diff options
| author | Renato Botelho <garga@pfSense.org> | 2013-09-18 03:11:37 -0700 |
|---|---|---|
| committer | Renato Botelho <garga@pfSense.org> | 2013-09-18 03:11:37 -0700 |
| commit | ce6e90c992011363a911c6321e593684dfc9da24 (patch) | |
| tree | 851d1a3db45ffa1632410e833ba10277d62893bb | |
| parent | c0d492de3ce5be90b942c9222fa8f3fdf8ac6767 (diff) | |
| parent | af0cf104b57482d767d8dc3745a0cf9751e998f6 (diff) | |
| download | pfsense-packages-ce6e90c992011363a911c6321e593684dfc9da24.tar.gz pfsense-packages-ce6e90c992011363a911c6321e593684dfc9da24.tar.bz2 pfsense-packages-ce6e90c992011363a911c6321e593684dfc9da24.zip | |
Merge pull request #474 from timdufrane/master
Fix Incorrect Directory Replacement
| -rwxr-xr-x | config/dansguardian/dansguardian.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/dansguardian/dansguardian.inc b/config/dansguardian/dansguardian.inc index 39282409..12c2af93 100755 --- a/config/dansguardian/dansguardian.inc +++ b/config/dansguardian/dansguardian.inc @@ -321,7 +321,7 @@ function sync_package_dansguardian($via_rpc="no",$install_process=false) { #contentscanners preg_replace patterns $match[0]="/(conf)/"; - $match[1]="/(\/usr.local)/"; + $match[1]="/\/usr.local|".str_replace("/","\\/",DANSGUARDIAN_DIR)."/"; $match[2]="/,/"; $replace[0]="$1'"; $replace[1]="contentscanner = '".DANSGUARDIAN_DIR; @@ -331,7 +331,7 @@ function sync_package_dansguardian($via_rpc="no",$install_process=false) { #includes preg_replace patterns $match[0]="/(.)$/"; - $match[1]="/\/usr.local/"; + $match[1]="/\/usr.local|".str_replace("/","\\/",DANSGUARDIAN_DIR)."/"; $match[2]="/,/"; $replace[0]="$1>\n"; $replace[1]="\n.Include<".DANSGUARDIAN_DIR; @@ -1416,4 +1416,4 @@ function dansguardian_do_xmlrpc_sync($sync_to_ip,$username,$password,$sync_type, } } -?>
\ No newline at end of file +?> |