diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-12-25 14:47:57 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-12-25 14:47:57 +0000 |
| commit | 5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730 (patch) | |
| tree | a083f062a59bdacfe913d1cc84d96813037185ec /phpBB/adm/index.php | |
| parent | ddfef8d832e84eca694bc6d98f2d4ec3ca480142 (diff) | |
| download | forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar.gz forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar.bz2 forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar.xz forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.zip | |
add nils' request and super globals class
rename request:: to phpbb_request::
git-svn-id: file:///svn/phpbb/trunk@9230 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/index.php')
| -rw-r--r-- | phpBB/adm/index.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 89eda2b602..14d5da9882 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -136,7 +136,7 @@ function adm_page_header($page_title) 'ICON_MOVE_UP' => '<img src="' . PHPBB_ADMIN_PATH . 'images/icon_up.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />', 'ICON_MOVE_UP_DISABLED' => '<img src="' . PHPBB_ADMIN_PATH . 'images/icon_up_disabled.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />', 'ICON_MOVE_DOWN' => '<img src="' . PHPBB_ADMIN_PATH . 'images/icon_down.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />', - 'ICON_MOVE_DOWN_DISABLED' => '<img src="' . PHPBB_ADMIN_PATH . 'images/icon_down_disabled.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />', + 'ICON_MOVE_DOWN_DISABLED' => '<img src="' . PHPBB_ADMIN_PATH . 'images/icon_down_disabled.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />', 'ICON_EDIT' => '<img src="' . PHPBB_ADMIN_PATH . 'images/icon_edit.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />', 'ICON_EDIT_DISABLED' => '<img src="' . PHPBB_ADMIN_PATH . 'images/icon_edit_disabled.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />', 'ICON_DELETE' => '<img src="' . PHPBB_ADMIN_PATH . 'images/icon_delete.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />', @@ -175,7 +175,7 @@ function adm_page_footer($copyright_html = true) $mtime = explode(' ', microtime()); $totaltime = $mtime[0] + $mtime[1] - $starttime; - if (request::variable('explain', false) && $auth->acl_get('a_') && defined('DEBUG_EXTRA') && method_exists($db, 'sql_report')) + if (phpbb_request::variable('explain', false) && $auth->acl_get('a_') && defined('DEBUG_EXTRA') && method_exists($db, 'sql_report')) { $db->sql_report('display'); } @@ -307,7 +307,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) case 'select': case 'custom': - + $return = ''; if (isset($vars['method'])) @@ -346,7 +346,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) { $args = array($new[$config_key], $key); } - + $return = call_user_func_array($call, $args); if ($tpl_type[0] == 'select') @@ -383,19 +383,19 @@ function validate_config_vars($config_vars, &$cfg_array, &$error) $type = 0; $min = 1; $max = 2; - + foreach ($config_vars as $config_name => $config_definition) { if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false) { continue; } - + if (!isset($config_definition['validate'])) { continue; } - + $validator = explode(':', $config_definition['validate']); // Validate a bit. ;) (0 = type, 1 = min, 2= max) @@ -554,14 +554,14 @@ function validate_config_vars($config_vars, &$cfg_array, &$error) function validate_range($value_ary, &$error) { global $user; - + $column_types = array( 'BOOL' => array('php_type' => 'int', 'min' => 0, 'max' => 1), 'USINT' => array('php_type' => 'int', 'min' => 0, 'max' => 65535), 'UINT' => array('php_type' => 'int', 'min' => 0, 'max' => (int) 0x7fffffff), 'INT' => array('php_type' => 'int', 'min' => (int) 0x80000000, 'max' => (int) 0x7fffffff), 'TINT' => array('php_type' => 'int', 'min' => -128, 'max' => 127), - + 'VCHAR' => array('php_type' => 'string', 'min' => 0, 'max' => 255), ); foreach ($value_ary as $value) @@ -588,7 +588,7 @@ function validate_range($value_ary, &$error) } break; - case 'int': + case 'int': $min = (isset($column[1])) ? max($column[1],$type['min']) : $type['min']; $max = (isset($column[2])) ? min($column[2],$type['max']) : $type['max']; if ($value['value'] < $min) |