From 5f35bc9bc1c062bdab2d01678c464a41759488bb Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 23 Nov 2003 22:25:46 +0000 Subject: my attempt to break things... git-svn-id: file:///svn/phpbb/trunk@4682 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/admin_board.php | 320 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 308 insertions(+), 12 deletions(-) (limited to 'phpBB/adm/admin_board.php') diff --git a/phpBB/adm/admin_board.php b/phpBB/adm/admin_board.php index 27cb9b04cd..cc71837402 100644 --- a/phpBB/adm/admin_board.php +++ b/phpBB/adm/admin_board.php @@ -113,7 +113,12 @@ while ($row = $db->sql_fetchrow($result)) if ($config_name == 'bump_interval' && $submit) { - $new['bump_interval'] = request_var('bump_interval', 0) . request_var('bump_type', ''); + $new['bump_interval'] = request_var('bump_interval', 2) . request_var('bump_type', 'd'); + } + + if ($config_name == 'email_function_name') + { + $new['email_function_name'] = (empty($new['email_function_name']) || !function_exists($new['email_function_name'])) ? 'mail' : str_replace(array('(', ')'), array('', ''), trim($new['email_function_name'])); } if ($mode == 'attach') @@ -172,6 +177,11 @@ while ($row = $db->sql_fetchrow($result)) } } +if ($mode == 'attach') +{ + perform_site_list(); +} + if ($submit) { add_log('admin', 'LOG_' . strtoupper($mode) . '_CONFIG'); @@ -180,7 +190,6 @@ if ($submit) { // Check Settings test_upload($error, $new['upload_dir'], false); -// test_upload($error, $new['upload_dir'] . '/thumbs', true); } if (!sizeof($error)) @@ -252,6 +261,15 @@ switch ($mode) $create_thumbnail_yes = ($new['img_create_thumbnail']) ? 'checked="checked"' : ''; $create_thumbnail_no = (!$new['img_create_thumbnail']) ? 'checked="checked"' : ''; + $secure_downloads_yes = ($new['secure_downloads']) ? 'checked="checked"' : ''; + $secure_downloads_no = (!$new['secure_downloads']) ? 'checked="checked"' : ''; + + $secure_allow_deny_yes = ($new['secure_allow_deny']) ? 'checked="checked"' : ''; + $secure_allow_deny_no = (!$new['secure_allow_deny']) ? 'checked="checked"' : ''; + + $secure_allow_empty_referer_yes = ($new['secure_allow_empty_referer']) ? 'checked="checked"' : ''; + $secure_allow_empty_referer_no = (!$new['secure_allow_empty_referer']) ? 'checked="checked"' : ''; + ?> @@ -282,6 +300,18 @@ switch ($mode) lang['MAX_ATTACHMENTS_PM'] ?>: + + lang['SECURE_DOWNLOADS']; ?>:
lang['SECURE_DOWNLOADS_EXPLAIN']; ?> + /> lang['YES']; ?>   /> lang['NO']; ?> + + + lang['SECURE_ALLOW_DENY']; ?>:
lang['SECURE_ALLOW_DENY_EXPLAIN']; ?> + /> lang['ORDER_ALLOW_DENY']; ?>   /> lang['ORDER_DENY_ALLOW']; ?> + + + lang['SECURE_EMPTY_REFERER']; ?>:
lang['SECURE_EMPTY_REFERER_EXPLAIN']; ?> + /> lang['YES']; ?>   /> lang['NO']; ?> + lang['SETTINGS_CAT_IMAGES']; ?> @@ -294,13 +324,13 @@ switch ($mode) @@ -313,7 +343,7 @@ switch ($mode) @@ -328,7 +358,86 @@ switch ($mode) lang['IMAGE_LINK_SIZE']; ?>:
lang['IMAGE_LINK_SIZE_EXPLAIN']; ?> px X px - + +    + + +sql_query($sql); + + $defined_ips = ''; + $ips = array(); + + while ($row = $db->sql_fetchrow($result)) + { + $value = ($row['site_ip']) ? $row['site_ip'] : $row['site_hostname']; + if ($value) + { + $defined_ips .= '' . $value . ''; + $ips[$row['site_id']] = $value; + } + } + $db->sql_freeresult($result); +?> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
lang['DEFINE_' . $allow_deny . '_IPS']; ?>
lang['DOWNLOAD_ADD_IPS_EXPLAIN']; ?>
lang['IP_HOSTNAME']; ?>:
lang['EXCLUDE_FROM_' . $allow_deny . '_IP']; ?>:
lang['EXCLUDE_ENTERED_IP']; ?>		 lang['YES']; ?>   lang['NO']; ?>
   
