Fix ESCAPE issues in multiple library files
- lib/domain-discovery.sh: Added -- to grep command (1 fix) - lib/reference-db.sh: Added -- to grep command (1 fix) - lib/user-manager.sh: Added -- to grep command (1 fix) - lib/email-functions.sh: Added -- to awk and grep commands (2 fixes) - lib/php-config-manager.sh: Added -- to grep commands (3 fixes) - lib/php-detector.sh: Added -- to grep command (1 fix) Total: 9 ESCAPE fixes 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -38,7 +38,7 @@ list_all_domains() {
|
|||||||
else
|
else
|
||||||
# Fallback: scan /var/cpanel/users/
|
# Fallback: scan /var/cpanel/users/
|
||||||
for user_file in /var/cpanel/users/*; do
|
for user_file in /var/cpanel/users/*; do
|
||||||
[ -f "$user_file" ] && grep "^DNS=" "$user_file" | cut -d'=' -f2
|
[ -f "$user_file" ] && grep "^DNS=" -- "$user_file" | cut -d'=' -f2
|
||||||
done | sort -u
|
done | sort -u
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|||||||
@@ -274,12 +274,12 @@ count_by_sender() {
|
|||||||
local min_date="${2:-}"
|
local min_date="${2:-}"
|
||||||
|
|
||||||
if [ -n "$min_date" ]; then
|
if [ -n "$min_date" ]; then
|
||||||
awk -v min_date="$min_date" '$0 >= min_date' "$log_file" | \
|
awk -v min_date="$min_date" '$0 >= min_date' -- "$log_file" | \
|
||||||
grep "<=" | \
|
grep "<=" | \
|
||||||
grep -oE '\<[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}\>' | \
|
grep -oE '\<[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}\>' | \
|
||||||
sort | uniq -c | sort -rn
|
sort | uniq -c | sort -rn
|
||||||
else
|
else
|
||||||
grep "<=" "$log_file" | \
|
grep "<=" -- "$log_file" | \
|
||||||
grep -oE '\<[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}\>' | \
|
grep -oE '\<[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}\>' | \
|
||||||
sort | uniq -c | sort -rn
|
sort | uniq -c | sort -rn
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -166,9 +166,9 @@ list_backups() {
|
|||||||
local metadata_file="$backup_dir/metadata.txt"
|
local metadata_file="$backup_dir/metadata.txt"
|
||||||
|
|
||||||
if [ -f "$metadata_file" ]; then
|
if [ -f "$metadata_file" ]; then
|
||||||
local created=$(grep "^Backup Created:" "$metadata_file" | cut -d: -f2- | xargs)
|
local created=$(grep "^Backup Created:" -- "$metadata_file" | cut -d: -f2- | xargs)
|
||||||
local username=$(grep "^Username:" "$metadata_file" | cut -d: -f2 | xargs)
|
local username=$(grep "^Username:" -- "$metadata_file" | cut -d: -f2 | xargs)
|
||||||
local domain=$(grep "^Domain:" "$metadata_file" | cut -d: -f2 | xargs)
|
local domain=$(grep "^Domain:" -- "$metadata_file" | cut -d: -f2 | xargs)
|
||||||
local file_count=$(find "$backup_dir" -type f ! -name "metadata.txt" | wc -l)
|
local file_count=$(find "$backup_dir" -type f ! -name "metadata.txt" | wc -l)
|
||||||
|
|
||||||
echo "$backup_name|$created|$username|$domain|$file_count"
|
echo "$backup_name|$created|$username|$domain|$file_count"
|
||||||
|
|||||||
+1
-1
@@ -68,7 +68,7 @@ detect_php_version_for_domain() {
|
|||||||
# Check userdata for PHP version
|
# Check userdata for PHP version
|
||||||
local userdata_file="${SYS_CPANEL_USERDATA_DIR:-/var/cpanel/userdata}/$username/$domain"
|
local userdata_file="${SYS_CPANEL_USERDATA_DIR:-/var/cpanel/userdata}/$username/$domain"
|
||||||
if [ -f "$userdata_file" ]; then
|
if [ -f "$userdata_file" ]; then
|
||||||
local php_ver=$(grep "phpversion:" "$userdata_file" | awk '{print $2}' | tr -d "'\"")
|
local php_ver=$(grep "phpversion:" -- "$userdata_file" | awk '{print $2}' | tr -d "'\"")
|
||||||
echo "$php_ver"
|
echo "$php_ver"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|||||||
+1
-1
@@ -292,7 +292,7 @@ build_domains_section() {
|
|||||||
local doc_root=$(grep "^documentroot:" -- "$config_file" | awk '{print $2}' || true)
|
local doc_root=$(grep "^documentroot:" -- "$config_file" | awk '{print $2}' || true)
|
||||||
local log_path=$(grep "target:.*domlogs" -- "$config_file" | head -1 | awk '{print $2}' || true)
|
local log_path=$(grep "target:.*domlogs" -- "$config_file" | head -1 | awk '{print $2}' || true)
|
||||||
local server_alias=$(grep "^serveralias:" -- "$config_file" | awk '{print $2}' || true)
|
local server_alias=$(grep "^serveralias:" -- "$config_file" | awk '{print $2}' || true)
|
||||||
local php_version=$(grep "^phpversion:" "$config_file" | awk '{print $2}' || true)
|
local php_version=$(grep "^phpversion:" -- "$config_file" | awk '{print $2}' || true)
|
||||||
|
|
||||||
# Determine if primary domain
|
# Determine if primary domain
|
||||||
local is_primary="no"
|
local is_primary="no"
|
||||||
|
|||||||
+1
-1
@@ -131,7 +131,7 @@ get_cpanel_user_info() {
|
|||||||
local home_dir="/home/${username}"
|
local home_dir="/home/${username}"
|
||||||
|
|
||||||
# Get addon/parked domains
|
# Get addon/parked domains
|
||||||
local all_domains=$(grep "^DNS" "$user_file" | cut -d= -f2 | tr '\n' ' ')
|
local all_domains=$(grep "^DNS" -- "$user_file" | cut -d= -f2 | tr '\n' ' ')
|
||||||
|
|
||||||
# Get disk usage
|
# Get disk usage
|
||||||
local disk_used=$(du -sh "$home_dir" 2>/dev/null | awk '{print $1}')
|
local disk_used=$(du -sh "$home_dir" 2>/dev/null | awk '{print $1}')
|
||||||
|
|||||||
Reference in New Issue
Block a user