diff options
Diffstat (limited to 'packages/squidGuard/squidguard.inc')
| -rw-r--r-- | packages/squidGuard/squidguard.inc | 2182 |
1 files changed, 1027 insertions, 1155 deletions
diff --git a/packages/squidGuard/squidguard.inc b/packages/squidGuard/squidguard.inc index 88779180..5628882d 100644 --- a/packages/squidGuard/squidguard.inc +++ b/packages/squidGuard/squidguard.inc @@ -1,28 +1,27 @@ <?php - # ------------------------------------------------------------------------------ -# squidguard.inc -# (C)2006, 2007 Serg Dvoriancev -/* Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. +/* squidguard.inc + (C)2006-2008 Serg Dvoriancev + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ # ------------------------------------------------------------------------------ @@ -88,9 +87,8 @@ define('MODULE_SOURCE', 'squidguardsrc'); define('MODULE_TIME', 'squidguardtime'); define('MODULE_LOG', 'squidguardlog'); -define('BLACKLIST_DEFAULT_URL', 'http://ftp.teledanmark.no/pub/www/proxy/squidGuard/contrib/blacklists.tar.gz'); // 360Kb -define('BLACKLIST_DEFAULT_URL1', 'http://squidguard.mesd.k12.or.us/blacklists.tgz'); // 3.5Mb -define('BLACKLIST_DEFAULT_URL2', 'http://blacklist.dansguardian.org/cgi-bin/download.pl?type=download&file=bigblacklist'); +define('BLACKLIST_DEFAULT_URL', 'http://ftp.teledanmark.no/pub/www/proxy/squidGuard/contrib/blacklists.tar.gz'); # 360Kb +define('BLACKLIST_DEFAULT_URL1', 'http://www.shallalist.de/Downloads/shallalist.tar.gz'); # ~7Mb define('BLACKLIST_TMP_FILE', '/var/tmp/blacklists.tar.gz'); define('BLACKLIST_BTN_URL', 'Upload Url'); define('BLACKLIST_BTN_LAST', 'Restore last'); @@ -103,108 +101,105 @@ define('WEBGUI_HISTORY_LOG', 'on'); define('TEST_LOG', '/var/tmp/sqtest.test'); -define('ERRVALIDATE_REDIRECT', "Redirect must contains valid data. Example: 'http://www.my.com', 'https://my.com', Error_Code<space>Reason, blank, blank_img"); - # ============================================================================== # Initialization # ============================================================================== sg_init(convert_pfxml_to_sgxml()); +# file_put_contents("/var/tmp/sg.xml", $squidguard_config); # Test # ============================================================================== # Validations # ============================================================================== +function squidguard_validate($post, $input_errors) +{ + $submit = isset($_GET['submit']) ? $_GET['submit'] : $_POST['submit']; + # check config if 'Apply' + if ($submit === APPLY_BTN) sg_check_config_data(&$input_errors); +} # ------------------------------------------------------------------------------ # validate default # ------------------------------------------------------------------------------ -function squidguard_validate_default($post, $input_errors) { - squidguard_validate_acl($post, &$input_errors); +function squidguard_validate_default($post, $input_errors) +{ + squidguard_validate_acl($post, &$input_errors); } # ------------------------------------------------------------------------------ # validate acl # ------------------------------------------------------------------------------ -function squidguard_validate_acl($post, $input_errors) { - global $config; - $pass_up = array(); - $deny_up = array(); - $pass_up_val = ''; - $pass_over = array(); - $deny_over = array(); - $pass_over_val = ''; - - // check name ('source') - $name = trim($post[FLD_NAME]); - if(!empty($name)) { - $err = check_name($name); // validate name content - if (!empty($err)) - $input_errors[] = $err; - - // check unique name - if (!check_unique_name(MODULE_ACL, $name)) - $input_errors[] = "Name '$name' already exists."; - } +function squidguard_validate_acl($post, $input_errors) +{ + global $config; + $pass_up = array(); + $deny_up = array(); + $pass_up_val = ''; + $pass_over = array(); + $deny_over = array(); + $pass_over_val = ''; + $id = get_item_id(); + + # check name ('source') + $name = trim($post[FLD_NAME]); + if(!empty($name)) { + # validate name format + check_name_format($name, &$input_errors); + + # check unique name + if (!sg_check_unique_name(FLD_ACLS, $id, $name)) + $input_errors[] = "Name '$name' already exists."; + + # check source + $sgx = array(); + $sgx[FLD_NAME] = $post[FLD_NAME]; + $sgx[FLD_SOURCE] = $post[FLD_SOURCE]; + sg_check_src($sgx, &$input_errors); + } - // store destinations to 'dest' value - foreach ($post as $key => $val) { - if (substr_count($key, PREFLD_UPTIME) != 0) { - $name = str_replace(PREFLD_UPTIME, '', $key); - if ($name) { - switch($val) { - case "allow": $pass_up_val .= " $name"; break; - case "white": $pass_up_val .= " ^$name"; break; - case "deny" : $pass_up_val .= " !$name"; break; - } - } + # store destinations to 'dest' value + foreach ($post as $key => $val) { + if (substr_count($key, PREFLD_UPTIME) != 0) { + $name = str_replace(PREFLD_UPTIME, '', $key); + if ($name) { + switch($val) { + case "allow": $pass_up_val .= " $name"; break; + case "white": $pass_up_val .= " ^$name"; break; + case "deny" : $pass_up_val .= " !$name"; break; } - elseif (substr_count($key, PREFLD_OVERTIME) != 0) { - $name = str_replace(PREFLD_OVERTIME, '', $key); - if ($name) { - switch($val) { - case "allow": $pass_over_val .= " $name"; break; - case "white": $pass_over_val .= " ^$name"; break; - case "deny" : $pass_over_val .= " !$name"; break; - } - } + } + } + elseif (substr_count($key, PREFLD_OVERTIME) != 0) { + $name = str_replace(PREFLD_OVERTIME, '', $key); + if ($name) { + switch($val) { + case "allow": $pass_over_val .= " $name"; break; + case "white": $pass_over_val .= " ^$name"; break; + case "deny" : $pass_over_val .= " !$name"; break; } + } } + } - // !ATTENTION! on pfSense XML config must be must(shell) be '!all' instead of 'none' - it is a must for correct work GUI + # !ATTENTION! on pfSense XML config must be must(shell) be '!all' instead of 'none' - it is a must for correct work GUI - // if not exists key 'all', then add 'none' - default 'deny all' - if ((substr_count($pass_up_val, 'all') == 0)) { - $pass_up_val .= ' !all'; - } + # if not exists key 'all', then add 'none' - default 'deny all' + if ((substr_count($pass_up_val, 'all') == 0)) { + $pass_up_val .= ' !all'; + } - if (!empty($pass_over_val) && (substr_count($pass_over_val, 'all') == 0)) { - $pass_over_val .= ' !all'; - } + if (!empty($pass_over_val) && (substr_count($pass_over_val, 'all') == 0)) { + $pass_over_val .= ' !all'; + } - if (empty($pass_over_val)) - $post[FLD_DEST] = "$pass_up_val"; - else $post[FLD_DEST] = "$pass_up_val [$pass_over_val]"; - - // check redirect - $redirect = trim($post[FLD_REDIRECT]); - if(!empty($redirect)) { - // cut first redirect url, if entered more that one - $redirect = explode("\n", $redirect); - $redirect = $redirect[0]; - $post[FLD_REDIRECT] = $redirect; - if (is_url($redirect) === false) - $input_errors[] = "Redirect '$redirect' error. " . ERRVALIDATE_REDIRECT; - } + if (empty($pass_over_val)) + $post[FLD_DEST] = "$pass_up_val"; + else $post[FLD_DEST] = "$pass_up_val [$pass_over_val]"; - // check overredirect - $redirect = trim($post[FLD_OVERREDIRECT]); - if(!empty($redirect)) { - // cut first redirect url, if entered more that one - $redirect = explode("\n", $redirect); - $redirect = $redirect[0]; - $post[FLD_OVERREDIRECT] = $redirect; - if (is_url($redirect) === false) - $input_errors[] = "Overtime redirect '$redirect' error. " . ERRVALIDATE_REDIRECT; - } + # check redirect + $errmsg = ''; + if (!sg_check_redirect($post[FLD_RMOD], $post[FLD_REDIRECT], &$errmsg)) { + $input_errors[] = "Redirect info error. $errmsg"; + } } # ------------------------------------------------------------------------------ @@ -213,534 +208,445 @@ function squidguard_validate_acl($post, $input_errors) { # date: <date(or range)><time (or range)> -- days not parsed (reset to *) # weekly: <day or *><time or range> -- dates not parsed (reset to '') # ------------------------------------------------------------------------------ -function squidguard_validate_times($post, $input_errors) { +function squidguard_validate_times($post, $input_errors) +{ + $id = get_item_id(); - // check name - $name = trim($post[FLD_NAME]); - if(!empty($name)) { - $err = check_name($name); - if (!empty($err)) - $input_errors[] = $err; - } + # check name + $name = trim($post[FLD_NAME]); + if(!empty($name)) { + check_name_format($name, &$input_errors); - // check unique name - if (!check_unique_name(MODULE_TIME, $name)) - $input_errors[] = "Name '$name' already exists"; - - // check format - $err = ''; - for ($i=0; $post[FLD_TIMETYPE . "$i"] != ''; $i++) { - $timetype = strtolower($post[FLD_TIMETYPE . "$i"]); - if ($timetype == 'date') { - // set timedays to '*' - $post[FLD_TIMEDAYS . "$i"] = '*'; - - // check date and time - $date = trim($post[FLD_DATERANGE."$i"]); - $time = trim($post[FLD_TIMERANGE."$i"]); - $err = check_date($date); - if (!empty($err)) $input_errors[] = $err; - $err = check_time($time); - if (!empty($err)) $input_errors[] = $err; - } else { - // set daterange to '' - $post[FLD_DATERANGE . "$i"] = ''; - - // check time - $time = trim($post[FLD_TIMERANGE."$i"]); - $err = check_time($time); - if (!empty($err)) $input_errors[] = $err; - } - } -} + # check unique name + if (!sg_check_unique_name(MODULE_TIME, $id, $name)) + $input_errors[] = "Name '$name' already exists"; + } -# ------------------------------------------------------------------------------ -# validate sources -# ------------------------------------------------------------------------------ -function squidguard_validate_source($post, $input_errors) { - // check name - $name = trim($post[FLD_NAME]); - if(!empty($name)) { - $err = check_name($name); // validate name content - if (!empty($err)) - $input_errors[] = $err; + # --- check format --- + $sgx = array(); + $sgx[FLD_NAME] = $post[FLD_NAME]; + $sgx[FLD_DESCRIPTION] = $post[FLD_DESCRIPTION]; + # fields of $post have 'fnameX' format + for ($i=0; isset($post[FLD_TIMETYPE."$i"]); $i++) { + # correct and update + if (strtolower($post[FLD_TIMETYPE."$i"]) === "date") { + $post[FLD_TIMEDAYS."$i"] = '*'; + # date cant be empty + if (trim($post[FLD_DATERANGE."$i"]) == '') $post[FLD_DATERANGE."$i"] = "*.*.*"; + } + else $post[FLD_DATERANGE."$i"] = ''; + + if (trim($post[FLD_TIMERANGE."$i"]) == '') $post[FLD_TIMERANGE."$i"] = "00:00-23:59"; + + # $post->xml + $sgx_row = array(); + $sgx_row[FLD_TIMETYPE] = $post[FLD_TIMETYPE."$i"]; + $sgx_row[FLD_TIMEDAYS] = $post[FLD_TIMEDAYS."$i"]; + $sgx_row[FLD_DATERANGE] = $post[FLD_DATERANGE."$i"]; + $sgx_row[FLD_TIMERANGE] = $post[FLD_TIMERANGE."$i"]; + $sgx[FLD_ITEM][] = $sgx_row; + } + # + sg_check_time($sgx, &$input_errors); - // check unique name - if (!check_unique_name(MODULE_SOURCE, $name)) - $input_errors[] = "Name '$name' already exists"; - } } # ------------------------------------------------------------------------------ # validate destinations # ------------------------------------------------------------------------------ function squidguard_validate_destination($post, $input_errors) { - // check name - $name = trim($post[FLD_NAME]); - if(!empty($name)) { - $err = check_name($name); // validate name content - if (!empty($err)) - $input_errors[] = $err; + # check name + $name = trim($post[FLD_NAME]); + if(!empty($name)) { + check_name_format($name, &$input_errors); + + # check unique name + if (!sg_check_unique_name(MODULE_DESTINATION, $name)) + $input_errors[] = "Name '$name' already exists"; + } - // check unique name - if (!check_unique_name(MODULE_DESTINATION, $name)) - $input_errors[] = "Name '$name' already exists"; - } - // check redirect - $redirect = trim($post[FLD_REDIRECT]); - if(!empty($redirect)) { - // cut first redirect url, if entered more that one - $redirect = explode("\n", $redirect); - $redirect = $redirect[0]; - $post[FLD_REDIRECT] = $redirect; - if (is_url($redirect) === false) - $input_errors[] = "Redirect '$redirect' error. " . ERRVALIDATE_REDIRECT; - } + # --- check format --- + $sgx = array(); + $sgx[FLD_NAME] = $post[FLD_NAME]; + $sgx[FLD_URLS] = $post[FLD_URLS]; + $sgx[FLD_DOMAINS] = $post[FLD_DOMAINS]; + $sgx[FLD_EXPRESSIONS] = $post[FLD_EXPRESSIONS]; + $sgx[FLD_RMOD] = $post[FLD_RMOD]; + $sgx[FLD_REDIRECT] = $post[FLD_REDIRECT]; + # + sg_check_dest($sgx, &$input_errors); } # ------------------------------------------------------------------------------ # validate rewrites # ------------------------------------------------------------------------------ function squidguard_validate_rewrite($post, $input_errors) { - // check name + # check name $name = trim($post[FLD_NAME]); if(!empty($name)) { - // check name format <char><symbols without space> - Ab123 - $err = check_name($name); - if (!empty($err)) - $input_errors[] = $err; - - // check unique name - if (!check_unique_name(MODULE_REWRITE, $name)) - $input_errors[] = "Name '$name' already exists"; + # check name format <char><symbols without space> - Ab123 + check_name_format($name, &$input_errors); + + # check unique name + if (!sg_check_unique_name(MODULE_REWRITE, $name)) + $input_errors[] = "Name '$name' already exists"; } } -// ----------------------------------------------------------------------------- -// squidguard_resync -// ----------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- +# squidguard_resync +# ----------------------------------------------------------------------------- function squidguard_resync() { - global $config; - $conf = $config['installedpackages'][MODULE_GENERAL]['config'][0]; - $upload_file = ''; - $submit = ''; - $url = ''; - $proxy = ''; - - if (isset($_POST['submit'])) { - $submit = $_POST['submit']; - $url = $_POST['blacklist_url']; - $proxy = $_POST['blacklist_proxy']; - } - else - if (isset($_GET['submit'])) { - $submit = $_GET['submit']; - $url = $_GET['blacklist_url']; - $proxy = $_GET['blacklist_proxy']; - } - - // blacklist upload - if ($submit == BLACKLIST_BTN_URL) { -# $url = $conf['blacklist_url']; -# $proxy = $conf['blacklist_proxy']; - if ($url) - sg_reconfigure_blacklist($url, $proxy); - } - - // blacklist restore last (if exists) - if ($submit == BLACKLIST_BTN_LAST) { - restore_arc_blacklist(); - } - - // apply changes - if ($submit == APPLY_BTN) { -# write_config('Update squidGuard options.'); // store, if not 'Save' button - sg_reconfigure(); - } + global $config; + $conf = $config['installedpackages'][MODULE_GENERAL]['config'][0]; + $upload_file = ''; + $submit = ''; + $url = ''; + $proxy = ''; + + $submit = isset($_POST['submit']) ? $_POST['submit'] : $_GET['submit']; + $url = isset($_POST['blacklist_url']) ? $_POST['blacklist_url'] : $_GET['blacklist_url']; + $proxy = isset($_POST['blacklist_proxy']) ? $_POST['blacklist_proxy'] : $_GET['blacklist_proxy']; + + # blacklist upload + if ($submit == BLACKLIST_BTN_URL) { + if ($url) + sg_reconfigure_blacklist($url, $proxy); + } + + # blacklist restore last (if exists) + if ($submit == BLACKLIST_BTN_LAST) { + restore_arc_blacklist(); + } + + # apply changes + if ($submit == APPLY_BTN) { +# write_config('Update squidGuard options.'); # store, if not 'Save' button +# перенести в validate для детектирования ошибок? + sg_reconfigure(); + } } - -// ----------------------------------------------------------------------------- -// squidguard_resync_acl -// ----------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- +# squidguard_resync_acl +# ----------------------------------------------------------------------------- function squidguard_resync_acl() { - global $config; - $conf = $config['installedpackages'][MODULE_ACL]['config']; - $id = $_GET['id']; - - if (!$id) - $id = $_POST['id']; - - // --- sources part --- - // move current id by order - if (($id !== '') and is_array($conf) /*and ($id !== intval($conf[$id]['order']))*/) { - - $src_new = array(); - foreach ($conf as $key => $src) { - $order = $src['order']; - $n_key = ''; // n_key: [order]_x[key]; x: =0[up]; = 5[nothing]; =9[down]; - - $k1 = sprintf("%04d", $order); - $k3 = sprintf("%04d", $key); - - // new: move to last - if (!isset($src['order']) or ($src['order'] === '')) - $n_key = "99995{$k3}"; - // current: moveup; movedown; nothing; - elseif (intval($key) === intval($id)) { - if (intval($order) < intval($key)) - $n_key = "{$k1}0{$k3}"; - elseif (intval($order) > intval($key)) - $n_key = "{$k1}9{$k3}"; - else - $n_key = "{$k1}5{$k3}"; - // other: nothing - } else - $n_key = "{$k1}5{$k3}"; - // update with key - $src_new[$n_key] = $src; - } - // sort by key - ksort($src_new); - reset($src_new); - - // make keys '0, 1, 2, ...', and update order - $src_new = array_values($src_new); - foreach ($src_new as $key => $src) { - $src_new[$key]['order'] = $key; - } - - // renew config - unset ($config['installedpackages'][MODULE_ACL]['config']); - $config['installedpackages'][MODULE_ACL]['config'] = $src_new; - write_config('Update squidguardacl config'); - } + global $config; + $conf = $config['installedpackages'][MODULE_ACL]['config']; + $id = isset($_POST['id']) ? $_POST['id'] : $_GET['id']; + + # --- sources part --- + # move current id by order + if (($id !== '') and is_array($conf) /*and ($id !== intval($conf[$id]['order']))*/) { + + $src_new = array(); + foreach ($conf as $key => $src) { + $order = $src['order']; + $n_key = ''; # n_key: [order]_x[key]; x: =0[up]; = 5[nothing]; =9[down]; + + $k1 = sprintf("%04d", $order); + $k3 = sprintf("%04d", $key); + + # new: move to last + if (!isset($src['order']) or ($src['order'] === '')) + $n_key = "99995{$k3}"; + # current: moveup; movedown; nothing; + elseif (intval($key) === intval($id)) { + if (intval($order) < intval($key)) + $n_key = "{$k1}0{$k3}"; + elseif (intval($order) > intval($key)) + $n_key = "{$k1}9{$k3}"; + else + $n_key = "{$k1}5{$k3}"; + # other: nothing + } else + $n_key = "{$k1}5{$k3}"; + # update with key + $src_new[$n_key] = $src; + } + # sort by key + ksort($src_new); + reset($src_new); + + # make keys '0, 1, 2, ...', and update order + $src_new = array_values($src_new); + foreach ($src_new as $key => $src) { + $src_new[$key]['order'] = $key; + } + + # renew config + unset ($config['installedpackages'][MODULE_ACL]['config']); + $config['installedpackages'][MODULE_ACL]['config'] = $src_new; + write_config('Update squidguardacl config'); + } } -// ============================================================================= -// common functions -// ============================================================================= +# ============================================================================= +# common functions +# ============================================================================= -// ----------------------------------------------------------------------------- -// get_pkg_items_list -// ----------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- +# get_pkg_items_list +# ----------------------------------------------------------------------------- function get_pkg_items_list($pkg_gui_name, $fieldname) { - $res = ''; - global $config; - $conf = $config['installedpackages'][$pkg_gui_name]['config']; - foreach($conf as $cf) - $res[] = $cf[$fieldname]; - return $res; + $res = ''; + global $config; + $conf = $config['installedpackages'][$pkg_gui_name]['config']; + if (is_array($conf)) + foreach($conf as $cf) $res[] = $cf[$fieldname]; + return $res; } # ============================================================================== # Before form # ============================================================================== -# squidguard_before_form_dest -# ------------------------------------------------------------------------------ -function squidguard_before_form_dest($pkg) { - global $config; - $expr_names = ''; - $expressions = ''; - - // update expressions list - $expressions = $config['installedpackages']['squidguardexpr']['config']; - if (is_array($expressions )) { - foreach($expressions as $expr) - $expr_names[] = $expr['name']; - } - - $i = 0; - foreach($pkg['fields']['field'] as $field) { - if ($field['fieldname'] == 'exprname') { - $fld = &$pkg['fields']['field'][$i]; - $fld['options']['option'][] = array('name'=>'none (expressions not defined)', 'value'=>''); - foreach ($expr_names as $nm) { - $fld['options']['option'][] = array('name'=>$nm, 'value'=>$nm); - } - break; - } - $i++; - } -} - -# ------------------------------------------------------------------------------ # squidguard_before_form # ------------------------------------------------------------------------------ function squidguard_before_form($pkg) { - $i=0; - - foreach($pkg['fields']['field'] as $field) { - // blacklist controls - if ($field['fieldname'] == 'blacklist_url') { - $fld = &$pkg['fields']['field'][$i]; - $fld['description'] .= make_grid_blacklist(); // insert to description custom controls - } - // Apply button - if ($field['fieldname'] == 'squidguard_enable'){ - $fld = &$pkg['fields']['field'][$i]; - $fld['description'] .= make_grid_general_items(); // insert to description custom controls - } - // GUI log - if ($field['fieldname'] == 'view_gui_log') { - $fld = &$pkg['fields']['field'][$i]; - $fld['description'] .= make_grid_general_items('gui_log'); // insert to description custom controls - } - $i++; + $i=0; + + foreach($pkg['fields']['field'] as $field) { + # blacklist controls + switch ($field['fieldname']) { + case 'blacklist_url': + $fld = &$pkg['fields']['field'][$i]; + $fld['description'] .= make_grid_blacklist(); # insert to description custom controls + break; + # Apply button + case 'squidguard_enable': + $fld = &$pkg['fields']['field'][$i]; + $fld['description'] .= make_grid_general_items(); # insert to description custom controls + break; + # GUI log + case 'view_gui_log': + $fld = &$pkg['fields']['field'][$i]; + $fld['description'] .= make_grid_general_items('gui_log'); # insert to description custom controls + break; } + $i++; + } } -// ----------------------------------------------------------------------------- -// squidguard_before_form_acl -// ----------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- +# squidguard_before_form_acl +# ----------------------------------------------------------------------------- function squidguard_before_form_acl($pkg, $is_acl=true) { - global $config; - global $g; - $current_id = ''; - - $sources = ''; - $source_items = ''; - $destinations = ''; - $dest_items = ''; - $rewrites = ''; - $rewr_names = ''; - $times = ''; - $time_names = ''; - $acls_up = ''; - $acls_over = ''; - - $current_id = $_GET['id']; - if ($current_id == '') - $current_id = $_POST['id']; - if ($current_id == '') - $current_id = 0; - - // 'source' part of 'acl' page - $i=0; - foreach($pkg['fields']['field'] as $field) { - if ($field['fieldname'] == 'order') { - $fld = &$pkg['fields']['field'][$i]; - $img_up = "<img src='./themes/{$g['theme']}/images/icons/icon_up.gif' - title='move up' width='17' height='17' border='0' onclick='on_moveup()'>"; - $img_down = "<img src='./themes/{$g['theme']}/images/icons/icon_down.gif' - title='move down' width='17' height='17' border='0' onclick='on_movedown()'>"; - $s = "<b>Move to:</b> $img_up $img_down <br>" . $fld['description']; - $fld['description'] = $s; - } - $i++; + global $config, $g; + $current_id = ''; + $sources = ''; + $source_items = ''; + $destinations = ''; + $dest_items = ''; + $rewrites = ''; + $rewr_names = ''; + $times = ''; + $time_names = ''; + $acls_up = ''; + $acls_over = ''; + + $current_id = isset($_POST['id']) ? $_POST['id'] : $_GET['id']; + $current_id = ($current_id) ? $current_id : 0; + + # 'source' part of 'acl' page + # order option + $i=0; + foreach($pkg['fields']['field'] as $field) { + if ($field['fieldname'] === 'order') { + $fld = &$pkg['fields']['field'][$i]; + $img_up = "<img src='./themes/{$g['theme']}/images/icons/icon_up.gif' title='move up' width='17' height='17' border='0' onclick='on_moveup()'>"; + $img_down = "<img src='./themes/{$g['theme']}/images/icons/icon_down.gif' title='move down' width='17' height='17' border='0' onclick='on_movedown()'>"; + $s = "<b>Move to:</b> $img_up $img_down <br> {$fld['description']}"; + $fld['description'] = $s; } - unset ($i); - - // sources - $sources = $config['installedpackages']['squidguardsrc']['config']; - if (is_array($sources)) { - foreach($sources as $src) - $source_items[] = $src['name']; + $i++; + } + unset($i); + + # sources + $source_items = get_pkg_items_list('squidguardsrc', 'name'); + # generate sources list TODO: exclude used names from list, source name used in ACL unique + $i=0; + foreach($pkg['fields']['field'] as $field) { + if ($field['fieldname'] == 'source') { + $fld = &$pkg['fields']['field'][$i]; + if (is_array($source_items)) { + foreach($source_items as $nm) + $fld['options']['option'][] = array('name'=>$nm, 'value'=>$nm); + } } + $i++; + } - // generate sources list TODO: exclude used names from list, source name used in ACL unique - $i=0; - foreach($pkg['fields']['field'] as $field) { - if ($field['fieldname'] == 'source') { - $fld = &$pkg['fields']['field'][$i]; - if (is_array($source_items)) { - foreach($source_items as $nm) - $fld['options']['option'][] = array('name'=>$nm, 'value'=>$nm); - } + # destinations + # acls pass ---> prepare data for destinations; dest format 'uptime_dests_list [overtime_dests_list]' + $acl_dest = ''; + + $current_id = ($pkg['name'] !== MODULE_DEFAULT) ? $current_id : 0; + $acl_dest = $config['installedpackages'][$pkg['name']]['config'][$current_id]['dest']; + + if ($acl_dest) { + $overtime = ''; + $pss = explode(' ', str_replace(']', '', $acl_dest)); + foreach($pss as $val) { + $name = $val; + $name = str_replace('!', '', $name); + $name = str_replace('^', '', $name); + if ($val === '[') { $overtime = 'yes'; continue; } + elseif ($val === ']') { break; } + if (empty($overtime)) { + if (!empty($val)) { + switch($val[0]) { + case '!': $acls_up[$name] = 'deny'; break; + case '^': $acls_up[$name] = 'white'; break; + default : $acls_up[$name] = 'allow'; break; + } } - $i++; - } - - // destinations - // acls pass ---> prepare data for destinations; dest format 'uptime_dests_list [overtime_dests_list]' - $acl_dest = ''; - if ($pkg['name'] == MODULE_DEFAULT) { - $current_id = 0; - $acl_dest = $config['installedpackages'][MODULE_DEFAULT]['config'][$current_id]['dest']; - } - else $acl_dest = $config['installedpackages'][MODULE_ACL]['config'][$current_id]['dest']; - - if ($acl_dest) { - $overtime = ''; - $pss = str_replace(']', '', $acl_dest); - $pss = explode(' ', $pss); - foreach($pss as $val) { - $name = $val; - $name = str_replace('!', '', $name); - $name = str_replace('^', '', $name); - if ($val == '[') { $overtime = 'yes'; continue; } - elseif ($val == ']') { break; } - if (empty($overtime)) { - if (!empty($val)) { - switch($val[0]) { - case '!': $acls_up[$name] = 'deny'; break; - case '^': $acls_up[$name] = 'white'; break; - default : $acls_up[$name] = 'allow'; break; - } - } - } else { - if (!empty($val)) { - switch($val[0]) { - case '!': $acls_over[$name] = 'deny'; break; - case '^': $acls_over[$name] = 'white'; break; - default : $acls_over[$name] = 'allow'; break; - } - } - } + } else { + if (!empty($val)) { + switch($val[0]) { + case '!': $acls_over[$name] = 'deny'; break; + case '^': $acls_over[$name] = 'white'; break; + default : $acls_over[$name] = 'allow'; break; + } } - } - - // --- Destinations --- - $general_cfg = $config['installedpackages'][MODULE_GENERAL]['config'][0]; - $dest_cfg = $config['installedpackages'][MODULE_DESTINATION]['config']; - - // Blacklist - if ($general_cfg['blacklist'] == 'on') { - $blk_entries = sg_entries_blacklist(); - if (!empty($blk_entries)) { - foreach($blk_entries as $dst) - $dest_items[] = array ('name'=>$dst, - 'upt_value'=>$acls_up[$dst], - 'ovt_value'=>$acls_over[$dst], - 'description'=>''); } } + } - // User destinations - if ($dest_cfg) { - foreach($dest_cfg as $dst) - $dest_items[] = array ('name'=>$dst[FLD_NAME], - 'upt_value'=>$acls_up[$dst[FLD_NAME]], - 'ovt_value'=>$acls_over[$dst[FLD_NAME]], - 'description'=>$dst[FLD_DESCRIPTION]); - } - - // Default all - $dest_items[] = array('name'=>FLT_DEFAULT_ALL, - 'upt_value'=>$acls_up[FLT_DEFAULT_ALL], - 'ovt_value'=>$acls_over[FLT_DEFAULT_ALL], - 'description'=>'Default access'); - - $i=0; - foreach($pkg['fields']['field'] as $field) { - if (($field['fieldname'] == 'dest')/* || ($field['fieldname'] == 'overdest')*/) { - $fld = &$pkg['fields']['field'][$i]; - $fld['description'] .= make_grid_controls('', $dest_items, $is_acl); // insert to description custom controls - } - $i++; + # --- Destinations --- + $general_cfg = $config['installedpackages'][MODULE_GENERAL]['config'][0]; + $dest_cfg = $config['installedpackages'][MODULE_DESTINATION]['config']; + + # Blacklist + if ($general_cfg['blacklist'] === 'on') { + $blk_entries = sg_entries_blacklist(); + if (!empty($blk_entries)) { + foreach($blk_entries as $dst) + $dest_items[] = array ('name'=>$dst, + 'upt_value'=>$acls_up[$dst], + 'ovt_value'=>$acls_over[$dst], + 'description'=>''); } + } - // rewrites - $rewrites = $config['installedpackages'][MODULE_REWRITE]['config']; - if (is_array($rewrites)) { - foreach($rewrites as $rewr) { - $rewr_names[] = $rewr['name']; - } - } + # User destinations + if ($dest_cfg) { + foreach($dest_cfg as $dst) + $dest_items[] = array ('name'=>$dst[FLD_NAME], + 'upt_value'=>$acls_up[$dst[FLD_NAME]], + 'ovt_value'=>$acls_over[$dst[FLD_NAME]], + 'description'=>$dst[FLD_DESCRIPTION]); + } - $i=0; - foreach($pkg['fields']['field'] as $field) { - if (($field['fieldname'] == 'rewrite') || ($field['fieldname'] == 'overrewrite')) { - $fld = &$pkg['fields']['field'][$i]; - $fld['options']['option'][] = array('name'=>'none (rewrite not defined)', 'value'=>''); - if (is_array($rewr_names)) { - foreach($rewr_names as $nm) - $fld['options']['option'][] = array('name'=>$nm, 'value'=>$nm); - } - } - $i++; + # Default all + $dest_items[] = array('name'=>FLT_DEFAULT_ALL, + 'upt_value'=>$acls_up[FLT_DEFAULT_ALL], + 'ovt_value'=>$acls_over[FLT_DEFAULT_ALL], + 'description'=>'Default access'); + + $i=0; + foreach($pkg['fields']['field'] as $field) { + if (($field['fieldname'] === 'dest')/* || ($field['fieldname'] == 'overdest')*/) { + $fld = &$pkg['fields']['field'][$i]; + $fld['description'] .= make_grid_controls('', $dest_items, $is_acl); # insert to description custom controls } + $i++; + } - // times - $times = $config['installedpackages']['squidguardtime']['config']; - if (is_array($times)) { - foreach($times as $tm) { - $time_names[] = $tm['name']; - } + # rewrites + $rewr_names = get_pkg_items_list(MODULE_REWRITE, 'name'); + $i=0; + foreach($pkg['fields']['field'] as $field) { + if (($field['fieldname'] == 'rewrite') || ($field['fieldname'] == 'overrewrite')) { + $fld = &$pkg['fields']['field'][$i]; + $fld['options']['option'][] = array('name'=>'none (rewrite not defined)', 'value'=>''); + if (is_array($rewr_names)) { + foreach($rewr_names as $nm) + $fld['options']['option'][] = array('name'=>$nm, 'value'=>$nm); + } } + $i++; + } - $i=0; - foreach($pkg['fields']['field'] as $field) { - if ($field['fieldname'] == 'time') { - $fld = &$pkg['fields']['field'][$i]; - $fld['options']['option'][] = array('name'=>'none (time not defined)', 'value'=>''); - if (is_array($time_names)) { - foreach($time_names as $nm) - $fld['options']['option'][] = array('name'=>$nm, 'value'=>$nm); - } - break; - } - $i++; + # - set times field - + $time_names = get_pkg_items_list('squidguardtime', 'name'); + $i=0; + foreach($pkg['fields']['field'] as $field) { + if ($field['fieldname'] === 'time') { + $fld = &$pkg['fields']['field'][$i]; + $fld['options']['option'][] = array('name'=>'none (time not defined)', 'value'=>''); + if (is_array($time_names)) { + foreach($time_names as $nm) + $fld['options']['option'][] = array('name'=>$nm, 'value'=>$nm); + } + break; } + $i++; + } } -// ----------------------------------------------------------------------------- -// squidguard_before_form_log -// ----------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- +# squidguard_before_form_log +# ----------------------------------------------------------------------------- define('LOGSHOW_BUFSIZE', 16384); function squidguard_before_form_log($pkg) { - global $config; - $i=0; - $move_pos = 0; - $move_step = 50; - - foreach($pkg['fields']['field'] as $field) { - if ($field['fieldname'] == 'logtype') { - $slog = ''; - $mlog = $config['installedpackages'][MODULE_LOG]['config'][0]; - - $filename = ''; - $fld = &$pkg['fields']['field'][$i]; - if (empty($move_pos)) $move_pos = 0; - - if ($mlog['logtype'] == 'block_log') { - $filename = SQUIDGUARD_LOGDIR . "/" . SQUIDGUARD_ACCESSBLOCK_FILE; - $fh = ''; - if (file_exists($filename)) { - $fh = fopen($filename, "r"); - if ($fh) { - $fsize = filesize($filename); - // take LOGSHOW_BUFSIZE bytes from end - if ($fsize > LOGSHOW_BUFSIZE) - fseek($fh, -LOGSHOW_BUFSIZE, SEEK_END); - $s = fread($fh, LOGSHOW_BUFSIZE); - fclose($fh); - - $slog .= "<tr><td colspan='7'>Block log '$filename'. Last 100:<td><tr>"; - - $s = explode("\n", $s); - unset($s[0]); // unset us'nt complete string - - $slog .= "<tr><th>Num</th><th>DateTime</th><th>IP</th><th>URL</th><th>Filter</th><th>ID</th><th>Mtd</th></tr>"; - foreach($s as $key => $vs) { - $nkey = $move_pos + intval($key); - $slog .= "<tr>"; - $sx = $vs; - $sx = str_replace("/- -", "", $sx); - $sx = str_replace("/-", "", $sx); - $sx = str_replace("Request", "", $sx); - $sx = str_replace("request", "", $sx); - $sx = str_replace("(", "", $sx); - $sx = str_replace(")", "", $sx); - $sx = str_replace("[", "", $sx); - $sx = str_replace("]", "", $sx); - $sx = explode(" ", $sx); - - // formatting url - $spos =0; - $stmp = ''; - while($spos + 81 < strlen($sx[4])) { - $stmp .= substr($sx[4], $spos, 81) . "<br>"; - $spos += 81; - } - $stmp .= substr($sx[4], $spos, strlen($sx[4]) - $spos); - $sx[4] = $stmp; - - if (!empty($vs)) - $slog .= "<tr> + global $config; + $i=0; + $move_pos = 0; + $move_step = 50; + + foreach($pkg['fields']['field'] as $field) { + if ($field['fieldname'] == 'logtype') { + $slog = ''; + $mlog = $config['installedpackages'][MODULE_LOG]['config'][0]; + + $filename = ''; + $fld = &$pkg['fields']['field'][$i]; + $move_pos = ($move_pos) ? $move_pos : 0; + + switch ($mlog['logtype']) { + case 'block_log': + { + $filename = SQUIDGUARD_LOGDIR . "/" . SQUIDGUARD_ACCESSBLOCK_FILE; + $fh = ''; + if (file_exists($filename)) { + $fh = fopen($filename, "r"); + if ($fh) { + $fsize = filesize($filename); + # take LOGSHOW_BUFSIZE bytes from end + if ($fsize > LOGSHOW_BUFSIZE) + fseek($fh, -LOGSHOW_BUFSIZE, SEEK_END); + $s = fread($fh, LOGSHOW_BUFSIZE); + fclose($fh); + + $slog .= "<tr><td colspan='7'>Block log '$filename'. Last 100:<td><tr>"; + + $s = explode("\n", $s); + unset($s[0]); # unset us'nt complete string + + $slog .= "<tr><th>Num</th><th>DateTime</th><th>IP</th><th>URL</th><th>Filter</th><th>ID</th><th>Mtd</th></tr>"; + foreach($s as $key => $vs) { + $nkey = $move_pos + intval($key); + $slog .= "<tr>"; + $sx = $vs; + $sx = str_replace(array("/- -", "/-", "Request", "request","(", ")", "[", "]"), "", $sx); + $sx = explode(" ", $sx); + + # formatting url + $spos =0; + $stmp = ''; + while($spos + 81 < strlen($sx[4])) { + $stmp .= substr($sx[4], $spos, 81) . "<br>"; + $spos += 81; + } + $stmp .= substr($sx[4], $spos, strlen($sx[4]) - $spos); + $sx[4] = $stmp; + + if (!empty($vs)) + $slog .= "<tr> <td style='vertical-align: top; white-space: nowrap;'>" . strval($nkey) . "</td> <td style='vertical-align: top; white-space: nowrap;'>$sx[0] $sx[1]</td> <td style='vertical-align: top;'>$sx[5]</td> @@ -748,25 +654,26 @@ function squidguard_before_form_log($pkg) { <td style='vertical-align: top;'>$sx[3]</td> <td style='vertical-align: top;'>$sx[2]</td> <td style='vertical-align: top;'>$sx[6]</td></tr>"; - } - } - } - - } else - - if ($mlog['logtype'] == 'configurator_log') { - $filename = SQUIDGUARD_LOGDIR . SQUIDGUARDCONF_LOGFILE; - $slog .= "<b>$filename</b><br>"; - if (file_exists($filename)) { - $slog .= file_get_contents($filename); - $slog = str_replace("\n", "<br>", $slog); - $slog = "<tr><td>$slog</td></tr>"; } - } else - - if ($mlog['logtype'] == 'squidguard_log') { + } + } - $slog .= 'squidguard_log report disabled'; + } + break; + case 'configurator_log': + { + $filename = SQUIDGUARD_LOGDIR . SQUIDGUARDCONF_LOGFILE; + $slog .= "<b>$filename</b><br>"; + if (file_exists($filename)) { + $slog .= file_get_contents($filename); + $slog = str_replace("\n", "<br>", $slog); + $slog = "<tr><td>$slog</td></tr>"; + } + } + break; + case 'squidguard_log': + { + $slog .= 'squidguard_log report disabled'; /* $filename = SQUIDGUARD_LOGDIR . '/squidGuard.log'; $slog .= "<b>$filename</b><br>"; @@ -779,301 +686,228 @@ function squidguard_before_form_log($pkg) { $slog = "<tr><td>$slog</td></tr>"; } */ - } else - - if ($mlog['logtype'] == 'squid_config') { - $filename = SQUID_CONFIGFILE; - $slog .= "<b>$filename</b><br>"; - if (file_exists($filename)) { - $slog .= file_get_contents($filename); - $slog = str_replace("\n", "<br>", $slog); - $slog = str_replace("\t", " ", $slog); - $slog = "<tr><td>$slog</td></tr>"; - } - } else - if ($mlog['logtype'] == 'squidguard_config') { - $filename = SQUIDGUARD_WORKDIR . "/squidGuard.conf"; - $slog .= "<b>$filename</b><br>"; - if (file_exists($filename)) { - $slog .= file_get_contents($filename); - $slog = str_replace("\n", "<br>", $slog); - $slog = str_replace("\t", " ", $slog); - $slog = "<tr><td>$slog</td></tr>"; - } - } - - $fld['description'] .= - "<INPUT class=formbtn type=submit value='Get log' name=Submit> - </tr><tr> - <td colspan='2'><table width='100%' class=tabcont cellSpacing=0 cellPadding=1 border=1>$slog</table>"; - "<table class=tabcont cellSpacing=0 cellPadding=0 border=1 width='100%'>$slog</table></td></tr>"; - } - $i++; - } -} + break; + case 'squid_config': + { + $filename = SQUID_CONFIGFILE; + $slog .= "<b>$filename</b><br>"; + if (file_exists($filename)) { + $slog .= file_get_contents($filename); + $slog = str_replace("\n", "<br>", $slog); + $slog = str_replace("\t", " ", $slog); + $slog = "<tr><td>$slog</td></tr>"; + } + } + break; + case 'squidguard_config': + { + $filename = SQUIDGUARD_WORKDIR . "/squidGuard.conf"; + $slog .= "<b>$filename</b><br>"; + if (file_exists($filename)) { + $slog .= file_get_contents($filename); + $slog = str_replace("\n", "<br>", $slog); + $slog = str_replace("\t", " ", $slog); + $slog = "<tr><td>$slog</td></tr>"; + } + } + break; + } # switch -// ----------------------------------------------------------------------------- -// squidguard_update_acl_dest -// ----------------------------------------------------------------------------- -function squidguard_update_acl_dest($acl_name, $post) { - global $config; - $post['dest'] = 'fig vam'; - foreach($post as $k => $p) - $s .= $k . '=' . $p; + $fld['description'] .= + "<INPUT class=formbtn type=submit value='Get log' name=Submit> + </tr><tr> + <td colspan='2'><table width='100%' class=tabcont cellSpacing=0 cellPadding=1 border=1>$slog</table>"; + } + $i++; + } } -// ----------------------------------------------------------------------------- -// make_grid_general_items -// ----------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- +# make_grid_general_items +# ----------------------------------------------------------------------------- function make_grid_general_items($id = '') { - global $config; - - $bg_color = "bgcolor='#dddddd'"; - $res = ''; - $res .= "<table width='100%'>"; - - if ($id == '') { - // Apply - $res .= "<tr $bg_color><td><big>For saving configuration YOU need click button 'Save' on bottom of page</big></td></tr> - <tr><td><big>After changing configuration squidGuard you must <b><span style='color: #800000;'>apply all changes</span></b></big></td></tr> - <tr><td><input name='submit' type='submit' value='Apply'></td></tr>"; - - // service state - $sgstate = "<span style='color: #800000;'>STOPPED</span>"; - if (is_service_running("squidGuard")) - $sgstate = "<span style='color: #008000;'>STARTED</span>"; - - if (is_blacklist_update_started()) { - $sgstate .= "<br><span style='color: #800000;'>Wait: began updating the blacklist.<br>New data will be available after some time.<br>After the upgrade, it is necessary to check the configuration.</span>"; - } - $res .= "<tr $bg_color><td><big>SquidGuard service state: <b>$sgstate</b></big></td></tr>"; - } else - if ($id == 'gui_log') { - if ($config['installedpackages']['squidguardgeneral']['config'][0]['view_gui_log'] == 'on') { - $log_content = sg_getlog(50); - $log_content = str_replace("\n","<br>", $log_content); - $res .= "<tr $bg_color><td><font size='-1'><b>Web GUI log (Latest 50)</b></font></td></tr>"; - $res .= "<tr $bg_color><td vAlign=top width='100%'><font size='-2'>$log_content</font></td></tr>"; - } + global $config; + $bg_color = "bgcolor='#dddddd'"; + $res = ''; + $res .= "<table width='100%'>"; + + if ($id === '') { + # Apply + $res .= "<tr $bg_color><td><big>For saving configuration YOU need click button 'Save' on bottom of page</big></td></tr> + <tr><td><big>After changing configuration squidGuard you must <b><span style='color: #800000;'>apply all changes</span></b></big></td></tr> + <tr><td><input name='submit' type='submit' value='Apply'></td></tr>"; + + # service state + $sgstate = "<span style='color: #800000;'>STOPPED</span>"; + if (is_service_running("squidGuard")) + $sgstate = "<span style='color: #008000;'>STARTED</span>"; + + if (is_blacklist_update_started()) + $sgstate .= "<br><span style='color: #800000;'>Wait: began updating the blacklist.<br>New data will be available after some time.<br>After the upgrade, it is necessary to check the configuration.</span>"; + $res .= "<tr $bg_color><td><big>SquidGuard service state: <b>$sgstate</b></big></td></tr>"; + } + elseif ($id === 'gui_log') { + if ($config['installedpackages']['squidguardgeneral']['config'][0]['view_gui_log'] == 'on') { + $log_content = sg_getlog(50); + $log_content = str_replace("\n","<br>", $log_content); + $res .= "<tr $bg_color><td><font size='-1'><b>Web GUI log (Latest 50)</b></font></td></tr>"; + $res .= "<tr $bg_color><td vAlign=top width='100%'><font size='-2'>$log_content</font></td></tr>"; } + } - $res .= "</table>"; - return $res; + $res .= "</table>"; + return $res; } -// ----------------------------------------------------------------------------- -// make_grid_blacklist -// ----------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- +# make_grid_blacklist +# ----------------------------------------------------------------------------- function make_grid_blacklist() { - $res = ''; - - // button 'Upload URL' - $res = "<br><input name='submit' value='" . BLACKLIST_BTN_URL . "' type='submit'>"; - // button 'Restore last blacklist' - $res .= " <input name='submit' value='" . BLACKLIST_BTN_LAST . "' type='submit'>"; - - return $res; + $res = ''; + # button 'Upload URL' and button 'Restore last blacklist' + $res = "<hr><input name='submit' value='" . BLACKLIST_BTN_URL . "' type='submit'>"; + $res .= " <input name='submit' value='" . BLACKLIST_BTN_LAST . "' type='submit'>"; + return $res; } -// ----------------------------------------------------------------------------- -// make_grid_controls -// ----------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- +# make_grid_controls +# ----------------------------------------------------------------------------- function make_grid_controls($type, $items, $enable_overtime = true) { - $res = ''; - $tbl = ''; - $color = ''; - $color2 = ''; - $x = 0; - - foreach($items as $item) { - if ($x == 0) { - $color = 'style="background-color: #dddddd;"'; - $color2 = ''; - $x = 1; - } else { - $color = ''; - $color2 = 'style="background-color: #dddddd;"'; - $x = 0; - } - - $name = $item['name']; - $upt_val = $item['upt_value']; - $ovt_val = $item['ovt_value']; - $description = $item['description']; - - $sel = "selected=\"selected\""; - $upt_A = $upt_B = $upt_C = $upt_D = ''; - switch($upt_val) { - case "allow": $upt_B = $sel; break; - case "white": $upt_C = $sel; break; - case "deny" : $upt_D = $sel; break; - default: $upt_A = $sel; break; - } - - $ovt_A = $ovt_B = $ovt_C= $ovt_D = ''; - switch($ovt_val) { - case "allow": $ovt_B = $sel; break; - case "white": $ovt_C = $sel; break; - case "deny" : $ovt_D = $sel; break; - default: $ovt_A = $sel; break; - } - unset($sel); - - $tbl .= "<tr>"; - // uptime table - $tnm = PREFLD_UPTIME . $name; - $tbl .= "<td $color></td>"; - $tbl .= "<td $color>$description [$name]</td>"; - $tbl .= "<td $color>access</td>"; - $tbl .= "<td $color><select id=$tnm name=\"$tnm\">"; - if (substr_count($name, "all") === 0) { - $tbl .= "<option value=none name=\"----\" $upt_A>----</option>"; - $tbl .= "<option value=allow name=\"allow\" $upt_B>allow</option>"; - $tbl .= "<option value=white name=\"white\" $upt_C>white</option>"; - $tbl .= "<option value=deny name=\"deny\" $upt_D>deny </option>"; - } else { - $tbl .= "<option value=allow name=\"allow\" $upt_B>allow</option>"; - $tbl .= "<option value=deny name=\"deny\" $upt_D>deny </option>"; - } - $tbl .= "</td>"; - - // overtime table - if ($enable_overtime) { - $tnm = PREFLD_OVERTIME . $name; - $tbl .= "<td $color></td>"; - $tbl .= "<td $color>$description [$name]</td>"; - $tbl .= "<td $color>access</td>"; - $tbl .= "<td $color><select id=$tnm name=\"$tnm\">"; - if (substr_count($name, "all") === 0) { - $tbl .= "<option value=none name=\"----\" $ovt_A>----</option>"; - $tbl .= "<option value=allow name=\"allow\" $ovt_B>allow</option>"; - $tbl .= "<option value=white name=\"white\" $ovt_C>white</option>"; - $tbl .= "<option value=deny name=\"deny\" $ovt_D>deny </option>"; - } else { - $tbl .= "<option value=allow name=\"allow\" $ovt_B>allow</option>"; - $tbl .= "<option value=deny name=\"deny\" $ovt_D>deny </option>"; - } - $tbl .= "</td>"; - } - $tbl .= "</tr>"; + $res = ''; + $tbl = ''; + $color = ''; + $color2 = ''; + $x = 0; + + foreach($items as $item) { + if ($x === 0) { + $color = ''; + $color2 = 'style="background-color: #dddddd;"'; + $x = 1; + } + else { + $color = 'style="background-color: #dddddd;"'; + $color2 = ''; + $x = 0; } - # header - if (!empty($tbl)) { - $thdr = ''; - $hdr1up = "Destinations in uptime"; - $hdr1ov = "Destinations in overtime"; - $hdr2up = "Select destinations for uptime rule."; - $hdr2ov = "Select destination for overtime rule."; - $hds3 = "Access option priority: 1-'white'(whitelist), 2-'deny'(blacklist), 3-'allow', 4-all rule('allow' ro 'deny')."; - if ($enable_overtime) { - $thdr = - "<tr><th colspan='4' align=middle>$hdr1up</th><th colspan='4' align=middle>$hdr1ov</th></tr>" . - "<tr><td colspan='4' align=middle>$hdr2up</td><td colspan='4' align=middle>$hdr2ov<br>If <b>'Time'</b> not defined, this part must be ignored</td></tr>" . - "<tr><td colspan='8' align=left><hr><b>$hds3</b><hr></td></tr>"; - // formatting - $thdr .= "<tr><td/><td width='35%'/><td/><td/><td/><td width='35%'/><td/><td/></tr>"; - } else { - $thdr = "<tr><th colspan='4' align=middle>$hdr1up</th></tr>" . - "<tr><td colspan='4' align=middle>$hdr2up</td></tr>" . - "<tr><td colspan='4' align=middle><hr><b>$hds3</b><hr></tr>"; - // formatting - $thdr .= "<tr><td width='5%'/><td/><td width='5%'/><td width='10%'/></tr>"; - } - - $res .= "<table cellspacing='0' width='100%'> $thdr $tbl </table>"; + $name = $item['name']; + $upt_val = $item['upt_value']; + $ovt_val = $item['ovt_value']; + $description = $item['description']; + + $sel = "selected=\"selected\""; + $upt_A = $upt_B = $upt_C = $upt_D = ''; + switch($upt_val) { + case "allow": $upt_B = $sel; break; + case "white": $upt_C = $sel; break; + case "deny" : $upt_D = $sel; break; + default: $upt_A = $sel; break; } - return $res; -} -// ----------------------------------------------------------------------------- -// check unique name -// ----------------------------------------------------------------------------- -function check_unique_name($module_id, $name, $log='') { - $res = true; - $count_names = 0; - $is_self ='notself'; - - $id = $_GET['id']; - if (!isset($id)) - $id = $_POST['id']; - - $name_list = get_pkg_items_list($module_id, 'name'); - $name_list_count = count($name_list); - - for($j=0; $j<$name_list_count; $j++) { - $val = $name_list[$j]; - if ($val == $name) { - $count_names++; - if ($j==$id) $is_self='self'; - } + $ovt_A = $ovt_B = $ovt_C= $ovt_D = ''; + switch($ovt_val) { + case "allow": $ovt_B = $sel; break; + case "white": $ovt_C = $sel; break; + case "deny" : $ovt_D = $sel; break; + default: $ovt_A = $sel; break; + } + unset($sel); + + $tbl .= "<tr>"; + # uptime table + $tnm = PREFLD_UPTIME . $name; + $tbl .= "<td $color></td>"; + $tbl .= "<td $color>$description [$name]</td>"; + $tbl .= "<td $color>access</td>"; + $tbl .= "<td $color><select id=$tnm name=\"$tnm\">"; + if (substr_count($name, "all") === 0) { + $tbl .= "<option value=none name=\"----\" $upt_A>----</option>"; + $tbl .= "<option value=white name=\"white\" $upt_C>white</option>"; + $tbl .= "<option value=deny name=\"deny\" $upt_D>deny </option>"; + $tbl .= "<option value=allow name=\"allow\" $upt_B>allow</option>"; + } + else { + $tbl .= "<option value=allow name=\"allow\" $upt_B>allow</option>"; + $tbl .= "<option value=deny name=\"deny\" $upt_D>deny </option>"; } + $tbl .= "</td>"; + + # overtime table + if ($enable_overtime) { + $tnm = PREFLD_OVERTIME . $name; + $tbl .= "<td $color></td>"; + $tbl .= "<td $color>$description [$name]</td>"; + $tbl .= "<td $color>access</td>"; + $tbl .= "<td $color><select id=$tnm name=\"$tnm\">"; + if (substr_count($name, "all") === 0) { + $tbl .= "<option value=none name=\"----\" $ovt_A>----</option>"; + $tbl .= "<option value=white name=\"white\" $ovt_C>white</option>"; + $tbl .= "<option value=deny name=\"deny\" $ovt_D>deny </option>"; + $tbl .= "<option value=allow name=\"allow\" $ovt_B>allow</option>"; + } + else { + $tbl .= "<option value=allow name=\"allow\" $ovt_B>allow</option>"; + $tbl .= "<option value=deny name=\"deny\" $ovt_D>deny </option>"; + } + $tbl .= "</td>"; + } + $tbl .= "</tr>"; + } - // if count names = 1, then check if add new record with this name(not valid) / or this is a self record(valid) - // else if count names > 1 - not valid - if ($count_names == 1) { - if ($id == name_list_count) { // this new record - $res = false; - $log = "*ID*"; - } - elseif($is_self != 'self') { // not self record - $res = false; - $log = '*NOT SELF*'; - } + # header + if (!empty($tbl)) { + $color = 'style="background-color: #dddddd;"'; + $thdr = ''; + $hdr1up = "<big>Destination rules</big>"; + $hdr1ov = "<big>Destination rules in overtime</big>"; + $hds3 = "Rules priority: [1]: 'white'(whitelist); [2]: 'deny'(blacklist); [3]: 'allow'; [4]: end-rule('allow' ro 'deny'). For permit of the exceptions from blacklist, use 'white' option."; + if ($enable_overtime) { + $thdr .= "<tr><td colspan='8' align=left>$hds3<hr></td></tr>"; + $thdr .= "<tr $color><th colspan='4' align=middle>$hdr1up</th><th colspan='4' align=middle>$hdr1ov</th></tr>"; + $thdr .= "<tr $color><td colspan='4' align=middle></td><td colspan='4' align=middle>If <b>'Time'</b> not defined, this ruleset will be ignored</td></tr>"; + # formatting + $thdr .= "<tr><td/><td width='35%'/><td/><td/><td/><td width='35%'/><td/><td/></tr>"; } - elseif($count_names > 1) { - $res = false; - $log = '*COUNT*'; + else { + $thdr .= "<tr><td colspan='4' align=left>$hds3<hr></tr>"; + $thdr .= "<tr $color><th colspan='4' align=middle>$hdr1up</th></tr>"; + # formatting + $thdr .= "<tr><td width='5%'/><td/><td width='5%'/><td width='10%'/></tr>"; } - $log .= " id=$id is_self=$is_self count=$name_list_count"; - return $res; -} -// ----------------------------------------------------------------------------- -// check date -// ----------------------------------------------------------------------------- -function check_date($date) { - $err = ''; - $val = trim($date); - // date or date range format: 'yyyy-mm-dd', 'yyyy-m-d', 'yyyy.mm.dd' 'yyyy.mm.dd-yyyy.mm.dd' - if (!eregi("^(([0-9]{4})|[*])\.(([0-9]{2})|[*])\.(([0-9]{2})|[*])$", $val) && - !eregi("^(([0-9]{4})|[*])\.(([0-9]{2})|[*])\.(([0-9]{2})|[*])-(([0-9]{4})|[*])\.(([0-9]{2})|[*])\.(([0-9]{2})|[*])$", $val)) - $err .= " Invalid date '$date'. - You mast use date or date range format: 'yyyy.mm.dd' and 'yyyy.mm.dd-yyyy.mm.dd'. - Any symbol in date can be set as * (any). Example: '*-10-01', '199*-*1-*1'."; - return $err; + $res .= "<table cellspacing='0' width='100%'> $thdr $tbl </table>"; + } + return $res; } -// ----------------------------------------------------------------------------- -// check time -// ----------------------------------------------------------------------------- -function check_time($time) { - $err = ''; - $val = trim($time); - - if (empty($val)) return ''; - - // time range format: 'HH:MM-HH:MM' - if (!eregi("^([0-9]{2})\:([0-9]{2})-([0-9]{2})\:([0-9]{2})$", $val)) - $err = "Invalid time range '$time'. You must use 'HH:MM-HH:MM' time range format. "; - else { - $tms = $time; - $tms = str_replace("-", "\n", $tms); - $tmsv = $tms; - $tms = str_replace(":", "", $tms); - $tms = explode("\n", $tms); - $tmsv = explode("\n", $tmsv); - if ($tms[0] >= 2400) - $err .= "Invalid time range var1='$tmsv[0]' must be < '24:00'. "; - if ($tms[1] > 2400) - $err .= "Invalid time range var2='$tmsv[1]' must be <= '24:00'. "; - if ($tms[0] >= $tms[1]) - $err .= "Invalid time range var1='$tmsv[0]' must be < var2='$tmsv[1]'. "; - } +# ----------------------------------------------------------------------------- +# check unique name +# ----------------------------------------------------------------------------- +function sg_check_unique_name($module_id, $name, $log='') { + $res = true; + $id = (isset($_GET['id'])) ? $_GET['id'] : $_POST['id']; + + $name_list = get_pkg_items_list($module_id, 'name'); + $name_list_count = count($name_list); + $name_val = (is_array($name_list)) ? array_count_values($name_list) : array(); + $count_names = $name_val[$name]; + + # if count names = 1, then check if add new record with this name(not valid) / or this is a self record(valid) + # else if count names > 1 - not valid + if ($count_names === 1) { + $nm_key = array_search($name, $name_list); + # if this new record + if ($id >= $name_list_count) { $res = false; } + # if not self record + elseif ($nm_key && (intval($id) !== intval($nm_key))) { $res = false; } + } + elseif($count_names > 1) $res = false; # bad - not unique - return $err; + return $res; } # ------------------------------------------------------------------------------ @@ -1081,31 +915,31 @@ function check_time($time) { # ------------------------------------------------------------------------------ function squidguard_install_command() { - if (!is_service_running("squidGuard")) { - sg_init(convert_pfxml_to_sgxml()); - sg_check_system(); - - // generate squidGuard blacklist entries file (check with squidGuard PORT) - $entries = array("ads", "aggressive", "audio-video", "drugs", "gambling", "hacking", - "mail", "porn", "proxy", "violence", "warez"); - file_put_contents(SQUIDGUARD_WORKDIR . SQUIDGUARD_BLK_ENTRIES, implode("\n", $entries)); - set_file_access(SQUIDGUARD_WORKDIR, OWNER_NAME, 0755); - set_file_access(SQUIDGUARD_DBHOME, OWNER_NAME, 0755); - - sg_reconfigure(); - } + if (!is_service_running("squidGuard")) { + sg_init(convert_pfxml_to_sgxml()); + sg_check_system(); + + # generate squidGuard blacklist entries file (check with squidGuard PORT) + $entries = array("ads", "aggressive", "audio-video", "drugs", "gambling", "hacking", + "mail", "porn", "proxy", "violence", "warez"); + file_put_contents(SQUIDGUARD_WORKDIR . SQUIDGUARD_BLK_ENTRIES, implode("\n", $entries)); + set_file_access(SQUIDGUARD_WORKDIR, OWNER_NAME, 0755); + set_file_access(SQUIDGUARD_DBHOME, OWNER_NAME, 0755); + + sg_reconfigure(); + } } function squidguard_deinstall_command() { - // remove entries from squid config - squid_reconfigure('remove redirector options'); - - // remove package and his depends - mwexec("pkg_delete squidGuard-1.2.0_1"); - mwexec("rm -rf " . SQUIDGUARD_WORKDIR); - // i known't, really need delete blacklist base? - mwexec("rm -rf " . SQUIDGUARD_DBHOME); - mwexec("/bin/rm -f " . SQUIDGUARD_CONFBASE . "/squidGuard*"); + # remove entries from squid config + squid_reconfigure('remove redirector options'); + + # remove package and his depends + mwexec("pkg_delete squidGuard-1.2.0_1"); + mwexec("rm -rf " . SQUIDGUARD_WORKDIR); + # i known't, really need delete blacklist base? + mwexec("rm -rf " . SQUIDGUARD_DBHOME); + mwexec("/bin/rm -f " . SQUIDGUARD_CONFBASE . "/squidGuard*"); } # ------------------------------------------------------------------------------ @@ -1113,122 +947,121 @@ function squidguard_deinstall_command() { # ------------------------------------------------------------------------------ function squidGuard_print_javascript() { - $javascript = ''; - - $xml = $_GET["xml"]; - if ($xml == "") - $xml = $_POST["xml"]; - - // squidguard_default.xml - if ($xml == "squidguard_default.xml") { - $javascript .= "\n<script language='JavaScript'>"; - $javascript .= "\n<!--"; - $javascript .= "\n document.iform.dest.disabled=1;"; - $javascript .= "\n//-->"; - $javascript .= "\n</script>"; - } // if - - // squidguard_acl.xml - if ($xml == "squidguard_acl.xml") { - $javascript .= "\n<script language='JavaScript'>"; - $javascript .= "\n<!--"; - $javascript .= "\n document.iform.dest.disabled=1;"; - // source JS part - $javascript .= "\n function on_updatecontrols() {"; - $javascript .= "\n document.iform.elements['order'].disabled = 0;"; - $javascript .= "\n document.iform.elements['order'].onfocus = on_orderfocus;"; - $javascript .= "\n }"; - $javascript .= "\n function on_orderfocus() {"; - $javascript .= "\n document.iform.elements['order'].blur();"; - $javascript .= "\n }"; - $javascript .= "\n function on_moveup() {"; - $javascript .= "\n var order = parseInt(document.iform.elements['order'].value)"; - $javascript .= "\n if (order > 0)"; - $javascript .= "\n order = order - 1;"; - $javascript .= "\n else order = 0;"; - $javascript .= "\n document.iform.elements['order'].value = order;"; - $javascript .= "\n }"; - $javascript .= "\n function on_movedown() {"; - $javascript .= "\n var order = parseInt(document.iform.elements['order'].value)"; - $javascript .= "\n if (order >= 0)"; - $javascript .= "\n order = order + 1;"; - $javascript .= "\n else order = 0;"; - $javascript .= "\n document.iform.elements['order'].value = order;"; - $javascript .= "\n }"; - $javascript .= "\n on_updatecontrols();"; - $javascript .= "\n "; - // end source JS part - $javascript .= "\n//-->"; - $javascript .= "\n</script>"; - - } // if - - if ($xml == "squidguard_time.xml") { - $javascript .= "\n<script language='JavaScript'>"; - $javascript .= "\n<!--"; - $javascript .= "\n function on_updatecontrols() {"; - $javascript .= "\n for (var i=0; i<99; i++) {"; - $javascript .= "\n var elm = document.iform.elements['timetype' + i];"; - $javascript .= "\n if (elm) {"; - $javascript .= "\n document.iform.elements['timetype' + i].onclick = on_updatecontrols;"; - $javascript .= "\n if (document.iform.elements['timetype' + i].value == 'weekly') {"; - $javascript .= "\n document.iform.elements['timedays' + i].disabled = 0;"; - $javascript .= "\n document.iform.elements['daterange' + i].disabled = 1;"; - $javascript .= "\n }"; - $javascript .= "\n else {"; - $javascript .= "\n document.iform.elements['timedays' + i].disabled = 1;"; - $javascript .= "\n document.iform.elements['daterange' + i].disabled = 0;"; - $javascript .= "\n }"; - $javascript .= "\n }"; - $javascript .= "\n }"; - $javascript .= "\n }"; - $javascript .= "\n on_updatecontrols();"; - $javascript .= "\n "; - $javascript .= "\n//-->"; - $javascript .= "\n</script>"; - } + $javascript = ''; + + $xml = ($_GET["xml"] !== '') ? $_GET["xml"] : $_POST["xml"]; + + # squidguard_default.xml + if ($xml === "squidguard_default.xml") { + $javascript .= "\n<script language='JavaScript'>"; + $javascript .= "\n<!--"; + $javascript .= "\n document.iform.dest.disabled=1;"; + $javascript .= "\n//-->"; + $javascript .= "\n</script>"; + } # if + + # squidguard_acl.xml + if ($xml === "squidguard_acl.xml") { + $javascript .= "\n<script language='JavaScript'>"; + $javascript .= "\n<!--"; + $javascript .= "\n document.iform.dest.disabled=1;"; + # source JS part + $javascript .= "\n function on_updatecontrols() {"; + $javascript .= "\n document.iform.elements['order'].disabled = 0;"; + $javascript .= "\n document.iform.elements['order'].onfocus = on_orderfocus;"; + $javascript .= "\n }"; + $javascript .= "\n function on_orderfocus() {"; + $javascript .= "\n document.iform.elements['order'].blur();"; + $javascript .= "\n }"; + $javascript .= "\n function on_moveup() {"; + $javascript .= "\n var order = parseInt(document.iform.elements['order'].value)"; + $javascript .= "\n if (order > 0)"; + $javascript .= "\n order = order - 1;"; + $javascript .= "\n else order = 0;"; + $javascript .= "\n document.iform.elements['order'].value = order;"; + $javascript .= "\n }"; + $javascript .= "\n function on_movedown() {"; + $javascript .= "\n var order = parseInt(document.iform.elements['order'].value)"; + $javascript .= "\n if (order >= 0)"; + $javascript .= "\n order = order + 1;"; + $javascript .= "\n else order = 0;"; + $javascript .= "\n document.iform.elements['order'].value = order;"; + $javascript .= "\n }"; + $javascript .= "\n on_updatecontrols();"; + $javascript .= "\n "; + # end source JS part + $javascript .= "\n//-->"; + $javascript .= "\n</script>"; + + } # if + + if ($xml === "squidguard_time.xml") { + $javascript .= "\n<script language='JavaScript'>"; + $javascript .= "\n<!--"; + $javascript .= "\n function on_updatecontrols() {"; + $javascript .= "\n for (var i=0; i<99; i++) {"; + $javascript .= "\n var elm = document.iform.elements['timetype' + i];"; + $javascript .= "\n if (elm) {"; + $javascript .= "\n document.iform.elements['timetype' + i].onclick = on_updatecontrols;"; + $javascript .= "\n if (document.iform.elements['timetype' + i].value == 'weekly') {"; + $javascript .= "\n document.iform.elements['timedays' + i].disabled = 0;"; + $javascript .= "\n document.iform.elements['daterange' + i].disabled = 1;"; + $javascript .= "\n }"; + $javascript .= "\n else {"; + $javascript .= "\n document.iform.elements['timedays' + i].disabled = 1;"; + $javascript .= "\n document.iform.elements['daterange' + i].disabled = 0;"; + $javascript .= "\n }"; + $javascript .= "\n }"; + $javascript .= "\n }"; + $javascript .= "\n }"; + $javascript .= "\n on_updatecontrols();"; + $javascript .= "\n "; + $javascript .= "\n//-->"; + $javascript .= "\n</script>"; + } - if ($xml == "squidguard_src.xml") { ### will deleted ### - $javascript .= "\n<script language='JavaScript'>"; - $javascript .= "\n<!--"; - $javascript .= "\n function on_updatecontrols() {"; - $javascript .= "\n document.iform.elements['order'].disabled = 0;"; - $javascript .= "\n document.iform.elements['order'].onfocus = on_orderfocus;"; - $javascript .= "\n }"; - $javascript .= "\n function on_orderfocus() {"; - $javascript .= "\n document.iform.elements['order'].blur();"; - $javascript .= "\n }"; - $javascript .= "\n function on_moveup() {"; - $javascript .= "\n var order = parseInt(document.iform.elements['order'].value)"; - $javascript .= "\n if (order > 0)"; - $javascript .= "\n order = order - 1;"; - $javascript .= "\n else order = 0;"; - $javascript .= "\n document.iform.elements['order'].value = order;"; - $javascript .= "\n }"; - $javascript .= "\n function on_movedown() {"; - $javascript .= "\n var order = parseInt(document.iform.elements['order'].value)"; - $javascript .= "\n if (order >= 0)"; - $javascript .= "\n order = order + 1;"; - $javascript .= "\n else order = 0;"; - $javascript .= "\n document.iform.elements['order'].value = order;"; - $javascript .= "\n }"; - $javascript .= "\n on_updatecontrols();"; - $javascript .= "\n "; - $javascript .= "\n//-->"; - $javascript .= "\n</script>"; - } + if ($xml === "squidguard_src.xml") { ### will deleted ### + $javascript .= "\n<script language='JavaScript'>"; + $javascript .= "\n<!--"; + $javascript .= "\n function on_updatecontrols() {"; + $javascript .= "\n document.iform.elements['order'].disabled = 0;"; + $javascript .= "\n document.iform.elements['order'].onfocus = on_orderfocus;"; + $javascript .= "\n }"; + $javascript .= "\n function on_orderfocus() {"; + $javascript .= "\n document.iform.elements['order'].blur();"; + $javascript .= "\n }"; + $javascript .= "\n function on_moveup() {"; + $javascript .= "\n var order = parseInt(document.iform.elements['order'].value)"; + $javascript .= "\n if (order > 0)"; + $javascript .= "\n order = order - 1;"; + $javascript .= "\n else order = 0;"; + $javascript .= "\n document.iform.elements['order'].value = order;"; + $javascript .= "\n }"; + $javascript .= "\n function on_movedown() {"; + $javascript .= "\n var order = parseInt(document.iform.elements['order'].value)"; + $javascript .= "\n if (order >= 0)"; + $javascript .= "\n order = order + 1;"; + $javascript .= "\n else order = 0;"; + $javascript .= "\n document.iform.elements['order'].value = order;"; + $javascript .= "\n }"; + $javascript .= "\n on_updatecontrols();"; + $javascript .= "\n "; + $javascript .= "\n//-->"; + $javascript .= "\n</script>"; + } - print($javascript); + print($javascript); } # ============================================================================== -# SquidGuard 2 +# Converter # ============================================================================== - -// ----------------------------------------------------------------- -// convert_pfxml_to_sgxml -// ----------------------------------------------------------------- +# convert_pfxml_to_sgxml +# ----------------------------------------------------------------- function convert_pfxml_to_sgxml() { + + capability_update_source(); + global $config; $sgxml = array(); $pfxml = $config['installedpackages'][MODULE_GENERAL]['config'][0]; @@ -1240,7 +1073,6 @@ function convert_pfxml_to_sgxml() { $sgxml[FLD_SGCONF_XML] = SQUIDGUARD_WORKDIR . SQUIDGUARD_CONFXML; $sgxml[FLD_ENABLED] = $pfxml[FLD_SQUIDGUARDENABLE]; $sgxml[FLD_BLACKLISTENABLED] = $pfxml[FLD_BLACKLIST]; - $sgxml[FLD_REDIRECTMODE] = $pfxml[FLD_REDIRECTMODE]; $sgxml[FLD_SOURCES] = convert_pfxml_to_sgxml_source($config); $sgxml[FLD_DESTINATIONS] = convert_pfxml_to_sgxml_destination($config); $sgxml[FLD_REWRITES] = convert_pfxml_to_sgxml_rewrite($config); @@ -1248,220 +1080,260 @@ function convert_pfxml_to_sgxml() { $sgxml[FLD_ACLS] = convert_pfxml_to_sgxml_acl($config); $sgxml[FLD_DEFAULT] = convert_pfxml_to_sgxml_default($config); - // transparent + # transparent $squidxml = $config['installedpackages']['squid']['config'][0]; if(isset($squidxml['transparent_proxy'])) { - $lanip = $config['interfaces']['lan']['ipaddr']; - $guiport = $config['system']['webgui']['port']; - $guiprotocol = $config['system']['webgui']['protocol']; - - $sgxml[FLD_SQUID_TRANSPARENT_MODE] = 'on'; - $sgxml[FLD_CURRENT_LAN_IP] = $lanip; - $sgxml[FLD_CURRENT_GUI_PORT] = $guiport; - $sgxml[FLD_CURRENT_GUI_PROTO] = $guiprotocol; + $lanip = $config['interfaces']['lan']['ipaddr']; + $guiport = $config['system']['webgui']['port']; + $guiprotocol = $config['system']['webgui']['protocol']; + + $sgxml[FLD_SQUID_TRANSPARENT_MODE] = 'on'; + $sgxml[FLD_CURRENT_LAN_IP] = $lanip; + $sgxml[FLD_CURRENT_GUI_PORT] = $guiport; + $sgxml[FLD_CURRENT_GUI_PROTO] = $guiprotocol; } else { - unset($sgxml[FLD_SQUID_TRANSPARENT_MODE]); - unset($sgxml[FLD_CURRENT_LAN_IP]); - unset($sgxml[FLD_CURRENT_GUI_PORT]); - unset($sgxml[FLD_CURRENT_GUI_PROTO]); + unset($sgxml[FLD_SQUID_TRANSPARENT_MODE]); + unset($sgxml[FLD_CURRENT_LAN_IP]); + unset($sgxml[FLD_CURRENT_GUI_PORT]); + unset($sgxml[FLD_CURRENT_GUI_PROTO]); } - // store cfg cache + # store cfg cache $cfg_xml = dump_xml_config($sgxml, FLD_SQUIDGUARD); file_put_contents($sgxml[FLD_SGCONF_XML], $cfg_xml); return $sgxml; } -// ----------------------------------------------------------------- -// convert_pfxml_to_sgxml_source -// sgxml_source: [name][ip][desc][log] -// ----------------------------------------------------------------- +# ----------------------------------------------------------------- +# convert_pfxml_to_sgxml_source +# sgxml_source: [name][ip][desc][log] +# ----------------------------------------------------------------- # Changes 04-01-2008 : # Source fields moved to ACL page. Source page - will remove # But in XML internal config nothing to change -# +# ----------------------------------------------------------------- +# Changes 21-07-2008 : +# Source IP and domain move to one field, added 'username'. function convert_pfxml_to_sgxml_source($pfconfig) { - $sgxml = array(); - $pfxml = $pfconfig['installedpackages']['squidguardacl']['config']; - if (is_array($pfxml)) { - foreach($pfxml as $pfx) { - $sgx = array(); - $sgx[FLD_NAME] = $pfx['name']; - $sgx[FLD_IP] = $pfx['iplist']; - $sgx[FLD_DOMAINS] = $pfx[FLD_DOMAINS]; - $sgx[FLD_LOG] = $pfx[FLD_ENABLELOG]; - $sgx[FLD_DESCRIPTION] = $pfx['description']; - $sgxml[FLD_ITEM][] = $sgx; - } - } - return $sgxml; + $sgxml = array(); + $pfxml = $pfconfig['installedpackages']['squidguardacl']['config']; + if (is_array($pfxml)) { + foreach($pfxml as $pfx) { + $sgx = array(); + $sgx[FLD_NAME] = $pfx['name']; + $sgx[FLD_SOURCE] = $pfx[FLD_SOURCE]; + $sgx[FLD_LOG] = $pfx[FLD_ENABLELOG]; + $sgx[FLD_DESCRIPTION] = $pfx['description']; + $sgxml[FLD_ITEM][] = $sgx; + } + } + return $sgxml; } -// ----------------------------------------------------------------- -// convert_pfxml_to_sgxml_destination -// sgxml_destination: [name][domains][expr][urls][redir][desc][log] -// ----------------------------------------------------------------- +# ----------------------------------------------------------------- +# convert_pfxml_to_sgxml_destination +# sgxml_destination: [name][domains][expr][urls][redir][desc][log] +# ----------------------------------------------------------------- function convert_pfxml_to_sgxml_destination($pfconfig) { - $sgxml = array(); - $pfxml = $pfconfig['installedpackages']['squidguarddest']['config']; - if (is_array($pfxml)) { - foreach($pfxml as $pfx) { - $sgx = array(); - $sgx[FLD_NAME] = $pfx['name']; - $sgx[FLD_URLS] = $pfx['urls']; - $sgx[FLD_DOMAINS] = $pfx[FLD_DOMAINS]; - $sgx[FLD_EXPRESSIONS] = $pfx['expressions']; - $sgx[FLD_REDIRECT] = $pfx[FLD_REDIRECT]; - $sgx[FLD_DESCRIPTION] = $pfx['description']; - $sgx[FLD_LOG] = $pfx[FLD_ENABLELOG]; - $sgxml[FLD_ITEM][] = $sgx; - } + $sgxml = array(); + $pfxml = $pfconfig['installedpackages']['squidguarddest']['config']; + if (is_array($pfxml)) { + foreach($pfxml as $pfx) { + $sgx = array(); + $sgx[FLD_NAME] = $pfx['name']; + $sgx[FLD_URLS] = $pfx['urls']; + $sgx[FLD_DOMAINS] = $pfx[FLD_DOMAINS]; + $sgx[FLD_EXPRESSIONS] = $pfx['expressions']; + $sgx[FLD_RMOD] = isset($pfx[FLD_RMOD]) ? $pfx[FLD_RMOD] : RMOD_NONE; + $sgx[FLD_REDIRECT] = $pfx[FLD_REDIRECT]; + $sgx[FLD_DESCRIPTION] = $pfx['description']; + $sgx[FLD_LOG] = $pfx[FLD_ENABLELOG]; + $sgxml[FLD_ITEM][] = $sgx; } - return $sgxml; + } + return $sgxml; } -// ----------------------------------------------------------------- -// convert_pfxml_to_sgxml_rewrite -// sgxml_rewrite: [name][desc][log][items(array): [targeturl][replaceto]] -// ----------------------------------------------------------------- +# ----------------------------------------------------------------- +# convert_pfxml_to_sgxml_rewrite +# sgxml_rewrite: [name][desc][log][items(array): [targeturl][replaceto]] +# ----------------------------------------------------------------- function convert_pfxml_to_sgxml_rewrite($pfconfig) { - $sgxml = array(); - - $pfxml = $pfconfig['installedpackages']['squidguardrewrite']['config']; - if (is_array($pfxml)) { - foreach($pfxml as $pfx) { - $sgx = array(); - $sgx[FLD_NAME] = $pfx['name']; - $sgx[FLD_DESCRIPTION] = $pfx['description']; - $sgx[FLD_LOG] = $pfx[FLD_ENABLELOG]; - - if (is_array($pfx['row'])) { - foreach($pfx['row'] as $pfx_row) { - $sgx_row = array(); - $sgx_row[FLD_TARGETURL] = $pfx_row['targeturl']; - $sgx_row[FLD_REPLACETO] = $pfx_row['replaceto']; - $sgx[FLD_ITEM][] = $sgx_row; - } - } + $sgxml = array(); - $sgxml[FLD_ITEM][] = $sgx; + $pfxml = $pfconfig['installedpackages']['squidguardrewrite']['config']; + if (is_array($pfxml)) { + foreach($pfxml as $pfx) { + $sgx = array(); + $sgx[FLD_NAME] = $pfx['name']; + $sgx[FLD_DESCRIPTION] = $pfx['description']; + $sgx[FLD_LOG] = $pfx[FLD_ENABLELOG]; + + if (is_array($pfx['row'])) { + foreach($pfx['row'] as $pfx_row) { + $sgx_row = array(); + $sgx_row[FLD_TARGETURL] = $pfx_row['targeturl']; + $sgx_row[FLD_REPLACETO] = $pfx_row['replaceto']; + $sgx[FLD_ITEM][] = $sgx_row; + } } + + $sgxml[FLD_ITEM][] = $sgx; } - return $sgxml; + } + return $sgxml; } -// ----------------------------------------------------------------- -// convert_pfxml_to_sgxml_time -// sgxml_time: [name][desc][items(array): [timetype][timedays][daterange][timerange]] -// ----------------------------------------------------------------- +# ----------------------------------------------------------------- +# convert_pfxml_to_sgxml_time +# sgxml_time: [name][desc][items(array): [timetype][timedays][daterange][timerange]] +# ----------------------------------------------------------------- function convert_pfxml_to_sgxml_time($pfconfig) { - $sgxml = array(); - - $pfxml = $pfconfig['installedpackages']['squidguardtime']['config']; - if (is_array($pfxml)) { - foreach($pfxml as $pfx) { - $sgx = array(); - $sgx[FLD_NAME] = $pfx[FLD_NAME]; - $sgx[FLD_DESCRIPTION] = $pfx[FLD_DESCRIPTION]; - - if (is_array($pfx['row'])) { - foreach($pfx['row'] as $pfx_row) { - $sgx_row = array(); - $sgx_row[FLD_TIMETYPE] = $pfx_row[FLD_TIMETYPE]; - $sgx_row[FLD_TIMEDAYS] = $pfx_row[FLD_TIMEDAYS]; - $sgx_row[FLD_DATERANGE] = $pfx_row[FLD_DATERANGE]; - $sgx_row[FLD_TIMERANGE] = $pfx_row[FLD_TIMERANGE]; - $sgx[FLD_ITEM][] = $sgx_row; - } - } + $sgxml = array(); - $sgxml[FLD_ITEM][] = $sgx; + $pfxml = $pfconfig['installedpackages']['squidguardtime']['config']; + if (is_array($pfxml)) { + foreach($pfxml as $pfx) { + $sgx = array(); + $sgx[FLD_NAME] = $pfx[FLD_NAME]; + $sgx[FLD_DESCRIPTION] = $pfx[FLD_DESCRIPTION]; + + if (is_array($pfx['row'])) { + foreach($pfx['row'] as $pfx_row) { + $sgx_row = array(); + $sgx_row[FLD_TIMETYPE] = $pfx_row[FLD_TIMETYPE]; + $sgx_row[FLD_TIMEDAYS] = $pfx_row[FLD_TIMEDAYS]; + $sgx_row[FLD_DATERANGE] = $pfx_row[FLD_DATERANGE]; + $sgx_row[FLD_TIMERANGE] = $pfx_row[FLD_TIMERANGE]; + $sgx[FLD_ITEM][] = $sgx_row; + } } + + $sgxml[FLD_ITEM][] = $sgx; } + } - return $sgxml; + return $sgxml; } -// ----------------------------------------------------------------- -// convert_pfxml_to_sgxml_acl -// sgxml_acl: [name][desc][disabled][timename][destname][redirect][rewritename][over_redirect][over_rewritename] -// ----------------------------------------------------------------- +# ----------------------------------------------------------------- +# convert_pfxml_to_sgxml_acl +# sgxml_acl: [name][desc][disabled][timename][destname][redirect][rewritename][over_redirect][over_rewritename] +# ----------------------------------------------------------------- function convert_pfxml_to_sgxml_acl($pfconfig) { - $sgxml = array(); - - $pfxml = $pfconfig['installedpackages']['squidguardacl']['config']; - if (is_array($pfxml)) { - foreach($pfxml as $pfx) { - $sgx = array(); - $sgx[FLD_NAME] = $pfx[FLD_NAME]; // [04-01-2008] new ver - $sgx[FLD_DESCRIPTION] = $pfx[FLD_DESCRIPTION]; - $sgx[FLD_DISABLED] = $pfx[FLD_DISABLED]; - $sgx[FLD_TIMENAME] = $pfx[FLD_TIME]; - $sgx[FLD_REDIRECT] = $pfx[FLD_REDIRECT]; - $sgx[FLD_REWRITENAME] = $pfx[FLD_REWRITE]; - $sgx[FLD_LOG] = $pfx[FLD_ENABLELOG]; - $sgx[FLD_NOTALLOWINGIP] = $pfx[FLD_NOTALLOWINGIP]; - - // for overtime - $sgx[FLD_OVERREDIRECT] = $pfx[FLD_OVERREDIRECT]; - $sgx[FLD_OVERREWRITENAME] = $pfx[FLD_OVERREWRITE]; - - // destinations - if (strpos($pfx['dest'], '[') === false) { - $sgx[FLD_DESTINATIONNAME] = trim($pfx['dest']); - $sgx[FLD_OVERDESTINATIONNAME] = ''; - } else { - $sgx[FLD_DESTINATIONNAME] = trim( substr($pfx['dest'], 0, strpos($pfx['dest'], '[')) ); - $sgx[FLD_OVERDESTINATIONNAME] = trim( strstr($pfx['dest'], '[') ); - $sgx[FLD_OVERDESTINATIONNAME] = trim( str_replace(']', '', $sgx[FLD_OVERDESTINATIONNAME]) ); - $sgx[FLD_OVERDESTINATIONNAME] = trim( str_replace('[', '', $sgx[FLD_OVERDESTINATIONNAME]) ); - } + $sgxml = array(); - // !ATTENTION! '!all' must be convert to 'none' - $sgx[FLD_DESTINATIONNAME] = str_replace("!all", "none", $sgx[FLD_DESTINATIONNAME]); - $sgx[FLD_OVERDESTINATIONNAME] = str_replace("!all", "none", $sgx[FLD_OVERDESTINATIONNAME]); + $pfxml = $pfconfig['installedpackages']['squidguardacl']['config']; + if (is_array($pfxml)) { + foreach($pfxml as $pfx) { + $sgx = array(); + $sgx[FLD_NAME] = $pfx[FLD_NAME]; # [04-01-2008] new ver + $sgx[FLD_DESCRIPTION] = $pfx[FLD_DESCRIPTION]; + $sgx[FLD_DISABLED] = $pfx[FLD_DISABLED]; + $sgx[FLD_TIMENAME] = $pfx[FLD_TIME]; + $sgx[FLD_REDIRECT] = $pfx[FLD_REDIRECT]; + $sgx[FLD_RMOD] = isset($pfx[FLD_RMOD]) ? $pfx[FLD_RMOD] : RMOD_NONE; + $sgx[FLD_REWRITENAME] = $pfx[FLD_REWRITE]; + $sgx[FLD_LOG] = $pfx[FLD_ENABLELOG]; + $sgx[FLD_NOTALLOWINGIP] = $pfx[FLD_NOTALLOWINGIP]; + + # for overtime + $sgx[FLD_OVERREDIRECT] = $pfx[FLD_REDIRECT]; # disabled ->- $pfx[FLD_OVERREDIRECT]; + $sgx[FLD_OVERREWRITENAME] = $pfx[FLD_OVERREWRITE]; + + # destinations + if (strpos($pfx['dest'], '[') === false) { + $sgx[FLD_DESTINATIONNAME] = trim($pfx['dest']); + $sgx[FLD_OVERDESTINATIONNAME] = ''; + } + else { + $sgx[FLD_DESTINATIONNAME] = trim( substr($pfx['dest'], 0, strpos($pfx['dest'], '[')) ); + $sgx[FLD_OVERDESTINATIONNAME] = trim( strstr($pfx['dest'], '[') ); + $sgx[FLD_OVERDESTINATIONNAME] = trim( str_replace(']', '', $sgx[FLD_OVERDESTINATIONNAME]) ); + $sgx[FLD_OVERDESTINATIONNAME] = trim( str_replace('[', '', $sgx[FLD_OVERDESTINATIONNAME]) ); + } - // if empty - adding 'none' - if (!$sgx[FLD_DESTINATIONNAME]) $sgx[FLD_DESTINATIONNAME] = "none"; - if (!$sgx[FLD_OVERDESTINATIONNAME]) $sgx[FLD_OVERDESTINATIONNAME] = "none"; + # !ATTENTION! '!all' must be convert to 'none' + $sgx[FLD_DESTINATIONNAME] = str_replace("!all", "none", $sgx[FLD_DESTINATIONNAME]); + $sgx[FLD_OVERDESTINATIONNAME] = str_replace("!all", "none", $sgx[FLD_OVERDESTINATIONNAME]); - $sgxml[FLD_ITEM][] = $sgx; - } + # if empty - adding 'none' + if (!$sgx[FLD_DESTINATIONNAME]) $sgx[FLD_DESTINATIONNAME] = "none"; + if (!$sgx[FLD_OVERDESTINATIONNAME]) $sgx[FLD_OVERDESTINATIONNAME] = "none"; + + $sgxml[FLD_ITEM][] = $sgx; } - return $sgxml; + } + return $sgxml; } -// ----------------------------------------------------------------- -// convert_pfxml_to_sgxml_default -// sgxml_acl: [name][desc][disabled][timename][destname][redirect][rewritename][over_redirect][over_rewritename] -// ----------------------------------------------------------------- +# ----------------------------------------------------------------- +# convert_pfxml_to_sgxml_default +# sgxml_acl: [name][desc][disabled][timename][destname][redirect][rewritename][over_redirect][over_rewritename] +# ----------------------------------------------------------------- function convert_pfxml_to_sgxml_default($pfconfig) { - $pfxml = $pfconfig['installedpackages']['squidguarddefault']['config']; - - $pfx = $pfxml[0]; - $sgx = array(); - $sgx[FLD_NAME] = 'default'; - $sgx[FLD_DESCRIPTION] = ''; - $sgx[FLD_DISABLED] = ''; - $sgx[FLD_TIMENAME] = $pfx[FLD_TIME]; - $sgx[FLD_REDIRECT] = $pfx[FLD_REDIRECT]; - $sgx[FLD_REWRITENAME] = $pfx[FLD_REWRITE]; - $sgx[FLD_LOG] = $pfx[FLD_ENABLELOG]; - $sgx[FLD_NOTALLOWINGIP] = $pfx[FLD_NOTALLOWINGIP]; - - // destinations - if (strpos($pfx['dest'], '[') === false) - $sgx[FLD_DESTINATIONNAME] = trim($pfx['dest']); - else $sgx[FLD_DESTINATIONNAME] = trim( substr($pfx['dest'], 0, strpos($pfx['dest'], '[')) ); - - // !ATTENTION! '!all' must be convert to 'none' - $sgx[FLD_DESTINATIONNAME] = str_replace("!all", "none", $sgx[FLD_DESTINATIONNAME]); - - // if empty - adding 'none' - if (!$sgx[FLD_DESTINATIONNAME]) $sgx[FLD_DESTINATIONNAME] = "none"; - - return $sgx; + $pfxml = $pfconfig['installedpackages']['squidguarddefault']['config']; + + $pfx = $pfxml[0]; + $sgx = array(); + $sgx[FLD_NAME] = 'default'; + $sgx[FLD_DESCRIPTION] = ''; + $sgx[FLD_DISABLED] = ''; + $sgx[FLD_TIMENAME] = $pfx[FLD_TIME]; + $sgx[FLD_RMOD] = isset($pfx[FLD_RMOD]) ? $pfx[FLD_RMOD] : RMOD_INT_ERRORPAGE; + $sgx[FLD_REDIRECT] = $pfx[FLD_REDIRECT]; + $sgx[FLD_REWRITENAME] = $pfx[FLD_REWRITE]; + $sgx[FLD_LOG] = $pfx[FLD_ENABLELOG]; + $sgx[FLD_NOTALLOWINGIP] = $pfx[FLD_NOTALLOWINGIP]; + + # destinations + if (strpos($pfx['dest'], '[') === false) + $sgx[FLD_DESTINATIONNAME] = trim($pfx['dest']); + else $sgx[FLD_DESTINATIONNAME] = trim( substr($pfx['dest'], 0, strpos($pfx['dest'], '[')) ); + + # !ATTENTION! '!all' must be convert to 'none' + $sgx[FLD_DESTINATIONNAME] = str_replace("!all", "none", $sgx[FLD_DESTINATIONNAME]); + + # if empty - adding 'none' + if (!$sgx[FLD_DESTINATIONNAME]) $sgx[FLD_DESTINATIONNAME] = "none"; + + return $sgx; } +# ================================================================= +# Capability +# ================================================================= +# capability update source from old config version +function capability_update_source() { + global $config; + $conf_changed = false; + + if (isset($config['installedpackages']['squidguardacl']['config'])) { + $tconf = &$config['installedpackages']['squidguardacl']['config']; + foreach($tconf as $key => $cfg) { + if (isset($cfg['iplist'])) { + $tconf[$key][FLD_SOURCE] .= " " . $cfg['iplist']; + unset($tconf[$key]['iplist']); + $conf_changed = true; + } + if (isset($cfg[FLD_DOMAINS])) { + $tconf[$key][FLD_SOURCE] .= " " . $cfg[FLD_DOMAINS]; + unset($tconf[$key][FLD_DOMAINS]); + $conf_changed = true; + } + } + + if ($conf_changed) write_config('Update squidguardacl config'); + } + +} +# ------------------------------------------------------------------ +# get_item_id - get item 'id' from get/post +# ------------------------------------------------------------------ +function get_item_id() +{ + return isset($_GET['id']) ? $_GET['id'] : $_POST['id']; +} +# ------------------------------------------------------------------ ?> |