lang['REMOVE_' . $allow_deny . '_IPS']; ?>
lang['DOWNLOAD_REMOVE_IPS_EXPLAIN']; ?>
lang['IP_HOSTNAME']; ?>:
 
lang['NO_IPS_DEFINED']; ?>
lang['BOARD_EMAIL_FORM']; ?>:
lang['BOARD_EMAIL_FORM_EXPLAIN']; ?> /> lang['ENABLED']; ?>   /> lang['DISABLED']; ?> + + lang['EMAIL_FUNCTION_NAME']; ?>:
lang['EMAIL_FUNCTION_NAME_EXPLAIN']; ?> + + lang['EMAIL_PACKAGE_SIZE']; ?>:
lang['EMAIL_PACKAGE_SIZE_EXPLAIN']; ?> @@ -971,11 +1084,17 @@ switch ($mode) break; } + if ($mode != 'attach') + { ?>    - + + + sql_query($sql); + + if ($row = $db->sql_fetchrow($result)) + { + $iplist_tmp = array(); + $hostlist_tmp = array(); + do + { + if ($row['site_ip']) + { + $iplist_tmp[] = "'" . $row['site_ip'] . "'"; + } + else if ($row['site_hostname']) + { + $hostlist_tmp[] = "'" . $row['site_hostname'] . "'"; + } + break; + } + while ($row = $db->sql_fetchrow($result)); + + $iplist = array_unique(array_diff($iplist, $iplist_tmp)); + $hostlist = array_unique(array_diff($hostlist, $hostlist_tmp)); + unset($iplist_tmp); + unset($hostlist_tmp); + } + + if (sizeof($iplist)) + { + foreach ($iplist as $ip_entry) + { + $sql = 'INSERT INTO ' . SITELIST_TABLE . " (site_ip, ip_exclude) + VALUES ($ip_entry, $ip_exclude)"; + $db->sql_query($sql); + } + } + + if (sizeof($hostlist)) + { + foreach ($hostlist as $host_entry) + { + $sql = 'INSERT INTO ' . SITELIST_TABLE . ' (site_hostname, ip_exclude) + VALUES ($host_entry, $ip_exclude)"; + $db->sql_query($sql); + } + } + + if (!empty($ip_list_log)) + { + // Update log + $log_entry = ($ip_exclude) ? 'LOG_DOWNLOAD_EXCLUDE_IP' : 'LOG_DOWNLOAD_IP'; + add_log('admin', $log_entry, $ip_list_log); + } + + trigger_error($user->lang['SECURE_DOWNLOAD_UPDATE_SUCESSFUL']); + } + else if (isset($_POST['unsecuresubmit'])) + { + $unip_sql = implode(', ', array_map('intval', $_POST['unip'])); + + if ($unip_sql != '') + { + $l_unip_list = ''; + + // Grab details of ips for logging information later + $sql = 'SELECT site_ip, site_hostname + FROM ' . SITELIST_TABLE . " + WHERE site_id IN ($unip_sql)"; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + $l_unip_list .= (($l_unip_list != '') ? ', ' : '') . (($row['site_ip']) ? $row['site_ip'] : $row['site_hostname']); + } + + $sql = 'DELETE FROM ' . SITELIST_TABLE . " + WHERE site_id IN ($unip_sql)"; + $db->sql_query($sql); + + add_log('admin', 'LOG_DOWNLOAD_REMOVE_IP', $l_unip_list); + } + + trigger_error($user->lang['SECURE_DOWNLOAD_UPDATE_SUCESSFUL']); + } +} + ?> \ No newline at end of file -- cgit v1.2.1