diff --git a/phpBB/.htaccess b/phpBB/.htaccess deleted file mode 100644 index 41fb129175..0000000000 --- a/phpBB/.htaccess +++ /dev/null @@ -1,9 +0,0 @@ - -Order Allow,Deny -Deny from All - - - -Order Allow,Deny -Deny from All - diff --git a/phpBB/adm/images/arrow_down.gif b/phpBB/adm/images/arrow_down.gif deleted file mode 100644 index e45c365ecc..0000000000 Binary files a/phpBB/adm/images/arrow_down.gif and /dev/null differ diff --git a/phpBB/adm/images/arrow_left.gif b/phpBB/adm/images/arrow_left.gif deleted file mode 100644 index 076a5596f1..0000000000 Binary files a/phpBB/adm/images/arrow_left.gif and /dev/null differ diff --git a/phpBB/adm/images/arrow_right.gif b/phpBB/adm/images/arrow_right.gif deleted file mode 100644 index c5827a401f..0000000000 Binary files a/phpBB/adm/images/arrow_right.gif and /dev/null differ diff --git a/phpBB/adm/images/arrow_up.gif b/phpBB/adm/images/arrow_up.gif deleted file mode 100644 index 38b5a62c17..0000000000 Binary files a/phpBB/adm/images/arrow_up.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_button.gif b/phpBB/adm/images/bg_button.gif deleted file mode 100644 index 03172ff5c6..0000000000 Binary files a/phpBB/adm/images/bg_button.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_hash1.gif b/phpBB/adm/images/bg_hash1.gif deleted file mode 100644 index 61163679a8..0000000000 Binary files a/phpBB/adm/images/bg_hash1.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_hash2.gif b/phpBB/adm/images/bg_hash2.gif deleted file mode 100644 index d31840361c..0000000000 Binary files a/phpBB/adm/images/bg_hash2.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_hash3.gif b/phpBB/adm/images/bg_hash3.gif deleted file mode 100644 index 40bc7e1b5c..0000000000 Binary files a/phpBB/adm/images/bg_hash3.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_hash4.gif b/phpBB/adm/images/bg_hash4.gif deleted file mode 100644 index 54e7f0019f..0000000000 Binary files a/phpBB/adm/images/bg_hash4.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_header.gif b/phpBB/adm/images/bg_header.gif deleted file mode 100644 index b95bf3ba95..0000000000 Binary files a/phpBB/adm/images/bg_header.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_header.jpg b/phpBB/adm/images/bg_header.jpg deleted file mode 100644 index 5ecec5360b..0000000000 Binary files a/phpBB/adm/images/bg_header.jpg and /dev/null differ diff --git a/phpBB/adm/images/bg_tabs1.gif b/phpBB/adm/images/bg_tabs1.gif deleted file mode 100644 index d129365661..0000000000 Binary files a/phpBB/adm/images/bg_tabs1.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_tabs2.gif b/phpBB/adm/images/bg_tabs2.gif deleted file mode 100644 index 0aace9b6db..0000000000 Binary files a/phpBB/adm/images/bg_tabs2.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_tabs_alt1.gif b/phpBB/adm/images/bg_tabs_alt1.gif deleted file mode 100644 index 335a72c711..0000000000 Binary files a/phpBB/adm/images/bg_tabs_alt1.gif and /dev/null differ diff --git a/phpBB/adm/images/bg_tabs_alt2.gif b/phpBB/adm/images/bg_tabs_alt2.gif deleted file mode 100644 index a2142d5432..0000000000 Binary files a/phpBB/adm/images/bg_tabs_alt2.gif and /dev/null differ diff --git a/phpBB/adm/images/cellpic3.gif b/phpBB/adm/images/cellpic3.gif deleted file mode 100644 index be46fc6fcc..0000000000 Binary files a/phpBB/adm/images/cellpic3.gif and /dev/null differ diff --git a/phpBB/adm/images/corners_left.gif b/phpBB/adm/images/corners_left.gif deleted file mode 100644 index bacd276495..0000000000 Binary files a/phpBB/adm/images/corners_left.gif and /dev/null differ diff --git a/phpBB/adm/images/corners_left2.gif b/phpBB/adm/images/corners_left2.gif deleted file mode 100644 index 206e50368d..0000000000 Binary files a/phpBB/adm/images/corners_left2.gif and /dev/null differ diff --git a/phpBB/adm/images/corners_right.gif b/phpBB/adm/images/corners_right.gif deleted file mode 100644 index bcb5bd7d14..0000000000 Binary files a/phpBB/adm/images/corners_right.gif and /dev/null differ diff --git a/phpBB/adm/images/corners_right2.gif b/phpBB/adm/images/corners_right2.gif deleted file mode 100644 index 0ba66d50b2..0000000000 Binary files a/phpBB/adm/images/corners_right2.gif and /dev/null differ diff --git a/phpBB/adm/images/file_conflict.gif b/phpBB/adm/images/file_conflict.gif deleted file mode 100644 index 4458c4ff23..0000000000 Binary files a/phpBB/adm/images/file_conflict.gif and /dev/null differ diff --git a/phpBB/adm/images/file_modified.gif b/phpBB/adm/images/file_modified.gif deleted file mode 100644 index 17e8f976c3..0000000000 Binary files a/phpBB/adm/images/file_modified.gif and /dev/null differ diff --git a/phpBB/adm/images/file_new.gif b/phpBB/adm/images/file_new.gif deleted file mode 100644 index d0ec75876d..0000000000 Binary files a/phpBB/adm/images/file_new.gif and /dev/null differ diff --git a/phpBB/adm/images/file_new_conflict.gif b/phpBB/adm/images/file_new_conflict.gif deleted file mode 100644 index 84efde4faa..0000000000 Binary files a/phpBB/adm/images/file_new_conflict.gif and /dev/null differ diff --git a/phpBB/adm/images/file_not_modified.gif b/phpBB/adm/images/file_not_modified.gif deleted file mode 100644 index 8f9b3d3839..0000000000 Binary files a/phpBB/adm/images/file_not_modified.gif and /dev/null differ diff --git a/phpBB/adm/images/file_up_to_date.gif b/phpBB/adm/images/file_up_to_date.gif deleted file mode 100644 index c372342646..0000000000 Binary files a/phpBB/adm/images/file_up_to_date.gif and /dev/null differ diff --git a/phpBB/adm/images/gradient2b.gif b/phpBB/adm/images/gradient2b.gif deleted file mode 100644 index a8107659e2..0000000000 Binary files a/phpBB/adm/images/gradient2b.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_delete.gif b/phpBB/adm/images/icon_delete.gif deleted file mode 100644 index 57962d5172..0000000000 Binary files a/phpBB/adm/images/icon_delete.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_delete_disabled.gif b/phpBB/adm/images/icon_delete_disabled.gif deleted file mode 100644 index da55bbbe44..0000000000 Binary files a/phpBB/adm/images/icon_delete_disabled.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_down.gif b/phpBB/adm/images/icon_down.gif deleted file mode 100644 index 793db26cde..0000000000 Binary files a/phpBB/adm/images/icon_down.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_down_disabled.gif b/phpBB/adm/images/icon_down_disabled.gif deleted file mode 100644 index 3ba36975b4..0000000000 Binary files a/phpBB/adm/images/icon_down_disabled.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_edit.gif b/phpBB/adm/images/icon_edit.gif deleted file mode 100644 index c95cf98eb9..0000000000 Binary files a/phpBB/adm/images/icon_edit.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_edit_disabled.gif b/phpBB/adm/images/icon_edit_disabled.gif deleted file mode 100644 index ac96b0e6dc..0000000000 Binary files a/phpBB/adm/images/icon_edit_disabled.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_folder.gif b/phpBB/adm/images/icon_folder.gif deleted file mode 100644 index 82ceee0784..0000000000 Binary files a/phpBB/adm/images/icon_folder.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_folder_link.gif b/phpBB/adm/images/icon_folder_link.gif deleted file mode 100644 index 01fb1c4e1e..0000000000 Binary files a/phpBB/adm/images/icon_folder_link.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_folder_lock.gif b/phpBB/adm/images/icon_folder_lock.gif deleted file mode 100644 index 450bf28c3c..0000000000 Binary files a/phpBB/adm/images/icon_folder_lock.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_subfolder.gif b/phpBB/adm/images/icon_subfolder.gif deleted file mode 100644 index 5e97bc94ce..0000000000 Binary files a/phpBB/adm/images/icon_subfolder.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_sync.gif b/phpBB/adm/images/icon_sync.gif deleted file mode 100644 index 16223dfd9a..0000000000 Binary files a/phpBB/adm/images/icon_sync.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_sync_disabled.gif b/phpBB/adm/images/icon_sync_disabled.gif deleted file mode 100644 index 39985045c8..0000000000 Binary files a/phpBB/adm/images/icon_sync_disabled.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_trace.gif b/phpBB/adm/images/icon_trace.gif deleted file mode 100644 index 5c622e9a9d..0000000000 Binary files a/phpBB/adm/images/icon_trace.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_up.gif b/phpBB/adm/images/icon_up.gif deleted file mode 100644 index 7daa95c07e..0000000000 Binary files a/phpBB/adm/images/icon_up.gif and /dev/null differ diff --git a/phpBB/adm/images/icon_up_disabled.gif b/phpBB/adm/images/icon_up_disabled.gif deleted file mode 100644 index 2797192574..0000000000 Binary files a/phpBB/adm/images/icon_up_disabled.gif and /dev/null differ diff --git a/phpBB/adm/images/innerbox_bg.gif b/phpBB/adm/images/innerbox_bg.gif deleted file mode 100644 index 460526f0ba..0000000000 Binary files a/phpBB/adm/images/innerbox_bg.gif and /dev/null differ diff --git a/phpBB/adm/images/no_avatar.gif b/phpBB/adm/images/no_avatar.gif deleted file mode 100644 index 80539c8c71..0000000000 Binary files a/phpBB/adm/images/no_avatar.gif and /dev/null differ diff --git a/phpBB/adm/images/no_image.png b/phpBB/adm/images/no_image.png deleted file mode 100644 index 1061ee3b8f..0000000000 Binary files a/phpBB/adm/images/no_image.png and /dev/null differ diff --git a/phpBB/adm/images/phpbb_logo.gif b/phpBB/adm/images/phpbb_logo.gif deleted file mode 100644 index 239993182b..0000000000 Binary files a/phpBB/adm/images/phpbb_logo.gif and /dev/null differ diff --git a/phpBB/adm/images/progress_bar.gif b/phpBB/adm/images/progress_bar.gif deleted file mode 100755 index 1ae265152c..0000000000 Binary files a/phpBB/adm/images/progress_bar.gif and /dev/null differ diff --git a/phpBB/adm/images/spacer.gif b/phpBB/adm/images/spacer.gif deleted file mode 100644 index cd29009a65..0000000000 Binary files a/phpBB/adm/images/spacer.gif and /dev/null differ diff --git a/phpBB/adm/images/toggle.gif b/phpBB/adm/images/toggle.gif deleted file mode 100644 index 8af6861bd1..0000000000 Binary files a/phpBB/adm/images/toggle.gif and /dev/null differ diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php deleted file mode 100644 index 0932e01aa1..0000000000 --- a/phpBB/adm/index.php +++ /dev/null @@ -1,511 +0,0 @@ -session_begin(); -$auth->acl($user->data); -$user->setup('acp/common'); -// End session management - -// Have they authenticated (again) as an admin for this session? -if (!isset($user->data['session_admin']) || !$user->data['session_admin']) -{ - login_box('', $user->lang['LOGIN_ADMIN_CONFIRM'], $user->lang['LOGIN_ADMIN_SUCCESS'], true, false); -} - -// Is user any type of admin? No, then stop here, each script needs to -// check specific permissions but this is a catchall -if (!$auth->acl_get('a_')) -{ - trigger_error('NO_ADMIN'); -} - -// We define the admin variables now, because the user is now able to use the admin related features... -define('IN_ADMIN', true); -$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : './'; - -// Some oft used variables -$safe_mode = (@ini_get('safe_mode') == '1' || @strtolower(ini_get('safe_mode')) === 'on') ? true : false; -$file_uploads = (@ini_get('file_uploads') == '1' || strtolower(@ini_get('file_uploads')) === 'on') ? true : false; -$module_id = request_var('i', ''); -$mode = request_var('mode', ''); - -// Set custom template for admin area -$template->set_custom_template($phpbb_admin_path . 'style', 'admin'); -$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style'); - -// the acp template is never stored in the database -$user->theme['template_storedb'] = false; - -// Instantiate new module -$module = new p_master(); - -// Instantiate module system and generate list of available modules -$module->list_modules('acp'); - -// Select the active module -$module->set_active($module_id, $mode); - -// Assign data to the template engine for the list of modules -// We do this before loading the active module for correct menu display in trigger_error -$module->assign_tpl_vars(append_sid("{$phpbb_admin_path}index.$phpEx")); - -// Load and execute the relevant module -$module->load_active(); - -// Generate the page -adm_page_header($module->get_page_title()); - -$template->set_filenames(array( - 'body' => $module->get_tpl_name(), -)); - -adm_page_footer(); - -/** -* Header for acp pages -*/ -function adm_page_header($page_title) -{ - global $config, $db, $user, $template; - global $phpbb_root_path, $phpbb_admin_path, $phpEx, $SID, $_SID; - - if (defined('HEADER_INC')) - { - return; - } - - define('HEADER_INC', true); - - // gzip_compression - if ($config['gzip_compress']) - { - if (@extension_loaded('zlib') && !headers_sent()) - { - ob_start('ob_gzhandler'); - } - } - - $template->assign_vars(array( - 'PAGE_TITLE' => $page_title, - 'USERNAME' => $user->data['username'], - - 'SID' => $SID, - '_SID' => $_SID, - 'SESSION_ID' => $user->session_id, - 'ROOT_PATH' => $phpbb_admin_path, - - 'U_LOGOUT' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout'), - 'U_ADM_INDEX' => append_sid("{$phpbb_admin_path}index.$phpEx"), - 'U_INDEX' => append_sid("{$phpbb_root_path}index.$phpEx"), - - 'T_IMAGES_PATH' => "{$phpbb_root_path}images/", - 'T_SMILIES_PATH' => "{$phpbb_root_path}{$config['smilies_path']}/", - 'T_AVATAR_PATH' => "{$phpbb_root_path}{$config['avatar_path']}/", - 'T_AVATAR_GALLERY_PATH' => "{$phpbb_root_path}{$config['avatar_gallery_path']}/", - 'T_ICONS_PATH' => "{$phpbb_root_path}{$config['icons_path']}/", - 'T_RANKS_PATH' => "{$phpbb_root_path}{$config['ranks_path']}/", - 'T_UPLOAD_PATH' => "{$phpbb_root_path}{$config['upload_path']}/", - - 'ICON_MOVE_UP' => '' . $user->lang['MOVE_UP'] . '', - 'ICON_MOVE_UP_DISABLED' => '' . $user->lang['MOVE_UP'] . '', - 'ICON_MOVE_DOWN' => '' . $user->lang['MOVE_DOWN'] . '', - 'ICON_MOVE_DOWN_DISABLED' => '' . $user->lang['MOVE_DOWN'] . '', - 'ICON_EDIT' => '' . $user->lang['EDIT'] . '', - 'ICON_EDIT_DISABLED' => '' . $user->lang['EDIT'] . '', - 'ICON_DELETE' => '' . $user->lang['DELETE'] . '', - 'ICON_DELETE_DISABLED' => '' . $user->lang['DELETE'] . '', - 'ICON_SYNC' => '' . $user->lang['RESYNC'] . '', - 'ICON_SYNC_DISABLED' => '' . $user->lang['RESYNC'] . '', - - 'S_USER_LANG' => $user->lang['USER_LANG'], - 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], - 'S_CONTENT_ENCODING' => 'UTF-8', - 'S_CONTENT_FLOW_BEGIN' => ($user->lang['DIRECTION'] == 'ltr') ? 'left' : 'right', - 'S_CONTENT_FLOW_END' => ($user->lang['DIRECTION'] == 'ltr') ? 'right' : 'left', - )); - - // application/xhtml+xml not used because of IE - header('Content-type: text/html; charset=UTF-8'); - - header('Cache-Control: private, no-cache="set-cookie"'); - header('Expires: 0'); - header('Pragma: no-cache'); - - return; -} - -/** -* Page footer for acp pages -*/ -function adm_page_footer($copyright_html = true) -{ - global $db, $config, $template, $user, $auth, $cache; - global $starttime, $phpbb_root_path, $phpbb_admin_path, $phpEx; - - // Output page creation time - if (defined('DEBUG')) - { - $mtime = explode(' ', microtime()); - $totaltime = $mtime[0] + $mtime[1] - $starttime; - - if (!empty($_REQUEST['explain']) && $auth->acl_get('a_') && defined('DEBUG_EXTRA') && method_exists($db, 'sql_report')) - { - $db->sql_report('display'); - } - - $debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($config['gzip_compress']) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime); - - if ($auth->acl_get('a_') && defined('DEBUG_EXTRA')) - { - if (function_exists('memory_get_usage')) - { - if ($memory_usage = memory_get_usage()) - { - global $base_memory_usage; - $memory_usage -= $base_memory_usage; - $memory_usage = get_formatted_filesize($memory_usage); - - $debug_output .= ' | Memory Usage: ' . $memory_usage; - } - } - - $debug_output .= ' | Explain'; - } - } - - $template->assign_vars(array( - 'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : '', - 'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', - 'S_COPYRIGHT_HTML' => $copyright_html, - 'VERSION' => $config['version']) - ); - - $template->display('body'); - - garbage_collection(); - exit_handler(); -} - -/** -* Generate back link for acp pages -*/ -function adm_back_link($u_action) -{ - global $user; - return '

« ' . $user->lang['BACK_TO_PREV'] . ''; -} - -/** -* Build select field options in acp pages -*/ -function build_select($option_ary, $option_default = false) -{ - global $user; - - $html = ''; - foreach ($option_ary as $value => $title) - { - $selected = ($option_default !== false && $value == $option_default) ? ' selected="selected"' : ''; - $html .= ''; - } - - return $html; -} - -/** -* Build radio fields in acp pages -*/ -function h_radio($name, &$input_ary, $input_default = false, $id = false, $key = false) -{ - global $user; - - $html = ''; - $id_assigned = false; - foreach ($input_ary as $value => $title) - { - $selected = ($input_default !== false && $value == $input_default) ? ' checked="checked"' : ''; - $html .= ''; - $id_assigned = true; - } - - return $html; -} - -/** -* Build configuration template for acp configuration pages -*/ -function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars) -{ - global $user, $module; - - $tpl = ''; - $name = 'config[' . $config_key . ']'; - - switch ($tpl_type[0]) - { - case 'text': - case 'password': - $size = (int) $tpl_type[1]; - $maxlength = (int) $tpl_type[2]; - - $tpl = ''; - break; - - case 'dimension': - $size = (int) $tpl_type[1]; - $maxlength = (int) $tpl_type[2]; - - $tpl = ' x '; - break; - - case 'textarea': - $rows = (int) $tpl_type[1]; - $cols = (int) $tpl_type[2]; - - $tpl = ''; - break; - - case 'radio': - $key_yes = ($new[$config_key]) ? ' checked="checked"' : ''; - $key_no = (!$new[$config_key]) ? ' checked="checked"' : ''; - - $tpl_type_cond = explode('_', $tpl_type[1]); - $type_no = ($tpl_type_cond[0] == 'disabled' || $tpl_type_cond[0] == 'enabled') ? false : true; - - $tpl_no = ''; - $tpl_yes = ''; - - $tpl = ($tpl_type_cond[0] == 'yes' || $tpl_type_cond[0] == 'enabled') ? $tpl_yes . $tpl_no : $tpl_no . $tpl_yes; - break; - - case 'select': - case 'custom': - - $return = ''; - - if (isset($vars['method'])) - { - $call = array($module->module, $vars['method']); - } - else if (isset($vars['function'])) - { - $call = $vars['function']; - } - else - { - break; - } - - if (isset($vars['params'])) - { - $args = array(); - foreach ($vars['params'] as $value) - { - switch ($value) - { - case '{CONFIG_VALUE}': - $value = $new[$config_key]; - break; - - case '{KEY}': - $value = $key; - break; - } - - $args[] = $value; - } - } - else - { - $args = array($new[$config_key], $key); - } - - $return = call_user_func_array($call, $args); - - if ($tpl_type[0] == 'select') - { - $tpl = ''; - } - else - { - $tpl = $return; - } - - break; - - default: - break; - } - - if (isset($vars['append'])) - { - $tpl .= $vars['append']; - } - - return $tpl; -} - -/** -* Going through a config array and validate values, writing errors to $error. -*/ -function validate_config_vars($config_vars, &$cfg_array, &$error) -{ - global $phpbb_root_path, $user; - - 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; - } - - // Validate a bit. ;) String is already checked through request_var(), therefore we do not check this again - switch ($config_definition['validate']) - { - case 'bool': - $cfg_array[$config_name] = ($cfg_array[$config_name]) ? 1 : 0; - break; - - case 'int': - $cfg_array[$config_name] = (int) $cfg_array[$config_name]; - break; - - // Absolute path - case 'script_path': - if (!$cfg_array[$config_name]) - { - break; - } - - $destination = str_replace('\\', '/', $cfg_array[$config_name]); - - if ($destination !== '/') - { - // Adjust destination path (no trailing slash) - if (substr($destination, -1, 1) == '/') - { - $destination = substr($destination, 0, -1); - } - - $destination = str_replace(array('../', './'), '', $destination); - - if ($destination[0] != '/') - { - $destination = '/' . $destination; - } - } - - $cfg_array[$config_name] = trim($destination); - - break; - - // Absolute path - case 'lang': - if (!$cfg_array[$config_name]) - { - break; - } - - $cfg_array[$config_name] = basename($cfg_array[$config_name]); - - if (!file_exists($phpbb_root_path . 'language/' . $cfg_array[$config_name] . '/')) - { - $error[] = $user->lang['WRONG_DATA_LANG']; - } - break; - - // Relative path (appended $phpbb_root_path) - case 'rpath': - case 'rwpath': - if (!$cfg_array[$config_name]) - { - break; - } - - $destination = $cfg_array[$config_name]; - - // Adjust destination path (no trailing slash) - if (substr($destination, -1, 1) == '/' || substr($destination, -1, 1) == '\\') - { - $destination = substr($destination, 0, -1); - } - - $destination = str_replace(array('../', '..\\', './', '.\\'), '', $destination); - if ($destination && ($destination[0] == '/' || $destination[0] == "\\")) - { - $destination = ''; - } - - $cfg_array[$config_name] = trim($destination); - - // Path being relative (still prefixed by phpbb_root_path), but with the ability to escape the root dir... - case 'path': - case 'wpath': - - if (!$cfg_array[$config_name]) - { - break; - } - - $cfg_array[$config_name] = trim($cfg_array[$config_name]); - - // Make sure no NUL byte is present... - if (strpos($cfg_array[$config_name], "\0") !== false || strpos($cfg_array[$config_name], '%00') !== false) - { - $cfg_array[$config_name] = ''; - break; - } - - if (!file_exists($phpbb_root_path . $cfg_array[$config_name])) - { - $error[] = sprintf($user->lang['DIRECTORY_DOES_NOT_EXIST'], $cfg_array[$config_name]); - } - - if (file_exists($phpbb_root_path . $cfg_array[$config_name]) && !is_dir($phpbb_root_path . $cfg_array[$config_name])) - { - $error[] = sprintf($user->lang['DIRECTORY_NOT_DIR'], $cfg_array[$config_name]); - } - - // Check if the path is writable - if ($config_definition['validate'] == 'wpath' || $config_definition['validate'] == 'rwpath') - { - if (file_exists($phpbb_root_path . $cfg_array[$config_name]) && !@is_writable($phpbb_root_path . $cfg_array[$config_name])) - { - $error[] = sprintf($user->lang['DIRECTORY_NOT_WRITABLE'], $cfg_array[$config_name]); - } - } - - break; - } - } - - return; -} - -?> \ No newline at end of file diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html deleted file mode 100644 index a002ad19ac..0000000000 --- a/phpBB/adm/style/acp_attachments.html +++ /dev/null @@ -1,376 +0,0 @@ - - - - - - « {L_BACK} - - -

{L_TITLE}

- -

{L_TITLE_EXPLAIN}

- - -
-

{L_WARNING}

-

{WARNING_MSG}

-
- - - -
-

{L_NOTIFY}

-

{NOTIFY_MSG}

-
- - - -

{L_UPLOADING_FILES}

- - - :: {upload.FILE_INFO}
- {upload.DENIED}{upload.ERROR_MSG}{L_SUCCESSFULLY_UPLOADED} -

- - - - - - - -
-

{L_NO_THUMBNAIL_SUPPORT}

-
- - -
- - - - - -
- {options.LEGEND} - - -
-

{options.TITLE_EXPLAIN}
-
{options.CONTENT}
-
- - - -
- -
- {L_SUBMIT} -   - -
- - -
-

{L_SECURE_DOWNLOAD_NOTICE}

-
- - -
- {L_SECURE_TITLE} -

{L_DOWNLOAD_ADD_IPS_EXPLAIN}

-
-
-
-
-
-

{L_EXCLUDE_ENTERED_IP}
-
-
-
- -

- -

-
- -
- {L_REMOVE_IPS} - -

{L_DOWNLOAD_REMOVE_IPS_EXPLAIN}

-
-
-
-
- -

- -

-
- - -

{L_NO_IPS_DEFINED}

- - {S_FORM_TOKEN} - -
- - - - - - -
-
- - - - {L_LEGEND} -
-
-
-
-
-

{L_SPECIAL_CATEGORY_EXPLAIN}
-
{S_CATEGORY_SELECT}
-
-
-
-
checked="checked" />
-
-
-
-
checked="checked" />
-
-
-
-
-
 src="{PHPBB_ROOT_PATH}images/spacer.gif"src="{UPLOAD_ICON_SRC}" name="image_upload_icon" alt="" title="" /> 
-
-
-
-
-
-
-
-
{ASSIGNED_EXTENSIONS}
[{L_GO_TO_EXTENSIONS} ]
-
-
-
-

{L_ALLOWED_FORUMS_EXPLAIN}
-
-
-
-
- -

-   - -

- {S_FORM_TOKEN} -
- -
- - -
-
- {L_TITLE} - - - - - - - - - - - - - - - - - - - - - - - - -
{L_EXTENSION_GROUP}{L_SPECIAL_CATEGORY}{L_OPTIONS}
 
{groups.GROUP_NAME} -
» {L_NOT_ALLOWED_IN_PM} -
» {L_ONLY_ALLOWED_IN_PM} -
» {L_NOT_ALLOWED_IN_PM_POST} -
» {L_ALLOWED_IN_PM_POST} -
{groups.CATEGORY} {ICON_EDIT}  {ICON_DELETE} 
-

- {L_CREATE_GROUP}: - -

- {S_FORM_TOKEN} -
-
- - - - - -
-
- {L_ADD_EXTENSION} -
-
-
-
-
-
-
{GROUP_SELECT_OPTIONS}
-
- -

- -

- {S_FORM_TOKEN} -
-
- -
- -
- -
- {L_TITLE} - - - - - - - - - - - - - - - - - - - - - - - - -
{L_EXTENSION}{L_EXTENSION_GROUP}{L_DELETE}
 
{extensions.EXTENSION}{extensions.GROUP_OPTIONS}
- -

-   - -

- {S_FORM_TOKEN} -
-
- - - -
- -
- {L_TITLE} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_FILENAME}{L_FILEDATE}{L_FILESIZE}{L_ATTACH_POST_ID}{L_ATTACH_TO_POST}{L_DELETE}
{orphan.REAL_FILENAME}{orphan.FILETIME}{orphan.FILESIZE}{L_ATTACH_ID}:
 {L_MARK_ALL} :: {L_UNMARK_ALL}{L_MARK_ALL} :: {L_UNMARK_ALL}
- -
- -

-   - -

- {S_FORM_TOKEN} -
-
- - - - \ No newline at end of file diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html deleted file mode 100644 index acb6e46df1..0000000000 --- a/phpBB/adm/style/acp_ban.html +++ /dev/null @@ -1,124 +0,0 @@ - - - - -

{L_ACP_BAN_EXPLAIN}

- -

{L_TITLE}

- -

{L_EXPLAIN}

- - - -
- -
- {L_TITLE} -
-
-
-
[ {L_FIND_USERNAME} ]
-
-
-
-
- -
-
-

{L_BAN_EXCLUDE_EXPLAIN}
-
-
-
-
-
-
-
-
-
-
-
- -

-   - -

-{S_FORM_TOKEN} -
-
- -

- -

{L_UNBAN_TITLE}

- -

{L_UNBAN_EXPLAIN}

- -
- -
- {L_UNBAN_TITLE} - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -

-   - -

- {S_FORM_TOKEN} -
- - - -

{L_NO_BAN_CELL}

- {S_FORM_TOKEN} - - - - -
- - \ No newline at end of file diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html deleted file mode 100644 index a0b0016a11..0000000000 --- a/phpBB/adm/style/acp_bbcodes.html +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - « {L_BACK} - -

{L_ACP_BBCODES}

- -

{L_ACP_BBCODES_EXPLAIN}

- -
- -
- {L_BBCODE_USAGE} -

{L_BBCODE_USAGE_EXPLAIN}

-
-


{L_BBCODE_USAGE_EXAMPLE}
-
-
-
- -
- {L_HTML_REPLACEMENT} -

{L_HTML_REPLACEMENT_EXPLAIN}

-
-


{L_HTML_REPLACEMENT_EXAMPLE}
-
-
-
- -
- {L_BBCODE_HELPLINE} -

{L_BBCODE_HELPLINE_EXPLAIN}

-
-
-
-
-
- -
- {L_SETTINGS} -
-
-
checked="checked" />
-
-
- -
- {L_SUBMIT} -   - - {S_FORM_TOKEN} -
- -
- - - - - - - - - - - - - - - - - - - - - - -
{L_TOKENS}
{L_TOKENS_EXPLAIN}
{L_TOKEN}{L_TOKEN_DEFINITION}
{token.TOKEN}{token.EXPLAIN}
-
- - - -

{L_ACP_BBCODES}

- -

{L_ACP_BBCODES_EXPLAIN}

- -
-
- {L_ACP_BBCODES} - - - - - - - - - - - - - - - - -
{L_BBCODE_TAG}{L_ACTION}
{bbcodes.BBCODE_TAG}{ICON_EDIT} {ICON_DELETE}
- -

- -

- {S_FORM_TOKEN} -
- -
- - - - diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html deleted file mode 100644 index bb16204801..0000000000 --- a/phpBB/adm/style/acp_board.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - -

{L_TITLE}

- -

{L_TITLE_EXPLAIN}

- - -
-

{L_WARNING}

-

{ERROR_MSG}

-
- - -
- - - - - - -
- {options.LEGEND} - - -
-

{options.TITLE_EXPLAIN}
-
{options.CONTENT}
-
- - - - - - - {auth_tpl.TPL} - - - -

-   - -

- {S_FORM_TOKEN} -
-
- - diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html deleted file mode 100644 index 7783356574..0000000000 --- a/phpBB/adm/style/acp_bots.html +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - « {L_BACK} - -

{L_TITLE}

- -

{L_BOT_EDIT_EXPLAIN}

- - -
-

{L_WARNING}

-

{ERROR_MSG}

-
- - -
- -
- {L_TITLE} -
-

{L_BOT_NAME_EXPLAIN}
-
-
-
-

{L_BOT_STYLE_EXPLAIN}
-
-
-
-

{L_BOT_LANG_EXPLAIN}
-
-
-
-
-
-
-
-

{L_BOT_AGENT_EXPLAIN}
-
-
-
-

{L_BOT_IP_EXPLAIN}
-
-
- -

-   - - {S_FORM_TOKEN} -

-
-
- - - -

{L_BOTS}

- -

{L_BOTS_EXPLAIN}

- -
- - - - - - - - - - - - - - - - - - - - - - -
{L_BOT_NAME}{L_BOT_LAST_VISIT}{L_OPTIONS}{L_MARK}
{bots.BOT_NAME} {bots.LAST_VISIT}  {bots.L_ACTIVATE_DEACTIVATE}  {L_EDIT}  {L_DELETE} 
- -
- -
- -
- - -

{L_MARK_ALL}{L_UNMARK_ALL}

- {S_FORM_TOKEN} -
-
- - - - diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html deleted file mode 100644 index d9d087d6ba..0000000000 --- a/phpBB/adm/style/acp_captcha.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - -

{L_ACP_VC_SETTINGS}

- -

{L_ACP_VC_SETTINGS_EXPLAIN}

- - -
- -
-{L_GENERAL_OPTIONS} - -
-

{L_VISUAL_CONFIRM_REG_EXPLAIN}
-
-
-
-
-

{L_VISUAL_CONFIRM_POST_EXPLAIN}
-
-
-
- -
-

{L_CAPTCHA_GD_EXPLAIN}
-
-
-
-
-

{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}
-
-
-
-
-

{L_CAPTCHA_GD_X_GRID_EXPLAIN}
-
-
-
-

{L_CAPTCHA_GD_Y_GRID_EXPLAIN}
-
-
- - -
-
- {L_PREVIEW} - -
-

{L_WARNING}

-

{L_CAPTCHA_PREVIEW_MSG}

-
- -
-

{L_CAPTCHA_PREVIEW_EXPLAIN}
-
{L_PREVIEW}width="360" height="96" width="320" height="50" id="captcha_preview" />
-
-
- -
- {L_SUBMIT} -   -   - - {S_FORM_TOKEN} -
-
- - diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html deleted file mode 100644 index e64c5ed437..0000000000 --- a/phpBB/adm/style/acp_database.html +++ /dev/null @@ -1,93 +0,0 @@ - - - - - -

{L_ACP_RESTORE}

- -

{L_ACP_RESTORE_EXPLAIN}

- -
- -
- {L_RESTORE_OPTIONS} -
-
-
-
- - -

-   -   - -

- - {S_FORM_TOKEN} -
-
- - -

{L_ACP_BACKUP}

- -

{L_ACP_BACKUP_EXPLAIN}

- - - -
- -
- {L_BACKUP_OPTIONS} -
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
{L_SELECT_ALL} :: {L_DESELECT_ALL}
-
- -

-   - -

- {S_FORM_TOKEN} -
-
- - - - diff --git a/phpBB/adm/style/acp_disallow.html b/phpBB/adm/style/acp_disallow.html deleted file mode 100644 index b68d3ab3c0..0000000000 --- a/phpBB/adm/style/acp_disallow.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - -

{L_ACP_DISALLOW_USERNAMES}

- -

{L_ACP_DISALLOW_EXPLAIN}

- -
- -
- {L_ADD_DISALLOW_TITLE} -
-

{L_ADD_DISALLOW_EXPLAIN}
-
-
- -

- -

-
- -

{L_DELETE_DISALLOW_TITLE}

- -

{L_DELETE_DISALLOW_EXPLAIN}

- -
- {L_DELETE_DISALLOW_TITLE} - -
-
-
-
- -

- -

- -

{L_NO_DISALLOWED}

- - {S_FORM_TOKEN} -
-
- - diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html deleted file mode 100644 index b1d9b4af11..0000000000 --- a/phpBB/adm/style/acp_email.html +++ /dev/null @@ -1,54 +0,0 @@ - - - - -

{L_ACP_MASS_EMAIL}

- -

{L_ACP_MASS_EMAIL_EXPLAIN}

- - -
-

{L_WARNING}

-

{WARNING_MSG}

-
- - -
- -
- {L_COMPOSE} -
-
-
-
-
-

{L_SEND_TO_USERS_EXPLAIN}
-
-
[ {L_FIND_USERNAME} ]
-
-
-
-
-
-
-

{L_MASS_MESSAGE_EXPLAIN}
-
-
-
-
-
-
-
-
-
-
- -

-   - -

-{S_FORM_TOKEN} -
-
- - diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html deleted file mode 100644 index e4662d9280..0000000000 --- a/phpBB/adm/style/acp_forums.html +++ /dev/null @@ -1,500 +0,0 @@ - - - - - - - - - « {L_BACK} - -

{L_TITLE} :: {FORUM_NAME}

- -

{L_FORUM_EDIT_EXPLAIN}

- - -
-

{L_WARNING}

-

{ERROR_MSG}

-
- - -
- -
- {L_FORUM_SETTINGS} -
-
-
-
- -
-
-
-
-
-
-
- - - - -
-
-
-
-
-
-
-
-
-

{L_FORUM_DESC_EXPLAIN}
-
-
- -
-
-
-

{L_FORUM_IMAGE_EXPLAIN}
-
- -
{L_FORUM_IMAGE}
- -
-
-

{L_FORUM_PASSWORD_EXPLAIN}
-
-
-
-

{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}
-
-
- -
-

{L_FORUM_PASSWORD_UNSET_EXPLAIN}
-
-
- -
-
-
-
- -
-

{L_COPY_PERMISSIONS_EXPLAIN}
-
-
- -
- -
-
- {L_GENERAL_FORUM_SETTINGS} -
-

{L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}
-
-
-
-
-
- -
-
- {L_GENERAL_FORUM_SETTINGS} -
-
-
-
-
-

{L_LIST_SUBFORUMS_EXPLAIN}
-
-
-
-
-

{L_LIST_INDEX_EXPLAIN}
-
-
-
-
-

{L_ENABLE_POST_REVIEW_EXPLAIN}
-
-
-
-
-

{L_ENABLE_INDEXING_EXPLAIN}
-
-
-
-
-
-
-
-
-
-

{L_ENABLE_RECENT_EXPLAIN}
-
-
-
-
-

{L_FORUM_TOPICS_PAGE_EXPLAIN}
-
-
-
- -
- {L_FORUM_PRUNE_SETTINGS} -
-

{L_FORUM_AUTO_PRUNE_EXPLAIN}
-
-
-
-
-

{L_AUTO_PRUNE_FREQ_EXPLAIN}
-
{L_DAYS}
-
-
-

{L_AUTO_PRUNE_DAYS_EXPLAIN}
-
{L_DAYS}
-
-
-

{L_AUTO_PRUNE_VIEWED_EXPLAIN}
-
{L_DAYS}
-
-
-

{L_PRUNE_OLD_POLLS_EXPLAIN}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - - -
-
- {L_FORUM_RULES} -
-

{L_FORUM_RULES_LINK_EXPLAIN}
-
-
- -
-
-
{FORUM_RULES_PREVIEW}
-
- -
-

{L_FORUM_RULES_EXPLAIN}
-
-
- -
-
-
-
- -
- {L_SUBMIT} -   - - {S_FORM_TOKEN} -
-
- - - - « {L_BACK} - -

{L_FORUM_DELETE}

- -

{L_FORUM_DELETE_EXPLAIN}

- - -
-

{L_WARNING}

-

{ERROR_MSG}

-
- - -
- -
- {L_FORUM_DELETE} -
-
-
{FORUM_NAME}
-
- -
-
-
- -
- -
- - -
-
-
- -
- -
- - -

- -

- {S_FORM_TOKEN} -
-
- - - - - -

{L_FORUM_ADMIN}

- -

{L_FORUM_ADMIN_EXPLAIN}

- -

{L_PROGRESS_EXPLAIN}

- - - - - -

{L_FORUM_ADMIN}

- -

{L_FORUM_ADMIN_EXPLAIN}

- - -
-

{L_WARNING}

-

{ERROR_MSG}

-
- - - - - -
-

{L_NOTIFY}

-

{L_FORUM_RESYNCED}

-
- - -

{NAVIGATION} [{L_EDIT} | {L_DELETE} | {L_RESYNC}]

- - - - - - - - - - - - - -
{forums.FOLDER_IMAGE} -
{forums.FORUM_IMAGE}
- {forums.FORUM_NAME}{forums.FORUM_NAME} -
{forums.FORUM_DESCRIPTION} -

{L_TOPICS}: {forums.FORUM_TOPICS} / {L_POSTS}: {forums.FORUM_POSTS} -
- - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN} - - {ICON_MOVE_UP} - {ICON_MOVE_DOWN} - - {ICON_MOVE_UP} - {ICON_MOVE_DOWN_DISABLED} - - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN_DISABLED} - - {ICON_EDIT} - - {ICON_SYNC} - - {ICON_SYNC_DISABLED} - - {ICON_DELETE} -
- - -
- -
- {L_SELECT_FORUM}: - - - {S_FORM_TOKEN} -
-
- -
- -
- - - - - {S_FORM_TOKEN} -
-
- - - - diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html deleted file mode 100644 index c90a075f9e..0000000000 --- a/phpBB/adm/style/acp_groups.html +++ /dev/null @@ -1,346 +0,0 @@ - - - - - - - « {L_BACK} - -

{L_ACP_GROUPS_MANAGE}

- -

{L_GROUP_EDIT_EXPLAIN}

- - -
-

{L_WARNING}

-

{ERROR_MSG}

-
- - -
enctype="multipart/form-data"> - -
- {L_GROUP_DETAILS} -
-
for="group_name">{L_GROUP_NAME}:
-
{GROUP_NAME}
-
-
-
-
-
- -
-
- -
-

{L_GROUP_TYPE_EXPLAIN}
-
- - - - -
-
- - - - - -
-

{L_COPY_PERMISSIONS_EXPLAIN}
-
-
- -
- -
- {L_GROUP_SETTINGS_SAVE} - -
-

{L_GROUP_FOUNDER_MANAGE_EXPLAIN}
-
-
- -
-
-
-
-
-

{L_GROUP_RECEIVE_PM_EXPLAIN}
-
-
-
-

{L_GROUP_MESSAGE_LIMIT_EXPLAIN}
-
-
-
-

{L_GROUP_COLOR_EXPLAIN}
-
  [ {L_COLOUR_SWATCH} ]
-
-
-
-
-
-
- -
- {L_GROUP_AVATAR} -
-

{L_AVATAR_EXPLAIN}
-
{AVATAR_IMAGE}
-
-
- - -
-
-
-
-
-

{L_UPLOAD_AVATAR_URL_EXPLAIN}
-
-
- -
-

{L_LINK_REMOTE_AVATAR_EXPLAIN}
-
-
-
-

{L_LINK_REMOTE_SIZE_EXPLAIN}
-
px X px
-
- -
-
-
-
- - -
- -
- {L_AVATAR_GALLERY} -
-
-
 
-
-
- - - - - - - - - - - - - -
{avatar_row.avatar_column.AVATAR_NAME}
-
-
- -
- -
- - - - -
- {L_SUBMIT} -   - - {S_FORM_TOKEN} -
-
- - - - « {L_BACK} - -

{L_GROUP_MEMBERS} :: {GROUP_NAME}

- -

{L_GROUP_MEMBERS_EXPLAIN}

- -
- -
- » {L_MAKE_DEFAULT_FOR_ALL} -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_USERNAME}{L_GROUP_DEFAULT}{L_JOINED}{L_POSTS}{L_MARK}
{L_GROUP_LEAD}
{leader.USERNAME}{L_YES}{L_NO}{leader.JOINED}{leader.USER_POSTS}
{L_GROUPS_NO_MODS}
{L_GROUP_APPROVED}
{L_GROUP_PENDING}
{member.USERNAME}{L_YES}{L_NO}{member.JOINED}{member.USER_POSTS}
{L_GROUPS_NO_MEMBERS}
- - - - -
- - -

{L_MARK_ALL}{L_UNMARK_ALL}

-
- -

{L_ADD_USERS}

- -

{L_ADD_USERS_EXPLAIN}

- -
- {L_ADD_USERS} -
-
-
-
-
-
-

{L_USER_GROUP_DEFAULT_EXPLAIN}
-
-
-
-
-

{L_USERNAMES_EXPLAIN}
-
-
[ {L_FIND_USERNAME} ]
-
- -

- -

- {S_FORM_TOKEN} -
-
- - - -

{L_ACP_GROUPS_MANAGE}

- -

{L_ACP_GROUPS_MANAGE_EXPLAIN}

- - -
-

{L_WARNING}

-

{ERROR_MSG}

-
- - -

{L_USER_DEF_GROUPS}

- -

{L_USER_DEF_GROUPS_EXPLAIN}

- -
- - - - - - - - - - - - - - - - - - - - -
{L_GROUP}{L_TOTAL_MEMBERS}{L_OPTIONS}{L_ACTION}
{L_NO_GROUPS_CREATED}
- -
- - {L_CREATE_GROUP}: - - - {S_FORM_TOKEN} -
-
- -

{L_SPECIAL_GROUPS}

- -

{L_SPECIAL_GROUPS_EXPLAIN}

- - - - - - - - - - - - - - - - - - - - - - - -
{L_GROUP}{L_TOTAL_MEMBERS}{L_OPTIONS}{L_ACTION}
{groups.GROUP_NAME}{groups.TOTAL_MEMBERS}{L_SETTINGS}{L_MEMBERS}{L_DELETE}{L_DELETE}
- - - - diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html deleted file mode 100644 index 8bb8257318..0000000000 --- a/phpBB/adm/style/acp_icons.html +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - - - - « {L_BACK} - -

{L_TITLE}

- -

{L_EXPLAIN}

- -
- -
- {L_TITLE} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_CONFIG}
{L_URL}{L_LOCATION}{L_SMILIES_CODE}{L_SMILIES_EMOTION}{L_WIDTH}{L_HEIGHT}{L_DISPLAY_ON_POSTING}{L_ORDER}{L_ADD}
[{items.IMG}] - - - - -
{L_ADD_SMILEY_CODE}
{L_NO_ICONS}
- -

-   - -

- {S_FORM_TOKEN} -
-
- - - - « {L_BACK} - -

{L_TITLE}

- -

{L_EXPLAIN}

- -
- -
- {L_IMPORT} - - -

{L_NO_PAK_OPTIONS}

- - -
-
-
-
-

{L_CURRENT_EXPLAIN}
-
- -
- - -

- -

- - {S_FORM_TOKEN} -
-
- - - -

{L_TITLE}

- -

{L_EXPLAIN}

- - -
-

{L_NOTIFY}

-

{NOTICE}

-
- - -
- -
{L_IMPORT} | {L_EXPORT}
- -
- - {L_TITLE} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_TITLE}{L_CODE}{L_EMOTION}{L_OPTIONS}
{L_NOT_DISPLAYED}
{items.ALT_TEXT}{items.CODE}{items.EMOTION} - {ICON_MOVE_UP_DISABLED}{ICON_MOVE_UP}  - {ICON_MOVE_DOWN_DISABLED}{ICON_MOVE_DOWN} -  {ICON_EDIT} {ICON_DELETE} -
- -

-     -

- {S_FORM_TOKEN} -
-
- - - - diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html deleted file mode 100755 index 240cec1643..0000000000 --- a/phpBB/adm/style/acp_inactive.html +++ /dev/null @@ -1,71 +0,0 @@ - - - - -

{L_INACTIVE_USERS}

- -

{L_INACTIVE_USERS_EXPLAIN}

- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_USERNAME}{L_JOINED}{L_INACTIVE_DATE}{L_INACTIVE_REASON}{L_LAST_VISIT}{L_MARK}
{inactive.USERNAME}{inactive.JOINED}{inactive.INACTIVE_DATE}{inactive.REASON}{inactive.LAST_VISIT}  
{L_NO_INACTIVE_USERS}
- -
- {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} - -
-
- - - - -
- - -

{L_MARK_ALL}{L_UNMARK_ALL}

- {S_FORM_TOKEN} -
- - - -
- - \ No newline at end of file diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html deleted file mode 100644 index 2cc715493a..0000000000 --- a/phpBB/adm/style/acp_jabber.html +++ /dev/null @@ -1,65 +0,0 @@ - - - - -

{L_ACP_JABBER_SETTINGS}

- -

{L_ACP_JABBER_SETTINGS_EXPLAIN}

- - -
-

{L_WARNING}

-

{WARNING_MSG}

-
- - -
- -
- {L_ACP_JABBER_SETTINGS} - -

{L_JAB_GTALK_NOTE}

- -
-

{L_JAB_ENABLE_EXPLAIN}
-
-
-
-
-

{L_JAB_SERVER_EXPLAIN}
-
-
-
-

{L_JAB_PORT_EXPLAIN}
-
-
-
-

{L_JAB_USERNAME_EXPLAIN}
-
-
-
-
-
-
- -
-

{L_JAB_USE_SSL_EXPLAIN}
-
-
-
- -
-

{L_JAB_PACKAGE_SIZE_EXPLAIN}
-
-
- -
- -
-   - - {S_FORM_TOKEN} -
-
- - diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html deleted file mode 100644 index 95ac1d5852..0000000000 --- a/phpBB/adm/style/acp_language.html +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - « {L_BACK} - -

{L_SELECT_DOWNLOAD_FORMAT}

- -
- -
- {L_DOWNLOAD_AS} -
-
-
{RADIO_BUTTONS}
-
- -

- -

-
- -
- - - - « {L_BACK} - -

{L_LANGUAGE_PACK_DETAILS}

- -
- -
- {LANG_LOCAL_NAME} -
-
-
-
-
-
-
-
-
-
-
{LANG_ISO}
-
-
-
-
-
- -

- -

- {S_FORM_TOKEN} -
-
- -

- - -
-

{L_MISSING_FILES}

-

{MISSING_FILES}

-
-

- - - -

{L_MISSING_LANG_VARIABLES}

- -

{L_MISSING_VARS_EXPLAIN}

- -
- - - - - - - - - - - - - - - {missing.TPL} - - -
{L_LANGUAGE_KEY}{L_LANGUAGE_VARIABLE}
{missing.FILE}
-
{S_FORM_TOKEN}
-
- -

- - - - -

{L_LANGUAGE_ENTRIES}

- -

{L_LANGUAGE_ENTRIES_EXPLAIN}

- -
- - -
- -
- - -
-   -
- -

 
 

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {TPL} - - - - - -
{L_FILE_CONTENTS}
{L_LANGUAGE_KEY}{L_LANGUAGE_VARIABLE}
{PRINT_MESSAGE}
{L_FILE_FROM_STORAGE}
  
-   {L_UPLOAD_METHOD}:  id="method" checked="checked" value="{buttons.VALUE}" name="method" /> {buttons.VALUE} 
{S_FORM_TOKEN}  
-
- - - - « {L_BACK} - -

{L_UPLOAD_SETTINGS}

- -
- - -
-

{L_CONNECTION_SUCCESS}

-
- -
-

{L_CONNECTION_FAILED}

-
- - -
- {L_UPLOAD_SETTINGS} -
-
-
{NAME}
-
- -
-

{data.EXPLAIN}
-
-
- -
- -
- {HIDDEN} - {S_FORM_TOKEN} - - -
-
- - - -

{L_ACP_LANGUAGE_PACKS}

- -

{L_ACP_LANGUAGE_PACKS_EXPLAIN}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_LANGUAGE_PACK_NAME}{L_LANGUAGE_PACK_LOCALNAME}{L_LANGUAGE_PACK_ISO}{L_LANGUAGE_PACK_USED_BY}{L_OPTIONS}
{L_INSTALLED_LANGUAGE_PACKS}
{lang.ENGLISH_NAME} {lang.TAG}{lang.LOCAL_NAME}{lang.ISO}{lang.USED_BY} {L_DOWNLOAD} | {L_DELETE}
{L_UNINSTALLED_LANGUAGE_PACKS}
{notinst.NAME}{notinst.LOCAL_NAME}{notinst.ISO}{L_INSTALL}
- - - - diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html deleted file mode 100644 index 11ab5faa9c..0000000000 --- a/phpBB/adm/style/acp_logs.html +++ /dev/null @@ -1,85 +0,0 @@ - - - - -

{L_TITLE}

- -

{L_EXPLAIN}

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_USERNAME}{L_IP}{L_TIME}{L_ACTION}{L_MARK}
- {log.USERNAME} - -
» {log.REPORTEE_USERNAME} - -
{log.IP}{log.DATE}{log.ACTION}
{log.DATA}
- - - -
-

{L_NO_ENTRIES}

-
- - - - -
- {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} - - {S_FORM_TOKEN} -
-
- - - - -
- {L_SELECT_FORUM}: - -
- - - -
-   -
-

{L_MARK_ALL}{L_UNMARK_ALL}

-
- - - -
- - \ No newline at end of file diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html deleted file mode 100644 index bad15bef30..0000000000 --- a/phpBB/adm/style/acp_main.html +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - -

{L_PERMISSIONS_TRANSFERRED}

- -

{L_PERMISSIONS_TRANSFERRED_EXPLAIN}

- - - -

{L_WELCOME_PHPBB}

- -

{L_ADMIN_INTRO}

- - -
-

{L_WARNING}

-

{L_REMOVE_INSTALL}

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_FORUM_STATS}
{L_STATISTIC}{L_VALUE}{L_STATISTIC}{L_VALUE}
{L_NUMBER_POSTS}: {TOTAL_POSTS}{L_POSTS_PER_DAY}: {POSTS_PER_DAY}
{L_NUMBER_TOPICS}: {TOTAL_TOPICS}{L_TOPICS_PER_DAY}: {TOPICS_PER_DAY}
{L_NUMBER_USERS}: {TOTAL_USERS}{L_USERS_PER_DAY}: {USERS_PER_DAY}
{L_NUMBER_FILES}: {TOTAL_FILES}{L_FILES_PER_DAY}: {FILES_PER_DAY}
{L_BOARD_STARTED}: {START_DATE}{L_AVATAR_DIR_SIZE}: {AVATAR_DIR_SIZE}
{L_DATABASE_SIZE}: {DBSIZE}{L_UPLOAD_DIR_SIZE}: {UPLOAD_DIR_SIZE}
{L_DATABASE_SERVER_INFO}: {DATABASE_INFO}{L_GZIP_COMPRESSION}: {GZIP_COMPRESSION}
{L_BOARD_VERSION}: {BOARD_VERSION}{L_NUMBER_ORPHAN}: {TOTAL_ORPHAN}  
- - -
- {L_STATISTIC_RESYNC_OPTIONS} - -
-
-

 
-
-
-
- -
-
-

 
-
-
-
- -
-
-

{L_RESYNC_STATS_EXPLAIN}
-
-
-
- -
-
-

{L_RESYNC_POSTCOUNTS_EXPLAIN}
-
-
-
- -
-
-

{L_RESYNC_POST_MARKING_EXPLAIN}
-
-
-
- - -
-
-

{L_PURGE_CACHE_EXPLAIN}
-
-
-
- -
- - - -

{L_ADMIN_LOG}

- -

{L_ADMIN_LOG_INDEX_EXPLAIN}

- -
» {L_VIEW_ADMIN_LOG}
- - - - - - - - - - - - - - - - - - - - - -
{L_USERNAME}{L_IP}{L_TIME}{L_ACTION}
{log.USERNAME}{log.IP}{log.DATE}{log.ACTION}
- -
- - - - -

{L_INACTIVE_USERS}

- -

{L_INACTIVE_USERS_EXPLAIN_INDEX}

- -
» {L_VIEW_INACTIVE_USERS}
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_USERNAME}{L_JOINED}{L_INACTIVE_DATE}{L_INACTIVE_REASON}{L_LAST_VISIT}
{inactive.USERNAME}{inactive.JOINED}{inactive.INACTIVE_DATE}{inactive.REASON}{inactive.LAST_VISIT}
{L_NO_INACTIVE_USERS}
- - - - - - \ No newline at end of file diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html deleted file mode 100644 index 5396e78557..0000000000 --- a/phpBB/adm/style/acp_modules.html +++ /dev/null @@ -1,212 +0,0 @@ - - - - - - - - - « {L_BACK} - -

{L_TITLE} :: {MODULENAME}

- -

{L_EDIT_MODULE_EXPLAIN}

- - -
-

{L_WARNING}

-

{ERROR_MSG}

-
- - -
- -
- {L_GENERAL_OPTIONS} -
-

- {L_MODULE_LANGNAME_EXPLAIN}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
style="display: none;"> -
-

{L_MODULE_DISPLAYED_EXPLAIN}
-
-
-
-
-

- {L_CHOOSE_MODULE_EXPLAIN}
-
-
-
-

- {L_CHOOSE_MODE_EXPLAIN}
-
-
-
- -

- - - -   - -

- {S_FORM_TOKEN} -
-
- - - -

{L_ACP_MODULE_MANAGEMENT}

- -

{L_ACP_MODULE_MANAGEMENT_EXPLAIN}

- - -
-

{L_WARNING}

-

{ERROR_MSG}

-
- - - - - - - - -
{NAVIGATION} [{L_EDIT} | {L_DELETE} | {L_DISABLE}{L_ENABLE}]
- - - - - - - - - - - - - - -
{modules.MODULE_IMAGE}{modules.MODULE_TITLE} [{L_HIDDEN_MODULE}] {L_DISABLE}{L_ENABLE}  - - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN} - - {ICON_MOVE_UP} - {ICON_MOVE_DOWN} - - {ICON_MOVE_UP} - {ICON_MOVE_DOWN_DISABLED} - - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN_DISABLED} - - {ICON_EDIT} - {ICON_DELETE} -
- - -
 
- -
- -
- - - - -
- -
- -
- -
- - - - - -
- -
- -
 

- -
-
- {L_SELECT_MODULE}: - - -
-
- - - - diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html deleted file mode 100644 index 725c7a5ec1..0000000000 --- a/phpBB/adm/style/acp_permission_roles.html +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - - « {L_BACK} - -

{L_TITLE}

- -

{L_EXPLAIN}

- -
- -
- » {L_SET_ROLE_PERMISSIONS} - -
- {L_ROLE_DETAILS} -
-
-
-
-
-

{L_ROLE_DESCRIPTION_EXPLAIN}
-
-
- -

- -

-
- - - -

{L_ROLE_ASSIGNED_TO}

- - - - - - - - » {L_BACK_TO_TOP}
-

- -

{L_ACL_TYPE}

- -
- -
-
- -
- -
style="display: none;"> - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_ACL_SETTING}{L_ACL_YES}{L_ACL_NO}{L_ACL_NEVER}
{auth.mask.PERMISSION}
-
- -
- -
- -
- -
- - {S_FORM_TOKEN} -
-
- - » {L_BACK_TO_TOP}
-
- - - -

{L_TITLE}

- -

{L_EXPLAIN}

- -
- - - - - - - - - - - - - - - - - - -
{L_ROLE_NAME}{L_OPTIONS}
{roles.ROLE_NAME} -
{roles.ROLE_DESCRIPTION} -
{L_VIEW_ASSIGNED_ITEMS}{L_VIEW_ASSIGNED_ITEMS} - - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN} - - {ICON_MOVE_UP} - {ICON_MOVE_DOWN} - - {ICON_MOVE_UP} - {ICON_MOVE_DOWN_DISABLED} - - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN_DISABLED} - - {ICON_EDIT} - {ICON_DELETE} -
- -
- {L_CREATE_ROLE}:
- {S_FORM_TOKEN} -
-
- - - - - -

{L_ROLE_ASSIGNED_TO}

- - - - - - - - \ No newline at end of file diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html deleted file mode 100644 index b4386d5f19..0000000000 --- a/phpBB/adm/style/acp_permissions.html +++ /dev/null @@ -1,355 +0,0 @@ - - - - - - -

{L_ACP_PERMISSIONS}

- - {L_ACP_PERMISSIONS_EXPLAIN} - - - - - -

{L_TITLE}

- -

{L_EXPLAIN}

- - -

{L_FORUMS}: {FORUM_NAMES}

- - - - -
- -
- {L_LOOK_UP_FORUM} -

{L_LOOK_UP_FORUMS_EXPLAIN}

-
-
-
-
-
- -

- {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} - -

- -
-
- - - -
- -
- {L_LOOK_UP_FORUM} -

{L_SELECT_FORUM_SUBFORUM_EXPLAIN}

-
-
-
-
- -

- {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} - -

- -
-
- - - - - -
- -
- {L_LOOK_UP_USER} -
-
-
-
[ {L_FIND_USERNAME} ]
-
-
- -

- {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} - -

-
-
- - - -
- -
- {L_LOOK_UP_GROUP} -
-
-
-
- -

- {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} - -

- -
-
- - - -
- - - -

{L_USERS}

- -
- -
- {L_MANAGE_USERS} -
-
-
-
-
- -
- {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} -   -
-
- -
- -
- {L_ADD_USERS} -

{L_USERNAMES_EXPLAIN}

-
-
-
-
-
- -
- {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} - -
-
- - - -
- -
- - - -

{L_USERGROUPS}

- -
- -
- {L_MANAGE_GROUPS} -
-
-
-
-
- -
- {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} -   -
-
- -
- -
- {L_ADD_GROUPS} -
-
-
-
- -
- {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} - -
-
- - - -
- - - -
- -

{L_USERS}

- -
- -
- {L_MANAGE_USERS} -
-
-
-
- -
- {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} - -
-
- -
- -
- {L_LOOK_UP_USER} -
-
-
-
[ {L_FIND_USERNAME} ]
-
-
-
- -
- {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} - -
-
- -
- -
- -

{L_USERGROUPS}

- -
- -
- {L_MANAGE_GROUPS} -
-
-
-
- -
- {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} - -
-
- -
- -
- {L_LOOK_UP_GROUP} -
-
-
-
 
-
-
- -
- {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} - -
-
- -
- - - - - - - -

{L_ACL_VIEW}

- -

{L_ACL_VIEW_EXPLAIN}

- -
- » {L_PERMISSION_TYPE} -
- - - - - - - -

{L_ACL_SET}

- -

{L_ACL_SET_EXPLAIN}

- -
- -
- » {L_PERMISSION_TYPE} -
- - -
- -
- {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} - {L_SELECT_TYPE}: - - -
-
- - -

- - - - - -
- - {S_HIDDEN_FIELDS} - - - -

- -
- - - {S_FORM_TOKEN} -
- -

- -
- - - - \ No newline at end of file diff --git a/phpBB/adm/style/acp_php_info.html b/phpBB/adm/style/acp_php_info.html deleted file mode 100644 index de065c4896..0000000000 --- a/phpBB/adm/style/acp_php_info.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - -

{L_ACP_PHP_INFO}

- -

{L_ACP_PHP_INFO_EXPLAIN}

- -
- {PHPINFO} -
- - \ No newline at end of file diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html deleted file mode 100644 index eec975ad25..0000000000 --- a/phpBB/adm/style/acp_profile.html +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - - « {L_BACK} - -

{L_TITLE}

- -

{L_EXPLAIN}

- - -
-

{L_WARNING}

-

{ERROR_MSG}

-
- - -
- - - -
- {L_TITLE} -
-

{L_FIELD_TYPE_EXPLAIN}
-
{FIELD_TYPE}
-
- -
-

{L_FIELD_IDENT_EXPLAIN}
-
{FIELD_IDENT}
-
- -
-

{L_FIELD_IDENT_EXPLAIN}
-
-
- -
-

{L_DISPLAY_PROFILE_FIELD_EXPLAIN}
-
-
-
-
- -
- {L_VISIBILITY_OPTION} -
-

{L_DISPLAY_AT_PROFILE_EXPLAIN}
-
checked="checked" />
-
-
-

{L_DISPLAY_AT_REGISTER_EXPLAIN}
-
checked="checked" />
-
-
-

{L_REQUIRED_FIELD_EXPLAIN}
-
checked="checked" />
-
-
-

{L_HIDE_PROFILE_FIELD_EXPLAIN}
-
checked="checked" />
-
-
- - -
- -
- - -
- {L_LANG_SPECIFIC} -
-
-
-
-
-

{L_FIELD_DESCRIPTION_EXPLAIN}
-
-
- -
-

{L_DEFAULT_VALUE_EXPLAIN}
-
-
- - -
-
- -
{L_EDIT_DROPDOWN_LANG_EXPLAIN} - -
{L_LANG_OPTIONS_EXPLAIN} - -
- -
- -
{L_FIRST_OPTION}
-
{L_SECOND_OPTION}
- -
- -
- -
- {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} - -
- - - -
- {L_TITLE} - -
-

{option.EXPLAIN}
-
{option.FIELD}
-
- -
- -
- -
- -
- {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} - -
- - - - -
- {options.LANGUAGE} - -
-

{options.field.L_EXPLAIN}
- {options.field.FIELD} -
- -
- - -
- -
- -
- {S_HIDDEN_FIELDS} - - {S_FORM_TOKEN} -
- - - -
- - - -

{L_ACP_CUSTOM_PROFILE_FIELDS}

- - -
-

{L_WARNING}

-

{L_CUSTOM_FIELDS_NOT_TRANSLATED}

-
- - - - - - - - - - - - - - - - - - - - - - - -
{L_FIELD_IDENT}{L_FIELD_TYPE}{L_OPTIONS}
{fields.FIELD_IDENT}{fields.FIELD_TYPE}{fields.L_ACTIVATE_DEACTIVATE} | {L_TRANSLATE} - - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN} - - {ICON_MOVE_UP} - {ICON_MOVE_DOWN} - - {ICON_MOVE_UP} - {ICON_MOVE_DOWN_DISABLED} - - - {ICON_EDIT} - - {ICON_EDIT_DISABLED} - - {ICON_DELETE} -
- -
- -
- - - - {S_FORM_TOKEN} -
-
- - - - diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html deleted file mode 100644 index 890a3ba569..0000000000 --- a/phpBB/adm/style/acp_prune_forums.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - -

{L_FORUM_PRUNE}

- -

{L_PRUNE_SUCCESS}

- - - - - - - - - - - - - - - - - - - - - - -
{L_FORUM}{L_TOPICS_PRUNED}{L_POSTS_PRUNED}
{pruned.FORUM_NAME}{pruned.NUM_TOPICS}{pruned.NUM_POSTS}
{L_NO_PRUNE}
- - - -

{L_ACP_PRUNE_FORUMS}

- -

{L_ACP_PRUNE_FORUMS_EXPLAIN}

- -
- -
- {L_SELECT_FORUM} -

{L_LOOK_UP_FORUMS_EXPLAIN}

-
-
-
-
-
- -

- -

-
- -
- - - - « {L_BACK} - -

{L_ACP_PRUNE_FORUMS}

- -

{L_ACP_PRUNE_FORUMS_EXPLAIN}

- -

{L_FORUM}

- -

{L_SELECTED_FORUMS}: {FORUM_LIST}

- -
- -
- {L_FORUM_PRUNE} -
-
-
-
-
-
-
-
-
-

{L_PRUNE_OLD_POLLS_EXPLAIN}
-
-
-
-
-
-
-
-
-
-
-
-
-
- -

- {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} - -

-
-
- - - - diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html deleted file mode 100644 index 0f2b23dcef..0000000000 --- a/phpBB/adm/style/acp_prune_users.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - -

{L_ACP_PRUNE_USERS}

- -

{L_ACP_PRUNE_USERS_EXPLAIN}

- -
- -
- {L_ACP_PRUNE_USERS} -
-
-
-
-
-
-
-
-
-

{L_JOINED_EXPLAIN}
-
-
-
-

{L_LAST_ACTIVE_EXPLAIN}
-
-
-
-
-
-
-
-

{L_SELECT_USERS_EXPLAIN}
-
-
[ {L_FIND_USERNAME} ]
-
-
-

{L_DELETE_USER_POSTS_EXPLAIN}
-
-
-
-
-

{L_DEACTIVATE_DELETE_EXPLAIN}
-
-
-
- -

- - -   - - {S_FORM_TOKEN} -

-
-
- - diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html deleted file mode 100644 index 9306e30269..0000000000 --- a/phpBB/adm/style/acp_ranks.html +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - « {L_BACK} - - - -

{L_ACP_MANAGE_RANKS}

- -

{L_ACP_RANKS_EXPLAIN}

- -
- -
- {L_ACP_RANKS} -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - - -

{L_ACP_MANAGE_RANKS}

- -

{L_ACP_RANKS_EXPLAIN}

- -
-
- {L_ACP_MANAGE_RANKS} - - - - - - - - - - - - - - - - - - - - -
{L_RANK_IMAGE}{L_RANK_TITLE}{L_RANK_MINIMUM}{L_ACTION}
{ranks.RANK_TITLE}  -  {ranks.RANK_TITLE}  -  {ranks.MIN_POSTS}{ICON_EDIT} {ICON_DELETE}
- -

- - {S_FORM_TOKEN} -

-
-
- - - - diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html deleted file mode 100644 index 23fcfbdeb8..0000000000 --- a/phpBB/adm/style/acp_reasons.html +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - « {L_BACK} - -

{L_TITLE}

- -

{L_REASON_EDIT_EXPLAIN}

- - -
-

{L_WARNING}

-

{ERROR_MSG}

-
- - - -

{L_AVAILABLE_TITLES}

- -

{S_AVAILABLE_TITLES}

- - -
- -
- {L_TITLE} -

{L_IS_TRANSLATED_EXPLAIN}{L_IS_NOT_TRANSLATED_EXPLAIN}

-
-
-
-
- -
-
{L_REASON_TITLE_TRANSLATED}
-
{TRANSLATED_TITLE}
-
- -
-
-
-
- -
-
{L_REASON_DESC_TRANSLATED}
-
{TRANSLATED_DESCRIPTION}
-
- - -

-   - - {S_FORM_TOKEN} -

-
-
- - - -

{L_ACP_REASONS}

- -

{L_ACP_REASONS_EXPLAIN}

- -
-
- {L_ACP_REASONS} - - - - - - - - - - - - - - - - - - - - -
{L_REASON}{L_USED_IN_REPORTS}{L_OPTIONS}
- {L_IS_TRANSLATED}{L_IS_NOT_TRANSLATED} - {reasons.REASON_TITLE} * -
{reasons.REASON_DESCRIPTION} -
{reasons.REASON_COUNT} - - {ICON_MOVE_UP_DISABLED} - {ICON_MOVE_DOWN} - - {ICON_MOVE_UP} - {ICON_MOVE_DOWN} - - {ICON_MOVE_UP} - {ICON_MOVE_DOWN_DISABLED} - - {ICON_EDIT} - - {ICON_DELETE} - - {ICON_DELETE_DISABLED} - -
- - - -

- - - - - {S_FORM_TOKEN} -

-
- -
- - - - diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html deleted file mode 100644 index 0879780749..0000000000 --- a/phpBB/adm/style/acp_search.html +++ /dev/null @@ -1,153 +0,0 @@ - - - - - -

{L_ACP_SEARCH_SETTINGS}

- -

{L_ACP_SEARCH_SETTINGS_EXPLAIN}

- - - - - - - -

{L_ACP_SEARCH_INDEX}

- - -

{L_CONTINUE_EXPLAIN}

- -
-
- {L_SUBMIT} -   - - {S_FORM_TOKEN} -
-
- - -

{L_ACP_SEARCH_INDEX_EXPLAIN}

- - - - - -
- -
- - {backend.S_HIDDEN_FIELDS} - - {L_INDEX_STATS}: {backend.L_NAME} ({L_ACTIVE}) - - - - - - - - - - - - - - - - - - - - - - -
{backend.L_NAME} ({L_ACTIVE})
{L_STATISTIC}{L_VALUE}{L_STATISTIC}{L_VALUE}
{backend.data.STATISTIC_1}:{backend.data.VALUE_1}{backend.data.STATISTIC_2}:{backend.data.VALUE_2}
- - - -

- - - - - -

- {S_FORM_TOKEN} -
- -
- - - - - - - diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html deleted file mode 100644 index 4b3bcddf1d..0000000000 --- a/phpBB/adm/style/acp_styles.html +++ /dev/null @@ -1,515 +0,0 @@ - - - - - - - « {L_BACK} - -

{L_TITLE}

- -

{L_EXPLAIN}

- -
- -
- {L_TITLE} -
-
-
{NAME}
-
-
-

{L_REPLACE_EXPLAIN}
-
-
- -

- - {S_FORM_TOKEN} -

-
-
- - - - « {L_BACK} - -

{L_TITLE}

- -

{L_EXPLAIN}

- - -
-

{L_IMAGESET_UPDATED}

-
- - - -
-

{L_NO_IMAGE}

-
- - - - - -
- -
- {L_SELECT_IMAGE} - {L_SELECT_IMAGE}:   -
- -
- {L_EDIT_IMAGESET} -
-
-
-
-
-
-
-
-
- -
- {L_IMAGE} -
-
-
-
-
-
-

{L_DIMENSIONS_EXPLAIN}
-
-
-
-
-
-

{L_AUTOMATIC_EXPLAIN}
-
-
-
-

{L_AUTOMATIC_EXPLAIN}
-
-
-
-
- -
- {L_SUBMIT} -    - {S_FORM_TOKEN} -
-
- - - - « {L_BACK} - -

{L_EDIT}

- -

{L_EDIT_EXPLAIN}

- -

{L_SELECTED}: {SELECTED_TEMPLATE}

- -
- - -
- {L_SELECT} -
-
-
-
- {S_FORM_TOKEN} -
- -
- - - - -
- -
- {L_EDITOR} - -
-
-
{TEMPLATE_FILE}
-
- -
-
-
-
- -
- -
- {L_SUBMIT} - {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} - -
-
- - - - - « {L_BACK} - -

{L_TEMPLATE_CACHE}

- -

{L_TEMPLATE_CACHE_EXPLAIN}

- -
-
- {L_TEMPLATE_CACHE} - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_CACHE_FILENAME}{L_CACHE_FILESIZE}{L_CACHE_CACHED}{L_CACHE_MODIFIED}{L_MARK}
{file.FILENAME}{file.FILESIZE}{file.CACHED}{file.MODIFIED}
{L_TEMPLATE_CACHE_EMPTY}
- -

- {L_MARK_ALL} :: {L_UNMARK_ALL}
- {S_FORM_TOKEN} - -

-
-
- - - - « {L_BACK} - -

{L_TITLE}

- -

{L_EXPLAIN}

- - -
-

{L_WARNING}

-

{ERROR_MSG}

-
- - -
- -
- {L_TITLE} -
-
-
{NAME}
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-

{L_DOWNLOAD_STORE_EXPLAIN}
-
-
-
-
-
-
{FORMAT_BUTTONS}
-
- -

- {S_FORM_TOKEN} - -

-
- - -
- - - -

{L_TITLE}

- -

{L_EXPLAIN}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - colspan="2">{uninstalled.NAME}
{L_COPYRIGHT}: {uninstalled.COPYRIGHT} -
- - - -
{L_NAME}{L_STYLE_USED_BY}{L_OPTIONS}{L_ACTIONS}
{L_INSTALLED}
{installed.NAME} *{installed.STYLE_COUNT} - {installed.S_OPTIONS} - - - {installed.L_STYLE_ACT_DEACT} | - - {installed.S_ACTIONS} - - | {L_PREVIEW} - -
{L_UNINSTALLED}
{L_NO_UNINSTALLED}
{L_INSTALL}
- - -
- -
- {L_CREATE} - {L_CREATE}: {L_FROM} -
- -
- - - - - « {L_BACK} - -

{L_TITLE}

- -

{L_EXPLAIN}

- - -
-

{L_WARNING}

-

{ERROR_MSG}

-
- - -
- -
- {L_TITLE} -
-
-
{NAME}
-
-
-
-
{COPYRIGHT}
-
- -
-
-
{TEMPLATE_NAME}
-
-
-
-
{THEME_NAME}
-
-
-
-
{IMAGESET_NAME}
-
- - -
-

{L_LOCATION_EXPLAIN}
-
-
-
- - -
- -
- {L_OPTIONS} -
-
-
-
-
- -
-
-
-
-
- - -
- -
- {L_SUBMIT} - - {S_FORM_TOKEN} -
- -
- - - - diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html deleted file mode 100644 index e82aee0e87..0000000000 --- a/phpBB/adm/style/acp_update.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - -

{L_VERSION_CHECK}

- -

{L_VERSION_CHECK_EXPLAIN}

- - -
-

{L_VERSION_UP_TO_DATE_ACP}

-
- -
-

{L_VERSION_NOT_UP_TO_DATE_ACP}

-
- - -
- -
-
-
{AUTO_VERSION}{CURRENT_VERSION}
-
-
-
-
{LATEST_VERSION}
-
-
- - - {L_UPDATE_INSTRUCTIONS_INCOMPLETE} -

- {UPDATE_INSTRUCTIONS} -

- - - {UPDATE_INSTRUCTIONS} -

- - - - - \ No newline at end of file diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html deleted file mode 100644 index 2e4b3ef8f2..0000000000 --- a/phpBB/adm/style/acp_users.html +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - -

{L_USER_ADMIN}

- -

{L_USER_ADMIN_EXPLAIN}

- -
- -
- {L_SELECT_USER} -
-
-
-
[ {L_FIND_USERNAME} ]
-
-
- -

- -

-
- -
- - - - « {L_BACK} - -

{L_USER_ADMIN}

- -

{L_USER_ADMIN_EXPLAIN}

- -
- -
- {L_USER_ADMIN_MOVE_POSTS} -
-

{L_MOVE_POSTS_EXPLAIN}
-
-
-
- -
- - {S_FORM_TOKEN} -
-
- - - - « {L_BACK} - -

{L_USER_ADMIN} :: {MANAGED_USERNAME}

- -

{L_USER_ADMIN_EXPLAIN}

- - -
-

{L_WARNING}

-

{ERROR_MSG}

-
- - -
- -
- {L_SELECT_FORM}: - {S_FORM_TOKEN} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- {L_ACP_USER_RANK} -
-
-
-
-
- -
- - {S_FORM_TOKEN} -
-
- - - - - - - -
- - - - - - - - - - - - - - - - - - -
{group.GROUP_TYPE}
{group.GROUP_NAME}{L_GROUP_DEFAULT}{L_GROUP_DEFAULT}{group.L_DEMOTE_PROMOTE} {L_GROUP_DELETE}
- - -
- {L_USER_GROUP_ADD}: - {S_FORM_TOKEN} -
- -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_FILENAME}{L_POST_TIME}{L_FILESIZE}{L_DOWNLOADS}{L_MARK}
{attach.REAL_FILENAME}
{L_PM}: {L_POST}: {attach.TOPIC_TITLE}
{attach.POST_TIME}{attach.SIZE}{attach.DOWNLOAD_COUNT}
- -
-

{L_USER_NO_ATTACHMENTS}

-
- -
- {L_SORT_BY}: - -
-
- - - - -
- -

{L_MARK_ALL}{L_UNMARK_ALL}

- {S_FORM_TOKEN} -
-
- - - -
- » {L_SET_USERS_PERMISSIONS}
- » {L_SET_USERS_FORUM_PERMISSIONS} -
- -
- -
- {L_SELECT_FORUM}: - - {S_FORM_TOKEN} -
-
- -
 
- - - - - - diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html deleted file mode 100644 index 20b5b60050..0000000000 --- a/phpBB/adm/style/acp_users_avatar.html +++ /dev/null @@ -1,76 +0,0 @@ -
enctype="multipart/form-data"> - -
- {L_ACP_USER_AVATAR} -
-

{L_AVATAR_EXPLAIN}
-
{AVATAR_IMAGE}
-
-
- - -
-
-
-
-
-

{L_UPLOAD_AVATAR_URL_EXPLAIN}
-
-
- - -
-

{L_LINK_REMOTE_AVATAR_EXPLAIN}
-
-
-
-

{L_LINK_REMOTE_SIZE_EXPLAIN}
-
px X px
-
- - -
-
-
-
- - -
- -
- {L_AVATAR_GALLERY} -
-
-
 
-
-
- - - - - - - - - - - - - -
{avatar_row.avatar_column.AVATAR_NAME}
-
-
- -
- -
- - - - -
- - {S_FORM_TOKEN} -
- -
\ No newline at end of file diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html deleted file mode 100644 index e11a8e6ec1..0000000000 --- a/phpBB/adm/style/acp_users_feedback.html +++ /dev/null @@ -1,76 +0,0 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_REPORT_BY}{L_IP}{L_TIME}{L_FEEDBACK}{L_MARK}
{log.USERNAME}{log.IP}{log.DATE} - {log.ACTION} -
» [ {log.DATA} ] -
- -
-

{L_NO_ENTRIES}

-
- - -
- {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} - -
-
- - - - - -
-   - -

{L_MARK_ALL}{L_UNMARK_ALL}

-
- - -

{L_ADD_FEEDBACK}

- -

{L_ADD_FEEDBACK_EXPLAIN}

- -
- {L_ACP_USER_FEEDBACK} -
-
-
-
- -
- -
- {S_FORM_TOKEN} -
\ No newline at end of file diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html deleted file mode 100644 index 0611ccba46..0000000000 --- a/phpBB/adm/style/acp_users_overview.html +++ /dev/null @@ -1,144 +0,0 @@ -
- -
- {L_ACP_USER_OVERVIEW} -
-

{L_NAME_CHARS_EXPLAIN}
-
-
[ {L_USE_PERMISSIONS} ]
-
- -
-
-
{USER_INACTIVE_REASON}
-
- -
-
-
{USER_REGISTERED}
-
- -
-
-
{REGISTERED_IP}
-
[ {L_WHOIS} ]
-
- -
-
-
{USER_LASTACTIVE}
-
-
-
-
{USER_POSTS}
-
-
-
-
{USER_WARNINGS}
-
-
-

{L_FOUNDER_EXPLAIN}
-
-
-
-
-
-
-
-
-

{L_CONFIRM_EMAIL_EXPLAIN}
-
-
-
-

{L_CHANGE_PASSWORD_EXPLAIN}
-
-
-
-

{L_CONFIRM_PASSWORD_EXPLAIN}
-
-
- -

- - - {S_FORM_TOKEN} -

- -
-
- - - - - -
- -
- {L_USER_TOOLS} -
-
-
-
- - -
-

{L_DELETE_USER_EXPLAIN}
-
-
-
- - -

- - {S_FORM_TOKEN} -

- -
- -
- - diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html deleted file mode 100644 index 07a9bc5c78..0000000000 --- a/phpBB/adm/style/acp_users_prefs.html +++ /dev/null @@ -1,158 +0,0 @@ - - -
- -
- {L_UCP_PREFS_PERSONAL} -
-
-
-
-
-
-
-
-
-
-
-

{L_ALLOW_PM_EXPLAIN}
-
-
-
-
-
-
-
-
-
-

{L_NOTIFY_METHOD_EXPLAIN}
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

{L_BOARD_DATE_FORMAT_EXPLAIN}
-
-
style="display:none;">
-
-
- -
- {L_UCP_PREFS_POST} -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
- {L_UCP_PREFS_VIEW} -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{S_TOPIC_SORT_DAYS}
-
-
-
-
{S_TOPIC_SORT_KEY}
-
-
-
-
{S_TOPIC_SORT_DIR}
-
-
-
-
{S_POST_SORT_DAYS}
-
-
-
-
{S_POST_SORT_KEY}
-
-
-
-
{S_POST_SORT_DIR}
-
-
- -
- - {S_FORM_TOKEN} -
- -
\ No newline at end of file diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html deleted file mode 100644 index 0d1c6f8e46..0000000000 --- a/phpBB/adm/style/acp_users_profile.html +++ /dev/null @@ -1,66 +0,0 @@ -
- -
- {L_USER_PROFILE} -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

{L_BIRTHDAY_EXPLAIN}
-
{L_DAY}: {L_MONTH}: {L_YEAR}:
-
-
- - -
- {L_USER_CUSTOM_PROFILE_FIELDS} - -
-
for="{profile_fields.FIELD_ID}">{profile_fields.LANG_NAME}:
{profile_fields.LANG_EXPLAIN}
-
{profile_fields.FIELD}
- -
{profile_fields.ERROR}
- -
- -
- - -
- - {S_FORM_TOKEN} -
-
\ No newline at end of file diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html deleted file mode 100644 index 239d35f119..0000000000 --- a/phpBB/adm/style/acp_users_signature.html +++ /dev/null @@ -1,117 +0,0 @@ - - - -
- - -
- {L_ADMIN_SIG_PREVIEW} -

{SIGNATURE_PREVIEW}

-
- - -
- {L_SIGNATURE} -

{L_SIGNATURE_EXPLAIN}

- -
- - - - - - - - - - - - - - - - - - - {L_FONT_SIZE}: - -

- - onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')" /> - - - -
- -

- -
-
- -
-
-
- - - - - - - - - -
-
{L_OPTIONS}: {BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}
-
-
- -
-   - - {S_FORM_TOKEN} -
-
\ No newline at end of file diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html deleted file mode 100644 index 9bd0bf11a0..0000000000 --- a/phpBB/adm/style/acp_words.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - « {L_BACK} - -

{L_ACP_WORDS}

- -

{L_ACP_WORDS_EXPLAIN}

- -
- -
- {L_EDIT_WORD} -
-
-
-
-
-
-
-
- {S_HIDDEN_FIELDS} - -

-   - - {S_FORM_TOKEN} -

-
-
- - - -

{L_ACP_WORDS}

- -

{L_ACP_WORDS_EXPLAIN}

- -
- -
- {L_ACP_WORDS} -

- {S_HIDDEN_FIELDS} - -

- - - - - - - - - - - - - - - - - - -
{L_WORD}{L_REPLACEMENT}{L_ACTION}
{words.WORD}{words.REPLACEMENT} {ICON_EDIT}  {ICON_DELETE} 
- {S_FORM_TOKEN} -
-
- - - diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css deleted file mode 100644 index 8e6f0b7295..0000000000 --- a/phpBB/adm/style/admin.css +++ /dev/null @@ -1,1637 +0,0 @@ -/* phpBB 3.0 Admin Style Sheet - ------------------------------------------------------------------------ - Original author: subBlue ( http://www.subblue.com/ ) - Copyright 2007 phpBB Group ( http://www.phpbb.com/ ) - ------------------------------------------------------------------------ -*/ - -/* General markup styles ----------------------------------------- */ -* { - /* Reset browsers default margin, padding and font sizes */ - margin: 0; - padding: 0; - font-size: 100%; -} - -body, div, p, th, td, li, dd { - font-size: x-small; - voice-family: "\"}\""; - voice-family: inherit; - font-size: small -} - -html>body, html>div, html>p, html>th, html>td, html>li, html>dd { - font-size: small -} - -html { - color: #536482; - background: #DBD7D1; - /* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-ie browsers */ - height: 100%; - margin-bottom: 1px; -} - -body { - /* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */ - font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - color: #536482; - background: #DBD7D1; - font-size: 62.5%; /* This sets the default font size to be equivalent to 10px */ - margin: 10px 15px; -} - -img { - border: 0; -} - -h1 { - font-family: "Trebuchet MS", Helvetica, sans-serif; - font-size: 1.70em; - font-weight: normal; - color: #333333; -} - -h2, caption { - font-family: "Trebuchet MS", Helvetica, sans-serif; - font-size: 1.40em; - font-weight: normal; - color: #115098; - text-align: left; - margin-top: 25px; -} - -.rtl h2, .rtl caption { - text-align: right; -} - -h3, h4 { - font-family: "Trebuchet MS", Helvetica, sans-serif; - font-size: 1.20em; - text-decoration: none; - line-height: 1.20em; - margin-top: 25px; -} - -p { - margin-bottom: 0.7em; - line-height: 1.40em; - font-size: 0.90em; -} - -ul { - list-style: disc; - margin: 0 0 1em 2em; -} - -.rtl ul { - margin: 0 2em 1em 0; -} - -hr { - border: 0 none; - border-top: 1px dashed #999999; - margin-bottom: 5px; - padding-bottom: 5px; - height: 1px; -} - -.small { - font-size: 0.85em; -} - -/* General links */ -a:link, a:visited { - color: #105289; - text-decoration: none; -} - -a:hover { - color: #BC2A4D; - text-decoration: underline; -} - -a:active { - color: #368AD2; - text-decoration: none; -} - -.install-body p a { - font-weight: bold; -} - -/* Main blocks ----------------------------------------- */ -#wrap { - padding: 0 0 15px 0; - min-width: 615px; -} - -#page-header { - clear: both; - text-align: right; - background: url("../images/phpbb_logo.gif") top left no-repeat; - height: 49px; - font-size: 0.85em; - margin-bottom: 10px; -} - -.rtl #page-header { - text-align: left; - background: url("../images/phpbb_logo.gif") top right no-repeat; -} - -#page-header h1 { - color: #767676; - font-family: "Trebuchet MS",Helvetica,sans-serif; - font-size: 1.70em; - padding-top: 10px; -} - -#page-header p { - font-size: 1.00em; -} - -#page-header p#skip { - display: none; -} - -#page-body { - clear: both; - min-width: 700px; -} - -#page-footer { - clear: both; - font-size: 0.75em; - text-align: center; -} - -#content { - padding: 30px 10px 10px; - position: relative; -} - -#content h1 { - color: #115098; - line-height: 1.2em; - margin-bottom: 0; -} - -#main { - float: left; - width: 76%; - margin: 0 0 0 3%; - min-height: 350px; -} - -.rtl #main { - float: right; - margin: 0 3% 0 0; -} - -* html #main { - height: 350px; -} - -#page-body.simple-page-body { - padding: 0; - padding-right: 10px; - min-width: 0; -} - -/* Tabbed menu - Based on: http://www.alistapart.com/articles/slidingdoors2/ -----------------------------------------*/ -#tabs { - line-height: normal; - margin: 0 0 -6px 7px; - min-width: 600px; -} - -.rtl #tabs { - margin: 0 7px -6px 0; -} - -#tabs ul { - margin:0; - padding: 0; - list-style: none; -} - -#tabs li { - display: inline; - margin: 0; - padding: 0; - font-size: 0.85em; - font-weight: bold; -} - -#tabs a { - float: left; - background:url("../images/bg_tabs1.gif") no-repeat 0% -34px; - margin: 0 1px 0 0; - padding: 0 0 0 7px; - text-decoration: none; - position: relative; -} - -.rtl #tabs a { - float: right; -} - -#tabs a span { - float: left; - display: block; - background: url("../images/bg_tabs2.gif") no-repeat 100% -34px; - padding: 7px 10px 4px 4px; - color: #767676; - white-space: nowrap; - font-family: Arial, Helvetica, sans-serif; - text-transform: uppercase; - font-weight: bold; -} - -.rtl #tabs a span { - float: right; -} - -/* Commented Backslash Hack hides rule from IE5-Mac \*/ -#tabs a span, .rtl #tabs a span { float:none;} -/* End hack */ - -#tabs a:hover span { - color: #BC2A4D; -} - -#tabs #activetab a { - background-position: 0 0; - border-bottom: 1px solid #DCDEE2; -} - -#tabs #activetab a span { - background-position: 100% 0; - padding-bottom: 5px; - color: #23649F; -} - -#tabs a:hover { - background-position: 0 -69px; -} - -#tabs a:hover span { - background-position: 100% -69px; -} - -#tabs #activetab a:hover span { - color: #115098; -} - - -/* Main Panel ----------------------------------------- */ -#acp { - margin: 4px 0; - padding: 3px 1px; - min-width: 550px; - background-color: #FFFFFF; - border: 1px #999999 solid; -} - -.panel { - background: #F3F3F3 url("../images/innerbox_bg.gif") repeat-x top; - padding: 0; -} - -span.corners-top, span.corners-bottom, -span.corners-top span, span.corners-bottom span { - font-size: 1px; - line-height: 1px; - display: block; - height: 5px; - background-repeat: no-repeat; -} - -span.corners-top { - background-image: url("../images/corners_left.gif"); - background-position: 0 0; - margin: -4px -2px 0; -} - -span.corners-top span { - background-image: url("../images/corners_right.gif"); - background-position: 100% 0; -} - -span.corners-bottom { - background-image: url("../images/corners_left.gif"); - background-position: 0 100%; - margin: 0 -2px -4px; - clear: both; -} - -span.corners-bottom span { - background-image: url("../images/corners_right.gif"); - background-position: 100% 100%; -} - -/* WinIE tweaks \*/ -* html span.corners-top, * html span.corners-bottom { background-image: url("../images/corners_left.gif"); } -* html span.corners-top span, * html span.corners-bottom span { background-image: url("../images/corners_right.gif"); } -/* End tweaks */ - -/* Sub-navigation Menu ----------------------------------------- */ - -/* Toggle */ -#toggle { - padding: 5px; - width: 5%; - height: 100px; - position: absolute; - left: 15%; - top: 28px; - margin-left: 2px; -} - -.rtl #toggle { - left: 75%; - margin-right: 0; - margin-left: 6px; -} - -#toggle-handle { - display: block; - width: 18px; - height: 19px; - float: right; - background-image: url(../images/toggle.gif); -} - -.rtl #toggle-handle { - background-image: url(../images/toggle.gif); - background-position: 100% 50%; -} - -/* Menu */ -#menu { - float: left; - width: 20%; - font-size: 1.00em; - padding: 0; - border-right: 1px solid #CCCFD3; -} - -.rtl #menu { - float: right; - border: none; - border-left: 1px solid #CCCFD3; -} - -#menu p { - font-size: 0.85em; -} - -#menu ul { - list-style: none; - margin: 0; - padding: 0; -} - -/* Default list state */ -#menu li { - padding: 0; - margin: 0; - font-size: 0.85em; - font-weight: bold; - display: inline; -} - -/* Link styles for the sub-section links */ -#menu li span { - display: block; - padding: 3px 3px 3px 8px; - margin: 1px 0; - text-decoration: none; - font-weight: normal; - color: #138ECB; -} - -.rtl #menu li span { - padding: 3px 8px 3px 3px; -} - -#menu li a:hover, #menu li a:hover span { - text-decoration: none; - background-color: #FFFFFF; - color: #BC2A4D; -} - -#menu li a:active, #menu li a:active span { - color: #F632A0; -} - -#menu li#activemenu a span { - text-decoration: none; - font-weight: bold; - color: #1180B7; - background: transparent url("../images/arrow_right.gif") 0% 50% no-repeat; -} - -.rtl #menu li#activemenu a span { - background: transparent url("../images/arrow_left.gif") 100% 50% no-repeat; -} - -#menu li#activemenu a:hover span, #menu li#activemenu span { - text-decoration: none; - font-weight: bold; - color: #BC2A4D; - background: #FFFFFF url("../images/arrow_right.gif") 1% 50% no-repeat; -} - -.rtl #menu li#activemenu a:hover span, .rtl #menu li#activemenu span { - background: #FFFFFF url("../images/arrow_left.gif") 99% 50% no-repeat; -} - -#menu li a:active, #menu li a:active span, #menu li#activemenu a:active span { - color: #F632A0; -} - -#menu li span.completed { - text-decoration: none; - padding: 3px 3px 3px 12px; - background: url("../images/arrow_down.gif") 1% 50% no-repeat; -} - -.rtl #menu li span.completed { - text-decoration: none; - padding: 3px 12px 3px 3px; - background: url("../images/arrow_down.gif") 99% 50% no-repeat; -} - -#menu li.header { - font-family: Tahoma, Helvetica, sans-serif; - display: block; - font-weight: bold; - color: #115098; - border-bottom: 1px solid #327AA5; - padding: 4px 0 2px; - margin-top: 15px; - text-transform: uppercase; - font-size: 0.75em; -} - -/* Table styles ----------------------------------------- */ - -table { - width: 100%; - border: 1px solid #CCCFD3; - background-color: #FFFFFF; - padding: 1px; -} - -th { - padding: 3px 4px; - color: #FFFFFF; - background: #70AED3 url("../images/gradient2b.gif") bottom left repeat-x; - border-top: 1px solid #6DACD2; - border-bottom: 1px solid #327AA5; - text-align: left; - font-size: 0.75em; - text-transform: uppercase; -} - -td { - text-align: left; - font-size: 0.85em; - padding: 4px; - line-height: 1.20em; -} - -.rtl th, .rtl td { - text-align: right; -} - -table.type2 { - border: none; - background: none; - padding: 0; -} - -table.type2 th { - background: none; - border-top: none; - text-align: center; - color: #115098; - padding: 2px 0; -} - -table.type2 td { - padding: 0; - font-size: 1em; -} - -table.type2 td.name { - padding: 2px; - vertical-align: middle; -} - -table.type3 { - float: right; - width: 300px; - border: none; - background-color: transparent; - padding: 0; -} - -.rtl table.type3 { - float: left; -} - -table.type3 thead th { - background-color: transparent; - border-top: none; - text-align: center; - color: #115098; - padding: 0 3px; - font-size: 0.85em; - font-weight: normal; - text-transform: none; -} - -table.type3 tbody th { - border-top: none; - text-align: left; - text-transform: none; - padding: 0; - border: none; - font-size: 0.90em; - font-weight: normal; - width: 100%; -} - -.rtl table.type3 tbody th { - text-align: right; -} - -table.type3 td { - text-align: center; - padding: 1px; -} - -th.name { - text-align: left; - width: auto; -} - -.rtl th.name { - text-align: right; -} - -td.name { - text-align: left; - font-weight: bold; -} - -.rtl td.name { - text-align: right; -} - -.entry { - text-align: left; - font-weight: normal; -} - -.rtl .entry { - text-align: right; -} - -.row1 { background-color: #F9F9F9; } -.row2 { background-color: #DCEBFE; } -.row3 { background-color: #DBDFE2; } -.row4 { background-color: #E4E8EB; } -.col1 { background-color: #DCEBFE; } -.col2 { background-color: #F9F9F9; } - -.spacer { - background-color: #DBDFE2; - height: 1px; - line-height: 1px; -} - -/* General form styles -----------------------------------------*/ -fieldset { - margin: 15px 0; - padding: 10px; - border-top: 1px solid #D7D7D7; - border-right: 1px solid #CCCCCC; - border-bottom: 1px solid #CCCCCC; - border-left: 1px solid #D7D7D7; - background-color: #FFFFFF; - position: relative; -} - -.rtl fieldset { - border-top: 1px solid #D7D7D7; - border-right: 1px solid #D7D7D7; - border-bottom: 1px solid #CCCCCC; - border-left: 1px solid #CCCCCC; -} - -* html fieldset { - padding: 0 10px 5px 10px; -} - -fieldset p { - font-size: 0.85em; -} - -legend { - padding: 1px 0; - font-family: Tahoma,arial,Verdana,Sans-serif; - font-size: .9em; - font-weight: bold; - color: #115098; - margin-top: -.4em; - position: relative; - text-transform: none; - line-height: 1.2em; - top: 0; - vertical-align: middle; -} - -/* Hide from macIE \*/ -legend { top: -1.2em; } -/* end */ - -* html legend { - margin: 0 0 -10px -7px; - line-height: 1em; - font-size: .85em; -} - -/* Holly hack, .rtl comes after html */ -* html .rtl legend { - margin: 0; - margin-right: -7px; -} - -input, textarea { - font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 0.90em; - font-weight: normal; - cursor: text; - vertical-align: middle; - padding: 2px; - color: #111111; - border-left: 1px solid #AFAEAA; - border-top: 1px solid #AFAEAA; - border-right: 1px solid #D5D5C8; - border-bottom: 1px solid #D5D5C8; - background-color: #E3DFD8; -} - -.rtl input, .rtl textarea { - border-left: 1px solid #D5D5C8; - border-top: 1px solid #AFAEAA; - border-right: 1px solid #AFAEAA; - border-bottom: 1px solid #D5D5C8; -} - -input:hover, textarea:hover { - border-left: 1px solid #AFAEAA; - border-top: 1px solid #AFAEAA; - border-right: 1px solid #AFAEAA; - border-bottom: 1px solid #AFAEAA; - background-color: #E9E9E2; -} - -input.langvalue, textarea.langvalue { - width: 90%; -} - -optgroup, select { - font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 0.85em; - font-weight: normal; - font-style: normal; - cursor: pointer; - vertical-align: middle; - width: auto; - color: #000; -} - -optgroup { - font-size: 1.00em; - font-weight: bold; -} - -optgroup.disabled-options { - display: none; - background-color: gray; -} - -option { - padding: 0 1em 0 0; - color: #000; -} - -option.disabled-option { - color: graytext; -} - -.rtl option { - padding: 0 0 0 1em; -} - -.sep { - font-weight: bold; -} - -.username-coloured { - font-weight: bold; -} - -textarea { - font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 0.85em; - width: 60%; - padding: 2px; -} - -label { - cursor: pointer; - font-size: 0.85em; - padding: 0 5px 0 0; -} - -.rtl label { - padding: 0 0 0 5px; -} - -label input { - font-size: 1.00em; - vertical-align: middle; -} - -label img { - vertical-align: middle; -} - -fieldset.quick, p.quick { - margin: 0 0 5px; - padding: 5px 0 0; - border: none; - background-color: transparent; - text-align: right; -} - -.rtl fieldset.quick, .rtl p.quick { - text-align: left; -} - -fieldset.quick legend { - display: none; -} - -fieldset.tabulated { - background: none; - margin: 0; - padding: 0; - padding-top: 5px; - border: 0; -} - -fieldset.tabulated legend { - display: none; -} - -fieldset.nobg { - margin: 15px 0 0 0; - padding: 0; - border: none; - background-color: transparent; -} - -fieldset.display-options { - margin: 15px 0 2px 0; - padding: 0 0 4px 0; - border: none; - background-color: transparent; - text-align: center; - font-size: 0.75em; -} - -fieldset.display-options select, fieldset.display-options input, fieldset.display-options label { - font-size: 1.00em; - vertical-align: middle; -} - -select option.disabled { - background-color: #bbb; - color: #fff; -} - -/* Special case inputs */ -select#board_timezone, -select#full_folder_action { - width: 95%; -} - -/* Definition list layout for forms - Other general def. list properties defined in prosilver_main.css ----------------------------------------- */ -dl { - font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 1.00em; -} - -dt { - float: left; - width: auto; -} - -.rtl dt { - float: right; -} - -dd { color: #666666;} -dd + dd { padding-top: 5px;} -dt span { padding: 0 5px 0 0;} -.rtl dt span { padding: 0 0 0 5px;} - -dt .explain { font-style: italic;} - -dt label { - font-size: 1.00em; - text-align: left; - font-weight: bold; - color: #4A5A73; -} - -.rtl dt label { - text-align: right; -} - -dd label { - font-size: 1.00em; - white-space: nowrap; - margin: 0 10px 0 0; - color: #4A5A73; -} - -.rtl dd label { - margin: 0 0 0 10px; -} - -html>body dd label input { vertical-align: text-bottom;} /* Tweak for Moz to align checkboxes/radio buttons nicely */ - -dd input { - font-size: 1.00em; - max-width: 100%; -} - -dd select { - font-size: 100%; - width: auto; - max-width: 100%; -} - -dd textarea { - font-size: 0.90em; - width: 90%; -} - -dd select { - width: auto; - font-size: 1.00em; -} - -fieldset dl { - margin-bottom: 10px; - font-size: 0.85em; -} - -fieldset dt { - width: 45%; - text-align: left; - border: none; - border-right: 1px solid #CCCCCC; - padding-top: 3px; -} - -.rtl fieldset dt { - text-align: right; - border: none; - border-left: 1px solid #CCCCCC; -} - -fieldset dd { - margin: 0 0 0 45%; - padding: 0 0 0 5px; - border: none; - border-left: 1px solid #CCCCCC; - vertical-align: top; - font-size: 1.00em; -} - -.rtl fieldset dd { - margin: 0 45% 0 0; - padding: 0 5px 0 0; - border: none; - border-right: 1px solid #CCCCCC; -} - -dd.full, .rtl dd.full { - margin: 0; - border: 0; - padding: 0; - padding-top: 3px; - text-align: center; - width: 95%; -} - -/* Hover highlights for form rows */ -fieldset dl:hover dt, fieldset dl:hover dd { - border-color: #666666; -} - -fieldset dl:hover dt label { - color: #000000; -} - -fieldset dl dd label:hover { - color: #BC2A4D; -} - -input:focus, textarea:focus { - border: 1px solid #BC2A4D; - background-color: #E9E9E2; - color: #BC2A4D; -} - -/* Submit button fieldset or paragraph ----------------------------------------- */ -fieldset.submit-buttons { - text-align: center; - border: none; - background-color: transparent; - margin: 0; - padding: 4px; - margin-top: -1px; -} - -p.submit-buttons { - text-align: center; - margin: 0; - padding: 4px; - margin-top: 10px; -} - -fieldset.submit-buttons input, p.submit-buttons input { - padding: 3px 2px; -} - -fieldset.submit-buttons legend { - display: none; -} - -/* Input field styles ----------------------------------------- */ - -input.radio, input.permissions-checkbox { - width: auto !important; - background-color: transparent; - border: none; - cursor: default; -} - -input.full, -textarea.full { - width: 99%; -} - -* html input.full, * html textarea.full { width: 95%;} -input.medium { width: 50%;} -input.narrow { width: 25%;} -input.tiny { width: 10%;} -input.autowidth { width: auto !important;} -.box2 .inputbox { background-color: #E9E9E9;} - -/* Form button styles ----------------------------------------- */ -a.button1, input.button1, input.button3, -a.button2, input.button2 { - width: auto !important; - padding: 1px 3px 0 3px; - font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - color: #000; - font-size: 0.85em; - background: #EFEFEF url("../images/bg_button.gif") repeat-x top; - cursor: pointer; -} - -a.button1, input.button1 { - font-weight: bold; - border: 1px solid #666666; -} - -/* Alternative button */ -a.button2, input.button2 { - border: 1px solid #666666; -} - -/* button in the style of the form buttons */ -a.button1, a.button1:link, a.button1:visited, a.button1:active, -a.button2, a.button2:link, a.button2:visited, a.button2:active { - text-decoration: none; - color: #000000; - padding: 4px 8px; -} - -/* Hover states */ -a.button1:hover, input.button1:hover, -a.button2:hover, input.button2:hover { - border: 1px solid #BC2A4D; - background: #EFEFEF url("../images/bg_button.gif") repeat bottom; - color: #BC2A4D; -} - -input.disabled { - font-weight: normal; - color: #666666; -} - -/* Pagination ----------------------------------------- */ -.pagination { - height: 1%; /* IE tweak (holly hack) */ - width: auto; - text-align: right; - margin-top: 5px; - font-size: 0.85em; - padding-bottom: 2px; -} - -.rtl .pagination { - text-align: left; -} - -.pagination strong, -.pagination b { - font-weight: normal; -} - -.pagination span.page-sep { - display:none; -} - -.pagination span strong { - padding: 0 2px; - margin: 0 2px; - font-weight: normal; - font-size: 0.85em; - color: #FFFFFF; - background: #4692BF; - border: 1px solid #4692BF; -} - -.pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active { - font-weight: normal; - font-size: 0.85em; - text-decoration: none; - color: #5C758C; - margin: 0 2px; - padding: 0 2px; - background: #ECEDEE; - border: 1px solid #B4BAC0; -} - -.pagination span a:hover { - border-color: #368AD2; - background: #368AD2; - color: #FFFFFF; - text-decoration: none; -} - -.pagination img { - vertical-align: middle; -} - - -/* Action Highlighting ----------------------------------------- */ -.successbox, .errorbox { - padding: 8px; - margin: 10px 0; - color: #FFFFFF; - text-align: center; -} - -.success { - color: #228822; -} - -.error { - color: #BC2A4D; -} - -.successbox { - background-color: #228822; -} - -.errorbox { - background-color: #BC2A4D; -} - -* html .errorbox, * html .successbox { height: 1%; } /* Pixel shift fix for IE */ - -.successbox h3, .errorbox h3 { - color: #FFFFFF; - margin: 0 0 0.5em; - font-size: 1.10em; - font-family: "Lucida Grande",Verdana,Helvetica,Arial,sans-serif; -} - -.successbox p, .errorbox p { - color: #FFFFFF; - font-size: 0.85em; - margin-bottom: 0; -} - -.errorbox a:link, .errorbox a:active, .errorbox a:visited, -.successbox a:link, .successbox a:active, .successbox a:visited { - color: #DBD7D1; - text-decoration: underline; - font-weight: bold; -} - -.errorbox a:hover, .successbox a:hover { - color: #FFFFFF; - text-decoration: none; - font-weight: bold; -} - -/* Special cases for the error page */ -#errorpage #page-header a { - font-weight: bold; - line-height: 6em; -} - -#errorpage #content { - padding-top: 10px; -} - -#errorpage #content h1 { - color: #DF075C; -} - -#errorpage #content h2 { - margin-top: 20px; - margin-bottom: 5px; - border-bottom: 1px solid #CCCCCC; - padding-bottom: 5px; - color: #333333; -} - -/* Tooltip for permission roles */ -.tooltip { - width: 200px; - color: #000; - text-align: center; - border: 1px solid #AAA; -} - -.tooltip span.top { - background: #EFEFEF; - font-weight: bold; - padding: 2px; -} - -.tooltip span.bottom { - padding: 5px; - color: #000000; - background: #FFFFFF; -} - -/* - Format Buttons for signature editor -*/ -#format-buttons { - margin: 15px 0 2px 0; -} - -#format-buttons input, #format-buttons select { - vertical-align: middle; -} - -/* Nice method for clearing floated blocks without having to insert any extra markup - From http://www.positioniseverything.net/easyclearing.html -.clearfix:after, #tabs:after, .row:after, #content:after, fieldset dl:after, #page-body:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -}*/ - -.clearfix, #tabs, .row, #content, fieldset dl, #page-body { - height: 1%; - overflow: hidden; -} - -/* Syntax Highlighting ----------------------------------------- */ -.sourcenum { - color: gray; - font-family: Monaco, 'Courier New', monospace; - font-size: 1.25em; - font-weight: bold; - line-height: 1.20em; - text-align: right; - padding: 0; -} - -.rtl .sourcenum { - text-align: left; -} - -.source { - font-family: Monaco, 'Courier New', monospace; - font-size: 1.25em; - line-height: 1.20em; - padding: 0; -} - -.syntaxbg { - color: #FFFFFF; -} - -.syntaxcomment { - color: #FF8000; -} - -.syntaxdefault { - color: #0000BB; -} - -.syntaxhtml { - color: #000000; -} - -.syntaxkeyword { - color: #007700; -} - -.syntaxstring { - color: #DD0000; -} - -/* Permission interface ----------------------------------------- */ - -fieldset.permissions legend { - text-transform: none; -} - -fieldset.permissions legend input{ - height: 1.1em; -} - -/* Permission sections */ -fieldset.permissions .permissions-simple { - text-align: left; - padding-top: 3px; -} - -.rtl fieldset.permissions .permissions-simple { - text-align: right; -} - -fieldset.permissions .permissions-advanced { - padding: 10px 0 0 5px; - vertical-align: top; - clear: right; -} - -.rtl fieldset.permissions .permissions-advanced { - padding: 10px 5px 0 0; - clear: left; -} - -fieldset.permissions .permissions-switch { - float: right; -} - -.rtl fieldset.permissions .permissions-switch { - float: left; -} - -fieldset.permissions .padding { -} - -.permissions-switch a { - text-decoration: underline; - font-size: 0.90em; -} - -.permissions-reset { - margin-top: -6px; - padding-bottom: 10px; -} - -.permissions-reset a { - font-size: .8em; -} - -/* Tabbed menu */ -.permissions-category { - line-height: normal; - margin: 0 0 -1px 7px; - min-width: 570px; - font-size: 0.85em; -} - -.rtl .permissions-category { - margin: 0 7px -1px 0; -} - -.permissions-category ul { - margin: 0; - padding: 0; - list-style: none; -} - -.permissions-category li { - display: inline; - margin: 0; - padding: 0; - font-size: 1em; - font-weight: bold; -} - -.permissions-category a { - float: left; - background: url("../images/bg_tabs_alt1.gif") no-repeat 0% -35px; - margin: 0 1px 0 0; - padding: 0 0 0 6px; - text-decoration: none; - position: relative; -} - -.rtl .permissions-category a { - float: right; -} - -.permissions-category a span.tabbg { - float: left; - display: block; - background: url("../images/bg_tabs_alt2.gif") no-repeat 100% -35px; - padding: 7px 12px 6px 6px; - color: #536482; - white-space: nowrap; -} - -.rtl .permissions-category a span.tabbg { - float: right; -} - -/* Commented Backslash Hack hides rule from IE5-Mac \*/ -.permissions-category a span.tabbg, .rtl .permissions-category a span.tabbg { float: none;} -/* End hack */ - -.permissions-category a:hover span.tabbg { - color: #DD6900; -} - -.permissions-category .activetab a { - background-position: 0 0; -} - -.permissions-category .activetab a span.tabbg { - background-position: 100% 0; - padding-bottom: 7px; - color: #333333; -} - -.permissions-category a:hover { - background-position: 0 -70px; -} - -.permissions-category a:hover span.tabbg { - background-position: 100% -70px; -} - -.permissions-category .activetab a:hover span.tabbg { - color: #333333; - background-position: 100% 0; -} - -.permissions-category .activetab a:hover { - background-position: 0 0; -} - -.permissions-category a span.colour { - border: 1px solid #536482; - display: block; - float: left; - width: 10px; - height: 10px; - margin: 0 5px 0 0; -} - -/* Most browsers will have to live with a left aligned icon in RTL mode, as (currently) only Firefox 3.0 Alpha 3 renders it correctly without destroying it -.rtl .permissions-category a span.colour { - float: right; - margin: 0 0 0 5px; -} -*/ - -.permissions-category .activetab span.colour { - border-color: #333333; -} - -.permissions-category a:hover span.colour { - border-color: #DD6900; -} - -.permissions-category .activetab a:hover span.colour { - border-color: #333333; -} - -/* Permission preset colours */ -.permissions-preset-yes span.colour, -.yes { - background-color: #86F786; -} - -.permissions-preset-custom span.colour { - background-color: #B2BBDD; -} - -.permissions-preset-never span.colour { - background-color: #DD0000; -} - -.permissions-preset-no span.colour, -.never { - background-color: #EFB0B2; -} - -/* Permission panel ----------------------------------------- */ -.permissions-panel { - float: left; - background-color: #CADCEB; - width: 100%; -} - -.rtl .permissions-panel { - float: right; -} - -.permissions-panel span.corners-top { - background-image: url("../images/corners_left2.gif"); -} - -.permissions-panel span.corners-top span { - background-image: url("../images/corners_right2.gif"); -} - -.permissions-panel span.corners-bottom { - background-image: url("../images/corners_left2.gif"); -} - -.permissions-panel span.corners-bottom span { - background-image: url("../images/corners_right2.gif"); -} - -.permissions-panel span.corners-top, .permissions-panel span.corners-bottom, -.permissions-panel span.corners-top span, .permissions-panel span.corners-bottom span { - font-size: 1px; - line-height: 1px; - display: block; - height: 5px; - background-repeat: no-repeat; -} - -.permissions-panel span.corners-top { - background-image: url("../images/corners_left2.gif"); - background-position: 0 0; - margin: 0 0; -} - -.permissions-panel span.corners-top span { - background-image: url("../images/corners_right2.gif"); - background-position: 100% 0; -} - -.permissions-panel span.corners-bottom { - background-image: url("../images/corners_left2.gif"); - background-position: 0 100%; - margin: 0 0; - clear: both; -} - -.permissions-panel span.corners-bottom span { - background-image: url("../images/corners_right2.gif"); - background-position: 100% 100%; -} - -/* Permission table ----------------------------------------- */ -.permissions-panel .tablewrap { - margin: 0 10px; -} - -.permissions-panel table { - width: 100%; -} - -.permissions-panel th { - text-transform: none; -} - -.permissions-panel th.value { - text-align: center; -} - -.permissions-panel th.name { - text-align: left; - width: auto; - text-transform: none; -} - -.rtl .permissions-panel th.name { - text-align: right; -} - -.permissions-panel th.permissions-name { - border: none; - color: #536482; - font-weight: normal; -} - -.permissions-panel th.permissions-name a.trace { - display: inline; -} - -.permissions-panel th.row3 { - background-image: none; - background-color: #D1D7DC; - color: #536482; - border: none; -} - -.permissions-panel th.row4 { - background-image: none; - background-color: #E4E8EB; - color: #536482; - border: none; -} - -.permissions-panel th a:link, .permissions-panel th a:hover, .permissions-panel th a:visited { - display: block; - color: #FFFFFF; - text-decoration: underline; -} - -.permissions-panel td.permissions-yes label:hover { - background-color: #86F786; -} - -.permissions-panel td.permissions-no label:hover { - background-color: #EFB0B2; -} - -.permissions-panel td.permissions-never label:hover { - background-color: #DD0000; -} - -.permissions-panel td { - padding: 0; - text-align: center; - width: 10%; -} - -.permissions-panel td label { - display: block; - margin: 0; - padding: 0; -} - -/* Classes for additional tasks ----------------------------------------- */ - -.phpinfo { - overflow: auto; - width: 99%; - direction: ltr; -} - -.phpinfo td, .phpinfo th, .phpinfo h2, .phpinfo h1 { - text-align: left; -} diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html deleted file mode 100644 index c9e89980d8..0000000000 --- a/phpBB/adm/style/colour_swatch.html +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - -{L_COLOUR_SWATCH} - - - - - - - - - - \ No newline at end of file diff --git a/phpBB/adm/style/confirm_body.html b/phpBB/adm/style/confirm_body.html deleted file mode 100644 index 2fbb1a60d7..0000000000 --- a/phpBB/adm/style/confirm_body.html +++ /dev/null @@ -1,20 +0,0 @@ - - -
- -
-

{MESSAGE_TITLE}

-

{MESSAGE_TEXT}

- - {S_HIDDEN_FIELDS} - -
-   - -
- -
- -
- - diff --git a/phpBB/adm/style/confirm_body_prune.html b/phpBB/adm/style/confirm_body_prune.html deleted file mode 100644 index 9481386231..0000000000 --- a/phpBB/adm/style/confirm_body_prune.html +++ /dev/null @@ -1,30 +0,0 @@ - - -
- -
-

{MESSAGE_TITLE}

-

{MESSAGE_TEXT}

- - {S_HIDDEN_FIELDS} - -
-   - -
- -

{L_PRUNE_USERS_LIST}

-

{L_PRUNE_USERS_LIST_DEACTIVATE}

{L_PRUNE_USERS_LIST_DELETE}

- -
- - »
{users.USERNAME} [{L_USER_ADMIN}]
- - -

- -
- -
- - diff --git a/phpBB/adm/style/custom_profile_fields.html b/phpBB/adm/style/custom_profile_fields.html deleted file mode 100644 index 351397d3c7..0000000000 --- a/phpBB/adm/style/custom_profile_fields.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - checked="checked" /> - - - - - - - - - {L_DAY}: - {L_MONTH}: - {L_YEAR}: - diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js deleted file mode 100644 index 93d0059609..0000000000 --- a/phpBB/adm/style/editor.js +++ /dev/null @@ -1,399 +0,0 @@ -/** -* bbCode control by subBlue design [ www.subBlue.com ] -* Includes unixsafe colour palette selector by SHS` -*/ - -// Startup variables -var imageTag = false; -var theSelection = false; - -// Check for Browser & Platform for PC & IE specific bits -// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html -var clientPC = navigator.userAgent.toLowerCase(); // Get client info -var clientVer = parseInt(navigator.appVersion); // Get browser version - -var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1)); -var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1)); - -var baseHeight; -window.onload = initInsertions; - -/** -* Shows the help messages in the helpline window -*/ -function helpline(help) -{ - document.forms[form_name].helpbox.value = help_line[help]; -} - -/** -* Fix a bug involving the TextRange object. From -* http://www.frostjedi.com/terra/scripts/demo/caretBug.html -*/ -function initInsertions() -{ - var doc; - if(document.forms[form_name]) - { - doc = document; - } - else - { - doc = opener.document; - } - - var textarea = doc.forms[form_name].elements[text_name]; - if (is_ie && typeof(baseHeight) != 'number') - { - textarea.focus(); - baseHeight = doc.selection.createRange().duplicate().boundingHeight; - // document.body.focus(); - } -} - -/** -* bbstyle -*/ -function bbstyle(bbnumber) -{ - if (bbnumber != -1) - { - bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]); - } - else - { - insert_text('[*]'); - document.forms[form_name].elements[text_name].focus(); - } -} - -/** -* Apply bbcodes -*/ -function bbfontstyle(bbopen, bbclose) -{ - theSelection = false; - - var textarea = document.forms[form_name].elements[text_name]; - - textarea.focus(); - - if ((clientVer >= 4) && is_ie && is_win) - { - // Get text selection - theSelection = document.selection.createRange().text; - - if (theSelection) - { - // Add tags around selection - document.selection.createRange().text = bbopen + theSelection + bbclose; - document.forms[form_name].elements[text_name].focus(); - theSelection = ''; - return; - } - } - else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0)) - { - mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose); - document.forms[form_name].elements[text_name].focus(); - theSelection = ''; - return; - } - - //The new position for the cursor after adding the bbcode - var caret_pos = getCaretPosition(textarea).start; - var new_pos = caret_pos + bbopen.length; - - // Open tag - insert_text(bbopen + bbclose); - - // Center the cursor when we don't have a selection - // Gecko and proper browsers - if (!isNaN(textarea.selectionStart)) - { - textarea.selectionStart = new_pos; - textarea.selectionEnd = new_pos; - } - // IE - else if (document.selection) - { - var range = textarea.createTextRange(); - range.move("character", new_pos); - range.select(); - storeCaret(textarea); - } - - textarea.focus(); - return; -} - -/** -* Insert text at position -*/ -function insert_text(text, spaces, popup) -{ - var textarea; - - if (!popup) - { - textarea = document.forms[form_name].elements[text_name]; - } - else - { - textarea = opener.document.forms[form_name].elements[text_name]; - } - - if (spaces) - { - text = ' ' + text + ' '; - } - - if (!isNaN(textarea.selectionStart)) - { - var sel_start = textarea.selectionStart; - var sel_end = textarea.selectionEnd; - - mozWrap(textarea, text, '') - textarea.selectionStart = sel_start + text.length; - textarea.selectionEnd = sel_end + text.length; - } - - else if (textarea.createTextRange && textarea.caretPos) - { - if (baseHeight != textarea.caretPos.boundingHeight) - { - textarea.focus(); - storeCaret(textarea); - } - var caret_pos = textarea.caretPos; - caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text; - - } - else - { - textarea.value = textarea.value + text; - } - - if (!popup) - { - textarea.focus(); - } - -} - -/** -* Add inline attachment at position -*/ -function attach_inline(index, filename) -{ - insert_text('[attachment=' + index + ']' + filename + '[/attachment]'); - document.forms[form_name].elements[text_name].focus(); -} - -/** -* Add quote text to message -*/ -function addquote(post_id, username) -{ - var message_name = 'message_' + post_id; - var theSelection = ''; - var divarea = false; - - if (document.all) - { - divarea = document.all[message_name]; - } - else - { - divarea = document.getElementById(message_name); - } - - // Get text selection - not only the post content :( - if (window.getSelection) - { - theSelection = window.getSelection().toString(); - } - else if (document.getSelection) - { - theSelection = document.getSelection(); - } - else if (document.selection) - { - theSelection = document.selection.createRange().text; - } - - if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null) - { - if (divarea.innerHTML) - { - theSelection = divarea.innerHTML.replace(/
/ig, '\n'); - theSelection = theSelection.replace(//ig, '\n'); - theSelection = theSelection.replace(/<\;/ig, '<'); - theSelection = theSelection.replace(/>\;/ig, '>'); - theSelection = theSelection.replace(/&\;/ig, '&'); - } - else if (document.all) - { - theSelection = divarea.innerText; - } - else if (divarea.textContent) - { - theSelection = divarea.textContent; - } - else if (divarea.firstChild.nodeValue) - { - theSelection = divarea.firstChild.nodeValue; - } - } - - if (theSelection) - { - insert_text('[quote="' + username + '"]' + theSelection + '[/quote]'); - } - - return; -} - -/** -* From http://www.massless.org/mozedit/ -*/ -function mozWrap(txtarea, open, close) -{ - var selLength = txtarea.textLength; - var selStart = txtarea.selectionStart; - var selEnd = txtarea.selectionEnd; - var scrollTop = txtarea.scrollTop; - - if (selEnd == 1 || selEnd == 2) - { - selEnd = selLength; - } - - var s1 = (txtarea.value).substring(0,selStart); - var s2 = (txtarea.value).substring(selStart, selEnd) - var s3 = (txtarea.value).substring(selEnd, selLength); - - txtarea.value = s1 + open + s2 + close + s3; - txtarea.selectionStart = selEnd + open.length + close.length; - txtarea.selectionEnd = txtarea.selectionStart; - txtarea.focus(); - txtarea.scrollTop = scrollTop; - - return; -} - -/** -* Insert at Caret position. Code from -* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130 -*/ -function storeCaret(textEl) -{ - if (textEl.createTextRange) - { - textEl.caretPos = document.selection.createRange().duplicate(); - } -} - -/** -* Color pallette -*/ -function colorPalette(dir, width, height) -{ - var r = 0, g = 0, b = 0; - var numberList = new Array(6); - var color = ''; - - numberList[0] = '00'; - numberList[1] = '40'; - numberList[2] = '80'; - numberList[3] = 'BF'; - numberList[4] = 'FF'; - - document.writeln(''); - - for (r = 0; r < 5; r++) - { - if (dir == 'h') - { - document.writeln(''); - } - - for (g = 0; g < 5; g++) - { - if (dir == 'v') - { - document.writeln(''); - } - - for (b = 0; b < 5; b++) - { - color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]); - document.write(''); - } - - if (dir == 'v') - { - document.writeln(''); - } - } - - if (dir == 'h') - { - document.writeln(''); - } - } - document.writeln('
'); - document.write('#' + color + ''); - document.writeln('
'); -} - - -/** -* Caret Position object -*/ -function caretPosition() -{ - var start = null; - var end = null; -} - - -/** -* Get the caret position in an textarea -*/ -function getCaretPosition(txtarea) -{ - var caretPos = new caretPosition(); - - // simple Gecko/Opera way - if (txtarea.selectionStart || txtarea.selectionStart == 0) - { - caretPos.start = txtarea.selectionStart; - caretPos.end = txtarea.selectionEnd; - } - // dirty and slow IE way - else if (document.selection) - { - // get current selection - var range = document.selection.createRange(); - - // a new selection of the whole textarea - var range_all = document.body.createTextRange(); - range_all.moveToElementText(txtarea); - - // calculate selection start point by moving beginning of range_all to beginning of range - var sel_start; - for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++) - { - range_all.moveStart('character', 1); - } - - txtarea.sel_start = sel_start; - - // we ignore the end value for IE, this is already dirty enough and we don't need it - caretPos.start = txtarea.sel_start; - caretPos.end = txtarea.sel_start; - } - - return caretPos; -} \ No newline at end of file diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html deleted file mode 100755 index 783e89d6bf..0000000000 --- a/phpBB/adm/style/install_convert.html +++ /dev/null @@ -1,134 +0,0 @@ - - - - -

{TITLE}

- -

{BODY}

- - - -
- -

{TITLE}

- -

{BODY}

- - -
-

{ERROR_TITLE}

-

{ERROR_MSG}

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_AVAILABLE_CONVERTORS}
{L_SOFTWARE}{L_VERSION}{L_AUTHOR}{L_OPTIONS}
{convertors.SOFTWARE}{convertors.VERSION}{convertors.AUTHOR}{L_CONVERT}
{L_NO_CONVERTORS}---
- - - -
- -
-
- -
-
-
- -
-
- -
- - - -
- - - - -
- -
- - {checks.LEGEND} -

{checks.LEGEND_EXPLAIN}

- - -
-

{checks.TITLE_EXPLAIN}
-
{checks.RESULT}
-
- - - -
- - - -
- - - - -
- -
- - {options.LEGEND} - - -
-

{options.TITLE_EXPLAIN}
-
{options.CONTENT}
-
- - - - -
- - - -

{L_MESSAGE}

- -
- {S_HIDDEN} - disabled="disabled" onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" name="submit" value="{L_SUBMIT}" /> -
- - -
- - - \ No newline at end of file diff --git a/phpBB/adm/style/install_error.html b/phpBB/adm/style/install_error.html deleted file mode 100755 index ad53433207..0000000000 --- a/phpBB/adm/style/install_error.html +++ /dev/null @@ -1,8 +0,0 @@ - - -
-

{MESSAGE_TITLE}

-

{MESSAGE_TEXT}

-
- - \ No newline at end of file diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html deleted file mode 100755 index 2ec3581ef4..0000000000 --- a/phpBB/adm/style/install_footer.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html deleted file mode 100755 index fbb6a7b409..0000000000 --- a/phpBB/adm/style/install_header.html +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - -{META} -{PAGE_TITLE} - - - - - - - - -
- - -
-
- -
- -
-
- -
- - -
diff --git a/phpBB/adm/style/install_install.html b/phpBB/adm/style/install_install.html deleted file mode 100755 index 79006fba69..0000000000 --- a/phpBB/adm/style/install_install.html +++ /dev/null @@ -1,77 +0,0 @@ - - -
- -

{TITLE}

-

{BODY}

- - -
- - - - -
- -
- - {checks.LEGEND} -

{checks.LEGEND_EXPLAIN}

- - -
-
{checks.TITLE}:
{checks.TITLE_EXPLAIN}
-
{checks.RESULT}
-
- - - -
- - - -
- - - - -
- -
- - {options.LEGEND} - - -
-

{options.TITLE_EXPLAIN}
-
{options.CONTENT}
-
- - - - -
- - - -

{L_DL_CONFIG}

-

{L_DL_CONFIG_EXPLAIN}

- -
- {L_DL_CONFIG} - {S_HIDDEN} -   -
- - - -
- {L_SUBMIT} - {S_HIDDEN} - -
- - -
- - diff --git a/phpBB/adm/style/install_main.html b/phpBB/adm/style/install_main.html deleted file mode 100755 index 2c318bfd65..0000000000 --- a/phpBB/adm/style/install_main.html +++ /dev/null @@ -1,6 +0,0 @@ - - -

{TITLE}

-

{BODY}

- - \ No newline at end of file diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html deleted file mode 100644 index 318795f4cf..0000000000 --- a/phpBB/adm/style/install_update.html +++ /dev/null @@ -1,393 +0,0 @@ - - - - - -
-

{L_NOTICE}

-

{ERROR_MSG}

-
- - - - -
-

{L_IN_PROGRESS}

-

{L_IN_PROGRESS_EXPLAIN}

-
- - - - -
-

{L_NOTICE}

-

{WARNING_MSG}

-
- - -
- -

{L_UPDATE_INSTALLATION}

-

{L_UPDATE_INSTALLATION_EXPLAIN}

- -
- -
- -
- - - -
- -

{L_UPDATE_SUCCESS}

-

{L_UPDATE_SUCCESS_EXPLAIN}

- -
- -
- -
- - - - - -

{L_VERSION_CHECK}

- -

{L_VERSION_CHECK_EXPLAIN}

- - -
-

{L_VERSION_UP_TO_DATE}

-
- -
-

{L_VERSION_NOT_UP_TO_DATE}

-
- - -
- -
-
-
{CURRENT_VERSION}
-
-
-
-
{LATEST_VERSION}
-
- -
-
-
{PACKAGE_VERSION}
-
- -
- - - -
- -
-

{L_UPDATE_DATABASE_EXPLAIN}

- -
- -
- - -
- -
-

{L_CHECK_FILES_UP_TO_DATE}

- -
- -
- - - - - - -

{L_PERFORM_DATABASE_UPDATE}

- -

- {L_PERFORM_DATABASE_UPDATE_EXPLAIN}
-

- -

- -
- -
- {L_RUN_DATABASE_SCRIPT} - - -
- -
- - - -

{L_UPDATE_DB_SUCCESS}

- -

- -
- -
-

{L_CHECK_FILES_EXPLAIN}

- -
- -
- - - - - - - -
-

{L_UPDATE_SUCCESS}

-

{L_ALL_FILES_UP_TO_DATE}

-
- - -

{L_COLLECTED_INFORMATION}

- -

{L_COLLECTED_INFORMATION_EXPLAIN}

- - -
-

{L_NO_UPDATE_FILES}

- -

{L_NO_UPDATE_FILES_EXPLAIN}


- - {NO_UPDATE_FILES} - -
- - -
- - - - - -
- - -

{files.TITLE}

- - -

{files.EXPLAIN}

- -
- -
- {files.L_STATUS} - -
- -
{files.FILENAME}
- -
- {files.DIR_PART}
{files.FILE_PART}
- -
{L_FILE_USED}: {files.CUSTOM_ORIGINAL} - - -
{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS} - -
-
 [ {files.L_SHOW_DIFF} ]{L_BINARY_FILE}
- -
- - - -
-
-
-
[ {files.L_SHOW_DIFF} ]{L_BINARY_FILE}
-
-
-
-
[{L_SHOW_DIFF_FINAL}] 
-
-
-
-
[{L_SHOW_DIFF_FINAL}] 
-
- -
- -
- {files.L_STATUS} - - - - - - -
-
-
[{L_SHOW_DIFF_FINAL}] 
-
- -
-
-
[{L_SHOW_DIFF_FINAL}]
-
-
-
-
[{L_SHOW_DIFF_FINAL}]
-
- - -
- -
- {files.L_STATUS} - - - - - - - - -
- - -
- -
- -
- -
- -

{L_UPDATE_METHOD}

- -

{L_UPDATE_METHOD_EXPLAIN}

- -
-     -
- - - - - - - -

{L_DOWNLOAD_UPDATE_METHOD}

- -

{L_DOWNLOAD_UPDATE_METHOD_EXPLAIN}

- -
- -
- {L_SELECT_DOWNLOAD_FORMAT} -
-
-
{RADIO_BUTTONS}
-
-
- -
- {S_HIDDEN_FIELDS} -     -
- -
- -

- -

{L_MAPPING_FILE_STRUCTURE}

- - - - - - - - - - - - - - - - - - - -
{L_ARCHIVE_FILE} {L_DESTINATION}
{location.SOURCE}»{location.DESTINATION}
- - - -

{L_SELECT_FTP_SETTINGS}

- -
- - -
-

{L_CONNECTION_SUCCESS}

-
- -
-

{L_CONNECTION_FAILED}
{ERROR_MSG}

-
- - -
- {L_FTP_SETTINGS} -
-
-
{UPLOAD_METHOD}
-
- -
-

{data.EXPLAIN}
-
-
- -
- -
- {S_HIDDEN_FIELDS} - - - -
- -
- - - - diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html deleted file mode 100644 index efbe1d045c..0000000000 --- a/phpBB/adm/style/install_update_diff.html +++ /dev/null @@ -1,253 +0,0 @@ - - - - - - - - -{META} -{PAGE_TITLE} - - - - - - - - - - - - - - - - -
- - -
-
-
- -
-
- - -
{L_NUM_CONFLICTS}: {NUM_CONFLICTS}
- - {DIFF_CONTENT} -
-
- -
-
-
- - - \ No newline at end of file diff --git a/phpBB/adm/style/message_body.html b/phpBB/adm/style/message_body.html deleted file mode 100644 index 5d907e911c..0000000000 --- a/phpBB/adm/style/message_body.html +++ /dev/null @@ -1,8 +0,0 @@ - - -
class="successbox"class="errorbox"> -

{MESSAGE_TITLE}

-

{MESSAGE_TEXT}

-
- - \ No newline at end of file diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html deleted file mode 100644 index d5316aae08..0000000000 --- a/phpBB/adm/style/overall_footer.html +++ /dev/null @@ -1,34 +0,0 @@ - -
-
- -
-
-
- - - - -
- - - \ No newline at end of file diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html deleted file mode 100644 index e883e66d80..0000000000 --- a/phpBB/adm/style/overall_header.html +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - -{META} -{PAGE_TITLE} - - - - - - - - -
- - -
-
- -
- -
-
- -
- -
-
- - - -
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html deleted file mode 100644 index 19a24a48b8..0000000000 --- a/phpBB/adm/style/permission_mask.html +++ /dev/null @@ -1,139 +0,0 @@ - - - - - -
-

{p_mask.NAME} [{p_mask.L_ACL_TYPE}]

- - -
-
- - - - - - {p_mask.f_mask.PADDING}{p_mask.f_mask.PADDING}{p_mask.f_mask.NAME} - - - -
-
- -
- -
{L_NO_ROLE_AVAILABLE}
- -
- - - - - -
- - - diff --git a/phpBB/adm/style/permission_roles_mask.html b/phpBB/adm/style/permission_roles_mask.html deleted file mode 100644 index e88c5fd2ba..0000000000 --- a/phpBB/adm/style/permission_roles_mask.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - -
{L_FORUM}: {role_mask.NAME}
{L_USERS}
- - {role_mask.users.USERNAME} :: - - {L_USERS_NOT_ASSIGNED} - -
{L_GROUPS}
- - {role_mask.groups.GROUP_NAME} :: - - {L_GROUPS_NOT_ASSIGNED} - -
- - - -

{L_ROLE_NOT_ASSIGNED}

- - \ No newline at end of file diff --git a/phpBB/adm/style/permission_trace.html b/phpBB/adm/style/permission_trace.html deleted file mode 100644 index 186bb28b67..0000000000 --- a/phpBB/adm/style/permission_trace.html +++ /dev/null @@ -1,58 +0,0 @@ - - -
- - « {L_BACK} - -

{L_TRACE_FOR}: {PERMISSION_USERNAME} / {FORUM_NAME} / {PERMISSION}

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_TRACE_WHO}{L_ACL_SETTING}{L_TRACE_TOTAL}{L_INFORMATION}
{trace.WHO}{L_ACL_NEVER}{L_ACL_YES}{L_ACL_NO}{L_ACL_NEVER}{L_ACL_YES}{L_ACL_NO}{trace.INFORMATION}
{L_TRACE_RESULT} - {L_ACL_NEVER}{L_ACL_YES}{L_ACL_NO} - {L_RESULTING_PERMISSION}
- -
- -
- - diff --git a/phpBB/adm/style/permissions.js b/phpBB/adm/style/permissions.js deleted file mode 100644 index adc8995c23..0000000000 --- a/phpBB/adm/style/permissions.js +++ /dev/null @@ -1,359 +0,0 @@ -/** -* Hide and show all checkboxes -* status = true (show boxes), false (hide boxes) -*/ -function display_checkboxes(status) -{ - var form = document.getElementById('set-permissions'); - var cb = document.getElementsByTagName('input'); - var display; - - //show - if (status) - { - display = 'inline'; - } - //hide - else - { - display = 'none'; - } - - for (var i = 0; i < cb.length; i++ ) - { - if (cb[i].className == 'permissions-checkbox') - { - cb[i].style.display = display; - } - - } - -} - - -/** -* Change opacity of element -* e = element -* value = 0 (hidden) till 10 (fully visible) -*/ -function set_opacity(e, value) { - e.style.opacity = value/10; - - //IE opacity currently turned off, because of its astronomical stupidity - //e.style.filter = 'alpha(opacity=' + value*10 + ')'; -} - -/** -* Reset the opacity and checkboxes -* block_id = id of the element that needs to be toggled -*/ -function toggle_opacity(block_id) { - var cb = document.getElementById('checkbox' + block_id); - var fs = document.getElementById('perm' + block_id); - - if (cb.checked) - { - set_opacity(fs, 5); - } - else - { - set_opacity(fs, 10); - } -} - -/** -* Reset the opacity and checkboxes -* value = 0 (checked) and 1 (unchecked) -* except_id = id of the element not to hide -*/ -function reset_opacity(status, except_id) { - var perm = document.getElementById('set-permissions'); - var fs = perm.getElementsByTagName('fieldset'); - var opacity = 5; - - if (status) - { - opacity = 10; - } - - for (var i = 0; i < fs.length; i++ ) - { - if (fs[i].className != 'quick') - { - set_opacity(fs[i], opacity); - } - } - - if (typeof(except_id) != 'undefined') - { - set_opacity(document.getElementById('perm' + except_id), 10); - } - - //reset checkboxes too - marklist('set-permissions', 'inherit', !status); -} - - -/** -* Check whether we have a full radiobutton row of true -* index = offset for the row of inputs (0 == first row, 1 == second, 2 == third), -* rb = array of radiobuttons -*/ -function get_radio_status(index, rb) -{ - for (var i = index; i < rb.length; i = i + 3 ) - { - if (rb[i].checked != true) - { - if (i > index) - { - //at least one is true, but not all (custom) - return 2; - } - //first one is not true - return 0; - } - } - - // all radiobuttons true - return 1; -} - -/** -* Set tab colours -* id = panel the tab needs to be set for, -* init = initialising on open, -* quick = If no calculation needed, this contains the colour -*/ -function set_colours(id, init, quick) -{ - var table = document.getElementById('table' + id); - var tab = document.getElementById('tab' + id); - - if (typeof(quick) != 'undefined') - { - tab.className = 'permissions-preset-' + quick + ' activetab'; - return; - } - - var rb = table.getElementsByTagName('input'); - var colour = 'custom'; - - var status = get_radio_status(0, rb); - - if (status == 1) - { - colour = 'yes'; - } - else if (status == 0) - { - // We move on to No - status = get_radio_status(1, rb); - - if (status == 1) - { - colour = 'no'; - } - else if (status == 0) - { - // We move on to Never - status = get_radio_status(2, rb); - - if (status == 1) - { - colour = 'never'; - } - } - } - - if (init) - { - tab.className = 'permissions-preset-' + colour; - } - else - { - tab.className = 'permissions-preset-' + colour + ' activetab'; - } -} - -/** -* Initialise advanced tab colours on first load -* block_id = block that is opened -*/ -function init_colours(block_id) -{ - var block = document.getElementById('advanced' + block_id); - var panels = block.getElementsByTagName('div'); - var tab = document.getElementById('tab' + id); - - for (var i = 0; i < panels.length; i++) - { - if(panels[i].className == 'permissions-panel') - { - set_colours(panels[i].id.replace(/options/, ''), true); - } - } - - tab.className = tab.className + ' activetab'; -} - -/** -* Show/hide option panels -* value = suffix for ID to show -* adv = we are opening advanced permissions -* view = called from view permissions -*/ -function swap_options(pmask, fmask, cat, adv, view) -{ - id = pmask + fmask + cat; - active_option = active_pmask + active_fmask + active_cat; - - var old_tab = document.getElementById('tab' + active_option); - var new_tab = document.getElementById('tab' + id); - var adv_block = document.getElementById('advanced' + pmask + fmask); - - if (adv_block.style.display == 'block' && adv == true) - { - dE('advanced' + pmask + fmask, -1); - reset_opacity(1); - display_checkboxes(false); - return; - } - - // no need to set anything if we are clicking on the same tab again - if (new_tab == old_tab && !adv) - { - return; - } - - // init colours - if (adv && (pmask + fmask) != (active_pmask + active_fmask)) - { - init_colours(pmask + fmask); - display_checkboxes(true); - reset_opacity(1); - } - else if (adv) - { - //Checkbox might have been clicked, but we need full visibility - display_checkboxes(true); - reset_opacity(1); - } - - // set active tab - old_tab.className = old_tab.className.replace(/\ activetab/g, ''); - new_tab.className = new_tab.className + ' activetab'; - - if (id == active_option && adv != true) - { - return; - } - - dE('options' + active_option, -1); - - //hiding and showing the checkbox - if (document.getElementById('checkbox' + active_pmask + active_fmask)) - { - dE('checkbox' + pmask + fmask, -1); - - if ((pmask + fmask) != (active_pmask + active_fmask)) - { - document.getElementById('checkbox' + active_pmask + active_fmask).style.display = 'inline'; - } - } - - if (!view) - { - dE('advanced' + active_pmask + active_fmask, -1); - } - - if (!view) - { - dE('advanced' + pmask + fmask, 1); - } - dE('options' + id, 1); - - active_pmask = pmask; - active_fmask = fmask; - active_cat = cat; -} - -/** -* Mark all radio buttons in one panel -* id = table ID container, s = status ['y'/'u'/'n'] -*/ -function mark_options(id, s) -{ - var t = document.getElementById(id); - - if (!t) - { - return; - } - - var rb = t.getElementsByTagName('input'); - - for (var r = 0; r < rb.length; r++) - { - if (rb[r].id.substr(rb[r].id.length-1) == s) - { - rb[r].checked = true; - } - } -} - -function mark_one_option(id, field_name, s) -{ - var t = document.getElementById(id); - - if (!t) - { - return; - } - - var rb = t.getElementsByTagName('input'); - - for (var r = 0; r < rb.length; r++) - { - if (rb[r].id.substr(rb[r].id.length-field_name.length-3, field_name.length) == field_name && rb[r].id.substr(rb[r].id.length-1) == s) - { - rb[r].checked = true; - } - } -} - -/** -* Reset role dropdown field to Select role... if an option gets changed -*/ -function reset_role(id) -{ - var t = document.getElementById(id); - - if (!t) - { - return; - } - - t.options[0].selected = true; -} - -/** -* Load role and set options accordingly -*/ -function set_role_settings(role_id, target_id) -{ - settings = role_options[role_id]; - - if (!settings) - { - return; - } - - // Mark all options to no (unset) first... - mark_options(target_id, 'u'); - - for (var r in settings) - { - mark_one_option(target_id, r, (settings[r] == 1) ? 'y' : 'n'); - } -} diff --git a/phpBB/adm/style/progress_bar.html b/phpBB/adm/style/progress_bar.html deleted file mode 100644 index 00e1e5e885..0000000000 --- a/phpBB/adm/style/progress_bar.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - -
-

{L_PROGRESS}

- {L_PROGRESS} -

{L_PROGRESS_EXPLAIN}

-
- - - - \ No newline at end of file diff --git a/phpBB/adm/style/simple_body.html b/phpBB/adm/style/simple_body.html deleted file mode 100644 index 0b1e11b9a2..0000000000 --- a/phpBB/adm/style/simple_body.html +++ /dev/null @@ -1,8 +0,0 @@ - - -
-

{MESSAGE_TITLE}

-

{MESSAGE_TEXT}

-
- - \ No newline at end of file diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html deleted file mode 100644 index 65cf724c2f..0000000000 --- a/phpBB/adm/style/simple_footer.html +++ /dev/null @@ -1,31 +0,0 @@ - -

-
- - - - - - - diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html deleted file mode 100644 index 3e36c47988..0000000000 --- a/phpBB/adm/style/simple_header.html +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - -{META} -{PAGE_TITLE} - - - - - - - - -
diff --git a/phpBB/adm/style/tooltip.js b/phpBB/adm/style/tooltip.js deleted file mode 100644 index 20610b52fe..0000000000 --- a/phpBB/adm/style/tooltip.js +++ /dev/null @@ -1,251 +0,0 @@ -/* -javascript for Bubble Tooltips by Alessandro Fulciniti -- http://pro.html.it - http://web-graphics.com -obtained from: http://web-graphics.com/mtarchive/001717.php - -phpBB Development Team: - - modified to adhere to our coding guidelines - - integration into our design - - added ability to perform tooltips on select elements - - further adjustements -*/ - -var head_text, tooltip_mode; - -/** -* Enable tooltip replacements for links -*/ -function enable_tooltips_link(id, headline, sub_id) -{ - var links, i, hold; - - head_text = headline; - - if (!document.getElementById || !document.getElementsByTagName) - { - return; - } - - hold = document.createElement('span'); - hold.id = '_tooltip_container'; - hold.setAttribute('id', '_tooltip_container'); - hold.style.position = 'absolute'; - - document.getElementsByTagName('body')[0].appendChild(hold); - - if (id == null) - { - links = document.getElementsByTagName('a'); - } - else - { - links = document.getElementById(id).getElementsByTagName('a'); - } - - for (i = 0; i < links.length; i++) - { - if (sub_id) - { - if (links[i].id.substr(0, sub_id.length) == sub_id) - { - prepare(links[i]); - } - } - else - { - prepare(links[i]); - } - } - - tooltip_mode = 'link'; -} - -/** -* Enable tooltip replacements for selects -*/ -function enable_tooltips_select(id, headline, sub_id) -{ - var links, i, hold; - - head_text = headline; - - if (!document.getElementById || !document.getElementsByTagName) - { - return; - } - - hold = document.createElement('span'); - hold.id = '_tooltip_container'; - hold.setAttribute('id', '_tooltip_container'); - hold.style.position = 'absolute'; - - document.getElementsByTagName('body')[0].appendChild(hold); - - if (id == null) - { - links = document.getElementsByTagName('option'); - } - else - { - links = document.getElementById(id).getElementsByTagName('option'); - } - - for (i = 0; i < links.length; i++) - { - if (sub_id) - { - if (links[i].parentNode.id.substr(0, sub_id.length) == sub_id) - { - prepare(links[i]); - } - } - else - { - prepare(links[i]); - } - } - - tooltip_mode = 'select'; -} - -/** -* Prepare elements to replace -*/ -function prepare(element) -{ - var tooltip, text, desc, title; - - text = element.getAttribute('title'); - - if (text == null || text.length == 0) - { - return; - } - - element.removeAttribute('title'); - tooltip = create_element('span', 'tooltip'); - - title = create_element('span', 'top'); - title.appendChild(document.createTextNode(head_text)); - tooltip.appendChild(title); - - desc = create_element('span', 'bottom'); - desc.innerHTML = text; - tooltip.appendChild(desc); - - set_opacity(tooltip); - - element.tooltip = tooltip; - element.onmouseover = show_tooltip; - element.onmouseout = hide_tooltip; - - if (tooltip_mode == 'link') - { - element.onmousemove = locate; - } -} - -/** -* Show tooltip -*/ -function show_tooltip(e) -{ - document.getElementById('_tooltip_container').appendChild(this.tooltip); - locate(this); -} - -/** -* Hide tooltip -*/ -function hide_tooltip(e) -{ - var d = document.getElementById('_tooltip_container'); - if (d.childNodes.length > 0) - { - d.removeChild(d.firstChild); - } -} - -/** -* Set opacity on tooltip element -*/ -function set_opacity(element) -{ - element.style.filter = 'alpha(opacity:95)'; - element.style.KHTMLOpacity = '0.95'; - element.style.MozOpacity = '0.95'; - element.style.opacity = '0.95'; -} - -/** -* Create new element -*/ -function create_element(tag, c) -{ - var x = document.createElement(tag); - x.className = c; - x.style.display = 'block'; - return x; -} - -/** -* Correct positioning of tooltip container -*/ -function locate(e) -{ - var posx = 0; - var posy = 0; - - e = e.parentNode; - - if (e.offsetParent) - { - for (var posx = 0, posy = 0; e.offsetParent; e = e.offsetParent) - { - posx += e.offsetLeft; - posy += e.offsetTop; - } - } - else - { - posx = e.offsetLeft; - posy = e.offsetTop; - } - - if (tooltip_mode == 'link') - { - document.getElementById('_tooltip_container').style.top=(posy+20) + 'px'; - document.getElementById('_tooltip_container').style.left=(posx-20) + 'px'; - } - else - { - document.getElementById('_tooltip_container').style.top=(posy+30) + 'px'; - document.getElementById('_tooltip_container').style.left=(posx-205) + 'px'; - } - -/* - if (e == null) - { - e = window.event; - } - - if (e.pageX || e.pageY) - { - posx = e.pageX; - posy = e.pageY; - } - else if (e.clientX || e.clientY) - { - if (document.documentElement.scrollTop) - { - posx = e.clientX+document.documentElement.scrollLeft; - posy = e.clientY+document.documentElement.scrollTop; - } - else - { - posx = e.clientX+document.body.scrollLeft; - posy = e.clientY+document.body.scrollTop; - } - } -*/ -} diff --git a/phpBB/adm/style/viewsource.html b/phpBB/adm/style/viewsource.html deleted file mode 100644 index f127c9626f..0000000000 --- a/phpBB/adm/style/viewsource.html +++ /dev/null @@ -1,21 +0,0 @@ - -
-
-
-

{FILENAME}

- - - - - - - - - - -
{source.LINENUM}  {source.LINE}
- -
-
-
- \ No newline at end of file diff --git a/phpBB/adm/swatch.php b/phpBB/adm/swatch.php deleted file mode 100644 index e372c16b9b..0000000000 --- a/phpBB/adm/swatch.php +++ /dev/null @@ -1,53 +0,0 @@ -session_begin(false); -$auth->acl($user->data); -$user->setup(); - -// Set custom template for admin area -$template->set_custom_template($phpbb_root_path . 'adm/style', 'admin'); - -$template->set_filenames(array( - 'body' => 'colour_swatch.html') -); - -$form = request_var('form', ''); -$name = request_var('name', ''); - -// We validate form and name here, only id/class allowed -$form = (!preg_match('/^[a-z0-9_-]+$/i', $form)) ? '' : $form; -$name = (!preg_match('/^[a-z0-9_-]+$/i', $name)) ? '' : $name; - -$template->assign_vars(array( - 'OPENER' => $form, - 'NAME' => $name, - 'T_IMAGES_PATH' => "{$phpbb_root_path}images/", - - 'S_USER_LANG' => $user->lang['USER_LANG'], - 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], - 'S_CONTENT_ENCODING' => 'UTF-8', -)); - -$template->display('body'); - -garbage_collection(); - -?> \ No newline at end of file diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php new file mode 100644 index 0000000000..4b10039506 --- /dev/null +++ b/phpBB/admin/admin_board.php @@ -0,0 +1,366 @@ +sql_query($sql)) +{ + message_die(CRITICAL_ERROR, "Could not query config information in admin_board", "", __LINE__, __FILE__, $sql); +} +else +{ + while( $row = $db->sql_fetchrow($result) ) + { + $config_name = $row['config_name']; + $config_value = $row['config_value']; + $default_config[$config_name] = isset($HTTP_POST_VARS['submit']) ? str_replace("'", "\'", $config_value) : $config_value; + + $new[$config_name] = ( isset($HTTP_POST_VARS[$config_name]) ) ? $HTTP_POST_VARS[$config_name] : $default_config[$config_name]; + + if ($config_name == 'cookie_name') + { + $new['cookie_name'] = str_replace('.', '_', $new['cookie_name']); + } + + // Attempt to prevent a common mistake with this value, + // http:// is the protocol and not part of the server name + if ($config_name == 'server_name') + { + $new['server_name'] = str_replace('http://', '', $new['server_name']); + } + + // Attempt to prevent a mistake with this value. + if ($config_name == 'avatar_path') + { + $new['avatar_path'] = trim($new['avatar_path']); + if (strstr($new['avatar_path'], "\0") || !is_dir($phpbb_root_path . $new['avatar_path']) || !is_writable($phpbb_root_path . $new['avatar_path'])) + { + $new['avatar_path'] = $default_config['avatar_path']; + } + } + + if( isset($HTTP_POST_VARS['submit']) ) + { + $sql = "UPDATE " . CONFIG_TABLE . " SET + config_value = '" . str_replace("\'", "''", $new[$config_name]) . "' + WHERE config_name = '$config_name'"; + if( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Failed to update general configuration for $config_name", "", __LINE__, __FILE__, $sql); + } + } + } + + if( isset($HTTP_POST_VARS['submit']) ) + { + $message = $lang['Config_updated'] . "

" . sprintf($lang['Click_return_config'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + } +} + +$style_select = style_select($new['default_style'], 'default_style', "../templates"); +$lang_select = language_select($new['default_lang'], 'default_lang', "language"); +$timezone_select = tz_select($new['board_timezone'], 'board_timezone'); + +$disable_board_yes = ( $new['board_disable'] ) ? "checked=\"checked\"" : ""; +$disable_board_no = ( !$new['board_disable'] ) ? "checked=\"checked\"" : ""; + +$cookie_secure_yes = ( $new['cookie_secure'] ) ? "checked=\"checked\"" : ""; +$cookie_secure_no = ( !$new['cookie_secure'] ) ? "checked=\"checked\"" : ""; + +$html_tags = $new['allow_html_tags']; + +$override_user_style_yes = ( $new['override_user_style'] ) ? "checked=\"checked\"" : ""; +$override_user_style_no = ( !$new['override_user_style'] ) ? "checked=\"checked\"" : ""; + +$html_yes = ( $new['allow_html'] ) ? "checked=\"checked\"" : ""; +$html_no = ( !$new['allow_html'] ) ? "checked=\"checked\"" : ""; + +$bbcode_yes = ( $new['allow_bbcode'] ) ? "checked=\"checked\"" : ""; +$bbcode_no = ( !$new['allow_bbcode'] ) ? "checked=\"checked\"" : ""; + +$activation_none = ( $new['require_activation'] == USER_ACTIVATION_NONE ) ? "checked=\"checked\"" : ""; +$activation_user = ( $new['require_activation'] == USER_ACTIVATION_SELF ) ? "checked=\"checked\"" : ""; +$activation_admin = ( $new['require_activation'] == USER_ACTIVATION_ADMIN ) ? "checked=\"checked\"" : ""; + +$confirm_yes = ($new['enable_confirm']) ? 'checked="checked"' : ''; +$confirm_no = (!$new['enable_confirm']) ? 'checked="checked"' : ''; + +$allow_autologin_yes = ($new['allow_autologin']) ? 'checked="checked"' : ''; +$allow_autologin_no = (!$new['allow_autologin']) ? 'checked="checked"' : ''; + +$board_email_form_yes = ( $new['board_email_form'] ) ? "checked=\"checked\"" : ""; +$board_email_form_no = ( !$new['board_email_form'] ) ? "checked=\"checked\"" : ""; + +$gzip_yes = ( $new['gzip_compress'] ) ? "checked=\"checked\"" : ""; +$gzip_no = ( !$new['gzip_compress'] ) ? "checked=\"checked\"" : ""; + +$privmsg_on = ( !$new['privmsg_disable'] ) ? "checked=\"checked\"" : ""; +$privmsg_off = ( $new['privmsg_disable'] ) ? "checked=\"checked\"" : ""; + +$prune_yes = ( $new['prune_enable'] ) ? "checked=\"checked\"" : ""; +$prune_no = ( !$new['prune_enable'] ) ? "checked=\"checked\"" : ""; + +$smile_yes = ( $new['allow_smilies'] ) ? "checked=\"checked\"" : ""; +$smile_no = ( !$new['allow_smilies'] ) ? "checked=\"checked\"" : ""; + +$sig_yes = ( $new['allow_sig'] ) ? "checked=\"checked\"" : ""; +$sig_no = ( !$new['allow_sig'] ) ? "checked=\"checked\"" : ""; + +$namechange_yes = ( $new['allow_namechange'] ) ? "checked=\"checked\"" : ""; +$namechange_no = ( !$new['allow_namechange'] ) ? "checked=\"checked\"" : ""; + +$avatars_local_yes = ( $new['allow_avatar_local'] ) ? "checked=\"checked\"" : ""; +$avatars_local_no = ( !$new['allow_avatar_local'] ) ? "checked=\"checked\"" : ""; +$avatars_remote_yes = ( $new['allow_avatar_remote'] ) ? "checked=\"checked\"" : ""; +$avatars_remote_no = ( !$new['allow_avatar_remote'] ) ? "checked=\"checked\"" : ""; +$avatars_upload_yes = ( $new['allow_avatar_upload'] ) ? "checked=\"checked\"" : ""; +$avatars_upload_no = ( !$new['allow_avatar_upload'] ) ? "checked=\"checked\"" : ""; + +$smtp_yes = ( $new['smtp_delivery'] ) ? "checked=\"checked\"" : ""; +$smtp_no = ( !$new['smtp_delivery'] ) ? "checked=\"checked\"" : ""; + +$template->set_filenames(array( + "body" => "admin/board_config_body.tpl") +); + +// +// Escape any quotes in the site description for proper display in the text +// box on the admin page +// +$new['site_desc'] = str_replace('"', '"', $new['site_desc']); +$new['sitename'] = str_replace('"', '"', strip_tags($new['sitename'])); +$template->assign_vars(array( + "S_CONFIG_ACTION" => append_sid("admin_board.$phpEx"), + + "L_YES" => $lang['Yes'], + "L_NO" => $lang['No'], + "L_CONFIGURATION_TITLE" => $lang['General_Config'], + "L_CONFIGURATION_EXPLAIN" => $lang['Config_explain'], + "L_GENERAL_SETTINGS" => $lang['General_settings'], + "L_SERVER_NAME" => $lang['Server_name'], + "L_SERVER_NAME_EXPLAIN" => $lang['Server_name_explain'], + "L_SERVER_PORT" => $lang['Server_port'], + "L_SERVER_PORT_EXPLAIN" => $lang['Server_port_explain'], + "L_SCRIPT_PATH" => $lang['Script_path'], + "L_SCRIPT_PATH_EXPLAIN" => $lang['Script_path_explain'], + "L_SITE_NAME" => $lang['Site_name'], + "L_SITE_DESCRIPTION" => $lang['Site_desc'], + "L_DISABLE_BOARD" => $lang['Board_disable'], + "L_DISABLE_BOARD_EXPLAIN" => $lang['Board_disable_explain'], + "L_ACCT_ACTIVATION" => $lang['Acct_activation'], + "L_NONE" => $lang['Acc_None'], + "L_USER" => $lang['Acc_User'], + "L_ADMIN" => $lang['Acc_Admin'], + "L_VISUAL_CONFIRM" => $lang['Visual_confirm'], + "L_VISUAL_CONFIRM_EXPLAIN" => $lang['Visual_confirm_explain'], + "L_ALLOW_AUTOLOGIN" => $lang['Allow_autologin'], + "L_ALLOW_AUTOLOGIN_EXPLAIN" => $lang['Allow_autologin_explain'], + "L_AUTOLOGIN_TIME" => $lang['Autologin_time'], + "L_AUTOLOGIN_TIME_EXPLAIN" => $lang['Autologin_time_explain'], + "L_COOKIE_SETTINGS" => $lang['Cookie_settings'], + "L_COOKIE_SETTINGS_EXPLAIN" => $lang['Cookie_settings_explain'], + "L_COOKIE_DOMAIN" => $lang['Cookie_domain'], + "L_COOKIE_NAME" => $lang['Cookie_name'], + "L_COOKIE_PATH" => $lang['Cookie_path'], + "L_COOKIE_SECURE" => $lang['Cookie_secure'], + "L_COOKIE_SECURE_EXPLAIN" => $lang['Cookie_secure_explain'], + "L_SESSION_LENGTH" => $lang['Session_length'], + "L_PRIVATE_MESSAGING" => $lang['Private_Messaging'], + "L_INBOX_LIMIT" => $lang['Inbox_limits'], + "L_SENTBOX_LIMIT" => $lang['Sentbox_limits'], + "L_SAVEBOX_LIMIT" => $lang['Savebox_limits'], + "L_DISABLE_PRIVATE_MESSAGING" => $lang['Disable_privmsg'], + "L_ENABLED" => $lang['Enabled'], + "L_DISABLED" => $lang['Disabled'], + "L_ABILITIES_SETTINGS" => $lang['Abilities_settings'], + "L_MAX_POLL_OPTIONS" => $lang['Max_poll_options'], + "L_FLOOD_INTERVAL" => $lang['Flood_Interval'], + "L_FLOOD_INTERVAL_EXPLAIN" => $lang['Flood_Interval_explain'], + "L_SEARCH_FLOOD_INTERVAL" => $lang['Search_Flood_Interval'], + "L_SEARCH_FLOOD_INTERVAL_EXPLAIN" => $lang['Search_Flood_Interval_explain'], + + 'L_MAX_LOGIN_ATTEMPTS' => $lang['Max_login_attempts'], + 'L_MAX_LOGIN_ATTEMPTS_EXPLAIN' => $lang['Max_login_attempts_explain'], + 'L_LOGIN_RESET_TIME' => $lang['Login_reset_time'], + 'L_LOGIN_RESET_TIME_EXPLAIN' => $lang['Login_reset_time_explain'], + 'MAX_LOGIN_ATTEMPTS' => $new['max_login_attempts'], + 'LOGIN_RESET_TIME' => $new['login_reset_time'], + + "L_BOARD_EMAIL_FORM" => $lang['Board_email_form'], + "L_BOARD_EMAIL_FORM_EXPLAIN" => $lang['Board_email_form_explain'], + "L_TOPICS_PER_PAGE" => $lang['Topics_per_page'], + "L_POSTS_PER_PAGE" => $lang['Posts_per_page'], + "L_HOT_THRESHOLD" => $lang['Hot_threshold'], + "L_DEFAULT_STYLE" => $lang['Default_style'], + "L_OVERRIDE_STYLE" => $lang['Override_style'], + "L_OVERRIDE_STYLE_EXPLAIN" => $lang['Override_style_explain'], + "L_DEFAULT_LANGUAGE" => $lang['Default_language'], + "L_DATE_FORMAT" => $lang['Date_format'], + "L_SYSTEM_TIMEZONE" => $lang['System_timezone'], + "L_ENABLE_GZIP" => $lang['Enable_gzip'], + "L_ENABLE_PRUNE" => $lang['Enable_prune'], + "L_ALLOW_HTML" => $lang['Allow_HTML'], + "L_ALLOW_BBCODE" => $lang['Allow_BBCode'], + "L_ALLOWED_TAGS" => $lang['Allowed_tags'], + "L_ALLOWED_TAGS_EXPLAIN" => $lang['Allowed_tags_explain'], + "L_ALLOW_SMILIES" => $lang['Allow_smilies'], + "L_SMILIES_PATH" => $lang['Smilies_path'], + "L_SMILIES_PATH_EXPLAIN" => $lang['Smilies_path_explain'], + "L_ALLOW_SIG" => $lang['Allow_sig'], + "L_MAX_SIG_LENGTH" => $lang['Max_sig_length'], + "L_MAX_SIG_LENGTH_EXPLAIN" => $lang['Max_sig_length_explain'], + "L_ALLOW_NAME_CHANGE" => $lang['Allow_name_change'], + "L_AVATAR_SETTINGS" => $lang['Avatar_settings'], + "L_ALLOW_LOCAL" => $lang['Allow_local'], + "L_ALLOW_REMOTE" => $lang['Allow_remote'], + "L_ALLOW_REMOTE_EXPLAIN" => $lang['Allow_remote_explain'], + "L_ALLOW_UPLOAD" => $lang['Allow_upload'], + "L_MAX_FILESIZE" => $lang['Max_filesize'], + "L_MAX_FILESIZE_EXPLAIN" => $lang['Max_filesize_explain'], + "L_MAX_AVATAR_SIZE" => $lang['Max_avatar_size'], + "L_MAX_AVATAR_SIZE_EXPLAIN" => $lang['Max_avatar_size_explain'], + "L_AVATAR_STORAGE_PATH" => $lang['Avatar_storage_path'], + "L_AVATAR_STORAGE_PATH_EXPLAIN" => $lang['Avatar_storage_path_explain'], + "L_AVATAR_GALLERY_PATH" => $lang['Avatar_gallery_path'], + "L_AVATAR_GALLERY_PATH_EXPLAIN" => $lang['Avatar_gallery_path_explain'], + "L_COPPA_SETTINGS" => $lang['COPPA_settings'], + "L_COPPA_FAX" => $lang['COPPA_fax'], + "L_COPPA_MAIL" => $lang['COPPA_mail'], + "L_COPPA_MAIL_EXPLAIN" => $lang['COPPA_mail_explain'], + "L_EMAIL_SETTINGS" => $lang['Email_settings'], + "L_ADMIN_EMAIL" => $lang['Admin_email'], + "L_EMAIL_SIG" => $lang['Email_sig'], + "L_EMAIL_SIG_EXPLAIN" => $lang['Email_sig_explain'], + "L_USE_SMTP" => $lang['Use_SMTP'], + "L_USE_SMTP_EXPLAIN" => $lang['Use_SMTP_explain'], + "L_SMTP_SERVER" => $lang['SMTP_server'], + "L_SMTP_USERNAME" => $lang['SMTP_username'], + "L_SMTP_USERNAME_EXPLAIN" => $lang['SMTP_username_explain'], + "L_SMTP_PASSWORD" => $lang['SMTP_password'], + "L_SMTP_PASSWORD_EXPLAIN" => $lang['SMTP_password_explain'], + "L_SUBMIT" => $lang['Submit'], + "L_RESET" => $lang['Reset'], + + "SERVER_NAME" => $new['server_name'], + "SCRIPT_PATH" => $new['script_path'], + "SERVER_PORT" => $new['server_port'], + "SITENAME" => $new['sitename'], + "SITE_DESCRIPTION" => $new['site_desc'], + "S_DISABLE_BOARD_YES" => $disable_board_yes, + "S_DISABLE_BOARD_NO" => $disable_board_no, + "ACTIVATION_NONE" => USER_ACTIVATION_NONE, + "ACTIVATION_NONE_CHECKED" => $activation_none, + "ACTIVATION_USER" => USER_ACTIVATION_SELF, + "ACTIVATION_USER_CHECKED" => $activation_user, + "ACTIVATION_ADMIN" => USER_ACTIVATION_ADMIN, + "ACTIVATION_ADMIN_CHECKED" => $activation_admin, + "CONFIRM_ENABLE" => $confirm_yes, + "CONFIRM_DISABLE" => $confirm_no, + 'ALLOW_AUTOLOGIN_YES' => $allow_autologin_yes, + 'ALLOW_AUTOLOGIN_NO' => $allow_autologin_no, + 'AUTOLOGIN_TIME' => (int) $new['max_autologin_time'], + "BOARD_EMAIL_FORM_ENABLE" => $board_email_form_yes, + "BOARD_EMAIL_FORM_DISABLE" => $board_email_form_no, + "MAX_POLL_OPTIONS" => $new['max_poll_options'], + "FLOOD_INTERVAL" => $new['flood_interval'], + "SEARCH_FLOOD_INTERVAL" => $new['search_flood_interval'], + "TOPICS_PER_PAGE" => $new['topics_per_page'], + "POSTS_PER_PAGE" => $new['posts_per_page'], + "HOT_TOPIC" => $new['hot_threshold'], + "STYLE_SELECT" => $style_select, + "OVERRIDE_STYLE_YES" => $override_user_style_yes, + "OVERRIDE_STYLE_NO" => $override_user_style_no, + "LANG_SELECT" => $lang_select, + "L_DATE_FORMAT_EXPLAIN" => $lang['Date_format_explain'], + "DEFAULT_DATEFORMAT" => $new['default_dateformat'], + "TIMEZONE_SELECT" => $timezone_select, + "S_PRIVMSG_ENABLED" => $privmsg_on, + "S_PRIVMSG_DISABLED" => $privmsg_off, + "INBOX_LIMIT" => $new['max_inbox_privmsgs'], + "SENTBOX_LIMIT" => $new['max_sentbox_privmsgs'], + "SAVEBOX_LIMIT" => $new['max_savebox_privmsgs'], + "COOKIE_DOMAIN" => $new['cookie_domain'], + "COOKIE_NAME" => $new['cookie_name'], + "COOKIE_PATH" => $new['cookie_path'], + "SESSION_LENGTH" => $new['session_length'], + "S_COOKIE_SECURE_ENABLED" => $cookie_secure_yes, + "S_COOKIE_SECURE_DISABLED" => $cookie_secure_no, + "GZIP_YES" => $gzip_yes, + "GZIP_NO" => $gzip_no, + "PRUNE_YES" => $prune_yes, + "PRUNE_NO" => $prune_no, + "HTML_TAGS" => $html_tags, + "HTML_YES" => $html_yes, + "HTML_NO" => $html_no, + "BBCODE_YES" => $bbcode_yes, + "BBCODE_NO" => $bbcode_no, + "SMILE_YES" => $smile_yes, + "SMILE_NO" => $smile_no, + "SIG_YES" => $sig_yes, + "SIG_NO" => $sig_no, + "SIG_SIZE" => $new['max_sig_chars'], + "NAMECHANGE_YES" => $namechange_yes, + "NAMECHANGE_NO" => $namechange_no, + "AVATARS_LOCAL_YES" => $avatars_local_yes, + "AVATARS_LOCAL_NO" => $avatars_local_no, + "AVATARS_REMOTE_YES" => $avatars_remote_yes, + "AVATARS_REMOTE_NO" => $avatars_remote_no, + "AVATARS_UPLOAD_YES" => $avatars_upload_yes, + "AVATARS_UPLOAD_NO" => $avatars_upload_no, + "AVATAR_FILESIZE" => $new['avatar_filesize'], + "AVATAR_MAX_HEIGHT" => $new['avatar_max_height'], + "AVATAR_MAX_WIDTH" => $new['avatar_max_width'], + "AVATAR_PATH" => $new['avatar_path'], + "AVATAR_GALLERY_PATH" => $new['avatar_gallery_path'], + "SMILIES_PATH" => $new['smilies_path'], + "INBOX_PRIVMSGS" => $new['max_inbox_privmsgs'], + "SENTBOX_PRIVMSGS" => $new['max_sentbox_privmsgs'], + "SAVEBOX_PRIVMSGS" => $new['max_savebox_privmsgs'], + "EMAIL_FROM" => $new['board_email'], + "EMAIL_SIG" => $new['board_email_sig'], + "SMTP_YES" => $smtp_yes, + "SMTP_NO" => $smtp_no, + "SMTP_HOST" => $new['smtp_host'], + "SMTP_USERNAME" => $new['smtp_username'], + "SMTP_PASSWORD" => $new['smtp_password'], + "COPPA_MAIL" => $new['coppa_mail'], + "COPPA_FAX" => $new['coppa_fax']) +); + +$template->pparse("body"); + +include('./page_footer_admin.'.$phpEx); + +?> diff --git a/phpBB/admin/admin_db_utilities.php b/phpBB/admin/admin_db_utilities.php new file mode 100644 index 0000000000..16648ae5df --- /dev/null +++ b/phpBB/admin/admin_db_utilities.php @@ -0,0 +1,1008 @@ += '4.0.0') ? @ini_get('file_uploads') : @get_cfg_var('file_uploads'); + + if( (empty($file_uploads) || $file_uploads != 0) && (strtolower($file_uploads) != 'off') && (@phpversion() != '4.0.4pl1') ) + { + $module['General']['Restore_DB'] = $filename . "?perform=restore"; + } + + return; +} + +// +// Load default header +// +$no_page_header = TRUE; +$phpbb_root_path = "./../"; +require($phpbb_root_path . 'extension.inc'); +require('./pagestart.' . $phpEx); +include($phpbb_root_path . 'includes/sql_parse.'.$phpEx); + +// +// Set VERBOSE to 1 for debugging info.. +// +define("VERBOSE", 0); + +// +// Increase maximum execution time, but don't complain about it if it isn't +// allowed. +// +@set_time_limit(1200); + +// ----------------------- +// The following functions are adapted from phpMyAdmin and upgrade_20.php +// +function gzip_PrintFourChars($Val) +{ + for ($i = 0; $i < 4; $i ++) + { + $return .= chr($Val % 256); + $Val = floor($Val / 256); + } + return $return; +} + + + +// +// This function is used for grabbing the sequences for postgres... +// +function pg_get_sequences($crlf, $backup_type) +{ + global $db; + + $get_seq_sql = "SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' + AND relkind = 'S' ORDER BY relname"; + + $seq = $db->sql_query($get_seq_sql); + + if( !$num_seq = $db->sql_numrows($seq) ) + { + + $return_val = "# No Sequences Found $crlf"; + + } + else + { + $return_val = "# Sequences $crlf"; + $i_seq = 0; + + while($i_seq < $num_seq) + { + $row = $db->sql_fetchrow($seq); + $sequence = $row['relname']; + + $get_props_sql = "SELECT * FROM $sequence"; + $seq_props = $db->sql_query($get_props_sql); + + if($db->sql_numrows($seq_props) > 0) + { + $row1 = $db->sql_fetchrow($seq_props); + + if($backup_type == 'structure') + { + $row['last_value'] = 1; + } + + $return_val .= "CREATE SEQUENCE $sequence start " . $row['last_value'] . ' increment ' . $row['increment_by'] . ' maxvalue ' . $row['max_value'] . ' minvalue ' . $row['min_value'] . ' cache ' . $row['cache_value'] . "; $crlf"; + + } // End if numrows > 0 + + if(($row['last_value'] > 1) && ($backup_type != 'structure')) + { + $return_val .= "SELECT NEXTVALE('$sequence'); $crlf"; + unset($row['last_value']); + } + + $i_seq++; + + } // End while.. + + } // End else... + + return $returnval; + +} // End function... + +// +// The following functions will return the "CREATE TABLE syntax for the +// varying DBMS's +// +// This function returns, will return the table def's for postgres... +// +function get_table_def_postgresql($table, $crlf) +{ + global $drop, $db; + + $schema_create = ""; + // + // Get a listing of the fields, with their associated types, etc. + // + + $field_query = "SELECT a.attnum, a.attname AS field, t.typname as type, a.attlen AS length, a.atttypmod as lengthvar, a.attnotnull as notnull + FROM pg_class c, pg_attribute a, pg_type t + WHERE c.relname = '$table' + AND a.attnum > 0 + AND a.attrelid = c.oid + AND a.atttypid = t.oid + ORDER BY a.attnum"; + $result = $db->sql_query($field_query); + + if(!$result) + { + message_die(GENERAL_ERROR, "Failed in get_table_def (show fields)", "", __LINE__, __FILE__, $field_query); + } // end if.. + + if ($drop == 1) + { + $schema_create .= "DROP TABLE $table;$crlf"; + } // end if + + // + // Ok now we actually start building the SQL statements to restore the tables + // + + $schema_create .= "CREATE TABLE $table($crlf"; + + while ($row = $db->sql_fetchrow($result)) + { + // + // Get the data from the table + // + $sql_get_default = "SELECT d.adsrc AS rowdefault + FROM pg_attrdef d, pg_class c + WHERE (c.relname = '$table') + AND (c.oid = d.adrelid) + AND d.adnum = " . $row['attnum']; + $def_res = $db->sql_query($sql_get_default); + + if (!$def_res) + { + unset($row['rowdefault']); + } + else + { + $row['rowdefault'] = @pg_result($def_res, 0, 'rowdefault'); + } + + if ($row['type'] == 'bpchar') + { + // Internally stored as bpchar, but isn't accepted in a CREATE TABLE statement. + $row['type'] = 'char'; + } + + $schema_create .= ' ' . $row['field'] . ' ' . $row['type']; + + if (eregi('char', $row['type'])) + { + if ($row['lengthvar'] > 0) + { + $schema_create .= '(' . ($row['lengthvar'] -4) . ')'; + } + } + + if (eregi('numeric', $row['type'])) + { + $schema_create .= '('; + $schema_create .= sprintf("%s,%s", (($row['lengthvar'] >> 16) & 0xffff), (($row['lengthvar'] - 4) & 0xffff)); + $schema_create .= ')'; + } + + if (!empty($row['rowdefault'])) + { + $schema_create .= ' DEFAULT ' . $row['rowdefault']; + } + + if ($row['notnull'] == 't') + { + $schema_create .= ' NOT NULL'; + } + + $schema_create .= ",$crlf"; + + } + // + // Get the listing of primary keys. + // + + $sql_pri_keys = "SELECT ic.relname AS index_name, bc.relname AS tab_name, ta.attname AS column_name, i.indisunique AS unique_key, i.indisprimary AS primary_key + FROM pg_class bc, pg_class ic, pg_index i, pg_attribute ta, pg_attribute ia + WHERE (bc.oid = i.indrelid) + AND (ic.oid = i.indexrelid) + AND (ia.attrelid = i.indexrelid) + AND (ta.attrelid = bc.oid) + AND (bc.relname = '$table') + AND (ta.attrelid = i.indrelid) + AND (ta.attnum = i.indkey[ia.attnum-1]) + ORDER BY index_name, tab_name, column_name "; + $result = $db->sql_query($sql_pri_keys); + + if(!$result) + { + message_die(GENERAL_ERROR, "Failed in get_table_def (show fields)", "", __LINE__, __FILE__, $sql_pri_keys); + } + + while ( $row = $db->sql_fetchrow($result)) + { + if ($row['primary_key'] == 't') + { + if (!empty($primary_key)) + { + $primary_key .= ', '; + } + + $primary_key .= $row['column_name']; + $primary_key_name = $row['index_name']; + + } + else + { + // + // We have to store this all this info because it is possible to have a multi-column key... + // we can loop through it again and build the statement + // + $index_rows[$row['index_name']]['table'] = $table; + $index_rows[$row['index_name']]['unique'] = ($row['unique_key'] == 't') ? ' UNIQUE ' : ''; + $index_rows[$row['index_name']]['column_names'] .= $row['column_name'] . ', '; + } + } + + if (!empty($index_rows)) + { + while(list($idx_name, $props) = each($index_rows)) + { + $props['column_names'] = ereg_replace(", $", "" , $props['column_names']); + $index_create .= 'CREATE ' . $props['unique'] . " INDEX $idx_name ON $table (" . $props['column_names'] . ");$crlf"; + } + } + + if (!empty($primary_key)) + { + $schema_create .= " CONSTRAINT $primary_key_name PRIMARY KEY ($primary_key),$crlf"; + } + + // + // Generate constraint clauses for CHECK constraints + // + $sql_checks = "SELECT rcname as index_name, rcsrc + FROM pg_relcheck, pg_class bc + WHERE rcrelid = bc.oid + AND bc.relname = '$table' + AND NOT EXISTS ( + SELECT * + FROM pg_relcheck as c, pg_inherits as i + WHERE i.inhrelid = pg_relcheck.rcrelid + AND c.rcname = pg_relcheck.rcname + AND c.rcsrc = pg_relcheck.rcsrc + AND c.rcrelid = i.inhparent + )"; + $result = $db->sql_query($sql_checks); + + if (!$result) + { + message_die(GENERAL_ERROR, "Failed in get_table_def (show fields)", "", __LINE__, __FILE__, $sql_checks); + } + + // + // Add the constraints to the sql file. + // + while ($row = $db->sql_fetchrow($result)) + { + $schema_create .= ' CONSTRAINT ' . $row['index_name'] . ' CHECK ' . $row['rcsrc'] . ",$crlf"; + } + + $schema_create = ereg_replace(',' . $crlf . '$', '', $schema_create); + $index_create = ereg_replace(',' . $crlf . '$', '', $index_create); + + $schema_create .= "$crlf);$crlf"; + + if (!empty($index_create)) + { + $schema_create .= $index_create; + } + + // + // Ok now we've built all the sql return it to the calling function. + // + return (stripslashes($schema_create)); + +} + +// +// This function returns the "CREATE TABLE" syntax for mysql dbms... +// +function get_table_def_mysql($table, $crlf) +{ + global $drop, $db; + + $schema_create = ""; + $field_query = "SHOW FIELDS FROM $table"; + $key_query = "SHOW KEYS FROM $table"; + + // + // If the user has selected to drop existing tables when doing a restore. + // Then we add the statement to drop the tables.... + // + if ($drop == 1) + { + $schema_create .= "DROP TABLE IF EXISTS $table;$crlf"; + } + + $schema_create .= "CREATE TABLE $table($crlf"; + + // + // Ok lets grab the fields... + // + $result = $db->sql_query($field_query); + if(!$result) + { + message_die(GENERAL_ERROR, "Failed in get_table_def (show fields)", "", __LINE__, __FILE__, $field_query); + } + + while ($row = $db->sql_fetchrow($result)) + { + $schema_create .= ' ' . $row['Field'] . ' ' . $row['Type']; + + if(!empty($row['Default'])) + { + $schema_create .= ' DEFAULT \'' . $row['Default'] . '\''; + } + + if($row['Null'] != "YES") + { + $schema_create .= ' NOT NULL'; + } + + if($row['Extra'] != "") + { + $schema_create .= ' ' . $row['Extra']; + } + + $schema_create .= ",$crlf"; + } + // + // Drop the last ',$crlf' off ;) + // + $schema_create = ereg_replace(',' . $crlf . '$', "", $schema_create); + + // + // Get any Indexed fields from the database... + // + $result = $db->sql_query($key_query); + if(!$result) + { + message_die(GENERAL_ERROR, "FAILED IN get_table_def (show keys)", "", __LINE__, __FILE__, $key_query); + } + + while($row = $db->sql_fetchrow($result)) + { + $kname = $row['Key_name']; + + if(($kname != 'PRIMARY') && ($row['Non_unique'] == 0)) + { + $kname = "UNIQUE|$kname"; + } + + if(!is_array($index[$kname])) + { + $index[$kname] = array(); + } + + $index[$kname][] = $row['Column_name']; + } + + while(list($x, $columns) = @each($index)) + { + $schema_create .= ", $crlf"; + + if($x == 'PRIMARY') + { + $schema_create .= ' PRIMARY KEY (' . implode($columns, ', ') . ')'; + } + elseif (substr($x,0,6) == 'UNIQUE') + { + $schema_create .= ' UNIQUE ' . substr($x,7) . ' (' . implode($columns, ', ') . ')'; + } + else + { + $schema_create .= " KEY $x (" . implode($columns, ', ') . ')'; + } + } + + $schema_create .= "$crlf);"; + + if(get_magic_quotes_runtime()) + { + return(stripslashes($schema_create)); + } + else + { + return($schema_create); + } + +} // End get_table_def_mysql + + +// +// This fuction will return a tables create definition to be used as an sql +// statement. +// +// +// The following functions Get the data from the tables and format it as a +// series of INSERT statements, for each different DBMS... +// After every row a custom callback function $handler gets called. +// $handler must accept one parameter ($sql_insert); +// +// +// Here is the function for postgres... +// +function get_table_content_postgresql($table, $handler) +{ + global $db; + + // + // Grab all of the data from current table. + // + + $result = $db->sql_query("SELECT * FROM $table"); + + if (!$result) + { + message_die(GENERAL_ERROR, "Failed in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table"); + } + + $i_num_fields = $db->sql_numfields($result); + + for ($i = 0; $i < $i_num_fields; $i++) + { + $aryType[] = $db->sql_fieldtype($i, $result); + $aryName[] = $db->sql_fieldname($i, $result); + } + + $iRec = 0; + + while($row = $db->sql_fetchrow($result)) + { + $schema_vals = ''; + $schema_fields = ''; + $schema_insert = ''; + // + // Build the SQL statement to recreate the data. + // + for($i = 0; $i < $i_num_fields; $i++) + { + $strVal = $row[$aryName[$i]]; + if (eregi("char|text|bool", $aryType[$i])) + { + $strQuote = "'"; + $strEmpty = ""; + $strVal = addslashes($strVal); + } + elseif (eregi("date|timestamp", $aryType[$i])) + { + if (empty($strVal)) + { + $strQuote = ""; + } + else + { + $strQuote = "'"; + } + } + else + { + $strQuote = ""; + $strEmpty = "NULL"; + } + + if (empty($strVal) && $strVal != "0") + { + $strVal = $strEmpty; + } + + $schema_vals .= " $strQuote$strVal$strQuote,"; + $schema_fields .= " $aryName[$i],"; + + } + + $schema_vals = ereg_replace(",$", "", $schema_vals); + $schema_vals = ereg_replace("^ ", "", $schema_vals); + $schema_fields = ereg_replace(",$", "", $schema_fields); + $schema_fields = ereg_replace("^ ", "", $schema_fields); + + // + // Take the ordered fields and their associated data and build it + // into a valid sql statement to recreate that field in the data. + // + $schema_insert = "INSERT INTO $table ($schema_fields) VALUES($schema_vals);"; + + $handler(trim($schema_insert)); + } + + return(true); + +}// end function get_table_content_postgres... + +// +// This function is for getting the data from a mysql table. +// + +function get_table_content_mysql($table, $handler) +{ + global $db; + + // Grab the data from the table. + if (!($result = $db->sql_query("SELECT * FROM $table"))) + { + message_die(GENERAL_ERROR, "Failed in get_table_content (select *)", "", __LINE__, __FILE__, "SELECT * FROM $table"); + } + + // Loop through the resulting rows and build the sql statement. + if ($row = $db->sql_fetchrow($result)) + { + $handler("\n#\n# Table Data for $table\n#\n"); + $field_names = array(); + + // Grab the list of field names. + $num_fields = $db->sql_numfields($result); + $table_list = '('; + for ($j = 0; $j < $num_fields; $j++) + { + $field_names[$j] = $db->sql_fieldname($j, $result); + $table_list .= (($j > 0) ? ', ' : '') . $field_names[$j]; + + } + $table_list .= ')'; + + do + { + // Start building the SQL statement. + $schema_insert = "INSERT INTO $table $table_list VALUES("; + + // Loop through the rows and fill in data for each column + for ($j = 0; $j < $num_fields; $j++) + { + $schema_insert .= ($j > 0) ? ', ' : ''; + + if(!isset($row[$field_names[$j]])) + { + // + // If there is no data for the column set it to null. + // There was a problem here with an extra space causing the + // sql file not to reimport if the last column was null in + // any table. Should be fixed now :) JLH + // + $schema_insert .= 'NULL'; + } + elseif ($row[$field_names[$j]] != '') + { + $schema_insert .= '\'' . addslashes($row[$field_names[$j]]) . '\''; + } + else + { + $schema_insert .= '\'\''; + } + } + + $schema_insert .= ');'; + + // Go ahead and send the insert statement to the handler function. + $handler(trim($schema_insert)); + + } + while ($row = $db->sql_fetchrow($result)); + } + + return(true); +} + +function output_table_content($content) +{ + global $tempfile; + + //fwrite($tempfile, $content . "\n"); + //$backup_sql .= $content . "\n"; + echo $content ."\n"; + return; +} +// +// End Functions +// ------------- + + +// +// Begin program proper +// +if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) ) +{ + $perform = (isset($HTTP_POST_VARS['perform'])) ? $HTTP_POST_VARS['perform'] : $HTTP_GET_VARS['perform']; + + switch($perform) + { + case 'backup': + + $error = false; + switch(SQL_LAYER) + { + case 'oracle': + $error = true; + break; + case 'db2': + $error = true; + break; + case 'msaccess': + $error = true; + break; + case 'mssql': + case 'mssql-odbc': + $error = true; + break; + } + + if ($error) + { + include('./page_header_admin.'.$phpEx); + + $template->set_filenames(array( + "body" => "admin/admin_message_body.tpl") + ); + + $template->assign_vars(array( + "MESSAGE_TITLE" => $lang['Information'], + "MESSAGE_TEXT" => $lang['Backups_not_supported']) + ); + + $template->pparse("body"); + + include('./page_footer_admin.'.$phpEx); + } + + $tables = array('auth_access', 'banlist', 'categories', 'config', 'disallow', 'forums', 'forum_prune', 'groups', 'posts', 'posts_text', 'privmsgs', 'privmsgs_text', 'ranks', 'search_results', 'search_wordlist', 'search_wordmatch', 'sessions', 'smilies', 'themes', 'themes_name', 'topics', 'topics_watch', 'user_group', 'users', 'vote_desc', 'vote_results', 'vote_voters', 'words', 'confirm', 'sessions_keys'); + + $additional_tables = (isset($HTTP_POST_VARS['additional_tables'])) ? $HTTP_POST_VARS['additional_tables'] : ( (isset($HTTP_GET_VARS['additional_tables'])) ? $HTTP_GET_VARS['additional_tables'] : "" ); + + $backup_type = (isset($HTTP_POST_VARS['backup_type'])) ? $HTTP_POST_VARS['backup_type'] : ( (isset($HTTP_GET_VARS['backup_type'])) ? $HTTP_GET_VARS['backup_type'] : "" ); + + $gzipcompress = (!empty($HTTP_POST_VARS['gzipcompress'])) ? $HTTP_POST_VARS['gzipcompress'] : ( (!empty($HTTP_GET_VARS['gzipcompress'])) ? $HTTP_GET_VARS['gzipcompress'] : 0 ); + + $drop = (!empty($HTTP_POST_VARS['drop'])) ? intval($HTTP_POST_VARS['drop']) : ( (!empty($HTTP_GET_VARS['drop'])) ? intval($HTTP_GET_VARS['drop']) : 0 ); + + if(!empty($additional_tables)) + { + if(ereg(",", $additional_tables)) + { + $additional_tables = split(",", $additional_tables); + + for($i = 0; $i < count($additional_tables); $i++) + { + $tables[] = trim($additional_tables[$i]); + } + + } + else + { + $tables[] = trim($additional_tables); + } + } + + if( !isset($HTTP_POST_VARS['backupstart']) && !isset($HTTP_GET_VARS['backupstart'])) + { + include('./page_header_admin.'.$phpEx); + + $template->set_filenames(array( + "body" => "admin/db_utils_backup_body.tpl") + ); + $s_hidden_fields = ""; + + $template->assign_vars(array( + "L_DATABASE_BACKUP" => $lang['Database_Utilities'] . " : " . $lang['Backup'], + "L_BACKUP_EXPLAIN" => $lang['Backup_explain'], + "L_FULL_BACKUP" => $lang['Full_backup'], + "L_STRUCTURE_BACKUP" => $lang['Structure_backup'], + "L_DATA_BACKUP" => $lang['Data_backup'], + "L_ADDITIONAL_TABLES" => $lang['Additional_tables'], + "L_START_BACKUP" => $lang['Start_backup'], + "L_BACKUP_OPTIONS" => $lang['Backup_options'], + "L_GZIP_COMPRESS" => $lang['Gzip_compress'], + "L_NO" => $lang['No'], + "L_YES" => $lang['Yes'], + + "S_HIDDEN_FIELDS" => $s_hidden_fields, + "S_DBUTILS_ACTION" => append_sid("admin_db_utilities.$phpEx")) + ); + $template->pparse("body"); + + break; + + } + else if( !isset($HTTP_POST_VARS['startdownload']) && !isset($HTTP_GET_VARS['startdownload']) ) + { + if(is_array($additional_tables)) + { + $additional_tables = implode(',', $additional_tables); + } + $template->set_filenames(array( + "body" => "admin/admin_message_body.tpl") + ); + + $template->assign_vars(array( + "META" => '', + + "MESSAGE_TITLE" => $lang['Database_Utilities'] . " : " . $lang['Backup'], + "MESSAGE_TEXT" => $lang['Backup_download']) + ); + + include('./page_header_admin.'.$phpEx); + + $template->pparse("body"); + + include('./page_footer_admin.'.$phpEx); + + } + header("Pragma: no-cache"); + $do_gzip_compress = FALSE; + if( $gzipcompress ) + { + $phpver = phpversion(); + + if($phpver >= "4.0") + { + if(extension_loaded("zlib")) + { + $do_gzip_compress = TRUE; + } + } + } + if($do_gzip_compress) + { + @ob_start(); + @ob_implicit_flush(0); + header("Content-Type: application/x-gzip; name=\"phpbb_db_backup.sql.gz\""); + header("Content-disposition: attachment; filename=phpbb_db_backup.sql.gz"); + } + else + { + header("Content-Type: text/x-delimtext; name=\"phpbb_db_backup.sql\""); + header("Content-disposition: attachment; filename=phpbb_db_backup.sql"); + } + + // + // Build the sql script file... + // + echo "#\n"; + echo "# phpBB Backup Script\n"; + echo "# Dump of tables for $dbname\n"; + echo "#\n# DATE : " . gmdate("d-m-Y H:i:s", time()) . " GMT\n"; + echo "#\n"; + + if(SQL_LAYER == 'postgresql') + { + echo "\n" . pg_get_sequences("\n", $backup_type); + } + for($i = 0; $i < count($tables); $i++) + { + $table_name = $tables[$i]; + + switch (SQL_LAYER) + { + case 'postgresql': + $table_def_function = "get_table_def_postgresql"; + $table_content_function = "get_table_content_postgresql"; + break; + + case 'mysql': + case 'mysql4': + $table_def_function = "get_table_def_mysql"; + $table_content_function = "get_table_content_mysql"; + break; + } + + if($backup_type != 'data') + { + echo "#\n# TABLE: " . $table_prefix . $table_name . "\n#\n"; + echo $table_def_function($table_prefix . $table_name, "\n") . "\n"; + } + + if($backup_type != 'structure') + { + $table_content_function($table_prefix . $table_name, "output_table_content"); + } + } + + if($do_gzip_compress) + { + $Size = ob_get_length(); + $Crc = crc32(ob_get_contents()); + $contents = gzcompress(ob_get_contents()); + ob_end_clean(); + echo "\x1f\x8b\x08\x00\x00\x00\x00\x00".substr($contents, 0, strlen($contents) - 4).gzip_PrintFourChars($Crc).gzip_PrintFourChars($Size); + } + exit; + + break; + + case 'restore': + if(!isset($HTTP_POST_VARS['restore_start'])) + { + // + // Define Template files... + // + include('./page_header_admin.'.$phpEx); + + $template->set_filenames(array( + "body" => "admin/db_utils_restore_body.tpl") + ); + + $s_hidden_fields = ""; + + $template->assign_vars(array( + "L_DATABASE_RESTORE" => $lang['Database_Utilities'] . " : " . $lang['Restore'], + "L_RESTORE_EXPLAIN" => $lang['Restore_explain'], + "L_SELECT_FILE" => $lang['Select_file'], + "L_START_RESTORE" => $lang['Start_Restore'], + + "S_DBUTILS_ACTION" => append_sid("admin_db_utilities.$phpEx"), + "S_HIDDEN_FIELDS" => $s_hidden_fields) + ); + $template->pparse("body"); + + break; + + } + else + { + // + // Handle the file upload .... + // If no file was uploaded report an error... + // + $backup_file_name = (!empty($HTTP_POST_FILES['backup_file']['name'])) ? $HTTP_POST_FILES['backup_file']['name'] : ""; + $backup_file_tmpname = ($HTTP_POST_FILES['backup_file']['tmp_name'] != "none") ? $HTTP_POST_FILES['backup_file']['tmp_name'] : ""; + $backup_file_type = (!empty($HTTP_POST_FILES['backup_file']['type'])) ? $HTTP_POST_FILES['backup_file']['type'] : ""; + + if($backup_file_tmpname == "" || $backup_file_name == "") + { + message_die(GENERAL_MESSAGE, $lang['Restore_Error_no_file']); + } + // + // If I file was actually uploaded, check to make sure that we + // are actually passed the name of an uploaded file, and not + // a hackers attempt at getting us to process a local system + // file. + // + if( file_exists(phpbb_realpath($backup_file_tmpname)) ) + { + if( preg_match("/^(text\/[a-zA-Z]+)|(application\/(x\-)?gzip(\-compressed)?)|(application\/octet-stream)$/is", $backup_file_type) ) + { + if( preg_match("/\.gz$/is",$backup_file_name) ) + { + $do_gzip_compress = FALSE; + $phpver = phpversion(); + if($phpver >= "4.0") + { + if(extension_loaded("zlib")) + { + $do_gzip_compress = TRUE; + } + } + + if($do_gzip_compress) + { + $gz_ptr = gzopen($backup_file_tmpname, 'rb'); + $sql_query = ""; + while( !gzeof($gz_ptr) ) + { + $sql_query .= gzgets($gz_ptr, 100000); + } + } + else + { + message_die(GENERAL_ERROR, $lang['Restore_Error_decompress']); + } + } + else + { + $sql_query = fread(fopen($backup_file_tmpname, 'r'), filesize($backup_file_tmpname)); + } + // + // Comment this line out to see if this fixes the stuff... + // + //$sql_query = stripslashes($sql_query); + } + else + { + message_die(GENERAL_ERROR, $lang['Restore_Error_filename'] ." $backup_file_type $backup_file_name"); + } + } + else + { + message_die(GENERAL_ERROR, $lang['Restore_Error_uploading']); + } + + if($sql_query != "") + { + // Strip out sql comments... + $sql_query = remove_remarks($sql_query); + $pieces = split_sql_file($sql_query, ";"); + + $sql_count = count($pieces); + for($i = 0; $i < $sql_count; $i++) + { + $sql = trim($pieces[$i]); + + if(!empty($sql) and $sql[0] != "#") + { + if(VERBOSE == 1) + { + echo "Executing: $sql\n
"; + flush(); + } + + $result = $db->sql_query($sql); + + if(!$result && ( !(SQL_LAYER == 'postgresql' && eregi("drop table", $sql) ) ) ) + { + message_die(GENERAL_ERROR, "Error importing backup file", "", __LINE__, __FILE__, $sql); + } + } + } + } + + include('./page_header_admin.'.$phpEx); + + $template->set_filenames(array( + "body" => "admin/admin_message_body.tpl") + ); + + $message = $lang['Restore_success']; + + $template->assign_vars(array( + "MESSAGE_TITLE" => $lang['Database_Utilities'] . " : " . $lang['Restore'], + "MESSAGE_TEXT" => $message) + ); + + $template->pparse("body"); + break; + } + break; + } +} + +include('./page_footer_admin.'.$phpEx); + +?> diff --git a/phpBB/admin/admin_disallow.php b/phpBB/admin/admin_disallow.php new file mode 100644 index 0000000000..ea1e0404e6 --- /dev/null +++ b/phpBB/admin/admin_disallow.php @@ -0,0 +1,146 @@ +sql_query( $sql ); + if ( !$result ) + { + message_die(GENERAL_ERROR, "Could not add disallowed user.", "",__LINE__, __FILE__, $sql); + } + $message = $lang['Disallow_successful']; + } + + $message .= "

" . sprintf($lang['Click_return_disallowadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); +} +else if( isset($HTTP_POST_VARS['delete_name']) ) +{ + $disallowed_id = ( isset($HTTP_POST_VARS['disallowed_id']) ) ? intval( $HTTP_POST_VARS['disallowed_id'] ) : intval( $HTTP_GET_VARS['disallowed_id'] ); + + $sql = "DELETE FROM " . DISALLOW_TABLE . " + WHERE disallow_id = $disallowed_id"; + $result = $db->sql_query($sql); + if( !$result ) + { + message_die(GENERAL_ERROR, "Couldn't removed disallowed user.", "",__LINE__, __FILE__, $sql); + } + + $message .= $lang['Disallowed_deleted'] . "

" . sprintf($lang['Click_return_disallowadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + +} + +// +// Grab the current list of disallowed usernames... +// +$sql = "SELECT * + FROM " . DISALLOW_TABLE; +$result = $db->sql_query($sql); +if( !$result ) +{ + message_die(GENERAL_ERROR, "Couldn't get disallowed users.", "", __LINE__, __FILE__, $sql ); +} + +$disallowed = $db->sql_fetchrowset($result); + +// +// Ok now generate the info for the template, which will be put out no matter +// what mode we are in. +// +$disallow_select = ''; + +$template->set_filenames(array( + "body" => "admin/disallow_body.tpl") +); + +$template->assign_vars(array( + "S_DISALLOW_SELECT" => $disallow_select, + "S_FORM_ACTION" => append_sid("admin_disallow.$phpEx"), + + "L_INFO" => $output_info, + "L_DISALLOW_TITLE" => $lang['Disallow_control'], + "L_DISALLOW_EXPLAIN" => $lang['Disallow_explain'], + "L_DELETE" => $lang['Delete_disallow'], + "L_DELETE_DISALLOW" => $lang['Delete_disallow_title'], + "L_DELETE_EXPLAIN" => $lang['Delete_disallow_explain'], + "L_ADD" => $lang['Add_disallow'], + "L_ADD_DISALLOW" => $lang['Add_disallow_title'], + "L_ADD_EXPLAIN" => $lang['Add_disallow_explain'], + "L_USERNAME" => $lang['Username']) +); + +$template->pparse("body"); + +include('./page_footer_admin.'.$phpEx); + +?> \ No newline at end of file diff --git a/phpBB/admin/admin_forum_prune.php b/phpBB/admin/admin_forum_prune.php new file mode 100644 index 0000000000..a766360e12 --- /dev/null +++ b/phpBB/admin/admin_forum_prune.php @@ -0,0 +1,199 @@ +sql_query($sql)) ) +{ + message_die(GENERAL_ERROR, 'Could not obtain list of forums for pruning', '', __LINE__, __FILE__, $sql); +} + +$forum_rows = array(); +while( $row = $db->sql_fetchrow($result) ) +{ + $forum_rows[] = $row; +} + +// +// Check for submit to be equal to Prune. If so then proceed with the pruning. +// +if( isset($HTTP_POST_VARS['doprune']) ) +{ + $prunedays = ( isset($HTTP_POST_VARS['prunedays']) ) ? intval($HTTP_POST_VARS['prunedays']) : 0; + + // Convert days to seconds for timestamp functions... + $prunedate = time() - ( $prunedays * 86400 ); + + $template->set_filenames(array( + 'body' => 'admin/forum_prune_result_body.tpl') + ); + + for($i = 0; $i < count($forum_rows); $i++) + { + $p_result = prune($forum_rows[$i]['forum_id'], $prunedate); + sync('forum', $forum_rows[$i]['forum_id']); + + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $template->assign_block_vars('prune_results', array( + 'ROW_COLOR' => '#' . $row_color, + 'ROW_CLASS' => $row_class, + 'FORUM_NAME' => $forum_rows[$i]['forum_name'], + 'FORUM_TOPICS' => $p_result['topics'], + 'FORUM_POSTS' => $p_result['posts']) + ); + } + + $template->assign_vars(array( + 'L_FORUM_PRUNE' => $lang['Forum_Prune'], + 'L_FORUM' => $lang['Forum'], + 'L_TOPICS_PRUNED' => $lang['Topics_pruned'], + 'L_POSTS_PRUNED' => $lang['Posts_pruned'], + 'L_PRUNE_RESULT' => $lang['Prune_success']) + ); +} +else +{ + // + // If they haven't selected a forum for pruning yet then + // display a select box to use for pruning. + // + if( empty($HTTP_POST_VARS[POST_FORUM_URL]) ) + { + // + // Output a selection table if no forum id has been specified. + // + $template->set_filenames(array( + 'body' => 'admin/forum_prune_select_body.tpl') + ); + + $select_list = ''; + + // + // Assign the template variables. + // + $template->assign_vars(array( + 'L_FORUM_PRUNE' => $lang['Forum_Prune'], + 'L_SELECT_FORUM' => $lang['Select_a_Forum'], + 'L_LOOK_UP' => $lang['Look_up_Forum'], + + 'S_FORUMPRUNE_ACTION' => append_sid("admin_forum_prune.$phpEx"), + 'S_FORUMS_SELECT' => $select_list) + ); + } + else + { + $forum_id = intval($HTTP_POST_VARS[POST_FORUM_URL]); + + // + // Output the form to retrieve Prune information. + // + $template->set_filenames(array( + 'body' => 'admin/forum_prune_body.tpl') + ); + + $forum_name = ( $forum_id == -1 ) ? $lang['All_Forums'] : $forum_rows[0]['forum_name']; + + $prune_data = $lang['Prune_topics_not_posted'] . " "; + $prune_data .= ' ' . $lang['Days']; + + $hidden_input = ''; + + // + // Assign the template variables. + // + $template->assign_vars(array( + 'FORUM_NAME' => $forum_name, + + 'L_FORUM' => $lang['Forum'], + 'L_FORUM_PRUNE' => $lang['Forum_Prune'], + 'L_FORUM_PRUNE_EXPLAIN' => $lang['Forum_Prune_explain'], + 'L_DO_PRUNE' => $lang['Do_Prune'], + + 'S_FORUMPRUNE_ACTION' => append_sid("admin_forum_prune.$phpEx"), + 'S_PRUNE_DATA' => $prune_data, + 'S_HIDDEN_VARS' => $hidden_input) + ); + } +} +// +// Actually output the page here. +// +$template->pparse('body'); + +include('./page_footer_admin.'.$phpEx); + +?> \ No newline at end of file diff --git a/phpBB/admin/admin_forumauth.php b/phpBB/admin/admin_forumauth.php new file mode 100644 index 0000000000..69e097e445 --- /dev/null +++ b/phpBB/admin/admin_forumauth.php @@ -0,0 +1,328 @@ + array(AUTH_ALL, AUTH_ALL, AUTH_ALL, AUTH_ALL, AUTH_REG, AUTH_REG, AUTH_MOD, AUTH_MOD, AUTH_REG, AUTH_REG), + 1 => array(AUTH_ALL, AUTH_ALL, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_MOD, AUTH_MOD, AUTH_REG, AUTH_REG), + 2 => array(AUTH_REG, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_MOD, AUTH_MOD, AUTH_REG, AUTH_REG), + 3 => array(AUTH_ALL, AUTH_ACL, AUTH_ACL, AUTH_ACL, AUTH_ACL, AUTH_ACL, AUTH_ACL, AUTH_MOD, AUTH_ACL, AUTH_ACL), + 4 => array(AUTH_ACL, AUTH_ACL, AUTH_ACL, AUTH_ACL, AUTH_ACL, AUTH_ACL, AUTH_ACL, AUTH_MOD, AUTH_ACL, AUTH_ACL), + 5 => array(AUTH_ALL, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD), + 6 => array(AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD, AUTH_MOD), +); + +$simple_auth_types = array($lang['Public'], $lang['Registered'], $lang['Registered'] . ' [' . $lang['Hidden'] . ']', $lang['Private'], $lang['Private'] . ' [' . $lang['Hidden'] . ']', $lang['Moderators'], $lang['Moderators'] . ' [' . $lang['Hidden'] . ']'); + +$forum_auth_fields = array('auth_view', 'auth_read', 'auth_post', 'auth_reply', 'auth_edit', 'auth_delete', 'auth_sticky', 'auth_announce', 'auth_vote', 'auth_pollcreate'); + +$field_names = array( + 'auth_view' => $lang['View'], + 'auth_read' => $lang['Read'], + 'auth_post' => $lang['Post'], + 'auth_reply' => $lang['Reply'], + 'auth_edit' => $lang['Edit'], + 'auth_delete' => $lang['Delete'], + 'auth_sticky' => $lang['Sticky'], + 'auth_announce' => $lang['Announce'], + 'auth_vote' => $lang['Vote'], + 'auth_pollcreate' => $lang['Pollcreate']); + +$forum_auth_levels = array('ALL', 'REG', 'PRIVATE', 'MOD', 'ADMIN'); +$forum_auth_const = array(AUTH_ALL, AUTH_REG, AUTH_ACL, AUTH_MOD, AUTH_ADMIN); + +if(isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL])) +{ + $forum_id = (isset($HTTP_POST_VARS[POST_FORUM_URL])) ? intval($HTTP_POST_VARS[POST_FORUM_URL]) : intval($HTTP_GET_VARS[POST_FORUM_URL]); + $forum_sql = "AND forum_id = $forum_id"; +} +else +{ + unset($forum_id); + $forum_sql = ''; +} + +if( isset($HTTP_GET_VARS['adv']) ) +{ + $adv = intval($HTTP_GET_VARS['adv']); +} +else +{ + unset($adv); +} + +// +// Start program proper +// +if( isset($HTTP_POST_VARS['submit']) ) +{ + $sql = ''; + + if(!empty($forum_id)) + { + if(isset($HTTP_POST_VARS['simpleauth'])) + { + $simple_ary = $simple_auth_ary[intval($HTTP_POST_VARS['simpleauth'])]; + + for($i = 0; $i < count($simple_ary); $i++) + { + $sql .= ( ( $sql != '' ) ? ', ' : '' ) . $forum_auth_fields[$i] . ' = ' . $simple_ary[$i]; + } + + if (is_array($simple_ary)) + { + $sql = "UPDATE " . FORUMS_TABLE . " SET $sql WHERE forum_id = $forum_id"; + } + } + else + { + for($i = 0; $i < count($forum_auth_fields); $i++) + { + $value = intval($HTTP_POST_VARS[$forum_auth_fields[$i]]); + + if ( $forum_auth_fields[$i] == 'auth_vote' ) + { + if ( $HTTP_POST_VARS['auth_vote'] == AUTH_ALL ) + { + $value = AUTH_REG; + } + } + + $sql .= ( ( $sql != '' ) ? ', ' : '' ) .$forum_auth_fields[$i] . ' = ' . $value; + } + + $sql = "UPDATE " . FORUMS_TABLE . " SET $sql WHERE forum_id = $forum_id"; + } + + if ( $sql != '' ) + { + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update auth table', '', __LINE__, __FILE__, $sql); + } + } + + $forum_sql = ''; + $adv = 0; + } + + $template->assign_vars(array( + 'META' => '') + ); + $message = $lang['Forum_auth_updated'] . '

' . sprintf($lang['Click_return_forumauth'], '', ""); + message_die(GENERAL_MESSAGE, $message); + +} // End of submit + +// +// Get required information, either all forums if +// no id was specified or just the requsted if it +// was +// +$sql = "SELECT f.* + FROM " . FORUMS_TABLE . " f, " . CATEGORIES_TABLE . " c + WHERE c.cat_id = f.cat_id + $forum_sql + ORDER BY c.cat_order ASC, f.forum_order ASC"; +if ( !($result = $db->sql_query($sql)) ) +{ + message_die(GENERAL_ERROR, "Couldn't obtain forum list", "", __LINE__, __FILE__, $sql); +} + +$forum_rows = $db->sql_fetchrowset($result); +$db->sql_freeresult($result); + +if( empty($forum_id) ) +{ + // + // Output the selection table if no forum id was + // specified + // + $template->set_filenames(array( + 'body' => 'admin/auth_select_body.tpl') + ); + + $select_list = ''; + + $template->assign_vars(array( + 'L_AUTH_TITLE' => $lang['Auth_Control_Forum'], + 'L_AUTH_EXPLAIN' => $lang['Forum_auth_explain'], + 'L_AUTH_SELECT' => $lang['Select_a_Forum'], + 'L_LOOK_UP' => $lang['Look_up_Forum'], + + 'S_AUTH_ACTION' => append_sid("admin_forumauth.$phpEx"), + 'S_AUTH_SELECT' => $select_list) + ); + +} +else +{ + // + // Output the authorisation details if an id was + // specified + // + $template->set_filenames(array( + 'body' => 'admin/auth_forum_body.tpl') + ); + + $forum_name = $forum_rows[0]['forum_name']; + + @reset($simple_auth_ary); + while( list($key, $auth_levels) = each($simple_auth_ary)) + { + $matched = 1; + for($k = 0; $k < count($auth_levels); $k++) + { + $matched_type = $key; + + if ( $forum_rows[0][$forum_auth_fields[$k]] != $auth_levels[$k] ) + { + $matched = 0; + } + } + + if ( $matched ) + { + break; + } + } + + // + // If we didn't get a match above then we + // automatically switch into 'advanced' mode + // + if ( !isset($adv) && !$matched ) + { + $adv = 1; + } + + $s_column_span == 0; + + if ( empty($adv) ) + { + $simple_auth = ''; + + $template->assign_block_vars('forum_auth_titles', array( + 'CELL_TITLE' => $lang['Simple_mode']) + ); + $template->assign_block_vars('forum_auth_data', array( + 'S_AUTH_LEVELS_SELECT' => $simple_auth) + ); + + $s_column_span++; + } + else + { + // + // Output values of individual + // fields + // + for($j = 0; $j < count($forum_auth_fields); $j++) + { + $custom_auth[$j] = '  '; + + $cell_title = $field_names[$forum_auth_fields[$j]]; + + $template->assign_block_vars('forum_auth_titles', array( + 'CELL_TITLE' => $cell_title) + ); + $template->assign_block_vars('forum_auth_data', array( + 'S_AUTH_LEVELS_SELECT' => $custom_auth[$j]) + ); + + $s_column_span++; + } + } + + $adv_mode = ( empty($adv) ) ? '1' : '0'; + $switch_mode = append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=" . $forum_id . "&adv=". $adv_mode); + $switch_mode_text = ( empty($adv) ) ? $lang['Advanced_mode'] : $lang['Simple_mode']; + $u_switch_mode = '' . $switch_mode_text . ''; + + $s_hidden_fields = ''; + + $template->assign_vars(array( + 'FORUM_NAME' => $forum_name, + + 'L_FORUM' => $lang['Forum'], + 'L_AUTH_TITLE' => $lang['Auth_Control_Forum'], + 'L_AUTH_EXPLAIN' => $lang['Forum_auth_explain'], + 'L_SUBMIT' => $lang['Submit'], + 'L_RESET' => $lang['Reset'], + + 'U_SWITCH_MODE' => $u_switch_mode, + + 'S_FORUMAUTH_ACTION' => append_sid("admin_forumauth.$phpEx"), + 'S_COLUMN_SPAN' => $s_column_span, + 'S_HIDDEN_FIELDS' => $s_hidden_fields) + ); + +} + +include('./page_header_admin.'.$phpEx); + +$template->pparse('body'); + +include('./page_footer_admin.'.$phpEx); + +?> \ No newline at end of file diff --git a/phpBB/admin/admin_forums.php b/phpBB/admin/admin_forums.php new file mode 100644 index 0000000000..bcaf989697 --- /dev/null +++ b/phpBB/admin/admin_forums.php @@ -0,0 +1,1028 @@ + AUTH_ALL, + "auth_read" => AUTH_ALL, + "auth_post" => AUTH_REG, + "auth_reply" => AUTH_REG, + "auth_edit" => AUTH_REG, + "auth_delete" => AUTH_REG, + "auth_sticky" => AUTH_MOD, + "auth_announce" => AUTH_MOD, + "auth_vote" => AUTH_REG, + "auth_pollcreate" => AUTH_REG +); + +// +// Mode setting +// +if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) ) +{ + $mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; + $mode = htmlspecialchars($mode); +} +else +{ + $mode = ""; +} + +// ------------------ +// Begin function block +// +function get_info($mode, $id) +{ + global $db; + + switch($mode) + { + case 'category': + $table = CATEGORIES_TABLE; + $idfield = 'cat_id'; + $namefield = 'cat_title'; + break; + + case 'forum': + $table = FORUMS_TABLE; + $idfield = 'forum_id'; + $namefield = 'forum_name'; + break; + + default: + message_die(GENERAL_ERROR, "Wrong mode for generating select list", "", __LINE__, __FILE__); + break; + } + $sql = "SELECT count(*) as total + FROM $table"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't get Forum/Category information", "", __LINE__, __FILE__, $sql); + } + $count = $db->sql_fetchrow($result); + $count = $count['total']; + + $sql = "SELECT * + FROM $table + WHERE $idfield = $id"; + + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't get Forum/Category information", "", __LINE__, __FILE__, $sql); + } + + if( $db->sql_numrows($result) != 1 ) + { + message_die(GENERAL_ERROR, "Forum/Category doesn't exist or multiple forums/categories with ID $id", "", __LINE__, __FILE__); + } + + $return = $db->sql_fetchrow($result); + $return['number'] = $count; + return $return; +} + +function get_list($mode, $id, $select) +{ + global $db; + + switch($mode) + { + case 'category': + $table = CATEGORIES_TABLE; + $idfield = 'cat_id'; + $namefield = 'cat_title'; + break; + + case 'forum': + $table = FORUMS_TABLE; + $idfield = 'forum_id'; + $namefield = 'forum_name'; + break; + + default: + message_die(GENERAL_ERROR, "Wrong mode for generating select list", "", __LINE__, __FILE__); + break; + } + + $sql = "SELECT * + FROM $table"; + if( $select == 0 ) + { + $sql .= " WHERE $idfield <> $id"; + } + + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't get list of Categories/Forums", "", __LINE__, __FILE__, $sql); + } + + $cat_list = ""; + + while( $row = $db->sql_fetchrow($result) ) + { + $s = ""; + if ($row[$idfield] == $id) + { + $s = " selected=\"selected\""; + } + $catlist .= "\n"; + } + + return($catlist); +} + +function renumber_order($mode, $cat = 0) +{ + global $db; + + switch($mode) + { + case 'category': + $table = CATEGORIES_TABLE; + $idfield = 'cat_id'; + $orderfield = 'cat_order'; + $cat = 0; + break; + + case 'forum': + $table = FORUMS_TABLE; + $idfield = 'forum_id'; + $orderfield = 'forum_order'; + $catfield = 'cat_id'; + break; + + default: + message_die(GENERAL_ERROR, "Wrong mode for generating select list", "", __LINE__, __FILE__); + break; + } + + $sql = "SELECT * FROM $table"; + if( $cat != 0) + { + $sql .= " WHERE $catfield = $cat"; + } + $sql .= " ORDER BY $orderfield ASC"; + + + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't get list of Categories", "", __LINE__, __FILE__, $sql); + } + + $i = 10; + $inc = 10; + + while( $row = $db->sql_fetchrow($result) ) + { + $sql = "UPDATE $table + SET $orderfield = $i + WHERE $idfield = " . $row[$idfield]; + if( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't update order fields", "", __LINE__, __FILE__, $sql); + } + $i += 10; + } + +} +// +// End function block +// ------------------ + +// +// Begin program proper +// +if( isset($HTTP_POST_VARS['addforum']) || isset($HTTP_POST_VARS['addcategory']) ) +{ + $mode = ( isset($HTTP_POST_VARS['addforum']) ) ? "addforum" : "addcat"; + + if( $mode == "addforum" ) + { + list($cat_id) = each($HTTP_POST_VARS['addforum']); + $cat_id = intval($cat_id); + // + // stripslashes needs to be run on this because slashes are added when the forum name is posted + // + $forumname = stripslashes($HTTP_POST_VARS['forumname'][$cat_id]); + } +} + +if( !empty($mode) ) +{ + switch($mode) + { + case 'addforum': + case 'editforum': + // + // Show form to create/modify a forum + // + if ($mode == 'editforum') + { + // $newmode determines if we are going to INSERT or UPDATE after posting? + + $l_title = $lang['Edit_forum']; + $newmode = 'modforum'; + $buttonvalue = $lang['Update']; + + $forum_id = intval($HTTP_GET_VARS[POST_FORUM_URL]); + + $row = get_info('forum', $forum_id); + + $cat_id = $row['cat_id']; + $forumname = $row['forum_name']; + $forumdesc = $row['forum_desc']; + $forumstatus = $row['forum_status']; + + // + // start forum prune stuff. + // + if( $row['prune_enable'] ) + { + $prune_enabled = "checked=\"checked\""; + $sql = "SELECT * + FROM " . PRUNE_TABLE . " + WHERE forum_id = $forum_id"; + if(!$pr_result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Auto-Prune: Couldn't read auto_prune table.", __LINE__, __FILE__); + } + + $pr_row = $db->sql_fetchrow($pr_result); + } + else + { + $prune_enabled = ''; + } + } + else + { + $l_title = $lang['Create_forum']; + $newmode = 'createforum'; + $buttonvalue = $lang['Create_forum']; + + $forumdesc = ''; + $forumstatus = FORUM_UNLOCKED; + $forum_id = ''; + $prune_enabled = ''; + } + + $catlist = get_list('category', $cat_id, TRUE); + + $forumstatus == ( FORUM_LOCKED ) ? $forumlocked = "selected=\"selected\"" : $forumunlocked = "selected=\"selected\""; + + // These two options ($lang['Status_unlocked'] and $lang['Status_locked']) seem to be missing from + // the language files. + $lang['Status_unlocked'] = isset($lang['Status_unlocked']) ? $lang['Status_unlocked'] : 'Unlocked'; + $lang['Status_locked'] = isset($lang['Status_locked']) ? $lang['Status_locked'] : 'Locked'; + + $statuslist = "\n"; + $statuslist .= "\n"; + + $template->set_filenames(array( + "body" => "admin/forum_edit_body.tpl") + ); + + $s_hidden_fields = ''; + + $template->assign_vars(array( + 'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"), + 'S_HIDDEN_FIELDS' => $s_hidden_fields, + 'S_SUBMIT_VALUE' => $buttonvalue, + 'S_CAT_LIST' => $catlist, + 'S_STATUS_LIST' => $statuslist, + 'S_PRUNE_ENABLED' => $prune_enabled, + + 'L_FORUM_TITLE' => $l_title, + 'L_FORUM_EXPLAIN' => $lang['Forum_edit_delete_explain'], + 'L_FORUM_SETTINGS' => $lang['Forum_settings'], + 'L_FORUM_NAME' => $lang['Forum_name'], + 'L_CATEGORY' => $lang['Category'], + 'L_FORUM_DESCRIPTION' => $lang['Forum_desc'], + 'L_FORUM_STATUS' => $lang['Forum_status'], + 'L_AUTO_PRUNE' => $lang['Forum_pruning'], + 'L_ENABLED' => $lang['Enabled'], + 'L_PRUNE_DAYS' => $lang['prune_days'], + 'L_PRUNE_FREQ' => $lang['prune_freq'], + 'L_DAYS' => $lang['Days'], + + 'PRUNE_DAYS' => ( isset($pr_row['prune_days']) ) ? $pr_row['prune_days'] : 7, + 'PRUNE_FREQ' => ( isset($pr_row['prune_freq']) ) ? $pr_row['prune_freq'] : 1, + 'FORUM_NAME' => $forumname, + 'DESCRIPTION' => $forumdesc) + ); + $template->pparse("body"); + break; + + case 'createforum': + // + // Create a forum in the DB + // + if( trim($HTTP_POST_VARS['forumname']) == "" ) + { + message_die(GENERAL_ERROR, "Can't create a forum without a name"); + } + + $sql = "SELECT MAX(forum_order) AS max_order + FROM " . FORUMS_TABLE . " + WHERE cat_id = " . intval($HTTP_POST_VARS[POST_CAT_URL]); + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't get order number from forums table", "", __LINE__, __FILE__, $sql); + } + $row = $db->sql_fetchrow($result); + + $max_order = $row['max_order']; + $next_order = $max_order + 10; + + $sql = "SELECT MAX(forum_id) AS max_id + FROM " . FORUMS_TABLE; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't get order number from forums table", "", __LINE__, __FILE__, $sql); + } + $row = $db->sql_fetchrow($result); + + $max_id = $row['max_id']; + $next_id = $max_id + 1; + + // + // Default permissions of public :: + // + $field_sql = ""; + $value_sql = ""; + while( list($field, $value) = each($forum_auth_ary) ) + { + $field_sql .= ", $field"; + $value_sql .= ", $value"; + + } + + // There is no problem having duplicate forum names so we won't check for it. + $sql = "INSERT INTO " . FORUMS_TABLE . " (forum_id, forum_name, cat_id, forum_desc, forum_order, forum_status, prune_enable" . $field_sql . ") + VALUES ('" . $next_id . "', '" . str_replace("\'", "''", $HTTP_POST_VARS['forumname']) . "', " . intval($HTTP_POST_VARS[POST_CAT_URL]) . ", '" . str_replace("\'", "''", $HTTP_POST_VARS['forumdesc']) . "', $next_order, " . intval($HTTP_POST_VARS['forumstatus']) . ", " . intval($HTTP_POST_VARS['prune_enable']) . $value_sql . ")"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't insert row in forums table", "", __LINE__, __FILE__, $sql); + } + + if( $HTTP_POST_VARS['prune_enable'] ) + { + + if( $HTTP_POST_VARS['prune_days'] == "" || $HTTP_POST_VARS['prune_freq'] == "") + { + message_die(GENERAL_MESSAGE, $lang['Set_prune_data']); + } + + $sql = "INSERT INTO " . PRUNE_TABLE . " (forum_id, prune_days, prune_freq) + VALUES('" . $next_id . "', " . intval($HTTP_POST_VARS['prune_days']) . ", " . intval($HTTP_POST_VARS['prune_freq']) . ")"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't insert row in prune table", "", __LINE__, __FILE__, $sql); + } + } + + $message = $lang['Forums_updated'] . "

" . sprintf($lang['Click_return_forumadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + + break; + + case 'modforum': + // Modify a forum in the DB + if( isset($HTTP_POST_VARS['prune_enable'])) + { + if( $HTTP_POST_VARS['prune_enable'] != 1 ) + { + $HTTP_POST_VARS['prune_enable'] = 0; + } + } + + $sql = "UPDATE " . FORUMS_TABLE . " + SET forum_name = '" . str_replace("\'", "''", $HTTP_POST_VARS['forumname']) . "', cat_id = " . intval($HTTP_POST_VARS[POST_CAT_URL]) . ", forum_desc = '" . str_replace("\'", "''", $HTTP_POST_VARS['forumdesc']) . "', forum_status = " . intval($HTTP_POST_VARS['forumstatus']) . ", prune_enable = " . intval($HTTP_POST_VARS['prune_enable']) . " + WHERE forum_id = " . intval($HTTP_POST_VARS[POST_FORUM_URL]); + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't update forum information", "", __LINE__, __FILE__, $sql); + } + + if( $HTTP_POST_VARS['prune_enable'] == 1 ) + { + if( $HTTP_POST_VARS['prune_days'] == "" || $HTTP_POST_VARS['prune_freq'] == "" ) + { + message_die(GENERAL_MESSAGE, $lang['Set_prune_data']); + } + + $sql = "SELECT * + FROM " . PRUNE_TABLE . " + WHERE forum_id = " . intval($HTTP_POST_VARS[POST_FORUM_URL]); + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't get forum Prune Information","",__LINE__, __FILE__, $sql); + } + + if( $db->sql_numrows($result) > 0 ) + { + $sql = "UPDATE " . PRUNE_TABLE . " + SET prune_days = " . intval($HTTP_POST_VARS['prune_days']) . ", prune_freq = " . intval($HTTP_POST_VARS['prune_freq']) . " + WHERE forum_id = " . intval($HTTP_POST_VARS[POST_FORUM_URL]); + } + else + { + $sql = "INSERT INTO " . PRUNE_TABLE . " (forum_id, prune_days, prune_freq) + VALUES(" . intval($HTTP_POST_VARS[POST_FORUM_URL]) . ", " . intval($HTTP_POST_VARS['prune_days']) . ", " . intval($HTTP_POST_VARS['prune_freq']) . ")"; + } + + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't Update Forum Prune Information","",__LINE__, __FILE__, $sql); + } + } + + $message = $lang['Forums_updated'] . "

" . sprintf($lang['Click_return_forumadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + + break; + + case 'addcat': + // Create a category in the DB + if( trim($HTTP_POST_VARS['categoryname']) == '') + { + message_die(GENERAL_ERROR, "Can't create a category without a name"); + } + + $sql = "SELECT MAX(cat_order) AS max_order + FROM " . CATEGORIES_TABLE; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't get order number from categories table", "", __LINE__, __FILE__, $sql); + } + $row = $db->sql_fetchrow($result); + + $max_order = $row['max_order']; + $next_order = $max_order + 10; + + // + // There is no problem having duplicate forum names so we won't check for it. + // + $sql = "INSERT INTO " . CATEGORIES_TABLE . " (cat_title, cat_order) + VALUES ('" . str_replace("\'", "''", $HTTP_POST_VARS['categoryname']) . "', $next_order)"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't insert row in categories table", "", __LINE__, __FILE__, $sql); + } + + $message = $lang['Forums_updated'] . "

" . sprintf($lang['Click_return_forumadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + + break; + + case 'editcat': + // + // Show form to edit a category + // + $newmode = 'modcat'; + $buttonvalue = $lang['Update']; + + $cat_id = intval($HTTP_GET_VARS[POST_CAT_URL]); + + $row = get_info('category', $cat_id); + $cat_title = $row['cat_title']; + + $template->set_filenames(array( + "body" => "admin/category_edit_body.tpl") + ); + + $s_hidden_fields = ''; + + $template->assign_vars(array( + 'CAT_TITLE' => $cat_title, + + 'L_EDIT_CATEGORY' => $lang['Edit_Category'], + 'L_EDIT_CATEGORY_EXPLAIN' => $lang['Edit_Category_explain'], + 'L_CATEGORY' => $lang['Category'], + + 'S_HIDDEN_FIELDS' => $s_hidden_fields, + 'S_SUBMIT_VALUE' => $buttonvalue, + 'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx")) + ); + + $template->pparse("body"); + break; + + case 'modcat': + // Modify a category in the DB + $sql = "UPDATE " . CATEGORIES_TABLE . " + SET cat_title = '" . str_replace("\'", "''", $HTTP_POST_VARS['cat_title']) . "' + WHERE cat_id = " . intval($HTTP_POST_VARS[POST_CAT_URL]); + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't update forum information", "", __LINE__, __FILE__, $sql); + } + + $message = $lang['Forums_updated'] . "

" . sprintf($lang['Click_return_forumadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + + break; + + case 'deleteforum': + // Show form to delete a forum + $forum_id = intval($HTTP_GET_VARS[POST_FORUM_URL]); + + $select_to = ''; + + $buttonvalue = $lang['Move_and_Delete']; + + $newmode = 'movedelforum'; + + $foruminfo = get_info('forum', $forum_id); + $name = $foruminfo['forum_name']; + + $template->set_filenames(array( + "body" => "admin/forum_delete_body.tpl") + ); + + $s_hidden_fields = ''; + + $template->assign_vars(array( + 'NAME' => $name, + + 'L_FORUM_DELETE' => $lang['Forum_delete'], + 'L_FORUM_DELETE_EXPLAIN' => $lang['Forum_delete_explain'], + 'L_MOVE_CONTENTS' => $lang['Move_contents'], + 'L_FORUM_NAME' => $lang['Forum_name'], + + "S_HIDDEN_FIELDS" => $s_hidden_fields, + 'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"), + 'S_SELECT_TO' => $select_to, + 'S_SUBMIT_VALUE' => $buttonvalue) + ); + + $template->pparse("body"); + break; + + case 'movedelforum': + // + // Move or delete a forum in the DB + // + $from_id = intval($HTTP_POST_VARS['from_id']); + $to_id = intval($HTTP_POST_VARS['to_id']); + $delete_old = intval($HTTP_POST_VARS['delete_old']); + + // Either delete or move all posts in a forum + if($to_id == -1) + { + // Delete polls in this forum + $sql = "SELECT v.vote_id + FROM " . VOTE_DESC_TABLE . " v, " . TOPICS_TABLE . " t + WHERE t.forum_id = $from_id + AND v.topic_id = t.topic_id"; + if (!($result = $db->sql_query($sql))) + { + message_die(GENERAL_ERROR, "Couldn't obtain list of vote ids", "", __LINE__, __FILE__, $sql); + } + + if ($row = $db->sql_fetchrow($result)) + { + $vote_ids = ''; + do + { + $vote_ids .= (($vote_ids != '') ? ', ' : '') . $row['vote_id']; + } + while ($row = $db->sql_fetchrow($result)); + + $sql = "DELETE FROM " . VOTE_DESC_TABLE . " + WHERE vote_id IN ($vote_ids)"; + $db->sql_query($sql); + + $sql = "DELETE FROM " . VOTE_RESULTS_TABLE . " + WHERE vote_id IN ($vote_ids)"; + $db->sql_query($sql); + + $sql = "DELETE FROM " . VOTE_USERS_TABLE . " + WHERE vote_id IN ($vote_ids)"; + $db->sql_query($sql); + } + $db->sql_freeresult($result); + + include($phpbb_root_path . "includes/prune.$phpEx"); + prune($from_id, 0, true); // Delete everything from forum + } + else + { + $sql = "SELECT * + FROM " . FORUMS_TABLE . " + WHERE forum_id IN ($from_id, $to_id)"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't verify existence of forums", "", __LINE__, __FILE__, $sql); + } + + if($db->sql_numrows($result) != 2) + { + message_die(GENERAL_ERROR, "Ambiguous forum ID's", "", __LINE__, __FILE__); + } + $sql = "UPDATE " . TOPICS_TABLE . " + SET forum_id = $to_id + WHERE forum_id = $from_id"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't move topics to other forum", "", __LINE__, __FILE__, $sql); + } + $sql = "UPDATE " . POSTS_TABLE . " + SET forum_id = $to_id + WHERE forum_id = $from_id"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't move posts to other forum", "", __LINE__, __FILE__, $sql); + } + sync('forum', $to_id); + } + + // Alter Mod level if appropriate - 2.0.4 + $sql = "SELECT ug.user_id + FROM " . AUTH_ACCESS_TABLE . " a, " . USER_GROUP_TABLE . " ug + WHERE a.forum_id <> $from_id + AND a.auth_mod = 1 + AND ug.group_id = a.group_id"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't obtain moderator list", "", __LINE__, __FILE__, $sql); + } + + if ($row = $db->sql_fetchrow($result)) + { + $user_ids = ''; + do + { + $user_ids .= (($user_ids != '') ? ', ' : '' ) . $row['user_id']; + } + while ($row = $db->sql_fetchrow($result)); + + $sql = "SELECT ug.user_id + FROM " . AUTH_ACCESS_TABLE . " a, " . USER_GROUP_TABLE . " ug + WHERE a.forum_id = $from_id + AND a.auth_mod = 1 + AND ug.group_id = a.group_id + AND ug.user_id NOT IN ($user_ids)"; + if( !$result2 = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't obtain moderator list", "", __LINE__, __FILE__, $sql); + } + + if ($row = $db->sql_fetchrow($result2)) + { + $user_ids = ''; + do + { + $user_ids .= (($user_ids != '') ? ', ' : '' ) . $row['user_id']; + } + while ($row = $db->sql_fetchrow($result2)); + + $sql = "UPDATE " . USERS_TABLE . " + SET user_level = " . USER . " + WHERE user_id IN ($user_ids) + AND user_level <> " . ADMIN; + $db->sql_query($sql); + } + $db->sql_freeresult($result); + + } + $db->sql_freeresult($result2); + + $sql = "DELETE FROM " . FORUMS_TABLE . " + WHERE forum_id = $from_id"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't delete forum", "", __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . AUTH_ACCESS_TABLE . " + WHERE forum_id = $from_id"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't delete forum", "", __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . PRUNE_TABLE . " + WHERE forum_id = $from_id"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't delete forum prune information!", "", __LINE__, __FILE__, $sql); + } + + $message = $lang['Forums_updated'] . "

" . sprintf($lang['Click_return_forumadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + + break; + + case 'deletecat': + // + // Show form to delete a category + // + $cat_id = intval($HTTP_GET_VARS[POST_CAT_URL]); + + $buttonvalue = $lang['Move_and_Delete']; + $newmode = 'movedelcat'; + $catinfo = get_info('category', $cat_id); + $name = $catinfo['cat_title']; + + if ($catinfo['number'] == 1) + { + $sql = "SELECT count(*) as total + FROM ". FORUMS_TABLE; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't get Forum count", "", __LINE__, __FILE__, $sql); + } + $count = $db->sql_fetchrow($result); + $count = $count['total']; + + if ($count > 0) + { + message_die(GENERAL_ERROR, $lang['Must_delete_forums']); + } + else + { + $select_to = $lang['Nowhere_to_move']; + } + } + else + { + $select_to = ''; + } + + $template->set_filenames(array( + "body" => "admin/forum_delete_body.tpl") + ); + + $s_hidden_fields = ''; + + $template->assign_vars(array( + 'NAME' => $name, + + 'L_FORUM_DELETE' => $lang['Forum_delete'], + 'L_FORUM_DELETE_EXPLAIN' => $lang['Forum_delete_explain'], + 'L_MOVE_CONTENTS' => $lang['Move_contents'], + 'L_FORUM_NAME' => $lang['Forum_name'], + + 'S_HIDDEN_FIELDS' => $s_hidden_fields, + 'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"), + 'S_SELECT_TO' => $select_to, + 'S_SUBMIT_VALUE' => $buttonvalue) + ); + + $template->pparse("body"); + break; + + case 'movedelcat': + // + // Move or delete a category in the DB + // + $from_id = intval($HTTP_POST_VARS['from_id']); + $to_id = intval($HTTP_POST_VARS['to_id']); + + if (!empty($to_id)) + { + $sql = "SELECT * + FROM " . CATEGORIES_TABLE . " + WHERE cat_id IN ($from_id, $to_id)"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't verify existence of categories", "", __LINE__, __FILE__, $sql); + } + if($db->sql_numrows($result) != 2) + { + message_die(GENERAL_ERROR, "Ambiguous category ID's", "", __LINE__, __FILE__); + } + + $sql = "UPDATE " . FORUMS_TABLE . " + SET cat_id = $to_id + WHERE cat_id = $from_id"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't move forums to other category", "", __LINE__, __FILE__, $sql); + } + } + + $sql = "DELETE FROM " . CATEGORIES_TABLE ." + WHERE cat_id = $from_id"; + + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't delete category", "", __LINE__, __FILE__, $sql); + } + + $message = $lang['Forums_updated'] . "

" . sprintf($lang['Click_return_forumadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + + break; + + case 'forum_order': + // + // Change order of forums in the DB + // + $move = intval($HTTP_GET_VARS['move']); + $forum_id = intval($HTTP_GET_VARS[POST_FORUM_URL]); + + $forum_info = get_info('forum', $forum_id); + + $cat_id = $forum_info['cat_id']; + + $sql = "UPDATE " . FORUMS_TABLE . " + SET forum_order = forum_order + $move + WHERE forum_id = $forum_id"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't change category order", "", __LINE__, __FILE__, $sql); + } + + renumber_order('forum', $forum_info['cat_id']); + $show_index = TRUE; + + break; + + case 'cat_order': + // + // Change order of categories in the DB + // + $move = intval($HTTP_GET_VARS['move']); + $cat_id = intval($HTTP_GET_VARS[POST_CAT_URL]); + + $sql = "UPDATE " . CATEGORIES_TABLE . " + SET cat_order = cat_order + $move + WHERE cat_id = $cat_id"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't change category order", "", __LINE__, __FILE__, $sql); + } + + renumber_order('category'); + $show_index = TRUE; + + break; + + case 'forum_sync': + sync('forum', intval($HTTP_GET_VARS[POST_FORUM_URL])); + $show_index = TRUE; + + break; + + default: + message_die(GENERAL_MESSAGE, $lang['No_mode']); + break; + } + + if ($show_index != TRUE) + { + include('./page_footer_admin.'.$phpEx); + exit; + } +} + +// +// Start page proper +// +$template->set_filenames(array( + "body" => "admin/forum_admin_body.tpl") +); + +$template->assign_vars(array( + 'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"), + 'L_FORUM_TITLE' => $lang['Forum_admin'], + 'L_FORUM_EXPLAIN' => $lang['Forum_admin_explain'], + 'L_CREATE_FORUM' => $lang['Create_forum'], + 'L_CREATE_CATEGORY' => $lang['Create_category'], + 'L_EDIT' => $lang['Edit'], + 'L_DELETE' => $lang['Delete'], + 'L_MOVE_UP' => $lang['Move_up'], + 'L_MOVE_DOWN' => $lang['Move_down'], + 'L_RESYNC' => $lang['Resync']) +); + +$sql = "SELECT cat_id, cat_title, cat_order + FROM " . CATEGORIES_TABLE . " + ORDER BY cat_order"; +if( !$q_categories = $db->sql_query($sql) ) +{ + message_die(GENERAL_ERROR, "Could not query categories list", "", __LINE__, __FILE__, $sql); +} + +if( $total_categories = $db->sql_numrows($q_categories) ) +{ + $category_rows = $db->sql_fetchrowset($q_categories); + + $sql = "SELECT * + FROM " . FORUMS_TABLE . " + ORDER BY cat_id, forum_order"; + if(!$q_forums = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Could not query forums information", "", __LINE__, __FILE__, $sql); + } + + if( $total_forums = $db->sql_numrows($q_forums) ) + { + $forum_rows = $db->sql_fetchrowset($q_forums); + } + + // + // Okay, let's build the index + // + $gen_cat = array(); + + for($i = 0; $i < $total_categories; $i++) + { + $cat_id = $category_rows[$i]['cat_id']; + + $template->assign_block_vars("catrow", array( + 'S_ADD_FORUM_SUBMIT' => "addforum[$cat_id]", + 'S_ADD_FORUM_NAME' => "forumname[$cat_id]", + + 'CAT_ID' => $cat_id, + 'CAT_DESC' => $category_rows[$i]['cat_title'], + + 'U_CAT_EDIT' => append_sid("admin_forums.$phpEx?mode=editcat&" . POST_CAT_URL . "=$cat_id"), + 'U_CAT_DELETE' => append_sid("admin_forums.$phpEx?mode=deletecat&" . POST_CAT_URL . "=$cat_id"), + 'U_CAT_MOVE_UP' => append_sid("admin_forums.$phpEx?mode=cat_order&move=-15&" . POST_CAT_URL . "=$cat_id"), + 'U_CAT_MOVE_DOWN' => append_sid("admin_forums.$phpEx?mode=cat_order&move=15&" . POST_CAT_URL . "=$cat_id"), + 'U_VIEWCAT' => append_sid($phpbb_root_path."index.$phpEx?" . POST_CAT_URL . "=$cat_id")) + ); + + for($j = 0; $j < $total_forums; $j++) + { + $forum_id = $forum_rows[$j]['forum_id']; + + if ($forum_rows[$j]['cat_id'] == $cat_id) + { + + $template->assign_block_vars("catrow.forumrow", array( + 'FORUM_NAME' => $forum_rows[$j]['forum_name'], + 'FORUM_DESC' => $forum_rows[$j]['forum_desc'], + 'ROW_COLOR' => $row_color, + 'NUM_TOPICS' => $forum_rows[$j]['forum_topics'], + 'NUM_POSTS' => $forum_rows[$j]['forum_posts'], + + 'U_VIEWFORUM' => append_sid($phpbb_root_path."viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"), + 'U_FORUM_EDIT' => append_sid("admin_forums.$phpEx?mode=editforum&" . POST_FORUM_URL . "=$forum_id"), + 'U_FORUM_DELETE' => append_sid("admin_forums.$phpEx?mode=deleteforum&" . POST_FORUM_URL . "=$forum_id"), + 'U_FORUM_MOVE_UP' => append_sid("admin_forums.$phpEx?mode=forum_order&move=-15&" . POST_FORUM_URL . "=$forum_id"), + 'U_FORUM_MOVE_DOWN' => append_sid("admin_forums.$phpEx?mode=forum_order&move=15&" . POST_FORUM_URL . "=$forum_id"), + 'U_FORUM_RESYNC' => append_sid("admin_forums.$phpEx?mode=forum_sync&" . POST_FORUM_URL . "=$forum_id")) + ); + + }// if ... forumid == catid + + } // for ... forums + + } // for ... categories + +}// if ... total_categories + +$template->pparse("body"); + +include('./page_footer_admin.'.$phpEx); + +?> \ No newline at end of file diff --git a/phpBB/admin/admin_groups.php b/phpBB/admin/admin_groups.php new file mode 100644 index 0000000000..4406b01946 --- /dev/null +++ b/phpBB/admin/admin_groups.php @@ -0,0 +1,417 @@ +set_filenames(array( + 'body' => 'admin/group_edit_body.tpl') + ); + + if ( isset($HTTP_POST_VARS['edit']) ) + { + // + // They're editing. Grab the vars. + // + $sql = "SELECT * + FROM " . GROUPS_TABLE . " + WHERE group_single_user <> " . TRUE . " + AND group_id = $group_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Error getting group information', '', __LINE__, __FILE__, $sql); + } + + if ( !($group_info = $db->sql_fetchrow($result)) ) + { + message_die(GENERAL_MESSAGE, $lang['Group_not_exist']); + } + + $mode = 'editgroup'; + $template->assign_block_vars('group_edit', array()); + + } + else if ( isset($HTTP_POST_VARS['new']) ) + { + $group_info = array ( + 'group_name' => '', + 'group_description' => '', + 'group_moderator' => '', + 'group_type' => GROUP_OPEN); + $group_open = ' checked="checked"'; + + $mode = 'newgroup'; + + } + + // + // Ok, now we know everything about them, let's show the page. + // + if ($group_info['group_moderator'] != '') + { + $sql = "SELECT user_id, username + FROM " . USERS_TABLE . " + WHERE user_id = " . $group_info['group_moderator']; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain user info for moderator list', '', __LINE__, __FILE__, $sql); + } + + if ( !($row = $db->sql_fetchrow($result)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain user info for moderator list', '', __LINE__, __FILE__, $sql); + } + + $group_moderator = $row['username']; + } + else + { + $group_moderator = ''; + } + + $group_open = ( $group_info['group_type'] == GROUP_OPEN ) ? ' checked="checked"' : ''; + $group_closed = ( $group_info['group_type'] == GROUP_CLOSED ) ? ' checked="checked"' : ''; + $group_hidden = ( $group_info['group_type'] == GROUP_HIDDEN ) ? ' checked="checked"' : ''; + + $s_hidden_fields = ''; + + $template->assign_vars(array( + 'GROUP_NAME' => $group_info['group_name'], + 'GROUP_DESCRIPTION' => $group_info['group_description'], + 'GROUP_MODERATOR' => $group_moderator, + + 'L_GROUP_TITLE' => $lang['Group_administration'], + 'L_GROUP_EDIT_DELETE' => ( isset($HTTP_POST_VARS['new']) ) ? $lang['New_group'] : $lang['Edit_group'], + 'L_GROUP_NAME' => $lang['group_name'], + 'L_GROUP_DESCRIPTION' => $lang['group_description'], + 'L_GROUP_MODERATOR' => $lang['group_moderator'], + 'L_FIND_USERNAME' => $lang['Find_username'], + 'L_GROUP_STATUS' => $lang['group_status'], + 'L_GROUP_OPEN' => $lang['group_open'], + 'L_GROUP_CLOSED' => $lang['group_closed'], + 'L_GROUP_HIDDEN' => $lang['group_hidden'], + 'L_GROUP_DELETE' => $lang['group_delete'], + 'L_GROUP_DELETE_CHECK' => $lang['group_delete_check'], + 'L_SUBMIT' => $lang['Submit'], + 'L_RESET' => $lang['Reset'], + 'L_DELETE_MODERATOR' => $lang['delete_group_moderator'], + 'L_DELETE_MODERATOR_EXPLAIN' => $lang['delete_moderator_explain'], + 'L_YES' => $lang['Yes'], + + 'U_SEARCH_USER' => append_sid("../search.$phpEx?mode=searchuser"), + + 'S_GROUP_OPEN_TYPE' => GROUP_OPEN, + 'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED, + 'S_GROUP_HIDDEN_TYPE' => GROUP_HIDDEN, + 'S_GROUP_OPEN_CHECKED' => $group_open, + 'S_GROUP_CLOSED_CHECKED' => $group_closed, + 'S_GROUP_HIDDEN_CHECKED' => $group_hidden, + 'S_GROUP_ACTION' => append_sid("admin_groups.$phpEx"), + 'S_HIDDEN_FIELDS' => $s_hidden_fields) + ); + + $template->pparse('body'); + +} +else if ( isset($HTTP_POST_VARS['group_update']) ) +{ + // + // Ok, they are submitting a group, let's save the data based on if it's new or editing + // + if ( isset($HTTP_POST_VARS['group_delete']) ) + { + // + // Reset User Moderator Level + // + + // Is Group moderating a forum ? + $sql = "SELECT auth_mod FROM " . AUTH_ACCESS_TABLE . " + WHERE group_id = " . $group_id; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not select auth_access', '', __LINE__, __FILE__, $sql); + } + + $row = $db->sql_fetchrow($result); + if (intval($row['auth_mod']) == 1) + { + // Yes, get the assigned users and update their Permission if they are no longer moderator of one of the forums + $sql = "SELECT user_id FROM " . USER_GROUP_TABLE . " + WHERE group_id = " . $group_id; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not select user_group', '', __LINE__, __FILE__, $sql); + } + + $rows = $db->sql_fetchrowset($result); + for ($i = 0; $i < count($rows); $i++) + { + $sql = "SELECT g.group_id FROM " . AUTH_ACCESS_TABLE . " a, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug + WHERE (a.auth_mod = 1) AND (g.group_id = a.group_id) AND (a.group_id = ug.group_id) AND (g.group_id = ug.group_id) + AND (ug.user_id = " . intval($rows[$i]['user_id']) . ") AND (ug.group_id <> " . $group_id . ")"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain moderator permissions', '', __LINE__, __FILE__, $sql); + } + + if ($db->sql_numrows($result) == 0) + { + $sql = "UPDATE " . USERS_TABLE . " SET user_level = " . USER . " + WHERE user_level = " . MOD . " AND user_id = " . intval($rows[$i]['user_id']); + + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update moderator permissions', '', __LINE__, __FILE__, $sql); + } + } + } + } + + // + // Delete Group + // + $sql = "DELETE FROM " . GROUPS_TABLE . " + WHERE group_id = " . $group_id; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update group', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . USER_GROUP_TABLE . " + WHERE group_id = " . $group_id; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update user_group', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . AUTH_ACCESS_TABLE . " + WHERE group_id = " . $group_id; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update auth_access', '', __LINE__, __FILE__, $sql); + } + + $message = $lang['Deleted_group'] . '

' . sprintf($lang['Click_return_groupsadmin'], '', '') . '

' . sprintf($lang['Click_return_admin_index'], '', ''); + + message_die(GENERAL_MESSAGE, $message); + } + else + { + $group_type = isset($HTTP_POST_VARS['group_type']) ? intval($HTTP_POST_VARS['group_type']) : GROUP_OPEN; + $group_name = isset($HTTP_POST_VARS['group_name']) ? htmlspecialchars(trim($HTTP_POST_VARS['group_name'])) : ''; + $group_description = isset($HTTP_POST_VARS['group_description']) ? trim($HTTP_POST_VARS['group_description']) : ''; + $group_moderator = isset($HTTP_POST_VARS['username']) ? $HTTP_POST_VARS['username'] : ''; + $delete_old_moderator = isset($HTTP_POST_VARS['delete_old_moderator']) ? true : false; + + if ( $group_name == '' ) + { + message_die(GENERAL_MESSAGE, $lang['No_group_name']); + } + else if ( $group_moderator == '' ) + { + message_die(GENERAL_MESSAGE, $lang['No_group_moderator']); + } + + $this_userdata = get_userdata($group_moderator, true); + $group_moderator = $this_userdata['user_id']; + + if ( !$group_moderator ) + { + message_die(GENERAL_MESSAGE, $lang['No_group_moderator']); + } + + if( $mode == "editgroup" ) + { + $sql = "SELECT * + FROM " . GROUPS_TABLE . " + WHERE group_single_user <> " . TRUE . " + AND group_id = " . $group_id; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Error getting group information', '', __LINE__, __FILE__, $sql); + } + + if( !($group_info = $db->sql_fetchrow($result)) ) + { + message_die(GENERAL_MESSAGE, $lang['Group_not_exist']); + } + + if ( $group_info['group_moderator'] != $group_moderator ) + { + if ( $delete_old_moderator ) + { + $sql = "DELETE FROM " . USER_GROUP_TABLE . " + WHERE user_id = " . $group_info['group_moderator'] . " + AND group_id = " . $group_id; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update group moderator', '', __LINE__, __FILE__, $sql); + } + } + + $sql = "SELECT user_id + FROM " . USER_GROUP_TABLE . " + WHERE user_id = $group_moderator + AND group_id = $group_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Failed to obtain current group moderator info', '', __LINE__, __FILE__, $sql); + } + + if ( !($row = $db->sql_fetchrow($result)) ) + { + $sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending) + VALUES (" . $group_id . ", " . $group_moderator . ", 0)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update group moderator', '', __LINE__, __FILE__, $sql); + } + } + } + + $sql = "UPDATE " . GROUPS_TABLE . " + SET group_type = $group_type, group_name = '" . str_replace("\'", "''", $group_name) . "', group_description = '" . str_replace("\'", "''", $group_description) . "', group_moderator = $group_moderator + WHERE group_id = $group_id"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update group', '', __LINE__, __FILE__, $sql); + } + + $message = $lang['Updated_group'] . '

' . sprintf($lang['Click_return_groupsadmin'], '', '') . '

' . sprintf($lang['Click_return_admin_index'], '', '');; + + message_die(GENERAL_MESSAGE, $message); + } + else if( $mode == 'newgroup' ) + { + $sql = "INSERT INTO " . GROUPS_TABLE . " (group_type, group_name, group_description, group_moderator, group_single_user) + VALUES ($group_type, '" . str_replace("\'", "''", $group_name) . "', '" . str_replace("\'", "''", $group_description) . "', $group_moderator, '0')"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not insert new group', '', __LINE__, __FILE__, $sql); + } + $new_group_id = $db->sql_nextid(); + + $sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending) + VALUES ($new_group_id, $group_moderator, 0)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not insert new user-group info', '', __LINE__, __FILE__, $sql); + } + + $message = $lang['Added_new_group'] . '

' . sprintf($lang['Click_return_groupsadmin'], '', '') . '

' . sprintf($lang['Click_return_admin_index'], '', '');; + + message_die(GENERAL_MESSAGE, $message); + + } + else + { + message_die(GENERAL_MESSAGE, $lang['No_group_action']); + } + } +} +else +{ + $sql = "SELECT group_id, group_name + FROM " . GROUPS_TABLE . " + WHERE group_single_user <> " . TRUE . " + ORDER BY group_name"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain group list', '', __LINE__, __FILE__, $sql); + } + + $select_list = ''; + if ( $row = $db->sql_fetchrow($result) ) + { + $select_list .= ''; + } + + $template->set_filenames(array( + 'body' => 'admin/group_select_body.tpl') + ); + + $template->assign_vars(array( + 'L_GROUP_TITLE' => $lang['Group_administration'], + 'L_GROUP_EXPLAIN' => $lang['Group_admin_explain'], + 'L_GROUP_SELECT' => $lang['Select_group'], + 'L_LOOK_UP' => $lang['Look_up_group'], + 'L_CREATE_NEW_GROUP' => $lang['New_group'], + + 'S_GROUP_ACTION' => append_sid("admin_groups.$phpEx"), + 'S_GROUP_SELECT' => $select_list) + ); + + if ( $select_list != '' ) + { + $template->assign_block_vars('select_box', array()); + } + + $template->pparse('body'); +} + +include('./page_footer_admin.'.$phpEx); + +?> diff --git a/phpBB/admin/admin_mass_email.php b/phpBB/admin/admin_mass_email.php new file mode 100644 index 0000000000..265b637921 --- /dev/null +++ b/phpBB/admin/admin_mass_email.php @@ -0,0 +1,213 @@ +' . $lang['Empty_subject'] : $lang['Empty_subject']; + } + + if ( empty($message) ) + { + $error = true; + $error_msg .= ( !empty($error_msg) ) ? '
' . $lang['Empty_message'] : $lang['Empty_message']; + } + + $group_id = intval($HTTP_POST_VARS[POST_GROUPS_URL]); + + $sql = ( $group_id != -1 ) ? "SELECT u.user_email FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug WHERE ug.group_id = $group_id AND ug.user_pending <> " . TRUE . " AND u.user_id = ug.user_id" : "SELECT user_email FROM " . USERS_TABLE; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not select group members', '', __LINE__, __FILE__, $sql); + } + + if ( $row = $db->sql_fetchrow($result) ) + { + $bcc_list = array(); + do + { + $bcc_list[] = $row['user_email']; + } + while ( $row = $db->sql_fetchrow($result) ); + + $db->sql_freeresult($result); + } + else + { + $message = ( $group_id != -1 ) ? $lang['Group_not_exist'] : $lang['No_such_user']; + + $error = true; + $error_msg .= ( !empty($error_msg) ) ? '
' . $message : $message; + } + + if ( !$error ) + { + include($phpbb_root_path . 'includes/emailer.'.$phpEx); + + // + // Let's do some checking to make sure that mass mail functions + // are working in win32 versions of php. + // + if ( preg_match('/[c-z]:\\\.*/i', getenv('PATH')) && !$board_config['smtp_delivery']) + { + $ini_val = ( @phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var'; + + // We are running on windows, force delivery to use our smtp functions + // since php's are broken by default + $board_config['smtp_delivery'] = 1; + $board_config['smtp_host'] = @$ini_val('SMTP'); + } + + $emailer = new emailer($board_config['smtp_delivery']); + + $emailer->from($board_config['board_email']); + $emailer->replyto($board_config['board_email']); + + for ($i = 0; $i < count($bcc_list); $i++) + { + $emailer->bcc($bcc_list[$i]); + } + + $email_headers = 'X-AntiAbuse: Board servername - ' . $board_config['server_name'] . "\n"; + $email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n"; + $email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n"; + $email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\n"; + + $emailer->use_template('admin_send_email'); + $emailer->email_address($board_config['board_email']); + $emailer->set_subject($subject); + $emailer->extra_headers($email_headers); + + $emailer->assign_vars(array( + 'SITENAME' => $board_config['sitename'], + 'BOARD_EMAIL' => $board_config['board_email'], + 'MESSAGE' => $message) + ); + $emailer->send(); + $emailer->reset(); + + message_die(GENERAL_MESSAGE, $lang['Email_sent'] . '

' . sprintf($lang['Click_return_admin_index'], '', '')); + } +} + +if ( $error ) +{ + $template->set_filenames(array( + 'reg_header' => 'error_body.tpl') + ); + $template->assign_vars(array( + 'ERROR_MESSAGE' => $error_msg) + ); + $template->assign_var_from_handle('ERROR_BOX', 'reg_header'); +} + +// +// Initial selection +// + +$sql = "SELECT group_id, group_name + FROM ".GROUPS_TABLE . " + WHERE group_single_user <> 1"; +if ( !($result = $db->sql_query($sql)) ) +{ + message_die(GENERAL_ERROR, 'Could not obtain list of groups', '', __LINE__, __FILE__, $sql); +} + +$select_list = ''; + +// +// Generate page +// +include('./page_header_admin.'.$phpEx); + +$template->set_filenames(array( + 'body' => 'admin/user_email_body.tpl') +); + +$template->assign_vars(array( + 'MESSAGE' => $message, + 'SUBJECT' => $subject, + + 'L_EMAIL_TITLE' => $lang['Email'], + 'L_EMAIL_EXPLAIN' => $lang['Mass_email_explain'], + 'L_COMPOSE' => $lang['Compose'], + 'L_RECIPIENTS' => $lang['Recipients'], + 'L_EMAIL_SUBJECT' => $lang['Subject'], + 'L_EMAIL_MSG' => $lang['Message'], + 'L_EMAIL' => $lang['Email'], + 'L_NOTICE' => $notice, + + 'S_USER_ACTION' => append_sid('admin_mass_email.'.$phpEx), + 'S_GROUP_SELECT' => $select_list) +); + +$template->pparse('body'); + +include('./page_footer_admin.'.$phpEx); + +?> \ No newline at end of file diff --git a/phpBB/admin/admin_ranks.php b/phpBB/admin/admin_ranks.php new file mode 100644 index 0000000000..50def2526a --- /dev/null +++ b/phpBB/admin/admin_ranks.php @@ -0,0 +1,349 @@ +sql_query($sql)) + { + message_die(GENERAL_ERROR, "Couldn't obtain rank data", "", __LINE__, __FILE__, $sql); + } + + $rank_info = $db->sql_fetchrow($result); + $s_hidden_fields .= ''; + + } + else + { + $rank_info['rank_special'] = 0; + } + + $s_hidden_fields .= ''; + + $rank_is_special = ( $rank_info['rank_special'] ) ? "checked=\"checked\"" : ""; + $rank_is_not_special = ( !$rank_info['rank_special'] ) ? "checked=\"checked\"" : ""; + + $template->set_filenames(array( + "body" => "admin/ranks_edit_body.tpl") + ); + + $template->assign_vars(array( + "RANK" => $rank_info['rank_title'], + "SPECIAL_RANK" => $rank_is_special, + "NOT_SPECIAL_RANK" => $rank_is_not_special, + "MINIMUM" => ( $rank_is_special ) ? "" : $rank_info['rank_min'], + "IMAGE" => ( $rank_info['rank_image'] != "" ) ? $rank_info['rank_image'] : "", + "IMAGE_DISPLAY" => ( $rank_info['rank_image'] != "" ) ? '' : "", + + "L_RANKS_TITLE" => $lang['Ranks_title'], + "L_RANKS_TEXT" => $lang['Ranks_explain'], + "L_RANK_TITLE" => $lang['Rank_title'], + "L_RANK_SPECIAL" => $lang['Rank_special'], + "L_RANK_MINIMUM" => $lang['Rank_minimum'], + "L_RANK_IMAGE" => $lang['Rank_image'], + "L_RANK_IMAGE_EXPLAIN" => $lang['Rank_image_explain'], + "L_SUBMIT" => $lang['Submit'], + "L_RESET" => $lang['Reset'], + "L_YES" => $lang['Yes'], + "L_NO" => $lang['No'], + + "S_RANK_ACTION" => append_sid("admin_ranks.$phpEx"), + "S_HIDDEN_FIELDS" => $s_hidden_fields) + ); + + } + else if( $mode == "save" ) + { + // + // Ok, they sent us our info, let's update it. + // + + $rank_id = ( isset($HTTP_POST_VARS['id']) ) ? intval($HTTP_POST_VARS['id']) : 0; + $rank_title = ( isset($HTTP_POST_VARS['title']) ) ? trim($HTTP_POST_VARS['title']) : ""; + $special_rank = ( $HTTP_POST_VARS['special_rank'] == 1 ) ? TRUE : 0; + $min_posts = ( isset($HTTP_POST_VARS['min_posts']) ) ? intval($HTTP_POST_VARS['min_posts']) : -1; + $rank_image = ( (isset($HTTP_POST_VARS['rank_image'])) ) ? trim($HTTP_POST_VARS['rank_image']) : ""; + + if( $rank_title == "" ) + { + message_die(GENERAL_MESSAGE, $lang['Must_select_rank']); + } + + if( $special_rank == 1 ) + { + $max_posts = -1; + $min_posts = -1; + } + + // + // The rank image has to be a jpg, gif or png + // + if($rank_image != "") + { + if ( !preg_match("/(\.gif|\.png|\.jpg)$/is", $rank_image)) + { + $rank_image = ""; + } + } + + if ($rank_id) + { + if (!$special_rank) + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_rank = 0 + WHERE user_rank = $rank_id"; + + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, $lang['No_update_ranks'], "", __LINE__, __FILE__, $sql); + } + } + $sql = "UPDATE " . RANKS_TABLE . " + SET rank_title = '" . str_replace("\'", "''", $rank_title) . "', rank_special = $special_rank, rank_min = $min_posts, rank_image = '" . str_replace("\'", "''", $rank_image) . "' + WHERE rank_id = $rank_id"; + + $message = $lang['Rank_updated']; + } + else + { + $sql = "INSERT INTO " . RANKS_TABLE . " (rank_title, rank_special, rank_min, rank_image) + VALUES ('" . str_replace("\'", "''", $rank_title) . "', $special_rank, $min_posts, '" . str_replace("\'", "''", $rank_image) . "')"; + + $message = $lang['Rank_added']; + } + + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't update/insert into ranks table", "", __LINE__, __FILE__, $sql); + } + + $message .= "

" . sprintf($lang['Click_return_rankadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + + } + else if( $mode == "delete" ) + { + // + // Ok, they want to delete their rank + // + + if( isset($HTTP_POST_VARS['id']) || isset($HTTP_GET_VARS['id']) ) + { + $rank_id = ( isset($HTTP_POST_VARS['id']) ) ? intval($HTTP_POST_VARS['id']) : intval($HTTP_GET_VARS['id']); + } + else + { + $rank_id = 0; + } + + $confirm = isset($HTTP_POST_VARS['confirm']); + + if( $rank_id && $confirm ) + { + $sql = "DELETE FROM " . RANKS_TABLE . " + WHERE rank_id = $rank_id"; + + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't delete rank data", "", __LINE__, __FILE__, $sql); + } + + $sql = "UPDATE " . USERS_TABLE . " + SET user_rank = 0 + WHERE user_rank = $rank_id"; + + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, $lang['No_update_ranks'], "", __LINE__, __FILE__, $sql); + } + + $message = $lang['Rank_removed'] . "

" . sprintf($lang['Click_return_rankadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + + } + elseif( $rank_id && !$confirm) + { + // Present the confirmation screen to the user + $template->set_filenames(array( + 'body' => 'admin/confirm_body.tpl') + ); + + $hidden_fields = ''; + + $template->assign_vars(array( + 'MESSAGE_TITLE' => $lang['Confirm'], + 'MESSAGE_TEXT' => $lang['Confirm_delete_rank'], + + 'L_YES' => $lang['Yes'], + 'L_NO' => $lang['No'], + + 'S_CONFIRM_ACTION' => append_sid("admin_ranks.$phpEx"), + 'S_HIDDEN_FIELDS' => $hidden_fields) + ); + } + else + { + message_die(GENERAL_MESSAGE, $lang['Must_select_rank']); + } + } + + $template->pparse("body"); + + include('./page_footer_admin.'.$phpEx); +} + +// +// Show the default page +// +$template->set_filenames(array( + "body" => "admin/ranks_list_body.tpl") +); + +$sql = "SELECT * FROM " . RANKS_TABLE . " + ORDER BY rank_min ASC, rank_special ASC"; +if( !$result = $db->sql_query($sql) ) +{ + message_die(GENERAL_ERROR, "Couldn't obtain ranks data", "", __LINE__, __FILE__, $sql); +} +$rank_count = $db->sql_numrows($result); + +$rank_rows = $db->sql_fetchrowset($result); + +$template->assign_vars(array( + "L_RANKS_TITLE" => $lang['Ranks_title'], + "L_RANKS_TEXT" => $lang['Ranks_explain'], + "L_RANK" => $lang['Rank_title'], + "L_RANK_MINIMUM" => $lang['Rank_minimum'], + "L_SPECIAL_RANK" => $lang['Rank_special'], + "L_EDIT" => $lang['Edit'], + "L_DELETE" => $lang['Delete'], + "L_ADD_RANK" => $lang['Add_new_rank'], + "L_ACTION" => $lang['Action'], + + "S_RANKS_ACTION" => append_sid("admin_ranks.$phpEx")) +); + +for($i = 0; $i < $rank_count; $i++) +{ + $rank = $rank_rows[$i]['rank_title']; + $special_rank = $rank_rows[$i]['rank_special']; + $rank_id = $rank_rows[$i]['rank_id']; + $rank_min = $rank_rows[$i]['rank_min']; + + if( $special_rank == 1 ) + { + $rank_min = $rank_max = "-"; + } + + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $rank_is_special = ( $special_rank ) ? $lang['Yes'] : $lang['No']; + + $template->assign_block_vars("ranks", array( + "ROW_COLOR" => "#" . $row_color, + "ROW_CLASS" => $row_class, + "RANK" => $rank, + "SPECIAL_RANK" => $rank_is_special, + "RANK_MIN" => $rank_min, + + "U_RANK_EDIT" => append_sid("admin_ranks.$phpEx?mode=edit&id=$rank_id"), + "U_RANK_DELETE" => append_sid("admin_ranks.$phpEx?mode=delete&id=$rank_id")) + ); +} + +$template->pparse("body"); + +include('./page_footer_admin.'.$phpEx); + +?> diff --git a/phpBB/admin/admin_smilies.php b/phpBB/admin/admin_smilies.php new file mode 100644 index 0000000000..aac94bb3d2 --- /dev/null +++ b/phpBB/admin/admin_smilies.php @@ -0,0 +1,594 @@ +sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't delete current smilies", "", __LINE__, __FILE__, $sql); + } + } + else + { + $sql = "SELECT code + FROM ". SMILIES_TABLE; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't get current smilies", "", __LINE__, __FILE__, $sql); + } + + $cur_smilies = $db->sql_fetchrowset($result); + + for( $i = 0; $i < count($cur_smilies); $i++ ) + { + $k = $cur_smilies[$i]['code']; + $smiles[$k] = 1; + } + } + + $fcontents = @file($phpbb_root_path . $board_config['smilies_path'] . '/'. $smile_pak); + + if( empty($fcontents) ) + { + message_die(GENERAL_ERROR, "Couldn't read smiley pak file", "", __LINE__, __FILE__, $sql); + } + + for( $i = 0; $i < count($fcontents); $i++ ) + { + $smile_data = explode($delimeter, trim(addslashes($fcontents[$i]))); + + for( $j = 2; $j < count($smile_data); $j++) + { + // + // Replace > and < with the proper html_entities for matching. + // + $smile_data[$j] = str_replace("<", "<", $smile_data[$j]); + $smile_data[$j] = str_replace(">", ">", $smile_data[$j]); + $k = $smile_data[$j]; + + if( $smiles[$k] == 1 ) + { + if( !empty($replace_existing) ) + { + $sql = "UPDATE " . SMILIES_TABLE . " + SET smile_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emoticon = '" . str_replace("\'", "''", $smile_data[1]) . "' + WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'"; + } + else + { + $sql = ''; + } + } + else + { + $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon) + VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')"; + } + + if( $sql != '' ) + { + $result = $db->sql_query($sql); + if( !$result ) + { + message_die(GENERAL_ERROR, "Couldn't update smilies!", "", __LINE__, __FILE__, $sql); + } + } + } + } + + $message = $lang['smiley_import_success'] . "

" . sprintf($lang['Click_return_smileadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + + } + else + { + // + // Display the script to get the smile_pak cfg file... + // + $smile_paks_select = ""; + + $hidden_vars = ""; + + $template->set_filenames(array( + "body" => "admin/smile_import_body.tpl") + ); + + $template->assign_vars(array( + "L_SMILEY_TITLE" => $lang['smiley_title'], + "L_SMILEY_EXPLAIN" => $lang['smiley_import_inst'], + "L_SMILEY_IMPORT" => $lang['smiley_import'], + "L_SELECT_LBL" => $lang['choose_smile_pak'], + "L_IMPORT" => $lang['import'], + "L_CONFLICTS" => $lang['smile_conflicts'], + "L_DEL_EXISTING" => $lang['del_existing_smileys'], + "L_REPLACE_EXISTING" => $lang['replace_existing'], + "L_KEEP_EXISTING" => $lang['keep_existing'], + + "S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"), + "S_SMILE_SELECT" => $smile_paks_select, + "S_HIDDEN_FIELDS" => $hidden_vars) + ); + + $template->pparse("body"); + } +} +else if( isset($HTTP_POST_VARS['export_pack']) || isset($HTTP_GET_VARS['export_pack']) ) +{ + // + // Export our smiley config as a smiley pak... + // + if ( $HTTP_GET_VARS['export_pack'] == "send" ) + { + $sql = "SELECT * + FROM " . SMILIES_TABLE; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Could not get smiley list", "", __LINE__, __FILE__, $sql); + } + + $resultset = $db->sql_fetchrowset($result); + + $smile_pak = ""; + for($i = 0; $i < count($resultset); $i++ ) + { + $smile_pak .= $resultset[$i]['smile_url'] . $delimeter; + $smile_pak .= $resultset[$i]['emoticon'] . $delimeter; + $smile_pak .= $resultset[$i]['code'] . "\n"; + } + + header("Content-Type: text/x-delimtext; name=\"smiles.pak\""); + header("Content-disposition: attachment; filename=smiles.pak"); + + echo $smile_pak; + + exit; + } + + $message = sprintf($lang['export_smiles'], "", "") . "

" . sprintf($lang['Click_return_smileadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + +} +else if( isset($HTTP_POST_VARS['add']) || isset($HTTP_GET_VARS['add']) ) +{ + // + // Admin has selected to add a smiley. + // + + $template->set_filenames(array( + "body" => "admin/smile_edit_body.tpl") + ); + + $filename_list = ""; + for( $i = 0; $i < count($smiley_images); $i++ ) + { + $filename_list .= ''; + } + + $s_hidden_fields = ''; + + $template->assign_vars(array( + "L_SMILEY_TITLE" => $lang['smiley_title'], + "L_SMILEY_CONFIG" => $lang['smiley_config'], + "L_SMILEY_EXPLAIN" => $lang['smile_desc'], + "L_SMILEY_CODE" => $lang['smiley_code'], + "L_SMILEY_URL" => $lang['smiley_url'], + "L_SMILEY_EMOTION" => $lang['smiley_emot'], + "L_SUBMIT" => $lang['Submit'], + "L_RESET" => $lang['Reset'], + + "SMILEY_IMG" => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smiley_images[0], + + "S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"), + "S_HIDDEN_FIELDS" => $s_hidden_fields, + "S_FILENAME_OPTIONS" => $filename_list, + "S_SMILEY_BASEDIR" => $phpbb_root_path . $board_config['smilies_path']) + ); + + $template->pparse("body"); +} +else if ( $mode != "" ) +{ + switch( $mode ) + { + case 'delete': + // + // Admin has selected to delete a smiley. + // + + $smiley_id = ( !empty($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id']; + $smiley_id = intval($smiley_id); + + $confirm = isset($HTTP_POST_VARS['confirm']); + + if( $confirm ) + { + $sql = "DELETE FROM " . SMILIES_TABLE . " + WHERE smilies_id = " . $smiley_id; + $result = $db->sql_query($sql); + if( !$result ) + { + message_die(GENERAL_ERROR, "Couldn't delete smiley", "", __LINE__, __FILE__, $sql); + } + + $message = $lang['smiley_del_success'] . "

" . sprintf($lang['Click_return_smileadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + } + else + { + // Present the confirmation screen to the user + $template->set_filenames(array( + 'body' => 'admin/confirm_body.tpl') + ); + + $hidden_fields = ''; + + $template->assign_vars(array( + 'MESSAGE_TITLE' => $lang['Confirm'], + 'MESSAGE_TEXT' => $lang['Confirm_delete_smiley'], + + 'L_YES' => $lang['Yes'], + 'L_NO' => $lang['No'], + + 'S_CONFIRM_ACTION' => append_sid("admin_smilies.$phpEx"), + 'S_HIDDEN_FIELDS' => $hidden_fields) + ); + $template->pparse('body'); + } + break; + + case 'edit': + // + // Admin has selected to edit a smiley. + // + + $smiley_id = ( !empty($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id']; + $smiley_id = intval($smiley_id); + + $sql = "SELECT * + FROM " . SMILIES_TABLE . " + WHERE smilies_id = " . $smiley_id; + $result = $db->sql_query($sql); + if( !$result ) + { + message_die(GENERAL_ERROR, 'Could not obtain emoticon information', "", __LINE__, __FILE__, $sql); + } + $smile_data = $db->sql_fetchrow($result); + + $filename_list = ""; + for( $i = 0; $i < count($smiley_images); $i++ ) + { + if( $smiley_images[$i] == $smile_data['smile_url'] ) + { + $smiley_selected = "selected=\"selected\""; + $smiley_edit_img = $smiley_images[$i]; + } + else + { + $smiley_selected = ""; + } + + $filename_list .= ''; + } + + $template->set_filenames(array( + "body" => "admin/smile_edit_body.tpl") + ); + + $s_hidden_fields = ''; + + $template->assign_vars(array( + "SMILEY_CODE" => $smile_data['code'], + "SMILEY_EMOTICON" => $smile_data['emoticon'], + + "L_SMILEY_TITLE" => $lang['smiley_title'], + "L_SMILEY_CONFIG" => $lang['smiley_config'], + "L_SMILEY_EXPLAIN" => $lang['smile_desc'], + "L_SMILEY_CODE" => $lang['smiley_code'], + "L_SMILEY_URL" => $lang['smiley_url'], + "L_SMILEY_EMOTION" => $lang['smiley_emot'], + "L_SUBMIT" => $lang['Submit'], + "L_RESET" => $lang['Reset'], + + "SMILEY_IMG" => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smiley_edit_img, + + "S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx"), + "S_HIDDEN_FIELDS" => $s_hidden_fields, + "S_FILENAME_OPTIONS" => $filename_list, + "S_SMILEY_BASEDIR" => $phpbb_root_path . $board_config['smilies_path']) + ); + + $template->pparse("body"); + break; + + case "save": + // + // Admin has submitted changes while editing a smiley. + // + + // + // Get the submitted data, being careful to ensure that we only + // accept the data we are looking for. + // + $smile_code = ( isset($HTTP_POST_VARS['smile_code']) ) ? trim($HTTP_POST_VARS['smile_code']) : ''; + $smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? trim($HTTP_POST_VARS['smile_url']) : ''; + $smile_url = phpbb_ltrim(basename($smile_url), "'"); + $smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? htmlspecialchars(trim($HTTP_POST_VARS['smile_emotion'])) : ''; + $smile_id = ( isset($HTTP_POST_VARS['smile_id']) ) ? intval($HTTP_POST_VARS['smile_id']) : 0; + $smile_code = trim($smile_code); + $smile_url = trim($smile_url); + + // If no code was entered complain ... + if ($smile_code == '' || $smile_url == '') + { + message_die(GENERAL_MESSAGE, $lang['Fields_empty']); + } + + // + // Convert < and > to proper htmlentities for parsing. + // + $smile_code = str_replace('<', '<', $smile_code); + $smile_code = str_replace('>', '>', $smile_code); + + // + // Proceed with updating the smiley table. + // + $sql = "UPDATE " . SMILIES_TABLE . " + SET code = '" . str_replace("\'", "''", $smile_code) . "', smile_url = '" . str_replace("\'", "''", $smile_url) . "', emoticon = '" . str_replace("\'", "''", $smile_emotion) . "' + WHERE smilies_id = $smile_id"; + if( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't update smilies info", "", __LINE__, __FILE__, $sql); + } + + $message = $lang['smiley_edit_success'] . "

" . sprintf($lang['Click_return_smileadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + break; + + case "savenew": + // + // Admin has submitted changes while adding a new smiley. + // + + // + // Get the submitted data being careful to ensure the the data + // we recieve and process is only the data we are looking for. + // + $smile_code = ( isset($HTTP_POST_VARS['smile_code']) ) ? $HTTP_POST_VARS['smile_code'] : ''; + $smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? $HTTP_POST_VARS['smile_url'] : ''; + $smile_url = phpbb_ltrim(basename($smile_url), "'"); + $smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? htmlspecialchars(trim($HTTP_POST_VARS['smile_emotion'])) : ''; + $smile_code = trim($smile_code); + $smile_url = trim($smile_url); + + // If no code was entered complain ... + if ($smile_code == '' || $smile_url == '') + { + message_die(GENERAL_MESSAGE, $lang['Fields_empty']); + } + + // + // Convert < and > to proper htmlentities for parsing. + // + $smile_code = str_replace('<', '<', $smile_code); + $smile_code = str_replace('>', '>', $smile_code); + + // + // Save the data to the smiley table. + // + $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon) + VALUES ('" . str_replace("\'", "''", $smile_code) . "', '" . str_replace("\'", "''", $smile_url) . "', '" . str_replace("\'", "''", $smile_emotion) . "')"; + $result = $db->sql_query($sql); + if( !$result ) + { + message_die(GENERAL_ERROR, "Couldn't insert new smiley", "", __LINE__, __FILE__, $sql); + } + + $message = $lang['smiley_add_success'] . "

" . sprintf($lang['Click_return_smileadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + break; + } +} +else +{ + + // + // This is the main display of the page before the admin has selected + // any options. + // + $sql = "SELECT * + FROM " . SMILIES_TABLE; + $result = $db->sql_query($sql); + if( !$result ) + { + message_die(GENERAL_ERROR, "Couldn't obtain smileys from database", "", __LINE__, __FILE__, $sql); + } + + $smilies = $db->sql_fetchrowset($result); + + $template->set_filenames(array( + "body" => "admin/smile_list_body.tpl") + ); + + $template->assign_vars(array( + "L_ACTION" => $lang['Action'], + "L_SMILEY_TITLE" => $lang['smiley_title'], + "L_SMILEY_TEXT" => $lang['smile_desc'], + "L_DELETE" => $lang['Delete'], + "L_EDIT" => $lang['Edit'], + "L_SMILEY_ADD" => $lang['smile_add'], + "L_CODE" => $lang['Code'], + "L_EMOT" => $lang['Emotion'], + "L_SMILE" => $lang['Smile'], + "L_IMPORT_PACK" => $lang['import_smile_pack'], + "L_EXPORT_PACK" => $lang['export_smile_pack'], + + "S_HIDDEN_FIELDS" => $s_hidden_fields, + "S_SMILEY_ACTION" => append_sid("admin_smilies.$phpEx")) + ); + + // + // Loop throuh the rows of smilies setting block vars for the template. + // + for($i = 0; $i < count($smilies); $i++) + { + // + // Replace htmlentites for < and > with actual character. + // + $smilies[$i]['code'] = str_replace('<', '<', $smilies[$i]['code']); + $smilies[$i]['code'] = str_replace('>', '>', $smilies[$i]['code']); + + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $template->assign_block_vars("smiles", array( + "ROW_COLOR" => "#" . $row_color, + "ROW_CLASS" => $row_class, + + "SMILEY_IMG" => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'], + "CODE" => $smilies[$i]['code'], + "EMOT" => $smilies[$i]['emoticon'], + + "U_SMILEY_EDIT" => append_sid("admin_smilies.$phpEx?mode=edit&id=" . $smilies[$i]['smilies_id']), + "U_SMILEY_DELETE" => append_sid("admin_smilies.$phpEx?mode=delete&id=" . $smilies[$i]['smilies_id'])) + ); + } + + // + // Spit out the page. + // + $template->pparse("body"); +} + +// +// Page Footer +// +include('./page_footer_admin.'.$phpEx); + +?> \ No newline at end of file diff --git a/phpBB/admin/admin_styles.php b/phpBB/admin/admin_styles.php new file mode 100644 index 0000000000..8b3f2ec311 --- /dev/null +++ b/phpBB/admin/admin_styles.php @@ -0,0 +1,941 @@ +sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Could not insert theme data!", "", __LINE__, __FILE__, $sql); + } + + $message = $lang['Theme_installed'] . "

" . sprintf($lang['Click_return_styleadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + } + else + { + + $installable_themes = array(); + + if( $dir = @opendir($phpbb_root_path. "templates/") ) + { + while( $sub_dir = @readdir($dir) ) + { + if( !is_file(phpbb_realpath($phpbb_root_path . 'templates/' .$sub_dir)) && !is_link(phpbb_realpath($phpbb_root_path . 'templates/' .$sub_dir)) && $sub_dir != "." && $sub_dir != ".." && $sub_dir != "CVS" ) + { + if( @file_exists(@phpbb_realpath($phpbb_root_path. "templates/" . $sub_dir . "/theme_info.cfg")) ) + { + include($phpbb_root_path. "templates/" . $sub_dir . "/theme_info.cfg"); + + for($i = 0; $i < count($$sub_dir); $i++) + { + $working_data = $$sub_dir; + + $style_name = $working_data[$i]['style_name']; + + $sql = "SELECT themes_id + FROM " . THEMES_TABLE . " + WHERE style_name = '" . str_replace("\'", "''", $style_name) . "'"; + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Could not query themes table!", "", __LINE__, __FILE__, $sql); + } + + if(!$db->sql_numrows($result)) + { + $installable_themes[] = $working_data[$i]; + } + } + } + } + } + + $template->set_filenames(array( + "body" => "admin/styles_addnew_body.tpl") + ); + + $template->assign_vars(array( + "L_STYLES_TITLE" => $lang['Styles_admin'], + "L_STYLES_ADD_TEXT" => $lang['Styles_addnew_explain'], + "L_STYLE" => $lang['Style'], + "L_TEMPLATE" => $lang['Template'], + "L_INSTALL" => $lang['Install'], + "L_ACTION" => $lang['Action']) + ); + + for($i = 0; $i < count($installable_themes); $i++) + { + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $template->assign_block_vars("styles", array( + "ROW_CLASS" => $row_class, + "ROW_COLOR" => "#" . $row_color, + "STYLE_NAME" => $installable_themes[$i]['style_name'], + "TEMPLATE_NAME" => $installable_themes[$i]['template_name'], + + "U_STYLES_INSTALL" => append_sid("admin_styles.$phpEx?mode=addnew&style=" . urlencode($installable_themes[$i]['style_name']) . "&install_to=" . urlencode($installable_themes[$i]['template_name']))) + ); + + } + $template->pparse("body"); + + } + closedir($dir); + } + break; + + case "create": + case "edit": + $submit = ( isset($HTTP_POST_VARS['submit']) ) ? TRUE : 0; + + if( $submit ) + { + // + // DAMN! Thats alot of data to validate... + // + $updated['style_name'] = $HTTP_POST_VARS['style_name']; + $updated['template_name'] = $HTTP_POST_VARS['template_name']; + $updated['head_stylesheet'] = $HTTP_POST_VARS['head_stylesheet']; + $updated['body_background'] = $HTTP_POST_VARS['body_background']; + $updated['body_bgcolor'] = $HTTP_POST_VARS['body_bgcolor']; + $updated['body_text'] = $HTTP_POST_VARS['body_text']; + $updated['body_link'] = $HTTP_POST_VARS['body_link']; + $updated['body_vlink'] = $HTTP_POST_VARS['body_vlink']; + $updated['body_alink'] = $HTTP_POST_VARS['body_alink']; + $updated['body_hlink'] = $HTTP_POST_VARS['body_hlink']; + $updated['tr_color1'] = $HTTP_POST_VARS['tr_color1']; + $updated_name['tr_color1_name'] = $HTTP_POST_VARS['tr_color1_name']; + $updated['tr_color2'] = $HTTP_POST_VARS['tr_color2']; + $updated_name['tr_color2_name'] = $HTTP_POST_VARS['tr_color2_name']; + $updated['tr_color3'] = $HTTP_POST_VARS['tr_color3']; + $updated_name['tr_color3_name'] = $HTTP_POST_VARS['tr_color3_name']; + $updated['tr_class1'] = $HTTP_POST_VARS['tr_class1']; + $updated_name['tr_class1_name'] = $HTTP_POST_VARS['tr_class1_name']; + $updated['tr_class2'] = $HTTP_POST_VARS['tr_class2']; + $updated_name['tr_class2_name'] = $HTTP_POST_VARS['tr_class2_name']; + $updated['tr_class3'] = $HTTP_POST_VARS['tr_class3']; + $updated_name['tr_class3_name'] = $HTTP_POST_VARS['tr_class3_name']; + $updated['th_color1'] = $HTTP_POST_VARS['th_color1']; + $updated_name['th_color1_name'] = $HTTP_POST_VARS['th_color1_name']; + $updated['th_color2'] = $HTTP_POST_VARS['th_color2']; + $updated_name['th_color2_name'] = $HTTP_POST_VARS['th_color2_name']; + $updated['th_color3'] = $HTTP_POST_VARS['th_color3']; + $updated_name['th_color3_name'] = $HTTP_POST_VARS['th_color3_name']; + $updated['th_class1'] = $HTTP_POST_VARS['th_class1']; + $updated_name['th_class1_name'] = $HTTP_POST_VARS['th_class1_name']; + $updated['th_class2'] = $HTTP_POST_VARS['th_class2']; + $updated_name['th_class2_name'] = $HTTP_POST_VARS['th_class2_name']; + $updated['th_class3'] = $HTTP_POST_VARS['th_class3']; + $updated_name['th_class3_name'] = $HTTP_POST_VARS['th_class3_name']; + $updated['td_color1'] = $HTTP_POST_VARS['td_color1']; + $updated_name['td_color1_name'] = $HTTP_POST_VARS['td_color1_name']; + $updated['td_color2'] = $HTTP_POST_VARS['td_color2']; + $updated_name['td_color2_name'] = $HTTP_POST_VARS['td_color2_name']; + $updated['td_color3'] = $HTTP_POST_VARS['td_color3']; + $updated_name['td_color3_name'] = $HTTP_POST_VARS['td_color3_name']; + $updated['td_class1'] = $HTTP_POST_VARS['td_class1']; + $updated_name['td_class1_name'] = $HTTP_POST_VARS['td_class1_name']; + $updated['td_class2'] = $HTTP_POST_VARS['td_class2']; + $updated_name['td_class2_name'] = $HTTP_POST_VARS['td_class2_name']; + $updated['td_class3'] = $HTTP_POST_VARS['td_class3']; + $updated_name['td_class3_name'] = $HTTP_POST_VARS['td_class3_name']; + $updated['fontface1'] = $HTTP_POST_VARS['fontface1']; + $updated_name['fontface1_name'] = $HTTP_POST_VARS['fontface1_name']; + $updated['fontface2'] = $HTTP_POST_VARS['fontface2']; + $updated_name['fontface2_name'] = $HTTP_POST_VARS['fontface2_name']; + $updated['fontface3'] = $HTTP_POST_VARS['fontface3']; + $updated_name['fontface3_name'] = $HTTP_POST_VARS['fontface3_name']; + $updated['fontsize1'] = intval($HTTP_POST_VARS['fontsize1']); + $updated_name['fontsize1_name'] = $HTTP_POST_VARS['fontsize1_name']; + $updated['fontsize2'] = intval($HTTP_POST_VARS['fontsize2']); + $updated_name['fontsize2_name'] = $HTTP_POST_VARS['fontsize2_name']; + $updated['fontsize3'] = intval($HTTP_POST_VARS['fontsize3']); + $updated_name['fontsize3_name'] = $HTTP_POST_VARS['fontsize3_name']; + $updated['fontcolor1'] = $HTTP_POST_VARS['fontcolor1']; + $updated_name['fontcolor1_name'] = $HTTP_POST_VARS['fontcolor1_name']; + $updated['fontcolor2'] = $HTTP_POST_VARS['fontcolor2']; + $updated_name['fontcolor2_name'] = $HTTP_POST_VARS['fontcolor2_name']; + $updated['fontcolor3'] = $HTTP_POST_VARS['fontcolor3']; + $updated_name['fontcolor3_name'] = $HTTP_POST_VARS['fontcolor3_name']; + $updated['span_class1'] = $HTTP_POST_VARS['span_class1']; + $updated_name['span_class1_name'] = $HTTP_POST_VARS['span_class1_name']; + $updated['span_class2'] = $HTTP_POST_VARS['span_class2']; + $updated_name['span_class2_name'] = $HTTP_POST_VARS['span_class2_name']; + $updated['span_class3'] = $HTTP_POST_VARS['span_class3']; + $updated_name['span_class3_name'] = $HTTP_POST_VARS['span_class3_name']; + $style_id = intval($HTTP_POST_VARS['style_id']); + // + // Wheeeew! Thank heavens for copy and paste and search and replace :D + // + + if($mode == "edit") + { + $sql = "UPDATE " . THEMES_TABLE . " SET "; + $count = 0; + + while(list($key, $val) = each($updated)) + { + if($count != 0) + { + $sql .= ", "; + } + + // + // I don't like this but it'll keep MSSQL from throwing + // an error and save me alot of typing + // + $sql .= ( stristr($key, "fontsize") ) ? "$key = $val" : "$key = '" . str_replace("\'", "''", $val) . "'"; + + $count++; + } + + $sql .= " WHERE themes_id = $style_id"; + + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Could not update themes table!", "", __LINE__, __FILE__, $sql); + } + + // + // Check if there's a names table entry for this style + // + $sql = "SELECT themes_id + FROM " . THEMES_NAME_TABLE . " + WHERE themes_id = $style_id"; + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Could not get data from themes_name table", "", __LINE__, __FILE__, $sql); + } + + if($db->sql_numrows($result) > 0) + { + $sql = "UPDATE " . THEMES_NAME_TABLE . " + SET "; + $count = 0; + while(list($key, $val) = each($updated_name)) + { + if($count != 0) + { + $sql .= ", "; + } + + $sql .= "$key = '$val'"; + + $count++; + } + + $sql .= " WHERE themes_id = $style_id"; + } + else + { + // + // Nope, no names entry so we create a new one. + // + $sql = "INSERT INTO " . THEMES_NAME_TABLE . " (themes_id, "; + while(list($key, $val) = each($updated_name)) + { + $fields[] = $key; + $vals[] = str_replace("\'", "''", $val); + } + + for($i = 0; $i < count($fields); $i++) + { + if($i > 0) + { + $sql .= ", "; + } + $sql .= $fields[$i]; + } + + $sql .= ") VALUES ($style_id, "; + for($i = 0; $i < count($vals); $i++) + { + if($i > 0) + { + $sql .= ", "; + } + $sql .= "'" . $vals[$i] . "'"; + } + + $sql .= ")"; + } + + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Could not update themes name table!", "", __LINE__, __FILE__, $sql); + } + + $message = $lang['Theme_updated'] . "

" . sprintf($lang['Click_return_styleadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + } + else + { + // + // First, check if we already have a style by this name + // + $sql = "SELECT themes_id + FROM " . THEMES_TABLE . " + WHERE style_name = '" . str_replace("\'", "''", $updated['style_name']) . "'"; + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Could not query themes table", "", __LINE__, __FILE__, $sql); + } + + if($db->sql_numrows($result)) + { + message_die(GENERAL_ERROR, $lang['Style_exists'], $lang['Error']); + } + + while(list($key, $val) = each($updated)) + { + $field_names[] = $key; + + if(stristr($key, "fontsize")) + { + $values[] = "$val"; + } + else + { + $values[] = "'" . str_replace("\'", "''", $val) . "'"; + } + } + + $sql = "INSERT + INTO " . THEMES_TABLE . " ("; + for($i = 0; $i < count($field_names); $i++) + { + if($i != 0) + { + $sql .= ", "; + } + $sql .= $field_names[$i]; + } + + $sql .= ") VALUES ("; + for($i = 0; $i < count($values); $i++) + { + if($i != 0) + { + $sql .= ", "; + } + $sql .= $values[$i]; + } + $sql .= ")"; + + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Could not update themes table!", "", __LINE__, __FILE__, $sql); + } + + $style_id = $db->sql_nextid(); + + // + // Insert names data + // + $sql = "INSERT INTO " . THEMES_NAME_TABLE . " (themes_id, "; + while(list($key, $val) = each($updated_name)) + { + $fields[] = $key; + $vals[] = $val; + } + + for($i = 0; $i < count($fields); $i++) + { + if($i > 0) + { + $sql .= ", "; + } + $sql .= $fields[$i]; + } + + $sql .= ") VALUES ($style_id, "; + for($i = 0; $i < count($vals); $i++) + { + if($i > 0) + { + $sql .= ", "; + } + $sql .= "'" . $vals[$i] . "'"; + } + + $sql .= ")"; + + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Could not insert themes name table!", "", __LINE__, __FILE__, $sql); + } + + $message = $lang['Theme_created'] . "

" . sprintf($lang['Click_return_styleadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + } + } + else + { + if($mode == "edit") + { + $themes_title = $lang['Edit_theme']; + $themes_explain = $lang['Edit_theme_explain']; + + $style_id = intval($HTTP_GET_VARS['style_id']); + + $selected_names = array(); + $selected_values = array(); + // + // Fetch the Theme Info from the db + // + $sql = "SELECT * + FROM " . THEMES_TABLE . " + WHERE themes_id = $style_id"; + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Could not get data from themes table", "", __LINE__, __FILE__, $sql); + } + + if ( $selected_values = $db->sql_fetchrow($result) ) + { + while(list($key, $val) = @each($selected_values)) + { + $selected[$key] = $val; + } + } + + // + // Fetch the Themes Name data + // + $sql = "SELECT * + FROM " . THEMES_NAME_TABLE . " + WHERE themes_id = $style_id"; + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Could not get data from themes name table", "", __LINE__, __FILE__, $sql); + } + + if ( $selected_names = $db->sql_fetchrow($result) ) + { + while(list($key, $val) = @each($selected_names)) + { + $selected[$key] = $val; + } + } + + $s_hidden_fields = ''; + } + else + { + $themes_title = $lang['Create_theme']; + $themes_explain = $lang['Create_theme_explain']; + } + + $template->set_filenames(array( + "body" => "admin/styles_edit_body.tpl") + ); + + if( $dir = @opendir($phpbb_root_path . 'templates/') ) + { + $s_template_select = ''; + } + else + { + message_die(GENERAL_MESSAGE, $lang['No_template_dir']); + } + + $s_hidden_fields .= ''; + + $template->assign_vars(array( + "L_THEMES_TITLE" => $themes_title, + "L_THEMES_EXPLAIN" => $themes_explain, + "L_THEME_NAME" => $lang['Theme_name'], + "L_TEMPLATE" => $lang['Template'], + "L_THEME_SETTINGS" => $lang['Theme_settings'], + "L_THEME_ELEMENT" => $lang['Theme_element'], + "L_SIMPLE_NAME" => $lang['Simple_name'], + "L_VALUE" => $lang['Value'], + "L_STYLESHEET" => $lang['Stylesheet'], + "L_STYLESHEET_EXPLAIN" => $lang['Stylesheet_explain'], + "L_BACKGROUND_IMAGE" => $lang['Background_image'], + "L_BACKGROUND_COLOR" => $lang['Background_color'], + "L_BODY_TEXT_COLOR" => $lang['Text_color'], + "L_BODY_LINK_COLOR" => $lang['Link_color'], + "L_BODY_VLINK_COLOR" => $lang['VLink_color'], + "L_BODY_ALINK_COLOR" => $lang['ALink_color'], + "L_BODY_HLINK_COLOR" => $lang['HLink_color'], + "L_TR_COLOR1" => $lang['Tr_color1'], + "L_TR_COLOR2" => $lang['Tr_color2'], + "L_TR_COLOR3" => $lang['Tr_color3'], + "L_TR_CLASS1" => $lang['Tr_class1'], + "L_TR_CLASS2" => $lang['Tr_class2'], + "L_TR_CLASS3" => $lang['Tr_class3'], + "L_TH_COLOR1" => $lang['Th_color1'], + "L_TH_COLOR2" => $lang['Th_color2'], + "L_TH_COLOR3" => $lang['Th_color3'], + "L_TH_CLASS1" => $lang['Th_class1'], + "L_TH_CLASS2" => $lang['Th_class2'], + "L_TH_CLASS3" => $lang['Th_class3'], + "L_TD_COLOR1" => $lang['Td_color1'], + "L_TD_COLOR2" => $lang['Td_color2'], + "L_TD_COLOR3" => $lang['Td_color3'], + "L_TD_CLASS1" => $lang['Td_class1'], + "L_TD_CLASS2" => $lang['Td_class2'], + "L_TD_CLASS3" => $lang['Td_class3'], + "L_FONTFACE_1" => $lang['fontface1'], + "L_FONTFACE_2" => $lang['fontface2'], + "L_FONTFACE_3" => $lang['fontface3'], + "L_FONTSIZE_1" => $lang['fontsize1'], + "L_FONTSIZE_2" => $lang['fontsize2'], + "L_FONTSIZE_3" => $lang['fontsize3'], + "L_FONTCOLOR_1" => $lang['fontcolor1'], + "L_FONTCOLOR_2" => $lang['fontcolor2'], + "L_FONTCOLOR_3" => $lang['fontcolor3'], + "L_SPAN_CLASS_1" => $lang['span_class1'], + "L_SPAN_CLASS_2" => $lang['span_class2'], + "L_SPAN_CLASS_3" => $lang['span_class3'], + "L_SAVE_SETTINGS" => $lang['Save_Settings'], + "THEME_NAME" => $selected['style_name'], + "HEAD_STYLESHEET" => $selected['head_stylesheet'], + "BODY_BACKGROUND" => $selected['body_background'], + "BODY_BGCOLOR" => $selected['body_bgcolor'], + "BODY_TEXT_COLOR" => $selected['body_text'], + "BODY_LINK_COLOR" => $selected['body_link'], + "BODY_VLINK_COLOR" => $selected['body_vlink'], + "BODY_ALINK_COLOR" => $selected['body_alink'], + "BODY_HLINK_COLOR" => $selected['body_hlink'], + "TR_COLOR1" => $selected['tr_color1'], + "TR_COLOR2" => $selected['tr_color2'], + "TR_COLOR3" => $selected['tr_color3'], + "TR_CLASS1" => $selected['tr_class1'], + "TR_CLASS2" => $selected['tr_class2'], + "TR_CLASS3" => $selected['tr_class3'], + "TH_COLOR1" => $selected['th_color1'], + "TH_COLOR2" => $selected['th_color2'], + "TH_COLOR3" => $selected['th_color3'], + "TH_CLASS1" => $selected['th_class1'], + "TH_CLASS2" => $selected['th_class2'], + "TH_CLASS3" => $selected['th_class3'], + "TD_COLOR1" => $selected['td_color1'], + "TD_COLOR2" => $selected['td_color2'], + "TD_COLOR3" => $selected['td_color3'], + "TD_CLASS1" => $selected['td_class1'], + "TD_CLASS2" => $selected['td_class2'], + "TD_CLASS3" => $selected['td_class3'], + "FONTFACE1" => $selected['fontface1'], + "FONTFACE2" => $selected['fontface2'], + "FONTFACE3" => $selected['fontface3'], + "FONTSIZE1" => $selected['fontsize1'], + "FONTSIZE2" => $selected['fontsize2'], + "FONTSIZE3" => $selected['fontsize3'], + "FONTCOLOR1" => $selected['fontcolor1'], + "FONTCOLOR2" => $selected['fontcolor2'], + "FONTCOLOR3" => $selected['fontcolor3'], + "SPAN_CLASS1" => $selected['span_class1'], + "SPAN_CLASS2" => $selected['span_class2'], + "SPAN_CLASS3" => $selected['span_class3'], + + "TR_COLOR1_NAME" => $selected['tr_color1_name'], + "TR_COLOR2_NAME" => $selected['tr_color2_name'], + "TR_COLOR3_NAME" => $selected['tr_color3_name'], + "TR_CLASS1_NAME" => $selected['tr_class1_name'], + "TR_CLASS2_NAME" => $selected['tr_class2_name'], + "TR_CLASS3_NAME" => $selected['tr_class3_name'], + "TH_COLOR1_NAME" => $selected['th_color1_name'], + "TH_COLOR2_NAME" => $selected['th_color2_name'], + "TH_COLOR3_NAME" => $selected['th_color3_name'], + "TH_CLASS1_NAME" => $selected['th_class1_name'], + "TH_CLASS2_NAME" => $selected['th_class2_name'], + "TH_CLASS3_NAME" => $selected['th_class3_name'], + "TD_COLOR1_NAME" => $selected['td_color1_name'], + "TD_COLOR2_NAME" => $selected['td_color2_name'], + "TD_COLOR3_NAME" => $selected['td_color3_name'], + "TD_CLASS1_NAME" => $selected['td_class1_name'], + "TD_CLASS2_NAME" => $selected['td_class2_name'], + "TD_CLASS3_NAME" => $selected['td_class3_name'], + "FONTFACE1_NAME" => $selected['fontface1_name'], + "FONTFACE2_NAME" => $selected['fontface2_name'], + "FONTFACE3_NAME" => $selected['fontface3_name'], + "FONTSIZE1_NAME" => $selected['fontsize1_name'], + "FONTSIZE2_NAME" => $selected['fontsize2_name'], + "FONTSIZE3_NAME" => $selected['fontsize3_name'], + "FONTCOLOR1_NAME" => $selected['fontcolor1_name'], + "FONTCOLOR2_NAME" => $selected['fontcolor2_name'], + "FONTCOLOR3_NAME" => $selected['fontcolor3_name'], + "SPAN_CLASS1_NAME" => $selected['span_class1_name'], + "SPAN_CLASS2_NAME" => $selected['span_class2_name'], + "SPAN_CLASS3_NAME" => $selected['span_class3_name'], + + "S_THEME_ACTION" => append_sid("admin_styles.$phpEx"), + "S_TEMPLATE_SELECT" => $s_template_select, + "S_HIDDEN_FIELDS" => $s_hidden_fields) + ); + + $template->pparse("body"); + } + break; + + case "export"; + if($HTTP_POST_VARS['export_template']) + { + $template_name = $HTTP_POST_VARS['export_template']; + + $sql = "SELECT * + FROM " . THEMES_TABLE . " + WHERE template_name = '" . str_replace("\'", "''", $template_name) . "'"; + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Could not get theme data for selected template", "", __LINE__, __FILE__, $sql); + } + + $theme_rowset = $db->sql_fetchrowset($result); + + if( count($theme_rowset) == 0 ) + { + message_die(GENERAL_MESSAGE, $lang['No_themes']); + } + + $theme_data = ''; // Done this to prevent highlighting editors getting confused! + + @umask(0111); + + $fp = @fopen($phpbb_root_path . 'templates/' . basename($template_name) . '/theme_info.cfg', 'w'); + + if( !$fp ) + { + // + // Unable to open the file writeable do something here as an attempt + // to get around that... + // + $s_hidden_fields = ''; + $s_hidden_fields .= ''; + + $download_form = '
' . $s_hidden_fields; + + $template->set_filenames(array( + "body" => "message_body.tpl") + ); + + $template->assign_vars(array( + "MESSAGE_TITLE" => $lang['Export_themes'], + "MESSAGE_TEXT" => $lang['Download_theme_cfg'] . "

" . $download_form) + ); + + $template->pparse('body'); + exit(); + } + + $result = @fputs($fp, $theme_data, strlen($theme_data)); + fclose($fp); + + $message = $lang['Theme_info_saved'] . "

" . sprintf($lang['Click_return_styleadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + + } + else if($HTTP_POST_VARS['send_file']) + { + + header("Content-Type: text/x-delimtext; name=\"theme_info.cfg\""); + header("Content-disposition: attachment; filename=theme_info.cfg"); + + echo stripslashes($HTTP_POST_VARS['theme_info']); + } + else + { + $template->set_filenames(array( + "body" => "admin/styles_exporter.tpl") + ); + + if( $dir = @opendir($phpbb_root_path . 'templates/') ) + { + $s_template_select = ''; + } + else + { + message_die(GENERAL_MESSAGE, $lang['No_template_dir']); + } + + $template->assign_vars(array( + "L_STYLE_EXPORTER" => $lang['Export_themes'], + "L_EXPORTER_EXPLAIN" => $lang['Export_explain'], + "L_TEMPLATE_SELECT" => $lang['Select_template'], + "L_SUBMIT" => $lang['Submit'], + + "S_EXPORTER_ACTION" => append_sid("admin_styles.$phpEx?mode=export"), + "S_TEMPLATE_SELECT" => $s_template_select) + ); + + $template->pparse("body"); + + } + break; + + case "delete": + $style_id = ( isset($HTTP_GET_VARS['style_id']) ) ? intval($HTTP_GET_VARS['style_id']) : intval($HTTP_POST_VARS['style_id']); + + if( !$confirm ) + { + if($style_id == $board_config['default_style']) + { + message_die(GENERAL_MESSAGE, $lang['Cannot_remove_style']); + } + + $hidden_fields = ''; + + // + // Set template files + // + $template->set_filenames(array( + "confirm" => "admin/confirm_body.tpl") + ); + + $template->assign_vars(array( + "MESSAGE_TITLE" => $lang['Confirm'], + "MESSAGE_TEXT" => $lang['Confirm_delete_style'], + + "L_YES" => $lang['Yes'], + "L_NO" => $lang['No'], + + "S_CONFIRM_ACTION" => append_sid("admin_styles.$phpEx"), + "S_HIDDEN_FIELDS" => $hidden_fields) + ); + + $template->pparse("confirm"); + + } + else + { + // + // The user has confirmed the delete. Remove the style, the style element + // names and update any users who might be using this style + // + $sql = "DELETE FROM " . THEMES_TABLE . " + WHERE themes_id = $style_id"; + if(!$result = $db->sql_query($sql, BEGIN_TRANSACTION)) + { + message_die(GENERAL_ERROR, "Could not remove style data!", "", __LINE__, __FILE__, $sql); + } + + // + // There may not be any theme name data so don't throw an error + // if the SQL dosan't work + // + $sql = "DELETE FROM " . THEMES_NAME_TABLE . " + WHERE themes_id = $style_id"; + $db->sql_query($sql); + + $sql = "UPDATE " . USERS_TABLE . " + SET user_style = " . $board_config['default_style'] . " + WHERE user_style = $style_id"; + if(!$result = $db->sql_query($sql, END_TRANSACTION)) + { + message_die(GENERAL_ERROR, "Could not update user style information", "", __LINE__, __FILE__, $sql); + } + + $message = $lang['Style_removed'] . "

" . sprintf($lang['Click_return_styleadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + } + break; + + default: + + $sql = "SELECT themes_id, template_name, style_name + FROM " . THEMES_TABLE . " + ORDER BY template_name"; + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Could not get style information!", "", __LINE__, __FILE__, $sql); + } + + $style_rowset = $db->sql_fetchrowset($result); + + $template->set_filenames(array( + "body" => "admin/styles_list_body.tpl") + ); + + $template->assign_vars(array( + "L_STYLES_TITLE" => $lang['Styles_admin'], + "L_STYLES_TEXT" => $lang['Styles_explain'], + "L_STYLE" => $lang['Style'], + "L_TEMPLATE" => $lang['Template'], + "L_EDIT" => $lang['Edit'], + "L_DELETE" => $lang['Delete']) + ); + + for($i = 0; $i < count($style_rowset); $i++) + { + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $template->assign_block_vars("styles", array( + "ROW_CLASS" => $row_class, + "ROW_COLOR" => $row_color, + "STYLE_NAME" => $style_rowset[$i]['style_name'], + "TEMPLATE_NAME" => $style_rowset[$i]['template_name'], + + "U_STYLES_EDIT" => append_sid("admin_styles.$phpEx?mode=edit&style_id=" . $style_rowset[$i]['themes_id']), + "U_STYLES_DELETE" => append_sid("admin_styles.$phpEx?mode=delete&style_id=" . $style_rowset[$i]['themes_id'])) + ); + } + + $template->pparse("body"); + break; +} + +if (empty($HTTP_POST_VARS['send_file'])) +{ + include('./page_footer_admin.'.$phpEx); +} + +?> \ No newline at end of file diff --git a/phpBB/admin/admin_ug_auth.php b/phpBB/admin/admin_ug_auth.php new file mode 100644 index 0000000000..5efb0c1e17 --- /dev/null +++ b/phpBB/admin/admin_ug_auth.php @@ -0,0 +1,1034 @@ + 'mode', 'user_id' => POST_USERS_URL, 'group_id' => POST_GROUPS_URL, 'adv' => 'adv'); + +while( list($var, $param) = @each($params) ) +{ + if ( !empty($HTTP_POST_VARS[$param]) || !empty($HTTP_GET_VARS[$param]) ) + { + $$var = ( !empty($HTTP_POST_VARS[$param]) ) ? $HTTP_POST_VARS[$param] : $HTTP_GET_VARS[$param]; + } + else + { + $$var = ""; + } +} + +$user_id = intval($user_id); +$group_id = intval($group_id); +$adv = intval($adv); +$mode = htmlspecialchars($mode); + +// +// Start program - define vars +// +$forum_auth_fields = array('auth_view', 'auth_read', 'auth_post', 'auth_reply', 'auth_edit', 'auth_delete', 'auth_sticky', 'auth_announce', 'auth_vote', 'auth_pollcreate'); + +$auth_field_match = array( + 'auth_view' => AUTH_VIEW, + 'auth_read' => AUTH_READ, + 'auth_post' => AUTH_POST, + 'auth_reply' => AUTH_REPLY, + 'auth_edit' => AUTH_EDIT, + 'auth_delete' => AUTH_DELETE, + 'auth_sticky' => AUTH_STICKY, + 'auth_announce' => AUTH_ANNOUNCE, + 'auth_vote' => AUTH_VOTE, + 'auth_pollcreate' => AUTH_POLLCREATE); + +$field_names = array( + 'auth_view' => $lang['View'], + 'auth_read' => $lang['Read'], + 'auth_post' => $lang['Post'], + 'auth_reply' => $lang['Reply'], + 'auth_edit' => $lang['Edit'], + 'auth_delete' => $lang['Delete'], + 'auth_sticky' => $lang['Sticky'], + 'auth_announce' => $lang['Announce'], + 'auth_vote' => $lang['Vote'], + 'auth_pollcreate' => $lang['Pollcreate']); + +// --------------- +// Start Functions +// +function check_auth($type, $key, $u_access, $is_admin) +{ + $auth_user = 0; + + if( count($u_access) ) + { + for($j = 0; $j < count($u_access); $j++) + { + $result = 0; + switch($type) + { + case AUTH_ACL: + $result = $u_access[$j][$key]; + + case AUTH_MOD: + $result = $result || $u_access[$j]['auth_mod']; + + case AUTH_ADMIN: + $result = $result || $is_admin; + break; + } + + $auth_user = $auth_user || $result; + } + } + else + { + $auth_user = $is_admin; + } + + return $auth_user; +} +// +// End Functions +// ------------- + +if ( isset($HTTP_POST_VARS['submit']) && ( ( $mode == 'user' && $user_id ) || ( $mode == 'group' && $group_id ) ) ) +{ + $user_level = ''; + if ( $mode == 'user' ) + { + // + // Get group_id for this user_id + // + $sql = "SELECT g.group_id, u.user_level + FROM " . USER_GROUP_TABLE . " ug, " . USERS_TABLE . " u, " . GROUPS_TABLE . " g + WHERE u.user_id = $user_id + AND ug.user_id = u.user_id + AND g.group_id = ug.group_id + AND g.group_single_user = " . TRUE; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not select info from user/user_group table', '', __LINE__, __FILE__, $sql); + } + + $row = $db->sql_fetchrow($result); + + $group_id = $row['group_id']; + $user_level = $row['user_level']; + + $db->sql_freeresult($result); + } + + // + // Carry out requests + // + if ( $mode == 'user' && $HTTP_POST_VARS['userlevel'] == 'admin' && $user_level != ADMIN ) + { + // + // Make user an admin (if already user) + // + if ( $userdata['user_id'] != $user_id ) + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_level = " . ADMIN . " + WHERE user_id = $user_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . AUTH_ACCESS_TABLE . " + WHERE group_id = $group_id + AND auth_mod = 0"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't delete auth access info", "", __LINE__, __FILE__, $sql); + } + + // + // Delete any entries in auth_access, they are not required if user is becoming an + // admin + // + $sql = "UPDATE " . AUTH_ACCESS_TABLE . " + SET auth_view = 0, auth_read = 0, auth_post = 0, auth_reply = 0, auth_edit = 0, auth_delete = 0, auth_sticky = 0, auth_announce = 0 + WHERE group_id = $group_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't update auth access", "", __LINE__, __FILE__, $sql); + } + } + + $message = $lang['Auth_updated'] . '

' . sprintf($lang['Click_return_userauth'], '', '') . '

' . sprintf($lang['Click_return_admin_index'], '', ''); + message_die(GENERAL_MESSAGE, $message); + } + else + { + if ( $mode == 'user' && $HTTP_POST_VARS['userlevel'] == 'user' && $user_level == ADMIN ) + { + // + // Make admin a user (if already admin) ... ignore if you're trying + // to change yourself from an admin to user! + // + if ( $userdata['user_id'] != $user_id ) + { + $sql = "UPDATE " . AUTH_ACCESS_TABLE . " + SET auth_view = 0, auth_read = 0, auth_post = 0, auth_reply = 0, auth_edit = 0, auth_delete = 0, auth_sticky = 0, auth_announce = 0 + WHERE group_id = $group_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not update auth access', '', __LINE__, __FILE__, $sql); + } + + // + // Update users level, reset to USER + // + $sql = "UPDATE " . USERS_TABLE . " + SET user_level = " . USER . " + WHERE user_id = $user_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql); + } + } + + $message = $lang['Auth_updated'] . '

' . sprintf($lang['Click_return_userauth'], '', '') . '

' . sprintf($lang['Click_return_admin_index'], '', ''); + } + else + { + + $change_mod_list = ( isset($HTTP_POST_VARS['moderator']) ) ? $HTTP_POST_VARS['moderator'] : array(); + + if ( empty($adv) ) + { + $sql = "SELECT f.* + FROM " . FORUMS_TABLE . " f, " . CATEGORIES_TABLE . " c + WHERE f.cat_id = c.cat_id + ORDER BY c.cat_order, f.forum_order ASC"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't obtain forum information", "", __LINE__, __FILE__, $sql); + } + + $forum_access = $forum_auth_level_fields = array(); + while( $row = $db->sql_fetchrow($result) ) + { + $forum_access[] = $row; + } + $db->sql_freeresult($result); + + for($i = 0; $i < count($forum_access); $i++) + { + $forum_id = $forum_access[$i]['forum_id']; + + for($j = 0; $j < count($forum_auth_fields); $j++) + { + $forum_auth_level_fields[$forum_id][$forum_auth_fields[$j]] = $forum_access[$i][$forum_auth_fields[$j]] == AUTH_ACL; + } + } + + while( list($forum_id, $value) = @each($HTTP_POST_VARS['private']) ) + { + while( list($auth_field, $exists) = @each($forum_auth_level_fields[$forum_id]) ) + { + if ($exists) + { + $change_acl_list[$forum_id][$auth_field] = $value; + } + } + } + } + else + { + $change_acl_list = array(); + for($j = 0; $j < count($forum_auth_fields); $j++) + { + $auth_field = $forum_auth_fields[$j]; + + while( list($forum_id, $value) = @each($HTTP_POST_VARS['private_' . $auth_field]) ) + { + $change_acl_list[$forum_id][$auth_field] = $value; + } + } + } + + $sql = 'SELECT f.* + FROM ' . FORUMS_TABLE . ' f, ' . CATEGORIES_TABLE . ' c + WHERE f.cat_id = c.cat_id + ORDER BY c.cat_order, f.forum_order'; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't obtain forum information", "", __LINE__, __FILE__, $sql); + } + + $forum_access = array(); + while( $row = $db->sql_fetchrow($result) ) + { + $forum_access[] = $row; + } + $db->sql_freeresult($result); + + $sql = ( $mode == 'user' ) ? "SELECT aa.* FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE. " g WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND aa.group_id = ug.group_id AND g.group_single_user = " . TRUE : "SELECT * FROM " . AUTH_ACCESS_TABLE . " WHERE group_id = $group_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't obtain user/group permissions", "", __LINE__, __FILE__, $sql); + } + + $auth_access = array(); + while( $row = $db->sql_fetchrow($result) ) + { + $auth_access[$row['forum_id']] = $row; + } + $db->sql_freeresult($result); + + $forum_auth_action = array(); + $update_acl_status = array(); + $update_mod_status = array(); + + for($i = 0; $i < count($forum_access); $i++) + { + $forum_id = $forum_access[$i]['forum_id']; + + if ( + ( isset($auth_access[$forum_id]['auth_mod']) && $change_mod_list[$forum_id] != $auth_access[$forum_id]['auth_mod'] ) || + ( !isset($auth_access[$forum_id]['auth_mod']) && !empty($change_mod_list[$forum_id]) ) + ) + { + $update_mod_status[$forum_id] = $change_mod_list[$forum_id]; + + if ( !$update_mod_status[$forum_id] ) + { + $forum_auth_action[$forum_id] = 'delete'; + } + else if ( !isset($auth_access[$forum_id]['auth_mod']) ) + { + $forum_auth_action[$forum_id] = 'insert'; + } + else + { + $forum_auth_action[$forum_id] = 'update'; + } + } + + for($j = 0; $j < count($forum_auth_fields); $j++) + { + $auth_field = $forum_auth_fields[$j]; + + if( $forum_access[$i][$auth_field] == AUTH_ACL && isset($change_acl_list[$forum_id][$auth_field]) ) + { + if ( ( empty($auth_access[$forum_id]['auth_mod']) && + ( isset($auth_access[$forum_id][$auth_field]) && $change_acl_list[$forum_id][$auth_field] != $auth_access[$forum_id][$auth_field] ) || + ( !isset($auth_access[$forum_id][$auth_field]) && !empty($change_acl_list[$forum_id][$auth_field]) ) ) || + !empty($update_mod_status[$forum_id]) + ) + { + $update_acl_status[$forum_id][$auth_field] = ( !empty($update_mod_status[$forum_id]) ) ? 0 : $change_acl_list[$forum_id][$auth_field]; + + if ( isset($auth_access[$forum_id][$auth_field]) && empty($update_acl_status[$forum_id][$auth_field]) && $forum_auth_action[$forum_id] != 'insert' && $forum_auth_action[$forum_id] != 'update' ) + { + $forum_auth_action[$forum_id] = 'delete'; + } + else if ( !isset($auth_access[$forum_id][$auth_field]) && !( $forum_auth_action[$forum_id] == 'delete' && empty($update_acl_status[$forum_id][$auth_field]) ) ) + { + $forum_auth_action[$forum_id] = 'insert'; + } + else if ( isset($auth_access[$forum_id][$auth_field]) && !empty($update_acl_status[$forum_id][$auth_field]) ) + { + $forum_auth_action[$forum_id] = 'update'; + } + } + else if ( ( empty($auth_access[$forum_id]['auth_mod']) && + ( isset($auth_access[$forum_id][$auth_field]) && $change_acl_list[$forum_id][$auth_field] == $auth_access[$forum_id][$auth_field] ) ) && $forum_auth_action[$forum_id] == 'delete' ) + { + $forum_auth_action[$forum_id] = 'update'; + } + } + } + } + + // + // Checks complete, make updates to DB + // + $delete_sql = ''; + while( list($forum_id, $action) = @each($forum_auth_action) ) + { + if ( $action == 'delete' ) + { + $delete_sql .= ( ( $delete_sql != '' ) ? ', ' : '' ) . $forum_id; + } + else + { + if ( $action == 'insert' ) + { + $sql_field = ''; + $sql_value = ''; + while ( list($auth_type, $value) = @each($update_acl_status[$forum_id]) ) + { + $sql_field .= ( ( $sql_field != '' ) ? ', ' : '' ) . $auth_type; + $sql_value .= ( ( $sql_value != '' ) ? ', ' : '' ) . $value; + } + $sql_field .= ( ( $sql_field != '' ) ? ', ' : '' ) . 'auth_mod'; + $sql_value .= ( ( $sql_value != '' ) ? ', ' : '' ) . ( ( !isset($update_mod_status[$forum_id]) ) ? 0 : $update_mod_status[$forum_id]); + + $sql = "INSERT INTO " . AUTH_ACCESS_TABLE . " (forum_id, group_id, $sql_field) + VALUES ($forum_id, $group_id, $sql_value)"; + } + else + { + $sql_values = ''; + while ( list($auth_type, $value) = @each($update_acl_status[$forum_id]) ) + { + $sql_values .= ( ( $sql_values != '' ) ? ', ' : '' ) . $auth_type . ' = ' . $value; + } + $sql_values .= ( ( $sql_values != '' ) ? ', ' : '' ) . 'auth_mod = ' . ( ( !isset($update_mod_status[$forum_id]) ) ? 0 : $update_mod_status[$forum_id]); + + $sql = "UPDATE " . AUTH_ACCESS_TABLE . " + SET $sql_values + WHERE group_id = $group_id + AND forum_id = $forum_id"; + } + if( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't update private forum permissions", "", __LINE__, __FILE__, $sql); + } + } + } + + if ( $delete_sql != '' ) + { + $sql = "DELETE FROM " . AUTH_ACCESS_TABLE . " + WHERE group_id = $group_id + AND forum_id IN ($delete_sql)"; + if( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't delete permission entries", "", __LINE__, __FILE__, $sql); + } + } + + $l_auth_return = ( $mode == 'user' ) ? $lang['Click_return_userauth'] : $lang['Click_return_groupauth']; + $message = $lang['Auth_updated'] . '

' . sprintf($l_auth_return, '', '') . '

' . sprintf($lang['Click_return_admin_index'], '', ''); + } + + // + // Update user level to mod for appropriate users + // + $sql = "SELECT u.user_id + FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . USERS_TABLE . " u + WHERE ug.group_id = aa.group_id + AND u.user_id = ug.user_id + AND ug.user_pending = 0 + AND u.user_level NOT IN (" . MOD . ", " . ADMIN . ") + GROUP BY u.user_id + HAVING SUM(aa.auth_mod) > 0"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't obtain user/group permissions", "", __LINE__, __FILE__, $sql); + } + + $set_mod = ''; + while( $row = $db->sql_fetchrow($result) ) + { + $set_mod .= ( ( $set_mod != '' ) ? ', ' : '' ) . $row['user_id']; + } + $db->sql_freeresult($result); + + // + // Update user level to user for appropriate users + // + switch ( SQL_LAYER ) + { + case 'postgresql': + $sql = "SELECT u.user_id + FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug, " . AUTH_ACCESS_TABLE . " aa + WHERE ug.user_id = u.user_id + AND aa.group_id = ug.group_id + AND u.user_level NOT IN (" . USER . ", " . ADMIN . ") + GROUP BY u.user_id + HAVING SUM(aa.auth_mod) = 0 + UNION ( + SELECT u.user_id + FROM " . USERS_TABLE . " u + WHERE NOT EXISTS ( + SELECT aa.auth_mod + FROM " . USER_GROUP_TABLE . " ug, " . AUTH_ACCESS_TABLE . " aa + WHERE ug.user_id = u.user_id + AND aa.group_id = ug.group_id + ) + AND u.user_level NOT IN (" . USER . ", " . ADMIN . ") + GROUP BY u.user_id + )"; + break; + case 'oracle': + $sql = "SELECT u.user_id + FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug, " . AUTH_ACCESS_TABLE . " aa + WHERE ug.user_id = u.user_id(+) + AND aa.group_id = ug.group_id(+) + AND u.user_level NOT IN (" . USER . ", " . ADMIN . ") + GROUP BY u.user_id + HAVING SUM(aa.auth_mod) = 0"; + break; + default: + $sql = "SELECT u.user_id + FROM ( ( " . USERS_TABLE . " u + LEFT JOIN " . USER_GROUP_TABLE . " ug ON ug.user_id = u.user_id ) + LEFT JOIN " . AUTH_ACCESS_TABLE . " aa ON aa.group_id = ug.group_id ) + WHERE u.user_level NOT IN (" . USER . ", " . ADMIN . ") + GROUP BY u.user_id + HAVING SUM(aa.auth_mod) = 0"; + break; + } + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't obtain user/group permissions", "", __LINE__, __FILE__, $sql); + } + + $unset_mod = ""; + while( $row = $db->sql_fetchrow($result) ) + { + $unset_mod .= ( ( $unset_mod != '' ) ? ', ' : '' ) . $row['user_id']; + } + $db->sql_freeresult($result); + + if ( $set_mod != '' ) + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_level = " . MOD . " + WHERE user_id IN ($set_mod)"; + if( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't update user level", "", __LINE__, __FILE__, $sql); + } + } + + if ( $unset_mod != '' ) + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_level = " . USER . " + WHERE user_id IN ($unset_mod)"; + if( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't update user level", "", __LINE__, __FILE__, $sql); + } + } + + $sql = 'SELECT user_id FROM ' . USER_GROUP_TABLE . " + WHERE group_id = $group_id"; + $result = $db->sql_query($sql); + + $group_user = array(); + while ($row = $db->sql_fetchrow($result)) + { + $group_user[$row['user_id']] = $row['user_id']; + } + $db->sql_freeresult($result); + + $sql = "SELECT ug.user_id, COUNT(auth_mod) AS is_auth_mod + FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug + WHERE ug.user_id IN (" . implode(', ', $group_user) . ") + AND aa.group_id = ug.group_id + AND aa.auth_mod = 1 + GROUP BY ug.user_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain moderator status', '', __LINE__, __FILE__, $sql); + } + + while ($row = $db->sql_fetchrow($result)) + { + if ($row['is_auth_mod']) + { + unset($group_user[$row['user_id']]); + } + } + $db->sql_freeresult($result); + + if (sizeof($group_user)) + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_level = " . USER . " + WHERE user_id IN (" . implode(', ', $group_user) . ") AND user_level = " . MOD; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql); + } + } + + message_die(GENERAL_MESSAGE, $message); + } +} +else if ( ( $mode == 'user' && ( isset($HTTP_POST_VARS['username']) || $user_id ) ) || ( $mode == 'group' && $group_id ) ) +{ + if ( isset($HTTP_POST_VARS['username']) ) + { + $this_userdata = get_userdata($HTTP_POST_VARS['username'], true); + if ( !is_array($this_userdata) ) + { + message_die(GENERAL_MESSAGE, $lang['No_such_user']); + } + $user_id = $this_userdata['user_id']; + } + + // + // Front end + // + $sql = "SELECT f.* + FROM " . FORUMS_TABLE . " f, " . CATEGORIES_TABLE . " c + WHERE f.cat_id = c.cat_id + ORDER BY c.cat_order, f.forum_order ASC"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't obtain forum information", "", __LINE__, __FILE__, $sql); + } + + $forum_access = array(); + while( $row = $db->sql_fetchrow($result) ) + { + $forum_access[] = $row; + } + $db->sql_freeresult($result); + + if( empty($adv) ) + { + for($i = 0; $i < count($forum_access); $i++) + { + $forum_id = $forum_access[$i]['forum_id']; + + $forum_auth_level[$forum_id] = AUTH_ALL; + + for($j = 0; $j < count($forum_auth_fields); $j++) + { + $forum_access[$i][$forum_auth_fields[$j]] . ' :: '; + if ( $forum_access[$i][$forum_auth_fields[$j]] == AUTH_ACL ) + { + $forum_auth_level[$forum_id] = AUTH_ACL; + $forum_auth_level_fields[$forum_id][] = $forum_auth_fields[$j]; + } + } + } + } + + $sql = "SELECT u.user_id, u.username, u.user_level, g.group_id, g.group_name, g.group_single_user, ug.user_pending FROM " . USERS_TABLE . " u, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug WHERE "; + $sql .= ( $mode == 'user' ) ? "u.user_id = $user_id AND ug.user_id = u.user_id AND g.group_id = ug.group_id" : "g.group_id = $group_id AND ug.group_id = g.group_id AND u.user_id = ug.user_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't obtain user/group information", "", __LINE__, __FILE__, $sql); + } + $ug_info = array(); + while( $row = $db->sql_fetchrow($result) ) + { + $ug_info[] = $row; + } + $db->sql_freeresult($result); + + $sql = ( $mode == 'user' ) ? "SELECT aa.*, g.group_single_user FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE. " g WHERE ug.user_id = $user_id AND g.group_id = ug.group_id AND aa.group_id = ug.group_id AND g.group_single_user = 1" : "SELECT * FROM " . AUTH_ACCESS_TABLE . " WHERE group_id = $group_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't obtain user/group permissions", "", __LINE__, __FILE__, $sql); + } + + $auth_access = array(); + $auth_access_count = array(); + while( $row = $db->sql_fetchrow($result) ) + { + $auth_access[$row['forum_id']][] = $row; + $auth_access_count[$row['forum_id']]++; + } + $db->sql_freeresult($result); + + $is_admin = ( $mode == 'user' ) ? ( ( $ug_info[0]['user_level'] == ADMIN && $ug_info[0]['user_id'] != ANONYMOUS ) ? 1 : 0 ) : 0; + + for($i = 0; $i < count($forum_access); $i++) + { + $forum_id = $forum_access[$i]['forum_id']; + + unset($prev_acl_setting); + for($j = 0; $j < count($forum_auth_fields); $j++) + { + $key = $forum_auth_fields[$j]; + $value = $forum_access[$i][$key]; + + switch( $value ) + { + case AUTH_ALL: + case AUTH_REG: + $auth_ug[$forum_id][$key] = 1; + break; + + case AUTH_ACL: + $auth_ug[$forum_id][$key] = ( !empty($auth_access_count[$forum_id]) ) ? check_auth(AUTH_ACL, $key, $auth_access[$forum_id], $is_admin) : 0; + $auth_field_acl[$forum_id][$key] = $auth_ug[$forum_id][$key]; + + if ( isset($prev_acl_setting) ) + { + if ( $prev_acl_setting != $auth_ug[$forum_id][$key] && empty($adv) ) + { + $adv = 1; + } + } + + $prev_acl_setting = $auth_ug[$forum_id][$key]; + + break; + + case AUTH_MOD: + $auth_ug[$forum_id][$key] = ( !empty($auth_access_count[$forum_id]) ) ? check_auth(AUTH_MOD, $key, $auth_access[$forum_id], $is_admin) : 0; + break; + + case AUTH_ADMIN: + $auth_ug[$forum_id][$key] = $is_admin; + break; + + default: + $auth_ug[$forum_id][$key] = 0; + break; + } + } + + // + // Is user a moderator? + // + $auth_ug[$forum_id]['auth_mod'] = ( !empty($auth_access_count[$forum_id]) ) ? check_auth(AUTH_MOD, 'auth_mod', $auth_access[$forum_id], 0) : 0; + } + + $i = 0; + @reset($auth_ug); + while( list($forum_id, $user_ary) = @each($auth_ug) ) + { + if ( empty($adv) ) + { + if ( $forum_auth_level[$forum_id] == AUTH_ACL ) + { + $allowed = 1; + + for($j = 0; $j < count($forum_auth_level_fields[$forum_id]); $j++) + { + if ( !$auth_ug[$forum_id][$forum_auth_level_fields[$forum_id][$j]] ) + { + $allowed = 0; + } + } + + $optionlist_acl = ''; + } + else + { + $optionlist_acl = ' '; + } + } + else + { + for($j = 0; $j < count($forum_access); $j++) + { + if ( $forum_access[$j]['forum_id'] == $forum_id ) + { + for($k = 0; $k < count($forum_auth_fields); $k++) + { + $field_name = $forum_auth_fields[$k]; + + if( $forum_access[$j][$field_name] == AUTH_ACL ) + { + $optionlist_acl_adv[$forum_id][$k] = ''; + + } + } + } + } + } + + $optionlist_mod = ''; + + $row_class = ( !( $i % 2 ) ) ? 'row2' : 'row1'; + $row_color = ( !( $i % 2 ) ) ? $theme['td_color1'] : $theme['td_color2']; + + $template->assign_block_vars('forums', array( + 'ROW_COLOR' => '#' . $row_color, + 'ROW_CLASS' => $row_class, + 'FORUM_NAME' => $forum_access[$i]['forum_name'], + + 'U_FORUM_AUTH' => append_sid("admin_forumauth.$phpEx?f=" . $forum_access[$i]['forum_id']), + + 'S_MOD_SELECT' => $optionlist_mod) + ); + + if( !$adv ) + { + $template->assign_block_vars('forums.aclvalues', array( + 'S_ACL_SELECT' => $optionlist_acl) + ); + } + else + { + for($j = 0; $j < count($forum_auth_fields); $j++) + { + $template->assign_block_vars('forums.aclvalues', array( + 'S_ACL_SELECT' => $optionlist_acl_adv[$forum_id][$j]) + ); + } + } + + $i++; + } +// @reset($auth_user); + + if ( $mode == 'user' ) + { + $t_username = $ug_info[0]['username']; + $s_user_type = ( $is_admin ) ? '' : ''; + } + else + { + $t_groupname = $ug_info[0]['group_name']; + } + + $name = array(); + $id = array(); + for($i = 0; $i < count($ug_info); $i++) + { + if( ( $mode == 'user' && !$ug_info[$i]['group_single_user'] ) || $mode == 'group' ) + { + $name[] = ( $mode == 'user' ) ? $ug_info[$i]['group_name'] : $ug_info[$i]['username']; + $id[] = ( $mode == 'user' ) ? intval($ug_info[$i]['group_id']) : intval($ug_info[$i]['user_id']); + } + } + + $t_usergroup_list = $t_pending_list = ''; + if( count($name) ) + { + for($i = 0; $i < count($ug_info); $i++) + { + $ug = ( $mode == 'user' ) ? 'group&' . POST_GROUPS_URL : 'user&' . POST_USERS_URL; + + if (!$ug_info[$i]['user_pending']) + { + $t_usergroup_list .= ( ( $t_usergroup_list != '' ) ? ', ' : '' ) . '' . $name[$i] . ''; + } + else + { + $t_pending_list .= ( ( $t_pending_list != '' ) ? ', ' : '' ) . '' . $name[$i] . ''; + } + } + } + + $t_usergroup_list = ($t_usergroup_list == '') ? $lang['None'] : $t_usergroup_list; + $t_pending_list = ($t_pending_list == '') ? $lang['None'] : $t_pending_list; + + $s_column_span = 2; // Two columns always present + if( !$adv ) + { + $template->assign_block_vars('acltype', array( + 'L_UG_ACL_TYPE' => $lang['Simple_Permission']) + ); + $s_column_span++; + } + else + { + for($i = 0; $i < count($forum_auth_fields); $i++) + { + $cell_title = $field_names[$forum_auth_fields[$i]]; + + $template->assign_block_vars('acltype', array( + 'L_UG_ACL_TYPE' => $cell_title) + ); + $s_column_span++; + } + } + + // + // Dump in the page header ... + // + include('./page_header_admin.'.$phpEx); + + $template->set_filenames(array( + "body" => 'admin/auth_ug_body.tpl') + ); + + $adv_switch = ( empty($adv) ) ? 1 : 0; + $u_ug_switch = ( $mode == 'user' ) ? POST_USERS_URL . "=" . $user_id : POST_GROUPS_URL . "=" . $group_id; + $switch_mode = append_sid("admin_ug_auth.$phpEx?mode=$mode&" . $u_ug_switch . "&adv=$adv_switch"); + $switch_mode_text = ( empty($adv) ) ? $lang['Advanced_mode'] : $lang['Simple_mode']; + $u_switch_mode = '' . $switch_mode_text . ''; + + $s_hidden_fields = ''; + $s_hidden_fields .= ( $mode == 'user' ) ? '' : ''; + + if ( $mode == 'user' ) + { + $template->assign_block_vars('switch_user_auth', array()); + + $template->assign_vars(array( + 'USERNAME' => $t_username, + 'USER_LEVEL' => $lang['User_Level'] . " : " . $s_user_type, + 'USER_GROUP_MEMBERSHIPS' => $lang['Group_memberships'] . ' : ' . $t_usergroup_list) + ); + } + else + { + $template->assign_block_vars("switch_group_auth", array()); + + $template->assign_vars(array( + 'USERNAME' => $t_groupname, + 'GROUP_MEMBERSHIP' => $lang['Usergroup_members'] . ' : ' . $t_usergroup_list . '
' . $lang['Pending_members'] . ' : ' . $t_pending_list) + ); + } + + $template->assign_vars(array( + 'L_USER_OR_GROUPNAME' => ( $mode == 'user' ) ? $lang['Username'] : $lang['Group_name'], + + 'L_AUTH_TITLE' => ( $mode == 'user' ) ? $lang['Auth_Control_User'] : $lang['Auth_Control_Group'], + 'L_AUTH_EXPLAIN' => ( $mode == 'user' ) ? $lang['User_auth_explain'] : $lang['Group_auth_explain'], + 'L_MODERATOR_STATUS' => $lang['Moderator_status'], + 'L_PERMISSIONS' => $lang['Permissions'], + 'L_SUBMIT' => $lang['Submit'], + 'L_RESET' => $lang['Reset'], + 'L_FORUM' => $lang['Forum'], + + 'U_USER_OR_GROUP' => append_sid("admin_ug_auth.$phpEx"), + 'U_SWITCH_MODE' => $u_switch_mode, + + 'S_COLUMN_SPAN' => $s_column_span, + 'S_AUTH_ACTION' => append_sid("admin_ug_auth.$phpEx"), + 'S_HIDDEN_FIELDS' => $s_hidden_fields) + ); +} +else +{ + // + // Select a user/group + // + include('./page_header_admin.'.$phpEx); + + $template->set_filenames(array( + 'body' => ( $mode == 'user' ) ? 'admin/user_select_body.tpl' : 'admin/auth_select_body.tpl') + ); + + if ( $mode == 'user' ) + { + $template->assign_vars(array( + 'L_FIND_USERNAME' => $lang['Find_username'], + + 'U_SEARCH_USER' => append_sid("../search.$phpEx?mode=searchuser")) + ); + } + else + { + $sql = "SELECT group_id, group_name + FROM " . GROUPS_TABLE . " + WHERE group_single_user <> " . TRUE; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't get group list", "", __LINE__, __FILE__, $sql); + } + + if ( $row = $db->sql_fetchrow($result) ) + { + $select_list = ''; + } + + $template->assign_vars(array( + 'S_AUTH_SELECT' => $select_list) + ); + } + + $s_hidden_fields = ''; + + $l_type = ( $mode == 'user' ) ? 'USER' : 'AUTH'; + + $template->assign_vars(array( + 'L_' . $l_type . '_TITLE' => ( $mode == 'user' ) ? $lang['Auth_Control_User'] : $lang['Auth_Control_Group'], + 'L_' . $l_type . '_EXPLAIN' => ( $mode == 'user' ) ? $lang['User_auth_explain'] : $lang['Group_auth_explain'], + 'L_' . $l_type . '_SELECT' => ( $mode == 'user' ) ? $lang['Select_a_User'] : $lang['Select_a_Group'], + 'L_LOOK_UP' => ( $mode == 'user' ) ? $lang['Look_up_User'] : $lang['Look_up_Group'], + + 'S_HIDDEN_FIELDS' => $s_hidden_fields, + 'S_' . $l_type . '_ACTION' => append_sid("admin_ug_auth.$phpEx")) + ); + +} + +$template->pparse('body'); + +include('./page_footer_admin.'.$phpEx); + +?> \ No newline at end of file diff --git a/phpBB/admin/admin_user_ban.php b/phpBB/admin/admin_user_ban.php new file mode 100644 index 0000000000..355e5c170d --- /dev/null +++ b/phpBB/admin/admin_user_ban.php @@ -0,0 +1,452 @@ +sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't obtain banlist information", "", __LINE__, __FILE__, $sql); + } + + $current_banlist = $db->sql_fetchrowset($result); + $db->sql_freeresult($result); + + $kill_session_sql = ''; + for($i = 0; $i < count($user_list); $i++) + { + $in_banlist = false; + for($j = 0; $j < count($current_banlist); $j++) + { + if ( $user_list[$i] == $current_banlist[$j]['ban_userid'] ) + { + $in_banlist = true; + } + } + + if ( !$in_banlist ) + { + $kill_session_sql .= ( ( $kill_session_sql != '' ) ? ' OR ' : '' ) . "session_user_id = " . $user_list[$i]; + + $sql = "INSERT INTO " . BANLIST_TABLE . " (ban_userid) + VALUES (" . $user_list[$i] . ")"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't insert ban_userid info into database", "", __LINE__, __FILE__, $sql); + } + } + } + + for($i = 0; $i < count($ip_list); $i++) + { + $in_banlist = false; + for($j = 0; $j < count($current_banlist); $j++) + { + if ( $ip_list[$i] == $current_banlist[$j]['ban_ip'] ) + { + $in_banlist = true; + } + } + + if ( !$in_banlist ) + { + if ( preg_match('/(ff\.)|(\.ff)/is', chunk_split($ip_list[$i], 2, '.')) ) + { + $kill_ip_sql = "session_ip LIKE '" . str_replace('.', '', preg_replace('/(ff\.)|(\.ff)/is', '%', chunk_split($ip_list[$i], 2, "."))) . "'"; + } + else + { + $kill_ip_sql = "session_ip = '" . $ip_list[$i] . "'"; + } + + $kill_session_sql .= ( ( $kill_session_sql != '' ) ? ' OR ' : '' ) . $kill_ip_sql; + + $sql = "INSERT INTO " . BANLIST_TABLE . " (ban_ip) + VALUES ('" . $ip_list[$i] . "')"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't insert ban_ip info into database", "", __LINE__, __FILE__, $sql); + } + } + } + + // + // Now we'll delete all entries from the session table with any of the banned + // user or IP info just entered into the ban table ... this will force a session + // initialisation resulting in an instant ban + // + if ( $kill_session_sql != '' ) + { + $sql = "DELETE FROM " . SESSIONS_TABLE . " + WHERE $kill_session_sql"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't delete banned sessions from database", "", __LINE__, __FILE__, $sql); + } + } + + for($i = 0; $i < count($email_list); $i++) + { + $in_banlist = false; + for($j = 0; $j < count($current_banlist); $j++) + { + if ( $email_list[$i] == $current_banlist[$j]['ban_email'] ) + { + $in_banlist = true; + } + } + + if ( !$in_banlist ) + { + $sql = "INSERT INTO " . BANLIST_TABLE . " (ban_email) + VALUES ('" . str_replace("\'", "''", $email_list[$i]) . "')"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't insert ban_email info into database", "", __LINE__, __FILE__, $sql); + } + } + } + + $where_sql = ''; + + if ( isset($HTTP_POST_VARS['unban_user']) ) + { + $user_list = $HTTP_POST_VARS['unban_user']; + + for($i = 0; $i < count($user_list); $i++) + { + if ( $user_list[$i] != -1 ) + { + $where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . intval($user_list[$i]); + } + } + } + + if ( isset($HTTP_POST_VARS['unban_ip']) ) + { + $ip_list = $HTTP_POST_VARS['unban_ip']; + + for($i = 0; $i < count($ip_list); $i++) + { + if ( $ip_list[$i] != -1 ) + { + $where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . str_replace("\'", "''", $ip_list[$i]); + } + } + } + + if ( isset($HTTP_POST_VARS['unban_email']) ) + { + $email_list = $HTTP_POST_VARS['unban_email']; + + for($i = 0; $i < count($email_list); $i++) + { + if ( $email_list[$i] != -1 ) + { + $where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . str_replace("\'", "''", $email_list[$i]); + } + } + } + + if ( $where_sql != '' ) + { + $sql = "DELETE FROM " . BANLIST_TABLE . " + WHERE ban_id IN ($where_sql)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't delete ban info from database", "", __LINE__, __FILE__, $sql); + } + } + + $message = $lang['Ban_update_sucessful'] . '

' . sprintf($lang['Click_return_banadmin'], '', '') . '

' . sprintf($lang['Click_return_admin_index'], '', ''); + + message_die(GENERAL_MESSAGE, $message); + +} +else +{ + $template->set_filenames(array( + 'body' => 'admin/user_ban_body.tpl') + ); + + $template->assign_vars(array( + 'L_BAN_TITLE' => $lang['Ban_control'], + 'L_BAN_EXPLAIN' => $lang['Ban_explain'], + 'L_BAN_EXPLAIN_WARN' => $lang['Ban_explain_warn'], + 'L_IP_OR_HOSTNAME' => $lang['IP_hostname'], + 'L_EMAIL_ADDRESS' => $lang['Email_address'], + 'L_SUBMIT' => $lang['Submit'], + 'L_RESET' => $lang['Reset'], + + 'S_BANLIST_ACTION' => append_sid("admin_user_ban.$phpEx")) + ); + + $template->assign_vars(array( + 'L_BAN_USER' => $lang['Ban_username'], + 'L_BAN_USER_EXPLAIN' => $lang['Ban_username_explain'], + 'L_BAN_IP' => $lang['Ban_IP'], + 'L_BAN_IP_EXPLAIN' => $lang['Ban_IP_explain'], + 'L_BAN_EMAIL' => $lang['Ban_email'], + 'L_BAN_EMAIL_EXPLAIN' => $lang['Ban_email_explain']) + ); + + $userban_count = 0; + $ipban_count = 0; + $emailban_count = 0; + + $sql = "SELECT b.ban_id, u.user_id, u.username + FROM " . BANLIST_TABLE . " b, " . USERS_TABLE . " u + WHERE u.user_id = b.ban_userid + AND b.ban_userid <> 0 + AND u.user_id <> " . ANONYMOUS . " + ORDER BY u.user_id ASC"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not select current user_id ban list', '', __LINE__, __FILE__, $sql); + } + + $user_list = $db->sql_fetchrowset($result); + $db->sql_freeresult($result); + + $select_userlist = ''; + for($i = 0; $i < count($user_list); $i++) + { + $select_userlist .= ''; + $userban_count++; + } + + if( $select_userlist == '' ) + { + $select_userlist = ''; + } + + $select_userlist = ''; + + $sql = "SELECT ban_id, ban_ip, ban_email + FROM " . BANLIST_TABLE; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not select current ip ban list', '', __LINE__, __FILE__, $sql); + } + + $banlist = $db->sql_fetchrowset($result); + $db->sql_freeresult($result); + + $select_iplist = ''; + $select_emaillist = ''; + + for($i = 0; $i < count($banlist); $i++) + { + $ban_id = $banlist[$i]['ban_id']; + + if ( !empty($banlist[$i]['ban_ip']) ) + { + $ban_ip = str_replace('255', '*', decode_ip($banlist[$i]['ban_ip'])); + $select_iplist .= ''; + $ipban_count++; + } + else if ( !empty($banlist[$i]['ban_email']) ) + { + $ban_email = $banlist[$i]['ban_email']; + $select_emaillist .= ''; + $emailban_count++; + } + } + + if ( $select_iplist == '' ) + { + $select_iplist = ''; + } + + if ( $select_emaillist == '' ) + { + $select_emaillist = ''; + } + + $select_iplist = ''; + $select_emaillist = ''; + + $template->assign_vars(array( + 'L_UNBAN_USER' => $lang['Unban_username'], + 'L_UNBAN_USER_EXPLAIN' => $lang['Unban_username_explain'], + 'L_UNBAN_IP' => $lang['Unban_IP'], + 'L_UNBAN_IP_EXPLAIN' => $lang['Unban_IP_explain'], + 'L_UNBAN_EMAIL' => $lang['Unban_email'], + 'L_UNBAN_EMAIL_EXPLAIN' => $lang['Unban_email_explain'], + 'L_USERNAME' => $lang['Username'], + 'L_LOOK_UP' => $lang['Look_up_User'], + 'L_FIND_USERNAME' => $lang['Find_username'], + + 'U_SEARCH_USER' => append_sid("./../search.$phpEx?mode=searchuser"), + 'S_UNBAN_USERLIST_SELECT' => $select_userlist, + 'S_UNBAN_IPLIST_SELECT' => $select_iplist, + 'S_UNBAN_EMAILLIST_SELECT' => $select_emaillist, + 'S_BAN_ACTION' => append_sid("admin_user_ban.$phpEx")) + ); +} + +$template->pparse('body'); + +include('./page_footer_admin.'.$phpEx); + +?> \ No newline at end of file diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php new file mode 100644 index 0000000000..cdd950ec4d --- /dev/null +++ b/phpBB/admin/admin_users.php @@ -0,0 +1,1155 @@ +#'); +$html_entities_replace = array('<', '>'); + +// +// Set mode +// +if( isset( $HTTP_POST_VARS['mode'] ) || isset( $HTTP_GET_VARS['mode'] ) ) +{ + $mode = ( isset( $HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; + $mode = htmlspecialchars($mode); +} +else +{ + $mode = ''; +} + +// +// Begin program +// +if ( $mode == 'edit' || $mode == 'save' && ( isset($HTTP_POST_VARS['username']) || isset($HTTP_GET_VARS[POST_USERS_URL]) || isset( $HTTP_POST_VARS[POST_USERS_URL]) ) ) +{ + // + // Ok, the profile has been modified and submitted, let's update + // + if ( ( $mode == 'save' && isset( $HTTP_POST_VARS['submit'] ) ) || isset( $HTTP_POST_VARS['avatargallery'] ) || isset( $HTTP_POST_VARS['submitavatar'] ) || isset( $HTTP_POST_VARS['cancelavatar'] ) ) + { + $user_id = intval($HTTP_POST_VARS['id']); + + if (!($this_userdata = get_userdata($user_id))) + { + message_die(GENERAL_MESSAGE, $lang['No_user_id_specified'] ); + } + + if( $HTTP_POST_VARS['deleteuser'] && ( $userdata['user_id'] != $user_id ) ) + { + $sql = "SELECT g.group_id + FROM " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g + WHERE ug.user_id = $user_id + AND g.group_id = ug.group_id + AND g.group_single_user = 1"; + if( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain group information for this user', '', __LINE__, __FILE__, $sql); + } + + $row = $db->sql_fetchrow($result); + + $sql = "UPDATE " . POSTS_TABLE . " + SET poster_id = " . DELETED . ", post_username = '" . str_replace("\\'", "''", addslashes($this_userdata['username'])) . "' + WHERE poster_id = $user_id"; + if( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update posts for this user', '', __LINE__, __FILE__, $sql); + } + + $sql = "UPDATE " . TOPICS_TABLE . " + SET topic_poster = " . DELETED . " + WHERE topic_poster = $user_id"; + if( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update topics for this user', '', __LINE__, __FILE__, $sql); + } + + $sql = "UPDATE " . VOTE_USERS_TABLE . " + SET vote_user_id = " . DELETED . " + WHERE vote_user_id = $user_id"; + if( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update votes for this user', '', __LINE__, __FILE__, $sql); + } + + $sql = "UPDATE " . GROUPS_TABLE . " + SET group_moderator = " . $userdata['user_id'] . " + WHERE group_moderator = $user_id"; + if( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update group moderators', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . USERS_TABLE . " + WHERE user_id = $user_id"; + if( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete user', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . USER_GROUP_TABLE . " + WHERE user_id = $user_id"; + if( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete user from user_group table', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . GROUPS_TABLE . " + WHERE group_id = " . $row['group_id']; + if( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete group for this user', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . AUTH_ACCESS_TABLE . " + WHERE group_id = " . $row['group_id']; + if( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete group for this user', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " + WHERE user_id = $user_id"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete user from topic watch table', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . BANLIST_TABLE . " + WHERE ban_userid = $user_id"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete user from banlist table', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . SESSIONS_TABLE . " + WHERE session_user_id = $user_id"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete sessions for this user', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . SESSIONS_KEYS_TABLE . " + WHERE user_id = $user_id"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete auto-login keys for this user', '', __LINE__, __FILE__, $sql); + } + + $sql = "SELECT privmsgs_id + FROM " . PRIVMSGS_TABLE . " + WHERE privmsgs_from_userid = $user_id + OR privmsgs_to_userid = $user_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not select all users private messages', '', __LINE__, __FILE__, $sql); + } + + // This little bit of code directly from the private messaging section. + while ( $row_privmsgs = $db->sql_fetchrow($result) ) + { + $mark_list[] = $row_privmsgs['privmsgs_id']; + } + + if ( count($mark_list) ) + { + $delete_sql_id = implode(', ', $mark_list); + + $delete_text_sql = "DELETE FROM " . PRIVMSGS_TEXT_TABLE . " + WHERE privmsgs_text_id IN ($delete_sql_id)"; + $delete_sql = "DELETE FROM " . PRIVMSGS_TABLE . " + WHERE privmsgs_id IN ($delete_sql_id)"; + + if ( !$db->sql_query($delete_sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete private message info', '', __LINE__, __FILE__, $delete_sql); + } + + if ( !$db->sql_query($delete_text_sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete private message text', '', __LINE__, __FILE__, $delete_text_sql); + } + } + + $message = $lang['User_deleted'] . '

' . sprintf($lang['Click_return_useradmin'], '', '') . '

' . sprintf($lang['Click_return_admin_index'], '', ''); + + message_die(GENERAL_MESSAGE, $message); + } + + $username = ( !empty($HTTP_POST_VARS['username']) ) ? phpbb_clean_username($HTTP_POST_VARS['username']) : ''; + $email = ( !empty($HTTP_POST_VARS['email']) ) ? trim(strip_tags(htmlspecialchars( $HTTP_POST_VARS['email'] ) )) : ''; + + $password = ( !empty($HTTP_POST_VARS['password']) ) ? trim(strip_tags(htmlspecialchars( $HTTP_POST_VARS['password'] ) )) : ''; + $password_confirm = ( !empty($HTTP_POST_VARS['password_confirm']) ) ? trim(strip_tags(htmlspecialchars( $HTTP_POST_VARS['password_confirm'] ) )) : ''; + + $icq = ( !empty($HTTP_POST_VARS['icq']) ) ? trim(strip_tags( $HTTP_POST_VARS['icq'] ) ) : ''; + $aim = ( !empty($HTTP_POST_VARS['aim']) ) ? trim(strip_tags( $HTTP_POST_VARS['aim'] ) ) : ''; + $msn = ( !empty($HTTP_POST_VARS['msn']) ) ? trim(strip_tags( $HTTP_POST_VARS['msn'] ) ) : ''; + $yim = ( !empty($HTTP_POST_VARS['yim']) ) ? trim(strip_tags( $HTTP_POST_VARS['yim'] ) ) : ''; + + $website = ( !empty($HTTP_POST_VARS['website']) ) ? trim(strip_tags( $HTTP_POST_VARS['website'] ) ) : ''; + $location = ( !empty($HTTP_POST_VARS['location']) ) ? trim(strip_tags( $HTTP_POST_VARS['location'] ) ) : ''; + $occupation = ( !empty($HTTP_POST_VARS['occupation']) ) ? trim(strip_tags( $HTTP_POST_VARS['occupation'] ) ) : ''; + $interests = ( !empty($HTTP_POST_VARS['interests']) ) ? trim(strip_tags( $HTTP_POST_VARS['interests'] ) ) : ''; + $signature = ( !empty($HTTP_POST_VARS['signature']) ) ? trim(str_replace('
', "\n", $HTTP_POST_VARS['signature'] ) ) : ''; + + validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature); + + $viewemail = ( isset( $HTTP_POST_VARS['viewemail']) ) ? ( ( $HTTP_POST_VARS['viewemail'] ) ? TRUE : 0 ) : 0; + $allowviewonline = ( isset( $HTTP_POST_VARS['hideonline']) ) ? ( ( $HTTP_POST_VARS['hideonline'] ) ? 0 : TRUE ) : TRUE; + $notifyreply = ( isset( $HTTP_POST_VARS['notifyreply']) ) ? ( ( $HTTP_POST_VARS['notifyreply'] ) ? TRUE : 0 ) : 0; + $notifypm = ( isset( $HTTP_POST_VARS['notifypm']) ) ? ( ( $HTTP_POST_VARS['notifypm'] ) ? TRUE : 0 ) : TRUE; + $popuppm = ( isset( $HTTP_POST_VARS['popup_pm']) ) ? ( ( $HTTP_POST_VARS['popup_pm'] ) ? TRUE : 0 ) : TRUE; + $attachsig = ( isset( $HTTP_POST_VARS['attachsig']) ) ? ( ( $HTTP_POST_VARS['attachsig'] ) ? TRUE : 0 ) : 0; + + $allowhtml = ( isset( $HTTP_POST_VARS['allowhtml']) ) ? intval( $HTTP_POST_VARS['allowhtml'] ) : $board_config['allow_html']; + $allowbbcode = ( isset( $HTTP_POST_VARS['allowbbcode']) ) ? intval( $HTTP_POST_VARS['allowbbcode'] ) : $board_config['allow_bbcode']; + $allowsmilies = ( isset( $HTTP_POST_VARS['allowsmilies']) ) ? intval( $HTTP_POST_VARS['allowsmilies'] ) : $board_config['allow_smilies']; + + $user_style = ( isset( $HTTP_POST_VARS['style'] ) ) ? intval( $HTTP_POST_VARS['style'] ) : $board_config['default_style']; + $user_lang = ( $HTTP_POST_VARS['language'] ) ? $HTTP_POST_VARS['language'] : $board_config['default_lang']; + $user_timezone = ( isset( $HTTP_POST_VARS['timezone']) ) ? doubleval( $HTTP_POST_VARS['timezone'] ) : $board_config['board_timezone']; + $user_dateformat = ( $HTTP_POST_VARS['dateformat'] ) ? trim( $HTTP_POST_VARS['dateformat'] ) : $board_config['default_dateformat']; + + $user_avatar_local = ( isset( $HTTP_POST_VARS['avatarselect'] ) && !empty($HTTP_POST_VARS['submitavatar'] ) && $board_config['allow_avatar_local'] ) ? $HTTP_POST_VARS['avatarselect'] : ( ( isset( $HTTP_POST_VARS['avatarlocal'] ) ) ? $HTTP_POST_VARS['avatarlocal'] : '' ); + $user_avatar_category = ( isset($HTTP_POST_VARS['avatarcatname']) && $board_config['allow_avatar_local'] ) ? htmlspecialchars($HTTP_POST_VARS['avatarcatname']) : '' ; + + $user_avatar_remoteurl = ( !empty($HTTP_POST_VARS['avatarremoteurl']) ) ? trim( $HTTP_POST_VARS['avatarremoteurl'] ) : ''; + $user_avatar_url = ( !empty($HTTP_POST_VARS['avatarurl']) ) ? trim( $HTTP_POST_VARS['avatarurl'] ) : ''; + $user_avatar_loc = ( $HTTP_POST_FILES['avatar']['tmp_name'] != "none") ? $HTTP_POST_FILES['avatar']['tmp_name'] : ''; + $user_avatar_name = ( !empty($HTTP_POST_FILES['avatar']['name']) ) ? $HTTP_POST_FILES['avatar']['name'] : ''; + $user_avatar_size = ( !empty($HTTP_POST_FILES['avatar']['size']) ) ? $HTTP_POST_FILES['avatar']['size'] : 0; + $user_avatar_filetype = ( !empty($HTTP_POST_FILES['avatar']['type']) ) ? $HTTP_POST_FILES['avatar']['type'] : ''; + + $user_avatar = ( empty($user_avatar_loc) ) ? $this_userdata['user_avatar'] : ''; + $user_avatar_type = ( empty($user_avatar_loc) ) ? $this_userdata['user_avatar_type'] : ''; + + $user_status = ( !empty($HTTP_POST_VARS['user_status']) ) ? intval( $HTTP_POST_VARS['user_status'] ) : 0; + $user_allowpm = ( !empty($HTTP_POST_VARS['user_allowpm']) ) ? intval( $HTTP_POST_VARS['user_allowpm'] ) : 0; + $user_rank = ( !empty($HTTP_POST_VARS['user_rank']) ) ? intval( $HTTP_POST_VARS['user_rank'] ) : 0; + $user_allowavatar = ( !empty($HTTP_POST_VARS['user_allowavatar']) ) ? intval( $HTTP_POST_VARS['user_allowavatar'] ) : 0; + + if( isset( $HTTP_POST_VARS['avatargallery'] ) || isset( $HTTP_POST_VARS['submitavatar'] ) || isset( $HTTP_POST_VARS['cancelavatar'] ) ) + { + $username = stripslashes($username); + $email = stripslashes($email); + $password = ''; + $password_confirm = ''; + + $icq = stripslashes($icq); + $aim = htmlspecialchars(stripslashes($aim)); + $msn = htmlspecialchars(stripslashes($msn)); + $yim = htmlspecialchars(stripslashes($yim)); + + $website = htmlspecialchars(stripslashes($website)); + $location = htmlspecialchars(stripslashes($location)); + $occupation = htmlspecialchars(stripslashes($occupation)); + $interests = htmlspecialchars(stripslashes($interests)); + $signature = htmlspecialchars(stripslashes($signature)); + + $user_lang = stripslashes($user_lang); + $user_dateformat = htmlspecialchars(stripslashes($user_dateformat)); + + if ( !isset($HTTP_POST_VARS['cancelavatar'])) + { + $user_avatar = $user_avatar_category . '/' . $user_avatar_local; + $user_avatar_type = USER_AVATAR_GALLERY; + } + } + } + + if( isset( $HTTP_POST_VARS['submit'] ) ) + { + include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx); + + $error = FALSE; + + if (stripslashes($username) != $this_userdata['username']) + { + unset($rename_user); + + if ( stripslashes(strtolower($username)) != strtolower($this_userdata['username']) ) + { + $result = validate_username($username); + if ( $result['error'] ) + { + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
' : '' ) . $result['error_msg']; + } + else if ( strtolower(str_replace("\\'", "''", $username)) == strtolower($userdata['username']) ) + { + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
' : '' ) . $lang['Username_taken']; + } + } + + if (!$error) + { + $username_sql = "username = '" . str_replace("\\'", "''", $username) . "', "; + $rename_user = $username; // Used for renaming usergroup + } + } + + $passwd_sql = ''; + if( !empty($password) && !empty($password_confirm) ) + { + // + // Awww, the user wants to change their password, isn't that cute.. + // + if($password != $password_confirm) + { + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
' : '' ) . $lang['Password_mismatch']; + } + else + { + $password = md5($password); + $passwd_sql = "user_password = '$password', "; + } + } + else if( $password && !$password_confirm ) + { + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
' : '' ) . $lang['Password_mismatch']; + } + else if( !$password && $password_confirm ) + { + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
' : '' ) . $lang['Password_mismatch']; + } + + if ($signature != '') + { + $sig_length_check = preg_replace('/(\[.*?)(=.*?)\]/is', '\\1]', stripslashes($signature)); + if ( $allowhtml ) + { + $sig_length_check = preg_replace('/(\<.*?)(=.*?)( .*?=.*?)?([ \/]?\>)/is', '\\1\\3\\4', $sig_length_check); + } + + // Only create a new bbcode_uid when there was no uid yet. + if ( $signature_bbcode_uid == '' ) + { + $signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : ''; + } + $signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid); + + if ( strlen($sig_length_check) > $board_config['max_sig_chars'] ) + { + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
' : '' ) . $lang['Signature_too_long']; + } + } + + // + // Avatar stuff + // + $avatar_sql = ""; + if( isset($HTTP_POST_VARS['avatardel']) ) + { + if( $this_userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $this_userdata['user_avatar'] != "" ) + { + if( @file_exists(@phpbb_realpath('./../' . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar'])) ) + { + @unlink('./../' . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']); + } + } + $avatar_sql = ", user_avatar = '', user_avatar_type = " . USER_AVATAR_NONE; + } + else if( ( $user_avatar_loc != "" || !empty($user_avatar_url) ) && !$error ) + { + // + // Only allow one type of upload, either a + // filename or a URL + // + if( !empty($user_avatar_loc) && !empty($user_avatar_url) ) + { + $error = TRUE; + if( isset($error_msg) ) + { + $error_msg .= "
"; + } + $error_msg .= $lang['Only_one_avatar']; + } + + if( $user_avatar_loc != "" ) + { + if( file_exists(@phpbb_realpath($user_avatar_loc)) && ereg(".jpg$|.gif$|.png$", $user_avatar_name) ) + { + if( $user_avatar_size <= $board_config['avatar_filesize'] && $user_avatar_size > 0) + { + $error_type = false; + + // + // Opera appends the image name after the type, not big, not clever! + // + preg_match("'image\/[x\-]*([a-z]+)'", $user_avatar_filetype, $user_avatar_filetype); + $user_avatar_filetype = $user_avatar_filetype[1]; + + switch( $user_avatar_filetype ) + { + case "jpeg": + case "pjpeg": + case "jpg": + $imgtype = '.jpg'; + break; + case "gif": + $imgtype = '.gif'; + break; + case "png": + $imgtype = '.png'; + break; + default: + $error = true; + $error_msg = (!empty($error_msg)) ? $error_msg . "
" . $lang['Avatar_filetype'] : $lang['Avatar_filetype']; + break; + } + + if( !$error ) + { + list($width, $height) = @getimagesize($user_avatar_loc); + + if( $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] ) + { + $user_id = $this_userdata['user_id']; + + $avatar_filename = $user_id . $imgtype; + + if( $this_userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $this_userdata['user_avatar'] != "" ) + { + if( @file_exists(@phpbb_realpath("./../" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar'])) ) + { + @unlink("./../" . $board_config['avatar_path'] . "/". $this_userdata['user_avatar']); + } + } + @copy($user_avatar_loc, "./../" . $board_config['avatar_path'] . "/$avatar_filename"); + + $avatar_sql = ", user_avatar = '$avatar_filename', user_avatar_type = " . USER_AVATAR_UPLOAD; + } + else + { + $l_avatar_size = sprintf($lang['Avatar_imagesize'], $board_config['avatar_max_width'], $board_config['avatar_max_height']); + + $error = true; + $error_msg = ( !empty($error_msg) ) ? $error_msg . "
" . $l_avatar_size : $l_avatar_size; + } + } + } + else + { + $l_avatar_size = sprintf($lang['Avatar_filesize'], round($board_config['avatar_filesize'] / 1024)); + + $error = true; + $error_msg = ( !empty($error_msg) ) ? $error_msg . "
" . $l_avatar_size : $l_avatar_size; + } + } + else + { + $error = true; + $error_msg = ( !empty($error_msg) ) ? $error_msg . "
" . $lang['Avatar_filetype'] : $lang['Avatar_filetype']; + } + } + else if( !empty($user_avatar_url) ) + { + // + // First check what port we should connect + // to, look for a :[xxxx]/ or, if that doesn't + // exist assume port 80 (http) + // + preg_match("/^(http:\/\/)?([\w\-\.]+)\:?([0-9]*)\/(.*)$/", $user_avatar_url, $url_ary); + + if( !empty($url_ary[4]) ) + { + $port = (!empty($url_ary[3])) ? $url_ary[3] : 80; + + $fsock = @fsockopen($url_ary[2], $port, $errno, $errstr); + if( $fsock ) + { + $base_get = "/" . $url_ary[4]; + + // + // Uses HTTP 1.1, could use HTTP 1.0 ... + // + @fputs($fsock, "GET $base_get HTTP/1.1\r\n"); + @fputs($fsock, "HOST: " . $url_ary[2] . "\r\n"); + @fputs($fsock, "Connection: close\r\n\r\n"); + + unset($avatar_data); + while( !@feof($fsock) ) + { + $avatar_data .= @fread($fsock, $board_config['avatar_filesize']); + } + @fclose($fsock); + + if( preg_match("/Content-Length\: ([0-9]+)[^\/ ][\s]+/i", $avatar_data, $file_data1) && preg_match("/Content-Type\: image\/[x\-]*([a-z]+)[\s]+/i", $avatar_data, $file_data2) ) + { + $file_size = $file_data1[1]; + $file_type = $file_data2[1]; + + switch( $file_type ) + { + case "jpeg": + case "pjpeg": + case "jpg": + $imgtype = '.jpg'; + break; + case "gif": + $imgtype = '.gif'; + break; + case "png": + $imgtype = '.png'; + break; + default: + $error = true; + $error_msg = (!empty($error_msg)) ? $error_msg . "
" . $lang['Avatar_filetype'] : $lang['Avatar_filetype']; + break; + } + + if( !$error && $file_size > 0 && $file_size < $board_config['avatar_filesize'] ) + { + $avatar_data = substr($avatar_data, strlen($avatar_data) - $file_size, $file_size); + + $tmp_filename = tempnam ("/tmp", $this_userdata['user_id'] . "-"); + $fptr = @fopen($tmp_filename, "wb"); + $bytes_written = @fwrite($fptr, $avatar_data, $file_size); + @fclose($fptr); + + if( $bytes_written == $file_size ) + { + list($width, $height) = @getimagesize($tmp_filename); + + if( $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] ) + { + $user_id = $this_userdata['user_id']; + + $avatar_filename = $user_id . $imgtype; + + if( $this_userdata['user_avatar_type'] == USER_AVATAR_UPLOAD && $this_userdata['user_avatar'] != "") + { + if( file_exists(@phpbb_realpath("./../" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar'])) ) + { + @unlink("./../" . $board_config['avatar_path'] . "/" . $this_userdata['user_avatar']); + } + } + @copy($tmp_filename, "./../" . $board_config['avatar_path'] . "/$avatar_filename"); + @unlink($tmp_filename); + + $avatar_sql = ", user_avatar = '$avatar_filename', user_avatar_type = " . USER_AVATAR_UPLOAD; + } + else + { + $l_avatar_size = sprintf($lang['Avatar_imagesize'], $board_config['avatar_max_width'], $board_config['avatar_max_height']); + + $error = true; + $error_msg = ( !empty($error_msg) ) ? $error_msg . "
" . $l_avatar_size : $l_avatar_size; + } + } + else + { + // + // Error writing file + // + @unlink($tmp_filename); + message_die(GENERAL_ERROR, "Could not write avatar file to local storage. Please contact the board administrator with this message", "", __LINE__, __FILE__); + } + } + } + else + { + // + // No data + // + $error = true; + $error_msg = ( !empty($error_msg) ) ? $error_msg . "
" . $lang['File_no_data'] : $lang['File_no_data']; + } + } + else + { + // + // No connection + // + $error = true; + $error_msg = ( !empty($error_msg) ) ? $error_msg . "
" . $lang['No_connection_URL'] : $lang['No_connection_URL']; + } + } + else + { + $error = true; + $error_msg = ( !empty($error_msg) ) ? $error_msg . "
" . $lang['Incomplete_URL'] : $lang['Incomplete_URL']; + } + } + else if( !empty($user_avatar_name) ) + { + $l_avatar_size = sprintf($lang['Avatar_filesize'], round($board_config['avatar_filesize'] / 1024)); + + $error = true; + $error_msg = ( !empty($error_msg) ) ? $error_msg . "
" . $l_avatar_size : $l_avatar_size; + } + } + else if( $user_avatar_remoteurl != "" && $avatar_sql == "" && !$error ) + { + if( !preg_match("#^http:\/\/#i", $user_avatar_remoteurl) ) + { + $user_avatar_remoteurl = "http://" . $user_avatar_remoteurl; + } + + if( preg_match("#^(http:\/\/[a-z0-9\-]+?\.([a-z0-9\-]+\.)*[a-z]+\/.*?\.(gif|jpg|png)$)#is", $user_avatar_remoteurl) ) + { + $avatar_sql = ", user_avatar = '" . str_replace("\'", "''", $user_avatar_remoteurl) . "', user_avatar_type = " . USER_AVATAR_REMOTE; + } + else + { + $error = true; + $error_msg = ( !empty($error_msg) ) ? $error_msg . "
" . $lang['Wrong_remote_avatar_format'] : $lang['Wrong_remote_avatar_format']; + } + } + else if( $user_avatar_local != "" && $avatar_sql == "" && !$error ) + { + $avatar_sql = ", user_avatar = '" . str_replace("\'", "''", phpbb_ltrim(basename($user_avatar_category), "'") . '/' . phpbb_ltrim(basename($user_avatar_local), "'")) . "', user_avatar_type = " . USER_AVATAR_GALLERY; + } + + // + // Update entry in DB + // + if( !$error ) + { + $sql = "UPDATE " . USERS_TABLE . " + SET " . $username_sql . $passwd_sql . "user_email = '" . str_replace("\'", "''", $email) . "', user_icq = '" . str_replace("\'", "''", $icq) . "', user_website = '" . str_replace("\'", "''", $website) . "', user_occ = '" . str_replace("\'", "''", $occupation) . "', user_from = '" . str_replace("\'", "''", $location) . "', user_interests = '" . str_replace("\'", "''", $interests) . "', user_sig = '" . str_replace("\'", "''", $signature) . "', user_viewemail = $viewemail, user_aim = '" . str_replace("\'", "''", $aim) . "', user_yim = '" . str_replace("\'", "''", $yim) . "', user_msnm = '" . str_replace("\'", "''", $msn) . "', user_attachsig = $attachsig, user_sig_bbcode_uid = '$signature_bbcode_uid', user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowavatar = $user_allowavatar, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_notify = $notifyreply, user_allow_pm = $user_allowpm, user_notify_pm = $notifypm, user_popup_pm = $popuppm, user_lang = '" . str_replace("\'", "''", $user_lang) . "', user_style = $user_style, user_timezone = $user_timezone, user_dateformat = '" . str_replace("\'", "''", $user_dateformat) . "', user_active = $user_status, user_rank = $user_rank" . $avatar_sql . " + WHERE user_id = $user_id"; + + if( $result = $db->sql_query($sql) ) + { + if( isset($rename_user) ) + { + $sql = "UPDATE " . GROUPS_TABLE . " + SET group_name = '".str_replace("\'", "''", $rename_user)."' + WHERE group_name = '".str_replace("'", "''", $this_userdata['username'] )."'"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not rename users group', '', __LINE__, __FILE__, $sql); + } + } + + // Delete user session, to prevent the user navigating the forum (if logged in) when disabled + if (!$user_status) + { + $sql = "DELETE FROM " . SESSIONS_TABLE . " + WHERE session_user_id = " . $user_id; + + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Error removing user session', '', __LINE__, __FILE__, $sql); + } + } + + // We remove all stored login keys since the password has been updated + // and change the current one (if applicable) + if ( !empty($passwd_sql) ) + { + session_reset_keys($user_id, $user_ip); + } + + $message .= $lang['Admin_user_updated']; + } + else + { + message_die(GENERAL_ERROR, 'Admin_user_fail', '', __LINE__, __FILE__, $sql); + } + + $message .= '

' . sprintf($lang['Click_return_useradmin'], '', '') . '

' . sprintf($lang['Click_return_admin_index'], '', ''); + + message_die(GENERAL_MESSAGE, $message); + } + else + { + $template->set_filenames(array( + 'reg_header' => 'error_body.tpl') + ); + + $template->assign_vars(array( + 'ERROR_MESSAGE' => $error_msg) + ); + + $template->assign_var_from_handle('ERROR_BOX', 'reg_header'); + + $username = htmlspecialchars(stripslashes($username)); + $email = stripslashes($email); + $password = ''; + $password_confirm = ''; + + $icq = stripslashes($icq); + $aim = htmlspecialchars(str_replace('+', ' ', stripslashes($aim))); + $msn = htmlspecialchars(stripslashes($msn)); + $yim = htmlspecialchars(stripslashes($yim)); + + $website = htmlspecialchars(stripslashes($website)); + $location = htmlspecialchars(stripslashes($location)); + $occupation = htmlspecialchars(stripslashes($occupation)); + $interests = htmlspecialchars(stripslashes($interests)); + $signature = htmlspecialchars(stripslashes($signature)); + + $user_lang = stripslashes($user_lang); + $user_dateformat = htmlspecialchars(stripslashes($user_dateformat)); + } + } + else if( !isset( $HTTP_POST_VARS['submit'] ) && $mode != 'save' && !isset( $HTTP_POST_VARS['avatargallery'] ) && !isset( $HTTP_POST_VARS['submitavatar'] ) && !isset( $HTTP_POST_VARS['cancelavatar'] ) ) + { + if( isset( $HTTP_GET_VARS[POST_USERS_URL]) || isset( $HTTP_POST_VARS[POST_USERS_URL]) ) + { + $user_id = ( isset( $HTTP_POST_VARS[POST_USERS_URL]) ) ? intval( $HTTP_POST_VARS[POST_USERS_URL]) : intval( $HTTP_GET_VARS[POST_USERS_URL]); + $this_userdata = get_userdata($user_id); + if( !$this_userdata ) + { + message_die(GENERAL_MESSAGE, $lang['No_user_id_specified'] ); + } + } + else + { + $this_userdata = get_userdata($HTTP_POST_VARS['username'], true); + if( !$this_userdata ) + { + message_die(GENERAL_MESSAGE, $lang['No_user_id_specified'] ); + } + } + + // + // Now parse and display it as a template + // + $user_id = $this_userdata['user_id']; + $username = $this_userdata['username']; + $email = $this_userdata['user_email']; + $password = ''; + $password_confirm = ''; + + $icq = $this_userdata['user_icq']; + $aim = htmlspecialchars(str_replace('+', ' ', $this_userdata['user_aim'] )); + $msn = htmlspecialchars($this_userdata['user_msnm']); + $yim = htmlspecialchars($this_userdata['user_yim']); + + $website = htmlspecialchars($this_userdata['user_website']); + $location = htmlspecialchars($this_userdata['user_from']); + $occupation = htmlspecialchars($this_userdata['user_occ']); + $interests = htmlspecialchars($this_userdata['user_interests']); + + $signature = ($this_userdata['user_sig_bbcode_uid'] != '') ? preg_replace('#:' . $this_userdata['user_sig_bbcode_uid'] . '#si', '', $this_userdata['user_sig']) : $this_userdata['user_sig']; + $signature = preg_replace($html_entities_match, $html_entities_replace, $signature); + + $viewemail = $this_userdata['user_viewemail']; + $notifypm = $this_userdata['user_notify_pm']; + $popuppm = $this_userdata['user_popup_pm']; + $notifyreply = $this_userdata['user_notify']; + $attachsig = $this_userdata['user_attachsig']; + $allowhtml = $this_userdata['user_allowhtml']; + $allowbbcode = $this_userdata['user_allowbbcode']; + $allowsmilies = $this_userdata['user_allowsmile']; + $allowviewonline = $this_userdata['user_allow_viewonline']; + + $user_avatar = $this_userdata['user_avatar']; + $user_avatar_type = $this_userdata['user_avatar_type']; + $user_style = $this_userdata['user_style']; + $user_lang = $this_userdata['user_lang']; + $user_timezone = $this_userdata['user_timezone']; + $user_dateformat = htmlspecialchars($this_userdata['user_dateformat']); + + $user_status = $this_userdata['user_active']; + $user_allowavatar = $this_userdata['user_allowavatar']; + $user_allowpm = $this_userdata['user_allow_pm']; + + $COPPA = false; + + $html_status = ($this_userdata['user_allowhtml'] ) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF']; + $bbcode_status = ($this_userdata['user_allowbbcode'] ) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF']; + $smilies_status = ($this_userdata['user_allowsmile'] ) ? $lang['Smilies_are_ON'] : $lang['Smilies_are_OFF']; + } + + if( isset($HTTP_POST_VARS['avatargallery']) && !$error ) + { + if( !$error ) + { + $user_id = intval($HTTP_POST_VARS['id']); + + $template->set_filenames(array( + "body" => "admin/user_avatar_gallery.tpl") + ); + + $dir = @opendir("../" . $board_config['avatar_gallery_path']); + + $avatar_images = array(); + while( $file = @readdir($dir) ) + { + if( $file != "." && $file != ".." && !is_file(phpbb_realpath("./../" . $board_config['avatar_gallery_path'] . "/" . $file)) && !is_link(phpbb_realpath("./../" . $board_config['avatar_gallery_path'] . "/" . $file)) ) + { + $sub_dir = @opendir("../" . $board_config['avatar_gallery_path'] . "/" . $file); + + $avatar_row_count = 0; + $avatar_col_count = 0; + + while( $sub_file = @readdir($sub_dir) ) + { + if( preg_match("/(\.gif$|\.png$|\.jpg)$/is", $sub_file) ) + { + $avatar_images[$file][$avatar_row_count][$avatar_col_count] = $sub_file; + + $avatar_col_count++; + if( $avatar_col_count == 5 ) + { + $avatar_row_count++; + $avatar_col_count = 0; + } + } + } + } + } + + @closedir($dir); + + if( isset($HTTP_POST_VARS['avatarcategory']) ) + { + $category = htmlspecialchars($HTTP_POST_VARS['avatarcategory']); + } + else + { + list($category, ) = each($avatar_images); + } + @reset($avatar_images); + + $s_categories = ""; + while( list($key) = each($avatar_images) ) + { + $selected = ( $key == $category ) ? "selected=\"selected\"" : ""; + if( count($avatar_images[$key]) ) + { + $s_categories .= ''; + } + } + + $s_colspan = 0; + for($i = 0; $i < count($avatar_images[$category]); $i++) + { + $template->assign_block_vars("avatar_row", array()); + + $s_colspan = max($s_colspan, count($avatar_images[$category][$i])); + + for($j = 0; $j < count($avatar_images[$category][$i]); $j++) + { + $template->assign_block_vars("avatar_row.avatar_column", array( + "AVATAR_IMAGE" => "../" . $board_config['avatar_gallery_path'] . '/' . $category . '/' . $avatar_images[$category][$i][$j]) + ); + + $template->assign_block_vars("avatar_row.avatar_option_column", array( + "S_OPTIONS_AVATAR" => $avatar_images[$category][$i][$j]) + ); + } + } + + $coppa = ( ( !$HTTP_POST_VARS['coppa'] && !$HTTP_GET_VARS['coppa'] ) || $mode == "register") ? 0 : TRUE; + + $s_hidden_fields = ''; + $s_hidden_fields .= ''; + + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + + $template->assign_vars(array( + "L_USER_TITLE" => $lang['User_admin'], + "L_USER_EXPLAIN" => $lang['User_admin_explain'], + "L_AVATAR_GALLERY" => $lang['Avatar_gallery'], + "L_SELECT_AVATAR" => $lang['Select_avatar'], + "L_RETURN_PROFILE" => $lang['Return_profile'], + "L_CATEGORY" => $lang['Select_category'], + "L_GO" => $lang['Go'], + + "S_OPTIONS_CATEGORIES" => $s_categories, + "S_COLSPAN" => $s_colspan, + "S_PROFILE_ACTION" => append_sid("admin_users.$phpEx?mode=$mode"), + "S_HIDDEN_FIELDS" => $s_hidden_fields) + ); + } + } + else + { + $s_hidden_fields = ''; + $s_hidden_fields .= ''; + + if( !empty($user_avatar_local) ) + { + $s_hidden_fields .= ''; + } + + if( $user_avatar_type ) + { + switch( $user_avatar_type ) + { + case USER_AVATAR_UPLOAD: + $avatar = ''; + break; + case USER_AVATAR_REMOTE: + $avatar = ''; + break; + case USER_AVATAR_GALLERY: + $avatar = ''; + break; + } + } + else + { + $avatar = ""; + } + + $sql = "SELECT * FROM " . RANKS_TABLE . " + WHERE rank_special = 1 + ORDER BY rank_title"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain ranks data', '', __LINE__, __FILE__, $sql); + } + + $rank_select_box = ''; + while( $row = $db->sql_fetchrow($result) ) + { + $rank = $row['rank_title']; + $rank_id = $row['rank_id']; + + $selected = ( $this_userdata['user_rank'] == $rank_id ) ? ' selected="selected"' : ''; + $rank_select_box .= ''; + } + + $template->set_filenames(array( + "body" => "admin/user_edit_body.tpl") + ); + + // + // Let's do an overall check for settings/versions which would prevent + // us from doing file uploads.... + // + $ini_val = ( phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var'; + $form_enctype = ( !@$ini_val('file_uploads') || phpversion() == '4.0.4pl1' || !$board_config['allow_avatar_upload'] || ( phpversion() < '4.0.3' && @$ini_val('open_basedir') != '' ) ) ? '' : 'enctype="multipart/form-data"'; + + $template->assign_vars(array( + 'USERNAME' => $username, + 'EMAIL' => $email, + 'YIM' => $yim, + 'ICQ' => $icq, + 'MSN' => $msn, + 'AIM' => $aim, + 'OCCUPATION' => $occupation, + 'INTERESTS' => $interests, + 'LOCATION' => $location, + 'WEBSITE' => $website, + 'SIGNATURE' => str_replace('
', "\n", $signature), + 'VIEW_EMAIL_YES' => ($viewemail) ? 'checked="checked"' : '', + 'VIEW_EMAIL_NO' => (!$viewemail) ? 'checked="checked"' : '', + 'HIDE_USER_YES' => (!$allowviewonline) ? 'checked="checked"' : '', + 'HIDE_USER_NO' => ($allowviewonline) ? 'checked="checked"' : '', + 'NOTIFY_PM_YES' => ($notifypm) ? 'checked="checked"' : '', + 'NOTIFY_PM_NO' => (!$notifypm) ? 'checked="checked"' : '', + 'POPUP_PM_YES' => ($popuppm) ? 'checked="checked"' : '', + 'POPUP_PM_NO' => (!$popuppm) ? 'checked="checked"' : '', + 'ALWAYS_ADD_SIGNATURE_YES' => ($attachsig) ? 'checked="checked"' : '', + 'ALWAYS_ADD_SIGNATURE_NO' => (!$attachsig) ? 'checked="checked"' : '', + 'NOTIFY_REPLY_YES' => ( $notifyreply ) ? 'checked="checked"' : '', + 'NOTIFY_REPLY_NO' => ( !$notifyreply ) ? 'checked="checked"' : '', + 'ALWAYS_ALLOW_BBCODE_YES' => ($allowbbcode) ? 'checked="checked"' : '', + 'ALWAYS_ALLOW_BBCODE_NO' => (!$allowbbcode) ? 'checked="checked"' : '', + 'ALWAYS_ALLOW_HTML_YES' => ($allowhtml) ? 'checked="checked"' : '', + 'ALWAYS_ALLOW_HTML_NO' => (!$allowhtml) ? 'checked="checked"' : '', + 'ALWAYS_ALLOW_SMILIES_YES' => ($allowsmilies) ? 'checked="checked"' : '', + 'ALWAYS_ALLOW_SMILIES_NO' => (!$allowsmilies) ? 'checked="checked"' : '', + 'AVATAR' => $avatar, + 'LANGUAGE_SELECT' => language_select($user_lang), + 'TIMEZONE_SELECT' => tz_select($user_timezone), + 'STYLE_SELECT' => style_select($user_style, 'style'), + 'DATE_FORMAT' => $user_dateformat, + 'ALLOW_PM_YES' => ($user_allowpm) ? 'checked="checked"' : '', + 'ALLOW_PM_NO' => (!$user_allowpm) ? 'checked="checked"' : '', + 'ALLOW_AVATAR_YES' => ($user_allowavatar) ? 'checked="checked"' : '', + 'ALLOW_AVATAR_NO' => (!$user_allowavatar) ? 'checked="checked"' : '', + 'USER_ACTIVE_YES' => ($user_status) ? 'checked="checked"' : '', + 'USER_ACTIVE_NO' => (!$user_status) ? 'checked="checked"' : '', + 'RANK_SELECT_BOX' => $rank_select_box, + + 'L_USERNAME' => $lang['Username'], + 'L_USER_TITLE' => $lang['User_admin'], + 'L_USER_EXPLAIN' => $lang['User_admin_explain'], + 'L_NEW_PASSWORD' => $lang['New_password'], + 'L_PASSWORD_IF_CHANGED' => $lang['password_if_changed'], + 'L_CONFIRM_PASSWORD' => $lang['Confirm_password'], + 'L_PASSWORD_CONFIRM_IF_CHANGED' => $lang['password_confirm_if_changed'], + 'L_SUBMIT' => $lang['Submit'], + 'L_RESET' => $lang['Reset'], + 'L_ICQ_NUMBER' => $lang['ICQ'], + 'L_MESSENGER' => $lang['MSNM'], + 'L_YAHOO' => $lang['YIM'], + 'L_WEBSITE' => $lang['Website'], + 'L_AIM' => $lang['AIM'], + 'L_LOCATION' => $lang['Location'], + 'L_OCCUPATION' => $lang['Occupation'], + 'L_BOARD_LANGUAGE' => $lang['Board_lang'], + 'L_BOARD_STYLE' => $lang['Board_style'], + 'L_TIMEZONE' => $lang['Timezone'], + 'L_DATE_FORMAT' => $lang['Date_format'], + 'L_DATE_FORMAT_EXPLAIN' => $lang['Date_format_explain'], + 'L_YES' => $lang['Yes'], + 'L_NO' => $lang['No'], + 'L_INTERESTS' => $lang['Interests'], + 'L_ALWAYS_ALLOW_SMILIES' => $lang['Always_smile'], + 'L_ALWAYS_ALLOW_BBCODE' => $lang['Always_bbcode'], + 'L_ALWAYS_ALLOW_HTML' => $lang['Always_html'], + 'L_HIDE_USER' => $lang['Hide_user'], + 'L_ALWAYS_ADD_SIGNATURE' => $lang['Always_add_sig'], + + 'L_SPECIAL' => $lang['User_special'], + 'L_SPECIAL_EXPLAIN' => $lang['User_special_explain'], + 'L_USER_ACTIVE' => $lang['User_status'], + 'L_ALLOW_PM' => $lang['User_allowpm'], + 'L_ALLOW_AVATAR' => $lang['User_allowavatar'], + + 'L_AVATAR_PANEL' => $lang['Avatar_panel'], + 'L_AVATAR_EXPLAIN' => $lang['Admin_avatar_explain'], + 'L_DELETE_AVATAR' => $lang['Delete_Image'], + 'L_CURRENT_IMAGE' => $lang['Current_Image'], + 'L_UPLOAD_AVATAR_FILE' => $lang['Upload_Avatar_file'], + 'L_UPLOAD_AVATAR_URL' => $lang['Upload_Avatar_URL'], + 'L_AVATAR_GALLERY' => $lang['Select_from_gallery'], + 'L_SHOW_GALLERY' => $lang['View_avatar_gallery'], + 'L_LINK_REMOTE_AVATAR' => $lang['Link_remote_Avatar'], + + 'L_SIGNATURE' => $lang['Signature'], + 'L_SIGNATURE_EXPLAIN' => sprintf($lang['Signature_explain'], $board_config['max_sig_chars'] ), + 'L_NOTIFY_ON_PRIVMSG' => $lang['Notify_on_privmsg'], + 'L_NOTIFY_ON_REPLY' => $lang['Always_notify'], + 'L_POPUP_ON_PRIVMSG' => $lang['Popup_on_privmsg'], + 'L_PREFERENCES' => $lang['Preferences'], + 'L_PUBLIC_VIEW_EMAIL' => $lang['Public_view_email'], + 'L_ITEMS_REQUIRED' => $lang['Items_required'], + 'L_REGISTRATION_INFO' => $lang['Registration_info'], + 'L_PROFILE_INFO' => $lang['Profile_info'], + 'L_PROFILE_INFO_NOTICE' => $lang['Profile_info_warn'], + 'L_EMAIL_ADDRESS' => $lang['Email_address'], + 'S_FORM_ENCTYPE' => $form_enctype, + + 'HTML_STATUS' => $html_status, + 'BBCODE_STATUS' => sprintf($bbcode_status, '', ''), + 'SMILIES_STATUS' => $smilies_status, + + 'L_DELETE_USER' => $lang['User_delete'], + 'L_DELETE_USER_EXPLAIN' => $lang['User_delete_explain'], + 'L_SELECT_RANK' => $lang['Rank_title'], + + 'S_HIDDEN_FIELDS' => $s_hidden_fields, + 'S_PROFILE_ACTION' => append_sid("admin_users.$phpEx")) + ); + + if( file_exists(@phpbb_realpath('./../' . $board_config['avatar_path'])) && ($board_config['allow_avatar_upload'] == TRUE) ) + { + if ( $form_enctype != '' ) + { + $template->assign_block_vars('avatar_local_upload', array() ); + } + $template->assign_block_vars('avatar_remote_upload', array() ); + } + + if( file_exists(@phpbb_realpath('./../' . $board_config['avatar_gallery_path'])) && ($board_config['allow_avatar_local'] == TRUE) ) + { + $template->assign_block_vars('avatar_local_gallery', array() ); + } + + if( $board_config['allow_avatar_remote'] == TRUE ) + { + $template->assign_block_vars('avatar_remote_link', array() ); + } + } + + $template->pparse('body'); +} +else +{ + // + // Default user selection box + // + $template->set_filenames(array( + 'body' => 'admin/user_select_body.tpl') + ); + + $template->assign_vars(array( + 'L_USER_TITLE' => $lang['User_admin'], + 'L_USER_EXPLAIN' => $lang['User_admin_explain'], + 'L_USER_SELECT' => $lang['Select_a_User'], + 'L_LOOK_UP' => $lang['Look_up_user'], + 'L_FIND_USERNAME' => $lang['Find_username'], + + 'U_SEARCH_USER' => append_sid("./../search.$phpEx?mode=searchuser"), + + 'S_USER_ACTION' => append_sid("admin_users.$phpEx"), + 'S_USER_SELECT' => $select_list) + ); + $template->pparse('body'); + +} + +include('./page_footer_admin.'.$phpEx); + +?> \ No newline at end of file diff --git a/phpBB/admin/admin_words.php b/phpBB/admin/admin_words.php new file mode 100644 index 0000000000..2ffc06eb79 --- /dev/null +++ b/phpBB/admin/admin_words.php @@ -0,0 +1,273 @@ +set_filenames(array( + "body" => "admin/words_edit_body.tpl") + ); + + $word_info = array('word' => '', 'replacement' => ''); + $s_hidden_fields = ''; + + if( $mode == "edit" ) + { + if( $word_id ) + { + $sql = "SELECT * + FROM " . WORDS_TABLE . " + WHERE word_id = $word_id"; + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Could not query words table", "Error", __LINE__, __FILE__, $sql); + } + + $word_info = $db->sql_fetchrow($result); + $s_hidden_fields .= ''; + } + else + { + message_die(GENERAL_MESSAGE, $lang['No_word_selected']); + } + } + + $template->assign_vars(array( + "WORD" => htmlspecialchars($word_info['word']), + "REPLACEMENT" => htmlspecialchars($word_info['replacement']), + + "L_WORDS_TITLE" => $lang['Words_title'], + "L_WORDS_TEXT" => $lang['Words_explain'], + "L_WORD_CENSOR" => $lang['Edit_word_censor'], + "L_WORD" => $lang['Word'], + "L_REPLACEMENT" => $lang['Replacement'], + "L_SUBMIT" => $lang['Submit'], + + "S_WORDS_ACTION" => append_sid("admin_words.$phpEx"), + "S_HIDDEN_FIELDS" => $s_hidden_fields) + ); + + $template->pparse("body"); + + include('./page_footer_admin.'.$phpEx); + } + else if( $mode == "save" ) + { + $word_id = ( isset($HTTP_POST_VARS['id']) ) ? intval($HTTP_POST_VARS['id']) : 0; + $word = ( isset($HTTP_POST_VARS['word']) ) ? trim($HTTP_POST_VARS['word']) : ""; + $replacement = ( isset($HTTP_POST_VARS['replacement']) ) ? trim($HTTP_POST_VARS['replacement']) : ""; + + if($word == "" || $replacement == "") + { + message_die(GENERAL_MESSAGE, $lang['Must_enter_word']); + } + + if( $word_id ) + { + $sql = "UPDATE " . WORDS_TABLE . " + SET word = '" . str_replace("\'", "''", $word) . "', replacement = '" . str_replace("\'", "''", $replacement) . "' + WHERE word_id = $word_id"; + $message = $lang['Word_updated']; + } + else + { + $sql = "INSERT INTO " . WORDS_TABLE . " (word, replacement) + VALUES ('" . str_replace("\'", "''", $word) . "', '" . str_replace("\'", "''", $replacement) . "')"; + $message = $lang['Word_added']; + } + + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Could not insert data into words table", $lang['Error'], __LINE__, __FILE__, $sql); + } + + $message .= "

" . sprintf($lang['Click_return_wordadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + } + else if( $mode == "delete" ) + { + if( isset($HTTP_POST_VARS['id']) || isset($HTTP_GET_VARS['id']) ) + { + $word_id = ( isset($HTTP_POST_VARS['id']) ) ? $HTTP_POST_VARS['id'] : $HTTP_GET_VARS['id']; + $word_id = intval($word_id); + } + else + { + $word_id = 0; + } + + $confirm = isset($HTTP_POST_VARS['confirm']); + + if( $word_id && $confirm ) + { + $sql = "DELETE FROM " . WORDS_TABLE . " + WHERE word_id = $word_id"; + + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Could not remove data from words table", $lang['Error'], __LINE__, __FILE__, $sql); + } + + $message = $lang['Word_removed'] . "

" . sprintf($lang['Click_return_wordadmin'], "", "") . "

" . sprintf($lang['Click_return_admin_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + } + elseif( $word_id && !$confirm) + { + // Present the confirmation screen to the user + $template->set_filenames(array( + 'body' => 'admin/confirm_body.tpl') + ); + + $hidden_fields = ''; + + $template->assign_vars(array( + 'MESSAGE_TITLE' => $lang['Confirm'], + 'MESSAGE_TEXT' => $lang['Confirm_delete_word'], + + 'L_YES' => $lang['Yes'], + 'L_NO' => $lang['No'], + + 'S_CONFIRM_ACTION' => append_sid("admin_words.$phpEx"), + 'S_HIDDEN_FIELDS' => $hidden_fields) + ); + } + else + { + message_die(GENERAL_MESSAGE, $lang['No_word_selected']); + } + } +} +else +{ + $template->set_filenames(array( + "body" => "admin/words_list_body.tpl") + ); + + $sql = "SELECT * + FROM " . WORDS_TABLE . " + ORDER BY word"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Could not query words table", $lang['Error'], __LINE__, __FILE__, $sql); + } + + $word_rows = $db->sql_fetchrowset($result); + $db->sql_freeresult($result); + $word_count = count($word_rows); + + $template->assign_vars(array( + "L_WORDS_TITLE" => $lang['Words_title'], + "L_WORDS_TEXT" => $lang['Words_explain'], + "L_WORD" => $lang['Word'], + "L_REPLACEMENT" => $lang['Replacement'], + "L_EDIT" => $lang['Edit'], + "L_DELETE" => $lang['Delete'], + "L_ADD_WORD" => $lang['Add_new_word'], + "L_ACTION" => $lang['Action'], + + "S_WORDS_ACTION" => append_sid("admin_words.$phpEx"), + "S_HIDDEN_FIELDS" => '') + ); + + for($i = 0; $i < $word_count; $i++) + { + $word = $word_rows[$i]['word']; + $replacement = $word_rows[$i]['replacement']; + $word_id = $word_rows[$i]['word_id']; + + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $template->assign_block_vars("words", array( + "ROW_COLOR" => "#" . $row_color, + "ROW_CLASS" => $row_class, + "WORD" => htmlspecialchars($word), + "REPLACEMENT" => htmlspecialchars($replacement), + + "U_WORD_EDIT" => append_sid("admin_words.$phpEx?mode=edit&id=$word_id"), + "U_WORD_DELETE" => append_sid("admin_words.$phpEx?mode=delete&id=$word_id")) + ); + } +} + +$template->pparse("body"); + +include('./page_footer_admin.'.$phpEx); + +?> \ No newline at end of file diff --git a/phpBB/admin/index.php b/phpBB/admin/index.php new file mode 100644 index 0000000000..a530a2b3cf --- /dev/null +++ b/phpBB/admin/index.php @@ -0,0 +1,657 @@ +set_filenames(array( + "body" => "admin/index_navigate.tpl") + ); + + $template->assign_vars(array( + "U_FORUM_INDEX" => append_sid("../index.$phpEx"), + "U_ADMIN_INDEX" => append_sid("index.$phpEx?pane=right"), + + "L_FORUM_INDEX" => $lang['Main_index'], + "L_ADMIN_INDEX" => $lang['Admin_Index'], + "L_PREVIEW_FORUM" => $lang['Preview_forum']) + ); + + ksort($module); + + while( list($cat, $action_array) = each($module) ) + { + $cat = ( !empty($lang[$cat]) ) ? $lang[$cat] : preg_replace("/_/", " ", $cat); + + $template->assign_block_vars("catrow", array( + "ADMIN_CATEGORY" => $cat) + ); + + ksort($action_array); + + $row_count = 0; + while( list($action, $file) = each($action_array) ) + { + $row_color = ( !($row_count%2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action); + + $template->assign_block_vars("catrow.modulerow", array( + "ROW_COLOR" => "#" . $row_color, + "ROW_CLASS" => $row_class, + + "ADMIN_MODULE" => $action, + "U_ADMIN_MODULE" => append_sid($file)) + ); + $row_count++; + } + } + + $template->pparse("body"); + + include('./page_footer_admin.'.$phpEx); +} +elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' ) +{ + + include('./page_header_admin.'.$phpEx); + + $template->set_filenames(array( + "body" => "admin/index_body.tpl") + ); + + $template->assign_vars(array( + "L_WELCOME" => $lang['Welcome_phpBB'], + "L_ADMIN_INTRO" => $lang['Admin_intro'], + "L_FORUM_STATS" => $lang['Forum_stats'], + "L_WHO_IS_ONLINE" => $lang['Who_is_Online'], + "L_USERNAME" => $lang['Username'], + "L_LOCATION" => $lang['Location'], + "L_LAST_UPDATE" => $lang['Last_updated'], + "L_IP_ADDRESS" => $lang['IP_Address'], + "L_STATISTIC" => $lang['Statistic'], + "L_VALUE" => $lang['Value'], + "L_NUMBER_POSTS" => $lang['Number_posts'], + "L_POSTS_PER_DAY" => $lang['Posts_per_day'], + "L_NUMBER_TOPICS" => $lang['Number_topics'], + "L_TOPICS_PER_DAY" => $lang['Topics_per_day'], + "L_NUMBER_USERS" => $lang['Number_users'], + "L_USERS_PER_DAY" => $lang['Users_per_day'], + "L_BOARD_STARTED" => $lang['Board_started'], + "L_AVATAR_DIR_SIZE" => $lang['Avatar_dir_size'], + "L_DB_SIZE" => $lang['Database_size'], + "L_FORUM_LOCATION" => $lang['Forum_Location'], + "L_STARTED" => $lang['Login'], + "L_GZIP_COMPRESSION" => $lang['Gzip_compression']) + ); + + // + // Get forum statistics + // + $total_posts = get_db_stat('postcount'); + $total_users = get_db_stat('usercount'); + $total_topics = get_db_stat('topiccount'); + + $start_date = create_date($board_config['default_dateformat'], $board_config['board_startdate'], $board_config['board_timezone']); + + $boarddays = ( time() - $board_config['board_startdate'] ) / 86400; + + $posts_per_day = sprintf("%.2f", $total_posts / $boarddays); + $topics_per_day = sprintf("%.2f", $total_topics / $boarddays); + $users_per_day = sprintf("%.2f", $total_users / $boarddays); + + $avatar_dir_size = 0; + + if ($avatar_dir = @opendir($phpbb_root_path . $board_config['avatar_path'])) + { + while( $file = @readdir($avatar_dir) ) + { + if( $file != "." && $file != ".." ) + { + $avatar_dir_size += @filesize($phpbb_root_path . $board_config['avatar_path'] . "/" . $file); + } + } + @closedir($avatar_dir); + + // + // This bit of code translates the avatar directory size into human readable format + // Borrowed the code from the PHP.net annoted manual, origanally written by: + // Jesse (jesse@jess.on.ca) + // + if($avatar_dir_size >= 1048576) + { + $avatar_dir_size = round($avatar_dir_size / 1048576 * 100) / 100 . " MB"; + } + else if($avatar_dir_size >= 1024) + { + $avatar_dir_size = round($avatar_dir_size / 1024 * 100) / 100 . " KB"; + } + else + { + $avatar_dir_size = $avatar_dir_size . " Bytes"; + } + + } + else + { + // Couldn't open Avatar dir. + $avatar_dir_size = $lang['Not_available']; + } + + if($posts_per_day > $total_posts) + { + $posts_per_day = $total_posts; + } + + if($topics_per_day > $total_topics) + { + $topics_per_day = $total_topics; + } + + if($users_per_day > $total_users) + { + $users_per_day = $total_users; + } + + // + // DB size ... MySQL only + // + // This code is heavily influenced by a similar routine + // in phpMyAdmin 2.2.0 + // + if( preg_match("/^mysql/", SQL_LAYER) ) + { + $sql = "SELECT VERSION() AS mysql_version"; + if($result = $db->sql_query($sql)) + { + $row = $db->sql_fetchrow($result); + $version = $row['mysql_version']; + + if( preg_match("/^(3\.23|4\.|5\.)/", $version) ) + { + $db_name = ( preg_match("/^(3\.23\.[6-9])|(3\.23\.[1-9][1-9])|(4\.)|(5\.)/", $version) ) ? "`$dbname`" : $dbname; + + $sql = "SHOW TABLE STATUS + FROM " . $db_name; + if($result = $db->sql_query($sql)) + { + $tabledata_ary = $db->sql_fetchrowset($result); + + $dbsize = 0; + for($i = 0; $i < count($tabledata_ary); $i++) + { + if( $tabledata_ary[$i]['Type'] != "MRG_MyISAM" ) + { + if( $table_prefix != "" ) + { + if( strstr($tabledata_ary[$i]['Name'], $table_prefix) ) + { + $dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length']; + } + } + else + { + $dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length']; + } + } + } + } // Else we couldn't get the table status. + } + else + { + $dbsize = $lang['Not_available']; + } + } + else + { + $dbsize = $lang['Not_available']; + } + } + else if( preg_match("/^mssql/", SQL_LAYER) ) + { + $sql = "SELECT ((SUM(size) * 8.0) * 1024.0) as dbsize + FROM sysfiles"; + if( $result = $db->sql_query($sql) ) + { + $dbsize = ( $row = $db->sql_fetchrow($result) ) ? intval($row['dbsize']) : $lang['Not_available']; + } + else + { + $dbsize = $lang['Not_available']; + } + } + else + { + $dbsize = $lang['Not_available']; + } + + if ( is_integer($dbsize) ) + { + if( $dbsize >= 1048576 ) + { + $dbsize = sprintf("%.2f MB", ( $dbsize / 1048576 )); + } + else if( $dbsize >= 1024 ) + { + $dbsize = sprintf("%.2f KB", ( $dbsize / 1024 )); + } + else + { + $dbsize = sprintf("%.2f Bytes", $dbsize); + } + } + + $template->assign_vars(array( + "NUMBER_OF_POSTS" => $total_posts, + "NUMBER_OF_TOPICS" => $total_topics, + "NUMBER_OF_USERS" => $total_users, + "START_DATE" => $start_date, + "POSTS_PER_DAY" => $posts_per_day, + "TOPICS_PER_DAY" => $topics_per_day, + "USERS_PER_DAY" => $users_per_day, + "AVATAR_DIR_SIZE" => $avatar_dir_size, + "DB_SIZE" => $dbsize, + "GZIP_COMPRESSION" => ( $board_config['gzip_compress'] ) ? $lang['ON'] : $lang['OFF']) + ); + // + // End forum statistics + // + + // + // Get users online information. + // + $sql = "SELECT u.user_id, u.username, u.user_session_time, u.user_session_page, s.session_logged_in, s.session_ip, s.session_start + FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s + WHERE s.session_logged_in = " . TRUE . " + AND u.user_id = s.session_user_id + AND u.user_id <> " . ANONYMOUS . " + AND s.session_time >= " . ( time() - 300 ) . " + ORDER BY u.user_session_time DESC"; + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Couldn't obtain regd user/online information.", "", __LINE__, __FILE__, $sql); + } + $onlinerow_reg = $db->sql_fetchrowset($result); + + $sql = "SELECT session_page, session_logged_in, session_time, session_ip, session_start + FROM " . SESSIONS_TABLE . " + WHERE session_logged_in = 0 + AND session_time >= " . ( time() - 300 ) . " + ORDER BY session_time DESC"; + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Couldn't obtain guest user/online information.", "", __LINE__, __FILE__, $sql); + } + $onlinerow_guest = $db->sql_fetchrowset($result); + + $sql = "SELECT forum_name, forum_id + FROM " . FORUMS_TABLE; + if($forums_result = $db->sql_query($sql)) + { + while($forumsrow = $db->sql_fetchrow($forums_result)) + { + $forum_data[$forumsrow['forum_id']] = $forumsrow['forum_name']; + } + } + else + { + message_die(GENERAL_ERROR, "Couldn't obtain user/online forums information.", "", __LINE__, __FILE__, $sql); + } + + $reg_userid_ary = array(); + + if( count($onlinerow_reg) ) + { + $registered_users = 0; + + for($i = 0; $i < count($onlinerow_reg); $i++) + { + if( !inarray($onlinerow_reg[$i]['user_id'], $reg_userid_ary) ) + { + $reg_userid_ary[] = $onlinerow_reg[$i]['user_id']; + + $username = $onlinerow_reg[$i]['username']; + + if( $onlinerow_reg[$i]['user_allow_viewonline'] || $userdata['user_level'] == ADMIN ) + { + $registered_users++; + $hidden = FALSE; + } + else + { + $hidden_users++; + $hidden = TRUE; + } + + if( $onlinerow_reg[$i]['user_session_page'] < 1 ) + { + switch($onlinerow_reg[$i]['user_session_page']) + { + case PAGE_INDEX: + $location = $lang['Forum_index']; + $location_url = "index.$phpEx?pane=right"; + break; + case PAGE_POSTING: + $location = $lang['Posting_message']; + $location_url = "index.$phpEx?pane=right"; + break; + case PAGE_LOGIN: + $location = $lang['Logging_on']; + $location_url = "index.$phpEx?pane=right"; + break; + case PAGE_SEARCH: + $location = $lang['Searching_forums']; + $location_url = "index.$phpEx?pane=right"; + break; + case PAGE_PROFILE: + $location = $lang['Viewing_profile']; + $location_url = "index.$phpEx?pane=right"; + break; + case PAGE_VIEWONLINE: + $location = $lang['Viewing_online']; + $location_url = "index.$phpEx?pane=right"; + break; + case PAGE_VIEWMEMBERS: + $location = $lang['Viewing_member_list']; + $location_url = "index.$phpEx?pane=right"; + break; + case PAGE_PRIVMSGS: + $location = $lang['Viewing_priv_msgs']; + $location_url = "index.$phpEx?pane=right"; + break; + case PAGE_FAQ: + $location = $lang['Viewing_FAQ']; + $location_url = "index.$phpEx?pane=right"; + break; + default: + $location = $lang['Forum_index']; + $location_url = "index.$phpEx?pane=right"; + } + } + else + { + $location_url = append_sid("admin_forums.$phpEx?mode=editforum&" . POST_FORUM_URL . "=" . $onlinerow_reg[$i]['user_session_page']); + $location = $forum_data[$onlinerow_reg[$i]['user_session_page']]; + } + + $row_color = ( $registered_users % 2 ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( $registered_users % 2 ) ? $theme['td_class1'] : $theme['td_class2']; + + $reg_ip = decode_ip($onlinerow_reg[$i]['session_ip']); + + $template->assign_block_vars("reg_user_row", array( + "ROW_COLOR" => "#" . $row_color, + "ROW_CLASS" => $row_class, + "USERNAME" => $username, + "STARTED" => create_date($board_config['default_dateformat'], $onlinerow_reg[$i]['session_start'], $board_config['board_timezone']), + "LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_reg[$i]['user_session_time'], $board_config['board_timezone']), + "FORUM_LOCATION" => $location, + "IP_ADDRESS" => $reg_ip, + + "U_WHOIS_IP" => "http://network-tools.com/default.asp?host=$reg_ip", + "U_USER_PROFILE" => append_sid("admin_users.$phpEx?mode=edit&" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']), + "U_FORUM_LOCATION" => append_sid($location_url)) + ); + } + } + + } + else + { + $template->assign_vars(array( + "L_NO_REGISTERED_USERS_BROWSING" => $lang['No_users_browsing']) + ); + } + + // + // Guest users + // + if( count($onlinerow_guest) ) + { + $guest_users = 0; + + for($i = 0; $i < count($onlinerow_guest); $i++) + { + $guest_userip_ary[] = $onlinerow_guest[$i]['session_ip']; + $guest_users++; + + if( $onlinerow_guest[$i]['session_page'] < 1 ) + { + switch( $onlinerow_guest[$i]['session_page'] ) + { + case PAGE_INDEX: + $location = $lang['Forum_index']; + $location_url = "index.$phpEx?pane=right"; + break; + case PAGE_POSTING: + $location = $lang['Posting_message']; + $location_url = "index.$phpEx?pane=right"; + break; + case PAGE_LOGIN: + $location = $lang['Logging_on']; + $location_url = "index.$phpEx?pane=right"; + break; + case PAGE_SEARCH: + $location = $lang['Searching_forums']; + $location_url = "index.$phpEx?pane=right"; + break; + case PAGE_PROFILE: + $location = $lang['Viewing_profile']; + $location_url = "index.$phpEx?pane=right"; + break; + case PAGE_VIEWONLINE: + $location = $lang['Viewing_online']; + $location_url = "index.$phpEx?pane=right"; + break; + case PAGE_VIEWMEMBERS: + $location = $lang['Viewing_member_list']; + $location_url = "index.$phpEx?pane=right"; + break; + case PAGE_PRIVMSGS: + $location = $lang['Viewing_priv_msgs']; + $location_url = "index.$phpEx?pane=right"; + break; + case PAGE_FAQ: + $location = $lang['Viewing_FAQ']; + $location_url = "index.$phpEx?pane=right"; + break; + default: + $location = $lang['Forum_index']; + $location_url = "index.$phpEx?pane=right"; + } + } + else + { + $location_url = append_sid("admin_forums.$phpEx?mode=editforum&" . POST_FORUM_URL . "=" . $onlinerow_guest[$i]['session_page']); + $location = $forum_data[$onlinerow_guest[$i]['session_page']]; + } + + $row_color = ( $guest_users % 2 ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( $guest_users % 2 ) ? $theme['td_class1'] : $theme['td_class2']; + + $guest_ip = decode_ip($onlinerow_guest[$i]['session_ip']); + + $template->assign_block_vars("guest_user_row", array( + "ROW_COLOR" => "#" . $row_color, + "ROW_CLASS" => $row_class, + "USERNAME" => $lang['Guest'], + "STARTED" => create_date($board_config['default_dateformat'], $onlinerow_guest[$i]['session_start'], $board_config['board_timezone']), + "LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_guest[$i]['session_time'], $board_config['board_timezone']), + "FORUM_LOCATION" => $location, + "IP_ADDRESS" => $guest_ip, + + "U_WHOIS_IP" => "http://network-tools.com/default.asp?host=$guest_ip", + "U_FORUM_LOCATION" => append_sid($location_url)) + ); + } + + } + else + { + $template->assign_vars(array( + "L_NO_GUESTS_BROWSING" => $lang['No_users_browsing']) + ); + } + + // Check for new version + $current_version = explode('.', '2' . $board_config['version']); + $minor_revision = (int) $current_version[2]; + + $errno = 0; + $errstr = $version_info = ''; + + if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr, 10)) + { + @fputs($fsock, "GET /updatecheck/20x.txt HTTP/1.1\r\n"); + @fputs($fsock, "HOST: www.phpbb.com\r\n"); + @fputs($fsock, "Connection: close\r\n\r\n"); + + $get_info = false; + while (!@feof($fsock)) + { + if ($get_info) + { + $version_info .= @fread($fsock, 1024); + } + else + { + if (@fgets($fsock, 1024) == "\r\n") + { + $get_info = true; + } + } + } + @fclose($fsock); + + $version_info = explode("\n", $version_info); + $latest_head_revision = (int) $version_info[0]; + $latest_minor_revision = (int) $version_info[2]; + $latest_version = (int) $version_info[0] . '.' . (int) $version_info[1] . '.' . (int) $version_info[2]; + + if ($latest_head_revision == 2 && $minor_revision == $latest_minor_revision) + { + $version_info = '

' . $lang['Version_up_to_date'] . '

'; + } + else + { + $version_info = '

' . $lang['Version_not_up_to_date']; + $version_info .= '
' . sprintf($lang['Latest_version_info'], $latest_version) . ' ' . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '

'; + } + } + else + { + if ($errstr) + { + $version_info = '

' . sprintf($lang['Connect_socket_error'], $errstr) . '

'; + } + else + { + $version_info = '

' . $lang['Socket_functions_disabled'] . '

'; + } + } + + $version_info .= '

' . $lang['Mailing_list_subscribe_reminder'] . '

'; + + + $template->assign_vars(array( + 'VERSION_INFO' => $version_info, + 'L_VERSION_INFORMATION' => $lang['Version_information']) + ); + + $template->pparse("body"); + + include('./page_footer_admin.'.$phpEx); + +} +else +{ + // + // Generate frameset + // + $template->set_filenames(array( + "body" => "admin/index_frameset.tpl") + ); + + $template->assign_vars(array( + "S_FRAME_NAV" => append_sid("index.$phpEx?pane=left"), + "S_FRAME_MAIN" => append_sid("index.$phpEx?pane=right")) + ); + + header ("Expires: " . gmdate("D, d M Y H:i:s", time()) . " GMT"); + header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); + + $template->pparse("body"); + + $db->sql_close(); + exit; + +} + +?> \ No newline at end of file diff --git a/phpBB/admin/page_footer_admin.php b/phpBB/admin/page_footer_admin.php new file mode 100644 index 0000000000..2b55349b7d --- /dev/null +++ b/phpBB/admin/page_footer_admin.php @@ -0,0 +1,75 @@ +set_filenames(array( + 'page_footer' => 'admin/page_footer.tpl') +); + +$template->assign_vars(array( + 'PHPBB_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '', + 'TRANSLATION_INFO' => (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : '')) +); + +$template->pparse('page_footer'); + +// +// Close our DB connection. +// +$db->sql_close(); + +// +// Compress buffered output if required +// and send to browser +// +if( $do_gzip_compress ) +{ + // + // Borrowed from php.net! + // + $gzip_contents = ob_get_contents(); + ob_end_clean(); + + $gzip_size = strlen($gzip_contents); + $gzip_crc = crc32($gzip_contents); + + $gzip_contents = gzcompress($gzip_contents, 9); + $gzip_contents = substr($gzip_contents, 0, strlen($gzip_contents) - 4); + + echo "\x1f\x8b\x08\x00\x00\x00\x00\x00"; + echo $gzip_contents; + echo pack('V', $gzip_crc); + echo pack('V', $gzip_size); +} + +exit; + +?> \ No newline at end of file diff --git a/phpBB/admin/page_header_admin.php b/phpBB/admin/page_header_admin.php new file mode 100644 index 0000000000..3f8435405b --- /dev/null +++ b/phpBB/admin/page_header_admin.php @@ -0,0 +1,150 @@ += '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) ) + { + if ( extension_loaded('zlib') ) + { + ob_start('ob_gzhandler'); + } + } + else if ( $phpver > '4.0' ) + { + if ( strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip') ) + { + if ( extension_loaded('zlib') ) + { + $do_gzip_compress = TRUE; + ob_start(); + ob_implicit_flush(0); + + header('Content-Encoding: gzip'); + } + } + } +} + +$template->set_filenames(array( + 'header' => 'admin/page_header.tpl') +); + +// Format Timezone. We are unable to use array_pop here, because of PHP3 compatibility +$l_timezone = explode('.', $board_config['board_timezone']); +$l_timezone = (count($l_timezone) > 1 && $l_timezone[count($l_timezone)-1] != 0) ? $lang[sprintf('%.1f', $board_config['board_timezone'])] : $lang[number_format($board_config['board_timezone'])]; + +// +// The following assigns all _common_ variables that may be used at any point +// in a template. Note that all URL's should be wrapped in append_sid, as +// should all S_x_ACTIONS for forms. +// +$template->assign_vars(array( + 'SITENAME' => $board_config['sitename'], + 'PAGE_TITLE' => $page_title, + + 'L_ADMIN' => $lang['Admin'], + 'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']), + 'L_FAQ' => $lang['FAQ'], + + 'U_INDEX' => append_sid('../index.'.$phpEx), + + 'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone), + 'S_LOGIN_ACTION' => append_sid('../login.'.$phpEx), + 'S_JUMPBOX_ACTION' => append_sid('../viewforum.'.$phpEx), + 'S_CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), + 'S_CONTENT_DIRECTION' => $lang['DIRECTION'], + 'S_CONTENT_ENCODING' => $lang['ENCODING'], + 'S_CONTENT_DIR_LEFT' => $lang['LEFT'], + 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], + + 'T_HEAD_STYLESHEET' => $theme['head_stylesheet'], + 'T_BODY_BACKGROUND' => $theme['body_background'], + 'T_BODY_BGCOLOR' => '#'.$theme['body_bgcolor'], + 'T_BODY_TEXT' => '#'.$theme['body_text'], + 'T_BODY_LINK' => '#'.$theme['body_link'], + 'T_BODY_VLINK' => '#'.$theme['body_vlink'], + 'T_BODY_ALINK' => '#'.$theme['body_alink'], + 'T_BODY_HLINK' => '#'.$theme['body_hlink'], + 'T_TR_COLOR1' => '#'.$theme['tr_color1'], + 'T_TR_COLOR2' => '#'.$theme['tr_color2'], + 'T_TR_COLOR3' => '#'.$theme['tr_color3'], + 'T_TR_CLASS1' => $theme['tr_class1'], + 'T_TR_CLASS2' => $theme['tr_class2'], + 'T_TR_CLASS3' => $theme['tr_class3'], + 'T_TH_COLOR1' => '#'.$theme['th_color1'], + 'T_TH_COLOR2' => '#'.$theme['th_color2'], + 'T_TH_COLOR3' => '#'.$theme['th_color3'], + 'T_TH_CLASS1' => $theme['th_class1'], + 'T_TH_CLASS2' => $theme['th_class2'], + 'T_TH_CLASS3' => $theme['th_class3'], + 'T_TD_COLOR1' => '#'.$theme['td_color1'], + 'T_TD_COLOR2' => '#'.$theme['td_color2'], + 'T_TD_COLOR3' => '#'.$theme['td_color3'], + 'T_TD_CLASS1' => $theme['td_class1'], + 'T_TD_CLASS2' => $theme['td_class2'], + 'T_TD_CLASS3' => $theme['td_class3'], + 'T_FONTFACE1' => $theme['fontface1'], + 'T_FONTFACE2' => $theme['fontface2'], + 'T_FONTFACE3' => $theme['fontface3'], + 'T_FONTSIZE1' => $theme['fontsize1'], + 'T_FONTSIZE2' => $theme['fontsize2'], + 'T_FONTSIZE3' => $theme['fontsize3'], + 'T_FONTCOLOR1' => '#'.$theme['fontcolor1'], + 'T_FONTCOLOR2' => '#'.$theme['fontcolor2'], + 'T_FONTCOLOR3' => '#'.$theme['fontcolor3'], + 'T_SPAN_CLASS1' => $theme['span_class1'], + 'T_SPAN_CLASS2' => $theme['span_class2'], + 'T_SPAN_CLASS3' => $theme['span_class3']) +); + +// Work around for "current" Apache 2 + PHP module which seems to not +// cope with private cache control setting +if (!empty($HTTP_SERVER_VARS['SERVER_SOFTWARE']) && strstr($HTTP_SERVER_VARS['SERVER_SOFTWARE'], 'Apache/2')) +{ + header ('Cache-Control: no-cache, pre-check=0, post-check=0'); +} +else +{ + header ('Cache-Control: private, pre-check=0, post-check=0, max-age=0'); +} +header ('Expires: 0'); +header ('Pragma: no-cache'); + +$template->pparse('header'); + +?> diff --git a/phpBB/admin/pagestart.php b/phpBB/admin/pagestart.php new file mode 100644 index 0000000000..2db4ad903d --- /dev/null +++ b/phpBB/admin/pagestart.php @@ -0,0 +1,67 @@ + \ No newline at end of file diff --git a/phpBB/cache/.htaccess b/phpBB/cache/.htaccess deleted file mode 100644 index aa5afc1640..0000000000 --- a/phpBB/cache/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ - - Order Allow,Deny - Deny from All - \ No newline at end of file diff --git a/phpBB/common.php b/phpBB/common.php index b91fd01706..618a1b0105 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -1,228 +1,236 @@ = '5.0.0' && (!@ini_get('register_long_arrays') || @ini_get('register_long_arrays') == '0' || strtolower(@ini_get('register_long_arrays')) == 'off')) { - $not_unset = array( - 'GLOBALS' => true, - '_GET' => true, - '_POST' => true, - '_COOKIE' => true, - '_REQUEST' => true, - '_SERVER' => true, - '_SESSION' => true, - '_ENV' => true, - '_FILES' => true, - 'phpEx' => true, - 'phpbb_root_path' => true - ); + $HTTP_POST_VARS = $_POST; + $HTTP_GET_VARS = $_GET; + $HTTP_SERVER_VARS = $_SERVER; + $HTTP_COOKIE_VARS = $_COOKIE; + $HTTP_ENV_VARS = $_ENV; + $HTTP_POST_FILES = $_FILES; - // Not only will array_merge and array_keys give a warning if - // a parameter is not an array, array_merge will actually fail. - // So we check if _SESSION has been initialised. - if (!isset($_SESSION) || !is_array($_SESSION)) + // _SESSION is the only superglobal which is conditionally set + if (isset($_SESSION)) { - $_SESSION = array(); + $HTTP_SESSION_VARS = $_SESSION; + } +} + +// Protect against GLOBALS tricks +if (isset($HTTP_POST_VARS['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($HTTP_GET_VARS['GLOBALS']) || isset($HTTP_COOKIE_VARS['GLOBALS'])) +{ + die("Hacking attempt"); +} + +// Protect against HTTP_SESSION_VARS tricks +if (isset($HTTP_SESSION_VARS) && !is_array($HTTP_SESSION_VARS)) +{ + die("Hacking attempt"); +} + +if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') +{ + // PHP4+ path + $not_unset = array('HTTP_GET_VARS', 'HTTP_POST_VARS', 'HTTP_COOKIE_VARS', 'HTTP_SERVER_VARS', 'HTTP_SESSION_VARS', 'HTTP_ENV_VARS', 'HTTP_POST_FILES', 'phpEx', 'phpbb_root_path'); + + // Not only will array_merge give a warning if a parameter + // is not an array, it will actually fail. So we check if + // HTTP_SESSION_VARS has been initialised. + if (!isset($HTTP_SESSION_VARS) || !is_array($HTTP_SESSION_VARS)) + { + $HTTP_SESSION_VARS = array(); } - // Merge all into one extremely huge array; unset this later - $input = array_merge( - array_keys($_GET), - array_keys($_POST), - array_keys($_COOKIE), - array_keys($_SERVER), - array_keys($_SESSION), - array_keys($_ENV), - array_keys($_FILES) - ); + // Merge all into one extremely huge array; unset + // this later + $input = array_merge($HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_COOKIE_VARS, $HTTP_SERVER_VARS, $HTTP_SESSION_VARS, $HTTP_ENV_VARS, $HTTP_POST_FILES); - foreach ($input as $varname) + unset($input['input']); + unset($input['not_unset']); + + while (list($var,) = @each($input)) { - if (isset($not_unset[$varname])) + if (in_array($var, $not_unset)) { - // Hacking attempt. No point in continuing unless it's a COOKIE - if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) - { - exit; - } - else - { - $cookie = &$_COOKIE; - while (isset($cookie['GLOBALS'])) - { - foreach ($cookie['GLOBALS'] as $registered_var => $value) - { - if (!isset($not_unset[$registered_var])) - { - unset($GLOBALS[$registered_var]); - } - } - $cookie = &$cookie['GLOBALS']; - } - } + die('Hacking attempt!'); } - - unset($GLOBALS[$varname]); + unset($$var); } unset($input); } -// If we are on PHP >= 6.0.0 we do not need some code -if (version_compare(PHP_VERSION, '6.0.0-dev', '>=')) +// +// addslashes to vars if magic_quotes_gpc is off +// this is a security precaution to prevent someone +// trying to break out of a SQL statement. +// +if( !get_magic_quotes_gpc() ) { - /** - * @ignore - */ - define('STRIP', false); -} -else -{ - set_magic_quotes_runtime(0); - - // Be paranoid with passed vars - if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get')) + if( is_array($HTTP_GET_VARS) ) { - deregister_globals(); - } - - define('STRIP', (get_magic_quotes_gpc()) ? true : false); -} - -if (defined('IN_CRON')) -{ - $phpbb_root_path = dirname(__FILE__) . DIRECTORY_SEPARATOR; -} - -if (!file_exists($phpbb_root_path . 'config.' . $phpEx)) -{ - die("

The config.$phpEx file could not be found.

Click here to install phpBB

"); -} - -require($phpbb_root_path . 'config.' . $phpEx); - -if (!defined('PHPBB_INSTALLED')) -{ - // Redirect the user to the installer - // We have to generate a full HTTP/1.1 header here since we can't guarantee to have any of the information - // available as used by the redirect function - $server_name = (!empty($_SERVER['HTTP_HOST'])) ? strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME')); - $server_port = (!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT'); - $secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0; - - $script_name = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : getenv('PHP_SELF'); - if (!$script_name) - { - $script_name = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : getenv('REQUEST_URI'); - } - - // Replace any number of consecutive backslashes and/or slashes with a single slash - // (could happen on some proxy setups and/or Windows servers) - $script_path = trim(dirname($script_name)) . '/install/index.' . $phpEx; - $script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path); - - $url = (($secure) ? 'https://' : 'http://') . $server_name; - - if ($server_port && (($secure && $server_port <> 443) || (!$secure && $server_port <> 80))) - { - // HTTP HOST can carry a port number... - if (strpos($server_name, ':') === false) + while( list($k, $v) = each($HTTP_GET_VARS) ) { - $url .= ':' . $server_port; + if( is_array($HTTP_GET_VARS[$k]) ) + { + while( list($k2, $v2) = each($HTTP_GET_VARS[$k]) ) + { + $HTTP_GET_VARS[$k][$k2] = addslashes($v2); + } + @reset($HTTP_GET_VARS[$k]); + } + else + { + $HTTP_GET_VARS[$k] = addslashes($v); + } } + @reset($HTTP_GET_VARS); } - $url .= $script_path; - header('Location: ' . $url); + if( is_array($HTTP_POST_VARS) ) + { + while( list($k, $v) = each($HTTP_POST_VARS) ) + { + if( is_array($HTTP_POST_VARS[$k]) ) + { + while( list($k2, $v2) = each($HTTP_POST_VARS[$k]) ) + { + $HTTP_POST_VARS[$k][$k2] = addslashes($v2); + } + @reset($HTTP_POST_VARS[$k]); + } + else + { + $HTTP_POST_VARS[$k] = addslashes($v); + } + } + @reset($HTTP_POST_VARS); + } + + if( is_array($HTTP_COOKIE_VARS) ) + { + while( list($k, $v) = each($HTTP_COOKIE_VARS) ) + { + if( is_array($HTTP_COOKIE_VARS[$k]) ) + { + while( list($k2, $v2) = each($HTTP_COOKIE_VARS[$k]) ) + { + $HTTP_COOKIE_VARS[$k][$k2] = addslashes($v2); + } + @reset($HTTP_COOKIE_VARS[$k]); + } + else + { + $HTTP_COOKIE_VARS[$k] = addslashes($v); + } + } + @reset($HTTP_COOKIE_VARS); + } +} + +// +// Define some basic configuration arrays this also prevents +// malicious rewriting of language and otherarray values via +// URI params +// +$board_config = array(); +$userdata = array(); +$theme = array(); +$images = array(); +$lang = array(); +$nav_links = array(); +$dss_seeded = false; +$gen_simple_header = FALSE; + +include($phpbb_root_path . 'config.'.$phpEx); + +if( !defined("PHPBB_INSTALLED") ) +{ + header('Location: ' . $phpbb_root_path . 'install/install.' . $phpEx); exit; } -if (defined('DEBUG_EXTRA')) -{ - $base_memory_usage = 0; - if (function_exists('memory_get_usage')) - { - $base_memory_usage = memory_get_usage(); - } -} - -// Load Extensions -if (!empty($load_extensions)) -{ - $load_extensions = explode(',', $load_extensions); - - foreach ($load_extensions as $extension) - { - @dl(trim($extension)); - } -} - -// Include files -require($phpbb_root_path . 'includes/acm/acm_' . $acm_type . '.' . $phpEx); -require($phpbb_root_path . 'includes/cache.' . $phpEx); -require($phpbb_root_path . 'includes/template.' . $phpEx); -require($phpbb_root_path . 'includes/session.' . $phpEx); -require($phpbb_root_path . 'includes/auth.' . $phpEx); - -require($phpbb_root_path . 'includes/functions.' . $phpEx); -require($phpbb_root_path . 'includes/functions_content.' . $phpEx); - -require($phpbb_root_path . 'includes/constants.' . $phpEx); -require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); -require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); - -// Set PHP error handler to ours -set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler'); - -// Instantiate some basic classes -$user = new user(); -$auth = new auth(); -$template = new template(); -$cache = new acm(); -$db = new $sql_db(); - -// Connect to DB -$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, defined('PHPBB_DB_NEW_LINK') ? PHPBB_DB_NEW_LINK : false); +include($phpbb_root_path . 'includes/constants.'.$phpEx); +include($phpbb_root_path . 'includes/template.'.$phpEx); +include($phpbb_root_path . 'includes/sessions.'.$phpEx); +include($phpbb_root_path . 'includes/auth.'.$phpEx); +include($phpbb_root_path . 'includes/functions.'.$phpEx); +include($phpbb_root_path . 'includes/db.'.$phpEx); // We do not need this any longer, unset for safety purposes unset($dbpasswd); -// Grab global variables, re-cache if necessary -$config = cache::obtain_config(); +// +// Obtain and encode users IP +// +// I'm removing HTTP_X_FORWARDED_FOR ... this may well cause other problems such as +// private range IP's appearing instead of the guilty routable IP, tough, don't +// even bother complaining ... go scream and shout at the idiots out there who feel +// "clever" is doing harm rather than good ... karma is a great thing ... :) +// +$client_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : getenv('REMOTE_ADDR') ); +$user_ip = encode_ip($client_ip); -// Add own hook handler -require($phpbb_root_path . 'includes/hooks/index.' . $phpEx); -$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display'))); - -foreach (cache::obtain_hooks() as $hook) +// +// Setup forum wide options, if this fails +// then we output a CRITICAL_ERROR since +// basic forum information is not available +// +$sql = "SELECT * + FROM " . CONFIG_TABLE; +if( !($result = $db->sql_query($sql)) ) { - @include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx); + message_die(CRITICAL_ERROR, "Could not query config information", "", __LINE__, __FILE__, $sql); +} + +while ( $row = $db->sql_fetchrow($result) ) +{ + $board_config[$row['config_name']] = $row['config_value']; +} + +if (file_exists('install') || file_exists('contrib')) +{ + message_die(GENERAL_MESSAGE, 'Please_remove_install_contrib'); +} + +// +// Show 'Board is disabled' message if needed. +// +if( $board_config['board_disable'] && !defined("IN_ADMIN") && !defined("IN_LOGIN") ) +{ + message_die(GENERAL_MESSAGE, 'Board_disable', 'Information'); } ?> \ No newline at end of file diff --git a/phpBB/cron.php b/phpBB/cron.php deleted file mode 100644 index 3993a149b5..0000000000 --- a/phpBB/cron.php +++ /dev/null @@ -1,287 +0,0 @@ -session_begin(false); -$auth->acl($user->data); - -$cron_type = request_var('cron_type', ''); -$use_shutdown_function = (@function_exists('register_shutdown_function')) ? true : false; - -// Output transparent gif -header('Cache-Control: no-cache'); -header('Content-type: image/gif'); -header('Content-length: 43'); - -echo base64_decode('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=='); - -// test without flush ;) -// flush(); - -// -if (!isset($config['cron_lock'])) -{ - set_config('cron_lock', '0', true); -} - -// make sure cron doesn't run multiple times in parallel -if ($config['cron_lock']) -{ - // if the other process is running more than an hour already we have to assume it - // aborted without cleaning the lock - $time = explode(' ', $config['cron_lock']); - $time = $time[0]; - - if ($time + 3600 >= time()) - { - exit; - } -} - -define('CRON_ID', time() . ' ' . unique_id()); - -$sql = 'UPDATE ' . CONFIG_TABLE . " - SET config_value = '" . $db->sql_escape(CRON_ID) . "' - WHERE config_name = 'cron_lock' AND config_value = '" . $db->sql_escape($config['cron_lock']) . "'"; -$db->sql_query($sql); - -// another cron process altered the table between script start and UPDATE query so exit -if ($db->sql_affectedrows() != 1) -{ - exit; -} - -/** -* Run cron-like action -* Real cron-based layer will be introduced in 3.2 -*/ -switch ($cron_type) -{ - case 'queue': - - if (time() - $config['queue_interval'] <= $config['last_queue_run'] || !file_exists($phpbb_root_path . 'cache/queue.' . $phpEx)) - { - break; - } - - // A user reported using the mail() function while using shutdown does not work. We do not want to risk that. - if ($use_shutdown_function && !$config['smtp_delivery']) - { - $use_shutdown_function = false; - } - - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - $queue = new queue(); - - if ($use_shutdown_function) - { - register_shutdown_function(array(&$queue, 'process')); - } - else - { - $queue->process(); - } - - break; - - case 'tidy_cache': - - if (time() - $config['cache_gc'] <= $config['cache_last_gc'] || !method_exists($cache, 'tidy')) - { - break; - } - - if ($use_shutdown_function) - { - register_shutdown_function(array(&$cache, 'tidy')); - } - else - { - $cache->tidy(); - } - - break; - - case 'tidy_search': - - // Select the search method - $search_type = basename($config['search_type']); - - if (time() - $config['search_gc'] <= $config['search_last_gc'] || !file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx)) - { - break; - } - - include_once("{$phpbb_root_path}includes/search/$search_type.$phpEx"); - - // We do some additional checks in the module to ensure it can actually be utilised - $error = false; - $search = new $search_type($error); - - if ($error) - { - break; - } - - if ($use_shutdown_function) - { - register_shutdown_function(array(&$search, 'tidy')); - } - else - { - $search->tidy(); - } - - break; - - case 'tidy_warnings': - - if (time() - $config['warnings_gc'] <= $config['warnings_last_gc']) - { - break; - } - - include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); - - if ($use_shutdown_function) - { - register_shutdown_function('tidy_warnings'); - } - else - { - tidy_warnings(); - } - - break; - - case 'tidy_database': - - if (time() - $config['database_gc'] <= $config['database_last_gc']) - { - break; - } - - include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); - - if ($use_shutdown_function) - { - register_shutdown_function('tidy_database'); - } - else - { - tidy_database(); - } - - break; - - case 'tidy_sessions': - - if (time() - $config['session_gc'] <= $config['session_last_gc']) - { - break; - } - - if ($use_shutdown_function) - { - register_shutdown_function(array(&$user, 'session_gc')); - } - else - { - $user->session_gc(); - } - - break; - - case 'prune_forum': - - $forum_id = request_var('f', 0); - - $sql = 'SELECT forum_id, prune_next, enable_prune, prune_days, prune_viewed, forum_flags, prune_freq - FROM ' . FORUMS_TABLE . " - WHERE forum_id = $forum_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - break; - } - - // Do the forum Prune thang - if ($row['prune_next'] < time() && $row['enable_prune']) - { - include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); - - if ($row['prune_days']) - { - if ($use_shutdown_function) - { - register_shutdown_function('auto_prune', $row['forum_id'], 'posted', $row['forum_flags'], $row['prune_days'], $row['prune_freq']); - } - else - { - auto_prune($row['forum_id'], 'posted', $row['forum_flags'], $row['prune_days'], $row['prune_freq']); - } - } - - if ($row['prune_viewed']) - { - if ($use_shutdown_function) - { - register_shutdown_function('auto_prune', $row['forum_id'], 'viewed', $row['forum_flags'], $row['prune_viewed'], $row['prune_freq']); - } - else - { - auto_prune($row['forum_id'], 'viewed', $row['forum_flags'], $row['prune_viewed'], $row['prune_freq']); - } - } - } - - break; -} - -// Unloading cache and closing db after having done the dirty work. -if ($use_shutdown_function) -{ - register_shutdown_function('unlock_cron'); - register_shutdown_function('garbage_collection'); -} -else -{ - unlock_cron(); - garbage_collection(); -} - -exit; - - -/** -* Unlock cron script -*/ -function unlock_cron() -{ - global $db; - - $sql = 'UPDATE ' . CONFIG_TABLE . " - SET config_value = '0' - WHERE config_name = 'cron_lock' AND config_value = '" . $db->sql_escape(CRON_ID) . "'"; - $db->sql_query($sql); -} - -?> \ No newline at end of file diff --git a/phpBB/db/db2.php b/phpBB/db/db2.php new file mode 100644 index 0000000000..da471841c1 --- /dev/null +++ b/phpBB/db/db2.php @@ -0,0 +1,421 @@ +persistency = $persistency; + $this->user = $sqluser; + $this->password = $sqlpassword; + $this->dbname = $database; + + $this->server = $sqlserver; + + if($this->persistency) + { + $this->db_connect_id = odbc_pconnect($this->server, "", ""); + } + else + { + $this->db_connect_id = odbc_connect($this->server, "", ""); + } + + if($this->db_connect_id) + { + @odbc_autocommit($this->db_connect_id, off); + + return $this->db_connect_id; + } + else + { + return false; + } + } + // + // Other base methods + // + function sql_close() + { + if($this->db_connect_id) + { + if($this->query_result) + { + @odbc_free_result($this->query_result); + } + $result = @odbc_close($this->db_connect_id); + return $result; + } + else + { + return false; + } + } + + + // + // Query method + // + function sql_query($query = "", $transaction = FALSE) + { + // + // Remove any pre-existing queries + // + unset($this->query_result); + unset($this->row); + if($query != "") + { + $this->num_queries++; + + if(!eregi("^INSERT ",$query)) + { + if(eregi("LIMIT", $query)) + { + preg_match("/^(.*)LIMIT ([0-9]+)[, ]*([0-9]+)*/s", $query, $limits); + + $query = $limits[1]; + if($limits[3]) + { + $row_offset = $limits[2]; + $num_rows = $limits[3]; + } + else + { + $row_offset = 0; + $num_rows = $limits[2]; + } + + $query .= " FETCH FIRST ".($row_offset+$num_rows)." ROWS ONLY OPTIMIZE FOR ".($row_offset+$num_rows)." ROWS"; + + $this->query_result = odbc_exec($this->db_connect_id, $query); + + $query_limit_offset = $row_offset; + $this->result_numrows[$this->query_result] = $num_rows; + } + else + { + $this->query_result = odbc_exec($this->db_connect_id, $query); + + $row_offset = 0; + $this->result_numrows[$this->query_result] = 5E6; + } + + $result_id = $this->query_result; + if($this->query_result && eregi("^SELECT", $query)) + { + + for($i = 1; $i < odbc_num_fields($result_id)+1; $i++) + { + $this->result_field_names[$result_id][] = odbc_field_name($result_id, $i); + } + + $i = $row_offset + 1; + $k = 0; + while(odbc_fetch_row($result_id, $i) && $k < $this->result_numrows[$result_id]) + { + + for($j = 1; $j < count($this->result_field_names[$result_id])+1; $j++) + { + $this->result_rowset[$result_id][$k][$this->result_field_names[$result_id][$j-1]] = odbc_result($result_id, $j); + } + $i++; + $k++; + } + + $this->result_numrows[$result_id] = $k; + $this->row_index[$result_id] = 0; + } + else + { + $this->result_numrows[$result_id] = @odbc_num_rows($result_id); + $this->row_index[$result_id] = 0; + } + } + else + { + if(eregi("^(INSERT|UPDATE) ", $query)) + { + $query = preg_replace("/\\\'/s", "''", $query); + } + + $this->query_result = odbc_exec($this->db_connect_id, $query); + + if($this->query_result) + { + $sql_id = "VALUES(IDENTITY_VAL_LOCAL())"; + + $id_result = odbc_exec($this->db_connect_id, $sql_id); + if($id_result) + { + $row_result = odbc_fetch_row($id_result); + if($row_result) + { + $this->next_id[$this->query_result] = odbc_result($id_result, 1); + } + } + } + + odbc_commit($this->db_connect_id); + + $this->query_limit_offset[$this->query_result] = 0; + $this->result_numrows[$this->query_result] = 0; + } + + return $this->query_result; + } + else + { + return false; + } + } + + // + // Other query methods + // + function sql_numrows($query_id = 0) + { + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + return $this->result_numrows[$query_id]; + } + else + { + return false; + } + } + function sql_affectedrows($query_id = 0) + { + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + return $this->result_numrows[$query_id]; + } + else + { + return false; + } + } + function sql_numfields($query_id = 0) + { + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + $result = count($this->result_field_names[$query_id]); + return $result; + } + else + { + return false; + } + } + function sql_fieldname($offset, $query_id = 0) + { + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + $result = $this->result_field_names[$query_id][$offset]; + return $result; + } + else + { + return false; + } + } + function sql_fieldtype($offset, $query_id = 0) + { + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + $result = @odbc_field_type($query_id, $offset); + return $result; + } + else + { + return false; + } + } + function sql_fetchrow($query_id = 0) + { + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + if($this->row_index[$query_id] < $this->result_numrows[$query_id]) + { + $result = $this->result_rowset[$query_id][$this->row_index[$query_id]]; + $this->row_index[$query_id]++; + return $result; + } + else + { + return false; + } + } + else + { + return false; + } + } + function sql_fetchrowset($query_id = 0) + { + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + $this->row_index[$query_id] = $this->result_numrows[$query_id]; + return $this->result_rowset[$query_id]; + } + else + { + return false; + } + } + function sql_fetchfield($field, $row = -1, $query_id = 0) + { + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + if($row < $this->result_numrows[$query_id]) + { + if($row == -1) + { + $getrow = $this->row_index[$query_id]-1; + } + else + { + $getrow = $row; + } + + return $this->result_rowset[$query_id][$getrow][$this->result_field_names[$query_id][$field]]; + + } + else + { + return false; + } + } + else + { + return false; + } + } + function sql_rowseek($offset, $query_id = 0) + { + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + $this->row_index[$query_id] = 0; + return true; + } + else + { + return false; + } + } + function sql_nextid($query_id = 0) + { + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + return $this->next_id[$query_id]; + } + else + { + return false; + } + } + function sql_freeresult($query_id = 0) + { + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + $result = @odbc_free_result($query_id); + return $result; + } + else + { + return false; + } + } + function sql_error($query_id = 0) + { +// $result['code'] = @odbc_error($this->db_connect_id); +// $result['message'] = @odbc_errormsg($this->db_connect_id); + + return ""; + } + +} // class sql_db + +} // if ... define + +?> \ No newline at end of file diff --git a/phpBB/cache/index.htm b/phpBB/db/index.htm similarity index 100% rename from phpBB/cache/index.htm rename to phpBB/db/index.htm diff --git a/phpBB/db/msaccess.php b/phpBB/db/msaccess.php new file mode 100644 index 0000000000..3424763675 --- /dev/null +++ b/phpBB/db/msaccess.php @@ -0,0 +1,389 @@ +persistency = $persistency; + $this->server = $sqlserver; + $this->user = $sqluser; + $this->password = $sqlpassword; + $this->dbname = $database; + + $this->db_connect_id = ($this->persistency) ? odbc_pconnect($this->server, $this->user, $this->password) : odbc_connect($this->server, $this->user, $this->password); + + return ( $this->db_connect_id ) ? $this->db_connect_id : false; + } + // + // Other base methods + // + function sql_close() + { + if($this->db_connect_id) + { + if( $this->in_transaction ) + { + @odbc_commit($this->db_connect_id); + } + + if( count($this->result_rowset) ) + { + unset($this->result_rowset); + unset($this->field_names); + unset($this->field_types); + unset($this->num_rows); + unset($this->current_row); + } + + return @odbc_close($this->db_connect_id); + } + else + { + return false; + } + } + + // + // Query method + // + function sql_query($query = "", $transaction = FALSE) + { + if( $query != "" ) + { + $this->num_queries++; + + if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction ) + { + if( !odbc_autocommit($this->db_connect_id, false) ) + { + return false; + } + $this->in_transaction = TRUE; + } + + $query = str_replace("LOWER(", "LCASE(", $query); + + if( preg_match("/^SELECT(.*?)(LIMIT ([0-9]+)[, ]*([0-9]+)*)?$/s", $query, $limits) ) + { + $query = $limits[1]; + + if( !empty($limits[2]) ) + { + $row_offset = ( $limits[4] ) ? $limits[3] : ""; + $num_rows = ( $limits[4] ) ? $limits[4] : $limits[3]; + + $query = "TOP " . ( $row_offset + $num_rows ) . $query; + } + + $this->result = odbc_exec($this->db_connect_id, "SELECT $query"); + + if( $this->result ) + { + if( empty($this->field_names[$this->result]) ) + { + for($i = 1; $i < odbc_num_fields($this->result) + 1; $i++) + { + $this->field_names[$this->result][] = odbc_field_name($this->result, $i); + $this->field_types[$this->result][] = odbc_field_type($this->result, $i); + } + } + + $this->current_row[$this->result] = 0; + $this->result_rowset[$this->result] = array(); + + $row_outer = ( isset($row_offset) ) ? $row_offset + 1 : 1; + $row_outer_max = ( isset($num_rows) ) ? $row_offset + $num_rows + 1 : 1E9; + $row_inner = 0; + + while( odbc_fetch_row($this->result, $row_outer) && $row_outer < $row_outer_max ) + { + for($j = 0; $j < count($this->field_names[$this->result]); $j++) + { + $this->result_rowset[$this->result][$row_inner][$this->field_names[$this->result][$j]] = stripslashes(odbc_result($this->result, $j + 1)); + } + + $row_outer++; + $row_inner++; + } + + $this->num_rows[$this->result] = count($this->result_rowset[$this->result]); + + odbc_free_result($this->result); + } + + } + else if( eregi("^INSERT ", $query) ) + { + $this->result = odbc_exec($this->db_connect_id, $query); + + if( $this->result ) + { + $result_id = odbc_exec($this->db_connect_id, "SELECT @@IDENTITY"); + if( $result_id ) + { + if( odbc_fetch_row($result_id) ) + { + $this->next_id[$this->db_connect_id] = odbc_result($result_id, 1); + $this->affected_rows[$this->db_connect_id] = odbc_num_rows($this->result); + } + } + } + } + else + { + $this->result = odbc_exec($this->db_connect_id, $query); + + if( $this->result ) + { + $this->affected_rows[$this->db_connect_id] = odbc_num_rows($this->result); + } + } + + if( !$this->result ) + { + if( $this->in_transaction ) + { + odbc_rollback($this->db_connect_id); + odbc_autocommit($this->db_connect_id, true); + $this->in_transaction = FALSE; + } + + return false; + } + + if( $transaction == END_TRANSACTION && $this->in_transaction ) + { + $this->in_transaction = FALSE; + + if ( !@odbc_commit($this->db_connect_id) ) + { + odbc_rollback($this->db_connect_id); + odbc_autocommit($this->db_connect_id, true); + return false; + } + odbc_autocommit($this->db_connect_id, true); + } + + return $this->result; + } + else + { + if( $transaction == END_TRANSACTION && $this->in_transaction ) + { + $this->in_transaction = FALSE; + + if ( !@odbc_commit($this->db_connect_id) ) + { + odbc_rollback($this->db_connect_id); + odbc_autocommit($this->db_connect_id, true); + return false; + } + odbc_autocommit($this->db_connect_id, true); + } + + return true; + } + } + + // + // Other query methods + // + function sql_numrows($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + return ( $query_id ) ? $this->num_rows[$query_id] : false; + } + + function sql_numfields($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + return ( $query_id ) ? count($this->field_names[$query_id]) : false; + } + + function sql_fieldname($offset, $query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + return ( $query_id ) ? $this->field_names[$query_id][$offset] : false; + } + + function sql_fieldtype($offset, $query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + return ( $query_id ) ? $this->field_types[$query_id][$offset] : false; + } + + function sql_fetchrow($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + if( $query_id ) + { + return ( $this->num_rows[$query_id] && $this->current_row[$query_id] < $this->num_rows[$query_id] ) ? $this->result_rowset[$query_id][$this->current_row[$query_id]++] : false; + } + else + { + return false; + } + } + + function sql_fetchrowset($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + if( $query_id ) + { + return ( $this->num_rows[$query_id] ) ? $this->result_rowset[$query_id] : false; + } + else + { + return false; + } + } + + function sql_fetchfield($field, $row = -1, $query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + if( $query_id ) + { + if( $row < $this->num_rows[$query_id] ) + { + $getrow = ($row == -1) ? $this->current_row[$query_id] - 1 : $row; + + return $this->result_rowset[$query_id][$getrow][$this->field_names[$query_id][$field]]; + } + else + { + return false; + } + } + else + { + return false; + } + } + + function sql_rowseek($offset, $query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + if( $query_id ) + { + $this->current_row[$query_id] = $offset - 1; + return true; + } + else + { + return false; + } + } + + function sql_nextid() + { + return ( $this->next_id[$this->db_connect_id] ) ? $this->next_id[$this->db_connect_id] : false; + } + + function sql_affectedrows() + { + return ( $this->affected_rows[$this->db_connect_id] ) ? $this->affected_rows[$this->db_connect_id] : false; + } + + function sql_freeresult($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + unset($this->num_rows[$query_id]); + unset($this->current_row[$query_id]); + unset($this->result_rowset[$query_id]); + unset($this->field_names[$query_id]); + unset($this->field_types[$query_id]); + + return true; + } + + function sql_error() + { + $error['code'] = "";//odbc_error($this->db_connect_id); + $error['message'] = "Error";//odbc_errormsg($this->db_connect_id); + + return $error; + } + +} // class sql_db + +} // if ... define + +?> \ No newline at end of file diff --git a/phpBB/db/mssql-odbc.php b/phpBB/db/mssql-odbc.php new file mode 100644 index 0000000000..e2b3e5cd91 --- /dev/null +++ b/phpBB/db/mssql-odbc.php @@ -0,0 +1,387 @@ +persistency = $persistency; + $this->server = $sqlserver; + $this->user = $sqluser; + $this->password = $sqlpassword; + $this->dbname = $database; + + $this->db_connect_id = ($this->persistency) ? odbc_pconnect($this->server, $this->user, $this->password) : odbc_connect($this->server, $this->user, $this->password); + + return ( $this->db_connect_id ) ? $this->db_connect_id : false; + } + // + // Other base methods + // + function sql_close() + { + if($this->db_connect_id) + { + if( $this->in_transaction ) + { + @odbc_commit($this->db_connect_id); + } + + if( count($this->result_rowset) ) + { + unset($this->result_rowset); + unset($this->field_names); + unset($this->field_types); + unset($this->num_rows); + unset($this->current_row); + } + + return @odbc_close($this->db_connect_id); + } + else + { + return false; + } + } + + // + // Query method + // + function sql_query($query = "", $transaction = FALSE) + { + if( $query != "" ) + { + $this->num_queries++; + + if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction ) + { + if( !odbc_autocommit($this->db_connect_id, false) ) + { + return false; + } + $this->in_transaction = TRUE; + } + + if( preg_match("/^SELECT(.*?)(LIMIT ([0-9]+)[, ]*([0-9]+)*)?$/s", $query, $limits) ) + { + $query = $limits[1]; + + if( !empty($limits[2]) ) + { + $row_offset = ( $limits[4] ) ? $limits[3] : ""; + $num_rows = ( $limits[4] ) ? $limits[4] : $limits[3]; + + $query = "TOP " . ( $row_offset + $num_rows ) . $query; + } + + $this->result = odbc_exec($this->db_connect_id, "SELECT $query"); + + if( $this->result ) + { + if( empty($this->field_names[$this->result]) ) + { + for($i = 1; $i < odbc_num_fields($this->result) + 1; $i++) + { + $this->field_names[$this->result][] = odbc_field_name($this->result, $i); + $this->field_types[$this->result][] = odbc_field_type($this->result, $i); + } + } + + $this->current_row[$this->result] = 0; + $this->result_rowset[$this->result] = array(); + + $row_outer = ( isset($row_offset) ) ? $row_offset + 1 : 1; + $row_outer_max = ( isset($num_rows) ) ? $row_offset + $num_rows + 1 : 1E9; + $row_inner = 0; + + while( odbc_fetch_row($this->result, $row_outer) && $row_outer < $row_outer_max ) + { + for($j = 0; $j < count($this->field_names[$this->result]); $j++) + { + $this->result_rowset[$this->result][$row_inner][$this->field_names[$this->result][$j]] = stripslashes(odbc_result($this->result, $j + 1)); + } + + $row_outer++; + $row_inner++; + } + + $this->num_rows[$this->result] = count($this->result_rowset[$this->result]); + } + + } + else if( eregi("^INSERT ", $query) ) + { + $this->result = odbc_exec($this->db_connect_id, $query); + + if( $this->result ) + { + $result_id = odbc_exec($this->db_connect_id, "SELECT @@IDENTITY"); + if( $result_id ) + { + if( odbc_fetch_row($result_id) ) + { + $this->next_id[$this->db_connect_id] = odbc_result($result_id, 1); + $this->affected_rows[$this->db_connect_id] = odbc_num_rows($this->result); + } + } + } + } + else + { + $this->result = odbc_exec($this->db_connect_id, $query); + + if( $this->result ) + { + $this->affected_rows[$this->db_connect_id] = odbc_num_rows($this->result); + } + } + + if( !$this->result ) + { + if( $this->in_transaction ) + { + odbc_rollback($this->db_connect_id); + odbc_autocommit($this->db_connect_id, true); + $this->in_transaction = FALSE; + } + + return false; + } + + if( $transaction == END_TRANSACTION && $this->in_transaction ) + { + $this->in_transaction = FALSE; + + if ( !odbc_commit($this->db_connect_id) ) + { + odbc_rollback($this->db_connect_id); + odbc_autocommit($this->db_connect_id, true); + return false; + } + odbc_autocommit($this->db_connect_id, true); + } + + odbc_free_result($this->result); + + return $this->result; + } + else + { + if( $transaction == END_TRANSACTION && $this->in_transaction ) + { + $this->in_transaction = FALSE; + + if ( !@odbc_commit($this->db_connect_id) ) + { + odbc_rollback($this->db_connect_id); + odbc_autocommit($this->db_connect_id, true); + return false; + } + odbc_autocommit($this->db_connect_id, true); + } + + return true; + } + } + + // + // Other query methods + // + function sql_numrows($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + return ( $query_id ) ? $this->num_rows[$query_id] : false; + } + + function sql_numfields($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + return ( $query_id ) ? count($this->field_names[$query_id]) : false; + } + + function sql_fieldname($offset, $query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + return ( $query_id ) ? $this->field_names[$query_id][$offset] : false; + } + + function sql_fieldtype($offset, $query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + return ( $query_id ) ? $this->field_types[$query_id][$offset] : false; + } + + function sql_fetchrow($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + if( $query_id ) + { + return ( $this->num_rows[$query_id] && $this->current_row[$query_id] < $this->num_rows[$query_id] ) ? $this->result_rowset[$query_id][$this->current_row[$query_id]++] : false; + } + else + { + return false; + } + } + + function sql_fetchrowset($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + if( $query_id ) + { + return ( $this->num_rows[$query_id] ) ? $this->result_rowset[$query_id] : false; + } + else + { + return false; + } + } + + function sql_fetchfield($field, $row = -1, $query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + if( $query_id ) + { + if( $row < $this->num_rows[$query_id] ) + { + $getrow = ( $row == -1 ) ? $this->current_row[$query_id] - 1 : $row; + + return $this->result_rowset[$query_id][$getrow][$this->field_names[$query_id][$field]]; + + } + else + { + return false; + } + } + else + { + return false; + } + } + + function sql_rowseek($offset, $query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + if( $query_id ) + { + $this->current_row[$query_id] = $offset - 1; + return true; + } + else + { + return false; + } + } + + function sql_nextid() + { + return ( $this->next_id[$this->db_connect_id] ) ? $this->next_id[$this->db_connect_id] : false; + } + + function sql_affectedrows() + { + return ( $this->affected_rows[$this->db_connect_id] ) ? $this->affected_rows[$this->db_connect_id] : false; + } + + function sql_freeresult($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + unset($this->num_rows[$query_id]); + unset($this->current_row[$query_id]); + unset($this->result_rowset[$query_id]); + unset($this->field_names[$query_id]); + unset($this->field_types[$query_id]); + + return true; + } + + function sql_error() + { + $error['code'] = odbc_error($this->db_connect_id); + $error['message'] = odbc_errormsg($this->db_connect_id); + + return $error; + } + +} // class sql_db + +} // if ... define + +?> \ No newline at end of file diff --git a/phpBB/db/mssql.php b/phpBB/db/mssql.php new file mode 100644 index 0000000000..5c406ff852 --- /dev/null +++ b/phpBB/db/mssql.php @@ -0,0 +1,418 @@ +persistency = $persistency; + $this->user = $sqluser; + $this->password = $sqlpassword; + $this->server = $sqlserver; + $this->dbname = $database; + + $this->db_connect_id = ( $this->persistency ) ? @mssql_pconnect($this->server, $this->user, $this->password) : @mssql_connect($this->server, $this->user, $this->password); + + if( $this->db_connect_id && $this->dbname != "" ) + { + if( !mssql_select_db($this->dbname, $this->db_connect_id) ) + { + mssql_close($this->db_connect_id); + return false; + } + } + + return $this->db_connect_id; + } + + // + // Other base methods + // + function sql_close() + { + if($this->db_connect_id) + { + // + // Commit any remaining transactions + // + if( $this->in_transaction ) + { + @mssql_query("COMMIT", $this->db_connect_id); + } + + return @mssql_close($this->db_connect_id); + } + else + { + return false; + } + } + + + // + // Query method + // + function sql_query($query = '', $transaction = FALSE) + { + // + // Remove any pre-existing queries + // + unset($this->result); + unset($this->row); + + if ( $query != '' ) + { + $this->num_queries++; + + if ( $transaction == BEGIN_TRANSACTION && !$this->in_transaction ) + { + if ( !@mssql_query('BEGIN TRANSACTION', $this->db_connect_id) ) + { + return false; + } + $this->in_transaction = TRUE; + } + + // + // Does query contain any LIMIT code? If so pull out relevant start and num_results + // This isn't terribly easy with MSSQL, whatever you do will potentially impact + // performance compared to an 'in-built' limit + // + // Another issue is the 'lack' of a returned true value when a query is valid but has + // no result set (as with all the other DB interfaces). It seems though that it's + // 'fair' to say that if a query returns a false result (ie. no resource id) then the + // SQL was valid but had no result set. If the query returns nothing but the rowcount + // returns something then there's a problem. This may well be a false assumption though + // ... needs checking under Windows itself. + // + if( preg_match('#^SELECT(.*?)(LIMIT ([0-9]+)[, ]*([0-9]+)*)?$#s', $query, $limits) ) + { + $query = $limits[1]; + + if( !empty($limits[2]) ) + { + $row_offset = ( $limits[4] ) ? $limits[3] : ""; + $num_rows = ( $limits[4] ) ? $limits[4] : $limits[3]; + + $query = 'TOP ' . ( $row_offset + $num_rows ) . $query; + } + + $this->result = @mssql_query("SELECT $query", $this->db_connect_id); + + if( $this->result ) + { + $this->limit_offset[$this->result] = ( !empty($row_offset) ) ? $row_offset : 0; + + if( $row_offset > 0 ) + { + @mssql_data_seek($this->result, $row_offset); + } + } + } + else if( preg_match('#^INSERT #i', $query) ) + { + if( @mssql_query($query, $this->db_connect_id) ) + { + $this->result = time() + microtime(); + + $result_id = @mssql_query('SELECT @@IDENTITY AS id, @@ROWCOUNT as affected', $this->db_connect_id); + if( $result_id ) + { + if( $row = @mssql_fetch_array($result_id) ) + { + $this->next_id[$this->db_connect_id] = $row['id']; + $this->affected_rows[$this->db_connect_id] = $row['affected']; + } + } + } + } + else + { + if( @mssql_query($query, $this->db_connect_id) ) + { + $this->result = time() + microtime(); + + $result_id = @mssql_query('SELECT @@ROWCOUNT as affected', $this->db_connect_id); + if( $result_id ) + { + if( $row = @mssql_fetch_array($result_id) ) + { + $this->affected_rows[$this->db_connect_id] = $row['affected']; + } + } + } + } + + if( !$this->result ) + { + if( $this->in_transaction ) + { + @mssql_query('ROLLBACK', $this->db_connect_id); + $this->in_transaction = FALSE; + } + + return false; + } + + if( $transaction == END_TRANSACTION && $this->in_transaction ) + { + $this->in_transaction = FALSE; + + if( !@mssql_query('COMMIT', $this->db_connect_id) ) + { + @mssql_query("ROLLBACK", $this->db_connect_id); + return false; + } + } + + return $this->result; + } + else + { + if( $transaction == END_TRANSACTION && $this->in_transaction ) + { + $this->in_transaction = FALSE; + + if( !@mssql_query('COMMIT', $this->db_connect_id) ) + { + @mssql_query('ROLLBACK', $this->db_connect_id); + return false; + } + } + + return true; + } + } + + // + // Other query methods + // + function sql_numrows($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + if( $query_id ) + { + return ( !empty($this->limit_offset[$query_id]) ) ? @mssql_num_rows($query_id) - $this->limit_offset[$query_id] : @mssql_num_rows($query_id); + } + else + { + return false; + } + } + + function sql_numfields($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + return ( $query_id ) ? @mssql_num_fields($query_id) : false; + } + + function sql_fieldname($offset, $query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + return ( $query_id ) ? @mssql_field_name($query_id, $offset) : false; + } + + function sql_fieldtype($offset, $query_id = 0) + { + if(!$query_id) + { + $query_id = $this->result; + } + + return ( $query_id ) ? @mssql_field_type($query_id, $offset) : false; + } + + function sql_fetchrow($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + if( $query_id ) + { + empty($row); + + $row = @mssql_fetch_array($query_id); + + while( list($key, $value) = @each($row) ) + { + $row[$key] = ($value === ' ') ? '' : stripslashes($value); + } + @reset($row); + + return $row; + } + else + { + return false; + } + } + + function sql_fetchrowset($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + if( $query_id ) + { + $i = 0; + empty($rowset); + + while( $row = @mssql_fetch_array($query_id)) + { + while( list($key, $value) = @each($row) ) + { + $rowset[$i][$key] = ($value === ' ') ? '' : stripslashes($value); + } + $i++; + } + @reset($rowset); + + return $rowset; + } + else + { + return false; + } + } + + function sql_fetchfield($field, $row = -1, $query_id) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + if( $query_id ) + { + if( $row != -1 ) + { + if( $this->limit_offset[$query_id] > 0 ) + { + $result = ( !empty($this->limit_offset[$query_id]) ) ? @mssql_result($this->result, ($this->limit_offset[$query_id] + $row), $field) : false; + } + else + { + $result = @mssql_result($this->result, $row, $field); + } + } + else + { + if( empty($this->row[$query_id]) ) + { + $this->row[$query_id] = @mssql_fetch_array($query_id); + $result = ($this->row[$query_id][$field] === ' ') ? '' : stripslashes($this->row[$query_id][$field]); + } + } + + return $result; + } + else + { + return false; + } + } + + function sql_rowseek($rownum, $query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + if( $query_id ) + { + return ( !empty($this->limit_offset[$query_id]) ) ? @mssql_data_seek($query_id, ($this->limit_offset[$query_id] + $rownum)) : @mssql_data_seek($query_id, $rownum); + } + else + { + return false; + } + } + + function sql_nextid() + { + return ( $this->next_id[$this->db_connect_id] ) ? $this->next_id[$this->db_connect_id] : false; + } + + function sql_affectedrows() + { + return ( $this->affected_rows[$this->db_connect_id] ) ? $this->affected_rows[$this->db_connect_id] : false; + } + + function sql_freeresult($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->result; + } + + return ( $query_id ) ? @mssql_free_result($query_id) : false; + } + + function sql_error($query_id = 0) + { + $result['message'] = @mssql_get_last_message(); + return $result; + } + +} // class sql_db + +} // if ... define + +?> \ No newline at end of file diff --git a/phpBB/db/mysql.php b/phpBB/db/mysql.php new file mode 100644 index 0000000000..adaa2bf657 --- /dev/null +++ b/phpBB/db/mysql.php @@ -0,0 +1,335 @@ +persistency = $persistency; + $this->user = $sqluser; + $this->password = $sqlpassword; + $this->server = $sqlserver; + $this->dbname = $database; + + if($this->persistency) + { + $this->db_connect_id = @mysql_pconnect($this->server, $this->user, $this->password); + } + else + { + $this->db_connect_id = @mysql_connect($this->server, $this->user, $this->password); + } + if($this->db_connect_id) + { + if($database != "") + { + $this->dbname = $database; + $dbselect = @mysql_select_db($this->dbname); + if(!$dbselect) + { + @mysql_close($this->db_connect_id); + $this->db_connect_id = $dbselect; + } + } + return $this->db_connect_id; + } + else + { + return false; + } + } + + // + // Other base methods + // + function sql_close() + { + if($this->db_connect_id) + { + if($this->query_result) + { + @mysql_free_result($this->query_result); + } + $result = @mysql_close($this->db_connect_id); + return $result; + } + else + { + return false; + } + } + + // + // Base query method + // + function sql_query($query = "", $transaction = FALSE) + { + // Remove any pre-existing queries + unset($this->query_result); + if($query != "") + { + $this->num_queries++; + + $this->query_result = @mysql_query($query, $this->db_connect_id); + } + if($this->query_result) + { + unset($this->row[$this->query_result]); + unset($this->rowset[$this->query_result]); + return $this->query_result; + } + else + { + return ( $transaction == END_TRANSACTION ) ? true : false; + } + } + + // + // Other query methods + // + function sql_numrows($query_id = 0) + { + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + $result = @mysql_num_rows($query_id); + return $result; + } + else + { + return false; + } + } + function sql_affectedrows() + { + if($this->db_connect_id) + { + $result = @mysql_affected_rows($this->db_connect_id); + return $result; + } + else + { + return false; + } + } + function sql_numfields($query_id = 0) + { + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + $result = @mysql_num_fields($query_id); + return $result; + } + else + { + return false; + } + } + function sql_fieldname($offset, $query_id = 0) + { + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + $result = @mysql_field_name($query_id, $offset); + return $result; + } + else + { + return false; + } + } + function sql_fieldtype($offset, $query_id = 0) + { + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + $result = @mysql_field_type($query_id, $offset); + return $result; + } + else + { + return false; + } + } + function sql_fetchrow($query_id = 0) + { + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + $this->row[$query_id] = @mysql_fetch_array($query_id); + return $this->row[$query_id]; + } + else + { + return false; + } + } + function sql_fetchrowset($query_id = 0) + { + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + unset($this->rowset[$query_id]); + unset($this->row[$query_id]); + while($this->rowset[$query_id] = @mysql_fetch_array($query_id)) + { + $result[] = $this->rowset[$query_id]; + } + return $result; + } + else + { + return false; + } + } + function sql_fetchfield($field, $rownum = -1, $query_id = 0) + { + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + if($rownum > -1) + { + $result = @mysql_result($query_id, $rownum, $field); + } + else + { + if(empty($this->row[$query_id]) && empty($this->rowset[$query_id])) + { + if($this->sql_fetchrow()) + { + $result = $this->row[$query_id][$field]; + } + } + else + { + if($this->rowset[$query_id]) + { + $result = $this->rowset[$query_id][0][$field]; + } + else if($this->row[$query_id]) + { + $result = $this->row[$query_id][$field]; + } + } + } + return $result; + } + else + { + return false; + } + } + function sql_rowseek($rownum, $query_id = 0){ + if(!$query_id) + { + $query_id = $this->query_result; + } + if($query_id) + { + $result = @mysql_data_seek($query_id, $rownum); + return $result; + } + else + { + return false; + } + } + function sql_nextid(){ + if($this->db_connect_id) + { + $result = @mysql_insert_id($this->db_connect_id); + return $result; + } + else + { + return false; + } + } + function sql_freeresult($query_id = 0){ + if(!$query_id) + { + $query_id = $this->query_result; + } + + if ( $query_id ) + { + unset($this->row[$query_id]); + unset($this->rowset[$query_id]); + + @mysql_free_result($query_id); + + return true; + } + else + { + return false; + } + } + function sql_error($query_id = 0) + { + $result["message"] = @mysql_error($this->db_connect_id); + $result["code"] = @mysql_errno($this->db_connect_id); + + return $result; + } + +} // class sql_db + +} // if ... define + +?> \ No newline at end of file diff --git a/phpBB/db/mysql4.php b/phpBB/db/mysql4.php new file mode 100644 index 0000000000..d00ea7700e --- /dev/null +++ b/phpBB/db/mysql4.php @@ -0,0 +1,340 @@ +persistency = $persistency; + $this->user = $sqluser; + $this->password = $sqlpassword; + $this->server = $sqlserver; + $this->dbname = $database; + + $this->db_connect_id = ($this->persistency) ? mysql_pconnect($this->server, $this->user, $this->password) : mysql_connect($this->server, $this->user, $this->password); + + if( $this->db_connect_id ) + { + if( $database != "" ) + { + $this->dbname = $database; + $dbselect = mysql_select_db($this->dbname); + + if( !$dbselect ) + { + mysql_close($this->db_connect_id); + $this->db_connect_id = $dbselect; + } + } + + return $this->db_connect_id; + } + else + { + return false; + } + } + + // + // Other base methods + // + function sql_close() + { + if( $this->db_connect_id ) + { + // + // Commit any remaining transactions + // + if( $this->in_transaction ) + { + mysql_query("COMMIT", $this->db_connect_id); + } + + return mysql_close($this->db_connect_id); + } + else + { + return false; + } + } + + // + // Base query method + // + function sql_query($query = "", $transaction = FALSE) + { + // + // Remove any pre-existing queries + // + unset($this->query_result); + + if( $query != "" ) + { + $this->num_queries++; + if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction ) + { + $result = mysql_query("BEGIN", $this->db_connect_id); + if(!$result) + { + return false; + } + $this->in_transaction = TRUE; + } + + $this->query_result = mysql_query($query, $this->db_connect_id); + } + else + { + if( $transaction == END_TRANSACTION && $this->in_transaction ) + { + $result = mysql_query("COMMIT", $this->db_connect_id); + } + } + + if( $this->query_result ) + { + unset($this->row[$this->query_result]); + unset($this->rowset[$this->query_result]); + + if( $transaction == END_TRANSACTION && $this->in_transaction ) + { + $this->in_transaction = FALSE; + + if ( !mysql_query("COMMIT", $this->db_connect_id) ) + { + mysql_query("ROLLBACK", $this->db_connect_id); + return false; + } + } + + return $this->query_result; + } + else + { + if( $this->in_transaction ) + { + mysql_query("ROLLBACK", $this->db_connect_id); + $this->in_transaction = FALSE; + } + return false; + } + } + + // + // Other query methods + // + function sql_numrows($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + return ( $query_id ) ? mysql_num_rows($query_id) : false; + } + + function sql_affectedrows() + { + return ( $this->db_connect_id ) ? mysql_affected_rows($this->db_connect_id) : false; + } + + function sql_numfields($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + return ( $query_id ) ? mysql_num_fields($query_id) : false; + } + + function sql_fieldname($offset, $query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + return ( $query_id ) ? mysql_field_name($query_id, $offset) : false; + } + + function sql_fieldtype($offset, $query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + return ( $query_id ) ? mysql_field_type($query_id, $offset) : false; + } + + function sql_fetchrow($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + if( $query_id ) + { + $this->row[$query_id] = mysql_fetch_array($query_id, MYSQL_ASSOC); + return $this->row[$query_id]; + } + else + { + return false; + } + } + + function sql_fetchrowset($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + if( $query_id ) + { + unset($this->rowset[$query_id]); + unset($this->row[$query_id]); + + while($this->rowset[$query_id] = mysql_fetch_array($query_id, MYSQL_ASSOC)) + { + $result[] = $this->rowset[$query_id]; + } + + return $result; + } + else + { + return false; + } + } + + function sql_fetchfield($field, $rownum = -1, $query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + if( $query_id ) + { + if( $rownum > -1 ) + { + $result = mysql_result($query_id, $rownum, $field); + } + else + { + if( empty($this->row[$query_id]) && empty($this->rowset[$query_id]) ) + { + if( $this->sql_fetchrow() ) + { + $result = $this->row[$query_id][$field]; + } + } + else + { + if( $this->rowset[$query_id] ) + { + $result = $this->rowset[$query_id][0][$field]; + } + else if( $this->row[$query_id] ) + { + $result = $this->row[$query_id][$field]; + } + } + } + + return $result; + } + else + { + return false; + } + } + + function sql_rowseek($rownum, $query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + return ( $query_id ) ? mysql_data_seek($query_id, $rownum) : false; + } + + function sql_nextid() + { + return ( $this->db_connect_id ) ? mysql_insert_id($this->db_connect_id) : false; + } + + function sql_freeresult($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + if ( $query_id ) + { + unset($this->row[$query_id]); + unset($this->rowset[$query_id]); + + mysql_free_result($query_id); + + return true; + } + else + { + return false; + } + } + + function sql_error() + { + $result['message'] = mysql_error($this->db_connect_id); + $result['code'] = mysql_errno($this->db_connect_id); + + return $result; + } + +} // class sql_db + +} // if ... define + +?> diff --git a/phpBB/db/postgres7.php b/phpBB/db/postgres7.php new file mode 100644 index 0000000000..96a90fbb1a --- /dev/null +++ b/phpBB/db/postgres7.php @@ -0,0 +1,397 @@ +connect_string = ""; + + if( $sqluser ) + { + $this->connect_string .= "user=$sqluser "; + } + + if( $sqlpassword ) + { + $this->connect_string .= "password=$sqlpassword "; + } + + if( $sqlserver ) + { + if( ereg(":", $sqlserver) ) + { + list($sqlserver, $sqlport) = split(":", $sqlserver); + $this->connect_string .= "host=$sqlserver port=$sqlport "; + } + else + { + if( $sqlserver != "localhost" ) + { + $this->connect_string .= "host=$sqlserver "; + } + } + } + + if( $database ) + { + $this->dbname = $database; + $this->connect_string .= "dbname=$database"; + } + + $this->persistency = $persistency; + + $this->db_connect_id = ( $this->persistency ) ? pg_pconnect($this->connect_string) : pg_connect($this->connect_string); + + return ( $this->db_connect_id ) ? $this->db_connect_id : false; + } + + // + // Other base methods + // + function sql_close() + { + if( $this->db_connect_id ) + { + // + // Commit any remaining transactions + // + if( $this->in_transaction ) + { + @pg_exec($this->db_connect_id, "COMMIT"); + } + + if( $this->query_result ) + { + @pg_freeresult($this->query_result); + } + + return @pg_close($this->db_connect_id); + } + else + { + return false; + } + } + + // + // Query method + // + function sql_query($query = "", $transaction = false) + { + // + // Remove any pre-existing queries + // + unset($this->query_result); + if( $query != "" ) + { + $this->num_queries++; + + $query = preg_replace("/LIMIT ([0-9]+),([ 0-9]+)/", "LIMIT \\2 OFFSET \\1", $query); + + if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction ) + { + $this->in_transaction = TRUE; + + if( !@pg_exec($this->db_connect_id, "BEGIN") ) + { + return false; + } + } + + $this->query_result = @pg_exec($this->db_connect_id, $query); + if( $this->query_result ) + { + if( $transaction == END_TRANSACTION ) + { + $this->in_transaction = FALSE; + + if( !@pg_exec($this->db_connect_id, "COMMIT") ) + { + @pg_exec($this->db_connect_id, "ROLLBACK"); + return false; + } + } + + $this->last_query_text[$this->query_result] = $query; + $this->rownum[$this->query_result] = 0; + + unset($this->row[$this->query_result]); + unset($this->rowset[$this->query_result]); + + return $this->query_result; + } + else + { + if( $this->in_transaction ) + { + @pg_exec($this->db_connect_id, "ROLLBACK"); + } + $this->in_transaction = FALSE; + + return false; + } + } + else + { + if( $transaction == END_TRANSACTION && $this->in_transaction ) + { + $this->in_transaction = FALSE; + + if( !@pg_exec($this->db_connect_id, "COMMIT") ) + { + @pg_exec($this->db_connect_id, "ROLLBACK"); + return false; + } + } + + return true; + } + } + + // + // Other query methods + // + function sql_numrows($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + return ( $query_id ) ? @pg_numrows($query_id) : false; + } + + function sql_numfields($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + return ( $query_id ) ? @pg_numfields($query_id) : false; + } + + function sql_fieldname($offset, $query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + return ( $query_id ) ? @pg_fieldname($query_id, $offset) : false; + } + + function sql_fieldtype($offset, $query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + return ( $query_id ) ? @pg_fieldtype($query_id, $offset) : false; + } + + function sql_fetchrow($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + if($query_id) + { + $this->row = @pg_fetch_array($query_id, $this->rownum[$query_id]); + + if( $this->row ) + { + $this->rownum[$query_id]++; + return $this->row; + } + } + + return false; + } + + function sql_fetchrowset($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + if( $query_id ) + { + unset($this->rowset[$query_id]); + unset($this->row[$query_id]); + $this->rownum[$query_id] = 0; + + while( $this->rowset = @pg_fetch_array($query_id, $this->rownum[$query_id], PGSQL_ASSOC) ) + { + $result[] = $this->rowset; + $this->rownum[$query_id]++; + } + + return $result; + } + + return false; + } + + function sql_fetchfield($field, $row_offset=-1, $query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + if( $query_id ) + { + if( $row_offset != -1 ) + { + $this->row = @pg_fetch_array($query_id, $row_offset, PGSQL_ASSOC); + } + else + { + if( $this->rownum[$query_id] ) + { + $this->row = @pg_fetch_array($query_id, $this->rownum[$query_id]-1, PGSQL_ASSOC); + } + else + { + $this->row = @pg_fetch_array($query_id, $this->rownum[$query_id], PGSQL_ASSOC); + + if( $this->row ) + { + $this->rownum[$query_id]++; + } + } + } + + return $this->row[$field]; + } + + return false; + } + + function sql_rowseek($offset, $query_id = 0) + { + + if(!$query_id) + { + $query_id = $this->query_result; + } + + if( $query_id ) + { + if( $offset > -1 ) + { + $this->rownum[$query_id] = $offset; + return true; + } + else + { + return false; + } + } + + return false; + } + + function sql_nextid() + { + $query_id = $this->query_result; + + if($query_id && $this->last_query_text[$query_id] != "") + { + if( preg_match("/^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)/is", $this->last_query_text[$query_id], $tablename) ) + { + $query = "SELECT currval('" . $tablename[1] . "_id_seq') AS last_value"; + $temp_q_id = @pg_exec($this->db_connect_id, $query); + if( !$temp_q_id ) + { + return false; + } + + $temp_result = @pg_fetch_array($temp_q_id, 0, PGSQL_ASSOC); + + return ( $temp_result ) ? $temp_result['last_value'] : false; + } + } + + return false; + } + + function sql_affectedrows($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + return ( $query_id ) ? @pg_cmdtuples($query_id) : false; + } + + function sql_freeresult($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + return ( $query_id ) ? @pg_freeresult($query_id) : false; + } + + function sql_error($query_id = 0) + { + if( !$query_id ) + { + $query_id = $this->query_result; + } + + $result['message'] = @pg_errormessage($this->db_connect_id); + $result['code'] = -1; + + return $result; + } + +} // class ... db_sql + +} // if ... defined + +?> \ No newline at end of file diff --git a/phpBB/develop/add_permissions.php b/phpBB/develop/add_permissions.php deleted file mode 100644 index 956b830465..0000000000 --- a/phpBB/develop/add_permissions.php +++ /dev/null @@ -1,417 +0,0 @@ -sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false); - -// auth => is_local, is_global -$f_permissions = array( - 'f_' => array(1, 0), - 'f_list' => array(1, 0), - 'f_read' => array(1, 0), - 'f_post' => array(1, 0), - 'f_reply' => array(1, 0), - 'f_edit' => array(1, 0), - 'f_user_lock' => array(1, 0), - 'f_delete' => array(1, 0), - 'f_bump' => array(1, 0), - 'f_poll' => array(1, 0), - 'f_vote' => array(1, 0), - 'f_votechg' => array(1, 0), - 'f_announce'=> array(1, 0), - 'f_sticky' => array(1, 0), - 'f_attach' => array(1, 0), - 'f_download'=> array(1, 0), - 'f_icons' => array(1, 0), - 'f_bbcode' => array(1, 0), - 'f_smilies' => array(1, 0), - 'f_img' => array(1, 0), - 'f_flash' => array(1, 0), - 'f_sigs' => array(1, 0), - 'f_search' => array(1, 0), - 'f_email' => array(1, 0), - 'f_print' => array(1, 0), - 'f_ignoreflood' => array(1, 0), - 'f_postcount' => array(1, 0), - 'f_noapprove'=> array(1, 0), - 'f_report' => array(1, 0), - 'f_subscribe' => array(1, 0), -); - -$m_permissions = array( - 'm_' => array(1, 1), - 'm_edit' => array(1, 1), - 'm_delete' => array(1, 1), - 'm_move' => array(1, 1), - 'm_lock' => array(1, 1), - 'm_split' => array(1, 1), - 'm_merge' => array(1, 1), - 'm_approve' => array(1, 1), - 'm_unrate' => array(1, 1), - 'm_auth' => array(1, 1), - 'm_ip' => array(1, 1), - 'm_info' => array(1, 1), -); - -$a_permissions = array( - 'a_' => array(0, 1), - 'a_server' => array(0, 1), - 'a_board' => array(0, 1), - 'a_clearlogs' => array(0, 1), - 'a_words' => array(0, 1), - 'a_icons' => array(0, 1), - 'a_bbcode' => array(0, 1), - 'a_attach' => array(0, 1), - 'a_email' => array(0, 1), - 'a_styles' => array(0, 1), - 'a_user' => array(0, 1), - 'a_useradd' => array(0, 1), - 'a_userdel' => array(0, 1), - 'a_ranks' => array(0, 1), - 'a_ban' => array(0, 1), - 'a_names' => array(0, 1), - 'a_group' => array(0, 1), - 'a_groupadd'=> array(0, 1), - 'a_groupdel'=> array(0, 1), - 'a_forum' => array(0, 1), - 'a_forumadd'=> array(0, 1), - 'a_forumdel'=> array(0, 1), - 'a_prune' => array(0, 1), - 'a_auth' => array(0, 1), - 'a_authmods'=> array(0, 1), - 'a_authadmins' => array(0, 1), - 'a_authusers' => array(0, 1), - 'a_authgroups' => array(0, 1), - 'a_authdeps'=> array(0, 1), - 'a_backup' => array(0, 1), - 'a_restore' => array(0, 1), - 'a_search' => array(0, 1), - 'a_events' => array(0, 1), - 'a_cron' => array(0, 1), -); - -$u_permissions = array( - 'u_' => array(0, 1), - 'u_sendemail' => array(0, 1), - 'u_readpm' => array(0, 1), - 'u_sendpm' => array(0, 1), - 'u_sendim' => array(0, 1), - 'u_hideonline' => array(0, 1), - 'u_viewonline' => array(0, 1), - 'u_viewprofile' => array(0, 1), - 'u_chgavatar' => array(0, 1), - 'u_chggrp' => array(0, 1), - 'u_chgemail' => array(0, 1), - 'u_chgname' => array(0, 1), - 'u_chgpasswd' => array(0, 1), - 'u_chgcensors' => array(0, 1), - 'u_search' => array(0, 1), - 'u_savedrafts' => array(0, 1), - 'u_download' => array(0, 1), - 'u_attach' => array(0, 1), - 'u_sig' => array(0, 1), - 'u_pm_attach' => array(0, 1), - 'u_pm_bbcode' => array(0, 1), - 'u_pm_smilies' => array(0, 1), - 'u_pm_download' => array(0, 1), - 'u_pm_edit' => array(0, 1), - 'u_pm_printpm' => array(0, 1), - 'u_pm_emailpm' => array(0, 1), - 'u_pm_forward' => array(0, 1), - 'u_pm_delete' => array(0, 1), - 'u_pm_img' => array(0, 1), - 'u_pm_flash' => array(0, 1), -); - -echo "

Determining existing permissions

\n"; - -$sql = 'SELECT auth_option_id, auth_option FROM ' . ACL_OPTIONS_TABLE; -$result = $db->sql_query($sql); - -$remove_auth_options = array(); -while ($row = $db->sql_fetchrow($result)) -{ - if (!in_array($row['auth_option'], array_keys(${substr($row['auth_option'], 0, 2) . 'permissions'}))) - { - $remove_auth_options[$row['auth_option']] = $row['auth_option_id']; - } - unset(${substr($row['auth_option'], 0, 2) . 'permissions'}[$row['auth_option']]); -} -$db->sql_freeresult($result); - -if (sizeof($remove_auth_options)) -{ - $db->sql_query('DELETE FROM ' . ACL_USERS_TABLE . ' WHERE auth_option_id IN (' . implode(', ', $remove_auth_options) . ')'); - $db->sql_query('DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE auth_option_id IN (' . implode(', ', $remove_auth_options) . ')'); - $db->sql_query('DELETE FROM ' . ACL_OPTIONS_TABLE . ' WHERE auth_option_id IN (' . implode(', ', $remove_auth_options) . ')'); - - echo '

Removed the following auth options... [' . implode(', ', array_keys($remove_auth_options)) . "]

\n\n"; -} - -$prefixes = array('f_', 'a_', 'm_', 'u_'); - -foreach ($prefixes as $prefix) -{ - $var = $prefix . 'permissions'; - if (sizeof($$var)) - { - foreach ($$var as $auth_option => $l_ary) - { - $sql_ary = array( - 'auth_option' => $auth_option, - 'is_local' => $l_ary[0], - 'is_global' => $l_ary[1] - ); - - $db->sql_query('INSERT INTO ' . ACL_OPTIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); - - echo "

Adding $auth_option...

\n"; - - mass_auth('group', 0, 'guests', $auth_option, ACL_NEVER); - mass_auth('group', 0, 'inactive', $auth_option, ACL_NEVER); - mass_auth('group', 0, 'inactive_coppa', $auth_option, ACL_NEVER); - mass_auth('group', 0, 'registered_coppa', $auth_option, ACL_NEVER); - mass_auth('group', 0, 'registered', $auth_option, (($prefix != 'm_' && $prefix != 'a_') ? ACL_YES : ACL_NEVER)); - mass_auth('group', 0, 'global_moderators', $auth_option, (($prefix != 'a_') ? ACL_YES : ACL_NEVER)); - mass_auth('group', 0, 'administrators', $auth_option, ACL_YES); - mass_auth('group', 0, 'bots', $auth_option, (($prefix != 'm_' && $prefix != 'a_') ? ACL_YES : ACL_NEVER)); - } - } -} - -$sql = 'UPDATE ' . USERS_TABLE . " SET user_permissions = ''"; -$db->sql_query($sql); - -$cache->destroy('_acl_options'); - -echo "

Done

\n"; - -/* - $ug_type = user|group - $forum_id = forum ids (array|int|0) -> 0 == all forums - $ug_id = [int] user_id|group_id : [string] usergroup name - $acl_list = [string] acl entry : [array] acl entries - $setting = ACL_YES|ACL_NEVER|ACL_NO -*/ -function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting) -{ - global $db; - static $acl_option_ids, $group_ids; - - if ($ug_type == 'group' && is_string($ug_id)) - { - if (!isset($group_ids[$ug_id])) - { - $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " - WHERE group_name = '" . strtoupper($ug_id) . "'"; - $result = $db->sql_query_limit($sql, 1); - $id = (int) $db->sql_fetchfield('group_id', $result); - $db->sql_freeresult($result); - - if (!$id) - { - return; - } - - $group_ids[$ug_id] = $id; - } - - $ug_id = (int) $group_ids[$ug_id]; - } - - // Build correct parameters - $auth = array(); - - if (!is_array($acl_list)) - { - $auth = array($acl_list => $setting); - } - else - { - foreach ($acl_list as $auth_option) - { - $auth[$auth_option] = $setting; - } - } - unset($acl_list); - - if (!is_array($forum_id)) - { - $forum_id = array($forum_id); - } - - // Set any flags as required - foreach ($auth as $auth_option => $acl_setting) - { - $flag = substr($auth_option, 0, strpos($auth_option, '_') + 1); - if (empty($auth[$flag])) - { - $auth[$flag] = $acl_setting; - } - } - - if (!is_array($acl_option_ids) || empty($acl_option_ids)) - { - $sql = 'SELECT auth_option_id, auth_option - FROM ' . ACL_OPTIONS_TABLE; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $acl_option_ids[$row['auth_option']] = $row['auth_option_id']; - } - $db->sql_freeresult($result); - } - - $sql_forum = 'AND a.forum_id IN (' . implode(', ', array_map('intval', $forum_id)) . ')'; - - $sql = ($ug_type == 'user') ? 'SELECT o.auth_option_id, o.auth_option, a.forum_id, a.auth_setting FROM ' . ACL_USERS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . " o WHERE a.auth_option_id = o.auth_option_id $sql_forum AND a.user_id = $ug_id" : 'SELECT o.auth_option_id, o.auth_option, a.forum_id, a.auth_setting FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . " o WHERE a.auth_option_id = o.auth_option_id $sql_forum AND a.group_id = $ug_id"; - $result = $db->sql_query($sql); - - $cur_auth = array(); - while ($row = $db->sql_fetchrow($result)) - { - $cur_auth[$row['forum_id']][$row['auth_option_id']] = $row['auth_setting']; - } - $db->sql_freeresult($result); - - $table = ($ug_type == 'user') ? ACL_USERS_TABLE : ACL_GROUPS_TABLE; - $id_field = $ug_type . '_id'; - - $sql_ary = array(); - foreach ($forum_id as $forum) - { - foreach ($auth as $auth_option => $setting) - { - $auth_option_id = $acl_option_ids[$auth_option]; - - if (!$auth_option_id) - { - continue; - } - - switch ($setting) - { - case ACL_NO: - if (isset($cur_auth[$forum][$auth_option_id])) - { - $sql_ary['delete'][] = "DELETE FROM $table - WHERE forum_id = $forum - AND auth_option_id = $auth_option_id - AND $id_field = $ug_id"; - } - break; - - default: - if (!isset($cur_auth[$forum][$auth_option_id])) - { - $sql_ary['insert'][] = "$ug_id, $forum, $auth_option_id, $setting"; - } - else if ($cur_auth[$forum][$auth_option_id] != $setting) - { - $sql_ary['update'][] = "UPDATE " . $table . " - SET auth_setting = $setting - WHERE $id_field = $ug_id - AND forum_id = $forum - AND auth_option_id = $auth_option_id"; - } - } - } - } - unset($cur_auth); - - $sql = ''; - foreach ($sql_ary as $sql_type => $sql_subary) - { - switch ($sql_type) - { - case 'insert': - switch ($db->sql_layer) - { - case 'mysql': - case 'mysql4': - $sql = 'VALUES ' . implode(', ', preg_replace('#^(.*?)$#', '(\1)', $sql_subary)); - break; - - case 'mssql': - case 'sqlite': - $sql = implode(' UNION ALL ', preg_replace('#^(.*?)$#', 'SELECT \1', $sql_subary)); - break; - - default: - foreach ($sql_subary as $sql) - { - $sql = "INSERT INTO $table ($id_field, forum_id, auth_option_id, auth_setting) VALUES ($sql)"; - $result = $db->sql_query($sql); - $sql = ''; - } - } - - if ($sql != '') - { - $sql = "INSERT INTO $table ($id_field, forum_id, auth_option_id, auth_setting) $sql"; - $result = $db->sql_query($sql); - } - break; - - case 'update': - case 'delete': - foreach ($sql_subary as $sql) - { - $result = $db->sql_query($sql); - $sql = ''; - } - break; - } - unset($sql_ary[$sql_type]); - } - unset($sql_ary); - -} - -?> \ No newline at end of file diff --git a/phpBB/develop/adjust_avatars.php b/phpBB/develop/adjust_avatars.php deleted file mode 100755 index 81599e694b..0000000000 --- a/phpBB/develop/adjust_avatars.php +++ /dev/null @@ -1,147 +0,0 @@ -session_begin(); -$auth->acl($user->data); -$user->setup(); - -$echos = 0; - -if (!isset($config['avatar_salt'])) -{ - $cache->purge(); - if (!isset($config['avatar_salt'])) - { - die('database not up to date'); - } - die('database not up to date'); -} - -// let's start with the users using a group_avatar. -$sql = 'SELECT group_id, group_avatar - FROM ' . GROUPS_TABLE . ' - WHERE group_avatar_type = ' . AVATAR_UPLOAD; - -// We'll skip these, so remember them -$group_avatars = array(); - -echo '
Updating groups' . "\n"; - -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $new_avatar_name = adjust_avatar($row['group_avatar'], 'g' . $row['group_id']); - $group_avatars[] = $new_avatar_name; - - // failure is probably due to the avatar name already being adjusted - if ($new_avatar_name !== false) - { - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_avatar = '" . $db->sql_escape($new_avatar_name) . "' - WHERE user_avatar = '" . $db->sql_escape($row['group_avatar']) . "' - AND user_avatar_type = " . AVATAR_UPLOAD; - $db->sql_query($sql); - - $sql = 'UPDATE ' . GROUPS_TABLE . " - SET group_avatar = '" . $db->sql_escape($new_avatar_name) . "' - WHERE group_id = {$row['group_id']}"; - $db->sql_query($sql); - } - else - { - echo '
Failed updating group ' . $row['group_id'] . "\n"; - } - - if ($echos > 200) - { - echo '
' . "\n"; - $echos = 0; - } - - echo '.'; - $echos++; - - flush(); -} -$db->sql_freeresult($result); - -$sql = 'SELECT user_id, username, user_avatar, user_avatar_type - FROM ' . USERS_TABLE . ' - WHERE user_avatar_type = ' . AVATAR_UPLOAD . ' - AND ' . $db->sql_in_set('user_avatar', $group_avatars, true, true); -$result = $db->sql_query($sql); - -echo '
Updating users' . "\n"; - -while ($row = $db->sql_fetchrow($result)) -{ - $new_avatar_name = adjust_avatar($row['user_avatar'], $row['user_id']); - - // failure is probably due to the avatar name already being adjusted - if ($new_avatar_name !== false) - { - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_avatar = '" . $db->sql_escape($new_avatar_name) . "' - WHERE user_id = {$row['user_id']}"; - $db->sql_query($sql); - } - else - { - // nuke this avatar - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_avatar = '', user_avatar_type = 0 - WHERE user_id = {$row['user_id']}"; - $db->sql_query($sql); - echo '
Failed updating user ' . $row['user_id'] . "\n"; - } - - if ($echos > 200) - { - echo '
' . "\n"; - $echos = 0; - } - - echo '.'; - $echos++; - - flush(); -} - -$db->sql_freeresult($result); - -echo 'FINISHED'; - -// Done -$db->sql_close(); - -function adjust_avatar($old_name, $midfix) -{ - global $config, $phpbb_root_path; - - $avatar_path = $phpbb_root_path . $config['avatar_path']; - $extension = strtolower(substr(strrchr($old_name, '.'), 1)); - $new_name = $config['avatar_salt'] . '_' . $midfix . '.' . $extension; - - if (@file_exists($avatar_path . '/' . $old_name) && @is_writable($avatar_path . '/' . $old_name) && @is_writable($avatar_path . '/' . $new_name)) - { - @rename($avatar_path . '/' . $old_name, $avatar_path . '/' . $new_name); - return $midfix . '.' . $extension; - } - return false; -} - -?> \ No newline at end of file diff --git a/phpBB/develop/adjust_bbcodes.php b/phpBB/develop/adjust_bbcodes.php deleted file mode 100644 index f06f0112ab..0000000000 --- a/phpBB/develop/adjust_bbcodes.php +++ /dev/null @@ -1,174 +0,0 @@ -session_begin(); -$auth->acl($user->data); -$user->setup(); - -$echos = 0; - -// Adjust user signatures -$message_parser = new parse_message(); -$message_parser->mode = 'sig'; -$message_parser->bbcode_init(); - -$sql = 'SELECT user_id, user_sig, user_sig_bbcode_uid, user_sig_bbcode_bitfield - FROM ' . USERS_TABLE; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - // Convert bbcodes back to their normal form - if ($row['user_sig_bbcode_uid'] && $row['user_sig']) - { - decode_message($row['user_sig'], $row['user_sig_bbcode_uid']); - - $message_parser->message = $row['user_sig']; - - $message_parser->prepare_bbcodes(); - $message_parser->parse_bbcode(); - - $bitfield = $message_parser->bbcode_bitfield; - - $sql = 'UPDATE ' . USERS_TABLE . " SET user_sig_bbcode_bitfield = '" . $db->sql_escape($bitfield) . "' - WHERE user_id = " . $row['user_id']; - $db->sql_query($sql); - - if ($echos > 200) - { - echo '
' . "\n"; - $echos = 0; - } - - echo '.'; - $echos++; - - flush(); - } - else - { - $sql = 'UPDATE ' . USERS_TABLE . " SET user_sig_bbcode_bitfield = '' - WHERE user_id = " . $row['user_id']; - $db->sql_query($sql); - } -} -$db->sql_freeresult($result); - - -// Now adjust posts - -$message_parser = new parse_message(); -$message_parser->mode = 'post'; -$message_parser->bbcode_init(); - -// Update posts -$sql = 'SELECT post_id, post_text, bbcode_uid, enable_bbcode, enable_smilies, enable_sig - FROM ' . POSTS_TABLE; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - // Convert bbcodes back to their normal form - if ($row['enable_bbcode']) - { - decode_message($row['post_text'], $row['bbcode_uid']); - - $message_parser->message = $row['post_text']; - - $message_parser->prepare_bbcodes(); - $message_parser->parse_bbcode(); - - $bitfield = $message_parser->bbcode_bitfield; - - $sql = 'UPDATE ' . POSTS_TABLE . " SET bbcode_bitfield = '" . $db->sql_escape($bitfield) . "' - WHERE post_id = " . $row['post_id']; - $db->sql_query($sql); - - if ($echos > 200) - { - echo '
' . "\n"; - $echos = 0; - } - - echo '.'; - $echos++; - - flush(); - } - else - { - $sql = 'UPDATE ' . POSTS_TABLE . " SET bbcode_bitfield = '' - WHERE post_id = " . $row['post_id']; - $db->sql_query($sql); - } -} -$db->sql_freeresult($result); - -// Now to the private messages -$message_parser = new parse_message(); -$message_parser->mode = 'post'; -$message_parser->bbcode_init(); - -// Update pms -$sql = 'SELECT msg_id, message_text, bbcode_uid, enable_bbcode - FROM ' . PRIVMSGS_TABLE; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - // Convert bbcodes back to their normal form - if ($row['enable_bbcode']) - { - decode_message($row['message_text'], $row['bbcode_uid']); - - $message_parser->message = $row['message_text']; - - $message_parser->prepare_bbcodes(); - $message_parser->parse_bbcode(); - - $bitfield = $message_parser->bbcode_bitfield; - - $sql = 'UPDATE ' . PRIVMSGS_TABLE . " SET bbcode_bitfield = '" . $db->sql_escape($bitfield) . "' - WHERE msg_id = " . $row['msg_id']; - $db->sql_query($sql); - - if ($echos > 200) - { - echo '
' . "\n"; - $echos = 0; - } - - echo '.'; - $echos++; - - flush(); - } - else - { - $sql = 'UPDATE ' . PRIVMSGS_TABLE . " SET bbcode_bitfield = '' - WHERE msg_id = " . $row['msg_id']; - $db->sql_query($sql); - } -} -$db->sql_freeresult($result); - -// Done -$db->sql_close(); - -?> \ No newline at end of file diff --git a/phpBB/develop/adjust_magic_urls.php b/phpBB/develop/adjust_magic_urls.php deleted file mode 100644 index 1430a47a12..0000000000 --- a/phpBB/develop/adjust_magic_urls.php +++ /dev/null @@ -1,126 +0,0 @@ -session_begin(); -$auth->acl($user->data); -$user->setup(); - -$echos = 0; - -$replace = array( - 'sql_freeresult($result); - - -// Now adjust posts -$sql = 'SELECT post_id, post_text - FROM ' . POSTS_TABLE; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $new_content = str_replace($replace, $with, $row['post_text']); - - if ($row['post_text'] != $new_content) - { - $sql = 'UPDATE ' . POSTS_TABLE . " SET post_text = '" . $db->sql_escape($new_content) . "' - WHERE post_id = " . $row['post_id']; - $db->sql_query($sql); - - if ($echos > 200) - { - echo '
' . "\n"; - $echos = 0; - } - - echo '.'; - $echos++; - - flush(); - } -} -$db->sql_freeresult($result); - -// Now to the private messages -$sql = 'SELECT msg_id, message_text - FROM ' . PRIVMSGS_TABLE; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $new_content = str_replace($replace, $with, $row['message_text']); - - if ($row['message_text'] != $new_content) - { - $sql = 'UPDATE ' . PRIVMSGS_TABLE . " SET bbcode_bitfield = '" . $db->sql_escape($new_content) . "' - WHERE msg_id = " . $row['msg_id']; - $db->sql_query($sql); - - if ($echos > 200) - { - echo '
' . "\n"; - $echos = 0; - } - - echo '.'; - $echos++; - - flush(); - } -} -$db->sql_freeresult($result); - -// Done -$db->sql_close(); - -?> \ No newline at end of file diff --git a/phpBB/develop/adjust_sizes.php b/phpBB/develop/adjust_sizes.php deleted file mode 100644 index 7d72813056..0000000000 --- a/phpBB/develop/adjust_sizes.php +++ /dev/null @@ -1,132 +0,0 @@ -session_begin(); -$auth->acl($user->data); -$user->setup(); - -$echos = 0; - -function replace_size($matches) -{ - return '[size=' . ceil(100.0 * (((double) $matches[1])/12.0)) . ':' . $matches[2] . ']'; -} - -// Adjust user signatures -$sql = 'SELECT user_id, user_sig, user_sig_bbcode_uid - FROM ' . USERS_TABLE; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $bbcode_uid = $row['user_sig_bbcode_uid']; - - // Only if a bbcode uid is present, the signature present and a size tag used... - if ($bbcode_uid && $row['user_sig'] && strpos($row['user_sig'], '[size=') !== false) - { - $row['user_sig'] = preg_replace_callback('/\[size=(\d*):(' . $bbcode_uid . ')\]/', 'replace_size', $row['user_sig']); - - $sql = 'UPDATE ' . USERS_TABLE . " SET user_sig = '" . $db->sql_escape($row['user_sig']) . "' - WHERE user_id = " . $row['user_id']; - $db->sql_query($sql); - - if ($echos > 200) - { - echo '
' . "\n"; - $echos = 0; - } - - echo '.'; - $echos++; - - flush(); - } -} -$db->sql_freeresult($result); - - -// Now adjust posts -$sql = 'SELECT post_id, post_text, bbcode_uid, enable_bbcode - FROM ' . POSTS_TABLE; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $bbcode_uid = $row['bbcode_uid']; - - // Only if a bbcode uid is present, bbcode enabled and a size tag used... - if ($row['enable_bbcode'] && $bbcode_uid && strpos($row['post_text'], '[size=') !== false) - { - $row['post_text'] = preg_replace_callback('/\[size=(\d*):' . $bbcode_uid . '\]/', 'replace_size', $row['post_text']); - - $sql = 'UPDATE ' . POSTS_TABLE . " SET post_text = '" . $db->sql_escape($row['post_text']) . "' - WHERE post_id = " . $row['post_id']; - $db->sql_query($sql); - - if ($echos > 200) - { - echo '
' . "\n"; - $echos = 0; - } - - echo '.'; - $echos++; - - flush(); - } -} -$db->sql_freeresult($result); - -// Now to the private messages -$sql = 'SELECT msg_id, message_text, bbcode_uid, enable_bbcode - FROM ' . PRIVMSGS_TABLE; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $bbcode_uid = $row['bbcode_uid']; - - // Only if a bbcode uid is present, bbcode enabled and a size tag used... - if ($row['enable_bbcode'] && $bbcode_uid && strpos($row['message_text'], '[size=') !== false) - { - $row['message_text'] = preg_replace_callback('/\[size=(\d*):' . $bbcode_uid . '\]/', 'replace_size', $row['message_text']); - - $sql = 'UPDATE ' . PRIVMSGS_TABLE . " SET message_text = '" . $db->sql_escape($row['message_text']) . "' - WHERE msg_id = " . $row['msg_id']; - $db->sql_query($sql); - - if ($echos > 200) - { - echo '
' . "\n"; - $echos = 0; - } - - echo '.'; - $echos++; - - flush(); - } -} -$db->sql_freeresult($result); - -// Done -$db->sql_close(); - -?> \ No newline at end of file diff --git a/phpBB/develop/adjust_smilies.php b/phpBB/develop/adjust_smilies.php deleted file mode 100644 index 774c8834f6..0000000000 --- a/phpBB/develop/adjust_smilies.php +++ /dev/null @@ -1,130 +0,0 @@ -session_begin(); -$auth->acl($user->data); -$user->setup(); - -$echos = 0; - -$replace = array( - 'sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $new_content = str_replace($replace, $with, $row['user_sig']); - - if ($new_content != $row['user_sig']) - { - $sql = 'UPDATE ' . USERS_TABLE . " SET user_sig = '" . $db->sql_escape($new_content) . "' - WHERE user_id = " . $row['user_id']; - $db->sql_query($sql); - - if ($echos > 200) - { - echo '
' . "\n"; - $echos = 0; - } - - echo '.'; - $echos++; - - flush(); - } -} -$db->sql_freeresult($result); - - -// Now adjust posts -$sql = 'SELECT post_id, post_text - FROM ' . POSTS_TABLE; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $new_content = str_replace($replace, $with, $row['post_text']); - - if ($row['post_text'] != $new_content) - { - $sql = 'UPDATE ' . POSTS_TABLE . " SET post_text = '" . $db->sql_escape($new_content) . "' - WHERE post_id = " . $row['post_id']; - $db->sql_query($sql); - - if ($echos > 200) - { - echo '
' . "\n"; - $echos = 0; - } - - echo '.'; - $echos++; - - flush(); - } -} -$db->sql_freeresult($result); - -// Now to the private messages -$sql = 'SELECT msg_id, message_text - FROM ' . PRIVMSGS_TABLE; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $new_content = str_replace($replace, $with, $row['message_text']); - - if ($row['message_text'] != $new_content) - { - $sql = 'UPDATE ' . PRIVMSGS_TABLE . " SET bbcode_bitfield = '" . $db->sql_escape($new_content) . "' - WHERE msg_id = " . $row['msg_id']; - $db->sql_query($sql); - - if ($echos > 200) - { - echo '
' . "\n"; - $echos = 0; - } - - echo '.'; - $echos++; - - flush(); - } -} -$db->sql_freeresult($result); - -// Done -$db->sql_close(); - -?> \ No newline at end of file diff --git a/phpBB/develop/adjust_uids.php b/phpBB/develop/adjust_uids.php deleted file mode 100755 index d301f3cadb..0000000000 --- a/phpBB/develop/adjust_uids.php +++ /dev/null @@ -1,129 +0,0 @@ -session_begin(); -$auth->acl($user->data); -$user->setup(); - -$echos = 0; - - -// Adjust user signatures -$sql = 'SELECT user_id, user_sig, user_sig_bbcode_uid - FROM ' . USERS_TABLE . ' - ORDER BY user_id ASC'; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $bbcode_uid = $row['user_sig_bbcode_uid']; - - // Only if a bbcode uid is present, the signature present and a size tag used... - if (!empty($bbcode_uid) && strpos($row['user_sig'], $bbcode_uid) === false) - { - $row['user_sig'] = preg_replace('/\:[0-9a-z]{8}\]/', ":$bbcode_uid]", $row['user_sig']); - - $sql = 'UPDATE ' . USERS_TABLE . " SET user_sig = '" . $db->sql_escape($row['user_sig']) . "' - WHERE user_id = " . $row['user_id']; - $db->sql_query($sql); - - if ($echos > 200) - { - echo '
User: ' . "{$row['user_id']}\n"; - $echos = 0; - } - - echo '.'; - $echos++; - - flush(); - } -} -$db->sql_freeresult($result); - - -// Now adjust posts -$sql = 'SELECT post_id, post_text, bbcode_uid, enable_bbcode - FROM ' . POSTS_TABLE . ' - ORDER BY post_id ASC'; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $bbcode_uid = $row['bbcode_uid']; - - // Only if a bbcode uid is present, bbcode enabled and a size tag used... - if ($row['enable_bbcode'] && !empty($bbcode_uid) && strpos($row['post_text'], $bbcode_uid) === false) - { - $row['post_text'] = preg_replace('/\:[0-9a-z]{8}\]/', ":$bbcode_uid]", $row['post_text']); - - $sql = 'UPDATE ' . POSTS_TABLE . " SET post_text = '" . $db->sql_escape($row['post_text']) . "' - WHERE post_id = " . $row['post_id']; - $db->sql_query($sql); - - if ($echos > 200) - { - echo '
Post: ' . "{$row['post_id']} \n"; - $echos = 0; - } - - echo '.'; - $echos++; - - flush(); - } -} -$db->sql_freeresult($result); - -// Now to the private messages -$sql = 'SELECT msg_id, message_text, bbcode_uid, enable_bbcode - FROM ' . PRIVMSGS_TABLE; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $bbcode_uid = $row['bbcode_uid']; - - // Only if a bbcode uid is present, bbcode enabled and a size tag used... - if ($row['enable_bbcode'] && !empty($bbcode_uid) && strpos($row['message_text'], $bbcode_uid) === false) - { - $row['message_text'] = preg_replace('/\:[0-9a-z]{8}\]/', ":$bbcode_uid]", $row['message_text']); - - $sql = 'UPDATE ' . PRIVMSGS_TABLE . " SET message_text = '" . $db->sql_escape($row['message_text']) . "' - WHERE msg_id = " . $row['msg_id']; - $db->sql_query($sql); - - if ($echos > 200) - { - echo '
' . "\n"; - $echos = 0; - } - - echo '.'; - $echos++; - - flush(); - } -} -$db->sql_freeresult($result); - -// Done -$db->sql_close(); -echo 'done'; -?> \ No newline at end of file diff --git a/phpBB/develop/adjust_usernames.php b/phpBB/develop/adjust_usernames.php deleted file mode 100644 index 1afa77af16..0000000000 --- a/phpBB/develop/adjust_usernames.php +++ /dev/null @@ -1,52 +0,0 @@ -session_begin(); -$auth->acl($user->data); -$user->setup(); - -$echos = 0; - -$sql = 'SELECT user_id, username - FROM ' . USERS_TABLE; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $sql = 'UPDATE ' . USERS_TABLE . " - SET username_clean = '" . $db->sql_escape(utf8_clean_string($row['username'])) . "' - WHERE user_id = " . $row['user_id']; - $db->sql_query($sql); - - if ($echos > 200) - { - echo '
' . "\n"; - $echos = 0; - } - - echo '.'; - $echos++; - - flush(); -} -$db->sql_freeresult($result); - -echo 'FINISHED'; - -// Done -$db->sql_close(); - -?> \ No newline at end of file diff --git a/phpBB/develop/bbcode_conversion.php b/phpBB/develop/bbcode_conversion.php new file mode 100644 index 0000000000..f340b7d18f --- /dev/null +++ b/phpBB/develop/bbcode_conversion.php @@ -0,0 +1,218 @@ +Creating backup table..

\n"; +flush(); + +$result = $db->sql_query($sql); +if (!$result) +{ + $db_error = $db->sql_error(); + die("Error doing DB backup table creation. Reason: " . $db_error["message"]); +} + +$sql = "insert into $backup_name select * from $table_name"; + +echo "

Populating backup table..

\n"; +flush(); + +$result = $db->sql_query($sql); +if (!$result) +{ + $db_error = $db->sql_error(); + die("Error doing DB backup table data moving. Reason: " . $db_error["message"]); +} + + +$sql = "SELECT p.post_id, t.post_text FROM " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " t WHERE (p.post_id = t.post_id)"; +if(!$result = $db->sql_query($sql)) +{ + die("error getting posts to work on"); +} +if(!$total_rows = $db->sql_numrows($result)) +{ + die("error getting rowcount"); +} + +echo "

Found $total_rows total rows to work on.

\n"; +flush(); + +$row = $db->sql_fetchrowset($result); + +for($i = 0; $i < $total_rows; $i++) +{ + $post_id = $row[$i]['post_id']; + $text = $row[$i]['post_text']; + + // undo 1.2.x encoding.. + $text = bbdecode($text); + $text = undo_make_clickable($text); + $text = str_replace("
", "\n", $text); + + // make a uid + $uid = make_bbcode_uid(); + + // do 2.x first-pass encoding.. + $text = bbencode_first_pass($text, $uid); + + $text = addslashes($text); + + // put the uid in the database. + $sql = "UPDATE " . POSTS_TABLE . " SET bbcode_uid='" . $uid . "' WHERE (post_id = $post_id)"; + $result = $db->sql_query($sql); + if (!$result) + { + $db_error = $db->sql_error(); + die("Error doing DB update in posts table. Reason: " . $db_error["message"] . " sql: $sql"); + } + // Put the post text back in the database. + $sql = "UPDATE " . POSTS_TEXT_TABLE . " SET post_text='" . $text . "' WHERE (post_id = $post_id)"; + $result = $db->sql_query($sql); + if (!$result) + { + $db_error = $db->sql_error(); + die("Error doing DB update in post text table. Reason: " . $db_error["message"] . " sql: $sql"); + } + + if (($i % 100) == 0) + { + echo "Done post: $i
\n"; + flush(); + } + + +} + + + +echo "

Done.

\n"; + + + +// ------------------------------------------------------------------------------- +// Everything below here is 1.x BBCode functions. +// ------------------------------------------------------------------------------- + + +function bbdecode($message) { + + // Undo [code] + $code_start_html = "
Code:
";
+		$code_end_html = "

"; + $message = str_replace($code_start_html, "[code]", $message); + $message = str_replace($code_end_html, "[/code]", $message); + + // Undo [quote] + $quote_start_html = "
Quote:
"; + $quote_end_html = "

"; + $message = str_replace($quote_start_html, "[quote]", $message); + $message = str_replace($quote_end_html, "[/quote]", $message); + + // Undo [b] and [i] + $message = preg_replace("#(.*?)#s", "[b]\\1[/b]", $message); + $message = preg_replace("#(.*?)#s", "[i]\\1[/i]", $message); + + // Undo [url] (long form) + $message = preg_replace("#
(.*?)#s", "[url=\\1\\2]\\3[/url]", $message); + + // Undo [url] (short form) + $message = preg_replace("#(.*?)#s", "[url]\\3[/url]", $message); + + // Undo [email] + $message = preg_replace("#(.*?)#s", "[email]\\1[/email]", $message); + + // Undo [img] + $message = preg_replace("##s", "[img]\\1[/img]", $message); + + // Undo lists (unordered/ordered) + + //
  • tags: + $message = str_replace("
  • ", "[*]", $message); + + // [list] tags: + $message = str_replace("
      ", "[list]", $message); + + // [list=x] tags: + $message = preg_replace("#
        #si", "[list=\\1]", $message); + + // [/list] tags: + $message = str_replace("
    ", "[/list]", $message); + $message = str_replace("", "[/list]", $message); + + return($message); +} + + +/** + * Nathan Codding - Feb 6, 2001 + * Reverses the effects of make_clickable(), for use in editpost. + * - Does not distinguish between "www.xxxx.yyyy" and "http://aaaa.bbbb" type URLs. + * + */ + +function undo_make_clickable($text) { + + $text = preg_replace("#.*?#i", "\\1", $text); + $text = preg_replace("#.*?#i", "\\1", $text); + + return $text; + +} + + + + +?> diff --git a/phpBB/develop/benchmark.php b/phpBB/develop/benchmark.php index 5bbe6f53be..6588b7cea2 100644 --- a/phpBB/develop/benchmark.php +++ b/phpBB/develop/benchmark.php @@ -13,11 +13,11 @@ die("Please read the first lines of this script for instructions on how to enabl // Do not change anything below this line. // - +define('IN_PHPBB', true); $phpbb_root_path = "../"; include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'common.'.$phpEx); -include($phpbb_root_path . 'includes/post.'.$phpEx); +include($phpbb_root_path . 'includes/functions_post.'.$phpEx); include($phpbb_root_path . 'includes/bbcode.'.$phpEx); srand ((double) microtime() * 1000000); @@ -51,6 +51,9 @@ And a quote! [/quote] '; +$users = intval($HTTP_GET_VARS['users']); +$posts = intval($HTTP_GET_VARS['posts']); +$size = intval($HTTP_GET_VARS['size']); // The script expects the ID's in the tables to sequential (1,2,3,4,5), // so no holes please (1,4,5,8)... @@ -88,7 +91,9 @@ if ($posts > 0) $endtime = microtime(); -if ($submit="" || !isset($submit)) +$submit = (isset($HTTP_GET_VARS['submit'])) ? true : false; + +if (!$submit) { ?> Hello, welcome to this little phpBB Benchmarking script :)

    @@ -219,10 +224,10 @@ function make_topic($user_id, $subject, $forum_id) $topic_vote = 0; $current_time = time(); - $sql = "INSERT INTO " . TOPICS_TABLE . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_vote) - VALUES ('$subject', $user_id, $current_time, $forum_id, " . TOPIC_UNLOCKED . ", $topic_type, $topic_vote)"; + $sql = "INSERT INTO " . TOPICS_TABLE . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_vote) + VALUES ('$subject', $user_id, $current_time, $forum_id, " . TOPIC_UNLOCKED . ", $topic_type, $topic_vote)"; - if( $result = $db->sql_query($sql, BEGIN_TRANSACTION) ) + if( $result = $db->sql_query($sql) ) { $new_topic_id = $db->sql_nextid(); } @@ -238,17 +243,14 @@ function make_topic($user_id, $subject, $forum_id) -function create_posting($userid, $topic_id, $forum, $mode='newtopic') +function create_posting($userid, $topic_id, $forum, $mode = 'newtopic') { $message = generatepost(); return make_post($topic_id, $forum, $userid, "", $message, $mode); - } - - -function make_post($new_topic_id, $forum_id, $user_id, $post_username, $text, $mode='newtopic') +function make_post($new_topic_id, $forum_id, $user_id, $post_username, $text, $mode = 'newtopic') { global $db; $current_time = time(); @@ -261,65 +263,54 @@ function make_post($new_topic_id, $forum_id, $user_id, $post_username, $text, $m $post_subject = 'random subject'; - $post_message = prepare_message($text, $html_on, $bbcode_on, $smilies_on, $bbcode_uid); + $post_message = prepare_message($text, $html_on, $bbcode_on, $smilies_on, $bbcode_uid); - $sql = "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, attach_id, icon_id, post_username, post_time, poster_ip, post_approved, bbcode_uid, enable_bbcode, enable_html, enable_smilies, enable_sig, post_subject, post_text) - VALUES ($new_topic_id, $forum_id, $user_id, 0, 0, '$post_username', $current_time, '$user_ip', 1, '$bbcode_uid', $bbcode_on, $html_on, $smilies_on, $attach_sig, '$post_subject', '$post_message')"; + $sql = "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, enable_bbcode, enable_html, enable_smilies, enable_sig) + VALUES ($new_topic_id, $forum_id, $user_id, '$post_username', $current_time, '$user_ip', $bbcode_on, $html_on, $smilies_on, $attach_sig)"; $result = $db->sql_query($sql); - if ($result) + if($result) { $new_post_id = $db->sql_nextid(); - $sql = "UPDATE " . TOPICS_TABLE . " - SET topic_last_post_id = $new_post_id"; - if($mode == "reply") - { - $sql .= ", topic_replies = topic_replies + 1 "; - } - $sql .= " WHERE topic_id = $new_topic_id"; - + $sql = "INSERT INTO " . POSTS_TEXT_TABLE . " (post_id, post_subject, bbcode_uid, post_text) + VALUES ($new_post_id, '$post_subject', '$bbcode_uid', '$post_message')"; + if($db->sql_query($sql)) { - $sql = "UPDATE " . FORUMS_TABLE . " - SET forum_last_post_id = $new_post_id, forum_posts = forum_posts + 1"; - if($mode == "newtopic") + $post_data = array(); + $post_data['first_post'] = false; + $post_data['last_post'] = true; + + $sql = "SELECT SUM(post_id) as total FROM " . POSTS_TABLE . " WHERE topic_id = " . $new_topic_id; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $total = intval($row['total']); + + if ($total == 1) { - $sql .= ", forum_topics = forum_topics + 1"; - } - $sql .= " WHERE forum_id = $forum_id"; - - if($db->sql_query($sql)) - { - $sql = "UPDATE " . USERS_TABLE . " - SET user_posts = user_posts + 1 - WHERE user_id = " . $user_id; - - if($db->sql_query($sql, END_TRANSACTION)) - { - // SUCCESS. - return true; - } - else - { - message_die(GENERAL_ERROR, "Error updating users table", "", __LINE__, __FILE__, $sql); - } - } - else - { - message_die(GENERAL_ERROR, "Error updating forums table", "", __LINE__, __FILE__, $sql); + $post_data['first_post'] = true; } + + $sql = "SELECT forum_last_post_id + FROM " . FORUMS_TABLE . " + WHERE forum_id = $forum_id"; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $post_data['last_topic'] = ( $row['forum_last_post_id'] == $new_post_id ) ? true : false; + + update_post_stats($mode, $post_data, $forum_id, $new_topic_id, $new_post_id, $user_id); } else { // Rollback - if($db->sql_layer == "mysql") + if(SQL_LAYER == "mysql") { $sql = "DELETE FROM " . POSTS_TABLE . " WHERE post_id = $new_post_id"; $db->sql_query($sql); } - message_die(GENERAL_ERROR, "Error updating topics table", "", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, "Error inserting data into posts text table", "", __LINE__, __FILE__, $sql); } } else @@ -329,7 +320,7 @@ function make_post($new_topic_id, $forum_id, $user_id, $post_username, $text, $m } -function generatepost($size=850) +function generatepost($size = 850) { global $bigass_text; // Returns a string with a length between $size and $size*0.2 @@ -406,23 +397,7 @@ function make_user($username) message_die(GENERAL_ERROR, "Couldn't obtained next user_id information.", "", __LINE__, __FILE__, $sql); } - $sql = "SELECT MAX(group_id) AS total - FROM " . GROUPS_TABLE; - if($result = $db->sql_query($sql)) - { - $row = $db->sql_fetchrow($result); - $new_group_id = $row['total'] + 1; - - unset($result); - unset($row); - } - else - { - message_die(GENERAL_ERROR, "Couldn't obtained next user_id information.", "", __LINE__, __FILE__, $sql); - } - - - $sql = "INSERT INTO " . USERS_TABLE . " (user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmilies, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey) + $sql = "INSERT INTO " . USERS_TABLE . " (user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey) VALUES ($new_user_id, '$username', " . time() . ", '$password', '$email', '$icq', '$website', '$occupation', '$location', '$interests', '$signature', '$signature_bbcode_uid', '$avatar_filename', $viewemail, '$aim', '$yim', '$msn', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $user_timezone, '$user_dateformat', '$user_lang', $user_style, 0, 1, "; @@ -430,12 +405,14 @@ function make_user($username) if($result = $db->sql_query($sql, BEGIN_TRANSACTION)) { - $sql = "INSERT INTO " . GROUPS_TABLE . " (group_id, group_name, group_description, group_single_user, group_moderator) - VALUES ($new_group_id, '', 'Personal User', 1, 0)"; + $sql = "INSERT INTO " . GROUPS_TABLE . " (group_name, group_description, group_single_user, group_moderator) + VALUES ('', 'Personal User', 1, 0)"; if($result = $db->sql_query($sql)) { + $group_id = $db->sql_nextid(); + $sql = "INSERT INTO " . USER_GROUP_TABLE . " (user_id, group_id, user_pending) - VALUES ($new_user_id, $new_group_id, 0)"; + VALUES ($new_user_id, $group_id, 0)"; if($result = $db->sql_query($sql, END_TRANSACTION)) { @@ -459,4 +436,8 @@ function make_user($username) } + + + + ?> \ No newline at end of file diff --git a/phpBB/develop/calc_email_hash.php b/phpBB/develop/calc_email_hash.php deleted file mode 100644 index a67b0f52a3..0000000000 --- a/phpBB/develop/calc_email_hash.php +++ /dev/null @@ -1,76 +0,0 @@ -sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false); - -$start = 0; -do -{ - // Batch query for group members, call group_user_del - $sql = "SELECT user_id, user_email - FROM {$table_prefix}users - LIMIT $start, 100"; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - do - { - $sql = "UPDATE {$table_prefix}users - SET user_email_hash = " . (crc32(strtolower($row['user_email'])) . strlen($row['user_email'])) . ' - WHERE user_id = ' . $row['user_id']; - $db->sql_query($sql); - - $start++; - } - while ($row = $db->sql_fetchrow($result)); - - echo "
    Batch -> $start\n"; - flush(); - } - else - { - $start = 0; - } - $db->sql_freeresult($result); -} -while ($start); - -echo "

    Done

    \n"; - -?> \ No newline at end of file diff --git a/phpBB/develop/change_smiley_ref.php b/phpBB/develop/change_smiley_ref.php deleted file mode 100644 index db65dd52d4..0000000000 --- a/phpBB/develop/change_smiley_ref.php +++ /dev/null @@ -1,62 +0,0 @@ -sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false); - -$sql = "SELECT post_id, post_text FROM {$table_prefix}posts WHERE post_text LIKE '%{SMILE_PATH}%'"; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $db->sql_query("UPDATE {$table_prefix}posts SET post_text = '" . $db->sql_escape(str_replace('{SMILE_PATH}', '{SMILIES_PATH}', $row['post_text'])) . "' WHERE post_id = " . $row['post_id']); -} -$db->sql_freeresult($result); - -echo "

    Done

    \n"; - -?> \ No newline at end of file diff --git a/phpBB/develop/convert_avatars.php b/phpBB/develop/convert_avatars.php new file mode 100644 index 0000000000..4f090451d6 --- /dev/null +++ b/phpBB/develop/convert_avatars.php @@ -0,0 +1,65 @@ +sql_query($sql) ) +{ + die("Couldn't alter users table"); +} + +$sql = "SELECT user_id, user_avatar + FROM " . USERS_TABLE; +if( $result = $db->sql_query($sql) ) +{ + $rowset = $db->sql_fetchrowset($result); + + for($i = 0; $i < count($rowset); $i++) + { + if( ereg("^http", $rowset[$i]['user_avatar'])) + { + $sql_type = USER_AVATAR_REMOTE; + } + else if( $rowset[$i]['user_avatar'] != "" ) + { + $sql_type = USER_AVATAR_UPLOAD; + } + else + { + $sql_type = USER_AVATAR_NONE; + } + + $sql = "UPDATE " . USERS_TABLE . " + SET user_avatar_type = $sql_type + WHERE user_id = " . $rowset[$i]['user_id']; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't update users table- " . $i); + } + } +} + +echo "

    COMPLETE
    "; + +?> diff --git a/phpBB/develop/convert_bbcodeuid.php b/phpBB/develop/convert_bbcodeuid.php new file mode 100644 index 0000000000..4a2a223e20 --- /dev/null +++ b/phpBB/develop/convert_bbcodeuid.php @@ -0,0 +1,96 @@ +sql_query($sql)) + { + print "
    \n"; + print "$errormsg
    "; + $sql_error = $db->sql_error(); + print $sql_error['code'] .": ". $sql_error['message']. "
    \n"; + print "
    $sql
    "; + print "
    \n"; + return FALSE; + } + else + { + return $result; + } +} + +if($HTTP_GET_VARS['delete'] == 'true') +{ + $sql = "ALTER TABLE ".POSTS_TABLE." + DROP bbcode_uid"; + query($sql, "Didn't manage to drop the bbcode_uid table in ".POSTS_TABLE); + print "All done now. Deleted the bbcode_uid column from the posts table.

    "; + exit; +} + + +$sql = "ALTER TABLE ".POSTS_TEXT_TABLE." + ADD bbcode_uid char(10) NOT NULL"; +print "Adding bbcode_uid field to ".POSTS_TEXT_TABLE.".
    \n"; +$result = query($sql, "Couldn't get add bbcode_uid field to ".POSTS_TEXT_TABLE."."); + +$sql = " + SELECT + count(*) as total, + max(post_id) as maxid + FROM ". POSTS_TABLE; +$result = query($sql, "Couldn't get max post_id."); +$maxid = $db->sql_fetchrow($result); +$totalposts = $maxid['total']; +$maxid = $maxid['maxid']; + +$batchsize = 200; +print "Going to convert BBcode in posts with $batchsize messages at a time and $totalposts in total.
    \n"; +for($i = 0; $i <= $maxid; $i += $batchsize) +{ + $batchstart = $i + 1; + $batchend = $i + $batchsize; + + print "Moving BBcode UID in post number $batchstart to $batchend
    \n"; + flush(); + $sql = " + SELECT + post_id, + bbcode_uid + FROM " + .POSTS_TABLE." + WHERE + post_id BETWEEN $batchstart AND $batchend"; + $result = query($sql, "Couldn't get ". POSTS_TABLE .".post_id $batchstart to $batchend"); + while($row = mysql_fetch_array($result)) + { + query("UPDATE ".POSTS_TEXT_TABLE." set bbcode_uid = '". $row['bbcode_uid']. "' WHERE post_id = ".$row['post_id'], "Was unable to update the posts text table with the BBcode_uid"); + } +} + +echo "Click HERE to remove the bbcode_uid table from the POSTS table (if you didn't get any serious error messages).

    "; + +$db->sql_close(); + +?> diff --git a/phpBB/develop/convert_conf.php b/phpBB/develop/convert_conf.php new file mode 100644 index 0000000000..09c71e8c03 --- /dev/null +++ b/phpBB/develop/convert_conf.php @@ -0,0 +1,110 @@ +sql_query($sql)) +{ + message_die(CRITICAL_ERROR, "Could not query config information", "", __LINE__, __FILE__, $sql); +} +else +{ + $board_config = $db->sql_fetchrow($result); +} + +$newconfigtable = $table_prefix . "newconfig"; + +$sql = "SELECT config_name, config_value FROM ". CONFIG_TABLE; +if( $result = $db->sql_query($sql) ) +{ + die("Don't run this script twice!
    \n"); +} + +$sql = " CREATE TABLE $newconfigtable ( + config_name varchar(255) NOT NULL, + config_value varchar(255) NOT NULL, + PRIMARY KEY (config_name) + )"; +print "Creating temporary table: $newconfigtable

    \n"; +if( !$result = $db->sql_query($sql) ) +{ + print("Couldn't create new config table
    \n"); +} + +$error = 0; +while (list($name, $value) = each($board_config)) +{ + if(is_int($name)) + { + // Skip numeric array elements (we only want the associative array) + continue; + } + + // Rename sys_template + if ($name == 'sys_template') + { + $name = 'board_template'; + } + // Rename system_timezone + if ($name == 'system_timezone') + { + $name = 'board_timezone'; + } + print "$name = $value
    \n"; + $value = addslashes($value); + $sql = "INSERT INTO $newconfigtable (config_name, config_value) VALUES ('$name', '$value')"; + if( !$result = $db->sql_query($sql) ) + { + print("Couldn't insert '$name' into new config table"); + $error = 1; + } +} + +if ($error != 1) +{ + print "Dropping old table

    \n"; + $sql = "DROP TABLE ". CONFIG_TABLE; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't drop old table"); + } + print "Renaming $newconfigtable to ".CONFIG_TABLE."

    \n"; + $sql = "ALTER TABLE $newconfigtable RENAME ".CONFIG_TABLE; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't rename new config table"); + } + print "Renaming ".SESSIONS_TABLE." to ".$table_prefix."sessions
    \n"; + $sql = "ALTER TABLE ".SESSIONS_TABLE." RENAME ".$table_prefix."sessions"; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't rename session table"); + } + +} + +$db->sql_close(); + + echo "

    COMPLETE
    "; + +?> diff --git a/phpBB/develop/convert_privmsgs.php b/phpBB/develop/convert_privmsgs.php new file mode 100644 index 0000000000..df4f662c8e --- /dev/null +++ b/phpBB/develop/convert_privmsgs.php @@ -0,0 +1,181 @@ +sql_query($sql) ) +{ + die("Couldn't alter privmsgs table"); +} +echo $sql = "ALTER TABLE " . PRIVMSGS_TEXT_TABLE . " + ADD privmsgs_bbcode_uid CHAR(10) AFTER privmsgs_text_id"; +if( !$result = $db->sql_query($sql) ) +{ + die("Couldn't alter privmsgs text table"); +} +echo "COMPLETE
    "; + +// +// Move bbcode ... +// +echo "Move bbcode uid's ... "; + +$sql = "SELECT privmsgs_id, privmsgs_bbcode_uid + FROM " . PRIVMSGS_TABLE; +if( $result = $db->sql_query($sql) ) +{ + $rowset = $db->sql_fetchrowset($result); + + for($i = 0; $i < count($rowset); $i++) + { + $sql = "UPDATE " . PRIVMSGS_TEXT_TABLE . " + SET privmsgs_bbcode_uid = '" . $rowset[$i]['privmsgs_bbcode_uid'] . "' + WHERE privmsgs_text_id = " . $rowset[$i]['privmsgs_id']; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't update privmsgs text bbcode - " . $i); + } + } + + $sql = "ALTER TABLE " . PRIVMSGS_TABLE . " + DROP privmsgs_bbcode_uid"; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't alter privmsgs table - drop privmsgs_bbcode_uid"); + } +} + +echo "COMPLETE
    "; + +// +// Stripslashes from titles +// +echo "Strip subject slashes ... "; + +$sql = "SELECT privmsgs_subject , privmsgs_id, privmsgs_to_userid, privmsgs_from_userid + FROM " . PRIVMSGS_TABLE; +if( $result = $db->sql_query($sql) ) +{ + $rowset = $db->sql_fetchrowset($result); + + for($i = 0; $i < count($rowset); $i++) + { + $sql = "UPDATE " . PRIVMSGS_TABLE . " + SET privmsgs_subject = '" . addslashes(stripslashes($rowset[$i]['privmsgs_subject'])) . "' + WHERE privmsgs_id = " . $rowset[$i]['privmsgs_id']; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't update subjects - $i"); + } + } +} +echo "COMPLETE
    "; + +// +// Update sigs +// +echo "Remove [addsig], stripslashes and update privmsgs table sig enable ..."; + +$sql = "SELECT privmsgs_text_id , privmsgs_text + FROM " . PRIVMSGS_TEXT_TABLE; +if( $result = $db->sql_query($sql) ) +{ + $rowset = $db->sql_fetchrowset($result); + + $attach_sql = ""; + $non_attach_sql = ""; + + for($i = 0; $i < count($rowset); $i++) + { + if( ereg("\[addsig]$", $rowset[$i]['privmsgs_text'])) + { + if( $attach_sql != "" ) + { + $attach_sql .= ", "; + } + $attach_sql .= $rowset[$i]['privmsgs_text_id']; + + $sql = "UPDATE " . PRIVMSGS_TEXT_TABLE . " + SET privmsgs_text = '" . addslashes(preg_replace("/\[addsig\]/is", "", stripslashes($rowset[$i]['privmsgs_text']))) . "' + WHERE privmsgs_text_id = " . $rowset[$i]['privmsgs_text_id']; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't update privmsgs text - " . $i); + } + + } + else + { + $sql = "UPDATE " . PRIVMSGS_TEXT_TABLE . " + SET privmsgs_text = '" . addslashes(stripslashes($rowset[$i]['privmsgs_text'])) . "' + WHERE privmsgs_text_id = " . $rowset[$i]['privmsgs_text_id']; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't update privmsgs text - " . $i); + } + + if( $non_attach_sql != "" ) + { + $non_attach_sql .= ", "; + } + $non_attach_sql .= $rowset[$i]['privmsgs_text_id']; + } + } + + if( $attach_sql != "" ) + { + $sql = "UPDATE " . PRIVMSGS_TABLE . " + SET privmsgs_attach_sig = 1 + WHERE privmsgs_id IN ($attach_sql)"; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't update privmsgs table attach_sig - "); + } + } + + if( $non_attach_sql != "" ) + { + $sql = "UPDATE " . PRIVMSGS_TABLE . " + SET privmsgs_attach_sig = 0 + WHERE privmsgs_id IN ($non_attach_sql)"; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't update privmsgs table non_attach_sig - "); + } + } + +} + +echo "COMPLETE
    "; + +$db->sql_close(); + +?> diff --git a/phpBB/develop/convert_sigs.php b/phpBB/develop/convert_sigs.php new file mode 100644 index 0000000000..501106fc10 --- /dev/null +++ b/phpBB/develop/convert_sigs.php @@ -0,0 +1,93 @@ +sql_query($sql) ) +{ + $rowset = $db->sql_fetchrowset($result); + + $attach_sql = ""; + $non_attach_sql = ""; + + for($i = 0; $i < count($rowset); $i++) + { + if( ereg("\[addsig]$", $rowset[$i]['post_text'])) + { + if( $attach_sql != "" ) + { + $attach_sql .= ", "; + } + $attach_sql .= $rowset[$i]['post_id']; + + $sql = "UPDATE " . POSTS_TEXT_TABLE . " + SET post_text = '" . addslashes(preg_replace("/\[addsig\]/is", "", $rowset[$i]['post_text'])) . "' + WHERE post_id = " . $rowset[$i]['post_id']; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't update post_text - " . $i); + } + + } + else + { + if( $non_attach_sql != "" ) + { + $non_attach_sql .= ", "; + } + $non_attach_sql .= $rowset[$i]['post_id']; + } + } + + echo "
    "; + + if( $attach_sql != "" ) + { + echo $sql = "UPDATE " . POSTS_TABLE . " + SET enable_sig = 1 + WHERE post_id IN ($attach_sql)"; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't update post table attach_sig - "); + } + } + + echo "
    "; + + if( $non_attach_sql != "" ) + { + echo $sql = "UPDATE " . POSTS_TABLE . " + SET enable_sig = 0 + WHERE post_id IN ($non_attach_sql)"; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't update post table non_attach_sig - "); + } + } + +} + +$db->sql_close(); + + echo "

    COMPLETE
    "; + +?> diff --git a/phpBB/develop/convert_user_regdates.php b/phpBB/develop/convert_user_regdates.php new file mode 100644 index 0000000000..21737edda4 --- /dev/null +++ b/phpBB/develop/convert_user_regdates.php @@ -0,0 +1,84 @@ + + + 1, + "Feb" => 2, + "Mar" => 3, + "Apr" => 4, + "May" => 5, + "Jun" => 6, + "Jul" => 7, + "Aug" => 8, + "Sep" => 9, + "Oct" => 10, + "Nov" => 11, + "Dec" => 12 + ); + + $sql = "SELECT user_id, user_regdate FROM ".USERS_TABLE; + $result = $db->sql_query($sql); + if(!$result) + { + die("OOpppps, that didn't work!"); + } + + $all_old_dates = $db->sql_fetchrowset($result); + + $sql = "ALTER TABLE ".USERS_TABLE." + CHANGE user_regdate user_regdate INT (11) NOT NULL"; + $result = $db->sql_query($sql); + if(!$result) + { + die("Opps, that didn't work either ... oh damn!"); + } + + + for($i = 0; $i < count($all_old_dates); $i++) + { + if(is_string($all_old_dates[$i]['user_regdate'])) + { + if(eregi("^([a-zA-Z]{3}) ([0-9]+), ([0-9]{4})", $all_old_dates[$i]['user_regdate'], $result)) + { + echo $all_old_dates[$i]['user_regdate']." : "; + echo $new_time = gmmktime(0, 1, 0, $months[$result[1]], $result[2], $result[3]); + echo " : ".gmdate("M d, Y", $new_time)."
    "; + $sql = "UPDATE phpbb_users + SET user_regdate = '$new_time' + WHERE user_id = '".$all_old_dates[$i]['user_id']."'"; + $result = $db->sql_query($sql); + if(!$result) + { + die("Oh damn it, now that's really broken it!"); + } + } + } + } + + echo "
    That's All Folks!"; + +?> + + diff --git a/phpBB/develop/convert_usernames.php b/phpBB/develop/convert_usernames.php new file mode 100644 index 0000000000..ba5935eaa3 --- /dev/null +++ b/phpBB/develop/convert_usernames.php @@ -0,0 +1,67 @@ + + +sql_query($sql); + +if(!$result) +{ + die("Unable to get users"); +} + +while ($row = $db->sql_fetchrow($result)) +{ + if (!preg_match('#(>)|(<)|(")|(&)#', $row['username'])) + { + if ($row['username'] != htmlspecialchars($row['username'])) + { + flush(); + $sql = "UPDATE " . USERS_TABLE . " + SET username = '" . str_replace("'", "''", htmlspecialchars($row['username'])) . "' + WHERE user_id = " . $row['user_id']; + if (!$db->sql_query($sql)) + { + echo "ERROR: Unable to rename user " . htmlspecialchars($row['username']) . " with ID " . $row['user_id'] . "
    "; + echo "

    " . print_r($db->sql_error()) . "

    $sql"; + } + else + { + echo "Renamed User " . htmlspecialchars($row['username']) . " with ID " . $row['user_id'] . "
    "; + } + } + } +} + +echo "
    That's All Folks!"; + +?> + + diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php deleted file mode 100644 index 58057df300..0000000000 --- a/phpBB/develop/create_schema_files.php +++ /dev/null @@ -1,1978 +0,0 @@ - array( - 'INT:' => 'int(%d)', - 'BINT' => 'bigint(20)', - 'UINT' => 'mediumint(8) UNSIGNED', - 'UINT:' => 'int(%d) UNSIGNED', - 'TINT:' => 'tinyint(%d)', - 'USINT' => 'smallint(4) UNSIGNED', - 'BOOL' => 'tinyint(1) UNSIGNED', - 'VCHAR' => 'varchar(255)', - 'VCHAR:' => 'varchar(%d)', - 'CHAR:' => 'char(%d)', - 'XSTEXT' => 'text', - 'XSTEXT_UNI'=> 'varchar(100)', - 'STEXT' => 'text', - 'STEXT_UNI' => 'varchar(255)', - 'TEXT' => 'text', - 'TEXT_UNI' => 'text', - 'MTEXT' => 'mediumtext', - 'MTEXT_UNI' => 'mediumtext', - 'TIMESTAMP' => 'int(11) UNSIGNED', - 'DECIMAL' => 'decimal(5,2)', - 'DECIMAL:' => 'decimal(%d,2)', - 'PDECIMAL' => 'decimal(6,3)', - 'PDECIMAL:' => 'decimal(%d,3)', - 'VCHAR_UNI' => 'varchar(255)', - 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar(255)', - 'VARBINARY' => 'varbinary(255)', - ), - - 'firebird' => array( - 'INT:' => 'INTEGER', - 'BINT' => 'DOUBLE PRECISION', - 'UINT' => 'INTEGER', - 'UINT:' => 'INTEGER', - 'TINT:' => 'INTEGER', - 'USINT' => 'INTEGER', - 'BOOL' => 'INTEGER', - 'VCHAR' => 'VARCHAR(255) CHARACTER SET NONE', - 'VCHAR:' => 'VARCHAR(%d) CHARACTER SET NONE', - 'CHAR:' => 'CHAR(%d) CHARACTER SET NONE', - 'XSTEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', - 'STEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', - 'TEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', - 'MTEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', - 'XSTEXT_UNI'=> 'VARCHAR(100) CHARACTER SET UTF8', - 'STEXT_UNI' => 'VARCHAR(255) CHARACTER SET UTF8', - 'TEXT_UNI' => 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8', - 'MTEXT_UNI' => 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8', - 'TIMESTAMP' => 'INTEGER', - 'DECIMAL' => 'DOUBLE PRECISION', - 'DECIMAL:' => 'DOUBLE PRECISION', - 'PDECIMAL' => 'DOUBLE PRECISION', - 'PDECIMAL:' => 'DOUBLE PRECISION', - 'VCHAR_UNI' => 'VARCHAR(255) CHARACTER SET UTF8', - 'VCHAR_UNI:'=> 'VARCHAR(%d) CHARACTER SET UTF8', - 'VCHAR_CI' => 'VARCHAR(255) CHARACTER SET UTF8', - 'VARBINARY' => 'CHAR(255) CHARACTER SET NONE', - ), - - 'mssql' => array( - 'INT:' => '[int]', - 'BINT' => '[float]', - 'UINT' => '[int]', - 'UINT:' => '[int]', - 'TINT:' => '[int]', - 'USINT' => '[int]', - 'BOOL' => '[int]', - 'VCHAR' => '[varchar] (255)', - 'VCHAR:' => '[varchar] (%d)', - 'CHAR:' => '[char] (%d)', - 'XSTEXT' => '[varchar] (1000)', - 'STEXT' => '[varchar] (3000)', - 'TEXT' => '[varchar] (8000)', - 'MTEXT' => '[text]', - 'XSTEXT_UNI'=> '[varchar] (100)', - 'STEXT_UNI' => '[varchar] (255)', - 'TEXT_UNI' => '[varchar] (4000)', - 'MTEXT_UNI' => '[text]', - 'TIMESTAMP' => '[int]', - 'DECIMAL' => '[float]', - 'DECIMAL:' => '[float]', - 'PDECIMAL' => '[float]', - 'PDECIMAL:' => '[float]', - 'VCHAR_UNI' => '[varchar] (255)', - 'VCHAR_UNI:'=> '[varchar] (%d)', - 'VCHAR_CI' => '[varchar] (255)', - 'VARBINARY' => '[varchar] (255)', - ), - - 'db2' => array( - 'INT:' => 'integer', - 'BINT' => 'float', - 'UINT' => 'integer', - 'UINT:' => 'integer', - 'TINT:' => 'smallint', - 'USINT' => 'smallint', - 'BOOL' => 'smallint', - 'VCHAR' => 'varchar(255)', - 'VCHAR:' => 'varchar(%d)', - 'CHAR:' => 'char(%d)', - 'XSTEXT' => 'clob(65K)', - 'STEXT' => 'varchar(3000)', - 'TEXT' => 'clob(65K)', - 'MTEXT' => 'clob(16M)', - 'XSTEXT_UNI'=> 'varchar(100)', - 'STEXT_UNI' => 'varchar(255)', - 'TEXT_UNI' => 'clob(65K)', - 'MTEXT_UNI' => 'clob(16M)', - 'TIMESTAMP' => 'integer', - 'DECIMAL' => 'float', - 'VCHAR_UNI' => 'varchar(255)', - 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar(255)', - 'VARBINARY' => 'varchar(255)', - ), - - 'oracle' => array( - 'INT:' => 'number(%d)', - 'BINT' => 'number(20)', - 'UINT' => 'number(8)', - 'UINT:' => 'number(%d)', - 'TINT:' => 'number(%d)', - 'USINT' => 'number(4)', - 'BOOL' => 'number(1)', - 'VCHAR' => 'varchar2(255 char)', - 'VCHAR:' => 'varchar2(%d char)', - 'CHAR:' => 'char(%d char)', - 'XSTEXT' => 'varchar2(1000 char)', - 'STEXT' => 'varchar2(3000 char)', - 'TEXT' => 'clob', - 'MTEXT' => 'clob', - 'XSTEXT_UNI'=> 'varchar2(100 char)', - 'STEXT_UNI' => 'varchar2(255 char)', - 'TEXT_UNI' => 'clob', - 'MTEXT_UNI' => 'clob', - 'TIMESTAMP' => 'number(11)', - 'DECIMAL' => 'number(5, 2)', - 'DECIMAL:' => 'number(%d, 2)', - 'PDECIMAL' => 'number(6, 3)', - 'PDECIMAL:' => 'number(%d, 3)', - 'VCHAR_UNI' => 'varchar2(255 char)', - 'VCHAR_UNI:'=> 'varchar2(%d char)', - 'VCHAR_CI' => 'varchar2(255 char)', - 'VARBINARY' => 'raw(255)', - ), - - 'sqlite' => array( - 'INT:' => 'int(%d)', - 'BINT' => 'bigint(20)', - 'UINT' => 'INTEGER UNSIGNED', //'mediumint(8) UNSIGNED', - 'UINT:' => 'INTEGER UNSIGNED', // 'int(%d) UNSIGNED', - 'TINT:' => 'tinyint(%d)', - 'USINT' => 'INTEGER UNSIGNED', //'mediumint(4) UNSIGNED', - 'BOOL' => 'INTEGER UNSIGNED', //'tinyint(1) UNSIGNED', - 'VCHAR' => 'varchar(255)', - 'VCHAR:' => 'varchar(%d)', - 'CHAR:' => 'char(%d)', - 'XSTEXT' => 'text(65535)', - 'STEXT' => 'text(65535)', - 'TEXT' => 'text(65535)', - 'MTEXT' => 'mediumtext(16777215)', - 'XSTEXT_UNI'=> 'text(65535)', - 'STEXT_UNI' => 'text(65535)', - 'TEXT_UNI' => 'text(65535)', - 'MTEXT_UNI' => 'mediumtext(16777215)', - 'TIMESTAMP' => 'INTEGER UNSIGNED', //'int(11) UNSIGNED', - 'DECIMAL' => 'decimal(5,2)', - 'DECIMAL:' => 'decimal(%d,2)', - 'PDECIMAL' => 'decimal(6,3)', - 'PDECIMAL:' => 'decimal(%d,3)', - 'VCHAR_UNI' => 'varchar(255)', - 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar(255)', - 'VARBINARY' => 'blob', - ), - - 'postgres' => array( - 'INT:' => 'INT4', - 'BINT' => 'INT8', - 'UINT' => 'INT4', // unsigned - 'UINT:' => 'INT4', // unsigned - 'USINT' => 'INT2', // unsigned - 'BOOL' => 'boolean', // unsigned - 'TINT:' => 'INT2', - 'VCHAR' => 'varchar(255)', - 'VCHAR:' => 'varchar(%d)', - 'CHAR:' => 'char(%d)', - 'XSTEXT' => 'varchar(1000)', - 'STEXT' => 'varchar(3000)', - 'TEXT' => 'varchar(8000)', - 'MTEXT' => 'TEXT', - 'XSTEXT_UNI'=> 'varchar(100)', - 'STEXT_UNI' => 'varchar(255)', - 'TEXT_UNI' => 'varchar(4000)', - 'MTEXT_UNI' => 'TEXT', - 'TIMESTAMP' => 'INT4', // unsigned - 'DECIMAL' => 'decimal(5,2)', - 'DECIMAL:' => 'decimal(%d,2)', - 'PDECIMAL' => 'decimal(6,3)', - 'PDECIMAL:' => 'decimal(%d,3)', - 'VCHAR_UNI' => 'varchar(255)', - 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar(255)', - 'VARBINARY' => 'bytea', - ), -); - -// A list of types being unsigned for better reference in some db's -$unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP'); -$supported_dbms = array('firebird', 'mssql', 'mysql', 'db2', 'oracle', 'postgres', 'sqlite'); - -foreach ($supported_dbms as $dbms) -{ - $fp = fopen($schema_path . '_' . $dbms . '_schema.sql', 'wt'); - - $line = ''; - - // Write Header - switch ($dbms) - { - case 'mysql': - $line = "#\n# \$I" . "d: $\n#\n\n"; - break; - - case 'firebird': - $line = "#\n# \$I" . "d: $\n#\n\n"; - $line .= custom_data('firebird') . "\n"; - break; - - case 'sqlite': - $line = "#\n# \$I" . "d: $\n#\n\n"; - $line .= "BEGIN TRANSACTION;\n\n"; - break; - - case 'mssql': - $line = "/*\n\n \$I" . "d: $\n\n*/\n\n"; - $line .= "BEGIN TRANSACTION\nGO\n\n"; - break; - - case 'db2': - $line = "/*\n\n \$I" . "d: $\n\n*/\n\n"; - break; - - case 'oracle': - $line = "/*\n\n \$I" . "d: $\n\n*/\n\n"; - $line .= custom_data('oracle') . "\n"; - break; - - case 'postgres': - $line = "/*\n\n \$I" . "d: $\n\n*/\n\n"; - $line .= "BEGIN;\n\n"; - $line .= custom_data('postgres') . "\n"; - break; - } - - fwrite($fp, $line); - - foreach ($schema_data as $table_name => $table_data) - { - // Write comment about table - switch ($dbms) - { - case 'mysql': - case 'firebird': - case 'sqlite': - fwrite($fp, "# Table: '{$table_name}'\n"); - break; - - case 'mssql': - case 'oracle': - case 'postgres': - case 'db2': - fwrite($fp, "/*\n\tTable: '{$table_name}'\n*/\n"); - break; - } - - // Create Table statement - $generator = $textimage = false; - $line = ''; - - switch ($dbms) - { - case 'mysql': - case 'firebird': - case 'oracle': - case 'sqlite': - case 'postgres': - case 'db2': - $line = "CREATE TABLE {$table_name} (\n"; - break; - - case 'mssql': - $line = "CREATE TABLE [{$table_name}] (\n"; - break; - } - - // Table specific so we don't get overlap - $modded_array = array(); - - // Write columns one by one... - foreach ($table_data['COLUMNS'] as $column_name => $column_data) - { - // Get type - if (strpos($column_data[0], ':') !== false) - { - list($orig_column_type, $column_length) = explode(':', $column_data[0]); - if (!is_array($dbms_type_map[$dbms][$orig_column_type . ':'])) - { - $column_type = sprintf($dbms_type_map[$dbms][$orig_column_type . ':'], $column_length); - } - else - { - if (isset($dbms_type_map[$dbms][$orig_column_type . ':']['rule'])) - { - switch ($dbms_type_map[$dbms][$orig_column_type . ':']['rule'][0]) - { - case 'div': - $column_length /= $dbms_type_map[$dbms][$orig_column_type . ':']['rule'][1]; - $column_length = ceil($column_length); - $column_type = sprintf($dbms_type_map[$dbms][$orig_column_type . ':'][0], $column_length); - break; - } - } - - if (isset($dbms_type_map[$dbms][$orig_column_type . ':']['limit'])) - { - switch ($dbms_type_map[$dbms][$orig_column_type . ':']['limit'][0]) - { - case 'mult': - $column_length *= $dbms_type_map[$dbms][$orig_column_type . ':']['limit'][1]; - if ($column_length > $dbms_type_map[$dbms][$orig_column_type . ':']['limit'][2]) - { - $column_type = $dbms_type_map[$dbms][$orig_column_type . ':']['limit'][3]; - $modded_array[$column_name] = $column_type; - } - else - { - $column_type = sprintf($dbms_type_map[$dbms][$orig_column_type . ':'][0], $column_length); - } - break; - } - } - } - $orig_column_type .= ':'; - } - else - { - $orig_column_type = $column_data[0]; - $column_type = $dbms_type_map[$dbms][$column_data[0]]; - if ($column_type == 'text' || $column_type == 'blob') - { - $modded_array[$column_name] = $column_type; - } - } - - // Adjust default value if db-dependant specified - if (is_array($column_data[1])) - { - $column_data[1] = (isset($column_data[1][$dbms])) ? $column_data[1][$dbms] : $column_data[1]['default']; - } - - switch ($dbms) - { - case 'mysql': - $line .= "\t{$column_name} {$column_type} "; - - // For hexadecimal values do not use single quotes - if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text' && substr($column_type, -4) !== 'blob') - { - $line .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' "; - } - $line .= 'NOT NULL'; - - if (isset($column_data[2])) - { - if ($column_data[2] == 'auto_increment') - { - $line .= ' auto_increment'; - } - else if ($column_data[2] == 'true_sort') - { - $line .= ' COLLATE utf8_unicode_ci'; - } - } - - $line .= ",\n"; - break; - - case 'sqlite': - if (isset($column_data[2]) && $column_data[2] == 'auto_increment') - { - $line .= "\t{$column_name} INTEGER PRIMARY KEY "; - $generator = $column_name; - } - else - { - $line .= "\t{$column_name} {$column_type} "; - } - - $line .= 'NOT NULL '; - $line .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : ''; - $line .= ",\n"; - break; - - case 'firebird': - $line .= "\t{$column_name} {$column_type} "; - - if (!is_null($column_data[1])) - { - $line .= 'DEFAULT ' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' '; - } - - $line .= 'NOT NULL'; - - // This is a UNICODE column and thus should be given it's fair share - if (preg_match('/^X?STEXT_UNI|VCHAR_(CI|UNI:?)/', $column_data[0])) - { - $line .= ' COLLATE UNICODE'; - } - - $line .= ",\n"; - - if (isset($column_data[2]) && $column_data[2] == 'auto_increment') - { - $generator = $column_name; - } - break; - - case 'mssql': - if ($column_type == '[text]') - { - $textimage = true; - } - - $line .= "\t[{$column_name}] {$column_type} "; - - if (!is_null($column_data[1])) - { - // For hexadecimal values do not use single quotes - if (strpos($column_data[1], '0x') === 0) - { - $line .= 'DEFAULT (' . $column_data[1] . ') '; - } - else - { - $line .= 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') '; - } - } - - if (isset($column_data[2]) && $column_data[2] == 'auto_increment') - { - $line .= 'IDENTITY (1, 1) '; - } - - $line .= 'NOT NULL'; - $line .= " ,\n"; - break; - - case 'oracle': - $line .= "\t{$column_name} {$column_type} "; - $line .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : ''; - - // In Oracle empty strings ('') are treated as NULL. - // Therefore in oracle we allow NULL's for all DEFAULT '' entries - $line .= ($column_data[1] === '') ? ",\n" : "NOT NULL,\n"; - - if (isset($column_data[2]) && $column_data[2] == 'auto_increment') - { - $generator = $column_name; - } - break; - - case 'postgres': - $line .= "\t{$column_name} {$column_type} "; - - if (isset($column_data[2]) && $column_data[2] == 'auto_increment') - { - $line .= "DEFAULT nextval('{$table_name}_seq'),\n"; - - // Make sure the sequence will be created before creating the table - $line = "CREATE SEQUENCE {$table_name}_seq;\n\n" . $line; - } - else - { - $line .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : ''; - $line .= "NOT NULL"; - - // Unsigned? Then add a CHECK contraint - if (in_array($orig_column_type, $unsigned_types)) - { - $line .= " CHECK ({$column_name} >= 0)"; - } - - $line .= ",\n"; - } - break; - - case 'db2': - $line .= "\t{$column_name} {$column_type} NOT NULL"; - - if (isset($column_data[2]) && $column_data[2] == 'auto_increment') - { - $line .= ' GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1)'; - } - else - { - if (preg_match('/^(integer|smallint|float)$/', $column_type)) - { - $line .= " DEFAULT {$column_data[1]}"; - } - else - { - $line .= " DEFAULT '{$column_data[1]}'"; - } - } - $line .= ",\n"; - break; - } - } - - switch ($dbms) - { - case 'firebird': - // Remove last line delimiter... - $line = substr($line, 0, -2); - $line .= "\n);;\n\n"; - break; - - case 'mssql': - $line = substr($line, 0, -2); - $line .= "\n) ON [PRIMARY]" . (($textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : '') . "\n"; - $line .= "GO\n\n"; - break; - } - - // Write primary key - if (isset($table_data['PRIMARY_KEY'])) - { - if (!is_array($table_data['PRIMARY_KEY'])) - { - $table_data['PRIMARY_KEY'] = array($table_data['PRIMARY_KEY']); - } - - switch ($dbms) - { - case 'mysql': - case 'postgres': - case 'db2': - $line .= "\tPRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n"; - break; - - case 'firebird': - $line .= "ALTER TABLE {$table_name} ADD PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ");;\n\n"; - break; - - case 'sqlite': - if ($generator === false || !in_array($generator, $table_data['PRIMARY_KEY'])) - { - $line .= "\tPRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n"; - } - break; - - case 'mssql': - $line .= "ALTER TABLE [{$table_name}] WITH NOCHECK ADD \n"; - $line .= "\tCONSTRAINT [PK_{$table_name}] PRIMARY KEY CLUSTERED \n"; - $line .= "\t(\n"; - $line .= "\t\t[" . implode("],\n\t\t[", $table_data['PRIMARY_KEY']) . "]\n"; - $line .= "\t) ON [PRIMARY] \n"; - $line .= "GO\n\n"; - break; - - case 'oracle': - $line .= "\tCONSTRAINT pk_{$table_name} PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . "),\n"; - break; - } - } - - switch ($dbms) - { - case 'oracle': - // UNIQUE contrains to be added? - if (isset($table_data['KEYS'])) - { - foreach ($table_data['KEYS'] as $key_name => $key_data) - { - if (!is_array($key_data[1])) - { - $key_data[1] = array($key_data[1]); - } - - if ($key_data[0] == 'UNIQUE') - { - $line .= "\tCONSTRAINT u_phpbb_{$key_name} UNIQUE (" . implode(', ', $key_data[1]) . "),\n"; - } - } - } - - // Remove last line delimiter... - $line = substr($line, 0, -2); - $line .= "\n)\n/\n\n"; - break; - - case 'postgres': - // Remove last line delimiter... - $line = substr($line, 0, -2); - $line .= "\n);\n\n"; - break; - - case 'db2': - // Remove last line delimiter... - $line = substr($line, 0, -2); - $line .= "\n);\n\n"; - break; - - case 'sqlite': - // Remove last line delimiter... - $line = substr($line, 0, -2); - $line .= "\n);\n\n"; - break; - } - - // Write Keys - if (isset($table_data['KEYS'])) - { - foreach ($table_data['KEYS'] as $key_name => $key_data) - { - if (!is_array($key_data[1])) - { - $key_data[1] = array($key_data[1]); - } - - switch ($dbms) - { - case 'mysql': - $line .= ($key_data[0] == 'INDEX') ? "\tKEY" : ''; - $line .= ($key_data[0] == 'UNIQUE') ? "\tUNIQUE" : ''; - foreach ($key_data[1] as $key => $col_name) - { - if (isset($modded_array[$col_name])) - { - switch ($modded_array[$col_name]) - { - case 'text': - case 'blob': - $key_data[1][$key] = $col_name . '(255)'; - break; - } - } - } - $line .= ' ' . $key_name . ' (' . implode(', ', $key_data[1]) . "),\n"; - break; - - case 'firebird': - $line .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : ''; - $line .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : ''; - - $line .= ' ' . $table_name . '_' . $key_name . ' ON ' . $table_name . '(' . implode(', ', $key_data[1]) . ");;\n"; - break; - - case 'mssql': - $line .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : ''; - $line .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : ''; - $line .= " [{$key_name}] ON [{$table_name}]([" . implode('], [', $key_data[1]) . "]) ON [PRIMARY]\n"; - $line .= "GO\n\n"; - break; - - case 'oracle': - if ($key_data[0] == 'UNIQUE') - { - continue; - } - - $line .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : ''; - - $line .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ")\n"; - $line .= "/\n"; - break; - - case 'sqlite': - $line .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : ''; - $line .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : ''; - - $line .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ");\n"; - break; - - case 'postgres': - $line .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : ''; - $line .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : ''; - - $line .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ");\n"; - break; - - case 'db2': - $line .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : ''; - $line .= ($key_data[0] == 'UNIQUE') ? 'CREATE UNIQUE INDEX' : ''; - - $line .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ") PCTFREE 10 MINPCTUSED 10 ALLOW REVERSE SCANS PAGE SPLIT SYMMETRIC COLLECT SAMPLED DETAILED STATISTICS;\n"; - break; - } - } - } - - switch ($dbms) - { - case 'mysql': - // Remove last line delimiter... - $line = substr($line, 0, -2); - $line .= "\n) CHARACTER SET `utf8` COLLATE `utf8_bin`;\n\n"; - break; - - // Create Generator - case 'firebird': - if ($generator !== false) - { - $line .= "\nCREATE GENERATOR {$table_name}_gen;;\n"; - $line .= 'SET GENERATOR ' . $table_name . "_gen TO 0;;\n\n"; - - $line .= 'CREATE TRIGGER t_' . $table_name . ' FOR ' . $table_name . "\n"; - $line .= "BEFORE INSERT\nAS\nBEGIN\n"; - $line .= "\tNEW.{$generator} = GEN_ID({$table_name}_gen, 1);\nEND;;\n\n"; - } - break; - - case 'oracle': - if ($generator !== false) - { - $line .= "\nCREATE SEQUENCE {$table_name}_seq\n/\n\n"; - - $line .= "CREATE OR REPLACE TRIGGER t_{$table_name}\n"; - $line .= "BEFORE INSERT ON {$table_name}\n"; - $line .= "FOR EACH ROW WHEN (\n"; - $line .= "\tnew.{$generator} IS NULL OR new.{$generator} = 0\n"; - $line .= ")\nBEGIN\n"; - $line .= "\tSELECT {$table_name}_seq.nextval\n"; - $line .= "\tINTO :new.{$generator}\n"; - $line .= "\tFROM dual;\nEND;\n/\n\n"; - } - break; - } - - fwrite($fp, $line . "\n"); - } - - $line = ''; - - // Write custom function at the end for some db's - switch ($dbms) - { - case 'mssql': - $line = "\nCOMMIT\nGO\n\n"; - break; - - case 'sqlite': - $line = "\nCOMMIT;"; - break; - - case 'postgres': - $line = "\nCOMMIT;"; - break; - } - - fwrite($fp, $line); - fclose($fp); -} - - -/** -* Define the basic structure -* The format: -* array('{TABLE_NAME}' => {TABLE_DATA}) -* {TABLE_DATA}: -* COLUMNS = array({column_name} = array({column_type}, {default}, {auto_increment})) -* PRIMARY_KEY = {column_name(s)} -* KEYS = array({key_name} = array({key_type}, {column_name(s)})), -* -* Column Types: -* INT:x => SIGNED int(x) -* BINT => BIGINT -* UINT => mediumint(8) UNSIGNED -* UINT:x => int(x) UNSIGNED -* TINT:x => tinyint(x) -* USINT => smallint(4) UNSIGNED (for _order columns) -* BOOL => tinyint(1) UNSIGNED -* VCHAR => varchar(255) -* CHAR:x => char(x) -* XSTEXT_UNI => text for storing 100 characters (topic_title for example) -* STEXT_UNI => text for storing 255 characters (normal input field with a max of 255 single-byte chars) - same as VCHAR_UNI -* TEXT_UNI => text for storing 3000 characters (short text, descriptions, comments, etc.) -* MTEXT_UNI => mediumtext (post text, large text) -* VCHAR:x => varchar(x) -* TIMESTAMP => int(11) UNSIGNED -* DECIMAL => decimal number (5,2) -* DECIMAL: => decimal number (x,2) -* PDECIMAL => precision decimal number (6,3) -* PDECIMAL: => precision decimal number (x,3) -* VCHAR_UNI => varchar(255) BINARY -* VCHAR_CI => varchar_ci for postgresql, others VCHAR -*/ -function get_schema_struct() -{ - $schema_data = array(); - - $schema_data['phpbb_attachments'] = array( - 'COLUMNS' => array( - 'attach_id' => array('UINT', NULL, 'auto_increment'), - 'post_msg_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), - 'in_message' => array('BOOL', 0), - 'poster_id' => array('UINT', 0), - 'is_orphan' => array('BOOL', 1), - 'physical_filename' => array('VCHAR', ''), - 'real_filename' => array('VCHAR', ''), - 'download_count' => array('UINT', 0), - 'attach_comment' => array('TEXT_UNI', ''), - 'extension' => array('VCHAR:100', ''), - 'mimetype' => array('VCHAR:100', ''), - 'filesize' => array('UINT:20', 0), - 'filetime' => array('TIMESTAMP', 0), - 'thumbnail' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'attach_id', - 'KEYS' => array( - 'filetime' => array('INDEX', 'filetime'), - 'post_msg_id' => array('INDEX', 'post_msg_id'), - 'topic_id' => array('INDEX', 'topic_id'), - 'poster_id' => array('INDEX', 'poster_id'), - 'is_orphan' => array('INDEX', 'is_orphan'), - ), - ); - - $schema_data['phpbb_acl_groups'] = array( - 'COLUMNS' => array( - 'group_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'auth_option_id' => array('UINT', 0), - 'auth_role_id' => array('UINT', 0), - 'auth_setting' => array('TINT:2', 0), - ), - 'KEYS' => array( - 'group_id' => array('INDEX', 'group_id'), - 'auth_opt_id' => array('INDEX', 'auth_option_id'), - 'auth_role_id' => array('INDEX', 'auth_role_id'), - ), - ); - - $schema_data['phpbb_acl_options'] = array( - 'COLUMNS' => array( - 'auth_option_id' => array('UINT', NULL, 'auto_increment'), - 'auth_option' => array('VCHAR:50', ''), - 'is_global' => array('BOOL', 0), - 'is_local' => array('BOOL', 0), - 'founder_only' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'auth_option_id', - 'KEYS' => array( - 'auth_option' => array('INDEX', 'auth_option'), - ), - ); - - $schema_data['phpbb_acl_roles'] = array( - 'COLUMNS' => array( - 'role_id' => array('UINT', NULL, 'auto_increment'), - 'role_name' => array('VCHAR_UNI', ''), - 'role_description' => array('TEXT_UNI', ''), - 'role_type' => array('VCHAR:10', ''), - 'role_order' => array('USINT', 0), - ), - 'PRIMARY_KEY' => 'role_id', - 'KEYS' => array( - 'role_type' => array('INDEX', 'role_type'), - 'role_order' => array('INDEX', 'role_order'), - ), - ); - - $schema_data['phpbb_acl_roles_data'] = array( - 'COLUMNS' => array( - 'role_id' => array('UINT', 0), - 'auth_option_id' => array('UINT', 0), - 'auth_setting' => array('TINT:2', 0), - ), - 'PRIMARY_KEY' => array('role_id', 'auth_option_id'), - 'KEYS' => array( - 'ath_op_id' => array('INDEX', 'auth_option_id'), - ), - ); - - $schema_data['phpbb_acl_users'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'auth_option_id' => array('UINT', 0), - 'auth_role_id' => array('UINT', 0), - 'auth_setting' => array('TINT:2', 0), - ), - 'KEYS' => array( - 'user_id' => array('INDEX', 'user_id'), - 'auth_option_id' => array('INDEX', 'auth_option_id'), - 'auth_role_id' => array('INDEX', 'auth_role_id'), - ), - ); - - $schema_data['phpbb_banlist'] = array( - 'COLUMNS' => array( - 'ban_id' => array('UINT', NULL, 'auto_increment'), - 'ban_userid' => array('UINT', 0), - 'ban_ip' => array('VCHAR:40', ''), - 'ban_email' => array('VCHAR_UNI:100', ''), - 'ban_start' => array('TIMESTAMP', 0), - 'ban_end' => array('TIMESTAMP', 0), - 'ban_exclude' => array('BOOL', 0), - 'ban_reason' => array('VCHAR_UNI', ''), - 'ban_give_reason' => array('VCHAR_UNI', ''), - ), - 'PRIMARY_KEY' => 'ban_id', - 'KEYS' => array( - 'ban_end' => array('INDEX', 'ban_end'), - 'ban_user' => array('INDEX', array('ban_userid', 'ban_exclude')), - 'ban_email' => array('INDEX', array('ban_email', 'ban_exclude')), - 'ban_ip' => array('INDEX', array('ban_ip', 'ban_exclude')), - ), - ); - - $schema_data['phpbb_bbcodes'] = array( - 'COLUMNS' => array( - 'bbcode_id' => array('TINT:3', 0), - 'bbcode_tag' => array('VCHAR:16', ''), - 'bbcode_helpline' => array('VCHAR_UNI', ''), - 'display_on_posting' => array('BOOL', 0), - 'bbcode_match' => array('TEXT_UNI', ''), - 'bbcode_tpl' => array('MTEXT_UNI', ''), - 'first_pass_match' => array('MTEXT_UNI', ''), - 'first_pass_replace' => array('MTEXT_UNI', ''), - 'second_pass_match' => array('MTEXT_UNI', ''), - 'second_pass_replace' => array('MTEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'bbcode_id', - 'KEYS' => array( - 'display_on_post' => array('INDEX', 'display_on_posting'), - ), - ); - - $schema_data['phpbb_bookmarks'] = array( - 'COLUMNS' => array( - 'topic_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - ), - 'PRIMARY_KEY' => array('topic_id', 'user_id'), - ); - - $schema_data['phpbb_bots'] = array( - 'COLUMNS' => array( - 'bot_id' => array('UINT', NULL, 'auto_increment'), - 'bot_active' => array('BOOL', 1), - 'bot_name' => array('STEXT_UNI', ''), - 'user_id' => array('UINT', 0), - 'bot_agent' => array('VCHAR', ''), - 'bot_ip' => array('VCHAR', ''), - ), - 'PRIMARY_KEY' => 'bot_id', - 'KEYS' => array( - 'bot_active' => array('INDEX', 'bot_active'), - ), - ); - - $schema_data['phpbb_config'] = array( - 'COLUMNS' => array( - 'config_name' => array('VCHAR', ''), - 'config_value' => array('VCHAR_UNI', ''), - 'is_dynamic' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'config_name', - 'KEYS' => array( - 'is_dynamic' => array('INDEX', 'is_dynamic'), - 'config_name' => array('INDEX', 'config_name'), - ), - ); - - $schema_data['phpbb_confirm'] = array( - 'COLUMNS' => array( - 'confirm_id' => array('CHAR:32', ''), - 'session_id' => array('CHAR:32', ''), - 'confirm_type' => array('TINT:3', 0), - 'code' => array('VCHAR:8', ''), - 'seed' => array('UINT:10', 0), - ), - 'PRIMARY_KEY' => array('session_id', 'confirm_id'), - 'KEYS' => array( - 'confirm_type' => array('INDEX', 'confirm_type'), - ), - ); - - $schema_data['phpbb_disallow'] = array( - 'COLUMNS' => array( - 'disallow_id' => array('UINT', NULL, 'auto_increment'), - 'disallow_username' => array('VCHAR_UNI:255', ''), - ), - 'PRIMARY_KEY' => 'disallow_id', - ); - - $schema_data['phpbb_drafts'] = array( - 'COLUMNS' => array( - 'draft_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'save_time' => array('TIMESTAMP', 0), - 'draft_subject' => array('XSTEXT_UNI', ''), - 'draft_message' => array('MTEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'draft_id', - 'KEYS' => array( - 'save_time' => array('INDEX', 'save_time'), - ), - ); - - $schema_data['phpbb_extensions'] = array( - 'COLUMNS' => array( - 'extension_id' => array('UINT', NULL, 'auto_increment'), - 'group_id' => array('UINT', 0), - 'extension' => array('VCHAR:100', ''), - ), - 'PRIMARY_KEY' => 'extension_id', - ); - - $schema_data['phpbb_extension_groups'] = array( - 'COLUMNS' => array( - 'group_id' => array('UINT', NULL, 'auto_increment'), - 'group_name' => array('VCHAR_UNI', ''), - 'cat_id' => array('TINT:2', 0), - 'allow_group' => array('BOOL', 0), - 'download_mode' => array('BOOL', 1), - 'upload_icon' => array('VCHAR', ''), - 'max_filesize' => array('UINT:20', 0), - 'allowed_forums' => array('TEXT', ''), - 'allow_in_pm' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'group_id', - ); - - $schema_data['phpbb_forums'] = array( - 'COLUMNS' => array( - 'forum_id' => array('UINT', NULL, 'auto_increment'), - 'parent_id' => array('UINT', 0), - 'left_id' => array('UINT', 0), - 'right_id' => array('UINT', 0), - 'forum_parents' => array('MTEXT', ''), - 'forum_name' => array('STEXT_UNI', ''), - 'forum_desc' => array('TEXT_UNI', ''), - 'forum_desc_bitfield' => array('VCHAR:255', ''), - 'forum_desc_options' => array('UINT:11', 7), - 'forum_desc_uid' => array('VCHAR:8', ''), - 'forum_link' => array('VCHAR_UNI', ''), - 'forum_password' => array('VCHAR_UNI:40', ''), - 'forum_style' => array('USINT', 0), - 'forum_image' => array('VCHAR', ''), - 'forum_rules' => array('TEXT_UNI', ''), - 'forum_rules_link' => array('VCHAR_UNI', ''), - 'forum_rules_bitfield' => array('VCHAR:255', ''), - 'forum_rules_options' => array('UINT:11', 7), - 'forum_rules_uid' => array('VCHAR:8', ''), - 'forum_topics_per_page' => array('TINT:4', 0), - 'forum_type' => array('TINT:4', 0), - 'forum_status' => array('TINT:4', 0), - 'forum_posts' => array('UINT', 0), - 'forum_topics' => array('UINT', 0), - 'forum_topics_real' => array('UINT', 0), - 'forum_last_post_id' => array('UINT', 0), - 'forum_last_poster_id' => array('UINT', 0), - 'forum_last_post_subject' => array('XSTEXT_UNI', ''), - 'forum_last_post_time' => array('TIMESTAMP', 0), - 'forum_last_poster_name'=> array('VCHAR_UNI', ''), - 'forum_last_poster_colour'=> array('VCHAR:6', ''), - 'forum_flags' => array('TINT:4', 32), - 'display_on_index' => array('BOOL', 1), - 'enable_indexing' => array('BOOL', 1), - 'enable_icons' => array('BOOL', 1), - 'enable_prune' => array('BOOL', 0), - 'prune_next' => array('TIMESTAMP', 0), - 'prune_days' => array('UINT', 0), - 'prune_viewed' => array('UINT', 0), - 'prune_freq' => array('UINT', 0), - ), - 'PRIMARY_KEY' => 'forum_id', - 'KEYS' => array( - 'left_right_id' => array('INDEX', array('left_id', 'right_id')), - 'forum_lastpost_id' => array('INDEX', 'forum_last_post_id'), - ), - ); - - $schema_data['phpbb_forums_access'] = array( - 'COLUMNS' => array( - 'forum_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'session_id' => array('CHAR:32', ''), - ), - 'PRIMARY_KEY' => array('forum_id', 'user_id', 'session_id'), - ); - - $schema_data['phpbb_forums_track'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'mark_time' => array('TIMESTAMP', 0), - ), - 'PRIMARY_KEY' => array('user_id', 'forum_id'), - ); - - $schema_data['phpbb_forums_watch'] = array( - 'COLUMNS' => array( - 'forum_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'notify_status' => array('BOOL', 0), - ), - 'KEYS' => array( - 'forum_id' => array('INDEX', 'forum_id'), - 'user_id' => array('INDEX', 'user_id'), - 'notify_stat' => array('INDEX', 'notify_status'), - ), - ); - - $schema_data['phpbb_groups'] = array( - 'COLUMNS' => array( - 'group_id' => array('UINT', NULL, 'auto_increment'), - 'group_type' => array('TINT:4', 1), - 'group_founder_manage' => array('BOOL', 0), - 'group_name' => array('VCHAR_UNI', ''), - 'group_name_clean' => array('VCHAR_UNI', ''), - 'group_desc' => array('TEXT_UNI', ''), - 'group_desc_bitfield' => array('VCHAR:255', ''), - 'group_desc_options' => array('UINT:11', 7), - 'group_desc_uid' => array('VCHAR:8', ''), - 'group_display' => array('BOOL', 0), - 'group_avatar' => array('VCHAR', ''), - 'group_avatar_type' => array('TINT:2', 0), - 'group_avatar_width' => array('USINT', 0), - 'group_avatar_height' => array('USINT', 0), - 'group_rank' => array('UINT', 0), - 'group_colour' => array('VCHAR:6', ''), - 'group_sig_chars' => array('UINT', 0), - 'group_receive_pm' => array('BOOL', 0), - 'group_message_limit' => array('UINT', 0), - 'group_legend' => array('BOOL', 1), - ), - 'PRIMARY_KEY' => 'group_id', - 'KEYS' => array( - 'group_legend' => array('INDEX', 'group_legend'), - ), - ); - - $schema_data['phpbb_icons'] = array( - 'COLUMNS' => array( - 'icons_id' => array('UINT', NULL, 'auto_increment'), - 'icons_url' => array('VCHAR', ''), - 'icons_width' => array('TINT:4', 0), - 'icons_height' => array('TINT:4', 0), - 'icons_order' => array('UINT', 0), - 'display_on_posting' => array('BOOL', 1), - ), - 'PRIMARY_KEY' => 'icons_id', - 'KEYS' => array( - 'display_on_posting' => array('INDEX', 'display_on_posting'), - ), - ); - - $schema_data['phpbb_lang'] = array( - 'COLUMNS' => array( - 'lang_id' => array('TINT:4', NULL, 'auto_increment'), - 'lang_iso' => array('VCHAR:30', ''), - 'lang_dir' => array('VCHAR:30', ''), - 'lang_english_name' => array('VCHAR_UNI:100', ''), - 'lang_local_name' => array('VCHAR_UNI:255', ''), - 'lang_author' => array('VCHAR_UNI:255', ''), - ), - 'PRIMARY_KEY' => 'lang_id', - 'KEYS' => array( - 'lang_iso' => array('INDEX', 'lang_iso'), - ), - ); - - $schema_data['phpbb_log'] = array( - 'COLUMNS' => array( - 'log_id' => array('UINT', NULL, 'auto_increment'), - 'log_type' => array('TINT:4', 0), - 'user_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), - 'reportee_id' => array('UINT', 0), - 'log_ip' => array('VCHAR:40', ''), - 'log_time' => array('TIMESTAMP', 0), - 'log_operation' => array('TEXT_UNI', ''), - 'log_data' => array('MTEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'log_id', - 'KEYS' => array( - 'log_type' => array('INDEX', 'log_type'), - 'forum_id' => array('INDEX', 'forum_id'), - 'topic_id' => array('INDEX', 'topic_id'), - 'reportee_id' => array('INDEX', 'reportee_id'), - 'user_id' => array('INDEX', 'user_id'), - ), - ); - - $schema_data['phpbb_moderator_cache'] = array( - 'COLUMNS' => array( - 'forum_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'username' => array('VCHAR_UNI:255', ''), - 'group_id' => array('UINT', 0), - 'group_name' => array('VCHAR_UNI', ''), - 'display_on_index' => array('BOOL', 1), - ), - 'KEYS' => array( - 'disp_idx' => array('INDEX', 'display_on_index'), - 'forum_id' => array('INDEX', 'forum_id'), - ), - ); - - $schema_data['phpbb_modules'] = array( - 'COLUMNS' => array( - 'module_id' => array('UINT', NULL, 'auto_increment'), - 'module_enabled' => array('BOOL', 1), - 'module_display' => array('BOOL', 1), - 'module_basename' => array('VCHAR', ''), - 'module_class' => array('VCHAR:10', ''), - 'parent_id' => array('UINT', 0), - 'left_id' => array('UINT', 0), - 'right_id' => array('UINT', 0), - 'module_langname' => array('VCHAR', ''), - 'module_mode' => array('VCHAR', ''), - 'module_auth' => array('VCHAR', ''), - ), - 'PRIMARY_KEY' => 'module_id', - 'KEYS' => array( - 'left_right_id' => array('INDEX', array('left_id', 'right_id')), - 'module_enabled' => array('INDEX', 'module_enabled'), - 'class_left_id' => array('INDEX', array('module_class', 'left_id')), - ), - ); - - $schema_data['phpbb_poll_options'] = array( - 'COLUMNS' => array( - 'poll_option_id' => array('TINT:4', 0), - 'topic_id' => array('UINT', 0), - 'poll_option_text' => array('TEXT_UNI', ''), - 'poll_option_total' => array('UINT', 0), - ), - 'KEYS' => array( - 'poll_opt_id' => array('INDEX', 'poll_option_id'), - 'topic_id' => array('INDEX', 'topic_id'), - ), - ); - - $schema_data['phpbb_poll_votes'] = array( - 'COLUMNS' => array( - 'topic_id' => array('UINT', 0), - 'poll_option_id' => array('TINT:4', 0), - 'vote_user_id' => array('UINT', 0), - 'vote_user_ip' => array('VCHAR:40', ''), - ), - 'KEYS' => array( - 'topic_id' => array('INDEX', 'topic_id'), - 'vote_user_id' => array('INDEX', 'vote_user_id'), - 'vote_user_ip' => array('INDEX', 'vote_user_ip'), - ), - ); - - $schema_data['phpbb_posts'] = array( - 'COLUMNS' => array( - 'post_id' => array('UINT', NULL, 'auto_increment'), - 'topic_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'poster_id' => array('UINT', 0), - 'icon_id' => array('UINT', 0), - 'poster_ip' => array('VCHAR:40', ''), - 'post_time' => array('TIMESTAMP', 0), - 'post_approved' => array('BOOL', 1), - 'post_reported' => array('BOOL', 0), - 'enable_bbcode' => array('BOOL', 1), - 'enable_smilies' => array('BOOL', 1), - 'enable_magic_url' => array('BOOL', 1), - 'enable_sig' => array('BOOL', 1), - 'post_username' => array('VCHAR_UNI:255', ''), - 'post_subject' => array('XSTEXT_UNI', '', 'true_sort'), - 'post_text' => array('MTEXT_UNI', ''), - 'post_checksum' => array('VCHAR:32', ''), - 'post_attachment' => array('BOOL', 0), - 'bbcode_bitfield' => array('VCHAR:255', ''), - 'bbcode_uid' => array('VCHAR:8', ''), - 'post_postcount' => array('BOOL', 1), - 'post_edit_time' => array('TIMESTAMP', 0), - 'post_edit_reason' => array('STEXT_UNI', ''), - 'post_edit_user' => array('UINT', 0), - 'post_edit_count' => array('USINT', 0), - 'post_edit_locked' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'post_id', - 'KEYS' => array( - 'forum_id' => array('INDEX', 'forum_id'), - 'topic_id' => array('INDEX', 'topic_id'), - 'poster_ip' => array('INDEX', 'poster_ip'), - 'poster_id' => array('INDEX', 'poster_id'), - 'post_approved' => array('INDEX', 'post_approved'), - 'tid_post_time' => array('INDEX', array('topic_id', 'post_time')), - ), - ); - - $schema_data['phpbb_privmsgs'] = array( - 'COLUMNS' => array( - 'msg_id' => array('UINT', NULL, 'auto_increment'), - 'root_level' => array('UINT', 0), - 'author_id' => array('UINT', 0), - 'icon_id' => array('UINT', 0), - 'author_ip' => array('VCHAR:40', ''), - 'message_time' => array('TIMESTAMP', 0), - 'enable_bbcode' => array('BOOL', 1), - 'enable_smilies' => array('BOOL', 1), - 'enable_magic_url' => array('BOOL', 1), - 'enable_sig' => array('BOOL', 1), - 'message_subject' => array('XSTEXT_UNI', ''), - 'message_text' => array('MTEXT_UNI', ''), - 'message_edit_reason' => array('STEXT_UNI', ''), - 'message_edit_user' => array('UINT', 0), - 'message_attachment' => array('BOOL', 0), - 'bbcode_bitfield' => array('VCHAR:255', ''), - 'bbcode_uid' => array('VCHAR:8', ''), - 'message_edit_time' => array('TIMESTAMP', 0), - 'message_edit_count' => array('USINT', 0), - 'to_address' => array('TEXT_UNI', ''), - 'bcc_address' => array('TEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'msg_id', - 'KEYS' => array( - 'author_ip' => array('INDEX', 'author_ip'), - 'message_time' => array('INDEX', 'message_time'), - 'author_id' => array('INDEX', 'author_id'), - 'root_level' => array('INDEX', 'root_level'), - ), - ); - - $schema_data['phpbb_privmsgs_folder'] = array( - 'COLUMNS' => array( - 'folder_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT', 0), - 'folder_name' => array('VCHAR_UNI', ''), - 'pm_count' => array('UINT', 0), - ), - 'PRIMARY_KEY' => 'folder_id', - 'KEYS' => array( - 'user_id' => array('INDEX', 'user_id'), - ), - ); - - $schema_data['phpbb_privmsgs_rules'] = array( - 'COLUMNS' => array( - 'rule_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT', 0), - 'rule_check' => array('UINT', 0), - 'rule_connection' => array('UINT', 0), - 'rule_string' => array('VCHAR_UNI', ''), - 'rule_user_id' => array('UINT', 0), - 'rule_group_id' => array('UINT', 0), - 'rule_action' => array('UINT', 0), - 'rule_folder_id' => array('INT:11', 0), - ), - 'PRIMARY_KEY' => 'rule_id', - 'KEYS' => array( - 'user_id' => array('INDEX', 'user_id'), - ), - ); - - $schema_data['phpbb_privmsgs_to'] = array( - 'COLUMNS' => array( - 'msg_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'author_id' => array('UINT', 0), - 'pm_deleted' => array('BOOL', 0), - 'pm_new' => array('BOOL', 1), - 'pm_unread' => array('BOOL', 1), - 'pm_replied' => array('BOOL', 0), - 'pm_marked' => array('BOOL', 0), - 'pm_forwarded' => array('BOOL', 0), - 'folder_id' => array('INT:11', 0), - ), - 'KEYS' => array( - 'msg_id' => array('INDEX', 'msg_id'), - 'author_id' => array('INDEX', 'author_id'), - 'usr_flder_id' => array('INDEX', array('user_id', 'folder_id')), - ), - ); - - $schema_data['phpbb_profile_fields'] = array( - 'COLUMNS' => array( - 'field_id' => array('UINT', NULL, 'auto_increment'), - 'field_name' => array('VCHAR_UNI', ''), - 'field_type' => array('TINT:4', 0), - 'field_ident' => array('VCHAR:20', ''), - 'field_length' => array('VCHAR:20', ''), - 'field_minlen' => array('VCHAR', ''), - 'field_maxlen' => array('VCHAR', ''), - 'field_novalue' => array('VCHAR_UNI', ''), - 'field_default_value' => array('VCHAR_UNI', ''), - 'field_validation' => array('VCHAR_UNI:20', ''), - 'field_required' => array('BOOL', 0), - 'field_show_on_reg' => array('BOOL', 0), - 'field_hide' => array('BOOL', 0), - 'field_no_view' => array('BOOL', 0), - 'field_active' => array('BOOL', 0), - 'field_order' => array('UINT', 0), - ), - 'PRIMARY_KEY' => 'field_id', - 'KEYS' => array( - 'fld_type' => array('INDEX', 'field_type'), - 'fld_ordr' => array('INDEX', 'field_order'), - ), - ); - - $schema_data['phpbb_profile_fields_data'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - ), - 'PRIMARY_KEY' => 'user_id', - ); - - $schema_data['phpbb_profile_fields_lang'] = array( - 'COLUMNS' => array( - 'field_id' => array('UINT', 0), - 'lang_id' => array('UINT', 0), - 'option_id' => array('UINT', 0), - 'field_type' => array('TINT:4', 0), - 'lang_value' => array('VCHAR_UNI', ''), - ), - 'PRIMARY_KEY' => array('field_id', 'lang_id', 'option_id'), - ); - - $schema_data['phpbb_profile_lang'] = array( - 'COLUMNS' => array( - 'field_id' => array('UINT', 0), - 'lang_id' => array('UINT', 0), - 'lang_name' => array('VCHAR_UNI', ''), - 'lang_explain' => array('TEXT_UNI', ''), - 'lang_default_value' => array('VCHAR_UNI', ''), - ), - 'PRIMARY_KEY' => array('field_id', 'lang_id'), - ); - - $schema_data['phpbb_ranks'] = array( - 'COLUMNS' => array( - 'rank_id' => array('UINT', NULL, 'auto_increment'), - 'rank_title' => array('VCHAR_UNI', ''), - 'rank_min' => array('UINT', 0), - 'rank_special' => array('BOOL', 0), - 'rank_image' => array('VCHAR', ''), - ), - 'PRIMARY_KEY' => 'rank_id', - ); - - $schema_data['phpbb_reports'] = array( - 'COLUMNS' => array( - 'report_id' => array('UINT', NULL, 'auto_increment'), - 'reason_id' => array('USINT', 0), - 'post_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'user_notify' => array('BOOL', 0), - 'report_closed' => array('BOOL', 0), - 'report_time' => array('TIMESTAMP', 0), - 'report_text' => array('MTEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'report_id', - ); - - $schema_data['phpbb_reports_reasons'] = array( - 'COLUMNS' => array( - 'reason_id' => array('USINT', NULL, 'auto_increment'), - 'reason_title' => array('VCHAR_UNI', ''), - 'reason_description' => array('MTEXT_UNI', ''), - 'reason_order' => array('USINT', 0), - ), - 'PRIMARY_KEY' => 'reason_id', - ); - - $schema_data['phpbb_search_results'] = array( - 'COLUMNS' => array( - 'search_key' => array('VCHAR:32', ''), - 'search_time' => array('TIMESTAMP', 0), - 'search_keywords' => array('MTEXT_UNI', ''), - 'search_authors' => array('MTEXT', ''), - ), - 'PRIMARY_KEY' => 'search_key', - ); - - $schema_data['phpbb_search_wordlist'] = array( - 'COLUMNS' => array( - 'word_id' => array('UINT', NULL, 'auto_increment'), - 'word_text' => array('VCHAR_UNI', ''), - 'word_common' => array('BOOL', 0), - 'word_count' => array('UINT', 0), - ), - 'PRIMARY_KEY' => 'word_id', - 'KEYS' => array( - 'wrd_txt' => array('UNIQUE', 'word_text'), - 'wrd_cnt' => array('INDEX', 'word_count'), - ), - ); - - $schema_data['phpbb_search_wordmatch'] = array( - 'COLUMNS' => array( - 'post_id' => array('UINT', 0), - 'word_id' => array('UINT', 0), - 'title_match' => array('BOOL', 0), - ), - 'KEYS' => array( - 'unq_mtch' => array('UNIQUE', array('word_id', 'post_id', 'title_match')), - 'word_id' => array('INDEX', 'word_id'), - 'post_id' => array('INDEX', 'post_id'), - ), - ); - - $schema_data['phpbb_sessions'] = array( - 'COLUMNS' => array( - 'session_id' => array('CHAR:32', ''), - 'session_user_id' => array('UINT', 0), - 'session_last_visit' => array('TIMESTAMP', 0), - 'session_start' => array('TIMESTAMP', 0), - 'session_time' => array('TIMESTAMP', 0), - 'session_ip' => array('VCHAR:40', ''), - 'session_browser' => array('VCHAR:150', ''), - 'session_forwarded_for' => array('VCHAR:255', ''), - 'session_page' => array('VCHAR_UNI', ''), - 'session_viewonline' => array('BOOL', 1), - 'session_autologin' => array('BOOL', 0), - 'session_admin' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'session_id', - 'KEYS' => array( - 'session_time' => array('INDEX', 'session_time'), - 'session_user_id' => array('INDEX', 'session_user_id'), - ), - ); - - $schema_data['phpbb_sessions_keys'] = array( - 'COLUMNS' => array( - 'key_id' => array('CHAR:32', ''), - 'user_id' => array('UINT', 0), - 'last_ip' => array('VCHAR:40', ''), - 'last_login' => array('TIMESTAMP', 0), - ), - 'PRIMARY_KEY' => array('key_id', 'user_id'), - 'KEYS' => array( - 'last_login' => array('INDEX', 'last_login'), - ), - ); - - $schema_data['phpbb_sitelist'] = array( - 'COLUMNS' => array( - 'site_id' => array('UINT', NULL, 'auto_increment'), - 'site_ip' => array('VCHAR:40', ''), - 'site_hostname' => array('VCHAR', ''), - 'ip_exclude' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'site_id', - ); - - $schema_data['phpbb_smilies'] = array( - 'COLUMNS' => array( - 'smiley_id' => array('UINT', NULL, 'auto_increment'), - // We may want to set 'code' to VCHAR:50 or check if unicode support is possible... at the moment only ASCII characters are allowed. - 'code' => array('VCHAR_UNI:50', ''), - 'emotion' => array('VCHAR_UNI:50', ''), - 'smiley_url' => array('VCHAR:50', ''), - 'smiley_width' => array('USINT', 0), - 'smiley_height' => array('USINT', 0), - 'smiley_order' => array('UINT', 0), - 'display_on_posting'=> array('BOOL', 1), - ), - 'PRIMARY_KEY' => 'smiley_id', - 'KEYS' => array( - 'display_on_post' => array('INDEX', 'display_on_posting'), - ), - ); - - $schema_data['phpbb_styles'] = array( - 'COLUMNS' => array( - 'style_id' => array('USINT', NULL, 'auto_increment'), - 'style_name' => array('VCHAR_UNI:255', ''), - 'style_copyright' => array('VCHAR_UNI', ''), - 'style_active' => array('BOOL', 1), - 'template_id' => array('USINT', 0), - 'theme_id' => array('USINT', 0), - 'imageset_id' => array('USINT', 0), - ), - 'PRIMARY_KEY' => 'style_id', - 'KEYS' => array( - 'style_name' => array('UNIQUE', 'style_name'), - 'template_id' => array('INDEX', 'template_id'), - 'theme_id' => array('INDEX', 'theme_id'), - 'imageset_id' => array('INDEX', 'imageset_id'), - ), - ); - - $schema_data['phpbb_styles_template'] = array( - 'COLUMNS' => array( - 'template_id' => array('USINT', NULL, 'auto_increment'), - 'template_name' => array('VCHAR_UNI:255', ''), - 'template_copyright' => array('VCHAR_UNI', ''), - 'template_path' => array('VCHAR:100', ''), - 'bbcode_bitfield' => array('VCHAR:255', 'kNg='), - 'template_storedb' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'template_id', - 'KEYS' => array( - 'tmplte_nm' => array('UNIQUE', 'template_name'), - ), - ); - - $schema_data['phpbb_styles_template_data'] = array( - 'COLUMNS' => array( - 'template_id' => array('USINT', 0), - 'template_filename' => array('VCHAR:100', ''), - 'template_included' => array('TEXT', ''), - 'template_mtime' => array('TIMESTAMP', 0), - 'template_data' => array('MTEXT_UNI', ''), - ), - 'KEYS' => array( - 'tid' => array('INDEX', 'template_id'), - 'tfn' => array('INDEX', 'template_filename'), - ), - ); - - $schema_data['phpbb_styles_theme'] = array( - 'COLUMNS' => array( - 'theme_id' => array('USINT', NULL, 'auto_increment'), - 'theme_name' => array('VCHAR_UNI:255', ''), - 'theme_copyright' => array('VCHAR_UNI', ''), - 'theme_path' => array('VCHAR:100', ''), - 'theme_storedb' => array('BOOL', 0), - 'theme_mtime' => array('TIMESTAMP', 0), - 'theme_data' => array('MTEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'theme_id', - 'KEYS' => array( - 'theme_name' => array('UNIQUE', 'theme_name'), - ), - ); - - $schema_data['phpbb_styles_imageset'] = array( - 'COLUMNS' => array( - 'imageset_id' => array('USINT', NULL, 'auto_increment'), - 'imageset_name' => array('VCHAR_UNI:255', ''), - 'imageset_copyright' => array('VCHAR_UNI', ''), - 'imageset_path' => array('VCHAR:100', ''), - ), - 'PRIMARY_KEY' => 'imageset_id', - 'KEYS' => array( - 'imgset_nm' => array('UNIQUE', 'imageset_name'), - ), - ); - - $schema_data['phpbb_styles_imageset_data'] = array( - 'COLUMNS' => array( - 'image_id' => array('USINT', NULL, 'auto_increment'), - 'image_name' => array('VCHAR:200', ''), - 'image_filename' => array('VCHAR:200', ''), - 'image_lang' => array('VCHAR:30', ''), - 'image_height' => array('USINT', 0), - 'image_width' => array('USINT', 0), - 'imageset_id' => array('USINT', 0), - ), - 'PRIMARY_KEY' => 'image_id', - 'KEYS' => array( - 'i_d' => array('INDEX', 'imageset_id'), - ), - ); - - $schema_data['phpbb_topics'] = array( - 'COLUMNS' => array( - 'topic_id' => array('UINT', NULL, 'auto_increment'), - 'forum_id' => array('UINT', 0), - 'icon_id' => array('UINT', 0), - 'topic_attachment' => array('BOOL', 0), - 'topic_approved' => array('BOOL', 1), - 'topic_reported' => array('BOOL', 0), - 'topic_title' => array('XSTEXT_UNI', '', 'true_sort'), - 'topic_poster' => array('UINT', 0), - 'topic_time' => array('TIMESTAMP', 0), - 'topic_time_limit' => array('TIMESTAMP', 0), - 'topic_views' => array('UINT', 0), - 'topic_replies' => array('UINT', 0), - 'topic_replies_real' => array('UINT', 0), - 'topic_status' => array('TINT:3', 0), - 'topic_type' => array('TINT:3', 0), - 'topic_first_post_id' => array('UINT', 0), - 'topic_first_poster_name' => array('VCHAR_UNI', ''), - 'topic_first_poster_colour' => array('VCHAR:6', ''), - 'topic_last_post_id' => array('UINT', 0), - 'topic_last_poster_id' => array('UINT', 0), - 'topic_last_poster_name' => array('VCHAR_UNI', ''), - 'topic_last_poster_colour' => array('VCHAR:6', ''), - 'topic_last_post_subject' => array('XSTEXT_UNI', ''), - 'topic_last_post_time' => array('TIMESTAMP', 0), - 'topic_last_view_time' => array('TIMESTAMP', 0), - 'topic_moved_id' => array('UINT', 0), - 'topic_bumped' => array('BOOL', 0), - 'topic_bumper' => array('UINT', 0), - 'poll_title' => array('STEXT_UNI', ''), - 'poll_start' => array('TIMESTAMP', 0), - 'poll_length' => array('TIMESTAMP', 0), - 'poll_max_options' => array('TINT:4', 1), - 'poll_last_vote' => array('TIMESTAMP', 0), - 'poll_vote_change' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'topic_id', - 'KEYS' => array( - 'forum_id' => array('INDEX', 'forum_id'), - 'forum_id_type' => array('INDEX', array('forum_id', 'topic_type')), - 'last_post_time' => array('INDEX', 'topic_last_post_time'), - 'topic_approved' => array('INDEX', 'topic_approved'), - 'forum_appr_last' => array('INDEX', array('forum_id', 'topic_approved', 'topic_last_post_id')), - 'fid_time_moved' => array('INDEX', array('forum_id', 'topic_last_post_time', 'topic_moved_id')), - ), - ); - - $schema_data['phpbb_topics_track'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'mark_time' => array('TIMESTAMP', 0), - ), - 'PRIMARY_KEY' => array('user_id', 'topic_id'), - 'KEYS' => array( - 'forum_id' => array('INDEX', 'forum_id'), - ), - ); - - $schema_data['phpbb_topics_posted'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), - 'topic_posted' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => array('user_id', 'topic_id'), - ); - - $schema_data['phpbb_topics_watch'] = array( - 'COLUMNS' => array( - 'topic_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'notify_status' => array('BOOL', 0), - ), - 'KEYS' => array( - 'topic_id' => array('INDEX', 'topic_id'), - 'user_id' => array('INDEX', 'user_id'), - 'notify_stat' => array('INDEX', 'notify_status'), - ), - ); - - $schema_data['phpbb_user_group'] = array( - 'COLUMNS' => array( - 'group_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'group_leader' => array('BOOL', 0), - 'user_pending' => array('BOOL', 1), - ), - 'KEYS' => array( - 'group_id' => array('INDEX', 'group_id'), - 'user_id' => array('INDEX', 'user_id'), - 'group_leader' => array('INDEX', 'group_leader'), - ), - ); - - $schema_data['phpbb_users'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', NULL, 'auto_increment'), - 'user_type' => array('TINT:2', 0), - 'group_id' => array('UINT', 3), - 'user_permissions' => array('MTEXT', ''), - 'user_perm_from' => array('UINT', 0), - 'user_ip' => array('VCHAR:40', ''), - 'user_regdate' => array('TIMESTAMP', 0), - 'username' => array('VCHAR_UNI', ''), - 'username_clean' => array('VCHAR_UNI', ''), - 'user_password' => array('VCHAR_UNI:40', ''), - 'user_passchg' => array('TIMESTAMP', 0), - 'user_pass_convert' => array('BOOL', 0), - 'user_email' => array('VCHAR_UNI:100', ''), - 'user_email_hash' => array('BINT', 0), - 'user_birthday' => array('VCHAR:10', ''), - 'user_lastvisit' => array('TIMESTAMP', 0), - 'user_lastmark' => array('TIMESTAMP', 0), - 'user_lastpost_time' => array('TIMESTAMP', 0), - 'user_lastpage' => array('VCHAR_UNI:200', ''), - 'user_last_confirm_key' => array('VCHAR:10', ''), - 'user_last_search' => array('TIMESTAMP', 0), - 'user_warnings' => array('TINT:4', 0), - 'user_last_warning' => array('TIMESTAMP', 0), - 'user_login_attempts' => array('TINT:4', 0), - 'user_inactive_reason' => array('TINT:2', 0), - 'user_inactive_time' => array('TIMESTAMP', 0), - 'user_posts' => array('UINT', 0), - 'user_lang' => array('VCHAR:30', ''), - 'user_timezone' => array('DECIMAL', 0), - 'user_dst' => array('BOOL', 0), - 'user_dateformat' => array('VCHAR_UNI:30', 'd M Y H:i'), - 'user_style' => array('USINT', 0), - 'user_rank' => array('UINT', 0), - 'user_colour' => array('VCHAR:6', ''), - 'user_new_privmsg' => array('INT:4', 0), - 'user_unread_privmsg' => array('INT:4', 0), - 'user_last_privmsg' => array('TIMESTAMP', 0), - 'user_message_rules' => array('BOOL', 0), - 'user_full_folder' => array('INT:11', -3), - 'user_emailtime' => array('TIMESTAMP', 0), - 'user_topic_show_days' => array('USINT', 0), - 'user_topic_sortby_type' => array('VCHAR:1', 't'), - 'user_topic_sortby_dir' => array('VCHAR:1', 'd'), - 'user_post_show_days' => array('USINT', 0), - 'user_post_sortby_type' => array('VCHAR:1', 't'), - 'user_post_sortby_dir' => array('VCHAR:1', 'a'), - 'user_notify' => array('BOOL', 0), - 'user_notify_pm' => array('BOOL', 1), - 'user_notify_type' => array('TINT:4', 0), - 'user_allow_pm' => array('BOOL', 1), - 'user_allow_viewonline' => array('BOOL', 1), - 'user_allow_viewemail' => array('BOOL', 1), - 'user_allow_massemail' => array('BOOL', 1), - 'user_options' => array('UINT:11', 895), - 'user_avatar' => array('VCHAR', ''), - 'user_avatar_type' => array('TINT:2', 0), - 'user_avatar_width' => array('USINT', 0), - 'user_avatar_height' => array('USINT', 0), - 'user_sig' => array('MTEXT_UNI', ''), - 'user_sig_bbcode_uid' => array('VCHAR:8', ''), - 'user_sig_bbcode_bitfield' => array('VCHAR:255', ''), - 'user_from' => array('VCHAR_UNI:100', ''), - 'user_icq' => array('VCHAR:15', ''), - 'user_aim' => array('VCHAR_UNI', ''), - 'user_yim' => array('VCHAR_UNI', ''), - 'user_msnm' => array('VCHAR_UNI', ''), - 'user_jabber' => array('VCHAR_UNI', ''), - 'user_website' => array('VCHAR_UNI:200', ''), - 'user_occ' => array('TEXT_UNI', ''), - 'user_interests' => array('TEXT_UNI', ''), - 'user_actkey' => array('VCHAR:32', ''), - 'user_newpasswd' => array('VCHAR_UNI:40', ''), - 'user_form_salt' => array('VCHAR_UNI:32', ''), - - ), - 'PRIMARY_KEY' => 'user_id', - 'KEYS' => array( - 'user_birthday' => array('INDEX', 'user_birthday'), - 'user_email_hash' => array('INDEX', 'user_email_hash'), - 'user_type' => array('INDEX', 'user_type'), - 'username_clean' => array('UNIQUE', 'username_clean'), - ), - ); - - $schema_data['phpbb_warnings'] = array( - 'COLUMNS' => array( - 'warning_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT', 0), - 'post_id' => array('UINT', 0), - 'log_id' => array('UINT', 0), - 'warning_time' => array('TIMESTAMP', 0), - ), - 'PRIMARY_KEY' => 'warning_id', - ); - - $schema_data['phpbb_words'] = array( - 'COLUMNS' => array( - 'word_id' => array('UINT', NULL, 'auto_increment'), - 'word' => array('VCHAR_UNI', ''), - 'replacement' => array('VCHAR_UNI', ''), - ), - 'PRIMARY_KEY' => 'word_id', - ); - - $schema_data['phpbb_zebra'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - 'zebra_id' => array('UINT', 0), - 'friend' => array('BOOL', 0), - 'foe' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => array('user_id', 'zebra_id'), - 'KEYS' => array( - 'zebra_user' => array('INDEX', array('zebra_id', 'user_id')), - ), - ); - - return $schema_data; -} - - -/** -* Data put into the header for various dbms -*/ -function custom_data($dbms) -{ - switch ($dbms) - { - case 'oracle': - return << \ No newline at end of file diff --git a/phpBB/develop/create_variable_overview.php b/phpBB/develop/create_variable_overview.php deleted file mode 100644 index 3782f53e4c..0000000000 --- a/phpBB/develop/create_variable_overview.php +++ /dev/null @@ -1,547 +0,0 @@ - - - - - -{FILENAME} - - - - - - - - -
    phpBB LogoFile {FILENAME}      
    - - - - - -

    - -'; -$html_skeleton .= '
    Back to Contents

    '; -$html_skeleton .= '
    Language Variables :: Includes :: Conditionals
    Remaining Vars :: phpBB File Usage :: References'; -$html_skeleton .= '

    Language Variables

    {LANGUAGE_VARIABLES}'; -$html_skeleton .= '

    Included Files

    {INCLUDES}'; -$html_skeleton .= '

    Used Conditionals

    {CONDITIONALS}'; -$html_skeleton .= '

    Remaining Vars used

    {REMAINING_VARS}'; -$html_skeleton .= '

    This Template File is used by the following phpBB Files

    {USED_BY}'; -$html_skeleton .= '

    References: {SEE_FILES}'; - -//$html_skeleton .= "\n\n"; - -$html_skeleton .= ' -

    - - -
    - - - -'; - -// Open Language File -include('../language/en/lang_main.php'); -include('../language/en/lang_admin.php'); - -$files_to_parse = $php_files = array(); - -$dhandler = opendir($directory); -if (!$dhandler) -{ - die("Unable to open $directory"); -} - -$num = 0; -while ($file = readdir($dhandler)) -{ - if (is_file($directory . $file) && preg_match('#\.' . $ext . '$#i', $file)) - { - $files_to_parse[$num]['filename'] = $directory . $file; - $files_to_parse[$num]['single_filename'] = $file; - $files_to_parse[$num]['destfile'] = str_replace(".{$ext}", '', $file) . '_' . $num . '.html'; - $file_to_destfile[$file] = $files_to_parse[$num]['destfile']; - $num++; - } -} -closedir($dhandler); - -$num = 0; -foreach ($phpfiles_directories as $directory) -{ - $dhandler = opendir($directory); - if (!$dhandler) - { - die("Unable to open $directory"); - } - - while ($file = readdir($dhandler)) - { - if (is_file($directory . $file) && preg_match('#\.php$#i', $file)) - { - $php_files[$num]['filename'] = $directory . $file; - $php_files[$num]['single_filename'] = $file; - $num++; - } - } - closedir($dhandler); -} - -$php_files_includes = $lang_references = array(); - -//$php_files_includes['viewtopic_attach_body.html'][0] = filename - -echo '
    Parsing PHP Files'; - -// Parse PHP Files and get our filenames -foreach ($php_files as $file_num => $data) -{ - echo '.'; - flush(); - $contents = implode('', file($data['filename'], filesize($data['filename']))); - - $html_files = array(); - preg_match_all('#([a-zA-Z0-9\-_]*?)\.' . $ext . '#s', $contents, $html_files); - $html_files = array_unique($html_files[1]); - - foreach ($html_files as $html_file) - { - $html_file = trim($html_file); - if ($html_file != '') - { - $php_files_includes[$html_file . '.' . $ext][] = $data['filename']; - } - } -} - -echo '
    Parsing HTML Files'; -foreach ($files_to_parse as $file_num => $data) -{ - echo '.'; - flush(); - $contents = implode('', file($data['filename'], filesize($data['filename']))); - - // Language Variables -> [0]:tpl [1]:lang - $lang_vars = array(); - preg_match_all('#{L_([a-z0-9\-_]*?)\}#is', $contents, $lang_vars); - $contents = preg_replace('#{L_([a-z0-9\-_]*?)\}#is', '', $contents); - $lang_vars[0] = array_unique($lang_vars[0]); - $lang_vars[1] = array_unique($lang_vars[1]); - - // Includes - $includes = array(); - preg_match_all('##s', $contents, $includes); - $contents = preg_replace('##', '', $contents); - $includes = $includes[1]; - $includes = array_unique($includes); - - // IF Conditions - $switches = array(); - preg_match_all('##', $contents, $switches); - $contents = preg_replace('##s', '', $contents); - $switches[0] = array_unique($switches[1]); // No resorting please - $switches[1] = $switches[2]; - unset($switches[2]); - - // Remaining Vars - $remaining_vars = array(); - preg_match_all('#{([a-z0-9\-_\.]*?)\}#is', $contents, $remaining_vars); - $contents = preg_replace('#{([a-z0-9\-_]*?)\}#is', '', $contents); - $remaining_vars = array_unique($remaining_vars[1]); - sort($remaining_vars, SORT_STRING); - - // Now build the filename specific site - $fp = fopen($store_dir . $data['destfile'], 'w'); - $html_data = $html_skeleton; - - $html_data = str_replace('{FILENAME}', $data['single_filename'], $html_data); - - // Write up the Language Variables - if (count($lang_vars[0])) - { - $lang_data = '
      '; - for ($num = 0; $num <= count($lang_vars[0]); $num++) - { - $var = $lang_vars[0][$num]; - if ($var != '') - { - $_var = str_replace(array('{', '}'), array('', ''), $var); - $lang_references[$_var][] = $data['single_filename']; - $lang_data .= '
    • ' . $var . '
      ' . "\n" . ((isset($lang[$_var])) ? htmlspecialchars(str_replace("\\'", "'", $lang[$_var])) : 'No Language Variable available') . '

    • ' . "\n"; - } - } - $lang_data .= '
    '; - } - else - { - $lang_data = 'NONE
    ' . "\n"; - } - - $html_data = str_replace('{LANGUAGE_VARIABLES}', $lang_data, $html_data); - - // Write up the Includes - echo '.'; - flush(); - if (count($includes)) - { - $includes_data = '
      '; - $see_files = ''; - for ($num = 0; $num <= count($includes); $num++) - { - $var = $includes[$num]; - if ($var != '') - { - $includes_data .= '
    • ' . $var . '

    • ' . "\n"; - $see_files .= ($see_files != '') ? ' :: ' : ''; - $see_files .= '' . $var . ''; - } - } - $includes_data .= '
    '; - } - else - { - $includes_data = 'NONE
    ' . "\n"; - $see_files = 'NONE'; - } - - $html_data = str_replace('{INCLUDES}', $includes_data, $html_data); - $html_data = str_replace('{SEE_FILES}', $see_files, $html_data); - - // Write up Conditionals - echo '.'; - flush(); - if (count($switches[0])) - { - $conditionals = '
      '; - for ($num = 0; $num <= count($switches[0]); $num++) - { - $var = trim($switches[0][$num]); - if ($var != '') - { - if ($var == 'not') - { - $conditionals .= '
    • ' . trim($switches[1][$num]) . '
      Negation
      ' . "\n"; - $block_var = explode('.', trim($switches[1][$num])); - unset($block_var[0]); - } - else - { - $conditionals .= '
    • ' . $var . ((trim($switches[1][$num]) != '') ? '
      ' . "\n" . 'Compared with -> ' . trim($switches[1][$num]) . '' : '') . '
      ' . "\n"; - $block_var = explode('.', $var); - unset($block_var[count($block_var)-1]); - } - - if (count($block_var)) - { - for ($_num = count($block_var)-1; $_num >= 0; $_num--) - { - $conditionals .= ($_num == count($block_var)-1) ? 'Element of Block -> ' . $block_var[$_num] . '
      ' . "\n" : '...which is an element of -> ' . $block_var[$_num] . '
      ' . "\n"; - } - } - $conditionals .= '
    • ' . "\n"; - } - } - $conditionals .= '
    '; - } - else - { - $conditionals = 'NONE
    ' . "\n"; - } - - $html_data = str_replace('{CONDITIONALS}', $conditionals, $html_data); - - // Write up Remaining Vars - echo '.'; - flush(); - if (count($remaining_vars)) - { - $remaining = '
      '; - for ($num = 0; $num <= count($remaining_vars); $num++) - { - $var = trim($remaining_vars[$num]); - if ($var != '') - { - $remaining .= '
    • ' . $var . '
      ' . "\n"; - $block_var = explode('.', $var); - unset($block_var[count($block_var)-1]); - - if (count($block_var)) - { - for ($_num = count($block_var)-1; $_num >= 0; $_num--) - { - $remaining .= ($_num == count($block_var)-1) ? 'Element of Block -> ' . $block_var[$_num] . '
      ' . "\n" : '...which is an element of -> ' . $block_var[$_num] . '
      ' . "\n"; - } - } - $remaining .= '
    • ' . "\n"; - } - } - $remaining .= '
    '; - } - else - { - $remaining = 'NONE
    ' . "\n"; - } - - $html_data = str_replace('{REMAINING_VARS}', $remaining, $html_data); - - if (isset($php_files_includes[$data['single_filename']]) && count($php_files_includes[$data['single_filename']])) - { - $usedby = '
      '; - foreach ($php_files_includes[$data['single_filename']] as $php_filename) - { - $usedby .= '
    • ' . str_replace('../', '', $php_filename) . '
    • '; - } - $usedby .= '
    '; - } - else - { - $usedby = 'NONE
    ' . "\n"; - } - - $html_data = str_replace('{USED_BY}', $usedby, $html_data); - - fwrite($fp, $html_data); - fclose($fp); -} - -echo '
    Store Files'; - -$fp = fopen($store_dir . 'index.html', 'w'); - -$html_data = ' - - - - - -Contents - - - - - - - - -
    phpBB LogoAvailable Template Files      
    - - - - - -

    -
    This Style Document is 100% auto-generated... no human interaction included. :D
    -

    phpBB 2.2 Template

    -
    -
      -'; - -sort($files_to_parse); -foreach ($files_to_parse as $file_num => $data) -{ - echo '.'; - flush(); - $var = $data['single_filename']; - $html_data .= '
    1. ' . $var . '

    2. ' . "\n"; -} - -$html_data .= '
    3. Appendix A: Language Variable Index

    4. '; - -$html_data .= ' -


    - - -
    - - - -'; - -fwrite($fp, $html_data); -fclose($fp); - -// Not only write down all language files, place them into a specific array, named by the template file -// All Language vars assigned to more than one template will be placed into a common file -$entry = array(); -$common_fp = fopen($store_dir . 'lang_common.php', 'w'); -fwrite($common_fp, " - - - - -Appendix A :: Language Variable Index - - - - - - - - -
    phpBB LogoLanguage Variable Index      
    - - - - - -

    -
    Back to Contents

    -
    -'; - -echo '
    Write Language Files'; - -asort($lang_references); -ksort($lang_references); -$_index = ''; -$old_char = ''; -foreach ($lang_references as $lang_var => $filenames) -{ - $var = preg_replace('#^L_(.*?)#', '\1', $lang_var); - $char = $var{0}; - if ($old_char != $char) - { - $old_char = $char; - $_index .= ($_index != '') ? ' :: ' : ''; - $_index .= '' . $char . ''; - } -} - -$html_data .= $_index . '


    '; -$old_char = ''; -foreach ($lang_references as $lang_var => $filenames) -{ - echo '.'; - flush(); - $var = preg_replace('#^L_(.*?)#', '\1', $lang_var); - $char = $var{0}; - if ($old_char != $char) - { - $old_char = $char; - $html_data .= '


    Letter ' . $char . '



    '; - } - - $html_data .= '' . $lang_var . '
      '; - - if (sizeof($filenames) != 1) - { - fwrite($common_fp, (($entry['common']) ? ",\n" : '') . "\t'$var' => '" . $lang[$var] . "'"); - $entry['common'] = true; - } - else if (sizeof($filenames) == 1) - { - // Merge logical - hardcoded - $fname = (preg_match('#^(' . implode('|', $merge) . ')#', $filenames[0], $match)) ? $match[0] . '.php' : str_replace($ext, 'php', $filenames[0]); - - if (!$lang_fp[$fname]) - { - $lang_fp[$fname] = fopen($store_dir . 'lang_' . $fname, 'w'); - fwrite($lang_fp[$fname], " '" . $lang[$var] . "'"); - $entry[$fname] = true; - } - - foreach ($filenames as $f_name) - { - $var = trim($f_name); - $html_data .= '
    • ' . $var . '

    • ' . "\n"; - } - $html_data .= '


    '; -} - -fwrite($common_fp, ")\n);\n?>"); -fclose($common_fp); - -foreach ($lang_fp as $filepointer) -{ - fwrite($filepointer, ")\n);\n?>"); - fclose($filepointer); -} - -$html_data .= ' -

    - - -
    - - - -'; - -fwrite($fp, $html_data); -fclose($fp); - -echo '
    Finished!'; -flush(); - -?> \ No newline at end of file diff --git a/phpBB/develop/encoding_emails.php b/phpBB/develop/encoding_emails.php new file mode 100644 index 0000000000..aa1d749dab --- /dev/null +++ b/phpBB/develop/encoding_emails.php @@ -0,0 +1,73 @@ +' . $dirname . '/' . $file . '/email/' . $email . "
    \n"; + echo nl2br($email_file); + echo "\n\n

    \n\n"; + + fseek($fp, 0); + fwrite($fp, $email_file); + fclose($fp); + } + } + echo "\n\n
    \n\n"; + } +} + +?> \ No newline at end of file diff --git a/phpBB/develop/fill.php b/phpBB/develop/fill.php deleted file mode 100644 index 336e510d06..0000000000 --- a/phpBB/develop/fill.php +++ /dev/null @@ -1,190 +0,0 @@ -sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - $user_ids[] = $row['user_id']; - } - $db->sql_freeresult($result); - - $sql = 'SELECT forum_id FROM ' . FORUMS_TABLE . ' WHERE forum_type = ' . FORUM_POST; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - $forum_ids[$row['forum_id']] = $row['forum_id']; - } - $db->sql_freeresult($result); - - if (!$start) - { - $db->sql_query('TRUNCATE TABLE ' . POSTS_TABLE); - $db->sql_query('TRUNCATE TABLE ' . TOPICS_TABLE); -// $db->sql_query('TRUNCATE TABLE ' . TOPICS_TABLE . '_prefetch'); - } - - $db->sql_query('LOCK TABLES ' . POSTS_TABLE . ' WRITE, ' . TOPICS_TABLE . ' WRITE'); - - for ($topic_id = $start + 1; $topic_id < min($start + $batch_size, $num_topics + 1); ++$topic_id) - { - $forum_id = array_rand($forum_ids); - - if (count($topic_rows) == 10) - { - $sql = 'INSERT IGNORE INTO ' . TOPICS_TABLE . " (topic_id, forum_id, topic_title, topic_reported) - VALUES " . implode(', ', $topic_rows); - $db->sql_query($sql); - - $topic_rows = array(); - } - - $topic_rows[] = "($topic_id, $forum_id, '$forum_id-$topic_id', " . (($topic_id % 34) ? '0' : '1') . ')'; - - $sql = 'INSERT IGNORE INTO ' . POSTS_TABLE . ' (topic_id, forum_id, poster_id, post_subject, post_text, post_username, post_approved, post_time, post_reported) - VALUES '; - - $rows = array(); - $post_time = mt_rand(0, time()); - - $num_posts = $posts_per_topic; //mt_rand(1, $posts_per_topic); - for ($i = 0; $i < $num_posts; ++$i) - { - $poster_id = $user_ids[array_rand($user_ids)]; - $poster_name = ($poster_id == ANONYMOUS) ? rndm_username() : ''; - $rows[] = "($topic_id, $forum_id, $poster_id, '$forum_id-$topic_id-$i', '$forum_id-$topic_id-$i', '$poster_name', " . (mt_rand(0, 12) ? '1' : '0') . ', ' . ($post_time + $i * 60) . ', ' . (mt_rand(0, 32) ? '0' : '1') . ')'; - } - - $db->sql_query($sql . implode(', ', $rows)); - } - - if (count($topic_rows)) - { - $sql = 'INSERT IGNORE INTO ' . TOPICS_TABLE . " (topic_id, forum_id, topic_title, topic_reported) - VALUES " . implode(', ', $topic_rows); - $db->sql_query($sql); - } - - $db->sql_query('UNLOCK TABLES'); - - if ($topic_id >= $num_topics) - { - echo 'And now for something completely different...'; - - $db->sql_query('ANALYZE TABLES ' . TOPICS_TABLE . ', ' . POSTS_TABLE); - flush(); - } - else - { - echo 'To the next page... (' . $topic_id . '/' . $num_topics . ')'; - flush(); - } - break; - - case 'sync': -/* error_reporting(E_ALL); - $sync_all = TRUE; - - if ($sync_all) - { - $s = explode(' ', microtime()); - sync('topic', '', '', TRUE, FALSE); -// sync('forum'); - $e = explode(' ', microtime()); - - echo '
    ' . ($e[0] + $e[1] - $s[0] - $s[1]) . '
    '; - echo 'Here we go again'; - } - else - { - $batch_size = $batch_size * 10; - $end = $start + $batch_size; - - $s = explode(' ', microtime()); - sync('topic', 'range', "topic_id BETWEEN $start AND $end", TRUE, FALSE); - $e = explode(' ', microtime()); - - echo '
    Time taken: ' . ($e[0] + $e[1] - $s[0] - $s[1]) . '
    '; - - if ($end < $num_topics) - { - $start += $batch_size; - echo 'And now for something completely different... ($start/$num_topics)"; - } - else - { - echo 'Here we go again'; - } - } - - if (isset($_GET['explain'])) - { - trigger_error('Done'); - } - */ -} - -$db->sql_close(); - -function rndm_username() -{ - static $usernames; - - if (!isset($usernames)) - { - $usernames = get_defined_functions(); - $usernames = $usernames['internal']; - } - - return $usernames[array_rand($usernames)]; -} - -?> \ No newline at end of file diff --git a/phpBB/develop/fix_files.sh b/phpBB/develop/fix_files.sh index 782418f504..f38c5ef5bd 100755 --- a/phpBB/develop/fix_files.sh +++ b/phpBB/develop/fix_files.sh @@ -7,21 +7,18 @@ # # UPDATE: 7/31/2001: fix so that it doesn't touch things in the images directory # -# UPDATE: 12/15/2003: Fix so that it doesn't touch any "non-text" files -# find . > FILELIST.$$ grep -sv FILELIST FILELIST.$$ > FILELIST2.$$ grep -sv $(basename $0) FILELIST2.$$ > FILELIST.$$ grep -sv "^\.$" FILELIST.$$ > FILELIST2.$$ -file -f FILELIST2.$$ |grep text | sed -e 's/^\([^\:]*\)\:.*$/\1/' > FILELIST -file -f FILELIST2.$$ |grep -sv text | sed -e 's/^\([^\:]*\)\:.*$/Not Modifying file: \1/' +grep -sv "images" FILELIST2.$$ > FILELIST rm FILELIST2.$$ rm FILELIST.$$ for i in $(cat FILELIST); do if [ -f $i ]; then - sed -e s/ + sed -e s/ //g $i > $i.tmp mv $i.tmp $i fi diff --git a/phpBB/develop/generate_utf_casefold.php b/phpBB/develop/generate_utf_casefold.php deleted file mode 100644 index 89c4aec01a..0000000000 --- a/phpBB/develop/generate_utf_casefold.php +++ /dev/null @@ -1,156 +0,0 @@ - 0xFFFF) - { - return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F)); - } - else if ($cp > 0x7FF) - { - return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F)); - } - else if ($cp > 0x7F) - { - return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F)); - } - else - { - return chr($cp); - } -} - -preg_match_all('/^([0-9A-F]+); ([CFS]); ([0-9A-F]+(?: [0-9A-F]+)*);/im', $unidata, $array, PREG_SET_ORDER); - -$uniarray = array(); - -foreach ($array as $value) -{ - $uniarray[$value[2]][utf8_chr(hexdec((string)$value[1]))] = implode(array_map('utf8_chr', array_map('hexdec', explode(' ', $value[3])))); -} - -foreach ($uniarray as $idx => $contents) -{ - echo "Writing to case_fold_$idx.$phpEx\n"; - $fp = fopen($phpbb_root_path . 'includes/utf/data/case_fold_' . strtolower($idx) . '.' . $phpEx, 'wb'); - fwrite($fp, ' $v) - { - $lines[] = my_var_export($k) . '=>' . my_var_export($v); - } - - return 'array(' . implode(',', $lines) . ')'; - } - else if (is_string($var)) - { - return "'" . str_replace(array('\\', "'"), array('\\\\', "\\'"), $var) . "'"; - } - else - { - return $var; - } -} - -/** -* Download a file to the develop/ dir -* -* @param string $url URL of the file to download -* @return void -*/ -function download($url) -{ - global $phpbb_root_path; - - if (file_exists($phpbb_root_path . 'develop/' . basename($url))) - { - return; - } - - echo 'Downloading from ', $url, ' '; - - if (!$fpr = fopen($url, 'rb')) - { - die("Can't download from $url\nPlease download it yourself and put it in the develop/ dir, kthxbai"); - } - - if (!$fpw = fopen($phpbb_root_path . 'develop/' . basename($url), 'wb')) - { - die("Can't open develop/" . basename($url) . " for output... please check your permissions or something"); - } - - $i = 0; - $chunk = 32768; - $done = ''; - - while (!feof($fpr)) - { - $i += fwrite($fpw, fread($fpr, $chunk)); - echo str_repeat("\x08", strlen($done)); - - $done = ($i >> 10) . ' KiB'; - echo $done; - } - fclose($fpr); - fclose($fpw); - - echo "\n"; -} - -?> \ No newline at end of file diff --git a/phpBB/develop/generate_utf_confusables.php b/phpBB/develop/generate_utf_confusables.php deleted file mode 100644 index f79471afc6..0000000000 --- a/phpBB/develop/generate_utf_confusables.php +++ /dev/null @@ -1,240 +0,0 @@ - 0xFFFF) - { - return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F)); - } - else if ($cp > 0x7FF) - { - return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F)); - } - else if ($cp > 0x7F) - { - return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F)); - } - else - { - return chr($cp); - } -} - -preg_match_all('/^([0-9A-F]+) ;\s((?:[0-9A-F]+ )*);.*?$/im', $unidata, $array, PREG_SET_ORDER); -preg_match_all('/^([0-9A-F]+); ([CFS]); ([0-9A-F]+(?: [0-9A-F]+)*);/im', $casefolds, $casefold_array); - -// some that we defined ourselves -$uniarray = array( - "\xC2\xA1" => "\x69", // EXCLAMATION MARK, INVERTED => LATIN SMALL LETTER I - "\xC7\x83" => "\x21", // LATIN LETTER RETROFLEX CLICK => EXCLAMATION MARK - "\xCE\xB1" => "\x61", // GREEK SMALL LETTER ALPHA => LATIN SMALL LETTER A - "\xE1\x9A\x80" => "\x20", // OGHAM SPACE MARK - - "\xC2\xAD" => '', // HYPHEN, SOFT => empty string - "\xDB\x9D" => '', // ARABIC END OF AYAH - "\xDC\x8F" => '', // SYRIAC ABBREVIATION MARK - "\xE1\xA0\x86" => '', // MONGOLIAN TODO SOFT HYPHEN - "\xE1\xA0\x8E" => '', // MONGOLIAN VOWEL SEPARATOR - "\xE2\x80\x8B" => '', // ZERO WIDTH SPACE - "\xE2\x80\x8C" => '', // ZERO WIDTH NON-JOINER - "\xE2\x80\x8D" => '', // ZERO WIDTH JOINER - "\xE2\x80\xA8" => '', // LINE SEPARATOR - "\xE2\x80\xA9" => '', // PARAGRAPH SEPARATOR - "\xE2\x81\xA0" => '', // WORD JOINER - "\xE2\x81\xA1" => '', // FUNCTION APPLICATION - "\xE2\x81\xA2" => '', // INVISIBLE TIMES - "\xE2\x81\xA3" => '', // INVISIBLE SEPARATOR - "\xE2\x81\xAA" => '', // [CONTROL CHARACTERS] - "\xE2\x81\xAB" => '', // [CONTROL CHARACTERS] - "\xE2\x81\xAC" => '', // [CONTROL CHARACTERS] - "\xE2\x81\xAD" => '', // [CONTROL CHARACTERS] - "\xE2\x81\xAE" => '', // [CONTROL CHARACTERS] - "\xE2\x81\xAF" => '', // [CONTROL CHARACTERS] - "\xEF\xBB\xBF" => '', // ZERO WIDTH NO-BREAK SPACE - "\xEF\xBF\xB9" => '', // [CONTROL CHARACTERS] - "\xEF\xBF\xBA" => '', // [CONTROL CHARACTERS] - "\xEF\xBF\xBB" => '', // [CONTROL CHARACTERS] - "\xEF\xBF\xBC" => '', // [CONTROL CHARACTERS] - "\xF0\x9D\x85\xB3" => '', // [MUSICAL CONTROL CHARACTERS] - "\xF0\x9D\x85\xB4" => '', // [MUSICAL CONTROL CHARACTERS] - "\xF0\x9D\x85\xB5" => '', // [MUSICAL CONTROL CHARACTERS] - "\xF0\x9D\x85\xB6" => '', // [MUSICAL CONTROL CHARACTERS] - "\xF0\x9D\x85\xB7" => '', // [MUSICAL CONTROL CHARACTERS] - "\xF0\x9D\x85\xB8" => '', // [MUSICAL CONTROL CHARACTERS] - "\xF0\x9D\x85\xB9" => '', // [MUSICAL CONTROL CHARACTERS] - "\xF0\x9D\x85\xBA" => '', // [MUSICAL CONTROL CHARACTERS] -); - -$copy = $uniarray; - -foreach ($array as $value) -{ - $temp_hold = implode(array_map('utf8_chr', array_map('hexdec', explode(' ', trim($value[2]))))); - - if (isset($copy[utf8_chr(hexdec((string)$value[1]))])) - { - $num = ''; - $string = utf8_chr(hexdec((string)$value[1])); - for ($i = 0; $i < strlen($string); $i++) - { - $num .= '\x' . str_pad(base_convert(ord($string[$i]), 10, 16), 2, '0', STR_PAD_LEFT); - } - echo $num . "\n"; - if ($uniarray[$string] != $temp_hold) - { - echo " --> $string\n"; - echo " --> " . $temp_hold . "\n"; - } - } - - // do some tests for things that transform into something with the number one - if (strpos($temp_hold, utf8_chr(0x0031)) !== false) - { - // any kind of letter L? - if (strpos($value[0], 'LETTER L') !== false || strpos($value[0], 'IOTA') !== false || strpos($value[0], 'SMALL L ') !== false || preg_match('/SMALL LIGATURE [^L]*L /', $value[0])) - { - // replace all of the mappings that transform some sort of letter l to number one instead to some sort of letter l to latin small letter l - $temp_hold = str_replace(utf8_chr(0x0031), utf8_chr(0x006C), $temp_hold); - } - } - - // uppercased chars that were folded do not exist in this universe, - // no amount of normalization could ever "trick" this into not working - if (in_array($value[1], $casefold_array[1])) - { - continue; - } - - $uniarray[utf8_chr(hexdec((string)$value[1]))] = $temp_hold; -} - -echo "Writing to confusables.$phpEx\n"; - -$fp = fopen($phpbb_root_path . 'includes/utf/data/confusables.' . $phpEx, 'wb'); -fwrite($fp, ' $v) - { - $lines[] = my_var_export($k) . '=>' . my_var_export($v); - } - - return 'array(' . implode(',', $lines) . ')'; - } - else if (is_string($var)) - { - return "'" . str_replace(array('\\', "'"), array('\\\\', "\\'"), $var) . "'"; - } - else - { - return $var; - } -} - -/** -* Download a file to the develop/ dir -* -* @param string $url URL of the file to download -* @return void -*/ -function download($url) -{ - global $phpbb_root_path; - - if (file_exists($phpbb_root_path . 'develop/' . basename($url))) - { - return; - } - - echo 'Downloading from ', $url, ' '; - - if (!$fpr = fopen($url, 'rb')) - { - die("Can't download from $url\nPlease download it yourself and put it in the develop/ dir, kthxbai"); - } - - if (!$fpw = fopen($phpbb_root_path . 'develop/' . basename($url), 'wb')) - { - die("Can't open develop/" . basename($url) . " for output... please check your permissions or something"); - } - - $i = 0; - $chunk = 32768; - $done = ''; - - while (!feof($fpr)) - { - $i += fwrite($fpw, fread($fpr, $chunk)); - echo str_repeat("\x08", strlen($done)); - - $done = ($i >> 10) . ' KiB'; - echo $done; - } - fclose($fpr); - fclose($fpw); - - echo "\n"; -} - -?> \ No newline at end of file diff --git a/phpBB/develop/generate_utf_tables.php b/phpBB/develop/generate_utf_tables.php deleted file mode 100644 index 3d5188163d..0000000000 --- a/phpBB/develop/generate_utf_tables.php +++ /dev/null @@ -1,572 +0,0 @@ -= UTF8_HANGUL_FIRST && $end <= UTF8_HANGUL_LAST) - { - /** - * We do not store Hangul syllables in the array - */ - continue; - } - - if ($p[2] == 'M') - { - $val = UNICODE_QC_MAYBE; - } - else - { - $val = UNICODE_QC_NO; - } - - if ($p[1] == 'NFKC_QC') - { - $file = 'utf_nfkc_qc'; - } - else - { - $file = 'utf_nfc_qc'; - } - - for ($i = $start; $i <= $end; ++$i) - { - /** - * The vars have the same name as the file: $utf_nfc_qc is in utf_nfc_qc.php - */ - $file_contents[$file][$file][cp_to_utf($i)] = $val; - } -} -fclose($fp); - -/** -* Do mappings -*/ -echo "Loading Unicode decomposition mappings\n"; -$fp = fopen($phpbb_root_path . 'develop/UnicodeData.txt', 'rt'); - -$map = array(); -while (!feof($fp)) -{ - $p = explode(';', fgets($fp, 1024)); - $cp = hexdec($p[0]); - - if (!empty($p[3])) - { - /** - * Store combining class > 0 - */ - $file_contents['utf_normalizer_common']['utf_combining_class'][cp_to_utf($cp)] = (int) $p[3]; - } - - if (!isset($p[5]) || !preg_match_all('#[0-9A-F]+#', strip_tags($p[5]), $m)) - { - continue; - } - - if (strpos($p[5], '>')) - { - $map['NFKD'][$cp] = implode(' ', array_map('hexdec', $m[0])); - } - else - { - $map['NFD'][$cp] = $map['NFKD'][$cp] = implode(' ', array_map('hexdec', $m[0])); - } -} -fclose($fp); - -/** -* Build the canonical composition table -*/ -echo "Generating the Canonical Composition table\n"; -foreach ($map['NFD'] as $cp => $decomp_seq) -{ - if (!strpos($decomp_seq, ' ') || isset($exclude[$cp])) - { - /** - * Singletons are excluded from canonical composition - */ - continue; - } - - $utf_seq = implode('', array_map('cp_to_utf', explode(' ', $decomp_seq))); - - if (!isset($file_contents['utf_canonical_comp']['utf_canonical_comp'][$utf_seq])) - { - $file_contents['utf_canonical_comp']['utf_canonical_comp'][$utf_seq] = cp_to_utf($cp); - } -} - -/** -* Decompose the NF[K]D mappings recursively and prepare the file contents -*/ -echo "Generating the Canonical and Compatibility Decomposition tables\n\n"; -foreach ($map as $type => $decomp_map) -{ - foreach ($decomp_map as $cp => $decomp_seq) - { - $decomp_map[$cp] = decompose($decomp_map, $decomp_seq); - } - unset($decomp_seq); - - if ($type == 'NFKD') - { - $file = 'utf_compatibility_decomp'; - $var = 'utf_compatibility_decomp'; - } - else - { - $file = 'utf_canonical_decomp'; - $var = 'utf_canonical_decomp'; - } - - /** - * Generate the corresponding file - */ - foreach ($decomp_map as $cp => $decomp_seq) - { - $file_contents[$file][$var][cp_to_utf($cp)] = implode('', array_map('cp_to_utf', explode(' ', $decomp_seq))); - } -} - -/** -* Generate and/or alter the files -*/ -foreach ($file_contents as $file => $contents) -{ - /** - * Generate a new file - */ - echo "Writing to $file.$phpEx\n"; - - if (!$fp = fopen($phpbb_root_path . 'includes/utf/data/' . $file . '.' . $phpEx, 'wb')) - { - trigger_error('Cannot open ' . $file . ' for write'); - } - - fwrite($fp, ' $val) - { - fwrite($fp, "\n\$GLOBALS[" . my_var_export($var) . ']=' . my_var_export($val) . ";"); - } - fclose($fp); -} - -echo "\n*** UTF-8 normalization tables done\n\n"; - -/** -* Now we'll generate the files needed by the search indexer -*/ -echo "Generating search indexer tables\n"; - -$fp = fopen($phpbb_root_path . 'develop/UnicodeData.txt', 'rt'); - -$map = array(); -while ($line = fgets($fp, 1024)) -{ - /** - * The current line is split, $m[0] hold the codepoint in hexadecimal and - * all other fields numbered as in http://www.unicode.org/Public/UNIDATA/UCD.html#UnicodeData.txt - */ - $m = explode(';', $line); - - /** - * @var integer $cp Current char codepoint - * @var string $utf_char UTF-8 representation of current char - */ - $cp = hexdec($m[0]); - $utf_char = cp_to_utf($cp); - - /** - * $m[2] holds the "General Category" of the character - * @link http://www.unicode.org/Public/UNIDATA/UCD.html#General_Category_Values - */ - switch ($m[2][0]) - { - case 'L': - /** - * We allow all letters and map them to their lowercased counterpart on the fly - */ - $map_to_hex = (isset($m[13][0])) ? $m[13] : $m[0]; - - if (preg_match('#^LATIN.*(?:LETTER|LIGATURE) ([A-Z]{2}(?![A-Z]))$#', $m[1], $capture)) - { - /** - * Special hack for some latin ligatures. Using the name of a character - * is bad practice, but for now it works well enough. - * - * @todo Note that ligatures with combining marks such as U+01E2 are - * not supported at this time - */ - $map[$cp] = strtolower($capture[1]); - } - else if (isset($m[13][0])) - { - /** - * If the letter has a lowercased form, use it - */ - $map[$cp] = hex_to_utf($m[13]); - } - else - { - /** - * In all other cases, map the letter to itself - */ - $map[$cp] = $utf_char; - } - break; - - case 'M': - /** - * We allow all marks, they are mapped to themselves - */ - $map[$cp] = $utf_char; - break; - - case 'N': - /** - * We allow all numbers, but we map them to their numeric value whenever - * possible. The numeric value (field #8) is in ASCII already - * - * @todo Note that fractions such as U+00BD will be converted to something - * like "1/2", with a slash. However, "1/2" entered in ASCII is converted - * to "1 2". This will have to be fixed. - */ - $map[$cp] = (isset($m[8][0])) ? $m[8] : $utf_char; - break; - - default: - /** - * Everything else is ignored, skip to the next line - */ - continue 2; - } -} -fclose($fp); - -/** -* Add some cheating -*/ -$cheats = array( - '00DF' => 'ss', # German sharp S - '00C5' => 'ae', # Capital A with diaeresis - '00E4' => 'ae', # Small A with diaeresis - '00D6' => 'oe', # Capital O with diaeresis - '00F6' => 'oe', # Small O with diaeresis - '00DC' => 'ue', # Capital U with diaeresis - '00FC' => 'ue', # Small U with diaeresis -); - -/** -* Add our "cheat replacements" to the map -*/ -foreach ($cheats as $hex => $map_to) -{ - $map[hexdec($hex)] = $map_to; -} - -/** -* Split the map into smaller blocks -*/ -$file_contents = array(); -foreach ($map as $cp => $map_to) -{ - $file_contents[$cp >> 11][cp_to_utf($cp)] = $map_to; -} -unset($map); - -foreach ($file_contents as $idx => $contents) -{ - echo "Writing to search_indexer_$idx.$phpEx\n"; - $fp = fopen($phpbb_root_path . 'includes/utf/data/search_indexer_' . $idx . '.' . $phpEx, 'wb'); - fwrite($fp, ' $v) - { - $lines[] = my_var_export($k) . '=>' . my_var_export($v); - } - - return 'array(' . implode(',', $lines) . ')'; - } - else if (is_string($var)) - { - return "'" . str_replace(array('\\', "'"), array('\\\\', "\\'"), $var) . "'"; - } - else - { - return $var; - } -} - -/** -* Download a file to the develop/ dir -* -* @param string $url URL of the file to download -* @return void -*/ -function download($url) -{ - global $phpbb_root_path; - - if (file_exists($phpbb_root_path . 'develop/' . basename($url))) - { - return; - } - - echo 'Downloading from ', $url, ' '; - - if (!$fpr = fopen($url, 'rb')) - { - die("Can't download from $url\nPlease download it yourself and put it in the develop/ dir, kthxbai"); - } - - if (!$fpw = fopen($phpbb_root_path . 'develop/' . basename($url), 'wb')) - { - die("Can't open develop/" . basename($url) . " for output... please check your permissions or something"); - } - - $i = 0; - $chunk = 32768; - $done = ''; - - while (!feof($fpr)) - { - $i += fwrite($fpw, fread($fpr, $chunk)); - echo str_repeat("\x08", strlen($done)); - - $done = ($i >> 10) . ' KiB'; - echo $done; - } - fclose($fpr); - fclose($fpw); - - echo "\n"; -} - -/** -* Convert a codepoint in hexadecimal to a UTF-8 char -* -* @param string $hex Codepoint, in hexadecimal -* @return string UTF-8 char -*/ -function hex_to_utf($hex) -{ - return cp_to_utf(hexdec($hex)); -} - -/** -* Return a UTF string formed from a sequence of codepoints in hexadecimal -* -* @param string $seq Sequence of codepoints, separated with a space -* @return string UTF-8 string -*/ -function hexseq_to_utf($seq) -{ - return implode('', array_map('hex_to_utf', explode(' ', $seq))); -} - -/** -* Convert a codepoint to a UTF-8 char -* -* @param integer $cp Unicode codepoint -* @return string UTF-8 string -*/ -function cp_to_utf($cp) -{ - if ($cp > 0xFFFF) - { - return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F)); - } - else if ($cp > 0x7FF) - { - return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F)); - } - else if ($cp > 0x7F) - { - return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F)); - } - else - { - return chr($cp); - } -} \ No newline at end of file diff --git a/phpBB/develop/insert_server_info.php b/phpBB/develop/insert_server_info.php new file mode 100644 index 0000000000..f7d9fcc08e --- /dev/null +++ b/phpBB/develop/insert_server_info.php @@ -0,0 +1,64 @@ +
    \n"; + +echo "server_name :: "; +flush(); +$sql = "INSERT INTO " . CONFIG_TABLE . " + (config_name, config_value) VALUES ('server_name', 'www.myserver.tld')"; +if( !$db->sql_query($sql) ) +{ + print "Failed inserting server_name config ... probably exists already
    \n"; +} +else +{ + echo "DONE
    \n"; +} + +echo "script_path :: "; +flush(); +$sql = "INSERT INTO " . CONFIG_TABLE . " + (config_name, config_value) VALUES ('script_path', '/phpBB2/')"; +if( !$db->sql_query($sql) ) +{ + print "Failed inserting script_path config ... probably exists already
    \n"; +} +else +{ + echo "DONE
    \n"; +} + +echo "server_port :: "; +flush(); +$sql = "INSERT INTO " . CONFIG_TABLE . " + (config_name, config_value) VALUES ('server_port', '80')"; +if( !$db->sql_query($sql) ) +{ + print "Failed inserting server_port config ... probably exists already
    \n"; +} +else +{ + echo "DONE
    \n"; +} + +$db->sql_close(); + +echo "
    COMPLETE
    \n"; + +?> diff --git a/phpBB/develop/lang_duplicates.php b/phpBB/develop/lang_duplicates.php deleted file mode 100644 index 5be48f69f0..0000000000 --- a/phpBB/develop/lang_duplicates.php +++ /dev/null @@ -1,140 +0,0 @@ - - - Duplicate Language Keys - - -" . ((isset($output[$module])) ? ' ' : "$module" ) . "$dup$other_module$compare"; - break; - - default: - $output[$dup][] = "$dup$module$other_module$compare"; - break; - } - } - } -}//var_dump($output); - -echo "

    By Key By Module

    Equal: $equal, Differ in case only: $case, differ in content: $diff

    "; -switch ($mode) -{ - case 'module': - echo ""; - foreach ($output as $module => $html) - { - echo implode('', $html); - } - break; - - default: - ksort($output); - echo "
    KeyFirst FileSecond FileDifference
    "; - foreach ($output as $dup) - { - echo implode('', $dup); - } - break; -} - -echo "
    FileKeyConflicting FileDifference
    "; - - -function find_modules($dirname) -{ - $list = glob("$dirname/*.php"); - - foreach(glob("$dirname/*", GLOB_ONLYDIR) as $name) - { - $list = array_merge($list, find_modules($name)); - } - return $list; -} - -?> - - \ No newline at end of file diff --git a/phpBB/develop/merge_attachment_tables.php b/phpBB/develop/merge_attachment_tables.php deleted file mode 100644 index ae7fe57be4..0000000000 --- a/phpBB/develop/merge_attachment_tables.php +++ /dev/null @@ -1,80 +0,0 @@ -sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false); - -// Rename the attachments table... -$sql = "RENAME TABLE {$table_prefix}attachments TO {$table_prefix}attach_temp"; -$db->sql_query($sql); - -$sql = "CREATE TABLE {$table_prefix}attachments - SELECT d.*, a.post_id, a.user_id_from as poster_id, p.topic_id - FROM {$table_prefix}attach_desc d, {$table_prefix}attach_temp a, {$table_prefix}posts p - WHERE a.attach_id = d.attach_id - AND a.post_id = p.post_id"; -$db->sql_query($sql); - -switch ($db->sql_layer) -{ - case 'mysql': - case 'mysql4': - $sql = 'ALTER TABLE ' . $table_prefix . 'attachments - ADD PRIMARY KEY (attach_id), - ADD INDEX filetime (filetime), - ADD INDEX post_id (post_id), - ADD INDEX poster_id (poster_id), - ADD INDEX physical_filename (physical_filename(10)), - ADD INDEX filesize (filesize), - ADD INDEX topic_id (topic_id), - MODIFY COLUMN attach_id mediumint(8) UNSIGNED NOT NULL auto_increment'; - break; - - case 'mssql': - case 'mssql-odbc': - case 'msaccess': - break; - - case 'postgresql': - break; -} -$db->sql_query($sql); - -//$db->sql_query("DROP TABLE {$table_prefix}attach_temp"); - -echo "

    Done

    \n"; - -?> \ No newline at end of file diff --git a/phpBB/develop/merge_post_tables.php b/phpBB/develop/merge_post_tables.php deleted file mode 100644 index 3567a569c6..0000000000 --- a/phpBB/develop/merge_post_tables.php +++ /dev/null @@ -1,209 +0,0 @@ -sql_query($sql); - -$sql = "CREATE TABLE {$table_prefix}posts - SELECT p.*, pt.post_subject, pt.post_text, pt.post_checksum, pt.bbcode_bitfield, pt.bbcode_uid - FROM {$table_prefix}posts_temp p, {$table_prefix}posts_text pt - WHERE pt.post_id = p.post_id"; -$db->sql_query($sql); - -switch ($db->sql_layer) -{ - case 'mysql': - case 'mysql4': - $sql = 'ALTER TABLE ' . $table_prefix . 'posts - ADD PRIMARY KEY (post_id), - ADD INDEX topic_id (topic_id), - ADD INDEX poster_ip (poster_ip), - ADD INDEX post_approved (post_approved), - MODIFY COLUMN post_id mediumint(8) UNSIGNED NOT NULL auto_increment, - ADD COLUMN post_encoding varchar(11) DEFAULT \'iso-8859-15\' NOT NULL'; - break; - - case 'mssql': - case 'mssql-odbc': - case 'msaccess': - break; - - case 'postgresql': - break; -} -$db->sql_query($sql); - -$sql = "UPDATE {$table_prefix}topics SET topic_poster = 1 WHERE topic_poster = 0 OR topic_poster IS NULL"; -$db->sql_query($sql); -$sql = "UPDATE {$table_prefix}topics SET topic_last_poster_id = 1 WHERE topic_last_poster_id = 0 OR topic_last_poster_id IS NULL"; -$db->sql_query($sql); -$sql = "UPDATE {$table_prefix}posts SET poster_id = 1 WHERE poster_id = 0 OR poster_id IS NULL"; -$db->sql_query($sql); -$sql = "UPDATE {$table_prefix}users SET user_id = 1 WHERE user_id = 0"; -$db->sql_query($sql); - -$sql = "SELECT t.topic_id - FROM {$table_prefix}topics t - LEFT JOIN {$table_prefix}posts p ON p.topic_id = t.topic_id - WHERE p.topic_id IS NULL"; -$result = $db->sql_query($sql); - -if ($row = $db->sql_fetchrow($result)) -{ - $del_sql = ''; - do - { - $del_sql .= (($del_sql != '') ? ', ' : '') . $row['topic_id']; - } - while ($row = $db->sql_fetchrow($result)); - - $sql = "DELETE FROM {$table_prefix}topics - WHERE topic_id IN ($del_sql)"; - $db->sql_query($sql); -} -$db->sql_freeresult($result); - -$del_sql = ''; -$sql = "SELECT topic_id, MIN(post_id) AS first_post_id, MAX(post_id) AS last_post_id, COUNT(post_id) AS total_posts - FROM {$table_prefix}posts - GROUP BY topic_id"; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $del_sql .= (($del_sql != '') ? ', ' : '') . $row['topic_id']; - - $sql = "UPDATE {$table_prefix}topics - SET topic_first_post_id = " . $row['first_post_id'] . ", topic_last_post_id = " . $row['last_post_id'] . ", topic_replies = " . ($row['total_posts'] - 1) . " - WHERE topic_id = " . $row['topic_id']; - $db->sql_query($sql); -} -$db->sql_freeresult($result); - -$sql = "DELETE FROM {$table_prefix}topics WHERE topic_id NOT IN ($del_sql)"; -$db->sql_query($sql); - -$topic_count = $post_count = array(); -$sql = "SELECT forum_id, COUNT(topic_id) AS topics - FROM {$table_prefix}topics - GROUP BY forum_id"; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $topic_count[$row['forum_id']] = $row['topics']; -} -$db->sql_freeresult($result); - -$sql = "SELECT forum_id, COUNT(post_id) AS posts - FROM {$table_prefix}posts - GROUP BY forum_id"; -$result = $db->sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $post_count[$row['forum_id']] = $row['posts']; -} -$db->sql_freeresult($result); - -switch ($db->sql_layer) -{ - case 'oracle': - $sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id - FROM " . $table_prefix . "forums f, " . $table_prefix . "posts p, " . $table_prefix . "users u - WHERE p.post_id = f.forum_last_post_id(+) - AND u.user_id = p.poster_id(+)"; - break; - - default: - $sql = "SELECT f.forum_id, p.post_time, p.post_username, u.username, u.user_id - FROM ((" . $table_prefix . "forums f - LEFT JOIN " . $table_prefix . "posts p ON p.post_id = f.forum_last_post_id) - LEFT JOIN " . $table_prefix . "users u ON u.user_id = p.poster_id)"; - break; -} -$result = $db->sql_query($sql); - -$sql_ary = array(); -while ($row = $db->sql_fetchrow($result)) -{ - $forum_id = $row['forum_id']; - - $sql_ary[] = "UPDATE " . $table_prefix . "forums - SET forum_last_poster_id = " . ((!empty($row['user_id']) && $row['user_id'] != ANONYMOUS) ? $row['user_id'] : ANONYMOUS) . ", forum_last_poster_name = '" . ((!empty($row['user_id']) && $row['user_id'] != ANONYMOUS) ? addslashes($row['username']) : addslashes($row['post_username'])) . "', forum_last_post_time = " . $row['post_time'] . ", forum_posts = " . (($post_count[$forum_id]) ? $post_count[$forum_id] : 0) . ", forum_topics = " . (($topic_count[$forum_id]) ? $topic_count[$forum_id] : 0) . " - WHERE forum_id = $forum_id"; - - $sql = "SELECT t.topic_id, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_username, p2.post_username AS post_username2, p2.post_time - FROM " . $table_prefix . "topics t, " . $table_prefix . "users u, " . $table_prefix . "posts p, " . $table_prefix . "posts p2, " . $table_prefix . "users u2 - WHERE t.forum_id = $forum_id - AND u.user_id = t.topic_poster - AND p.post_id = t.topic_first_post_id - AND p2.post_id = t.topic_last_post_id - AND u2.user_id = p2.poster_id"; - $result2 = $db->sql_query($sql); - - while ($row2 = $db->sql_fetchrow($result2)) - { - $sql_ary[] = "UPDATE " . $table_prefix . "topics - SET topic_poster = " . $row2['user_id'] . ", topic_first_poster_name = '" . ((!empty($row2['user_id']) && $row2['user_id'] != ANONYMOUS) ? addslashes($row2['username']) : addslashes($row2['post_username'])) . "', topic_last_poster_id = " . ((!empty($row2['id2']) && $row2['id2'] != ANONYMOUS) ? $row2['id2'] : ANONYMOUS) . ", topic_last_post_time = " . $row2['post_time'] . ", topic_last_poster_name = '" . ((!empty($row2['id2']) && $row2['id2'] != ANONYMOUS) ? addslashes($row2['user2']) : addslashes($row2['post_username2'])) . "' - WHERE topic_id = " . $row2['topic_id']; - } - $db->sql_freeresult($result2); - - unset($row2); -} -$db->sql_freeresult($result); - -foreach ($sql_ary as $sql) -{ - $sql . "
    "; - $db->sql_query($sql); -} - -echo "

    Done

    \n"; - -?> \ No newline at end of file diff --git a/phpBB/develop/most_users_update.php b/phpBB/develop/most_users_update.php new file mode 100644 index 0000000000..b914424ce8 --- /dev/null +++ b/phpBB/develop/most_users_update.php @@ -0,0 +1,42 @@ + + +\n" . $sql = "INSERT INTO " . CONFIG_TABLE . " + (config_name, config_value) VALUES ('record_online_users', '1')"; + if( !$result = $db->sql_query($sql) ) + { + + message_die(GENERAL_ERROR, "Couldn't insert config key 'record_online_users'", "", __LINE__, __FILE__, $sql); + } + + echo "\n
    \n" . $sql = "INSERT INTO " . CONFIG_TABLE . " + (config_name, config_value) VALUES ('record_online_date', '".time()."')"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't insert config key 'record_online_date'", "", __LINE__, __FILE__, $sql); + } + + echo "\n
    \nCOMPLETE"; + +?> + + diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php deleted file mode 100644 index ea64a1a94f..0000000000 --- a/phpBB/develop/mysql_upgrader.php +++ /dev/null @@ -1,1362 +0,0 @@ -'; -} - -$sql = 'DESCRIBE ' . POSTS_TABLE . ' post_text'; -$result = $db->sql_query($sql); - -$row = $db->sql_fetchrow($result); - -$db->sql_freeresult($result); - -$mysql_indexer = false; - -if (strtolower($row['Type']) === 'mediumtext') -{ - $mysql_indexer = true; -} - -echo "USE $dbname;$newline$newline"; - - -@set_time_limit(0); - -$schema_data = get_schema_struct(); -$dbms_type_map = array( - 'mysql_41' => array( - 'INT:' => 'int(%d)', - 'BINT' => 'bigint(20)', - 'UINT' => 'mediumint(8) UNSIGNED', - 'UINT:' => 'int(%d) UNSIGNED', - 'TINT:' => 'tinyint(%d)', - 'USINT' => 'smallint(4) UNSIGNED', - 'BOOL' => 'tinyint(1) UNSIGNED', - 'VCHAR' => 'varchar(255)', - 'VCHAR:' => 'varchar(%d)', - 'CHAR:' => 'char(%d)', - 'XSTEXT' => 'text', - 'XSTEXT_UNI'=> 'varchar(100)', - 'STEXT' => 'text', - 'STEXT_UNI' => 'varchar(255)', - 'TEXT' => 'text', - 'TEXT_UNI' => 'text', - 'MTEXT' => 'mediumtext', - 'MTEXT_UNI' => 'mediumtext', - 'TIMESTAMP' => 'int(11) UNSIGNED', - 'DECIMAL' => 'decimal(5,2)', - 'DECIMAL:' => 'decimal(%d,2)', - 'PDECIMAL' => 'decimal(6,3)', - 'PDECIMAL:' => 'decimal(%d,3)', - 'VCHAR_UNI' => 'varchar(255)', - 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar(255)', - 'VARBINARY' => 'varbinary(255)', - ), - - 'mysql_40' => array( - 'INT:' => 'int(%d)', - 'BINT' => 'bigint(20)', - 'UINT' => 'mediumint(8) UNSIGNED', - 'UINT:' => 'int(%d) UNSIGNED', - 'TINT:' => 'tinyint(%d)', - 'USINT' => 'smallint(4) UNSIGNED', - 'BOOL' => 'tinyint(1) UNSIGNED', - 'VCHAR' => 'varbinary(255)', - 'VCHAR:' => 'varbinary(%d)', - 'CHAR:' => 'binary(%d)', - 'XSTEXT' => 'blob', - 'XSTEXT_UNI'=> 'blob', - 'STEXT' => 'blob', - 'STEXT_UNI' => 'blob', - 'TEXT' => 'blob', - 'TEXT_UNI' => 'blob', - 'MTEXT' => 'mediumblob', - 'MTEXT_UNI' => 'mediumblob', - 'TIMESTAMP' => 'int(11) UNSIGNED', - 'DECIMAL' => 'decimal(5,2)', - 'DECIMAL:' => 'decimal(%d,2)', - 'PDECIMAL' => 'decimal(6,3)', - 'PDECIMAL:' => 'decimal(%d,3)', - 'VCHAR_UNI' => 'blob', - 'VCHAR_UNI:'=> array('varbinary(%d)', 'limit' => array('mult', 3, 255, 'blob')), - 'VCHAR_CI' => 'blob', - 'VARBINARY' => 'varbinary(255)', - ), -); - -foreach ($schema_data as $table_name => $table_data) -{ - $table_name = str_replace('phpbb_', $prefix, $table_name); - // Write comment about table - echo "# Table: '{$table_name}'$newline"; - - // Create Table statement - $generator = $textimage = false; - - $line = "ALTER TABLE {$table_name} $newline"; - - // Table specific so we don't get overlap - $modded_array = array(); - - // Write columns one by one... - foreach ($table_data['COLUMNS'] as $column_name => $column_data) - { - // Get type - if (strpos($column_data[0], ':') !== false) - { - list($orig_column_type, $column_length) = explode(':', $column_data[0]); - $column_type = sprintf($dbms_type_map['mysql_41'][$orig_column_type . ':'], $column_length); - - if (isset($dbms_type_map['mysql_40'][$orig_column_type . ':']['limit'][0])) - { - switch ($dbms_type_map['mysql_40'][$orig_column_type . ':']['limit'][0]) - { - case 'mult': - if (($column_length * $dbms_type_map['mysql_40'][$orig_column_type . ':']['limit'][1]) > $dbms_type_map['mysql_40'][$orig_column_type . ':']['limit'][2]) - { - $modded_array[$column_name] = $column_type; - } - break; - } - } - - $orig_column_type .= ':'; - } - else - { - $orig_column_type = $column_data[0]; - $other_column_type = $dbms_type_map['mysql_40'][$column_data[0]]; - if ($other_column_type == 'text' || $other_column_type == 'blob') - { - $modded_array[$column_name] = $column_type; - } - $column_type = $dbms_type_map['mysql_41'][$column_data[0]]; - } - - // Adjust default value if db-dependant specified - if (is_array($column_data[1])) - { - $column_data[1] = (isset($column_data[1][$dbms])) ? $column_data[1][$dbms] : $column_data[1]['default']; - } - - $line .= "\tMODIFY {$column_name} {$column_type} "; - - // For hexadecimal values do not use single quotes - if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text' && substr($column_type, -4) !== 'blob') - { - $line .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' "; - } - $line .= 'NOT NULL'; - - if (isset($column_data[2])) - { - if ($column_data[2] == 'auto_increment') - { - $line .= ' auto_increment'; - } - else if ($column_data[2] == 'true_sort') - { - $line .= ' COLLATE utf8_unicode_ci'; - } - else if ($column_data[2] == 'no_sort') - { - $line .= ' COLLATE utf8_bin'; - } - } - else if (preg_match('/(?:var)?char|(?:medium)?text/i', $column_type)) - { - $line .= ' COLLATE utf8_bin'; - } - - $line .= ",$newline"; - } - - // Write Keys - if (isset($table_data['KEYS'])) - { - foreach ($table_data['KEYS'] as $key_name => $key_data) - { - $temp = ''; - if (!is_array($key_data[1])) - { - $key_data[1] = array($key_data[1]); - } - - $temp .= ($key_data[0] == 'INDEX') ? "\tADD KEY" : ''; - $temp .= ($key_data[0] == 'UNIQUE') ? "\tADD UNIQUE" : ''; - $repair = false; - foreach ($key_data[1] as $key => $col_name) - { - if (isset($modded_array[$col_name])) - { - $repair = true; - } - } - if ($repair) - { - $line .= "\tDROP INDEX " . $key_name . ",$newline"; - $line .= $temp; - $line .= ' ' . $key_name . ' (' . implode(', ', $key_data[1]) . "),$newline"; - } - } - } - - //$line .= "\tCONVERT TO CHARACTER SET `utf8`$newline"; - $line .= "\tDEFAULT CHARSET=utf8 COLLATE=utf8_bin;$newline$newline"; - - echo $line . "$newline"; -} - -/** -* Define the basic structure -* The format: -* array('{TABLE_NAME}' => {TABLE_DATA}) -* {TABLE_DATA}: -* COLUMNS = array({column_name} = array({column_type}, {default}, {auto_increment})) -* PRIMARY_KEY = {column_name(s)} -* KEYS = array({key_name} = array({key_type}, {column_name(s)})), -* -* Column Types: -* INT:x => SIGNED int(x) -* BINT => BIGINT -* UINT => mediumint(8) UNSIGNED -* UINT:x => int(x) UNSIGNED -* TINT:x => tinyint(x) -* USINT => smallint(4) UNSIGNED (for _order columns) -* BOOL => tinyint(1) UNSIGNED -* VCHAR => varchar(255) -* CHAR:x => char(x) -* XSTEXT_UNI => text for storing 100 characters (topic_title for example) -* STEXT_UNI => text for storing 255 characters (normal input field with a max of 255 single-byte chars) - same as VCHAR_UNI -* TEXT_UNI => text for storing 3000 characters (short text, descriptions, comments, etc.) -* MTEXT_UNI => mediumtext (post text, large text) -* VCHAR:x => varchar(x) -* TIMESTAMP => int(11) UNSIGNED -* DECIMAL => decimal number (5,2) -* DECIMAL: => decimal number (x,2) -* PDECIMAL => precision decimal number (6,3) -* PDECIMAL: => precision decimal number (x,3) -* VCHAR_UNI => varchar(255) BINARY -* VCHAR_CI => varchar_ci for postgresql, others VCHAR -*/ -function get_schema_struct() -{ - $schema_data = array(); - - $schema_data['phpbb_attachments'] = array( - 'COLUMNS' => array( - 'attach_id' => array('UINT', NULL, 'auto_increment'), - 'post_msg_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), - 'in_message' => array('BOOL', 0), - 'poster_id' => array('UINT', 0), - 'is_orphan' => array('BOOL', 1), - 'physical_filename' => array('VCHAR', ''), - 'real_filename' => array('VCHAR', ''), - 'download_count' => array('UINT', 0), - 'attach_comment' => array('TEXT_UNI', ''), - 'extension' => array('VCHAR:100', ''), - 'mimetype' => array('VCHAR:100', ''), - 'filesize' => array('UINT:20', 0), - 'filetime' => array('TIMESTAMP', 0), - 'thumbnail' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'attach_id', - 'KEYS' => array( - 'filetime' => array('INDEX', 'filetime'), - 'post_msg_id' => array('INDEX', 'post_msg_id'), - 'topic_id' => array('INDEX', 'topic_id'), - 'poster_id' => array('INDEX', 'poster_id'), - 'is_orphan' => array('INDEX', 'is_orphan'), - ), - ); - - $schema_data['phpbb_acl_groups'] = array( - 'COLUMNS' => array( - 'group_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'auth_option_id' => array('UINT', 0), - 'auth_role_id' => array('UINT', 0), - 'auth_setting' => array('TINT:2', 0), - ), - 'KEYS' => array( - 'group_id' => array('INDEX', 'group_id'), - 'auth_opt_id' => array('INDEX', 'auth_option_id'), - 'auth_role_id' => array('INDEX', 'auth_role_id'), - ), - ); - - $schema_data['phpbb_acl_options'] = array( - 'COLUMNS' => array( - 'auth_option_id' => array('UINT', NULL, 'auto_increment'), - 'auth_option' => array('VCHAR:50', ''), - 'is_global' => array('BOOL', 0), - 'is_local' => array('BOOL', 0), - 'founder_only' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'auth_option_id', - 'KEYS' => array( - 'auth_option' => array('INDEX', 'auth_option'), - ), - ); - - $schema_data['phpbb_acl_roles'] = array( - 'COLUMNS' => array( - 'role_id' => array('UINT', NULL, 'auto_increment'), - 'role_name' => array('VCHAR_UNI', ''), - 'role_description' => array('TEXT_UNI', ''), - 'role_type' => array('VCHAR:10', ''), - 'role_order' => array('USINT', 0), - ), - 'PRIMARY_KEY' => 'role_id', - 'KEYS' => array( - 'role_type' => array('INDEX', 'role_type'), - 'role_order' => array('INDEX', 'role_order'), - ), - ); - - $schema_data['phpbb_acl_roles_data'] = array( - 'COLUMNS' => array( - 'role_id' => array('UINT', 0), - 'auth_option_id' => array('UINT', 0), - 'auth_setting' => array('TINT:2', 0), - ), - 'PRIMARY_KEY' => array('role_id', 'auth_option_id'), - 'KEYS' => array( - 'ath_op_id' => array('INDEX', 'auth_option_id'), - ), - ); - - $schema_data['phpbb_acl_users'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'auth_option_id' => array('UINT', 0), - 'auth_role_id' => array('UINT', 0), - 'auth_setting' => array('TINT:2', 0), - ), - 'KEYS' => array( - 'user_id' => array('INDEX', 'user_id'), - 'auth_option_id' => array('INDEX', 'auth_option_id'), - 'auth_role_id' => array('INDEX', 'auth_role_id'), - ), - ); - - $schema_data['phpbb_banlist'] = array( - 'COLUMNS' => array( - 'ban_id' => array('UINT', NULL, 'auto_increment'), - 'ban_userid' => array('UINT', 0), - 'ban_ip' => array('VCHAR:40', ''), - 'ban_email' => array('VCHAR_UNI:100', ''), - 'ban_start' => array('TIMESTAMP', 0), - 'ban_end' => array('TIMESTAMP', 0), - 'ban_exclude' => array('BOOL', 0), - 'ban_reason' => array('VCHAR_UNI', ''), - 'ban_give_reason' => array('VCHAR_UNI', ''), - ), - 'PRIMARY_KEY' => 'ban_id', - 'KEYS' => array( - 'ban_end' => array('INDEX', 'ban_end'), - 'ban_user' => array('INDEX', array('ban_userid', 'ban_exclude')), - 'ban_email' => array('INDEX', array('ban_email', 'ban_exclude')), - 'ban_ip' => array('INDEX', array('ban_ip', 'ban_exclude')), - ), - ); - - $schema_data['phpbb_bbcodes'] = array( - 'COLUMNS' => array( - 'bbcode_id' => array('TINT:3', 0), - 'bbcode_tag' => array('VCHAR:16', ''), - 'bbcode_helpline' => array('VCHAR_UNI', ''), - 'display_on_posting' => array('BOOL', 0), - 'bbcode_match' => array('TEXT_UNI', ''), - 'bbcode_tpl' => array('MTEXT_UNI', ''), - 'first_pass_match' => array('MTEXT_UNI', ''), - 'first_pass_replace' => array('MTEXT_UNI', ''), - 'second_pass_match' => array('MTEXT_UNI', ''), - 'second_pass_replace' => array('MTEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'bbcode_id', - 'KEYS' => array( - 'display_on_post' => array('INDEX', 'display_on_posting'), - ), - ); - - $schema_data['phpbb_bookmarks'] = array( - 'COLUMNS' => array( - 'topic_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - ), - 'PRIMARY_KEY' => array('topic_id', 'user_id'), - ); - - $schema_data['phpbb_bots'] = array( - 'COLUMNS' => array( - 'bot_id' => array('UINT', NULL, 'auto_increment'), - 'bot_active' => array('BOOL', 1), - 'bot_name' => array('STEXT_UNI', ''), - 'user_id' => array('UINT', 0), - 'bot_agent' => array('VCHAR', ''), - 'bot_ip' => array('VCHAR', ''), - ), - 'PRIMARY_KEY' => 'bot_id', - 'KEYS' => array( - 'bot_active' => array('INDEX', 'bot_active'), - ), - ); - - $schema_data['phpbb_config'] = array( - 'COLUMNS' => array( - 'config_name' => array('VCHAR', ''), - 'config_value' => array('VCHAR_UNI', ''), - 'is_dynamic' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'config_name', - 'KEYS' => array( - 'is_dynamic' => array('INDEX', 'is_dynamic'), - ), - ); - - $schema_data['phpbb_confirm'] = array( - 'COLUMNS' => array( - 'confirm_id' => array('CHAR:32', ''), - 'session_id' => array('CHAR:32', ''), - 'confirm_type' => array('TINT:3', 0), - 'code' => array('VCHAR:8', ''), - 'seed' => array('UINT:10', 0), - ), - 'PRIMARY_KEY' => array('session_id', 'confirm_id'), - 'KEYS' => array( - 'confirm_type' => array('INDEX', 'confirm_type'), - ), - ); - - $schema_data['phpbb_disallow'] = array( - 'COLUMNS' => array( - 'disallow_id' => array('UINT', NULL, 'auto_increment'), - 'disallow_username' => array('VCHAR_UNI:255', ''), - ), - 'PRIMARY_KEY' => 'disallow_id', - ); - - $schema_data['phpbb_drafts'] = array( - 'COLUMNS' => array( - 'draft_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'save_time' => array('TIMESTAMP', 0), - 'draft_subject' => array('XSTEXT_UNI', ''), - 'draft_message' => array('MTEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'draft_id', - 'KEYS' => array( - 'save_time' => array('INDEX', 'save_time'), - ), - ); - - $schema_data['phpbb_extensions'] = array( - 'COLUMNS' => array( - 'extension_id' => array('UINT', NULL, 'auto_increment'), - 'group_id' => array('UINT', 0), - 'extension' => array('VCHAR:100', ''), - ), - 'PRIMARY_KEY' => 'extension_id', - ); - - $schema_data['phpbb_extension_groups'] = array( - 'COLUMNS' => array( - 'group_id' => array('UINT', NULL, 'auto_increment'), - 'group_name' => array('VCHAR_UNI', ''), - 'cat_id' => array('TINT:2', 0), - 'allow_group' => array('BOOL', 0), - 'download_mode' => array('BOOL', 1), - 'upload_icon' => array('VCHAR', ''), - 'max_filesize' => array('UINT:20', 0), - 'allowed_forums' => array('TEXT', ''), - 'allow_in_pm' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'group_id', - ); - - $schema_data['phpbb_forums'] = array( - 'COLUMNS' => array( - 'forum_id' => array('UINT', NULL, 'auto_increment'), - 'parent_id' => array('UINT', 0), - 'left_id' => array('UINT', 0), - 'right_id' => array('UINT', 0), - 'forum_parents' => array('MTEXT', ''), - 'forum_name' => array('STEXT_UNI', ''), - 'forum_desc' => array('TEXT_UNI', ''), - 'forum_desc_bitfield' => array('VCHAR:255', ''), - 'forum_desc_options' => array('UINT:11', 7), - 'forum_desc_uid' => array('VCHAR:8', ''), - 'forum_link' => array('VCHAR_UNI', ''), - 'forum_password' => array('VCHAR_UNI:40', ''), - 'forum_style' => array('USINT', 0), - 'forum_image' => array('VCHAR', ''), - 'forum_rules' => array('TEXT_UNI', ''), - 'forum_rules_link' => array('VCHAR_UNI', ''), - 'forum_rules_bitfield' => array('VCHAR:255', ''), - 'forum_rules_options' => array('UINT:11', 7), - 'forum_rules_uid' => array('VCHAR:8', ''), - 'forum_topics_per_page' => array('TINT:4', 0), - 'forum_type' => array('TINT:4', 0), - 'forum_status' => array('TINT:4', 0), - 'forum_posts' => array('UINT', 0), - 'forum_topics' => array('UINT', 0), - 'forum_topics_real' => array('UINT', 0), - 'forum_last_post_id' => array('UINT', 0), - 'forum_last_poster_id' => array('UINT', 0), - 'forum_last_post_subject' => array('XSTEXT_UNI', ''), - 'forum_last_post_time' => array('TIMESTAMP', 0), - 'forum_last_poster_name'=> array('VCHAR_UNI', ''), - 'forum_last_poster_colour'=> array('VCHAR:6', ''), - 'forum_flags' => array('TINT:4', 32), - 'display_on_index' => array('BOOL', 1), - 'enable_indexing' => array('BOOL', 1), - 'enable_icons' => array('BOOL', 1), - 'enable_prune' => array('BOOL', 0), - 'prune_next' => array('TIMESTAMP', 0), - 'prune_days' => array('UINT', 0), - 'prune_viewed' => array('UINT', 0), - 'prune_freq' => array('UINT', 0), - ), - 'PRIMARY_KEY' => 'forum_id', - 'KEYS' => array( - 'left_right_id' => array('INDEX', array('left_id', 'right_id')), - 'forum_lastpost_id' => array('INDEX', 'forum_last_post_id'), - ), - ); - - $schema_data['phpbb_forums_access'] = array( - 'COLUMNS' => array( - 'forum_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'session_id' => array('CHAR:32', ''), - ), - 'PRIMARY_KEY' => array('forum_id', 'user_id', 'session_id'), - ); - - $schema_data['phpbb_forums_track'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'mark_time' => array('TIMESTAMP', 0), - ), - 'PRIMARY_KEY' => array('user_id', 'forum_id'), - ); - - $schema_data['phpbb_forums_watch'] = array( - 'COLUMNS' => array( - 'forum_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'notify_status' => array('BOOL', 0), - ), - 'KEYS' => array( - 'forum_id' => array('INDEX', 'forum_id'), - 'user_id' => array('INDEX', 'user_id'), - 'notify_stat' => array('INDEX', 'notify_status'), - ), - ); - - $schema_data['phpbb_groups'] = array( - 'COLUMNS' => array( - 'group_id' => array('UINT', NULL, 'auto_increment'), - 'group_type' => array('TINT:4', 1), - 'group_founder_manage' => array('BOOL', 0), - 'group_name' => array('VCHAR_CI', ''), - 'group_desc' => array('TEXT_UNI', ''), - 'group_desc_bitfield' => array('VCHAR:255', ''), - 'group_desc_options' => array('UINT:11', 7), - 'group_desc_uid' => array('VCHAR:8', ''), - 'group_display' => array('BOOL', 0), - 'group_avatar' => array('VCHAR', ''), - 'group_avatar_type' => array('TINT:2', 0), - 'group_avatar_width' => array('USINT', 0), - 'group_avatar_height' => array('USINT', 0), - 'group_rank' => array('UINT', 0), - 'group_colour' => array('VCHAR:6', ''), - 'group_sig_chars' => array('UINT', 0), - 'group_receive_pm' => array('BOOL', 0), - 'group_message_limit' => array('UINT', 0), - 'group_legend' => array('BOOL', 1), - ), - 'PRIMARY_KEY' => 'group_id', - 'KEYS' => array( - 'group_legend' => array('INDEX', 'group_legend'), - ), - ); - - $schema_data['phpbb_icons'] = array( - 'COLUMNS' => array( - 'icons_id' => array('UINT', NULL, 'auto_increment'), - 'icons_url' => array('VCHAR', ''), - 'icons_width' => array('TINT:4', 0), - 'icons_height' => array('TINT:4', 0), - 'icons_order' => array('UINT', 0), - 'display_on_posting' => array('BOOL', 1), - ), - 'PRIMARY_KEY' => 'icons_id', - 'KEYS' => array( - 'display_on_posting' => array('INDEX', 'display_on_posting'), - ), - ); - - $schema_data['phpbb_lang'] = array( - 'COLUMNS' => array( - 'lang_id' => array('TINT:4', NULL, 'auto_increment'), - 'lang_iso' => array('VCHAR:30', ''), - 'lang_dir' => array('VCHAR:30', ''), - 'lang_english_name' => array('VCHAR_UNI:100', ''), - 'lang_local_name' => array('VCHAR_UNI:255', ''), - 'lang_author' => array('VCHAR_UNI:255', ''), - ), - 'PRIMARY_KEY' => 'lang_id', - 'KEYS' => array( - 'lang_iso' => array('INDEX', 'lang_iso'), - ), - ); - - $schema_data['phpbb_log'] = array( - 'COLUMNS' => array( - 'log_id' => array('UINT', NULL, 'auto_increment'), - 'log_type' => array('TINT:4', 0), - 'user_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), - 'reportee_id' => array('UINT', 0), - 'log_ip' => array('VCHAR:40', ''), - 'log_time' => array('TIMESTAMP', 0), - 'log_operation' => array('TEXT_UNI', ''), - 'log_data' => array('MTEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'log_id', - 'KEYS' => array( - 'log_type' => array('INDEX', 'log_type'), - 'forum_id' => array('INDEX', 'forum_id'), - 'topic_id' => array('INDEX', 'topic_id'), - 'reportee_id' => array('INDEX', 'reportee_id'), - 'user_id' => array('INDEX', 'user_id'), - ), - ); - - $schema_data['phpbb_moderator_cache'] = array( - 'COLUMNS' => array( - 'forum_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'username' => array('VCHAR_UNI:255', ''), - 'group_id' => array('UINT', 0), - 'group_name' => array('VCHAR_UNI', ''), - 'display_on_index' => array('BOOL', 1), - ), - 'KEYS' => array( - 'disp_idx' => array('INDEX', 'display_on_index'), - 'forum_id' => array('INDEX', 'forum_id'), - ), - ); - - $schema_data['phpbb_modules'] = array( - 'COLUMNS' => array( - 'module_id' => array('UINT', NULL, 'auto_increment'), - 'module_enabled' => array('BOOL', 1), - 'module_display' => array('BOOL', 1), - 'module_basename' => array('VCHAR', ''), - 'module_class' => array('VCHAR:10', ''), - 'parent_id' => array('UINT', 0), - 'left_id' => array('UINT', 0), - 'right_id' => array('UINT', 0), - 'module_langname' => array('VCHAR', ''), - 'module_mode' => array('VCHAR', ''), - 'module_auth' => array('VCHAR', ''), - ), - 'PRIMARY_KEY' => 'module_id', - 'KEYS' => array( - 'left_right_id' => array('INDEX', array('left_id', 'right_id')), - 'module_enabled' => array('INDEX', 'module_enabled'), - 'class_left_id' => array('INDEX', array('module_class', 'left_id')), - ), - ); - - $schema_data['phpbb_poll_options'] = array( - 'COLUMNS' => array( - 'poll_option_id' => array('TINT:4', 0), - 'topic_id' => array('UINT', 0), - 'poll_option_text' => array('TEXT_UNI', ''), - 'poll_option_total' => array('UINT', 0), - ), - 'KEYS' => array( - 'poll_opt_id' => array('INDEX', 'poll_option_id'), - 'topic_id' => array('INDEX', 'topic_id'), - ), - ); - - $schema_data['phpbb_poll_votes'] = array( - 'COLUMNS' => array( - 'topic_id' => array('UINT', 0), - 'poll_option_id' => array('TINT:4', 0), - 'vote_user_id' => array('UINT', 0), - 'vote_user_ip' => array('VCHAR:40', ''), - ), - 'KEYS' => array( - 'topic_id' => array('INDEX', 'topic_id'), - 'vote_user_id' => array('INDEX', 'vote_user_id'), - 'vote_user_ip' => array('INDEX', 'vote_user_ip'), - ), - ); - - $schema_data['phpbb_posts'] = array( - 'COLUMNS' => array( - 'post_id' => array('UINT', NULL, 'auto_increment'), - 'topic_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'poster_id' => array('UINT', 0), - 'icon_id' => array('UINT', 0), - 'poster_ip' => array('VCHAR:40', ''), - 'post_time' => array('TIMESTAMP', 0), - 'post_approved' => array('BOOL', 1), - 'post_reported' => array('BOOL', 0), - 'enable_bbcode' => array('BOOL', 1), - 'enable_smilies' => array('BOOL', 1), - 'enable_magic_url' => array('BOOL', 1), - 'enable_sig' => array('BOOL', 1), - 'post_username' => array('VCHAR_UNI:255', ''), - 'post_subject' => array('XSTEXT_UNI', '', 'true_sort'), - 'post_text' => array('MTEXT_UNI', '', ($GLOBALS['mysql_indexer']) ? 'true_sort' : 'no_sort'), - 'post_checksum' => array('VCHAR:32', ''), - 'post_attachment' => array('BOOL', 0), - 'bbcode_bitfield' => array('VCHAR:255', ''), - 'bbcode_uid' => array('VCHAR:8', ''), - 'post_postcount' => array('BOOL', 1), - 'post_edit_time' => array('TIMESTAMP', 0), - 'post_edit_reason' => array('STEXT_UNI', ''), - 'post_edit_user' => array('UINT', 0), - 'post_edit_count' => array('USINT', 0), - 'post_edit_locked' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'post_id', - 'KEYS' => array( - 'forum_id' => array('INDEX', 'forum_id'), - 'topic_id' => array('INDEX', 'topic_id'), - 'poster_ip' => array('INDEX', 'poster_ip'), - 'poster_id' => array('INDEX', 'poster_id'), - 'post_approved' => array('INDEX', 'post_approved'), - 'tid_post_time' => array('INDEX', array('topic_id', 'post_time')), - ), - ); - - $schema_data['phpbb_privmsgs'] = array( - 'COLUMNS' => array( - 'msg_id' => array('UINT', NULL, 'auto_increment'), - 'root_level' => array('UINT', 0), - 'author_id' => array('UINT', 0), - 'icon_id' => array('UINT', 0), - 'author_ip' => array('VCHAR:40', ''), - 'message_time' => array('TIMESTAMP', 0), - 'enable_bbcode' => array('BOOL', 1), - 'enable_smilies' => array('BOOL', 1), - 'enable_magic_url' => array('BOOL', 1), - 'enable_sig' => array('BOOL', 1), - 'message_subject' => array('XSTEXT_UNI', ''), - 'message_text' => array('MTEXT_UNI', ''), - 'message_edit_reason' => array('STEXT_UNI', ''), - 'message_edit_user' => array('UINT', 0), - 'message_attachment' => array('BOOL', 0), - 'bbcode_bitfield' => array('VCHAR:255', ''), - 'bbcode_uid' => array('VCHAR:8', ''), - 'message_edit_time' => array('TIMESTAMP', 0), - 'message_edit_count' => array('USINT', 0), - 'to_address' => array('TEXT_UNI', ''), - 'bcc_address' => array('TEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'msg_id', - 'KEYS' => array( - 'author_ip' => array('INDEX', 'author_ip'), - 'message_time' => array('INDEX', 'message_time'), - 'author_id' => array('INDEX', 'author_id'), - 'root_level' => array('INDEX', 'root_level'), - ), - ); - - $schema_data['phpbb_privmsgs_folder'] = array( - 'COLUMNS' => array( - 'folder_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT', 0), - 'folder_name' => array('VCHAR_UNI', ''), - 'pm_count' => array('UINT', 0), - ), - 'PRIMARY_KEY' => 'folder_id', - 'KEYS' => array( - 'user_id' => array('INDEX', 'user_id'), - ), - ); - - $schema_data['phpbb_privmsgs_rules'] = array( - 'COLUMNS' => array( - 'rule_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT', 0), - 'rule_check' => array('UINT', 0), - 'rule_connection' => array('UINT', 0), - 'rule_string' => array('VCHAR_UNI', ''), - 'rule_user_id' => array('UINT', 0), - 'rule_group_id' => array('UINT', 0), - 'rule_action' => array('UINT', 0), - 'rule_folder_id' => array('INT:11', 0), - ), - 'PRIMARY_KEY' => 'rule_id', - 'KEYS' => array( - 'user_id' => array('INDEX', 'user_id'), - ), - ); - - $schema_data['phpbb_privmsgs_to'] = array( - 'COLUMNS' => array( - 'msg_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'author_id' => array('UINT', 0), - 'pm_deleted' => array('BOOL', 0), - 'pm_new' => array('BOOL', 1), - 'pm_unread' => array('BOOL', 1), - 'pm_replied' => array('BOOL', 0), - 'pm_marked' => array('BOOL', 0), - 'pm_forwarded' => array('BOOL', 0), - 'folder_id' => array('INT:11', 0), - ), - 'KEYS' => array( - 'msg_id' => array('INDEX', 'msg_id'), - 'author_id' => array('INDEX', 'author_id'), - 'usr_flder_id' => array('INDEX', array('user_id', 'folder_id')), - ), - ); - - $schema_data['phpbb_profile_fields'] = array( - 'COLUMNS' => array( - 'field_id' => array('UINT', NULL, 'auto_increment'), - 'field_name' => array('VCHAR_UNI', ''), - 'field_type' => array('TINT:4', 0), - 'field_ident' => array('VCHAR:20', ''), - 'field_length' => array('VCHAR:20', ''), - 'field_minlen' => array('VCHAR', ''), - 'field_maxlen' => array('VCHAR', ''), - 'field_novalue' => array('VCHAR_UNI', ''), - 'field_default_value' => array('VCHAR_UNI', ''), - 'field_validation' => array('VCHAR_UNI:20', ''), - 'field_required' => array('BOOL', 0), - 'field_show_on_reg' => array('BOOL', 0), - 'field_hide' => array('BOOL', 0), - 'field_no_view' => array('BOOL', 0), - 'field_active' => array('BOOL', 0), - 'field_order' => array('UINT', 0), - ), - 'PRIMARY_KEY' => 'field_id', - 'KEYS' => array( - 'fld_type' => array('INDEX', 'field_type'), - 'fld_ordr' => array('INDEX', 'field_order'), - ), - ); - - $schema_data['phpbb_profile_fields_data'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - ), - 'PRIMARY_KEY' => 'user_id', - ); - - $schema_data['phpbb_profile_fields_lang'] = array( - 'COLUMNS' => array( - 'field_id' => array('UINT', 0), - 'lang_id' => array('UINT', 0), - 'option_id' => array('UINT', 0), - 'field_type' => array('TINT:4', 0), - 'lang_value' => array('VCHAR_UNI', ''), - ), - 'PRIMARY_KEY' => array('field_id', 'lang_id', 'option_id'), - ); - - $schema_data['phpbb_profile_lang'] = array( - 'COLUMNS' => array( - 'field_id' => array('UINT', 0), - 'lang_id' => array('UINT', 0), - 'lang_name' => array('VCHAR_UNI', ''), - 'lang_explain' => array('TEXT_UNI', ''), - 'lang_default_value' => array('VCHAR_UNI', ''), - ), - 'PRIMARY_KEY' => array('field_id', 'lang_id'), - ); - - $schema_data['phpbb_ranks'] = array( - 'COLUMNS' => array( - 'rank_id' => array('UINT', NULL, 'auto_increment'), - 'rank_title' => array('VCHAR_UNI', ''), - 'rank_min' => array('UINT', 0), - 'rank_special' => array('BOOL', 0), - 'rank_image' => array('VCHAR', ''), - ), - 'PRIMARY_KEY' => 'rank_id', - ); - - $schema_data['phpbb_reports'] = array( - 'COLUMNS' => array( - 'report_id' => array('UINT', NULL, 'auto_increment'), - 'reason_id' => array('USINT', 0), - 'post_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'user_notify' => array('BOOL', 0), - 'report_closed' => array('BOOL', 0), - 'report_time' => array('TIMESTAMP', 0), - 'report_text' => array('MTEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'report_id', - ); - - $schema_data['phpbb_reports_reasons'] = array( - 'COLUMNS' => array( - 'reason_id' => array('USINT', NULL, 'auto_increment'), - 'reason_title' => array('VCHAR_UNI', ''), - 'reason_description' => array('MTEXT_UNI', ''), - 'reason_order' => array('USINT', 0), - ), - 'PRIMARY_KEY' => 'reason_id', - ); - - $schema_data['phpbb_search_results'] = array( - 'COLUMNS' => array( - 'search_key' => array('VCHAR:32', ''), - 'search_time' => array('TIMESTAMP', 0), - 'search_keywords' => array('MTEXT_UNI', ''), - 'search_authors' => array('MTEXT', ''), - ), - 'PRIMARY_KEY' => 'search_key', - ); - - $schema_data['phpbb_search_wordlist'] = array( - 'COLUMNS' => array( - 'word_id' => array('UINT', NULL, 'auto_increment'), - 'word_text' => array('VCHAR_UNI', ''), - 'word_common' => array('BOOL', 0), - 'word_count' => array('UINT', 0), - ), - 'PRIMARY_KEY' => 'word_id', - 'KEYS' => array( - 'wrd_txt' => array('UNIQUE', 'word_text'), - 'wrd_cnt' => array('INDEX', 'word_count'), - ), - ); - - $schema_data['phpbb_search_wordmatch'] = array( - 'COLUMNS' => array( - 'post_id' => array('UINT', 0), - 'word_id' => array('UINT', 0), - 'title_match' => array('BOOL', 0), - ), - 'KEYS' => array( - 'unq_mtch' => array('UNIQUE', array('word_id', 'post_id', 'title_match')), - 'word_id' => array('INDEX', 'word_id'), - 'post_id' => array('INDEX', 'post_id'), - ), - ); - - $schema_data['phpbb_sessions'] = array( - 'COLUMNS' => array( - 'session_id' => array('CHAR:32', ''), - 'session_user_id' => array('UINT', 0), - 'session_last_visit' => array('TIMESTAMP', 0), - 'session_start' => array('TIMESTAMP', 0), - 'session_time' => array('TIMESTAMP', 0), - 'session_ip' => array('VCHAR:40', ''), - 'session_browser' => array('VCHAR:150', ''), - 'session_forwarded_for' => array('VCHAR:255', ''), - 'session_page' => array('VCHAR_UNI', ''), - 'session_viewonline' => array('BOOL', 1), - 'session_autologin' => array('BOOL', 0), - 'session_admin' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'session_id', - 'KEYS' => array( - 'session_time' => array('INDEX', 'session_time'), - 'session_user_id' => array('INDEX', 'session_user_id'), - ), - ); - - $schema_data['phpbb_sessions_keys'] = array( - 'COLUMNS' => array( - 'key_id' => array('CHAR:32', ''), - 'user_id' => array('UINT', 0), - 'last_ip' => array('VCHAR:40', ''), - 'last_login' => array('TIMESTAMP', 0), - ), - 'PRIMARY_KEY' => array('key_id', 'user_id'), - 'KEYS' => array( - 'last_login' => array('INDEX', 'last_login'), - ), - ); - - $schema_data['phpbb_sitelist'] = array( - 'COLUMNS' => array( - 'site_id' => array('UINT', NULL, 'auto_increment'), - 'site_ip' => array('VCHAR:40', ''), - 'site_hostname' => array('VCHAR', ''), - 'ip_exclude' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'site_id', - ); - - $schema_data['phpbb_smilies'] = array( - 'COLUMNS' => array( - 'smiley_id' => array('UINT', NULL, 'auto_increment'), - // We may want to set 'code' to VCHAR:50 or check if unicode support is possible... at the moment only ASCII characters are allowed. - 'code' => array('VCHAR_UNI:50', ''), - 'emotion' => array('VCHAR_UNI:50', ''), - 'smiley_url' => array('VCHAR:50', ''), - 'smiley_width' => array('USINT', 0), - 'smiley_height' => array('USINT', 0), - 'smiley_order' => array('UINT', 0), - 'display_on_posting'=> array('BOOL', 1), - ), - 'PRIMARY_KEY' => 'smiley_id', - 'KEYS' => array( - 'display_on_post' => array('INDEX', 'display_on_posting'), - ), - ); - - $schema_data['phpbb_styles'] = array( - 'COLUMNS' => array( - 'style_id' => array('USINT', NULL, 'auto_increment'), - 'style_name' => array('VCHAR_UNI:255', ''), - 'style_copyright' => array('VCHAR_UNI', ''), - 'style_active' => array('BOOL', 1), - 'template_id' => array('USINT', 0), - 'theme_id' => array('USINT', 0), - 'imageset_id' => array('USINT', 0), - ), - 'PRIMARY_KEY' => 'style_id', - 'KEYS' => array( - 'style_name' => array('UNIQUE', 'style_name'), - 'template_id' => array('INDEX', 'template_id'), - 'theme_id' => array('INDEX', 'theme_id'), - 'imageset_id' => array('INDEX', 'imageset_id'), - ), - ); - - $schema_data['phpbb_styles_template'] = array( - 'COLUMNS' => array( - 'template_id' => array('USINT', NULL, 'auto_increment'), - 'template_name' => array('VCHAR_UNI:255', ''), - 'template_copyright' => array('VCHAR_UNI', ''), - 'template_path' => array('VCHAR:100', ''), - 'bbcode_bitfield' => array('VCHAR:255', 'kNg='), - 'template_storedb' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'template_id', - 'KEYS' => array( - 'tmplte_nm' => array('UNIQUE', 'template_name'), - ), - ); - - $schema_data['phpbb_styles_template_data'] = array( - 'COLUMNS' => array( - 'template_id' => array('USINT', 0), - 'template_filename' => array('VCHAR:100', ''), - 'template_included' => array('TEXT', ''), - 'template_mtime' => array('TIMESTAMP', 0), - 'template_data' => array('MTEXT_UNI', ''), - ), - 'KEYS' => array( - 'tid' => array('INDEX', 'template_id'), - 'tfn' => array('INDEX', 'template_filename'), - ), - ); - - $schema_data['phpbb_styles_theme'] = array( - 'COLUMNS' => array( - 'theme_id' => array('USINT', NULL, 'auto_increment'), - 'theme_name' => array('VCHAR_UNI:255', ''), - 'theme_copyright' => array('VCHAR_UNI', ''), - 'theme_path' => array('VCHAR:100', ''), - 'theme_storedb' => array('BOOL', 0), - 'theme_mtime' => array('TIMESTAMP', 0), - 'theme_data' => array('MTEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'theme_id', - 'KEYS' => array( - 'theme_name' => array('UNIQUE', 'theme_name'), - ), - ); - - $schema_data['phpbb_styles_imageset'] = array( - 'COLUMNS' => array( - 'imageset_id' => array('USINT', NULL, 'auto_increment'), - 'imageset_name' => array('VCHAR_UNI:255', ''), - 'imageset_copyright' => array('VCHAR_UNI', ''), - 'imageset_path' => array('VCHAR:100', ''), - ), - 'PRIMARY_KEY' => 'imageset_id', - 'KEYS' => array( - 'imgset_nm' => array('UNIQUE', 'imageset_name'), - ), - ); - - $schema_data['phpbb_styles_imageset_data'] = array( - 'COLUMNS' => array( - 'image_id' => array('USINT', NULL, 'auto_increment'), - 'image_name' => array('VCHAR:200', ''), - 'image_filename' => array('VCHAR:200', ''), - 'image_lang' => array('VCHAR:30', ''), - 'image_height' => array('USINT', 0), - 'image_width' => array('USINT', 0), - 'imageset_id' => array('USINT', 0), - ), - 'PRIMARY_KEY' => 'image_id', - 'KEYS' => array( - 'i_d' => array('INDEX', 'imageset_id'), - ), - ); - - $schema_data['phpbb_topics'] = array( - 'COLUMNS' => array( - 'topic_id' => array('UINT', NULL, 'auto_increment'), - 'forum_id' => array('UINT', 0), - 'icon_id' => array('UINT', 0), - 'topic_attachment' => array('BOOL', 0), - 'topic_approved' => array('BOOL', 1), - 'topic_reported' => array('BOOL', 0), - 'topic_title' => array('XSTEXT_UNI', '', 'true_sort'), - 'topic_poster' => array('UINT', 0), - 'topic_time' => array('TIMESTAMP', 0), - 'topic_time_limit' => array('TIMESTAMP', 0), - 'topic_views' => array('UINT', 0), - 'topic_replies' => array('UINT', 0), - 'topic_replies_real' => array('UINT', 0), - 'topic_status' => array('TINT:3', 0), - 'topic_type' => array('TINT:3', 0), - 'topic_first_post_id' => array('UINT', 0), - 'topic_first_poster_name' => array('VCHAR_UNI', ''), - 'topic_first_poster_colour' => array('VCHAR:6', ''), - 'topic_last_post_id' => array('UINT', 0), - 'topic_last_poster_id' => array('UINT', 0), - 'topic_last_poster_name' => array('VCHAR_UNI', ''), - 'topic_last_poster_colour' => array('VCHAR:6', ''), - 'topic_last_post_subject' => array('XSTEXT_UNI', ''), - 'topic_last_post_time' => array('TIMESTAMP', 0), - 'topic_last_view_time' => array('TIMESTAMP', 0), - 'topic_moved_id' => array('UINT', 0), - 'topic_bumped' => array('BOOL', 0), - 'topic_bumper' => array('UINT', 0), - 'poll_title' => array('STEXT_UNI', ''), - 'poll_start' => array('TIMESTAMP', 0), - 'poll_length' => array('TIMESTAMP', 0), - 'poll_max_options' => array('TINT:4', 1), - 'poll_last_vote' => array('TIMESTAMP', 0), - 'poll_vote_change' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'topic_id', - 'KEYS' => array( - 'forum_id' => array('INDEX', 'forum_id'), - 'forum_id_type' => array('INDEX', array('forum_id', 'topic_type')), - 'last_post_time' => array('INDEX', 'topic_last_post_time'), - 'topic_approved' => array('INDEX', 'topic_approved'), - 'forum_appr_last' => array('INDEX', array('forum_id', 'topic_approved', 'topic_last_post_id')), - 'fid_time_moved' => array('INDEX', array('forum_id', 'topic_last_post_time', 'topic_moved_id')), - ), - ); - - $schema_data['phpbb_topics_track'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'mark_time' => array('TIMESTAMP', 0), - ), - 'PRIMARY_KEY' => array('user_id', 'topic_id'), - 'KEYS' => array( - 'forum_id' => array('INDEX', 'forum_id'), - ), - ); - - $schema_data['phpbb_topics_posted'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), - 'topic_posted' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => array('user_id', 'topic_id'), - ); - - $schema_data['phpbb_topics_watch'] = array( - 'COLUMNS' => array( - 'topic_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'notify_status' => array('BOOL', 0), - ), - 'KEYS' => array( - 'topic_id' => array('INDEX', 'topic_id'), - 'user_id' => array('INDEX', 'user_id'), - 'notify_stat' => array('INDEX', 'notify_status'), - ), - ); - - $schema_data['phpbb_user_group'] = array( - 'COLUMNS' => array( - 'group_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'group_leader' => array('BOOL', 0), - 'user_pending' => array('BOOL', 1), - ), - 'KEYS' => array( - 'group_id' => array('INDEX', 'group_id'), - 'user_id' => array('INDEX', 'user_id'), - 'group_leader' => array('INDEX', 'group_leader'), - ), - ); - - $schema_data['phpbb_users'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', NULL, 'auto_increment'), - 'user_type' => array('TINT:2', 0), - 'group_id' => array('UINT', 3), - 'user_permissions' => array('MTEXT', ''), - 'user_perm_from' => array('UINT', 0), - 'user_ip' => array('VCHAR:40', ''), - 'user_regdate' => array('TIMESTAMP', 0), - 'username' => array('VCHAR_CI', ''), - 'username_clean' => array('VCHAR_CI', ''), - 'user_password' => array('VCHAR_UNI:40', ''), - 'user_passchg' => array('TIMESTAMP', 0), - 'user_pass_convert' => array('BOOL', 0), - 'user_email' => array('VCHAR_UNI:100', ''), - 'user_email_hash' => array('BINT', 0), - 'user_birthday' => array('VCHAR:10', ''), - 'user_lastvisit' => array('TIMESTAMP', 0), - 'user_lastmark' => array('TIMESTAMP', 0), - 'user_lastpost_time' => array('TIMESTAMP', 0), - 'user_lastpage' => array('VCHAR_UNI:200', ''), - 'user_last_confirm_key' => array('VCHAR:10', ''), - 'user_last_search' => array('TIMESTAMP', 0), - 'user_warnings' => array('TINT:4', 0), - 'user_last_warning' => array('TIMESTAMP', 0), - 'user_login_attempts' => array('TINT:4', 0), - 'user_inactive_reason' => array('TINT:2', 0), - 'user_inactive_time' => array('TIMESTAMP', 0), - 'user_posts' => array('UINT', 0), - 'user_lang' => array('VCHAR:30', ''), - 'user_timezone' => array('DECIMAL', 0), - 'user_dst' => array('BOOL', 0), - 'user_dateformat' => array('VCHAR_UNI:30', 'd M Y H:i'), - 'user_style' => array('USINT', 0), - 'user_rank' => array('UINT', 0), - 'user_colour' => array('VCHAR:6', ''), - 'user_new_privmsg' => array('INT:4', 0), - 'user_unread_privmsg' => array('INT:4', 0), - 'user_last_privmsg' => array('TIMESTAMP', 0), - 'user_message_rules' => array('BOOL', 0), - 'user_full_folder' => array('INT:11', -3), - 'user_emailtime' => array('TIMESTAMP', 0), - 'user_topic_show_days' => array('USINT', 0), - 'user_topic_sortby_type' => array('VCHAR:1', 't'), - 'user_topic_sortby_dir' => array('VCHAR:1', 'd'), - 'user_post_show_days' => array('USINT', 0), - 'user_post_sortby_type' => array('VCHAR:1', 't'), - 'user_post_sortby_dir' => array('VCHAR:1', 'a'), - 'user_notify' => array('BOOL', 0), - 'user_notify_pm' => array('BOOL', 1), - 'user_notify_type' => array('TINT:4', 0), - 'user_allow_pm' => array('BOOL', 1), - 'user_allow_viewonline' => array('BOOL', 1), - 'user_allow_viewemail' => array('BOOL', 1), - 'user_allow_massemail' => array('BOOL', 1), - 'user_options' => array('UINT:11', 895), - 'user_avatar' => array('VCHAR', ''), - 'user_avatar_type' => array('TINT:2', 0), - 'user_avatar_width' => array('USINT', 0), - 'user_avatar_height' => array('USINT', 0), - 'user_sig' => array('MTEXT_UNI', ''), - 'user_sig_bbcode_uid' => array('VCHAR:8', ''), - 'user_sig_bbcode_bitfield' => array('VCHAR:255', ''), - 'user_from' => array('VCHAR_UNI:100', ''), - 'user_icq' => array('VCHAR:15', ''), - 'user_aim' => array('VCHAR_UNI', ''), - 'user_yim' => array('VCHAR_UNI', ''), - 'user_msnm' => array('VCHAR_UNI', ''), - 'user_jabber' => array('VCHAR_UNI', ''), - 'user_website' => array('VCHAR_UNI:200', ''), - 'user_occ' => array('TEXT_UNI', ''), - 'user_interests' => array('TEXT_UNI', ''), - 'user_actkey' => array('VCHAR:32', ''), - 'user_newpasswd' => array('VCHAR_UNI:40', ''), - 'user_form_salt' => array('VCHAR_UNI:32', ''), - - ), - 'PRIMARY_KEY' => 'user_id', - 'KEYS' => array( - 'user_birthday' => array('INDEX', 'user_birthday'), - 'user_email_hash' => array('INDEX', 'user_email_hash'), - 'user_type' => array('INDEX', 'user_type'), - 'username_clean' => array('UNIQUE', 'username_clean'), - ), - ); - - $schema_data['phpbb_warnings'] = array( - 'COLUMNS' => array( - 'warning_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT', 0), - 'post_id' => array('UINT', 0), - 'log_id' => array('UINT', 0), - 'warning_time' => array('TIMESTAMP', 0), - ), - 'PRIMARY_KEY' => 'warning_id', - ); - - $schema_data['phpbb_words'] = array( - 'COLUMNS' => array( - 'word_id' => array('UINT', NULL, 'auto_increment'), - 'word' => array('VCHAR_UNI', ''), - 'replacement' => array('VCHAR_UNI', ''), - ), - 'PRIMARY_KEY' => 'word_id', - ); - - $schema_data['phpbb_zebra'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - 'zebra_id' => array('UINT', 0), - 'friend' => array('BOOL', 0), - 'foe' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => array('user_id', 'zebra_id'), - ); - - return $schema_data; -} - -?> \ No newline at end of file diff --git a/phpBB/develop/regex.php b/phpBB/develop/regex.php deleted file mode 100644 index 9d2d48f653..0000000000 --- a/phpBB/develop/regex.php +++ /dev/null @@ -1,83 +0,0 @@ -\nIPv6: " . $ipv6 . "
    \n"; - -// URL regular expressions - -$pct_encoded = "%[\dA-F]{2}"; -$unreserved = 'a-z0-9\-._~'; -$sub_delims = '!$&\'()*+,;='; -$pchar = "(?:[$unreserved$sub_delims:@|]+|$pct_encoded)"; // rfc: no "|" - -$scheme = '[a-z][a-z\d+\-.]*'; -$reg_name = "(?:[$unreserved$sub_delims:@|]+|$pct_encoded)+"; // rfc: * instead of + and no "|" and no "@" and no ":" (included instead of userinfo) -//$userinfo = "(?:(?:[$unreserved$sub_delims:]+|$pct_encoded))*"; -$ipv4_simple = '[0-9.]+'; -$ipv6_simple = '\[[a-z0-9.]+:[a-z0-9.]+:[a-z0-9.:]+\]'; -$host = "(?:$reg_name|$ipv4_simple|$ipv6_simple)"; -$port = '\d*'; -//$authority = "(?:$userinfo@)?$host(?::$port)?"; -$authority = "$host(?::$port)?"; -$segment = "$pchar*"; -$path_abempty = "(?:/$segment)*"; -$hier_part = "/{2}$authority$path_abempty"; -$query = "(?:[$unreserved$sub_delims:@/?|]+|$pct_encoded)*"; // pchar | "/" | "?", rfc: no "|" -$fragment = $query; - -$url = "$scheme:$hier_part(?:\?$query)?(?:\#$fragment)?"; -echo 'URL: ' . $url . "
    \n"; - -// no scheme, shortened authority, but host has to start with www. -$www_url = "www\.$reg_name(?::$port)?$path_abempty(?:\?$query)?(?:\#$fragment)?"; -echo 'www.URL: ' . $www_url . "
    \n"; - -// no schema and no authority -$relative_url = "$segment$path_abempty(?:\?$query)?(?:\#$fragment)?"; -echo 'relative URL: ' . $relative_url . "
    \n"; - -?> diff --git a/phpBB/develop/repair_bots.php b/phpBB/develop/repair_bots.php deleted file mode 100755 index 4dae1e1091..0000000000 --- a/phpBB/develop/repair_bots.php +++ /dev/null @@ -1,151 +0,0 @@ -session_begin(); -$auth->acl($user->data); -$user->setup(); - -$bots = array( - 'AdsBot [Google]' => array('AdsBot-Google', ''), - 'Alexa [Bot]' => array('ia_archiver', ''), - 'Alta Vista [Bot]' => array('Scooter/', ''), - 'Ask Jeeves [Bot]' => array('Ask Jeeves', ''), - 'Baidu [Spider]' => array('Baiduspider+(', ''), - 'Exabot [Bot]' => array('Exabot/', ''), - 'FAST Enterprise [Crawler]' => array('FAST Enterprise Crawler', ''), - 'FAST WebCrawler [Crawler]' => array('FAST-WebCrawler/', ''), - 'Francis [Bot]' => array('http://www.neomo.de/', ''), - 'Gigabot [Bot]' => array('Gigabot/', ''), - 'Google Adsense [Bot]' => array('Mediapartners-Google', ''), - 'Google Desktop' => array('Google Desktop', ''), - 'Google Feedfetcher' => array('Feedfetcher-Google', ''), - 'Google [Bot]' => array('Googlebot', ''), - 'Heise IT-Markt [Crawler]' => array('heise-IT-Markt-Crawler', ''), - 'Heritrix [Crawler]' => array('heritrix/1.', ''), - 'IBM Research [Bot]' => array('ibm.com/cs/crawler', ''), - 'ICCrawler - ICjobs' => array('ICCrawler - ICjobs', ''), - 'ichiro [Crawler]' => array('ichiro/2', ''), - 'Majestic-12 [Bot]' => array('MJ12bot/', ''), - 'Metager [Bot]' => array('MetagerBot/', ''), - 'MSN NewsBlogs' => array('msnbot-NewsBlogs/', ''), - 'MSN [Bot]' => array('msnbot/', ''), - 'MSNbot Media' => array('msnbot-media/', ''), - 'NG-Search [Bot]' => array('NG-Search/', ''), - 'Nutch [Bot]' => array('http://lucene.apache.org/nutch/', ''), - 'Nutch/CVS [Bot]' => array('NutchCVS/', ''), - 'OmniExplorer [Bot]' => array('OmniExplorer_Bot/', ''), - 'Online link [Validator]' => array('online link validator', ''), - 'psbot [Picsearch]' => array('psbot/0', ''), - 'Seekport [Bot]' => array('Seekbot/', ''), - 'Sensis [Crawler]' => array('Sensis Web Crawler', ''), - 'SEO Crawler' => array('SEO search Crawler/', ''), - 'Seoma [Crawler]' => array('Seoma [SEO Crawler]', ''), - 'SEOSearch [Crawler]' => array('SEOsearch/', ''), - 'Snappy [Bot]' => array('Snappy/1.1 ( http://www.urltrends.com/ )', ''), - 'Steeler [Crawler]' => array('http://www.tkl.iis.u-tokyo.ac.jp/~crawler/', ''), - 'Synoo [Bot]' => array('SynooBot/', ''), - 'Telekom [Bot]' => array('crawleradmin.t-info@telekom.de', ''), - 'TurnitinBot [Bot]' => array('TurnitinBot/', ''), - 'Voyager [Bot]' => array('voyager/1.0', ''), - 'W3 [Sitesearch]' => array('W3 SiteSearch Crawler', ''), - 'W3C [Linkcheck]' => array('W3C-checklink/', ''), - 'W3C [Validator]' => array('W3C_*Validator', ''), - 'WiseNut [Bot]' => array('http://www.WISEnutbot.com', ''), - 'YaCy [Bot]' => array('yacybot', ''), - 'Yahoo MMCrawler [Bot]' => array('Yahoo-MMCrawler/', ''), - 'Yahoo Slurp [Bot]' => array('Yahoo! DE Slurp', ''), - 'Yahoo [Bot]' => array('Yahoo! Slurp', ''), - 'YahooSeeker [Bot]' => array('YahooSeeker/', ''), -); - -$bot_ids = array(); -user_get_id_name($bot_ids, array_keys($bots), USER_IGNORE); -foreach($bot_ids as $bot) -{ - user_delete('remove', $bot); -} -// Done -add_bots($bots); -echo 'done'; - - -/** -* Add the search bots into the database -* This code should be used in execute_last if the source database did not have bots -* If you are converting bots this function should not be called -* @todo We might want to look at sharing the bot list between the install code and this code for consistency -*/ -function add_bots($bots) -{ - global $db, $config; - - $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = 'BOTS'"; - $result = $db->sql_query($sql); - $group_id = (int) $db->sql_fetchfield('group_id', $result); - $db->sql_freeresult($result); - $db->sql_query('TRUNCATE TABLE ' . BOTS_TABLE); - - if (!$group_id) - { - add_default_groups(); - - $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = 'BOTS'"; - $result = $db->sql_query($sql); - $group_id = (int) $db->sql_fetchfield('group_id', $result); - $db->sql_freeresult($result); - - } - - - - - foreach ($bots as $bot_name => $bot_ary) - { - $user_row = array( - 'user_type' => USER_IGNORE, - 'group_id' => $group_id, - 'username' => $bot_name, - 'user_regdate' => time(), - 'user_password' => '', - 'user_colour' => '9E8DA7', - 'user_email' => '', - 'user_lang' => $config['default_lang'], - 'user_style' => 1, - 'user_timezone' => 0, - 'user_allow_massemail' => 0, - ); - - $user_id = user_add($user_row); - - if ($user_id) - { - $sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'bot_active' => 1, - 'bot_name' => $bot_name, - 'user_id' => $user_id, - 'bot_agent' => $bot_ary[0], - 'bot_ip' => $bot_ary[1]) - ); - $db->sql_query($sql); - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/develop/revar_lang_files.php b/phpBB/develop/revar_lang_files.php new file mode 100644 index 0000000000..9886baa09b --- /dev/null +++ b/phpBB/develop/revar_lang_files.php @@ -0,0 +1,82 @@ + 'lang', 'lang_admin' => 'lang', 'lang_faq' => 'faq', 'lang_bbcode' => 'faq'); + +$dirname = "./../language"; +$dir = opendir($dirname); + +while ( $file = readdir($dir) ) +{ + if ( ereg("^lang_", $file) && !is_file(realpath($dirname . "/" . $file)) && !is_link(realpath($dirname . "/" . $file)) ) + { + foreach($vars as $lang_file => $lang_var) + { + $$lang_var = array(); + + include($dirname . "/" . $file . "/" . $lang_file . '.php'); + + $store = ""; + while( list($key, $value) = each($$lang_var) ) + { + if ( !is_array($value) ) + { + $key = ( is_string($key) ) ? "'$key'" : $key; + $store .= ( ( $store != "" ) ? ", \n\t" : "" ) . "$key => '" . addslashes($value) . "'"; + } + else + { + $key = ( is_string($key) ) ? "'$key'" : $key; + $store .= ( ( $store != "" ) ? ", \n\t" : "" ) . "$key => array(\n\t\t"; + + $store2 = ""; + while( list($key2, $value2) = each($value) ) + { + $key2 = ( is_string($key) ) ? "'$key2'" : $key2; + $store2 .= ( ( $store2 != "" ) ? ", \n\t\t" : "" ) . "$key2 => '" . addslashes($value2) . "'"; + } + $store .= $store2 . "\n\t)"; + } + } + + $store = ""; + + $fp = fopen($dirname . "/" . $file . "/" . $lang_file . '.php', 'w'); + + fwrite($fp, $store); + + fclose($fp); + + } + } +} + +?> \ No newline at end of file diff --git a/phpBB/develop/search_fill.php b/phpBB/develop/search_fill.php index 371c8c74cc..8cfea84f02 100644 --- a/phpBB/develop/search_fill.php +++ b/phpBB/develop/search_fill.php @@ -1,4 +1,4 @@ -session_begin(); -$auth->acl($user->data); -$user->setup(); - -$search_type = $config['search_type']; - -if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx)) -{ - trigger_error('NO_SUCH_SEARCH_MODULE'); -} - -require($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx); - -$error = false; -$search = new $search_type($error); - -if ($error) -{ - trigger_error($error); -} +$common_percent = 0.4; // Percentage of posts in which a word has to appear to be marked as common print "\n\n"; +// +// Try and load stopword and synonym files +// +// This needs fixing! Shouldn't be hardcoded to English files! +$stopword_array = file($phpbb_root_path . "language/lang_english/search_stopwords.txt"); +$synonym_array = file($phpbb_root_path . "language/lang_english/search_synonyms.txt"); + // // Fetch a batch of posts_text entries // -$sql = "SELECT COUNT(*) as total, MAX(post_id) as max_post_id - FROM ". POSTS_TABLE; -if ( !($result = $db->sql_query($sql)) ) +$sql = "SELECT COUNT(*) as total, MAX(post_id) as max_post_id + FROM ". POSTS_TEXT_TABLE; +if ( !($result = $db->sql_query($sql)) ) { $error = $db->sql_error(); die("Couldn't get maximum post ID :: " . $sql . " :: " . $error['message']); @@ -77,10 +55,10 @@ for(;$postcounter <= $max_post_id; $postcounter += $batchsize) $batchend = $postcounter + $batchsize; $batchcount++; - $sql = "SELECT * - FROM " . POSTS_TABLE . " - WHERE post_id - BETWEEN $batchstart + $sql = "SELECT * + FROM " . POSTS_TEXT_TABLE . " + WHERE post_id + BETWEEN $batchstart AND $batchend"; if( !($result = $db->sql_query($sql)) ) { @@ -91,35 +69,121 @@ for(;$postcounter <= $max_post_id; $postcounter += $batchsize) $rowset = $db->sql_fetchrowset($result); $db->sql_freeresult($result); - $post_rows = sizeof($rowset); + $post_rows = count($rowset); if( $post_rows ) { - // $sql = "LOCK TABLES ".POST_TEXT_TABLE." WRITE"; - // $result = $db->sql_query($sql); - print "\n

    \nRestart from posting $batchstart
    \n"; + // $sql = "LOCK TABLES ".POST_TEXT_TABLE." WRITE"; + // $result = $db->sql_query($sql); + print "\n

    \nRestart from posting $batchstart
    \n"; // For every post in the batch: for($post_nr = 0; $post_nr < $post_rows; $post_nr++ ) - { + { print "."; flush(); - $post_id = $rowset[$post_nr]['post_id']; + $post_id = $rowset[$post_nr]['post_id']; - $search->index('post', $rowset[$post_nr]['post_id'], $rowset[$post_nr]['post_text'], $rowset[$post_nr]['post_subject'], $rowset[$post_nr]['poster_id']); + $matches = array(); + $matches['text'] = split_words(clean_words("post", $rowset[$post_nr]['post_text'], $stopword_array, $synonym_array)); + $matches['title'] = split_words(clean_words("post", $rowset[$post_nr]['post_subject'], $stopword_array, $synonym_array)); + + while( list($match_type, $match_ary) = @each($matches) ) + { + $title_match = ( $match_type == 'title' ) ? 1 : 0; + + $num_matches = count($match_ary); + + if ( $num_matches < 1 ) + { + // Skip this post if no words where found + continue; + } + + // For all words in the posting + $sql_in = ""; + + $sql_insert = ''; + $sql_select = ''; + + $word = array(); + $word_count = array(); + + for($j = 0; $j < $num_matches; $j++) + { + $this_word = strtolower(trim($match_ary[$j])); + if ( $this_word != '' ) + { + $word_count[$this_word] = ( isset($word_count[$this_word]) ) ? $word_count[$this_word] + 1 : 0; + $comma = ($sql_insert != '')? ', ': ''; + + $sql_insert .= "$comma('" . $this_word . "')"; + $sql_select .= "$comma'" . $this_word . "'"; + } + } + + if ( $sql_insert == '' ) + { + die("no words found"); + } + + $sql = 'INSERT IGNORE INTO ' . SEARCH_WORD_TABLE . " + (word_text) + VALUES $sql_insert"; + if ( !$result = $db->sql_query($sql) ) + { + $error = $db->sql_error(); + die("Couldn't INSERT words :: " . $sql . " :: " . $error['message']); + } + + // Get the word_id's out of the DB (to see if they are already there) + $sql = "SELECT word_id, word_text + FROM " . SEARCH_WORD_TABLE . " + WHERE word_text IN ($sql_select) + GROUP BY word_text"; + $result = $db->sql_query($sql); + if ( !$result ) + { + $error = $db->sql_error(); + die("Couldn't select words :: " . $sql . " :: " . $error['message']); + } + + $sql_insert = array(); + while( $row = $db->sql_fetchrow($result) ) + { + $sql_insert[] = "($post_id, " . $row['word_id'] . ", $title_match)"; + } + + $db->sql_freeresult($result); + + $sql = "INSERT INTO " . SEARCH_MATCH_TABLE . " + (post_id, word_id, title_match) + VALUES " . implode(", ", $sql_insert); + $result = $db->sql_query($sql); + if ( !$result ) + { + $error = $db->sql_error(); + die("Couldn't insert new word match :: " . $sql . " :: " . $error['message']); + } + + } // All posts } - // $sql = "UNLOCK TABLES"; - // $result = $db->sql_query($sql); + + // $sql = "UNLOCK TABLES"; + // $result = $db->sql_query($sql); } -} -print "
    Removing common words (words that appear in more than 50% of the posts)
    \n"; -flush(); -$search->tidy(); -print "Removed words that where too common.
    "; + // Remove common words after the first 2 batches and after every 4th batch after that. + if( $batchcount % 4 == 3 ) + { + print "
    Removing common words (words that appear in more than $common_percent of the posts)
    \n"; + flush(); + print "Removed ". remove_common("global", $common_percent) ." words that where too common.
    "; + } +} echo "
    Done"; diff --git a/phpBB/develop/unicode_testing.php b/phpBB/develop/unicode_testing.php deleted file mode 100644 index 25a13d1325..0000000000 --- a/phpBB/develop/unicode_testing.php +++ /dev/null @@ -1,120 +0,0 @@ - $string) - { - utf_normalizer::nfkc($strings[$key]); - } - } - - return $strings; -} - -?> \ No newline at end of file diff --git a/phpBB/develop/utf_normalizer_test.php b/phpBB/develop/utf_normalizer_test.php deleted file mode 100644 index 2ce74fe833..0000000000 --- a/phpBB/develop/utf_normalizer_test.php +++ /dev/null @@ -1,391 +0,0 @@ - array( - 'c2' => array('c1', 'c2', 'c3'), - 'c4' => array('c4', 'c5') - ), - - /** - * NFD - * c3 == NFD(c1) == NFD(c2) == NFD(c3) - * c5 == NFD(c4) == NFD(c5) - */ - 'NFD' => array( - 'c3' => array('c1', 'c2', 'c3'), - 'c5' => array('c4', 'c5') - ), - - /** - * NFKC - * c4 == NFKC(c1) == NFKC(c2) == NFKC(c3) == NFKC(c4) == NFKC(c5) - */ - 'NFKC' => array( - 'c4' => array('c1', 'c2', 'c3', 'c4', 'c5') - ), - - /** - * NFKD - * c5 == NFKD(c1) == NFKD(c2) == NFKD(c3) == NFKD(c4) == NFKD(c5) - */ - 'NFKD' => array( - 'c5' => array('c1', 'c2', 'c3', 'c4', 'c5') - ) -); - -require_once($phpbb_root_path . 'includes/utf/utf_normalizer.' . $phpEx); - -$i = $n = 0; -$failed = false; -$tested_chars = array(); - -$fp = fopen($phpbb_root_path . 'develop/NormalizationTest.txt', 'rb'); -while (!feof($fp)) -{ - $line = fgets($fp); - ++$n; - - if ($line[0] == '@') - { - if ($i) - { - echo "done\n"; - } - - $i = 0; - echo "\n", substr($line, 1), "\n\n"; - continue; - } - - if (!strpos(' 0123456789ABCDEF', $line[0])) - { - continue; - } - - if (++$i % 100 == 0) - { - echo $i, ' '; - } - - list($c1, $c2, $c3, $c4, $c5) = explode(';', $line); - - if (!strpos($c1, ' ')) - { - /** - * We are currently testing a single character, we add it to the list of - * characters we have processed so that we can exclude it when testing - * for invariants - */ - $tested_chars[$c1] = 1; - } - - foreach ($test_suite as $form => $serie) - { - foreach ($serie as $expected => $tests) - { - $hex_expected = ${$expected}; - $utf_expected = hexseq_to_utf($hex_expected); - - foreach ($tests as $test) - { - $utf_result = $utf_expected; - call_user_func(array('utf_normalizer', $form), $utf_result); - - if (strcmp($utf_expected, $utf_result)) - { - $failed = true; - $hex_result = utf_to_hexseq($utf_result); - - echo "\nFAILED $expected == $form($test) ($hex_expected != $hex_result)"; - } - } - } - - if ($failed) - { - die("\n\nFailed at line $n\n"); - } - } -} -fclose($fp); - -/** -* Test for invariants -*/ -echo "\n\nTesting for invariants...\n\n"; - -$fp = fopen($phpbb_root_path . 'develop/UnicodeData.txt', 'rt'); - -$n = 0; -while (!feof($fp)) -{ - if (++$n % 100 == 0) - { - echo $n, ' '; - } - - $line = fgets($fp, 1024); - - if (!$pos = strpos($line, ';')) - { - continue; - } - - $hex_tested = $hex_expected = substr($line, 0, $pos); - - if (isset($tested_chars[$hex_tested])) - { - continue; - } - - $utf_expected = hex_to_utf($hex_expected); - - if ($utf_expected >= UTF8_SURROGATE_FIRST - && $utf_expected <= UTF8_SURROGATE_LAST) - { - /** - * Surrogates are illegal on their own, we expect the normalizer - * to return a replacement char - */ - $utf_expected = UTF8_REPLACEMENT; - $hex_expected = utf_to_hexseq($utf_expected); - } - - foreach (array('nfc', 'nfkc', 'nfd', 'nfkd') as $form) - { - $utf_result = $utf_expected; - call_user_func(array('utf_normalizer', $form), $utf_result); - $hex_result = utf_to_hexseq($utf_result); -// echo "$form($utf_expected) == $utf_result\n"; - - if (strcmp($utf_expected, $utf_result)) - { - $failed = 1; - - echo "\nFAILED $hex_expected == $form($hex_tested) ($hex_expected != $hex_result)"; - } - } - - if ($failed) - { - die("\n\nFailed at line $n\n"); - } -} -fclose($fp); - -die("\n\nALL TESTS PASSED SUCCESSFULLY\n"); - -/** -* Download a file to the develop/ dir -* -* @param string $url URL of the file to download -* @return void -*/ -function download($url) -{ - global $phpbb_root_path; - - if (file_exists($phpbb_root_path . 'develop/' . basename($url))) - { - return; - } - - echo 'Downloading from ', $url, ' '; - - if (!$fpr = fopen($url, 'rb')) - { - die("Can't download from $url\nPlease download it yourself and put it in the develop/ dir, kthxbai"); - } - - if (!$fpw = fopen($phpbb_root_path . 'develop/' . basename($url), 'wb')) - { - die("Can't open develop/" . basename($url) . " for output... please check your permissions or something"); - } - - $i = 0; - $chunk = 32768; - $done = ''; - - while (!feof($fpr)) - { - $i += fwrite($fpw, fread($fpr, $chunk)); - echo str_repeat("\x08", strlen($done)); - - $done = ($i >> 10) . ' KiB'; - echo $done; - } - fclose($fpr); - fclose($fpw); - - echo "\n"; -} - -/** -* Convert a UTF string to a sequence of codepoints in hexadecimal -* -* @param string $utf UTF string -* @return integer Unicode codepoints in hex -*/ -function utf_to_hexseq($str) -{ - $pos = 0; - $len = strlen($str); - $ret = array(); - - while ($pos < $len) - { - $c = $str[$pos]; - switch ($c & "\xF0") - { - case "\xC0": - case "\xD0": - $utf_char = substr($str, $pos, 2); - $pos += 2; - break; - - case "\xE0": - $utf_char = substr($str, $pos, 3); - $pos += 3; - break; - - case "\xF0": - $utf_char = substr($str, $pos, 4); - $pos += 4; - break; - - default: - $utf_char = $c; - ++$pos; - } - - $hex = dechex(utf_to_cp($utf_char)); - - if (!isset($hex[3])) - { - $hex = substr('000' . $hex, -4); - } - - $ret[] = $hex; - } - - return strtr(implode(' ', $ret), 'abcdef', 'ABCDEF'); -} - -/** -* Convert a UTF-8 char to its codepoint -* -* @param string $utf_char UTF-8 char -* @return integer Unicode codepoint -*/ -function utf_to_cp($utf_char) -{ - switch (strlen($utf_char)) - { - case 1: - return ord($utf_char); - - case 2: - return ((ord($utf_char[0]) & 0x1F) << 6) | (ord($utf_char[1]) & 0x3F); - - case 3: - return ((ord($utf_char[0]) & 0x0F) << 12) | ((ord($utf_char[1]) & 0x3F) << 6) | (ord($utf_char[2]) & 0x3F); - - case 4: - return ((ord($utf_char[0]) & 0x07) << 18) | ((ord($utf_char[1]) & 0x3F) << 12) | ((ord($utf_char[2]) & 0x3F) << 6) | (ord($utf_char[3]) & 0x3F); - - default: - die('UTF-8 chars can only be 1-4 bytes long'); - } -} - -/** -* Return a UTF string formed from a sequence of codepoints in hexadecimal -* -* @param string $seq Sequence of codepoints, separated with a space -* @return string UTF-8 string -*/ -function hexseq_to_utf($seq) -{ - return implode('', array_map('hex_to_utf', explode(' ', $seq))); -} - -/** -* Convert a codepoint in hexadecimal to a UTF-8 char -* -* @param string $hex Codepoint, in hexadecimal -* @return string UTF-8 char -*/ -function hex_to_utf($hex) -{ - return cp_to_utf(hexdec($hex)); -} - -/** -* Convert a codepoint to a UTF-8 char -* -* @param integer $cp Unicode codepoint -* @return string UTF-8 string -*/ -function cp_to_utf($cp) -{ - if ($cp > 0xFFFF) - { - return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F)); - } - else if ($cp > 0x7FF) - { - return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F)); - } - else if ($cp > 0x7F) - { - return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F)); - } - else - { - return chr($cp); - } -} \ No newline at end of file diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS index 19bbda832a..358e5e179f 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -1,67 +1,6 @@ -/** -* -* phpBB3 © Copyright 2000, 2002, 2005, 2007 phpBB Group -* http://www.phpbb.com -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, version 2 of the License. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -* -*/ - -Please see: http://www.phpbb.com/about/team/ for a list of all the people currently -involved in phpBB. - -phpBB Lead Developer : Acyd Burn (Meik Sievertsen) - -phpBB Developers : DavidMJ (David M.) - dhn (Dominik Dröscher) - kellanved (Henry Sudhof) - naderman (Nils Adermann) - subBlue (Tom Beddard) - Vic D'Elfant (Vic D'Elfant) - --- Previous Contributors -- - -phpBB Project Manager : theFinn (James Atkinson) [Founder - 04/2007] - SHS` (Jonathan Stanley) - -phpBB Lead Developer : psoTFX (Paul S. Owen) [2001 - 09/2005] - -phpBB Developers : Ashe (Ludovic Arnaud) [10/2002 - 11/2003, 06/2006 - 10/2006] - BartVB (Bart van Bragt) [11/2000 - 03/2006] - GrahamJE (Graham Eames) [09/2005 - 11/2006] - - --- Copyrights -- - -Visual Confirmation : Xore (Robert Hetzler) - -Original subSilver by subBlue Design, Tom Beddard, (c) 2001 phpBB Group -prosilver by subBlue Design, Tom Beddard, (c) 2004 phpBB Group -subsilver2 by subBlue Design, Tom Beddard, (c) 2004 phpBB Group - -phpBB3 contains code from the following applications: - -LGPL licenced: -Smarty (c) 2001, 2002 by ispi of Lincoln, Inc, http://smarty.php.net/ - -GPL licenced: -phpMyAdmin (c) 2001,2003 phpMyAdmin Devel team, http://www.phpmyadmin.net/ -Jabber Class (c) 2006 Flyspray.org, http://www.flyspray.org/ -Chora (c) 2000-2006, The Horde Project. http://horde.org/chora/ -Horde Project (c) 2000-2006, The Horde Project. http://horde.org/ - -PHP License, version 3.0: -Pear (c) 2001-2004 PHP Group, http://pear.php.net - -Text_Diff-0.2.1 http://pear.php.net/package/Text_Diff +Please see: http://www.phpbb.com/about.php for a list of all the people involved in phpBB. +Please see: http://www.phpbb.com/about.php for a list of people involved within the security audit of phpBB (since phpBB 2.0.17). +[September 2005] +Our special thanks goes to our former developer and manager psoTFX (Paul S. Owen) for being a wonderful teammate and talented programer. +He was a driving force in the project for over 3 years and helped a lot in making phpBB what it is now. diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index e489e3b099..fd0718f6cb 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -1,615 +1,856 @@ - - + + - - - - - - - - - - -phpBB3 • Changelog - - - + + +phpBB 2.0.x :: Changelog + + + - + + + + +
    + + + +
    -
    - - - - - -
    + + + + + +
    phpBB 2 : Creating CommunitiesphpBB 2.0.x CHANGELOG
    - -

    This is a non-exhaustive (but still near complete) changelog for phpBB 3.0.x including release candidate versions. Our thanks to all those people who've contributed bug reports and code fixes.

    - -

    Changelog

    - - - -
    +

    This is a non-exhaustive (but still near complete) changelog for phpBB 2.0.x including beta and release candidate versions. Our thanks to all those people who've contributed bug reports and code fixes.

    -

    1. Changelog

    +

    l.i. Changes since 2.0.22

    -
    -
    +
      +
    • [Fix] Correctly re-assign group moderator on user deletion (Bug #280)
    • +
    • [Fix] Deleting a forum with multiple polls included (Bug #6740)
    • +
    • [Fix] Fixed postgresql query for obtaining group moderator in groupcp.php (Bug #6550)
    • +
    • [Fix] Selected field on first entry by default for font size within posting_body.tpl (Bug #7124)
    • +
    • [Fix] Adjusted maxlength parameters in admin/styles_edit_body.tpl (Bug #81)
    • +
    • [Fix] Fixed html output in make_forum_select if no forums present (Bug #436)
    • +
    • [Fix] Fixed spelling error(s) in lang_admin.php (Bug #7172, #6978)
    • +
    • [Fix] Correctly display censored words in admin panel (Bug #12271)
    • +
    • [Fix] Do not allow soft hyphen \xAD in usernames (reported by Bander00)
    • +
    • [Fix] Fixed the group permission system's use of array access
    • +
    • [Fix] Simple group permissions now work properly
    • +
    • [Sec] Fix possible XSRF Vulnerability in private messaging and groups handling
    • +
    • [Fix] Fix inability to export smilies (Bug #2265)
    • +
    • [Fix] Fixing some problems with PHP5 and register_long_arrays off
    • +
    -
    +

    l.ii. Changes since 2.0.21

    -

    1.i. Changes since 3.0.0

    +
      +
    • [Fix] Check for user's existence prior to showing email form
    • +
    • [Fix] New members of moderator groups should always become moderators (Bug #382)
    • +
    • [Fix] Proper message when replying to non-existant topics (Bug #459)
    • +
    • [Fix] Changed column type of search_array to store more ids (Bug #4058)
    • +
    • [Fix] Fixed annoyance with font-size selector (Bug #4612)
    • +
    • [Fix] Fix optimize line in database updater (Bug #6186)
    • +
    • [Sec] Check for the avatar upload directory reinforced
    • +
    • [Sec] Changes to the criteria for "bad" redirection targets - kellanved
    • +
    • [Sec] Fixed a non-persistent XSS issue in private messaging
    • +
    • [Sec] Fixing possible negative start parameter - SpiderZ.
    • +
    • [Sec] Added session checks to various forms - kellanved
    • +
    -
      -
    • [Change] Migrate phpBB to PHP versions >= 5.1
    • +

      l.iii. Changes since 2.0.20

      -
    • [Change] Validate birthdays (Bug #15004)
    • -
    • [Fix] Allow correct avatar caching for CGI installations. (thanks wildbill)
    • -
    • [Fix] Fix disabling of word censor, now possible again
    • -
    • [Fix] Allow single quotes in db password to be stored within config.php in installer
    • -
    • [Fix] Correctly quote db password for re-display in installer (Bug #16695 / thanks to m313 for reporting too - #s17235)
    • -
    • [Fix] Correctly handle empty imageset entries (Bug #16865)
    • -
    • [Fix] Correctly check empty subjects/messages (Bug #17915)
    • -
    • [Change] Do not check usernames against word censor list. Disallowed usernames is already checked and word censor belong to posts. (Bug #17745)
    • -
    • [Fix] Additionally include non-postable forums for moderators forums shown within the teams list. (Bug #17265)
    • -
    • [Change] Sped up viewforum considerably (also goes towards mcp_forum)
    • -
    • [Fix] Do not split topic list for topics being promoted to announcements after been moved to another forum (Bug #18635)
    • -
    • [Fix] Allow editing usernames within database_update on username cleanup (Bug #18415)
    • -
    • [Fix] Fixing wrong sync() calls if moving all posts by a member in ACP (Bug #18385)
    • -
    • [Fix] Check entered imagemagick path for trailing slash (Bug #18205)
    • -
    • [Fix] Use proper title on index for new/unread posts (Bug #13101) - patch provided by Pyramide
    • -
    • [Fix] Allow calls to $user->set_cookie() define no cookie time for setting session cookies (Bug #18025)
    • -
    • [Fix] Stricter checks on smilie packs (Bug #19675)
    • -
    • [Fix] Gracefully return from cancelling pm drafts (Bug #19675)
    • -
    • [Fix] Possible login problems with IE7 if browser check is activated (Bug #20135)
    • -
    • [Fix] Fix possible database transaction errors if code returns on error and rollback happened (Bug #17025)
    • -
    • [Change] Allow numbers in permission names for modifications, as well as uppercase letters for the request_ part (Bug #20125)
    • -
    • [Fix] Use HTTP_HOST in favor of SERVER_NAME for determining server url for redirection and installation (Bug #19955)
    • -
    • [Fix] Removing s_watching_img from watch_topic_forum() function (Bug #20445)
    • -
    • [Fix] Changing order for post review if more than one post affected (Bug #15249)
    • -
    • [Fix] Language typos/fixes (Bug #20425, #15719, #15429, #14669, #13479, #20795, #21095, #21405, #21715, #21725, #21755, #21865, #15689)
    • -
    • [Fix] Style/Template fixes (Bug #20065, #19405, #19205, #15028, #14934, #14821, #14752, #14497, #13707, #14738, #19725)
    • -
    • [Fix] Tiny code fixes (Bug #20165, #20025, #19795, #14804)
    • -
    • [Fix] Prepend phpbb_root_path to ranks path for displaying ranks (Bug #19075)
    • -
    • [Fix] Allow forum notifications if topic notifications are disabled but forum notifications enabled (Bug #14765)
    • -
    • [Fix] Fixing realpath issues for provider returning the passed value instead of disabling it. This fixes issues with confirm boxes for those hosted on Network Solutions for example. (Bug #20435)
    • -
    • [Fix] Try to sort last active date on memberlist correctly at least on current page (Bug #18665)
    • -
    • [Fix] Handle generation of form tokens when maximum time is set to -1
    • -
    • [Fix] Correctly delete unapproved posts without deleting the topic (Bug #15120)
    • -
    • [Fix] Respect signature permissions in posting (Bug #16029)
    • -
    • [Fix] Users allowed to resign only from open and freely open groups (Bug #19355)
    • -
    • [Fix] Assign a last viewed date to converted topics (Bug #16565)
    • -
    • [Fix] Many minor and/or cosmetic fixes (Including, but not limited to: #21315, #18575, #18435, #21215)
    • -
    • [Feature] New option to hide the entire list of subforums on listforums
    • -
    • [Fix] Custom BBCode {EMAIL}-Token usage (Bug #21155)
    • -
    • [Fix] Do not rely on parameter returned by unlink() for verifying cache directory write permission (Bug #19565)
    • -
    • [Change] Use correct string for filesize (MiB instead of MB for example)
    • -
    • [Change] Remove left join for query used to retrieve already assigned users and groups within permission panel (Bug #20235)
    • -
    • [Fix] Correctly return sole whitespaces if used with BBCodes (Bug #19535)
    • -
    • [Fix] Quote bbcode parsing adding too much closing tags on special conditions (Bug #20735)
    • +
        +
      • [Fix] Changes to random number generator code to explicitly truncate the length of the string
      • +
      • [Fix] Quoting on boards with HTML enabled
      • +
      • [Fix] Special characters on boards with HTML enabled
      • +
      • [Fix] Redirect to list if cancelling deletion of ranks, smilies or word censors
      • +
      • [Fix] Missing error message if an inactive user tried to login (Bug #1598)
      • +
      • [Fix] Do not alter post counts when just removing a poll (Bug #1602)
      • +
      • [Fix] Correct error in removal of old session keys
      • +
      • [Fix] Changed filtering of short search terms
      • +
      • [Sec] Improved filtering on language selection (also addresses a number of bug reports related to missing languages)
      • +
      • [Change] Backported more efficient highlighting code from Olympus
      • +
      • [Change] Backported zlib emulation code so that there is only a single confirmation image even if zlib is not available
      • +
      -
    - -

    1.i. Changes since 3.0.RC8

    -
      -
    • [Fix] Cleaned usernames contain only single spaces, so "a_name" and "a__name" are treated as the same name (Bug #15634)
    • -
    • [Fix] Check "able to disable word censor" option while applying word censor on text (Bug #15974)
    • -
    • [Fix] Rollback changes on failed transaction if returning on sql error is set
    • -
    • [Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)
    • -
    +

    l.iv. Changes since 2.0.19

    -

    1.ii. Changes since 3.0.RC7

    +
      +
    • [Fix] Prevent login attempts from incrementing for inactive users
    • +
    • [Fix] Do not check maximum login attempts on re-authentication to the admin panel - tomknight
    • +
    • [Fix] Regenerate session keys on password change
    • +
    • [Fix] retrieving category rows in index.php (Bug #90)
    • +
    • [Fix] improved index performance by determining the permissions before iterating through all forums (Bug #91)
    • +
    • [Fix] Better handling of short usernames within the search (bug #105)
    • +
    • [Fix] Send a no-cache header on admin pages as well as normal board pages (Bug #149)
    • +
    • [Fix] Apply word censors to the message when quoting it (Bug #405)
    • +
    • [Fix] Improved performance of query in admin_groups (Bug #753)
    • +
    • [Fix] Workaround for an issue in either PHP or MSSQL resulting in a space being returned instead of an empty string (bug #830)
    • +
    • [Fix] Correct use of default_style config value (Bug #861)
    • +
    • [Fix] Replace unneeded unset calls in admin_db_utilities.php - vanderaj
    • +
    • [Fix] Improved error handling in modcp.php
    • +
    • [Fix] Improved handling of forums to which the user does not have any explicit permissions - vanderaj
    • +
    • [Fix] Assorted fixes and cleanup of admin_ranks.php, now requires confirmation of deletions
    • +
    • [Fix] Assorted fixes and cleanup of admin_words.php, now requires confirmation of deletions
    • +
    • [Fix] Addition and editing of smilies can no longer be performed via GET, now requires confirmation of deletions
    • +
    • [Fix] Escape group names in admin_groups.php
    • +
    • [Sec] Replace strip_tags with htmlspecialchars in private message subject
    • +
    • [Sec] Some changes to HTML handling if enabled
    • +
    • [Sec] Escape any special characters in reverse dns - Anthrax101
    • +
    • [Sec] Typecast poll id values - Anthrax101
    • +
    • [Sec] Added configurable search flood control to reduce the effect of DoS style attacks
    • +
    • [Sec] Changed the way we create "random" values for use as keys - chinchilla/Anthrax101
    • +
    • [Change] Changed handling of the case where a selected style doesn't exist in the database
    • +
    • [Change] Changed handling of topic pruning to improve performance
    • +
    • [Change] Changed default forum permissions to only allow registered users to post in new forums
    • +
    -
      -
    • [Fix] Fixed MSSQL related bug in the update system
    • -
    • [Fix] Display "Return to" links on unwritable forums (Bug #14824)
    • -
    • [Fix] Mitigating different realpath() handling between PHP versions (fixing confirm box redirects)
    • -
    • [Fix] Fix signature editing - ability to remove signature (Bug #14820)
    • -
    • [Fix] Send correct activation key by forcing reactivation for inactive user (Bug #14819)
    • -
    • [Fix] Adding correct IP for private messages sent by issuing warnings (Bug #14781)
    • -
    • [Fix] Open private message notification (Bug #14773)
    • -
    • [Fix] Fixing false new private message indicator (Bug #14627)
    • -
    • [Fix] Let newly activated passwords work if users were converted (Bug #14787)
    • -
    • [Fix] Quote bbcode fixes. Letting parse quote="[" and re-allowing whitelisted bbcodes within username portion (Bug #14770)
    • -
    • [Fix] Allow alternative text for styled buttons if images turned off, but CSS staying on
    • -
    • [Sec] Fix bbcode helpline display for custom bbcodes - this requires style changes for any custom style (Bug #14850)
    • -
    • [Fix] Correctly count announcements when filtering forums by date (Bug #14877)
    • -
    • [Fix] Allow charset names containing underscores or spaces
    • -
    • [Fix] Don't allow previous/next links for non-existing topics (Bug #15039)
    • -
    • [Change] Do not assign converted votes to the first option in a vote.
    • -
    • [Fix] Use correct RFC 2822 date format in emails (Bug #15042)
    • -
    • [Fix] Require founder status for some actions on founder-only groups (Bug #15119)
    • -
    • [Fix] Allow changing the "now" option of date CPFs (Bug #15111)
    • -
    • [Change] Some improvements to the caching of avatars
    • -
    • [Change] Set template recompilation to be disabled by default. All mod and style authors and all those who want to modify their styles should enabled it after installation.
    • -
    • [Change] Disable debug mode. All mod and style authors should enable DEBUG and DEBUG_EXTRA.
    • -
    • [Fix] Check error reporting level for all error level. This fixes a problem for hosts having manipulated the error handler. (Bug #14831)
    • -
    • [Feature] Constant PHPBB_DB_NEW_LINK introduced which can be used to force phpBB to create a new database connection instead of reusing an existing one if the dbms supports it (Bug #14927)
    • -
    • [Fix] Automatic URL parsing no longer allows dots in the schema but can parse URLs starting after a dot (Bug #15110)
    • -
    • [Fix] Dynamic width for birthday select boxes (Bug #15149)
    • -
    • [Fix] Recache Moderators when copying permissions. (Bug #15384)
    • -
    • [Fix] Propagate sort options in mcp_forums (Bug #15464)
    • -
    • [Change] Do not allow [size=0] bbcodes (font-size of 0)
    • -
    • [Fix] No duplication of active topics (Bug #15474)
    • -
    -

    1.iii. Changes since 3.0.RC6

    +

    l.v. Changes since 2.0.18

    -
      -
    • [Fix] Submitting language changes using acp_language (Bug #14736)
    • -
    • [Fix] Fixed wrong bbcode handling for forum rules, forum descriptions and group descriptions
    • -
    • [Fix] Fixed faulty form tokens (Bug #14725, #14762 and #14755)
    • -
    • [Fix] Fixed bbcode uid generation in the phpBB2 converter (Bug #14722)
    • -
    • [Fix] Able to request new password (Bug #14743)
    • -
    +
      +
    • [Fix] corrected index on session keys table under MS SQL
    • +
    • [Fix] added session keys table to backup
    • +
    • [Fix] delete session keys entries when deleting user
    • +
    • [Fix] changes to support MySQL 5.0
    • +
    • [Fix] changes to some of the admin files to improve efficiency and remove a potential error condition when building the menu
    • +
    • [Fix] change truncation of username length in usercp_register.php - BFUK
    • +
    • [Fix] incorrect path to avatars in admin_users.php (Bug #667)
    • +
    • [Fix] fixed get_userdata to support correct sql escaping (non-mysql dbs) - jarnaez
    • +
    • [Fix] fixed captcha for those not having the zlib extension enabled
    • +
    • [Change] Placed version information above who is online in admin panel for better visual presence
    • +
    • [Sec] fixed XSS issue (only valid for Internet Explorer) within the url bbcode
    • +
    • [Sec] fixed XSS issue if html tags are allowed and enabled
    • +
    • [Sec] added configurable maximum login attempts to prevent dictionary attacks
    • +
    -

    1.iv. Changes since 3.0.RC5

    -
      -
    • [Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.
    • -
    • [Feature] Constant PHPBB_ADMIN_PATH introduced, having the same purpose as PHPBB_ROOT_PATH, but for the ACP.
    • -
    • [Fix] Further fixing user profile view (please do not forget to update/refresh your template and style) (Bug #14230)
    • -
    • [Fix] Adjust google adsense bot information (Bug #14296)
    • -
    • [Fix] Fix horizontal scrollbar problem in IE6 (Bug #14228) - fix provided by Danny-dev
    • -
    • [Fix] Use correct size values in ACP user signature screen (Bug #13367)
    • -
    • [Fix] Attachment Place inline won't work with single quotes (Bug #14291)
    • -
    • [Fix] Unable to save email templates through ACP language page (Bug #14266)
    • -
    • [Fix] Correctly set user style for guest user (able to be changed within user management)
    • -
    • [Change] Moved note about dns_get_record function for using GTalk (Jabber) from Jabber log to Jabber ACP panel
    • -
    • [Fix] Do not use register_shutdown_function within cron.php if handling the queue and the mail function being used (Bug #14321)
    • -
    • [Fix] Fixing private message on-hold code if moving messages into folder based on rules (Bug #14309)
    • -
    • [Fix] Allow the merge selection screen to work (Bug #14363)
    • -
    • [Change] Require additional permissions for copying permission when editing forums
    • -
    • [Fix] Local magic URLs no longer get an additional trailing slash (Bug #14362)
    • -
    • [Fix] Do not let the cron script stale for one hour if register_shutdown_function is not able to be called (Bug #14436)
    • -
    • [Feature] Added /includes/db/db_tools.php file, which includes tools for handling cross-db actions such as altering columns, etc.
    • -
    • [Change] Reset the start parameter when the timeframe is changed in the mcp topic page (Ticket #14438)
    • -
    • [Change] Added Code for cleaning the confirm table to the session garbage collection
    • -
    • [Fix] Fixed token handling in jabber class for extremely spec-compliant XMPP server (Bug #14445)
    • -
    • [Fix] Disallowed galleries from using special characters (Bug #14466)
    • -
    • [Change] Listing the board url within the email text instead of appending it to the subject (Bug #14378)
    • -
    • [Fix] Always display the quote button as the most accessible one (this means edit is before quote in prosilver due to the way we lay out profiles)
    • -
    • [Fix] Use correct dimension (width x height) in ACP (Bug #14452)
    • -
    • [Fix] Only display PM history links if there are PM's to be displayed (Bug #14484)
    • -
    • [Feature] Added completely new hook system to allow better application/mod integration - see docs/hook_system.html
    • -
    • [Fix] Correctly delete excess poll options (Bug #14566)
    • -
    • [Fix] Allow names evaluating to false for poll options
    • -
    • [Change] use in-build functions for user online list (Bug #14596) - provided by rxu
    • -
    • [Fix] Fixing google cache display problems with Firefox (Bug #14472) - patch provided by Raimon
    • -
    • [Fix] Prevent topic unlocking if locked by someone else while posting (Bug #10307)
    • -
    • [Change] Allow years in future be selected for date custom profile field (Bug #14519)
    • -
    • [Fix] Don't display "Avatars Disabled" message on edit groups in UCP (Bug #14636)
    • -
    • [Change] Require confirm for deleting inactive users. (Bug #14641)
    • -
    • [Fix] Match custom BBCodes in the same way during first and second pass - patch provided by IBBoard (Bug #14268)
    • -
    • [Fix] Correct quote parsing if opening bracket before opening quote (Bug #14667)
    • -
    • [Fix] Clean post message for checking length to prevent posting empty messages
    • -
    • [Fix] Display jumpbox if needed for functionality (Bug #14702)
    • -
    • [Feature] Added an option to enforce that users spend a configurable amount of time on the terms page during registration
    • -
    • [Fix] Fixed copy permissions box in the ACP
    • -
    • [Fix] Enforce types for the user table during conversions
    • -
    • [Sec] Fixing possible XSS through compromised WHOIS server (#i63, #i64)
    • -
    • [Sec] Missing access control on whois in viewonline.php (#i51)
    • -
    • [Sec] Encoding some variables within user::page array correctly (to cope with browser not doing it correctly) to prevent XSS through functions re-using them (#i61)
    • -
    • [Sec] Fixed XSS through memberlist search feature (#i62)
    • -
    • [Sec] Fixed XSS through colour swatch (#i65)
    • -
    • [Sec] Fixed insecure attachment deletion (#i53)
    • -
    • [Sec] Only allow whitelisted protocols in meta_redirect/redirect (#i66)
    • -
    • [Sec] Check file names to be written in language management panel (#i52)
    • -
    • [Sec] Deregister globals if ini_get has been disabled (#i112)
    • -
    • [Sec] Added form tokens to most forms to enforce a lighter variant of CSRF protection (#i91 - #i96)
    • -
    • [Sec] Use new password hash method for forum passwords (#i43)
    • -
    • [Sec] Changed download file location to prevent flash crossdomain policies taking effect (#i8)
    • -
    • [Sec] Do not allow autocompletion for password on admin re-authentication (#i41)
    • -
    • [Sec] Made sure users are not completely locked out if they have a GLOBALS cookie (#i101)
    • -
    • [Sec] Use the secure hash to generate BBCODE_UIDs (#i71)
    • -
    • [Sec] Increase the length of BBCODE_UIDs (#i72)
    • -
    • [Sec] New password hashing mechanism for storing passwords (#i42)
    • -
    +

    l.vi. Changes since 2.0.17

    -

    1.v. Changes since 3.0.RC4

    +
      +
    • [Fix] incorrect handling of password resets if admin activation is enabled (Bug #88)
    • +
    • [Fix] wrong topic redirection after login redirect (Bug #94)
    • +
    • [Fix] improved handling of username lists in admin_ug_auth.php (Bug #98)
    • +
    • [Fix] incorrect removal of bbcode_uid values if bbcode has been turned off (Bug #100)
    • +
    • [Fix] correctly preview signature if editing other users posts (Bug #101)
    • +
    • [Fix] incorrect alt tag on generated search images in groupcp.php, viewtopic.php and usercp_viewprofile.php (Bug #102)
    • +
    • [Fix] consistent forum ordering in all dropdown boxes (Bug #106)
    • +
    • [Fix] correctly get compression status in page_tail.php and page_footer_admin.php (Bug #117)
    • +
    • [Fix] set page title on summary page of groupcp.php (bug #125)
    • +
    • [Fix] correctly test style and avatar in usercp_register.php (bug #129 and #317)
    • +
    • [Fix] handling of reactivation notifications if admin activation is enabled (Bug #145)
    • +
    • [Fix] handling of both forms of translation information used in language packs (Bug #159)
    • +
    • [Fix] key length for activation keys fixed in usercp_sendpassword.php (Bug #171)
    • +
    • [Fix] use GENERAL_MESSAGE constant in message_die instead of MESSAGE (Bug #176)
    • +
    • [Fix] incorrect handling of move stubs (Bug #179)
    • +
    • [Fix] wrong mode_type in memberlist (Bug #187)
    • +
    • [Fix] SQL errors when setting maximum PMs to 0 (Bug #188)
    • +
    • [Fix] removed unused variable from topic_notify email template (Bug #210)
    • +
    • [Fix] removed unset variable from smilies popup window title (Bug #224)
    • +
    • [Fix] removed duplicate template assignment from admin_board.php (Bug #226)
    • +
    • [Fix] incorrect search link for guest posts in modcp.php (Bug #254)
    • +
    • [Fix] all users removed from topics watch table on special occassions (Bug #271)
    • +
    • [Fix] correctly check returned value from strpos in append_sid function (Bug #275)
    • +
    • [Fix] correctly display username in private message notification (Bug #278)
    • +
    • [Fix] fixed "var-by-ref" errors (Bug #322)
    • +
    • [Fix] changed redirection to installation (Bug #325)
    • +
    • [Fix] added timout of 10 seconds to version check (Bug #348)
    • +
    • [Fix] fixed user_level default in postgresql schema file (Bug #444)
    • +
    • [Fix] multiple minor HTML issues with subSilver
    • +
    • [Change] deprecated the use of some PHP 3 compatability functions in favour of the native equivalents
    • +
    • [Change] added 60 days limit for grabbing unread topics in index.php
    • -
        -
      • [Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)
      • -
      • [Fix] Allow MS SQL to properly connect when using the mssql driver and PHP is less than either 4.4.1 or 5.1 (Bug #13874)
      • -
      • [Fix] Ignore files containing HTML special chars in the filenames as gallery avatars (Bug #13906)
      • -
      • [Fix] Multiple PM recipients not separated (Bug #13876)
      • -
      • [Change] Split the select list for the smilie order to clarify which are feasible and which are not (Bug #13911)
      • -
      • [Fix] Convert empty homepage fields (Bug #13917)
      • -
      • [Fix] Use board default DST setting on creating new profiles (Bug #11563)
      • -
      • [Feature] New constant PHPBB_EMBEDDED can be used to let phpBB not call exit; if wrapped/embedded (We may re-check this constant on other code locations later too)
      • -
      • [Feature] append_sid() having a check for the function append_sid_phpbb_hook(). This function is called in favour of append_sid() with the exact same parameters if present.
      • -
      • [Fix] Only list enabled modes within the dropdown at user administration (Bug #13883) - patch provided by damnian
      • -
      • [Fix] Properly display ban reason if selecting banned entries within the ACP (Bug #13896)
      • -
      • [Fix] Properly parse SQL expressions for Oracle (Bug #13916)
      • -
      • [Fix] Added label bindings to the custom profile fields in the ACP (Bug #13936) - patch provided by damnian
      • -
      • [Change] Made group avatar/rank changes more intuitive
      • -
      • [Fix] Give more feedback in icon/smilie management (Bug #13295)
      • -
      • [Fix] Correctly set user::lang_id (Bug #14010)
      • -
      • [Fix] Properly display the smiley export screen (Bug #13968)
      • -
      • [Feature] Add "DECIMAL:", "PDECIMAL", and "PDECIMAL:" to the schema creation code (Bug #13999) - patch provided by poyntesm
      • -
      • [Fix] Don't show the notify checkbox in the approval queue if the only posts are written by ANONYMOUS (Bug #13973)
      • -
      • [Fix] Redirect to bots management page on edit/add (Bug #14073)
      • -
      • [Fix] Display locked icon in viewforum/prosilver if forum locked (Bug #14009)
      • -
      • [Feature] Display message history in compose PM screen
      • -
      • [Change] Do not force login on visiting topic/forum from notification emails (Bug #13818)
      • -
      • [Fix] Fixed cron_lock value for cron execution. This bug led to users having problems with the email queue and other cron related issues.
      • -
      • [Fix] Prevent white pages on php notices with gzip compression enabled (Bug #14096)
      • -
      • [Fix] Propagate the cleaned identifier for CFPs (Bug #14072)
      • -
      • [Fix] Do not display NO_TOPICS message if viewing non-postable category (Bug #13489)
      • -
      • [Fix] Let the theme immediately expire if changed from ACP for at least 30 minutes after change
      • -
      • [Fix] Do not append hilit= in search if highlighting term is empty (Bug #13910)
      • -
      • [Fix] Return to last page after voting in viewtopic instead of first page in topic (Bug #13976)
      • -
      • [Fix] If sending PM's to groups only include activated member (Bug #14040)
      • -
      • [Fix] Correctly wrap words in emails containing utf8 characters (Bug #14109)
      • -
      • [Change] For new posts or editing the first post topic titles have a maxlength of 60 characters. For any subsequent posts the length is extended to 64 to make room for the Re: part, but cutting at 60 characters. The maxlength need to be 64, else users using opera are unable to post (opera does not allow pre-filling a field with more characters than specified within the maxlength attribute)
      • -
      • [Fix] Disable gzip compression for cached stylesheet for Internet Explorer 6 or empty browser (IE6 is not able to properly display the compressed stylesheet) (Bug #14054)
      • -
      • [Fix] Header icons fixed in FF for RTL languages (Bug #14084)
      • -
      • [Change] Words in topic titles and post subjects are highlighted on the search results page and viewtopic too now (Bug #13383)
      • -
      • [Fix] Made sure strip_bbcode cannot get the idea that a smiley is a BBCode (Bug #14030)
      • -
      • [Change] Added a filter for user objects to LDAP configuration and improved explanations (Bug #12627)
      • -
      • [Fix] Display searchable subforums of invisible parents in advanced search forum selection (Bug #11395)
      • -
      • [Fix] Allow line breaks in custom BBCodes (Bug #10758)
      • -
      • [Fix] Ordered BBcode parsing functions in the same way everywhere where they are used
      • -
      • [Fix] Prevent {URL} token in custom BBCodes from make_clickable messing (Bug #14151)
      • -
      • [Sec] Added alternative tokens to custom BBCodes which are safe for CSS/Javascript and changed TEXT token to entitise opening and closing parantheses.
      • -
      • [Fix] Convert 2.0 moderator posting permissions (Bug #14105)
      • -
      • [Fix] Correctly apply PM box limit of 0 to custom folder (Bug #14154)
      • -
      • [Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)
      • -
      +
    • [Sec] backport of session keys system from olympus
    • +
    • [Sec] fixed email bans to use the same pattern as email validation and allow wildcard domain bans
    • +
    • [Sec] fixed validation of topic type when posting
    • +
    • [Sec] unset database password once it is no longer needed
    • +
    • [Sec] fixed potential to select images outside the specified path as avatars or smilies
    • +
    • [Sec] fix globals de-registration code for PHP5 - (Stefan Esser/Matt Kavanagh)
    • +
    • [Sec] changed avatar gallery code sections to prevent possible injection points (AnthraX101)
    • +
    • [Sec] signature field is not properly sanitised for user input when an error occurs while accessing the avatar gallery (AnthraX101)
    • +
    • [Sec] check to_username and ownership when editing a PM (AnthraX101)
    • +
    • [Sec] fixed ability to edit PM's you did not send (depablo84)
    • +
    • [Sec] compare imagetype on avatar uploading to match the file extension from uploaded file
    • +
    -

    1.vi. Changes since 3.0.RC3

    +

    l.vii. Changes since 2.0.16

    -
      -
    • [Fix] Fixing some subsilver2 and prosilver style issues
    • -
    • [Fix] Parse error in MCP ban (Bug #13109)
    • -
    • [Fix] Correctly hide online status in the profile (Bug #13059)
    • -
    • [Feature] Let the user choose how to update modified files (merging, using new file or using old file) within automatic updater
    • -
    • [Fix] An extra \ in an Oracle SQL regex was corrected (Bug #13151)
    • -
    • [Fix] Added a missing global to get_file() (Bug #13149)
    • -
    • [Fix] Hide autologin box when autologin is disabled (Bug #13093)
    • -
    • [Fix] Account for the forum id not being part of the request uri in prosilver (Bug #13121)
    • -
    • [Fix] Properly alter PostgreSQL tables
    • -
    • [Fix] Properly cache template files that were stored in the database (Bug #12675)
    • -
    • [Fix] Do not count the deletion of an unapproved topic as a decrease in normally viewable posts (Bug #13167)
    • -
    • [Fix] Allow column_exists() to return true if the column exists but no data is in the table
    • -
    • [Fix] Allow setting the smiley order via the select. Also allow to add smileys at the top. (Bug #13199)
    • -
    • [Fix] Fix php notice on sending jabber messages (Bug #13201)
    • -
    • [Fix] Make the window showing file differences a little wider (Bug #13157)
    • -
    • [Fix] Preserve preview style on search form (Bug #13205)
    • -
    • [Fix] Place attachment filename in new line in posting editor (Bug #9726)
    • -
    • [Fix] Don't allow caching to occur in the update sequence (Bug #13207)
    • -
    • [Fix] Enforce the max password length for automatically generated password created by the password sender (Bug #13181)
    • -
    • [Fix] Handle phpinfo() when expose_php is false (Bug #12777)
    • -
    • [Fix] Allow managing of forum roles without global users (Bug #13249)
    • -
    • [Change] Do not run cron script if board is disabled
    • -
    • [Fix] Correctly destroy sql cache for some query combinations (Bug #13237)
    • -
    • [Fix] Allow link forums being password protected (Bug #12967)
    • -
    • [Fix] Allow wrapping topic/post icons in posting editor (Bug #12843)
    • -
    • [Fix] Display L_RANK only once in template if rank title and image defined (Bug #13231)
    • -
    • [Fix] Make sure selected transfer method exists before calling (Bug #13265)
    • -
    • [Fix] Correctly escape language keys in language editor (Bug #13279)
    • -
    • [Fix] Correctly hide post/reply buttons if permissions are not given (related to Bug #12809)
    • -
    • [Fix] Remove orphan/wrong permission entries for non-existent forums - self-repairing permissions if conversions went "crazy"
    • -
    • [Feature] Allow "older" updates applied with the automatic updater. This allows people using it for updating, say, from 3.0.0 to 3.0.1 (with the correct package of course) and then from 3.0.1 to 3.0.2 if the latest version at this time is 3.0.2. These changes take effect beginning with RC4 or people replacing install/install_update.php manually prior doing the updates.
    • -
    • [Fix] Present correct error message if user tries to edit already read private message (Bug #13271)
    • -
    • [Fix] Also display board disabled notice for admins/mods if board got disabled due to exceeding the load limit (Bug #13267)
    • -
    • [Fix] Correctly deliver avatar if readfile function has been disabled (Bug #13309)
    • -
    • [Fix] Display php information page with the correct direction (Bug #12557)
    • -
    • [Fix] Increased the number of style objects (styles, templates, themes and imagesets) possible from 127 to 65535 for MySQL (Bug #13179)
    • -
    • [Fix] Although theoretically impossible in our code, removed the chance of trying to open a file that does not exist (Bug #13327)
    • -
    • [Fix] Although theoretically impossible in our code, changed the handling of non-existent language files (Bug #13329, #13331)
    • -
    • [Fix] Removed extra ampersand from ACP link (Bug #13315)
    • -
    • [Fix] used cleaned up version of given field identification for pre-filling a new custom profile field (Bug #13319)
    • -
    • [Fix] Correctly convert 2.0 website profile fields. (Bug #13379)
    • -
    • [Fix] Fixed the "Alphanumeric" and "Alphanumeric and spacers" username selection limitations (Bug #13391)
    • -
    • [Fix] Make sure filelist() is only returning array types (Bug #13385)
    • -
    • [Fix] Correctly mark forums read if using cookie based topic tracking (Bug #13245)
    • -
    • [Change] Put custom profile fields into top box and signature into separate box in members profile view (Bug #13357)
    • -
    • [Fix] Only show moderator log entries for forums the user is having moderation rights in (Bug #12481)
    • -
    • [Feature] Show resulting permission alone in trace window (Bug #10952) - thanks to dark/rain for the proposal
    • -
    • [Fix] Fixed bug in realpath replacement letting it actually work again
    • -
    • [Change] Try to be a bit more specific regarding global/local permission trace (Bug #11032)
    • -
    • [Fix] Fixed some strangeness in password validation due to mb_ereg()
    • -
    • [Fix] Subforums of a forum would overwrite the latest post information even if they did not contain the latest post (Bug #11931)
    • -
    • [Fix] Use global username display function on several places (Bug #11080, #11098) - patch by HoL
    • -
    • [Fix] Several viewonline fixes and feature changes. Also displaying the users browser in viewonline list to let the admin easier spot additional search bots, connected to a_user permission (Bug #11088) - patch and suggestions provided by HoL
    • -
    • [Change] u_viewprofile permission also affecting viewonline list now
    • -
    • [Fix] Do not display return to search link in prosilver if search is not allowed (Bug #11393)
    • -
    • [Fix] Use global url validation for img bbcode tag (Bug #11935)
    • -
    • [Fix] Added proper unicode support to style names (Bug #12165)
    • -
    • [Fix] Search result extract should not end in the middle of a multibyte character (Bug #11863)
    • -
    • [Fix] Missing localisation for an imageset no longer triggers a lot of "imageset refreshed" log messages (Bug #12027)
    • -
    • [Fix] Explain that themes which need parsing cannot be stored on the filesystem (Bug #11134)
    • -
    • [Fix] Normalize usernames
    • -
    • [Change] Improved utf8_clean_string with a more complete list of homographs and NFKC normalization
    • -
    • [Fix] Fixed error messages that ACP Database can give (Bug #13463)
    • -
    • [Fix] Fixed potential issues with databases that use tables names is uppercase
    • -
    • [Fix] Handle forum links/redirects within viewforum if no read permission given (to display login box or error message) (Bug #13467)
    • -
    • [Fix] Prevent changing postable forum having subforums to link forum without moving subforums out first
    • -
    • [Fix] Do not display version in admin template (Bug #13495)
    • -
    • [Fix] Allow manual specification of remote avatar dimensions if getimagesize is disabled (Bug #13531)
    • -
    • [Fix] Make viewonline use the session page's added forum parameter (Bug #13597)
    • -
    • [Fix] Correcting BBCode FAQ (Bug #11180)
    • -
    • [Fix] Make to/bcc line in view private message display consistent with other username displays in prosilver (Bug #11989)
    • -
    • [Fix] Send out activation email if admin activation is enabled and user activated through inactive users panel upon registration (Bug #12065)
    • -
    • [Change] Re-implemented All Yes/No/Never links in permission panels for easier changing all categories at once
    • -
    • [Change] Advanced permission link now "marked" if no role is assigned and custom permissions set. With this an admin can instantly see if the object is not set at all or having custom permissions, something you only saw if advanced permissions were viewed before.
    • -
    • [Fix] Change misleading custom BBCodes explanation, regarding tokens and useable template variables (Bug #12403, #5660)
    • -
    • [Feature] Ability to disable birthdays completely with new board features setting
    • -
    • [Fix] Fix disallowed username check (Bug #13511)
    • -
    • [Fix] Allow for unicode usernames to be pruned (Bug #13643)
    • -
    • [Fix] Do not copy forum permissions from self (Bug #13663)
    • -
    • [Fix] Allow for polls to work during preview (Bug #13657) - thanks to Thatbitextra
    • -
    • [Fix] Finer error conditions for sending IM messages (Bugs #13681, #13683)
    • -
    • [Fix] Add a confirmation for log deletion in the MCP (Bug #13693)
    • -
    • [Fix] Do not erase ranks and avatars when changing default groups (Bugs #13701, #13697)
    • -
    • [Fix] Limit author searches to firstpost, if selected (Bug #13579)
    • -
    • [Fix] Properly resync user post counts for users that have no posts (Bug #13581)
    • -
    • [Fix] Do not require space after , in smiley pak files (Bug #13647)
    • -
    • [Fix] Properly display the subscribe link in topic and forum display for Oracle (Bug #13583)
    • -
    • [Change] Add version number to ACP index (Bug #13703)
    • -
    • [Fix] Several fixes for custom profile fields on multi-lingual boards (Bugs #13763, #13527, #13525, #11515)
    • -
    • [Fix] Return to the mode previously selected after disaproving a post (Bug #13796)
    • -
    • [Fix] Cron now uses a locking variable to make sure it does not spawn too many webserver processes (Bug #12741)
    • -
    • [Fix] Cached stylesheet now supporting gzip compression
    • -
    • [Fix] Added link to inbox for deleted PMs (Bug #13813)
    • -
    • [Fix] Re-syncing the board stats also refreshes the newest user (Bug #13831)
    • -
    • [Feature] Ability to externally set $phpbb_root_path if wrapping phpBB3 by defining constant PHPBB_ROOT_PATH
    • -
    • [Fix] Implemented correct left/right floating within ACP in regard to RTL languages (Bug #13777)
    • -
    • [Fix] Fixing session problems when using MySQL strict mode in conjunction with very long browser agent string (Bug #13827)
    • -
    • [Fix] Disallow post/pm subjects entirely made up from non-printable chars and whitespaces (Bug #13800)
    • -
    • [Fix] Allow moving private messages from the sentbox (Bug #13791)
    • -
    • [Fix] Properly export localized imagesets
    • -
    • [Feature] Show the size of Firebird databases
    • -
    • [Fix] Show error when moving topic into a category via quickmod (Bug #11611)
    • -
    • [Fix] Allow Oracle to install on a database without specify the database name
    • +
        +
      • Added extra checks to the deletion code in privmsg.php - reported by party_fan
      • +
      • Fixed XSS issue in IE using the url BBCode
      • +
      • Fixed admin activation so that you must have administrator rights to activate accounts in this mode - reported by ieure
      • +
      • Fixed get_username returning wrong row for usernames beginning with numerics - reported by Ptirhiik
      • +
      • Pass username through phpbb_clean_username within validate_username function - AnthraX101
      • +
      • Fixed PHP error in message_die function
      • +
      • Fixed incorrect generation of {postrow.SEARCH_IMG} tag in viewtopic.php - reported by Double_J
      • +
      • Also fixed above issue in usercp_viewprofile.php
      • +
      • Fixed incorrect setting of user_level on pending members if a group is granted moderator rights - reported by halochat
      • +
      • Fixed ordering of forums on admin_ug_auth.php to be consistant with other pages
      • +
      • Correctly set username on posts when deleting a user from the admin panel
      • +
      -
    +

    l.viii. Changes since 2.0.15

    -

    1.vii. Changes since 3.0.RC2

    +
      +
    • Fixed critical issue with highlighting - Discovered and fix provided by Ron van Daal
    • +
    • Url descriptions able to be wrapped over more than one line again
    • +
    • Fixed bug with eAccelerator in admin_ug_auth.php
    • +
    • Check new_forum_id for existence in modcp.php - alessnet
    • +
    • Prevent uploading avatars with no dimensions - Xpert
    • +
    • Fixed bug in usercp_register.php, forcing avatar file removal without updating avatar informations within the database - HenkPoley
    • +
    • Fixed bug in admin re-authentication redirect for servers not having index.php as one of their default files set
    • +
    -
      -
    • [Fix] Re-allow searching within the memberlist
    • -
    • [Fix] Force prune related values to integers during conversions
    • -
    • [Fix] Updater now detects successfully merged files having conflicts and user chose to merge with modifications (Bug #12685)
    • -
    • [Fix] Updater is no longer listing missing language entries and styles if these had been removed (Bug #12655)
    • -
    • [Fix] Correct approval of posts in global announcements (Bug #12699)
    • -
    • [Sec] Do not allow setup spiders/robots to post, even if permissions are given. We see no reason why this should be possible. (Thanks to Frank Rizzo for convincing us regarding this)
    • -
    • [Sec] Do not display the last active column within the memberlist if u_viewonline permission is not given (Bug #12797)
    • -
    • [Fix] Display custom profile field "date" based on users language (Bug #12787)
    • -
    • [Fix] Allow adding of help language files within subdirectories (Bug #12783)
    • -
    • [Fix] Correctly apply smileys on posting having # within their emotion code
    • -
    • [Fix] Correctly convert smileys having double quotes within their emotion code (Bug #12731)
    • -
    • [Fix] The converter now adds the protocol to user website profile fields missing it (Bug #12819)
    • -
    • [Fix] Correctly escape banned ip/email using wildcard for ban check (Bug #12815)
    • -
    • [Fix] Fixed some very nasty opera bugs (dropdown list bug, cpu spike bug) (Bug #12763, #11609)
    • -
    • [Fix] Font colour list having the correct height in IE (Bug #9571)
    • -
    • [Feature] Added mark/unmark all links to the bots page (Bug #12461)
    • -
    • [Fix] Introduced check on duplicate usernames during bot creation/edit (Bug #12461)
    • -
    • [Fix] Allow multibyte letters for smilie codes(Bug #12321)
    • -
    • [Fix] Correctly chmod created cache files (Bug #12859)
    • -
    • [Fix] Use our global expression for checking email syntax in memberlist (Bug #12827)
    • -
    • [Fix] Correctly retrieve/refresh templates stored in database if using subdirectories within template directory (Bug #12839)
    • -
    • [Fix] Correctly translate special group names in ucp_groups.php (Bug #12597)
    • -
    • [Fix] Search boxes not loosing session id (changing method from get to post) (Bug #12643)
    • -
    • [Fix] Make sure the automatic update is also working for those having fsockopen disabled
    • -
    • [Fix] Simulate recache of theme data on automatic update finished page - recaching it if css data changed
    • -
    • [Feature] Allow dropping in custom "info_[module class]_*.php" files to language/*/mods directory for inclusion into the menu structure without the need to modify phpBB language files for menu placements
    • -
    • [Fix] Added login box to egosearch (Bug #12941)
    • -
    • [Fix] Deal with slashed quotes during quote bbcode conversion (Bug #12607)
    • -
    • [Fix] Minor language and style fixes (Bugs #12235, #12493, #11949)
    • -
    • [Feature] Added backlinks to mcp_report (Bug #12905)
    • -
    • [Fix] Only check usernames in guest posts upon edit (Bug #11349)
    • -
    • [Fix] Consider viewonline permission when viewing friends/foes (Bug #12955)
    • -
    • [Fix] Added proper unicode support to ban reasons (Bug #12947)
    • -
    • [Fix] The forum/topic sync code now recognizes other ways that the latest post in a topic can be expressed (Bug #12947) - patch provided by APTX
    • -
    • [Fix] Topic deletion via the user post deletion mechanism did not take into account statistics for forums that hold shadow topics (Bug #12981)
    • -
    • [Fix] Allow for negative and decimal numbers to be in transposed queries in the Oracle and Firebird DBAL (Bug #13033)
    • -
    • [Fix] Some jabber related bugs (Bug #12989, #11805, #11809)
    • -
    • [Fix] Added UTF-8 support for banning via the MCP (Bug #13013)
    • -
    • [Fix] Properly detect the script name in session::extract_current_page() if PHP_SELF is not defined (Bug #12705) - patch provided by ToonArmy
    • -
    • [Fix] Show role mask for global permission class under Permissions->Permission Roles (Bug #13057)
    • +

      l.ix. Changes since 2.0.14

      -
    +
      +
    • Fixed moderator status removal in groupcp.php
    • +
    • Removed newlines after ?> on some files - Thoul
    • +
    • Added admin re-authentication (admin needs to login seperatly to access the ACP) - backported from Olympus
    • +
    • Fixed vulnerability in url/bbcode handling functions - PapaDos and Paul/Zhen-Xjell from CastleCops
    • +
    • Fixed issue in admin/admin_forums.php
    • +
    • Suppressed warning message for fsockopen in /includes/smtp.php - Thoul
    • +
    • Fixed bug in admin/admin_smilies.php (admin is able to add empty smilies) - Exy
    • +
    • Adjusted documents to reflect the urgent need to update the files too (not only running the database update script)
    • +
    • Updated the readme file
    • +
    • Added one new language variable
    • +
    • Added general error if accessing profile for a non-existent user
    • +
    • Changed session id generation to be more unique - Henno Joosep
    • +
    • Fixed bug in highlight code to escape characters correctly
    • +
    • Reversed the 2.0.14 fix for postgresql because it produced more problems than it solves.
    • +
    • Added reference to article written by R45 about case-sensitivity in postgreSQL to the readme file
    • +
    • Fixed bypassing of validate_username on registration - Yen
    • +
    • Empty url/img bbcodes no longer get parsed
    • +
    -

    1.viii. Changes since 3.0.RC1

    +

    l.x. Changes since 2.0.13

    -
      -
    • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
    • -
    • [Fix] Tiny language and grammar changes
    • -
    • [Fix] Several style related fixes, mainly fixing cross-browser issues
    • -
    • [Fix] Several RTL fixes within prosilver
    • -
    • [Fix] MCP looses forum_id in some panels (Bug #11255)
    • -
    • [Fix] Moderation queue used unfriendly notification of no posts/topics (Bug #11291)
    • -
    • [Fix] Array in Oracle DBAL not always set (Bug #11475)
    • -
    • [Fix] Improper continue; in acp_styles.php (Bug #11523)
    • -
    • [Fix] Imageset editor more friendly (Bug #11511)
    • -
    • [Fix] Made Custom BBCode validation more strict (Bug #11335)
    • -
    • [Fix] Proper sync of data on topic copy (Bug #11335)
    • -
    • [Fix] Introduced ORDER BY clauses to converter queries (Bug #10697)
    • -
    • [Fix] Stopped bots from getting added to the registered users group during conversion (Bug #11283)
    • -
    • [Fix] Filled "SMILIEYS_DISABLED" template variable (Bug #11257)
    • -
    • [Fix] Properly escaped the delimiter in disallowed username comparisons (Bug #11339)
    • -
    • [Fix] Check global purge setting (Bug #11555)
    • -
    • [Fix] Improper magic url parsing applied to already parsed [url=] bbcode tag (Bug #11429)
    • -
    • [Fix] Renamed two indicies for Oracle support (Bug #11457)
    • -
    • [Fix] Added support for ISO-8859-8(-i) in the character set convertor (Bug #11265, #12039)
    • -
    • [Fix] Added support for Oracle's "easy connect naming"
    • -
    • [Fix] Let Mark/Unmark All work in Manage Drafts (Bug #11679)
    • -
    • [Fix] Display correct message if no attachments found in user administration (Bug #11629)
    • -
    • [Fix] Let the "Delete all board cookies" being displayed for guests too (only prosilver) (Bug #11603)
    • -
    • [Fix] Do not display view topic link in MCP while there is no link present (Bug #11573)
    • -
    • [Fix] MySQL now properly sorts by post_subject (Bug #11637)
    • -
    • [Fix] Introduced checks to stop negative postcounts (Bug #11561, #11421)
    • -
    • [Fix] Allow IP v4/v6 urls for remote avatars (Bug #11633)
    • -
    • [Fix] Delete avatar files automatically (Bug #11631)
    • -
    • [Fix] Automatically add selected columns to group by statements in the converter (Bug #11465)
    • -
    • [Fix] Allow posts without subjects to be clicked in the MCP (Bug #11483)
    • -
    • [Fix] Sync the forums that shadow topics reside in when the topic that they point to is deleted
    • -
    • [Fix] Do not use the gen_random_string function to create cookie names during install (Bug #11431)
    • -
    • [Fix] Send stylesheet in style.php even without a valid session id (Bug #11531)
    • -
    • [Fix] request_var should strictly return the requested number of dimensions
    • -
    • [Fix] Correct assignment of custom width to $user->img(); / Correctly display poll bars in subsilver2 (Bug #11301)
    • -
    • [Fix] Allow removing polls in prosilver
    • -
    • [Fix] Correct link to post in managing users attachments (Bug #11765)
    • -
    • [Fix] Reload confirm screen for selecting new forum for global topic type change if not postable forum is chosen (Bug #11711)
    • -
    • [Fix] Correctly show system default color for disabled options in Internet Explorer which does not support disabled option fields
    • -
    • [Fix] Update query for custom profiles in user management used wrong order for left/right delimiter (affecting mssql) (Bug #11781)
    • -
    • [Fix] Inconsistent display of more smileys link fixed (Bug #11801)
    • -
    • [Fix] Outbox messages are no always neither new nor unread post-conversion (Bug #11461)
    • -
    • [Feature] Replaced outdated jabber class with the one from the flyspray project
    • -
    • [Feature] The converter no longer relies on the smiley ID to decide if it should be displayed on the posting page
    • -
    • [Change] Limit maximum number of allowed characters in messages to 60.000 by default. Admins should increase their PHP time limits if they want to raise this tremedously.
    • -
    • [Change] Some changes to the conversion documentation
    • -
    • [Fix] Only use permissions from existing forums during the conversion (Bug #11417)
    • -
    • [Fix] Do not permit the decimal as a valid prefix character (Bug #11967)
    • -
    • [Fix] Account for the fact that the IM fields might hold non-IM information
    • -
    • [Fix] Make the queue function on post details
    • -
    • [Fix] Check if there are active styles left before deleting a style
    • -
    • [Fix] Correctly update styles after the deletion of an imageset.
    • -
    • [Fix] Replaced jabber validation to use the method used by the new jabber class (Bug #9822)
    • -
    • [Sec] Adding confirm boxes to UCP group actions (ToonArmy)
    • -
    • [Feature] Added the option to disable the flash bbcode globally (DelvarWorld)
    • -
    • [Sec] Changed the embedding of Flash (NeoThermic, DelvarWorld)
    • -
    • [Fix] Use the signature setting for PMs (Bug #12001)
    • -
    • [Fix] Made the DBMS selection use language variables (Bug #11969)
    • -
    • [Fix] Make sure that a folder is used when viewing messages to oneself (Bug #12105)
    • -
    • [Fix] Account for the fact that a board might have no visible Admins (Bug #12185)
    • -
    • [Fix] Change group ranks even if empty (Bug #12231)
    • -
    • [Fix] Correctly propagate variables across the custom profile field wizard (Bug #12237)
    • -
    • [Fix] Correctly move pm's into folders if more than one is received (Bug #12135)
    • -
    • [Fix] Corrected various bugs with CPF on multi-language boards (Bug #11803)
    • -
    • [Fix] Disable notify checkbox in posting editor when board email is disabled (Bug #12263)
    • -
    • [Fix] Removed maxlength from password/username fields (Bugs #12215, #11797)
    • -
    • [Fix] Use icon-unsubscribe in prosilver (Bug #12211)
    • -
    • [Fix] Seperated PREVIOUS/NEXT language vars for pagination and next/previous step (Bug #12197)
    • -
    • [Feature] append_sid() supporting anchor (Bug #11535) - patch provided by Schumi and ToonArmy
    • -
    • [Fix] Remember selected language while registering after submit (Bug #11435)
    • -
    • [Fix] UTF-8 support in theme and template editors (Bug #12251)
    • -
    • [Fix] Allow for posts per page in the MCP to change during topic selection (Bug #12067)
    • -
    • [Fix] Remove group avatars upon deletion from all profiles, not just the people having the group as default (Bug #12275, #12267)
    • -
    • [Fix] Allow for conversions to SQLite (Bug #12279) - patch provided by ToonArmy
    • -
    • [Fix] Apply colours to guests (Bug #12219)
    • -
    • [Fix] Set the Admin group as founder_manage during conversion (Bug #12287)
    • -
    • [Fix] Fixed a special quote BBCode case (Bug #12189)
    • -
    • [Fix] Correctly parse BBCodes in a post when a poll is being used (Bug #11833)
    • -
    • [Fix] Remember attached files on PM edit (Bug #12019)
    • -
    • [Fix] Correctly display poll ending on preview (Bug #12303)
    • -
    • [Feature] Display the success message on posting longer for posts awaiting approval (Bug #12053)
    • -
    • [Fix] Display maximum and entered number of characters for the "maximum number of characters exceeded" error messages (Bug #11981)
    • -
    • [Fix] Wrongly applied setting for allowing links in private messages (used the signature setting instead of the post setting) (Bug #11945)
    • -
    • [Fix] Unread flag for multipage topic wrongly set under some conditions (Bug #12127) - fix provided by asinshesq
    • -
    • [Fix] Able to delete posts within user prune panel (Bug #11849)
    • -
    • [Feature] Allow to specify dimensions of images manually on imageset config (Bug #11675)
    • -
    • [Fix] Correctly re-assign query result id after seeking rows (MSSQL/Firebird) (Bug #12369)
    • -
    • [Feature] Make effect of a changed hideonline permission instantaneous
    • -
    • [Fix] Do not overwrite larger memory values in the installer (Bug #12195)
    • -
    • [Fix] Order forums on role permission mask (Bug #12337)
    • -
    • [Fix] Show "no image" image when a non-selectable item was selected in the acp imageset editor - IE (Bug #12423)
    • -
    • [Fix] Update session information without new pageload (Bug #12393, Bug #12441)
    • -
    • [Fix] Let polls be edited correctly (Bug #12433)
    • -
    • [Fix] Overcome Oracle's inability to handle IN() clauses with over one thousand elements (Bug #12449)
    • -
    • [Fix] Simulate Firebird's affected rows mechanism for older versions of PHP
    • -
    • [Fix] Custom BBCodes properly handle lowercasing of parameterized tags (Bug #12377)
    • -
    • [Fix] Update the forum_id sequence for PostgreSQL during conversion (Bug #11927)
    • -
    • [Fix] Allow for multiple tags containing URL and LOCAL_URL tokens (Bug #12473)
    • -
    • [Fix] Properly display forum list in the MCP Queue (Bug #11313)
    • -
    • [Fix] Use the localised guest name for quotes (Bug #12483)
    • -
    • [Fix] Added post anchor to links in default warning message (Bug #12489)
    • -
    • [Fix] Allow 5 digits in editing time fields (Bug #12489)
    • -
    • [Fix] MS SQL DBAL drivers now write over extension limitations, they are too low for most installations (Bug #12415)
    • -
    • [Fix] Fix sorting by author on "unanswered posts" (Bug #12545)
    • -
    • [Fix] Allow searching for multibyte authors (Bug #11793)
    • -
    • [Fix] Writing directories/files with correct permissions using FTP for transfers on PHP4
    • -
    • [Fix] Oracle sequences during conversions are now corrected (Bug #12555)
    • -
    • [Fix] Allow users to continue after selecting "No" in the merge quickmod confirmation (Bug #12577)
    • -
    • [Fix] Correctly check permissions on the UCP subscription/bookmark pages (Bug #12595)
    • -
    • [Fix] Only convert non-orphaned PMs
    • -
    • [Fix] Fixed a few Postgres related errors (Bug #12587)
    • -
    • [Feature] New DBAL wrapper for LIKE expressions / sql_like_expression()
    • -
    • [Sec] Stricter validation of language entries.
    • +
        +
      • Hardened author and keyword search a bit to not allow very server intensive searches
      • +
      • Fixed full path disclosure in bad word parsing
      • +
      • Resetting complete userdata array in session code if authentication fails
      • +
      • Fixed bug in moderator control panel where certain parameters could lead to an "error creating new session" sql error
      • +
      • Fixed bug in session code where empty page ids could lead to an "error creating new session" sql error
      • +
      • Fixed html handling in signatures if html is turned off globally
      • +
      • Fixed install.php problem with PHP5 register_long_arrays option turned off
      • +
      • Fixed potential issues with styling system
      • +
      • Added correct class to login_body template file
      • +
      • Removed file db/oracle.php from package
      • +
      • Removed version number from message body page in /admin (if user is not an admin) - mikelbeck
      • +
      • Fixed case-sensitivity issues in postgres7.php - R45
      • +
      -
    +

    l.xi. Changes since 2.0.12

    -
    +
      +
    • Ommitted preg_replace warning in viewtopic due to improper working of preg_quote in PHP - originally reported by matrix_killer, fix submitted by another party
    • +
    • Fixed high severity issue in session handling allowing everyone gaining administrator rights. Please update as soon as possible.
    • +
    • Minimum requirements raised to PHP 4.0.3 or above due to fixing vulnerability issues breaking PHP3 compatibility.
    • +
    - +

    l.xii. Changes since 2.0.11

    -
    -
    +
      +
    • Added confirm table to admin_db_utilities.php
    • +
    • Prevented full path display on critical messages
    • +
    • Fixed full path disclosure in username handling caused by a PHP 4.3.10 bug - AnthraX101
    • +
    • Added exclude list to unsetting globals (if register_globals is on) - SpoofedExistence
    • +
    • Fixed arbitrary file disclosure vulnerability in avatar handling functions - AnthraX101
    • +
    • Fixed arbitrary file unlink vulnerability in avatar handling functions - AnthraX101
    • +
    • Removed version number from powered by line
    • +
    • Merged database update files to update_to_latest.php file
    • +
    • Fixed path disclosure bug in search.php caused by a PHP 4.3.10 bug (related to AnthraX101's discovery)
    • +
    • Fixed path disclosure bug in viewtopic.php caused by a PHP 4.3.10 bug - matrix_killer
    • +
    -
    +

    l.xiii. Changes since 2.0.10

    -

    2. Copyright and disclaimer

    +
      +
    • Fixed vulnerability in highlighting code (very high severity, please update your installation as soon as possible)
    • +
    • Fixed unsetting global vars - Matt Kavanagh
    • +
    • Fixed XSS vulnerability in username handling - AnthraX101
    • +
    • Fixed not confirmed sql injection in username handling - warmth
    • +
    • Added check for empty topic id in topic_review function
    • +
    • Added visual confirmation mod to code base
    • +
    -
    -
    +

    l.xiv. Changes since 2.0.9

    -
    +
      +
    • Fixed deleting of styles in admin_styles.php
    • +
    • Fixed wrong unsetting of variables introduced in phpBB 2.0.9, making the board non-functional for users with specific php.ini settings
    • +
    • Added code to let phpBB work with PHP5 for those having register_long_arrays set to off (default settings) - running phpBB 2.0.x with PHP5 is not supported at http://www.phpbb.com.
    • +
    • Fixed bug in admin_board.php for board settings having single quotes in it
    • +
    • Fixed "search by author" in search.php. Now it is possible to search for users with special chars in their name too
    • +
    • Fixed forum jumpbox propagating session id in moderator control pages
    • +
    • Added check for newlines at redirecting pages, to prevent http response splitting attacks - Ory Segal and Amit Klein
    • +
    • Fixed visual confirmation code. The image was not created due to a wrong regular expression.
    • +
    -

    This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 phpBB Group, All Rights Reserved.

    +

    l.xv. Changes since 2.0.8

    -
    +
      +
    • Fixed one vulnerability in admin_board.php - Xore
    • +
    • Added checking for proper session id characters to sessions and viewtopic to prevent injections - Bartlomiej Korupczynski
    • +
    • Fixed injection vulnerabilities possible with linked avatars
    • +
    • Implemented unsetting globalised variables
    • +
    • Limited confirm switch to POST variable in posting
    • +
    • Changed IP code in common.php to prevent IP spoofing, which might introduce some problems with private IP Ranges showing up. - Wang Products
    • +
    • Updated visual confirmation mod [pre-edited files]
    • +
    • Moved obtaining word censors in modcp out of topic generation loop [increased performance/lower query count] - spotted by R45
    • +
    • Added the ability to link to https/ftps sites using the img bbcode tag
    • +
    • Fixed user online information in admin/index.php
    • +
    • Fixed getting group moderator in groupcp.php if running oracle backend - spotted by pakman
    • +
    • Fixed use of non-existing result variable in modcp (poster_id instead of user_id)
    • +
    • Fixed several vulnerabilities (XSS, SQL Injection and path disclosure) only possible with register_globals enabled - Matthew C. Kavanagh, Janek Vind
    • +
    • Fixed problem with SID not delivered to next page in groupcp.php
    • +
    - +

    l.xvi. Changes since 2.0.7

    -
    -
    +
      +
    • Fixed several vulnerabilities in admin pages
    • +
    • Fixed sid checking code in admin/pagestart.php
    • +
    • Fixed injection vulnerabilities possible with the img bbcode tag
    • +
    • Limited allowed images in img bbcode tag to jpg, jpeg, gif and png
    • +
    • Fixed redirect problems - 2.0.7a
    • +
    • Fixed sql injection vulnerability in search - 2.0.7a
    • +
    • Fixed sql injection vulnerability in privmsg - 2.0.8a
    • +
    + +

    1.xvii. Changes since 2.0.6

    + +
      +
    • Fixed several vulnerabilities in modcp - Robert Lavierck
    • +
    • Changed whois lookup address within admin index
    • +
    • Fixed potential vulnerability in viewtopic postorder - 2.0.6d
    • +
    • Updates to cope with Zend Optimizer 2.5 problems - 2.0.6d - jetset
    • +
    • Force specialcharing of redirect variable in login - Pit
    • +
    • Fixed potential vulnerability in viewtopic postdays - GulfTech Security Research
    • +
    • Fixed potential vulnerability in viewforum topicdays - GulfTech Security Research
    • +
    • Fixed potential vulnerability in modcp
    • +
    • Fixed potential vulnerability in avatar gallery
    • +
    + +

    1.xviii. Changes since 2.0.5

    + +
      +
    • Fixed various email issues
    • +
    • Fixed registration email bug with Administrator Confirmation used
    • +
    • Fixed mass emailer
    • +
    • Fixed long post time issue
    • +
    • Fixed bug with usernames containing single quotes
    • +
    • Fixed word list bug - Word boundaries were not considered
    • +
    • Fixed vulnerability in style admin
    • +
    • Fixed sql injection vulnerability in viewtopic
    • +
    • Fixed vulnerability allowing server side variable access in search - tendor
    • +
    • Fixed potential vulnerability in 2.0.5 login username entry - throw away/eomer
    • +
    • Fixed sql injection with reset date format field in profile - tendor
    • +
    + +

    1.xix. Changes since 2.0.4

    + +
      +
    • Removed user facing session_id checks
    • +
    • Fixed user self-activation after deactivation
    • +
    • Fixed incorrect functioning of phpbb_realpath
    • +
    • Fixed wrong path to database schema files within the upgrade script
    • +
    • Fixed double quote problem with username validation
    • +
    • Allow & within email addresses
    • +
    • Fixed email validation for banned email addresses
    • +
    • Removed underline from email domain validation
    • +
    • Fixed redirection for sentbox folder, installation and email
    • +
    • Fixed poll deletion
    • +
    • Fixed Mozilla navigation bar
    • +
    • Fixed URL bbcode parsing
    • +
    • Fixed database timeouts while searching the forums
    • +
    • Fixed wrong email return path in admin mass mailing - netclectic
    • +
    • Fixed MS-SQL failures within the update script
    • +
    • Fixed memberlist sort order
    • +
    • Fixed not showing leading spaces within Code BBCode
    • +
    • Fixed problem with adding double quotes to subject titles
    • +
    • Remove username input field from profile when user cannot change name
    • +
    • Fixed pagination error with highlighting
    • +
    • Fixed errors if no smilies are installed
    • +
    • Fixed CSS issues with IE 5.2 on MacOS X
    • +
    • Fixed missing sid propagation problem within the Moderator Control Panel
    • +
    • Fixed language variables within Authentication error output
    • +
    • Removed doubled CSS class definitions within input fields
    • +
    • Fixed username change within the Administration Panel
    • +
    • Added missing <tr> tags to index_body.tpl
    • +
    • Added missing username language variable to admin index page
    • +
    • Fixed moderator status update if a usergroup got deleted
    • +
    • Fixed poll handling upon post edit
    • +
    • Fixed remove common words from search table if post get pruned - Nuttzy99
    • +
    • Fixed behaviour on splitting topics if no checkbox is selected
    • +
    • Anonymous is no longer displayed within Username dropdown boxes
    • +
    • Fixed viewprofile redirection if an invalid mode was specified
    • +
    • Fixed fraction settings within determining common words - Novan
    • +
    • Prevent admin change usernames to his own within the ACP
    • +
    • Activation email is sent to all admins
    • +
    • Fixed conversion of & to &amp; in appropriate cases
    • +
    • Fixed display of "greater than topics per page" announcements preventing display of normal posts
    • +
    • Added variable checks to database backup and restore screen
    • +
    • Prevented pm popup window from resetting after visiting avatar gallery
    • +
    • Fixed special character handling with word censor
    • +
    • Added SID to jumpbox
    • +
    • Fixed problems with usernames using html special chars
    • +
    • Added GMT + 13 to English lang_main, all translators are encouraged to do likewise
    • +
    • Deleted doubled 'U_MEMBERLIST' assignment from page_header.php
    • +
    • Fixed wrong display of Signature Checkbox while editing Private Message
    • +
    • Fixed disappearing post text if emoticon was inserted directly after pressing a BBCode button
    • +
    • Display correct alt-tag for smilies within postings
    • +
    • Prevented the ability to apply BBCode to website contents
    • +
    • Fixed maxlength issue with password field in login_body.tpl
    • +
    • Fixed possible username duplication issue with validation and username length
    • +
    • Fixed split words function to handle additional foreign characters
    • +
    • Changed empty email To Field to use a non-disclosure delimiter
    • +
    • Fixed wrong language var in install.php - FTP Config screen
    • +
    • Fixed alt tag for locked topic images in viewforum_body.tpl
    • +
    • Fixed typo in groupcp.php - $lang['Unsub_success'] instead of $lang['Usub_success']
    • +
    • Fixed timezone display
    • +
    • Fixed wrong display of author quote tag within profile - Cl1mh4224rd
    • +
    • Added deletion of sessions of users whose account is deactivated
    • +
    • Added mail header X-MimeOLE to the emailer class
    • +
    • Prevent registration if user is logged in or user trying to register again
    • +
    • Prevent usage of char(255) in usernames
    • +
    • Added check for additional FORWARDED_FOR IP's - cosmos
    • +
    • Fixed handling of non-selection of option when voting
    • +
    • Fixed potential xss issue with memberslist mode
    • +
    • Default English support for visual confirmation - translators are encouraged to support this
    • +
    + +

    1.xx. Changes since 2.0.3

    + +
      +
    • Fixed cross-browser scripting issue with highlight param
    • +
    • Back-ported highlighting code from phpBB 2.2
    • +
    • Add session id validation to posting, profile, email, voting - Edwin van Vliet
    • +
    • Added {S_HIDDEN_FIELDS} template var to profile_send_email.tpl
    • +
    • Added "intval" fix for flood check, may resolve some issues
    • +
    • Added missing index to post_id for search_wordmatch
    • +
    • Fixed spelling error in search add words preventing use of stopword list
    • +
    • Fixed issue with search common words not being run
    • +
    • Introduce viewtopic resync patch by Ashe
    • +
    • Replace a for n in templating code
    • +
    • Fixed ordering in memberslist
    • +
    • Fixed group_id sequence issues with pgsql and msaccess
    • +
    • Fixed assumption of word censors in user notification
    • +
    • Fixed incorrect display of quotes in user management fields
    • +
    • Fixed entry of special chars in all profile fields - note this may cause temporary issues
    • +
    • Fixed incorrect display of quotes when using avatar gallery
    • +
    • Fixed missing username in email sent to users when admin activated
    • +
    • Added check for non-empty smiley code and url in smiley admin
    • +
    • Prevent display of -- sig seperator in emails when no board sig exists
    • +
    • Fixed URL propagated sid issues with jumpbox
    • +
    • Fixed wrong mode name check (polldelete) in functions_post
    • +
    • Added missing root path to l10n image path check
    • +
    • Remove validation of fields when deleting a user
    • +
    • Fixed sort mode select box in memberslist to default to current mode
    • +
    • Deny inline topic review listing to users without auth_read permissions
    • +
    • Prevent display of topic notification checkbox if user cannot read forum
    • +
    • Remove incorrect pre-pending of IP to uploaded avatars
    • +
    • Fixed deletion of uploaded avatars when changing to remote/gallery
    • +
    • Added check for non-blank line during install schema/basic sql ops
    • +
    • Added sort ordering to Top Ten poster listing by request
    • +
    • Fixed incorrect error report when altering case of username
    • +
    • Added jumpbox output to modcp {JUMPBOX} will now work
    • +
    • Fixed non-updating of users with MOD levels when deleting a forum
    • +
    • Remove email to group moderator when approving new members
    • +
    • Fixed non-handling of HTML in poll options
    • +
    • Fixed non-deletion of polls when deleting forum and its posts
    • +
    • Fixed moved shadow topic from being bumped upon reply
    • +
    • Changed field size of timezone to decimal(5,2) where applicable
    • +
    • Fixed missing sid append to URL when redirecting to newest reply
    • +
    • Fixed missing slashes in private IP preg check
    • +
    • Fixed session not setting userdata['user_id'] to ANON as appropriate
    • +
    • Added check for non-empty name in disallow admin
    • +
    • Fixed validation of SSL website addresses in profile
    • +
    • Fixed inability of admins to upload avatars via user admin panel
    • +
    • Fixed non-deletion of private message text upon full box overwrite
    • +
    • Fixed incorrect error message in smiley admin
    • +
    • Fixed incorrect alt-text for "Stop Watching Topic" image
    • +
    • Temporary fix for missing lang strings in forum admin - translators should update their packages if not done already
    • +
    • Use selected localisation during later stages of installation
    • +
    • Fixed non-check of permissions when deleting a topic via Moderator Control Panel
    • +
    • Fixed non-update of banlist upon user deletion
    • +
    • Check approved users boxes by default in usergroup approve form
    • +
    • Fixed non-appending of sid to backup meta refresh
    • +
    • Fixed non-notification of no support for certain databases in backup/restore
    • +
    • Added $images var to message die global declaration
    • +
    • Fixed wrong string, Private_message in Private Messaging
    • +
    • Add mail send result to error output
    • +
    • Fixed non-appending of sid to Mozilla nav bar menu items
    • +
    • Fixed incorrect profile linking from MSNM url in private messaging
    • +
    • Grammatical errors in English lang_main fixed - Cluster
    • +
    • Allow deletion of avatar and simultaneous upload/linking/gallery selection
    • +
    • Fixed non-updating of user rank when changing from special to normal rank in rank admin
    • +
    • Changed user topic notification default in schemas to 0 (off)
    • +
    • Fixed non-XHTML compliant img tags in privmsg.php
    • +
    • Fixed non-deletion of announcements and polls when removing forum contents in forum admin
    • +
    • Fixed non-pruning of watched topics table when pruning related topics
    • +
    • Enable GET redirect on logout
    • +
    • Added check for IE6.x to viewtopic ICQ indicator javascript
    • +
    • Fixed empty username quoting with MS-SQL
    • +
    • Fixed BBCode url, magic url and img tags to allow most chars beyond domain names
    • +
    • Prevent parsing of -ve size values in BBCode size tag
    • +
    • Back ported HTML handler from 2.2, this may impact some boards which allow complex HTML - existing parser remains but commented out
    • +
    • Fixed parsing of word censors to not censor words within < and > tag delimiters
    • +
    • Fixed database utilities failing to backup data with MySQL
    • +
    • Fixed signature parsing in User Admin
    • +
    • Fixed missing class="post" tags in subSilver Admin templates
    • +
    • Fixes for paths under Apache2
    • +
    • Added wrap text with tag support for posting in Mozilla 1.1+
    • +
    • Fixed use of missing CSS classes in modcp_split, group_info_body, error_body and agreement
    • +
    • Fixed ability of users to edit polls even after they have received votes
    • +
    • Fixed header Location to be absolute URL as per HTTP 1.1 spec - noted by PhilippK
    • +
    • Added additional session_id checks to MCP, topic subscription, PM and similar items
    • +
    • Fixed colour select box in posting_body to reset to Default colour after selection
    • +
    • Altered PM icon to show new image until messages have been read
    • +
    • Fixed incomplete deletion of PMs when removing the associated user
    • +
    • Fixed unread and new PM user counters to decrement appropriately in all situations
    • +
    • Fixed possible cross-site scripting issue with username search
    • +
    • Fixed some problems with gzip in combination with newer PHP versions and Mozilla
    • +
    • Fixed wrong maxlength in modcp_split.tpl subject field
    • +
    • Fixed inability to edit username of guest poster - vHiker
    • +
    • Fixed ability for guests to post with certain registered usernames
    • +
    • Fixed various HTML issues to improve XHTML compliance - Daz
    • +
    • Fixed missing template var {L_PM} for memberslist - Daz
    • +
    • Fixed wrong key name for $images['Topic_un_watch'] - Daz
    • +
    • Fixed missing template var {S_WATCH_TOPIC_IMG} for viewtopic - Daz
    • +
    • Fixed missing default constraints for post table under MSSQL
    • +
    • Fixed incorrect field size for forum pruning - preventing days > 256
    • +
    • Fixed continuing redirect issues for broken web servers, e.g. IIS+CGI PHP
    • +
    • Fixed inability to use ftp as a protocol for the [img] tag
    • +
    • Fixed incorrect handling of [img] tags containing %20 encoded spaces
    • +
    • Added check for . within cookie_name, change to _ if present
    • +
    • Added SHOW_ONLINE constant to limit "users online" code operation to index and viewforum
    • +
    • Added "temporary" workaround for Apache2 + PHP module ignoring "private" cache header
    • +
    • Added workaround for modcp IP lookup and links to Anonymous user profile
    • +
    • Fixed broken bbcode parsing of quotes containing bbcode in the "username"
    • +
    • Fixed excess slashes in [quote=""] first pass encoding
    • +
    • Fixed rendering issue with quote button under Mozilla - Daz
    • +
    • Grammatical errors in remaining core lang files fixed - Cluster
    • +
    • Fixed bbcode quote breaking when username contained ] before [
    • +
    • Fixed duplicate group_id error during upgrade of users from phpBB 1.x
    • +
    • Fixed stripslashes() problem with the conversion of the config table from phpBB 1.x
    • +
    • Rejiggled validation code, may eliminate "Username disallowed" issues
    • +
    • Fixed differing initial "public" setting of forum permissions between different files
    • +
    • Added check for invalid (non-compliant) email addresses to upgrade script
    • +
    • Further redirect workarounds for broken servers, please direct further issues to the vendors
    • +
    • Added GMT + 13 to English lang_main, all translators are encouraged to do likewise
    • +
    • Added switch to default_lang email template if user lang template no longer exists
    • +
    • Fixed javascript error when selecting smiley containing a single quote
    • +
    • Update users watched topic if a post they made is split into a new topic
    • +
    • Fixed situations where email templates contain incorrect or missing subject lines
    • +
    • Fixed error when searching for posts and no forums exist
    • +
    • Fixed potential SQL vulnerability with marking of private messages - Ulf Harnhammar
    • +
    + +

    1.xxi. Changes since 2.0.2

    + +
      +
    • Fixed potential cross-site scripting vulnerability with avatars - Showscout
    • +
    • Fixed potential SQL rewrite issue in page header - missing contrib
    • +
    • Fixed potential CSS/HTML rewrite on viewing in login - Marc Rees
    • +
    • Fixed (hopefully) issue with MS Access and multiple pages
    • +
    + +

    1.xxii. Changes since 2.0.1

    + +
      +
    • Fixed missing "username" lang variable in user admin template
    • +
    • Session work around for users behind rotating IPs - vHiker
    • +
    • Fixed potential session user_id re-write - Ashe
    • +
    • Fixed potential cross-browser scripting issue with BBCode URLs
    • +
    • Fixed potential gallery avatar exploit - Ashe
    • +
    • Fix sorting of smileys on each function call - Ashe/psoTFX
    • +
    • Clear topic_mod text output in viewtopic - Lars
    • +
    • Fix regex for avatar remote urls
    • +
    • Fix non-updating of user post counts when deleting whole topics
    • +
    • Increase time limit when sending topic reply notifications
    • +
    • Set default forum when splitting topics
    • +
    • Fix non-deletion of uploaded avatars when switching to gallery
    • +
    • Removed various closing newlines from included files
    • +
    • Add MAX_ROWS to HEAP table alter in install/upgrade - Ashe
    • +
    • Update username maxlength for subSilver templates
    • +
    • Allow ( and ) in BBCode [url] tags
    • +
    • Fix non-quoting of # in username validation regexs
    • +
    • Fix overlooked global var in private messaging
    • +
    • Possible fix for \r\n email templates issues
    • +
    • Fix missing str_replace for category title forum admin SQL
    • +
    • Fix trailing , when sending emails via smtp
    • +
    • Fix avatar issues in user admin
    • +
    • Fix improper checking of email address ban in sessions
    • +
    • Fix use of hard coded language strings in forum admin
    • +
    • Fix missing closing ) in smilies admin
    • +
    • Fix missing Username label in user admin
    • +
    • Fix upgrade.php bug where conversion would not complete (and updated other scripts to match the changes)
    • +
    • Fix problem with redirect and login.php
    • +
    • Fix typo that could cause problems with sorting in the memberlist
    • +
    • Fix emailer to allow sending emails with language-specific character sets
    • +
    + +

    1.xxiii. Changes since 2.0.0

    + +
      +
    • Fixed delete image bug for normal users
    • +
    • Fixed group control panel image links
    • +
    • Fixed missing L_POST variable in group control panel
    • +
    • Fixed missing user id when redirecting to email form after login
    • +
    • Fixed (a)ppend_sid function name error in group control panel
    • +
    • Fixed reset of post type when previewing a post
    • +
    • Fixed mass emailer include path error
    • +
    • Fixed potential SQL exploit
    • +
    • Fixed several minor subSilver issues
    • +
    • Fixed [quote] breaking HTML problem
    • +
    • Fixed problem with unclosed nested quotes
    • +
    • Fixed bad handling of automagic links at end of quotes
    • +
    • Fixed potential BBCode and avatar remote exploit
    • +
    • Altered email validation check to allow + in username as per RFC
    • +
    • Fixed incorrect behaviour with wildcards in disallowed usernames
    • +
    • Added missing append_sid for search view results as posts
    • +
    • Fixed incorrect clearing of current sessions for logged in users
    • +
    • Fixed user_timezone (cannot update user profile) problem
    • +
    • Added correct setting of moderator status for users during upgrade
    • +
    • Fixed handling of uploaded avatars if gallery avatar currently used
    • +
    • Fixed use of existing username for uploaded avatars
    • +
    • Fixed updating of topic reply stats when post is deleted
    • +
    • Fixed irrelevant error message when activating already active account
    • +
    • Fixed gzip compression problems with Netscape and some PHP versions
    • +
    • Fixed MS Access layer errors when using latest PHP versions
    • +
    • Fixed styles admin editing problems with MSSQL Server
    • +
    • Fixed logout issue when cancelling certain actions
    • +
    • Fixed missing text in certain admin links
    • +
    • Fixed opening of frame within frame when logging into admin
    • +
    • Fixed incorrect ordering of search results by time
    • +
    • Fixed fulltext searching failure with MS Access
    • +
    • Hopefully fixed fulltext search with non-latin single byte charsets
    • +
    • Enabled work-around support for some multi-byte charsets - OOHOO
    • +
    • Re-enabled search indexing of all-numeric character sequences
    • +
    • Updated email banning to properly implement wildcards
    • +
    • Fixed missing extension in links from groupcp
    • +
    • Fixed lack of re-validation when changing email address
    • +
    • Added additional IP check when using HTTP_X_FORWARDED_FOR
    • +
    • Fixed non-display of delete icon when on second or greater topic page
    • +
    • Fixed problems with users/groups assigned multiple permissions
    • +
    • Fixed problem with - and + in search words - Matthijs
    • +
    • Fixed improper handling for deletion of words from search table
    • +
    • Fixed support for , in automagic URLs as per RFC
    • +
    • Fixed circular reference SQL errors when deleting posts under MS Access
    • +
    • Fixed nested [code] problems
    • +
    • Added charset encoding headers for emails - romutis
    • +
    • Fixed "Copy to self" emails to use correct language
    • +
    • Fixed pagination error when limiting previous days for viewforum
    • +
    • Decreased minimum search word size to 3 chars
    • +
    • Fixed deletion of one or more options from all polls when editing just one
    • +
    • Fixed checking of group memberships when promoting/demoting group moderators
    • +
    • Added database closure to admin frameset page
    • +
    + +

    1.xxiv. Changes since RC-4

    + +
      +
    • Fixed improper report of general error when posting messages containing errors
    • +
    • Fixed post text being doubled up if it contained one or more < without closing >
    • +
    • Fixed pruning errors due to search function name change
    • +
    • Hopefully fixed various issues which led to incorrect reply and excess page counts
    • +
    • Fixed groupcp not displaying all email buttons to group moderator or admin
    • +
    • Fixed failure to display error notice when uploading oversized avatars
    • +
    • Hopefully corrected problem with viewonline displaying too few/many users online
    • +
    • Partially addressed issue with activation URLs >76 chars
    • +
    • Fixed additional search facilities failing to work or working incorrectly
    • +
    • Fixed search syntax highlighting
    • +
    • Addressed various webservers handling of page redirects
    • +
    • Fixed word censor not replacing first or last words
    • +
    • Fixed avatar height and width check for locally uploaded images
    • +
    • Hopefully fixed cache control header
    • +
    • Added check for PM box size limit of 0 to prevent div0 error
    • +
    • Fixed failure to fully delete PMs in outbox
    • +
    • Fixed display problem with polls
    • +
    • Fixed problem with guest username not being displayed for topic results in search
    • +
    • Fixed problem with quotes in various profile fields
    • +
    • Fixed schema problem with user_timezone
    • +
    • Fixed page display issue with MS Access
    • +
    • Fixed user level issue when altering user from user to admin and vice versa
    • +
    • Fixed incorrect parseing of some email templates
    • +
    • Reduced size of MS Access primer
    • +
    • Fixed various remaining usergroup display issues
    • +
    + +

    1.xxv. Changes since RC-3

    + +
      +
    • Addressed serious security issue with included files
    • +
    • Fixed non-use of database table prefix name during upgrade
    • +
    • Split functions and profile into separate modules
    • +
    • Fixed (hopefully) remaining issues with colourisation of moderator usernames
    • +
    • Updated install to include entry of additional, required, information
    • +
    • Fixed (hopefully) AOL incompatibilities
    • +
    • Fixed non-display of moderators in index/viewforum
    • +
    • Fixed group control panel 'no groups exist' problems
    • +
    • Fix HTTP_X_FORWARDED_FOR spoofing possibility
    • +
    • Fix ignoring of private range IP's in HTTP_X_FORWARDED_FOR
    • +
    • Enable multiple wildcard email banning, eg. *name*@somewhere.tld
    • +
    • Fix problems with posts being truncated if containing < and > characters
    • +
    • Prevent URL, BBCode and most smiley parseing in [code][/code]
    • +
    • Fix problems with use of certain reserved chars in word censor list
    • +
    • Fix default search useage to be as described (was doing AND by default)
    • +
    • Fix various avatar issues with profile, gallery and viewtopic
    • +
    • Enable safe mode support for uploading avatars
    • +
    • Fix broken modcp IP view issue
    • +
    • Fix potential session_id re-write vulnerability
    • +
    • Finish localisation of days and months (AM/PM are not and will not be localised in 2.0)
    • +
    • Remove link to external subSilver stylesheet from default subSilver templates
    • +
    • Handle TRANSACTIONS correctly in MySQL 3.x (by returning correct responses)
    • +
    • Fix checkbox resetting problem while previewing posts
    • +
    • Fix a login redirect issue
    • +
    • Remove some additional unused fields during upgrade
    • +
    • Fix (hopefully) remaining ICQ overlay issue with view profile in subSilver
    • +
    + +

    1.xxvi. Changes since RC-2

    + +
      +
    • Fixed infamous install parse error
    • +
    • Major update of posting and related search functions (fixing various issues and increasing speed)
    • +
    • Fixed display of author and last poster names when both are different guest users
    • +
    • Fixed upgrade stall issues (hopefully!) and improved output
    • +
    • Fixed highlighting code for viewtopic and search
    • +
    • Reduced size of several files and functions
    • +
    • Moved localised images to sub-directories
    • +
    • Improved user feedback of disallowed usernames
    • +
    • Fixed various MSSQL bugs
    • +
    • Fixed installation of MSSQL/MSSQL-ODBC
    • +
    • Fixed security issue with upgrade.php
    • +
    • Finished implemention of various additional features
    • +
    • Fixed various user, group and forum permissions problems
    • +
    • Fixed issues with BBCode [ and ] (hopefully!)
    • +
    • Fixed autologin problems with MS IIS
    • +
    • Hopefully fixed problems with URIs in emails on some server configs
    • +
    • Fixed 'blank' profile and DB utilities problems on submit
    • +
    • Fixed incorrect language being used in email subjects
    • +
    • Fixed issues with incorrect private message new/unread counts
    • +
    • Fixed various PostgreSQL related errors
    • +
    • Automatically forward users to login screen in more situations
    • +
    • AEnabled (coloured) online indication of moderators and admins
    • +
    • Enabled maximum online user count
    • +
    • Altered online user count to ignore duplicate IPs (will now underestimate rather than overestimate)
    • +
    • Enabled viewing of users browsing each forum
    • +
    • Fixed (hopefully) display of overlayed ICQ icon in Netscape using subSilver
    • +
    • Fixed display of guest usernames for last post and author
    • +
    • Hidden usergroups are now completely hidden from view
    • +
    + +

    1.xxvii. Changes since RC-1

    + +
      +
    • Fixed numerous PostgreSQL related issues
    • +
    • Significant updates and additions to the upgrade script
    • +
    • Various (missed) hard coded language strings fixed
    • +
    • Fixed viewforum error when no forum id specified
    • +
    • Fixed old constant name useage in search system
    • +
    • Fixed display of moved posts when viewing unanswered posts
    • +
    • Fixed failure of search for user and keyword when displaying as posts
    • +
    • Fixed PM popup notification
    • +
    • Fixed view more emoticon session page problem
    • +
    • Fixed view profile email links
    • +
    • Fixed display of websites in profile
    • +
    • Fixed backup database failure
    • +
    • Fixed MS Access schema error when posting topics
    • +
    • Fixed problem with hypenated/dotted DB names in MySQL 3.23.6+
    • +
    • Various other fixes and updates
    • +
    + +

    1.xxviii. Changes since RC-1 (pre)

    + +
      +
    • Upgrade script completed for initial fully functional release
    • +
    • Sessions code updated
    • +
    • Mark read code updated and hopefully fixed
    • +
    • Significant changes to properly deal with \' for non-MySQL boards
    • +
    • mssql, msaccess and mssql-odbc DB classes re-written
    • +
    • Avatar issues addressed and fixed
    • +
    • Search (INSERT) bug using MySQL fixed
    • +
    • Search highlighting issues addressed
    • +
    • Search own/other users posts fixed
    • +
    • BBCode fixes for magic URIs and other issues
    • +
    • Template updates for subSilver
    • +
    • User and group permissions problems fixed
    • +
    • Forum management problems (deletion of forum causing category not to display) fixed
    • +
    • Pagination problem with groupcp fixed
    • +
    • Backslash issues with posting and profile fixed
    • +
    • Backslash issues with emails fixed
    • +
    • preg_quote problems fixed
    • +
    • User management updated with full avatar control and missing fields
    • +
    • Private messaging box limits fixed
    • +
    • Private messaging ?folder= strangeness fixed
    • +
    • Forum pruning code updated to cope with search system
    • +
    • Emoticon system in posting updated
    • +
    • BBCode FAQ link added to posting form
    • +
    • Language file updates to address concerns of translators
    • +
    • Various other bug fixes and updates
    • +
    + +

    Note that a full list of fixed bugs can be found at the bug tracker (see section on bug reporting here)

    + +

    2. Copyright and disclaimer

    + +

    This application is opensource software released under the GPL. Please see source code and the Docs directory for more details. This package and its contents are Copyright © 2002 phpBB Group, All Rights Reserved.

    - - -
    - -
    - -
    +
    - \ No newline at end of file + diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html index ee92427530..fdffa82a0a 100644 --- a/phpBB/docs/FAQ.html +++ b/phpBB/docs/FAQ.html @@ -1,352 +1,208 @@ - - + + - - - - - - - - - - -phpBB3 • FAQ - - - + + +phpBB 2.0.x :: FAQ + + + - + + + + +
    + + + +
    -
    - - - - - -
    + + + + + +
    phpBB 2 : Creating CommunitiesphpBB 2.0.x FAQ
    +

    This is a very basic Frequently Asked Questions (FAQ) page which attempts to answer some of the more commonly asked questions. It is by no means exhaustive and should be used in combination with the 'built-in' User FAQ within phpBB2, the community forums (particularly the Tutorials forum) and our IRC channel (see README for details).

    -

    This is a very basic Frequently Asked Questions (FAQ) page which attempts to answer some of the more commonly asked questions. It is by no means exhaustive and should be used in combination with the 'built-in' User FAQ within phpBB3, the community forums and our IRC channel (see README for details).

    +
      -

      FAQ

      +
    1. I cannot install this it is too difficult! Will you do it?
    2. - - -
      - -

      I cannot install this it is too difficult! Will you do it?

      - -
      -
      - -
      - -

      Simple answer, no we will not. We are not being difficult when we say this we are actually trying to help you. phpBB has a reputation for being easy to install, that reputation is we believe well deserved. It is a simple process of unarchiving a single file, uploading the resulting directory/files to their intended location and entering some data in a web based form. The sequence of events, what to type where, etc. is covered in detail in the accompanying INSTALL.html documentation. If you cannot install phpBB3 the chances are you will be unable to administer or update it.

      +

      Simple answer, no we will not. We are not being difficult when we say this we are actually trying to help you. phpBB has a reputation for being easy to install, that reputation is we believe well deserved. It is a simple process of unarchiving a single file, uploading the resulting directory/files to their intended location and entering some data in a web based form. The sequence of events, what to type where, etc. is covered in detail in the accompanying INSTALL.html documentation. If you cannot install phpBB 2.0.x the chances are you will be unable to administer or update it.

      There are people, companies (unrelated to your hosting provider), etc. that will install your forum, either for free or for a payment. We do not recommend you make use of these offers. Unless the service is provided by your hosting company you will have to divulge passwords and other sensitive details. If you did not know how to use an ATM would you give a passer-by your bank card and PIN and ask them to show you what to do? No, probably not! The same applies to your hosting account details!

      -

      We think a better solution is for you to carefully read the enclosed documentation, read through our knowledge base at www.phpbb.com and if necessary ask for help on any thing you get stuck on. However, the decision is yours but please note we may not offer support if we believe you have had the board installed by a third party. In such cases you should direct your questions to that company or person/s.

      +

      We think a better solution is for you to carefully read the enclosed documentation, read our tutorials forum at www.phpbb.com and if necessary ask for help on any thing you get stuck on. However, the decision is yours but please note we may not offer support if we believe you have had the board installed by a third party. In such cases you should direct your questions to that company or person/s.

      -
      +
    3. How do I install this board on Lycos/coolfreepages/other free host?
    4. - +

      The old addage "You get what you pay for" is particularly true for hosting services! However if you must use a free service (and recognise its limitations) you will find details on common pitfalls in our tutorials forum at http://www.phpbb.com/phpBB/.

      -
      -
      +
    5. I am having problems with the admin at a certain board, help!
    6. +
    7. A board has ripped off my graphics/software/etc., stop them!
    8. +
    9. A board is dealing in warez/porn/etc., you need to prevent them doing this!
    10. -
      +

      We provide the software, we have absolutely nothing to do with any board that runs it (beyond phpbb.com of course!). The GPL grants the user an unlimited right of use subject to their adherence of that licence. Therefore we cannot prevent, dictate, control or otherwise limit the use of phpBB 2 software. So please do not contact us for such matters.

      -

      I am having problems with the admin at a certain board, help!
      -A board has ripped off my graphics/software/etc., stop them!
      -A board is dealing in warez/porn/etc., you need to prevent them doing this!
      -I want to sue you because i think you host an illegal board!

      +

      If you have a problem with a given board please take it up with them, not us. We are not and cannot be held legally responsible for any third party use of this software (much like Microsoft et al cannot be held responsible for the use of Windows in illegal activities, etc.). Additionally we do not track the use of phpBB software in any way. So please do not ask us for details on a "given" board we will not be able to help you. If any law firms or lawyers out there send us writs, Cease and Desist orders, etc. for third party website use of this software we reserve the right to charge for time wasted dealing with such issues ...

      -
      -
      +
    11. According to viewonline a user is doing/reading something they should not be able to!
    12. -
      - -

      We provide the software, we have absolutely nothing to do with any board that runs it (beyond phpbb.com of course!) and we also do not host any site. The GPL grants the user an unlimited right of use subject to their adherence of that licence. Therefore we cannot prevent, dictate, control or otherwise limit the use of phpBB software. So please do not contact us for such matters.

      - -

      If you have a problem with a given board please take it up with them, not us. We are not and cannot be held legally responsible for any third party use of this software (much like Microsoft et al cannot be held responsible for the use of Windows in illegal activities, etc.). Additionally we do not track the use of phpBB software in any way. So please do not ask us for details on a "given" board we will not be able to help you. If any law firms or lawyers out there send us writs, cease and desist orders, etc. for third party website use of this software we reserve the right to charge for time wasted dealing with such issues...

      - -
      - - - -
      -
      - -
      - -

      According to viewonline a user is doing/reading something they should not be able to!

      - -
      -
      - -
      - -

      No, they probably are not. phpBB uses sessions to keep track of users as they move between pages. The session information tells us who this user is. Therefore in order to determine what a user can do on a page we first need the session details. Once this data is available we can check whether the user is permitted to do whatever it is they are trying to do. This can result in it appearing as if a user is reading a topic in a forum they should not be able to access. Or perhaps viewing private messages when they are only guests, etc. In practice the user is not doing these things, they are viewing a "You are not permitted to do this" type message. The session data has simply been updated before we were able to determine what the user could or could not do.

      +

      No, they probably are not. phpBB uses sessions to keep track of users as they move between pages. The session information tells us who this user is. Therefore in order to determine what a user can do on a page we first need the session details. Once this data is available we can check whether the user is permitted to do whatever it is they are trying to do. This can result in it appearing as if a user is reading a topic in a forum they should not be able to access. Or perhaps viewing private messages when they are only guests, etc. In practice the user is not doing these things, they are viewing a "You are not permitted to do this" type message. The session data has simply been updated before we were able to determine what the user could or could not do.

      Of course this only applies where permissions have been set correctly!

      -
      +
    13. I keep getting Mail sending errors when I (or my users) post/send PM's/etc.!
    14. - - -
      -
      - -
      - -

      I keep getting Mail sending errors when I (or my users) post/send PM's/etc.!

      - -
      -
      - -
      - -

      This error will occur if phpBB cannot send mail. phpBB can send email two ways; using the PHP mail() function or directly via SMTP. Some hosting providers limit the mail() function to prevent its use in spamming, others may rename it or limit its functionality. If the mail() function got renamed, you are able to enter the correct name within the administration control panel. In either case you may need to make use of SMTP. This requires that you have access to such a facility, e.g. your hosting provider may provide one (perhaps requiring specific written authorisation), etc. Please see www.phpbb.com for additional help on this matter.

      +

      This error will occur if phpBB cannot send mail. phpBB can send email two ways; using the PHP mail() function or directly via SMTP. Some hosting providers limit the mail() function to prevent its use in spamming, others may rename it or limit its functionality. In either case you may need to make use of SMTP. This requires that you have access to such a facility, e.g. your hosting provider may provide one (perhaps requiring specific written authorisation), etc. Note that if your provider requires authorisation we only support the simple AUTH method using plaintext username/password. We do not support secure sockets layer (SSL), POP3 send or any other method. Please see http://www.phpbb.com/phpBB/ for additional help on this matter.

      If you do require SMTP services please do not ask (on our forums or elsewhere) for someone to provide you with one. Open relays are now things of the past thanks to the unthinking spammers out there. Therefore you are unlikely to find someone willing to offer you (free) services.

      -
      - - - -
      -
      - -
      - -

      My users are complaining that emails are not in their selected language!

      - -
      -
      - -
      +
    15. My users are complaining that emails are not in their selected language!
    16. You must have deleted a language pack or the language pack is incomplete. phpBB will try to send emails in the users selected language. If it cannot find a suitable email template it will switch to the boards default language.

      - +
    17. The first four letters of my text disappeared when I hit submit!
    18. -
      +

      Some forms in phpBB make use of arrays to "post" or submit data, e.g. polls, forum management, etc. A bug exists in PHP 4.2.3 (and perhaps older versions) which can cause such data to lose the first four characters of text. This bug is related to the presence of the mbstring module and certain compile time parameters (the problem exists for both compiled in and modular version of mbstring). Please see: http://bugs.php.net/bug.php?id=19460 for more details. Note the bug is fixed in PHP CVS and thus future versions should be immune. Remember, this is not a bug in phpBB 2.

      - +
    19. My AOL based users keep getting logged out!
    20. -
      -
      +

      phpBB2 uses sessions to keep track of users as they browse the board. These sessions use a combination of a unique session id and the users IP to identify each user. We make use of the IP as an extra safe-guard to help prevent sessions being hijacked (by discovering the unique session id).

      -
      +

      Unfortunately this only works when the users IP is constant as they browse the board. For most users this will be the case. However certain providers route their users via a cluster of proxys. In some cases, particularly AOL this results in different IPs being forwarded as the user moves between pages. We take account of this by not checking the entire IP but only the first "three quads". Again in most cases this will be fine. However again AOL uses IPs which can vary so much that checking only the first two quads results in a fairly static IP being available for session validation.

      -

      My AOL based users keep getting logged out!

      +

      If you are experiencing problems related to this you can make a small change to the code. Please note that reducing the IP validation length does potentially increase the risk of sessions being hijacked (this is something for you to consider, phpBB Group takes no responsibility should anything happen!). The change requires you to open the file sessions.php in the includes/ directory of the distribution. Find line 250, it contains the following

      $ip_check_s = substr($userdata['session_ip'], 0, 6);
      change this to:
      $ip_check_s = substr($userdata['session_ip'], 0, 4);
      You need to make exactly the same change to the number 6 in the next line. Save the file (and upload it if required). This should reduce or eliminate the problem noted.

      -
      -
      +
    21. I selected X for my timezone but the time is not correct!
    22. -
      +

      I suspect the time is correct but that you may have switched (locally) to daylight savings time. At present we do not support daylight savings only standard local times. Therefore during summer months (depending on whether your nation/state switches to daylight savings) the board times may appear to be one hour behind the real local time. The solution is to either put up with it (just let your users know) or to move the timezone of everyone who is affected (remember that not all your users may be from nations who have switched to daylight savings) on one hour, eg. GMT becomes GMT+1. This requires running some SQL and you should search our forums for information.

      -

      phpBB uses sessions to keep track of users as they browse the board. These sessions use a combination of a unique session id, the users IP and if specified the users browser and/or the users x-forwarded-for header to identify each user. We make use of all of this as an extra safe-guard to help prevent sessions being hijacked (by discovering the unique session id).

      +

      If this is not the case then I suspect your servers time is at fault. phpBB 2 stores all times in the form of a unix timestamp. This is a 32bit integer value containing the number of seconds since the unix epoch event, 1st January 1970 00:00:00 GMT. This value is global in nature and will be the same wherever you are in the world. So, if your time is incorrect and you have selected the appropriate timezone chances are your server time is off.

      -

      Unfortunately this only works when the users IP is constant as they browse the board. For most users this will be the case. However certain providers route their users via a cluster of proxys. In some cases, particularly the AOL browser, this results in different IPs being forwarded as the user moves between pages. We take account of this by not checking the entire IP by default but only the first "three quads" (A.B.C). Again in most cases this will be fine. However again AOL uses IPs which can vary so much that checking only the first two quads results in a fairly static IP being available for session validation.

      +
    23. I am seeing &#nnnn; sequences output instead of what I typed!
    24. -

      If you are experiencing problems related to this you can set the Session IP validation parameter found in Admin->General->Server Configuration->Security Settings to A.B. Please note that reducing the IP validation length does potentially increase the risk of sessions being hijacked (this is something for you to consider, phpBB Group takes no responsibility should anything happen!). We suggest to at least additionally enable the browser validation.

      +

      To enable compliance with HTML and XHTML specifications as well as enabling browsers to automatically support a users selected language we enable a charset tag to be output to the browser. This identifies the primary character set the user has selected, eg. iso-8859-1 for Western European languages (English, German, French, etc.), windows-1251 for Cyrillic alphabets (Russian, Bulgarian, etc.) and so on. The downside to doing this is that most modern browsers (such as Internet Explorer) convert any character not present in that character set into what are termed Numerical Character References or NCR's. These take the form of &#nnnn; where nnnn is the hexadecimal number of that characters UNICODE reference.

      -
      +

      Unfortunately PHP (which effectively supports only iso-8859-1 at this time) does not appear to attempt to process this data back into normal characters. Therefore phpBB treats them as text the user has entered and wishes to see. phpBB enables this by turning the & into &amp;. This results in the characters appearing as they do. Although we could ignore &#nnnn; (there are pro's and of course con's to doing so) at present we don't.

      - +

      If you are finding this to be problem the solution is to remove the

      charset={S_CONTENT_ENCODING}
      text from all the _header.tpl template files in all templates. The downside to this is a users browser will not automatically switch its charset to that selected by the user (however this is unlikely to be a big problem since users typically run their browser by default in the language they wish to use). Alternatively you can modify the $lang['ENCODING'] entry in the appropriate language file. Until PHP (and all browsers!) trully support UNICODE these problems will persist across all boards.

      -
      -
      +
    25. I cannot search for certain words! -
      +

      phpBB 2 uses a Fulltext search system, this has both advantages and disadvantages. The advantage is that on large or busy forums it has far less impact on server load than standard search methods as used by many alternative forums (including phpBB 1.x). The disadvantage is that to reduce the size of the database (every post is examined and unique words stored in a table) we have to limit the size and type of words we store. By default words must contain at least three characters but no more than 25, they must be either alpha or combinations of alpha and numerals (numbers alone are not stored). In addition all non-alphanumeric characters are removed, eg. _, +, -, etc. This is standard practice for fulltext search solutions.

      -

      No matter what I set the uploadable avatars to I cannot upload one from my computer!

      +

      A further downside is that non-latin alphabets, eg. Cyrillic, Greek, etc. require proper locale support to be compiled in and available on the server your board is running on. If this is not the case it is quite likely that words will not be properly indexed for storage. In many cases this can be recified by altering the setlocale(LC_ALL, '[LOCALE_HERE]'); statement in the appropriate language file. If you are experiencing problems you should change whatever is currently in place of [LOCALE_HERE] with the locale as available on your server. If you do not know this please ask your hosting provider. Some examples may be ru_RU.WIN_CP_1251 for the codepage used for the Russian translation, ko.KOI8 for Korean, etc.

      -
      -
      +

      Please note that support for multibyte character sets remains very limited in PHP4 and therefore Japanese, Chinese, etc. may have difficulty getting the fulltext search working correctly at all.

      -
      +
    26. My screen is filled with errors when I try to view the forum! -

      There are two possibilities here, the first is you have not created the directory you specified as the storage location for avatars, ie. as specified in the Admin -> General -> Board Configuration -> Avatar settings section. If the directory does not exist uploadeable avatars are automatically disabled. You should create the required directory (ensuring it has global write access or other appropriate permissions to allow the webserver to write files to it).

      +

      Are they errors? Are you sure they are not warnings? They probably are ... What you're seeing is PHP warn you about unset variables. Great care has been taken with phpBB 2.0 to ensure it is secure. Unset variables while being a potential security risk really shouldn't be in 2.0. Unfortunately some hosting providers have decided that any unset variables equal security problems and force PHP to output these warnings even though phpBB 2.0 is set to ignore them.

      -

      The second possibility is that your provider has disabled file_upload support. You should contact your provider and ask them if this is the case. There is not a lot you can do, there are still three other avatar settings left to choose from including uploading via an URL which will work fine.

      +

      We have worked some way toward checking and/or setting all variables before use but this will take time to complete (if it can be). Therefore I am afraid for the time being you will have to manually modify the code or ask your hosting provider to be more realistic with their setup.

    27. -
    +
  • How do I use the avatar settings? - +

    There are three types of avatar; upload, remote and local.

    +

      +
    • Upload types require you to create a directory (the default is images/avatars) and to set this to public read/write (ie. chmod a+rw), users can then upload avatars (subject to width, height and size limits definable by you).
    • +
    • Remote avatars allow the user to supply a URI pointing to an image available on the internet, PLEASE NOTE that size limits do not apply to remote avatars!
    • +
    • Local avatars allow you to upload your own avatars to a set directory, users can then pick from this avatar gallery. The default location for this is images/avatars/gallery. PLEASE NOTE that avatars are categorised according to sub-folders in this location! ie. you MUST place your avatars in subdirectories, eg. images/avatars/gallery/cartoons, images/avatars/gallery/real-life, etc.
    • +

  • -
    - +
  • No matter what I set the uploadable avatars to I cannot upload one from my computer! -
    +

    There are two possibilities here, the first is you have not created the directory you specified as the storage location for avatars, ie. as specified in the Admin->General Configuration->Avatars section. If the directory does not exist uploadeable avatars are automatically disabled. You should create the required directory (ensuring it has global write access or other appropriate permissions to allow the webserver to write files to it).

    -

    I just cannot get gallery avatars to appear!

    +

    The second possibility is that your provider has disabled file_upload support, possibly because of a recently found serious security issue with PHP before version 4.1.2. You should contact your provider and ask them if this is the case. It may be unrelated to the security issue and your provider has simply decided to disable such things in general. In either case I'm afraid there is not a lot you can do, there are still three other avatar settings left to choose from including uploading via a URL which will work fine

  • -
    -
    +
  • I just cannot get gallery avatars to appear! -
    +

    Chances are you have not followed our instructions above. phpBB 2 categorises gallery avatars and it does this by reading through folders contained in the location you specified as being the gallery path. For example, if you set the gallery path to "images/avatars/gallery" phpBB 2 will expect to find a series of folders within that path, eg. "images/avatars/gallery/moviestars", "images/avatars/gallery/cartoons", "images/avatars/gallery/misc", etc. Placing images directly in "images/avatars/gallery/" will result in nothing being listed in your gallery.

  • -

    phpBB categorises gallery avatars and it does this by reading through folders contained in the location you specified as being the gallery path. For example, if you set the gallery path to images/avatars/gallery phpBB will expect to find a series of folders within that path, e.g. images/avatars/gallery/moviestars, images/avatars/gallery/cartoons, images/avatars/gallery/misc, etc. Placing images directly in images/avatars/gallery/ will result in nothing being listed in your gallery.

    +
  • How do I set forum permissions? -
  • +

    You set forum permissions from the administration control panel -> Forums -> Permissions. This system has two modes of operation; Simple and Advanced. Simple uses a set of pre-defined authorisation levels, these set each type of authorisation setting to a specific level. Advanced settings allow you to specify individual levels for each operation in each forum. Experiment!

    - +
  • How do I set user and group permissions? -
  • - +

    These are set from Admin -> Users (Groups) -> Permissions. The system may appear strange but it's very powerful. When you look up a user or group it will give you basic information (at the top of the page) followed by the available forum listing and current settings for this user. You can assign moderator status to users and groups and if you have PRIVATE forums (or forums with any of their individual operations set to PRIVATE) you can also assign access.

    -
    +
  • How do I set a user (group) as moderator? -

    How do I use/set permissions?

    +

    See above

  • -
    -
    +
  • Why are there no entries in the user (group) permission "Allow Access" column? -
    +

    You can only allow (or deny) users access to PRIVATE forums, or forums which have one or more operations set to PRIVATE

  • -

    Please read the paragraph about permissions in our extensive online documentation.

    +
  • How come I cannot set "Vote" to ALL?
  • -
    +

    phpBB does not by default allow guest voting. This was done to prevent guest users (who cannot be reliably tracked) from voting time and time again in the same poll. There is a Mod available if you really need this feature, please see our Mod forums at http://www.phpbb.com/phpBB/.

    - +
  • I (or my users) cannot stay logged in to the forum! -
  • - +

    If you (or your users) are, after attempting a login, being returned to the index (or other page) without appearing to be logged in the most likely problem is incorrect cookie settings. phpBB 2 uses cookies to store a session id and a small amount of user data. For this data to be stored correctly the cookie domain, path and secure settings must be correct. You can check this in Admin->General Configuration->Cookie settings. Typically the cookie domain can be left blank and the cookie path set to / (a single forward slash). Do not set the cookie as being secure unless your board is running over a secure sockets layer connection, ie. https://

    -
    +

    If you still have problems try setting the cookie domain to your full domain name, eg. www.mysystem.tld, www.something.mydomain.tld. You must ensure the domain name contains at least two dots or browsers will be unlikely to recognise the cookie, eg. .mydomain.com, mydomain.com. Do not add http:// or anything else to the domain name!

    -

    I (or my users) cannot stay logged in to the forum!

    +
  • My users are complaining about being logged out too quickly! -
    -
    +

    You can increase the default length of sessions (ie. how long before a users session is considered 'dead') in Admin->General->Configuration->Cookie Settings->Session Length. Set it to whatever value your users feel comfortable with, remember that security issues may affect your decision (ie. having too long a session may allow non-users to abuse your board should a user forget to logout or otherwise leave a current session on a public workstation).

  • -
    +
  • I am having problems with HTML! -

    If you (or your users) are, after attempting a login, being returned to the index (or other page) without appearing to be logged in the most likely problem is incorrect cookie settings. phpBB uses cookies to store a session id and a small amount of user data. For this data to be stored correctly the cookie domain, name, path and secure settings must be correct. You can check this in Admin->General->Server Configuration->Cookie Settings. Typically the cookie domain can be left blank and the cookie path set to / (a single forward slash). Do not set the cookie as being secure unless your board is running over a secure sockets layer connection, ie. https://

    +

    If you want to allow your users to make use of HTML in posts you need to do two things. Firstly enable HTML in Admin -> General -> Configuration. Secondly to need to make sure that the tags your users will post are in the Allowed HTML Tags field (again Admin -> General -> Configuration). If users post using tags not on this list they won't be displayed as HTML! eg. to enable someone to post Flash you could add the embed tag to this field. Be careful which tags you allow, it is very easy to break the boards own output if the wrong tags are used in posts.

  • -

    If you still have problems try setting the cookie domain to your full domain name, e.g. www.mysystem.tld, www.something.mydomain.tld. You must ensure the domain name contains at least two dots or browsers will be unlikely to recognise the cookie, e.g. .mydomain.com, mydomain.com. Do not add http:// or anything else to the domain name!

    +
  • Can I suggest a feature for phpBB 3.0? -
  • +

    No, the feature list for phpBB 3.0 is now frozen and no new features will be added to that list. At the moment we do not accept new feature requests.

    + +

    If you wish to follow the progress of phpBB 3.0 you may like to visit our development forum to see how things are progressing:

    -

    My users are complaining about being logged out too quickly!

    +

    http://area51.phpbb.com/phpBB/

    -
    -
    +

    Please note that this forum should NOT be used to obtain support for or ask questions about phpBB 2.0.x, the main community forums are the place for this. Any such posts will be locked and go unanswered.

    -
    +
  • Why is phpBB 1.x faster than phpBB 2.0? -

    You can increase the default length of sessions (ie. how long before a users session is considered 'dead') in Admin->General->Server Configuration->Load Settings. Set it to whatever value your users feel comfortable with, remember that security issues may affect your decision (ie. having too long a session may allow non-users to abuse your board should a user forget to logout or otherwise leave a current session on a public workstation).

    +

    The original phpBB 1.0 saw a very large decrease in page generation times from version 1.0/1.2 to 1.4. This was achieved by rewriting many of the SQL queries and splitting the database. These changes came about from work on phpBB 2.0. With phpBB 2.0 we have introduced numerous additional functions and features, not least of which is full templating (the separation of page design from code). This results in a slowdown from phpBB 1.4, we suspect though that the new features will outweigh the small difference in page generation times.

  • -
    - +
  • My question isn't answered here! -
  • -
    +Feel free to search our community forum for the information you require. PLEASE DO NOT post your question without having first used search, chances are someone has already asked and answered your question. You can find our board here:

    -
    +

    http://www.phpbb.com/phpBB/

    -

    My question isn't answered here!

    + -
    -
    - -
    - -

    Please read our extensive user documentation first, it may just explain what you want to know.

    - -

    Feel free to search our community forum for the information you require. PLEASE DO NOT post your question without having first used search, chances are someone has already asked and answered your question. You can find our board here:

    - -

    www.phpbb.com

    - -
    - - - -
    -
    - -
    - -

    Copyright and disclaimer

    - -
    -
    - -
    - -

    This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 phpBB Group, All Rights Reserved.

    - -
    - - - -
    -
    +

    Copyright and disclaimer

    +

    This application is opensource software released under the GPL. Please see source code and the Docs directory for more details. This package and its contents are Copyright © 2002 phpBB Group, All Rights Reserved.

    - - - -
    - -
    +
    - + \ No newline at end of file diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 40ae50047b..533afac582 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -1,448 +1,259 @@ - - + + - - - - - - - - - - -phpBB3 • Install - - - + + +phpBB 2.0.x :: Install + + + - + + + + +
    + + + +
    -
    - - - - - -
    + + + + + +
    phpBB 2 : Creating CommunitiesphpBB 2.0.x INSTALL
    +

    Please read this document completely before proceeding with installation.

    -

    Please read this document completely before proceeding with installation, updating or converting.

    +

    Please note these instructions are not fully comprehensive, a more thorough userguide will be available on the phpBB website in the near future. However, this document will walk you through the basics on installing the forum software.

    -

    This document will walk you through the basics on installing, updating and converting the forum software.

    - -

    A basic overview of running phpBB3 can be found in the accompanying README file. Please ensure you read that document in addition to this! For more detailed information on using, installing, updating and converting phpBB3 you should read the documentation available online.

    - -

    Install

    - - +

    If you have basic knowledge of using FTP and are sure your hosting service or server will run phpBB 2 you can use these steps to quickly get started. For a more detailed explanation you should skip this and go to section 2 below.

    -
    +
      +
    1. Decompress the phpBB 2 archive to a local directory on your system.
    2. +
    3. Upload all the files contained in this archive (retaining the directory structure) to a web accessible directory on your server or hosting account. +
    4. Change the permissions on config.php to be writeable by all (666 or -rw-rw-rw- within your FTP Client)
    5. +
    6. Using your web browser visit the location you placed phpBB 2 with the addition of install/install.php, e.g. http://www.mydomain.com/phpBB2/install/install.php, http://www.mydomain.com/forum/install/install.php etc. +
    7. Fill out all the requested information and hit Submit
    8. +
    9. Change the permissions on config.php to be writeable only by yourself (644 or -rw-r--r-- within your FTP Client)
    10. +
    11. Click the Complete Installation button or revisit the location you entered above.
    12. +
    13. phpBB 2 should now be available, please MAKE SURE you read at least Section 8 below for important, security related post-installation instructions.
    14. +
    -

    1. Quick install

    +

    If you experienced problems or do not know how to proceed with any of the steps above please read the rest of this document.

    -
    -
    - -
    - -

    If you have basic knowledge of using FTP and are sure your hosting service or server will run phpBB3 you can use these steps to quickly get started. For a more detailed explanation you should skip this and go to section 2 below.

    - -
      -
    1. Decompress the phpBB3 archive to a local directory on your system.
    2. -
    3. Upload all the files contained in this archive (retaining the directory structure) to a web accessible directory on your server or hosting account.
    4. -
    5. Change the permissions on config.php to be writable by all (666 or -rw-rw-rw- within your FTP Client)
    6. -
    7. Change the permissions on the following directories to be writable by all (777 or -rwxrwxrwx within your FTP Client):
      - store/, cache/, files/ and images/avatars/upload/.
    8. -
    9. Using your web browser visit the location you placed phpBB3 with the addition of install/index.php or pointing directly to install/, e.g. http://www.mydomain.com/phpBB3/install/, http://www.mydomain.com/forum/install/ etc.
    10. -
    11. Click the INSTALL tab, follow the steps and fill out all the requested information.
    12. -
    13. Change the permissions on config.php to be writable only by yourself (644 or -rw-r--r-- within your FTP Client)
    14. -
    15. phpBB3 should now be available, please MAKE SURE you read at least Section 6 below for important, security related post-installation instructions.
    16. -
    - -

    If you experienced problems or do not know how to proceed with any of the steps above please read the rest of this document.

    - -
    - - - -
    -
    - -
    - -

    2. Requirements

    - -
    -
    - -
    - -

    phpBB3 has a few requirements which must be met before you are able to install and use it.

    +

    2. Requirements

    +

    Installation of phpBB2 requires the following:

    +
      +
    • A webserver or web hosting account running on any major Operating System
    • +
    • A SQL database system, one of:
        -
      • A webserver or web hosting account running on any major Operating System with support for PHP
      • -
      • A SQL database system, one of: -
          -
        • MySQL 3.23 or above (MySQLi supported)
        • -
        • PostgreSQL 7.3+
        • -
        • SQLite 2.8.2+
        • -
        • Firebird 2.0+
        • -
        • MS SQL Server 2000 or above (directly or via ODBC)
        • -
        • Oracle
        • -
        -
      • -
      • PHP 4.3.3+ (>=4.3.3, >4.4.x, >5.x.x, >6.0-dev (compatible)) with support for the database you intend to use.
      • -
      • getimagesize() function need to be enabled.
      • -
      • These optional presence of the following modules within PHP will provide access to additional features, but they are not required. -
          -
        • zlib Compression support
        • -
        • Remote FTP support
        • -
        • XML support
        • -
        • Imagemagick support
        • -
        • GD Support
        • -
        -
      • +
      • MySQL (3.22 or higher)
      • +
      • PostgreSQL 7.0.3 or higher (preferably 7.1.x or 7.2.x)
      • +
      • MS SQL Server (7 or 2000) directly or via ODBC
      • +
      • MS Access (2000 or XP) via ODBC
      +
    • +
    • PHP (4.0.3 and above) with support for the database you intend to use above
    • +
    -

    If your server or hosting account does not meet the requirements above we are afraid phpBB3 is not for you.

    +

    If your server or hosting account does not meet the requirements above I am afraid phpBB 2.0 is not for you.

    -
    +

    3. New Installations

    - +

    Installation of phpBB 2 will vary according to your server and database. If you have shell access to your account (via telnet or ssh for example) you may want to upload the entire phpBB 2 archive (in binary mode!) to a directory on your host and unarchive it there.

    -
    -
    +

    If you do not have shell access or do not wish to use it you will need to decompress the phpBB 2 archive to a local directory on your system using your favourite compression program, e.g. winzip, rar, zip, etc. From there you must FTP ALL the files it contains (being sure to retain the directory structure and filenames) to your host. Please ensure that the cases of filenames are retained, do NOT force filenames to all lower or upper case doing so will cause errors later.

    -
    +

    All .php, .inc, .sql, .cfg and .htm files should be uploaded in ASCII mode, while all graphics should be uploaded in BINARY mode. If you are unfamiliar with what this means please refer to your FTP client documentation. In most cases this is all handled transparantly by your ftp client but if you encounter problems later you should be sure the files where uploaded correctly as described here.

    -

    3. New installation

    +

    phpBB2 comes supplied with English as its standard language. However a number of seperate packs for different languages are available. If you are not a native English speaker you may wish to install one or more of these packages before continuing. The installation process below will allow you to select a default language from those available (you can of course change this default at a later stage). For more details of language packs, where to obtain them and how to install them please see the README.

    -
    -
    +

    Once all the files have been uploaded to your site you should point your browser at this location with the addition of install/install.php (please note that if you changed the extension from php, see Section 3.i below, you should alter install.php appropriately). For example if your domain name is www.mydomain.tld and you placed phpBB 2 in a directory /phpBB2 off your web root you would enter http://www.mydomain.tld/phpBB2/install/install.php into your browser. When you have done this you should see the phpBB 2 Installation screen appear.

    -
    +

    3.i. Changing the file extension

    -

    Installation of phpBB3 will vary according to your server and database. If you have shell access to your account (via telnet or ssh for example) you may want to upload the entire phpBB3 archive (in binary mode!) to a directory on your host and unarchive it there.

    +

    If the file extension used to execute PHP scripts on your server is NOT .php but for example .php3 or .phtml you should first rename ALL files ending in .php and change the value of $phpEx in extension.inc. In the vast majority of cases this step will be unncessary.

    -

    If you do not have shell access or do not wish to use it you will need to decompress the phpBB3 archive to a local directory on your system using your favourite compression program, e.g. winzip, rar, zip, etc. From there you must FTP ALL the files it contains (being sure to retain the directory structure and filenames) to your host. Please ensure that the cases of filenames are retained, do NOT force filenames to all lower or upper case doing so will cause errors later.

    +

    3.ii. Replacing an old phpBB 1.x install

    -

    All .php, .inc, .sql, .cfg, .html and .txt files should be uploaded in ASCII mode, while all graphics should be uploaded in BINARY mode. If you are unfamiliar with what this means please refer to your FTP client documentation. In most cases this is all handled transparantly by your ftp client but if you encounter problems later you should be sure the files where uploaded correctly as described here.

    +

    NOTE, you should NOT place phpBB 2 files into the same directory as any previous installation of phpBB 1.x! Create a new directory (or move your old phpBB 1.x out of the way), failure to do this will result in runtime errors.

    -

    phpBB3 comes supplied with english as its standard language. However a number of separate packs for different languages are available. If you are not a native english speaker you may wish to install one or more of these packages before continuing. The installation process below will allow you to select a default language from those available (you can of course change this default at a later stage). For more details of language packs, where to obtain them and how to install them please see the README.

    +

    3.iii. Installing on MySQL 3 and 4, PostgreSQL 7.x, MS SQL 7/2000 (inc. via ODBC)

    -

    Once all the files have been uploaded to your site you should point your browser at this location with the addition of install/. For example if your domain name is www.mydomain.tld and you placed phpBB3 in a directory /phpBB3 off your web root you would enter http://www.mydomain.tld/phpBB3/install/ or (alternatively) http://www.mydomain.tld/phpBB3/install/index.php into your browser. When you have done this you should see the phpBB3 Installation screen appear.

    +

    Before proceeding with installation you should ensure you have a database available. Most good hosting accounts now come with at least one database as part of the basic package although it may need to be setup before first use. Ask your provider for details if you are unsure whether you do or not. If you are running your own server and are unsure how to create a database you should refer to your SQL servers documentation or website, e.g. http://www.mysql.com/doc/, http://www.postgresql.org/users-lounge/, etc.

    -

    Introduction:

    +

    If your database server is MySQL PLEASE ensure you select the appropriate version from the dropdown box. Do NOT select MySQL 4.x if you have MySQL 3.x (the most common type) installed, if in doubt select MySQL 3.x.

    -

    The installation screen gives you a short introduction into phpBB. It allows you to read the license phpBB3 is released under (General Public License) and provides information about how you can receive support. To start the installation, use the Install button.

    +

    3.iv. Installing on MS Access 2000/XP

    -

    Requirements

    +

    Before you install phpBB 2 you need to create a Data Source Name or DSN. The exact way to do this will depend on your hosting provider, if you are unsure you should check with them before proceeding. In general though you should create a System DSN which points to the location where you have stored an unarchived copy of the ms_access_primer.mdb file (this is contained in the ms_access_primer.zip which can be found in install/schemas/). The name you give this DSN will be used during installation. Do not proceed until this step is complete!

    -

    The first page you will see after starting the installation is the Requirements list. phpBB3 checks automatically whether everything that it needs to run properly is installed on your server. You need to have at least the minimum PHP version installed, and at least one database available to continue the installation. Also important, is that all shown folders are available and do have the correct permissions. Please see the description of each section to find out whether they are optional or required for phpBB3 to run. If everything is in order, you can continue the installation with Start Install.

    +

    Please note that MS Access support is not designed for busy boards. If you anticipate more than one or two users being online at any given time you should upgrade to a more robust server solution.

    -

    Database settings

    +

    3.v. Entering required data

    -

    You now have to decide which database to use. See the Requirements section for information on which databases are supported. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:

    +

    Once you have reached the installation page you need to fill out several fields. Be sure to select the right database type! If you do not have or do not know the database name, database server, etc. please check with your hosting provider. For non-ODBC databases the database server is typically localhost but this is NOT universal! If you are using an ODBC based database (such as MS Access or MSSQL via ODBC) you should enter the DSN here (see 2.iv.).

    -
      -
    • The Database Type - the database you will be using.
    • -
    • The Database server hostname or DSN - the address of the database server.
    • -
    • The Database server port - the port of the database server (most of the time this is not needed).
    • -
    • The Database name - the name of the database on the server.
    • -
    • The Database username and Database password - the login data to access the database.
    • -
    +

    The database prefix allows you to enter a few characters, short name, etc. which all tables used by this installation will be prefixed with. The default (phpbb_) will usually be fine. However if you have more than one copy of phpBB 2 using the same database be sure to alter it or you will receive errors during installation.

    -
    -

    Note: if you are installing using SQLite, you should enter the full path to your database file in the DSN field and leave the username and password fields blank. For security reasons, you should make sure that the database file is not stored in a location accessible from the web.

    -
    +

    The remaining information is personal to you and your site. You will need to enter a username and password for the initial administration account (more administrators can be created later). The server name, server port and script path are essential because all emails containing URLs will use these values. The installer will guess initial values, however they may not be correct so be sure to check them!

    -

    You don't need to change the Prefix for tables in database setting, unless you plan on using multipe phpBB installations on one database. In this case you can use a different prefix for each installation to make it work.

    +

    Remember that a domain (or server) name does NOT include http://! Enter just the domain name, eg. www.mydomain.tld and NOT http://www.mydomain.tld/. The server port can, in the great majority of cases be left as 80, this is the standard http port. However if your web server listens to a different port because for example port 80 is blocked then alter this appropriately. The script path is the relative path from your webroot where phpBB 2 is installed, e.g. if you install phpBB 2 into phpBB 2/ in your webroot then enter phpBB 2 (or /phpBB 2/) as the script path.

    -

    After you entered your details, you can continue with the Proceed to next step button. Now phpBB3 will check whether the data you entered will lead to a successful database connection and whether tables with the same prefix already exist.

    +

    3.vi. Completing installation

    -

    A Could not connect to the database error means that you didn't enter the database data correctly and it is not possible for phpBB to connect. Make sure that everything you entered is in order and try again. Again, if you are unsure about your database settings, please contact your host.

    +

    Once you have checked all the data press submit. The installation script will create and populate all the necessary tables. It will then attempt to write to the config.php file which will contain the basic configuration data used to run phpBB 2. If the installer cannot write config.php directly you will be given the option of either downloading the file or even FTPing it to the correct location. If you choose to download you should then re-upload the file to your server, overwriting the existing config.php in the process. If you attempt to FTP via the install script you should supply the requested information. Should FTP fail you will be able to download the file and then re-upload as described earlier.

    -

    If you installed another version of phpBB before on the same database with the same prefix, phpBB will inform you and you just need to enter a different database prefix.

    +

    During the installation procedure phpBB 2 will check to ensure the relevant PHP database module is available and will not proceed if it cannot be found. Should this happen be sure to check you have selected the correct database and/or ask your hosting provider for advice.

    -

    If you see the Successful Connection message, you can continue to the next step.

    +

    Do not proceed untill the installation is completed and (if necessary) you have uploaded the config.php file.

    -

    Administrator details

    +

    4. Upgrade from phpBB 1.4.x

    -

    Now you have to create your administration user. This user will have full administration access and he/she will be the first user on your forum. All fields on this page are required. You can also set the default language of your forum on this page. In a vanilla phpBB3 installation we only include English. You can download further languages from www.phpbb.com, and add them before installing or later.

    +

    Before upgrading we heavily recommend you do a full backup of your database! If you are unsure how to achieve this please ask your hosting provider for advice. One you have backed up your database you should follow the basic instructions given for New Installations above. However instead of selecting Install as the Installation Method you should select Upgrade.

    -

    Configuration file

    +

    As with install the upgrade is automated. The config.php will be written automatically (if possible, else you will be able to download a copy as with New Installation above). Once the config.php is in place everything should proceed without error. Please note that this upgrading process may take quite some time and depending on your hosting provider this may result in it failing (due to web server or other timeout issues). If this is the case you should ask your provider if they are willing to allow the upgrade script to temporarily exceed their limits (be nice and they will probably be quite helpful).

    -

    In this step, phpBB will try to write the configuration file automatically. The forum needs the configuration to run properly. It contains all database settings, so without it, phpBB will not be able to access the database.

    +

    Once completed your board should be immediately available. If you encountered errors you should restore your original database and report the problems to our bug tracker or seek help via our forums (see README for details).

    -

    Usually writing the configuration file automatically works fine. But in some cases it can fail due to wrong file permissions, for instance. In this case, you need to upload the file manually. phpBB asks you to download the config.php file and tells you what to do with it. Please read the instructions carefully. After you have uploaded the file, use Done to get to the last step. If Done returns you to the same page as before, and does not return a success message, you did not upload the file correctly.

    +

    5. Upgrade from phpBB 2.0 beta-1

    -

    Advanced settings

    +

    Sorry but no direct upgrade is available from beta-1 (we did warn you!). If you are reasonably confident with the use of SQL, etc. you may be able to make the required changes to the database manually. You will need to examine the CVS check-ins to determine what needs changing where.

    -

    The Advanced settings allow you to set some parameters of the board configuration. They are optional, and you can always change them later. So if you are not sure what these settings mean, proceed to the final step and finish the installation.

    +

    6. Upgrade from previous Release Candidate versions of phpBB 2

    -

    If the installation was successful, you can now use the Login button to visit the Administration Control Panel. Congratulations, you have installed phpBB3 successfully. But there is still work ahead!

    +

    Upgrading from these versions is generally quite easy. First you should make a copy of your existing config.php, keep it in a safe place! Next delete all the existing phpBB 2 files, do not leave any in place otherwise you may encounter errors later. You can leave alternative templates in-place but you should note they may not function correctly with the final release. It is therefore recommended you switch back to subSilver if you are currently using a different style. With this complete you can upload the new phpBB 2.0.0 files (see New Installations for details if necessary). Once complete copy back your saved config.php, replacing the new one.

    -

    If you are unable to get phpBB3 installed even after reading this guide, please look at the support section to find out where you can ask for further assistance.

    +

    You should now run install/update_to_latest.php which, depending on your previous version, will make a number of database changes. You may receive FAILURES during this procedure, they should not be a cause for concern unless you see an actual ERROR, in which case the script will stop (in this case you should seek help via our forums or bug tracker).

    -

    At this point if you are converting from phpBB 2.0.x, you should refer to the conversion steps for further information. If not, you should remove the install directory from your server as you will only be able to access the Administration Control Panel whilst it is present.

    +

    RC-2 and below MSSQL users, please note that during the update procedure your existing forums table will be dropped and re-created. All data in standard fields will be retained. However if you have modified the forums table and added additional fields or altered existing ones these changes WILL be lost. If this is a significant issue for you we advise you comment out the "DROP FORUM TABLE" section in update_to_latest.php and instead, manually alter the forum_id column to remove the IDENTITY setting (if it exists).

    -
    +

    Once the update_to_latest.php has completed you MUST proceed to the Administration General Configuration panel and check all the values in General Configuration. This is essential if you were running any version before RC-3 since extra information needs to be entered to enable correct URLs to be output in emails.

    - +

    6.i. Changes in language pack format and templates

    -
    -
    +

    Please note that changes have been made to the format of language, image localisations and templates from previous RC's to FINAL. If you were running a release candidate prior to RC-3 you will need to download new language and image localisation packs. You can safely delete any existing *_lang.gif files in the subSilver/images directory since these are no longer utilised. If you are using or have installed any 3rd party template set you must either remove it or update it. Changes have been made to a number of template variables which will result in these not working unless they have been updated to meet phpBB 2.0.x standards.

    -
    +

    7. Upgrade from previous stable (released) versions of phpBB 2

    -

    4. Updating from stable releases of phpBB 3.0.x

    +

    If you are currently using a stable release of phpBB 2 updating to this version is straightforward. You would have downloaded one of three packages and your choice determines what you need to do. Please Note: That before upgrading we heavily recommend you do a full backup of your database and existing phpBB2 source files! If you are unsure how to achieve this please ask your hosting provider for advice.

    -
    -
    +

    MySQL Users Please Note: Changes introduced in 2.0.4 may increase the size of your database, more specifically the search_wordmatch table. There are other changes in that release which are designed to reduce the database size. However these additional changes may not apply to all types of forum (particularly non-English boards). While any increases will be relatively small compared to the overall database size it may be an issue for some users. In particular users on hosting plans which limit database size and where the database is near that limit.

    -
    +

    Please make sure you update your phpBB2 source files too, even if you run the update_to_latest.php file.

    -

    If you are currently using a stable release of phpBB3 updating to this version is straightforward. You would have downloaded one of four packages and your choice determines what you need to do. Please Note: That before updating we heavily recommend you do a full backup of your database and existing phpBB3 files! If you are unsure how to achieve this please ask your hosting provider for advice.

    +

    7.i. Full package

    -

    Please make sure you update your phpBB3 source files too, even if you run the database_update.php file.

    +

    If you have downloaded the full package you should follow the same general upgrade path as for "Upgrade from previous Release Candidate versions of phpBB 2". The exception to this being the need to switch or update styles. In addition there is generally little need to visit the admin panel (though it is adviseable).

    -

    4.i. Full package

    +

    7.ii. Changed files only

    -

    The full package is normally meant for new installations only, but if you want to replace all source files this package comes in handy.

    +

    This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have 2.0.22 you should select the phpBB-2.0.22_to_2.0.23.zip/tar.gz file.

    -

    First you should make a copy of your existing config.php file, keep it in a safe place! Next delete all the existing phpBB3 files, you may want to leave your files/ and images/ directory in place. You can leave alternative styles in-place too. With this complete you can upload the new phpBB3 files (see New installation for details if necessary). Once complete copy back your saved config.php, replacing the new one. Another method is to just replace the existing files with the files from the full package - though make sure you do not overwrite your config.php file.

    +

    The directory structure has been preserved enabling you (if you wish) to simply upload the contents of the archive to the appropriate location on your server, i.e. simply overwrite the existing files with the new versions. Do not forget that if you have installed any Mods these files will overwrite the originals possibly destroying them in the process. You will need to re-add Mods to any affected file before uploading.

    -

    You should now run install/database_update.php which, depending on your previous version, will make a number of database changes. You may receive FAILURES during this procedure, they should not be a cause for concern unless you see an actual ERROR, in which case the script will stop (in this case you should seek help via our forums or bug tracker).

    +

    As for the other upgrade procedures you should run install/update_to_latest.php after you have finished updating the files. This will update your database schema and increment the version number.

    -

    Once the install/database_update.php has completed you may proceed to the Administration Control Panel and check remove the install directory as advised.

    +

    7.iii. Patch file

    -

    4.ii. Changed files only

    +

    The patch file is probably the best solution for those with many Mods or other changes who do not want to re-add them back to all the changed files. To use this you will need command line access to a standard UNIX type patch application.

    -

    This package is meant for those wanting to only replace changed files from a previous version to the latest version. This package normally contains the changed files from up to five previous versions.

    +

    A number of patch files are provided to allow you to upgrade from previous stable releases. Select the correct patch, e.g. if your current version is 2.0.22 you need the phpBB-2.0.22_to_2.0.23.patch. Place the correct patch in the parent directory containing the phpBB 2 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME] (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB2, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.

    -

    This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have 3.0.0 you should select the phpBB-3.0.0_to_3.0.1.zip/tar.gz file.

    +

    If you do get failures you should look at using the Changed files only package to replace the files which failed to patch, please note that you will need to manually re-add any Mods to these particular files. Alternatively if you know how you can examine the .rej files to determine what failed where and make manual adjustments to the relevant source.

    -

    The directory structure has been preserved enabling you (if you wish) to simply upload the contents of the archive to the appropriate location on your server, i.e. simply overwrite the existing files with the new versions. Do not forget that if you have installed any MODs these files will overwrite the originals possibly destroying them in the process. You will need to re-add MODs to any affected file before uploading.

    +

    You should of course delete the patch file (or files) after use. As for the other upgrade procedures you should run install/update_to_latest.php after you have finished updating the files. This will update your database schema and data (if appropriate) and increment the version number.

    -

    As for the other update procedures you should run install/database_update.php after you have finished updating the files. This will update your database schema and increment the version number.

    +

    7.iv. All package types

    -

    4.iii. Patch file

    +

    If you have non-English language packs installed you may want to see if a new version has been made available. A number of missing strings have been added which, though not essential, may be beneficial to users. Please note that at this time not all language packs have been updated so you should be prepared to periodically check for updates.

    -

    The patch file package is for those wanting to update through the patch application, and being comfortable with it.

    +

    8. Important (security related) post-Install tasks for all installation methods

    -

    The patch file is one solution for those with many Modifications (MODs) or other changes who do not want to re-add them back to all the changed files if they use the method explained above. To use this you will need command line access to a standard UNIX type patch application. If you do not have access to such an application but still want to use this update approach, we strongly recommend the Automatic update package explained below. It is also the preferred update method.

    +

    Once you have succssfully installed phpBB 2.0.x you MUST ensure you remove the entire install/ and contrib/ directories. Leaving these in place is a very serious potential security issue which may lead to deletion or alteration of files, etc. Please note that until these directories are remove phpBB2 will not operate and a warning message will be displayed. Beyond these essential deletions you may also wish to delete the docs/ directories if you wish.

    -

    A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.0.0 you need the phpBB-3.0.0_to_3.0.1.patch file. Place the correct patch in the parent directory containing the phpBB3 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME] (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB3, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.

    +

    With these directories deleted you should proceed to the administration panel. Depending on how the installation completed you may have been directed there automatically. If not, login as the administrator you specified during install/upgrade and click the "Administration Panel" link at the bottom of any page. Ensure that details specified in General -> Configuration are correct!

    -

    If you do get failures you should look at using the Changed files only package to replace the files which failed to patch, please note that you will need to manually re-add any Modifications (MODs) to these particular files. Alternatively if you know how you can examine the .rej files to determine what failed where and make manual adjustments to the relevant source.

    +

    8.i. Uploadable avatars

    -

    You should of course delete the patch file (or files) after use. As for the other update procedures you should run install/database_update.php after you have finished updating the files. This will update your database schema and data (if appropriate) and increment the version number.

    +

    phpBB 2 supports several methods for allowing users to select their own avatar (an avatar is a small image generally unique to a user and displayed just below their username in posts).

    -

    4.iv. Automatic update package

    +

    Two of these options allow users to upload an avatar from their machine or a remote location (via a URL). If you wish to enable this function you should first ensure the correct paths for uploadeable avatars is set in Admin -> General -> Configuration -> Avatars. By default this is images/avatars but you can set it to whatever you like, just ensure the configuration setting is updated. You must also ensure this directory can be written to by the webserver. Usually this means you have to alter its permissions to allow anyone to read and write to. Exactly how you should do this depends on your ftp client or server operating system.

    -

    This update method is the preferred method for updating. This package allows detecting changed files automatically and merges changes if needed.

    +

    On UNIX systems for example you set the directory to a+rwx (or ugo+rwx or even 777). This can be done from a command line on your server using chmod or via your FTP client (using the Change Permissions, chmod or other Permissions dialoge box, see your FTP clients documentation for help). Most FTP clients list permissions in the form of User (Read, Write, Execute), Group (Read, Write, Execute) and Other (Read, Write, Execute). You need to tick all of these boxes to set correct permissions.

    -

    The automatic update package is holding - contrary to the others - only the update informations for updating the last released version to the latest available version. These package is meant for use with the automatic update tool.

    +

    On Windows system you need to ensure the directory is not write-protected and that it has global write permissions (see your servers documentation or contact your hosting provider if you are unsure on how to achieve this).

    -

    To perform the update, either follow the instructions from the Administration Control Panel->System Tab - this should point out that you are running an outdated version and will guide you through the update - or follow the instructions listed below.

    +

    Please be aware that setting a directories permissions to global write access is a potential security issue. While it is unlikely that anything nasty will occur (such as all the avatars being deleted) there are always people out there out to cause trouble. Therefore you should monitor this directory and if possible make regular backups.

    -
      -
    • Go to the downloads page and download the latest update package listed there, matching your current version.
    • -
    • Upload the archives contents to your phpBB installation - only the install folder is required. Upload the whole install folder, retaining the file structure.
    • -
    • After the install folder is present, phpBB3 will go offline automatically.
    • -
    • Point your browser to the install directory, for example http://www.example.com/phpBB3/install/
    • -
    • Choose the "Update" Tab and follow the instructions
    • -
    +

    8.ii. Safe Mode

    -

     

    +

    phpBB 2.0.x includes support for using uploadable avatars on systems running PHP in safe mode. If this applies to your hosting service you will need to create a sub-directory called tmp in the directory you specified for storage of uploaded avatars (by default this is images/avatars as explained above). Give it the same access rights as for uploadable avatars above.

    -

    4.v. All package types

    +

    This safe mode support includes compatibility with various directory restrictions your host may impose (assuming they are not too restrictive and that the PHP installed is version 4.0.3 or later). There is generally no need for any manual setup for safe mode support it is typically handled transparantly.

    -

    If you have non-English language packs installed you may want to see if a new version has been made available. A number of missing strings may have been added which, though not essential, may be beneficial to users. Please note that at this time not all language packs have been updated so you should be prepared to periodically check for updates.

    +

    8.iii. Optional extras

    -
    +

    Included with this package are two extra (optional) files, you will find them in the contrib/ directory. These extras, template_file_cache.php and template_db_cache.php address concerns over server load and page generation times on slower or heavily loaded systems. These updated template modules compile each template and uses this rather than compiling each file everytime it is viewed. Tests seem to indicate a noticeable decrease in page generation times and more importantly a significant decrease in overall server load in virtual hosting environments.

    - +

    You should see the README contained within the contrib directory for more details.

    -
    -
    - -
    - -

    5. Conversion from phpBB 2.0.x to phpBB 3.0.x

    - -
    -
    - -
    - -

    This paragraph explains the steps necessary to convert your existing phpBB2 installation to phpBB3.

    - -

    5.i. Requirements before converting

    - -

    Before converting we heavily recommend you do a full backup of your database and files! If you are unsure how to achieve this please ask your hosting provider for advice. You basically need to follow the basic instructions given for New installations. Please do not overwrite any old files - install phpBB3 at a different location.

    - -

    Once you made a backup of everything and also have a brand new phpBB3 installation, you can now begin the conversion.

    - -

    Note that the conversion requires CREATE and DROP privileges for the phpBB3's database user account.

    - -

    5.ii. Converting

    - -

    To begin the conversion visit the install folder of your phpBB3 installation (the same as you have done for installing). Now you will see a new tab Convert. Click this tab.

    - -

    As with install the conversion is automated. Your previous 2.0.x database tables will not be changed as well as the original 2.0.x files remaining unaltered. The conversion is actually only filling your phpBB3 database tables and copying additional data over to your phpBB3 installation. This has the benefit that if something goes wrong you are able to either re-run the conversion or continue a conversion, while your old board is still accessible. We really recommend you disable your old installation while converting, else you may have inconsistent data after the conversion.

    - -

    Please note that this conversion process may take quite some time and depending on your hosting provider this may result in it failing (due to web server or other timeout issues). If this is the case you should ask your provider if they are willing to allow the convert script to temporarily exceed their limits (be nice and they will probably be quite helpful).

    - -

    Once completed your board should be immediately available. If you encountered errors you should report the problems to our bug tracker or seek help via our forums (see README for details).

    - -

    5.iii. Things to do after conversion

    - -

    After successful conversion there may be a few items you need to do - apart from checking if the installation is accessible and everything displayed correctly.

    - -

    The first thing you may want to do is going to the administration control panel and checking every configuration item within the general tab. Thereafter you may want to adjust the forum descriptions/names if you entered HTML there. You also may want to access the other administrative sections, e.g. adjusting permissions, smilies, icons, ranks, etc.

    - -

    Within the conversion the search index has not been created or transferred. This means after conversion you are not able to find any matches if you want to search for something. We recommend you rebuild your search index within Admin -> Maintenance -> Database -> Search Index.

    - -

    After verifying the settings in the ACP, you can delete the install directory to enable the board. The board will stay disabled until you do so.

    - -

    Once you are pleased with your new installation you may want to give it the name of your old installation, changing the directory name. With phpBB3 this is possible without any problems - but you may still want to check your cookie settings within the administration panel, if the cookie path need to be adjusted prior to renaming.

    - -

    5.iv. Common conversion problems

    - -

    Broken non-latin characters The conversion script assumes that the database encoding in the source phpBB2 matches the encoding defined in the lang_main.php file of the default language pack of the source installation. Edit that file to match the database's encoding and re-start the conversion procedure.

    - -

    http 500 / white pages The conversion is a load-heavy procedure. Restrictions imposed by some server hosting providers can cause problems. The most common causes are: too low values for the php settings memory_limit and max_execution_time. Limits on the allowed CPU time are also a frequent cause for such errors, as are caps on the number of database queries allowed. If you cannot change such settings, then contact your hosting provider or run the conversion procedure on a different computer. The phpBB.com forums are also an excellent location to ask for support.

    - -

    Password conversion Due to the utf-8 based handling of passwords in phpBB3, it is not always possible to transfer all passwords. For passwords "lost in translation" the easiest workaround is to use the "forgotten password" function.

    - -

    Path to your former board The converter expects the relative path to your old board's files. So, - for instance - if the old board is located at http://www.yourdomain.com/forum and the phpBB3 installation is located at http://www.yourdomain.com/phpBB3, then the correct value would be ../forum. Note that the webserver user must be able to access the source installation's files.

    - -

    Missing images If your default board language's language pack does not include all images, then some images might be missing in your installation. Always use a complete language pack as default language.

    - -

    Smilies During the conversion you might see warnings about image files where the copying failed. That can happen if the old board's smilies have the same file names as those on the new board. Copy those files manually after the conversion, if you want to continue using the old smilies.

    - - -
    - - - -
    -
    - -
    - -

    6. Important (security related) post-Install tasks for all installation methods

    - -
    -
    - -
    - -

    Once you have successfully installed phpBB3 you MUST ensure you remove the entire install/ directory. Leaving the install directory in place is a very serious potential security issue which may lead to deletion or alteration of files, etc. Please note that until this directory is removed, phpBB3 will not operate and a warning message will be displayed. Beyond this essential deletion, you may also wish to delete the docs/ directories if you wish.

    - -

    With these directories deleted you should proceed to the administration panel. Depending on how the installation completed you may have been directed there automatically. If not, login as the administrator you specified during install/conversion and click the Administration Panel link at the bottom of any page. Ensure that details specified in Admin -> General are correct!

    - -

    6.i. Uploadable avatars

    - -

    phpBB3 supports several methods for allowing users to select their own avatar (an avatar is a small image generally unique to a user and displayed just below their username in posts).

    - -

    Two of these options allow users to upload an avatar from their machine or a remote location (via a URL). If you wish to enable this function you should first ensure the correct paths for uploadeable avatars is set in Admin -> General -> Board Configuration -> Avatar settings. By default this is images/avatars/uploads but you can set it to whatever you like, just ensure the configuration setting is updated. You must also ensure this directory can be written to by the webserver. Usually this means you have to alter its permissions to allow anyone to read and write to. Exactly how you should do this depends on your ftp client or server operating system.

    - -

    On UNIX systems for example you set the directory to a+rwx (or ugo+rwx or even 777). This can be done from a command line on your server using chmod or via your FTP client (using the Change Permissions, chmod or other Permissions dialoge box, see your FTP clients documentation for help). Most FTP clients list permissions in the form of User (Read, Write, Execute), Group (Read, Write, Execute) and Other (Read, Write, Execute). You need to tick all of these boxes to set correct permissions.

    - -

    On Windows system you need to ensure the directory is not write-protected and that it has global write permissions (see your servers documentation or contact your hosting provider if you are unsure on how to achieve this).

    - -

    Please be aware that setting a directories permissions to global write access is a potential security issue. While it is unlikely that anything nasty will occur (such as all the avatars being deleted) there are always people out there to cause trouble. Therefore you should monitor this directory and if possible make regular backups.

    - -
    - - - -
    -
    - -
    - -

    7. Copyright and disclaimer

    - -
    -
    - -
    - -

    This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 phpBB Group, All Rights Reserved.

    - -
    - - - -
    -
    +

    9. Copyright and disclaimer

    +

    This application is opensource software released under the GPL. Please see source code and the Docs directory for more details. This package and its contents are Copyright © 2002 phpBB Group, All Rights Reserved.

    - -
    - -
    - -
    +
    diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index 3510bc448e..6baac9d152 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -1,363 +1,224 @@ - - + + - - - - - - - - - - -phpBB3 • Readme - - - + + +phpBB 2.0.x :: Readme + + + - + + + + +
    + + + +
    -
    - - - - - -
    + + + + + +
    phpBB 2 : Creating CommunitiesphpBB 2.0.x README
    +

    Thank you for downloading phpBB 2, the long awaited re-write of the popular phpBB 1.x online community forum. This README will guide through the basics of installation and operation of phpBB 2. Please ensure you read this and the accompanying documentation fully before proceeding with the installation.

    -

    Thank you for downloading phpBB3. This README will guide through the basics of installation and operation of phpBB3. Please ensure you read this and the accompanying documentation fully before proceeding with the installation.

    +
      +
    1. Installing phpBB 2
    2. +
    3. Running phpBB 2
    4. +
        +
      1. Internationalisation (i18n)
      2. +
      3. Styles
      4. +
      5. Mods
      6. +
      +
    5. Getting help with phpBB 2
    6. +
        +
      1. Userguide
      2. +
      3. Community Forums
      4. +
      5. Internet Relay Chat
      6. +
      +
    7. Status of this version
    8. +
    9. Reporting Bugs
    10. +
        +
      1. Security related bugs
      2. +
      +
    11. Overview of current bug list
    12. +
    13. PHP compatibility issues
    14. +
        +
      1. Notice on PHP security issues
      2. +
      +
    15. Disclaimer
    16. +
    -

    Readme

    +

    1. Installing phpBB 2

    - +

    2. Running phpBB 2

    -
    +

    Once installed phpBB 2.0 is easily managed by both admin and moderator control panels. If you need help or advice with phpBB 2 please see Section 3 below.

    -

    1. Installing phpBB3

    +

    2.i. Internationalisation, i18n

    -
    -
    +

    A number of language packs and subSilver localisations are now available. You can find them on our official download page:

    -
    +

    http://www.phpbb.com/downloads.php

    -

    Installation, update and conversion instructions can be found in the INSTALL document contained in this distribution. If you are intending to convert from a previous phpBB 2.0.x installation we highly recommend you backup any existing data before proceeding!

    +

    This is the Official location for all support language sets. If you download a package from a 3rd party site you do so with the understanding that we cannot offer support. So please, do not ask for help in these cases!

    -

    Users of phpBB3 Beta versions cannot directly update.

    +

    Installation of these packages is straightforward, simply download the required language pack and unarchive it into the languages/ folder. Please ensure you retain the directory structure when doing this! To install the subSilver image packs you should unarchive the file/s into the templates/subSilver/images directory, again you must retain the directory structure. Once installed the languages will become immediately available.

    -

    Please note that we won't support the following installation types:

    -
      -
    • Updates from phpBB3 Beta versions to phpBB3 RC1 and higher
    • -
    • Conversions from phpBB 2.0.x to phpBB3 Beta versions
    • -
    • phpBB3 Beta installations
    • -
    +

    If your language is not available please visit our forums where you will find a topic listing translations currently available or in preparation. This topic also gives you information should you wish to volunteer to translate a language not currently listed

    -

    We give support for the following installation types:

    +

    Please note that users who have upgraded to the latest version from versions prior to RC-3 should will need to download new versions of the language/subSilver image packs. Any package downloaded prior to the availability of RC-3 will not function correctly with this version of phpBB 2.

    -
      -
    • Updates from phpBB3 RC1 to the latest version
    • -
    • Conversions from phpBB 2.0.x to the latest version
    • -
    • New installations of phpBB3 - always only the latest released version
    • -
    +

    If you have upgraded from 2.0.0 and make use of non-English language packs you will benefit from downloading updated versions which will become available shortly. These introduce a number of strings which went missing from the first version plus a few updates and additions.

    -
    +

    2.ii. Styles

    - +

    Although phpBB Group are rather proud of the subSilver style (which has influenced many of our competitors boards updated designs!) we realise that it may not be to everyones tastes. Therefore phpBB 2 allows styles to be switched with relative ease. Firstly you need to locate and download a style you like. We maintain such a site at

    -
    -
    +

    http://www.phpbb.com/styles/

    -
    +

    Please note that 3rd party styles downloaded for versions of phpBB 2 prior to its final (2.0.x) release will not function correctly. You should either remove these styles or (if available) update them to meet changes in 2.0.x.

    -

    2. Running phpBB3

    +

    Once you have downloaded a style the usual next step is to unarchive (or upload the unarchived contents of) the package into your templates/ directory. You then need to visit Administration -> Styles -> Add, you should see the new style available, click add and it will become available for all your users.

    -
    -
    +

    2.iii. Mods

    -
    +

    Although not officially supported by phpBB Group, phpBB 2 has a thriving mod (formerly known as hacks) scene. These third party modifications to the standard phpBB 2 extend its capabilities still further and can be found at:

    -

    Once installed phpBB is easily managed by both admin and moderator control panels. If you need help or advice with phpBB please see Section 3 below.

    +

    http://www.phpbb.com/mods

    -

    2.i. Internationalisation (i18n)

    +

    Please remember that any bugs or other issues that occur after you have added any modification should NOT be reported to the bug tracker (see below). First remove the modification and see if the problem is resolved.

    -

    A number of language packs and style localisations are available. You can find them on our official download page:

    +

    Also remember that any modifications which modify the database in any way may render upgrading your forum to future versions more difficult unless we state otherwise. With all this said many users have and continue to utilise many of the mods already available with great success

    -

    http://www.phpbb.com/downloads/

    +

    3. Getting help with phpBB 2

    -

    This is the official location for all supported language sets. If you download a package from a 3rd party site you do so with the understanding that we cannot offer support. So please, do not ask for help in these cases!

    +

    phpBB 2 can seem a little daunting to new users in places, particularly with regard the permission system. The first thing you should do is check the FAQ which covers a few basic getting started questions. If you need additional help there are several places you should look.

    -

    Installation of these packages is straightforward, simply download the required language pack and unarchive it into the languages/ folder. Please ensure you retain the directory structure when doing this! Once uploaded go to the Admin->System->Language Packs and install the now appeared new language pack. To install the style imageset you should download the imageset for your language and unarchive the file/s into the relevant imageset directory (styles/prosilver/imageset or styles/subsilver2/imageset), again you must retain the directory structure. Once installed the imageset will become immediately available.

    +

    3.i. phpBB 2 Userguide

    -

    If your language is not available please visit our forums where you will find a topic listing translations currently available or in preparation. This topic also gives you information should you wish to volunteer to translate a language not currently listed.

    +

    A comprehensive userguide is now available online and can be accessed from the following location:

    -

    2.ii. Styles

    +

    http://www.phpbb.com/support/guide/

    -

    Although phpBB Group are rather proud of the included styles we realise that it may not be to everyones tastes. Therefore phpBB3 allows styles to be switched with relative ease. Firstly you need to locate and download a style you like. We maintain such a site at

    +

    This covers everything from installation through setting permissions and managing users.

    -

    http://www.phpbb.com/styles/

    +

    3.ii. Community Forums

    -

    Please note that 3rd party styles downloaded for versions of phpBB2 will not work in phpBB3.

    +

    phpBB Group maintains a thriving community where a number of people have generously decided to donate their time to help support users. This site can be found at:

    -

    Once you have downloaded a style the usual next step is to unarchive (or upload the unarchived contents of) the package into your styles/ directory. You then need to visit Administration -> Styles, you should see the new style available, click install and it will become available for all your users.

    +

    http://www.phpbb.com/

    -

    Please note that if you create your own style or modify existing ones, please remember to enable the "Recompile stale style components" setting within the Admin->General->Load Settings screen. This setting allows the cache to detect changes made to the style and automatically refresh it. If this setting is disabled, you will not see your changes taking effect.

    +

    If you do seek help via our forums please be sure to do a Search before posting. This may well save both you and us time and allow the developer, moderator and support groups to spend more time responding to people with unknown issues and problems. Please also remember that phpBB is an entirely volunteer effort, no one receives any compensation for the time they give, this includes moderators as well as developers. So please be respectful and mindful when awaiting responses.

    -

    2.iii. Modifications

    +

    3.iii Internet Relay Chat

    -

    Although not officially supported by phpBB Group, phpBB has a thriving modification scene. These third party modifications to the standard phpBB extend its capabilities still further and can be found at:

    +

    Another place you may find help is our IRC channel. This operates on the Freenode IRC network, irc.freenode.net and the channel is #phpbb and can be accessed by any good IRC client such as mIRC, XChat, etc. Again, please do not abuse this service and be respectful of other users.

    -

    http://www.phpbb.com/mods/

    +

    4. Status of this version

    -

    Please remember that any bugs or other issues that occur after you have added any modification should NOT be reported to the bug tracker (see below). First remove the modification and see if the problem is resolved.

    +

    This is the second stable release of phpBB 2. The 2.0.x line is essentially feature frozen, point releases will see only bugs and such like fixed. Our next major release will be phpBB 3.0 and work is progressing on this (the unstable development version is 2.1). Please do not post questions asking when 3.0 will be available, no release date has been set. phpBB 3.0 is now feature frozen, please feel free to suggest new features for phpBB 3.2 using our feature request tracker. We do not guarantee that all these will appear in 3.2 but we will do our best!:

    -

    Also remember that any modifications which modify the database in any way may render upgrading your forum to future versions more difficult unless we state otherwise. With all this said many users have and continue to utilise many of the mods already available with great success.

    +

    http://sourceforge.net/tracker/?atid=580201&group_id=7885&func=browse

    -
    +

    Before submitting your idea please ensure you have read through the entries in that list. If your idea is similar to an existing one please feel free to add a comment to it. Please do not submit duplicate suggestions!

    - +

    For some suggestions we may ask for your feedback via our forums. For those interested in the development of phpBB 3.0 you should keep an eye on the community forums (particularly the Feature Discussion forum) where you may be able to influence the direction we take with certain new features. Finally you may like to visit our development forum to see how things are progressing:

    -
    -
    +

    http://area51.phpbb.com/phpBB/

    -
    +

    Please note that this forum should NOT be used to obtain support for or ask questions about phpBB 2.0.x, the main community forums are the place for this. Any such posts will be locked and go unanswered.

    -

    3. Getting help with phpBB3

    +

    5. Reporting Bugs

    -
    -
    +

    The phpBB Group uses a bug tracking system to store, list and manage all reported bugs, it can be found at the location listed below. Please DO NOT post bug reports to our forums, they will be locked. In addition please DO NOT use the bug tracker for support requests. Posting such a request will only see you directed to the support forums (while taking time away from working on real bugs).

    -
    +

    http://www.phpbb.com/bugs/

    -

    phpBB3 can seem a little daunting to new users in places, particularly with regard the permission system. The first thing you should do is check the FAQ which covers a few basic getting started questions. If you need additional help there are several places you should look.

    +

    While we very much appreciate receiving bug reports (the more reports the more stable phpBB 2 will be) we ask you carry out a few steps before adding new entries:

    +
      +
    • Firstly determine if your bug is reproduceable, how to determine this depends on the bug in question. Only if the bug is reproduceable is it likely to be a problem with phpBB 2.0 (or in some way connected). If something cannot be reproduced it may turn out to have been your hosting provider working on something, a user doing something silly, etc. Bug reports for non-reproduceable events can slow down our attempts to fix real, reproduceable issues

    • +
    • Next please read or search through the existing bug reports (remember to check open AND closed reports!) to see if your bug (or one very similar to it) is already listed. If it is please add to that existing bug rather than creating a new duplicate entry (all this does is slow us down).

    • +
    • Check the forums (use search!) to see if people have discussed anything that sounds similar to what you are seeing. However, as noted above please DO NOT post your particular bug to the forum unless it's non-reproduceable or you are sure it's related to something you have done rather phpBB 2.0

    • +
    • If no existing bug exists then please feel free to add it
    • +
    -

    3.i. phpBB3 Documentation

    +

    If you do post a new bug (i.e. one that isn't already listed in the bug tracker) firstly make sure you have logged in (your username and password are the same as for the community forums) then please include the following details:

    +
      +
    • Your server type/version, eg. Apache 1.2.22, IIS 4, Sambar, etc.
    • +
    • PHP version and mode of operation, eg. PHP 4.1.1 as a module, PHP 4.0.1 running as CGI, etc.
    • +
    • DB type/version, eg. MySQL 3.23.32, PostgreSQL 7.1.2, MSSQL Server 2000 SP1, etc.
    • +
    -

    A comprehensive documentation is now available online and can be accessed from the following location:

    +

    Please also be as detailed as you can in your report, if possible list the steps required to duplicate the problem. If you have a fix which you are VERY SURE works (and is consistent with our coding guidelines) and does not introduce further problems or incompatibilities please let us know. However only include it in the bug report if you really must, if we need it we'll ask you for it.

    -

    http://www.phpbb.com/support/documentation/3.0/

    +

    Once a bug has been submitted you will be emailed any follow up comments added to it. Please if you are requested to supply additional information, do so! It is extremely frustrating for us to receive bug reports, ask for additional information but get nothing. In these cases we have a policy of closing the bug, which may leave a very real problem in place. Obviously we would rather not have this situation arise.

    -

    This covers everything from installation through setting permissions and managing users.

    +

    5.i. Security related bugs

    -

    3.ii. Community Forums

    +

    If you find a potential security related vulnerability in phpBB 2 please DO NOT post it to the bug tracker, public forums, mailing lists, etc.! Doing so may allow unscrupulous users to take advantage of it before we have time to put a fix in place. All security related bugs should be sent to our security tracker:

    -

    phpBB Group maintains a thriving community where a number of people have generously decided to donate their time to help support users. This site can be found at:

    +

    http://www.phpbb.com/security/

    -

    http://www.phpbb.com/

    +

    6. Overview of current bug list

    -

    If you do seek help via our forums please be sure to do a Search before posting. This may well save both you and us time and allow the developer, moderator and support groups to spend more time responding to people with unknown issues and problems. Please also remember that phpBB is an entirely volunteer effort, no one receives any compensation for the time they give, this includes moderators as well as developers. So please be respectful and mindful when awaiting responses.

    +

    This list is not complete (see above link for full list) but does represent those bugs which may effect users on a wider scale. Other bugs listed in the tracker have typically been shown to be limited to certain setups or methods of installation/upgrade.

    -

    3.iii Internet Relay Chat

    +
      +
    • First four characters of some posted content disappears - this is an issue with PHP not phpBB
    • +
    • Cannot post very large messages when using PostgreSQL 7.0.x (limitation of Postgresql 7.0.x)
    • +
    • By default cannot post very large messages with MSSQL (this can be configured within MSSQL)
    • +
    • Use of non-latin charsets with MSSQL may result in post data being cropped unexpectedly
    • +
    • Upgrade may fail to complete on large boards under some hosts
    • +
    • Case-sensitivity on usernames and emails with PostgreSQL 7.x. A fix is provided by a user within our knowledge base
    • +
    -

    Another place you may find help is our IRC channel. This operates on the Freenode IRC network, irc.freenode.net and the channel is #phpbb and can be accessed by any good IRC client such as mIRC, XChat, etc. Again, please do not abuse this service and be respectful of other users.

    +

    7. PHP compatibility issues

    -
    +

    phpBB is no longer supported on PHP3 due to several compatibility issues and we recommend that you upgrade to the latest stable release of PHP4 to run phpBB.

    - +

    Please remember that running any application on a developmental version of PHP can lead to strange/unexpected results which may appear to be bugs in the application (which may not be true). Therefore we recommend you upgrade to the newest stable version of PHP before running phpBB 2. If you are running a developmental version of PHP please check any bugs you find on a system running a stable release before submitting.

    -
    -
    +

    This board has been developed and tested under Linux and Windows (amongst others) running IIS and Apache using MySQL 3.23 and 4.0.0, MSSQL Server 2000, MS Access 2000 and XP and PostgreSQL 7.x. Versions of PHP used range from 4.0.6 to 4.3.8 without problem. There may be unconfirmed issues with PHP 4.0.1 including patch level releases. If you experience problems with phpBB and have this PHP version installed it is recommended you upgrade it before posting bug reports.

    -
    +

    With the recent release of the official version of PHP 5, people and hosts may be switching to the latest PHP version. At this moment, the phpBB Team does not officially support running phpBB on PHP 5, as phpBB2.0.x was not written with PHP 5 in mind. However, many users have reported using it sucessfully on PHP 5 having made a configuration change in PHP to enable support for the deprecated HTTP_*_VARS arrays which is turned off by default in new PHP 5 installations. The relevant configuration option is register_long_arrays and it is decribed in the PHP Manual. phpBB 2.0.x makes use of these arrays in order to maintain backwards compatibility with early versions of PHP 4.x which is part of the original specification.
    +For this reason we do not support PHP 5 as platform for phpBB. It has been reported working, so you can try it. It's a risk you will be taking though.

    -

    4. Status of this version

    +

    7.i. Notice on PHP security issues

    -
    -
    +

    At the end of February 2002 a major security issue was found with PHP 3 and 4 which has resulted in many hosting providers disabling file uploads (although patches fixing the security issues are available and new versions of PHP 4 have been released).

    -
    +

    Because of this, and to cope with situations where hosts didn't allow such uploads anyway we have implemented various checks in phpBB 2. These checks prevent you from enabling or making use of functions which will not operate correctly on PHP as installed on your server. At this time this includes locally uploaded avatars and DB restore.

    -

    This is the third stable release of phpBB. The 3.0.x line is essentially feature frozen, with only point releases seeing fixes for bugs and security issues, though feature alterations and minor feature additions may be done if deemed absolutely required. Our next major release will be phpBB 3.2 and the planning phase has begun (the unstable development version is 3.1). Please do not post questions asking when 3.2 will be available, no release date has been set.

    +

    Third party mods may also be effected but these are outside our control, you should contact the mod writer for more information.

    -

    For those interested in the development of phpBB should keep an eye on the community forums to see how things are progressing:

    - -

    http://area51.phpbb.com/phpBB/

    - -

    Please note that this forum should NOT be used to obtain support for or ask questions about phpBB 2.0.x or phpBB 3.0.x, the main community forums are the place for this. Any such posts will be locked and go unanswered.

    - -
    - - - -
    -
    - -
    - -

    5. Reporting Bugs

    - -
    -
    - -
    - -

    The phpBB Group uses a bug tracking system to store, list and manage all reported bugs, it can be found at the location listed below. Please DO NOT post bug reports to our forums, they will be locked. In addition please DO NOT use the bug tracker for support requests. Posting such a request will only see you directed to the support forums (while taking time away from working on real bugs).

    - -

    http://www.phpbb.com/bugs/

    - -

    While we very much appreciate receiving bug reports (the more reports the more stable phpBB will be) we ask you carry out a few steps before adding new entries:

    - -
      -
    • Firstly determine if your bug is reproduceable, how to determine this depends on the bug in question. Only if the bug is reproduceable it is likely to be a problem with phpBB3 (or in some way connected). If something cannot be reproduced it may turn out to have been your hosting provider working on something, a user doing something silly, etc. Bug reports for non-reproduceable events can slow down our attempts to fix real, reproduceable issues

    • -
    • Next please read or search through the existing bug reports to see if your bug (or one very similar to it) is already listed. If it is please add to that existing bug rather than creating a new duplicate entry (all this does is slow us down).

    • -
    • Check the forums (use search!) to see if people have discussed anything that sounds similar to what you are seeing. However, as noted above please DO NOT post your particular bug to the forum unless it's non-reproduceable or you are sure it's related to something you have done rather phpBB3

    • -
    • If no existing bug exists then please feel free to add it
    • -
    - -

    If you do post a new bug (i.e. one that isn't already listed in the bug tracker) firstly make sure you have logged in (your username and password are the same as for the community forums) then please include the following details:

    - -
      -
    • Your server type/version, e.g. Apache 1.3.28, IIS 4, Sambar, etc.
    • -
    • PHP version and mode of operation, e.g. PHP 5.1.1 as a module, PHP 4.4.4 running as CGI, etc.
    • -
    • DB type/version, e.g. MySQL 4.0.1, PostgreSQL 7.3.2, MSSQL Server 2000 SP1, etc.
    • -
    - -

    The relevant database type/version is listed within the administration control panel

    - -

    Please also be as detailed as you can in your report, if possible list the steps required to duplicate the problem. If you have a fix which you are VERY SURE works (and is consistent with our coding guidelines) and does not introduce further problems or incompatibilities please let us know. However only include it in the bug report if you really must, if we need it we'll ask you for it.

    - -

    Once a bug has been submitted you will be emailed any follow up comments added to it. Please if you are requested to supply additional information, do so! It is frustrating for us to receive bug reports, ask for additional information but get nothing. In these cases we have a policy of closing the bug, which may leave a very real problem in place. Obviously we would rather not have this situation arise.

    - -

    5.i. Security related bugs

    - -

    If you find a potential security related vulnerability in phpBB please DO NOT post it to the bug tracker, public forums, etc.! Doing so may allow unscrupulous users to take advantage of it before we have time to put a fix in place. All security related bugs should be sent to our security tracker:

    - -

    http://www.phpbb.com/security/

    - -
    - - - -
    -
    - -
    - -

    6. Overview of current bug list

    - -
    -
    - -
    - -

    This list is not complete but does represent those bugs which may effect users on a wider scale. Other bugs listed in the tracker have typically been shown to be limited to certain setups or methods of installation, updating and/or conversions.

    - -
      -
    • Conversions may fail to complete on large boards under some hosts
    • -
    • Updates may fail to complete on large update sets under some hosts
    • -
    • Smilies placed directly after bbcode tags will not get parsed. Smilies always need to be separated by spaces.
    • -
    - -
    - - - -
    -
    - -
    - -

    7. PHP compatibility issues

    - -
    -
    - -
    - -

    phpBB is no longer supported on PHP3 due to several compatibility issues and we recommend that you upgrade to the latest stable release of PHP5 to run phpBB. The minimum version required is PHP 4.3.3.

    - -

    Please remember that running any application on a developmental version of PHP can lead to strange/unexpected results which may appear to be bugs in the application (which may not be true). Therefore we recommend you upgrade to the newest stable version of PHP before running phpBB3. If you are running a developmental version of PHP please check any bugs you find on a system running a stable release before submitting.

    - -

    This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MSSQL Server 2000, PostgreSQL 7.x, Oracle 8, SQLite and Firebird. Versions of PHP used range from 4.3.3 to 6.0.0-dev without problem.

    - -

    7.i. Notice on PHP security issues

    - -

    Currently there are no known issues regarding PHP security.

    - -
    - - - -
    -
    - -
    - -

    8. Copyright and disclaimer

    - -
    -
    - -
    - -

    This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 phpBB Group, All Rights Reserved.

    - -
    - - - -
    -
    +

    8. Copyright and disclaimer

    +

    This application is opensource software released under the GPL. Please see source code and the Docs directory for more details. This package and its contents are Copyright © 2002 phpBB Group, All Rights Reserved.

    - -
    - -
    - -
    +
    - + \ No newline at end of file diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html deleted file mode 100644 index c83aaadc2d..0000000000 --- a/phpBB/docs/auth_api.html +++ /dev/null @@ -1,253 +0,0 @@ - - - - - - - - - - - - - -phpBB3 • Auth API - - - - - - - -

    - - - - - -
    - - - -

    This is an explanation of how to use the phpBB auth/acl API.

    - -

    Auth API

    - - - -
    - -

    1. Introduction

    - -
    -
    - -
    - -

    What is it?

    - -

    The auth class contains methods related to authorisation users to access various board functions, e.g. posting, viewing, replying, logging in (and out), etc. If you need to check whether a user can carry out a task or handle user login/logouts this class is required.

    - -

    Initialisation

    - -

    To use any methods contained with the auth class it first needs to be instantiated. This is best achieved early in the execution of the script in the following manner:

    - -
    -$auth = new auth();
    -	
    - -

    Once an instance of the class has been created you are free to call the various methods it contains. Please note that should you wish to use the auth_admin methods you will need to instantiate this separately but in the same way.

    - -
    - - - -
    -
    - -
    - -

    2. Methods

    - -
    -
    - -
    - -

    Following are the methods you are able to use.

    - -

    2.i. acl

    - -

    The acl method is the initialisation routine for all the acl functions. If you intend calling any acl method you must first call this. The method takes as its one and only required parameter an associative array containing user information as stored in the database. This array must contain at least the following information; user_id, user_permissions and user_type. It is called in the following way:

    - -
    -$auth->acl(userdata);
    -	
    - -

    Where userdata is the array containing the aforementioned data.

    - -

    2.ii. acl_get

    - -

    This method is the primary way of determining what a user can and cannot do for a given option globally or in a given forum. The method should be called in the following way:

    - -
    -$result = $auth->acl_get(option[, forum]);
    -	
    - -

    Where option is a string representing the required option, e.g. 'f_list', 'm_edit', 'a_adduser', etc. By adding a ! in front of the option, e.g. '!f_list' the result of this method will be negated. The optional forum term is the integer forum_id.

    - -

    The method returns a positive integer when the user is allowed to carry out the option and a zero if denied or the other way around if the option is prefixed with an exclamation mark.

    - -

    If you specify a forum and there is also a global setting for the specified option then this method will return a positive integer if one of them evaluates to a positive integer. An example would be the m_approve option which can be set per forum but also globally. If a user has the global option he will automatically have m_approve in every forum.

    - -

    There are some special options or flags which are used as prefixes for other options, e.g. 'f_' or 'm_'. These flags will automatically be set to a positive integer if the user has one or more permissions with the given prefix. A local setting will result in the flag being set only locally (so it will require a forum id to retrieve). If a user has one or more global permissions with the prefix acl_get will return a positive integer regardless of the forum id.

    - -

    2.iii. acl_gets

    - -

    This method is funtionally similar to acl_get in that it returns information on whether a user can or cannot carry out a given task. The difference here is the ability to test several different options in one go. This may be useful for testing whether a user is a moderator or an admin in one call. Rather than having to call and check acl_get twice.

    - -

    The method should be called thus:

    - -
    -$result = $auth->acl_gets(option1[, option2, ..., optionN, forum]);
    -	
    - -

    As with the acl_get method the options are strings representing the required permissions to check. The forum again is an integer representing a given forum_id.

    - -

    The method will return a positive integer if acl_get for one of the options evaluates to a positive integer (combines permissions with OR).

    - -

    2.iv. acl_getf

    - -

    This method is used to find out in which forums a user is allowed to carry out an operation or to find out in which forums he is not allowed to carry out an operation. The method should be called in the following way:

    - -
    -$result = $auth->acl_getf(option[, clean]);
    -	
    - -

    Just like in the acl_get method the option is a string specifying the permission which has to be checked (negation using ! is allowed). The second parameter is a boolean. If it is set to false this method returns all forums with either zero or a positive integer. If it is set to true only those forums with a positive integer as the result will be returned.

    - -

    The method returns an associative array of the form:

    - -
    -array(forum_id1 => array(option => integer), forum_id2 => ...)
    -	
    - -

    Where option is the option passed to the method and integer is either zero or a positive integer and the same acl_get(option, forum_id) would return.

    - -

    2.v. acl_getf_global

    - -

    This method is used to find out whether a user has a permission in at least one forum or globally. This method is similar to checking whether acl_getf(option, true) returned one or more forums but it's faster. It should be called in the following way:

    - -
    -$result = acl_getf_global(option)
    -	
    - -

    As with the previous methods option is a string specifying the permission which has to be checked.

    - -

    This method returns either zero or a positive integer.

    - -

    2.vi. acl_cache

    - -

    This should be considered a private method and not be called externally. It handles the generation of the user_permissions data from the basic user and group authorisation data. When necessary this method is called automatically by acl.

    - -
    - - - -
    -
    - -
    - -

    3. Admin related functions

    - -
    -
    - -
    - -

    A number of additional methods are available related to auth. These handle more basic functions such as adding user and group permissions, new options and clearing the user cache. These methods are contained within a separate class, auth_admin. This can be found in includes/acp/auth.php.

    - -

    To use any methods this class contains it first needs to be instantiated separately from auth. This is achieved in the same way as auth:

    - -
    -$auth_admin = new auth_admin();
    -	
    - -

    This instance gives you access to both the methods of this specific class and that of auth.

    - -
    - - - -
    -
    - -
    - -

    4. Copyright and disclaimer

    - -
    -
    - -
    - -

    This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 phpBB Group, All Rights Reserved.

    - -
    - - - -
    -
    - - - - -
    - -
    - -
    - - - diff --git a/phpBB/docs/bg_header.gif b/phpBB/docs/bg_header.gif deleted file mode 100644 index 351de9f46a..0000000000 Binary files a/phpBB/docs/bg_header.gif and /dev/null differ diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html deleted file mode 100644 index 837ae55227..0000000000 --- a/phpBB/docs/coding-guidelines.html +++ /dev/null @@ -1,2283 +0,0 @@ - - - - - - - - - - - - - -phpBB3 • Coding Guidelines - - - - - - - -
    - - - - - -
    - - - -

    These are the phpBB Coding Guidelines for Olympus, all attempts should be made to follow them as closely as possible.

    - -

    Coding Guidelines

    - - - -
    - -

    1. Defaults

    - -
    -
    - -
    - -

    1.i. Editor Settings

    - -

    Tabs vs Spaces:

    -

    In order to make this as simple as possible, we will be using tabs, not spaces. We enforce 4 (four) spaces for one tab - therefore you need to set your tab width within your editor to 4 spaces. Make sure that when you save the file, it's saving tabs and not spaces. This way, we can each have the code be displayed the way we like it, without breaking the layout of the actual files.

    -

    Tabs in front of lines are no problem, but having them within the text can be a problem if you do not set it to the amount of spaces every one of us uses. Here is a short example of how it should look like:

    - -
    -{TAB}$mode{TAB}{TAB}= request_var('mode', '');
    -{TAB}$search_id{TAB}= request_var('search_id', '');
    -	
    - -

    If entered with tabs (replace the {TAB}) both equal signs need to be on the same column.

    - -

    Linefeeds:

    -

    Ensure that your editor is saving files in the UNIX (LF) line ending format. This means that lines are terminated with a newline, not with Windows Line endings (CR/LF combo) as they are on Win32 or Classic Mac (CR) Line endings. Any decent editor should be able to do this, but it might not always be the default setting. Know your editor. If you want advice for an editor for your Operating System, just ask one of the developers. Some of them do their editing on Win32. - -

    1.ii. File Header

    - -

    Standard header for new files:

    -

    This template of the header must be included at the start of all phpBB files:

    - -
    -/**
    -*
    -* @package {PACKAGENAME}
    -* @version $Id: $
    -* @copyright (c) 2007 phpBB Group
    -* @license http://opensource.org/licenses/gpl-license.php GNU Public License
    -*
    -*/
    -	
    - -

    Please see the File Locations section for the correct package name.

    - -

    Files containing inline code:

    - -

    For those files you have to put an empty comment directly after the header to prevent the documentor assigning the header to the first code element found.

    - -
    -/**
    -* {HEADER}
    -*/
    -
    -/**
    -*/
    -{CODE}
    -	
    - -

    Files containing only functions:

    - -

    Do not forget to comment the functions (especially the first function following the header). Each function should have at least a comment of what this function does. For more complex functions it is recommended to document the parameters too.

    - -

    Files containing only classes:

    - -

    Do not forget to comment the class. Classes need a separate @package definition, it is the same as the header package name. Apart from this special case the above statement for files containing only functions needs to be applied to classes and it's methods too.

    - -

    Code following the header but only functions/classes file:

    - -

    If this case is true, the best method to avoid documentation confusions is adding an ignore command, for example:

    - -
    -/**
    -* {HEADER}
    -*/
    -
    -/**
    -* @ignore
    -*/
    -Small code snipped, mostly one or two defines or an if statement
    -
    -/**
    -* {DOCUMENTATION}
    -*/
    -class ...
    -	
    - -

    1.iii. File Locations

    - -

    Functions used by more than one page should be placed in functions.php, functions specific to one page should be placed on that page (at the bottom) or within the relevant sections functions file. Some files in /includes are holding functions responsible for special sections, for example uploading files, displaying "things", user related functions and so forth.

    - -

    The following packages are defined, and related new features/functions should be placed within the mentioned files/locations, as well as specifying the correct package name. The package names are bold within this list:

    - -
      -
    • phpBB3
      Core files and all files not assigned to a separate package
    • -
    • acm
      /includes/acm, /includes/cache.php
      Cache System
    • -
    • acp
      /adm, /includes/acp, /includes/functions_admin.php
      Administration Control Panel
    • -
    • dbal
      /includes/db
      Database Abstraction Layer.
      Base class is dbal -
        -
      • /includes/db/dbal.php
        Base DBAL class, defining the overall framework
      • -
      • /includes/db/firebird.php
        Firebird/Interbase Database Abstraction Layer
      • -
      • /includes/db/msssql.php
        MSSQL Database Abstraction Layer
      • -
      • /includes/db/mssql_odbc.php
        MSSQL ODBC Database Abstraction Layer for MSSQL
      • -
      • /includes/db/mysql.php
        MySQL Database Abstraction Layer for MySQL 3.x/4.0.x
      • -
      • /includes/db/mysql4.php
        MySQL4 Database Abstraction Layer for MySQL 4.1.x/5.x
      • -
      • /includes/db/mysqli.php
        MySQLi Database Abstraction Layer
      • -
      • /includes/db/oracle.php
        Oracle Database Abstraction Layer
      • -
      • /includes/db/postgres.php
        PostgreSQL Database Abstraction Layer
      • -
      • /includes/db/sqlite.php
        Sqlite Database Abstraction Layer
      • -
      -
    • -
    • diff
      /includes/diff
      Diff Engine
    • -
    • docs
      /docs
      phpBB Documentation
    • -
    • images
      /images
      All global images not connected to styles
    • -
    • install
      /install
      Installation System
    • -
    • language
      /language
      All language files
    • -
    • login
      /includes/auth
      Login Authentication Plugins
    • -
    • VC
      /includes/captcha
      CAPTCHA
    • -
    • mcp
      mcp.php, /includes/mcp, report.php
      Moderator Control Panel
    • -
    • ucp
      ucp.php, /includes/ucp
      User Control Panel
    • -
    • utf
      /includes/utf
      UTF8-related functions/classes
    • -
    • search
      /includes/search, search.php
      Search System
    • -
    • styles
      /styles, style.php
      phpBB Styles/Templates/Themes/Imagesets
    • -
    - -
    - - - -
    -
    - -
    - -

    2. Code Layout/Guidelines

    - -
    -
    - -
    - -

    Please note that these Guidelines applies to all php, html, javascript and css files.

    - -

    2.i. Variable/Function Naming

    - -

    We will not be using any form of hungarian notation in our naming conventions. Many of us believe that hungarian naming is one of the primary code obfuscation techniques currently in use.

    - -

    Variable Names:

    -

    Variable names should be in all lowercase, with words separated by an underscore, example:

    - -
    -

    $current_user is right, but $currentuser and $currentUser are not.

    -
    - -

    Names should be descriptive, but concise. We don't want huge sentences as our variable names, but typing an extra couple of characters is always better than wondering what exactly a certain variable is for.

    - -

    Loop Indices:

    -

    The only situation where a one-character variable name is allowed is when it's the index for some looping construct. In this case, the index of the outer loop should always be $i. If there's a loop inside that loop, its index should be $j, followed by $k, and so on. If the loop is being indexed by some already-existing variable with a meaningful name, this guideline does not apply, example:

    - -
    -for ($i = 0; $i < $outer_size; $i++)
    -{
    -   for ($j = 0; $j < $inner_size; $j++)
    -   {
    -      foo($i, $j);
    -   }
    -}
    -	
    - -

    Function Names:

    -

    Functions should also be named descriptively. We're not programming in C here, we don't want to write functions called things like "stristr()". Again, all lower-case names with words separated by a single underscore character. Function names should preferably have a verb in them somewhere. Good function names are print_login_status(), get_user_data(), etc.

    - -

    Function Arguments:

    -

    Arguments are subject to the same guidelines as variable names. We don't want a bunch of functions like: do_stuff($a, $b, $c). In most cases, we'd like to be able to tell how to use a function by just looking at its declaration.

    - -

    Summary:

    -

    The basic philosophy here is to not hurt code clarity for the sake of laziness. This has to be balanced by a little bit of common sense, though; print_login_status_for_a_given_user() goes too far, for example -- that function would be better named print_user_login_status(), or just print_login_status().

    - -

    Special Namings:

    -

    For all emoticons use the term smiley in singular and smilies in plural.

    - -

    2.ii. Code Layout

    - -

    Always include the braces:

    -

    This is another case of being too lazy to type 2 extra characters causing problems with code clarity. Even if the body of some construct is only one line long, do not drop the braces. Just don't, examples:

    - -

    // These are all wrong.

    - -
    -if (condition) do_stuff();
    -
    -if (condition)
    -	do_stuff();
    -
    -while (condition)
    -	do_stuff();
    -
    -for ($i = 0; $i < size; $i++)
    -	do_stuff($i);
    -	
    - -

    // These are all right.

    -
    -if (condition)
    -{
    -	do_stuff();
    -}
    -
    -while (condition)
    -{
    -	do_stuff();
    -}
    -
    -for ($i = 0; $i < size; $i++)
    -{
    -	do_stuff();
    -}
    -	
    - -

    Where to put the braces:

    -

    This one is a bit of a holy war, but we're going to use a style that can be summed up in one sentence: Braces always go on their own line. The closing brace should also always be at the same column as the corresponding opening brace, examples:

    - -
    -if (condition)
    -{
    -	while (condition2)
    -	{
    -		...
    -	}
    -}
    -else
    -{
    -	...
    -}
    -
    -for ($i = 0; $i < $size; $i++)
    -{
    -	...
    -}
    -
    -while (condition)
    -{
    -	...
    -}
    -
    -function do_stuff()
    -{
    -	...
    -}
    -	
    - -

    Use spaces between tokens:

    -

    This is another simple, easy step that helps keep code readable without much effort. Whenever you write an assignment, expression, etc.. Always leave one space between the tokens. Basically, write code as if it was English. Put spaces between variable names and operators. Don't put spaces just after an opening bracket or before a closing bracket. Don't put spaces just before a comma or a semicolon. This is best shown with a few examples, examples:

    - -

    // Each pair shows the wrong way followed by the right way.

    - -
    -$i=0;
    -$i = 0;
    -
    -if($i<7) ...
    -if ($i < 7) ...
    -
    -if ( ($i < 7)&&($j > 8) ) ...
    -if ($i < 7 && $j > 8) ...
    -
    -do_stuff( $i, 'foo', $b );
    -do_stuff($i, 'foo', $b);
    -
    -for($i=0; $i<$size; $i++) ...
    -for ($i = 0; $i < $size; $i++) ...
    -
    -$i=($j < $size)?0:1;
    -$i = ($j < $size) ? 0 : 1;
    -	
    - -

    Operator precedence:

    -

    Do you know the exact precedence of all the operators in PHP? Neither do I. Don't guess. Always make it obvious by using brackets to force the precedence of an equation so you know what it does. Remember to not over-use this, as it may harden the readability. Basically, do not enclose single expressions. Examples:

    - -

    // what's the result? who knows.

    -
    -$bool = ($i < 7 && $j > 8 || $k == 4);
    -	
    - -

    // now you can be certain what I'm doing here.

    -
    -$bool = (($i < 7) && (($j < 8) || ($k == 4)));
    -	
    - -

    // But this one is even better, because it is easier on the eye but the intention is preserved

    -
    -$bool = ($i < 7 && ($j < 8 || $k == 4));
    -	
    - -

    Quoting strings:

    -

    There are two different ways to quote strings in PHP - either with single quotes or with double quotes. The main difference is that the parser does variable interpolation in double-quoted strings, but not in single quoted strings. Because of this, you should always use single quotes unless you specifically need variable interpolation to be done on that string. This way, we can save the parser the trouble of parsing a bunch of strings where no interpolation needs to be done.

    -

    Also, if you are using a string variable as part of a function call, you do not need to enclose that variable in quotes. Again, this will just make unnecessary work for the parser. Note, however, that nearly all of the escape sequences that exist for double-quoted strings will not work with single-quoted strings. Be careful, and feel free to break this guideline if it's making your code easier to read, examples:

    - -

    // wrong

    -
    -$str = "This is a really long string with no variables for the parser to find.";
    -
    -do_stuff("$str");
    -	
    - -

    // right

    -
    -$str = 'This is a really long string with no variables for the parser to find.';
    -
    -do_stuff($str);
    -	
    - -

    // Sometimes single quotes are just not right

    -
    -$post_url = $phpbb_root_path . 'posting.' . $phpEx . '?mode=' . $mode . '&amp;start=' . $start;
    -	
    - -

    // Double quotes are sometimes needed to not overcroud the line with concentinations

    -
    -$post_url = "{$phpbb_root_path}posting.$phpEx?mode=$mode&amp;start=$start";
    -	
    - -

    In SQL Statements mixing single and double quotes is partly allowed (following the guidelines listed here about SQL Formatting), else it should be tryed to only use one method - mostly single quotes.

    - -

    Associative array keys:

    -

    In PHP, it's legal to use a literal string as a key to an associative array without quoting that string. We don't want to do this -- the string should always be quoted to avoid confusion. Note that this is only when we're using a literal, not when we're using a variable, examples:

    - -

    // wrong

    -
    -$foo = $assoc_array[blah];
    -	
    - -

    // right

    -
    -$foo = $assoc_array['blah'];
    -	
    - -

    // wrong

    -
    -$foo = $assoc_array["$var"];
    -	
    - -

    // right

    -
    -$foo = $assoc_array[$var];
    -	
    - -

    Comments:

    -

    Each complex function should be preceded by a comment that tells a programmer everything they need to know to use that function. The meaning of every parameter, the expected input, and the output are required as a minimal comment. The function's behaviour in error conditions (and what those error conditions are) should also be present - but mostly included within the comment about the output.

    Especially important to document are any assumptions the code makes, or preconditions for its proper operation. Any one of the developers should be able to look at any part of the application and figure out what's going on in a reasonable amount of time.

    Avoid using /* */ comment blocks for one-line comments, // should be used for one/two-liners.

    - -

    Magic numbers:

    -

    Don't use them. Use named constants for any literal value other than obvious special cases. Basically, it's ok to check if an array has 0 elements by using the literal 0. It's not ok to assign some special meaning to a number and then use it everywhere as a literal. This hurts readability AND maintainability. The constants true and false should be used in place of the literals 1 and 0 -- even though they have the same values (but not type!), it's more obvious what the actual logic is when you use the named constants. Typecast variables where it is needed, do not rely on the correct variable type (PHP is currently very loose on typecasting which can lead to security problems if a developer does not have a very close eye to it).

    - -

    Shortcut operators:

    -

    The only shortcut operators that cause readability problems are the shortcut increment $i++ and decrement $j-- operators. These operators should not be used as part of an expression. They can, however, be used on their own line. Using them in expressions is just not worth the headaches when debugging, examples:

    - -

    // wrong

    -
    -$array[++$i] = $j;
    -$array[$i++] = $k;
    -	
    - -

    // right

    -
    -$i++;
    -$array[$i] = $j;
    -
    -$array[$i] = $k;
    -$i++;
    -	
    - -

    Inline conditionals:

    -

    Inline conditionals should only be used to do very simple things. Preferably, they will only be used to do assignments, and not for function calls or anything complex at all. They can be harmful to readability if used incorrectly, so don't fall in love with saving typing by using them, examples:

    - -

    // Bad place to use them

    -
    -($i < $size && $j > $size) ? do_stuff($foo) : do_stuff($bar);
    -	
    - -

    // OK place to use them

    -
    -$min = ($i < $j) ? $i : $j;
    -	
    - -

    Don't use uninitialized variables.

    -

    For phpBB3, we intend to use a higher level of run-time error reporting. This will mean that the use of an uninitialized variable will be reported as a warning. These warnings can be avoided by using the built-in isset() function to check whether a variable has been set - but preferably the variable is always existing. For checking if an array has a key set this can come in handy though, examples:

    - -

    // Wrong

    -
    -if ($forum) ...
    -	
    - -

    // Right

    -
    -if (isset($forum)) ...
    -	
    - -

    // Also possible

    -
    -if (isset($forum) && $forum == 5)
    -	
    - -

    The empty() function is useful if you want to check if a variable is not set or being empty (an empty string, 0 as an integer or string, NULL, false, an empty array or a variable declared, but without a value in a class). Therefore empty should be used in favor of isset($array) && sizeof($array) > 0 - this can be written in a shorter way as !empty($array).

    - -

    Switch statements:

    -

    Switch/case code blocks can get a bit long sometimes. To have some level of notice and being in-line with the opening/closing brace requirement (where they are on the same line for better readability), this also applies to switch/case code blocks and the breaks. An example:

    - -

    // Wrong

    -
    -switch ($mode)
    -{
    -	case 'mode1':
    -		// I am doing something here
    -		break;
    -	case 'mode2':
    -		// I am doing something completely different here
    -		break;
    -}
    -	
    - -

    // Good

    -
    -switch ($mode)
    -{
    -	case 'mode1':
    -		// I am doing something here
    -	break;
    -
    -	case 'mode2':
    -		// I am doing something completely different here
    -	break;
    -
    -	default:
    -		// Always assume that the case got not catched
    -	break;
    -}
    -	
    - -

    // Also good, if you have more code between the case and the break

    -
    -switch ($mode)
    -{
    -	case 'mode1':
    -
    -		// I am doing something here
    -
    -	break;
    -
    -	case 'mode2':
    -
    -		// I am doing something completely different here
    -
    -	break;
    -
    -	default:
    -
    -		// Always assume that the case got not catched
    -
    -	break;
    -}
    -	
    - -

    Even if the break for the default case is not needed, it is sometimes better to include it just for readability and completeness.

    - -

    If no break is intended, please add a comment instead. An example:

    - -

    // Example with no break

    -
    -switch ($mode)
    -{
    -	case 'mode1':
    -
    -		// I am doing something here
    -
    -	// no break here
    -
    -	case 'mode2':
    -
    -		// I am doing something completely different here
    -
    -	break;
    -
    -	default:
    -
    -		// Always assume that the case got not catched
    -
    -	break;
    -}
    -	
    - -

    2.iii. SQL/SQL Layout

    - -

    Common SQL Guidelines:

    -

    All SQL should be cross-DB compatible, if DB specific SQL is used alternatives must be provided which work on all supported DB's (MySQL3/4/5, MSSQL (7.0 and 2000), PostgreSQL (7.0+), Firebird, SQLite, Oracle8, ODBC (generalised if possible)).

    -

    All SQL commands should utilise the DataBase Abstraction Layer (DBAL)

    - -

    SQL code layout:

    -

    SQL Statements are often unreadable without some formatting, since they tend to be big at times. Though the formatting of sql statements adds a lot to the readability of code. SQL statements should be formatted in the following way, basically writing keywords:

    - -
    -$sql = 'SELECT *
    -<-one tab->FROM ' . SOME_TABLE . '
    -<-one tab->WHERE a = 1
    -<-two tabs->AND (b = 2
    -<-three tabs->OR b = 3)
    -<-one tab->ORDER BY b';
    -	
    - -

    Here the example with the tabs applied:

    - -
    -$sql = 'SELECT *
    -	FROM ' . SOME_TABLE . '
    -	WHERE a = 1
    -		AND (b = 2
    -			OR b = 3)
    -	ORDER BY b';
    -	
    - -

    SQL Quotes:

    -

    Double quotes where applicable (The variables in these examples are typecasted to integers before) ... examples:

    - -

    // These are wrong.

    -
    -"UPDATE " . SOME_TABLE . " SET something = something_else WHERE a = $b";
    -
    -'UPDATE ' . SOME_TABLE . ' SET something = ' . $user_id . ' WHERE a = ' . $something;
    -	
    - -

    // These are right.

    - -
    -'UPDATE ' . SOME_TABLE . " SET something = something_else WHERE a = $b";
    -
    -'UPDATE ' . SOME_TABLE . " SET something = $user_id WHERE a = $something";
    -	
    - -

    In other words use single quotes where no variable substitution is required or where the variable involved shouldn't appear within double quotes. Otherwise use double quotes.

    - -

    Avoid DB specific SQL:

    -

    The "not equals operator", as defined by the SQL:2003 standard, is "<>"

    - -

    // This is wrong.

    -
    -$sql = 'SELECT *
    -	FROM ' . SOME_TABLE . '
    -	WHERE a != 2';
    -	
    - -

    // This is right.

    -
    -$sql = 'SELECT *
    -	FROM ' . SOME_TABLE . '
    -	WHERE a <> 2';
    -	
    - -

    Common DBAL methods:

    - -

    sql_escape():

    - -

    Always use $db->sql_escape() if you need to check for a string within an SQL statement (even if you are sure the variable cannot contain single quotes - never trust your input), for example:

    - -
    -$sql = 'SELECT *
    -	FROM ' . SOME_TABLE . "
    -	WHERE username = '" . $db->sql_escape($username) . "'";
    -	
    - -

    sql_query_limit():

    - -

    We do not add limit statements to the sql query, but instead use $db->sql_query_limit(). You basically pass the query, the total number of lines to retrieve and the offset.

    - -

    Note: Since Oracle handles limits differently and because of how we implemented this handling you need to take special care if you use sql_query_limit with an sql query retrieving data from more than one table.

    - -

    Make sure when using something like "SELECT x.*, y.jars" that there is not a column named jars in x; make sure that there is no overlap between an implicit column and the explicit columns.

    - -

    sql_build_array():

    - -

    If you need to UPDATE or INSERT data, make use of the $db->sql_build_array() function. This function already escapes strings and checks other types, so there is no need to do this here. The data to be inserted should go into an array - $sql_ary - or directly within the statement if one or two variables needs to be inserted/updated. An example of an insert statement would be:

    - -
    -$sql_ary = array(
    -	'somedata'		=> $my_string,
    -	'otherdata'		=> $an_int,
    -	'moredata'		=> $another_int
    -);
    -
    -$db->sql_query('INSERT INTO ' . SOME_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
    -	
    - -

    To complete the example, this is how an update statement would look like:

    - -
    -$sql_ary = array(
    -	'somedata'		=> $my_string,
    -	'otherdata'		=> $an_int,
    -	'moredata'		=> $another_int
    -);
    -
    -$sql = 'UPDATE ' . SOME_TABLE . '
    -	SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
    -	WHERE user_id = ' . (int) $user_id;
    -$db->sql_query($sql);
    -	
    - -

    The $db->sql_build_array() function supports the following modes: INSERT (example above), INSERT_SELECT (building query for INSERT INTO table (...) SELECT value, column ... statements), MULTI_INSERT (for returning extended inserts), UPDATE (example above) and SELECT (for building WHERE statement [AND logic]).

    - -

    sql_in_set():

    - -

    The $db->sql_in_set() function should be used for building IN () and NOT IN () constructs. Since (specifically) MySQL tend to be faster if for one value to be compared the = and <> operator is used, we let the DBAL decide what to do. A typical example of doing a positive match against a number of values would be:

    - -
    -$sql = 'SELECT *
    -	FROM ' . FORUMS_TABLE . '
    -	WHERE ' . $db->sql_in_set('forum_id', $forum_ids);
    -$db->sql_query($sql);
    -	
    - -

    Based on the number of values in $forum_ids, the query can look differently.

    - -

    // SQL Statement if $forum_ids = array(1, 2, 3);

    - -
    -SELECT FROM phpbb_forums WHERE forum_id IN (1, 2, 3)
    -	
    - -

    // SQL Statement if $forum_ids = array(1) or $forum_ids = 1

    - -
    -SELECT FROM phpbb_forums WHERE forum_id = 1
    -	
    - -

    Of course the same is possible for doing a negative match against a number of values:

    - -
    -$sql = 'SELECT *
    -	FROM ' . FORUMS_TABLE . '
    -	WHERE ' . $db->sql_in_set('forum_id', $forum_ids, true);
    -$db->sql_query($sql);
    -	
    - -

    Based on the number of values in $forum_ids, the query can look differently here too.

    - -

    // SQL Statement if $forum_ids = array(1, 2, 3);

    - -
    -SELECT FROM phpbb_forums WHERE forum_id NOT IN (1, 2, 3)
    -	
    - -

    // SQL Statement if $forum_ids = array(1) or $forum_ids = 1

    - -
    -SELECT FROM phpbb_forums WHERE forum_id <> 1
    -	
    - -

    If the given array is empty, an error will be produced.

    - -

    sql_build_query():

    - -

    The $db->sql_build_query() function is responsible for building sql statements for select and select distinct queries if you need to JOIN on more than one table or retrieving data from more than one table while doing a JOIN. This needs to be used to make sure the resulting statement is working on all supported db's. Instead of explaining every possible combination, i will give a short example:

    - -
    -$sql_array = array(
    -	'SELECT'	=> 'f.*, ft.mark_time',
    -
    -	'FROM'		=> array(
    -		FORUMS_WATCH_TABLE	=> 'fw',
    -		FORUMS_TABLE		=> 'f'
    -	),
    -
    -	'LEFT_JOIN'	=> array(
    -		array(
    -			'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
    -			'ON'	=> 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id'
    -		)
    -	),
    -
    -	'WHERE'		=> 'fw.user_id = ' . $user->data['user_id'] . '
    -		AND f.forum_id = fw.forum_id',
    -
    -	'ORDER_BY'	=> 'left_id'
    -);
    -
    -$sql = $db->sql_build_query('SELECT', $sql_array);
    -	
    - -

    The possible first parameter for sql_build_query() is SELECT or SELECT_DISTINCT. As you can see, the logic is pretty self-explaining. For the LEFT_JOIN key, just add another array if you want to join on to tables for example. The added benefit of using this construct is that you are able to easily build the query statement based on conditions - for example the above LEFT_JOIN is only necessary if server side topic tracking is enabled; a slight adjustement would be:

    - -
    -$sql_array = array(
    -	'SELECT'	=> 'f.*',
    -
    -	'FROM'		=> array(
    -		FORUMS_WATCH_TABLE	=> 'fw',
    -		FORUMS_TABLE		=> 'f'
    -	),
    -
    -	'WHERE'		=> 'fw.user_id = ' . $user->data['user_id'] . '
    -		AND f.forum_id = fw.forum_id',
    -
    -	'ORDER_BY'	=> 'left_id'
    -);
    -
    -if ($config['load_db_lastread'])
    -{
    -	$sql_array['LEFT_JOIN'] = array(
    -		array(
    -			'FROM'	=> array(FORUMS_TRACK_TABLE => 'ft'),
    -			'ON'	=> 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id'
    -		)
    -	);
    -
    -	$sql_array['SELECT'] .= ', ft.mark_time ';
    -}
    -else
    -{
    -	// Here we read the cookie data
    -}
    -
    -$sql = $db->sql_build_query('SELECT', $sql_array);
    -	
    - -

    2.iv. Optimizations

    - -

    Operations in loop definition:

    -

    Always try to optimize your loops if operations are going on at the comparing part, since this part is executed every time the loop is parsed through. For assignments a descriptive name should be chosen. Example:

    - -

    // On every iteration the sizeof function is called

    -
    -for ($i = 0; $i < sizeof($post_data); $i++)
    -{
    -	do_something();
    -}
    -	
    - -

    // You are able to assign the (not changing) result within the loop itself

    -
    -for ($i = 0, $size = sizeof($post_data); $i < $size; $i++)
    -{
    -	do_something();
    -}
    -	
    - -

    Use of in_array():

    -

    Try to avoid using in_array() on huge arrays, and try to not place them into loops if the array to check consist of more than 20 entries. in_array() can be very time consuming and uses a lot of cpu processing time. For little checks it is not noticable, but if checked against a huge array within a loop those checks alone can be a bunch of seconds. If you need this functionality, try using isset() on the arrays keys instead, actually shifting the values into keys and vice versa. A call to isset($array[$var]) is a lot faster than in_array($var, array_keys($array)) for example.

    - - -

    2.v. General Guidelines

    - -

    General things:

    -

    Never trust user input (this also applies to server variables as well as cookies).

    -

    Try to sanitize values returned from a function.

    -

    Try to sanitize given function variables within your function.

    -

    The auth class should be used for all authorisation checking.

    -

    No attempt should be made to remove any copyright information (either contained within the source or displayed interactively when the source is run/compiled), neither should the copyright information be altered in any way (it may be added to).

    - -

    Variables:

    -

    Make use of the request_var() function for anything except for submit or single checking params.

    -

    The request_var function determines the type to set from the second parameter (which determines the default value too). If you need to get a scalar variable type, you need to tell this the request_var function explicitly. Examples:

    - -

    // Old method, do not use it

    -
    -$start = (isset($HTTP_GET_VARS['start'])) ? intval($HTTP_GET_VARS['start']) : intval($HTTP_POST_VARS['start']);
    -$submit = (isset($HTTP_POST_VARS['submit'])) ? true : false;
    -	
    - -

    // Use request var and define a default variable (use the correct type)

    -
    -$start = request_var('start', 0);
    -$submit = (isset($_POST['submit'])) ? true : false;
    -	
    - -

    // $start is an int, the following use of request_var therefore is not allowed

    -
    -$start = request_var('start', '0');
    -	
    - -

    // Getting an array, keys are integers, value defaults to 0

    -
    -$mark_array = request_var('mark', array(0));
    -	
    - -

    // Getting an array, keys are strings, value defaults to 0

    -
    -$action_ary = request_var('action', array('' => 0));
    -	
    - -

    Login checks/redirection:

    -

    To show a forum login box use login_forum_box($forum_data), else use the login_box() function.

    - -

    The login_box() function can have a redirect as the first parameter. As a thumb of rule, specify an empty string if you want to redirect to the users current location, else do not add the $SID to the redirect string (for example within the ucp/login we redirect to the board index because else the user would be redirected to the login screen).

    - -

    Sensitive Operations:

    -

    For sensitive operations always let the user confirm the action. For the confirmation screens, make use of the confirm_box() function.

    - -

    Altering Operations:

    -

    For operations altering the state of the database, for instance posting, always verify the form token, unless you are already using confirm_box(). To do so, make use of the add_form_key() and check_form_key() functions.

    -
    -	add_form_key('my_form');
    -
    -	if ($submit)
    -	{
    -		if (!check_form_key('my_form'))
    -		{
    -			trigger_error('FORM_INVALID');
    -		}
    -	}
    -	
    - -

    The string passed to add_form_key() needs to match the string passed to check_form_key(). Another requirement for this to work correctly is that all forms include the {S_FORM_TOKEN} template variable.

    - - -

    Sessions:

    -

    Sessions should be initiated on each page, as near the top as possible using the following code:

    - -
    -$user->session_begin();
    -$auth->acl($user->data);
    -$user->setup();
    -	
    - -

    The $user->setup() call can be used to pass on additional language definition and a custom style (used in viewforum).

    - -

    Errors and messages:

    -

    All messages/errors should be outputed by calling trigger_error() using the appropriate message type and language string. Example:

    - -
    -trigger_error('NO_FORUM');
    -	
    - -
    -trigger_error($user->lang['NO_FORUM']);
    -	
    - -
    -trigger_error('NO_MODE', E_USER_ERROR);
    -	
    - -

    Url formatting

    - -

    All urls pointing to internal files need to be prepended by the $phpbb_root_path variable. Within the administration control panel all urls pointing to internal files need to be prepended by the $phpbb_admin_path variable. This makes sure the path is always correct and users being able to just rename the admin folder and the acp still working as intended (though some links will fail and the code need to be slightly adjusted).

    - -

    The append_sid() function from 2.0.x is available too, though does not handle url alterations automatically. Please have a look at the code documentation if you want to get more details on how to use append_sid(). A sample call to append_sid() can look like this:

    - -
    -append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&amp;g=' . $row['group_id'])
    -	
    - -

    General function usage:

    - -

    Some of these functions are only chosen over others because of personal preference and having no other benefit than to be consistant over the code.

    - -
      -
    • -

      Use sizeof instead of count

      -
    • -
    • -

      Use strpos instead of strstr

      -
    • -
    • -

      Use else if instead of elseif

      -
    • -
    • -

      Use false (lowercase) instead of FALSE

      -
    • -
    • -

      Use true (lowercase) instead of TRUE

      -
    • -
    - -

    Exiting

    - -

    Your page should either call page_footer() in the end to trigger output through the template engine and terminate the script, or alternatively at least call the exit_handler(). That call is necessary because it provides a method for external applications embedding phpBB to be called at the end of the script.

    - -
    - - - -
    -
    - -
    - -

    3. Styling

    -
    -
    - -
    - -

    General things

    -

    Templates should be produced in a consistent manner. Where appropriate they should be based off an existing copy, e.g. index, viewforum or viewtopic (the combination of which implement a range of conditional and variable forms). Please also note that the intendation and coding guidelines also apply to templates where possible.

    - -

    The outer table class forumline has gone and is replaced with tablebg.

    -

    When writing <table> the order <table class="" cellspacing="" cellpadding="" border="" align=""> creates consistency and allows everyone to easily see which table produces which "look". The same applies to most other tags for which additional parameters can be set, consistency is the major aim here.

    -

    Each block level element should be indented by one tab, same for tabular elements, e.g. <tr> <td> etc., whereby the intendiation of <table> and the following/ending <tr> should be on the same line. This applies not to div elements of course.

    -

    Don't use <span> more than is essential ... the CSS is such that text sizes are dependent on the parent class. So writing <span class="gensmall"><span class="gensmall">TEST</span></span> will result in very very small text. Similarly don't use span at all if another element can contain the class definition, e.g.

    - -
    -<td><span class="gensmall">TEST</span></td>
    -
    - -

    can just as well become:

    -
    -<td class="gensmall">TEST</td>
    -
    - -

    Try to match text class types with existing useage, e.g. don't use the nav class where viewtopic uses gensmall for example.

    - -

    Row colours/classes are now defined by the template, use an IF S_ROW_COUNT switch, see viewtopic or viewforum for an example.

    - -

    Remember block level ordering is important ... while not all pages validate as XHTML 1.0 Strict compliant it is something we're trying to work too.

    - -

    Use a standard cellpadding of 2 and cellspacing of 0 on outer tables. Inner tables can vary from 0 to 3 or even 4 depending on the need.

    - -

    Use div container/css for styling and table for data representation.

    - -

    The separate catXXXX and thXXX classes are gone. When defining a header cell just use <th> rather than <th class="thHead"> etc. Similarly for cat, don't use <td class="catLeft"> use <td class="cat"> etc.

    - -

    Try to retain consistency of basic layout and class useage, i.e. _EXPLAIN text should generally be placed below the title it explains, e.g. {L_POST_USERNAME}<br /><span class="gensmall">{L_POST_USERNAME_EXPLAIN}</span> is the typical way of handling this ... there may be exceptions and this isn't a hard and fast rule.

    - -

    Try to keep template conditional and other statements tabbed in line with the block to which they refer.

    - -

    this is correct

    -
    -<!-- BEGIN test -->
    -	<tr>
    -		<td>{test.TEXT}</td>
    -	</tr>
    -<!-- END test -->
    -
    - -

    this is also correct:

    -
    -<!-- BEGIN test -->
    -<tr>
    -	<td>{test.TEXT}</td>
    -</tr>
    -<!-- END test -->
    -
    - -

    it gives immediate feedback on exactly what is looping - decide which way to use based on the readability.

    - -
    - - - -
    -
    - -
    - -

    4. Templating

    -
    -
    - -
    - -

    File naming

    -

    Firstly templates now take the suffix ".html" rather than ".tpl". This was done simply to make the lifes of some people easier wrt syntax highlighting, etc.

    - -

    Variables

    -

    All template variables should be named appropriately (using underscores for spaces), language entries should be prefixed with L_, system data with S_, urls with U_, javascript urls with UA_, language to be put in javascript statements with LA_, all other variables should be presented 'as is'.

    - -

    L_* template variables are automatically tried to be mapped to the corresponding language entry if the code does not set (and therefore overwrite) this variable specifically. For example {L_USERNAME} maps to $user->lang['USERNAME']. The LA_* template variables are handled within the same way, but properly escaped to be put in javascript code. This should reduce the need to assign loads of new lang vars in Modifications. -

    - -

    Blocks/Loops

    -

    The basic block level loop remains and takes the form:

    -
    -<!-- BEGIN loopname -->
    -	markup, {loopname.X_YYYYY}, etc.
    -<!-- END loopname -->
    -
    - -

    A bit later loops will be explained further. To not irritate you we will explain conditionals as well as other statements first.

    - -

    Including files

    -

    Something that existed in 2.0.x which no longer exists in 3.0.x is the ability to assign a template to a variable. This was used (for example) to output the jumpbox. Instead (perhaps better, perhaps not but certainly more flexible) we now have INCLUDE. This takes the simple form:

    - -
    -<!-- INCLUDE filename -->
    -
    - -

    You will note in the 3.0 templates the major sources start with <!-- INCLUDE overall_header.html --> or <!-- INCLUDE simple_header.html -->, etc. In 2.0.x control of "which" header to use was defined entirely within the code. In 3.0.x the template designer can output what they like. Note that you can introduce new templates (i.e. other than those in the default set) using this system and include them as you wish ... perhaps useful for a common "menu" bar or some such. No need to modify loads of files as with 2.0.x.

    - -

    PHP

    -

    A contentious decision has seen the ability to include PHP within the template introduced. This is achieved by enclosing the PHP within relevant tags:

    - -
    -<!-- PHP -->
    -	echo "hello!";
    -<!-- ENDPHP -->
    -
    - -

    You may also include PHP from an external file using:

    - -
    -<!-- INCLUDEPHP somefile.php -->
    -
    - -

    it will be included and executed inline.

    A note, it is very much encouraged that template designers do not include PHP. The ability to include raw PHP was introduced primarily to allow end users to include banner code, etc. without modifying multiple files (as with 2.0.x). It was not intended for general use ... hence www.phpbb.com will not make available template sets which include PHP. And by default templates will have PHP disabled (the admin will need to specifically activate PHP for a template).

    - -

    Conditionals/Control structures

    -

    The most significant addition to 3.0.x are conditions or control structures, "if something then do this else do that". The system deployed is very similar to Smarty. This may confuse some people at first but it offers great potential and great flexibility with a little imagination. In their most simple form these constructs take the form:

    - -
    -<!-- IF expr -->
    -	markup
    -<!-- ENDIF -->
    -
    - -

    expr can take many forms, for example:

    - -
    -<!-- IF loop.S_ROW_COUNT is even -->
    -	markup
    -<!-- ENDIF -->
    -
    - -

    This will output the markup if the S_ROW_COUNT variable in the current iteration of loop is an even value (i.e. the expr is TRUE). You can use various comparison methods (standard as well as equivalent textual versions noted in square brackets) including (not, or, and, eq, neq, is should be used if possible for better readability):

    - -
    -== [eq]
    -!= [neq, ne]
    -<> (same as !=)
    -!== (not equivalent in value and type)
    -=== (equivalent in value and type)
    -> [gt]
    -< [lt]
    ->= [gte]
    -<= [lte]
    -&& [and]
    -|| [or]
    -% [mod]
    -! [not]
    -+
    --
    -*
    -/
    -,
    -<< (bitwise shift left)
    ->> (bitwise shift right)
    -| (bitwise or)
    -^ (bitwise xor)
    -& (bitwise and)
    -~ (bitwise not)
    -is (can be used to join comparison operations)
    -
    - -

    Basic parenthesis can also be used to enforce good old BODMAS rules. Additionally some basic comparison types are defined:

    - -
    -even
    -odd
    -div
    -
    - -

    Beyond the simple use of IF you can also do a sequence of comparisons using the following:

    - -
    -<!-- IF expr1 -->
    -	markup
    -<!-- ELSEIF expr2 -->
    -	markup
    -	.
    -	.
    -	.
    -<!-- ELSEIF exprN -->
    -	markup
    -<!-- ELSE -->
    -	markup
    -<!-- ENDIF -->
    -
    - -

    Each statement will be tested in turn and the relevant output generated when a match (if a match) is found. It is not necessary to always use ELSEIF, ELSE can be used alone to match "everything else".

    So what can you do with all this? Well take for example the colouration of rows in viewforum. In 2.0.x row colours were predefined within the source as either row color1, row color2 or row class1, row class2. In 3.0.x this is moved to the template, it may look a little daunting at first but remember control flows from top to bottom and it's not too difficult:

    - -
    -<table>
    -	<!-- IF loop.S_ROW_COUNT is even -->
    -		<tr class="row1">
    -	<!-- ELSE -->
    -		<tr class="row2">
    -	<!-- ENDIF -->
    -	<td>HELLO!</td>
    -</tr>
    -</table>
    -
    - -

    This will cause the row cell to be output using class row1 when the row count is even, and class row2 otherwise. The S_ROW_COUNT parameter gets assigned to loops by default. Another example would be the following:

    - -
    -<table>
    -	<!-- IF loop.S_ROW_COUNT > 10 -->
    -		<tr bgcolor="#FF0000">
    -	<!-- ELSEIF loop.S_ROW_COUNT > 5 -->
    -		<tr bgcolor="#00FF00">
    -	<!-- ELSEIF loop.S_ROW_COUNT > 2 -->
    -		<tr bgcolor="#0000FF">
    -	<!-- ELSE -->
    -		<tr bgcolor="#FF00FF">
    -	<!-- ENDIF -->
    -	<td>hello!</td>
    -</tr>
    -</table>
    -
    - -

    This will output the row cell in purple for the first two rows, blue for rows 2 to 5, green for rows 5 to 10 and red for remainder. So, you could produce a "nice" gradient effect, for example.

    What else can you do? Well, you could use IF to do common checks on for example the login state of a user:

    - -
    -<!-- IF S_USER_LOGGED_IN -->
    -	markup
    -<!-- ENDIF -->
    -
    - -

    This replaces the existing (fudged) method in 2.0.x using a zero length array and BEGIN/END.

    - -

    Extended syntax for Blocks/Loops

    - -

    Back to our loops - they had been extended with the following additions. Firstly you can set the start and end points of the loop. For example:

    - -
    -<!-- BEGIN loopname(2) -->
    -	markup
    -<!-- END loopname -->
    -
    - -

    Will start the loop on the third entry (note that indexes start at zero). Extensions of this are: -

    -loopname(2): Will start the loop on the 3rd entry
    -loopname(-2): Will start the loop two entries from the end
    -loopname(3,4): Will start the loop on the fourth entry and end it on the fifth
    -loopname(3,-4): Will start the loop on the fourth entry and end it four from last
    -

    - -

    A further extension to begin is BEGINELSE:

    - -
    -<!-- BEGIN loop -->
    -	markup
    -<!-- BEGINELSE -->
    -	markup
    -<!-- END loop -->
    -
    - -

    This will cause the markup between BEGINELSE and END to be output if the loop contains no values. This is useful for forums with no topics (for example) ... in some ways it replaces "bits of" the existing "switch_" type control (the rest being replaced by conditionals).

    - -

    Another way of checking if a loop contains values is by prefixing the loops name with a dot:

    - -
    -<!-- IF .loop -->
    -	<!-- BEGIN loop -->
    -		markup
    -	<!-- END loop -->
    -<!-- ELSE -->
    -	markup
    -<!-- ENDIF -->
    -
    - -

    You are even able to check the number of items within a loop by comparing it with values within the IF condition:

    - -
    -<!-- IF .loop > 2 -->
    -	<!-- BEGIN loop -->
    -		markup
    -	<!-- END loop -->
    -<!-- ELSE -->
    -	markup
    -<!-- ENDIF -->
    -
    - -

    Nesting loops cause the conditionals needing prefixed with all loops from the outer one to the inner most. An illustration of this:

    - -
    -<!-- BEGIN firstloop -->
    -	{firstloop.MY_VARIABLE_FROM_FIRSTLOOP}
    -
    -	<!-- BEGIN secondloop -->
    -		{firstloop.secondloop.MY_VARIABLE_FROM_SECONDLOOP}
    -	<!-- END secondloop -->
    -<!-- END firstloop -->
    -
    - -

    Sometimes it is necessary to break out of nested loops to be able to call another loop within the current iteration. This sounds a little bit confusing and it is not used very often. The following (rather complex) example shows this quite good - it also shows how you test for the first and last row in a loop (i will explain the example in detail further down):

    - -
    -<!-- BEGIN l_block1 -->
    -	<!-- IF l_block1.S_SELECTED -->
    -		<strong>{l_block1.L_TITLE}</strong>
    -		<!-- IF S_PRIVMSGS -->
    -
    -			<!-- the ! at the beginning of the loop name forces the loop to be not a nested one of l_block1 -->
    -			<!-- BEGIN !folder -->
    -				<!-- IF folder.S_FIRST_ROW -->
    -					<ul class="nav">
    -				<!-- ENDIF -->
    -
    -				<li><a href="{folder.U_FOLDER}">{folder.FOLDER_NAME}</a></li>
    -
    -				<!-- IF folder.S_LAST_ROW -->
    -					</ul>
    -				<!-- ENDIF -->
    -			<!-- END !folder -->
    -
    -		<!-- ENDIF -->
    -
    -		<ul class="nav">
    -		<!-- BEGIN l_block2 -->
    -			<li>
    -				<!-- IF l_block1.l_block2.S_SELECTED -->
    -					<strong>{l_block1.l_block2.L_TITLE}</strong>
    -				<!-- ELSE -->
    -					<a href="{l_block1.l_block2.U_TITLE}">{l_block1.l_block2.L_TITLE}</a>
    -				<!-- ENDIF -->
    -			</li>
    -		<!-- END l_block2 -->
    -		</ul>
    -	<!-- ELSE -->
    -		<a class="nav" href="{l_block1.U_TITLE}">{l_block1.L_TITLE}</a>
    -	<!-- ENDIF -->
    -<!-- END l_block1 -->
    -
    - -

    Let us first concentrate on this part of the example:

    - -
    -<!-- BEGIN l_block1 -->
    -	<!-- IF l_block1.S_SELECTED -->
    -		markup
    -	<!-- ELSE -->
    -		<a class="nav" href="{l_block1.U_TITLE}">{l_block1.L_TITLE}</a>
    -	<!-- ENDIF -->
    -<!-- END l_block1 -->
    -
    - -

    Here we open the loop l_block1 and doing some things if the value S_SELECTED within the current loop iteration is true, else we write the blocks link and title. Here, you see {l_block1.L_TITLE} referenced - you remember that L_* variables get automatically assigned the corresponding language entry? This is true, but not within loops. The L_TITLE variable within the loop l_block1 is assigned within the code itself.

    - -

    Let's have a closer look to the markup:

    - -
    -<!-- BEGIN l_block1 -->
    -.
    -.
    -	<!-- IF S_PRIVMSGS -->
    -
    -		<!-- BEGIN !folder -->
    -			<!-- IF folder.S_FIRST_ROW -->
    -				<ul class="nav">
    -			<!-- ENDIF -->
    -
    -			<li><a href="{folder.U_FOLDER}">{folder.FOLDER_NAME}</a></li>
    -
    -			<!-- IF folder.S_LAST_ROW -->
    -				</ul>
    -			<!-- ENDIF -->
    -		<!-- END !folder -->
    -
    -	<!-- ENDIF -->
    -.
    -.
    -<!-- END l_block1 -->
    -
    - -

    The <!-- IF S_PRIVMSGS --> statement clearly checks a global variable and not one within the loop, since the loop is not given here. So, if S_PRIVMSGS is true we execute the shown markup. Now, you see the <!-- BEGIN !folder --> statement. The exclamation mark is responsible for instructing the template engine to iterate through the main loop folder. So, we are now within the loop folder - with <!-- BEGIN folder --> we would have been within the loop l_block1.folder automatically as is the case with l_block2:

    - -
    -<!-- BEGIN l_block1 -->
    -.
    -.
    -	<ul class="nav">
    -	<!-- BEGIN l_block2 -->
    -		<li>
    -			<!-- IF l_block1.l_block2.S_SELECTED -->
    -				<strong>{l_block1.l_block2.L_TITLE}</strong>
    -			<!-- ELSE -->
    -				<a href="{l_block1.l_block2.U_TITLE}">{l_block1.l_block2.L_TITLE}</a>
    -			<!-- ENDIF -->
    -		</li>
    -	<!-- END l_block2 -->
    -	</ul>
    -.
    -.
    -<!-- END l_block1 -->
    -
    - -

    You see the difference? The loop l_block2 is a member of the loop l_block1 but the loop folder is a main loop.

    - -

    Now back to our folder loop:

    - -
    -<!-- IF folder.S_FIRST_ROW -->
    -	<ul class="nav">
    -<!-- ENDIF -->
    -
    -<li><a href="{folder.U_FOLDER}">{folder.FOLDER_NAME}</a></li>
    -
    -<!-- IF folder.S_LAST_ROW -->
    -	</ul>
    -<!-- ENDIF -->
    -
    - -

    You may have wondered what the comparison to S_FIRST_ROW and S_LAST_ROW is about. If you haven't guessed already - it is checking for the first iteration of the loop with S_FIRST_ROW and the last iteration with S_LAST_ROW. This can come in handy quite often if you want to open or close design elements, like the above list. Let us imagine a folder loop build with three iterations, it would go this way:

    - -
    -<ul class="nav"> <!-- written on first iteration -->
    -	<li>first element</li> <!-- written on first iteration -->
    -	<li>second element</li> <!-- written on second iteration -->
    -	<li>third element</li> <!-- written on third iteration -->
    -</ul> <!-- written on third iteration -->
    -
    - -

    As you can see, all three elements are written down as well as the markup for the first iteration and the last one. Sometimes you want to omit writing the general markup - for example:

    - -
    -<!-- IF folder.S_FIRST_ROW -->
    -	<ul class="nav">
    -<!-- ELSEIF folder.S_LAST_ROW -->
    -	</ul>
    -<!-- ELSE -->
    -	<li><a href="{folder.U_FOLDER}">{folder.FOLDER_NAME}</a></li>
    -<!-- ENDIF -->
    -
    - -

    would result in the following markup:

    - -
    -<ul class="nav"> <!-- written on first iteration -->
    -	<li>second element</li> <!-- written on second iteration -->
    -</ul> <!-- written on third iteration -->
    -
    - -

    Just always remember that processing is taking place from up to down.

    - -

    Forms

    -

    If a form is used for a non-trivial operation (i.e. more than a jumpbox), then it should include the {S_FORM_TOKEN} template variable.

    -
    -<form method="post" id="mcp" action="{U_POST_ACTION}">
    -
    -	<fieldset class="submit-buttons">
    -		<input type="reset" value="{L_RESET}" name="reset" class="button2" /> 
    -		<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" />
    -		{S_FORM_TOKEN}
    -	</fieldset>
    -</form>
    -		

    -
    - - - -
    -
    - -
    - - - -

    5. Character Sets and Encodings

    - -
    -
    - -
    - - - -

    What are Unicode, UCS and UTF-8?

    -

    The Universal Character Set (UCS) described in ISO/IEC 10646 consists of a large amount of characters. Each of them has a unique name and a code point which is an integer number. Unicode - which is an industry standard - complements the Universal Character Set with further information about the characters' properties and alternative character encodings. More information on Unicode can be found on the Unicode Consortium's website. One of the Unicode encodings is the 8-bit Unicode Transformation Format (UTF-8). It encodes characters with up to four bytes aiming for maximum compatability with the American Standard Code for Information Interchange which is a 7-bit encoding of a relatively small subset of the UCS.

    - -

    phpBB's use of Unicode

    -

    Unfortunately PHP does not faciliate the use of Unicode prior to version 6. Most functions simply treat strings as sequences of bytes assuming that each character takes up exactly one byte. This behaviour still allows for storing UTF-8 encoded text in PHP strings but many operations on strings have unexpected results. To circumvent this problem we have created some alternative functions to PHP's native string operations which use code points instead of bytes. These functions can be found in /includes/utf/utf_tools.php. They are also covered in the phpBB3 Sourcecode Documentation. A lot of native PHP functions still work with UTF-8 as long as you stick to certain restrictions. For example explode still works as long as the first and the last character of the delimiter string are ASCII characters.

    - -

    phpBB only uses the ASCII and the UTF-8 character encodings. Still all Strings are UTF-8 encoded because ASCII is a subset of UTF-8. The only exceptions to this rule are code sections which deal with external systems which use other encodings and character sets. Such external data should be converted to UTF-8 using the utf8_recode() function supplied with phpBB. It supports a variety of other character sets and encodings, a full list can be found below.

    - -

    With request_var() you can either allow all UCS characters in user input or restrict user input to ASCII characters. This feature is controlled by the function's third parameter called $multibyte. You should allow multibyte characters in posts, PMs, topic titles, forum names, etc. but it's not necessary for internal uses like a $mode variable which should only hold a predefined list of ASCII strings anyway.

    - -
    -// an input string containing a multibyte character
    -$_REQUEST['multibyte_string'] = 'Käse';
    -
    -// print request variable as a UTF-8 string allowing multibyte characters
    -echo request_var('multibyte_string', '', true);
    -// print request variable as ASCII string
    -echo request_var('multibyte_string', '');
    -
    - -

    This code snippet will generate the following output:

    - -
    -Käse
    -K??se
    -
    - -

    Unicode Normalization

    - -

    If you retrieve user input with multibyte characters you should additionally normalize the string using utf8_normalize_nfc() before you work with it. This is necessary to make sure that equal characters can only occur in one particular binary representation. For example the character Å can be represented either as U+00C5 (LATIN CAPITAL LETTER A WITH RING ABOVE) or as U+212B (ANGSTROM SIGN). phpBB uses Normalization Form Canonical Composition (NFC) for all text. So the correct version of the above example would look like this:

    - -
    -$_REQUEST['multibyte_string'] = 'Käse';
    -
    -// normalize multibyte strings
    -echo utf8_normalize_nfc(request_var('multibyte_string', '', true));
    -// ASCII strings do not need to be normalized
    -echo request_var('multibyte_string', '');
    -
    - -

    Case Folding

    - -

    Case insensitive comparison of strings is no longer possible with strtolower or strtoupper as some characters have multiple lower case or multiple upper case forms depending on their position in a word. The utf8_strtolower and the utf8_strtoupper functions suffer from the same problem so they can only be used to display upper/lower case versions of a string but they cannot be used for case insensitive comparisons either. So instead you should use case folding which gives you a case insensitive version of the string which can be used for case insensitive comparisons. An NFC normalized string can be case folded using utf8_case_fold_nfc().

    - -

    // Bad - The strings might be the same even if strtolower differs

    - -
    -if (strtolower($string1) == strtolower($string2))
    -{
    -	echo '$string1 and $string2 are equal or differ in case';
    -}
    -
    - -

    // Good - Case folding is really case insensitive

    - -
    -if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
    -{
    -	echo '$string1 and $string2 are equal or differ in case';
    -}
    -
    - -

    Confusables Detection

    - -

    phpBB offers a special method utf8_clean_string which can be used to make sure string identifiers are unique. This method uses Normalization Form Compatibility Composition (NFKC) instead of NFC and replaces similarly looking characters with a particular representative of the equivalence class. This method is currently used for usernames and group names to avoid confusion with similarly looking names.

    - -
    - - - -
    -
    - -
    - -

    6. Translation (i18n/L10n) Guidelines

    - -
    -
    - -
    - -

    6.i. Standardisation

    - -

    Reason:

    - -

    phpBB is one of the most translated open-source projects, with the current stable version being available in over 60 localisations. Whilst the ad hoc approach to the naming of language packs has worked, for phpBB3 and beyond we hope to make this process saner which will allow for better interoperation with current and future web browsers.

    - -

    Encoding:

    - -

    With phpBB3, the output encoding for the forum in now UTF-8, a Universal Character Encoding by the Unicode Consortium that is by design a superset to US-ASCII and ISO-8859-1. By using one character set which simultaenously supports all scripts which previously would have required different encodings (eg: ISO-8859-1 to ISO-8859-15 (Latin, Greek, Cyrillic, Thai, Hebrew, Arabic); GB2312 (Simplified Chinese); Big5 (Traditional Chinese), EUC-JP (Japanese), EUC-KR (Korean), VISCII (Vietnamese); et cetera), this removes the need to convert between encodings and improves the accessibility of multilingual forums.

    - -

    The impact is that the language files for phpBB must now also be encoded as UTF-8, with a caveat that the files must not contain a BOM for compatibility reasons with non-Unicode aware versions of PHP. For those with forums using the Latin character set (ie: most European languages), this change is transparent since UTF-8 is superset to US-ASCII and ISO-8859-1.

    - -

    Language Tag:

    - -

    The IETF recently published RFC 4646 for tags used to identify languages, which in combination with RFC 4647 obseletes the older RFC 3006 and older-still RFC 1766. RFC 4646 uses ISO 639-1/ISO 639-2, ISO 3166-1 alpha-2, ISO 15924 and UN M.49 to define a language tag. Each complete tag is composed of subtags which are not case sensitive and can also be empty.

    - -

    Ordering of the subtags in the case that they are all non-empty is: language-script-region-variant-extension-privateuse. Should any subtag be empty, its corresponding hyphen would also be ommited. Thus, the language tag for English will be en and not en-----.

    - -

    Most language tags consist of a two- or three-letter language subtag (from ISO 639-1/ISO 639-2). Sometimes, this is followed by a two-letter or three-digit region subtag (from ISO 3166-1 alpha-2 or UN M.49). Some examples are:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Language tag examples
    Language tagDescriptionComponent subtags
    enEnglishlanguage
    masMasailanguage
    fr-CAFrench as used in Canadalanguage+region
    en-833English as used in the Isle of Manlanguage+region
    zh-HansChinese written with Simplified scriptlanguage+script
    zh-Hant-HKChinese written with Traditional script as used in Hong Konglanguage+script+region
    de-AT-1996German as used in Austria with 1996 orthographylanguage+region+variant
    - -

    The ultimate aim of a language tag is to convey the needed useful distingushing information, whilst keeping it as short as possible. So for example, use en, fr and ja as opposed to en-GB, fr-FR and ja-JP, since we know English, French and Japanese are the native language of Great Britain, France and Japan respectively.

    - -

    Next is the ISO 15924 language script code and when one should or shouldn't use it. For example, whilst en-Latn is syntaxically correct for describing English written with Latin script, real world English writing is more-or-less exclusively in the Latin script. For such languages like English that are written in a single script, the IANA Language Subtag Registry has a "Suppress-Script" field meaning the script code should be ommitted unless a specific language tag requires a specific script code. Some languages are written in more than one script and in such cases, the script code is encouraged since an end-user may be able to read their language in one script, but not the other. Some examples are:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Language subtag + script subtag examples
    Language tagDescriptionComponent subtags
    en-BraiEnglish written in Braille scriptlanguage+script
    en-DsrtEnglish written in Deseret (Mormon) scriptlanguage+script
    sr-LatnSerbian written in Latin scriptlanguage+script
    sr-CyrlSerbian written in Cyrillic scriptlanguage+script
    mn-MongMongolian written in Mongolian scriptlanguage+script
    mn-CyrlMongolian written in Cyrillic scriptlanguage+script
    mn-PhagMongolian written in Phags-pa scriptlanguage+script
    az-Cyrl-AZAzerbaijani written in Cyrillic script as used in Azerbaijanlanguage+script+region
    az-Latn-AZAzerbaijani written in Latin script as used in Azerbaijanlanguage+script+region
    az-Arab-IRAzerbaijani written in Arabic script as used in Iranlanguage+script+region
    - -

    Usage of the three-digit UN M.49 code over the two-letter ISO 3166-1 alpha-2 code should hapen if a macro-geographical entity is required and/or the ISO 3166-1 alpha-2 is ambiguous.

    - -

    Examples of English using marco-geographical regions:

    - - - - - - - - - - - - - - - - - - - - - - - -
    Coding for English using macro-geographical regions
    ISO 639-1/ISO 639-2 + ISO 3166-1 alpha-2ISO 639-1/ISO 639-2 + UN M.49 (Example macro regions)
    en-AU
    English as used in Australia
    en-053
    English as used in Australia & New Zealand
    en-009
    English as used in Oceania
    en-NZ
    English as used in New Zealand
    en-FJ
    English as used in Fiji
    en-054
    English as used in Melanesia
    - -

    Examples of Spanish using marco-geographical regions:

    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Coding for Spanish macro-geographical regions
    ISO 639-1/ISO 639-2 + ISO 3166-1 alpha-2ISO 639-1/ISO 639-2 + UN M.49 (Example macro regions)
    es-PR
    Spanish as used in Puerto Rico
    es-419
    Spanish as used in Latin America & the Caribbean
    es-019
    Spanish as used in the Americas
    es-HN
    Spanish as used in Honduras
    es-AR
    Spanish as used in Argentina
    es-US
    Spanish as used in United States of America
    es-021
    Spanish as used in North America
    - -

    Example of where the ISO 3166-1 alpha-2 is ambiguous and why UN M.49 might be preferred:

    - - - - - - - - - - - - - - - - - - - - - -
    Coding for ambiguous ISO 3166-1 alpha-2 regions
    CS assignment pre-1994CS assignment post-1994
    -
    -
    CS
    Czechoslovakia (ISO 3166-1)
    -
    200
    Czechoslovakia (UN M.49)
    -
    -
    -
    -
    CS
    Serbian & Montenegro (ISO 3166-1)
    -
    891
    Serbian & Montenegro (UN M.49)
    -
    -
    -
    -
    CZ
    Czech Republic (ISO 3166-1)
    -
    203
    Czech Republic (UN M.49)
    -
    -
    -
    -
    SK
    Slovakia (ISO 3166-1)
    -
    703
    Slovakia (UN M.49)
    -
    -
    -
    -
    RS
    Serbia (ISO 3166-1)
    -
    688
    Serbia (UN M.49)
    -
    -
    -
    -
    ME
    Montenegro (ISO 3166-1)
    -
    499
    Montenegro (UN M.49)
    -
    -
    - -

    Macro-languages & Topolects:

    - -

    RFC 4646 anticipates features which shall be available in (currently draft) ISO 639-3 which aims to provide as complete enumeration of languages as possible, including living, extinct, ancient and constructed languages, whether majour, minor or unwritten. A new feature of ISO 639-3 compared to the previous two revisions is the concept of macrolanguages where Arabic and Chinese are two such examples. In such cases, their respective codes of ar and zh is very vague as to which dialect/topolect is used or perhaps some terse classical variant which may be difficult for all but very educated users. For such macrolanguages, it is recommended that the sub-language tag is used as a suffix to the macrolanguage tag, eg:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Macrolanguage subtag + sub-language subtag examples
    Language tagDescriptionComponent subtags
    zh-cmnMandarin (Putonghau/Guoyu) Chinesemacrolanguage+sublanguage
    zh-yueYue (Cantonese) Chinesemacrolanguage+sublanguage
    zh-cmn-HansMandarin (Putonghau/Guoyu) Chinese written in Simplified scriptmacrolanguage+sublanguage+script
    zh-cmn-HantMandarin (Putonghau/Guoyu) Chinese written in Traditional scriptmacrolanguage+sublanguage+script
    zh-nan-Latn-TWMinnan (Hoklo) Chinese written in Latin script (POJ Romanisation) as used in Taiwanmacrolanguage+sublanguage+script+region
    - -

    6.ii. Other considerations

    - -

    Normalisation of language tags for phpBB:

    - -

    For phpBB, the language tags are not used in their raw form and instead converted to all lower-case and have the hyphen - replaced with an underscore _ where appropriate, with some examples below:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Language tag normalisation examples
    Raw language tagDescriptionValue of USER_LANG
    in ./common.php
    Language pack directory
    name in /language/
    enBritish Englishenen
    de-ATGerman as used in Austriade-atde_at
    es-419Spanish as used in Latin America & Caribbeanen-419en_419
    zh-yue-Hant-HKCantonese written in Traditional script as used in Hong Kongzh-yue-hant-hkzh_yue_hant_hk
    - -

    How to use iso.txt:

    - -

    The iso.txt file is a small UTF-8 encoded plain-text file which consists of three lines:

    - -
      -
    1. Language's English name
    2. -
    3. Language's local name
    4. -
    5. Authors information
    6. -
    - -

    iso.txt is automatically generated by the language pack submission system on phpBB.com. You don't have to create this file yourself if you plan on releasing your language pack on phpBB.com, but do keep in mind that phpBB itself does require this file to be present.

    - -

    Because language tags themselves are meant to be machine read, they can be rather obtuse to humans and why descriptive strings as provided by iso.txt are needed. Whilst en-US could be fairly easily deduced to be "English as used in the United States", de-CH is more difficult less one happens to know that de is from "Deutsch", German for "German" and CH is the abbreviation of the official Latin name for Switzerland, "Confoederatio Helvetica".

    - -

    For the English language description, the language name is always first and any additional attributes required to describe the subtags within the language code are then listed in order separated with commas and enclosed within parentheses, eg:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    English language description examples for iso.txt
    Raw language tagEnglish description within iso.txt
    enBritish English
    en-USEnglish (United States)
    en-053English (Australia & New Zealand)
    deGerman
    de-CH-1996German (Switzerland, 1996 orthography)
    gws-1996Swiss German (1996 orthography)
    zh-cmn-Hans-CNMandarin Chinese (Simplified, Mainland China)
    zh-yue-Hant-HKCantonese Chinese (Traditional, Hong Kong)
    - -

    For the localised language description, just translate the English version though use whatever appropriate punctuation typical for your own locale, assuming the language uses punctuation at all.

    - -

    Unicode bi-directional considerations:

    - -

    Because phpBB is now UTF-8, all translators must take into account that certain strings may be shown when the directionality of the document is either opposite to normal or is ambiguous.

    - -

    The various Unicode control characters for bi-directional text and their HTML enquivalents where appropriate are as follows:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Unicode bidirectional control characters & HTML elements/entities
    Unicode character
    abbreviation
    Unicode
    code-point
    Unicode character
    name
    Equivalent HTML
    markup/entity
    Raw character
    (enclosed between '')
    LRMU+200ELeft-to-Right Mark&lrm;'‎'
    RLMU+200FRight-to-Left Mark&rlm;'‏'
    LREU+202ALeft-to-Right Embeddingdir="ltr"'‪'
    RLEU+202BRight-to-Left Embeddingdir="rtl"'‫'
    PDFU+202CPop Directional Formatting</bdo>'‬'
    LROU+202DLeft-to-Right Override<bdo dir="ltr">'‭'
    RLOU+202ERight-to-Left Override<bdo dir="rtl">'‮'
    - -

    For iso.txt, the directionality of the text can be explicitly set using special Unicode characters via any of the three methods provided by left-to-right/right-to-left markers/embeds/overrides, as without them, the ordering of characters will be incorrect, eg:

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Unicode bidirectional control characters iso.txt
    DirectionalityRaw character viewDisplay of localised
    description in iso.txt
    Ordering
    dir="ltr"English (Australia & New Zealand)English (Australia & New Zealand)Correct
    dir="rtl"English (Australia & New Zealand)English (Australia & New Zealand)Incorrect
    dir="rtl" with LRMEnglish (Australia & New Zealand)U+200EEnglish (Australia & New Zealand)‎Correct
    dir="rtl" with LRE & PDFU+202AEnglish (Australia & New Zealand)U+202C‪English (Australia & New Zealand)‬Correct
    dir="rtl" with LRO & PDFU+202DEnglish (Australia & New Zealand)U+202C‭English (Australia & New Zealand)‬Correct
    - -

    In choosing which of the three methods to use, in the majority of cases, the LRM or RLM to put a "strong" character to fully enclose an ambiguous punctuation character and thus make it inherit the correct directionality is sufficient.

    -

    Within some cases, there may be mixed scripts of a left-to-right and right-to-left direction, so using LRE & RLE with PDF may be more appropriate. Lastly, in very rare instances where directionality must be forced, then use LRO & RLO with PDF.

    -

    For further information on authoring techniques of bi-directional text, please see the W3C tutorial on authoring techniques for XHTML pages with bi-directional text.

    - -

    Working with placeholders:

    - -

    As phpBB is translated into languages with different ordering rules to that of English, it is possible to show specific values in any order deemed appropriate. Take for example the extremely simple "Page X of Y", whilst in English this could just be coded as:

    - -
    -	...
    -'PAGE_OF'	=>	'Page %s of %s',
    -		/* Just grabbing the replacements as they
    -		come and hope they are in the right order */
    -	...
    -	
    - -

    … a clearer way to show explicit replacement ordering is to do:

    - -
    -	...
    -'PAGE_OF'	=>	'Page %1$s of %2$s',
    -		/* Explicit ordering of the replacements,
    -		even if they are the same order as English */
    -	...
    -	
    - -

    Why bother at all? Because some languages, the string transliterated back to English might read something like:

    - -
    -	...
    -'PAGE_OF'	=>	'Total of %2$s pages, currently on page %1$s',
    -		/* Explicit ordering of the replacements,
    -		reversed compared to English as the total comes first */
    -	...
    -	
    - -

    6.iii. Writing Style

    - -

    Miscellaneous tips & hints:

    - -

    As the language files are PHP files, where the various strings for phpBB are stored within an array which in turn are used for display within an HTML page, rules of syntax for both must be considered. Potentially problematic characters are: ' (straight quote/apostrophe), " (straight double quote), < (less-than sign), > (greater-than sign) and & (ampersand).

    - -

    // Bad - The un-escapsed straight-quote/apostrophe will throw a PHP parse error

    - -
    -	...
    -'CONV_ERROR_NO_AVATAR_PATH'
    -	=>	'Note to developer: you must specify $convertor['avatar_path'] to use %s.',
    -	...
    -	
    - -

    // Good - Literal straight quotes should be escaped with a backslash, ie: \

    - -
    -	...
    -'CONV_ERROR_NO_AVATAR_PATH'
    -	=>	'Note to developer: you must specify $convertor[\'avatar_path\'] to use %s.',
    -	...
    -	
    - -

    However, because phpBB3 now uses UTF-8 as its sole encoding, we can actually use this to our advantage and not have to remember to escape a straight quote when we don't have to:

    - -

    // Bad - The un-escapsed straight-quote/apostrophe will throw a PHP parse error

    - -
    -	...
    -'USE_PERMISSIONS'	=>	'Test out user's permissions',
    -	...
    -	
    - -

    // Okay - However, non-programmers wouldn't type "user\'s" automatically

    - -
    -	...
    -'USE_PERMISSIONS'	=>	'Test out user\'s permissions',
    -	...
    -	
    - -

    // Best - Use the Unicode Right-Single-Quotation-Mark character

    - -
    -	...
    -'USE_PERMISSIONS'	=>	'Test out user’s permissions',
    -	...
    -	
    - -

    The " (straight double quote), < (less-than sign) and > (greater-than sign) characters can all be used as displayed glyphs or as part of HTML markup, for example:

    - -

    // Bad - Invalid HTML, as segments not part of elements are not entitised

    - -
    -	...
    -'FOO_BAR'	=>	'PHP version < 4.3.3.<br />
    -	Visit "Downloads" at <a href="http://www.php.net/">www.php.net</a>.',
    -	...
    -	
    - -

    // Okay - No more invalid HTML, but "&quot;" is rather clumsy

    - -
    -	...
    -'FOO_BAR'	=>	'PHP version &lt; 4.3.3.<br />
    -	Visit &quot;Downloads&quot; at <a href="http://www.php.net/">www.php.net</a>.',
    -	...
    -	
    - -

    // Best - No more invalid HTML, and usage of correct typographical quotation marks

    - -
    -	...
    -'FOO_BAR'	=>	'PHP version &lt; 4.3.3.<br />
    -	Visit “Downloads” at <a href="http://www.php.net/">www.php.net</a>.',
    -	...
    -	
    - -

    Lastly, the & (ampersand) must always be entitised regardless of where it is used:

    - -

    // Bad - Invalid HTML, none of the ampersands are entitised

    - -
    -	...
    -'FOO_BAR'	=>	'<a href="http://somedomain.tld/?foo=1&bar=2">Foo & Bar</a>.',
    -	...
    -	
    - -

    // Good - Valid HTML, amperands are correctly entitised in all cases

    - -
    -	...
    -'FOO_BAR'	=>	'<a href="http://somedomain.tld/?foo=1&amp;bar=2">Foo &amp; Bar</a>.',
    -	...
    -	
    - -

    As for how these charcters are entered depends very much on choice of Operating System, current language locale/keyboard configuration and native abilities of the text editor used to edit phpBB language files. Please see http://en.wikipedia.org/wiki/Unicode#Input_methods for more information.

    - -

    Spelling, punctuation, grammar, et cetera:

    - -

    The default language pack bundled with phpBB is British English using Cambridge University Press spelling and is assigned the language code en. The style and tone of writing tends towards formal and translations should emulate this style, at least for the variant using the most compact language code. Less formal translations or those with colloquialisms must be denoted as such via either an extension or privateuse tag within its language code.

    - -
    - - - -
    -
    - -
    - -

    7. Guidelines Changelog

    -
    -
    - -
    - -

    Revision 1.31

    - -
      -
    • Added add_form_key and check_form_key.
    • -
    - -

    Revision 1.24

    - - - -

    Revision 1.16

    - - - -

    Revision 1.11-1.15

    - -
      -
    • Various document formatting, spelling, punctuation, grammar bugs.
    • -
    - -

    Revision 1.9-1.10

    - - - -

    Revision 1.8

    - - - -

    Revision 1.5

    - - - - -
    - - - -
    -
    - -
    - -

    8. Copyright and disclaimer

    - -
    -
    - -
    - -

    This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 phpBB Group, All Rights Reserved.

    - -
    - - - -
    -
    - - - - -
    - -
    - -
    - - - diff --git a/phpBB/docs/coding-guidelines.txt b/phpBB/docs/coding-guidelines.txt new file mode 100644 index 0000000000..700c9d0ea9 --- /dev/null +++ b/phpBB/docs/coding-guidelines.txt @@ -0,0 +1,26 @@ +CODING GUIDELINES : Initials by psoTFX (July 2001) +----------------- + +* The coding style is defined in the codingstandards.html file, all attempts should be made to follow it as closely as possible + +* All SQL should be cross-DB compatible, if DB specific SQL is used alternatives must be provided which work on all supported DB's (MySQL, MSSQL (7.0 and 2000), PostgreSQL (7.0+), Oracle8, ODBC (generalised if possible, otherwise MS Access, DB2)) + +* All SQL commands should utilise the DataBase Abstraction Layer (DBAL) + +* All URL's (and form actions) _must_ be wrapped in append_sid, this ensures the session_id is propagated when cookies aren't available + +* The minimum amount of data should be passed via GET or POST, checking should occur within individual scripts (to prevent spoofing of information) + +* The auth function should be used for all authorisation checking + +* Sessions should be initiated on each page, as near the top as possible using the session_pagestart function (userdata should be obtained by calling the init_userprefs immediately after session initialisation) + +* Login checks should be forwarded to the login page (supplying a page to forward onto once check is complete if required) + +* All template variables should be named appropriately (using underscores for spaces), language entries should be prefixed with L_, system data with S_, urls with U_, all other variables should be presented 'as is'. + +* Functions used by more than page should be placed in functions.php, functions specific to one page should be placed on that page (at the top to maintain compatibility with PHP3) surrounded by comments indicating the start and end of the function block + +* All messages/errors should be output by the message_die function using the appropriate message type (see function for details) + +* No attempt should be made to remove any copyright information (either contained within the source or displayed interactively when the source is run/compiled), neither should the copyright information be altered in any way (it may be added to) diff --git a/phpBB/docs/codingstandards.htm b/phpBB/docs/codingstandards.htm new file mode 100644 index 0000000000..1cb7f3c57d --- /dev/null +++ b/phpBB/docs/codingstandards.htm @@ -0,0 +1,327 @@ + + +phpBB Coding Standard Guidelines + + + +

    phpBB Coding Standard Guidelines

    Comments or suggestions? email nate@phpbb.com

    Editor +Settings
    Naming +Conventions
    Code Layout
    General +Guidelines


    top +

    Editor Settings

    +

    Tabs vs Spaces: In order to make this as simple as possible, we will +be using tabs, not spaces. Feel free to set how many spaces your editor uses +when it displays tabs, but make sure that when you save the file, +it's saving tabs and not spaces. This way, we can each have the code be +displayed the way we like it, without breaking the layout of the actual files. +

    +

    Linefeeds: Ensure that your editor is saving files in the UNIX format. +This means lines are terminated with a newline, not with a CR/LF combo as they +are on Win32, or whatever the Mac uses. Any decent Win32 editor should be able +to do this, but it might not always be the default. Know your editor. If you +want advice on Windows text editors, just ask one of the developers. Some of +them do their editing on Win32.



    top +

    Naming Conventions

    +

    We will not be using any form of hungarian notation in our naming +conventions. Many of us believe that hungarian naming is one of the primary code +obfuscation techniques currently in use.

    +

    Variable Names: Variable names should be in all lowercase, with words +separated by an underscore.

        Example: $current_user is right, but $currentuser and $currentUser are not.

    Names should be descriptive, +but concise. We don't want huge sentences as our variable names, but typing an +extra couple of characters is always better than wondering what exactly a +certain variable is for.

    +

    Loop Indices: The only situation where a one-character variable +name is allowed is when it's the index for some looping construct. In this case, +the index of the outer loop should always be $i. If there's a loop inside that +loop, its index should be $j, followed by $k, and so on. If the loop is being +indexed by some already-existing variable with a meaningful name, this guideline +does not apply.

        Example:

    
    +		for ($i = 0; $i < $outer_size; $i++) 
    +		{
    +		   for ($j = 0; $j < $inner_size; $j++) 
    +		   {
    +		      foo($i, $j);
    +		   }
    +		} 
    +

    +

    Function Names: Functions should also be named descriptively. We're +not programming in C here, we don't want to write functions called things like +"stristr()". Again, all lower-case names with words separated by a single +underscore character. Function names should preferably have a verb in them +somewhere. Good function names are print_login_status(), get_user_data(), etc..

    +

    Function Arguments: Arguments are subject to the same guidelines as +variable names. We don't want a bunch of functions like: do_stuff($a, $b, $c). In most cases, we'd like to be able +to tell how to use a function by just looking at its declaration.

    +

    Summary: The basic philosophy here is to not hurt code clarity for the +sake of laziness. This has to be balanced by a little bit of common sense, +though; print_login_status_for_a_given_user() +goes too far, for example -- that function would be better named print_user_login_status() , or just print_login_status().



    top +

    Code Layout

    +

    Standard header for new files: Here a template of the header that must +be included at the start of all phpBB files:

    
    +		/***************************************************************************
    +		                                filename.php
    +		                             -------------------
    +		    begin                : Sat June 17 2000
    +		    copyright            : (C) 2000 The phpBB Group
    +		    email                : support@phpBB.com
    +		
    +		    $Id$
    +		
    +		 ***************************************************************************/
    +		
    +		/***************************************************************************
    +		 *                                         				                                
    +		 *   This program is free software; you can redistribute it and/or modify  	
    +		 *   it under the terms of the GNU General Public License as published by  
    +		 *   the Free Software Foundation; either version 2 of the License, or	    	
    +		 *   (at your option) any later version.
    +		 *
    +		 ***************************************************************************/
    +	
    +

    +

    Always include the braces: This is another case of being too lazy to +type 2 extra characters causing problems with code clarity. Even if the body of +some construct is only one line long, do not drop the braces. Just don't. +

       Examples:

    
    +		/* These are all wrong. */
    +		if (condition)	do_stuff();
    +		if (condition)
    +			do_stuff();
    +		while (condition) 
    +			do_stuff();
    +		for ($i = 0; $i < size; $i++)
    +			do_stuff($i);
    +		
    +		/* These are right. */
    +		if (condition) 
    +		{
    +			do_stuff();
    +		}
    +		while (condition) 
    +		{
    +			do_stuff();
    +		}
    +		for ($i = 0; $i < size; $i++) 
    +		{
    +			do_stuff();
    +		}
    +	
    +

    +

    Where to put the braces: This one is a bit of a holy war, but we're +going to use a style that can be summed up in one sentence: Braces always go on +their own line. The closing brace should also always be at the same column as +the corresponding opening brace.

       Examples:

    
    +		if (condition) 
    +		{
    +			while (condition2)
    +			{
    +				...
    +			}
    +		}
    +		else 
    +		{
    +			...
    +		}
    +
    +		for ($i = 0; $i < $size; $i++) 
    +		{
    +			...
    +		}
    +		
    +		while (condition) 
    +		{
    +			...
    +		}
    +		
    +		function do_stuff() 
    +		{
    +			...
    +		}
    +	
    +

    +

    Use spaces between tokens: This is another simple, easy step that +helps keep code readable without much effort. Whenever you write an assignment, +expression, etc.. Always leave one space between the tokens. Basically, +write code as if it was English. Put spaces between variable names and +operators. Don't put spaces just after an opening bracket or before a closing +bracket. Don't put spaces just before a comma or a semicolon. This is best shown +with a few examples.

       Examples:

    
    +		/* Each pair shows the wrong way followed by the right way. */
    +		
    +		$i=0;
    +		$i = 0;
    +		
    +		if($i<7) ...
    +		if ($i < 7) ...
    +		
    +		if ( ($i < 7)&&($j > 8) ) ...
    +		if (($i < 7) && ($j > 8)) ...
    +		
    +		do_stuff( $i, "foo", $b );
    +		do_stuff($i, "foo", $b);
    +		
    +		for($i=0; $i<$size; $i++) ...
    +		for($i = 0; $i < $size; $i++) ... 
    +		
    +		$i=($j < $size)?0:1;
    +		$i = ($j < $size) ? 0 : 1;
    +	
    +

    +

    Operator precedence: Do you know the exact precedence of all the +operators in PHP? Neither do I. Don't guess. Always make it obvious by using +brackets to force the precedence of an equation so you know what it does. +

       Examples:

    
    +		/* what's the result? who knows. */
    +		$bool = ($i < 7 && $j > 8 || $k == 4);
    +		
    +		/* now you can be certain what I'm doing here. */
    +		$bool = (($i < 7) && (($j < 8) || ($k == 4)))
    +		
    +

    +

    SQL code layout: Since we'll all be using different editor settings, +don't try to do anything complex like aligning columns in SQL code. Do, however, +break statements onto their own lines. Here's a sample of how SQL code should +look. Note where the lines break, the capitalization, and the use of brackets. +

       Examples:

    
    +		SELECT field1 AS something, field2, field3
    +		FROM table a, table b
    +		WHERE (this = that) AND (this2 = that2)
    +		
    +

    +

    SQL insert statements: SQL INSERT statements can be written in two +different ways. Either you specify explicitly the columns being inserted, or +you rely on knowing the order of the columns in the database and do not +specify them. We want to use the former approach, where it is explicitly +stated whcih columns are being inserted. This means our application-level code +will not depend on the order of the fields in the database, and will not be broken +if we add additional fields (unless they're specified as NOT NULL, of course). +

       Examples:

    
    +		# This is not what we want.
    +		INSERT INTO mytable
    +		VALUES ('something', 1, 'else')
    +		
    +		# This is correct.
    +		INSERT INTO mytable (column1, column2, column3)
    +		VALUES ('something', 1, 'else')
    +		
    +



    top +

    General Guidelines

    +

    Quoting strings: There are two different ways to quote strings in PHP +- either with single quotes or with double quotes. The main difference is that +the parser does variable interpolation in double-quoted strings, but not in +single quoted strings. Because of this, you should always use single +quotes unless you specifically need variable interpolation to be done on +that string. This way, we can save the parser the trouble of parsing a bunch of +strings where no interpolation needs to be done. Also, if you are using a string +variable as part of a function call, you do not need to enclose that variable in +quotes. Again, this will just make unnecessary work for the parser. Note, +however, that nearly all of the escape sequences that exist for double-quoted +strings will not work with single-quoted strings. Be careful, and feel free to +break this guideline if it's making your code harder to read. +

       Examples:

    
    +		/* wrong */
    +		$str = "This is a really long string with no variables for the parser to find.";
    +		do_stuff("$str");
    +		
    +		/* right */
    +		$str = 'This is a really long string with no variables for the parser to find.';
    +		do_stuff($str);
    +		
    +

    +

    Associative array keys: In PHP, it's legal to use a literal string as +a key to an associative array without quoting that string. We don't want to do +this -- the string should always be quoted to avoid confusion. Note that this is +only when we're using a literal, not when we're using a variable. +

       Examples:

    
    +		/* wrong */
    +		$foo = $assoc_array[blah];
    +		
    +		/* right */
    +		$foo = $assoc_array['blah'];
    +		
    +

    +

    Comments: Each function should be preceded by a comment that tells a +programmer everything they need to know to use that function. The meaning of +every parameter, the expected input, and the output are required as a minimal +comment. The function's behaviour in error conditions (and what those error +conditions are) should also be present. Nobody should have to look at the actual +source of a function in order to be able to call it with confidence in their own +code.

    In addition, commenting any tricky, obscure, or otherwise +not-immediately-obvious code is clearly something we should be doing. Especially +important to document are any assumptions your code makes, or preconditions for +its proper operation. Any one of the developers should be able to look at any +part of the application and figure out what's going on in a reasonable amount of +time.

    +

    Magic numbers: Don't use them. Use named constants for any literal +value other than obvious special cases. Basically, it's OK to check if an array +has 0 elements by using the literal 0. It's not OK to assign some special +meaning to a number and then use it everywhere as a literal. This hurts +readability AND maintainability. Included in this guideline is that we should be +using the constants TRUE and FALSE in place of the literals 1 and 0 -- even +though they have the same values, it's more obvious what the actual logic is +when you use the named constants.

    +

    Shortcut operators: The only shortcut operators that cause readability +problems are the shortcut increment ($i++) and decrement ($j--) operators. These +operators should not be used as part of an expression. They can, however, be +used on their own line. Using them in expressions is just not worth the +headaches when debugging.

       Examples:

    
    +		/* wrong */
    +		$array[++$i] = $j;
    +		$array[$i++] = $k;
    +		
    +		
    +		/* right */
    +		$i++;
    +		$array[$i] = $j;
    +		
    +		$array[$i] = $k;
    +		$i++;
    +		
    +

    +

    Inline conditionals: Inline conditionals should only be used to do +very simple things. Preferably, they will only be used to do assignments, and +not for function calls or anything complex at all. They can be harmful to +readability if used incorrectly, so don't fall in love with saving typing by +using them.

       Examples:

    
    +		/* Bad place to use them */
    +		(($i < $size) && ($j > $size)) ? do_stuff($foo) : do_stuff($bar);
    +		
    +		
    +		/* OK place to use them */
    +		$min = ($i < $j) ? $i : $j;
    +		
    +

    +

    Don't use uninitialized variables. for phpBB 2, we intend to use a +higher level of run-time error reporting. This will mean that the use of an +uninitialized variable will be reported as an error. This will come up most +often when checking which HTML form variables were passed. These errors can be +avoided by using the built-in isset() function to check whether a variable has +been set.

       Examples:

    
    +		/* Old way */
    +		if ($forum) ...
    +		
    +		
    +		/* New way */
    +		if (isset($forum)) ...
    +		
    +



    Return +to top
    diff --git a/phpBB/docs/corners_left.gif b/phpBB/docs/corners_left.gif deleted file mode 100644 index 206e50368d..0000000000 Binary files a/phpBB/docs/corners_left.gif and /dev/null differ diff --git a/phpBB/docs/corners_left.png b/phpBB/docs/corners_left.png deleted file mode 100644 index 256bde3daa..0000000000 Binary files a/phpBB/docs/corners_left.png and /dev/null differ diff --git a/phpBB/docs/corners_right.gif b/phpBB/docs/corners_right.gif deleted file mode 100644 index 0ba66d50b2..0000000000 Binary files a/phpBB/docs/corners_right.gif and /dev/null differ diff --git a/phpBB/docs/corners_right.png b/phpBB/docs/corners_right.png deleted file mode 100644 index df41823b4c..0000000000 Binary files a/phpBB/docs/corners_right.png and /dev/null differ diff --git a/phpBB/docs/hook_system.html b/phpBB/docs/hook_system.html deleted file mode 100644 index 565e0096fc..0000000000 --- a/phpBB/docs/hook_system.html +++ /dev/null @@ -1,859 +0,0 @@ - - - - - - - - - - - - - -phpBB3 • Hook System - - - - - - - -
    - - - - - -
    - -

    Hook System

    - - - -
    - -

    1. Introduction

    - -
    -
    - -
    - -

    What is it?

    - -

    The hook system allows applicaton and mod developers to hook into phpBB's or their own functions.

    - -

    Pre-defined hookable phpBB3 functions

    - -

    In phpBB3 there are four functions you are able to hook into with your custom functions:

    - -

    phpbb_user_session_handler(); which is called within user::setup after the session and the user object is correctly initialized.
    -append_sid($url, $params = false, $is_amp = true, $session_id = false); which is called for building urls (appending the session id)
    -$template->display($handle, $include_once = true); which is called directly before outputting the (not-yet-compiled) template.
    -exit_handler(); which is called at the very end of phpBB3's execution.

    - -

    There are also valid external constants you may want to use if you embed phpBB3 into your application:

    - -
    -PHPBB_MSG_HANDLER (overwrite message handler)
    -PHPBB_DB_NEW_LINK (overwrite new_link parameter for sql_connect)
    -PHPBB_ROOT_PATH   (overwrite $phpbb_root_path)
    -PHPBB_ADMIN_PATH  (overwrite $phpbb_admin_path)
    -
    - -
    - - - -
    -
    - -

    2. Allow hooks in functions/methods

    - -
    -
    - -
    - -

    The following examples explain how phpBB3 utilize the in-build hook system. You will be more interested in registering your hooks, but showing you this may help you understand the system better along the way.

    - -

    First of all, this is how a function need to be layed out if you want to allow it to be hookable...

    - -
    -function my_own_function($my_first_parameter, $my_second_parameter)
    -{
    -	global $phpbb_hook;
    -
    -	if ($phpbb_hook->call_hook(__FUNCTION__, $my_first_parameter, $my_second_parameter))
    -	{
    -		if ($phpbb_hook->hook_return(__FUNCTION__))
    -		{
    -			return $phpbb_hook->hook_return_result(__FUNCTION__);
    -		}
    -	}
    -
    -	[YOUR CODE HERE]
    -}
    -
    - -

    Above, the call_hook function should always be mapping your function call... in regard to the number of parameters passed.

    - -

    This is how you could make a method being hookable...

    - -
    -class my_hookable_object
    -{
    -	function hook_me($my_first_parameter, $my_second_parameter)
    -	{
    -		global $phpbb_hook;
    -
    -		if ($phpbb_hook->call_hook(array(__CLASS__, __FUNCTION__), $my_first_parameter, $my_second_parameter))
    -		{
    -			if ($phpbb_hook->hook_return(array(__CLASS__, __FUNCTION__)))
    -			{
    -				return $phpbb_hook->hook_return_result(array(__CLASS__, __FUNCTION__));
    -			}
    -		}
    -
    -		[YOUR CODE HERE]
    -	}
    -}
    -
    - -

    The only difference about calling it is the way you define the first parameter. For a function it is only __FUNCTION__, for a method it is array(__CLASS__, __FUNCTION__). In PHP4 __CLASS__ is always returning the class in lowercase.

    - -

    Now, in phpBB there are some pre-defined hooks available, but how do you make your own hookable function available (and therefore allowing others to hook into it)? For this, there is the add_hook() method:

    - -
    -// Adding your own hookable function:
    -$phpbb_hook->add_hook('my_own_function');
    -
    -// Adding your own hookable method:
    -$phpbb_hook->add_hook(array('my_hookable_object', 'hook_me'));
    -
    - -

    You are also able to remove the possibility of hooking a function/method by calling $phpbb_hook->remove_hook() with the same parameters as add_hook().
    -This comes in handy if you want to force some hooks not to be called - at all.

    - -
    - - - -
    -
    - -

    3. Registering hooks

    - -
    -
    - -
    - -

    Registering hooks

    - -

    Now to actually defining your functions which should be called. For this we take the append_sid() function as an example (this function is able to be hooked by default). We create two classes, one being static and a function:

    - -
    -class my_append_sid_class
    -{
    -	// Our functions
    -	function my_append_sid(&$hook, $url, $params = false, $is_amp = true, $session_id = false)
    -	{
    -		// Get possible previous results
    -		$result = $hook->previous_hook_result('append_sid');
    -
    -		return $result['result'] . '<br />And i was the second one.';
    -	}
    -}
    -
    -// Yet another class :o
    -class my_second_append_sid_class
    -{
    -	function my_append_sid(&$hook, $url, $params = false, $is_amp = true, $session_id = false)
    -	{
    -		// Get possible previous results
    -		$result = $hook->previous_hook_result('append_sid');
    -
    -		echo $result['result'] . '<br />I was called as the third one.';
    -	}
    -}
    -
    -// And a normal function
    -function my_append_sid(&$hook, $url, $params = false, $is_amp = true, $session_id = false)
    -{
    -	// Get possible previous results
    -	$result = $hook->previous_hook_result('append_sid');
    -
    -	return 'I was called as the first one';
    -}
    -
    -// Initializing the second class
    -$my_second_append_sid_class = new my_second_append_sid_class();
    -
    - -

    Make sure you add the same parameters to your function as is defined for the hookable function with one exception: The first variable is always &$hook... this is the hook object itself you are able to operate on.

    - -

    Now we register the hooks one by one with the $phpbb_hook->register() method:

    - -
    -// Now, we register our append_sid "replacements" in a stacked way...
    -// Registering the function (this is called first)
    -$phpbb_hook->register('append_sid', 'my_append_sid');
    -
    -// Registering the first class
    -$phpbb_hook->register('append_sid', array('my_append_sid_class', 'my_append_sid'));
    -$phpbb_hook->register('append_sid', array(&$my_second_append_sid_class, 'my_append_sid'));
    -
    - -

    With this you are even able to make your own functions that are already hooked itself being hooked again...

    - -
    -// Registering hook, which will be called
    -$phpbb_hook->register('append_sid', 'my_own_append_sid');
    -
    -// Add hook to our called hook function
    -$phpbb_hook->add_hook('my_own_append_sid');
    -
    -// Register added hook
    -$phpbb_hook->register('my_own_append_sid', 'also_my_own_append_sid');
    -
    - -

    Special treatment/chains

    - -

    The register method is able to take a third argument to specify a special 'chain' mode. The valid modes are first, last and standalone

    - -

    $phpbb_hook->register('append_sid', 'my_own_append_sid', 'first') would make sure that the function is called in the beginning of the chain. It is possible that more than one function is called within the first block - here the FIFO principle is used.

    - -

    $phpbb_hook->register('append_sid', 'my_own_append_sid', 'last') would make sure that the function is called at the very end of the chain. It is possible that more than one function is called within the last block - here the FIFO principle is used.

    - -

    $phpbb_hook->register('append_sid', 'my_own_append_sid', 'standalone') makes sure only the defined function is called. All other functions are removed from the chain and no other functions are added to it later on. If two applications try to trigger the standalone mode a PHP notice will be printed and the second function being discarded.

    - -

    Only allowing hooks for some objects

    - -

    Because the hook system is not able to differate between initialized objects and only operate on the class, you need to solve this on the code level.

    - -

    One possibility would be to use a property:

    - -
    -class my_hookable_object
    -{
    -	function blabla()
    -	{
    -	}
    -}
    -
    -class my_hookable_object2 extends my_hookable_object
    -{
    -	var $call_hook = true;
    -
    -	function hook_me($my_first_parameter, $my_second_parameter)
    -	{
    -		if ($this->call_hook)
    -		{
    -			global $phpbb_hook;
    -
    -			if ($phpbb_hook->call_hook(array(__CLASS__, __FUNCTION__), $my_first_parameter, $my_second_parameter))
    -			{
    -				if ($phpbb_hook->hook_return(array(__CLASS__, __FUNCTION__)))
    -				{
    -					return $phpbb_hook->hook_return_result(array(__CLASS__, __FUNCTION__));
    -				}
    -			}
    -		}
    -
    -		return 'not hooked';
    -	}
    -}
    -
    -function hooking(&$hook, $first, $second)
    -{
    -	return 'hooked';
    -}
    -
    -$first_object = new my_hookable_object2();
    -$second_object = new my_hookable_object2();
    -
    -$phpbb_hook->add_hook(array('my_hookable_object2', 'hook_me'));
    -
    -$phpbb_hook->register(array('my_hookable_object2', 'hook_me'), 'hooking');
    -
    -// Do not call the hook for $first_object
    -$first_object->call_hook = false;
    -
    -echo $first_object->hook_me('first', 'second') . '<br />';
    -echo $second_object->hook_me('first', 'second') . '<br />';
    -
    - -

    OUTPUT:

    - -
    -not hooked
    -hooked 
    -
    - -

    A different possibility would be using a function variable (which could be left out on passing the function variables to the hook):

    - -
    -class my_hookable_object
    -{
    -	function blabla()
    -	{
    -	}
    -}
    -
    -class my_hookable_object2 extends my_hookable_object
    -{
    -	function hook_me($my_first_parameter, $my_second_parameter, $hook_me = true)
    -	{
    -		if ($hook_me)
    -		{
    -			global $phpbb_hook;
    -
    -			if ($phpbb_hook->call_hook(array(__CLASS__, __FUNCTION__), $my_first_parameter, $my_second_parameter))
    -			{
    -				if ($phpbb_hook->hook_return(array(__CLASS__, __FUNCTION__)))
    -				{
    -					return $phpbb_hook->hook_return_result(array(__CLASS__, __FUNCTION__));
    -				}
    -			}
    -		}
    -
    -		return 'not hooked';
    -	}
    -}
    -
    -function hooking(&$hook, $first, $second)
    -{
    -	return 'hooked';
    -}
    -
    -$first_object = new my_hookable_object2();
    -$second_object = new my_hookable_object2();
    -
    -$phpbb_hook->add_hook(array('my_hookable_object2', 'hook_me'));
    -
    -$phpbb_hook->register(array('my_hookable_object2', 'hook_me'), 'hooking');
    -
    -echo $first_object->hook_me('first', 'second', false) . '<br />';
    -echo $second_object->hook_me('first', 'second') . '<br />';
    -		
    - -

    OUTPUT:

    - -
    -not hooked
    -hooked 
    -		
    - -
    - - - -
    -
    - -

    4. Result returning

    - -
    -
    - -
    - -

    Generally, the distinction has to be made if a function returns the result obtained from the called function or continue the execution. Based on the needs of the application this may differ. Therefore, the function returns the results only if the called hook function is returning a result.

    - -

    Case 1 - Returning the result

    - -

    Imagine the following function supporting hooks:

    - -
    -function append_sid($url, $params = false, $is_amp = true, $session_id = false)
    -{
    -	global $_SID, $_EXTRA_URL, $phpbb_hook;
    -
    -	// Developers using the hook function need to globalise the $_SID and $_EXTRA_URL on their own and also handle it appropiatly.
    -	// They could mimick most of what is within this function
    -	if ($phpbb_hook->call_hook(__FUNCTION__, $url, $params, $is_amp, $session_id))
    -	{
    -		if ($phpbb_hook->hook_return(__FUNCTION__))
    -		{
    -			return $phpbb_hook->hook_return_result(__FUNCTION__);
    -		}
    -	}
    -
    -	[...]
    -}
    -
    - -

    Now, the following function is yours. Since you return a value, the append_sid() function itself is returning it as is:

    - -
    -// The function called
    -function my_append_sid(&$hook, $url, $params = false, $is_amp = true, $session_id = false)
    -{
    -	// Get possible previous results
    -	$result = $hook->previous_hook_result('append_sid');
    -
    -	return 'Since i return something the append_sid() function will return my result.';
    -}
    -
    - -

    To be able to get the results returned from functions higher in the change the previous_hook_result() method should always be used, it returns an array('result' => [your result]) construct.

    - -

    Case 2 - Not Returning any result

    - -

    Sometimes applications want to return nothing and therefore force the underlying function to continue it's execution:

    - -
    -function append_sid($url, $params = false, $is_amp = true, $session_id = false)
    -{
    -	global $_SID, $_EXTRA_URL, $phpbb_hook;
    -
    -	// Developers using the hook function need to globalise the $_SID and $_EXTRA_URL on their own and also handle it appropiatly.
    -	// They could mimick most of what is within this function
    -	if ($phpbb_hook->call_hook(__FUNCTION__, $url, $params, $is_amp, $session_id))
    -	{
    -		if ($phpbb_hook->hook_return(__FUNCTION__))
    -		{
    -			return $phpbb_hook->hook_return_result(__FUNCTION__);
    -		}
    -	}
    -
    -	[...]
    -}
    -
    -// The function called
    -function my_append_sid(&$hook, $url, $params = false, $is_amp = true, $session_id = false)
    -{
    -	// Get possible previous results
    -	$result = $hook->previous_hook_result('append_sid');
    -
    -	[...]
    -
    -	// I only rewrite some variables, but return nothing. Therefore, the append_sid() function will not return my (non)result.
    -}
    -
    - -

    Please Note: The decision to return or not return is solely made of the very last function call within the hook chain. An example:

    - -
    -// The function called
    -function my_append_sid(&$hook, $url, $params = false, $is_amp = true, $session_id = false)
    -{
    -	// Get possible previous results
    -	$result = $hook->previous_hook_result('append_sid');
    -
    -	// $result is not filled
    -
    -	return 'FILLED';
    -}
    -
    -// This function is registered too and gets executed after my_append_sid()
    -function my_own_append_sid(&$hook, $url, $params = false, $is_amp = true, $session_id = false)
    -{
    -	$result = $hook->previous_hook_result('append_sid');
    -
    -	// $result is actually filled with $result['result'] = 'FILLED'
    -	// But i return nothing, therefore append_sid() continues it's execution.
    -}
    -
    -// The way both functions are registered.
    -$phpbb_hook->register('append_sid', 'my_append_sid');
    -$phpbb_hook->register('append_sid', 'my_own_append_sid');
    -
    - -
    - - - -
    -
    - -

    5. Embedding your hook files/classes/methods

    - -
    -
    - -
    - -

    There are basically two methods you are able to choose from:

    - -

    1) Add a file to includes/hooks/. The file need to be prefixed by hook_. This file is included within common.php, you are able to register your hooks, include other files or functions, etc. It is advised to only include other files if needed (within a function call for example).

    - -

    Please be aware that you need to purge your cache within the ACP to make your newly placed file available to phpBB3.

    - -

    2) The second method is meant for those wanting to wrap phpBB3 without placing a custom file to the hooks directory. This is mostly done by including phpBB's files within the application file. To be able to register your hooks you need to create a function within your application:

    - -
    -// My function which gets executed within the hooks constuctor
    -function phpbb_hook_register(&$hook)
    -{
    -	$hook->register('append_sid', 'my_append_sid');
    -}
    -
    -[...]
    -
    - -

    You should get the idea. ;)

    - -
    - - - -
    -
    - -

    6. Copyright and disclaimer

    - -
    -
    - -
    - -

    This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 phpBB Group, All Rights Reserved.

    - -
    - - - -
    -
    - - -
    - -
    - -
    - - - diff --git a/phpBB/docs/site_logo.gif b/phpBB/docs/site_logo.gif deleted file mode 100644 index 909114c377..0000000000 Binary files a/phpBB/docs/site_logo.gif and /dev/null differ diff --git a/phpBB/docs/stylesheet.css b/phpBB/docs/stylesheet.css deleted file mode 100644 index 6b8f5994c0..0000000000 --- a/phpBB/docs/stylesheet.css +++ /dev/null @@ -1,352 +0,0 @@ -/* - The original "prosilver" theme for phpBB3 - Created by subBlue design :: http://www.subBlue.com -*/ - -* { margin: 0; padding: 0; } - -html { font-size: 100%; height: 100%; margin-bottom: 1px; } - -body { - font-family: Verdana, Helvetica, Arial, sans-serif; - color: #828282; - background-color: #FFFFFF; - font-size: 12px; - margin: 0; - padding: 12px 0; -} - -img { border-width: 0; } - -p { - line-height: 1.3em; - font-size: 1.1em; - margin-bottom: 1.5em; -} - -hr { - border: 0 none #FFFFFF; - border-top: 1px solid #CCCCCC; - height: 1px; - margin: 5px 0; - display: block; - clear: both; -} - -html, body { - color: #536482; - background-color: #FFFFFF; -} - -#doc-description h1 { - font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - margin-right: 200px; - color: #FFFFFF; - margin-top: 15px; - font-weight: bold; - font-size: 2em; - color: #fff; -} - -h1 { - font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - font-weight: normal; - color: #000; - font-size: 2em; - margin: 0.8em 0 0.2em 0; -} - -h2 { - font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - font-weight: normal; - color: #28313F; - font-size: 1.5em; - margin: 0.8em 0 0.2em 0; -} - -h3 { - font-family: Arial, Helvetica, sans-serif; - font-weight: bold; - border-bottom: 1px solid #CCCCCC; - margin-bottom: 3px; - padding-bottom: 2px; - font-size: 1.05em; - color: #115098; - margin-top: 20px; -} - -h4 { - font-family: Arial, Helvetica, sans-serif; - font-weight: bold; - margin-bottom: 3px; - padding-bottom: 2px; - font-size: 1.05em; - color: #115098; - margin-top: 20px; -} - -.good { color: green; } -.bad { color: red; } - -.version { - margin-top: 20px; - text-align: left; - font-size: 70%; - color: #006600; - border-top: 1px solid #ccc; -} - -code { - color: #006600; - font-weight: normal; - font-family: 'Courier New', monospace; - border-color: #D1D7DC; - border-width: 1px; - border-style: solid; - background-color: #FAFAFA; -} - -#wrap { - padding: 0 20px; - min-width: 650px; -} - -#simple-wrap { - padding: 6px 10px; -} - -#page-body { - margin: 4px 0; - clear: both; -} - -#page-footer { - clear: both; -} - -#logo { - float: left; - width: auto; - padding: 10px 13px 0 10px; -} - -a#logo:hover { - text-decoration: none; -} - -#doc-description { - float: left; - width: 70%; -} - -#doc-description h1 { - margin-right: 0; -} - -.headerbar { - background: #ebebeb none repeat-x 0 0; - color: #FFFFFF; - margin-bottom: 4px; - padding: 0 5px; -} - -span.corners-top, span.corners-bottom, span.corners-top span, span.corners-bottom span { - font-size: 1px; - line-height: 1px; - display: block; - height: 5px; - background-repeat: no-repeat; -} - -span.corners-top { - background-image: none; - background-position: 0 0; - margin: 0 -5px; -} - -span.corners-top span { - background-image: none; - background-position: 100% 0; -} - -span.corners-bottom { - background-image: none; - background-position: 0 100%; - margin: 0 -5px; - clear: both; -} - -span.corners-bottom span { - background-image: none; - background-position: 100% 100%; -} - -.paragraph { - padding: 0 10px; - margin-bottom: 4px; - background-repeat: no-repeat; - background-position: 100% 0; - background-color: #ECF3F7; -} - -.paragraph:target .content { - color: #000000; -} - -.paragraph:target h3 a { - color: #000000; -} - -.content { - color: #333333; -} - -.content h2, .panel h2 { - color: #115098; - border-bottom-color: #CCCCCC; -} - -a:link { color: #898989; text-decoration: none; } -a:visited { color: #898989; text-decoration: none; } -a:hover { color: #d3d3d3; text-decoration: underline; } -a:active { color: #d2d2d2; text-decoration: none; } - -hr { - border-color: #FFFFFF; - border-top-color: #CCCCCC; -} - -.menu { - background-color: #cadceb; -} - -.headerbar { - background-color: #12A3EB; - background-image: url("bg_header.gif"); - color: #FFFFFF; -} - -.panel { - background-color: #ECF1F3; - color: #28313F; -} - - -span.corners-top { - background-image: url("corners_left.png"); -} - -span.corners-top span { - background-image: url("corners_right.png"); -} - -span.corners-bottom { - background-image: url("corners_left.png"); -} - -span.corners-bottom span { - background-image: url("corners_right.png"); -} - -.error { - color: #BC2A4D; -} - -a:link { color: #105289; } -a:visited { color: #105289; } -a:hover { color: #D31141; } -a:active { color: #368AD2; } - -.paragraph span.corners-top, .paragraph span.corners-bottom { - margin: 0 -10px; -} - -.content { - padding: 0; - line-height: 1.48em; - color: #333333; -} - -.content h2, .panel h2 { - color: #115098; - border-bottom-color: #CCCCCC; -} - -.notice { - border-top-color: #CCCCCC; -} - -.codebox { - padding: 3px; - background-color: #FFFFFF; - border: 1px solid #C9D2D8; - font-size: 1em; - margin-bottom: 10px; - display: block; - font: 0.9em Monaco, "Andale Mono","Courier New", Courier, mono; - line-height: 1.3em; -} - -* html hr { margin: 0; } -* html span.corners-top, * html span.corners-bottom { background-image: url("corners_left.gif"); } -* html span.corners-top span, * html span.corners-bottom span { background-image: url("corners_right.gif"); } - -.back2top { - clear: both; - height: 11px; - text-align: right; -} - -.content ol, .content ul { - margin-left: 25px; - margin-top: 0; -} - -.content ul + p, .content ul + div { - margin-top: 20px; -} - -.comment { - color: green; -} - -.indent { - margin-left: 20px; -} - -.paragraph table { - font-size: 8pt; - border-collapse: collapse; - border: 1px solid #cfcfcf; - margin-bottom: 20px; -} - -.paragraph table caption { - display: none; -} - -.paragraph table thead { - background-color: #cadceb; - color: #000; -} - -.paragraph table td, .paragraph table th { - border: 1px solid #006699; - padding: 0.5em; - background-color: #e1ebf2; -} - -.paragraph table th { - background-color: #cadceb; -} - -.paragraph table td dl { - margin: 0; - padding: 0; -} - -.paragraph table td dl dt { - float: left; - clear: both; - margin-right: 1em; -} diff --git a/phpBB/download/file.php b/phpBB/download/file.php deleted file mode 100644 index 8189e900e4..0000000000 --- a/phpBB/download/file.php +++ /dev/null @@ -1,627 +0,0 @@ -sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false)) - { - exit; - } - unset($dbpasswd); - - // worst-case default - $browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : 'msie 6.0'; - - $config = cache::obtain_config(); - $filename = $_GET['avatar']; - $avatar_group = false; - if ($filename[0] === 'g') - { - $avatar_group = true; - $filename = substr($filename, 1); - } - - // '==' is not a bug - . as the first char is as bad as no dot at all - if (strpos($filename, '.') == false) - { - header('HTTP/1.0 403 forbidden'); - if (!empty($cache)) - { - $cache->unload(); - } - $db->sql_close(); - exit; - } - - $ext = substr(strrchr($filename, '.'), 1); - $stamp = (int) substr(stristr($filename, '_'), 1); - $filename = (int) $filename; - - // let's see if we have to send the file at all - $last_load = isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? strtotime(trim($_SERVER['HTTP_IF_MODIFIED_SINCE'])) : false; - if (strpos(strtolower($browser), 'msie 6.0') === false) - { - if ($last_load !== false && $last_load <= $stamp) - { - if (@php_sapi_name() === 'CGI') - { - header('Status: 304 Not Modified', true, 304); - } - else - { - header('HTTP/1.0 304 Not Modified', true, 304); - } - // seems that we need those too ... browsers - header('Pragma: public'); - header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 31536000)); - exit(); - } - else - { - header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $stamp) . ' GMT'); - } - } - - if (!in_array($ext, array('png', 'gif', 'jpg', 'jpeg'))) - { - // no way such an avatar could exist. They are not following the rules, stop the show. - header("HTTP/1.0 403 forbidden"); - if (!empty($cache)) - { - $cache->unload(); - } - $db->sql_close(); - exit; - } - - if (!$filename) - { - // no way such an avatar could exist. They are not following the rules, stop the show. - header("HTTP/1.0 403 forbidden"); - if (!empty($cache)) - { - $cache->unload(); - } - $db->sql_close(); - exit; - } - - send_avatar_to_browser(($avatar_group ? 'g' : '') . $filename . '.' . $ext, $browser); - - if (!empty($cache)) - { - $cache->unload(); - } - $db->sql_close(); - exit; -} - -// implicit else: we are not in avatar mode -include($phpbb_root_path . 'common.' . $phpEx); - -$download_id = request_var('id', 0); -$mode = request_var('mode', ''); -$thumbnail = request_var('t', false); - -// Start session management, do not update session page. -$user->session_begin(false); -$auth->acl($user->data); -$user->setup('viewtopic'); - -if (!$download_id) -{ - trigger_error('NO_ATTACHMENT_SELECTED'); -} - -if (!$config['allow_attachments'] && !$config['allow_pm_attach']) -{ - trigger_error('ATTACHMENT_FUNCTIONALITY_DISABLED'); -} - -$sql = 'SELECT attach_id, in_message, post_msg_id, extension, is_orphan, poster_id - FROM ' . ATTACHMENTS_TABLE . " - WHERE attach_id = $download_id"; -$result = $db->sql_query_limit($sql, 1); -$attachment = $db->sql_fetchrow($result); -$db->sql_freeresult($result); - -if (!$attachment) -{ - trigger_error('ERROR_NO_ATTACHMENT'); -} - -if ((!$attachment['in_message'] && !$config['allow_attachments']) || ($attachment['in_message'] && !$config['allow_pm_attach'])) -{ - trigger_error('ATTACHMENT_FUNCTIONALITY_DISABLED'); -} - -$row = array(); - -if ($attachment['is_orphan']) -{ - // We allow admins having attachment permissions to see orphan attachments... - $own_attachment = ($auth->acl_get('a_attach') || $attachment['poster_id'] == $user->data['user_id']) ? true : false; - - if (!$own_attachment || ($attachment['in_message'] && !$auth->acl_get('u_pm_download')) || (!$attachment['in_message'] && !$auth->acl_get('u_download'))) - { - trigger_error('ERROR_NO_ATTACHMENT'); - } - - // Obtain all extensions... - $extensions = cache::obtain_attach_extensions(true); -} -else -{ - if (!$attachment['in_message']) - { - // - $sql = 'SELECT p.forum_id, f.forum_password, f.parent_id - FROM ' . POSTS_TABLE . ' p, ' . FORUMS_TABLE . ' f - WHERE p.post_id = ' . $attachment['post_msg_id'] . ' - AND p.forum_id = f.forum_id'; - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // Global announcement? - $f_download = (!$row) ? $auth->acl_getf_global('f_download') : $auth->acl_get('f_download', $row['forum_id']); - - if ($auth->acl_get('u_download') && $f_download) - { - if ($row && $row['forum_password']) - { - // Do something else ... ? - login_forum_box($row); - } - } - else - { - trigger_error('SORRY_AUTH_VIEW_ATTACH'); - } - } - else - { - $row['forum_id'] = false; - if (!$auth->acl_get('u_pm_download')) - { - trigger_error('SORRY_AUTH_VIEW_ATTACH'); - } - } - - // disallowed? - $extensions = array(); - if (!extension_allowed($row['forum_id'], $attachment['extension'], $extensions)) - { - trigger_error(sprintf($user->lang['EXTENSION_DISABLED_AFTER_POSTING'], $attachment['extension'])); - } -} - -if (!download_allowed()) -{ - trigger_error($user->lang['LINKAGE_FORBIDDEN']); -} - -$download_mode = (int) $extensions[$attachment['extension']]['download_mode']; - -// Fetching filename here to prevent sniffing of filename -$sql = 'SELECT attach_id, is_orphan, in_message, post_msg_id, extension, physical_filename, real_filename, mimetype - FROM ' . ATTACHMENTS_TABLE . " - WHERE attach_id = $download_id"; -$result = $db->sql_query_limit($sql, 1); -$attachment = $db->sql_fetchrow($result); -$db->sql_freeresult($result); - -if (!$attachment) -{ - trigger_error('ERROR_NO_ATTACHMENT'); -} - -$attachment['physical_filename'] = basename($attachment['physical_filename']); -$display_cat = $extensions[$attachment['extension']]['display_cat']; - -if (($display_cat == ATTACHMENT_CATEGORY_IMAGE || $display_cat == ATTACHMENT_CATEGORY_THUMB) && !$user->optionget('viewimg')) -{ - $display_cat = ATTACHMENT_CATEGORY_NONE; -} - -if ($display_cat == ATTACHMENT_CATEGORY_FLASH && !$user->optionget('viewflash')) -{ - $display_cat = ATTACHMENT_CATEGORY_NONE; -} - -if ($thumbnail) -{ - $attachment['physical_filename'] = 'thumb_' . $attachment['physical_filename']; -} -else if (($display_cat == ATTACHMENT_CATEGORY_NONE || $display_cat == ATTACHMENT_CATEGORY_IMAGE) && !$attachment['is_orphan']) -{ - // Update download count - $sql = 'UPDATE ' . ATTACHMENTS_TABLE . ' - SET download_count = download_count + 1 - WHERE attach_id = ' . $attachment['attach_id']; - $db->sql_query($sql); -} - -if ($display_cat == ATTACHMENT_CATEGORY_IMAGE && $mode === 'view' && (strpos($attachment['mimetype'], 'image') === 0) && strpos(strtolower($user->browser), 'msie') !== false) -{ - wrap_img_in_html(append_sid($phpbb_root_path . 'download/file.' . $phpEx, 'id=' . $attachment['attach_id']), $attachment['real_filename']); -} -else -{ - // Determine the 'presenting'-method - if ($download_mode == PHYSICAL_LINK) - { - // This presenting method should no longer be used - if (!@is_dir($phpbb_root_path . $config['upload_path'])) - { - trigger_error($user->lang['PHYSICAL_DOWNLOAD_NOT_POSSIBLE']); - } - - redirect($phpbb_root_path . $config['upload_path'] . '/' . $attachment['physical_filename']); - exit; - } - else - { - send_file_to_browser($attachment, $config['upload_path'], $display_cat); - exit; - } -} - - -/** -* A simplified function to deliver avatars -* The argument needs to be checked before calling this function. -*/ -function send_avatar_to_browser($file, $browser) -{ - global $config, $phpbb_root_path; - - $prefix = $config['avatar_salt'] . '_'; - $image_dir = $config['avatar_path']; - - // Adjust image_dir path (no trailing slash) - if (substr($image_dir, -1, 1) == '/' || substr($image_dir, -1, 1) == '\\') - { - $image_dir = substr($image_dir, 0, -1) . '/'; - } - $image_dir = str_replace(array('../', '..\\', './', '.\\'), '', $image_dir); - - if ($image_dir && ($image_dir[0] == '/' || $image_dir[0] == '\\')) - { - $image_dir = ''; - } - $file_path = $phpbb_root_path . $image_dir . '/' . $prefix . $file; - - if ((@file_exists($file_path) && @is_readable($file_path)) && !headers_sent()) - { - header('Pragma: public'); - - $image_data = @getimagesize($file_path); - header('Content-Type: ' . image_type_to_mime_type($image_data[2])); - - if (strpos(strtolower($browser), 'msie') !== false) - { - header('Content-Disposition: attachment; ' . header_filename($file)); - - if (strpos(strtolower($browser), 'msie 6.0') !== false) - { - header('Expires: -1'); - } - else - { - header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 31536000)); - } - } - else - { - header('Content-Disposition: inline; ' . header_filename($file)); - header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 31536000)); - } - - $size = @filesize($file_path); - if ($size) - { - header("Content-Length: $size"); - } - - if (@readfile($file_path) === false) - { - $fp = @fopen($file_path, 'rb'); - - if ($fp !== false) - { - while (!feof($fp)) - { - echo fread($fp, 8192); - } - fclose($fp); - } - } - - flush(); - } - else - { - header('HTTP/1.0 404 not found'); - } -} - -/** -* Wraps an url into a simple html page. Used to display attachments in IE. -* this is a workaround for now; might be moved to template system later -* direct any complaints to 1 Microsoft Way, Redmond -*/ -function wrap_img_in_html($src, $title) -{ - echo ''; - echo ''; - echo ''; - echo ''; - echo '' . $title . ''; - echo ''; - echo ''; - echo '
    '; - echo '' . $title . ''; - echo '
    '; - echo ''; - echo ''; -} - -/** -* Send file to browser -*/ -function send_file_to_browser($attachment, $upload_dir, $category) -{ - global $user, $db, $config, $phpbb_root_path; - - $filename = $phpbb_root_path . $upload_dir . '/' . $attachment['physical_filename']; - - if (!@file_exists($filename)) - { - trigger_error($user->lang['ERROR_NO_ATTACHMENT'] . '

    ' . sprintf($user->lang['FILE_NOT_FOUND_404'], $filename)); - } - - // Correct the mime type - we force application/octetstream for all files, except images - // Please do not change this, it is a security precaution - if ($category != ATTACHMENT_CATEGORY_IMAGE || strpos($attachment['mimetype'], 'image') !== 0) - { - $attachment['mimetype'] = (strpos(strtolower($user->browser), 'msie') !== false || strpos(strtolower($user->browser), 'opera') !== false) ? 'application/octetstream' : 'application/octet-stream'; - } - - if (@ob_get_length()) - { - @ob_end_clean(); - } - - // Now send the File Contents to the Browser - $size = @filesize($filename); - - // To correctly display further errors we need to make sure we are using the correct headers for both (unsetting content-length may not work) - - // Check if headers already sent or not able to get the file contents. - if (headers_sent() || !@file_exists($filename) || !@is_readable($filename)) - { - // PHP track_errors setting On? - if (!empty($php_errormsg)) - { - trigger_error($user->lang['UNABLE_TO_DELIVER_FILE'] . '
    ' . sprintf($user->lang['TRACKED_PHP_ERROR'], $php_errormsg)); - } - - trigger_error('UNABLE_TO_DELIVER_FILE'); - } - - // Now the tricky part... let's dance - header('Pragma: public'); - - /** - * Commented out X-Sendfile support. To not expose the physical filename within the header if xsendfile is absent we need to look into methods of checking it's status. - * - * Try X-Sendfile since it is much more server friendly - only works if the path is *not* outside of the root path... - * lighttpd has core support for it. An apache2 module is available at http://celebnamer.celebworld.ws/stuff/mod_xsendfile/ - * - * Not really ideal, but should work fine... - * - * if (strpos($upload_dir, '/') !== 0 && strpos($upload_dir, '../') === false) - * { - * header('X-Sendfile: ' . $filename); - * } - * - */ - - // Send out the Headers. Do not set Content-Disposition to inline please, it is a security measure for users using the Internet Explorer. - header('Content-Type: ' . $attachment['mimetype']); - - if (empty($user->browser) || (strpos(strtolower($user->browser), 'msie') !== false)) - { - header('Content-Disposition: attachment; ' . header_filename(htmlspecialchars_decode($attachment['real_filename']))); - if (empty($user->browser) || (strpos(strtolower($user->browser), 'msie 6.0') !== false)) - { - header('expires: -1'); - } - } - else - { - header('Content-Disposition: ' . ((strpos($attachment['mimetype'], 'image') === 0) ? 'inline' : 'attachment') . '; ' . header_filename(htmlspecialchars_decode($attachment['real_filename']))); - } - - if ($size) - { - header("Content-Length: $size"); - } - - // Try to deliver in chunks - @set_time_limit(0); - - $fp = @fopen($filename, 'rb'); - - if ($fp !== false) - { - while (!feof($fp)) - { - echo fread($fp, 8192); - } - fclose($fp); - } - else - { - @readfile($filename); - } - - flush(); - exit; -} - -/** -* Get a browser friendly UTF-8 encoded filename -*/ -function header_filename($file) -{ - $user_agent = (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : ''; - - // There be dragons here. - // Not many follows the RFC... - if (strpos($user_agent, 'MSIE') !== false || strpos($user_agent, 'Safari') !== false || strpos($user_agent, 'Konqueror') !== false) - { - return "filename=" . rawurlencode($file); - } - - // follow the RFC for extended filename for the rest - return "filename*=UTF-8''" . rawurlencode($file); -} - -/** -* Check if downloading item is allowed -*/ -function download_allowed() -{ - global $config, $user, $db; - - if (!$config['secure_downloads']) - { - return true; - } - - $url = (!empty($_SERVER['HTTP_REFERER'])) ? trim($_SERVER['HTTP_REFERER']) : trim(getenv('HTTP_REFERER')); - - if (!$url) - { - return ($config['secure_allow_empty_referer']) ? true : false; - } - - // Split URL into domain and script part - $url = @parse_url($url); - - if ($url === false) - { - return ($config['secure_allow_empty_referer']) ? true : false; - } - - $hostname = $url['host']; - unset($url); - - $allowed = ($config['secure_allow_deny']) ? false : true; - $iplist = array(); - - if (($ip_ary = @gethostbynamel($hostname)) !== false) - { - foreach ($ip_ary as $ip) - { - if ($ip) - { - $iplist[] = $ip; - } - } - } - - // Check for own server... - $server_name = $user->host; - - // Forcing server vars is the only way to specify/override the protocol - if ($config['force_server_vars'] || !$server_name) - { - $server_name = $config['server_name']; - } - - if (preg_match('#^.*?' . preg_quote($server_name, '#') . '.*?$#i', $hostname)) - { - $allowed = true; - } - - // Get IP's and Hostnames - if (!$allowed) - { - $sql = 'SELECT site_ip, site_hostname, ip_exclude - FROM ' . SITELIST_TABLE; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $site_ip = trim($row['site_ip']); - $site_hostname = trim($row['site_hostname']); - - if ($site_ip) - { - foreach ($iplist as $ip) - { - if (preg_match('#^' . str_replace('\*', '.*?', preg_quote($site_ip, '#')) . '$#i', $ip)) - { - if ($row['ip_exclude']) - { - $allowed = ($config['secure_allow_deny']) ? false : true; - break 2; - } - else - { - $allowed = ($config['secure_allow_deny']) ? true : false; - } - } - } - } - - if ($site_hostname) - { - if (preg_match('#^' . str_replace('\*', '.*?', preg_quote($site_hostname, '#')) . '$#i', $hostname)) - { - if ($row['ip_exclude']) - { - $allowed = ($config['secure_allow_deny']) ? false : true; - break; - } - else - { - $allowed = ($config['secure_allow_deny']) ? true : false; - } - } - } - } - $db->sql_freeresult($result); - } - - return $allowed; -} - -?> \ No newline at end of file diff --git a/phpBB/extension.inc b/phpBB/extension.inc new file mode 100644 index 0000000000..abc99efe9c --- /dev/null +++ b/phpBB/extension.inc @@ -0,0 +1,26 @@ + \ No newline at end of file diff --git a/phpBB/faq.php b/phpBB/faq.php index da064e4452..f7f82a1da7 100644 --- a/phpBB/faq.php +++ b/phpBB/faq.php @@ -1,74 +1,150 @@ session_begin(); -$auth->acl($user->data); -$user->setup(); +// +$userdata = session_pagestart($user_ip, PAGE_FAQ); +init_userprefs($userdata); +// +// End session management +// -$mode = request_var('mode', ''); +// Set vars to prevent naughtiness +$faq = array(); +// // Load the appropriate faq file -switch ($mode) +// +if( isset($HTTP_GET_VARS['mode']) ) { - case 'bbcode': - $l_title = $user->lang['BBCODE_GUIDE']; - $user->add_lang('bbcode', false, true); - break; - - default: - $l_title = $user->lang['FAQ_EXPLAIN']; - $user->add_lang('faq', false, true); - break; -} - -// Pull the array data from the lang pack -$help_blocks = array(); -foreach ($user->help as $help_ary) -{ - if ($help_ary[0] == '--') + switch( $HTTP_GET_VARS['mode'] ) { - $template->assign_block_vars('faq_block', array( - 'BLOCK_TITLE' => $help_ary[1]) - ); - - continue; + case 'bbcode': + $lang_file = 'lang_bbcode'; + $l_title = $lang['BBCode_guide']; + break; + default: + $lang_file = 'lang_faq'; + $l_title = $lang['FAQ']; + break; } +} +else +{ + $lang_file = 'lang_faq'; + $l_title = $lang['FAQ']; +} +include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/' . $lang_file . '.' . $phpEx); - $template->assign_block_vars('faq_block.faq_row', array( - 'FAQ_QUESTION' => $help_ary[0], - 'FAQ_ANSWER' => $help_ary[1]) - ); +// +// Pull the array data from the lang pack +// +$j = 0; +$counter = 0; +$counter_2 = 0; +$faq_block = array(); +$faq_block_titles = array(); + +for($i = 0; $i < count($faq); $i++) +{ + if( $faq[$i][0] != '--' ) + { + $faq_block[$j][$counter]['id'] = $counter_2; + $faq_block[$j][$counter]['question'] = $faq[$i][0]; + $faq_block[$j][$counter]['answer'] = $faq[$i][1]; + + $counter++; + $counter_2++; + } + else + { + $j = ( $counter != 0 ) ? $j + 1 : 0; + + $faq_block_titles[$j] = $faq[$i][1]; + + $counter = 0; + } } +// // Lets build a page ... -$template->assign_vars(array( - 'L_FAQ_TITLE' => $l_title, - 'L_BACK_TO_TOP' => $user->lang['BACK_TO_TOP']) -); - -page_header($l_title); +// +$page_title = $l_title; +include($phpbb_root_path . 'includes/page_header.'.$phpEx); $template->set_filenames(array( - 'body' => 'faq_body.html') + 'body' => 'faq_body.tpl') ); -make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); +make_jumpbox('viewforum.'.$phpEx); -page_footer(); +$template->assign_vars(array( + 'L_FAQ_TITLE' => $l_title, + 'L_BACK_TO_TOP' => $lang['Back_to_top']) +); + +for($i = 0; $i < count($faq_block); $i++) +{ + if( count($faq_block[$i]) ) + { + $template->assign_block_vars('faq_block', array( + 'BLOCK_TITLE' => $faq_block_titles[$i]) + ); + $template->assign_block_vars('faq_block_link', array( + 'BLOCK_TITLE' => $faq_block_titles[$i]) + ); + + for($j = 0; $j < count($faq_block[$i]); $j++) + { + $row_color = ( !($j % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($j % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $template->assign_block_vars('faq_block.faq_row', array( + 'ROW_COLOR' => '#' . $row_color, + 'ROW_CLASS' => $row_class, + 'FAQ_QUESTION' => $faq_block[$i][$j]['question'], + 'FAQ_ANSWER' => $faq_block[$i][$j]['answer'], + + 'U_FAQ_ID' => $faq_block[$i][$j]['id']) + ); + + $template->assign_block_vars('faq_block_link.faq_row_link', array( + 'ROW_COLOR' => '#' . $row_color, + 'ROW_CLASS' => $row_class, + 'FAQ_LINK' => $faq_block[$i][$j]['question'], + + 'U_FAQ_LINK' => '#' . $faq_block[$i][$j]['id']) + ); + } + } +} + +$template->pparse('body'); + +include($phpbb_root_path . 'includes/page_tail.'.$phpEx); ?> \ No newline at end of file diff --git a/phpBB/files/.htaccess b/phpBB/files/.htaccess deleted file mode 100644 index aa5afc1640..0000000000 --- a/phpBB/files/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ - - Order Allow,Deny - Deny from All - \ No newline at end of file diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php new file mode 100644 index 0000000000..281f92b0b9 --- /dev/null +++ b/phpBB/groupcp.php @@ -0,0 +1,1298 @@ +' : ''; + break; + case USER_AVATAR_REMOTE: + $poster_avatar = ( $board_config['allow_avatar_remote'] ) ? '' : ''; + break; + case USER_AVATAR_GALLERY: + $poster_avatar = ( $board_config['allow_avatar_local'] ) ? '' : ''; + break; + } + } + + if ( !empty($row['user_viewemail']) || $group_mod ) + { + $email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $row['user_id']) : 'mailto:' . $row['user_email']; + + $email_img = '' . $lang['Send_email'] . ''; + $email = '' . $lang['Send_email'] . ''; + } + else + { + $email_img = ' '; + $email = ' '; + } + + $temp_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']); + $profile_img = '' . $lang['Read_profile'] . ''; + $profile = '' . $lang['Read_profile'] . ''; + + $temp_url = append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=" . $row['user_id']); + $pm_img = '' . $lang['Send_private_message'] . ''; + $pm = '' . $lang['Send_private_message'] . ''; + + $www_img = ( $row['user_website'] ) ? '' . $lang['Visit_website'] . '' : ''; + $www = ( $row['user_website'] ) ? '' . $lang['Visit_website'] . '' : ''; + + if ( !empty($row['user_icq']) ) + { + $icq_status_img = ''; + $icq_img = '' . $lang['ICQ'] . ''; + $icq = '' . $lang['ICQ'] . ''; + } + else + { + $icq_status_img = ''; + $icq_img = ''; + $icq = ''; + } + + $aim_img = ( $row['user_aim'] ) ? '' . $lang['AIM'] . '' : ''; + $aim = ( $row['user_aim'] ) ? '' . $lang['AIM'] . '' : ''; + + $temp_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']); + $msn_img = ( $row['user_msnm'] ) ? '' . $lang['MSNM'] . '' : ''; + $msn = ( $row['user_msnm'] ) ? '' . $lang['MSNM'] . '' : ''; + + $yim_img = ( $row['user_yim'] ) ? '' . $lang['YIM'] . '' : ''; + $yim = ( $row['user_yim'] ) ? '' . $lang['YIM'] . '' : ''; + + $temp_url = append_sid("search.$phpEx?search_author=" . urlencode($row['username']) . "&showresults=posts"); + $search_img = '' . sprintf($lang['Search_user_posts'], $row['username']) . ''; + $search = '' . sprintf($lang['Search_user_posts'], $row['username']) . ''; + + return; +} +// +// -------------------------- + +// +// Start session management +// +$userdata = session_pagestart($user_ip, PAGE_GROUPCP); +init_userprefs($userdata); +// +// End session management +// + +$script_name = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path'])); +$script_name = ( $script_name != '' ) ? $script_name . '/groupcp.'.$phpEx : 'groupcp.'.$phpEx; +$server_name = trim($board_config['server_name']); +$server_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://'; +$server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/'; + +$server_url = $server_protocol . $server_name . $server_port . $script_name; + +if ( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) +{ + $group_id = ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? intval($HTTP_POST_VARS[POST_GROUPS_URL]) : intval($HTTP_GET_VARS[POST_GROUPS_URL]); +} +else +{ + $group_id = ''; +} + +if ( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) ) +{ + $mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; + $mode = htmlspecialchars($mode); +} +else +{ + $mode = ''; +} + +$confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : 0; +$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : 0; +$sid = ( isset($HTTP_POST_VARS['sid']) ) ? $HTTP_POST_VARS['sid'] : ''; +$start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0; +$start = ($start < 0) ? 0 : $start; + +// +// Default var values +// +$is_moderator = FALSE; + +if ( isset($HTTP_POST_VARS['groupstatus']) && $group_id ) +{ + if ( !$userdata['session_logged_in'] ) + { + redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true)); + } + + $sql = "SELECT group_moderator + FROM " . GROUPS_TABLE . " + WHERE group_id = $group_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain user and group information', '', __LINE__, __FILE__, $sql); + } + + $row = $db->sql_fetchrow($result); + + if ( $row['group_moderator'] != $userdata['user_id'] && $userdata['user_level'] != ADMIN ) + { + $template->assign_vars(array( + 'META' => '') + ); + + $message = $lang['Not_group_moderator'] . '

    ' . sprintf($lang['Click_return_group'], '', '') . '

    ' . sprintf($lang['Click_return_index'], '', ''); + + message_die(GENERAL_MESSAGE, $message); + } + + $sql = "UPDATE " . GROUPS_TABLE . " + SET group_type = " . intval($HTTP_POST_VARS['group_type']) . " + WHERE group_id = $group_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain user and group information', '', __LINE__, __FILE__, $sql); + } + + $template->assign_vars(array( + 'META' => '') + ); + + $message = $lang['Group_type_updated'] . '

    ' . sprintf($lang['Click_return_group'], '', '') . '

    ' . sprintf($lang['Click_return_index'], '', ''); + + message_die(GENERAL_MESSAGE, $message); + +} +else if ( isset($HTTP_POST_VARS['joingroup']) && $group_id ) +{ + // + // First, joining a group + // If the user isn't logged in redirect them to login + // + if ( !$userdata['session_logged_in'] ) + { + redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true)); + } + else if ( $sid !== $userdata['session_id'] ) + { + message_die(GENERAL_ERROR, $lang['Session_invalid']); + } + + $sql = "SELECT ug.user_id, g.group_type + FROM " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g + WHERE g.group_id = $group_id + AND g.group_type <> " . GROUP_HIDDEN . " + AND ug.group_id = g.group_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain user and group information', '', __LINE__, __FILE__, $sql); + } + + if ( $row = $db->sql_fetchrow($result)) + { + if ( $row['group_type'] == GROUP_OPEN ) + { + do + { + if ( $userdata['user_id'] == $row['user_id'] ) + { + $template->assign_vars(array( + 'META' => '') + ); + + $message = $lang['Already_member_group'] . '

    ' . sprintf($lang['Click_return_group'], '', '') . '

    ' . sprintf($lang['Click_return_index'], '', ''); + + message_die(GENERAL_MESSAGE, $message); + } + } while ( $row = $db->sql_fetchrow($result) ); + } + else + { + $template->assign_vars(array( + 'META' => '') + ); + + $message = $lang['This_closed_group'] . '

    ' . sprintf($lang['Click_return_group'], '', '') . '

    ' . sprintf($lang['Click_return_index'], '', ''); + + message_die(GENERAL_MESSAGE, $message); + } + } + else + { + message_die(GENERAL_MESSAGE, $lang['No_groups_exist']); + } + + $sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending) + VALUES ($group_id, " . $userdata['user_id'] . ", 1)"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Error inserting user group subscription", "", __LINE__, __FILE__, $sql); + } + + $sql = "SELECT u.user_email, u.username, u.user_lang, g.group_name + FROM ".USERS_TABLE . " u, " . GROUPS_TABLE . " g + WHERE u.user_id = g.group_moderator + AND g.group_id = $group_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Error getting group moderator data", "", __LINE__, __FILE__, $sql); + } + + $moderator = $db->sql_fetchrow($result); + + include($phpbb_root_path . 'includes/emailer.'.$phpEx); + $emailer = new emailer($board_config['smtp_delivery']); + + $emailer->from($board_config['board_email']); + $emailer->replyto($board_config['board_email']); + + $emailer->use_template('group_request', $moderator['user_lang']); + $emailer->email_address($moderator['user_email']); + $emailer->set_subject($lang['Group_request']); + + $emailer->assign_vars(array( + 'SITENAME' => $board_config['sitename'], + 'GROUP_MODERATOR' => $moderator['username'], + 'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('
    ', "\n", "-- \n" . $board_config['board_email_sig']) : '', + + 'U_GROUPCP' => $server_url . '?' . POST_GROUPS_URL . "=$group_id&validate=true") + ); + $emailer->send(); + $emailer->reset(); + + $template->assign_vars(array( + 'META' => '') + ); + + $message = $lang['Group_joined'] . '

    ' . sprintf($lang['Click_return_group'], '', '') . '

    ' . sprintf($lang['Click_return_index'], '', ''); + + message_die(GENERAL_MESSAGE, $message); +} +else if ( isset($HTTP_POST_VARS['unsub']) || isset($HTTP_POST_VARS['unsubpending']) && $group_id ) +{ + // + // Second, unsubscribing from a group + // Check for confirmation of unsub. + // + if ( $cancel ) + { + redirect(append_sid("groupcp.$phpEx", true)); + } + else if ( !$userdata['session_logged_in'] ) + { + redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true)); + } + else if ( $sid !== $userdata['session_id'] ) + { + message_die(GENERAL_ERROR, $lang['Session_invalid']); + } + + + if ( $confirm ) + { + $sql = "DELETE FROM " . USER_GROUP_TABLE . " + WHERE user_id = " . $userdata['user_id'] . " + AND group_id = $group_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not delete group memebership data', '', __LINE__, __FILE__, $sql); + } + + if ( $userdata['user_level'] != ADMIN && $userdata['user_level'] == MOD ) + { + $sql = "SELECT COUNT(auth_mod) AS is_auth_mod + FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug + WHERE ug.user_id = " . $userdata['user_id'] . " + AND aa.group_id = ug.group_id + AND aa.auth_mod = 1"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain moderator status', '', __LINE__, __FILE__, $sql); + } + + if ( !($row = $db->sql_fetchrow($result)) || $row['is_auth_mod'] == 0 ) + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_level = " . USER . " + WHERE user_id = " . $userdata['user_id']; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql); + } + } + } + + $template->assign_vars(array( + 'META' => '') + ); + + $message = $lang['Unsub_success'] . '

    ' . sprintf($lang['Click_return_group'], '', '') . '

    ' . sprintf($lang['Click_return_index'], '', ''); + + message_die(GENERAL_MESSAGE, $message); + } + else + { + $unsub_msg = ( isset($HTTP_POST_VARS['unsub']) ) ? $lang['Confirm_unsub'] : $lang['Confirm_unsub_pending']; + + $s_hidden_fields = ''; + $s_hidden_fields .= ''; + + $page_title = $lang['Group_Control_Panel']; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + $template->set_filenames(array( + 'confirm' => 'confirm_body.tpl') + ); + + $template->assign_vars(array( + 'MESSAGE_TITLE' => $lang['Confirm'], + 'MESSAGE_TEXT' => $unsub_msg, + 'L_YES' => $lang['Yes'], + 'L_NO' => $lang['No'], + 'S_CONFIRM_ACTION' => append_sid("groupcp.$phpEx"), + 'S_HIDDEN_FIELDS' => $s_hidden_fields) + ); + + $template->pparse('confirm'); + + include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + } + +} +else if ( $group_id ) +{ + // + // Did the group moderator get here through an email? + // If so, check to see if they are logged in. + // + if ( isset($HTTP_GET_VARS['validate']) ) + { + if ( !$userdata['session_logged_in'] ) + { + redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true)); + } + } + + // + // For security, get the ID of the group moderator. + // + switch(SQL_LAYER) + { + case 'postgresql': + $sql = "SELECT g.group_moderator, g.group_type, aa.auth_mod + FROM " . GROUPS_TABLE . " g, " . AUTH_ACCESS_TABLE . " aa + WHERE g.group_id = $group_id + AND aa.group_id = g.group_id + UNION ( + SELECT g.group_moderator, g.group_type, NULL + FROM " . GROUPS_TABLE . " g + WHERE g.group_id = $group_id + AND NOT EXISTS ( + SELECT aa.group_id + FROM " . AUTH_ACCESS_TABLE . " aa + WHERE aa.group_id = g.group_id + ) + ) + ORDER BY auth_mod DESC"; + break; + + case 'oracle': + $sql = "SELECT g.group_moderator, g.group_type, aa.auth_mod + FROM " . GROUPS_TABLE . " g, " . AUTH_ACCESS_TABLE . " aa + WHERE g.group_id = $group_id + AND aa.group_id (+) = g.group_id + ORDER BY aa.auth_mod DESC"; + break; + + default: + $sql = "SELECT g.group_moderator, g.group_type, aa.auth_mod + FROM ( " . GROUPS_TABLE . " g + LEFT JOIN " . AUTH_ACCESS_TABLE . " aa ON aa.group_id = g.group_id ) + WHERE g.group_id = $group_id + ORDER BY aa.auth_mod DESC"; + break; + } + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not get moderator information', '', __LINE__, __FILE__, $sql); + } + + if ( $group_info = $db->sql_fetchrow($result) ) + { + $group_moderator = $group_info['group_moderator']; + + if ( $group_moderator == $userdata['user_id'] || $userdata['user_level'] == ADMIN ) + { + $is_moderator = TRUE; + } + + // + // Handle Additions, removals, approvals and denials + // + if ( !empty($HTTP_POST_VARS['add']) || !empty($HTTP_POST_VARS['remove']) || isset($HTTP_POST_VARS['approve']) || isset($HTTP_POST_VARS['deny']) ) + { + if ( !$userdata['session_logged_in'] ) + { + redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true)); + } + else if ( $sid !== $userdata['session_id'] ) + { + message_die(GENERAL_ERROR, $lang['Session_invalid']); + } + + if ( !$is_moderator ) + { + $template->assign_vars(array( + 'META' => '') + ); + + $message = $lang['Not_group_moderator'] . '

    ' . sprintf($lang['Click_return_index'], '', ''); + + message_die(GENERAL_MESSAGE, $message); + } + + if ( isset($HTTP_POST_VARS['add']) ) + { + $username = ( isset($HTTP_POST_VARS['username']) ) ? phpbb_clean_username($HTTP_POST_VARS['username']) : ''; + + $sql = "SELECT user_id, user_email, user_lang, user_level + FROM " . USERS_TABLE . " + WHERE username = '" . str_replace("\'", "''", $username) . "'"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Could not get user information", $lang['Error'], __LINE__, __FILE__, $sql); + } + + if ( !($row = $db->sql_fetchrow($result)) ) + { + $template->assign_vars(array( + 'META' => '') + ); + + $message = $lang['Could_not_add_user'] . "

    " . sprintf($lang['Click_return_group'], "", "") . "

    " . sprintf($lang['Click_return_index'], "", ""); + + message_die(GENERAL_MESSAGE, $message); + } + + if ( $row['user_id'] == ANONYMOUS ) + { + $template->assign_vars(array( + 'META' => '') + ); + + $message = $lang['Could_not_anon_user'] . '

    ' . sprintf($lang['Click_return_group'], '', '') . '

    ' . sprintf($lang['Click_return_index'], '', ''); + + message_die(GENERAL_MESSAGE, $message); + } + + $sql = "SELECT ug.user_id, u.user_level + FROM " . USER_GROUP_TABLE . " ug, " . USERS_TABLE . " u + WHERE u.user_id = " . $row['user_id'] . " + AND ug.user_id = u.user_id + AND ug.group_id = $group_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not get user information', '', __LINE__, __FILE__, $sql); + } + + if ( !($db->sql_fetchrow($result)) ) + { + $sql = "INSERT INTO " . USER_GROUP_TABLE . " (user_id, group_id, user_pending) + VALUES (" . $row['user_id'] . ", $group_id, 0)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not add user to group', '', __LINE__, __FILE__, $sql); + } + + if ( $row['user_level'] != ADMIN && $row['user_level'] != MOD && $group_info['auth_mod'] ) + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_level = " . MOD . " + WHERE user_id = " . $row['user_id']; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql); + } + } + + // + // Get the group name + // Email the user and tell them they're in the group + // + $group_sql = "SELECT group_name + FROM " . GROUPS_TABLE . " + WHERE group_id = $group_id"; + if ( !($result = $db->sql_query($group_sql)) ) + { + message_die(GENERAL_ERROR, 'Could not get group information', '', __LINE__, __FILE__, $group_sql); + } + + $group_name_row = $db->sql_fetchrow($result); + + $group_name = $group_name_row['group_name']; + + include($phpbb_root_path . 'includes/emailer.'.$phpEx); + $emailer = new emailer($board_config['smtp_delivery']); + + $emailer->from($board_config['board_email']); + $emailer->replyto($board_config['board_email']); + + $emailer->use_template('group_added', $row['user_lang']); + $emailer->email_address($row['user_email']); + $emailer->set_subject($lang['Group_added']); + + $emailer->assign_vars(array( + 'SITENAME' => $board_config['sitename'], + 'GROUP_NAME' => $group_name, + 'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('
    ', "\n", "-- \n" . $board_config['board_email_sig']) : '', + + 'U_GROUPCP' => $server_url . '?' . POST_GROUPS_URL . "=$group_id") + ); + $emailer->send(); + $emailer->reset(); + } + else + { + $template->assign_vars(array( + 'META' => '') + ); + + $message = $lang['User_is_member_group'] . '

    ' . sprintf($lang['Click_return_group'], '', '') . '

    ' . sprintf($lang['Click_return_index'], '', ''); + + message_die(GENERAL_MESSAGE, $message); + } + } + else + { + if ( ( ( isset($HTTP_POST_VARS['approve']) || isset($HTTP_POST_VARS['deny']) ) && isset($HTTP_POST_VARS['pending_members']) ) || ( isset($HTTP_POST_VARS['remove']) && isset($HTTP_POST_VARS['members']) ) ) + { + + $members = ( isset($HTTP_POST_VARS['approve']) || isset($HTTP_POST_VARS['deny']) ) ? $HTTP_POST_VARS['pending_members'] : $HTTP_POST_VARS['members']; + + $sql_in = ''; + for($i = 0; $i < count($members); $i++) + { + $sql_in .= ( ( $sql_in != '' ) ? ', ' : '' ) . intval($members[$i]); + } + + if ( isset($HTTP_POST_VARS['approve']) ) + { + if ( $group_info['auth_mod'] ) + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_level = " . MOD . " + WHERE user_id IN ($sql_in) + AND user_level NOT IN (" . MOD . ", " . ADMIN . ")"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql); + } + } + + $sql = "UPDATE " . USER_GROUP_TABLE . " + SET user_pending = 0 + WHERE user_id IN ($sql_in) + AND group_id = $group_id"; + $sql_select = "SELECT user_email + FROM ". USERS_TABLE . " + WHERE user_id IN ($sql_in)"; + } + else if ( isset($HTTP_POST_VARS['deny']) || isset($HTTP_POST_VARS['remove']) ) + { + if ( $group_info['auth_mod'] ) + { + $sql = "SELECT ug.user_id, ug.group_id + FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug + WHERE ug.user_id IN ($sql_in) + AND aa.group_id = ug.group_id + AND aa.auth_mod = 1 + GROUP BY ug.user_id, ug.group_id + ORDER BY ug.user_id, ug.group_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain moderator status', '', __LINE__, __FILE__, $sql); + } + + if ( $row = $db->sql_fetchrow($result) ) + { + $group_check = array(); + $remove_mod_sql = ''; + + do + { + $group_check[$row['user_id']][] = $row['group_id']; + } + while ( $row = $db->sql_fetchrow($result) ); + + while( list($user_id, $group_list) = @each($group_check) ) + { + if ( count($group_list) == 1 ) + { + $remove_mod_sql .= ( ( $remove_mod_sql != '' ) ? ', ' : '' ) . $user_id; + } + } + + if ( $remove_mod_sql != '' ) + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_level = " . USER . " + WHERE user_id IN ($remove_mod_sql) + AND user_level NOT IN (" . ADMIN . ")"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql); + } + } + } + } + + $sql = "DELETE FROM " . USER_GROUP_TABLE . " + WHERE user_id IN ($sql_in) + AND group_id = $group_id"; + } + + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update user group table', '', __LINE__, __FILE__, $sql); + } + + // + // Email users when they are approved + // + if ( isset($HTTP_POST_VARS['approve']) ) + { + if ( !($result = $db->sql_query($sql_select)) ) + { + message_die(GENERAL_ERROR, 'Could not get user email information', '', __LINE__, __FILE__, $sql); + } + + $bcc_list = array(); + while ($row = $db->sql_fetchrow($result)) + { + $bcc_list[] = $row['user_email']; + } + + // + // Get the group name + // + $group_sql = "SELECT group_name + FROM " . GROUPS_TABLE . " + WHERE group_id = $group_id"; + if ( !($result = $db->sql_query($group_sql)) ) + { + message_die(GENERAL_ERROR, 'Could not get group information', '', __LINE__, __FILE__, $group_sql); + } + + $group_name_row = $db->sql_fetchrow($result); + $group_name = $group_name_row['group_name']; + + include($phpbb_root_path . 'includes/emailer.'.$phpEx); + $emailer = new emailer($board_config['smtp_delivery']); + + $emailer->from($board_config['board_email']); + $emailer->replyto($board_config['board_email']); + + for ($i = 0; $i < count($bcc_list); $i++) + { + $emailer->bcc($bcc_list[$i]); + } + + $emailer->use_template('group_approved'); + $emailer->set_subject($lang['Group_approved']); + + $emailer->assign_vars(array( + 'SITENAME' => $board_config['sitename'], + 'GROUP_NAME' => $group_name, + 'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('
    ', "\n", "-- \n" . $board_config['board_email_sig']) : '', + + 'U_GROUPCP' => $server_url . '?' . POST_GROUPS_URL . "=$group_id") + ); + $emailer->send(); + $emailer->reset(); + } + } + } + } + // + // END approve or deny + // + } + else + { + message_die(GENERAL_MESSAGE, $lang['No_groups_exist']); + } + + // + // Get group details + // + $sql = "SELECT * + FROM " . GROUPS_TABLE . " + WHERE group_id = $group_id + AND group_single_user = 0"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Error getting group information', '', __LINE__, __FILE__, $sql); + } + + if ( !($group_info = $db->sql_fetchrow($result)) ) + { + message_die(GENERAL_MESSAGE, $lang['Group_not_exist']); + } + + // + // Get moderator details for this group + // + $sql = "SELECT username, user_id, user_viewemail, user_posts, user_regdate, user_from, user_website, user_email, user_icq, user_aim, user_yim, user_msnm + FROM " . USERS_TABLE . " + WHERE user_id = " . $group_info['group_moderator']; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Error getting user list for group', '', __LINE__, __FILE__, $sql); + } + + $group_moderator = $db->sql_fetchrow($result); + + // + // Get user information for this group + // + $sql = "SELECT u.username, u.user_id, u.user_viewemail, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_msnm, ug.user_pending + FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug + WHERE ug.group_id = $group_id + AND u.user_id = ug.user_id + AND ug.user_pending = 0 + AND ug.user_id <> " . $group_moderator['user_id'] . " + ORDER BY u.username"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Error getting user list for group', '', __LINE__, __FILE__, $sql); + } + + $group_members = $db->sql_fetchrowset($result); + $members_count = count($group_members); + $db->sql_freeresult($result); + + $sql = "SELECT u.username, u.user_id, u.user_viewemail, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_msnm + FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug, " . USERS_TABLE . " u + WHERE ug.group_id = $group_id + AND g.group_id = ug.group_id + AND ug.user_pending = 1 + AND u.user_id = ug.user_id + ORDER BY u.username"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Error getting user pending information', '', __LINE__, __FILE__, $sql); + } + + $modgroup_pending_list = $db->sql_fetchrowset($result); + $modgroup_pending_count = count($modgroup_pending_list); + $db->sql_freeresult($result); + + $is_group_member = 0; + if ( $members_count ) + { + for($i = 0; $i < $members_count; $i++) + { + if ( $group_members[$i]['user_id'] == $userdata['user_id'] && $userdata['session_logged_in'] ) + { + $is_group_member = TRUE; + } + } + } + + $is_group_pending_member = 0; + if ( $modgroup_pending_count ) + { + for($i = 0; $i < $modgroup_pending_count; $i++) + { + if ( $modgroup_pending_list[$i]['user_id'] == $userdata['user_id'] && $userdata['session_logged_in'] ) + { + $is_group_pending_member = TRUE; + } + } + } + + if ( $userdata['user_level'] == ADMIN ) + { + $is_moderator = TRUE; + } + + if ( $userdata['user_id'] == $group_info['group_moderator'] ) + { + $is_moderator = TRUE; + + $group_details = $lang['Are_group_moderator']; + + $s_hidden_fields = ''; + } + else if ( $is_group_member || $is_group_pending_member ) + { + $template->assign_block_vars('switch_unsubscribe_group_input', array()); + + $group_details = ( $is_group_pending_member ) ? $lang['Pending_this_group'] : $lang['Member_this_group']; + + $s_hidden_fields = ''; + } + else if ( $userdata['user_id'] == ANONYMOUS ) + { + $group_details = $lang['Login_to_join']; + $s_hidden_fields = ''; + } + else + { + if ( $group_info['group_type'] == GROUP_OPEN ) + { + $template->assign_block_vars('switch_subscribe_group_input', array()); + + $group_details = $lang['This_open_group']; + $s_hidden_fields = ''; + } + else if ( $group_info['group_type'] == GROUP_CLOSED ) + { + $group_details = $lang['This_closed_group']; + $s_hidden_fields = ''; + } + else if ( $group_info['group_type'] == GROUP_HIDDEN ) + { + $group_details = $lang['This_hidden_group']; + $s_hidden_fields = ''; + } + } + + $page_title = $lang['Group_Control_Panel']; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + // + // Load templates + // + $template->set_filenames(array( + 'info' => 'groupcp_info_body.tpl', + 'pendinginfo' => 'groupcp_pending_info.tpl') + ); + make_jumpbox('viewforum.'.$phpEx); + + // + // Add the moderator + // + $username = $group_moderator['username']; + $user_id = $group_moderator['user_id']; + + generate_user_info($group_moderator, $board_config['default_dateformat'], $is_moderator, $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim); + + $s_hidden_fields .= ''; + + $template->assign_vars(array( + 'L_GROUP_INFORMATION' => $lang['Group_Information'], + 'L_GROUP_NAME' => $lang['Group_name'], + 'L_GROUP_DESC' => $lang['Group_description'], + 'L_GROUP_TYPE' => $lang['Group_type'], + 'L_GROUP_MEMBERSHIP' => $lang['Group_membership'], + 'L_SUBSCRIBE' => $lang['Subscribe'], + 'L_UNSUBSCRIBE' => $lang['Unsubscribe'], + 'L_JOIN_GROUP' => $lang['Join_group'], + 'L_UNSUBSCRIBE_GROUP' => $lang['Unsubscribe'], + 'L_GROUP_OPEN' => $lang['Group_open'], + 'L_GROUP_CLOSED' => $lang['Group_closed'], + 'L_GROUP_HIDDEN' => $lang['Group_hidden'], + 'L_UPDATE' => $lang['Update'], + 'L_GROUP_MODERATOR' => $lang['Group_Moderator'], + 'L_GROUP_MEMBERS' => $lang['Group_Members'], + 'L_PENDING_MEMBERS' => $lang['Pending_members'], + 'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'], + 'L_PM' => $lang['Private_Message'], + 'L_EMAIL' => $lang['Email'], + 'L_POSTS' => $lang['Posts'], + 'L_WEBSITE' => $lang['Website'], + 'L_FROM' => $lang['Location'], + 'L_ORDER' => $lang['Order'], + 'L_SORT' => $lang['Sort'], + 'L_SUBMIT' => $lang['Sort'], + 'L_AIM' => $lang['AIM'], + 'L_YIM' => $lang['YIM'], + 'L_MSNM' => $lang['MSNM'], + 'L_ICQ' => $lang['ICQ'], + 'L_SELECT' => $lang['Select'], + 'L_REMOVE_SELECTED' => $lang['Remove_selected'], + 'L_ADD_MEMBER' => $lang['Add_member'], + 'L_FIND_USERNAME' => $lang['Find_username'], + + 'GROUP_NAME' => $group_info['group_name'], + 'GROUP_DESC' => $group_info['group_description'], + 'GROUP_DETAILS' => $group_details, + 'MOD_ROW_COLOR' => '#' . $theme['td_color1'], + 'MOD_ROW_CLASS' => $theme['td_class1'], + 'MOD_USERNAME' => $username, + 'MOD_FROM' => $from, + 'MOD_JOINED' => $joined, + 'MOD_POSTS' => $posts, + 'MOD_AVATAR_IMG' => $poster_avatar, + 'MOD_PROFILE_IMG' => $profile_img, + 'MOD_PROFILE' => $profile, + 'MOD_SEARCH_IMG' => $search_img, + 'MOD_SEARCH' => $search, + 'MOD_PM_IMG' => $pm_img, + 'MOD_PM' => $pm, + 'MOD_EMAIL_IMG' => $email_img, + 'MOD_EMAIL' => $email, + 'MOD_WWW_IMG' => $www_img, + 'MOD_WWW' => $www, + 'MOD_ICQ_STATUS_IMG' => $icq_status_img, + 'MOD_ICQ_IMG' => $icq_img, + 'MOD_ICQ' => $icq, + 'MOD_AIM_IMG' => $aim_img, + 'MOD_AIM' => $aim, + 'MOD_MSN_IMG' => $msn_img, + 'MOD_MSN' => $msn, + 'MOD_YIM_IMG' => $yim_img, + 'MOD_YIM' => $yim, + + 'U_MOD_VIEWPROFILE' => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id"), + 'U_SEARCH_USER' => append_sid("search.$phpEx?mode=searchuser"), + + 'S_GROUP_OPEN_TYPE' => GROUP_OPEN, + 'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED, + 'S_GROUP_HIDDEN_TYPE' => GROUP_HIDDEN, + 'S_GROUP_OPEN_CHECKED' => ( $group_info['group_type'] == GROUP_OPEN ) ? ' checked="checked"' : '', + 'S_GROUP_CLOSED_CHECKED' => ( $group_info['group_type'] == GROUP_CLOSED ) ? ' checked="checked"' : '', + 'S_GROUP_HIDDEN_CHECKED' => ( $group_info['group_type'] == GROUP_HIDDEN ) ? ' checked="checked"' : '', + 'S_HIDDEN_FIELDS' => $s_hidden_fields, + 'S_MODE_SELECT' => $select_sort_mode, + 'S_ORDER_SELECT' => $select_sort_order, + 'S_GROUPCP_ACTION' => append_sid("groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id")) + ); + + // + // Dump out the remaining users + // + for($i = $start; $i < min($board_config['topics_per_page'] + $start, $members_count); $i++) + { + $username = $group_members[$i]['username']; + $user_id = $group_members[$i]['user_id']; + + generate_user_info($group_members[$i], $board_config['default_dateformat'], $is_moderator, $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim); + + if ( $group_info['group_type'] != GROUP_HIDDEN || $is_group_member || $is_moderator ) + { + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $template->assign_block_vars('member_row', array( + 'ROW_COLOR' => '#' . $row_color, + 'ROW_CLASS' => $row_class, + 'USERNAME' => $username, + 'FROM' => $from, + 'JOINED' => $joined, + 'POSTS' => $posts, + 'USER_ID' => $user_id, + 'AVATAR_IMG' => $poster_avatar, + 'PROFILE_IMG' => $profile_img, + 'PROFILE' => $profile, + 'SEARCH_IMG' => $search_img, + 'SEARCH' => $search, + 'PM_IMG' => $pm_img, + 'PM' => $pm, + 'EMAIL_IMG' => $email_img, + 'EMAIL' => $email, + 'WWW_IMG' => $www_img, + 'WWW' => $www, + 'ICQ_STATUS_IMG' => $icq_status_img, + 'ICQ_IMG' => $icq_img, + 'ICQ' => $icq, + 'AIM_IMG' => $aim_img, + 'AIM' => $aim, + 'MSN_IMG' => $msn_img, + 'MSN' => $msn, + 'YIM_IMG' => $yim_img, + 'YIM' => $yim, + + 'U_VIEWPROFILE' => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id")) + ); + + if ( $is_moderator ) + { + $template->assign_block_vars('member_row.switch_mod_option', array()); + } + } + } + + if ( !$members_count ) + { + // + // No group members + // + $template->assign_block_vars('switch_no_members', array()); + $template->assign_vars(array( + 'L_NO_MEMBERS' => $lang['No_group_members']) + ); + } + + $current_page = ( !$members_count ) ? 1 : ceil( $members_count / $board_config['topics_per_page'] ); + + $template->assign_vars(array( + 'PAGINATION' => generate_pagination("groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id", $members_count, $board_config['topics_per_page'], $start), + 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), $current_page ), + + 'L_GOTO_PAGE' => $lang['Goto_page']) + ); + + if ( $group_info['group_type'] == GROUP_HIDDEN && !$is_group_member && !$is_moderator ) + { + // + // No group members + // + $template->assign_block_vars('switch_hidden_group', array()); + $template->assign_vars(array( + 'L_HIDDEN_MEMBERS' => $lang['Group_hidden_members']) + ); + } + + // + // We've displayed the members who belong to the group, now we + // do that pending memebers... + // + if ( $is_moderator ) + { + // + // Users pending in ONLY THIS GROUP (which is moderated by this user) + // + if ( $modgroup_pending_count ) + { + for($i = 0; $i < $modgroup_pending_count; $i++) + { + $username = $modgroup_pending_list[$i]['username']; + $user_id = $modgroup_pending_list[$i]['user_id']; + + generate_user_info($modgroup_pending_list[$i], $board_config['default_dateformat'], $is_moderator, $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim); + + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $user_select = ''; + + $template->assign_block_vars('pending_members_row', array( + 'ROW_CLASS' => $row_class, + 'ROW_COLOR' => '#' . $row_color, + 'USERNAME' => $username, + 'FROM' => $from, + 'JOINED' => $joined, + 'POSTS' => $posts, + 'USER_ID' => $user_id, + 'AVATAR_IMG' => $poster_avatar, + 'PROFILE_IMG' => $profile_img, + 'PROFILE' => $profile, + 'SEARCH_IMG' => $search_img, + 'SEARCH' => $search, + 'PM_IMG' => $pm_img, + 'PM' => $pm, + 'EMAIL_IMG' => $email_img, + 'EMAIL' => $email, + 'WWW_IMG' => $www_img, + 'WWW' => $www, + 'ICQ_STATUS_IMG' => $icq_status_img, + 'ICQ_IMG' => $icq_img, + 'ICQ' => $icq, + 'AIM_IMG' => $aim_img, + 'AIM' => $aim, + 'MSN_IMG' => $msn_img, + 'MSN' => $msn, + 'YIM_IMG' => $yim_img, + 'YIM' => $yim, + + 'U_VIEWPROFILE' => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id")) + ); + } + + $template->assign_block_vars('switch_pending_members', array() ); + + $template->assign_vars(array( + 'L_SELECT' => $lang['Select'], + 'L_APPROVE_SELECTED' => $lang['Approve_selected'], + 'L_DENY_SELECTED' => $lang['Deny_selected']) + ); + + $template->assign_var_from_handle('PENDING_USER_BOX', 'pendinginfo'); + + } + } + + if ( $is_moderator ) + { + $template->assign_block_vars('switch_mod_option', array()); + $template->assign_block_vars('switch_add_member', array()); + } + + $template->pparse('info'); +} +else +{ + // + // Show the main groupcp.php screen where the user can select a group. + // + // Select all group that the user is a member of or where the user has + // a pending membership. + // + $in_group = array(); + + if ( $userdata['session_logged_in'] ) + { + $sql = "SELECT g.group_id, g.group_name, g.group_type, ug.user_pending + FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug + WHERE ug.user_id = " . $userdata['user_id'] . " + AND ug.group_id = g.group_id + AND g.group_single_user <> " . TRUE . " + ORDER BY g.group_name, ug.user_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Error getting group information', '', __LINE__, __FILE__, $sql); + } + + if ( $row = $db->sql_fetchrow($result) ) + { + $in_group = array(); + $s_member_groups_opt = ''; + $s_pending_groups_opt = ''; + + do + { + $in_group[] = $row['group_id']; + if ( $row['user_pending'] ) + { + $s_pending_groups_opt .= ''; + } + else + { + $s_member_groups_opt .= ''; + } + } + while( $row = $db->sql_fetchrow($result) ); + + $s_pending_groups = '"; + $s_member_groups = '"; + } + } + + // + // Select all other groups i.e. groups that this user is not a member of + // + $ignore_group_sql = ( count($in_group) ) ? "AND group_id NOT IN (" . implode(', ', $in_group) . ")" : ''; + $sql = "SELECT group_id, group_name, group_type + FROM " . GROUPS_TABLE . " g + WHERE group_single_user <> " . TRUE . " + $ignore_group_sql + ORDER BY g.group_name"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Error getting group information', '', __LINE__, __FILE__, $sql); + } + + $s_group_list_opt = ''; + while( $row = $db->sql_fetchrow($result) ) + { + if ( $row['group_type'] != GROUP_HIDDEN || $userdata['user_level'] == ADMIN ) + { + $s_group_list_opt .=''; + } + } + $s_group_list = ''; + + if ( $s_group_list_opt != '' || $s_pending_groups_opt != '' || $s_member_groups_opt != '' ) + { + // + // Load and process templates + // + $page_title = $lang['Group_Control_Panel']; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + $template->set_filenames(array( + 'user' => 'groupcp_user_body.tpl') + ); + make_jumpbox('viewforum.'.$phpEx); + + if ( $s_pending_groups_opt != '' || $s_member_groups_opt != '' ) + { + $template->assign_block_vars('switch_groups_joined', array() ); + } + + if ( $s_member_groups_opt != '' ) + { + $template->assign_block_vars('switch_groups_joined.switch_groups_member', array() ); + } + + if ( $s_pending_groups_opt != '' ) + { + $template->assign_block_vars('switch_groups_joined.switch_groups_pending', array() ); + } + + if ( $s_group_list_opt != '' ) + { + $template->assign_block_vars('switch_groups_remaining', array() ); + } + + $s_hidden_fields = ''; + + $template->assign_vars(array( + 'L_GROUP_MEMBERSHIP_DETAILS' => $lang['Group_member_details'], + 'L_JOIN_A_GROUP' => $lang['Group_member_join'], + 'L_YOU_BELONG_GROUPS' => $lang['Current_memberships'], + 'L_SELECT_A_GROUP' => $lang['Non_member_groups'], + 'L_PENDING_GROUPS' => $lang['Memberships_pending'], + 'L_SUBSCRIBE' => $lang['Subscribe'], + 'L_UNSUBSCRIBE' => $lang['Unsubscribe'], + 'L_VIEW_INFORMATION' => $lang['View_Information'], + + 'S_USERGROUP_ACTION' => append_sid("groupcp.$phpEx"), + 'S_HIDDEN_FIELDS' => $s_hidden_fields, + + 'GROUP_LIST_SELECT' => $s_group_list, + 'GROUP_PENDING_SELECT' => $s_pending_groups, + 'GROUP_MEMBER_SELECT' => $s_member_groups) + ); + + $template->pparse('user'); + } + else + { + message_die(GENERAL_MESSAGE, $lang['No_groups_exist']); + } + +} + +include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + +?> \ No newline at end of file diff --git a/phpBB/images/avatars/upload/.htaccess b/phpBB/images/avatars/upload/.htaccess deleted file mode 100755 index aa5afc1640..0000000000 --- a/phpBB/images/avatars/upload/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ - - Order Allow,Deny - Deny from All - \ No newline at end of file diff --git a/phpBB/images/icons/misc/fire.gif b/phpBB/images/icons/misc/fire.gif deleted file mode 100644 index e436d6e8c9..0000000000 Binary files a/phpBB/images/icons/misc/fire.gif and /dev/null differ diff --git a/phpBB/images/icons/misc/heart.gif b/phpBB/images/icons/misc/heart.gif deleted file mode 100644 index c626dcb99f..0000000000 Binary files a/phpBB/images/icons/misc/heart.gif and /dev/null differ diff --git a/phpBB/images/icons/misc/radioactive.gif b/phpBB/images/icons/misc/radioactive.gif deleted file mode 100644 index 517ae6397b..0000000000 Binary files a/phpBB/images/icons/misc/radioactive.gif and /dev/null differ diff --git a/phpBB/images/icons/misc/star.gif b/phpBB/images/icons/misc/star.gif deleted file mode 100644 index dcde6eb66e..0000000000 Binary files a/phpBB/images/icons/misc/star.gif and /dev/null differ diff --git a/phpBB/images/icons/misc/thinking.gif b/phpBB/images/icons/misc/thinking.gif deleted file mode 100644 index fdec41bc19..0000000000 Binary files a/phpBB/images/icons/misc/thinking.gif and /dev/null differ diff --git a/phpBB/images/icons/smile/alert.gif b/phpBB/images/icons/smile/alert.gif deleted file mode 100644 index 024e2a969a..0000000000 Binary files a/phpBB/images/icons/smile/alert.gif and /dev/null differ diff --git a/phpBB/images/icons/smile/index.htm b/phpBB/images/icons/smile/index.htm deleted file mode 100644 index ee1f723a7d..0000000000 --- a/phpBB/images/icons/smile/index.htm +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/phpBB/images/icons/smile/info.gif b/phpBB/images/icons/smile/info.gif deleted file mode 100644 index d715ac7c75..0000000000 Binary files a/phpBB/images/icons/smile/info.gif and /dev/null differ diff --git a/phpBB/images/icons/smile/mrgreen.gif b/phpBB/images/icons/smile/mrgreen.gif deleted file mode 100644 index 9cd2715824..0000000000 Binary files a/phpBB/images/icons/smile/mrgreen.gif and /dev/null differ diff --git a/phpBB/images/icons/smile/question.gif b/phpBB/images/icons/smile/question.gif deleted file mode 100644 index a07c038a9b..0000000000 Binary files a/phpBB/images/icons/smile/question.gif and /dev/null differ diff --git a/phpBB/images/icons/smile/redface.gif b/phpBB/images/icons/smile/redface.gif deleted file mode 100644 index 50e7ce3bfa..0000000000 Binary files a/phpBB/images/icons/smile/redface.gif and /dev/null differ diff --git a/phpBB/images/ranks/index.htm b/phpBB/images/ranks/index.htm deleted file mode 100644 index ee1f723a7d..0000000000 --- a/phpBB/images/ranks/index.htm +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/phpBB/images/smiles/icon_arrow.gif b/phpBB/images/smiles/icon_arrow.gif new file mode 100644 index 0000000000..2880055cc0 Binary files /dev/null and b/phpBB/images/smiles/icon_arrow.gif differ diff --git a/phpBB/images/smiles/icon_biggrin.gif b/phpBB/images/smiles/icon_biggrin.gif new file mode 100644 index 0000000000..d3527723c6 Binary files /dev/null and b/phpBB/images/smiles/icon_biggrin.gif differ diff --git a/phpBB/images/smiles/icon_confused.gif b/phpBB/images/smiles/icon_confused.gif new file mode 100644 index 0000000000..0c49e06983 Binary files /dev/null and b/phpBB/images/smiles/icon_confused.gif differ diff --git a/phpBB/images/smiles/icon_cool.gif b/phpBB/images/smiles/icon_cool.gif new file mode 100644 index 0000000000..cead0306c0 Binary files /dev/null and b/phpBB/images/smiles/icon_cool.gif differ diff --git a/phpBB/images/smiles/icon_cry.gif b/phpBB/images/smiles/icon_cry.gif new file mode 100644 index 0000000000..7d54b1f994 Binary files /dev/null and b/phpBB/images/smiles/icon_cry.gif differ diff --git a/phpBB/images/smiles/icon_eek.gif b/phpBB/images/smiles/icon_eek.gif new file mode 100644 index 0000000000..5d3978106a Binary files /dev/null and b/phpBB/images/smiles/icon_eek.gif differ diff --git a/phpBB/images/smiles/icon_evil.gif b/phpBB/images/smiles/icon_evil.gif new file mode 100644 index 0000000000..ab1aa8e123 Binary files /dev/null and b/phpBB/images/smiles/icon_evil.gif differ diff --git a/phpBB/images/smiles/icon_exclaim.gif b/phpBB/images/smiles/icon_exclaim.gif new file mode 100644 index 0000000000..6e50e2eecd Binary files /dev/null and b/phpBB/images/smiles/icon_exclaim.gif differ diff --git a/phpBB/images/smiles/icon_frown.gif b/phpBB/images/smiles/icon_frown.gif new file mode 100644 index 0000000000..d2ac78c04b Binary files /dev/null and b/phpBB/images/smiles/icon_frown.gif differ diff --git a/phpBB/images/smiles/icon_idea.gif b/phpBB/images/smiles/icon_idea.gif new file mode 100644 index 0000000000..a40ae0d7e8 Binary files /dev/null and b/phpBB/images/smiles/icon_idea.gif differ diff --git a/phpBB/images/smiles/icon_lol.gif b/phpBB/images/smiles/icon_lol.gif new file mode 100644 index 0000000000..374ba150fb Binary files /dev/null and b/phpBB/images/smiles/icon_lol.gif differ diff --git a/phpBB/images/smiles/icon_mad.gif b/phpBB/images/smiles/icon_mad.gif new file mode 100644 index 0000000000..1f6c3c2fb4 Binary files /dev/null and b/phpBB/images/smiles/icon_mad.gif differ diff --git a/phpBB/images/smiles/icon_mrgreen.gif b/phpBB/images/smiles/icon_mrgreen.gif new file mode 100644 index 0000000000..b54cd0f946 Binary files /dev/null and b/phpBB/images/smiles/icon_mrgreen.gif differ diff --git a/phpBB/images/smiles/icon_neutral.gif b/phpBB/images/smiles/icon_neutral.gif new file mode 100644 index 0000000000..4f311567ed Binary files /dev/null and b/phpBB/images/smiles/icon_neutral.gif differ diff --git a/phpBB/images/smiles/icon_question.gif b/phpBB/images/smiles/icon_question.gif new file mode 100644 index 0000000000..9d072265bb Binary files /dev/null and b/phpBB/images/smiles/icon_question.gif differ diff --git a/phpBB/images/smiles/icon_razz.gif b/phpBB/images/smiles/icon_razz.gif new file mode 100644 index 0000000000..29da2a2fcc Binary files /dev/null and b/phpBB/images/smiles/icon_razz.gif differ diff --git a/phpBB/images/smiles/icon_redface.gif b/phpBB/images/smiles/icon_redface.gif new file mode 100644 index 0000000000..ad7628320c Binary files /dev/null and b/phpBB/images/smiles/icon_redface.gif differ diff --git a/phpBB/images/smiles/icon_rolleyes.gif b/phpBB/images/smiles/icon_rolleyes.gif new file mode 100644 index 0000000000..d7f5f2f4b1 Binary files /dev/null and b/phpBB/images/smiles/icon_rolleyes.gif differ diff --git a/phpBB/images/smiles/icon_sad.gif b/phpBB/images/smiles/icon_sad.gif new file mode 100644 index 0000000000..d2ac78c04b Binary files /dev/null and b/phpBB/images/smiles/icon_sad.gif differ diff --git a/phpBB/images/smiles/icon_smile.gif b/phpBB/images/smiles/icon_smile.gif new file mode 100644 index 0000000000..7b1f6d3044 Binary files /dev/null and b/phpBB/images/smiles/icon_smile.gif differ diff --git a/phpBB/images/smiles/icon_surprised.gif b/phpBB/images/smiles/icon_surprised.gif new file mode 100644 index 0000000000..cb21424319 Binary files /dev/null and b/phpBB/images/smiles/icon_surprised.gif differ diff --git a/phpBB/images/smiles/icon_twisted.gif b/phpBB/images/smiles/icon_twisted.gif new file mode 100644 index 0000000000..502fe247e8 Binary files /dev/null and b/phpBB/images/smiles/icon_twisted.gif differ diff --git a/phpBB/images/smiles/icon_wink.gif b/phpBB/images/smiles/icon_wink.gif new file mode 100644 index 0000000000..d148288042 Binary files /dev/null and b/phpBB/images/smiles/icon_wink.gif differ diff --git a/phpBB/images/smilies/icon_arrow.gif b/phpBB/images/smilies/icon_arrow.gif deleted file mode 100644 index c0f9117b96..0000000000 Binary files a/phpBB/images/smilies/icon_arrow.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_cool.gif b/phpBB/images/smilies/icon_cool.gif deleted file mode 100644 index 6dd150375d..0000000000 Binary files a/phpBB/images/smilies/icon_cool.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_cry.gif b/phpBB/images/smilies/icon_cry.gif deleted file mode 100644 index 21a5a3c113..0000000000 Binary files a/phpBB/images/smilies/icon_cry.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_e_biggrin.gif b/phpBB/images/smilies/icon_e_biggrin.gif deleted file mode 100644 index 08be8479b2..0000000000 Binary files a/phpBB/images/smilies/icon_e_biggrin.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_e_confused.gif b/phpBB/images/smilies/icon_e_confused.gif deleted file mode 100644 index be5b583c0c..0000000000 Binary files a/phpBB/images/smilies/icon_e_confused.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_e_geek.gif b/phpBB/images/smilies/icon_e_geek.gif deleted file mode 100644 index 535bc9f723..0000000000 Binary files a/phpBB/images/smilies/icon_e_geek.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_e_sad.gif b/phpBB/images/smilies/icon_e_sad.gif deleted file mode 100644 index 7cd3016a96..0000000000 Binary files a/phpBB/images/smilies/icon_e_sad.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_e_smile.gif b/phpBB/images/smilies/icon_e_smile.gif deleted file mode 100644 index d1ec74c8e0..0000000000 Binary files a/phpBB/images/smilies/icon_e_smile.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_e_surprised.gif b/phpBB/images/smilies/icon_e_surprised.gif deleted file mode 100644 index 1be6041e3a..0000000000 Binary files a/phpBB/images/smilies/icon_e_surprised.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_e_ugeek.gif b/phpBB/images/smilies/icon_e_ugeek.gif deleted file mode 100644 index 0d3c17994d..0000000000 Binary files a/phpBB/images/smilies/icon_e_ugeek.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_e_wink.gif b/phpBB/images/smilies/icon_e_wink.gif deleted file mode 100644 index fb1c1402d2..0000000000 Binary files a/phpBB/images/smilies/icon_e_wink.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_eek.gif b/phpBB/images/smilies/icon_eek.gif deleted file mode 100644 index cbe9b7b6ab..0000000000 Binary files a/phpBB/images/smilies/icon_eek.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_evil.gif b/phpBB/images/smilies/icon_evil.gif deleted file mode 100644 index 98e6535fde..0000000000 Binary files a/phpBB/images/smilies/icon_evil.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_exclaim.gif b/phpBB/images/smilies/icon_exclaim.gif deleted file mode 100644 index 2b4a3df330..0000000000 Binary files a/phpBB/images/smilies/icon_exclaim.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_idea.gif b/phpBB/images/smilies/icon_idea.gif deleted file mode 100644 index e51d542bfe..0000000000 Binary files a/phpBB/images/smilies/icon_idea.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_lol.gif b/phpBB/images/smilies/icon_lol.gif deleted file mode 100644 index 3042b00d6b..0000000000 Binary files a/phpBB/images/smilies/icon_lol.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_mad.gif b/phpBB/images/smilies/icon_mad.gif deleted file mode 100644 index 994216615b..0000000000 Binary files a/phpBB/images/smilies/icon_mad.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_mrgreen.gif b/phpBB/images/smilies/icon_mrgreen.gif deleted file mode 100644 index dcb44bb01a..0000000000 Binary files a/phpBB/images/smilies/icon_mrgreen.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_neutral.gif b/phpBB/images/smilies/icon_neutral.gif deleted file mode 100644 index 41c3e14c48..0000000000 Binary files a/phpBB/images/smilies/icon_neutral.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_question.gif b/phpBB/images/smilies/icon_question.gif deleted file mode 100644 index 13936f71a6..0000000000 Binary files a/phpBB/images/smilies/icon_question.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_razz.gif b/phpBB/images/smilies/icon_razz.gif deleted file mode 100644 index a262743958..0000000000 Binary files a/phpBB/images/smilies/icon_razz.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_redface.gif b/phpBB/images/smilies/icon_redface.gif deleted file mode 100644 index d23a1396a0..0000000000 Binary files a/phpBB/images/smilies/icon_redface.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_rolleyes.gif b/phpBB/images/smilies/icon_rolleyes.gif deleted file mode 100644 index 0707821667..0000000000 Binary files a/phpBB/images/smilies/icon_rolleyes.gif and /dev/null differ diff --git a/phpBB/images/smilies/icon_twisted.gif b/phpBB/images/smilies/icon_twisted.gif deleted file mode 100644 index a555dd0ab3..0000000000 Binary files a/phpBB/images/smilies/icon_twisted.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/avi.gif b/phpBB/images/upload_icons/avi.gif deleted file mode 100644 index 55f2116261..0000000000 Binary files a/phpBB/images/upload_icons/avi.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/bmp.gif b/phpBB/images/upload_icons/bmp.gif deleted file mode 100644 index abd05713ef..0000000000 Binary files a/phpBB/images/upload_icons/bmp.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/doc.gif b/phpBB/images/upload_icons/doc.gif deleted file mode 100644 index 078d9f7a14..0000000000 Binary files a/phpBB/images/upload_icons/doc.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/exe.gif b/phpBB/images/upload_icons/exe.gif deleted file mode 100644 index b77dd4dcec..0000000000 Binary files a/phpBB/images/upload_icons/exe.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/flash.gif b/phpBB/images/upload_icons/flash.gif deleted file mode 100644 index 00ee0f4f72..0000000000 Binary files a/phpBB/images/upload_icons/flash.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/gif.gif b/phpBB/images/upload_icons/gif.gif deleted file mode 100644 index 5aa8d463e7..0000000000 Binary files a/phpBB/images/upload_icons/gif.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/html.gif b/phpBB/images/upload_icons/html.gif deleted file mode 100644 index eb948eae6a..0000000000 Binary files a/phpBB/images/upload_icons/html.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/jpg.gif b/phpBB/images/upload_icons/jpg.gif deleted file mode 100644 index 537de1c3a0..0000000000 Binary files a/phpBB/images/upload_icons/jpg.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/mid.gif b/phpBB/images/upload_icons/mid.gif deleted file mode 100644 index ea7302cb16..0000000000 Binary files a/phpBB/images/upload_icons/mid.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/mov.gif b/phpBB/images/upload_icons/mov.gif deleted file mode 100644 index 55f2116261..0000000000 Binary files a/phpBB/images/upload_icons/mov.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/mp3.gif b/phpBB/images/upload_icons/mp3.gif deleted file mode 100644 index acf1a5015f..0000000000 Binary files a/phpBB/images/upload_icons/mp3.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/mpg.gif b/phpBB/images/upload_icons/mpg.gif deleted file mode 100644 index 55f2116261..0000000000 Binary files a/phpBB/images/upload_icons/mpg.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/netscape.gif b/phpBB/images/upload_icons/netscape.gif deleted file mode 100644 index 0854440952..0000000000 Binary files a/phpBB/images/upload_icons/netscape.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/pdf.gif b/phpBB/images/upload_icons/pdf.gif deleted file mode 100644 index 8d0603ae65..0000000000 Binary files a/phpBB/images/upload_icons/pdf.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/ppt.gif b/phpBB/images/upload_icons/ppt.gif deleted file mode 100644 index a3800d12c6..0000000000 Binary files a/phpBB/images/upload_icons/ppt.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/rar.gif b/phpBB/images/upload_icons/rar.gif deleted file mode 100644 index 9c0bd5667e..0000000000 Binary files a/phpBB/images/upload_icons/rar.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/txt.gif b/phpBB/images/upload_icons/txt.gif deleted file mode 100644 index cc3639b89c..0000000000 Binary files a/phpBB/images/upload_icons/txt.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/wav.gif b/phpBB/images/upload_icons/wav.gif deleted file mode 100644 index 21195252b7..0000000000 Binary files a/phpBB/images/upload_icons/wav.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/xls.gif b/phpBB/images/upload_icons/xls.gif deleted file mode 100644 index 187a19b53c..0000000000 Binary files a/phpBB/images/upload_icons/xls.gif and /dev/null differ diff --git a/phpBB/images/upload_icons/zip.gif b/phpBB/images/upload_icons/zip.gif deleted file mode 100644 index 0141376100..0000000000 Binary files a/phpBB/images/upload_icons/zip.gif and /dev/null differ diff --git a/phpBB/includes/acm/acm_apc.php b/phpBB/includes/acm/acm_apc.php deleted file mode 100644 index 15f3705d9e..0000000000 --- a/phpBB/includes/acm/acm_apc.php +++ /dev/null @@ -1,331 +0,0 @@ -cache_dir = $phpbb_root_path . 'cache/'; - } - - /** - * Load global cache - */ - private function load() - { - global $phpEx; - - // grab the global cache - if ($this->vars = apc_fetch('global')) - { - return true; - } - - return false; - } - - /** - * Unload cache object - */ - public function unload() - { - $this->save(); - unset($this->vars); - unset($this->sql_rowset); - - $this->vars = array(); - $this->sql_rowset = array(); - } - - /** - * Save modified objects - */ - private function save() - { - if (!$this->is_modified) - { - return; - } - - apc_store('global', $this->vars, 31536000); - - $this->is_modified = false; - } - - /** - * Tidy cache - */ - public function tidy() - { - global $phpEx; - - // cache has auto GC, no need to have any code here :) - - set_config('cache_last_gc', time(), true); - } - - /** - * Get saved cache object - */ - public function get($var_name) - { - if ($var_name[0] === '_') - { - global $phpEx; - - return apc_fetch($var_name); - } - else - { - if (!sizeof($this->vars)) - { - $this->load(); - } - return (isset($this->vars[$var_name])) ? $this->vars[$var_name] : false; - } - } - - /** - * Put data into cache - */ - public function put($var_name, $var, $ttl = 31536000) - { - if ($var_name[0] === '_') - { - apc_store($var_name, $var, $ttl); - } - else - { - $this->vars[$var_name] = $var; - $this->is_modified = true; - } - } - - /** - * Purge cache data - */ - public function purge() - { - // Purge all phpbb cache files - $dir = @opendir($this->cache_dir); - - if (!$dir) - { - return; - } - - while (($entry = readdir($dir)) !== false) - { - if (strpos($entry, 'sql_') !== 0 && strpos($entry, 'data_') !== 0 && strpos($entry, 'ctpl_') !== 0 && strpos($entry, 'tpl_') !== 0) - { - continue; - } - - @unlink($this->cache_dir . $entry); - } - closedir($dir); - - apc_clear_cache('user'); - - unset($this->vars); - unset($this->sql_rowset); - - $this->vars = array(); - $this->var_expires = array(); - $this->sql_rowset = array(); - - $this->is_modified = false; - } - - /** - * Destroy cache data - */ - public function destroy($var_name, $table = '') - { - global $phpEx; - - if ($var_name === 'sql' && !empty($table)) - { - if (!is_array($table)) - { - $table = array($table); - } - - foreach ($table as $table_name) - { - // gives us the md5s that we want - $temp = apc_fetch('sql_' . $table_name); - if ($temp === false) - { - continue; - } - - // delete each query ref - foreach ($temp as $md5_id => $void) - { - apc_delete('sql_' . $md5_id); - } - - // delete the table ref - apc_delete('sql_' . $table_name); - } - - return; - } - - if ($var_name[0] === '_') - { - apc_delete($var_name); - } - else if (isset($this->vars[$var_name])) - { - $this->is_modified = true; - unset($this->vars[$var_name]); - - // We save here to let the following cache hits succeed - $this->save(); - } - } - - /** - * Load cached sql query - */ - public function sql_load($query) - { - global $phpEx; - - // Remove extra spaces and tabs - $query = preg_replace('/[\n\r\s\t]+/', ' ', $query); - $query_id = sizeof($this->sql_rowset); - - $temp = apc_fetch('sql_' . md5($query)); - - if ($temp === false) - { - return false; - } - - $this->sql_rowset[$query_id] = $temp; - - return $query_id; - } - - /** - * Save sql query - */ - public function sql_save($query, &$query_result, $ttl) - { - global $db, $phpEx; - - // Remove extra spaces and tabs - $query = preg_replace('/[\n\r\s\t]+/', ' ', $query); - - // determine which tables this query belongs to: - - // grab all the FROM tables, avoid getting a LEFT JOIN - preg_match('/FROM \(?(\w+(?: (?!LEFT JOIN)\w+)?(?:, ?\w+(?: (?!LEFT JOIN)\w+)?)*)\)?/', $query, $regs); - $tables = array_map('trim', explode(',', $regs[1])); - - // now get the LEFT JOIN - preg_match_all('/LEFT JOIN\s+(\w+)(?: \w+)?/', $query, $result, PREG_PATTERN_ORDER); - $tables = array_merge($tables, $result[1]); - - $query_hash = md5($query); - - foreach ($tables as $table_name) - { - if (($pos = strpos($table_name, ' ')) !== false) - { - $table_name = substr($table_name, 0, $pos); - } - - $temp = apc_fetch('sql_' . $table_name); - if ($temp === false) - { - $temp = array(); - } - $temp[$query_hash] = true; - apc_store('sql_' . $table_name, $temp, $ttl); - } - - // store them in the right place - $query_id = sizeof($this->sql_rowset); - $this->sql_rowset[$query_id] = array(); - - while ($row = $db->sql_fetchrow($query_result)) - { - $this->sql_rowset[$query_id][] = $row; - } - $db->sql_freeresult($query_result); - - apc_store('sql_' . $query_hash, $this->sql_rowset[$query_id], $ttl); - - $query_result = $query_id; - } - - /** - * Fetch row from cache (database) - */ - public function sql_fetchrow($query_id) - { - list(, $row) = each($this->sql_rowset[$query_id]); - - return ($row !== NULL) ? $row : false; - } - - /** - * Fetch a field from the current row of a cached database result (database) - */ - public function sql_fetchfield($query_id, $field) - { - $row = current($this->sql_rowset[$query_id]); - - return ($row !== false && isset($row[$field])) ? $row[$field] : false; - } - - /** - * Free memory used for a cached database result (database) - */ - public function sql_freeresult($query_id) - { - if (!isset($this->sql_rowset[$query_id])) - { - return false; - } - - unset($this->sql_rowset[$query_id]); - - return true; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acm/acm_eaccelerator.php b/phpBB/includes/acm/acm_eaccelerator.php deleted file mode 100644 index 8592658e51..0000000000 --- a/phpBB/includes/acm/acm_eaccelerator.php +++ /dev/null @@ -1,347 +0,0 @@ -cache_dir = $phpbb_root_path . 'cache/'; - } - - /** - * Load global cache - */ - private function load() - { - global $phpEx; - - // grab the global cache - if ($this->vars = eaccelerator_get('global')) - { - return true; - } - - return false; - } - - /** - * Unload cache object - */ - public function unload() - { - $this->save(); - unset($this->vars); - unset($this->sql_rowset); - - $this->vars = array(); - $this->sql_rowset = array(); - } - - /** - * Save modified objects - */ - private function save() - { - if (!$this->is_modified) - { - return; - } - - eaccelerator_put('global', $this->vars, 31536000); - - $this->is_modified = false; - } - - /** - * Tidy cache - */ - public function tidy() - { - global $phpEx; - - eaccelerator_gc(); - - set_config('cache_last_gc', time(), true); - } - - /** - * Get saved cache object - */ - public function get($var_name) - { - if ($var_name[0] === '_') - { - global $phpEx; - - $temp = eaccelerator_get($var_name); - - if ($temp !== null) - { - return $temp; - } - else - { - return false; - } - } - else - { - if (!sizeof($this->vars)) - { - $this->load(); - } - return (isset($this->vars[$var_name])) ? $this->vars[$var_name] : false; - } - } - - /** - * Put data into cache - */ - public function put($var_name, $var, $ttl = 31536000) - { - if ($var_name[0] === '_') - { - eaccelerator_put($var_name, $var, $ttl); - } - else - { - $this->vars[$var_name] = $var; - $this->is_modified = true; - } - } - - /** - * Purge cache data - */ - public function purge() - { - // Purge all phpbb cache files - $dir = @opendir($this->cache_dir); - - if (!$dir) - { - return; - } - - while (($entry = readdir($dir)) !== false) - { - if (strpos($entry, 'sql_') !== 0 && strpos($entry, 'data_') !== 0 && strpos($entry, 'ctpl_') !== 0 && strpos($entry, 'tpl_') !== 0) - { - continue; - } - - @unlink($this->cache_dir . $entry); - } - closedir($dir); - - foreach (eaccelerator_list_keys() as $var) - { - eaccelerator_rm(substr($var['name'], 1)); - } - - unset($this->vars); - unset($this->sql_rowset); - - $this->vars = array(); - $this->var_expires = array(); - $this->sql_rowset = array(); - - $this->is_modified = false; - } - - /** - * Destroy cache data - */ - public function destroy($var_name, $table = '') - { - global $phpEx; - - if ($var_name === 'sql' && !empty($table)) - { - if (!is_array($table)) - { - $table = array($table); - } - - foreach ($table as $table_name) - { - // gives us the md5s that we want - eaccelerator_lock('sql_' . $table_name); - $temp = eaccelerator_get('sql_' . $table_name); - if ($temp === null) - { - continue; - } - - // delete each query ref - foreach ($temp as $md5_id => $void) - { - eaccelerator_lock('sql_' . $md5_id); - eaccelerator_rm('sql_' . $md5_id); - eaccelerator_unlock('sql_' . $md5_id); - } - - // delete the table ref - eaccelerator_rm('sql_' . $table_name); - eaccelerator_unlock('sql_' . $table_name); - } - - return; - } - - if ($var_name[0] === '_') - { - eaccelerator_rm($var_name); - } - else if (isset($this->vars[$var_name])) - { - $this->is_modified = true; - unset($this->vars[$var_name]); - - // We save here to let the following cache hits succeed - $this->save(); - } - } - - /** - * Load cached sql query - */ - public function sql_load($query) - { - global $phpEx; - - // Remove extra spaces and tabs - $query = preg_replace('/[\n\r\s\t]+/', ' ', $query); - $query_id = sizeof($this->sql_rowset); - - $temp = eaccelerator_get('sql_' . md5($query)); - - if ($temp === null) - { - return false; - } - - $this->sql_rowset[$query_id] = $temp; - - return $query_id; - } - - /** - * Save sql query - */ - public function sql_save($query, &$query_result, $ttl) - { - global $db, $phpEx; - - // Remove extra spaces and tabs - $query = preg_replace('/[\n\r\s\t]+/', ' ', $query); - - // determine which tables this query belongs to: - - // grab all the FROM tables, avoid getting a LEFT JOIN - preg_match('/FROM \(?(\w+(?: (?!LEFT JOIN)\w+)?(?:, ?\w+(?: (?!LEFT JOIN)\w+)?)*)\)?/', $query, $regs); - $tables = array_map('trim', explode(',', $regs[1])); - - // now get the LEFT JOIN - preg_match_all('/LEFT JOIN\s+(\w+)(?: \w+)?/', $query, $result, PREG_PATTERN_ORDER); - $tables = array_merge($tables, $result[1]); - - $query_hash = md5($query); - - foreach ($tables as $table_name) - { - if (($pos = strpos($table_name, ' ')) !== false) - { - $table_name = substr($table_name, 0, $pos); - } - - $temp = eaccelerator_get('sql_' . $table_name); - if ($temp === null) - { - $temp = array(); - } - $temp[$query_hash] = true; - eaccelerator_put('sql_' . $table_name, $temp, $ttl); - } - - // store them in the right place - $query_id = sizeof($this->sql_rowset); - $this->sql_rowset[$query_id] = array(); - - while ($row = $db->sql_fetchrow($query_result)) - { - $this->sql_rowset[$query_id][] = $row; - } - $db->sql_freeresult($query_result); - - eaccelerator_put('sql_' . $query_hash, $this->sql_rowset[$query_id], $ttl); - - $query_result = $query_id; - } - - /** - * Fetch row from cache (database) - */ - public function sql_fetchrow($query_id) - { - list(, $row) = each($this->sql_rowset[$query_id]); - - return ($row !== NULL) ? $row : false; - } - - /** - * Fetch a field from the current row of a cached database result (database) - */ - public function sql_fetchfield($query_id, $field) - { - $row = current($this->sql_rowset[$query_id]); - - return ($row !== false && isset($row[$field])) ? $row[$field] : false; - } - - /** - * Free memory used for a cached database result (database) - */ - public function sql_freeresult($query_id) - { - if (!isset($this->sql_rowset[$query_id])) - { - return false; - } - - unset($this->sql_rowset[$query_id]); - - return true; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php deleted file mode 100644 index f952b372c6..0000000000 --- a/phpBB/includes/acm/acm_file.php +++ /dev/null @@ -1,467 +0,0 @@ -cache_dir = $phpbb_root_path . 'cache/'; - } - - /** - * Load global cache - */ - private function load() - { - global $phpEx; - - // grab the global cache - if (file_exists($this->cache_dir . 'data_global.' . $phpEx)) - { - @include($this->cache_dir . 'data_global.' . $phpEx); - return true; - } - - return false; - } - - /** - * Unload cache object - */ - public function unload() - { - $this->save(); - unset($this->vars); - unset($this->var_expires); - unset($this->sql_rowset); - - $this->vars = array(); - $this->var_expires = array(); - $this->sql_rowset = array(); - } - - /** - * Save modified objects - */ - private function save() - { - if (!$this->is_modified) - { - return; - } - - global $phpEx; - - if ($fp = @fopen($this->cache_dir . 'data_global.' . $phpEx, 'wb')) - { - @flock($fp, LOCK_EX); - fwrite($fp, "vars = unserialize('" . serialize($this->vars) . "');\n\$this->var_expires = unserialize('" . serialize($this->var_expires) . "');"); - @flock($fp, LOCK_UN); - fclose($fp); - - @chmod($this->cache_dir . 'data_global.' . $phpEx, 0666); - } - else - { - // Now, this occurred how often? ... phew, just tell the user then... - if (!@is_writable($this->cache_dir)) - { - trigger_error($this->cache_dir . ' is NOT writable.', E_USER_ERROR); - } - - trigger_error('Not able to open ' . $this->cache_dir . 'data_global.' . $phpEx, E_USER_ERROR); - } - - $this->is_modified = false; - } - - /** - * Tidy cache - */ - public function tidy() - { - global $phpEx; - - $dir = @opendir($this->cache_dir); - - if (!$dir) - { - return; - } - - while (($entry = readdir($dir)) !== false) - { - if (!preg_match('/^(sql_|data_(?!global))/', $entry)) - { - continue; - } - - $expired = true; - @include($this->cache_dir . $entry); - if ($expired) - { - $this->remove_file($this->cache_dir . $entry); - } - } - closedir($dir); - - if (file_exists($this->cache_dir . 'data_global.' . $phpEx)) - { - if (!sizeof($this->vars)) - { - $this->load(); - } - - foreach ($this->var_expires as $var_name => $expires) - { - if (time() > $expires) - { - $this->destroy($var_name); - } - } - } - - set_config('cache_last_gc', time(), true); - } - - /** - * Get saved cache object - */ - public function get($var_name) - { - if ($var_name[0] === '_') - { - global $phpEx; - - if (!$this->_exists($var_name)) - { - return false; - } - - @include($this->cache_dir . "data{$var_name}.$phpEx"); - return (isset($data)) ? $data : false; - } - else - { - return ($this->_exists($var_name)) ? $this->vars[$var_name] : false; - } - } - - /** - * Put data into cache - */ - function put($var_name, $var, $ttl = 31536000) - { - if ($var_name[0] === '_') - { - global $phpEx; - - if ($fp = @fopen($this->cache_dir . "data{$var_name}.$phpEx", 'wb')) - { - @flock($fp, LOCK_EX); - fwrite($fp, " " . (time() + $ttl) . ") ? true : false;\nif (\$expired) { return; }\n\$data = " . (sizeof($var) ? "unserialize('" . serialize($var) . "');" : 'array();')); - @flock($fp, LOCK_UN); - fclose($fp); - - @chmod($this->cache_dir . "data{$var_name}.$phpEx", 0666); - } - } - else - { - $this->vars[$var_name] = $var; - $this->var_expires[$var_name] = time() + $ttl; - $this->is_modified = true; - } - } - - /** - * Purge cache data - */ - public function purge() - { - // Purge all phpbb cache files - $dir = @opendir($this->cache_dir); - - if (!$dir) - { - return; - } - - while (($entry = readdir($dir)) !== false) - { - if (strpos($entry, 'sql_') !== 0 && strpos($entry, 'data_') !== 0 && strpos($entry, 'ctpl_') !== 0 && strpos($entry, 'tpl_') !== 0) - { - continue; - } - - $this->remove_file($this->cache_dir . $entry); - } - closedir($dir); - - unset($this->vars); - unset($this->var_expires); - unset($this->sql_rowset); - - $this->vars = array(); - $this->var_expires = array(); - $this->sql_rowset = array(); - - $this->is_modified = false; - } - - /** - * Destroy cache data - */ - public function destroy($var_name, $table = '') - { - global $phpEx; - - if ($var_name === 'sql' && !empty($table)) - { - if (!is_array($table)) - { - $table = array($table); - } - - $dir = @opendir($this->cache_dir); - - if (!$dir) - { - return; - } - - while (($entry = readdir($dir)) !== false) - { - if (strpos($entry, 'sql_') !== 0) - { - continue; - } - - // The following method is more failproof than simply assuming the query is on line 3 (which it should be) - $check_line = @file_get_contents($this->cache_dir . $entry); - - if (empty($check_line)) - { - continue; - } - - // Now get the contents between /* and */ - $check_line = substr($check_line, strpos($check_line, '/* ') + 3, strpos($check_line, ' */') - strpos($check_line, '/* ') - 3); - - $found = false; - foreach ($table as $check_table) - { - // Better catch partial table names than no table names. ;) - if (strpos($check_line, $check_table) !== false) - { - $found = true; - break; - } - } - - if ($found) - { - $this->remove_file($this->cache_dir . $entry); - } - } - closedir($dir); - - return; - } - - if (!$this->_exists($var_name)) - { - return; - } - - if ($var_name[0] === '_') - { - $this->remove_file($this->cache_dir . 'data' . $var_name . ".$phpEx", true); - } - else if (isset($this->vars[$var_name])) - { - $this->is_modified = true; - unset($this->vars[$var_name]); - unset($this->var_expires[$var_name]); - - // We save here to let the following cache hits succeed - $this->save(); - } - } - - /** - * Check if a given cache entry exist - */ - private function _exists($var_name) - { - if ($var_name[0] === '_') - { - global $phpEx; - return file_exists($this->cache_dir . 'data' . $var_name . ".$phpEx"); - } - else - { - if (!sizeof($this->vars)) - { - $this->load(); - } - - if (!isset($this->var_expires[$var_name])) - { - return false; - } - - return (time() > $this->var_expires[$var_name]) ? false : isset($this->vars[$var_name]); - } - } - - /** - * Load cached sql query - */ - public function sql_load($query) - { - global $phpEx; - - // Remove extra spaces and tabs - $query = preg_replace('/[\n\r\s\t]+/', ' ', $query); - $query_id = sizeof($this->sql_rowset); - - if (!file_exists($this->cache_dir . 'sql_' . md5($query) . ".$phpEx")) - { - return false; - } - - @include($this->cache_dir . 'sql_' . md5($query) . ".$phpEx"); - - if (!isset($expired)) - { - return false; - } - else if ($expired) - { - $this->remove_file($this->cache_dir . 'sql_' . md5($query) . ".$phpEx", true); - return false; - } - - - return $query_id; - } - - /** - * Save sql query - */ - public function sql_save($query, &$query_result, $ttl) - { - global $db, $phpEx; - - // Remove extra spaces and tabs - $query = preg_replace('/[\n\r\s\t]+/', ' ', $query); - $filename = $this->cache_dir . 'sql_' . md5($query) . '.' . $phpEx; - - if ($fp = @fopen($filename, 'wb')) - { - @flock($fp, LOCK_EX); - - $query_id = sizeof($this->sql_rowset); - $this->sql_rowset[$query_id] = array(); - - while ($row = $db->sql_fetchrow($query_result)) - { - $this->sql_rowset[$query_id][] = $row; - } - $db->sql_freeresult($query_result); - - $file = " " . (time() + $ttl) . ") ? true : false;\nif (\$expired) { return; }\n"; - - fwrite($fp, $file . "\$this->sql_rowset[\$query_id] = " . (sizeof($this->sql_rowset[$query_id]) ? "unserialize('" . serialize($this->sql_rowset[$query_id]) . "');" : 'array();')); - @flock($fp, LOCK_UN); - fclose($fp); - - @chmod($filename, 0666); - - $query_result = $query_id; - } - } - - /** - * Fetch row from cache (database) - */ - public function sql_fetchrow($query_id) - { - list(, $row) = each($this->sql_rowset[$query_id]); - - return ($row !== NULL) ? $row : false; - } - - /** - * Fetch a field from the current row of a cached database result (database) - */ - public function sql_fetchfield($query_id, $field) - { - $row = current($this->sql_rowset[$query_id]); - - return ($row !== false && isset($row[$field])) ? $row[$field] : false; - } - - /** - * Free memory used for a cached database result (database) - */ - public function sql_freeresult($query_id) - { - if (!isset($this->sql_rowset[$query_id])) - { - return false; - } - - unset($this->sql_rowset[$query_id]); - - return true; - } - - /** - * Removes/unlinks file - */ - private function remove_file($filename, $check = false) - { - if ($check && !@is_writeable($this->cache_dir)) - { - // E_USER_ERROR - not using language entry - intended. - trigger_error('Unable to remove files within ' . $this->cache_dir . '. Please check directory permissions.', E_USER_ERROR); - } - - return @unlink($filename); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acm/acm_memcache.php b/phpBB/includes/acm/acm_memcache.php deleted file mode 100644 index fc17b04942..0000000000 --- a/phpBB/includes/acm/acm_memcache.php +++ /dev/null @@ -1,333 +0,0 @@ -memcache = memcache_connect('localhost', 11211); - } - - /** - * Load global cache - */ - private function load() - { - global $phpEx; - - // grab the global cache - if ($this->vars = memcache_get($this->memcache, 'global')) - { - return true; - } - - return false; - } - - /** - * Unload cache object - */ - public function unload() - { - $this->save(); - unset($this->vars); - unset($this->sql_rowset); - - $this->vars = array(); - $this->sql_rowset = array(); - } - - /** - * Save modified objects - */ - private function save() - { - if (!$this->is_modified) - { - return; - } - - memcache_set($this->memcache, 'global', $this->vars, 0, 2592000); - - $this->is_modified = false; - } - - /** - * Tidy cache - */ - public function tidy() - { - global $phpEx; - - // cache has auto GC, no need to have any code here :) - - set_config('cache_last_gc', time(), true); - } - - /** - * Get saved cache object - */ - public function get($var_name) - { - if ($var_name[0] === '_') - { - global $phpEx; - - return memcache_get($this->memcache, $var_name); - } - else - { - if (!sizeof($this->vars)) - { - $this->load(); - } - return (isset($this->vars[$var_name])) ? $this->vars[$var_name] : false; - } - } - - /** - * Put data into cache - */ - public function put($var_name, $var, $ttl = 31536000) - { - if ($var_name[0] === '_') - { - memcache_set($this->memcache, $var_name, $var, 0, $ttl); - } - else - { - $this->vars[$var_name] = $var; - $this->is_modified = true; - } - } - - /** - * Purge cache data - */ - public function purge() - { - // Purge all phpbb cache files - $dir = @opendir($this->cache_dir); - - if (!$dir) - { - return; - } - - while (($entry = readdir($dir)) !== false) - { - if (strpos($entry, 'sql_') !== 0 && strpos($entry, 'data_') !== 0 && strpos($entry, 'ctpl_') !== 0 && strpos($entry, 'tpl_') !== 0) - { - continue; - } - - @unlink($this->cache_dir . $entry); - } - closedir($dir); - - memcache_flush($this->memcache); - - unset($this->vars); - unset($this->sql_rowset); - - $this->vars = array(); - $this->var_expires = array(); - $this->sql_rowset = array(); - - $this->is_modified = false; - } - - /** - * Destroy cache data - */ - public function destroy($var_name, $table = '') - { - global $phpEx; - - if ($var_name === 'sql' && !empty($table)) - { - if (!is_array($table)) - { - $table = array($table); - } - - foreach ($table as $table_name) - { - // gives us the md5s that we want - $temp = memcache_get($this->memcache, 'sql_' . $table_name); - if ($temp === false) - { - continue; - } - - // delete each query ref - foreach ($temp as $md5_id => $void) - { - memcache_delete($this->memcache, 'sql_' . $md5_id); - } - - // delete the table ref - memcache_delete($this->memcache, 'sql_' . $table_name); - } - - return; - } - - if ($var_name[0] === '_') - { - memcache_delete($this->memcache, $var_name); - } - else if (isset($this->vars[$var_name])) - { - $this->is_modified = true; - unset($this->vars[$var_name]); - - // We save here to let the following cache hits succeed - $this->save(); - } - } - - /** - * Load cached sql query - */ - public function sql_load($query) - { - global $phpEx; - - // Remove extra spaces and tabs - $query = preg_replace('/[\n\r\s\t]+/', ' ', $query); - $query_id = sizeof($this->sql_rowset); - - $temp = memcache_get($this->memcache, 'sql_' . md5($query)); - - if ($temp === false) - { - return false; - } - - $this->sql_rowset[$query_id] = $temp; - - - return $query_id; - } - - /** - * Save sql query - */ - public function sql_save($query, &$query_result, $ttl) - { - global $db, $phpEx; - - // Remove extra spaces and tabs - $query = preg_replace('/[\n\r\s\t]+/', ' ', $query); - - // determine which tables this query belongs to: - - // grab all the FROM tables, avoid getting a LEFT JOIN - preg_match('/FROM \(?(\w+(?: (?!LEFT JOIN)\w+)?(?:, ?\w+(?: (?!LEFT JOIN)\w+)?)*)\)?/', $query, $regs); - $tables = array_map('trim', explode(',', $regs[1])); - - // now get the LEFT JOIN - preg_match_all('/LEFT JOIN\s+(\w+)(?: \w+)?/', $query, $result, PREG_PATTERN_ORDER); - $tables = array_merge($tables, $result[1]); - - $query_hash = md5($query); - - foreach ($tables as $table_name) - { - if (($pos = strpos($table_name, ' ')) !== false) - { - $table_name = substr($table_name, 0, $pos); - } - - $temp = memcache_get($this->memcache, 'sql_' . $table_name); - if ($temp === false) - { - $temp = array(); - } - $temp[$query_hash] = true; - memcache_set($this->memcache, 'sql_' . $table_name, $temp, 0, $ttl); - } - - // store them in the right place - $query_id = sizeof($this->sql_rowset); - $this->sql_rowset[$query_id] = array(); - - while ($row = $db->sql_fetchrow($query_result)) - { - $this->sql_rowset[$query_id][] = $row; - } - $db->sql_freeresult($query_result); - - memcache_set($this->memcache, 'sql_' . $query_hash, $this->sql_rowset[$query_id], 0, $ttl); - - $query_result = $query_id; - } - - /** - * Fetch row from cache (database) - */ - public function sql_fetchrow($query_id) - { - list(, $row) = each($this->sql_rowset[$query_id]); - - return ($row !== NULL) ? $row : false; - } - - /** - * Fetch a field from the current row of a cached database result (database) - */ - public function sql_fetchfield($query_id, $field) - { - $row = current($this->sql_rowset[$query_id]); - - return ($row !== false && isset($row[$field])) ? $row[$field] : false; - } - - /** - * Free memory used for a cached database result (database) - */ - public function sql_freeresult($query_id) - { - if (!isset($this->sql_rowset[$query_id])) - { - return false; - } - - unset($this->sql_rowset[$query_id]); - - return true; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acm/acm_xcache.php b/phpBB/includes/acm/acm_xcache.php deleted file mode 100644 index 542dc60abb..0000000000 --- a/phpBB/includes/acm/acm_xcache.php +++ /dev/null @@ -1,340 +0,0 @@ -cache_dir = $phpbb_root_path . 'cache/'; - } - - /** - * Load global cache - */ - private function load() - { - global $phpEx; - - // grab the global cache - if (xcache_isset('global')) - { - $this->vars = xcache_get('global'); - return true; - } - - return false; - } - - /** - * Unload cache object - */ - public function unload() - { - $this->save(); - unset($this->vars); - unset($this->sql_rowset); - - $this->vars = array(); - $this->sql_rowset = array(); - } - - /** - * Save modified objects - */ - private function save() - { - if (!$this->is_modified) - { - return; - } - - xcache_set('global', $this->vars, 31536000); - - $this->is_modified = false; - } - - /** - * Tidy cache - */ - public function tidy() - { - global $phpEx; - - // cache has auto GC, no need to have any code here :) - - set_config('cache_last_gc', time(), true); - } - - /** - * Get saved cache object - */ - public function get($var_name) - { - if ($var_name[0] === '_') - { - global $phpEx; - - return (xcache_isset($var_name)) ? xcache_get($var_name) : false; - } - else - { - if (!sizeof($this->vars)) - { - $this->load(); - } - return (isset($this->vars[$var_name])) ? $this->vars[$var_name] : false; - } - } - - /** - * Put data into cache - */ - public function put($var_name, $var, $ttl = 31536000) - { - if ($var_name[0] === '_') - { - xcache_set($var_name, $var, $ttl); - } - else - { - $this->vars[$var_name] = $var; - $this->is_modified = true; - } - } - - /** - * Purge cache data - */ - public function purge() - { - // Purge all phpbb cache files - $dir = @opendir($this->cache_dir); - - if (!$dir) - { - return; - } - - while (($entry = readdir($dir)) !== false) - { - if (strpos($entry, 'sql_') !== 0 && strpos($entry, 'data_') !== 0 && strpos($entry, 'ctpl_') !== 0 && strpos($entry, 'tpl_') !== 0) - { - continue; - } - - @unlink($this->cache_dir . $entry); - } - closedir($dir); - - $n = xcache_count(XC_TYPE_VAR); - for ($i = 0; $i < $n; $i++) - { - xcache_clear_cache(XC_TYPE_VAR, $i); - } - - unset($this->vars); - unset($this->sql_rowset); - - $this->vars = array(); - $this->var_expires = array(); - $this->sql_rowset = array(); - - $this->is_modified = false; - } - - /** - * Destroy cache data - */ - public function destroy($var_name, $table = '') - { - global $phpEx; - - if ($var_name === 'sql' && !empty($table)) - { - if (!is_array($table)) - { - $table = array($table); - } - - foreach ($table as $table_name) - { - // gives us the md5s that we want - if (!xcache_isset('sql_' . $table_name)) - { - continue; - } - $temp = xcache_get('sql_' . $table_name); - - // delete each query ref - foreach ($temp as $md5_id => $void) - { - xcache_unset('sql_' . $md5_id); - } - - // delete the table ref - xcache_unset('sql_' . $table_name); - } - - return; - } - - if ($var_name[0] === '_') - { - xcache_unset($var_name); - } - else if (isset($this->vars[$var_name])) - { - $this->is_modified = true; - unset($this->vars[$var_name]); - - // We save here to let the following cache hits succeed - $this->save(); - } - } - - /** - * Load cached sql query - */ - public function sql_load($query) - { - global $phpEx; - - // Remove extra spaces and tabs - $query = preg_replace('/[\n\r\s\t]+/', ' ', $query); - $query_id = sizeof($this->sql_rowset); - - $query_hash = md5($query); - - if (!xcache_isset('sql_' . $query_hash)) - { - return false; - } - - $this->sql_rowset[$query_id] = xcache_get('sql_' . $query_hash); - - - return $query_id; - } - - /** - * Save sql query - */ - public function sql_save($query, &$query_result, $ttl) - { - global $db, $phpEx; - - // Remove extra spaces and tabs - $query = preg_replace('/[\n\r\s\t]+/', ' ', $query); - - // determine which tables this query belongs to: - - // grab all the FROM tables, avoid getting a LEFT JOIN - preg_match('/FROM \(?(\w+(?: (?!LEFT JOIN)\w+)?(?:, ?\w+(?: (?!LEFT JOIN)\w+)?)*)\)?/', $query, $regs); - $tables = array_map('trim', explode(',', $regs[1])); - - // now get the LEFT JOIN - preg_match_all('/LEFT JOIN\s+(\w+)(?: \w+)?/', $query, $result, PREG_PATTERN_ORDER); - $tables = array_merge($tables, $result[1]); - - $query_hash = md5($query); - - foreach ($tables as $table_name) - { - if (($pos = strpos($table_name, ' ')) !== false) - { - $table_name = substr($table_name, 0, $pos); - } - - if (xcache_isset('sql_' . $table_name)) - { - $temp = xcache_get('sql_' . $table_name); - } - else - { - $temp = array(); - } - $temp[$query_hash] = true; - xcache_set('sql_' . $table_name, $temp, $ttl); - } - - // store them in the right place - $query_id = sizeof($this->sql_rowset); - $this->sql_rowset[$query_id] = array(); - - while ($row = $db->sql_fetchrow($query_result)) - { - $this->sql_rowset[$query_id][] = $row; - } - $db->sql_freeresult($query_result); - - xcache_set('sql_' . $query_hash, $this->sql_rowset[$query_id], $ttl); - - $query_result = $query_id; - } - - /** - * Fetch row from cache (database) - */ - public function sql_fetchrow($query_id) - { - list(, $row) = each($this->sql_rowset[$query_id]); - - return ($row !== NULL) ? $row : false; - } - - /** - * Fetch a field from the current row of a cached database result (database) - */ - public function sql_fetchfield($query_id, $field) - { - $row = current($this->sql_rowset[$query_id]); - - return ($row !== false && isset($row[$field])) ? $row[$field] : false; - } - - /** - * Free memory used for a cached database result (database) - */ - public function sql_freeresult($query_id) - { - if (!isset($this->sql_rowset[$query_id])) - { - return false; - } - - unset($this->sql_rowset[$query_id]); - - return true; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php deleted file mode 100644 index 120c6a789f..0000000000 --- a/phpBB/includes/acp/acp_attachments.php +++ /dev/null @@ -1,1433 +0,0 @@ -add_lang(array('posting', 'viewtopic', 'acp/attachments')); - - $error = $notify = array(); - $submit = (isset($_POST['submit'])) ? true : false; - $action = request_var('action', ''); - - $form_key = 'acp_attach'; - add_form_key($form_key); - - if ($submit && !check_form_key($form_key)) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - switch ($mode) - { - case 'attach': - $l_title = 'ACP_ATTACHMENT_SETTINGS'; - break; - - case 'extensions': - $l_title = 'ACP_MANAGE_EXTENSIONS'; - break; - - case 'ext_groups': - $l_title = 'ACP_EXTENSION_GROUPS'; - break; - - case 'orphan': - $l_title = 'ACP_ORPHAN_ATTACHMENTS'; - break; - - default: - trigger_error('NO_MODE', E_USER_ERROR); - break; - } - - $this->tpl_name = 'acp_attachments'; - $this->page_title = $l_title; - - $template->assign_vars(array( - 'L_TITLE' => $user->lang[$l_title], - 'L_TITLE_EXPLAIN' => $user->lang[$l_title . '_EXPLAIN'], - 'U_ACTION' => $this->u_action) - ); - - switch ($mode) - { - case 'attach': - - include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx); - - $sql = 'SELECT group_name, cat_id - FROM ' . EXTENSION_GROUPS_TABLE . ' - WHERE cat_id > 0 - ORDER BY cat_id'; - $result = $db->sql_query($sql); - - $s_assigned_groups = array(); - while ($row = $db->sql_fetchrow($result)) - { - $s_assigned_groups[$row['cat_id']][] = $row['group_name']; - } - $db->sql_freeresult($result); - - $l_legend_cat_images = $user->lang['SETTINGS_CAT_IMAGES'] . ' [' . $user->lang['ASSIGNED_GROUP'] . ': ' . ((!empty($s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE])) ? implode(', ', $s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE]) : $user->lang['NO_EXT_GROUP']) . ']'; - - $display_vars = array( - 'title' => 'ACP_ATTACHMENT_SETTINGS', - 'vars' => array( - 'img_max_width' => false, 'img_max_height' => false, 'img_link_width' => false, 'img_link_height' => false, - - 'legend1' => 'ACP_ATTACHMENT_SETTINGS', - 'allow_attachments' => array('lang' => 'ALLOW_ATTACHMENTS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_pm_attach' => array('lang' => 'ALLOW_PM_ATTACHMENTS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'upload_path' => array('lang' => 'UPLOAD_DIR', 'validate' => 'wpath', 'type' => 'text:25:100', 'explain' => true), - 'display_order' => array('lang' => 'DISPLAY_ORDER', 'validate' => 'bool', 'type' => 'custom', 'method' => 'display_order', 'explain' => true), - 'attachment_quota' => array('lang' => 'ATTACH_QUOTA', 'validate' => 'string', 'type' => 'custom', 'method' => 'max_filesize', 'explain' => true), - 'max_filesize' => array('lang' => 'ATTACH_MAX_FILESIZE', 'validate' => 'string', 'type' => 'custom', 'method' => 'max_filesize', 'explain' => true), - 'max_filesize_pm' => array('lang' => 'ATTACH_MAX_PM_FILESIZE','validate' => 'string', 'type' => 'custom', 'method' => 'max_filesize', 'explain' => true), - 'max_attachments' => array('lang' => 'MAX_ATTACHMENTS', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => false), - 'max_attachments_pm' => array('lang' => 'MAX_ATTACHMENTS_PM', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => false), - 'secure_downloads' => array('lang' => 'SECURE_DOWNLOADS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'secure_allow_deny' => array('lang' => 'SECURE_ALLOW_DENY', 'validate' => 'int', 'type' => 'custom', 'method' => 'select_allow_deny', 'explain' => true), - 'secure_allow_empty_referer' => array('lang' => 'SECURE_EMPTY_REFERRER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - - 'legend2' => $l_legend_cat_images, - 'img_display_inlined' => array('lang' => 'DISPLAY_INLINED', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'img_create_thumbnail' => array('lang' => 'CREATE_THUMBNAIL', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'img_max_thumb_width' => array('lang' => 'MAX_THUMB_WIDTH', 'validate' => 'int', 'type' => 'text:7:15', 'explain' => true, 'append' => ' px'), - 'img_min_thumb_filesize' => array('lang' => 'MIN_THUMB_FILESIZE', 'validate' => 'int', 'type' => 'text:7:15', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']), - 'img_imagick' => array('lang' => 'IMAGICK_PATH', 'validate' => 'string', 'type' => 'text:20:200', 'explain' => true, 'append' => '  [ ' . $user->lang['SEARCH_IMAGICK'] . ' ]'), - 'img_max' => array('lang' => 'MAX_IMAGE_SIZE', 'validate' => 'int', 'type' => 'dimension:3:4', 'explain' => true, 'append' => ' px'), - 'img_link' => array('lang' => 'IMAGE_LINK_SIZE', 'validate' => 'int', 'type' => 'dimension:3:4', 'explain' => true, 'append' => ' px'), - ) - ); - - $this->new_config = $config; - $cfg_array = (isset($_REQUEST['config'])) ? request_var('config', array('' => '')) : $this->new_config; - $error = array(); - - // We validate the complete config if whished - validate_config_vars($display_vars['vars'], $cfg_array, $error); - - // Do not write values if there is an error - if (sizeof($error)) - { - $submit = false; - } - - // We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to... - foreach ($display_vars['vars'] as $config_name => $null) - { - if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false) - { - continue; - } - - $this->new_config[$config_name] = $config_value = $cfg_array[$config_name]; - - if (in_array($config_name, array('attachment_quota', 'max_filesize', 'max_filesize_pm'))) - { - $size_var = request_var($config_name, ''); - $this->new_config[$config_name] = $config_value = ($size_var == 'kb') ? ($config_value << 10) : (($size_var == 'mb') ? ($config_value << 20) : $config_value); - } - - if ($submit) - { - set_config($config_name, $config_value); - } - } - - $this->perform_site_list(); - - if ($submit) - { - add_log('admin', 'LOG_CONFIG_ATTACH'); - - // Check Settings - $this->test_upload($error, $this->new_config['upload_path'], false); - - if (!sizeof($error)) - { - trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action)); - } - } - - $template->assign_var('S_ATTACHMENT_SETTINGS', true); - - if ($action == 'imgmagick') - { - $this->new_config['img_imagick'] = $this->search_imagemagick(); - } - - // We strip eventually manual added convert program, we only want the patch - if ($this->new_config['img_imagick']) - { - // Change path separator - $this->new_config['img_imagick'] = str_replace('\\', '/', $this->new_config['img_imagick']); - $this->new_config['img_imagick'] = str_replace(array('convert', '.exe'), array('', ''), $this->new_config['img_imagick']); - - // Check for trailing slash - if (substr($this->new_config['img_imagick'], -1) !== '/') - { - $this->new_config['img_imagick'] .= '/'; - } - } - - $supported_types = get_supported_image_types(); - - // Check Thumbnail Support - if (!$this->new_config['img_imagick'] && (!isset($supported_types['format']) || !sizeof($supported_types['format']))) - { - $this->new_config['img_create_thumbnail'] = 0; - } - - $template->assign_vars(array( - 'U_SEARCH_IMAGICK' => $this->u_action . '&action=imgmagick', - 'S_THUMBNAIL_SUPPORT' => (!$this->new_config['img_imagick'] && (!isset($supported_types['format']) || !sizeof($supported_types['format']))) ? false : true) - ); - - // Secure Download Options - Same procedure as with banning - $allow_deny = ($this->new_config['secure_allow_deny']) ? 'ALLOWED' : 'DISALLOWED'; - - $sql = 'SELECT * - FROM ' . SITELIST_TABLE; - $result = $db->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); - - $template->assign_vars(array( - 'S_SECURE_DOWNLOADS' => $this->new_config['secure_downloads'], - 'S_DEFINED_IPS' => ($defined_ips != '') ? true : false, - 'S_WARNING' => (sizeof($error)) ? true : false, - - 'WARNING_MSG' => implode('
    ', $error), - 'DEFINED_IPS' => $defined_ips, - - 'L_SECURE_TITLE' => $user->lang['DEFINE_' . $allow_deny . '_IPS'], - 'L_IP_EXCLUDE' => $user->lang['EXCLUDE_FROM_' . $allow_deny . '_IP'], - 'L_REMOVE_IPS' => $user->lang['REMOVE_' . $allow_deny . '_IPS']) - ); - - // Output relevant options - foreach ($display_vars['vars'] as $config_key => $vars) - { - if (!is_array($vars) && strpos($config_key, 'legend') === false) - { - continue; - } - - if (strpos($config_key, 'legend') !== false) - { - $template->assign_block_vars('options', array( - 'S_LEGEND' => true, - 'LEGEND' => (isset($user->lang[$vars])) ? $user->lang[$vars] : $vars) - ); - - continue; - } - - $type = explode(':', $vars['type']); - - $l_explain = ''; - if ($vars['explain'] && isset($vars['lang_explain'])) - { - $l_explain = (isset($user->lang[$vars['lang_explain']])) ? $user->lang[$vars['lang_explain']] : $vars['lang_explain']; - } - else if ($vars['explain']) - { - $l_explain = (isset($user->lang[$vars['lang'] . '_EXPLAIN'])) ? $user->lang[$vars['lang'] . '_EXPLAIN'] : ''; - } - - $template->assign_block_vars('options', array( - 'KEY' => $config_key, - 'TITLE' => $user->lang[$vars['lang']], - 'S_EXPLAIN' => $vars['explain'], - 'TITLE_EXPLAIN' => $l_explain, - 'CONTENT' => build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars), - ) - ); - - unset($display_vars['vars'][$config_key]); - } - - break; - - case 'extensions': - - if ($submit || isset($_POST['add_extension_check'])) - { - if ($submit) - { - // Change Extensions ? - $extension_change_list = request_var('extension_change_list', array(0)); - $group_select_list = request_var('group_select', array(0)); - - // Generate correct Change List - $extensions = array(); - - for ($i = 0, $size = sizeof($extension_change_list); $i < $size; $i++) - { - $extensions[$extension_change_list[$i]]['group_id'] = $group_select_list[$i]; - } - - $sql = 'SELECT * - FROM ' . EXTENSIONS_TABLE . ' - ORDER BY extension_id'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if ($row['group_id'] != $extensions[$row['extension_id']]['group_id']) - { - $sql = 'UPDATE ' . EXTENSIONS_TABLE . ' - SET group_id = ' . (int) $extensions[$row['extension_id']]['group_id'] . ' - WHERE extension_id = ' . $row['extension_id']; - $db->sql_query($sql); - - add_log('admin', 'LOG_ATTACH_EXT_UPDATE', $row['extension']); - } - } - $db->sql_freeresult($result); - - // Delete Extension? - $extension_id_list = request_var('extension_id_list', array(0)); - - if (sizeof($extension_id_list)) - { - $sql = 'SELECT extension - FROM ' . EXTENSIONS_TABLE . ' - WHERE ' . $db->sql_in_set('extension_id', $extension_id_list); - $result = $db->sql_query($sql); - - $extension_list = ''; - while ($row = $db->sql_fetchrow($result)) - { - $extension_list .= ($extension_list == '') ? $row['extension'] : ', ' . $row['extension']; - } - $db->sql_freeresult($result); - - $sql = 'DELETE - FROM ' . EXTENSIONS_TABLE . ' - WHERE ' . $db->sql_in_set('extension_id', $extension_id_list); - $db->sql_query($sql); - - add_log('admin', 'LOG_ATTACH_EXT_DEL', $extension_list); - } - } - - // Add Extension? - $add_extension = strtolower(request_var('add_extension', '')); - $add_extension_group = request_var('add_group_select', 0); - $add = (isset($_POST['add_extension_check'])) ? true : false; - - if ($add_extension && $add) - { - if (!sizeof($error)) - { - $sql = 'SELECT extension_id - FROM ' . EXTENSIONS_TABLE . " - WHERE extension = '" . $db->sql_escape($add_extension) . "'"; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - $error[] = sprintf($user->lang['EXTENSION_EXIST'], $add_extension); - } - $db->sql_freeresult($result); - - if (!sizeof($error)) - { - $sql_ary = array( - 'group_id' => $add_extension_group, - 'extension' => $add_extension - ); - - $db->sql_query('INSERT INTO ' . EXTENSIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); - add_log('admin', 'LOG_ATTACH_EXT_ADD', $add_extension); - } - } - } - - if (!sizeof($error)) - { - $notify[] = $user->lang['EXTENSIONS_UPDATED']; - } - - $cache->destroy('_extensions'); - } - - $template->assign_vars(array( - 'S_EXTENSIONS' => true, - 'ADD_EXTENSION' => (isset($add_extension)) ? $add_extension : '', - 'GROUP_SELECT_OPTIONS' => (isset($_POST['add_extension_check'])) ? $this->group_select('add_group_select', $add_extension_group, 'extension_group') : $this->group_select('add_group_select', false, 'extension_group')) - ); - - $sql = 'SELECT * - FROM ' . EXTENSIONS_TABLE . ' - ORDER BY group_id, extension'; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - $old_group_id = $row['group_id']; - do - { - $s_spacer = false; - - $current_group_id = $row['group_id']; - if ($old_group_id != $current_group_id) - { - $s_spacer = true; - $old_group_id = $current_group_id; - } - - $template->assign_block_vars('extensions', array( - 'S_SPACER' => $s_spacer, - 'EXTENSION_ID' => $row['extension_id'], - 'EXTENSION' => $row['extension'], - 'GROUP_OPTIONS' => $this->group_select('group_select[]', $row['group_id'])) - ); - } - while ($row = $db->sql_fetchrow($result)); - } - $db->sql_freeresult($result); - - break; - - case 'ext_groups': - - $template->assign_var('S_EXTENSION_GROUPS', true); - - if ($submit) - { - $action = request_var('action', ''); - $group_id = request_var('g', 0); - - if ($action != 'add' && $action != 'edit') - { - trigger_error('NO_MODE', E_USER_ERROR); - } - - if (!$group_id && $action == 'edit') - { - trigger_error($user->lang['NO_EXT_GROUP_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if ($group_id) - { - $sql = 'SELECT * - FROM ' . EXTENSION_GROUPS_TABLE . " - WHERE group_id = $group_id"; - $result = $db->sql_query($sql); - $ext_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$ext_row) - { - trigger_error($user->lang['NO_EXT_GROUP_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING); - } - } - else - { - $ext_row = array(); - } - - $group_name = utf8_normalize_nfc(request_var('group_name', '', true)); - $new_group_name = ($action == 'add') ? $group_name : (($ext_row['group_name'] != $group_name) ? $group_name : ''); - - if (!$group_name) - { - $error[] = $user->lang['NO_EXT_GROUP_NAME']; - } - - // Check New Group Name - if ($new_group_name) - { - $sql = 'SELECT group_name - FROM ' . EXTENSION_GROUPS_TABLE; - $result = $db->sql_query($sql); - $ext_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $clean_group_name = utf8_clean_string($new_group_name); - - while ($row = $db->sql_fetchrow($result)) - { - if (utf8_clean_string($row['group_name']) === $clean_group_name) - { - $error[] = sprintf($user->lang['EXTENSION_GROUP_EXIST'], $new_group_name); - break; - } - } - $db->sql_freeresult($result); - } - - if (!sizeof($error)) - { - // Ok, build the update/insert array - $upload_icon = request_var('upload_icon', 'no_image'); - $size_select = request_var('size_select', 'b'); - $forum_select = request_var('forum_select', false); - $allowed_forums = request_var('allowed_forums', array(0)); - $allow_in_pm = (isset($_POST['allow_in_pm'])) ? true : false; - $max_filesize = request_var('max_filesize', 0); - $max_filesize = ($size_select == 'kb') ? ($max_filesize << 10) : (($size_select == 'mb') ? ($max_filesize << 20) : $max_filesize); - $allow_group = (isset($_POST['allow_group'])) ? true : false; - - if ($max_filesize == $config['max_filesize']) - { - $max_filesize = 0; - } - - if (!sizeof($allowed_forums)) - { - $forum_select = false; - } - - $group_ary = array( - 'group_name' => $group_name, - 'cat_id' => request_var('special_category', ATTACHMENT_CATEGORY_NONE), - 'allow_group' => ($allow_group) ? 1 : 0, - 'upload_icon' => ($upload_icon == 'no_image') ? '' : $upload_icon, - 'max_filesize' => $max_filesize, - 'allowed_forums'=> ($forum_select) ? serialize($allowed_forums) : '', - 'allow_in_pm' => ($allow_in_pm) ? 1 : 0, - ); - - if ($action == 'add') - { - $group_ary['download_mode'] = INLINE_LINK; - } - - $sql = ($action == 'add') ? 'INSERT INTO ' . EXTENSION_GROUPS_TABLE . ' ' : 'UPDATE ' . EXTENSION_GROUPS_TABLE . ' SET '; - $sql .= $db->sql_build_array((($action == 'add') ? 'INSERT' : 'UPDATE'), $group_ary); - $sql .= ($action == 'edit') ? " WHERE group_id = $group_id" : ''; - - $db->sql_query($sql); - - if ($action == 'add') - { - $group_id = $db->sql_nextid(); - } - - add_log('admin', 'LOG_ATTACH_EXTGROUP_' . strtoupper($action), $group_name); - } - - $extension_list = request_var('extensions', array(0)); - - if ($action == 'edit' && sizeof($extension_list)) - { - $sql = 'UPDATE ' . EXTENSIONS_TABLE . " - SET group_id = 0 - WHERE group_id = $group_id"; - $db->sql_query($sql); - } - - if (sizeof($extension_list)) - { - $sql = 'UPDATE ' . EXTENSIONS_TABLE . " - SET group_id = $group_id - WHERE " . $db->sql_in_set('extension_id', $extension_list); - $db->sql_query($sql); - } - - $cache->destroy('_extensions'); - - if (!sizeof($error)) - { - $notify[] = $user->lang['SUCCESS_EXTENSION_GROUP_' . strtoupper($action)]; - } - } - - $cat_lang = array( - ATTACHMENT_CATEGORY_NONE => $user->lang['NO_FILE_CAT'], - ATTACHMENT_CATEGORY_IMAGE => $user->lang['CAT_IMAGES'], - ATTACHMENT_CATEGORY_WM => $user->lang['CAT_WM_FILES'], - ATTACHMENT_CATEGORY_RM => $user->lang['CAT_RM_FILES'], - ATTACHMENT_CATEGORY_FLASH => $user->lang['CAT_FLASH_FILES'], - ATTACHMENT_CATEGORY_QUICKTIME => $user->lang['CAT_QUICKTIME_FILES'], - ); - - $group_id = request_var('g', 0); - $action = (isset($_POST['add'])) ? 'add' : $action; - - switch ($action) - { - case 'delete': - - if (confirm_box(true)) - { - $sql = 'SELECT group_name - FROM ' . EXTENSION_GROUPS_TABLE . " - WHERE group_id = $group_id"; - $result = $db->sql_query($sql); - $group_name = (string) $db->sql_fetchfield('group_name'); - $db->sql_freeresult($result); - - $sql = 'DELETE - FROM ' . EXTENSION_GROUPS_TABLE . " - WHERE group_id = $group_id"; - $db->sql_query($sql); - - // Set corresponding Extensions to a pending Group - $sql = 'UPDATE ' . EXTENSIONS_TABLE . " - SET group_id = 0 - WHERE group_id = $group_id"; - $db->sql_query($sql); - - add_log('admin', 'LOG_ATTACH_EXTGROUP_DEL', $group_name); - - $cache->destroy('_extensions'); - - trigger_error($user->lang['EXTENSION_GROUP_DELETED'] . adm_back_link($this->u_action)); - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'i' => $id, - 'mode' => $mode, - 'group_id' => $group_id, - 'action' => 'delete', - ))); - } - - break; - - case 'edit': - - if (!$group_id) - { - trigger_error($user->lang['NO_EXT_GROUP_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = 'SELECT * - FROM ' . EXTENSION_GROUPS_TABLE . " - WHERE group_id = $group_id"; - $result = $db->sql_query($sql); - $ext_group_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $forum_ids = (!$ext_group_row['allowed_forums']) ? array() : unserialize(trim($ext_group_row['allowed_forums'])); - - // no break; - - case 'add': - - if ($action == 'add') - { - $ext_group_row = array( - 'group_name' => utf8_normalize_nfc(request_var('group_name', '', true)), - 'cat_id' => 0, - 'allow_group' => 1, - 'allow_in_pm' => 1, - 'upload_icon' => '', - 'max_filesize' => 0, - ); - - $forum_ids = array(); - } - - $extensions = array(); - - $sql = 'SELECT * - FROM ' . EXTENSIONS_TABLE . " - WHERE group_id = $group_id - OR group_id = 0 - ORDER BY extension"; - $result = $db->sql_query($sql); - $extensions = $db->sql_fetchrowset($result); - $db->sql_freeresult($result); - - if ($ext_group_row['max_filesize'] == 0) - { - $ext_group_row['max_filesize'] = (int) $config['max_filesize']; - } - - $size_format = ($ext_group_row['max_filesize'] >= 1048576) ? 'mb' : (($ext_group_row['max_filesize'] >= 1024) ? 'kb' : 'b'); - $ext_group_row['max_filesize'] = get_formatted_filesize($ext_group_row['max_filesize'], false); - - $img_path = $config['upload_icons_path']; - - $filename_list = ''; - $no_image_select = false; - - $imglist = filelist($phpbb_root_path . $img_path); - - if (sizeof($imglist)) - { - $imglist = array_values($imglist); - $imglist = $imglist[0]; - - foreach ($imglist as $key => $img) - { - if (!$ext_group_row['upload_icon']) - { - $no_image_select = true; - $selected = ''; - } - else - { - $selected = ($ext_group_row['upload_icon'] == $img) ? ' selected="selected"' : ''; - } - - if (strlen($img) > 255) - { - continue; - } - - $filename_list .= ''; - } - } - - $i = 0; - $assigned_extensions = ''; - foreach ($extensions as $num => $row) - { - if ($row['group_id'] == $group_id && $group_id) - { - $assigned_extensions .= ($i) ? ', ' . $row['extension'] : $row['extension']; - $i++; - } - } - - $s_extension_options = ''; - foreach ($extensions as $row) - { - $s_extension_options .= '' . $row['extension'] . ''; - } - - $template->assign_vars(array( - 'PHPBB_ROOT_PATH' => $phpbb_root_path, - 'IMG_PATH' => $img_path, - 'ACTION' => $action, - 'GROUP_ID' => $group_id, - 'GROUP_NAME' => $ext_group_row['group_name'], - 'ALLOW_GROUP' => $ext_group_row['allow_group'], - 'ALLOW_IN_PM' => $ext_group_row['allow_in_pm'], - 'UPLOAD_ICON_SRC' => $phpbb_root_path . $img_path . '/' . $ext_group_row['upload_icon'], - 'EXTGROUP_FILESIZE' => $ext_group_row['max_filesize'], - 'ASSIGNED_EXTENSIONS' => $assigned_extensions, - - 'S_CATEGORY_SELECT' => $this->category_select('special_category', $group_id, 'category'), - 'S_EXT_GROUP_SIZE_OPTIONS' => size_select_options($size_format), - 'S_EXTENSION_OPTIONS' => $s_extension_options, - 'S_FILENAME_LIST' => $filename_list, - 'S_EDIT_GROUP' => true, - 'S_NO_IMAGE' => $no_image_select, - 'S_FORUM_IDS' => (sizeof($forum_ids)) ? true : false, - - 'U_EXTENSIONS' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&mode=extensions"), - 'U_BACK' => $this->u_action, - - 'L_LEGEND' => $user->lang[strtoupper($action) . '_EXTENSION_GROUP']) - ); - - $s_forum_id_options = ''; - - $sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id - FROM ' . FORUMS_TABLE . ' - ORDER BY left_id ASC'; - $result = $db->sql_query($sql, 600); - - $right = $cat_right = $padding_inc = 0; - $padding = $forum_list = $holding = ''; - $padding_store = array('0' => ''); - - while ($row = $db->sql_fetchrow($result)) - { - if ($row['forum_type'] == FORUM_CAT && ($row['left_id'] + 1 == $row['right_id'])) - { - // Non-postable forum with no subforums, don't display - continue; - } - - if (!$auth->acl_get('f_list', $row['forum_id'])) - { - // if the user does not have permissions to list this forum skip - continue; - } - - if ($row['left_id'] < $right) - { - $padding .= '   '; - $padding_store[$row['parent_id']] = $padding; - } - else if ($row['left_id'] > $right + 1) - { - $padding = $padding_store[$row['parent_id']]; - } - - $right = $row['right_id']; - - $selected = (in_array($row['forum_id'], $forum_ids)) ? ' selected="selected"' : ''; - - if ($row['left_id'] > $cat_right) - { - // make sure we don't forget anything - $s_forum_id_options .= $holding; - $holding = ''; - } - - if ($row['right_id'] - $row['left_id'] > 1) - { - $cat_right = max($cat_right, $row['right_id']); - - $holding .= ''; - } - else - { - $s_forum_id_options .= $holding . ''; - $holding = ''; - } - } - - if ($holding) - { - $s_forum_id_options .= $holding; - } - - $db->sql_freeresult($result); - unset($padding_store); - - $template->assign_vars(array( - 'S_FORUM_ID_OPTIONS' => $s_forum_id_options) - ); - - break; - } - - $sql = 'SELECT * - FROM ' . EXTENSION_GROUPS_TABLE . ' - ORDER BY allow_group DESC, allow_in_pm DESC, group_name'; - $result = $db->sql_query($sql); - - $old_allow_group = $old_allow_pm = 1; - while ($row = $db->sql_fetchrow($result)) - { - $s_add_spacer = ($old_allow_group != $row['allow_group'] || $old_allow_pm != $row['allow_in_pm']) ? true : false; - - $template->assign_block_vars('groups', array( - 'S_ADD_SPACER' => $s_add_spacer, - 'S_ALLOWED_IN_PM' => ($row['allow_in_pm']) ? true : false, - 'S_GROUP_ALLOWED' => ($row['allow_group']) ? true : false, - - 'U_EDIT' => $this->u_action . "&action=edit&g={$row['group_id']}", - 'U_DELETE' => $this->u_action . "&action=delete&g={$row['group_id']}", - - 'GROUP_NAME' => $row['group_name'], - 'CATEGORY' => $cat_lang[$row['cat_id']], - ) - ); - - $old_allow_group = $row['allow_group']; - $old_allow_pm = $row['allow_in_pm']; - } - $db->sql_freeresult($result); - - break; - - case 'orphan': - - if ($submit) - { - $delete_files = (isset($_POST['delete'])) ? array_keys(request_var('delete', array('' => 0))) : array(); - $add_files = (isset($_POST['add'])) ? array_keys(request_var('add', array('' => 0))) : array(); - $post_ids = request_var('post_id', array('' => 0)); - - if (sizeof($delete_files)) - { - $sql = 'SELECT * - FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set('attach_id', $delete_files) . ' - AND is_orphan = 1'; - $result = $db->sql_query($sql); - - $delete_files = array(); - while ($row = $db->sql_fetchrow($result)) - { - phpbb_unlink($row['physical_filename'], 'file'); - - if ($row['thumbnail']) - { - phpbb_unlink($row['physical_filename'], 'thumbnail'); - } - - $delete_files[$row['attach_id']] = $row['real_filename']; - } - $db->sql_freeresult($result); - } - - if (sizeof($delete_files)) - { - $sql = 'DELETE FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set('attach_id', array_keys($delete_files)); - $db->sql_query($sql); - - add_log('admin', 'LOG_ATTACH_ORPHAN_DEL', implode(', ', $delete_files)); - $notify[] = sprintf($user->lang['LOG_ATTACH_ORPHAN_DEL'], implode(', ', $delete_files)); - } - - $upload_list = array(); - foreach ($add_files as $attach_id) - { - if (!isset($delete_files[$attach_id]) && !empty($post_ids[$attach_id])) - { - $upload_list[$attach_id] = $post_ids[$attach_id]; - } - } - unset($add_files); - - if (sizeof($upload_list)) - { - $template->assign_var('S_UPLOADING_FILES', true); - - $sql = 'SELECT forum_id, forum_name - FROM ' . FORUMS_TABLE; - $result = $db->sql_query($sql); - - $forum_names = array(); - while ($row = $db->sql_fetchrow($result)) - { - $forum_names[$row['forum_id']] = $row['forum_name']; - } - $db->sql_freeresult($result); - - $sql = 'SELECT forum_id, topic_id, post_id, poster_id - FROM ' . POSTS_TABLE . ' - WHERE ' . $db->sql_in_set('post_id', $upload_list); - $result = $db->sql_query($sql); - - $post_info = array(); - while ($row = $db->sql_fetchrow($result)) - { - $post_info[$row['post_id']] = $row; - } - $db->sql_freeresult($result); - - // Select those attachments we want to change... - $sql = 'SELECT * - FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set('attach_id', array_keys($upload_list)) . ' - AND is_orphan = 1'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $post_row = $post_info[$upload_list[$row['attach_id']]]; - - $template->assign_block_vars('upload', array( - 'FILE_INFO' => sprintf($user->lang['UPLOADING_FILE_TO'], $row['real_filename'], $post_row['post_id']), - 'S_DENIED' => (!$auth->acl_get('f_attach', $post_row['forum_id'])) ? true : false, - 'L_DENIED' => (!$auth->acl_get('f_attach', $post_row['forum_id'])) ? sprintf($user->lang['UPLOAD_DENIED_FORUM'], $forum_names[$row['forum_id']]) : '') - ); - - if (!$auth->acl_get('f_attach', $post_row['forum_id'])) - { - continue; - } - - // Adjust attachment entry - $sql_ary = array( - 'in_message' => 0, - 'is_orphan' => 0, - 'poster_id' => $post_row['poster_id'], - 'post_msg_id' => $post_row['post_id'], - 'topic_id' => $post_row['topic_id'], - ); - - $sql = 'UPDATE ' . ATTACHMENTS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE attach_id = ' . $row['attach_id']; - $db->sql_query($sql); - - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET post_attachment = 1 - WHERE post_id = ' . $post_row['post_id']; - $db->sql_query($sql); - - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET topic_attachment = 1 - WHERE topic_id = ' . $post_row['topic_id']; - $db->sql_query($sql); - - add_log('admin', 'LOG_ATTACH_FILEUPLOAD', $post_row['post_id'], $row['real_filename']); - } - $db->sql_freeresult($result); - } - } - - $template->assign_vars(array( - 'S_ORPHAN' => true) - ); - - // Just get the files with is_orphan set and older than 3 hours - $sql = 'SELECT * - FROM ' . ATTACHMENTS_TABLE . ' - WHERE is_orphan = 1 - AND filetime < ' . (time() - 3*60*60) . ' - ORDER BY filetime DESC'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $template->assign_block_vars('orphan', array( - 'FILESIZE' => get_formatted_filesize($row['filesize']), - 'FILETIME' => $user->format_date($row['filetime']), - 'REAL_FILENAME' => basename($row['real_filename']), - 'PHYSICAL_FILENAME' => basename($row['physical_filename']), - 'ATTACH_ID' => $row['attach_id'], - 'POST_IDS' => (!empty($post_ids[$row['attach_id']])) ? $post_ids[$row['attach_id']] : '', - 'U_FILE' => append_sid($phpbb_root_path . 'download/file.' . $phpEx, 'mode=view&id=' . $row['attach_id'])) - ); - } - $db->sql_freeresult($result); - - break; - } - - if (sizeof($error)) - { - $template->assign_vars(array( - 'S_WARNING' => true, - 'WARNING_MSG' => implode('
    ', $error)) - ); - } - - if (sizeof($notify)) - { - $template->assign_vars(array( - 'S_NOTIFY' => true, - 'NOTIFY_MSG' => implode('
    ', $notify)) - ); - } - } - - /** - * Build Select for category items - */ - function category_select($select_name, $group_id = false, $key = '') - { - global $db, $user; - - $types = array( - ATTACHMENT_CATEGORY_NONE => $user->lang['NO_FILE_CAT'], - ATTACHMENT_CATEGORY_IMAGE => $user->lang['CAT_IMAGES'], - ATTACHMENT_CATEGORY_WM => $user->lang['CAT_WM_FILES'], - ATTACHMENT_CATEGORY_RM => $user->lang['CAT_RM_FILES'], - ATTACHMENT_CATEGORY_FLASH => $user->lang['CAT_FLASH_FILES'], - ATTACHMENT_CATEGORY_QUICKTIME => $user->lang['CAT_QUICKTIME_FILES'], - ); - - if ($group_id) - { - $sql = 'SELECT cat_id - FROM ' . EXTENSION_GROUPS_TABLE . ' - WHERE group_id = ' . (int) $group_id; - $result = $db->sql_query($sql); - - $cat_type = (!($row = $db->sql_fetchrow($result))) ? ATTACHMENT_CATEGORY_NONE : $row['cat_id']; - - $db->sql_freeresult($result); - } - else - { - $cat_type = ATTACHMENT_CATEGORY_NONE; - } - - $group_select = ''; - - return $group_select; - } - - /** - * Extension group select - */ - function group_select($select_name, $default_group = false, $key = '') - { - global $db, $user; - - $group_select = ''; - - return $group_select; - } - - /** - * Search Imagick - */ - function search_imagemagick() - { - $imagick = ''; - - $exe = ((defined('PHP_OS')) && (preg_match('#^win#i', PHP_OS))) ? '.exe' : ''; - - $magic_home = getenv('MAGICK_HOME'); - - if (empty($magic_home)) - { - $locations = array('C:/WINDOWS/', 'C:/WINNT/', 'C:/WINDOWS/SYSTEM/', 'C:/WINNT/SYSTEM/', 'C:/WINDOWS/SYSTEM32/', 'C:/WINNT/SYSTEM32/', '/usr/bin/', '/usr/sbin/', '/usr/local/bin/', '/usr/local/sbin/', '/opt/', '/usr/imagemagick/', '/usr/bin/imagemagick/'); - $path_locations = str_replace('\\', '/', (explode(($exe) ? ';' : ':', getenv('PATH')))); - - $locations = array_merge($path_locations, $locations); - - foreach ($locations as $location) - { - // The path might not end properly, fudge it - if (substr($location, -1) !== '/') - { - $location .= '/'; - } - - if (@is_readable($location . 'mogrify' . $exe) && @filesize($location . 'mogrify' . $exe) > 3000) - { - $imagick = str_replace('\\', '/', $location); - continue; - } - } - } - else - { - $imagick = str_replace('\\', '/', $magic_home); - } - - return $imagick; - } - - /** - * Test Settings - */ - function test_upload(&$error, $upload_dir, $create_directory = false) - { - global $user, $phpbb_root_path; - - // Does the target directory exist, is it a directory and writable. - if ($create_directory) - { - if (!file_exists($phpbb_root_path . $upload_dir)) - { - @mkdir($phpbb_root_path . $upload_dir, 0777); - @chmod($phpbb_root_path . $upload_dir, 0777); - } - } - - if (!file_exists($phpbb_root_path . $upload_dir)) - { - $error[] = sprintf($user->lang['NO_UPLOAD_DIR'], $upload_dir); - return; - } - - if (!is_dir($phpbb_root_path . $upload_dir)) - { - $error[] = sprintf($user->lang['UPLOAD_NOT_DIR'], $upload_dir); - return; - } - - if (!is_writable($phpbb_root_path . $upload_dir)) - { - $error[] = sprintf($user->lang['NO_WRITE_UPLOAD'], $upload_dir); - return; - } - } - - /** - * Perform operations on sites for external linking - */ - function perform_site_list() - { - global $db, $user; - - if (isset($_REQUEST['securesubmit'])) - { - // Grab the list of entries - $ips = request_var('ips', ''); - $ip_list = array_unique(explode("\n", $ips)); - $ip_list_log = implode(', ', $ip_list); - - $ip_exclude = (!empty($_POST['ipexclude'])) ? 1 : 0; - - $iplist = array(); - $hostlist = array(); - - foreach ($ip_list as $item) - { - if (preg_match('#^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})[ ]*\-[ ]*([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$#', trim($item), $ip_range_explode)) - { - // Don't ask about all this, just don't ask ... ! - $ip_1_counter = $ip_range_explode[1]; - $ip_1_end = $ip_range_explode[5]; - - while ($ip_1_counter <= $ip_1_end) - { - $ip_2_counter = ($ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[2] : 0; - $ip_2_end = ($ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[6]; - - if ($ip_2_counter == 0 && $ip_2_end == 254) - { - $ip_2_counter = 256; - $ip_2_fragment = 256; - - $iplist[] = "'$ip_1_counter.*'"; - } - - while ($ip_2_counter <= $ip_2_end) - { - $ip_3_counter = ($ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[3] : 0; - $ip_3_end = ($ip_2_counter < $ip_2_end || $ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[7]; - - if ($ip_3_counter == 0 && $ip_3_end == 254) - { - $ip_3_counter = 256; - $ip_3_fragment = 256; - - $iplist[] = "'$ip_1_counter.$ip_2_counter.*'"; - } - - while ($ip_3_counter <= $ip_3_end) - { - $ip_4_counter = ($ip_3_counter == $ip_range_explode[3] && $ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[4] : 0; - $ip_4_end = ($ip_3_counter < $ip_3_end || $ip_2_counter < $ip_2_end) ? 254 : $ip_range_explode[8]; - - if ($ip_4_counter == 0 && $ip_4_end == 254) - { - $ip_4_counter = 256; - $ip_4_fragment = 256; - - $iplist[] = "'$ip_1_counter.$ip_2_counter.$ip_3_counter.*'"; - } - - while ($ip_4_counter <= $ip_4_end) - { - $iplist[] = "'$ip_1_counter.$ip_2_counter.$ip_3_counter.$ip_4_counter'"; - $ip_4_counter++; - } - $ip_3_counter++; - } - $ip_2_counter++; - } - $ip_1_counter++; - } - } - else if (preg_match('#^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$#', trim($item)) || preg_match('#^[a-f0-9:]+\*?$#i', trim($item))) - { - $iplist[] = "'" . trim($item) . "'"; - } - else if (preg_match('#^([\w\-_]\.?){2,}$#is', trim($item))) - { - $hostlist[] = "'" . trim($item) . "'"; - } - else if (preg_match("#^([a-z0-9\-\*\._/]+?)$#is", trim($item))) - { - $hostlist[] = "'" . trim($item) . "'"; - } - } - - $sql = 'SELECT site_ip, site_hostname - FROM ' . SITELIST_TABLE . " - WHERE ip_exclude = $ip_exclude"; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - $iplist_tmp = array(); - $hostlist_tmp = array(); - do - { - if ($row['site_ip']) - { - if (strlen($row['site_ip']) > 40) - { - continue; - } - - $iplist_tmp[] = "'" . $row['site_ip'] . "'"; - } - else if ($row['site_hostname']) - { - if (strlen($row['site_hostname']) > 255) - { - continue; - } - - $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); - } - $db->sql_freeresult($result); - - 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_SUCCESS'] . adm_back_link($this->u_action)); - } - else if (isset($_POST['unsecuresubmit'])) - { - $unip_sql = request_var('unip', array(0)); - - if (sizeof($unip_sql)) - { - $l_unip_list = ''; - - // Grab details of ips for logging information later - $sql = 'SELECT site_ip, site_hostname - FROM ' . SITELIST_TABLE . ' - WHERE ' . $db->sql_in_set('site_id', $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']); - } - $db->sql_freeresult($result); - - $sql = 'DELETE FROM ' . SITELIST_TABLE . ' - WHERE ' . $db->sql_in_set('site_id', $unip_sql); - $db->sql_query($sql); - - add_log('admin', 'LOG_DOWNLOAD_REMOVE_IP', $l_unip_list); - } - - trigger_error($user->lang['SECURE_DOWNLOAD_UPDATE_SUCCESS'] . adm_back_link($this->u_action)); - } - } - - /** - * Write display_order config field - */ - function display_order($value, $key = '') - { - $radio_ary = array(0 => 'DESCENDING', 1 => 'ASCENDING'); - - return h_radio('config[display_order]', $radio_ary, $value, $key); - } - - /** - * Adjust all three max_filesize config vars for display - */ - function max_filesize($value, $key = '') - { - // Determine size var and adjust the value accordingly - $size_var = ($value >= 1048576) ? 'mb' : (($value >= 1024) ? 'kb' : 'b'); - $value = get_formatted_filesize($value, false); - - return ' '; - } - - /** - * Write secure_allow_deny config field - */ - function select_allow_deny($value, $key = '') - { - $radio_ary = array(1 => 'ORDER_ALLOW_DENY', 0 => 'ORDER_DENY_ALLOW'); - - return h_radio('config[' . $key . ']', $radio_ary, $value, $key); - } - -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/includes/acp/acp_ban.php deleted file mode 100644 index 77fb44dda9..0000000000 --- a/phpBB/includes/acp/acp_ban.php +++ /dev/null @@ -1,235 +0,0 @@ -add_lang(array('acp/ban', 'acp/users')); - $this->tpl_name = 'acp_ban'; - $form_key = 'acp_ban'; - add_form_key($form_key); - - if (($bansubmit || $unbansubmit) && !check_form_key($form_key)) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - // Ban submitted? - if ($bansubmit) - { - // Grab the list of entries - $ban = utf8_normalize_nfc(request_var('ban', '', true)); - $ban_len = request_var('banlength', 0); - $ban_len_other = request_var('banlengthother', ''); - $ban_exclude = request_var('banexclude', 0); - $ban_reason = utf8_normalize_nfc(request_var('banreason', '', true)); - $ban_give_reason = utf8_normalize_nfc(request_var('bangivereason', '', true)); - - if ($ban) - { - user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reason, $ban_give_reason); - - trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . adm_back_link($this->u_action)); - } - } - else if ($unbansubmit) - { - $ban = request_var('unban', array('')); - - if ($ban) - { - user_unban($mode, $ban); - - trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . adm_back_link($this->u_action)); - } - } - - // Define language vars - $this->page_title = $user->lang[strtoupper($mode) . '_BAN']; - - $l_ban_explain = $user->lang[strtoupper($mode) . '_BAN_EXPLAIN']; - $l_ban_exclude_explain = $user->lang[strtoupper($mode) . '_BAN_EXCLUDE_EXPLAIN']; - $l_unban_title = $user->lang[strtoupper($mode) . '_UNBAN']; - $l_unban_explain = $user->lang[strtoupper($mode) . '_UNBAN_EXPLAIN']; - $l_no_ban_cell = $user->lang[strtoupper($mode) . '_NO_BANNED']; - - switch ($mode) - { - case 'user': - $l_ban_cell = $user->lang['USERNAME']; - break; - - case 'ip': - $l_ban_cell = $user->lang['IP_HOSTNAME']; - break; - - case 'email': - $l_ban_cell = $user->lang['EMAIL_ADDRESS']; - break; - } - - $this->display_ban_options($mode); - - $template->assign_vars(array( - 'L_TITLE' => $this->page_title, - 'L_EXPLAIN' => $l_ban_explain, - 'L_UNBAN_TITLE' => $l_unban_title, - 'L_UNBAN_EXPLAIN' => $l_unban_explain, - 'L_BAN_CELL' => $l_ban_cell, - 'L_BAN_EXCLUDE_EXPLAIN' => $l_ban_exclude_explain, - 'L_NO_BAN_CELL' => $l_no_ban_cell, - - 'S_USERNAME_BAN' => ($mode == 'user') ? true : false, - - 'U_ACTION' => $this->u_action, - 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=acp_ban&field=ban'), - )); - } - - /** - * Display ban options - */ - function display_ban_options($mode) - { - global $user, $db, $template; - - // Ban length options - $ban_end_text = array(0 => $user->lang['PERMANENT'], 30 => $user->lang['30_MINS'], 60 => $user->lang['1_HOUR'], 360 => $user->lang['6_HOURS'], 1440 => $user->lang['1_DAY'], 10080 => $user->lang['7_DAYS'], 20160 => $user->lang['2_WEEKS'], 40320 => $user->lang['1_MONTH'], -1 => $user->lang['UNTIL'] . ' -> '); - - $ban_end_options = ''; - foreach ($ban_end_text as $length => $text) - { - $ban_end_options .= ''; - } - - switch ($mode) - { - case 'user': - - $field = 'username'; - $l_ban_cell = $user->lang['USERNAME']; - - $sql = 'SELECT b.*, u.user_id, u.username, u.username_clean - FROM ' . BANLIST_TABLE . ' b, ' . USERS_TABLE . ' u - WHERE (b.ban_end >= ' . time() . ' - OR b.ban_end = 0) - AND u.user_id = b.ban_userid - ORDER BY u.username_clean ASC'; - break; - - case 'ip': - - $field = 'ban_ip'; - $l_ban_cell = $user->lang['IP_HOSTNAME']; - - $sql = 'SELECT * - FROM ' . BANLIST_TABLE . ' - WHERE (ban_end >= ' . time() . " - OR ban_end = 0) - AND ban_ip <> ''"; - break; - - case 'email': - - $field = 'ban_email'; - $l_ban_cell = $user->lang['EMAIL_ADDRESS']; - - $sql = 'SELECT * - FROM ' . BANLIST_TABLE . ' - WHERE (ban_end >= ' . time() . " - OR ban_end = 0) - AND ban_email <> ''"; - break; - } - $result = $db->sql_query($sql); - - $banned_options = ''; - $ban_length = $ban_reasons = $ban_give_reasons = array(); - - while ($row = $db->sql_fetchrow($result)) - { - $banned_options .= '' . $row[$field] . ''; - - $time_length = ($row['ban_end']) ? ($row['ban_end'] - $row['ban_start']) / 60 : 0; - $ban_length[$row['ban_id']] = (isset($ban_end_text[$time_length])) ? $ban_end_text[$time_length] : $user->lang['UNTIL'] . ' -> ' . $user->format_date($row['ban_end']); - - $ban_reasons[$row['ban_id']] = $row['ban_reason']; - $ban_give_reasons[$row['ban_id']] = $row['ban_give_reason']; - } - $db->sql_freeresult($result); - - if (sizeof($ban_length)) - { - foreach ($ban_length as $ban_id => $length) - { - $template->assign_block_vars('ban_length', array( - 'BAN_ID' => (int) $ban_id, - 'LENGTH' => $length, - 'A_LENGTH' => addslashes($length), - )); - } - } - - if (sizeof($ban_reasons)) - { - foreach ($ban_reasons as $ban_id => $reason) - { - $template->assign_block_vars('ban_reason', array( - 'BAN_ID' => $ban_id, - 'REASON' => $reason, - 'A_REASON' => addslashes(htmlspecialchars_decode($reason)), - )); - } - } - - if (sizeof($ban_give_reasons)) - { - foreach ($ban_give_reasons as $ban_id => $reason) - { - $template->assign_block_vars('ban_give_reason', array( - 'BAN_ID' => $ban_id, - 'REASON' => $reason, - 'A_REASON' => addslashes(htmlspecialchars_decode($reason)), - )); - } - } - - $template->assign_vars(array( - 'S_BAN_END_OPTIONS' => $ban_end_options, - 'S_BANNED_OPTIONS' => ($banned_options) ? true : false, - 'BANNED_OPTIONS' => $banned_options) - ); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php deleted file mode 100644 index 33e8fe7ec1..0000000000 --- a/phpBB/includes/acp/acp_bbcodes.php +++ /dev/null @@ -1,437 +0,0 @@ -add_lang('acp/posting'); - - // Set up general vars - $action = request_var('action', ''); - $bbcode_id = request_var('bbcode', 0); - - $this->tpl_name = 'acp_bbcodes'; - $this->page_title = 'ACP_BBCODES'; - $form_key = 'acp_bbcodes'; - - add_form_key($form_key); - - // Set up mode-specific vars - switch ($action) - { - case 'add': - $bbcode_match = $bbcode_tpl = $bbcode_helpline = ''; - $display_on_posting = 0; - break; - - case 'edit': - $sql = 'SELECT bbcode_match, bbcode_tpl, display_on_posting, bbcode_helpline - FROM ' . BBCODES_TABLE . ' - WHERE bbcode_id = ' . $bbcode_id; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error($user->lang['BBCODE_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $bbcode_match = $row['bbcode_match']; - $bbcode_tpl = htmlspecialchars($row['bbcode_tpl']); - $display_on_posting = $row['display_on_posting']; - $bbcode_helpline = $row['bbcode_helpline']; - break; - - case 'modify': - $sql = 'SELECT bbcode_id, bbcode_tag - FROM ' . BBCODES_TABLE . ' - WHERE bbcode_id = ' . $bbcode_id; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error($user->lang['BBCODE_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - // No break here - - case 'create': - $display_on_posting = request_var('display_on_posting', 0); - - $bbcode_match = request_var('bbcode_match', ''); - $bbcode_tpl = htmlspecialchars_decode(utf8_normalize_nfc(request_var('bbcode_tpl', '', true))); - $bbcode_helpline = utf8_normalize_nfc(request_var('bbcode_helpline', '', true)); - break; - } - - // Do major work - switch ($action) - { - case 'edit': - case 'add': - - $template->assign_vars(array( - 'S_EDIT_BBCODE' => true, - 'U_BACK' => $this->u_action, - 'U_ACTION' => $this->u_action . '&action=' . (($action == 'add') ? 'create' : 'modify') . (($bbcode_id) ? "&bbcode=$bbcode_id" : ''), - - 'L_BBCODE_USAGE_EXPLAIN'=> sprintf($user->lang['BBCODE_USAGE_EXPLAIN'], '', ''), - 'BBCODE_MATCH' => $bbcode_match, - 'BBCODE_TPL' => $bbcode_tpl, - 'BBCODE_HELPLINE' => $bbcode_helpline, - 'DISPLAY_ON_POSTING' => $display_on_posting) - ); - - foreach ($user->lang['tokens'] as $token => $token_explain) - { - $template->assign_block_vars('token', array( - 'TOKEN' => '{' . $token . '}', - 'EXPLAIN' => $token_explain) - ); - } - - return; - - break; - - case 'modify': - case 'create': - - $data = $this->build_regexp($bbcode_match, $bbcode_tpl); - - // Make sure the user didn't pick a "bad" name for the BBCode tag. - $hard_coded = array('code', 'quote', 'quote=', 'attachment', 'attachment=', 'b', 'i', 'url', 'url=', 'img', 'size', 'size=', 'color', 'color=', 'u', 'list', 'list=', 'email', 'email=', 'flash', 'flash='); - - if (($action == 'modify' && strtolower($data['bbcode_tag']) !== strtolower($row['bbcode_tag'])) || ($action == 'create')) - { - $sql = 'SELECT 1 as test - FROM ' . BBCODES_TABLE . " - WHERE LOWER(bbcode_tag) = '" . $db->sql_escape(strtolower($data['bbcode_tag'])) . "'"; - $result = $db->sql_query($sql); - $info = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // Grab the end, interrogate the last closing tag - if ($info['test'] === '1' || in_array(strtolower($data['bbcode_tag']), $hard_coded) || (preg_match('#\[/([^[]*)]$#', $bbcode_match, $regs) && in_array(strtolower($regs[1]), $hard_coded))) - { - trigger_error($user->lang['BBCODE_INVALID_TAG_NAME'] . adm_back_link($this->u_action), E_USER_WARNING); - } - } - - if (substr($data['bbcode_tag'], -1) === '=') - { - $test = substr($data['bbcode_tag'], 0, -1); - } - else - { - $test = $data['bbcode_tag']; - } - - if (!preg_match('%\\[' . $test . '[^]]*].*?\\[/' . $test . ']%s', $bbcode_match)) - { - trigger_error($user->lang['BBCODE_OPEN_ENDED_TAG'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if (strlen($data['bbcode_tag']) > 16) - { - trigger_error($user->lang['BBCODE_TAG_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if (strlen($bbcode_match) > 4000) - { - trigger_error($user->lang['BBCODE_TAG_DEF_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql_ary = array( - 'bbcode_tag' => $data['bbcode_tag'], - 'bbcode_match' => $bbcode_match, - 'bbcode_tpl' => $bbcode_tpl, - 'display_on_posting' => $display_on_posting, - 'bbcode_helpline' => $bbcode_helpline, - 'first_pass_match' => $data['first_pass_match'], - 'first_pass_replace' => $data['first_pass_replace'], - 'second_pass_match' => $data['second_pass_match'], - 'second_pass_replace' => $data['second_pass_replace'] - ); - - if ($action == 'create') - { - $sql = 'SELECT MAX(bbcode_id) as max_bbcode_id - FROM ' . BBCODES_TABLE; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - $bbcode_id = $row['max_bbcode_id'] + 1; - - // Make sure it is greater than the core bbcode ids... - if ($bbcode_id <= NUM_CORE_BBCODES) - { - $bbcode_id = NUM_CORE_BBCODES + 1; - } - } - else - { - $bbcode_id = NUM_CORE_BBCODES + 1; - } - - if ($bbcode_id > 1511) - { - trigger_error($user->lang['TOO_MANY_BBCODES'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql_ary['bbcode_id'] = (int) $bbcode_id; - - $db->sql_query('INSERT INTO ' . BBCODES_TABLE . $db->sql_build_array('INSERT', $sql_ary)); - $cache->destroy('sql', BBCODES_TABLE); - - $lang = 'BBCODE_ADDED'; - $log_action = 'LOG_BBCODE_ADD'; - } - else - { - $sql = 'UPDATE ' . BBCODES_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE bbcode_id = ' . $bbcode_id; - $db->sql_query($sql); - $cache->destroy('sql', BBCODES_TABLE); - - $lang = 'BBCODE_EDITED'; - $log_action = 'LOG_BBCODE_EDIT'; - } - - add_log('admin', $log_action, $data['bbcode_tag']); - - trigger_error($user->lang[$lang] . adm_back_link($this->u_action)); - - break; - - case 'delete': - - $sql = 'SELECT bbcode_tag - FROM ' . BBCODES_TABLE . " - WHERE bbcode_id = $bbcode_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - if (confirm_box(true)) - { - $db->sql_query('DELETE FROM ' . BBCODES_TABLE . " WHERE bbcode_id = $bbcode_id"); - $cache->destroy('sql', BBCODES_TABLE); - add_log('admin', 'LOG_BBCODE_DELETE', $row['bbcode_tag']); - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'bbcode' => $bbcode_id, - 'i' => $id, - 'mode' => $mode, - 'action' => $action)) - ); - } - } - - break; - } - - $template->assign_vars(array( - 'U_ACTION' => $this->u_action . '&action=add') - ); - - $sql = 'SELECT * - FROM ' . BBCODES_TABLE . ' - ORDER BY bbcode_tag'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $template->assign_block_vars('bbcodes', array( - 'BBCODE_TAG' => $row['bbcode_tag'], - 'U_EDIT' => $this->u_action . '&action=edit&bbcode=' . $row['bbcode_id'], - 'U_DELETE' => $this->u_action . '&action=delete&bbcode=' . $row['bbcode_id']) - ); - } - $db->sql_freeresult($result); - } - - /* - * Build regular expression for custom bbcode - */ - function build_regexp(&$bbcode_match, &$bbcode_tpl) - { - $bbcode_match = trim($bbcode_match); - $bbcode_tpl = trim($bbcode_tpl); - - $fp_match = preg_quote($bbcode_match, '!'); - $fp_replace = preg_replace('#^\[(.*?)\]#', '[$1:$uid]', $bbcode_match); - $fp_replace = preg_replace('#\[/(.*?)\]$#', '[/$1:$uid]', $fp_replace); - - $sp_match = preg_quote($bbcode_match, '!'); - $sp_match = preg_replace('#^\\\\\[(.*?)\\\\\]#', '\[$1:$uid\]', $sp_match); - $sp_match = preg_replace('#\\\\\[/(.*?)\\\\\]$#', '\[/$1:$uid\]', $sp_match); - $sp_replace = $bbcode_tpl; - - // @todo Make sure to change this too if something changed in message parsing - $tokens = array( - 'URL' => array( - '!(?:(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('url')) . ')|(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('www_url')) . '))!ie' => "\$this->bbcode_specialchars(('\$1') ? '\$1' : 'http://\$2')" - ), - 'LOCAL_URL' => array( - '!(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('relative_url')) . ')!e' => "\$this->bbcode_specialchars('$1')" - ), - 'EMAIL' => array( - '!(' . get_preg_expression('email') . ')!ie' => "\$this->bbcode_specialchars('$1')" - ), - 'TEXT' => array( - '!(.*?)!es' => "str_replace(array(\"\\r\\n\", '\\\"', '\\'', '(', ')'), array(\"\\n\", '\"', ''', '(', ')'), trim('\$1'))" - ), - 'SIMPLETEXT' => array( - '!([a-zA-Z0-9-+.,_ ]+)!' => "$1" - ), - 'IDENTIFIER' => array( - '!([a-zA-Z0-9-_]+)!' => "$1" - ), - 'COLOR' => array( - '!([a-z]+|#[0-9abcdef]+)!i' => '$1' - ), - 'NUMBER' => array( - '!([0-9]+)!' => '$1' - ) - ); - - $sp_tokens = array( - 'URL' => '(?i)((?:' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('url')) . ')|(?:' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('www_url')) . '))(?-i)', - 'LOCAL_URL' => '(?i)(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('relative_url')) . ')(?-i)', - 'EMAIL' => '(' . get_preg_expression('email') . ')', - 'TEXT' => '(.*?)', - 'SIMPLETEXT' => '([a-zA-Z0-9-+.,_ ]+)', - 'IDENTIFIER' => '([a-zA-Z0-9-_]+)', - 'COLOR' => '([a-zA-Z]+|#[0-9abcdefABCDEF]+)', - 'NUMBER' => '([0-9]+)', - ); - - $pad = 0; - $modifiers = 'i'; - - if (preg_match_all('/\{(' . implode('|', array_keys($tokens)) . ')[0-9]*\}/i', $bbcode_match, $m)) - { - foreach ($m[0] as $n => $token) - { - $token_type = $m[1][$n]; - - reset($tokens[strtoupper($token_type)]); - list($match, $replace) = each($tokens[strtoupper($token_type)]); - - // Pad backreference numbers from tokens - if (preg_match_all('/(?lang['BBCODE_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $fp_match = preg_replace('#\[/?' . $bbcode_search . '#ie', "strtolower('\$0')", $fp_match); - $fp_replace = preg_replace('#\[/?' . $bbcode_search . '#ie', "strtolower('\$0')", $fp_replace); - $sp_match = preg_replace('#\[/?' . $bbcode_search . '#ie', "strtolower('\$0')", $sp_match); - $sp_replace = preg_replace('#\[/?' . $bbcode_search . '#ie', "strtolower('\$0')", $sp_replace); - - return array( - 'bbcode_tag' => $bbcode_tag, - 'first_pass_match' => $fp_match, - 'first_pass_replace' => $fp_replace, - 'second_pass_match' => $sp_match, - 'second_pass_replace' => $sp_replace - ); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php deleted file mode 100644 index 455719110e..0000000000 --- a/phpBB/includes/acp/acp_board.php +++ /dev/null @@ -1,813 +0,0 @@ -add_lang('acp/board'); - - $action = request_var('action', ''); - $submit = (isset($_POST['submit'])) ? true : false; - - $form_key = 'acp_board'; - add_form_key($form_key); - - /** - * Validation types are: - * string, int, bool, - * script_path (absolute path in url - beginning with / and no trailing slash), - * rpath (relative), rwpath (realtive, writable), path (relative path, but able to escape the root), wpath (writable) - */ - switch ($mode) - { - case 'settings': - $display_vars = array( - 'title' => 'ACP_BOARD_SETTINGS', - 'vars' => array( - 'legend1' => 'ACP_BOARD_SETTINGS', - 'sitename' => array('lang' => 'SITE_NAME', 'validate' => 'string', 'type' => 'text:40:255', 'explain' => false), - 'site_desc' => array('lang' => 'SITE_DESC', 'validate' => 'string', 'type' => 'text:40:255', 'explain' => false), - 'board_disable' => array('lang' => 'DISABLE_BOARD', 'validate' => 'bool', 'type' => 'custom', 'method' => 'board_disable', 'explain' => true), - 'board_disable_msg' => false, - 'default_lang' => array('lang' => 'DEFAULT_LANGUAGE', 'validate' => 'lang', 'type' => 'select', 'function' => 'language_select', 'params' => array('{CONFIG_VALUE}'), 'explain' => false), - 'default_dateformat' => array('lang' => 'DEFAULT_DATE_FORMAT', 'validate' => 'string', 'type' => 'custom', 'method' => 'dateformat_select', 'explain' => true), - 'board_timezone' => array('lang' => 'SYSTEM_TIMEZONE', 'validate' => 'string', 'type' => 'select', 'function' => 'tz_select', 'params' => array('{CONFIG_VALUE}', 1), 'explain' => false), - 'board_dst' => array('lang' => 'SYSTEM_DST', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'default_style' => array('lang' => 'DEFAULT_STYLE', 'validate' => 'int', 'type' => 'select', 'function' => 'style_select', 'params' => array('{CONFIG_VALUE}', false), 'explain' => false), - 'override_user_style' => array('lang' => 'OVERRIDE_STYLE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - - 'legend2' => 'WARNINGS', - 'warnings_expire_days' => array('lang' => 'WARNINGS_EXPIRE', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']), - ) - ); - break; - - case 'features': - $display_vars = array( - 'title' => 'ACP_BOARD_FEATURES', - 'vars' => array( - 'legend1' => 'ACP_BOARD_FEATURES', - 'allow_privmsg' => array('lang' => 'BOARD_PM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'allow_topic_notify' => array('lang' => 'ALLOW_TOPIC_NOTIFY', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_forum_notify' => array('lang' => 'ALLOW_FORUM_NOTIFY', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_namechange' => array('lang' => 'ALLOW_NAME_CHANGE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_attachments' => array('lang' => 'ALLOW_ATTACHMENTS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_pm_attach' => array('lang' => 'ALLOW_PM_ATTACHMENTS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_bbcode' => array('lang' => 'ALLOW_BBCODE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_smilies' => array('lang' => 'ALLOW_SMILIES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_sig' => array('lang' => 'ALLOW_SIG', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_nocensors' => array('lang' => 'ALLOW_NO_CENSORS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'allow_bookmarks' => array('lang' => 'ALLOW_BOOKMARKS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'allow_birthdays' => array('lang' => 'ALLOW_BIRTHDAYS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - - 'legend2' => 'ACP_LOAD_SETTINGS', - 'load_birthdays' => array('lang' => 'YES_BIRTHDAYS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'load_moderators' => array('lang' => 'YES_MODERATORS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'load_jumpbox' => array('lang' => 'YES_JUMPBOX', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'load_cpf_memberlist' => array('lang' => 'LOAD_CPF_MEMBERLIST', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'load_cpf_viewprofile' => array('lang' => 'LOAD_CPF_VIEWPROFILE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'load_cpf_viewtopic' => array('lang' => 'LOAD_CPF_VIEWTOPIC', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - ) - ); - break; - - case 'avatar': - $display_vars = array( - 'title' => 'ACP_AVATAR_SETTINGS', - 'vars' => array( - 'legend1' => 'ACP_AVATAR_SETTINGS', - 'avatar_min_height' => false, 'avatar_min_width' => false, 'avatar_max_height' => false, 'avatar_max_width' => false, - - 'allow_avatar_local' => array('lang' => 'ALLOW_LOCAL', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_avatar_remote' => array('lang' => 'ALLOW_REMOTE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'allow_avatar_upload' => array('lang' => 'ALLOW_UPLOAD', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'avatar_filesize' => array('lang' => 'MAX_FILESIZE', 'validate' => 'int', 'type' => 'text:4:10', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']), - 'avatar_min' => array('lang' => 'MIN_AVATAR_SIZE', 'validate' => 'int', 'type' => 'dimension:3:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), - 'avatar_max' => array('lang' => 'MAX_AVATAR_SIZE', 'validate' => 'int', 'type' => 'dimension:3:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), - 'avatar_path' => array('lang' => 'AVATAR_STORAGE_PATH', 'validate' => 'rwpath', 'type' => 'text:20:255', 'explain' => true), - 'avatar_gallery_path' => array('lang' => 'AVATAR_GALLERY_PATH', 'validate' => 'rpath', 'type' => 'text:20:255', 'explain' => true) - ) - ); - break; - - case 'message': - $display_vars = array( - 'title' => 'ACP_MESSAGE_SETTINGS', - 'lang' => 'ucp', - 'vars' => array( - 'legend1' => 'GENERAL_SETTINGS', - 'allow_privmsg' => array('lang' => 'BOARD_PM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'pm_max_boxes' => array('lang' => 'BOXES_MAX', 'validate' => 'int', 'type' => 'text:4:4', 'explain' => true), - 'pm_max_msgs' => array('lang' => 'BOXES_LIMIT', 'validate' => 'int', 'type' => 'text:4:4', 'explain' => true), - 'full_folder_action' => array('lang' => 'FULL_FOLDER_ACTION', 'validate' => 'int', 'type' => 'select', 'method' => 'full_folder_select', 'explain' => true), - 'pm_edit_time' => array('lang' => 'PM_EDIT_TIME', 'validate' => 'int', 'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']), - - 'legend2' => 'GENERAL_OPTIONS', - 'allow_mass_pm' => array('lang' => 'ALLOW_MASS_PM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'auth_bbcode_pm' => array('lang' => 'ALLOW_BBCODE_PM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'auth_smilies_pm' => array('lang' => 'ALLOW_SMILIES_PM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_pm_attach' => array('lang' => 'ALLOW_PM_ATTACHMENTS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_sig_pm' => array('lang' => 'ALLOW_SIG_PM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'print_pm' => array('lang' => 'ALLOW_PRINT_PM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'forward_pm' => array('lang' => 'ALLOW_FORWARD_PM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'auth_img_pm' => array('lang' => 'ALLOW_IMG_PM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'auth_flash_pm' => array('lang' => 'ALLOW_FLASH_PM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'enable_pm_icons' => array('lang' => 'ENABLE_PM_ICONS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false) - ) - ); - break; - - case 'post': - $display_vars = array( - 'title' => 'ACP_POST_SETTINGS', - 'vars' => array( - 'legend1' => 'GENERAL_OPTIONS', - 'allow_topic_notify' => array('lang' => 'ALLOW_TOPIC_NOTIFY', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_forum_notify' => array('lang' => 'ALLOW_FORUM_NOTIFY', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_bbcode' => array('lang' => 'ALLOW_BBCODE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_post_flash' => array('lang' => 'ALLOW_POST_FLASH', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'allow_smilies' => array('lang' => 'ALLOW_SMILIES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_post_links' => array('lang' => 'ALLOW_POST_LINKS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'allow_nocensors' => array('lang' => 'ALLOW_NO_CENSORS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'allow_bookmarks' => array('lang' => 'ALLOW_BOOKMARKS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'enable_post_confirm' => array('lang' => 'VISUAL_CONFIRM_POST', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - - 'legend2' => 'POSTING', - 'bump_type' => false, - 'edit_time' => array('lang' => 'EDIT_TIME', 'validate' => 'int', 'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']), - 'display_last_edited' => array('lang' => 'DISPLAY_LAST_EDITED', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'flood_interval' => array('lang' => 'FLOOD_INTERVAL', 'validate' => 'int', 'type' => 'text:3:10', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']), - 'bump_interval' => array('lang' => 'BUMP_INTERVAL', 'validate' => 'int', 'type' => 'custom', 'method' => 'bump_interval', 'explain' => true), - 'topics_per_page' => array('lang' => 'TOPICS_PER_PAGE', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => false), - 'posts_per_page' => array('lang' => 'POSTS_PER_PAGE', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => false), - 'hot_threshold' => array('lang' => 'HOT_THRESHOLD', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => true), - 'max_poll_options' => array('lang' => 'MAX_POLL_OPTIONS', 'validate' => 'int', 'type' => 'text:4:4', 'explain' => false), - 'max_post_chars' => array('lang' => 'CHAR_LIMIT', 'validate' => 'int', 'type' => 'text:4:6', 'explain' => true), - 'max_post_smilies' => array('lang' => 'SMILIES_LIMIT', 'validate' => 'int', 'type' => 'text:4:4', 'explain' => true), - 'max_post_urls' => array('lang' => 'MAX_POST_URLS', 'validate' => 'int', 'type' => 'text:5:4', 'explain' => true), - 'max_post_font_size' => array('lang' => 'MAX_POST_FONT_SIZE', 'validate' => 'int', 'type' => 'text:5:4', 'explain' => true, 'append' => ' %'), - 'max_quote_depth' => array('lang' => 'QUOTE_DEPTH_LIMIT', 'validate' => 'int', 'type' => 'text:4:4', 'explain' => true), - 'max_post_img_width' => array('lang' => 'MAX_POST_IMG_WIDTH', 'validate' => 'int', 'type' => 'text:5:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), - 'max_post_img_height' => array('lang' => 'MAX_POST_IMG_HEIGHT', 'validate' => 'int', 'type' => 'text:5:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), - ) - ); - break; - - case 'signature': - $display_vars = array( - 'title' => 'ACP_SIGNATURE_SETTINGS', - 'vars' => array( - 'legend1' => 'GENERAL_OPTIONS', - 'allow_sig' => array('lang' => 'ALLOW_SIG', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_sig_bbcode' => array('lang' => 'ALLOW_SIG_BBCODE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_sig_img' => array('lang' => 'ALLOW_SIG_IMG', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_sig_flash' => array('lang' => 'ALLOW_SIG_FLASH', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_sig_smilies' => array('lang' => 'ALLOW_SIG_SMILIES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_sig_links' => array('lang' => 'ALLOW_SIG_LINKS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - - 'legend2' => 'GENERAL_SETTINGS', - 'max_sig_chars' => array('lang' => 'MAX_SIG_LENGTH', 'validate' => 'int', 'type' => 'text:5:4', 'explain' => true), - 'max_sig_urls' => array('lang' => 'MAX_SIG_URLS', 'validate' => 'int', 'type' => 'text:5:4', 'explain' => true), - 'max_sig_font_size' => array('lang' => 'MAX_SIG_FONT_SIZE', 'validate' => 'int', 'type' => 'text:5:4', 'explain' => true, 'append' => ' %'), - 'max_sig_smilies' => array('lang' => 'MAX_SIG_SMILIES', 'validate' => 'int', 'type' => 'text:5:4', 'explain' => true), - 'max_sig_img_width' => array('lang' => 'MAX_SIG_IMG_WIDTH', 'validate' => 'int', 'type' => 'text:5:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), - 'max_sig_img_height' => array('lang' => 'MAX_SIG_IMG_HEIGHT', 'validate' => 'int', 'type' => 'text:5:4', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), - ) - ); - break; - - case 'registration': - $display_vars = array( - 'title' => 'ACP_REGISTER_SETTINGS', - 'vars' => array( - 'legend1' => 'GENERAL_SETTINGS', - 'max_name_chars' => false, - 'max_pass_chars' => false, - - 'require_activation' => array('lang' => 'ACC_ACTIVATION', 'validate' => 'int', 'type' => 'custom', 'method' => 'select_acc_activation', 'explain' => true), - 'min_name_chars' => array('lang' => 'USERNAME_LENGTH', 'validate' => 'int', 'type' => 'custom', 'method' => 'username_length', 'explain' => true), - 'min_pass_chars' => array('lang' => 'PASSWORD_LENGTH', 'validate' => 'int', 'type' => 'custom', 'method' => 'password_length', 'explain' => true), - 'allow_name_chars' => array('lang' => 'USERNAME_CHARS', 'validate' => 'string', 'type' => 'select', 'method' => 'select_username_chars', 'explain' => true), - 'pass_complex' => array('lang' => 'PASSWORD_TYPE', 'validate' => 'string', 'type' => 'select', 'method' => 'select_password_chars', 'explain' => true), - 'chg_passforce' => array('lang' => 'FORCE_PASS_CHANGE', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']), - - 'legend2' => 'GENERAL_OPTIONS', - 'allow_namechange' => array('lang' => 'ALLOW_NAME_CHANGE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'allow_emailreuse' => array('lang' => 'ALLOW_EMAIL_REUSE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'enable_confirm' => array('lang' => 'VISUAL_CONFIRM_REG', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'max_login_attempts' => array('lang' => 'MAX_LOGIN_ATTEMPTS', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true), - 'max_reg_attempts' => array('lang' => 'REG_LIMIT', 'validate' => 'int', 'type' => 'text:4:4', 'explain' => true), - 'min_time_reg' => array('lang' => 'MIN_TIME_REG', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']), - 'min_time_terms' => array('lang' => 'MIN_TIME_TERMS', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']), - - 'legend3' => 'COPPA', - 'coppa_enable' => array('lang' => 'ENABLE_COPPA', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'coppa_mail' => array('lang' => 'COPPA_MAIL', 'validate' => 'string', 'type' => 'textarea:5:40', 'explain' => true), - 'coppa_fax' => array('lang' => 'COPPA_FAX', 'validate' => 'string', 'type' => 'text:25:100', 'explain' => false), - ) - ); - break; - - case 'cookie': - $display_vars = array( - 'title' => 'ACP_COOKIE_SETTINGS', - 'vars' => array( - 'legend1' => 'ACP_COOKIE_SETTINGS', - 'cookie_domain' => array('lang' => 'COOKIE_DOMAIN', 'validate' => 'string', 'type' => 'text::255', 'explain' => false), - 'cookie_name' => array('lang' => 'COOKIE_NAME', 'validate' => 'string', 'type' => 'text::16', 'explain' => false), - 'cookie_path' => array('lang' => 'COOKIE_PATH', 'validate' => 'string', 'type' => 'text::255', 'explain' => false), - 'cookie_secure' => array('lang' => 'COOKIE_SECURE', 'validate' => 'bool', 'type' => 'radio:disabled_enabled', 'explain' => true) - ) - ); - break; - - case 'load': - $display_vars = array( - 'title' => 'ACP_LOAD_SETTINGS', - 'vars' => array( - 'legend1' => 'GENERAL_SETTINGS', - 'limit_load' => array('lang' => 'LIMIT_LOAD', 'validate' => 'string', 'type' => 'text:4:4', 'explain' => true), - 'session_length' => array('lang' => 'SESSION_LENGTH', 'validate' => 'int', 'type' => 'text:5:10', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']), - 'active_sessions' => array('lang' => 'LIMIT_SESSIONS', 'validate' => 'int', 'type' => 'text:4:4', 'explain' => true), - 'load_online_time' => array('lang' => 'ONLINE_LENGTH', 'validate' => 'int', 'type' => 'text:4:3', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']), - - 'legend2' => 'GENERAL_OPTIONS', - 'load_db_track' => array('lang' => 'YES_POST_MARKING', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'load_db_lastread' => array('lang' => 'YES_READ_MARKING', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'load_anon_lastread' => array('lang' => 'YES_ANON_READ_MARKING', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'load_online' => array('lang' => 'YES_ONLINE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'load_online_guests' => array('lang' => 'YES_ONLINE_GUESTS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'load_onlinetrack' => array('lang' => 'YES_ONLINE_TRACK', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'load_birthdays' => array('lang' => 'YES_BIRTHDAYS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'load_moderators' => array('lang' => 'YES_MODERATORS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'load_jumpbox' => array('lang' => 'YES_JUMPBOX', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'load_user_activity' => array('lang' => 'LOAD_USER_ACTIVITY', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'load_tplcompile' => array('lang' => 'RECOMPILE_STYLES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - - 'legend3' => 'CUSTOM_PROFILE_FIELDS', - 'load_cpf_memberlist' => array('lang' => 'LOAD_CPF_MEMBERLIST', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'load_cpf_viewprofile' => array('lang' => 'LOAD_CPF_VIEWPROFILE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'load_cpf_viewtopic' => array('lang' => 'LOAD_CPF_VIEWTOPIC', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - ) - ); - break; - - case 'auth': - $display_vars = array( - 'title' => 'ACP_AUTH_SETTINGS', - 'vars' => array( - 'legend1' => 'ACP_AUTH_SETTINGS', - 'auth_method' => array('lang' => 'AUTH_METHOD', 'validate' => 'string', 'type' => 'select', 'method' => 'select_auth_method', 'explain' => false) - ) - ); - break; - - case 'server': - $display_vars = array( - 'title' => 'ACP_SERVER_SETTINGS', - 'vars' => array( - 'legend1' => 'ACP_SERVER_SETTINGS', - 'gzip_compress' => array('lang' => 'ENABLE_GZIP', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - - 'legend2' => 'PATH_SETTINGS', - 'smilies_path' => array('lang' => 'SMILIES_PATH', 'validate' => 'rpath', 'type' => 'text:20:255', 'explain' => true), - 'icons_path' => array('lang' => 'ICONS_PATH', 'validate' => 'rpath', 'type' => 'text:20:255', 'explain' => true), - 'upload_icons_path' => array('lang' => 'UPLOAD_ICONS_PATH', 'validate' => 'rpath', 'type' => 'text:20:255', 'explain' => true), - 'ranks_path' => array('lang' => 'RANKS_PATH', 'validate' => 'rpath', 'type' => 'text:20:255', 'explain' => true), - - 'legend3' => 'SERVER_URL_SETTINGS', - 'force_server_vars' => array('lang' => 'FORCE_SERVER_VARS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'server_protocol' => array('lang' => 'SERVER_PROTOCOL', 'validate' => 'string', 'type' => 'text:10:10', 'explain' => true), - 'server_name' => array('lang' => 'SERVER_NAME', 'validate' => 'string', 'type' => 'text:40:255', 'explain' => true), - 'server_port' => array('lang' => 'SERVER_PORT', 'validate' => 'int', 'type' => 'text:5:5', 'explain' => true), - 'script_path' => array('lang' => 'SCRIPT_PATH', 'validate' => 'script_path', 'type' => 'text::255', 'explain' => true), - ) - ); - break; - - case 'security': - $display_vars = array( - 'title' => 'ACP_SECURITY_SETTINGS', - 'vars' => array( - 'legend1' => 'ACP_SECURITY_SETTINGS', - 'allow_autologin' => array('lang' => 'ALLOW_AUTOLOGIN', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'max_autologin_time' => array('lang' => 'AUTOLOGIN_LENGTH', 'validate' => 'int', 'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']), - 'ip_check' => array('lang' => 'IP_VALID', 'validate' => 'int', 'type' => 'custom', 'method' => 'select_ip_check', 'explain' => true), - 'browser_check' => array('lang' => 'BROWSER_VALID', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'forwarded_for_check' => array('lang' => 'FORWARDED_FOR_VALID', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'check_dnsbl' => array('lang' => 'CHECK_DNSBL', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'email_check_mx' => array('lang' => 'EMAIL_CHECK_MX', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'pass_complex' => array('lang' => 'PASSWORD_TYPE', 'validate' => 'string', 'type' => 'select', 'method' => 'select_password_chars', 'explain' => true), - 'chg_passforce' => array('lang' => 'FORCE_PASS_CHANGE', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . $user->lang['DAYS']), - 'max_login_attempts' => array('lang' => 'MAX_LOGIN_ATTEMPTS', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true), - 'tpl_allow_php' => array('lang' => 'TPL_ALLOW_PHP', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'form_token_lifetime' => array('lang' => 'FORM_TIME_MAX', 'validate' => 'int', 'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']), - 'form_token_mintime' => array('lang' => 'FORM_TIME_MIN', 'validate' => 'int', 'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']), - 'form_token_sid_guests' => array('lang' => 'FORM_SID_GUESTS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - - ) - ); - break; - - case 'email': - $display_vars = array( - 'title' => 'ACP_EMAIL_SETTINGS', - 'vars' => array( - 'legend1' => 'GENERAL_SETTINGS', - 'email_enable' => array('lang' => 'ENABLE_EMAIL', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true), - 'board_email_form' => array('lang' => 'BOARD_EMAIL_FORM', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true), - 'email_function_name' => array('lang' => 'EMAIL_FUNCTION_NAME', 'validate' => 'string', 'type' => 'text:20:50', 'explain' => true), - 'email_package_size' => array('lang' => 'EMAIL_PACKAGE_SIZE', 'validate' => 'int', 'type' => 'text:5:5', 'explain' => true), - 'board_contact' => array('lang' => 'CONTACT_EMAIL', 'validate' => 'string', 'type' => 'text:25:100', 'explain' => true), - 'board_email' => array('lang' => 'ADMIN_EMAIL', 'validate' => 'string', 'type' => 'text:25:100', 'explain' => true), - 'board_email_sig' => array('lang' => 'EMAIL_SIG', 'validate' => 'string', 'type' => 'textarea:5:30', 'explain' => true), - 'board_hide_emails' => array('lang' => 'BOARD_HIDE_EMAILS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - - 'legend2' => 'SMTP_SETTINGS', - 'smtp_delivery' => array('lang' => 'USE_SMTP', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'smtp_host' => array('lang' => 'SMTP_SERVER', 'validate' => 'string', 'type' => 'text:25:50', 'explain' => false), - 'smtp_port' => array('lang' => 'SMTP_PORT', 'validate' => 'int', 'type' => 'text:4:5', 'explain' => true), - 'smtp_auth_method' => array('lang' => 'SMTP_AUTH_METHOD', 'validate' => 'string', 'type' => 'select', 'method' => 'mail_auth_select', 'explain' => true), - 'smtp_username' => array('lang' => 'SMTP_USERNAME', 'validate' => 'string', 'type' => 'text:25:255', 'explain' => true), - 'smtp_password' => array('lang' => 'SMTP_PASSWORD', 'validate' => 'string', 'type' => 'password:25:255', 'explain' => true) - ) - ); - break; - - default: - trigger_error('NO_MODE', E_USER_ERROR); - break; - } - - if (isset($display_vars['lang'])) - { - $user->add_lang($display_vars['lang']); - } - - $this->new_config = $config; - $cfg_array = (isset($_REQUEST['config'])) ? utf8_normalize_nfc(request_var('config', array('' => ''), true)) : $this->new_config; - $error = array(); - - // We validate the complete config if whished - validate_config_vars($display_vars['vars'], $cfg_array, $error); - - if ($submit && !check_form_key($form_key)) - { - $error[] = $user->lang['FORM_INVALID']; - } - // Do not write values if there is an error - if (sizeof($error)) - { - $submit = false; - } - - // We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to... - foreach ($display_vars['vars'] as $config_name => $null) - { - if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false) - { - continue; - } - - if ($config_name == 'auth_method') - { - continue; - } - - $this->new_config[$config_name] = $config_value = $cfg_array[$config_name]; - - if ($config_name == 'email_function_name') - { - $this->new_config['email_function_name'] = trim(str_replace(array('(', ')'), array('', ''), $this->new_config['email_function_name'])); - $this->new_config['email_function_name'] = (empty($this->new_config['email_function_name']) || !function_exists($this->new_config['email_function_name'])) ? 'mail' : $this->new_config['email_function_name']; - $config_value = $this->new_config['email_function_name']; - } - - if ($submit) - { - set_config($config_name, $config_value); - } - } - - if ($mode == 'auth') - { - // Retrieve a list of auth plugins and check their config values - $auth_plugins = array(); - - $dp = @opendir($phpbb_root_path . 'includes/auth'); - - if ($dp) - { - while (($file = readdir($dp)) !== false) - { - if (preg_match('#^auth_(.*?)\.' . $phpEx . '$#', $file)) - { - $auth_plugins[] = basename(preg_replace('#^auth_(.*?)\.' . $phpEx . '$#', '\1', $file)); - } - } - closedir($dp); - - sort($auth_plugins); - } - - $updated_auth_settings = false; - $old_auth_config = array(); - foreach ($auth_plugins as $method) - { - if ($method && file_exists($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx)) - { - include_once($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx); - - $method = 'acp_' . $method; - if (function_exists($method)) - { - if ($fields = $method($this->new_config)) - { - // Check if we need to create config fields for this plugin and save config when submit was pressed - foreach ($fields['config'] as $field) - { - if (!isset($config[$field])) - { - set_config($field, ''); - } - - if (!isset($cfg_array[$field]) || strpos($field, 'legend') !== false) - { - continue; - } - - $old_auth_config[$field] = $this->new_config[$field]; - $config_value = $cfg_array[$field]; - $this->new_config[$field] = $config_value; - - if ($submit) - { - $updated_auth_settings = true; - set_config($field, $config_value); - } - } - } - unset($fields); - } - } - } - - if ($submit && (($cfg_array['auth_method'] != $this->new_config['auth_method']) || $updated_auth_settings)) - { - $method = basename($cfg_array['auth_method']); - if ($method && in_array($method, $auth_plugins)) - { - include_once($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx); - - $method = 'init_' . $method; - if (function_exists($method)) - { - if ($error = $method()) - { - foreach ($old_auth_config as $config_name => $config_value) - { - set_config($config_name, $config_value); - } - trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING); - } - } - set_config('auth_method', basename($cfg_array['auth_method'])); - } - else - { - trigger_error('NO_AUTH_PLUGIN', E_USER_ERROR); - } - } - } - - if ($submit) - { - add_log('admin', 'LOG_CONFIG_' . strtoupper($mode)); - - trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action)); - } - - $this->tpl_name = 'acp_board'; - $this->page_title = $display_vars['title']; - - $template->assign_vars(array( - 'L_TITLE' => $user->lang[$display_vars['title']], - 'L_TITLE_EXPLAIN' => $user->lang[$display_vars['title'] . '_EXPLAIN'], - - 'S_ERROR' => (sizeof($error)) ? true : false, - 'ERROR_MSG' => implode('
    ', $error), - - 'U_ACTION' => $this->u_action) - ); - - // Output relevant page - foreach ($display_vars['vars'] as $config_key => $vars) - { - if (!is_array($vars) && strpos($config_key, 'legend') === false) - { - continue; - } - - if (strpos($config_key, 'legend') !== false) - { - $template->assign_block_vars('options', array( - 'S_LEGEND' => true, - 'LEGEND' => (isset($user->lang[$vars])) ? $user->lang[$vars] : $vars) - ); - - continue; - } - - $type = explode(':', $vars['type']); - - $l_explain = ''; - if ($vars['explain'] && isset($vars['lang_explain'])) - { - $l_explain = (isset($user->lang[$vars['lang_explain']])) ? $user->lang[$vars['lang_explain']] : $vars['lang_explain']; - } - else if ($vars['explain']) - { - $l_explain = (isset($user->lang[$vars['lang'] . '_EXPLAIN'])) ? $user->lang[$vars['lang'] . '_EXPLAIN'] : ''; - } - - $template->assign_block_vars('options', array( - 'KEY' => $config_key, - 'TITLE' => (isset($user->lang[$vars['lang']])) ? $user->lang[$vars['lang']] : $vars['lang'], - 'S_EXPLAIN' => $vars['explain'], - 'TITLE_EXPLAIN' => $l_explain, - 'CONTENT' => build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars), - ) - ); - - unset($display_vars['vars'][$config_key]); - } - - if ($mode == 'auth') - { - $template->assign_var('S_AUTH', true); - - foreach ($auth_plugins as $method) - { - if ($method && file_exists($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx)) - { - $method = 'acp_' . $method; - if (function_exists($method)) - { - $fields = $method($this->new_config); - - if ($fields['tpl']) - { - $template->assign_block_vars('auth_tpl', array( - 'TPL' => $fields['tpl']) - ); - } - unset($fields); - } - } - } - } - } - - /** - * Select auth method - */ - function select_auth_method($selected_method, $key = '') - { - global $phpbb_root_path, $phpEx; - - $auth_plugins = array(); - - $dp = @opendir($phpbb_root_path . 'includes/auth'); - - if (!$dp) - { - return ''; - } - - while (($file = readdir($dp)) !== false) - { - if (preg_match('#^auth_(.*?)\.' . $phpEx . '$#', $file)) - { - $auth_plugins[] = preg_replace('#^auth_(.*?)\.' . $phpEx . '$#', '\1', $file); - } - } - closedir($dp); - - sort($auth_plugins); - - $auth_select = ''; - foreach ($auth_plugins as $method) - { - $selected = ($selected_method == $method) ? ' selected="selected"' : ''; - $auth_select .= ''; - } - - return $auth_select; - } - - /** - * Select mail authentication method - */ - function mail_auth_select($selected_method, $key = '') - { - global $user; - - $auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5', 'POP-BEFORE-SMTP'); - $s_smtp_auth_options = ''; - - foreach ($auth_methods as $method) - { - $s_smtp_auth_options .= ''; - } - - return $s_smtp_auth_options; - } - - /** - * Select full folder action - */ - function full_folder_select($value, $key = '') - { - global $user; - - return ''; - } - - /** - * Select ip validation - */ - function select_ip_check($value, $key = '') - { - $radio_ary = array(4 => 'ALL', 3 => 'CLASS_C', 2 => 'CLASS_B', 0 => 'NO_IP_VALIDATION'); - - return h_radio('config[ip_check]', $radio_ary, $value, $key); - } - - /** - * Select account activation method - */ - function select_acc_activation($value, $key = '') - { - global $user, $config; - - $radio_ary = array(USER_ACTIVATION_DISABLE => 'ACC_DISABLE', USER_ACTIVATION_NONE => 'ACC_NONE'); - if ($config['email_enable']) - { - $radio_ary += array(USER_ACTIVATION_SELF => 'ACC_USER', USER_ACTIVATION_ADMIN => 'ACC_ADMIN'); - } - - return h_radio('config[require_activation]', $radio_ary, $value, $key); - } - - /** - * Maximum/Minimum username length - */ - function username_length($value, $key = '') - { - global $user; - - return ' ' . $user->lang['MIN_CHARS'] . '   ' . $user->lang['MAX_CHARS']; - } - - /** - * Allowed chars in usernames - */ - function select_username_chars($selected_value, $key) - { - global $user; - - $user_char_ary = array('USERNAME_CHARS_ANY', 'USERNAME_ALPHA_ONLY', 'USERNAME_ALPHA_SPACERS', 'USERNAME_LETTER_NUM', 'USERNAME_LETTER_NUM_SPACERS', 'USERNAME_ASCII'); - $user_char_options = ''; - foreach ($user_char_ary as $user_type) - { - $selected = ($selected_value == $user_type) ? ' selected="selected"' : ''; - $user_char_options .= ''; - } - - return $user_char_options; - } - - /** - * Maximum/Minimum password length - */ - function password_length($value, $key) - { - global $user; - - return ' ' . $user->lang['MIN_CHARS'] . '   ' . $user->lang['MAX_CHARS']; - } - - /** - * Required chars in passwords - */ - function select_password_chars($selected_value, $key) - { - global $user; - - $pass_type_ary = array('PASS_TYPE_ANY', 'PASS_TYPE_CASE', 'PASS_TYPE_ALPHA', 'PASS_TYPE_SYMBOL'); - $pass_char_options = ''; - foreach ($pass_type_ary as $pass_type) - { - $selected = ($selected_value == $pass_type) ? ' selected="selected"' : ''; - $pass_char_options .= ''; - } - - return $pass_char_options; - } - - /** - * Select bump interval - */ - function bump_interval($value, $key) - { - global $user; - - $s_bump_type = ''; - $types = array('m' => 'MINUTES', 'h' => 'HOURS', 'd' => 'DAYS'); - foreach ($types as $type => $lang) - { - $selected = ($this->new_config['bump_type'] == $type) ? ' selected="selected"' : ''; - $s_bump_type .= ''; - } - - return ' '; - } - - /** - * Board disable option and message - */ - function board_disable($value, $key) - { - global $user; - - $radio_ary = array(1 => 'YES', 0 => 'NO'); - - return h_radio('config[board_disable]', $radio_ary, $value) . '
    '; - } - - /** - * Select default dateformat - */ - function dateformat_select($value, $key) - { - global $user, $config; - - // Let the format_date function operate with the acp values - $old_tz = $user->timezone; - $old_dst = $user->dst; - - $user->timezone = $config['board_timezone']; - $user->dst = $config['board_dst']; - - $dateformat_options = ''; - - foreach ($user->lang['dateformats'] as $format => $null) - { - $dateformat_options .= ''; - } - - $dateformat_options .= ''; - - // Reset users date options - $user->timezone = $old_tz; - $user->dst = $old_dst; - - return " - "; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_bots.php b/phpBB/includes/acp/acp_bots.php deleted file mode 100644 index 81ac239358..0000000000 --- a/phpBB/includes/acp/acp_bots.php +++ /dev/null @@ -1,418 +0,0 @@ -add_lang('acp/bots'); - $this->tpl_name = 'acp_bots'; - $this->page_title = 'ACP_BOTS'; - $form_key = 'acp_bots'; - add_form_key($form_key); - - if ($submit && !check_form_key($form_key)) - { - $error[] = $user->lang['FORM_INVALID']; - } - - // User wants to do something, how inconsiderate of them! - switch ($action) - { - case 'activate': - if ($bot_id || sizeof($mark)) - { - $sql_id = ($bot_id) ? " = $bot_id" : ' IN (' . implode(', ', $mark) . ')'; - - $sql = 'UPDATE ' . BOTS_TABLE . " - SET bot_active = 1 - WHERE bot_id $sql_id"; - $db->sql_query($sql); - } - - $cache->destroy('_bots'); - break; - - case 'deactivate': - if ($bot_id || sizeof($mark)) - { - $sql_id = ($bot_id) ? " = $bot_id" : ' IN (' . implode(', ', $mark) . ')'; - - $sql = 'UPDATE ' . BOTS_TABLE . " - SET bot_active = 0 - WHERE bot_id $sql_id"; - $db->sql_query($sql); - } - - $cache->destroy('_bots'); - break; - - case 'delete': - if ($bot_id || sizeof($mark)) - { - if (confirm_box(true)) - { - // We need to delete the relevant user, usergroup and bot entries ... - $sql_id = ($bot_id) ? " = $bot_id" : ' IN (' . implode(', ', $mark) . ')'; - - $sql = 'SELECT bot_name, user_id - FROM ' . BOTS_TABLE . " - WHERE bot_id $sql_id"; - $result = $db->sql_query($sql); - - $user_id_ary = $bot_name_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - $user_id_ary[] = (int) $row['user_id']; - $bot_name_ary[] = $row['bot_name']; - } - $db->sql_freeresult($result); - - $db->sql_transaction('begin'); - - $sql = 'DELETE FROM ' . BOTS_TABLE . " - WHERE bot_id $sql_id"; - $db->sql_query($sql); - - if (sizeof($user_id_ary)) - { - $_tables = array(USERS_TABLE, USER_GROUP_TABLE); - foreach ($_tables as $table) - { - $sql = "DELETE FROM $table - WHERE " . $db->sql_in_set('user_id', $user_id_ary); - $db->sql_query($sql); - } - } - - $db->sql_transaction('commit'); - - $cache->destroy('_bots'); - - add_log('admin', 'LOG_BOT_DELETE', implode(', ', $bot_name_ary)); - trigger_error($user->lang['BOT_DELETED'] . adm_back_link($this->u_action)); - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'mark' => $mark, - 'id' => $bot_id, - 'mode' => $mode, - 'action' => $action)) - ); - } - } - break; - - case 'edit': - case 'add': - include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx); - - $bot_row = array( - 'bot_name' => utf8_normalize_nfc(request_var('bot_name', '', true)), - 'bot_agent' => request_var('bot_agent', ''), - 'bot_ip' => request_var('bot_ip', ''), - 'bot_active' => request_var('bot_active', true), - 'bot_lang' => request_var('bot_lang', $config['default_lang']), - 'bot_style' => request_var('bot_style' , $config['default_style']), - ); - - if ($submit) - { - if (!$bot_row['bot_agent'] && !$bot_row['bot_ip']) - { - $error[] = $user->lang['ERR_BOT_NO_MATCHES']; - } - - if ($bot_row['bot_ip'] && !preg_match('#^[\d\.,:]+$#', $bot_row['bot_ip'])) - { - if (!$ip_list = gethostbynamel($bot_row['bot_ip'])) - { - $error[] = $user->lang['ERR_BOT_NO_IP']; - } - else - { - $bot_row['bot_ip'] = implode(',', $ip_list); - } - } - $bot_row['bot_ip'] = str_replace(' ', '', $bot_row['bot_ip']); - - // Make sure the admin is not adding a bot with an user agent similar to his one - if ($bot_row['bot_agent'] && substr($user->data['session_browser'], 0, 149) === substr($bot_row['bot_agent'], 0, 149)) - { - $error[] = $user->lang['ERR_BOT_AGENT_MATCHES_UA']; - } - - $bot_name = false; - if ($bot_id) - { - $sql = 'SELECT u.username_clean - FROM ' . BOTS_TABLE . ' b, ' . USERS_TABLE . " u - WHERE b.bot_id = $bot_id - AND u.user_id = b.user_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$bot_row) - { - $error[] = $user->lang['NO_BOT']; - } - else - { - $bot_name = $row['username_clean']; - } - } - if (!$this->validate_botname($bot_row['bot_name'], $bot_name)) - { - $error[] = $user->lang['BOT_NAME_TAKEN']; - } - - if (!sizeof($error)) - { - // New bot? Create a new user and group entry - if ($action == 'add') - { - $sql = 'SELECT group_id, group_colour - FROM ' . GROUPS_TABLE . " - WHERE group_name_clean = 'bots' - AND group_type = " . GROUP_SPECIAL; - $result = $db->sql_query($sql); - $group_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$group_row) - { - trigger_error($user->lang['NO_BOT_GROUP'] . adm_back_link($this->u_action . "&id=$bot_id&action=$action"), E_USER_WARNING); - } - - - $user_id = user_add(array( - 'user_type' => (int) USER_IGNORE, - 'group_id' => (int) $group_row['group_id'], - 'username' => (string) $bot_row['bot_name'], - 'user_regdate' => time(), - 'user_password' => '', - 'user_colour' => (string) $group_row['group_colour'], - 'user_email' => '', - 'user_lang' => (string) $bot_row['bot_lang'], - 'user_style' => (int) $bot_row['bot_style'], - 'user_allow_massemail' => 0, - )); - - $sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'user_id' => (int) $user_id, - 'bot_name' => (string) $bot_row['bot_name'], - 'bot_active' => (int) $bot_row['bot_active'], - 'bot_agent' => (string) $bot_row['bot_agent'], - 'bot_ip' => (string) $bot_row['bot_ip']) - ); - $db->sql_query($sql); - - $log = 'ADDED'; - } - else if ($bot_id) - { - $sql = 'SELECT user_id, bot_name - FROM ' . BOTS_TABLE . " - WHERE bot_id = $bot_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error($user->lang['NO_BOT'] . adm_back_link($this->u_action . "&id=$bot_id&action=$action"), E_USER_WARNING); - } - - $sql_ary = array( - 'user_style' => (int) $bot_row['bot_style'], - 'user_lang' => (string) $bot_row['bot_lang'], - ); - - if ($bot_row['bot_name'] !== $row['bot_name']) - { - $sql_ary['username'] = (string) $bot_row['bot_name']; - $sql_ary['username_clean'] = (string) utf8_clean_string($bot_row['bot_name']); - } - - $sql = 'UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " WHERE user_id = {$row['user_id']}"; - $db->sql_query($sql); - - $sql = 'UPDATE ' . BOTS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array( - 'bot_name' => (string) $bot_row['bot_name'], - 'bot_active' => (int) $bot_row['bot_active'], - 'bot_agent' => (string) $bot_row['bot_agent'], - 'bot_ip' => (string) $bot_row['bot_ip']) - ) . " WHERE bot_id = $bot_id"; - $db->sql_query($sql); - - // Updated username? - if ($bot_row['bot_name'] !== $row['bot_name']) - { - user_update_name($row['bot_name'], $bot_row['bot_name']); - } - - $log = 'UPDATED'; - } - - $cache->destroy('_bots'); - - add_log('admin', 'LOG_BOT_' . $log, $bot_row['bot_name']); - trigger_error($user->lang['BOT_' . $log] . adm_back_link($this->u_action)); - - } - } - else if ($bot_id) - { - $sql = 'SELECT b.*, u.user_lang, u.user_style - FROM ' . BOTS_TABLE . ' b, ' . USERS_TABLE . " u - WHERE b.bot_id = $bot_id - AND u.user_id = b.user_id"; - $result = $db->sql_query($sql); - $bot_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$bot_row) - { - trigger_error($user->lang['NO_BOT'] . adm_back_link($this->u_action . "&id=$bot_id&action=$action"), E_USER_WARNING); - } - - $bot_row['bot_lang'] = $bot_row['user_lang']; - $bot_row['bot_style'] = $bot_row['user_style']; - unset($bot_row['user_lang'], $bot_row['user_style']); - } - - $s_active_options = ''; - $_options = array('0' => 'NO', '1' => 'YES'); - foreach ($_options as $value => $lang) - { - $selected = ($bot_row['bot_active'] == $value) ? ' selected="selected"' : ''; - $s_active_options .= ''; - } - - $style_select = style_select($bot_row['bot_style'], true); - $lang_select = language_select($bot_row['bot_lang']); - - $l_title = ($action == 'edit') ? 'EDIT' : 'ADD'; - - $template->assign_vars(array( - 'L_TITLE' => $user->lang['BOT_' . $l_title], - 'U_ACTION' => $this->u_action . "&id=$bot_id&action=$action", - 'U_BACK' => $this->u_action, - 'ERROR_MSG' => (sizeof($error)) ? implode('
    ', $error) : '', - - 'BOT_NAME' => $bot_row['bot_name'], - 'BOT_IP' => $bot_row['bot_ip'], - 'BOT_AGENT' => $bot_row['bot_agent'], - - 'S_EDIT_BOT' => true, - 'S_ACTIVE_OPTIONS' => $s_active_options, - 'S_STYLE_OPTIONS' => $style_select, - 'S_LANG_OPTIONS' => $lang_select, - 'S_ERROR' => (sizeof($error)) ? true : false, - ) - ); - - return; - - break; - } - - $s_options = ''; - $_options = array('activate' => 'BOT_ACTIVATE', 'deactivate' => 'BOT_DEACTIVATE', 'delete' => 'DELETE'); - foreach ($_options as $value => $lang) - { - $s_options .= ''; - } - - $template->assign_vars(array( - 'U_ACTION' => $this->u_action, - 'S_BOT_OPTIONS' => $s_options) - ); - - $sql = 'SELECT b.bot_id, b.bot_name, b.bot_active, u.user_lastvisit - FROM ' . BOTS_TABLE . ' b, ' . USERS_TABLE . ' u - WHERE u.user_id = b.user_id - ORDER BY u.user_lastvisit DESC, b.bot_name ASC'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $active_lang = (!$row['bot_active']) ? 'BOT_ACTIVATE' : 'BOT_DEACTIVATE'; - $active_value = (!$row['bot_active']) ? 'activate' : 'deactivate'; - - $template->assign_block_vars('bots', array( - 'BOT_NAME' => $row['bot_name'], - 'BOT_ID' => $row['bot_id'], - 'LAST_VISIT' => ($row['user_lastvisit']) ? $user->format_date($row['user_lastvisit']) : $user->lang['BOT_NEVER'], - - 'U_ACTIVATE_DEACTIVATE' => $this->u_action . "&id={$row['bot_id']}&action=$active_value", - 'L_ACTIVATE_DEACTIVATE' => $user->lang[$active_lang], - 'U_EDIT' => $this->u_action . "&id={$row['bot_id']}&action=edit", - 'U_DELETE' => $this->u_action . "&id={$row['bot_id']}&action=delete") - ); - } - $db->sql_freeresult($result); - } - - /** - * Validate bot name against username table - */ - function validate_botname($newname, $oldname = false) - { - global $db; - - if ($oldname && utf8_clean_string($newname) === $oldname) - { - return true; - } - - // Admins might want to use names otherwise forbidden, thus we only check for duplicates. - $sql = 'SELECT username - FROM ' . USERS_TABLE . " - WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($newname)) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - return ($row) ? false : true; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php deleted file mode 100644 index 5b2b345ef8..0000000000 --- a/phpBB/includes/acp/acp_captcha.php +++ /dev/null @@ -1,119 +0,0 @@ -add_lang('acp/board'); - - - $captcha_vars = array( - 'captcha_gd_x_grid' => 'CAPTCHA_GD_X_GRID', - 'captcha_gd_y_grid' => 'CAPTCHA_GD_Y_GRID', - 'captcha_gd_foreground_noise' => 'CAPTCHA_GD_FOREGROUND_NOISE', - 'captcha_gd' => 'CAPTCHA_GD_PREVIEWED' - ); - - if (isset($_GET['demo'])) - { - $captcha_vars = array_keys($captcha_vars); - foreach ($captcha_vars as $captcha_var) - { - $config[$captcha_var] = (isset($_REQUEST[$captcha_var])) ? request_var($captcha_var, 0) : $config[$captcha_var]; - } - - if ($config['captcha_gd']) - { - include($phpbb_root_path . 'includes/captcha/captcha_gd.' . $phpEx); - } - else - { - include($phpbb_root_path . 'includes/captcha/captcha_non_gd.' . $phpEx); - } - - captcha::execute(gen_rand_string(mt_rand(5, 8)), time()); - exit(); - } - - $config_vars = array( - 'enable_confirm' => 'REG_ENABLE', - 'enable_post_confirm' => 'POST_ENABLE', - 'captcha_gd' => 'CAPTCHA_GD', - ); - - $this->tpl_name = 'acp_captcha'; - $this->page_title = 'ACP_VC_SETTINGS'; - $form_key = 'acp_captcha'; - add_form_key($form_key); - - $submit = request_var('submit', ''); - - if ($submit && check_form_key($form_key)) - { - $config_vars = array_keys($config_vars); - foreach ($config_vars as $config_var) - { - set_config($config_var, request_var($config_var, '')); - } - $captcha_vars = array_keys($captcha_vars); - foreach ($captcha_vars as $captcha_var) - { - set_config($captcha_var, request_var($captcha_var, 0)); - } - trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action)); - } - else if ($submit) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action)); - } - else - { - - $preview_image_src = append_sid(append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&demo=demo")); - if (@extension_loaded('gd')) - { - $template->assign_var('GD', true); - } - foreach ($config_vars as $config_var => $template_var) - { - $template->assign_var($template_var, (isset($_REQUEST[$config_var])) ? request_var($config_var, '') : $config[$config_var]) ; - } - foreach ($captcha_vars as $captcha_var => $template_var) - { - $var = (isset($_REQUEST[$captcha_var])) ? request_var($captcha_var, 0) : $config[$captcha_var]; - $template->assign_var($template_var, $var); - $preview_image_src .= "&$captcha_var=" . $var; - } - $template->assign_vars(array( - 'CAPTCHA_PREVIEW' => $preview_image_src, - 'PREVIEW' => isset($_POST['preview']), - )); - - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php deleted file mode 100644 index ee3ab39b47..0000000000 --- a/phpBB/includes/acp/acp_database.php +++ /dev/null @@ -1,2335 +0,0 @@ -add_lang('acp/database'); - - $this->tpl_name = 'acp_database'; - $this->page_title = 'ACP_DATABASE'; - - $action = request_var('action', ''); - $submit = (isset($_POST['submit'])) ? true : false; - - $template->assign_vars(array( - 'MODE' => $mode - )); - - switch ($mode) - { - case 'backup': - - $this->page_title = 'ACP_BACKUP'; - - switch ($action) - { - case 'download': - $type = request_var('type', ''); - $table = request_var('table', array('')); - $format = request_var('method', ''); - $where = request_var('where', ''); - - if (!sizeof($table)) - { - trigger_error($user->lang['TABLE_SELECT_ERROR'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $store = $download = $structure = $schema_data = false; - - if ($where == 'store_and_download' || $where == 'store') - { - $store = true; - } - - if ($where == 'store_and_download' || $where == 'download') - { - $download = true; - } - - if ($type == 'full' || $type == 'structure') - { - $structure = true; - } - - if ($type == 'full' || $type == 'data') - { - $schema_data = true; - } - - @set_time_limit(1200); - - $time = time(); - - $filename = 'backup_' . $time . '_' . unique_id(); - switch ($db->dbms_type) - { - case 'mysql': - $extractor = new mysql_extractor($download, $store, $format, $filename, $time); - break; - - case 'sqlite': - $extractor = new sqlite_extractor($download, $store, $format, $filename, $time); - break; - - case 'postgres': - $extractor = new postgres_extractor($download, $store, $format, $filename, $time); - break; - - case 'oracle': - $extractor = new oracle_extractor($download, $store, $format, $filename, $time); - break; - - case 'mssql': - $extractor = new mssql_extractor($download, $store, $format, $filename, $time); - break; - - case 'firebird': - $extractor = new firebird_extractor($download, $store, $format, $filename, $time); - break; - - case 'db2': - $extractor = new db2_extractor($download, $store, $format, $filename, $time); - break; - } - - $extractor->write_start($table_prefix); - - foreach ($table as $table_name) - { - // Get the table structure - if ($structure) - { - $extractor->write_table($table_name); - } - else - { - // We might wanna empty out all that junk :D - switch ($db->dbms_type) - { - case 'sqlite': - case 'firebird': - case 'db2': - $extractor->flush('DELETE FROM ' . $table_name . ";\n"); - break; - - case 'mssql': - $extractor->flush('TRUNCATE TABLE ' . $table_name . "GO\n"); - break; - - case 'oracle': - $extractor->flush('TRUNCATE TABLE ' . $table_name . "\\\n"); - break; - - default: - $extractor->flush('TRUNCATE TABLE ' . $table_name . ";\n"); - break; - } - } - - // Data - if ($schema_data) - { - $extractor->write_data($table_name); - } - } - - $extractor->write_end(); - - if ($download == true) - { - exit; - } - - add_log('admin', 'LOG_DB_BACKUP'); - trigger_error($user->lang['BACKUP_SUCCESS'] . adm_back_link($this->u_action)); - break; - - default: - include($phpbb_root_path . 'includes/functions_install.' . $phpEx); - $tables = get_tables($db); - foreach ($tables as $table_name) - { - if (strlen($table_prefix) === 0 || stripos($table_name, $table_prefix) === 0) - { - $template->assign_block_vars('tables', array( - 'TABLE' => $table_name - )); - } - } - unset($tables); - - $template->assign_vars(array( - 'U_ACTION' => $this->u_action . '&action=download' - )); - - $available_methods = array('gzip' => 'zlib', 'bzip2' => 'bz2'); - - foreach ($available_methods as $type => $module) - { - if (!@extension_loaded($module)) - { - continue; - } - - $template->assign_block_vars('methods', array( - 'TYPE' => $type - )); - } - - $template->assign_block_vars('methods', array( - 'TYPE' => 'text' - )); - break; - } - break; - - case 'restore': - - $this->page_title = 'ACP_RESTORE'; - - switch ($action) - { - case 'submit': - $delete = request_var('delete', ''); - $file = request_var('file', ''); - - if (!preg_match('#^backup_\d{10,}_[a-z\d]{16}\.(sql(?:\.(?:gz|bz2))?)$#', $file, $matches)) - { - trigger_error($user->lang['BACKUP_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $file_name = $phpbb_root_path . 'store/' . $matches[0]; - - if (!file_exists($file_name) || !is_readable($file_name)) - { - trigger_error($user->lang['BACKUP_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if ($delete) - { - if (confirm_box(true)) - { - unlink($file_name); - add_log('admin', 'LOG_DB_DELETE'); - trigger_error($user->lang['BACKUP_DELETE'] . adm_back_link($this->u_action)); - } - else - { - confirm_box(false, $user->lang['DELETE_SELECTED_BACKUP'], build_hidden_fields(array('delete' => $delete, 'file' => $file))); - } - } - else - { - $download = request_var('download', ''); - - if ($download) - { - $name = $matches[0]; - - switch ($matches[1]) - { - case 'sql': - $mimetype = 'text/x-sql'; - break; - case 'sql.bz2': - $mimetype = 'application/x-bzip2'; - break; - case 'sql.gz': - $mimetype = 'application/x-gzip'; - break; - } - - header('Pragma: no-cache'); - header("Content-Type: $mimetype; name=\"$name\""); - header("Content-disposition: attachment; filename=$name"); - - @set_time_limit(0); - - $fp = @fopen($file_name, 'rb'); - - if ($fp !== false) - { - while (!feof($fp)) - { - echo fread($fp, 8192); - } - fclose($fp); - } - - flush(); - exit; - } - - switch ($matches[1]) - { - case 'sql': - $fp = fopen($file_name, 'rb'); - $read = 'fread'; - $seek = 'fseek'; - $eof = 'feof'; - $close = 'fclose'; - $fgetd = 'fgetd'; - break; - - case 'sql.bz2': - $fp = bzopen($file_name, 'r'); - $read = 'bzread'; - $seek = ''; - $eof = 'feof'; - $close = 'bzclose'; - $fgetd = 'fgetd_seekless'; - break; - - case 'sql.gz': - $fp = gzopen($file_name, 'rb'); - $read = 'gzread'; - $seek = 'gzseek'; - $eof = 'gzeof'; - $close = 'gzclose'; - $fgetd = 'fgetd'; - break; - } - - switch ($db->dbms_type) - { - case 'mysql': - case 'sqlite': - case 'db2': - while (($sql = $fgetd($fp, ";\n", $read, $seek, $eof)) !== false) - { - $db->sql_query($sql); - } - break; - - case 'firebird': - $delim = ";\n"; - while (($sql = $fgetd($fp, $delim, $read, $seek, $eof)) !== false) - { - $query = trim($sql); - if (substr($query, 0, 8) === 'SET TERM') - { - $delim = $query[9] . "\n"; - continue; - } - $db->sql_query($query); - } - break; - - case 'postgres': - while (($sql = $fgetd($fp, $delim, $read, $seek, $eof)) !== false) - { - $query = trim($sql); - $db->sql_query($query); - if (substr($query, 0, 4) == 'COPY') - { - while (($sub = $fgetd($fp, "\n", $read, $seek, $eof)) !== '\.') - { - if ($sub === false) - { - trigger_error($user->lang['RESTORE_FAILURE'] . adm_back_link($this->u_action), E_USER_WARNING); - } - pg_put_line($db->db_connect_id, $sub . "\n"); - } - pg_put_line($db->db_connect_id, "\\.\n"); - pg_end_copy($db->db_connect_id); - } - } - break; - - case 'oracle': - while (($sql = $fgetd($fp, "/\n", $read, $seek, $eof)) !== false) - { - $db->sql_query($sql); - } - break; - - case 'mssql': - while (($sql = $fgetd($fp, "GO\n", $read, $seek, $eof)) !== false) - { - $db->sql_query($sql); - } - break; - } - - $close($fp); - - add_log('admin', 'LOG_DB_RESTORE'); - trigger_error($user->lang['RESTORE_SUCCESS'] . adm_back_link($this->u_action)); - break; - } - - default: - $methods = array('sql'); - $available_methods = array('sql.gz' => 'zlib', 'sql.bz2' => 'bz2'); - - foreach ($available_methods as $type => $module) - { - if (!@extension_loaded($module)) - { - continue; - } - $methods[] = $type; - } - - $dir = $phpbb_root_path . 'store/'; - $dh = @opendir($dir); - - if ($dh) - { - while (($file = readdir($dh)) !== false) - { - if (preg_match('#^backup_(\d{10,})_[a-z\d]{16}\.(sql(?:\.(?:gz|bz2))?)$#', $file, $matches)) - { - $supported = in_array($matches[2], $methods); - - if ($supported == 'true') - { - $template->assign_block_vars('files', array( - 'FILE' => $file, - 'NAME' => gmdate("d-m-Y H:i:s", $matches[1]), - 'SUPPORTED' => $supported - )); - } - } - } - closedir($dh); - } - - $template->assign_vars(array( - 'U_ACTION' => $this->u_action . '&action=submit' - )); - break; - } - break; - } - } -} - -/** -* @package acp -*/ -class base_extractor -{ - var $fh; - var $fp; - var $write; - var $close; - var $store; - var $download; - var $time; - var $format; - var $run_comp = false; - - function __construct($download = false, $store = false, $format, $filename, $time) - { - $this->download = $download; - $this->store = $store; - $this->time = $time; - $this->format = $format; - - switch ($format) - { - case 'text': - $ext = '.sql'; - $open = 'fopen'; - $this->write = 'fwrite'; - $this->close = 'fclose'; - $mimetype = 'text/x-sql'; - break; - case 'bzip2': - $ext = '.sql.bz2'; - $open = 'bzopen'; - $this->write = 'bzwrite'; - $this->close = 'bzclose'; - $mimetype = 'application/x-bzip2'; - break; - case 'gzip': - $ext = '.sql.gz'; - $open = 'gzopen'; - $this->write = 'gzwrite'; - $this->close = 'gzclose'; - $mimetype = 'application/x-gzip'; - break; - } - - if ($download == true) - { - $name = $filename . $ext; - header('Pragma: no-cache'); - header("Content-Type: $mimetype; name=\"$name\""); - header("Content-disposition: attachment; filename=$name"); - - switch ($format) - { - case 'bzip2': - ob_start(); - break; - - case 'gzip': - if ((isset($_SERVER['HTTP_ACCEPT_ENCODING']) && strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false) && strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'msie') === false) - { - ob_start('ob_gzhandler'); - } - else - { - $this->run_comp = true; - } - break; - } - } - - if ($store == true) - { - global $phpbb_root_path; - $file = $phpbb_root_path . 'store/' . $filename . $ext; - - $this->fp = $open($file, 'w'); - - if (!$this->fp) - { - trigger_error('Unable to write temporary file to storage folder', E_USER_ERROR); - } - } - } - - function write_end() - { - static $close; - if ($this->store) - { - if ($close === null) - { - $close = $this->close; - } - $close($this->fp); - } - - // bzip2 must be written all the way at the end - if ($this->download && $this->format === 'bzip2') - { - $c = ob_get_clean(); - echo bzcompress($c); - } - } - - function flush($data) - { - static $write; - if ($this->store === true) - { - if ($write === null) - { - $write = $this->write; - } - $write($this->fp, $data); - } - - if ($this->download === true) - { - if ($this->format === 'bzip2' || $this->format === 'text' || ($this->format === 'gzip' && !$this->run_comp)) - { - echo $data; - } - - // we can write the gzip data as soon as we get it - if ($this->format === 'gzip') - { - if ($this->run_comp) - { - echo gzencode($data); - } - else - { - ob_flush(); - flush(); - } - } - } - } -} - -/** -* @package acp -*/ -class mysql_extractor extends base_extractor -{ - function write_start($table_prefix) - { - $sql_data = "#\n"; - $sql_data .= "# phpBB Backup Script\n"; - $sql_data .= "# Dump of tables for $table_prefix\n"; - $sql_data .= "# DATE : " . gmdate("d-m-Y H:i:s", $this->time) . " GMT\n"; - $sql_data .= "#\n"; - $this->flush($sql_data); - } - - function write_table($table_name) - { - global $db; - - $sql = 'SHOW CREATE TABLE ' . $table_name; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - - $sql_data = '# Table: ' . $table_name . "\n"; - $sql_data .= "DROP TABLE IF EXISTS $table_name;\n"; - $this->flush($sql_data . $row['Create Table'] . ";\n\n"); - - $db->sql_freeresult($result); - } - - function write_data($table_name) - { - global $db; - if ($db->sql_layer === 'mysqli') - { - $this->write_data_mysqli($table_name); - } - else - { - $this->write_data_mysql($table_name); - } - } - - function write_data_mysqli($table_name) - { - global $db; - $sql = "SELECT * - FROM $table_name"; - $result = mysqli_query($db->db_connect_id, $sql, MYSQLI_USE_RESULT); - if ($result != false) - { - $fields_cnt = mysqli_num_fields($result); - - // Get field information - $field = mysqli_fetch_fields($result); - $field_set = array(); - - for ($j = 0; $j < $fields_cnt; $j++) - { - $field_set[] = $field[$j]->name; - } - - $search = array("\\", "'", "\x00", "\x0a", "\x0d", "\x1a", '"'); - $replace = array("\\\\", "\\'", '\0', '\n', '\r', '\Z', '\\"'); - $fields = implode(', ', $field_set); - $sql_data = 'INSERT INTO ' . $table_name . ' (' . $fields . ') VALUES '; - $first_set = true; - $query_len = 0; - $max_len = get_usable_memory(); - - while ($row = mysqli_fetch_row($result)) - { - $values = array(); - if ($first_set) - { - $query = $sql_data . '('; - } - else - { - $query .= ',('; - } - - for ($j = 0; $j < $fields_cnt; $j++) - { - if (!isset($row[$j]) || is_null($row[$j])) - { - $values[$j] = 'NULL'; - } - else if (($field[$j]->flags & 32768) && !($field[$j]->flags & 1024)) - { - $values[$j] = $row[$j]; - } - else - { - $values[$j] = "'" . str_replace($search, $replace, $row[$j]) . "'"; - } - } - $query .= implode(', ', $values) . ')'; - - $query_len += strlen($query); - if ($query_len > $max_len) - { - $this->flush($query . ";\n\n"); - $query = ''; - $query_len = 0; - $first_set = true; - } - else - { - $first_set = false; - } - } - mysqli_free_result($result); - - // check to make sure we have nothing left to flush - if (!$first_set && $query) - { - $this->flush($query . ";\n\n"); - } - } - } - - function write_data_mysql($table_name) - { - global $db; - $sql = "SELECT * - FROM $table_name"; - $result = mysql_unbuffered_query($sql, $db->db_connect_id); - - if ($result != false) - { - $fields_cnt = mysql_num_fields($result); - - // Get field information - $field = array(); - for ($i = 0; $i < $fields_cnt; $i++) - { - $field[] = mysql_fetch_field($result, $i); - } - $field_set = array(); - - for ($j = 0; $j < $fields_cnt; $j++) - { - $field_set[] = $field[$j]->name; - } - - $search = array("\\", "'", "\x00", "\x0a", "\x0d", "\x1a", '"'); - $replace = array("\\\\", "\\'", '\0', '\n', '\r', '\Z', '\\"'); - $fields = implode(', ', $field_set); - $sql_data = 'INSERT INTO ' . $table_name . ' (' . $fields . ') VALUES '; - $first_set = true; - $query_len = 0; - $max_len = get_usable_memory(); - - while ($row = mysql_fetch_row($result)) - { - $values = array(); - if ($first_set) - { - $query = $sql_data . '('; - } - else - { - $query .= ',('; - } - - for ($j = 0; $j < $fields_cnt; $j++) - { - if (!isset($row[$j]) || is_null($row[$j])) - { - $values[$j] = 'NULL'; - } - else if ($field[$j]->numeric && ($field[$j]->type !== 'timestamp')) - { - $values[$j] = $row[$j]; - } - else - { - $values[$j] = "'" . str_replace($search, $replace, $row[$j]) . "'"; - } - } - $query .= implode(', ', $values) . ')'; - - $query_len += strlen($query); - if ($query_len > $max_len) - { - $this->flush($query . ";\n\n"); - $query = ''; - $query_len = 0; - $first_set = true; - } - else - { - $first_set = false; - } - } - mysql_free_result($result); - - // check to make sure we have nothing left to flush - if (!$first_set && $query) - { - $this->flush($query . ";\n\n"); - } - } - } -} - -/** -* @package acp -*/ -class sqlite_extractor extends base_extractor -{ - function write_start($prefix) - { - $sql_data = "--\n"; - $sql_data .= "-- phpBB Backup Script\n"; - $sql_data .= "-- Dump of tables for $prefix\n"; - $sql_data .= "-- DATE : " . gmdate("d-m-Y H:i:s", $this->time) . " GMT\n"; - $sql_data .= "--\n"; - $sql_data .= "BEGIN TRANSACTION;\n"; - $this->flush($sql_data); - } - - function write_table($table_name) - { - global $db; - $sql_data = '-- Table: ' . $table_name . "\n"; - $sql_data .= "DROP TABLE $table_name;\n"; - - $sql = "SELECT sql - FROM sqlite_master - WHERE type = 'table' - AND name = '" . $db->sql_escape($table_name) . "' - ORDER BY type DESC, name;"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // Create Table - $sql_data .= $row['sql'] . ";\n"; - - $result = $db->sql_query("PRAGMA index_list('" . $db->sql_escape($table_name) . "');"); - - $ar = array(); - while ($row = $db->sql_fetchrow($result)) - { - $ar[] = $row; - } - $db->sql_freeresult($result); - - foreach ($ar as $value) - { - if (strpos($value['name'], 'autoindex') !== false) - { - continue; - } - - $result = $db->sql_query("PRAGMA index_info('" . $db->sql_escape($value['name']) . "');"); - - $fields = array(); - while ($row = $db->sql_fetchrow($result)) - { - $fields[] = $row['name']; - } - $db->sql_freeresult($result); - - $sql_data .= 'CREATE ' . ($value['unique'] ? 'UNIQUE ' : '') . 'INDEX ' . $value['name'] . ' on ' . $table_name . ' (' . implode(', ', $fields) . ");\n"; - } - - $this->flush($sql_data . "\n"); - } - - function write_data($table_name) - { - global $db; - static $proper; - - if (is_null($proper)) - { - $proper = version_compare(PHP_VERSION, '5.1.3', '>='); - } - - if ($proper) - { - $col_types = sqlite_fetch_column_types($db->db_connect_id, $table_name); - } - else - { - $sql = "SELECT sql - FROM sqlite_master - WHERE type = 'table' - AND name = '" . $table_name . "'"; - $table_data = sqlite_single_query($db->db_connect_id, $sql); - $table_data = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', '', $table_data); - $table_data = trim($table_data); - - preg_match('#\((.*)\)#s', $table_data, $matches); - - $table_cols = explode(',', trim($matches[1])); - foreach ($table_cols as $declaration) - { - $entities = preg_split('#\s+#', trim($declaration)); - $column_name = preg_replace('/"?([^"]+)"?/', '\1', $entities[0]); - - // Hit a primary key, those are not what we need :D - if (empty($entities[1]) || (strtolower($entities[0]) === 'primary' && strtolower($entities[1]) === 'key')) - { - continue; - } - $col_types[$column_name] = $entities[1]; - } - } - - $sql = "SELECT * - FROM $table_name"; - $result = sqlite_unbuffered_query($db->db_connect_id, $sql); - $rows = sqlite_fetch_all($result, SQLITE_ASSOC); - $sql_insert = 'INSERT INTO ' . $table_name . ' (' . implode(', ', array_keys($col_types)) . ') VALUES ('; - foreach ($rows as $row) - { - foreach ($row as $column_name => $column_data) - { - if (is_null($column_data)) - { - $row[$column_name] = 'NULL'; - } - else if ($column_data == '') - { - $row[$column_name] = "''"; - } - else if (strpos($col_types[$column_name], 'text') !== false || strpos($col_types[$column_name], 'char') !== false || strpos($col_types[$column_name], 'blob') !== false) - { - $row[$column_name] = sanitize_data_generic(str_replace("'", "''", $column_data)); - } - } - $this->flush($sql_insert . implode(', ', $row) . ");\n"); - } - } - - function write_end() - { - $this->flush("COMMIT;\n"); - parent::write_end(); - } -} - -/** -* @package acp -*/ -class postgres_extractor extends base_extractor -{ - function write_start($prefix) - { - $sql_data = "--\n"; - $sql_data .= "-- phpBB Backup Script\n"; - $sql_data .= "-- Dump of tables for $prefix\n"; - $sql_data .= "-- DATE : " . gmdate("d-m-Y H:i:s", $this->time) . " GMT\n"; - $sql_data .= "--\n"; - $sql_data .= "BEGIN TRANSACTION;\n"; - $this->flush($sql_data); - } - - function write_table($table_name) - { - global $db; - static $domains_created = array(); - - $sql = "SELECT a.domain_name, a.data_type, a.character_maximum_length, a.domain_default - FROM INFORMATION_SCHEMA.domains a, INFORMATION_SCHEMA.column_domain_usage b - WHERE a.domain_name = b.domain_name - AND b.table_name = '{$table_name}'"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - if (empty($domains_created[$row['domain_name']])) - { - $domains_created[$row['domain_name']] = true; - //$sql_data = "DROP DOMAIN {$row['domain_name']};\n"; - $sql_data = "CREATE DOMAIN {$row['domain_name']} as {$row['data_type']}"; - if (!empty($row['character_maximum_length'])) - { - $sql_data .= '(' . $row['character_maximum_length'] . ')'; - } - $sql_data .= ' NOT NULL'; - if (!empty($row['domain_default'])) - { - $sql_data .= ' DEFAULT ' . $row['domain_default']; - } - $this->flush($sql_data . ";\n"); - } - } - - $sql_data = '-- Table: ' . $table_name . "\n"; - //$sql_data .= "DROP TABLE $table_name;\n"; - // PGSQL does not "tightly" bind sequences and tables, we must guess... - $sql = "SELECT relname - FROM pg_class - WHERE relkind = 'S' - AND relname = '{$table_name}_seq'"; - $result = $db->sql_query($sql); - // We don't even care about storing the results. We already know the answer if we get rows back. - if ($db->sql_fetchrow($result)) - { - $sql_data .= "DROP SEQUENCE {$table_name}_seq;\n"; - $sql_data .= "CREATE SEQUENCE {$table_name}_seq;\n"; - } - $db->sql_freeresult($result); - - $field_query = "SELECT a.attnum, a.attname as field, t.typname as type, a.attlen as length, a.atttypmod as lengthvar, a.attnotnull as notnull - FROM pg_class c, pg_attribute a, pg_type t - WHERE c.relname = '" . $db->sql_escape($table_name) . "' - AND a.attnum > 0 - AND a.attrelid = c.oid - AND a.atttypid = t.oid - ORDER BY a.attnum"; - $result = $db->sql_query($field_query); - - $sql_data .= "CREATE TABLE $table_name(\n"; - $lines = array(); - while ($row = $db->sql_fetchrow($result)) - { - // Get the data from the table - $sql_get_default = "SELECT pg_get_expr(d.adbin, d.adrelid) as rowdefault - FROM pg_attrdef d, pg_class c - WHERE (c.relname = '" . $db->sql_escape($table_name) . "') - AND (c.oid = d.adrelid) - AND d.adnum = " . $row['attnum']; - $def_res = $db->sql_query($sql_get_default); - - if (!$def_res) - { - unset($row['rowdefault']); - } - else - { - $row['rowdefault'] = $db->sql_fetchfield('rowdefault', $def_res); - } - $db->sql_freeresult($def_res); - - if ($row['type'] == 'bpchar') - { - // Internally stored as bpchar, but isn't accepted in a CREATE TABLE statement. - $row['type'] = 'char'; - } - - $line = ' ' . $row['field'] . ' ' . $row['type']; - - if (strpos($row['type'], 'char') !== false) - { - if ($row['lengthvar'] > 0) - { - $line .= '(' . ($row['lengthvar'] - 4) . ')'; - } - } - - if (strpos($row['type'], 'numeric') !== false) - { - $line .= '('; - $line .= sprintf("%s,%s", (($row['lengthvar'] >> 16) & 0xffff), (($row['lengthvar'] - 4) & 0xffff)); - $line .= ')'; - } - - if (!empty($row['rowdefault'])) - { - $line .= ' DEFAULT ' . $row['rowdefault']; - } - - if ($row['notnull'] == 't') - { - $line .= ' NOT NULL'; - } - - $lines[] = $line; - } - $db->sql_freeresult($result); - - - // Get the listing of primary keys. - $sql_pri_keys = "SELECT ic.relname as index_name, bc.relname as tab_name, ta.attname as column_name, i.indisunique as unique_key, i.indisprimary as primary_key - FROM pg_class bc, pg_class ic, pg_index i, pg_attribute ta, pg_attribute ia - WHERE (bc.oid = i.indrelid) - AND (ic.oid = i.indexrelid) - AND (ia.attrelid = i.indexrelid) - AND (ta.attrelid = bc.oid) - AND (bc.relname = '" . $db->sql_escape($table_name) . "') - AND (ta.attrelid = i.indrelid) - AND (ta.attnum = i.indkey[ia.attnum-1]) - ORDER BY index_name, tab_name, column_name"; - - $result = $db->sql_query($sql_pri_keys); - - $index_create = $index_rows = $primary_key = array(); - - // We do this in two steps. It makes placing the comma easier - while ($row = $db->sql_fetchrow($result)) - { - if ($row['primary_key'] == 't') - { - $primary_key[] = $row['column_name']; - $primary_key_name = $row['index_name']; - } - else - { - // We have to store this all this info because it is possible to have a multi-column key... - // we can loop through it again and build the statement - $index_rows[$row['index_name']]['table'] = $table_name; - $index_rows[$row['index_name']]['unique'] = ($row['unique_key'] == 't') ? true : false; - $index_rows[$row['index_name']]['column_names'][] = $row['column_name']; - } - } - $db->sql_freeresult($result); - - if (!empty($index_rows)) - { - foreach ($index_rows as $idx_name => $props) - { - $index_create[] = 'CREATE ' . ($props['unique'] ? 'UNIQUE ' : '') . "INDEX $idx_name ON $table_name (" . implode(', ', $props['column_names']) . ");"; - } - } - - if (!empty($primary_key)) - { - $lines[] = " CONSTRAINT $primary_key_name PRIMARY KEY (" . implode(', ', $primary_key) . ")"; - } - - // Generate constraint clauses for CHECK constraints - $sql_checks = "SELECT conname as index_name, consrc - FROM pg_constraint, pg_class bc - WHERE conrelid = bc.oid - AND bc.relname = '" . $db->sql_escape($table_name) . "' - AND NOT EXISTS ( - SELECT * - FROM pg_constraint as c, pg_inherits as i - WHERE i.inhrelid = pg_constraint.conrelid - AND c.conname = pg_constraint.conname - AND c.consrc = pg_constraint.consrc - AND c.conrelid = i.inhparent - )"; - $result = $db->sql_query($sql_checks); - - // Add the constraints to the sql file. - while ($row = $db->sql_fetchrow($result)) - { - if (!is_null($row['consrc'])) - { - $lines[] = ' CONSTRAINT ' . $row['index_name'] . ' CHECK ' . $row['consrc']; - } - } - $db->sql_freeresult($result); - - $sql_data .= implode(", \n", $lines); - $sql_data .= "\n);\n"; - - if (!empty($index_create)) - { - $sql_data .= implode("\n", $index_create) . "\n\n"; - } - $this->flush($sql_data); - } - - function write_data($table_name) - { - global $db; - // Grab all of the data from current table. - $sql = "SELECT * - FROM $table_name"; - $result = $db->sql_query($sql); - - $i_num_fields = pg_num_fields($result); - $seq = ''; - - for ($i = 0; $i < $i_num_fields; $i++) - { - $ary_type[] = pg_field_type($result, $i); - $ary_name[] = pg_field_name($result, $i); - - - $sql = "SELECT pg_get_expr(d.adbin, d.adrelid) as rowdefault - FROM pg_attrdef d, pg_class c - WHERE (c.relname = '{$table_name}') - AND (c.oid = d.adrelid) - AND d.adnum = " . strval($i + 1); - $result2 = $db->sql_query($sql); - if ($row = $db->sql_fetchrow($result2)) - { - // Determine if we must reset the sequences - if (strpos($row['rowdefault'], "nextval('") === 0) - { - $seq .= "SELECT SETVAL('{$table_name}_seq',(select case when max({$ary_name[$i]})>0 then max({$ary_name[$i]})+1 else 1 end FROM {$table_name}));\n"; - } - } - } - - $this->flush("COPY $table_name (" . implode(', ', $ary_name) . ') FROM stdin;' . "\n"); - while ($row = $db->sql_fetchrow($result)) - { - $schema_vals = array(); - - // Build the SQL statement to recreate the data. - for ($i = 0; $i < $i_num_fields; $i++) - { - $str_val = $row[$ary_name[$i]]; - - if (preg_match('#char|text|bool|bytea#i', $ary_type[$i])) - { - $str_val = str_replace(array("\n", "\t", "\r", "\b", "\f", "\v"), array('\n', '\t', '\r', '\b', '\f', '\v'), addslashes($str_val)); - $str_empty = ''; - } - else - { - $str_empty = '\N'; - } - - if (empty($str_val) && $str_val !== '0') - { - $str_val = $str_empty; - } - - $schema_vals[] = $str_val; - } - - // Take the ordered fields and their associated data and build it - // into a valid sql statement to recreate that field in the data. - $this->flush(implode("\t", $schema_vals) . "\n"); - } - $db->sql_freeresult($result); - $this->flush("\\.\n"); - - // Write out the sequence statements - $this->flush($seq); - } - - function write_end() - { - $this->flush("COMMIT;\n"); - parent::write_end(); - } -} - -/** -* @package acp -*/ -class mssql_extractor extends base_extractor -{ - function write_end() - { - $this->flush("COMMIT\nGO\n"); - parent::write_end(); - } - - function write_start($prefix) - { - $sql_data = "--\n"; - $sql_data .= "-- phpBB Backup Script\n"; - $sql_data .= "-- Dump of tables for $prefix\n"; - $sql_data .= "-- DATE : " . gmdate("d-m-Y H:i:s", $this->time) . " GMT\n"; - $sql_data .= "--\n"; - $sql_data .= "BEGIN TRANSACTION\n"; - $sql_data .= "GO\n"; - $this->flush($sql_data); - } - - function write_table($table_name) - { - global $db; - $sql_data = '-- Table: ' . $table_name . "\n"; - $sql_data .= "IF OBJECT_ID(N'$table_name', N'U') IS NOT NULL\n"; - $sql_data .= "DROP TABLE $table_name;\n"; - $sql_data .= "GO\n"; - $sql_data .= "\nCREATE TABLE [$table_name] (\n"; - $rows = array(); - - $text_flag = false; - - $sql = "SELECT COLUMN_NAME, COLUMN_DEFAULT, IS_NULLABLE, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, COLUMNPROPERTY(object_id(TABLE_NAME), COLUMN_NAME, 'IsIdentity') as IS_IDENTITY - FROM INFORMATION_SCHEMA.COLUMNS - WHERE TABLE_NAME = '$table_name'"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $line = "\t[{$row['COLUMN_NAME']}] [{$row['DATA_TYPE']}]"; - - if ($row['DATA_TYPE'] == 'text') - { - $text_flag = true; - } - - if ($row['IS_IDENTITY']) - { - $line .= ' IDENTITY (1 , 1)'; - } - - if ($row['CHARACTER_MAXIMUM_LENGTH'] && $row['DATA_TYPE'] !== 'text') - { - $line .= ' (' . $row['CHARACTER_MAXIMUM_LENGTH'] . ')'; - } - - if ($row['IS_NULLABLE'] == 'YES') - { - $line .= ' NULL'; - } - else - { - $line .= ' NOT NULL'; - } - - if ($row['COLUMN_DEFAULT']) - { - $line .= ' DEFAULT ' . $row['COLUMN_DEFAULT']; - } - - $rows[] = $line; - } - $db->sql_freeresult($result); - - $sql_data .= implode(",\n", $rows); - $sql_data .= "\n) ON [PRIMARY]"; - - if ($text_flag) - { - $sql_data .= " TEXTIMAGE_ON [PRIMARY]"; - } - - $sql_data .= "\nGO\n\n"; - $rows = array(); - - $sql = "SELECT CONSTRAINT_NAME, COLUMN_NAME - FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE - WHERE TABLE_NAME = '$table_name'"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - if (!sizeof($rows)) - { - $sql_data .= "ALTER TABLE [$table_name] WITH NOCHECK ADD\n"; - $sql_data .= "\tCONSTRAINT [{$row['CONSTRAINT_NAME']}] PRIMARY KEY CLUSTERED \n\t(\n"; - } - $rows[] = "\t\t[{$row['COLUMN_NAME']}]"; - } - if (sizeof($rows)) - { - $sql_data .= implode(",\n", $rows); - $sql_data .= "\n\t) ON [PRIMARY] \nGO\n"; - } - $db->sql_freeresult($result); - - $index = array(); - $sql = "EXEC sp_statistics '$table_name'"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['TYPE'] == 3) - { - $index[$row['INDEX_NAME']][] = '[' . $row['COLUMN_NAME'] . ']'; - } - } - $db->sql_freeresult($result); - - foreach ($index as $index_name => $column_name) - { - $index[$index_name] = implode(', ', $column_name); - } - - foreach ($index as $index_name => $columns) - { - $sql_data .= "\nCREATE INDEX [$index_name] ON [$table_name]($columns) ON [PRIMARY]\nGO\n"; - } - $this->flush($sql_data); - } - - function write_data($table_name) - { - global $db; - - if ($db->sql_layer === 'mssql') - { - $this->write_data_mssql($table_name); - } - else if ($db->sql_layer === 'mssql_odbc') - { - $this->write_data_odbc($table_name); - } - else - { - // @todo: write code for MS SQL 2005 DBAL - trigger_error('KungFuDeathGrip'); - } - } - - function write_data_mssql($table_name) - { - global $db; - $ary_type = $ary_name = array(); - $ident_set = false; - $sql_data = ''; - - // Grab all of the data from current table. - $sql = "SELECT * - FROM $table_name"; - $result = $db->sql_query($sql); - - $retrieved_data = mssql_num_rows($result); - - $i_num_fields = mssql_num_fields($result); - - for ($i = 0; $i < $i_num_fields; $i++) - { - $ary_type[$i] = mssql_field_type($result, $i); - $ary_name[$i] = mssql_field_name($result, $i); - } - - if ($retrieved_data) - { - $sql = "SELECT 1 as has_identity - FROM INFORMATION_SCHEMA.COLUMNS - WHERE COLUMNPROPERTY(object_id('$table_name'), COLUMN_NAME, 'IsIdentity') = 1"; - $result2 = $db->sql_query($sql); - $row2 = $db->sql_fetchrow($result2); - if (!empty($row2['has_identity'])) - { - $sql_data .= "\nSET IDENTITY_INSERT $table_name ON\nGO\n"; - $ident_set = true; - } - $db->sql_freeresult($result2); - } - - while ($row = $db->sql_fetchrow($result)) - { - $schema_vals = $schema_fields = array(); - - // Build the SQL statement to recreate the data. - for ($i = 0; $i < $i_num_fields; $i++) - { - $str_val = $row[$ary_name[$i]]; - - if (preg_match('#char|text|bool|varbinary#i', $ary_type[$i])) - { - $str_quote = ''; - $str_empty = "''"; - $str_val = sanitize_data_mssql(str_replace("'", "''", $str_val)); - } - else if (preg_match('#date|timestamp#i', $ary_type[$i])) - { - if (empty($str_val)) - { - $str_quote = ''; - } - else - { - $str_quote = "'"; - } - } - else - { - $str_quote = ''; - $str_empty = 'NULL'; - } - - if (empty($str_val) && $str_val !== '0' && !(is_int($str_val) || is_float($str_val))) - { - $str_val = $str_empty; - } - - $schema_vals[$i] = $str_quote . $str_val . $str_quote; - $schema_fields[$i] = $ary_name[$i]; - } - - // Take the ordered fields and their associated data and build it - // into a valid sql statement to recreate that field in the data. - $sql_data .= "INSERT INTO $table_name (" . implode(', ', $schema_fields) . ') VALUES (' . implode(', ', $schema_vals) . ");\nGO\n"; - - $this->flush($sql_data); - $sql_data = ''; - } - $db->sql_freeresult($result); - - if ($retrieved_data && $ident_set) - { - $sql_data .= "\nSET IDENTITY_INSERT $table_name OFF\nGO\n"; - } - $this->flush($sql_data); - } - - function write_data_odbc($table_name) - { - global $db; - $ary_type = $ary_name = array(); - $ident_set = false; - $sql_data = ''; - - // Grab all of the data from current table. - $sql = "SELECT * - FROM $table_name"; - $result = $db->sql_query($sql); - - $retrieved_data = odbc_num_rows($result); - - if ($retrieved_data) - { - $sql = "SELECT 1 as has_identity - FROM INFORMATION_SCHEMA.COLUMNS - WHERE COLUMNPROPERTY(object_id('$table_name'), COLUMN_NAME, 'IsIdentity') = 1"; - $result2 = $db->sql_query($sql); - $row2 = $db->sql_fetchrow($result2); - if (!empty($row2['has_identity'])) - { - $sql_data .= "\nSET IDENTITY_INSERT $table_name ON\nGO\n"; - $ident_set = true; - } - $db->sql_freeresult($result2); - } - - $i_num_fields = odbc_num_fields($result); - - for ($i = 0; $i < $i_num_fields; $i++) - { - $ary_type[$i] = odbc_field_type($result, $i + 1); - $ary_name[$i] = odbc_field_name($result, $i + 1); - } - - while ($row = $db->sql_fetchrow($result)) - { - $schema_vals = $schema_fields = array(); - - // Build the SQL statement to recreate the data. - for ($i = 0; $i < $i_num_fields; $i++) - { - $str_val = $row[$ary_name[$i]]; - - if (preg_match('#char|text|bool|varbinary#i', $ary_type[$i])) - { - $str_quote = ''; - $str_empty = "''"; - $str_val = sanitize_data_mssql(str_replace("'", "''", $str_val)); - } - else if (preg_match('#date|timestamp#i', $ary_type[$i])) - { - if (empty($str_val)) - { - $str_quote = ''; - } - else - { - $str_quote = "'"; - } - } - else - { - $str_quote = ''; - $str_empty = 'NULL'; - } - - if (empty($str_val) && $str_val !== '0' && !(is_int($str_val) || is_float($str_val))) - { - $str_val = $str_empty; - } - - $schema_vals[$i] = $str_quote . $str_val . $str_quote; - $schema_fields[$i] = $ary_name[$i]; - } - - // Take the ordered fields and their associated data and build it - // into a valid sql statement to recreate that field in the data. - $sql_data .= "INSERT INTO $table_name (" . implode(', ', $schema_fields) . ') VALUES (' . implode(', ', $schema_vals) . ");\nGO\n"; - - $this->flush($sql_data); - - $sql_data = ''; - - } - $db->sql_freeresult($result); - - if ($retrieved_data && $ident_set) - { - $sql_data .= "\nSET IDENTITY_INSERT $table_name OFF\nGO\n"; - } - $this->flush($sql_data); - } - -} - -/** -* @package acp -*/ -class db2_extractor extends base_extractor -{ - function write_start($prefix) - { - $sql_data = "--\n"; - $sql_data .= "-- phpBB Backup Script\n"; - $sql_data .= "-- Dump of tables for $prefix\n"; - $sql_data .= "-- DATE : " . gmdate("d-m-Y H:i:s", $this->time) . " GMT\n"; - $sql_data .= "--\n"; - $this->flush($sql_data); - } - - function write_table($table_name) - { - global $db; - $sql_data = '-- Table: ' . $table_name . "\n"; - $sql_data .= "\nCREATE TABLE $table_name (\n"; - $rows = array(); - - // switch to db2_columns()? - $sql = "SELECT colname, typename, length, default, identity, nulls - FROM syscat.columns - WHERE tabname = '$table_name'"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $line = "\t{$row['colname']} {$row['typename']}"; - - if ($row['identity'] == 'Y') - { - $line .= ' GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1)'; - } - - if ($row['typename'] == 'VARCHAR' || $row['typename'] == 'CHARACTER' || $row['typename'] == 'CLOB') - { - $line .= ' (' . $row['length'] . ')'; - } - - if ($row['nulls'] == 'N') - { - $line .= ' NOT NULL'; - } - else - { - $line .= ' NULL'; - } - - if ($row['default'] !== null) - { - $line .= ' DEFAULT ' . $row['default']; - } - - $rows[] = $line; - } - $db->sql_freeresult($result); - - // switch to db2_columns()? - $sql = "SELECT colname - FROM SYSCAT.KEYCOLUSE - WHERE tabname = '$table_name'"; - $result = $db->sql_query($sql); - $prim_cols = array(); - while ($row = $db->sql_fetchrow($result)) - { - $prim_cols[] = $row['colname']; - } - $db->sql_freeresult($result); - if (sizeof($prim_cols)) - { - $rows[] = "\tPRIMARY KEY (" . implode($prim_cols) . ')'; - } - - $sql_data .= implode(",\n", $rows); - $sql_data .= "\n);\n\n"; - $rows = array(); - - $sql = "SELECT colnames, indname - FROM SYSCAT.INDEXES - WHERE TABNAME = '$table_name' - AND UNIQUERULE <> 'P'"; - $result = $db->sql_query($sql); - $index = array(); - while ($row = $db->sql_fetchrow($result)) - { - $inds = explode('+', $row['colnames']); - unset($inds[0]); - $sql_data .= 'CREATE INDEX ' . $row['indname'] . ' ON ' . $table_name . ' (' . implode(', ', $inds) . ") PCTFREE 10 MINPCTUSED 10 ALLOW REVERSE SCANS PAGE SPLIT SYMMETRIC COLLECT SAMPLED DETAILED STATISTICS;\n"; - } - $db->sql_freeresult($result); - - $this->flush($sql_data); - } - - function write_data($table_name) - { - global $db; - $ary_type = $ary_name = array(); - $result = db2_columns($db->db_connect_id, '', '%', $table_name); - $i = 0; - while ($row = $db->sql_fetchrow($result)) - { - $ary_type[$i] = $row['type_name']; - $ary_name[$i++] = strtolower($row['column_name']); - } - $db->sql_freeresult($result); - - // Grab all of the data from current table. - $sql = "SELECT * - FROM $table_name"; - $result = $db->sql_query($sql); - - $sql_data = ''; - $i_num_fields = $i; - - while ($row = $db->sql_fetchrow($result)) - { - $schema_vals = $schema_fields = array(); - - // Build the SQL statement to recreate the data. - for ($i = 0; $i < $i_num_fields; $i++) - { - $str_val = $row[$ary_name[$i]]; - - if (preg_match('#char|clob#i', $ary_type[$i])) - { - $str_quote = "'"; - $str_empty = ''; - $str_val = sanitize_data_generic(str_replace("'", "''", $str_val)); - } - else if (preg_match('#date|timestamp#i', $ary_type[$i])) - { - if (empty($str_val)) - { - $str_quote = ''; - } - else - { - $str_quote = "'"; - } - } - else - { - $str_quote = ''; - $str_empty = 'NULL'; - } - - if (empty($str_val) && $str_val !== '0') - { - $str_val = $str_empty; - } - - $schema_vals[$i] = $str_quote . $str_val . $str_quote; - $schema_fields[$i] = '"' . $ary_name[$i] . "'"; - } - - // Take the ordered fields and their associated data and build it - // into a valid sql statement to recreate that field in the data. - $sql_data = "INSERT INTO $table_name (" . implode(', ', $schema_fields) . ') VALUES (' . implode(', ', $schema_vals) . ");\n"; - - $this->flush($sql_data); - } - $db->sql_freeresult($result); - } -} - -/** -* @package acp -*/ -class oracle_extractor extends base_extractor -{ - function write_table($table_name) - { - global $db; - $sql_data = '-- Table: ' . $table_name . "\n"; - $sql_data .= "DROP TABLE $table_name;\n"; - $sql_data .= '\\' . "\n"; - $sql_data .= "\nCREATE TABLE $table_name (\n"; - - $sql = "SELECT COLUMN_NAME, DATA_TYPE, DATA_PRECISION, DATA_LENGTH, NULLABLE, DATA_DEFAULT - FROM ALL_TAB_COLS - WHERE table_name = '{$table_name}'"; - $result = $db->sql_query($sql); - - $rows = array(); - while ($row = $db->sql_fetchrow($result)) - { - $line = ' "' . $row['column_name'] . '" ' . $row['data_type']; - - if ($row['data_type'] !== 'CLOB') - { - if ($row['data_type'] !== 'VARCHAR2') - { - $line .= '(' . $row['data_precision'] . ')'; - } - else - { - $line .= '(' . $row['data_length'] . ')'; - } - } - - if (!empty($row['data_default'])) - { - $line .= ' DEFAULT ' . $row['data_default']; - } - - if ($row['nullable'] == 'N') - { - $line .= ' NOT NULL'; - } - $rows[] = $line; - } - $db->sql_freeresult($result); - - $sql = "SELECT A.CONSTRAINT_NAME, A.COLUMN_NAME - FROM USER_CONS_COLUMNS A, USER_CONSTRAINTS B - WHERE A.CONSTRAINT_NAME = B.CONSTRAINT_NAME - AND B.CONSTRAINT_TYPE = 'P' - AND A.TABLE_NAME = '{$table_name}'"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $rows[] = " CONSTRAINT {$row['constraint_name']} PRIMARY KEY ({$row['column_name']})"; - } - $db->sql_freeresult($result); - - $sql = "SELECT A.CONSTRAINT_NAME, A.COLUMN_NAME - FROM USER_CONS_COLUMNS A, USER_CONSTRAINTS B - WHERE A.CONSTRAINT_NAME = B.CONSTRAINT_NAME - AND B.CONSTRAINT_TYPE = 'U' - AND A.TABLE_NAME = '{$table_name}'"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $rows[] = " CONSTRAINT {$row['constraint_name']} UNIQUE ({$row['column_name']})"; - } - $db->sql_freeresult($result); - - $sql_data .= implode(",\n", $rows); - $sql_data .= "\n)\n\\"; - - $sql = "SELECT A.REFERENCED_NAME - FROM USER_DEPENDENCIES A, USER_TRIGGERS B - WHERE A.REFERENCED_TYPE = 'SEQUENCE' - AND A.NAME = B.TRIGGER_NAME - AND B.TABLE_NAME = '{$table_name}'"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - $sql_data .= "\nCREATE SEQUENCE {$row['referenced_name']}\\\n"; - } - $db->sql_freeresult($result); - - $sql = "SELECT DESCRIPTION, WHEN_CLAUSE, TRIGGER_BODY - FROM USER_TRIGGERS - WHERE TABLE_NAME = '{$table_name}'"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - $sql_data .= "\nCREATE OR REPLACE TRIGGER {$row['description']}WHEN ({$row['when_clause']})\n{$row['trigger_body']}\\"; - } - $db->sql_freeresult($result); - - $sql = "SELECT A.INDEX_NAME, B.COLUMN_NAME - FROM USER_INDEXES A, USER_IND_COLUMNS B - WHERE A.UNIQUENESS = 'NONUNIQUE' - AND A.INDEX_NAME = B.INDEX_NAME - AND B.TABLE_NAME = '{$table_name}'"; - $result = $db->sql_query($sql); - - $index = array(); - - while ($row = $db->sql_fetchrow($result)) - { - $index[$row['index_name']][] = $row['column_name']; - } - - foreach ($index as $index_name => $column_names) - { - $sql_data .= "\nCREATE INDEX $index_name ON $table_name(" . implode(', ', $column_names) . ")\n\\"; - } - $db->sql_freeresult($result); - $this->flush($sql_data); - } - - function write_data($table_name) - { - global $db; - $ary_type = $ary_name = array(); - - // Grab all of the data from current table. - $sql = "SELECT * - FROM $table_name"; - $result = $db->sql_query($sql); - - $i_num_fields = ocinumcols($result); - - for ($i = 0; $i < $i_num_fields; $i++) - { - $ary_type[$i] = ocicolumntype($result, $i + 1); - $ary_name[$i] = ocicolumnname($result, $i + 1); - } - - $sql_data = ''; - - while ($row = $db->sql_fetchrow($result)) - { - $schema_vals = $schema_fields = array(); - - // Build the SQL statement to recreate the data. - for ($i = 0; $i < $i_num_fields; $i++) - { - $str_val = $row[$ary_name[$i]]; - - if (preg_match('#char|text|bool|raw#i', $ary_type[$i])) - { - $str_quote = ''; - $str_empty = "''"; - $str_val = sanitize_data_oracle($str_val); - } - else if (preg_match('#date|timestamp#i', $ary_type[$i])) - { - if (empty($str_val)) - { - $str_quote = ''; - } - else - { - $str_quote = "'"; - } - } - else - { - $str_quote = ''; - $str_empty = 'NULL'; - } - - if (empty($str_val) && $str_val !== '0') - { - $str_val = $str_empty; - } - - $schema_vals[$i] = $str_quote . $str_val . $str_quote; - $schema_fields[$i] = '"' . $ary_name[$i] . "'"; - } - - // Take the ordered fields and their associated data and build it - // into a valid sql statement to recreate that field in the data. - $sql_data = "INSERT INTO $table_name (" . implode(', ', $schema_fields) . ') VALUES (' . implode(', ', $schema_vals) . ");\n"; - - $this->flush($sql_data); - } - $db->sql_freeresult($result); - } - - function write_start($prefix) - { - $sql_data = "--\n"; - $sql_data .= "-- phpBB Backup Script\n"; - $sql_data .= "-- Dump of tables for $prefix\n"; - $sql_data .= "-- DATE : " . gmdate("d-m-Y H:i:s", $this->time) . " GMT\n"; - $sql_data .= "--\n"; - $this->flush($sql_data); - } -} - -/** -* @package acp -*/ -class firebird_extractor extends base_extractor -{ - function write_start($prefix) - { - $sql_data = "--\n"; - $sql_data .= "-- phpBB Backup Script\n"; - $sql_data .= "-- Dump of tables for $prefix\n"; - $sql_data .= "-- DATE : " . gmdate("d-m-Y H:i:s", $this->time) . " GMT\n"; - $sql_data .= "--\n"; - $this->flush($sql_data); - } - - function write_data($table_name) - { - global $db; - $ary_type = $ary_name = array(); - - // Grab all of the data from current table. - $sql = "SELECT * - FROM $table_name"; - $result = $db->sql_query($sql); - - $i_num_fields = ibase_num_fields($result); - - for ($i = 0; $i < $i_num_fields; $i++) - { - $info = ibase_field_info($result, $i); - $ary_type[$i] = $info['type']; - $ary_name[$i] = $info['name']; - } - - while ($row = $db->sql_fetchrow($result)) - { - $schema_vals = $schema_fields = array(); - - // Build the SQL statement to recreate the data. - for ($i = 0; $i < $i_num_fields; $i++) - { - $str_val = $row[strtolower($ary_name[$i])]; - - if (preg_match('#char|text|bool|varbinary|blob#i', $ary_type[$i])) - { - $str_quote = ''; - $str_empty = "''"; - $str_val = sanitize_data_generic(str_replace("'", "''", $str_val)); - } - else if (preg_match('#date|timestamp#i', $ary_type[$i])) - { - if (empty($str_val)) - { - $str_quote = ''; - } - else - { - $str_quote = "'"; - } - } - else - { - $str_quote = ''; - $str_empty = 'NULL'; - } - - if (empty($str_val) && $str_val !== '0') - { - $str_val = $str_empty; - } - - $schema_vals[$i] = $str_quote . $str_val . $str_quote; - $schema_fields[$i] = '"' . $ary_name[$i] . '"'; - } - - // Take the ordered fields and their associated data and build it - // into a valid sql statement to recreate that field in the data. - $sql_data = "INSERT INTO $table_name (" . implode(', ', $schema_fields) . ') VALUES (' . implode(', ', $schema_vals) . ");\n"; - - $this->flush($sql_data); - } - $db->sql_freeresult($result); - } - - function write_table($table_name) - { - global $db; - - $sql_data = '-- Table: ' . $table_name . "\n"; - $sql_data .= "DROP TABLE $table_name;\n"; - - $data_types = array(7 => 'SMALLINT', 8 => 'INTEGER', 10 => 'FLOAT', 12 => 'DATE', 13 => 'TIME', 14 => 'CHARACTER', 27 => 'DOUBLE PRECISION', 35 => 'TIMESTAMP', 37 => 'VARCHAR', 40 => 'CSTRING', 261 => 'BLOB', 701 => 'DECIMAL', 702 => 'NUMERIC'); - - $sql_data .= "\nCREATE TABLE $table_name (\n"; - - $sql = 'SELECT DISTINCT R.RDB$FIELD_NAME as FNAME, R.RDB$NULL_FLAG as NFLAG, R.RDB$DEFAULT_SOURCE as DSOURCE, F.RDB$FIELD_TYPE as FTYPE, F.RDB$FIELD_SUB_TYPE as STYPE, F.RDB$FIELD_LENGTH as FLEN - FROM RDB$RELATION_FIELDS R - JOIN RDB$FIELDS F ON R.RDB$FIELD_SOURCE=F.RDB$FIELD_NAME - LEFT JOIN RDB$FIELD_DIMENSIONS D ON R.RDB$FIELD_SOURCE = D.RDB$FIELD_NAME - WHERE F.RDB$SYSTEM_FLAG = 0 - AND R.RDB$RELATION_NAME = \''. $table_name . '\' - ORDER BY R.RDB$FIELD_POSITION'; - $result = $db->sql_query($sql); - - $rows = array(); - while ($row = $db->sql_fetchrow($result)) - { - $line = "\t" . '"' . $row['fname'] . '" ' . $data_types[$row['ftype']]; - - if ($row['ftype'] == 261 && $row['stype'] == 1) - { - $line .= ' SUB_TYPE TEXT'; - } - - if ($row['ftype'] == 37 || $row['ftype'] == 14) - { - $line .= ' (' . $row['flen'] . ')'; - } - - if (!empty($row['dsource'])) - { - $line .= ' ' . $row['dsource']; - } - - if (!empty($row['nflag'])) - { - $line .= ' NOT NULL'; - } - $rows[] = $line; - } - $db->sql_freeresult($result); - - $sql_data .= implode(",\n", $rows); - $sql_data .= "\n);\n"; - $keys = array(); - - $sql = 'SELECT I.RDB$FIELD_NAME as NAME - FROM RDB$RELATION_CONSTRAINTS RC, RDB$INDEX_SEGMENTS I, RDB$INDICES IDX - WHERE (I.RDB$INDEX_NAME = RC.RDB$INDEX_NAME) - AND (IDX.RDB$INDEX_NAME = RC.RDB$INDEX_NAME) - AND (RC.RDB$RELATION_NAME = \''. $table_name . '\') - ORDER BY I.RDB$FIELD_POSITION'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $keys[] = $row['name']; - } - - if (sizeof($keys)) - { - $sql_data .= "\nALTER TABLE $table_name ADD PRIMARY KEY (" . implode(', ', $keys) . ');'; - } - - $db->sql_freeresult($result); - - $sql = 'SELECT I.RDB$INDEX_NAME as INAME, I.RDB$UNIQUE_FLAG as UFLAG, S.RDB$FIELD_NAME as FNAME - FROM RDB$INDICES I JOIN RDB$INDEX_SEGMENTS S ON S.RDB$INDEX_NAME=I.RDB$INDEX_NAME - WHERE (I.RDB$SYSTEM_FLAG IS NULL OR I.RDB$SYSTEM_FLAG=0) - AND I.RDB$FOREIGN_KEY IS NULL - AND I.RDB$RELATION_NAME = \''. $table_name . '\' - AND I.RDB$INDEX_NAME NOT STARTING WITH \'RDB$\' - ORDER BY S.RDB$FIELD_POSITION'; - $result = $db->sql_query($sql); - - $index = array(); - while ($row = $db->sql_fetchrow($result)) - { - $index[$row['iname']]['unique'] = !empty($row['uflag']); - $index[$row['iname']]['values'][] = $row['fname']; - } - - foreach ($index as $index_name => $data) - { - $sql_data .= "\nCREATE "; - if ($data['unique']) - { - $sql_data .= 'UNIQUE '; - } - $sql_data .= "INDEX $index_name ON $table_name(" . implode(', ', $data['values']) . ");"; - } - $sql_data .= "\n"; - - $db->sql_freeresult($result); - - $sql = 'SELECT D1.RDB$DEPENDENT_NAME as DNAME, D1.RDB$FIELD_NAME as FNAME, D1.RDB$DEPENDENT_TYPE, R1.RDB$RELATION_NAME - FROM RDB$DEPENDENCIES D1 - LEFT JOIN RDB$RELATIONS R1 ON ((D1.RDB$DEPENDENT_NAME = R1.RDB$RELATION_NAME) AND (NOT (R1.RDB$VIEW_BLR IS NULL))) - WHERE (D1.RDB$DEPENDED_ON_TYPE = 0) - AND (D1.RDB$DEPENDENT_TYPE <> 3) - AND (D1.RDB$DEPENDED_ON_NAME = \'' . $table_name . '\') - UNION SELECT DISTINCT F2.RDB$RELATION_NAME, D2.RDB$FIELD_NAME, D2.RDB$DEPENDENT_TYPE, R2.RDB$RELATION_NAME FROM RDB$DEPENDENCIES D2, RDB$RELATION_FIELDS F2 - LEFT JOIN RDB$RELATIONS R2 ON ((F2.RDB$RELATION_NAME = R2.RDB$RELATION_NAME) AND (NOT (R2.RDB$VIEW_BLR IS NULL))) - WHERE (D2.RDB$DEPENDENT_TYPE = 3) - AND (D2.RDB$DEPENDENT_NAME = F2.RDB$FIELD_SOURCE) - AND (D2.RDB$DEPENDED_ON_NAME = \'' . $table_name . '\') - ORDER BY 1, 2'; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - $sql = 'SELECT T1.RDB$DEPENDED_ON_NAME as GEN, T1.RDB$FIELD_NAME, T1.RDB$DEPENDED_ON_TYPE - FROM RDB$DEPENDENCIES T1 - WHERE (T1.RDB$DEPENDENT_NAME = \'' . $row['dname'] . '\') - AND (T1.RDB$DEPENDENT_TYPE = 2 AND T1.RDB$DEPENDED_ON_TYPE = 14) - UNION ALL SELECT DISTINCT D.RDB$DEPENDED_ON_NAME, D.RDB$FIELD_NAME, D.RDB$DEPENDED_ON_TYPE - FROM RDB$DEPENDENCIES D, RDB$RELATION_FIELDS F - WHERE (D.RDB$DEPENDENT_TYPE = 3) - AND (D.RDB$DEPENDENT_NAME = F.RDB$FIELD_SOURCE) - AND (F.RDB$RELATION_NAME = \'' . $row['dname'] . '\') - ORDER BY 1,2'; - $result2 = $db->sql_query($sql); - $row2 = $db->sql_fetchrow($result2); - $db->sql_freeresult($result2); - $gen_name = $row2['gen']; - - $sql_data .= "\nDROP GENERATOR " . $gen_name . ";"; - $sql_data .= "\nSET TERM ^ ;"; - $sql_data .= "\nCREATE GENERATOR " . $gen_name . "^"; - $sql_data .= "\nSET GENERATOR " . $gen_name . " TO 0^\n"; - $sql_data .= "\nCREATE TRIGGER {$row['dname']} FOR $table_name"; - $sql_data .= "\nBEFORE INSERT\nAS\nBEGIN"; - $sql_data .= "\n NEW.{$row['fname']} = GEN_ID(" . $gen_name . ", 1);"; - $sql_data .= "\nEND^\n"; - $sql_data .= "\nSET TERM ; ^\n"; - } - - $this->flush($sql_data); - - $db->sql_freeresult($result); - } -} - -// get how much space we allow for a chunk of data, very similar to phpMyAdmin's way of doing things ;-) (hey, we only do this for MySQL anyway :P) -function get_usable_memory() -{ - $val = trim(@ini_get('memory_limit')); - - if (preg_match('/(\\d+)([mkg]?)/i', $val, $regs)) - { - $memory_limit = (int) $regs[1]; - switch ($regs[2]) - { - - case 'k': - case 'K': - $memory_limit *= 1024; - break; - - case 'm': - case 'M': - $memory_limit *= 1048576; - break; - - case 'g': - case 'G': - $memory_limit *= 1073741824; - break; - } - - // how much memory PHP requires at the start of export (it is really a little less) - if ($memory_limit > 6100000) - { - $memory_limit -= 6100000; - } - - // allow us to consume half of the total memory available - $memory_limit /= 2; - } - else - { - // set the buffer to 1M if we have no clue how much memory PHP will give us :P - $memory_limit = 1048576; - } - - return $memory_limit; -} - -function sanitize_data_mssql($text) -{ - $data = preg_split('/[\n\t\r\b\f]/', $text); - preg_match_all('/[\n\t\r\b\f]/', $text, $matches); - - $val = array(); - - foreach ($data as $value) - { - if (strlen($value)) - { - $val[] = "'" . $value . "'"; - } - if (sizeof($matches[0])) - { - $val[] = 'char(' . ord(array_shift($matches[0])) . ')'; - } - } - - return implode('+', $val); -} - -function sanitize_data_oracle($text) -{ - $data = preg_split('/[\0\n\t\r\b\f\'"\\\]/', $text); - preg_match_all('/[\0\n\t\r\b\f\'"\\\]/', $text, $matches); - - $val = array(); - - foreach ($data as $value) - { - if (strlen($value)) - { - $val[] = "'" . $value . "'"; - } - if (sizeof($matches[0])) - { - $val[] = 'chr(' . ord(array_shift($matches[0])) . ')'; - } - } - - return implode('||', $val); -} - -function sanitize_data_generic($text) -{ - $data = preg_split('/[\n\t\r\b\f]/', $text); - preg_match_all('/[\n\t\r\b\f]/', $text, $matches); - - $val = array(); - - foreach ($data as $value) - { - if (strlen($value)) - { - $val[] = "'" . $value . "'"; - } - if (sizeof($matches[0])) - { - $val[] = "'" . array_shift($matches[0]) . "'"; - } - } - - return implode('||', $val); -} - -// modified from PHP.net -function fgetd(&$fp, $delim, $read, $seek, $eof, $buffer = 8192) -{ - $record = ''; - $delim_len = strlen($delim); - - while (!$eof($fp)) - { - $pos = strpos($record, $delim); - if ($pos === false) - { - $record .= $read($fp, $buffer); - if ($eof($fp) && ($pos = strpos($record, $delim)) !== false) - { - $seek($fp, $pos + $delim_len - strlen($record), SEEK_CUR); - return substr($record, 0, $pos); - } - } - else - { - $seek($fp, $pos + $delim_len - strlen($record), SEEK_CUR); - return substr($record, 0, $pos); - } - } - - return false; -} - -function fgetd_seekless(&$fp, $delim, $read, $seek, $eof, $buffer = 8192) -{ - static $array = array(); - static $record = ''; - - if (!sizeof($array)) - { - while (!$eof($fp)) - { - if (strpos($record, $delim) !== false) - { - $array = explode($delim, $record); - $record = array_pop($array); - break; - } - else - { - $record .= $read($fp, $buffer); - } - } - if ($eof($fp) && strpos($record, $delim) !== false) - { - $array = explode($delim, $record); - $record = array_pop($array); - } - } - - if (sizeof($array)) - { - return array_shift($array); - } - - return false; -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_disallow.php b/phpBB/includes/acp/acp_disallow.php deleted file mode 100644 index 9549955cc8..0000000000 --- a/phpBB/includes/acp/acp_disallow.php +++ /dev/null @@ -1,108 +0,0 @@ -add_lang('acp/posting'); - - // Set up general vars - $this->tpl_name = 'acp_disallow'; - $this->page_title = 'ACP_DISALLOW_USERNAMES'; - - $form_key = 'acp_disallow'; - add_form_key($form_key); - - $disallow = (isset($_POST['disallow'])) ? true : false; - $allow = (isset($_POST['allow'])) ? true : false; - - if (($allow || $disallow) && !check_form_key($form_key)) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if ($disallow) - { - $disallowed_user = str_replace('*', '%', utf8_normalize_nfc(request_var('disallowed_user', '', true))); - - if (!$disallowed_user) - { - trigger_error($user->lang['NO_USERNAME_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = 'INSERT INTO ' . DISALLOW_TABLE . ' ' . $db->sql_build_array('INSERT', array('disallow_username' => $disallowed_user)); - $db->sql_query($sql); - - $cache->destroy('_disallowed_usernames'); - - $message = $user->lang['DISALLOW_SUCCESSFUL']; - add_log('admin', 'LOG_DISALLOW_ADD', str_replace('%', '*', $disallowed_user)); - - trigger_error($message . adm_back_link($this->u_action)); - } - else if ($allow) - { - $disallowed_id = request_var('disallowed_id', 0); - - if (!$disallowed_id) - { - trigger_error($user->lang['NO_USERNAME_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = 'DELETE FROM ' . DISALLOW_TABLE . ' - WHERE disallow_id = ' . $disallowed_id; - $db->sql_query($sql); - - $cache->destroy('_disallowed_usernames'); - - add_log('admin', 'LOG_DISALLOW_DELETE'); - - trigger_error($user->lang['DISALLOWED_DELETED'] . adm_back_link($this->u_action)); - } - - // Grab the current list of disallowed usernames... - $sql = 'SELECT * - FROM ' . DISALLOW_TABLE; - $result = $db->sql_query($sql); - - $disallow_select = ''; - while ($row = $db->sql_fetchrow($result)) - { - $disallow_select .= ''; - } - $db->sql_freeresult($result); - - $template->assign_vars(array( - 'U_ACTION' => $this->u_action, - 'S_DISALLOWED_NAMES' => $disallow_select) - ); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php deleted file mode 100644 index c964530c32..0000000000 --- a/phpBB/includes/acp/acp_email.php +++ /dev/null @@ -1,262 +0,0 @@ -add_lang('acp/email'); - $this->tpl_name = 'acp_email'; - $this->page_title = 'ACP_MASS_EMAIL'; - - $form_key = 'acp_email'; - add_form_key($form_key); - - // Set some vars - $submit = (isset($_POST['submit'])) ? true : false; - $error = array(); - - $usernames = request_var('usernames', '', true); - $group_id = request_var('g', 0); - $subject = utf8_normalize_nfc(request_var('subject', '', true)); - $message = utf8_normalize_nfc(request_var('message', '', true)); - - // Do the job ... - if ($submit) - { - // Error checking needs to go here ... if no subject and/or no message then skip - // over the send and return to the form - $use_queue = (isset($_POST['send_immediately'])) ? false : true; - $priority = request_var('mail_priority_flag', MAIL_NORMAL_PRIORITY); - - if (!check_form_key($form_key)) - { - $error[] = $user->lang['FORM_INVALID']; - } - - if (!$subject) - { - $error[] = $user->lang['NO_EMAIL_SUBJECT']; - } - - if (!$message) - { - $error[] = $user->lang['NO_EMAIL_MESSAGE']; - } - - if (!sizeof($error)) - { - if ($usernames) - { - // If giving usernames the admin is able to email inactive users too... - $sql = 'SELECT username, user_email, user_jabber, user_notify_type, user_lang - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('username_clean', array_map('utf8_clean_string', explode("\n", $usernames))) . ' - AND user_allow_massemail = 1 - ORDER BY user_lang, user_notify_type'; // , SUBSTRING(user_email FROM INSTR(user_email, '@')) - } - else - { - if ($group_id) - { - $sql = 'SELECT u.user_email, u.username, u.username_clean, u.user_lang, u.user_jabber, u.user_notify_type - FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug - WHERE ug.group_id = ' . $group_id . ' - AND ug.user_pending = 0 - AND u.user_id = ug.user_id - AND u.user_allow_massemail = 1 - AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ') - ORDER BY u.user_lang, u.user_notify_type'; - } - else - { - $sql = 'SELECT username, username_clean, user_email, user_jabber, user_notify_type, user_lang - FROM ' . USERS_TABLE . ' - WHERE user_allow_massemail = 1 - AND user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ') - ORDER BY user_lang, user_notify_type'; - } - } - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - - if (!$row) - { - $db->sql_freeresult($result); - trigger_error($user->lang['NO_USER'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $i = $j = 0; - - // Send with BCC, no more than 50 recipients for one mail (to not exceed the limit) - $max_chunk_size = 50; - $email_list = array(); - $old_lang = $row['user_lang']; - $old_notify_type = $row['user_notify_type']; - - do - { - if (($row['user_notify_type'] == NOTIFY_EMAIL && $row['user_email']) || - ($row['user_notify_type'] == NOTIFY_IM && $row['user_jabber']) || - ($row['user_notify_type'] == NOTIFY_BOTH && $row['user_email'] && $row['user_jabber'])) - { - if ($i == $max_chunk_size || $row['user_lang'] != $old_lang || $row['user_notify_type'] != $old_notify_type) - { - $i = 0; - - if (sizeof($email_list)) - { - $j++; - } - - $old_lang = $row['user_lang']; - $old_notify_type = $row['user_notify_type']; - } - - $email_list[$j][$i]['lang'] = $row['user_lang']; - $email_list[$j][$i]['method'] = $row['user_notify_type']; - $email_list[$j][$i]['email'] = $row['user_email']; - $email_list[$j][$i]['name'] = $row['username']; - $email_list[$j][$i]['jabber'] = $row['user_jabber']; - $i++; - } - } - while ($row = $db->sql_fetchrow($result)); - $db->sql_freeresult($result); - - // Send the messages - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx); - $messenger = new messenger($use_queue); - - $errored = false; - - for ($i = 0, $size = sizeof($email_list); $i < $size; $i++) - { - $used_lang = $email_list[$i][0]['lang']; - $used_method = $email_list[$i][0]['method']; - - for ($j = 0, $list_size = sizeof($email_list[$i]); $j < $list_size; $j++) - { - $email_row = $email_list[$i][$j]; - - $messenger->{((sizeof($email_list[$i]) == 1) ? 'to' : 'bcc')}($email_row['email'], $email_row['name']); - $messenger->im($email_row['jabber'], $email_row['name']); - } - - $messenger->template('admin_send_email', $used_lang); - - $messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); - $messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']); - $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']); - $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); - - $messenger->subject(htmlspecialchars_decode($subject)); - $messenger->set_mail_priority($priority); - - $messenger->assign_vars(array( - 'CONTACT_EMAIL' => $config['board_contact'], - 'MESSAGE' => htmlspecialchars_decode($message)) - ); - - if (!($messenger->send($used_method))) - { - $errored = true; - } - } - unset($email_list); - - $messenger->save_queue(); - - if ($usernames) - { - $usernames = explode("\n", $usernames); - add_log('admin', 'LOG_MASS_EMAIL', implode(', ', utf8_normalize_nfc($usernames))); - } - else - { - if ($group_id) - { - $group_name = get_group_name($group_id); - } - else - { - // Not great but the logging routine doesn't cope well with localising on the fly - $group_name = $user->lang['ALL_USERS']; - } - - add_log('admin', 'LOG_MASS_EMAIL', $group_name); - } - - if (!$errored) - { - $message = ($use_queue) ? $user->lang['EMAIL_SENT_QUEUE'] : $user->lang['EMAIL_SENT']; - trigger_error($message . adm_back_link($this->u_action)); - } - else - { - $message = sprintf($user->lang['EMAIL_SEND_ERROR'], '', ''); - trigger_error($message . adm_back_link($this->u_action), E_USER_WARNING); - } - } - } - - // Exclude bots and guests... - $sql = 'SELECT group_id - FROM ' . GROUPS_TABLE . " - WHERE group_name_clean IN ('bots', 'guests')"; - $result = $db->sql_query($sql); - - $exclude = array(); - while ($row = $db->sql_fetchrow($result)) - { - $exclude[] = $row['group_id']; - } - $db->sql_freeresult($result); - - $select_list = ''; - $select_list .= group_select_options($group_id, $exclude); - - $s_priority_options = ''; - $s_priority_options .= ''; - $s_priority_options .= ''; - - $template->assign_vars(array( - 'S_WARNING' => (sizeof($error)) ? true : false, - 'WARNING_MSG' => (sizeof($error)) ? implode('
    ', $error) : '', - 'U_ACTION' => $this->u_action, - 'S_GROUP_OPTIONS' => $select_list, - 'USERNAMES' => $usernames, - 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=acp_email&field=usernames'), - 'SUBJECT' => $subject, - 'MESSAGE' => $message, - 'S_PRIORITY_OPTIONS' => $s_priority_options) - ); - - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php deleted file mode 100644 index 1677440cb9..0000000000 --- a/phpBB/includes/acp/acp_forums.php +++ /dev/null @@ -1,1914 +0,0 @@ -add_lang('acp/forums'); - $this->tpl_name = 'acp_forums'; - $this->page_title = 'ACP_MANAGE_FORUMS'; - - $form_key = 'acp_forums'; - add_form_key($form_key); - - $action = request_var('action', ''); - $update = (isset($_POST['update'])) ? true : false; - $forum_id = request_var('f', 0); - - $this->parent_id = request_var('parent_id', 0); - $forum_data = $errors = array(); - if ($update && !check_form_key($form_key)) - { - $update = false; - $errors[] = $user->lang['FORM_INVALID']; - } - - // Check additional permissions - switch ($action) - { - case 'progress_bar': - $start = request_var('start', 0); - $total = request_var('total', 0); - - $this->display_progress_bar($start, $total); - exit_handler(); - break; - - case 'delete': - - if (!$auth->acl_get('a_forumdel')) - { - trigger_error($user->lang['NO_PERMISSION_FORUM_DELETE'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); - } - - break; - - case 'add': - - if (!$auth->acl_get('a_forumadd')) - { - trigger_error($user->lang['NO_PERMISSION_FORUM_ADD'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); - } - - break; - } - - // Major routines - if ($update) - { - switch ($action) - { - case 'delete': - $action_subforums = request_var('action_subforums', ''); - $subforums_to_id = request_var('subforums_to_id', 0); - $action_posts = request_var('action_posts', ''); - $posts_to_id = request_var('posts_to_id', 0); - - $errors = $this->delete_forum($forum_id, $action_posts, $action_subforums, $posts_to_id, $subforums_to_id); - - if (sizeof($errors)) - { - break; - } - - $auth->acl_clear_prefetch(); - $cache->destroy('sql', FORUMS_TABLE); - - trigger_error($user->lang['FORUM_DELETED'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id)); - - break; - - case 'edit': - $forum_data = array( - 'forum_id' => $forum_id - ); - - // No break here - - case 'add': - - $forum_data += array( - 'parent_id' => request_var('forum_parent_id', $this->parent_id), - 'forum_type' => request_var('forum_type', FORUM_POST), - 'type_action' => request_var('type_action', ''), - 'forum_status' => request_var('forum_status', ITEM_UNLOCKED), - 'forum_parents' => '', - 'forum_name' => utf8_normalize_nfc(request_var('forum_name', '', true)), - 'forum_link' => request_var('forum_link', ''), - 'forum_link_track' => request_var('forum_link_track', false), - 'forum_desc' => utf8_normalize_nfc(request_var('forum_desc', '', true)), - 'forum_desc_uid' => '', - 'forum_desc_options' => 7, - 'forum_desc_bitfield' => '', - 'forum_rules' => utf8_normalize_nfc(request_var('forum_rules', '', true)), - 'forum_rules_uid' => '', - 'forum_rules_options' => 7, - 'forum_rules_bitfield' => '', - 'forum_rules_link' => request_var('forum_rules_link', ''), - 'forum_image' => request_var('forum_image', ''), - 'forum_style' => request_var('forum_style', 0), - 'display_subforum_list' => request_var('display_subforum_list', false), - 'display_on_index' => request_var('display_on_index', false), - 'forum_topics_per_page' => request_var('topics_per_page', 0), - 'enable_indexing' => request_var('enable_indexing', true), - 'enable_icons' => request_var('enable_icons', false), - 'enable_prune' => request_var('enable_prune', false), - 'enable_post_review' => request_var('enable_post_review', true), - 'prune_days' => request_var('prune_days', 7), - 'prune_viewed' => request_var('prune_viewed', 7), - 'prune_freq' => request_var('prune_freq', 1), - 'prune_old_polls' => request_var('prune_old_polls', false), - 'prune_announce' => request_var('prune_announce', false), - 'prune_sticky' => request_var('prune_sticky', false), - 'forum_password' => request_var('forum_password', '', true), - 'forum_password_confirm'=> request_var('forum_password_confirm', '', true), - 'forum_password_unset' => request_var('forum_password_unset', false), - ); - - // Use link_display_on_index setting if forum type is link - if ($forum_data['forum_type'] == FORUM_LINK) - { - $forum_data['display_on_index'] = request_var('link_display_on_index', false); - - // Linked forums are not able to be locked... - $forum_data['forum_status'] = ITEM_UNLOCKED; - } - - $forum_data['show_active'] = ($forum_data['forum_type'] == FORUM_POST) ? request_var('display_recent', false) : request_var('display_active', false); - - // Get data for forum rules if specified... - if ($forum_data['forum_rules']) - { - generate_text_for_storage($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield'], $forum_data['forum_rules_options'], request_var('rules_parse_bbcode', false), request_var('rules_parse_urls', false), request_var('rules_parse_smilies', false)); - } - - // Get data for forum description if specified - if ($forum_data['forum_desc']) - { - generate_text_for_storage($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], $forum_data['forum_desc_options'], request_var('desc_parse_bbcode', false), request_var('desc_parse_urls', false), request_var('desc_parse_smilies', false)); - } - - $errors = $this->update_forum_data($forum_data); - - if (!sizeof($errors)) - { - $forum_perm_from = request_var('forum_perm_from', 0); - - // Copy permissions? - if ($forum_perm_from && !empty($forum_perm_from) && $forum_perm_from != $forum_data['forum_id'] && - (($action != 'edit') || empty($forum_id) || ($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth')))) - { - // if we edit a forum delete current permissions first - if ($action == 'edit') - { - $sql = 'DELETE FROM ' . ACL_USERS_TABLE . ' - WHERE forum_id = ' . (int) $forum_data['forum_id']; - $db->sql_query($sql); - - $sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . ' - WHERE forum_id = ' . (int) $forum_data['forum_id']; - $db->sql_query($sql); - } - - // From the mysql documentation: - // Prior to MySQL 4.0.14, the target table of the INSERT statement cannot appear in the FROM clause of the SELECT part of the query. This limitation is lifted in 4.0.14. - // Due to this we stay on the safe side if we do the insertion "the manual way" - - // Copy permisisons from/to the acl users table (only forum_id gets changed) - $sql = 'SELECT user_id, auth_option_id, auth_role_id, auth_setting - FROM ' . ACL_USERS_TABLE . ' - WHERE forum_id = ' . $forum_perm_from; - $result = $db->sql_query($sql); - - $users_sql_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - $users_sql_ary[] = array( - 'user_id' => (int) $row['user_id'], - 'forum_id' => (int) $forum_data['forum_id'], - 'auth_option_id' => (int) $row['auth_option_id'], - 'auth_role_id' => (int) $row['auth_role_id'], - 'auth_setting' => (int) $row['auth_setting'] - ); - } - $db->sql_freeresult($result); - - // Copy permisisons from/to the acl groups table (only forum_id gets changed) - $sql = 'SELECT group_id, auth_option_id, auth_role_id, auth_setting - FROM ' . ACL_GROUPS_TABLE . ' - WHERE forum_id = ' . $forum_perm_from; - $result = $db->sql_query($sql); - - $groups_sql_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - $groups_sql_ary[] = array( - 'group_id' => (int) $row['group_id'], - 'forum_id' => (int) $forum_data['forum_id'], - 'auth_option_id' => (int) $row['auth_option_id'], - 'auth_role_id' => (int) $row['auth_role_id'], - 'auth_setting' => (int) $row['auth_setting'] - ); - } - $db->sql_freeresult($result); - - // Now insert the data - $db->sql_multi_insert(ACL_USERS_TABLE, $users_sql_ary); - $db->sql_multi_insert(ACL_GROUPS_TABLE, $groups_sql_ary); - cache_moderators(); - } - - $auth->acl_clear_prefetch(); - $cache->destroy('sql', FORUMS_TABLE); - - $acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id']; - - $message = ($action == 'add') ? $user->lang['FORUM_CREATED'] : $user->lang['FORUM_UPDATED']; - - // Redirect to permissions - if ($auth->acl_get('a_fauth')) - { - $message .= '

    ' . sprintf($user->lang['REDIRECT_ACL'], '', ''); - } - - // redirect directly to permission settings screen if authed - if ($action == 'add' && !$forum_perm_from && $auth->acl_get('a_fauth')) - { - meta_refresh(4, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url)); - } - - trigger_error($message . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id)); - } - - break; - } - } - - switch ($action) - { - case 'move_up': - case 'move_down': - - if (!$forum_id) - { - trigger_error($user->lang['NO_FORUM'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); - } - - $sql = 'SELECT * - FROM ' . FORUMS_TABLE . " - WHERE forum_id = $forum_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error($user->lang['NO_FORUM'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); - } - - $move_forum_name = $this->move_forum_by($row, $action, 1); - - if ($move_forum_name !== false) - { - add_log('admin', 'LOG_FORUM_' . strtoupper($action), $row['forum_name'], $move_forum_name); - $cache->destroy('sql', FORUMS_TABLE); - } - - break; - - case 'sync': - if (!$forum_id) - { - trigger_error($user->lang['NO_FORUM'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); - } - - @set_time_limit(0); - - $sql = 'SELECT forum_name, forum_topics_real - FROM ' . FORUMS_TABLE . " - WHERE forum_id = $forum_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error($user->lang['NO_FORUM'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); - } - - if ($row['forum_topics_real']) - { - $sql = 'SELECT MIN(topic_id) as min_topic_id, MAX(topic_id) as max_topic_id - FROM ' . TOPICS_TABLE . ' - WHERE forum_id = ' . $forum_id; - $result = $db->sql_query($sql); - $row2 = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // Typecast to int if there is no data available - $row2['min_topic_id'] = (int) $row2['min_topic_id']; - $row2['max_topic_id'] = (int) $row2['max_topic_id']; - - $start = request_var('start', $row2['min_topic_id']); - - $batch_size = 2000; - $end = $start + $batch_size; - - // Sync all topics in batch mode... - sync('topic_approved', 'range', 'topic_id BETWEEN ' . $start . ' AND ' . $end, true, false); - sync('topic', 'range', 'topic_id BETWEEN ' . $start . ' AND ' . $end, true, true); - - if ($end < $row2['max_topic_id']) - { - // We really need to find a way of showing statistics... no progress here - $sql = 'SELECT COUNT(topic_id) as num_topics - FROM ' . TOPICS_TABLE . ' - WHERE forum_id = ' . $forum_id . ' - AND topic_id BETWEEN ' . $start . ' AND ' . $end; - $result = $db->sql_query($sql); - $topics_done = request_var('topics_done', 0) + (int) $db->sql_fetchfield('num_topics'); - $db->sql_freeresult($result); - - $start += $batch_size; - - $url = $this->u_action . "&parent_id={$this->parent_id}&f=$forum_id&action=sync&start=$start&topics_done=$topics_done&total={$row['forum_topics_real']}"; - - meta_refresh(0, $url); - - $template->assign_vars(array( - 'U_PROGRESS_BAR' => $this->u_action . "&action=progress_bar&start=$topics_done&total={$row['forum_topics_real']}", - 'UA_PROGRESS_BAR' => addslashes($this->u_action . "&action=progress_bar&start=$topics_done&total={$row['forum_topics_real']}"), - 'S_CONTINUE_SYNC' => true, - 'L_PROGRESS_EXPLAIN' => sprintf($user->lang['SYNC_IN_PROGRESS_EXPLAIN'], $topics_done, $row['forum_topics_real'])) - ); - - return; - } - } - - $url = $this->u_action . "&parent_id={$this->parent_id}&f=$forum_id&action=sync_forum"; - meta_refresh(0, $url); - - $template->assign_vars(array( - 'U_PROGRESS_BAR' => $this->u_action . '&action=progress_bar', - 'UA_PROGRESS_BAR' => addslashes($this->u_action . '&action=progress_bar'), - 'S_CONTINUE_SYNC' => true, - 'L_PROGRESS_EXPLAIN' => sprintf($user->lang['SYNC_IN_PROGRESS_EXPLAIN'], 0, $row['forum_topics_real'])) - ); - - return; - - break; - - case 'sync_forum': - - $sql = 'SELECT forum_name, forum_type - FROM ' . FORUMS_TABLE . " - WHERE forum_id = $forum_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error($user->lang['NO_FORUM'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); - } - - sync('forum', 'forum_id', $forum_id, false, true); - - add_log('admin', 'LOG_FORUM_SYNC', $row['forum_name']); - $cache->destroy('sql', FORUMS_TABLE); - - $template->assign_var('L_FORUM_RESYNCED', sprintf($user->lang['FORUM_RESYNCED'], $row['forum_name'])); - - break; - - case 'add': - case 'edit': - - if ($update) - { - $forum_data['forum_flags'] = 0; - $forum_data['forum_flags'] += (request_var('forum_link_track', false)) ? FORUM_FLAG_LINK_TRACK : 0; - $forum_data['forum_flags'] += (request_var('prune_old_polls', false)) ? FORUM_FLAG_PRUNE_POLL : 0; - $forum_data['forum_flags'] += (request_var('prune_announce', false)) ? FORUM_FLAG_PRUNE_ANNOUNCE : 0; - $forum_data['forum_flags'] += (request_var('prune_sticky', false)) ? FORUM_FLAG_PRUNE_STICKY : 0; - $forum_data['forum_flags'] += ($forum_data['show_active']) ? FORUM_FLAG_ACTIVE_TOPICS : 0; - $forum_data['forum_flags'] += (request_var('enable_post_review', true)) ? FORUM_FLAG_POST_REVIEW : 0; - } - - // Show form to create/modify a forum - if ($action == 'edit') - { - $this->page_title = 'EDIT_FORUM'; - $row = $this->get_forum_info($forum_id); - $old_forum_type = $row['forum_type']; - - if (!$update) - { - $forum_data = $row; - } - else - { - $forum_data['left_id'] = $row['left_id']; - $forum_data['right_id'] = $row['right_id']; - } - - // Make sure no direct child forums are able to be selected as parents. - $exclude_forums = array(); - foreach (get_forum_branch($forum_id, 'children') as $row) - { - $exclude_forums[] = $row['forum_id']; - } - - $parents_list = make_forum_select($forum_data['parent_id'], $exclude_forums, false, false, false); - - $forum_data['forum_password_confirm'] = $forum_data['forum_password']; - } - else - { - $this->page_title = 'CREATE_FORUM'; - - $forum_id = $this->parent_id; - $parents_list = make_forum_select($this->parent_id, false, false, false, false); - - // Fill forum data with default values - if (!$update) - { - $forum_data = array( - 'parent_id' => $this->parent_id, - 'forum_type' => FORUM_POST, - 'forum_status' => ITEM_UNLOCKED, - 'forum_name' => utf8_normalize_nfc(request_var('forum_name', '', true)), - 'forum_link' => '', - 'forum_link_track' => false, - 'forum_desc' => '', - 'forum_rules' => '', - 'forum_rules_link' => '', - 'forum_image' => '', - 'forum_style' => 0, - 'display_subforum_list' => true, - 'display_on_index' => false, - 'forum_topics_per_page' => 0, - 'enable_indexing' => true, - 'enable_icons' => false, - 'enable_prune' => false, - 'prune_days' => 7, - 'prune_viewed' => 7, - 'prune_freq' => 1, - 'forum_flags' => FORUM_FLAG_POST_REVIEW, - 'forum_password' => '', - 'forum_password_confirm'=> '', - ); - } - } - - $forum_rules_data = array( - 'text' => $forum_data['forum_rules'], - 'allow_bbcode' => true, - 'allow_smilies' => true, - 'allow_urls' => true - ); - - $forum_desc_data = array( - 'text' => $forum_data['forum_desc'], - 'allow_bbcode' => true, - 'allow_smilies' => true, - 'allow_urls' => true - ); - - $forum_rules_preview = ''; - - // Parse rules if specified - if ($forum_data['forum_rules']) - { - if (!isset($forum_data['forum_rules_uid'])) - { - // Before we are able to display the preview and plane text, we need to parse our request_var()'d value... - $forum_data['forum_rules_uid'] = ''; - $forum_data['forum_rules_bitfield'] = ''; - $forum_data['forum_rules_options'] = 0; - - generate_text_for_storage($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield'], $forum_data['forum_rules_options'], request_var('rules_allow_bbcode', false), request_var('rules_allow_urls', false), request_var('rules_allow_smilies', false)); - } - - // Generate preview content - $forum_rules_preview = generate_text_for_display($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield'], $forum_data['forum_rules_options']); - - // decode... - $forum_rules_data = generate_text_for_edit($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_options']); - } - - // Parse desciption if specified - if ($forum_data['forum_desc']) - { - if (!isset($forum_data['forum_desc_uid'])) - { - // Before we are able to display the preview and plane text, we need to parse our request_var()'d value... - $forum_data['forum_desc_uid'] = ''; - $forum_data['forum_desc_bitfield'] = ''; - $forum_data['forum_desc_options'] = 0; - - generate_text_for_storage($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], $forum_data['forum_desc_options'], request_var('desc_allow_bbcode', false), request_var('desc_allow_urls', false), request_var('desc_allow_smilies', false)); - } - - // decode... - $forum_desc_data = generate_text_for_edit($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_options']); - } - - $forum_type_options = ''; - $forum_type_ary = array(FORUM_CAT => 'CAT', FORUM_POST => 'FORUM', FORUM_LINK => 'LINK'); - - foreach ($forum_type_ary as $value => $lang) - { - $forum_type_options .= ''; - } - - $styles_list = style_select($forum_data['forum_style'], true); - - $statuslist = ''; - - $sql = 'SELECT forum_id - FROM ' . FORUMS_TABLE . ' - WHERE forum_type = ' . FORUM_POST . " - AND forum_id <> $forum_id"; - $result = $db->sql_query($sql); - - if ($db->sql_fetchrow($result)) - { - $template->assign_vars(array( - 'S_MOVE_FORUM_OPTIONS' => make_forum_select($forum_data['parent_id'], $forum_id, false, true, false)) - ); - } - $db->sql_freeresult($result); - - // Subforum move options - if ($action == 'edit' && $forum_data['forum_type'] == FORUM_CAT) - { - $subforums_id = array(); - $subforums = get_forum_branch($forum_id, 'children'); - - foreach ($subforums as $row) - { - $subforums_id[] = $row['forum_id']; - } - - $forums_list = make_forum_select($forum_data['parent_id'], $subforums_id); - - $sql = 'SELECT forum_id - FROM ' . FORUMS_TABLE . ' - WHERE forum_type = ' . FORUM_POST . " - AND forum_id <> $forum_id"; - $result = $db->sql_query($sql); - - if ($db->sql_fetchrow($result)) - { - $template->assign_vars(array( - 'S_MOVE_FORUM_OPTIONS' => make_forum_select($forum_data['parent_id'], $subforums_id)) // , false, true, false??? - ); - } - $db->sql_freeresult($result); - - $template->assign_vars(array( - 'S_HAS_SUBFORUMS' => ($forum_data['right_id'] - $forum_data['left_id'] > 1) ? true : false, - 'S_FORUMS_LIST' => $forums_list) - ); - } - - $s_show_display_on_index = false; - - if ($forum_data['parent_id'] > 0) - { - // if this forum is a subforum put the "display on index" checkbox - if ($parent_info = $this->get_forum_info($forum_data['parent_id'])) - { - if ($parent_info['parent_id'] > 0 || $parent_info['forum_type'] == FORUM_CAT) - { - $s_show_display_on_index = true; - } - } - } - - if (strlen($forum_data['forum_password']) == 32) - { - $errors[] = $user->lang['FORUM_PASSWORD_OLD']; - } - - $template->assign_vars(array( - 'S_EDIT_FORUM' => true, - 'S_ERROR' => (sizeof($errors)) ? true : false, - 'S_PARENT_ID' => $this->parent_id, - 'S_FORUM_PARENT_ID' => $forum_data['parent_id'], - 'S_ADD_ACTION' => ($action == 'add') ? true : false, - - 'U_BACK' => $this->u_action . '&parent_id=' . $this->parent_id, - 'U_EDIT_ACTION' => $this->u_action . "&parent_id={$this->parent_id}&action=$action&f=$forum_id", - - 'L_COPY_PERMISSIONS_EXPLAIN' => $user->lang['COPY_PERMISSIONS_' . strtoupper($action) . '_EXPLAIN'], - 'L_TITLE' => $user->lang[$this->page_title], - 'ERROR_MSG' => (sizeof($errors)) ? implode('
    ', $errors) : '', - - 'FORUM_NAME' => $forum_data['forum_name'], - 'FORUM_DATA_LINK' => $forum_data['forum_link'], - 'FORUM_IMAGE' => $forum_data['forum_image'], - 'FORUM_IMAGE_SRC' => ($forum_data['forum_image']) ? $phpbb_root_path . $forum_data['forum_image'] : '', - 'FORUM_POST' => FORUM_POST, - 'FORUM_LINK' => FORUM_LINK, - 'FORUM_CAT' => FORUM_CAT, - 'PRUNE_FREQ' => $forum_data['prune_freq'], - 'PRUNE_DAYS' => $forum_data['prune_days'], - 'PRUNE_VIEWED' => $forum_data['prune_viewed'], - 'TOPICS_PER_PAGE' => $forum_data['forum_topics_per_page'], - 'FORUM_RULES_LINK' => $forum_data['forum_rules_link'], - 'FORUM_RULES' => $forum_data['forum_rules'], - 'FORUM_RULES_PREVIEW' => $forum_rules_preview, - 'FORUM_RULES_PLAIN' => $forum_rules_data['text'], - 'S_BBCODE_CHECKED' => ($forum_rules_data['allow_bbcode']) ? true : false, - 'S_SMILIES_CHECKED' => ($forum_rules_data['allow_smilies']) ? true : false, - 'S_URLS_CHECKED' => ($forum_rules_data['allow_urls']) ? true : false, - 'S_FORUM_PASSWORD_SET' => (empty($forum_data['forum_password'])) ? false : true, - - 'FORUM_DESC' => $forum_desc_data['text'], - 'S_DESC_BBCODE_CHECKED' => ($forum_desc_data['allow_bbcode']) ? true : false, - 'S_DESC_SMILIES_CHECKED' => ($forum_desc_data['allow_smilies']) ? true : false, - 'S_DESC_URLS_CHECKED' => ($forum_desc_data['allow_urls']) ? true : false, - - 'S_FORUM_TYPE_OPTIONS' => $forum_type_options, - 'S_STATUS_OPTIONS' => $statuslist, - 'S_PARENT_OPTIONS' => $parents_list, - 'S_STYLES_OPTIONS' => $styles_list, - 'S_FORUM_OPTIONS' => make_forum_select(($action == 'add') ? $forum_data['parent_id'] : false, ($action == 'edit') ? $forum_data['forum_id'] : false, false, false, false), - 'S_SHOW_DISPLAY_ON_INDEX' => $s_show_display_on_index, - 'S_FORUM_POST' => ($forum_data['forum_type'] == FORUM_POST) ? true : false, - 'S_FORUM_ORIG_POST' => (isset($old_forum_type) && $old_forum_type == FORUM_POST) ? true : false, - 'S_FORUM_ORIG_CAT' => (isset($old_forum_type) && $old_forum_type == FORUM_CAT) ? true : false, - 'S_FORUM_ORIG_LINK' => (isset($old_forum_type) && $old_forum_type == FORUM_LINK) ? true : false, - 'S_FORUM_LINK' => ($forum_data['forum_type'] == FORUM_LINK) ? true : false, - 'S_FORUM_CAT' => ($forum_data['forum_type'] == FORUM_CAT) ? true : false, - 'S_ENABLE_INDEXING' => ($forum_data['enable_indexing']) ? true : false, - 'S_TOPIC_ICONS' => ($forum_data['enable_icons']) ? true : false, - 'S_DISPLAY_SUBFORUM_LIST' => ($forum_data['display_subforum_list']) ? true : false, - 'S_DISPLAY_ON_INDEX' => ($forum_data['display_on_index']) ? true : false, - 'S_PRUNE_ENABLE' => ($forum_data['enable_prune']) ? true : false, - 'S_FORUM_LINK_TRACK' => ($forum_data['forum_flags'] & FORUM_FLAG_LINK_TRACK) ? true : false, - 'S_PRUNE_OLD_POLLS' => ($forum_data['forum_flags'] & FORUM_FLAG_PRUNE_POLL) ? true : false, - 'S_PRUNE_ANNOUNCE' => ($forum_data['forum_flags'] & FORUM_FLAG_PRUNE_ANNOUNCE) ? true : false, - 'S_PRUNE_STICKY' => ($forum_data['forum_flags'] & FORUM_FLAG_PRUNE_STICKY) ? true : false, - 'S_DISPLAY_ACTIVE_TOPICS' => ($forum_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS) ? true : false, - 'S_ENABLE_POST_REVIEW' => ($forum_data['forum_flags'] & FORUM_FLAG_POST_REVIEW) ? true : false, - 'S_CAN_COPY_PERMISSIONS' => ($action != 'edit' || empty($forum_id) || ($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth'))) ? true : false, - )); - - return; - - break; - - case 'delete': - - if (!$forum_id) - { - trigger_error($user->lang['NO_FORUM'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); - } - - $forum_data = $this->get_forum_info($forum_id); - - $subforums_id = array(); - $subforums = get_forum_branch($forum_id, 'children'); - - foreach ($subforums as $row) - { - $subforums_id[] = $row['forum_id']; - } - - $forums_list = make_forum_select($forum_data['parent_id'], $subforums_id); - - $sql = 'SELECT forum_id - FROM ' . FORUMS_TABLE . ' - WHERE forum_type = ' . FORUM_POST . " - AND forum_id <> $forum_id"; - $result = $db->sql_query($sql); - - if ($db->sql_fetchrow($result)) - { - $template->assign_vars(array( - 'S_MOVE_FORUM_OPTIONS' => make_forum_select($forum_data['parent_id'], $subforums_id, false, true)) // , false, true, false??? - ); - } - $db->sql_freeresult($result); - - $parent_id = ($this->parent_id == $forum_id) ? 0 : $this->parent_id; - - $template->assign_vars(array( - 'S_DELETE_FORUM' => true, - 'U_ACTION' => $this->u_action . "&parent_id={$parent_id}&action=delete&f=$forum_id", - 'U_BACK' => $this->u_action . '&parent_id=' . $this->parent_id, - - 'FORUM_NAME' => $forum_data['forum_name'], - 'S_FORUM_POST' => ($forum_data['forum_type'] == FORUM_POST) ? true : false, - 'S_FORUM_LINK' => ($forum_data['forum_type'] == FORUM_LINK) ? true : false, - 'S_HAS_SUBFORUMS' => ($forum_data['right_id'] - $forum_data['left_id'] > 1) ? true : false, - 'S_FORUMS_LIST' => $forums_list, - 'S_ERROR' => (sizeof($errors)) ? true : false, - 'ERROR_MSG' => (sizeof($errors)) ? implode('
    ', $errors) : '') - ); - - return; - break; - } - - // Default management page - if (!$this->parent_id) - { - $navigation = $user->lang['FORUM_INDEX']; - } - else - { - $navigation = '' . $user->lang['FORUM_INDEX'] . ''; - - $forums_nav = get_forum_branch($this->parent_id, 'parents', 'descending'); - foreach ($forums_nav as $row) - { - if ($row['forum_id'] == $this->parent_id) - { - $navigation .= ' -> ' . $row['forum_name']; - } - else - { - $navigation .= ' -> ' . $row['forum_name'] . ''; - } - } - } - - // Jumpbox - $forum_box = make_forum_select($this->parent_id, false, false, false, false); //make_forum_select($this->parent_id); - - if ($action == 'sync' || $action == 'sync_forum') - { - $template->assign_var('S_RESYNCED', true); - } - - $sql = 'SELECT * - FROM ' . FORUMS_TABLE . " - WHERE parent_id = $this->parent_id - ORDER BY left_id"; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - do - { - $forum_type = $row['forum_type']; - - if ($row['forum_status'] == ITEM_LOCKED) - { - $folder_image = '' . $user->lang['LOCKED'] . ''; - } - else - { - switch ($forum_type) - { - case FORUM_LINK: - $folder_image = '' . $user->lang['LINK'] . ''; - break; - - default: - $folder_image = ($row['left_id'] + 1 != $row['right_id']) ? '' . $user->lang['SUBFORUM'] . '' : '' . $user->lang['FOLDER'] . ''; - break; - } - } - - $url = $this->u_action . "&parent_id=$this->parent_id&f={$row['forum_id']}"; - - $forum_title = ($forum_type != FORUM_LINK) ? '' : ''; - $forum_title .= $row['forum_name']; - $forum_title .= ($forum_type != FORUM_LINK) ? '' : ''; - - $template->assign_block_vars('forums', array( - 'FOLDER_IMAGE' => $folder_image, - 'FORUM_IMAGE' => ($row['forum_image']) ? '' : '', - 'FORUM_IMAGE_SRC' => ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '', - 'FORUM_NAME' => $row['forum_name'], - 'FORUM_DESCRIPTION' => generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']), - 'FORUM_TOPICS' => $row['forum_topics'], - 'FORUM_POSTS' => $row['forum_posts'], - - 'S_FORUM_LINK' => ($forum_type == FORUM_LINK) ? true : false, - 'S_FORUM_POST' => ($forum_type == FORUM_POST) ? true : false, - - 'U_FORUM' => $this->u_action . '&parent_id=' . $row['forum_id'], - 'U_MOVE_UP' => $url . '&action=move_up', - 'U_MOVE_DOWN' => $url . '&action=move_down', - 'U_EDIT' => $url . '&action=edit', - 'U_DELETE' => $url . '&action=delete', - 'U_SYNC' => $url . '&action=sync') - ); - } - while ($row = $db->sql_fetchrow($result)); - } - else if ($this->parent_id) - { - $row = $this->get_forum_info($this->parent_id); - - $url = $this->u_action . '&parent_id=' . $this->parent_id . '&f=' . $row['forum_id']; - - $template->assign_vars(array( - 'S_NO_FORUMS' => true, - - 'U_EDIT' => $url . '&action=edit', - 'U_DELETE' => $url . '&action=delete', - 'U_SYNC' => $url . '&action=sync') - ); - } - $db->sql_freeresult($result); - - $template->assign_vars(array( - 'ERROR_MSG' => (sizeof($errors)) ? implode('
    ', $errors) : '', - 'NAVIGATION' => $navigation, - 'FORUM_BOX' => $forum_box, - 'U_SEL_ACTION' => $this->u_action, - 'U_ACTION' => $this->u_action . '&parent_id=' . $this->parent_id, - - 'U_PROGRESS_BAR' => $this->u_action . '&action=progress_bar', - 'UA_PROGRESS_BAR' => addslashes($this->u_action . '&action=progress_bar'), - )); - } - - /** - * Get forum details - */ - function get_forum_info($forum_id) - { - global $db; - - $sql = 'SELECT * - FROM ' . FORUMS_TABLE . " - WHERE forum_id = $forum_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error("Forum #$forum_id does not exist", E_USER_ERROR); - } - - return $row; - } - - /** - * Update forum data - */ - function update_forum_data(&$forum_data) - { - global $db, $user, $cache; - - $errors = array(); - - if (!$forum_data['forum_name']) - { - $errors[] = $user->lang['FORUM_NAME_EMPTY']; - } - - if (utf8_strlen($forum_data['forum_desc']) > 4000) - { - $errors[] = $user->lang['FORUM_DESC_TOO_LONG']; - } - - if (utf8_strlen($forum_data['forum_rules']) > 4000) - { - $errors[] = $user->lang['FORUM_RULES_TOO_LONG']; - } - - if ($forum_data['forum_password'] || $forum_data['forum_password_confirm']) - { - if ($forum_data['forum_password'] != $forum_data['forum_password_confirm']) - { - $forum_data['forum_password'] = $forum_data['forum_password_confirm'] = ''; - $errors[] = $user->lang['FORUM_PASSWORD_MISMATCH']; - } - } - - if ($forum_data['prune_days'] < 0 || $forum_data['prune_viewed'] < 0 || $forum_data['prune_freq'] < 0) - { - $forum_data['prune_days'] = $forum_data['prune_viewed'] = $forum_data['prune_freq'] = 0; - $errors[] = $user->lang['FORUM_DATA_NEGATIVE']; - } - - // Set forum flags - // 1 = link tracking - // 2 = prune old polls - // 4 = prune announcements - // 8 = prune stickies - // 16 = show active topics - // 32 = enable post review - $forum_data['forum_flags'] = 0; - $forum_data['forum_flags'] += ($forum_data['forum_link_track']) ? FORUM_FLAG_LINK_TRACK : 0; - $forum_data['forum_flags'] += ($forum_data['prune_old_polls']) ? FORUM_FLAG_PRUNE_POLL : 0; - $forum_data['forum_flags'] += ($forum_data['prune_announce']) ? FORUM_FLAG_PRUNE_ANNOUNCE : 0; - $forum_data['forum_flags'] += ($forum_data['prune_sticky']) ? FORUM_FLAG_PRUNE_STICKY : 0; - $forum_data['forum_flags'] += ($forum_data['show_active']) ? FORUM_FLAG_ACTIVE_TOPICS : 0; - $forum_data['forum_flags'] += ($forum_data['enable_post_review']) ? FORUM_FLAG_POST_REVIEW : 0; - - // Unset data that are not database fields - $forum_data_sql = $forum_data; - - unset($forum_data_sql['forum_link_track']); - unset($forum_data_sql['prune_old_polls']); - unset($forum_data_sql['prune_announce']); - unset($forum_data_sql['prune_sticky']); - unset($forum_data_sql['show_active']); - unset($forum_data_sql['enable_post_review']); - unset($forum_data_sql['forum_password_confirm']); - - // What are we going to do tonight Brain? The same thing we do everynight, - // try to take over the world ... or decide whether to continue update - // and if so, whether it's a new forum/cat/link or an existing one - if (sizeof($errors)) - { - return $errors; - } - - // As we don't know the old password, it's kinda tricky to detect changes - if ($forum_data_sql['forum_password_unset']) - { - $forum_data_sql['forum_password'] = ''; - } - else if (empty($forum_data_sql['forum_password'])) - { - unset($forum_data_sql['forum_password']); - } - else - { - $forum_data_sql['forum_password'] = phpbb_hash($forum_data_sql['forum_password']); - } - unset($forum_data_sql['forum_password_unset']); - - if (!isset($forum_data_sql['forum_id'])) - { - // no forum_id means we're creating a new forum - unset($forum_data_sql['type_action']); - - if ($forum_data_sql['parent_id']) - { - $sql = 'SELECT left_id, right_id, forum_type - FROM ' . FORUMS_TABLE . ' - WHERE forum_id = ' . $forum_data_sql['parent_id']; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error($user->lang['PARENT_NOT_EXIST'] . adm_back_link($this->u_action . '&' . $this->parent_id), E_USER_WARNING); - } - - if ($row['forum_type'] == FORUM_LINK) - { - $errors[] = $user->lang['PARENT_IS_LINK_FORUM']; - return $errors; - } - - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET left_id = left_id + 2, right_id = right_id + 2 - WHERE left_id > ' . $row['right_id']; - $db->sql_query($sql); - - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET right_id = right_id + 2 - WHERE ' . $row['left_id'] . ' BETWEEN left_id AND right_id'; - $db->sql_query($sql); - - $forum_data_sql['left_id'] = $row['right_id']; - $forum_data_sql['right_id'] = $row['right_id'] + 1; - } - else - { - $sql = 'SELECT MAX(right_id) AS right_id - FROM ' . FORUMS_TABLE; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $forum_data_sql['left_id'] = $row['right_id'] + 1; - $forum_data_sql['right_id'] = $row['right_id'] + 2; - } - - $sql = 'INSERT INTO ' . FORUMS_TABLE . ' ' . $db->sql_build_array('INSERT', $forum_data_sql); - $db->sql_query($sql); - - $forum_data['forum_id'] = $db->sql_nextid(); - - add_log('admin', 'LOG_FORUM_ADD', $forum_data['forum_name']); - } - else - { - $row = $this->get_forum_info($forum_data_sql['forum_id']); - - if ($row['forum_type'] == FORUM_POST && $row['forum_type'] != $forum_data_sql['forum_type']) - { - // Has subforums and want to change into a link? - if ($row['right_id'] - $row['left_id'] > 1 && $forum_data_sql['forum_type'] == FORUM_LINK) - { - $errors[] = $user->lang['FORUM_WITH_SUBFORUMS_NOT_TO_LINK']; - return $errors; - } - - // we're turning a postable forum into a non-postable forum - if ($forum_data_sql['type_action'] == 'move') - { - $to_forum_id = request_var('to_forum_id', 0); - - if ($to_forum_id) - { - $errors = $this->move_forum_content($forum_data_sql['forum_id'], $to_forum_id); - } - else - { - return array($user->lang['NO_DESTINATION_FORUM']); - } - } - else if ($forum_data_sql['type_action'] == 'delete') - { - $errors = $this->delete_forum_content($forum_data_sql['forum_id']); - } - else - { - return array($user->lang['NO_FORUM_ACTION']); - } - - $forum_data_sql['forum_posts'] = $forum_data_sql['forum_topics'] = $forum_data_sql['forum_topics_real'] = $forum_data_sql['forum_last_post_id'] = $forum_data_sql['forum_last_poster_id'] = $forum_data_sql['forum_last_post_time'] = 0; - $forum_data_sql['forum_last_poster_name'] = $forum_data_sql['forum_last_poster_colour'] = ''; - } - else if ($row['forum_type'] == FORUM_CAT && $forum_data_sql['forum_type'] == FORUM_LINK) - { - // Has subforums? - if ($row['right_id'] - $row['left_id'] > 1) - { - // We are turning a category into a link - but need to decide what to do with the subforums. - $action_subforums = request_var('action_subforums', ''); - $subforums_to_id = request_var('subforums_to_id', 0); - - if ($action_subforums == 'delete') - { - $rows = get_forum_branch($row['forum_id'], 'children', 'descending', false); - - foreach ($rows as $_row) - { - // Do not remove the forum id we are about to change. ;) - if ($_row['forum_id'] == $row['forum_id']) - { - continue; - } - - $forum_ids[] = $_row['forum_id']; - $errors = array_merge($errors, $this->delete_forum_content($_row['forum_id'])); - } - - if (sizeof($errors)) - { - return $errors; - } - - if (sizeof($forum_ids)) - { - $sql = 'DELETE FROM ' . FORUMS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $forum_ids); - $db->sql_query($sql); - - $sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $forum_ids); - $db->sql_query($sql); - - $sql = 'DELETE FROM ' . ACL_USERS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $forum_ids); - $db->sql_query($sql); - - // Delete forum ids from extension groups table - $sql = 'SELECT group_id, allowed_forums - FROM ' . EXTENSION_GROUPS_TABLE; - $result = $db->sql_query($sql); - - while ($_row = $db->sql_fetchrow($result)) - { - if (!$_row['allowed_forums']) - { - continue; - } - - $allowed_forums = unserialize(trim($_row['allowed_forums'])); - $allowed_forums = array_diff($allowed_forums, $forum_ids); - - $sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . " - SET allowed_forums = '" . ((sizeof($allowed_forums)) ? serialize($allowed_forums) : '') . "' - WHERE group_id = {$_row['group_id']}"; - $db->sql_query($sql); - } - $db->sql_freeresult($result); - - $cache->destroy('_extensions'); - } - } - else if ($action_subforums == 'move') - { - if (!$subforums_to_id) - { - return array($user->lang['NO_DESTINATION_FORUM']); - } - - $sql = 'SELECT forum_name - FROM ' . FORUMS_TABLE . ' - WHERE forum_id = ' . $subforums_to_id; - $result = $db->sql_query($sql); - $_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$_row) - { - return array($user->lang['NO_FORUM']); - } - - $subforums_to_name = $_row['forum_name']; - - $sql = 'SELECT forum_id - FROM ' . FORUMS_TABLE . " - WHERE parent_id = {$row['forum_id']}"; - $result = $db->sql_query($sql); - - while ($_row = $db->sql_fetchrow($result)) - { - $this->move_forum($_row['forum_id'], $subforums_to_id); - } - $db->sql_freeresult($result); - - $sql = 'UPDATE ' . FORUMS_TABLE . " - SET parent_id = $subforums_to_id - WHERE parent_id = {$row['forum_id']}"; - $db->sql_query($sql); - } - - // Adjust the left/right id - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET right_id = left_id + 1 - WHERE forum_id = ' . $row['forum_id']; - $db->sql_query($sql); - } - } - else if ($row['forum_type'] == FORUM_CAT && $forum_data_sql['forum_type'] == FORUM_POST) - { - // Changing a category to a forum? Reset the data (you can't post directly in a cat, you must use a forum) - $forum_data_sql['forum_posts'] = 0; - $forum_data_sql['forum_topics'] = 0; - $forum_data_sql['forum_topics_real'] = 0; - $forum_data_sql['forum_last_post_id'] = 0; - $forum_data_sql['forum_last_post_subject'] = ''; - $forum_data_sql['forum_last_post_time'] = 0; - $forum_data_sql['forum_last_poster_id'] = 0; - $forum_data_sql['forum_last_poster_name'] = ''; - $forum_data_sql['forum_last_poster_colour'] = ''; - } - - if (sizeof($errors)) - { - return $errors; - } - - if ($row['parent_id'] != $forum_data_sql['parent_id']) - { - $errors = $this->move_forum($forum_data_sql['forum_id'], $forum_data_sql['parent_id']); - } - - if (sizeof($errors)) - { - return $errors; - } - - unset($forum_data_sql['type_action']); - - if ($row['forum_name'] != $forum_data_sql['forum_name']) - { - // the forum name has changed, clear the parents list of all forums (for safety) - $sql = 'UPDATE ' . FORUMS_TABLE . " - SET forum_parents = ''"; - $db->sql_query($sql); - } - - // Setting the forum id to the forum id is not really received well by some dbs. ;) - $forum_id = $forum_data_sql['forum_id']; - unset($forum_data_sql['forum_id']); - - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $forum_data_sql) . ' - WHERE forum_id = ' . $forum_id; - $db->sql_query($sql); - - // Add it back - $forum_data['forum_id'] = $forum_id; - - add_log('admin', 'LOG_FORUM_EDIT', $forum_data['forum_name']); - } - - return $errors; - } - - /** - * Move forum - */ - function move_forum($from_id, $to_id) - { - global $db, $user; - - $to_data = $moved_ids = $errors = array(); - - // Check if we want to move to a parent with link type - if ($to_id > 0) - { - $to_data = $this->get_forum_info($to_id); - - if ($to_data['forum_type'] == FORUM_LINK) - { - $errors[] = $user->lang['PARENT_IS_LINK_FORUM']; - return $errors; - } - } - - $moved_forums = get_forum_branch($from_id, 'children', 'descending'); - $from_data = $moved_forums[0]; - $diff = sizeof($moved_forums) * 2; - - $moved_ids = array(); - for ($i = 0; $i < sizeof($moved_forums); ++$i) - { - $moved_ids[] = $moved_forums[$i]['forum_id']; - } - - // Resync parents - $sql = 'UPDATE ' . FORUMS_TABLE . " - SET right_id = right_id - $diff, forum_parents = '' - WHERE left_id < " . $from_data['right_id'] . " - AND right_id > " . $from_data['right_id']; - $db->sql_query($sql); - - // Resync righthand side of tree - $sql = 'UPDATE ' . FORUMS_TABLE . " - SET left_id = left_id - $diff, right_id = right_id - $diff, forum_parents = '' - WHERE left_id > " . $from_data['right_id']; - $db->sql_query($sql); - - if ($to_id > 0) - { - // Retrieve $to_data again, it may have been changed... - $to_data = $this->get_forum_info($to_id); - - // Resync new parents - $sql = 'UPDATE ' . FORUMS_TABLE . " - SET right_id = right_id + $diff, forum_parents = '' - WHERE " . $to_data['right_id'] . ' BETWEEN left_id AND right_id - AND ' . $db->sql_in_set('forum_id', $moved_ids, true); - $db->sql_query($sql); - - // Resync the righthand side of the tree - $sql = 'UPDATE ' . FORUMS_TABLE . " - SET left_id = left_id + $diff, right_id = right_id + $diff, forum_parents = '' - WHERE left_id > " . $to_data['right_id'] . ' - AND ' . $db->sql_in_set('forum_id', $moved_ids, true); - $db->sql_query($sql); - - // Resync moved branch - $to_data['right_id'] += $diff; - - if ($to_data['right_id'] > $from_data['right_id']) - { - $diff = '+ ' . ($to_data['right_id'] - $from_data['right_id'] - 1); - } - else - { - $diff = '- ' . abs($to_data['right_id'] - $from_data['right_id'] - 1); - } - } - else - { - $sql = 'SELECT MAX(right_id) AS right_id - FROM ' . FORUMS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $moved_ids, true); - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $diff = '+ ' . ($row['right_id'] - $from_data['left_id'] + 1); - } - - $sql = 'UPDATE ' . FORUMS_TABLE . " - SET left_id = left_id $diff, right_id = right_id $diff, forum_parents = '' - WHERE " . $db->sql_in_set('forum_id', $moved_ids); - $db->sql_query($sql); - - return $errors; - } - - /** - * Move forum content from one to another forum - */ - function move_forum_content($from_id, $to_id, $sync = true) - { - global $db; - - $table_ary = array(LOG_TABLE, POSTS_TABLE, TOPICS_TABLE, DRAFTS_TABLE, TOPICS_TRACK_TABLE); - - foreach ($table_ary as $table) - { - $sql = "UPDATE $table - SET forum_id = $to_id - WHERE forum_id = $from_id"; - $db->sql_query($sql); - } - unset($table_ary); - - $table_ary = array(FORUMS_ACCESS_TABLE, FORUMS_TRACK_TABLE, FORUMS_WATCH_TABLE, MODERATOR_CACHE_TABLE); - - foreach ($table_ary as $table) - { - $sql = "DELETE FROM $table - WHERE forum_id = $from_id"; - $db->sql_query($sql); - } - - if ($sync) - { - // Delete ghost topics that link back to the same forum then resync counters - sync('topic_moved'); - sync('forum', 'forum_id', $to_id, false, true); - } - - return array(); - } - - /** - * Remove complete forum - */ - function delete_forum($forum_id, $action_posts = 'delete', $action_subforums = 'delete', $posts_to_id = 0, $subforums_to_id = 0) - { - global $db, $user, $cache; - - $forum_data = $this->get_forum_info($forum_id); - - $errors = array(); - $log_action_posts = $log_action_forums = $posts_to_name = $subforums_to_name = ''; - $forum_ids = array($forum_id); - - if ($action_posts == 'delete') - { - $log_action_posts = 'POSTS'; - $errors = array_merge($errors, $this->delete_forum_content($forum_id)); - } - else if ($action_posts == 'move') - { - if (!$posts_to_id) - { - $errors[] = $user->lang['NO_DESTINATION_FORUM']; - } - else - { - $log_action_posts = 'MOVE_POSTS'; - - $sql = 'SELECT forum_name - FROM ' . FORUMS_TABLE . ' - WHERE forum_id = ' . $posts_to_id; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - $errors[] = $user->lang['NO_FORUM']; - } - else - { - $posts_to_name = $row['forum_name']; - $errors = array_merge($errors, $this->move_forum_content($forum_id, $posts_to_id)); - } - } - } - - if (sizeof($errors)) - { - return $errors; - } - - if ($action_subforums == 'delete') - { - $log_action_forums = 'FORUMS'; - $rows = get_forum_branch($forum_id, 'children', 'descending', false); - - foreach ($rows as $row) - { - $forum_ids[] = $row['forum_id']; - $errors = array_merge($errors, $this->delete_forum_content($row['forum_id'])); - } - - if (sizeof($errors)) - { - return $errors; - } - - $diff = sizeof($forum_ids) * 2; - - $sql = 'DELETE FROM ' . FORUMS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $forum_ids); - $db->sql_query($sql); - - $sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $forum_ids); - $db->sql_query($sql); - - $sql = 'DELETE FROM ' . ACL_USERS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $forum_ids); - $db->sql_query($sql); - } - else if ($action_subforums == 'move') - { - if (!$subforums_to_id) - { - $errors[] = $user->lang['NO_DESTINATION_FORUM']; - } - else - { - $log_action_forums = 'MOVE_FORUMS'; - - $sql = 'SELECT forum_name - FROM ' . FORUMS_TABLE . ' - WHERE forum_id = ' . $subforums_to_id; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - $errors[] = $user->lang['NO_FORUM']; - } - else - { - $subforums_to_name = $row['forum_name']; - - $sql = 'SELECT forum_id - FROM ' . FORUMS_TABLE . " - WHERE parent_id = $forum_id"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $this->move_forum($row['forum_id'], $subforums_to_id); - } - $db->sql_freeresult($result); - - // Grab new forum data for correct tree updating later - $forum_data = $this->get_forum_info($forum_id); - - $sql = 'UPDATE ' . FORUMS_TABLE . " - SET parent_id = $subforums_to_id - WHERE parent_id = $forum_id"; - $db->sql_query($sql); - - $diff = 2; - $sql = 'DELETE FROM ' . FORUMS_TABLE . " - WHERE forum_id = $forum_id"; - $db->sql_query($sql); - - $sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . " - WHERE forum_id = $forum_id"; - $db->sql_query($sql); - - $sql = 'DELETE FROM ' . ACL_USERS_TABLE . " - WHERE forum_id = $forum_id"; - $db->sql_query($sql); - } - } - - if (sizeof($errors)) - { - return $errors; - } - } - else - { - $diff = 2; - $sql = 'DELETE FROM ' . FORUMS_TABLE . " - WHERE forum_id = $forum_id"; - $db->sql_query($sql); - - $sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . " - WHERE forum_id = $forum_id"; - $db->sql_query($sql); - - $sql = 'DELETE FROM ' . ACL_USERS_TABLE . " - WHERE forum_id = $forum_id"; - $db->sql_query($sql); - } - - // Resync tree - $sql = 'UPDATE ' . FORUMS_TABLE . " - SET right_id = right_id - $diff - WHERE left_id < {$forum_data['right_id']} AND right_id > {$forum_data['right_id']}"; - $db->sql_query($sql); - - $sql = 'UPDATE ' . FORUMS_TABLE . " - SET left_id = left_id - $diff, right_id = right_id - $diff - WHERE left_id > {$forum_data['right_id']}"; - $db->sql_query($sql); - - // Delete forum ids from extension groups table - $sql = 'SELECT group_id, allowed_forums - FROM ' . EXTENSION_GROUPS_TABLE; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if (!$row['allowed_forums']) - { - continue; - } - - $allowed_forums = unserialize(trim($row['allowed_forums'])); - $allowed_forums = array_diff($allowed_forums, $forum_ids); - - $sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . " - SET allowed_forums = '" . ((sizeof($allowed_forums)) ? serialize($allowed_forums) : '') . "' - WHERE group_id = {$row['group_id']}"; - $db->sql_query($sql); - } - $db->sql_freeresult($result); - - $cache->destroy('_extensions'); - - $log_action = implode('_', array($log_action_posts, $log_action_forums)); - - switch ($log_action) - { - case 'MOVE_POSTS_MOVE_FORUMS': - add_log('admin', 'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS', $posts_to_name, $subforums_to_name, $forum_data['forum_name']); - break; - - case 'MOVE_POSTS_FORUMS': - add_log('admin', 'LOG_FORUM_DEL_MOVE_POSTS_FORUMS', $posts_to_name, $forum_data['forum_name']); - break; - - case 'POSTS_MOVE_FORUMS': - add_log('admin', 'LOG_FORUM_DEL_POSTS_MOVE_FORUMS', $subforums_to_name, $forum_data['forum_name']); - break; - - case '_MOVE_FORUMS': - add_log('admin', 'LOG_FORUM_DEL_MOVE_FORUMS', $subforums_to_name, $forum_data['forum_name']); - break; - - case 'MOVE_POSTS_': - add_log('admin', 'LOG_FORUM_DEL_MOVE_POSTS', $posts_to_name, $forum_data['forum_name']); - break; - - case 'POSTS_FORUMS': - add_log('admin', 'LOG_FORUM_DEL_POSTS_FORUMS', $forum_data['forum_name']); - break; - - case '_FORUMS': - add_log('admin', 'LOG_FORUM_DEL_FORUMS', $forum_data['forum_name']); - break; - - case 'POSTS_': - add_log('admin', 'LOG_FORUM_DEL_POSTS', $forum_data['forum_name']); - break; - - default: - add_log('admin', 'LOG_FORUM_DEL_FORUM', $forum_data['forum_name']); - break; - } - - return $errors; - } - - /** - * Delete forum content - */ - function delete_forum_content($forum_id) - { - global $db, $config, $phpbb_root_path, $phpEx; - - include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx); - - $db->sql_transaction('begin'); - - // Select then delete all attachments - $sql = 'SELECT a.topic_id - FROM ' . POSTS_TABLE . ' p, ' . ATTACHMENTS_TABLE . " a - WHERE p.forum_id = $forum_id - AND a.in_message = 0 - AND a.topic_id = p.topic_id"; - $result = $db->sql_query($sql); - - $topic_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $topic_ids[] = $row['topic_id']; - } - $db->sql_freeresult($result); - - delete_attachments('topic', $topic_ids, false); - - // Before we remove anything we make sure we are able to adjust the post counts later. ;) - $sql = 'SELECT poster_id - FROM ' . POSTS_TABLE . ' - WHERE forum_id = ' . $forum_id . ' - AND post_postcount = 1'; - $result = $db->sql_query($sql); - - $post_counts = array(); - while ($row = $db->sql_fetchrow($result)) - { - $post_counts[$row['poster_id']] = (!empty($post_counts[$row['poster_id']])) ? $post_counts[$row['poster_id']] + 1 : 1; - } - $db->sql_freeresult($result); - - switch ($db->dbms_type) - { - case 'mysql': - - // Delete everything else and thank MySQL for offering multi-table deletion - $tables_ary = array( - SEARCH_WORDMATCH_TABLE => 'post_id', - REPORTS_TABLE => 'post_id', - WARNINGS_TABLE => 'post_id', - BOOKMARKS_TABLE => 'topic_id', - TOPICS_WATCH_TABLE => 'topic_id', - TOPICS_POSTED_TABLE => 'topic_id', - POLL_OPTIONS_TABLE => 'topic_id', - POLL_VOTES_TABLE => 'topic_id', - ); - - $sql = 'DELETE ' . POSTS_TABLE; - $sql_using = "\nFROM " . POSTS_TABLE; - $sql_where = "\nWHERE " . POSTS_TABLE . ".forum_id = $forum_id\n"; - - foreach ($tables_ary as $table => $field) - { - $sql .= ", $table "; - $sql_using .= ", $table "; - $sql_where .= "\nAND $table.$field = " . POSTS_TABLE . ".$field"; - } - - $db->sql_query($sql . $sql_using . $sql_where); - - break; - - default: - - // Delete everything else and curse your DB for not offering multi-table deletion - $tables_ary = array( - 'post_id' => array( - SEARCH_WORDMATCH_TABLE, - REPORTS_TABLE, - WARNINGS_TABLE, - ), - - 'topic_id' => array( - BOOKMARKS_TABLE, - TOPICS_WATCH_TABLE, - TOPICS_POSTED_TABLE, - POLL_OPTIONS_TABLE, - POLL_VOTES_TABLE, - ) - ); - - foreach ($tables_ary as $field => $tables) - { - $start = 0; - - do - { - $sql = "SELECT $field - FROM " . POSTS_TABLE . ' - WHERE forum_id = ' . $forum_id; - $result = $db->sql_query_limit($sql, 500, $start); - - $ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $ids[] = $row[$field]; - } - $db->sql_freeresult($result); - - if (sizeof($ids)) - { - $start += sizeof($ids); - - foreach ($tables as $table) - { - $db->sql_query("DELETE FROM $table WHERE " . $db->sql_in_set($field, $ids)); - } - } - } - while ($row); - } - unset($ids); - - break; - } - - $table_ary = array(FORUMS_ACCESS_TABLE, FORUMS_TRACK_TABLE, FORUMS_WATCH_TABLE, LOG_TABLE, MODERATOR_CACHE_TABLE, POSTS_TABLE, TOPICS_TABLE, TOPICS_TRACK_TABLE); - - foreach ($table_ary as $table) - { - $db->sql_query("DELETE FROM $table WHERE forum_id = $forum_id"); - } - - // Set forum ids to 0 - $table_ary = array(DRAFTS_TABLE); - - foreach ($table_ary as $table) - { - $db->sql_query("UPDATE $table SET forum_id = 0 WHERE forum_id = $forum_id"); - } - - // Adjust users post counts - if (sizeof($post_counts)) - { - foreach ($post_counts as $poster_id => $substract) - { - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_posts = 0 - WHERE user_id = ' . $poster_id . ' - AND user_posts < ' . $substract; - $db->sql_query($sql); - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_posts = user_posts - ' . $substract . ' - WHERE user_id = ' . $poster_id . ' - AND user_posts >= ' . $substract; - $db->sql_query($sql); - } - } - - $db->sql_transaction('commit'); - - // Make sure the overall post/topic count is correct... - $sql = 'SELECT COUNT(post_id) AS stat - FROM ' . POSTS_TABLE . ' - WHERE post_approved = 1'; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - set_config('num_posts', (int) $row['stat'], true); - - $sql = 'SELECT COUNT(topic_id) AS stat - FROM ' . TOPICS_TABLE . ' - WHERE topic_approved = 1'; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - set_config('num_topics', (int) $row['stat'], true); - - $sql = 'SELECT COUNT(attach_id) as stat - FROM ' . ATTACHMENTS_TABLE; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - set_config('num_files', (int) $row['stat'], true); - - $sql = 'SELECT SUM(filesize) as stat - FROM ' . ATTACHMENTS_TABLE; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - set_config('upload_dir_size', (int) $row['stat'], true); - - return array(); - } - - /** - * Move forum position by $steps up/down - */ - function move_forum_by($forum_row, $action = 'move_up', $steps = 1) - { - global $db; - - /** - * Fetch all the siblings between the module's current spot - * and where we want to move it to. If there are less than $steps - * siblings between the current spot and the target then the - * module will move as far as possible - */ - $sql = 'SELECT forum_id, forum_name, left_id, right_id - FROM ' . FORUMS_TABLE . " - WHERE parent_id = {$forum_row['parent_id']} - AND " . (($action == 'move_up') ? "right_id < {$forum_row['right_id']} ORDER BY right_id DESC" : "left_id > {$forum_row['left_id']} ORDER BY left_id ASC"); - $result = $db->sql_query_limit($sql, $steps); - - $target = array(); - while ($row = $db->sql_fetchrow($result)) - { - $target = $row; - } - $db->sql_freeresult($result); - - if (!sizeof($target)) - { - // The forum is already on top or bottom - return false; - } - - /** - * $left_id and $right_id define the scope of the nodes that are affected by the move. - * $diff_up and $diff_down are the values to substract or add to each node's left_id - * and right_id in order to move them up or down. - * $move_up_left and $move_up_right define the scope of the nodes that are moving - * up. Other nodes in the scope of ($left_id, $right_id) are considered to move down. - */ - if ($action == 'move_up') - { - $left_id = $target['left_id']; - $right_id = $forum_row['right_id']; - - $diff_up = $forum_row['left_id'] - $target['left_id']; - $diff_down = $forum_row['right_id'] + 1 - $forum_row['left_id']; - - $move_up_left = $forum_row['left_id']; - $move_up_right = $forum_row['right_id']; - } - else - { - $left_id = $forum_row['left_id']; - $right_id = $target['right_id']; - - $diff_up = $forum_row['right_id'] + 1 - $forum_row['left_id']; - $diff_down = $target['right_id'] - $forum_row['right_id']; - - $move_up_left = $forum_row['right_id'] + 1; - $move_up_right = $target['right_id']; - } - - // Now do the dirty job - $sql = 'UPDATE ' . FORUMS_TABLE . " - SET left_id = left_id + CASE - WHEN left_id BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up} - ELSE {$diff_down} - END, - right_id = right_id + CASE - WHEN right_id BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up} - ELSE {$diff_down} - END, - forum_parents = '' - WHERE - left_id BETWEEN {$left_id} AND {$right_id} - AND right_id BETWEEN {$left_id} AND {$right_id}"; - $db->sql_query($sql); - - return $target['forum_name']; - } - - /** - * Display progress bar for syncinc forums - */ - function display_progress_bar($start, $total) - { - global $template, $user; - - adm_page_header($user->lang['SYNC_IN_PROGRESS']); - - $template->set_filenames(array( - 'body' => 'progress_bar.html') - ); - - $template->assign_vars(array( - 'L_PROGRESS' => $user->lang['SYNC_IN_PROGRESS'], - 'L_PROGRESS_EXPLAIN' => ($start && $total) ? sprintf($user->lang['SYNC_IN_PROGRESS_EXPLAIN'], $start, $total) : $user->lang['SYNC_IN_PROGRESS']) - ); - - adm_page_footer(); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php deleted file mode 100644 index eb785ced23..0000000000 --- a/phpBB/includes/acp/acp_groups.php +++ /dev/null @@ -1,759 +0,0 @@ -add_lang('acp/groups'); - $this->tpl_name = 'acp_groups'; - $this->page_title = 'ACP_GROUPS_MANAGE'; - - $form_key = 'acp_groups'; - add_form_key($form_key); - - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - - // Check and set some common vars - $action = (isset($_POST['add'])) ? 'add' : ((isset($_POST['addusers'])) ? 'addusers' : request_var('action', '')); - $group_id = request_var('g', 0); - $mark_ary = request_var('mark', array(0)); - $name_ary = request_var('usernames', '', true); - $leader = request_var('leader', 0); - $default = request_var('default', 0); - $start = request_var('start', 0); - $update = (isset($_POST['update'])) ? true : false; - - - // Clear some vars - $can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && @is_writable($phpbb_root_path . $config['avatar_path']) && $file_uploads) ? true : false; - $group_row = array(); - - // Grab basic data for group, if group_id is set and exists - if ($group_id) - { - $sql = 'SELECT * - FROM ' . GROUPS_TABLE . " - WHERE group_id = $group_id"; - $result = $db->sql_query($sql); - $group_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$group_row) - { - trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - // Check if the user is allowed to manage this group if set to founder only. - if ($user->data['user_type'] != USER_FOUNDER && $group_row['group_founder_manage']) - { - trigger_error($user->lang['NOT_ALLOWED_MANAGE_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING); - } - } - - // Which page? - switch ($action) - { - case 'approve': - case 'demote': - case 'promote': - if (!$group_id) - { - trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - // Approve, demote or promote - $group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name']; - group_user_attributes($action, $group_id, $mark_ary, false, $group_name); - - switch ($action) - { - case 'demote': - $message = 'GROUP_MODS_DEMOTED'; - break; - - case 'promote': - $message = 'GROUP_MODS_PROMOTED'; - break; - - case 'approve': - $message = 'USERS_APPROVED'; - break; - } - - trigger_error($user->lang[$message] . adm_back_link($this->u_action . '&action=list&g=' . $group_id)); - break; - - case 'default': - if (!$group_id) - { - trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if (confirm_box(true)) - { - $group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name']; - - if (!sizeof($mark_ary)) - { - $start = 0; - - do - { - $sql = 'SELECT user_id - FROM ' . USER_GROUP_TABLE . " - WHERE group_id = $group_id - ORDER BY user_id"; - $result = $db->sql_query_limit($sql, 200, $start); - - $mark_ary = array(); - if ($row = $db->sql_fetchrow($result)) - { - do - { - $mark_ary[] = $row['user_id']; - } - while ($row = $db->sql_fetchrow($result)); - - group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row); - - $start = (sizeof($mark_ary) < 200) ? 0 : $start + 200; - } - else - { - $start = 0; - } - $db->sql_freeresult($result); - } - while ($start); - } - else - { - group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row); - } - - trigger_error($user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action . '&action=list&g=' . $group_id)); - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'mark' => $mark_ary, - 'g' => $group_id, - 'i' => $id, - 'mode' => $mode, - 'action' => $action)) - ); - } - - break; - - case 'deleteusers': - case 'delete': - if (confirm_box(true)) - { - if (!$group_id) - { - trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $error = ''; - - switch ($action) - { - case 'delete': - if (!$auth->acl_get('a_groupdel')) - { - trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $error = group_delete($group_id, $group_row['group_name']); - break; - - case 'deleteusers': - $group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name']; - $error = group_user_del($group_id, $mark_ary, false, $group_name); - break; - } - - $back_link = ($action == 'delete') ? $this->u_action : $this->u_action . '&action=list&g=' . $group_id; - - if ($error) - { - trigger_error($user->lang[$error] . adm_back_link($back_link), E_USER_WARNING); - } - - $message = ($action == 'delete') ? 'GROUP_DELETED' : 'GROUP_USERS_REMOVE'; - trigger_error($user->lang[$message] . adm_back_link($back_link)); - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'mark' => $mark_ary, - 'g' => $group_id, - 'i' => $id, - 'mode' => $mode, - 'action' => $action)) - ); - } - break; - - case 'addusers': - if (!$group_id) - { - trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if (!$name_ary) - { - trigger_error($user->lang['NO_USERS'] . adm_back_link($this->u_action . '&action=list&g=' . $group_id), E_USER_WARNING); - } - - $name_ary = array_unique(explode("\n", $name_ary)); - $group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name']; - - // Add user/s to group - if ($error = group_user_add($group_id, false, $name_ary, $group_name, $default, $leader, 0, $group_row)) - { - trigger_error($user->lang[$error] . adm_back_link($this->u_action . '&action=list&g=' . $group_id), E_USER_WARNING); - } - - $message = ($leader) ? 'GROUP_MODS_ADDED' : 'GROUP_USERS_ADDED'; - trigger_error($user->lang[$message] . adm_back_link($this->u_action . '&action=list&g=' . $group_id)); - break; - - case 'edit': - case 'add': - - include($phpbb_root_path . 'includes/functions_display.' . $phpEx); - - $data = $submit_ary = array(); - - if ($action == 'edit' && !$group_id) - { - trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if ($action == 'add' && !$auth->acl_get('a_groupadd')) - { - trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $error = array(); - $user->add_lang('ucp'); - - $avatar_select = basename(request_var('avatar_select', '')); - $category = basename(request_var('category', '')); - - // Did we submit? - if ($update) - { - if (!check_form_key($form_key)) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $group_name = utf8_normalize_nfc(request_var('group_name', '', true)); - $group_desc = utf8_normalize_nfc(request_var('group_desc', '', true)); - $group_type = request_var('group_type', GROUP_FREE); - - $allow_desc_bbcode = request_var('desc_parse_bbcode', false); - $allow_desc_urls = request_var('desc_parse_urls', false); - $allow_desc_smilies = request_var('desc_parse_smilies', false); - - $data['uploadurl'] = request_var('uploadurl', ''); - $data['remotelink'] = request_var('remotelink', ''); - $data['width'] = request_var('width', ''); - $data['height'] = request_var('height', ''); - $delete = request_var('delete', ''); - - $submit_ary = array( - 'colour' => request_var('group_colour', ''), - 'rank' => request_var('group_rank', 0), - 'receive_pm' => isset($_REQUEST['group_receive_pm']) ? 1 : 0, - 'legend' => isset($_REQUEST['group_legend']) ? 1 : 0, - 'message_limit' => request_var('group_message_limit', 0), - 'founder_manage' => 0, - ); - - if ($user->data['user_type'] == USER_FOUNDER) - { - $submit_ary['founder_manage'] = isset($_REQUEST['group_founder_manage']) ? 1 : 0; - } - - if (!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl'] || $data['remotelink']) - { - // Avatar stuff - $var_ary = array( - 'uploadurl' => array('string', true, 5, 255), - 'remotelink' => array('string', true, 5, 255), - 'width' => array('string', true, 1, 3), - 'height' => array('string', true, 1, 3), - ); - - if (!($error = validate_data($data, $var_ary))) - { - $data['user_id'] = "g$group_id"; - - if ((!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl']) && $can_upload) - { - list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_upload($data, $error); - } - else if ($data['remotelink']) - { - list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_remote($data, $error); - } - } - } - else if ($avatar_select && $config['allow_avatar_local']) - { - // check avatar gallery - if (is_dir($phpbb_root_path . $config['avatar_gallery_path'] . '/' . $category)) - { - $submit_ary['avatar_type'] = AVATAR_GALLERY; - - list($submit_ary['avatar_width'], $submit_ary['avatar_height']) = getimagesize($phpbb_root_path . $config['avatar_gallery_path'] . '/' . $category . '/' . $avatar_select); - $submit_ary['avatar'] = $category . '/' . $avatar_select; - } - } - else if ($delete) - { - $submit_ary['avatar'] = ''; - $submit_ary['avatar_type'] = $submit_ary['avatar_width'] = $submit_ary['avatar_height'] = 0; - } - else if ($data['width'] && $data['height']) - { - // Only update the dimensions? - if ($config['avatar_max_width'] || $config['avatar_max_height']) - { - if ($data['width'] > $config['avatar_max_width'] || $data['height'] > $config['avatar_max_height']) - { - $error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height'], $data['width'], $data['height']); - } - } - - if (!sizeof($error)) - { - if ($config['avatar_min_width'] || $config['avatar_min_height']) - { - if ($data['width'] < $config['avatar_min_width'] || $data['height'] < $config['avatar_min_height']) - { - $error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height'], $data['width'], $data['height']); - } - } - } - - if (!sizeof($error)) - { - $submit_ary['avatar_width'] = $data['width']; - $submit_ary['avatar_height'] = $data['height']; - } - } - - if ((isset($submit_ary['avatar']) && $submit_ary['avatar'] && (!isset($group_row['group_avatar']))) || $delete) - { - if (isset($group_row['group_avatar']) && $group_row['group_avatar']) - { - avatar_delete('group', $group_row, true); - } - } - - if (!sizeof($error)) - { - // Only set the rank, colour, etc. if it's changed or if we're adding a new - // group. This prevents existing group members being updated if no changes - // were made. - - $group_attributes = array(); - $test_variables = array('rank', 'colour', 'avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'receive_pm', 'legend', 'message_limit', 'founder_manage'); - foreach ($test_variables as $test) - { - if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test])) - { - $group_attributes['group_' . $test] = $group_row['group_' . $test] = $submit_ary[$test]; - } - } - - if (!($error = group_create($group_id, $group_type, $group_name, $group_desc, $group_attributes, $allow_desc_bbcode, $allow_desc_urls, $allow_desc_smilies))) - { - $group_perm_from = request_var('group_perm_from', 0); - - // Copy permissions? - // If the user has the a_authgroups permission and at least one additional permission ability set the permissions are fully transferred. - // We do not limit on one auth category because this can lead to incomplete permissions being tricky to fix for the admin, roles being assigned or added non-default permissions. - // Since the user only has the option to copy permissions from non leader managed groups this seems to be a good compromise. - if ($group_perm_from && $action == 'add' && $auth->acl_get('a_authgroups') && $auth->acl_gets('a_aauth', 'a_fauth', 'a_mauth', 'a_uauth')) - { - $sql = 'SELECT group_founder_manage - FROM ' . GROUPS_TABLE . ' - WHERE group_id = ' . $group_perm_from; - $result = $db->sql_query($sql); - $check_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // Check the group if non-founder - if ($check_row && ($user->data['user_type'] == USER_FOUNDER || $check_row['group_founder_manage'] == 0)) - { - // From the mysql documentation: - // Prior to MySQL 4.0.14, the target table of the INSERT statement cannot appear in the FROM clause of the SELECT part of the query. This limitation is lifted in 4.0.14. - // Due to this we stay on the safe side if we do the insertion "the manual way" - - // Copy permisisons from/to the acl groups table (only group_id gets changed) - $sql = 'SELECT forum_id, auth_option_id, auth_role_id, auth_setting - FROM ' . ACL_GROUPS_TABLE . ' - WHERE group_id = ' . $group_perm_from; - $result = $db->sql_query($sql); - - $groups_sql_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - $groups_sql_ary[] = array( - 'group_id' => (int) $group_id, - 'forum_id' => (int) $row['forum_id'], - 'auth_option_id' => (int) $row['auth_option_id'], - 'auth_role_id' => (int) $row['auth_role_id'], - 'auth_setting' => (int) $row['auth_setting'] - ); - } - $db->sql_freeresult($result); - - // Now insert the data - $db->sql_multi_insert(ACL_GROUPS_TABLE, $groups_sql_ary); - - $auth->acl_clear_prefetch(); - } - } - - $cache->destroy('sql', GROUPS_TABLE); - - $message = ($action == 'edit') ? 'GROUP_UPDATED' : 'GROUP_CREATED'; - trigger_error($user->lang[$message] . adm_back_link($this->u_action)); - } - } - - if (sizeof($error)) - { - $group_rank = $submit_ary['rank']; - - $group_desc_data = array( - 'text' => $group_desc, - 'allow_bbcode' => $allow_desc_bbcode, - 'allow_smilies' => $allow_desc_smilies, - 'allow_urls' => $allow_desc_urls - ); - } - } - else if (!$group_id) - { - $group_name = utf8_normalize_nfc(request_var('group_name', '', true)); - $group_desc_data = array( - 'text' => '', - 'allow_bbcode' => true, - 'allow_smilies' => true, - 'allow_urls' => true - ); - $group_rank = 0; - $group_type = GROUP_OPEN; - } - else - { - $group_name = $group_row['group_name']; - $group_desc_data = generate_text_for_edit($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_options']); - $group_type = $group_row['group_type']; - $group_rank = $group_row['group_rank']; - } - - $sql = 'SELECT * - FROM ' . RANKS_TABLE . ' - WHERE rank_special = 1 - ORDER BY rank_title'; - $result = $db->sql_query($sql); - - $rank_options = ''; - - while ($row = $db->sql_fetchrow($result)) - { - $selected = ($group_rank && $row['rank_id'] == $group_rank) ? ' selected="selected"' : ''; - $rank_options .= ''; - } - $db->sql_freeresult($result); - - $type_free = ($group_type == GROUP_FREE) ? ' checked="checked"' : ''; - $type_open = ($group_type == GROUP_OPEN) ? ' checked="checked"' : ''; - $type_closed = ($group_type == GROUP_CLOSED) ? ' checked="checked"' : ''; - $type_hidden = ($group_type == GROUP_HIDDEN) ? ' checked="checked"' : ''; - - $avatar_img = (!empty($group_row['group_avatar'])) ? get_user_avatar($group_row['group_avatar'], $group_row['group_avatar_type'], $group_row['group_avatar_width'], $group_row['group_avatar_height'], 'GROUP_AVATAR') : ''; - - $display_gallery = (isset($_POST['display_gallery'])) ? true : false; - - if ($config['allow_avatar_local'] && $display_gallery) - { - avatar_gallery($category, $avatar_select, 4); - } - - $back_link = request_var('back_link', ''); - - switch ($back_link) - { - case 'acp_users_groups': - $u_back = append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&mode=groups&u=' . request_var('u', 0)); - break; - - default: - $u_back = $this->u_action; - break; - } - - $template->assign_vars(array( - 'S_EDIT' => true, - 'S_ADD_GROUP' => ($action == 'add') ? true : false, - 'S_GROUP_PERM' => ($action == 'add' && $auth->acl_get('a_authgroups') && $auth->acl_gets('a_aauth', 'a_fauth', 'a_mauth', 'a_uauth')) ? true : false, - 'S_INCLUDE_SWATCH' => true, - 'S_CAN_UPLOAD' => $can_upload, - 'S_ERROR' => (sizeof($error)) ? true : false, - 'S_SPECIAL_GROUP' => ($group_type == GROUP_SPECIAL) ? true : false, - 'S_DISPLAY_GALLERY' => ($config['allow_avatar_local'] && !$display_gallery) ? true : false, - 'S_IN_GALLERY' => ($config['allow_avatar_local'] && $display_gallery) ? true : false, - 'S_USER_FOUNDER' => ($user->data['user_type'] == USER_FOUNDER) ? true : false, - - 'ERROR_MSG' => (sizeof($error)) ? implode('
    ', $error) : '', - 'GROUP_NAME' => ($group_type == GROUP_SPECIAL) ? $user->lang['G_' . $group_name] : $group_name, - 'GROUP_INTERNAL_NAME' => $group_name, - 'GROUP_DESC' => $group_desc_data['text'], - 'GROUP_RECEIVE_PM' => (isset($group_row['group_receive_pm']) && $group_row['group_receive_pm']) ? ' checked="checked"' : '', - 'GROUP_FOUNDER_MANAGE' => (isset($group_row['group_founder_manage']) && $group_row['group_founder_manage']) ? ' checked="checked"' : '', - 'GROUP_LEGEND' => (isset($group_row['group_legend']) && $group_row['group_legend']) ? ' checked="checked"' : '', - 'GROUP_MESSAGE_LIMIT' => (isset($group_row['group_message_limit'])) ? $group_row['group_message_limit'] : 0, - 'GROUP_COLOUR' => (isset($group_row['group_colour'])) ? $group_row['group_colour'] : '', - - - 'S_DESC_BBCODE_CHECKED' => $group_desc_data['allow_bbcode'], - 'S_DESC_URLS_CHECKED' => $group_desc_data['allow_urls'], - 'S_DESC_SMILIES_CHECKED'=> $group_desc_data['allow_smilies'], - - 'S_RANK_OPTIONS' => $rank_options, - 'S_GROUP_OPTIONS' => group_select_options(false, false, (($user->data['user_type'] == USER_FOUNDER) ? false : 0)), - 'AVATAR' => $avatar_img, - 'AVATAR_IMAGE' => $avatar_img, - 'AVATAR_MAX_FILESIZE' => $config['avatar_filesize'], - 'AVATAR_WIDTH' => (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '', - 'AVATAR_HEIGHT' => (isset($group_row['group_avatar_height'])) ? $group_row['group_avatar_height'] : '', - - 'GROUP_TYPE_FREE' => GROUP_FREE, - 'GROUP_TYPE_OPEN' => GROUP_OPEN, - 'GROUP_TYPE_CLOSED' => GROUP_CLOSED, - 'GROUP_TYPE_HIDDEN' => GROUP_HIDDEN, - 'GROUP_TYPE_SPECIAL' => GROUP_SPECIAL, - - 'GROUP_FREE' => $type_free, - 'GROUP_OPEN' => $type_open, - 'GROUP_CLOSED' => $type_closed, - 'GROUP_HIDDEN' => $type_hidden, - - 'U_BACK' => $u_back, - 'U_SWATCH' => append_sid("{$phpbb_admin_path}swatch.$phpEx", 'form=settings&name=group_colour'), - 'U_ACTION' => "{$this->u_action}&action=$action&g=$group_id", - 'L_AVATAR_EXPLAIN' => sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], round($config['avatar_filesize'] / 1024)), - ) - ); - - return; - break; - - case 'list': - - if (!$group_id) - { - trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $this->page_title = 'GROUP_MEMBERS'; - - // Grab the leaders - always, on every page... - $sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending - FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug - WHERE ug.group_id = $group_id - AND u.user_id = ug.user_id - AND ug.group_leader = 1 - ORDER BY ug.group_leader DESC, ug.user_pending ASC, u.username_clean"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $template->assign_block_vars('leader', array( - 'U_USER_EDIT' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=users&action=edit&u={$row['user_id']}"), - - 'USERNAME' => $row['username'], - 'S_GROUP_DEFAULT' => ($row['group_id'] == $group_id) ? true : false, - 'JOINED' => ($row['user_regdate']) ? $user->format_date($row['user_regdate']) : ' - ', - 'USER_POSTS' => $row['user_posts'], - 'USER_ID' => $row['user_id']) - ); - } - $db->sql_freeresult($result); - - // Total number of group members (non-leaders) - $sql = 'SELECT COUNT(user_id) AS total_members - FROM ' . USER_GROUP_TABLE . " - WHERE group_id = $group_id - AND group_leader = 0"; - $result = $db->sql_query($sql); - $total_members = (int) $db->sql_fetchfield('total_members'); - $db->sql_freeresult($result); - - $s_action_options = ''; - $options = array('default' => 'DEFAULT', 'approve' => 'APPROVE', 'demote' => 'DEMOTE', 'promote' => 'PROMOTE', 'deleteusers' => 'DELETE'); - - foreach ($options as $option => $lang) - { - $s_action_options .= ''; - } - - $template->assign_vars(array( - 'S_LIST' => true, - 'S_GROUP_SPECIAL' => ($group_row['group_type'] == GROUP_SPECIAL) ? true : false, - 'S_ACTION_OPTIONS' => $s_action_options, - - 'S_ON_PAGE' => on_page($total_members, $config['topics_per_page'], $start), - 'PAGINATION' => generate_pagination($this->u_action . "&action=$action&g=$group_id", $total_members, $config['topics_per_page'], $start, true), - 'GROUP_NAME' => ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'], - - 'U_ACTION' => $this->u_action . "&g=$group_id", - 'U_BACK' => $this->u_action, - 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=list&field=usernames'), - 'U_DEFAULT_ALL' => "{$this->u_action}&action=default&g=$group_id", - )); - - // Grab the members - $sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending - FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug - WHERE ug.group_id = $group_id - AND u.user_id = ug.user_id - AND ug.group_leader = 0 - ORDER BY ug.group_leader DESC, ug.user_pending ASC, u.username_clean"; - $result = $db->sql_query_limit($sql, $config['topics_per_page'], $start); - - $pending = false; - - while ($row = $db->sql_fetchrow($result)) - { - if ($row['user_pending'] && !$pending) - { - $template->assign_block_vars('member', array( - 'S_PENDING' => true) - ); - - $pending = true; - } - - $template->assign_block_vars('member', array( - 'U_USER_EDIT' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=users&action=edit&u={$row['user_id']}"), - - 'USERNAME' => $row['username'], - 'S_GROUP_DEFAULT' => ($row['group_id'] == $group_id) ? true : false, - 'JOINED' => ($row['user_regdate']) ? $user->format_date($row['user_regdate']) : ' - ', - 'USER_POSTS' => $row['user_posts'], - 'USER_ID' => $row['user_id']) - ); - } - $db->sql_freeresult($result); - - return; - break; - } - - $template->assign_vars(array( - 'U_ACTION' => $this->u_action, - 'S_GROUP_ADD' => ($auth->acl_get('a_groupadd')) ? true : false) - ); - - // Get us all the groups - $sql = 'SELECT g.group_id, g.group_name, g.group_type - FROM ' . GROUPS_TABLE . ' g - ORDER BY g.group_type ASC, g.group_name'; - $result = $db->sql_query($sql); - - $lookup = $cached_group_data = array(); - while ($row = $db->sql_fetchrow($result)) - { - $type = ($row['group_type'] == GROUP_SPECIAL) ? 'special' : 'normal'; - - // used to determine what type a group is - $lookup[$row['group_id']] = $type; - - // used for easy access to the data within a group - $cached_group_data[$type][$row['group_id']] = $row; - $cached_group_data[$type][$row['group_id']]['total_members'] = 0; - } - $db->sql_freeresult($result); - - // How many people are in which group? - $sql = 'SELECT COUNT(ug.user_id) AS total_members, ug.group_id - FROM ' . USER_GROUP_TABLE . ' ug - WHERE ' . $db->sql_in_set('ug.group_id', array_keys($lookup)) . ' - GROUP BY ug.group_id'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $type = $lookup[$row['group_id']]; - $cached_group_data[$type][$row['group_id']]['total_members'] = $row['total_members']; - } - $db->sql_freeresult($result); - - // The order is... normal, then special - ksort($cached_group_data); - - foreach ($cached_group_data as $type => $row_ary) - { - if ($type == 'special') - { - $template->assign_block_vars('groups', array( - 'S_SPECIAL' => true) - ); - } - - foreach ($row_ary as $group_id => $row) - { - $group_name = (!empty($user->lang['G_' . $row['group_name']]))? $user->lang['G_' . $row['group_name']] : $row['group_name']; - - $template->assign_block_vars('groups', array( - 'U_LIST' => "{$this->u_action}&action=list&g=$group_id", - 'U_EDIT' => "{$this->u_action}&action=edit&g=$group_id", - 'U_DELETE' => ($auth->acl_get('a_groupdel')) ? "{$this->u_action}&action=delete&g=$group_id" : '', - - 'S_GROUP_SPECIAL' => ($row['group_type'] == GROUP_SPECIAL) ? true : false, - - 'GROUP_NAME' => $group_name, - 'TOTAL_MEMBERS' => $row['total_members'], - ) - ); - } - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php deleted file mode 100644 index 4f16c0c83d..0000000000 --- a/phpBB/includes/acp/acp_icons.php +++ /dev/null @@ -1,856 +0,0 @@ -add_lang('acp/posting'); - - // Set up general vars - $action = request_var('action', ''); - $action = (isset($_POST['add'])) ? 'add' : $action; - $action = (isset($_POST['edit'])) ? 'edit' : $action; - $action = (isset($_POST['import'])) ? 'import' : $action; - $icon_id = request_var('id', 0); - - $mode = ($mode == 'smilies') ? 'smilies' : 'icons'; - - $this->tpl_name = 'acp_icons'; - - // What are we working on? - switch ($mode) - { - case 'smilies': - $table = SMILIES_TABLE; - $lang = 'SMILIES'; - $fields = 'smiley'; - $img_path = $config['smilies_path']; - break; - - case 'icons': - $table = ICONS_TABLE; - $lang = 'ICONS'; - $fields = 'icons'; - $img_path = $config['icons_path']; - break; - } - - $this->page_title = 'ACP_' . $lang; - - // Clear some arrays - $_images = $_paks = array(); - $notice = ''; - - // Grab file list of paks and images - if ($action == 'edit' || $action == 'add' || $action == 'import') - { - $imglist = filelist($phpbb_root_path . $img_path, ''); - - foreach ($imglist as $path => $img_ary) - { - foreach ($img_ary as $img) - { - $img_size = getimagesize($phpbb_root_path . $img_path . '/' . $path . $img); - - if (!$img_size[0] || !$img_size[1] || strlen($img) > 255) - { - continue; - } - - $_images[$path . $img]['file'] = $path . $img; - $_images[$path . $img]['width'] = $img_size[0]; - $_images[$path . $img]['height'] = $img_size[1]; - } - } - unset($imglist); - - if ($dir = @opendir($phpbb_root_path . $img_path)) - { - while (($file = readdir($dir)) !== false) - { - if (is_file($phpbb_root_path . $img_path . '/' . $file) && preg_match('#\.pak$#i', $file)) - { - $_paks[] = $file; - } - } - closedir($dir); - } - } - - // What shall we do today? Oops, I believe that's trademarked ... - switch ($action) - { - case 'edit': - unset($_images); - $_images = array(); - - // no break; - - case 'add': - - $smilies = $default_row = array(); - $smiley_options = $order_list = $add_order_list = ''; - - if ($action == 'add' && $mode == 'smilies') - { - $sql = 'SELECT * - FROM ' . SMILIES_TABLE . ' - ORDER BY smiley_order'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if (empty($smilies[$row['smiley_url']])) - { - $smilies[$row['smiley_url']] = $row; - } - } - $db->sql_freeresult($result); - - if (sizeof($smilies)) - { - foreach ($smilies as $row) - { - $selected = false; - - if (!$smiley_options) - { - $selected = true; - $default_row = $row; - } - $smiley_options .= ''; - - $template->assign_block_vars('smile', array( - 'SMILEY_URL' => addslashes($row['smiley_url']), - 'CODE' => addslashes($row['code']), - 'EMOTION' => addslashes($row['emotion']), - 'WIDTH' => $row['smiley_width'], - 'HEIGHT' => $row['smiley_height'], - 'ORDER' => $row['smiley_order'] + 1, - )); - } - } - } - - $sql = "SELECT * - FROM $table - ORDER BY {$fields}_order " . (($icon_id || $action == 'add') ? 'DESC' : 'ASC'); - $result = $db->sql_query($sql); - - $data = array(); - $after = false; - $display = 0; - $order_lists = array('', ''); - $add_order_lists = array('', ''); - $display_count = 0; - - while ($row = $db->sql_fetchrow($result)) - { - if ($action == 'add') - { - unset($_images[$row[$fields . '_url']]); - } - - - if ($row[$fields . '_id'] == $icon_id) - { - $after = true; - $display = $row['display_on_posting']; - $data[$row[$fields . '_url']] = $row; - } - else - { - if ($action == 'edit' && !$icon_id) - { - $data[$row[$fields . '_url']] = $row; - } - - $selected = ''; - if (!empty($after)) - { - $selected = ' selected="selected"'; - $after = false; - } - if ($row['display_on_posting']) - { - $display_count++; - } - $after_txt = ($mode == 'smilies') ? $row['code'] : $row['icons_url']; - $order_lists[$row['display_on_posting']] = '' . $order_lists[$row['display_on_posting']]; - - if (!empty($default_row)) - { - $add_order_lists[$row['display_on_posting']] = '' . $add_order_lists[$row['display_on_posting']]; - } - } - } - $db->sql_freeresult($result); - - $order_list = ''; - $add_order_list = ''; - - if ($action == 'add') - { - $data = $_images; - } - - $colspan = (($mode == 'smilies') ? '7' : '5'); - $colspan += ($icon_id) ? 1 : 0; - $colspan += ($action == 'add') ? 2 : 0; - - $template->assign_vars(array( - 'S_EDIT' => true, - 'S_SMILIES' => ($mode == 'smilies') ? true : false, - 'S_ADD' => ($action == 'add') ? true : false, - - 'S_ORDER_LIST_DISPLAY' => $order_list . $order_lists[1], - 'S_ORDER_LIST_UNDISPLAY' => $order_list . $order_lists[0], - 'S_ORDER_LIST_DISPLAY_COUNT' => $display_count + 1, - - 'L_TITLE' => $user->lang['ACP_' . $lang], - 'L_EXPLAIN' => $user->lang['ACP_' . $lang . '_EXPLAIN'], - 'L_CONFIG' => $user->lang[$lang . '_CONFIG'], - 'L_URL' => $user->lang[$lang . '_URL'], - 'L_LOCATION' => $user->lang[$lang . '_LOCATION'], - 'L_WIDTH' => $user->lang[$lang . '_WIDTH'], - 'L_HEIGHT' => $user->lang[$lang . '_HEIGHT'], - 'L_ORDER' => $user->lang[$lang . '_ORDER'], - 'L_NO_ICONS' => $user->lang['NO_' . $lang . '_' . strtoupper($action)], - - 'COLSPAN' => $colspan, - 'ID' => $icon_id, - - 'U_BACK' => $this->u_action, - 'U_ACTION' => $this->u_action . '&action=' . (($action == 'add') ? 'create' : 'modify'), - )); - - foreach ($data as $img => $img_row) - { - $template->assign_block_vars('items', array( - 'IMG' => $img, - 'A_IMG' => addslashes($img), - 'IMG_SRC' => $phpbb_root_path . $img_path . '/' . $img, - - 'CODE' => ($mode == 'smilies' && isset($img_row['code'])) ? $img_row['code'] : '', - 'EMOTION' => ($mode == 'smilies' && isset($img_row['emotion'])) ? $img_row['emotion'] : '', - - 'S_ID' => (isset($img_row[$fields . '_id'])) ? true : false, - 'ID' => (isset($img_row[$fields . '_id'])) ? $img_row[$fields . '_id'] : 0, - 'WIDTH' => (!empty($img_row[$fields .'_width'])) ? $img_row[$fields .'_width'] : $img_row['width'], - 'HEIGHT' => (!empty($img_row[$fields .'_height'])) ? $img_row[$fields .'_height'] : $img_row['height'], - 'POSTING_CHECKED' => (!empty($img_row['display_on_posting']) || $action == 'add') ? ' checked="checked"' : '', - )); - } - - // Ok, another row for adding an addition code for a pre-existing image... - if ($action == 'add' && $mode == 'smilies' && sizeof($smilies)) - { - $template->assign_vars(array( - 'S_ADD_CODE' => true, - - 'S_IMG_OPTIONS' => $smiley_options, - - 'S_ADD_ORDER_LIST_DISPLAY' => $add_order_list . $add_order_lists[1], - 'S_ADD_ORDER_LIST_UNDISPLAY' => $add_order_list . $add_order_lists[0], - - 'IMG_SRC' => $phpbb_root_path . $img_path . '/' . $default_row['smiley_url'], - 'IMG_PATH' => $img_path, - 'PHPBB_ROOT_PATH' => $phpbb_root_path, - - 'CODE' => $default_row['code'], - 'EMOTION' => $default_row['emotion'], - - 'WIDTH' => $default_row['smiley_width'], - 'HEIGHT' => $default_row['smiley_height'], - )); - } - - return; - - break; - - case 'create': - case 'modify': - - // Get items to create/modify - $images = (isset($_POST['image'])) ? array_keys(request_var('image', array('' => 0))) : array(); - - // Now really get the items - $image_id = (isset($_POST['id'])) ? request_var('id', array('' => 0)) : array(); - $image_order = (isset($_POST['order'])) ? request_var('order', array('' => 0)) : array(); - $image_width = (isset($_POST['width'])) ? request_var('width', array('' => 0)) : array(); - $image_height = (isset($_POST['height'])) ? request_var('height', array('' => 0)) : array(); - $image_add = (isset($_POST['add_img'])) ? request_var('add_img', array('' => 0)) : array(); - $image_emotion = utf8_normalize_nfc(request_var('emotion', array('' => ''), true)); - $image_code = utf8_normalize_nfc(request_var('code', array('' => ''), true)); - $image_display_on_posting = (isset($_POST['display_on_posting'])) ? request_var('display_on_posting', array('' => 0)) : array(); - - // Ok, add the relevant bits if we are adding new codes to existing emoticons... - if (!empty($_POST['add_additional_code'])) - { - $add_image = request_var('add_image', ''); - $add_code = utf8_normalize_nfc(request_var('add_code', '', true)); - $add_emotion = utf8_normalize_nfc(request_var('add_emotion', '', true)); - - if ($add_image && $add_emotion && $add_code) - { - $images[] = $add_image; - $image_add[$add_image] = true; - - $image_code[$add_image] = $add_code; - $image_emotion[$add_image] = $add_emotion; - $image_width[$add_image] = request_var('add_width', 0); - $image_height[$add_image] = request_var('add_height', 0); - - if (!empty($_POST['add_display_on_posting'])) - { - $image_display_on_posting[$add_image] = 1; - } - - $image_order[$add_image] = request_var('add_order', 0); - } - } - - $icons_updated = 0; - $errors = array(); - foreach ($images as $image) - { - if ($mode == 'smilies' && ($image_emotion[$image] == '' || $image_code[$image] == '')) - { - $errors[$image] = 'SMILIE_NO_' . (($image_emotion[$image] == '') ? 'EMOTION' : 'CODE'); - } - else if ($action == 'create' && !isset($image_add[$image])) - { - // skip images where add wasn't checked - } - else - { - if ($image_width[$image] == 0 || $image_height[$image] == 0) - { - $img_size = getimagesize($phpbb_root_path . $img_path . '/' . $image); - $image_width[$image] = $img_size[0]; - $image_height[$image] = $img_size[1]; - } - - $img_sql = array( - $fields . '_url' => $image, - $fields . '_width' => $image_width[$image], - $fields . '_height' => $image_height[$image], - 'display_on_posting' => (isset($image_display_on_posting[$image])) ? 1 : 0, - ); - - if ($mode == 'smilies') - { - $img_sql = array_merge($img_sql, array( - 'emotion' => $image_emotion[$image], - 'code' => $image_code[$image]) - ); - } - - // Image_order holds the 'new' order value - if (!empty($image_order[$image])) - { - $img_sql = array_merge($img_sql, array( - $fields . '_order' => $image_order[$image]) - ); - - // Since we always add 'after' an item, we just need to increase all following + the current by one - $sql = "UPDATE $table - SET {$fields}_order = {$fields}_order + 1 - WHERE {$fields}_order >= {$image_order[$image]}"; - $db->sql_query($sql); - - // If we adjust the order, we need to adjust all other orders too - they became inaccurate... - foreach ($image_order as $_image => $_order) - { - if ($_image == $image) - { - continue; - } - - if ($_order >= $image_order[$image]) - { - $image_order[$_image]++; - } - } - } - - if ($action == 'modify' && !empty($image_id[$image])) - { - $sql = "UPDATE $table - SET " . $db->sql_build_array('UPDATE', $img_sql) . " - WHERE {$fields}_id = " . $image_id[$image]; - $db->sql_query($sql); - $icons_updated++; - } - else if ($action !== 'modify') - { - $sql = "INSERT INTO $table " . $db->sql_build_array('INSERT', $img_sql); - $db->sql_query($sql); - $icons_updated++; - } - - } - } - - $cache->destroy('_icons'); - $cache->destroy('sql', $table); - - $level = E_USER_NOTICE; - switch ($icons_updated) - { - case 0: - $suc_lang = "{$lang}_NONE"; - $level = E_USER_WARNING; - break; - - case 1: - $suc_lang = "{$lang}_ONE"; - break; - - default: - $suc_lang = $lang; - } - $errormsgs = '
    '; - foreach ($errors as $img => $error) - { - $errormsgs .= '
    ' . sprintf($user->lang[$error], $img); - } - if ($action == 'modify') - { - trigger_error($user->lang[$suc_lang . '_EDITED'] . $errormsgs . adm_back_link($this->u_action), $level); - } - else - { - trigger_error($user->lang[$suc_lang . '_ADDED'] . $errormsgs .adm_back_link($this->u_action), $level); - } - - break; - - case 'import': - - $pak = request_var('pak', ''); - $current = request_var('current', ''); - - if ($pak != '') - { - $order = 0; - - if (!($pak_ary = @file($phpbb_root_path . $img_path . '/' . $pak))) - { - trigger_error($user->lang['PAK_FILE_NOT_READABLE'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - // Make sure the pak_ary is valid - foreach ($pak_ary as $pak_entry) - { - if (preg_match_all("#'(.*?)', ?#", $pak_entry, $data)) - { - if ((sizeof($data[1]) != 4 && $mode == 'icons') || - ((sizeof($data[1]) != 6 || (empty($data[1][4]) || empty($data[1][5]))) && $mode == 'smilies' )) - { - trigger_error($user->lang['WRONG_PAK_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING); - } - } - else - { - trigger_error($user->lang['WRONG_PAK_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING); - } - } - - - // The user has already selected a smilies_pak file - if ($current == 'delete') - { - if ($db->truncate) - { - $db->sql_query('TRUNCATE TABLE ' . $table); - } - else - { - $db->sql_query('DELETE FROM ' . $table); - } - - switch ($mode) - { - case 'smilies': - break; - - case 'icons': - // Reset all icon_ids - $db->sql_query('UPDATE ' . TOPICS_TABLE . ' SET icon_id = 0'); - $db->sql_query('UPDATE ' . POSTS_TABLE . ' SET icon_id = 0'); - break; - } - } - else - { - $cur_img = array(); - - $field_sql = ($mode == 'smilies') ? 'code' : 'icons_url'; - - $sql = "SELECT $field_sql - FROM $table"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - ++$order; - $cur_img[$row[$field_sql]] = 1; - } - $db->sql_freeresult($result); - } - - foreach ($pak_ary as $pak_entry) - { - $data = array(); - if (preg_match_all("#'(.*?)', ?#", $pak_entry, $data)) - { - if ((sizeof($data[1]) != 4 && $mode == 'icons') || - (sizeof($data[1]) != 6 && $mode == 'smilies')) - { - trigger_error($user->lang['WRONG_PAK_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - // Stripslash here because it got addslashed before... (on export) - $img = stripslashes($data[1][0]); - $width = stripslashes($data[1][1]); - $height = stripslashes($data[1][2]); - $display_on_posting = stripslashes($data[1][3]); - - if (isset($data[1][4]) && isset($data[1][5])) - { - $emotion = stripslashes($data[1][4]); - $code = stripslashes($data[1][5]); - } - - if ($current == 'replace' && - (($mode == 'smilies' && !empty($cur_img[$code])) || - ($mode == 'icons' && !empty($cur_img[$img])))) - { - $replace_sql = ($mode == 'smilies') ? $code : $img; - $sql = array( - $fields . '_url' => $img, - $fields . '_height' => (int) $height, - $fields . '_width' => (int) $width, - 'display_on_posting' => (int) $display_on_posting, - ); - - if ($mode == 'smilies') - { - $sql = array_merge($sql, array( - 'emotion' => $emotion, - )); - } - - $sql = "UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql) . " - WHERE $field_sql = '" . $db->sql_escape($replace_sql) . "'"; - $db->sql_query($sql); - } - else - { - ++$order; - - $sql = array( - $fields . '_url' => $img, - $fields . '_height' => (int) $height, - $fields . '_width' => (int) $width, - $fields . '_order' => (int) $order, - 'display_on_posting'=> (int) $display_on_posting, - ); - - if ($mode == 'smilies') - { - $sql = array_merge($sql, array( - 'code' => $code, - 'emotion' => $emotion, - )); - } - $db->sql_query("INSERT INTO $table " . $db->sql_build_array('INSERT', $sql)); - } - } - } - - $cache->destroy('_icons'); - $cache->destroy('sql', $table); - - trigger_error($user->lang[$lang . '_IMPORT_SUCCESS'] . adm_back_link($this->u_action)); - } - else - { - $pak_options = ''; - - foreach ($_paks as $pak) - { - $pak_options .= ''; - } - - $template->assign_vars(array( - 'S_CHOOSE_PAK' => true, - 'S_PAK_OPTIONS' => $pak_options, - - 'L_TITLE' => $user->lang['ACP_' . $lang], - 'L_EXPLAIN' => $user->lang['ACP_' . $lang . '_EXPLAIN'], - 'L_NO_PAK_OPTIONS' => $user->lang['NO_' . $lang . '_PAK'], - 'L_CURRENT' => $user->lang['CURRENT_' . $lang], - 'L_CURRENT_EXPLAIN' => $user->lang['CURRENT_' . $lang . '_EXPLAIN'], - 'L_IMPORT_SUBMIT' => $user->lang['IMPORT_' . $lang], - - 'U_BACK' => $this->u_action, - 'U_ACTION' => $this->u_action . '&action=import', - ) - ); - } - break; - - case 'export': - - $this->page_title = 'EXPORT_' . $lang; - $this->tpl_name = 'message_body'; - - $template->assign_vars(array( - 'MESSAGE_TITLE' => $user->lang['EXPORT_' . $lang], - 'MESSAGE_TEXT' => sprintf($user->lang['EXPORT_' . $lang . '_EXPLAIN'], '', ''), - - 'S_USER_NOTICE' => true, - ) - ); - - return; - - break; - - case 'send': - - $sql = "SELECT * - FROM $table - ORDER BY {$fields}_order"; - $result = $db->sql_query($sql); - - $pak = ''; - while ($row = $db->sql_fetchrow($result)) - { - $pak .= "'" . addslashes($row[$fields . '_url']) . "', "; - $pak .= "'" . addslashes($row[$fields . '_width']) . "', "; - $pak .= "'" . addslashes($row[$fields . '_height']) . "', "; - $pak .= "'" . addslashes($row['display_on_posting']) . "', "; - - if ($mode == 'smilies') - { - $pak .= "'" . addslashes($row['emotion']) . "', "; - $pak .= "'" . addslashes($row['code']) . "', "; - } - - $pak .= "\n"; - } - $db->sql_freeresult($result); - - if ($pak != '') - { - garbage_collection(); - - header('Pragma: public'); - - // Send out the Headers - header('Content-Type: text/x-delimtext; name="' . $mode . '.pak"'); - header('Content-Disposition: inline; filename="' . $mode . '.pak"'); - echo $pak; - - flush(); - exit; - } - else - { - trigger_error($user->lang['NO_' . strtoupper($fields) . '_EXPORT'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - break; - - case 'delete': - - if (confirm_box(true)) - { - $sql = "DELETE FROM $table - WHERE {$fields}_id = $icon_id"; - $db->sql_query($sql); - - switch ($mode) - { - case 'smilies': - break; - - case 'icons': - // Reset appropriate icon_ids - $db->sql_query('UPDATE ' . TOPICS_TABLE . " - SET icon_id = 0 - WHERE icon_id = $icon_id"); - - $db->sql_query('UPDATE ' . POSTS_TABLE . " - SET icon_id = 0 - WHERE icon_id = $icon_id"); - break; - } - - $notice = $user->lang[$lang . '_DELETED']; - - $cache->destroy('_icons'); - $cache->destroy('sql', $table); - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'i' => $id, - 'mode' => $mode, - 'id' => $icon_id, - 'action' => 'delete', - ))); - } - - break; - - case 'move_up': - case 'move_down': - - // Get current order id... - $sql = "SELECT {$fields}_order as current_order - FROM $table - WHERE {$fields}_id = $icon_id"; - $result = $db->sql_query($sql); - $current_order = (int) $db->sql_fetchfield('current_order'); - $db->sql_freeresult($result); - - if ($current_order == 0 && $action == 'move_up') - { - break; - } - - // on move_down, switch position with next order_id... - // on move_up, switch position with previous order_id... - $switch_order_id = ($action == 'move_down') ? $current_order + 1 : $current_order - 1; - - // - $sql = "UPDATE $table - SET {$fields}_order = $current_order - WHERE {$fields}_order = $switch_order_id - AND {$fields}_id <> $icon_id"; - $db->sql_query($sql); - - // Only update the other entry too if the previous entry got updated - if ($db->sql_affectedrows()) - { - $sql = "UPDATE $table - SET {$fields}_order = $switch_order_id - WHERE {$fields}_order = $current_order - AND {$fields}_id = $icon_id"; - $db->sql_query($sql); - } - - $cache->destroy('_icons'); - $cache->destroy('sql', $table); - - break; - } - - // By default, check that image_order is valid and fix it if necessary - $sql = "SELECT {$fields}_id AS order_id, {$fields}_order AS fields_order - FROM $table - ORDER BY display_on_posting DESC, {$fields}_order"; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - $order = 0; - do - { - ++$order; - if ($row['fields_order'] != $order) - { - $db->sql_query("UPDATE $table - SET {$fields}_order = $order - WHERE {$fields}_id = " . $row['order_id']); - } - } - while ($row = $db->sql_fetchrow($result)); - } - $db->sql_freeresult($result); - - $template->assign_vars(array( - 'L_TITLE' => $user->lang['ACP_' . $lang], - 'L_EXPLAIN' => $user->lang['ACP_' . $lang . '_EXPLAIN'], - 'L_IMPORT' => $user->lang['IMPORT_' . $lang], - 'L_EXPORT' => $user->lang['EXPORT_' . $lang], - 'L_NOT_DISPLAYED' => $user->lang[$lang . '_NOT_DISPLAYED'], - 'L_ICON_ADD' => $user->lang['ADD_' . $lang], - 'L_ICON_EDIT' => $user->lang['EDIT_' . $lang], - - 'NOTICE' => $notice, - 'COLSPAN' => ($mode == 'smilies') ? 5 : 3, - - 'S_SMILIES' => ($mode == 'smilies') ? true : false, - - 'U_ACTION' => $this->u_action, - 'U_IMPORT' => $this->u_action . '&action=import', - 'U_EXPORT' => $this->u_action . '&action=export', - ) - ); - - $spacer = false; - - $sql = "SELECT * - FROM $table - ORDER BY {$fields}_order ASC"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $alt_text = ($mode == 'smilies') ? $row['code'] : ''; - - $template->assign_block_vars('items', array( - 'S_SPACER' => (!$spacer && !$row['display_on_posting']) ? true : false, - 'ALT_TEXT' => $alt_text, - 'IMG_SRC' => $phpbb_root_path . $img_path . '/' . $row[$fields . '_url'], - 'WIDTH' => $row[$fields . '_width'], - 'HEIGHT' => $row[$fields . '_height'], - 'CODE' => (isset($row['code'])) ? $row['code'] : '', - 'EMOTION' => (isset($row['emotion'])) ? $row['emotion'] : '', - 'U_EDIT' => $this->u_action . '&action=edit&id=' . $row[$fields . '_id'], - 'U_DELETE' => $this->u_action . '&action=delete&id=' . $row[$fields . '_id'], - 'U_MOVE_UP' => $this->u_action . '&action=move_up&id=' . $row[$fields . '_id'], - 'U_MOVE_DOWN' => $this->u_action . '&action=move_down&id=' . $row[$fields . '_id']) - ); - - if (!$spacer && !$row['display_on_posting']) - { - $spacer = true; - } - } - $db->sql_freeresult($result); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php deleted file mode 100755 index 90f326b099..0000000000 --- a/phpBB/includes/acp/acp_inactive.php +++ /dev/null @@ -1,259 +0,0 @@ -p_master = &$p_master; - } - - function main($id, $mode) - { - global $config, $db, $user, $auth, $template; - global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix; - - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - - $user->add_lang('memberlist'); - - $action = request_var('action', ''); - $mark = (isset($_REQUEST['mark'])) ? request_var('mark', array(0)) : array(); - $start = request_var('start', 0); - $submit = isset($_POST['submit']); - - // Sort keys - $sort_days = request_var('st', 0); - $sort_key = request_var('sk', 'i'); - $sort_dir = request_var('sd', 'd'); - - $form_key = 'acp_inactive'; - add_form_key($form_key); - - if ($submit && sizeof($mark)) - { - if ($action !== 'delete' && !check_form_key($form_key)) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - switch ($action) - { - case 'activate': - case 'delete': - - $sql = 'SELECT user_id, username - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', $mark); - $result = $db->sql_query($sql); - - $user_affected = array(); - while ($row = $db->sql_fetchrow($result)) - { - $user_affected[$row['user_id']] = $row['username']; - } - $db->sql_freeresult($result); - - if ($action == 'activate') - { - if ($config['require_activation'] == USER_ACTIVATION_ADMIN) - { - // Get those 'being activated'... - $sql = 'SELECT user_id, username, user_email, user_lang - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', $mark) . ' - AND user_type = ' . USER_INACTIVE; - $result = $db->sql_query($sql); - - $inactive_users = array(); - while ($row = $db->sql_fetchrow($result)) - { - $inactive_users[] = $row; - } - $db->sql_freeresult($result); - } - - user_active_flip('activate', $mark); - - if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !empty($inactive_users)) - { - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - - $messenger = new messenger(); - - foreach ($inactive_users as $row) - { - $messenger->template('admin_welcome_activated', $row['user_lang']); - - $messenger->to($row['user_email'], $row['username']); - - $messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); - $messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']); - $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($row['username'])) - ); - - $messenger->send(NOTIFY_EMAIL); - } - - $messenger->save_queue(); - } - } - else if ($action == 'delete') - { - if (confirm_box(true)) - { - if (!$auth->acl_get('a_userdel')) - { - trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - foreach ($mark as $user_id) - { - user_delete('retain', $user_id, $user_affected[$user_id]); - } - - add_log('admin', 'LOG_INACTIVE_' . strtoupper($action), implode(', ', $user_affected)); - } - else - { - $s_hidden_fields = array( - 'mode' => $mode, - 'action' => $action, - 'mark' => $mark, - 'submit' => 1, - 'start' => $start, - ); - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields($s_hidden_fields)); - } - } - - break; - - case 'remind': - if (empty($config['email_enable'])) - { - trigger_error($user->lang['EMAIL_DISABLED'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type, user_regdate, user_actkey - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', $mark); - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - // Send the messages - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - - $messenger = new messenger(); - $usernames = array(); - - do - { - $messenger->template('user_remind_inactive', $row['user_lang']); - - $messenger->to($row['user_email'], $row['username']); - $messenger->im($row['user_jabber'], $row['username']); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($row['username']), - 'REGISTER_DATE' => $user->format_date($row['user_regdate']), - 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u=" . $row['user_id'] . '&k=' . $row['user_actkey']) - ); - - $messenger->send($row['user_notify_type']); - - $usernames[] = $row['username']; - } - while ($row = $db->sql_fetchrow($result)); - - $messenger->save_queue(); - - add_log('admin', 'LOG_INACTIVE_REMIND', implode(', ', $usernames)); - unset($usernames); - } - $db->sql_freeresult($result); - - break; - } - } - - // Sorting - $limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); - $sort_by_text = array('i' => $user->lang['SORT_INACTIVE'], 'j' => $user->lang['SORT_REG_DATE'], 'l' => $user->lang['SORT_LAST_VISIT'], 'r' => $user->lang['SORT_REASON'], 'u' => $user->lang['SORT_USERNAME']); - $sort_by_sql = array('i' => 'user_inactive_time', 'j' => 'user_regdate', 'l' => 'user_lastvisit', 'r' => 'user_inactive_reason', 'u' => 'username_clean'); - - $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = ''; - gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); - - // Define where and sort sql for use in displaying logs - $sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0; - $sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC'); - - $inactive = array(); - $inactive_count = 0; - - $start = view_inactive_users($inactive, $inactive_count, $config['topics_per_page'], $start, $sql_where, $sql_sort); - - foreach ($inactive as $row) - { - $template->assign_block_vars('inactive', array( - 'INACTIVE_DATE' => $user->format_date($row['user_inactive_time']), - 'JOINED' => $user->format_date($row['user_regdate']), - 'LAST_VISIT' => (!$row['user_lastvisit']) ? ' - ' : $user->format_date($row['user_lastvisit']), - 'REASON' => $row['inactive_reason'], - 'USER_ID' => $row['user_id'], - 'USERNAME' => $row['username'], - 'U_USER_ADMIN' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=users&mode=overview&u={$row['user_id']}")) - ); - } - - $option_ary = array('activate' => 'ACTIVATE', 'delete' => 'DELETE'); - if ($config['email_enable']) - { - $option_ary += array('remind' => 'REMIND'); - } - - $template->assign_vars(array( - 'S_INACTIVE_USERS' => true, - 'S_INACTIVE_OPTIONS' => build_select($option_ary), - - 'S_LIMIT_DAYS' => $s_limit_days, - 'S_SORT_KEY' => $s_sort_key, - 'S_SORT_DIR' => $s_sort_dir, - 'S_ON_PAGE' => on_page($inactive_count, $config['topics_per_page'], $start), - 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param", $inactive_count, $config['topics_per_page'], $start, true), - - 'U_ACTION' => $this->u_action . '&start=' . $start, - )); - - $this->tpl_name = 'acp_inactive'; - $this->page_title = 'ACP_INACTIVE_USERS'; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php deleted file mode 100644 index 3862ee1ee8..0000000000 --- a/phpBB/includes/acp/acp_jabber.php +++ /dev/null @@ -1,117 +0,0 @@ -add_lang('acp/board'); - - include_once($phpbb_root_path . 'includes/functions_jabber.' . $phpEx); - - $action = request_var('action', ''); - $submit = (isset($_POST['submit'])) ? true : false; - - if ($mode != 'settings') - { - return; - } - - $this->tpl_name = 'acp_jabber'; - $this->page_title = 'ACP_JABBER_SETTINGS'; - - $jab_enable = request_var('jab_enable', $config['jab_enable']); - $jab_host = request_var('jab_host', $config['jab_host']); - $jab_port = request_var('jab_port', $config['jab_port']); - $jab_username = request_var('jab_username', $config['jab_username']); - $jab_password = request_var('jab_password', $config['jab_password']); - $jab_package_size = request_var('jab_package_size', $config['jab_package_size']); - $jab_use_ssl = request_var('jab_use_ssl', $config['jab_use_ssl']); - - $form_name = 'acp_jabber'; - add_form_key($form_name); - - if ($submit) - { - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING); - } - - $error = array(); - - $message = $user->lang['JAB_SETTINGS_CHANGED']; - $log = 'JAB_SETTINGS_CHANGED'; - - // Is this feature enabled? Then try to establish a connection - if ($jab_enable) - { - $jabber = new jabber($jab_host, $jab_port, $jab_username, $jab_password, $jab_use_ssl); - - if (!$jabber->connect()) - { - trigger_error($user->lang['ERR_JAB_CONNECT'] . '

    ' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING); - } - - // We'll try to authorise using this account - if (!$jabber->login()) - { - trigger_error($user->lang['ERR_JAB_AUTH'] . '

    ' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING); - } - - $jabber->disconnect(); - } - - set_config('jab_enable', $jab_enable); - set_config('jab_host', $jab_host); - set_config('jab_port', $jab_port); - set_config('jab_username', $jab_username); - set_config('jab_password', $jab_password); - set_config('jab_package_size', $jab_package_size); - set_config('jab_use_ssl', $jab_use_ssl); - - add_log('admin', 'LOG_' . $log); - trigger_error($message . adm_back_link($this->u_action)); - } - - $template->assign_vars(array( - 'U_ACTION' => $this->u_action, - 'JAB_ENABLE' => $jab_enable, - 'L_JAB_SERVER_EXPLAIN' => sprintf($user->lang['JAB_SERVER_EXPLAIN'], '', ''), - 'JAB_HOST' => $jab_host, - 'JAB_PORT' => $jab_port, - 'JAB_USERNAME' => $jab_username, - 'JAB_PASSWORD' => $jab_password, - 'JAB_PACKAGE_SIZE' => $jab_package_size, - 'JAB_USE_SSL' => $jab_use_ssl, - 'S_CAN_USE_SSL' => jabber::can_use_ssl(), - 'S_GTALK_NOTE' => (!@function_exists('dns_get_record')) ? true : false, - )); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php deleted file mode 100644 index fc2ae11b1e..0000000000 --- a/phpBB/includes/acp/acp_language.php +++ /dev/null @@ -1,1440 +0,0 @@ -default_variables(); - - // Check and set some common vars - - $action = (isset($_POST['update_details'])) ? 'update_details' : ''; - $action = (isset($_POST['download_file'])) ? 'download_file' : $action; - $action = (isset($_POST['upload_file'])) ? 'upload_file' : $action; - $action = (isset($_POST['upload_data'])) ? 'upload_data' : $action; - $action = (isset($_POST['submit_file'])) ? 'submit_file' : $action; - $action = (isset($_POST['remove_store'])) ? 'details' : $action; - - $submit = (empty($action) && !isset($_POST['update']) && !isset($_POST['test_connection'])) ? false : true; - $action = (empty($action)) ? request_var('action', '') : $action; - - $form_name = 'acp_lang'; - add_form_key('acp_lang'); - - $lang_id = request_var('id', 0); - if (isset($_POST['missing_file'])) - { - $missing_file = request_var('missing_file', array('' => 0)); - list($_REQUEST['language_file'], ) = array_keys($missing_file); - } - - $selected_lang_file = request_var('language_file', '|common.' . $phpEx); - - list($this->language_directory, $this->language_file) = explode('|', $selected_lang_file); - - $this->language_directory = basename($this->language_directory); - $this->language_file = basename($this->language_file); - - $user->add_lang('acp/language'); - $this->tpl_name = 'acp_language'; - $this->page_title = 'ACP_LANGUAGE_PACKS'; - - if ($submit && $action == 'upload_data' && request_var('test_connection', '')) - { - $test_connection = false; - $action = 'upload_file'; - $method = request_var('method', ''); - - include_once($phpbb_root_path . 'includes/functions_transfer.' . $phpEx); - - switch ($method) - { - case 'ftp': - $transfer = new ftp(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', '')); - break; - - case 'ftp_fsock': - $transfer = new ftp_fsock(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', '')); - break; - - default: - trigger_error($user->lang['INVALID_UPLOAD_METHOD'], E_USER_ERROR); - break; - } - - $test_connection = $transfer->open_session(); - $transfer->close_session(); - } - - switch ($action) - { - case 'upload_file': - - include_once($phpbb_root_path . 'includes/functions_transfer.' . $phpEx); - - $method = request_var('method', ''); - - if (!class_exists($method)) - { - trigger_error('Method does not exist.', E_USER_ERROR); - } - - $requested_data = call_user_func(array($method, 'data')); - foreach ($requested_data as $data => $default) - { - $template->assign_block_vars('data', array( - 'DATA' => $data, - 'NAME' => $user->lang[strtoupper($method . '_' . $data)], - 'EXPLAIN' => $user->lang[strtoupper($method . '_' . $data) . '_EXPLAIN'], - 'DEFAULT' => (!empty($_REQUEST[$data])) ? request_var($data, '') : $default - )); - } - - $hidden_data = build_hidden_fields(array( - 'file' => $this->language_file, - 'dir' => $this->language_directory, - 'language_file' => $selected_lang_file, - 'method' => $method) - ); - - $hidden_data .= build_hidden_fields(array('entry' => $_POST['entry']), true, STRIP); - - $template->assign_vars(array( - 'S_UPLOAD' => true, - 'NAME' => $method, - 'U_ACTION' => $this->u_action . "&id=$lang_id&action=upload_data", - 'U_BACK' => $this->u_action . "&id=$lang_id&action=details&language_file=" . urlencode($selected_lang_file), - 'HIDDEN' => $hidden_data, - - 'S_CONNECTION_SUCCESS' => (request_var('test_connection', '') && $test_connection === true) ? true : false, - 'S_CONNECTION_FAILED' => (request_var('test_connection', '') && $test_connection !== true) ? true : false - )); - break; - - case 'update_details': - - if (!$submit || !check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING); - } - - if (!$lang_id) - { - trigger_error($user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = 'SELECT * - FROM ' . LANG_TABLE . " - WHERE lang_id = $lang_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $sql_ary = array( - 'lang_english_name' => request_var('lang_english_name', $row['lang_english_name']), - 'lang_local_name' => utf8_normalize_nfc(request_var('lang_local_name', $row['lang_local_name'], true)), - 'lang_author' => utf8_normalize_nfc(request_var('lang_author', $row['lang_author'], true)), - ); - - $db->sql_query('UPDATE ' . LANG_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE lang_id = ' . $lang_id); - - add_log('admin', 'LOG_LANGUAGE_PACK_UPDATED', $sql_ary['lang_english_name']); - - trigger_error($user->lang['LANGUAGE_DETAILS_UPDATED'] . adm_back_link($this->u_action)); - break; - - case 'submit_file': - case 'download_file': - case 'upload_data': - - if (!$submit || !check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING); - } - - if (!$lang_id || empty($_POST['entry'])) - { - trigger_error($user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if ($this->language_directory != 'email' && !is_array($_POST['entry'])) - { - trigger_error($user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if (!$this->language_file || (!$this->language_directory && !in_array($this->language_file, $this->main_files))) - { - trigger_error($user->lang['NO_FILE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = 'SELECT * - FROM ' . LANG_TABLE . " - WHERE lang_id = $lang_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error($user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - // Before we attempt to write anything let's check if the admin really chose a correct filename - switch ($this->language_directory) - { - case 'email': - // Get email templates - $email_files = filelist($phpbb_root_path . 'language/' . $row['lang_iso'], 'email', 'txt'); - $email_files = $email_files['email/']; - - if (!in_array($this->language_file, $email_files)) - { - trigger_error($user->lang['WRONG_LANGUAGE_FILE'] . adm_back_link($this->u_action . '&action=details&id=' . $lang_id), E_USER_WARNING); - } - break; - - case 'acp': - // Get acp files - $acp_files = filelist($phpbb_root_path . 'language/' . $row['lang_iso'], 'acp', $phpEx); - $acp_files = $acp_files['acp/']; - - if (!in_array($this->language_file, $acp_files)) - { - trigger_error($user->lang['WRONG_LANGUAGE_FILE'] . adm_back_link($this->u_action . '&action=details&id=' . $lang_id), E_USER_WARNING); - } - break; - - case 'mods': - // Get mod files - $mods_files = filelist($phpbb_root_path . 'language/' . $row['lang_iso'], 'mods', $phpEx); - $mods_files = (isset($mods_files['mods/'])) ? $mods_files['mods/'] : array(); - - if (!in_array($this->language_file, $mods_files)) - { - trigger_error($user->lang['WRONG_LANGUAGE_FILE'] . adm_back_link($this->u_action . '&action=details&id=' . $lang_id), E_USER_WARNING); - } - break; - - default: - if (!in_array($this->language_file, $this->main_files)) - { - trigger_error($user->lang['WRONG_LANGUAGE_FILE'] . adm_back_link($this->u_action . '&action=details&id=' . $lang_id), E_USER_WARNING); - } - break; - } - - if (!$safe_mode) - { - $mkdir_ary = array('language', 'language/' . $row['lang_iso']); - - if ($this->language_directory) - { - $mkdir_ary[] = 'language/' . $row['lang_iso'] . '/' . $this->language_directory; - } - - foreach ($mkdir_ary as $dir) - { - $dir = $phpbb_root_path . 'store/' . $dir; - - if (!is_dir($dir)) - { - if (!@mkdir($dir, 0777)) - { - trigger_error("Could not create directory $dir", E_USER_ERROR); - } - @chmod($dir, 0777); - } - } - } - - // Get target filename for storage folder - $filename = $this->get_filename($row['lang_iso'], $this->language_directory, $this->language_file, true, true); - $fp = @fopen($phpbb_root_path . $filename, 'wb'); - - if (!$fp) - { - trigger_error(sprintf($user->lang['UNABLE_TO_WRITE_FILE'], $filename) . adm_back_link($this->u_action . '&id=' . $lang_id . '&action=details&language_file=' . urlencode($selected_lang_file)), E_USER_WARNING); - } - - if ($this->language_directory == 'email') - { - // Email Template - $entry = $this->prepare_lang_entry($_POST['entry'], false); - fwrite($fp, $entry); - } - else - { - $name = (($this->language_directory) ? $this->language_directory . '_' : '') . $this->language_file; - $header = str_replace(array('{FILENAME}', '{LANG_NAME}', '{CHANGED}', '{AUTHOR}'), array($name, $row['lang_english_name'], date('Y-m-d', time()), $row['lang_author']), $this->language_file_header); - - if (strpos($this->language_file, 'help_') === 0) - { - // Help File - $header .= '$help = array(' . "\n"; - fwrite($fp, $header); - - foreach ($_POST['entry'] as $key => $value) - { - if (!is_array($value)) - { - continue; - } - - $entry = "\tarray(\n"; - - foreach ($value as $_key => $_value) - { - $entry .= "\t\t" . (int) $_key . "\t=> '" . $this->prepare_lang_entry($_value) . "',\n"; - } - - $entry .= "\t),\n"; - fwrite($fp, $entry); - } - - $footer = ");\n\n?>"; - fwrite($fp, $footer); - } - else - { - // Language File - $header .= $this->lang_header; - fwrite($fp, $header); - - foreach ($_POST['entry'] as $key => $value) - { - $entry = $this->format_lang_array($key, $value); - fwrite($fp, $entry); - } - - $footer = "));\n\n?>"; - fwrite($fp, $footer); - } - } - - fclose($fp); - - if ($action == 'download_file') - { - header('Pragma: no-cache'); - header('Content-Type: application/octetstream; name="' . $this->language_file . '"'); - header('Content-disposition: attachment; filename=' . $this->language_file); - - $fp = @fopen($phpbb_root_path . $filename, 'rb'); - while ($buffer = fread($fp, 1024)) - { - echo $buffer; - } - fclose($fp); - - add_log('admin', 'LOG_LANGUAGE_FILE_SUBMITTED', $this->language_file); - - exit; - } - else if ($action == 'upload_data') - { - $sql = 'SELECT lang_iso - FROM ' . LANG_TABLE . " - WHERE lang_id = $lang_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $file = request_var('file', ''); - $dir = request_var('dir', ''); - - $selected_lang_file = $dir . '|' . $file; - - $old_file = '/' . $this->get_filename($row['lang_iso'], $dir, $file, false, true); - $lang_path = 'language/' . $row['lang_iso'] . '/' . (($dir) ? $dir . '/' : ''); - - include_once($phpbb_root_path . 'includes/functions_transfer.' . $phpEx); - $method = request_var('method', ''); - - if ($method != 'ftp' && $method != 'ftp_fsock') - { - trigger_error($user->lang['INVALID_UPLOAD_METHOD'], E_USER_ERROR); - } - - $transfer = new $method(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', '')); - - if (($result = $transfer->open_session()) !== true) - { - trigger_error($user->lang[$result] . adm_back_link($this->u_action . '&action=details&id=' . $lang_id . '&language_file=' . urlencode($selected_lang_file)), E_USER_WARNING); - } - - $transfer->rename($lang_path . $file, $lang_path . $file . '.bak'); - $result = $transfer->copy_file('store/' . $lang_path . $file, $lang_path . $file); - - if ($result === false) - { - // If failed, try to rename again and print error out... - $transfer->delete_file($lang_path . $file); - $transfer->rename($lang_path . $file . '.bak', $lang_path . $file); - - trigger_error($user->lang['UPLOAD_FAILED'] . adm_back_link($this->u_action . '&action=details&id=' . $lang_id . '&language_file=' . urlencode($selected_lang_file)), E_USER_WARNING); - } - - $transfer->close_session(); - - // Remove from storage folder - if (file_exists($phpbb_root_path . 'store/' . $lang_path . $file)) - { - @unlink($phpbb_root_path . 'store/' . $lang_path . $file); - } - - add_log('admin', 'LOG_LANGUAGE_FILE_REPLACED', $file); - - trigger_error($user->lang['UPLOAD_COMPLETED'] . adm_back_link($this->u_action . '&action=details&id=' . $lang_id . '&language_file=' . urlencode($selected_lang_file))); - } - - add_log('admin', 'LOG_LANGUAGE_FILE_SUBMITTED', $this->language_file); - $action = 'details'; - - // no break; - - case 'details': - - if (!$lang_id) - { - trigger_error($user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $this->page_title = 'LANGUAGE_PACK_DETAILS'; - - $sql = 'SELECT * - FROM ' . LANG_TABLE . ' - WHERE lang_id = ' . $lang_id; - $result = $db->sql_query($sql); - $lang_entries = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $lang_iso = $lang_entries['lang_iso']; - $missing_vars = $missing_files = array(); - - // Get email templates - $email_files = filelist($phpbb_root_path . 'language/' . $config['default_lang'], 'email', 'txt'); - $email_files = $email_files['email/']; - - // Get acp files - $acp_files = filelist($phpbb_root_path . 'language/' . $config['default_lang'], 'acp', $phpEx); - $acp_files = $acp_files['acp/']; - - // Get mod files - $mods_files = filelist($phpbb_root_path . 'language/' . $config['default_lang'], 'mods', $phpEx); - $mods_files = (isset($mods_files['mods/'])) ? $mods_files['mods/'] : array(); - - // Check if our current filename matches the files - switch ($this->language_directory) - { - case 'email': - if (!in_array($this->language_file, $email_files)) - { - trigger_error($user->lang['WRONG_LANGUAGE_FILE'] . adm_back_link($this->u_action . '&action=details&id=' . $lang_id), E_USER_WARNING); - } - break; - - case 'acp': - if (!in_array($this->language_file, $acp_files)) - { - trigger_error($user->lang['WRONG_LANGUAGE_FILE'] . adm_back_link($this->u_action . '&action=details&id=' . $lang_id), E_USER_WARNING); - } - break; - - case 'mods': - if (!in_array($this->language_file, $mods_files)) - { - trigger_error($user->lang['WRONG_LANGUAGE_FILE'] . adm_back_link($this->u_action . '&action=details&id=' . $lang_id), E_USER_WARNING); - } - break; - - default: - if (!in_array($this->language_file, $this->main_files)) - { - trigger_error($user->lang['WRONG_LANGUAGE_FILE'] . adm_back_link($this->u_action . '&action=details&id=' . $lang_id), E_USER_WARNING); - } - } - - if (isset($_POST['remove_store'])) - { - $store_filename = $this->get_filename($lang_iso, $this->language_directory, $this->language_file, true, true); - - if (file_exists($phpbb_root_path . $store_filename)) - { - @unlink($phpbb_root_path . $store_filename); - } - } - - include_once($phpbb_root_path . 'includes/functions_transfer.' . $phpEx); - - $methods = transfer::methods(); - - foreach ($methods as $method) - { - $template->assign_block_vars('buttons', array( - 'VALUE' => $method - )); - } - - $template->assign_vars(array( - 'S_DETAILS' => true, - 'U_ACTION' => $this->u_action . "&action=details&id=$lang_id", - 'U_BACK' => $this->u_action, - 'LANG_LOCAL_NAME' => $lang_entries['lang_local_name'], - 'LANG_ENGLISH_NAME' => $lang_entries['lang_english_name'], - 'LANG_ISO' => $lang_entries['lang_iso'], - 'LANG_AUTHOR' => $lang_entries['lang_author'], - 'ALLOW_UPLOAD' => sizeof($methods) - ) - ); - - // If current lang is different from the default lang, then first try to grab missing/additional vars - if ($lang_iso != $config['default_lang']) - { - $is_missing_var = false; - - foreach ($this->main_files as $file) - { - if (file_exists($phpbb_root_path . $this->get_filename($lang_iso, '', $file))) - { - $missing_vars[$file] = $this->compare_language_files($config['default_lang'], $lang_iso, '', $file); - - if (sizeof($missing_vars[$file])) - { - $is_missing_var = true; - } - } - else - { - $missing_files[] = $this->get_filename($lang_iso, '', $file); - } - } - - // Now go through acp/mods directories - foreach ($acp_files as $file) - { - if (file_exists($phpbb_root_path . $this->get_filename($lang_iso, 'acp', $file))) - { - $missing_vars['acp/' . $file] = $this->compare_language_files($config['default_lang'], $lang_iso, 'acp', $file); - - if (sizeof($missing_vars['acp/' . $file])) - { - $is_missing_var = true; - } - } - else - { - $missing_files[] = $this->get_filename($lang_iso, 'acp', $file); - } - } - - if (sizeof($mods_files)) - { - foreach ($mods_files as $file) - { - if (file_exists($phpbb_root_path . $this->get_filename($lang_iso, 'mods', $file))) - { - $missing_vars['mods/' . $file] = $this->compare_language_files($config['default_lang'], $lang_iso, 'mods', $file); - - if (sizeof($missing_vars['mods/' . $file])) - { - $is_missing_var = true; - } - } - else - { - $missing_files[] = $this->get_filename($lang_iso, 'mods', $file); - } - } - } - - // More missing files... for example email templates? - foreach ($email_files as $file) - { - if (!file_exists($phpbb_root_path . $this->get_filename($lang_iso, 'email', $file))) - { - $missing_files[] = $this->get_filename($lang_iso, 'email', $file); - } - } - - if (sizeof($missing_files)) - { - $template->assign_vars(array( - 'S_MISSING_FILES' => true, - 'L_MISSING_FILES' => sprintf($user->lang['THOSE_MISSING_LANG_FILES'], $lang_entries['lang_local_name']), - 'MISSING_FILES' => implode('
    ', $missing_files)) - ); - } - - if ($is_missing_var) - { - $template->assign_vars(array( - 'S_MISSING_VARS' => true, - 'L_MISSING_VARS_EXPLAIN' => sprintf($user->lang['THOSE_MISSING_LANG_VARIABLES'], $lang_entries['lang_local_name']), - 'U_MISSING_ACTION' => $this->u_action . "&action=$action&id=$lang_id") - ); - - foreach ($missing_vars as $file => $vars) - { - if (!sizeof($vars)) - { - continue; - } - - $template->assign_block_vars('missing', array( - 'FILE' => $file, - 'TPL' => $this->print_language_entries($vars, '', false), - 'KEY' => (strpos($file, '/') === false) ? '|' . $file : str_replace('/', '|', $file)) - ); - } - } - } - - // Main language files - $s_lang_options = ''; - foreach ($this->main_files as $file) - { - if (strpos($file, 'help_') === 0) - { - continue; - } - - $prefix = (file_exists($phpbb_root_path . $this->get_filename($lang_iso, '', $file, true, true))) ? '* ' : ''; - - $selected = (!$this->language_directory && $this->language_file == $file) ? ' selected="selected"' : ''; - $s_lang_options .= ''; - } - - // Help Files - $s_lang_options .= ''; - foreach ($this->main_files as $file) - { - if (strpos($file, 'help_') !== 0) - { - continue; - } - - $prefix = (file_exists($phpbb_root_path . $this->get_filename($lang_iso, '', $file, true, true))) ? '* ' : ''; - - $selected = (!$this->language_directory && $this->language_file == $file) ? ' selected="selected"' : ''; - $s_lang_options .= ''; - } - - // Now every other language directory - $check_files = array('email', 'acp', 'mods'); - - foreach ($check_files as $check) - { - if (!sizeof(${$check . '_files'})) - { - continue; - } - - $s_lang_options .= ''; - - foreach (${$check . '_files'} as $file) - { - $prefix = (file_exists($phpbb_root_path . $this->get_filename($lang_iso, $check, $file, true, true))) ? '* ' : ''; - - $selected = ($this->language_directory == $check && $this->language_file == $file) ? ' selected="selected"' : ''; - $s_lang_options .= ''; - } - } - - // Get Language Entries - if saved within store folder, we take this one (with the option to remove it) - $lang = array(); - - $is_email_file = ($this->language_directory == 'email') ? true : false; - $is_help_file = (strpos($this->language_file, 'help_') === 0) ? true : false; - - $file_from_store = (file_exists($phpbb_root_path . $this->get_filename($lang_iso, $this->language_directory, $this->language_file, true, true))) ? true : false; - $no_store_filename = $this->get_filename($lang_iso, $this->language_directory, $this->language_file); - - if (!$file_from_store && !file_exists($phpbb_root_path . $no_store_filename)) - { - $print_message = sprintf($user->lang['MISSING_LANGUAGE_FILE'], $no_store_filename); - } - else - { - if ($is_email_file) - { - $lang = file_get_contents($phpbb_root_path . $this->get_filename($lang_iso, $this->language_directory, $this->language_file, $file_from_store)); - } - else - { - $help = array(); - include($phpbb_root_path . $this->get_filename($lang_iso, $this->language_directory, $this->language_file, $file_from_store)); - - if ($is_help_file) - { - $lang = $help; - unset($help); - } - } - - $print_message = (($this->language_directory) ? $this->language_directory . '/' : '') . $this->language_file; - } - - // Normal language pack entries - $template->assign_vars(array( - 'U_ENTRY_ACTION' => $this->u_action . "&action=details&id=$lang_id#entries", - 'S_EMAIL_FILE' => $is_email_file, - 'S_FROM_STORE' => $file_from_store, - 'S_LANG_OPTIONS' => $s_lang_options, - 'PRINT_MESSAGE' => $print_message, - ) - ); - - if (!$is_email_file) - { - $tpl = ''; - $name = (($this->language_directory) ? $this->language_directory . '/' : '') . $this->language_file; - - if (isset($missing_vars[$name]) && sizeof($missing_vars[$name])) - { - $tpl .= $this->print_language_entries($missing_vars[$name], '* '); - } - - $tpl .= $this->print_language_entries($lang); - - $template->assign_var('TPL', $tpl); - unset($tpl); - } - else - { - $template->assign_vars(array( - 'LANG' => $lang) - ); - - unset($lang); - } - - return; - - break; - - case 'delete': - - if (!$lang_id) - { - trigger_error($user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = 'SELECT * - FROM ' . LANG_TABLE . ' - WHERE lang_id = ' . $lang_id; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row['lang_iso'] == $config['default_lang']) - { - trigger_error($user->lang['NO_REMOVE_DEFAULT_LANG'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $db->sql_query('DELETE FROM ' . LANG_TABLE . ' WHERE lang_id = ' . $lang_id); - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_lang = '" . $db->sql_escape($config['default_lang']) . "' - WHERE user_lang = '" . $db->sql_escape($row['lang_iso']) . "'"; - $db->sql_query($sql); - - // We also need to remove the translated entries for custom profile fields - we want clean tables, don't we? - $sql = 'DELETE FROM ' . PROFILE_LANG_TABLE . ' WHERE lang_id = ' . $lang_id; - $db->sql_query($sql); - - $sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . ' WHERE lang_id = ' . $lang_id; - $db->sql_query($sql); - - $sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . " WHERE image_lang = '" . $db->sql_escape($row['lang_iso']) . "'"; - $result = $db->sql_query($sql); - - $cache->destroy('sql', STYLES_IMAGESET_DATA_TABLE); - - add_log('admin', 'LOG_LANGUAGE_PACK_DELETED', $row['lang_english_name']); - - trigger_error(sprintf($user->lang['LANGUAGE_PACK_DELETED'], $row['lang_english_name']) . adm_back_link($this->u_action)); - break; - - case 'install': - $lang_iso = request_var('iso', ''); - $lang_iso = basename($lang_iso); - - if (!$lang_iso || !file_exists("{$phpbb_root_path}language/$lang_iso/iso.txt")) - { - trigger_error($user->lang['LANGUAGE_PACK_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $file = file("{$phpbb_root_path}language/$lang_iso/iso.txt"); - - $lang_pack = array( - 'iso' => $lang_iso, - 'name' => trim(htmlspecialchars($file[0])), - 'local_name'=> trim(htmlspecialchars($file[1], ENT_COMPAT, 'UTF-8')), - 'author' => trim(htmlspecialchars($file[2], ENT_COMPAT, 'UTF-8')) - ); - unset($file); - - $sql = 'SELECT lang_iso - FROM ' . LANG_TABLE . " - WHERE lang_iso = '" . $db->sql_escape($lang_iso) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - trigger_error($user->lang['LANGUAGE_PACK_ALREADY_INSTALLED'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if (!$lang_pack['name'] || !$lang_pack['local_name']) - { - trigger_error($user->lang['INVALID_LANGUAGE_PACK'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - // Add language pack - $sql_ary = array( - 'lang_iso' => $lang_pack['iso'], - 'lang_dir' => $lang_pack['iso'], - 'lang_english_name' => $lang_pack['name'], - 'lang_local_name' => $lang_pack['local_name'], - 'lang_author' => $lang_pack['author'] - ); - - $db->sql_query('INSERT INTO ' . LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); - $lang_id = $db->sql_nextid(); - - $valid_localized = array( - 'icon_back_top', 'icon_contact_aim', 'icon_contact_email', 'icon_contact_icq', 'icon_contact_jabber', 'icon_contact_msnm', 'icon_contact_pm', 'icon_contact_yahoo', 'icon_contact_www', 'icon_post_delete', 'icon_post_edit', 'icon_post_info', 'icon_post_quote', 'icon_post_report', 'icon_user_online', 'icon_user_offline', 'icon_user_profile', 'icon_user_search', 'icon_user_warn', 'button_pm_forward', 'button_pm_new', 'button_pm_reply', 'button_topic_locked', 'button_topic_new', 'button_topic_reply', - ); - - $sql_ary = array(); - - $sql = 'SELECT * - FROM ' . STYLES_IMAGESET_TABLE; - $result = $db->sql_query($sql); - while ($imageset_row = $db->sql_fetchrow($result)) - { - if (@file_exists("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$lang_pack['iso']}/imageset.cfg")) - { - $cfg_data_imageset_data = parse_cfg_file("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$lang_pack['iso']}/imageset.cfg"); - foreach ($cfg_data_imageset_data as $image_name => $value) - { - if (strpos($value, '*') !== false) - { - if (substr($value, -1, 1) === '*') - { - list($image_filename, $image_height) = explode('*', $value); - $image_width = 0; - } - else - { - list($image_filename, $image_height, $image_width) = explode('*', $value); - } - } - else - { - $image_filename = $value; - $image_height = $image_width = 0; - } - - if (strpos($image_name, 'img_') === 0 && $image_filename) - { - $image_name = substr($image_name, 4); - if (in_array($image_name, $valid_localized)) - { - $sql_ary[] = array( - 'image_name' => (string) $image_name, - 'image_filename' => (string) $image_filename, - 'image_height' => (int) $image_height, - 'image_width' => (int) $image_width, - 'imageset_id' => (int) $imageset_row['imageset_id'], - 'image_lang' => (string) $lang_pack['iso'], - ); - } - } - } - } - } - $db->sql_freeresult($result); - - if (sizeof($sql_ary)) - { - $db->sql_multi_insert(STYLES_IMAGESET_DATA_TABLE, $sql_ary); - $cache->destroy('sql', STYLES_IMAGESET_DATA_TABLE); - } - - // Now let's copy the default language entries for custom profile fields for this new language - makes admin's life easier. - $sql = 'SELECT lang_id - FROM ' . LANG_TABLE . " - WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'"; - $result = $db->sql_query($sql); - $default_lang_id = (int) $db->sql_fetchfield('lang_id'); - $db->sql_freeresult($result); - - // From the mysql documentation: - // Prior to MySQL 4.0.14, the target table of the INSERT statement cannot appear in the FROM clause of the SELECT part of the query. This limitation is lifted in 4.0.14. - // Due to this we stay on the safe side if we do the insertion "the manual way" - - $sql = 'SELECT field_id, lang_name, lang_explain, lang_default_value - FROM ' . PROFILE_LANG_TABLE . ' - WHERE lang_id = ' . $default_lang_id; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $row['lang_id'] = $lang_id; - $db->sql_query('INSERT INTO ' . PROFILE_LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $row)); - } - $db->sql_freeresult($result); - - $sql = 'SELECT field_id, option_id, field_type, lang_value - FROM ' . PROFILE_FIELDS_LANG_TABLE . ' - WHERE lang_id = ' . $default_lang_id; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $row['lang_id'] = $lang_id; - $db->sql_query('INSERT INTO ' . PROFILE_FIELDS_LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $row)); - } - $db->sql_freeresult($result); - - add_log('admin', 'LOG_LANGUAGE_PACK_INSTALLED', $lang_pack['name']); - - trigger_error(sprintf($user->lang['LANGUAGE_PACK_INSTALLED'], $lang_pack['name']) . adm_back_link($this->u_action)); - - break; - - case 'download': - - if (!$lang_id) - { - trigger_error($user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = 'SELECT * - FROM ' . LANG_TABLE . ' - WHERE lang_id = ' . $lang_id; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $use_method = request_var('use_method', ''); - $methods = array('.tar'); - - $available_methods = array('.tar.gz' => 'zlib', '.tar.bz2' => 'bz2', '.zip' => 'zlib'); - foreach ($available_methods as $type => $module) - { - if (!@extension_loaded($module)) - { - continue; - } - - $methods[] = $type; - } - - // Let the user decide in which format he wants to have the pack - if (!$use_method) - { - $this->page_title = 'SELECT_DOWNLOAD_FORMAT'; - - $radio_buttons = ''; - foreach ($methods as $method) - { - $radio_buttons .= ''; - } - - $template->assign_vars(array( - 'S_SELECT_METHOD' => true, - 'U_BACK' => $this->u_action, - 'U_ACTION' => $this->u_action . "&action=$action&id=$lang_id", - 'RADIO_BUTTONS' => $radio_buttons) - ); - - return; - } - - if (!in_array($use_method, $methods)) - { - $use_method = '.tar'; - } - - include_once($phpbb_root_path . 'includes/functions_compress.' . $phpEx); - - if ($use_method == '.zip') - { - $compress = new compress_zip('w', $phpbb_root_path . 'store/lang_' . $row['lang_iso'] . $use_method); - } - else - { - $compress = new compress_tar('w', $phpbb_root_path . 'store/lang_' . $row['lang_iso'] . $use_method, $use_method); - } - - // Get email templates - $email_templates = filelist($phpbb_root_path . 'language/' . $row['lang_iso'], 'email', 'txt'); - $email_templates = $email_templates['email/']; - - // Get acp files - $acp_files = filelist($phpbb_root_path . 'language/' . $row['lang_iso'], 'acp', $phpEx); - $acp_files = $acp_files['acp/']; - - // Get mod files - $mod_files = filelist($phpbb_root_path . 'language/' . $row['lang_iso'], 'mods', $phpEx); - $mod_files = (isset($mod_files['mods/'])) ? $mod_files['mods/'] : array(); - - // Add main files - $this->add_to_archive($compress, $this->main_files, $row['lang_iso']); - - // Add search files if they exist... - if (file_exists($phpbb_root_path . 'language/' . $row['lang_iso'] . '/search_ignore_words.' . $phpEx)) - { - $this->add_to_archive($compress, array("search_ignore_words.$phpEx"), $row['lang_iso']); - } - - if (file_exists($phpbb_root_path . 'language/' . $row['lang_iso'] . '/search_synonyms.' . $phpEx)) - { - $this->add_to_archive($compress, array("search_synonyms.$phpEx"), $row['lang_iso']); - } - - // Write files in folders - $this->add_to_archive($compress, $email_templates, $row['lang_iso'], 'email'); - $this->add_to_archive($compress, $acp_files, $row['lang_iso'], 'acp'); - $this->add_to_archive($compress, $mod_files, $row['lang_iso'], 'mods'); - - // Write ISO File - $iso_src = htmlspecialchars_decode($row['lang_english_name']) . "\n"; - $iso_src .= htmlspecialchars_decode($row['lang_local_name']) . "\n"; - $iso_src .= htmlspecialchars_decode($row['lang_author']); - $compress->add_data($iso_src, 'language/' . $row['lang_iso'] . '/iso.txt'); - - // index.html files - $compress->add_data('', 'language/' . $row['lang_iso'] . '/index.html'); - $compress->add_data('', 'language/' . $row['lang_iso'] . '/email/index.html'); - $compress->add_data('', 'language/' . $row['lang_iso'] . '/acp/index.html'); - - if (sizeof($mod_files)) - { - $compress->add_data('', 'language/' . $row['lang_iso'] . '/mods/index.html'); - } - - $compress->close(); - - $compress->download('lang_' . $row['lang_iso']); - @unlink($phpbb_root_path . 'store/lang_' . $row['lang_iso'] . $use_method); - - exit; - - break; - } - - $sql = 'SELECT user_lang, COUNT(user_lang) AS lang_count - FROM ' . USERS_TABLE . ' - GROUP BY user_lang'; - $result = $db->sql_query($sql); - - $lang_count = array(); - while ($row = $db->sql_fetchrow($result)) - { - $lang_count[$row['user_lang']] = $row['lang_count']; - } - $db->sql_freeresult($result); - - $sql = 'SELECT * - FROM ' . LANG_TABLE . ' - ORDER BY lang_english_name'; - $result = $db->sql_query($sql); - - $installed = array(); - - while ($row = $db->sql_fetchrow($result)) - { - $installed[] = $row['lang_iso']; - $tagstyle = ($row['lang_iso'] == $config['default_lang']) ? '*' : ''; - - $template->assign_block_vars('lang', array( - 'U_DETAILS' => $this->u_action . "&action=details&id={$row['lang_id']}", - 'U_DOWNLOAD' => $this->u_action . "&action=download&id={$row['lang_id']}", - 'U_DELETE' => $this->u_action . "&action=delete&id={$row['lang_id']}", - - 'ENGLISH_NAME' => $row['lang_english_name'], - 'TAG' => $tagstyle, - 'LOCAL_NAME' => $row['lang_local_name'], - 'ISO' => $row['lang_iso'], - 'USED_BY' => (isset($lang_count[$row['lang_iso']])) ? $lang_count[$row['lang_iso']] : 0, - )); - } - $db->sql_freeresult($result); - - $new_ary = $iso = array(); - $dp = @opendir("{$phpbb_root_path}language"); - - if ($dp) - { - while (($file = readdir($dp)) !== false) - { - if ($file[0] != '.' && file_exists("{$phpbb_root_path}language/$file/iso.txt")) - { - if (!in_array($file, $installed)) - { - if ($iso = file("{$phpbb_root_path}language/$file/iso.txt")) - { - if (sizeof($iso) == 3) - { - $new_ary[$file] = array( - 'iso' => $file, - 'name' => trim($iso[0]), - 'local_name'=> trim($iso[1]), - 'author' => trim($iso[2]) - ); - } - } - } - } - } - closedir($dp); - } - - unset($installed); - - if (sizeof($new_ary)) - { - foreach ($new_ary as $iso => $lang_ary) - { - $template->assign_block_vars('notinst', array( - 'ISO' => htmlspecialchars($lang_ary['iso']), - 'LOCAL_NAME' => htmlspecialchars($lang_ary['local_name'], ENT_COMPAT, 'UTF-8'), - 'NAME' => htmlspecialchars($lang_ary['name'], ENT_COMPAT, 'UTF-8'), - 'U_INSTALL' => $this->u_action . '&action=install&iso=' . urlencode($lang_ary['iso'])) - ); - } - } - - unset($new_ary); - } - - - /** - * Set default language variables/header - */ - function default_variables() - { - global $phpEx; - - $this->language_file_header = 'lang_header = ' -$lang = array_merge($lang, array( -'; - - // Language files in language root directory - $this->main_files = array("common.$phpEx", "groups.$phpEx", "install.$phpEx", "mcp.$phpEx", "memberlist.$phpEx", "posting.$phpEx", "search.$phpEx", "ucp.$phpEx", "viewforum.$phpEx", "viewtopic.$phpEx", "help_bbcode.$phpEx", "help_faq.$phpEx"); - } - - /** - * Get filename/location of language file - */ - function get_filename($lang_iso, $directory, $filename, $check_store = false, $only_return_filename = false) - { - global $phpbb_root_path, $safe_mode; - - $check_filename = "language/$lang_iso/" . (($directory) ? $directory . '/' : '') . $filename; - - if ($check_store) - { - $check_store_filename = ($safe_mode) ? "store/langfile_{$lang_iso}" . (($directory) ? '_' . $directory : '') . "_{$filename}" : "store/language/$lang_iso/" . (($directory) ? $directory . '/' : '') . $filename; - - if (!$only_return_filename && file_exists($phpbb_root_path . $check_store_filename)) - { - return $check_store_filename; - } - else if ($only_return_filename) - { - return $check_store_filename; - } - } - - return $check_filename; - } - - /** - * Add files to archive - */ - function add_to_archive(&$compress, $filelist, $lang_iso, $directory = '') - { - global $phpbb_root_path; - - foreach ($filelist as $file) - { - // Get source filename - $source = $this->get_filename($lang_iso, $directory, $file, true); - $destination = 'language/' . $lang_iso . '/' . (($directory) ? $directory . '/' : '') . $file; - - // Add file to archive - $compress->add_custom_file($phpbb_root_path . $source, $destination); - } - } - - /** - * Little helper to add some hardcoded template bits - */ - function add_input_field() - { - $keys = func_get_args(); - - $non_static = array_shift($keys); - $value = array_shift($keys); - - if (!$non_static) - { - return '' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . ''; - } - - // If more then 270 characters, then we present a textarea, else an input field - $textarea = (utf8_strlen($value) > 270) ? true : false; - $tpl = ''; - - $tpl .= ($textarea) ? '' : '" />'; - - return $tpl; - } - - /** - * Print language entries - */ - function print_language_entries(&$lang_ary, $key_prefix = '', $input_field = true) - { - $tpl = ''; - - foreach ($lang_ary as $key => $value) - { - if (is_array($value)) - { - // Write key - $tpl .= ' - - ' . htmlspecialchars($key_prefix, ENT_COMPAT, 'UTF-8') . '' . htmlspecialchars($key, ENT_COMPAT, 'UTF-8') . ' - '; - - foreach ($value as $_key => $_value) - { - if (is_array($_value)) - { - // Write key - $tpl .= ' - - ' . htmlspecialchars($key_prefix, ENT_COMPAT, 'UTF-8') . '   ' . htmlspecialchars($_key, ENT_COMPAT, 'UTF-8') . ' - '; - - foreach ($_value as $__key => $__value) - { - // Write key - $tpl .= ' - - ' . htmlspecialchars($key_prefix, ENT_COMPAT, 'UTF-8') . '' . htmlspecialchars($__key, ENT_COMPAT, 'UTF-8') . ' - '; - - $tpl .= $this->add_input_field($input_field, $__value, $key, $_key, $__key); - - $tpl .= ' - '; - } - } - else - { - // Write key - $tpl .= ' - - ' . htmlspecialchars($key_prefix, ENT_COMPAT, 'UTF-8') . '' . htmlspecialchars($_key, ENT_COMPAT, 'UTF-8') . ' - '; - - $tpl .= $this->add_input_field($input_field, $_value, $key, $_key); - - $tpl .= ' - '; - } - } - - $tpl .= ' - -   - '; - } - else - { - // Write key - $tpl .= ' - - ' . htmlspecialchars($key_prefix, ENT_COMPAT, 'UTF-8') . '' . htmlspecialchars($key, ENT_COMPAT, 'UTF-8') . ' - '; - - $tpl .= $this->add_input_field($input_field, $value, $key); - - $tpl .= ' - '; - } - } - - return $tpl; - } - - /** - * Compare two language files - */ - function compare_language_files($source_lang, $dest_lang, $directory, $file) - { - global $phpbb_root_path, $phpEx; - - $return_ary = array(); - - $lang = array(); - include("{$phpbb_root_path}language/{$source_lang}/" . (($directory) ? $directory . '/' : '') . $file); - $lang_entry_src = $lang; - - $lang = array(); - - if (!file_exists($phpbb_root_path . $this->get_filename($dest_lang, $directory, $file, true))) - { - return array(); - } - - include($phpbb_root_path . $this->get_filename($dest_lang, $directory, $file, true)); - - $lang_entry_dst = $lang; - - unset($lang); - - $diff_array_keys = array_diff(array_keys($lang_entry_src), array_keys($lang_entry_dst)); - unset($lang_entry_dst); - - foreach ($diff_array_keys as $key) - { - $return_ary[$key] = $lang_entry_src[$key]; - } - - unset($lang_entry_src); - - return $return_ary; - } - - /** - * Return language string value for storage - */ - function prepare_lang_entry($text, $store = true) - { - $text = (STRIP) ? stripslashes($text) : $text; - - // Adjust for storage... - if ($store) - { - $text = str_replace("'", "\\'", str_replace('\\', '\\\\', $text)); - } - - return $text; - } - - /** - * Format language array for storage - */ - function format_lang_array($key, $value, $tabs = "\t") - { - $entry = ''; - - if (!is_array($value)) - { - $entry .= "{$tabs}'" . $this->prepare_lang_entry($key) . "'\t=> '" . $this->prepare_lang_entry($value) . "',\n"; - } - else - { - $_tabs = $tabs . "\t"; - $entry .= "\n{$tabs}'" . $this->prepare_lang_entry($key) . "'\t=> array(\n"; - - foreach ($value as $_key => $_value) - { - $entry .= $this->format_lang_array($_key, $_value, $_tabs); - } - - $entry .= "{$tabs}),\n\n"; - } - - return $entry; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php deleted file mode 100644 index 12953173f1..0000000000 --- a/phpBB/includes/acp/acp_logs.php +++ /dev/null @@ -1,171 +0,0 @@ -add_lang('mcp'); - - // Set up general vars - $action = request_var('action', ''); - $forum_id = request_var('f', 0); - $start = request_var('start', 0); - $deletemark = (!empty($_POST['delmarked'])) ? true : false; - $deleteall = (!empty($_POST['delall'])) ? true : false; - $marked = request_var('mark', array(0)); - - // Sort keys - $sort_days = request_var('st', 0); - $sort_key = request_var('sk', 't'); - $sort_dir = request_var('sd', 'd'); - - $this->tpl_name = 'acp_logs'; - $this->log_type = constant('LOG_' . strtoupper($mode)); - - // Delete entries if requested and able - if (($deletemark || $deleteall) && $auth->acl_get('a_clearlogs')) - { - if (confirm_box(true)) - { - $where_sql = ''; - - if ($deletemark && sizeof($marked)) - { - $sql_in = array(); - foreach ($marked as $mark) - { - $sql_in[] = $mark; - } - $where_sql = ' AND ' . $db->sql_in_set('log_id', $sql_in); - unset($sql_in); - } - - if ($where_sql || $deleteall) - { - $sql = 'DELETE FROM ' . LOG_TABLE . " - WHERE log_type = {$this->log_type} - $where_sql"; - $db->sql_query($sql); - - add_log('admin', 'LOG_CLEAR_' . strtoupper($mode)); - } - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'f' => $forum_id, - 'start' => $start, - 'delmarked' => $deletemark, - 'delall' => $deleteall, - 'mark' => $marked, - 'st' => $sort_days, - 'sk' => $sort_key, - 'sd' => $sort_dir, - 'i' => $id, - 'mode' => $mode, - 'action' => $action)) - ); - } - } - - // Sorting - $limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); - $sort_by_text = array('u' => $user->lang['SORT_USERNAME'], 't' => $user->lang['SORT_DATE'], 'i' => $user->lang['SORT_IP'], 'o' => $user->lang['SORT_ACTION']); - $sort_by_sql = array('u' => 'u.username_clean', 't' => 'l.log_time', 'i' => 'l.log_ip', 'o' => 'l.log_operation'); - - $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = ''; - gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); - - // Define where and sort sql for use in displaying logs - $sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0; - $sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC'); - - $l_title = $user->lang['ACP_' . strtoupper($mode) . '_LOGS']; - $l_title_explain = $user->lang['ACP_' . strtoupper($mode) . '_LOGS_EXPLAIN']; - - $this->page_title = $l_title; - - // Define forum list if we're looking @ mod logs - if ($mode == 'mod') - { - $forum_box = '' . make_forum_select($forum_id); - - $template->assign_vars(array( - 'S_SHOW_FORUMS' => true, - 'S_FORUM_BOX' => $forum_box) - ); - } - - // Grab log data - $log_data = array(); - $log_count = 0; - view_log($mode, $log_data, $log_count, $config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort); - - $template->assign_vars(array( - 'L_TITLE' => $l_title, - 'L_EXPLAIN' => $l_title_explain, - 'U_ACTION' => $this->u_action, - - 'S_ON_PAGE' => on_page($log_count, $config['topics_per_page'], $start), - 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param", $log_count, $config['topics_per_page'], $start, true), - - 'S_LIMIT_DAYS' => $s_limit_days, - 'S_SORT_KEY' => $s_sort_key, - 'S_SORT_DIR' => $s_sort_dir, - 'S_CLEARLOGS' => $auth->acl_get('a_clearlogs'), - ) - ); - - foreach ($log_data as $row) - { - $data = array(); - - $checks = array('viewtopic', 'viewlogs', 'viewforum'); - foreach ($checks as $check) - { - if (isset($row[$check]) && $row[$check]) - { - $data[] = '' . $user->lang['LOGVIEW_' . strtoupper($check)] . ''; - } - } - - $template->assign_block_vars('log', array( - 'USERNAME' => $row['username_full'], - 'REPORTEE_USERNAME' => ($row['reportee_username'] && $row['user_id'] != $row['reportee_id']) ? $row['reportee_username_full'] : '', - - 'IP' => $row['ip'], - 'DATE' => $user->format_date($row['time']), - 'ACTION' => $row['action'], - 'DATA' => (sizeof($data)) ? implode(' | ', $data) : '', - 'ID' => $row['id'], - ) - ); - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php deleted file mode 100644 index bf6e8a39b5..0000000000 --- a/phpBB/includes/acp/acp_main.php +++ /dev/null @@ -1,459 +0,0 @@ -data['user_perm_from'] && $auth->acl_get('a_switchperm')) - { - $this->tpl_name = 'acp_main'; - $this->page_title = 'ACP_MAIN'; - - $sql = 'SELECT user_id, username, user_colour - FROM ' . USERS_TABLE . ' - WHERE user_id = ' . $user->data['user_perm_from']; - $result = $db->sql_query($sql); - $user_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $perm_from = '' : '>'); - $perm_from .= ($user_row['user_id'] != ANONYMOUS) ? '' : ''; - $perm_from .= $user_row['username']; - $perm_from .= ($user_row['user_id'] != ANONYMOUS) ? '' : ''; - $perm_from .= ''; - - $template->assign_vars(array( - 'S_RESTORE_PERMISSIONS' => true, - 'U_RESTORE_PERMISSIONS' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm'), - 'PERM_FROM' => $perm_from, - 'L_PERMISSIONS_TRANSFERRED_EXPLAIN' => sprintf($user->lang['PERMISSIONS_TRANSFERRED_EXPLAIN'], $perm_from, append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm')), - )); - - return; - } - - $action = request_var('action', ''); - - if ($action) - { - if (!confirm_box(true)) - { - switch ($action) - { - case 'online': - $confirm = true; - $confirm_lang = 'RESET_ONLINE_CONFIRM'; - break; - case 'stats': - $confirm = true; - $confirm_lang = 'RESYNC_STATS_CONFIRM'; - break; - case 'user': - $confirm = true; - $confirm_lang = 'RESYNC_POSTCOUNTS_CONFIRM'; - break; - case 'date': - $confirm = true; - $confirm_lang = 'RESET_DATE_CONFIRM'; - break; - case 'db_track': - $confirm = true; - $confirm_lang = 'RESYNC_POST_MARKING_CONFIRM'; - break; - case 'purge_cache': - $confirm = true; - $confirm_lang = 'PURGE_CACHE_CONFIRM'; - break; - - default: - $confirm = true; - $confirm_lang = 'CONFIRM_OPERATION'; - } - - if ($confirm) - { - confirm_box(false, $user->lang[$confirm_lang], build_hidden_fields(array( - 'i' => $id, - 'mode' => $mode, - 'action' => $action, - ))); - } - } - else - { - switch ($action) - { - case 'online': - if (!$auth->acl_get('a_board')) - { - trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - set_config('record_online_users', 1, true); - set_config('record_online_date', time(), true); - add_log('admin', 'LOG_RESET_ONLINE'); - break; - - case 'stats': - if (!$auth->acl_get('a_board')) - { - trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = 'SELECT COUNT(post_id) AS stat - FROM ' . POSTS_TABLE . ' - WHERE post_approved = 1'; - $result = $db->sql_query($sql); - set_config('num_posts', (int) $db->sql_fetchfield('stat'), true); - $db->sql_freeresult($result); - - $sql = 'SELECT COUNT(topic_id) AS stat - FROM ' . TOPICS_TABLE . ' - WHERE topic_approved = 1'; - $result = $db->sql_query($sql); - set_config('num_topics', (int) $db->sql_fetchfield('stat'), true); - $db->sql_freeresult($result); - - $sql = 'SELECT COUNT(user_id) AS stat - FROM ' . USERS_TABLE . ' - WHERE user_type IN (' . USER_NORMAL . ',' . USER_FOUNDER . ')'; - $result = $db->sql_query($sql); - set_config('num_users', (int) $db->sql_fetchfield('stat'), true); - $db->sql_freeresult($result); - - $sql = 'SELECT COUNT(attach_id) as stat - FROM ' . ATTACHMENTS_TABLE . ' - WHERE is_orphan = 0'; - $result = $db->sql_query($sql); - set_config('num_files', (int) $db->sql_fetchfield('stat'), true); - $db->sql_freeresult($result); - - $sql = 'SELECT SUM(filesize) as stat - FROM ' . ATTACHMENTS_TABLE . ' - WHERE is_orphan = 0'; - $result = $db->sql_query($sql); - set_config('upload_dir_size', (int) $db->sql_fetchfield('stat'), true); - $db->sql_freeresult($result); - - if (!function_exists('update_last_username')) - { - include($phpbb_root_path . "includes/functions_user.$phpEx"); - } - update_last_username(); - - add_log('admin', 'LOG_RESYNC_STATS'); - break; - - case 'user': - if (!$auth->acl_get('a_board')) - { - trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = 'SELECT COUNT(p.post_id) AS num_posts, u.user_id - FROM ' . USERS_TABLE . ' u - LEFT JOIN ' . POSTS_TABLE . ' p ON (u.user_id = p.poster_id AND p.post_postcount = 1) - GROUP BY u.user_id'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $db->sql_query('UPDATE ' . USERS_TABLE . " SET user_posts = {$row['num_posts']} WHERE user_id = {$row['user_id']}"); - } - $db->sql_freeresult($result); - - add_log('admin', 'LOG_RESYNC_POSTCOUNTS'); - - break; - - case 'date': - if (!$auth->acl_get('a_board')) - { - trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - set_config('board_startdate', time() - 1); - add_log('admin', 'LOG_RESET_DATE'); - break; - - case 'db_track': - if ($db->truncate) - { - $db->sql_query('TRUNCATE TABLE ' . TOPICS_POSTED_TABLE); - } - else - { - $db->sql_query('DELETE FROM ' . TOPICS_POSTED_TABLE); - } - - // This can get really nasty... therefore we only do the last six months - $get_from_time = time() - (6 * 4 * 7 * 24 * 60 * 60); - - // Select forum ids, do not include categories - $sql = 'SELECT forum_id - FROM ' . FORUMS_TABLE . ' - WHERE forum_type <> ' . FORUM_CAT; - $result = $db->sql_query($sql); - - $forum_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $forum_ids[] = $row['forum_id']; - } - $db->sql_freeresult($result); - - // Any global announcements? ;) - $forum_ids[] = 0; - - // Now go through the forums and get us some topics... - foreach ($forum_ids as $forum_id) - { - $sql = 'SELECT p.poster_id, p.topic_id - FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t - WHERE t.forum_id = ' . $forum_id . ' - AND t.topic_moved_id = 0 - AND t.topic_last_post_time > ' . $get_from_time . ' - AND t.topic_id = p.topic_id - AND p.poster_id <> ' . ANONYMOUS . ' - GROUP BY p.poster_id, p.topic_id'; - $result = $db->sql_query($sql); - - $posted = array(); - while ($row = $db->sql_fetchrow($result)) - { - $posted[$row['poster_id']][] = $row['topic_id']; - } - $db->sql_freeresult($result); - - $sql_ary = array(); - foreach ($posted as $user_id => $topic_row) - { - foreach ($topic_row as $topic_id) - { - $sql_ary[] = array( - 'user_id' => (int) $user_id, - 'topic_id' => (int) $topic_id, - 'topic_posted' => 1, - ); - } - } - unset($posted); - - if (sizeof($sql_ary)) - { - $db->sql_multi_insert(TOPICS_POSTED_TABLE, $sql_ary); - } - } - - add_log('admin', 'LOG_RESYNC_POST_MARKING'); - break; - - case 'purge_cache': - if ((int) $user->data['user_type'] !== USER_FOUNDER) - { - trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - global $cache; - $cache->purge(); - - // Clear permissions - $auth->acl_clear_prefetch(); - cache_moderators(); - - add_log('admin', 'LOG_PURGE_CACHE'); - break; - } - } - } - - // Get forum statistics - $total_posts = $config['num_posts']; - $total_topics = $config['num_topics']; - $total_users = $config['num_users']; - $total_files = $config['num_files']; - - $start_date = $user->format_date($config['board_startdate']); - - $boarddays = (time() - $config['board_startdate']) / 86400; - - $posts_per_day = sprintf('%.2f', $total_posts / $boarddays); - $topics_per_day = sprintf('%.2f', $total_topics / $boarddays); - $users_per_day = sprintf('%.2f', $total_users / $boarddays); - $files_per_day = sprintf('%.2f', $total_files / $boarddays); - - $upload_dir_size = get_formatted_filesize($config['upload_dir_size']); - - $avatar_dir_size = 0; - - if ($avatar_dir = @opendir($phpbb_root_path . $config['avatar_path'])) - { - while (($file = readdir($avatar_dir)) !== false) - { - if ($file[0] != '.' && $file != 'CVS' && strpos($file, 'index.') === false) - { - $avatar_dir_size += filesize($phpbb_root_path . $config['avatar_path'] . '/' . $file); - } - } - closedir($avatar_dir); - - $avatar_dir_size = get_formatted_filesize($avatar_dir_size); - } - else - { - // Couldn't open Avatar dir. - $avatar_dir_size = $user->lang['NOT_AVAILABLE']; - } - - if ($posts_per_day > $total_posts) - { - $posts_per_day = $total_posts; - } - - if ($topics_per_day > $total_topics) - { - $topics_per_day = $total_topics; - } - - if ($users_per_day > $total_users) - { - $users_per_day = $total_users; - } - - if ($files_per_day > $total_files) - { - $files_per_day = $total_files; - } - - if ($config['allow_attachments'] || $config['allow_pm_attach']) - { - $sql = 'SELECT COUNT(attach_id) AS total_orphan - FROM ' . ATTACHMENTS_TABLE . ' - WHERE is_orphan = 1 - AND filetime < ' . (time() - 3*60*60); - $result = $db->sql_query($sql); - $total_orphan = (int) $db->sql_fetchfield('total_orphan'); - $db->sql_freeresult($result); - } - else - { - $total_orphan = false; - } - - $dbsize = get_database_size(); - - $template->assign_vars(array( - 'TOTAL_POSTS' => $total_posts, - 'POSTS_PER_DAY' => $posts_per_day, - 'TOTAL_TOPICS' => $total_topics, - 'TOPICS_PER_DAY' => $topics_per_day, - 'TOTAL_USERS' => $total_users, - 'USERS_PER_DAY' => $users_per_day, - 'TOTAL_FILES' => $total_files, - 'FILES_PER_DAY' => $files_per_day, - 'START_DATE' => $start_date, - 'AVATAR_DIR_SIZE' => $avatar_dir_size, - 'DBSIZE' => $dbsize, - 'UPLOAD_DIR_SIZE' => $upload_dir_size, - 'TOTAL_ORPHAN' => $total_orphan, - 'S_TOTAL_ORPHAN' => ($total_orphan === false) ? false : true, - 'GZIP_COMPRESSION' => ($config['gzip_compress']) ? $user->lang['ON'] : $user->lang['OFF'], - 'DATABASE_INFO' => $db->sql_server_info(), - 'BOARD_VERSION' => $config['version'], - - 'U_ACTION' => $this->u_action, - 'U_ADMIN_LOG' => append_sid("{$phpbb_admin_path}index.$phpEx", 'i=logs&mode=admin'), - 'U_INACTIVE_USERS' => append_sid("{$phpbb_admin_path}index.$phpEx", 'i=inactive&mode=list'), - - 'S_ACTION_OPTIONS' => ($auth->acl_get('a_board')) ? true : false, - 'S_FOUNDER' => ($user->data['user_type'] == USER_FOUNDER) ? true : false, - ) - ); - - $log_data = array(); - $log_count = 0; - - if ($auth->acl_get('a_viewlogs')) - { - view_log('admin', $log_data, $log_count, 5); - - foreach ($log_data as $row) - { - $template->assign_block_vars('log', array( - 'USERNAME' => $row['username_full'], - 'IP' => $row['ip'], - 'DATE' => $user->format_date($row['time']), - 'ACTION' => $row['action']) - ); - } - } - - if ($auth->acl_get('a_user')) - { - $inactive = array(); - $inactive_count = 0; - - view_inactive_users($inactive, $inactive_count, 10); - - foreach ($inactive as $row) - { - $template->assign_block_vars('inactive', array( - 'INACTIVE_DATE' => $user->format_date($row['user_inactive_time']), - 'JOINED' => $user->format_date($row['user_regdate']), - 'LAST_VISIT' => (!$row['user_lastvisit']) ? ' - ' : $user->format_date($row['user_lastvisit']), - 'REASON' => $row['inactive_reason'], - 'USER_ID' => $row['user_id'], - 'USERNAME' => $row['username'], - 'U_USER_ADMIN' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=users&mode=overview&u={$row['user_id']}")) - ); - } - - $option_ary = array('activate' => 'ACTIVATE', 'delete' => 'DELETE'); - if ($config['email_enable']) - { - $option_ary += array('remind' => 'REMIND'); - } - - $template->assign_vars(array( - 'S_INACTIVE_USERS' => true, - 'S_INACTIVE_OPTIONS' => build_select($option_ary)) - ); - } - - // Warn if install is still present - if (file_exists($phpbb_root_path . 'install')) - { - $template->assign_var('S_REMOVE_INSTALL', true); - } - - $this->tpl_name = 'acp_main'; - $this->page_title = 'ACP_MAIN'; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php deleted file mode 100644 index f3540941df..0000000000 --- a/phpBB/includes/acp/acp_modules.php +++ /dev/null @@ -1,1063 +0,0 @@ -add_lang('acp/modules'); - $this->tpl_name = 'acp_modules'; - - // module class - $this->module_class = $mode; - - if ($this->module_class == 'ucp') - { - $user->add_lang('ucp'); - } - else if ($this->module_class == 'mcp') - { - $user->add_lang('mcp'); - } - - if ($module->p_class != $this->module_class) - { - $module->add_mod_info($this->module_class); - } - - $this->page_title = strtoupper($this->module_class); - - $this->parent_id = request_var('parent_id', 0); - $module_id = request_var('m', 0); - $action = request_var('action', ''); - $errors = array(); - - switch ($action) - { - case 'delete': - if (!$module_id) - { - trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); - } - - if (confirm_box(true)) - { - // Make sure we are not directly within a module - if ($module_id == $this->parent_id) - { - $sql = 'SELECT parent_id - FROM ' . MODULES_TABLE . ' - WHERE module_id = ' . $module_id; - $result = $db->sql_query($sql); - $this->parent_id = (int) $db->sql_fetchfield('parent_id'); - $db->sql_freeresult($result); - } - - $errors = $this->delete_module($module_id); - - if (!sizeof($errors)) - { - $this->remove_cache_file(); - trigger_error($user->lang['MODULE_DELETED'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id)); - } - } - else - { - confirm_box(false, 'DELETE_MODULE', build_hidden_fields(array( - 'i' => $id, - 'mode' => $mode, - 'parent_id' => $this->parent_id, - 'module_id' => $module_id, - 'action' => $action, - ))); - } - - break; - - case 'enable': - case 'disable': - if (!$module_id) - { - trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); - } - - $sql = 'SELECT * - FROM ' . MODULES_TABLE . " - WHERE module_class = '" . $db->sql_escape($this->module_class) . "' - AND module_id = $module_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error($user->lang['NO_MODULE'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); - } - - $sql = 'UPDATE ' . MODULES_TABLE . ' - SET module_enabled = ' . (($action == 'enable') ? 1 : 0) . " - WHERE module_class = '" . $db->sql_escape($this->module_class) . "' - AND module_id = $module_id"; - $db->sql_query($sql); - - add_log('admin', 'LOG_MODULE_' . strtoupper($action), $this->lang_name($row['module_langname'])); - $this->remove_cache_file(); - - break; - - case 'move_up': - case 'move_down': - if (!$module_id) - { - trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); - } - - $sql = 'SELECT * - FROM ' . MODULES_TABLE . " - WHERE module_class = '" . $db->sql_escape($this->module_class) . "' - AND module_id = $module_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error($user->lang['NO_MODULE'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); - } - - $move_module_name = $this->move_module_by($row, $action, 1); - - if ($move_module_name !== false) - { - add_log('admin', 'LOG_MODULE_' . strtoupper($action), $this->lang_name($row['module_langname']), $move_module_name); - $this->remove_cache_file(); - } - - break; - - case 'quickadd': - $quick_install = request_var('quick_install', ''); - - if (confirm_box(true)) - { - if (!$quick_install || strpos($quick_install, '::') === false) - { - break; - } - - list($module_basename, $module_mode) = explode('::', $quick_install); - - // Check if module name and mode exist... - $fileinfo = $this->get_module_infos($module_basename); - $fileinfo = $fileinfo[$module_basename]; - - if (isset($fileinfo['modes'][$module_mode])) - { - $module_data = array( - 'module_basename' => $module_basename, - 'module_enabled' => 0, - 'module_display' => (isset($fileinfo['modes'][$module_mode]['display'])) ? $fileinfo['modes'][$module_mode]['display'] : 1, - 'parent_id' => $this->parent_id, - 'module_class' => $this->module_class, - 'module_langname' => $fileinfo['modes'][$module_mode]['title'], - 'module_mode' => $module_mode, - 'module_auth' => $fileinfo['modes'][$module_mode]['auth'], - ); - - $errors = $this->update_module_data($module_data); - - if (!sizeof($errors)) - { - $this->remove_cache_file(); - - trigger_error($user->lang['MODULE_ADDED'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id)); - } - } - } - else - { - confirm_box(false, 'ADD_MODULE', build_hidden_fields(array( - 'i' => $id, - 'mode' => $mode, - 'parent_id' => $this->parent_id, - 'action' => 'quickadd', - 'quick_install' => $quick_install, - ))); - } - - break; - - case 'edit': - - if (!$module_id) - { - trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); - } - - $module_row = $this->get_module_row($module_id); - - // no break - - case 'add': - - if ($action == 'add') - { - $module_row = array( - 'module_basename' => '', - 'module_enabled' => 0, - 'module_display' => 1, - 'parent_id' => 0, - 'module_langname' => utf8_normalize_nfc(request_var('module_langname', '', true)), - 'module_mode' => '', - 'module_auth' => '', - ); - } - - $module_data = array(); - - $module_data['module_basename'] = request_var('module_basename', (string) $module_row['module_basename']); - $module_data['module_enabled'] = request_var('module_enabled', (int) $module_row['module_enabled']); - $module_data['module_display'] = request_var('module_display', (int) $module_row['module_display']); - $module_data['parent_id'] = request_var('module_parent_id', (int) $module_row['parent_id']); - $module_data['module_class'] = $this->module_class; - $module_data['module_langname'] = utf8_normalize_nfc(request_var('module_langname', (string) $module_row['module_langname'], true)); - $module_data['module_mode'] = request_var('module_mode', (string) $module_row['module_mode']); - - $submit = (isset($_POST['submit'])) ? true : false; - - if ($submit) - { - if (!$module_data['module_langname']) - { - trigger_error($user->lang['NO_MODULE_LANGNAME'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); - } - - $module_type = request_var('module_type', 'category'); - - if ($module_type == 'category') - { - $module_data['module_basename'] = $module_data['module_mode'] = $module_data['module_auth'] = ''; - $module_data['module_display'] = 1; - } - - if ($action == 'edit') - { - $module_data['module_id'] = $module_id; - } - - // Adjust auth row - if ($module_data['module_basename'] && $module_data['module_mode']) - { - $fileinfo = $this->get_module_infos($module_data['module_basename']); - $module_data['module_auth'] = $fileinfo[$module_data['module_basename']]['modes'][$module_data['module_mode']]['auth']; - } - - $errors = $this->update_module_data($module_data); - - if (!sizeof($errors)) - { - $this->remove_cache_file(); - - trigger_error((($action == 'add') ? $user->lang['MODULE_ADDED'] : $user->lang['MODULE_EDITED']) . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id)); - } - } - - // Category/not category? - $is_cat = (!$module_data['module_basename']) ? true : false; - - // Get module information - $module_infos = $this->get_module_infos(); - - // Build name options - $s_name_options = $s_mode_options = ''; - foreach ($module_infos as $option => $values) - { - if (!$module_data['module_basename']) - { - $module_data['module_basename'] = $option; - } - - // Name options - $s_name_options .= ''; - - $template->assign_block_vars('m_names', array('NAME' => $option, 'A_NAME' => addslashes($option))); - - // Build module modes - foreach ($values['modes'] as $m_mode => $m_values) - { - if ($option == $module_data['module_basename']) - { - $s_mode_options .= ''; - } - - $template->assign_block_vars('m_names.modes', array( - 'OPTION' => $m_mode, - 'VALUE' => $this->lang_name($m_values['title']), - 'A_OPTION' => addslashes($m_mode), - 'A_VALUE' => addslashes($this->lang_name($m_values['title']))) - ); - } - } - - $s_cat_option = ''; - - $template->assign_vars(array_merge(array( - 'S_EDIT_MODULE' => true, - 'S_IS_CAT' => $is_cat, - 'S_CAT_OPTIONS' => $s_cat_option . $this->make_module_select($module_data['parent_id'], ($action == 'edit') ? $module_row['module_id'] : false, false, false, false, true), - 'S_MODULE_NAMES' => $s_name_options, - 'S_MODULE_MODES' => $s_mode_options, - 'U_BACK' => $this->u_action . '&parent_id=' . $this->parent_id, - 'U_EDIT_ACTION' => $this->u_action . '&parent_id=' . $this->parent_id, - - 'L_TITLE' => $user->lang[strtoupper($action) . '_MODULE'], - - 'MODULENAME' => $this->lang_name($module_data['module_langname']), - 'ACTION' => $action, - 'MODULE_ID' => $module_id, - - ), - array_change_key_case($module_data, CASE_UPPER)) - ); - - if (sizeof($errors)) - { - $template->assign_vars(array( - 'S_ERROR' => true, - 'ERROR_MSG' => implode('
    ', $errors)) - ); - } - - return; - - break; - } - - // Default management page - if (sizeof($errors)) - { - $template->assign_vars(array( - 'S_ERROR' => true, - 'ERROR_MSG' => implode('
    ', $errors)) - ); - } - - if (!$this->parent_id) - { - $navigation = strtoupper($this->module_class); - } - else - { - $navigation = '' . strtoupper($this->module_class) . ''; - - $modules_nav = $this->get_module_branch($this->parent_id, 'parents', 'descending'); - - foreach ($modules_nav as $row) - { - $langname = $this->lang_name($row['module_langname']); - - if ($row['module_id'] == $this->parent_id) - { - $navigation .= ' -> ' . $langname; - } - else - { - $navigation .= ' -> ' . $langname . ''; - } - } - } - - // Jumpbox - $module_box = $this->make_module_select($this->parent_id, false, false, false, false); - - $sql = 'SELECT * - FROM ' . MODULES_TABLE . " - WHERE parent_id = {$this->parent_id} - AND module_class = '" . $db->sql_escape($this->module_class) . "' - ORDER BY left_id"; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - do - { - $langname = $this->lang_name($row['module_langname']); - - if (!$row['module_enabled']) - { - $module_image = '' . $user->lang['DEACTIVATED_MODULE'] .''; - } - else - { - $module_image = (!$row['module_basename'] || $row['left_id'] + 1 != $row['right_id']) ? '' . $user->lang['CATEGORY'] . '' : '' . $user->lang['MODULE'] . ''; - } - - $url = $this->u_action . '&parent_id=' . $this->parent_id . '&m=' . $row['module_id']; - - $template->assign_block_vars('modules', array( - 'MODULE_IMAGE' => $module_image, - 'MODULE_TITLE' => $langname, - 'MODULE_ENABLED' => ($row['module_enabled']) ? true : false, - 'MODULE_DISPLAYED' => ($row['module_display']) ? true : false, - - 'S_ACP_CAT_SYSTEM' => ($this->module_class == 'acp' && $row['module_langname'] == 'ACP_CAT_SYSTEM') ? true : false, - 'S_ACP_MODULE_MANAGEMENT' => ($this->module_class == 'acp' && ($row['module_basename'] == 'modules' || $row['module_langname'] == 'ACP_MODULE_MANAGEMENT')) ? true : false, - - 'U_MODULE' => $this->u_action . '&parent_id=' . $row['module_id'], - 'U_MOVE_UP' => $url . '&action=move_up', - 'U_MOVE_DOWN' => $url . '&action=move_down', - 'U_EDIT' => $url . '&action=edit', - 'U_DELETE' => $url . '&action=delete', - 'U_ENABLE' => $url . '&action=enable', - 'U_DISABLE' => $url . '&action=disable') - ); - } - while ($row = $db->sql_fetchrow($result)); - } - else if ($this->parent_id) - { - $row = $this->get_module_row($this->parent_id); - - $url = $this->u_action . '&parent_id=' . $this->parent_id . '&m=' . $row['module_id']; - - $template->assign_vars(array( - 'S_NO_MODULES' => true, - 'MODULE_TITLE' => $langname, - 'MODULE_ENABLED' => ($row['module_enabled']) ? true : false, - 'MODULE_DISPLAYED' => ($row['module_display']) ? true : false, - - 'U_EDIT' => $url . '&action=edit', - 'U_DELETE' => $url . '&action=delete', - 'U_ENABLE' => $url . '&action=enable', - 'U_DISABLE' => $url . '&action=disable') - ); - } - $db->sql_freeresult($result); - - // Quick adding module - $module_infos = $this->get_module_infos(); - - // Build quick options - $s_install_options = ''; - foreach ($module_infos as $option => $values) - { - // Name options - $s_install_options .= ''; - - // Build module modes - foreach ($values['modes'] as $m_mode => $m_values) - { - $s_install_options .= ''; - } - - $s_install_options .= ''; - } - - $template->assign_vars(array( - 'U_SEL_ACTION' => $this->u_action, - 'U_ACTION' => $this->u_action . '&parent_id=' . $this->parent_id, - 'NAVIGATION' => $navigation, - 'MODULE_BOX' => $module_box, - 'PARENT_ID' => $this->parent_id, - 'S_INSTALL_OPTIONS' => $s_install_options, - ) - ); - } - - /** - * Get row for specified module - */ - function get_module_row($module_id) - { - global $db, $user; - - $sql = 'SELECT * - FROM ' . MODULES_TABLE . " - WHERE module_class = '" . $db->sql_escape($this->module_class) . "' - AND module_id = $module_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error($user->lang['NO_MODULE'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); - } - - return $row; - } - - /** - * Get available module information from module files - */ - function get_module_infos($module = '', $module_class = false) - { - global $phpbb_root_path, $phpEx; - - $module_class = ($module_class === false) ? $this->module_class : $module_class; - - $directory = $phpbb_root_path . 'includes/' . $module_class . '/info/'; - $fileinfo = array(); - - if (!$module) - { - $dh = @opendir($directory); - - if (!$dh) - { - return $fileinfo; - } - - while (($file = readdir($dh)) !== false) - { - // Is module? - if (preg_match('/^' . $module_class . '_.+\.' . $phpEx . '$/', $file)) - { - $class = str_replace(".$phpEx", '', $file) . '_info'; - - if (!class_exists($class)) - { - include($directory . $file); - } - - // Get module title tag - if (class_exists($class)) - { - $c_class = new $class(); - $module_info = $c_class->module(); - $fileinfo[str_replace($module_class . '_', '', $module_info['filename'])] = $module_info; - } - } - } - closedir($dh); - - ksort($fileinfo); - } - else - { - $filename = $module_class . '_' . basename($module); - $class = $module_class . '_' . basename($module) . '_info'; - - if (!class_exists($class)) - { - include($directory . $filename . '.' . $phpEx); - } - - // Get module title tag - if (class_exists($class)) - { - $c_class = new $class(); - $module_info = $c_class->module(); - $fileinfo[str_replace($module_class . '_', '', $module_info['filename'])] = $module_info; - } - } - - return $fileinfo; - } - - /** - * Simple version of jumpbox, just lists modules - */ - function make_module_select($select_id = false, $ignore_id = false, $ignore_acl = false, $ignore_nonpost = false, $ignore_emptycat = true, $ignore_noncat = false) - { - global $db, $user, $auth, $config; - - $sql = 'SELECT module_id, module_enabled, module_basename, parent_id, module_langname, left_id, right_id, module_auth - FROM ' . MODULES_TABLE . " - WHERE module_class = '" . $db->sql_escape($this->module_class) . "' - ORDER BY left_id ASC"; - $result = $db->sql_query($sql); - - $right = $iteration = 0; - $padding_store = array('0' => ''); - $module_list = $padding = ''; - - while ($row = $db->sql_fetchrow($result)) - { - if ($row['left_id'] < $right) - { - $padding .= '   '; - $padding_store[$row['parent_id']] = $padding; - } - else if ($row['left_id'] > $right + 1) - { - $padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : ''; - } - - $right = $row['right_id']; - - if (!$ignore_acl && $row['module_auth']) - { - // We use zero as the forum id to check - global setting. - if (!p_master::module_auth($row['module_auth'], 0)) - { - continue; - } - } - - // ignore this module? - if ((is_array($ignore_id) && in_array($row['module_id'], $ignore_id)) || $row['module_id'] == $ignore_id) - { - continue; - } - - // empty category - if (!$row['module_basename'] && ($row['left_id'] + 1 == $row['right_id']) && $ignore_emptycat) - { - continue; - } - - // ignore non-category? - if ($row['module_basename'] && $ignore_noncat) - { - continue; - } - - $selected = (is_array($select_id)) ? ((in_array($row['module_id'], $select_id)) ? ' selected="selected"' : '') : (($row['module_id'] == $select_id) ? ' selected="selected"' : ''); - - $langname = $this->lang_name($row['module_langname']); - $module_list .= ''; - - $iteration++; - } - unset($padding_store); - - return $module_list; - } - - /** - * Get module branch - */ - function get_module_branch($module_id, $type = 'all', $order = 'descending', $include_module = true) - { - global $db; - - switch ($type) - { - case 'parents': - $condition = 'm1.left_id BETWEEN m2.left_id AND m2.right_id'; - break; - - case 'children': - $condition = 'm2.left_id BETWEEN m1.left_id AND m1.right_id'; - break; - - default: - $condition = 'm2.left_id BETWEEN m1.left_id AND m1.right_id OR m1.left_id BETWEEN m2.left_id AND m2.right_id'; - break; - } - - $rows = array(); - - $sql = 'SELECT m2.* - FROM ' . MODULES_TABLE . ' m1 - LEFT JOIN ' . MODULES_TABLE . " m2 ON ($condition) - WHERE m1.module_class = '" . $db->sql_escape($this->module_class) . "' - AND m2.module_class = '" . $db->sql_escape($this->module_class) . "' - AND m1.module_id = $module_id - ORDER BY m2.left_id " . (($order == 'descending') ? 'ASC' : 'DESC'); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if (!$include_module && $row['module_id'] == $module_id) - { - continue; - } - - $rows[] = $row; - } - $db->sql_freeresult($result); - - return $rows; - } - - /** - * Remove modules cache file - */ - function remove_cache_file() - { - global $cache; - - // Sanitise for future path use, it's escaped as appropriate for queries - $p_class = str_replace(array('.', '/', '\\'), '', basename($this->module_class)); - - $cache->destroy('_modules_' . $p_class); - - // Additionally remove sql cache - $cache->destroy('sql', MODULES_TABLE); - } - - /** - * Return correct language name - */ - function lang_name($module_langname) - { - global $user; - - return (!empty($user->lang[$module_langname])) ? $user->lang[$module_langname] : $module_langname; - } - - /** - * Update/Add module - * - * @param bool $run_inline if set to true errors will be returned and no logs being written - */ - function update_module_data(&$module_data, $run_inline = false) - { - global $db, $user; - - if (!isset($module_data['module_id'])) - { - // no module_id means we're creating a new category/module - if ($module_data['parent_id']) - { - $sql = 'SELECT left_id, right_id - FROM ' . MODULES_TABLE . " - WHERE module_class = '" . $db->sql_escape($module_data['module_class']) . "' - AND module_id = " . (int) $module_data['parent_id']; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - if ($run_inline) - { - return 'PARENT_NO_EXIST'; - } - - trigger_error($user->lang['PARENT_NO_EXIST'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); - } - - // Workaround - $row['left_id'] = (int) $row['left_id']; - $row['right_id'] = (int) $row['right_id']; - - $sql = 'UPDATE ' . MODULES_TABLE . " - SET left_id = left_id + 2, right_id = right_id + 2 - WHERE module_class = '" . $db->sql_escape($module_data['module_class']) . "' - AND left_id > {$row['right_id']}"; - $db->sql_query($sql); - - $sql = 'UPDATE ' . MODULES_TABLE . " - SET right_id = right_id + 2 - WHERE module_class = '" . $db->sql_escape($module_data['module_class']) . "' - AND {$row['left_id']} BETWEEN left_id AND right_id"; - $db->sql_query($sql); - - $module_data['left_id'] = (int) $row['right_id']; - $module_data['right_id'] = (int) $row['right_id'] + 1; - } - else - { - $sql = 'SELECT MAX(right_id) AS right_id - FROM ' . MODULES_TABLE . " - WHERE module_class = '" . $db->sql_escape($module_data['module_class']) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $module_data['left_id'] = (int) $row['right_id'] + 1; - $module_data['right_id'] = (int) $row['right_id'] + 2; - } - - $sql = 'INSERT INTO ' . MODULES_TABLE . ' ' . $db->sql_build_array('INSERT', $module_data); - $db->sql_query($sql); - - $module_data['module_id'] = $db->sql_nextid(); - - if (!$run_inline) - { - add_log('admin', 'LOG_MODULE_ADD', $this->lang_name($module_data['module_langname'])); - } - } - else - { - $row = $this->get_module_row($module_data['module_id']); - - if ($module_data['module_basename'] && !$row['module_basename']) - { - // we're turning a category into a module - $branch = $this->get_module_branch($module_data['module_id'], 'children', 'descending', false); - - if (sizeof($branch)) - { - return array($user->lang['NO_CATEGORY_TO_MODULE']); - } - } - - if ($row['parent_id'] != $module_data['parent_id']) - { - $this->move_module($module_data['module_id'], $module_data['parent_id']); - } - - $update_ary = $module_data; - unset($update_ary['module_id']); - - $sql = 'UPDATE ' . MODULES_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $update_ary) . " - WHERE module_class = '" . $db->sql_escape($module_data['module_class']) . "' - AND module_id = " . (int) $module_data['module_id']; - $db->sql_query($sql); - - if (!$run_inline) - { - add_log('admin', 'LOG_MODULE_EDIT', $this->lang_name($module_data['module_langname'])); - } - } - - return array(); - } - - /** - * Move module around the tree - */ - function move_module($from_module_id, $to_parent_id) - { - global $db; - - $moved_modules = $this->get_module_branch($from_module_id, 'children', 'descending'); - $from_data = $moved_modules[0]; - $diff = sizeof($moved_modules) * 2; - - $moved_ids = array(); - for ($i = 0; $i < sizeof($moved_modules); ++$i) - { - $moved_ids[] = $moved_modules[$i]['module_id']; - } - - // Resync parents - $sql = 'UPDATE ' . MODULES_TABLE . " - SET right_id = right_id - $diff - WHERE module_class = '" . $db->sql_escape($this->module_class) . "' - AND left_id < " . (int) $from_data['right_id'] . ' - AND right_id > ' . (int) $from_data['right_id']; - $db->sql_query($sql); - - // Resync righthand side of tree - $sql = 'UPDATE ' . MODULES_TABLE . " - SET left_id = left_id - $diff, right_id = right_id - $diff - WHERE module_class = '" . $db->sql_escape($this->module_class) . "' - AND left_id > " . (int) $from_data['right_id']; - $db->sql_query($sql); - - if ($to_parent_id > 0) - { - $to_data = $this->get_module_row($to_parent_id); - - // Resync new parents - $sql = 'UPDATE ' . MODULES_TABLE . " - SET right_id = right_id + $diff - WHERE module_class = '" . $db->sql_escape($this->module_class) . "' - AND " . (int) $to_data['right_id'] . ' BETWEEN left_id AND right_id - AND ' . $db->sql_in_set('module_id', $moved_ids, true); - $db->sql_query($sql); - - // Resync the righthand side of the tree - $sql = 'UPDATE ' . MODULES_TABLE . " - SET left_id = left_id + $diff, right_id = right_id + $diff - WHERE module_class = '" . $db->sql_escape($this->module_class) . "' - AND left_id > " . (int) $to_data['right_id'] . ' - AND ' . $db->sql_in_set('module_id', $moved_ids, true); - $db->sql_query($sql); - - // Resync moved branch - $to_data['right_id'] += $diff; - if ($to_data['right_id'] > $from_data['right_id']) - { - $diff = '+ ' . ($to_data['right_id'] - $from_data['right_id'] - 1); - } - else - { - $diff = '- ' . abs($to_data['right_id'] - $from_data['right_id'] - 1); - } - } - else - { - $sql = 'SELECT MAX(right_id) AS right_id - FROM ' . MODULES_TABLE . " - WHERE module_class = '" . $db->sql_escape($this->module_class) . "' - AND " . $db->sql_in_set('module_id', $moved_ids, true); - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $diff = '+ ' . (int) ($row['right_id'] - $from_data['left_id'] + 1); - } - - $sql = 'UPDATE ' . MODULES_TABLE . " - SET left_id = left_id $diff, right_id = right_id $diff - WHERE module_class = '" . $db->sql_escape($this->module_class) . "' - AND " . $db->sql_in_set('module_id', $moved_ids); - $db->sql_query($sql); - } - - /** - * Remove module from tree - */ - function delete_module($module_id) - { - global $db, $user; - - $row = $this->get_module_row($module_id); - - $branch = $this->get_module_branch($module_id, 'children', 'descending', false); - - if (sizeof($branch)) - { - return array($user->lang['CANNOT_REMOVE_MODULE']); - } - - // If not move - $diff = 2; - $sql = 'DELETE FROM ' . MODULES_TABLE . " - WHERE module_class = '" . $db->sql_escape($this->module_class) . "' - AND module_id = $module_id"; - $db->sql_query($sql); - - $row['right_id'] = (int) $row['right_id']; - $row['left_id'] = (int) $row['left_id']; - - // Resync tree - $sql = 'UPDATE ' . MODULES_TABLE . " - SET right_id = right_id - $diff - WHERE module_class = '" . $db->sql_escape($this->module_class) . "' - AND left_id < {$row['right_id']} AND right_id > {$row['right_id']}"; - $db->sql_query($sql); - - $sql = 'UPDATE ' . MODULES_TABLE . " - SET left_id = left_id - $diff, right_id = right_id - $diff - WHERE module_class = '" . $db->sql_escape($this->module_class) . "' - AND left_id > {$row['right_id']}"; - $db->sql_query($sql); - - add_log('admin', 'LOG_MODULE_REMOVED', $this->lang_name($row['module_langname'])); - - return array(); - - } - - /** - * Move module position by $steps up/down - */ - function move_module_by($module_row, $action = 'move_up', $steps = 1) - { - global $db; - - /** - * Fetch all the siblings between the module's current spot - * and where we want to move it to. If there are less than $steps - * siblings between the current spot and the target then the - * module will move as far as possible - */ - $sql = 'SELECT module_id, left_id, right_id, module_langname - FROM ' . MODULES_TABLE . " - WHERE module_class = '" . $db->sql_escape($this->module_class) . "' - AND parent_id = " . (int) $module_row['parent_id'] . ' - AND ' . (($action == 'move_up') ? 'right_id < ' . (int) $module_row['right_id'] . ' ORDER BY right_id DESC' : 'left_id > ' . (int) $module_row['left_id'] . ' ORDER BY left_id ASC'); - $result = $db->sql_query_limit($sql, $steps); - - $target = array(); - while ($row = $db->sql_fetchrow($result)) - { - $target = $row; - } - $db->sql_freeresult($result); - - if (!sizeof($target)) - { - // The module is already on top or bottom - return false; - } - - /** - * $left_id and $right_id define the scope of the nodes that are affected by the move. - * $diff_up and $diff_down are the values to substract or add to each node's left_id - * and right_id in order to move them up or down. - * $move_up_left and $move_up_right define the scope of the nodes that are moving - * up. Other nodes in the scope of ($left_id, $right_id) are considered to move down. - */ - if ($action == 'move_up') - { - $left_id = (int) $target['left_id']; - $right_id = (int) $module_row['right_id']; - - $diff_up = (int) ($module_row['left_id'] - $target['left_id']); - $diff_down = (int) ($module_row['right_id'] + 1 - $module_row['left_id']); - - $move_up_left = (int) $module_row['left_id']; - $move_up_right = (int) $module_row['right_id']; - } - else - { - $left_id = (int) $module_row['left_id']; - $right_id = (int) $target['right_id']; - - $diff_up = (int) ($module_row['right_id'] + 1 - $module_row['left_id']); - $diff_down = (int) ($target['right_id'] - $module_row['right_id']); - - $move_up_left = (int) ($module_row['right_id'] + 1); - $move_up_right = (int) $target['right_id']; - } - - // Now do the dirty job - $sql = 'UPDATE ' . MODULES_TABLE . " - SET left_id = left_id + CASE - WHEN left_id BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up} - ELSE {$diff_down} - END, - right_id = right_id + CASE - WHEN right_id BETWEEN {$move_up_left} AND {$move_up_right} THEN -{$diff_up} - ELSE {$diff_down} - END - WHERE module_class = '" . $db->sql_escape($this->module_class) . "' - AND left_id BETWEEN {$left_id} AND {$right_id} - AND right_id BETWEEN {$left_id} AND {$right_id}"; - $db->sql_query($sql); - - $this->remove_cache_file(); - - return $this->lang_name($target['module_langname']); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_permission_roles.php b/phpBB/includes/acp/acp_permission_roles.php deleted file mode 100644 index 03ea5a39dd..0000000000 --- a/phpBB/includes/acp/acp_permission_roles.php +++ /dev/null @@ -1,571 +0,0 @@ -add_lang('acp/permissions'); - add_permission_language(); - - $this->tpl_name = 'acp_permission_roles'; - - $submit = (isset($_POST['submit'])) ? true : false; - $role_id = request_var('role_id', 0); - $action = request_var('action', ''); - $action = (isset($_POST['add'])) ? 'add' : $action; - - $form_name = 'acp_permissions'; - add_form_key($form_name); - - switch ($mode) - { - case 'admin_roles': - $permission_type = 'a_'; - $this->page_title = 'ACP_ADMIN_ROLES'; - break; - - case 'user_roles': - $permission_type = 'u_'; - $this->page_title = 'ACP_USER_ROLES'; - break; - - case 'mod_roles': - $permission_type = 'm_'; - $this->page_title = 'ACP_MOD_ROLES'; - break; - - case 'forum_roles': - $permission_type = 'f_'; - $this->page_title = 'ACP_FORUM_ROLES'; - break; - - default: - trigger_error('NO_MODE', E_USER_ERROR); - break; - } - - $template->assign_vars(array( - 'L_TITLE' => $user->lang[$this->page_title], - 'L_EXPLAIN' => $user->lang[$this->page_title . '_EXPLAIN']) - ); - - // Take action... admin submitted something - if ($submit || $action == 'remove') - { - switch ($action) - { - case 'remove': - - if (!$role_id) - { - trigger_error($user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = 'SELECT * - FROM ' . ACL_ROLES_TABLE . ' - WHERE role_id = ' . $role_id; - $result = $db->sql_query($sql); - $role_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$role_row) - { - trigger_error($user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if (confirm_box(true)) - { - $this->remove_role($role_id, $permission_type); - - $role_name = (!empty($user->lang[$role_row['role_name']])) ? $user->lang[$role_row['role_name']] : $role_row['role_name']; - add_log('admin', 'LOG_' . strtoupper($permission_type) . 'ROLE_REMOVED', $role_name); - trigger_error($user->lang['ROLE_DELETED'] . adm_back_link($this->u_action)); - } - else - { - confirm_box(false, 'DELETE_ROLE', build_hidden_fields(array( - 'i' => $id, - 'mode' => $mode, - 'role_id' => $role_id, - 'action' => $action, - ))); - } - - break; - - case 'edit': - if (!$role_id) - { - trigger_error($user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - // Get role we edit - $sql = 'SELECT * - FROM ' . ACL_ROLES_TABLE . ' - WHERE role_id = ' . $role_id; - $result = $db->sql_query($sql); - $role_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$role_row) - { - trigger_error($user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - // no break; - - case 'add': - - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING); - } - - $role_name = utf8_normalize_nfc(request_var('role_name', '', true)); - $role_description = utf8_normalize_nfc(request_var('role_description', '', true)); - $auth_settings = request_var('setting', array('' => 0)); - - if (!$role_name) - { - trigger_error($user->lang['NO_ROLE_NAME_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if (utf8_strlen($role_description) > 4000) - { - trigger_error($user->lang['ROLE_DESCRIPTION_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - // if we add/edit a role we check the name to be unique among the settings... - $sql = 'SELECT role_id - FROM ' . ACL_ROLES_TABLE . " - WHERE role_type = '" . $db->sql_escape($permission_type) . "' - AND role_name = '" . $db->sql_escape($role_name) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // Make sure we only print out the error if we add the role or change it's name - if ($row && ($mode == 'add' || ($mode == 'edit' && $role_row['role_name'] != $role_name))) - { - trigger_error(sprintf($user->lang['ROLE_NAME_ALREADY_EXIST'], $role_name) . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql_ary = array( - 'role_name' => (string) $role_name, - 'role_description' => (string) $role_description, - 'role_type' => (string) $permission_type, - ); - - if ($action == 'edit') - { - $sql = 'UPDATE ' . ACL_ROLES_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE role_id = ' . $role_id; - $db->sql_query($sql); - } - else - { - // Get maximum role order for inserting a new role... - $sql = 'SELECT MAX(role_order) as max_order - FROM ' . ACL_ROLES_TABLE . " - WHERE role_type = '" . $db->sql_escape($permission_type) . "'"; - $result = $db->sql_query($sql); - $max_order = (int) $db->sql_fetchfield('max_order'); - $db->sql_freeresult($result); - - $sql_ary['role_order'] = $max_order + 1; - - $sql = 'INSERT INTO ' . ACL_ROLES_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - $db->sql_query($sql); - - $role_id = $db->sql_nextid(); - } - - // Now add the auth settings - $auth_admin->acl_set_role($role_id, $auth_settings); - - $role_name = (!empty($user->lang[$role_name])) ? $user->lang[$role_name] : $role_name; - add_log('admin', 'LOG_' . strtoupper($permission_type) . 'ROLE_' . strtoupper($action), $role_name); - - trigger_error($user->lang['ROLE_' . strtoupper($action) . '_SUCCESS'] . adm_back_link($this->u_action)); - - break; - } - } - - // Display screens - switch ($action) - { - case 'add': - - $options_from = request_var('options_from', 0); - - $role_row = array( - 'role_name' => utf8_normalize_nfc(request_var('role_name', '', true)), - 'role_description' => utf8_normalize_nfc(request_var('role_description', '', true)), - 'role_type' => $permission_type, - ); - - if ($options_from) - { - $sql = 'SELECT p.auth_option_id, p.auth_setting, o.auth_option - FROM ' . ACL_ROLES_DATA_TABLE . ' p, ' . ACL_OPTIONS_TABLE . ' o - WHERE o.auth_option_id = p.auth_option_id - AND p.role_id = ' . $options_from . ' - ORDER BY p.auth_option_id'; - $result = $db->sql_query($sql); - - $auth_options = array(); - while ($row = $db->sql_fetchrow($result)) - { - $auth_options[$row['auth_option']] = $row['auth_setting']; - } - $db->sql_freeresult($result); - } - else - { - $sql = 'SELECT auth_option_id, auth_option - FROM ' . ACL_OPTIONS_TABLE . " - WHERE auth_option " . $db->sql_like_expression($permission_type . $db->any_char) . " - AND auth_option <> '{$permission_type}' - ORDER BY auth_option_id"; - $result = $db->sql_query($sql); - - $auth_options = array(); - while ($row = $db->sql_fetchrow($result)) - { - $auth_options[$row['auth_option']] = ACL_NO; - } - $db->sql_freeresult($result); - } - - // no break; - - case 'edit': - - if ($action == 'edit') - { - if (!$role_id) - { - trigger_error($user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = 'SELECT * - FROM ' . ACL_ROLES_TABLE . ' - WHERE role_id = ' . $role_id; - $result = $db->sql_query($sql); - $role_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $sql = 'SELECT p.auth_option_id, p.auth_setting, o.auth_option - FROM ' . ACL_ROLES_DATA_TABLE . ' p, ' . ACL_OPTIONS_TABLE . ' o - WHERE o.auth_option_id = p.auth_option_id - AND p.role_id = ' . $role_id . ' - ORDER BY p.auth_option_id'; - $result = $db->sql_query($sql); - - $auth_options = array(); - while ($row = $db->sql_fetchrow($result)) - { - $auth_options[$row['auth_option']] = $row['auth_setting']; - } - $db->sql_freeresult($result); - } - - if (!$role_row) - { - trigger_error($user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $template->assign_vars(array( - 'S_EDIT' => true, - - 'U_ACTION' => $this->u_action . "&action={$action}&role_id={$role_id}", - 'U_BACK' => $this->u_action, - - 'ROLE_NAME' => $role_row['role_name'], - 'ROLE_DESCRIPTION' => $role_row['role_description'], - 'L_ACL_TYPE' => $user->lang['ACL_TYPE_' . strtoupper($permission_type)], - ) - ); - - // We need to fill the auth options array with ACL_NO options ;) - $sql = 'SELECT auth_option_id, auth_option - FROM ' . ACL_OPTIONS_TABLE . " - WHERE auth_option " . $db->sql_like_expression($permission_type . $db->any_char) . " - AND auth_option <> '{$permission_type}' - ORDER BY auth_option_id"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if (!isset($auth_options[$row['auth_option']])) - { - $auth_options[$row['auth_option']] = ACL_NO; - } - } - $db->sql_freeresult($result); - - // Unset global permission option - unset($auth_options[$permission_type]); - - // Display auth options - $this->display_auth_options($auth_options); - - // Get users/groups/forums using this preset... - if ($action == 'edit') - { - $hold_ary = $auth_admin->get_role_mask($role_id); - - if (sizeof($hold_ary)) - { - $role_name = (!empty($user->lang[$role_row['role_name']])) ? $user->lang[$role_row['role_name']] : $role_row['role_name']; - - $template->assign_vars(array( - 'S_DISPLAY_ROLE_MASK' => true, - 'L_ROLE_ASSIGNED_TO' => sprintf($user->lang['ROLE_ASSIGNED_TO'], $role_name)) - ); - - $auth_admin->display_role_mask($hold_ary); - } - } - - return; - break; - - case 'move_up': - case 'move_down': - - $order = request_var('order', 0); - $order_total = $order * 2 + (($action == 'move_up') ? -1 : 1); - - $sql = 'UPDATE ' . ACL_ROLES_TABLE . ' - SET role_order = ' . $order_total . " - role_order - WHERE role_type = '" . $db->sql_escape($permission_type) . "' - AND role_order IN ($order, " . (($action == 'move_up') ? $order - 1 : $order + 1) . ')'; - $db->sql_query($sql); - - break; - } - - // By default, check that role_order is valid and fix it if necessary - $sql = 'SELECT role_id, role_order - FROM ' . ACL_ROLES_TABLE . " - WHERE role_type = '" . $db->sql_escape($permission_type) . "' - ORDER BY role_order ASC"; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - $order = 0; - do - { - $order++; - if ($row['role_order'] != $order) - { - $db->sql_query('UPDATE ' . ACL_ROLES_TABLE . " SET role_order = $order WHERE role_id = {$row['role_id']}"); - } - } - while ($row = $db->sql_fetchrow($result)); - } - $db->sql_freeresult($result); - - // Display assigned items? - $display_item = request_var('display_item', 0); - - // Select existing roles - $sql = 'SELECT * - FROM ' . ACL_ROLES_TABLE . " - WHERE role_type = '" . $db->sql_escape($permission_type) . "' - ORDER BY role_order ASC"; - $result = $db->sql_query($sql); - - $s_role_options = ''; - while ($row = $db->sql_fetchrow($result)) - { - $role_name = (!empty($user->lang[$row['role_name']])) ? $user->lang[$row['role_name']] : $row['role_name']; - - $template->assign_block_vars('roles', array( - 'ROLE_NAME' => $role_name, - 'ROLE_DESCRIPTION' => (!empty($user->lang[$row['role_description']])) ? $user->lang[$row['role_description']] : nl2br($row['role_description']), - - 'U_EDIT' => $this->u_action . '&action=edit&role_id=' . $row['role_id'], - 'U_REMOVE' => $this->u_action . '&action=remove&role_id=' . $row['role_id'], - 'U_MOVE_UP' => $this->u_action . '&action=move_up&order=' . $row['role_order'], - 'U_MOVE_DOWN' => $this->u_action . '&action=move_down&order=' . $row['role_order'], - 'U_DISPLAY_ITEMS' => ($row['role_id'] == $display_item) ? '' : $this->u_action . '&display_item=' . $row['role_id'] . '#assigned_to') - ); - - $s_role_options .= ''; - - if ($display_item == $row['role_id']) - { - $template->assign_vars(array( - 'L_ROLE_ASSIGNED_TO' => sprintf($user->lang['ROLE_ASSIGNED_TO'], $role_name)) - ); - } - } - $db->sql_freeresult($result); - - $template->assign_vars(array( - 'S_ROLE_OPTIONS' => $s_role_options) - ); - - if ($display_item) - { - $template->assign_vars(array( - 'S_DISPLAY_ROLE_MASK' => true) - ); - - $hold_ary = $auth_admin->get_role_mask($display_item); - $auth_admin->display_role_mask($hold_ary); - } - } - - /** - * Display permission settings able to be set - */ - function display_auth_options($auth_options) - { - global $template, $user; - - $content_array = $categories = array(); - $key_sort_array = array(0); - $auth_options = array(0 => $auth_options); - - // Making use of auth_admin method here (we do not really want to change two similar code fragments) - auth_admin::build_permission_array($auth_options, $content_array, $categories, $key_sort_array); - - $content_array = $content_array[0]; - - $template->assign_var('S_NUM_PERM_COLS', sizeof($categories)); - - // Assign to template - foreach ($content_array as $cat => $cat_array) - { - $template->assign_block_vars('auth', array( - 'CAT_NAME' => $user->lang['permission_cat'][$cat], - - 'S_YES' => ($cat_array['S_YES'] && !$cat_array['S_NEVER'] && !$cat_array['S_NO']) ? true : false, - 'S_NEVER' => ($cat_array['S_NEVER'] && !$cat_array['S_YES'] && !$cat_array['S_NO']) ? true : false, - 'S_NO' => ($cat_array['S_NO'] && !$cat_array['S_NEVER'] && !$cat_array['S_YES']) ? true : false) - ); - - foreach ($cat_array['permissions'] as $permission => $allowed) - { - $template->assign_block_vars('auth.mask', array( - 'S_YES' => ($allowed == ACL_YES) ? true : false, - 'S_NEVER' => ($allowed == ACL_NEVER) ? true : false, - 'S_NO' => ($allowed == ACL_NO) ? true : false, - - 'FIELD_NAME' => $permission, - 'PERMISSION' => $user->lang['acl_' . $permission]['lang']) - ); - } - } - } - - /** - * Remove role - */ - function remove_role($role_id, $permission_type) - { - global $db; - - $auth_admin = new auth_admin(); - - // Get complete auth array - $sql = 'SELECT auth_option, auth_option_id - FROM ' . ACL_OPTIONS_TABLE . " - WHERE auth_option " . $db->sql_like_expression($permission_type . $db->any_char); - $result = $db->sql_query($sql); - - $auth_settings = array(); - while ($row = $db->sql_fetchrow($result)) - { - $auth_settings[$row['auth_option']] = ACL_NO; - } - $db->sql_freeresult($result); - - // Get the role auth settings we need to re-set... - $sql = 'SELECT o.auth_option, r.auth_setting - FROM ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' o - WHERE o.auth_option_id = r.auth_option_id - AND r.role_id = ' . $role_id; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $auth_settings[$row['auth_option']] = $row['auth_setting']; - } - $db->sql_freeresult($result); - - // Get role assignments - $hold_ary = $auth_admin->get_role_mask($role_id); - - // Re-assign permissions - foreach ($hold_ary as $forum_id => $forum_ary) - { - if (isset($forum_ary['users'])) - { - $auth_admin->acl_set('user', $forum_id, $forum_ary['users'], $auth_settings, 0, false); - } - - if (isset($forum_ary['groups'])) - { - $auth_admin->acl_set('group', $forum_id, $forum_ary['groups'], $auth_settings, 0, false); - } - } - - // Remove role from users and groups just to be sure (happens through acl_set) - $sql = 'DELETE FROM ' . ACL_USERS_TABLE . ' - WHERE auth_role_id = ' . $role_id; - $db->sql_query($sql); - - $sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . ' - WHERE auth_role_id = ' . $role_id; - $db->sql_query($sql); - - // Remove role data and role - $sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' - WHERE role_id = ' . $role_id; - $db->sql_query($sql); - - $sql = 'DELETE FROM ' . ACL_ROLES_TABLE . ' - WHERE role_id = ' . $role_id; - $db->sql_query($sql); - - $auth_admin->acl_clear_prefetch(); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php deleted file mode 100644 index a9e64b74ae..0000000000 --- a/phpBB/includes/acp/acp_permissions.php +++ /dev/null @@ -1,1202 +0,0 @@ -add_lang('acp/permissions'); - add_permission_language(); - - $this->tpl_name = 'acp_permissions'; - - // Trace has other vars - if ($mode == 'trace') - { - $user_id = request_var('u', 0); - $forum_id = request_var('f', 0); - $permission = request_var('auth', ''); - - $this->tpl_name = 'permission_trace'; - - if ($user_id && isset($auth_admin->acl_options['id'][$permission]) && $auth->acl_get('a_viewauth')) - { - $this->page_title = sprintf($user->lang['TRACE_PERMISSION'], $user->lang['acl_' . $permission]['lang']); - $this->permission_trace($user_id, $forum_id, $permission); - return; - } - trigger_error('NO_MODE', E_USER_ERROR); - } - - // Set some vars - $action = request_var('action', array('' => 0)); - $action = key($action); - $action = (isset($_POST['psubmit'])) ? 'apply_permissions' : $action; - - $all_forums = request_var('all_forums', 0); - $subforum_id = request_var('subforum_id', 0); - $forum_id = request_var('forum_id', array(0)); - - $username = request_var('username', array(''), true); - $usernames = request_var('usernames', '', true); - $user_id = request_var('user_id', array(0)); - - $group_id = request_var('group_id', array(0)); - $select_all_groups = request_var('select_all_groups', 0); - - $form_name = 'acp_permissions'; - add_form_key($form_name); - - // If select all groups is set, we pre-build the group id array (this option is used for other screens to link to the permission settings screen) - if ($select_all_groups) - { - // Add default groups to selection - $sql_and = (!$config['coppa_enable']) ? " AND group_name <> 'REGISTERED_COPPA'" : ''; - - $sql = 'SELECT group_id - FROM ' . GROUPS_TABLE . ' - WHERE group_type = ' . GROUP_SPECIAL . " - $sql_and"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $group_id[] = $row['group_id']; - } - $db->sql_freeresult($result); - } - - // Map usernames to ids and vice versa - if ($usernames) - { - $username = explode("\n", $usernames); - } - unset($usernames); - - if (sizeof($username) && !sizeof($user_id)) - { - user_get_id_name($user_id, $username); - - if (!sizeof($user_id)) - { - trigger_error($user->lang['SELECTED_USER_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING); - } - } - unset($username); - - // Build forum ids (of all forums are checked or subforum listing used) - if ($all_forums) - { - $sql = 'SELECT forum_id - FROM ' . FORUMS_TABLE . ' - ORDER BY left_id'; - $result = $db->sql_query($sql); - - $forum_id = array(); - while ($row = $db->sql_fetchrow($result)) - { - $forum_id[] = (int) $row['forum_id']; - } - $db->sql_freeresult($result); - } - else if ($subforum_id) - { - $forum_id = array(); - foreach (get_forum_branch($subforum_id, 'children') as $row) - { - $forum_id[] = (int) $row['forum_id']; - } - } - - // Define some common variables for every mode - $error = array(); - - $permission_scope = (strpos($mode, '_global') !== false) ? 'global' : 'local'; - - // Showing introductionary page? - if ($mode == 'intro') - { - $this->page_title = 'ACP_PERMISSIONS'; - - $template->assign_vars(array( - 'S_INTRO' => true) - ); - - return; - } - - switch ($mode) - { - case 'setting_user_global': - case 'setting_group_global': - $this->permission_dropdown = array('u_', 'm_', 'a_'); - $permission_victim = ($mode == 'setting_user_global') ? array('user') : array('group'); - $this->page_title = ($mode == 'setting_user_global') ? 'ACP_USERS_PERMISSIONS' : 'ACP_GROUPS_PERMISSIONS'; - break; - - case 'setting_user_local': - case 'setting_group_local': - $this->permission_dropdown = array('f_', 'm_'); - $permission_victim = ($mode == 'setting_user_local') ? array('user', 'forums') : array('group', 'forums'); - $this->page_title = ($mode == 'setting_user_local') ? 'ACP_USERS_FORUM_PERMISSIONS' : 'ACP_GROUPS_FORUM_PERMISSIONS'; - break; - - case 'setting_admin_global': - case 'setting_mod_global': - $this->permission_dropdown = (strpos($mode, '_admin_') !== false) ? array('a_') : array('m_'); - $permission_victim = array('usergroup'); - $this->page_title = ($mode == 'setting_admin_global') ? 'ACP_ADMINISTRATORS' : 'ACP_GLOBAL_MODERATORS'; - break; - - case 'setting_mod_local': - case 'setting_forum_local': - $this->permission_dropdown = ($mode == 'setting_mod_local') ? array('m_') : array('f_'); - $permission_victim = array('forums', 'usergroup'); - $this->page_title = ($mode == 'setting_mod_local') ? 'ACP_FORUM_MODERATORS' : 'ACP_FORUM_PERMISSIONS'; - break; - - case 'view_admin_global': - case 'view_user_global': - case 'view_mod_global': - $this->permission_dropdown = ($mode == 'view_admin_global') ? array('a_') : (($mode == 'view_user_global') ? array('u_') : array('m_')); - $permission_victim = array('usergroup_view'); - $this->page_title = ($mode == 'view_admin_global') ? 'ACP_VIEW_ADMIN_PERMISSIONS' : (($mode == 'view_user_global') ? 'ACP_VIEW_USER_PERMISSIONS' : 'ACP_VIEW_GLOBAL_MOD_PERMISSIONS'); - break; - - case 'view_mod_local': - case 'view_forum_local': - $this->permission_dropdown = ($mode == 'view_mod_local') ? array('m_') : array('f_'); - $permission_victim = array('forums', 'usergroup_view'); - $this->page_title = ($mode == 'view_mod_local') ? 'ACP_VIEW_FORUM_MOD_PERMISSIONS' : 'ACP_VIEW_FORUM_PERMISSIONS'; - break; - - default: - trigger_error('NO_MODE', E_USER_ERROR); - break; - } - - $template->assign_vars(array( - 'L_TITLE' => $user->lang[$this->page_title], - 'L_EXPLAIN' => $user->lang[$this->page_title . '_EXPLAIN']) - ); - - // Get permission type - $permission_type = request_var('type', $this->permission_dropdown[0]); - - if (!in_array($permission_type, $this->permission_dropdown)) - { - trigger_error($user->lang['WRONG_PERMISSION_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - - // Handle actions - if (strpos($mode, 'setting_') === 0 && $action) - { - switch ($action) - { - case 'delete': - - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING); - } - // All users/groups selected? - $all_users = (isset($_POST['all_users'])) ? true : false; - $all_groups = (isset($_POST['all_groups'])) ? true : false; - - if ($all_users || $all_groups) - { - $items = $this->retrieve_defined_user_groups($permission_scope, $forum_id, $permission_type); - - if ($all_users && sizeof($items['user_ids'])) - { - $user_id = $items['user_ids']; - } - else if ($all_groups && sizeof($items['group_ids'])) - { - $group_id = $items['group_ids']; - } - } - - if (sizeof($user_id) || sizeof($group_id)) - { - $this->remove_permissions($mode, $permission_type, $auth_admin, $user_id, $group_id, $forum_id); - } - else - { - trigger_error($user->lang['NO_USER_GROUP_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING); - } - break; - - case 'apply_permissions': - if (!isset($_POST['setting'])) - { - trigger_error($user->lang['NO_AUTH_SETTING_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING); - } - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING); - } - - $this->set_permissions($mode, $permission_type, $auth_admin, $user_id, $group_id); - break; - - case 'apply_all_permissions': - if (!isset($_POST['setting'])) - { - trigger_error($user->lang['NO_AUTH_SETTING_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING); - } - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING); - } - - $this->set_all_permissions($mode, $permission_type, $auth_admin, $user_id, $group_id); - break; - } - } - - - // Setting permissions screen - $s_hidden_fields = build_hidden_fields(array( - 'user_id' => $user_id, - 'group_id' => $group_id, - 'forum_id' => $forum_id, - 'type' => $permission_type) - ); - - // Go through the screens/options needed and present them in correct order - foreach ($permission_victim as $victim) - { - switch ($victim) - { - case 'forum_dropdown': - - if (sizeof($forum_id)) - { - $this->check_existence('forum', $forum_id); - continue 2; - } - - $template->assign_vars(array( - 'S_SELECT_FORUM' => true, - 'S_FORUM_OPTIONS' => make_forum_select(false, false, true, false, false)) - ); - - break; - - case 'forums': - - if (sizeof($forum_id)) - { - $this->check_existence('forum', $forum_id); - continue 2; - } - - $forum_list = make_forum_select(false, false, true, false, false, false, true); - - // Build forum options - $s_forum_options = ''; - foreach ($forum_list as $f_id => $f_row) - { - $s_forum_options .= ''; - } - - // Build subforum options - $s_subforum_options = $this->build_subforum_options($forum_list); - - $template->assign_vars(array( - 'S_SELECT_FORUM' => true, - 'S_FORUM_OPTIONS' => $s_forum_options, - 'S_SUBFORUM_OPTIONS' => $s_subforum_options, - 'S_FORUM_ALL' => true, - 'S_FORUM_MULTIPLE' => true) - ); - - break; - - case 'user': - - if (sizeof($user_id)) - { - $this->check_existence('user', $user_id); - continue 2; - } - - $template->assign_vars(array( - 'S_SELECT_USER' => true, - 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=select_victim&field=username&select_single=true'), - )); - - break; - - case 'group': - - if (sizeof($group_id)) - { - $this->check_existence('group', $group_id); - continue 2; - } - - $template->assign_vars(array( - 'S_SELECT_GROUP' => true, - 'S_GROUP_OPTIONS' => group_select_options(false, false, (($user->data['user_type'] == USER_FOUNDER) ? false : 0))) - ); - - break; - - case 'usergroup': - case 'usergroup_view': - - $all_users = (isset($_POST['all_users'])) ? true : false; - $all_groups = (isset($_POST['all_groups'])) ? true : false; - - if ((sizeof($user_id) && !$all_users) || (sizeof($group_id) && !$all_groups)) - { - if (sizeof($user_id)) - { - $this->check_existence('user', $user_id); - } - - if (sizeof($group_id)) - { - $this->check_existence('group', $group_id); - } - - continue 2; - } - - // Now we check the users... because the "all"-selection is different here (all defined users/groups) - $items = $this->retrieve_defined_user_groups($permission_scope, $forum_id, $permission_type); - - if ($all_users && sizeof($items['user_ids'])) - { - $user_id = $items['user_ids']; - continue 2; - } - - if ($all_groups && sizeof($items['group_ids'])) - { - $group_id = $items['group_ids']; - continue 2; - } - - $template->assign_vars(array( - 'S_SELECT_USERGROUP' => ($victim == 'usergroup') ? true : false, - 'S_SELECT_USERGROUP_VIEW' => ($victim == 'usergroup_view') ? true : false, - 'S_DEFINED_USER_OPTIONS' => $items['user_ids_options'], - 'S_DEFINED_GROUP_OPTIONS' => $items['group_ids_options'], - 'S_ADD_GROUP_OPTIONS' => group_select_options(false, $items['group_ids'], (($user->data['user_type'] == USER_FOUNDER) ? false : 0)), - 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=add_user&field=username&select_single=true'), - )); - - break; - } - - // The S_ALLOW_SELECT parameter below is a measure to lower memory usage. - // If there are more than 5 forums selected the admin is not able to select all users/groups too. - // We need to see if the number of forums can be increased or need to be decreased. - - $template->assign_vars(array( - 'U_ACTION' => $this->u_action, - 'ANONYMOUS_USER_ID' => ANONYMOUS, - - 'S_SELECT_VICTIM' => true, - 'S_ALLOW_ALL_SELECT' => (sizeof($forum_id) > 5) ? false : true, - 'S_CAN_SELECT_USER' => ($auth->acl_get('a_authusers')) ? true : false, - 'S_CAN_SELECT_GROUP' => ($auth->acl_get('a_authgroups')) ? true : false, - 'S_HIDDEN_FIELDS' => $s_hidden_fields) - ); - - // Let the forum names being displayed - if (sizeof($forum_id)) - { - $sql = 'SELECT forum_name - FROM ' . FORUMS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $forum_id) . ' - ORDER BY left_id ASC'; - $result = $db->sql_query($sql); - - $forum_names = array(); - while ($row = $db->sql_fetchrow($result)) - { - $forum_names[] = $row['forum_name']; - } - $db->sql_freeresult($result); - - $template->assign_vars(array( - 'S_FORUM_NAMES' => (sizeof($forum_names)) ? true : false, - 'FORUM_NAMES' => implode(', ', $forum_names)) - ); - } - - return; - } - - // Do not allow forum_ids being set and no other setting defined (will bog down the server too much) - if (sizeof($forum_id) && !sizeof($user_id) && !sizeof($group_id)) - { - trigger_error($user->lang['ONLY_FORUM_DEFINED'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $template->assign_vars(array( - 'S_PERMISSION_DROPDOWN' => (sizeof($this->permission_dropdown) > 1) ? $this->build_permission_dropdown($this->permission_dropdown, $permission_type, $permission_scope) : false, - 'L_PERMISSION_TYPE' => $user->lang['ACL_TYPE_' . strtoupper($permission_type)], - - 'U_ACTION' => $this->u_action, - 'S_HIDDEN_FIELDS' => $s_hidden_fields) - ); - - if (strpos($mode, 'setting_') === 0) - { - $template->assign_vars(array( - 'S_SETTING_PERMISSIONS' => true) - ); - - $hold_ary = $auth_admin->get_mask('set', (sizeof($user_id)) ? $user_id : false, (sizeof($group_id)) ? $group_id : false, (sizeof($forum_id)) ? $forum_id : false, $permission_type, $permission_scope, ACL_NO); - $auth_admin->display_mask('set', $permission_type, $hold_ary, ((sizeof($user_id)) ? 'user' : 'group'), (($permission_scope == 'local') ? true : false)); - } - else - { - $template->assign_vars(array( - 'S_VIEWING_PERMISSIONS' => true) - ); - - $hold_ary = $auth_admin->get_mask('view', (sizeof($user_id)) ? $user_id : false, (sizeof($group_id)) ? $group_id : false, (sizeof($forum_id)) ? $forum_id : false, $permission_type, $permission_scope, ACL_NEVER); - $auth_admin->display_mask('view', $permission_type, $hold_ary, ((sizeof($user_id)) ? 'user' : 'group'), (($permission_scope == 'local') ? true : false)); - } - } - - /** - * Build +subforum options - */ - function build_subforum_options($forum_list) - { - global $user; - - $s_options = ''; - - $forum_list = array_merge($forum_list); - - foreach ($forum_list as $key => $row) - { - if ($row['disabled']) - { - continue; - } - - $s_options .= ''; - } - - return $s_options; - } - - /** - * Build dropdown field for changing permission types - */ - function build_permission_dropdown($options, $default_option, $permission_scope) - { - global $user, $auth; - - $s_dropdown_options = ''; - foreach ($options as $setting) - { - if (!$auth->acl_get('a_' . str_replace('_', '', $setting) . 'auth')) - { - continue; - } - - $selected = ($setting == $default_option) ? ' selected="selected"' : ''; - $l_setting = (isset($user->lang['permission_type'][$permission_scope][$setting])) ? $user->lang['permission_type'][$permission_scope][$setting] : $user->lang['permission_type'][$setting]; - $s_dropdown_options .= ''; - } - - return $s_dropdown_options; - } - - /** - * Check if selected items exist. Remove not found ids and if empty return error. - */ - function check_existence($mode, &$ids) - { - global $db, $user; - - switch ($mode) - { - case 'user': - $table = USERS_TABLE; - $sql_id = 'user_id'; - break; - - case 'group': - $table = GROUPS_TABLE; - $sql_id = 'group_id'; - break; - - case 'forum': - $table = FORUMS_TABLE; - $sql_id = 'forum_id'; - break; - } - - if (sizeof($ids)) - { - $sql = "SELECT $sql_id - FROM $table - WHERE " . $db->sql_in_set($sql_id, $ids); - $result = $db->sql_query($sql); - - $ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $ids[] = (int) $row[$sql_id]; - } - $db->sql_freeresult($result); - } - - if (!sizeof($ids)) - { - trigger_error($user->lang['SELECTED_' . strtoupper($mode) . '_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING); - } - } - - /** - * Apply permissions - */ - function set_permissions($mode, $permission_type, &$auth_admin, &$user_id, &$group_id) - { - global $user, $auth; - - $psubmit = request_var('psubmit', array(0 => array(0 => 0))); - - // User or group to be set? - $ug_type = (sizeof($user_id)) ? 'user' : 'group'; - - // Check the permission setting again - if (!$auth->acl_get('a_' . str_replace('_', '', $permission_type) . 'auth') || !$auth->acl_get('a_auth' . $ug_type . 's')) - { - trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $ug_id = $forum_id = 0; - - // We loop through the auth settings defined in our submit - list($ug_id, ) = each($psubmit); - list($forum_id, ) = each($psubmit[$ug_id]); - - if (empty($_POST['setting']) || empty($_POST['setting'][$ug_id]) || empty($_POST['setting'][$ug_id][$forum_id]) || !is_array($_POST['setting'][$ug_id][$forum_id])) - { - trigger_error('WRONG_PERMISSION_SETTING_FORMAT', E_USER_WARNING); - } - - // We obtain and check $_POST['setting'][$ug_id][$forum_id] directly and not using request_var() because request_var() - // currently does not support the amount of dimensions required. ;) - // $auth_settings = request_var('setting', array(0 => array(0 => array('' => 0)))); - $auth_settings = array_map('intval', $_POST['setting'][$ug_id][$forum_id]); - - // Do we have a role we want to set? - $assigned_role = (isset($_POST['role'][$ug_id][$forum_id])) ? (int) $_POST['role'][$ug_id][$forum_id] : 0; - - // Do the admin want to set these permissions to other items too? - $inherit = request_var('inherit', array(0 => array(0))); - - $ug_id = array($ug_id); - $forum_id = array($forum_id); - - if (sizeof($inherit)) - { - foreach ($inherit as $_ug_id => $forum_id_ary) - { - // Inherit users/groups? - if (!in_array($_ug_id, $ug_id)) - { - $ug_id[] = $_ug_id; - } - - // Inherit forums? - $forum_id = array_merge($forum_id, array_keys($forum_id_ary)); - } - } - - $forum_id = array_unique($forum_id); - - // If the auth settings differ from the assigned role, then do not set a role... - if ($assigned_role) - { - if (!$this->check_assigned_role($assigned_role, $auth_settings)) - { - $assigned_role = 0; - } - } - - // Update the permission set... - $auth_admin->acl_set($ug_type, $forum_id, $ug_id, $auth_settings, $assigned_role); - - // Do we need to recache the moderator lists? - if ($permission_type == 'm_') - { - cache_moderators(); - } - - // Remove users who are now moderators or admins from everyones foes list - if ($permission_type == 'm_' || $permission_type == 'a_') - { - update_foes($group_id, $user_id); - } - - $this->log_action($mode, 'add', $permission_type, $ug_type, $ug_id, $forum_id); - - trigger_error($user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action)); - } - - /** - * Apply all permissions - */ - function set_all_permissions($mode, $permission_type, &$auth_admin, &$user_id, &$group_id) - { - global $user, $auth; - - // User or group to be set? - $ug_type = (sizeof($user_id)) ? 'user' : 'group'; - - // Check the permission setting again - if (!$auth->acl_get('a_' . str_replace('_', '', $permission_type) . 'auth') || !$auth->acl_get('a_auth' . $ug_type . 's')) - { - trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $auth_settings = (isset($_POST['setting'])) ? $_POST['setting'] : array(); - $auth_roles = (isset($_POST['role'])) ? $_POST['role'] : array(); - $ug_ids = $forum_ids = array(); - - // We need to go through the auth settings - foreach ($auth_settings as $ug_id => $forum_auth_row) - { - $ug_id = (int) $ug_id; - $ug_ids[] = $ug_id; - - foreach ($forum_auth_row as $forum_id => $auth_options) - { - $forum_id = (int) $forum_id; - $forum_ids[] = $forum_id; - - // Check role... - $assigned_role = (isset($auth_roles[$ug_id][$forum_id])) ? (int) $auth_roles[$ug_id][$forum_id] : 0; - - // If the auth settings differ from the assigned role, then do not set a role... - if ($assigned_role) - { - if (!$this->check_assigned_role($assigned_role, $auth_options)) - { - $assigned_role = 0; - } - } - - // Update the permission set... - $auth_admin->acl_set($ug_type, $forum_id, $ug_id, $auth_options, $assigned_role, false); - } - } - - $auth_admin->acl_clear_prefetch(); - - // Do we need to recache the moderator lists? - if ($permission_type == 'm_') - { - cache_moderators(); - } - - // Remove users who are now moderators or admins from everyones foes list - if ($permission_type == 'm_' || $permission_type == 'a_') - { - update_foes($group_id, $user_id); - } - - $this->log_action($mode, 'add', $permission_type, $ug_type, $ug_ids, $forum_ids); - - trigger_error($user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action)); - } - - /** - * Compare auth settings with auth settings from role - * returns false if they differ, true if they are equal - */ - function check_assigned_role($role_id, &$auth_settings) - { - global $db; - - $sql = 'SELECT o.auth_option, r.auth_setting - FROM ' . ACL_OPTIONS_TABLE . ' o, ' . ACL_ROLES_DATA_TABLE . ' r - WHERE o.auth_option_id = r.auth_option_id - AND r.role_id = ' . $role_id; - $result = $db->sql_query($sql); - - $test_auth_settings = array(); - while ($row = $db->sql_fetchrow($result)) - { - $test_auth_settings[$row['auth_option']] = $row['auth_setting']; - } - $db->sql_freeresult($result); - - // We need to add any ACL_NO setting from auth_settings to compare correctly - foreach ($auth_settings as $option => $setting) - { - if ($setting == ACL_NO) - { - $test_auth_settings[$option] = $setting; - } - } - - if (sizeof(array_diff_assoc($auth_settings, $test_auth_settings))) - { - return false; - } - - return true; - } - - /** - * Remove permissions - */ - function remove_permissions($mode, $permission_type, &$auth_admin, &$user_id, &$group_id, &$forum_id) - { - global $user, $db, $auth; - - // User or group to be set? - $ug_type = (sizeof($user_id)) ? 'user' : 'group'; - - // Check the permission setting again - if (!$auth->acl_get('a_' . str_replace('_', '', $permission_type) . 'auth') || !$auth->acl_get('a_auth' . $ug_type . 's')) - { - trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $auth_admin->acl_delete($ug_type, (($ug_type == 'user') ? $user_id : $group_id), (sizeof($forum_id) ? $forum_id : false), $permission_type); - - // Do we need to recache the moderator lists? - if ($permission_type == 'm_') - { - cache_moderators(); - } - - $this->log_action($mode, 'del', $permission_type, $ug_type, (($ug_type == 'user') ? $user_id : $group_id), (sizeof($forum_id) ? $forum_id : array(0 => 0))); - - trigger_error($user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action)); - } - - /** - * Log permission changes - */ - function log_action($mode, $action, $permission_type, $ug_type, $ug_id, $forum_id) - { - global $db, $user; - - if (!is_array($ug_id)) - { - $ug_id = array($ug_id); - } - - if (!is_array($forum_id)) - { - $forum_id = array($forum_id); - } - - // Logging ... first grab user or groupnames ... - $sql = ($ug_type == 'group') ? 'SELECT group_name as name, group_type FROM ' . GROUPS_TABLE . ' WHERE ' : 'SELECT username as name FROM ' . USERS_TABLE . ' WHERE '; - $sql .= $db->sql_in_set(($ug_type == 'group') ? 'group_id' : 'user_id', array_map('intval', $ug_id)); - $result = $db->sql_query($sql); - - $l_ug_list = ''; - while ($row = $db->sql_fetchrow($result)) - { - $l_ug_list .= (($l_ug_list != '') ? ', ' : '') . ((isset($row['group_type']) && $row['group_type'] == GROUP_SPECIAL) ? '' . $user->lang['G_' . $row['name']] . '' : $row['name']); - } - $db->sql_freeresult($result); - - $mode = str_replace('setting_', '', $mode); - - if ($forum_id[0] == 0) - { - add_log('admin', 'LOG_ACL_' . strtoupper($action) . '_' . strtoupper($mode) . '_' . strtoupper($permission_type), $l_ug_list); - } - else - { - // Grab the forum details if non-zero forum_id - $sql = 'SELECT forum_name - FROM ' . FORUMS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $forum_id); - $result = $db->sql_query($sql); - - $l_forum_list = ''; - while ($row = $db->sql_fetchrow($result)) - { - $l_forum_list .= (($l_forum_list != '') ? ', ' : '') . $row['forum_name']; - } - $db->sql_freeresult($result); - - add_log('admin', 'LOG_ACL_' . strtoupper($action) . '_' . strtoupper($mode) . '_' . strtoupper($permission_type), $l_forum_list, $l_ug_list); - } - } - - /** - * Display a complete trace tree for the selected permission to determine where settings are set/unset - */ - function permission_trace($user_id, $forum_id, $permission) - { - global $db, $template, $user, $auth; - - if ($user_id != $user->data['user_id']) - { - $sql = 'SELECT user_id, username, user_permissions, user_type - FROM ' . USERS_TABLE . ' - WHERE user_id = ' . $user_id; - $result = $db->sql_query($sql); - $userdata = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - } - else - { - $userdata = $user->data; - } - - if (!$userdata) - { - trigger_error('NO_USERS', E_USER_ERROR); - } - - $forum_name = false; - - if ($forum_id) - { - $sql = 'SELECT forum_name - FROM ' . FORUMS_TABLE . " - WHERE forum_id = $forum_id"; - $result = $db->sql_query($sql, 3600); - $forum_name = $db->sql_fetchfield('forum_name'); - $db->sql_freeresult($result); - } - - $back = request_var('back', 0); - - $template->assign_vars(array( - 'PERMISSION' => $user->lang['acl_' . $permission]['lang'], - 'PERMISSION_USERNAME' => $userdata['username'], - 'FORUM_NAME' => $forum_name, - - 'S_GLOBAL_TRACE' => ($forum_id) ? false : true, - - 'U_BACK' => ($back) ? build_url(array('f', 'back')) . "&f=$back" : '') - ); - - $template->assign_block_vars('trace', array( - 'WHO' => $user->lang['DEFAULT'], - 'INFORMATION' => $user->lang['TRACE_DEFAULT'], - - 'S_SETTING_NO' => true, - 'S_TOTAL_NO' => true) - ); - - $sql = 'SELECT DISTINCT g.group_name, g.group_id, g.group_type - FROM ' . GROUPS_TABLE . ' g - LEFT JOIN ' . USER_GROUP_TABLE . ' ug ON (ug.group_id = g.group_id) - WHERE ug.user_id = ' . $user_id . ' - AND ug.user_pending = 0 - ORDER BY g.group_type DESC, g.group_id DESC'; - $result = $db->sql_query($sql); - - $groups = array(); - while ($row = $db->sql_fetchrow($result)) - { - $groups[$row['group_id']] = array( - 'auth_setting' => ACL_NO, - 'group_name' => ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'] - ); - } - $db->sql_freeresult($result); - - $total = ACL_NO; - $add_key = (($forum_id) ? '_LOCAL' : ''); - - if (sizeof($groups)) - { - // Get group auth settings - $hold_ary = $auth->acl_group_raw_data(array_keys($groups), $permission, $forum_id); - - foreach ($hold_ary as $group_id => $forum_ary) - { - $groups[$group_id]['auth_setting'] = $hold_ary[$group_id][$forum_id][$permission]; - } - unset($hold_ary); - - foreach ($groups as $id => $row) - { - switch ($row['auth_setting']) - { - case ACL_NO: - $information = $user->lang['TRACE_GROUP_NO' . $add_key]; - break; - - case ACL_YES: - $information = ($total == ACL_YES) ? $user->lang['TRACE_GROUP_YES_TOTAL_YES' . $add_key] : (($total == ACL_NEVER) ? $user->lang['TRACE_GROUP_YES_TOTAL_NEVER' . $add_key] : $user->lang['TRACE_GROUP_YES_TOTAL_NO' . $add_key]); - $total = ($total == ACL_NO) ? ACL_YES : $total; - break; - - case ACL_NEVER: - $information = ($total == ACL_YES) ? $user->lang['TRACE_GROUP_NEVER_TOTAL_YES' . $add_key] : (($total == ACL_NEVER) ? $user->lang['TRACE_GROUP_NEVER_TOTAL_NEVER' . $add_key] : $user->lang['TRACE_GROUP_NEVER_TOTAL_NO' . $add_key]); - $total = ACL_NEVER; - break; - } - - $template->assign_block_vars('trace', array( - 'WHO' => $row['group_name'], - 'INFORMATION' => $information, - - 'S_SETTING_NO' => ($row['auth_setting'] == ACL_NO) ? true : false, - 'S_SETTING_YES' => ($row['auth_setting'] == ACL_YES) ? true : false, - 'S_SETTING_NEVER' => ($row['auth_setting'] == ACL_NEVER) ? true : false, - 'S_TOTAL_NO' => ($total == ACL_NO) ? true : false, - 'S_TOTAL_YES' => ($total == ACL_YES) ? true : false, - 'S_TOTAL_NEVER' => ($total == ACL_NEVER) ? true : false) - ); - } - } - - // Get user specific permission... globally or for this forum - $hold_ary = $auth->acl_user_raw_data($user_id, $permission, $forum_id); - $auth_setting = (!sizeof($hold_ary)) ? ACL_NO : $hold_ary[$user_id][$forum_id][$permission]; - - switch ($auth_setting) - { - case ACL_NO: - $information = ($total == ACL_NO) ? $user->lang['TRACE_USER_NO_TOTAL_NO' . $add_key] : $user->lang['TRACE_USER_KEPT' . $add_key]; - $total = ($total == ACL_NO) ? ACL_NEVER : $total; - break; - - case ACL_YES: - $information = ($total == ACL_YES) ? $user->lang['TRACE_USER_YES_TOTAL_YES' . $add_key] : (($total == ACL_NEVER) ? $user->lang['TRACE_USER_YES_TOTAL_NEVER' . $add_key] : $user->lang['TRACE_USER_YES_TOTAL_NO' . $add_key]); - $total = ($total == ACL_NO) ? ACL_YES : $total; - break; - - case ACL_NEVER: - $information = ($total == ACL_YES) ? $user->lang['TRACE_USER_NEVER_TOTAL_YES' . $add_key] : (($total == ACL_NEVER) ? $user->lang['TRACE_USER_NEVER_TOTAL_NEVER' . $add_key] : $user->lang['TRACE_USER_NEVER_TOTAL_NO' . $add_key]); - $total = ACL_NEVER; - break; - } - - $template->assign_block_vars('trace', array( - 'WHO' => $userdata['username'], - 'INFORMATION' => $information, - - 'S_SETTING_NO' => ($auth_setting == ACL_NO) ? true : false, - 'S_SETTING_YES' => ($auth_setting == ACL_YES) ? true : false, - 'S_SETTING_NEVER' => ($auth_setting == ACL_NEVER) ? true : false, - 'S_TOTAL_NO' => false, - 'S_TOTAL_YES' => ($total == ACL_YES) ? true : false, - 'S_TOTAL_NEVER' => ($total == ACL_NEVER) ? true : false) - ); - - if ($forum_id != 0 && isset($auth->acl_options['global'][$permission])) - { - if ($user_id != $user->data['user_id']) - { - $auth2 = new auth(); - $auth2->acl($userdata); - $auth_setting = $auth2->acl_get($permission); - } - else - { - $auth_setting = $auth->acl_get($permission); - } - - if ($auth_setting) - { - $information = ($total == ACL_YES) ? $user->lang['TRACE_USER_GLOBAL_YES_TOTAL_YES'] : $user->lang['TRACE_USER_GLOBAL_YES_TOTAL_NEVER']; - $total = ACL_YES; - } - else - { - $information = $user->lang['TRACE_USER_GLOBAL_NEVER_TOTAL_KEPT']; - } - - // If there is no auth information we do not need to worry the user by showing non-relevant data. - if ($auth_setting) - { - $template->assign_block_vars('trace', array( - 'WHO' => sprintf($user->lang['TRACE_GLOBAL_SETTING'], $userdata['username']), - 'INFORMATION' => sprintf($information, '", ''), - - 'S_SETTING_NO' => false, - 'S_SETTING_YES' => $auth_setting, - 'S_SETTING_NEVER' => !$auth_setting, - 'S_TOTAL_NO' => false, - 'S_TOTAL_YES' => ($total == ACL_YES) ? true : false, - 'S_TOTAL_NEVER' => ($total == ACL_NEVER) ? true : false) - ); - } - } - - // Take founder status into account, overwriting the default values - if ($userdata['user_type'] == USER_FOUNDER && strpos($permission, 'a_') === 0) - { - $template->assign_block_vars('trace', array( - 'WHO' => $userdata['username'], - 'INFORMATION' => $user->lang['TRACE_USER_FOUNDER'], - - 'S_SETTING_NO' => ($auth_setting == ACL_NO) ? true : false, - 'S_SETTING_YES' => ($auth_setting == ACL_YES) ? true : false, - 'S_SETTING_NEVER' => ($auth_setting == ACL_NEVER) ? true : false, - 'S_TOTAL_NO' => false, - 'S_TOTAL_YES' => true, - 'S_TOTAL_NEVER' => false) - ); - - $total = ACL_YES; - } - - // Total value... - $template->assign_vars(array( - 'S_RESULT_NO' => ($total == ACL_NO) ? true : false, - 'S_RESULT_YES' => ($total == ACL_YES) ? true : false, - 'S_RESULT_NEVER' => ($total == ACL_NEVER) ? true : false, - )); - } - - /** - * Get already assigned users/groups - */ - function retrieve_defined_user_groups($permission_scope, $forum_id, $permission_type) - { - global $db, $user; - - $sql_forum_id = ($permission_scope == 'global') ? 'AND a.forum_id = 0' : ((sizeof($forum_id)) ? 'AND ' . $db->sql_in_set('a.forum_id', $forum_id) : 'AND a.forum_id <> 0'); - - // Permission options are only able to be a permission set... therefore we will pre-fetch the possible options and also the possible roles - $option_ids = $role_ids = array(); - - $sql = 'SELECT auth_option_id - FROM ' . ACL_OPTIONS_TABLE . ' - WHERE auth_option ' . $db->sql_like_expression($permission_type . $db->any_char); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $option_ids[] = (int) $row['auth_option_id']; - } - $db->sql_freeresult($result); - - if (sizeof($option_ids)) - { - $sql = 'SELECT DISTINCT role_id - FROM ' . ACL_ROLES_DATA_TABLE . ' - WHERE ' . $db->sql_in_set('auth_option_id', $option_ids); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $role_ids[] = (int) $row['role_id']; - } - $db->sql_freeresult($result); - } - - if (sizeof($option_ids) && sizeof($role_ids)) - { - $sql_where = 'AND (' . $db->sql_in_set('a.auth_option_id', $option_ids) . ' OR ' . $db->sql_in_set('a.auth_role_id', $role_ids) . ')'; - } - else - { - $sql_where = 'AND ' . $db->sql_in_set('a.auth_option_id', $option_ids); - } - - // Not ideal, due to the filesort, non-use of indexes, etc. - $sql = 'SELECT DISTINCT u.user_id, u.username - FROM ' . USERS_TABLE . ' u, ' . ACL_USERS_TABLE . " a - WHERE u.user_id = a.user_id - $sql_forum_id - $sql_where - ORDER BY u.username_clean, u.user_regdate ASC"; - $result = $db->sql_query($sql); - - $s_defined_user_options = ''; - $defined_user_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $s_defined_user_options .= ''; - $defined_user_ids[] = $row['user_id']; - } - $db->sql_freeresult($result); - - $sql = 'SELECT DISTINCT g.group_type, g.group_name, g.group_id - FROM ' . GROUPS_TABLE . ' g, ' . ACL_GROUPS_TABLE . " a - WHERE g.group_id = a.group_id - $sql_forum_id - $sql_where - ORDER BY g.group_type DESC, g.group_name ASC"; - $result = $db->sql_query($sql); - - $s_defined_group_options = ''; - $defined_group_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $s_defined_group_options .= '' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . ''; - $defined_group_ids[] = $row['group_id']; - } - $db->sql_freeresult($result); - - return array( - 'group_ids' => $defined_group_ids, - 'group_ids_options' => $s_defined_group_options, - 'user_ids' => $defined_user_ids, - 'user_ids_options' => $s_defined_user_options - ); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_php_info.php b/phpBB/includes/acp/acp_php_info.php deleted file mode 100644 index 9935c0466e..0000000000 --- a/phpBB/includes/acp/acp_php_info.php +++ /dev/null @@ -1,84 +0,0 @@ -tpl_name = 'acp_php_info'; - $this->page_title = 'ACP_PHP_INFO'; - - ob_start(); - @phpinfo(INFO_GENERAL | INFO_CONFIGURATION | INFO_MODULES | INFO_VARIABLES); - $phpinfo = ob_get_clean(); - - $phpinfo = trim($phpinfo); - - // Here we play around a little with the PHP Info HTML to try and stylise - // it along phpBB's lines ... hopefully without breaking anything. The idea - // for this was nabbed from the PHP annotated manual - preg_match_all('#]*>(.*)#si', $phpinfo, $output); - - if (empty($phpinfo) || empty($output)) - { - trigger_error('NO_PHPINFO_AVAILABLE', E_USER_WARNING); - } - - $output = $output[1][0]; - - // expose_php can make the image not exist - if (preg_match('#]*>]*>#', $output)) - { - $output = preg_replace('#(.*?]*>]*>)(.*?)#s', '
    \2\1
    ', $output); - } - else - { - $output = preg_replace('#(.*?)#s', '
    \1
    ', $output); - } - $output = preg_replace('#]+>#i', '', $output); - $output = preg_replace('#', ''), array('class="row1"', 'class="row2"', '', '', ''), $output); - - if (empty($output)) - { - trigger_error('NO_PHPINFO_AVAILABLE', E_USER_WARNING); - } - - $orig_output = $output; - - preg_match_all('#
    (.*)
    #siU', $output, $output); - $output = (!empty($output[1][0])) ? $output[1][0] : $orig_output; - - $template->assign_var('PHPINFO', $output); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php deleted file mode 100644 index 253308d153..0000000000 --- a/phpBB/includes/acp/acp_profile.php +++ /dev/null @@ -1,1647 +0,0 @@ -add_lang(array('ucp', 'acp/profile')); - $this->tpl_name = 'acp_profile'; - $this->page_title = 'ACP_CUSTOM_PROFILE_FIELDS'; - - $action = (isset($_POST['create'])) ? 'create' : request_var('action', ''); - - $error = array(); - $s_hidden_fields = ''; - - // Define some default values for each field type - $default_values = array( - FIELD_STRING => array('field_length' => 10, 'field_minlen' => 0, 'field_maxlen' => 20, 'field_validation' => '.*', 'field_novalue' => '', 'field_default_value' => ''), - FIELD_TEXT => array('field_length' => '5|80', 'field_minlen' => 0, 'field_maxlen' => 1000, 'field_validation' => '.*', 'field_novalue' => '', 'field_default_value' => ''), - FIELD_INT => array('field_length' => 5, 'field_minlen' => 0, 'field_maxlen' => 100, 'field_validation' => '', 'field_novalue' => 0, 'field_default_value' => 0), - FIELD_DATE => array('field_length' => 10, 'field_minlen' => 10, 'field_maxlen' => 10, 'field_validation' => '', 'field_novalue' => ' 0- 0- 0', 'field_default_value' => ' 0- 0- 0'), - FIELD_BOOL => array('field_length' => 1, 'field_minlen' => 0, 'field_maxlen' => 0, 'field_validation' => '', 'field_novalue' => 0, 'field_default_value' => 0), - FIELD_DROPDOWN => array('field_length' => 0, 'field_minlen' => 0, 'field_maxlen' => 5, 'field_validation' => '', 'field_novalue' => 0, 'field_default_value' => 0), - ); - - $cp = new custom_profile_admin(); - - // Build Language array - // Based on this, we decide which elements need to be edited later and which language items are missing - $this->lang_defs = array(); - - $sql = 'SELECT lang_id, lang_iso - FROM ' . LANG_TABLE . ' - ORDER BY lang_english_name'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - // Make some arrays with all available languages - $this->lang_defs['id'][$row['lang_id']] = $row['lang_iso']; - $this->lang_defs['iso'][$row['lang_iso']] = $row['lang_id']; - } - $db->sql_freeresult($result); - - $sql = 'SELECT field_id, lang_id - FROM ' . PROFILE_LANG_TABLE . ' - ORDER BY lang_id'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - // Which languages are available for each item - $this->lang_defs['entry'][$row['field_id']][] = $row['lang_id']; - } - $db->sql_freeresult($result); - - // Have some fields been defined? - if (isset($this->lang_defs['entry'])) - { - foreach ($this->lang_defs['entry'] as $field_id => $field_ary) - { - // Fill an array with the languages that are missing for each field - $this->lang_defs['diff'][$field_id] = array_diff(array_values($this->lang_defs['iso']), $field_ary); - } - } - - switch ($action) - { - case 'delete': - $field_id = request_var('field_id', 0); - - if (!$field_id) - { - trigger_error($user->lang['NO_FIELD_ID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if (confirm_box(true)) - { - $sql = 'SELECT field_ident - FROM ' . PROFILE_FIELDS_TABLE . " - WHERE field_id = $field_id"; - $result = $db->sql_query($sql); - $field_ident = (string) $db->sql_fetchfield('field_ident'); - $db->sql_freeresult($result); - - $db->sql_transaction('begin'); - - $db->sql_query('DELETE FROM ' . PROFILE_FIELDS_TABLE . " WHERE field_id = $field_id"); - $db->sql_query('DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . " WHERE field_id = $field_id"); - $db->sql_query('DELETE FROM ' . PROFILE_LANG_TABLE . " WHERE field_id = $field_id"); - - if ($db->dbms_type == 'sqlite') - { - $sql = "SELECT sql - FROM sqlite_master - WHERE type = 'table' - AND name = '" . PROFILE_FIELDS_DATA_TABLE . "' - ORDER BY type DESC, name;"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // Create a temp table and populate it, destroy the existing one - $db->sql_query(preg_replace('#CREATE\s+TABLE\s+"?' . PROFILE_FIELDS_DATA_TABLE . '"?#i', 'CREATE TEMPORARY TABLE ' . PROFILE_FIELDS_DATA_TABLE . '_temp', $row['sql'])); - $db->sql_query('INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . '_temp SELECT * FROM ' . PROFILE_FIELDS_DATA_TABLE); - $db->sql_query('DROP TABLE ' . PROFILE_FIELDS_DATA_TABLE); - - preg_match('#\((.*)\)#s', $row['sql'], $matches); - - $new_table_cols = trim($matches[1]); - $old_table_cols = preg_split('/,(?=[\\sa-z])/im', $new_table_cols); - $column_list = array(); - - foreach ($old_table_cols as $declaration) - { - $entities = preg_split('#\s+#', trim($declaration)); - - if ($entities[0] == 'PRIMARY') - { - continue; - } - - if ($entities[0] !== 'pf_' . $field_ident) - { - $column_list[] = $entities[0]; - } - } - - $columns = implode(',', $column_list); - - $new_table_cols = preg_replace('/' . 'pf_' . $field_ident . '[^,]+,/', '', $new_table_cols); - - // create a new table and fill it up. destroy the temp one - $db->sql_query('CREATE TABLE ' . PROFILE_FIELDS_DATA_TABLE . ' (' . $new_table_cols . ');'); - $db->sql_query('INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . PROFILE_FIELDS_DATA_TABLE . '_temp;'); - $db->sql_query('DROP TABLE ' . PROFILE_FIELDS_DATA_TABLE . '_temp'); - } - else - { - $db->sql_query('ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " DROP COLUMN pf_$field_ident"); - } - - $order = 0; - - $sql = 'SELECT * - FROM ' . PROFILE_FIELDS_TABLE . ' - ORDER BY field_order'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $order++; - if ($row['field_order'] != $order) - { - $sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . " - SET field_order = $order - WHERE field_id = {$row['field_id']}"; - $db->sql_query($sql); - } - } - $db->sql_freeresult($result); - - $db->sql_transaction('commit'); - - add_log('admin', 'LOG_PROFILE_FIELD_REMOVED', $field_ident); - trigger_error($user->lang['REMOVED_PROFILE_FIELD'] . adm_back_link($this->u_action)); - } - else - { - confirm_box(false, 'DELETE_PROFILE_FIELD', build_hidden_fields(array( - 'i' => $id, - 'mode' => $mode, - 'action' => $action, - 'field_id' => $field_id, - ))); - } - - break; - - case 'activate': - $field_id = request_var('field_id', 0); - - if (!$field_id) - { - trigger_error($user->lang['NO_FIELD_ID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = 'SELECT lang_id - FROM ' . LANG_TABLE . " - WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'"; - $result = $db->sql_query($sql); - $default_lang_id = (int) $db->sql_fetchfield('lang_id'); - $db->sql_freeresult($result); - - if (!in_array($default_lang_id, $this->lang_defs['entry'][$field_id])) - { - trigger_error($user->lang['DEFAULT_LANGUAGE_NOT_FILLED'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . " - SET field_active = 1 - WHERE field_id = $field_id"; - $db->sql_query($sql); - - $sql = 'SELECT field_ident - FROM ' . PROFILE_FIELDS_TABLE . " - WHERE field_id = $field_id"; - $result = $db->sql_query($sql); - $field_ident = (string) $db->sql_fetchfield('field_ident'); - $db->sql_freeresult($result); - - add_log('admin', 'LOG_PROFILE_FIELD_ACTIVATE', $field_ident); - trigger_error($user->lang['PROFILE_FIELD_ACTIVATED'] . adm_back_link($this->u_action)); - - break; - - case 'deactivate': - $field_id = request_var('field_id', 0); - - if (!$field_id) - { - trigger_error($user->lang['NO_FIELD_ID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . " - SET field_active = 0 - WHERE field_id = $field_id"; - $db->sql_query($sql); - - $sql = 'SELECT field_ident - FROM ' . PROFILE_FIELDS_TABLE . " - WHERE field_id = $field_id"; - $result = $db->sql_query($sql); - $field_ident = (string) $db->sql_fetchfield('field_ident'); - $db->sql_freeresult($result); - - add_log('admin', 'LOG_PROFILE_FIELD_DEACTIVATE', $field_ident); - trigger_error($user->lang['PROFILE_FIELD_DEACTIVATED'] . adm_back_link($this->u_action)); - - break; - - case 'move_up': - case 'move_down': - $field_order = request_var('order', 0); - $order_total = $field_order * 2 + (($action == 'move_up') ? -1 : 1); - - $sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . " - SET field_order = $order_total - field_order - WHERE field_order IN ($field_order, " . (($action == 'move_up') ? $field_order - 1 : $field_order + 1) . ')'; - $db->sql_query($sql); - - break; - - case 'create': - case 'edit': - - $field_id = request_var('field_id', 0); - $step = request_var('step', 1); - - $submit = (isset($_REQUEST['next']) || isset($_REQUEST['prev'])) ? true : false; - $save = (isset($_REQUEST['save'])) ? true : false; - - // The language id of default language - $this->edit_lang_id = $this->lang_defs['iso'][$config['default_lang']]; - - // We are editing... we need to grab basic things - if ($action == 'edit') - { - if (!$field_id) - { - trigger_error($user->lang['NO_FIELD_ID'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = 'SELECT l.*, f.* - FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f - WHERE l.lang_id = ' . $this->edit_lang_id . " - AND f.field_id = $field_id - AND l.field_id = f.field_id"; - $result = $db->sql_query($sql); - $field_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$field_row) - { - // Some admin changed the default language? - $sql = 'SELECT l.*, f.* - FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f - WHERE l.lang_id <> ' . $this->edit_lang_id . " - AND f.field_id = $field_id - AND l.field_id = f.field_id"; - $result = $db->sql_query($sql); - $field_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$field_row) - { - trigger_error($user->lang['FIELD_NOT_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $this->edit_lang_id = $field_row['lang_id']; - } - $field_type = $field_row['field_type']; - - // Get language entries - $sql = 'SELECT * - FROM ' . PROFILE_FIELDS_LANG_TABLE . ' - WHERE lang_id = ' . $this->edit_lang_id . " - AND field_id = $field_id - ORDER BY option_id ASC"; - $result = $db->sql_query($sql); - - $lang_options = array(); - while ($row = $db->sql_fetchrow($result)) - { - $lang_options[$row['option_id']] = $row['lang_value']; - } - $db->sql_freeresult($result); - - $s_hidden_fields = ''; - } - else - { - // We are adding a new field, define basic params - $lang_options = $field_row = array(); - - $field_type = request_var('field_type', 0); - - if (!$field_type) - { - trigger_error($user->lang['NO_FIELD_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $field_row = array_merge($default_values[$field_type], array( - 'field_ident' => utf8_clean_string(request_var('field_ident', '', true)), - 'field_required' => 0, - 'field_hide' => 0, - 'field_no_view' => 0, - 'field_show_on_reg' => 0, - 'lang_name' => utf8_normalize_nfc(request_var('field_ident', '', true)), - 'lang_explain' => '', - 'lang_default_value'=> '') - ); - - $s_hidden_fields = ''; - } - - // $exclude contains the data we gather in each step - $exclude = array( - 1 => array('field_ident', 'lang_name', 'lang_explain', 'field_option', 'field_no_view'), - 2 => array('field_length', 'field_maxlen', 'field_minlen', 'field_validation', 'field_novalue', 'field_default_value'), - 3 => array('l_lang_name', 'l_lang_explain', 'l_lang_default_value', 'l_lang_options') - ); - - // Text-based fields require the lang_default_value to be excluded - if ($field_type == FIELD_STRING || $field_type == FIELD_TEXT) - { - $exclude[1][] = 'lang_default_value'; - } - - // option-specific fields require lang_options to be excluded - if ($field_type == FIELD_BOOL || $field_type == FIELD_DROPDOWN) - { - $exclude[1][] = 'lang_options'; - } - - $cp->vars['field_ident'] = ($action == 'create' && $step == 1) ? utf8_clean_string(request_var('field_ident', $field_row['field_ident'], true)) : request_var('field_ident', $field_row['field_ident']); - $cp->vars['lang_name'] = utf8_normalize_nfc(request_var('lang_name', $field_row['lang_name'], true)); - $cp->vars['lang_explain'] = utf8_normalize_nfc(request_var('lang_explain', $field_row['lang_explain'], true)); - $cp->vars['lang_default_value'] = utf8_normalize_nfc(request_var('lang_default_value', $field_row['lang_default_value'], true)); - - // Field option... - if (isset($_REQUEST['field_option'])) - { - $field_option = request_var('field_option', ''); - - $cp->vars['field_required'] = ($field_option == 'field_required') ? 1 : 0; - $cp->vars['field_show_on_reg'] = ($field_option == 'field_show_on_reg') ? 1 : 0; - $cp->vars['field_hide'] = ($field_option == 'field_hide') ? 1 : 0; - } - else - { - $cp->vars['field_required'] = $field_row['field_required']; - $cp->vars['field_show_on_reg'] = $field_row['field_show_on_reg']; - $cp->vars['field_hide'] = $field_row['field_hide']; - - $field_option = ($field_row['field_required']) ? 'field_required' : (($field_row['field_show_on_reg']) ? 'field_show_on_reg' : (($field_row['field_hide']) ? 'field_hide' : '')); - } - - $cp->vars['field_no_view'] = request_var('field_no_view', $field_row['field_no_view']); - - // A boolean field expects an array as the lang options - if ($field_type == FIELD_BOOL) - { - $options = utf8_normalize_nfc(request_var('lang_options', array(''), true)); - } - else - { - $options = utf8_normalize_nfc(request_var('lang_options', '', true)); - } - - // If the user has submitted a form with options (i.e. dropdown field) - if ($options) - { - $exploded_options = (is_array($options)) ? $options : explode("\n", $options); - - if (sizeof($exploded_options) == sizeof($lang_options) || $action == 'create') - { - // The number of options in the field is equal to the number of options already in the database - // Or we are creating a new dropdown list. - $cp->vars['lang_options'] = $exploded_options; - } - else if ($action == 'edit') - { - // Changing the number of options? (We remove and re-create the option fields) - $cp->vars['lang_options'] = $exploded_options; - } - } - else - { - $cp->vars['lang_options'] = $lang_options; - } - - // step 2 - foreach ($exclude[2] as $key) - { - $var = utf8_normalize_nfc(request_var($key, $field_row[$key], true)); - - // Manipulate the intended variables a little bit if needed - if ($field_type == FIELD_DROPDOWN && $key == 'field_maxlen') - { - // Get the number of options if this key is 'field_maxlen' - $var = sizeof(explode("\n", utf8_normalize_nfc(request_var('lang_options', '', true)))); - } - else if ($field_type == FIELD_TEXT && $key == 'field_length') - { - if (isset($_REQUEST['rows'])) - { - $cp->vars['rows'] = request_var('rows', 0); - $cp->vars['columns'] = request_var('columns', 0); - $var = $cp->vars['rows'] . '|' . $cp->vars['columns']; - } - else - { - $row_col = explode('|', $var); - $cp->vars['rows'] = $row_col[0]; - $cp->vars['columns'] = $row_col[1]; - } - } - else if ($field_type == FIELD_DATE && $key == 'field_default_value') - { - $always_now = request_var('always_now', -1); - - if ($always_now == 1 || ($always_now === -1 && $var == 'now')) - { - $now = getdate(); - - $cp->vars['field_default_value_day'] = $now['mday']; - $cp->vars['field_default_value_month'] = $now['mon']; - $cp->vars['field_default_value_year'] = $now['year']; - $var = $_POST['field_default_value'] = 'now'; - } - else - { - if (isset($_REQUEST['field_default_value_day'])) - { - $cp->vars['field_default_value_day'] = request_var('field_default_value_day', 0); - $cp->vars['field_default_value_month'] = request_var('field_default_value_month', 0); - $cp->vars['field_default_value_year'] = request_var('field_default_value_year', 0); - $var = $_POST['field_default_value'] = sprintf('%2d-%2d-%4d', $cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']); - } - else - { - list($cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']) = explode('-', $var); - } - } - } - /* else if ($field_type == FIELD_BOOL && $key == 'field_default_value') - { - // Get the number of options if this key is 'field_maxlen' - $var = request_var('field_default_value', 0); - }*/ - - $cp->vars[$key] = $var; - } - - // step 3 - all arrays - if ($action == 'edit') - { - // Get language entries - $sql = 'SELECT * - FROM ' . PROFILE_FIELDS_LANG_TABLE . ' - WHERE lang_id <> ' . $this->edit_lang_id . " - AND field_id = $field_id - ORDER BY option_id ASC"; - $result = $db->sql_query($sql); - - $l_lang_options = array(); - while ($row = $db->sql_fetchrow($result)) - { - $l_lang_options[$row['lang_id']][$row['option_id']] = $row['lang_value']; - } - $db->sql_freeresult($result); - - - $sql = 'SELECT lang_id, lang_name, lang_explain, lang_default_value - FROM ' . PROFILE_LANG_TABLE . ' - WHERE lang_id <> ' . $this->edit_lang_id . " - AND field_id = $field_id - ORDER BY lang_id ASC"; - $result = $db->sql_query($sql); - - $l_lang_name = $l_lang_explain = $l_lang_default_value = array(); - while ($row = $db->sql_fetchrow($result)) - { - $l_lang_name[$row['lang_id']] = $row['lang_name']; - $l_lang_explain[$row['lang_id']] = $row['lang_explain']; - $l_lang_default_value[$row['lang_id']] = $row['lang_default_value']; - } - $db->sql_freeresult($result); - } - - foreach ($exclude[3] as $key) - { - $cp->vars[$key] = utf8_normalize_nfc(request_var($key, array(0 => ''), true)); - - if (!$cp->vars[$key] && $action == 'edit') - { - $cp->vars[$key] = $$key; - } - else if ($key == 'l_lang_options' && $field_type == FIELD_BOOL) - { - $cp->vars[$key] = utf8_normalize_nfc(request_var($key, array(0 => array('')), true)); - } - else if ($key == 'l_lang_options' && is_array($cp->vars[$key])) - { - foreach ($cp->vars[$key] as $lang_id => $options) - { - $cp->vars[$key][$lang_id] = explode("\n", $options); - } - - } - } - - // Check for general issues in every step - if ($submit) // && $step == 1 - { - // Check values for step 1 - if ($cp->vars['field_ident'] == '') - { - $error[] = $user->lang['EMPTY_FIELD_IDENT']; - } - - if (!preg_match('/^[a-z_]+$/', $cp->vars['field_ident'])) - { - $error[] = $user->lang['INVALID_CHARS_FIELD_IDENT']; - } - - if (strlen($cp->vars['field_ident']) > 17) - { - $error[] = $user->lang['INVALID_FIELD_IDENT_LEN']; - } - - if ($cp->vars['lang_name'] == '') - { - $error[] = $user->lang['EMPTY_USER_FIELD_NAME']; - } - - if ($field_type == FIELD_DROPDOWN && !sizeof($cp->vars['lang_options'])) - { - $error[] = $user->lang['NO_FIELD_ENTRIES']; - } - - if ($field_type == FIELD_BOOL && (empty($cp->vars['lang_options'][0]) || empty($cp->vars['lang_options'][1]))) - { - $error[] = $user->lang['NO_FIELD_ENTRIES']; - } - - // Check for already existing field ident - if ($action != 'edit') - { - $sql = 'SELECT field_ident - FROM ' . PROFILE_FIELDS_TABLE . " - WHERE field_ident = '" . $db->sql_escape($cp->vars['field_ident']) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - $error[] = $user->lang['FIELD_IDENT_ALREADY_EXIST']; - } - } - } - - $step = (isset($_REQUEST['next'])) ? $step + 1 : ((isset($_REQUEST['prev'])) ? $step - 1 : $step); - - if (sizeof($error)) - { - $step--; - $submit = false; - } - - // Build up the specific hidden fields - foreach ($exclude as $num => $key_ary) - { - if ($num == $step) - { - continue; - } - - $_new_key_ary = array(); - - foreach ($key_ary as $key) - { - if ($field_type == FIELD_TEXT && $key == 'field_length' && isset($_REQUEST['rows'])) - { - $cp->vars['rows'] = request_var('rows', 0); - $cp->vars['columns'] = request_var('columns', 0); - $_new_key_ary[$key] = $cp->vars['rows'] . '|' . $cp->vars['columns']; - } - else if ($field_type == FIELD_DATE && $key == 'field_default_value') - { - $always_now = request_var('always_now', 0); - - if ($always_now) - { - $_new_key_ary[$key] = 'now'; - } - else if (isset($_REQUEST['field_default_value_day'])) - { - $cp->vars['field_default_value_day'] = request_var('field_default_value_day', 0); - $cp->vars['field_default_value_month'] = request_var('field_default_value_month', 0); - $cp->vars['field_default_value_year'] = request_var('field_default_value_year', 0); - $_new_key_ary[$key] = sprintf('%2d-%2d-%4d', $cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']); - } - } - else if ($field_type == FIELD_BOOL && $key == 'l_lang_options' && isset($_REQUEST['l_lang_options'])) - { - $_new_key_ary[$key] = utf8_normalize_nfc(request_var($key, array(array('')), true)); - } - else - { - if (!isset($_REQUEST[$key])) - { - $var = false; - } - else if ($key == 'field_ident' && isset($cp->vars[$key])) - { - $_new_key_ary[$key]= $cp->vars[$key]; - } - else - { - $_new_key_ary[$key] = (is_array($_REQUEST[$key])) ? utf8_normalize_nfc(request_var($key, array(''), true)) : utf8_normalize_nfc(request_var($key, '', true)); - } - } - } - - $s_hidden_fields .= build_hidden_fields($_new_key_ary); - } - - if (!sizeof($error)) - { - if ($step == 3 && (sizeof($this->lang_defs['iso']) == 1 || $save)) - { - $this->save_profile_field($cp, $field_type, $action); - } - else if ($action == 'edit' && $save) - { - $this->save_profile_field($cp, $field_type, $action); - } - } - - $template->assign_vars(array( - 'S_EDIT' => true, - 'S_EDIT_MODE' => ($action == 'edit') ? true : false, - 'ERROR_MSG' => (sizeof($error)) ? implode('
    ', $error) : '', - - 'L_TITLE' => $user->lang['STEP_' . $step . '_TITLE_' . strtoupper($action)], - 'L_EXPLAIN' => $user->lang['STEP_' . $step . '_EXPLAIN_' . strtoupper($action)], - - 'U_ACTION' => $this->u_action . "&action=$action&step=$step", - 'U_BACK' => $this->u_action) - ); - - // Now go through the steps - switch ($step) - { - // Create basic options - only small differences between field types - case 1: - - // Build common create options - $template->assign_vars(array( - 'S_STEP_ONE' => true, - 'S_FIELD_REQUIRED' => ($cp->vars['field_required']) ? true : false, - 'S_SHOW_ON_REG' => ($cp->vars['field_show_on_reg']) ? true : false, - 'S_FIELD_HIDE' => ($cp->vars['field_hide']) ? true : false, - 'S_FIELD_NO_VIEW' => ($cp->vars['field_no_view']) ? true : false, - - 'L_LANG_SPECIFIC' => sprintf($user->lang['LANG_SPECIFIC_OPTIONS'], $config['default_lang']), - 'FIELD_TYPE' => $user->lang['FIELD_' . strtoupper(custom_profile::$profile_types[$field_type])], - 'FIELD_IDENT' => $cp->vars['field_ident'], - 'LANG_NAME' => $cp->vars['lang_name'], - 'LANG_EXPLAIN' => $cp->vars['lang_explain']) - ); - - // String and Text needs to set default values here... - if ($field_type == FIELD_STRING || $field_type == FIELD_TEXT) - { - $template->assign_vars(array( - 'S_TEXT' => ($field_type == FIELD_TEXT) ? true : false, - 'S_STRING' => ($field_type == FIELD_STRING) ? true : false, - - 'L_DEFAULT_VALUE_EXPLAIN' => $user->lang[strtoupper(custom_profile::$profile_types[$field_type]) . '_DEFAULT_VALUE_EXPLAIN'], - 'LANG_DEFAULT_VALUE' => $cp->vars['lang_default_value']) - ); - } - - if ($field_type == FIELD_BOOL || $field_type == FIELD_DROPDOWN) - { - // Initialize these array elements if we are creating a new field - if (!sizeof($cp->vars['lang_options'])) - { - if ($field_type == FIELD_BOOL) - { - // No options have been defined for a boolean field. - $cp->vars['lang_options'][0] = ''; - $cp->vars['lang_options'][1] = ''; - } - else - { - // No options have been defined for the dropdown menu - $cp->vars['lang_options'] = array(); - } - } - - $template->assign_vars(array( - 'S_BOOL' => ($field_type == FIELD_BOOL) ? true : false, - 'S_DROPDOWN' => ($field_type == FIELD_DROPDOWN) ? true : false, - - 'L_LANG_OPTIONS_EXPLAIN' => $user->lang[strtoupper(custom_profile::$profile_types[$field_type]) . '_ENTRIES_EXPLAIN'], - 'LANG_OPTIONS' => ($field_type == FIELD_DROPDOWN) ? implode("\n", $cp->vars['lang_options']) : '', - 'FIRST_LANG_OPTION' => ($field_type == FIELD_BOOL) ? $cp->vars['lang_options'][0] : '', - 'SECOND_LANG_OPTION' => ($field_type == FIELD_BOOL) ? $cp->vars['lang_options'][1] : '') - ); - } - - break; - - case 2: - - $template->assign_vars(array( - 'S_STEP_TWO' => true, - 'L_NEXT_STEP' => (sizeof($this->lang_defs['iso']) == 1) ? $user->lang['SAVE'] : $user->lang['PROFILE_LANG_OPTIONS']) - ); - - // Build options based on profile type - $function = 'get_' . custom_profile::$profile_types[$field_type] . '_options'; - $options = $cp->$function(); - - foreach ($options as $num => $option_ary) - { - $template->assign_block_vars('option', $option_ary); - } - - break; - - // Define remaining language variables - case 3: - - $template->assign_var('S_STEP_THREE', true); - $options = $this->build_language_options($cp, $field_type, $action); - - foreach ($options as $lang_id => $lang_ary) - { - $template->assign_block_vars('options', array( - 'LANGUAGE' => sprintf($user->lang[(($lang_id == $this->edit_lang_id) ? 'DEFAULT_' : '') . 'ISO_LANGUAGE'], $lang_ary['lang_iso'])) - ); - - foreach ($lang_ary['fields'] as $field_ident => $field_ary) - { - $template->assign_block_vars('options.field', array( - 'L_TITLE' => $field_ary['TITLE'], - 'L_EXPLAIN' => (isset($field_ary['EXPLAIN'])) ? $field_ary['EXPLAIN'] : '', - 'FIELD' => $field_ary['FIELD']) - ); - } - } - - break; - } - - $template->assign_vars(array( - 'S_HIDDEN_FIELDS' => $s_hidden_fields) - ); - - return; - - break; - } - - $sql = 'SELECT * - FROM ' . PROFILE_FIELDS_TABLE . ' - ORDER BY field_order'; - $result = $db->sql_query($sql); - - $s_one_need_edit = false; - while ($row = $db->sql_fetchrow($result)) - { - $active_lang = (!$row['field_active']) ? 'ACTIVATE' : 'DEACTIVATE'; - $active_value = (!$row['field_active']) ? 'activate' : 'deactivate'; - $id = $row['field_id']; - - $s_need_edit = (sizeof($this->lang_defs['diff'][$row['field_id']])) ? true : false; - - if ($s_need_edit) - { - $s_one_need_edit = true; - } - - $template->assign_block_vars('fields', array( - 'FIELD_IDENT' => $row['field_ident'], - 'FIELD_TYPE' => $user->lang['FIELD_' . strtoupper(custom_profile::$profile_types[$row['field_type']])], - - 'L_ACTIVATE_DEACTIVATE' => $user->lang[$active_lang], - 'U_ACTIVATE_DEACTIVATE' => $this->u_action . "&action=$active_value&field_id=$id", - 'U_EDIT' => $this->u_action . "&action=edit&field_id=$id", - 'U_TRANSLATE' => $this->u_action . "&action=edit&field_id=$id&step=3", - 'U_DELETE' => $this->u_action . "&action=delete&field_id=$id", - 'U_MOVE_UP' => $this->u_action . "&action=move_up&order={$row['field_order']}", - 'U_MOVE_DOWN' => $this->u_action . "&action=move_down&order={$row['field_order']}", - - 'S_NEED_EDIT' => $s_need_edit) - ); - } - $db->sql_freeresult($result); - - // At least one option field needs editing? - if ($s_one_need_edit) - { - $template->assign_var('S_NEED_EDIT', true); - } - - $s_select_type = ''; - foreach (custom_profile::$profile_types as $key => $value) - { - $s_select_type .= ''; - } - - $template->assign_vars(array( - 'U_ACTION' => $this->u_action, - 'S_TYPE_OPTIONS' => $s_select_type) - ); - } - - /** - * Build all Language specific options - */ - function build_language_options(&$cp, $field_type, $action = 'create') - { - global $user, $config, $db; - - $default_lang_id = (!empty($this->edit_lang_id)) ? $this->edit_lang_id : $this->lang_defs['iso'][$config['default_lang']]; - - $sql = 'SELECT lang_id, lang_iso - FROM ' . LANG_TABLE . ' - WHERE lang_id <> ' . (int) $default_lang_id . ' - ORDER BY lang_english_name'; - $result = $db->sql_query($sql); - - $languages = array(); - while ($row = $db->sql_fetchrow($result)) - { - $languages[$row['lang_id']] = $row['lang_iso']; - } - $db->sql_freeresult($result); - - $options = array(); - $options['lang_name'] = 'string'; - if ($cp->vars['lang_explain']) - { - $options['lang_explain'] = 'text'; - } - - switch ($field_type) - { - case FIELD_BOOL: - $options['lang_options'] = 'two_options'; - break; - - case FIELD_DROPDOWN: - $options['lang_options'] = 'optionfield'; - break; - - case FIELD_TEXT: - case FIELD_STRING: - if ($cp->vars['lang_default_value']) - { - $options['lang_default_value'] = ($field_type == FIELD_STRING) ? 'string' : 'text'; - } - break; - } - - $lang_options = array(); - - foreach ($options as $field => $field_type) - { - $lang_options[1]['lang_iso'] = $this->lang_defs['id'][$default_lang_id]; - $lang_options[1]['fields'][$field] = array( - 'TITLE' => $user->lang['CP_' . strtoupper($field)], - 'FIELD' => '
    ' . ((is_array($cp->vars[$field])) ? implode('
    ', $cp->vars[$field]) : bbcode_nl2br($cp->vars[$field])) . '
    ' - ); - - if (isset($user->lang['CP_' . strtoupper($field) . '_EXPLAIN'])) - { - $lang_options[1]['fields'][$field]['EXPLAIN'] = $user->lang['CP_' . strtoupper($field) . '_EXPLAIN']; - } - } - - foreach ($languages as $lang_id => $lang_iso) - { - $lang_options[$lang_id]['lang_iso'] = $lang_iso; - foreach ($options as $field => $field_type) - { - $value = ($action == 'create') ? utf8_normalize_nfc(request_var('l_' . $field, array(0 => ''), true)) : $cp->vars['l_' . $field]; - if ($field == 'lang_options') - { - $var = (!isset($cp->vars['l_lang_options'][$lang_id]) || !is_array($cp->vars['l_lang_options'][$lang_id])) ? $cp->vars['lang_options'] : $cp->vars['l_lang_options'][$lang_id]; - - switch ($field_type) - { - case 'two_options': - - $lang_options[$lang_id]['fields'][$field] = array( - 'TITLE' => $user->lang['CP_' . strtoupper($field)], - 'FIELD' => ' -
    ' . $user->lang['FIRST_OPTION'] . '
    -
    ' . $user->lang['SECOND_OPTION'] . '
    ' - ); - break; - - case 'optionfield': - $value = ((isset($value[$lang_id])) ? ((is_array($value[$lang_id])) ? implode("\n", $value[$lang_id]) : $value[$lang_id]) : implode("\n", $var)); - $lang_options[$lang_id]['fields'][$field] = array( - 'TITLE' => $user->lang['CP_' . strtoupper($field)], - 'FIELD' => '
    ' - ); - break; - } - - if (isset($user->lang['CP_' . strtoupper($field) . '_EXPLAIN'])) - { - $lang_options[$lang_id]['fields'][$field]['EXPLAIN'] = $user->lang['CP_' . strtoupper($field) . '_EXPLAIN']; - } - } - else - { - $var = ($action == 'create' || !is_array($cp->vars[$field])) ? $cp->vars[$field] : $cp->vars[$field][$lang_id]; - - $lang_options[$lang_id]['fields'][$field] = array( - 'TITLE' => $user->lang['CP_' . strtoupper($field)], - 'FIELD' => ($field_type == 'string') ? '
    ' : '
    ' - ); - - if (isset($user->lang['CP_' . strtoupper($field) . '_EXPLAIN'])) - { - $lang_options[$lang_id]['fields'][$field]['EXPLAIN'] = $user->lang['CP_' . strtoupper($field) . '_EXPLAIN']; - } - } - } - } - - return $lang_options; - } - - /** - * Save Profile Field - */ - function save_profile_field(&$cp, $field_type, $action = 'create') - { - global $db, $config, $user; - - $field_id = request_var('field_id', 0); - - // Collect all information, if something is going wrong, abort the operation - $profile_sql = $profile_lang = $empty_lang = $profile_lang_fields = array(); - - $default_lang_id = (!empty($this->edit_lang_id)) ? $this->edit_lang_id : $this->lang_defs['iso'][$config['default_lang']]; - - if ($action == 'create') - { - $sql = 'SELECT MAX(field_order) as max_field_order - FROM ' . PROFILE_FIELDS_TABLE; - $result = $db->sql_query($sql); - $new_field_order = (int) $db->sql_fetchfield('max_field_order'); - $db->sql_freeresult($result); - - $field_ident = $cp->vars['field_ident']; - } - - // Save the field - $profile_fields = array( - 'field_length' => $cp->vars['field_length'], - 'field_minlen' => $cp->vars['field_minlen'], - 'field_maxlen' => $cp->vars['field_maxlen'], - 'field_novalue' => $cp->vars['field_novalue'], - 'field_default_value' => $cp->vars['field_default_value'], - 'field_validation' => $cp->vars['field_validation'], - 'field_required' => $cp->vars['field_required'], - 'field_show_on_reg' => $cp->vars['field_show_on_reg'], - 'field_hide' => $cp->vars['field_hide'], - 'field_no_view' => $cp->vars['field_no_view'] - ); - - if ($action == 'create') - { - $profile_fields += array( - 'field_type' => $field_type, - 'field_ident' => $field_ident, - 'field_name' => $field_ident, - 'field_order' => $new_field_order + 1, - 'field_active' => 1 - ); - - $sql = 'INSERT INTO ' . PROFILE_FIELDS_TABLE . ' ' . $db->sql_build_array('INSERT', $profile_fields); - $db->sql_query($sql); - - $field_id = $db->sql_nextid(); - } - else - { - $sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $profile_fields) . " - WHERE field_id = $field_id"; - $db->sql_query($sql); - } - - if ($action == 'create') - { - $field_ident = 'pf_' . $field_ident; - $profile_sql[] = $this->add_field_ident($field_ident, $field_type); - } - - $sql_ary = array( - 'lang_name' => $cp->vars['lang_name'], - 'lang_explain' => $cp->vars['lang_explain'], - 'lang_default_value' => $cp->vars['lang_default_value'] - ); - - if ($action == 'create') - { - $sql_ary['field_id'] = $field_id; - $sql_ary['lang_id'] = $default_lang_id; - - $profile_sql[] = 'INSERT INTO ' . PROFILE_LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - } - else - { - $this->update_insert(PROFILE_LANG_TABLE, $sql_ary, array('field_id' => $field_id, 'lang_id' => $default_lang_id)); - } - - if (is_array($cp->vars['l_lang_name']) && sizeof($cp->vars['l_lang_name'])) - { - foreach ($cp->vars['l_lang_name'] as $lang_id => $data) - { - if (($cp->vars['lang_name'] != '' && $cp->vars['l_lang_name'][$lang_id] == '') - || ($cp->vars['lang_explain'] != '' && $cp->vars['l_lang_explain'][$lang_id] == '') - || ($cp->vars['lang_default_value'] != '' && $cp->vars['l_lang_default_value'][$lang_id] == '')) - { - $empty_lang[$lang_id] = true; - break; - } - - if (!isset($empty_lang[$lang_id])) - { - $profile_lang[] = array( - 'field_id' => $field_id, - 'lang_id' => $lang_id, - 'lang_name' => $cp->vars['l_lang_name'][$lang_id], - 'lang_explain' => (isset($cp->vars['l_lang_explain'][$lang_id])) ? $cp->vars['l_lang_explain'][$lang_id] : '', - 'lang_default_value' => (isset($cp->vars['l_lang_default_value'][$lang_id])) ? $cp->vars['l_lang_default_value'][$lang_id] : '' - ); - } - } - - foreach ($empty_lang as $lang_id => $NULL) - { - $sql = 'DELETE FROM ' . PROFILE_LANG_TABLE . " - WHERE field_id = $field_id - AND lang_id = " . (int) $lang_id; - $db->sql_query($sql); - } - } - - // These are always arrays because the key is the language id... - $cp->vars['l_lang_name'] = utf8_normalize_nfc(request_var('l_lang_name', array(0 => ''), true)); - $cp->vars['l_lang_explain'] = utf8_normalize_nfc(request_var('l_lang_explain', array(0 => ''), true)); - $cp->vars['l_lang_default_value'] = utf8_normalize_nfc(request_var('l_lang_default_value', array(0 => ''), true)); - - if ($field_type != FIELD_BOOL) - { - $cp->vars['l_lang_options'] = utf8_normalize_nfc(request_var('l_lang_options', array(0 => ''), true)); - } - else - { - /** - * @todo check if this line is correct... - $cp->vars['l_lang_default_value'] = request_var('l_lang_default_value', array(0 => array('')), true); - */ - $cp->vars['l_lang_options'] = utf8_normalize_nfc(request_var('l_lang_options', array(0 => array('')), true)); - } - - if ($cp->vars['lang_options']) - { - if (!is_array($cp->vars['lang_options'])) - { - $cp->vars['lang_options'] = explode("\n", $cp->vars['lang_options']); - } - - if ($action != 'create') - { - $sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . " - WHERE field_id = $field_id - AND lang_id = " . (int) $default_lang_id; - $db->sql_query($sql); - } - - foreach ($cp->vars['lang_options'] as $option_id => $value) - { - $sql_ary = array( - 'field_type' => (int) $field_type, - 'lang_value' => $value - ); - - if ($action == 'create') - { - $sql_ary['field_id'] = $field_id; - $sql_ary['lang_id'] = $default_lang_id; - $sql_ary['option_id'] = (int) $option_id; - - $profile_sql[] = 'INSERT INTO ' . PROFILE_FIELDS_LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - } - else - { - $this->update_insert(PROFILE_FIELDS_LANG_TABLE, $sql_ary, array( - 'field_id' => $field_id, - 'lang_id' => (int) $default_lang_id, - 'option_id' => (int) $option_id) - ); - } - } - } - - if (is_array($cp->vars['l_lang_options']) && sizeof($cp->vars['l_lang_options'])) - { - $empty_lang = array(); - - foreach ($cp->vars['l_lang_options'] as $lang_id => $lang_ary) - { - if (!is_array($lang_ary)) - { - $lang_ary = explode("\n", $lang_ary); - } - - if (sizeof($lang_ary) != sizeof($cp->vars['lang_options'])) - { - $empty_lang[$lang_id] = true; - } - - if (!isset($empty_lang[$lang_id])) - { - if ($action != 'create') - { - $sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . " - WHERE field_id = $field_id - AND lang_id = " . (int) $lang_id; - $db->sql_query($sql); - } - - foreach ($lang_ary as $option_id => $value) - { - $profile_lang_fields[] = array( - 'field_id' => (int) $field_id, - 'lang_id' => (int) $lang_id, - 'option_id' => (int) $option_id, - 'field_type' => (int) $field_type, - 'lang_value' => $value - ); - } - } - } - - foreach ($empty_lang as $lang_id => $NULL) - { - $sql = 'DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . " - WHERE field_id = $field_id - AND lang_id = " . (int) $lang_id; - $db->sql_query($sql); - } - } - - foreach ($profile_lang as $sql) - { - if ($action == 'create') - { - $profile_sql[] = 'INSERT INTO ' . PROFILE_LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $sql); - } - else - { - $lang_id = $sql['lang_id']; - unset($sql['lang_id'], $sql['field_id']); - - $this->update_insert(PROFILE_LANG_TABLE, $sql, array('lang_id' => (int) $lang_id, 'field_id' => $field_id)); - } - } - - if (sizeof($profile_lang_fields)) - { - foreach ($profile_lang_fields as $sql) - { - if ($action == 'create') - { - $profile_sql[] = 'INSERT INTO ' . PROFILE_FIELDS_LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $sql); - } - else - { - $lang_id = $sql['lang_id']; - $option_id = $sql['option_id']; - unset($sql['lang_id'], $sql['field_id'], $sql['option_id']); - - $this->update_insert(PROFILE_FIELDS_LANG_TABLE, $sql, array( - 'lang_id' => $lang_id, - 'field_id' => $field_id, - 'option_id' => $option_id) - ); - } - } - } - - - $db->sql_transaction('begin'); - - if ($action == 'create') - { - foreach ($profile_sql as $sql) - { - $db->sql_query($sql); - } - } - - $db->sql_transaction('commit'); - - if ($action == 'edit') - { - add_log('admin', 'LOG_PROFILE_FIELD_EDIT', $cp->vars['field_ident'] . ':' . $cp->vars['lang_name']); - trigger_error($user->lang['CHANGED_PROFILE_FIELD'] . adm_back_link($this->u_action)); - } - else - { - add_log('admin', 'LOG_PROFILE_FIELD_CREATE', substr($field_ident, 3) . ':' . $cp->vars['lang_name']); - trigger_error($user->lang['ADDED_PROFILE_FIELD'] . adm_back_link($this->u_action)); - } - } - - /** - * Update, then insert if not successfull - */ - function update_insert($table, $sql_ary, $where_fields) - { - global $db; - - $where_sql = array(); - $check_key = ''; - - foreach ($where_fields as $key => $value) - { - $check_key = (!$check_key) ? $key : $check_key; - $where_sql[] = $key . ' = ' . ((is_string($value)) ? "'" . $db->sql_escape($value) . "'" : (int) $value); - } - - if (!sizeof($where_sql)) - { - return; - } - - $sql = "SELECT $check_key - FROM $table - WHERE " . implode(' AND ', $where_sql); - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - $sql_ary = array_merge($where_fields, $sql_ary); - - if (sizeof($sql_ary)) - { - $db->sql_query("INSERT INTO $table " . $db->sql_build_array('INSERT', $sql_ary)); - } - } - else - { - if (sizeof($sql_ary)) - { - $sql = "UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE ' . implode(' AND ', $where_sql); - $db->sql_query($sql); - } - } - } - - /** - * Return sql statement for adding a new field ident (profile field) to the profile fields data table - */ - function add_field_ident($field_ident, $field_type) - { - global $db; - - switch ($db->dbms_type) - { - case 'mysql': - - // We are defining the biggest common value, because of the possibility to edit the min/max values of each field. - $sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD `$field_ident` "; - - switch ($field_type) - { - case FIELD_STRING: - $sql .= ' VARCHAR(255) '; - break; - - case FIELD_DATE: - $sql .= 'VARCHAR(10) '; - break; - - case FIELD_TEXT: - $sql .= "TEXT"; - // ADD {$field_ident}_bbcode_uid VARCHAR(5) NOT NULL, - // ADD {$field_ident}_bbcode_bitfield INT(11) UNSIGNED"; - break; - - case FIELD_BOOL: - $sql .= 'TINYINT(2) '; - break; - - case FIELD_DROPDOWN: - $sql .= 'MEDIUMINT(8) '; - break; - - case FIELD_INT: - $sql .= 'BIGINT(20) '; - break; - } - - break; - - case 'sqlite': - - switch ($field_type) - { - case FIELD_STRING: - $type = ' VARCHAR(255) '; - break; - - case FIELD_DATE: - $type = 'VARCHAR(10) '; - break; - - case FIELD_TEXT: - $type = "TEXT(65535)"; - // ADD {$field_ident}_bbcode_uid VARCHAR(5) NOT NULL, - // ADD {$field_ident}_bbcode_bitfield INT(11) UNSIGNED"; - break; - - case FIELD_BOOL: - $type = 'TINYINT(2) '; - break; - - case FIELD_DROPDOWN: - $type = 'MEDIUMINT(8) '; - break; - - case FIELD_INT: - $type = 'BIGINT(20) '; - break; - } - - // We are defining the biggest common value, because of the possibility to edit the min/max values of each field. - if (version_compare(sqlite_libversion(), '3.0') == -1) - { - $sql = "SELECT sql - FROM sqlite_master - WHERE type = 'table' - AND name = '" . PROFILE_FIELDS_DATA_TABLE . "' - ORDER BY type DESC, name;"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // Create a temp table and populate it, destroy the existing one - $db->sql_query(preg_replace('#CREATE\s+TABLE\s+"?' . PROFILE_FIELDS_DATA_TABLE . '"?#i', 'CREATE TEMPORARY TABLE ' . PROFILE_FIELDS_DATA_TABLE . '_temp', $row['sql'])); - $db->sql_query('INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . '_temp SELECT * FROM ' . PROFILE_FIELDS_DATA_TABLE); - $db->sql_query('DROP TABLE ' . PROFILE_FIELDS_DATA_TABLE); - - preg_match('#\((.*)\)#s', $row['sql'], $matches); - - $new_table_cols = trim($matches[1]); - $old_table_cols = explode(',', $new_table_cols); - $column_list = array(); - - foreach ($old_table_cols as $declaration) - { - $entities = preg_split('#\s+#', trim($declaration)); - if ($entities[0] == 'PRIMARY') - { - continue; - } - $column_list[] = $entities[0]; - } - - $columns = implode(',', $column_list); - - $new_table_cols = $field_ident . ' ' . $type . ',' . $new_table_cols; - - // create a new table and fill it up. destroy the temp one - $db->sql_query('CREATE TABLE ' . PROFILE_FIELDS_DATA_TABLE . ' (' . $new_table_cols . ');'); - $db->sql_query('INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . PROFILE_FIELDS_DATA_TABLE . '_temp;'); - $db->sql_query('DROP TABLE ' . PROFILE_FIELDS_DATA_TABLE . '_temp'); - } - else - { - $sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD $field_ident [$type]"; - } - - break; - - case 'mssql': - - // We are defining the biggest common value, because of the possibility to edit the min/max values of each field. - $sql = 'ALTER TABLE [' . PROFILE_FIELDS_DATA_TABLE . "] ADD [$field_ident] "; - - switch ($field_type) - { - case FIELD_STRING: - $sql .= ' [VARCHAR] (255) '; - break; - - case FIELD_DATE: - $sql .= '[VARCHAR] (10) '; - break; - - case FIELD_TEXT: - $sql .= "[TEXT]"; - // ADD {$field_ident}_bbcode_uid [VARCHAR] (5) NOT NULL, - // ADD {$field_ident}_bbcode_bitfield [INT] UNSIGNED"; - break; - - case FIELD_BOOL: - case FIELD_DROPDOWN: - $sql .= '[INT] '; - break; - - case FIELD_INT: - $sql .= '[FLOAT] '; - break; - } - - break; - - case 'postgres': - - // We are defining the biggest common value, because of the possibility to edit the min/max values of each field. - $sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD COLUMN \"$field_ident\" "; - - switch ($field_type) - { - case FIELD_STRING: - $sql .= ' VARCHAR(255) '; - break; - - case FIELD_DATE: - $sql .= 'VARCHAR(10) '; - break; - - case FIELD_TEXT: - $sql .= "TEXT"; - // ADD {$field_ident}_bbcode_uid VARCHAR(5) NOT NULL, - // ADD {$field_ident}_bbcode_bitfield INT4 UNSIGNED"; - break; - - case FIELD_BOOL: - $sql .= 'INT2 '; - break; - - case FIELD_DROPDOWN: - $sql .= 'INT4 '; - break; - - case FIELD_INT: - $sql .= 'INT8 '; - break; - } - - break; - - case 'firebird': - - // We are defining the biggest common value, because of the possibility to edit the min/max values of each field. - $sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD \"$field_ident\" "; - - switch ($field_type) - { - case FIELD_STRING: - $sql .= ' VARCHAR(255) '; - break; - - case FIELD_DATE: - $sql .= 'VARCHAR(10) '; - break; - - case FIELD_TEXT: - $sql .= "BLOB SUB_TYPE TEXT"; - // ADD {$field_ident}_bbcode_uid VARCHAR(5) NOT NULL, - // ADD {$field_ident}_bbcode_bitfield INTEGER UNSIGNED"; - break; - - case FIELD_BOOL: - case FIELD_DROPDOWN: - $sql .= 'INTEGER '; - break; - - case FIELD_INT: - $sql .= 'DOUBLE PRECISION '; - break; - } - - break; - - case 'oracle': - - // We are defining the biggest common value, because of the possibility to edit the min/max values of each field. - $sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD $field_ident "; - - switch ($field_type) - { - case FIELD_STRING: - $sql .= ' VARCHAR2(255) '; - break; - - case FIELD_DATE: - $sql .= 'VARCHAR2(10) '; - break; - - case FIELD_TEXT: - $sql .= "CLOB"; - // ADD {$field_ident}_bbcode_uid VARCHAR2(5) NOT NULL, - // ADD {$field_ident}_bbcode_bitfield NUMBER(11) UNSIGNED"; - break; - - case FIELD_BOOL: - $sql .= 'NUMBER(2) '; - break; - - case FIELD_DROPDOWN: - $sql .= 'NUMBER(8) '; - break; - - case FIELD_INT: - $sql .= 'NUMBER(20) '; - break; - } - - break; - - case 'db2': - - // We are defining the biggest common value, because of the possibility to edit the min/max values of each field. - $sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD \"$field_ident\" "; - - switch ($field_type) - { - case FIELD_STRING: - $sql .= ' VARCHAR(255) '; - break; - - case FIELD_DATE: - $sql .= 'VARCHAR(10) '; - break; - - case FIELD_TEXT: - $sql .= "varchar(32672)"; - // ADD {$field_ident}_bbcode_uid VARCHAR2(5) NOT NULL, - // ADD {$field_ident}_bbcode_bitfield NUMBER(11) UNSIGNED"; - break; - - case FIELD_BOOL: - $sql .= 'smallint '; - break; - - case FIELD_DROPDOWN: - $sql .= 'integer '; - break; - - case FIELD_INT: - $sql .= 'float '; - break; - } - - break; - } - - return $sql; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php deleted file mode 100644 index 308f83387c..0000000000 --- a/phpBB/includes/acp/acp_prune.php +++ /dev/null @@ -1,453 +0,0 @@ -add_lang('acp/prune'); - include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx); - - switch ($mode) - { - case 'forums': - $this->tpl_name = 'acp_prune_forums'; - $this->page_title = 'ACP_PRUNE_FORUMS'; - $this->prune_forums($id, $mode); - break; - - case 'users': - $this->tpl_name = 'acp_prune_users'; - $this->page_title = 'ACP_PRUNE_USERS'; - $this->prune_users($id, $mode); - break; - } - } - - /** - * Prune forums - */ - function prune_forums($id, $mode) - { - global $db, $user, $auth, $template, $cache; - global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; - - $all_forums = request_var('all_forums', 0); - $forum_id = request_var('f', array(0)); - $submit = (isset($_POST['submit'])) ? true : false; - - if ($all_forums) - { - $sql = 'SELECT forum_id - FROM ' . FORUMS_TABLE . ' - ORDER BY left_id'; - $result = $db->sql_query($sql); - - $forum_id = array(); - while ($row = $db->sql_fetchrow($result)) - { - $forum_id[] = $row['forum_id']; - } - $db->sql_freeresult($result); - } - - if ($submit) - { - if (confirm_box(true)) - { - $prune_posted = request_var('prune_days', 0); - $prune_viewed = request_var('prune_vieweddays', 0); - $prune_all = (!$prune_posted && !$prune_viewed) ? true : false; - - $prune_flags = 0; - $prune_flags += (request_var('prune_old_polls', 0)) ? 2 : 0; - $prune_flags += (request_var('prune_announce', 0)) ? 4 : 0; - $prune_flags += (request_var('prune_sticky', 0)) ? 8 : 0; - - // Convert days to seconds for timestamp functions... - $prunedate_posted = time() - ($prune_posted * 86400); - $prunedate_viewed = time() - ($prune_viewed * 86400); - - $template->assign_vars(array( - 'S_PRUNED' => true) - ); - - $sql_forum = (sizeof($forum_id)) ? ' AND ' . $db->sql_in_set('forum_id', $forum_id) : ''; - - // Get a list of forum's or the data for the forum that we are pruning. - $sql = 'SELECT forum_id, forum_name - FROM ' . FORUMS_TABLE . ' - WHERE forum_type = ' . FORUM_POST . " - $sql_forum - ORDER BY left_id ASC"; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - $prune_ids = array(); - $p_result['topics'] = 0; - $p_result['posts'] = 0; - $log_data = ''; - - do - { - if (!$auth->acl_get('f_list', $row['forum_id'])) - { - continue; - } - - if ($prune_all) - { - $p_result = prune($row['forum_id'], 'posted', time(), $prune_flags, false); - } - else - { - if ($prune_posted) - { - $return = prune($row['forum_id'], 'posted', $prunedate_posted, $prune_flags, false); - $p_result['topics'] += $return['topics']; - $p_result['posts'] += $return['posts']; - } - - if ($prune_viewed) - { - $return = prune($row['forum_id'], 'viewed', $prunedate_viewed, $prune_flags, false); - $p_result['topics'] += $return['topics']; - $p_result['posts'] += $return['posts']; - } - } - - $prune_ids[] = $row['forum_id']; - - $template->assign_block_vars('pruned', array( - 'FORUM_NAME' => $row['forum_name'], - 'NUM_TOPICS' => $p_result['topics'], - 'NUM_POSTS' => $p_result['posts']) - ); - - $log_data .= (($log_data != '') ? ', ' : '') . $row['forum_name']; - } - while ($row = $db->sql_fetchrow($result)); - - // Sync all pruned forums at once - sync('forum', 'forum_id', $prune_ids, true, true); - add_log('admin', 'LOG_PRUNE', $log_data); - } - $db->sql_freeresult($result); - - return; - } - else - { - confirm_box(false, $user->lang['PRUNE_FORUM_CONFIRM'], build_hidden_fields(array( - 'i' => $id, - 'mode' => $mode, - 'submit' => 1, - 'all_forums' => $all_forums, - 'f' => $forum_id, - - 'prune_days' => request_var('prune_days', 0), - 'prune_vieweddays' => request_var('prune_vieweddays', 0), - 'prune_old_polls' => request_var('prune_old_polls', 0), - 'prune_announce' => request_var('prune_announce', 0), - 'prune_sticky' => request_var('prune_sticky', 0), - ))); - } - } - - // If they haven't selected a forum for pruning yet then - // display a select box to use for pruning. - if (!sizeof($forum_id)) - { - $template->assign_vars(array( - 'U_ACTION' => $this->u_action, - 'S_SELECT_FORUM' => true, - 'S_FORUM_OPTIONS' => make_forum_select(false, false, false)) - ); - } - else - { - $sql = 'SELECT forum_id, forum_name - FROM ' . FORUMS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $forum_id); - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - - if (!$row) - { - $db->sql_freeresult($result); - trigger_error($user->lang['NO_FORUM'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $forum_list = $s_hidden_fields = ''; - do - { - $forum_list .= (($forum_list != '') ? ', ' : '') . '' . $row['forum_name'] . ''; - $s_hidden_fields .= ''; - } - while ($row = $db->sql_fetchrow($result)); - - $db->sql_freeresult($result); - - $l_selected_forums = (sizeof($forum_id) == 1) ? 'SELECTED_FORUM' : 'SELECTED_FORUMS'; - - $template->assign_vars(array( - 'L_SELECTED_FORUMS' => $user->lang[$l_selected_forums], - 'U_ACTION' => $this->u_action, - 'U_BACK' => $this->u_action, - 'FORUM_LIST' => $forum_list, - 'S_HIDDEN_FIELDS' => $s_hidden_fields) - ); - } - } - - /** - * Prune users - */ - function prune_users($id, $mode) - { - global $db, $user, $auth, $template, $cache; - global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; - - $user->add_lang('memberlist'); - - $prune = (isset($_POST['prune'])) ? true : false; - - if ($prune) - { - $action = request_var('action', 'deactivate'); - $deleteposts = request_var('deleteposts', 0); - - if (confirm_box(true)) - { - $user_ids = $usernames = array(); - $this->get_prune_users($user_ids, $usernames); - - if (sizeof($user_ids)) - { - if ($action == 'deactivate') - { - user_active_flip('deactivate', $user_ids); - $l_log = 'LOG_PRUNE_USER_DEAC'; - } - else if ($action == 'delete') - { - if ($deleteposts) - { - foreach ($user_ids as $user_id) - { - user_delete('remove', $user_id); - } - - $l_log = 'LOG_PRUNE_USER_DEL_DEL'; - } - else - { - foreach ($user_ids as $user_id) - { - user_delete('retain', $user_id, $usernames[$user_id]); - } - - $l_log = 'LOG_PRUNE_USER_DEL_ANON'; - } - } - - add_log('admin', $l_log, implode(', ', $usernames)); - $msg = $user->lang['USER_' . strtoupper($action) . '_SUCCESS']; - } - else - { - $msg = $user->lang['USER_PRUNE_FAILURE']; - } - - trigger_error($msg . adm_back_link($this->u_action)); - } - else - { - // We list the users which will be pruned... - $user_ids = $usernames = array(); - $this->get_prune_users($user_ids, $usernames); - - if (!sizeof($user_ids)) - { - trigger_error($user->lang['USER_PRUNE_FAILURE'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - // Assign to template - foreach ($user_ids as $user_id) - { - $template->assign_block_vars('users', array( - 'USERNAME' => $usernames[$user_id], - 'U_PROFILE' => append_sid($phpbb_root_path . 'memberlist.' . $phpEx, 'mode=viewprofile&u=' . $user_id), - 'U_USER_ADMIN' => ($auth->acl_get('a_user')) ? append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&mode=overview&u=' . $user_id, true, $user->session_id) : '', - )); - } - - $template->assign_vars(array( - 'S_DEACTIVATE' => ($action == 'deactivate') ? true : false, - 'S_DELETE' => ($action == 'delete') ? true : false, - )); - - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'i' => $id, - 'mode' => $mode, - 'prune' => 1, - - 'users' => request_var('users', '', true), - 'username' => request_var('username', '', true), - 'email' => request_var('email', ''), - 'joined_select' => request_var('joined_select', ''), - 'joined' => request_var('joined', ''), - 'active_select' => request_var('active_select', ''), - 'active' => request_var('active', ''), - 'count_select' => request_var('count_select', ''), - 'count' => request_var('count', ''), - 'deleteposts' => request_var('deleteposts', 0), - - 'action' => request_var('action', ''), - )), 'confirm_body_prune.html'); - } - } - - $find_count = array('lt' => $user->lang['LESS_THAN'], 'eq' => $user->lang['EQUAL_TO'], 'gt' => $user->lang['MORE_THAN']); - $s_find_count = ''; - - foreach ($find_count as $key => $value) - { - $selected = ($key == 'eq') ? ' selected="selected"' : ''; - $s_find_count .= ''; - } - - $find_time = array('lt' => $user->lang['BEFORE'], 'gt' => $user->lang['AFTER']); - $s_find_join_time = ''; - foreach ($find_time as $key => $value) - { - $s_find_join_time .= ''; - } - - $s_find_active_time = ''; - foreach ($find_time as $key => $value) - { - $s_find_active_time .= ''; - } - - $template->assign_vars(array( - 'U_ACTION' => $this->u_action, - 'S_JOINED_OPTIONS' => $s_find_join_time, - 'S_ACTIVE_OPTIONS' => $s_find_active_time, - 'S_COUNT_OPTIONS' => $s_find_count, - 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=acp_prune&field=users'), - )); - } - - /** - * Get user_ids/usernames from those being pruned - */ - function get_prune_users(&$user_ids, &$usernames) - { - global $user, $db; - - $users = request_var('users', '', true); - - if ($users) - { - $users = explode("\n", $users); - $where_sql = ' AND ' . $db->sql_in_set('username_clean', array_map('utf8_clean_string', $users)); - } - else - { - $username = request_var('username', '', true); - $email = request_var('email', ''); - - $joined_select = request_var('joined_select', 'lt'); - $active_select = request_var('active_select', 'lt'); - $count_select = request_var('count_select', 'eq'); - $joined = request_var('joined', ''); - $active = request_var('active', ''); - - $active = ($active) ? explode('-', $active) : array(); - $joined = ($joined) ? explode('-', $joined) : array(); - - if ((sizeof($active) && sizeof($active) != 3) || (sizeof($joined) && sizeof($joined) != 3)) - { - trigger_error($user->lang['WRONG_ACTIVE_JOINED_DATE'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $count = request_var('count', ''); - - $key_match = array('lt' => '<', 'gt' => '>', 'eq' => '='); - $sort_by_types = array('username', 'user_email', 'user_posts', 'user_regdate', 'user_lastvisit'); - - $where_sql = ''; - $where_sql .= ($username) ? ' AND username_clean ' . $db->sql_like_expression(str_replace('*', $db->any_char, utf8_clean_string($username))) : ''; - $where_sql .= ($email) ? ' AND user_email ' . $db->sql_like_expression(str_replace('*', $db->any_char, $email)) . ' ' : ''; - $where_sql .= (sizeof($joined)) ? " AND user_regdate " . $key_match[$joined_select] . ' ' . gmmktime(0, 0, 0, (int) $joined[1], (int) $joined[2], (int) $joined[0]) : ''; - $where_sql .= ($count !== '') ? " AND user_posts " . $key_match[$count_select] . ' ' . (int) $count . ' ' : ''; - $where_sql .= (sizeof($active)) ? " AND user_lastvisit " . $key_match[$active_select] . " " . gmmktime(0, 0, 0, (int) $active[1], (int) $active[2], (int) $active[0]) : ''; - } - - // Protect the admin, do not prune if no options are given... - if (!$where_sql) - { - return; - } - - // Get bot ids - $sql = 'SELECT user_id - FROM ' . BOTS_TABLE; - $result = $db->sql_query($sql); - - $bot_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $bot_ids[] = $row['user_id']; - } - $db->sql_freeresult($result); - - // Do not prune founder members - $sql = 'SELECT user_id, username - FROM ' . USERS_TABLE . ' - WHERE user_id <> ' . ANONYMOUS . ' - AND user_type <> ' . USER_FOUNDER . " - $where_sql"; - $result = $db->sql_query($sql); - - $where_sql = ''; - $user_ids = $usernames = array(); - - while ($row = $db->sql_fetchrow($result)) - { - // Do not prune bots and the user currently pruning. - if ($row['user_id'] != $user->data['user_id'] && !in_array($row['user_id'], $bot_ids)) - { - $user_ids[] = $row['user_id']; - $usernames[$row['user_id']] = $row['username']; - } - } - $db->sql_freeresult($result); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_ranks.php b/phpBB/includes/acp/acp_ranks.php deleted file mode 100644 index 41ed5b0fba..0000000000 --- a/phpBB/includes/acp/acp_ranks.php +++ /dev/null @@ -1,243 +0,0 @@ -add_lang('acp/posting'); - - // Set up general vars - $action = request_var('action', ''); - $action = (isset($_POST['add'])) ? 'add' : $action; - $action = (isset($_POST['save'])) ? 'save' : $action; - $rank_id = request_var('id', 0); - - $this->tpl_name = 'acp_ranks'; - $this->page_title = 'ACP_MANAGE_RANKS'; - - $form_name = 'acp_prune'; - add_form_key($form_name); - - switch ($action) - { - case 'save': - - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING); - } - $rank_title = utf8_normalize_nfc(request_var('title', '', true)); - $special_rank = request_var('special_rank', 0); - $min_posts = ($special_rank) ? 0 : request_var('min_posts', 0); - $rank_image = request_var('rank_image', ''); - - // The rank image has to be a jpg, gif or png - if ($rank_image != '' && !preg_match('#(\.gif|\.png|\.jpg|\.jpeg)$#i', $rank_image)) - { - $rank_image = ''; - } - - if (!$rank_title) - { - trigger_error($user->lang['NO_RANK_TITLE'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql_ary = array( - 'rank_title' => $rank_title, - 'rank_special' => $special_rank, - 'rank_min' => $min_posts, - 'rank_image' => htmlspecialchars_decode($rank_image) - ); - - if ($rank_id) - { - $sql = 'UPDATE ' . RANKS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " WHERE rank_id = $rank_id"; - $message = $user->lang['RANK_UPDATED']; - - add_log('admin', 'LOG_RANK_UPDATED', $rank_title); - } - else - { - $sql = 'INSERT INTO ' . RANKS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - $message = $user->lang['RANK_ADDED']; - - add_log('admin', 'LOG_RANK_ADDED', $rank_title); - } - $db->sql_query($sql); - - $cache->destroy('_ranks'); - - trigger_error($message . adm_back_link($this->u_action)); - - break; - - case 'delete': - - if (!$rank_id) - { - trigger_error($user->lang['MUST_SELECT_RANK'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if (confirm_box(true)) - { - $sql = 'SELECT rank_title - FROM ' . RANKS_TABLE . ' - WHERE rank_id = ' . $rank_id; - $result = $db->sql_query($sql); - $rank_title = (string) $db->sql_fetchfield('rank_title'); - $db->sql_freeresult($result); - - $sql = 'DELETE FROM ' . RANKS_TABLE . " - WHERE rank_id = $rank_id"; - $db->sql_query($sql); - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_rank = 0 - WHERE user_rank = $rank_id"; - $db->sql_query($sql); - - $cache->destroy('_ranks'); - - add_log('admin', 'LOG_RANK_REMOVED', $rank_title); - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'i' => $id, - 'mode' => $mode, - 'rank_id' => $rank_id, - 'action' => 'delete', - ))); - } - - break; - - case 'edit': - case 'add': - - $data = $ranks = $existing_imgs = array(); - - $sql = 'SELECT * - FROM ' . RANKS_TABLE . ' - ORDER BY rank_min ASC, rank_special ASC'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $existing_imgs[] = $row['rank_image']; - - if ($action == 'edit' && $rank_id == $row['rank_id']) - { - $ranks = $row; - } - } - $db->sql_freeresult($result); - - $imglist = filelist($phpbb_root_path . $config['ranks_path'], ''); - $edit_img = $filename_list = ''; - - foreach ($imglist as $path => $img_ary) - { - sort($img_ary); - - foreach ($img_ary as $img) - { - $img = $path . $img; - - if (!in_array($img, $existing_imgs) || $action == 'edit') - { - if ($ranks && $img == $ranks['rank_image']) - { - $selected = ' selected="selected"'; - $edit_img = $img; - } - else - { - $selected = ''; - } - - if (strlen($img) > 255) - { - continue; - } - - $filename_list .= ''; - } - } - } - - $filename_list = '' . $filename_list; - unset($existing_imgs, $imglist); - - $template->assign_vars(array( - 'S_EDIT' => true, - 'U_BACK' => $this->u_action, - 'RANKS_PATH' => $phpbb_root_path . $config['ranks_path'], - 'U_ACTION' => $this->u_action . '&id=' . $rank_id, - - 'RANK_TITLE' => (isset($ranks['rank_title'])) ? $ranks['rank_title'] : '', - 'S_FILENAME_LIST' => $filename_list, - 'RANK_IMAGE' => ($edit_img) ? $phpbb_root_path . $config['ranks_path'] . '/' . $edit_img : $phpbb_admin_path . 'images/spacer.gif', - 'S_SPECIAL_RANK' => (!isset($ranks['rank_special']) || $ranks['rank_special']) ? true : false, - 'MIN_POSTS' => (isset($ranks['rank_min']) && !$ranks['rank_special']) ? $ranks['rank_min'] : 0) - ); - - - return; - - break; - } - - $template->assign_vars(array( - 'U_ACTION' => $this->u_action) - ); - - $sql = 'SELECT * - FROM ' . RANKS_TABLE . ' - ORDER BY rank_special DESC, rank_min ASC, rank_title ASC'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $template->assign_block_vars('ranks', array( - 'S_RANK_IMAGE' => ($row['rank_image']) ? true : false, - 'S_SPECIAL_RANK' => ($row['rank_special']) ? true : false, - - 'RANK_IMAGE' => $phpbb_root_path . $config['ranks_path'] . '/' . $row['rank_image'], - 'RANK_TITLE' => $row['rank_title'], - 'MIN_POSTS' => $row['rank_min'], - - 'U_EDIT' => $this->u_action . '&action=edit&id=' . $row['rank_id'], - 'U_DELETE' => $this->u_action . '&action=delete&id=' . $row['rank_id']) - ); - } - $db->sql_freeresult($result); - - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_reasons.php b/phpBB/includes/acp/acp_reasons.php deleted file mode 100644 index 7a74c29631..0000000000 --- a/phpBB/includes/acp/acp_reasons.php +++ /dev/null @@ -1,343 +0,0 @@ -add_lang(array('mcp', 'acp/posting')); - - // Set up general vars - $action = request_var('action', ''); - $submit = (isset($_POST['submit'])) ? true : false; - $reason_id = request_var('id', 0); - - $this->tpl_name = 'acp_reasons'; - $this->page_title = 'ACP_REASONS'; - - $form_name = 'acp_reason'; - add_form_key('acp_reason'); - - $error = array(); - - switch ($action) - { - case 'add': - case 'edit': - - $reason_row = array( - 'reason_title' => utf8_normalize_nfc(request_var('reason_title', '', true)), - 'reason_description' => utf8_normalize_nfc(request_var('reason_description', '', true)), - ); - - if ($submit) - { - if (!check_form_key($form_name)) - { - $error[] = $user->lang['FORM_INVALID']; - } - // Reason specified? - if (!$reason_row['reason_title'] || !$reason_row['reason_description']) - { - $error[] = $user->lang['NO_REASON_INFO']; - } - - $check_double = ($action == 'add') ? true : false; - - if ($action == 'edit') - { - $sql = 'SELECT reason_title - FROM ' . REPORTS_REASONS_TABLE . " - WHERE reason_id = $reason_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (strtolower($row['reason_title']) == 'other' || strtolower($reason_row['reason_title']) == 'other') - { - $reason_row['reason_title'] = 'other'; - } - - if ($row['reason_title'] != $reason_row['reason_title']) - { - $check_double = true; - } - } - - // Check for same reason if adding it... - if ($check_double) - { - $sql = 'SELECT reason_id - FROM ' . REPORTS_REASONS_TABLE . " - WHERE reason_title = '" . $db->sql_escape($reason_row['reason_title']) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row || ($action == 'add' && strtolower($reason_row['reason_title']) == 'other')) - { - $error[] = $user->lang['REASON_ALREADY_EXIST']; - } - } - - if (!sizeof($error)) - { - // New reason? - if ($action == 'add') - { - // Get new order... - $sql = 'SELECT MAX(reason_order) as max_reason_order - FROM ' . REPORTS_REASONS_TABLE; - $result = $db->sql_query($sql); - $max_order = (int) $db->sql_fetchfield('max_reason_order'); - $db->sql_freeresult($result); - - $sql_ary = array( - 'reason_title' => (string) $reason_row['reason_title'], - 'reason_description' => (string) $reason_row['reason_description'], - 'reason_order' => $max_order + 1 - ); - - $db->sql_query('INSERT INTO ' . REPORTS_REASONS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); - - $log = 'ADDED'; - } - else if ($reason_id) - { - $sql_ary = array( - 'reason_title' => (string) $reason_row['reason_title'], - 'reason_description' => (string) $reason_row['reason_description'], - ); - - $db->sql_query('UPDATE ' . REPORTS_REASONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE reason_id = ' . $reason_id); - - $log = 'UPDATED'; - } - - add_log('admin', 'LOG_REASON_' . $log, $reason_row['reason_title']); - trigger_error($user->lang['REASON_' . $log] . adm_back_link($this->u_action)); - } - } - else if ($reason_id) - { - $sql = 'SELECT * - FROM ' . REPORTS_REASONS_TABLE . ' - WHERE reason_id = ' . $reason_id; - $result = $db->sql_query($sql); - $reason_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$reason_row) - { - trigger_error($user->lang['NO_REASON'] . adm_back_link($this->u_action), E_USER_WARNING); - } - } - - $l_title = ($action == 'edit') ? 'EDIT' : 'ADD'; - - $translated = false; - - // If the reason is defined within the language file, we will use the localized version, else just use the database entry... - if (isset($user->lang['report_reasons']['TITLE'][strtoupper($reason_row['reason_title'])]) && isset($user->lang['report_reasons']['DESCRIPTION'][strtoupper($reason_row['reason_title'])])) - { - $translated = true; - } - - $template->assign_vars(array( - 'L_TITLE' => $user->lang['REASON_' . $l_title], - 'U_ACTION' => $this->u_action . "&id=$reason_id&action=$action", - 'U_BACK' => $this->u_action, - 'ERROR_MSG' => (sizeof($error)) ? implode('
    ', $error) : '', - - 'REASON_TITLE' => $reason_row['reason_title'], - 'REASON_DESCRIPTION' => $reason_row['reason_description'], - - 'TRANSLATED_TITLE' => ($translated) ? $user->lang['report_reasons']['TITLE'][strtoupper($reason_row['reason_title'])] : '', - 'TRANSLATED_DESCRIPTION'=> ($translated) ? $user->lang['report_reasons']['DESCRIPTION'][strtoupper($reason_row['reason_title'])] : '', - - 'S_AVAILABLE_TITLES' => implode(', ', array_map('htmlspecialchars', array_keys($user->lang['report_reasons']['TITLE']))), - 'S_EDIT_REASON' => true, - 'S_TRANSLATED' => $translated, - 'S_ERROR' => (sizeof($error)) ? true : false, - ) - ); - - return; - break; - - case 'delete': - - $sql = 'SELECT * - FROM ' . REPORTS_REASONS_TABLE . ' - WHERE reason_id = ' . $reason_id; - $result = $db->sql_query($sql); - $reason_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$reason_row) - { - trigger_error($user->lang['NO_REASON'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if (strtolower($reason_row['reason_title']) == 'other') - { - trigger_error($user->lang['NO_REMOVE_DEFAULT_REASON'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - // Let the deletion be confirmed... - if (confirm_box(true)) - { - $sql = 'SELECT reason_id, report_text - FROM ' . REPORTS_REASONS_TABLE . " - WHERE LOWER(reason_title) = 'other'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - - $other_reason_id = (int) $row['reason_id']; - $report_text = $row['report_text']; - - $db->sql_freeresult($result); - - $report_text .= $reason_row['reason_description'] . "\n\n"; - - $sql = 'UPDATE ' . REPORTS_TABLE . ' - SET reason_id = ' . $other_reason_id . ", report_text = '" . $db->sql_escape($report_text) . "' - WHERE reason_id = $reason_id"; - $db->sql_query($sql); - - $db->sql_query('DELETE FROM ' . REPORTS_REASONS_TABLE . ' WHERE reason_id = ' . $reason_id); - - add_log('admin', 'LOG_REASON_REMOVED', $reason_row['reason_title']); - trigger_error($user->lang['REASON_REMOVED'] . adm_back_link($this->u_action)); - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'i' => $id, - 'mode' => $mode, - 'action' => $action, - 'id' => $reason_id)) - ); - } - - break; - - case 'move_up': - case 'move_down': - - $order = request_var('order', 0); - $order_total = $order * 2 + (($action == 'move_up') ? -1 : 1); - - $sql = 'UPDATE ' . REPORTS_REASONS_TABLE . ' - SET reason_order = ' . $order_total . ' - reason_order - WHERE reason_order IN (' . $order . ', ' . (($action == 'move_up') ? $order - 1 : $order + 1) . ')'; - $db->sql_query($sql); - - break; - } - - // By default, check that order is valid and fix it if necessary - $sql = 'SELECT reason_id, reason_order - FROM ' . REPORTS_REASONS_TABLE . ' - ORDER BY reason_order'; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - $order = 0; - do - { - ++$order; - - if ($row['reason_order'] != $order) - { - $sql = 'UPDATE ' . REPORTS_REASONS_TABLE . " - SET reason_order = $order - WHERE reason_id = {$row['reason_id']}"; - $db->sql_query($sql); - } - } - while ($row = $db->sql_fetchrow($result)); - } - $db->sql_freeresult($result); - - $template->assign_vars(array( - 'U_ACTION' => $this->u_action, - ) - ); - - // Reason count - $sql = 'SELECT reason_id, COUNT(reason_id) AS reason_count - FROM ' . REPORTS_TABLE . ' - GROUP BY reason_id'; - $result = $db->sql_query($sql); - - $reason_count = array(); - while ($row = $db->sql_fetchrow($result)) - { - $reason_count[$row['reason_id']] = $row['reason_count']; - } - $db->sql_freeresult($result); - - $sql = 'SELECT * - FROM ' . REPORTS_REASONS_TABLE . ' - ORDER BY reason_order ASC'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $translated = false; - $other_reason = ($row['reason_title'] == 'other') ? true : false; - - // If the reason is defined within the language file, we will use the localized version, else just use the database entry... - if (isset($user->lang['report_reasons']['TITLE'][strtoupper($row['reason_title'])]) && isset($user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])])) - { - $row['reason_description'] = $user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])]; - $row['reason_title'] = $user->lang['report_reasons']['TITLE'][strtoupper($row['reason_title'])]; - - $translated = true; - } - - $template->assign_block_vars('reasons', array( - 'REASON_TITLE' => $row['reason_title'], - 'REASON_DESCRIPTION' => $row['reason_description'], - 'REASON_COUNT' => (isset($reason_count[$row['reason_id']])) ? $reason_count[$row['reason_id']] : 0, - - 'S_TRANSLATED' => $translated, - 'S_OTHER_REASON' => $other_reason, - - 'U_EDIT' => $this->u_action . '&action=edit&id=' . $row['reason_id'], - 'U_DELETE' => (!$other_reason) ? $this->u_action . '&action=delete&id=' . $row['reason_id'] : '', - 'U_MOVE_UP' => $this->u_action . '&action=move_up&order=' . $row['reason_order'], - 'U_MOVE_DOWN' => $this->u_action . '&action=move_down&order=' . $row['reason_order']) - ); - } - $db->sql_freeresult($result); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php deleted file mode 100644 index 67a3c6bf6f..0000000000 --- a/phpBB/includes/acp/acp_search.php +++ /dev/null @@ -1,607 +0,0 @@ -add_lang('acp/search'); - - // For some this may be of help... - @ini_set('memory_limit', '128M'); - - switch ($mode) - { - case 'settings': - $this->settings($id, $mode); - break; - - case 'index': - $this->index($id, $mode); - break; - } - } - - function settings($id, $mode) - { - global $db, $user, $auth, $template, $cache; - global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; - - $submit = (isset($_POST['submit'])) ? true : false; - - $search_types = $this->get_search_types(); - - $settings = array( - 'search_interval' => 'float', - 'search_anonymous_interval' => 'float', - 'load_search' => 'bool', - 'limit_search_load' => 'float', - 'min_search_author_chars' => 'integer', - 'search_store_results' => 'integer', - ); - - $search = null; - $error = false; - $search_options = ''; - foreach ($search_types as $type) - { - if ($this->init_search($type, $search, $error)) - { - continue; - } - - $name = ucfirst(strtolower(str_replace('_', ' ', $type))); - $selected = ($config['search_type'] == $type) ? ' selected="selected"' : ''; - $search_options .= ''; - - if (method_exists($search, 'acp')) - { - $vars = $search->acp(); - - if (!$submit) - { - $template->assign_block_vars('backend', array( - 'NAME' => $name, - 'SETTINGS' => $vars['tpl']) - ); - } - else if (is_array($vars['config'])) - { - $settings = array_merge($settings, $vars['config']); - } - } - } - unset($search); - unset($error); - - $cfg_array = (isset($_REQUEST['config'])) ? request_var('config', array('' => ''), true) : array(); - $updated = request_var('updated', false); - - foreach ($settings as $config_name => $var_type) - { - if (!isset($cfg_array[$config_name])) - { - continue; - } - - // e.g. integer:4:12 (min 4, max 12) - $var_type = explode(':', $var_type); - - $config_value = $cfg_array[$config_name]; - settype($config_value, $var_type[0]); - - if (isset($var_type[1])) - { - $config_value = max($var_type[1], $config_value); - } - - if (isset($var_type[2])) - { - $config_value = min($var_type[2], $config_value); - } - - // only change config if anything was actually changed - if ($submit && ($config[$config_name] != $config_value)) - { - set_config($config_name, $config_value); - $updated = true; - } - } - - if ($submit) - { - $extra_message = ''; - if ($updated) - { - add_log('admin', 'LOG_CONFIG_SEARCH'); - } - - if (isset($cfg_array['search_type']) && in_array($cfg_array['search_type'], $search_types, true) && ($cfg_array['search_type'] != $config['search_type'])) - { - $search = null; - $error = false; - - if (!$this->init_search($cfg_array['search_type'], $search, $error)) - { - if (confirm_box(true)) - { - if (!method_exists($search, 'init') || !($error = $search->init())) - { - set_config('search_type', $cfg_array['search_type']); - - if (!$updated) - { - add_log('admin', 'LOG_CONFIG_SEARCH'); - } - $extra_message = '
    ' . $user->lang['SWITCHED_SEARCH_BACKEND'] . '
    » ' . $user->lang['GO_TO_SEARCH_INDEX'] . ''; - } - else - { - trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING); - } - } - else - { - confirm_box(false, $user->lang['CONFIRM_SEARCH_BACKEND'], build_hidden_fields(array( - 'i' => $id, - 'mode' => $mode, - 'submit' => true, - 'updated' => $updated, - 'config' => array('search_type' => $cfg_array['search_type']), - ))); - } - } - else - { - trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING); - } - } - - trigger_error($user->lang['CONFIG_UPDATED'] . $extra_message . adm_back_link($this->u_action)); - } - unset($cfg_array); - - $this->tpl_name = 'acp_search'; - $this->page_title = 'ACP_SEARCH_SETTINGS'; - - $template->assign_vars(array( - 'LIMIT_SEARCH_LOAD' => (float) $config['limit_search_load'], - 'MIN_SEARCH_AUTHOR_CHARS' => (int) $config['min_search_author_chars'], - 'SEARCH_INTERVAL' => (float) $config['search_interval'], - 'SEARCH_GUEST_INTERVAL' => (float) $config['search_anonymous_interval'], - 'SEARCH_STORE_RESULTS' => (int) $config['search_store_results'], - - 'S_SEARCH_TYPES' => $search_options, - 'S_YES_SEARCH' => (bool) $config['load_search'], - 'S_SETTINGS' => true, - - 'U_ACTION' => $this->u_action) - ); - } - - function index($id, $mode) - { - global $db, $user, $auth, $template, $cache; - global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; - - if (isset($_REQUEST['action']) && is_array($_REQUEST['action'])) - { - $action = request_var('action', array('' => false)); - $action = key($action); - } - else - { - $action = request_var('action', ''); - } - $this->state = explode(',', $config['search_indexing_state']); - - if (isset($_POST['cancel'])) - { - $action = ''; - $this->state = array(); - $this->save_state(); - } - - if ($action) - { - switch ($action) - { - case 'progress_bar': - $type = request_var('type', ''); - $this->display_progress_bar($type); - break; - - case 'delete': - $this->state[1] = 'delete'; - break; - - case 'create': - $this->state[1] = 'create'; - break; - - default: - trigger_error('NO_ACTION', E_USER_ERROR); - break; - } - - if (empty($this->state[0])) - { - $this->state[0] = request_var('search_type', ''); - } - - $this->search = null; - $error = false; - if ($this->init_search($this->state[0], $this->search, $error)) - { - trigger_error($error . adm_back_link($this->u_action), E_USER_WARNING); - } - $name = ucfirst(strtolower(str_replace('_', ' ', $this->state[0]))); - - $action = &$this->state[1]; - - $this->max_post_id = $this->get_max_post_id(); - - $post_counter = (isset($this->state[2])) ? $this->state[2] : 0; - $this->state[2] = &$post_counter; - $this->save_state(); - - switch ($action) - { - case 'delete': - if (method_exists($this->search, 'delete_index')) - { - // pass a reference to myself so the $search object can make use of save_state() and attributes - if ($error = $this->search->delete_index($this, append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&mode=$mode&action=delete", false))) - { - $this->state = array(''); - $this->save_state(); - trigger_error($error . adm_back_link($this->u_action) . $this->close_popup_js(), E_USER_WARNING); - } - } - else - { - $starttime = explode(' ', microtime()); - $starttime = $starttime[1] + $starttime[0]; - $row_count = 0; - while (still_on_time() && $post_counter <= $this->max_post_id) - { - $sql = 'SELECT post_id, poster_id, forum_id - FROM ' . POSTS_TABLE . ' - WHERE post_id >= ' . (int) ($post_counter + 1) . ' - AND post_id <= ' . (int) ($post_counter + $this->batch_size); - $result = $db->sql_query($sql); - - $ids = $posters = $forum_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $ids[] = $row['post_id']; - $posters[] = $row['poster_id']; - $forum_ids[] = $row['forum_id']; - } - $db->sql_freeresult($result); - $row_count += sizeof($ids); - - if (sizeof($ids)) - { - $this->search->index_remove($ids, $posters, $forum_ids); - } - - $post_counter += $this->batch_size; - } - // save the current state - $this->save_state(); - - if ($post_counter <= $this->max_post_id) - { - $mtime = explode(' ', microtime()); - $totaltime = $mtime[0] + $mtime[1] - $starttime; - $rows_per_second = $row_count / $totaltime; - meta_refresh(1, append_sid($this->u_action . '&action=delete&skip_rows=' . $post_counter)); - trigger_error(sprintf($user->lang['SEARCH_INDEX_DELETE_REDIRECT'], $post_counter, $row_count, $rows_per_second)); - } - } - - $this->search->tidy(); - - $this->state = array(''); - $this->save_state(); - - add_log('admin', 'LOG_SEARCH_INDEX_REMOVED', $name); - trigger_error($user->lang['SEARCH_INDEX_REMOVED'] . adm_back_link($this->u_action) . $this->close_popup_js()); - break; - - case 'create': - if (method_exists($this->search, 'create_index')) - { - // pass a reference to acp_search so the $search object can make use of save_state() and attributes - if ($error = $this->search->create_index($this, append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&mode=$mode&action=create", false))) - { - $this->state = array(''); - $this->save_state(); - trigger_error($error . adm_back_link($this->u_action) . $this->close_popup_js(), E_USER_WARNING); - } - } - else - { - $sql = 'SELECT forum_id, enable_indexing - FROM ' . FORUMS_TABLE; - $result = $db->sql_query($sql, 3600); - - while ($row = $db->sql_fetchrow($result)) - { - $forums[$row['forum_id']] = (bool) $row['enable_indexing']; - } - $db->sql_freeresult($result); - - $starttime = explode(' ', microtime()); - $starttime = $starttime[1] + $starttime[0]; - $row_count = 0; - while (still_on_time() && $post_counter <= $this->max_post_id) - { - $sql = 'SELECT post_id, post_subject, post_text, poster_id, forum_id - FROM ' . POSTS_TABLE . ' - WHERE post_id >= ' . (int) ($post_counter + 1) . ' - AND post_id <= ' . (int) ($post_counter + $this->batch_size); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - // Indexing enabled for this forum or global announcement? - // Global announcements get indexed by default. - if (!$row['forum_id'] || (isset($forums[$row['forum_id']]) && $forums[$row['forum_id']])) - { - $this->search->index('post', $row['post_id'], $row['post_text'], $row['post_subject'], $row['poster_id'], $row['forum_id']); - } - $row_count++; - } - $db->sql_freeresult($result); - - $post_counter += $this->batch_size; - } - // save the current state - $this->save_state(); - - // pretend the number of posts was as big as the number of ids we indexed so far - // just an estimation as it includes deleted posts - $num_posts = $config['num_posts']; - $config['num_posts'] = min($config['num_posts'], $post_counter); - $this->search->tidy(); - $config['num_posts'] = $num_posts; - - if ($post_counter <= $this->max_post_id) - { - $mtime = explode(' ', microtime()); - $totaltime = $mtime[0] + $mtime[1] - $starttime; - $rows_per_second = $row_count / $totaltime; - meta_refresh(1, append_sid($this->u_action . '&action=create&skip_rows=' . $post_counter)); - trigger_error(sprintf($user->lang['SEARCH_INDEX_CREATE_REDIRECT'], $post_counter, $row_count, $rows_per_second)); - } - } - - $this->search->tidy(); - - $this->state = array(''); - $this->save_state(); - - add_log('admin', 'LOG_SEARCH_INDEX_CREATED', $name); - trigger_error($user->lang['SEARCH_INDEX_CREATED'] . adm_back_link($this->u_action) . $this->close_popup_js()); - break; - } - } - - $search_types = $this->get_search_types(); - - $search = null; - $error = false; - $search_options = ''; - foreach ($search_types as $type) - { - if ($this->init_search($type, $search, $error) || !method_exists($search, 'index_created')) - { - continue; - } - - $name = ucfirst(strtolower(str_replace('_', ' ', $type))); - - $data = array(); - if (method_exists($search, 'index_stats')) - { - $data = $search->index_stats(); - } - - $statistics = array(); - foreach ($data as $statistic => $value) - { - $n = sizeof($statistics); - if ($n && sizeof($statistics[$n - 1]) < 3) - { - $statistics[$n - 1] += array('statistic_2' => $statistic, 'value_2' => $value); - } - else - { - $statistics[] = array('statistic_1' => $statistic, 'value_1' => $value); - } - } - - $template->assign_block_vars('backend', array( - 'L_NAME' => $name, - 'NAME' => $type, - - 'S_ACTIVE' => ($type == $config['search_type']) ? true : false, - 'S_HIDDEN_FIELDS' => build_hidden_fields(array('search_type' => $type)), - 'S_INDEXED' => (bool) $search->index_created(), - 'S_STATS' => (bool) sizeof($statistics)) - ); - - foreach ($statistics as $statistic) - { - $template->assign_block_vars('backend.data', array( - 'STATISTIC_1' => $statistic['statistic_1'], - 'VALUE_1' => $statistic['value_1'], - 'STATISTIC_2' => (isset($statistic['statistic_2'])) ? $statistic['statistic_2'] : '', - 'VALUE_2' => (isset($statistic['value_2'])) ? $statistic['value_2'] : '') - ); - } - } - unset($search); - unset($error); - unset($statistics); - unset($data); - - $this->tpl_name = 'acp_search'; - $this->page_title = 'ACP_SEARCH_INDEX'; - - $template->assign_vars(array( - 'S_INDEX' => true, - 'U_ACTION' => $this->u_action, - 'U_PROGRESS_BAR' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&mode=$mode&action=progress_bar"), - 'UA_PROGRESS_BAR' => addslashes(append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&mode=$mode&action=progress_bar")), - )); - - if (isset($this->state[1])) - { - $template->assign_vars(array( - 'S_CONTINUE_INDEXING' => $this->state[1], - 'U_CONTINUE_INDEXING' => $this->u_action . '&action=' . $this->state[1], - 'L_CONTINUE' => ($this->state[1] == 'create') ? $user->lang['CONTINUE_INDEXING'] : $user->lang['CONTINUE_DELETING_INDEX'], - 'L_CONTINUE_EXPLAIN' => ($this->state[1] == 'create') ? $user->lang['CONTINUE_INDEXING_EXPLAIN'] : $user->lang['CONTINUE_DELETING_INDEX_EXPLAIN']) - ); - } - } - - function display_progress_bar($type) - { - global $template, $user; - - $l_type = ($type == 'create') ? 'INDEXING_IN_PROGRESS' : 'DELETING_INDEX_IN_PROGRESS'; - - adm_page_header($user->lang[$l_type]); - - $template->set_filenames(array( - 'body' => 'progress_bar.html') - ); - - $template->assign_vars(array( - 'L_PROGRESS' => $user->lang[$l_type], - 'L_PROGRESS_EXPLAIN' => $user->lang[$l_type . '_EXPLAIN']) - ); - - adm_page_footer(); - } - - function close_popup_js() - { - return "\n"; - } - - function get_search_types() - { - global $phpbb_root_path, $phpEx; - - $search_types = array(); - - $dp = @opendir($phpbb_root_path . 'includes/search'); - - if ($dp) - { - while (($file = readdir($dp)) !== false) - { - if ((preg_match('#\.' . $phpEx . '$#', $file)) && ($file != "search.$phpEx")) - { - $search_types[] = preg_replace('#^(.*?)\.' . $phpEx . '$#', '\1', $file); - } - } - closedir($dp); - - sort($search_types); - } - - return $search_types; - } - - function get_max_post_id() - { - global $db; - - $sql = 'SELECT MAX(post_id) as max_post_id - FROM '. POSTS_TABLE; - $result = $db->sql_query($sql); - $max_post_id = (int) $db->sql_fetchfield('max_post_id'); - $db->sql_freeresult($result); - - return $max_post_id; - } - - function save_state($state = false) - { - if ($state) - { - $this->state = $state; - } - - ksort($this->state); - - set_config('search_indexing_state', implode(',', $this->state)); - } - - /** - * Initialises a search backend object - * - * @return false if no error occurred else an error message - */ - function init_search($type, &$search, &$error) - { - global $phpbb_root_path, $phpEx, $user; - - if (!preg_match('#^\w+$#', $type) || !file_exists("{$phpbb_root_path}includes/search/$type.$phpEx")) - { - $error = $user->lang['NO_SUCH_SEARCH_MODULE']; - return $error; - } - - include_once("{$phpbb_root_path}includes/search/$type.$phpEx"); - - if (!class_exists($type)) - { - $error = $user->lang['NO_SUCH_SEARCH_MODULE']; - return $error; - } - - $error = false; - $search = new $type($error); - - return $error; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php deleted file mode 100644 index 2f2649575b..0000000000 --- a/phpBB/includes/acp/acp_styles.php +++ /dev/null @@ -1,3258 +0,0 @@ -set(0); - $bitfield->set(3); - $bitfield->set(8); - $bitfield->set(9); - $bitfield->set(11); - $bitfield->set(12); - define('TEMPLATE_BITFIELD', $bitfield->get_base64()); - unset($bitfield); - - $user->add_lang('acp/styles'); - - $this->tpl_name = 'acp_styles'; - $this->page_title = 'ACP_CAT_STYLES'; - - $action = request_var('action', ''); - $action = (isset($_POST['add'])) ? 'add' : $action; - $style_id = request_var('id', 0); - - // Fill the configuration variables - $this->style_cfg = $this->template_cfg = $this->theme_cfg = $this->imageset_cfg = ' -# -# phpBB {MODE} configuration file -# -# @package phpBB3 -# @copyright (c) 2005 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License -# -# -# At the left is the name, please do not change this -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# -# - -# General Information about this {MODE} -name = {NAME} -copyright = {COPYRIGHT} -version = {VERSION} -'; - - $this->theme_cfg .= ' -# Some configuration options - -# -# You have to turn this option on if you want to use the -# path template variables ({T_IMAGESET_PATH} for example) within -# your css file. -# This is mostly the case if you want to use language specific -# images within your css file. -# -parse_css_file = {PARSE_CSS_FILE} -'; - - $this->imageset_keys = array( - 'logos' => array( - 'site_logo', - ), - 'buttons' => array( - 'icon_back_top', 'icon_contact_aim', 'icon_contact_email', 'icon_contact_icq', 'icon_contact_jabber', 'icon_contact_msnm', 'icon_contact_pm', 'icon_contact_yahoo', 'icon_contact_www', 'icon_post_delete', 'icon_post_edit', 'icon_post_info', 'icon_post_quote', 'icon_post_report', 'icon_user_online', 'icon_user_offline', 'icon_user_profile', 'icon_user_search', 'icon_user_warn', 'button_pm_forward', 'button_pm_new', 'button_pm_reply', 'button_topic_locked', 'button_topic_new', 'button_topic_reply', - ), - 'icons' => array( - 'icon_post_target', 'icon_post_target_unread', 'icon_topic_attach', 'icon_topic_latest', 'icon_topic_newest', 'icon_topic_reported', 'icon_topic_unapproved', 'icon_friend', 'icon_foe', - ), - 'forums' => array( - 'forum_link', 'forum_read', 'forum_read_locked', 'forum_read_subforum', 'forum_unread', 'forum_unread_locked', 'forum_unread_subforum', 'subforum_read', 'subforum_unread' - ), - 'folders' => array( - 'topic_moved', 'topic_read', 'topic_read_mine', 'topic_read_hot', 'topic_read_hot_mine', 'topic_read_locked', 'topic_read_locked_mine', 'topic_unread', 'topic_unread_mine', 'topic_unread_hot', 'topic_unread_hot_mine', 'topic_unread_locked', 'topic_unread_locked_mine', 'sticky_read', 'sticky_read_mine', 'sticky_read_locked', 'sticky_read_locked_mine', 'sticky_unread', 'sticky_unread_mine', 'sticky_unread_locked', 'sticky_unread_locked_mine', 'announce_read', 'announce_read_mine', 'announce_read_locked', 'announce_read_locked_mine', 'announce_unread', 'announce_unread_mine', 'announce_unread_locked', 'announce_unread_locked_mine', 'global_read', 'global_read_mine', 'global_read_locked', 'global_read_locked_mine', 'global_unread', 'global_unread_mine', 'global_unread_locked', 'global_unread_locked_mine', 'pm_read', 'pm_unread', - ), - 'polls' => array( - 'poll_left', 'poll_center', 'poll_right', - ), - 'ui' => array( - 'upload_bar', - ), - 'user' => array( - 'user_icon1', 'user_icon2', 'user_icon3', 'user_icon4', 'user_icon5', 'user_icon6', 'user_icon7', 'user_icon8', 'user_icon9', 'user_icon10', - ), - ); - - // Execute overall actions - switch ($action) - { - case 'delete': - if ($style_id) - { - $this->remove($mode, $style_id); - return; - } - break; - - case 'export': - if ($style_id) - { - $this->export($mode, $style_id); - return; - } - break; - - case 'install': - $this->install($mode); - return; - break; - - case 'add': - $this->add($mode); - return; - break; - - case 'details': - if ($style_id) - { - $this->details($mode, $style_id); - return; - } - break; - - case 'edit': - if ($style_id) - { - switch ($mode) - { - case 'imageset': - return $this->edit_imageset($style_id); - case 'template': - return $this->edit_template($style_id); - case 'theme': - return $this->edit_theme($style_id); - } - } - break; - - case 'cache': - if ($style_id) - { - switch ($mode) - { - case 'template': - return $this->template_cache($style_id); - } - } - break; - } - - switch ($mode) - { - case 'style': - - switch ($action) - { - case 'activate': - case 'deactivate': - - if ($style_id == $config['default_style']) - { - trigger_error($user->lang['DEACTIVATE_DEFAULT'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = 'UPDATE ' . STYLES_TABLE . ' - SET style_active = ' . (($action == 'activate') ? 1 : 0) . ' - WHERE style_id = ' . $style_id; - $db->sql_query($sql); - - // Set style to default for any member using deactivated style - if ($action == 'deactivate') - { - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_style = ' . $config['default_style'] . " - WHERE user_style = $style_id"; - $db->sql_query($sql); - - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET forum_style = 0 - WHERE forum_style = ' . $style_id; - $db->sql_query($sql); - } - break; - } - - $this->frontend('style', array('details'), array('export', 'delete')); - break; - - case 'template': - - switch ($action) - { - // Refresh template data stored in db and clear cache - case 'refresh': - - $sql = 'SELECT * - FROM ' . STYLES_TEMPLATE_TABLE . " - WHERE template_id = $style_id"; - $result = $db->sql_query($sql); - $template_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$template_row) - { - trigger_error($user->lang['NO_TEMPLATE'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if (confirm_box(true)) - { - $template_refreshed = ''; - - // Only refresh database if the template is stored in the database - if ($template_row['template_storedb'] && file_exists("{$phpbb_root_path}styles/{$template_row['template_path']}/template/")) - { - $filelist = array('' => array()); - - $sql = 'SELECT template_filename, template_mtime - FROM ' . STYLES_TEMPLATE_DATA_TABLE . " - WHERE template_id = $style_id"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { -// if (@filemtime("{$phpbb_root_path}styles/{$template_row['template_path']}/template/" . $row['template_filename']) > $row['template_mtime']) -// { - // get folder info from the filename - if (($slash_pos = strrpos($row['template_filename'], '/')) === false) - { - $filelist[''][] = $row['template_filename']; - } - else - { - $filelist[substr($row['template_filename'], 0, $slash_pos + 1)][] = substr($row['template_filename'], $slash_pos + 1, strlen($row['template_filename']) - $slash_pos - 1); - } -// } - } - $db->sql_freeresult($result); - - $this->store_templates('update', $style_id, $template_row['template_path'], $filelist); - unset($filelist); - - $template_refreshed = $user->lang['TEMPLATE_REFRESHED'] . '
    '; - add_log('admin', 'LOG_TEMPLATE_REFRESHED', $template_row['template_name']); - } - - $this->clear_template_cache($template_row); - - trigger_error($template_refreshed . $user->lang['TEMPLATE_CACHE_CLEARED'] . adm_back_link($this->u_action)); - } - else - { - confirm_box(false, ($template_row['template_storedb']) ? $user->lang['CONFIRM_TEMPLATE_REFRESH'] : $user->lang['CONFIRM_TEMPLATE_CLEAR_CACHE'], build_hidden_fields(array( - 'i' => $id, - 'mode' => $mode, - 'action' => $action, - 'id' => $style_id - ))); - } - - break; - } - - $this->frontend('template', array('edit', 'cache', 'details'), array('refresh', 'export', 'delete')); - break; - - case 'theme': - - switch ($action) - { - // Refresh theme data stored in the database - case 'refresh': - - $sql = 'SELECT * - FROM ' . STYLES_THEME_TABLE . " - WHERE theme_id = $style_id"; - $result = $db->sql_query($sql); - $theme_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$theme_row) - { - trigger_error($user->lang['NO_THEME'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if (!$theme_row['theme_storedb']) - { - trigger_error($user->lang['THEME_ERR_REFRESH_FS'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if (confirm_box(true)) - { - if ($theme_row['theme_storedb'] && file_exists("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/stylesheet.css")) - { - // Save CSS contents - $sql_ary = array( - 'theme_mtime' => (int) filemtime("{$phpbb_root_path}styles/{$theme_row['theme_path']}/theme/stylesheet.css"), - 'theme_data' => $this->db_theme_data($theme_row) - ); - - $sql = 'UPDATE ' . STYLES_THEME_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " - WHERE theme_id = $style_id"; - $db->sql_query($sql); - - $cache->destroy('sql', STYLES_THEME_TABLE); - - add_log('admin', 'LOG_THEME_REFRESHED', $theme_row['theme_name']); - trigger_error($user->lang['THEME_REFRESHED'] . adm_back_link($this->u_action)); - } - } - else - { - confirm_box(false, $user->lang['CONFIRM_THEME_REFRESH'], build_hidden_fields(array( - 'i' => $id, - 'mode' => $mode, - 'action' => $action, - 'id' => $style_id - ))); - } - break; - } - - $this->frontend('theme', array('edit', 'details'), array('refresh', 'export', 'delete')); - break; - - case 'imageset': - - switch ($action) - { - case 'refresh': - - $sql = 'SELECT * - FROM ' . STYLES_IMAGESET_TABLE . " - WHERE imageset_id = $style_id"; - $result = $db->sql_query($sql); - $imageset_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$imageset_row) - { - trigger_error($user->lang['NO_IMAGESET'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if (confirm_box(true)) - { - $sql_ary = array(); - - $imageset_definitions = array(); - foreach ($this->imageset_keys as $topic => $key_array) - { - $imageset_definitions = array_merge($imageset_definitions, $key_array); - } - - $cfg_data_imageset = parse_cfg_file("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/imageset.cfg"); - - $db->sql_transaction('begin'); - - $sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . ' - WHERE imageset_id = ' . $style_id; - $result = $db->sql_query($sql); - - foreach ($cfg_data_imageset as $image_name => $value) - { - if (strpos($value, '*') !== false) - { - if (substr($value, -1, 1) === '*') - { - list($image_filename, $image_height) = explode('*', $value); - $image_width = 0; - } - else - { - list($image_filename, $image_height, $image_width) = explode('*', $value); - } - } - else - { - $image_filename = $value; - $image_height = $image_width = 0; - } - - if (strpos($image_name, 'img_') === 0 && $image_filename) - { - $image_name = substr($image_name, 4); - if (in_array($image_name, $imageset_definitions)) - { - $sql_ary[] = array( - 'image_name' => (string) $image_name, - 'image_filename' => (string) $image_filename, - 'image_height' => (int) $image_height, - 'image_width' => (int) $image_width, - 'imageset_id' => (int) $style_id, - 'image_lang' => '', - ); - } - } - } - - $sql = 'SELECT lang_dir - FROM ' . LANG_TABLE; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if (@file_exists("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$row['lang_dir']}/imageset.cfg")) - { - $cfg_data_imageset_data = parse_cfg_file("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$row['lang_dir']}/imageset.cfg"); - foreach ($cfg_data_imageset_data as $image_name => $value) - { - if (strpos($value, '*') !== false) - { - if (substr($value, -1, 1) === '*') - { - list($image_filename, $image_height) = explode('*', $value); - $image_width = 0; - } - else - { - list($image_filename, $image_height, $image_width) = explode('*', $value); - } - } - else - { - $image_filename = $value; - $image_height = $image_width = 0; - } - - if (strpos($image_name, 'img_') === 0 && $image_filename) - { - $image_name = substr($image_name, 4); - if (in_array($image_name, $imageset_definitions)) - { - $sql_ary[] = array( - 'image_name' => (string) $image_name, - 'image_filename' => (string) $image_filename, - 'image_height' => (int) $image_height, - 'image_width' => (int) $image_width, - 'imageset_id' => (int) $style_id, - 'image_lang' => (string) $row['lang_dir'], - ); - } - } - } - } - } - $db->sql_freeresult($result); - - $db->sql_multi_insert(STYLES_IMAGESET_DATA_TABLE, $sql_ary); - - $db->sql_transaction('commit'); - - $cache->destroy('sql', STYLES_IMAGESET_DATA_TABLE); - - add_log('admin', 'LOG_IMAGESET_REFRESHED', $imageset_row['imageset_name']); - trigger_error($user->lang['IMAGESET_REFRESHED'] . adm_back_link($this->u_action)); - } - else - { - confirm_box(false, $user->lang['CONFIRM_IMAGESET_REFRESH'], build_hidden_fields(array( - 'i' => $id, - 'mode' => $mode, - 'action' => $action, - 'id' => $style_id - ))); - } - break; - } - - $this->frontend('imageset', array('edit', 'details'), array('refresh', 'export', 'delete')); - break; - } - } - - /** - * Build Frontend with supplied options - */ - function frontend($mode, $options, $actions) - { - global $user, $template, $db, $config, $phpbb_root_path, $phpEx; - - $sql_from = ''; - $style_count = array(); - - switch ($mode) - { - case 'style': - $sql_from = STYLES_TABLE; - - $sql = 'SELECT user_style, COUNT(user_style) AS style_count - FROM ' . USERS_TABLE . ' - GROUP BY user_style'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $style_count[$row['user_style']] = $row['style_count']; - } - $db->sql_freeresult($result); - - break; - - case 'template': - $sql_from = STYLES_TEMPLATE_TABLE; - break; - - case 'theme': - $sql_from = STYLES_THEME_TABLE; - break; - - case 'imageset': - $sql_from = STYLES_IMAGESET_TABLE; - break; - } - - $l_prefix = strtoupper($mode); - - $this->page_title = 'ACP_' . $l_prefix . 'S'; - - $template->assign_vars(array( - 'S_FRONTEND' => true, - 'S_STYLE' => ($mode == 'style') ? true : false, - - 'L_TITLE' => $user->lang[$this->page_title], - 'L_EXPLAIN' => $user->lang[$this->page_title . '_EXPLAIN'], - 'L_NAME' => $user->lang[$l_prefix . '_NAME'], - 'L_INSTALLED' => $user->lang['INSTALLED_' . $l_prefix], - 'L_UNINSTALLED' => $user->lang['UNINSTALLED_' . $l_prefix], - 'L_NO_UNINSTALLED' => $user->lang['NO_UNINSTALLED_' . $l_prefix], - 'L_CREATE' => $user->lang['CREATE_' . $l_prefix], - - 'U_ACTION' => $this->u_action, - ) - ); - - $sql = "SELECT * - FROM $sql_from"; - $result = $db->sql_query($sql); - - $installed = array(); - - $basis_options = ''; - while ($row = $db->sql_fetchrow($result)) - { - $installed[] = $row[$mode . '_name']; - $basis_options .= ''; - - $stylevis = ($mode == 'style' && !$row['style_active']) ? 'activate' : 'deactivate'; - - $s_options = array(); - foreach ($options as $option) - { - $s_options[] = '' . $user->lang[strtoupper($option)] . ''; - } - - $s_actions = array(); - foreach ($actions as $option) - { - $s_actions[] = '' . $user->lang[strtoupper($option)] . ''; - } - - $template->assign_block_vars('installed', array( - 'S_DEFAULT_STYLE' => ($mode == 'style' && $row['style_id'] == $config['default_style']) ? true : false, - 'U_EDIT' => $this->u_action . '&action=' . (($mode == 'style') ? 'details' : 'edit') . '&id=' . $row[$mode . '_id'], - 'U_STYLE_ACT_DEACT' => $this->u_action . '&action=' . $stylevis . '&id=' . $row[$mode . '_id'], - 'L_STYLE_ACT_DEACT' => $user->lang['STYLE_' . strtoupper($stylevis)], - 'S_OPTIONS' => implode(' | ', $s_options), - 'S_ACTIONS' => implode(' | ', $s_actions), - 'U_PREVIEW' => ($mode == 'style') ? append_sid("{$phpbb_root_path}index.$phpEx", "$mode=" . $row[$mode . '_id']) : '', - - 'NAME' => $row[$mode . '_name'], - 'STYLE_COUNT' => ($mode == 'style' && isset($style_count[$row['style_id']])) ? $style_count[$row['style_id']] : 0, - ) - ); - } - $db->sql_freeresult($result); - - // Grab uninstalled items - $new_ary = $cfg = array(); - - $dp = @opendir("{$phpbb_root_path}styles"); - - if ($dp) - { - while (($file = readdir($dp)) !== false) - { - $subpath = ($mode != 'style') ? "$mode/" : ''; - if ($file[0] != '.' && file_exists("{$phpbb_root_path}styles/$file/$subpath$mode.cfg")) - { - if ($cfg = file("{$phpbb_root_path}styles/$file/$subpath$mode.cfg")) - { - $items = parse_cfg_file('', $cfg); - $name = (isset($items['name'])) ? trim($items['name']) : false; - - if ($name && !in_array($name, $installed)) - { - $new_ary[] = array( - 'path' => $file, - 'name' => $name, - 'copyright' => $items['copyright'], - ); - } - } - } - } - closedir($dp); - } - - unset($installed); - - if (sizeof($new_ary)) - { - foreach ($new_ary as $cfg) - { - $template->assign_block_vars('uninstalled', array( - 'NAME' => $cfg['name'], - 'COPYRIGHT' => $cfg['copyright'], - 'U_INSTALL' => $this->u_action . '&action=install&path=' . urlencode($cfg['path'])) - ); - } - } - unset($new_ary); - - $template->assign_vars(array( - 'S_BASIS_OPTIONS' => $basis_options) - ); - - } - - /** - * Provides a template editor which allows saving changes to template files on the filesystem or in the database. - * - * @param int $template_id specifies which template set is being edited - */ - function edit_template($template_id) - { - global $phpbb_root_path, $phpEx, $config, $db, $cache, $user, $template, $safe_mode; - - $this->page_title = 'EDIT_TEMPLATE'; - - $filelist = $filelist_cats = array(); - - $template_data = utf8_normalize_nfc(request_var('template_data', '', true)); - $template_data = htmlspecialchars_decode($template_data); - $template_file = utf8_normalize_nfc(request_var('template_file', '', true)); - $text_rows = max(5, min(999, request_var('text_rows', 20))); - $save_changes = (isset($_POST['save'])) ? true : false; - - // make sure template_file path doesn't go upwards - $template_file = str_replace('..', '.', $template_file); - - // Retrieve some information about the template - $sql = 'SELECT template_storedb, template_path, template_name - FROM ' . STYLES_TEMPLATE_TABLE . " - WHERE template_id = $template_id"; - $result = $db->sql_query($sql); - $template_info = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$template_info) - { - trigger_error($user->lang['NO_TEMPLATE'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - // save changes to the template if the user submitted any - if ($save_changes && $template_file) - { - // Get the filesystem location of the current file - $file = "{$phpbb_root_path}styles/{$template_info['template_path']}/template/$template_file"; - $additional = ''; - - // If the template is stored on the filesystem try to write the file else store it in the database - if (!$safe_mode && !$template_info['template_storedb'] && file_exists($file) && @is_writable($file)) - { - if (!($fp = @fopen($file, 'wb'))) - { - trigger_error($user->lang['NO_TEMPLATE'] . adm_back_link($this->u_action), E_USER_WARNING); - } - fwrite($fp, $template_data); - fclose($fp); - } - else - { - $db->sql_transaction('begin'); - - // If it's not stored in the db yet, then update the template setting and store all template files in the db - if (!$template_info['template_storedb']) - { - $sql = 'UPDATE ' . STYLES_TEMPLATE_TABLE . ' - SET template_storedb = 1 - WHERE template_id = ' . $template_id; - $db->sql_query($sql); - - $filelist = filelist("{$phpbb_root_path}styles/{$template_info['template_path']}/template", '', 'html'); - $this->store_templates('insert', $template_id, $template_info['template_path'], $filelist); - - add_log('admin', 'LOG_TEMPLATE_EDIT_DETAILS', $template_info['template_name']); - $additional .= '
    ' . $user->lang['EDIT_TEMPLATE_STORED_DB']; - } - - // Update the template_data table entry for this template file - $sql = 'UPDATE ' . STYLES_TEMPLATE_DATA_TABLE . " - SET template_data = '" . $db->sql_escape($template_data) . "', template_mtime = " . time() . " - WHERE template_id = $template_id - AND template_filename = '" . $db->sql_escape($template_file) . "'"; - $db->sql_query($sql); - - $db->sql_transaction('commit'); - } - - // destroy the cached version of the template (filename without extension) - $this->clear_template_cache($template_info, array(substr($template_file, 0, -5))); - - $cache->destroy('sql', STYLES_TABLE); - - add_log('admin', 'LOG_TEMPLATE_EDIT', $template_info['template_name'], $template_file); - trigger_error($user->lang['TEMPLATE_FILE_UPDATED'] . $additional . adm_back_link($this->u_action . "&action=edit&id=$template_id&text_rows=$text_rows&template_file=$template_file")); - } - - // Generate a category array containing template filenames - if (!$template_info['template_storedb']) - { - $template_path = "{$phpbb_root_path}styles/{$template_info['template_path']}/template"; - - $filelist = filelist($template_path, '', 'html'); - $filelist[''] = array_diff($filelist[''], array('bbcode.html')); - - if ($template_file) - { - if (!file_exists($template_path . "/$template_file") || !($template_data = file_get_contents($template_path . "/$template_file"))) - { - trigger_error($user->lang['NO_TEMPLATE'] . adm_back_link($this->u_action), E_USER_WARNING); - } - } - } - else - { - $sql = 'SELECT * - FROM ' . STYLES_TEMPLATE_DATA_TABLE . " - WHERE template_id = $template_id"; - $result = $db->sql_query($sql); - - $filelist = array('' => array()); - while ($row = $db->sql_fetchrow($result)) - { - $file_info = pathinfo($row['template_filename']); - - if (($file_info['basename'] != 'bbcode') && ($file_info['extension'] == 'html')) - { - if (($file_info['dirname'] == '.') || empty($file_info['dirname'])) - { - $filelist[''][] = $row['template_filename']; - } - else - { - $filelist[$file_info['dirname'] . '/'][] = $file_info['basename']; - } - } - - if ($row['template_filename'] == $template_file) - { - $template_data = $row['template_data']; - } - } - $db->sql_freeresult($result); - unset($file_info); - } - - // Now create the categories - $filelist_cats[''] = array(); - foreach ($filelist as $pathfile => $file_ary) - { - // Use the directory name as category name - if (!empty($pathfile)) - { - $filelist_cats[$pathfile] = array(); - foreach ($file_ary as $file) - { - $filelist_cats[$pathfile][$pathfile . $file] = $file; - } - } - // or if it's in the main category use the word before the first underscore to group files - else - { - $cats = array(); - foreach ($file_ary as $file) - { - $cats[] = substr($file, 0, strpos($file, '_')); - $filelist_cats[substr($file, 0, strpos($file, '_'))][$file] = $file; - } - - $cats = array_values(array_unique($cats)); - - // we don't need any single element categories so put them into the misc '' category - for ($i = 0, $n = sizeof($cats); $i < $n; $i++) - { - if (sizeof($filelist_cats[$cats[$i]]) == 1 && $cats[$i] !== '') - { - $filelist_cats[''][key($filelist_cats[$cats[$i]])] = current($filelist_cats[$cats[$i]]); - unset($filelist_cats[$cats[$i]]); - } - } - unset($cats); - } - } - unset($filelist); - - // Generate list of categorised template files - $tpl_options = ''; - ksort($filelist_cats); - foreach ($filelist_cats as $category => $tpl_ary) - { - ksort($tpl_ary); - - if (!empty($category)) - { - $tpl_options .= ''; - } - - foreach ($tpl_ary as $filename => $file) - { - $selected = ($template_file == $filename) ? ' selected="selected"' : ''; - $tpl_options .= ''; - } - } - - $template->assign_vars(array( - 'S_EDIT_TEMPLATE' => true, - 'S_HIDDEN_FIELDS' => build_hidden_fields(array('template_file' => $template_file)), - 'S_TEMPLATES' => $tpl_options, - - 'U_ACTION' => $this->u_action . "&action=edit&id=$template_id&text_rows=$text_rows", - 'U_BACK' => $this->u_action, - - 'L_EDIT' => $user->lang['EDIT_TEMPLATE'], - 'L_EDIT_EXPLAIN' => $user->lang['EDIT_TEMPLATE_EXPLAIN'], - 'L_EDITOR' => $user->lang['TEMPLATE_EDITOR'], - 'L_EDITOR_HEIGHT' => $user->lang['TEMPLATE_EDITOR_HEIGHT'], - 'L_FILE' => $user->lang['TEMPLATE_FILE'], - 'L_SELECT' => $user->lang['SELECT_TEMPLATE'], - 'L_SELECTED' => $user->lang['SELECTED_TEMPLATE'], - 'L_SELECTED_FILE' => $user->lang['SELECTED_TEMPLATE_FILE'], - - 'SELECTED_TEMPLATE' => $template_info['template_name'], - 'TEMPLATE_FILE' => $template_file, - 'TEMPLATE_DATA' => utf8_htmlspecialchars($template_data), - 'TEXT_ROWS' => $text_rows) - ); - } - - /** - * Allows the admin to view cached versions of template files and clear single template cache files - * - * @param int $template_id specifies which template's cache is shown - */ - function template_cache($template_id) - { - global $phpbb_root_path, $phpEx, $config, $db, $cache, $user, $template; - - $source = str_replace('/', '.', request_var('source', '')); - $file_ary = array_diff(request_var('delete', array('')), array('')); - $submit = isset($_POST['submit']) ? true : false; - - $sql = 'SELECT * - FROM ' . STYLES_TEMPLATE_TABLE . " - WHERE template_id = $template_id"; - $result = $db->sql_query($sql); - $template_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$template_row) - { - trigger_error($user->lang['NO_TEMPLATE'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - // User wants to delete one or more files ... - if ($submit && $file_ary) - { - $this->clear_template_cache($template_row, $file_ary); - trigger_error($user->lang['TEMPLATE_CACHE_CLEARED'] . adm_back_link($this->u_action . "&action=cache&id=$template_id")); - } - - $cache_prefix = 'tpl_' . $template_row['template_path']; - - // Someone wants to see the cached source ... so we'll highlight it, - // add line numbers and indent it appropriately. This could be nasty - // on larger source files ... - if ($source && file_exists("{$phpbb_root_path}cache/{$cache_prefix}_$source.html.$phpEx")) - { - adm_page_header($user->lang['TEMPLATE_CACHE']); - - $template->set_filenames(array( - 'body' => 'viewsource.html') - ); - - $template->assign_vars(array( - 'FILENAME' => str_replace('.', '/', $source) . '.html') - ); - - $code = str_replace(array("\r\n", "\r"), array("\n", "\n"), file_get_contents("{$phpbb_root_path}cache/{$cache_prefix}_$source.html.$phpEx")); - - $conf = array('highlight.bg', 'highlight.comment', 'highlight.default', 'highlight.html', 'highlight.keyword', 'highlight.string'); - foreach ($conf as $ini_var) - { - @ini_set($ini_var, str_replace('highlight.', 'syntax', $ini_var)); - } - - $marker = 'MARKER' . time(); - $code = highlight_string(str_replace("\n", $marker, $code), true); - $code = str_replace($marker, "\n", $code); - $str_from = array('', '', '','[', ']', '.', ':'); - $str_to = array('', '', '', '[', ']', '.', ':'); - - $code = str_replace($str_from, $str_to, $code); - $code = preg_replace('#^()\n?(.*?)\n?()$#ism', '$1$2$3', $code); - $code = substr($code, strlen('')); - $code = substr($code, 0, -1 * strlen('')); - $code = explode("\n", $code); - - foreach ($code as $key => $line) - { - $template->assign_block_vars('source', array( - 'LINENUM' => $key + 1, - 'LINE' => preg_replace('#([^ ;]) ([^ &])#', '$1 $2', $line)) - ); - unset($code[$key]); - } - - adm_page_footer(); - } - - $filemtime = array(); - if ($template_row['template_storedb']) - { - $sql = 'SELECT template_filename, template_mtime - FROM ' . STYLES_TEMPLATE_DATA_TABLE . " - WHERE template_id = $template_id"; - $result = $db->sql_query($sql); - - $filemtime = array(); - while ($row = $db->sql_fetchrow($result)) - { - $filemtime[$row['template_filename']] = $row['template_mtime']; - } - $db->sql_freeresult($result); - } - - // Get a list of cached template files and then retrieve additional information about them - $file_ary = $this->template_cache_filelist($template_row['template_path']); - - foreach ($file_ary as $file) - { - $file = str_replace('/', '.', $file); - - // perform some dirty guessing to get the path right. - // We assume that three dots in a row were '../' - $tpl_file = str_replace('.', '/', $file); - $tpl_file = str_replace('///', '../', $tpl_file); - - $filename = "{$cache_prefix}_$file.html.$phpEx"; - - if (!file_exists("{$phpbb_root_path}cache/$filename")) - { - continue; - } - - $template->assign_block_vars('file', array( - 'U_VIEWSOURCE' => $this->u_action . "&action=cache&id=$template_id&source=$file", - - 'CACHED' => $user->format_date(filemtime("{$phpbb_root_path}cache/$filename")), - 'FILENAME' => $file, - 'FILESIZE' => sprintf('%.1f ' . $user->lang['KIB'], filesize("{$phpbb_root_path}cache/$filename") / 1024), - 'MODIFIED' => $user->format_date((!$template_row['template_storedb']) ? filemtime("{$phpbb_root_path}styles/{$template_row['template_path']}/template/$tpl_file.html") : $filemtime[$file . '.html'])) - ); - } - unset($filemtime); - - $template->assign_vars(array( - 'S_CACHE' => true, - 'S_TEMPLATE' => true, - - 'U_ACTION' => $this->u_action . "&action=cache&id=$template_id", - 'U_BACK' => $this->u_action) - ); - } - - /** - * Provides a css editor and a basic easier to use stylesheet editing tool for less experienced (or lazy) users - * - * @param int $theme_id specifies which theme is being edited - */ - function edit_theme($theme_id) - { - global $phpbb_root_path, $phpEx, $config, $db, $cache, $user, $template, $safe_mode; - - $this->page_title = 'EDIT_THEME'; - - $filelist = $filelist_cats = array(); - - $theme_data = utf8_normalize_nfc(request_var('template_data', '', true)); - $theme_data = htmlspecialchars_decode($theme_data); - $theme_file = utf8_normalize_nfc(request_var('template_file', '', true)); - $text_rows = max(5, min(999, request_var('text_rows', 20))); - $save_changes = (isset($_POST['save'])) ? true : false; - - // make sure theme_file path doesn't go upwards - $theme_file = str_replace('..', '.', $theme_file); - - // Retrieve some information about the theme - $sql = 'SELECT theme_storedb, theme_path, theme_name, theme_data - FROM ' . STYLES_THEME_TABLE . " - WHERE theme_id = $theme_id"; - $result = $db->sql_query($sql); - - if (!($theme_info = $db->sql_fetchrow($result))) - { - trigger_error($user->lang['NO_THEME'] . adm_back_link($this->u_action), E_USER_WARNING); - } - $db->sql_freeresult($result); - - // save changes to the theme if the user submitted any - if ($save_changes) - { - // Get the filesystem location of the current file - $file = "{$phpbb_root_path}styles/{$theme_info['theme_path']}/theme/$theme_file"; - $additional = ''; - $message = $user->lang['THEME_UPDATED']; - - // If the theme is stored on the filesystem try to write the file else store it in the database - if (!$safe_mode && !$theme_info['theme_storedb'] && file_exists($file) && @is_writable($file)) - { - if (!($fp = @fopen($file, 'wb'))) - { - trigger_error($user->lang['NO_THEME'] . adm_back_link($this->u_action), E_USER_WARNING); - } - fwrite($fp, $theme_data); - fclose($fp); - } - else - { - // Write stylesheet to db - $sql_ary = array( - 'theme_mtime' => time(), - 'theme_storedb' => 1, - 'theme_data' => $this->db_theme_data($theme_info, $theme_data), - ); - $sql = 'UPDATE ' . STYLES_THEME_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE theme_id = ' . $theme_id; - $db->sql_query($sql); - - $cache->destroy('sql', STYLES_THEME_TABLE); - - // notify the user if the theme was not stored in the db before his modification - if (!$theme_info['theme_storedb']) - { - add_log('admin', 'LOG_THEME_EDIT_DETAILS', $theme_info['theme_name']); - $message .= '
    ' . $user->lang['EDIT_THEME_STORED_DB']; - } - } - $cache->destroy('sql', STYLES_THEME_TABLE); - add_log('admin', (!$theme_info['theme_storedb']) ? 'LOG_THEME_EDIT_FILE' : 'LOG_THEME_EDIT', $theme_info['theme_name'], (!$theme_info['theme_storedb']) ? $theme_file : ''); - - trigger_error($message . adm_back_link($this->u_action . "&action=edit&id=$theme_id&template_file=$theme_file&text_rows=$text_rows")); - } - - // Generate a category array containing theme filenames - if (!$theme_info['theme_storedb']) - { - $theme_path = "{$phpbb_root_path}styles/{$theme_info['theme_path']}/theme"; - - $filelist = filelist($theme_path, '', 'css'); - - if ($theme_file) - { - if (!file_exists($theme_path . "/$theme_file") || !($theme_data = file_get_contents($theme_path . "/$theme_file"))) - { - trigger_error($user->lang['NO_THEME'] . adm_back_link($this->u_action), E_USER_WARNING); - } - } - } - else - { - $theme_data = &$theme_info['theme_data']; - } - - // Now create the categories - $filelist_cats[''] = array(); - foreach ($filelist as $pathfile => $file_ary) - { - // Use the directory name as category name - if (!empty($pathfile)) - { - $filelist_cats[$pathfile] = array(); - foreach ($file_ary as $file) - { - $filelist_cats[$pathfile][$pathfile . $file] = $file; - } - } - // or if it's in the main category use the word before the first underscore to group files - else - { - $cats = array(); - foreach ($file_ary as $file) - { - $cats[] = substr($file, 0, strpos($file, '_')); - $filelist_cats[substr($file, 0, strpos($file, '_'))][$file] = $file; - } - - $cats = array_values(array_unique($cats)); - - // we don't need any single element categories so put them into the misc '' category - for ($i = 0, $n = sizeof($cats); $i < $n; $i++) - { - if (sizeof($filelist_cats[$cats[$i]]) == 1 && $cats[$i] !== '') - { - $filelist_cats[''][key($filelist_cats[$cats[$i]])] = current($filelist_cats[$cats[$i]]); - unset($filelist_cats[$cats[$i]]); - } - } - unset($cats); - } - } - unset($filelist); - - // Generate list of categorised theme files - $tpl_options = ''; - ksort($filelist_cats); - foreach ($filelist_cats as $category => $tpl_ary) - { - ksort($tpl_ary); - - if (!empty($category)) - { - $tpl_options .= ''; - } - - foreach ($tpl_ary as $filename => $file) - { - $selected = ($theme_file == $filename) ? ' selected="selected"' : ''; - $tpl_options .= ''; - } - } - - $template->assign_vars(array( - 'S_EDIT_THEME' => true, - 'S_HIDDEN_FIELDS' => build_hidden_fields(array('template_file' => $theme_file)), - 'S_THEME_IN_DB' => $theme_info['theme_storedb'], - 'S_TEMPLATES' => $tpl_options, - - 'U_ACTION' => $this->u_action . "&action=edit&id=$theme_id&text_rows=$text_rows", - 'U_BACK' => $this->u_action, - - 'L_EDIT' => $user->lang['EDIT_THEME'], - 'L_EDIT_EXPLAIN' => $user->lang['EDIT_THEME_EXPLAIN'], - 'L_EDITOR' => $user->lang['THEME_EDITOR'], - 'L_EDITOR_HEIGHT' => $user->lang['THEME_EDITOR_HEIGHT'], - 'L_FILE' => $user->lang['THEME_FILE'], - 'L_SELECT' => $user->lang['SELECT_THEME'], - 'L_SELECTED' => $user->lang['SELECTED_THEME'], - 'L_SELECTED_FILE' => $user->lang['SELECTED_THEME_FILE'], - - 'SELECTED_TEMPLATE' => $theme_info['theme_name'], - 'TEMPLATE_FILE' => $theme_file, - 'TEMPLATE_DATA' => utf8_htmlspecialchars($theme_data), - 'TEXT_ROWS' => $text_rows) - ); - } - - - /** - * Edit imagesets - * - * @param int $imageset_id specifies which imageset is being edited - */ - function edit_imageset($imageset_id) - { - global $db, $user, $phpbb_root_path, $cache, $template; - - $this->page_title = 'EDIT_IMAGESET'; - - $update = (isset($_POST['update'])) ? true : false; - - $imgname = request_var('imgname', ''); - $imgpath = request_var('imgpath', ''); - $imgsize = request_var('imgsize', false); - $imgwidth = request_var('imgwidth', 0); - $imgheight = request_var('imgheight', 0); - - $imgname = preg_replace('#[^a-z0-9\-+_]#i', '', $imgname); - $imgpath = str_replace('..', '.', $imgpath); - - if ($imageset_id) - { - $sql = 'SELECT imageset_path, imageset_name - FROM ' . STYLES_IMAGESET_TABLE . " - WHERE imageset_id = $imageset_id"; - $result = $db->sql_query($sql); - $imageset_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $imageset_path = $imageset_row['imageset_path']; - $imageset_name = $imageset_row['imageset_name']; - - $sql_extra = ''; - if (strpos($imgname, '-') !== false) - { - list($imgname, $imgnamelang) = explode('-', $imgname); - $sql_extra = " AND image_lang IN ('" . $db->sql_escape($imgnamelang) . "', '')"; - } - - $sql = 'SELECT image_filename, image_width, image_height, image_lang, image_id - FROM ' . STYLES_IMAGESET_DATA_TABLE . " - WHERE imageset_id = $imageset_id - AND image_name = '" . $db->sql_escape($imgname) . "'$sql_extra"; - $result = $db->sql_query($sql); - $imageset_data_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $image_filename = $imageset_data_row['image_filename']; - $image_width = $imageset_data_row['image_width']; - $image_height = $imageset_data_row['image_height']; - $image_lang = $imageset_data_row['image_lang']; - $image_id = $imageset_data_row['image_id']; - - if (!$imageset_row) - { - trigger_error($user->lang['NO_IMAGESET'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - // Check to see whether the selected image exists in the table - $valid_name = ($update) ? false : true; - - foreach ($this->imageset_keys as $category => $img_ary) - { - if (in_array($imgname, $img_ary)) - { - $valid_name = true; - break; - } - } - - if ($update && isset($_POST['imgpath'])) - { - if ($valid_name) - { - // If imgwidth and imgheight are non-zero grab the actual size - // from the image itself ... we ignore width settings for the poll center image - $imgwidth = request_var('imgwidth', 0); - $imgheight = request_var('imgheight', 0); - $imglang = ''; - - if ($imgpath && !file_exists("{$phpbb_root_path}styles/$imageset_path/imageset/$imgpath")) - { - trigger_error($user->lang['NO_IMAGE_ERROR'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if ($imgsize && $imgpath) - { - if (!$imgwidth || !$imgheight) - { - list($imgwidth_file, $imgheight_file) = getimagesize("{$phpbb_root_path}styles/$imageset_path/imageset/$imgpath"); - $imgwidth = ($imgwidth) ? $imgwidth : $imgwidth_file; - $imgheight = ($imgheight) ? $imgheight : $imgheight_file; - } - $imgwidth = ($imgname != 'poll_center') ? (int) $imgwidth : 0; - $imgheight = (int) $imgheight; - } - - - if (strpos($imgpath, '/') !== false) - { - list($imglang, $imgfilename) = explode('/', $imgpath); - } - else - { - $imgfilename = $imgpath; - } - - $sql_ary = array( - 'image_filename' => (string) $imgfilename, - 'image_width' => (int) $imgwidth, - 'image_height' => (int) $imgheight, - 'image_lang' => (string) $imglang, - ); - - // already exists - if ($imageset_data_row) - { - $sql = 'UPDATE ' . STYLES_IMAGESET_DATA_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " - WHERE image_id = $image_id"; - $db->sql_query($sql); - } - // does not exist - else if (!$imageset_data_row) - { - $sql_ary['image_name'] = $imgname; - $sql_ary['imageset_id'] = (int) $imageset_id; - $db->sql_query('INSERT INTO ' . STYLES_IMAGESET_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); - } - - $cache->destroy('sql', STYLES_IMAGESET_DATA_TABLE); - - add_log('admin', 'LOG_IMAGESET_EDIT', $imageset_name); - - $template->assign_var('SUCCESS', true); - - $image_filename = $imgfilename; - $image_width = $imgwidth; - $image_height = $imgheight; - $image_lang = $imglang; - } - } - } - - $imglang = ''; - $imagesetlist = array('nolang' => array(), 'lang' => array()); - $langs = array(); - - $dir = "{$phpbb_root_path}styles/$imageset_path/imageset"; - $dp = @opendir($dir); - - if ($dp) - { - while (($file = readdir($dp)) !== false) - { - if ($file[0] != '.' && strtoupper($file) != 'CVS' && !is_file($dir . '/' . $file) && !is_link($dir . '/' . $file)) - { - $langs[] = $file; - } - else if (preg_match('#\.(?:gif|jpg|png)$#', $file)) - { - $imagesetlist['nolang'][] = $file; - } - } - - if ($sql_extra) - { - $dp2 = @opendir("$dir/$imgnamelang"); - - if ($dp2) - { - while (($file2 = readdir($dp2)) !== false) - { - if (preg_match('#\.(?:gif|jpg|png)$#', $file2)) - { - $imagesetlist['lang'][] = "$imgnamelang/$file2"; - } - } - closedir($dp2); - } - } - closedir($dp); - } - - // Generate list of image options - $img_options = ''; - foreach ($this->imageset_keys as $category => $img_ary) - { - $template->assign_block_vars('category', array( - 'NAME' => $user->lang['IMG_CAT_' . strtoupper($category)] - )); - - foreach ($img_ary as $img) - { - if ($category == 'buttons') - { - foreach ($langs as $language) - { - $template->assign_block_vars('category.images', array( - 'SELECTED' => ($img == $imgname && $language == $imgnamelang), - 'VALUE' => $img . '-' . $language, - 'TEXT' => $user->lang['IMG_' . strtoupper($img)] . ' [ ' . $language . ' ]' - )); - } - } - else - { - $template->assign_block_vars('category.images', array( - 'SELECTED' => ($img == $imgname), - 'VALUE' => $img, - 'TEXT' => (($category == 'custom') ? $img : $user->lang['IMG_' . strtoupper($img)]) - )); - } - } - } - - // Make sure the list of possible images is sorted alphabetically - sort($imagesetlist['lang']); - sort($imagesetlist['nolang']); - - $image_found = false; - $img_val = ''; - foreach ($imagesetlist as $type => $img_ary) - { - if ($type !== 'lang' || $sql_extra) - { - $template->assign_block_vars('imagesetlist', array( - 'TYPE' => ($type == 'lang') - )); - } - - foreach ($img_ary as $img) - { - $imgtext = preg_replace('/^([^\/]+\/)/', '', $img); - $selected = (!empty($imgname) && strpos($image_filename, $imgtext) !== false); - if ($selected) - { - $image_found = true; - $img_val = htmlspecialchars($img); - } - $template->assign_block_vars('imagesetlist.images', array( - 'SELECTED' => $selected, - 'TEXT' => $imgtext, - 'VALUE' => htmlspecialchars($img) - )); - } - } - - $imgsize_bool = (!empty($imgname) && $image_width && $image_height) ? true : false; - $image_request = '../styles/' . $imageset_path . '/imageset/' . ($image_lang ? $imgnamelang . '/' : '') . $image_filename; - - $template->assign_vars(array( - 'S_EDIT_IMAGESET' => true, - 'L_TITLE' => $user->lang[$this->page_title], - 'L_EXPLAIN' => $user->lang[$this->page_title . '_EXPLAIN'], - 'IMAGE_OPTIONS' => $img_options, - 'IMAGE_SIZE' => $image_width, - 'IMAGE_HEIGHT' => $image_height, - 'IMAGE_REQUEST' => (empty($image_filename)) ? 'images/no_image.png' : $image_request, - 'U_ACTION' => $this->u_action . "&action=edit&id=$imageset_id", - 'U_BACK' => $this->u_action, - 'NAME' => $imageset_name, - 'A_NAME' => addslashes($imageset_name), - 'ERROR' => !$valid_name, - 'IMG_SRC' => ($image_found) ? '../styles/' . $imageset_path . '/imageset/' . $img_val : 'images/no_image.png', - 'IMAGE_SELECT' => $image_found - )); - } - - /** - * Remove style/template/theme/imageset - */ - function remove($mode, $style_id) - { - global $db, $template, $user, $phpbb_root_path, $cache, $config; - - $new_id = request_var('new_id', 0); - $update = (isset($_POST['update'])) ? true : false; - $sql_where = ''; - - switch ($mode) - { - case 'style': - $sql_from = STYLES_TABLE; - $sql_select = 'style_name'; - $sql_where = 'AND style_active = 1'; - break; - - case 'template': - $sql_from = STYLES_TEMPLATE_TABLE; - $sql_select = 'template_name, template_path, template_storedb'; - break; - - case 'theme': - $sql_from = STYLES_THEME_TABLE; - $sql_select = 'theme_name, theme_path, theme_storedb'; - break; - - case 'imageset': - $sql_from = STYLES_IMAGESET_TABLE; - $sql_select = 'imageset_name, imageset_path'; - break; - } - - $l_prefix = strtoupper($mode); - - $sql = "SELECT $sql_select - FROM $sql_from - WHERE {$mode}_id = $style_id"; - $result = $db->sql_query($sql); - $style_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$style_row) - { - trigger_error($user->lang['NO_' . $l_prefix] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = "SELECT {$mode}_id, {$mode}_name - FROM $sql_from - WHERE {$mode}_id <> $style_id - $sql_where - ORDER BY {$mode}_name ASC"; - $result = $db->sql_query($sql); - - $s_options = ''; - - if ($row = $db->sql_fetchrow($result)) - { - do - { - $s_options .= ''; - } - while ($row = $db->sql_fetchrow($result)); - } - else - { - trigger_error($user->lang['ONLY_' . $l_prefix] . adm_back_link($this->u_action), E_USER_WARNING); - } - $db->sql_freeresult($result); - - if ($update) - { - $sql = "DELETE FROM $sql_from - WHERE {$mode}_id = $style_id"; - $db->sql_query($sql); - - if ($mode == 'style') - { - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_style = $new_id - WHERE user_style = $style_id"; - $db->sql_query($sql); - - $sql = 'UPDATE ' . FORUMS_TABLE . " - SET forum_style = $new_id - WHERE forum_style = $style_id"; - $db->sql_query($sql); - - if ($style_id == $config['default_style']) - { - set_config('default_style', $new_id); - } - } - else - { - if ($mode == 'imageset') - { - $sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . " - WHERE imageset_id = $style_id"; - $db->sql_query($sql); - } - $sql = 'UPDATE ' . STYLES_TABLE . " - SET {$mode}_id = $new_id - WHERE {$mode}_id = $style_id"; - $db->sql_query($sql); - } - - $cache->destroy('sql', STYLES_TABLE); - - add_log('admin', 'LOG_' . $l_prefix . '_DELETE', $style_row[$mode . '_name']); - $message = ($mode != 'style') ? $l_prefix . '_DELETED_FS' : $l_prefix . '_DELETED'; - trigger_error($user->lang[$message] . adm_back_link($this->u_action)); - } - - $this->page_title = 'DELETE_' . $l_prefix; - - $template->assign_vars(array( - 'S_DELETE' => true, - 'S_REPLACE_OPTIONS' => $s_options, - - 'L_TITLE' => $user->lang[$this->page_title], - 'L_EXPLAIN' => $user->lang[$this->page_title . '_EXPLAIN'], - 'L_NAME' => $user->lang[$l_prefix . '_NAME'], - 'L_REPLACE' => $user->lang['REPLACE_' . $l_prefix], - 'L_REPLACE_EXPLAIN' => $user->lang['REPLACE_' . $l_prefix . '_EXPLAIN'], - - 'U_ACTION' => $this->u_action . "&action=delete&id=$style_id", - 'U_BACK' => $this->u_action, - - 'NAME' => $style_row[$mode . '_name'], - ) - ); - } - - /** - * Export style or style elements - */ - function export($mode, $style_id) - { - global $db, $template, $user, $phpbb_root_path, $cache, $phpEx, $config; - - $update = (isset($_POST['update'])) ? true : false; - - $inc_template = request_var('inc_template', 0); - $inc_theme = request_var('inc_theme', 0); - $inc_imageset = request_var('inc_imageset', 0); - $store = request_var('store', 0); - $format = request_var('format', ''); - - $error = array(); - $methods = array('tar'); - - $available_methods = array('tar.gz' => 'zlib', 'tar.bz2' => 'bz2', 'zip' => 'zlib'); - foreach ($available_methods as $type => $module) - { - if (!@extension_loaded($module)) - { - continue; - } - - $methods[] = $type; - } - - if (!in_array($format, $methods)) - { - $format = 'tar'; - } - - switch ($mode) - { - case 'style': - if ($update && ($inc_template + $inc_theme + $inc_imageset) < 1) - { - $error[] = $user->lang['STYLE_ERR_MORE_ELEMENTS']; - } - - $name = 'style_name'; - - $sql_select = 's.style_id, s.style_name, s.style_copyright'; - $sql_select .= ($inc_template) ? ', t.*' : ', t.template_name'; - $sql_select .= ($inc_theme) ? ', c.*' : ', c.theme_name'; - $sql_select .= ($inc_imageset) ? ', i.*' : ', i.imageset_name'; - $sql_from = STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . ' i'; - $sql_where = "s.style_id = $style_id AND t.template_id = s.template_id AND c.theme_id = s.theme_id AND i.imageset_id = s.imageset_id"; - - $l_prefix = 'STYLE'; - break; - - case 'template': - $name = 'template_name'; - - $sql_select = '*'; - $sql_from = STYLES_TEMPLATE_TABLE; - $sql_where = "template_id = $style_id"; - - $l_prefix = 'TEMPLATE'; - break; - - case 'theme': - $name = 'theme_name'; - - $sql_select = '*'; - $sql_from = STYLES_THEME_TABLE; - $sql_where = "theme_id = $style_id"; - - $l_prefix = 'THEME'; - break; - - case 'imageset': - $name = 'imageset_name'; - - $sql_select = '*'; - $sql_from = STYLES_IMAGESET_TABLE; - $sql_where = "imageset_id = $style_id"; - - $l_prefix = 'IMAGESET'; - break; - } - - if ($update && !sizeof($error)) - { - $sql = "SELECT $sql_select - FROM $sql_from - WHERE $sql_where"; - $result = $db->sql_query($sql); - $style_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$style_row) - { - trigger_error($user->lang['NO_' . $l_prefix] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $var_ary = array('style_id', 'style_name', 'style_copyright', 'template_id', 'template_name', 'template_path', 'template_copyright', 'template_storedb', 'bbcode_bitfield', 'theme_id', 'theme_name', 'theme_path', 'theme_copyright', 'theme_storedb', 'theme_mtime', 'theme_data', 'imageset_id', 'imageset_name', 'imageset_path', 'imageset_copyright'); - - foreach ($var_ary as $var) - { - if (!isset($style_row[$var])) - { - $style_row[$var] = ''; - } - } - - $files = $data = array(); - - if ($mode == 'style') - { - $style_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['style_name'], $style_row['style_copyright'], $config['version']), $this->style_cfg); - - $style_cfg .= (!$inc_template) ? "\nrequired_template = {$style_row['template_name']}" : ''; - $style_cfg .= (!$inc_theme) ? "\nrequired_theme = {$style_row['theme_name']}" : ''; - $style_cfg .= (!$inc_imageset) ? "\nrequired_imageset = {$style_row['imageset_name']}" : ''; - - $data[] = array( - 'src' => $style_cfg, - 'prefix' => 'style.cfg' - ); - - unset($style_cfg); - } - - // Export template core code - if ($mode == 'template' || $inc_template) - { - $template_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['template_name'], $style_row['template_copyright'], $config['version']), $this->template_cfg); - $template_cfg .= "\nbbcode_bitfield = {$style_row['bbcode_bitfield']}"; - - $data[] = array( - 'src' => $template_cfg, - 'prefix' => 'template/template.cfg' - ); - - // This is potentially nasty memory-wise ... - if (!$style_row['template_storedb']) - { - $files[] = array( - 'src' => "styles/{$style_row['template_path']}/template/", - 'prefix-' => "styles/{$style_row['template_path']}/", - 'prefix+' => false, - 'exclude' => 'template.cfg' - ); - } - else - { - $sql = 'SELECT template_filename, template_data - FROM ' . STYLES_TEMPLATE_DATA_TABLE . " - WHERE template_id = {$style_row['template_id']}"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $data[] = array( - 'src' => $row['template_data'], - 'prefix' => 'template/' . $row['template_filename'] - ); - } - $db->sql_freeresult($result); - } - unset($template_cfg); - } - - // Export theme core code - if ($mode == 'theme' || $inc_theme) - { - $theme_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['theme_name'], $style_row['theme_copyright'], $config['version']), $this->theme_cfg); - - // Read old cfg file - $items = cache::obtain_cfg_item($style_row, 'theme'); - - if (!isset($items['parse_css_file'])) - { - $items['parse_css_file'] = 'off'; - } - - $theme_cfg = str_replace(array('{PARSE_CSS_FILE}'), array($items['parse_css_file']), $theme_cfg); - - $files[] = array( - 'src' => "styles/{$style_row['theme_path']}/theme/", - 'prefix-' => "styles/{$style_row['theme_path']}/", - 'prefix+' => false, - 'exclude' => ($style_row['theme_storedb']) ? 'stylesheet.css,theme.cfg' : 'theme.cfg' - ); - - $data[] = array( - 'src' => $theme_cfg, - 'prefix' => 'theme/theme.cfg' - ); - - if ($style_row['theme_storedb']) - { - $data[] = array( - 'src' => $style_row['theme_data'], - 'prefix' => 'theme/stylesheet.css' - ); - } - - unset($items, $theme_cfg); - } - - // Export imageset core code - if ($mode == 'imageset' || $inc_imageset) - { - $imageset_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['imageset_name'], $style_row['imageset_copyright'], $config['version']), $this->imageset_cfg); - - $imageset_main = array(); - - $sql = 'SELECT image_filename, image_name, image_height, image_width - FROM ' . STYLES_IMAGESET_DATA_TABLE . " - WHERE imageset_id = $style_id - AND image_lang = ''"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - $imageset_main[$row['image_name']] = $row['image_filename'] . ($row['image_height'] ? '*' . $row['image_height']: '') . ($row['image_width'] ? '*' . $row['image_width']: ''); - } - $db->sql_freeresult($result); - - foreach ($this->imageset_keys as $topic => $key_array) - { - foreach ($key_array as $key) - { - if (isset($imageset_main[$key])) - { - $imageset_cfg .= "\nimg_" . $key . ' = ' . str_replace("styles/{$style_row['imageset_path']}/imageset/", '{PATH}', $imageset_main[$key]); - } - } - } - - $files[] = array( - 'src' => "styles/{$style_row['imageset_path']}/imageset/", - 'prefix-' => "styles/{$style_row['imageset_path']}/", - 'prefix+' => false, - 'exclude' => 'imageset.cfg' - ); - - $data[] = array( - 'src' => trim($imageset_cfg), - 'prefix' => 'imageset/imageset.cfg' - ); - - end($data); - - $imageset_root = "{$phpbb_root_path}styles/{$style_row['imageset_path']}/imageset/"; - - if ($dh = @opendir($imageset_root)) - { - while (($fname = readdir($dh)) !== false) - { - if ($fname[0] != '.' && $fname != 'CVS' && is_dir("$imageset_root$fname")) - { - $files[key($files)]['exclude'] .= ',' . $fname . '/imageset.cfg'; - } - } - closedir($dh); - } - - $imageset_lang = array(); - - $sql = 'SELECT image_filename, image_name, image_height, image_width, image_lang - FROM ' . STYLES_IMAGESET_DATA_TABLE . " - WHERE imageset_id = $style_id - AND image_lang <> ''"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - $imageset_lang[$row['image_lang']][$row['image_name']] = $row['image_filename'] . ($row['image_height'] ? '*' . $row['image_height']: '') . ($row['image_width'] ? '*' . $row['image_width']: ''); - } - $db->sql_freeresult($result); - - foreach ($imageset_lang as $lang => $imageset_localized) - { - $imageset_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['imageset_name'], $style_row['imageset_copyright'], $config['version']), $this->imageset_cfg); - - foreach ($this->imageset_keys as $topic => $key_array) - { - foreach ($key_array as $key) - { - if (isset($imageset_localized[$key])) - { - $imageset_cfg .= "\nimg_" . $key . ' = ' . str_replace("styles/{$style_row['imageset_path']}/imageset/", '{PATH}', $imageset_localized[$key]); - } - } - } - - $data[] = array( - 'src' => trim($imageset_cfg), - 'prefix' => 'imageset/' . $lang . '/imageset.cfg' - ); - } - - unset($imageset_cfg); - } - - switch ($format) - { - case 'tar': - $ext = '.tar'; - $mimetype = 'x-tar'; - $compress = 'compress_tar'; - break; - - case 'zip': - $ext = '.zip'; - $mimetype = 'zip'; - break; - - case 'tar.gz': - $ext = '.tar.gz'; - $mimetype = 'x-gzip'; - break; - - case 'tar.bz2': - $ext = '.tar.bz2'; - $mimetype = 'x-bzip2'; - break; - - default: - $error[] = $user->lang[$l_prefix . '_ERR_ARCHIVE']; - } - - if (!sizeof($error)) - { - include($phpbb_root_path . 'includes/functions_compress.' . $phpEx); - - if ($mode == 'style') - { - $path = preg_replace('#[^\w-]+#', '_', $style_row['style_name']); - } - else - { - $path = $style_row[$mode . '_path']; - } - - if ($format == 'zip') - { - $compress = new compress_zip('w', $phpbb_root_path . "store/$path$ext"); - } - else - { - $compress = new compress_tar('w', $phpbb_root_path . "store/$path$ext", $ext); - } - - if (sizeof($files)) - { - foreach ($files as $file_ary) - { - $compress->add_file($file_ary['src'], $file_ary['prefix-'], $file_ary['prefix+'], $file_ary['exclude']); - } - } - - if (sizeof($data)) - { - foreach ($data as $data_ary) - { - $compress->add_data($data_ary['src'], $data_ary['prefix']); - } - } - - $compress->close(); - - add_log('admin', 'LOG_' . $l_prefix . '_EXPORT', $style_row[$mode . '_name']); - - if (!$store) - { - $compress->download($path); - @unlink("{$phpbb_root_path}store/$path$ext"); - exit; - } - - trigger_error(sprintf($user->lang[$l_prefix . '_EXPORTED'], "store/$path$ext") . adm_back_link($this->u_action)); - } - } - - $sql = "SELECT {$mode}_id, {$mode}_name - FROM " . (($mode == 'style') ? STYLES_TABLE : $sql_from) . " - WHERE {$mode}_id = $style_id"; - $result = $db->sql_query($sql); - $style_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$style_row) - { - trigger_error($user->lang['NO_' . $l_prefix] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $this->page_title = $l_prefix . '_EXPORT'; - - $format_buttons = ''; - foreach ($methods as $method) - { - $format_buttons .= ''; - } - - $template->assign_vars(array( - 'S_EXPORT' => true, - 'S_ERROR_MSG' => (sizeof($error)) ? true : false, - 'S_STYLE' => ($mode == 'style') ? true : false, - - 'L_TITLE' => $user->lang[$this->page_title], - 'L_EXPLAIN' => $user->lang[$this->page_title . '_EXPLAIN'], - 'L_NAME' => $user->lang[$l_prefix . '_NAME'], - - 'U_ACTION' => $this->u_action . '&action=export&id=' . $style_id, - 'U_BACK' => $this->u_action, - - 'ERROR_MSG' => (sizeof($error)) ? implode('
    ', $error) : '', - 'NAME' => $style_row[$mode . '_name'], - 'FORMAT_BUTTONS' => $format_buttons) - ); - } - - /** - * Display details - */ - function details($mode, $style_id) - { - global $template, $db, $config, $user, $safe_mode, $cache, $phpbb_root_path; - - $update = (isset($_POST['update'])) ? true : false; - $l_type = strtoupper($mode); - - $error = array(); - $element_ary = array('template' => STYLES_TEMPLATE_TABLE, 'theme' => STYLES_THEME_TABLE, 'imageset' => STYLES_IMAGESET_TABLE); - - switch ($mode) - { - case 'style': - $sql_from = STYLES_TABLE; - break; - - case 'template': - $sql_from = STYLES_TEMPLATE_TABLE; - break; - - case 'theme': - $sql_from = STYLES_THEME_TABLE; - break; - - case 'imageset': - $sql_from = STYLES_IMAGESET_TABLE; - break; - } - - $sql = "SELECT * - FROM $sql_from - WHERE {$mode}_id = $style_id"; - $result = $db->sql_query($sql); - $style_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$style_row) - { - trigger_error($user->lang['NO_' . $l_type] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $style_row['style_default'] = ($mode == 'style' && $config['default_style'] == $style_id) ? 1 : 0; - - if ($update) - { - $name = utf8_normalize_nfc(request_var('name', '', true)); - $copyright = utf8_normalize_nfc(request_var('copyright', '', true)); - - $template_id = request_var('template_id', 0); - $theme_id = request_var('theme_id', 0); - $imageset_id = request_var('imageset_id', 0); - - $style_active = request_var('style_active', 0); - $style_default = request_var('style_default', 0); - $store_db = request_var('store_db', 0); - - if ($mode == 'style' && (!$template_id || !$theme_id || !$imageset_id)) - { - $error[] = $user->lang['STYLE_ERR_NO_IDS']; - } - - if ($mode == 'style' && $style_row['style_active'] && !$style_active && $config['default_style'] == $style_id) - { - $error[] = $user->lang['DEACTIVATE_DEFAULT']; - } - - if (!$name) - { - $error[] = $user->lang[$l_type . '_ERR_STYLE_NAME']; - } - - if ($mode === 'theme' || $mode === 'template') - { - // a rather elaborate check we have to do here once to avoid trouble later - $check = "{$phpbb_root_path}styles/" . $style_row["{$mode}_path"] . (($mode === 'theme') ? '/theme/stylesheet.css' : '/template'); - if (($style_row["{$mode}_storedb"] != $store_db) && !$store_db && ($safe_mode || !@is_writable($check))) - { - $error[] = $user->lang['EDIT_' . strtoupper($mode) . '_STORED_DB']; - $store_db = 1; - } - - // themes which have to be parsed have to go into db - if ($mode == 'theme') - { - $cfg = parse_cfg_file("{$phpbb_root_path}styles/" . $style_row["{$mode}_path"] . "/theme/theme.cfg"); - - if (isset($cfg['parse_css_file']) && $cfg['parse_css_file'] && !$store_db) - { - $error[] = $user->lang['EDIT_THEME_STORE_PARSED']; - $store_db = 1; - } - } - } - - if (!sizeof($error)) - { - // Check length settings - if (utf8_strlen($name) > 30) - { - $error[] = $user->lang[$l_type . '_ERR_NAME_LONG']; - } - - if (utf8_strlen($copyright) > 60) - { - $error[] = $user->lang[$l_type . '_ERR_COPY_LONG']; - } - } - } - - if ($update && sizeof($error)) - { - $style_row = array_merge($style_row, array( - 'template_id' => $template_id, - 'theme_id' => $theme_id, - 'imageset_id' => $imageset_id, - 'style_active' => $style_active, - $mode . '_storedb' => $store_db, - $mode . '_name' => $name, - $mode . '_copyright' => $copyright) - ); - } - - // User has submitted form and no errors have occurred - if ($update && !sizeof($error)) - { - $sql_ary = array( - $mode . '_name' => $name, - $mode . '_copyright' => $copyright - ); - - switch ($mode) - { - case 'style': - - $sql_ary += array( - 'template_id' => (int) $template_id, - 'theme_id' => (int) $theme_id, - 'imageset_id' => (int) $imageset_id, - 'style_active' => (int) $style_active, - ); - break; - - case 'imageset': - break; - - case 'theme': - - if ($style_row['theme_storedb'] != $store_db) - { - $theme_data = ''; - - if (!$style_row['theme_storedb']) - { - $theme_data = $this->db_theme_data($style_row); - } - else if (!$store_db && !$safe_mode && @is_writable("{$phpbb_root_path}styles/{$style_row['theme_path']}/theme/stylesheet.css")) - { - $store_db = 1; - $theme_data = $style_row['theme_data']; - - if ($fp = @fopen("{$phpbb_root_path}styles/{$style_row['theme_path']}/theme/stylesheet.css", 'wb')) - { - $store_db = (@fwrite($fp, str_replace("styles/{$style_row['theme_path']}/theme/", './', $theme_data))) ? 0 : 1; - } - fclose($fp); - } - - $sql_ary += array( - 'theme_mtime' => ($store_db) ? filemtime("{$phpbb_root_path}styles/{$style_row['theme_path']}/theme/stylesheet.css") : 0, - 'theme_storedb' => $store_db, - 'theme_data' => ($store_db) ? $theme_data : '', - ); - } - break; - - case 'template': - - if ($style_row['template_storedb'] != $store_db) - { - if (!$store_db && !$safe_mode && @is_writable("{$phpbb_root_path}styles/{$style_row['template_path']}/template")) - { - $sql = 'SELECT * - FROM ' . STYLES_TEMPLATE_DATA_TABLE . " - WHERE template_id = $style_id"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if (!($fp = @fopen("{$phpbb_root_path}styles/{$style_row['template_path']}/template/" . $row['template_filename'], 'wb'))) - { - $store_db = 1; - $error[] = $user->lang['EDIT_TEMPLATE_STORED_DB']; - break; - } - - fwrite($fp, $row['template_data']); - fclose($fp); - } - $db->sql_freeresult($result); - - if (!$store_db) - { - $sql = 'DELETE FROM ' . STYLES_TEMPLATE_DATA_TABLE . " - WHERE template_id = $style_id"; - $db->sql_query($sql); - } - } - else if ($store_db) - { - $filelist = filelist("{$phpbb_root_path}styles/{$style_row['template_path']}/template", '', 'html'); - $this->store_templates('insert', $style_id, $style_row['template_path'], $filelist); - } - else - { - // We no longer store within the db, but are also not able to update the file structure - // Since the admin want to switch this, we adhere to his decision. But we also need to remove the cache - $sql = 'DELETE FROM ' . STYLES_TEMPLATE_DATA_TABLE . " - WHERE template_id = $style_id"; - $db->sql_query($sql); - } - - $sql_ary += array( - 'template_storedb' => $store_db, - ); - } - break; - } - - if (sizeof($sql_ary)) - { - $sql = "UPDATE $sql_from - SET " . $db->sql_build_array('UPDATE', $sql_ary) . " - WHERE {$mode}_id = $style_id"; - $db->sql_query($sql); - - // Making this the default style? - if ($mode == 'style' && $style_default) - { - set_config('default_style', $style_id); - } - } - - $cache->destroy('sql', STYLES_TABLE); - - add_log('admin', 'LOG_' . $l_type . '_EDIT_DETAILS', $name); - if (sizeof($error)) - { - trigger_error(implode('
    ', $error) . adm_back_link($this->u_action), E_USER_WARNING); - } - else - { - trigger_error($user->lang[$l_type . '_DETAILS_UPDATED'] . adm_back_link($this->u_action)); - } - } - - if ($mode == 'style') - { - foreach ($element_ary as $element => $table) - { - $sql = "SELECT {$element}_id, {$element}_name - FROM $table - ORDER BY {$element}_id ASC"; - $result = $db->sql_query($sql); - - ${$element . '_options'} = ''; - while ($row = $db->sql_fetchrow($result)) - { - $selected = ($row[$element . '_id'] == $style_row[$element . '_id']) ? ' selected="selected"' : ''; - ${$element . '_options'} .= ''; - } - $db->sql_freeresult($result); - } - } - - $this->page_title = 'EDIT_DETAILS_' . $l_type; - - $template->assign_vars(array( - 'S_DETAILS' => true, - 'S_ERROR_MSG' => (sizeof($error)) ? true : false, - 'S_STYLE' => ($mode == 'style') ? true : false, - 'S_TEMPLATE' => ($mode == 'template') ? true : false, - 'S_THEME' => ($mode == 'theme') ? true : false, - 'S_IMAGESET' => ($mode == 'imageset') ? true : false, - 'S_STORE_DB' => (isset($style_row[$mode . '_storedb'])) ? $style_row[$mode . '_storedb'] : 0, - 'S_STYLE_ACTIVE' => (isset($style_row['style_active'])) ? $style_row['style_active'] : 0, - 'S_STYLE_DEFAULT' => (isset($style_row['style_default'])) ? $style_row['style_default'] : 0, - - 'S_TEMPLATE_OPTIONS' => ($mode == 'style') ? $template_options : '', - 'S_THEME_OPTIONS' => ($mode == 'style') ? $theme_options : '', - 'S_IMAGESET_OPTIONS' => ($mode == 'style') ? $imageset_options : '', - - 'U_ACTION' => $this->u_action . '&action=details&id=' . $style_id, - 'U_BACK' => $this->u_action, - - 'L_TITLE' => $user->lang[$this->page_title], - 'L_EXPLAIN' => $user->lang[$this->page_title . '_EXPLAIN'], - 'L_NAME' => $user->lang[$l_type . '_NAME'], - 'L_LOCATION' => ($mode == 'template' || $mode == 'theme') ? $user->lang[$l_type . '_LOCATION'] : '', - 'L_LOCATION_EXPLAIN' => ($mode == 'template' || $mode == 'theme') ? $user->lang[$l_type . '_LOCATION_EXPLAIN'] : '', - - 'ERROR_MSG' => (sizeof($error)) ? implode('
    ', $error) : '', - 'NAME' => $style_row[$mode . '_name'], - 'COPYRIGHT' => $style_row[$mode . '_copyright'], - ) - ); - } - - /** - * Load css file contents - */ - function load_css_file($path, $filename) - { - global $phpbb_root_path; - - $file = "{$phpbb_root_path}styles/$path/theme/$filename"; - - if (file_exists($file) && ($content = file_get_contents($file))) - { - $content = trim($content); - } - else - { - $content = ''; - } - - return $content; - } - - /** - * Returns a string containing the value that should be used for the theme_data column in the theme database table. - * Includes contents of files loaded via @import - * - * @param array $theme_row is an associative array containing the theme's current database entry - * @param mixed $stylesheet can either be the new content for the stylesheet or false to load from the standard file - * @param string $root_path should only be used in case you want to use a different root path than "{$phpbb_root_path}styles/{$theme_row['theme_path']}" - * - * @return string Stylesheet data for theme_data column in the theme table - */ - function db_theme_data($theme_row, $stylesheet = false, $root_path = '') - { - global $phpbb_root_path; - - if (!$root_path) - { - $root_path = $phpbb_root_path . 'styles/' . $theme_row['theme_path']; - } - - if (!$stylesheet) - { - $stylesheet = ''; - if (file_exists($root_path . '/theme/stylesheet.css')) - { - $stylesheet = file_get_contents($root_path . '/theme/stylesheet.css'); - } - } - - // Match CSS imports - $matches = array(); - preg_match_all('/@import url\(["\'](.*)["\']\);/i', $stylesheet, $matches); - - if (sizeof($matches)) - { - foreach ($matches[0] as $idx => $match) - { - $stylesheet = str_replace($match, acp_styles::load_css_file($theme_row['theme_path'], $matches[1][$idx]), $stylesheet); - } - } - - // adjust paths - return str_replace('./', 'styles/' . $theme_row['theme_path'] . '/theme/', $stylesheet); - } - - /** - * Store template files into db - */ - function store_templates($mode, $style_id, $template_path, $filelist) - { - global $phpbb_root_path, $phpEx, $db; - - $template_path = $template_path . '/template/'; - $includes = array(); - foreach ($filelist as $pathfile => $file_ary) - { - foreach ($file_ary as $file) - { - if (!($fp = @fopen("{$phpbb_root_path}styles/$template_path$pathfile$file", 'r'))) - { - trigger_error("Could not open {$phpbb_root_path}styles/$template_path$pathfile$file", E_USER_ERROR); - } - $template_data = fread($fp, filesize("{$phpbb_root_path}styles/$template_path$pathfile$file")); - fclose($fp); - - if (preg_match_all('##is', $template_data, $matches)) - { - foreach ($matches[1] as $match) - { - $includes[trim($match)][] = $file; - } - } - } - } - - foreach ($filelist as $pathfile => $file_ary) - { - foreach ($file_ary as $file) - { - // Skip index. - if (strpos($file, 'index.') === 0) - { - continue; - } - - // We could do this using extended inserts ... but that could be one - // heck of a lot of data ... - $sql_ary = array( - 'template_id' => (int) $style_id, - 'template_filename' => "$pathfile$file", - 'template_included' => (isset($includes[$file])) ? implode(':', $includes[$file]) . ':' : '', - 'template_mtime' => (int) filemtime("{$phpbb_root_path}styles/$template_path$pathfile$file"), - 'template_data' => (string) file_get_contents("{$phpbb_root_path}styles/$template_path$pathfile$file"), - ); - - if ($mode == 'insert') - { - $sql = 'INSERT INTO ' . STYLES_TEMPLATE_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - } - else - { - $sql = 'UPDATE ' . STYLES_TEMPLATE_DATA_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " - WHERE template_id = $style_id - AND template_filename = '" . $db->sql_escape("$pathfile$file") . "'"; - } - $db->sql_query($sql); - } - } - } - - /** - * Returns an array containing all template filenames for one template that are currently cached. - * - * @param string $template_path contains the name of the template's folder in /styles/ - * - * @return array of filenames that exist in /styles/$template_path/template/ (without extension!) - */ - function template_cache_filelist($template_path) - { - global $phpbb_root_path, $phpEx, $user; - - $cache_prefix = 'tpl_' . $template_path; - - if (!($dp = @opendir("{$phpbb_root_path}cache"))) - { - trigger_error($user->lang['TEMPLATE_ERR_CACHE_READ'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $file_ary = array(); - while ($file = readdir($dp)) - { - if ($file[0] == '.') - { - continue; - } - - if (is_file($phpbb_root_path . 'cache/' . $file) && (strpos($file, $cache_prefix) === 0)) - { - $file_ary[] = str_replace('.', '/', preg_replace('#^' . preg_quote($cache_prefix, '#') . '_(.*?)\.html\.' . $phpEx . '$#i', '\1', $file)); - } - } - closedir($dp); - - return $file_ary; - } - - /** - * Destroys cached versions of template files - * - * @param array $template_row contains the template's row in the STYLES_TEMPLATE_TABLE database table - * @param mixed $file_ary is optional and may contain an array of template file names which should be refreshed in the cache. - * The file names should be the original template file names and not the cache file names. - */ - function clear_template_cache($template_row, $file_ary = false) - { - global $phpbb_root_path, $phpEx, $user; - - $cache_prefix = 'tpl_' . $template_row['template_path']; - - if (!$file_ary || !is_array($file_ary)) - { - $file_ary = $this->template_cache_filelist($template_row['template_path']); - $log_file_list = $user->lang['ALL_FILES']; - } - else - { - $log_file_list = implode(', ', $file_ary); - } - - foreach ($file_ary as $file) - { - $file = str_replace('/', '.', $file); - - $file = "{$phpbb_root_path}cache/{$cache_prefix}_$file.html.$phpEx"; - if (file_exists($file) && is_file($file)) - { - @unlink($file); - } - } - unset($file_ary); - - add_log('admin', 'LOG_TEMPLATE_CACHE_CLEARED', $template_row['template_name'], $log_file_list); - } - - /** - * Install Style/Template/Theme/Imageset - */ - function install($mode) - { - global $phpbb_root_path, $phpEx, $config, $db, $cache, $user, $template; - - $l_type = strtoupper($mode); - - $error = $installcfg = $style_row = array(); - $root_path = $cfg_file = ''; - $element_ary = array('template' => STYLES_TEMPLATE_TABLE, 'theme' => STYLES_THEME_TABLE, 'imageset' => STYLES_IMAGESET_TABLE); - - $install_path = request_var('path', ''); - $update = (isset($_POST['update'])) ? true : false; - - // Installing, obtain cfg file contents - if ($install_path) - { - $root_path = $phpbb_root_path . 'styles/' . $install_path . '/'; - $cfg_file = ($mode == 'style') ? "$root_path$mode.cfg" : "$root_path$mode/$mode.cfg"; - - if (!file_exists($cfg_file)) - { - $error[] = $user->lang[$l_type . '_ERR_NOT_' . $l_type]; - } - else - { - $installcfg = parse_cfg_file($cfg_file); - } - } - - // Installing - if (sizeof($installcfg)) - { - $name = $installcfg['name']; - $copyright = $installcfg['copyright']; - $version = $installcfg['version']; - - $style_row = array( - $mode . '_id' => 0, - $mode . '_name' => '', - $mode . '_copyright' => '' - ); - - switch ($mode) - { - case 'style': - - $style_row = array( - 'style_id' => 0, - 'style_name' => $installcfg['name'], - 'style_copyright' => $installcfg['copyright'] - ); - - $reqd_template = (isset($installcfg['required_template'])) ? $installcfg['required_template'] : false; - $reqd_theme = (isset($installcfg['required_theme'])) ? $installcfg['required_theme'] : false; - $reqd_imageset = (isset($installcfg['required_imageset'])) ? $installcfg['required_imageset'] : false; - - // Check to see if each element is already installed, if it is grab the id - foreach ($element_ary as $element => $table) - { - $style_row = array_merge($style_row, array( - $element . '_id' => 0, - $element . '_name' => '', - $element . '_copyright' => '') - ); - - $this->test_installed($element, $error, (${'reqd_' . $element}) ? $phpbb_root_path . 'styles/' . $reqd_template . '/' : $root_path, ${'reqd_' . $element}, $style_row[$element . '_id'], $style_row[$element . '_name'], $style_row[$element . '_copyright']); - - if (!$style_row[$element . '_name']) - { - $style_row[$element . '_name'] = $reqd_template; - } - } - - break; - - case 'template': - $this->test_installed('template', $error, $root_path, false, $style_row['template_id'], $style_row['template_name'], $style_row['template_copyright']); - break; - - case 'theme': - $this->test_installed('theme', $error, $root_path, false, $style_row['theme_id'], $style_row['theme_name'], $style_row['theme_copyright']); - break; - - case 'imageset': - $this->test_installed('imageset', $error, $root_path, false, $style_row['imageset_id'], $style_row['imageset_name'], $style_row['imageset_copyright']); - break; - } - } - else - { - trigger_error($user->lang['NO_' . $l_type] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $style_row['store_db'] = request_var('store_db', 0); - $style_row['style_active'] = request_var('style_active', 1); - $style_row['style_default'] = request_var('style_default', 0); - - // User has submitted form and no errors have occurred - if ($update && !sizeof($error)) - { - if ($mode == 'style') - { - foreach ($element_ary as $element => $table) - { - ${$element . '_root_path'} = (${'reqd_' . $element}) ? $phpbb_root_path . 'styles/' . ${'reqd_' . $element} . '/' : false; - ${$element . '_path'} = (${'reqd_' . $element}) ? ${'reqd_' . $element} : false; - } - $this->install_style($error, 'install', $root_path, $style_row['style_id'], $style_row['style_name'], $install_path, $style_row['style_copyright'], $style_row['style_active'], $style_row['style_default'], $style_row, $template_root_path, $template_path, $theme_root_path, $theme_path, $imageset_root_path, $imageset_path); - } - else - { - $style_row['store_db'] = $this->install_element($mode, $error, 'install', $root_path, $style_row[$mode . '_id'], $style_row[$mode . '_name'], $install_path, $style_row[$mode . '_copyright'], $style_row['store_db']); - } - - if (!sizeof($error)) - { - $cache->destroy('sql', STYLES_TABLE); - - $message = ($style_row['store_db']) ? '_ADDED_DB' : '_ADDED'; - trigger_error($user->lang[$l_type . $message] . adm_back_link($this->u_action)); - } - } - - $this->page_title = 'INSTALL_' . $l_type; - - $template->assign_vars(array( - 'S_DETAILS' => true, - 'S_INSTALL' => true, - 'S_ERROR_MSG' => (sizeof($error)) ? true : false, - 'S_STYLE' => ($mode == 'style') ? true : false, - 'S_TEMPLATE' => ($mode == 'template') ? true : false, - 'S_THEME' => ($mode == 'theme') ? true : false, - - 'S_STORE_DB' => (isset($style_row[$mode . '_storedb'])) ? $style_row[$mode . '_storedb'] : 0, - 'S_STYLE_ACTIVE' => (isset($style_row['style_active'])) ? $style_row['style_active'] : 0, - 'S_STYLE_DEFAULT' => (isset($style_row['style_default'])) ? $style_row['style_default'] : 0, - - 'U_ACTION' => $this->u_action . "&action=install&path=" . urlencode($install_path), - 'U_BACK' => $this->u_action, - - 'L_TITLE' => $user->lang[$this->page_title], - 'L_EXPLAIN' => $user->lang[$this->page_title . '_EXPLAIN'], - 'L_NAME' => $user->lang[$l_type . '_NAME'], - 'L_LOCATION' => ($mode == 'template' || $mode == 'theme') ? $user->lang[$l_type . '_LOCATION'] : '', - 'L_LOCATION_EXPLAIN' => ($mode == 'template' || $mode == 'theme') ? $user->lang[$l_type . '_LOCATION_EXPLAIN'] : '', - - 'ERROR_MSG' => (sizeof($error)) ? implode('
    ', $error) : '', - 'NAME' => $style_row[$mode . '_name'], - 'COPYRIGHT' => $style_row[$mode . '_copyright'], - 'TEMPLATE_NAME' => ($mode == 'style') ? $style_row['template_name'] : '', - 'THEME_NAME' => ($mode == 'style') ? $style_row['theme_name'] : '', - 'IMAGESET_NAME' => ($mode == 'style') ? $style_row['imageset_name'] : '') - ); - } - - /** - * Add new style - */ - function add($mode) - { - global $phpbb_root_path, $phpEx, $config, $db, $cache, $user, $template; - - $l_type = strtoupper($mode); - $element_ary = array('template' => STYLES_TEMPLATE_TABLE, 'theme' => STYLES_THEME_TABLE, 'imageset' => STYLES_IMAGESET_TABLE); - $error = array(); - - $style_row = array( - $mode . '_name' => utf8_normalize_nfc(request_var('name', '', true)), - $mode . '_copyright' => utf8_normalize_nfc(request_var('copyright', '', true)), - 'template_id' => 0, - 'theme_id' => 0, - 'imageset_id' => 0, - 'store_db' => request_var('store_db', 0), - 'style_active' => request_var('style_active', 1), - 'style_default' => request_var('style_default', 0), - ); - - $basis = request_var('basis', 0); - $update = (isset($_POST['update'])) ? true : false; - - if ($basis) - { - switch ($mode) - { - case 'style': - $sql_select = 'template_id, theme_id, imageset_id'; - $sql_from = STYLES_TABLE; - break; - - case 'template': - $sql_select = 'template_id'; - $sql_from = STYLES_TEMPLATE_TABLE; - break; - - case 'theme': - $sql_select = 'theme_id'; - $sql_from = STYLES_THEME_TABLE; - break; - - case 'imageset': - $sql_select = 'imageset_id'; - $sql_from = STYLES_IMAGESET_TABLE; - break; - } - - $sql = "SELECT $sql_select - FROM $sql_from - WHERE {$mode}_id = $basis"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - $error[] = $user->lang['NO_' . $l_type]; - } - - if (!sizeof($error)) - { - $style_row['template_id'] = (isset($row['template_id'])) ? $row['template_id'] : $style_row['template_id']; - $style_row['theme_id'] = (isset($row['theme_id'])) ? $row['theme_id'] : $style_row['theme_id']; - $style_row['imageset_id'] = (isset($row['imageset_id'])) ? $row['imageset_id'] : $style_row['imageset_id']; - } - } - - if ($update) - { - $style_row['template_id'] = request_var('template_id', $style_row['template_id']); - $style_row['theme_id'] = request_var('theme_id', $style_row['theme_id']); - $style_row['imageset_id'] = request_var('imageset_id', $style_row['imageset_id']); - - if ($mode == 'style' && (!$style_row['template_id'] || !$style_row['theme_id'] || !$style_row['imageset_id'])) - { - $error[] = $user->lang['STYLE_ERR_NO_IDS']; - } - } - - // User has submitted form and no errors have occurred - if ($update && !sizeof($error)) - { - if ($mode == 'style') - { - $style_row['style_id'] = 0; - - $this->install_style($error, 'add', '', $style_row['style_id'], $style_row['style_name'], '', $style_row['style_copyright'], $style_row['style_active'], $style_row['style_default'], $style_row); - } - - if (!sizeof($error)) - { - $cache->destroy('sql', STYLES_TABLE); - - $message = ($style_row['store_db']) ? '_ADDED_DB' : '_ADDED'; - trigger_error($user->lang[$l_type . $message] . adm_back_link($this->u_action)); - } - } - - if ($mode == 'style') - { - foreach ($element_ary as $element => $table) - { - $sql = "SELECT {$element}_id, {$element}_name - FROM $table - ORDER BY {$element}_id ASC"; - $result = $db->sql_query($sql); - - ${$element . '_options'} = ''; - while ($row = $db->sql_fetchrow($result)) - { - $selected = ($row[$element . '_id'] == $style_row[$element . '_id']) ? ' selected="selected"' : ''; - ${$element . '_options'} .= ''; - } - $db->sql_freeresult($result); - } - } - - $this->page_title = 'ADD_' . $l_type; - - $template->assign_vars(array( - 'S_DETAILS' => true, - 'S_ADD' => true, - 'S_ERROR_MSG' => (sizeof($error)) ? true : false, - 'S_STYLE' => ($mode == 'style') ? true : false, - 'S_TEMPLATE' => ($mode == 'template') ? true : false, - 'S_THEME' => ($mode == 'theme') ? true : false, - 'S_BASIS' => ($basis) ? true : false, - - 'S_STORE_DB' => (isset($style_row['storedb'])) ? $style_row['storedb'] : 0, - 'S_STYLE_ACTIVE' => (isset($style_row['style_active'])) ? $style_row['style_active'] : 0, - 'S_STYLE_DEFAULT' => (isset($style_row['style_default'])) ? $style_row['style_default'] : 0, - 'S_TEMPLATE_OPTIONS' => ($mode == 'style') ? $template_options : '', - 'S_THEME_OPTIONS' => ($mode == 'style') ? $theme_options : '', - 'S_IMAGESET_OPTIONS' => ($mode == 'style') ? $imageset_options : '', - - 'U_ACTION' => $this->u_action . '&action=add&basis=' . $basis, - 'U_BACK' => $this->u_action, - - 'L_TITLE' => $user->lang[$this->page_title], - 'L_EXPLAIN' => $user->lang[$this->page_title . '_EXPLAIN'], - 'L_NAME' => $user->lang[$l_type . '_NAME'], - 'L_LOCATION' => ($mode == 'template' || $mode == 'theme') ? $user->lang[$l_type . '_LOCATION'] : '', - 'L_LOCATION_EXPLAIN' => ($mode == 'template' || $mode == 'theme') ? $user->lang[$l_type . '_LOCATION_EXPLAIN'] : '', - - 'ERROR_MSG' => (sizeof($error)) ? implode('
    ', $error) : '', - 'NAME' => $style_row[$mode . '_name'], - 'COPYRIGHT' => $style_row[$mode . '_copyright']) - ); - - } - - /** - - $reqd_template = (isset($installcfg['required_template'])) ? $installcfg['required_template'] : false; - $reqd_theme = (isset($installcfg['required_theme'])) ? $installcfg['required_theme'] : false; - $reqd_imageset = (isset($installcfg['required_imageset'])) ? $installcfg['required_imageset'] : false; - - // Check to see if each element is already installed, if it is grab the id - foreach ($element_ary as $element => $table) - { - $style_row = array_merge($style_row, array( - $element . '_id' => 0, - $element . '_name' => '', - $element . '_copyright' => '') - ); - - $this->test_installed($element, $error, $root_path, ${'reqd_' . $element}, $style_row[$element . '_id'], $style_row[$element . '_name'], $style_row[$element . '_copyright']); - * Is this element installed? If not, grab its cfg details - */ - function test_installed($element, &$error, $root_path, $reqd_name, &$id, &$name, &$copyright) - { - global $db, $user; - - switch ($element) - { - case 'template': - $sql_from = STYLES_TEMPLATE_TABLE; - break; - - case 'theme': - $sql_from = STYLES_THEME_TABLE; - break; - - case 'imageset': - $sql_from = STYLES_IMAGESET_TABLE; - break; - } - - $l_element = strtoupper($element); - - $chk_name = ($reqd_name !== false) ? $reqd_name : $name; - - $sql = "SELECT {$element}_id, {$element}_name - FROM $sql_from - WHERE {$element}_name = '" . $db->sql_escape($chk_name) . "'"; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - $name = $row[$element . '_name']; - $id = $row[$element . '_id']; - } - else - { - if (!($cfg = @file("$root_path$element/$element.cfg"))) - { - $error[] = sprintf($user->lang['REQUIRES_' . $l_element], $reqd_name); - return false; - } - - $cfg = parse_cfg_file("$root_path$element/$element.cfg", $cfg); - - $name = $cfg['name']; - $copyright = $cfg['copyright']; - $id = 0; - - unset($cfg); - } - $db->sql_freeresult($result); - } - - /** - * Install/Add style - */ - function install_style(&$error, $action, $root_path, &$id, $name, $path, $copyright, $active, $default, &$style_row, $template_root_path = false, $template_path = false, $theme_root_path = false, $theme_path = false, $imageset_root_path = false, $imageset_path = false) - { - global $config, $db, $user; - - $element_ary = array('template', 'theme', 'imageset'); - - if (!$name) - { - $error[] = $user->lang['STYLE_ERR_STYLE_NAME']; - } - - // Check length settings - if (utf8_strlen($name) > 30) - { - $error[] = $user->lang['STYLE_ERR_NAME_LONG']; - } - - if (utf8_strlen($copyright) > 60) - { - $error[] = $user->lang['STYLE_ERR_COPY_LONG']; - } - - // Check if the name already exist - $sql = 'SELECT style_id - FROM ' . STYLES_TABLE . " - WHERE style_name = '" . $db->sql_escape($name) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - $error[] = $user->lang['STYLE_ERR_NAME_EXIST']; - } - - if (sizeof($error)) - { - return false; - } - - foreach ($element_ary as $element) - { - // Zero id value ... need to install element ... run usual checks - // and do the install if necessary - if (!$style_row[$element . '_id']) - { - $this->install_element($element, $error, $action, (${$element . '_root_path'}) ? ${$element . '_root_path'} : $root_path, $style_row[$element . '_id'], $style_row[$element . '_name'], (${$element . '_path'}) ? ${$element . '_path'} : $path, $style_row[$element . '_copyright']); - } - } - - if (!$style_row['template_id'] || !$style_row['theme_id'] || !$style_row['imageset_id']) - { - $error[] = $user->lang['STYLE_ERR_NO_IDS']; - } - - if (sizeof($error)) - { - return false; - } - - $db->sql_transaction('begin'); - - $sql_ary = array( - 'style_name' => $name, - 'style_copyright' => $copyright, - 'style_active' => (int) $active, - 'template_id' => (int) $style_row['template_id'], - 'theme_id' => (int) $style_row['theme_id'], - 'imageset_id' => (int) $style_row['imageset_id'], - ); - - $sql = 'INSERT INTO ' . STYLES_TABLE . ' - ' . $db->sql_build_array('INSERT', $sql_ary); - $db->sql_query($sql); - - $id = $db->sql_nextid(); - - if ($default) - { - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_style = $id - WHERE user_style = " . $config['default_style']; - $db->sql_query($sql); - - set_config('default_style', $id); - } - - $db->sql_transaction('commit'); - - add_log('admin', 'LOG_STYLE_ADD', $name); - } - - /** - * Install/add an element, doing various checks as we go - */ - function install_element($mode, &$error, $action, $root_path, &$id, $name, $path, $copyright, $store_db = 0) - { - global $phpbb_root_path, $db, $user; - - switch ($mode) - { - case 'template': - $sql_from = STYLES_TEMPLATE_TABLE; - break; - - case 'theme': - $sql_from = STYLES_THEME_TABLE; - break; - - case 'imageset': - $sql_from = STYLES_IMAGESET_TABLE; - break; - } - - $l_type = strtoupper($mode); - - if (!$name) - { - $error[] = $user->lang[$l_type . '_ERR_STYLE_NAME']; - } - - // Check length settings - if (utf8_strlen($name) > 30) - { - $error[] = $user->lang[$l_type . '_ERR_NAME_LONG']; - } - - if (utf8_strlen($copyright) > 60) - { - $error[] = $user->lang[$l_type . '_ERR_COPY_LONG']; - } - - // Check if the name already exist - $sql = "SELECT {$mode}_id - FROM $sql_from - WHERE {$mode}_name = '" . $db->sql_escape($name) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - // If it exist, we just use the style on installation - if ($action == 'install') - { - $id = $row[$mode . '_id']; - return false; - } - - $error[] = $user->lang[$l_type . '_ERR_NAME_EXIST']; - } - - if (sizeof($error)) - { - return false; - } - - $sql_ary = array( - $mode . '_name' => $name, - $mode . '_copyright' => $copyright, - $mode . '_path' => $path, - ); - - switch ($mode) - { - case 'template': - // We check if the template author defined a different bitfield - $cfg_data = parse_cfg_file("$root_path$mode/template.cfg"); - - if (!empty($cfg_data['template_bitfield'])) - { - $sql_ary['bbcode_bitfield'] = $cfg_data['template_bitfield']; - } - else - { - $sql_ary['bbcode_bitfield'] = TEMPLATE_BITFIELD; - } - - // We set a pre-defined bitfield here which we may use further in 3.2 - $sql_ary += array( - 'template_storedb' => $store_db - ); - break; - - case 'theme': - // We are only interested in the theme configuration for now - $theme_cfg = parse_cfg_file("{$phpbb_root_path}styles/$path/theme/theme.cfg"); - - if (isset($theme_cfg['parse_css_file']) && $theme_cfg['parse_css_file']) - { - $store_db = 1; - } - - $sql_ary += array( - 'theme_storedb' => $store_db, - 'theme_data' => ($store_db) ? $this->db_theme_data($sql_ary, false, $root_path) : '', - 'theme_mtime' => (int) filemtime("{$phpbb_root_path}styles/$path/theme/stylesheet.css") - ); - break; - - // all the heavy lifting is done later - case 'imageset': - break; - } - - $db->sql_transaction('begin'); - - $sql = "INSERT INTO $sql_from - " . $db->sql_build_array('INSERT', $sql_ary); - $db->sql_query($sql); - - $id = $db->sql_nextid(); - - if ($mode == 'template' && $store_db) - { - $filelist = filelist("{$root_path}template", '', 'html'); - $this->store_templates('insert', $id, $path, $filelist); - } - else if ($mode == 'imageset') - { - $cfg_data = parse_cfg_file("$root_path$mode/imageset.cfg"); - - $imageset_definitions = array(); - foreach ($this->imageset_keys as $topic => $key_array) - { - $imageset_definitions = array_merge($imageset_definitions, $key_array); - } - - foreach ($cfg_data as $key => $value) - { - if (strpos($value, '*') !== false) - { - if (substr($value, -1, 1) === '*') - { - list($image_filename, $image_height) = explode('*', $value); - $image_width = 0; - } - else - { - list($image_filename, $image_height, $image_width) = explode('*', $value); - } - } - else - { - $image_filename = $value; - $image_height = $image_width = 0; - } - - if (strpos($key, 'img_') === 0 && $image_filename) - { - $key = substr($key, 4); - if (in_array($key, $imageset_definitions)) - { - $sql_ary = array( - 'image_name' => $key, - 'image_filename' => str_replace('{PATH}', "styles/$path/imageset/", trim($image_filename)), - 'image_height' => (int) $image_height, - 'image_width' => (int) $image_width, - 'imageset_id' => (int) $id, - 'image_lang' => '', - ); - $db->sql_query('INSERT INTO ' . STYLES_IMAGESET_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); - } - } - } - unset($cfg_data); - - $sql = 'SELECT lang_dir - FROM ' . LANG_TABLE; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if (@file_exists("$root_path$mode/{$row['lang_dir']}/imageset.cfg")) - { - $cfg_data_imageset_data = parse_cfg_file("$root_path$mode/{$row['lang_dir']}/imageset.cfg"); - foreach ($cfg_data_imageset_data as $image_name => $value) - { - if (strpos($value, '*') !== false) - { - if (substr($value, -1, 1) === '*') - { - list($image_filename, $image_height) = explode('*', $value); - $image_width = 0; - } - else - { - list($image_filename, $image_height, $image_width) = explode('*', $value); - } - } - else - { - $image_filename = $value; - $image_height = $image_width = 0; - } - - if (strpos($image_name, 'img_') === 0 && $image_filename) - { - $image_name = substr($image_name, 4); - if (in_array($image_name, $imageset_definitions)) - { - $sql_ary = array( - 'image_name' => $image_name, - 'image_filename' => $image_filename, - 'image_height' => (int) $image_height, - 'image_width' => (int) $image_width, - 'imageset_id' => (int) $id, - 'image_lang' => $row['lang_dir'], - ); - $db->sql_query('INSERT INTO ' . STYLES_IMAGESET_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); - } - } - } - unset($cfg_data_imageset_data); - } - } - $db->sql_freeresult($result); - } - - $db->sql_transaction('commit'); - - $log = ($store_db) ? 'LOG_' . $l_type . '_ADD_DB' : 'LOG_' . $l_type . '_ADD_FS'; - add_log('admin', $log, $name); - - // Return store_db in case it had to be altered - return $store_db; - } - -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php deleted file mode 100644 index dbb25bdbbd..0000000000 --- a/phpBB/includes/acp/acp_update.php +++ /dev/null @@ -1,81 +0,0 @@ -add_lang('install'); - - $this->tpl_name = 'acp_update'; - $this->page_title = 'ACP_VERSION_CHECK'; - - // Get current and latest version - $errstr = ''; - $errno = 0; - - $info = get_remote_file('www.phpbb.com', '/updatecheck', ((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno); - - if ($info === false) - { - trigger_error($errstr, E_USER_WARNING); - } - - $info = explode("\n", $info); - $latest_version = trim($info[0]); - - $announcement_url = trim($info[1]); - $update_link = append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=update'); - - // Determine automatic update... - $sql = 'SELECT config_value - FROM ' . CONFIG_TABLE . " - WHERE config_name = 'version_update_from'"; - $result = $db->sql_query($sql); - $version_update_from = (string) $db->sql_fetchfield('config_value'); - $db->sql_freeresult($result); - - $current_version = (!empty($version_update_from)) ? $version_update_from : $config['version']; - - $up_to_date_automatic = (version_compare(str_replace('rc', 'RC', strtolower($current_version)), str_replace('rc', 'RC', strtolower($latest_version)), '<')) ? false : true; - $up_to_date = (version_compare(str_replace('rc', 'RC', strtolower($config['version'])), str_replace('rc', 'RC', strtolower($latest_version)), '<')) ? false : true; - - $template->assign_vars(array( - 'S_UP_TO_DATE' => $up_to_date, - 'S_UP_TO_DATE_AUTO' => $up_to_date_automatic, - 'S_VERSION_CHECK' => true, - 'U_ACTION' => $this->u_action, - - 'LATEST_VERSION' => $latest_version, - 'CURRENT_VERSION' => $config['version'], - 'AUTO_VERSION' => $version_update_from, - - 'UPDATE_INSTRUCTIONS' => sprintf($user->lang['UPDATE_INSTRUCTIONS'], $announcement_url, $update_link), - )); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php deleted file mode 100644 index 3ad8c88fb9..0000000000 --- a/phpBB/includes/acp/acp_users.php +++ /dev/null @@ -1,2078 +0,0 @@ -p_master = &$p_master; - } - - function main($id, $mode) - { - global $config, $db, $user, $auth, $template, $cache; - global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $file_uploads; - - $user->add_lang(array('posting', 'ucp', 'acp/users')); - $this->tpl_name = 'acp_users'; - $this->page_title = 'ACP_USER_' . strtoupper($mode); - - $error = array(); - $username = utf8_normalize_nfc(request_var('username', '', true)); - $user_id = request_var('u', 0); - $action = request_var('action', ''); - - $submit = (isset($_POST['update']) && !isset($_POST['cancel'])) ? true : false; - - $form_name = 'acp_users'; - add_form_key($form_name); - - // Whois (special case) - if ($action == 'whois') - { - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - - $this->page_title = 'WHOIS'; - $this->tpl_name = 'simple_body'; - - $user_ip = request_var('user_ip', ''); - $domain = gethostbyaddr($user_ip); - $ipwhois = user_ipwhois($user_ip); - - $template->assign_vars(array( - 'MESSAGE_TITLE' => sprintf($user->lang['IP_WHOIS_FOR'], $domain), - 'MESSAGE_TEXT' => nl2br($ipwhois)) - ); - - return; - } - - // Show user selection mask - if (!$username && !$user_id) - { - $this->page_title = 'SELECT_USER'; - - $template->assign_vars(array( - 'U_ACTION' => $this->u_action, - 'ANONYMOUS_USER_ID' => ANONYMOUS, - - 'S_SELECT_USER' => true, - 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=select_user&field=username&select_single=true'), - )); - - return; - } - - if (!$user_id) - { - $sql = 'SELECT user_id - FROM ' . USERS_TABLE . " - WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'"; - $result = $db->sql_query($sql); - $user_id = (int) $db->sql_fetchfield('user_id'); - $db->sql_freeresult($result); - - if (!$user_id) - { - trigger_error($user->lang['NO_USER'] . adm_back_link($this->u_action), E_USER_WARNING); - } - } - - // Generate content for all modes - $sql = 'SELECT u.*, s.* - FROM ' . USERS_TABLE . ' u - LEFT JOIN ' . SESSIONS_TABLE . ' s ON (s.session_user_id = u.user_id) - WHERE u.user_id = ' . $user_id . ' - ORDER BY s.session_time DESC'; - $result = $db->sql_query($sql); - $user_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$user_row) - { - trigger_error($user->lang['NO_USER'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - // Generate overall "header" for user admin - $s_form_options = ''; - - // Build modes dropdown list - $sql = 'SELECT module_mode, module_auth - FROM ' . MODULES_TABLE . " - WHERE module_basename = 'users' - AND module_enabled = 1 - AND module_class = 'acp' - ORDER BY left_id, module_mode"; - $result = $db->sql_query($sql); - - $dropdown_modes = array(); - while ($row = $db->sql_fetchrow($result)) - { - if (!$this->p_master->module_auth($row['module_auth'])) - { - continue; - } - - $dropdown_modes[$row['module_mode']] = true; - } - $db->sql_freeresult($result); - - foreach ($dropdown_modes as $module_mode => $null) - { - $selected = ($mode == $module_mode) ? ' selected="selected"' : ''; - $s_form_options .= ''; - } - - $template->assign_vars(array( - 'U_BACK' => $this->u_action, - 'U_MODE_SELECT' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&u=$user_id"), - 'U_ACTION' => $this->u_action . '&u=' . $user_id, - 'S_FORM_OPTIONS' => $s_form_options, - 'MANAGED_USERNAME' => $user_row['username']) - ); - - // Prevent normal users/admins change/view founders if they are not a founder by themselves - if ($user->data['user_type'] != USER_FOUNDER && $user_row['user_type'] == USER_FOUNDER) - { - trigger_error($user->lang['NOT_MANAGE_FOUNDER'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - switch ($mode) - { - case 'overview': - - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - - $user->add_lang('acp/ban'); - - $delete = request_var('delete', 0); - $delete_type = request_var('delete_type', ''); - $ip = request_var('ip', 'ip'); - - if ($submit) - { - // You can't delete the founder - if ($delete && $user_row['user_type'] != USER_FOUNDER) - { - if (!$auth->acl_get('a_userdel')) - { - trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - // Check if the user wants to remove himself or the guest user account - if ($user_id == ANONYMOUS) - { - trigger_error($user->lang['CANNOT_REMOVE_ANONYMOUS'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - if ($user_id == $user->data['user_id']) - { - trigger_error($user->lang['CANNOT_REMOVE_YOURSELF'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - if (confirm_box(true)) - { - user_delete($delete_type, $user_id, $user_row['username']); - - add_log('admin', 'LOG_USER_DELETED', $user_row['username']); - trigger_error($user->lang['USER_DELETED'] . adm_back_link($this->u_action)); - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'u' => $user_id, - 'i' => $id, - 'mode' => $mode, - 'action' => $action, - 'update' => true, - 'delete' => 1, - 'delete_type' => $delete_type)) - ); - } - } - - // Handle quicktool actions - switch ($action) - { - case 'banuser': - case 'banemail': - case 'banip': - - if ($user_id == $user->data['user_id']) - { - trigger_error($user->lang['CANNOT_BAN_YOURSELF'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - if ($user_row['user_type'] == USER_FOUNDER) - { - trigger_error($user->lang['CANNOT_BAN_FOUNDER'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - $ban = array(); - - switch ($action) - { - case 'banuser': - $ban[] = $user_row['username']; - $reason = 'USER_ADMIN_BAN_NAME_REASON'; - $log = 'LOG_USER_BAN_USER'; - break; - - case 'banemail': - $ban[] = $user_row['user_email']; - $reason = 'USER_ADMIN_BAN_EMAIL_REASON'; - $log = 'LOG_USER_BAN_EMAIL'; - break; - - case 'banip': - $ban[] = $user_row['user_ip']; - - $sql = 'SELECT DISTINCT poster_ip - FROM ' . POSTS_TABLE . " - WHERE poster_id = $user_id"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $ban[] = $row['poster_ip']; - } - $db->sql_freeresult($result); - - $reason = 'USER_ADMIN_BAN_IP_REASON'; - $log = 'LOG_USER_BAN_IP'; - break; - } - - $ban_reason = utf8_normalize_nfc(request_var('ban_reason', $user->lang[$reason], true)); - $ban_give_reason = utf8_normalize_nfc(request_var('ban_give_reason', '', true)); - - // Log not used at the moment, we simply utilize the ban function. - $result = user_ban(substr($action, 3), $ban, 0, 0, 0, $ban_reason, $ban_give_reason); - - trigger_error((($result === false) ? $user->lang['BAN_ALREADY_ENTERED'] : $user->lang['BAN_SUCCESSFUL']) . adm_back_link($this->u_action . '&u=' . $user_id)); - - break; - - case 'reactivate': - - if ($user_id == $user->data['user_id']) - { - trigger_error($user->lang['CANNOT_FORCE_REACT_YOURSELF'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - if ($user_row['user_type'] == USER_FOUNDER) - { - trigger_error($user->lang['CANNOT_FORCE_REACT_FOUNDER'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - if ($user_row['user_type'] == USER_IGNORE) - { - trigger_error($user->lang['CANNOT_FORCE_REACT_BOT'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - if ($config['email_enable']) - { - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - - $server_url = generate_board_url(); - - $user_actkey = gen_rand_string(10); - $key_len = 54 - (strlen($server_url)); - $key_len = ($key_len > 6) ? $key_len : 6; - $user_actkey = substr($user_actkey, 0, $key_len); - $email_template = ($user_row['user_type'] == USER_NORMAL) ? 'user_reactivate_account' : 'user_resend_inactive'; - - if ($user_row['user_type'] == USER_NORMAL) - { - user_active_flip('deactivate', $user_id, INACTIVE_REMIND); - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_actkey = '" . $db->sql_escape($user_actkey) . "' - WHERE user_id = $user_id"; - $db->sql_query($sql); - } - else - { - // Grabbing the last confirm key - we only send a reminder - $sql = 'SELECT user_actkey - FROM ' . USERS_TABLE . ' - WHERE user_id = ' . $user_id; - $result = $db->sql_query($sql); - $user_actkey = (string) $db->sql_fetchfield('user_actkey'); - $db->sql_freeresult($result); - } - - $messenger = new messenger(false); - - $messenger->template($email_template, $user_row['user_lang']); - - $messenger->to($user_row['user_email'], $user_row['username']); - - $messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); - $messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']); - $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']); - $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); - - $messenger->assign_vars(array( - 'WELCOME_MSG' => htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])), - 'USERNAME' => htmlspecialchars_decode($user_row['username']), - 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k=$user_actkey") - ); - - $messenger->send(NOTIFY_EMAIL); - - add_log('admin', 'LOG_USER_REACTIVATE', $user_row['username']); - add_log('user', $user_id, 'LOG_USER_REACTIVATE_USER'); - - trigger_error($user->lang['FORCE_REACTIVATION_SUCCESS'] . adm_back_link($this->u_action . '&u=' . $user_id)); - } - - break; - - case 'active': - - if ($user_id == $user->data['user_id']) - { - // It is only deactivation since the user is already activated (else he would not have reached this page) - trigger_error($user->lang['CANNOT_DEACTIVATE_YOURSELF'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - if ($user_row['user_type'] == USER_FOUNDER) - { - trigger_error($user->lang['CANNOT_DEACTIVATE_FOUNDER'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - if ($user_row['user_type'] == USER_IGNORE) - { - trigger_error($user->lang['CANNOT_DEACTIVATE_BOT'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - user_active_flip('flip', $user_id); - - $message = ($user_row['user_type'] == USER_INACTIVE) ? 'USER_ADMIN_ACTIVATED' : 'USER_ADMIN_DEACTIVED'; - $log = ($user_row['user_type'] == USER_INACTIVE) ? 'LOG_USER_ACTIVE' : 'LOG_USER_INACTIVE'; - - add_log('admin', $log, $user_row['username']); - add_log('user', $user_id, $log . '_USER'); - - trigger_error($user->lang[$message] . adm_back_link($this->u_action . '&u=' . $user_id)); - - break; - - case 'delsig': - - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - $sql_ary = array( - 'user_sig' => '', - 'user_sig_bbcode_uid' => '', - 'user_sig_bbcode_bitfield' => '' - ); - - $sql = 'UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " - WHERE user_id = $user_id"; - $db->sql_query($sql); - - add_log('admin', 'LOG_USER_DEL_SIG', $user_row['username']); - add_log('user', $user_id, 'LOG_USER_DEL_SIG_USER'); - - trigger_error($user->lang['USER_ADMIN_SIG_REMOVED'] . adm_back_link($this->u_action . '&u=' . $user_id)); - - break; - - case 'delavatar': - - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - $sql_ary = array( - 'user_avatar' => '', - 'user_avatar_type' => 0, - 'user_avatar_width' => 0, - 'user_avatar_height' => 0, - ); - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " - WHERE user_id = $user_id"; - $db->sql_query($sql); - - // Delete old avatar if present - if ($user_row['user_avatar'] && $user_row['user_avatar_type'] != AVATAR_GALLERY) - { - avatar_delete('user', $user_row); - } - - add_log('admin', 'LOG_USER_DEL_AVATAR', $user_row['username']); - add_log('user', $user_id, 'LOG_USER_DEL_AVATAR_USER'); - - trigger_error($user->lang['USER_ADMIN_AVATAR_REMOVED'] . adm_back_link($this->u_action . '&u=' . $user_id)); - break; - - case 'delposts': - - if (confirm_box(true)) - { - // Delete posts, attachments, etc. - delete_posts('poster_id', $user_id); - - add_log('admin', 'LOG_USER_DEL_POSTS', $user_row['username']); - trigger_error($user->lang['USER_POSTS_DELETED'] . adm_back_link($this->u_action . '&u=' . $user_id)); - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'u' => $user_id, - 'i' => $id, - 'mode' => $mode, - 'action' => $action, - 'update' => true)) - ); - } - - break; - - case 'delattach': - - if (confirm_box(true)) - { - delete_attachments('user', $user_id); - - add_log('admin', 'LOG_USER_DEL_ATTACH', $user_row['username']); - trigger_error($user->lang['USER_ATTACHMENTS_REMOVED'] . adm_back_link($this->u_action . '&u=' . $user_id)); - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'u' => $user_id, - 'i' => $id, - 'mode' => $mode, - 'action' => $action, - 'update' => true)) - ); - } - - break; - - case 'moveposts': - - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - $user->add_lang('acp/forums'); - - $new_forum_id = request_var('new_f', 0); - - if (!$new_forum_id) - { - $this->page_title = 'USER_ADMIN_MOVE_POSTS'; - - $template->assign_vars(array( - 'S_SELECT_FORUM' => true, - 'U_ACTION' => $this->u_action . "&action=$action&u=$user_id", - 'U_BACK' => $this->u_action . "&u=$user_id", - 'S_FORUM_OPTIONS' => make_forum_select(false, false, false, true)) - ); - - return; - } - - // Is the new forum postable to? - $sql = 'SELECT forum_name, forum_type - FROM ' . FORUMS_TABLE . " - WHERE forum_id = $new_forum_id"; - $result = $db->sql_query($sql); - $forum_info = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$forum_info) - { - trigger_error($user->lang['NO_FORUM'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - if ($forum_info['forum_type'] != FORUM_POST) - { - trigger_error($user->lang['MOVE_POSTS_NO_POSTABLE_FORUM'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - // Two stage? - // Move topics comprising only posts from this user - $topic_id_ary = $move_topic_ary = $move_post_ary = $new_topic_id_ary = array(); - $forum_id_ary = array($new_forum_id); - - $sql = 'SELECT topic_id, COUNT(post_id) AS total_posts - FROM ' . POSTS_TABLE . " - WHERE poster_id = $user_id - AND forum_id <> $new_forum_id - GROUP BY topic_id"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $topic_id_ary[$row['topic_id']] = $row['total_posts']; - } - $db->sql_freeresult($result); - - if (sizeof($topic_id_ary)) - { - $sql = 'SELECT topic_id, forum_id, topic_title, topic_replies, topic_replies_real, topic_attachment - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', array_keys($topic_id_ary)); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if (max($row['topic_replies'], $row['topic_replies_real']) + 1 == $topic_id_ary[$row['topic_id']]) - { - $move_topic_ary[] = $row['topic_id']; - } - else - { - $move_post_ary[$row['topic_id']]['title'] = $row['topic_title']; - $move_post_ary[$row['topic_id']]['attach'] = ($row['topic_attachment']) ? 1 : 0; - } - - $forum_id_ary[] = $row['forum_id']; - } - $db->sql_freeresult($result); - } - - // Entire topic comprises posts by this user, move these topics - if (sizeof($move_topic_ary)) - { - move_topics($move_topic_ary, $new_forum_id, false); - } - - if (sizeof($move_post_ary)) - { - // Create new topic - // Update post_ids, report_ids, attachment_ids - foreach ($move_post_ary as $topic_id => $post_ary) - { - // Create new topic - $sql = 'INSERT INTO ' . TOPICS_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'topic_poster' => $user_id, - 'topic_time' => time(), - 'forum_id' => $new_forum_id, - 'icon_id' => 0, - 'topic_approved' => 1, - 'topic_title' => $post_ary['title'], - 'topic_first_poster_name' => $user_row['username'], - 'topic_type' => POST_NORMAL, - 'topic_time_limit' => 0, - 'topic_attachment' => $post_ary['attach']) - ); - $db->sql_query($sql); - - $new_topic_id = $db->sql_nextid(); - - // Move posts - $sql = 'UPDATE ' . POSTS_TABLE . " - SET forum_id = $new_forum_id, topic_id = $new_topic_id - WHERE topic_id = $topic_id - AND poster_id = $user_id"; - $db->sql_query($sql); - - if ($post_ary['attach']) - { - $sql = 'UPDATE ' . ATTACHMENTS_TABLE . " - SET topic_id = $new_topic_id - WHERE topic_id = $topic_id - AND poster_id = $user_id"; - $db->sql_query($sql); - } - - $new_topic_id_ary[] = $new_topic_id; - } - } - - $forum_id_ary = array_unique($forum_id_ary); - $topic_id_ary = array_unique(array_merge(array_keys($topic_id_ary), $new_topic_id_ary)); - - if (sizeof($topic_id_ary)) - { - sync('reported', 'topic_id', $topic_id_ary); - sync('topic', 'topic_id', $topic_id_ary); - } - - if (sizeof($forum_id_ary)) - { - sync('forum', 'forum_id', $forum_id_ary, false, true); - } - - - add_log('admin', 'LOG_USER_MOVE_POSTS', $user_row['username'], $forum_info['forum_name']); - add_log('user', $user_id, 'LOG_USER_MOVE_POSTS_USER', $forum_info['forum_name']); - - trigger_error($user->lang['USER_POSTS_MOVED'] . adm_back_link($this->u_action . '&u=' . $user_id)); - - break; - } - - // Handle registration info updates - $data = array( - 'username' => utf8_normalize_nfc(request_var('user', $user_row['username'], true)), - 'user_founder' => request_var('user_founder', ($user_row['user_type'] == USER_FOUNDER) ? 1 : 0), - 'email' => strtolower(request_var('user_email', $user_row['user_email'])), - 'email_confirm' => strtolower(request_var('email_confirm', '')), - 'new_password' => request_var('new_password', '', true), - 'password_confirm' => request_var('password_confirm', '', true), - ); - - // Validation data - we do not check the password complexity setting here - $check_ary = array( - 'new_password' => array( - array('string', true, $config['min_pass_chars'], $config['max_pass_chars']), - array('password')), - 'password_confirm' => array('string', true, $config['min_pass_chars'], $config['max_pass_chars']), - ); - - // Check username if altered - if ($data['username'] != $user_row['username']) - { - $check_ary += array( - 'username' => array( - array('string', false, $config['min_name_chars'], $config['max_name_chars']), - array('username', $user_row['username']) - ), - ); - } - - // Check email if altered - if ($data['email'] != $user_row['user_email']) - { - $check_ary += array( - 'email' => array( - array('string', false, 6, 60), - array('email', $user_row['user_email']) - ), - 'email_confirm' => array('string', true, 6, 60) - ); - } - - $error = validate_data($data, $check_ary); - - if ($data['new_password'] && $data['password_confirm'] != $data['new_password']) - { - $error[] = 'NEW_PASSWORD_ERROR'; - } - - if ($data['email'] != $user_row['user_email'] && $data['email_confirm'] != $data['email']) - { - $error[] = 'NEW_EMAIL_ERROR'; - } - - if (!check_form_key($form_name)) - { - $error[] = 'FORM_INVALID'; - } - - // Which updates do we need to do? - $update_username = ($user_row['username'] != $data['username']) ? $data['username'] : false; - $update_password = ($data['new_password'] && !phpbb_check_hash($user_row['user_password'], $data['new_password'])) ? true : false; - $update_email = ($data['email'] != $user_row['user_email']) ? $data['email'] : false; - - if (!sizeof($error)) - { - $sql_ary = array(); - - if ($user_row['user_type'] != USER_FOUNDER || $user->data['user_type'] == USER_FOUNDER) - { - // Only allow founders updating the founder status... - if ($user->data['user_type'] == USER_FOUNDER) - { - // Setting a normal member to be a founder - if ($data['user_founder'] && $user_row['user_type'] != USER_FOUNDER) - { - // Make sure the user is not setting an Inactive or ignored user to be a founder - if ($user_row['user_type'] == USER_IGNORE) - { - trigger_error($user->lang['CANNOT_SET_FOUNDER_IGNORED'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - if ($user_row['user_type'] == USER_INACTIVE) - { - trigger_error($user->lang['CANNOT_SET_FOUNDER_INACTIVE'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - $sql_ary['user_type'] = USER_FOUNDER; - } - else if (!$data['user_founder'] && $user_row['user_type'] == USER_FOUNDER) - { - // Check if at least one founder is present - $sql = 'SELECT user_id - FROM ' . USERS_TABLE . ' - WHERE user_type = ' . USER_FOUNDER . ' - AND user_id <> ' . $user_id; - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - $sql_ary['user_type'] = USER_NORMAL; - } - else - { - trigger_error($user->lang['AT_LEAST_ONE_FOUNDER'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - } - } - } - - if ($update_username !== false) - { - $sql_ary['username'] = $update_username; - $sql_ary['username_clean'] = utf8_clean_string($update_username); - - add_log('user', $user_id, 'LOG_USER_UPDATE_NAME', $user_row['username'], $update_username); - } - - if ($update_email !== false) - { - $sql_ary += array( - 'user_email' => $update_email, - 'user_email_hash' => hexdec(crc32($update_email) . strlen($update_email)) - ); - - add_log('user', $user_id, 'LOG_USER_UPDATE_EMAIL', $user_row['username'], $user_row['user_email'], $update_email); - } - - if ($update_password) - { - $sql_ary += array( - 'user_password' => phpbb_hash($data['new_password']), - 'user_passchg' => time(), - 'user_pass_convert' => 0, - ); - - $user->reset_login_keys($user_id); - add_log('user', $user_id, 'LOG_USER_NEW_PASSWORD', $user_row['username']); - } - - if (sizeof($sql_ary)) - { - $sql = 'UPDATE ' . USERS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_id = ' . $user_id; - $db->sql_query($sql); - } - - if ($update_username) - { - user_update_name($user_row['username'], $update_username); - } - - // Let the users permissions being updated - $auth->acl_clear_prefetch($user_id); - - add_log('admin', 'LOG_USER_USER_UPDATE', $data['username']); - - trigger_error($user->lang['USER_OVERVIEW_UPDATED'] . adm_back_link($this->u_action . '&u=' . $user_id)); - } - - // Replace "error" strings with their real, localised form - $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); - } - - if ($user_id == $user->data['user_id']) - { - $quick_tool_ary = array('delsig' => 'DEL_SIG', 'delavatar' => 'DEL_AVATAR', 'moveposts' => 'MOVE_POSTS', 'delposts' => 'DEL_POSTS', 'delattach' => 'DEL_ATTACH'); - } - else - { - $quick_tool_ary = array(); - - if ($user_row['user_type'] != USER_FOUNDER) - { - $quick_tool_ary += array('banuser' => 'BAN_USER', 'banemail' => 'BAN_EMAIL', 'banip' => 'BAN_IP'); - } - - if ($user_row['user_type'] != USER_FOUNDER && $user_row['user_type'] != USER_IGNORE) - { - $quick_tool_ary += array('active' => (($user_row['user_type'] == USER_INACTIVE) ? 'ACTIVATE' : 'DEACTIVATE')); - } - - $quick_tool_ary += array('delsig' => 'DEL_SIG', 'delavatar' => 'DEL_AVATAR', 'moveposts' => 'MOVE_POSTS', 'delposts' => 'DEL_POSTS', 'delattach' => 'DEL_ATTACH'); - - if ($config['email_enable'] && ($user_row['user_type'] == USER_NORMAL || $user_row['user_type'] == USER_INACTIVE)) - { - $quick_tool_ary['reactivate'] = 'FORCE'; - } - } - - $s_action_options = ''; - foreach ($quick_tool_ary as $value => $lang) - { - $s_action_options .= ''; - } - - if ($config['load_onlinetrack']) - { - $sql = 'SELECT MAX(session_time) AS session_time, MIN(session_viewonline) AS session_viewonline - FROM ' . SESSIONS_TABLE . " - WHERE session_user_id = $user_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $user_row['session_time'] = (isset($row['session_time'])) ? $row['session_time'] : 0; - $user_row['session_viewonline'] = (isset($row['session_viewonline'])) ? $row['session_viewonline'] : 0; - unset($row); - } - - $last_visit = (!empty($user_row['session_time'])) ? $user_row['session_time'] : $user_row['user_lastvisit']; - - $inactive_reason = ''; - if ($user_row['user_type'] == USER_INACTIVE) - { - $inactive_reason = $user->lang['INACTIVE_REASON_UNKNOWN']; - - switch ($user_row['user_inactive_reason']) - { - case INACTIVE_REGISTER: - $inactive_reason = $user->lang['INACTIVE_REASON_REGISTER']; - break; - - case INACTIVE_PROFILE: - $inactive_reason = $user->lang['INACTIVE_REASON_PROFILE']; - break; - - case INACTIVE_MANUAL: - $inactive_reason = $user->lang['INACTIVE_REASON_MANUAL']; - break; - - case INACTIVE_REMIND: - $inactive_reason = $user->lang['INACTIVE_REASON_REMIND']; - break; - } - } - - $template->assign_vars(array( - 'L_NAME_CHARS_EXPLAIN' => sprintf($user->lang[$config['allow_name_chars'] . '_EXPLAIN'], $config['min_name_chars'], $config['max_name_chars']), - 'L_CHANGE_PASSWORD_EXPLAIN' => sprintf($user->lang[$config['pass_complex'] . '_EXPLAIN'], $config['min_pass_chars'], $config['max_pass_chars']), - 'S_FOUNDER' => ($user->data['user_type'] == USER_FOUNDER) ? true : false, - - 'S_OVERVIEW' => true, - 'S_USER_IP' => ($user_row['user_ip']) ? true : false, - 'S_USER_FOUNDER' => ($user_row['user_type'] == USER_FOUNDER) ? true : false, - 'S_ACTION_OPTIONS' => $s_action_options, - 'S_OWN_ACCOUNT' => ($user_id == $user->data['user_id']) ? true : false, - 'S_USER_INACTIVE' => ($user_row['user_type'] == USER_INACTIVE) ? true : false, - - 'U_SHOW_IP' => $this->u_action . "&u=$user_id&ip=" . (($ip == 'ip') ? 'hostname' : 'ip'), - 'U_WHOIS' => $this->u_action . "&action=whois&user_ip={$user_row['user_ip']}", - - 'U_SWITCH_PERMISSIONS' => ($auth->acl_get('a_switchperm') && $user->data['user_id'] != $user_row['user_id']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", "mode=switch_perm&u={$user_row['user_id']}") : '', - - 'USER' => $user_row['username'], - 'USER_REGISTERED' => $user->format_date($user_row['user_regdate']), - 'REGISTERED_IP' => ($ip == 'hostname') ? gethostbyaddr($user_row['user_ip']) : $user_row['user_ip'], - 'USER_LASTACTIVE' => ($last_visit) ? $user->format_date($last_visit) : ' - ', - 'USER_EMAIL' => $user_row['user_email'], - 'USER_WARNINGS' => $user_row['user_warnings'], - 'USER_POSTS' => $user_row['user_posts'], - 'USER_INACTIVE_REASON' => $inactive_reason, - )); - - break; - - case 'feedback': - - $user->add_lang('mcp'); - - // Set up general vars - $start = request_var('start', 0); - $deletemark = (isset($_POST['delmarked'])) ? true : false; - $deleteall = (isset($_POST['delall'])) ? true : false; - $marked = request_var('mark', array(0)); - $message = utf8_normalize_nfc(request_var('message', '', true)); - - // Sort keys - $sort_days = request_var('st', 0); - $sort_key = request_var('sk', 't'); - $sort_dir = request_var('sd', 'd'); - - // Delete entries if requested and able - if (($deletemark || $deleteall) && $auth->acl_get('a_clearlogs')) - { - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - $where_sql = ''; - if ($deletemark && $marked) - { - $sql_in = array(); - foreach ($marked as $mark) - { - $sql_in[] = $mark; - } - $where_sql = ' AND ' . $db->sql_in_set('log_id', $sql_in); - unset($sql_in); - } - - if ($where_sql || $deleteall) - { - $sql = 'DELETE FROM ' . LOG_TABLE . ' - WHERE log_type = ' . LOG_USERS . " - $where_sql"; - $db->sql_query($sql); - - add_log('admin', 'LOG_CLEAR_USER', $user_row['username']); - } - } - - if ($submit && $message) - { - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - add_log('admin', 'LOG_USER_FEEDBACK', $user_row['username']); - add_log('mod', 0, 0, 'LOG_USER_FEEDBACK', $user_row['username']); - add_log('user', $user_id, 'LOG_USER_GENERAL', $message); - - trigger_error($user->lang['USER_FEEDBACK_ADDED'] . adm_back_link($this->u_action . '&u=' . $user_id)); - } - - // Sorting - $limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); - $sort_by_text = array('u' => $user->lang['SORT_USERNAME'], 't' => $user->lang['SORT_DATE'], 'i' => $user->lang['SORT_IP'], 'o' => $user->lang['SORT_ACTION']); - $sort_by_sql = array('u' => 'u.username_clean', 't' => 'l.log_time', 'i' => 'l.log_ip', 'o' => 'l.log_operation'); - - $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = ''; - gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); - - // Define where and sort sql for use in displaying logs - $sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0; - $sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC'); - - // Grab log data - $log_data = array(); - $log_count = 0; - view_log('user', $log_data, $log_count, $config['topics_per_page'], $start, 0, 0, $user_id, $sql_where, $sql_sort); - - $template->assign_vars(array( - 'S_FEEDBACK' => true, - 'S_ON_PAGE' => on_page($log_count, $config['topics_per_page'], $start), - 'PAGINATION' => generate_pagination($this->u_action . "&u=$user_id&$u_sort_param", $log_count, $config['topics_per_page'], $start, true), - - 'S_LIMIT_DAYS' => $s_limit_days, - 'S_SORT_KEY' => $s_sort_key, - 'S_SORT_DIR' => $s_sort_dir, - 'S_CLEARLOGS' => $auth->acl_get('a_clearlogs')) - ); - - foreach ($log_data as $row) - { - $template->assign_block_vars('log', array( - 'USERNAME' => $row['username_full'], - 'IP' => $row['ip'], - 'DATE' => $user->format_date($row['time']), - 'ACTION' => nl2br($row['action']), - 'ID' => $row['id']) - ); - } - - break; - - case 'profile': - - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx); - - $cp = new custom_profile(); - - $cp_data = $cp_error = array(); - - $sql = 'SELECT lang_id - FROM ' . LANG_TABLE . " - WHERE lang_iso = '" . $db->sql_escape($user->data['user_lang']) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $user_row['iso_lang_id'] = $row['lang_id']; - - $data = array( - 'icq' => request_var('icq', $user_row['user_icq']), - 'aim' => request_var('aim', $user_row['user_aim']), - 'msn' => request_var('msn', $user_row['user_msnm']), - 'yim' => request_var('yim', $user_row['user_yim']), - 'jabber' => utf8_normalize_nfc(request_var('jabber', $user_row['user_jabber'], true)), - 'website' => request_var('website', $user_row['user_website']), - 'location' => utf8_normalize_nfc(request_var('location', $user_row['user_from'], true)), - 'occupation' => utf8_normalize_nfc(request_var('occupation', $user_row['user_occ'], true)), - 'interests' => utf8_normalize_nfc(request_var('interests', $user_row['user_interests'], true)), - 'bday_day' => 0, - 'bday_month' => 0, - 'bday_year' => 0, - ); - - if ($user_row['user_birthday']) - { - list($data['bday_day'], $data['bday_month'], $data['bday_year']) = explode('-', $user_row['user_birthday']); - } - - $data['bday_day'] = request_var('bday_day', $data['bday_day']); - $data['bday_month'] = request_var('bday_month', $data['bday_month']); - $data['bday_year'] = request_var('bday_year', $data['bday_year']); - $data['user_birthday'] = sprintf('%2d-%2d-%4d', $data['bday_day'], $data['bday_month'], $data['bday_year']); - - - if ($submit) - { - $error = validate_data($data, array( - 'icq' => array( - array('string', true, 3, 15), - array('match', true, '#^[0-9]+$#i')), - 'aim' => array('string', true, 3, 255), - 'msn' => array('string', true, 5, 255), - 'jabber' => array( - array('string', true, 5, 255), - array('jabber')), - 'yim' => array('string', true, 5, 255), - 'website' => array( - array('string', true, 12, 255), - array('match', true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')), - 'location' => array('string', true, 2, 255), - 'occupation' => array('string', true, 2, 500), - 'interests' => array('string', true, 2, 500), - 'bday_day' => array('num', true, 1, 31), - 'bday_month' => array('num', true, 1, 12), - 'bday_year' => array('num', true, 1901, gmdate('Y', time())), - 'user_birthday' => array('date', true), - )); - - // validate custom profile fields - $cp->submit_cp_field('profile', $user_row['iso_lang_id'], $cp_data, $cp_error); - - if (sizeof($cp_error)) - { - $error = array_merge($error, $cp_error); - } - if (!check_form_key($form_name)) - { - $error[] = 'FORM_INVALID'; - } - - if (!sizeof($error)) - { - $sql_ary = array( - 'user_icq' => $data['icq'], - 'user_aim' => $data['aim'], - 'user_msnm' => $data['msn'], - 'user_yim' => $data['yim'], - 'user_jabber' => $data['jabber'], - 'user_website' => $data['website'], - 'user_from' => $data['location'], - 'user_occ' => $data['occupation'], - 'user_interests'=> $data['interests'], - 'user_birthday' => $data['user_birthday'], - ); - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " - WHERE user_id = $user_id"; - $db->sql_query($sql); - - // Update Custom Fields - if (sizeof($cp_data)) - { - switch ($db->dbms_type) - { - case 'oracle': - case 'firebird': - case 'postgres': - case 'db2': - $right_delim = $left_delim = '"'; - break; - - case 'sqlite': - case 'mssql': - $right_delim = ']'; - $left_delim = '['; - break; - - case 'mysql': - $right_delim = $left_delim = '`'; - break; - } - - foreach ($cp_data as $key => $value) - { - $cp_data[$left_delim . $key . $right_delim] = $value; - unset($cp_data[$key]); - } - - $sql = 'UPDATE ' . PROFILE_FIELDS_DATA_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $cp_data) . " - WHERE user_id = $user_id"; - $db->sql_query($sql); - - if (!$db->sql_affectedrows()) - { - $cp_data['user_id'] = (int) $user_id; - - $db->sql_return_on_error(true); - - $sql = 'INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $cp_data); - $db->sql_query($sql); - - $db->sql_return_on_error(false); - } - } - - trigger_error($user->lang['USER_PROFILE_UPDATED'] . adm_back_link($this->u_action . '&u=' . $user_id)); - } - - // Replace "error" strings with their real, localised form - $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); - } - - $s_birthday_day_options = ''; - for ($i = 1; $i < 32; $i++) - { - $selected = ($i == $data['bday_day']) ? ' selected="selected"' : ''; - $s_birthday_day_options .= ""; - } - - $s_birthday_month_options = ''; - for ($i = 1; $i < 13; $i++) - { - $selected = ($i == $data['bday_month']) ? ' selected="selected"' : ''; - $s_birthday_month_options .= ""; - } - $s_birthday_year_options = ''; - - $now = getdate(); - $s_birthday_year_options = ''; - for ($i = $now['year'] - 100; $i < $now['year']; $i++) - { - $selected = ($i == $data['bday_year']) ? ' selected="selected"' : ''; - $s_birthday_year_options .= ""; - } - unset($now); - - $template->assign_vars(array( - 'ICQ' => $data['icq'], - 'YIM' => $data['yim'], - 'AIM' => $data['aim'], - 'MSN' => $data['msn'], - 'JABBER' => $data['jabber'], - 'WEBSITE' => $data['website'], - 'LOCATION' => $data['location'], - 'OCCUPATION' => $data['occupation'], - 'INTERESTS' => $data['interests'], - - 'S_BIRTHDAY_DAY_OPTIONS' => $s_birthday_day_options, - 'S_BIRTHDAY_MONTH_OPTIONS' => $s_birthday_month_options, - 'S_BIRTHDAY_YEAR_OPTIONS' => $s_birthday_year_options, - - 'S_PROFILE' => true) - ); - - // Get additional profile fields and assign them to the template block var 'profile_fields' - $user->get_profile_fields($user_id); - - $cp->generate_profile_fields('profile', $user_row['iso_lang_id']); - - break; - - case 'prefs': - - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - - $data = array( - 'dateformat' => utf8_normalize_nfc(request_var('dateformat', $user_row['user_dateformat'], true)), - 'lang' => basename(request_var('lang', $user_row['user_lang'])), - 'tz' => request_var('tz', (float) $user_row['user_timezone']), - 'style' => request_var('style', $user_row['user_style']), - 'dst' => request_var('dst', $user_row['user_dst']), - 'viewemail' => request_var('viewemail', $user_row['user_allow_viewemail']), - 'massemail' => request_var('massemail', $user_row['user_allow_massemail']), - 'hideonline' => request_var('hideonline', !$user_row['user_allow_viewonline']), - 'notifymethod' => request_var('notifymethod', $user_row['user_notify_type']), - 'notifypm' => request_var('notifypm', $user_row['user_notify_pm']), - 'popuppm' => request_var('popuppm', $this->optionget($user_row, 'popuppm')), - 'allowpm' => request_var('allowpm', $user_row['user_allow_pm']), - - 'topic_sk' => request_var('topic_sk', ($user_row['user_topic_sortby_type']) ? $user_row['user_topic_sortby_type'] : 't'), - 'topic_sd' => request_var('topic_sd', ($user_row['user_topic_sortby_dir']) ? $user_row['user_topic_sortby_dir'] : 'd'), - 'topic_st' => request_var('topic_st', ($user_row['user_topic_show_days']) ? $user_row['user_topic_show_days'] : 0), - - 'post_sk' => request_var('post_sk', ($user_row['user_post_sortby_type']) ? $user_row['user_post_sortby_type'] : 't'), - 'post_sd' => request_var('post_sd', ($user_row['user_post_sortby_dir']) ? $user_row['user_post_sortby_dir'] : 'a'), - 'post_st' => request_var('post_st', ($user_row['user_post_show_days']) ? $user_row['user_post_show_days'] : 0), - - 'view_images' => request_var('view_images', $this->optionget($user_row, 'viewimg')), - 'view_flash' => request_var('view_flash', $this->optionget($user_row, 'viewflash')), - 'view_smilies' => request_var('view_smilies', $this->optionget($user_row, 'viewsmilies')), - 'view_sigs' => request_var('view_sigs', $this->optionget($user_row, 'viewsigs')), - 'view_avatars' => request_var('view_avatars', $this->optionget($user_row, 'viewavatars')), - 'view_wordcensor' => request_var('view_wordcensor', $this->optionget($user_row, 'viewcensors')), - - 'bbcode' => request_var('bbcode', $this->optionget($user_row, 'bbcode')), - 'smilies' => request_var('smilies', $this->optionget($user_row, 'smilies')), - 'sig' => request_var('sig', $this->optionget($user_row, 'attachsig')), - 'notify' => request_var('notify', $user_row['user_notify']), - ); - - if ($submit) - { - $error = validate_data($data, array( - 'dateformat' => array('string', false, 1, 30), - 'lang' => array('match', false, '#^[a-z_\-]{2,}$#i'), - 'tz' => array('num', false, -14, 14), - - 'topic_sk' => array('string', false, 1, 1), - 'topic_sd' => array('string', false, 1, 1), - 'post_sk' => array('string', false, 1, 1), - 'post_sd' => array('string', false, 1, 1), - )); - - if (!check_form_key($form_name)) - { - $error[] = 'FORM_INVALID'; - } - - if (!sizeof($error)) - { - $this->optionset($user_row, 'popuppm', $data['popuppm']); - $this->optionset($user_row, 'viewimg', $data['view_images']); - $this->optionset($user_row, 'viewflash', $data['view_flash']); - $this->optionset($user_row, 'viewsmilies', $data['view_smilies']); - $this->optionset($user_row, 'viewsigs', $data['view_sigs']); - $this->optionset($user_row, 'viewavatars', $data['view_avatars']); - $this->optionset($user_row, 'viewcensors', $data['view_wordcensor']); - $this->optionset($user_row, 'bbcode', $data['bbcode']); - $this->optionset($user_row, 'smilies', $data['smilies']); - $this->optionset($user_row, 'attachsig', $data['sig']); - - $sql_ary = array( - 'user_options' => $user_row['user_options'], - - 'user_allow_pm' => $data['allowpm'], - 'user_allow_viewemail' => $data['viewemail'], - 'user_allow_massemail' => $data['massemail'], - 'user_allow_viewonline' => !$data['hideonline'], - 'user_notify_type' => $data['notifymethod'], - 'user_notify_pm' => $data['notifypm'], - - 'user_dst' => $data['dst'], - 'user_dateformat' => $data['dateformat'], - 'user_lang' => $data['lang'], - 'user_timezone' => $data['tz'], - 'user_style' => $data['style'], - - 'user_topic_sortby_type' => $data['topic_sk'], - 'user_post_sortby_type' => $data['post_sk'], - 'user_topic_sortby_dir' => $data['topic_sd'], - 'user_post_sortby_dir' => $data['post_sd'], - - 'user_topic_show_days' => $data['topic_st'], - 'user_post_show_days' => $data['post_st'], - - 'user_notify' => $data['notify'], - ); - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " - WHERE user_id = $user_id"; - $db->sql_query($sql); - - trigger_error($user->lang['USER_PREFS_UPDATED'] . adm_back_link($this->u_action . '&u=' . $user_id)); - } - - // Replace "error" strings with their real, localised form - $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); - } - - $dateformat_options = ''; - foreach ($user->lang['dateformats'] as $format => $null) - { - $dateformat_options .= ''; - } - - $s_custom = false; - - $dateformat_options .= ''; - - $sort_dir_text = array('a' => $user->lang['ASCENDING'], 'd' => $user->lang['DESCENDING']); - - // Topic ordering options - $limit_topic_days = array(0 => $user->lang['ALL_TOPICS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); - $sort_by_topic_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 'r' => $user->lang['REPLIES'], 's' => $user->lang['SUBJECT'], 'v' => $user->lang['VIEWS']); - - // Post ordering options - $limit_post_days = array(0 => $user->lang['ALL_POSTS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); - $sort_by_post_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']); - - $_options = array('topic', 'post'); - foreach ($_options as $sort_option) - { - ${'s_limit_' . $sort_option . '_days'} = ''; - - ${'s_sort_' . $sort_option . '_key'} = ''; - - ${'s_sort_' . $sort_option . '_dir'} = ''; - } - - $template->assign_vars(array( - 'S_PREFS' => true, - 'S_JABBER_DISABLED' => ($config['jab_enable'] && $user_row['user_jabber'] && @extension_loaded('xml')) ? false : true, - - 'VIEW_EMAIL' => $data['viewemail'], - 'MASS_EMAIL' => $data['massemail'], - 'ALLOW_PM' => $data['allowpm'], - 'HIDE_ONLINE' => $data['hideonline'], - 'NOTIFY_EMAIL' => ($data['notifymethod'] == NOTIFY_EMAIL) ? true : false, - 'NOTIFY_IM' => ($data['notifymethod'] == NOTIFY_IM) ? true : false, - 'NOTIFY_BOTH' => ($data['notifymethod'] == NOTIFY_BOTH) ? true : false, - 'NOTIFY_PM' => $data['notifypm'], - 'POPUP_PM' => $data['popuppm'], - 'DST' => $data['dst'], - 'BBCODE' => $data['bbcode'], - 'SMILIES' => $data['smilies'], - 'ATTACH_SIG' => $data['sig'], - 'NOTIFY' => $data['notify'], - 'VIEW_IMAGES' => $data['view_images'], - 'VIEW_FLASH' => $data['view_flash'], - 'VIEW_SMILIES' => $data['view_smilies'], - 'VIEW_SIGS' => $data['view_sigs'], - 'VIEW_AVATARS' => $data['view_avatars'], - 'VIEW_WORDCENSOR' => $data['view_wordcensor'], - - 'S_TOPIC_SORT_DAYS' => $s_limit_topic_days, - 'S_TOPIC_SORT_KEY' => $s_sort_topic_key, - 'S_TOPIC_SORT_DIR' => $s_sort_topic_dir, - 'S_POST_SORT_DAYS' => $s_limit_post_days, - 'S_POST_SORT_KEY' => $s_sort_post_key, - 'S_POST_SORT_DIR' => $s_sort_post_dir, - - 'DATE_FORMAT' => $data['dateformat'], - 'S_DATEFORMAT_OPTIONS' => $dateformat_options, - 'S_CUSTOM_DATEFORMAT' => $s_custom, - 'DEFAULT_DATEFORMAT' => $config['default_dateformat'], - 'A_DEFAULT_DATEFORMAT' => addslashes($config['default_dateformat']), - - 'S_LANG_OPTIONS' => language_select($data['lang']), - 'S_STYLE_OPTIONS' => style_select($data['style']), - 'S_TZ_OPTIONS' => tz_select($data['tz'], true), - ) - ); - - break; - - case 'avatar': - - include($phpbb_root_path . 'includes/functions_display.' . $phpEx); - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - - $can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && @is_writable($phpbb_root_path . $config['avatar_path']) && $file_uploads) ? true : false; - - if ($submit) - { - - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - if (avatar_process_user($error, $user_row)) - { - trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&u=' . $user_row['user_id'])); - } - - // Replace "error" strings with their real, localised form - $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); - } - - // Generate users avatar - $avatar_img = ($user_row['user_avatar']) ? get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']) : ''; - - $display_gallery = (isset($_POST['display_gallery'])) ? true : false; - $avatar_select = basename(request_var('avatar_select', '')); - $category = basename(request_var('category', '')); - - if ($config['allow_avatar_local'] && $display_gallery) - { - avatar_gallery($category, $avatar_select, 4); - } - - $template->assign_vars(array( - 'S_AVATAR' => true, - 'S_CAN_UPLOAD' => ($can_upload && $config['allow_avatar_upload']) ? true : false, - 'S_ALLOW_REMOTE' => ($config['allow_avatar_remote']) ? true : false, - 'S_DISPLAY_GALLERY' => ($config['allow_avatar_local'] && !$display_gallery) ? true : false, - 'S_IN_GALLERY' => ($config['allow_avatar_local'] && $display_gallery) ? true : false, - - 'AVATAR_IMAGE' => $avatar_img, - 'AVATAR_MAX_FILESIZE' => $config['avatar_filesize'], - 'USER_AVATAR_WIDTH' => $user_row['user_avatar_width'], - 'USER_AVATAR_HEIGHT' => $user_row['user_avatar_height'], - - 'L_AVATAR_EXPLAIN' => sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], round($config['avatar_filesize'] / 1024))) - ); - - break; - - case 'rank': - - if ($submit) - { - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - $rank_id = request_var('user_rank', 0); - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_rank = $rank_id - WHERE user_id = $user_id"; - $db->sql_query($sql); - - trigger_error($user->lang['USER_RANK_UPDATED'] . adm_back_link($this->u_action . '&u=' . $user_id)); - } - - $sql = 'SELECT * - FROM ' . RANKS_TABLE . ' - WHERE rank_special = 1 - ORDER BY rank_title'; - $result = $db->sql_query($sql); - - $s_rank_options = ''; - - while ($row = $db->sql_fetchrow($result)) - { - $selected = ($user_row['user_rank'] && $row['rank_id'] == $user_row['user_rank']) ? ' selected="selected"' : ''; - $s_rank_options .= ''; - } - $db->sql_freeresult($result); - - $template->assign_vars(array( - 'S_RANK' => true, - 'S_RANK_OPTIONS' => $s_rank_options) - ); - - break; - - case 'sig': - - include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx); - include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx); - - $enable_bbcode = ($config['allow_sig_bbcode']) ? ((request_var('disable_bbcode', !$user->optionget('bbcode'))) ? false : true) : false; - $enable_smilies = ($config['allow_sig_smilies']) ? ((request_var('disable_smilies', !$user->optionget('smilies'))) ? false : true) : false; - $enable_urls = ($config['allow_sig_links']) ? ((request_var('disable_magic_url', false)) ? false : true) : false; - $signature = utf8_normalize_nfc(request_var('signature', (string) $user_row['user_sig'], true)); - - $preview = (isset($_POST['preview'])) ? true : false; - - if ($submit || $preview) - { - include_once($phpbb_root_path . 'includes/message_parser.' . $phpEx); - - $message_parser = new parse_message($signature); - - // Allowing Quote BBCode - $message_parser->parse($enable_bbcode, $enable_urls, $enable_smilies, $config['allow_sig_img'], $config['allow_sig_flash'], true, $config['allow_sig_links'], true, 'sig'); - - if (sizeof($message_parser->warn_msg)) - { - $error[] = implode('
    ', $message_parser->warn_msg); - } - - if (!check_form_key($form_name)) - { - $error = 'FORM_INVALID'; - } - - if (!sizeof($error) && $submit) - { - $sql_ary = array( - 'user_sig' => (string) $message_parser->message, - 'user_sig_bbcode_uid' => (string) $message_parser->bbcode_uid, - 'user_sig_bbcode_bitfield' => (string) $message_parser->bbcode_bitfield - ); - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_id = ' . $user_id; - $db->sql_query($sql); - - trigger_error($user->lang['USER_SIG_UPDATED'] . adm_back_link($this->u_action . '&u=' . $user_id)); - } - - // Replace "error" strings with their real, localised form - $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); - } - - $signature_preview = ''; - - if ($preview) - { - // Now parse it for displaying - $signature_preview = $message_parser->format_display($enable_bbcode, $enable_urls, $enable_smilies, false); - unset($message_parser); - } - - decode_message($signature, $user_row['user_sig_bbcode_uid']); - - $template->assign_vars(array( - 'S_SIGNATURE' => true, - - 'SIGNATURE' => $signature, - 'SIGNATURE_PREVIEW' => $signature_preview, - - 'S_BBCODE_CHECKED' => (!$enable_bbcode) ? ' checked="checked"' : '', - 'S_SMILIES_CHECKED' => (!$enable_smilies) ? ' checked="checked"' : '', - 'S_MAGIC_URL_CHECKED' => (!$enable_urls) ? ' checked="checked"' : '', - - 'BBCODE_STATUS' => ($config['allow_sig_bbcode']) ? sprintf($user->lang['BBCODE_IS_ON'], '', '') : sprintf($user->lang['BBCODE_IS_OFF'], '', ''), - 'SMILIES_STATUS' => ($config['allow_sig_smilies']) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'], - 'IMG_STATUS' => ($config['allow_sig_img']) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'], - 'FLASH_STATUS' => ($config['allow_sig_flash']) ? $user->lang['FLASH_IS_ON'] : $user->lang['FLASH_IS_OFF'], - 'URL_STATUS' => ($config['allow_sig_links']) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'], - - 'L_SIGNATURE_EXPLAIN' => sprintf($user->lang['SIGNATURE_EXPLAIN'], $config['max_sig_chars']), - - 'S_BBCODE_ALLOWED' => $config['allow_sig_bbcode'], - 'S_SMILIES_ALLOWED' => $config['allow_sig_smilies'], - 'S_BBCODE_IMG' => ($config['allow_sig_img']) ? true : false, - 'S_BBCODE_FLASH' => ($config['allow_sig_flash']) ? true : false, - 'S_LINKS_ALLOWED' => ($config['allow_sig_links']) ? true : false) - ); - - // Assigning custom bbcodes - display_custom_bbcodes(); - - break; - - case 'attach': - - $start = request_var('start', 0); - $deletemark = (isset($_POST['delmarked'])) ? true : false; - $marked = request_var('mark', array(0)); - - // Sort keys - $sort_key = request_var('sk', 'a'); - $sort_dir = request_var('sd', 'd'); - - if ($deletemark && sizeof($marked)) - { - $sql = 'SELECT attach_id - FROM ' . ATTACHMENTS_TABLE . ' - WHERE poster_id = ' . $user_id . ' - AND is_orphan = 0 - AND ' . $db->sql_in_set('attach_id', $marked); - $result = $db->sql_query($sql); - - $marked = array(); - while ($row = $db->sql_fetchrow($result)) - { - $marked[] = $row['attach_id']; - } - $db->sql_freeresult($result); - } - - if ($deletemark && sizeof($marked)) - { - if (confirm_box(true)) - { - $sql = 'SELECT real_filename - FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set('attach_id', $marked); - $result = $db->sql_query($sql); - - $log_attachments = array(); - while ($row = $db->sql_fetchrow($result)) - { - $log_attachments[] = $row['real_filename']; - } - $db->sql_freeresult($result); - - delete_attachments('attach', $marked); - - $message = (sizeof($log_attachments) == 1) ? $user->lang['ATTACHMENT_DELETED'] : $user->lang['ATTACHMENTS_DELETED']; - - add_log('admin', 'LOG_ATTACHMENTS_DELETED', implode(', ', $log_attachments)); - trigger_error($message . adm_back_link($this->u_action . '&u=' . $user_id)); - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'u' => $user_id, - 'i' => $id, - 'mode' => $mode, - 'action' => $action, - 'delmarked' => true, - 'mark' => $marked)) - ); - } - } - - $sk_text = array('a' => $user->lang['SORT_FILENAME'], 'c' => $user->lang['SORT_EXTENSION'], 'd' => $user->lang['SORT_SIZE'], 'e' => $user->lang['SORT_DOWNLOADS'], 'f' => $user->lang['SORT_POST_TIME'], 'g' => $user->lang['SORT_TOPIC_TITLE']); - $sk_sql = array('a' => 'a.real_filename', 'c' => 'a.extension', 'd' => 'a.filesize', 'e' => 'a.download_count', 'f' => 'a.filetime', 'g' => 't.topic_title'); - - $sd_text = array('a' => $user->lang['ASCENDING'], 'd' => $user->lang['DESCENDING']); - - $s_sort_key = ''; - foreach ($sk_text as $key => $value) - { - $selected = ($sort_key == $key) ? ' selected="selected"' : ''; - $s_sort_key .= ''; - } - - $s_sort_dir = ''; - foreach ($sd_text as $key => $value) - { - $selected = ($sort_dir == $key) ? ' selected="selected"' : ''; - $s_sort_dir .= ''; - } - - if (!isset($sk_sql[$sort_key])) - { - $sort_key = 'a'; - } - - $order_by = $sk_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC'); - - $sql = 'SELECT COUNT(attach_id) as num_attachments - FROM ' . ATTACHMENTS_TABLE . " - WHERE poster_id = $user_id - AND is_orphan = 0"; - $result = $db->sql_query_limit($sql, 1); - $num_attachments = (int) $db->sql_fetchfield('num_attachments'); - $db->sql_freeresult($result); - - $sql = 'SELECT a.*, t.topic_title, p.message_subject as message_title - FROM ' . ATTACHMENTS_TABLE . ' a - LEFT JOIN ' . TOPICS_TABLE . ' t ON (a.topic_id = t.topic_id - AND a.in_message = 0) - LEFT JOIN ' . PRIVMSGS_TABLE . ' p ON (a.post_msg_id = p.msg_id - AND a.in_message = 1) - WHERE a.poster_id = ' . $user_id . " - AND a.is_orphan = 0 - ORDER BY $order_by"; - $result = $db->sql_query_limit($sql, $config['posts_per_page'], $start); - - while ($row = $db->sql_fetchrow($result)) - { - if ($row['in_message']) - { - $view_topic = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&p={$row['post_msg_id']}"); - } - else - { - $view_topic = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t={$row['topic_id']}&p={$row['post_msg_id']}") . '#p' . $row['post_msg_id']; - } - - $template->assign_block_vars('attach', array( - 'REAL_FILENAME' => $row['real_filename'], - 'COMMENT' => nl2br($row['attach_comment']), - 'EXTENSION' => $row['extension'], - 'SIZE' => get_formatted_filesize($row['filesize']), - 'DOWNLOAD_COUNT' => $row['download_count'], - 'POST_TIME' => $user->format_date($row['filetime']), - 'TOPIC_TITLE' => ($row['in_message']) ? $row['message_title'] : $row['topic_title'], - - 'ATTACH_ID' => $row['attach_id'], - 'POST_ID' => $row['post_msg_id'], - 'TOPIC_ID' => $row['topic_id'], - - 'S_IN_MESSAGE' => $row['in_message'], - - 'U_DOWNLOAD' => append_sid("{$phpbb_root_path}download/file.$phpEx", 'mode=view&id=' . $row['attach_id']), - 'U_VIEW_TOPIC' => $view_topic) - ); - } - $db->sql_freeresult($result); - - $template->assign_vars(array( - 'S_ATTACHMENTS' => true, - 'S_ON_PAGE' => on_page($num_attachments, $config['topics_per_page'], $start), - 'S_SORT_KEY' => $s_sort_key, - 'S_SORT_DIR' => $s_sort_dir, - - 'PAGINATION' => generate_pagination($this->u_action . "&u=$user_id&sk=$sort_key&sd=$sort_dir", $num_attachments, $config['topics_per_page'], $start, true)) - ); - - break; - - case 'groups': - - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - - $user->add_lang(array('groups', 'acp/groups')); - $group_id = request_var('g', 0); - - if ($group_id) - { - // Check the founder only entry for this group to make sure everything is well - $sql = 'SELECT group_founder_manage - FROM ' . GROUPS_TABLE . ' - WHERE group_id = ' . $group_id; - $result = $db->sql_query($sql); - $founder_manage = (int) $db->sql_fetchfield('group_founder_manage'); - $db->sql_freeresult($result); - - if ($user->data['user_type'] != USER_FOUNDER && $founder_manage) - { - trigger_error($user->lang['NOT_ALLOWED_MANAGE_GROUP'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - } - else - { - $founder_manage = 0; - } - - switch ($action) - { - case 'demote': - case 'promote': - case 'default': - if (!$group_id) - { - trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - group_user_attributes($action, $group_id, $user_id); - - if ($action == 'default') - { - $user_row['group_id'] = $group_id; - } - break; - - case 'delete': - - if (confirm_box(true)) - { - if (!$group_id) - { - trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - if ($error = group_user_del($group_id, $user_id)) - { - trigger_error($user->lang[$error] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - $error = array(); - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'u' => $user_id, - 'i' => $id, - 'mode' => $mode, - 'action' => $action, - 'g' => $group_id)) - ); - } - - break; - } - - // Add user to group? - if ($submit) - { - - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - if (!$group_id) - { - trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - // Add user/s to group - if ($error = group_user_add($group_id, $user_id)) - { - trigger_error($user->lang[$error] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); - } - - $error = array(); - } - - - $sql = 'SELECT ug.*, g.* - FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . " ug - WHERE ug.user_id = $user_id - AND g.group_id = ug.group_id - ORDER BY g.group_type DESC, ug.user_pending ASC, g.group_name"; - $result = $db->sql_query($sql); - - $i = 0; - $group_data = $id_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - $type = ($row['group_type'] == GROUP_SPECIAL) ? 'special' : (($row['user_pending']) ? 'pending' : 'normal'); - - $group_data[$type][$i]['group_id'] = $row['group_id']; - $group_data[$type][$i]['group_name'] = $row['group_name']; - $group_data[$type][$i]['group_leader'] = ($row['group_leader']) ? 1 : 0; - - $id_ary[] = $row['group_id']; - - $i++; - } - $db->sql_freeresult($result); - - // Select box for other groups - $sql = 'SELECT group_id, group_name, group_type, group_founder_manage - FROM ' . GROUPS_TABLE . ' - ' . ((sizeof($id_ary)) ? 'WHERE ' . $db->sql_in_set('group_id', $id_ary, true) : '') . ' - ORDER BY group_type DESC, group_name ASC'; - $result = $db->sql_query($sql); - - $s_group_options = ''; - while ($row = $db->sql_fetchrow($result)) - { - if (!$config['coppa_enable'] && $row['group_name'] == 'REGISTERED_COPPA') - { - continue; - } - - // Do not display those groups not allowed to be managed - if ($user->data['user_type'] != USER_FOUNDER && $row['group_founder_manage']) - { - continue; - } - - $s_group_options .= '' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . ''; - } - $db->sql_freeresult($result); - - $current_type = ''; - foreach ($group_data as $group_type => $data_ary) - { - if ($current_type != $group_type) - { - $template->assign_block_vars('group', array( - 'S_NEW_GROUP_TYPE' => true, - 'GROUP_TYPE' => $user->lang['USER_GROUP_' . strtoupper($group_type)]) - ); - } - - foreach ($data_ary as $data) - { - $template->assign_block_vars('group', array( - 'U_EDIT_GROUP' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=groups&mode=manage&action=edit&u=$user_id&g={$data['group_id']}&back_link=acp_users_groups"), - 'U_DEFAULT' => $this->u_action . "&action=default&u=$user_id&g=" . $data['group_id'], - 'U_DEMOTE_PROMOTE' => $this->u_action . '&action=' . (($data['group_leader']) ? 'demote' : 'promote') . "&u=$user_id&g=" . $data['group_id'], - 'U_DELETE' => $this->u_action . "&action=delete&u=$user_id&g=" . $data['group_id'], - - 'GROUP_NAME' => ($group_type == 'special') ? $user->lang['G_' . $data['group_name']] : $data['group_name'], - 'L_DEMOTE_PROMOTE' => ($data['group_leader']) ? $user->lang['GROUP_DEMOTE'] : $user->lang['GROUP_PROMOTE'], - - 'S_NO_DEFAULT' => ($user_row['group_id'] != $data['group_id']) ? true : false, - 'S_SPECIAL_GROUP' => ($group_type == 'special') ? true : false, - ) - ); - } - } - - $template->assign_vars(array( - 'S_GROUPS' => true, - 'S_GROUP_OPTIONS' => $s_group_options) - ); - - break; - - case 'perm': - - include_once($phpbb_root_path . 'includes/acp/auth.' . $phpEx); - - $auth_admin = new auth_admin(); - - $user->add_lang('acp/permissions'); - add_permission_language(); - - $forum_id = request_var('f', 0); - - // Global Permissions - if (!$forum_id) - { - // Select auth options - $sql = 'SELECT auth_option, is_local, is_global - FROM ' . ACL_OPTIONS_TABLE . ' - WHERE auth_option ' . $db->sql_like_expression($db->any_char . '_') . ' - AND is_global = 1 - ORDER BY auth_option'; - $result = $db->sql_query($sql); - - $hold_ary = array(); - - while ($row = $db->sql_fetchrow($result)) - { - $hold_ary = $auth_admin->get_mask('view', $user_id, false, false, $row['auth_option'], 'global', ACL_NEVER); - $auth_admin->display_mask('view', $row['auth_option'], $hold_ary, 'user', false, false); - } - $db->sql_freeresult($result); - - unset($hold_ary); - } - else - { - $sql = 'SELECT auth_option, is_local, is_global - FROM ' . ACL_OPTIONS_TABLE . " - WHERE auth_option " . $db->sql_like_expression($db->any_char . '_') . " - AND is_local = 1 - ORDER BY is_global DESC, auth_option"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $hold_ary = $auth_admin->get_mask('view', $user_id, false, $forum_id, $row['auth_option'], 'local', ACL_NEVER); - $auth_admin->display_mask('view', $row['auth_option'], $hold_ary, 'user', true, false); - } - $db->sql_freeresult($result); - } - - $s_forum_options = ''; - $s_forum_options .= make_forum_select($forum_id, false, true, false, false, false); - - $template->assign_vars(array( - 'S_PERMISSIONS' => true, - - 'S_GLOBAL' => (!$forum_id) ? true : false, - 'S_FORUM_OPTIONS' => $s_forum_options, - - 'U_ACTION' => $this->u_action . '&u=' . $user_id, - 'U_USER_PERMISSIONS' => append_sid("{$phpbb_admin_path}index.$phpEx" ,'i=permissions&mode=setting_user_global&user_id[]=' . $user_id), - 'U_USER_FORUM_PERMISSIONS' => append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions&mode=setting_user_local&user_id[]=' . $user_id)) - ); - - break; - - } - - // Assign general variables - $template->assign_vars(array( - 'S_ERROR' => (sizeof($error)) ? true : false, - 'ERROR_MSG' => (sizeof($error)) ? implode('
    ', $error) : '') - ); - } - - /** - * Optionset replacement for this module based on $user->optionset - */ - function optionset(&$user_row, $key, $value, $data = false) - { - global $user; - - $var = ($data) ? $data : $user_row['user_options']; - - if ($value && !($var & 1 << $user->keyoptions[$key])) - { - $var += 1 << $user->keyoptions[$key]; - } - else if (!$value && ($var & 1 << $user->keyoptions[$key])) - { - $var -= 1 << $user->keyoptions[$key]; - } - else - { - return ($data) ? $var : false; - } - - if (!$data) - { - $user_row['user_options'] = $var; - return true; - } - else - { - return $var; - } - } - - /** - * Optionget replacement for this module based on $user->optionget - */ - function optionget(&$user_row, $key, $data = false) - { - global $user; - - $var = ($data) ? $data : $user_row['user_options']; - return ($var & 1 << $user->keyoptions[$key]) ? true : false; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/acp_words.php b/phpBB/includes/acp/acp_words.php deleted file mode 100644 index 596c2fc743..0000000000 --- a/phpBB/includes/acp/acp_words.php +++ /dev/null @@ -1,185 +0,0 @@ -add_lang('acp/posting'); - - // Set up general vars - $action = request_var('action', ''); - $action = (isset($_POST['add'])) ? 'add' : ((isset($_POST['save'])) ? 'save' : $action); - - $s_hidden_fields = ''; - $word_info = array(); - - $this->tpl_name = 'acp_words'; - $this->page_title = 'ACP_WORDS'; - - $form_name = 'acp_words'; - add_form_key($form_name); - - switch ($action) - { - case 'edit': - $word_id = request_var('id', 0); - - if (!$word_id) - { - trigger_error($user->lang['NO_WORD'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql = 'SELECT * - FROM ' . WORDS_TABLE . " - WHERE word_id = $word_id"; - $result = $db->sql_query($sql); - $word_info = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $s_hidden_fields .= ''; - - case 'add': - - $template->assign_vars(array( - 'S_EDIT_WORD' => true, - 'U_ACTION' => $this->u_action, - 'U_BACK' => $this->u_action, - 'WORD' => (isset($word_info['word'])) ? $word_info['word'] : '', - 'REPLACEMENT' => (isset($word_info['replacement'])) ? $word_info['replacement'] : '', - 'S_HIDDEN_FIELDS' => $s_hidden_fields) - ); - - return; - - break; - - case 'save': - - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING); - } - $word_id = request_var('id', 0); - $word = utf8_normalize_nfc(request_var('word', '', true)); - $replacement = utf8_normalize_nfc(request_var('replacement', '', true)); - - if (!$word || !$replacement) - { - trigger_error($user->lang['ENTER_WORD'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - $sql_ary = array( - 'word' => $word, - 'replacement' => $replacement - ); - - if ($word_id) - { - $db->sql_query('UPDATE ' . WORDS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE word_id = ' . $word_id); - } - else - { - $db->sql_query('INSERT INTO ' . WORDS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); - } - - $cache->destroy('_word_censors'); - - $log_action = ($word_id) ? 'LOG_WORD_EDIT' : 'LOG_WORD_ADD'; - add_log('admin', $log_action, $word); - - $message = ($word_id) ? $user->lang['WORD_UPDATED'] : $user->lang['WORD_ADDED']; - trigger_error($message . adm_back_link($this->u_action)); - - break; - - case 'delete': - - $word_id = request_var('id', 0); - - if (!$word_id) - { - trigger_error($user->lang['NO_WORD'] . adm_back_link($this->u_action), E_USER_WARNING); - } - - if (confirm_box(true)) - { - $sql = 'SELECT word - FROM ' . WORDS_TABLE . " - WHERE word_id = $word_id"; - $result = $db->sql_query($sql); - $deleted_word = $db->sql_fetchfield('word'); - $db->sql_freeresult($result); - - $sql = 'DELETE FROM ' . WORDS_TABLE . " - WHERE word_id = $word_id"; - $db->sql_query($sql); - - $cache->destroy('_word_censors'); - - add_log('admin', 'LOG_WORD_DELETE', $deleted_word); - - trigger_error($user->lang['WORD_REMOVED'] . adm_back_link($this->u_action)); - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'i' => $id, - 'mode' => $mode, - 'id' => $word_id, - 'action' => 'delete', - ))); - } - - break; - } - - - $template->assign_vars(array( - 'U_ACTION' => $this->u_action, - 'S_HIDDEN_FIELDS' => $s_hidden_fields) - ); - - $sql = 'SELECT * - FROM ' . WORDS_TABLE . ' - ORDER BY word'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $template->assign_block_vars('words', array( - 'WORD' => $row['word'], - 'REPLACEMENT' => $row['replacement'], - 'U_EDIT' => $this->u_action . '&action=edit&id=' . $row['word_id'], - 'U_DELETE' => $this->u_action . '&action=delete&id=' . $row['word_id']) - ); - } - $db->sql_freeresult($result); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php deleted file mode 100644 index 5c81092a65..0000000000 --- a/phpBB/includes/acp/auth.php +++ /dev/null @@ -1,1260 +0,0 @@ -acl_options = $cache->get('_acl_options')) === false) - { - $sql = 'SELECT auth_option_id, auth_option, is_global, is_local - FROM ' . ACL_OPTIONS_TABLE . ' - ORDER BY auth_option_id'; - $result = $db->sql_query($sql); - - $global = $local = 0; - $this->acl_options = array(); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['is_global']) - { - $this->acl_options['global'][$row['auth_option']] = $global++; - } - - if ($row['is_local']) - { - $this->acl_options['local'][$row['auth_option']] = $local++; - } - - $this->acl_options['id'][$row['auth_option']] = (int) $row['auth_option_id']; - $this->acl_options['option'][(int) $row['auth_option_id']] = $row['auth_option']; - } - $db->sql_freeresult($result); - - $cache->put('_acl_options', $this->acl_options); - } - } - - /** - * Get permission mask - * This function only supports getting permissions of one type (for example a_) - * - * @param set|view $mode defines the permissions we get, view gets effective permissions (checking user AND group permissions), set only gets the user or group permission set alone - * @param mixed $user_id user ids to search for (a user_id or a group_id has to be specified at least) - * @param mixed $group_id group ids to search for, return group related settings (a user_id or a group_id has to be specified at least) - * @param mixed $forum_id forum_ids to search for. Defining a forum id also means getting local settings - * @param string $auth_option the auth_option defines the permission setting to look for (a_ for example) - * @param local|global $scope the scope defines the permission scope. If local, a forum_id is additionally required - * @param ACL_NEVER|ACL_NO|ACL_YES $acl_fill defines the mode those permissions not set are getting filled with - */ - public function get_mask($mode, $user_id = false, $group_id = false, $forum_id = false, $auth_option = false, $scope = false, $acl_fill = ACL_NEVER) - { - global $db, $user; - - $hold_ary = array(); - $view_user_mask = ($mode == 'view' && $group_id === false) ? true : false; - - if ($auth_option === false || $scope === false) - { - return array(); - } - - $acl_user_function = ($mode == 'set') ? 'acl_user_raw_data' : 'acl_raw_data'; - - if (!$view_user_mask) - { - if ($forum_id !== false) - { - $hold_ary = ($group_id !== false) ? $this->acl_group_raw_data($group_id, $auth_option . '%', $forum_id) : $this->$acl_user_function($user_id, $auth_option . '%', $forum_id); - } - else - { - $hold_ary = ($group_id !== false) ? $this->acl_group_raw_data($group_id, $auth_option . '%', ($scope == 'global') ? 0 : false) : $this->$acl_user_function($user_id, $auth_option . '%', ($scope == 'global') ? 0 : false); - } - } - - // Make sure hold_ary is filled with every setting (prevents missing forums/users/groups) - $ug_id = ($group_id !== false) ? ((!is_array($group_id)) ? array($group_id) : $group_id) : ((!is_array($user_id)) ? array($user_id) : $user_id); - $forum_ids = ($forum_id !== false) ? ((!is_array($forum_id)) ? array($forum_id) : $forum_id) : (($scope == 'global') ? array(0) : array()); - - // Only those options we need - $compare_options = array_diff(preg_replace('/^((?!' . $auth_option . ').+)|(' . $auth_option . ')$/', '', array_keys($this->acl_options[$scope])), array('')); - - // If forum_ids is false and the scope is local we actually want to have all forums within the array - if ($scope == 'local' && !sizeof($forum_ids)) - { - $sql = 'SELECT forum_id - FROM ' . FORUMS_TABLE; - $result = $db->sql_query($sql, 120); - - while ($row = $db->sql_fetchrow($result)) - { - $forum_ids[] = (int) $row['forum_id']; - } - $db->sql_freeresult($result); - } - - if ($view_user_mask) - { - $auth2 = null; - - $sql = 'SELECT user_id, user_permissions, user_type - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', $ug_id); - $result = $db->sql_query($sql); - - while ($userdata = $db->sql_fetchrow($result)) - { - if ($user->data['user_id'] != $userdata['user_id']) - { - $auth2 = new auth(); - $auth2->acl($userdata); - } - else - { - global $auth; - $auth2 = &$auth; - } - - - $hold_ary[$userdata['user_id']] = array(); - foreach ($forum_ids as $f_id) - { - $hold_ary[$userdata['user_id']][$f_id] = array(); - foreach ($compare_options as $option) - { - $hold_ary[$userdata['user_id']][$f_id][$option] = $auth2->acl_get($option, $f_id); - } - } - } - $db->sql_freeresult($result); - - unset($userdata); - unset($auth2); - } - - foreach ($ug_id as $_id) - { - if (!isset($hold_ary[$_id])) - { - $hold_ary[$_id] = array(); - } - - foreach ($forum_ids as $f_id) - { - if (!isset($hold_ary[$_id][$f_id])) - { - $hold_ary[$_id][$f_id] = array(); - } - } - } - - // Now, we need to fill the gaps with $acl_fill. ;) - - // Now switch back to keys - if (sizeof($compare_options)) - { - $compare_options = array_combine($compare_options, array_fill(1, sizeof($compare_options), $acl_fill)); - } - - // Defining the user-function here to save some memory - $return_acl_fill = create_function('$value', 'return ' . $acl_fill . ';'); - - // Actually fill the gaps - if (sizeof($hold_ary)) - { - foreach ($hold_ary as $ug_id => $row) - { - foreach ($row as $id => $options) - { - // Do not include the global auth_option - unset($options[$auth_option]); - - // Not a "fine" solution, but at all it's a 1-dimensional - // array_diff_key function filling the resulting array values with zeros - // The differences get merged into $hold_ary (all permissions having $acl_fill set) - $hold_ary[$ug_id][$id] = array_merge($options, - - array_map($return_acl_fill, - array_flip( - array_diff( - array_keys($compare_options), array_keys($options) - ) - ) - ) - ); - } - } - } - else - { - $hold_ary[($group_id !== false) ? $group_id : $user_id][(int) $forum_id] = $compare_options; - } - - return $hold_ary; - } - - /** - * Get permission mask for roles - * This function only supports getting masks for one role - */ - public function get_role_mask($role_id) - { - global $db; - - $hold_ary = array(); - - // Get users having this role set... - $sql = 'SELECT user_id, forum_id - FROM ' . ACL_USERS_TABLE . ' - WHERE auth_role_id = ' . $role_id . ' - ORDER BY forum_id'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $hold_ary[$row['forum_id']]['users'][] = $row['user_id']; - } - $db->sql_freeresult($result); - - // Now grab groups... - $sql = 'SELECT group_id, forum_id - FROM ' . ACL_GROUPS_TABLE . ' - WHERE auth_role_id = ' . $role_id . ' - ORDER BY forum_id'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $hold_ary[$row['forum_id']]['groups'][] = $row['group_id']; - } - $db->sql_freeresult($result); - - return $hold_ary; - } - - /** - * Display permission mask (assign to template) - */ - public function display_mask($mode, $permission_type, array $hold_ary, $user_mode = 'user', $local = false, $group_display = true) - { - global $template, $user, $db, $phpbb_root_path, $phpEx; - - // Define names for template loops, might be able to be set - $tpl_pmask = 'p_mask'; - $tpl_fmask = 'f_mask'; - $tpl_category = 'category'; - $tpl_mask = 'mask'; - - $l_acl_type = (isset($user->lang['ACL_TYPE_' . (($local) ? 'LOCAL' : 'GLOBAL') . '_' . strtoupper($permission_type)])) ? $user->lang['ACL_TYPE_' . (($local) ? 'LOCAL' : 'GLOBAL') . '_' . strtoupper($permission_type)] : 'ACL_TYPE_' . (($local) ? 'LOCAL' : 'GLOBAL') . '_' . strtoupper($permission_type); - - // Allow trace for viewing permissions and in user mode - $show_trace = ($mode == 'view' && $user_mode == 'user') ? true : false; - - // Get names - if ($user_mode == 'user') - { - $sql = 'SELECT user_id as ug_id, username as ug_name - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', array_keys($hold_ary)) . ' - ORDER BY username_clean ASC'; - } - else - { - $sql = 'SELECT group_id as ug_id, group_name as ug_name, group_type - FROM ' . GROUPS_TABLE . ' - WHERE ' . $db->sql_in_set('group_id', array_keys($hold_ary)) . ' - ORDER BY group_type DESC, group_name ASC'; - } - $result = $db->sql_query($sql); - - $ug_names_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - $ug_names_ary[$row['ug_id']] = ($user_mode == 'user') ? $row['ug_name'] : (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['ug_name']] : $row['ug_name']); - } - $db->sql_freeresult($result); - - // Get used forums - $forum_ids = array(); - foreach ($hold_ary as $ug_id => $row) - { - $forum_ids = array_merge($forum_ids, array_keys($row)); - } - $forum_ids = array_unique($forum_ids); - - $forum_names_ary = array(); - if ($local) - { - $forum_names_ary = make_forum_select(false, false, true, false, false, false, true); - - // Remove the disabled ones, since we do not create an option field here... - foreach ($forum_names_ary as $key => $value) - { - if (!$value['disabled']) - { - continue; - } - unset($forum_names_ary[$key]); - } - } - else - { - $forum_names_ary[0] = $l_acl_type; - } - - // Get available roles - $sql = 'SELECT * - FROM ' . ACL_ROLES_TABLE . " - WHERE role_type = '" . $db->sql_escape($permission_type) . "' - ORDER BY role_order ASC"; - $result = $db->sql_query($sql); - - $roles = array(); - while ($row = $db->sql_fetchrow($result)) - { - $roles[$row['role_id']] = $row; - } - $db->sql_freeresult($result); - - $cur_roles = $this->acl_role_data($user_mode, $permission_type, array_keys($hold_ary)); - - // Build js roles array (role data assignments) - $s_role_js_array = ''; - - if (sizeof($roles)) - { - $s_role_js_array = array(); - - // Make sure every role (even if empty) has its array defined - foreach ($roles as $_role_id => $null) - { - $s_role_js_array[$_role_id] = "\n" . 'role_options[' . $_role_id . '] = new Array();' . "\n"; - } - - $sql = 'SELECT r.role_id, o.auth_option, r.auth_setting - FROM ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' o - WHERE o.auth_option_id = r.auth_option_id - AND ' . $db->sql_in_set('r.role_id', array_keys($roles)); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $flag = substr($row['auth_option'], 0, strpos($row['auth_option'], '_') + 1); - if ($flag == $row['auth_option']) - { - continue; - } - - $s_role_js_array[$row['role_id']] .= 'role_options[' . $row['role_id'] . '][\'' . addslashes($row['auth_option']) . '\'] = ' . $row['auth_setting'] . '; '; - } - $db->sql_freeresult($result); - - $s_role_js_array = implode('', $s_role_js_array); - } - - $template->assign_var('S_ROLE_JS_ARRAY', $s_role_js_array); - unset($s_role_js_array); - - // Now obtain memberships - $user_groups_default = $user_groups_custom = array(); - if ($user_mode == 'user' && $group_display) - { - $sql = 'SELECT group_id, group_name, group_type - FROM ' . GROUPS_TABLE . ' - ORDER BY group_type DESC, group_name ASC'; - $result = $db->sql_query($sql); - - $groups = array(); - while ($row = $db->sql_fetchrow($result)) - { - $groups[$row['group_id']] = $row; - } - $db->sql_freeresult($result); - - $memberships = group_memberships(false, array_keys($hold_ary), false); - - // User is not a member of any group? Bad admin, bad bad admin... - if ($memberships) - { - foreach ($memberships as $row) - { - if ($groups[$row['group_id']]['group_type'] == GROUP_SPECIAL) - { - $user_groups_default[$row['user_id']][] = $user->lang['G_' . $groups[$row['group_id']]['group_name']]; - } - else - { - $user_groups_custom[$row['user_id']][] = $groups[$row['group_id']]['group_name']; - } - } - } - unset($memberships, $groups); - } - - // If we only have one forum id to display or being in local mode and more than one user/group to display, - // we switch the complete interface to group by user/usergroup instead of grouping by forum - // To achieve this, we need to switch the array a bit - if (sizeof($forum_ids) == 1 || ($local && sizeof($ug_names_ary) > 1)) - { - $hold_ary_temp = $hold_ary; - $hold_ary = array(); - foreach ($hold_ary_temp as $ug_id => $row) - { - foreach ($forum_names_ary as $forum_id => $forum_row) - { - if (isset($row[$forum_id])) - { - $hold_ary[$forum_id][$ug_id] = $row[$forum_id]; - } - } - } - unset($hold_ary_temp); - - foreach ($hold_ary as $forum_id => $forum_array) - { - $content_array = $categories = array(); - self::build_permission_array($hold_ary[$forum_id], $content_array, $categories, array_keys($ug_names_ary)); - - $template->assign_block_vars($tpl_pmask, array( - 'NAME' => ($forum_id == 0) ? $forum_names_ary[0] : $forum_names_ary[$forum_id]['forum_name'], - 'PADDING' => ($forum_id == 0) ? '' : $forum_names_ary[$forum_id]['padding'], - - 'CATEGORIES' => implode('
    ', $categories), - - 'L_ACL_TYPE' => $l_acl_type, - - 'S_LOCAL' => ($local) ? true : false, - 'S_GLOBAL' => (!$local) ? true : false, - 'S_NUM_CATS' => sizeof($categories), - 'S_VIEW' => ($mode == 'view') ? true : false, - 'S_NUM_OBJECTS' => sizeof($content_array), - 'S_USER_MODE' => ($user_mode == 'user') ? true : false, - 'S_GROUP_MODE' => ($user_mode == 'group') ? true : false) - ); - - @reset($content_array); - while (list($ug_id, $ug_array) = each($content_array)) - { - // Build role dropdown options - $current_role_id = (isset($cur_roles[$ug_id][$forum_id])) ? $cur_roles[$ug_id][$forum_id] : 0; - - $s_role_options = ''; - - @reset($roles); - while (list($role_id, $role_row) = each($roles)) - { - $role_description = (!empty($user->lang[$role_row['role_description']])) ? $user->lang[$role_row['role_description']] : nl2br($role_row['role_description']); - $role_name = (!empty($user->lang[$role_row['role_name']])) ? $user->lang[$role_row['role_name']] : $role_row['role_name']; - - $title = ($role_description) ? ' title="' . $role_description . '"' : ''; - $s_role_options .= ''; - } - - if ($s_role_options) - { - $s_role_options = '' . $s_role_options; - } - - if (!$current_role_id && $mode != 'view') - { - $s_custom_permissions = false; - - foreach ($ug_array as $key => $value) - { - if ($value['S_NEVER'] || $value['S_YES']) - { - $s_custom_permissions = true; - break; - } - } - } - else - { - $s_custom_permissions = false; - } - - $template->assign_block_vars($tpl_pmask . '.' . $tpl_fmask, array( - 'NAME' => $ug_names_ary[$ug_id], - 'S_ROLE_OPTIONS' => $s_role_options, - 'UG_ID' => $ug_id, - 'S_CUSTOM' => $s_custom_permissions, - 'FORUM_ID' => $forum_id) - ); - - self::assign_cat_array($ug_array, $tpl_pmask . '.' . $tpl_fmask . '.' . $tpl_category, $tpl_mask, $ug_id, $forum_id, $show_trace, ($mode == 'view')); - - unset($content_array[$ug_id]); - } - - unset($hold_ary[$forum_id]); - } - } - else - { - foreach ($ug_names_ary as $ug_id => $ug_name) - { - if (!isset($hold_ary[$ug_id])) - { - continue; - } - - $content_array = $categories = array(); - self::build_permission_array($hold_ary[$ug_id], $content_array, $categories, array_keys($forum_names_ary)); - - $template->assign_block_vars($tpl_pmask, array( - 'NAME' => $ug_name, - 'CATEGORIES' => implode('', $categories), - - 'USER_GROUPS_DEFAULT' => ($user_mode == 'user' && isset($user_groups_default[$ug_id]) && sizeof($user_groups_default[$ug_id])) ? implode(', ', $user_groups_default[$ug_id]) : '', - 'USER_GROUPS_CUSTOM' => ($user_mode == 'user' && isset($user_groups_custom[$ug_id]) && sizeof($user_groups_custom[$ug_id])) ? implode(', ', $user_groups_custom[$ug_id]) : '', - 'L_ACL_TYPE' => $l_acl_type, - - 'S_LOCAL' => ($local) ? true : false, - 'S_GLOBAL' => (!$local) ? true : false, - 'S_NUM_CATS' => sizeof($categories), - 'S_VIEW' => ($mode == 'view') ? true : false, - 'S_NUM_OBJECTS' => sizeof($content_array), - 'S_USER_MODE' => ($user_mode == 'user') ? true : false, - 'S_GROUP_MODE' => ($user_mode == 'group') ? true : false) - ); - - @reset($content_array); - while (list($forum_id, $forum_array) = each($content_array)) - { - // Build role dropdown options - $current_role_id = (isset($cur_roles[$ug_id][$forum_id])) ? $cur_roles[$ug_id][$forum_id] : 0; - - $s_role_options = ''; - - @reset($roles); - while (list($role_id, $role_row) = each($roles)) - { - $role_description = (!empty($user->lang[$role_row['role_description']])) ? $user->lang[$role_row['role_description']] : nl2br($role_row['role_description']); - $role_name = (!empty($user->lang[$role_row['role_name']])) ? $user->lang[$role_row['role_name']] : $role_row['role_name']; - - $title = ($role_description) ? ' title="' . $role_description . '"' : ''; - $s_role_options .= ''; - } - - if ($s_role_options) - { - $s_role_options = '' . $s_role_options; - } - - if (!$current_role_id && $mode != 'view') - { - $s_custom_permissions = false; - - foreach ($forum_array as $key => $value) - { - if ($value['S_NEVER'] || $value['S_YES']) - { - $s_custom_permissions = true; - break; - } - } - } - else - { - $s_custom_permissions = false; - } - - $template->assign_block_vars($tpl_pmask . '.' . $tpl_fmask, array( - 'NAME' => ($forum_id == 0) ? $forum_names_ary[0] : $forum_names_ary[$forum_id]['forum_name'], - 'PADDING' => ($forum_id == 0) ? '' : $forum_names_ary[$forum_id]['padding'], - 'S_ROLE_OPTIONS' => $s_role_options, - 'S_CUSTOM' => $s_custom_permissions, - 'UG_ID' => $ug_id, - 'FORUM_ID' => $forum_id) - ); - - self::assign_cat_array($forum_array, $tpl_pmask . '.' . $tpl_fmask . '.' . $tpl_category, $tpl_mask, $ug_id, $forum_id, $show_trace, ($mode == 'view')); - } - - unset($hold_ary[$ug_id], $ug_names_ary[$ug_id]); - } - } - } - - /** - * Display permission mask for roles - */ - public function display_role_mask(array $hold_ary) - { - global $db, $template, $user, $phpbb_root_path, $phpbb_admin_path, $phpEx; - - if (!sizeof($hold_ary)) - { - return; - } - - // Get forum names - $sql = 'SELECT forum_id, forum_name - FROM ' . FORUMS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', array_keys($hold_ary)) . ' - ORDER BY left_id'; - $result = $db->sql_query($sql); - - // If the role is used globally, then reflect that - $forum_names = (isset($hold_ary[0])) ? array(0 => '') : array(); - while ($row = $db->sql_fetchrow($result)) - { - $forum_names[$row['forum_id']] = $row['forum_name']; - } - $db->sql_freeresult($result); - - foreach ($forum_names as $forum_id => $forum_name) - { - $auth_ary = $hold_ary[$forum_id]; - - $template->assign_block_vars('role_mask', array( - 'NAME' => ($forum_id == 0) ? $user->lang['GLOBAL_MASK'] : $forum_name, - 'FORUM_ID' => $forum_id) - ); - - if (isset($auth_ary['users']) && sizeof($auth_ary['users'])) - { - $sql = 'SELECT user_id, username - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', $auth_ary['users']) . ' - ORDER BY username_clean ASC'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $template->assign_block_vars('role_mask.users', array( - 'USER_ID' => $row['user_id'], - 'USERNAME' => $row['username'], - 'U_PROFILE' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=viewprofile&u={$row['user_id']}")) - ); - } - $db->sql_freeresult($result); - } - - if (isset($auth_ary['groups']) && sizeof($auth_ary['groups'])) - { - $sql = 'SELECT group_id, group_name, group_type - FROM ' . GROUPS_TABLE . ' - WHERE ' . $db->sql_in_set('group_id', $auth_ary['groups']) . ' - ORDER BY group_type ASC, group_name'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $template->assign_block_vars('role_mask.groups', array( - 'GROUP_ID' => $row['group_id'], - 'GROUP_NAME' => ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'], - 'U_PROFILE' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=group&g={$row['group_id']}")) - ); - } - $db->sql_freeresult($result); - } - } - } - - /** - * NOTE: this function is not in use atm - * Add a new option to the list ... $options is a hash of form -> - * $options = array( - * 'local' => array('option1', 'option2', ...), - * 'global' => array('optionA', 'optionB', ...) - * ); - */ - public function acl_add_option(array $options) - { - global $db, $cache; - - $cur_options = array(); - - $sql = 'SELECT auth_option, is_global, is_local - FROM ' . ACL_OPTIONS_TABLE . ' - ORDER BY auth_option_id'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if ($row['is_global']) - { - $cur_options['global'][] = $row['auth_option']; - } - - if ($row['is_local']) - { - $cur_options['local'][] = $row['auth_option']; - } - } - $db->sql_freeresult($result); - - // Here we need to insert new options ... this requires discovering whether - // an options is global, local or both and whether we need to add an permission - // set flag (x_) - $new_options = array('local' => array(), 'global' => array()); - - foreach ($options as $type => $option_ary) - { - $option_ary = array_unique($option_ary); - - foreach ($option_ary as $option_value) - { - if (!in_array($option_value, $cur_options[$type])) - { - $new_options[$type][] = $option_value; - } - - $flag = substr($option_value, 0, strpos($option_value, '_') + 1); - - if (!in_array($flag, $cur_options[$type]) && !in_array($flag, $new_options[$type])) - { - $new_options[$type][] = $flag; - } - } - } - unset($options); - - $options = array(); - $options['local'] = array_diff($new_options['local'], $new_options['global']); - $options['global'] = array_diff($new_options['global'], $new_options['local']); - $options['local_global'] = array_intersect($new_options['local'], $new_options['global']); - - $sql_ary = array(); - - foreach ($options as $type => $option_ary) - { - foreach ($option_ary as $option) - { - $sql_ary[] = array( - 'auth_option' => (string) $option, - 'is_global' => ($type == 'global' || $type == 'local_global') ? 1 : 0, - 'is_local' => ($type == 'local' || $type == 'local_global') ? 1 : 0 - ); - } - } - - $db->sql_multi_insert(ACL_OPTIONS_TABLE, $sql_ary); - - $cache->destroy('_acl_options'); - $this->acl_clear_prefetch(); - - // Because we just changed the options and also purged the options cache, we instantly update/regenerate it for later calls to succeed. - $this->acl_options = array(); - $this->__construct(); - - return true; - } - - /** - * Set a user or group ACL record - */ - public function acl_set($ug_type, $forum_id, $ug_id, $auth, $role_id = 0, $clear_prefetch = true) - { - global $db; - - // One or more forums - if (!is_array($forum_id)) - { - $forum_id = array($forum_id); - } - - // One or more users - if (!is_array($ug_id)) - { - $ug_id = array($ug_id); - } - - $ug_id_sql = $db->sql_in_set($ug_type . '_id', array_map('intval', $ug_id)); - $forum_sql = $db->sql_in_set('forum_id', array_map('intval', $forum_id)); - - // Instead of updating, inserting, removing we just remove all current settings and re-set everything... - $table = ($ug_type == 'user') ? ACL_USERS_TABLE : ACL_GROUPS_TABLE; - $id_field = $ug_type . '_id'; - - // Get any flags as required - reset($auth); - $flag = key($auth); - $flag = substr($flag, 0, strpos($flag, '_') + 1); - - // This ID (the any-flag) is set if one or more permissions are true... - $any_option_id = (int) $this->acl_options['id'][$flag]; - - // Remove any-flag from auth ary - if (isset($auth[$flag])) - { - unset($auth[$flag]); - } - - // Remove current auth options... - $auth_option_ids = array((int)$any_option_id); - foreach ($auth as $auth_option => $auth_setting) - { - $auth_option_ids[] = (int) $this->acl_options['id'][$auth_option]; - } - - $sql = "DELETE FROM $table - WHERE $forum_sql - AND $ug_id_sql - AND " . $db->sql_in_set('auth_option_id', $auth_option_ids); - $db->sql_query($sql); - - // Remove those having a role assigned... the correct type of course... - $sql = 'SELECT role_id - FROM ' . ACL_ROLES_TABLE . " - WHERE role_type = '" . $db->sql_escape($flag) . "'"; - $result = $db->sql_query($sql); - - $role_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $role_ids[] = $row['role_id']; - } - $db->sql_freeresult($result); - - if (sizeof($role_ids)) - { - $sql = "DELETE FROM $table - WHERE $forum_sql - AND $ug_id_sql - AND auth_option_id = 0 - AND " . $db->sql_in_set('auth_role_id', $role_ids); - $db->sql_query($sql); - } - - // Ok, include the any-flag if one or more auth options are set to yes... - foreach ($auth as $auth_option => $setting) - { - if ($setting == ACL_YES && (!isset($auth[$flag]) || $auth[$flag] == ACL_NEVER)) - { - $auth[$flag] = ACL_YES; - } - } - - $sql_ary = array(); - foreach ($forum_id as $forum) - { - $forum = (int) $forum; - - if ($role_id) - { - foreach ($ug_id as $id) - { - $sql_ary[] = array( - $id_field => (int) $id, - 'forum_id' => (int) $forum, - 'auth_option_id' => 0, - 'auth_setting' => 0, - 'auth_role_id' => (int) $role_id, - ); - } - } - else - { - foreach ($auth as $auth_option => $setting) - { - $auth_option_id = (int) $this->acl_options['id'][$auth_option]; - - if ($setting != ACL_NO) - { - foreach ($ug_id as $id) - { - $sql_ary[] = array( - $id_field => (int) $id, - 'forum_id' => (int) $forum, - 'auth_option_id' => (int) $auth_option_id, - 'auth_setting' => (int) $setting - ); - } - } - } - } - } - - $db->sql_multi_insert($table, $sql_ary); - - if ($clear_prefetch) - { - $this->acl_clear_prefetch(); - } - } - - /** - * Set a role-specific ACL record - */ - public function acl_set_role($role_id, $auth) - { - global $db; - - // Get any-flag as required - reset($auth); - $flag = key($auth); - $flag = substr($flag, 0, strpos($flag, '_') + 1); - - // Remove any-flag from auth ary - if (isset($auth[$flag])) - { - unset($auth[$flag]); - } - - // Re-set any flag... - foreach ($auth as $auth_option => $setting) - { - if ($setting == ACL_YES && (!isset($auth[$flag]) || $auth[$flag] == ACL_NEVER)) - { - $auth[$flag] = ACL_YES; - } - } - - $sql_ary = array(); - foreach ($auth as $auth_option => $setting) - { - $auth_option_id = (int) $this->acl_options['id'][$auth_option]; - - if ($setting != ACL_NO) - { - $sql_ary[] = array( - 'role_id' => (int) $role_id, - 'auth_option_id' => (int) $auth_option_id, - 'auth_setting' => (int) $setting - ); - } - } - - // If no data is there, we set the any-flag to ACL_NEVER... - if (!sizeof($sql_ary)) - { - $sql_ary[] = array( - 'role_id' => (int) $role_id, - 'auth_option_id' => (int) $this->acl_options['id'][$flag], - 'auth_setting' => ACL_NEVER - ); - } - - // Remove current auth options... - $sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . ' - WHERE role_id = ' . $role_id; - $db->sql_query($sql); - - // Now insert the new values - $db->sql_multi_insert(ACL_ROLES_DATA_TABLE, $sql_ary); - - $this->acl_clear_prefetch(); - } - - /** - * Remove local permission - */ - public function acl_delete($mode, $ug_id = false, $forum_id = false, $permission_type = false) - { - global $db; - - if ($ug_id === false && $forum_id === false) - { - return; - } - - $option_id_ary = array(); - $table = ($mode == 'user') ? ACL_USERS_TABLE : ACL_GROUPS_TABLE; - $id_field = $mode . '_id'; - - $where_sql = array(); - - if ($forum_id !== false) - { - $where_sql[] = (!is_array($forum_id)) ? 'forum_id = ' . (int) $forum_id : $db->sql_in_set('forum_id', array_map('intval', $forum_id)); - } - - if ($ug_id !== false) - { - $where_sql[] = (!is_array($ug_id)) ? $id_field . ' = ' . (int) $ug_id : $db->sql_in_set($id_field, array_map('intval', $ug_id)); - } - - // There seem to be auth options involved, therefore we need to go through the list and make sure we capture roles correctly - if ($permission_type !== false) - { - // Get permission type - $sql = 'SELECT auth_option, auth_option_id - FROM ' . ACL_OPTIONS_TABLE . " - WHERE auth_option " . $db->sql_like_expression($permission_type . $db->any_char); - $result = $db->sql_query($sql); - - $auth_id_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - $option_id_ary[] = $row['auth_option_id']; - $auth_id_ary[$row['auth_option']] = ACL_NO; - } - $db->sql_freeresult($result); - - // First of all, lets grab the items having roles with the specified auth options assigned - $sql = "SELECT auth_role_id, $id_field, forum_id - FROM $table, " . ACL_ROLES_TABLE . " r - WHERE auth_role_id <> 0 - AND auth_role_id = r.role_id - AND r.role_type = '{$permission_type}' - AND " . implode(' AND ', $where_sql) . ' - ORDER BY auth_role_id'; - $result = $db->sql_query($sql); - - $cur_role_auth = array(); - while ($row = $db->sql_fetchrow($result)) - { - $cur_role_auth[$row['auth_role_id']][$row['forum_id']][] = $row[$id_field]; - } - $db->sql_freeresult($result); - - // Get role data for resetting data - if (sizeof($cur_role_auth)) - { - $sql = 'SELECT ao.auth_option, rd.role_id, rd.auth_setting - FROM ' . ACL_OPTIONS_TABLE . ' ao, ' . ACL_ROLES_DATA_TABLE . ' rd - WHERE ao.auth_option_id = rd.auth_option_id - AND ' . $db->sql_in_set('rd.role_id', array_keys($cur_role_auth)); - $result = $db->sql_query($sql); - - $auth_settings = array(); - while ($row = $db->sql_fetchrow($result)) - { - // We need to fill all auth_options, else setting it will fail... - if (!isset($auth_settings[$row['role_id']])) - { - $auth_settings[$row['role_id']] = $auth_id_ary; - } - $auth_settings[$row['role_id']][$row['auth_option']] = $row['auth_setting']; - } - $db->sql_freeresult($result); - - // Set the options - foreach ($cur_role_auth as $role_id => $auth_row) - { - foreach ($auth_row as $f_id => $ug_row) - { - $this->acl_set($mode, $f_id, $ug_row, $auth_settings[$role_id], 0, false); - } - } - } - } - - // Now, normally remove permissions... - if ($permission_type !== false) - { - $where_sql[] = $db->sql_in_set('auth_option_id', array_map('intval', $option_id_ary)); - } - - $sql = "DELETE FROM $table - WHERE " . implode(' AND ', $where_sql); - $db->sql_query($sql); - - $this->acl_clear_prefetch(); - } - - /** - * Assign category to template - * used by display_mask() - */ - private static function assign_cat_array(array $category_array, $tpl_cat, $tpl_mask, $ug_id, $forum_id, $show_trace = false, $s_view) - { - global $template, $user, $phpbb_admin_path, $phpEx; - - @reset($category_array); - while (list($cat, $cat_array) = each($category_array)) - { - $template->assign_block_vars($tpl_cat, array( - 'S_YES' => ($cat_array['S_YES'] && !$cat_array['S_NEVER'] && !$cat_array['S_NO']) ? true : false, - 'S_NEVER' => ($cat_array['S_NEVER'] && !$cat_array['S_YES'] && !$cat_array['S_NO']) ? true : false, - 'S_NO' => ($cat_array['S_NO'] && !$cat_array['S_NEVER'] && !$cat_array['S_YES']) ? true : false, - - 'CAT_NAME' => $user->lang['permission_cat'][$cat]) - ); - - /* Sort permissions by name (more naturaly and user friendly than sorting by a primary key) - * Commented out due to it's memory consumption and time needed - * - $key_array = array_intersect(array_keys($user->lang), array_map(create_function('$a', 'return "acl_" . $a;'), array_keys($cat_array['permissions']))); - $values_array = $cat_array['permissions']; - - $cat_array['permissions'] = array(); - - foreach ($key_array as $key) - { - $key = str_replace('acl_', '', $key); - $cat_array['permissions'][$key] = $values_array[$key]; - } - unset($key_array, $values_array); -*/ - @reset($cat_array['permissions']); - while (list($permission, $allowed) = each($cat_array['permissions'])) - { - if ($s_view) - { - $template->assign_block_vars($tpl_cat . '.' . $tpl_mask, array( - 'S_YES' => ($allowed == ACL_YES) ? true : false, - 'S_NEVER' => ($allowed == ACL_NEVER) ? true : false, - - 'UG_ID' => $ug_id, - 'FORUM_ID' => $forum_id, - 'FIELD_NAME' => $permission, - 'S_FIELD_NAME' => 'setting[' . $ug_id . '][' . $forum_id . '][' . $permission . ']', - - 'U_TRACE' => ($show_trace) ? append_sid("{$phpbb_admin_path}index.$phpEx", "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission") : '', - 'UA_TRACE' => ($show_trace) ? append_sid("{$phpbb_admin_path}index.$phpEx", "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission", false) : '', - - 'PERMISSION' => $user->lang['acl_' . $permission]['lang']) - ); - } - else - { - $template->assign_block_vars($tpl_cat . '.' . $tpl_mask, array( - 'S_YES' => ($allowed == ACL_YES) ? true : false, - 'S_NEVER' => ($allowed == ACL_NEVER) ? true : false, - 'S_NO' => ($allowed == ACL_NO) ? true : false, - - 'UG_ID' => $ug_id, - 'FORUM_ID' => $forum_id, - 'FIELD_NAME' => $permission, - 'S_FIELD_NAME' => 'setting[' . $ug_id . '][' . $forum_id . '][' . $permission . ']', - - 'U_TRACE' => ($show_trace) ? append_sid("{$phpbb_admin_path}index.$phpEx", "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission") : '', - 'UA_TRACE' => ($show_trace) ? append_sid("{$phpbb_admin_path}index.$phpEx", "i=permissions&mode=trace&u=$ug_id&f=$forum_id&auth=$permission", false) : '', - - 'PERMISSION' => $user->lang['acl_' . $permission]['lang']) - ); - } - } - } - } - - /** - * Building content array from permission rows with explicit key ordering - * used by display_mask() - */ - public static function build_permission_array(array $permission_row, array &$content_array, array &$categories, array $key_sort_array) - { - global $user; - - foreach ($key_sort_array as $forum_id) - { - if (!isset($permission_row[$forum_id])) - { - continue; - } - - $permissions = $permission_row[$forum_id]; - ksort($permissions); - - @reset($permissions); - while (list($permission, $auth_setting) = each($permissions)) - { - if (!isset($user->lang['acl_' . $permission])) - { - $user->lang['acl_' . $permission] = array( - 'cat' => 'misc', - 'lang' => '{ acl_' . $permission . ' }' - ); - } - - $cat = $user->lang['acl_' . $permission]['cat']; - - // Build our categories array - if (!isset($categories[$cat])) - { - $categories[$cat] = $user->lang['permission_cat'][$cat]; - } - - // Build our content array - if (!isset($content_array[$forum_id])) - { - $content_array[$forum_id] = array(); - } - - if (!isset($content_array[$forum_id][$cat])) - { - $content_array[$forum_id][$cat] = array( - 'S_YES' => false, - 'S_NEVER' => false, - 'S_NO' => false, - 'permissions' => array(), - ); - } - - $content_array[$forum_id][$cat]['S_YES'] |= ($auth_setting == ACL_YES) ? true : false; - $content_array[$forum_id][$cat]['S_NEVER'] |= ($auth_setting == ACL_NEVER) ? true : false; - $content_array[$forum_id][$cat]['S_NO'] |= ($auth_setting == ACL_NO) ? true : false; - - $content_array[$forum_id][$cat]['permissions'][$permission] = $auth_setting; - } - } - } - - /** - * Use permissions from another user. This transferes a permission set from one user to another. - * The other user is always able to revert back to his permission set. - * This function does not check for lower/higher permissions, it is possible for the user to gain - * "more" permissions by this. - * Admin permissions will not be copied. - */ - public function ghost_permissions($from_user_id, $to_user_id) - { - global $db; - - if ($to_user_id == ANONYMOUS) - { - return false; - } - - $hold_ary = $this->acl_raw_data_single_user($from_user_id); - - // Key 0 in $hold_ary are global options, all others are forum_ids - - // We disallow copying admin permissions - foreach ($this->acl_options['global'] as $opt => $id) - { - if (strpos($opt, 'a_') === 0) - { - $hold_ary[0][$this->acl_options['id'][$opt]] = ACL_NEVER; - } - } - - // Force a_switchperm to be allowed - $hold_ary[0][$this->acl_options['id']['a_switchperm']] = ACL_YES; - - $user_permissions = $this->build_bitstring($hold_ary); - - if (!$user_permissions) - { - return false; - } - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_permissions = '" . $db->sql_escape($user_permissions) . "', - user_perm_from = $from_user_id - WHERE user_id = " . $to_user_id; - $db->sql_query($sql); - - return true; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_attachments.php b/phpBB/includes/acp/info/acp_attachments.php deleted file mode 100644 index b77785801f..0000000000 --- a/phpBB/includes/acp/info/acp_attachments.php +++ /dev/null @@ -1,40 +0,0 @@ - 'acp_attachments', - 'title' => 'ACP_ATTACHMENTS', - 'version' => '1.0.0', - 'modes' => array( - 'attach' => array('title' => 'ACP_ATTACHMENT_SETTINGS', 'auth' => 'acl_a_attach', 'cat' => array('ACP_BOARD_CONFIGURATION', 'ACP_ATTACHMENTS')), - 'extensions' => array('title' => 'ACP_MANAGE_EXTENSIONS', 'auth' => 'acl_a_attach', 'cat' => array('ACP_ATTACHMENTS')), - 'ext_groups' => array('title' => 'ACP_EXTENSION_GROUPS', 'auth' => 'acl_a_attach', 'cat' => array('ACP_ATTACHMENTS')), - 'orphan' => array('title' => 'ACP_ORPHAN_ATTACHMENTS', 'auth' => 'acl_a_attach', 'cat' => array('ACP_ATTACHMENTS')) - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_ban.php b/phpBB/includes/acp/info/acp_ban.php deleted file mode 100644 index df51011ec6..0000000000 --- a/phpBB/includes/acp/info/acp_ban.php +++ /dev/null @@ -1,39 +0,0 @@ - 'acp_ban', - 'title' => 'ACP_BAN', - 'version' => '1.0.0', - 'modes' => array( - 'email' => array('title' => 'ACP_BAN_EMAILS', 'auth' => 'acl_a_ban', 'cat' => array('ACP_USER_SECURITY')), - 'ip' => array('title' => 'ACP_BAN_IPS', 'auth' => 'acl_a_ban', 'cat' => array('ACP_USER_SECURITY')), - 'user' => array('title' => 'ACP_BAN_USERNAMES', 'auth' => 'acl_a_ban', 'cat' => array('ACP_USER_SECURITY')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_bbcodes.php b/phpBB/includes/acp/info/acp_bbcodes.php deleted file mode 100644 index c0206432d6..0000000000 --- a/phpBB/includes/acp/info/acp_bbcodes.php +++ /dev/null @@ -1,37 +0,0 @@ - 'acp_bbcodes', - 'title' => 'ACP_BBCODES', - 'version' => '1.0.0', - 'modes' => array( - 'bbcodes' => array('title' => 'ACP_BBCODES', 'auth' => 'acl_a_bbcode', 'cat' => array('ACP_MESSAGES')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_board.php b/phpBB/includes/acp/info/acp_board.php deleted file mode 100644 index 72d86676a6..0000000000 --- a/phpBB/includes/acp/info/acp_board.php +++ /dev/null @@ -1,51 +0,0 @@ - 'acp_board', - 'title' => 'ACP_BOARD_MANAGEMENT', - 'version' => '1.0.0', - 'modes' => array( - 'settings' => array('title' => 'ACP_BOARD_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')), - 'features' => array('title' => 'ACP_BOARD_FEATURES', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')), - 'avatar' => array('title' => 'ACP_AVATAR_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')), - 'message' => array('title' => 'ACP_MESSAGE_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION', 'ACP_MESSAGES')), - 'post' => array('title' => 'ACP_POST_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')), - 'signature' => array('title' => 'ACP_SIGNATURE_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')), - 'registration' => array('title' => 'ACP_REGISTER_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')), - - 'auth' => array('title' => 'ACP_AUTH_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_CLIENT_COMMUNICATION')), - 'email' => array('title' => 'ACP_EMAIL_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_CLIENT_COMMUNICATION')), - - 'cookie' => array('title' => 'ACP_COOKIE_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')), - 'server' => array('title' => 'ACP_SERVER_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')), - 'security' => array('title' => 'ACP_SECURITY_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')), - 'load' => array('title' => 'ACP_LOAD_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_bots.php b/phpBB/includes/acp/info/acp_bots.php deleted file mode 100644 index 45087f9225..0000000000 --- a/phpBB/includes/acp/info/acp_bots.php +++ /dev/null @@ -1,38 +0,0 @@ - 'acp_bots', - 'title' => 'ACP_BOTS', - 'version' => '1.0.0', - 'modes' => array( - 'bots' => array('title' => 'ACP_BOTS', 'auth' => 'acl_a_bots', 'cat' => array('ACP_GENERAL_TASKS')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_captcha.php b/phpBB/includes/acp/info/acp_captcha.php deleted file mode 100644 index b2541c252c..0000000000 --- a/phpBB/includes/acp/info/acp_captcha.php +++ /dev/null @@ -1,38 +0,0 @@ - 'acp_captcha', - 'title' => 'ACP_CAPTCHA', - 'version' => '1.0.0', - 'modes' => array( - 'visual' => array('title' => 'ACP_VC_SETTINGS', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION')), - 'img' => array('title' => 'ACP_VC_CAPTCHA_DISPLAY', 'auth' => 'acl_a_board', 'cat' => array('ACP_BOARD_CONFIGURATION'), 'display' => false) - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_database.php b/phpBB/includes/acp/info/acp_database.php deleted file mode 100644 index 85c3c8b21c..0000000000 --- a/phpBB/includes/acp/info/acp_database.php +++ /dev/null @@ -1,38 +0,0 @@ - 'acp_database', - 'title' => 'ACP_DATABASE', - 'version' => '1.0.0', - 'modes' => array( - 'backup' => array('title' => 'ACP_BACKUP', 'auth' => 'acl_a_backup', 'cat' => array('ACP_CAT_DATABASE')), - 'restore' => array('title' => 'ACP_RESTORE', 'auth' => 'acl_a_backup', 'cat' => array('ACP_CAT_DATABASE')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_disallow.php b/phpBB/includes/acp/info/acp_disallow.php deleted file mode 100644 index 41315eb716..0000000000 --- a/phpBB/includes/acp/info/acp_disallow.php +++ /dev/null @@ -1,38 +0,0 @@ - 'acp_disallow', - 'title' => 'ACP_DISALLOW', - 'version' => '1.0.0', - 'modes' => array( - 'usernames' => array('title' => 'ACP_DISALLOW_USERNAMES', 'auth' => 'acl_a_names', 'cat' => array('ACP_USER_SECURITY')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_email.php b/phpBB/includes/acp/info/acp_email.php deleted file mode 100644 index f2270892e0..0000000000 --- a/phpBB/includes/acp/info/acp_email.php +++ /dev/null @@ -1,38 +0,0 @@ - 'acp_email', - 'title' => 'ACP_MASS_EMAIL', - 'version' => '1.0.0', - 'modes' => array( - 'email' => array('title' => 'ACP_MASS_EMAIL', 'auth' => 'acl_a_email', 'cat' => array('ACP_GENERAL_TASKS')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_forums.php b/phpBB/includes/acp/info/acp_forums.php deleted file mode 100644 index 8d82eaf42d..0000000000 --- a/phpBB/includes/acp/info/acp_forums.php +++ /dev/null @@ -1,37 +0,0 @@ - 'acp_forums', - 'title' => 'ACP_FORUM_MANAGEMENT', - 'version' => '1.0.0', - 'modes' => array( - 'manage' => array('title' => 'ACP_MANAGE_FORUMS', 'auth' => 'acl_a_forum', 'cat' => array('ACP_MANAGE_FORUMS')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_groups.php b/phpBB/includes/acp/info/acp_groups.php deleted file mode 100644 index 3910c24e6b..0000000000 --- a/phpBB/includes/acp/info/acp_groups.php +++ /dev/null @@ -1,37 +0,0 @@ - 'acp_groups', - 'title' => 'ACP_GROUPS_MANAGEMENT', - 'version' => '1.0.0', - 'modes' => array( - 'manage' => array('title' => 'ACP_GROUPS_MANAGE', 'auth' => 'acl_a_group', 'cat' => array('ACP_GROUPS')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_icons.php b/phpBB/includes/acp/info/acp_icons.php deleted file mode 100644 index 16bf753940..0000000000 --- a/phpBB/includes/acp/info/acp_icons.php +++ /dev/null @@ -1,38 +0,0 @@ - 'acp_icons', - 'title' => 'ACP_ICONS_SMILIES', - 'version' => '1.0.0', - 'modes' => array( - 'icons' => array('title' => 'ACP_ICONS', 'auth' => 'acl_a_icons', 'cat' => array('ACP_MESSAGES')), - 'smilies' => array('title' => 'ACP_SMILIES', 'auth' => 'acl_a_icons', 'cat' => array('ACP_MESSAGES')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_inactive.php b/phpBB/includes/acp/info/acp_inactive.php deleted file mode 100755 index e17fbda9dd..0000000000 --- a/phpBB/includes/acp/info/acp_inactive.php +++ /dev/null @@ -1,37 +0,0 @@ - 'acp_inactive', - 'title' => 'ACP_INACTIVE_USERS', - 'version' => '1.0.0', - 'modes' => array( - 'list' => array('title' => 'ACP_INACTIVE_USERS', 'auth' => 'acl_a_user', 'cat' => array('ACP_CAT_USERS')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_jabber.php b/phpBB/includes/acp/info/acp_jabber.php deleted file mode 100644 index 7bcf7744e1..0000000000 --- a/phpBB/includes/acp/info/acp_jabber.php +++ /dev/null @@ -1,36 +0,0 @@ - 'acp_jabber', - 'title' => 'ACP_JABBER_SETTINGS', - 'version' => '1.0.0', - 'modes' => array( - 'settings' => array('title' => 'ACP_JABBER_SETTINGS', 'auth' => 'acl_a_jabber', 'cat' => array('ACP_CLIENT_COMMUNICATION')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_language.php b/phpBB/includes/acp/info/acp_language.php deleted file mode 100644 index f7606631fe..0000000000 --- a/phpBB/includes/acp/info/acp_language.php +++ /dev/null @@ -1,37 +0,0 @@ - 'acp_language', - 'title' => 'ACP_LANGUAGE', - 'version' => '1.0.0', - 'modes' => array( - 'lang_packs' => array('title' => 'ACP_LANGUAGE_PACKS', 'auth' => 'acl_a_language', 'cat' => array('ACP_GENERAL_TASKS')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_logs.php b/phpBB/includes/acp/info/acp_logs.php deleted file mode 100644 index f119e10b83..0000000000 --- a/phpBB/includes/acp/info/acp_logs.php +++ /dev/null @@ -1,40 +0,0 @@ - 'acp_logs', - 'title' => 'ACP_LOGGING', - 'version' => '1.0.0', - 'modes' => array( - 'admin' => array('title' => 'ACP_ADMIN_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')), - 'mod' => array('title' => 'ACP_MOD_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')), - 'users' => array('title' => 'ACP_USERS_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')), - 'critical' => array('title' => 'ACP_CRITICAL_LOGS', 'auth' => 'acl_a_viewlogs', 'cat' => array('ACP_FORUM_LOGS')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_main.php b/phpBB/includes/acp/info/acp_main.php deleted file mode 100644 index 5574cc40d1..0000000000 --- a/phpBB/includes/acp/info/acp_main.php +++ /dev/null @@ -1,37 +0,0 @@ - 'acp_main', - 'title' => 'ACP_INDEX', - 'version' => '1.0.0', - 'modes' => array( - 'main' => array('title' => 'ACP_INDEX', 'auth' => '', 'cat' => array('ACP_CAT_GENERAL')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_modules.php b/phpBB/includes/acp/info/acp_modules.php deleted file mode 100644 index 886f17d628..0000000000 --- a/phpBB/includes/acp/info/acp_modules.php +++ /dev/null @@ -1,39 +0,0 @@ - 'acp_modules', - 'title' => 'ACP_MODULE_MANAGEMENT', - 'version' => '1.0.0', - 'modes' => array( - 'acp' => array('title' => 'ACP', 'auth' => 'acl_a_modules', 'cat' => array('ACP_MODULE_MANAGEMENT')), - 'ucp' => array('title' => 'UCP', 'auth' => 'acl_a_modules', 'cat' => array('ACP_MODULE_MANAGEMENT')), - 'mcp' => array('title' => 'MCP', 'auth' => 'acl_a_modules', 'cat' => array('ACP_MODULE_MANAGEMENT')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_permission_roles.php b/phpBB/includes/acp/info/acp_permission_roles.php deleted file mode 100644 index 3ab2fecd53..0000000000 --- a/phpBB/includes/acp/info/acp_permission_roles.php +++ /dev/null @@ -1,40 +0,0 @@ - 'acp_permission_roles', - 'title' => 'ACP_PERMISSION_ROLES', - 'version' => '1.0.0', - 'modes' => array( - 'admin_roles' => array('title' => 'ACP_ADMIN_ROLES', 'auth' => 'acl_a_roles && acl_a_aauth', 'cat' => array('ACP_PERMISSION_ROLES')), - 'user_roles' => array('title' => 'ACP_USER_ROLES', 'auth' => 'acl_a_roles && acl_a_uauth', 'cat' => array('ACP_PERMISSION_ROLES')), - 'mod_roles' => array('title' => 'ACP_MOD_ROLES', 'auth' => 'acl_a_roles && acl_a_mauth', 'cat' => array('ACP_PERMISSION_ROLES')), - 'forum_roles' => array('title' => 'ACP_FORUM_ROLES', 'auth' => 'acl_a_roles && acl_a_fauth', 'cat' => array('ACP_PERMISSION_ROLES')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_permissions.php b/phpBB/includes/acp/info/acp_permissions.php deleted file mode 100644 index 22de666af3..0000000000 --- a/phpBB/includes/acp/info/acp_permissions.php +++ /dev/null @@ -1,53 +0,0 @@ - 'acp_permissions', - 'title' => 'ACP_PERMISSIONS', - 'version' => '1.0.0', - 'modes' => array( - 'intro' => array('title' => 'ACP_PERMISSIONS', 'auth' => 'acl_a_authusers || acl_a_authgroups || acl_a_viewauth', 'cat' => array('ACP_CAT_PERMISSIONS')), - 'trace' => array('title' => 'ACP_PERMISSION_TRACE', 'auth' => 'acl_a_viewauth', 'display' => false, 'cat' => array('ACP_PERMISSION_MASKS')), - - 'setting_forum_local' => array('title' => 'ACP_FORUM_PERMISSIONS', 'auth' => 'acl_a_fauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS')), - 'setting_mod_local' => array('title' => 'ACP_FORUM_MODERATORS', 'auth' => 'acl_a_mauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS')), - 'setting_user_global' => array('title' => 'ACP_USERS_PERMISSIONS', 'auth' => 'acl_a_authusers && (acl_a_aauth || acl_a_mauth || acl_a_uauth)', 'cat' => array('ACP_GLOBAL_PERMISSIONS', 'ACP_CAT_USERS')), - 'setting_user_local' => array('title' => 'ACP_USERS_FORUM_PERMISSIONS', 'auth' => 'acl_a_authusers && (acl_a_mauth || acl_a_fauth)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS', 'ACP_CAT_USERS')), - 'setting_group_global' => array('title' => 'ACP_GROUPS_PERMISSIONS', 'auth' => 'acl_a_authgroups && (acl_a_aauth || acl_a_mauth || acl_a_uauth)', 'cat' => array('ACP_GLOBAL_PERMISSIONS', 'ACP_GROUPS')), - 'setting_group_local' => array('title' => 'ACP_GROUPS_FORUM_PERMISSIONS', 'auth' => 'acl_a_authgroups && (acl_a_mauth || acl_a_fauth)', 'cat' => array('ACP_FORUM_BASED_PERMISSIONS', 'ACP_GROUPS')), - 'setting_admin_global' => array('title' => 'ACP_ADMINISTRATORS', 'auth' => 'acl_a_aauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_GLOBAL_PERMISSIONS')), - 'setting_mod_global' => array('title' => 'ACP_GLOBAL_MODERATORS', 'auth' => 'acl_a_mauth && (acl_a_authusers || acl_a_authgroups)', 'cat' => array('ACP_GLOBAL_PERMISSIONS')), - - 'view_admin_global' => array('title' => 'ACP_VIEW_ADMIN_PERMISSIONS', 'auth' => 'acl_a_viewauth', 'cat' => array('ACP_PERMISSION_MASKS')), - 'view_user_global' => array('title' => 'ACP_VIEW_USER_PERMISSIONS', 'auth' => 'acl_a_viewauth', 'cat' => array('ACP_PERMISSION_MASKS')), - 'view_mod_global' => array('title' => 'ACP_VIEW_GLOBAL_MOD_PERMISSIONS', 'auth' => 'acl_a_viewauth', 'cat' => array('ACP_PERMISSION_MASKS')), - 'view_mod_local' => array('title' => 'ACP_VIEW_FORUM_MOD_PERMISSIONS', 'auth' => 'acl_a_viewauth', 'cat' => array('ACP_PERMISSION_MASKS')), - 'view_forum_local' => array('title' => 'ACP_VIEW_FORUM_PERMISSIONS', 'auth' => 'acl_a_viewauth', 'cat' => array('ACP_PERMISSION_MASKS')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_php_info.php b/phpBB/includes/acp/info/acp_php_info.php deleted file mode 100644 index 7d716b0f83..0000000000 --- a/phpBB/includes/acp/info/acp_php_info.php +++ /dev/null @@ -1,37 +0,0 @@ - 'acp_php_info', - 'title' => 'ACP_PHP_INFO', - 'version' => '1.0.0', - 'modes' => array( - 'info' => array('title' => 'ACP_PHP_INFO', 'auth' => 'acl_a_phpinfo', 'cat' => array('ACP_GENERAL_TASKS')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_profile.php b/phpBB/includes/acp/info/acp_profile.php deleted file mode 100644 index 8590226038..0000000000 --- a/phpBB/includes/acp/info/acp_profile.php +++ /dev/null @@ -1,37 +0,0 @@ - 'acp_profile', - 'title' => 'ACP_CUSTOM_PROFILE_FIELDS', - 'version' => '1.0.0', - 'modes' => array( - 'profile' => array('title' => 'ACP_CUSTOM_PROFILE_FIELDS', 'auth' => 'acl_a_profile', 'cat' => array('ACP_CAT_USERS')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_prune.php b/phpBB/includes/acp/info/acp_prune.php deleted file mode 100644 index 46565c4f16..0000000000 --- a/phpBB/includes/acp/info/acp_prune.php +++ /dev/null @@ -1,38 +0,0 @@ - 'acp_prune', - 'title' => 'ACP_PRUNING', - 'version' => '1.0.0', - 'modes' => array( - 'forums' => array('title' => 'ACP_PRUNE_FORUMS', 'auth' => 'acl_a_prune', 'cat' => array('ACP_MANAGE_FORUMS')), - 'users' => array('title' => 'ACP_PRUNE_USERS', 'auth' => 'acl_a_userdel', 'cat' => array('ACP_USER_SECURITY')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_ranks.php b/phpBB/includes/acp/info/acp_ranks.php deleted file mode 100644 index 06b9c6d284..0000000000 --- a/phpBB/includes/acp/info/acp_ranks.php +++ /dev/null @@ -1,37 +0,0 @@ - 'acp_ranks', - 'title' => 'ACP_RANKS', - 'version' => '1.0.0', - 'modes' => array( - 'ranks' => array('title' => 'ACP_MANAGE_RANKS', 'auth' => 'acl_a_ranks', 'cat' => array('ACP_CAT_USERS')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_reasons.php b/phpBB/includes/acp/info/acp_reasons.php deleted file mode 100644 index 65d805ee18..0000000000 --- a/phpBB/includes/acp/info/acp_reasons.php +++ /dev/null @@ -1,37 +0,0 @@ - 'acp_reasons', - 'title' => 'ACP_REASONS', - 'version' => '1.0.0', - 'modes' => array( - 'main' => array('title' => 'ACP_MANAGE_REASONS', 'auth' => 'acl_a_reasons', 'cat' => array('ACP_GENERAL_TASKS')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_search.php b/phpBB/includes/acp/info/acp_search.php deleted file mode 100644 index 4afd6c6994..0000000000 --- a/phpBB/includes/acp/info/acp_search.php +++ /dev/null @@ -1,38 +0,0 @@ - 'acp_search', - 'title' => 'ACP_SEARCH', - 'version' => '1.0.0', - 'modes' => array( - 'settings' => array('title' => 'ACP_SEARCH_SETTINGS', 'auth' => 'acl_a_search', 'cat' => array('ACP_SERVER_CONFIGURATION')), - 'index' => array('title' => 'ACP_SEARCH_INDEX', 'auth' => 'acl_a_search', 'cat' => array('ACP_CAT_DATABASE')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_styles.php b/phpBB/includes/acp/info/acp_styles.php deleted file mode 100644 index db67167e39..0000000000 --- a/phpBB/includes/acp/info/acp_styles.php +++ /dev/null @@ -1,40 +0,0 @@ - 'acp_styles', - 'title' => 'ACP_CAT_STYLES', - 'version' => '1.0.0', - 'modes' => array( - 'style' => array('title' => 'ACP_STYLES', 'auth' => 'acl_a_styles', 'cat' => array('ACP_STYLE_MANAGEMENT')), - 'template' => array('title' => 'ACP_TEMPLATES', 'auth' => 'acl_a_styles', 'cat' => array('ACP_STYLE_COMPONENTS')), - 'theme' => array('title' => 'ACP_THEMES', 'auth' => 'acl_a_styles', 'cat' => array('ACP_STYLE_COMPONENTS')), - 'imageset' => array('title' => 'ACP_IMAGESETS', 'auth' => 'acl_a_styles', 'cat' => array('ACP_STYLE_COMPONENTS')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_update.php b/phpBB/includes/acp/info/acp_update.php deleted file mode 100644 index 886cdc94d5..0000000000 --- a/phpBB/includes/acp/info/acp_update.php +++ /dev/null @@ -1,37 +0,0 @@ - 'acp_update', - 'title' => 'ACP_UPDATE', - 'version' => '1.0.0', - 'modes' => array( - 'version_check' => array('title' => 'ACP_VERSION_CHECK', 'auth' => 'acl_a_board', 'cat' => array('ACP_AUTOMATION')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_users.php b/phpBB/includes/acp/info/acp_users.php deleted file mode 100644 index 0cd5f7ae97..0000000000 --- a/phpBB/includes/acp/info/acp_users.php +++ /dev/null @@ -1,46 +0,0 @@ - 'acp_users', - 'title' => 'ACP_USER_MANAGEMENT', - 'version' => '1.0.0', - 'modes' => array( - 'overview' => array('title' => 'ACP_MANAGE_USERS', 'auth' => 'acl_a_user', 'cat' => array('ACP_CAT_USERS')), - 'feedback' => array('title' => 'ACP_USER_FEEDBACK', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')), - 'profile' => array('title' => 'ACP_USER_PROFILE', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')), - 'prefs' => array('title' => 'ACP_USER_PREFS', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')), - 'avatar' => array('title' => 'ACP_USER_AVATAR', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')), - 'rank' => array('title' => 'ACP_USER_RANK', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')), - 'sig' => array('title' => 'ACP_USER_SIG', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')), - 'groups' => array('title' => 'ACP_USER_GROUPS', 'auth' => 'acl_a_user && acl_a_group', 'display' => false, 'cat' => array('ACP_CAT_USERS')), - 'perm' => array('title' => 'ACP_USER_PERM', 'auth' => 'acl_a_user && acl_a_viewauth', 'display' => false, 'cat' => array('ACP_CAT_USERS')), - 'attach' => array('title' => 'ACP_USER_ATTACH', 'auth' => 'acl_a_user', 'display' => false, 'cat' => array('ACP_CAT_USERS')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/acp/info/acp_words.php b/phpBB/includes/acp/info/acp_words.php deleted file mode 100644 index a2417f8a7f..0000000000 --- a/phpBB/includes/acp/info/acp_words.php +++ /dev/null @@ -1,37 +0,0 @@ - 'acp_words', - 'title' => 'ACP_WORDS', - 'version' => '1.0.0', - 'modes' => array( - 'words' => array('title' => 'ACP_WORDS', 'auth' => 'acl_a_words', 'cat' => array('ACP_MESSAGES')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php index 16accea94e..1e64187caa 100644 --- a/phpBB/includes/auth.php +++ b/phpBB/includes/auth.php @@ -1,1004 +1,328 @@ sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Failed obtaining forum access control lists', '', __LINE__, __FILE__, $sql); + } + + $sql_fetchrow = ( $forum_id != AUTH_LIST_ALL ) ? 'sql_fetchrow' : 'sql_fetchrowset'; + + if ( !($f_access = $db->$sql_fetchrow($result)) ) + { + $db->sql_freeresult($result); + return array(); + } + $db->sql_freeresult($result); + } + + // + // If the user isn't logged on then all we need do is check if the forum + // has the type set to ALL, if yes they are good to go, if not then they + // are denied access + // + $u_access = array(); + if ( $userdata['session_logged_in'] ) + { + $forum_match_sql = ( $forum_id != AUTH_LIST_ALL ) ? "AND a.forum_id = $forum_id" : ''; + + $sql = "SELECT a.forum_id, $a_sql, a.auth_mod + FROM " . AUTH_ACCESS_TABLE . " a, " . USER_GROUP_TABLE . " ug + WHERE ug.user_id = ".$userdata['user_id']. " + AND ug.user_pending = 0 + AND a.group_id = ug.group_id + $forum_match_sql"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Failed obtaining forum access control lists', '', __LINE__, __FILE__, $sql); + } + + if ( $row = $db->sql_fetchrow($result) ) + { + do + { + if ( $forum_id != AUTH_LIST_ALL) + { + $u_access[] = $row; + } + else + { + $u_access[$row['forum_id']][] = $row; + } + } + while( $row = $db->sql_fetchrow($result) ); + } + $db->sql_freeresult($result); + } + + $is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0; + + $auth_user = array(); + for($i = 0; $i < count($auth_fields); $i++) + { + $key = $auth_fields[$i]; + + // + // If the user is logged on and the forum type is either ALL or REG then the user has access + // + // If the type if ACL, MOD or ADMIN then we need to see if the user has specific permissions + // to do whatever it is they want to do ... to do this we pull relevant information for the + // user (and any groups they belong to) + // + // Now we compare the users access level against the forums. We assume here that a moderator + // and admin automatically have access to an ACL forum, similarly we assume admins meet an + // auth requirement of MOD + // + if ( $forum_id != AUTH_LIST_ALL ) + { + $value = $f_access[$key]; + + switch( $value ) + { + case AUTH_ALL: + $auth_user[$key] = TRUE; + $auth_user[$key . '_type'] = $lang['Auth_Anonymous_Users']; + break; + + case AUTH_REG: + $auth_user[$key] = ( $userdata['session_logged_in'] ) ? TRUE : 0; + $auth_user[$key . '_type'] = $lang['Auth_Registered_Users']; + break; + + case AUTH_ACL: + $auth_user[$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_ACL, $key, $u_access, $is_admin) : 0; + $auth_user[$key . '_type'] = $lang['Auth_Users_granted_access']; + break; + + case AUTH_MOD: + $auth_user[$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access, $is_admin) : 0; + $auth_user[$key . '_type'] = $lang['Auth_Moderators']; + break; + + case AUTH_ADMIN: + $auth_user[$key] = $is_admin; + $auth_user[$key . '_type'] = $lang['Auth_Administrators']; + break; + + default: + $auth_user[$key] = 0; + break; + } + } + else + { + for($k = 0; $k < count($f_access); $k++) + { + $value = $f_access[$k][$key]; + $f_forum_id = $f_access[$k]['forum_id']; + $u_access[$f_forum_id] = isset($u_access[$f_forum_id]) ? $u_access[$f_forum_id] : array(); + + switch( $value ) + { + case AUTH_ALL: + $auth_user[$f_forum_id][$key] = TRUE; + $auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Anonymous_Users']; + break; + + case AUTH_REG: + $auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? TRUE : 0; + $auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Registered_Users']; + break; + + case AUTH_ACL: + $auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_ACL, $key, $u_access[$f_forum_id], $is_admin) : 0; + $auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Users_granted_access']; + break; + + case AUTH_MOD: + $auth_user[$f_forum_id][$key] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access[$f_forum_id], $is_admin) : 0; + $auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Moderators']; + break; + + case AUTH_ADMIN: + $auth_user[$f_forum_id][$key] = $is_admin; + $auth_user[$f_forum_id][$key . '_type'] = $lang['Auth_Administrators']; + break; + + default: + $auth_user[$f_forum_id][$key] = 0; + break; + } + } + } + } + + // + // Is user a moderator? + // + if ( $forum_id != AUTH_LIST_ALL ) + { + $auth_user['auth_mod'] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access, $is_admin) : 0; + } + else + { + for($k = 0; $k < count($f_access); $k++) + { + $f_forum_id = $f_access[$k]['forum_id']; + $u_access[$f_forum_id] = isset($u_access[$f_forum_id]) ? $u_access[$f_forum_id] : array(); + + $auth_user[$f_forum_id]['auth_mod'] = ( $userdata['session_logged_in'] ) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access[$f_forum_id], $is_admin) : 0; + } + } + + return $auth_user; } -/** -* Permission/Auth class -* @package phpBB3 -*/ -class auth +function auth_check_user($type, $key, $u_access, $is_admin) { - private $acl = array(); - private $cache = array(); - public $acl_options = array(); - private $acl_forum_ids = false; + $auth_user = 0; - /** - * Init permissions - */ - function acl(array &$userdata) + if ( count($u_access) ) { - global $db, $cache; - - $this->acl = $this->cache = $this->acl_options = array(); - $this->acl_forum_ids = false; - - if (($this->acl_options = $cache->get('_acl_options')) === false) + for($j = 0; $j < count($u_access); $j++) { - $sql = 'SELECT auth_option_id, auth_option, is_global, is_local - FROM ' . ACL_OPTIONS_TABLE . ' - ORDER BY auth_option_id'; - $result = $db->sql_query($sql); - - $global = $local = 0; - $this->acl_options = array(); - while ($row = $db->sql_fetchrow($result)) + $result = 0; + switch($type) { - if ($row['is_global']) - { - $this->acl_options['global'][$row['auth_option']] = $global++; - } + case AUTH_ACL: + $result = $u_access[$j][$key]; - if ($row['is_local']) - { - $this->acl_options['local'][$row['auth_option']] = $local++; - } + case AUTH_MOD: + $result = $result || $u_access[$j]['auth_mod']; - $this->acl_options['id'][$row['auth_option']] = (int) $row['auth_option_id']; - $this->acl_options['option'][(int) $row['auth_option_id']] = $row['auth_option']; - } - $db->sql_freeresult($result); - - $cache->put('_acl_options', $this->acl_options); - $this->acl_cache($userdata); - } - else if (!trim($userdata['user_permissions'])) - { - $this->acl_cache($userdata); - } - - $user_permissions = explode("\n", $userdata['user_permissions']); - - foreach ($user_permissions as $f => $seq) - { - if ($seq) - { - $i = 0; - - if (!isset($this->acl[$f])) - { - $this->acl[$f] = ''; - } - - while ($subseq = substr($seq, $i, 6)) - { - // We put the original bitstring into the acl array - $this->acl[$f] .= str_pad(base_convert($subseq, 36, 2), 31, 0, STR_PAD_LEFT); - $i += 6; - } - } - } - - return; - } - - /** - * Look up an option - * if the option is prefixed with !, then the result becomes negated - * - * If a forum id is specified the local option will be combined with a global option if one exist. - * If a forum id is not specified, only the global option will be checked. - */ - public function acl_get($opt, $f = 0) - { - $negate = false; - - if (strpos($opt, '!') === 0) - { - $negate = true; - $opt = substr($opt, 1); - } - - // @todo: use the ref technique to reduce opcode generation - if (!isset($this->cache[$f][$opt])) - { - // We combine the global/local option with an OR because some options are global and local. - // If the user has the global permission the local one is true too and vice versa - $this->cache[$f][$opt] = false; - - // Is this option a global permission setting? - if (isset($this->acl_options['global'][$opt])) - { - if (isset($this->acl[0])) - { - $this->cache[$f][$opt] = $this->acl[0][$this->acl_options['global'][$opt]]; - } + case AUTH_ADMIN: + $result = $result || $is_admin; + break; } - // Is this option a local permission setting? - // But if we check for a global option only, we won't combine the options... - if ($f != 0 && isset($this->acl_options['local'][$opt])) - { - if (isset($this->acl[$f]) && isset($this->acl[$f][$this->acl_options['local'][$opt]])) - { - $this->cache[$f][$opt] |= $this->acl[$f][$this->acl_options['local'][$opt]]; - } - } - } - - // Founder always has all global options set to true... - return $negate xor $this->cache[$f][$opt]; - } - - /** - * Get forums with the specified permission setting - * if the option is prefixed with !, then the result becomes nagated - * - * @param bool $clean set to true if only values needs to be returned which are set/unset - */ - public function acl_getf($opt, $clean = false) - { - $acl_f = array(); - $negate = false; - - if (strpos($opt, '!') === 0) - { - $negate = true; - $opt = substr($opt, 1); - } - - // If we retrieve a list of forums not having permissions in, we need to get every forum_id - if ($negate) - { - if ($this->acl_forum_ids === false) - { - global $db; - - $sql = 'SELECT forum_id - FROM ' . FORUMS_TABLE; - - if (sizeof($this->acl)) - { - $sql .= ' WHERE ' . $db->sql_in_set('forum_id', array_keys($this->acl), true); - } - $result = $db->sql_query($sql); - - $this->acl_forum_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $this->acl_forum_ids[] = $row['forum_id']; - } - $db->sql_freeresult($result); - } - } - - if (isset($this->acl_options['local'][$opt])) - { - foreach ($this->acl as $f => $bitstring) - { - // Skip global settings - if (!$f) - { - continue; - } - - $allowed = (!isset($this->cache[$f][$opt])) ? $this->acl_get($opt, $f) : $this->cache[$f][$opt]; - - if (!$clean) - { - $acl_f[$f][$opt] = $negate xor $allowed; - } - else if ($negate xor $allowed) - { - $acl_f[$f][$opt] = 1; - } - } - } - - // If we get forum_ids not having this permission, we need to fill the remaining parts - if ($negate && sizeof($this->acl_forum_ids)) - { - foreach ($this->acl_forum_ids as $f) - { - $acl_f[$f][$opt] = 1; - } - } - - return $acl_f; - } - - /** - * Get local permission state for any forum. - * - * Returns true if user has the permission in one or more forums, false if in no forum. - * If global option is checked it returns the global state (same as acl_get($opt)) - * Local option has precedence... - */ - public function acl_getf_global($opt) - { - if (is_array($opt)) - { - // evaluates to true as soon as acl_getf_global is true for one option - foreach ($opt as $check_option) - { - if ($this->acl_getf_global($check_option)) - { - return true; - } - } - - return false; - } - - if (isset($this->acl_options['local'][$opt])) - { - foreach ($this->acl as $f => $bitstring) - { - // Skip global settings - if (!$f) - { - continue; - } - - // as soon as the user has any permission we're done so return true - if ((!isset($this->cache[$f][$opt])) ? $this->acl_get($opt, $f) : $this->cache[$f][$opt]) - { - return true; - } - } - } - else if (isset($this->acl_options['global'][$opt])) - { - return $this->acl_get($opt); - } - - return false; - } - - /** - * Get permission settings (more than one) - */ - public function acl_gets() - { - $args = func_get_args(); - $f = array_pop($args); - - if (!is_numeric($f)) - { - $args[] = $f; - $f = 0; - } - - // alternate syntax: acl_gets(array('m_', 'a_'), $forum_id) - if (is_array($args[0])) - { - $args = $args[0]; - } - - $acl = 0; - foreach ($args as $opt) - { - $acl |= $this->acl_get($opt, $f); - } - - return $acl; - } - - /** - * Get permission listing based on user_id/options/forum_ids - */ - public function acl_get_list($user_id = false, $opts = false, $forum_id = false) - { - if ($user_id !== false && !is_array($user_id) && $opts === false && $forum_id === false) - { - $hold_ary = array($user_id => $this->acl_raw_data_single_user($user_id)); - } - else - { - $hold_ary = $this->acl_raw_data($user_id, $opts, $forum_id); - } - - $auth_ary = array(); - foreach ($hold_ary as $user_id => $forum_ary) - { - foreach ($forum_ary as $forum_id => $auth_option_ary) - { - foreach ($auth_option_ary as $auth_option => $auth_setting) - { - if ($auth_setting) - { - $auth_ary[$forum_id][$auth_option][] = $user_id; - } - } - } - } - - return $auth_ary; - } - - /** - * Cache data to user_permissions row - */ - public function acl_cache(array &$userdata) - { - global $db; - - // Empty user_permissions - $userdata['user_permissions'] = ''; - - $hold_ary = $this->acl_raw_data_single_user($userdata['user_id']); - - // Key 0 in $hold_ary are global options, all others are forum_ids - - // If this user is founder we're going to force fill the admin options ... - if ($userdata['user_type'] == USER_FOUNDER) - { - foreach ($this->acl_options['global'] as $opt => $id) - { - if (strpos($opt, 'a_') === 0) - { - $hold_ary[0][$this->acl_options['id'][$opt]] = ACL_YES; - } - } - } - - $hold_str = $this->build_bitstring($hold_ary); - - if ($hold_str) - { - $userdata['user_permissions'] = $hold_str; - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_permissions = '" . $db->sql_escape($userdata['user_permissions']) . "', - user_perm_from = 0 - WHERE user_id = " . $userdata['user_id']; - $db->sql_query($sql); - } - - return; - } - - /** - * Build bitstring from permission set - */ - protected function build_bitstring(&$hold_ary) - { - $hold_str = ''; - - if (sizeof($hold_ary)) - { - ksort($hold_ary); - - $last_f = 0; - - foreach ($hold_ary as $f => $auth_ary) - { - $ary_key = (!$f) ? 'global' : 'local'; - - $bitstring = array(); - foreach ($this->acl_options[$ary_key] as $opt => $id) - { - if (isset($auth_ary[$this->acl_options['id'][$opt]])) - { - $bitstring[$id] = $auth_ary[$this->acl_options['id'][$opt]]; - - $option_key = substr($opt, 0, strpos($opt, '_') + 1); - - // If one option is allowed, the global permission for this option has to be allowed too - // example: if the user has the a_ permission this means he has one or more a_* permissions - if ($auth_ary[$this->acl_options['id'][$opt]] == ACL_YES && (!isset($bitstring[$this->acl_options[$ary_key][$option_key]]) || $bitstring[$this->acl_options[$ary_key][$option_key]] == ACL_NEVER)) - { - $bitstring[$this->acl_options[$ary_key][$option_key]] = ACL_YES; - } - } - else - { - $bitstring[$id] = ACL_NEVER; - } - } - - // Now this bitstring defines the permission setting for the current forum $f (or global setting) - $bitstring = implode('', $bitstring); - - // The line number indicates the id, therefore we have to add empty lines for those ids not present - $hold_str .= str_repeat("\n", $f - $last_f); - - // Convert bitstring for storage - we do not use binary/bytes because PHP's string functions are not fully binary safe - for ($i = 0, $bit_length = strlen($bitstring); $i < $bit_length; $i += 31) - { - $hold_str .= str_pad(base_convert(str_pad(substr($bitstring, $i, 31), 31, 0, STR_PAD_RIGHT), 2, 36), 6, 0, STR_PAD_LEFT); - } - - $last_f = $f; - } - unset($bitstring); - - $hold_str = rtrim($hold_str); - } - - return $hold_str; - } - - /** - * Clear one or all users cached permission settings - */ - public function acl_clear_prefetch($user_id = false) - { - global $db, $cache; - - // Rebuild options cache - $cache->destroy('_role_cache'); - - $sql = 'SELECT * - FROM ' . ACL_ROLES_DATA_TABLE . ' - ORDER BY role_id ASC'; - $result = $db->sql_query($sql); - - $this->role_cache = array(); - while ($row = $db->sql_fetchrow($result)) - { - $this->role_cache[$row['role_id']][$row['auth_option_id']] = (int) $row['auth_setting']; - } - $db->sql_freeresult($result); - - foreach ($this->role_cache as $role_id => $role_options) - { - $this->role_cache[$role_id] = serialize($role_options); - } - - $cache->put('_role_cache', $this->role_cache); - - // Now empty user permissions - $where_sql = ''; - - if ($user_id !== false) - { - $user_id = (!is_array($user_id)) ? $user_id = array((int) $user_id) : array_map('intval', $user_id); - $where_sql = ' WHERE ' . $db->sql_in_set('user_id', $user_id); - } - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_permissions = '', - user_perm_from = 0 - $where_sql"; - $db->sql_query($sql); - - return; - } - - /** - * Get assigned roles - * @todo: protected or public? - */ - public function acl_role_data($user_type, $role_type, $ug_id = false, $forum_id = false) - { - global $db; - - $roles = array(); - - $sql_id = ($user_type == 'user') ? 'user_id' : 'group_id'; - - $sql_ug = ($ug_id !== false) ? ((!is_array($ug_id)) ? "AND a.$sql_id = $ug_id" : 'AND ' . $db->sql_in_set("a.$sql_id", $ug_id)) : ''; - $sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? "AND a.forum_id = $forum_id" : 'AND ' . $db->sql_in_set('a.forum_id', $forum_id)) : ''; - - // Grab assigned roles... - $sql = 'SELECT a.auth_role_id, a.' . $sql_id . ', a.forum_id - FROM ' . (($user_type == 'user') ? ACL_USERS_TABLE : ACL_GROUPS_TABLE) . ' a, ' . ACL_ROLES_TABLE . " r - WHERE a.auth_role_id = r.role_id - AND r.role_type = '" . $db->sql_escape($role_type) . "' - $sql_ug - $sql_forum - ORDER BY r.role_order ASC"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $roles[$row[$sql_id]][$row['forum_id']] = $row['auth_role_id']; - } - $db->sql_freeresult($result); - - return $roles; - } - - /** - * Get raw acl data based on user/option/forum - * @todo: protected or public? - */ - public function acl_raw_data($user_id = false, $opts = false, $forum_id = false) - { - global $db; - - $sql_user = ($user_id !== false) ? ((!is_array($user_id)) ? 'user_id = ' . (int) $user_id : $db->sql_in_set('user_id', array_map('intval', $user_id))) : ''; - $sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . $db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : ''; - - $sql_opts = $sql_opts_select = $sql_opts_from = ''; - $hold_ary = array(); - - if ($opts !== false) - { - $sql_opts_select = ', ao.auth_option'; - $sql_opts_from = ', ' . ACL_OPTIONS_TABLE . ' ao'; - $this->build_auth_option_statement('ao.auth_option', $opts, $sql_opts); - } - - $sql_ary = array(); - - // Grab non-role settings - user-specific - $sql_ary[] = 'SELECT a.user_id, a.forum_id, a.auth_setting, a.auth_option_id' . $sql_opts_select . ' - FROM ' . ACL_USERS_TABLE . ' a' . $sql_opts_from . ' - WHERE a.auth_role_id = 0 ' . - (($sql_opts_from) ? 'AND a.auth_option_id = ao.auth_option_id ' : '') . - (($sql_user) ? 'AND a.' . $sql_user : '') . " - $sql_forum - $sql_opts"; - - // Now the role settings - user-specific - $sql_ary[] = 'SELECT a.user_id, a.forum_id, r.auth_option_id, r.auth_setting, r.auth_option_id' . $sql_opts_select . ' - FROM ' . ACL_USERS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r' . $sql_opts_from . ' - WHERE a.auth_role_id = r.role_id ' . - (($sql_opts_from) ? 'AND r.auth_option_id = ao.auth_option_id ' : '') . - (($sql_user) ? 'AND a.' . $sql_user : '') . " - $sql_forum - $sql_opts"; - - foreach ($sql_ary as $sql) - { - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $option = ($sql_opts_select) ? $row['auth_option'] : $this->acl_options['option'][$row['auth_option_id']]; - $hold_ary[$row['user_id']][$row['forum_id']][$option] = $row['auth_setting']; - } - $db->sql_freeresult($result); - } - - $sql_ary = array(); - - // Now grab group settings - non-role specific... - $sql_ary[] = 'SELECT ug.user_id, a.forum_id, a.auth_setting, a.auth_option_id' . $sql_opts_select . ' - FROM ' . ACL_GROUPS_TABLE . ' a, ' . USER_GROUP_TABLE . ' ug' . $sql_opts_from . ' - WHERE a.auth_role_id = 0 ' . - (($sql_opts_from) ? 'AND a.auth_option_id = ao.auth_option_id ' : '') . ' - AND a.group_id = ug.group_id - AND ug.user_pending = 0 - ' . (($sql_user) ? 'AND ug.' . $sql_user : '') . " - $sql_forum - $sql_opts"; - - // Now grab group settings - role specific... - $sql_ary[] = 'SELECT ug.user_id, a.forum_id, r.auth_setting, r.auth_option_id' . $sql_opts_select . ' - FROM ' . ACL_GROUPS_TABLE . ' a, ' . USER_GROUP_TABLE . ' ug, ' . ACL_ROLES_DATA_TABLE . ' r' . $sql_opts_from . ' - WHERE a.auth_role_id = r.role_id ' . - (($sql_opts_from) ? 'AND r.auth_option_id = ao.auth_option_id ' : '') . ' - AND a.group_id = ug.group_id - AND ug.user_pending = 0 - ' . (($sql_user) ? 'AND ug.' . $sql_user : '') . " - $sql_forum - $sql_opts"; - - foreach ($sql_ary as $sql) - { - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $option = ($sql_opts_select) ? $row['auth_option'] : $this->acl_options['option'][$row['auth_option_id']]; - - // @todo: use the ref technique to reduce opcode generation - if (!isset($hold_ary[$row['user_id']][$row['forum_id']][$option]) || (isset($hold_ary[$row['user_id']][$row['forum_id']][$option]) && $hold_ary[$row['user_id']][$row['forum_id']][$option] != ACL_NEVER)) - { - $hold_ary[$row['user_id']][$row['forum_id']][$option] = $row['auth_setting']; - - // If we detect ACL_NEVER, we will unset the flag option (within building the bitstring it is correctly set again) - if ($row['auth_setting'] == ACL_NEVER) - { - $flag = substr($option, 0, strpos($option, '_') + 1); - - if (isset($hold_ary[$row['user_id']][$row['forum_id']][$flag]) && $hold_ary[$row['user_id']][$row['forum_id']][$flag] == ACL_YES) - { - unset($hold_ary[$row['user_id']][$row['forum_id']][$flag]); - -/* if (in_array(ACL_YES, $hold_ary[$row['user_id']][$row['forum_id']])) - { - $hold_ary[$row['user_id']][$row['forum_id']][$flag] = ACL_YES; - } -*/ - } - } - } - } - $db->sql_freeresult($result); - } - - return $hold_ary; - } - - /** - * Get raw user based permission settings - */ - public function acl_user_raw_data($user_id = false, $opts = false, $forum_id = false) - { - global $db; - - $sql_user = ($user_id !== false) ? ((!is_array($user_id)) ? 'user_id = ' . (int) $user_id : $db->sql_in_set('user_id', array_map('intval', $user_id))) : ''; - $sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . $db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : ''; - - $sql_opts = ''; - $hold_ary = $sql_ary = array(); - - if ($opts !== false) - { - $this->build_auth_option_statement('ao.auth_option', $opts, $sql_opts); - } - - // Grab user settings - non-role specific... - $sql_ary[] = 'SELECT a.user_id, a.forum_id, a.auth_setting, a.auth_option_id, ao.auth_option - FROM ' . ACL_USERS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . ' ao - WHERE a.auth_role_id = 0 - AND a.auth_option_id = ao.auth_option_id ' . - (($sql_user) ? 'AND a.' . $sql_user : '') . " - $sql_forum - $sql_opts - ORDER BY a.forum_id, ao.auth_option"; - - // Now the role settings - user-specific - $sql_ary[] = 'SELECT a.user_id, a.forum_id, r.auth_option_id, r.auth_setting, r.auth_option_id, ao.auth_option - FROM ' . ACL_USERS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' ao - WHERE a.auth_role_id = r.role_id - AND r.auth_option_id = ao.auth_option_id ' . - (($sql_user) ? 'AND a.' . $sql_user : '') . " - $sql_forum - $sql_opts - ORDER BY a.forum_id, ao.auth_option"; - - foreach ($sql_ary as $sql) - { - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $hold_ary[$row['user_id']][$row['forum_id']][$row['auth_option']] = $row['auth_setting']; - } - $db->sql_freeresult($result); - } - - return $hold_ary; - } - - /** - * Get raw group based permission settings - */ - public function acl_group_raw_data($group_id = false, $opts = false, $forum_id = false) - { - global $db; - - $sql_group = ($group_id !== false) ? ((!is_array($group_id)) ? 'group_id = ' . (int) $group_id : $db->sql_in_set('group_id', array_map('intval', $group_id))) : ''; - $sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . $db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : ''; - - $sql_opts = ''; - $hold_ary = $sql_ary = array(); - - if ($opts !== false) - { - $this->build_auth_option_statement('ao.auth_option', $opts, $sql_opts); - } - - // Grab group settings - non-role specific... - $sql_ary[] = 'SELECT a.group_id, a.forum_id, a.auth_setting, a.auth_option_id, ao.auth_option - FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . ' ao - WHERE a.auth_role_id = 0 - AND a.auth_option_id = ao.auth_option_id ' . - (($sql_group) ? 'AND a.' . $sql_group : '') . " - $sql_forum - $sql_opts - ORDER BY a.forum_id, ao.auth_option"; - - // Now grab group settings - role specific... - $sql_ary[] = 'SELECT a.group_id, a.forum_id, r.auth_setting, r.auth_option_id, ao.auth_option - FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' ao - WHERE a.auth_role_id = r.role_id - AND r.auth_option_id = ao.auth_option_id ' . - (($sql_group) ? 'AND a.' . $sql_group : '') . " - $sql_forum - $sql_opts - ORDER BY a.forum_id, ao.auth_option"; - - foreach ($sql_ary as $sql) - { - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $hold_ary[$row['group_id']][$row['forum_id']][$row['auth_option']] = $row['auth_setting']; - } - $db->sql_freeresult($result); - } - - return $hold_ary; - } - - /** - * Get raw acl data based on user for caching user_permissions - * This function returns the same data as acl_raw_data(), but without the user id as the first key within the array. - */ - public function acl_raw_data_single_user($user_id) - { - global $db, $cache; - - // Check if the role-cache is there - if (($this->role_cache = $cache->get('_role_cache')) === false) - { - $this->role_cache = array(); - - // We pre-fetch roles - $sql = 'SELECT * - FROM ' . ACL_ROLES_DATA_TABLE . ' - ORDER BY role_id ASC'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $this->role_cache[$row['role_id']][$row['auth_option_id']] = (int) $row['auth_setting']; - } - $db->sql_freeresult($result); - - foreach ($this->role_cache as $role_id => $role_options) - { - $this->role_cache[$role_id] = serialize($role_options); - } - - $cache->put('_role_cache', $this->role_cache); - } - - $hold_ary = array(); - - // Grab user-specific permission settings - $sql = 'SELECT forum_id, auth_option_id, auth_role_id, auth_setting - FROM ' . ACL_USERS_TABLE . ' - WHERE user_id = ' . $user_id; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - // If a role is assigned, assign all options included within this role. Else, only set this one option. - if ($row['auth_role_id']) - { - $hold_ary[$row['forum_id']] = (empty($hold_ary[$row['forum_id']])) ? unserialize($this->role_cache[$row['auth_role_id']]) : $hold_ary[$row['forum_id']] + unserialize($this->role_cache[$row['auth_role_id']]); - } - else - { - $hold_ary[$row['forum_id']][$row['auth_option_id']] = $row['auth_setting']; - } - } - $db->sql_freeresult($result); - - // Now grab group-specific permission settings - $sql = 'SELECT a.forum_id, a.auth_option_id, a.auth_role_id, a.auth_setting - FROM ' . ACL_GROUPS_TABLE . ' a, ' . USER_GROUP_TABLE . ' ug - WHERE a.group_id = ug.group_id - AND ug.user_pending = 0 - AND ug.user_id = ' . $user_id; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if (!$row['auth_role_id']) - { - $this->_set_group_hold_ary($hold_ary[$row['forum_id']], $row['auth_option_id'], $row['auth_setting']); - } - else - { - foreach (unserialize($this->role_cache[$row['auth_role_id']]) as $option_id => $setting) - { - $this->_set_group_hold_ary($hold_ary[$row['forum_id']], $option_id, $setting); - } - } - } - $db->sql_freeresult($result); - - return $hold_ary; - } - - /** - * Private function snippet for setting a specific piece of the hold_ary - */ - private function _set_group_hold_ary(&$hold_ary, $option_id, $setting) - { - if (!isset($hold_ary[$option_id]) || (isset($hold_ary[$option_id]) && $hold_ary[$option_id] != ACL_NEVER)) - { - $hold_ary[$option_id] = $setting; - - // If we detect ACL_NEVER, we will unset the flag option (within building the bitstring it is correctly set again) - if ($setting == ACL_NEVER) - { - $flag = substr($this->acl_options['option'][$option_id], 0, strpos($this->acl_options['option'][$option_id], '_') + 1); - $flag = (int) $this->acl_options['id'][$flag]; - - if (isset($hold_ary[$flag]) && $hold_ary[$flag] == ACL_YES) - { - unset($hold_ary[$flag]); - -/* This is uncommented, because i suspect this being slightly wrong due to mixed permission classes being possible - if (in_array(ACL_YES, $hold_ary)) - { - $hold_ary[$flag] = ACL_YES; - }*/ - } - } + $auth_user = $auth_user || $result; } } - - /** - * Authentication plug-ins is largely down to Sergey Kanareykin, our thanks to him. - */ - public function login($username, $password, $autologin = false, $viewonline = 1, $admin = 0) + else { - global $config, $db, $user, $phpbb_root_path, $phpEx; - - $method = trim(basename($config['auth_method'])); - include_once($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx); - - $method = 'login_' . $method; - if (function_exists($method)) - { - $login = $method($username, $password); - - // If the auth module wants us to create an empty profile do so and then treat the status as LOGIN_SUCCESS - if ($login['status'] == LOGIN_SUCCESS_CREATE_PROFILE) - { - // we are going to use the user_add function so include functions_user.php if it wasn't defined yet - if (!function_exists('user_add')) - { - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - } - - user_add($login['user_row'], (isset($login['cp_data'])) ? $login['cp_data'] : false); - - $sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type - FROM ' . USERS_TABLE . " - WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - return array( - 'status' => LOGIN_ERROR_EXTERNAL_AUTH, - 'error_msg' => 'AUTH_NO_PROFILE_CREATED', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - $login = array( - 'status' => LOGIN_SUCCESS, - 'error_msg' => false, - 'user_row' => $row, - ); - } - - // If login succeeded, we will log the user in... else we pass the login array through... - if ($login['status'] == LOGIN_SUCCESS) - { - $old_session_id = $user->session_id; - - if ($admin) - { - global $SID, $_SID; - - $cookie_expire = time() - 31536000; - $user->set_cookie('u', '', $cookie_expire); - $user->set_cookie('sid', '', $cookie_expire); - unset($cookie_expire); - - $SID = '?sid='; - $user->session_id = $_SID = ''; - } - - $result = $user->session_create($login['user_row']['user_id'], $admin, $autologin, $viewonline); - - // Successful session creation - if ($result === true) - { - // If admin re-authentication we remove the old session entry because a new one has been created... - if ($admin) - { - // the login array is used because the user ids do not differ for re-authentication - $sql = 'DELETE FROM ' . SESSIONS_TABLE . " - WHERE session_id = '" . $db->sql_escape($old_session_id) . "' - AND session_user_id = {$login['user_row']['user_id']}"; - $db->sql_query($sql); - } - - return array( - 'status' => LOGIN_SUCCESS, - 'error_msg' => false, - 'user_row' => $login['user_row'], - ); - } - - return array( - 'status' => LOGIN_BREAK, - 'error_msg' => $result, - 'user_row' => $login['user_row'], - ); - } - - return $login; - } - - trigger_error('Authentication method not found', E_USER_ERROR); + $auth_user = $is_admin; } - /** - * Fill auth_option statement for later querying based on the supplied options - */ - private function build_auth_option_statement($key, $auth_options, &$sql_opts) - { - global $db; - - if (!is_array($auth_options)) - { - if (strpos($auth_options, '%') !== false) - { - $sql_opts = "AND $key " . $db->sql_like_expression(str_replace('%', $db->any_char, $auth_options)); - } - else - { - $sql_opts = "AND $key = '" . $db->sql_escape($auth_options) . "'"; - } - } - else - { - $is_like_expression = false; - - foreach ($auth_options as $option) - { - if (strpos($option, '%') !== false) - { - $is_like_expression = true; - } - } - - if (!$is_like_expression) - { - $sql_opts = 'AND ' . $db->sql_in_set($key, $auth_options); - } - else - { - $sql = array(); - - foreach ($auth_options as $option) - { - if (strpos($option, '%') !== false) - { - $sql[] = $key . ' ' . $db->sql_like_expression(str_replace('%', $db->any_char, $option)); - } - else - { - $sql[] = $key . " = '" . $db->sql_escape($option) . "'"; - } - } - - $sql_opts = 'AND (' . implode(' OR ', $sql) . ')'; - } - } - } + return $auth_user; } ?> \ No newline at end of file diff --git a/phpBB/includes/auth/auth_apache.php b/phpBB/includes/auth/auth_apache.php deleted file mode 100644 index 50a49ee21e..0000000000 --- a/phpBB/includes/auth/auth_apache.php +++ /dev/null @@ -1,231 +0,0 @@ -data['username'] !== $_SERVER['PHP_AUTH_USER']) - { - return $user->lang['APACHE_SETUP_BEFORE_USE']; - } - return false; -} - -/** -* Login function -*/ -function login_apache(&$username, &$password) -{ - global $db; - - // do not allow empty password - if (!$password) - { - return array( - 'status' => LOGIN_BREAK, - 'error_msg' => 'NO_PASSWORD_SUPPLIED', - ); - } - - if (!isset($_SERVER['PHP_AUTH_USER'])) - { - return array( - 'status' => LOGIN_ERROR_EXTERNAL_AUTH, - 'error_msg' => 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - $php_auth_user = $_SERVER['PHP_AUTH_USER']; - $php_auth_pw = $_SERVER['PHP_AUTH_PW']; - - if (!empty($php_auth_user) && !empty($php_auth_pw)) - { - if ($php_auth_user !== $username) - { - return array( - 'status' => LOGIN_ERROR_USERNAME, - 'error_msg' => 'LOGIN_ERROR_USERNAME', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - $sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type - FROM ' . USERS_TABLE . " - WHERE username = '" . $db->sql_escape($php_auth_user) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - // User inactive... - if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) - { - return array( - 'status' => LOGIN_ERROR_ACTIVE, - 'error_msg' => 'ACTIVE_ERROR', - 'user_row' => $row, - ); - } - - // Successful login... - return array( - 'status' => LOGIN_SUCCESS, - 'error_msg' => false, - 'user_row' => $row, - ); - } - - // this is the user's first login so create an empty profile - return array( - 'status' => LOGIN_SUCCESS_CREATE_PROFILE, - 'error_msg' => false, - 'user_row' => user_row_apache($php_auth_user, $php_auth_pw), - ); - } - - // Not logged into apache - return array( - 'status' => LOGIN_ERROR_EXTERNAL_AUTH, - 'error_msg' => 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE', - 'user_row' => array('user_id' => ANONYMOUS), - ); -} - -/** -* Autologin function -* -* @return array containing the user row or empty if no auto login should take place -*/ -function autologin_apache() -{ - global $db; - - if (!isset($_SERVER['PHP_AUTH_USER'])) - { - return array(); - } - - $php_auth_user = $_SERVER['PHP_AUTH_USER']; - $php_auth_pw = $_SERVER['PHP_AUTH_PW']; - - if (!empty($php_auth_user) && !empty($php_auth_pw)) - { - set_var($php_auth_user, $php_auth_user, 'string'); - set_var($php_auth_pw, $php_auth_pw, 'string'); - - $sql = 'SELECT * - FROM ' . USERS_TABLE . " - WHERE username = '" . $db->sql_escape($php_auth_user) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - return ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) ? array() : $row; - } - - if (!function_exists('user_add')) - { - global $phpbb_root_path, $phpEx; - - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - } - - // create the user if he does not exist yet - user_add(user_row_apache($php_auth_user, $php_auth_pw)); - - $sql = 'SELECT * - FROM ' . USERS_TABLE . " - WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($php_auth_user)) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - return $row; - } - } - - return array(); -} - -/** -* This function generates an array which can be passed to the user_add function in order to create a user -*/ -function user_row_apache($username, $password) -{ - global $db, $config, $user; - // first retrieve default group id - $sql = 'SELECT group_id - FROM ' . GROUPS_TABLE . " - WHERE group_name_clean = '" . $db->sql_escape('registered') . "' - AND group_type = " . GROUP_SPECIAL; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error('NO_GROUP'); - } - - // generate user account data - return array( - 'username' => $username, - 'user_password' => phpbb_hash($password), - 'user_email' => '', - 'group_id' => (int) $row['group_id'], - 'user_type' => USER_NORMAL, - 'user_ip' => $user->ip, - ); -} - -/** -* The session validation function checks whether the user is still logged in -* -* @return boolean true if the given user is authenticated or false if the session should be closed -*/ -function validate_session_apache(&$user) -{ - if (!isset($_SERVER['PHP_AUTH_USER'])) - { - return false; - } - - $php_auth_user = ''; - set_var($php_auth_user, $_SERVER['PHP_AUTH_USER'], 'string'); - - return ($php_auth_user === $user['username']) ? true : false; -} - -?> \ No newline at end of file diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php deleted file mode 100644 index aa09710730..0000000000 --- a/phpBB/includes/auth/auth_db.php +++ /dev/null @@ -1,226 +0,0 @@ - LOGIN_BREAK, - 'error_msg' => 'NO_PASSWORD_SUPPLIED', - ); - } - - $sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts - FROM ' . USERS_TABLE . " - WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - return array( - 'status' => LOGIN_ERROR_USERNAME, - 'error_msg' => 'LOGIN_ERROR_USERNAME', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - // If there are too much login attempts, we need to check for an confirm image - // Every auth module is able to define what to do by itself... - if ($config['max_login_attempts'] && $row['user_login_attempts'] >= $config['max_login_attempts']) - { - $confirm_id = request_var('confirm_id', ''); - $confirm_code = request_var('confirm_code', ''); - - // Visual Confirmation handling - if (!$confirm_id) - { - return array( - 'status' => LOGIN_ERROR_ATTEMPTS, - 'error_msg' => 'LOGIN_ERROR_ATTEMPTS', - 'user_row' => $row, - ); - } - else - { - global $user; - - $sql = 'SELECT code - FROM ' . CONFIRM_TABLE . " - WHERE confirm_id = '" . $db->sql_escape($confirm_id) . "' - AND session_id = '" . $db->sql_escape($user->session_id) . "' - AND confirm_type = " . CONFIRM_LOGIN; - $result = $db->sql_query($sql); - $confirm_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($confirm_row) - { - if (strcasecmp($confirm_row['code'], $confirm_code) === 0) - { - $sql = 'DELETE FROM ' . CONFIRM_TABLE . " - WHERE confirm_id = '" . $db->sql_escape($confirm_id) . "' - AND session_id = '" . $db->sql_escape($user->session_id) . "' - AND confirm_type = " . CONFIRM_LOGIN; - $db->sql_query($sql); - } - else - { - return array( - 'status' => LOGIN_ERROR_ATTEMPTS, - 'error_msg' => 'CONFIRM_CODE_WRONG', - 'user_row' => $row, - ); - } - } - else - { - return array( - 'status' => LOGIN_ERROR_ATTEMPTS, - 'error_msg' => 'CONFIRM_CODE_WRONG', - 'user_row' => $row, - ); - } - } - } - - // @todo: safe to remove? - // If the password convert flag is set we need to convert it - /*if ($row['user_pass_convert']) - { - // in phpBB2 passwords were used exactly as they were sent, with addslashes applied - $password_old_format = isset($_REQUEST['password']) ? (string) $_REQUEST['password'] : ''; - $password_old_format = (!STRIP) ? addslashes($password_old_format) : $password_old_format; - $password_new_format = ''; - - set_var($password_new_format, stripslashes($password_old_format), 'string'); - - if ($password == $password_new_format) - { - if (!function_exists('utf8_to_cp1252')) - { - global $phpbb_root_path, $phpEx; - include($phpbb_root_path . 'includes/utf/data/recode_basic.' . $phpEx); - } - - // cp1252 is phpBB2's default encoding, characters outside ASCII range might work when converted into that encoding - if (md5($password_old_format) == $row['user_password'] || md5(utf8_to_cp1252($password_old_format)) == $row['user_password']) - { - $hash = phpbb_hash($password_new_format); - - // Update the password in the users table to the new format and remove user_pass_convert flag - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_password = \'' . $db->sql_escape($hash) . '\', - user_pass_convert = 0 - WHERE user_id = ' . $row['user_id']; - $db->sql_query($sql); - - $row['user_pass_convert'] = 0; - $row['user_password'] = $hash; - } - else - { - // Although we weren't able to convert this password we have to - // increase login attempt count to make sure this cannot be exploited - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_login_attempts = user_login_attempts + 1 - WHERE user_id = ' . $row['user_id']; - $db->sql_query($sql); - - return array( - 'status' => LOGIN_ERROR_PASSWORD_CONVERT, - 'error_msg' => 'LOGIN_ERROR_PASSWORD_CONVERT', - 'user_row' => $row, - ); - } - } - }*/ - - // Check password ... - if (!$row['user_pass_convert'] && phpbb_check_hash($password, $row['user_password'])) - { - // Check for old password hash... - if (strlen($row['user_password']) == 32) - { - $hash = phpbb_hash($password); - - // Update the password in the users table to the new format - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_password = '" . $db->sql_escape($hash) . "', - user_pass_convert = 0 - WHERE user_id = {$row['user_id']}"; - $db->sql_query($sql); - - $row['user_password'] = $hash; - } - - if ($row['user_login_attempts'] != 0) - { - // Successful, reset login attempts (the user passed all stages) - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_login_attempts = 0 - WHERE user_id = ' . $row['user_id']; - $db->sql_query($sql); - } - - // User inactive... - if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) - { - return array( - 'status' => LOGIN_ERROR_ACTIVE, - 'error_msg' => 'ACTIVE_ERROR', - 'user_row' => $row, - ); - } - - // Successful login... set user_login_attempts to zero... - return array( - 'status' => LOGIN_SUCCESS, - 'error_msg' => false, - 'user_row' => $row, - ); - } - - // Password incorrect - increase login attempts - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_login_attempts = user_login_attempts + 1 - WHERE user_id = ' . $row['user_id']; - $db->sql_query($sql); - - // Give status about wrong password... - return array( - 'status' => LOGIN_ERROR_PASSWORD, - 'error_msg' => 'LOGIN_ERROR_PASSWORD', - 'user_row' => $row, - ); -} - -?> \ No newline at end of file diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php deleted file mode 100644 index 9507dc645a..0000000000 --- a/phpBB/includes/auth/auth_ldap.php +++ /dev/null @@ -1,333 +0,0 @@ -lang['LDAP_NO_LDAP_EXTENSION']; - } - - $config['ldap_port'] = (int) $config['ldap_port']; - if ($config['ldap_port']) - { - $ldap = @ldap_connect($config['ldap_server'], $config['ldap_port']); - } - else - { - $ldap = @ldap_connect($config['ldap_server']); - } - - if (!$ldap) - { - return $user->lang['LDAP_NO_SERVER_CONNECTION']; - } - - @ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3); - @ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0); - - if ($config['ldap_user'] || $config['ldap_password']) - { - if (!@ldap_bind($ldap, htmlspecialchars_decode($config['ldap_user']), htmlspecialchars_decode($config['ldap_password']))) - { - return $user->lang['LDAP_INCORRECT_USER_PASSWORD']; - } - } - - // ldap_connect only checks whether the specified server is valid, so the connection might still fail - $search = @ldap_search( - $ldap, - $config['ldap_base_dn'], - ldap_user_filter($user->data['username']), - (empty($config['ldap_email'])) ? array($config['ldap_uid']) : array($config['ldap_uid'], $config['ldap_email']), - 0, - 1 - ); - - if ($search === false) - { - return $user->lang['LDAP_NO_SERVER_CONNECTION']; - } - - $result = @ldap_get_entries($ldap, $search); - - @ldap_close($ldap); - - - if (!is_array($result) || sizeof($result) < 2) - { - return sprintf($user->lang['LDAP_NO_IDENTITY'], $user->data['username']); - } - - if (!empty($config['ldap_email']) && !isset($result[0][$config['ldap_email']])) - { - return $user->lang['LDAP_NO_EMAIL']; - } - - return false; -} - -/** -* Login function -*/ -function login_ldap(&$username, &$password) -{ - global $db, $config, $user; - - // do not allow empty password - if (!$password) - { - return array( - 'status' => LOGIN_BREAK, - 'error_msg' => 'NO_PASSWORD_SUPPLIED', - ); - } - - if (!@extension_loaded('ldap')) - { - return array( - 'status' => LOGIN_ERROR_EXTERNAL_AUTH, - 'error_msg' => 'LDAP_NO_LDAP_EXTENSION', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - $config['ldap_port'] = (int) $config['ldap_port']; - if ($config['ldap_port']) - { - $ldap = @ldap_connect($config['ldap_server'], $config['ldap_port']); - } - else - { - $ldap = @ldap_connect($config['ldap_server']); - } - - if (!$ldap) - { - return array( - 'status' => LOGIN_ERROR_EXTERNAL_AUTH, - 'error_msg' => 'LDAP_NO_SERVER_CONNECTION', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - - @ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3); - @ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0); - - if ($config['ldap_user'] || $config['ldap_password']) - { - if (!@ldap_bind($ldap, $config['ldap_user'], htmlspecialchars_decode($config['ldap_password']))) - { - return $user->lang['LDAP_NO_SERVER_CONNECTION']; - } - } - - $search = @ldap_search( - $ldap, - $config['ldap_base_dn'], - ldap_user_filter($username), - (empty($config['ldap_email'])) ? array($config['ldap_uid']) : array($config['ldap_uid'], $config['ldap_email']), - 0, - 1 - ); - - $ldap_result = @ldap_get_entries($ldap, $search); - - if (is_array($ldap_result) && sizeof($ldap_result) > 1) - { - if (@ldap_bind($ldap, $ldap_result[0]['dn'], htmlspecialchars_decode($password))) - { - @ldap_close($ldap); - - $sql ='SELECT user_id, username, user_password, user_passchg, user_email, user_type - FROM ' . USERS_TABLE . " - WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - unset($ldap_result); - - // User inactive... - if ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) - { - return array( - 'status' => LOGIN_ERROR_ACTIVE, - 'error_msg' => 'ACTIVE_ERROR', - 'user_row' => $row, - ); - } - - // Successful login... set user_login_attempts to zero... - return array( - 'status' => LOGIN_SUCCESS, - 'error_msg' => false, - 'user_row' => $row, - ); - } - else - { - // retrieve default group id - $sql = 'SELECT group_id - FROM ' . GROUPS_TABLE . " - WHERE group_name_clean = '" . $db->sql_escape('registered') . "' - AND group_type = " . GROUP_SPECIAL; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error('NO_GROUP'); - } - - // generate user account data - $ldap_user_row = array( - 'username' => $username, - 'user_password' => phpbb_hash($password), - 'user_email' => (!empty($config['ldap_email'])) ? $ldap_result[0][$config['ldap_email']][0] : '', - 'group_id' => (int) $row['group_id'], - 'user_type' => USER_NORMAL, - 'user_ip' => $user->ip, - ); - - unset($ldap_result); - - // this is the user's first login so create an empty profile - return array( - 'status' => LOGIN_SUCCESS_CREATE_PROFILE, - 'error_msg' => false, - 'user_row' => $ldap_user_row, - ); - } - } - else - { - unset($ldap_result); - @ldap_close($ldap); - - // Give status about wrong password... - return array( - 'status' => LOGIN_ERROR_PASSWORD, - 'error_msg' => 'LOGIN_ERROR_PASSWORD', - 'user_row' => array('user_id' => ANONYMOUS), - ); - } - } - - @ldap_close($ldap); - - return array( - 'status' => LOGIN_ERROR_USERNAME, - 'error_msg' => 'LOGIN_ERROR_USERNAME', - 'user_row' => array('user_id' => ANONYMOUS), - ); -} - -/** -* Generates a filter string for ldap_search to find a user -* -* @param $username string Username identifying the searched user -* -* @return string A filter string for ldap_search -*/ -function ldap_user_filter($username) -{ - global $config; - - $filter = '(' . $config['ldap_uid'] . '=' . ldap_escape(htmlspecialchars_decode($username)) . ')'; - if ($config['ldap_user_filter']) - { - $filter = "(&$filter({$config['ldap_user_filter']}))"; - } - return $filter; -} - -/** -* Escapes an LDAP AttributeValue -*/ -function ldap_escape($string) -{ - return str_replace(array('*', '\\', '(', ')'), array('\\*', '\\\\', '\\(', '\\)'), $string); -} - -/** -* This function is used to output any required fields in the authentication -* admin panel. It also defines any required configuration table fields. -*/ -function acp_ldap(&$new) -{ - global $user; - - $tpl = ' - -
    -

    ' . $user->lang['LDAP_SERVER_EXPLAIN'] . '
    -
    -
    -
    -

    ' . $user->lang['LDAP_PORT_EXPLAIN'] . '
    -
    -
    -
    -

    ' . $user->lang['LDAP_DN_EXPLAIN'] . '
    -
    -
    -
    -

    ' . $user->lang['LDAP_UID_EXPLAIN'] . '
    -
    -
    -
    -

    ' . $user->lang['LDAP_USER_FILTER_EXPLAIN'] . '
    -
    -
    -
    -

    ' . $user->lang['LDAP_EMAIL_EXPLAIN'] . '
    -
    -
    -
    -

    ' . $user->lang['LDAP_USER_EXPLAIN'] . '
    -
    -
    -
    -

    ' . $user->lang['LDAP_PASSWORD_EXPLAIN'] . '
    -
    -
    - '; - - // These are fields required in the config table - return array( - 'tpl' => $tpl, - 'config' => array('ldap_server', 'ldap_port', 'ldap_base_dn', 'ldap_uid', 'ldap_user_filter', 'ldap_email', 'ldap_user', 'ldap_password') - ); -} - -?> \ No newline at end of file diff --git a/phpBB/includes/auth/index.htm b/phpBB/includes/auth/index.htm deleted file mode 100644 index ee1f723a7d..0000000000 --- a/phpBB/includes/auth/index.htm +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 354885143c..6971cd5af3 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -1,591 +1,790 @@ make_filename('bbcode.tpl'); + $tpl = fread(fopen($tpl_filename, 'r'), filesize($tpl_filename)); - var $bbcodes = array(); + // replace \ with \\ and then ' with \'. + $tpl = str_replace('\\', '\\\\', $tpl); + $tpl = str_replace('\'', '\\\'', $tpl); - var $template_bitfield; - var $template_filename = ''; + // strip newlines. + $tpl = str_replace("\n", '', $tpl); - /** - * Constructor - * Init bbcode cache entries if bitfield is specified - */ - function __construct($bitfield = '') + // Turn template blocks into PHP assignment statements for the values of $bbcode_tpls.. + $tpl = preg_replace('#(.*?)#', "\n" . '$bbcode_tpls[\'\\1\'] = \'\\2\';', $tpl); + + $bbcode_tpls = array(); + + eval($tpl); + + return $bbcode_tpls; +} + + +/** + * Prepares the loaded bbcode templates for insertion into preg_replace() + * or str_replace() calls in the bbencode_second_pass functions. This + * means replacing template placeholders with the appropriate preg backrefs + * or with language vars. NOTE: If you change how the regexps work in + * bbencode_second_pass(), you MUST change this function. + * + * Nathan Codding, Sept 26 2001 + * + */ +function prepare_bbcode_template($bbcode_tpl) +{ + global $lang; + + $bbcode_tpl['olist_open'] = str_replace('{LIST_TYPE}', '\\1', $bbcode_tpl['olist_open']); + + $bbcode_tpl['color_open'] = str_replace('{COLOR}', '\\1', $bbcode_tpl['color_open']); + + $bbcode_tpl['size_open'] = str_replace('{SIZE}', '\\1', $bbcode_tpl['size_open']); + + $bbcode_tpl['quote_open'] = str_replace('{L_QUOTE}', $lang['Quote'], $bbcode_tpl['quote_open']); + + $bbcode_tpl['quote_username_open'] = str_replace('{L_QUOTE}', $lang['Quote'], $bbcode_tpl['quote_username_open']); + $bbcode_tpl['quote_username_open'] = str_replace('{L_WROTE}', $lang['wrote'], $bbcode_tpl['quote_username_open']); + $bbcode_tpl['quote_username_open'] = str_replace('{USERNAME}', '\\1', $bbcode_tpl['quote_username_open']); + + $bbcode_tpl['code_open'] = str_replace('{L_CODE}', $lang['Code'], $bbcode_tpl['code_open']); + + $bbcode_tpl['img'] = str_replace('{URL}', '\\1', $bbcode_tpl['img']); + + // We do URLs in several different ways.. + $bbcode_tpl['url1'] = str_replace('{URL}', '\\1', $bbcode_tpl['url']); + $bbcode_tpl['url1'] = str_replace('{DESCRIPTION}', '\\1', $bbcode_tpl['url1']); + + $bbcode_tpl['url2'] = str_replace('{URL}', 'http://\\1', $bbcode_tpl['url']); + $bbcode_tpl['url2'] = str_replace('{DESCRIPTION}', '\\1', $bbcode_tpl['url2']); + + $bbcode_tpl['url3'] = str_replace('{URL}', '\\1', $bbcode_tpl['url']); + $bbcode_tpl['url3'] = str_replace('{DESCRIPTION}', '\\2', $bbcode_tpl['url3']); + + $bbcode_tpl['url4'] = str_replace('{URL}', 'http://\\1', $bbcode_tpl['url']); + $bbcode_tpl['url4'] = str_replace('{DESCRIPTION}', '\\3', $bbcode_tpl['url4']); + + $bbcode_tpl['email'] = str_replace('{EMAIL}', '\\1', $bbcode_tpl['email']); + + define("BBCODE_TPL_READY", true); + + return $bbcode_tpl; +} + + +/** + * Does second-pass bbencoding. This should be used before displaying the message in + * a thread. Assumes the message is already first-pass encoded, and we are given the + * correct UID as used in first-pass encoding. + */ +function bbencode_second_pass($text, $uid) +{ + global $lang, $bbcode_tpl; + + $text = preg_replace('#(script|about|applet|activex|chrome):#is', "\\1:", $text); + + // pad it with a space so we can distinguish between FALSE and matching the 1st char (index 0). + // This is important; bbencode_quote(), bbencode_list(), and bbencode_code() all depend on it. + $text = " " . $text; + + // First: If there isn't a "[" and a "]" in the message, don't bother. + if (! (strpos($text, "[") && strpos($text, "]")) ) { - if ($bitfield) + // Remove padding, return. + $text = substr($text, 1); + return $text; + } + + // Only load the templates ONCE.. + if (!defined("BBCODE_TPL_READY")) + { + // load templates from file into array. + $bbcode_tpl = load_bbcode_template(); + + // prepare array for use in regexps. + $bbcode_tpl = prepare_bbcode_template($bbcode_tpl); + } + + // [CODE] and [/CODE] for posting code (HTML, PHP, C etc etc) in your posts. + $text = bbencode_second_pass_code($text, $uid, $bbcode_tpl); + + // [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff. + $text = str_replace("[quote:$uid]", $bbcode_tpl['quote_open'], $text); + $text = str_replace("[/quote:$uid]", $bbcode_tpl['quote_close'], $text); + + // New one liner to deal with opening quotes with usernames... + // replaces the two line version that I had here before.. + $text = preg_replace("/\[quote:$uid=\"(.*?)\"\]/si", $bbcode_tpl['quote_username_open'], $text); + + // [list] and [list=x] for (un)ordered lists. + // unordered lists + $text = str_replace("[list:$uid]", $bbcode_tpl['ulist_open'], $text); + // li tags + $text = str_replace("[*:$uid]", $bbcode_tpl['listitem'], $text); + // ending tags + $text = str_replace("[/list:u:$uid]", $bbcode_tpl['ulist_close'], $text); + $text = str_replace("[/list:o:$uid]", $bbcode_tpl['olist_close'], $text); + // Ordered lists + $text = preg_replace("/\[list=([a1]):$uid\]/si", $bbcode_tpl['olist_open'], $text); + + // colours + $text = preg_replace("/\[color=(\#[0-9A-F]{6}|[a-z]+):$uid\]/si", $bbcode_tpl['color_open'], $text); + $text = str_replace("[/color:$uid]", $bbcode_tpl['color_close'], $text); + + // size + $text = preg_replace("/\[size=([1-2]?[0-9]):$uid\]/si", $bbcode_tpl['size_open'], $text); + $text = str_replace("[/size:$uid]", $bbcode_tpl['size_close'], $text); + + // [b] and [/b] for bolding text. + $text = str_replace("[b:$uid]", $bbcode_tpl['b_open'], $text); + $text = str_replace("[/b:$uid]", $bbcode_tpl['b_close'], $text); + + // [u] and [/u] for underlining text. + $text = str_replace("[u:$uid]", $bbcode_tpl['u_open'], $text); + $text = str_replace("[/u:$uid]", $bbcode_tpl['u_close'], $text); + + // [i] and [/i] for italicizing text. + $text = str_replace("[i:$uid]", $bbcode_tpl['i_open'], $text); + $text = str_replace("[/i:$uid]", $bbcode_tpl['i_close'], $text); + + // Patterns and replacements for URL and email tags.. + $patterns = array(); + $replacements = array(); + + // [img]image_url_here[/img] code.. + // This one gets first-passed.. + $patterns[] = "#\[img:$uid\]([^?](?:[^\[]+|\[(?!url))*?)\[/img:$uid\]#i"; + $replacements[] = $bbcode_tpl['img']; + + // matches a [url]xxxx://www.phpbb.com[/url] code.. + $patterns[] = "#\[url\]([\w]+?://([\w\#$%&~/.\-;:=,?@\]+]+|\[(?!url=))*?)\[/url\]#is"; + $replacements[] = $bbcode_tpl['url1']; + + // [url]www.phpbb.com[/url] code.. (no xxxx:// prefix). + $patterns[] = "#\[url\]((www|ftp)\.([\w\#$%&~/.\-;:=,?@\]+]+|\[(?!url=))*?)\[/url\]#is"; + $replacements[] = $bbcode_tpl['url2']; + + // [url=xxxx://www.phpbb.com]phpBB[/url] code.. + $patterns[] = "#\[url=([\w]+?://[\w\#$%&~/.\-;:=,?@\[\]+]*?)\]([^?\n\r\t].*?)\[/url\]#is"; + $replacements[] = $bbcode_tpl['url3']; + + // [url=www.phpbb.com]phpBB[/url] code.. (no xxxx:// prefix). + $patterns[] = "#\[url=((www|ftp)\.[\w\#$%&~/.\-;:=,?@\[\]+]*?)\]([^?\n\r\t].*?)\[/url\]#is"; + $replacements[] = $bbcode_tpl['url4']; + + // [email]user@domain.tld[/email] code.. + $patterns[] = "#\[email\]([a-z0-9&\-_.]+?@[\w\-]+\.([\w\-\.]+\.)?[\w]+)\[/email\]#si"; + $replacements[] = $bbcode_tpl['email']; + + $text = preg_replace($patterns, $replacements, $text); + + // Remove our padding from the string.. + $text = substr($text, 1); + + return $text; + +} // bbencode_second_pass() + +// Need to initialize the random numbers only ONCE +mt_srand( (double) microtime() * 1000000); + +function make_bbcode_uid() +{ + // Unique ID for this message.. + + $uid = dss_rand(); + $uid = substr($uid, 0, BBCODE_UID_LEN); + + return $uid; +} + +function bbencode_first_pass($text, $uid) +{ + // pad it with a space so we can distinguish between FALSE and matching the 1st char (index 0). + // This is important; bbencode_quote(), bbencode_list(), and bbencode_code() all depend on it. + $text = " " . $text; + + // [CODE] and [/CODE] for posting code (HTML, PHP, C etc etc) in your posts. + $text = bbencode_first_pass_pda($text, $uid, '[code]', '[/code]', '', true, ''); + + // [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff. + $text = bbencode_first_pass_pda($text, $uid, '[quote]', '[/quote]', '', false, ''); + $text = bbencode_first_pass_pda($text, $uid, '/\[quote=\\\\"(.*?)\\\\"\]/is', '[/quote]', '', false, '', "[quote:$uid=\\\"\\1\\\"]"); + + // [list] and [list=x] for (un)ordered lists. + $open_tag = array(); + $open_tag[0] = "[list]"; + + // unordered.. + $text = bbencode_first_pass_pda($text, $uid, $open_tag, "[/list]", "[/list:u]", false, 'replace_listitems'); + + $open_tag[0] = "[list=1]"; + $open_tag[1] = "[list=a]"; + + // ordered. + $text = bbencode_first_pass_pda($text, $uid, $open_tag, "[/list]", "[/list:o]", false, 'replace_listitems'); + + // [color] and [/color] for setting text color + $text = preg_replace("#\[color=(\#[0-9A-F]{6}|[a-z\-]+)\](.*?)\[/color\]#si", "[color=\\1:$uid]\\2[/color:$uid]", $text); + + // [size] and [/size] for setting text size + $text = preg_replace("#\[size=([1-2]?[0-9])\](.*?)\[/size\]#si", "[size=\\1:$uid]\\2[/size:$uid]", $text); + + // [b] and [/b] for bolding text. + $text = preg_replace("#\[b\](.*?)\[/b\]#si", "[b:$uid]\\1[/b:$uid]", $text); + + // [u] and [/u] for underlining text. + $text = preg_replace("#\[u\](.*?)\[/u\]#si", "[u:$uid]\\1[/u:$uid]", $text); + + // [i] and [/i] for italicizing text. + $text = preg_replace("#\[i\](.*?)\[/i\]#si", "[i:$uid]\\1[/i:$uid]", $text); + + // [img]image_url_here[/img] code.. + $text = preg_replace("#\[img\]((http|ftp|https|ftps)://)([^ \?&=\#\"\n\r\t<]*?(\.(jpg|jpeg|gif|png)))\[/img\]#sie", "'[img:$uid]\\1' . str_replace(' ', '%20', '\\3') . '[/img:$uid]'", $text); + + // Remove our padding from the string.. + return substr($text, 1);; + +} // bbencode_first_pass() + +/** + * $text - The text to operate on. + * $uid - The UID to add to matching tags. + * $open_tag - The opening tag to match. Can be an array of opening tags. + * $close_tag - The closing tag to match. + * $close_tag_new - The closing tag to replace with. + * $mark_lowest_level - boolean - should we specially mark the tags that occur + * at the lowest level of nesting? (useful for [code], because + * we need to match these tags first and transform HTML tags + * in their contents.. + * $func - This variable should contain a string that is the name of a function. + * That function will be called when a match is found, and passed 2 + * parameters: ($text, $uid). The function should return a string. + * This is used when some transformation needs to be applied to the + * text INSIDE a pair of matching tags. If this variable is FALSE or the + * empty string, it will not be executed. + * If open_tag is an array, then the pda will try to match pairs consisting of + * any element of open_tag followed by close_tag. This allows us to match things + * like [list=A]...[/list] and [list=1]...[/list] in one pass of the PDA. + * + * NOTES: - this function assumes the first character of $text is a space. + * - every opening tag and closing tag must be of the [...] format. + */ +function bbencode_first_pass_pda($text, $uid, $open_tag, $close_tag, $close_tag_new, $mark_lowest_level, $func, $open_regexp_replace = false) +{ + $open_tag_count = 0; + + if (!$close_tag_new || ($close_tag_new == '')) + { + $close_tag_new = $close_tag; + } + + $close_tag_length = strlen($close_tag); + $close_tag_new_length = strlen($close_tag_new); + $uid_length = strlen($uid); + + $use_function_pointer = ($func && ($func != '')); + + $stack = array(); + + if (is_array($open_tag)) + { + if (0 == count($open_tag)) { - $this->bbcode_bitfield = $bitfield; - $this->bbcode_cache_init(); + // No opening tags to match, so return. + return $text; + } + $open_tag_count = count($open_tag); + } + else + { + // only one opening tag. make it into a 1-element array. + $open_tag_temp = $open_tag; + $open_tag = array(); + $open_tag[0] = $open_tag_temp; + $open_tag_count = 1; + } + + $open_is_regexp = false; + + if ($open_regexp_replace) + { + $open_is_regexp = true; + if (!is_array($open_regexp_replace)) + { + $open_regexp_temp = $open_regexp_replace; + $open_regexp_replace = array(); + $open_regexp_replace[0] = $open_regexp_temp; } } - /** - * Second pass bbcodes - */ - function bbcode_second_pass(&$message, $bbcode_uid = '', $bbcode_bitfield = false) + if ($mark_lowest_level && $open_is_regexp) { - if ($bbcode_uid) - { - $this->bbcode_uid = $bbcode_uid; - } + message_die(GENERAL_ERROR, "Unsupported operation for bbcode_first_pass_pda()."); + } - if ($bbcode_bitfield !== false) - { - $this->bbcode_bitfield = $bbcode_bitfield; + // Start at the 2nd char of the string, looking for opening tags. + $curr_pos = 1; + while ($curr_pos && ($curr_pos < strlen($text))) + { + $curr_pos = strpos($text, "[", $curr_pos); - // Init those added with a new bbcode_bitfield (already stored codes will not get parsed again) - $this->bbcode_cache_init(); - } - - if (!$this->bbcode_bitfield) + // If not found, $curr_pos will be 0, and the loop will end. + if ($curr_pos) { - // Remove the uid from tags that have not been transformed into HTML - if ($this->bbcode_uid) + // We found a [. It starts at $curr_pos. + // check if it's a starting or ending tag. + $found_start = false; + $which_start_tag = ""; + $start_tag_index = -1; + + for ($i = 0; $i < $open_tag_count; $i++) { - $message = str_replace(':' . $this->bbcode_uid, '', $message); - } + // Grab everything until the first "]"... + $possible_start = substr($text, $curr_pos, strpos($text, ']', $curr_pos + 1) - $curr_pos + 1); - return; - } - - $str = array('search' => array(), 'replace' => array()); - $preg = array('search' => array(), 'replace' => array()); - - $bitfield = new bitfield($this->bbcode_bitfield); - $bbcodes_set = $bitfield->get_all_set(); - - $undid_bbcode_specialchars = false; - foreach ($bbcodes_set as $bbcode_id) - { - if (!empty($this->bbcode_cache[$bbcode_id])) - { - foreach ($this->bbcode_cache[$bbcode_id] as $type => $array) + // + // We're going to try and catch usernames with "[' characters. + // + if( preg_match('#\[quote=\\\"#si', $possible_start, $match) && !preg_match('#\[quote=\\\"(.*?)\\\"\]#si', $possible_start) ) { - foreach ($array as $search => $replace) + // OK we are in a quote tag that probably contains a ] bracket. + // Grab a bit more of the string to hopefully get all of it.. + if ($close_pos = strpos($text, '"]', $curr_pos + 14)) { - ${$type}['search'][] = str_replace('$uid', $this->bbcode_uid, $search); - ${$type}['replace'][] = $replace; - } - - if (sizeof($str['search'])) - { - $message = str_replace($str['search'], $str['replace'], $message); - $str = array('search' => array(), 'replace' => array()); - } - - if (sizeof($preg['search'])) - { - // we need to turn the entities back into their original form to allow the - // search patterns to work properly - if (!$undid_bbcode_specialchars) + if (strpos(substr($text, $curr_pos + 14, $close_pos - ($curr_pos + 14)), '[quote') === false) { - $message = str_replace(array(':', '.'), array(':', '.'), $message); - $undid_bbcode_specialchars = true; + $possible_start = substr($text, $curr_pos, $close_pos - $curr_pos + 7); } + } + } - $message = preg_replace($preg['search'], $preg['replace'], $message); - $preg = array('search' => array(), 'replace' => array()); + // Now compare, either using regexp or not. + if ($open_is_regexp) + { + $match_result = array(); + if (preg_match($open_tag[$i], $possible_start, $match_result)) + { + $found_start = true; + $which_start_tag = $match_result[0]; + $start_tag_index = $i; + break; + } + } + else + { + // straightforward string comparison. + if (0 == strcasecmp($open_tag[$i], $possible_start)) + { + $found_start = true; + $which_start_tag = $open_tag[$i]; + $start_tag_index = $i; + break; } } } - } - // Remove the uid from tags that have not been transformed into HTML - $message = str_replace(':' . $this->bbcode_uid, '', $message); - } - - /** - * Init bbcode cache - * - * requires: $this->bbcode_bitfield - * sets: $this->bbcode_cache with bbcode templates needed for bbcode_bitfield - */ - function bbcode_cache_init() - { - global $user, $phpbb_root_path; - - if (empty($this->template_filename)) - { - $this->template_bitfield = new bitfield($user->theme['bbcode_bitfield']); - $this->template_filename = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template/bbcode.html'; - - if (!@file_exists($this->template_filename)) + if ($found_start) { - trigger_error('The file ' . $this->template_filename . ' is missing.', E_USER_ERROR); + // We have an opening tag. + // Push its position, the text we matched, and its index in the open_tag array on to the stack, and then keep going to the right. + $match = array("pos" => $curr_pos, "tag" => $which_start_tag, "index" => $start_tag_index); + array_push($stack, $match); + // + // Rather than just increment $curr_pos + // Set it to the ending of the tag we just found + // Keeps error in nested tag from breaking out + // of table structure.. + // + $curr_pos += strlen($possible_start); } - } - - $bbcode_ids = $rowset = $sql = array(); - - $bitfield = new bitfield($this->bbcode_bitfield); - $bbcodes_set = $bitfield->get_all_set(); - - foreach ($bbcodes_set as $bbcode_id) - { - if (isset($this->bbcode_cache[$bbcode_id])) + else { - // do not try to re-cache it if it's already in - continue; - } - $bbcode_ids[] = $bbcode_id; - - if ($bbcode_id > NUM_CORE_BBCODES) - { - $sql[] = $bbcode_id; - } - } - - if (sizeof($sql)) - { - global $db; - - $sql = 'SELECT * - FROM ' . BBCODES_TABLE . ' - WHERE ' . $db->sql_in_set('bbcode_id', $sql); - $result = $db->sql_query($sql, 3600); - - while ($row = $db->sql_fetchrow($result)) - { - // To circumvent replacing newlines with
    for the generated html, - // we use carriage returns here. They are later changed back to newlines - $row['bbcode_tpl'] = str_replace("\n", "\r", $row['bbcode_tpl']); - $row['second_pass_replace'] = str_replace("\n", "\r", $row['second_pass_replace']); - - $rowset[$row['bbcode_id']] = $row; - } - $db->sql_freeresult($result); - } - - foreach ($bbcode_ids as $bbcode_id) - { - switch ($bbcode_id) - { - case 0: - $this->bbcode_cache[$bbcode_id] = array( - 'str' => array( - '[/quote:$uid]' => $this->bbcode_tpl('quote_close', $bbcode_id) - ), - 'preg' => array( - '#\[quote(?:="(.*?)")?:$uid\]((?!\[quote(?:=".*?")?:$uid\]).)?#ise' => "\$this->bbcode_second_pass_quote('\$1', '\$2')" - ) - ); - break; - - case 1: - $this->bbcode_cache[$bbcode_id] = array( - 'str' => array( - '[b:$uid]' => $this->bbcode_tpl('b_open', $bbcode_id), - '[/b:$uid]' => $this->bbcode_tpl('b_close', $bbcode_id), - ) - ); - break; - - case 2: - $this->bbcode_cache[$bbcode_id] = array( - 'str' => array( - '[i:$uid]' => $this->bbcode_tpl('i_open', $bbcode_id), - '[/i:$uid]' => $this->bbcode_tpl('i_close', $bbcode_id), - ) - ); - break; - - case 3: - $this->bbcode_cache[$bbcode_id] = array( - 'preg' => array( - '#\[url:$uid\]((.*?))\[/url:$uid\]#s' => $this->bbcode_tpl('url', $bbcode_id), - '#\[url=([^\[]+?):$uid\](.*?)\[/url:$uid\]#s' => $this->bbcode_tpl('url', $bbcode_id), - ) - ); - break; - - case 4: - if ($user->optionget('viewimg')) + // check for a closing tag.. + $possible_end = substr($text, $curr_pos, $close_tag_length); + if (0 == strcasecmp($close_tag, $possible_end)) + { + // We have an ending tag. + // Check if we've already found a matching starting tag. + if (sizeof($stack) > 0) { - $this->bbcode_cache[$bbcode_id] = array( - 'preg' => array( - '#\[img:$uid\](.*?)\[/img:$uid\]#s' => $this->bbcode_tpl('img', $bbcode_id), - ) - ); - } - else - { - $this->bbcode_cache[$bbcode_id] = array( - 'preg' => array( - '#\[img:$uid\](.*?)\[/img:$uid\]#s' => str_replace('$2', '[ img ]', $this->bbcode_tpl('url', $bbcode_id, true)), - ) - ); - } - break; + // There exists a starting tag. + $curr_nesting_depth = sizeof($stack); + // We need to do 2 replacements now. + $match = array_pop($stack); + $start_index = $match['pos']; + $start_tag = $match['tag']; + $start_length = strlen($start_tag); + $start_tag_index = $match['index']; - case 5: - $this->bbcode_cache[$bbcode_id] = array( - 'preg' => array( - '#\[size=([\-\+]?\d+):$uid\](.*?)\[/size:$uid\]#s' => $this->bbcode_tpl('size', $bbcode_id), - ) - ); - break; - - case 6: - $this->bbcode_cache[$bbcode_id] = array( - 'preg' => array( - '!\[color=(#[0-9a-f]{6}|[a-z\-]+):$uid\](.*?)\[/color:$uid\]!is' => $this->bbcode_tpl('color', $bbcode_id), - ) - ); - break; - - case 7: - $this->bbcode_cache[$bbcode_id] = array( - 'str' => array( - '[u:$uid]' => $this->bbcode_tpl('u_open', $bbcode_id), - '[/u:$uid]' => $this->bbcode_tpl('u_close', $bbcode_id), - ) - ); - break; - - case 8: - $this->bbcode_cache[$bbcode_id] = array( - 'preg' => array( - '#\[code(?:=([a-z]+))?:$uid\](.*?)\[/code:$uid\]#ise' => "\$this->bbcode_second_pass_code('\$1', '\$2')", - ) - ); - break; - - case 9: - $this->bbcode_cache[$bbcode_id] = array( - 'preg' => array( - '#(\[\/?(list|\*):[mou]?:?$uid\])[\n]{1}#' => "\$1", - '#(\[list=([^\[]+):$uid\])[\n]{1}#' => "\$1", - '#\[list=([^\[]+):$uid\]#e' => "\$this->bbcode_list('\$1')", - ), - 'str' => array( - '[list:$uid]' => $this->bbcode_tpl('ulist_open_default', $bbcode_id), - '[/list:u:$uid]' => $this->bbcode_tpl('ulist_close', $bbcode_id), - '[/list:o:$uid]' => $this->bbcode_tpl('olist_close', $bbcode_id), - '[*:$uid]' => $this->bbcode_tpl('listitem', $bbcode_id), - '[/*:$uid]' => $this->bbcode_tpl('listitem_close', $bbcode_id), - '[/*:m:$uid]' => $this->bbcode_tpl('listitem_close', $bbcode_id) - ), - ); - break; - - case 10: - $this->bbcode_cache[$bbcode_id] = array( - 'preg' => array( - '#\[email:$uid\]((.*?))\[/email:$uid\]#is' => $this->bbcode_tpl('email', $bbcode_id), - '#\[email=([^\[]+):$uid\](.*?)\[/email:$uid\]#is' => $this->bbcode_tpl('email', $bbcode_id) - ) - ); - break; - - case 11: - if ($user->optionget('viewflash')) - { - $this->bbcode_cache[$bbcode_id] = array( - 'preg' => array( - '#\[flash=([0-9]+),([0-9]+):$uid\](.*?)\[/flash:$uid\]#' => $this->bbcode_tpl('flash', $bbcode_id), - ) - ); - } - else - { - $this->bbcode_cache[$bbcode_id] = array( - 'preg' => array( - '#\[flash=([0-9]+),([0-9]+):$uid\](.*?)\[/flash:$uid\]#' => str_replace('$1', '$3', str_replace('$2', '[ flash ]', $this->bbcode_tpl('url', $bbcode_id, true))) - ) - ); - } - break; - - case 12: - $this->bbcode_cache[$bbcode_id] = array( - 'str' => array( - '[/attachment:$uid]' => $this->bbcode_tpl('inline_attachment_close', $bbcode_id) - ), - 'preg' => array( - '#\[attachment=([0-9]+):$uid\]#' => $this->bbcode_tpl('inline_attachment_open', $bbcode_id) - ) - ); - break; - - default: - if (isset($rowset[$bbcode_id])) - { - if ($this->template_bitfield->get($bbcode_id)) + if ($open_is_regexp) { - // The bbcode requires a custom template to be loaded - if (!$bbcode_tpl = $this->bbcode_tpl($rowset[$bbcode_id]['bbcode_tag'], $bbcode_id)) + $start_tag = preg_replace($open_tag[$start_tag_index], $open_regexp_replace[$start_tag_index], $start_tag); + } + + // everything before the opening tag. + $before_start_tag = substr($text, 0, $start_index); + + // everything after the opening tag, but before the closing tag. + $between_tags = substr($text, $start_index + $start_length, $curr_pos - $start_index - $start_length); + + // Run the given function on the text between the tags.. + if ($use_function_pointer) + { + $between_tags = $func($between_tags, $uid); + } + + // everything after the closing tag. + $after_end_tag = substr($text, $curr_pos + $close_tag_length); + + // Mark the lowest nesting level if needed. + if ($mark_lowest_level && ($curr_nesting_depth == 1)) + { + if ($open_tag[0] == '[code]') { - // For some reason, the required template seems not to be available, use the default template - $bbcode_tpl = (!empty($rowset[$bbcode_id]['second_pass_replace'])) ? $rowset[$bbcode_id]['second_pass_replace'] : $rowset[$bbcode_id]['bbcode_tpl']; + $code_entities_match = array('#<#', '#>#', '#"#', '#:#', '#\[#', '#\]#', '#\(#', '#\)#', '#\{#', '#\}#'); + $code_entities_replace = array('<', '>', '"', ':', '[', ']', '(', ')', '{', '}'); + $between_tags = preg_replace($code_entities_match, $code_entities_replace, $between_tags); + } + $text = $before_start_tag . substr($start_tag, 0, $start_length - 1) . ":$curr_nesting_depth:$uid]"; + $text .= $between_tags . substr($close_tag_new, 0, $close_tag_new_length - 1) . ":$curr_nesting_depth:$uid]"; + } + else + { + if ($open_tag[0] == '[code]') + { + $text = $before_start_tag . '[code]'; + $text .= $between_tags . '[/code]'; } else { - // In order to use templates with custom bbcodes we need - // to replace all {VARS} to corresponding backreferences - // Note that backreferences are numbered from bbcode_match - if (preg_match_all('/\{(URL|LOCAL_URL|EMAIL|TEXT|SIMPLETEXT|IDENTIFIER|COLOR|NUMBER)[0-9]*\}/', $rowset[$bbcode_id]['bbcode_match'], $m)) + if ($open_is_regexp) { - foreach ($m[0] as $i => $tok) - { - $bbcode_tpl = str_replace($tok, '$' . ($i + 1), $bbcode_tpl); - } + $text = $before_start_tag . $start_tag; } + else + { + $text = $before_start_tag . substr($start_tag, 0, $start_length - 1) . ":$uid]"; + } + $text .= $between_tags . substr($close_tag_new, 0, $close_tag_new_length - 1) . ":$uid]"; } } - else - { - // Default template - $bbcode_tpl = (!empty($rowset[$bbcode_id]['second_pass_replace'])) ? $rowset[$bbcode_id]['second_pass_replace'] : $rowset[$bbcode_id]['bbcode_tpl']; - } - // Replace {L_*} lang strings - $bbcode_tpl = preg_replace('/{L_([A-Z_]+)}/e', "(!empty(\$user->lang['\$1'])) ? \$user->lang['\$1'] : ucwords(strtolower(str_replace('_', ' ', '\$1')))", $bbcode_tpl); + $text .= $after_end_tag; - if (!empty($rowset[$bbcode_id]['second_pass_replace'])) + // Now.. we've screwed up the indices by changing the length of the string. + // So, if there's anything in the stack, we want to resume searching just after it. + // otherwise, we go back to the start. + if (sizeof($stack) > 0) { - // The custom BBCode requires second-pass pattern replacements - $this->bbcode_cache[$bbcode_id] = array( - 'preg' => array($rowset[$bbcode_id]['second_pass_match'] => $bbcode_tpl) - ); + $match = array_pop($stack); + $curr_pos = $match['pos']; +// bbcode_array_push($stack, $match); +// ++$curr_pos; } else { - $this->bbcode_cache[$bbcode_id] = array( - 'str' => array($rowset[$bbcode_id]['second_pass_match'] => $bbcode_tpl) - ); + $curr_pos = 1; } } else { - $this->bbcode_cache[$bbcode_id] = false; + // No matching start tag found. Increment pos, keep going. + ++$curr_pos; } - break; + } + else + { + // No starting tag or ending tag.. Increment pos, keep looping., + ++$curr_pos; + } } } - } + } // while - /** - * Return bbcode template - */ - function bbcode_tpl($tpl_name, $bbcode_id = -1, $skip_bitfield_check = false) + return $text; + +} // bbencode_first_pass_pda() + +/** + * Does second-pass bbencoding of the [code] tags. This includes + * running htmlspecialchars() over the text contained between + * any pair of [code] tags that are at the first level of + * nesting. Tags at the first level of nesting are indicated + * by this format: [code:1:$uid] ... [/code:1:$uid] + * Other tags are in this format: [code:$uid] ... [/code:$uid] + */ +function bbencode_second_pass_code($text, $uid, $bbcode_tpl) +{ + global $lang; + + $code_start_html = $bbcode_tpl['code_open']; + $code_end_html = $bbcode_tpl['code_close']; + + // First, do all the 1st-level matches. These need an htmlspecialchars() run, + // so they have to be handled differently. + $match_count = preg_match_all("#\[code:1:$uid\](.*?)\[/code:1:$uid\]#si", $text, $matches); + + for ($i = 0; $i < $match_count; $i++) { - static $bbcode_hardtpl = array(); - if (empty($bbcode_hardtpl)) - { - global $user; - - $bbcode_hardtpl = array( - 'b_open' => '', - 'b_close' => '', - 'i_open' => '', - 'i_close' => '', - 'u_open' => '', - 'u_close' => '', - 'img' => '' . $user->lang['IMAGE'] . '', - 'size' => '$2', - 'color' => '$2', - 'email' => '$2' - ); - } + $before_replace = $matches[1][$i]; + $after_replace = $matches[1][$i]; - if ($bbcode_id != -1 && !$skip_bitfield_check && !$this->template_bitfield->get($bbcode_id)) - { - return (isset($bbcode_hardtpl[$tpl_name])) ? $bbcode_hardtpl[$tpl_name] : false; - } + // Replace 2 spaces with "  " so non-tabbed code indents without making huge long lines. + $after_replace = str_replace(" ", "  ", $after_replace); + // now Replace 2 spaces with "  " to catch odd #s of spaces. + $after_replace = str_replace(" ", "  ", $after_replace); - if (empty($this->bbcode_template)) - { - if (($tpl = file_get_contents($this->template_filename)) === false) - { - trigger_error('Could not load bbcode template', E_USER_ERROR); - } + // Replace tabs with "   " so tabbed code indents sorta right without making huge long lines. + $after_replace = str_replace("\t", "   ", $after_replace); - // replace \ with \\ and then ' with \'. - $tpl = str_replace('\\', '\\\\', $tpl); - $tpl = str_replace("'", "\'", $tpl); + // now Replace space occurring at the beginning of a line + $after_replace = preg_replace("/^ {1}/m", ' ', $after_replace); - // strip newlines and indent - $tpl = preg_replace("/\n[\n\r\s\t]*/", '', $tpl); + $str_to_match = "[code:1:$uid]" . $before_replace . "[/code:1:$uid]"; - // Turn template blocks into PHP assignment statements for the values of $bbcode_tpl.. - $this->bbcode_template = array(); + $replacement = $code_start_html; + $replacement .= $after_replace; + $replacement .= $code_end_html; - $matches = preg_match_all('#(.*?)#', $tpl, $match); - - for ($i = 0; $i < $matches; $i++) - { - if (empty($match[1][$i])) - { - continue; - } - - $this->bbcode_template[$match[1][$i]] = $this->bbcode_tpl_replace($match[1][$i], $match[2][$i]); - } - } - - return (isset($this->bbcode_template[$tpl_name])) ? $this->bbcode_template[$tpl_name] : ((isset($bbcode_hardtpl[$tpl_name])) ? $bbcode_hardtpl[$tpl_name] : false); + $text = str_replace($str_to_match, $replacement, $text); } - /** - * Return bbcode template replacement - */ - function bbcode_tpl_replace($tpl_name, $tpl) + // Now, do all the non-first-level matches. These are simple. + $text = str_replace("[code:$uid]", $code_start_html, $text); + $text = str_replace("[/code:$uid]", $code_end_html, $text); + + return $text; + +} // bbencode_second_pass_code() + +/** + * Rewritten by Nathan Codding - Feb 6, 2001. + * - Goes through the given string, and replaces xxxx://yyyy with an HTML tag linking + * to that URL + * - Goes through the given string, and replaces www.xxxx.yyyy[zzzz] with an HTML tag linking + * to http://www.xxxx.yyyy[/zzzz] + * - Goes through the given string, and replaces xxxx@yyyy with an HTML mailto: tag linking + * to that email address + * - Only matches these 2 patterns either after a space, or at the beginning of a line + * + * Notes: the email one might get annoying - it's easy to make it more restrictive, though.. maybe + * have it require something like xxxx@yyyy.zzzz or such. We'll see. + */ +function make_clickable($text) +{ + $text = preg_replace('#(script|about|applet|activex|chrome):#is', "\\1:", $text); + + // pad it with a space so we can match things at the start of the 1st line. + $ret = ' ' . $text; + + // matches an "xxxx://yyyy" URL at the start of a line, or after a space. + // xxxx can only be alpha characters. + // yyyy is anything up to the first space, newline, comma, double quote or < + $ret = preg_replace("#(^|[\n ])([\w]+?://[\w\#$%&~/.\-;:=,?@\[\]+]*)#is", "\\1\\2", $ret); + + // matches a "www|ftp.xxxx.yyyy[/zzzz]" kinda lazy URL thing + // Must contain at least 2 dots. xxxx contains either alphanum, or "-" + // zzzz is optional.. will contain everything up to the first space, newline, + // comma, double quote or <. + $ret = preg_replace("#(^|[\n ])((www|ftp)\.[\w\#$%&~/.\-;:=,?@\[\]+]*)#is", "\\1\\2", $ret); + + // matches an email@domain type address at the start of a line, or after a space. + // Note: Only the followed chars are valid; alphanums, "-", "_" and or ".". + $ret = preg_replace("#(^|[\n ])([a-z0-9&\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i", "\\1\\2@\\3", $ret); + + // Remove our padding.. + $ret = substr($ret, 1); + + return($ret); +} + +/** + * Nathan Codding - Feb 6, 2001 + * Reverses the effects of make_clickable(), for use in editpost. + * - Does not distinguish between "www.xxxx.yyyy" and "http://aaaa.bbbb" type URLs. + * + */ +function undo_make_clickable($text) +{ + $text = preg_replace("#.*?#i", "\\1", $text); + $text = preg_replace("#.*?#i", "\\1", $text); + + return $text; + +} + +/** + * Nathan Codding - August 24, 2000. + * Takes a string, and does the reverse of the PHP standard function + * htmlspecialchars(). + */ +function undo_htmlspecialchars($input) +{ + $input = preg_replace("/>/i", ">", $input); + $input = preg_replace("/</i", "<", $input); + $input = preg_replace("/"/i", "\"", $input); + $input = preg_replace("/&/i", "&", $input); + + return $input; +} + +/** + * This is used to change a [*] tag into a [*:$uid] tag as part + * of the first-pass bbencoding of [list] tags. It fits the + * standard required in order to be passed as a variable + * function into bbencode_first_pass_pda(). + */ +function replace_listitems($text, $uid) +{ + $text = str_replace("[*]", "[*:$uid]", $text); + + return $text; +} + +/** + * Escapes the "/" character with "\/". This is useful when you need + * to stick a runtime string into a PREG regexp that is being delimited + * with slashes. + */ +function escape_slashes($input) +{ + $output = str_replace('/', '\/', $input); + return $output; +} + +/** + * This function does exactly what the PHP4 function array_push() does + * however, to keep phpBB compatable with PHP 3 we had to come up with our own + * method of doing it. + * This function was deprecated in phpBB 2.0.18 + */ +function bbcode_array_push(&$stack, $value) +{ + $stack[] = $value; + return(sizeof($stack)); +} + +/** + * This function does exactly what the PHP4 function array_pop() does + * however, to keep phpBB compatable with PHP 3 we had to come up with our own + * method of doing it. + * This function was deprecated in phpBB 2.0.18 + */ +function bbcode_array_pop(&$stack) +{ + $arrSize = count($stack); + $x = 1; + + while(list($key, $val) = each($stack)) + { + if($x < count($stack)) + { + $tmpArr[] = $val; + } + else + { + $return_val = $val; + } + $x++; + } + $stack = $tmpArr; + + return($return_val); +} + +// +// Smilies code ... would this be better tagged on to the end of bbcode.php? +// Probably so and I'll move it before B2 +// +function smilies_pass($message) +{ + static $orig, $repl; + + if (!isset($orig)) { - global $user; + global $db, $board_config; + $orig = $repl = array(); - static $replacements = array( - 'quote_username_open' => array('{USERNAME}' => '$1'), - 'color' => array('{COLOR}' => '$1', '{TEXT}' => '$2'), - 'size' => array('{SIZE}' => '$1', '{TEXT}' => '$2'), - 'img' => array('{URL}' => '$1'), - 'flash' => array('{WIDTH}' => '$1', '{HEIGHT}' => '$2', '{URL}' => '$3'), - 'url' => array('{URL}' => '$1', '{DESCRIPTION}' => '$2'), - 'email' => array('{EMAIL}' => '$1', '{DESCRIPTION}' => '$2') - ); - - $tpl = preg_replace('/{L_([A-Z_]+)}/e', "(!empty(\$user->lang['\$1'])) ? \$user->lang['\$1'] : ucwords(strtolower(str_replace('_', ' ', '\$1')))", $tpl); - - if (!empty($replacements[$tpl_name])) + $sql = 'SELECT * FROM ' . SMILIES_TABLE; + if( !$result = $db->sql_query($sql) ) { - $tpl = strtr($tpl, $replacements[$tpl_name]); + message_die(GENERAL_ERROR, "Couldn't obtain smilies data", "", __LINE__, __FILE__, $sql); + } + $smilies = $db->sql_fetchrowset($result); + + if (count($smilies)) + { + usort($smilies, 'smiley_sort'); } - return trim($tpl); + for ($i = 0; $i < count($smilies); $i++) + { + $orig[] = "/(?<=.\W|\W.|^\W)" . preg_quote($smilies[$i]['code'], "/") . "(?=.\W|\W.|\W$)/"; + $repl[] = '' . $smilies[$i]['emoticon'] . ''; + } } - /** - * Second parse list bbcode - */ - function bbcode_list($type) + if (count($orig)) { - if ($type == '') - { - $tpl = 'ulist_open_default'; - $type = 'default'; - } - else if ($type == 'i') - { - $tpl = 'olist_open'; - $type = 'lower-roman'; - } - else if ($type == 'I') - { - $tpl = 'olist_open'; - $type = 'upper-roman'; - } - else if (preg_match('#^(disc|circle|square)$#i', $type)) - { - $tpl = 'ulist_open'; - $type = strtolower($type); - } - else if (preg_match('#^[a-z]$#', $type)) - { - $tpl = 'olist_open'; - $type = 'lower-alpha'; - } - else if (preg_match('#[A-Z]#', $type)) - { - $tpl = 'olist_open'; - $type = 'upper-alpha'; - } - else if (is_numeric($type)) - { - $tpl = 'olist_open'; - $type = 'arabic-numbers'; - } - else - { - $tpl = 'olist_open'; - $type = 'arabic-numbers'; - } - - return str_replace('{LIST_TYPE}', $type, $this->bbcode_tpl($tpl)); + $message = preg_replace($orig, $repl, ' ' . $message . ' '); + $message = substr($message, 1, -1); } + + return $message; +} - /** - * Second parse quote tag - */ - function bbcode_second_pass_quote($username, $quote) +function smiley_sort($a, $b) +{ + if ( strlen($a['code']) == strlen($b['code']) ) { - // when using the /e modifier, preg_replace slashes double-quotes but does not - // seem to slash anything else - $quote = str_replace('\"', '"', $quote); - $username = str_replace('\"', '"', $username); - - // remove newline at the beginning - if ($quote == "\n") - { - $quote = ''; - } - - $quote = (($username) ? str_replace('$1', $username, $this->bbcode_tpl('quote_username_open')) : $this->bbcode_tpl('quote_open')) . $quote; - - return $quote; + return 0; } - /** - * Second parse code tag - */ - function bbcode_second_pass_code($type, $code) - { - // when using the /e modifier, preg_replace slashes double-quotes but does not - // seem to slash anything else - $code = str_replace('\"', '"', $code); - - switch ($type) - { - case 'php': - // Not the english way, but valid because of hardcoded syntax highlighting - if (strpos($code, '
    ') === 0) - { - $code = substr($code, 41); - } - - // no break; - - default: - $code = str_replace("\t", '   ', $code); - $code = str_replace(' ', '  ', $code); - $code = str_replace(' ', '  ', $code); - - // remove newline at the beginning - if (!empty($code) && $code[0] == "\n") - { - $code = substr($code, 1); - } - break; - } - - $code = $this->bbcode_tpl('code_open') . $code . $this->bbcode_tpl('code_close'); - - return $code; - } + return ( strlen($a['code']) > strlen($b['code']) ) ? -1 : 1; } ?> \ No newline at end of file diff --git a/phpBB/includes/cache.php b/phpBB/includes/cache.php deleted file mode 100644 index af2c0ab9fa..0000000000 --- a/phpBB/includes/cache.php +++ /dev/null @@ -1,426 +0,0 @@ -get('config')) !== false) - { - $sql = 'SELECT config_name, config_value - FROM ' . CONFIG_TABLE . ' - WHERE is_dynamic = 1'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $config[$row['config_name']] = $row['config_value']; - } - $db->sql_freeresult($result); - } - else - { - $config = $cached_config = array(); - - $sql = 'SELECT config_name, config_value, is_dynamic - FROM ' . CONFIG_TABLE; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if (!$row['is_dynamic']) - { - $cached_config[$row['config_name']] = $row['config_value']; - } - - $config[$row['config_name']] = $row['config_value']; - } - $db->sql_freeresult($result); - - $cache->put('config', $cached_config); - } - - return $config; - } - - /** - * Obtain list of naughty words and build preg style replacement arrays for use by the - * calling script - */ - public static function obtain_word_list() - { - global $cache; - - if (($censors = $cache->get('_word_censors')) === false) - { - global $db; - - $sql = 'SELECT word, replacement - FROM ' . WORDS_TABLE; - $result = $db->sql_query($sql); - - $censors = array(); - while ($row = $db->sql_fetchrow($result)) - { - $censors['match'][] = '#(?sql_freeresult($result); - - $cache->put('_word_censors', $censors); - } - - return $censors; - } - - /** - * Obtain currently listed icons - */ - public static function obtain_icons() - { - global $cache; - - if (($icons = $cache->get('_icons')) === false) - { - global $db; - - // Topic icons - $sql = 'SELECT * - FROM ' . ICONS_TABLE . ' - ORDER BY icons_order'; - $result = $db->sql_query($sql); - - $icons = array(); - while ($row = $db->sql_fetchrow($result)) - { - $icons[$row['icons_id']]['img'] = $row['icons_url']; - $icons[$row['icons_id']]['width'] = (int) $row['icons_width']; - $icons[$row['icons_id']]['height'] = (int) $row['icons_height']; - $icons[$row['icons_id']]['display'] = (bool) $row['display_on_posting']; - } - $db->sql_freeresult($result); - - $cache->put('_icons', $icons); - } - - return $icons; - } - - /** - * Obtain ranks - */ - public static function obtain_ranks() - { - global $cache; - - if (($ranks = $cache->get('_ranks')) === false) - { - global $db; - - $sql = 'SELECT * - FROM ' . RANKS_TABLE . ' - ORDER BY rank_min DESC'; - $result = $db->sql_query($sql); - - $ranks = array(); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['rank_special']) - { - $ranks['special'][$row['rank_id']] = array( - 'rank_title' => $row['rank_title'], - 'rank_image' => $row['rank_image'] - ); - } - else - { - $ranks['normal'][] = array( - 'rank_title' => $row['rank_title'], - 'rank_min' => $row['rank_min'], - 'rank_image' => $row['rank_image'] - ); - } - } - $db->sql_freeresult($result); - - $cache->put('_ranks', $ranks); - } - - return $ranks; - } - - /** - * Obtain allowed extensions - * - * @param mixed $forum_id If false then check for private messaging, if int then check for forum id. If true, then only return extension informations. - * - * @return array allowed extensions array. - */ - public static function obtain_attach_extensions($forum_id) - { - global $cache; - - if (($extensions = $cache->get('_extensions')) === false) - { - global $db; - - $extensions = array( - '_allowed_post' => array(), - '_allowed_pm' => array(), - ); - - // The rule is to only allow those extensions defined. ;) - $sql = 'SELECT e.extension, g.* - FROM ' . EXTENSIONS_TABLE . ' e, ' . EXTENSION_GROUPS_TABLE . ' g - WHERE e.group_id = g.group_id - AND (g.allow_group = 1 OR g.allow_in_pm = 1)'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $extension = strtolower(trim($row['extension'])); - - $extensions[$extension] = array( - 'display_cat' => (int) $row['cat_id'], - 'download_mode' => (int) $row['download_mode'], - 'upload_icon' => trim($row['upload_icon']), - 'max_filesize' => (int) $row['max_filesize'], - 'allow_group' => $row['allow_group'], - 'allow_in_pm' => $row['allow_in_pm'], - ); - - $allowed_forums = ($row['allowed_forums']) ? unserialize(trim($row['allowed_forums'])) : array(); - - // Store allowed extensions forum wise - if ($row['allow_group']) - { - $extensions['_allowed_post'][$extension] = (!sizeof($allowed_forums)) ? 0 : $allowed_forums; - } - - if ($row['allow_in_pm']) - { - $extensions['_allowed_pm'][$extension] = 0; - } - } - $db->sql_freeresult($result); - - $cache->put('_extensions', $extensions); - } - - // Forum post - if ($forum_id === false) - { - // We are checking for private messages, therefore we only need to get the pm extensions... - $return = array('_allowed_' => array()); - - foreach ($extensions['_allowed_pm'] as $extension => $check) - { - $return['_allowed_'][$extension] = 0; - $return[$extension] = $extensions[$extension]; - } - - $extensions = $return; - } - else if ($forum_id === true) - { - return $extensions; - } - else - { - $forum_id = (int) $forum_id; - $return = array('_allowed_' => array()); - - foreach ($extensions['_allowed_post'] as $extension => $check) - { - // Check for allowed forums - if (is_array($check)) - { - $allowed = (!in_array($forum_id, $check)) ? false : true; - } - else - { - $allowed = true; - } - - if ($allowed) - { - $return['_allowed_'][$extension] = 0; - $return[$extension] = $extensions[$extension]; - } - } - - $extensions = $return; - } - - if (!isset($extensions['_allowed_'])) - { - $extensions['_allowed_'] = array(); - } - - return $extensions; - } - - /** - * Obtain active bots - */ - public static function obtain_bots() - { - global $cache; - - if (($bots = $cache->get('_bots')) === false) - { - global $db; - - $sql = 'SELECT user_id, bot_agent, bot_ip - FROM ' . BOTS_TABLE . ' - WHERE bot_active = 1 - ORDER BY ' . $db->sql_function('length_varchar', 'bot_agent') . 'DESC'; - $result = $db->sql_query($sql); - - $bots = array(); - while ($row = $db->sql_fetchrow($result)) - { - $bots[] = $row; - } - $db->sql_freeresult($result); - - $cache->put('_bots', $bots); - } - - return $bots; - } - - /** - * Obtain cfg file data - * - * @param array $theme An array containing the path to the item - * - * @param string $item The specific item to get: 'theme', 'template', or 'imageset' - * - */ - public static function obtain_cfg_item($theme, $item = 'theme') - { - global $config, $phpbb_root_path, $cache; - - $parsed_array = $cache->get('_cfg_' . $item . '_' . $theme[$item . '_path']); - - if ($parsed_array === false) - { - $parsed_array = array(); - } - - $reparse = false; - $filename = $phpbb_root_path . 'styles/' . $theme[$item . '_path'] . '/' . $item . '/' . $item . '.cfg'; - - if (!file_exists($filename)) - { - return $parsed_array; - } - - if (!isset($parsed_array['filetime']) || (($config['load_tplcompile'] && @filemtime($filename) > $parsed_array['filetime']))) - { - $reparse = true; - } - - // Re-parse cfg file - if ($reparse) - { - $parsed_array = parse_cfg_file($filename); - $parsed_array['filetime'] = @filemtime($filename); - - $cache->put('_cfg_' . $item . '_' . $theme[$item . '_path'], $parsed_array); - } - - return $parsed_array; - } - - /** - * Obtain disallowed usernames - */ - public static function obtain_disallowed_usernames() - { - global $cache; - - if (($usernames = $cache->get('_disallowed_usernames')) === false) - { - global $db; - - $sql = 'SELECT disallow_username - FROM ' . DISALLOW_TABLE; - $result = $db->sql_query($sql); - - $usernames = array(); - while ($row = $db->sql_fetchrow($result)) - { - $usernames[] = str_replace('%', '.*?', preg_quote(utf8_clean_string($row['disallow_username']), '#')); - } - $db->sql_freeresult($result); - - $cache->put('_disallowed_usernames', $usernames); - } - - return $usernames; - } - - /** - * Obtain hooks... - */ - public static function obtain_hooks() - { - global $cache; - - if (($hook_files = $cache->get('_hooks')) === false) - { - global $phpbb_root_path; - - $hook_files = array(); - - // Now search for hooks... - $dh = @opendir($phpbb_root_path . 'includes/hooks/'); - - if ($dh) - { - global $phpEx; - - while (($file = readdir($dh)) !== false) - { - if (strpos($file, 'hook_') === 0 && substr($file, -(strlen($phpEx) + 1)) === '.' . $phpEx) - { - $hook_files[] = substr($file, 0, -(strlen($phpEx) + 1)); - } - } - closedir($dh); - } - - $cache->put('_hooks', $hook_files); - } - - return $hook_files; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/captcha/captcha_gd.php b/phpBB/includes/captcha/captcha_gd.php deleted file mode 100644 index 74afc152a2..0000000000 --- a/phpBB/includes/captcha/captcha_gd.php +++ /dev/null @@ -1,1567 +0,0 @@ - true, - 'min_value' => 60, - ), 'hsv'); - - $scheme = $colour->colour_scheme('background', false); - $scheme = $colour->mono_range($scheme, 10, false); - shuffle($scheme); - - $bg_colours = array_splice($scheme, mt_rand(6, 12)); - - // Generate code characters - $characters = $sizes = $bounding_boxes = array(); - $width_avail = self::width - 15; - $code_len = strlen($code); - - $captcha_bitmaps = self::captcha_bitmaps(); - for ($i = 0; $i < $code_len; ++$i) - { - $characters[$i] = new char_cube3d($captcha_bitmaps, $code[$i]); - - list($min, $max) = char_cube3d::range(); - $sizes[$i] = mt_rand($min, $max); - - $box = $characters[$i]->dimensions($sizes[$i]); - $width_avail -= ($box[2] - $box[0]); - $bounding_boxes[$i] = $box; - } - - // Redistribute leftover x-space - $offset = array(); - for ($i = 0; $i < $code_len; ++$i) - { - $denom = ($code_len - $i); - $denom = max(1.3, $denom); - $offset[$i] = mt_rand(0, (1.5 * $width_avail) / $denom); - $width_avail -= $offset[$i]; - } - - if ($config['captcha_gd_x_grid']) - { - $grid = (int) $config['captcha_gd_x_grid']; - for ($y = 0; $y < self::height; $y += mt_rand($grid - 2, $grid + 2)) - { - $current_colour = $scheme[array_rand($scheme)]; - imageline($img, mt_rand(0,4), mt_rand($y - 3, $y), mt_rand(self::width - 5, self::width), mt_rand($y - 3, $y), $current_colour); - } - } - - if ($config['captcha_gd_y_grid']) - { - $grid = (int) $config['captcha_gd_y_grid']; - for ($x = 0; $x < self::width; $x += mt_rand($grid - 2, $grid + 2)) - { - $current_colour = $scheme[array_rand($scheme)]; - imagedashedline($img, mt_rand($x -3, $x + 3), mt_rand(0, 4), mt_rand($x -3, $x + 3), mt_rand(self::height - 5, self::height), $current_colour); - } - } - - $xoffset = 5; - for ($i = 0; $i < $code_len; ++$i) - { - $dimm = $bounding_boxes[$i]; - $xoffset += ($offset[$i] - $dimm[0]); - $yoffset = mt_rand(-$dimm[1], self::height - $dimm[3]); - - $characters[$i]->drawchar($sizes[$i], $xoffset, $yoffset, $img, $colour->get_resource('background'), $scheme); - $xoffset += $dimm[2]; - } - - if ($config['captcha_gd_foreground_noise']) - { - self::noise_line($img, 0, 0, self::width, self::height, $colour->get_resource('background'), $scheme, $bg_colours); - } - - // Send image - header('Content-Type: image/png'); - header('Cache-control: no-cache, no-store'); - imagepng($img); - imagedestroy($img); - } - - /** - * Noise line - */ - private static function noise_line($img, $min_x, $min_y, $max_x, $max_y, $bg, $font, $non_font) - { - imagesetthickness($img, 2); - - $x1 = $min_x; - $x2 = $max_x; - $y1 = $min_y; - $y2 = $min_y; - - do - { - $line = array_merge( - array_fill(0, mt_rand(30, 60), $non_font[array_rand($non_font)]), - array_fill(0, mt_rand(30, 60), $bg) - ); - - imagesetstyle($img, $line); - imageline($img, $x1, $y1, $x2, $y2, IMG_COLOR_STYLED); - - $y1 += mt_rand(12, 35); - $y2 += mt_rand(12, 35); - } - while ($y1 < $max_y && $y2 < $max_y); - - $x1 = $min_x; - $x2 = $min_x; - $y1 = $min_y; - $y2 = $max_y; - - do - { - $line = array_merge( - array_fill(0, mt_rand(30, 60), $non_font[array_rand($non_font)]), - array_fill(0, mt_rand(30, 60), $bg) - ); - - imagesetstyle($img, $line); - imageline($img, $x1, $y1, $x2, $y2, IMG_COLOR_STYLED); - - $x1 += mt_rand(20, 35); - $x2 += mt_rand(20, 35); - } - while ($x1 < $max_x && $x2 < $max_x); - imagesetthickness($img, 1); - } - - /** - * Return bitmaps - */ - private static function captcha_bitmaps() - { - return array( - 'width' => 9, - 'height' => 15, - 'data' => array( - - 'A' => array( - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,1,1,1,1,1,1,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - ), - 'B' => array( - array(1,1,1,1,1,1,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,0,0), - ), - 'C' => array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - 'D' => array( - array(1,1,1,1,1,1,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,0,0), - ), - 'E' => array( - array(1,1,1,1,1,1,1,1,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,1,1,1,1,1,1,1,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,1,1,1,1,1,1,1,1), - ), - 'F' => array( - array(1,1,1,1,1,1,1,1,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,1,1,1,1,1,1,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - ), - 'G' => array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,1,1,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - 'H' => array( - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,1,1,1,1,1,1,1,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - ), - 'I' => array( - array(1,1,1,1,1,1,1,1,1), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(1,1,1,1,1,1,1,1,1), - ), - 'J' => array( - array(1,1,1,1,1,1,1,1,1), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(1,0,0,0,0,1,0,0,0), - array(1,0,0,0,0,1,0,0,0), - array(0,1,0,0,1,0,0,0,0), - array(0,0,1,1,0,0,0,0,0), - ), - 'K' => array( // New 'K', supplied by NeoThermic - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,1,0,0,0), - array(1,0,0,0,1,0,0,0,0), - array(1,0,0,1,0,0,0,0,0), - array(1,0,1,0,0,0,0,0,0), - array(1,1,0,0,0,0,0,0,0), - array(1,0,1,0,0,0,0,0,0), - array(1,0,0,1,0,0,0,0,0), - array(1,0,0,0,1,0,0,0,0), - array(1,0,0,0,0,1,0,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - ), - 'L' => array( - array(0,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,1,1,1,1,1,1,1,1), - ), - 'M' => array( - array(1,1,0,0,0,0,0,1,1), - array(1,1,0,0,0,0,0,1,1), - array(1,0,1,0,0,0,1,0,1), - array(1,0,1,0,0,0,1,0,1), - array(1,0,1,0,0,0,1,0,1), - array(1,0,0,1,0,1,0,0,1), - array(1,0,0,1,0,1,0,0,1), - array(1,0,0,1,0,1,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - ), - 'N' => array( - array(1,1,0,0,0,0,0,0,1), - array(1,1,0,0,0,0,0,0,1), - array(1,0,1,0,0,0,0,0,1), - array(1,0,1,0,0,0,0,0,1), - array(1,0,0,1,0,0,0,0,1), - array(1,0,0,1,0,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,0,1,0,0,1), - array(1,0,0,0,0,1,0,0,1), - array(1,0,0,0,0,0,1,0,1), - array(1,0,0,0,0,0,1,0,1), - array(1,0,0,0,0,0,0,1,1), - array(1,0,0,0,0,0,0,1,1), - ), - 'O' => array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - 'P' => array( - array(1,1,1,1,1,1,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - ), - 'Q' => array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,1,0,0,1), - array(1,0,0,0,0,0,1,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,1), - ), - 'R' => array( - array(1,1,1,1,1,1,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,0,0), - array(1,1,1,0,0,0,0,0,0), - array(1,0,0,1,0,0,0,0,0), - array(1,0,0,0,1,0,0,0,0), - array(1,0,0,0,0,1,0,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - ), - 'S' => array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,0,1,1,1,1,1,0,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - 'T' => array( - array(1,1,1,1,1,1,1,1,1), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - ), - 'U' => array( - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - 'V' => array( - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - ), - 'W' => array( // New 'W', supplied by MHobbit - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,1,0,1,0,0,1), - array(1,0,0,1,0,1,0,0,1), - array(1,0,0,1,0,1,0,0,1), - array(1,0,1,0,0,0,1,0,1), - array(1,0,1,0,0,0,1,0,1), - array(1,0,1,0,0,0,1,0,1), - array(1,1,0,0,0,0,0,1,1), - array(1,1,0,0,0,0,0,1,1), - ), - 'X' => array( - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,1,0,0,0,0,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - ), - 'Y' => array( - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - ), - 'Z' => array( // New 'Z' supplied by Anon - array(1,1,1,1,1,1,1,1,1), - array(1,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,1,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,0,0,0,0,0), - array(0,0,0,1,0,0,0,0,0), - array(0,0,1,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,1), - array(1,1,1,1,1,1,1,1,1), - ), - '1' => array( - array(0,0,0,1,1,0,0,0,0), - array(0,0,1,0,1,0,0,0,0), - array(0,1,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,1,1,1,1,1,1,1,0), - ), - '2' => array( // New '2' supplied by Anon - array(0,0,0,1,1,1,0,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,1,0,0,0,0,1,1,0), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,1,1), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,1,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,0,0,0,0,0), - array(0,0,1,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(1,1,1,1,1,1,1,1,1), - array(0,0,0,0,0,0,0,0,0), - ), - '3' => array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,1,1,0,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - '4' => array( - array(0,0,0,0,0,0,1,1,0), - array(0,0,0,0,0,1,0,1,0), - array(0,0,0,0,1,0,0,1,0), - array(0,0,0,1,0,0,0,1,0), - array(0,0,1,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,1,1), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,1,0), - ), - '5' => array( - array(1,1,1,1,1,1,1,1,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,0,1,1,1,1,1,0,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - '6' => array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,1,1,1,1,0,0), - array(1,0,1,0,0,0,0,1,0), - array(1,1,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - '7' => array( - array(1,1,1,1,1,1,1,1,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,1,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,0,0,0,0,0), - array(0,0,0,1,0,0,0,0,0), - array(0,0,1,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - ), - '8' => array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - '9' => array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,1,1), - array(0,1,0,0,0,0,1,0,1), - array(0,0,1,1,1,1,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - ) - ); - } -} - -/** -* @package VC -*/ -class char_cube3d -{ - private $bitmap; - private $bitmap_width; - private $bitmap_height; - - private $basis_matrix = array(array(1, 0, 0), array(0, 1, 0), array(0, 0, 1)); - private $abs_x = array(1, 0); - private $abs_y = array(0, 1); - private $x = 0; - private $y = 1; - private $z = 2; - private $letter = ''; - - /** - */ - function __construct(&$bitmaps, $letter) - { - $this->bitmap = $bitmaps['data'][$letter]; - $this->bitmap_width = $bitmaps['width']; - $this->bitmap_height = $bitmaps['height']; - - $this->basis_matrix[0][0] = mt_rand(-600, 600); - $this->basis_matrix[0][1] = mt_rand(-600, 600); - $this->basis_matrix[0][2] = (mt_rand(0, 1) * 2000) - 1000; - $this->basis_matrix[1][0] = mt_rand(-1000, 1000); - $this->basis_matrix[1][1] = mt_rand(-1000, 1000); - $this->basis_matrix[1][2] = mt_rand(-1000, 1000); - - $this->normalize($this->basis_matrix[0]); - $this->normalize($this->basis_matrix[1]); - $this->basis_matrix[2] = $this->cross_product($this->basis_matrix[0], $this->basis_matrix[1]); - $this->normalize($this->basis_matrix[2]); - - // $this->basis_matrix[1] might not be (probably isn't) orthogonal to $basis_matrix[0] - $this->basis_matrix[1] = $this->cross_product($this->basis_matrix[0], $this->basis_matrix[2]); - $this->normalize($this->basis_matrix[1]); - - // Make sure our cube is facing into the canvas (assuming +z == in) - for ($i = 0; $i < 3; ++$i) - { - if ($this->basis_matrix[$i][2] < 0) - { - $this->basis_matrix[$i][0] *= -1; - $this->basis_matrix[$i][1] *= -1; - $this->basis_matrix[$i][2] *= -1; - } - } - - // Force our "z" basis vector to be the one with greatest absolute z value - $this->x = 0; - $this->y = 1; - $this->z = 2; - - // Swap "y" with "z" - if ($this->basis_matrix[1][2] > $this->basis_matrix[2][2]) - { - $this->z = 1; - $this->y = 2; - } - - // Swap "x" with "z" - if ($this->basis_matrix[0][2] > $this->basis_matrix[$this->z][2]) - { - $this->x = $this->z; - $this->z = 0; - } - - // Still need to determine which of $x,$y are which. - // wrong orientation if y's y-component is less than it's x-component - // likewise if x's x-component is less than it's y-component - // if they disagree, go with the one with the greater weight difference. - // rotate if positive - $weight = (abs($this->basis_matrix[$this->x][1]) - abs($this->basis_matrix[$this->x][0])) + (abs($this->basis_matrix[$this->y][0]) - abs($this->basis_matrix[$this->y][1])); - - // Swap "x" with "y" - if ($weight > 0) - { - list($this->x, $this->y) = array($this->y, $this->x); - } - - $this->abs_x = array($this->basis_matrix[$this->x][0], $this->basis_matrix[$this->x][1]); - $this->abs_y = array($this->basis_matrix[$this->y][0], $this->basis_matrix[$this->y][1]); - - if ($this->abs_x[0] < 0) - { - $this->abs_x[0] *= -1; - $this->abs_x[1] *= -1; - } - - if ($this->abs_y[1] > 0) - { - $this->abs_y[0] *= -1; - $this->abs_y[1] *= -1; - } - - $this->letter = $letter; - } - - /** - * Draw a character - */ - public function drawchar($scale, $xoff, $yoff, $img, $background, $colours) - { - $width = $this->bitmap_width; - $height = $this->bitmap_height; - $bitmap = $this->bitmap; - - $colour1 = $colours[array_rand($colours)]; - $colour2 = $colours[array_rand($colours)]; - - $swapx = ($this->basis_matrix[$this->x][0] > 0); - $swapy = ($this->basis_matrix[$this->y][1] < 0); - - for ($y = 0; $y < $height; ++$y) - { - for ($x = 0; $x < $width; ++$x) - { - $xp = ($swapx) ? ($width - $x - 1) : $x; - $yp = ($swapy) ? ($height - $y - 1) : $y; - - if ($bitmap[$height - $yp - 1][$xp]) - { - $dx = $this->scale($this->abs_x, ($xp - ($swapx ? ($width / 2) : ($width / 2) - 1)) * $scale); - $dy = $this->scale($this->abs_y, ($yp - ($swapy ? ($height / 2) : ($height / 2) - 1)) * $scale); - $xo = $xoff + $dx[0] + $dy[0]; - $yo = $yoff + $dx[1] + $dy[1]; - - $origin = array(0, 0, 0); - $xvec = $this->scale($this->basis_matrix[$this->x], $scale); - $yvec = $this->scale($this->basis_matrix[$this->y], $scale); - $face_corner = self::sum2($xvec, $yvec); - - $zvec = $this->scale($this->basis_matrix[$this->z], $scale); - $x_corner = self::sum2($xvec, $zvec); - $y_corner = self::sum2($yvec, $zvec); - - imagefilledpolygon($img, self::gen_poly($xo, $yo, $origin, $xvec, $x_corner,$zvec), 4, $colour1); - imagefilledpolygon($img, self::gen_poly($xo, $yo, $origin, $yvec, $y_corner,$zvec), 4, $colour2); - - $face = self::gen_poly($xo, $yo, $origin, $xvec, $face_corner, $yvec); - - imagefilledpolygon($img, $face, 4, $background); - imagepolygon($img, $face, 4, $colour1); - } - } - } - } - - /* - * return a roughly acceptable range of sizes for rendering with this texttype - */ - public static function range() - { - return array(3, 4); - } - - /** - * Vector length - */ - private static function vectorlen($vector) - { - return sqrt(pow($vector[0], 2) + pow($vector[1], 2) + pow($vector[2], 2)); - } - - /** - * Normalize - */ - private static function normalize(&$vector, $length = 1) - { - $length = (( $length < 1) ? 1 : $length); - $length /= self::vectorlen($vector); - $vector[0] *= $length; - $vector[1] *= $length; - $vector[2] *= $length; - } - - /** - */ - private static function cross_product($vector1, $vector2) - { - $retval = array(0, 0, 0); - $retval[0] = (($vector1[1] * $vector2[2]) - ($vector1[2] * $vector2[1])); - $retval[1] = -(($vector1[0] * $vector2[2]) - ($vector1[2] * $vector2[0])); - $retval[2] = (($vector1[0] * $vector2[1]) - ($vector1[1] * $vector2[0])); - - return $retval; - } - - /** - */ - private static function sum($vector1, $vector2) - { - return array($vector1[0] + $vector2[0], $vector1[1] + $vector2[1], $vector1[2] + $vector2[2]); - } - - /** - */ - private static function sum2($vector1, $vector2) - { - return array($vector1[0] + $vector2[0], $vector1[1] + $vector2[1]); - } - - /** - */ - private static function scale($vector, $length) - { - if (sizeof($vector) == 2) - { - return array($vector[0] * $length, $vector[1] * $length); - } - - return array($vector[0] * $length, $vector[1] * $length, $vector[2] * $length); - } - - /** - */ - private static function gen_poly($xoff, $yoff, &$vec1, &$vec2, &$vec3, &$vec4) - { - $poly = array(); - $poly[0] = $xoff + $vec1[0]; - $poly[1] = $yoff + $vec1[1]; - $poly[2] = $xoff + $vec2[0]; - $poly[3] = $yoff + $vec2[1]; - $poly[4] = $xoff + $vec3[0]; - $poly[5] = $yoff + $vec3[1]; - $poly[6] = $xoff + $vec4[0]; - $poly[7] = $yoff + $vec4[1]; - - return $poly; - } - - /** - * dimensions - */ - public function dimensions($size) - { - $xn = $this->scale($this->basis_matrix[$this->x], -($this->bitmap_width / 2) * $size); - $xp = $this->scale($this->basis_matrix[$this->x], ($this->bitmap_width / 2) * $size); - $yn = $this->scale($this->basis_matrix[$this->y], -($this->bitmap_height / 2) * $size); - $yp = $this->scale($this->basis_matrix[$this->y], ($this->bitmap_height / 2) * $size); - - $p = array(); - $p[0] = self::sum2($xn, $yn); - $p[1] = self::sum2($xp, $yn); - $p[2] = self::sum2($xp, $yp); - $p[3] = self::sum2($xn, $yp); - - $min_x = $max_x = $p[0][0]; - $min_y = $max_y = $p[0][1]; - - for ($i = 1; $i < 4; ++$i) - { - $min_x = ($min_x > $p[$i][0]) ? $p[$i][0] : $min_x; - $min_y = ($min_y > $p[$i][1]) ? $p[$i][1] : $min_y; - $max_x = ($max_x < $p[$i][0]) ? $p[$i][0] : $max_x; - $max_y = ($max_y < $p[$i][1]) ? $p[$i][1] : $max_y; - } - - return array($min_x, $min_y, $max_x, $max_y); - } -} - -/** -* @package VC -*/ -class colour_manager -{ - private $img; - private $mode; - private $colours; - private $named_colours; - - /** - * Create the colour manager, link it to the image resource - */ - function __construct($img, $background = false, $mode = 'ahsv') - { - $this->img = $img; - $this->mode = $mode; - $this->colours = array(); - $this->named_colours = array(); - - if ($background !== false) - { - $bg = $this->allocate_named('background', $background); - imagefill($this->img, 0, 0, $bg); - } - } - - /** - * Lookup a named colour resource - */ - public function get_resource($named_colour) - { - if (isset($this->named_colours[$named_colour])) - { - return $this->named_colours[$named_colour]; - } - - if (isset($this->named_rgb[$named_colour])) - { - return $this->allocate_named($named_colour, $this->named_rgb[$named_colour], 'rgb'); - } - - return false; - } - - /** - * Assign a name to a colour resource - */ - private function name_colour($name, $resource) - { - $this->named_colours[$name] = $resource; - } - - /** - * names and allocates a colour resource - */ - private function allocate_named($name, $colour, $mode = false) - { - $resource = $this->allocate($colour, $mode); - - if ($resource !== false) - { - $this->name_colour($name, $resource); - } - return $resource; - } - - /** - * allocates a specified colour into the image - */ - private function allocate($colour, $mode = false) - { - if ($mode === false) - { - $mode = $this->mode; - } - - if (!is_array($colour)) - { - if (isset($this->named_rgb[$colour])) - { - return $this->allocate_named($colour, $this->named_rgb[$colour], 'rgb'); - } - - if (!is_int($colour)) - { - return false; - } - - $mode = 'rgb'; - $colour = array(255 & ($colour >> 16), 255 & ($colour >> 8), 255 & $colour); - } - - if (isset($colour['mode'])) - { - $mode = $colour['mode']; - unset($colour['mode']); - } - - if (isset($colour['random'])) - { - unset($colour['random']); - // everything else is params - return $this->random_colour($colour, $mode); - } - - $rgb = colour_manager::model_convert($colour, $mode, 'rgb'); - $store = ($this->mode == 'rgb') ? $rgb : colour_manager::model_convert($colour, $mode, $this->mode); - $resource = imagecolorallocate($this->img, $rgb[0], $rgb[1], $rgb[2]); - $this->colours[$resource] = $store; - - return $resource; - } - - /** - * randomly generates a colour, with optional params - */ - private function random_colour($params = array(), $mode = false) - { - if ($mode === false) - { - $mode = $this->mode; - } - - switch ($mode) - { - case 'rgb': - // @TODO random rgb generation. do we intend to do this, or is it just too tedious? - break; - - case 'ahsv': - case 'hsv': - default: - - $default_params = array( - 'hue_bias' => false, // degree / 'r'/'g'/'b'/'c'/'m'/'y' /'o' - 'hue_range' => false, // if hue bias, then difference range +/- from bias - 'min_saturation' => 30, // 0 - 100 - 'max_saturation' => 80, // 0 - 100 - 'min_value' => 30, // 0 - 100 - 'max_value' => 80, // 0 - 100 - ); - - $alt = ($mode == 'ahsv') ? true : false; - $params = array_merge($default_params, $params); - - $min_hue = 0; - $max_hue = 359; - $min_saturation = max(0, $params['min_saturation']); - $max_saturation = min(100, $params['max_saturation']); - $min_value = max(0, $params['min_value']); - $max_value = min(100, $params['max_value']); - - if ($params['hue_bias'] !== false) - { - if (is_numeric($params['hue_bias'])) - { - $h = intval($params['hue_bias']) % 360; - } - else - { - switch ($params['hue_bias']) - { - case 'o': - $h = $alt ? 60 : 30; - break; - - case 'y': - $h = $alt ? 120 : 60; - break; - - case 'g': - $h = $alt ? 180 : 120; - break; - - case 'c': - $h = $alt ? 210 : 180; - break; - - case 'b': - $h = 240; - break; - - case 'm': - $h = 300; - break; - - case 'r': - default: - $h = 0; - break; - } - } - - $min_hue = $h + 360; - $max_hue = $h + 360; - - if ($params['hue_range']) - { - $min_hue -= min(180, $params['hue_range']); - $max_hue += min(180, $params['hue_range']); - } - } - - $h = mt_rand($min_hue, $max_hue); - $s = mt_rand($min_saturation, $max_saturation); - $v = mt_rand($min_value, $max_value); - - return $this->allocate(array($h, $s, $v), $mode); - - break; - } - } - - /** - */ - public function colour_scheme($resource, $include_original = true) - { - $mode = 'hsv'; - - if (($pre = $this->get_resource($resource)) !== false) - { - $resource = $pre; - } - - $colour = colour_manager::model_convert($this->colours[$resource], $this->mode, $mode); - $results = ($include_original) ? array($resource) : array(); - $colour2 = $colour3 = $colour4 = $colour; - $colour2[0] += 150; - $colour3[0] += 180; - $colour4[0] += 210; - - - $results[] = $this->allocate($colour2, $mode); - $results[] = $this->allocate($colour3, $mode); - $results[] = $this->allocate($colour4, $mode); - - return $results; - } - - /** - */ - public function mono_range($resource, $count = 5, $include_original = true) - { - if (is_array($resource)) - { - $results = array(); - for ($i = 0, $size = sizeof($resource); $i < $size; ++$i) - { - $results = array_merge($results, $this->mono_range($resource[$i], $count, $include_original)); - } - return $results; - } - - $mode = (in_array($this->mode, array('hsv', 'ahsv'), true) ? $this->mode : 'ahsv'); - if (($pre = $this->get_resource($resource)) !== false) - { - $resource = $pre; - } - - $colour = colour_manager::model_convert($this->colours[$resource], $this->mode, $mode); - - $results = array(); - if ($include_original) - { - $results[] = $resource; - $count--; - } - - // This is a hard problem. I chicken out and try to maintain readability at the cost of less randomness. - - while ($count > 0) - { - $colour[1] = ($colour[1] + mt_rand(40,60)) % 99; - $colour[2] = ($colour[2] + mt_rand(40,60)); - $results[] = $this->allocate($colour, $mode); - $count--; - } - return $results; - } - - /** - * Convert from one colour model to another - */ - private static function model_convert($colour, $from_model, $to_model) - { - if ($from_model == $to_model) - { - return $colour; - } - - switch ($to_model) - { - case 'hsv': - - switch ($from_model) - { - case 'ahsv': - return colour_manager::ah2h($colour); - break; - - case 'rgb': - return colour_manager::rgb2hsv($colour); - break; - } - break; - - case 'ahsv': - - switch ($from_model) - { - case 'hsv': - return colour_manager::h2ah($colour); - break; - - case 'rgb': - return colour_manager::h2ah(colour_manager::rgb2hsv($colour)); - break; - } - break; - - case 'rgb': - switch ($from_model) - { - case 'hsv': - return colour_manager::hsv2rgb($colour); - break; - - case 'ahsv': - return colour_manager::hsv2rgb(colour_manager::ah2h($colour)); - break; - } - break; - } - return false; - } - - /** - * Slightly altered from wikipedia's algorithm - */ - private static function hsv2rgb($hsv) - { - colour_manager::normalize_hue($hsv[0]); - - $h = $hsv[0]; - $s = min(1, max(0, $hsv[1] / 100)); - $v = min(1, max(0, $hsv[2] / 100)); - - // calculate hue sector - $hi = floor($hsv[0] / 60); - - // calculate opposite colour - $p = $v * (1 - $s); - - // calculate distance between hex vertices - $f = ($h / 60) - $hi; - - // coming in or going out? - if (!($hi & 1)) - { - $f = 1 - $f; - } - - // calculate adjacent colour - $q = $v * (1 - ($f * $s)); - - switch ($hi) - { - case 0: - $rgb = array($v, $q, $p); - break; - - case 1: - $rgb = array($q, $v, $p); - break; - - case 2: - $rgb = array($p, $v, $q); - break; - - case 3: - $rgb = array($p, $q, $v); - break; - - case 4: - $rgb = array($q, $p, $v); - break; - - case 5: - $rgb = array($v, $p, $q); - break; - - default: - return array(0, 0, 0); - break; - } - - return array(255 * $rgb[0], 255 * $rgb[1], 255 * $rgb[2]); - } - - /** - * (more than) Slightly altered from wikipedia's algorithm - */ - private static function rgb2hsv($rgb) - { - $r = min(255, max(0, $rgb[0])); - $g = min(255, max(0, $rgb[1])); - $b = min(255, max(0, $rgb[2])); - $max = max($r, $g, $b); - $min = min($r, $g, $b); - - $v = $max / 255; - $s = (!$max) ? 0 : 1 - ($min / $max); - - // if max - min is 0, we want hue to be 0 anyway. - $h = $max - $min; - - if ($h) - { - switch ($max) - { - case $g: - $h = 120 + (60 * ($b - $r) / $h); - break; - - case $b: - $h = 240 + (60 * ($r - $g) / $h); - break; - - case $r: - $h = 360 + (60 * ($g - $b) / $h); - break; - } - } - colour_manager::normalize_hue($h); - - return array($h, $s * 100, $v * 100); - } - - /** - */ - private static function normalize_hue(&$hue) - { - $hue %= 360; - - if ($hue < 0) - { - $hue += 360; - } - } - - /** - * Alternate hue to hue - */ - private static function ah2h($ahue) - { - if (is_array($ahue)) - { - $ahue[0] = colour_manager::ah2h($ahue[0]); - return $ahue; - } - colour_manager::normalize_hue($ahue); - - // blue through red is already ok - if ($ahue >= 240) - { - return $ahue; - } - - // ahue green is at 180 - if ($ahue >= 180) - { - // return (240 - (2 * (240 - $ahue))); - return (2 * $ahue) - 240; // equivalent - } - - // ahue yellow is at 120 (RYB rather than RGB) - if ($ahue >= 120) - { - return $ahue - 60; - } - - return $ahue / 2; - } - - /** - * hue to Alternate hue - */ - private static function h2ah($hue) - { - if (is_array($hue)) - { - $hue[0] = colour_manager::h2ah($hue[0]); - return $hue; - } - colour_manager::normalize_hue($hue); - - // blue through red is already ok - if ($hue >= 240) - { - return $hue; - } - else if ($hue <= 60) - { - return $hue * 2; - } - else if ($hue <= 120) - { - return $hue + 60; - } - else - { - return ($hue + 240) / 2; - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/captcha/captcha_non_gd.php b/phpBB/includes/captcha/captcha_non_gd.php deleted file mode 100644 index 978aaa575f..0000000000 --- a/phpBB/includes/captcha/captcha_non_gd.php +++ /dev/null @@ -1,384 +0,0 @@ - $offset_y && $i < $offset_y + $img_height) - { - for ($j = 0; $j < $offset_x; $j++) - { - $image .= chr(mt_rand(140, 255)); - } - - for ($j = 0; $j < $code_len; $j++) - { - $image .= self::randomise(substr($hold_chars[$code{$j}][$i - $offset_y - 1], 1), $char_widths[$j]); - } - - for ($j = $offset_x + $img_width; $j < self::width; $j++) - { - $image .= chr(mt_rand(140, 255)); - } - } - else - { - for ($j = 0; $j < $this->width; $j++) - { - $image .= chr(mt_rand(140, 255)); - } - } - } - unset($hold_chars); - - $image = self::create_png($image, $this->width, $this->height); - - // Output image - header('Content-Type: image/png'); - header('Cache-control: no-cache, no-store'); - echo $image; - } - - /** - * This is designed to randomise the pixels of the image data within - * certain limits so as to keep it readable. It also varies the image - * width a little - */ - private static function randomise($scanline, $width) - { - $new_line = ''; - - $end = strlen($scanline) - ceil($width / 2); - for ($i = $width >> 1; $i < $end; $i++) - { - $pixel = ord($scanline[$i]); - - if ($pixel < 190) - { - $new_line .= chr(mt_rand(0, 205)); - } - else if ($pixel > 190) - { - $new_line .= chr(mt_rand(145, 255)); - } - else - { - $new_line .= $scanline{$i}; - } - } - - return $new_line; - } - - /** - * This creates a chunk of the given type, with the given data - * of the given length adding the relevant crc - */ - private static function png_chunk($length, $type, $data) - { - $raw = $type . $data; - - return pack('N', $length) . $raw . pack('N', crc32($raw)); - } - - /** - * Creates greyscale 8bit png - The PNG spec can be found at - * http://www.libpng.org/pub/png/spec/PNG-Contents.html we use - * png because it's a fully recognised open standard and supported - * by practically all modern browsers and OSs - */ - function create_png($raw_image, $width, $height) - { - // SIG - $image = pack('C8', 137, 80, 78, 71, 13, 10, 26, 10); - - // IHDR - $raw = pack('N2', $width, $height); - $raw .= pack('C5', 8, 0, 0, 0, 0); - $image .= self::png_chunk(13, 'IHDR', $raw); - - // IDAT - if (@extension_loaded('zlib')) - { - $raw_image = gzcompress($raw_image); - $length = strlen($raw_image); - } - else - { - // The total length of this image, uncompressed, is just a calculation of pixels - $length = ($width + 1) * $height; - - // Adler-32 hash generation - // Note: The hash is _backwards_ so we must reverse it - - if (@extension_loaded('hash')) - { - $adler_hash = strrev(hash('adler32', $raw_image, true)); - } - else if (@extension_loaded('mhash')) - { - $adler_hash = strrev(mhash(MHASH_ADLER32, $raw_image)); - } - else - { - // Optimized Adler-32 loop ported from the GNU Classpath project - $temp_length = $length; - $s1 = 1; - $s2 = $index = 0; - - while ($temp_length > 0) - { - // We can defer the modulo operation: - // s1 maximally grows from 65521 to 65521 + 255 * 3800 - // s2 maximally grows by 3800 * median(s1) = 2090079800 < 2^31 - $substract_value = ($temp_length < 3800) ? $temp_length : 3800; - $temp_length -= $substract_value; - - while (--$substract_value >= 0) - { - $s1 += ord($raw_image[$index]); - $s2 += $s1; - - $index++; - } - - $s1 %= 65521; - $s2 %= 65521; - } - $adler_hash = pack('N', ($s2 << 16) | $s1); - } - - // This is the same thing as gzcompress($raw_image, 0) but does not need zlib - $raw_image = pack('C3v2', 0x78, 0x01, 0x01, $length, ~$length) . $raw_image . $adler_hash; - - // The Zlib header + Adler hash make us add on 11 - $length += 11; - } - - // IDAT - $image .= self::png_chunk($length, 'IDAT', $raw_image); - - // IEND - $image .= self::png_chunk(0, 'IEND', ''); - - return $image; - } - - /** - * png image data - * Each 'data' element is base64_encoded uncompressed IDAT - */ - private static function define_filtered_pngs() - { - $this->filtered_pngs = array( - '0' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A///////////////////olFAkBAAAGDyA4P///M31/////////////wD////////////////0dAgAAAAAAAAAAAAEcPipFGHn////////////AP//////////////6DAAAAAAAAAAAAAAAAAALSEAN+T///////////8A//////////////xAAAAAAAAAAAAAAAAAAAAAACPA/////////////wD/////////////oAAAAAAAAAAAAAAAAAAAAAAAev//////////////AP////////////8oAAAAAAAAPNj/zDAAAAAAAABD//////////////8A////////////1AAAAAAAABjw////5BAAAAAAAADo/////////////wD///////////+QAAAAAAAAbP//////QgAAAAAAAKj/////////////AP///////////1wAAAAAAACs/////8AXAAAAAAAAcP////////////8A////////////OAAAAAAAAND////dNwAAAAAAAABI/////////////wD///////////8gAAAAAAAA4P//7koACwAAAAAAACT/////////////AP///////////wgAAAAAAAD///VqAwaPAAAAAAAAEP////////////8A////////////AAAAAAAAAP/8kQYDavUAAAAAAAAA/////////////wD///////////8AAAAAAAAA/6kNAEru/wAAAAAAAAD/////////////AP///////////wAAAAAAAADAIwA33f//AAAAAAAAAP////////////8A////////////FAAAAAAAADYAI8D///8AAAAAAAAQ/////////////wD///////////8kAAAAAAAAAA2p////5AAAAAAAACD/////////////AP///////////0gAAAAAAAAFkfz////UAAAAAAAAQP////////////8A////////////cAAAAAAAAET1/////7AAAAAAAABo/////////////wD///////////+oAAAAAAAAXfX/////sAAAAAAAAGj/////////////AAAAALgAAAAAAAAwAAAAAAAAAAAAAAD////////////oAAAAAAAACOT////oEAAAAAAAAOD/////////////AP////////////8+AAAAAAAAKMz/zDQAAAAAAAA0//////////////8A////////////7jgAAAAAAAAAAAAAAAAAAAAAAKT//////////////wD///////////VqAwIAAAAAAAAAAAAAAAAAAAA8////////////////AP//////////rQcDaVEAAAAAAAAAAAAAAAAAKOj///////////////8A///////////nblnu/IAIAAAAAAAAAAAAAFzw/////////////////wD////////////79////+iITCAAAAAgSITg////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////w==', - 'width' => 40 - ), - '1' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////8BAAAAAAAP//////////////////AP////////////////////////9sAAAAAAAA//////////////////8A////////////////////////pAAAAAAAAAD//////////////////wD//////////////////////6wEAAAAAAAAAP//////////////////AP////////////////////h4AAAAAAAAAAAA//////////////////8A//////////////////ygJAAAAAAAAAAAAAD//////////////////wD//////////////9x8HAAAAAAAAAAAAAAAAP//////////////////AP//////////////AAAAAAAAAAAAAAAAAAAA//////////////////8A//////////////8AAAAAAAAAAAAAAAAAAAD//////////////////wD//////////////wAAAAAAAAR4AAAAAAAAAP//////////////////AP//////////////AAAAAAA4zP8AAAAAAAAA//////////////////8A//////////////8AAAA4sP///wAAAAAAAAD//////////////////wD//////////////yR80P//////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - '2' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP/////////////////okFAkCAAABCBIfNT///////////////////8A///////////////8hAgAAAAAAAAAAAAAAFTo/////////////////wD//////////////1QAAAAAAAAAAAAAAAAAACjo////////////////AP////////////+MAAAAAAAAAAAAAAAAAAAAADj///////////////8A////////////9BAAAAAAAAAAAAAAAAAAAAAAALD//////////////wD///////////+gAAAAAAAAAHjs+KwMAAAAAAAAVP//////////////AP///////////1gAAAAAAABM/////6QAAAAAAAAU//////////////8A////////////KAAAAAAAALj/////+AAAAAAAAAD//////////////wD///////////+MfGBMOCAI8P/////wAAAAAAAACP//////////////AP///////////////////////////5wAAAAAAAAw//////////////8A///////////////////////////oFAAAAAAAAHz//////////////wD/////////////////////////6CgAAAAAAAAE3P//////////////AP///////////////////////9ggAAAAAAAAAHT///////////////8A//////////////////////+0DAAAAAAAAAA8+P///////////////wD/////////////////////gAAAAAAAAAAAKOj/////////////////AP//////////////////9FAAAAAAAAAAADzw//////////////////8A/////////////////+g4AAAAAAAAAABk/P///////////////////wD////////////////oKAAAAAAAAAAMqP//////////////////////AP//////////////6CgAAAAAAAAAMNz///////////////////////8A//////////////g4AAAAAAAAAFT0/////////////////////////wD/////////////bAAAAAAAAABU/P//////////////////////////AP///////////8wAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A////////////SAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////9wAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////hAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////9AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////xAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - '3' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD////////////////8sGg0FAAAACA4cLz8////////////////////AP//////////////rBgAAAAAAAAAAAAAACTA//////////////////8A/////////////3QAAAAAAAAAAAAAAAAAAASs/////////////////wD///////////+YAAAAAAAAAAAAAAAAAAAAAAjc////////////////AP//////////6AwAAAAAAAAAAAAAAAAAAAAAAGT///////////////8A//////////94AAAAAAAABJDw/8g4AAAAAAAAHP///////////////wD//////////yAAAAAAAACE/////9gAAAAAAAAA////////////////AP///////////NSwiGQ4FOT//////AAAAAAAABD///////////////8A//////////////////////////+YAAAAAAAAVP///////////////wD//////////////////////P/ggAQAAAAAAATM////////////////AP////////////////////9gAAAAAAAAAAAElP////////////////8A/////////////////////0AAAAAAAAAAHLj//////////////////wD/////////////////////OAAAAAAAAAAwkPj/////////////////AP////////////////////8gAAAAAAAAAAAAINj///////////////8A/////////////////////xAAAAAAAAAAAAAAIPD//////////////wD/////////////////////uOz/4HgEAAAAAAAAhP//////////////AP///////////////////////////3wAAAAAAAAw//////////////8A////////////////////////////6AAAAAAAAAj//////////////wD/////////////////////////////AAAAAAAAAP//////////////AP//////////tJh8YEQoDNz//////+AAAAAAAAAY//////////////8A//////////88AAAAAAAAaP//////dAAAAAAAAEz//////////////wD//////////6QAAAAAAAAAdOD/5HQAAAAAAAAApP//////////////AP///////////CgAAAAAAAAAAAAAAAAAAAAAACD4//////////////8A////////////yAQAAAAAAAAAAAAAAAAAAAAEuP///////////////wD/////////////rAQAAAAAAAAAAAAAAAAABJD/////////////////AP//////////////zDQAAAAAAAAAAAAAACTA//////////////////8A/////////////////8BwOCAAAAAUNGi0/P///////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - '4' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////////////////////nAAAAAAAAAD///////////////8A/////////////////////////8AEAAAAAAAAAP///////////////wD////////////////////////gGAAAAAAAAAAA////////////////AP//////////////////////9DAAAAAAAAAAAAD///////////////8A//////////////////////9UAAAAAAAAAAAAAP///////////////wD/////////////////////hAAAAAAAAAAAAAAA////////////////AP///////////////////7QAAAAAAAAAAAAAAAD///////////////8A///////////////////UDAAAAAAUAAAAAAAAAP///////////////wD/////////////////7CQAAAAABMAAAAAAAAAA////////////////AP////////////////xEAAAAAACU/wAAAAAAAAD///////////////8A////////////////cAAAAAAAZP//AAAAAAAAAP///////////////wD//////////////6AAAAAAADz8//8AAAAAAAAA////////////////AP/////////////IBAAAAAAc6P///wAAAAAAAAD///////////////8A////////////5BgAAAAADMz/////AAAAAAAAAP///////////////wD///////////g0AAAAAACk//////8AAAAAAAAA////////////////AP//////////XAAAAAAAfP///////wAAAAAAAAD///////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A////////////////////////////AAAAAAAAAP///////////////wD///////////////////////////8AAAAAAAAA////////////////AP///////////////////////////wAAAAAAAAD///////////////8A////////////////////////////AAAAAAAAAP///////////////wD///////////////////////////8AAAAAAAAA////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - '5' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////////8AAAAAAAAAAAAAAAAAAAAAAA//////////////8A///////////////MAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////////6wAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////////iAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////////9kAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////////0QAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////////IAAAAAAAYP////////////////////////////8A//////////////wAAAAAAAB8/////////////////////////////wD/////////////3AAAAAAAAIj/////////////////////////////AP////////////+4AAAAAAAAoLRYHAAEKGTE//////////////////8A/////////////5QAAAAAAAAQAAAAAAAAAABY9P///////////////wD/////////////dAAAAAAAAAAAAAAAAAAAAAA89P//////////////AP////////////9QAAAAAAAAAAAAAAAAAAAAAABg//////////////8A/////////////zAAAAAAAAAAAAAAAAAAAAAAAADQ/////////////wD/////////////IAAAAAAAAGjY/+h4BAAAAAAAAGz/////////////AP//////////////9NS0lHSc//////90AAAAAAAALP////////////8A/////////////////////////////9QAAAAAAAAE/////////////wD//////////////////////////////wAAAAAAAAD/////////////AP/////////////////////////////8AAAAAAAAEP////////////8A////////////pIRwWEAgDOD//////8wAAAAAAAA8/////////////wD///////////9EAAAAAAAAaP//////ZAAAAAAAAHz/////////////AP///////////6QAAAAAAAAAaOD/4GQAAAAAAAAE4P////////////8A/////////////CQAAAAAAAAAAAAAAAAAAAAAAGD//////////////wD/////////////yAQAAAAAAAAAAAAAAAAAAAAc7P//////////////AP//////////////rAwAAAAAAAAAAAAAAAAAGNj///////////////8A////////////////0EAAAAAAAAAAAAAAAFTo/////////////////wD//////////////////8h4QCAAAAAcQHzU////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - '6' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////////////+0ZCwMAAAUNGjI////////////////////AP/////////////////EMAAAAAAAAAAAAABM6P////////////////8A////////////////lAQAAAAAAAAAAAAAAAAo6P///////////////wD//////////////6wAAAAAAAAAAAAAAAAAAABI////////////////AP/////////////oEAAAAAAAAAAAAAAAAAAAAACw//////////////8A/////////////3AAAAAAAAAoxP/YPAAAAAAAAEj//////////////wD////////////4EAAAAAAACOD////YDCBAVGiAoP//////////////AP///////////7gAAAAAAABY//////////////////////////////8A////////////eAAAAAAAAJT//////////////////////////////wD///////////9MAAAAAAAAvP/IXBgABCx03P//////////////////AP///////////ygAAAAAAADcdAAAAAAAAAAEiP////////////////8A////////////FAAAAAAAAFAAAAAAAAAAAAAAcP///////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAlP//////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAQ8P////////////8A////////////AAAAAAAAAABAyP/kZAAAAAAAAACQ/////////////wD///////////8MAAAAAAAALPj/////WAAAAAAAAET/////////////AP///////////yQAAAAAAACY///////MAAAAAAAAFP////////////8A////////////SAAAAAAAAMD///////wAAAAAAAAA/////////////wD///////////9wAAAAAAAAvP///////wAAAAAAAAD/////////////AP///////////7QAAAAAAACI///////UAAAAAAAAJP////////////8A////////////+AwAAAAAACDw/////2wAAAAAAABY/////////////wD/////////////cAAAAAAAADC8/Ox4AAAAAAAAAKj/////////////AP/////////////oEAAAAAAAAAAAAAAAAAAAAAAk/P////////////8A//////////////+oAAAAAAAAAAAAAAAAAAAABLj//////////////wD///////////////+QAAAAAAAAAAAAAAAAAACQ////////////////AP////////////////+0JAAAAAAAAAAAAAAkuP////////////////8A///////////////////8sGg0FAAADCxgqPz//////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - '7' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAABP////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAy4/////////////wD//////////////////////////+QUAAAAAAAEuP//////////////AP/////////////////////////8QAAAAAAAAKT///////////////8A/////////////////////////4wAAAAAAAB0/////////////////wD////////////////////////cCAAAAAAANPz/////////////////AP///////////////////////0QAAAAAAATY//////////////////8A//////////////////////+0AAAAAAAAeP///////////////////wD//////////////////////CQAAAAAABTw////////////////////AP////////////////////+gAAAAAAAAkP////////////////////8A/////////////////////ywAAAAAABDw/////////////////////wD///////////////////+4AAAAAAAAbP//////////////////////AP///////////////////1wAAAAAAADQ//////////////////////8A///////////////////4DAAAAAAAMP///////////////////////wD//////////////////7QAAAAAAAB8////////////////////////AP//////////////////aAAAAAAAAMj///////////////////////8A//////////////////8oAAAAAAAM/P///////////////////////wD/////////////////8AAAAAAAAET/////////////////////////AP////////////////+0AAAAAAAAcP////////////////////////8A/////////////////4wAAAAAAACY/////////////////////////wD/////////////////WAAAAAAAAMD/////////////////////////AP////////////////80AAAAAAAA4P////////////////////////8A/////////////////xAAAAAAAAD4/////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - '8' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD////////////////////IdDQUAAAEIEiA1P//////////////////AP/////////////////gRAAAAAAAAAAAAAAAROD///////////////8A////////////////0BgAAAAAAAAAAAAAAAAAEMj//////////////wD///////////////AcAAAAAAAAAAAAAAAAAAAAHPD/////////////AP//////////////hAAAAAAAAAAAAAAAAAAAAAAAhP////////////8A//////////////8sAAAAAAAAKMz/zCgAAAAAAAAs/////////////wD//////////////wAAAAAAAADM////zAAAAAAAAAD/////////////AP//////////////BAAAAAAAAP//////AAAAAAAABP////////////8A//////////////8sAAAAAAAAzP///9QAAAAAAAAw/////////////wD//////////////3wAAAAAAAAoyP/YNAAAAAAAAIT/////////////AP//////////////7BgAAAAAAAAAAAAAAAAAAAAc8P////////////8A////////////////xBgAAAAAAAAAAAAAAAAAGNj//////////////wD/////////////////tAQAAAAAAAAAAAAAAACo////////////////AP///////////////HAAAAAAAAAAAAAAAAAAAAB8//////////////8A//////////////9gAAAAAAAAAAAAAAAAAAAAAAB8/////////////wD/////////////wAAAAAAAAABk4P/UWAAAAAAAAATQ////////////AP////////////9UAAAAAAAAaP//////XAAAAAAAAGT///////////8A/////////////xgAAAAAAADg///////cAAAAAAAAJP///////////wD/////////////AAAAAAAAAP////////8AAAAAAAAA////////////AP////////////8AAAAAAAAA4P//////3AAAAAAAAAT///////////8A/////////////ygAAAAAAABg//////9cAAAAAAAALP///////////wD/////////////ZAAAAAAAAABY1P/cXAAAAAAAAABw////////////AP/////////////QAAAAAAAAAAAAAAAAAAAAAAAABNz///////////8A//////////////9gAAAAAAAAAAAAAAAAAAAAAAB0/////////////wD///////////////Q8AAAAAAAAAAAAAAAAAAAAUPz/////////////AP////////////////x4CAAAAAAAAAAAAAAAEIT8//////////////8A///////////////////smFQwGAAAABg0ZKT0/////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - '9' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////////////ysYCwMAAAUNGiw/P//////////////////AP////////////////+4JAAAAAAAAAAAAAAkuP////////////////8A////////////////lAQAAAAAAAAAAAAAAAAAkP///////////////wD//////////////8AEAAAAAAAAAAAAAAAAAAAAqP//////////////AP/////////////8JAAAAAAAAAAAAAAAAAAAAAAQ7P////////////8A/////////////6wAAAAAAAAAfOz8vCwAAAAAAABw/////////////wD/////////////WAAAAAAAAHD/////7BgAAAAAAAz4////////////AP////////////8kAAAAAAAA1P//////hAAAAAAAALT///////////8A/////////////wAAAAAAAAD///////+4AAAAAAAAcP///////////wD/////////////AAAAAAAAAPz//////8AAAAAAAABI////////////AP////////////8UAAAAAAAAzP//////lAAAAAAAACT///////////8A/////////////0QAAAAAAABY//////gsAAAAAAAADP///////////wD/////////////kAAAAAAAAABw5P/IPAAAAAAAAAAA////////////AP/////////////wEAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A//////////////+UAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD///////////////9wAAAAAAAAAAAAAFAAAAAAAAAU////////////AP////////////////+IBAAAAAAAAABw3AAAAAAAACj///////////8A///////////////////cdCwEABhcxP+8AAAAAAAATP///////////wD//////////////////////////////5AAAAAAAAB4////////////AP//////////////////////////////UAAAAAAAALj///////////8A//////////////+kgGxUQCAM2P///+AIAAAAAAAQ+P///////////wD//////////////0gAAAAAAAA42P/EKAAAAAAAAHD/////////////AP//////////////sAAAAAAAAAAAAAAAAAAAAAAQ6P////////////8A////////////////TAAAAAAAAAAAAAAAAAAAAKz//////////////wD////////////////oKAAAAAAAAAAAAAAAAASU////////////////AP/////////////////sUAAAAAAAAAAAAAAwxP////////////////8A////////////////////yHA0FAAADCxktP///////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'A' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD//////////////////+QAAAAAAAAAAAAAAOT/////////////////AP//////////////////kAAAAAAAAAAAAAAAkP////////////////8A//////////////////88AAAAAAAAAAAAAAA8/////////////////wD/////////////////5AAAAAAAAAAAAAAAAADk////////////////AP////////////////+QAAAAAAAAAAAAAAAAAJD///////////////8A/////////////////zwAAAAAAAAAAAAAAAAAPP///////////////wD////////////////kAAAAAAAAAAgAAAAAAAAA5P//////////////AP///////////////5AAAAAAAAAAgAAAAAAAAACQ//////////////8A////////////////PAAAAAAAAAz8HAAAAAAAADz//////////////wD//////////////+QAAAAAAAAAWP9kAAAAAAAAANz/////////////AP//////////////kAAAAAAAAACk/7wAAAAAAAAAhP////////////8A//////////////88AAAAAAAABOz//BQAAAAAAAAw/////////////wD/////////////4AAAAAAAAAA8////ZAAAAAAAAADc////////////AP////////////+EAAAAAAAAAIj///+8AAAAAAAAAIT///////////8A/////////////zAAAAAAAAAA2P////wQAAAAAAAAMP///////////wD////////////cAAAAAAAAACT//////1wAAAAAAAAA3P//////////AP///////////4QAAAAAAAAAAAAAAAAAAAAAAAAAAACE//////////8A////////////MAAAAAAAAAAAAAAAAAAAAAAAAAAAADD//////////wD//////////9wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANz/////////AP//////////hAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhP////////8A//////////8wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAw/////////wD/////////3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADc////////AP////////+EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIT///////8A/////////zAAAAAAAAAAhP///////////2QAAAAAAAAAMP///////wD////////cAAAAAAAAAADM////////////vAAAAAAAAAAA3P//////AP///////4QAAAAAAAAAHP/////////////4DAAAAAAAAACE//////8A////////MAAAAAAAAABk//////////////9cAAAAAAAAADD//////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'B' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAEDh83P///////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAEhP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAeP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAxP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAABY////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAABT///////////8A//////////8AAAAAAAAAAP/////4zEwAAAAAAAAAAP///////////wD//////////wAAAAAAAAAA////////7AAAAAAAAAAQ////////////AP//////////AAAAAAAAAAD////////sAAAAAAAAAEj///////////8A//////////8AAAAAAAAAAP/////4zEQAAAAAAAAAtP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAFz/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAiA/P////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAIjPj//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAGKz/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAJT///////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAABNz//////////wD//////////wAAAAAAAAAA///////sqCAAAAAAAAAAbP//////////AP//////////AAAAAAAAAAD/////////yAAAAAAAAAAs//////////8A//////////8AAAAAAAAAAP//////////AAAAAAAAAAT//////////wD//////////wAAAAAAAAAA/////////7wAAAAAAAAAAP//////////AP//////////AAAAAAAAAAD//////+ikGAAAAAAAAAAY//////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFT//////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsP//////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAADj///////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAc6P///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAATOj/////////////AP//////////AAAAAAAAAAAAAAAAAAAEIEBkkNj///////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'C' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////////////5JRULBAAAAgkTIDQ//////////////////8A////////////////1FAAAAAAAAAAAAAAAABAyP///////////////wD//////////////4gEAAAAAAAAAAAAAAAAAAAElP//////////////AP////////////9wAAAAAAAAAAAAAAAAAAAAAAAAlP////////////8A////////////kAAAAAAAAAAAAAAAAAAAAAAAAAAEyP///////////wD//////////9wIAAAAAAAAAAAAAAAAAAAAAAAAAAAw////////////AP//////////WAAAAAAAAAAAWMz/8JwQAAAAAAAAAACw//////////8A/////////+wEAAAAAAAAAID//////9QMAAAAAAAAAET//////////wD/////////nAAAAAAAAAAo/P///////3wAAAAABDBspP//////////AP////////9gAAAAAAAAAIz/////////3BxQjMT0//////////////8A/////////zQAAAAAAAAAzP///////////////////////////////wD/////////GAAAAAAAAADo////////////////////////////////AP////////8AAAAAAAAAAP////////////////////////////////8A/////////wAAAAAAAAAA/////////////////////////////////wD/////////AAAAAAAAAAD/////////////////////////////////AP////////8cAAAAAAAAAOj///////////////////////////////8A/////////zgAAAAAAAAA0P/////////kIGio7P///////////////wD/////////bAAAAAAAAACg/////////5wAAAAAMHS49P//////////AP////////+oAAAAAAAAAEz/////////PAAAAAAAAAAc//////////8A//////////QIAAAAAAAAALz//////6QAAAAAAAAAAGT//////////wD//////////3AAAAAAAAAADIzo/+SEBAAAAAAAAAAAyP//////////AP//////////7BAAAAAAAAAAAAAAAAAAAAAAAAAAAED///////////8A////////////rAAAAAAAAAAAAAAAAAAAAAAAAAAE0P///////////wD/////////////fAAAAAAAAAAAAAAAAAAAAAAAAJz/////////////AP//////////////iAQAAAAAAAAAAAAAAAAAAASY//////////////8A////////////////yEAAAAAAAAAAAAAAAAA8yP///////////////wD//////////////////9yIUCwQAAAAIEB4yP//////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'D' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////8AAAAAAAAAAAAAAAAADChQkOT/////////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAABGjw//////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAACDY/////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAABjk////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAED///////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAKj//////////wD///////////8AAAAAAAAAAP///+isSAAAAAAAAAAANP//////////AP///////////wAAAAAAAAAA////////hAAAAAAAAAAA2P////////8A////////////AAAAAAAAAAD/////////MAAAAAAAAACQ/////////wD///////////8AAAAAAAAAAP////////+MAAAAAAAAAFj/////////AP///////////wAAAAAAAAAA/////////8gAAAAAAAAAMP////////8A////////////AAAAAAAAAAD/////////5AAAAAAAAAAY/////////wD///////////8AAAAAAAAAAP//////////AAAAAAAAAAD/////////AP///////////wAAAAAAAAAA//////////8AAAAAAAAAAP////////8A////////////AAAAAAAAAAD//////////wAAAAAAAAAA/////////wD///////////8AAAAAAAAAAP/////////wAAAAAAAAABD/////////AP///////////wAAAAAAAAAA/////////9QAAAAAAAAAJP////////8A////////////AAAAAAAAAAD/////////qAAAAAAAAABI/////////wD///////////8AAAAAAAAAAP////////9QAAAAAAAAAHj/////////AP///////////wAAAAAAAAAA////////uAAAAAAAAAAAvP////////8A////////////AAAAAAAAAAD////w0HwEAAAAAAAAACT8/////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAoP//////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAADz8//////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAY6P///////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAKNz/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAACHT0//////////////8A////////////AAAAAAAAAAAAAAAAABg4bKj0/////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'E' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP//////////AAAAAAAAAAD///////////////////////////////8A//////////8AAAAAAAAAAP///////////////////////////////wD//////////wAAAAAAAAAA////////////////////////////////AP//////////AAAAAAAAAAD///////////////////////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////8AAAAAAAAAAP///////////////////////////////wD//////////wAAAAAAAAAA////////////////////////////////AP//////////AAAAAAAAAAD///////////////////////////////8A//////////8AAAAAAAAAAP///////////////////////////////wD//////////wAAAAAAAAAA////////////////////////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'F' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'G' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD//////////////////MB8TCgQAAAACCA4YJzs////////////////AP///////////////JQcAAAAAAAAAAAAAAAAAAhw8P////////////8A/////////////9gwAAAAAAAAAAAAAAAAAAAAAAAk2P///////////wD////////////EDAAAAAAAAAAAAAAAAAAAAAAAAAAc7P//////////AP//////////2AwAAAAAAAAAAAAAAAAAAAAAAAAAAABY//////////8A//////////wwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQ/////////wD/////////kAAAAAAAAAAAEHzQ/P/gmCAAAAAAAAAAAFz/////////AP////////wcAAAAAAAAACjg////////8CwAAAAAAAAgWP////////8A////////vAAAAAAAAAAI2P//////////yBRAcJjI8P///////////wD///////94AAAAAAAAAGD/////////////////////////////////AP///////0AAAAAAAAAAsP////////////////////////////////8A////////IAAAAAAAAADc/////////////////////////////////wD///////8AAAAAAAAAAP///////wAAAAAAAAAAAAAAAAD/////////AP///////wAAAAAAAAAA////////AAAAAAAAAAAAAAAAAP////////8A////////AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAA/////////wD///////8gAAAAAAAAAOD//////wAAAAAAAAAAAAAAAAD/////////AP///////0AAAAAAAAAAtP//////AAAAAAAAAAAAAAAAAP////////8A////////cAAAAAAAAABw//////8AAAAAAAAAAAAAAAAA/////////wD///////+8AAAAAAAAABDs////////////AAAAAAAAAAD/////////AP////////wYAAAAAAAAADz0//////////AAAAAAAAAAAP////////8A/////////5AAAAAAAAAAACCY4P//3KhcCAAAAAAAAAAA/////////wD/////////+CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AP//////////xAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIP////////8A////////////rAQAAAAAAAAAAAAAAAAAAAAAAAAAAGTw/////////wD/////////////vBQAAAAAAAAAAAAAAAAAAAAAADjI////////////AP//////////////8HAQAAAAAAAAAAAAAAAAAEiw//////////////8A//////////////////iwcEAgBAAABCA4aKDk/////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'H' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'I' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'J' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAj//////////////wD//////////+zMrIxwUDAQ//////wAAAAAAAAAIP//////////////AP//////////DAAAAAAAAADo////2AAAAAAAAAA0//////////////8A//////////8wAAAAAAAAAKj///+YAAAAAAAAAFj//////////////wD//////////2gAAAAAAAAAIND/yBgAAAAAAAAAkP//////////////AP//////////vAAAAAAAAAAAAAAAAAAAAAAAAADc//////////////8A////////////MAAAAAAAAAAAAAAAAAAAAAAAUP///////////////wD////////////EBAAAAAAAAAAAAAAAAAAAABjk////////////////AP////////////+sBAAAAAAAAAAAAAAAAAAY2P////////////////8A///////////////EMAAAAAAAAAAAAAAAVOj//////////////////wD/////////////////vHBAIAAAABg8fNT/////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'K' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////8AAAAAAAAAAP//////////wAQAAAAAAAAAAABw////////AP///////wAAAAAAAAAA/////////9AMAAAAAAAAAAAAcP////////8A////////AAAAAAAAAAD////////cGAAAAAAAAAAAAHD//////////wD///////8AAAAAAAAAAP//////6CgAAAAAAAAAAABs////////////AP///////wAAAAAAAAAA//////Q0AAAAAAAAAAAAVPz///////////8A////////AAAAAAAAAAD////8RAAAAAAAAAAAAFT8/////////////wD///////8AAAAAAAAAAP///1gAAAAAAAAAAABU/P//////////////AP///////wAAAAAAAAAA//9wAAAAAAAAAAAASPz///////////////8A////////AAAAAAAAAAD/jAAAAAAAAAAAADz0/////////////////wD///////8AAAAAAAAAAKQAAAAAAAAAAAA89P//////////////////AP///////wAAAAAAAAAABAAAAAAAAAAAFPT///////////////////8A////////AAAAAAAAAAAAAAAAAAAAAAAApP///////////////////wD///////8AAAAAAAAAAAAAAAAAAAAAAAAU8P//////////////////AP///////wAAAAAAAAAAAAAAAAAAAAAAAABk//////////////////8A////////AAAAAAAAAAAAAAAAAAAAAAAAAADE/////////////////wD///////8AAAAAAAAAAAAAAAAoEAAAAAAAACz8////////////////AP///////wAAAAAAAAAAAAAAGNiAAAAAAAAAAIj///////////////8A////////AAAAAAAAAAAAABjY//gYAAAAAAAACOD//////////////wD///////8AAAAAAAAAAAAY2P///5wAAAAAAAAASP//////////////AP///////wAAAAAAAAAAGNj//////CgAAAAAAAAAqP////////////8A////////AAAAAAAAAADI////////sAAAAAAAAAAc8P///////////wD///////8AAAAAAAAAAP//////////QAAAAAAAAABs////////////AP///////wAAAAAAAAAA///////////IAAAAAAAAAATI//////////8A////////AAAAAAAAAAD///////////9YAAAAAAAAADD8/////////wD///////8AAAAAAAAAAP///////////9wEAAAAAAAAAJD/////////AP///////wAAAAAAAAAA/////////////3AAAAAAAAAADOT///////8A////////AAAAAAAAAAD/////////////7BAAAAAAAAAAUP///////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'L' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'M' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//////8AAAAAAAAAAAAAAHz//////3wAAAAAAAAAAAAAAP///////wD//////wAAAAAAAAAAAAAATP//////UAAAAAAAAAAAAAAA////////AP//////AAAAAAAAAAAAAAAc//////8cAAAAAAAAAAAAAAD///////8A//////8AAAAAAAAAAAAAAADw////8AAAAAAAAAAAAAAAAP///////wD//////wAAAAAAAAAAAAAAALz////AAAAAAAAAAAAAAAAA////////AP//////AAAAAAAAAAAAAAAAkP///5AAAAAAAAAAAAAAAAD///////8A//////8AAAAAAAAAAAAAAABc////ZAAAAAAAAAAAAAAAAP///////wD//////wAAAAAAAAAoAAAAADD///8wAAAAACQAAAAAAAAA////////AP//////AAAAAAAAAFwAAAAABPz//AgAAAAAXAAAAAAAAAD///////8A//////8AAAAAAAAAkAAAAAAA0P/UAAAAAACQAAAAAAAAAP///////wD//////wAAAAAAAADMAAAAAACg/6gAAAAAAMQAAAAAAAAA////////AP//////AAAAAAAAAPgEAAAAAHD/dAAAAAAE+AAAAAAAAAD///////8A//////8AAAAAAAAA/zQAAAAAQP9IAAAAADD/AAAAAAAAAP///////wD//////wAAAAAAAAD/bAAAAAAQ/xQAAAAAaP8AAAAAAAAA////////AP//////AAAAAAAAAP+gAAAAAADQAAAAAACc/wAAAAAAAAD///////8A//////8AAAAAAAAA/9QAAAAAAGgAAAAAAND/AAAAAAAAAP///////wD//////wAAAAAAAAD//wwAAAAAFAAAAAAM/P8AAAAAAAAA////////AP//////AAAAAAAAAP//RAAAAAAAAAAAADz//wAAAAAAAAD///////8A//////8AAAAAAAAA//94AAAAAAAAAAAAcP//AAAAAAAAAP///////wD//////wAAAAAAAAD//7AAAAAAAAAAAACo//8AAAAAAAAA////////AP//////AAAAAAAAAP//5AAAAAAAAAAAANz//wAAAAAAAAD///////8A//////8AAAAAAAAA////HAAAAAAAAAAQ////AAAAAAAAAP///////wD//////wAAAAAAAAD///9QAAAAAAAAAEz///8AAAAAAAAA////////AP//////AAAAAAAAAP///4gAAAAAAAAAfP///wAAAAAAAAD///////8A//////8AAAAAAAAA////vAAAAAAAAACw////AAAAAAAAAP///////wD//////wAAAAAAAAD////wAAAAAAAAAOz///8AAAAAAAAA////////AP//////AAAAAAAAAP////8sAAAAAAAc/////wAAAAAAAAD///////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'N' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////AAAAAAAAALD/////////////AAAAAAAAAP//////////AP////////8AAAAAAAAAFOj///////////8AAAAAAAAA//////////8A/////////wAAAAAAAAAASP///////////wAAAAAAAAD//////////wD/////////AAAAAAAAAAAAkP//////////AAAAAAAAAP//////////AP////////8AAAAAAAAAAAAI1P////////8AAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAw+P///////wAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAABw////////AAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAC8//////8AAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAAABzs/////wAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAAAAAFD/////AAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAJz///8AAAAAAAAA//////////8A/////////wAAAAAAAAAUAAAAAAAADNz//wAAAAAAAAD//////////wD/////////AAAAAAAAALQAAAAAAAAANPz/AAAAAAAAAP//////////AP////////8AAAAAAAAA/2wAAAAAAAAAfP8AAAAAAAAA//////////8A/////////wAAAAAAAAD/+CwAAAAAAAAExAAAAAAAAAD//////////wD/////////AAAAAAAAAP//0AQAAAAAAAAgAAAAAAAAAP//////////AP////////8AAAAAAAAA////jAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAD/////RAAAAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAP/////kFAAAAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAA//////+sAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAD///////9kAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAP////////QkAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAA/////////8wEAAAAAAAAAAAA//////////8A/////////wAAAAAAAAD//////////4QAAAAAAAAAAAD//////////wD/////////AAAAAAAAAP///////////DwAAAAAAAAAAP//////////AP////////8AAAAAAAAA////////////4BAAAAAAAAAA//////////8A/////////wAAAAAAAAD/////////////qAAAAAAAAAD//////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'O' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A///////////////////0qGw4HAAAABw4aKT0/////////////////wD////////////////wcAwAAAAAAAAAAAAAAAho6P//////////////AP//////////////uBQAAAAAAAAAAAAAAAAAAAAMoP////////////8A/////////////6AEAAAAAAAAAAAAAAAAAAAAAAAAkP///////////wD///////////+4BAAAAAAAAAAAAAAAAAAAAAAAAAAAoP//////////AP//////////8BQAAAAAAAAAAAAAAAAAAAAAAAAAAAAM5P////////8A//////////9wAAAAAAAAAAAsrPD/7KQsAAAAAAAAAABg/////////wD/////////+BAAAAAAAAAAUPj///////hQAAAAAAAAAAjs////////AP////////+sAAAAAAAAABDw//////////AYAAAAAAAAAKD///////8A/////////2wAAAAAAAAAdP///////////3wAAAAAAAAAYP///////wD/////////OAAAAAAAAAC4////////////xAAAAAAAAAAw////////AP////////8cAAAAAAAAAOD////////////oAAAAAAAAABT///////8A/////////wAAAAAAAAAA//////////////8AAAAAAAAAAP///////wD/////////AAAAAAAAAAD//////////////wAAAAAAAAAA////////AP////////8AAAAAAAAAAP/////////////8AAAAAAAAAAD///////8A/////////xwAAAAAAAAA5P///////////+AAAAAAAAAAHP///////wD/////////NAAAAAAAAAC8////////////uAAAAAAAAAA4////////AP////////9oAAAAAAAAAHj///////////98AAAAAAAAAGT///////8A/////////6gAAAAAAAAAGPD/////////+BgAAAAAAAAApP///////wD/////////9AwAAAAAAAAAUPz///////xcAAAAAAAAAAjs////////AP//////////cAAAAAAAAAAALKjs//CwOAAAAAAAAAAAYP////////8A///////////wFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzk/////////wD///////////+4BAAAAAAAAAAAAAAAAAAAAAAAAAAAoP//////////AP////////////+QAAAAAAAAAAAAAAAAAAAAAAAAAJD///////////8A//////////////+sEAAAAAAAAAAAAAAAAAAAAAyg/////////////wD////////////////oZAgAAAAAAAAAAAAAAARg4P//////////////AP//////////////////9KhsOCAAAAAUMFyc7P////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'P' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP///////////wAAAAAAAAAAAAAAAAAACCxguP////////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAOOD//////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAGOD/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAARP////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAxP///////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAABo////////////AP///////////wAAAAAAAAAA////6JwMAAAAAAAAADD///////////8A////////////AAAAAAAAAAD//////6AAAAAAAAAADP///////////wD///////////8AAAAAAAAAAP//////9AAAAAAAAAAA////////////AP///////////wAAAAAAAAAA///////0AAAAAAAAAAD///////////8A////////////AAAAAAAAAAD//////5gAAAAAAAAAHP///////////wD///////////8AAAAAAAAAAP///9iICAAAAAAAAABI////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAJD///////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAI6P///////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAIT/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAABU/P////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAIhPz//////////////wD///////////8AAAAAAAAAAAAAAAAABCRMkOz/////////////////AP///////////wAAAAAAAAAA//////////////////////////////8A////////////AAAAAAAAAAD//////////////////////////////wD///////////8AAAAAAAAAAP//////////////////////////////AP///////////wAAAAAAAAAA//////////////////////////////8A////////////AAAAAAAAAAD//////////////////////////////wD///////////8AAAAAAAAAAP//////////////////////////////AP///////////wAAAAAAAAAA//////////////////////////////8A////////////AAAAAAAAAAD//////////////////////////////wD///////////8AAAAAAAAAAP//////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'Q' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////SoaDQcAAAAHDhoqPT///////////////////8A//////////////BwDAAAAAAAAAAAAAAACHDo/////////////////wD///////////+4FAAAAAAAAAAAAAAAAAAAABCo////////////////AP//////////nAQAAAAAAAAAAAAAAAAAAAAAAACQ//////////////8A/////////7gEAAAAAAAAAAAAAAAAAAAAAAAAAACg/////////////wD////////wFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzo////////////AP///////3AAAAAAAAAAACyo8P/sqCwAAAAAAAAAAGT///////////8A///////4EAAAAAAAAABM+P///////FQAAAAAAAAACPT//////////wD//////7AAAAAAAAAAFPD/////////9BgAAAAAAAAApP//////////AP//////bAAAAAAAAAB4////////////fAAAAAAAAABk//////////8A//////84AAAAAAAAALz///////////+8AAAAAAAAADT//////////wD//////xwAAAAAAAAA6P///////////+QAAAAAAAAAHP//////////AP//////AAAAAAAAAAD//////////////wAAAAAAAAAA//////////8A//////8AAAAAAAAAAP//////////////AAAAAAAAAAD//////////wD//////wAAAAAAAAAA/P////////////8AAAAAAAAAAP//////////AP//////GAAAAAAAAADg////////////4AAAAAAAAAAc//////////8A//////84AAAAAAAAALT////MJHTo//+8AAAAAAAAADT//////////wD//////2wAAAAAAAAAdP///2AAABCg/3wAAAAAAAAAZP//////////AP//////rAAAAAAAAAAY9P/sCAAAAABMGAAAAAAAAACk//////////8A///////4EAAAAAAAAABU/P+0OAAAAAAAAAAAAAAACPT//////////wD///////94AAAAAAAAAAA4sPD/gAAAAAAAAAAAAABk////////////AP////////AcAAAAAAAAAAAAAAAAAAAAAAAAAAAADOT///////////8A/////////7wEAAAAAAAAAAAAAAAAAAAAAAAAAACQ/////////////wD//////////6wEAAAAAAAAAAAAAAAAAAAAAAAAABSs////////////AP///////////7gUAAAAAAAAAAAAAAAAAAAAAAAAAABAwP////////8A//////////////BwDAAAAAAAAAAAAAAABAgAAAAAAAA8/////////wD////////////////0qGg0GAAAABgwXJjkxBgAAAAAALD/////////AP//////////////////////////////////5DQAAAAk/P////////8A////////////////////////////////////+GwAAJD//////////wD//////////////////////////////////////8A49P//////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'R' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////wAAAAAAAAAAAAAAAAAAAAQgOGSk+P///////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAcuP//////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAEsP////////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ6P///////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAADD///////////8A/////////wAAAAAAAAAA///////svDgAAAAAAAAACP///////////wD/////////AAAAAAAAAAD/////////7AAAAAAAAAAA////////////AP////////8AAAAAAAAAAP/////////cAAAAAAAAABD///////////8A/////////wAAAAAAAAAA//////DQoCQAAAAAAAAAQP///////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAACU////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAIPj///////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAzU/////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAA02P//////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAxctPz///////////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAEDY/////////////////wD/////////AAAAAAAAAAD/9LAsAAAAAAAAAAzc////////////////AP////////8AAAAAAAAAAP///+wkAAAAAAAAADD8//////////////8A/////////wAAAAAAAAAA/////8QAAAAAAAAAAJD//////////////wD/////////AAAAAAAAAAD//////1QAAAAAAAAAFPD/////////////AP////////8AAAAAAAAAAP//////3AQAAAAAAAAAgP////////////8A/////////wAAAAAAAAAA////////aAAAAAAAAAAM6P///////////wD/////////AAAAAAAAAAD////////oCAAAAAAAAABs////////////AP////////8AAAAAAAAAAP////////+AAAAAAAAAAATc//////////8A/////////wAAAAAAAAAA//////////AUAAAAAAAAAFj//////////wD/////////AAAAAAAAAAD//////////5AAAAAAAAAAAND/////////AP////////8AAAAAAAAAAP//////////+CQAAAAAAAAAQP////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'S' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP/////////////////8vHBEIAgAAAQgQHC8/P////////////////8A////////////////pCQAAAAAAAAAAAAAAAAcoP///////////////wD//////////////FwAAAAAAAAAAAAAAAAAAAAAXP//////////////AP////////////9oAAAAAAAAAAAAAAAAAAAAAAAAhP////////////8A////////////zAAAAAAAAAAAAAAAAAAAAAAAAAAI6P///////////wD///////////9cAAAAAAAAAAAAAAAAAAAAAAAAAACA////////////AP///////////xgAAAAAAAAAUOD/8KwkAAAAAAAAADj///////////8A////////////AAAAAAAAAAD0/////8wABCAgICxASP///////////wD///////////8MAAAAAAAAAMz/////////////////////////////AP///////////0AAAAAAAAAACFiQxPT///////////////////////8A////////////oAAAAAAAAAAAAAAAADBwtPT//////////////////wD////////////8QAAAAAAAAAAAAAAAAAAACFTA////////////////AP/////////////oOAAAAAAAAAAAAAAAAAAAAABM6P////////////8A///////////////4fAgAAAAAAAAAAAAAAAAAAAAY2P///////////wD/////////////////7IwwAAAAAAAAAAAAAAAAAAAo+P//////////AP/////////////////////koGw0BAAAAAAAAAAAAACU//////////8A///////////////////////////4uFgAAAAAAAAAADz//////////wD//////////2BgSEA0IBwA6P///////5QAAAAAAAAADP//////////AP//////////JAAAAAAAAACc/////////AAAAAAAAAAA//////////8A//////////9YAAAAAAAAACDo///////AAAAAAAAAABT//////////wD//////////6QAAAAAAAAAACCk7P/snBQAAAAAAAAAUP//////////AP//////////+BAAAAAAAAAAAAAAAAAAAAAAAAAAAACs//////////8A////////////kAAAAAAAAAAAAAAAAAAAAAAAAAAAOP///////////wD////////////8RAAAAAAAAAAAAAAAAAAAAAAAABjc////////////AP/////////////0PAAAAAAAAAAAAAAAAAAAAAAg2P////////////8A///////////////8hBQAAAAAAAAAAAAAAAAMdPT//////////////wD/////////////////+LRwSCAMAAAAHDhoqPT/////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'T' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'U' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////JAAAAAAAAADk/////////+gAAAAAAAAAHP//////////AP////////9MAAAAAAAAAJz/////////nAAAAAAAAABE//////////8A/////////4gAAAAAAAAAHOj//////+ggAAAAAAAAAHz//////////wD/////////0AAAAAAAAAAAIJzs/+ykIAAAAAAAAAAA0P//////////AP//////////QAAAAAAAAAAAAAAAAAAAAAAAAAAAAED///////////8A///////////IBAAAAAAAAAAAAAAAAAAAAAAAAAAE0P///////////wD///////////+YAAAAAAAAAAAAAAAAAAAAAAAAAJj/////////////AP////////////+UBAAAAAAAAAAAAAAAAAAAAASU//////////////8A///////////////IPAAAAAAAAAAAAAAAAAAwyP///////////////wD/////////////////0IxYOCAIAAAEIEiAyP//////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'V' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD//////zAAAAAAAAAAYP//////////////ZAAAAAAAAAAw////////AP//////kAAAAAAAAAAU/P////////////8UAAAAAAAAAJD///////8A///////oBAAAAAAAAADE////////////xAAAAAAAAAAE7P///////wD///////9MAAAAAAAAAHD///////////94AAAAAAAAAEz/////////AP///////6gAAAAAAAAAJP///////////yQAAAAAAAAArP////////8A////////+BAAAAAAAAAA1P/////////YAAAAAAAAABT4/////////wD/////////aAAAAAAAAACE/////////4QAAAAAAAAAbP//////////AP/////////EAAAAAAAAADT/////////OAAAAAAAAADM//////////8A//////////8kAAAAAAAAAOT//////+QAAAAAAAAAKP///////////wD//////////4QAAAAAAAAAmP//////nAAAAAAAAACI////////////AP//////////5AAAAAAAAABE//////9EAAAAAAAABOT///////////8A////////////QAAAAAAAAAT0////9AgAAAAAAABI/////////////wD///////////+gAAAAAAAAAKT///+kAAAAAAAAAKj/////////////AP////////////QIAAAAAAAAXP///1wAAAAAAAAM+P////////////8A/////////////1wAAAAAAAAM+P/8DAAAAAAAAGT//////////////wD/////////////vAAAAAAAAAC8/7wAAAAAAAAAxP//////////////AP//////////////HAAAAAAAAGj/aAAAAAAAACT///////////////8A//////////////94AAAAAAAAHP8cAAAAAAAAhP///////////////wD//////////////9gAAAAAAAAAkAAAAAAAAADk////////////////AP///////////////zgAAAAAAAAQAAAAAAAAQP////////////////8A////////////////lAAAAAAAAAAAAAAAAACg/////////////////wD////////////////sCAAAAAAAAAAAAAAADPT/////////////////AP////////////////9QAAAAAAAAAAAAAABg//////////////////8A/////////////////7AAAAAAAAAAAAAAAMD//////////////////wD//////////////////BQAAAAAAAAAAAAc////////////////////AP//////////////////cAAAAAAAAAAAAHz///////////////////8A///////////////////MAAAAAAAAAAAA3P///////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'W' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//8cAAAAAAAAALz/////4AAAAAAAAAAA6P////+8AAAAAAAAABz//wD//1QAAAAAAAAAjP////+gAAAAAAAAAACo/////4wAAAAAAAAAUP//AP//jAAAAAAAAABU/////2AAAAAAAAAAAGj/////VAAAAAAAAACM//8A///EAAAAAAAAACT/////IAAAAAAAAAAAKP////8kAAAAAAAAAMT//wD///gEAAAAAAAAAPD//+AAAAAAAAAAAAAA6P//8AAAAAAAAAAE9P//AP///zAAAAAAAAAAvP//oAAAAAAAAAAAAACo//+8AAAAAAAAADD///8A////bAAAAAAAAACM//9gAAAAAAAAAAAAAGT//4wAAAAAAAAAaP///wD///+kAAAAAAAAAFT//yAAAAAAAAAAAAAAIP//VAAAAAAAAACc////AP///9gAAAAAAAAAJP/gAAAAAAAAAAAAAAAA4P8kAAAAAAAAANT///8A/////xAAAAAAAAAA8KAAAAAAAAAAAAAAAACg8AAAAAAAAAAQ/////wD/////TAAAAAAAAAC8YAAAAAAAAAAAAAAAAGC8AAAAAAAAAET/////AP////+AAAAAAAAAAIwgAAAAAAAAAAAAAAAAIIwAAAAAAAAAfP////8A/////7gAAAAAAAAANAAAAAAAACwwAAAAAAAANAAAAAAAAACw/////wD/////8AAAAAAAAAAAAAAAAAAAdHgAAAAAAAAAAAAAAAAAAOz/////AP//////KAAAAAAAAAAAAAAAAAC4vAAAAAAAAAAAAAAAAAAg//////8A//////9gAAAAAAAAAAAAAAAACPj4CAAAAAAAAAAAAAAAAFj//////wD//////5QAAAAAAAAAAAAAAABE//9IAAAAAAAAAAAAAAAAkP//////AP//////0AAAAAAAAAAAAAAAAIj//4wAAAAAAAAAAAAAAADI//////8A///////8DAAAAAAAAAAAAAAAzP//1AAAAAAAAAAAAAAABPj//////wD///////88AAAAAAAAAAAAABT/////GAAAAAAAAAAAAAA0////////AP///////3QAAAAAAAAAAAAAWP////9gAAAAAAAAAAAAAHD///////8A////////sAAAAAAAAAAAAACg/////6QAAAAAAAAAAAAApP///////wD////////kAAAAAAAAAAAAAOT/////6AAAAAAAAAAAAADc////////AP////////8cAAAAAAAAAAAo////////MAAAAAAAAAAAEP////////8A/////////1QAAAAAAAAAAHD///////94AAAAAAAAAABM/////////wD/////////jAAAAAAAAAAAtP///////7wAAAAAAAAAAID/////////AP/////////EAAAAAAAAAAT0////////+AgAAAAAAAAAuP////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'X' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////9UAAAAAAAAAKz///////////+sAAAAAAAAAFD/////////AP///////+QQAAAAAAAAFOT/////////8BwAAAAAAAAM5P////////8A/////////5gAAAAAAAAATP////////9kAAAAAAAAAJD//////////wD//////////0AAAAAAAAAAoP//////wAAAAAAAAAA0/P//////////AP//////////2AgAAAAAAAAQ4P////gkAAAAAAAABMz///////////8A////////////iAAAAAAAAABA////dAAAAAAAAABw/////////////wD////////////8MAAAAAAAAACU/9AEAAAAAAAAHPD/////////////AP/////////////IBAAAAAAAAAzYMAAAAAAAAACs//////////////8A//////////////90AAAAAAAAABAAAAAAAAAATP///////////////wD///////////////QgAAAAAAAAAAAAAAAAAAzg////////////////AP///////////////7wAAAAAAAAAAAAAAAAAjP////////////////8A/////////////////2AAAAAAAAAAAAAAADD8/////////////////wD/////////////////7BQAAAAAAAAAAAAEyP//////////////////AP/////////////////gDAAAAAAAAAAAAAjY//////////////////8A/////////////////0AAAAAAAAAAAAAAADj8/////////////////wD///////////////+UAAAAAAAAAAAAAAAAAJD/////////////////AP//////////////4AwAAAAAAAAAAAAAAAAADOD///////////////8A//////////////9AAAAAAAAAAAAAAAAAAAAAQP///////////////wD/////////////nAAAAAAAAAAAWAAAAAAAAAAAlP//////////////AP///////////+QQAAAAAAAAAGD/YAAAAAAAAAAM4P////////////8A////////////TAAAAAAAAAAs9P/0LAAAAAAAAABM/////////////wD//////////6AAAAAAAAAADNT////UDAAAAAAAAACg////////////AP/////////kEAAAAAAAAACg//////+gAAAAAAAAABDk//////////8A/////////0wAAAAAAAAAYP////////9gAAAAAAAAAEz//////////wD///////+oAAAAAAAAACz0//////////QsAAAAAAAAAKT/////////AP//////7BQAAAAAAAAM1P///////////9QMAAAAAAAAFOz///////8A//////9UAAAAAAAAAKD//////////////6AAAAAAAAAAVP///////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'Y' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP///////1QAAAAAAAAAAGj//////////2gAAAAAAAAAAFT///////8A////////5BAAAAAAAAAAAMT////////EAAAAAAAAAAAQ5P///////wD/////////mAAAAAAAAAAAKPj/////+CgAAAAAAAAAAJj/////////AP//////////PAAAAAAAAAAAgP////+AAAAAAAAAAAA8//////////8A///////////YCAAAAAAAAAAE2P//2AQAAAAAAAAACNj//////////wD///////////+AAAAAAAAAAAA4//84AAAAAAAAAACA////////////AP////////////woAAAAAAAAAACUlAAAAAAAAAAAKPz///////////8A/////////////8gAAAAAAAAAABAQAAAAAAAAAADI/////////////wD//////////////2wAAAAAAAAAAAAAAAAAAAAAbP//////////////AP//////////////8BwAAAAAAAAAAAAAAAAAABzw//////////////8A////////////////tAAAAAAAAAAAAAAAAAAAtP///////////////wD/////////////////VAAAAAAAAAAAAAAAAFT/////////////////AP/////////////////oEAAAAAAAAAAAAAAQ6P////////////////8A//////////////////+cAAAAAAAAAAAAAJz//////////////////wD///////////////////9AAAAAAAAAAABA////////////////////AP///////////////////9gAAAAAAAAAANj///////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////8AAAAAAAAAAP////////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////8AAAAAAAAAAP////////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////8AAAAAAAAAAP////////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'Z' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAQ//////////////8A/////////////////////////1AAAAAAAAAABLz//////////////wD///////////////////////98AAAAAAAAAACY////////////////AP//////////////////////pAAAAAAAAAAAaP////////////////8A/////////////////////8QIAAAAAAAAAET8/////////////////wD////////////////////gGAAAAAAAAAAo9P//////////////////AP//////////////////9CwAAAAAAAAAFNz///////////////////8A//////////////////xMAAAAAAAAAATA/////////////////////wD/////////////////eAAAAAAAAAAAnP//////////////////////AP///////////////5wAAAAAAAAAAHT///////////////////////8A///////////////ABAAAAAAAAABM/P///////////////////////wD/////////////3BQAAAAAAAAALPT/////////////////////////AP////////////QoAAAAAAAAABjg//////////////////////////8A///////////8SAAAAAAAAAAExP///////////////////////////wD//////////2wAAAAAAAAAAKD/////////////////////////////AP////////+YAAAAAAAAAAB8//////////////////////////////8A/////////wQAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - ); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index eb4eb77f22..70196769c2 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -1,245 +1,183 @@ \ No newline at end of file diff --git a/phpBB/includes/db.php b/phpBB/includes/db.php new file mode 100644 index 0000000000..700bb111ac --- /dev/null +++ b/phpBB/includes/db.php @@ -0,0 +1,66 @@ +db_connect_id) +{ + message_die(CRITICAL_ERROR, "Could not connect to the database"); +} + +?> \ No newline at end of file diff --git a/phpBB/includes/db/db2.php b/phpBB/includes/db/db2.php deleted file mode 100644 index 40909050c9..0000000000 --- a/phpBB/includes/db/db2.php +++ /dev/null @@ -1,453 +0,0 @@ -persistency = $persistency; - $this->user = $sqluser; - $this->server = $sqlserver . (($port) ? ':' . $port : ''); - $this->dbname = $database; - - $this->db_connect_id = ($this->persistency) ? @db2_pconnect($this->dbname, $this->user, $sqlpassword, array('autocommit' => DB2_AUTOCOMMIT_ON, 'DB2_ATTR_CASE' => DB2_CASE_LOWER)) : @db2_connect($this->dbname, $this->user, $sqlpassword, array('autocommit' => DB2_AUTOCOMMIT_ON, 'DB2_ATTR_CASE' => DB2_CASE_LOWER)); - - return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error(''); - } - - /** - * Version information about used database - */ - function sql_server_info() - { - $info = db2_server_info($this->db_connect_id); - return $info->DBMS_VER; - } - - /** - * SQL Transaction - * @access private - */ - function _sql_transaction($status = 'begin') - { - switch ($status) - { - case 'begin': - return @db2_autocommit($this->db_connect_id, DB2_AUTOCOMMIT_OFF); - break; - - case 'commit': - $result = @db2_commit($this->db_connect_id); - @db2_autocommit($this->db_connect_id, DB2_AUTOCOMMIT_ON); - return $result; - break; - - case 'rollback': - $result = @db2_rollback($this->db_connect_id); - @db2_autocommit($this->db_connect_id, DB2_AUTOCOMMIT_ON); - return $result; - break; - } - - return true; - } - - /** - * Base query method - * - * @param string $query Contains the SQL query which shall be executed - * @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache - * @return mixed When casted to bool the returned value returns true on success and false on failure - * - * @access public - */ - function sql_query($query = '', $cache_ttl = 0) - { - if ($query != '') - { - global $cache; - - // EXPLAIN only in extra debug mode - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('start', $query); - } - - $this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false; - $this->sql_add_num_queries($this->query_result); - - if ($this->query_result === false) - { - $array = array(); - if (strlen($query) > 32740) - { - if (preg_match('/^(INSERT INTO[^(]++)\\(([^()]+)\\) VALUES[^(]++\\((.*?)\\)$/s', $query, $regs)) - { - if (strlen($regs[3]) > 32740) - { - preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER); - - $inserts = $vals[0]; - unset($vals); - - foreach ($inserts as $key => $value) - { - if (!empty($value) && $value[0] === "'" && strlen($value) > 32742) // check to see if this thing is greater than the max + 'x2 - { - $inserts[$key] = '?'; - $array[] = str_replace("''", "'", substr($value, 1, -1)); - } - } - - $query = $regs[1] . '(' . $regs[2] . ') VALUES (' . implode(', ', $inserts) . ')'; - } - } - else if (preg_match_all('/^(UPDATE ([\\w_]++)\\s+SET )([\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+)(?:,\\s*[\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+)\\s+(WHERE.*)$/s', $query, $data, PREG_SET_ORDER)) - { - if (strlen($data[0][3]) > 32740) - { - $update = $data[0][1]; - $where = $data[0][4]; - preg_match_all('/(\\w++) = (\'(?:[^\']++|\'\')*+\'|\\d++)/', $data[0][3], $temp, PREG_SET_ORDER); - unset($data); - - $cols = array(); - foreach ($temp as $value) - { - if (!empty($value[2]) && $value[2][0] === "'" && strlen($value[2]) > 32742) // check to see if this thing is greater than the max + 'x2 - { - $array[] = str_replace("''", "'", substr($value[2], 1, -1)); - $cols[] = $value[1] . '=?'; - } - else - { - $cols[] = $value[1] . '=' . $value[2]; - } - } - - $query = $update . implode(', ', $cols) . ' ' . $where; - unset($cols); - } - } - } - - if (sizeof($array)) - { - if (($this->query_result = @db2_prepare($this->db_connect_id, $query)) === false) - { - $this->sql_error($query); - } - - if (!@db2_execute($this->query_result, $array)) - { - $this->sql_error($query); - } - } - else - { - if (($this->query_result = @db2_exec($this->db_connect_id, $query)) === false) - { - $this->sql_error($query); - } - } - - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('stop', $query); - } - - if ($cache_ttl && method_exists($cache, 'sql_save')) - { - $this->open_queries[(int) $this->query_result] = $this->query_result; - $cache->sql_save($query, $this->query_result, $cache_ttl); - } - else if (strpos($query, 'SELECT') === 0 && $this->query_result) - { - $this->open_queries[(int) $this->query_result] = $this->query_result; - } - } - else if (defined('DEBUG_EXTRA')) - { - $this->sql_report('fromcache', $query); - } - } - else - { - return false; - } - - return ($this->query_result) ? $this->query_result : false; - } - - /** - * Build LIMIT query - */ - function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) - { - if ($query != '') - { - $this->query_result = false; - - if ($total && $offset == 0) - { - return $this->sql_query($query . ' fetch first ' . $total . ' rows only', $cache_ttl); - } - - - // Seek by $offset rows - if ($offset) - { - $limit_sql = 'SELECT a2.* - FROM ( - SELECT ROW_NUMBER() OVER() AS rownum, a1.* - FROM ( - ' . $query . ' - ) a1 - ) a2 - WHERE a2.rownum BETWEEN ' . ($offset + 1) . ' AND ' . ($offset + $total); - return $this->sql_query($limit_sql, $cache_ttl); - } - } - else - { - return false; - } - } - - /** - * Return number of affected rows - */ - function sql_affectedrows() - { - return ($this->db_connect_id) ? @db2_num_rows($this->db_connect_id) : false; - } - - /** - * Fetch current row - */ - function sql_fetchrow($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_fetchrow($query_id); - } - - if ($query_id === false) - { - return false; - } - - $row = @db2_fetch_assoc($query_id); - - return $row; - } - - /** - * Get last inserted id after insert statement - */ - function sql_nextid() - { - $result_id = @db2_exec($this->db_connect_id, 'VALUES IDENTITY_VAL_LOCAL()'); - if ($result_id) - { - if ($row = @db2_fetch_assoc($result_id)) - { - @db2_free_result($result_id); - return (int) $row[1]; - } - @db2_free_result($result_id); - } - - return false; - } - - /** - * Free sql result - */ - function sql_freeresult($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_freeresult($query_id); - } - - if (isset($this->open_queries[$query_id])) - { - unset($this->open_queries[$query_id]); - return @db2_free_result($query_id); - } - - return false; - } - - /** - * Escape string used in sql query - */ - function sql_escape($msg) - { - return str_replace("'", "''", $msg); - } - - /** - * Expose a DBMS specific function - */ - function sql_function($type, $col) - { - switch ($type) - { - case 'length_varchar': - return 'LENGTH(' . $col . ')'; - break; - - case 'length_text': - return 'LENGTH(' . $col . ')'; - break; - } - } - - /** - * Build LIKE expression - * @access private - */ - function _sql_like_expression($expression) - { - return $expression . " ESCAPE '\\'"; - } - - /** - * return sql error array - * @access private - */ - function _sql_error() - { - $error = array( - 'message' => @db2_stmt_errormsg(), - 'code' => @db2_stmt_error() - ); - return $error; - } - - /** - * Build db-specific query data - * @access private - */ - function _sql_custom_build($stage, $data) - { - return $data; - } - - /** - * Close sql connection - * @access private - */ - function _sql_close() - { - return @db2_close($this->db_connect_id); - } - - /** - * Build db-specific report - * @access private - */ - function _sql_report($mode, $query = '') - { - switch ($mode) - { - case 'start': - - $html_table = false; - @db2_exec($this->db_connect_id, 'DELETE FROM EXPLAIN_INSTANCE'); - @db2_exec($this->db_connect_id, 'EXPLAIN PLAN FOR ' . $query); - - // Get the data from the plan - $sql = "SELECT O.Operator_ID, S2.Target_ID, O.Operator_Type, S.Object_Name, CAST(O.Total_Cost AS INTEGER) Cost - FROM EXPLAIN_OPERATOR O - LEFT OUTER JOIN EXPLAIN_STREAM S2 ON O.Operator_ID = S2.Source_ID - LEFT OUTER JOIN EXPLAIN_STREAM S ON O.Operator_ID = S.Target_ID AND O.Explain_Time = S.Explain_Time AND S.Object_Name IS NOT NULL - ORDER BY O.Explain_Time ASC, Operator_ID ASC"; - $query_id = @db2_exec($this->db_connect_id, $sql); - - if ($query_id) - { - while ($row = @db2_fetch_assoc($query_id)) - { - $html_table = $this->sql_report('add_select_row', $query, $html_table, $row); - } - - @db2_free_result($query_id); - } - - if ($html_table) - { - $this->html_hold .= '
    '; - } - break; - - case 'fromcache': - $endtime = explode(' ', microtime()); - $endtime = $endtime[0] + $endtime[1]; - - $result = @db2_exec($this->db_connect_id, $query); - while ($void = @db2_fetch_assoc($result, IBASE_TEXT)) - { - // Take the time spent on parsing rows into account - } - @db2_free_result($result); - - $splittime = explode(' ', microtime()); - $splittime = $splittime[0] + $splittime[1]; - - $this->sql_report('record_fromcache', $query, $endtime, $splittime); - - break; - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php deleted file mode 100644 index d417132c53..0000000000 --- a/phpBB/includes/db/db_tools.php +++ /dev/null @@ -1,1664 +0,0 @@ - array( - 'INT:' => 'int(%d)', - 'BINT' => 'bigint(20)', - 'UINT' => 'mediumint(8) UNSIGNED', - 'UINT:' => 'int(%d) UNSIGNED', - 'TINT:' => 'tinyint(%d)', - 'USINT' => 'smallint(4) UNSIGNED', - 'BOOL' => 'tinyint(1) UNSIGNED', - 'VCHAR' => 'varchar(255)', - 'VCHAR:' => 'varchar(%d)', - 'CHAR:' => 'char(%d)', - 'XSTEXT' => 'text', - 'XSTEXT_UNI'=> 'varchar(100)', - 'STEXT' => 'text', - 'STEXT_UNI' => 'varchar(255)', - 'TEXT' => 'text', - 'TEXT_UNI' => 'text', - 'MTEXT' => 'mediumtext', - 'MTEXT_UNI' => 'mediumtext', - 'TIMESTAMP' => 'int(11) UNSIGNED', - 'DECIMAL' => 'decimal(5,2)', - 'DECIMAL:' => 'decimal(%d,2)', - 'PDECIMAL' => 'decimal(6,3)', - 'PDECIMAL:' => 'decimal(%d,3)', - 'VCHAR_UNI' => 'varchar(255)', - 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar(255)', - 'VARBINARY' => 'varbinary(255)', - ), - - 'firebird' => array( - 'INT:' => 'INTEGER', - 'BINT' => 'DOUBLE PRECISION', - 'UINT' => 'INTEGER', - 'UINT:' => 'INTEGER', - 'TINT:' => 'INTEGER', - 'USINT' => 'INTEGER', - 'BOOL' => 'INTEGER', - 'VCHAR' => 'VARCHAR(255) CHARACTER SET NONE', - 'VCHAR:' => 'VARCHAR(%d) CHARACTER SET NONE', - 'CHAR:' => 'CHAR(%d) CHARACTER SET NONE', - 'XSTEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', - 'STEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', - 'TEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', - 'MTEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', - 'XSTEXT_UNI'=> 'VARCHAR(100) CHARACTER SET UTF8', - 'STEXT_UNI' => 'VARCHAR(255) CHARACTER SET UTF8', - 'TEXT_UNI' => 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8', - 'MTEXT_UNI' => 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8', - 'TIMESTAMP' => 'INTEGER', - 'DECIMAL' => 'DOUBLE PRECISION', - 'DECIMAL:' => 'DOUBLE PRECISION', - 'PDECIMAL' => 'DOUBLE PRECISION', - 'PDECIMAL:' => 'DOUBLE PRECISION', - 'VCHAR_UNI' => 'VARCHAR(255) CHARACTER SET UTF8', - 'VCHAR_UNI:'=> 'VARCHAR(%d) CHARACTER SET UTF8', - 'VCHAR_CI' => 'VARCHAR(255) CHARACTER SET UTF8', - 'VARBINARY' => 'CHAR(255) CHARACTER SET NONE', - ), - - 'mssql' => array( - 'INT:' => '[int]', - 'BINT' => '[float]', - 'UINT' => '[int]', - 'UINT:' => '[int]', - 'TINT:' => '[int]', - 'USINT' => '[int]', - 'BOOL' => '[int]', - 'VCHAR' => '[varchar] (255)', - 'VCHAR:' => '[varchar] (%d)', - 'CHAR:' => '[char] (%d)', - 'XSTEXT' => '[varchar] (1000)', - 'STEXT' => '[varchar] (3000)', - 'TEXT' => '[varchar] (8000)', - 'MTEXT' => '[text]', - 'XSTEXT_UNI'=> '[varchar] (100)', - 'STEXT_UNI' => '[varchar] (255)', - 'TEXT_UNI' => '[varchar] (4000)', - 'MTEXT_UNI' => '[text]', - 'TIMESTAMP' => '[int]', - 'DECIMAL' => '[float]', - 'DECIMAL:' => '[float]', - 'PDECIMAL' => '[float]', - 'PDECIMAL:' => '[float]', - 'VCHAR_UNI' => '[varchar] (255)', - 'VCHAR_UNI:'=> '[varchar] (%d)', - 'VCHAR_CI' => '[varchar] (255)', - 'VARBINARY' => '[varchar] (255)', - ), - - 'oracle' => array( - 'INT:' => 'number(%d)', - 'BINT' => 'number(20)', - 'UINT' => 'number(8)', - 'UINT:' => 'number(%d)', - 'TINT:' => 'number(%d)', - 'USINT' => 'number(4)', - 'BOOL' => 'number(1)', - 'VCHAR' => 'varchar2(255 char)', - 'VCHAR:' => 'varchar2(%d char)', - 'CHAR:' => 'char(%d char)', - 'XSTEXT' => 'varchar2(1000 char)', - 'STEXT' => 'varchar2(3000 char)', - 'TEXT' => 'clob', - 'MTEXT' => 'clob', - 'XSTEXT_UNI'=> 'varchar2(100 char)', - 'STEXT_UNI' => 'varchar2(255 char)', - 'TEXT_UNI' => 'clob', - 'MTEXT_UNI' => 'clob', - 'TIMESTAMP' => 'number(11)', - 'DECIMAL' => 'number(5, 2)', - 'DECIMAL:' => 'number(%d, 2)', - 'PDECIMAL' => 'number(6, 3)', - 'PDECIMAL:' => 'number(%d, 3)', - 'VCHAR_UNI' => 'varchar2(255 char)', - 'VCHAR_UNI:'=> 'varchar2(%d char)', - 'VCHAR_CI' => 'varchar2(255 char)', - 'VARBINARY' => 'raw(255)', - ), - - 'sqlite' => array( - 'INT:' => 'int(%d)', - 'BINT' => 'bigint(20)', - 'UINT' => 'INTEGER UNSIGNED', //'mediumint(8) UNSIGNED', - 'UINT:' => 'INTEGER UNSIGNED', // 'int(%d) UNSIGNED', - 'TINT:' => 'tinyint(%d)', - 'USINT' => 'INTEGER UNSIGNED', //'mediumint(4) UNSIGNED', - 'BOOL' => 'INTEGER UNSIGNED', //'tinyint(1) UNSIGNED', - 'VCHAR' => 'varchar(255)', - 'VCHAR:' => 'varchar(%d)', - 'CHAR:' => 'char(%d)', - 'XSTEXT' => 'text(65535)', - 'STEXT' => 'text(65535)', - 'TEXT' => 'text(65535)', - 'MTEXT' => 'mediumtext(16777215)', - 'XSTEXT_UNI'=> 'text(65535)', - 'STEXT_UNI' => 'text(65535)', - 'TEXT_UNI' => 'text(65535)', - 'MTEXT_UNI' => 'mediumtext(16777215)', - 'TIMESTAMP' => 'INTEGER UNSIGNED', //'int(11) UNSIGNED', - 'DECIMAL' => 'decimal(5,2)', - 'DECIMAL:' => 'decimal(%d,2)', - 'PDECIMAL' => 'decimal(6,3)', - 'PDECIMAL:' => 'decimal(%d,3)', - 'VCHAR_UNI' => 'varchar(255)', - 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar(255)', - 'VARBINARY' => 'blob', - ), - - 'db2' => array( - 'INT:' => 'integer', - 'BINT' => 'float', - 'UINT' => 'integer', - 'UINT:' => 'integer', - 'TINT:' => 'smallint', - 'USINT' => 'smallint', - 'BOOL' => 'smallint', - 'VCHAR' => 'varchar(255)', - 'VCHAR:' => 'varchar(%d)', - 'CHAR:' => 'char(%d)', - 'XSTEXT' => 'clob(65K)', - 'STEXT' => 'varchar(3000)', - 'TEXT' => 'clob(65K)', - 'MTEXT' => 'clob(16M)', - 'XSTEXT_UNI'=> 'varchar(100)', - 'STEXT_UNI' => 'varchar(255)', - 'TEXT_UNI' => 'clob(65K)', - 'MTEXT_UNI' => 'clob(16M)', - 'TIMESTAMP' => 'integer', - 'DECIMAL' => 'float', - 'VCHAR_UNI' => 'varchar(255)', - 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar(255)', - 'VARBINARY' => 'varchar(255)', - ), - - 'postgres' => array( - 'INT:' => 'INT4', - 'BINT' => 'INT8', - 'UINT' => 'INT4', // unsigned - 'UINT:' => 'INT4', // unsigned - 'USINT' => 'INT2', // unsigned - 'BOOL' => 'INT2', // unsigned - 'TINT:' => 'INT2', - 'VCHAR' => 'varchar(255)', - 'VCHAR:' => 'varchar(%d)', - 'CHAR:' => 'char(%d)', - 'XSTEXT' => 'varchar(1000)', - 'STEXT' => 'varchar(3000)', - 'TEXT' => 'varchar(8000)', - 'MTEXT' => 'TEXT', - 'XSTEXT_UNI'=> 'varchar(100)', - 'STEXT_UNI' => 'varchar(255)', - 'TEXT_UNI' => 'varchar(4000)', - 'MTEXT_UNI' => 'TEXT', - 'TIMESTAMP' => 'INT4', // unsigned - 'DECIMAL' => 'decimal(5,2)', - 'DECIMAL:' => 'decimal(%d,2)', - 'PDECIMAL' => 'decimal(6,3)', - 'PDECIMAL:' => 'decimal(%d,3)', - 'VCHAR_UNI' => 'varchar(255)', - 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar(255)', - 'VARBINARY' => 'bytea', - ), - ); - - // A list of types being unsigned for better reference in some db's - public static $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP'); - public static $supported_dbms = array('firebird', 'mssql', 'mysql', 'oracle', 'postgres', 'sqlite', 'db2'); - - /** - * Set this to true if you only want to return the 'to-be-executed' SQL statement(s) (as an array). - */ - public static $return_statements = false; - - /** - * Handle passed database update array. - * Expected structure... - * Key being one of the following - * change_columns: Column changes (only type, not name) - * add_columns: Add columns to a table - * drop_keys: Dropping keys - * drop_columns: Removing/Dropping columns - * add_primary_keys: adding primary keys - * add_unique_index: adding an unique index - * add_index: adding an index - * - * The values are in this format: - * {TABLE NAME} => array( - * {COLUMN NAME} => array({COLUMN TYPE}, {DEFAULT VALUE}, {OPTIONAL VARIABLES}), - * {KEY/INDEX NAME} => array({COLUMN NAMES}), - * ) - * - * For more information have a look at /install/schemas/schema_data.php (only available through CVS) - */ - public static function perform_schema_changes($schema_changes) - { - if (empty($schema_changes)) - { - return; - } - - $statements = array(); - - // Change columns? - if (!empty($schema_changes['change_columns'])) - { - foreach ($schema_changes['change_columns'] as $table => $columns) - { - foreach ($columns as $column_name => $column_data) - { - $result = self::sql_column_change($table, $column_name, $column_data); - - if (self::$return_statements) - { - $statements = array_merge($statements, $result); - } - } - } - } - - // Add columns? - if (!empty($schema_changes['add_columns'])) - { - foreach ($schema_changes['add_columns'] as $table => $columns) - { - foreach ($columns as $column_name => $column_data) - { - // Only add the column if it does not exist yet - if (!self::sql_column_exists($table, $column_name)) - { - $result = self::sql_column_add($table, $column_name, $column_data); - - if (self::$return_statements) - { - $statements = array_merge($statements, $result); - } - } - } - } - } - - // Remove keys? - if (!empty($schema_changes['drop_keys'])) - { - foreach ($schema_changes['drop_keys'] as $table => $indexes) - { - foreach ($indexes as $index_name) - { - $result = self::sql_index_drop($table, $index_name); - - if (self::$return_statements) - { - $statements = array_merge($statements, $result); - } - } - } - } - - // Drop columns? - if (!empty($schema_changes['drop_columns'])) - { - foreach ($schema_changes['drop_columns'] as $table => $columns) - { - foreach ($columns as $column) - { - $result = self::sql_column_remove($table, $column); - - if (self::$return_statements) - { - $statements = array_merge($statements, $result); - } - } - } - } - - // Add primary keys? - if (!empty($schema_changes['add_primary_keys'])) - { - foreach ($schema_changes['add_primary_keys'] as $table => $columns) - { - $result = self::sql_create_primary_key($table, $columns); - - if (self::$return_statements) - { - $statements = array_merge($statements, $result); - } - } - } - - // Add unqiue indexes? - if (!empty($schema_changes['add_unique_index'])) - { - foreach ($schema_changes['add_unique_index'] as $table => $index_array) - { - foreach ($index_array as $index_name => $column) - { - $result = self::sql_create_unique_index($table, $index_name, $column); - - if (self::$return_statements) - { - $statements = array_merge($statements, $result); - } - } - } - } - - // Add indexes? - if (!empty($schema_changes['add_index'])) - { - foreach ($schema_changes['add_index'] as $table => $index_array) - { - foreach ($index_array as $index_name => $column) - { - $result = self::sql_create_unique_index($table, $index_name, $column); - - if (self::$return_statements) - { - $statements = array_merge($statements, $result); - } - } - } - } - - if (self::$return_statements) - { - return $statements; - } - } - - /** - * Check if a specified column exist - * @return bool True if column exists, else false - */ - public static function sql_column_exists($table, $column_name) - { - global $db; - - switch ($db->dbms_type) - { - case 'mysql': - - $sql = "SHOW COLUMNS FROM $table"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - // lower case just in case - if (strtolower($row['Field']) == $column_name) - { - $db->sql_freeresult($result); - return true; - } - } - $db->sql_freeresult($result); - return false; - break; - - // PostgreSQL has a way of doing this in a much simpler way but would - // not allow us to support all versions of PostgreSQL - case 'postgres': - $sql = "SELECT a.attname - FROM pg_class c, pg_attribute a - WHERE c.relname = '{$table}' - AND a.attnum > 0 - AND a.attrelid = c.oid"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - // lower case just in case - if (strtolower($row['attname']) == $column_name) - { - $db->sql_freeresult($result); - return true; - } - } - $db->sql_freeresult($result); - - return false; - break; - - // same deal with PostgreSQL, we must perform more complex operations than - // we technically could - case 'mssql': - $sql = "SELECT c.name - FROM syscolumns c - LEFT JOIN sysobjects o ON c.id = o.id - WHERE o.name = '{$table}'"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - // lower case just in case - if (strtolower($row['name']) == $column_name) - { - $db->sql_freeresult($result); - return true; - } - } - $db->sql_freeresult($result); - return false; - break; - - case 'oracle': - $sql = "SELECT column_name - FROM user_tab_columns - WHERE table_name = '{$table}'"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - // lower case just in case - if (strtolower($row['column_name']) == $column_name) - { - $db->sql_freeresult($result); - return true; - } - } - $db->sql_freeresult($result); - return false; - break; - - case 'firebird': - $sql = "SELECT RDB\$FIELD_NAME as FNAME - FROM RDB\$RELATION_FIELDS - WHERE RDB\$RELATION_NAME = '{$table}'"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - // lower case just in case - if (strtolower($row['fname']) == $column_name) - { - $db->sql_freeresult($result); - return true; - } - } - $db->sql_freeresult($result); - return false; - break; - - case 'db2': - $sql = "SELECT colname - FROM syscat.columns - WHERE tabname = '$table'"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - // lower case just in case - if (strtolower($row['colname']) == $column_name) - { - $db->sql_freeresult($result); - return true; - } - } - $db->sql_freeresult($result); - return false; - break; - - // ugh, SQLite - case 'sqlite': - $sql = "SELECT sql - FROM sqlite_master - WHERE type = 'table' - AND name = '{$table}'"; - $result = $db->sql_query($sql); - - if (!$result) - { - return false; - } - - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - preg_match('#\((.*)\)#s', $row['sql'], $matches); - - $cols = trim($matches[1]); - $col_array = preg_split('/,(?![\s\w]+\))/m', $cols); - - foreach ($col_array as $declaration) - { - $entities = preg_split('#\s+#', trim($declaration)); - if ($entities[0] == 'PRIMARY') - { - continue; - } - - if (strtolower($entities[0]) == $column_name) - { - return true; - } - } - return false; - break; - } - } - - /** - * Private method for performing sql statements (either execute them or return them) - * @private - */ - private static function _sql_run_sql($statements) - { - if (self::$return_statements) - { - return $statements; - } - - global $db; - - // We could add error handling here... - foreach ($statements as $sql) - { - if ($sql === 'begin') - { - $db->sql_transaction('begin'); - } - else if ($sql === 'commit') - { - $db->sql_transaction('commit'); - } - else - { - $db->sql_query($sql); - } - } - - return true; - } - - /** - * Function to prepare some column information for better usage - * @private - */ - private static function sql_prepare_column_data($table_name, $column_name, $column_data) - { - global $db; - - // Get type - if (strpos($column_data[0], ':') !== false) - { - list($orig_column_type, $column_length) = explode(':', $column_data[0]); - - if (!is_array(self::$dbms_type_map[$db->dbms_type][$orig_column_type . ':'])) - { - $column_type = sprintf(self::$dbms_type_map[$db->dbms_type][$orig_column_type . ':'], $column_length); - } - - $orig_column_type .= ':'; - } - else - { - $orig_column_type = $column_data[0]; - $column_type = self::$dbms_type_map[$db->dbms_type][$column_data[0]]; - } - - // Adjust default value if db-dependant specified - if (is_array($column_data[1])) - { - $column_data[1] = (isset($column_data[1][$db->dbms_type])) ? $column_data[1][$db->dbms_type] : $column_data[1]['default']; - } - - $sql = ''; - - $return_array = array(); - - switch ($db->dbms_type) - { - case 'firebird': - $sql .= " {$column_type} "; - - if (!is_null($column_data[1])) - { - $sql .= 'DEFAULT ' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' '; - } - - $sql .= 'NOT NULL'; - - // This is a UNICODE column and thus should be given it's fair share - if (preg_match('/^X?STEXT_UNI|VCHAR_(CI|UNI:?)/', $column_data[0])) - { - $sql .= ' COLLATE UNICODE'; - } - - $return_array['auto_increment'] = false; - if (isset($column_data[2]) && $column_data[2] == 'auto_increment') - { - $return_array['auto_increment'] = true; - } - - break; - - case 'mssql': - $sql .= " {$column_type} "; - $sql_default = " {$column_type} "; - - // For adding columns we need the default definition - if (!is_null($column_data[1])) - { - // For hexadecimal values do not use single quotes - if (strpos($column_data[1], '0x') === 0) - { - $sql_default .= 'DEFAULT (' . $column_data[1] . ') '; - } - else - { - $sql_default .= 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') '; - } - } - - $return_array['textimage'] = $column_type === '[text]'; - - $sql .= 'NOT NULL'; - $sql_default .= 'NOT NULL'; - - $return_array['column_type_sql_default'] = $sql_default; - break; - - case 'mysql': - $sql .= " {$column_type} "; - - // For hexadecimal values do not use single quotes - if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text' && substr($column_type, -4) !== 'blob') - { - $sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' "; - } - $sql .= 'NOT NULL'; - - if (isset($column_data[2])) - { - if ($column_data[2] == 'auto_increment') - { - $sql .= ' auto_increment'; - } - else if ($column_data[2] == 'true_sort') - { - $sql .= ' COLLATE utf8_unicode_ci'; - } - } - - break; - - case 'oracle': - $sql .= " {$column_type} "; - $sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : ''; - - // In Oracle empty strings ('') are treated as NULL. - // Therefore in oracle we allow NULL's for all DEFAULT '' entries - // Oracle does not like setting NOT NULL on a column that is already NOT NULL (this happens only on number fields) - if (preg_match('/number/i', $column_type)) - { - $sql .= ($column_data[1] === '') ? '' : 'NOT NULL'; - } - - $return_array['auto_increment'] = false; - if (isset($column_data[2]) && $column_data[2] == 'auto_increment') - { - $return_array['auto_increment'] = true; - } - break; - - case 'postgres': - $return_array['column_type'] = $column_type; - - $sql .= " {$column_type} "; - - $return_array['auto_increment'] = false; - if (isset($column_data[2]) && $column_data[2] == 'auto_increment') - { - $default_val = "nextval('{$table_name}_seq')"; - $return_array['auto_increment'] = true; - } - else if (!is_null($column_data[1])) - { - $default_val = "'" . $column_data[1] . "'"; - $return_array['null'] = 'NOT NULL'; - $sql .= 'NOT NULL '; - } - - $return_array['default'] = $default_val; - - $sql .= "DEFAULT {$default_val}"; - - // Unsigned? Then add a CHECK contraint - if (in_array($orig_column_type, self::$unsigned_types)) - { - $return_array['constraint'] = "CHECK ({$column_name} >= 0)"; - $sql .= " CHECK ({$column_name} >= 0)"; - } - break; - - case 'sqlite': - $return_array['primary_key_set'] = false; - if (isset($column_data[2]) && $column_data[2] == 'auto_increment') - { - $sql .= ' INTEGER PRIMARY KEY'; - $return_array['primary_key_set'] = true; - } - else - { - $sql .= ' ' . $column_type; - } - - $sql .= ' NOT NULL '; - $sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : ''; - break; - - case 'db2': - $sql .= " {$column_type} NOT NULL"; - - if (isset($column_data[2]) && $column_data[2] == 'auto_increment') - { - $sql .= ' GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1)'; - } - else - { - if (preg_match('/^(integer|smallint|float)$/', $column_type)) - { - $sql .= " DEFAULT {$column_data[1]}"; - } - else - { - $sql .= " DEFAULT '{$column_data[1]}'"; - } - } - break; - } - - $return_array['column_type_sql'] = $sql; - - return $return_array; - } - - public static function sql_create_table($table_name, $table_data) - { - global $db; - - // holds the DDL for a column - $columns = array(); - - $table_sql = 'CREATE TABLE ' . $table_name . ' (' . "\n"; - - // Determine if we have created a PRIMARY KEY in the earliest - $primary_key_gen = false; - - // Determine if the table must be created with TEXTIMAGE - $create_textimage = false; - - // Determine if the table requires a sequence - $create_sequence = false; - - foreach ($table_data['COLUMNS'] as $column_name => $column_data) - { - // here lies an array, filled with information compiled on the column's data - $prepared_column = self::sql_prepare_column_data($table_name, $column_name, $column_data); - - // here we add the definition of the new column to the list of columns - $columns[] = "\t {$column_name} " . $prepared_column['column_type_sql']; - - // see if we have found a primary key set due to a column definition, - // if we have found it, we can stop looking - if (!$primary_key_gen) - { - $primary_key_gen = isset($prepared_column['primary_key_set']) && $prepared_column['primary_key_set']; - } - - // create textimage DDL based off of the existance of certain column types - if (!$create_textimage) - { - $create_textimage = isset($prepared_column['textimage']) && $prepared_column['textimage']; - } - - // create sequence DDL based off of the existance of auto incrementing columns - if (!$create_sequence && isset($prepared_column['auto_increment']) && $prepared_column['auto_increment']) - { - $create_sequence = $column_name; - } - } - - // this makes up all the columns in the create table statement - $table_sql .= implode(",\n", $columns); - - switch ($db->dbms_type) - { - case 'firebird': - $table_sql .= "\n);"; - $statements[] = $table_sql; - break; - - case 'mssql': - $table_sql .= "\n) ON [PRIMARY]" . (($create_textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : ''); - $statements[] = $table_sql; - break; - } - - // we have yet to create a primary key for this table, - // this means that we can add the one we really wanted instead - if (!$primary_key_gen) - { - // Write primary key - if (isset($table_data['PRIMARY_KEY'])) - { - if (!is_array($table_data['PRIMARY_KEY'])) - { - $table_data['PRIMARY_KEY'] = array($table_data['PRIMARY_KEY']); - } - - switch ($db->dbms_type) - { - case 'mysql': - case 'postgres': - case 'db2': - case 'sqlite': - $table_sql .= ",\n\t PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')'; - break; - - case 'firebird': - case 'mssql': - $primary_key_stmts = self::sql_create_primary_key($table_name, $table_data['PRIMARY_KEY']); - foreach ($primary_key_stmts as $pk_stmt) - { - $statements[] = $pk_stmt; - } - break; - - case 'oracle': - $table_sql .= ",\n\t CONSTRAINT pk_{$table_name} PRIMARY KEY (" . implode(', ', $table_data['PRIMARY_KEY']) . ')'; - break; - } - } - } - - - // close the table - switch ($db->dbms_type) - { - case 'mysql': - // make sure the table is in UTF-8 mode - $table_sql .= "\n) CHARACTER SET `utf8` COLLATE `utf8_bin`;"; - $statements[] = $table_sql; - break; - - case 'postgres': - // do we need to add a sequence for auto incrementing columns? - if ($create_sequence) - { - $statements[] = "CREATE SEQUENCE {$table_name}_seq;"; - } - - $table_sql .= "\n);"; - $statements[] = $table_sql; - break; - - case 'db2': - case 'sqlite': - $table_sql .= "\n);"; - $statements[] = $table_sql; - break; - - case 'oracle': - $table_sql .= "\n);"; - $statements[] = $table_sql; - - // do we need to add a sequence and a tigger for auto incrementing columns? - if ($create_sequence) - { - // create the actual sequence - $statements[] = "CREATE SEQUENCE {$table_name}_seq"; - - // the trigger is the mechanism by which we increment the counter - $trigger = "CREATE OR REPLACE TRIGGER t_{$table_name}\n"; - $trigger .= "BEFORE INSERT ON {$table_name}\n"; - $trigger .= "FOR EACH ROW WHEN (\n"; - $trigger .= "\tnew.{$create_sequence} IS NULL OR new.{$create_sequence} = 0\n"; - $trigger .= ")\n"; - $trigger .= "BEGIN\n"; - $trigger .= "\tSELECT {$table_name}_seq.nextval\n"; - $trigger .= "\tINTO :new.{$create_sequence}\n"; - $trigger .= "\tFROM dual\n"; - $trigger .= "END;"; - - $statements[] = $trigger; - } - break; - - case 'firebird': - if ($create_sequence) - { - $statements[] = "CREATE SEQUENCE {$table_name}_seq;"; - } - break; - } - - // Write Keys - if (isset($table_data['KEYS'])) - { - foreach ($table_data['KEYS'] as $key_name => $key_data) - { - if (!is_array($key_data[1])) - { - $key_data[1] = array($key_data[1]); - } - - $key_stmts = ($key_data[0] == 'UNIQUE') ? self::sql_create_unique_index($table_name, $key_name, $key_data[1]) : self::sql_create_index($table_name, $key_name, $key_data[1]); - foreach ($key_stmts as $key_stmt) - { - $statements[] = $key_stmt; - } - } - } - - return self::_sql_run_sql($statements); - } - - /** - * Add new column - */ - public static function sql_column_add($table_name, $column_name, $column_data) - { - $column_data = self::sql_prepare_column_data($table_name, $column_name, $column_data); - $statements = array(); - - switch ($db->dbms_type) - { - case 'firebird': - $statements[] = 'ALTER TABLE "' . $table_name . '" ADD "' . $column_name . '" ' . $column_data['column_type_sql']; - break; - - case 'mssql': - $statements[] = 'ALTER TABLE [' . $table_name . '] ADD [' . $column_name . '] ' . $column_data['column_type_sql_default']; - break; - - case 'mysql': - $statements[] = 'ALTER TABLE `' . $table_name . '` ADD COLUMN `' . $column_name . '` ' . $column_data['column_type_sql']; - break; - - case 'oracle': - $statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' ' . $column_data['column_type_sql']; - break; - - case 'postgres': - $statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type_sql']; - break; - - case 'db2': - $statements[] = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' ' . $column_data['column_type_sql']; - break; - - case 'sqlite': - global $db; - - $sql = "SELECT sql - FROM sqlite_master - WHERE type = 'table' - AND name = '{$table_name}' - ORDER BY type DESC, name;"; - $result = $db->sql_query($sql); - - if (!$result) - { - break; - } - - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $statements[] = 'begin'; - - // Create a backup table and populate it, destroy the existing one - $statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']); - $statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name; - $statements[] = 'DROP TABLE ' . $table_name; - - preg_match('#\((.*)\)#s', $row['sql'], $matches); - - $new_table_cols = trim($matches[1]); - $old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols); - $column_list = array(); - - foreach ($old_table_cols as $declaration) - { - $entities = preg_split('#\s+#', trim($declaration)); - if ($entities[0] == 'PRIMARY') - { - continue; - } - $column_list[] = $entities[0]; - } - - $columns = implode(',', $column_list); - - $new_table_cols = $column_name . ' ' . $column_data['column_type_sql'] . ',' . $new_table_cols; - - // create a new table and fill it up. destroy the temp one - $statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');'; - $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; - $statements[] = 'DROP TABLE ' . $table_name . '_temp'; - - $statements[] = 'commit'; - break; - } - - return self::_sql_run_sql($statements); - } - - /** - * Drop column - */ - public static function sql_column_remove($table_name, $column_name) - { - global $db; - - $statements = array(); - - switch ($db->dbms_type) - { - case 'firebird': - $statements[] = 'ALTER TABLE "' . $table_name . '" DROP "' . $column_name . '"'; - break; - - case 'mssql': - $statements[] = 'ALTER TABLE [' . $table_name . '] DROP COLUMN [' . $column_name . ']'; - break; - - case 'mysql': - $statements[] = 'ALTER TABLE `' . $table_name . '` DROP COLUMN `' . $column_name . '`'; - break; - - case 'oracle': - $statements[] = 'ALTER TABLE ' . $table_name . ' DROP ' . $column_name; - break; - - case 'postgres': - $statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN "' . $column_name . '"'; - break; - - case 'db2': - $statements[] = 'ALTER TABLE ' . $table_name . ' DROP ' . $column_name; - break; - - case 'sqlite': - global $db; - - $sql = "SELECT sql - FROM sqlite_master - WHERE type = 'table' - AND name = '{$table_name}' - ORDER BY type DESC, name;"; - $result = $db->sql_query($sql); - - if (!$result) - { - break; - } - - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $statements[] = 'begin'; - - // Create a backup table and populate it, destroy the existing one - $statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']); - $statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name; - $statements[] = 'DROP TABLE ' . $table_name; - - preg_match('#\((.*)\)#s', $row['sql'], $matches); - - $new_table_cols = trim($matches[1]); - $old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols); - $column_list = array(); - - foreach ($old_table_cols as $declaration) - { - $entities = preg_split('#\s+#', trim($declaration)); - if ($entities[0] == 'PRIMARY' || $entities[0] === $column_name) - { - continue; - } - $column_list[] = $entities[0]; - } - - $columns = implode(',', $column_list); - - $new_table_cols = $new_table_cols = preg_replace('/' . $column_name . '[^,]+(?:,|$)/m', '', $new_table_cols); - - // create a new table and fill it up. destroy the temp one - $statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');'; - $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; - $statements[] = 'DROP TABLE ' . $table_name . '_temp'; - - $statements[] = 'commit'; - break; - } - - return self::_sql_run_sql($statements); - } - - /** - * Drop Index - */ - public static function sql_index_drop($table_name, $index_name) - { - global $db; - - $statements = array(); - - switch ($db->dbms_type) - { - case 'mssql': - $statements[] = 'DROP INDEX ' . $table_name . '.' . $index_name; - break; - - case 'mysql': - $statements[] = 'DROP INDEX ' . $index_name . ' ON ' . $table_name; - break; - - case 'firebird': - case 'oracle': - case 'postgres': - case 'sqlite': - case 'db2': - $statements[] = 'DROP INDEX ' . $table_name . '_' . $index_name; - break; - } - - return self::_sql_run_sql($statements); - } - - /** - * Drop Table - */ - public static function sql_table_drop($table_name) - { - global $db; - - $statements = array(); - - // the most basic operation, get rid of the table - $statements[] = 'DROP TABLE ' . $table_name; - - switch ($db->dbms_type) - { - case 'firebird': - $sql = 'SELECT RDB$GENERATOR_NAME as gen - FROM RDB$GENERATORS - WHERE RDB$SYSTEM_FLAG = 0 - AND RDB$GENERATOR_NAME = \'' . strtoupper($table_name) . "_GEN'"; - $result = $db->sql_query($sql); - - // does a generator exist? - if ($row = $db->sql_fetchrow($result)) - { - $statements[] = "DROP GENERATOR {$row['gen']};"; - } - $db->sql_freeresult($result); - break; - - case 'oracle': - $sql = 'SELECT A.REFERENCED_NAME - FROM USER_DEPENDENCIES A, USER_TRIGGERS B - WHERE A.REFERENCED_TYPE = \'SEQUENCE\' - AND A.NAME = B.TRIGGER_NAME - AND B.TABLE_NAME = \'' . strtoupper($table_name) . "'"; - $result = $db->sql_query($sql); - - // any sequences ref'd to this table's triggers? - while ($row = $db->sql_fetchrow($result)) - { - $statements[] = "DROP SEQUENCE {$row['referenced_name']}"; - } - $db->sql_freeresult($result); - - case 'postgres': - // PGSQL does not "tightly" bind sequences and tables, we must guess... - $sql = "SELECT relname - FROM pg_class - WHERE relkind = 'S' - AND relname = '{$table_name}_seq'"; - $result = $db->sql_query($sql); - - // We don't even care about storing the results. We already know the answer if we get rows back. - if ($db->sql_fetchrow($result)) - { - $statements[] = "DROP SEQUENCE {$table_name}_seq;\n"; - } - $db->sql_freeresult($result); - break; - } - - return self::_sql_run_sql($statements); - } - - /** - * Add primary key - */ - public static function sql_create_primary_key($table_name, $column) - { - global $db; - - $statements = array(); - - switch ($db->dbms_type) - { - case 'firebird': - case 'postgres': - case 'mysql': - case 'db2': - $statements[] = 'ALTER TABLE ' . $table_name . ' ADD PRIMARY KEY (' . implode(', ', $column) . ')'; - break; - - case 'mssql': - $sql = "ALTER TABLE [{$table_name}] WITH NOCHECK ADD "; - $sql .= "CONSTRAINT [PK_{$table_name}] PRIMARY KEY CLUSTERED ("; - $sql .= '[' . implode("],\n\t\t[", $column) . ']'; - $sql .= ') ON [PRIMARY]'; - - $statements[] = $sql; - break; - - case 'oracle': - $statements[] = 'ALTER TABLE ' . $table_name . 'add CONSTRAINT pk_' . $table_name . ' PRIMARY KEY (' . implode(', ', $column) . ')'; - break; - - case 'sqlite': - global $db; - - $sql = "SELECT sql - FROM sqlite_master - WHERE type = 'table' - AND name = '{$table_name}' - ORDER BY type DESC, name;"; - $result = $db->sql_query($sql); - - if (!$result) - { - break; - } - - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $statements[] = 'begin'; - - // Create a backup table and populate it, destroy the existing one - $statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']); - $statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name; - $statements[] = 'DROP TABLE ' . $table_name; - - preg_match('#\((.*)\)#s', $row['sql'], $matches); - - $new_table_cols = trim($matches[1]); - $old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols); - $column_list = array(); - - foreach ($old_table_cols as $declaration) - { - $entities = preg_split('#\s+#', trim($declaration)); - if ($entities[0] == 'PRIMARY') - { - continue; - } - $column_list[] = $entities[0]; - } - - $columns = implode(',', $column_list); - - // create a new table and fill it up. destroy the temp one - $statements[] = 'CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ', PRIMARY KEY (' . implode(', ', $column) . '));'; - $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; - $statements[] = 'DROP TABLE ' . $table_name . '_temp'; - - $statements[] = 'commit'; - break; - } - - return self::_sql_run_sql($statements); - } - - /** - * Add unique index - */ - public static function sql_create_unique_index($table_name, $index_name, $column) - { - global $db; - - $statements = array(); - - switch ($db->dbms_type) - { - case 'firebird': - case 'postgres': - case 'oracle': - case 'sqlite': - case 'db2': - $statements[] = 'CREATE UNIQUE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')'; - break; - - case 'mysql': - $statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')'; - break; - - case 'mssql': - $statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]'; - break; - } - - return self::_sql_run_sql($statements); - } - - /** - * Add index - */ - public static function sql_create_index($table_name, $index_name, $column) - { - global $db; - - $statements = array(); - - switch ($db->dbms_type) - { - case 'firebird': - case 'postgres': - case 'oracle': - case 'sqlite': - case 'db2': - $statements[] = 'CREATE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')'; - break; - - case 'mysql': - $statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')'; - break; - - case 'mssql': - $statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]'; - break; - } - - return self::_sql_run_sql($statements); - } - - /** - * List all of the indices that belong to a table, - * does not count: - * * UNIQUE indices - * * PRIMARY keys - */ - public static function sql_list_index($table_name) - { - global $db; - - $index_array = array(); - - if ($db->dbms_type == 'mssql') - { - $sql = "EXEC sp_statistics '$table_name'"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['TYPE'] == 3) - { - $index_array[] = $row['INDEX_NAME']; - } - } - $db->sql_freeresult($result); - } - else - { - switch ($db->dbms_type) - { - case 'firebird': - $sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name - FROM RDB\$INDICES - WHERE RDB\$RELATION_NAME = " . strtoupper($table_name) . " - AND RDB\$UNIQUE_FLAG IS NULL - AND RDB\$FOREIGN_KEY IS NULL"; - $col = 'index_name'; - break; - - case 'postgres': - $sql = "SELECT ic.relname as index_name - FROM pg_class bc, pg_class ic, pg_index i - WHERE (bc.oid = i.indrelid) - AND (ic.oid = i.indexrelid) - AND (bc.relname = '" . $table_name . "') - AND (i.indisunique != 't') - AND (i.indisprimary != 't')"; - $col = 'index_name'; - break; - - case 'mysql': - $sql = 'SHOW KEYS - FROM ' . $table_name; - $col = 'Key_name'; - break; - - case 'oracle': - $sql = "SELECT index_name - FROM user_indexes - WHERE table_name = '" . $table_name . "' - AND generated = 'N'"; - break; - - case 'sqlite': - $sql = "PRAGMA index_info('" . $table_name . "');"; - $col = 'name'; - break; - - case 'db2': - $sql = "SELECT indname - FROM SYSCAT.INDEXES - WHERE TABNAME = '$table_name' - AND UNIQUERULE <> 'P'"; - $col = 'name'; - } - - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - if ($db->dbms_type == 'mysql' && !$row['Non_unique']) - { - continue; - } - - switch ($db->dbms_type) - { - case 'firebird': - case 'oracle': - case 'postgres': - case 'sqlite': - case 'db2': - $row[$col] = substr($row[$col], strlen($table_name) + 1); - break; - } - - $index_array[] = $row[$col]; - } - $db->sql_freeresult($result); - } - - return array_map('strtolower', $index_array); - } - - /** - * Change column type (not name!) - */ - public static function sql_column_change($table_name, $column_name, $column_data) - { - $column_data = self::sql_prepare_column_data($table_name, $column_name, $column_data); - $statements = array(); - - switch ($db->dbms_type) - { - case 'firebird': - // Change type... - $statements[] = 'ALTER TABLE "' . $table_name . '" ALTER COLUMN "' . $column_name . '" TYPE ' . ' ' . $column_data['column_type_sql']; - break; - - case 'mssql': - $statements[] = 'ALTER TABLE [' . $table_name . '] ALTER COLUMN [' . $column_name . '] ' . $column_data['column_type_sql']; - break; - - case 'mysql': - $statements[] = 'ALTER TABLE `' . $table_name . '` CHANGE `' . $column_name . '` `' . $column_name . '` ' . $column_data['column_type_sql']; - break; - - case 'oracle': - $statements[] = 'ALTER TABLE ' . $table_name . ' MODIFY ' . $column_name . ' ' . $column_data['column_type_sql']; - break; - - case 'db2': - $statements[] = 'ALTER TABLE ' . $table_name . ' ALTER ' . $column_name . ' SET DATA TYPE ' . $column_data['column_type_sql']; - break; - - case 'postgres': - $sql = 'ALTER TABLE ' . $table_name . ' '; - - $sql_array = array(); - $sql_array[] = 'ALTER COLUMN ' . $column_name . ' TYPE ' . $column_data['column_type']; - - if (isset($column_data['null'])) - { - if ($column_data['null'] == 'NOT NULL') - { - $sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET NOT NULL'; - } - else if ($column_data['null'] == 'NULL') - { - $sql_array[] = 'ALTER COLUMN ' . $column_name . ' DROP NOT NULL'; - } - } - - if (isset($column_data['default'])) - { - $sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET DEFAULT ' . $column_data['default']; - } - - // we don't want to double up on constraints if we change different number data types - if (isset($column_data['constraint'])) - { - global $db; - - $constraint_sql = "SELECT consrc as constraint_data - FROM pg_constraint, pg_class bc - WHERE conrelid = bc.oid - AND bc.relname = '{$table_name}' - AND NOT EXISTS ( - SELECT * - FROM pg_constraint as c, pg_inherits as i - WHERE i.inhrelid = pg_constraint.conrelid - AND c.conname = pg_constraint.conname - AND c.consrc = pg_constraint.consrc - AND c.conrelid = i.inhparent - )"; - - $constraint_exists = false; - - $result = $db->sql_query($constraint_sql); - while ($row = $db->sql_fetchrow($result)) - { - if (trim($row['constraint_data']) == trim($column_data['constraint'])) - { - $constraint_exists = true; - break; - } - } - $db->sql_freeresult($result); - - if (!$constraint_exists) - { - $sql_array[] = 'ADD ' . $column_data['constraint']; - } - } - - $sql .= implode(', ', $sql_array); - - $statements[] = $sql; - break; - - case 'sqlite': - global $db; - - $sql = "SELECT sql - FROM sqlite_master - WHERE type = 'table' - AND name = '{$table_name}' - ORDER BY type DESC, name;"; - $result = $db->sql_query($sql); - - if (!$result) - { - break; - } - - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $statements[] = 'begin'; - - // Create a temp table and populate it, destroy the existing one - $statements[] = preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql']); - $statements[] = 'INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name; - $statements[] = 'DROP TABLE ' . $table_name; - - preg_match('#\((.*)\)#s', $row['sql'], $matches); - - $new_table_cols = trim($matches[1]); - $old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols); - $column_list = array(); - - foreach ($old_table_cols as $key => $declaration) - { - $entities = preg_split('#\s+#', trim($declaration)); - $column_list[] = $entities[0]; - if ($entities[0] == $column_name) - { - $old_table_cols[$key] = $column_name . ' ' . $column_data['column_type_sql']; - } - } - - $columns = implode(',', $column_list); - - // create a new table and fill it up. destroy the temp one - $statements[] = 'CREATE TABLE ' . $table_name . ' (' . implode(',', $old_table_cols) . ');'; - $statements[] = 'INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'; - $statements[] = 'DROP TABLE ' . $table_name . '_temp'; - - $statements[] = 'commit'; - - break; - } - - return self::_sql_run_sql($statements); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php deleted file mode 100644 index 0444dcd816..0000000000 --- a/phpBB/includes/db/dbal.php +++ /dev/null @@ -1,811 +0,0 @@ -num_queries = array( - 'cached' => 0, - 'normal' => 0, - 'total' => 0, - ); - - // Fill default sql layer based on the class being called. - // This can be changed by the specified layer itself later if needed. - $this->sql_layer = substr(get_class($this), 5); - - // Do not change this please! This variable is used to easy the use of it - and is hardcoded. - $this->any_char = chr(0) . '%'; - $this->one_char = chr(0) . '_'; - } - - /** - * return on error or display error message - */ - function sql_return_on_error($fail = false) - { - $this->sql_error_triggered = false; - $this->sql_error_sql = ''; - - $this->return_on_error = $fail; - } - - /** - * Return number of sql queries and cached sql queries used - */ - function sql_num_queries($cached = false) - { - return ($cached) ? $this->num_queries['cached'] : $this->num_queries['normal']; - } - - /** - * Add to query count - */ - function sql_add_num_queries($cached = false) - { - $this->num_queries['cached'] += ($cached !== false) ? 1 : 0; - $this->num_queries['normal'] += ($cached !== false) ? 0 : 1; - $this->num_queries['total'] += 1; - } - - /** - * DBAL garbage collection, close sql connection - */ - function sql_close() - { - if (!$this->db_connect_id) - { - return false; - } - - if ($this->transaction) - { - do - { - $this->sql_transaction('commit'); - } - while ($this->transaction); - } - - foreach ($this->open_queries as $query_id) - { - $this->sql_freeresult($query_id); - } - - return $this->_sql_close(); - } - - /** - * Build LIMIT query - * Doing some validation here. - */ - function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) - { - if (empty($query)) - { - return false; - } - - // Never use a negative total or offset - $total = ($total < 0) ? 0 : $total; - $offset = ($offset < 0) ? 0 : $offset; - - return $this->_sql_query_limit($query, $total, $offset, $cache_ttl); - } - - /** - * Fetch all rows - */ - function sql_fetchrowset($query_id = false) - { - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if ($query_id !== false) - { - $result = array(); - while ($row = $this->sql_fetchrow($query_id)) - { - $result[] = $row; - } - - return $result; - } - - return false; - } - - /** - * Fetch field - */ - function sql_fetchfield($field, $query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if ($query_id !== false) - { - if (!is_object($query_id) && isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_fetchfield($query_id, $field); - } - - $row = $this->sql_fetchrow($query_id); - return (isset($row[$field])) ? $row[$field] : false; - } - - return false; - } - - /** - * Correctly adjust LIKE expression for special characters - * Some DBMS are handling them in a different way - * - * @param string $expression The expression to use. Every wildcard is escaped, except $this->any_char and $this->one_char - * @return string LIKE expression including the keyword! - */ - function sql_like_expression($expression) - { - $expression = str_replace(array('_', '%'), array("\_", "\%"), $expression); - $expression = str_replace(array(chr(0) . "\_", chr(0) . "\%"), array('_', '%'), $expression); - - return $this->_sql_like_expression('LIKE \'' . $this->sql_escape($expression) . '\''); - } - - /** - * SQL Transaction - * @access private - */ - function sql_transaction($status = 'begin') - { - switch ($status) - { - case 'begin': - // If we are within a transaction we will not open another one, but enclose the current one to not loose data (prevening auto commit) - if ($this->transaction) - { - $this->transactions++; - return true; - } - - $result = $this->_sql_transaction('begin'); - - if (!$result) - { - $this->sql_error(); - } - - $this->transaction = true; - break; - - case 'commit': - // If there was a previously opened transaction we do not commit yet... but count back the number of inner transactions - if ($this->transaction && $this->transactions) - { - $this->transactions--; - return true; - } - - // Check if there is a transaction (no transaction can happen if there was an error, with a combined rollback and error returning enabled) - // This implies we have transaction always set for autocommit db's - if (!$this->transaction) - { - return false; - } - - $result = $this->_sql_transaction('commit'); - - if (!$result) - { - $this->sql_error(); - } - - $this->transaction = false; - $this->transactions = 0; - break; - - case 'rollback': - $result = $this->_sql_transaction('rollback'); - $this->transaction = false; - $this->transactions = 0; - break; - - default: - $result = $this->_sql_transaction($status); - break; - } - - return $result; - } - - /** - * Build sql statement from array for insert/update/select statements - * - * Idea for this from Ikonboard - * Possible query values: INSERT, INSERT_SELECT, MULTI_INSERT, UPDATE, SELECT - * - */ - function sql_build_array($query, $assoc_ary = false) - { - if (!is_array($assoc_ary)) - { - return false; - } - - $fields = $values = array(); - - if ($query == 'INSERT' || $query == 'INSERT_SELECT') - { - foreach ($assoc_ary as $key => $var) - { - $fields[] = $key; - - if (is_array($var) && is_string($var[0])) - { - // This is used for INSERT_SELECT(s) - $values[] = $var[0]; - } - else - { - $values[] = $this->_sql_validate_value($var); - } - } - - $query = ($query == 'INSERT') ? ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')' : ' (' . implode(', ', $fields) . ') SELECT ' . implode(', ', $values) . ' '; - } - else if ($query == 'MULTI_INSERT') - { - $ary = array(); - foreach ($assoc_ary as $id => $sql_ary) - { - // If by accident the sql array is only one-dimensional we build a normal insert statement - if (!is_array($sql_ary)) - { - return $this->sql_build_array('INSERT', $assoc_ary); - } - - $values = array(); - foreach ($sql_ary as $key => $var) - { - $values[] = $this->_sql_validate_value($var); - } - $ary[] = '(' . implode(', ', $values) . ')'; - } - - $query = ' (' . implode(', ', array_keys($assoc_ary[0])) . ') VALUES ' . implode(', ', $ary); - } - else if ($query == 'UPDATE' || $query == 'SELECT') - { - $values = array(); - foreach ($assoc_ary as $key => $var) - { - $values[] = "$key = " . $this->_sql_validate_value($var); - } - $query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values); - } - - return $query; - } - - /** - * Build IN or NOT IN sql comparison string, uses <> or = on single element - * arrays to improve comparison speed - * - * @access public - * @param string $field name of the sql column that shall be compared - * @param array $array array of values that are allowed (IN) or not allowed (NOT IN) - * @param bool $negate true for NOT IN (), false for IN () (default) - * @param bool $allow_empty_set If true, allow $array to be empty, this function will return 1=1 or 1=0 then. Default to false. - */ - function sql_in_set($field, $array, $negate = false, $allow_empty_set = false) - { - if (!sizeof($array)) - { - if (!$allow_empty_set) - { - // Print the backtrace to help identifying the location of the problematic code - $this->sql_error('No values specified for SQL IN comparison'); - } - else - { - // NOT IN () actually means everything so use a tautology - if ($negate) - { - return '1=1'; - } - // IN () actually means nothing so use a contradiction - else - { - return '1=0'; - } - } - } - - if (!is_array($array)) - { - $array = array($array); - } - - if (sizeof($array) == 1) - { - @reset($array); - $var = current($array); - - return $field . ($negate ? ' <> ' : ' = ') . $this->_sql_validate_value($var); - } - else - { - return $field . ($negate ? ' NOT IN ' : ' IN ') . '(' . implode(', ', array_map(array($this, '_sql_validate_value'), $array)) . ')'; - } - } - - /** - * Run more than one insert statement. - * - * @param string $table table name to run the statements on - * @param array &$sql_ary multi-dimensional array holding the statement data. - * - * @return bool false if no statements were executed. - * @access public - */ - function sql_multi_insert($table, &$sql_ary) - { - if (!sizeof($sql_ary)) - { - return false; - } - - if ($this->multi_insert) - { - $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('MULTI_INSERT', $sql_ary)); - } - else - { - foreach ($sql_ary as $ary) - { - if (!is_array($ary)) - { - return false; - } - - $this->sql_query('INSERT INTO ' . $table . ' ' . $this->sql_build_array('INSERT', $ary)); - } - } - - return true; - } - - /** - * Function for validating values - * @access private - */ - function _sql_validate_value($var) - { - if (is_null($var)) - { - return 'NULL'; - } - else if (is_string($var)) - { - return "'" . $this->sql_escape($var) . "'"; - } - else - { - return (is_bool($var)) ? intval($var) : $var; - } - } - - /** - * Build sql statement from array for select and select distinct statements - * - * Possible query values: SELECT, SELECT_DISTINCT - */ - function sql_build_query($query, $array) - { - $sql = ''; - switch ($query) - { - case 'SELECT': - case 'SELECT_DISTINCT'; - - $sql = str_replace('_', ' ', $query) . ' ' . $array['SELECT'] . ' FROM '; - - $table_array = array(); - foreach ($array['FROM'] as $table_name => $alias) - { - if (is_array($alias)) - { - foreach ($alias as $multi_alias) - { - $table_array[] = $table_name . ' ' . $multi_alias; - } - } - else - { - $table_array[] = $table_name . ' ' . $alias; - } - } - - $sql .= $this->_sql_custom_build('FROM', implode(', ', $table_array)); - - if (!empty($array['LEFT_JOIN'])) - { - foreach ($array['LEFT_JOIN'] as $join) - { - $sql .= ' LEFT JOIN ' . key($join['FROM']) . ' ' . current($join['FROM']) . ' ON (' . $join['ON'] . ')'; - } - } - - if (!empty($array['WHERE'])) - { - $sql .= ' WHERE ' . $this->_sql_custom_build('WHERE', $array['WHERE']); - } - - if (!empty($array['GROUP_BY'])) - { - $sql .= ' GROUP BY ' . $array['GROUP_BY']; - } - - if (!empty($array['ORDER_BY'])) - { - $sql .= ' ORDER BY ' . $array['ORDER_BY']; - } - - break; - } - - return $sql; - } - - /** - * display sql error page - */ - function sql_error($sql = '') - { - global $auth, $user, $config; - - // Set var to retrieve errored status - $this->sql_error_triggered = true; - $this->sql_error_sql = $sql; - - $error = $this->_sql_error(); - - if (!$this->return_on_error) - { - $message = 'SQL ERROR [ ' . $this->sql_layer . ' ]

    ' . $error['message'] . ' [' . $error['code'] . ']'; - - // Show complete SQL error and path to administrators only - // Additionally show complete error on installation or if extended debug mode is enabled - // The DEBUG_EXTRA constant is for development only! - if ((isset($auth) && $auth->acl_get('a_')) || defined('IN_INSTALL') || defined('DEBUG_EXTRA')) - { - // Print out a nice backtrace... - $backtrace = get_backtrace(); - - $message .= ($sql) ? '

    SQL

    ' . htmlspecialchars($sql) : ''; - $message .= ($backtrace) ? '

    BACKTRACE
    ' . $backtrace : ''; - $message .= '
    '; - } - else - { - // If error occurs in initiating the session we need to use a pre-defined language string - // This could happen if the connection could not be established for example (then we are not able to grab the default language) - if (!isset($user->lang['SQL_ERROR_OCCURRED'])) - { - $message .= '

    An sql error occurred while fetching this page. Please contact an administrator if this problem persists.'; - } - else - { - if (!empty($config['board_contact'])) - { - $message .= '

    ' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '', ''); - } - else - { - $message .= '

    ' . sprintf($user->lang['SQL_ERROR_OCCURRED'], '', ''); - } - } - } - - if ($this->transaction) - { - $this->sql_transaction('rollback'); - } - - if (strlen($message) > 1024) - { - // We need to define $msg_long_text here to circumvent text stripping. - global $msg_long_text; - $msg_long_text = $message; - - trigger_error(false, E_USER_ERROR); - } - - trigger_error($message, E_USER_ERROR); - } - - if ($this->transaction) - { - $this->sql_transaction('rollback'); - } - - return $error; - } - - /** - * Explain queries - */ - function sql_report($mode, $query = '') - { - global $cache, $starttime, $phpbb_root_path, $user; - - if (empty($_REQUEST['explain'])) - { - return false; - } - - if (!$query && $this->query_hold != '') - { - $query = $this->query_hold; - } - - switch ($mode) - { - case 'display': - if (!empty($cache)) - { - $cache->unload(); - } - $this->sql_close(); - - $mtime = explode(' ', microtime()); - $totaltime = $mtime[0] + $mtime[1] - $starttime; - - echo ' - - - - - - SQL Report - - - -
    - -
    -
    -
    - -
    -

    SQL Report

    -
    -

    Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries['normal']} queries" . (($this->num_queries['cached']) ? " + {$this->num_queries['cached']} " . (($this->num_queries['cached'] == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '

    - -

    Time spent on ' . $this->sql_layer . ' queries: ' . round($this->sql_time, 5) . 's | Time spent on PHP: ' . round($totaltime - $this->sql_time, 5) . 's

    - -

    - ' . $this->sql_report . ' -
    - -
    -
    -
    - -
    - - '; - - exit_handler(); - - break; - - case 'stop': - $endtime = explode(' ', microtime()); - $endtime = $endtime[0] + $endtime[1]; - - $this->sql_report .= ' - - - - - - - - - - - - -
    Query #' . $this->num_queries['total'] . '
    - - ' . $this->html_hold . ' - -

    - '; - - if ($this->query_result) - { - if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query)) - { - $this->sql_report .= 'Affected rows: ' . $this->sql_affectedrows($this->query_result) . ' | '; - } - $this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: ' . sprintf('%.5f', $endtime - $this->curtime) . 's'; - } - else - { - $error = $this->sql_error(); - $this->sql_report .= 'FAILED - ' . $this->sql_layer . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']); - } - - $this->sql_report .= '



    '; - - $this->sql_time += $endtime - $this->curtime; - break; - - case 'start': - $this->query_hold = $query; - $this->html_hold = ''; - - $this->_sql_report($mode, $query); - - $this->curtime = explode(' ', microtime()); - $this->curtime = $this->curtime[0] + $this->curtime[1]; - - break; - - case 'add_select_row': - - $html_table = func_get_arg(2); - $row = func_get_arg(3); - - if (!$html_table && sizeof($row)) - { - $html_table = true; - $this->html_hold .= ''; - - foreach (array_keys($row) as $val) - { - $this->html_hold .= ''; - } - $this->html_hold .= ''; - } - $this->html_hold .= ''; - - $class = 'row1'; - foreach (array_values($row) as $val) - { - $class = ($class == 'row1') ? 'row2' : 'row1'; - $this->html_hold .= ''; - } - $this->html_hold .= ''; - - return $html_table; - - break; - - case 'fromcache': - - $this->_sql_report($mode, $query); - - break; - - case 'record_fromcache': - - $endtime = func_get_arg(2); - $splittime = func_get_arg(3); - - $time_cache = $endtime - $this->curtime; - $time_db = $splittime - $endtime; - $color = ($time_db > $time_cache) ? 'green' : 'red'; - - $this->sql_report .= '
    ' . (($val) ? ucwords(str_replace('_', ' ', $val)) : ' ') . '
    ' . (($val) ? $val : ' ') . '
    '; - $this->sql_report .= '
    Query results obtained from the cache
    '; - $this->sql_report .= '

    '; - $this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed [cache]: ' . sprintf('%.5f', ($time_cache)) . 's | Elapsed [db]: ' . sprintf('%.5f', $time_db) . 's



    '; - - // Pad the start time to not interfere with page timing - $starttime += $time_db; - - break; - - default: - - $this->_sql_report($mode, $query); - - break; - } - - return true; - } -} - -/** -* This variable holds the class name to use later -*/ -$sql_db = (!empty($dbms)) ? 'dbal_' . basename($dbms) : 'dbal'; - -?> \ No newline at end of file diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php deleted file mode 100644 index afb649a4f4..0000000000 --- a/phpBB/includes/db/firebird.php +++ /dev/null @@ -1,431 +0,0 @@ -persistency = $persistency; - $this->user = $sqluser; - $this->server = $sqlserver . (($port) ? ':' . $port : ''); - $this->dbname = $database; - - $this->db_connect_id = ($this->persistency) ? @ibase_pconnect($this->server . ':' . $this->dbname, $this->user, $sqlpassword, false, false, 3) : @ibase_connect($this->server . ':' . $this->dbname, $this->user, $sqlpassword, false, false, 3); - - $this->service_handle = (strtolower($this->user) == 'sysdba') ? @ibase_service_attach($this->server, $this->user, $sqlpassword) : false; - - return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error(''); - } - - /** - * Version information about used database - */ - function sql_server_info() - { - if ($this->service_handle !== false) - { - return @ibase_server_info($this->service_handle, IBASE_SVC_SERVER_VERSION); - } - - return 'Firebird/Interbase'; - } - - /** - * SQL Transaction - * @access private - */ - function _sql_transaction($status = 'begin') - { - switch ($status) - { - case 'begin': - return true; - break; - - case 'commit': - return @ibase_commit(); - break; - - case 'rollback': - return @ibase_rollback(); - break; - } - - return true; - } - - /** - * Base query method - * - * @param string $query Contains the SQL query which shall be executed - * @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache - * @return mixed When casted to bool the returned value returns true on success and false on failure - * - * @access public - */ - function sql_query($query = '', $cache_ttl = 0) - { - if ($query != '') - { - global $cache; - - // EXPLAIN only in extra debug mode - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('start', $query); - } - - $this->last_query_text = $query; - $this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false; - $this->sql_add_num_queries($this->query_result); - - if ($this->query_result === false) - { - $array = array(); - // We overcome Firebird's 32767 char limit by binding vars - if (strlen($query) > 32767) - { - if (preg_match('/^(INSERT INTO[^(]++)\\(([^()]+)\\) VALUES[^(]++\\((.*?)\\)$/s', $query, $regs)) - { - if (strlen($regs[3]) > 32767) - { - preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER); - - $inserts = $vals[0]; - unset($vals); - - foreach ($inserts as $key => $value) - { - if (!empty($value) && $value[0] === "'" && strlen($value) > 32769) // check to see if this thing is greater than the max + 'x2 - { - $inserts[$key] = '?'; - $array[] = str_replace("''", "'", substr($value, 1, -1)); - } - } - - $query = $regs[1] . '(' . $regs[2] . ') VALUES (' . implode(', ', $inserts) . ')'; - } - } - else if (preg_match('/^(UPDATE ([\\w_]++)\\s+SET )([\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|\\d+)(?:,\\s*[\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+)\\s+(WHERE.*)$/s', $query, $data)) - { - if (strlen($data[3]) > 32767) - { - $update = $data[1]; - $where = $data[4]; - preg_match_all('/(\\w++)\\s*=\\s*(\'(?:[^\']++|\'\')*+\'|[\d-.]++)/', $data[3], $temp, PREG_SET_ORDER); - unset($data); - - $cols = array(); - foreach ($temp as $value) - { - if (!empty($value[2]) && $value[2][0] === "'" && strlen($value[2]) > 32769) // check to see if this thing is greater than the max + 'x2 - { - $array[] = str_replace("''", "'", substr($value[2], 1, -1)); - $cols[] = $value[1] . '=?'; - } - else - { - $cols[] = $value[1] . '=' . $value[2]; - } - } - - $query = $update . implode(', ', $cols) . ' ' . $where; - unset($cols); - } - } - } - - if (sizeof($array)) - { - $p_query = @ibase_prepare($this->db_connect_id, $query); - array_unshift($array, $p_query); - $this->query_result = call_user_func_array('ibase_execute', $array); - unset($array); - - if ($this->query_result === false) - { - $this->sql_error($query); - } - } - else if (($this->query_result = @ibase_query($this->db_connect_id, $query)) === false) - { - $this->sql_error($query); - } - - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('stop', $query); - } - - if (!$this->transaction) - { - @ibase_commit_ret(); - } - - if ($cache_ttl && method_exists($cache, 'sql_save')) - { - $this->open_queries[(int) $this->query_result] = $this->query_result; - $cache->sql_save($query, $this->query_result, $cache_ttl); - } - else if (strpos($query, 'SELECT') === 0 && $this->query_result) - { - $this->open_queries[(int) $this->query_result] = $this->query_result; - } - } - else if (defined('DEBUG_EXTRA')) - { - $this->sql_report('fromcache', $query); - } - } - else - { - return false; - } - - return ($this->query_result) ? $this->query_result : false; - } - - /** - * Build LIMIT query - */ - function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) - { - $this->query_result = false; - - $query = 'SELECT FIRST ' . $total . ((!empty($offset)) ? ' SKIP ' . $offset : '') . substr($query, 6); - - return $this->sql_query($query, $cache_ttl); - } - - /** - * Return number of affected rows - */ - function sql_affectedrows() - { - return ($this->db_connect_id) ? @ibase_affected_rows($this->db_connect_id) : false; - } - - /** - * Fetch current row - */ - function sql_fetchrow($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_fetchrow($query_id); - } - - if ($query_id === false) - { - return false; - } - - $row = array(); - $cur_row = @ibase_fetch_object($query_id, IBASE_TEXT); - - if (!$cur_row) - { - return false; - } - - foreach (get_object_vars($cur_row) as $key => $value) - { - $row[strtolower($key)] = (is_string($value)) ? trim(str_replace(array("\\0", "\\n"), array("\0", "\n"), $value)) : $value; - } - - return (sizeof($row)) ? $row : false; - } - - /** - * Get last inserted id after insert statement - */ - function sql_nextid() - { - $query_id = $this->query_result; - - if ($query_id !== false && $this->last_query_text != '') - { - if ($this->query_result && preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#i', $this->last_query_text, $tablename)) - { - $sql = 'SELECT GEN_ID(' . $tablename[1] . '_gen, 0) AS new_id FROM RDB$DATABASE'; - - if (!($temp_q_id = @ibase_query($this->db_connect_id, $sql))) - { - return false; - } - - $temp_result = @ibase_fetch_assoc($temp_q_id); - @ibase_free_result($temp_q_id); - - return ($temp_result) ? $temp_result['NEW_ID'] : false; - } - } - - return false; - } - - /** - * Free sql result - */ - function sql_freeresult($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_freeresult($query_id); - } - - if (isset($this->open_queries[(int) $query_id])) - { - unset($this->open_queries[(int) $query_id]); - return @ibase_free_result($query_id); - } - - return false; - } - - /** - * Escape string used in sql query - */ - function sql_escape($msg) - { - return str_replace("'", "''", $msg); - } - - /** - * Expose a DBMS specific function - */ - function sql_function($type, $col) - { - switch ($type) - { - case 'length_varchar': - case 'length_text': - return 'OCTET_LENGTH(' . $col . ')'; - break; - } - } - - /** - * Build LIKE expression - * @access private - */ - function _sql_like_expression($expression) - { - return $expression . " ESCAPE '\\'"; - } - - /** - * Build db-specific query data - * @access private - */ - function _sql_custom_build($stage, $data) - { - return $data; - } - - /** - * return sql error array - * @access private - */ - function _sql_error() - { - return array( - 'message' => @ibase_errmsg(), - 'code' => @ibase_errcode() - ); - } - - /** - * Close sql connection - * @access private - */ - function _sql_close() - { - if ($this->service_handle !== false) - { - @ibase_service_detach($this->service_handle); - } - - return @ibase_close($this->db_connect_id); - } - - /** - * Build db-specific report - * @access private - */ - function _sql_report($mode, $query = '') - { - switch ($mode) - { - case 'start': - break; - - case 'fromcache': - $endtime = explode(' ', microtime()); - $endtime = $endtime[0] + $endtime[1]; - - $result = @ibase_query($this->db_connect_id, $query); - while ($void = @ibase_fetch_object($result, IBASE_TEXT)) - { - // Take the time spent on parsing rows into account - } - @ibase_free_result($result); - - $splittime = explode(' ', microtime()); - $splittime = $splittime[0] + $splittime[1]; - - $this->sql_report('record_fromcache', $query, $endtime, $splittime); - - break; - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/db/index.htm b/phpBB/includes/db/index.htm deleted file mode 100644 index ee1f723a7d..0000000000 --- a/phpBB/includes/db/index.htm +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php deleted file mode 100644 index bf6190c79c..0000000000 --- a/phpBB/includes/db/mssql.php +++ /dev/null @@ -1,421 +0,0 @@ -persistency = $persistency; - $this->user = $sqluser; - $this->server = $sqlserver . (($port) ? ':' . $port : ''); - $this->dbname = $database; - - @ini_set('mssql.charset', 'UTF-8'); - @ini_set('mssql.textlimit', 2147483647); - @ini_set('mssql.textsize', 2147483647); - - $this->db_connect_id = ($this->persistency) ? @mssql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mssql_connect($this->server, $this->user, $sqlpassword, $new_link); - - if ($this->db_connect_id && $this->dbname != '') - { - if (!@mssql_select_db($this->dbname, $this->db_connect_id)) - { - @mssql_close($this->db_connect_id); - return false; - } - } - - return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error(''); - } - - /** - * Version information about used database - */ - function sql_server_info() - { - $result_id = @mssql_query("SELECT SERVERPROPERTY('productversion'), SERVERPROPERTY('productlevel'), SERVERPROPERTY('edition')", $this->db_connect_id); - - $row = false; - if ($result_id) - { - $row = @mssql_fetch_assoc($result_id); - @mssql_free_result($result_id); - } - - if ($row) - { - return 'MSSQL
    ' . implode(' ', $row); - } - - return 'MSSQL'; - } - - /** - * SQL Transaction - * @access private - */ - function _sql_transaction($status = 'begin') - { - switch ($status) - { - case 'begin': - return @mssql_query('BEGIN TRANSACTION', $this->db_connect_id); - break; - - case 'commit': - return @mssql_query('COMMIT TRANSACTION', $this->db_connect_id); - break; - - case 'rollback': - return @mssql_query('ROLLBACK TRANSACTION', $this->db_connect_id); - break; - } - - return true; - } - - /** - * Base query method - * - * @param string $query Contains the SQL query which shall be executed - * @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache - * @return mixed When casted to bool the returned value returns true on success and false on failure - * - * @access public - */ - function sql_query($query = '', $cache_ttl = 0) - { - if ($query != '') - { - global $cache; - - // EXPLAIN only in extra debug mode - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('start', $query); - } - - $this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false; - $this->sql_add_num_queries($this->query_result); - - if ($this->query_result === false) - { - if (($this->query_result = @mssql_query($query, $this->db_connect_id)) === false) - { - $this->sql_error($query); - } - - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('stop', $query); - } - - if ($cache_ttl && method_exists($cache, 'sql_save')) - { - $this->open_queries[(int) $this->query_result] = $this->query_result; - $cache->sql_save($query, $this->query_result, $cache_ttl); - } - else if (strpos($query, 'SELECT') === 0 && $this->query_result) - { - $this->open_queries[(int) $this->query_result] = $this->query_result; - } - } - else if (defined('DEBUG_EXTRA')) - { - $this->sql_report('fromcache', $query); - } - } - else - { - return false; - } - - return ($this->query_result) ? $this->query_result : false; - } - - /** - * Build LIMIT query - */ - function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) - { - $this->query_result = false; - - // Since TOP is only returning a set number of rows we won't need it if total is set to 0 (return all rows) - if ($total) - { - // We need to grab the total number of rows + the offset number of rows to get the correct result - if (strpos($query, 'SELECT DISTINCT') === 0) - { - $query = 'SELECT DISTINCT TOP ' . ($total + $offset) . ' ' . substr($query, 15); - } - else - { - $query = 'SELECT TOP ' . ($total + $offset) . ' ' . substr($query, 6); - } - } - - $result = $this->sql_query($query, $cache_ttl); - - // Seek by $offset rows - if ($offset) - { - @mssql_data_seek($result, $offset); - } - - return $result; - } - - /** - * Return number of affected rows - */ - function sql_affectedrows() - { - return ($this->db_connect_id) ? @mssql_rows_affected($this->db_connect_id) : false; - } - - /** - * Fetch current row - */ - function sql_fetchrow($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_fetchrow($query_id); - } - - if ($query_id === false) - { - return false; - } - - $row = @mssql_fetch_assoc($query_id); - - // I hope i am able to remove this later... hopefully only a PHP or MSSQL bug - if ($row) - { - foreach ($row as $key => $value) - { - $row[$key] = ($value === ' ' || $value === NULL) ? '' : $value; - } - } - - return $row; - } - - /** - * Get last inserted id after insert statement - */ - function sql_nextid() - { - $result_id = @mssql_query('SELECT SCOPE_IDENTITY()', $this->db_connect_id); - if ($result_id) - { - if ($row = @mssql_fetch_assoc($result_id)) - { - @mssql_free_result($result_id); - return $row['computed']; - } - @mssql_free_result($result_id); - } - - return false; - } - - /** - * Free sql result - */ - function sql_freeresult($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_freeresult($query_id); - } - - if (isset($this->open_queries[$query_id])) - { - unset($this->open_queries[$query_id]); - return @mssql_free_result($query_id); - } - - return false; - } - - /** - * Escape string used in sql query - */ - function sql_escape($msg) - { - return str_replace("'", "''", $msg); - } - - /** - * Expose a DBMS specific function - */ - function sql_function($type, $col) - { - switch ($type) - { - case 'length_varchar': - case 'length_text': - return 'DATALENGTH(' . $col . ')'; - break; - } - } - - /** - * Build LIKE expression - * @access private - */ - function _sql_like_expression($expression) - { - return $expression . " ESCAPE '\\'"; - } - - /** - * return sql error array - * @access private - */ - function _sql_error() - { - $error = array( - 'message' => @mssql_get_last_message(), - 'code' => '' - ); - - // Get error code number - $result_id = @mssql_query('SELECT @@ERROR as code', $this->db_connect_id); - if ($result_id) - { - $row = @mssql_fetch_assoc($result_id); - $error['code'] = $row['code']; - @mssql_free_result($result_id); - } - - // Get full error message if possible - $sql = 'SELECT CAST(description as varchar(255)) as message - FROM master.dbo.sysmessages - WHERE error = ' . $error['code']; - $result_id = @mssql_query($sql); - - if ($result_id) - { - $row = @mssql_fetch_assoc($result_id); - if (!empty($row['message'])) - { - $error['message'] .= '
    ' . $row['message']; - } - @mssql_free_result($result_id); - } - - return $error; - } - - /** - * Build db-specific query data - * @access private - */ - function _sql_custom_build($stage, $data) - { - return $data; - } - - /** - * Close sql connection - * @access private - */ - function _sql_close() - { - return @mssql_close($this->db_connect_id); - } - - /** - * Build db-specific report - * @access private - */ - function _sql_report($mode, $query = '') - { - switch ($mode) - { - case 'start': - $html_table = false; - @mssql_query('SET SHOWPLAN_TEXT ON;', $this->db_connect_id); - if ($result = @mssql_query($query, $this->db_connect_id)) - { - @mssql_next_result($result); - while ($row = @mssql_fetch_row($result)) - { - $html_table = $this->sql_report('add_select_row', $query, $html_table, $row); - } - } - @mssql_query('SET SHOWPLAN_TEXT OFF;', $this->db_connect_id); - @mssql_free_result($result); - - if ($html_table) - { - $this->html_hold .= ''; - } - break; - - case 'fromcache': - $endtime = explode(' ', microtime()); - $endtime = $endtime[0] + $endtime[1]; - - $result = @mssql_query($query, $this->db_connect_id); - while ($void = @mssql_fetch_assoc($result)) - { - // Take the time spent on parsing rows into account - } - @mssql_free_result($result); - - $splittime = explode(' ', microtime()); - $splittime = $splittime[0] + $splittime[1]; - - $this->sql_report('record_fromcache', $query, $endtime, $splittime); - - break; - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/db/mssql_2005.php b/phpBB/includes/db/mssql_2005.php deleted file mode 100644 index 9fc2e7027f..0000000000 --- a/phpBB/includes/db/mssql_2005.php +++ /dev/null @@ -1,378 +0,0 @@ -persistency = $persistency; - $this->user = $sqluser; - $this->server = $sqlserver . (($port) ? ':' . $port : ''); - $this->dbname = $database; - - $this->db_connect_id = sqlsrv_connect($this->server, array('UID' => $this->user, 'PWD' => $sqlpassword)); - - if ($this->db_connect_id && $this->dbname != '') - { - if (!sqlsrv_conn_execute($this->db_connect_id, 'USE ' . $this->dbname)) - { - @sqlsrv_conn_close($this->db_connect_id); - return false; - } - } - - return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error(''); - } - - /** - * Version information about used database - */ - function sql_server_info() - { - $server_info = sqlsrv_conn_server_info($this->db_connect_id); - - return 'MSSQL (2005)
    ' . $server_info['SQL Server Version']; - } - - /** - * SQL Transaction - * @access private - */ - function _sql_transaction($status = 'begin') - { - switch ($status) - { - case 'begin': - return sqlsrv_conn_execute($this->db_connect_id, 'BEGIN TRANSACTION'); - break; - - case 'commit': - return sqlsrv_conn_execute($this->db_connect_id, 'COMMIT TRANSACTION'); - break; - - case 'rollback': - return sqlsrv_conn_execute($this->db_connect_id, 'ROLLBACK TRANSACTION'); - break; - } - - return true; - } - - /** - * Base query method - * - * @param string $query Contains the SQL query which shall be executed - * @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache - * @return mixed When casted to bool the returned value returns true on success and false on failure - * - * @access public - */ - function sql_query($query = '', $cache_ttl = 0) - { - if ($query != '') - { - global $cache; - - if (strpos($query, 'BEGIN') === 0 || strpos($query, 'COMMIT') === 0) - { - return true; - } - - // EXPLAIN only in extra debug mode - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('start', $query); - } - - $this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false; - $this->sql_add_num_queries($this->query_result); - - if ($this->query_result === false) - { - if (($this->query_result = @sqlsrv_conn_execute($this->db_connect_id, $query)) === false) - { - $this->sql_error($query); - } - - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('stop', $query); - } - - if ($cache_ttl && method_exists($cache, 'sql_save')) - { - $this->open_queries[(int) $this->query_result] = $this->query_result; - $cache->sql_save($query, $this->query_result, $cache_ttl); - } - else if (strpos($query, 'SELECT') === 0 && $this->query_result) - { - $this->open_queries[(int) $this->query_result] = $this->query_result; - } - } - else if (defined('DEBUG_EXTRA')) - { - $this->sql_report('fromcache', $query); - } - } - else - { - return false; - } - - return ($this->query_result) ? $this->query_result : false; - } - - /** - * Build LIMIT query - */ - function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) - { - $this->query_result = false; - - // Since TOP is only returning a set number of rows we won't need it if total is set to 0 (return all rows) - if ($total) - { - // We need to grab the total number of rows + the offset number of rows to get the correct result - if (strpos($query, 'SELECT DISTINCT') === 0) - { - $query = 'SELECT DISTINCT TOP ' . ($total + $offset) . ' ' . substr($query, 15); - } - else - { - $query = 'SELECT TOP ' . ($total + $offset) . ' ' . substr($query, 6); - } - } - - $result = $this->sql_query($query, $cache_ttl); - - // Seek by $offset rows - if ($offset) - { - // We do not fetch the row for rownum == 0 because then the next resultset would be the second row - for ($i = 0; $i < $offset; $i++) - { - if (!$this->sql_fetchrow($result)) - { - return false; - } - } - } - - return $result; - } - - /** - * Return number of affected rows - */ - function sql_affectedrows() - { - return ($this->db_connect_id) ? sqlsrv_stmt_rows_affected($this->db_connect_id) : false; - } - - /** - * Fetch current row - */ - function sql_fetchrow($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_fetchrow($query_id); - } - - if ($query_id === false) - { - return false; - } - - $row = @sqlsrv_stmt_fetch_array($query_id, SQLSRV_FETCH_TYPE_ARRAY); - - // I hope i am able to remove this later... hopefully only a PHP or MSSQL bug - if ($row) - { - foreach ($row as $key => $value) - { - $row[$key] = ($value === ' ' || $value === NULL) ? '' : $value; - } - } - - return $row; - } - - /** - * Get last inserted id after insert statement - */ - function sql_nextid() - { - $result_id = @sqlsrv_conn_execute($this->db_connect_id, 'SELECT SCOPE_IDENTITY()'); - if ($result_id) - { - if ($row = @sqlsrv_stmt_fetch_array($result_id, SQLSRV_FETCH_TYPE_ARRAY)) - { - @sqlsrv_stmt_close($result_id); - return $row['computed']; - } - @sqlsrv_stmt_close($result_id); - } - - return false; - } - - /** - * Free sql result - */ - function sql_freeresult($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_freeresult($query_id); - } - - if (isset($this->open_queries[$query_id])) - { - unset($this->open_queries[$query_id]); - return @sqlsrv_stmt_close($query_id); - } - - return false; - } - - /** - * Escape string used in sql query - */ - function sql_escape($msg) - { - return str_replace("'", "''", $msg); - } - - /** - * Expose a DBMS specific function - */ - function sql_function($type, $col) - { - switch ($type) - { - case 'length_varchar': - case 'length_text': - return 'DATALENGTH(' . $col . ')'; - break; - } - } - - /** - * Build LIKE expression - * @access private - */ - function _sql_like_expression($expression) - { - return $expression . " ESCAPE '\\'"; - } - - /** - * return sql error array - * @access private - */ - function _sql_error() - { - $error = array( - 'message' => '', - 'code' => '' - ); - - foreach (sqlsrv_errors() as $error_array) - { - $error['message'] .= $error_array['message'] . "
    "; - $error['code'] .= $error_array['code'] . "
    "; - } - - return $error; - } - - /** - * Build db-specific query data - * @access private - */ - function _sql_custom_build($stage, $data) - { - return $data; - } - - /** - * Close sql connection - * @access private - */ - function _sql_close() - { - return @sqlsrv_conn_close($this->db_connect_id); - } - - /** - * Build db-specific report - * @access private - */ - function _sql_report($mode, $query = '') - { - switch ($mode) - { - case 'fromcache': - $endtime = explode(' ', microtime()); - $endtime = $endtime[0] + $endtime[1]; - - $result = @sqlsrv_conn_execute($this->db_connect_id, $query); - while ($void = @sqlsrv_stmt_fetch_array($result)) - { - // Take the time spent on parsing rows into account - } - @sqlsrv_stmt_close($result); - - $splittime = explode(' ', microtime()); - $splittime = $splittime[0] + $splittime[1]; - - $this->sql_report('record_fromcache', $query, $endtime, $splittime); - - break; - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php deleted file mode 100644 index de96939035..0000000000 --- a/phpBB/includes/db/mssql_odbc.php +++ /dev/null @@ -1,387 +0,0 @@ -persistency = $persistency; - $this->user = $sqluser; - $this->server = $sqlserver . (($port) ? ':' . $port : ''); - $this->dbname = $database; - - $max_size = @ini_get('odbc.defaultlrl'); - if (!empty($max_size)) - { - $unit = strtolower(substr($max_size, -1, 1)); - $max_size = (int) $max_size; - - if ($unit == 'k') - { - $max_size = floor($max_size / 1024); - } - else if ($unit == 'g') - { - $max_size *= 1024; - } - else if (is_numeric($unit)) - { - $max_size = floor((int) ($max_size . $unit) / 1048576); - } - $max_size = max(8, $max_size) . 'M'; - - @ini_set('odbc.defaultlrl', $max_size); - } - - $this->db_connect_id = ($this->persistency) ? @odbc_pconnect($this->server, $this->user, $sqlpassword) : @odbc_connect($this->server, $this->user, $sqlpassword); - - return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error(''); - } - - /** - * Version information about used database - */ - function sql_server_info() - { - $result_id = @odbc_exec($this->db_connect_id, "SELECT SERVERPROPERTY('productversion'), SERVERPROPERTY('productlevel'), SERVERPROPERTY('edition')"); - - $row = false; - if ($result_id) - { - $row = @odbc_fetch_array($result_id); - @odbc_free_result($result_id); - } - - if ($row) - { - return 'MSSQL (ODBC)
    ' . implode(' ', $row); - } - - return 'MSSQL (ODBC)'; - } - - /** - * SQL Transaction - * @access private - */ - function _sql_transaction($status = 'begin') - { - switch ($status) - { - case 'begin': - return @odbc_exec($this->db_connect_id, 'BEGIN TRANSACTION'); - break; - - case 'commit': - return @odbc_exec($this->db_connect_id, 'COMMIT TRANSACTION'); - break; - - case 'rollback': - return @odbc_exec($this->db_connect_id, 'ROLLBACK TRANSACTION'); - break; - } - - return true; - } - - /** - * Base query method - * - * @param string $query Contains the SQL query which shall be executed - * @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache - * @return mixed When casted to bool the returned value returns true on success and false on failure - * - * @access public - */ - function sql_query($query = '', $cache_ttl = 0) - { - if ($query != '') - { - global $cache; - - // EXPLAIN only in extra debug mode - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('start', $query); - } - - $this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false; - $this->sql_add_num_queries($this->query_result); - - if ($this->query_result === false) - { - if (($this->query_result = @odbc_exec($this->db_connect_id, $query)) === false) - { - $this->sql_error($query); - } - - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('stop', $query); - } - - if ($cache_ttl && method_exists($cache, 'sql_save')) - { - $this->open_queries[(int) $this->query_result] = $this->query_result; - $cache->sql_save($query, $this->query_result, $cache_ttl); - } - else if (strpos($query, 'SELECT') === 0 && $this->query_result) - { - $this->open_queries[(int) $this->query_result] = $this->query_result; - } - } - else if (defined('DEBUG_EXTRA')) - { - $this->sql_report('fromcache', $query); - } - } - else - { - return false; - } - - return ($this->query_result) ? $this->query_result : false; - } - - /** - * Build LIMIT query - */ - function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) - { - $this->query_result = false; - - // Since TOP is only returning a set number of rows we won't need it if total is set to 0 (return all rows) - if ($total) - { - // We need to grab the total number of rows + the offset number of rows to get the correct result - if (strpos($query, 'SELECT DISTINCT') === 0) - { - $query = 'SELECT DISTINCT TOP ' . ($total + $offset) . ' ' . substr($query, 15); - } - else - { - $query = 'SELECT TOP ' . ($total + $offset) . ' ' . substr($query, 6); - } - } - - $result = $this->sql_query($query, $cache_ttl); - - // Seek by $offset rows - if ($offset) - { - // We do not fetch the row for rownum == 0 because then the next resultset would be the second row - for ($i = 0; $i < $offset; $i++) - { - if (!$this->sql_fetchrow($result)) - { - return false; - } - } - } - - return $result; - } - - /** - * Return number of affected rows - */ - function sql_affectedrows() - { - return ($this->db_connect_id) ? @odbc_num_rows($this->query_result) : false; - } - - /** - * Fetch current row - * @note number of bytes returned depends on odbc.defaultlrl php.ini setting. If it is limited to 4K for example only 4K of data is returned max. - */ - function sql_fetchrow($query_id = false, $debug = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_fetchrow($query_id); - } - - return ($query_id !== false) ? @odbc_fetch_array($query_id) : false; - } - - /** - * Get last inserted id after insert statement - */ - function sql_nextid() - { - $result_id = @odbc_exec($this->db_connect_id, 'SELECT @@IDENTITY'); - - if ($result_id) - { - if (@odbc_fetch_array($result_id)) - { - $id = @odbc_result($result_id, 1); - @odbc_free_result($result_id); - return $id; - } - @odbc_free_result($result_id); - } - - return false; - } - - /** - * Free sql result - */ - function sql_freeresult($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_freeresult($query_id); - } - - if (isset($this->open_queries[(int) $query_id])) - { - unset($this->open_queries[(int) $query_id]); - return @odbc_free_result($query_id); - } - - return false; - } - - /** - * Escape string used in sql query - */ - function sql_escape($msg) - { - return str_replace("'", "''", $msg); - } - - /** - * Expose a DBMS specific function - */ - function sql_function($type, $col) - { - switch ($type) - { - case 'length_varchar': - case 'length_text': - return 'DATALENGTH(' . $col . ')'; - break; - } - } - - /** - * Build LIKE expression - * @access private - */ - function _sql_like_expression($expression) - { - return $expression . " ESCAPE '\\'"; - } - - /** - * Build db-specific query data - * @access private - */ - function _sql_custom_build($stage, $data) - { - return $data; - } - - /** - * return sql error array - * @access private - */ - function _sql_error() - { - return array( - 'message' => @odbc_errormsg(), - 'code' => @odbc_error() - ); - } - - /** - * Close sql connection - * @access private - */ - function _sql_close() - { - return @odbc_close($this->db_connect_id); - } - - /** - * Build db-specific report - * @access private - */ - function _sql_report($mode, $query = '') - { - switch ($mode) - { - case 'start': - break; - - case 'fromcache': - $endtime = explode(' ', microtime()); - $endtime = $endtime[0] + $endtime[1]; - - $result = @odbc_exec($this->db_connect_id, $query); - while ($void = @odbc_fetch_array($result)) - { - // Take the time spent on parsing rows into account - } - @odbc_free_result($result); - - $splittime = explode(' ', microtime()); - $splittime = $splittime[0] + $splittime[1]; - - $this->sql_report('record_fromcache', $query, $endtime, $splittime); - - break; - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php deleted file mode 100644 index 1014fe6780..0000000000 --- a/phpBB/includes/db/mysql.php +++ /dev/null @@ -1,489 +0,0 @@ -persistency = $persistency; - $this->user = $sqluser; - $this->server = $sqlserver . (($port) ? ':' . $port : ''); - $this->dbname = $database; - - $this->db_connect_id = ($this->persistency) ? @mysql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mysql_connect($this->server, $this->user, $sqlpassword, $new_link); - - if ($this->db_connect_id && $this->dbname != '') - { - if (@mysql_select_db($this->dbname, $this->db_connect_id)) - { - @mysql_query("SET NAMES 'utf8'", $this->db_connect_id); - // enforce strict mode on databases that support it - if (version_compare(mysql_get_server_info($this->db_connect_id), '5.0.2', '>=')) - { - $result = @mysql_query('SELECT @@session.sql_mode AS sql_mode', $this->db_connect_id); - $row = @mysql_fetch_assoc($result); - @mysql_free_result($result); - $modes = array_map('trim', explode(',', $row['sql_mode'])); - - // TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES - if (!in_array('TRADITIONAL', $modes)) - { - if (!in_array('STRICT_ALL_TABLES', $modes)) - { - $modes[] = 'STRICT_ALL_TABLES'; - } - - if (!in_array('STRICT_TRANS_TABLES', $modes)) - { - $modes[] = 'STRICT_TRANS_TABLES'; - } - } - - $mode = implode(',', $modes); - @mysql_query("SET SESSION sql_mode='{$mode}'", $this->db_connect_id); - } - - return $this->db_connect_id; - } - } - - return $this->sql_error(''); - } - - /** - * Version information about used database - */ - function sql_server_info() - { - return 'MySQL ' . mysql_get_server_info($this->db_connect_id); - } - - /** - * SQL Transaction - * @access private - */ - function _sql_transaction($status = 'begin') - { - switch ($status) - { - case 'begin': - return @mysql_query('BEGIN', $this->db_connect_id); - break; - - case 'commit': - return @mysql_query('COMMIT', $this->db_connect_id); - break; - - case 'rollback': - return @mysql_query('ROLLBACK', $this->db_connect_id); - break; - } - - return true; - } - - /** - * Base query method - * - * @param string $query Contains the SQL query which shall be executed - * @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache - * @return mixed When casted to bool the returned value returns true on success and false on failure - * - * @access public - */ - function sql_query($query = '', $cache_ttl = 0) - { - if ($query != '') - { - global $cache; - - // EXPLAIN only in extra debug mode - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('start', $query); - } - - $this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false; - $this->sql_add_num_queries($this->query_result); - - if ($this->query_result === false) - { - if (($this->query_result = @mysql_query($query, $this->db_connect_id)) === false) - { - $this->sql_error($query); - } - - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('stop', $query); - } - - if ($cache_ttl && method_exists($cache, 'sql_save')) - { - $this->open_queries[(int) $this->query_result] = $this->query_result; - $cache->sql_save($query, $this->query_result, $cache_ttl); - } - else if (strpos($query, 'SELECT') === 0 && $this->query_result) - { - $this->open_queries[(int) $this->query_result] = $this->query_result; - } - } - else if (defined('DEBUG_EXTRA')) - { - $this->sql_report('fromcache', $query); - } - } - else - { - return false; - } - - return ($this->query_result) ? $this->query_result : false; - } - - /** - * Build LIMIT query - */ - function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) - { - $this->query_result = false; - - // if $total is set to 0 we do not want to limit the number of rows - if ($total == 0) - { - // Having a value of -1 was always a bug - $total = '18446744073709551615'; - } - - $query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total); - - return $this->sql_query($query, $cache_ttl); - } - - /** - * Return number of affected rows - */ - function sql_affectedrows() - { - return ($this->db_connect_id) ? @mysql_affected_rows($this->db_connect_id) : false; - } - - /** - * Fetch current row - */ - function sql_fetchrow($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_fetchrow($query_id); - } - - return ($query_id !== false) ? @mysql_fetch_assoc($query_id) : false; - } - - /** - * Get last inserted id after insert statement - */ - function sql_nextid() - { - return ($this->db_connect_id) ? @mysql_insert_id($this->db_connect_id) : false; - } - - /** - * Free sql result - */ - function sql_freeresult($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_freeresult($query_id); - } - - if (isset($this->open_queries[(int) $query_id])) - { - unset($this->open_queries[(int) $query_id]); - return @mysql_free_result($query_id); - } - - return false; - } - - /** - * Escape string used in sql query - */ - function sql_escape($msg) - { - if (!$this->db_connect_id) - { - return @mysql_real_escape_string($msg); - } - - return @mysql_real_escape_string($msg, $this->db_connect_id); - } - - /** - * Expose a DBMS specific function - */ - function sql_function($type, $col) - { - switch ($type) - { - case 'length_varchar': - case 'length_text': - return 'LENGTH(' . $col . ')'; - break; - } - } - - /** - * Build LIKE expression - * @access private - */ - function _sql_like_expression($expression) - { - return $expression; - } - - /** - * Build db-specific query data - * @access private - */ - function _sql_custom_build($stage, $data) - { - switch ($stage) - { - case 'FROM': - $data = '(' . $data . ')'; - break; - } - - return $data; - } - - /** - * return sql error array - * @access private - */ - function _sql_error() - { - if (!$this->db_connect_id) - { - return array( - 'message' => @mysql_error(), - 'code' => @mysql_errno() - ); - } - - return array( - 'message' => @mysql_error($this->db_connect_id), - 'code' => @mysql_errno($this->db_connect_id) - ); - } - - /** - * Close sql connection - * @access private - */ - function _sql_close() - { - return @mysql_close($this->db_connect_id); - } - - /** - * Build db-specific report - * @access private - */ - function _sql_report($mode, $query = '') - { - static $test_prof; - static $test_extend; - - // current detection method, might just switch to see the existance of INFORMATION_SCHEMA.PROFILING - if ($test_prof === null) - { - $test_prof = $test_extend = false; - if (strpos($this->mysql_version, 'community') !== false) - { - $ver = substr($this->mysql_version, 0, strpos($this->mysql_version, '-')); - if (version_compare($ver, '5.0.37', '>=') && version_compare($ver, '5.1', '<')) - { - $test_prof = true; - } - } - - if (version_compare($ver, '4.1.1', '>=')) - { - $test_extend = true; - } - } - - switch ($mode) - { - case 'start': - - $explain_query = $query; - if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m)) - { - $explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2]; - } - else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m)) - { - $explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2]; - } - - if (preg_match('/^SELECT/', $explain_query)) - { - $html_table = false; - - // begin profiling - if ($test_prof) - { - @mysql_query('SET profiling = 1;', $this->db_connect_id); - } - - if ($result = @mysql_query('EXPLAIN ' . (($test_extend) ? 'EXTENDED ' : '') . "$explain_query", $this->db_connect_id)) - { - while ($row = @mysql_fetch_assoc($result)) - { - $html_table = $this->sql_report('add_select_row', $query, $html_table, $row); - } - } - @mysql_free_result($result); - - if ($html_table) - { - $this->html_hold .= ''; - } - - if ($test_extend) - { - $html_table = false; - - if ($result = @mysql_query('SHOW WARNINGS', $this->db_connect_id)) - { - $this->html_hold .= '
    '; - while ($row = @mysql_fetch_assoc($result)) - { - $html_table = $this->sql_report('add_select_row', $query, $html_table, $row); - } - } - @mysql_free_result($result); - - if ($html_table) - { - $this->html_hold .= ''; - } - } - - - if ($test_prof) - { - $html_table = false; - - // get the last profile - if ($result = @mysql_query('SHOW PROFILE ALL;', $this->db_connect_id)) - { - $this->html_hold .= '
    '; - while ($row = @mysql_fetch_assoc($result)) - { - // make HTML safe - if (!empty($row['Source_function'])) - { - $row['Source_function'] = str_replace(array('<', '>'), array('<', '>'), $row['Source_function']); - } - - // remove unsupported features - foreach ($row as $key => $val) - { - if ($val === null) - { - unset($row[$key]); - } - } - $html_table = $this->sql_report('add_select_row', $query, $html_table, $row); - } - } - @mysql_free_result($result); - - if ($html_table) - { - $this->html_hold .= ''; - } - - @mysql_query('SET profiling = 0;', $this->db_connect_id); - } - } - - break; - - case 'fromcache': - $endtime = explode(' ', microtime()); - $endtime = $endtime[0] + $endtime[1]; - - $result = @mysql_query($query, $this->db_connect_id); - while ($void = @mysql_fetch_assoc($result)) - { - // Take the time spent on parsing rows into account - } - @mysql_free_result($result); - - $splittime = explode(' ', microtime()); - $splittime = $splittime[0] + $splittime[1]; - - $this->sql_report('record_fromcache', $query, $endtime, $splittime); - - break; - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php deleted file mode 100644 index ffe39d63bf..0000000000 --- a/phpBB/includes/db/mysqli.php +++ /dev/null @@ -1,447 +0,0 @@ -persistency = $persistency; - $this->user = $sqluser; - $this->server = $sqlserver; - $this->dbname = $database; - $port = (!$port) ? NULL : $port; - - // Persistant connections not supported by the mysqli extension? - $this->db_connect_id = @mysqli_connect($this->server, $this->user, $sqlpassword, $this->dbname, $port); - - if ($this->db_connect_id && $this->dbname != '') - { - @mysqli_query($this->db_connect_id, "SET NAMES 'utf8'"); - // enforce strict mode on databases that support it - if (mysqli_get_server_version($this->db_connect_id) >= 50002) - { - $result = @mysqli_query($this->db_connect_id, 'SELECT @@session.sql_mode AS sql_mode'); - $row = @mysqli_fetch_assoc($result); - @mysqli_free_result($result); - $modes = array_map('trim', explode(',', $row['sql_mode'])); - - // TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES - if (!in_array('TRADITIONAL', $modes)) - { - if (!in_array('STRICT_ALL_TABLES', $modes)) - { - $modes[] = 'STRICT_ALL_TABLES'; - } - - if (!in_array('STRICT_TRANS_TABLES', $modes)) - { - $modes[] = 'STRICT_TRANS_TABLES'; - } - } - - $mode = implode(',', $modes); - @mysqli_query($this->db_connect_id, "SET SESSION sql_mode='{$mode}'"); - } - return $this->db_connect_id; - } - - return $this->sql_error(''); - } - - /** - * Version information about used database - */ - function sql_server_info() - { - return 'MySQL(i) ' . @mysqli_get_server_info($this->db_connect_id); - } - - /** - * SQL Transaction - * @access private - */ - function _sql_transaction($status = 'begin') - { - switch ($status) - { - case 'begin': - return @mysqli_autocommit($this->db_connect_id, false); - break; - - case 'commit': - $result = @mysqli_commit($this->db_connect_id); - @mysqli_autocommit($this->db_connect_id, true); - return $result; - break; - - case 'rollback': - $result = @mysqli_rollback($this->db_connect_id); - @mysqli_autocommit($this->db_connect_id, true); - return $result; - break; - } - - return true; - } - - /** - * Base query method - * - * @param string $query Contains the SQL query which shall be executed - * @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache - * @return mixed When casted to bool the returned value returns true on success and false on failure - * - * @access public - */ - function sql_query($query = '', $cache_ttl = 0) - { - if ($query != '') - { - global $cache; - - // EXPLAIN only in extra debug mode - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('start', $query); - } - - $this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false; - $this->sql_add_num_queries($this->query_result); - - if ($this->query_result === false) - { - if (($this->query_result = @mysqli_query($this->db_connect_id, $query)) === false) - { - $this->sql_error($query); - } - - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('stop', $query); - } - - if ($cache_ttl && method_exists($cache, 'sql_save')) - { - $cache->sql_save($query, $this->query_result, $cache_ttl); - } - } - else if (defined('DEBUG_EXTRA')) - { - $this->sql_report('fromcache', $query); - } - } - else - { - return false; - } - - return ($this->query_result) ? $this->query_result : false; - } - - /** - * Build LIMIT query - */ - function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) - { - $this->query_result = false; - - // if $total is set to 0 we do not want to limit the number of rows - if ($total == 0) - { - // MySQL 4.1+ no longer supports -1 in limit queries - $total = '18446744073709551615'; - } - - $query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total); - - return $this->sql_query($query, $cache_ttl); - } - - /** - * Return number of affected rows - */ - function sql_affectedrows() - { - return ($this->db_connect_id) ? @mysqli_affected_rows($this->db_connect_id) : false; - } - - /** - * Fetch current row - */ - function sql_fetchrow($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (!is_object($query_id) && isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_fetchrow($query_id); - } - - return ($query_id !== false) ? @mysqli_fetch_assoc($query_id) : false; - } - - /** - * Get last inserted id after insert statement - */ - function sql_nextid() - { - return ($this->db_connect_id) ? @mysqli_insert_id($this->db_connect_id) : false; - } - - /** - * Free sql result - */ - function sql_freeresult($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (!is_object($query_id) && isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_freeresult($query_id); - } - - return @mysqli_free_result($query_id); - } - - /** - * Escape string used in sql query - */ - function sql_escape($msg) - { - return @mysqli_real_escape_string($this->db_connect_id, $msg); - } - - /** - * Expose a DBMS specific function - */ - function sql_function($type, $col) - { - switch ($type) - { - case 'length_varchar': - case 'length_text': - return 'LENGTH(' . $col . ')'; - break; - } - } - - /** - * Build LIKE expression - * @access private - */ - function _sql_like_expression($expression) - { - return $expression; - } - - /** - * Build db-specific query data - * @access private - */ - function _sql_custom_build($stage, $data) - { - switch ($stage) - { - case 'FROM': - $data = '(' . $data . ')'; - break; - } - - return $data; - } - - /** - * return sql error array - * @access private - */ - function _sql_error() - { - if (!$this->db_connect_id) - { - return array( - 'message' => @mysqli_connect_error(), - 'code' => @mysqli_connect_errno() - ); - } - - return array( - 'message' => @mysqli_error($this->db_connect_id), - 'code' => @mysqli_errno($this->db_connect_id) - ); - } - - /** - * Close sql connection - * @access private - */ - function _sql_close() - { - return @mysqli_close($this->db_connect_id); - } - - /** - * Build db-specific report - * @access private - */ - function _sql_report($mode, $query = '') - { - static $test_prof; - - // current detection method, might just switch to see the existance of INFORMATION_SCHEMA.PROFILING - if ($test_prof === null) - { - $test_prof = false; - if (strpos(mysqli_get_server_info($this->db_connect_id), 'community') !== false) - { - $ver = mysqli_get_server_version($this->db_connect_id); - if ($ver >= 50037 && $ver < 50100) - { - $test_prof = true; - } - } - } - - switch ($mode) - { - case 'start': - - $explain_query = $query; - if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m)) - { - $explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2]; - } - else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m)) - { - $explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2]; - } - - if (preg_match('/^SELECT/', $explain_query)) - { - $html_table = false; - - // begin profiling - if ($test_prof) - { - @mysqli_query($this->db_connect_id, 'SET profiling = 1;'); - } - - if ($result = @mysqli_query($this->db_connect_id, "EXPLAIN $explain_query")) - { - while ($row = @mysqli_fetch_assoc($result)) - { - $html_table = $this->sql_report('add_select_row', $query, $html_table, $row); - } - } - @mysqli_free_result($result); - - if ($html_table) - { - $this->html_hold .= ''; - } - - if ($test_prof) - { - $html_table = false; - - // get the last profile - if ($result = @mysqli_query($this->db_connect_id, 'SHOW PROFILE ALL;')) - { - $this->html_hold .= '
    '; - while ($row = @mysqli_fetch_assoc($result)) - { - // make HTML safe - if (!empty($row['Source_function'])) - { - $row['Source_function'] = str_replace(array('<', '>'), array('<', '>'), $row['Source_function']); - } - - // remove unsupported features - foreach ($row as $key => $val) - { - if ($val === null) - { - unset($row[$key]); - } - } - $html_table = $this->sql_report('add_select_row', $query, $html_table, $row); - } - } - @mysqli_free_result($result); - - if ($html_table) - { - $this->html_hold .= ''; - } - - @mysqli_query($this->db_connect_id, 'SET profiling = 0;'); - } - } - - break; - - case 'fromcache': - $endtime = explode(' ', microtime()); - $endtime = $endtime[0] + $endtime[1]; - - $result = @mysqli_query($this->db_connect_id, $query); - while ($void = @mysqli_fetch_assoc($result)) - { - // Take the time spent on parsing rows into account - } - @mysqli_free_result($result); - - $splittime = explode(' ', microtime()); - $splittime = $splittime[0] + $splittime[1]; - - $this->sql_report('record_fromcache', $query, $endtime, $splittime); - - break; - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php deleted file mode 100644 index fc7d177377..0000000000 --- a/phpBB/includes/db/oracle.php +++ /dev/null @@ -1,658 +0,0 @@ -persistency = $persistency; - $this->user = $sqluser; - $this->server = $sqlserver . (($port) ? ':' . $port : ''); - $this->dbname = $database; - - $connect = $database; - - // support for "easy connect naming" - if ($sqlserver !== '' && $sqlserver !== '/') - { - if (substr($sqlserver, -1, 1) == '/') - { - $sqlserver == substr($sqlserver, 0, -1); - } - $connect = $sqlserver . (($port) ? ':' . $port : '') . '/' . $database; - } - - $this->db_connect_id = ($new_link) ? @oci_new_connect($this->user, $sqlpassword, $connect, 'AL32UTF8') : (($this->persistency) ? @oci_pconnect($this->user, $sqlpassword, $connect, 'AL32UTF8') : @oci_connect($this->user, $sqlpassword, $connect, 'AL32UTF8')); - - return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error(''); - } - - /** - * Version information about used database - */ - function sql_server_info() - { - return @oci_server_version($this->db_connect_id); - } - - /** - * SQL Transaction - * @access private - */ - function _sql_transaction($status = 'begin') - { - switch ($status) - { - case 'begin': - return true; - break; - - case 'commit': - return @oci_commit($this->db_connect_id); - break; - - case 'rollback': - return @oci_rollback($this->db_connect_id); - break; - } - - return true; - } - - /** - * Oracle specific code to handle the fact that it does not compare columns properly - * @access private - */ - function _rewrite_col_compare($args) - { - if (sizeof($args) == 4) - { - if ($args[2] == '=') - { - return '(' . $args[0] . ' OR (' . $args[1] . ' is NULL AND ' . $args[3] . ' is NULL))'; - } - else if ($args[2] == '<>') - { - // really just a fancy way of saying foo <> bar or (foo is NULL XOR bar is NULL) but SQL has no XOR :P - return '(' . $args[0] . ' OR ((' . $args[1] . ' is NULL AND ' . $args[3] . ' is NOT NULL) OR (' . $args[1] . ' is NOT NULL AND ' . $args[3] . ' is NULL)))'; - } - } - else - { - return $this->_rewrite_where($args[0]); - } - } - - /** - * Oracle specific code to handle it's lack of sanity - * @access private - */ - function _rewrite_where($where_clause) - { - preg_match_all('/\s*(AND|OR)?\s*([\w_.]++)\s*(?:(=|<[=>]?|>=?)\s*((?>\'(?>[^\']++|\'\')*+\'|[\d-.]+))|((NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]+,? ?)*+\)))/', $where_clause, $result, PREG_SET_ORDER); - $out = ''; - foreach ($result as $val) - { - if (!isset($val[5])) - { - if ($val[4] !== "''") - { - $out .= $val[0]; - } - else - { - $out .= ' ' . $val[1] . ' ' . $val[2]; - if ($val[3] == '=') - { - $out .= ' is NULL'; - } - else if ($val[3] == '<>') - { - $out .= ' is NOT NULL'; - } - } - } - else - { - $in_clause = array(); - $sub_exp = substr($val[5], strpos($val[5], '(') + 1, -1); - $extra = false; - preg_match_all('/\'(?>[^\']++|\'\')*+\'|[\d-.]++/', $sub_exp, $sub_vals, PREG_PATTERN_ORDER); - $i = 0; - foreach ($sub_vals[0] as $sub_val) - { - // two things: - // 1) This determines if an empty string was in the IN clausing, making us turn it into a NULL comparison - // 2) This fixes the 1000 list limit that Oracle has (ORA-01795) - if ($sub_val !== "''") - { - $in_clause[(int) $i++/1000][] = $sub_val; - } - else - { - $extra = true; - } - } - if (!$extra && $i < 1000) - { - $out .= $val[0]; - } - else - { - $out .= ' ' . $val[1] . '('; - $in_array = array(); - - // constuct each IN() clause - foreach ($in_clause as $in_values) - { - $in_array[] = $val[2] . ' ' . (isset($val[6]) ? $val[6] : '') . 'IN(' . implode(', ', $in_values) . ')'; - } - - // Join the IN() clauses against a few ORs (IN is just a nicer OR anyway) - $out .= implode(' OR ', $in_array); - - // handle the empty string case - if ($extra) - { - $out .= ' OR ' . $val[2] . ' is ' . (isset($val[6]) ? $val[6] : '') . 'NULL'; - } - $out .= ')'; - - unset($in_array, $in_clause); - } - } - } - - return $out; - } - - /** - * Base query method - * - * @param string $query Contains the SQL query which shall be executed - * @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache - * @return mixed When casted to bool the returned value returns true on success and false on failure - * - * @access public - */ - function sql_query($query = '', $cache_ttl = 0) - { - if ($query != '') - { - global $cache; - - // EXPLAIN only in extra debug mode - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('start', $query); - } - - $this->last_query_text = $query; - $this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false; - $this->sql_add_num_queries($this->query_result); - - if ($this->query_result === false) - { - $in_transaction = false; - if (!$this->transaction) - { - $this->sql_transaction('begin'); - } - else - { - $in_transaction = true; - } - - $array = array(); - - // We overcome Oracle's 4000 char limit by binding vars - if (strlen($query) > 4000) - { - if (preg_match('/^(INSERT INTO[^(]++)\\(([^()]+)\\) VALUES[^(]++\\((.*?)\\)$/s', $query, $regs)) - { - if (strlen($regs[3]) > 4000) - { - $cols = explode(', ', $regs[2]); - preg_match_all('/\'(?:[^\']++|\'\')*+\'|[\d-.]+/', $regs[3], $vals, PREG_PATTERN_ORDER); - - $inserts = $vals[0]; - unset($vals); - - foreach ($inserts as $key => $value) - { - if (!empty($value) && $value[0] === "'" && strlen($value) > 4002) // check to see if this thing is greater than the max + 'x2 - { - $inserts[$key] = ':' . strtoupper($cols[$key]); - $array[$inserts[$key]] = str_replace("''", "'", substr($value, 1, -1)); - } - } - - $query = $regs[1] . '(' . $regs[2] . ') VALUES (' . implode(', ', $inserts) . ')'; - } - } - else if (preg_match_all('/^(UPDATE [\\w_]++\\s+SET )([\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+)(?:,\\s*[\\w_]++\\s*=\\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+)\\s+(WHERE.*)$/s', $query, $data, PREG_SET_ORDER)) - { - if (strlen($data[0][2]) > 4000) - { - $update = $data[0][1]; - $where = $data[0][3]; - preg_match_all('/([\\w_]++)\\s*=\\s*(\'(?:[^\']++|\'\')*+\'|[\d-.]++)/', $data[0][2], $temp, PREG_SET_ORDER); - unset($data); - - $cols = array(); - foreach ($temp as $value) - { - if (!empty($value[2]) && $value[2][0] === "'" && strlen($value[2]) > 4002) // check to see if this thing is greater than the max + 'x2 - { - $cols[] = $value[1] . '=:' . strtoupper($value[1]); - $array[$value[1]] = str_replace("''", "'", substr($value[2], 1, -1)); - } - else - { - $cols[] = $value[1] . '=' . $value[2]; - } - } - - $query = $update . implode(', ', $cols) . ' ' . $where; - unset($cols); - } - } - } - - switch (substr($query, 0, 6)) - { - case 'DELETE': - if (preg_match('/^(DELETE FROM [\w_]++ WHERE)((?:\s*(?:AND|OR)?\s*[\w_]+\s*(?:(?:=|<>)\s*(?>\'(?>[^\']++|\'\')*+\'|[\d-.]+)|(?:NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]+,? ?)*+\)))*+)$/', $query, $regs)) - { - $query = $regs[1] . $this->_rewrite_where($regs[2]); - unset($regs); - } - break; - - case 'UPDATE': - if (preg_match('/^(UPDATE [\\w_]++\\s+SET [\\w_]+\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]++|:\w++)(?:, [\\w_]+\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]++|:\w++))*+\\s+WHERE)(.*)$/s', $query, $regs)) - { - $query = $regs[1] . $this->_rewrite_where($regs[2]); - unset($regs); - } - break; - - case 'SELECT': - $query = preg_replace_callback('/([\w_.]++)\s*(?:(=|<>)\s*(?>\'(?>[^\']++|\'\')*+\'|[\d-.]++|([\w_.]++))|(?:NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]++,? ?)*+\))/', array($this, '_rewrite_col_compare'), $query); - break; - } - - $this->query_result = @oci_parse($this->db_connect_id, $query); - - foreach ($array as $key => $value) - { - @oci_bind_by_name($this->query_result, $key, $array[$key], -1); - } - - $success = @oci_execute($this->query_result, OCI_DEFAULT); - - if (!$success) - { - $this->sql_error($query); - $this->query_result = false; - } - else - { - if (!$in_transaction) - { - $this->sql_transaction('commit'); - } - } - - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('stop', $query); - } - - if ($cache_ttl && method_exists($cache, 'sql_save')) - { - $this->open_queries[(int) $this->query_result] = $this->query_result; - $cache->sql_save($query, $this->query_result, $cache_ttl); - } - else if (strpos($query, 'SELECT') === 0 && $this->query_result) - { - $this->open_queries[(int) $this->query_result] = $this->query_result; - } - } - else if (defined('DEBUG_EXTRA')) - { - $this->sql_report('fromcache', $query); - } - } - else - { - return false; - } - - return ($this->query_result) ? $this->query_result : false; - } - - /** - * Build LIMIT query - */ - function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) - { - $this->query_result = false; - - $query = 'SELECT * FROM (SELECT /*+ FIRST_ROWS */ rownum AS xrownum, a.* FROM (' . $query . ') a WHERE rownum <= ' . ($offset + $total) . ') WHERE xrownum >= ' . $offset; - - return $this->sql_query($query, $cache_ttl); - } - - /** - * Return number of affected rows - */ - function sql_affectedrows() - { - return ($this->query_result) ? @oci_num_rows($this->query_result) : false; - } - - /** - * Fetch current row - */ - function sql_fetchrow($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_fetchrow($query_id); - } - - if ($query_id !== false) - { - $row = array(); - $row = @oci_fetch_array($query_id, OCI_ASSOC + OCI_RETURN_NULLS); - - if (!$row) - { - return false; - } - - $result_row = array(); - foreach ($row as $key => $value) - { - // Oracle treats empty strings as null - if (is_null($value)) - { - $value = ''; - } - - // OCI->CLOB? - if (is_object($value)) - { - $value = $value->load(); - } - - $result_row[strtolower($key)] = $value; - } - - return $result_row; - } - - return false; - } - - /** - * Get last inserted id after insert statement - */ - function sql_nextid() - { - $query_id = $this->query_result; - - if ($query_id !== false && $this->last_query_text != '') - { - if (preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#is', $this->last_query_text, $tablename)) - { - $query = 'SELECT ' . $tablename[1] . '_seq.currval FROM DUAL'; - $stmt = @oci_parse($this->db_connect_id, $query); - @oci_execute($stmt, OCI_DEFAULT); - - $temp_array = @oci_fetch_array($stmt, OCI_ASSOC + OCI_RETURN_NULLS); - @oci_free_statement($stmt); - - if ($temp_array) - { - return $temp_array['CURRVAL']; - } - else - { - return false; - } - } - } - - return false; - } - - /** - * Free sql result - */ - function sql_freeresult($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_freeresult($query_id); - } - - if (isset($this->open_queries[(int) $query_id])) - { - unset($this->open_queries[(int) $query_id]); - return @oci_free_statement($query_id); - } - - return false; - } - - /** - * Escape string used in sql query - */ - function sql_escape($msg) - { - return str_replace("'", "''", $msg); - } - - /** - * Expose a DBMS specific function - */ - function sql_function($type, $col) - { - switch ($type) - { - case 'length_varchar': - return 'LENGTH(' . $col . ')'; - break; - - case 'length_text': - return 'dbms_lob.getlength(' . $col . ')'; - break; - } - } - - /** - * Build LIKE expression - * @access private - */ - function _sql_like_expression($expression) - { - return $expression . " ESCAPE '\\'"; - } - - function _sql_custom_build($stage, $data) - { - return $data; - } - - /** - * return sql error array - * @access private - */ - function _sql_error() - { - $error = @oci_error(); - $error = (!$error) ? @oci_error($this->query_result) : $error; - $error = (!$error) ? @oci_error($this->db_connect_id) : $error; - - if ($error) - { - $this->last_error_result = $error; - } - else - { - $error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array(); - } - - return $error; - } - - /** - * Close sql connection - * @access private - */ - function _sql_close() - { - return @oci_close($this->db_connect_id); - } - - /** - * Build db-specific report - * @access private - */ - function _sql_report($mode, $query = '') - { - switch ($mode) - { - case 'start': - - $html_table = false; - - // Grab a plan table, any will do - $sql = "SELECT table_name - FROM USER_TABLES - WHERE table_name LIKE '%PLAN_TABLE%'"; - $stmt = oci_parse($this->db_connect_id, $sql); - oci_execute($stmt); - $result = array(); - - if ($result = oci_fetch_array($stmt, OCI_ASSOC + OCI_RETURN_NULLS)) - { - $table = $result['TABLE_NAME']; - - // This is the statement_id that will allow us to track the plan - $statement_id = substr(md5($query), 0, 30); - - // Remove any stale plans - $stmt2 = oci_parse($this->db_connect_id, "DELETE FROM $table WHERE statement_id='$statement_id'"); - oci_execute($stmt2); - oci_free_statement($stmt2); - - // Explain the plan - $sql = "EXPLAIN PLAN - SET STATEMENT_ID = '$statement_id' - FOR $query"; - $stmt2 = ociparse($this->db_connect_id, $sql); - oci_execute($stmt2); - oci_free_statement($stmt2); - - // Get the data from the plan - $sql = "SELECT operation, options, object_name, object_type, cardinality, cost - FROM plan_table - START WITH id = 0 AND statement_id = '$statement_id' - CONNECT BY PRIOR id = parent_id - AND statement_id = '$statement_id'"; - $stmt2 = oci_parse($this->db_connect_id, $sql); - oci_execute($stmt2); - - $row = array(); - while ($row = oci_fetch_array($stmt2, OCI_ASSOC + OCI_RETURN_NULLS)) - { - $html_table = $this->sql_report('add_select_row', $query, $html_table, $row); - } - - oci_free_statement($stmt2); - - // Remove the plan we just made, we delete them on request anyway - $stmt2 = oci_parse($this->db_connect_id, "DELETE FROM $table WHERE statement_id='$statement_id'"); - oci_execute($stmt2); - oci_free_statement($stmt2); - } - - oci_free_statement($stmt); - - if ($html_table) - { - $this->html_hold .= ''; - } - - break; - - case 'fromcache': - $endtime = explode(' ', microtime()); - $endtime = $endtime[0] + $endtime[1]; - - $result = @oci_parse($this->db_connect_id, $query); - $success = @oci_execute($result, OCI_DEFAULT); - $row = array(); - - while ($void = @oci_fetch_array($result, OCI_ASSOC + OCI_RETURN_NULLS)) - { - // Take the time spent on parsing rows into account - } - @oci_free_statement($result); - - $splittime = explode(' ', microtime()); - $splittime = $splittime[0] + $splittime[1]; - - $this->sql_report('record_fromcache', $query, $endtime, $splittime); - - break; - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php deleted file mode 100644 index 0cce581558..0000000000 --- a/phpBB/includes/db/postgres.php +++ /dev/null @@ -1,429 +0,0 @@ -dbname = $database; - if (strpos($database, '.') !== false) - { - list($database, $schema) = explode('.', $database); - } - $connect_string .= "dbname=$database"; - } - - $this->persistency = $persistency; - - $this->db_connect_id = ($this->persistency) ? @pg_pconnect($connect_string, $new_link) : @pg_connect($connect_string, $new_link); - - if ($this->db_connect_id) - { - // determine what version of PostgreSQL is running, we can be more efficient if they are running 8.2+ - $this->pgsql_version = @pg_parameter_status($this->db_connect_id, 'server_version'); - - if (!empty($this->pgsql_version) && $this->pgsql_version[0] >= '8') - { - if ($this->pgsql_version[2] >= '1') - { - $this->multi_table_deletion = true; - } - - if ($this->pgsql_version[2] >= '2') - { - $this->multi_insert = true; - } - } - - if ($schema !== '') - { - @pg_query($this->db_connect_id, 'SET search_path TO ' . $schema); - } - return $this->db_connect_id; - } - - return $this->sql_error(''); - } - - /** - * Version information about used database - */ - function sql_server_info() - { - return 'PostgreSQL ' . $this->pgsql_version; - } - - /** - * SQL Transaction - * @access private - */ - function _sql_transaction($status = 'begin') - { - switch ($status) - { - case 'begin': - return @pg_query($this->db_connect_id, 'BEGIN'); - break; - - case 'commit': - return @pg_query($this->db_connect_id, 'COMMIT'); - break; - - case 'rollback': - return @pg_query($this->db_connect_id, 'ROLLBACK'); - break; - } - - return true; - } - - /** - * Base query method - * - * @param string $query Contains the SQL query which shall be executed - * @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache - * @return mixed When casted to bool the returned value returns true on success and false on failure - * - * @access public - */ - function sql_query($query = '', $cache_ttl = 0) - { - if ($query != '') - { - global $cache; - - // EXPLAIN only in extra debug mode - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('start', $query); - } - - $this->last_query_text = $query; - $this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false; - $this->sql_add_num_queries($this->query_result); - - if ($this->query_result === false) - { - if (($this->query_result = pg_query($this->db_connect_id, $query)) === false) - { - $this->sql_error($query); - } - - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('stop', $query); - } - - if ($cache_ttl && method_exists($cache, 'sql_save')) - { - $this->open_queries[(int) $this->query_result] = $this->query_result; - $cache->sql_save($query, $this->query_result, $cache_ttl); - } - else if (strpos($query, 'SELECT') === 0 && $this->query_result) - { - $this->open_queries[(int) $this->query_result] = $this->query_result; - } - } - else if (defined('DEBUG_EXTRA')) - { - $this->sql_report('fromcache', $query); - } - } - else - { - return false; - } - - return ($this->query_result) ? $this->query_result : false; - } - - /** - * Build db-specific query data - * @access private - */ - function _sql_custom_build($stage, $data) - { - return $data; - } - - /** - * Build LIMIT query - */ - function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) - { - $this->query_result = false; - - // if $total is set to 0 we do not want to limit the number of rows - if ($total == 0) - { - $total = -1; - } - - $query .= "\n LIMIT $total OFFSET $offset"; - - return $this->sql_query($query, $cache_ttl); - } - - /** - * Return number of affected rows - */ - function sql_affectedrows() - { - return ($this->query_result) ? @pg_affected_rows($this->query_result) : false; - } - - /** - * Fetch current row - */ - function sql_fetchrow($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_fetchrow($query_id); - } - - return ($query_id !== false) ? @pg_fetch_assoc($query_id, null) : false; - } - - /** - * Get last inserted id after insert statement - */ - function sql_nextid() - { - $query_id = $this->query_result; - - if ($query_id !== false && $this->last_query_text != '') - { - if (preg_match("/^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)/is", $this->last_query_text, $tablename)) - { - $query = "SELECT currval('" . $tablename[1] . "_seq') AS last_value"; - $temp_q_id = @pg_query($this->db_connect_id, $query); - - if (!$temp_q_id) - { - return false; - } - - $temp_result = @pg_fetch_assoc($temp_q_id, NULL); - @pg_free_result($query_id); - - return ($temp_result) ? $temp_result['last_value'] : false; - } - } - - return false; - } - - /** - * Free sql result - */ - function sql_freeresult($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_freeresult($query_id); - } - - if (isset($this->open_queries[(int) $query_id])) - { - unset($this->open_queries[(int) $query_id]); - return @pg_free_result($query_id); - } - - return false; - } - - /** - * Escape string used in sql query - * Note: Do not use for bytea values if we may use them at a later stage - */ - function sql_escape($msg) - { - return @pg_escape_string($msg); - } - - /** - * Expose a DBMS specific function - */ - function sql_function($type, $col) - { - switch ($type) - { - case 'length_varchar': - case 'length_text': - return 'LENGTH(' . $col . ')'; - break; - } - } - - /** - * Build LIKE expression - * @access private - */ - function _sql_like_expression($expression) - { - return $expression; - } - - /** - * return sql error array - * @access private - */ - function _sql_error() - { - return array( - 'message' => (!$this->db_connect_id) ? @pg_last_error() : @pg_last_error($this->db_connect_id), - 'code' => '' - ); - } - - /** - * Close sql connection - * @access private - */ - function _sql_close() - { - return @pg_close($this->db_connect_id); - } - - /** - * Build db-specific report - * @access private - */ - function _sql_report($mode, $query = '') - { - switch ($mode) - { - case 'start': - - $explain_query = $query; - if (preg_match('/UPDATE ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m)) - { - $explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2]; - } - else if (preg_match('/DELETE FROM ([a-z0-9_]+).*?WHERE(.*)/s', $query, $m)) - { - $explain_query = 'SELECT * FROM ' . $m[1] . ' WHERE ' . $m[2]; - } - - if (preg_match('/^SELECT/', $explain_query)) - { - $html_table = false; - - if ($result = @pg_query($this->db_connect_id, "EXPLAIN $explain_query")) - { - while ($row = @pg_fetch_assoc($result, NULL)) - { - $html_table = $this->sql_report('add_select_row', $query, $html_table, $row); - } - } - @pg_free_result($result); - - if ($html_table) - { - $this->html_hold .= ''; - } - } - - break; - - case 'fromcache': - $endtime = explode(' ', microtime()); - $endtime = $endtime[0] + $endtime[1]; - - $result = @pg_query($this->db_connect_id, $query); - while ($void = @pg_fetch_assoc($result, NULL)) - { - // Take the time spent on parsing rows into account - } - @pg_free_result($result); - - $splittime = explode(' ', microtime()); - $splittime = $splittime[0] + $splittime[1]; - - $this->sql_report('record_fromcache', $query, $endtime, $splittime); - - break; - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php deleted file mode 100644 index 580a9fb1fb..0000000000 --- a/phpBB/includes/db/sqlite.php +++ /dev/null @@ -1,322 +0,0 @@ -persistency = $persistency; - $this->user = $sqluser; - $this->server = $sqlserver . (($port) ? ':' . $port : ''); - $this->dbname = $database; - - $error = ''; - $this->db_connect_id = ($this->persistency) ? @sqlite_popen($this->server, 0666, $error) : @sqlite_open($this->server, 0666, $error); - - if ($this->db_connect_id) - { - @sqlite_query('PRAGMA short_column_names = 1', $this->db_connect_id); - } - - - return ($this->db_connect_id) ? true : array('message' => $error); - } - - /** - * Version information about used database - */ - function sql_server_info() - { - return 'SQLite ' . @sqlite_libversion(); - } - - /** - * SQL Transaction - * @access private - */ - function _sql_transaction($status = 'begin') - { - switch ($status) - { - case 'begin': - return @sqlite_query('BEGIN', $this->db_connect_id); - break; - - case 'commit': - return @sqlite_query('COMMIT', $this->db_connect_id); - break; - - case 'rollback': - return @sqlite_query('ROLLBACK', $this->db_connect_id); - break; - } - - return true; - } - - /** - * Base query method - * - * @param string $query Contains the SQL query which shall be executed - * @param int $cache_ttl Either 0 to avoid caching or the time in seconds which the result shall be kept in cache - * @return mixed When casted to bool the returned value returns true on success and false on failure - * - * @access public - */ - function sql_query($query = '', $cache_ttl = 0) - { - if ($query != '') - { - global $cache; - - // EXPLAIN only in extra debug mode - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('start', $query); - } - - $this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false; - $this->sql_add_num_queries($this->query_result); - - if ($this->query_result === false) - { - if (($this->query_result = @sqlite_query($query, $this->db_connect_id)) === false) - { - $this->sql_error($query); - } - - if (defined('DEBUG_EXTRA')) - { - $this->sql_report('stop', $query); - } - - if ($cache_ttl && method_exists($cache, 'sql_save')) - { - $this->open_queries[(int) $this->query_result] = $this->query_result; - $cache->sql_save($query, $this->query_result, $cache_ttl); - } - else if (strpos($query, 'SELECT') === 0 && $this->query_result) - { - $this->open_queries[(int) $this->query_result] = $this->query_result; - } - } - else if (defined('DEBUG_EXTRA')) - { - $this->sql_report('fromcache', $query); - } - } - else - { - return false; - } - - return ($this->query_result) ? $this->query_result : false; - } - - /** - * Build LIMIT query - */ - function _sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) - { - $this->query_result = false; - - // if $total is set to 0 we do not want to limit the number of rows - if ($total == 0) - { - $total = -1; - } - - $query .= "\n LIMIT " . ((!empty($offset)) ? $offset . ', ' . $total : $total); - - return $this->sql_query($query, $cache_ttl); - } - - /** - * Return number of affected rows - */ - function sql_affectedrows() - { - return ($this->db_connect_id) ? @sqlite_changes($this->db_connect_id) : false; - } - - /** - * Fetch current row - */ - function sql_fetchrow($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_fetchrow($query_id); - } - - return ($query_id !== false) ? @sqlite_fetch_array($query_id, SQLITE_ASSOC) : false; - } - - /** - * Get last inserted id after insert statement - */ - function sql_nextid() - { - return ($this->db_connect_id) ? @sqlite_last_insert_rowid($this->db_connect_id) : false; - } - - /** - * Free sql result - */ - function sql_freeresult($query_id = false) - { - global $cache; - - if ($query_id === false) - { - $query_id = $this->query_result; - } - - if (isset($cache->sql_rowset[$query_id])) - { - return $cache->sql_freeresult($query_id); - } - - return true; - } - - /** - * Escape string used in sql query - */ - function sql_escape($msg) - { - return @sqlite_escape_string($msg); - } - - /** - * Correctly adjust LIKE expression for special characters - * For SQLite an underscore is a not-known character... this may change with SQLite3 - */ - function sql_like_expression($expression) - { - // Unlike LIKE, GLOB is case sensitive (unfortunatly). SQLite users need to live with it! - // We only catch * and ? here, not the character map possible on file globbing. - $expression = str_replace(array(chr(0) . '_', chr(0) . '%'), array(chr(0) . '?', chr(0) . '*'), $expression); - - $expression = str_replace(array('?', '*'), array("\?", "\*"), $expression); - $expression = str_replace(array(chr(0) . "\?", chr(0) . "\*"), array('?', '*'), $expression); - - return 'GLOB \'' . $this->sql_escape($expression) . '\''; - } - - /** - * Expose a DBMS specific function - */ - function sql_function($type, $col) - { - switch ($type) - { - case 'length_varchar': - case 'length_text': - return 'LENGTH(' . $col . ')'; - break; - } - } - - /** - * return sql error array - * @access private - */ - function _sql_error() - { - return array( - 'message' => @sqlite_error_string(@sqlite_last_error($this->db_connect_id)), - 'code' => @sqlite_last_error($this->db_connect_id) - ); - } - - /** - * Build db-specific query data - * @access private - */ - function _sql_custom_build($stage, $data) - { - return $data; - } - - /** - * Close sql connection - * @access private - */ - function _sql_close() - { - return @sqlite_close($this->db_connect_id); - } - - /** - * Build db-specific report - * @access private - */ - function _sql_report($mode, $query = '') - { - switch ($mode) - { - case 'start': - break; - - case 'fromcache': - $endtime = explode(' ', microtime()); - $endtime = $endtime[0] + $endtime[1]; - - $result = @sqlite_query($query, $this->db_connect_id); - while ($void = @sqlite_fetch_array($result, SQLITE_ASSOC)) - { - // Take the time spent on parsing rows into account - } - - $splittime = explode(' ', microtime()); - $splittime = $splittime[0] + $splittime[1]; - - $this->sql_report('record_fromcache', $query, $endtime, $splittime); - - break; - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php deleted file mode 100644 index 801480df95..0000000000 --- a/phpBB/includes/diff/diff.php +++ /dev/null @@ -1,779 +0,0 @@ - -*/ -class diff -{ - /** - * Array of changes. - * @var array - */ - var $_edits; - - /** - * Computes diffs between sequences of strings. - * - * @param array $from_lines An array of strings. Typically these are lines from a file. - * @param array $to_lines An array of strings. - */ - function __construct(&$from_content, &$to_content, $preserve_cr = true) - { - $diff_engine = &new diff_engine(); - $this->_edits = $diff_engine->diff($from_content, $to_content, $preserve_cr); - } - - /** - * Returns the array of differences. - */ - function get_diff() - { - return $this->_edits; - } - - /** - * Computes a reversed diff. - * - * Example: - * - * $diff = &new diff($lines1, $lines2); - * $rev = $diff->reverse(); - * - * - * @return diff A Diff object representing the inverse of the original diff. - * Note that we purposely don't return a reference here, since - * this essentially is a clone() method. - */ - function reverse() - { - if (version_compare(zend_version(), '2', '>')) - { - $rev = clone($this); - } - else - { - $rev = $this; - } - - $rev->_edits = array(); - - foreach ($this->_edits as $edit) - { - $rev->_edits[] = $edit->reverse(); - } - - return $rev; - } - - /** - * Checks for an empty diff. - * - * @return boolean True if two sequences were identical. - */ - function is_empty() - { - foreach ($this->_edits as $edit) - { - if (!is_a($edit, 'diff_op_copy')) - { - return false; - } - } - return true; - } - - /** - * Computes the length of the Longest Common Subsequence (LCS). - * - * This is mostly for diagnostic purposes. - * - * @return integer The length of the LCS. - */ - function lcs() - { - $lcs = 0; - - foreach ($this->_edits as $edit) - { - if (is_a($edit, 'diff_op_copy')) - { - $lcs += sizeof($edit->orig); - } - } - return $lcs; - } - - /** - * Gets the original set of lines. - * - * This reconstructs the $from_lines parameter passed to the constructor. - * - * @return array The original sequence of strings. - */ - function get_original() - { - $lines = array(); - - foreach ($this->_edits as $edit) - { - if ($edit->orig) - { - array_splice($lines, sizeof($lines), 0, $edit->orig); - } - } - return $lines; - } - - /** - * Gets the final set of lines. - * - * This reconstructs the $to_lines parameter passed to the constructor. - * - * @return array The sequence of strings. - */ - function get_final() - { - $lines = array(); - - foreach ($this->_edits as $edit) - { - if ($edit->final) - { - array_splice($lines, sizeof($lines), 0, $edit->final); - } - } - return $lines; - } - - /** - * Removes trailing newlines from a line of text. This is meant to be used with array_walk(). - * - * @param string &$line The line to trim. - * @param integer $key The index of the line in the array. Not used. - */ - function trim_newlines(&$line, $key) - { - $line = str_replace(array("\n", "\r"), '', $line); - } - - /** - * Checks a diff for validity. - * - * This is here only for debugging purposes. - */ - function _check($from_lines, $to_lines) - { - if (serialize($from_lines) != serialize($this->get_original())) - { - trigger_error("[diff] Reconstructed original doesn't match", E_USER_ERROR); - } - - if (serialize($to_lines) != serialize($this->get_final())) - { - trigger_error("[diff] Reconstructed final doesn't match", E_USER_ERROR); - } - - $rev = $this->reverse(); - - if (serialize($to_lines) != serialize($rev->get_original())) - { - trigger_error("[diff] Reversed original doesn't match", E_USER_ERROR); - } - - if (serialize($from_lines) != serialize($rev->get_final())) - { - trigger_error("[diff] Reversed final doesn't match", E_USER_ERROR); - } - - $prevtype = null; - - foreach ($this->_edits as $edit) - { - if ($prevtype == get_class($edit)) - { - trigger_error("[diff] Edit sequence is non-optimal", E_USER_ERROR); - } - $prevtype = get_class($edit); - } - - return true; - } -} - -/** -* @package diff -* @author Geoffrey T. Dairiki -*/ -class mapped_diff extends diff -{ - /** - * Computes a diff between sequences of strings. - * - * This can be used to compute things like case-insensitve diffs, or diffs - * which ignore changes in white-space. - * - * @param array $from_lines An array of strings. - * @param array $to_lines An array of strings. - * @param array $mapped_from_lines This array should have the same size number of elements as $from_lines. - * The elements in $mapped_from_lines and $mapped_to_lines are what is actually - * compared when computing the diff. - * @param array $mapped_to_lines This array should have the same number of elements as $to_lines. - */ - function mapped_diff(&$from_lines, &$to_lines, &$mapped_from_lines, &$mapped_to_lines) - { - if (sizeof($from_lines) != sizeof($mapped_from_lines) || sizeof($to_lines) != sizeof($mapped_to_lines)) - { - return false; - } - - parent::diff($mapped_from_lines, $mapped_to_lines); - - $xi = $yi = 0; - for ($i = 0; $i < sizeof($this->_edits); $i++) - { - $orig = &$this->_edits[$i]->orig; - if (is_array($orig)) - { - $orig = array_slice($from_lines, $xi, sizeof($orig)); - $xi += sizeof($orig); - } - - $final = &$this->_edits[$i]->final; - if (is_array($final)) - { - $final = array_slice($to_lines, $yi, sizeof($final)); - $yi += sizeof($final); - } - } - } -} - -/** -* @package diff -* @author Geoffrey T. Dairiki -* -* @access private -*/ -class diff_op -{ - var $orig; - var $final; - - function reverse() - { - trigger_error('[diff] Abstract method', E_USER_ERROR); - } - - function norig() - { - return ($this->orig) ? sizeof($this->orig) : 0; - } - - function nfinal() - { - return ($this->final) ? sizeof($this->final) : 0; - } -} - -/** -* @package diff -* @author Geoffrey T. Dairiki -* -* @access private -*/ -class diff_op_copy extends diff_op -{ - function diff_op_copy($orig, $final = false) - { - if (!is_array($final)) - { - $final = $orig; - } - $this->orig = $orig; - $this->final = $final; - } - - function &reverse() - { - $reverse = &new diff_op_copy($this->final, $this->orig); - return $reverse; - } -} - -/** -* @package diff -* @author Geoffrey T. Dairiki -* -* @access private -*/ -class diff_op_delete extends diff_op -{ - function diff_op_delete($lines) - { - $this->orig = $lines; - $this->final = false; - } - - function &reverse() - { - $reverse = &new diff_op_add($this->orig); - return $reverse; - } -} - -/** -* @package diff -* @author Geoffrey T. Dairiki -* -* @access private -*/ -class diff_op_add extends diff_op -{ - function diff_op_add($lines) - { - $this->final = $lines; - $this->orig = false; - } - - function &reverse() - { - $reverse = &new diff_op_delete($this->final); - return $reverse; - } -} - -/** -* @package diff -* @author Geoffrey T. Dairiki -* -* @access private -*/ -class diff_op_change extends diff_op -{ - function diff_op_change($orig, $final) - { - $this->orig = $orig; - $this->final = $final; - } - - function &reverse() - { - $reverse = &new diff_op_change($this->final, $this->orig); - return $reverse; - } -} - - -/** -* A class for computing three way diffs. -* -* @package diff -* @author Geoffrey T. Dairiki -*/ -class diff3 extends diff -{ - /** - * Conflict counter. - * @var integer - */ - var $_conflicting_blocks = 0; - - /** - * Computes diff between 3 sequences of strings. - * - * @param array $orig The original lines to use. - * @param array $final1 The first version to compare to. - * @param array $final2 The second version to compare to. - */ - function diff3(&$orig, &$final1, &$final2) - { - $diff_engine = &new diff_engine(); - - $diff_1 = $diff_engine->diff($orig, $final1); - $diff_2 = $diff_engine->diff($orig, $final2); - - unset($engine); - - $this->_edits = $this->_diff3($diff_1, $diff_2); - } - - /** - * Return merged output - * - * @param string $label1 the cvs file version/label from the original set of lines - * @param string $label2 the cvs file version/label from the new set of lines - * @param string $label_sep the explanation between label1 and label2 - more of a helper for the user - * @param bool $get_conflicts if set to true only the number of conflicts is returned - * @param bool $merge_new if set to true the merged output will have the new file contents on a conflicting merge - * - * @return mixed the merged output - */ - function merged_output($label1 = 'CURRENT_FILE', $label2 = 'NEW_FILE', $label_sep = 'DIFF_SEP_EXPLAIN', $get_conflicts = false, $merge_new = false) - { - global $user; - - if ($get_conflicts) - { - foreach ($this->_edits as $edit) - { - if ($edit->is_conflict()) - { - $this->_conflicting_blocks++; - } - } - - return $this->_conflicting_blocks; - } - - $label1 = (!empty($user->lang[$label1])) ? $user->lang[$label1] : $label1; - $label2 = (!empty($user->lang[$label2])) ? $user->lang[$label2] : $label2; - $label_sep = (!empty($user->lang[$label_sep])) ? $user->lang[$label_sep] : $label_sep; - - $lines = array(); - - foreach ($this->_edits as $edit) - { - if ($edit->is_conflict()) - { - if (!$merge_new) - { - $lines = array_merge($lines, array('<<<<<<<' . ($label1 ? ' ' . $label1 : '')), $edit->final1, array('=======' . ($label_sep ? ' ' . $label_sep : '')), $edit->final2, array('>>>>>>>' . ($label2 ? ' ' . $label2 : ''))); - } - else - { - $lines = array_merge($lines, $edit->final1); - } - $this->_conflicting_blocks++; - } - else - { - $lines = array_merge($lines, $edit->merged()); - } - } - - return $lines; - } - - /** - * Merge the output and use the new file code for conflicts - */ - function merged_new_output() - { - $lines = array(); - - foreach ($this->_edits as $edit) - { - if ($edit->is_conflict()) - { - $lines = array_merge($lines, $edit->final2); - } - else - { - $lines = array_merge($lines, $edit->merged()); - } - } - - return $lines; - } - - /** - * Merge the output and use the original file code for conflicts - */ - function merged_orig_output() - { - $lines = array(); - - foreach ($this->_edits as $edit) - { - if ($edit->is_conflict()) - { - $lines = array_merge($lines, $edit->final1); - } - else - { - $lines = array_merge($lines, $edit->merged()); - } - } - - return $lines; - } - - /** - * Get conflicting block(s) - */ - function get_conflicts() - { - $conflicts = array(); - - foreach ($this->_edits as $edit) - { - if ($edit->is_conflict()) - { - $conflicts[] = array($edit->final1, $edit->final2); - } - } - - return $conflicts; - } - - /** - * @access private - */ - function _diff3(&$edits1, &$edits2) - { - $edits = array(); - $bb = &new diff3_block_builder(); - - $e1 = current($edits1); - $e2 = current($edits2); - - while ($e1 || $e2) - { - if ($e1 && $e2 && is_a($e1, 'diff_op_copy') && is_a($e2, 'diff_op_copy')) - { - // We have copy blocks from both diffs. This is the (only) time we want to emit a diff3 copy block. - // Flush current diff3 diff block, if any. - if ($edit = $bb->finish()) - { - $edits[] = $edit; - } - - $ncopy = min($e1->norig(), $e2->norig()); - $edits[] = &new diff3_op_copy(array_slice($e1->orig, 0, $ncopy)); - - if ($e1->norig() > $ncopy) - { - array_splice($e1->orig, 0, $ncopy); - array_splice($e1->final, 0, $ncopy); - } - else - { - $e1 = next($edits1); - } - - if ($e2->norig() > $ncopy) - { - array_splice($e2->orig, 0, $ncopy); - array_splice($e2->final, 0, $ncopy); - } - else - { - $e2 = next($edits2); - } - } - else - { - if ($e1 && $e2) - { - if ($e1->orig && $e2->orig) - { - $norig = min($e1->norig(), $e2->norig()); - $orig = array_splice($e1->orig, 0, $norig); - array_splice($e2->orig, 0, $norig); - $bb->input($orig); - } - else - { - $norig = 0; - } - - if (is_a($e1, 'diff_op_copy')) - { - $bb->out1(array_splice($e1->final, 0, $norig)); - } - - if (is_a($e2, 'diff_op_copy')) - { - $bb->out2(array_splice($e2->final, 0, $norig)); - } - } - - if ($e1 && ! $e1->orig) - { - $bb->out1($e1->final); - $e1 = next($edits1); - } - - if ($e2 && ! $e2->orig) - { - $bb->out2($e2->final); - $e2 = next($edits2); - } - } - } - - if ($edit = $bb->finish()) - { - $edits[] = $edit; - } - - return $edits; - } -} - -/** -* @package diff -* @author Geoffrey T. Dairiki -* -* @access private -*/ -class diff3_op -{ - function __construct($orig = false, $final1 = false, $final2 = false) - { - $this->orig = $orig ? $orig : array(); - $this->final1 = $final1 ? $final1 : array(); - $this->final2 = $final2 ? $final2 : array(); - } - - function merged() - { - if (!isset($this->_merged)) - { - if ($this->final1 === $this->final2) - { - $this->_merged = &$this->final1; - } - else if ($this->final1 === $this->orig) - { - $this->_merged = &$this->final2; - } - else if ($this->final2 === $this->orig) - { - $this->_merged = &$this->final1; - } - else - { - $this->_merged = false; - } - } - - return $this->_merged; - } - - function is_conflict() - { - return ($this->merged() === false) ? true : false; - } -} - -/** -* @package diff -* @author Geoffrey T. Dairiki -* -* @access private -*/ -class diff3_op_copy extends diff3_op -{ - function diff3_op_copy($lines = false) - { - $this->orig = $lines ? $lines : array(); - $this->final1 = &$this->orig; - $this->final2 = &$this->orig; - } - - function merged() - { - return $this->orig; - } - - function is_conflict() - { - return false; - } -} - -/** -* @package diff -* @author Geoffrey T. Dairiki -* -* @access private -*/ -class diff3_block_builder -{ - function __construct() - { - $this->_init(); - } - - function input($lines) - { - if ($lines) - { - $this->_append($this->orig, $lines); - } - } - - function out1($lines) - { - if ($lines) - { - $this->_append($this->final1, $lines); - } - } - - function out2($lines) - { - if ($lines) - { - $this->_append($this->final2, $lines); - } - } - - function is_empty() - { - return !$this->orig && !$this->final1 && !$this->final2; - } - - function finish() - { - if ($this->is_empty()) - { - return false; - } - else - { - $edit = &new diff3_op($this->orig, $this->final1, $this->final2); - $this->_init(); - return $edit; - } - } - - function _init() - { - $this->orig = $this->final1 = $this->final2 = array(); - } - - function _append(&$array, $lines) - { - array_splice($array, sizeof($array), 0, $lines); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/diff/engine.php b/phpBB/includes/diff/engine.php deleted file mode 100644 index 576839ea60..0000000000 --- a/phpBB/includes/diff/engine.php +++ /dev/null @@ -1,534 +0,0 @@ - 2, and some optimizations) are from -* Geoffrey T. Dairiki . The original PHP version of this -* code was written by him, and is used/adapted with his permission. -* -* @author Geoffrey T. Dairiki -* @package diff -* -* @access private -*/ -class diff_engine -{ - function diff(&$from_lines, &$to_lines, $preserve_cr = true) - { - // Remove empty lines... - // If preserve_cr is true, we basically only change \r\n and bare \r to \n to get the same carriage returns for both files - // If it is false, we try to only use \n once per line and ommit all empty lines to be able to get a proper data diff - - if (is_array($from_lines)) - { - $from_lines = implode("\n", $from_lines); - } - - if (is_array($to_lines)) - { - $to_lines = implode("\n", $to_lines); - } - - if ($preserve_cr) - { - $from_lines = explode("\n", str_replace("\r", "\n", str_replace("\r\n", "\n", $from_lines))); - $to_lines = explode("\n", str_replace("\r", "\n", str_replace("\r\n", "\n", $to_lines))); - } - else - { - $from_lines = explode("\n", preg_replace('#[\n\r]+#', "\n", $from_lines)); - $to_lines = explode("\n", preg_replace('#[\n\r]+#', "\n", $to_lines)); - } - - $n_from = sizeof($from_lines); - $n_to = sizeof($to_lines); - - $this->xchanged = $this->ychanged = $this->xv = $this->yv = $this->xind = $this->yind = array(); - unset($this->seq, $this->in_seq, $this->lcs); - - // Skip leading common lines. - for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) - { - if ($from_lines[$skip] !== $to_lines[$skip]) - { - break; - } - $this->xchanged[$skip] = $this->ychanged[$skip] = false; - } - - // Skip trailing common lines. - $xi = $n_from; - $yi = $n_to; - - for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) - { - if ($from_lines[$xi] !== $to_lines[$yi]) - { - break; - } - $this->xchanged[$xi] = $this->ychanged[$yi] = false; - } - - // Ignore lines which do not exist in both files. - for ($xi = $skip; $xi < $n_from - $endskip; $xi++) - { - $xhash[$from_lines[$xi]] = 1; - } - - for ($yi = $skip; $yi < $n_to - $endskip; $yi++) - { - $line = $to_lines[$yi]; - - if (($this->ychanged[$yi] = empty($xhash[$line]))) - { - continue; - } - $yhash[$line] = 1; - $this->yv[] = $line; - $this->yind[] = $yi; - } - - for ($xi = $skip; $xi < $n_from - $endskip; $xi++) - { - $line = $from_lines[$xi]; - - if (($this->xchanged[$xi] = empty($yhash[$line]))) - { - continue; - } - $this->xv[] = $line; - $this->xind[] = $xi; - } - - // Find the LCS. - $this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv)); - - // Merge edits when possible. - $this->_shift_boundaries($from_lines, $this->xchanged, $this->ychanged); - $this->_shift_boundaries($to_lines, $this->ychanged, $this->xchanged); - - // Compute the edit operations. - $edits = array(); - $xi = $yi = 0; - - while ($xi < $n_from || $yi < $n_to) - { - // Skip matching "snake". - $copy = array(); - - while ($xi < $n_from && $yi < $n_to && !$this->xchanged[$xi] && !$this->ychanged[$yi]) - { - $copy[] = $from_lines[$xi++]; - $yi++; - } - - if ($copy) - { - $edits[] = &new diff_op_copy($copy); - } - - // Find deletes & adds. - $delete = array(); - while ($xi < $n_from && $this->xchanged[$xi]) - { - $delete[] = $from_lines[$xi++]; - } - - $add = array(); - while ($yi < $n_to && $this->ychanged[$yi]) - { - $add[] = $to_lines[$yi++]; - } - - if ($delete && $add) - { - $edits[] = &new diff_op_change($delete, $add); - } - else if ($delete) - { - $edits[] = &new diff_op_delete($delete); - } - else if ($add) - { - $edits[] = &new diff_op_add($add); - } - } - - return $edits; - } - - /** - * Divides the Largest Common Subsequence (LCS) of the sequences (XOFF, - * XLIM) and (YOFF, YLIM) into NCHUNKS approximately equally sized segments. - * - * Returns (LCS, PTS). LCS is the length of the LCS. PTS is an array of - * NCHUNKS+1 (X, Y) indexes giving the diving points between sub - * sequences. The first sub-sequence is contained in (X0, X1), (Y0, Y1), - * the second in (X1, X2), (Y1, Y2) and so on. Note that (X0, Y0) == - * (XOFF, YOFF) and (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM). - * - * This function assumes that the first lines of the specified portions of - * the two files do not match, and likewise that the last lines do not - * match. The caller must trim matching lines from the beginning and end - * of the portions it is going to specify. - */ - function _diag($xoff, $xlim, $yoff, $ylim, $nchunks) - { - $flip = false; - - if ($xlim - $xoff > $ylim - $yoff) - { - // Things seems faster (I'm not sure I understand why) when the shortest sequence is in X. - $flip = true; - list($xoff, $xlim, $yoff, $ylim) = array($yoff, $ylim, $xoff, $xlim); - } - - if ($flip) - { - for ($i = $ylim - 1; $i >= $yoff; $i--) - { - $ymatches[$this->xv[$i]][] = $i; - } - } - else - { - for ($i = $ylim - 1; $i >= $yoff; $i--) - { - $ymatches[$this->yv[$i]][] = $i; - } - } - - $this->lcs = 0; - $this->seq[0]= $yoff - 1; - $this->in_seq = array(); - $ymids[0] = array(); - - $numer = $xlim - $xoff + $nchunks - 1; - $x = $xoff; - - for ($chunk = 0; $chunk < $nchunks; $chunk++) - { - if ($chunk > 0) - { - for ($i = 0; $i <= $this->lcs; $i++) - { - $ymids[$i][$chunk - 1] = $this->seq[$i]; - } - } - - $x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks); - - for (; $x < $x1; $x++) - { - $line = $flip ? $this->yv[$x] : $this->xv[$x]; - if (empty($ymatches[$line])) - { - continue; - } - $matches = $ymatches[$line]; - - foreach ($matches as $y) - { - if (empty($this->in_seq[$y])) - { - $k = $this->_lcs_pos($y); - $ymids[$k] = $ymids[$k - 1]; - break; - } - } - - // no reset() here - while (list($junk, $y) = each($matches)) - { - if ($y > $this->seq[$k - 1]) - { - // Optimization: this is a common case: next match is just replacing previous match. - $this->in_seq[$this->seq[$k]] = false; - $this->seq[$k] = $y; - $this->in_seq[$y] = 1; - } - else if (empty($this->in_seq[$y])) - { - $k = $this->_lcs_pos($y); - $ymids[$k] = $ymids[$k - 1]; - } - } - } - } - - $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff); - $ymid = $ymids[$this->lcs]; - - for ($n = 0; $n < $nchunks - 1; $n++) - { - $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks); - $y1 = $ymid[$n] + 1; - $seps[] = $flip ? array($y1, $x1) : array($x1, $y1); - } - $seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim); - - return array($this->lcs, $seps); - } - - function _lcs_pos($ypos) - { - $end = $this->lcs; - - if ($end == 0 || $ypos > $this->seq[$end]) - { - $this->seq[++$this->lcs] = $ypos; - $this->in_seq[$ypos] = 1; - return $this->lcs; - } - - $beg = 1; - while ($beg < $end) - { - $mid = (int)(($beg + $end) / 2); - if ($ypos > $this->seq[$mid]) - { - $beg = $mid + 1; - } - else - { - $end = $mid; - } - } - - $this->in_seq[$this->seq[$end]] = false; - $this->seq[$end] = $ypos; - $this->in_seq[$ypos] = 1; - - return $end; - } - - /** - * Finds LCS of two sequences. - * - * The results are recorded in the vectors $this->{x,y}changed[], by - * storing a 1 in the element for each line that is an insertion or - * deletion (ie. is not in the LCS). - * - * The subsequence of file 0 is (XOFF, XLIM) and likewise for file 1. - * - * Note that XLIM, YLIM are exclusive bounds. All line numbers are - * origin-0 and discarded lines are not counted. - */ - function _compareseq($xoff, $xlim, $yoff, $ylim) - { - // Slide down the bottom initial diagonal. - while ($xoff < $xlim && $yoff < $ylim && $this->xv[$xoff] == $this->yv[$yoff]) - { - ++$xoff; - ++$yoff; - } - - // Slide up the top initial diagonal. - while ($xlim > $xoff && $ylim > $yoff && $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) - { - --$xlim; - --$ylim; - } - - if ($xoff == $xlim || $yoff == $ylim) - { - $lcs = 0; - } - else - { - // This is ad hoc but seems to work well. - // $nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5); - // $nchunks = max(2,min(8,(int)$nchunks)); - $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1; - list($lcs, $seps) = $this->_diag($xoff, $xlim, $yoff, $ylim, $nchunks); - } - - if ($lcs == 0) - { - // X and Y sequences have no common subsequence: mark all changed. - while ($yoff < $ylim) - { - $this->ychanged[$this->yind[$yoff++]] = 1; - } - - while ($xoff < $xlim) - { - $this->xchanged[$this->xind[$xoff++]] = 1; - } - } - else - { - // Use the partitions to split this problem into subproblems. - reset($seps); - $pt1 = $seps[0]; - - while ($pt2 = next($seps)) - { - $this->_compareseq($pt1[0], $pt2[0], $pt1[1], $pt2[1]); - $pt1 = $pt2; - } - } - } - - /** - * Adjusts inserts/deletes of identical lines to join changes as much as possible. - * - * We do something when a run of changed lines include a line at one end - * and has an excluded, identical line at the other. We are free to - * choose which identical line is included. 'compareseq' usually chooses - * the one at the beginning, but usually it is cleaner to consider the - * following identical line to be the "change". - * - * This is extracted verbatim from analyze.c (GNU diffutils-2.7). - */ - function _shift_boundaries($lines, &$changed, $other_changed) - { - $i = 0; - $j = 0; - - $len = sizeof($lines); - $other_len = sizeof($other_changed); - - while (1) - { - // Scan forward to find the beginning of another run of - // changes. Also keep track of the corresponding point in the other file. - // - // Throughout this code, $i and $j are adjusted together so that - // the first $i elements of $changed and the first $j elements of - // $other_changed both contain the same number of zeros (unchanged lines). - // - // Furthermore, $j is always kept so that $j == $other_len or $other_changed[$j] == false. - while ($j < $other_len && $other_changed[$j]) - { - $j++; - } - - while ($i < $len && ! $changed[$i]) - { - $i++; - $j++; - - while ($j < $other_len && $other_changed[$j]) - { - $j++; - } - } - - if ($i == $len) - { - break; - } - - $start = $i; - - // Find the end of this run of changes. - while (++$i < $len && $changed[$i]) - { - continue; - } - - do - { - // Record the length of this run of changes, so that we can later determine whether the run has grown. - $runlength = $i - $start; - - // Move the changed region back, so long as the previous unchanged line matches the last changed one. - // This merges with previous changed regions. - while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) - { - $changed[--$start] = 1; - $changed[--$i] = false; - - while ($start > 0 && $changed[$start - 1]) - { - $start--; - } - - while ($other_changed[--$j]) - { - continue; - } - } - - // Set CORRESPONDING to the end of the changed run, at the last point where it corresponds to a changed run in the - // other file. CORRESPONDING == LEN means no such point has been found. - $corresponding = $j < $other_len ? $i : $len; - - // Move the changed region forward, so long as the first changed line matches the following unchanged one. - // This merges with following changed regions. - // Do this second, so that if there are no merges, the changed region is moved forward as far as possible. - while ($i < $len && $lines[$start] == $lines[$i]) - { - $changed[$start++] = false; - $changed[$i++] = 1; - - while ($i < $len && $changed[$i]) - { - $i++; - } - - $j++; - if ($j < $other_len && $other_changed[$j]) - { - $corresponding = $i; - while ($j < $other_len && $other_changed[$j]) - { - $j++; - } - } - } - } - while ($runlength != $i - $start); - - // If possible, move the fully-merged run of changes back to a corresponding run in the other file. - while ($corresponding < $i) - { - $changed[--$start] = 1; - $changed[--$i] = 0; - - while ($other_changed[--$j]) - { - continue; - } - } - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/diff/renderer.php b/phpBB/includes/diff/renderer.php deleted file mode 100644 index 7d5cd9e5d3..0000000000 --- a/phpBB/includes/diff/renderer.php +++ /dev/null @@ -1,840 +0,0 @@ - $value) - { - $v = '_' . $param; - if (isset($this->$v)) - { - $this->$v = $value; - } - } - } - - /** - * Get any renderer parameters. - * - * @return array All parameters of this renderer object. - */ - function get_params() - { - $params = array(); - foreach (get_object_vars($this) as $k => $v) - { - if ($k[0] == '_') - { - $params[substr($k, 1)] = $v; - } - } - - return $params; - } - - /** - * Renders a diff. - * - * @param diff &$diff A diff object. - * - * @return string The formatted output. - */ - function render(&$diff) - { - $xi = $yi = 1; - $block = false; - $context = array(); - - // Create a new diff object if it is a 3-way diff - if (is_a($diff, 'diff3')) - { - $diff3 = &$diff; - - $diff_1 = $diff3->get_original(); - $diff_2 = $diff3->merged_output(); - - unset($diff3); - - $diff = &new diff($diff_1, $diff_2); - } - - $nlead = $this->_leading_context_lines; - $ntrail = $this->_trailing_context_lines; - - $output = $this->_start_diff(); - $diffs = $diff->get_diff(); - - foreach ($diffs as $i => $edit) - { - if (is_a($edit, 'diff_op_copy')) - { - if (is_array($block)) - { - $keep = ($i == sizeof($diffs) - 1) ? $ntrail : $nlead + $ntrail; - if (sizeof($edit->orig) <= $keep) - { - $block[] = $edit; - } - else - { - if ($ntrail) - { - $context = array_slice($edit->orig, 0, $ntrail); - $block[] = &new diff_op_copy($context); - } - - $output .= $this->_block($x0, $ntrail + $xi - $x0, $y0, $ntrail + $yi - $y0, $block); - $block = false; - } - } - $context = $edit->orig; - } - else - { - if (!is_array($block)) - { - $context = array_slice($context, sizeof($context) - $nlead); - $x0 = $xi - sizeof($context); - $y0 = $yi - sizeof($context); - $block = array(); - - if ($context) - { - $block[] = &new diff_op_copy($context); - } - } - $block[] = $edit; - } - - $xi += ($edit->orig) ? sizeof($edit->orig) : 0; - $yi += ($edit->final) ? sizeof($edit->final) : 0; - } - - if (is_array($block)) - { - $output .= $this->_block($x0, $xi - $x0, $y0, $yi - $y0, $block); - } - - return $output . $this->_end_diff(); - } - - function _block($xbeg, $xlen, $ybeg, $ylen, &$edits) - { - $output = $this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen)); - - foreach ($edits as $edit) - { - switch (get_class($edit)) - { - case 'diff_op_copy': - $output .= $this->_context($edit->orig); - break; - - case 'diff_op_add': - $output .= $this->_added($edit->final); - break; - - case 'diff_op_delete': - $output .= $this->_deleted($edit->orig); - break; - - case 'diff_op_change': - $output .= $this->_changed($edit->orig, $edit->final); - break; - } - } - - return $output . $this->_end_block(); - } - - function _start_diff() - { - return ''; - } - - function _end_diff() - { - return ''; - } - - function _block_header($xbeg, $xlen, $ybeg, $ylen) - { - if ($xlen > 1) - { - $xbeg .= ',' . ($xbeg + $xlen - 1); - } - - if ($ylen > 1) - { - $ybeg .= ',' . ($ybeg + $ylen - 1); - } - - return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg; - } - - function _start_block($header) - { - return $header . "\n"; - } - - function _end_block() - { - return ''; - } - - function _lines($lines, $prefix = ' ') - { - return $prefix . implode("\n$prefix", $lines) . "\n"; - } - - function _context($lines) - { - return $this->_lines($lines, ' '); - } - - function _added($lines) - { - return $this->_lines($lines, '> '); - } - - function _deleted($lines) - { - return $this->_lines($lines, '< '); - } - - function _changed($orig, $final) - { - return $this->_deleted($orig) . "---\n" . $this->_added($final); - } - - /** - * Our function to get the diff - */ - function get_diff_content($diff) - { - return $this->render($diff); - } -} - -/** -* Renders a unified diff -* @package diff -*/ -class diff_renderer_unified extends diff_renderer -{ - var $_leading_context_lines = 4; - var $_trailing_context_lines = 4; - - /** - * Our function to get the diff - */ - function get_diff_content($diff) - { - return nl2br($this->render($diff)); - } - - function _block_header($xbeg, $xlen, $ybeg, $ylen) - { - if ($xlen != 1) - { - $xbeg .= ',' . $xlen; - } - - if ($ylen != 1) - { - $ybeg .= ',' . $ylen; - } - return '
    @@ -' . $xbeg . ' +' . $ybeg . ' @@
    '; - } - - function _context($lines) - { - return '
    ' . htmlspecialchars($this->_lines($lines, ' ')) . '
    '; - } - - function _added($lines) - { - return '
    ' . htmlspecialchars($this->_lines($lines, '+')) . '
    '; - } - - function _deleted($lines) - { - return '
    ' . htmlspecialchars($this->_lines($lines, '-')) . '
    '; - } - - function _changed($orig, $final) - { - return $this->_deleted($orig) . $this->_added($final); - } - - function _start_diff() - { - $start = '
    '; - - return $start; - } - - function _end_diff() - { - return '
    '; - } - - function _end_block() - { - return ''; - } -} - -/** -* "Inline" diff renderer. -* -* This class renders diffs in the Wiki-style "inline" format. -* -* @author Ciprian Popovici -* @package diff -*/ -class diff_renderer_inline extends diff_renderer -{ - var $_leading_context_lines = 10000; - var $_trailing_context_lines = 10000; - - // Prefix and suffix for inserted text - var $_ins_prefix = ''; - var $_ins_suffix = ''; - - // Prefix and suffix for deleted text - var $_del_prefix = ''; - var $_del_suffix = ''; - - var $_block_head = ''; - - // What are we currently splitting on? Used to recurse to show word-level - var $_split_level = 'lines'; - - /** - * Our function to get the diff - */ - function get_diff_content($diff) - { - return '
    ' . nl2br($this->render($diff)) . '
    '; - } - - function _start_diff() - { - return ''; - } - - function _end_diff() - { - return ''; - } - - function _block_header($xbeg, $xlen, $ybeg, $ylen) - { - return $this->_block_head; - } - - function _start_block($header) - { - return $header; - } - - function _lines($lines, $prefix = ' ', $encode = true) - { - if ($encode) - { - array_walk($lines, array(&$this, '_encode')); - } - - if ($this->_split_level == 'words') - { - return implode('', $lines); - } - else - { - return implode("\n", $lines) . "\n"; - } - } - - function _added($lines) - { - array_walk($lines, array(&$this, '_encode')); - $lines[0] = $this->_ins_prefix . $lines[0]; - $lines[sizeof($lines) - 1] .= $this->_ins_suffix; - return $this->_lines($lines, ' ', false); - } - - function _deleted($lines, $words = false) - { - array_walk($lines, array(&$this, '_encode')); - $lines[0] = $this->_del_prefix . $lines[0]; - $lines[sizeof($lines) - 1] .= $this->_del_suffix; - return $this->_lines($lines, ' ', false); - } - - function _changed($orig, $final) - { - // If we've already split on words, don't try to do so again - just display. - if ($this->_split_level == 'words') - { - $prefix = ''; - while ($orig[0] !== false && $final[0] !== false && substr($orig[0], 0, 1) == ' ' && substr($final[0], 0, 1) == ' ') - { - $prefix .= substr($orig[0], 0, 1); - $orig[0] = substr($orig[0], 1); - $final[0] = substr($final[0], 1); - } - - return $prefix . $this->_deleted($orig) . $this->_added($final); - } - - $text1 = implode("\n", $orig); - $text2 = implode("\n", $final); - - // Non-printing newline marker. - $nl = "\0"; - - // We want to split on word boundaries, but we need to preserve whitespace as well. - // Therefore we split on words, but include all blocks of whitespace in the wordlist. - $splitted_text_1 = $this->_split_on_words($text1, $nl); - $splitted_text_2 = $this->_split_on_words($text2, $nl); - - $diff = &new diff($splitted_text_1, $splitted_text_2); - unset($splitted_text_1, $splitted_text_2); - - // Get the diff in inline format. - $renderer = &new diff_renderer_inline(array_merge($this->get_params(), array('split_level' => 'words'))); - - // Run the diff and get the output. - return str_replace($nl, "\n", $renderer->render($diff)) . "\n"; - } - - function _split_on_words($string, $newline_escape = "\n") - { - // Ignore \0; otherwise the while loop will never finish. - $string = str_replace("\0", '', $string); - - $words = array(); - $length = strlen($string); - $pos = 0; - - $tab_there = true; - while ($pos < $length) - { - // Check for tabs... do not include them - if ($tab_there && substr($string, $pos, 1) === "\t") - { - $words[] = "\t"; - $pos++; - - continue; - } - else - { - $tab_there = false; - } - - // Eat a word with any preceding whitespace. - $spaces = strspn(substr($string, $pos), " \n"); - $nextpos = strcspn(substr($string, $pos + $spaces), " \n"); - $words[] = str_replace("\n", $newline_escape, substr($string, $pos, $spaces + $nextpos)); - $pos += $spaces + $nextpos; - } - - return $words; - } - - function _encode(&$string) - { - $string = htmlspecialchars($string); - } -} - -/** -* "raw" diff renderer. -* This class could be used to output a raw unified patch file -* -* @package diff -*/ -class diff_renderer_raw extends diff_renderer -{ - var $_leading_context_lines = 4; - var $_trailing_context_lines = 4; - - /** - * Our function to get the diff - */ - function get_diff_content($diff) - { - return ''; - } - - function _block_header($xbeg, $xlen, $ybeg, $ylen) - { - if ($xlen != 1) - { - $xbeg .= ',' . $xlen; - } - - if ($ylen != 1) - { - $ybeg .= ',' . $ylen; - } - return '@@ -' . $xbeg . ' +' . $ybeg . ' @@'; - } - - function _context($lines) - { - return $this->_lines($lines, ' '); - } - - function _added($lines) - { - return $this->_lines($lines, '+'); - } - - function _deleted($lines) - { - return $this->_lines($lines, '-'); - } - - function _changed($orig, $final) - { - return $this->_deleted($orig) . $this->_added($final); - } -} - -/** -* "chora (Horde)" diff renderer - similar style. -* This renderer class is a modified human_readable function from the Horde Framework. -* -* @package diff -*/ -class diff_renderer_side_by_side extends diff_renderer -{ - var $_leading_context_lines = 3; - var $_trailing_context_lines = 3; - - var $lines = array(); - - // Hold the left and right columns of lines for change blocks. - var $cols; - var $state; - - var $data = false; - - /** - * Our function to get the diff - */ - function get_diff_content($diff) - { - global $user; - - $output = ''; - $output .= ' - - -'; - - $this->render($diff); - - // Is the diff empty? - if (!sizeof($this->lines)) - { - $output .= ''; - } - else - { - // Iterate through every header block of changes - foreach ($this->lines as $header) - { - $output .= ''; - - // Each header block consists of a number of changes (add, remove, change). - $current_context = ''; - - foreach ($header['contents'] as $change) - { - if (!empty($current_context) && $change['type'] != 'empty') - { - $line = $current_context; - $current_context = ''; - - $output .= ' - '; - } - - switch ($change['type']) - { - case 'add': - $line = ''; - - foreach ($change['lines'] as $_line) - { - $line .= htmlspecialchars($_line) . '
    '; - } - - $output .= ''; - break; - - case 'remove': - $line = ''; - - foreach ($change['lines'] as $_line) - { - $line .= htmlspecialchars($_line) . '
    '; - } - - $output .= ''; - break; - - case 'empty': - $current_context .= htmlspecialchars($change['line']) . '
    '; - break; - - case 'change': - // Pop the old/new stacks one by one, until both are empty. - $oldsize = sizeof($change['old']); - $newsize = sizeof($change['new']); - $left = $right = ''; - - for ($row = 0, $row_max = max($oldsize, $newsize); $row < $row_max; ++$row) - { - $left .= isset($change['old'][$row]) ? htmlspecialchars($change['old'][$row]) : ''; - $left .= '
    '; - $right .= isset($change['new'][$row]) ? htmlspecialchars($change['new'][$row]) : ''; - $right .= '
    '; - } - - $output .= ''; - - if (!empty($left)) - { - $output .= ''; - } - else if ($row < $oldsize) - { - $output .= ''; - } - else - { - $output .= ''; - } - - if (!empty($right)) - { - $output .= ''; - } - else if ($row < $newsize) - { - $output .= ''; - } - else - { - $output .= ''; - } - - $output .= ''; - break; - } - } - - if (!empty($current_context)) - { - $line = $current_context; - $current_context = ''; - - $output .= ''; - $output .= ''; - } - } - } - - $output .= '
    -   ' . $user->lang['LINE_UNMODIFIED'] . ' -   ' . $user->lang['LINE_ADDED'] . ' -   ' . $user->lang['LINE_MODIFIED'] . ' -   ' . $user->lang['LINE_REMOVED'] . ' -
    ' . $user->lang['NO_VISIBLE_CHANGES'] . '
    ' . $user->lang['LINE'] . ' ' . $header['oldline'] . '' . $user->lang['LINE'] . ' ' . $header['newline'] . '
    ' . ((strlen($line)) ? $line : ' ') . '
    ' . ((strlen($line)) ? $line : ' ') . '
     
    ' . ((strlen($line)) ? $line : ' ') . '
    ' . ((strlen($line)) ? $line : ' ') . '
     
    ' . $left . '
      
    ' . $right . '
      
    ' . ((strlen($line)) ? $line : ' ') . '
    ' . ((strlen($line)) ? $line : ' ') . '
    '; - - return $output; - } - - function _start_diff() - { - $this->lines = array(); - - $this->data = false; - $this->cols = array(array(), array()); - $this->state = 'empty'; - - return ''; - } - - function _end_diff() - { - // Just flush any remaining entries in the columns stack. - switch ($this->state) - { - case 'add': - $this->data['contents'][] = array('type' => 'add', 'lines' => $this->cols[0]); - break; - - case 'remove': - // We have some removal lines pending in our stack, so flush them. - $this->data['contents'][] = array('type' => 'remove', 'lines' => $this->cols[0]); - break; - - case 'change': - // We have both remove and addition lines, so this is a change block. - $this->data['contents'][] = array('type' => 'change', 'old' => $this->cols[0], 'new' => $this->cols[1]); - break; - } - - if ($this->data !== false) - { - $this->lines[] = $this->data; - } - - return ''; - } - - function _block_header($xbeg, $xlen, $ybeg, $ylen) - { - // Push any previous header information to the return stack. - if ($this->data !== false) - { - $this->lines[] = $this->data; - } - - $this->data = array('type' => 'header', 'oldline' => $xbeg, 'newline' => $ybeg, 'contents' => array()); - $this->state = 'dump'; - } - - function _added($lines) - { - array_walk($lines, array(&$this, '_perform_add')); - } - - function _perform_add($line) - { - if ($this->state == 'empty') - { - return ''; - } - - // This is just an addition line. - if ($this->state == 'dump' || $this->state == 'add') - { - // Start adding to the addition stack. - $this->cols[0][] = $line; - $this->state = 'add'; - } - else - { - // This is inside a change block, so start accumulating lines. - $this->state = 'change'; - $this->cols[1][] = $line; - } - } - - function _deleted($lines) - { - array_walk($lines, array(&$this, '_perform_delete')); - } - - function _perform_delete($line) - { - // This is a removal line. - $this->state = 'remove'; - $this->cols[0][] = $line; - } - - function _context($lines) - { - array_walk($lines, array(&$this, '_perform_context')); - } - - function _perform_context($line) - { - // An empty block with no action. - switch ($this->state) - { - case 'add': - $this->data['contents'][] = array('type' => 'add', 'lines' => $this->cols[0]); - break; - - case 'remove': - // We have some removal lines pending in our stack, so flush them. - $this->data['contents'][] = array('type' => 'remove', 'lines' => $this->cols[0]); - break; - - case 'change': - // We have both remove and addition lines, so this is a change block. - $this->data['contents'][] = array('type' => 'change', 'old' => $this->cols[0], 'new' => $this->cols[1]); - break; - } - - $this->cols = array(array(), array()); - $this->data['contents'][] = array('type' => 'empty', 'line' => $line); - $this->state = 'dump'; - } - - function _changed($orig, $final) - { - return $this->_deleted($orig) . $this->_added($final); - } - -} - -?> \ No newline at end of file diff --git a/phpBB/includes/emailer.php b/phpBB/includes/emailer.php new file mode 100755 index 0000000000..1b735d65e7 --- /dev/null +++ b/phpBB/includes/emailer.php @@ -0,0 +1,373 @@ +reset(); + $this->use_smtp = $use_smtp; + $this->reply_to = $this->from = ''; + } + + // Resets all the data (address, template file, etc etc to default + function reset() + { + $this->addresses = array(); + $this->vars = $this->msg = $this->extra_headers = ''; + } + + // Sets an email address to send to + function email_address($address) + { + $this->addresses['to'] = trim($address); + } + + function cc($address) + { + $this->addresses['cc'][] = trim($address); + } + + function bcc($address) + { + $this->addresses['bcc'][] = trim($address); + } + + function replyto($address) + { + $this->reply_to = trim($address); + } + + function from($address) + { + $this->from = trim($address); + } + + // set up subject for mail + function set_subject($subject = '') + { + $this->subject = trim(preg_replace('#[\n\r]+#s', '', $subject)); + } + + // set up extra mail headers + function extra_headers($headers) + { + $this->extra_headers .= trim($headers) . "\n"; + } + + function use_template($template_file, $template_lang = '') + { + global $board_config, $phpbb_root_path; + + if (trim($template_file) == '') + { + message_die(GENERAL_ERROR, 'No template file set', '', __LINE__, __FILE__); + } + + if (trim($template_lang) == '') + { + $template_lang = $board_config['default_lang']; + } + + if (empty($this->tpl_msg[$template_lang . $template_file])) + { + $tpl_file = $phpbb_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.tpl'; + + if (!@file_exists(@phpbb_realpath($tpl_file))) + { + $tpl_file = $phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/email/' . $template_file . '.tpl'; + + if (!@file_exists(@phpbb_realpath($tpl_file))) + { + message_die(GENERAL_ERROR, 'Could not find email template file :: ' . $template_file, '', __LINE__, __FILE__); + } + } + + if (!($fd = @fopen($tpl_file, 'r'))) + { + message_die(GENERAL_ERROR, 'Failed opening template file :: ' . $tpl_file, '', __LINE__, __FILE__); + } + + $this->tpl_msg[$template_lang . $template_file] = fread($fd, filesize($tpl_file)); + fclose($fd); + } + + $this->msg = $this->tpl_msg[$template_lang . $template_file]; + + return true; + } + + // assign variables + function assign_vars($vars) + { + $this->vars = (empty($this->vars)) ? $vars : $this->vars . $vars; + } + + // Send the mail out to the recipients set previously in var $this->address + function send() + { + global $board_config, $lang, $phpEx, $phpbb_root_path, $db; + + // Escape all quotes, else the eval will fail. + $this->msg = str_replace ("'", "\'", $this->msg); + $this->msg = preg_replace('#\{([a-z0-9\-_]*?)\}#is', "' . $\\1 . '", $this->msg); + + // Set vars + reset ($this->vars); + while (list($key, $val) = each($this->vars)) + { + $$key = $val; + } + + eval("\$this->msg = '$this->msg';"); + + // Clear vars + reset ($this->vars); + while (list($key, $val) = each($this->vars)) + { + unset($$key); + } + + // We now try and pull a subject from the email body ... if it exists, + // do this here because the subject may contain a variable + $drop_header = ''; + $match = array(); + if (preg_match('#^(Subject:(.*?))$#m', $this->msg, $match)) + { + $this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : 'No Subject'); + $drop_header .= '[\r\n]*?' . preg_quote($match[1], '#'); + } + else + { + $this->subject = (($this->subject != '') ? $this->subject : 'No Subject'); + } + + if (preg_match('#^(Charset:(.*?))$#m', $this->msg, $match)) + { + $this->encoding = (trim($match[2]) != '') ? trim($match[2]) : trim($lang['ENCODING']); + $drop_header .= '[\r\n]*?' . preg_quote($match[1], '#'); + } + else + { + $this->encoding = trim($lang['ENCODING']); + } + + if ($drop_header != '') + { + $this->msg = trim(preg_replace('#' . $drop_header . '#s', '', $this->msg)); + } + + $to = $this->addresses['to']; + + $cc = (count($this->addresses['cc'])) ? implode(', ', $this->addresses['cc']) : ''; + $bcc = (count($this->addresses['bcc'])) ? implode(', ', $this->addresses['bcc']) : ''; + + // Build header + $this->extra_headers = (($this->reply_to != '') ? "Reply-to: $this->reply_to\n" : '') . (($this->from != '') ? "From: $this->from\n" : "From: " . $board_config['board_email'] . "\n") . "Return-Path: " . $board_config['board_email'] . "\nMessage-ID: <" . md5(uniqid(time())) . "@" . $board_config['server_name'] . ">\nMIME-Version: 1.0\nContent-type: text/plain; charset=" . $this->encoding . "\nContent-transfer-encoding: 8bit\nDate: " . date('r', time()) . "\nX-Priority: 3\nX-MSMail-Priority: Normal\nX-Mailer: PHP\nX-MimeOLE: Produced By phpBB2\n" . $this->extra_headers . (($cc != '') ? "Cc: $cc\n" : '') . (($bcc != '') ? "Bcc: $bcc\n" : ''); + + // Send message ... removed $this->encode() from subject for time being + if ( $this->use_smtp ) + { + if ( !defined('SMTP_INCLUDED') ) + { + include($phpbb_root_path . 'includes/smtp.' . $phpEx); + } + + $result = smtpmail($to, $this->subject, $this->msg, $this->extra_headers); + } + else + { + $empty_to_header = ($to == '') ? TRUE : FALSE; + $to = ($to == '') ? (($board_config['sendmail_fix']) ? ' ' : 'Undisclosed-recipients:;') : $to; + + $result = @mail($to, $this->subject, preg_replace("#(?msg), $this->extra_headers); + + if (!$result && !$board_config['sendmail_fix'] && $empty_to_header) + { + $to = ' '; + + $sql = "UPDATE " . CONFIG_TABLE . " + SET config_value = '1' + WHERE config_name = 'sendmail_fix'"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Unable to update config table', '', __LINE__, __FILE__, $sql); + } + + $board_config['sendmail_fix'] = 1; + $result = @mail($to, $this->subject, preg_replace("#(?msg), $this->extra_headers); + } + } + + // Did it work? + if (!$result) + { + message_die(GENERAL_ERROR, 'Failed sending email :: ' . (($this->use_smtp) ? 'SMTP' : 'PHP') . ' :: ' . $result, '', __LINE__, __FILE__); + } + + return true; + } + + // Encodes the given string for proper display for this encoding ... nabbed + // from php.net and modified. There is an alternative encoding method which + // may produce lesd output but it's questionable as to its worth in this + // scenario IMO + function encode($str) + { + if ($this->encoding == '') + { + return $str; + } + + // define start delimimter, end delimiter and spacer + $end = "?="; + $start = "=?$this->encoding?B?"; + $spacer = "$end\r\n $start"; + + // determine length of encoded text within chunks and ensure length is even + $length = 75 - strlen($start) - strlen($end); + $length = floor($length / 2) * 2; + + // encode the string and split it into chunks with spacers after each chunk + $str = chunk_split(base64_encode($str), $length, $spacer); + + // remove trailing spacer and add start and end delimiters + $str = preg_replace('#' . preg_quote($spacer, '#') . '$#', '', $str); + + return $start . $str . $end; + } + + // + // Attach files via MIME. + // + function attachFile($filename, $mimetype = "application/octet-stream", $szFromAddress, $szFilenameToDisplay) + { + global $lang; + $mime_boundary = "--==================_846811060==_"; + + $this->msg = '--' . $mime_boundary . "\nContent-Type: text/plain;\n\tcharset=\"" . $lang['ENCODING'] . "\"\n\n" . $this->msg; + + if ($mime_filename) + { + $filename = $mime_filename; + $encoded = $this->encode_file($filename); + } + + $fd = fopen($filename, "r"); + $contents = fread($fd, filesize($filename)); + + $this->mimeOut = "--" . $mime_boundary . "\n"; + $this->mimeOut .= "Content-Type: " . $mimetype . ";\n\tname=\"$szFilenameToDisplay\"\n"; + $this->mimeOut .= "Content-Transfer-Encoding: quoted-printable\n"; + $this->mimeOut .= "Content-Disposition: attachment;\n\tfilename=\"$szFilenameToDisplay\"\n\n"; + + if ( $mimetype == "message/rfc822" ) + { + $this->mimeOut .= "From: ".$szFromAddress."\n"; + $this->mimeOut .= "To: ".$this->emailAddress."\n"; + $this->mimeOut .= "Date: ".date("D, d M Y H:i:s") . " UT\n"; + $this->mimeOut .= "Reply-To:".$szFromAddress."\n"; + $this->mimeOut .= "Subject: ".$this->mailSubject."\n"; + $this->mimeOut .= "X-Mailer: PHP/".phpversion()."\n"; + $this->mimeOut .= "MIME-Version: 1.0\n"; + } + + $this->mimeOut .= $contents."\n"; + $this->mimeOut .= "--" . $mime_boundary . "--" . "\n"; + + return $out; + // added -- to notify email client attachment is done + } + + function getMimeHeaders($filename, $mime_filename="") + { + $mime_boundary = "--==================_846811060==_"; + + if ($mime_filename) + { + $filename = $mime_filename; + } + + $out = "MIME-Version: 1.0\n"; + $out .= "Content-Type: multipart/mixed;\n\tboundary=\"$mime_boundary\"\n\n"; + $out .= "This message is in MIME format. Since your mail reader does not understand\n"; + $out .= "this format, some or all of this message may not be legible."; + + return $out; + } + + // + // Split string by RFC 2045 semantics (76 chars per line, end with \r\n). + // + function myChunkSplit($str) + { + $stmp = $str; + $len = strlen($stmp); + $out = ""; + + while ($len > 0) + { + if ($len >= 76) + { + $out .= substr($stmp, 0, 76) . "\r\n"; + $stmp = substr($stmp, 76); + $len = $len - 76; + } + else + { + $out .= $stmp . "\r\n"; + $stmp = ""; + $len = 0; + } + } + return $out; + } + + // + // Split the specified file up into a string and return it + // + function encode_file($sourcefile) + { + if (is_readable(phpbb_realpath($sourcefile))) + { + $fd = fopen($sourcefile, "r"); + $contents = fread($fd, filesize($sourcefile)); + $encoded = $this->myChunkSplit(base64_encode($contents)); + fclose($fd); + } + + return $encoded; + } + +} // class emailer + +?> \ No newline at end of file diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index b580edb693..ab8e88954f 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1,3490 +1,945 @@ " . ANONYMOUS; + break; + + case 'newestuser': + $sql = "SELECT user_id, username + FROM " . USERS_TABLE . " + WHERE user_id <> " . ANONYMOUS . " + ORDER BY user_id DESC + LIMIT 1"; + break; + + case 'postcount': + case 'topiccount': + $sql = "SELECT SUM(forum_topics) AS topic_total, SUM(forum_posts) AS post_total + FROM " . FORUMS_TABLE; + break; + } + + if ( !($result = $db->sql_query($sql)) ) + { + return false; + } + + $row = $db->sql_fetchrow($result); + + switch ( $mode ) + { + case 'usercount': + return $row['total']; + break; + case 'newestuser': + return $row; + break; + case 'postcount': + return $row['post_total']; + break; + case 'topiccount': + return $row['topic_total']; + break; + } + + return false; } -// Common global functions - -/** -* set_var -* -* Set variable, used by {@link request_var the request_var function} -* -* @access private -*/ -function set_var(&$result, $var, $type, $multibyte = false) +// added at phpBB 2.0.11 to properly format the username +function phpbb_clean_username($username) { - settype($var, $type); - $result = $var; + $username = substr(htmlspecialchars(str_replace("\'", "'", trim($username))), 0, 25); + $username = phpbb_rtrim($username, "\\"); + $username = str_replace("'", "\'", $username); - if ($type == 'string') - { - $result = trim(htmlspecialchars(str_replace(array("\r\n", "\r"), array("\n", "\n"), $result), ENT_COMPAT, 'UTF-8')); - - if (!empty($result)) - { - // Make sure multibyte characters are wellformed - if ($multibyte) - { - if (!preg_match('/^./u', $result)) - { - $result = ''; - } - } - else - { - // no multibyte, allow only ASCII (0-127) - $result = preg_replace('/[\x80-\xFF]/', '?', $result); - } - } - - $result = (STRIP) ? stripslashes($result) : $result; - } + return $username; } /** -* request_var -* -* Used to get passed variable +* This function is a wrapper for ltrim, as charlist is only supported in php >= 4.1.0 +* Added in phpBB 2.0.18 */ -function request_var($var_name, $default, $multibyte = false, $cookie = false) +function phpbb_ltrim($str, $charlist = false) { - if (!$cookie && isset($_COOKIE[$var_name])) + if ($charlist === false) { - if (!isset($_GET[$var_name]) && !isset($_POST[$var_name])) + return ltrim($str); + } + + $php_version = explode('.', PHP_VERSION); + + // php version < 4.1.0 + if ((int) $php_version[0] < 4 || ((int) $php_version[0] == 4 && (int) $php_version[1] < 1)) + { + while ($str{0} == $charlist) { - return (is_array($default)) ? array() : $default; - } - $_REQUEST[$var_name] = isset($_POST[$var_name]) ? $_POST[$var_name] : $_GET[$var_name]; - } - - if (!isset($_REQUEST[$var_name]) || (is_array($_REQUEST[$var_name]) && !is_array($default)) || (is_array($default) && !is_array($_REQUEST[$var_name]))) - { - return (is_array($default)) ? array() : $default; - } - - $var = $_REQUEST[$var_name]; - if (!is_array($default)) - { - $type = gettype($default); - } - else - { - list($key_type, $type) = each($default); - $type = gettype($type); - $key_type = gettype($key_type); - if ($type == 'array') - { - reset($default); - $default = current($default); - list($sub_key_type, $sub_type) = each($default); - $sub_type = gettype($sub_type); - $sub_type = ($sub_type == 'array') ? 'NULL' : $sub_type; - $sub_key_type = gettype($sub_key_type); - } - } - - if (is_array($var)) - { - $_var = $var; - $var = array(); - - foreach ($_var as $k => $v) - { - set_var($k, $k, $key_type); - if ($type == 'array' && is_array($v)) - { - foreach ($v as $_k => $_v) - { - if (is_array($_v)) - { - $_v = null; - } - set_var($_k, $_k, $sub_key_type); - set_var($var[$k][$_k], $_v, $sub_type, $multibyte); - } - } - else - { - if ($type == 'array' || is_array($v)) - { - $v = null; - } - set_var($var[$k], $v, $type, $multibyte); - } + $str = substr($str, 1); } } else { - set_var($var, $var, $type, $multibyte); + $str = ltrim($str, $charlist); } - return $var; + return $str; } -/** -* Set config value. Creates missing config entry. -*/ -function set_config($config_name, $config_value, $is_dynamic = false) +// added at phpBB 2.0.12 to fix a bug in PHP 4.3.10 (only supporting charlist in php >= 4.1.0) +function phpbb_rtrim($str, $charlist = false) { - global $db, $cache, $config; - - $sql = 'UPDATE ' . CONFIG_TABLE . " - SET config_value = '" . $db->sql_escape($config_value) . "' - WHERE config_name = '" . $db->sql_escape($config_name) . "'"; - $db->sql_query($sql); - - if (!$db->sql_affectedrows() && !isset($config[$config_name])) + if ($charlist === false) { - $sql = 'INSERT INTO ' . CONFIG_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'config_name' => $config_name, - 'config_value' => $config_value, - 'is_dynamic' => ($is_dynamic) ? 1 : 0)); - $db->sql_query($sql); + return rtrim($str); } + + $php_version = explode('.', PHP_VERSION); - $config[$config_name] = $config_value; - - if (!$is_dynamic) + // php version < 4.1.0 + if ((int) $php_version[0] < 4 || ((int) $php_version[0] == 4 && (int) $php_version[1] < 1)) { - $cache->destroy('config'); + while ($str{strlen($str)-1} == $charlist) + { + $str = substr($str, 0, strlen($str)-1); + } } + else + { + $str = rtrim($str, $charlist); + } + + return $str; } /** -* Generates an alphanumeric random string of given length +* Our own generator of random values +* This uses a constantly changing value as the base for generating the values +* The board wide setting is updated once per page if this code is called +* With thanks to Anthrax101 for the inspiration on this one +* Added in phpBB 2.0.20 */ -function gen_rand_string($num_chars = 8) +function dss_rand() { - $rand_str = unique_id(); - $rand_str = str_replace('0', 'Z', strtoupper(base_convert($rand_str, 16, 35))); + global $db, $board_config, $dss_seeded; - return substr($rand_str, 0, $num_chars); -} - -/** -* Return unique id -* @param string $extra additional entropy -*/ -function unique_id($extra = 'c') -{ - static $dss_seeded = false; - global $config; - - $val = $config['rand_seed'] . microtime(); + $val = $board_config['rand_seed'] . microtime(); $val = md5($val); - $config['rand_seed'] = md5($config['rand_seed'] . $val . $extra); - - if ($dss_seeded !== true && ($config['rand_seed_last_update'] < time() - rand(1,10))) + $board_config['rand_seed'] = md5($board_config['rand_seed'] . $val . 'a'); + + if($dss_seeded !== true) { - set_config('rand_seed', $config['rand_seed'], true); - set_config('rand_seed_last_update', time(), true); + $sql = "UPDATE " . CONFIG_TABLE . " SET + config_value = '" . $board_config['rand_seed'] . "' + WHERE config_name = 'rand_seed'"; + + if( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Unable to reseed PRNG", "", __LINE__, __FILE__, $sql); + } + $dss_seeded = true; } return substr($val, 4, 16); } - -/** -* Return formatted string for filesizes -*/ -function get_formatted_filesize($bytes, $add_size_lang = true) +// +// Get Userdata, $user can be username or user_id. If force_str is true, the username will be forced. +// +function get_userdata($user, $force_str = false) { - global $user; + global $db; - if ($bytes >= pow(2, 20)) + if (!is_numeric($user) || $force_str) { - return ($add_size_lang) ? round($bytes / 1024 / 1024, 2) . ' ' . $user->lang['MIB'] : round($bytes / 1024 / 1024, 2); - } - - if ($bytes >= pow(2, 10)) - { - return ($add_size_lang) ? round($bytes / 1024, 2) . ' ' . $user->lang['KIB'] : round($bytes / 1024, 2); - } - - return ($add_size_lang) ? ($bytes) . ' ' . $user->lang['BYTES'] : ($bytes); -} - -/** -* Determine whether we are approaching the maximum execution time. Should be called once -* at the beginning of the script in which it's used. -* @return bool Either true if the maximum execution time is nearly reached, or false -* if some time is still left. -*/ -function still_on_time($extra_time = 15) -{ - static $max_execution_time, $start_time; - - $time = explode(' ', microtime()); - $current_time = $time[0] + $time[1]; - - if (empty($max_execution_time)) - { - $max_execution_time = (function_exists('ini_get')) ? (int) @ini_get('max_execution_time') : (int) @get_cfg_var('max_execution_time'); - - // If zero, then set to something higher to not let the user catch the ten seconds barrier. - if ($max_execution_time === 0) - { - $max_execution_time = 50 + $extra_time; - } - - $max_execution_time = min(max(10, ($max_execution_time - $extra_time)), 50); - - // For debugging purposes - // $max_execution_time = 10; - - global $starttime; - $start_time = (empty($starttime)) ? $current_time : $starttime; - } - - return (ceil($current_time - $start_time) < $max_execution_time) ? true : false; -} - -/** -* -* @version Version 0.1 / $Id$ -* -* Portable PHP password hashing framework. -* -* Written by Solar Designer in 2004-2006 and placed in -* the public domain. -* -* There's absolutely no warranty. -* -* The homepage URL for this framework is: -* -* http://www.openwall.com/phpass/ -* -* Please be sure to update the Version line if you edit this file in any way. -* It is suggested that you leave the main version number intact, but indicate -* your project name (after the slash) and add your own revision information. -* -* Please do not change the "private" password hashing method implemented in -* here, thereby making your hashes incompatible. However, if you must, please -* change the hash type identifier (the "$P$") to something different. -* -* Obviously, since this code is in the public domain, the above are not -* requirements (there can be none), but merely suggestions. -* -* -* Hash the password -*/ -function phpbb_hash($password) -{ - $itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; - - $random_state = unique_id(); - $random = ''; - $count = 6; - - if (($fh = @fopen('/dev/urandom', 'rb'))) - { - $random = fread($fh, $count); - fclose($fh); - } - - if (strlen($random) < $count) - { - $random = ''; - - for ($i = 0; $i < $count; $i += 16) - { - $random_state = md5(unique_id() . $random_state); - $random .= pack('H*', md5($random_state)); - } - $random = substr($random, 0, $count); - } - - $hash = _hash_crypt_private($password, _hash_gensalt_private($random, $itoa64), $itoa64); - - if (strlen($hash) == 34) - { - return $hash; - } - - return md5($password); -} - -/** -* Check for correct password -*/ -function phpbb_check_hash($password, $hash) -{ - $itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; - if (strlen($hash) == 34) - { - return (_hash_crypt_private($password, $hash, $itoa64) === $hash) ? true : false; - } - - return (md5($password) === $hash) ? true : false; -} - -/** -* Generate salt for hash generation -*/ -function _hash_gensalt_private($input, &$itoa64, $iteration_count_log2 = 6) -{ - if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31) - { - $iteration_count_log2 = 8; - } - - $output = '$H$'; - $output .= $itoa64[min($iteration_count_log2 + 5, 30)]; - $output .= _hash_encode64($input, 6, $itoa64); - - return $output; -} - -/** -* Encode hash -*/ -function _hash_encode64($input, $count, &$itoa64) -{ - $output = ''; - $i = 0; - - do - { - $value = ord($input[$i++]); - $output .= $itoa64[$value & 0x3f]; - - if ($i < $count) - { - $value |= ord($input[$i]) << 8; - } - - $output .= $itoa64[($value >> 6) & 0x3f]; - - if ($i++ >= $count) - { - break; - } - - if ($i < $count) - { - $value |= ord($input[$i]) << 16; - } - - $output .= $itoa64[($value >> 12) & 0x3f]; - - if ($i++ >= $count) - { - break; - } - - $output .= $itoa64[($value >> 18) & 0x3f]; - } - while ($i < $count); - - return $output; -} - -/** -* The crypt function/replacement -*/ -function _hash_crypt_private($password, $setting, &$itoa64) -{ - $output = '*'; - - // Check for correct hash - if (substr($setting, 0, 3) != '$H$') - { - return $output; - } - - $count_log2 = strpos($itoa64, $setting[3]); - - if ($count_log2 < 7 || $count_log2 > 30) - { - return $output; - } - - $count = 1 << $count_log2; - $salt = substr($setting, 4, 8); - - if (strlen($salt) != 8) - { - return $output; - } - - /** - * We're kind of forced to use MD5 here since it's the only - * cryptographic primitive available in all versions of PHP - * currently in use. To implement our own low-level crypto - * in PHP would result in much worse performance and - * consequently in lower iteration counts and hashes that are - * quicker to crack (by non-PHP code). - */ - $hash = md5($salt . $password, true); - do - { - $hash = md5($hash . $password, true); - } - while (--$count); - - $output = substr($setting, 0, 12); - $output .= _hash_encode64($hash, 16, $itoa64); - - return $output; -} - -/** -* Checks if a path ($path) is absolute or relative -* -* @param string $path Path to check absoluteness of -* @return boolean -*/ -function is_absolute($path) -{ - return ($path[0] == '/' || (DIRECTORY_SEPARATOR == '\\' && preg_match('#^[a-z]:/#i', $path))) ? true : false; -} - -/** -* @author Chris Smith -* @copyright 2006 Project Minerva Team -* @param string $path The path which we should attempt to resolve. -* @return mixed -*/ -function phpbb_own_realpath($path) -{ - // Now to perform funky shizzle - - // Switch to use UNIX slashes - $path = str_replace(DIRECTORY_SEPARATOR, '/', $path); - $path_prefix = ''; - - // Determine what sort of path we have - if (is_absolute($path)) - { - $absolute = true; - - if ($path[0] == '/') - { - // Absolute path, *NIX style - $path_prefix = ''; - } - else - { - // Absolute path, Windows style - // Remove the drive letter and colon - $path_prefix = $path[0] . ':'; - $path = substr($path, 2); - } + $user = phpbb_clean_username($user); } else { - // Relative Path - // Prepend the current working directory - if (function_exists('getcwd')) - { - // This is the best method, hopefully it is enabled! - $path = str_replace(DIRECTORY_SEPARATOR, '/', getcwd()) . '/' . $path; - $absolute = true; - if (preg_match('#^[a-z]:#i', $path)) - { - $path_prefix = $path[0] . ':'; - $path = substr($path, 2); - } - else - { - $path_prefix = ''; - } - } - else if (isset($_SERVER['SCRIPT_FILENAME']) && !empty($_SERVER['SCRIPT_FILENAME'])) - { - // Warning: If chdir() has been used this will lie! - // Warning: This has some problems sometime (CLI can create them easily) - $path = str_replace(DIRECTORY_SEPARATOR, '/', dirname($_SERVER['SCRIPT_FILENAME'])) . '/' . $path; - $absolute = true; - $path_prefix = ''; - } - else - { - // We have no way of getting the absolute path, just run on using relative ones. - $absolute = false; - $path_prefix = '.'; - } + $user = intval($user); } - // Remove any repeated slashes - $path = preg_replace('#/{2,}#', '/', $path); - - // Remove the slashes from the start and end of the path - $path = trim($path, '/'); - - // Break the string into little bits for us to nibble on - $bits = explode('/', $path); - - // Remove any . in the path, renumber array for the loop below - $bits = array_values(array_diff($bits, array('.'))); - - // Lets get looping, run over and resolve any .. (up directory) - for ($i = 0, $max = sizeof($bits); $i < $max; $i++) + $sql = "SELECT * + FROM " . USERS_TABLE . " + WHERE "; + $sql .= ( ( is_integer($user) ) ? "user_id = $user" : "username = '" . str_replace("\'", "''", $user) . "'" ) . " AND user_id <> " . ANONYMOUS; + if ( !($result = $db->sql_query($sql)) ) { - // @todo Optimise - if ($bits[$i] == '..' ) - { - if (isset($bits[$i - 1])) - { - if ($bits[$i - 1] != '..') - { - // We found a .. and we are able to traverse upwards, lets do it! - unset($bits[$i]); - unset($bits[$i - 1]); - $i -= 2; - $max -= 2; - $bits = array_values($bits); - } - } - else if ($absolute) // ie. !isset($bits[$i - 1]) && $absolute - { - // We have an absolute path trying to descend above the root of the filesystem - // ... Error! - return false; - } - } + message_die(GENERAL_ERROR, 'Tried obtaining data for a non-existent user', '', __LINE__, __FILE__, $sql); } - // Prepend the path prefix - array_unshift($bits, $path_prefix); - - $resolved = ''; - - $max = sizeof($bits) - 1; - - // Check if we are able to resolve symlinks, Windows cannot. - $symlink_resolve = (function_exists('readlink')) ? true : false; - - foreach ($bits as $i => $bit) - { - if (@is_dir("$resolved/$bit") || ($i == $max && @is_file("$resolved/$bit"))) - { - // Path Exists - if ($symlink_resolve && is_link("$resolved/$bit") && ($link = readlink("$resolved/$bit"))) - { - // Resolved a symlink. - $resolved = $link . (($i == $max) ? '' : '/'); - continue; - } - } - else - { - // Something doesn't exist here! - // This is correct realpath() behaviour but sadly open_basedir and safe_mode make this problematic - // return false; - } - $resolved .= $bit . (($i == $max) ? '' : '/'); - } - - // @todo If the file exists fine and open_basedir only has one path we should be able to prepend it - // because we must be inside that basedir, the question is where... - // @internal The slash in is_dir() gets around an open_basedir restriction - if (!@file_exists($resolved) || (!is_dir($resolved . '/') && !is_file($resolved))) - { - return false; - } - - // Put the slashes back to the native operating systems slashes - $resolved = str_replace('/', DIRECTORY_SEPARATOR, $resolved); - - // Check for DIRECTORY_SEPARATOR at the end (and remove it!) - if (substr($resolved, -1) == DIRECTORY_SEPARATOR) - { - return substr($resolved, 0, -1); - } - - return $resolved; // We got here, in the end! + return ( $row = $db->sql_fetchrow($result) ) ? $row : false; } -if (!function_exists('realpath')) +function make_jumpbox($action, $match_forum_id = 0) { - /** - * A wrapper for realpath - * @ignore - */ - function phpbb_realpath($path) + global $template, $userdata, $lang, $db, $nav_links, $phpEx, $SID; + +// $is_auth = auth(AUTH_VIEW, AUTH_LIST_ALL, $userdata); + + $sql = "SELECT c.cat_id, c.cat_title, c.cat_order + FROM " . CATEGORIES_TABLE . " c, " . FORUMS_TABLE . " f + WHERE f.cat_id = c.cat_id + GROUP BY c.cat_id, c.cat_title, c.cat_order + ORDER BY c.cat_order"; + if ( !($result = $db->sql_query($sql)) ) { - return phpbb_own_realpath($path); + message_die(GENERAL_ERROR, "Couldn't obtain category list.", "", __LINE__, __FILE__, $sql); } -} -else -{ - /** - * A wrapper for realpath - */ - function phpbb_realpath($path) + + $category_rows = array(); + while ( $row = $db->sql_fetchrow($result) ) { - $realpath = realpath($path); - - // Strangely there are provider not disabling realpath but returning strange values. :o - // We at least try to cope with them. - if ($realpath === $path || $realpath === false) - { - return phpbb_own_realpath($path); - } - - // Check for DIRECTORY_SEPARATOR at the end (and remove it!) - if (substr($realpath, -1) == DIRECTORY_SEPARATOR) - { - $realpath = substr($realpath, 0, -1); - } - - return $realpath; - } -} - -// functions used for building option fields - -/** -* Pick a language, any language ... -*/ -function language_select($default = '') -{ - global $db; - - $sql = 'SELECT lang_iso, lang_local_name - FROM ' . LANG_TABLE . ' - ORDER BY lang_english_name'; - $result = $db->sql_query($sql); - - $lang_options = ''; - while ($row = $db->sql_fetchrow($result)) - { - $selected = ($row['lang_iso'] == $default) ? ' selected="selected"' : ''; - $lang_options .= ''; - } - $db->sql_freeresult($result); - - return $lang_options; -} - -/** -* Pick a template/theme combo, -*/ -function style_select($default = '', $all = false) -{ - global $db; - - $sql_where = (!$all) ? 'WHERE style_active = 1 ' : ''; - $sql = 'SELECT style_id, style_name - FROM ' . STYLES_TABLE . " - $sql_where - ORDER BY style_name"; - $result = $db->sql_query($sql); - - $style_options = ''; - while ($row = $db->sql_fetchrow($result)) - { - $selected = ($row['style_id'] == $default) ? ' selected="selected"' : ''; - $style_options .= ''; - } - $db->sql_freeresult($result); - - return $style_options; -} - -/** -* Pick a timezone -*/ -function tz_select($default = '', $truncate = false) -{ - global $user; - - $tz_select = ''; - foreach ($user->lang['tz_zones'] as $offset => $zone) - { - if ($truncate) - { - $zone_trunc = truncate_string($zone, 50, false, '...'); - } - else - { - $zone_trunc = $zone; - } - - if (is_numeric($offset)) - { - $selected = ($offset == $default) ? ' selected="selected"' : ''; - $tz_select .= ''; - } + $category_rows[] = $row; } - return $tz_select; -} - -// Functions handling topic/post tracking/marking - -/** -* Marks a topic/forum as read -* Marks a topic as posted to -* -* @param int $user_id can only be used with $mode == 'post' -*/ -function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $user_id = 0) -{ - global $db, $user, $config; - - if ($mode == 'all') + if ( $total_categories = count($category_rows) ) { - if ($forum_id === false || !sizeof($forum_id)) + $sql = "SELECT * + FROM " . FORUMS_TABLE . " + ORDER BY cat_id, forum_order"; + if ( !($result = $db->sql_query($sql)) ) { - if ($config['load_db_lastread'] && $user->data['is_registered']) - { - // Mark all forums read (index page) - $db->sql_query('DELETE FROM ' . TOPICS_TRACK_TABLE . " WHERE user_id = {$user->data['user_id']}"); - $db->sql_query('DELETE FROM ' . FORUMS_TRACK_TABLE . " WHERE user_id = {$user->data['user_id']}"); - $db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_lastmark = ' . time() . " WHERE user_id = {$user->data['user_id']}"); - } - else if ($config['load_anon_lastread'] || $user->data['is_registered']) - { - $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_track'])) ? ((STRIP) ? stripslashes($_COOKIE[$config['cookie_name'] . '_track']) : $_COOKIE[$config['cookie_name'] . '_track']) : ''; - $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array(); - - unset($tracking_topics['tf']); - unset($tracking_topics['t']); - unset($tracking_topics['f']); - $tracking_topics['l'] = base_convert(time() - $config['board_startdate'], 10, 36); - - $user->set_cookie('track', tracking_serialize($tracking_topics), time() + 31536000); - $_COOKIE[$config['cookie_name'] . '_track'] = (STRIP) ? addslashes(tracking_serialize($tracking_topics)) : tracking_serialize($tracking_topics); - - unset($tracking_topics); - - if ($user->data['is_registered']) - { - $db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_lastmark = ' . time() . " WHERE user_id = {$user->data['user_id']}"); - } - } + message_die(GENERAL_ERROR, 'Could not obtain forums information', '', __LINE__, __FILE__, $sql); } - return; - } - else if ($mode == 'topics') - { - // Mark all topics in forums read - if (!is_array($forum_id)) + $boxstring = ''; } else { - $row = true; + $boxstring .= ''; } - if (!$row) - { - markread('topics', $forum_id); - return true; - } - - return false; -} - -/** -* Transform an array into a serialized format -*/ -function tracking_serialize($input) -{ - $out = ''; - foreach ($input as $key => $value) - { - if (is_array($value)) - { - $out .= $key . ':(' . tracking_serialize($value) . ');'; - } - else - { - $out .= $key . ':' . $value . ';'; - } - } - return $out; -} - -/** -* Transform a serialized array into an actual array -*/ -function tracking_unserialize($string, $max_depth = 3) -{ - $n = strlen($string); - if ($n > 10010) - { - die('Invalid data supplied'); - } - $data = $stack = array(); - $key = ''; - $mode = 0; - $level = &$data; - for ($i = 0; $i < $n; ++$i) - { - switch ($mode) - { - case 0: - switch ($string[$i]) - { - case ':': - $level[$key] = 0; - $mode = 1; - break; - case ')': - unset($level); - $level = array_pop($stack); - $mode = 3; - break; - default: - $key .= $string[$i]; - } - break; - - case 1: - switch ($string[$i]) - { - case '(': - if (sizeof($stack) >= $max_depth) - { - die('Invalid data supplied'); - } - $stack[] = &$level; - $level[$key] = array(); - $level = &$level[$key]; - $key = ''; - $mode = 0; - break; - default: - $level[$key] = $string[$i]; - $mode = 2; - break; - } - break; - - case 2: - switch ($string[$i]) - { - case ')': - unset($level); - $level = array_pop($stack); - $mode = 3; - break; - case ';': - $key = ''; - $mode = 0; - break; - default: - $level[$key] .= $string[$i]; - break; - } - break; - - case 3: - switch ($string[$i]) - { - case ')': - unset($level); - $level = array_pop($stack); - break; - case ';': - $key = ''; - $mode = 0; - break; - default: - die('Invalid data supplied'); - break; - } - break; - } - } - - if (sizeof($stack) != 0 || ($mode != 0 && $mode != 3)) - { - die('Invalid data supplied'); - } - - return $level; -} - -// Pagination functions - -/** -* Pagination routine, generates page number sequence -* tpl_prefix is for using different pagination blocks at one page -*/ -function generate_pagination($base_url, $num_items, $per_page, $start_item, $add_prevnext_text = false, $tpl_prefix = '') -{ - global $template, $user; - - // Make sure $per_page is a valid value - $per_page = ($per_page <= 0) ? 1 : $per_page; - - $seperator = '' . $user->lang['COMMA_SEPARATOR'] . ''; - $total_pages = ceil($num_items / $per_page); - - if ($total_pages == 1 || !$num_items) - { - return false; - } - - $on_page = floor($start_item / $per_page) + 1; - $url_delim = (strpos($base_url, '?') === false) ? '?' : '&'; - - $page_string = ($on_page == 1) ? '1' : '1'; - - if ($total_pages > 5) - { - $start_cnt = min(max(1, $on_page - 4), $total_pages - 5); - $end_cnt = max(min($total_pages, $on_page + 4), 6); - - $page_string .= ($start_cnt > 1) ? ' ... ' : $seperator; - - for ($i = $start_cnt + 1; $i < $end_cnt; $i++) - { - $page_string .= ($i == $on_page) ? '' . $i . '' : '' . $i . ''; - if ($i < $end_cnt - 1) - { - $page_string .= $seperator; - } - } - - $page_string .= ($end_cnt < $total_pages) ? ' ... ' : $seperator; - } - else - { - $page_string .= $seperator; - - for ($i = 2; $i < $total_pages; $i++) - { - $page_string .= ($i == $on_page) ? '' . $i . '' : '' . $i . ''; - if ($i < $total_pages) - { - $page_string .= $seperator; - } - } - } - - $page_string .= ($on_page == $total_pages) ? '' . $total_pages . '' : '' . $total_pages . ''; - - if ($add_prevnext_text) - { - if ($on_page != 1) - { - $page_string = '' . $user->lang['PREVIOUS'] . '  ' . $page_string; - } - - if ($on_page != $total_pages) - { - $page_string .= '  ' . $user->lang['NEXT'] . ''; - } - } - - $template->assign_vars(array( - $tpl_prefix . 'BASE_URL' => $base_url, - 'A_' . $tpl_prefix . 'BASE_URL' => addslashes($base_url), - $tpl_prefix . 'PER_PAGE' => $per_page, - - $tpl_prefix . 'PREVIOUS_PAGE' => ($on_page == 1) ? '' : $base_url . "{$url_delim}start=" . (($on_page - 2) * $per_page), - $tpl_prefix . 'NEXT_PAGE' => ($on_page == $total_pages) ? '' : $base_url . "{$url_delim}start=" . ($on_page * $per_page), - $tpl_prefix . 'TOTAL_PAGES' => $total_pages, - )); - - return $page_string; -} - -/** -* Return current page (pagination) -*/ -function on_page($num_items, $per_page, $start) -{ - global $template, $user; - - // Make sure $per_page is a valid value - $per_page = ($per_page <= 0) ? 1 : $per_page; - - $on_page = floor($start / $per_page) + 1; - - $template->assign_vars(array( - 'ON_PAGE' => $on_page) - ); - - return sprintf($user->lang['PAGE_OF'], $on_page, max(ceil($num_items / $per_page), 1)); -} - -// Server functions (building urls, redirecting...) - -/** -* Append session id to url. -* This function supports hooks. -* -* @param string $url The url the session id needs to be appended to (can have params) -* @param mixed $params String or array of additional url parameters -* @param bool $is_amp Is url using & (true) or & (false) -* @param string $session_id Possibility to use a custom session id instead of the global one -* -* Examples: -* -* append_sid("{$phpbb_root_path}viewtopic.$phpEx?t=1&f=2"); -* append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=1&f=2'); -* append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=1&f=2', false); -* append_sid("{$phpbb_root_path}viewtopic.$phpEx", array('t' => 1, 'f' => 2)); -* -* -*/ -function append_sid($url, $params = false, $is_amp = true, $session_id = false) -{ - global $_SID, $_EXTRA_URL, $phpbb_hook; - - // Developers using the hook function need to globalise the $_SID and $_EXTRA_URL on their own and also handle it appropiatly. - // They could mimick most of what is within this function - if (!empty($phpbb_hook) && $phpbb_hook->call_hook(__FUNCTION__, $url, $params, $is_amp, $session_id)) - { - if ($phpbb_hook->hook_return(__FUNCTION__)) - { - return $phpbb_hook->hook_return_result(__FUNCTION__); - } - } - - // Assign sid if session id is not specified - if ($session_id === false) - { - $session_id = $_SID; - } - - $amp_delim = ($is_amp) ? '&' : '&'; - $url_delim = (strpos($url, '?') === false) ? '?' : $amp_delim; - - // Appending custom url parameter? - $append_url = (!empty($_EXTRA_URL)) ? implode($amp_delim, $_EXTRA_URL) : ''; - - $anchor = ''; - if (strpos($url, '#') !== false) - { - list($url, $anchor) = explode('#', $url, 2); - $anchor = '#' . $anchor; - } - else if (!is_array($params) && strpos($params, '#') !== false) - { - list($params, $anchor) = explode('#', $params, 2); - $anchor = '#' . $anchor; - } - - // Use the short variant if possible ;) - if ($params === false) - { - // Append session id - if (!$session_id) - { - return $url . (($append_url) ? $url_delim . $append_url : '') . $anchor; - } - else - { - return $url . (($append_url) ? $url_delim . $append_url . $amp_delim : $url_delim) . 'sid=' . $session_id . $anchor; - } - } - - // Build string if parameters are specified as array - if (is_array($params)) - { - $output = array(); - - foreach ($params as $key => $item) - { - if ($item === NULL) - { - continue; - } - - if ($key == '#') - { - $anchor = '#' . $item; - continue; - } - - $output[] = $key . '=' . $item; - } - - $params = implode($amp_delim, $output); - } - - // Append session id and parameters (even if they are empty) - // If parameters are empty, the developer can still append his/her parameters without caring about the delimiter - return $url . (($append_url) ? $url_delim . $append_url . $amp_delim : $url_delim) . $params . ((!$session_id) ? '' : $amp_delim . 'sid=' . $session_id) . $anchor; -} - -/** -* Generate board url (example: http://www.example.com/phpBB) -* @param bool $without_script_path if set to true the script path gets not appended (example: http://www.example.com) -*/ -function generate_board_url($without_script_path = false) -{ - global $config, $user; - - $server_name = $user->host; - $server_port = (!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT'); - - // Forcing server vars is the only way to specify/override the protocol - if ($config['force_server_vars'] || !$server_name) - { - $server_protocol = ($config['server_protocol']) ? $config['server_protocol'] : (($config['cookie_secure']) ? 'https://' : 'http://'); - $server_name = $config['server_name']; - $server_port = (int) $config['server_port']; - $script_path = $config['script_path']; - - $url = $server_protocol . $server_name; - } - else - { - // Do not rely on cookie_secure, users seem to think that it means a secured cookie instead of an encrypted connection - $cookie_secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0; - $url = (($cookie_secure) ? 'https://' : 'http://') . $server_name; - - $script_path = $user->page['root_script_path']; - } - - if ($server_port && (($config['cookie_secure'] && $server_port <> 443) || (!$config['cookie_secure'] && $server_port <> 80))) - { - // HTTP HOST can carry a port number... - if (strpos($server_name, ':') === false) - { - $url .= ':' . $server_port; - } - } - - if (!$without_script_path) - { - $url .= $script_path; - } - - // Strip / from the end - if (substr($url, -1, 1) == '/') - { - $url = substr($url, 0, -1); - } - - return $url; -} - -/** -* Redirects the user to another page then exits the script nicely -*/ -function redirect($url, $return = false) -{ - global $db, $cache, $config, $user, $phpbb_root_path; - - if (empty($user->lang)) - { - $user->add_lang('common'); - } - - if (!$return) - { - garbage_collection(); - } - - // Make sure no &'s are in, this will break the redirect - $url = str_replace('&', '&', $url); - - // Determine which type of redirect we need to handle... - $url_parts = parse_url($url); - - if ($url_parts === false) - { - // Malformed url, redirect to current page... - $url = generate_board_url() . '/' . $user->page['page']; - } - else if (!empty($url_parts['scheme']) && !empty($url_parts['host'])) - { - // Full URL - } - else if ($url[0] == '/') - { - // Absolute uri, prepend direct url... - $url = generate_board_url(true) . $url; - } - else - { - // Relative uri - $pathinfo = pathinfo($url); - - // Is the uri pointing to the current directory? - if ($pathinfo['dirname'] == '.') - { - $url = str_replace('./', '', $url); - - // Strip / from the beginning - if ($url && substr($url, 0, 1) == '/') - { - $url = substr($url, 1); - } - - if ($user->page['page_dir']) - { - $url = generate_board_url() . '/' . $user->page['page_dir'] . '/' . $url; - } - else - { - $url = generate_board_url() . '/' . $url; - } - } - else - { - // Used ./ before, but $phpbb_root_path is working better with urls within another root path - $root_dirs = explode('/', str_replace('\\', '/', phpbb_realpath($phpbb_root_path))); - $page_dirs = explode('/', str_replace('\\', '/', phpbb_realpath($pathinfo['dirname']))); - $intersection = array_intersect_assoc($root_dirs, $page_dirs); - - $root_dirs = array_diff_assoc($root_dirs, $intersection); - $page_dirs = array_diff_assoc($page_dirs, $intersection); - - $dir = str_repeat('../', sizeof($root_dirs)) . implode('/', $page_dirs); - - // Strip / from the end - if ($dir && substr($dir, -1, 1) == '/') - { - $dir = substr($dir, 0, -1); - } - - // Strip / from the beginning - if ($dir && substr($dir, 0, 1) == '/') - { - $dir = substr($dir, 1); - } - - $url = str_replace($pathinfo['dirname'] . '/', '', $url); - - // Strip / from the beginning - if (substr($url, 0, 1) == '/') - { - $url = substr($url, 1); - } - - $url = $dir . '/' . $url; - $url = generate_board_url() . '/' . $url; - } - } - - // Make sure no linebreaks are there... to prevent http response splitting for PHP < 4.4.2 - if (strpos(urldecode($url), "\n") !== false || strpos(urldecode($url), "\r") !== false || strpos($url, ';') !== false) - { - trigger_error('Tried to redirect to potentially insecure url.', E_USER_ERROR); - } - - // Now, also check the protocol and for a valid url the last time... - $allowed_protocols = array('http', 'https', 'ftp', 'ftps'); - $url_parts = parse_url($url); - - if ($url_parts === false || empty($url_parts['scheme']) || !in_array($url_parts['scheme'], $allowed_protocols)) - { - trigger_error('Tried to redirect to potentially insecure url.', E_USER_ERROR); - } - - if ($return) - { - return $url; - } - - // Redirect via an HTML form for PITA webservers - if (@preg_match('#Microsoft|WebSTAR|Xitami#', getenv('SERVER_SOFTWARE'))) - { - header('Refresh: 0; URL=' . $url); - - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '' . $user->lang['REDIRECT'] . ''; - echo ''; - echo ''; - echo '
    ' . sprintf($user->lang['URL_REDIRECT'], '', '') . '
    '; - echo ''; - echo ''; - - exit; - } - - // Behave as per HTTP/1.1 spec for others - header('Location: ' . $url); - exit; -} - -/** -* Re-Apply session id after page reloads -*/ -function reapply_sid($url) -{ - global $phpEx, $phpbb_root_path; - - if ($url === "index.$phpEx") - { - return append_sid("index.$phpEx"); - } - else if ($url === "{$phpbb_root_path}index.$phpEx") - { - return append_sid("{$phpbb_root_path}index.$phpEx"); - } - - // Remove previously added sid - if (strpos($url, '?sid=') !== false) - { - $url = preg_replace('/(\?)sid=[a-z0-9]+(&|&)?/', '\1', $url); - } - else if (strpos($url, '&sid=') !== false) - { - $url = preg_replace('/&sid=[a-z0-9]+(&)?/', '\1', $url); - } - else if (strpos($url, '&sid=') !== false) - { - $url = preg_replace('/&sid=[a-z0-9]+(&)?/', '\1', $url); - } - - return append_sid($url); -} - -/** -* Returns url from the session/current page with an re-appended SID with optionally stripping vars from the url -*/ -function build_url($strip_vars = false) -{ - global $user, $phpbb_root_path; - - // Append SID - $redirect = append_sid($user->page['page'], false, false); - - // Add delimiter if not there... - if (strpos($redirect, '?') === false) - { - $redirect .= '?'; - } - - // Strip vars... - if ($strip_vars !== false && strpos($redirect, '?') !== false) - { - if (!is_array($strip_vars)) - { - $strip_vars = array($strip_vars); - } - - $query = $_query = array(); - - $args = substr($redirect, strpos($redirect, '?') + 1); - $args = ($args) ? explode('&', $args) : array(); - $redirect = substr($redirect, 0, strpos($redirect, '?')); - - foreach ($args as $argument) - { - $arguments = explode('=', $argument); - $key = $arguments[0]; - unset($arguments[0]); - - $query[$key] = implode('=', $arguments); - } - - // Strip the vars off - foreach ($strip_vars as $strip) - { - if (isset($query[$strip])) - { - unset($query[$strip]); - } - } - - // Glue the remaining parts together... already urlencoded - foreach ($query as $key => $value) - { - $_query[] = $key . '=' . $value; - } - $query = implode('&', $_query); - - $redirect .= ($query) ? '?' . $query : ''; - } - - return $phpbb_root_path . str_replace('&', '&', $redirect); -} - -/** -* Meta refresh assignment -*/ -function meta_refresh($time, $url) -{ - global $template; - - $url = redirect($url, true); - - // For XHTML compatibility we change back & to & - $template->assign_vars(array( - 'META' => '') - ); -} - -//Form validation - -/** -* Add a secret token to the form (requires the S_FORM_TOKEN template variable) -* @param string $form_name The name of the form; has to match the name used in check_form_key, otherwise no restrictions apply -*/ -function add_form_key($form_name) -{ - global $config, $template, $user; - $now = time(); - $token_sid = ($user->data['user_id'] == ANONYMOUS && !empty($config['form_token_sid_guests'])) ? $user->session_id : ''; - $token = sha1($now . $user->data['user_form_salt'] . $form_name . $token_sid); - - $s_fields = build_hidden_fields(array( - 'creation_time' => $now, - 'form_token' => $token, - )); - $template->assign_vars(array( - 'S_FORM_TOKEN' => $s_fields, - )); -} - -/** -* Check the form key. Required for all altering actions not secured by confirm_box -* @param string $form_name The name of the form; has to match the name used in add_form_key, otherwise no restrictions apply -* @param int $timespan The maximum acceptable age for a submitted form in seconds. Defaults to the config setting. -* @param string $return_page The address for the return link -* @param bool $trigger If true, the function will triger an error when encountering an invalid form -* @param int $minimum_time The minimum acceptable age for a submitted form in seconds -*/ -function check_form_key($form_name, $timespan = false, $return_page = '', $trigger = false, $minimum_time = false) -{ - global $config, $user; - - if ($timespan === false) - { - // we enforce a minimum value of half a minute here. - $timespan = ($config['form_token_lifetime'] == -1) ? -1 : max(30, $config['form_token_lifetime']); - } - if ($minimum_time === false) - { - $minimum_time = (int) $config['form_token_mintime']; - } - - if (isset($_POST['creation_time']) && isset($_POST['form_token'])) - { - $creation_time = abs(request_var('creation_time', 0)); - $token = request_var('form_token', ''); - - $diff = (time() - $creation_time); - - if (($diff >= $minimum_time) && (($diff <= $timespan) || $timespan == -1)) - { - $token_sid = ($user->data['user_id'] == ANONYMOUS && !empty($config['form_token_sid_guests'])) ? $user->session_id : ''; - - $key = sha1($creation_time . $user->data['user_form_salt'] . $form_name . $token_sid); - if ($key === $token) - { - return true; - } - } - } - if ($trigger) - { - trigger_error($user->lang['FORM_INVALID'] . $return_page); - } - return false; -} - -// Message/Login boxes - -/** -* Build Confirm box -* @param boolean $check True for checking if confirmed (without any additional parameters) and false for displaying the confirm box -* @param string $title Title/Message used for confirm box. -* message text is _CONFIRM appended to title. -* If title cannot be found in user->lang a default one is displayed -* If title_CONFIRM cannot be found in user->lang the text given is used. -* @param string $hidden Hidden variables -* @param string $html_body Template used for confirm box -* @param string $u_action Custom form action -*/ -function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_body.html', $u_action = '') -{ - global $user, $template, $db; - global $phpEx, $phpbb_root_path; - - if (isset($_POST['cancel'])) - { - return false; - } - - $confirm = false; - if (isset($_POST['confirm'])) - { - // language frontier - if ($_POST['confirm'] === $user->lang['YES']) - { - $confirm = true; - } - } - - if ($check && $confirm) - { - $user_id = request_var('user_id', 0); - $session_id = request_var('sess', ''); - $confirm_key = request_var('confirm_key', ''); - - if ($user_id != $user->data['user_id'] || $session_id != $user->session_id || !$confirm_key || !$user->data['user_last_confirm_key'] || $confirm_key != $user->data['user_last_confirm_key']) - { - return false; - } - - // Reset user_last_confirm_key - $sql = 'UPDATE ' . USERS_TABLE . " SET user_last_confirm_key = '' - WHERE user_id = " . $user->data['user_id']; - $db->sql_query($sql); - - return true; - } - else if ($check) - { - return false; - } - - $s_hidden_fields = build_hidden_fields(array( - 'user_id' => $user->data['user_id'], - 'sess' => $user->session_id, - 'sid' => $user->session_id) - ); - - // generate activation key - $confirm_key = gen_rand_string(10); - - if (defined('IN_ADMIN') && isset($user->data['session_admin']) && $user->data['session_admin']) - { - adm_page_header((!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title]); - } - else - { - page_header((!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title]); - } + // Let the jumpbox work again in sites having additional session id checks. +// if ( !empty($SID) ) +// { + $boxstring .= ''; +// } $template->set_filenames(array( - 'body' => $html_body) + 'jumpbox' => 'jumpbox.tpl') ); - - // If activation key already exist, we better do not re-use the key (something very strange is going on...) - if (request_var('confirm_key', '')) - { - // This should not occur, therefore we cancel the operation to safe the user - return false; - } - - // re-add sid / transform & to & for user->page (user->page is always using &) - $use_page = ($u_action) ? $phpbb_root_path . $u_action : $phpbb_root_path . str_replace('&', '&', $user->page['page']); - $u_action = reapply_sid($use_page); - $u_action .= ((strpos($u_action, '?') === false) ? '?' : '&') . 'confirm_key=' . $confirm_key; - $template->assign_vars(array( - 'MESSAGE_TITLE' => (!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title], - 'MESSAGE_TEXT' => (!isset($user->lang[$title . '_CONFIRM'])) ? $title : $user->lang[$title . '_CONFIRM'], + 'L_GO' => $lang['Go'], + 'L_JUMP_TO' => $lang['Jump_to'], + 'L_SELECT_FORUM' => $lang['Select_forum'], - 'YES_VALUE' => $user->lang['YES'], - 'S_CONFIRM_ACTION' => $u_action, - 'S_HIDDEN_FIELDS' => $hidden . $s_hidden_fields) + 'S_JUMPBOX_SELECT' => $boxstring, + 'S_JUMPBOX_ACTION' => append_sid($action)) ); + $template->assign_var_from_handle('JUMPBOX', 'jumpbox'); - $sql = 'UPDATE ' . USERS_TABLE . " SET user_last_confirm_key = '" . $db->sql_escape($confirm_key) . "' - WHERE user_id = " . $user->data['user_id']; - $db->sql_query($sql); + return; +} - if (defined('IN_ADMIN') && isset($user->data['session_admin']) && $user->data['session_admin']) +// +// Initialise user settings on page load +function init_userprefs($userdata) +{ + global $board_config, $theme, $images; + global $template, $lang, $phpEx, $phpbb_root_path, $db; + global $nav_links; + + if ( $userdata['user_id'] != ANONYMOUS ) { - adm_page_footer(); + if ( !empty($userdata['user_lang'])) + { + $default_lang = phpbb_ltrim(basename(phpbb_rtrim($userdata['user_lang'])), "'"); + } + + if ( !empty($userdata['user_dateformat']) ) + { + $board_config['default_dateformat'] = $userdata['user_dateformat']; + } + + if ( isset($userdata['user_timezone']) ) + { + $board_config['board_timezone'] = $userdata['user_timezone']; + } } else { - page_footer(); - } -} - -/** -* Generate login box or verify password -*/ -function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = false, $s_display = true) -{ - global $db, $user, $template, $auth, $phpEx, $phpbb_root_path, $config; - - $err = ''; - - // Make sure user->setup() has been called - if (empty($user->lang)) - { - $user->setup(); + $default_lang = phpbb_ltrim(basename(phpbb_rtrim($board_config['default_lang'])), "'"); } - // Print out error if user tries to authenticate as an administrator without having the privileges... - if ($admin && !$auth->acl_get('a_')) + if ( !file_exists(@phpbb_realpath($phpbb_root_path . 'language/lang_' . $default_lang . '/lang_main.'.$phpEx)) ) { - // Not authd - // anonymous/inactive users are never able to go to the ACP even if they have the relevant permissions - if ($user->data['is_registered']) + if ( $userdata['user_id'] != ANONYMOUS ) { - add_log('admin', 'LOG_ADMIN_AUTH_FAIL'); - } - trigger_error('NO_AUTH_ADMIN'); - } - - if (isset($_POST['login'])) - { - // Get credential - if ($admin) - { - $credential = request_var('credential', ''); - - if (strspn($credential, 'abcdef0123456789') !== strlen($credential) || strlen($credential) != 32) - { - if ($user->data['is_registered']) - { - add_log('admin', 'LOG_ADMIN_AUTH_FAIL'); - } - trigger_error('NO_AUTH_ADMIN'); - } - - $password = request_var('password_' . $credential, '', true); + // For logged in users, try the board default language next + $default_lang = phpbb_ltrim(basename(phpbb_rtrim($board_config['default_lang'])), "'"); } else { - $password = request_var('password', '', true); + // For guests it means the default language is not present, try english + // This is a long shot since it means serious errors in the setup to reach here, + // but english is part of a new install so it's worth us trying + $default_lang = 'english'; } - $username = request_var('username', '', true); - $autologin = (!empty($_POST['autologin'])) ? true : false; - $viewonline = (!empty($_POST['viewonline'])) ? 0 : 1; - $admin = ($admin) ? 1 : 0; - $viewonline = ($admin) ? $user->data['session_viewonline'] : $viewonline; - - // Check if the supplied username is equal to the one stored within the database if re-authenticating - if ($admin && utf8_clean_string($username) != utf8_clean_string($user->data['username'])) + if ( !file_exists(@phpbb_realpath($phpbb_root_path . 'language/lang_' . $default_lang . '/lang_main.'.$phpEx)) ) { - // We log the attempt to use a different username... - add_log('admin', 'LOG_ADMIN_AUTH_FAIL'); - trigger_error('NO_AUTH_ADMIN_USER_DIFFER'); + message_die(CRITICAL_ERROR, 'Could not locate valid language pack'); + } + } + + // If we've had to change the value in any way then let's write it back to the database + // before we go any further since it means there is something wrong with it + if ( $userdata['user_id'] != ANONYMOUS && $userdata['user_lang'] !== $default_lang ) + { + $sql = 'UPDATE ' . USERS_TABLE . " + SET user_lang = '" . $default_lang . "' + WHERE user_lang = '" . $userdata['user_lang'] . "'"; + + if ( !($result = $db->sql_query($sql)) ) + { + message_die(CRITICAL_ERROR, 'Could not update user language info'); } - // If authentication is successful we redirect user to previous page - $result = $auth->login($username, $password, $autologin, $viewonline, $admin); + $userdata['user_lang'] = $default_lang; + } + elseif ( $userdata['user_id'] == ANONYMOUS && $board_config['default_lang'] !== $default_lang ) + { + $sql = 'UPDATE ' . CONFIG_TABLE . " + SET config_value = '" . $default_lang . "' + WHERE config_name = 'default_lang'"; - // If admin authentication and login, we will log if it was a success or not... - // We also break the operation on the first non-success login - it could be argued that the user already knows - if ($admin) + if ( !($result = $db->sql_query($sql)) ) { - if ($result['status'] == LOGIN_SUCCESS) - { - add_log('admin', 'LOG_ADMIN_AUTH_SUCCESS'); - } - else - { - // Only log the failed attempt if a real user tried to. - // anonymous/inactive users are never able to go to the ACP even if they have the relevant permissions - if ($user->data['is_registered']) - { - add_log('admin', 'LOG_ADMIN_AUTH_FAIL'); - } - } + message_die(CRITICAL_ERROR, 'Could not update user language info'); + } + } + + $board_config['default_lang'] = $default_lang; + + include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); + + if ( defined('IN_ADMIN') ) + { + if( !file_exists(@phpbb_realpath($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.'.$phpEx)) ) + { + $board_config['default_lang'] = 'english'; } - // The result parameter is always an array, holding the relevant information... - if ($result['status'] == LOGIN_SUCCESS) + include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx); + } + + // + // Set up style + // + if ( !$board_config['override_user_style'] ) + { + if ( $userdata['user_id'] != ANONYMOUS && $userdata['user_style'] > 0 ) { - $redirect = request_var('redirect', "{$phpbb_root_path}index.$phpEx"); - $message = ($l_success) ? $l_success : $user->lang['LOGIN_REDIRECT']; - $l_redirect = ($admin) ? $user->lang['PROCEED_TO_ACP'] : (($redirect === "{$phpbb_root_path}index.$phpEx" || $redirect === "index.$phpEx") ? $user->lang['RETURN_INDEX'] : $user->lang['RETURN_PAGE']); - - // append/replace SID (may change during the session for AOL users) - $redirect = reapply_sid($redirect); - - // Special case... the user is effectively banned, but we allow founders to login - if (defined('IN_CHECK_BAN') && $result['user_row']['user_type'] != USER_FOUNDER) + if ( $theme = setup_style($userdata['user_style']) ) { return; } - - meta_refresh(3, $redirect); - trigger_error($message . '

    ' . sprintf($l_redirect, '', '')); } + } - // Something failed, determine what... - if ($result['status'] == LOGIN_BREAK) + $theme = setup_style($board_config['default_style']); + + // + // Mozilla navigation bar + // Default items that should be valid on all pages. + // Defined here to correctly assign the Language Variables + // and be able to change the variables within code. + // + $nav_links['top'] = array ( + 'url' => append_sid($phpbb_root_path . 'index.' . $phpEx), + 'title' => sprintf($lang['Forum_Index'], $board_config['sitename']) + ); + $nav_links['search'] = array ( + 'url' => append_sid($phpbb_root_path . 'search.' . $phpEx), + 'title' => $lang['Search'] + ); + $nav_links['help'] = array ( + 'url' => append_sid($phpbb_root_path . 'faq.' . $phpEx), + 'title' => $lang['FAQ'] + ); + $nav_links['author'] = array ( + 'url' => append_sid($phpbb_root_path . 'memberlist.' . $phpEx), + 'title' => $lang['Memberlist'] + ); + + return; +} + +function setup_style($style) +{ + global $db, $board_config, $template, $images, $phpbb_root_path; + + $sql = 'SELECT * + FROM ' . THEMES_TABLE . ' + WHERE themes_id = ' . (int) $style; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(CRITICAL_ERROR, 'Could not query database for theme info'); + } + + if ( !($row = $db->sql_fetchrow($result)) ) + { + // We are trying to setup a style which does not exist in the database + // Try to fallback to the board default (if the user had a custom style) + // and then any users using this style to the default if it succeeds + if ( $style != $board_config['default_style']) { - trigger_error($result['error_msg']); - } + $sql = 'SELECT * + FROM ' . THEMES_TABLE . ' + WHERE themes_id = ' . (int) $board_config['default_style']; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(CRITICAL_ERROR, 'Could not query database for theme info'); + } - // Special cases... determine - switch ($result['status']) - { - case LOGIN_ERROR_ATTEMPTS: + if ( $row = $db->sql_fetchrow($result) ) + { + $db->sql_freeresult($result); - // Show confirm image - $sql = 'DELETE FROM ' . CONFIRM_TABLE . " - WHERE session_id = '" . $db->sql_escape($user->session_id) . "' - AND confirm_type = " . CONFIRM_LOGIN; - $db->sql_query($sql); - - // Generate code - $code = gen_rand_string(mt_rand(5, 8)); - $confirm_id = md5(unique_id($user->ip)); - $seed = hexdec(substr(unique_id(), 4, 10)); - - // compute $seed % 0x7fffffff - $seed -= 0x7fffffff * floor($seed / 0x7fffffff); - - $sql = 'INSERT INTO ' . CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'confirm_id' => (string) $confirm_id, - 'session_id' => (string) $user->session_id, - 'confirm_type' => (int) CONFIRM_LOGIN, - 'code' => (string) $code, - 'seed' => (int) $seed) - ); - $db->sql_query($sql); - - $template->assign_vars(array( - 'S_CONFIRM_CODE' => true, - 'CONFIRM_ID' => $confirm_id, - 'CONFIRM_IMAGE' => '', - 'L_LOGIN_CONFIRM_EXPLAIN' => sprintf($user->lang['LOGIN_CONFIRM_EXPLAIN'], '', ''), - )); - - $err = $user->lang[$result['error_msg']]; - - break; - - case LOGIN_ERROR_PASSWORD_CONVERT: - $err = sprintf( - $user->lang[$result['error_msg']], - ($config['email_enable']) ? '' : '', - ($config['email_enable']) ? '' : '', - ($config['board_contact']) ? '' : '', - ($config['board_contact']) ? '' : '' - ); - break; - - // Username, password, etc... - default: - $err = $user->lang[$result['error_msg']]; - - // Assign admin contact to some error messages - if ($result['error_msg'] == 'LOGIN_ERROR_USERNAME' || $result['error_msg'] == 'LOGIN_ERROR_PASSWORD') + $sql = 'UPDATE ' . USERS_TABLE . ' + SET user_style = ' . (int) $board_config['default_style'] . " + WHERE user_style = $style"; + if ( !($result = $db->sql_query($sql)) ) { - $err = (!$config['board_contact']) ? sprintf($user->lang[$result['error_msg']], '', '') : sprintf($user->lang[$result['error_msg']], '', ''); + message_die(CRITICAL_ERROR, 'Could not update user theme info'); } - - break; - } - } - - if (!$redirect) - { - // We just use what the session code determined... - // If we are not within the admin directory we use the page dir... - $redirect = ''; - - if (!$admin) - { - $redirect .= ($user->page['page_dir']) ? $user->page['page_dir'] . '/' : ''; - } - - $redirect .= $user->page['page_name'] . (($user->page['query_string']) ? '?' . htmlspecialchars($user->page['query_string']) : ''); - } - - // Assign credential for username/password pair - $credential = ($admin) ? md5(unique_id()) : false; - - $s_hidden_fields = array( - 'redirect' => $redirect, - 'sid' => $user->session_id, - ); - - if ($admin) - { - $s_hidden_fields['credential'] = $credential; - } - - $s_hidden_fields = build_hidden_fields($s_hidden_fields); - - $template->assign_vars(array( - 'LOGIN_ERROR' => $err, - 'LOGIN_EXPLAIN' => $l_explain, - - 'U_SEND_PASSWORD' => ($config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') : '', - 'U_RESEND_ACTIVATION' => ($config['require_activation'] != USER_ACTIVATION_NONE && $config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=resend_act') : '', - 'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'), - 'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'), - - 'S_DISPLAY_FULL_LOGIN' => ($s_display) ? true : false, - 'S_LOGIN_ACTION' => (!$admin) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') : append_sid("index.$phpEx", false, true, $user->session_id), // Needs to stay index.$phpEx because we are within the admin directory - 'S_HIDDEN_FIELDS' => $s_hidden_fields, - - 'S_ADMIN_AUTH' => $admin, - 'USERNAME' => ($admin) ? $user->data['username'] : '', - - 'USERNAME_CREDENTIAL' => 'username', - 'PASSWORD_CREDENTIAL' => ($admin) ? 'password_' . $credential : 'password', - )); - - page_header($user->lang['LOGIN'], false); - - $template->set_filenames(array( - 'body' => 'login_body.html') - ); - make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); - - page_footer(); -} - -/** -* Generate forum login box -*/ -function login_forum_box($forum_data) -{ - global $db, $config, $user, $template, $phpEx; - - $password = request_var('password', '', true); - - $sql = 'SELECT forum_id - FROM ' . FORUMS_ACCESS_TABLE . ' - WHERE forum_id = ' . $forum_data['forum_id'] . ' - AND user_id = ' . $user->data['user_id'] . " - AND session_id = '" . $db->sql_escape($user->session_id) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - return true; - } - - if ($password) - { - // Remove expired authorised sessions - $sql = 'SELECT f.session_id - FROM ' . FORUMS_ACCESS_TABLE . ' f - LEFT JOIN ' . SESSIONS_TABLE . ' s ON (f.session_id = s.session_id) - WHERE s.session_id IS NULL'; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - $sql_in = array(); - do - { - $sql_in[] = (string) $row['session_id']; } - while ($row = $db->sql_fetchrow($result)); - - // Remove expired sessions - $sql = 'DELETE FROM ' . FORUMS_ACCESS_TABLE . ' - WHERE ' . $db->sql_in_set('session_id', $sql_in); - $db->sql_query($sql); - } - $db->sql_freeresult($result); - - if (phpbb_check_hash($password, $forum_data['forum_password'])) - { - $sql_ary = array( - 'forum_id' => (int) $forum_data['forum_id'], - 'user_id' => (int) $user->data['user_id'], - 'session_id' => (string) $user->session_id, - ); - - $db->sql_query('INSERT INTO ' . FORUMS_ACCESS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); - - return true; - } - - $template->assign_var('LOGIN_ERROR', $user->lang['WRONG_PASSWORD']); - } - - page_header($user->lang['LOGIN']); - - $template->assign_vars(array( - 'S_HIDDEN_FIELDS' => build_hidden_fields(array('f' => $forum_data['forum_id']))) - ); - - $template->set_filenames(array( - 'body' => 'login_forum.html') - ); - - page_footer(); -} - -// Little helpers - -/** -* Little helper for the build_hidden_fields function -*/ -function _build_hidden_fields($key, $value, $specialchar, $stripslashes) -{ - $hidden_fields = ''; - - if (!is_array($value)) - { - $value = ($stripslashes) ? stripslashes($value) : $value; - $value = ($specialchar) ? htmlspecialchars($value, ENT_COMPAT, 'UTF-8') : $value; - - $hidden_fields .= '' . "\n"; - } - else - { - foreach ($value as $_key => $_value) - { - $_key = ($stripslashes) ? stripslashes($_key) : $_key; - $_key = ($specialchar) ? htmlspecialchars($_key, ENT_COMPAT, 'UTF-8') : $_key; - - $hidden_fields .= _build_hidden_fields($key . '[' . $_key . ']', $_value, $specialchar, $stripslashes); - } - } - - return $hidden_fields; -} - -/** -* Build simple hidden fields from array -* -* @param array $field_ary an array of values to build the hidden field from -* @param bool $specialchar if true, keys and values get specialchared -* @param bool $stripslashes if true, keys and values get stripslashed -* -* @return string the hidden fields -*/ -function build_hidden_fields($field_ary, $specialchar = false, $stripslashes = false) -{ - $s_hidden_fields = ''; - - foreach ($field_ary as $name => $vars) - { - $name = ($stripslashes) ? stripslashes($name) : $name; - $name = ($specialchar) ? htmlspecialchars($name, ENT_COMPAT, 'UTF-8') : $name; - - $s_hidden_fields .= _build_hidden_fields($name, $vars, $specialchar, $stripslashes); - } - - return $s_hidden_fields; -} - -/** -* Parse cfg file -*/ -function parse_cfg_file($filename, $lines = false) -{ - $parsed_items = array(); - - if ($lines === false) - { - $lines = file($filename); - } - - foreach ($lines as $line) - { - $line = trim($line); - - if (!$line || $line[0] == '#' || ($delim_pos = strpos($line, '=')) === false) - { - continue; - } - - // Determine first occurrence, since in values the equal sign is allowed - $key = strtolower(trim(substr($line, 0, $delim_pos))); - $value = trim(substr($line, $delim_pos + 1)); - - if (in_array($value, array('off', 'false', '0'))) - { - $value = false; - } - else if (in_array($value, array('on', 'true', '1'))) - { - $value = true; - } - else if (!trim($value)) - { - $value = ''; - } - else if (($value[0] == "'" && $value[sizeof($value) - 1] == "'") || ($value[0] == '"' && $value[sizeof($value) - 1] == '"')) - { - $value = substr($value, 1, sizeof($value)-2); - } - - $parsed_items[$key] = $value; - } - - return $parsed_items; -} - -/** -* Add log event -*/ -function add_log() -{ - global $db, $user; - - $args = func_get_args(); - - $mode = array_shift($args); - $reportee_id = ($mode == 'user') ? intval(array_shift($args)) : ''; - $forum_id = ($mode == 'mod') ? intval(array_shift($args)) : ''; - $topic_id = ($mode == 'mod') ? intval(array_shift($args)) : ''; - $action = array_shift($args); - $data = (!sizeof($args)) ? '' : serialize($args); - - $sql_ary = array( - 'user_id' => (empty($user->data)) ? ANONYMOUS : $user->data['user_id'], - 'log_ip' => $user->ip, - 'log_time' => time(), - 'log_operation' => $action, - 'log_data' => $data, - ); - - switch ($mode) - { - case 'admin': - $sql_ary['log_type'] = LOG_ADMIN; - break; - - case 'mod': - $sql_ary += array( - 'log_type' => LOG_MOD, - 'forum_id' => $forum_id, - 'topic_id' => $topic_id - ); - break; - - case 'user': - $sql_ary += array( - 'log_type' => LOG_USERS, - 'reportee_id' => $reportee_id - ); - break; - - case 'critical': - $sql_ary['log_type'] = LOG_CRITICAL; - break; - - default: - return false; - } - - $db->sql_query('INSERT INTO ' . LOG_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); - - return $db->sql_nextid(); -} - -/** -* Return a nicely formatted backtrace (parts from the php manual by diz at ysagoon dot com) -*/ -function get_backtrace() -{ - global $phpbb_root_path; - - $output = '
    '; - $backtrace = debug_backtrace(); - $path = phpbb_realpath($phpbb_root_path); - - foreach ($backtrace as $number => $trace) - { - // We skip the first one, because it only shows this file/function - if ($number == 0) - { - continue; - } - - // Strip the current directory from path - if (empty($trace['file'])) - { - $trace['file'] = ''; + else + { + message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]"); + } } else { - $trace['file'] = str_replace(array($path, '\\'), array('', '/'), $trace['file']); - $trace['file'] = substr($trace['file'], 1); + message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]"); } - $args = array(); + } - // If include/require/include_once is not called, do not show arguments - they may contain sensible information - if (!in_array($trace['function'], array('include', 'require', 'include_once'))) + $template_path = 'templates/' ; + $template_name = $row['template_name'] ; + + $template = new Template($phpbb_root_path . $template_path . $template_name); + + if ( $template ) + { + $current_template_path = $template_path . $template_name; + @include($phpbb_root_path . $template_path . $template_name . '/' . $template_name . '.cfg'); + + if ( !defined('TEMPLATE_CONFIG') ) { - unset($trace['args']); + message_die(CRITICAL_ERROR, "Could not open $template_name template config file", '', __LINE__, __FILE__); } - else + + $img_lang = ( file_exists(@phpbb_realpath($phpbb_root_path . $current_template_path . '/images/lang_' . $board_config['default_lang'])) ) ? $board_config['default_lang'] : 'english'; + + while( list($key, $value) = @each($images) ) { - // Path... - if (!empty($trace['args'][0])) + if ( !is_array($value) ) { - $argument = htmlspecialchars($trace['args'][0]); - $argument = str_replace(array($path, '\\'), array('', '/'), $argument); - $argument = substr($argument, 1); - $args[] = "'{$argument}'"; + $images[$key] = str_replace('{LANG}', 'lang_' . $img_lang, $value); } } - - $trace['class'] = (!isset($trace['class'])) ? '' : $trace['class']; - $trace['type'] = (!isset($trace['type'])) ? '' : $trace['type']; - - $output .= '
    '; - $output .= 'FILE: ' . htmlspecialchars($trace['file']) . '
    '; - $output .= 'LINE: ' . ((!empty($trace['line'])) ? $trace['line'] : '') . '
    '; - - $output .= 'CALL: ' . htmlspecialchars($trace['class'] . $trace['type'] . $trace['function']) . '(' . ((sizeof($args)) ? implode(', ', $args) : '') . ')
    '; } - $output .= '
    '; - return $output; + + return $row; } -/** -* This function returns a regular expression pattern for commonly used expressions -* Use with / as delimiter for email mode and # for url modes -* mode can be: email|bbcode_htm|url|url_inline|www_url|www_url_inline|relative_url|relative_url_inline|ipv4|ipv6 -*/ -function get_preg_expression($mode) +function encode_ip($dotquad_ip) { - switch ($mode) + $ip_sep = explode('.', $dotquad_ip); + return sprintf('%02x%02x%02x%02x', $ip_sep[0], $ip_sep[1], $ip_sep[2], $ip_sep[3]); +} + +function decode_ip($int_ip) +{ + $hexipbang = explode('.', chunk_split($int_ip, 2, '.')); + return hexdec($hexipbang[0]). '.' . hexdec($hexipbang[1]) . '.' . hexdec($hexipbang[2]) . '.' . hexdec($hexipbang[3]); +} + +// +// Create date/time from format and timezone +// +function create_date($format, $gmepoch, $tz) +{ + global $board_config, $lang; + static $translate; + + if ( empty($translate) && $board_config['default_lang'] != 'english' ) { - case 'email': - return '[a-z0-9&\'\.\-_\+]+@[a-z0-9\-]+\.(?:[a-z0-9\-]+\.)*[a-z]+'; - break; - - case 'bbcode_htm': - return array( - '#.*?#', - '#.*?#', - '#.*?#', - '# 10 ) { - if (!function_exists('exec')) + $init_page_max = ( $total_pages > 3 ) ? 3 : $total_pages; + + for($i = 1; $i < $init_page_max + 1; $i++) { - return NULL; - } - - // @exec('nslookup -retry=1 -timout=1 -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host), $output); - @exec('nslookup -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host), $output); - - // If output is empty, the nslookup failed - if (empty($output)) - { - return NULL; - } - - foreach ($output as $line) - { - if (!trim($line)) + $page_string .= ( $i == $on_page ) ? '' . $i . '' : '' . $i . ''; + if ( $i < $init_page_max ) { - continue; - } - - // Valid records begin with host name: - if (strpos($line, $host) === 0) - { - return true; + $page_string .= ", "; } } - return false; - } - else if (function_exists('checkdnsrr')) - { - return (checkdnsrr($host, $type)) ? true : false; - } - - return NULL; -} - -// Handler, header and footer - -/** -* Error and message handler, call with trigger_error if reqd -*/ -function msg_handler($errno, $msg_text, $errfile, $errline) -{ - global $cache, $db, $auth, $template, $config, $user; - global $phpEx, $phpbb_root_path, $msg_title, $msg_long_text; - - // Do not display notices if we suppress them via @ - if (error_reporting() == 0) - { - return; - } - - // Message handler is stripping text. In case we need it, we are possible to define long text... - if (isset($msg_long_text) && $msg_long_text && !$msg_text) - { - $msg_text = $msg_long_text; - } - - switch ($errno) - { - case E_NOTICE: - case E_WARNING: - - // Check the error reporting level and return if the error level does not match - // If DEBUG is defined the default level is E_ALL - if (($errno & ((defined('DEBUG')) ? E_ALL : error_reporting())) == 0) + if ( $total_pages > 3 ) + { + if ( $on_page > 1 && $on_page < $total_pages ) { - return; - } + $page_string .= ( $on_page > 5 ) ? ' ... ' : ', '; - if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false) - { - // flush the content, else we get a white page if output buffering is on - if ($config['gzip_compress']) + $init_page_min = ( $on_page > 4 ) ? $on_page : 5; + $init_page_max = ( $on_page < $total_pages - 4 ) ? $on_page : $total_pages - 4; + + for($i = $init_page_min - 1; $i < $init_page_max + 2; $i++) { - if (@extension_loaded('zlib') && !headers_sent()) + $page_string .= ($i == $on_page) ? '' . $i . '' : '' . $i . ''; + if ( $i < $init_page_max + 1 ) { - ob_flush(); + $page_string .= ', '; } } - // remove complete path to installation, with the risk of changing backslashes meant to be there - $errfile = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $errfile); - $msg_text = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $msg_text); - - echo '[phpBB Debug] PHP Notice: in file ' . $errfile . ' on line ' . $errline . ': ' . $msg_text . '
    ' . "\n"; - } - - return; - - break; - - case E_USER_ERROR: - - if (!empty($user) && !empty($user->lang)) - { - $msg_text = (!empty($user->lang[$msg_text])) ? $user->lang[$msg_text] : $msg_text; - $msg_title = (!isset($msg_title)) ? $user->lang['GENERAL_ERROR'] : ((!empty($user->lang[$msg_title])) ? $user->lang[$msg_title] : $msg_title); - - $l_return_index = sprintf($user->lang['RETURN_INDEX'], '', ''); - $l_notify = ''; - - if (!empty($config['board_contact'])) - { - $l_notify = '

    ' . sprintf($user->lang['NOTIFY_ADMIN_EMAIL'], $config['board_contact']) . '

    '; - } + $page_string .= ( $on_page < $total_pages - 4 ) ? ' ... ' : ', '; } else { - $msg_title = 'General Error'; - $l_return_index = 'Return to index page'; - $l_notify = ''; + $page_string .= ' ... '; + } - if (!empty($config['board_contact'])) + for($i = $total_pages - 2; $i < $total_pages + 1; $i++) + { + $page_string .= ( $i == $on_page ) ? '' . $i . '' : '' . $i . ''; + if( $i < $total_pages ) { - $l_notify = '

    Please notify the board administrator or webmaster: ' . $config['board_contact'] . '

    '; + $page_string .= ", "; } } - - garbage_collection(); - - // Try to not call the adm page data... - - echo ''; - echo ''; - echo ''; - echo ''; - echo '' . $msg_title . ''; - echo ''; - echo ''; - echo ''; - echo '
    '; - echo ' '; - echo '
    '; - echo '
    '; - echo '
    '; - echo '

    ' . $msg_title . '

    '; - - echo '
    ' . $msg_text . '
    '; - - echo $l_notify; - - echo '
    '; - echo '
    '; - echo '
    '; - echo ' '; - echo '
    '; - echo ''; - echo ''; - - exit_handler(); - break; - - case E_USER_WARNING: - case E_USER_NOTICE: - - define('IN_ERROR_HANDLER', true); - - if (empty($user->data)) + } + } + else + { + for($i = 1; $i < $total_pages + 1; $i++) + { + $page_string .= ( $i == $on_page ) ? '' . $i . '' : '' . $i . ''; + if ( $i < $total_pages ) { - $user->session_begin(); + $page_string .= ', '; + } + } + } + + if ( $add_prevnext_text ) + { + if ( $on_page > 1 ) + { + $page_string = ' ' . $lang['Previous'] . '  ' . $page_string; + } + + if ( $on_page < $total_pages ) + { + $page_string .= '  ' . $lang['Next'] . ''; + } + + } + + $page_string = $lang['Goto_page'] . ' ' . $page_string; + + return $page_string; +} + +// +// This does exactly what preg_quote() does in PHP 4-ish +// If you just need the 1-parameter preg_quote call, then don't bother using this. +// +function phpbb_preg_quote($str, $delimiter) +{ + $text = preg_quote($str); + $text = str_replace($delimiter, '\\' . $delimiter, $text); + + return $text; +} + +// +// Obtain list of naughty words and build preg style replacement arrays for use by the +// calling script, note that the vars are passed as references this just makes it easier +// to return both sets of arrays +// +function obtain_word_list(&$orig_word, &$replacement_word) +{ + global $db; + + // + // Define censored word matches + // + $sql = "SELECT word, replacement + FROM " . WORDS_TABLE; + if( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not get censored words from database', '', __LINE__, __FILE__, $sql); + } + + if ( $row = $db->sql_fetchrow($result) ) + { + do + { + $orig_word[] = '#\b(' . str_replace('\*', '\w*?', preg_quote($row['word'], '#')) . ')\b#i'; + $replacement_word[] = $row['replacement']; + } + while ( $row = $db->sql_fetchrow($result) ); + } + + return true; +} + +// +// This is general replacement for die(), allows templated +// output in users (or default) language, etc. +// +// $msg_code can be one of these constants: +// +// GENERAL_MESSAGE : Use for any simple text message, eg. results +// of an operation, authorisation failures, etc. +// +// GENERAL ERROR : Use for any error which occurs _AFTER_ the +// common.php include and session code, ie. most errors in +// pages/functions +// +// CRITICAL_MESSAGE : Used when basic config data is available but +// a session may not exist, eg. banned users +// +// CRITICAL_ERROR : Used when config data cannot be obtained, eg +// no database connection. Should _not_ be used in 99.5% of cases +// +function message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '', $err_file = '', $sql = '') +{ + global $db, $template, $board_config, $theme, $lang, $phpEx, $phpbb_root_path, $nav_links, $gen_simple_header, $images; + global $userdata, $user_ip, $session_length; + global $starttime; + + if(defined('HAS_DIED')) + { + die("message_die() was called multiple times. This isn't supposed to happen. Was message_die() used in page_tail.php?"); + } + + define('HAS_DIED', 1); + + + $sql_store = $sql; + + // + // Get SQL error if we are debugging. Do this as soon as possible to prevent + // subsequent queries from overwriting the status of sql_error() + // + if ( DEBUG && ( $msg_code == GENERAL_ERROR || $msg_code == CRITICAL_ERROR ) ) + { + $sql_error = $db->sql_error(); + + $debug_text = ''; + + if ( $sql_error['message'] != '' ) + { + $debug_text .= '

    SQL Error : ' . $sql_error['code'] . ' ' . $sql_error['message']; + } + + if ( $sql_store != '' ) + { + $debug_text .= "

    $sql_store"; + } + + if ( $err_line != '' && $err_file != '' ) + { + $debug_text .= '

    Line : ' . $err_line . '
    File : ' . basename($err_file); + } + } + + if( empty($userdata) && ( $msg_code == GENERAL_MESSAGE || $msg_code == GENERAL_ERROR ) ) + { + $userdata = session_pagestart($user_ip, PAGE_INDEX); + init_userprefs($userdata); + } + + // + // If the header hasn't been output then do it + // + if ( !defined('HEADER_INC') && $msg_code != CRITICAL_ERROR ) + { + if ( empty($lang) ) + { + if ( !empty($board_config['default_lang']) ) + { + include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx); + } + else + { + include($phpbb_root_path . 'language/lang_english/lang_main.'.$phpEx); + } + } + + if ( empty($template) || empty($theme) ) + { + $theme = setup_style($board_config['default_style']); + } + + // + // Load the Page Header + // + if ( !defined('IN_ADMIN') ) + { + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + } + else + { + include($phpbb_root_path . 'admin/page_header_admin.'.$phpEx); + } + } + + switch($msg_code) + { + case GENERAL_MESSAGE: + if ( $msg_title == '' ) + { + $msg_title = $lang['Information']; + } + break; + + case CRITICAL_MESSAGE: + if ( $msg_title == '' ) + { + $msg_title = $lang['Critical_Information']; + } + break; + + case GENERAL_ERROR: + if ( $msg_text == '' ) + { + $msg_text = $lang['An_error_occured']; } - // We re-init the auth array to get correct results on login/logout - $auth->acl($user->data); - - if (empty($user->lang)) + if ( $msg_title == '' ) { - $user->setup(); + $msg_title = $lang['General_Error']; + } + break; + + case CRITICAL_ERROR: + // + // Critical errors mean we cannot rely on _ANY_ DB information being + // available so we're going to dump out a simple echo'd statement + // + include($phpbb_root_path . 'language/lang_english/lang_main.'.$phpEx); + + if ( $msg_text == '' ) + { + $msg_text = $lang['A_critical_error']; } - $msg_text = (!empty($user->lang[$msg_text])) ? $user->lang[$msg_text] : $msg_text; - $msg_title = (!isset($msg_title)) ? $user->lang['INFORMATION'] : ((!empty($user->lang[$msg_title])) ? $user->lang[$msg_title] : $msg_title); - - if (!defined('HEADER_INC')) + if ( $msg_title == '' ) { - if (defined('IN_ADMIN') && isset($user->data['session_admin']) && $user->data['session_admin']) - { - adm_page_header($msg_title); - } - else - { - page_header($msg_title); - } + $msg_title = 'phpBB : ' . $lang['Critical_Error'] . ''; } + break; + } + // + // Add on DEBUG info if we've enabled debug mode and this is an error. This + // prevents debug info being output for general messages should DEBUG be + // set TRUE by accident (preventing confusion for the end user!) + // + if ( DEBUG && ( $msg_code == GENERAL_ERROR || $msg_code == CRITICAL_ERROR ) ) + { + if ( $debug_text != '' ) + { + $msg_text = $msg_text . '

    DEBUG MODE' . $debug_text; + } + } + + if ( $msg_code != CRITICAL_ERROR ) + { + if ( !empty($lang[$msg_text]) ) + { + $msg_text = $lang[$msg_text]; + } + + if ( !defined('IN_ADMIN') ) + { $template->set_filenames(array( - 'body' => 'message_body.html') + 'message_body' => 'message_body.tpl') ); - - $template->assign_vars(array( - 'MESSAGE_TITLE' => $msg_title, - 'MESSAGE_TEXT' => $msg_text, - 'S_USER_WARNING' => ($errno == E_USER_WARNING) ? true : false, - 'S_USER_NOTICE' => ($errno == E_USER_NOTICE) ? true : false) - ); - - // We do not want the cron script to be called on error messages - define('IN_CRON', true); - - if (defined('IN_ADMIN') && isset($user->data['session_admin']) && $user->data['session_admin']) - { - adm_page_footer(); - } - else - { - page_footer(); - } - - exit_handler(); - break; - } - - // If we notice an error not handled here we pass this back to PHP by returning false - // This may not work for all php versions - return false; -} - -/** -* Generate page header -*/ -function page_header($page_title = '', $display_online_list = true) -{ - global $db, $config, $template, $SID, $_SID, $user, $auth, $phpEx, $phpbb_root_path; - - if (defined('HEADER_INC')) - { - return; - } - - define('HEADER_INC', true); - - // gzip_compression - if ($config['gzip_compress']) - { - if (@extension_loaded('zlib') && !headers_sent()) - { - ob_start('ob_gzhandler'); - } - } - - // Generate logged in/logged out status - if ($user->data['user_id'] != ANONYMOUS) - { - $u_login_logout = append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout', true, $user->session_id); - $l_login_logout = sprintf($user->lang['LOGOUT_USER'], $user->data['username']); - } - else - { - $u_login_logout = append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'); - $l_login_logout = $user->lang['LOGIN']; - } - - // Last visit date/time - $s_last_visit = ($user->data['user_id'] != ANONYMOUS) ? $user->format_date($user->data['session_last_visit']) : ''; - - // Get users online list ... if required - $l_online_users = $online_userlist = $l_online_record = ''; - - if ($config['load_online'] && $config['load_online_time'] && $display_online_list) - { - $logged_visible_online = $logged_hidden_online = $guests_online = $prev_user_id = 0; - $prev_session_ip = $reading_sql = ''; - - if (!empty($_REQUEST['f'])) - { - $f = request_var('f', 0); - - $reading_sql = ' AND s.session_page ' . $db->sql_like_expression("{$db->any_char}_f_={$f}x{$db->any_char}"); - } - - // Get number of online guests - if (!$config['load_online_guests']) - { - if ($db->count_distinct) - { - $sql = 'SELECT COUNT(DISTINCT s.session_ip) as num_guests - FROM ' . SESSIONS_TABLE . ' s - WHERE s.session_user_id = ' . ANONYMOUS . ' - AND s.session_time >= ' . (time() - ($config['load_online_time'] * 60)) . - $reading_sql; - } - else - { - $sql = 'SELECT COUNT(session_ip) as num_guests - FROM ( - SELECT DISTINCT s.session_ip - FROM ' . SESSIONS_TABLE . ' s - WHERE s.session_user_id = ' . ANONYMOUS . ' - AND s.session_time >= ' . (time() - ($config['load_online_time'] * 60)) . - $reading_sql . - ')'; - } - $result = $db->sql_query($sql); - $guests_online = (int) $db->sql_fetchfield('num_guests'); - $db->sql_freeresult($result); - } - - $sql = 'SELECT u.username, u.username_clean, u.user_id, u.user_type, u.user_allow_viewonline, u.user_colour, s.session_ip, s.session_viewonline - FROM ' . USERS_TABLE . ' u, ' . SESSIONS_TABLE . ' s - WHERE s.session_time >= ' . (time() - (intval($config['load_online_time']) * 60)) . - $reading_sql . - ((!$config['load_online_guests']) ? ' AND s.session_user_id <> ' . ANONYMOUS : '') . ' - AND u.user_id = s.session_user_id - ORDER BY u.username_clean ASC, s.session_ip ASC'; - $result = $db->sql_query($sql); - - $prev_user_id = false; - - while ($row = $db->sql_fetchrow($result)) - { - // User is logged in and therefore not a guest - if ($row['user_id'] != ANONYMOUS) - { - // Skip multiple sessions for one user - if ($row['user_id'] != $prev_user_id) - { - if ($row['session_viewonline']) - { - $logged_visible_online++; - } - else - { - $row['username'] = '' . $row['username'] . ''; - $logged_hidden_online++; - } - - if (($row['session_viewonline']) || $auth->acl_get('u_viewonline')) - { - $user_online_link = get_username_string(($row['user_type'] <> USER_IGNORE) ? 'full' : 'no_profile', $row['user_id'], $row['username'], $row['user_colour']); - $online_userlist .= ($online_userlist != '') ? ', ' . $user_online_link : $user_online_link; - } - } - - $prev_user_id = $row['user_id']; - } - else - { - // Skip multiple sessions for one user - if ($row['session_ip'] != $prev_session_ip) - { - $guests_online++; - } - } - - $prev_session_ip = $row['session_ip']; - } - $db->sql_freeresult($result); - - if (!$online_userlist) - { - $online_userlist = $user->lang['NO_ONLINE_USERS']; - } - - if (empty($_REQUEST['f'])) - { - $online_userlist = $user->lang['REGISTERED_USERS'] . ' ' . $online_userlist; } else { - $l_online = ($guests_online == 1) ? $user->lang['BROWSING_FORUM_GUEST'] : $user->lang['BROWSING_FORUM_GUESTS']; - $online_userlist = sprintf($l_online, $online_userlist, $guests_online); + $template->set_filenames(array( + 'message_body' => 'admin/admin_message_body.tpl') + ); } - $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online; - - if ($total_online_users > $config['record_online_users']) - { - set_config('record_online_users', $total_online_users, true); - set_config('record_online_date', time(), true); - } - - // Build online listing - $vars_online = array( - 'ONLINE' => array('total_online_users', 'l_t_user_s'), - 'REG' => array('logged_visible_online', 'l_r_user_s'), - 'HIDDEN' => array('logged_hidden_online', 'l_h_user_s'), - 'GUEST' => array('guests_online', 'l_g_user_s') + $template->assign_vars(array( + 'MESSAGE_TITLE' => $msg_title, + 'MESSAGE_TEXT' => $msg_text) ); + $template->pparse('message_body'); - foreach ($vars_online as $l_prefix => $var_ary) + if ( !defined('IN_ADMIN') ) { - switch (${$var_ary[0]}) - { - case 0: - ${$var_ary[1]} = $user->lang[$l_prefix . '_USERS_ZERO_TOTAL']; - break; - - case 1: - ${$var_ary[1]} = $user->lang[$l_prefix . '_USER_TOTAL']; - break; - - default: - ${$var_ary[1]} = $user->lang[$l_prefix . '_USERS_TOTAL']; - break; - } - } - unset($vars_online); - - $l_online_users = sprintf($l_t_user_s, $total_online_users); - $l_online_users .= sprintf($l_r_user_s, $logged_visible_online); - $l_online_users .= sprintf($l_h_user_s, $logged_hidden_online); - $l_online_users .= sprintf($l_g_user_s, $guests_online); - - $l_online_record = sprintf($user->lang['RECORD_ONLINE_USERS'], $config['record_online_users'], $user->format_date($config['record_online_date'])); - - $l_online_time = ($config['load_online_time'] == 1) ? 'VIEW_ONLINE_TIME' : 'VIEW_ONLINE_TIMES'; - $l_online_time = sprintf($user->lang[$l_online_time], $config['load_online_time']); - } - else - { - $l_online_time = ''; - } - - $l_privmsgs_text = $l_privmsgs_text_unread = ''; - $s_privmsg_new = false; - - // Obtain number of new private messages if user is logged in - if (isset($user->data['is_registered']) && $user->data['is_registered']) - { - if ($user->data['user_new_privmsg']) - { - $l_message_new = ($user->data['user_new_privmsg'] == 1) ? $user->lang['NEW_PM'] : $user->lang['NEW_PMS']; - $l_privmsgs_text = sprintf($l_message_new, $user->data['user_new_privmsg']); - - if (!$user->data['user_last_privmsg'] || $user->data['user_last_privmsg'] > $user->data['session_last_visit']) - { - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_last_privmsg = ' . $user->data['session_last_visit'] . ' - WHERE user_id = ' . $user->data['user_id']; - $db->sql_query($sql); - - $s_privmsg_new = true; - } - else - { - $s_privmsg_new = false; - } + include($phpbb_root_path . 'includes/page_tail.'.$phpEx); } else { - $l_privmsgs_text = $user->lang['NO_NEW_PM']; - $s_privmsg_new = false; - } - - $l_privmsgs_text_unread = ''; - - if ($user->data['user_unread_privmsg'] && $user->data['user_unread_privmsg'] != $user->data['user_new_privmsg']) - { - $l_message_unread = ($user->data['user_unread_privmsg'] == 1) ? $user->lang['UNREAD_PM'] : $user->lang['UNREAD_PMS']; - $l_privmsgs_text_unread = sprintf($l_message_unread, $user->data['user_unread_privmsg']); + include($phpbb_root_path . 'admin/page_footer_admin.'.$phpEx); } } - - // Which timezone? - $tz = ($user->data['user_id'] != ANONYMOUS) ? strval(doubleval($user->data['user_timezone'])) : strval(doubleval($config['board_timezone'])); - - // Send a proper content-language to the output - $user_lang = $user->lang['USER_LANG']; - if (strpos($user_lang, '-x-') !== false) + else { - $user_lang = substr($user_lang, 0, strpos($user_lang, '-x-')); - } - - // The following assigns all _common_ variables that may be used at any point in a template. - $template->assign_vars(array( - 'SITENAME' => $config['sitename'], - 'SITE_DESCRIPTION' => $config['site_desc'], - 'PAGE_TITLE' => $page_title, - 'SCRIPT_NAME' => str_replace('.' . $phpEx, '', $user->page['page_name']), - 'LAST_VISIT_DATE' => sprintf($user->lang['YOU_LAST_VISIT'], $s_last_visit), - 'LAST_VISIT_YOU' => $s_last_visit, - 'CURRENT_TIME' => sprintf($user->lang['CURRENT_TIME'], $user->format_date(time(), false, true)), - 'TOTAL_USERS_ONLINE' => $l_online_users, - 'LOGGED_IN_USER_LIST' => $online_userlist, - 'RECORD_USERS' => $l_online_record, - 'PRIVATE_MESSAGE_INFO' => $l_privmsgs_text, - 'PRIVATE_MESSAGE_INFO_UNREAD' => $l_privmsgs_text_unread, - - 'S_USER_NEW_PRIVMSG' => $user->data['user_new_privmsg'], - 'S_USER_UNREAD_PRIVMSG' => $user->data['user_unread_privmsg'], - - 'SID' => $SID, - '_SID' => $_SID, - 'SESSION_ID' => $user->session_id, - 'ROOT_PATH' => $phpbb_root_path, - - 'L_LOGIN_LOGOUT' => $l_login_logout, - 'L_INDEX' => $user->lang['FORUM_INDEX'], - 'L_ONLINE_EXPLAIN' => $l_online_time, - - 'U_PRIVATEMSGS' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox'), - 'U_RETURN_INBOX' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox'), - 'U_POPUP_PM' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=popup'), - 'UA_POPUP_PM' => addslashes(append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=popup')), - 'U_MEMBERLIST' => append_sid("{$phpbb_root_path}memberlist.$phpEx"), - 'U_VIEWONLINE' => ($auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? append_sid("{$phpbb_root_path}viewonline.$phpEx") : '', - 'U_LOGIN_LOGOUT' => $u_login_logout, - 'U_INDEX' => append_sid("{$phpbb_root_path}index.$phpEx"), - 'U_SEARCH' => append_sid("{$phpbb_root_path}search.$phpEx"), - 'U_REGISTER' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'), - 'U_PROFILE' => append_sid("{$phpbb_root_path}ucp.$phpEx"), - 'U_MODCP' => append_sid("{$phpbb_root_path}mcp.$phpEx", false, true, $user->session_id), - 'U_FAQ' => append_sid("{$phpbb_root_path}faq.$phpEx"), - 'U_SEARCH_SELF' => append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=egosearch'), - 'U_SEARCH_NEW' => append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=newposts'), - 'U_SEARCH_UNANSWERED' => append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=unanswered'), - 'U_SEARCH_ACTIVE_TOPICS'=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=active_topics'), - 'U_DELETE_COOKIES' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=delete_cookies'), - 'U_TEAM' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=leaders'), - 'U_RESTORE_PERMISSIONS' => ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm') : '', - - 'S_USER_LOGGED_IN' => ($user->data['user_id'] != ANONYMOUS) ? true : false, - 'S_AUTOLOGIN_ENABLED' => ($config['allow_autologin']) ? true : false, - 'S_BOARD_DISABLED' => ($config['board_disable']) ? true : false, - 'S_REGISTERED_USER' => $user->data['is_registered'], - 'S_IS_BOT' => $user->data['is_bot'], - 'S_IN_SEARCH' => false, - 'S_VIEWTOPIC' => false, - 'S_VIEWFORUM' => false, - 'S_USER_PM_POPUP' => $user->optionget('popuppm'), - 'S_USER_LANG' => $user_lang, - 'S_USER_BROWSER' => (isset($user->data['session_browser'])) ? $user->data['session_browser'] : $user->lang['UNKNOWN_BROWSER'], - 'S_USERNAME' => $user->data['username'], - 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], - 'S_CONTENT_FLOW_BEGIN' => ($user->lang['DIRECTION'] == 'ltr') ? 'left' : 'right', - 'S_CONTENT_FLOW_END' => ($user->lang['DIRECTION'] == 'ltr') ? 'right' : 'left', - 'S_CONTENT_ENCODING' => 'UTF-8', - 'S_TIMEZONE' => ($user->data['user_dst'] || ($user->data['user_id'] == ANONYMOUS && $config['board_dst'])) ? sprintf($user->lang['ALL_TIMES'], $user->lang['tz'][$tz], $user->lang['tz']['dst']) : sprintf($user->lang['ALL_TIMES'], $user->lang['tz'][$tz], ''), - 'S_DISPLAY_ONLINE_LIST' => ($l_online_time) ? 1 : 0, - 'S_DISPLAY_SEARCH' => (!$config['load_search']) ? 0 : (isset($auth) ? ($auth->acl_get('u_search') && $auth->acl_getf_global('f_search')) : 1), - 'S_DISPLAY_PM' => ($config['allow_privmsg'] && $user->data['is_registered'] && ($auth->acl_get('u_readpm') || $auth->acl_get('u_sendpm'))) ? true : false, - 'S_DISPLAY_MEMBERLIST' => (isset($auth)) ? $auth->acl_get('u_viewprofile') : 0, - 'S_NEW_PM' => ($s_privmsg_new) ? 1 : 0, - 'S_REGISTER_ENABLED' => ($config['require_activation'] != USER_ACTIVATION_DISABLE) ? true : false, - - 'T_THEME_PATH' => "{$phpbb_root_path}styles/" . $user->theme['theme_path'] . '/theme', - 'T_TEMPLATE_PATH' => "{$phpbb_root_path}styles/" . $user->theme['template_path'] . '/template', - 'T_IMAGESET_PATH' => "{$phpbb_root_path}styles/" . $user->theme['imageset_path'] . '/imageset', - 'T_IMAGESET_LANG_PATH' => "{$phpbb_root_path}styles/" . $user->theme['imageset_path'] . '/imageset/' . $user->data['user_lang'], - 'T_IMAGES_PATH' => "{$phpbb_root_path}images/", - 'T_SMILIES_PATH' => "{$phpbb_root_path}{$config['smilies_path']}/", - 'T_AVATAR_PATH' => "{$phpbb_root_path}{$config['avatar_path']}/", - 'T_AVATAR_GALLERY_PATH' => "{$phpbb_root_path}{$config['avatar_gallery_path']}/", - 'T_ICONS_PATH' => "{$phpbb_root_path}{$config['icons_path']}/", - 'T_RANKS_PATH' => "{$phpbb_root_path}{$config['ranks_path']}/", - 'T_UPLOAD_PATH' => "{$phpbb_root_path}{$config['upload_path']}/", - 'T_STYLESHEET_LINK' => (!$user->theme['theme_storedb']) ? "{$phpbb_root_path}styles/" . $user->theme['theme_path'] . '/theme/stylesheet.css' : "{$phpbb_root_path}style.$phpEx?sid=$user->session_id&id=" . $user->theme['style_id'] . '&lang=' . $user->data['user_lang'], - 'T_STYLESHEET_NAME' => $user->theme['theme_name'], - - 'SITE_LOGO_IMG' => $user->img('site_logo')) - ); - - // application/xhtml+xml not used because of IE - header('Content-type: text/html; charset=UTF-8'); - - header('Cache-Control: private, no-cache="set-cookie"'); - header('Expires: 0'); - header('Pragma: no-cache'); - - return; -} - -/** -* Generate page footer -*/ -function page_footer($run_cron = true) -{ - global $db, $config, $template, $user, $auth, $cache, $starttime, $phpbb_root_path, $phpEx; - - // Output page creation time - if (defined('DEBUG')) - { - $mtime = explode(' ', microtime()); - $totaltime = $mtime[0] + $mtime[1] - $starttime; - - if (!empty($_REQUEST['explain']) && $auth->acl_get('a_') && defined('DEBUG_EXTRA') && method_exists($db, 'sql_report')) - { - $db->sql_report('display'); - } - - $debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($config['gzip_compress']) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime); - - if ($auth->acl_get('a_') && defined('DEBUG_EXTRA')) - { - if (function_exists('memory_get_usage')) - { - if ($memory_usage = memory_get_usage()) - { - global $base_memory_usage; - $memory_usage -= $base_memory_usage; - $memory_usage = get_formatted_filesize($memory_usage); - - $debug_output .= ' | Memory Usage: ' . $memory_usage; - } - } - - $debug_output .= ' | Explain'; - } - } - - $template->assign_vars(array( - 'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : '', - 'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', - - 'U_ACP' => ($auth->acl_get('a_') && $user->data['is_registered']) ? append_sid("{$phpbb_root_path}adm/index.$phpEx", false, true, $user->session_id) : '') - ); - - // Call cron-type script - if (!defined('IN_CRON') && $run_cron && !$config['board_disable']) - { - $cron_type = ''; - - if (time() - $config['queue_interval'] > $config['last_queue_run'] && !defined('IN_ADMIN') && file_exists($phpbb_root_path . 'cache/queue.' . $phpEx)) - { - // Process email queue - $cron_type = 'queue'; - } - else if (method_exists($cache, 'tidy') && time() - $config['cache_gc'] > $config['cache_last_gc']) - { - // Tidy the cache - $cron_type = 'tidy_cache'; - } - else if (time() - $config['warnings_gc'] > $config['warnings_last_gc']) - { - $cron_type = 'tidy_warnings'; - } - else if (time() - $config['database_gc'] > $config['database_last_gc']) - { - // Tidy the database - $cron_type = 'tidy_database'; - } - else if (time() - $config['search_gc'] > $config['search_last_gc']) - { - // Tidy the search - $cron_type = 'tidy_search'; - } - else if (time() - $config['session_gc'] > $config['session_last_gc']) - { - $cron_type = 'tidy_sessions'; - } - - if ($cron_type) - { - $template->assign_var('RUN_CRON_TASK', 'cron'); - } - } - - $template->display('body'); - - garbage_collection(); - exit_handler(); -} - -/** -* Closing the cache object and the database -* Cool function name, eh? We might want to add operations to it later -*/ -function garbage_collection() -{ - global $cache, $db; - - // Unload cache, must be done before the DB connection if closed - if (!empty($cache)) - { - $cache->unload(); - } - - // Close our DB connection. - if (!empty($db)) - { - $db->sql_close(); - } -} - -/** -* Handler for exit calls in phpBB. -* This function supports hooks. -* -* Note: This function is called after the template has been outputted. -*/ -function exit_handler() -{ - global $phpbb_hook; - - if (!empty($phpbb_hook) && $phpbb_hook->call_hook(__FUNCTION__)) - { - if ($phpbb_hook->hook_return(__FUNCTION__)) - { - return $phpbb_hook->hook_return_result(__FUNCTION__); - } + echo "\n\n" . $msg_title . "\n

    \n" . $msg_text . "\n"; } exit; } -/** -* Handler for init calls in phpBB. This function is called in user::setup(); -* This function supports hooks. -*/ -function phpbb_user_session_handler() +// +// This function is for compatibility with PHP 4.x's realpath() +// function. In later versions of PHP, it needs to be called +// to do checks with some functions. Older versions of PHP don't +// seem to need this, so we'll just return the original value. +// dougk_ff7 +function phpbb_realpath($path) { - global $phpbb_hook; + global $phpbb_root_path, $phpEx; - if (!empty($phpbb_hook) && $phpbb_hook->call_hook(__FUNCTION__)) + return (!@function_exists('realpath') || !@realpath($phpbb_root_path . 'includes/functions.'.$phpEx)) ? $path : @realpath($path); +} + +function redirect($url) +{ + global $db, $board_config; + + if (!empty($db)) { - if ($phpbb_hook->hook_return(__FUNCTION__)) - { - return $phpbb_hook->hook_return_result(__FUNCTION__); - } + $db->sql_close(); } - return; + if (strstr(urldecode($url), "\n") || strstr(urldecode($url), "\r") || strstr(urldecode($url), ';url')) + { + message_die(GENERAL_ERROR, 'Tried to redirect to potentially insecure url.'); + } + + $server_protocol = ($board_config['cookie_secure']) ? 'https://' : 'http://'; + $server_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name'])); + $server_port = ($board_config['server_port'] <> 80) ? ':' . trim($board_config['server_port']) : ''; + $script_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path'])); + $script_name = ($script_name == '') ? $script_name : '/' . $script_name; + $url = preg_replace('#^\/?(.*?)\/?$#', '/\1', trim($url)); + + // Redirect via an HTML form for PITA webservers + if (@preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE'))) + { + header('Refresh: 0; URL=' . $server_protocol . $server_name . $server_port . $script_name . $url); + echo 'Redirect
    If your browser does not support meta redirection please click HERE to be redirected
    '; + exit; + } + + // Behave as per HTTP/1.1 spec for others + header('Location: ' . $server_protocol . $server_name . $server_port . $script_name . $url); + exit; } ?> \ No newline at end of file diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 1e85adff9b..37f6fef6c4 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -1,3039 +1,190 @@ sql_query($sql)) ) { - return; + message_die(GENERAL_ERROR, 'Couldn not obtain forums information', '', __LINE__, __FILE__, $sql); } - $sql_where = ($module_class) ? " WHERE module_class = '" . $db->sql_escape($module_class) . "'" : ''; - - // Reset to minimum possible left and right id - $sql = "SELECT MIN(left_id) as min_left_id, MIN(right_id) as min_right_id - FROM $sql_table - $sql_where"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $substract = (int) (min($row['min_left_id'], $row['min_right_id']) - 1); - - if ($substract > 0) + $forum_list = ''; + while( $row = $db->sql_fetchrow($result) ) { - $sql = "UPDATE $sql_table - SET left_id = left_id - $substract, right_id = right_id - $substract - $sql_where"; - $db->sql_query($sql); + if ( $is_auth_ary[$row['forum_id']]['auth_read'] && $ignore_forum != $row['forum_id'] ) + { + $selected = ( $select_forum == $row['forum_id'] ) ? ' selected="selected"' : ''; + $forum_list .= ''; + } } - $sql = "SELECT $sql_id, parent_id, left_id, right_id - FROM $sql_table - $sql_where - ORDER BY left_id ASC, parent_id ASC, $sql_id ASC"; - $f_result = $db->sql_query($sql); - - while ($item_data = $db->sql_fetchrow($f_result)) - { - if ($item_data['parent_id']) - { - $sql = "SELECT left_id, right_id - FROM $sql_table - $sql_where " . (($sql_where) ? 'AND' : 'WHERE') . " - $sql_id = {$item_data['parent_id']}"; - $result = $db->sql_query($sql); - - if (!$row = $db->sql_fetchrow($result)) - { - $sql = "UPDATE $sql_table SET parent_id = 0 WHERE $sql_id = " . $item_data[$sql_id]; - $db->sql_query($sql); - } - $db->sql_freeresult($result); - - $sql = "UPDATE $sql_table - SET left_id = left_id + 2, right_id = right_id + 2 - $sql_where " . (($sql_where) ? 'AND' : 'WHERE') . " - left_id > {$row['right_id']}"; - $db->sql_query($sql); - - $sql = "UPDATE $sql_table - SET right_id = right_id + 2 - $sql_where " . (($sql_where) ? 'AND' : 'WHERE') . " - {$row['left_id']} BETWEEN left_id AND right_id"; - $db->sql_query($sql); - - $item_data['left_id'] = $row['right_id']; - $item_data['right_id'] = $row['right_id'] + 1; - } - else - { - $sql = "SELECT MAX(right_id) AS right_id - FROM $sql_table - $sql_where"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $item_data['left_id'] = $row['right_id'] + 1; - $item_data['right_id'] = $row['right_id'] + 2; - } - - $sql = "UPDATE $sql_table - SET left_id = {$item_data['left_id']}, right_id = {$item_data['right_id']} - WHERE $sql_id = " . $item_data[$sql_id]; - $db->sql_query($sql); - } - $db->sql_freeresult($f_result); -} -*/ - -/** -* Simple version of jumpbox, just lists authed forums -*/ -function make_forum_select($select_id = false, $ignore_id = false, $ignore_acl = false, $ignore_nonpost = false, $ignore_emptycat = true, $only_acl_post = false, $return_array = false) -{ - global $db, $user, $auth; - - $acl = ($ignore_acl) ? '' : (($only_acl_post) ? 'f_post' : array('f_list', 'a_forum', 'a_forumadd', 'a_forumdel')); - - // This query is identical to the jumpbox one - $sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id - FROM ' . FORUMS_TABLE . ' - ORDER BY left_id ASC'; - $result = $db->sql_query($sql, 600); - - $right = 0; - $padding_store = array('0' => ''); - $padding = ''; - $forum_list = ($return_array) ? array() : ''; - - // Sometimes it could happen that forums will be displayed here not be displayed within the index page - // This is the result of forums not displayed at index, having list permissions and a parent of a forum with no permissions. - // If this happens, the padding could be "broken" - - while ($row = $db->sql_fetchrow($result)) - { - if ($row['left_id'] < $right) - { - $padding .= '   '; - $padding_store[$row['parent_id']] = $padding; - } - else if ($row['left_id'] > $right + 1) - { - $padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : ''; - } - - $right = $row['right_id']; - $disabled = false; - - if ($acl && !$auth->acl_gets($acl, $row['forum_id'])) - { - // List permission? - if ($auth->acl_get('f_list', $row['forum_id'])) - { - $disabled = true; - } - else - { - continue; - } - } - - if ( - ((is_array($ignore_id) && in_array($row['forum_id'], $ignore_id)) || $row['forum_id'] == $ignore_id) - || - // Non-postable forum with no subforums, don't display - ($row['forum_type'] == FORUM_CAT && ($row['left_id'] + 1 == $row['right_id']) && $ignore_emptycat) - || - ($row['forum_type'] != FORUM_POST && $ignore_nonpost) - ) - { - $disabled = true; - } - - if ($return_array) - { - // Include some more information... - $selected = (is_array($select_id)) ? ((in_array($row['forum_id'], $select_id)) ? true : false) : (($row['forum_id'] == $select_id) ? true : false); - $forum_list[$row['forum_id']] = array_merge(array('padding' => $padding, 'selected' => ($selected && !$disabled), 'disabled' => $disabled), $row); - } - else - { - $selected = (is_array($select_id)) ? ((in_array($row['forum_id'], $select_id)) ? ' selected="selected"' : '') : (($row['forum_id'] == $select_id) ? ' selected="selected"' : ''); - $forum_list .= ''; - } - } - $db->sql_freeresult($result); - unset($padding_store); + $forum_list = ( $forum_list == '' ) ? $lang['No_forums'] : ''; return $forum_list; } -/** -* Generate size select options -*/ -function size_select_options($size_compare) -{ - global $user; - - $size_types_text = array($user->lang['BYTES'], $user->lang['KIB'], $user->lang['MIB']); - $size_types = array('b', 'kb', 'mb'); - - $s_size_options = ''; - - for ($i = 0, $size = sizeof($size_types_text); $i < $size; $i++) - { - $selected = ($size_compare == $size_types[$i]) ? ' selected="selected"' : ''; - $s_size_options .= ''; - } - - return $s_size_options; -} - -/** -* Generate list of groups (option fields without select) -* -* @param int $group_id The default group id to mark as selected -* @param array $exclude_ids The group ids to exclude from the list, false (default) if you whish to exclude no id -* @param int $manage_founder If set to false (default) all groups are returned, if 0 only those groups returned not being managed by founders only, if 1 only those groups returned managed by founders only. -* -* @return string The list of options. -*/ -function group_select_options($group_id, $exclude_ids = false, $manage_founder = false) -{ - global $db, $user, $config; - - $exclude_sql = ($exclude_ids !== false && sizeof($exclude_ids)) ? 'WHERE ' . $db->sql_in_set('group_id', array_map('intval', $exclude_ids), true) : ''; - $sql_and = (!$config['coppa_enable']) ? (($exclude_sql) ? ' AND ' : ' WHERE ') . "group_name <> 'REGISTERED_COPPA'" : ''; - $sql_founder = ($manage_founder !== false) ? (($exclude_sql || $sql_and) ? ' AND ' : ' WHERE ') . 'group_founder_manage = ' . (int) $manage_founder : ''; - - $sql = 'SELECT group_id, group_name, group_type - FROM ' . GROUPS_TABLE . " - $exclude_sql - $sql_and - $sql_founder - ORDER BY group_type DESC, group_name ASC"; - $result = $db->sql_query($sql); - - $s_group_options = ''; - while ($row = $db->sql_fetchrow($result)) - { - $selected = ($row['group_id'] == $group_id) ? ' selected="selected"' : ''; - $s_group_options .= '' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . ''; - } - $db->sql_freeresult($result); - - return $s_group_options; -} - -/** -* Obtain authed forums list -*/ -function get_forum_list($acl_list = 'f_list', $id_only = true, $postable_only = false, $no_cache = false) -{ - global $db, $auth; - static $forum_rows; - - if (!isset($forum_rows)) - { - // This query is identical to the jumpbox one - $expire_time = ($no_cache) ? 0 : 600; - - $sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id - FROM ' . FORUMS_TABLE . ' - ORDER BY left_id ASC'; - $result = $db->sql_query($sql, $expire_time); - - $forum_rows = array(); - - $right = $padding = 0; - $padding_store = array('0' => 0); - - while ($row = $db->sql_fetchrow($result)) - { - if ($row['left_id'] < $right) - { - $padding++; - $padding_store[$row['parent_id']] = $padding; - } - else if ($row['left_id'] > $right + 1) - { - // Ok, if the $padding_store for this parent is empty there is something wrong. For now we will skip over it. - // @todo digging deep to find out "how" this can happen. - $padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : $padding; - } - - $right = $row['right_id']; - $row['padding'] = $padding; - - $forum_rows[] = $row; - } - $db->sql_freeresult($result); - unset($padding_store); - } - - $rowset = array(); - foreach ($forum_rows as $row) - { - if ($postable_only && $row['forum_type'] != FORUM_POST) - { - continue; - } - - if ($acl_list == '' || ($acl_list != '' && $auth->acl_gets($acl_list, $row['forum_id']))) - { - $rowset[] = ($id_only) ? $row['forum_id'] : $row; - } - } - - return $rowset; -} - -/** -* Get forum branch -*/ -function get_forum_branch($forum_id, $type = 'all', $order = 'descending', $include_forum = true) +// +// Synchronise functions for forums/topics +// +function sync($type, $id = false) { global $db; - switch ($type) + switch($type) { - case 'parents': - $condition = 'f1.left_id BETWEEN f2.left_id AND f2.right_id'; - break; - - case 'children': - $condition = 'f2.left_id BETWEEN f1.left_id AND f1.right_id'; - break; - - default: - $condition = 'f2.left_id BETWEEN f1.left_id AND f1.right_id OR f1.left_id BETWEEN f2.left_id AND f2.right_id'; - break; - } - - $rows = array(); - - $sql = 'SELECT f2.* - FROM ' . FORUMS_TABLE . ' f1 - LEFT JOIN ' . FORUMS_TABLE . " f2 ON ($condition) - WHERE f1.forum_id = $forum_id - ORDER BY f2.left_id " . (($order == 'descending') ? 'ASC' : 'DESC'); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if (!$include_forum && $row['forum_id'] == $forum_id) - { - continue; - } - - $rows[] = $row; - } - $db->sql_freeresult($result); - - return $rows; -} - -/** -* Get physical file listing -*/ -function filelist($rootdir, $dir = '', $type = 'gif|jpg|jpeg|png') -{ - $matches = array(); - - // Remove initial / if present - $rootdir = (substr($rootdir, 0, 1) == '/') ? substr($rootdir, 1) : $rootdir; - // Add closing / if not present - $rootdir = ($rootdir && substr($rootdir, -1) != '/') ? $rootdir . '/' : $rootdir; - - // Remove initial / if present - $dir = (substr($dir, 0, 1) == '/') ? substr($dir, 1) : $dir; - // Add closing / if not present - $dir = ($dir && substr($dir, -1) != '/') ? $dir . '/' : $dir; - - if (!is_dir($rootdir . $dir)) - { - return $matches; - } - - $dh = @opendir($rootdir . $dir); - - if (!$dh) - { - return $matches; - } - - while (($fname = readdir($dh)) !== false) - { - if (is_file("$rootdir$dir$fname")) - { - if (filesize("$rootdir$dir$fname") && preg_match('#\.' . $type . '$#i', $fname)) + case 'all forums': + $sql = "SELECT forum_id + FROM " . FORUMS_TABLE; + if ( !($result = $db->sql_query($sql)) ) { - $matches[$dir][] = $fname; - } - } - else if ($fname[0] != '.' && is_dir("$rootdir$dir$fname")) - { - $matches += filelist($rootdir, "$dir$fname", $type); - } - } - closedir($dh); - - return $matches; -} - -/** -* Move topic(s) -*/ -function move_topics($topic_ids, $forum_id, $auto_sync = true) -{ - global $db; - - if (empty($topic_ids)) - { - return; - } - - $forum_ids = array($forum_id); - - if (!is_array($topic_ids)) - { - $topic_ids = array($topic_ids); - } - - $sql = 'DELETE FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_moved_id', $topic_ids) . ' - AND forum_id = ' . $forum_id; - $db->sql_query($sql); - - if ($auto_sync) - { - $sql = 'SELECT DISTINCT forum_id - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $topic_ids); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $forum_ids[] = $row['forum_id']; - } - $db->sql_freeresult($result); - } - - $table_ary = array(TOPICS_TABLE, POSTS_TABLE, LOG_TABLE, DRAFTS_TABLE, TOPICS_TRACK_TABLE); - foreach ($table_ary as $table) - { - $sql = "UPDATE $table - SET forum_id = $forum_id - WHERE " . $db->sql_in_set('topic_id', $topic_ids); - $db->sql_query($sql); - } - unset($table_ary); - - if ($auto_sync) - { - sync('forum', 'forum_id', $forum_ids, true, true); - unset($forum_ids); - } -} - -/** -* Move post(s) -*/ -function move_posts($post_ids, $topic_id, $auto_sync = true) -{ - global $db; - - if (!is_array($post_ids)) - { - $post_ids = array($post_ids); - } - - $forum_ids = array(); - $topic_ids = array($topic_id); - - $sql = 'SELECT DISTINCT topic_id, forum_id - FROM ' . POSTS_TABLE . ' - WHERE ' . $db->sql_in_set('post_id', $post_ids); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $forum_ids[] = $row['forum_id']; - $topic_ids[] = $row['topic_id']; - } - $db->sql_freeresult($result); - - $sql = 'SELECT forum_id - FROM ' . TOPICS_TABLE . ' - WHERE topic_id = ' . $topic_id; - $result = $db->sql_query($sql); - $forum_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$forum_row) - { - trigger_error('NO_TOPIC'); - } - - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET forum_id = ' . $forum_row['forum_id'] . ", topic_id = $topic_id - WHERE " . $db->sql_in_set('post_id', $post_ids); - $db->sql_query($sql); - - $sql = 'UPDATE ' . ATTACHMENTS_TABLE . " - SET topic_id = $topic_id, in_message = 0 - WHERE " . $db->sql_in_set('post_msg_id', $post_ids); - $db->sql_query($sql); - - if ($auto_sync) - { - $forum_ids[] = $forum_row['forum_id']; - - sync('topic_reported', 'topic_id', $topic_ids); - sync('topic_attachment', 'topic_id', $topic_ids); - sync('topic', 'topic_id', $topic_ids, true); - sync('forum', 'forum_id', $forum_ids, true, true); - } - - // Update posted information - update_posted_info($topic_ids); -} - -/** -* Remove topic(s) -*/ -function delete_topics($where_type, $where_ids, $auto_sync = true, $post_count_sync = true, $call_delete_posts = true) -{ - global $db, $config; - - $approved_topics = 0; - $forum_ids = $topic_ids = array(); - - if ($where_type === 'range') - { - $where_clause = $where_ids; - } - else - { - $where_ids = (is_array($where_ids)) ? array_unique($where_ids) : array($where_ids); - - if (!sizeof($where_ids)) - { - return array('topics' => 0, 'posts' => 0); - } - - $where_clause = $db->sql_in_set($where_type, $where_ids); - } - - // Making sure that delete_posts does not call delete_topics again... - $return = array( - 'posts' => ($call_delete_posts) ? delete_posts($where_type, $where_ids, false, true, $post_count_sync, false) : 0, - ); - - $sql = 'SELECT topic_id, forum_id, topic_approved - FROM ' . TOPICS_TABLE . ' - WHERE ' . $where_clause; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $forum_ids[] = $row['forum_id']; - $topic_ids[] = $row['topic_id']; - - if ($row['topic_approved']) - { - $approved_topics++; - } - } - $db->sql_freeresult($result); - - $return['topics'] = sizeof($topic_ids); - - if (!sizeof($topic_ids)) - { - return $return; - } - - $db->sql_transaction('begin'); - - $table_ary = array(TOPICS_TRACK_TABLE, TOPICS_POSTED_TABLE, POLL_VOTES_TABLE, POLL_OPTIONS_TABLE, TOPICS_WATCH_TABLE, TOPICS_TABLE); - - foreach ($table_ary as $table) - { - $sql = "DELETE FROM $table - WHERE " . $db->sql_in_set('topic_id', $topic_ids); - $db->sql_query($sql); - } - unset($table_ary); - - $moved_topic_ids = array(); - - // update the other forums - $sql = 'SELECT topic_id, forum_id - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_moved_id', $topic_ids); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $forum_ids[] = $row['forum_id']; - $moved_topic_ids[] = $row['topic_id']; - } - $db->sql_freeresult($result); - - if (sizeof($moved_topic_ids)) - { - $sql = 'DELETE FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $moved_topic_ids); - $db->sql_query($sql); - } - - $db->sql_transaction('commit'); - - if ($auto_sync) - { - sync('forum', 'forum_id', array_unique($forum_ids), true, true); - sync('topic_reported', $where_type, $where_ids); - } - - if ($approved_topics) - { - set_config('num_topics', $config['num_topics'] - $approved_topics, true); - } - - return $return; -} - -/** -* Remove post(s) -*/ -function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync = true, $post_count_sync = true, $call_delete_topics = true) -{ - global $db, $config, $phpbb_root_path, $phpEx; - - if ($where_type === 'range') - { - $where_clause = $where_ids; - } - else - { - if (is_array($where_ids)) - { - $where_ids = array_unique($where_ids); - } - else - { - $where_ids = array($where_ids); - } - - if (!sizeof($where_ids)) - { - return false; - } - - $where_clause = $db->sql_in_set($where_type, array_map('intval', $where_ids)); - } - - $approved_posts = 0; - $post_ids = $topic_ids = $forum_ids = $post_counts = $remove_topics = array(); - - $sql = 'SELECT post_id, poster_id, post_approved, post_postcount, topic_id, forum_id - FROM ' . POSTS_TABLE . ' - WHERE ' . $where_clause; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $post_ids[] = $row['post_id']; - $poster_ids[] = $row['poster_id']; - $topic_ids[] = $row['topic_id']; - $forum_ids[] = $row['forum_id']; - - if ($row['post_postcount'] && $post_count_sync) - { - $post_counts[$row['poster_id']] = (!empty($post_counts[$row['poster_id']])) ? $post_counts[$row['poster_id']] + 1 : 1; - } - - if ($row['post_approved']) - { - $approved_posts++; - } - } - $db->sql_freeresult($result); - - if (!sizeof($post_ids)) - { - return false; - } - - $db->sql_transaction('begin'); - - $table_ary = array(POSTS_TABLE, REPORTS_TABLE); - - foreach ($table_ary as $table) - { - $sql = "DELETE FROM $table - WHERE " . $db->sql_in_set('post_id', $post_ids); - $db->sql_query($sql); - } - unset($table_ary); - - // Adjust users post counts - if (sizeof($post_counts) && $post_count_sync) - { - foreach ($post_counts as $poster_id => $substract) - { - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_posts = 0 - WHERE user_id = ' . $poster_id . ' - AND user_posts < ' . $substract; - $db->sql_query($sql); - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_posts = user_posts - ' . $substract . ' - WHERE user_id = ' . $poster_id . ' - AND user_posts >= ' . $substract; - $db->sql_query($sql); - } - } - - // Remove topics now having no posts? - if (sizeof($topic_ids)) - { - $sql = 'SELECT topic_id - FROM ' . POSTS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $topic_ids) . ' - GROUP BY topic_id'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $remove_topics[] = $row['topic_id']; - } - $db->sql_freeresult($result); - - // Actually, those not within remove_topics should be removed. ;) - $remove_topics = array_diff($topic_ids, $remove_topics); - } - - // Remove the message from the search index - $search_type = basename($config['search_type']); - - if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx)) - { - trigger_error('NO_SUCH_SEARCH_MODULE'); - } - - include_once("{$phpbb_root_path}includes/search/$search_type.$phpEx"); - - $error = false; - $search = new $search_type($error); - - if ($error) - { - trigger_error($error); - } - - $search->index_remove($post_ids, $poster_ids, $forum_ids); - - delete_attachments('post', $post_ids, false); - - $db->sql_transaction('commit'); - - // Resync topics_posted table - if ($posted_sync) - { - update_posted_info($topic_ids); - } - - if ($auto_sync) - { - sync('topic_reported', 'topic_id', $topic_ids); - sync('topic', 'topic_id', $topic_ids, true); - sync('forum', 'forum_id', $forum_ids, true, true); - } - - if ($approved_posts) - { - set_config('num_posts', $config['num_posts'] - $approved_posts, true); - } - - // We actually remove topics now to not be inconsistent (the delete_topics function calls this function too) - if (sizeof($remove_topics) && $call_delete_topics) - { - delete_topics('topic_id', $remove_topics, $auto_sync, $post_count_sync, false); - } - - return sizeof($post_ids); -} - -/** -* Delete Attachments -* -* @param string $mode can be: post|topic|attach|user -* @param mixed $ids can be: post_ids, topic_ids, attach_ids, user_ids -* @param bool $resync set this to false if you are deleting posts or topics -*/ -function delete_attachments($mode, $ids, $resync = true) -{ - global $db, $config; - - if (is_array($ids) && sizeof($ids)) - { - $ids = array_unique($ids); - $ids = array_map('intval', $ids); - } - else - { - $ids = array((int) $ids); - } - - if (!sizeof($ids)) - { - return false; - } - - $sql_id = ($mode == 'user') ? 'poster_id' : (($mode == 'post') ? 'post_msg_id' : (($mode == 'topic') ? 'topic_id' : 'attach_id')); - - $post_ids = $topic_ids = $physical = array(); - - // Collect post and topics ids for later use - if ($mode == 'attach' || $mode == 'user' || ($mode == 'topic' && $resync)) - { - $sql = 'SELECT post_msg_id as post_id, topic_id, physical_filename, thumbnail, filesize - FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set($sql_id, $ids); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $post_ids[] = $row['post_id']; - $topic_ids[] = $row['topic_id']; - $physical[] = array('filename' => $row['physical_filename'], 'thumbnail' => $row['thumbnail'], 'filesize' => $row['filesize']); - } - $db->sql_freeresult($result); - } - - if ($mode == 'post') - { - $sql = 'SELECT topic_id, physical_filename, thumbnail, filesize - FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set('post_msg_id', $ids) . ' - AND in_message = 0'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $topic_ids[] = $row['topic_id']; - $physical[] = array('filename' => $row['physical_filename'], 'thumbnail' => $row['thumbnail'], 'filesize' => $row['filesize']); - } - $db->sql_freeresult($result); - } - - // Delete attachments - $sql = 'DELETE FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set($sql_id, $ids); - $db->sql_query($sql); - $num_deleted = $db->sql_affectedrows(); - - if (!$num_deleted) - { - return 0; - } - - // Delete attachments from filesystem - $space_removed = $files_removed = 0; - foreach ($physical as $file_ary) - { - if (phpbb_unlink($file_ary['filename'], 'file', true)) - { - $space_removed += $file_ary['filesize']; - $files_removed++; - } - - if ($file_ary['thumbnail']) - { - phpbb_unlink($file_ary['filename'], 'thumbnail', true); - } - } - set_config('upload_dir_size', $config['upload_dir_size'] - $space_removed, true); - set_config('num_files', $config['num_files'] - $files_removed, true); - - if ($mode == 'topic' && !$resync) - { - return $num_deleted; - } - - if ($mode == 'post') - { - $post_ids = $ids; - } - unset($ids); - - $post_ids = array_unique($post_ids); - $topic_ids = array_unique($topic_ids); - - // Update post indicators - if (sizeof($post_ids)) - { - if ($mode == 'post' || $mode == 'topic') - { - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET post_attachment = 0 - WHERE ' . $db->sql_in_set('post_id', $post_ids); - $db->sql_query($sql); - } - - if ($mode == 'user' || $mode == 'attach') - { - $remaining = array(); - - $sql = 'SELECT post_msg_id - FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set('post_msg_id', $post_ids) . ' - AND in_message = 0'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $remaining[] = $row['post_msg_id']; - } - $db->sql_freeresult($result); - - $unset_ids = array_diff($post_ids, $remaining); - - if (sizeof($unset_ids)) - { - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET post_attachment = 0 - WHERE ' . $db->sql_in_set('post_id', $unset_ids); - $db->sql_query($sql); + message_die(GENERAL_ERROR, 'Could not get forum IDs', '', __LINE__, __FILE__, $sql); } - $remaining = array(); - - $sql = 'SELECT post_msg_id - FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set('post_msg_id', $post_ids) . ' - AND in_message = 1'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) + while( $row = $db->sql_fetchrow($result) ) { - $remaining[] = $row['post_msg_id']; + sync('forum', $row['forum_id']); } - $db->sql_freeresult($result); + break; - $unset_ids = array_diff($post_ids, $remaining); - - if (sizeof($unset_ids)) + case 'all topics': + $sql = "SELECT topic_id + FROM " . TOPICS_TABLE; + if ( !($result = $db->sql_query($sql)) ) { - $sql = 'UPDATE ' . PRIVMSGS_TABLE . ' - SET message_attachment = 0 - WHERE ' . $db->sql_in_set('msg_id', $unset_ids); - $db->sql_query($sql); - } - } - } - - if (sizeof($topic_ids)) - { - // Update topic indicator - if ($mode == 'topic') - { - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET topic_attachment = 0 - WHERE ' . $db->sql_in_set('topic_id', $topic_ids); - $db->sql_query($sql); - } - - if ($mode == 'post' || $mode == 'user' || $mode == 'attach') - { - $remaining = array(); - - $sql = 'SELECT topic_id - FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $topic_ids); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $remaining[] = $row['topic_id']; - } - $db->sql_freeresult($result); - - $unset_ids = array_diff($topic_ids, $remaining); - - if (sizeof($unset_ids)) - { - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET topic_attachment = 0 - WHERE ' . $db->sql_in_set('topic_id', $unset_ids); - $db->sql_query($sql); - } - } - } - - return $num_deleted; -} - -/** -* Remove topic shadows -*/ -function delete_topic_shadows($max_age, $forum_id = '', $auto_sync = true) -{ - $where = (is_array($forum_id)) ? 'AND ' . $db->sql_in_set('t.forum_id', array_map('intval', $forum_id)) : (($forum_id) ? 'AND t.forum_id = ' . (int) $forum_id : ''); - - if ($db->multi_table_deletion) - { - $sql = 'DELETE FROM ' . TOPICS_TABLE . ' t - USING ' . TOPICS_TABLE . ' t2 - WHERE t.topic_moved_id = t2.topic_id - AND t.topic_time < ' . (time() - $max_age) - . $where; - $db->sql_query($sql); - - } - else - { - $sql = 'SELECT t.topic_id - FROM ' . TOPICS_TABLE . ' t, ' . TOPICS_TABLE . ' t2 - WHERE t.topic_moved_id = t2.topic_id - AND t.topic_time < ' . (time() - $max_age) - . $where; - $result = $db->sql_query($sql); - - $topic_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $topic_ids[] = $row['topic_id']; - } - $db->sql_freeresult($result); - - if (sizeof($topic_ids)) - { - $sql = 'DELETE FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $topic_ids); - $db->sql_query($sql); - } - } - - if ($auto_sync) - { - $where_type = ($forum_id) ? 'forum_id' : ''; - sync('forum', $where_type, $forum_id, true, true); - } -} - -/** -* Update/Sync posted information for topics -*/ -function update_posted_info(&$topic_ids) -{ - global $db, $config; - - if (empty($topic_ids) || !$config['load_db_track']) - { - return; - } - - // First of all, let us remove any posted information for these topics - $sql = 'DELETE FROM ' . TOPICS_POSTED_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $topic_ids); - $db->sql_query($sql); - - // Now, let us collect the user/topic combos for rebuilding the information - $sql = 'SELECT poster_id, topic_id - FROM ' . POSTS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $topic_ids) . ' - AND poster_id <> ' . ANONYMOUS . ' - GROUP BY poster_id, topic_id'; - $result = $db->sql_query($sql); - - $posted = array(); - while ($row = $db->sql_fetchrow($result)) - { - // Add as key to make them unique (grouping by) and circumvent empty keys on array_unique - $posted[$row['poster_id']][] = $row['topic_id']; - } - $db->sql_freeresult($result); - - // Now add the information... - $sql_ary = array(); - foreach ($posted as $user_id => $topic_row) - { - foreach ($topic_row as $topic_id) - { - $sql_ary[] = array( - 'user_id' => (int) $user_id, - 'topic_id' => (int) $topic_id, - 'topic_posted' => 1, - ); - } - } - unset($posted); - - $db->sql_multi_insert(TOPICS_POSTED_TABLE, $sql_ary); -} - -/** -* Delete attached file -*/ -function phpbb_unlink($filename, $mode = 'file', $entry_removed = false) -{ - global $db, $phpbb_root_path, $config; - - // Because of copying topics or modifications a physical filename could be assigned more than once. If so, do not remove the file itself. - $sql = 'SELECT COUNT(attach_id) AS num_entries - FROM ' . ATTACHMENTS_TABLE . " - WHERE physical_filename = '" . $db->sql_escape(basename($filename)) . "'"; - $result = $db->sql_query($sql); - $num_entries = (int) $db->sql_fetchfield('num_entries'); - $db->sql_freeresult($result); - - // Do not remove file if at least one additional entry with the same name exist. - if (($entry_removed && $num_entries > 0) || (!$entry_removed && $num_entries > 1)) - { - return false; - } - - $filename = ($mode == 'thumbnail') ? 'thumb_' . basename($filename) : basename($filename); - return @unlink($phpbb_root_path . $config['upload_path'] . '/' . $filename); -} - -/** -* All-encompasing sync function -* -* Exaples: -* -* sync('topic', 'topic_id', 123); // resync topic #123 -* sync('topic', 'forum_id', array(2, 3)); // resync topics from forum #2 and #3 -* sync('topic'); // resync all topics -* sync('topic', 'range', 'topic_id BETWEEN 1 AND 60'); // resync a range of topics/forums (only available for 'topic' and 'forum' modes) -* -* -* Modes: -* - forum Resync complete forum -* - topic Resync topics -* - topic_moved Removes topic shadows that would be in the same forum as the topic they link to -* - topic_approved Resyncs the topic_approved flag according to the status of the first post -* - post_reported Resyncs the post_reported flag, relying on actual reports -* - topic_reported Resyncs the topic_reported flag, relying on post_reported flags -* - post_attachement Same as post_reported, but with attachment flags -* - topic_attachement Same as topic_reported, but with attachment flags -*/ -function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false, $sync_extra = false) -{ - global $db; - - if (is_array($where_ids)) - { - $where_ids = array_unique($where_ids); - $where_ids = array_map('intval', $where_ids); - } - else if ($where_type != 'range') - { - $where_ids = ($where_ids) ? array((int) $where_ids) : array(); - } - - if ($mode == 'forum' || $mode == 'topic' || $mode == 'topic_approved' || $mode == 'topic_reported' || $mode == 'post_reported') - { - if (!$where_type) - { - $where_sql = ''; - $where_sql_and = 'WHERE'; - } - else if ($where_type == 'range') - { - // Only check a range of topics/forums. For instance: 'topic_id BETWEEN 1 AND 60' - $where_sql = 'WHERE (' . $mode[0] . ".$where_ids)"; - $where_sql_and = $where_sql . "\n\tAND"; - } - else - { - // Do not sync the "global forum" - $where_ids = array_diff($where_ids, array(0)); - - if (!sizeof($where_ids)) - { - // Empty array with IDs. This means that we don't have any work to do. Just return. - return; + message_die(GENERAL_ERROR, 'Could not get topic ID', '', __LINE__, __FILE__, $sql); } - // Limit the topics/forums we are syncing, use specific topic/forum IDs. - // $where_type contains the field for the where clause (forum_id, topic_id) - $where_sql = 'WHERE ' . $db->sql_in_set($mode[0] . '.' . $where_type, $where_ids); - $where_sql_and = $where_sql . "\n\tAND"; - } - } - else - { - if (!sizeof($where_ids)) - { - return; - } - - // $where_type contains the field for the where clause (forum_id, topic_id) - $where_sql = 'WHERE ' . $db->sql_in_set($mode[0] . '.' . $where_type, $where_ids); - $where_sql_and = $where_sql . "\n\tAND"; - } - - switch ($mode) - { - case 'topic_moved': - if ($db->multi_table_deletion) + while( $row = $db->sql_fetchrow($result) ) { - $sql = 'DELETE FROM ' . TOPICS_TABLE . ' - USING ' . TOPICS_TABLE . ' t1, ' . TOPICS_TABLE . " t2 - WHERE t1.topic_moved_id = t2.topic_id - AND t1.forum_id = t2.forum_id"; - $db->sql_query($sql); + sync('topic', $row['topic_id']); + } + break; + + case 'forum': + $sql = "SELECT MAX(post_id) AS last_post, COUNT(post_id) AS total + FROM " . POSTS_TABLE . " + WHERE forum_id = $id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not get post ID', '', __LINE__, __FILE__, $sql); + } + + if ( $row = $db->sql_fetchrow($result) ) + { + $last_post = ( $row['last_post'] ) ? $row['last_post'] : 0; + $total_posts = ($row['total']) ? $row['total'] : 0; } else { - $sql = 'SELECT t1.topic_id - FROM ' .TOPICS_TABLE . ' t1, ' . TOPICS_TABLE . " t2 - WHERE t1.topic_moved_id = t2.topic_id - AND t1.forum_id = t2.forum_id"; - $result = $db->sql_query($sql); - - $topic_id_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - $topic_id_ary[] = $row['topic_id']; - } - $db->sql_freeresult($result); - - if (!sizeof($topic_id_ary)) - { - return; - } - - $sql = 'DELETE FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $topic_id_ary); - $db->sql_query($sql); + $last_post = 0; + $total_posts = 0; } - break; - case 'topic_approved': - if ($db->dbms_type == 'mysql') + $sql = "SELECT COUNT(topic_id) AS total + FROM " . TOPICS_TABLE . " + WHERE forum_id = $id"; + if ( !($result = $db->sql_query($sql)) ) { - $sql = 'UPDATE ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p - SET t.topic_approved = p.post_approved - $where_sql_and t.topic_first_post_id = p.post_id"; - $db->sql_query($sql); + message_die(GENERAL_ERROR, 'Could not get topic count', '', __LINE__, __FILE__, $sql); } - else + + $total_topics = ( $row = $db->sql_fetchrow($result) ) ? ( ( $row['total'] ) ? $row['total'] : 0 ) : 0; + + $sql = "UPDATE " . FORUMS_TABLE . " + SET forum_last_post_id = $last_post, forum_posts = $total_posts, forum_topics = $total_topics + WHERE forum_id = $id"; + if ( !$db->sql_query($sql) ) { - $sql = 'SELECT t.topic_id, p.post_approved - FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p - $where_sql_and p.post_id = t.topic_first_post_id - AND p.post_approved <> t.topic_approved"; - $result = $db->sql_query($sql); - - $topic_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $topic_ids[] = $row['topic_id']; - } - $db->sql_freeresult($result); - - if (!sizeof($topic_ids)) - { - return; - } - - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET topic_approved = 1 - topic_approved - WHERE ' . $db->sql_in_set('topic_id', $topic_ids); - $db->sql_query($sql); + message_die(GENERAL_ERROR, 'Could not update forum', '', __LINE__, __FILE__, $sql); } - break; - - case 'post_reported': - $post_ids = $post_reported = array(); - - $sql = 'SELECT p.post_id, p.post_reported - FROM ' . POSTS_TABLE . " p - $where_sql - GROUP BY p.post_id, p.post_reported"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $post_ids[$row['post_id']] = $row['post_id']; - if ($row['post_reported']) - { - $post_reported[$row['post_id']] = 1; - } - } - $db->sql_freeresult($result); - - $sql = 'SELECT DISTINCT(post_id) - FROM ' . REPORTS_TABLE . ' - WHERE ' . $db->sql_in_set('post_id', $post_ids) . ' - AND report_closed = 0'; - $result = $db->sql_query($sql); - - $post_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - if (!isset($post_reported[$row['post_id']])) - { - $post_ids[] = $row['post_id']; - } - else - { - unset($post_reported[$row['post_id']]); - } - } - $db->sql_freeresult($result); - - // $post_reported should be empty by now, if it's not it contains - // posts that are falsely flagged as reported - foreach ($post_reported as $post_id => $void) - { - $post_ids[] = $post_id; - } - - if (sizeof($post_ids)) - { - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET post_reported = 1 - post_reported - WHERE ' . $db->sql_in_set('post_id', $post_ids); - $db->sql_query($sql); - } - break; - - case 'topic_reported': - if ($sync_extra) - { - sync('post_reported', $where_type, $where_ids); - } - - $topic_ids = $topic_reported = array(); - - $sql = 'SELECT DISTINCT(t.topic_id) - FROM ' . POSTS_TABLE . " t - $where_sql_and t.post_reported = 1"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $topic_reported[$row['topic_id']] = 1; - } - $db->sql_freeresult($result); - - $sql = 'SELECT t.topic_id, t.topic_reported - FROM ' . TOPICS_TABLE . " t - $where_sql"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if ($row['topic_reported'] ^ isset($topic_reported[$row['topic_id']])) - { - $topic_ids[] = $row['topic_id']; - } - } - $db->sql_freeresult($result); - - if (sizeof($topic_ids)) - { - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET topic_reported = 1 - topic_reported - WHERE ' . $db->sql_in_set('topic_id', $topic_ids); - $db->sql_query($sql); - } - break; - - case 'post_attachment': - $post_ids = $post_attachment = array(); - - $sql = 'SELECT p.post_id, p.post_attachment - FROM ' . POSTS_TABLE . " p - $where_sql - GROUP BY p.post_id, p.post_attachment"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $post_ids[$row['post_id']] = $row['post_id']; - if ($row['post_attachment']) - { - $post_attachment[$row['post_id']] = 1; - } - } - $db->sql_freeresult($result); - - $sql = 'SELECT DISTINCT(post_msg_id) - FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set('post_msg_id', $post_ids) . ' - AND in_message = 0'; - $result = $db->sql_query($sql); - - $post_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - if (!isset($post_attachment[$row['post_msg_id']])) - { - $post_ids[] = $row['post_msg_id']; - } - else - { - unset($post_attachment[$row['post_msg_id']]); - } - } - $db->sql_freeresult($result); - - // $post_attachment should be empty by now, if it's not it contains - // posts that are falsely flagged as having attachments - foreach ($post_attachment as $post_id => $void) - { - $post_ids[] = $post_id; - } - - if (sizeof($post_ids)) - { - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET post_attachment = 1 - post_attachment - WHERE ' . $db->sql_in_set('post_id', $post_ids); - $db->sql_query($sql); - } - break; - - case 'topic_attachment': - if ($sync_extra) - { - sync('post_attachment', $where_type, $where_ids); - } - - $topic_ids = $topic_attachment = array(); - - $sql = 'SELECT DISTINCT(t.topic_id) - FROM ' . POSTS_TABLE . " t - $where_sql_and t.post_attachment = 1"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $topic_attachment[$row['topic_id']] = 1; - } - $db->sql_freeresult($result); - - $sql = 'SELECT t.topic_id, t.topic_attachment - FROM ' . TOPICS_TABLE . " t - $where_sql"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if ($row['topic_attachment'] ^ isset($topic_attachment[$row['topic_id']])) - { - $topic_ids[] = $row['topic_id']; - } - } - $db->sql_freeresult($result); - - if (sizeof($topic_ids)) - { - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET topic_attachment = 1 - topic_attachment - WHERE ' . $db->sql_in_set('topic_id', $topic_ids); - $db->sql_query($sql); - } - break; - - case 'forum': - - // 1: Get the list of all forums - $sql = 'SELECT f.* - FROM ' . FORUMS_TABLE . " f - $where_sql"; - $result = $db->sql_query($sql); - - $forum_data = $forum_ids = $post_ids = $last_post_id = $post_info = array(); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['forum_type'] == FORUM_LINK) - { - continue; - } - - $forum_id = (int) $row['forum_id']; - $forum_ids[$forum_id] = $forum_id; - - $forum_data[$forum_id] = $row; - if ($sync_extra) - { - $forum_data[$forum_id]['posts'] = 0; - $forum_data[$forum_id]['topics'] = 0; - $forum_data[$forum_id]['topics_real'] = 0; - } - $forum_data[$forum_id]['last_post_id'] = 0; - $forum_data[$forum_id]['last_post_subject'] = ''; - $forum_data[$forum_id]['last_post_time'] = 0; - $forum_data[$forum_id]['last_poster_id'] = 0; - $forum_data[$forum_id]['last_poster_name'] = ''; - $forum_data[$forum_id]['last_poster_colour'] = ''; - } - $db->sql_freeresult($result); - - if (!sizeof($forum_ids)) - { - break; - } - - $forum_ids = array_values($forum_ids); - - // 2: Get topic counts for each forum (optional) - if ($sync_extra) - { - $sql = 'SELECT forum_id, topic_approved, COUNT(topic_id) AS forum_topics - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $forum_ids) . ' - GROUP BY forum_id, topic_approved'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $forum_id = (int) $row['forum_id']; - $forum_data[$forum_id]['topics_real'] += $row['forum_topics']; - - if ($row['topic_approved']) - { - $forum_data[$forum_id]['topics'] = $row['forum_topics']; - } - } - $db->sql_freeresult($result); - } - - // 3: Get post count for each forum (optional) - if ($sync_extra) - { - if (sizeof($forum_ids) == 1) - { - $sql = 'SELECT SUM(t.topic_replies + 1) AS forum_posts - FROM ' . TOPICS_TABLE . ' t - WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . ' - AND t.topic_approved = 1'; - } - else - { - $sql = 'SELECT t.forum_id, SUM(t.topic_replies + 1) AS forum_posts - FROM ' . TOPICS_TABLE . ' t - WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . ' - AND t.topic_approved = 1 - GROUP BY t.forum_id'; - } - - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $forum_id = (sizeof($forum_ids) == 1) ? (int) $forum_ids[0] : (int) $row['forum_id']; - - $forum_data[$forum_id]['posts'] = (int) $row['forum_posts']; - } - $db->sql_freeresult($result); - } - - // 4: Get last_post_id for each forum - if (sizeof($forum_ids) == 1) - { - $sql = 'SELECT MAX(t.topic_last_post_id) as last_post_id - FROM ' . TOPICS_TABLE . ' t - WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . ' - AND t.topic_approved = 1'; - } - else - { - $sql = 'SELECT t.forum_id, MAX(t.topic_last_post_id) as last_post_id - FROM ' . TOPICS_TABLE . ' t - WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . ' - AND t.topic_approved = 1 - GROUP BY t.forum_id'; - } - - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $forum_id = (sizeof($forum_ids) == 1) ? (int) $forum_ids[0] : (int) $row['forum_id']; - - $forum_data[$forum_id]['last_post_id'] = (int) $row['last_post_id']; - - $post_ids[] = $row['last_post_id']; - } - $db->sql_freeresult($result); - - // 5: Retrieve last_post infos - if (sizeof($post_ids)) - { - $sql = 'SELECT p.post_id, p.poster_id, p.post_subject, p.post_time, p.post_username, u.username, u.user_colour - FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u - WHERE ' . $db->sql_in_set('p.post_id', $post_ids) . ' - AND p.poster_id = u.user_id'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $post_info[$row['post_id']] = $row; - } - $db->sql_freeresult($result); - - foreach ($forum_data as $forum_id => $data) - { - if ($data['last_post_id']) - { - if (isset($post_info[$data['last_post_id']])) - { - $forum_data[$forum_id]['last_post_subject'] = $post_info[$data['last_post_id']]['post_subject']; - $forum_data[$forum_id]['last_post_time'] = $post_info[$data['last_post_id']]['post_time']; - $forum_data[$forum_id]['last_poster_id'] = $post_info[$data['last_post_id']]['poster_id']; - $forum_data[$forum_id]['last_poster_name'] = ($post_info[$data['last_post_id']]['poster_id'] != ANONYMOUS) ? $post_info[$data['last_post_id']]['username'] : $post_info[$data['last_post_id']]['post_username']; - $forum_data[$forum_id]['last_poster_colour'] = $post_info[$data['last_post_id']]['user_colour']; - } - else - { - // For some reason we did not find the post in the db - $forum_data[$forum_id]['last_post_id'] = 0; - $forum_data[$forum_id]['last_post_subject'] = ''; - $forum_data[$forum_id]['last_post_time'] = 0; - $forum_data[$forum_id]['last_poster_id'] = 0; - $forum_data[$forum_id]['last_poster_name'] = ''; - $forum_data[$forum_id]['last_poster_colour'] = ''; - } - } - } - unset($post_info); - } - - // 6: Now do that thing - $fieldnames = array('last_post_id', 'last_post_subject', 'last_post_time', 'last_poster_id', 'last_poster_name', 'last_poster_colour'); - - if ($sync_extra) - { - array_push($fieldnames, 'posts', 'topics', 'topics_real'); - } - - foreach ($forum_data as $forum_id => $row) - { - $sql_ary = array(); - - foreach ($fieldnames as $fieldname) - { - if ($row['forum_' . $fieldname] != $row[$fieldname]) - { - if (preg_match('#(name|colour|subject)$#', $fieldname)) - { - $sql_ary['forum_' . $fieldname] = (string) $row[$fieldname]; - } - else - { - $sql_ary['forum_' . $fieldname] = (int) $row[$fieldname]; - } - } - } - - if (sizeof($sql_ary)) - { - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE forum_id = ' . $forum_id; - $db->sql_query($sql); - } - } - break; + break; case 'topic': - $topic_data = $post_ids = $approved_unapproved_ids = $resync_forums = $delete_topics = $delete_posts = $moved_topics = array(); - - $sql = 'SELECT t.topic_id, t.forum_id, t.topic_moved_id, t.topic_approved, ' . (($sync_extra) ? 't.topic_attachment, t.topic_reported, ' : '') . 't.topic_poster, t.topic_time, t.topic_replies, t.topic_replies_real, t.topic_first_post_id, t.topic_first_poster_name, t.topic_first_poster_colour, t.topic_last_post_id, t.topic_last_post_subject, t.topic_last_poster_id, t.topic_last_poster_name, t.topic_last_poster_colour, t.topic_last_post_time - FROM ' . TOPICS_TABLE . " t - $where_sql"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) + $sql = "SELECT MAX(post_id) AS last_post, MIN(post_id) AS first_post, COUNT(post_id) AS total_posts + FROM " . POSTS_TABLE . " + WHERE topic_id = $id"; + if ( !($result = $db->sql_query($sql)) ) { - if ($row['topic_moved_id']) - { - $moved_topics[] = $row['topic_id']; - continue; - } - - $topic_id = (int) $row['topic_id']; - $topic_data[$topic_id] = $row; - $topic_data[$topic_id]['replies_real'] = -1; - $topic_data[$topic_id]['replies'] = 0; - $topic_data[$topic_id]['first_post_id'] = 0; - $topic_data[$topic_id]['last_post_id'] = 0; - unset($topic_data[$topic_id]['topic_id']); - - // This array holds all topic_ids - $delete_topics[$topic_id] = ''; - - if ($sync_extra) - { - $topic_data[$topic_id]['reported'] = 0; - $topic_data[$topic_id]['attachment'] = 0; - } + message_die(GENERAL_ERROR, 'Could not get post ID', '', __LINE__, __FILE__, $sql); } - $db->sql_freeresult($result); - // Use "t" as table alias because of the $where_sql clause - // NOTE: 't.post_approved' in the GROUP BY is causing a major slowdown. - $sql = 'SELECT t.topic_id, t.post_approved, COUNT(t.post_id) AS total_posts, MIN(t.post_id) AS first_post_id, MAX(t.post_id) AS last_post_id - FROM ' . POSTS_TABLE . " t - $where_sql - GROUP BY t.topic_id, t.post_approved"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) + if ( $row = $db->sql_fetchrow($result) ) { - $topic_id = (int) $row['topic_id']; - - $row['first_post_id'] = (int) $row['first_post_id']; - $row['last_post_id'] = (int) $row['last_post_id']; - - if (!isset($topic_data[$topic_id])) + if ($row['total_posts']) { - // Hey, these posts come from a topic that does not exist - $delete_posts[$topic_id] = ''; + // Correct the details of this topic + $sql = 'UPDATE ' . TOPICS_TABLE . ' + SET topic_replies = ' . ($row['total_posts'] - 1) . ', topic_first_post_id = ' . $row['first_post'] . ', topic_last_post_id = ' . $row['last_post'] . " + WHERE topic_id = $id"; + + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Could not update topic', '', __LINE__, __FILE__, $sql); + } } else { - // Unset the corresponding entry in $delete_topics - // When we'll be done, only topics with no posts will remain - unset($delete_topics[$topic_id]); + // There are no replies to this topic + // Check if it is a move stub + $sql = 'SELECT topic_moved_id + FROM ' . TOPICS_TABLE . " + WHERE topic_id = $id"; - $topic_data[$topic_id]['replies_real'] += $row['total_posts']; - $topic_data[$topic_id]['first_post_id'] = (!$topic_data[$topic_id]['first_post_id']) ? $row['first_post_id'] : min($topic_data[$topic_id]['first_post_id'], $row['first_post_id']); - - if ($row['post_approved'] || !$topic_data[$topic_id]['last_post_id']) + if (!($result = $db->sql_query($sql))) { - $topic_data[$topic_id]['replies'] = $row['total_posts'] - 1; - $topic_data[$topic_id]['last_post_id'] = $row['last_post_id']; + message_die(GENERAL_ERROR, 'Could not get topic ID', '', __LINE__, __FILE__, $sql); } - } - } - $db->sql_freeresult($result); - foreach ($topic_data as $topic_id => $row) - { - $post_ids[] = $row['first_post_id']; - if ($row['first_post_id'] != $row['last_post_id']) - { - $post_ids[] = $row['last_post_id']; - } - } - - // Now we delete empty topics and orphan posts - if (sizeof($delete_posts)) - { - delete_posts('topic_id', array_keys($delete_posts), false); - unset($delete_posts); - } - - if (!sizeof($topic_data)) - { - // If we get there, topic ids were invalid or topics did not contain any posts - delete_topics($where_type, $where_ids, true); - return; - } - - if (sizeof($delete_topics)) - { - $delete_topic_ids = array(); - foreach ($delete_topics as $topic_id => $void) - { - unset($topic_data[$topic_id]); - $delete_topic_ids[] = $topic_id; - } - - delete_topics('topic_id', $delete_topic_ids, false); - unset($delete_topics, $delete_topic_ids); - } - - $sql = 'SELECT p.post_id, p.topic_id, p.post_approved, p.poster_id, p.post_subject, p.post_username, p.post_time, u.username, u.user_colour - FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u - WHERE ' . $db->sql_in_set('p.post_id', $post_ids) . ' - AND u.user_id = p.poster_id'; - $result = $db->sql_query($sql); - - $post_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $topic_id = intval($row['topic_id']); - - if ($row['post_id'] == $topic_data[$topic_id]['first_post_id']) - { - if ($topic_data[$topic_id]['topic_approved'] != $row['post_approved']) + if ($row = $db->sql_fetchrow($result)) { - $approved_unapproved_ids[] = $topic_id; - } - $topic_data[$topic_id]['time'] = $row['post_time']; - $topic_data[$topic_id]['poster'] = $row['poster_id']; - $topic_data[$topic_id]['first_poster_name'] = ($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username']; - $topic_data[$topic_id]['first_poster_colour'] = $row['user_colour']; - } - - if ($row['post_id'] == $topic_data[$topic_id]['last_post_id']) - { - $topic_data[$topic_id]['last_poster_id'] = $row['poster_id']; - $topic_data[$topic_id]['last_post_subject'] = $row['post_subject']; - $topic_data[$topic_id]['last_post_time'] = $row['post_time']; - $topic_data[$topic_id]['last_poster_name'] = ($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username']; - $topic_data[$topic_id]['last_poster_colour'] = $row['user_colour']; - } - } - $db->sql_freeresult($result); - - // Make sure shadow topics do link to existing topics - if (sizeof($moved_topics)) - { - $delete_topics = array(); - - $sql = 'SELECT t1.topic_id, t1.topic_moved_id - FROM ' . TOPICS_TABLE . ' t1 - LEFT JOIN ' . TOPICS_TABLE . ' t2 ON (t2.topic_id = t1.topic_moved_id) - WHERE ' . $db->sql_in_set('t1.topic_id', $moved_topics) . ' - AND t2.topic_id IS NULL'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $delete_topics[] = $row['topic_id']; - } - $db->sql_freeresult($result); - - if (sizeof($delete_topics)) - { - delete_topics('topic_id', $delete_topics, false); - } - unset($delete_topics); - - // Make sure shadow topics having no last post data being updated (this only rarely happens...) - $sql = 'SELECT topic_id, topic_moved_id, topic_last_post_id, topic_first_post_id - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $moved_topics) . ' - AND topic_last_post_time = 0'; - $result = $db->sql_query($sql); - - $shadow_topic_data = $post_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $shadow_topic_data[$row['topic_moved_id']] = $row; - $post_ids[] = $row['topic_last_post_id']; - $post_ids[] = $row['topic_first_post_id']; - } - $db->sql_freeresult($result); - - $sync_shadow_topics = array(); - if (sizeof($post_ids)) - { - $sql = 'SELECT p.post_id, p.topic_id, p.post_approved, p.poster_id, p.post_subject, p.post_username, p.post_time, u.username, u.user_colour - FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u - WHERE ' . $db->sql_in_set('p.post_id', $post_ids) . ' - AND u.user_id = p.poster_id'; - $result = $db->sql_query($sql); - - $post_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $topic_id = (int) $row['topic_id']; - - // Ok, there should be a shadow topic. If there isn't, then there's something wrong with the db. - // However, there's not much we can do about it. - if (!empty($shadow_topic_data[$topic_id])) + if (!$row['topic_moved_id']) { - if ($row['post_id'] == $shadow_topic_data[$topic_id]['topic_first_post_id']) + $sql = 'DELETE FROM ' . TOPICS_TABLE . " WHERE topic_id = $id"; + + if (!$db->sql_query($sql)) { - $orig_topic_id = $shadow_topic_data[$topic_id]['topic_id']; - - if (!isset($sync_shadow_topics[$orig_topic_id])) - { - $sync_shadow_topics[$orig_topic_id] = array(); - } - - $sync_shadow_topics[$orig_topic_id]['topic_time'] = $row['post_time']; - $sync_shadow_topics[$orig_topic_id]['topic_poster'] = $row['poster_id']; - $sync_shadow_topics[$orig_topic_id]['topic_first_poster_name'] = ($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username']; - $sync_shadow_topics[$orig_topic_id]['topic_first_poster_colour'] = $row['user_colour']; - } - - if ($row['post_id'] == $shadow_topic_data[$topic_id]['topic_last_post_id']) - { - $orig_topic_id = $shadow_topic_data[$topic_id]['topic_id']; - - if (!isset($sync_shadow_topics[$orig_topic_id])) - { - $sync_shadow_topics[$orig_topic_id] = array(); - } - - $sync_shadow_topics[$orig_topic_id]['topic_last_poster_id'] = $row['poster_id']; - $sync_shadow_topics[$orig_topic_id]['topic_last_post_subject'] = $row['post_subject']; - $sync_shadow_topics[$orig_topic_id]['topic_last_post_time'] = $row['post_time']; - $sync_shadow_topics[$orig_topic_id]['topic_last_poster_name'] = ($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username']; - $sync_shadow_topics[$orig_topic_id]['topic_last_poster_colour'] = $row['user_colour']; + message_die(GENERAL_ERROR, 'Could not remove topic', '', __LINE__, __FILE__, $sql); } } } - $db->sql_freeresult($result); - $shadow_topic_data = array(); - - // Update the information we collected - if (sizeof($sync_shadow_topics)) - { - foreach ($sync_shadow_topics as $sync_topic_id => $sql_ary) - { - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE topic_id = ' . $sync_topic_id; - $db->sql_query($sql); - } - } - } - - unset($sync_shadow_topics, $shadow_topic_data); - } - - // approved becomes unapproved, and vice-versa - if (sizeof($approved_unapproved_ids)) - { - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET topic_approved = 1 - topic_approved - WHERE ' . $db->sql_in_set('topic_id', $approved_unapproved_ids); - $db->sql_query($sql); - } - unset($approved_unapproved_ids); - - // These are fields that will be synchronised - $fieldnames = array('time', 'replies', 'replies_real', 'poster', 'first_post_id', 'first_poster_name', 'first_poster_colour', 'last_post_id', 'last_post_subject', 'last_post_time', 'last_poster_id', 'last_poster_name', 'last_poster_colour'); - - if ($sync_extra) - { - // This routine assumes that post_reported values are correct - // if they are not, use sync('post_reported') first - $sql = 'SELECT t.topic_id, p.post_id - FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p - $where_sql_and p.topic_id = t.topic_id - AND p.post_reported = 1 - GROUP BY t.topic_id, p.post_id"; - $result = $db->sql_query($sql); - - $fieldnames[] = 'reported'; - while ($row = $db->sql_fetchrow($result)) - { - $topic_data[intval($row['topic_id'])]['reported'] = 1; - } - $db->sql_freeresult($result); - - // This routine assumes that post_attachment values are correct - // if they are not, use sync('post_attachment') first - $sql = 'SELECT t.topic_id, p.post_id - FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p - $where_sql_and p.topic_id = t.topic_id - AND p.post_attachment = 1 - GROUP BY t.topic_id, p.post_id"; - $result = $db->sql_query($sql); - - $fieldnames[] = 'attachment'; - while ($row = $db->sql_fetchrow($result)) - { - $topic_data[intval($row['topic_id'])]['attachment'] = 1; - } - $db->sql_freeresult($result); - } - - foreach ($topic_data as $topic_id => $row) - { - $sql_ary = array(); - - foreach ($fieldnames as $fieldname) - { - if (isset($row[$fieldname]) && isset($row['topic_' . $fieldname]) && $row['topic_' . $fieldname] != $row[$fieldname]) - { - $sql_ary['topic_' . $fieldname] = $row[$fieldname]; - } - } - - if (sizeof($sql_ary)) - { - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE topic_id = ' . $topic_id; - $db->sql_query($sql); - - $resync_forums[$row['forum_id']] = $row['forum_id']; - } - } - unset($topic_data); - - // if some topics have been resync'ed then resync parent forums - // except when we're only syncing a range, we don't want to sync forums during - // batch processing. - if ($resync_parents && sizeof($resync_forums) && $where_type != 'range') - { - sync('forum', 'forum_id', array_values($resync_forums), true, true); - } - break; - } - - return; -} - -/** -* Prune function -*/ -function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync = true) -{ - global $db; - - if (!is_array($forum_id)) - { - $forum_id = array($forum_id); - } - - if (!sizeof($forum_id)) - { - return; - } - - $sql_and = ''; - - if (!($prune_flags & FORUM_FLAG_PRUNE_ANNOUNCE)) - { - $sql_and .= ' AND topic_type <> ' . POST_ANNOUNCE; - } - - if (!($prune_flags & FORUM_FLAG_PRUNE_STICKY)) - { - $sql_and .= ' AND topic_type <> ' . POST_STICKY; - } - - if ($prune_mode == 'posted') - { - $sql_and .= " AND topic_last_post_time < $prune_date"; - } - - if ($prune_mode == 'viewed') - { - $sql_and .= " AND topic_last_view_time < $prune_date"; - } - - $sql = 'SELECT topic_id - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $forum_id) . " - AND poll_start = 0 - $sql_and"; - $result = $db->sql_query($sql); - - $topic_list = array(); - while ($row = $db->sql_fetchrow($result)) - { - $topic_list[] = $row['topic_id']; - } - $db->sql_freeresult($result); - - if ($prune_flags & FORUM_FLAG_PRUNE_POLL) - { - $sql = 'SELECT topic_id - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $forum_id) . " - AND poll_start > 0 - AND poll_last_vote < $prune_date - $sql_and"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $topic_list[] = $row['topic_id']; - } - $db->sql_freeresult($result); - - $topic_list = array_unique($topic_list); - } - - return delete_topics('topic_id', $topic_list, $auto_sync, false); -} - -/** -* Function auto_prune(), this function now relies on passed vars -*/ -function auto_prune($forum_id, $prune_mode, $prune_flags, $prune_days, $prune_freq) -{ - global $db; - - $sql = 'SELECT forum_name - FROM ' . FORUMS_TABLE . " - WHERE forum_id = $forum_id"; - $result = $db->sql_query($sql, 3600); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - $prune_date = time() - ($prune_days * 86400); - $next_prune = time() + ($prune_freq * 86400); - - prune($forum_id, $prune_mode, $prune_date, $prune_flags, true); - - $sql = 'UPDATE ' . FORUMS_TABLE . " - SET prune_next = $next_prune - WHERE forum_id = $forum_id"; - $db->sql_query($sql); - - add_log('admin', 'LOG_AUTO_PRUNE', $row['forum_name']); - } - - return; -} - -/** -* remove_comments will strip the sql comment lines out of an uploaded sql file -* specifically for mssql and postgres type files in the install.... -*/ -function remove_comments(&$output) -{ - $lines = explode("\n", $output); - $output = ''; - - // try to keep mem. use down - $linecount = sizeof($lines); - - $in_comment = false; - for ($i = 0; $i < $linecount; $i++) - { - if (trim($lines[$i]) == '/*') - { - $in_comment = true; - } - - if (!$in_comment) - { - $output .= $lines[$i] . "\n"; - } - - if (trim($lines[$i]) == '*/') - { - $in_comment = false; - } - } - - unset($lines); - return $output; -} - -/** -* Cache moderators, called whenever permissions are changed via admin_permissions. Changes of username -* and group names must be carried through for the moderators table -*/ -function cache_moderators() -{ - global $db, $cache, $auth, $phpbb_root_path, $phpEx; - - // Remove cached sql results - $cache->destroy('sql', MODERATOR_CACHE_TABLE); - - // Clear table - if ($db->truncate) - { - $db->sql_query('TRUNCATE TABLE ' . MODERATOR_CACHE_TABLE); - } - else - { - $db->sql_query('DELETE FROM ' . MODERATOR_CACHE_TABLE); - } - - // We add moderators who have forum moderator permissions without an explicit ACL_NEVER setting - $hold_ary = $ug_id_ary = $sql_ary = array(); - - // Grab all users having moderative options... - $hold_ary = $auth->acl_user_raw_data(false, 'm_%', false); - - // Add users? - if (sizeof($hold_ary)) - { - // At least one moderative option warrants a display - $ug_id_ary = array_keys($hold_ary); - - // Remove users who have group memberships with DENY moderator permissions - $sql = $db->sql_build_query('SELECT', array( - 'SELECT' => 'a.forum_id, ug.user_id', - - 'FROM' => array( - ACL_OPTIONS_TABLE => 'o', - USER_GROUP_TABLE => 'ug', - ACL_GROUPS_TABLE => 'a' - ), - - 'LEFT_JOIN' => array( - array( - 'FROM' => array(ACL_ROLES_DATA_TABLE => 'r'), - 'ON' => 'a.auth_role_id = r.role_id' - ) - ), - - 'WHERE' => '(o.auth_option_id = a.auth_option_id OR o.auth_option_id = r.auth_option_id) - AND ((a.auth_setting = ' . ACL_NEVER . ' AND r.auth_setting IS NULL) - OR r.auth_setting = ' . ACL_NEVER . ') - AND a.group_id = ug.group_id - AND ' . $db->sql_in_set('ug.user_id', $ug_id_ary) . " - AND ug.user_pending = 0 - AND o.auth_option " . $db->sql_like_expression('m_' . $db->any_char), - )); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if (isset($hold_ary[$row['user_id']][$row['forum_id']])) - { - unset($hold_ary[$row['user_id']][$row['forum_id']]); - } - } - $db->sql_freeresult($result); - - if (sizeof($hold_ary)) - { - // Get usernames... - $sql = 'SELECT user_id, username - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', array_keys($hold_ary)); - $result = $db->sql_query($sql); - - $usernames_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - $usernames_ary[$row['user_id']] = $row['username']; - } - - foreach ($hold_ary as $user_id => $forum_id_ary) - { - // Do not continue if user does not exist - if (!isset($usernames_ary[$user_id])) - { - continue; - } - - foreach ($forum_id_ary as $forum_id => $auth_ary) - { - $sql_ary[] = array( - 'forum_id' => (int) $forum_id, - 'user_id' => (int) $user_id, - 'username' => (string) $usernames_ary[$user_id], - 'group_id' => 0, - 'group_name' => '' - ); - } - } - } - } - - // Now to the groups... - $hold_ary = $auth->acl_group_raw_data(false, 'm_%', false); - - if (sizeof($hold_ary)) - { - $ug_id_ary = array_keys($hold_ary); - - // Make sure not hidden or special groups are involved... - $sql = 'SELECT group_name, group_id, group_type - FROM ' . GROUPS_TABLE . ' - WHERE ' . $db->sql_in_set('group_id', $ug_id_ary); - $result = $db->sql_query($sql); - - $groupnames_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['group_type'] == GROUP_HIDDEN || $row['group_type'] == GROUP_SPECIAL) - { - unset($hold_ary[$row['group_id']]); - } - - $groupnames_ary[$row['group_id']] = $row['group_name']; - } - $db->sql_freeresult($result); - - foreach ($hold_ary as $group_id => $forum_id_ary) - { - // If there is no group, we do not assign it... - if (!isset($groupnames_ary[$group_id])) - { - continue; - } - - foreach ($forum_id_ary as $forum_id => $auth_ary) - { - $flag = false; - foreach ($auth_ary as $auth_option => $setting) - { - // Make sure at least one ACL_YES option is set... - if ($setting == ACL_YES) - { - $flag = true; - break; - } - } - - if (!$flag) - { - continue; - } - - $sql_ary[] = array( - 'forum_id' => (int) $forum_id, - 'user_id' => 0, - 'username' => '', - 'group_id' => (int) $group_id, - 'group_name' => (string) $groupnames_ary[$group_id] - ); - } - } - } - - $db->sql_multi_insert(MODERATOR_CACHE_TABLE, $sql_ary); -} - -/** -* View log -*/ -function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id = 0, $topic_id = 0, $user_id = 0, $limit_days = 0, $sort_by = 'l.log_time DESC') -{ - global $db, $user, $auth, $phpEx, $phpbb_root_path, $phpbb_admin_path; - - $topic_id_list = $reportee_id_list = $is_auth = $is_mod = array(); - - $profile_url = (defined('IN_ADMIN')) ? append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&mode=overview') : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile'); - - switch ($mode) - { - case 'admin': - $log_type = LOG_ADMIN; - $sql_forum = ''; - break; - - case 'mod': - $log_type = LOG_MOD; - - if ($topic_id) - { - $sql_forum = 'AND l.topic_id = ' . intval($topic_id); - } - else if (is_array($forum_id)) - { - $sql_forum = 'AND ' . $db->sql_in_set('l.forum_id', array_map('intval', $forum_id)); - } - else - { - $sql_forum = ($forum_id) ? 'AND l.forum_id = ' . intval($forum_id) : ''; - } - break; - - case 'user': - $log_type = LOG_USERS; - $sql_forum = 'AND l.reportee_id = ' . (int) $user_id; - break; - - case 'users': - $log_type = LOG_USERS; - $sql_forum = ''; - break; - - case 'critical': - $log_type = LOG_CRITICAL; - $sql_forum = ''; - break; - - default: - return; - } - - $sql = "SELECT l.*, u.username, u.username_clean, u.user_colour - FROM " . LOG_TABLE . " l, " . USERS_TABLE . " u - WHERE l.log_type = $log_type - AND u.user_id = l.user_id - " . (($limit_days) ? "AND l.log_time >= $limit_days" : '') . " - $sql_forum - ORDER BY $sort_by"; - $result = $db->sql_query_limit($sql, $limit, $offset); - - $i = 0; - $log = array(); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['topic_id']) - { - $topic_id_list[] = $row['topic_id']; - } - - if ($row['reportee_id']) - { - $reportee_id_list[] = $row['reportee_id']; - } - - $log[$i] = array( - 'id' => $row['log_id'], - - 'reportee_id' => $row['reportee_id'], - 'reportee_username' => '', - 'reportee_username_full'=> '', - - 'user_id' => $row['user_id'], - 'username' => $row['username'], - 'username_full' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'], false, $profile_url), - - 'ip' => $row['log_ip'], - 'time' => $row['log_time'], - 'forum_id' => $row['forum_id'], - 'topic_id' => $row['topic_id'], - - 'viewforum' => ($row['forum_id'] && $auth->acl_get('f_read', $row['forum_id'])) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : false, - 'action' => (isset($user->lang[$row['log_operation']])) ? $user->lang[$row['log_operation']] : '{' . ucfirst(str_replace('_', ' ', $row['log_operation'])) . '}', - ); - - if (!empty($row['log_data'])) - { - $log_data_ary = unserialize($row['log_data']); - - if (isset($user->lang[$row['log_operation']])) - { - // We supress the warning about inappropriate number of passed parameters here due to possible changes within LOG strings from one version to another. - $log[$i]['action'] = @vsprintf($log[$i]['action'], $log_data_ary); - - // If within the admin panel we do not censor text out - if (defined('IN_ADMIN')) - { - $log[$i]['action'] = bbcode_nl2br($log[$i]['action']); - } - else - { - $log[$i]['action'] = bbcode_nl2br(censor_text($log[$i]['action'])); - } - } - else - { - $log[$i]['action'] .= '
    ' . implode('', $log_data_ary); - } - - /* Apply make_clickable... has to be seen if it is for good. :/ - // Seems to be not for the moment, reconsider later... - $log[$i]['action'] = make_clickable($log[$i]['action']); - */ - } - - $i++; - } - $db->sql_freeresult($result); - - if (sizeof($topic_id_list)) - { - $topic_id_list = array_unique($topic_id_list); - - // This query is not really needed if move_topics() updates the forum_id field, - // although it's also used to determine if the topic still exists in the database - $sql = 'SELECT topic_id, forum_id - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', array_map('intval', $topic_id_list)); - $result = $db->sql_query($sql); - - $default_forum_id = 0; - - while ($row = $db->sql_fetchrow($result)) - { - if (!$row['forum_id']) - { - if ($auth->acl_getf_global('f_read')) - { - if (!$default_forum_id) - { - $sql = 'SELECT forum_id - FROM ' . FORUMS_TABLE . ' - WHERE forum_type = ' . FORUM_POST; - $f_result = $db->sql_query_limit($sql, 1); - $default_forum_id = (int) $db->sql_fetchfield('forum_id', $f_result); - $db->sql_freeresult($f_result); - } - - $is_auth[$row['topic_id']] = $default_forum_id; - } - } - else - { - if ($auth->acl_get('f_read', $row['forum_id'])) - { - $is_auth[$row['topic_id']] = $row['forum_id']; - } - } - - if ($auth->acl_gets('a_', 'm_', $row['forum_id'])) - { - $is_mod[$row['topic_id']] = $row['forum_id']; - } - } - $db->sql_freeresult($result); - - foreach ($log as $key => $row) - { - $log[$key]['viewtopic'] = (isset($is_auth[$row['topic_id']])) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $is_auth[$row['topic_id']] . '&t=' . $row['topic_id']) : false; - $log[$key]['viewlogs'] = (isset($is_mod[$row['topic_id']])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=logs&mode=topic_logs&t=' . $row['topic_id'], true, $user->session_id) : false; - } - } - - if (sizeof($reportee_id_list)) - { - $reportee_id_list = array_unique($reportee_id_list); - $reportee_names_list = array(); - - $sql = 'SELECT user_id, username, user_colour - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', $reportee_id_list); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $reportee_names_list[$row['user_id']] = $row; - } - $db->sql_freeresult($result); - - foreach ($log as $key => $row) - { - if (!isset($reportee_names_list[$row['reportee_id']])) - { - continue; - } - - $log[$key]['reportee_username'] = $reportee_names_list[$row['reportee_id']]['username']; - $log[$key]['reportee_username_full'] = get_username_string('full', $row['reportee_id'], $reportee_names_list[$row['reportee_id']]['username'], $reportee_names_list[$row['reportee_id']]['user_colour'], false, $profile_url); - } - } - - $sql = 'SELECT COUNT(l.log_id) AS total_entries - FROM ' . LOG_TABLE . " l - WHERE l.log_type = $log_type - AND l.log_time >= $limit_days - $sql_forum"; - $result = $db->sql_query($sql); - $log_count = (int) $db->sql_fetchfield('total_entries'); - $db->sql_freeresult($result); - - return; -} - -/** -* Update foes - remove moderators and administrators from foe lists... -*/ -function update_foes($group_id = false, $user_id = false) -{ - global $db, $auth; - - // update foes for some user - if (is_array($user_id) && sizeof($user_id)) - { - $sql = 'DELETE FROM ' . ZEBRA_TABLE . ' - WHERE ' . $db->sql_in_set('zebra_id', $user_id) . ' - AND foe = 1'; - $db->sql_query($sql); - return; - } - - // update foes for some group - if (is_array($group_id) && sizeof($group_id)) - { - // Grab group settings... - $sql = $db->sql_build_query('SELECT', array( - 'SELECT' => 'a.group_id', - - 'FROM' => array( - ACL_OPTIONS_TABLE => 'ao', - ACL_GROUPS_TABLE => 'a' - ), - - 'LEFT_JOIN' => array( - array( - 'FROM' => array(ACL_ROLES_DATA_TABLE => 'r'), - 'ON' => 'a.auth_role_id = r.role_id' - ), - ), - - 'WHERE' => '(ao.auth_option_id = a.auth_option_id OR ao.auth_option_id = r.auth_option_id) - AND ' . $db->sql_in_set('a.group_id', $group_id) . " - AND ao.auth_option IN ('a_', 'm_')", - - 'GROUP_BY' => 'a.group_id' - )); - $result = $db->sql_query($sql); - - $groups = array(); - while ($row = $db->sql_fetchrow($result)) - { - $groups[] = (int) $row['group_id']; - } - $db->sql_freeresult($result); - - if (!sizeof($groups)) - { - return; - } - - if ($db->multi_table_deletion) - { - $sql = 'DELETE FROM' . ZEBRA_TABLE . ' z - USING ' . USER_GROUP_TABLE . ' ug - WHERE z.zebra_id = ug.user_id - AND z.foe = 1 - AND ' . $db->sql_in_set('ug.group_id', $groups); - $db->sql_query($sql); - } - else - { - $sql = 'SELECT user_id - FROM ' . USER_GROUP_TABLE . ' - WHERE ' . $db->sql_in_set('group_id', $groups); - $result = $db->sql_query($sql); - - $users = array(); - while ($row = $db->sql_fetchrow($result)) - { - $users[] = (int) $row['user_id']; - } - $db->sql_freeresult($result); - - if (sizeof($users)) - { - $sql = 'DELETE FROM ' . ZEBRA_TABLE . ' - WHERE ' . $db->sql_in_set('zebra_id', $users) . ' - AND foe = 1'; - $db->sql_query($sql); - } - } - - return; - } - - // update foes for everyone - $perms = array(); - foreach ($auth->acl_get_list(false, array('a_', 'm_'), false) as $forum_id => $forum_ary) - { - foreach ($forum_ary as $auth_option => $user_ary) - { - $perms = array_merge($perms, $user_ary); - } - } - - if (sizeof($perms)) - { - $sql = 'DELETE FROM ' . ZEBRA_TABLE . ' - WHERE ' . $db->sql_in_set('zebra_id', array_unique($perms)) . ' - AND foe = 1'; - $db->sql_query($sql); - } - unset($perms); -} - -/** -* Lists inactive users -*/ -function view_inactive_users(&$users, &$user_count, $limit = 0, $offset = 0, $limit_days = 0, $sort_by = 'user_inactive_time DESC') -{ - global $db, $user; - - $sql = 'SELECT COUNT(user_id) AS user_count - FROM ' . USERS_TABLE . ' - WHERE user_type = ' . USER_INACTIVE . - (($limit_days) ? " AND user_inactive_time >= $limit_days" : ''); - $result = $db->sql_query($sql); - $user_count = (int) $db->sql_fetchfield('user_count'); - $db->sql_freeresult($result); - - if ($offset >= $user_count) - { - $offset = ($offset - $limit < 0) ? 0 : $offset - $limit; - } - - $sql = 'SELECT user_id, username, user_regdate, user_lastvisit, user_inactive_time, user_inactive_reason - FROM ' . USERS_TABLE . ' - WHERE user_type = ' . USER_INACTIVE . - (($limit_days) ? " AND user_inactive_time >= $limit_days" : '') . " - ORDER BY $sort_by"; - $result = $db->sql_query_limit($sql, $limit, $offset); - - while ($row = $db->sql_fetchrow($result)) - { - $row['inactive_reason'] = $user->lang['INACTIVE_REASON_UNKNOWN']; - switch ($row['user_inactive_reason']) - { - case INACTIVE_REGISTER: - $row['inactive_reason'] = $user->lang['INACTIVE_REASON_REGISTER']; - break; - - case INACTIVE_PROFILE: - $row['inactive_reason'] = $user->lang['INACTIVE_REASON_PROFILE']; - break; - - case INACTIVE_MANUAL: - $row['inactive_reason'] = $user->lang['INACTIVE_REASON_MANUAL']; - break; - - case INACTIVE_REMIND: - $row['inactive_reason'] = $user->lang['INACTIVE_REASON_REMIND']; - break; - } - - $users[] = $row; - } - - return $offset; -} - -/** -* Lists warned users -*/ -function view_warned_users(&$users, &$user_count, $limit = 0, $offset = 0, $limit_days = 0, $sort_by = 'user_warnings DESC') -{ - global $db; - - $sql = 'SELECT user_id, username, user_colour, user_warnings, user_last_warning - FROM ' . USERS_TABLE . ' - WHERE user_warnings > 0 - ' . (($limit_days) ? "AND user_last_warning >= $limit_days" : '') . " - ORDER BY $sort_by"; - $result = $db->sql_query_limit($sql, $limit, $offset); - $users = $db->sql_fetchrowset($result); - $db->sql_freeresult($result); - - $sql = 'SELECT count(user_id) AS user_count - FROM ' . USERS_TABLE . ' - WHERE user_warnings > 0 - ' . (($limit_days) ? "AND user_last_warning >= $limit_days" : ''); - $result = $db->sql_query($sql); - $user_count = (int) $db->sql_fetchfield('user_count'); - $db->sql_freeresult($result); - - return; -} - -/** -* Get database size -*/ -function get_database_size() -{ - global $db, $user, $table_prefix; - - $database_size = false; - - // This code is heavily influenced by a similar routine in phpMyAdmin 2.2.0 - switch ($db->dbms_type) - { - case 'mysql': - $sql = 'SELECT VERSION() AS mysql_version'; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - $version = $row['mysql_version']; - - if (preg_match('#(3\.23|[45]\.)#', $version)) - { - $db_name = (preg_match('#^(?:3\.23\.(?:[6-9]|[1-9]{2}))|[45]\.#', $version)) ? "`{$db->dbname}`" : $db->dbname; - - $sql = 'SHOW TABLE STATUS - FROM ' . $db_name; - $result = $db->sql_query($sql, 7200); - - $database_size = 0; - while ($row = $db->sql_fetchrow($result)) - { - if ((isset($row['Type']) && $row['Type'] != 'MRG_MyISAM') || (isset($row['Engine']) && ($row['Engine'] == 'MyISAM' || $row['Engine'] == 'InnoDB'))) - { - if ($table_prefix != '') - { - if (strpos($row['Name'], $table_prefix) !== false) - { - $database_size += $row['Data_length'] + $row['Index_length']; - } - } - else - { - $database_size += $row['Data_length'] + $row['Index_length']; - } - } - } $db->sql_freeresult($result); } } - break; - - case 'firebird': - global $dbname; - - // if it on the local machine, we can get lucky - if (file_exists($dbname)) - { - $database_size = filesize($dbname); - } - - break; - - case 'sqlite': - global $dbhost; - - if (file_exists($dbhost)) - { - $database_size = filesize($dbhost); - } - - break; - - case 'mssql': - $sql = 'SELECT ((SUM(size) * 8.0) * 1024.0) as dbsize - FROM sysfiles'; - $result = $db->sql_query($sql, 7200); - $database_size = ($row = $db->sql_fetchrow($result)) ? $row['dbsize'] : false; - $db->sql_freeresult($result); - break; - - case 'postgres': - $sql = "SELECT proname - FROM pg_proc - WHERE proname = 'pg_database_size'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row['proname'] == 'pg_database_size') - { - $database = $db->dbname; - if (strpos($database, '.') !== false) - { - list($database, ) = explode('.', $database); - } - - $sql = "SELECT oid - FROM pg_database - WHERE datname = '$database'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $oid = $row['oid']; - - $sql = 'SELECT pg_database_size(' . $oid . ') as size'; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $database_size = $row['size']; - } - break; - - case 'oracle': - $sql = 'SELECT SUM(bytes) as dbsize - FROM user_segments'; - $result = $db->sql_query($sql, 7200); - $database_size = ($row = $db->sql_fetchrow($result)) ? $row['dbsize'] : false; - $db->sql_freeresult($result); - break; - } - - $database_size = ($database_size !== false) ? get_formatted_filesize($database_size) : $user->lang['NOT_AVAILABLE']; - - return $database_size; -} - -/** -* Retrieve contents from remotely stored file -*/ -function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port = 80, $timeout = 10) -{ - global $user; - - if ($fsock = @fsockopen($host, $port, $errno, $errstr, $timeout)) - { - @fputs($fsock, "GET $directory/$filename HTTP/1.1\r\n"); - @fputs($fsock, "HOST: $host\r\n"); - @fputs($fsock, "Connection: close\r\n\r\n"); - - $file_info = ''; - $get_info = false; - - while (!@feof($fsock)) - { - if ($get_info) - { - $file_info .= @fread($fsock, 1024); - } - else - { - $line = @fgets($fsock, 1024); - if ($line == "\r\n") - { - $get_info = true; - } - else if (stripos($line, '404 not found') !== false) - { - $errstr = $user->lang['FILE_NOT_FOUND'] . ': ' . $filename; - return false; - } - } - } - @fclose($fsock); - } - else - { - if ($errstr) - { - $errstr = utf8_convert_message($errstr); - return false; - } - else - { - $errstr = $user->lang['FSOCK_DISABLED']; - return false; - } + break; } - return $file_info; -} - -/** -* Tidy Warnings -* Remove all warnings which have now expired from the database -* The duration of a warning can be defined by the administrator -* This only removes the warning and reduces the associated count, -* it does not remove the user note recording the contents of the warning -*/ -function tidy_warnings() -{ - global $db, $config; - - $expire_date = time() - ($config['warnings_expire_days'] * 86400); - $warning_list = $user_list = array(); - - $sql = 'SELECT * FROM ' . WARNINGS_TABLE . " - WHERE warning_time < $expire_date"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $warning_list[] = $row['warning_id']; - $user_list[$row['user_id']] = isset($user_list[$row['user_id']]) ? ++$user_list[$row['user_id']] : 1; - } - $db->sql_freeresult($result); - - if (sizeof($warning_list)) - { - $db->sql_transaction('begin'); - - $sql = 'DELETE FROM ' . WARNINGS_TABLE . ' - WHERE ' . $db->sql_in_set('warning_id', $warning_list); - $db->sql_query($sql); - - foreach ($user_list as $user_id => $value) - { - $sql = 'UPDATE ' . USERS_TABLE . " SET user_warnings = user_warnings - $value - WHERE user_id = $user_id"; - $db->sql_query($sql); - } - - $db->sql_transaction('commit'); - } - - set_config('warnings_last_gc', time(), true); -} - -/** -* Tidy database, doing some maintanance tasks -*/ -function tidy_database() -{ - global $db; - - // Here we check permission consistency - - // Sometimes, it can happen permission tables having forums listed which do not exist - $sql = 'SELECT forum_id - FROM ' . FORUMS_TABLE; - $result = $db->sql_query($sql); - - $forum_ids = array(0); - while ($row = $db->sql_fetchrow($result)) - { - $forum_ids[] = $row['forum_id']; - } - $db->sql_freeresult($result); - - // Delete those rows from the acl tables not having listed the forums above - $sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $forum_ids, true); - $db->sql_query($sql); - - $sql = 'DELETE FROM ' . ACL_USERS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $forum_ids, true); - $db->sql_query($sql); - - set_config('database_last_gc', time(), true); -} - -/** -* Add permission language - this will make sure custom files will be included -*/ -function add_permission_language() -{ - global $user, $phpEx; - - // First of all, our own file. We need to include it as the first file because it presets all relevant variables. - $user->add_lang('acp/permissions_phpbb'); - - $files_to_add = array(); - - // Now search in acp and mods folder for permissions_ files. - foreach (array('acp/', 'mods/') as $path) - { - $dh = @opendir($user->lang_path . $path); - - if ($dh) - { - while (($file = readdir($dh)) !== false) - { - if ($file !== 'permissions_phpbb.' . $phpEx && strpos($file, 'permissions_') === 0 && substr($file, -(strlen($phpEx) + 1)) === '.' . $phpEx) - { - $files_to_add[] = $path . substr($file, 0, -(strlen($phpEx) + 1)); - } - } - closedir($dh); - } - } - - if (!sizeof($files_to_add)) - { - return false; - } - - $user->add_lang($files_to_add); return true; } diff --git a/phpBB/includes/functions_compress.php b/phpBB/includes/functions_compress.php deleted file mode 100644 index 9537bd1ed1..0000000000 --- a/phpBB/includes/functions_compress.php +++ /dev/null @@ -1,674 +0,0 @@ -data($src_path, file_get_contents("$phpbb_root_path$src"), false, stat("$phpbb_root_path$src")); - } - else if (is_dir($phpbb_root_path . $src)) - { - // Clean up path, add closing / if not present - $src_path = ($src_path && substr($src_path, -1) != '/') ? $src_path . '/' : $src_path; - - $filelist = array(); - $filelist = filelist("$phpbb_root_path$src", '', '*'); - krsort($filelist); - - if ($src_path) - { - $this->data($src_path, '', true, stat("$phpbb_root_path$src")); - } - - foreach ($filelist as $path => $file_ary) - { - if ($path) - { - // Same as for src_path - $path = (substr($path, 0, 1) == '/') ? substr($path, 1) : $path; - $path = ($path && substr($path, -1) != '/') ? $path . '/' : $path; - - $this->data("$src_path$path", '', true, stat("$phpbb_root_path$src$path")); - } - - foreach ($file_ary as $file) - { - if (in_array($path . $file, $skip_files)) - { - continue; - } - - $this->data("$src_path$path$file", file_get_contents("$phpbb_root_path$src$path$file"), false, stat("$phpbb_root_path$src$path$file")); - } - } - } - - return true; - } - - /** - * Add custom file (the filepath will not be adjusted) - */ - public function add_custom_file($src, $filename) - { - $this->data($filename, file_get_contents($src), false, stat($src)); - return true; - } - - /** - * Add file data - */ - public function add_data($src, $name) - { - $stat = array(); - $stat[2] = 436; //384 - $stat[4] = $stat[5] = 0; - $stat[7] = strlen($src); - $stat[9] = time(); - $this->data($name, $src, false, $stat); - return true; - } - - /** - * Return available methods - */ - public static function methods() - { - $methods = array('.tar'); - $available_methods = array('.tar.gz' => 'zlib', '.tar.bz2' => 'bz2', '.zip' => 'zlib'); - - foreach ($available_methods as $type => $module) - { - if (!@extension_loaded($module)) - { - continue; - } - $methods[] = $type; - } - - return $methods; - } -} - -/** -* Zip creation class from phpMyAdmin 2.3.0 (c) Tobias Ratschiller, Olivier Müller, Loïc Chapeaux, -* Marc Delisle, http://www.phpmyadmin.net/ -* -* Zip extraction function by Alexandre Tedeschi, alexandrebr at gmail dot com -* -* Modified extensively by psoTFX and DavidMJ, (c) phpBB Group, 2003 -* -* Based on work by Eric Mueller and Denis125 -* Official ZIP file format: http://www.pkware.com/appnote.txt -* -* @package phpBB3 -*/ -class compress_zip extends compress -{ - private $datasec = array(); - private $ctrl_dir = array(); - const eof_cdh = "\x50\x4b\x05\x06\x00\x00\x00\x00"; - - private $old_offset = 0; - private $datasec_len = 0; - - /** - * Constructor - */ - function __construct($mode, $file) - { - return $this->fp = @fopen($file, $mode . 'b'); - } - - /** - * Convert unix to dos time - */ - private static function unix_to_dos_time($time) - { - $timearray = (!$time) ? getdate() : getdate($time); - - if ($timearray['year'] < 1980) - { - $timearray['year'] = 1980; - $timearray['mon'] = $timearray['mday'] = 1; - $timearray['hours'] = $timearray['minutes'] = $timearray['seconds'] = 0; - } - - return (($timearray['year'] - 1980) << 25) | ($timearray['mon'] << 21) | ($timearray['mday'] << 16) | ($timearray['hours'] << 11) | ($timearray['minutes'] << 5) | ($timearray['seconds'] >> 1); - } - - /** - * Extract archive - */ - public function extract($dst) - { - // Loop the file, looking for files and folders - $dd_try = false; - rewind($this->fp); - - while (!feof($this->fp)) - { - // Check if the signature is valid... - $signature = fread($this->fp, 4); - - switch ($signature) - { - // 'Local File Header' - case "\x50\x4b\x03\x04": - // Lets get everything we need. - // We don't store the version needed to extract, the general purpose bit flag or the date and time fields - $data = unpack("@4/vc_method/@10/Vcrc/Vc_size/Vuc_size/vname_len/vextra_field", fread($this->fp, 26)); - $file_name = fread($this->fp, $data['name_len']); // filename - - if ($data['extra_field']) - { - fread($this->fp, $data['extra_field']); // extra field - } - - $target_filename = "$dst$file_name"; - - if (!$data['uc_size'] && !$data['crc'] && substr($file_name, -1, 1) == '/') - { - if (!is_dir($target_filename)) - { - $str = ''; - $folders = explode('/', $target_filename); - - // Create and folders and subfolders if they do not exist - foreach ($folders as $folder) - { - $str = (!empty($str)) ? $str . '/' . $folder : $folder; - if (!is_dir($str)) - { - if (!@mkdir($str, 0777)) - { - trigger_error("Could not create directory $folder"); - } - @chmod($str, 0777); - } - } - } - // This is a directory, we are not writting files - continue; - } - else - { - // Some archivers are punks, they don't don't include folders in their archives! - $str = ''; - $folders = explode('/', pathinfo($target_filename, PATHINFO_DIRNAME)); - - // Create and folders and subfolders if they do not exist - foreach ($folders as $folder) - { - $str = (!empty($str)) ? $str . '/' . $folder : $folder; - if (!is_dir($str)) - { - if (!@mkdir($str, 0777)) - { - trigger_error("Could not create directory $folder"); - } - @chmod($str, 0777); - } - } - } - - if (!$data['uc_size']) - { - $content = ''; - } - else - { - $content = fread($this->fp, $data['c_size']); - } - - $fp = fopen($target_filename, "w"); - - switch ($data['c_method']) - { - case 0: - // Not compressed - fwrite($fp, $content); - break; - - case 8: - // Deflate - fwrite($fp, gzinflate($content, $data['uc_size'])); - break; - - case 12: - // Bzip2 - fwrite($fp, bzdecompress($content)); - break; - } - - fclose($fp); - break; - - // We hit the 'Central Directory Header', we can stop because nothing else in here requires our attention - // or we hit the end of the central directory record, we can safely end the loop as we are totally finished with looking for files and folders - case "\x50\x4b\x01\x02": - // This case should simply never happen.. but it does exist.. - case "\x50\x4b\x05\x06": - break 2; - - // 'Packed to Removable Disk', ignore it and look for the next signature... - case 'PK00': - continue 2; - - // We have encountered a header that is weird. Lets look for better data... - default: - if (!$dd_try) - { - // Unexpected header. Trying to detect wrong placed 'Data Descriptor'; - $dd_try = true; - fseek($this->fp, 8, SEEK_CUR); // Jump over 'crc-32'(4) 'compressed-size'(4), 'uncompressed-size'(4) - continue 2; - } - trigger_error("Unexpected header, ending loop"); - break 2; - } - - $dd_try = false; - } - } - - /** - * Close archive - */ - public function close() - { - // Write out central file directory and footer ... if it exists - if (sizeof($this->ctrl_dir)) - { - fwrite($this->fp, $this->file()); - } - fclose($this->fp); - } - - /** - * Create the structures ... note we assume version made by is MSDOS - */ - protected function data($name, $data, $is_dir = false, $stat) - { - $name = str_replace('\\', '/', $name); - - $hexdtime = pack('V', self::unix_to_dos_time($stat[9])); - - if ($is_dir) - { - $unc_len = $c_len = $crc = 0; - $zdata = ''; - $var_ext = 10; - } - else - { - $unc_len = strlen($data); - $crc = crc32($data); - $zdata = gzdeflate($data); - $c_len = strlen($zdata); - $var_ext = 20; - - // Did we compress? No, then use data as is - if ($c_len >= $unc_len) - { - $zdata = $data; - $c_len = $unc_len; - $var_ext = 10; - } - } - unset($data); - - // If we didn't compress set method to store, else deflate - $c_method = ($c_len == $unc_len) ? "\x00\x00" : "\x08\x00"; - - // Are we a file or a directory? Set archive for file - $attrib = ($is_dir) ? 16 : 32; - - // File Record Header - $fr = "\x50\x4b\x03\x04"; // Local file header 4bytes - $fr .= pack('v', $var_ext); // ver needed to extract 2bytes - $fr .= "\x00\x00"; // gen purpose bit flag 2bytes - $fr .= $c_method; // compression method 2bytes - $fr .= $hexdtime; // last mod time and date 2+2bytes - $fr .= pack('V', $crc); // crc32 4bytes - $fr .= pack('V', $c_len); // compressed filesize 4bytes - $fr .= pack('V', $unc_len); // uncompressed filesize 4bytes - $fr .= pack('v', strlen($name));// length of filename 2bytes - - $fr .= pack('v', 0); // extra field length 2bytes - $fr .= $name; - $fr .= $zdata; - unset($zdata); - - $this->datasec_len += strlen($fr); - - // Add data to file ... by writing data out incrementally we save some memory - fwrite($this->fp, $fr); - unset($fr); - - // Central Directory Header - $cdrec = "\x50\x4b\x01\x02"; // header 4bytes - $cdrec .= "\x00\x00"; // version made by - $cdrec .= pack('v', $var_ext); // version needed to extract - $cdrec .= "\x00\x00"; // gen purpose bit flag - $cdrec .= $c_method; // compression method - $cdrec .= $hexdtime; // last mod time & date - $cdrec .= pack('V', $crc); // crc32 - $cdrec .= pack('V', $c_len); // compressed filesize - $cdrec .= pack('V', $unc_len); // uncompressed filesize - $cdrec .= pack('v', strlen($name)); // length of filename - $cdrec .= pack('v', 0); // extra field length - $cdrec .= pack('v', 0); // file comment length - $cdrec .= pack('v', 0); // disk number start - $cdrec .= pack('v', 0); // internal file attributes - $cdrec .= pack('V', $attrib); // external file attributes - $cdrec .= pack('V', $this->old_offset); // relative offset of local header - $cdrec .= $name; - - // Save to central directory - $this->ctrl_dir[] = $cdrec; - - $this->old_offset = $this->datasec_len; - } - - /** - * file - */ - private function file() - { - $ctrldir = implode('', $this->ctrl_dir); - - return $ctrldir . self::eof_cdh . - pack('v', sizeof($this->ctrl_dir)) . // total # of entries "on this disk" - pack('v', sizeof($this->ctrl_dir)) . // total # of entries overall - pack('V', strlen($ctrldir)) . // size of central dir - pack('V', $this->datasec_len) . // offset to start of central dir - "\x00\x00"; // .zip file comment length - } - - /** - * Download archive - */ - public function download($filename, $download_name = false) - { - global $phpbb_root_path; - - if ($download_name === false) - { - $download_name = $filename; - } - - $mimetype = 'application/zip'; - - header('Pragma: no-cache'); - header("Content-Type: $mimetype; name=\"$download_name.zip\""); - header("Content-disposition: attachment; filename=$download_name.zip"); - - $fp = @fopen("{$phpbb_root_path}store/$filename.zip", 'rb'); - if ($fp) - { - while ($buffer = fread($fp, 1024)) - { - echo $buffer; - } - fclose($fp); - } - } -} - -/** -* Tar/tar.gz compression routine -* Header/checksum creation derived from tarfile.pl, (c) Tom Horsley, 1994 -* -* @package phpBB3 -*/ -class compress_tar extends compress -{ - private $isgz = false; - private $isbz = false; - private $filename = ''; - private $mode = ''; - private $type = ''; - private $wrote = false; - - /** - * Constructor - */ - function __construct($mode, $file, $type = '') - { - $type = (!$type) ? $file : $type; - $this->isgz = (strpos($type, '.tar.gz') !== false || strpos($type, '.tgz') !== false) ? true : false; - $this->isbz = (strpos($type, '.tar.bz2') !== false) ? true : false; - - $this->mode = &$mode; - $this->file = &$file; - $this->type = &$type; - $this->open(); - } - - /** - * Extract archive - */ - public function extract($dst) - { - $fzread = ($this->isbz && function_exists('bzread')) ? 'bzread' : (($this->isgz && @extension_loaded('zlib')) ? 'gzread' : 'fread'); - - // Run through the file and grab directory entries - while ($buffer = $fzread($this->fp, 512)) - { - $tmp = unpack('A6magic', substr($buffer, 257, 6)); - - if (trim($tmp['magic']) == 'ustar') - { - $tmp = unpack('A100name', $buffer); - $filename = trim($tmp['name']); - - $tmp = unpack('Atype', substr($buffer, 156, 1)); - $filetype = (int) trim($tmp['type']); - - $tmp = unpack('A12size', substr($buffer, 124, 12)); - $filesize = octdec((int) trim($tmp['size'])); - - if ($filetype == 5) - { - if (!is_dir("$dst$filename")) - { - $str = ''; - $folders = explode('/', "$dst$filename"); - - // Create and folders and subfolders if they do not exist - foreach ($folders as $folder) - { - $str = (!empty($str)) ? $str . '/' . $folder : $folder; - if (!is_dir($str)) - { - if (!@mkdir($str, 0777)) - { - trigger_error("Could not create directory $folder"); - } - @chmod($str, 0777); - } - } - } - } - else if ($filesize != 0 && ($filetype == 0 || $filetype == "\0")) - { - // Write out the files - if (!($fp = fopen("$dst$filename", 'wb'))) - { - trigger_error("Couldn't create file $filename"); - } - @chmod("$dst$filename", 0777); - - // Grab the file contents - fwrite($fp, $fzread($this->fp, ($filesize + 511) &~ 511), $filesize); - fclose($fp); - } - } - } - } - - /** - * Close archive - */ - public function close() - { - $fzclose = ($this->isbz && function_exists('bzclose')) ? 'bzclose' : (($this->isgz && @extension_loaded('zlib')) ? 'gzclose' : 'fclose'); - - if ($this->wrote) - { - $fzwrite = ($this->isbz && function_exists('bzwrite')) ? 'bzwrite' : (($this->isgz && @extension_loaded('zlib')) ? 'gzwrite' : 'fwrite'); - - // The end of a tar archive ends in two records of all NULLs (1024 bytes of \0) - $fzwrite($this->fp, str_repeat("\0", 1024)); - } - - $fzclose($this->fp); - } - - /** - * Create the structures - */ - protected function data($name, $data, $is_dir = false, $stat) - { - $this->wrote = true; - $fzwrite = ($this->isbz && function_exists('bzwrite')) ? 'bzwrite' : (($this->isgz && @extension_loaded('zlib')) ? 'gzwrite' : 'fwrite'); - - $typeflag = ($is_dir) ? '5' : ''; - - // This is the header data, it contains all the info we know about the file or folder that we are about to archive - $header = ''; - $header .= pack('a100', $name); // file name - $header .= pack('a8', sprintf("%07o", $stat[2])); // file mode - $header .= pack('a8', sprintf("%07o", $stat[4])); // owner id - $header .= pack('a8', sprintf("%07o", $stat[5])); // group id - $header .= pack('a12', sprintf("%011o", $stat[7])); // file size - $header .= pack('a12', sprintf("%011o", $stat[9])); // last mod time - - // Checksum - $checksum = 0; - for ($i = 0; $i < 148; $i++) - { - $checksum += ord($header[$i]); - } - - // We precompute the rest of the hash, this saves us time in the loop and allows us to insert our hash without resorting to string functions - $checksum += 2415 + (($is_dir) ? 53 : 0); - - $header .= pack('a8', sprintf("%07o", $checksum)); // checksum - $header .= pack('a1', $typeflag); // link indicator - $header .= pack('a100', ''); // name of linked file - $header .= pack('a6', 'ustar'); // ustar indicator - $header .= pack('a2', '00'); // ustar version - $header .= pack('a32', 'Unknown'); // owner name - $header .= pack('a32', 'Unknown'); // group name - $header .= pack('a8', ''); // device major number - $header .= pack('a8', ''); // device minor number - $header .= pack('a155', ''); // filename prefix - $header .= pack('a12', ''); // end - - // This writes the entire file in one shot. Header, followed by data and then null padded to a multiple of 512 - $fzwrite($this->fp, $header . (($stat[7] !== 0 && !$is_dir) ? $data . str_repeat("\0", (($stat[7] + 511) &~ 511) - $stat[7]) : '')); - unset($data); - } - - /** - * Open archive - */ - private function open() - { - $fzopen = ($this->isbz && function_exists('bzopen')) ? 'bzopen' : (($this->isgz && @extension_loaded('zlib')) ? 'gzopen' : 'fopen'); - $this->fp = @$fzopen($this->file, $this->mode . (($fzopen == 'bzopen') ? '' : 'b') . (($fzopen == 'gzopen') ? '9' : '')); - - if (!$this->fp) - { - trigger_error('Unable to open file ' . $this->file . ' [' . $fzopen . ' - ' . $this->mode . 'b]'); - } - } - - /** - * Download archive - */ - public function download($filename, $download_name = false) - { - global $phpbb_root_path; - - if ($download_name === false) - { - $download_name = $filename; - } - - switch ($this->type) - { - case '.tar': - $mimetype = 'application/x-tar'; - break; - - case '.tar.gz': - $mimetype = 'application/x-gzip'; - break; - - case '.tar.bz2': - $mimetype = 'application/x-bzip2'; - break; - - default: - $mimetype = 'application/octet-stream'; - break; - } - - header('Pragma: no-cache'); - header("Content-Type: $mimetype; name=\"$download_name$this->type\""); - header("Content-disposition: attachment; filename=$download_name$this->type"); - - $fp = @fopen("{$phpbb_root_path}store/$filename$this->type", 'rb'); - if ($fp) - { - while ($buffer = fread($fp, 1024)) - { - echo $buffer; - } - fclose($fp); - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php deleted file mode 100644 index 8d4a75e2f7..0000000000 --- a/phpBB/includes/functions_content.php +++ /dev/null @@ -1,1278 +0,0 @@ - $user->lang['ASCENDING'], 'd' => $user->lang['DESCENDING']); - - // Check if the key is selectable. If not, we reset to the first key found. - // This ensures the values are always valid. - if (!isset($limit_days[$sort_days])) - { - @reset($limit_days); - $sort_days = key($limit_days); - } - - if (!isset($sort_by_text[$sort_key])) - { - @reset($sort_by_text); - $sort_key = key($sort_by_text); - } - - if (!isset($sort_dir_text[$sort_dir])) - { - @reset($sort_dir_text); - $sort_dir = key($sort_dir_text); - } - - $s_limit_days = ''; - - $s_sort_key = ''; - - $s_sort_dir = ''; - - $u_sort_param = "st=$sort_days&sk=$sort_key&sd=$sort_dir"; - - return; -} - -/** -* Generate Jumpbox -*/ -function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list = false, $force_display = false) -{ - global $config, $auth, $template, $user, $db; - - // We only return if the jumpbox is not forced to be displayed (in case it is needed for functionality) - if (!$config['load_jumpbox'] && $force_display === false) - { - return; - } - - $sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id - FROM ' . FORUMS_TABLE . ' - ORDER BY left_id ASC'; - $result = $db->sql_query($sql, 600); - - $right = $padding = 0; - $padding_store = array('0' => 0); - $display_jumpbox = false; - $iteration = 0; - - // Sometimes it could happen that forums will be displayed here not be displayed within the index page - // This is the result of forums not displayed at index, having list permissions and a parent of a forum with no permissions. - // If this happens, the padding could be "broken" - - while ($row = $db->sql_fetchrow($result)) - { - if ($row['left_id'] < $right) - { - $padding++; - $padding_store[$row['parent_id']] = $padding; - } - else if ($row['left_id'] > $right + 1) - { - // Ok, if the $padding_store for this parent is empty there is something wrong. For now we will skip over it. - // @todo digging deep to find out "how" this can happen. - $padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : $padding; - } - - $right = $row['right_id']; - - if ($row['forum_type'] == FORUM_CAT && ($row['left_id'] + 1 == $row['right_id'])) - { - // Non-postable forum with no subforums, don't display - continue; - } - - if (!$auth->acl_get('f_list', $row['forum_id'])) - { - // if the user does not have permissions to list this forum skip - continue; - } - - if ($acl_list && !$auth->acl_gets($acl_list, $row['forum_id'])) - { - continue; - } - - if (!$display_jumpbox) - { - $template->assign_block_vars('jumpbox_forums', array( - 'FORUM_ID' => ($select_all) ? 0 : -1, - 'FORUM_NAME' => ($select_all) ? $user->lang['ALL_FORUMS'] : $user->lang['SELECT_FORUM'], - 'S_FORUM_COUNT' => $iteration) - ); - - $iteration++; - $display_jumpbox = true; - } - - $template->assign_block_vars('jumpbox_forums', array( - 'FORUM_ID' => $row['forum_id'], - 'FORUM_NAME' => $row['forum_name'], - 'SELECTED' => ($row['forum_id'] == $forum_id) ? ' selected="selected"' : '', - 'S_FORUM_COUNT' => $iteration, - 'S_IS_CAT' => ($row['forum_type'] == FORUM_CAT) ? true : false, - 'S_IS_LINK' => ($row['forum_type'] == FORUM_LINK) ? true : false, - 'S_IS_POST' => ($row['forum_type'] == FORUM_POST) ? true : false) - ); - - for ($i = 0; $i < $padding; $i++) - { - $template->assign_block_vars('jumpbox_forums.level', array()); - } - $iteration++; - } - $db->sql_freeresult($result); - unset($padding_store); - - $template->assign_vars(array( - 'S_DISPLAY_JUMPBOX' => $display_jumpbox, - 'S_JUMPBOX_ACTION' => $action) - ); - - return; -} - -/** -* Bump Topic Check - used by posting and viewtopic -*/ -function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_poster, $last_topic_poster) -{ - global $config, $auth, $user; - - // Check permission and make sure the last post was not already bumped - if (!$auth->acl_get('f_bump', $forum_id) || $topic_bumped) - { - return false; - } - - // Check bump time range, is the user really allowed to bump the topic at this time? - $bump_time = ($config['bump_type'] == 'm') ? $config['bump_interval'] * 60 : (($config['bump_type'] == 'h') ? $config['bump_interval'] * 3600 : $config['bump_interval'] * 86400); - - // Check bump time - if ($last_post_time + $bump_time > time()) - { - return false; - } - - // Check bumper, only topic poster and last poster are allowed to bump - if ($topic_poster != $user->data['user_id'] && $last_topic_poster != $user->data['user_id']) - { - return false; - } - - // A bump time of 0 will completely disable the bump feature... not intended but might be useful. - return $bump_time; -} - -/** -* Generates a text with approx. the specified length which contains the specified words and their context -* -* @param string $text The full text from which context shall be extracted -* @param string $words An array of words which should be contained in the result, has to be a valid part of a PCRE pattern (escape with preg_quote!) -* @param int $length The desired length of the resulting text, however the result might be shorter or longer than this value -* -* @return string Context of the specified words separated by "..." -*/ -function get_context($text, $words, $length = 400) -{ - // first replace all whitespaces with single spaces - $text = preg_replace('/ +/', ' ', strtr($text, "\t\n\r\x0C ", ' '), $text); - - $word_indizes = array(); - if (sizeof($words)) - { - $match = ''; - // find the starting indizes of all words - foreach ($words as $word) - { - if ($word) - { - if (preg_match('#(?:[^\w]|^)(' . $word . ')(?:[^\w]|$)#i', $text, $match)) - { - $pos = utf8_strpos($text, $match[1]); - if ($pos !== false) - { - $word_indizes[] = $pos; - } - } - } - } - unset($match); - - if (sizeof($word_indizes)) - { - $word_indizes = array_unique($word_indizes); - sort($word_indizes); - - $wordnum = sizeof($word_indizes); - // number of characters on the right and left side of each word - $sequence_length = (int) ($length / (2 * $wordnum)) - 2; - $final_text = ''; - $word = $j = 0; - $final_text_index = -1; - - // cycle through every character in the original text - for ($i = $word_indizes[$word], $n = utf8_strlen($text); $i < $n; $i++) - { - // if the current position is the start of one of the words then append $sequence_length characters to the final text - if (isset($word_indizes[$word]) && ($i == $word_indizes[$word])) - { - if ($final_text_index < $i - $sequence_length - 1) - { - $final_text .= '... ' . preg_replace('#^([^ ]*)#', '', utf8_substr($text, $i - $sequence_length, $sequence_length)); - } - else - { - // if the final text is already nearer to the current word than $sequence_length we only append the text - // from its current index on and distribute the unused length to all other sequenes - $sequence_length += (int) (($final_text_index - $i + $sequence_length + 1) / (2 * $wordnum)); - $final_text .= utf8_substr($text, $final_text_index + 1, $i - $final_text_index - 1); - } - $final_text_index = $i - 1; - - // add the following characters to the final text (see below) - $word++; - $j = 1; - } - - if ($j > 0) - { - // add the character to the final text and increment the sequence counter - $final_text .= utf8_substr($text, $i, 1); - $final_text_index++; - $j++; - - // if this is a whitespace then check whether we are done with this sequence - if (utf8_substr($text, $i, 1) == ' ') - { - // only check whether we have to exit the context generation completely if we haven't already reached the end anyway - if ($i + 4 < $n) - { - if (($j > $sequence_length && $word >= $wordnum) || utf8_strlen($final_text) > $length) - { - $final_text .= ' ...'; - break; - } - } - else - { - // make sure the text really reaches the end - $j -= 4; - } - - // stop context generation and wait for the next word - if ($j > $sequence_length) - { - $j = 0; - } - } - } - } - return $final_text; - } - } - - if (!sizeof($words) || !sizeof($word_indizes)) - { - return (utf8_strlen($text) >= $length + 3) ? utf8_substr($text, 0, $length) . '...' : $text; - } -} - -/** -* Decode text whereby text is coming from the db and expected to be pre-parsed content -* We are placing this outside of the message parser because we are often in need of it... -*/ -function decode_message(&$message, $bbcode_uid = '') -{ - global $config; - - if ($bbcode_uid) - { - $match = array('
    ', "[/*:m:$bbcode_uid]", ":u:$bbcode_uid", ":o:$bbcode_uid", ":$bbcode_uid"); - $replace = array("\n", '', '', '', ''); - } - else - { - $match = array('
    '); - $replace = array("\n"); - } - - $message = str_replace($match, $replace, $message); - - $match = get_preg_expression('bbcode_htm'); - $replace = array('\1', '\1', '\2', '\1', '', ''); - - $message = preg_replace($match, $replace, $message); -} - -/** -* Strips all bbcode from a text and returns the plain content -*/ -function strip_bbcode(&$text, $uid = '') -{ - if (!$uid) - { - $uid = '[0-9a-z]{5,}'; - } - - $text = preg_replace("#\[\/?[a-z0-9\*\+\-]+(?:=(?:".*"|[^\]]*))?(?::[a-z])?(\:$uid)\]#", ' ', $text); - - $match = get_preg_expression('bbcode_htm'); - $replace = array('\1', '\1', '\2', '\1', '', ''); - - $text = preg_replace($match, $replace, $text); -} - -/** -* For display of custom parsed text on user-facing pages -* Expects $text to be the value directly from the database (stored value) -*/ -function generate_text_for_display($text, $uid, $bitfield, $flags) -{ - static $bbcode; - - if (!$text) - { - return ''; - } - - $text = censor_text($text); - - // Parse bbcode if bbcode uid stored and bbcode enabled - if ($uid && ($flags & OPTION_FLAG_BBCODE)) - { - if (!class_exists('bbcode')) - { - global $phpbb_root_path, $phpEx; - include($phpbb_root_path . 'includes/bbcode.' . $phpEx); - } - - if (empty($bbcode)) - { - $bbcode = new bbcode($bitfield); - } - else - { - $bbcode->bbcode($bitfield); - } - - $bbcode->bbcode_second_pass($text, $uid); - } - - $text = bbcode_nl2br($text); - $text = smiley_text($text, !($flags & OPTION_FLAG_SMILIES)); - - return $text; -} - -/** -* For parsing custom parsed text to be stored within the database. -* This function additionally returns the uid and bitfield that needs to be stored. -* Expects $text to be the value directly from request_var() and in it's non-parsed form -*/ -function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bbcode = false, $allow_urls = false, $allow_smilies = false) -{ - global $phpbb_root_path, $phpEx; - - $uid = $bitfield = ''; - - if (!$text) - { - return; - } - - if (!class_exists('parse_message')) - { - include($phpbb_root_path . 'includes/message_parser.' . $phpEx); - } - - $message_parser = new parse_message($text); - $message_parser->parse($allow_bbcode, $allow_urls, $allow_smilies); - - $text = $message_parser->message; - $uid = $message_parser->bbcode_uid; - - // If the bbcode_bitfield is empty, there is no need for the uid to be stored. - if (!$message_parser->bbcode_bitfield) - { - $uid = ''; - } - - $flags = (($allow_bbcode) ? OPTION_FLAG_BBCODE : 0) + (($allow_smilies) ? OPTION_FLAG_SMILIES : 0) + (($allow_urls) ? OPTION_FLAG_LINKS : 0); - $bitfield = $message_parser->bbcode_bitfield; - - return; -} - -/** -* For decoding custom parsed text for edits as well as extracting the flags -* Expects $text to be the value directly from the database (pre-parsed content) -*/ -function generate_text_for_edit($text, $uid, $flags) -{ - global $phpbb_root_path, $phpEx; - - decode_message($text, $uid); - - return array( - 'allow_bbcode' => ($flags & OPTION_FLAG_BBCODE) ? 1 : 0, - 'allow_smilies' => ($flags & OPTION_FLAG_SMILIES) ? 1 : 0, - 'allow_urls' => ($flags & OPTION_FLAG_LINKS) ? 1 : 0, - 'text' => $text - ); -} - -/** -* A subroutine of make_clickable used with preg_replace -* It places correct HTML around an url, shortens the displayed text -* and makes sure no entities are inside URLs -*/ -function make_clickable_callback($type, $whitespace, $url, $relative_url, $class) -{ - $append = ''; - $url = htmlspecialchars_decode($url); - $relative_url = htmlspecialchars_decode($relative_url); - - // make sure no HTML entities were matched - $chars = array('<', '>', '"'); - $split = false; - - foreach ($chars as $char) - { - $next_split = strpos($url, $char); - if ($next_split !== false) - { - $split = ($split !== false) ? min($split, $next_split) : $next_split; - } - } - - if ($split !== false) - { - // an HTML entity was found, so the URL has to end before it - $append = substr($url, $split) . $relative_url; - $url = substr($url, 0, $split); - $relative_url = ''; - } - else if ($relative_url) - { - // same for $relative_url - $split = false; - foreach ($chars as $char) - { - $next_split = strpos($relative_url, $char); - if ($next_split !== false) - { - $split = ($split !== false) ? min($split, $next_split) : $next_split; - } - } - - if ($split !== false) - { - $append = substr($relative_url, $split); - $relative_url = substr($relative_url, 0, $split); - } - } - - // if the last character of the url is a punctuation mark, exclude it from the url - $last_char = ($relative_url) ? $relative_url[strlen($relative_url) - 1] : $url[strlen($url) - 1]; - - switch ($last_char) - { - case '.': - case '?': - case '!': - case ':': - case ',': - $append = $last_char; - if ($relative_url) - { - $relative_url = substr($relative_url, 0, -1); - } - else - { - $url = substr($url, 0, -1); - } - break; - } - - switch ($type) - { - case MAGIC_URL_LOCAL: - $tag = 'l'; - $relative_url = preg_replace('/[&?]sid=[0-9a-f]{32}$/', '', preg_replace('/([&?])sid=[0-9a-f]{32}&/', '$1', $relative_url)); - $url = $url . '/' . $relative_url; - $text = ($relative_url) ? $relative_url : $url; - break; - - case MAGIC_URL_FULL: - $tag = 'm'; - $text = (strlen($url) > 55) ? substr($url, 0, 39) . ' ... ' . substr($url, -10) : $url; - break; - - case MAGIC_URL_WWW: - $tag = 'w'; - $url = 'http://' . $url; - $text = (strlen($url) > 55) ? substr($url, 0, 39) . ' ... ' . substr($url, -10) : $url; - break; - - case MAGIC_URL_EMAIL: - $tag = 'e'; - $text = (strlen($url) > 55) ? substr($url, 0, 39) . ' ... ' . substr($url, -10) : $url; - $url = 'mailto:' . $url; - break; - } - - $url = htmlspecialchars($url); - $text = htmlspecialchars($text); - $append = htmlspecialchars($append); - - $html = "$whitespace$text$append"; - - return $html; -} - -/** -* make_clickable function -* -* Replace magic urls of form http://xxx.xxx., www.xxx. and xxx@xxx.xxx. -* Cuts down displayed size of link if over 50 chars, turns absolute links -* into relative versions when the server/script path matches the link -*/ -function make_clickable($text, $server_url = false, $class = 'postlink') -{ - if ($server_url === false) - { - $server_url = generate_board_url(); - } - - static $magic_url_match; - static $magic_url_replace; - static $static_class; - - if (!is_array($magic_url_match) || $static_class != $class) - { - $static_class = $class; - $class = ($static_class) ? ' class="' . $static_class . '"' : ''; - $local_class = ($static_class) ? ' class="' . $static_class . '-local"' : ''; - - $magic_url_match = $magic_url_replace = array(); - // Be sure to not let the matches cross over. ;) - - // relative urls for this board - $magic_url_match[] = '#(^|[\n\t (>.])(' . preg_quote($server_url, '#') . ')/(' . get_preg_expression('relative_url_inline') . ')#ie'; - $magic_url_replace[] = "make_clickable_callback(MAGIC_URL_LOCAL, '\$1', '\$2', '\$3', '$local_class')"; - - // matches a xxxx://aaaaa.bbb.cccc. ... - $magic_url_match[] = '#(^|[\n\t (>.])(' . get_preg_expression('url_inline') . ')#ie'; - $magic_url_replace[] = "make_clickable_callback(MAGIC_URL_FULL, '\$1', '\$2', '', '$class')"; - - // matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing - $magic_url_match[] = '#(^|[\n\t (>])(' . get_preg_expression('www_url_inline') . ')#ie'; - $magic_url_replace[] = "make_clickable_callback(MAGIC_URL_WWW, '\$1', '\$2', '', '$class')"; - - // matches an email@domain type address at the start of a line, or after a space or after what might be a BBCode. - $magic_url_match[] = '/(^|[\n\t (>])(' . get_preg_expression('email') . ')/ie'; - $magic_url_replace[] = "make_clickable_callback(MAGIC_URL_EMAIL, '\$1', '\$2', '', '')"; - } - - return preg_replace($magic_url_match, $magic_url_replace, $text); -} - -/** -* Censoring -*/ -function censor_text($text) -{ - static $censors; - - // We moved the word censor checks in here because we call this function quite often - and then only need to do the check once - if (!isset($censors) || !is_array($censors)) - { - global $config, $user, $auth, $cache; - - // We check here if the user is having viewing censors disabled (and also allowed to do so). - if (!$user->optionget('viewcensors') && $config['allow_nocensors'] && $auth->acl_get('u_chgcensors')) - { - $censors = array(); - } - else - { - $censors = cache::obtain_word_list(); - } - } - - if (sizeof($censors)) - { - return preg_replace($censors['match'], $censors['replace'], $text); - } - - return $text; -} - -/** -* custom version of nl2br which takes custom BBCodes into account -*/ -function bbcode_nl2br($text) -{ - // custom BBCodes might contain carriage returns so they - // are not converted into
    so now revert that - $text = str_replace(array("\n", "\r"), array('
    ', "\n"), $text); - return $text; -} - -/** -* Smiley processing -*/ -function smiley_text($text, $force_option = false) -{ - global $config, $user, $phpbb_root_path; - - if ($force_option || !$config['allow_smilies'] || !$user->optionget('viewsmilies')) - { - return preg_replace('##', ''; - } - } - - $filesize = $attachment['filesize']; - $size_lang = ($filesize >= 1048576) ? $user->lang['MB'] : ( ($filesize >= 1024) ? $user->lang['KB'] : $user->lang['BYTES'] ); - $filesize = get_formatted_filesize($filesize, false); - - $comment = bbcode_nl2br(censor_text($attachment['attach_comment'])); - - $block_array += array( - 'UPLOAD_ICON' => $upload_icon, - 'FILESIZE' => $filesize, - 'SIZE_LANG' => $size_lang, - 'DOWNLOAD_NAME' => basename($attachment['real_filename']), - 'COMMENT' => $comment, - ); - - $denied = false; - - if (!extension_allowed($forum_id, $attachment['extension'], $extensions)) - { - $denied = true; - - $block_array += array( - 'S_DENIED' => true, - 'DENIED_MESSAGE' => sprintf($user->lang['EXTENSION_DISABLED_AFTER_POSTING'], $attachment['extension']) - ); - } - - if (!$denied) - { - $l_downloaded_viewed = $download_link = ''; - $display_cat = $extensions[$attachment['extension']]['display_cat']; - - if ($display_cat == ATTACHMENT_CATEGORY_IMAGE) - { - if ($attachment['thumbnail']) - { - $display_cat = ATTACHMENT_CATEGORY_THUMB; - } - else - { - if ($config['img_display_inlined']) - { - if ($config['img_link_width'] || $config['img_link_height']) - { - $dimension = @getimagesize($filename); - - // If the dimensions could not be determined or the image being 0x0 we display it as a link for safety purposes - if ($dimension === false || empty($dimension[0]) || empty($dimension[1])) - { - $display_cat = ATTACHMENT_CATEGORY_NONE; - } - else - { - $display_cat = ($dimension[0] <= $config['img_link_width'] && $dimension[1] <= $config['img_link_height']) ? ATTACHMENT_CATEGORY_IMAGE : ATTACHMENT_CATEGORY_NONE; - } - } - } - else - { - $display_cat = ATTACHMENT_CATEGORY_NONE; - } - } - } - - // Make some descisions based on user options being set. - if (($display_cat == ATTACHMENT_CATEGORY_IMAGE || $display_cat == ATTACHMENT_CATEGORY_THUMB) && !$user->optionget('viewimg')) - { - $display_cat = ATTACHMENT_CATEGORY_NONE; - } - - if ($display_cat == ATTACHMENT_CATEGORY_FLASH && !$user->optionget('viewflash')) - { - $display_cat = ATTACHMENT_CATEGORY_NONE; - } - - $download_link = append_sid("{$phpbb_root_path}download/file.$phpEx", 'id=' . $attachment['attach_id']); - - switch ($display_cat) - { - // Images - case ATTACHMENT_CATEGORY_IMAGE: - $l_downloaded_viewed = 'VIEWED_COUNT'; - $inline_link = append_sid("{$phpbb_root_path}download/file.$phpEx", 'id=' . $attachment['attach_id']); - $download_link .= '&mode=view'; - - $block_array += array( - 'S_IMAGE' => true, - 'U_INLINE_LINK' => $inline_link, - ); - - $update_count[] = $attachment['attach_id']; - break; - - // Images, but display Thumbnail - case ATTACHMENT_CATEGORY_THUMB: - $l_downloaded_viewed = 'VIEWED_COUNT'; - $thumbnail_link = append_sid("{$phpbb_root_path}download/file.$phpEx", 'id=' . $attachment['attach_id'] . '&t=1'); - $download_link .= '&mode=view'; - - $block_array += array( - 'S_THUMBNAIL' => true, - 'THUMB_IMAGE' => $thumbnail_link, - ); - break; - - // Windows Media Streams - case ATTACHMENT_CATEGORY_WM: - $l_downloaded_viewed = 'VIEWED_COUNT'; - - // Giving the filename directly because within the wm object all variables are in local context making it impossible - // to validate against a valid session (all params can differ) - // $download_link = $filename; - - $block_array += array( - 'U_FORUM' => generate_board_url(), - 'ATTACH_ID' => $attachment['attach_id'], - 'S_WM_FILE' => true, - ); - - // Viewed/Heared File ... update the download count - $update_count[] = $attachment['attach_id']; - break; - - // Real Media Streams - case ATTACHMENT_CATEGORY_RM: - case ATTACHMENT_CATEGORY_QUICKTIME: - $l_downloaded_viewed = 'VIEWED_COUNT'; - - $block_array += array( - 'S_RM_FILE' => ($display_cat == ATTACHMENT_CATEGORY_RM) ? true : false, - 'S_QUICKTIME_FILE' => ($display_cat == ATTACHMENT_CATEGORY_QUICKTIME) ? true : false, - 'U_FORUM' => generate_board_url(), - 'ATTACH_ID' => $attachment['attach_id'], - ); - - // Viewed/Heared File ... update the download count - $update_count[] = $attachment['attach_id']; - break; - - // Macromedia Flash Files - case ATTACHMENT_CATEGORY_FLASH: - list($width, $height) = @getimagesize($filename); - - $l_downloaded_viewed = 'VIEWED_COUNT'; - - $block_array += array( - 'S_FLASH_FILE' => true, - 'WIDTH' => $width, - 'HEIGHT' => $height, - ); - - // Viewed/Heared File ... update the download count - $update_count[] = $attachment['attach_id']; - break; - - default: - $l_downloaded_viewed = 'DOWNLOAD_COUNT'; - - $block_array += array( - 'S_FILE' => true, - ); - break; - } - - $l_download_count = (!isset($attachment['download_count']) || $attachment['download_count'] == 0) ? $user->lang[$l_downloaded_viewed . '_NONE'] : (($attachment['download_count'] == 1) ? sprintf($user->lang[$l_downloaded_viewed], $attachment['download_count']) : sprintf($user->lang[$l_downloaded_viewed . 'S'], $attachment['download_count'])); - - $block_array += array( - 'U_DOWNLOAD_LINK' => $download_link, - 'L_DOWNLOAD_COUNT' => $l_download_count - ); - } - - $template->assign_block_vars('_file', $block_array); - - $compiled_attachments[] = $template->assign_display('attachment_tpl'); - } - - $attachments = $compiled_attachments; - unset($compiled_attachments); - - $tpl_size = sizeof($attachments); - - $unset_tpl = array(); - - preg_match_all('#(.*?)#', $message, $matches, PREG_PATTERN_ORDER); - - $replace = array(); - foreach ($matches[0] as $num => $capture) - { - // Flip index if we are displaying the reverse way - $index = ($config['display_order']) ? ($tpl_size-($matches[1][$num] + 1)) : $matches[1][$num]; - - $replace['from'][] = $matches[0][$num]; - $replace['to'][] = (isset($attachments[$index])) ? $attachments[$index] : sprintf($user->lang['MISSING_INLINE_ATTACHMENT'], $matches[2][array_search($index, $matches[1])]); - - $unset_tpl[] = $index; - } - - if (isset($replace['from'])) - { - $message = str_replace($replace['from'], $replace['to'], $message); - } - - $unset_tpl = array_unique($unset_tpl); - - // Needed to let not display the inlined attachments at the end of the post again - foreach ($unset_tpl as $index) - { - unset($attachments[$index]); - } -} - -/** -* Check if extension is allowed to be posted. -* -* @param mixed $forum_id The forum id to check or false if private message -* @param string $extension The extension to check, for example zip. -* @param array &$extensions The extension array holding the information from the cache (will be obtained if empty) -* -* @return bool False if the extension is not allowed to be posted, else true. -*/ -function extension_allowed($forum_id, $extension, &$extensions) -{ - if (empty($extensions)) - { - global $cache; - $extensions = cache::obtain_attach_extensions($forum_id); - } - - return (!isset($extensions['_allowed_'][$extension])) ? false : true; -} - -/** -* Truncates string while retaining special characters if going over the max length -* The default max length is 60 at the moment -*/ -function truncate_string($string, $max_length = 60, $allow_reply = true, $append = '') -{ - $chars = array(); - - $strip_reply = false; - $stripped = false; - if ($allow_reply && strpos($string, 'Re: ') === 0) - { - $strip_reply = true; - $string = substr($string, 4); - } - - $_chars = utf8_str_split(htmlspecialchars_decode($string)); - $chars = array_map('utf8_htmlspecialchars', $_chars); - - // Now check the length ;) - if (sizeof($chars) > $max_length) - { - // Cut off the last elements from the array - $string = implode('', array_slice($chars, 0, $max_length - utf8_strlen($append))); - $stripped = true; - } - - if ($strip_reply) - { - $string = 'Re: ' . $string; - } - - if ($append != '' && $stripped) - { - $string = $string . $append; - } - - return $string; -} - -/** -* Get username details for placing into templates. -* -* @param string $mode Can be profile (for getting an url to the profile), username (for obtaining the username), colour (for obtaining the user colour), full (for obtaining a html string representing a coloured link to the users profile) or no_profile (the same as full but forcing no profile link) -* @param int $user_id The users id -* @param string $username The users name -* @param string $username_colour The users colour -* @param string $guest_username optional parameter to specify the guest username. It will be used in favor of the GUEST language variable then. -* @param string $custom_profile_url optional parameter to specify a profile url. The user id get appended to this url as &u={user_id} -* -* @return string A string consisting of what is wanted based on $mode. -*/ -function get_username_string($mode, $user_id, $username, $username_colour = '', $guest_username = false, $custom_profile_url = false) -{ - global $phpbb_root_path, $phpEx, $user, $auth; - - $profile_url = ''; - $username_colour = ($username_colour) ? '#' . $username_colour : ''; - - if ($guest_username === false) - { - $username = ($username) ? $username : $user->lang['GUEST']; - } - else - { - $username = ($user_id && $user_id != ANONYMOUS) ? $username : ((!empty($guest_username)) ? $guest_username : $user->lang['GUEST']); - } - - // Only show the link if not anonymous - if ($mode != 'no_profile' && $user_id && $user_id != ANONYMOUS) - { - // Do not show the link if the user is already logged in but do not have u_viewprofile permissions (relevant for bots mostly). - // For all others the link leads to a login page or the profile. - if ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile')) - { - $profile_url = ''; - } - else - { - $profile_url = ($custom_profile_url !== false) ? $custom_profile_url . '&u=' . (int) $user_id : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . (int) $user_id); - } - } - else - { - $profile_url = ''; - } - - switch ($mode) - { - case 'profile': - return $profile_url; - break; - - case 'username': - return $username; - break; - - case 'colour': - return $username_colour; - break; - - case 'no_profile': - case 'full': - default: - - $tpl = ''; - if (!$profile_url && !$username_colour) - { - $tpl = '{USERNAME}'; - } - else if (!$profile_url && $username_colour) - { - $tpl = '{USERNAME}'; - } - else if ($profile_url && !$username_colour) - { - $tpl = '{USERNAME}'; - } - else if ($profile_url && $username_colour) - { - $tpl = '{USERNAME}'; - } - - return str_replace(array('{PROFILE_URL}', '{USERNAME_COLOUR}', '{USERNAME}'), array($profile_url, $username_colour, $username), $tpl); - break; - } -} - -/** -* @package phpBB3 -*/ -class bitfield -{ - var $data; - - function __construct($bitfield = '') - { - $this->data = base64_decode($bitfield); - } - - /** - */ - function get($n) - { - // Get the ($n / 8)th char - $byte = $n >> 3; - - if (strlen($this->data) >= $byte + 1) - { - $c = $this->data[$byte]; - - // Lookup the ($n % 8)th bit of the byte - $bit = 7 - ($n & 7); - return (bool) (ord($c) & (1 << $bit)); - } - else - { - return false; - } - } - - function set($n) - { - $byte = $n >> 3; - $bit = 7 - ($n & 7); - - if (strlen($this->data) >= $byte + 1) - { - $this->data[$byte] = $this->data[$byte] | chr(1 << $bit); - } - else - { - $this->data .= str_repeat("\0", $byte - strlen($this->data)); - $this->data .= chr(1 << $bit); - } - } - - function clear($n) - { - $byte = $n >> 3; - - if (strlen($this->data) >= $byte + 1) - { - $bit = 7 - ($n & 7); - $this->data[$byte] = $this->data[$byte] &~ chr(1 << $bit); - } - } - - function get_blob() - { - return $this->data; - } - - function get_base64() - { - return base64_encode($this->data); - } - - function get_bin() - { - $bin = ''; - $len = strlen($this->data); - - for ($i = 0; $i < $len; ++$i) - { - $bin .= str_pad(decbin(ord($this->data[$i])), 8, '0', STR_PAD_LEFT); - } - - return $bin; - } - - function get_all_set() - { - return array_keys(array_filter(str_split($this->get_bin()))); - } - - function merge($bitfield) - { - $this->data = $this->data | $bitfield->get_blob(); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php deleted file mode 100644 index 159d6e935e..0000000000 --- a/phpBB/includes/functions_convert.php +++ /dev/null @@ -1,2449 +0,0 @@ - 0) ? 1 : 0; -} - -/** -* Boolean inverse of the value -*/ -function not($var) -{ - return ($var) ? 0 : 1; -} - -/** -* Convert a textual value to it's equivalent boolean value -* -* @param string $str String to convert (converts yes, on, y, 1 and true to boolean true) -* @return boolean The equivalent value -*/ -function str_to_bool($str) -{ - $str = strtolower($str); - return ($str == 'yes' || $str == 'on' || $str == 'y' || $str == 'true' || $str == '1') ? true : false; -} - -/** -* Function to mimic php's empty() function (it is the same) -*/ -function is_empty($mixed) -{ - return empty($mixed); -} - -/** -* Convert the name of a user's primary group to the appropriate equivalent phpBB group id -* -* @param string $status The name of the group -* @return int The group_id corresponding to the equivalent group -*/ -function str_to_primary_group($status) -{ - switch (ucfirst(strtolower($status))) - { - case 'Administrator': - return get_group_id('administrators'); - break; - - case 'Super moderator': - case 'Global moderator': - case 'Moderator': - return get_group_id('global_moderators'); - break; - - case 'Guest': - case 'Anonymous': - return get_group_id('guests'); - break; - - default: - return get_group_id('registered'); - break; - } -} - -/** -* Convert a boolean into the appropriate phpBB constant indicating whether the item is locked -*/ -function is_item_locked($bool) -{ - return ($bool) ? ITEM_LOCKED : ITEM_UNLOCKED; -} - -/** -* Convert a value from days to seconds -*/ -function days_to_seconds($days) -{ - return ($days * 86400); -} - -/** -* Determine whether a user is anonymous and return the appropriate new user_id -*/ -function is_user_anonymous($user_id) -{ - return ($user_id > ANONYMOUS) ? $user_id : ANONYMOUS; -} - -/** -* Generate a key value based on existing values -* -* @param int $pad Amount to add to the maximum value -* @return int Key value -*/ -function auto_id($pad = 0) -{ - global $auto_id, $convert_row; - - if (!empty($convert_row['max_id'])) - { - return $convert_row['max_id'] + $pad; - } - - return $auto_id + $pad; -} - -/** -* Convert a boolean into the appropriate phpBB constant indicating whether the user is active -*/ -function set_user_type($user_active) -{ - return ($user_active) ? USER_NORMAL : USER_INACTIVE; -} - -/** -* Convert a value from minutes to hours -*/ -function minutes_to_hours($minutes) -{ - return ($minutes / 3600); -} - -/** -* Return the group_id for a given group name -*/ -function get_group_id($group_name) -{ - global $db, $group_mapping; - - if (empty($group_mapping)) - { - $sql = 'SELECT group_name, group_id - FROM ' . GROUPS_TABLE; - $result = $db->sql_query($sql); - - $group_mapping = array(); - while ($row = $db->sql_fetchrow($result)) - { - $group_mapping[strtoupper($row['group_name'])] = (int) $row['group_id']; - } - $db->sql_freeresult($result); - } - - if (!sizeof($group_mapping)) - { - add_default_groups(); - return get_group_id($group_name); - } - - if (isset($group_mapping[strtoupper($group_name)])) - { - return $group_mapping[strtoupper($group_name)]; - } - - return $group_mapping['REGISTERED']; -} - -/** -* Generate the email hash stored in the users table -*/ -function gen_email_hash($email) -{ - return (crc32(strtolower($email)) . strlen($email)); -} - -/** -* Convert a boolean into the appropriate phpBB constant indicating whether the topic is locked -*/ -function is_topic_locked($bool) -{ - return (!empty($bool)) ? ITEM_LOCKED : ITEM_UNLOCKED; -} - -/** -* Generate a bbcode_uid value -*/ -function make_uid($timestamp) -{ - static $last_timestamp, $last_uid; - - if (empty($last_timestamp) || $timestamp != $last_timestamp) - { - $last_uid = substr(base_convert(unique_id(), 16, 36), 0, BBCODE_UID_LEN); - } - $last_timestamp = $timestamp; - return $last_uid; -} - - -/** -* Validate a website address -*/ -function validate_website($url) -{ - if ($url === 'http://') - { - return ''; - } - else if (!preg_match('#^[a-z0-9]+://#i', $url) && strlen($url) > 0) - { - return 'http://' . $url; - } - return $url; -} - -/** -* Convert nulls to zeros for fields which allowed a NULL value in the source but not the destination -*/ -function null_to_zero($value) -{ - return ($value === NULL) ? 0 : $value; -} - -/** -* Convert nulls to empty strings for fields which allowed a NULL value in the source but not the destination -*/ -function null_to_str($value) -{ - return ($value === NULL) ? '' : $value; -} - -// EXTENDED FUNCTIONS - -/** -* Get old config value -*/ -function get_config_value($config_name) -{ - static $convert_config; - - if (!isset($convert_config)) - { - $convert_config = get_config(); - } - - if (!isset($convert_config[$config_name])) - { - return false; - } - - return (empty($convert_config[$config_name])) ? '' : $convert_config[$config_name]; -} - -/** -* Convert an IP address from the hexadecimal notation to normal dotted-quad notation -*/ -function decode_ip($int_ip) -{ - if (!$int_ip) - { - return $int_ip; - } - - $hexipbang = explode('.', chunk_split($int_ip, 2, '.')); - - // Any mod changing the way ips are stored? Then we are not able to convert and enter the ip "as is" to not "destroy" anything... - if (sizeof($hexipbang) < 4) - { - return $int_ip; - } - - return hexdec($hexipbang[0]) . '.' . hexdec($hexipbang[1]) . '.' . hexdec($hexipbang[2]) . '.' . hexdec($hexipbang[3]); -} - -/** -* Reverse the encoding of wild-carded bans -*/ -function decode_ban_ip($int_ip) -{ - return str_replace('255', '*', decode_ip($int_ip)); -} - -/** -* Determine the MIME-type of a specified filename -* This does not actually inspect the file, but simply uses the file extension -*/ -function mimetype($filename) -{ - if (!preg_match('/\.([a-z0-9]+)$/i', $filename, $m)) - { - return 'application/octet-stream'; - } - - switch (strtolower($m[1])) - { - case 'zip': return 'application/zip'; - case 'jpeg': return 'image/jpeg'; - case 'jpg': return 'image/jpeg'; - case 'jpe': return 'image/jpeg'; - case 'png': return 'image/png'; - case 'gif': return 'image/gif'; - case 'htm': - case 'html': return 'text/html'; - case 'tif': return 'image/tiff'; - case 'tiff': return 'image/tiff'; - case 'ras': return 'image/x-cmu-raster'; - case 'pnm': return 'image/x-portable-anymap'; - case 'pbm': return 'image/x-portable-bitmap'; - case 'pgm': return 'image/x-portable-graymap'; - case 'ppm': return 'image/x-portable-pixmap'; - case 'rgb': return 'image/x-rgb'; - case 'xbm': return 'image/x-xbitmap'; - case 'xpm': return 'image/x-xpixmap'; - case 'xwd': return 'image/x-xwindowdump'; - case 'z': return 'application/x-compress'; - case 'gtar': return 'application/x-gtar'; - case 'tgz': return 'application/x-gtar'; - case 'gz': return 'application/x-gzip'; - case 'tar': return 'application/x-tar'; - case 'xls': return 'application/excel'; - case 'pdf': return 'application/pdf'; - case 'ppt': return 'application/powerpoint'; - case 'rm': return 'application/vnd.rn-realmedia'; - case 'wma': return 'audio/x-ms-wma'; - case 'swf': return 'application/x-shockwave-flash'; - case 'ief': return 'image/ief'; - case 'doc': - case 'dot': - case 'wrd': return 'application/msword'; - case 'ai': - case 'eps': - case 'ps': return 'application/postscript'; - case 'asc': - case 'txt': - case 'c': - case 'cc': - case 'h': - case 'hh': - case 'cpp': - case 'hpp': - case 'php': - case 'php3': return 'text/plain'; - default: return 'application/octet-stream'; - } -} - -/** -* Obtain the dimensions of all remotely hosted avatars -* This should only be called from execute_last -* There can be significant network overhead if there are a large number of remote avatars -* @todo Look at the option of allowing the user to decide whether this is called or to force the dimensions -*/ -function remote_avatar_dims() -{ - global $db; - - $sql = 'SELECT user_id, user_avatar - FROM ' . USERS_TABLE . ' - WHERE user_avatar_type = ' . AVATAR_REMOTE; - $result = $db->sql_query($sql); - - $remote_avatars = array(); - while ($row = $db->sql_fetchrow($result)) - { - $remote_avatars[(int) $row['user_id']] = $row['user_avatar']; - } - $db->sql_freeresult($result); - - foreach ($remote_avatars as $user_id => $avatar) - { - $width = (int) get_remote_avatar_dim($avatar, 0); - $height = (int) get_remote_avatar_dim($avatar, 1); - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_avatar_width = ' . (int) $width . ', user_avatar_height = ' . (int) $height . ' - WHERE user_id = ' . $user_id; - $db->sql_query($sql); - } -} - -function import_avatar_gallery($gallery_name = '', $subdirs_as_galleries = false) -{ - global $config, $convert, $phpbb_root_path, $user; - - $relative_path = empty($convert->convertor['source_path_absolute']); - - if (empty($convert->convertor['avatar_gallery_path'])) - { - $convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_GALLERY_PATH'], 'import_avatar_gallery()'), __LINE__, __FILE__); - } - - $src_path = relative_base(path($convert->convertor['avatar_gallery_path'], $relative_path), $relative_path); - - if (is_dir($src_path)) - { - // Do not die on failure... safe mode restrictions may be in effect. - copy_dir($convert->convertor['avatar_gallery_path'], path($config['avatar_gallery_path']) . $gallery_name, !$subdirs_as_galleries, false, false, $relative_path); - - // only doing 1 level deep. (ibf 1.x) - // notes: ibf has 2 tiers: directly in the avatar directory for base gallery (handled in the above statement), plus subdirs(handled below). - // recursive subdirs ignored. -- i don't know if other forums support recursive galleries. if they do, this following code could be upgraded to be recursive. - if ($subdirs_as_galleries) - { - $dirlist = array(); - if ($handle = @opendir($src_path)) - { - while ($entry = readdir($handle)) - { - if ($entry[0] == '.' || $entry == 'CVS' || $entry == 'index.htm') - { - continue; - } - - if (is_dir($src_path . $entry)) - { - $dirlist[] = $entry; - } - } - closedir($handle); - } - else if ($dir = @dir($src_path)) - { - while ($entry = $dir->read()) - { - if ($entry[0] == '.' || $entry == 'CVS' || $entry == 'index.htm') - { - continue; - } - - if (is_dir($src_path . $entry)) - { - $dirlist[] = $entry; - } - } - $dir->close(); - } - - for ($i = 0; $i < sizeof($dirlist); ++$i) - { - $dir = $dirlist[$i]; - - // Do not die on failure... safe mode restrictions may be in effect. - copy_dir(path($convert->convertor['avatar_gallery_path'], $relative_path) . $dir, path($config['avatar_gallery_path']) . $dir, true, false, false, $relative_path); - } - } - } -} - -function import_attachment_files($category_name = '') -{ - global $config, $convert, $phpbb_root_path, $db, $user; - - $sql = 'SELECT config_value AS upload_path - FROM ' . CONFIG_TABLE . " - WHERE config_name = 'upload_path'"; - $result = $db->sql_query($sql); - $config['upload_path'] = $db->sql_fetchfield('upload_path'); - $db->sql_freeresult($result); - - $relative_path = empty($convert->convertor['source_path_absolute']); - - if (empty($convert->convertor['upload_path'])) - { - $convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_UPLOAD_DIR'], 'import_attachment_files()'), __LINE__, __FILE__); - } - - if (is_dir(relative_base(path($convert->convertor['upload_path'], $relative_path), $relative_path))) - { - copy_dir($convert->convertor['upload_path'], path($config['upload_path']) . $category_name, true, false, true, $relative_path); - } -} - -function attachment_forum_perms($forum_id) -{ - if (!is_array($forum_id)) - { - $forum_id = array($forum_id); - } - - return serialize($forum_id); -} - -// base64todec function -// -> from php manual? -function base64_unpack($string) -{ - $chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ+-'; - $base = strlen($chars); - - $length = strlen($string); - $number = 0; - - for ($i = 1; $i <= $length; $i++) - { - $pos = $length - $i; - $operand = strpos($chars, substr($string, $pos, 1)); - $exponent = pow($base, $i-1); - $dec_value = $operand * $exponent; - $number += $dec_value; - } - - return $number; -} - -function _import_check($config_var, $source, $use_target) -{ - global $convert, $config; - - $result = array( - 'orig_source' => $source, - 'copied' => false, - 'relative_path' => (empty($convert->convertor['source_path_absolute'])) ? true : false, - ); - - // copy file will prepend $phpBB_root_path - $target = $config[$config_var] . '/' . basename(($use_target === false) ? $source : $use_target); - - if (!empty($convert->convertor[$config_var]) && strpos($source, $convert->convertor[$config_var]) !== 0) - { - $source = $convert->convertor[$config_var] . $source; - } - - $result['source'] = $source; - - if (file_exists(relative_base($source, $result['relative_path'], __LINE__, __FILE__))) - { - $result['copied'] = copy_file($source, $target, false, false, $result['relative_path']); - } - - if ($result['copied']) - { - $result['target'] = basename($target); - } - else - { - $result['target'] = ($use_target !== false) ? $result['orig_source'] : basename($target); - } - - return $result; -} - -function import_attachment($source, $use_target = false) -{ - if (empty($source)) - { - return ''; - } - - global $convert, $phpbb_root_path, $config, $user; - - if (empty($convert->convertor['upload_path'])) - { - $convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_UPLOAD_DIR'], 'import_attachment()'), __LINE__, __FILE__); - } - - $result = _import_check('upload_path', $source, $use_target); - - if ($result['copied']) - { - // Thumbnails? - if (is_array($convert->convertor['thumbnails'])) - { - $thumb_dir = $convert->convertor['thumbnails'][0]; - $thumb_prefix = $convert->convertor['thumbnails'][1]; - $thumb_source = $thumb_dir . $thumb_prefix . basename($result['source']); - - if (strpos($thumb_source, $convert->convertor['upload_path']) !== 0) - { - $thumb_source = $convert->convertor['upload_path'] . $thumb_source; - } - $thumb_target = $config['upload_path'] . '/thumb_' . $result['target']; - - if (file_exists(relative_base($thumb_source, $result['relative_path'], __LINE__, __FILE__))) - { - copy_file($thumb_source, $thumb_target, false, false, $result['relative_path']); - } - } - } - - return $result['target']; -} - -function import_rank($source, $use_target = false) -{ - if (empty($source)) - { - return ''; - } - - global $convert, $phpbb_root_path, $config, $user; - - if (!isset($convert->convertor['ranks_path'])) - { - $convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_RANKS_PATH'], 'import_rank()'), __LINE__, __FILE__); - } - - $result = _import_check('ranks_path', $source, $use_target); - return $result['target']; -} - -function import_smiley($source, $use_target = false) -{ - if (empty($source)) - { - return ''; - } - - global $convert, $phpbb_root_path, $config, $user; - - if (!isset($convert->convertor['smilies_path'])) - { - $convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_SMILIES_PATH'], 'import_smiley()'), __LINE__, __FILE__); - } - - $result = _import_check('smilies_path', $source, $use_target); - return $result['target']; -} - -/* -*/ -function import_avatar($source, $use_target = false, $user_id = false) -{ - if (empty($source) || preg_match('#^https?:#i', $source) || preg_match('#blank\.(gif|png)$#i', $source)) - { - return; - } - - global $convert, $phpbb_root_path, $config, $user; - - if (!isset($convert->convertor['avatar_path'])) - { - $convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_AVATAR_PATH'], 'import_avatar()'), __LINE__, __FILE__); - } - - if ($use_target === false && $user_id !== false) - { - $use_target = $config['avatar_salt'] . '_' . $user_id . '.' . substr(strrchr($source, '.'), 1); - } - - $result = _import_check('avatar_path', $source, $use_target); - - return ((!empty($user_id)) ? $user_id : $use_target) . '.' . substr(strrchr($source, '.'), 1); -} - -/** -* @todo all image dimension functions below (there are a *lot*) should get revisited and converted to one or two functions (no more needed, really). -*/ - -/** -* Calculate the size of the specified image -* Called from the following functions for calculating the size of specific image types -*/ -function get_image_dim($source) -{ - if (empty($source)) - { - return array(0, 0); - } - - global $convert; - - $relative_path = empty($convert->convertor['source_path_absolute']); - - if (file_exists(relative_base($source, $relative_path))) - { - $image = relative_base($source, $relative_path); - return @getimagesize($image); - } - - return false; -} - -/** -* Obtain the width of the specified smilie -*/ -function get_smiley_width($src) -{ - return get_smiley_dim($src, 0); -} - -/** -* Obtain the height of the specified smilie -*/ -function get_smiley_height($src) -{ - return get_smiley_dim($src, 1); -} - -/** -* Obtain the size of the specified smilie (using the cache if possible) and cache the value -*/ -function get_smiley_dim($source, $axis) -{ - if (empty($source)) - { - return 15; - } - - static $smiley_cache = array(); - - if (isset($smiley_cache[$source])) - { - return $smiley_cache[$source][$axis]; - } - - global $convert, $phpbb_root_path, $config, $user; - - $orig_source = $source; - - if (!isset($convert->convertor['smilies_path'])) - { - $convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_SMILIES_PATH'], 'get_smiley_dim()'), __LINE__, __FILE__); - } - - if (!empty($convert->convertor['smilies_path']) && strpos($source, $convert->convertor['smilies_path']) !== 0) - { - $source = $convert->convertor['smilies_path'] . $source; - } - - $smiley_cache[$orig_source] = get_image_dim($source); - - if (empty($smiley_cache[$orig_source]) || empty($smiley_cache[$orig_source][0]) || empty($smiley_cache[$orig_source][1])) - { - $smiley_cache[$orig_source] = array(15, 15); - return 15; - } - - return $smiley_cache[$orig_source][$axis]; -} - -/** -* Obtain the width of the specified avatar -*/ -function get_avatar_width($src, $func = false, $arg1 = false, $arg2 = false) -{ - return get_avatar_dim($src, 0, $func, $arg1, $arg2); -} - -/** -* Obtain the height of the specified avatar -*/ -function get_avatar_height($src, $func = false, $arg1 = false, $arg2 = false) -{ - return get_avatar_dim($src, 1, $func, $arg1, $arg2); -} - -/** -*/ -function get_avatar_dim($src, $axis, $func = false, $arg1 = false, $arg2 = false) -{ - $avatar_type = AVATAR_UPLOAD; - - if ($func) - { - if ($arg1 || $arg2) - { - $ary = array($arg1); - - if ($arg2) - { - $ary[] = $arg2; - } - - $avatar_type = call_user_func_array($func, $ary); - } - else - { - $avatar_type = call_user_func($func); - } - } - - switch ($avatar_type) - { - case AVATAR_UPLOAD: - return get_upload_avatar_dim($src, $axis); - break; - - case AVATAR_GALLERY: - return get_gallery_avatar_dim($src, $axis); - break; - - case AVATAR_REMOTE: - // see notes on this functions usage and (hopefully) model $func to avoid this accordingly - return get_remote_avatar_dim($src, $axis); - break; - - default: - $default_x = (defined('DEFAULT_AVATAR_X_CUSTOM')) ? DEFAULT_AVATAR_X_CUSTOM : DEFAULT_AVATAR_X; - $default_y = (defined('DEFAULT_AVATAR_Y_CUSTOM')) ? DEFAULT_AVATAR_Y_CUSTOM : DEFAULT_AVATAR_Y; - - return $axis ? $default_y : $default_x; - break; - } -} - -/** -* Obtain the size of the specified uploaded avatar (using the cache if possible) and cache the value -*/ -function get_upload_avatar_dim($source, $axis) -{ - static $cachedims = false; - static $cachekey = false; - - if (empty($source)) - { - return 0; - } - - if ($cachekey == $source) - { - return $cachedims[$axis]; - } - - $orig_source = $source; - - if (substr($source, 0, 7) == 'upload:') - { - $source = substr($source, 7); - } - - global $convert, $phpbb_root_path, $config, $user; - - if (!isset($convert->convertor['avatar_path'])) - { - $convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_AVATAR_PATH'], 'get_upload_avatar_dim()'), __LINE__, __FILE__); - } - - if (!empty($convert->convertor['avatar_path']) && strpos($source, $convert->convertor['avatar_path']) !== 0) - { - $source = path($convert->convertor['avatar_path'], empty($convert->convertor['source_path_absolute'])) . $source; - } - - $cachedims = get_image_dim($source); - - if (empty($cachedims) || empty($cachedims[0]) || empty($cachedims[1])) - { - $default_x = (defined('DEFAULT_AVATAR_X_CUSTOM')) ? DEFAULT_AVATAR_X_CUSTOM : DEFAULT_AVATAR_X; - $default_y = (defined('DEFAULT_AVATAR_Y_CUSTOM')) ? DEFAULT_AVATAR_Y_CUSTOM : DEFAULT_AVATAR_Y; - - $cachedims = array($default_x, $default_y); - } - - return $cachedims[$axis]; -} - -/** -* Obtain the size of the specified gallery avatar (using the cache if possible) and cache the value -*/ -function get_gallery_avatar_dim($source, $axis) -{ - if (empty($source)) - { - return 0; - } - - static $avatar_cache = array(); - - if (isset($avatar_cache[$source])) - { - return $avatar_cache[$source][$axis]; - } - - global $convert, $phpbb_root_path, $config, $user; - - $orig_source = $source; - - if (!isset($convert->convertor['avatar_gallery_path'])) - { - $convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_GALLERY_PATH'], 'get_gallery_avatar_dim()'), __LINE__, __FILE__); - } - - if (!empty($convert->convertor['avatar_gallery_path']) && strpos($source, $convert->convertor['avatar_gallery_path']) !== 0) - { - $source = path($convert->convertor['avatar_gallery_path'], empty($convert->convertor['source_path_absolute'])) . $source; - } - - $avatar_cache[$orig_source] = get_image_dim($source); - - if (empty($avatar_cache[$orig_source]) || empty($avatar_cache[$orig_source][0]) || empty($avatar_cache[$orig_source][1])) - { - $default_x = (defined('DEFAULT_AVATAR_X_CUSTOM')) ? DEFAULT_AVATAR_X_CUSTOM : DEFAULT_AVATAR_X; - $default_y = (defined('DEFAULT_AVATAR_Y_CUSTOM')) ? DEFAULT_AVATAR_Y_CUSTOM : DEFAULT_AVATAR_Y; - - $avatar_cache[$orig_source] = array($default_x, $default_y); - } - - return $avatar_cache[$orig_source][$axis]; -} - -/** -* Obtain the size of the specified remote avatar (using the cache if possible) and cache the value -* Whilst it's unlikely that remote avatars will be duplicated, it is possible so caching seems the best option -* This should only be called from a post processing step due to the possibility of network timeouts -*/ -function get_remote_avatar_dim($src, $axis) -{ - if (empty($src)) - { - return 0; - } - - static $remote_avatar_cache = array(); - - // an ugly hack: we assume that the dimensions of each remote avatar are accessed exactly twice (x and y) - if (isset($remote_avatar_cache[$src])) - { - $retval = $remote_avatar_cache[$src][$axis]; - unset($remote_avatar_cache); - return $retval; - } - - $url_info = @parse_url($src); - if (empty($url_info['host'])) - { - return 0; - } - $host = $url_info['host']; - $port = (isset($url_info['port'])) ? $url_info['port'] : 0; - $protocol = (isset($url_info['scheme'])) ? $url_info['scheme'] : 'http'; - if (empty($port)) - { - switch(strtolower($protocol)) - { - case 'ftp': - $port = 21; - break; - - case 'https': - $port = 443; - break; - - default: - $port = 80; - } - } - - $timeout = @ini_get('default_socket_timeout'); - @ini_set('default_socket_timeout', 2); - - // We're just trying to reach the server to avoid timeouts - $fp = @fsockopen($host, $port, $errno, $errstr, 1); - if ($fp) - { - $remote_avatar_cache[$src] = @getimagesize($src); - fclose($fp); - } - - $default_x = (defined('DEFAULT_AVATAR_X_CUSTOM')) ? DEFAULT_AVATAR_X_CUSTOM : DEFAULT_AVATAR_X; - $default_y = (defined('DEFAULT_AVATAR_Y_CUSTOM')) ? DEFAULT_AVATAR_Y_CUSTOM : DEFAULT_AVATAR_Y; - $default = array($default_x, $default_y); - - if (empty($remote_avatar_cache[$src]) || empty($remote_avatar_cache[$src][0]) || empty($remote_avatar_cache[$src][1])) - { - $remote_avatar_cache[$src] = $default; - } - else - { - // We trust gallery and uploaded avatars to conform to the size settings; we might have to adjust here - if ($remote_avatar_cache[$src][0] > $default_x || $remote_avatar_cache[$src][1] > $default_y) - { - $bigger = ($remote_avatar_cache[$src][0] > $remote_avatar_cache[$src][1]) ? 0 : 1; - $ratio = $default[$bigger] / $remote_avatar_cache[$src][$bigger]; - $remote_avatar_cache[$src][0] = (int)($remote_avatar_cache[$src][0] * $ratio); - $remote_avatar_cache[$src][1] = (int)($remote_avatar_cache[$src][1] * $ratio); - } - } - - @ini_set('default_socket_timeout', $timeout); - return $remote_avatar_cache[$src][$axis]; -} - -function set_user_options() -{ - global $convert_row; - - // Key need to be set in row, else default value is chosen - $keyoptions = array( - 'viewimg' => array('bit' => 0, 'default' => 1), - 'viewflash' => array('bit' => 1, 'default' => 1), - 'viewsmilies' => array('bit' => 2, 'default' => 1), - 'viewsigs' => array('bit' => 3, 'default' => 1), - 'viewavatars' => array('bit' => 4, 'default' => 1), - 'viewcensors' => array('bit' => 5, 'default' => 1), - 'attachsig' => array('bit' => 6, 'default' => 0), - 'bbcode' => array('bit' => 8, 'default' => 1), - 'smilies' => array('bit' => 9, 'default' => 1), - 'popuppm' => array('bit' => 10, 'default' => 0), - ); - - $option_field = 0; - - foreach ($keyoptions as $key => $key_ary) - { - $value = (isset($convert_row[$key])) ? (int) $convert_row[$key] : $key_ary['default']; - - if ($value && !($option_field & 1 << $key_ary['bit'])) - { - $option_field += 1 << $key_ary['bit']; - } - } - - return $option_field; -} - -/** -* Index messages on the fly as we convert them -* @todo naderman, can you check that this works with the new search plugins as it's use is currently disabled (and thus untested) -function search_indexing($message = '') -{ - global $fulltext_search, $convert_row; - - if (!isset($convert_row['post_id'])) - { - return; - } - - if (!$message) - { - if (!isset($convert_row['message'])) - { - return; - } - - $message = $convert_row['message']; - } - - $title = (isset($convert_row['title'])) ? $convert_row['title'] : ''; - - $fulltext_search->index('post', $convert_row['post_id'], $message, $title, $convert_row['poster_id'], $convert_row['forum_id']); -} -*/ - -function make_unique_filename($filename) -{ - if (!strlen($filename)) - { - $filename = md5(unique_id()) . '.dat'; - } - else if ($filename[0] == '.') - { - $filename = md5(unique_id()) . $filename; - } - else if (preg_match('/\.([a-z]+)$/i', $filename, $m)) - { - $filename = preg_replace('/\.([a-z]+)$/i', '_' . md5(unique_id()) . '.\1', $filename); - } - else - { - $filename .= '_' . md5(unique_id()) . '.dat'; - } - - return $filename; -} - -function words_unique(&$words) -{ - reset($words); - $return_array = array(); - - $word = current($words); - do - { - $return_array[$word] = $word; - } - while ($word = next($words)); - - return $return_array; -} - -/** -* Adds a user to the specified group and optionally makes them a group leader -* This function does not create the group if it does not exist and so should only be called after the groups have been created -*/ -function add_user_group($group_id, $user_id, $group_leader=false) -{ - global $convert, $phpbb_root_path, $config, $user, $db; - - $sql = 'INSERT INTO ' . USER_GROUP_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'group_id' => $group_id, - 'user_id' => $user_id, - 'group_leader' => ($group_leader) ? 1 : 0, - 'user_pending' => 0)); - $db->sql_query($sql); -} - -// STANDALONE FUNCTIONS - -/** -* Add users to the pre-defined "special" groups -* -* @param string $group The name of the special group to add to -* @param string $select_query An SQL query to retrieve the user(s) to add to the group -*/ -function user_group_auth($group, $select_query, $use_src_db) -{ - global $convert, $phpbb_root_path, $config, $user, $db, $src_db, $same_db; - - if (!in_array($group, array('guests', 'registered', 'registered_coppa', 'global_moderators', 'administrators', 'bots'))) - { - $convert->p_master->error(sprintf($user->lang['CONV_ERROR_WRONG_GROUP'], $group, 'user_group_auth()'), __LINE__, __FILE__, true); - return; - } - - $sql = 'SELECT group_id - FROM ' . GROUPS_TABLE . " - WHERE group_name_clean = '" . $db->sql_escape(utf8_clean_string($group)) . "'"; - $result = $db->sql_query($sql); - $group_id = (int) $db->sql_fetchfield('group_id'); - $db->sql_freeresult($result); - - if (!$group_id) - { - $convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_GROUP'], $group, 'user_group_auth()'), __LINE__, __FILE__, true); - return; - } - - if ($same_db || !$use_src_db) - { - $sql = 'INSERT INTO ' . USER_GROUP_TABLE . ' (user_id, group_id, user_pending) - ' . str_replace('{' . strtoupper($group) . '}', $group_id . ', 0', $select_query); - $db->sql_query($sql); - } - else - { - $result = $src_db->sql_query(str_replace('{' . strtoupper($group) . '}', $group_id . ' ', $select_query)); - while ($row = $src_db->sql_fetchrow($result)) - { - // this might become quite a lot of INSERTS unfortunately - $sql = 'INSERT INTO ' . USER_GROUP_TABLE . " (user_id, group_id, user_pending) - VALUES ({$row['user_id']}, $group_id, 0)"; - $db->sql_query($sql); - } - $src_db->sql_freeresult($result); - } -} - -/** -* Retrieves configuration information from the source forum and caches it as an array -* Both database and file driven configuration formats can be handled -* (the type used is specified in $config_schema, see convert_phpbb20.php for more details) -*/ -function get_config() -{ - static $convert_config; - global $user; - - if (isset($convert_config)) - { - return $convert_config; - } - - global $src_db, $same_db, $phpbb_root_path, $config; - global $convert; - - if ($convert->config_schema['table_format'] != 'file') - { - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - - $sql = 'SELECT * FROM ' . $convert->src_table_prefix . $convert->config_schema['table_name']; - $result = $src_db->sql_query($sql); - $row = $src_db->sql_fetchrow($result); - - if (!$row) - { - $convert->p_master->error($user->lang['CONV_ERROR_GET_CONFIG'], __LINE__, __FILE__); - } - } - - if (is_array($convert->config_schema['table_format'])) - { - $convert_config = array(); - list($key, $val) = each($convert->config_schema['table_format']); - - do - { - $convert_config[$row[$key]] = $row[$val]; - } - while ($row = $src_db->sql_fetchrow($result)); - $src_db->sql_freeresult($result); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - } - else if ($convert->config_schema['table_format'] == 'file') - { - $filename = $convert->options['forum_path'] . '/' . $convert->config_schema['filename']; - if (!file_exists($filename)) - { - $convert->p_master->error($user->lang['FILE_NOT_FOUND'] . ': ' . $filename, __LINE__, __FILE__); - } - - $convert_config = extract_variables_from_file($filename); - if (!empty($convert->config_schema['array_name'])) - { - $convert_config = $convert_config[$convert->config_schema['array_name']]; - } - } - else - { - $convert_config = $row; - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - } - - if (!sizeof($convert_config)) - { - $convert->p_master->error($user->lang['CONV_ERROR_CONFIG_EMPTY'], __LINE__, __FILE__); - } - - return $convert_config; -} - -/** -* Transfers the relevant configuration information from the source forum -* The mapping of fields is specified in $config_schema, see convert_phpbb20.php for more details -*/ -function restore_config($schema) -{ - global $db, $config; - - $convert_config = get_config(); - foreach ($schema['settings'] as $config_name => $src) - { - if (preg_match('/(.*)\((.*)\)/', $src, $m)) - { - $var = (empty($m[2]) || empty($convert_config[$m[2]])) ? "''" : "'" . addslashes($convert_config[$m[2]]) . "'"; - $exec = '$config_value = ' . $m[1] . '(' . $var . ');'; - eval($exec); - } - else - { - $config_value = (isset($convert_config[$src])) ? $convert_config[$src] : ''; - } - - if ($config_value !== '') - { - // Most are... - if (is_string($config_value)) - { - $config_value = utf8_htmlspecialchars($config_value); - } - - set_config($config_name, $config_value); - } - } -} - -/** -* Update the count of PM's in custom folders for all users -*/ -function update_folder_pm_count() -{ - global $db, $convert, $user; - - $sql = 'SELECT user_id, folder_id, COUNT(msg_id) as num_messages - FROM ' . PRIVMSGS_TO_TABLE . ' - WHERE folder_id NOT IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ', ' . PRIVMSGS_INBOX . ', ' . PRIVMSGS_OUTBOX . ', ' . PRIVMSGS_SENTBOX . ') - GROUP BY folder_id, user_id'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $db->sql_query('UPDATE ' . PRIVMSGS_FOLDER_TABLE . ' SET pm_count = ' . $row['num_messages'] . ' - WHERE user_id = ' . $row['user_id'] . ' AND folder_id = ' . $row['folder_id']); - } - $db->sql_freeresult($result); -} - -// Functions mainly used by the main convertor script - -function path($path, $path_relative = true) -{ - if ($path === false) - { - return ''; - } - - if (substr($path, -1) != '/') - { - $path .= '/'; - } - - if (!$path_relative) - { - return $path; - } - - if (substr($path, 0, 1) == '/') - { - $path = substr($path, 1); - } - - return $path; -} - -/** -* Extract the variables defined in a configuration file -* @todo As noted by Xore we need to look at this from a security perspective -*/ -function extract_variables_from_file($_filename) -{ - include($_filename); - - $vars = get_defined_vars(); - unset($vars['_filename']); - - return $vars; -} - -function get_path($src_path, $src_url, $test_file) -{ - global $config, $phpbb_root_path, $phpEx; - - $board_config = get_config(); - - $test_file = preg_replace('/\.php$/i', ".$phpEx", $test_file); - $src_path = path($src_path); - - if (@file_exists($phpbb_root_path . $src_path . $test_file)) - { - return $src_path; - } - - if (!empty($src_url) && !empty($board_config['server_name'])) - { - if (!preg_match('#https?://([^/]+)(.*)#i', $src_url, $m)) - { - return false; - } - - if ($m[1] != $board_config['server_name']) - { - return false; - } - - $url_parts = explode('/', $m[2]); - if (substr($src_url, -1) != '/') - { - if (preg_match('/.*\.([a-z0-9]{3,4})$/i', $url_parts[sizeof($url_parts) - 1])) - { - $url_parts[sizeof($url_parts) - 1] = ''; - } - else - { - $url_parts[] = ''; - } - } - - $script_path = $board_config['script_path']; - if (substr($script_path, -1) == '/') - { - $script_path = substr($script_path, 0, -1); - } - - $path_array = array(); - - $phpbb_parts = explode('/', $script_path); - for ($i = 0; $i < sizeof($url_parts); ++$i) - { - if ($i < sizeof($phpbb_parts[$i]) && $url_parts[$i] == $phpbb_parts[$i]) - { - $path_array[] = $url_parts[$i]; - unset($url_parts[$i]); - } - else - { - $path = ''; - for ($j = $i; $j < sizeof($phpbb_parts); ++$j) - { - $path .= '../'; - } - $path .= implode('/', $url_parts); - break; - } - } - - if (!empty($path)) - { - if (@file_exists($phpbb_root_path . $path . $test_file)) - { - return $path; - } - } - } - - return false; -} - -function compare_table($tables, $tablename, &$prefixes) -{ - for ($i = 0, $table_size = sizeof($tables); $i < $table_size; ++$i) - { - if (preg_match('/(.*)' . $tables[$i] . '$/', $tablename, $m)) - { - if (empty($m[1])) - { - $m[1] = '*'; - } - - if (isset($prefixes[$m[1]])) - { - $prefixes[$m[1]]++; - } - else - { - $prefixes[$m[1]] = 1; - } - } - } -} - -/** -* Grant permissions to a specified user or group -* -* @param string $ug_type user|group|user_role|group_role -* @param mixed $forum_id forum ids (array|int|0) -> 0 == all forums -* @param mixed $ug_id [int] user_id|group_id : [string] usergroup name -* @param mixed $acl_list [string] acl entry : [array] acl entries : [string] role entry -* @param int $setting ACL_YES|ACL_NO|ACL_NEVER -*/ -function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting = ACL_NO) -{ - global $db, $convert, $user, $config; - static $acl_option_ids, $group_ids; - - if (($ug_type == 'group' || $ug_type == 'group_role') && is_string($ug_id)) - { - if (!isset($group_ids[$ug_id])) - { - $sql = 'SELECT group_id - FROM ' . GROUPS_TABLE . " - WHERE group_name_clean = '" . $db->sql_escape(utf8_clean_string($ug_id)) . "'"; - $result = $db->sql_query_limit($sql, 1); - $id = (int) $db->sql_fetchfield('group_id'); - $db->sql_freeresult($result); - - if (!$id) - { - return; - } - - $group_ids[$ug_id] = $id; - } - - $ug_id = (int) $group_ids[$ug_id]; - } - - $table = ($ug_type == 'user' || $ug_type == 'user_role') ? ACL_USERS_TABLE : ACL_GROUPS_TABLE; - $id_field = ($ug_type == 'user' || $ug_type == 'user_role') ? 'user_id' : 'group_id'; - - // Role based permissions are the simplest to handle so check for them first - if ($ug_type == 'user_role' || $ug_type == 'group_role') - { - if (is_numeric($forum_id)) - { - $sql = 'SELECT role_id - FROM ' . ACL_ROLES_TABLE . " - WHERE role_name = 'ROLE_" . $db->sql_escape($acl_list) . "'"; - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // If we have no role id there is something wrong here - if ($row) - { - $sql = "INSERT INTO $table ($id_field, forum_id, auth_role_id) VALUES ($ug_id, $forum_id, " . $row['role_id'] . ')'; - $db->sql_query($sql); - } - } - - return; - } - - // Build correct parameters - $auth = array(); - - if (!is_array($acl_list)) - { - $auth = array($acl_list => $setting); - } - else - { - foreach ($acl_list as $auth_option) - { - $auth[$auth_option] = $setting; - } - } - unset($acl_list); - - if (!is_array($forum_id)) - { - $forum_id = array($forum_id); - } - - // Set any flags as required - foreach ($auth as $auth_option => $acl_setting) - { - $flag = substr($auth_option, 0, strpos($auth_option, '_') + 1); - if (empty($auth[$flag])) - { - $auth[$flag] = $acl_setting; - } - } - - if (!is_array($acl_option_ids) || empty($acl_option_ids)) - { - $sql = 'SELECT auth_option_id, auth_option - FROM ' . ACL_OPTIONS_TABLE; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $acl_option_ids[$row['auth_option']] = $row['auth_option_id']; - } - $db->sql_freeresult($result); - } - - $sql_forum = 'AND ' . $db->sql_in_set('a.forum_id', array_map('intval', $forum_id), false, true); - - $sql = ($ug_type == 'user') ? 'SELECT o.auth_option_id, o.auth_option, a.forum_id, a.auth_setting FROM ' . ACL_USERS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . " o WHERE a.auth_option_id = o.auth_option_id $sql_forum AND a.user_id = $ug_id" : 'SELECT o.auth_option_id, o.auth_option, a.forum_id, a.auth_setting FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . " o WHERE a.auth_option_id = o.auth_option_id $sql_forum AND a.group_id = $ug_id"; - $result = $db->sql_query($sql); - - $cur_auth = array(); - while ($row = $db->sql_fetchrow($result)) - { - $cur_auth[$row['forum_id']][$row['auth_option_id']] = $row['auth_setting']; - } - $db->sql_freeresult($result); - - $sql_ary = array(); - foreach ($forum_id as $forum) - { - foreach ($auth as $auth_option => $setting) - { - $auth_option_id = $acl_option_ids[$auth_option]; - - if (!$auth_option_id) - { - continue; - } - - switch ($setting) - { - case ACL_NO: - if (isset($cur_auth[$forum][$auth_option_id])) - { - $sql_ary['delete'][] = "DELETE FROM $table - WHERE forum_id = $forum - AND auth_option_id = $auth_option_id - AND $id_field = $ug_id"; - } - break; - - default: - if (!isset($cur_auth[$forum][$auth_option_id])) - { - $sql_ary['insert'][] = "$ug_id, $forum, $auth_option_id, $setting"; - } - else if ($cur_auth[$forum][$auth_option_id] != $setting) - { - $sql_ary['update'][] = "UPDATE " . $table . " - SET auth_setting = $setting - WHERE $id_field = $ug_id - AND forum_id = $forum - AND auth_option_id = $auth_option_id"; - } - } - } - } - unset($cur_auth); - - $sql = ''; - foreach ($sql_ary as $sql_type => $sql_subary) - { - switch ($sql_type) - { - case 'insert': - switch ($db->dbms_type) - { - case 'mysql': - $sql = 'VALUES ' . implode(', ', preg_replace('#^(.*?)$#', '(\1)', $sql_subary)); - break; - - case 'mssql': - case 'sqlite': - $sql = implode(' UNION ALL ', preg_replace('#^(.*?)$#', 'SELECT \1', $sql_subary)); - break; - - default: - foreach ($sql_subary as $sql) - { - $sql = "INSERT INTO $table ($id_field, forum_id, auth_option_id, auth_setting) VALUES ($sql)"; - $db->sql_query($sql); - $sql = ''; - } - } - - if ($sql != '') - { - $sql = "INSERT INTO $table ($id_field, forum_id, auth_option_id, auth_setting) $sql"; - $db->sql_query($sql); - } - break; - - case 'update': - case 'delete': - foreach ($sql_subary as $sql) - { - $db->sql_query($sql); - $sql = ''; - } - break; - } - unset($sql_ary[$sql_type]); - } - unset($sql_ary); - -} - -/** -* Update the count of unread private messages for all users -*/ -function update_unread_count() -{ - global $db; - - $sql = 'SELECT user_id, COUNT(msg_id) as num_messages - FROM ' . PRIVMSGS_TO_TABLE . ' - WHERE pm_unread = 1 - AND folder_id <> ' . PRIVMSGS_OUTBOX . ' - GROUP BY user_id'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_unread_privmsg = ' . $row['num_messages'] . ' - WHERE user_id = ' . $row['user_id']); - } - $db->sql_freeresult($result); -} - -/** -* Add any of the pre-defined "special" groups which are missing from the database -*/ -function add_default_groups() -{ - global $db; - - $default_groups = array( - 'GUESTS' => array('', 0, 0), - 'REGISTERED' => array('', 0, 0), - 'REGISTERED_COPPA' => array('', 0, 0), - 'GLOBAL_MODERATORS' => array('00AA00', 1, 0), - 'ADMINISTRATORS' => array('AA0000', 1, 1), - 'BOTS' => array('9E8DA7', 0, 0) - ); - - $sql = 'SELECT * - FROM ' . GROUPS_TABLE . ' - WHERE ' . $db->sql_in_set('group_name_clean', array_map('utf8_clean_string', array_keys($default_groups))); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - unset($default_groups[strtoupper($row['group_name'])]); - } - $db->sql_freeresult($result); - - $sql_ary = array(); - - foreach ($default_groups as $name => $data) - { - $sql_ary[] = array( - 'group_name' => (string) $name, - 'group_name_clean' => (string) utf8_clean_string($name), - 'group_desc' => '', - 'group_desc_uid' => '', - 'group_desc_bitfield' => '', - 'group_type' => GROUP_SPECIAL, - 'group_colour' => (string) $data[0], - 'group_legend' => (int) $data[1], - 'group_founder_manage' => (int) $data[2] - ); - } - - if (sizeof($sql_ary)) - { - $db->sql_multi_insert(GROUPS_TABLE, $sql_ary); - } -} - - -/** -* Sync post count. We might need to do this in batches. -*/ -function sync_post_count($offset, $limit) -{ - global $db; - $sql = 'SELECT COUNT(post_id) AS num_posts, poster_id - FROM ' . POSTS_TABLE . ' - WHERE post_postcount = 1 - GROUP BY poster_id - ORDER BY poster_id'; - $result = $db->sql_query_limit($sql, $limit, $offset); - - while ($row = $db->sql_fetchrow($result)) - { - $db->sql_query('UPDATE ' . USERS_TABLE . " SET user_posts = {$row['num_posts']} WHERE user_id = {$row['poster_id']}"); - } - $db->sql_freeresult($result); -} - -/** -* Add the search bots into the database -* This code should be used in execute_last if the source database did not have bots -* If you are converting bots this function should not be called -* @todo We might want to look at sharing the bot list between the install code and this code for consistancy -*/ -function add_bots() -{ - global $db, $convert, $user, $config, $phpbb_root_path, $phpEx; - - $db->sql_query($convert->truncate_statement . BOTS_TABLE); - - $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name_clean = 'bots'"; - $result = $db->sql_query($sql); - $group_id = (int) $db->sql_fetchfield('group_id', $result); - $db->sql_freeresult($result); - - if (!$group_id) - { - add_default_groups(); - - $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name_clean = 'bots'"; - $result = $db->sql_query($sql); - $group_id = (int) $db->sql_fetchfield('group_id', $result); - $db->sql_freeresult($result); - - if (!$group_id) - { - global $install; - $install->error($user->lang['CONV_ERROR_INCONSISTENT_GROUPS'], __LINE__, __FILE__); - } - } - - $bots = array( - 'AdsBot [Google]' => array('AdsBot-Google', ''), - 'Alexa [Bot]' => array('ia_archiver', ''), - 'Alta Vista [Bot]' => array('Scooter/', ''), - 'Ask Jeeves [Bot]' => array('Ask Jeeves', ''), - 'Baidu [Spider]' => array('Baiduspider+(', ''), - 'Exabot [Bot]' => array('Exabot/', ''), - 'FAST Enterprise [Crawler]' => array('FAST Enterprise Crawler', ''), - 'FAST WebCrawler [Crawler]' => array('FAST-WebCrawler/', ''), - 'Francis [Bot]' => array('http://www.neomo.de/', ''), - 'Gigabot [Bot]' => array('Gigabot/', ''), - 'Google Adsense [Bot]' => array('Mediapartners-Google', ''), - 'Google Desktop' => array('Google Desktop', ''), - 'Google Feedfetcher' => array('Feedfetcher-Google', ''), - 'Google [Bot]' => array('Googlebot', ''), - 'Heise IT-Markt [Crawler]' => array('heise-IT-Markt-Crawler', ''), - 'Heritrix [Crawler]' => array('heritrix/1.', ''), - 'IBM Research [Bot]' => array('ibm.com/cs/crawler', ''), - 'ICCrawler - ICjobs' => array('ICCrawler - ICjobs', ''), - 'ichiro [Crawler]' => array('ichiro/2', ''), - 'Majestic-12 [Bot]' => array('MJ12bot/', ''), - 'Metager [Bot]' => array('MetagerBot/', ''), - 'MSN NewsBlogs' => array('msnbot-NewsBlogs/', ''), - 'MSN [Bot]' => array('msnbot/', ''), - 'MSNbot Media' => array('msnbot-media/', ''), - 'NG-Search [Bot]' => array('NG-Search/', ''), - 'Nutch [Bot]' => array('http://lucene.apache.org/nutch/', ''), - 'Nutch/CVS [Bot]' => array('NutchCVS/', ''), - 'OmniExplorer [Bot]' => array('OmniExplorer_Bot/', ''), - 'Online link [Validator]' => array('online link validator', ''), - 'psbot [Picsearch]' => array('psbot/0', ''), - 'Seekport [Bot]' => array('Seekbot/', ''), - 'Sensis [Crawler]' => array('Sensis Web Crawler', ''), - 'SEO Crawler' => array('SEO search Crawler/', ''), - 'Seoma [Crawler]' => array('Seoma [SEO Crawler]', ''), - 'SEOSearch [Crawler]' => array('SEOsearch/', ''), - 'Snappy [Bot]' => array('Snappy/1.1 ( http://www.urltrends.com/ )', ''), - 'Steeler [Crawler]' => array('http://www.tkl.iis.u-tokyo.ac.jp/~crawler/', ''), - 'Synoo [Bot]' => array('SynooBot/', ''), - 'Telekom [Bot]' => array('crawleradmin.t-info@telekom.de', ''), - 'TurnitinBot [Bot]' => array('TurnitinBot/', ''), - 'Voyager [Bot]' => array('voyager/1.0', ''), - 'W3 [Sitesearch]' => array('W3 SiteSearch Crawler', ''), - 'W3C [Linkcheck]' => array('W3C-checklink/', ''), - 'W3C [Validator]' => array('W3C_*Validator', ''), - 'WiseNut [Bot]' => array('http://www.WISEnutbot.com', ''), - 'YaCy [Bot]' => array('yacybot', ''), - 'Yahoo MMCrawler [Bot]' => array('Yahoo-MMCrawler/', ''), - 'Yahoo Slurp [Bot]' => array('Yahoo! DE Slurp', ''), - 'Yahoo [Bot]' => array('Yahoo! Slurp', ''), - 'YahooSeeker [Bot]' => array('YahooSeeker/', ''), - ); - - if (!function_exists('user_add')) - { - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - } - - foreach ($bots as $bot_name => $bot_ary) - { - $user_row = array( - 'user_type' => USER_IGNORE, - 'group_id' => $group_id, - 'username' => $bot_name, - 'user_regdate' => time(), - 'user_password' => '', - 'user_colour' => '9E8DA7', - 'user_email' => '', - 'user_lang' => $config['default_lang'], - 'user_style' => 1, - 'user_timezone' => 0, - 'user_allow_massemail' => 0, - ); - - $user_id = user_add($user_row); - - if ($user_id) - { - $sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'bot_active' => 1, - 'bot_name' => $bot_name, - 'user_id' => $user_id, - 'bot_agent' => $bot_ary[0], - 'bot_ip' => $bot_ary[1]) - ); - $db->sql_query($sql); - } - } -} - -/** -* Update any dynamic configuration variables after the conversion is finished -* @todo Confirm that this updates all relevant values since it has not necessarily been kept in sync with all changes -*/ -function update_dynamic_config() -{ - global $db, $config; - - // Get latest username - $sql = 'SELECT user_id, username, user_colour - FROM ' . USERS_TABLE . ' - WHERE user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')'; - - if (!empty($config['increment_user_id'])) - { - $sql .= ' AND user_id <> ' . $config['increment_user_id']; - } - - $sql .= ' ORDER BY user_id DESC'; - - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - set_config('newest_user_id', $row['user_id'], true); - set_config('newest_username', $row['username'], true); - set_config('newest_user_colour', $row['user_colour'], true); - } - -// Also do not reset record online user/date. There will be old data or the fresh data from the schema. -// set_config('record_online_users', 1, true); -// set_config('record_online_date', time(), true); - - $sql = 'SELECT COUNT(post_id) AS stat - FROM ' . POSTS_TABLE . ' - WHERE post_approved = 1'; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - set_config('num_posts', (int) $row['stat'], true); - - $sql = 'SELECT COUNT(topic_id) AS stat - FROM ' . TOPICS_TABLE . ' - WHERE topic_approved = 1'; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - set_config('num_topics', (int) $row['stat'], true); - - $sql = 'SELECT COUNT(user_id) AS stat - FROM ' . USERS_TABLE . ' - WHERE user_type IN (' . USER_NORMAL . ',' . USER_FOUNDER . ')'; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - set_config('num_users', (int) $row['stat'], true); - - $sql = 'SELECT COUNT(attach_id) as stat - FROM ' . ATTACHMENTS_TABLE . ' - WHERE is_orphan = 0'; - $result = $db->sql_query($sql); - set_config('num_files', (int) $db->sql_fetchfield('stat'), true); - $db->sql_freeresult($result); - - $sql = 'SELECT SUM(filesize) as stat - FROM ' . ATTACHMENTS_TABLE . ' - WHERE is_orphan = 0'; - $result = $db->sql_query($sql); - set_config('upload_dir_size', (int) $db->sql_fetchfield('stat'), true); - $db->sql_freeresult($result); - - /** - * We do not resync users post counts - this can be done by the admin after conversion if wanted. - $sql = 'SELECT COUNT(post_id) AS num_posts, poster_id - FROM ' . POSTS_TABLE . ' - WHERE post_postcount = 1 - GROUP BY poster_id'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $db->sql_query('UPDATE ' . USERS_TABLE . " SET user_posts = {$row['num_posts']} WHERE user_id = {$row['poster_id']}"); - } - $db->sql_freeresult($result); - */ -} - -/** -* Updates topics_posted entries -*/ -function update_topics_posted() -{ - global $db, $config; - - if ($db->truncate) - { - $db->sql_query('DELETE FROM ' . TOPICS_POSTED_TABLE); - } - else - { - $db->sql_query('TRUNCATE TABLE ' . TOPICS_POSTED_TABLE); - } - - // This can get really nasty... therefore we only do the last six months - $get_from_time = time() - (6 * 4 * 7 * 24 * 60 * 60); - - // Select forum ids, do not include categories - $sql = 'SELECT forum_id - FROM ' . FORUMS_TABLE . ' - WHERE forum_type <> ' . FORUM_CAT; - $result = $db->sql_query($sql); - - $forum_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $forum_ids[] = $row['forum_id']; - } - $db->sql_freeresult($result); - - // Any global announcements? ;) - $forum_ids[] = 0; - - // Now go through the forums and get us some topics... - foreach ($forum_ids as $forum_id) - { - $sql = 'SELECT p.poster_id, p.topic_id - FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t - WHERE t.forum_id = ' . $forum_id . ' - AND t.topic_moved_id = 0 - AND t.topic_last_post_time > ' . $get_from_time . ' - AND t.topic_id = p.topic_id - AND p.poster_id <> ' . ANONYMOUS . ' - GROUP BY p.poster_id, p.topic_id'; - $result = $db->sql_query($sql); - - $posted = array(); - while ($row = $db->sql_fetchrow($result)) - { - $posted[$row['poster_id']][] = $row['topic_id']; - } - $db->sql_freeresult($result); - - $sql_ary = array(); - foreach ($posted as $user_id => $topic_row) - { - foreach ($topic_row as $topic_id) - { - $sql_ary[] = array( - 'user_id' => (int) $user_id, - 'topic_id' => (int) $topic_id, - 'topic_posted' => 1, - ); - } - } - unset($posted); - - if (sizeof($sql_ary)) - { - $db->sql_multi_insert(TOPICS_POSTED_TABLE, $sql_ary); - } - } -} - -/** -* Ensure that all users have a default group specified and update related information such as their colour -*/ -function fix_empty_primary_groups() -{ - global $db; - - // Set group ids for users not already having it - $sql = 'UPDATE ' . USERS_TABLE . ' SET group_id = ' . get_group_id('registered') . ' - WHERE group_id = 0 AND user_type = ' . USER_INACTIVE; - $db->sql_query($sql); - - $sql = 'UPDATE ' . USERS_TABLE . ' SET group_id = ' . get_group_id('registered') . ' - WHERE group_id = 0 AND user_type = ' . USER_NORMAL; - $db->sql_query($sql); - - $db->sql_query('UPDATE ' . USERS_TABLE . ' SET group_id = ' . get_group_id('guests') . ' WHERE user_id = ' . ANONYMOUS); - - $sql = 'SELECT user_id FROM ' . USER_GROUP_TABLE . ' WHERE group_id = ' . get_group_id('administrators'); - $result = $db->sql_query($sql); - - $user_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $user_ids[] = $row['user_id']; - } - $db->sql_freeresult($result); - - if (sizeof($user_ids)) - { - $db->sql_query('UPDATE ' . USERS_TABLE . ' SET group_id = ' . get_group_id('administrators') . ' - WHERE group_id = 0 AND ' . $db->sql_in_set('user_id', $user_ids)); - } - - $sql = 'SELECT user_id FROM ' . USER_GROUP_TABLE . ' WHERE group_id = ' . get_group_id('global_moderators'); - - $user_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $user_ids[] = $row['user_id']; - } - $db->sql_freeresult($result); - - if (sizeof($user_ids)) - { - $db->sql_query('UPDATE ' . USERS_TABLE . ' SET group_id = ' . get_group_id('global_moderators') . ' - WHERE group_id = 0 AND ' . $db->sql_in_set('user_id', $user_ids)); - } - - // Set user colour - $sql = 'SELECT group_id, group_colour FROM ' . GROUPS_TABLE . " - WHERE group_colour <> ''"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $db->sql_query('UPDATE ' . USERS_TABLE . " SET user_colour = '{$row['group_colour']}' WHERE group_id = {$row['group_id']}"); - } - $db->sql_freeresult($result); -} - -/** -* Cleanly remove invalid user entries after converting the users table... -*/ -function remove_invalid_users() -{ - global $convert, $db, $phpEx, $phpbb_root_path; - - // username_clean is UNIQUE - $sql = 'SELECT user_id - FROM ' . USERS_TABLE . " - WHERE username_clean = ''"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - if (!function_exists('user_delete')) - { - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - } - - user_delete('remove', $row['user_id']); - } -} - -function convert_bbcode($message, $convert_size = true, $extended_bbcodes = false) -{ - static $orig, $repl, $origx, $replx, $str_from, $str_to; - - if (empty($orig)) - { - $orig = $repl = array(); - - $orig[] = '#\[(php|sql)\](.*?)\[/(php|sql)\]#is'; - $repl[] = '[code]\2[/code]'; - - $orig[] = '#\[font=[^\]]+\](.*?)\[/font\]#is'; - $repl[] = '\1'; - - $orig[] = '#\[align=[a-z]+\](.*?)\[/align\]#is'; - $repl[] = '\1'; - - $orig[] = '#\[/list=.*?\]#is'; - $repl[] = '[/list]'; - - $origx = array( - '#\[glow[^\]]+\](.*?)\[/glow\]#is', - '#\[shadow[^\]]+\](.*?)\[/shadow\]#is', - '#\[flash[^\]]+\](.*?)\[/flash\]#is' - ); - - $replx = array( - '\1', - '\1', - '[url=\1]Flash[/url]' - ); - - $str_from = array( - '[ftp]', '[/ftp]', - '[ftp=', '[/ftp]', - '[pre]', '[/pre]', - '[table]', '[/table]', - '[td]', '[/td]', - '[tr]', '[/tr]', - '[s]', '[/s]', - '[left]', '[/left]', - '[right]', '[/right]', - '[center]', '[/center]', - '[sub]', '[/sub]', - '[sup]', '[/sup]', - '[tt]', '[/tt]', - '[move]', '[/move]', - '[hr]' - ); - - $str_to = array( - '[url]', '[/url]', - '[url=', '[/url]', - '[code]', '[/code]', - "\n", '', - '', '', - "\n", '', - '', '', - '', '', - '', '', - '', '', - '', '', - '', '', - '', '', - '', '', - "\n\n" - ); - - for ($i = 0; $i < sizeof($str_from); ++$i) - { - $origx[] = '#\\' . str_replace(']', '\\]', $str_from[$i]) . '#is'; - $replx[] = $str_to[$i]; - } - } - - if (preg_match_all('#\[email=([^\]]+)\](.*?)\[/email\]#i', $message, $m)) - { - for ($i = 0; $i < sizeof($m[1]); ++$i) - { - if ($m[1][$i] == $m[2][$i]) - { - $message = str_replace($m[0][$i], '[email]' . $m[1][$i] . '[/email]', $message); - } - else - { - $message = str_replace($m[0][$i], $m[2][$i] . ' ([email]' . $m[1][$i] . '[/email])', $message); - } - } - } - - if ($convert_size && preg_match('#\[size=[0-9]+\].*?\[/size\]#i', $message)) - { - $size = array(9, 9, 12, 15, 18, 24, 29, 29, 29, 29); - $message = preg_replace('#\[size=([0-9]+)\](.*?)\[/size\]#i', '[size=\1]\2[/size]', $message); - $message = preg_replace('#\[size=[0-9]{2,}\](.*?)\[/size\]#i', '[size=29]\1[/size]', $message); - - for ($i = sizeof($size); $i; ) - { - $i--; - $message = str_replace('[size=' . $i . ']', '[size=' . $size[$i] . ']', $message); - } - } - - if ($extended_bbcodes) - { - $message = preg_replace($origx, $replx, $message); - } - - $message = preg_replace($orig, $repl, $message); - return $message; -} - - -function copy_file($src, $trg, $overwrite = false, $die_on_failure = true, $source_relative_path = true) -{ - global $convert, $phpbb_root_path, $config, $user, $db; - - if (substr($trg, -1) == '/') - { - $trg .= basename($src); - } - $src_path = relative_base($src, $source_relative_path, __LINE__, __FILE__); - $trg_path = $trg; - - if (!$overwrite && @file_exists($trg_path)) - { - return true; - } - - if (!@file_exists($src_path)) - { - return; - } - - $path = $phpbb_root_path; - $parts = explode('/', $trg); - unset($parts[sizeof($parts) - 1]); - - for ($i = 0; $i < sizeof($parts); ++$i) - { - $path .= $parts[$i] . '/'; - - if (!is_dir($path)) - { - @mkdir($path, 0777); - } - } - - if (!is_writable($path)) - { - @chmod($path, 0777); - } - - if (!@copy($src_path, $phpbb_root_path . $trg_path)) - { - $convert->p_master->error(sprintf($user->lang['COULD_NOT_COPY'], $src_path, $phpbb_root_path . $trg_path), __LINE__, __FILE__, !$die_on_failure); - return; - } - - if ($perm = @fileperms($src_path)) - { - @chmod($phpbb_root_path . $trg_path, $perm); - } - - return true; -} - -function copy_dir($src, $trg, $copy_subdirs = true, $overwrite = false, $die_on_failure = true, $source_relative_path = true) -{ - global $convert, $phpbb_root_path, $config, $user, $db; - - $dirlist = $filelist = $bad_dirs = array(); - $src = path($src, $source_relative_path); - $trg = path($trg); - $src_path = relative_base($src, $source_relative_path, __LINE__, __FILE__); - $trg_path = $phpbb_root_path . $trg; - - if (!is_dir($trg_path)) - { - @mkdir($trg_path, 0777); - @chmod($trg_path, 0777); - } - - if (!@is_writable($trg_path)) - { - $bad_dirs[] = path($config['script_path']) . $trg; - } - - if ($handle = @opendir($src_path)) - { - while ($entry = readdir($handle)) - { - if ($entry[0] == '.' || $entry == 'CVS' || $entry == 'index.htm') - { - continue; - } - - if (is_dir($src_path . $entry)) - { - $dirlist[] = $entry; - } - else - { - $filelist[] = $entry; - } - } - closedir($handle); - } - else if ($dir = @dir($src_path)) - { - while ($entry = $dir->read()) - { - if ($entry[0] == '.' || $entry == 'CVS' || $entry == 'index.htm') - { - continue; - } - - if (is_dir($src_path . $entry)) - { - $dirlist[] = $entry; - } - else - { - $filelist[] = $entry; - } - } - $dir->close(); - } - else - { - $convert->p_master->error(sprintf($user->lang['CONV_ERROR_COULD_NOT_READ'], relative_base($src, $source_relative_path)), __LINE__, __FILE__); - } - - if ($copy_subdirs) - { - for ($i = 0; $i < sizeof($dirlist); ++$i) - { - $dir = $dirlist[$i]; - - if ($dir == 'CVS') - { - continue; - } - - if (!is_dir($trg_path . $dir)) - { - @mkdir($trg_path . $dir, 0777); - @chmod($trg_path . $dir, 0777); - } - - if (!@is_writable($trg_path . $dir)) - { - $bad_dirs[] = $trg . $dir; - $bad_dirs[] = $trg_path . $dir; - } - - if (!sizeof($bad_dirs)) - { - copy_dir($src . $dir, $trg . $dir, true, $overwrite, $die_on_failure, $source_relative_path); - } - } - } - - if (sizeof($bad_dirs)) - { - $str = (sizeof($bad_dirs) == 1) ? $user->lang['MAKE_FOLDER_WRITABLE'] : $user->lang['MAKE_FOLDERS_WRITABLE']; - sort($bad_dirs); - $convert->p_master->error(sprintf($str, implode('
    ', $bad_dirs)), __LINE__, __FILE__); - } - - for ($i = 0; $i < sizeof($filelist); ++$i) - { - copy_file($src . $filelist[$i], $trg . $filelist[$i], $overwrite, $die_on_failure, $source_relative_path); - } -} - -function relative_base($path, $is_relative = true, $line = false, $file = false) -{ - global $convert, $phpbb_root_path, $config, $user, $db; - - if (!$is_relative) - { - return $path; - } - - if (empty($convert->options['forum_path']) && $is_relative) - { - $line = $line ? $line : __LINE__; - $file = $file ? $file : __FILE__; - - $convert->p_master->error($user->lang['CONV_ERROR_NO_FORUM_PATH'], $line, $file); - } - - return $convert->options['forum_path'] . '/' . $path; -} - -function get_smiley_display() -{ - static $smiley_count = 0; - $smiley_count++; - return ($smiley_count < 50) ? 1 : 0; -} - - -function fill_dateformat($user_dateformat) -{ - global $config; - - return ((empty($user_dateformat)) ? $config['default_dateformat'] : $user_dateformat); -} - - - -?> \ No newline at end of file diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php deleted file mode 100644 index e7971b3398..0000000000 --- a/phpBB/includes/functions_display.php +++ /dev/null @@ -1,1175 +0,0 @@ - 0); - $sql_where = ''; - } - else - { - $sql_where = 'left_id > ' . $root_data['left_id'] . ' AND left_id < ' . $root_data['right_id']; - } - - // Display list of active topics for this category? - $show_active = (isset($root_data['forum_flags']) && ($root_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS)) ? true : false; - - $sql_array = array( - 'SELECT' => 'f.*', - 'FROM' => array( - FORUMS_TABLE => 'f' - ), - 'LEFT_JOIN' => array(), - ); - - if ($config['load_db_lastread'] && $user->data['is_registered']) - { - $sql_array['LEFT_JOIN'][] = array('FROM' => array(FORUMS_TRACK_TABLE => 'ft'), 'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id'); - $sql_array['SELECT'] .= ', ft.mark_time'; - } - else if ($config['load_anon_lastread'] || $user->data['is_registered']) - { - $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_track'])) ? ((STRIP) ? stripslashes($_COOKIE[$config['cookie_name'] . '_track']) : $_COOKIE[$config['cookie_name'] . '_track']) : ''; - $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array(); - - if (!$user->data['is_registered']) - { - $user->data['user_lastmark'] = (isset($tracking_topics['l'])) ? (int) (base_convert($tracking_topics['l'], 36, 10) + $config['board_startdate']) : 0; - } - } - - if ($show_active) - { - $sql_array['LEFT_JOIN'][] = array( - 'FROM' => array(FORUMS_ACCESS_TABLE => 'fa'), - 'ON' => "fa.forum_id = f.forum_id AND fa.session_id = '" . $db->sql_escape($user->session_id) . "'" - ); - - $sql_array['SELECT'] .= ', fa.user_id'; - } - - $sql = $db->sql_build_query('SELECT', array( - 'SELECT' => $sql_array['SELECT'], - 'FROM' => $sql_array['FROM'], - 'LEFT_JOIN' => $sql_array['LEFT_JOIN'], - - 'WHERE' => $sql_where, - - 'ORDER_BY' => 'f.left_id', - )); - - $result = $db->sql_query($sql); - - $forum_tracking_info = array(); - $branch_root_id = $root_data['forum_id']; - while ($row = $db->sql_fetchrow($result)) - { - $forum_id = $row['forum_id']; - - // Mark forums read? - if ($mark_read == 'forums' || $mark_read == 'all') - { - if ($auth->acl_get('f_list', $forum_id)) - { - $forum_ids[] = $forum_id; - continue; - } - } - - // Category with no members - if ($row['forum_type'] == FORUM_CAT && ($row['left_id'] + 1 == $row['right_id'])) - { - continue; - } - - // Skip branch - if (isset($right_id)) - { - if ($row['left_id'] < $right_id) - { - continue; - } - unset($right_id); - } - - if (!$auth->acl_get('f_list', $forum_id)) - { - // if the user does not have permissions to list this forum, skip everything until next branch - $right_id = $row['right_id']; - continue; - } - - $forum_ids[] = $forum_id; - - if ($config['load_db_lastread'] && $user->data['is_registered']) - { - $forum_tracking_info[$forum_id] = (!empty($row['mark_time'])) ? $row['mark_time'] : $user->data['user_lastmark']; - } - else if ($config['load_anon_lastread'] || $user->data['is_registered']) - { - if (!$user->data['is_registered']) - { - $user->data['user_lastmark'] = (isset($tracking_topics['l'])) ? (int) (base_convert($tracking_topics['l'], 36, 10) + $config['board_startdate']) : 0; - } - $forum_tracking_info[$forum_id] = (isset($tracking_topics['f'][$forum_id])) ? (int) (base_convert($tracking_topics['f'][$forum_id], 36, 10) + $config['board_startdate']) : $user->data['user_lastmark']; - } - - $row['forum_topics'] = ($auth->acl_get('m_approve', $forum_id)) ? $row['forum_topics_real'] : $row['forum_topics']; - - // Display active topics from this forum? - if ($show_active && $row['forum_type'] == FORUM_POST && $auth->acl_get('f_read', $forum_id) && ($row['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS)) - { - if (!isset($active_forum_ary['forum_topics'])) - { - $active_forum_ary['forum_topics'] = 0; - } - - if (!isset($active_forum_ary['forum_posts'])) - { - $active_forum_ary['forum_posts'] = 0; - } - - $active_forum_ary['forum_id'][] = $forum_id; - $active_forum_ary['enable_icons'][] = $row['enable_icons']; - $active_forum_ary['forum_topics'] += $row['forum_topics']; - $active_forum_ary['forum_posts'] += $row['forum_posts']; - - // If this is a passworded forum we do not show active topics from it if the user is not authorised to view it... - if ($row['forum_password'] && $row['user_id'] != $user->data['user_id']) - { - $active_forum_ary['exclude_forum_id'][] = $forum_id; - } - } - - // - if ($row['parent_id'] == $root_data['forum_id'] || $row['parent_id'] == $branch_root_id) - { - if ($row['forum_type'] != FORUM_CAT) - { - $forum_ids_moderator[] = (int) $forum_id; - } - - // Direct child of current branch - $parent_id = $forum_id; - $forum_rows[$forum_id] = $row; - - if ($row['forum_type'] == FORUM_CAT && $row['parent_id'] == $root_data['forum_id']) - { - $branch_root_id = $forum_id; - } - $forum_rows[$parent_id]['forum_id_last_post'] = $row['forum_id']; - $forum_rows[$parent_id]['orig_forum_last_post_time'] = $row['forum_last_post_time']; - } - else if ($row['forum_type'] != FORUM_CAT) - { - $subforums[$parent_id][$forum_id]['display'] = ($row['display_on_index']) ? true : false; - $subforums[$parent_id][$forum_id]['name'] = $row['forum_name']; - $subforums[$parent_id][$forum_id]['orig_forum_last_post_time'] = $row['forum_last_post_time']; - - $forum_rows[$parent_id]['forum_topics'] += $row['forum_topics']; - - // Do not list redirects in LINK Forums as Posts. - if ($row['forum_type'] != FORUM_LINK) - { - $forum_rows[$parent_id]['forum_posts'] += $row['forum_posts']; - } - - if ($row['forum_last_post_time'] > $forum_rows[$parent_id]['forum_last_post_time']) - { - $forum_rows[$parent_id]['forum_last_post_id'] = $row['forum_last_post_id']; - $forum_rows[$parent_id]['forum_last_post_subject'] = $row['forum_last_post_subject']; - $forum_rows[$parent_id]['forum_last_post_time'] = $row['forum_last_post_time']; - $forum_rows[$parent_id]['forum_last_poster_id'] = $row['forum_last_poster_id']; - $forum_rows[$parent_id]['forum_last_poster_name'] = $row['forum_last_poster_name']; - $forum_rows[$parent_id]['forum_last_poster_colour'] = $row['forum_last_poster_colour']; - $forum_rows[$parent_id]['forum_id_last_post'] = $forum_id; - } - } - } - $db->sql_freeresult($result); - - // Handle marking posts - if ($mark_read == 'forums' || $mark_read == 'all') - { - $redirect = build_url('mark'); - - if ($mark_read == 'all') - { - markread('all'); - - $message = sprintf($user->lang['RETURN_INDEX'], '', ''); - } - else - { - markread('topics', $forum_ids); - - $message = sprintf($user->lang['RETURN_FORUM'], '', ''); - } - - meta_refresh(3, $redirect); - trigger_error($user->lang['FORUMS_MARKED'] . '

    ' . $message); - } - - // Grab moderators ... if necessary - if ($display_moderators) - { - if ($return_moderators) - { - $forum_ids_moderator[] = $root_data['forum_id']; - } - get_moderators($forum_moderators, $forum_ids_moderator); - } - - // Used to tell whatever we have to create a dummy category or not. - $last_catless = true; - foreach ($forum_rows as $row) - { - // Empty category - if ($row['parent_id'] == $root_data['forum_id'] && $row['forum_type'] == FORUM_CAT) - { - $template->assign_block_vars('forumrow', array( - 'S_IS_CAT' => true, - 'FORUM_ID' => $row['forum_id'], - 'FORUM_NAME' => $row['forum_name'], - 'FORUM_DESC' => generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']), - 'FORUM_FOLDER_IMG' => '', - 'FORUM_FOLDER_IMG_SRC' => '', - 'FORUM_IMAGE' => ($row['forum_image']) ? '' . $user->lang['FORUM_CAT'] . '' : '', - 'FORUM_IMAGE_SRC' => ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '', - 'U_VIEWFORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id'])) - ); - - continue; - } - - $visible_forums++; - $forum_id = $row['forum_id']; - - $forum_unread = (isset($forum_tracking_info[$forum_id]) && $row['orig_forum_last_post_time'] > $forum_tracking_info[$forum_id]) ? true : false; - - $folder_image = $folder_alt = $l_subforums = ''; - $subforums_list = array(); - - // Generate list of subforums if we need to - if (isset($subforums[$forum_id])) - { - foreach ($subforums[$forum_id] as $subforum_id => $subforum_row) - { - $subforum_unread = (isset($forum_tracking_info[$subforum_id]) && $subforum_row['orig_forum_last_post_time'] > $forum_tracking_info[$subforum_id]) ? true : false; - - if ($subforum_row['display'] && $subforum_row['name']) - { - $subforums_list[] = array( - 'link' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $subforum_id), - 'name' => $subforum_row['name'], - 'unread' => $subforum_unread, - ); - } - else - { - unset($subforums[$forum_id][$subforum_id]); - } - - // If one subforum is unread the forum gets unread too... - if ($subforum_unread) - { - $forum_unread = true; - } - } - - $l_subforums = (sizeof($subforums[$forum_id]) == 1) ? $user->lang['SUBFORUM'] . ': ' : $user->lang['SUBFORUMS'] . ': '; - $folder_image = ($forum_unread) ? 'forum_unread_subforum' : 'forum_read_subforum'; - } - else - { - switch ($row['forum_type']) - { - case FORUM_POST: - $folder_image = ($forum_unread) ? 'forum_unread' : 'forum_read'; - break; - - case FORUM_LINK: - $folder_image = 'forum_link'; - break; - } - } - - // Which folder should we display? - if ($row['forum_status'] == ITEM_LOCKED) - { - $folder_image = ($forum_unread) ? 'forum_unread_locked' : 'forum_read_locked'; - $folder_alt = 'FORUM_LOCKED'; - } - else - { - $folder_alt = ($forum_unread) ? 'NEW_POSTS' : 'NO_NEW_POSTS'; - } - - // Create last post link information, if appropriate - if ($row['forum_last_post_id']) - { - $last_post_subject = $row['forum_last_post_subject']; - $last_post_time = $user->format_date($row['forum_last_post_time']); - $last_post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id_last_post'] . '&p=' . $row['forum_last_post_id']) . '#p' . $row['forum_last_post_id']; - } - else - { - $last_post_subject = $last_post_time = $last_post_url = ''; - } - - // Output moderator listing ... if applicable - $l_moderator = $moderators_list = ''; - if ($display_moderators && !empty($forum_moderators[$forum_id])) - { - $l_moderator = (sizeof($forum_moderators[$forum_id]) == 1) ? $user->lang['MODERATOR'] : $user->lang['MODERATORS']; - $moderators_list = implode(', ', $forum_moderators[$forum_id]); - } - - $l_post_click_count = ($row['forum_type'] == FORUM_LINK) ? 'CLICKS' : 'POSTS'; - $post_click_count = ($row['forum_type'] != FORUM_LINK || $row['forum_flags'] & FORUM_FLAG_LINK_TRACK) ? $row['forum_posts'] : ''; - - $s_subforums_list = array(); - foreach ($subforums_list as $subforum) - { - $s_subforums_list[] = '' . $subforum['name'] . ''; - } - $s_subforums_list = (string) implode(', ', $s_subforums_list); - $catless = ($row['parent_id'] == $root_data['forum_id']) ? true : false; - - if ($row['forum_type'] != FORUM_LINK) - { - $u_viewforum = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']); - } - else - { - // If the forum is a link and we count redirects we need to visit it - // If the forum is having a password or no read access we do not expose the link, but instead handle it in viewforum - if (($row['forum_flags'] & FORUM_FLAG_LINK_TRACK) || $row['forum_password'] || !$auth->acl_get('f_read', $forum_id)) - { - $u_viewforum = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']); - } - else - { - $u_viewforum = $row['forum_link']; - } - } - - $template->assign_block_vars('forumrow', array( - 'S_IS_CAT' => false, - 'S_NO_CAT' => $catless && !$last_catless, - 'S_IS_LINK' => ($row['forum_type'] == FORUM_LINK) ? true : false, - 'S_UNREAD_FORUM' => $forum_unread, - 'S_LOCKED_FORUM' => ($row['forum_status'] == ITEM_LOCKED) ? true : false, - 'S_LIST_SUBFORUMS' => ($row['display_subforum_list']) ? true : false, - 'S_SUBFORUMS' => (sizeof($subforums_list)) ? true : false, - - 'FORUM_ID' => $row['forum_id'], - 'FORUM_NAME' => $row['forum_name'], - 'FORUM_DESC' => generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']), - 'TOPICS' => $row['forum_topics'], - $l_post_click_count => $post_click_count, - 'FORUM_FOLDER_IMG' => $user->img($folder_image, $folder_alt), - 'FORUM_FOLDER_IMG_SRC' => $user->img($folder_image, $folder_alt, false, '', 'src'), - 'FORUM_FOLDER_IMG_ALT' => isset($user->lang[$folder_alt]) ? $user->lang[$folder_alt] : '', - 'FORUM_IMAGE' => ($row['forum_image']) ? '' . $user->lang[$folder_alt] . '' : '', - 'FORUM_IMAGE_SRC' => ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '', - 'LAST_POST_SUBJECT' => censor_text($last_post_subject), - 'LAST_POST_TIME' => $last_post_time, - 'LAST_POSTER' => get_username_string('username', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']), - 'LAST_POSTER_COLOUR' => get_username_string('colour', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']), - 'LAST_POSTER_FULL' => get_username_string('full', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']), - 'MODERATORS' => $moderators_list, - 'SUBFORUMS' => $s_subforums_list, - - 'L_SUBFORUM_STR' => $l_subforums, - 'L_FORUM_FOLDER_ALT' => $folder_alt, - 'L_MODERATOR_STR' => $l_moderator, - - 'U_VIEWFORUM' => $u_viewforum, - 'U_LAST_POSTER' => get_username_string('profile', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']), - 'U_LAST_POST' => $last_post_url) - ); - - // Assign subforums loop for style authors - foreach ($subforums_list as $subforum) - { - $template->assign_block_vars('forumrow.subforum', array( - 'U_SUBFORUM' => $subforum['link'], - 'SUBFORUM_NAME' => $subforum['name'], - 'S_UNREAD' => $subforum['unread']) - ); - } - - $last_catless = $catless; - } - - $template->assign_vars(array( - 'U_MARK_FORUMS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $root_data['forum_id'] . '&mark=forums') : '', - 'S_HAS_SUBFORUM' => ($visible_forums) ? true : false, - 'L_SUBFORUM' => ($visible_forums == 1) ? $user->lang['SUBFORUM'] : $user->lang['SUBFORUMS'], - 'LAST_POST_IMG' => $user->img('icon_topic_latest', 'VIEW_LATEST_POST')) - ); - - if ($return_moderators) - { - return array($active_forum_ary, $forum_moderators); - } - - return array($active_forum_ary, array()); -} - -/** -* Create forum rules for given forum -*/ -function generate_forum_rules(&$forum_data) -{ - if (!$forum_data['forum_rules'] && !$forum_data['forum_rules_link']) - { - return; - } - - global $template, $phpbb_root_path, $phpEx; - - if ($forum_data['forum_rules']) - { - $forum_data['forum_rules'] = generate_text_for_display($forum_data['forum_rules'], $forum_data['forum_rules_uid'], $forum_data['forum_rules_bitfield'], $forum_data['forum_rules_options']); - } - - $template->assign_vars(array( - 'S_FORUM_RULES' => true, - 'U_FORUM_RULES' => $forum_data['forum_rules_link'], - 'FORUM_RULES' => $forum_data['forum_rules']) - ); -} - -/** -* Create forum navigation links for given forum, create parent -* list if currently null, assign basic forum info to template -*/ -function generate_forum_nav(&$forum_data) -{ - global $db, $user, $template, $auth; - global $phpEx, $phpbb_root_path; - - if (!$auth->acl_get('f_list', $forum_data['forum_id'])) - { - return; - } - - // Get forum parents - $forum_parents = get_forum_parents($forum_data); - - // Build navigation links - if (!empty($forum_parents)) - { - foreach ($forum_parents as $parent_forum_id => $parent_data) - { - list($parent_name, $parent_type) = array_values($parent_data); - - // Skip this parent if the user does not have the permission to view it - if (!$auth->acl_get('f_list', $parent_forum_id)) - { - continue; - } - - $template->assign_block_vars('navlinks', array( - 'S_IS_CAT' => ($parent_type == FORUM_CAT) ? true : false, - 'S_IS_LINK' => ($parent_type == FORUM_LINK) ? true : false, - 'S_IS_POST' => ($parent_type == FORUM_POST) ? true : false, - 'FORUM_NAME' => $parent_name, - 'FORUM_ID' => $parent_forum_id, - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $parent_forum_id)) - ); - } - } - - $template->assign_block_vars('navlinks', array( - 'S_IS_CAT' => ($forum_data['forum_type'] == FORUM_CAT) ? true : false, - 'S_IS_LINK' => ($forum_data['forum_type'] == FORUM_LINK) ? true : false, - 'S_IS_POST' => ($forum_data['forum_type'] == FORUM_POST) ? true : false, - 'FORUM_NAME' => $forum_data['forum_name'], - 'FORUM_ID' => $forum_data['forum_id'], - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_data['forum_id'])) - ); - - $template->assign_vars(array( - 'FORUM_ID' => $forum_data['forum_id'], - 'FORUM_NAME' => $forum_data['forum_name'], - 'FORUM_DESC' => generate_text_for_display($forum_data['forum_desc'], $forum_data['forum_desc_uid'], $forum_data['forum_desc_bitfield'], $forum_data['forum_desc_options'])) - ); - - return; -} - -/** -* Returns forum parents as an array. Get them from forum_data if available, or update the database otherwise -*/ -function get_forum_parents(&$forum_data) -{ - global $db; - - $forum_parents = array(); - - if ($forum_data['parent_id'] > 0) - { - if ($forum_data['forum_parents'] == '') - { - $sql = 'SELECT forum_id, forum_name, forum_type - FROM ' . FORUMS_TABLE . ' - WHERE left_id < ' . $forum_data['left_id'] . ' - AND right_id > ' . $forum_data['right_id'] . ' - ORDER BY left_id ASC'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $forum_parents[$row['forum_id']] = array($row['forum_name'], (int) $row['forum_type']); - } - $db->sql_freeresult($result); - - $forum_data['forum_parents'] = serialize($forum_parents); - - $sql = 'UPDATE ' . FORUMS_TABLE . " - SET forum_parents = '" . $db->sql_escape($forum_data['forum_parents']) . "' - WHERE parent_id = " . $forum_data['parent_id']; - $db->sql_query($sql); - } - else - { - $forum_parents = unserialize($forum_data['forum_parents']); - } - } - - return $forum_parents; -} - -/** -* Generate topic pagination -*/ -function topic_generate_pagination($replies, $url) -{ - global $config, $user; - - // Make sure $per_page is a valid value - $per_page = ($config['posts_per_page'] <= 0) ? 1 : $config['posts_per_page']; - - if (($replies + 1) > $per_page) - { - $total_pages = ceil(($replies + 1) / $per_page); - $pagination = ''; - - $times = 1; - for ($j = 0; $j < $replies + 1; $j += $per_page) - { - $pagination .= '' . $times . ''; - if ($times == 1 && $total_pages > 5) - { - $pagination .= ' ... '; - - // Display the last three pages - $times = $total_pages - 3; - $j += ($total_pages - 4) * $per_page; - } - else if ($times < $total_pages) - { - $pagination .= '' . $user->lang['COMMA_SEPARATOR'] . ''; - } - $times++; - } - } - else - { - $pagination = ''; - } - - return $pagination; -} - -/** -* Obtain list of moderators of each forum -*/ -function get_moderators(&$forum_moderators, $forum_id = false) -{ - global $config, $template, $db, $phpbb_root_path, $phpEx; - - // Have we disabled the display of moderators? If so, then return - // from whence we came ... - if (!$config['load_moderators']) - { - return; - } - - $forum_sql = ''; - - if ($forum_id !== false) - { - if (!is_array($forum_id)) - { - $forum_id = array($forum_id); - } - - // If we don't have a forum then we can't have a moderator - if (!sizeof($forum_id)) - { - return; - } - - $forum_sql = 'AND m.' . $db->sql_in_set('forum_id', $forum_id); - } - - $sql_array = array( - 'SELECT' => 'm.*, u.user_colour, g.group_colour, g.group_type', - - 'FROM' => array( - MODERATOR_CACHE_TABLE => 'm', - ), - - 'LEFT_JOIN' => array( - array( - 'FROM' => array(USERS_TABLE => 'u'), - 'ON' => 'm.user_id = u.user_id', - ), - array( - 'FROM' => array(GROUPS_TABLE => 'g'), - 'ON' => 'm.group_id = g.group_id', - ), - ), - - 'WHERE' => "m.display_on_index = 1 $forum_sql", - ); - - $sql = $db->sql_build_query('SELECT', $sql_array); - $result = $db->sql_query($sql, 3600); - - while ($row = $db->sql_fetchrow($result)) - { - if (!empty($row['user_id'])) - { - $forum_moderators[$row['forum_id']][] = get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']); - } - else - { - $forum_moderators[$row['forum_id']][] = '' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . ''; - } - } - $db->sql_freeresult($result); - - return; -} - -/** -* User authorisation levels output -* -* @param string $mode Can be forum or topic. Not in use at the moment. -* @param int $forum_id The current forum the user is in. -* @param int $forum_status The forums status bit. -*/ -function gen_forum_auth_level($mode, $forum_id, $forum_status) -{ - global $template, $auth, $user, $config; - - $locked = ($forum_status == ITEM_LOCKED && !$auth->acl_get('m_edit', $forum_id)) ? true : false; - - $rules = array( - ($auth->acl_get('f_post', $forum_id) && !$locked) ? $user->lang['RULES_POST_CAN'] : $user->lang['RULES_POST_CANNOT'], - ($auth->acl_get('f_reply', $forum_id) && !$locked) ? $user->lang['RULES_REPLY_CAN'] : $user->lang['RULES_REPLY_CANNOT'], - ($user->data['is_registered'] && $auth->acl_gets('f_edit', 'm_edit', $forum_id) && !$locked) ? $user->lang['RULES_EDIT_CAN'] : $user->lang['RULES_EDIT_CANNOT'], - ($user->data['is_registered'] && $auth->acl_gets('f_delete', 'm_delete', $forum_id) && !$locked) ? $user->lang['RULES_DELETE_CAN'] : $user->lang['RULES_DELETE_CANNOT'], - ); - - if ($config['allow_attachments']) - { - $rules[] = ($auth->acl_get('f_attach', $forum_id) && $auth->acl_get('u_attach') && !$locked) ? $user->lang['RULES_ATTACH_CAN'] : $user->lang['RULES_ATTACH_CANNOT']; - } - - foreach ($rules as $rule) - { - $template->assign_block_vars('rules', array('RULE' => $rule)); - } - - return; -} - -/** -* Generate topic status -*/ -function topic_status(&$topic_row, $replies, $unread_topic, &$folder_img, &$folder_alt, &$topic_type) -{ - global $user, $config; - - $folder = $folder_new = ''; - - if ($topic_row['topic_status'] == ITEM_MOVED) - { - $topic_type = $user->lang['VIEW_TOPIC_MOVED']; - $folder_img = 'topic_moved'; - $folder_alt = 'TOPIC_MOVED'; - } - else - { - switch ($topic_row['topic_type']) - { - case POST_GLOBAL: - $topic_type = $user->lang['VIEW_TOPIC_GLOBAL']; - $folder = 'global_read'; - $folder_new = 'global_unread'; - break; - - case POST_ANNOUNCE: - $topic_type = $user->lang['VIEW_TOPIC_ANNOUNCEMENT']; - $folder = 'announce_read'; - $folder_new = 'announce_unread'; - break; - - case POST_STICKY: - $topic_type = $user->lang['VIEW_TOPIC_STICKY']; - $folder = 'sticky_read'; - $folder_new = 'sticky_unread'; - break; - - default: - $topic_type = ''; - $folder = 'topic_read'; - $folder_new = 'topic_unread'; - - if ($config['hot_threshold'] && $replies >= $config['hot_threshold'] && $topic_row['topic_status'] != ITEM_LOCKED) - { - $folder .= '_hot'; - $folder_new .= '_hot'; - } - break; - } - - if ($topic_row['topic_status'] == ITEM_LOCKED) - { - $topic_type = $user->lang['VIEW_TOPIC_LOCKED']; - $folder .= '_locked'; - $folder_new .= '_locked'; - } - - - $folder_img = ($unread_topic) ? $folder_new : $folder; - $folder_alt = ($unread_topic) ? 'NEW_POSTS' : (($topic_row['topic_status'] == ITEM_LOCKED) ? 'TOPIC_LOCKED' : 'NO_NEW_POSTS'); - - // Posted image? - if (!empty($topic_row['topic_posted']) && $topic_row['topic_posted']) - { - $folder_img .= '_mine'; - } - } - - if ($topic_row['poll_start'] && $topic_row['topic_status'] != ITEM_MOVED) - { - $topic_type = $user->lang['VIEW_TOPIC_POLL']; - } -} - -/** -* Assign/Build custom bbcodes for display in screens supporting using of bbcodes -* The custom bbcodes buttons will be placed within the template block 'custom_codes' -*/ -function display_custom_bbcodes() -{ - global $db, $template; - - // Start counting from 22 for the bbcode ids (every bbcode takes two ids - opening/closing) - $num_predefined_bbcodes = 22; - - $sql = 'SELECT bbcode_id, bbcode_tag, bbcode_helpline - FROM ' . BBCODES_TABLE . ' - WHERE display_on_posting = 1 - ORDER BY bbcode_tag'; - $result = $db->sql_query($sql); - - $i = 0; - while ($row = $db->sql_fetchrow($result)) - { - $template->assign_block_vars('custom_tags', array( - 'BBCODE_NAME' => "'[{$row['bbcode_tag']}]', '[/" . str_replace('=', '', $row['bbcode_tag']) . "]'", - 'BBCODE_ID' => $num_predefined_bbcodes + ($i * 2), - 'BBCODE_TAG' => $row['bbcode_tag'], - 'BBCODE_HELPLINE' => $row['bbcode_helpline'], - 'A_BBCODE_HELPLINE' => str_replace(array('&', '"', "'", '<', '>'), array('&', '"', "\'", '<', '>'), $row['bbcode_helpline']), - )); - - $i++; - } - $db->sql_freeresult($result); -} - -/** -* Display reasons -*/ -function display_reasons($reason_id = 0) -{ - global $db, $user, $template; - - $sql = 'SELECT * - FROM ' . REPORTS_REASONS_TABLE . ' - ORDER BY reason_order ASC'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - // If the reason is defined within the language file, we will use the localized version, else just use the database entry... - if (isset($user->lang['report_reasons']['TITLE'][strtoupper($row['reason_title'])]) && isset($user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])])) - { - $row['reason_description'] = $user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])]; - $row['reason_title'] = $user->lang['report_reasons']['TITLE'][strtoupper($row['reason_title'])]; - } - - $template->assign_block_vars('reason', array( - 'ID' => $row['reason_id'], - 'TITLE' => $row['reason_title'], - 'DESCRIPTION' => $row['reason_description'], - 'S_SELECTED' => ($row['reason_id'] == $reason_id) ? true : false) - ); - } - $db->sql_freeresult($result); -} - -/** -* Display user activity (action forum/topic) -*/ -function display_user_activity(&$userdata) -{ - global $auth, $template, $db, $user; - global $phpbb_root_path, $phpEx; - - // Do not display user activity for users having more than 5000 posts... - if ($userdata['user_posts'] > 5000) - { - return; - } - - $forum_ary = array(); - - // Do not include those forums the user is not having read access to... - $forum_read_ary = $auth->acl_getf('!f_read'); - - foreach ($forum_read_ary as $forum_id => $not_allowed) - { - if ($not_allowed['f_read']) - { - $forum_ary[] = (int) $forum_id; - } - } - - $forum_ary = array_unique($forum_ary); - $forum_sql = (sizeof($forum_ary)) ? 'AND ' . $db->sql_in_set('forum_id', $forum_ary, true) : ''; - - // Obtain active forum - $sql = 'SELECT forum_id, COUNT(post_id) AS num_posts - FROM ' . POSTS_TABLE . ' - WHERE poster_id = ' . $userdata['user_id'] . " - AND post_postcount = 1 - $forum_sql - GROUP BY forum_id - ORDER BY num_posts DESC"; - $result = $db->sql_query_limit($sql, 1); - $active_f_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!empty($active_f_row)) - { - $sql = 'SELECT forum_name - FROM ' . FORUMS_TABLE . ' - WHERE forum_id = ' . $active_f_row['forum_id']; - $result = $db->sql_query($sql, 3600); - $active_f_row['forum_name'] = (string) $db->sql_fetchfield('forum_name'); - $db->sql_freeresult($result); - } - - // Obtain active topic - $sql = 'SELECT topic_id, COUNT(post_id) AS num_posts - FROM ' . POSTS_TABLE . ' - WHERE poster_id = ' . $userdata['user_id'] . " - AND post_postcount = 1 - $forum_sql - GROUP BY topic_id - ORDER BY num_posts DESC"; - $result = $db->sql_query_limit($sql, 1); - $active_t_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!empty($active_t_row)) - { - $sql = 'SELECT topic_title - FROM ' . TOPICS_TABLE . ' - WHERE topic_id = ' . $active_t_row['topic_id']; - $result = $db->sql_query($sql); - $active_t_row['topic_title'] = (string) $db->sql_fetchfield('topic_title'); - $db->sql_freeresult($result); - } - - $userdata['active_t_row'] = $active_t_row; - $userdata['active_f_row'] = $active_f_row; - - $active_f_name = $active_f_id = $active_f_count = $active_f_pct = ''; - if (!empty($active_f_row['num_posts'])) - { - $active_f_name = $active_f_row['forum_name']; - $active_f_id = $active_f_row['forum_id']; - $active_f_count = $active_f_row['num_posts']; - $active_f_pct = ($userdata['user_posts']) ? ($active_f_count / $userdata['user_posts']) * 100 : 0; - } - - $active_t_name = $active_t_id = $active_t_count = $active_t_pct = ''; - if (!empty($active_t_row['num_posts'])) - { - $active_t_name = $active_t_row['topic_title']; - $active_t_id = $active_t_row['topic_id']; - $active_t_count = $active_t_row['num_posts']; - $active_t_pct = ($userdata['user_posts']) ? ($active_t_count / $userdata['user_posts']) * 100 : 0; - } - - $l_active_pct = ($userdata['user_id'] != ANONYMOUS && $userdata['user_id'] == $user->data['user_id']) ? $user->lang['POST_PCT_ACTIVE_OWN'] : $user->lang['POST_PCT_ACTIVE']; - - $template->assign_vars(array( - 'ACTIVE_FORUM' => $active_f_name, - 'ACTIVE_FORUM_POSTS' => ($active_f_count == 1) ? sprintf($user->lang['USER_POST'], 1) : sprintf($user->lang['USER_POSTS'], $active_f_count), - 'ACTIVE_FORUM_PCT' => sprintf($l_active_pct, $active_f_pct), - 'ACTIVE_TOPIC' => censor_text($active_t_name), - 'ACTIVE_TOPIC_POSTS' => ($active_t_count == 1) ? sprintf($user->lang['USER_POST'], 1) : sprintf($user->lang['USER_POSTS'], $active_t_count), - 'ACTIVE_TOPIC_PCT' => sprintf($l_active_pct, $active_t_pct), - 'U_ACTIVE_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $active_f_id), - 'U_ACTIVE_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . $active_t_id), - 'S_SHOW_ACTIVITY' => true) - ); -} - -/** -* Topic and forum watching common code -*/ -function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, $notify_status = 'unset', $start = 0) -{ - global $template, $db, $user, $phpEx, $start, $phpbb_root_path; - - $table_sql = ($mode == 'forum') ? FORUMS_WATCH_TABLE : TOPICS_WATCH_TABLE; - $where_sql = ($mode == 'forum') ? 'forum_id' : 'topic_id'; - $match_id = ($mode == 'forum') ? $forum_id : $topic_id; - - $u_url = ($mode == 'forum') ? 'f' : 'f=' . $forum_id . '&t'; - - // Is user watching this thread? - if ($user_id != ANONYMOUS) - { - $can_watch = true; - - if ($notify_status == 'unset') - { - $sql = "SELECT notify_status - FROM $table_sql - WHERE $where_sql = $match_id - AND user_id = $user_id"; - $result = $db->sql_query($sql); - - $notify_status = ($row = $db->sql_fetchrow($result)) ? $row['notify_status'] : NULL; - $db->sql_freeresult($result); - } - - if (!is_null($notify_status) && $notify_status !== '') - { - if (isset($_GET['unwatch'])) - { - if ($_GET['unwatch'] == $mode) - { - $is_watching = 0; - - $sql = 'DELETE FROM ' . $table_sql . " - WHERE $where_sql = $match_id - AND user_id = $user_id"; - $db->sql_query($sql); - } - - $redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start"); - - meta_refresh(3, $redirect_url); - - $message = $user->lang['NOT_WATCHING_' . strtoupper($mode)] . '

    ' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '', ''); - trigger_error($message); - } - else - { - $is_watching = true; - - if ($notify_status) - { - $sql = 'UPDATE ' . $table_sql . " - SET notify_status = 0 - WHERE $where_sql = $match_id - AND user_id = $user_id"; - $db->sql_query($sql); - } - } - } - else - { - if (isset($_GET['watch'])) - { - if ($_GET['watch'] == $mode) - { - $is_watching = true; - - $sql = 'INSERT INTO ' . $table_sql . " (user_id, $where_sql, notify_status) - VALUES ($user_id, $match_id, 0)"; - $db->sql_query($sql); - } - - $redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start"); - meta_refresh(3, $redirect_url); - - $message = $user->lang['ARE_WATCHING_' . strtoupper($mode)] . '

    ' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '', ''); - trigger_error($message); - } - else - { - $is_watching = 0; - } - } - } - else - { - if (isset($_GET['unwatch']) && $_GET['unwatch'] == $mode) - { - login_box(); - } - else - { - $can_watch = 0; - $is_watching = 0; - } - } - - if ($can_watch) - { - $s_watching['link'] = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&" . (($is_watching) ? 'unwatch' : 'watch') . "=$mode&start=$start"); - $s_watching['title'] = $user->lang[(($is_watching) ? 'STOP' : 'START') . '_WATCHING_' . strtoupper($mode)]; - $s_watching['is_watching'] = $is_watching; - } - - return; -} - -/** -* Get user rank title and image -* -* @param int $user_rank the current stored users rank id -* @param int $user_posts the users number of posts -* @param string &$rank_title the rank title will be stored here after execution -* @param string &$rank_img the rank image as full img tag is stored here after execution -* @param string &$rank_img_src the rank image source is stored here after execution -* -*/ -function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank_img_src) -{ - global $ranks, $config, $phpbb_root_path; - - if (empty($ranks)) - { - global $cache; - $ranks = cache::obtain_ranks(); - } - - if (!empty($user_rank)) - { - $rank_title = (isset($ranks['special'][$user_rank]['rank_title'])) ? $ranks['special'][$user_rank]['rank_title'] : ''; - $rank_img = (!empty($ranks['special'][$user_rank]['rank_image'])) ? '' . $ranks['special'][$user_rank]['rank_title'] . '' : ''; - $rank_img_src = (!empty($ranks['special'][$user_rank]['rank_image'])) ? $phpbb_root_path . $config['ranks_path'] . '/' . $ranks['special'][$user_rank]['rank_image'] : ''; - } - else - { - if (!empty($ranks['normal'])) - { - foreach ($ranks['normal'] as $rank) - { - if ($user_posts >= $rank['rank_min']) - { - $rank_title = $rank['rank_title']; - $rank_img = (!empty($rank['rank_image'])) ? '' . $rank['rank_title'] . '' : ''; - $rank_img_src = (!empty($rank['rank_image'])) ? $phpbb_root_path . $config['ranks_path'] . '/' . $rank['rank_image'] : ''; - break; - } - } - } - } -} - -/** -* Get user avatar -* -* @param string $avatar Users assigned avatar name -* @param int $avatar_type Type of avatar -* @param string $avatar_width Width of users avatar -* @param string $avatar_height Height of users avatar -* @param string $alt Optional language string for alt tag within image, can be a language key or text -* -* @return string Avatar image -*/ -function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR') -{ - global $user, $config, $phpbb_root_path, $phpEx; - - if (empty($avatar) || !$avatar_type) - { - return ''; - } - - $avatar_img = ''; - - switch ($avatar_type) - { - case AVATAR_UPLOAD: - $avatar_img = $phpbb_root_path . "download/file.$phpEx?avatar="; - break; - - case AVATAR_GALLERY: - $avatar_img = $phpbb_root_path . $config['avatar_gallery_path'] . '/'; - break; - } - - $avatar_img .= $avatar; - return '' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . ''; -} - -?> \ No newline at end of file diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php deleted file mode 100644 index cdd62b6d9e..0000000000 --- a/phpBB/includes/functions_install.php +++ /dev/null @@ -1,575 +0,0 @@ - array( - 'LABEL' => 'FireBird', - 'SCHEMA' => 'firebird', - 'MODULE' => 'interbase', - 'DELIM' => ';;', - 'COMMENTS' => 'remove_remarks', - 'DRIVER' => 'firebird', - 'AVAILABLE' => true, - '2.0.x' => false, - ), - 'mysqli' => array( - 'LABEL' => 'MySQL with MySQLi Extension', - 'SCHEMA' => 'mysql', - 'MODULE' => 'mysqli', - 'DELIM' => ';', - 'COMMENTS' => 'remove_remarks', - 'DRIVER' => 'mysqli', - 'AVAILABLE' => true, - '2.0.x' => true, - ), - 'mysql' => array( - 'LABEL' => 'MySQL', - 'SCHEMA' => 'mysql', - 'MODULE' => 'mysql', - 'DELIM' => ';', - 'COMMENTS' => 'remove_remarks', - 'DRIVER' => 'mysql', - 'AVAILABLE' => true, - '2.0.x' => true, - ), - 'mssql' => array( - 'LABEL' => 'MS SQL Server 2000+', - 'SCHEMA' => 'mssql', - 'MODULE' => 'mssql', - 'DELIM' => 'GO', - 'COMMENTS' => 'remove_comments', - 'DRIVER' => 'mssql', - 'AVAILABLE' => true, - '2.0.x' => true, - ), - 'mssql_odbc'=> array( - 'LABEL' => 'MS SQL Server [ ODBC ]', - 'SCHEMA' => 'mssql', - 'MODULE' => 'odbc', - 'DELIM' => 'GO', - 'COMMENTS' => 'remove_comments', - 'DRIVER' => 'mssql_odbc', - 'AVAILABLE' => true, - '2.0.x' => true, - ), - 'mssql_2005'=> array( - 'LABEL' => 'MS SQL Server [ 2005 ]', - 'SCHEMA' => 'mssql', - 'MODULE' => 'sqlsrv', - 'DELIM' => 'GO', - 'COMMENTS' => 'remove_comments', - 'DRIVER' => 'mssql_2005', - 'AVAILABLE' => true, - '2.0.x' => true, - ), - 'db2' => array( - 'LABEL' => 'IBM DB2', - 'SCHEMA' => 'db2', - 'MODULE' => 'ibm_db2', - 'DELIM' => ';', - 'COMMENTS' => 'remove_comments', - 'DRIVER' => 'db2', - 'AVAILABLE' => true, - '2.0.x' => false, - ), - 'oracle' => array( - 'LABEL' => 'Oracle', - 'SCHEMA' => 'oracle', - 'MODULE' => 'oci8', - 'DELIM' => '/', - 'COMMENTS' => 'remove_comments', - 'DRIVER' => 'oracle', - 'AVAILABLE' => true, - '2.0.x' => false, - ), - 'postgres' => array( - 'LABEL' => 'PostgreSQL 7.x/8.x', - 'SCHEMA' => 'postgres', - 'MODULE' => 'pgsql', - 'DELIM' => ';', - 'COMMENTS' => 'remove_comments', - 'DRIVER' => 'postgres', - 'AVAILABLE' => true, - '2.0.x' => true, - ), - 'sqlite' => array( - 'LABEL' => 'SQLite', - 'SCHEMA' => 'sqlite', - 'MODULE' => 'sqlite', - 'DELIM' => ';', - 'COMMENTS' => 'remove_remarks', - 'DRIVER' => 'sqlite', - 'AVAILABLE' => true, - '2.0.x' => false, - ), - ); - - if ($dbms) - { - if (isset($available_dbms[$dbms])) - { - $available_dbms = array($dbms => $available_dbms[$dbms]); - } - else - { - return array(); - } - } - - // now perform some checks whether they are really available - foreach ($available_dbms as $db_name => $db_ary) - { - if ($only_20x_options && !$db_ary['2.0.x']) - { - if ($return_unavailable) - { - $available_dbms[$db_name]['AVAILABLE'] = false; - } - else - { - unset($available_dbms[$db_name]); - } - continue; - } - - $dll = $db_ary['MODULE']; - - if (!@extension_loaded($dll)) - { - if (!can_load_dll($dll)) - { - if ($return_unavailable) - { - $available_dbms[$db_name]['AVAILABLE'] = false; - } - else - { - unset($available_dbms[$db_name]); - } - continue; - } - } - $any_db_support = true; - } - - if ($return_unavailable) - { - $available_dbms['ANY_DB_SUPPORT'] = $any_db_support; - } - return $available_dbms; -} - -/** -* Generate the drop down of available database options -*/ -function dbms_select($default = '', $only_20x_options = false) -{ - global $lang; - - $available_dbms = get_available_dbms(false, false, $only_20x_options); - $dbms_options = ''; - foreach ($available_dbms as $dbms_name => $details) - { - $selected = ($dbms_name == $default) ? ' selected="selected"' : ''; - $dbms_options .= ''; - } - return $dbms_options; -} - -/** -* Get tables of a database -*/ -function get_tables($db) -{ - switch ($db->dbms_type) - { - case 'mysql': - $sql = 'SHOW TABLES'; - break; - - case 'sqlite': - $sql = 'SELECT name - FROM sqlite_master - WHERE type = "table"'; - break; - - case 'mssql': - $sql = "SELECT name - FROM sysobjects - WHERE type='U'"; - break; - - case 'postgres': - $sql = 'SELECT relname - FROM pg_stat_user_tables'; - break; - - case 'firebird': - $sql = 'SELECT rdb$relation_name - FROM rdb$relations - WHERE rdb$view_source is null - AND rdb$system_flag = 0'; - break; - - case 'db2': - $sql = "SELECT tabname - FROM SYSCAT.TABLES - WHERE type = 'T' - AND tabschema = 'DB2ADMIN'"; - $field = 'tabname'; - break; - - case 'oracle': - $sql = 'SELECT table_name - FROM USER_TABLES'; - break; - } - - $result = $db->sql_query($sql); - - $tables = array(); - - while ($row = $db->sql_fetchrow($result)) - { - $tables[] = current($row); - } - - $db->sql_freeresult($result); - - return $tables; -} - -/** -* Used to test whether we are able to connect to the database the user has specified -* and identify any problems (eg there are already tables with the names we want to use -* @param array $dbms should be of the format of an element of the array returned by {@link get_available_dbms get_available_dbms()} -* necessary extensions should be loaded already -*/ -function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix, $dbhost, $dbuser, $dbpasswd, $dbname, $dbport, $prefix_may_exist = false, $load_dbal = true, $unicode_check = true) -{ - global $phpbb_root_path, $phpEx, $config, $lang; - - $dbms = $dbms_details['DRIVER']; - - if ($load_dbal) - { - // Include the DB layer - include($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); - } - - // Instantiate it and set return on error true - $sql_db = 'dbal_' . $dbms; - $db = new $sql_db(); - $db->sql_return_on_error(true); - - // Check that we actually have a database name before going any further..... - if ($dbms_details['DRIVER'] != 'sqlite' && $dbms_details['DRIVER'] != 'oracle' && $dbname === '') - { - $error[] = $lang['INST_ERR_DB_NO_NAME']; - return false; - } - - // Make sure we don't have a daft user who thinks having the SQLite database in the forum directory is a good idea - if ($dbms_details['DRIVER'] == 'sqlite' && stripos(phpbb_realpath($dbhost), phpbb_realpath('../')) === 0) - { - $error[] = $lang['INST_ERR_DB_FORUM_PATH']; - return false; - } - - // Check the prefix length to ensure that index names are not too long and does not contain invalid characters - switch ($dbms_details['DRIVER']) - { - case 'mysql': - case 'mysqli': - if (strpos($table_prefix, '-') !== false || strpos($table_prefix, '.') !== false) - { - $error[] = $lang['INST_ERR_PREFIX_INVALID']; - return false; - } - - // no break; - - case 'postgres': - $prefix_length = 36; - break; - - case 'mssql': - case 'mssql_odbc': - case 'mssql_2005': - $prefix_length = 90; - break; - - case 'db2': - $prefix_length = 108; - break; - - case 'sqlite': - $prefix_length = 200; - break; - - case 'firebird': - case 'oracle': - $prefix_length = 6; - break; - } - - if (strlen($table_prefix) > $prefix_length) - { - $error[] = sprintf($lang['INST_ERR_PREFIX_TOO_LONG'], $prefix_length); - return false; - } - - // Try and connect ... - if (is_array($db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true))) - { - $db_error = $db->sql_error(); - $error[] = $lang['INST_ERR_DB_CONNECT'] . '
    ' . (($db_error['message']) ? $db_error['message'] : $lang['INST_ERR_DB_NO_ERROR']); - } - else - { - // Likely matches for an existing phpBB installation - if (!$prefix_may_exist) - { - $temp_prefix = strtolower($table_prefix); - $table_ary = array($temp_prefix . 'attachments', $temp_prefix . 'config', $temp_prefix . 'sessions', $temp_prefix . 'topics', $temp_prefix . 'users'); - - $tables = get_tables($db); - $tables = array_map('strtolower', $tables); - $table_intersect = array_intersect($tables, $table_ary); - - if (sizeof($table_intersect)) - { - $error[] = $lang['INST_ERR_PREFIX']; - } - } - - // Make sure that the user has selected a sensible DBAL for the DBMS actually installed - switch ($dbms_details['DRIVER']) - { - case 'mysql': - if (version_compare(mysql_get_server_info($db->db_connect_id), '4.1.3', '<')) - { - $error[] = $lang['INST_ERR_DB_NO_MYSQL']; - } - break; - - case 'mysqli': - if (version_compare(mysqli_get_server_info($db->db_connect_id), '4.1.3', '<')) - { - $error[] = $lang['INST_ERR_DB_NO_MYSQLI']; - } - break; - - case 'sqlite': - if (version_compare(sqlite_libversion(), '2.8.2', '<')) - { - $error[] = $lang['INST_ERR_DB_NO_SQLITE']; - } - break; - - case 'firebird': - // check the version of FB, use some hackery if we can't get access to the server info - if ($db->service_handle !== false && strtolower($dbuser) == 'sysdba') - { - $val = @ibase_server_info($db->service_handle, IBASE_SVC_SERVER_VERSION); - preg_match('#V([\d.]+)#', $val, $match); - if ($match[1] < 2) - { - $error[] = $lang['INST_ERR_DB_NO_FIREBIRD']; - } - $db_info = @ibase_db_info($db->service_handle, $dbname, IBASE_STS_HDR_PAGES); - - preg_match('/^\\s*Page size\\s*(\\d+)/m', $db_info, $regs); - $page_size = intval($regs[1]); - if ($page_size < 8192) - { - $error[] = $lang['INST_ERR_DB_NO_FIREBIRD_PS']; - } - } - else - { - $sql = "SELECT * - FROM RDB$FUNCTIONS - WHERE RDB$SYSTEM_FLAG IS NULL - AND RDB$FUNCTION_NAME = 'CHAR_LENGTH'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // if its a UDF, its too old - if ($row) - { - $error[] = $lang['INST_ERR_DB_NO_FIREBIRD']; - } - else - { - $sql = "SELECT FIRST 0 char_length('') - FROM RDB\$DATABASE"; - $result = $db->sql_query($sql); - if (!$result) // This can only fail if char_length is not defined - { - $error[] = $lang['INST_ERR_DB_NO_FIREBIRD']; - } - $db->sql_freeresult($result); - } - - // Setup the stuff for our random table - $char_array = array_merge(range('A', 'Z'), range('0', '9')); - $char_len = mt_rand(7, 9); - $char_array_len = sizeof($char_array) - 1; - - $final = ''; - - for ($i = 0; $i < $char_len; $i++) - { - $final .= $char_array[mt_rand(0, $char_array_len)]; - } - - // Create some random table - $sql = 'CREATE TABLE ' . $final . " ( - FIELD1 VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, - FIELD2 INTEGER DEFAULT 0 NOT NULL);"; - $db->sql_query($sql); - - // Create an index that should fail if the page size is less than 8192 - $sql = 'CREATE INDEX ' . $final . ' ON ' . $final . '(FIELD1, FIELD2);'; - $db->sql_query($sql); - - if (ibase_errmsg() !== false) - { - $error[] = $lang['INST_ERR_DB_NO_FIREBIRD_PS']; - } - - // Kill the old table - $db->sql_query('DROP TABLE ' . $final . ';'); - - unset($final); - } - break; - - case 'oracle': - if ($unicode_check) - { - $sql = "SELECT * - FROM NLS_DATABASE_PARAMETERS - WHERE PARAMETER = 'NLS_RDBMS_VERSION' - OR PARAMETER = 'NLS_CHARACTERSET'"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $stats[$row['parameter']] = $row['value']; - } - $db->sql_freeresult($result); - - if (version_compare($stats['NLS_RDBMS_VERSION'], '9.2', '<')) - { - $error[] = $lang['INST_ERR_DB_NO_ORACLE']; - } - - if ($stats['NLS_CHARACTERSET'] !== 'AL32UTF8') - { - $error[] = $lang['INST_ERR_DB_NO_ORACLE_NLS']; - } - } - break; - - case 'postgres': - if ($unicode_check) - { - $sql = "SHOW server_encoding;"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row['server_encoding'] !== 'UNICODE' && $row['server_encoding'] !== 'UTF8') - { - $error[] = $lang['INST_ERR_DB_NO_POSTGRES']; - } - } - break; - } - - } - - if ($error_connect && (!isset($error) || !sizeof($error))) - { - return true; - } - return false; -} - -/** -* remove_remarks will strip the sql comment lines out of an uploaded sql file -*/ -function remove_remarks(&$sql) -{ - $sql = preg_replace('/\n{2,}/', "\n", preg_replace('/^#.*$/m', "\n", $sql)); -} - -/** -* split_sql_file will split an uploaded sql file into single sql statements. -* Note: expects trim() to have already been run on $sql. -*/ -function split_sql_file($sql, $delimiter) -{ - $sql = str_replace("\r" , '', $sql); - $data = preg_split('/' . preg_quote($delimiter, '/') . '$/m', $sql); - - $data = array_map('trim', $data); - - // The empty case - $end_data = end($data); - - if (empty($end_data)) - { - unset($data[key($data)]); - } - - return $data; -} - -/** -* For replacing {L_*} strings with preg_replace_callback -*/ -function adjust_language_keys_callback($matches) -{ - if (!empty($matches[1])) - { - global $lang, $db; - - return (!empty($lang[$matches[1]])) ? $db->sql_escape($lang[$matches[1]]) : $db->sql_escape($matches[1]); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php deleted file mode 100644 index 72dbbd2869..0000000000 --- a/phpBB/includes/functions_jabber.php +++ /dev/null @@ -1,865 +0,0 @@ -server = ($server) ? $server : 'localhost'; - $this->port = ($port) ? $port : 5222; - $this->username = $username; - $this->password = $password; - $this->use_ssl = ($use_ssl && self::can_use_ssl()) ? true : false; - - // Change port if we use SSL - if ($this->port == 5222 && $this->use_ssl) - { - $this->port = 5223; - } - - $this->enable_logging = true; - $this->log_array = array(); - } - - /** - * Able to use the SSL functionality? - */ - public static function can_use_ssl() - { - // Will not work with PHP >= 5.2.1 or < 5.2.3RC2 until timeout problem with ssl hasn't been fixed (http://bugs.php.net/41236) - return ((version_compare(PHP_VERSION, '5.2.1', '<') || version_compare(PHP_VERSION, '5.2.3RC2', '>=')) && @extension_loaded('openssl')) ? true : false; - } - - /** - * Able to use TLS? - */ - public static function can_use_tls() - { - if (!@extension_loaded('openssl') || !function_exists('stream_socket_enable_crypto') || !function_exists('stream_get_meta_data') || !function_exists('socket_set_blocking') || !function_exists('stream_get_wrappers')) - { - return false; - } - - /** - * Make sure the encryption stream is supported - * Also seem to work without the crypto stream if correctly compiled - - $streams = stream_get_wrappers(); - - if (!in_array('streams.crypto', $streams)) - { - return false; - } - */ - - return true; - } - - /** - * Sets the resource which is used. No validation is done here, only escaping. - * @param string $name - * @access public - */ - public function set_resource($name) - { - $this->resource = $name; - } - - /** - * Connect - */ - public function connect() - { -/* if (!$this->check_jid($this->username . '@' . $this->server)) - { - $this->add_to_log('Error: Jabber ID is not valid: ' . $this->username . '@' . $this->server); - return false; - }*/ - - $this->session['ssl'] = $this->use_ssl; - - if ($this->open_socket($this->server, $this->port, $this->use_ssl)) - { - $this->send("\n"); - $this->send("\n"); - } - else - { - $this->add_to_log('Error: connect() #2'); - return false; - } - - // Now we listen what the server has to say...and give appropriate responses - $this->response($this->listen()); - return true; - } - - /** - * Disconnect - */ - public function disconnect() - { - if ($this->connected()) - { - // disconnect gracefully - if (isset($this->session['sent_presence'])) - { - $this->send_presence('offline', '', true); - } - - $this->send(''); - $this->session = array(); - return fclose($this->connection); - } - - return false; - } - - /** - * Connected? - */ - public function connected() - { - return (is_resource($this->connection) && !feof($this->connection)) ? true : false; - } - - - /** - * Initiates login (using data from contructor, after calling connect()) - * @access public - * @return bool - */ - public function login() - { - if (!sizeof($this->features)) - { - $this->add_to_log('Error: No feature information from server available.'); - return false; - } - - return $this->response($this->features); - } - - /** - * Send data to the Jabber server - * @param string $xml - * @access private - * @return bool - */ - private function send($xml) - { - if ($this->connected()) - { - $xml = trim($xml); - $this->add_to_log('SEND: '. $xml); - return fwrite($this->connection, $xml); - } - else - { - $this->add_to_log('Error: Could not send, connection lost (flood?).'); - return false; - } - } - - /** - * OpenSocket - * @param string $server host to connect to - * @param int $port port number - * @param bool $use_ssl use ssl or not - * @access private - * @return bool - */ - private function open_socket($server, $port, $use_ssl = false) - { - if (@function_exists('dns_get_record')) - { - $record = @dns_get_record("_xmpp-client._tcp.$server", DNS_SRV); - if (!empty($record) && !empty($record[0]['target'])) - { - $server = $record[0]['target']; - } - } - - $server = $use_ssl ? 'ssl://' . $server : $server; - - if ($this->connection = @fsockopen($server, $port, $errorno, $errorstr, $this->timeout)) - { - socket_set_blocking($this->connection, 0); - socket_set_timeout($this->connection, 60); - - return true; - } - - // Apparently an error occured... - $this->add_to_log('Error: open_socket() - ' . $errorstr); - return false; - } - - /** - * Return log - */ - public function get_log() - { - if ($this->enable_logging && sizeof($this->log_array)) - { - return implode("

    ", $this->log_array); - } - - return ''; - } - - /** - * Add information to log - */ - private function add_to_log($string) - { - if ($this->enable_logging) - { - $this->log_array[] = utf8_htmlspecialchars($string); - } - } - - /** - * Listens to the connection until it gets data or the timeout is reached. - * Thus, it should only be called if data is expected to be received. - * @access private - * @return mixed either false for timeout or an array with the received data - */ - private function listen($timeout = 10, $wait = false) - { - if (!$this->connected()) - { - return false; - } - - // Wait for a response until timeout is reached - $start = time(); - $data = ''; - - do - { - $read = trim(fread($this->connection, 4096)); - $data .= $read; - } - while (time() <= $start + $timeout && !feof($this->connection) && ($wait || $data == '' || $read != '' || (substr(rtrim($data), -1) != '>'))); - - if ($data != '') - { - $this->add_to_log('RECV: '. $data); - return self::xmlize($data); - } - else - { - $this->add_to_log('Timeout, no response from server.'); - return false; - } - } - - /** - * Initiates account registration (based on data used for contructor) - * @access private - * @return bool - */ - private function register() - { - if (!isset($this->session['id']) || isset($this->session['jid'])) - { - $this->add_to_log('Error: Cannot initiate registration.'); - return false; - } - - $this->send(""); - return $this->response($this->listen()); - } - - /** - * Sets account presence. No additional info required (default is "online" status) - * @param $message online, offline... - * @param $type dnd, away, chat, xa or nothing - * @param $unavailable set this to true if you want to become unavailable - * @access private - * @return bool - */ - private function send_presence($message = '', $type = '', $unavailable = false) - { - if (!isset($this->session['jid'])) - { - $this->add_to_log('ERROR: send_presence() - Cannot set presence at this point, no jid given.'); - return false; - } - - $type = strtolower($type); - $type = (in_array($type, array('dnd', 'away', 'chat', 'xa'))) ? ''. $type .'' : ''; - - $unavailable = ($unavailable) ? " type='unavailable'" : ''; - $message = ($message) ? '' . utf8_htmlspecialchars($message) .'' : ''; - - $this->session['sent_presence'] = !$unavailable; - - return $this->send("" . $type . $message . ''); - } - - /** - * This handles all the different XML elements - * @param array $xml - * @access private - * @return bool - */ - private function response($xml) - { - if (!is_array($xml) || !sizeof($xml)) - { - return false; - } - - // did we get multiple elements? do one after another - // array('message' => ..., 'presence' => ...) - if (sizeof($xml) > 1) - { - foreach ($xml as $key => $value) - { - $this->response(array($key => $value)); - } - return; - } - else - { - // or even multiple elements of the same type? - // array('message' => array(0 => ..., 1 => ...)) - if (sizeof(reset($xml)) > 1) - { - foreach (reset($xml) as $value) - { - $this->response(array(key($xml) => array(0 => $value))); - } - return; - } - } - - switch (key($xml)) - { - case 'stream:stream': - // Connection initialised (or after authentication). Not much to do here... - - if (isset($xml['stream:stream'][0]['#']['stream:features'])) - { - // we already got all info we need - $this->features = $xml['stream:stream'][0]['#']; - } - else - { - $this->features = $this->listen(); - } - - $second_time = isset($this->session['id']); - $this->session['id'] = $xml['stream:stream'][0]['@']['id']; - - if ($second_time) - { - // If we are here for the second time after TLS, we need to continue logging in - $this->login(); - return; - } - - // go on with authentication? - if (isset($this->features['stream:features'][0]['#']['bind']) || !empty($this->session['tls'])) - { - return $this->response($this->features); - } - break; - - case 'stream:features': - // Resource binding after successful authentication - if (isset($this->session['authenticated'])) - { - // session required? - $this->session['sess_required'] = isset($xml['stream:features'][0]['#']['session']); - - $this->send(" - - " . utf8_htmlspecialchars($this->resource) . ' - - '); - return $this->response($this->listen()); - } - - // Let's use TLS if SSL is not enabled and we can actually use it - if (!$this->session['ssl'] && self::can_use_tls() && self::can_use_ssl() && isset($xml['stream:features'][0]['#']['starttls'])) - { - $this->add_to_log('Switching to TLS.'); - $this->send("\n"); - return $this->response($this->listen()); - } - - // Does the server support SASL authentication? - - // I hope so, because we do (and no other method). - if (isset($xml['stream:features'][0]['#']['mechanisms'][0]['@']['xmlns']) && $xml['stream:features'][0]['#']['mechanisms'][0]['@']['xmlns'] == 'urn:ietf:params:xml:ns:xmpp-sasl') - { - // Now decide on method - $methods = array(); - - foreach ($xml['stream:features'][0]['#']['mechanisms'][0]['#']['mechanism'] as $value) - { - $methods[] = $value['#']; - } - - // we prefer DIGEST-MD5 - // we don't want to use plain authentication (neither does the server usually) if no encryption is in place - - // http://www.xmpp.org/extensions/attic/jep-0078-1.7.html - // The plaintext mechanism SHOULD NOT be used unless the underlying stream is encrypted (using SSL or TLS) - // and the client has verified that the server certificate is signed by a trusted certificate authority. - - if (in_array('DIGEST-MD5', $methods)) - { - $this->send(""); - } - else if (in_array('PLAIN', $methods) && ($this->session['ssl'] || !empty($this->session['tls']))) - { - $this->send("" - . base64_encode(chr(0) . $this->username . '@' . $this->server . chr(0) . $this->password) . - ''); - } - else if (in_array('ANONYMOUS', $methods)) - { - $this->send(""); - } - else - { - // not good... - $this->add_to_log('Error: No authentication method supported.'); - $this->disconnect(); - return false; - } - - return $this->response($this->listen()); - } - else - { - // ok, this is it. bye. - $this->add_to_log('Error: Server does not offer SASL authentication.'); - $this->disconnect(); - return false; - } - break; - - case 'challenge': - // continue with authentication...a challenge literally -_- - $decoded = base64_decode($xml['challenge'][0]['#']); - $decoded = self::parse_data($decoded); - - if (!isset($decoded['digest-uri'])) - { - $decoded['digest-uri'] = 'xmpp/'. $this->server; - } - - // better generate a cnonce, maybe it's needed - $str = ''; - mt_srand((double)microtime()*10000000); - - for ($i = 0; $i < 32; $i++) - { - $str .= chr(mt_rand(0, 255)); - } - $decoded['cnonce'] = base64_encode($str); - - // second challenge? - if (isset($decoded['rspauth'])) - { - $this->send(""); - } - else - { - // Make sure we only use 'auth' for qop (relevant for $this->encrypt_password()) - // If the is choking up on the changed parameter we may need to adjust encrypt_password() directly - if (isset($decoded['qop']) && $decoded['qop'] != 'auth' && strpos($decoded['qop'], 'auth') !== false) - { - $decoded['qop'] = 'auth'; - } - - $response = array( - 'username' => $this->username, - 'response' => $this->encrypt_password(array_merge($decoded, array('nc' => '00000001'))), - 'charset' => 'utf-8', - 'nc' => '00000001', - 'qop' => 'auth', // only auth being supported - ); - - foreach (array('nonce', 'digest-uri', 'realm', 'cnonce') as $key) - { - if (isset($decoded[$key])) - { - $response[$key] = $decoded[$key]; - } - } - - $this->send("" . base64_encode($this->implode_data($response)) . ''); - } - - return $this->response($this->listen()); - break; - - case 'failure': - $this->add_to_log('Error: Server sent "failure".'); - $this->disconnect(); - return false; - break; - - case 'proceed': - // continue switching to TLS - $meta = stream_get_meta_data($this->connection); - socket_set_blocking($this->connection, 1); - - if (!stream_socket_enable_crypto($this->connection, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) - { - $this->add_to_log('Error: TLS mode change failed.'); - return false; - } - - socket_set_blocking($this->connection, $meta['blocked']); - $this->session['tls'] = true; - - // new stream - $this->send("\n"); - $this->send("\n"); - - return $this->response($this->listen()); - break; - - case 'success': - // Yay, authentication successful. - $this->send("\n"); - $this->session['authenticated'] = true; - - // we have to wait for another response - return $this->response($this->listen()); - break; - - case 'iq': - // we are not interested in IQs we did not expect - if (!isset($xml['iq'][0]['@']['id'])) - { - return false; - } - - // multiple possibilities here - switch ($xml['iq'][0]['@']['id']) - { - case 'bind_1': - $this->session['jid'] = $xml['iq'][0]['#']['bind'][0]['#']['jid'][0]['#']; - - // and (maybe) yet another request to be able to send messages *finally* - if ($this->session['sess_required']) - { - $this->send(" - - "); - return $this->response($this->listen()); - } - - return true; - break; - - case 'sess_1': - return true; - break; - - case 'reg_1': - $this->send(" - - " . utf8_htmlspecialchars($this->username) . " - " . utf8_htmlspecialchars($this->password) . " - - "); - return $this->response($this->listen()); - break; - - case 'reg_2': - // registration end - if (isset($xml['iq'][0]['#']['error'])) - { - $this->add_to_log('Warning: Registration failed.'); - return false; - } - return true; - break; - - case 'unreg_1': - return true; - break; - - default: - $this->add_to_log('Notice: Received unexpected IQ.'); - return false; - break; - } - break; - - case 'message': - // we are only interested in content... - if (!isset($xml['message'][0]['#']['body'])) - { - return false; - } - - $message['body'] = $xml['message'][0]['#']['body'][0]['#']; - $message['from'] = $xml['message'][0]['@']['from']; - - if (isset($xml['message'][0]['#']['subject'])) - { - $message['subject'] = $xml['message'][0]['#']['subject'][0]['#']; - } - $this->session['messages'][] = $message; - break; - - default: - // hm...don't know this response - $this->add_to_log('Notice: Unknown server response (' . key($xml) . ')'); - return false; - break; - } - } - - public function send_message($to, $text, $subject = '', $type = 'normal') - { - if (!isset($this->session['jid'])) - { - return false; - } - - if (!in_array($type, array('chat', 'normal', 'error', 'groupchat', 'headline'))) - { - $type = 'normal'; - } - - return $this->send(" - " . utf8_htmlspecialchars($subject) . " - " . utf8_htmlspecialchars($text) . " - " - ); - } - - /** - * Encrypts a password as in RFC 2831 - * @param array $data Needs data from the client-server connection - * @access public - * @return string - */ - public function encrypt_password($data) - { - // let's me think about again... - foreach (array('realm', 'cnonce', 'digest-uri') as $key) - { - if (!isset($data[$key])) - { - $data[$key] = ''; - } - } - - $pack = md5($this->username . ':' . $data['realm'] . ':' . $this->password); - - if (isset($data['authzid'])) - { - $a1 = pack('H32', $pack) . sprintf(':%s:%s:%s', $data['nonce'], $data['cnonce'], $data['authzid']); - } - else - { - $a1 = pack('H32', $pack) . sprintf(':%s:%s', $data['nonce'], $data['cnonce']); - } - - // should be: qop = auth - $a2 = 'AUTHENTICATE:'. $data['digest-uri']; - - return md5(sprintf('%s:%s:%s:%s:%s:%s', md5($a1), $data['nonce'], $data['nc'], $data['cnonce'], $data['qop'], md5($a2))); - } - - /** - * parse_data like a="b",c="d",... or like a="a, b", c, d="e", f=g,... - * @param string $data - * @access private - * @return array a => b ... - */ - private static function parse_data($data) - { - $data = explode(',', $data); - $pairs = array(); - $key = false; - - foreach ($data as $pair) - { - $dd = strpos($pair, '='); - - if ($dd) - { - $key = trim(substr($pair, 0, $dd)); - $pairs[$key] = trim(trim(substr($pair, $dd + 1)), '"'); - } - else if (strpos(strrev(trim($pair)), '"') === 0 && $key) - { - // We are actually having something left from "a, b" values, add it to the last one we handled. - $pairs[$key] .= ',' . trim(trim($pair), '"'); - continue; - } - } - - return $pairs; - } - - /** - * opposite of jabber::parse_data() - * @param array $data - * @access private - * @return string - */ - private function implode_data($data) - { - $return = array(); - foreach ($data as $key => $value) - { - $return[] = $key . '="' . $value . '"'; - } - return implode(',', $return); - } - - /** - * xmlize() - * @author Hans Anderson - * @copyright Hans Anderson / http://www.hansanderson.com/php/xml/ - */ - private static function xmlize($data, $skip_white = 1, $encoding = 'UTF-8') - { - $data = trim($data); - - if (substr($data, 0, 5) != ''. $data . ''; - } - - $vals = $index = $array = array(); - $parser = xml_parser_create($encoding); - xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0); - xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, $skip_white); - xml_parse_into_struct($parser, $data, $vals, $index); - xml_parser_free($parser); - - $i = 0; - $tagname = $vals[$i]['tag']; - - $array[$tagname][0]['@'] = (isset($vals[$i]['attributes'])) ? $vals[$i]['attributes'] : array(); - $array[$tagname][0]['#'] = self::_xml_depth($vals, $i); - - if (substr($data, 0, 5) != ' \ No newline at end of file diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php deleted file mode 100644 index 8aba4ed255..0000000000 --- a/phpBB/includes/functions_messenger.php +++ /dev/null @@ -1,1440 +0,0 @@ -use_queue = (!$config['email_package_size']) ? false : $use_queue; - $this->subject = ''; - } - - /** - * Resets all the data (address, template file, etc etc) to default - */ - private function reset() - { - $this->addresses = $this->extra_headers = array(); - $this->vars = $this->msg = $this->replyto = $this->from = ''; - $this->mail_priority = MAIL_NORMAL_PRIORITY; - } - - /** - * Sets an email address to send to - */ - function to($address, $realname = '') - { - global $config; - - $pos = isset($this->addresses['to']) ? sizeof($this->addresses['to']) : 0; - - $this->addresses['to'][$pos]['email'] = trim($address); - - // If empty sendmail_path on windows, PHP changes the to line - if (!$config['smtp_delivery'] && DIRECTORY_SEPARATOR == '\\') - { - $this->addresses['to'][$pos]['name'] = ''; - } - else - { - $this->addresses['to'][$pos]['name'] = trim($realname); - } - } - - /** - * Sets an cc address to send to - */ - function cc($address, $realname = '') - { - $pos = isset($this->addresses['cc']) ? sizeof($this->addresses['cc']) : 0; - $this->addresses['cc'][$pos]['email'] = trim($address); - $this->addresses['cc'][$pos]['name'] = trim($realname); - } - - /** - * Sets an bcc address to send to - */ - function bcc($address, $realname = '') - { - $pos = isset($this->addresses['bcc']) ? sizeof($this->addresses['bcc']) : 0; - $this->addresses['bcc'][$pos]['email'] = trim($address); - $this->addresses['bcc'][$pos]['name'] = trim($realname); - } - - /** - * Sets a im contact to send to - */ - function im($address, $realname = '') - { - $pos = isset($this->addresses['im']) ? sizeof($this->addresses['im']) : 0; - $this->addresses['im'][$pos]['uid'] = trim($address); - $this->addresses['im'][$pos]['name'] = trim($realname); - } - - /** - * Set the reply to address - */ - function replyto($address) - { - $this->replyto = trim($address); - } - - /** - * Set the from address - */ - function from($address) - { - $this->from = trim($address); - } - - /** - * set up subject for mail - */ - function subject($subject = '') - { - $this->subject = trim($subject); - } - - /** - * set up extra mail headers - */ - function headers($headers) - { - $this->extra_headers[] = trim($headers); - } - - /** - * Set the email priority - */ - function set_mail_priority($priority = MAIL_NORMAL_PRIORITY) - { - $this->mail_priority = $priority; - } - - /** - * Set email template to use - */ - function template($template_file, $template_lang = '') - { - global $config, $phpbb_root_path; - - if (!trim($template_file)) - { - trigger_error('No template file set', E_USER_ERROR); - } - - if (!trim($template_lang)) - { - $template_lang = basename($config['default_lang']); - } - - if (empty($this->tpl_msg[$template_lang . $template_file])) - { - $tpl_file = "{$phpbb_root_path}language/$template_lang/email/$template_file.txt"; - - if (!file_exists($tpl_file)) - { - trigger_error("Could not find email template file [ $tpl_file ]", E_USER_ERROR); - } - - if (($data = @file_get_contents($tpl_file)) === false) - { - trigger_error("Failed opening template file [ $tpl_file ]", E_USER_ERROR); - } - - $this->tpl_msg[$template_lang . $template_file] = $data; - } - - $this->msg = $this->tpl_msg[$template_lang . $template_file]; - - return true; - } - - /** - * assign variables to email template - */ - function assign_vars($vars) - { - $this->vars = (empty($this->vars)) ? $vars : $this->vars + $vars; - } - - /** - * Send the mail out to the recipients set previously in var $this->addresses - */ - function send($method = NOTIFY_EMAIL, $break = false) - { - global $config, $user; - - // We add some standard variables we always use, no need to specify them always - $this->vars['U_BOARD'] = (!isset($this->vars['U_BOARD'])) ? generate_board_url() : $this->vars['U_BOARD']; - $this->vars['EMAIL_SIG'] = (!isset($this->vars['EMAIL_SIG'])) ? str_replace('
    ', "\n", "-- \n" . htmlspecialchars_decode($config['board_email_sig'])) : $this->vars['EMAIL_SIG']; - $this->vars['SITENAME'] = (!isset($this->vars['SITENAME'])) ? htmlspecialchars_decode($config['sitename']) : $this->vars['SITENAME']; - - // Escape all quotes, else the eval will fail. - $this->msg = str_replace ("'", "\'", $this->msg); - $this->msg = preg_replace('#\{([a-z0-9\-_]*?)\}#is', "' . ((isset(\$this->vars['\\1'])) ? \$this->vars['\\1'] : '') . '", $this->msg); - - eval("\$this->msg = '$this->msg';"); - - // We now try and pull a subject from the email body ... if it exists, - // do this here because the subject may contain a variable - $drop_header = ''; - $match = array(); - if (preg_match('#^(Subject:(.*?))$#m', $this->msg, $match)) - { - $this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : $user->lang['NO_EMAIL_SUBJECT']); - $drop_header .= '[\r\n]*?' . preg_quote($match[1], '#'); - } - else - { - $this->subject = (($this->subject != '') ? $this->subject : $user->lang['NO_EMAIL_SUBJECT']); - } - - if ($drop_header) - { - $this->msg = trim(preg_replace('#' . $drop_header . '#s', '', $this->msg)); - } - - if ($break) - { - return true; - } - - switch ($method) - { - case NOTIFY_EMAIL: - $result = $this->msg_email(); - break; - - case NOTIFY_IM: - $result = $this->msg_jabber(); - break; - - case NOTIFY_BOTH: - $result = $this->msg_email(); - $this->msg_jabber(); - break; - } - - $this->reset(); - return $result; - } - - /** - * Add error message to log - */ - public static function error($type, $msg) - { - global $user, $phpEx, $phpbb_root_path, $config; - - // Session doesn't exist, create it - if (!isset($user->session_id) || $user->session_id === '') - { - $user->session_begin(); - } - - $calling_page = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF']; - - $message = ''; - switch ($type) - { - case 'EMAIL': - $message = 'EMAIL/' . (($config['smtp_delivery']) ? 'SMTP' : 'PHP/' . $config['email_function_name'] . '()') . ''; - break; - - default: - $message = "$type"; - break; - } - - $message .= '
    ' . htmlspecialchars($calling_page) . '

    ' . $msg . '
    '; - add_log('critical', 'LOG_ERROR_' . $type, $message); - } - - /** - * Save to queue - */ - function save_queue() - { - global $config; - - if ($config['email_package_size'] && $this->use_queue && !empty($this->queue)) - { - $this->queue->save(); - return; - } - } - - /** - * Return email header - */ - private function build_header($to, $cc, $bcc) - { - global $config; - - $headers = array(); - - $headers[] = 'From: ' . $this->from; - - if ($cc) - { - $headers[] = 'Cc: ' . $cc; - } - - if ($bcc) - { - $headers[] = 'Bcc: ' . $bcc; - } - - $headers[] = 'Reply-To: ' . $this->replyto; - $headers[] = 'Return-Path: <' . $config['board_email'] . '>'; - $headers[] = 'Sender: <' . $config['board_email'] . '>'; - $headers[] = 'MIME-Version: 1.0'; - $headers[] = 'Message-ID: <' . md5(unique_id(time())) . '@' . $config['server_name'] . '>'; - $headers[] = 'Date: ' . date('r', time()); - $headers[] = 'Content-Type: text/plain; charset=UTF-8'; // format=flowed - $headers[] = 'Content-Transfer-Encoding: 8bit'; // 7bit - - $headers[] = 'X-Priority: ' . $this->mail_priority; - $headers[] = 'X-MSMail-Priority: ' . (($this->mail_priority == MAIL_LOW_PRIORITY) ? 'Low' : (($this->mail_priority == MAIL_NORMAL_PRIORITY) ? 'Normal' : 'High')); - $headers[] = 'X-Mailer: PhpBB3'; - $headers[] = 'X-MimeOLE: phpBB3'; - $headers[] = 'X-phpBB-Origin: phpbb://' . str_replace(array('http://', 'https://'), array('', ''), generate_board_url()); - - // We use \n here instead of \r\n because our smtp mailer is adjusting it to \r\n automatically, whereby the php mail function only works - // if using \n. - - if (sizeof($this->extra_headers)) - { - $headers[] = implode("\n", $this->extra_headers); - } - - return implode("\n", $headers); - } - - /** - * Send out emails - */ - private function msg_email() - { - global $config, $user; - - if (empty($config['email_enable'])) - { - return false; - } - - $use_queue = false; - if ($config['email_package_size'] && $this->use_queue) - { - if (empty($this->queue)) - { - $this->queue = new queue(); - $this->queue->init('email', $config['email_package_size']); - } - $use_queue = true; - } - - if (empty($this->replyto)) - { - $this->replyto = '<' . $config['board_contact'] . '>'; - } - - if (empty($this->from)) - { - $this->from = '<' . $config['board_contact'] . '>'; - } - - // Build to, cc and bcc strings - $to = $cc = $bcc = ''; - foreach ($this->addresses as $type => $address_ary) - { - if ($type == 'im') - { - continue; - } - - foreach ($address_ary as $which_ary) - { - $$type .= (($$type != '') ? ', ' : '') . (($which_ary['name'] != '') ? '"' . mail_encode($which_ary['name']) . '" <' . $which_ary['email'] . '>' : $which_ary['email']); - } - } - - // Build header - $headers = $this->build_header($to, $cc, $bcc); - - // Send message ... - if (!$use_queue) - { - $mail_to = ($to == '') ? 'undisclosed-recipients:;' : $to; - $err_msg = ''; - - if ($config['smtp_delivery']) - { - $result = smtpmail($this->addresses, mail_encode($this->subject), wordwrap(utf8_wordwrap($this->msg), 997, "\n", true), $err_msg, $headers); - } - else - { - ob_start(); - $result = $config['email_function_name']($mail_to, mail_encode($this->subject), wordwrap(utf8_wordwrap($this->msg), 997, "\n", true), $headers); - $err_msg = ob_get_clean(); - } - - if (!$result) - { - self::error('EMAIL', $err_msg); - return false; - } - } - else - { - $this->queue->put('email', array( - 'to' => $to, - 'addresses' => $this->addresses, - 'subject' => $this->subject, - 'msg' => $this->msg, - 'headers' => $headers) - ); - } - - return true; - } - - /** - * Send jabber message out - */ - private function msg_jabber() - { - global $config, $db, $user, $phpbb_root_path, $phpEx; - - if (empty($config['jab_enable']) || empty($config['jab_host']) || empty($config['jab_username']) || empty($config['jab_password'])) - { - return false; - } - - $use_queue = false; - if ($config['jab_package_size'] && $this->use_queue) - { - if (empty($this->queue)) - { - $this->queue = new queue(); - $this->queue->init('jabber', $config['jab_package_size']); - } - $use_queue = true; - } - - $addresses = array(); - foreach ($this->addresses['im'] as $type => $uid_ary) - { - $addresses[] = $uid_ary['uid']; - } - $addresses = array_unique($addresses); - - if (!$use_queue) - { - include_once($phpbb_root_path . 'includes/functions_jabber.' . $phpEx); - $this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], $config['jab_password'], $config['jab_use_ssl']); - - if (!$this->jabber->connect()) - { - self::error('JABBER', $user->lang['ERR_JAB_CONNECT'] . '
    ' . $this->jabber->get_log()); - return false; - } - - if (!$this->jabber->login()) - { - self::error('JABBER', $user->lang['ERR_JAB_AUTH'] . '
    ' . $this->jabber->get_log()); - return false; - } - - foreach ($addresses as $address) - { - $this->jabber->send_message($address, $this->msg, $this->subject); - } - - $this->jabber->disconnect(); - } - else - { - $this->queue->put('jabber', array( - 'addresses' => $addresses, - 'subject' => $this->subject, - 'msg' => $this->msg) - ); - } - unset($addresses); - return true; - } -} - -/** -* handling email and jabber queue -* @package phpBB3 -*/ -class queue -{ - private $data = array(); - private $queue_data = array(); - private $package_size = 0; - private $cache_file = ''; - - /** - * constructor - */ - function __construct() - { - global $phpEx, $phpbb_root_path; - - $this->data = array(); - $this->cache_file = "{$phpbb_root_path}cache/queue.$phpEx"; - } - - /** - * Init a queue object - */ - public function init($object, $package_size) - { - $this->data[$object] = array(); - $this->data[$object]['package_size'] = $package_size; - $this->data[$object]['data'] = array(); - } - - /** - * Put object in queue - */ - public function put($object, $scope) - { - $this->data[$object]['data'][] = $scope; - } - - /** - * Process queue - * Using lock file - */ - public function process() - { - global $db, $config, $phpEx, $phpbb_root_path, $user; - - set_config('last_queue_run', time(), true); - - // Delete stale lock file - if (file_exists($this->cache_file . '.lock') && !file_exists($this->cache_file)) - { - @unlink($this->cache_file . '.lock'); - return; - } - - if (!file_exists($this->cache_file) || (file_exists($this->cache_file . '.lock') && filemtime($this->cache_file) > time() - $config['queue_interval'])) - { - return; - } - - $fp = @fopen($this->cache_file . '.lock', 'wb'); - fclose($fp); - @chmod($this->cache_file . '.lock', 0666); - - include($this->cache_file); - - foreach ($this->queue_data as $object => $data_ary) - { - @set_time_limit(0); - - if (!isset($data_ary['package_size'])) - { - $data_ary['package_size'] = 0; - } - - $package_size = $data_ary['package_size']; - $num_items = (!$package_size || sizeof($data_ary['data']) < $package_size) ? sizeof($data_ary['data']) : $package_size; - - // If the amount of emails to be sent is way more than package_size than we need to increase it to prevent backlogs... - if (sizeof($data_ary['data']) > $package_size * 2.5) - { - $num_items = sizeof($data_ary['data']); - } - - switch ($object) - { - case 'email': - // Delete the email queued objects if mailing is disabled - if (!$config['email_enable']) - { - unset($this->queue_data['email']); - continue 2; - } - break; - - case 'jabber': - if (!$config['jab_enable']) - { - unset($this->queue_data['jabber']); - continue 2; - } - - include_once($phpbb_root_path . 'includes/functions_jabber.' . $phpEx); - $this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], $config['jab_password'], $config['jab_use_ssl']); - - if (!$this->jabber->connect()) - { - messenger::error('JABBER', $user->lang['ERR_JAB_CONNECT']); - continue 2; - } - - if (!$this->jabber->login()) - { - messenger::error('JABBER', $user->lang['ERR_JAB_AUTH']); - continue 2; - } - - break; - - default: - return; - } - - for ($i = 0; $i < $num_items; $i++) - { - // Make variables available... - extract(array_shift($this->queue_data[$object]['data'])); - - switch ($object) - { - case 'email': - $err_msg = ''; - $to = (!$to) ? 'undisclosed-recipients:;' : $to; - - if ($config['smtp_delivery']) - { - $result = smtpmail($addresses, mail_encode($subject), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $err_msg, $headers); - } - else - { - ob_start(); - $result = $config['email_function_name']($to, mail_encode($subject), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $headers); - $err_msg = ob_get_clean(); - } - - if (!$result) - { - @unlink($this->cache_file . '.lock'); - - messenger::error('EMAIL', $err_msg); - continue 2; - } - break; - - case 'jabber': - foreach ($addresses as $address) - { - if ($this->jabber->send_message($address, $msg, $subject) === false) - { - messenger::error('JABBER', $this->jabber->get_log()); - continue 3; - } - } - break; - } - } - - // No more data for this object? Unset it - if (!sizeof($this->queue_data[$object]['data'])) - { - unset($this->queue_data[$object]); - } - - // Post-object processing - switch ($object) - { - case 'jabber': - // Hang about a couple of secs to ensure the messages are - // handled, then disconnect - $this->jabber->disconnect(); - break; - } - } - - if (!sizeof($this->queue_data)) - { - @unlink($this->cache_file); - } - else - { - if ($fp = @fopen($this->cache_file, 'w')) - { - @flock($fp, LOCK_EX); - fwrite($fp, "queue_data = " . var_export($this->queue_data, true) . ";\n?>"); - @flock($fp, LOCK_UN); - fclose($fp); - - @chmod($this->cache_file, 0666); - } - } - - @unlink($this->cache_file . '.lock'); - } - - /** - * Save queue - */ - public function save() - { - if (!sizeof($this->data)) - { - return; - } - - if (file_exists($this->cache_file)) - { - include($this->cache_file); - - foreach ($this->queue_data as $object => $data_ary) - { - if (isset($this->data[$object]) && sizeof($this->data[$object])) - { - $this->data[$object]['data'] = array_merge($data_ary['data'], $this->data[$object]['data']); - } - else - { - $this->data[$object]['data'] = $data_ary['data']; - } - } - } - - if ($fp = @fopen($this->cache_file, 'w')) - { - @flock($fp, LOCK_EX); - fwrite($fp, "queue_data = " . var_export($this->data, true) . ";\n?>"); - @flock($fp, LOCK_UN); - fclose($fp); - - @chmod($this->cache_file, 0666); - } - } -} - -/** -* Replacement or substitute for PHP's mail command -*/ -function smtpmail($addresses, $subject, $message, &$err_msg, $headers = '') -{ - global $config, $user; - - // Fix any bare linefeeds in the message to make it RFC821 Compliant. - $message = preg_replace("#(? 1) ? join("\n", $headers) : $headers[0]; - } - $headers = chop($headers); - - // Make sure there are no bare linefeeds in the headers - $headers = preg_replace('#(?lang['NO_EMAIL_SUBJECT'])) ? $user->lang['NO_EMAIL_SUBJECT'] : 'No email subject specified'; - return false; - } - - if (trim($message) == '') - { - $err_msg = (isset($user->lang['NO_EMAIL_MESSAGE'])) ? $user->lang['NO_EMAIL_MESSAGE'] : 'Email message was blank'; - return false; - } - - $mail_rcpt = $mail_to = $mail_cc = array(); - - // Build correct addresses for RCPT TO command and the client side display (TO, CC) - if (isset($addresses['to']) && sizeof($addresses['to'])) - { - foreach ($addresses['to'] as $which_ary) - { - $mail_to[] = ($which_ary['name'] != '') ? mail_encode(trim($which_ary['name'])) . ' <' . trim($which_ary['email']) . '>' : '<' . trim($which_ary['email']) . '>'; - $mail_rcpt['to'][] = '<' . trim($which_ary['email']) . '>'; - } - } - - if (isset($addresses['bcc']) && sizeof($addresses['bcc'])) - { - foreach ($addresses['bcc'] as $which_ary) - { - $mail_rcpt['bcc'][] = '<' . trim($which_ary['email']) . '>'; - } - } - - if (isset($addresses['cc']) && sizeof($addresses['cc'])) - { - foreach ($addresses['cc'] as $which_ary) - { - $mail_cc[] = ($which_ary['name'] != '') ? mail_encode(trim($which_ary['name'])) . ' <' . trim($which_ary['email']) . '>' : '<' . trim($which_ary['email']) . '>'; - $mail_rcpt['cc'][] = '<' . trim($which_ary['email']) . '>'; - } - } - - $smtp = new smtp_class(); - - $errno = 0; - $errstr = ''; - - $smtp->add_backtrace('Connecting to ' . $config['smtp_host'] . ':' . $config['smtp_port']); - - // Ok we have error checked as much as we can to this point let's get on it already. - ob_start(); - $smtp->socket = fsockopen($config['smtp_host'], $config['smtp_port'], $errno, $errstr, 20); - $error_contents = ob_get_clean(); - - if (!$smtp->socket) - { - if ($errstr) - { - $errstr = utf8_convert_message($errstr); - } - - $err_msg = (isset($user->lang['NO_CONNECT_TO_SMTP_HOST'])) ? sprintf($user->lang['NO_CONNECT_TO_SMTP_HOST'], $errno, $errstr) : "Could not connect to smtp host : $errno : $errstr"; - $err_msg .= ($error_contents) ? '

    ' . htmlspecialchars($error_contents) : ''; - return false; - } - - // Wait for reply - if ($err_msg = $smtp->server_parse('220', __LINE__)) - { - $smtp->close_session($err_msg); - return false; - } - - // Let me in. This function handles the complete authentication process - if ($err_msg = $smtp->log_into_server($config['smtp_host'], $config['smtp_username'], $config['smtp_password'], $config['smtp_auth_method'])) - { - $smtp->close_session($err_msg); - return false; - } - - // From this point onward most server response codes should be 250 - // Specify who the mail is from.... - $smtp->server_send('MAIL FROM:<' . $config['board_email'] . '>'); - if ($err_msg = $smtp->server_parse('250', __LINE__)) - { - $smtp->close_session($err_msg); - return false; - } - - // Specify each user to send to and build to header. - $to_header = implode(', ', $mail_to); - $cc_header = implode(', ', $mail_cc); - - // Now tell the MTA to send the Message to the following people... [TO, BCC, CC] - $rcpt = false; - foreach ($mail_rcpt as $type => $mail_to_addresses) - { - foreach ($mail_to_addresses as $mail_to_address) - { - // Add an additional bit of error checking to the To field. - if (preg_match('#[^ ]+\@[^ ]+#', $mail_to_address)) - { - $smtp->server_send("RCPT TO:$mail_to_address"); - if ($err_msg = $smtp->server_parse('250', __LINE__)) - { - // We continue... if users are not resolved we do not care - if ($smtp->numeric_response_code != 550) - { - $smtp->close_session($err_msg); - return false; - } - } - else - { - $rcpt = true; - } - } - } - } - - // We try to send messages even if a few people do not seem to have valid email addresses, but if no one has, we have to exit here. - if (!$rcpt) - { - $user->session_begin(); - $err_msg .= '

    '; - $err_msg .= (isset($user->lang['INVALID_EMAIL_LOG'])) ? sprintf($user->lang['INVALID_EMAIL_LOG'], htmlspecialchars($mail_to_address)) : '' . htmlspecialchars($mail_to_address) . ' possibly an invalid email address?'; - $smtp->close_session($err_msg); - return false; - } - - // Ok now we tell the server we are ready to start sending data - $smtp->server_send('DATA'); - - // This is the last response code we look for until the end of the message. - if ($err_msg = $smtp->server_parse('354', __LINE__)) - { - $smtp->close_session($err_msg); - return false; - } - - // Send the Subject Line... - $smtp->server_send("Subject: $subject"); - - // Now the To Header. - $to_header = ($to_header == '') ? 'undisclosed-recipients:;' : $to_header; - $smtp->server_send("To: $to_header"); - - // Now the CC Header. - if ($cc_header != '') - { - $smtp->server_send("CC: $cc_header"); - } - - // Now any custom headers.... - $smtp->server_send("$headers\r\n"); - - // Ok now we are ready for the message... - $smtp->server_send($message); - - // Ok the all the ingredients are mixed in let's cook this puppy... - $smtp->server_send('.'); - if ($err_msg = $smtp->server_parse('250', __LINE__)) - { - $smtp->close_session($err_msg); - return false; - } - - // Now tell the server we are done and close the socket... - $smtp->server_send('QUIT'); - $smtp->close_session($err_msg); - - return true; -} - -/** -* SMTP Class -* Auth Mechanisms originally taken from the AUTH Modules found within the PHP Extension and Application Repository (PEAR) -* See docs/AUTHORS for more details -* @package phpBB3 -*/ -class smtp_class -{ - private $server_response = ''; - public $socket = 0; - private $responses = array(); - private $commands = array(); - public $numeric_response_code = 0; - - private $backtrace = false; - private $backtrace_log = array(); - - function __construct() - { - // Always create a backtrace for admins to identify SMTP problems - $this->backtrace = true; - $this->backtrace_log = array(); - } - - /** - * Add backtrace message for debugging - */ - public function add_backtrace($message) - { - if ($this->backtrace) - { - $this->backtrace_log[] = utf8_htmlspecialchars($message); - } - } - - /** - * Send command to smtp server - */ - public function server_send($command, $private_info = false) - { - fputs($this->socket, $command . "\r\n"); - - (!$private_info) ? $this->add_backtrace("# $command") : $this->add_backtrace('# Omitting sensitive information'); - - // We could put additional code here - } - - /** - * We use the line to give the support people an indication at which command the error occurred - */ - public function server_parse($response, $line) - { - global $user; - - $this->server_response = ''; - $this->responses = array(); - $this->numeric_response_code = 0; - - while (substr($this->server_response, 3, 1) != ' ') - { - if (!($this->server_response = fgets($this->socket, 256))) - { - return (isset($user->lang['NO_EMAIL_RESPONSE_CODE'])) ? $user->lang['NO_EMAIL_RESPONSE_CODE'] : 'Could not get mail server response codes'; - } - $this->responses[] = substr(rtrim($this->server_response), 4); - $this->numeric_response_code = (int) substr($this->server_response, 0, 3); - - $this->add_backtrace("LINE: $line <- {$this->server_response}"); - } - - if (!(substr($this->server_response, 0, 3) == $response)) - { - $this->numeric_response_code = (int) substr($this->server_response, 0, 3); - return (isset($user->lang['EMAIL_SMTP_ERROR_RESPONSE'])) ? sprintf($user->lang['EMAIL_SMTP_ERROR_RESPONSE'], $line, $this->server_response) : "Ran into problems sending Mail at Line $line. Response: $this->server_response"; - } - - return 0; - } - - /** - * Close session - */ - public function close_session(&$err_msg) - { - fclose($this->socket); - - if ($this->backtrace) - { - $message = '

    Backtrace

    ' . implode('
    ', $this->backtrace_log) . '

    '; - $err_msg .= $message; - } - } - - /** - * Log into server and get possible auth codes if neccessary - */ - public function log_into_server($hostname, $username, $password, $default_auth_method) - { - global $user; - - $err_msg = ''; - $local_host = php_uname('n'); - $local_host = (empty($local_host)) ? 'localhost' : $local_host; - - // If we are authenticating through pop-before-smtp, we - // have to login ones before we get authenticated - // NOTE: on some configurations the time between an update of the auth database takes so - // long that the first email send does not work. This is not a biggie on a live board (only - // the install mail will most likely fail) - but on a dynamic ip connection this might produce - // severe problems and is not fixable! - if ($default_auth_method == 'POP-BEFORE-SMTP' && $username && $password) - { - global $config; - - $errno = 0; - $errstr = ''; - - $this->server_send("QUIT"); - fclose($this->socket); - - $result = $this->pop_before_smtp($hostname, $username, $password); - $username = $password = $default_auth_method = ''; - - // We need to close the previous session, else the server is not - // able to get our ip for matching... - if (!$this->socket = @fsockopen($config['smtp_host'], $config['smtp_port'], $errno, $errstr, 10)) - { - if ($errstr) - { - $errstr = utf8_convert_message($errstr); - } - - $err_msg = (isset($user->lang['NO_CONNECT_TO_SMTP_HOST'])) ? sprintf($user->lang['NO_CONNECT_TO_SMTP_HOST'], $errno, $errstr) : "Could not connect to smtp host : $errno : $errstr"; - return $err_msg; - } - - // Wait for reply - if ($err_msg = $this->server_parse('220', __LINE__)) - { - $this->close_session($err_msg); - return $err_msg; - } - } - - // Try EHLO first - $this->server_send("EHLO {$local_host}"); - if ($err_msg = $this->server_parse('250', __LINE__)) - { - // a 503 response code means that we're already authenticated - if ($this->numeric_response_code == 503) - { - return false; - } - - // If EHLO fails, we try HELO - $this->server_send("HELO {$local_host}"); - if ($err_msg = $this->server_parse('250', __LINE__)) - { - return ($this->numeric_response_code == 503) ? false : $err_msg; - } - } - - foreach ($this->responses as $response) - { - $response = explode(' ', $response); - $response_code = $response[0]; - unset($response[0]); - $this->commands[$response_code] = implode(' ', $response); - } - - // If we are not authenticated yet, something might be wrong if no username and passwd passed - if (!$username || !$password) - { - return false; - } - - if (!isset($this->commands['AUTH'])) - { - return (isset($user->lang['SMTP_NO_AUTH_SUPPORT'])) ? $user->lang['SMTP_NO_AUTH_SUPPORT'] : 'SMTP server does not support authentication'; - } - - // Get best authentication method - $available_methods = explode(' ', $this->commands['AUTH']); - - // Define the auth ordering if the default auth method was not found - $auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5'); - $method = ''; - - if (in_array($default_auth_method, $available_methods)) - { - $method = $default_auth_method; - } - else - { - foreach ($auth_methods as $_method) - { - if (in_array($_method, $available_methods)) - { - $method = $_method; - break; - } - } - } - - if (!$method) - { - return (isset($user->lang['NO_SUPPORTED_AUTH_METHODS'])) ? $user->lang['NO_SUPPORTED_AUTH_METHODS'] : 'No supported authentication methods'; - } - - $method = strtolower(str_replace('-', '_', $method)); - return $this->$method($username, $password); - } - - /** - * Pop before smtp authentication - */ - private function pop_before_smtp($hostname, $username, $password) - { - global $user; - - if (!$this->socket = @fsockopen($hostname, 110, $errno, $errstr, 10)) - { - if ($errstr) - { - $errstr = utf8_convert_message($errstr); - } - - return (isset($user->lang['NO_CONNECT_TO_SMTP_HOST'])) ? sprintf($user->lang['NO_CONNECT_TO_SMTP_HOST'], $errno, $errstr) : "Could not connect to smtp host : $errno : $errstr"; - } - - $this->server_send("USER $username", true); - if ($err_msg = $this->server_parse('+OK', __LINE__)) - { - return $err_msg; - } - - $this->server_send("PASS $password", true); - if ($err_msg = $this->server_parse('+OK', __LINE__)) - { - return $err_msg; - } - - $this->server_send('QUIT'); - fclose($this->socket); - - return false; - } - - /** - * Plain authentication method - */ - private function plain($username, $password) - { - $this->server_send('AUTH PLAIN'); - if ($err_msg = $this->server_parse('334', __LINE__)) - { - return ($this->numeric_response_code == 503) ? false : $err_msg; - } - - $base64_method_plain = base64_encode("\0" . $username . "\0" . $password); - $this->server_send($base64_method_plain, true); - if ($err_msg = $this->server_parse('235', __LINE__)) - { - return $err_msg; - } - - return false; - } - - /** - * Login authentication method - */ - private function login($username, $password) - { - $this->server_send('AUTH LOGIN'); - if ($err_msg = $this->server_parse('334', __LINE__)) - { - return ($this->numeric_response_code == 503) ? false : $err_msg; - } - - $this->server_send(base64_encode($username), true); - if ($err_msg = $this->server_parse('334', __LINE__)) - { - return $err_msg; - } - - $this->server_send(base64_encode($password), true); - if ($err_msg = $this->server_parse('235', __LINE__)) - { - return $err_msg; - } - - return false; - } - - /** - * cram_md5 authentication method - */ - private function cram_md5($username, $password) - { - $this->server_send('AUTH CRAM-MD5'); - if ($err_msg = $this->server_parse('334', __LINE__)) - { - return ($this->numeric_response_code == 503) ? false : $err_msg; - } - - $md5_challenge = base64_decode($this->responses[0]); - $password = (strlen($password) > 64) ? pack('H32', md5($password)) : ((strlen($password) < 64) ? str_pad($password, 64, chr(0)) : $password); - $md5_digest = md5((substr($password, 0, 64) ^ str_repeat(chr(0x5C), 64)) . (pack('H32', md5((substr($password, 0, 64) ^ str_repeat(chr(0x36), 64)) . $md5_challenge)))); - - $base64_method_cram_md5 = base64_encode($username . ' ' . $md5_digest); - - $this->server_send($base64_method_cram_md5, true); - if ($err_msg = $this->server_parse('235', __LINE__)) - { - return $err_msg; - } - - return false; - } - - /** - * digest_md5 authentication method - * A real pain in the *** - */ - private function digest_md5($username, $password) - { - global $config, $user; - - $this->server_send('AUTH DIGEST-MD5'); - if ($err_msg = $this->server_parse('334', __LINE__)) - { - return ($this->numeric_response_code == 503) ? false : $err_msg; - } - - $md5_challenge = base64_decode($this->responses[0]); - - // Parse the md5 challenge - from AUTH_SASL (PEAR) - $tokens = array(); - while (preg_match('/^([a-z-]+)=("[^"]+(?lang['INVALID_DIGEST_CHALLENGE'])) ? $user->lang['INVALID_DIGEST_CHALLENGE'] : 'Invalid digest challenge'; - } - - $base64_method_digest_md5 = base64_encode($input_string); - $this->server_send($base64_method_digest_md5, true); - if ($err_msg = $this->server_parse('334', __LINE__)) - { - return $err_msg; - } - - $this->server_send(' '); - if ($err_msg = $this->server_parse('235', __LINE__)) - { - return $err_msg; - } - - return false; - } -} - -/** -* Encodes the given string for proper display in UTF-8. -* -* This version is using base64 encoded data. The downside of this -* is if the mail client does not understand this encoding the user -* is basically doomed with an unreadable subject. -* -* Please note that this version fully supports RFC 2045 section 6.8. -*/ -function mail_encode($str) -{ - // define start delimimter, end delimiter and spacer - $start = "=?UTF-8?B?"; - $end = "?="; - $spacer = $end . ' ' . $start; - $split_length = 64; - - $encoded_str = base64_encode($str); - - // If encoded string meets the limits, we just return with the correct data. - if (strlen($encoded_str) <= $split_length) - { - return $start . $encoded_str . $end; - } - - // If there is only ASCII data, we just return what we want, correctly splitting the lines. - if (strlen($str) === utf8_strlen($str)) - { - return $start . implode($spacer, str_split($encoded_str, $split_length)) . $end; - } - - // UTF-8 data, compose encoded lines - $array = utf8_str_split($str); - $str = ''; - - while (sizeof($array)) - { - $text = ''; - - while (sizeof($array) && intval((strlen($text . $array[0]) + 2) / 3) << 2 <= $split_length) - { - $text .= array_shift($array); - } - - $str .= $start . base64_encode($text) . $end . ' '; - } - - return substr($str, 0, -1); -} - -?> \ No newline at end of file diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php deleted file mode 100644 index f4ee454033..0000000000 --- a/phpBB/includes/functions_module.php +++ /dev/null @@ -1,847 +0,0 @@ -module_ary of all available - * modules for the given class (ucp, mcp and acp). Additionally - * $this->module_y_ary is created with indentation information for - * displaying the module list appropriately. Only modules for which - * the user has access rights are included in these lists. - */ - function list_modules($p_class) - { - global $auth, $db, $user, $cache; - global $config, $phpbb_root_path, $phpEx; - - // Sanitise for future path use, it's escaped as appropriate for queries - $this->p_class = str_replace(array('.', '/', '\\'), '', basename($p_class)); - - // Get cached modules - if (($this->module_cache = $cache->get('_modules_' . $this->p_class)) === false) - { - // Get modules - $sql = 'SELECT * - FROM ' . MODULES_TABLE . " - WHERE module_class = '" . $db->sql_escape($this->p_class) . "' - ORDER BY left_id ASC"; - $result = $db->sql_query($sql); - - $rows = array(); - while ($row = $db->sql_fetchrow($result)) - { - $rows[$row['module_id']] = $row; - } - $db->sql_freeresult($result); - - $this->module_cache = array(); - foreach ($rows as $module_id => $row) - { - $this->module_cache['modules'][] = $row; - $this->module_cache['parents'][$row['module_id']] = $this->get_parents($row['parent_id'], $row['left_id'], $row['right_id'], $rows); - } - unset($rows); - - $cache->put('_modules_' . $this->p_class, $this->module_cache); - } - - if (empty($this->module_cache)) - { - $this->module_cache = array('modules' => array(), 'parents' => array()); - } - - // We "could" build a true tree with this function - maybe mod authors want to use this... - // Functions for traversing and manipulating the tree are not available though - // We might re-structure the module system to use true trees in 3.2.x... - // $tree = $this->build_tree($this->module_cache['modules'], $this->module_cache['parents']); - - // Clean up module cache array to only let survive modules the user can access - $right_id = false; - foreach ($this->module_cache['modules'] as $key => $row) - { - // Not allowed to view module? - if (!$this->module_auth($row['module_auth'])) - { - unset($this->module_cache['modules'][$key]); - continue; - } - - // Category with no members, ignore - if (!$row['module_basename'] && ($row['left_id'] + 1 == $row['right_id'])) - { - unset($this->module_cache['modules'][$key]); - continue; - } - - // Skip branch - if ($right_id !== false) - { - if ($row['left_id'] < $right_id) - { - unset($this->module_cache['modules'][$key]); - continue; - } - - $right_id = false; - } - - // Not enabled? - if (!$row['module_enabled']) - { - // If category is disabled then disable every child too - unset($this->module_cache['modules'][$key]); - $right_id = $row['right_id']; - continue; - } - } - - // Re-index (this is needed, else we are not able to array_slice later) - $this->module_cache['modules'] = array_merge($this->module_cache['modules']); - - // Include MOD _info files for populating language entries within the menus - $this->add_mod_info($this->p_class); - - // Now build the module array, but exclude completely empty categories... - $right_id = false; - $names = array(); - - foreach ($this->module_cache['modules'] as $key => $row) - { - // Skip branch - if ($right_id !== false) - { - if ($row['left_id'] < $right_id) - { - continue; - } - - $right_id = false; - } - - // Category with no members on their way down (we have to check every level) - if (!$row['module_basename']) - { - $empty_category = true; - - // We go through the branch and look for an activated module - foreach (array_slice($this->module_cache['modules'], $key + 1) as $temp_row) - { - if ($temp_row['left_id'] > $row['left_id'] && $temp_row['left_id'] < $row['right_id']) - { - // Module there - if ($temp_row['module_basename'] && $temp_row['module_enabled']) - { - $empty_category = false; - break; - } - continue; - } - break; - } - - // Skip the branch - if ($empty_category) - { - $right_id = $row['right_id']; - continue; - } - } - - $depth = sizeof($this->module_cache['parents'][$row['module_id']]); - - // We need to prefix the functions to not create a naming conflict - - // Function for building 'url_extra' - $url_func = '_module_' . $row['module_basename'] . '_url'; - - // Function for building the language name - $lang_func = '_module_' . $row['module_basename'] . '_lang'; - - // Custom function for calling parameters on module init (for example assigning template variables) - $custom_func = '_module_' . $row['module_basename']; - - $names[$row['module_basename'] . '_' . $row['module_mode']][] = true; - - $module_row = array( - 'depth' => $depth, - - 'id' => (int) $row['module_id'], - 'parent' => (int) $row['parent_id'], - 'cat' => ($row['right_id'] > $row['left_id'] + 1) ? true : false, - - 'is_duplicate' => ($row['module_basename'] && sizeof($names[$row['module_basename'] . '_' . $row['module_mode']]) > 1) ? true : false, - - 'name' => (string) $row['module_basename'], - 'mode' => (string) $row['module_mode'], - 'display' => (int) $row['module_display'], - - 'url_extra' => (function_exists($url_func)) ? $url_func($row['module_mode'], $row) : '', - - 'lang' => ($row['module_basename'] && function_exists($lang_func)) ? $lang_func($row['module_mode'], $row['module_langname']) : ((!empty($user->lang[$row['module_langname']])) ? $user->lang[$row['module_langname']] : $row['module_langname']), - 'langname' => $row['module_langname'], - - 'left' => $row['left_id'], - 'right' => $row['right_id'], - ); - - if (function_exists($custom_func)) - { - $custom_func($row['module_mode'], $module_row); - } - - $this->module_ary[] = $module_row; - } - - unset($this->module_cache['modules'], $names); - } - - /** - * Check if a certain main module is accessible/loaded - * By giving the module mode you are able to additionally check for only one mode within the main module - * - * @param string $module_basename The module base name, for example logs, reports, main (for the mcp). - * @param mixed $module_mode The module mode to check. If provided the mode will be checked in addition for presence. - * - * @return bool Returns true if module is loaded and accessible, else returns false - */ - function loaded($module_basename, $module_mode = false) - { - if (empty($this->loaded_cache)) - { - $this->loaded_cache = array(); - - foreach ($this->module_ary as $row) - { - if (!$row['name']) - { - continue; - } - - if (!isset($this->loaded_cache[$row['name']])) - { - $this->loaded_cache[$row['name']] = array(); - } - - if (!$row['mode']) - { - continue; - } - - $this->loaded_cache[$row['name']][$row['mode']] = true; - } - } - - if ($module_mode === false) - { - return (isset($this->loaded_cache[$module_basename])) ? true : false; - } - - return (!empty($this->loaded_cache[$module_basename][$module_mode])) ? true : false; - } - - /** - * Check module authorisation - */ - function module_auth($module_auth, $forum_id = false) - { - global $auth, $config; - - $module_auth = trim($module_auth); - - // Generally allowed to access module if module_auth is empty - if (!$module_auth) - { - return true; - } - - // With the code below we make sure only those elements get eval'd we really want to be checked - preg_match_all('/(?: - "[^"\\\\]*(?:\\\\.[^"\\\\]*)*" | - \'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\' | - [(),] | - [^\s(),]+)/x', $module_auth, $match); - - $tokens = $match[0]; - for ($i = 0, $size = sizeof($tokens); $i < $size; $i++) - { - $token = &$tokens[$i]; - - switch ($token) - { - case ')': - case '(': - case '&&': - case '||': - case ',': - break; - - default: - if (!preg_match('#(?:acl_([a-z0-9_]+)(,\$id)?)|(?:\$id)|(?:aclf_([a-z0-9_]+))|(?:cfg_([a-z0-9_]+))|(?:request_([a-zA-Z0-9_]+))#', $token)) - { - $token = ''; - } - break; - } - } - - $module_auth = implode(' ', $tokens); - - // Make sure $id seperation is working fine - $module_auth = str_replace(' , ', ',', $module_auth); - - $forum_id = ($forum_id === false) ? $this->acl_forum_id : $forum_id; - - $is_auth = false; - eval('$is_auth = (int) (' . preg_replace(array('#acl_([a-z0-9_]+)(,\$id)?#', '#\$id#', '#aclf_([a-z0-9_]+)#', '#cfg_([a-z0-9_]+)#', '#request_([a-zA-Z0-9_]+)#'), array('(int) $auth->acl_get(\'\\1\'\\2)', '(int) $forum_id', '(int) $auth->acl_getf_global(\'\\1\')', '(int) $config[\'\\1\']', '!empty($_REQUEST[\'\\1\'])'), $module_auth) . ');'); - - return $is_auth; - } - - /** - * Set active module - */ - function set_active($id = false, $mode = false) - { - $icat = false; - $this->active_module = false; - - if (request_var('icat', '')) - { - $icat = $id; - $id = request_var('icat', ''); - } - - $category = false; - foreach ($this->module_ary as $row_id => $item_ary) - { - // If this is a module and it's selected, active - // If this is a category and the module is the first within it, active - // If this is a module and no mode selected, select first mode - // If no category or module selected, go active for first module in first category - if ( - (($item_ary['name'] === $id || $item_ary['id'] === (int) $id) && (($item_ary['mode'] == $mode && !$item_ary['cat']) || ($icat && $item_ary['cat']))) || - ($item_ary['parent'] === $category && !$item_ary['cat'] && !$icat && $item_ary['display']) || - (($item_ary['name'] === $id || $item_ary['id'] === (int) $id) && !$mode && !$item_ary['cat']) || - (!$id && !$mode && !$item_ary['cat'] && $item_ary['display']) - ) - { - if ($item_ary['cat']) - { - $id = $icat; - $icat = false; - - continue; - } - - $this->p_id = $item_ary['id']; - $this->p_parent = $item_ary['parent']; - $this->p_name = $item_ary['name']; - $this->p_mode = $item_ary['mode']; - $this->p_left = $item_ary['left']; - $this->p_right = $item_ary['right']; - - $this->module_cache['parents'] = $this->module_cache['parents'][$this->p_id]; - $this->active_module = $item_ary['id']; - $this->active_module_row_id = $row_id; - - break; - } - else if (($item_ary['cat'] && $item_ary['id'] === (int) $id) || ($item_ary['parent'] === $category && $item_ary['cat'])) - { - $category = $item_ary['id']; - } - } - } - - /** - * Loads currently active module - * - * This method loads a given module, passing it the relevant id and mode. - */ - function load_active($mode = false, $module_url = false, $execute_module = true) - { - global $phpbb_root_path, $phpbb_admin_path, $phpEx, $user; - - $module_path = $phpbb_root_path . 'includes/' . $this->p_class; - $icat = request_var('icat', ''); - - if ($this->active_module === false) - { - trigger_error('Module not accessible', E_USER_ERROR); - } - - if (!class_exists("{$this->p_class}_$this->p_name")) - { - if (!file_exists("$module_path/{$this->p_class}_$this->p_name.$phpEx")) - { - trigger_error("Cannot find module $module_path/{$this->p_class}_$this->p_name.$phpEx", E_USER_ERROR); - } - - include("$module_path/{$this->p_class}_$this->p_name.$phpEx"); - - if (!class_exists("{$this->p_class}_$this->p_name")) - { - trigger_error("Module file $module_path/{$this->p_class}_$this->p_name.$phpEx does not contain correct class [{$this->p_class}_$this->p_name]", E_USER_ERROR); - } - - if (!empty($mode)) - { - $this->p_mode = $mode; - } - - // Create a new instance of the desired module ... if it has a - // constructor it will of course be executed - $instance = "{$this->p_class}_$this->p_name"; - - $this->module = new $instance($this); - - // We pre-define the action parameter we are using all over the place - if (defined('IN_ADMIN')) - { - // Is first module automatically enabled a duplicate and the category not passed yet? - if (!$icat && $this->module_ary[$this->active_module_row_id]['is_duplicate']) - { - $icat = $this->module_ary[$this->active_module_row_id]['parent']; - } - - // Not being able to overwrite ;) - $this->module->u_action = append_sid("{$phpbb_admin_path}index.$phpEx", "i={$this->p_name}") . (($icat) ? '&icat=' . $icat : '') . "&mode={$this->p_mode}"; - } - else - { - // If user specified the module url we will use it... - if ($module_url !== false) - { - $this->module->u_action = $module_url; - } - else - { - $this->module->u_action = $phpbb_root_path . (($user->page['page_dir']) ? $user->page['page_dir'] . '/' : '') . $user->page['page_name']; - } - - $this->module->u_action = append_sid($this->module->u_action, "i={$this->p_name}") . (($icat) ? '&icat=' . $icat : '') . "&mode={$this->p_mode}"; - } - - // Add url_extra parameter to u_action url - if (!empty($this->module_ary) && $this->active_module !== false && $this->module_ary[$this->active_module_row_id]['url_extra']) - { - $this->module->u_action .= $this->module_ary[$this->active_module_row_id]['url_extra']; - } - - // Assign the module path for re-usage - $this->module->module_path = $module_path . '/'; - - // Execute the main method for the new instance, we send the module id and mode as parameters - // Users are able to call the main method after this function to be able to assign additional parameters manually - if ($execute_module) - { - $this->module->main($this->p_name, $this->p_mode); - } - - return; - } - } - - /** - * Appending url parameter to the currently active module. - * - * This function is called for adding specific url parameters while executing the current module. - * It is doing the same as the _module_{name}_url() function, apart from being able to be called after - * having dynamically parsed specific parameters. This allows more freedom in choosing additional parameters. - * One example can be seen in /includes/mcp/mcp_notes.php - $this->p_master->adjust_url() call. - * - * @param string $url_extra Extra url parameters, e.g.: &u=$user_id - * - */ - function adjust_url($url_extra) - { - if (empty($this->module_ary[$this->active_module_row_id])) - { - return; - } - - $row = &$this->module_ary[$this->active_module_row_id]; - - // We check for the same url_extra in $row['url_extra'] to overcome doubled additions... - if (strpos($row['url_extra'], $url_extra) === false) - { - $row['url_extra'] .= $url_extra; - } - } - - /** - * Check if a module is active - */ - function is_active($id, $mode = false) - { - // If we find a name by this id and being enabled we have our active one... - foreach ($this->module_ary as $row_id => $item_ary) - { - if (($item_ary['name'] === $id || $item_ary['id'] === (int) $id) && $item_ary['display']) - { - if ($mode === false || $mode === $item_ary['mode']) - { - return true; - } - } - } - - return false; - } - - /** - * Get parents - */ - function get_parents($parent_id, $left_id, $right_id, &$all_parents) - { - global $db; - - $parents = array(); - - if ($parent_id > 0) - { - foreach ($all_parents as $module_id => $row) - { - if ($row['left_id'] < $left_id && $row['right_id'] > $right_id) - { - $parents[$module_id] = $row['parent_id']; - } - - if ($row['left_id'] > $left_id) - { - break; - } - } - } - - return $parents; - } - - /** - * Get tree branch - */ - function get_branch($left_id, $right_id, $remaining) - { - $branch = array(); - - foreach ($remaining as $key => $row) - { - if ($row['left_id'] > $left_id && $row['left_id'] < $right_id) - { - $branch[] = $row; - continue; - } - break; - } - - return $branch; - } - - /** - * Build true binary tree from given array - * Not in use - */ - function build_tree(&$modules, &$parents) - { - $tree = array(); - - foreach ($modules as $row) - { - $branch = &$tree; - - if ($row['parent_id']) - { - // Go through the tree to find our branch - $parent_tree = $parents[$row['module_id']]; - - foreach ($parent_tree as $id => $value) - { - if (!isset($branch[$id]) && isset($branch['child'])) - { - $branch = &$branch['child']; - } - $branch = &$branch[$id]; - } - $branch = &$branch['child']; - } - - $branch[$row['module_id']] = $row; - if (!isset($branch[$row['module_id']]['child'])) - { - $branch[$row['module_id']]['child'] = array(); - } - } - - return $tree; - } - - /** - * Build navigation structure - */ - function assign_tpl_vars($module_url) - { - global $template; - - $current_id = $right_id = false; - - // Make sure the module_url has a question mark set, effectively determining the delimiter to use - $delim = (strpos($module_url, '?') === false) ? '?' : '&'; - - $current_padding = $current_depth = 0; - $linear_offset = 'l_block1'; - $tabular_offset = 't_block2'; - - // Generate the list of modules, we'll do this in two ways ... - // 1) In a linear fashion - // 2) In a combined tabbed + linear fashion ... tabs for the categories - // and a linear list for subcategories/items - foreach ($this->module_ary as $row_id => $item_ary) - { - // Skip hidden modules - if (!$item_ary['display']) - { - continue; - } - - // Skip branch - if ($right_id !== false) - { - if ($item_ary['left'] < $right_id) - { - continue; - } - - $right_id = false; - } - - // Category with no members on their way down (we have to check every level) - if (!$item_ary['name']) - { - $empty_category = true; - - // We go through the branch and look for an activated module - foreach (array_slice($this->module_ary, $row_id + 1) as $temp_row) - { - if ($temp_row['left'] > $item_ary['left'] && $temp_row['left'] < $item_ary['right']) - { - // Module there and displayed? - if ($temp_row['name'] && $temp_row['display']) - { - $empty_category = false; - break; - } - continue; - } - break; - } - - // Skip the branch - if ($empty_category) - { - $right_id = $item_ary['right']; - continue; - } - } - - // Select first id we can get - if (!$current_id && (isset($this->module_cache['parents'][$item_ary['id']]) || $item_ary['id'] == $this->p_id)) - { - $current_id = $item_ary['id']; - } - - $depth = $item_ary['depth']; - - if ($depth > $current_depth) - { - $linear_offset = $linear_offset . '.l_block' . ($depth + 1); - $tabular_offset = ($depth + 1 > 2) ? $tabular_offset . '.t_block' . ($depth + 1) : $tabular_offset; - } - else if ($depth < $current_depth) - { - for ($i = $current_depth - $depth; $i > 0; $i--) - { - $linear_offset = substr($linear_offset, 0, strrpos($linear_offset, '.')); - $tabular_offset = ($i + $depth > 1) ? substr($tabular_offset, 0, strrpos($tabular_offset, '.')) : $tabular_offset; - } - } - - $u_title = $module_url . $delim . 'i=' . (($item_ary['cat']) ? $item_ary['id'] : $item_ary['name'] . (($item_ary['is_duplicate']) ? '&icat=' . $current_id : '') . '&mode=' . $item_ary['mode']); - - // Was not allowed in categories before - /*!$item_ary['cat'] && */ - $u_title .= (isset($item_ary['url_extra'])) ? $item_ary['url_extra'] : ''; - - // Only output a categories items if it's currently selected - if (!$depth || ($depth && (in_array($item_ary['parent'], array_values($this->module_cache['parents'])) || $item_ary['parent'] == $this->p_parent))) - { - $use_tabular_offset = (!$depth) ? 't_block1' : $tabular_offset; - - $tpl_ary = array( - 'L_TITLE' => $item_ary['lang'], - 'S_SELECTED' => (isset($this->module_cache['parents'][$item_ary['id']]) || $item_ary['id'] == $this->p_id) ? true : false, - 'U_TITLE' => $u_title - ); - - $template->assign_block_vars($use_tabular_offset, array_merge($tpl_ary, array_change_key_case($item_ary, CASE_UPPER))); - } - - $tpl_ary = array( - 'L_TITLE' => $item_ary['lang'], - 'S_SELECTED' => (isset($this->module_cache['parents'][$item_ary['id']]) || $item_ary['id'] == $this->p_id) ? true : false, - 'U_TITLE' => $u_title - ); - - $template->assign_block_vars($linear_offset, array_merge($tpl_ary, array_change_key_case($item_ary, CASE_UPPER))); - - $current_depth = $depth; - } - } - - /** - * Returns desired template name - */ - function get_tpl_name() - { - return $this->module->tpl_name . '.html'; - } - - /** - * Returns the desired page title - */ - function get_page_title() - { - global $user; - - if (!isset($this->module->page_title)) - { - return ''; - } - - return (isset($user->lang[$this->module->page_title])) ? $user->lang[$this->module->page_title] : $this->module->page_title; - } - - /** - * Load module as the current active one without the need for registering it - */ - function load($class, $name, $mode = false) - { - $this->p_class = $class; - $this->p_name = $name; - - // Set active module to true instead of using the id - $this->active_module = true; - - $this->load_active($mode); - } - - /** - * Display module - */ - function display($page_title, $display_online_list = true) - { - global $template, $user; - - // Generate the page - if (defined('IN_ADMIN') && isset($user->data['session_admin']) && $user->data['session_admin']) - { - adm_page_header($page_title); - } - else - { - page_header($page_title, $display_online_list); - } - - $template->set_filenames(array( - 'body' => $this->get_tpl_name()) - ); - - if (defined('IN_ADMIN') && isset($user->data['session_admin']) && $user->data['session_admin']) - { - adm_page_footer(); - } - else - { - page_footer(); - } - } - - /** - * Toggle whether this module will be displayed or not - */ - function set_display($id, $mode = false, $display = true) - { - foreach ($this->module_ary as $row_id => $item_ary) - { - if (($item_ary['name'] === $id || $item_ary['id'] === (int) $id) && (!$mode || $item_ary['mode'] === $mode)) - { - $this->module_ary[$row_id]['display'] = (int) $display; - } - } - } - - /** - * Add custom MOD info language file - */ - function add_mod_info($module_class) - { - global $user, $phpEx; - - if (file_exists($user->lang_path . 'mods')) - { - $add_files = array(); - - $dir = @opendir($user->lang_path . 'mods'); - - if ($dir) - { - while (($entry = readdir($dir)) !== false) - { - if (strpos($entry, 'info_' . strtolower($module_class) . '_') === 0 && substr(strrchr($entry, '.'), 1) == $phpEx) - { - $add_files[] = 'mods/' . substr(basename($entry), 0, -(strlen($phpEx) + 1)); - } - } - closedir($dir); - } - - if (sizeof($add_files)) - { - $user->add_lang($add_files); - } - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/functions_post.php b/phpBB/includes/functions_post.php new file mode 100644 index 0000000000..b92394e190 --- /dev/null +++ b/phpBB/includes/functions_post.php @@ -0,0 +1,887 @@ +#', '#"#'); +$html_entities_replace = array('&', '<', '>', '"'); + +$unhtml_specialchars_match = array('#>#', '#<#', '#"#', '#&#'); +$unhtml_specialchars_replace = array('>', '<', '"', '&'); + +// +// This function will prepare a posted message for +// entry into the database. +// +function prepare_message($message, $html_on, $bbcode_on, $smile_on, $bbcode_uid = 0) +{ + global $board_config, $html_entities_match, $html_entities_replace; + + // + // Clean up the message + // + $message = trim($message); + + if ($html_on) + { + // If HTML is on, we try to make it safe + // This approach is quite agressive and anything that does not look like a valid tag + // is going to get converted to HTML entities + $message = stripslashes($message); + $html_match = '#<[^\w<]*(\w+)((?:"[^"]*"|\'[^\']*\'|[^<>\'"])+)?>#'; + $matches = array(); + + $message_split = preg_split($html_match, $message); + preg_match_all($html_match, $message, $matches); + + $message = ''; + + foreach ($message_split as $part) + { + $tag = array(array_shift($matches[0]), array_shift($matches[1]), array_shift($matches[2])); + $message .= preg_replace($html_entities_match, $html_entities_replace, $part) . clean_html($tag); + } + + $message = addslashes($message); + $message = str_replace('"', '\"', $message); + } + else + { + $message = preg_replace($html_entities_match, $html_entities_replace, $message); + } + + if($bbcode_on && $bbcode_uid != '') + { + $message = bbencode_first_pass($message, $bbcode_uid); + } + + return $message; +} + +function unprepare_message($message) +{ + global $unhtml_specialchars_match, $unhtml_specialchars_replace; + + return preg_replace($unhtml_specialchars_match, $unhtml_specialchars_replace, $message); +} + +// +// Prepare a message for posting +// +function prepare_post(&$mode, &$post_data, &$bbcode_on, &$html_on, &$smilies_on, &$error_msg, &$username, &$bbcode_uid, &$subject, &$message, &$poll_title, &$poll_options, &$poll_length) +{ + global $board_config, $userdata, $lang, $phpEx, $phpbb_root_path; + + // Check username + if (!empty($username)) + { + $username = phpbb_clean_username($username); + + if (!$userdata['session_logged_in'] || ($userdata['session_logged_in'] && $username != $userdata['username'])) + { + include($phpbb_root_path . 'includes/functions_validate.'.$phpEx); + + $result = validate_username($username); + if ($result['error']) + { + $error_msg .= (!empty($error_msg)) ? '
    ' . $result['error_msg'] : $result['error_msg']; + } + } + else + { + $username = ''; + } + } + + // Check subject + if (!empty($subject)) + { + $subject = htmlspecialchars(trim($subject)); + } + else if ($mode == 'newtopic' || ($mode == 'editpost' && $post_data['first_post'])) + { + $error_msg .= (!empty($error_msg)) ? '
    ' . $lang['Empty_subject'] : $lang['Empty_subject']; + } + + // Check message + if (!empty($message)) + { + $bbcode_uid = ($bbcode_on) ? make_bbcode_uid() : ''; + $message = prepare_message(trim($message), $html_on, $bbcode_on, $smilies_on, $bbcode_uid); + } + else if ($mode != 'delete' && $mode != 'poll_delete') + { + $error_msg .= (!empty($error_msg)) ? '
    ' . $lang['Empty_message'] : $lang['Empty_message']; + } + + // + // Handle poll stuff + // + if ($mode == 'newtopic' || ($mode == 'editpost' && $post_data['first_post'])) + { + $poll_length = (isset($poll_length)) ? max(0, intval($poll_length)) : 0; + + if (!empty($poll_title)) + { + $poll_title = htmlspecialchars(trim($poll_title)); + } + + if(!empty($poll_options)) + { + $temp_option_text = array(); + while(list($option_id, $option_text) = @each($poll_options)) + { + $option_text = trim($option_text); + if (!empty($option_text)) + { + $temp_option_text[intval($option_id)] = htmlspecialchars($option_text); + } + } + $option_text = $temp_option_text; + + if (count($poll_options) < 2) + { + $error_msg .= (!empty($error_msg)) ? '
    ' . $lang['To_few_poll_options'] : $lang['To_few_poll_options']; + } + else if (count($poll_options) > $board_config['max_poll_options']) + { + $error_msg .= (!empty($error_msg)) ? '
    ' . $lang['To_many_poll_options'] : $lang['To_many_poll_options']; + } + else if ($poll_title == '') + { + $error_msg .= (!empty($error_msg)) ? '
    ' . $lang['Empty_poll_title'] : $lang['Empty_poll_title']; + } + } + } + + return; +} + +// +// Post a new topic/reply/poll or edit existing post/poll +// +function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_id, &$post_id, &$poll_id, &$topic_type, &$bbcode_on, &$html_on, &$smilies_on, &$attach_sig, &$bbcode_uid, $post_username, $post_subject, $post_message, $poll_title, &$poll_options, &$poll_length) +{ + global $board_config, $lang, $db, $phpbb_root_path, $phpEx; + global $userdata, $user_ip; + + include($phpbb_root_path . 'includes/functions_search.'.$phpEx); + + $current_time = time(); + + if ($mode == 'newtopic' || $mode == 'reply' || $mode == 'editpost') + { + // + // Flood control + // + $where_sql = ($userdata['user_id'] == ANONYMOUS) ? "poster_ip = '$user_ip'" : 'poster_id = ' . $userdata['user_id']; + $sql = "SELECT MAX(post_time) AS last_post_time + FROM " . POSTS_TABLE . " + WHERE $where_sql"; + if ($result = $db->sql_query($sql)) + { + if ($row = $db->sql_fetchrow($result)) + { + if (intval($row['last_post_time']) > 0 && ($current_time - intval($row['last_post_time'])) < intval($board_config['flood_interval'])) + { + message_die(GENERAL_MESSAGE, $lang['Flood_Error']); + } + } + } + } + + if ($mode == 'editpost') + { + remove_search_post($post_id); + } + + if ($mode == 'newtopic' || ($mode == 'editpost' && $post_data['first_post'])) + { + $topic_vote = (!empty($poll_title) && count($poll_options) >= 2) ? 1 : 0; + + $sql = ($mode != "editpost") ? "INSERT INTO " . TOPICS_TABLE . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type, topic_vote) VALUES ('$post_subject', " . $userdata['user_id'] . ", $current_time, $forum_id, " . TOPIC_UNLOCKED . ", $topic_type, $topic_vote)" : "UPDATE " . TOPICS_TABLE . " SET topic_title = '$post_subject', topic_type = $topic_type " . (($post_data['edit_vote'] || !empty($poll_title)) ? ", topic_vote = " . $topic_vote : "") . " WHERE topic_id = $topic_id"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql); + } + + if ($mode == 'newtopic') + { + $topic_id = $db->sql_nextid(); + } + } + + $edited_sql = ($mode == 'editpost' && !$post_data['last_post'] && $post_data['poster_post']) ? ", post_edit_time = $current_time, post_edit_count = post_edit_count + 1 " : ""; + $sql = ($mode != "editpost") ? "INSERT INTO " . POSTS_TABLE . " (topic_id, forum_id, poster_id, post_username, post_time, poster_ip, enable_bbcode, enable_html, enable_smilies, enable_sig) VALUES ($topic_id, $forum_id, " . $userdata['user_id'] . ", '$post_username', $current_time, '$user_ip', $bbcode_on, $html_on, $smilies_on, $attach_sig)" : "UPDATE " . POSTS_TABLE . " SET post_username = '$post_username', enable_bbcode = $bbcode_on, enable_html = $html_on, enable_smilies = $smilies_on, enable_sig = $attach_sig" . $edited_sql . " WHERE post_id = $post_id"; + if (!$db->sql_query($sql, BEGIN_TRANSACTION)) + { + message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql); + } + + if ($mode != 'editpost') + { + $post_id = $db->sql_nextid(); + } + + $sql = ($mode != 'editpost') ? "INSERT INTO " . POSTS_TEXT_TABLE . " (post_id, post_subject, bbcode_uid, post_text) VALUES ($post_id, '$post_subject', '$bbcode_uid', '$post_message')" : "UPDATE " . POSTS_TEXT_TABLE . " SET post_text = '$post_message', bbcode_uid = '$bbcode_uid', post_subject = '$post_subject' WHERE post_id = $post_id"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql); + } + + add_search_words('single', $post_id, stripslashes($post_message), stripslashes($post_subject)); + + // + // Add poll + // + if (($mode == 'newtopic' || ($mode == 'editpost' && $post_data['edit_poll'])) && !empty($poll_title) && count($poll_options) >= 2) + { + $sql = (!$post_data['has_poll']) ? "INSERT INTO " . VOTE_DESC_TABLE . " (topic_id, vote_text, vote_start, vote_length) VALUES ($topic_id, '$poll_title', $current_time, " . ($poll_length * 86400) . ")" : "UPDATE " . VOTE_DESC_TABLE . " SET vote_text = '$poll_title', vote_length = " . ($poll_length * 86400) . " WHERE topic_id = $topic_id"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql); + } + + $delete_option_sql = ''; + $old_poll_result = array(); + if ($mode == 'editpost' && $post_data['has_poll']) + { + $sql = "SELECT vote_option_id, vote_result + FROM " . VOTE_RESULTS_TABLE . " + WHERE vote_id = $poll_id + ORDER BY vote_option_id ASC"; + if (!($result = $db->sql_query($sql))) + { + message_die(GENERAL_ERROR, 'Could not obtain vote data results for this topic', '', __LINE__, __FILE__, $sql); + } + + while ($row = $db->sql_fetchrow($result)) + { + $old_poll_result[$row['vote_option_id']] = $row['vote_result']; + + if (!isset($poll_options[$row['vote_option_id']])) + { + $delete_option_sql .= ($delete_option_sql != '') ? ', ' . $row['vote_option_id'] : $row['vote_option_id']; + } + } + } + else + { + $poll_id = $db->sql_nextid(); + } + + @reset($poll_options); + + $poll_option_id = 1; + while (list($option_id, $option_text) = each($poll_options)) + { + if (!empty($option_text)) + { + $option_text = str_replace("\'", "''", htmlspecialchars($option_text)); + $poll_result = ($mode == "editpost" && isset($old_poll_result[$option_id])) ? $old_poll_result[$option_id] : 0; + + $sql = ($mode != "editpost" || !isset($old_poll_result[$option_id])) ? "INSERT INTO " . VOTE_RESULTS_TABLE . " (vote_id, vote_option_id, vote_option_text, vote_result) VALUES ($poll_id, $poll_option_id, '$option_text', $poll_result)" : "UPDATE " . VOTE_RESULTS_TABLE . " SET vote_option_text = '$option_text', vote_result = $poll_result WHERE vote_option_id = $option_id AND vote_id = $poll_id"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql); + } + $poll_option_id++; + } + } + + if ($delete_option_sql != '') + { + $sql = "DELETE FROM " . VOTE_RESULTS_TABLE . " + WHERE vote_option_id IN ($delete_option_sql) + AND vote_id = $poll_id"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Error deleting pruned poll options', '', __LINE__, __FILE__, $sql); + } + } + } + + $meta = ''; + $message = $lang['Stored'] . '

    ' . sprintf($lang['Click_view_message'], '', '') . '

    ' . sprintf($lang['Click_return_forum'], '', ''); + + return false; +} + +// +// Update post stats and details +// +function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_id, &$user_id) +{ + global $db; + + $sign = ($mode == 'delete') ? '- 1' : '+ 1'; + $forum_update_sql = "forum_posts = forum_posts $sign"; + $topic_update_sql = ''; + + if ($mode == 'delete') + { + if ($post_data['last_post']) + { + if ($post_data['first_post']) + { + $forum_update_sql .= ', forum_topics = forum_topics - 1'; + } + else + { + + $topic_update_sql .= 'topic_replies = topic_replies - 1'; + + $sql = "SELECT MAX(post_id) AS last_post_id + FROM " . POSTS_TABLE . " + WHERE topic_id = $topic_id"; + if (!($result = $db->sql_query($sql))) + { + message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql); + } + + if ($row = $db->sql_fetchrow($result)) + { + $topic_update_sql .= ', topic_last_post_id = ' . $row['last_post_id']; + } + } + + if ($post_data['last_topic']) + { + $sql = "SELECT MAX(post_id) AS last_post_id + FROM " . POSTS_TABLE . " + WHERE forum_id = $forum_id"; + if (!($result = $db->sql_query($sql))) + { + message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql); + } + + if ($row = $db->sql_fetchrow($result)) + { + $forum_update_sql .= ($row['last_post_id']) ? ', forum_last_post_id = ' . $row['last_post_id'] : ', forum_last_post_id = 0'; + } + } + } + else if ($post_data['first_post']) + { + $sql = "SELECT MIN(post_id) AS first_post_id + FROM " . POSTS_TABLE . " + WHERE topic_id = $topic_id"; + if (!($result = $db->sql_query($sql))) + { + message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql); + } + + if ($row = $db->sql_fetchrow($result)) + { + $topic_update_sql .= 'topic_replies = topic_replies - 1, topic_first_post_id = ' . $row['first_post_id']; + } + } + else + { + $topic_update_sql .= 'topic_replies = topic_replies - 1'; + } + } + else if ($mode != 'poll_delete') + { + $forum_update_sql .= ", forum_last_post_id = $post_id" . (($mode == 'newtopic') ? ", forum_topics = forum_topics $sign" : ""); + $topic_update_sql = "topic_last_post_id = $post_id" . (($mode == 'reply') ? ", topic_replies = topic_replies $sign" : ", topic_first_post_id = $post_id"); + } + else + { + $topic_update_sql .= 'topic_vote = 0'; + } + + if ($mode != 'poll_delete') + { + $sql = "UPDATE " . FORUMS_TABLE . " SET + $forum_update_sql + WHERE forum_id = $forum_id"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql); + } + } + + if ($topic_update_sql != '') + { + $sql = "UPDATE " . TOPICS_TABLE . " SET + $topic_update_sql + WHERE topic_id = $topic_id"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql); + } + } + + if ($mode != 'poll_delete') + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_posts = user_posts $sign + WHERE user_id = $user_id"; + if (!$db->sql_query($sql, END_TRANSACTION)) + { + message_die(GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql); + } + } + + return; +} + +// +// Delete a post/poll +// +function delete_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_id, &$post_id, &$poll_id) +{ + global $board_config, $lang, $db, $phpbb_root_path, $phpEx; + global $userdata, $user_ip; + + if ($mode != 'poll_delete') + { + include($phpbb_root_path . 'includes/functions_search.'.$phpEx); + + $sql = "DELETE FROM " . POSTS_TABLE . " + WHERE post_id = $post_id"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . POSTS_TEXT_TABLE . " + WHERE post_id = $post_id"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql); + } + + if ($post_data['last_post']) + { + if ($post_data['first_post']) + { + $forum_update_sql .= ', forum_topics = forum_topics - 1'; + $sql = "DELETE FROM " . TOPICS_TABLE . " + WHERE topic_id = $topic_id + OR topic_moved_id = $topic_id"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " + WHERE topic_id = $topic_id"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql); + } + } + } + + remove_search_post($post_id); + } + + if ($mode == 'poll_delete' || ($mode == 'delete' && $post_data['first_post'] && $post_data['last_post']) && $post_data['has_poll'] && $post_data['edit_poll']) + { + $sql = "DELETE FROM " . VOTE_DESC_TABLE . " + WHERE topic_id = $topic_id"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . VOTE_RESULTS_TABLE . " + WHERE vote_id = $poll_id"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . VOTE_USERS_TABLE . " + WHERE vote_id = $poll_id"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Error in deleting poll', '', __LINE__, __FILE__, $sql); + } + } + + if ($mode == 'delete' && $post_data['first_post'] && $post_data['last_post']) + { + $meta = ''; + $message = $lang['Deleted']; + } + else + { + $meta = ''; + $message = (($mode == 'poll_delete') ? $lang['Poll_delete'] : $lang['Deleted']) . '

    ' . sprintf($lang['Click_return_topic'], '', ''); + } + + $message .= '

    ' . sprintf($lang['Click_return_forum'], '', ''); + + return; +} + +// +// Handle user notification on new post +// +function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topic_id, &$post_id, &$notify_user) +{ + global $board_config, $lang, $db, $phpbb_root_path, $phpEx; + global $userdata, $user_ip; + + $current_time = time(); + + if ($mode != 'delete') + { + if ($mode == 'reply') + { + $sql = "SELECT ban_userid + FROM " . BANLIST_TABLE; + if (!($result = $db->sql_query($sql))) + { + message_die(GENERAL_ERROR, 'Could not obtain banlist', '', __LINE__, __FILE__, $sql); + } + + $user_id_sql = ''; + while ($row = $db->sql_fetchrow($result)) + { + if (isset($row['ban_userid']) && !empty($row['ban_userid'])) + { + $user_id_sql .= ', ' . $row['ban_userid']; + } + } + + $sql = "SELECT u.user_id, u.user_email, u.user_lang + FROM " . TOPICS_WATCH_TABLE . " tw, " . USERS_TABLE . " u + WHERE tw.topic_id = $topic_id + AND tw.user_id NOT IN (" . $userdata['user_id'] . ", " . ANONYMOUS . $user_id_sql . ") + AND tw.notify_status = " . TOPIC_WATCH_UN_NOTIFIED . " + AND u.user_id = tw.user_id"; + if (!($result = $db->sql_query($sql))) + { + message_die(GENERAL_ERROR, 'Could not obtain list of topic watchers', '', __LINE__, __FILE__, $sql); + } + + $update_watched_sql = ''; + $bcc_list_ary = array(); + + if ($row = $db->sql_fetchrow($result)) + { + // Sixty second limit + @set_time_limit(60); + + do + { + if ($row['user_email'] != '') + { + $bcc_list_ary[$row['user_lang']][] = $row['user_email']; + } + $update_watched_sql .= ($update_watched_sql != '') ? ', ' . $row['user_id'] : $row['user_id']; + } + while ($row = $db->sql_fetchrow($result)); + + // + // Let's do some checking to make sure that mass mail functions + // are working in win32 versions of php. + // + if (preg_match('/[c-z]:\\\.*/i', getenv('PATH')) && !$board_config['smtp_delivery']) + { + $ini_val = (@phpversion() >= '4.0.0') ? 'ini_get' : 'get_cfg_var'; + + // We are running on windows, force delivery to use our smtp functions + // since php's are broken by default + $board_config['smtp_delivery'] = 1; + $board_config['smtp_host'] = @$ini_val('SMTP'); + } + + if (sizeof($bcc_list_ary)) + { + include($phpbb_root_path . 'includes/emailer.'.$phpEx); + $emailer = new emailer($board_config['smtp_delivery']); + + $script_name = preg_replace('/^\/?(.*?)\/?$/', '\1', trim($board_config['script_path'])); + $script_name = ($script_name != '') ? $script_name . '/viewtopic.'.$phpEx : 'viewtopic.'.$phpEx; + $server_name = trim($board_config['server_name']); + $server_protocol = ($board_config['cookie_secure']) ? 'https://' : 'http://'; + $server_port = ($board_config['server_port'] <> 80) ? ':' . trim($board_config['server_port']) . '/' : '/'; + + $orig_word = array(); + $replacement_word = array(); + obtain_word_list($orig_word, $replacement_word); + + $emailer->from($board_config['board_email']); + $emailer->replyto($board_config['board_email']); + + $topic_title = (count($orig_word)) ? preg_replace($orig_word, $replacement_word, unprepare_message($topic_title)) : unprepare_message($topic_title); + + @reset($bcc_list_ary); + while (list($user_lang, $bcc_list) = each($bcc_list_ary)) + { + $emailer->use_template('topic_notify', $user_lang); + + for ($i = 0; $i < count($bcc_list); $i++) + { + $emailer->bcc($bcc_list[$i]); + } + + // The Topic_reply_notification lang string below will be used + // if for some reason the mail template subject cannot be read + // ... note it will not necessarily be in the posters own language! + $emailer->set_subject($lang['Topic_reply_notification']); + + // This is a nasty kludge to remove the username var ... till (if?) + // translators update their templates + $emailer->msg = preg_replace('#[ ]?{USERNAME}#', '', $emailer->msg); + + $emailer->assign_vars(array( + 'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('
    ', "\n", "-- \n" . $board_config['board_email_sig']) : '', + 'SITENAME' => $board_config['sitename'], + 'TOPIC_TITLE' => $topic_title, + + 'U_TOPIC' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_POST_URL . "=$post_id#$post_id", + 'U_STOP_WATCHING_TOPIC' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_TOPIC_URL . "=$topic_id&unwatch=topic") + ); + + $emailer->send(); + $emailer->reset(); + } + } + } + $db->sql_freeresult($result); + + if ($update_watched_sql != '') + { + $sql = "UPDATE " . TOPICS_WATCH_TABLE . " + SET notify_status = " . TOPIC_WATCH_NOTIFIED . " + WHERE topic_id = $topic_id + AND user_id IN ($update_watched_sql)"; + $db->sql_query($sql); + } + } + + $sql = "SELECT topic_id + FROM " . TOPICS_WATCH_TABLE . " + WHERE topic_id = $topic_id + AND user_id = " . $userdata['user_id']; + if (!($result = $db->sql_query($sql))) + { + message_die(GENERAL_ERROR, 'Could not obtain topic watch information', '', __LINE__, __FILE__, $sql); + } + + $row = $db->sql_fetchrow($result); + + if (!$notify_user && !empty($row['topic_id'])) + { + $sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " + WHERE topic_id = $topic_id + AND user_id = " . $userdata['user_id']; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Could not delete topic watch information', '', __LINE__, __FILE__, $sql); + } + } + else if ($notify_user && empty($row['topic_id'])) + { + $sql = "INSERT INTO " . TOPICS_WATCH_TABLE . " (user_id, topic_id, notify_status) + VALUES (" . $userdata['user_id'] . ", $topic_id, 0)"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Could not insert topic watch information', '', __LINE__, __FILE__, $sql); + } + } + } +} + +// +// Fill smiley templates (or just the variables) with smileys +// Either in a window or inline +// +function generate_smilies($mode, $page_id) +{ + global $db, $board_config, $template, $lang, $images, $theme, $phpEx, $phpbb_root_path; + global $user_ip, $session_length, $starttime; + global $userdata; + + $inline_columns = 4; + $inline_rows = 5; + $window_columns = 8; + + if ($mode == 'window') + { + $userdata = session_pagestart($user_ip, $page_id); + init_userprefs($userdata); + + $gen_simple_header = TRUE; + + $page_title = $lang['Emoticons']; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + $template->set_filenames(array( + 'smiliesbody' => 'posting_smilies.tpl') + ); + } + + $sql = "SELECT emoticon, code, smile_url + FROM " . SMILIES_TABLE . " + ORDER BY smilies_id"; + if ($result = $db->sql_query($sql)) + { + $num_smilies = 0; + $rowset = array(); + while ($row = $db->sql_fetchrow($result)) + { + if (empty($rowset[$row['smile_url']])) + { + $rowset[$row['smile_url']]['code'] = str_replace("'", "\\'", str_replace('\\', '\\\\', $row['code'])); + $rowset[$row['smile_url']]['emoticon'] = $row['emoticon']; + $num_smilies++; + } + } + + if ($num_smilies) + { + $smilies_count = ($mode == 'inline') ? min(19, $num_smilies) : $num_smilies; + $smilies_split_row = ($mode == 'inline') ? $inline_columns - 1 : $window_columns - 1; + + $s_colspan = 0; + $row = 0; + $col = 0; + + while (list($smile_url, $data) = @each($rowset)) + { + if (!$col) + { + $template->assign_block_vars('smilies_row', array()); + } + + $template->assign_block_vars('smilies_row.smilies_col', array( + 'SMILEY_CODE' => $data['code'], + 'SMILEY_IMG' => $board_config['smilies_path'] . '/' . $smile_url, + 'SMILEY_DESC' => $data['emoticon']) + ); + + $s_colspan = max($s_colspan, $col + 1); + + if ($col == $smilies_split_row) + { + if ($mode == 'inline' && $row == $inline_rows - 1) + { + break; + } + $col = 0; + $row++; + } + else + { + $col++; + } + } + + if ($mode == 'inline' && $num_smilies > $inline_rows * $inline_columns) + { + $template->assign_block_vars('switch_smilies_extra', array()); + + $template->assign_vars(array( + 'L_MORE_SMILIES' => $lang['More_emoticons'], + 'U_MORE_SMILIES' => append_sid("posting.$phpEx?mode=smilies")) + ); + } + + $template->assign_vars(array( + 'L_EMOTICONS' => $lang['Emoticons'], + 'L_CLOSE_WINDOW' => $lang['Close_window'], + 'S_SMILIES_COLSPAN' => $s_colspan) + ); + } + } + + if ($mode == 'window') + { + $template->pparse('smiliesbody'); + + include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + } +} + +/** +* Called from within prepare_message to clean included HTML tags if HTML is +* turned on for that post +* @param array $tag Matching text from the message to parse +*/ +function clean_html($tag) +{ + global $board_config; + + if (empty($tag[0])) + { + return ''; + } + + $allowed_html_tags = preg_split('/, */', strtolower($board_config['allow_html_tags'])); + $disallowed_attributes = '/^(?:style|on)/i'; + + // Check if this is an end tag + preg_match('/<[^\w\/]*\/[\W]*(\w+)/', $tag[0], $matches); + if (sizeof($matches)) + { + if (in_array(strtolower($matches[1]), $allowed_html_tags)) + { + return ''; + } + else + { + return htmlspecialchars(''); + } + } + + // Check if this is an allowed tag + if (in_array(strtolower($tag[1]), $allowed_html_tags)) + { + $attributes = ''; + if (!empty($tag[2])) + { + preg_match_all('/[\W]*?(\w+)[\W]*?=[\W]*?(["\'])((?:(?!\2).)*)\2/', $tag[2], $test); + for ($i = 0; $i < sizeof($test[0]); $i++) + { + if (preg_match($disallowed_attributes, $test[1][$i])) + { + continue; + } + $attributes .= ' ' . $test[1][$i] . '=' . $test[2][$i] . str_replace(array('[', ']'), array('[', ']'), htmlspecialchars($test[3][$i])) . $test[2][$i]; + } + } + if (in_array(strtolower($tag[1]), $allowed_html_tags)) + { + return '<' . $tag[1] . $attributes . '>'; + } + else + { + return htmlspecialchars('<' . $tag[1] . $attributes . '>'); + } + } + // Finally, this is not an allowed tag so strip all the attibutes and escape it + else + { + return htmlspecialchars('<' . $tag[1] . '>'); + } +} +?> \ No newline at end of file diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php deleted file mode 100644 index 7eba43c955..0000000000 --- a/phpBB/includes/functions_posting.php +++ /dev/null @@ -1,2451 +0,0 @@ -sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $user->setup('posting', (int) $row['forum_style']); - } - else - { - $user->setup('posting'); - } - - page_header($user->lang['SMILIES']); - - $template->set_filenames(array( - 'body' => 'posting_smilies.html') - ); - } - - $display_link = false; - if ($mode == 'inline') - { - $sql = 'SELECT smiley_id - FROM ' . SMILIES_TABLE . ' - WHERE display_on_posting = 0'; - $result = $db->sql_query_limit($sql, 1, 0, 3600); - - if ($row = $db->sql_fetchrow($result)) - { - $display_link = true; - } - $db->sql_freeresult($result); - } - - $last_url = ''; - - $sql = 'SELECT * - FROM ' . SMILIES_TABLE . - (($mode == 'inline') ? ' WHERE display_on_posting = 1 ' : '') . ' - ORDER BY smiley_order'; - $result = $db->sql_query($sql, 3600); - - $smilies = array(); - while ($row = $db->sql_fetchrow($result)) - { - if (empty($smilies[$row['smiley_url']])) - { - $smilies[$row['smiley_url']] = $row; - } - } - $db->sql_freeresult($result); - - if (sizeof($smilies)) - { - foreach ($smilies as $row) - { - $template->assign_block_vars('smiley', array( - 'SMILEY_CODE' => $row['code'], - 'A_SMILEY_CODE' => addslashes($row['code']), - 'SMILEY_IMG' => $phpbb_root_path . $config['smilies_path'] . '/' . $row['smiley_url'], - 'SMILEY_WIDTH' => $row['smiley_width'], - 'SMILEY_HEIGHT' => $row['smiley_height'], - 'SMILEY_DESC' => $row['emotion']) - ); - } - } - - if ($mode == 'inline' && $display_link) - { - $template->assign_vars(array( - 'S_SHOW_SMILEY_LINK' => true, - 'U_MORE_SMILIES' => append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=smilies&f=' . $forum_id)) - ); - } - - if ($mode == 'window') - { - page_footer(); - } -} - -/** -* Update last post information -* Should be used instead of sync() if only the last post information are out of sync... faster -* -* @param string $type Can be forum|topic -* @param mixed $ids topic/forum ids -* @param bool $return_update_sql true: SQL query shall be returned, false: execute SQL -*/ -function update_post_information($type, $ids, $return_update_sql = false) -{ - global $db; - - if (empty($ids)) - { - return; - } - if (!is_array($ids)) - { - $ids = array($ids); - } - - - $update_sql = $empty_forums = $not_empty_forums = array(); - - if ($type != 'topic') - { - $topic_join = ', ' . TOPICS_TABLE . ' t'; - $topic_condition = 'AND t.topic_id = p.topic_id AND t.topic_approved = 1'; - } - else - { - $topic_join = ''; - $topic_condition = ''; - } - - if (sizeof($ids) == 1) - { - $sql = 'SELECT MAX(p.post_id) as last_post_id - FROM ' . POSTS_TABLE . " p $topic_join - WHERE " . $db->sql_in_set('p.' . $type . '_id', $ids) . " - $topic_condition - AND p.post_approved = 1"; - } - else - { - $sql = 'SELECT p.' . $type . '_id, MAX(p.post_id) as last_post_id - FROM ' . POSTS_TABLE . " p $topic_join - WHERE " . $db->sql_in_set('p.' . $type . '_id', $ids) . " - $topic_condition - AND p.post_approved = 1 - GROUP BY p.{$type}_id"; - } - $result = $db->sql_query($sql); - - $last_post_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - if (sizeof($ids) == 1) - { - $row[$type . '_id'] = $ids[0]; - } - - if ($type == 'forum') - { - $not_empty_forums[] = $row['forum_id']; - - if (empty($row['last_post_id'])) - { - $empty_forums[] = $row['forum_id']; - } - } - - $last_post_ids[] = $row['last_post_id']; - } - $db->sql_freeresult($result); - - if ($type == 'forum') - { - $empty_forums = array_merge($empty_forums, array_diff($ids, $not_empty_forums)); - - foreach ($empty_forums as $void => $forum_id) - { - $update_sql[$forum_id][] = 'forum_last_post_id = 0'; - $update_sql[$forum_id][] = "forum_last_post_subject = ''"; - $update_sql[$forum_id][] = 'forum_last_post_time = 0'; - $update_sql[$forum_id][] = 'forum_last_poster_id = 0'; - $update_sql[$forum_id][] = "forum_last_poster_name = ''"; - $update_sql[$forum_id][] = "forum_last_poster_colour = ''"; - } - } - - if (sizeof($last_post_ids)) - { - $sql = 'SELECT p.' . $type . '_id, p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.user_id, u.username, u.user_colour - FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u - WHERE p.poster_id = u.user_id - AND ' . $db->sql_in_set('p.post_id', $last_post_ids); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $update_sql[$row["{$type}_id"]][] = $type . '_last_post_id = ' . (int) $row['post_id']; - $update_sql[$row["{$type}_id"]][] = "{$type}_last_post_subject = '" . $db->sql_escape($row['post_subject']) . "'"; - $update_sql[$row["{$type}_id"]][] = $type . '_last_post_time = ' . (int) $row['post_time']; - $update_sql[$row["{$type}_id"]][] = $type . '_last_poster_id = ' . (int) $row['poster_id']; - $update_sql[$row["{$type}_id"]][] = "{$type}_last_poster_colour = '" . $db->sql_escape($row['user_colour']) . "'"; - $update_sql[$row["{$type}_id"]][] = "{$type}_last_poster_name = '" . (($row['poster_id'] == ANONYMOUS) ? $db->sql_escape($row['post_username']) : $db->sql_escape($row['username'])) . "'"; - } - $db->sql_freeresult($result); - } - unset($empty_forums, $ids, $last_post_ids); - - if ($return_update_sql || !sizeof($update_sql)) - { - return $update_sql; - } - - $table = ($type == 'forum') ? FORUMS_TABLE : TOPICS_TABLE; - - foreach ($update_sql as $update_id => $update_sql_ary) - { - $sql = "UPDATE $table - SET " . implode(', ', $update_sql_ary) . " - WHERE {$type}_id = $update_id"; - $db->sql_query($sql); - } - - return; -} - -/** -* Generate Topic Icons for display -*/ -function posting_gen_topic_icons($mode, $icon_id) -{ - global $phpbb_root_path, $config, $template, $cache; - - // Grab icons - $icons = cache::obtain_icons(); - - if (!$icon_id) - { - $template->assign_var('S_NO_ICON_CHECKED', ' checked="checked"'); - } - - if (sizeof($icons)) - { - foreach ($icons as $id => $data) - { - if ($data['display']) - { - $template->assign_block_vars('topic_icon', array( - 'ICON_ID' => $id, - 'ICON_IMG' => $phpbb_root_path . $config['icons_path'] . '/' . $data['img'], - 'ICON_WIDTH' => $data['width'], - 'ICON_HEIGHT' => $data['height'], - - 'S_CHECKED' => ($id == $icon_id) ? true : false, - 'S_ICON_CHECKED' => ($id == $icon_id) ? ' checked="checked"' : '') - ); - } - } - - return true; - } - - return false; -} - -/** -* Build topic types able to be selected -*/ -function posting_gen_topic_types($forum_id, $cur_topic_type = POST_NORMAL) -{ - global $auth, $user, $template, $topic_type; - - $toggle = false; - - $topic_types = array( - 'sticky' => array('const' => POST_STICKY, 'lang' => 'POST_STICKY'), - 'announce' => array('const' => POST_ANNOUNCE, 'lang' => 'POST_ANNOUNCEMENT'), - 'global' => array('const' => POST_GLOBAL, 'lang' => 'POST_GLOBAL') - ); - - $topic_type_array = array(); - - foreach ($topic_types as $auth_key => $topic_value) - { - // We do not have a special post global announcement permission - $auth_key = ($auth_key == 'global') ? 'announce' : $auth_key; - - if ($auth->acl_get('f_' . $auth_key, $forum_id)) - { - $toggle = true; - - $topic_type_array[] = array( - 'VALUE' => $topic_value['const'], - 'S_CHECKED' => ($cur_topic_type == $topic_value['const'] || ($forum_id == 0 && $topic_value['const'] == POST_GLOBAL)) ? ' checked="checked"' : '', - 'L_TOPIC_TYPE' => $user->lang[$topic_value['lang']] - ); - } - } - - if ($toggle) - { - $topic_type_array = array_merge(array(0 => array( - 'VALUE' => POST_NORMAL, - 'S_CHECKED' => ($topic_type == POST_NORMAL) ? ' checked="checked"' : '', - 'L_TOPIC_TYPE' => $user->lang['POST_NORMAL'])), - - $topic_type_array - ); - - foreach ($topic_type_array as $array) - { - $template->assign_block_vars('topic_type', $array); - } - - $template->assign_vars(array( - 'S_TOPIC_TYPE_STICKY' => ($auth->acl_get('f_sticky', $forum_id)), - 'S_TOPIC_TYPE_ANNOUNCE' => ($auth->acl_get('f_announce', $forum_id))) - ); - } - - return $toggle; -} - -// -// Attachment related functions -// - -/** -* Upload Attachment - filedata is generated here -* Uses upload class -*/ -function upload_attachment($form_name, $forum_id, $local = false, $local_storage = '', $is_message = false, $local_filedata = false) -{ - global $auth, $user, $config, $db, $cache; - global $phpbb_root_path, $phpEx; - - $filedata = array( - 'error' => array() - ); - - include_once($phpbb_root_path . 'includes/functions_upload.' . $phpEx); - $upload = new fileupload(); - - if (!$local) - { - $filedata['post_attach'] = ($upload->is_valid($form_name)) ? true : false; - } - else - { - $filedata['post_attach'] = true; - } - - if (!$filedata['post_attach']) - { - $filedata['error'][] = $user->lang['NO_UPLOAD_FORM_FOUND']; - return $filedata; - } - - $extensions = cache::obtain_attach_extensions((($is_message) ? false : (int) $forum_id)); - $upload->set_allowed_extensions(array_keys($extensions['_allowed_'])); - - $file = ($local) ? $upload->local_upload($local_storage, $local_filedata) : $upload->form_upload($form_name); - - if ($file->init_error) - { - $filedata['post_attach'] = false; - return $filedata; - } - - $cat_id = (isset($extensions[$file->get('extension')]['display_cat'])) ? $extensions[$file->get('extension')]['display_cat'] : ATTACHMENT_CATEGORY_NONE; - - // Make sure the image category only holds valid images... - if ($cat_id == ATTACHMENT_CATEGORY_IMAGE && !$file->is_image()) - { - $file->remove(); - - // If this error occurs a user tried to exploit an IE Bug by renaming extensions - // Since the image category is displaying content inline we need to catch this. - trigger_error($user->lang['ATTACHED_IMAGE_NOT_IMAGE']); - } - - // Do we have to create a thumbnail? - $filedata['thumbnail'] = ($cat_id == ATTACHMENT_CATEGORY_IMAGE && $config['img_create_thumbnail']) ? 1 : 0; - - // Check Image Size, if it is an image - if (!$auth->acl_get('a_') && !$auth->acl_get('m_', $forum_id) && $cat_id == ATTACHMENT_CATEGORY_IMAGE) - { - $file->upload->set_allowed_dimensions(0, 0, $config['img_max_width'], $config['img_max_height']); - } - - // Admins and mods are allowed to exceed the allowed filesize - if (!$auth->acl_get('a_') && !$auth->acl_get('m_', $forum_id)) - { - if (!empty($extensions[$file->get('extension')]['max_filesize'])) - { - $allowed_filesize = $extensions[$file->get('extension')]['max_filesize']; - } - else - { - $allowed_filesize = ($is_message) ? $config['max_filesize_pm'] : $config['max_filesize']; - } - - $file->upload->set_max_filesize($allowed_filesize); - } - - $file->clean_filename('unique', $user->data['user_id'] . '_'); - - // Are we uploading an image *and* this image being within the image category? Only then perform additional image checks. - $no_image = ($cat_id == ATTACHMENT_CATEGORY_IMAGE) ? false : true; - - $file->move_file($config['upload_path'], false, $no_image); - - if (sizeof($file->error)) - { - $file->remove(); - $filedata['error'] = array_merge($filedata['error'], $file->error); - $filedata['post_attach'] = false; - - return $filedata; - } - - $filedata['filesize'] = $file->get('filesize'); - $filedata['mimetype'] = $file->get('mimetype'); - $filedata['extension'] = $file->get('extension'); - $filedata['physical_filename'] = $file->get('realname'); - $filedata['real_filename'] = $file->get('uploadname'); - $filedata['filetime'] = time(); - - // Check our complete quota - if ($config['attachment_quota']) - { - if ($config['upload_dir_size'] + $file->get('filesize') > $config['attachment_quota']) - { - $filedata['error'][] = $user->lang['ATTACH_QUOTA_REACHED']; - $filedata['post_attach'] = false; - - $file->remove(); - - return $filedata; - } - } - - // Check free disk space - if ($free_space = @disk_free_space($phpbb_root_path . $config['upload_path'])) - { - if ($free_space <= $file->get('filesize')) - { - $filedata['error'][] = $user->lang['ATTACH_QUOTA_REACHED']; - $filedata['post_attach'] = false; - - $file->remove(); - - return $filedata; - } - } - - // Create Thumbnail - if ($filedata['thumbnail']) - { - $source = $file->get('destination_file'); - $destination = $file->get('destination_path') . '/thumb_' . $file->get('realname'); - - if (!create_thumbnail($source, $destination, $file->get('mimetype'))) - { - $filedata['thumbnail'] = 0; - } - } - - return $filedata; -} - -/** -* Calculate the needed size for Thumbnail -*/ -function get_img_size_format($width, $height) -{ - global $config; - - // Maximum Width the Image can take - $max_width = ($config['img_max_thumb_width']) ? $config['img_max_thumb_width'] : 400; - - if ($width > $height) - { - return array( - round($width * ($max_width / $width)), - round($height * ($max_width / $width)) - ); - } - else - { - return array( - round($width * ($max_width / $height)), - round($height * ($max_width / $height)) - ); - } -} - -/** -* Return supported image types -*/ -function get_supported_image_types($type = false) -{ - if (@extension_loaded('gd')) - { - $format = imagetypes(); - $new_type = 0; - - if ($type !== false) - { - switch ($type) - { - // GIF - case 1: - $new_type = ($format & IMG_GIF) ? IMG_GIF : false; - break; - - // JPG, JPC, JP2 - case 2: - case 9: - case 10: - case 11: - case 12: - $new_type = ($format & IMG_JPG) ? IMG_JPG : false; - break; - - // PNG - case 3: - $new_type = ($format & IMG_PNG) ? IMG_PNG : false; - break; - - // BMP, WBMP - case 6: - case 15: - $new_type = ($format & IMG_WBMP) ? IMG_WBMP : false; - break; - } - } - else - { - $new_type = array(); - $go_through_types = array(IMG_GIF, IMG_JPG, IMG_PNG, IMG_WBMP); - - foreach ($go_through_types as $check_type) - { - if ($format & $check_type) - { - $new_type[] = $check_type; - } - } - } - - return array( - 'gd' => ($new_type) ? true : false, - 'format' => $new_type, - 'version' => (function_exists('imagecreatetruecolor')) ? 2 : 1 - ); - } - - return array('gd' => false); -} - -/** -* Create Thumbnail -*/ -function create_thumbnail($source, $destination, $mimetype) -{ - global $config; - - $min_filesize = (int) $config['img_min_thumb_filesize']; - $img_filesize = (file_exists($source)) ? @filesize($source) : false; - - if (!$img_filesize || $img_filesize <= $min_filesize) - { - return false; - } - - $dimension = @getimagesize($source); - - if ($dimension === false) - { - return false; - } - - list($width, $height, $type, ) = $dimension; - - if (empty($width) || empty($height)) - { - return false; - } - - list($new_width, $new_height) = get_img_size_format($width, $height); - - // Do not create a thumbnail if the resulting width/height is bigger than the original one - if ($new_width > $width && $new_height > $height) - { - return false; - } - - $used_imagick = false; - - // Only use imagemagick if defined and the passthru function not disabled - if ($config['img_imagick'] && function_exists('passthru')) - { - if (substr($config['img_imagick'], -1) !== '/') - { - $config['img_imagick'] .= '/'; - } - - @passthru(escapeshellcmd($config['img_imagick']) . 'convert' . ((defined('PHP_OS') && preg_match('#^win#i', PHP_OS)) ? '.exe' : '') . ' -quality 85 -antialias -sample ' . $new_width . 'x' . $new_height . ' "' . str_replace('\\', '/', $source) . '" +profile "*" "' . str_replace('\\', '/', $destination) . '"'); - - if (file_exists($destination)) - { - $used_imagick = true; - } - } - - if (!$used_imagick) - { - $type = get_supported_image_types($type); - - if ($type['gd']) - { - // If the type is not supported, we are not able to create a thumbnail - if ($type['format'] === false) - { - return false; - } - - switch ($type['format']) - { - case IMG_GIF: - $image = @imagecreatefromgif($source); - break; - - case IMG_JPG: - $image = @imagecreatefromjpeg($source); - break; - - case IMG_PNG: - $image = @imagecreatefrompng($source); - break; - - case IMG_WBMP: - $image = @imagecreatefromwbmp($source); - break; - } - - if ($type['version'] == 1) - { - $new_image = imagecreate($new_width, $new_height); - - if ($new_image === false) - { - return false; - } - - imagecopyresized($new_image, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height); - } - else - { - $new_image = imagecreatetruecolor($new_width, $new_height); - - if ($new_image === false) - { - return false; - } - - imagecopyresampled($new_image, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height); - } - - // If we are in safe mode create the destination file prior to using the gd functions to circumvent a PHP bug - if (@ini_get('safe_mode') || @strtolower(ini_get('safe_mode')) == 'on') - { - @touch($destination); - } - - switch ($type['format']) - { - case IMG_GIF: - imagegif($new_image, $destination); - break; - - case IMG_JPG: - imagejpeg($new_image, $destination, 90); - break; - - case IMG_PNG: - imagepng($new_image, $destination); - break; - - case IMG_WBMP: - imagewbmp($new_image, $destination); - break; - } - - imagedestroy($new_image); - } - else - { - return false; - } - } - - if (!file_exists($destination)) - { - return false; - } - - @chmod($destination, 0666); - - return true; -} - -/** -* Assign Inline attachments (build option fields) -*/ -function posting_gen_inline_attachments(&$attachment_data) -{ - global $template; - - if (sizeof($attachment_data)) - { - $s_inline_attachment_options = ''; - - foreach ($attachment_data as $i => $attachment) - { - $s_inline_attachment_options .= ''; - } - - $template->assign_var('S_INLINE_ATTACHMENT_OPTIONS', $s_inline_attachment_options); - - return true; - } - - return false; -} - -/** -* Generate inline attachment entry -*/ -function posting_gen_attachment_entry($attachment_data, &$filename_data) -{ - global $template, $config, $phpbb_root_path, $phpEx, $user; - - $template->assign_vars(array( - 'S_SHOW_ATTACH_BOX' => true) - ); - - if (sizeof($attachment_data)) - { - $template->assign_vars(array( - 'S_HAS_ATTACHMENTS' => true) - ); - - // We display the posted attachments within the desired order. - ($config['display_order']) ? krsort($attachment_data) : ksort($attachment_data); - - foreach ($attachment_data as $count => $attach_row) - { - $hidden = ''; - $attach_row['real_filename'] = basename($attach_row['real_filename']); - - foreach ($attach_row as $key => $value) - { - $hidden .= ''; - } - - $download_link = append_sid("{$phpbb_root_path}download/file.$phpEx", 'mode=view&id=' . (int) $attach_row['attach_id'], true, ($attach_row['is_orphan']) ? $user->session_id : false); - - $template->assign_block_vars('attach_row', array( - 'FILENAME' => basename($attach_row['real_filename']), - 'A_FILENAME' => addslashes(basename($attach_row['real_filename'])), - 'FILE_COMMENT' => $attach_row['attach_comment'], - 'ATTACH_ID' => $attach_row['attach_id'], - 'S_IS_ORPHAN' => $attach_row['is_orphan'], - 'ASSOC_INDEX' => $count, - - 'U_VIEW_ATTACHMENT' => $download_link, - 'S_HIDDEN' => $hidden) - ); - } - } - - $template->assign_vars(array( - 'FILE_COMMENT' => $filename_data['filecomment'], - 'FILESIZE' => $config['max_filesize']) - ); - - return sizeof($attachment_data); -} - -// -// General Post functions -// - -/** -* Load Drafts -*/ -function load_drafts($topic_id = 0, $forum_id = 0, $id = 0) -{ - global $user, $db, $template, $auth; - global $phpbb_root_path, $phpEx; - - $topic_ids = $forum_ids = $draft_rows = array(); - - // Load those drafts not connected to forums/topics - // If forum_id == 0 AND topic_id == 0 then this is a PM draft - if (!$topic_id && !$forum_id) - { - $sql_and = ' AND d.forum_id = 0 AND d.topic_id = 0'; - } - else - { - $sql_and = ''; - $sql_and .= ($forum_id) ? ' AND d.forum_id = ' . (int) $forum_id : ''; - $sql_and .= ($topic_id) ? ' AND d.topic_id = ' . (int) $topic_id : ''; - } - - $sql = 'SELECT d.*, f.forum_id, f.forum_name - FROM ' . DRAFTS_TABLE . ' d - LEFT JOIN ' . FORUMS_TABLE . ' f ON (f.forum_id = d.forum_id) - WHERE d.user_id = ' . $user->data['user_id'] . " - $sql_and - ORDER BY d.save_time DESC"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if ($row['topic_id']) - { - $topic_ids[] = (int) $row['topic_id']; - } - $draft_rows[] = $row; - } - $db->sql_freeresult($result); - - if (!sizeof($draft_rows)) - { - return; - } - - $topic_rows = array(); - if (sizeof($topic_ids)) - { - $sql = 'SELECT topic_id, forum_id, topic_title - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', array_unique($topic_ids)); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $topic_rows[$row['topic_id']] = $row; - } - $db->sql_freeresult($result); - } - unset($topic_ids); - - $template->assign_var('S_SHOW_DRAFTS', true); - - foreach ($draft_rows as $draft) - { - $link_topic = $link_forum = $link_pm = false; - $insert_url = $view_url = $title = ''; - - if (isset($topic_rows[$draft['topic_id']]) - && ( - ($topic_rows[$draft['topic_id']]['forum_id'] && $auth->acl_get('f_read', $topic_rows[$draft['topic_id']]['forum_id'])) - || - (!$topic_rows[$draft['topic_id']]['forum_id'] && $auth->acl_getf_global('f_read')) - )) - { - $topic_forum_id = ($topic_rows[$draft['topic_id']]['forum_id']) ? $topic_rows[$draft['topic_id']]['forum_id'] : $forum_id; - - $link_topic = true; - $view_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $topic_forum_id . '&t=' . $draft['topic_id']); - $title = $topic_rows[$draft['topic_id']]['topic_title']; - - $insert_url = append_sid("{$phpbb_root_path}posting.$phpEx", 'f=' . $topic_forum_id . '&t=' . $draft['topic_id'] . '&mode=reply&d=' . $draft['draft_id']); - } - else if ($draft['forum_id'] && $auth->acl_get('f_read', $draft['forum_id'])) - { - $link_forum = true; - $view_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $draft['forum_id']); - $title = $draft['forum_name']; - - $insert_url = append_sid("{$phpbb_root_path}posting.$phpEx", 'f=' . $draft['forum_id'] . '&mode=post&d=' . $draft['draft_id']); - } - else - { - // Either display as PM draft if forum_id and topic_id are empty or if access to the forums has been denied afterwards... - $link_pm = true; - $insert_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=$id&mode=compose&d={$draft['draft_id']}"); - } - - $template->assign_block_vars('draftrow', array( - 'DRAFT_ID' => $draft['draft_id'], - 'DATE' => $user->format_date($draft['save_time']), - 'DRAFT_SUBJECT' => $draft['draft_subject'], - - 'TITLE' => $title, - 'U_VIEW' => $view_url, - 'U_INSERT' => $insert_url, - - 'S_LINK_PM' => $link_pm, - 'S_LINK_TOPIC' => $link_topic, - 'S_LINK_FORUM' => $link_forum) - ); - } -} - -/** -* Topic Review -*/ -function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id = 0, $show_quote_button = true) -{ - global $user, $auth, $db, $template, $bbcode, $cache; - global $config, $phpbb_root_path, $phpEx; - - // Go ahead and pull all data for this topic - $sql = 'SELECT p.post_id - FROM ' . POSTS_TABLE . ' p' . " - WHERE p.topic_id = $topic_id - " . ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND p.post_approved = 1' : '') . ' - ' . (($mode == 'post_review') ? " AND p.post_id > $cur_post_id" : '') . ' - ORDER BY p.post_time '; - $sql .= ($mode == 'post_review') ? 'ASC' : 'DESC'; - $result = $db->sql_query_limit($sql, $config['posts_per_page']); - - $post_list = array(); - - while ($row = $db->sql_fetchrow($result)) - { - $post_list[] = $row['post_id']; - } - - $db->sql_freeresult($result); - - if (!sizeof($post_list)) - { - return false; - } - - $sql = $db->sql_build_query('SELECT', array( - 'SELECT' => 'u.username, u.user_id, u.user_colour, p.*', - - 'FROM' => array( - USERS_TABLE => 'u', - POSTS_TABLE => 'p', - ), - - 'WHERE' => $db->sql_in_set('p.post_id', $post_list) . ' - AND u.user_id = p.poster_id' - )); - - $result = $db->sql_query($sql); - - $bbcode_bitfield = ''; - $rowset = array(); - $has_attachments = false; - while ($row = $db->sql_fetchrow($result)) - { - $rowset[$row['post_id']] = $row; - $bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']); - - if ($row['post_attachment']) - { - $has_attachments = true; - } - } - $db->sql_freeresult($result); - - // Instantiate BBCode class - if (!isset($bbcode) && $bbcode_bitfield !== '') - { - include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); - $bbcode = new bbcode(base64_encode($bbcode_bitfield)); - } - - // Grab extensions - $extensions = $attachments = array(); - if ($has_attachments && $auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id)) - { - $extensions = cache::obtain_attach_extensions($forum_id); - - // Get attachments... - $sql = 'SELECT * - FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set('post_msg_id', $post_list) . ' - AND in_message = 0 - ORDER BY filetime DESC, post_msg_id ASC'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $attachments[$row['post_msg_id']][] = $row; - } - $db->sql_freeresult($result); - } - - for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) - { - // A non-existing rowset only happens if there was no user present for the entered poster_id - // This could be a broken posts table. - if (!isset($rowset[$post_list[$i]])) - { - continue; - } - - $row =& $rowset[$post_list[$i]]; - - $poster_id = $row['user_id']; - $post_subject = $row['post_subject']; - $message = censor_text($row['post_text']); - - $decoded_message = false; - - if ($show_quote_button && $auth->acl_get('f_reply', $forum_id)) - { - $decoded_message = $message; - decode_message($decoded_message, $row['bbcode_uid']); - - $decoded_message = bbcode_nl2br($decoded_message); - } - - if ($row['bbcode_bitfield']) - { - $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); - } - - $message = bbcode_nl2br($message); - $message = smiley_text($message, !$row['enable_smilies']); - - if (!empty($attachments[$row['post_id']])) - { - $update_count = array(); - parse_attachments($forum_id, $message, $attachments[$row['post_id']], $update_count); - } - - $post_subject = censor_text($post_subject); - - $template->assign_block_vars($mode . '_row', array( - 'POST_AUTHOR_FULL' => get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), - 'POST_AUTHOR_COLOUR' => get_username_string('colour', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), - 'POST_AUTHOR' => get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), - 'U_POST_AUTHOR' => get_username_string('profile', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), - - 'S_HAS_ATTACHMENTS' => (!empty($attachments[$row['post_id']])) ? true : false, - - 'POST_SUBJECT' => $post_subject, - 'MINI_POST_IMG' => $user->img('icon_post_target', $user->lang['POST']), - 'POST_DATE' => $user->format_date($row['post_time']), - 'MESSAGE' => $message, - 'DECODED_MESSAGE' => $decoded_message, - 'POST_ID' => $row['post_id'], - 'U_MINI_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '#p' . $row['post_id'], - 'U_MCP_DETAILS' => ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=post_details&f=' . $forum_id . '&p=' . $row['post_id'], true, $user->session_id) : '', - 'POSTER_QUOTE' => ($show_quote_button && $auth->acl_get('f_reply', $forum_id)) ? addslashes(get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '') - ); - - // Display not already displayed Attachments for this post, we already parsed them. ;) - if (!empty($attachments[$row['post_id']])) - { - foreach ($attachments[$row['post_id']] as $attachment) - { - $template->assign_block_vars($mode . '_row.attachment', array( - 'DISPLAY_ATTACHMENT' => $attachment) - ); - } - } - - unset($rowset[$i]); - } - - if ($mode == 'topic_review') - { - $template->assign_var('QUOTE_IMG', $user->img('icon_post_quote', $user->lang['REPLY_WITH_QUOTE'])); - } - - return true; -} - -/** -* User Notification -*/ -function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id, $topic_id, $post_id) -{ - global $db, $user, $config, $phpbb_root_path, $phpEx, $auth; - - $topic_notification = ($mode == 'reply' || $mode == 'quote') ? true : false; - $forum_notification = ($mode == 'post') ? true : false; - - if (!$topic_notification && !$forum_notification) - { - trigger_error('WRONG_NOTIFICATION_MODE'); - } - - if (($topic_notification && !$config['allow_topic_notify']) || ($forum_notification && !$config['allow_forum_notify'])) - { - return; - } - - $topic_title = ($topic_notification) ? $topic_title : $subject; - $topic_title = censor_text($topic_title); - - // Get banned User ID's - $sql = 'SELECT ban_userid - FROM ' . BANLIST_TABLE; - $result = $db->sql_query($sql); - - $sql_ignore_users = ANONYMOUS . ', ' . $user->data['user_id']; - while ($row = $db->sql_fetchrow($result)) - { - if (isset($row['ban_userid'])) - { - $sql_ignore_users .= ', ' . $row['ban_userid']; - } - } - $db->sql_freeresult($result); - - $notify_rows = array(); - - // -- get forum_userids || topic_userids - $sql = 'SELECT u.user_id, u.username, u.user_email, u.user_lang, u.user_notify_type, u.user_jabber - FROM ' . (($topic_notification) ? TOPICS_WATCH_TABLE : FORUMS_WATCH_TABLE) . ' w, ' . USERS_TABLE . ' u - WHERE w.' . (($topic_notification) ? 'topic_id' : 'forum_id') . ' = ' . (($topic_notification) ? $topic_id : $forum_id) . " - AND w.user_id NOT IN ($sql_ignore_users) - AND w.notify_status = 0 - AND u.user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ') - AND u.user_id = w.user_id'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $notify_rows[$row['user_id']] = array( - 'user_id' => $row['user_id'], - 'username' => $row['username'], - 'user_email' => $row['user_email'], - 'user_jabber' => $row['user_jabber'], - 'user_lang' => $row['user_lang'], - 'notify_type' => ($topic_notification) ? 'topic' : 'forum', - 'template' => ($topic_notification) ? 'topic_notify' : 'newtopic_notify', - 'method' => $row['user_notify_type'], - 'allowed' => false - ); - } - $db->sql_freeresult($result); - - // forum notification is sent to those not already receiving topic notifications - if ($topic_notification) - { - if (sizeof($notify_rows)) - { - $sql_ignore_users .= ', ' . implode(', ', array_keys($notify_rows)); - } - - $sql = 'SELECT u.user_id, u.username, u.user_email, u.user_lang, u.user_notify_type, u.user_jabber - FROM ' . FORUMS_WATCH_TABLE . ' fw, ' . USERS_TABLE . " u - WHERE fw.forum_id = $forum_id - AND fw.user_id NOT IN ($sql_ignore_users) - AND fw.notify_status = 0 - AND u.user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ') - AND u.user_id = fw.user_id'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $notify_rows[$row['user_id']] = array( - 'user_id' => $row['user_id'], - 'username' => $row['username'], - 'user_email' => $row['user_email'], - 'user_jabber' => $row['user_jabber'], - 'user_lang' => $row['user_lang'], - 'notify_type' => 'forum', - 'template' => 'forum_notify', - 'method' => $row['user_notify_type'], - 'allowed' => false - ); - } - $db->sql_freeresult($result); - } - - if (!sizeof($notify_rows)) - { - return; - } - - // Make sure users are allowed to read the forum - foreach ($auth->acl_get_list(array_keys($notify_rows), 'f_read', $forum_id) as $forum_id => $forum_ary) - { - foreach ($forum_ary as $auth_option => $user_ary) - { - foreach ($user_ary as $user_id) - { - $notify_rows[$user_id]['allowed'] = true; - } - } - } - - - // Now, we have to do a little step before really sending, we need to distinguish our users a little bit. ;) - $msg_users = $delete_ids = $update_notification = array(); - foreach ($notify_rows as $user_id => $row) - { - if (!$row['allowed'] || !trim($row['user_email'])) - { - $delete_ids[$row['notify_type']][] = $row['user_id']; - } - else - { - $msg_users[] = $row; - $update_notification[$row['notify_type']][] = $row['user_id']; - } - } - unset($notify_rows); - - // Now, we are able to really send out notifications - if (sizeof($msg_users)) - { - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - $messenger = new messenger(); - - $msg_list_ary = array(); - foreach ($msg_users as $row) - { - $pos = (!isset($msg_list_ary[$row['template']])) ? 0 : sizeof($msg_list_ary[$row['template']]); - - $msg_list_ary[$row['template']][$pos]['method'] = $row['method']; - $msg_list_ary[$row['template']][$pos]['email'] = $row['user_email']; - $msg_list_ary[$row['template']][$pos]['jabber'] = $row['user_jabber']; - $msg_list_ary[$row['template']][$pos]['name'] = $row['username']; - $msg_list_ary[$row['template']][$pos]['lang'] = $row['user_lang']; - } - unset($msg_users); - - foreach ($msg_list_ary as $email_template => $email_list) - { - foreach ($email_list as $addr) - { - $messenger->template($email_template, $addr['lang']); - - $messenger->to($addr['email'], $addr['name']); - $messenger->im($addr['jabber'], $addr['name']); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($addr['name']), - 'TOPIC_TITLE' => htmlspecialchars_decode($topic_title), - 'FORUM_NAME' => htmlspecialchars_decode($forum_name), - - 'U_FORUM' => generate_board_url() . "/viewforum.$phpEx?f=$forum_id", - 'U_TOPIC' => generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&t=$topic_id", - 'U_NEWEST_POST' => generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&t=$topic_id&p=$post_id&e=$post_id", - 'U_STOP_WATCHING_TOPIC' => generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&t=$topic_id&unwatch=topic", - 'U_STOP_WATCHING_FORUM' => generate_board_url() . "/viewforum.$phpEx?f=$forum_id&unwatch=forum", - )); - - $messenger->send($addr['method']); - } - } - unset($msg_list_ary); - - $messenger->save_queue(); - } - - // Handle the DB updates - $db->sql_transaction('begin'); - - if (!empty($update_notification['topic'])) - { - $sql = 'UPDATE ' . TOPICS_WATCH_TABLE . " - SET notify_status = 1 - WHERE topic_id = $topic_id - AND " . $db->sql_in_set('user_id', $update_notification['topic']); - $db->sql_query($sql); - } - - if (!empty($update_notification['forum'])) - { - $sql = 'UPDATE ' . FORUMS_WATCH_TABLE . " - SET notify_status = 1 - WHERE forum_id = $forum_id - AND " . $db->sql_in_set('user_id', $update_notification['forum']); - $db->sql_query($sql); - } - - // Now delete the user_ids not authorised to receive notifications on this topic/forum - if (!empty($delete_ids['topic'])) - { - $sql = 'DELETE FROM ' . TOPICS_WATCH_TABLE . " - WHERE topic_id = $topic_id - AND " . $db->sql_in_set('user_id', $delete_ids['topic']); - $db->sql_query($sql); - } - - if (!empty($delete_ids['forum'])) - { - $sql = 'DELETE FROM ' . FORUMS_WATCH_TABLE . " - WHERE forum_id = $forum_id - AND " . $db->sql_in_set('user_id', $delete_ids['forum']); - $db->sql_query($sql); - } - - $db->sql_transaction('commit'); -} - -// -// Post handling functions -// - -/** -* Delete Post -*/ -function delete_post($forum_id, $topic_id, $post_id, &$data) -{ - global $db, $user, $auth; - global $config, $phpEx, $phpbb_root_path; - - // Specify our post mode - $post_mode = 'delete'; - if (($data['topic_first_post_id'] === $data['topic_last_post_id']) && $data['topic_replies_real'] == 0) - { - $post_mode = 'delete_topic'; - } - else if ($data['topic_first_post_id'] == $post_id) - { - $post_mode = 'delete_first_post'; - } - else if ($data['topic_last_post_id'] == $post_id) - { - $post_mode = 'delete_last_post'; - } - $sql_data = array(); - $next_post_id = false; - - include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); - - $db->sql_transaction('begin'); - - // we must make sure to update forums that contain the shadow'd topic - if ($post_mode == 'delete_topic') - { - $shadow_forum_ids = array(); - - $sql = 'SELECT forum_id - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_moved_id', $topic_id); - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - if (!isset($shadow_forum_ids[(int) $row['forum_id']])) - { - $shadow_forum_ids[(int) $row['forum_id']] = 1; - } - else - { - $shadow_forum_ids[(int) $row['forum_id']]++; - } - } - $db->sql_freeresult($result); - } - - if (!delete_posts('post_id', array($post_id), false, false)) - { - // Try to delete topic, we may had an previous error causing inconsistency - if ($post_mode == 'delete_topic') - { - delete_topics('topic_id', array($topic_id), false); - } - trigger_error('ALREADY_DELETED'); - } - - $db->sql_transaction('commit'); - - // Collect the necessary information for updating the tables - $sql_data[FORUMS_TABLE] = ''; - switch ($post_mode) - { - case 'delete_topic': - - foreach ($shadow_forum_ids as $updated_forum => $topic_count) - { - // counting is fun! we only have to do sizeof($forum_ids) number of queries, - // even if the topic is moved back to where its shadow lives (we count how many times it is in a forum) - $db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_topics_real = forum_topics_real - ' . $topic_count . ', forum_topics = forum_topics - ' . $topic_count . ' WHERE forum_id = ' . $updated_forum); - update_post_information('forum', $updated_forum); - } - - delete_topics('topic_id', array($topic_id), false); - - if ($data['topic_type'] != POST_GLOBAL) - { - $sql_data[FORUMS_TABLE] .= 'forum_topics_real = forum_topics_real - 1'; - $sql_data[FORUMS_TABLE] .= ($data['topic_approved']) ? ', forum_posts = forum_posts - 1, forum_topics = forum_topics - 1' : ''; - } - - $update_sql = update_post_information('forum', $forum_id, true); - if (sizeof($update_sql)) - { - $sql_data[FORUMS_TABLE] .= ($sql_data[FORUMS_TABLE]) ? ', ' : ''; - $sql_data[FORUMS_TABLE] .= implode(', ', $update_sql[$forum_id]); - } - break; - - case 'delete_first_post': - $sql = 'SELECT p.post_id, p.poster_id, p.post_username, u.username, u.user_colour - FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u - WHERE p.topic_id = $topic_id - AND p.poster_id = u.user_id - ORDER BY p.post_time ASC"; - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($data['topic_type'] != POST_GLOBAL) - { - $sql_data[FORUMS_TABLE] = ($data['post_approved']) ? 'forum_posts = forum_posts - 1' : ''; - } - - $sql_data[TOPICS_TABLE] = 'topic_first_post_id = ' . intval($row['post_id']) . ", topic_first_poster_colour = '" . $db->sql_escape($row['user_colour']) . "', topic_first_poster_name = '" . (($row['poster_id'] == ANONYMOUS) ? $db->sql_escape($row['post_username']) : $db->sql_escape($row['username'])) . "'"; - - // Decrementing topic_replies here is fine because this case only happens if there is more than one post within the topic - basically removing one "reply" - $sql_data[TOPICS_TABLE] .= ', topic_replies_real = topic_replies_real - 1' . (($data['post_approved']) ? ', topic_replies = topic_replies - 1' : ''); - - $next_post_id = (int) $row['post_id']; - break; - - case 'delete_last_post': - if ($data['topic_type'] != POST_GLOBAL) - { - $sql_data[FORUMS_TABLE] = ($data['post_approved']) ? 'forum_posts = forum_posts - 1' : ''; - } - - $update_sql = update_post_information('forum', $forum_id, true); - if (sizeof($update_sql)) - { - $sql_data[FORUMS_TABLE] .= ($sql_data[FORUMS_TABLE]) ? ', ' : ''; - $sql_data[FORUMS_TABLE] .= implode(', ', $update_sql[$forum_id]); - } - - $sql_data[TOPICS_TABLE] = 'topic_bumped = 0, topic_bumper = 0, topic_replies_real = topic_replies_real - 1' . (($data['post_approved']) ? ', topic_replies = topic_replies - 1' : ''); - - $update_sql = update_post_information('topic', $topic_id, true); - if (sizeof($update_sql)) - { - $sql_data[TOPICS_TABLE] .= ', ' . implode(', ', $update_sql[$topic_id]); - $next_post_id = (int) str_replace('topic_last_post_id = ', '', $update_sql[$topic_id][0]); - } - else - { - $sql = 'SELECT MAX(post_id) as last_post_id - FROM ' . POSTS_TABLE . " - WHERE topic_id = $topic_id " . - ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND post_approved = 1' : ''); - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $next_post_id = (int) $row['last_post_id']; - } - break; - - case 'delete': - $sql = 'SELECT post_id - FROM ' . POSTS_TABLE . " - WHERE topic_id = $topic_id " . - ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND post_approved = 1' : '') . ' - AND post_time > ' . $data['post_time'] . ' - ORDER BY post_time ASC'; - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($data['topic_type'] != POST_GLOBAL) - { - $sql_data[FORUMS_TABLE] = ($data['post_approved']) ? 'forum_posts = forum_posts - 1' : ''; - } - - $sql_data[TOPICS_TABLE] = 'topic_replies_real = topic_replies_real - 1' . (($data['post_approved']) ? ', topic_replies = topic_replies - 1' : ''); - $next_post_id = (int) $row['post_id']; - break; - } - -// $sql_data[USERS_TABLE] = ($data['post_postcount']) ? 'user_posts = user_posts - 1' : ''; - - $db->sql_transaction('begin'); - - $where_sql = array( - FORUMS_TABLE => "forum_id = $forum_id", - TOPICS_TABLE => "topic_id = $topic_id", - USERS_TABLE => 'user_id = ' . $data['poster_id'] - ); - - foreach ($sql_data as $table => $update_sql) - { - if ($update_sql) - { - $db->sql_query("UPDATE $table SET $update_sql WHERE " . $where_sql[$table]); - } - } - - // Adjust posted info for this user by looking for a post by him/her within this topic... - if ($post_mode != 'delete_topic' && $config['load_db_track'] && $data['poster_id'] != ANONYMOUS) - { - $sql = 'SELECT poster_id - FROM ' . POSTS_TABLE . ' - WHERE topic_id = ' . $topic_id . ' - AND poster_id = ' . $data['poster_id']; - $result = $db->sql_query_limit($sql, 1); - $poster_id = (int) $db->sql_fetchfield('poster_id'); - $db->sql_freeresult($result); - - // The user is not having any more posts within this topic - if (!$poster_id) - { - $sql = 'DELETE FROM ' . TOPICS_POSTED_TABLE . ' - WHERE topic_id = ' . $topic_id . ' - AND user_id = ' . $data['poster_id']; - $db->sql_query($sql); - } - } - - $db->sql_transaction('commit'); - - if ($data['post_reported'] && ($post_mode != 'delete_topic')) - { - sync('topic_reported', 'topic_id', array($topic_id)); - } - - return $next_post_id; -} - -/** -* Submit Post -*/ -function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $update_message = true) -{ - global $db, $auth, $user, $config, $phpEx, $template, $phpbb_root_path; - - // We do not handle erasing posts here - if ($mode == 'delete') - { - return false; - } - - $current_time = time(); - - if ($mode == 'post') - { - $post_mode = 'post'; - $update_message = true; - } - else if ($mode != 'edit') - { - $post_mode = 'reply'; - $update_message = true; - } - else if ($mode == 'edit') - { - $post_mode = ($data['topic_replies_real'] == 0) ? 'edit_topic' : (($data['topic_first_post_id'] == $data['post_id']) ? 'edit_first_post' : (($data['topic_last_post_id'] == $data['post_id']) ? 'edit_last_post' : 'edit')); - } - - // First of all make sure the subject and topic title are having the correct length. - // To achieve this without cutting off between special chars we convert to an array and then count the elements. - $subject = truncate_string($subject); - $data['topic_title'] = truncate_string($data['topic_title']); - - // Collect some basic information about which tables and which rows to update/insert - $sql_data = $topic_row = array(); - $poster_id = ($mode == 'edit') ? $data['poster_id'] : (int) $user->data['user_id']; - - // Retrieve some additional information if not present - if ($mode == 'edit' && (!isset($data['post_approved']) || !isset($data['topic_approved']) || $data['post_approved'] === false || $data['topic_approved'] === false)) - { - $sql = 'SELECT p.post_approved, t.topic_type, t.topic_replies, t.topic_replies_real, t.topic_approved - FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . ' p - WHERE t.topic_id = p.topic_id - AND p.post_id = ' . $data['post_id']; - $result = $db->sql_query($sql); - $topic_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $data['topic_approved'] = $topic_row['topic_approved']; - $data['post_approved'] = $topic_row['post_approved']; - } - - // Start the transaction here - $db->sql_transaction('begin'); - - - // Collect Information - switch ($post_mode) - { - case 'post': - case 'reply': - $sql_data[POSTS_TABLE]['sql'] = array( - 'forum_id' => ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'], - 'poster_id' => (int) $user->data['user_id'], - 'icon_id' => $data['icon_id'], - 'poster_ip' => $user->ip, - 'post_time' => $current_time, - 'post_approved' => (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id'])) ? 0 : 1, - 'enable_bbcode' => $data['enable_bbcode'], - 'enable_smilies' => $data['enable_smilies'], - 'enable_magic_url' => $data['enable_urls'], - 'enable_sig' => $data['enable_sig'], - 'post_username' => (!$user->data['is_registered']) ? $username : '', - 'post_subject' => $subject, - 'post_text' => $data['message'], - 'post_checksum' => $data['message_md5'], - 'post_attachment' => (!empty($data['attachment_data'])) ? 1 : 0, - 'bbcode_bitfield' => $data['bbcode_bitfield'], - 'bbcode_uid' => $data['bbcode_uid'], - 'post_postcount' => ($auth->acl_get('f_postcount', $data['forum_id'])) ? 1 : 0, - 'post_edit_locked' => $data['post_edit_locked'] - ); - break; - - case 'edit_first_post': - case 'edit': - - case 'edit_last_post': - case 'edit_topic': - - // If edit reason is given always display edit info - - // If editing last post then display no edit info - // If m_edit permission then display no edit info - // If normal edit display edit info - - // Display edit info if edit reason given or user is editing his post, which is not the last within the topic. - if ($data['post_edit_reason'] || (!$auth->acl_get('m_edit', $data['forum_id']) && ($post_mode == 'edit' || $post_mode == 'edit_first_post'))) - { - $data['post_edit_reason'] = truncate_string($data['post_edit_reason'], 255, false); - - $sql_data[POSTS_TABLE]['sql'] = array( - 'post_edit_time' => $current_time, - 'post_edit_reason' => $data['post_edit_reason'], - 'post_edit_user' => (int) $data['post_edit_user'], - ); - - $sql_data[POSTS_TABLE]['stat'][] = 'post_edit_count = post_edit_count + 1'; - } - else if (!$data['post_edit_reason'] && $mode == 'edit' && $auth->acl_get('m_edit', $data['forum_id'])) - { - $sql_data[POSTS_TABLE]['sql'] = array( - 'post_edit_reason' => '', - ); - } - - // If the person editing this post is different to the one having posted then we will add a log entry stating the edit - // Could be simplified by only adding to the log if the edit is not tracked - but this may confuse admins/mods - if ($user->data['user_id'] != $poster_id) - { - $log_subject = ($subject) ? $subject : $data['topic_title']; - add_log('mod', $data['forum_id'], $data['topic_id'], 'LOG_POST_EDITED', $log_subject, (!empty($username)) ? $username : $user->lang['GUEST']); - } - - if (!isset($sql_data[POSTS_TABLE]['sql'])) - { - $sql_data[POSTS_TABLE]['sql'] = array(); - } - - $sql_data[POSTS_TABLE]['sql'] = array_merge($sql_data[POSTS_TABLE]['sql'], array( - 'forum_id' => ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'], - 'poster_id' => $data['poster_id'], - 'icon_id' => $data['icon_id'], - 'post_approved' => (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id'])) ? 0 : $data['post_approved'], - 'enable_bbcode' => $data['enable_bbcode'], - 'enable_smilies' => $data['enable_smilies'], - 'enable_magic_url' => $data['enable_urls'], - 'enable_sig' => $data['enable_sig'], - 'post_username' => ($username && $data['poster_id'] == ANONYMOUS) ? $username : '', - 'post_subject' => $subject, - 'post_checksum' => $data['message_md5'], - 'post_attachment' => (!empty($data['attachment_data'])) ? 1 : 0, - 'bbcode_bitfield' => $data['bbcode_bitfield'], - 'bbcode_uid' => $data['bbcode_uid'], - 'post_edit_locked' => $data['post_edit_locked']) - ); - - if ($update_message) - { - $sql_data[POSTS_TABLE]['sql']['post_text'] = $data['message']; - } - - break; - } - - $post_approved = $sql_data[POSTS_TABLE]['sql']['post_approved']; - $topic_row = array(); - - // And the topic ladies and gentlemen - switch ($post_mode) - { - case 'post': - $sql_data[TOPICS_TABLE]['sql'] = array( - 'topic_poster' => (int) $user->data['user_id'], - 'topic_time' => $current_time, - 'forum_id' => ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'], - 'icon_id' => $data['icon_id'], - 'topic_approved' => (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id'])) ? 0 : 1, - 'topic_title' => $subject, - 'topic_first_poster_name' => (!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : ''), - 'topic_first_poster_colour' => $user->data['user_colour'], - 'topic_type' => $topic_type, - 'topic_time_limit' => ($topic_type == POST_STICKY || $topic_type == POST_ANNOUNCE) ? ($data['topic_time_limit'] * 86400) : 0, - 'topic_attachment' => (!empty($data['attachment_data'])) ? 1 : 0, - ); - - if (isset($poll['poll_options']) && !empty($poll['poll_options'])) - { - $sql_data[TOPICS_TABLE]['sql'] = array_merge($sql_data[TOPICS_TABLE]['sql'], array( - 'poll_title' => $poll['poll_title'], - 'poll_start' => ($poll['poll_start']) ? $poll['poll_start'] : $current_time, - 'poll_max_options' => $poll['poll_max_options'], - 'poll_length' => ($poll['poll_length'] * 86400), - 'poll_vote_change' => $poll['poll_vote_change']) - ); - } - - $sql_data[USERS_TABLE]['stat'][] = "user_lastpost_time = $current_time" . (($auth->acl_get('f_postcount', $data['forum_id'])) ? ', user_posts = user_posts + 1' : ''); - - if ($topic_type != POST_GLOBAL) - { - if ($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id'])) - { - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + 1'; - } - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics_real = forum_topics_real + 1' . (($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id'])) ? ', forum_topics = forum_topics + 1' : ''); - } - break; - - case 'reply': - $sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies_real = topic_replies_real + 1, topic_bumped = 0, topic_bumper = 0' . (($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id'])) ? ', topic_replies = topic_replies + 1' : '') . ((!empty($data['attachment_data']) || (isset($data['topic_attachment']) && $data['topic_attachment'])) ? ', topic_attachment = 1' : ''); - - $sql_data[USERS_TABLE]['stat'][] = "user_lastpost_time = $current_time" . (($auth->acl_get('f_postcount', $data['forum_id'])) ? ', user_posts = user_posts + 1' : ''); - - if (($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id'])) && $topic_type != POST_GLOBAL) - { - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + 1'; - } - break; - - case 'edit_topic': - case 'edit_first_post': - - $sql_data[TOPICS_TABLE]['sql'] = array( - 'forum_id' => ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id'], - 'icon_id' => $data['icon_id'], - 'topic_approved' => (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id'])) ? 0 : $data['topic_approved'], - 'topic_title' => $subject, - 'topic_first_poster_name' => $username, - 'topic_type' => $topic_type, - 'topic_time_limit' => ($topic_type == POST_STICKY || $topic_type == POST_ANNOUNCE) ? ($data['topic_time_limit'] * 86400) : 0, - 'poll_title' => (isset($poll['poll_options'])) ? $poll['poll_title'] : '', - 'poll_start' => (isset($poll['poll_options'])) ? (($poll['poll_start']) ? $poll['poll_start'] : $current_time) : 0, - 'poll_max_options' => (isset($poll['poll_options'])) ? $poll['poll_max_options'] : 1, - 'poll_length' => (isset($poll['poll_options'])) ? ($poll['poll_length'] * 86400) : 0, - 'poll_vote_change' => (isset($poll['poll_vote_change'])) ? $poll['poll_vote_change'] : 0, - - 'topic_attachment' => (!empty($data['attachment_data'])) ? 1 : (isset($data['topic_attachment']) ? $data['topic_attachment'] : 0), - ); - - // Correctly set back the topic replies and forum posts... only if the topic was approved before and now gets disapproved - if (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id']) && $data['topic_approved']) - { - // Do we need to grab some topic informations? - if (!sizeof($topic_row)) - { - $sql = 'SELECT topic_type, topic_replies, topic_replies_real, topic_approved - FROM ' . TOPICS_TABLE . ' - WHERE topic_id = ' . $data['topic_id']; - $result = $db->sql_query($sql); - $topic_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - } - - // If this is the only post remaining we do not need to decrement topic_replies. - // Also do not decrement if first post - then the topic_replies will not be adjusted if approving the topic again. - - // If this is an edited topic or the first post the topic gets completely disapproved later on... - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics = forum_topics - 1'; - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts - ' . ($topic_row['topic_replies'] + 1); - - set_config('num_topics', $config['num_topics'] - 1, true); - set_config('num_posts', $config['num_posts'] - ($topic_row['topic_replies'] + 1), true); - } - - break; - - case 'edit': - case 'edit_last_post': - - // Correctly set back the topic replies and forum posts... but only if the post was approved before. - if (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id']) && $data['post_approved']) - { - $sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies = topic_replies - 1'; - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts - 1'; - - set_config('num_posts', $config['num_posts'] - 1, true); - } - - break; - } - - // Submit new topic - if ($post_mode == 'post') - { - $sql = 'INSERT INTO ' . TOPICS_TABLE . ' ' . - $db->sql_build_array('INSERT', $sql_data[TOPICS_TABLE]['sql']); - $db->sql_query($sql); - - $data['topic_id'] = $db->sql_nextid(); - - $sql_data[POSTS_TABLE]['sql'] = array_merge($sql_data[POSTS_TABLE]['sql'], array( - 'topic_id' => $data['topic_id']) - ); - unset($sql_data[TOPICS_TABLE]['sql']); - } - - // Submit new post - if ($post_mode == 'post' || $post_mode == 'reply') - { - if ($post_mode == 'reply') - { - $sql_data[POSTS_TABLE]['sql'] = array_merge($sql_data[POSTS_TABLE]['sql'], array( - 'topic_id' => $data['topic_id']) - ); - } - - $sql = 'INSERT INTO ' . POSTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_data[POSTS_TABLE]['sql']); - $db->sql_query($sql); - $data['post_id'] = $db->sql_nextid(); - - if ($post_mode == 'post') - { - $sql_data[TOPICS_TABLE]['sql'] = array( - 'topic_first_post_id' => $data['post_id'], - 'topic_last_post_id' => $data['post_id'], - 'topic_last_post_time' => $current_time, - 'topic_last_poster_id' => (int) $user->data['user_id'], - 'topic_last_poster_name' => (!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : ''), - 'topic_last_poster_colour' => $user->data['user_colour'], - ); - } - - unset($sql_data[POSTS_TABLE]['sql']); - } - - $make_global = false; - - // Are we globalising or unglobalising? - if ($post_mode == 'edit_first_post' || $post_mode == 'edit_topic') - { - if (!sizeof($topic_row)) - { - $sql = 'SELECT topic_type, topic_replies, topic_replies_real, topic_approved, topic_last_post_id - FROM ' . TOPICS_TABLE . ' - WHERE topic_id = ' . $data['topic_id']; - $result = $db->sql_query($sql); - $topic_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - } - - // globalise/unglobalise? - if (($topic_row['topic_type'] != POST_GLOBAL && $topic_type == POST_GLOBAL) || ($topic_row['topic_type'] == POST_GLOBAL && $topic_type != POST_GLOBAL)) - { - if (!empty($sql_data[FORUMS_TABLE]['stat']) && implode('', $sql_data[FORUMS_TABLE]['stat'])) - { - $db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET ' . implode(', ', $sql_data[FORUMS_TABLE]['stat']) . ' WHERE forum_id = ' . $data['forum_id']); - } - - $make_global = true; - $sql_data[FORUMS_TABLE]['stat'] = array(); - } - - // globalise - if ($topic_row['topic_type'] != POST_GLOBAL && $topic_type == POST_GLOBAL) - { - // Decrement topic/post count - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts - ' . ($topic_row['topic_replies_real'] + 1); - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics_real = forum_topics_real - 1' . (($topic_row['topic_approved']) ? ', forum_topics = forum_topics - 1' : ''); - - // Update forum_ids for all posts - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET forum_id = 0 - WHERE topic_id = ' . $data['topic_id']; - $db->sql_query($sql); - } - // unglobalise - else if ($topic_row['topic_type'] == POST_GLOBAL && $topic_type != POST_GLOBAL) - { - // Increment topic/post count - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts + ' . ($topic_row['topic_replies_real'] + 1); - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_topics_real = forum_topics_real + 1' . (($topic_row['topic_approved']) ? ', forum_topics = forum_topics + 1' : ''); - - // Update forum_ids for all posts - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET forum_id = ' . $data['forum_id'] . ' - WHERE topic_id = ' . $data['topic_id']; - $db->sql_query($sql); - } - } - - // Update the topics table - if (isset($sql_data[TOPICS_TABLE]['sql'])) - { - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_data[TOPICS_TABLE]['sql']) . ' - WHERE topic_id = ' . $data['topic_id']; - $db->sql_query($sql); - } - - // Update the posts table - if (isset($sql_data[POSTS_TABLE]['sql'])) - { - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_data[POSTS_TABLE]['sql']) . ' - WHERE post_id = ' . $data['post_id']; - $db->sql_query($sql); - } - - // Update Poll Tables - if (isset($poll['poll_options']) && !empty($poll['poll_options'])) - { - $cur_poll_options = array(); - - if ($poll['poll_start'] && $mode == 'edit') - { - $sql = 'SELECT * - FROM ' . POLL_OPTIONS_TABLE . ' - WHERE topic_id = ' . $data['topic_id'] . ' - ORDER BY poll_option_id'; - $result = $db->sql_query($sql); - - $cur_poll_options = array(); - while ($row = $db->sql_fetchrow($result)) - { - $cur_poll_options[] = $row; - } - $db->sql_freeresult($result); - } - - $sql_insert_ary = array(); - - for ($i = 0, $size = sizeof($poll['poll_options']); $i < $size; $i++) - { - if (strlen(trim($poll['poll_options'][$i]))) - { - if (empty($cur_poll_options[$i])) - { - // If we add options we need to put them to the end to be able to preserve votes... - $sql_insert_ary[] = array( - 'poll_option_id' => (int) sizeof($cur_poll_options) + 1 + sizeof($sql_insert_ary), - 'topic_id' => (int) $data['topic_id'], - 'poll_option_text' => (string) $poll['poll_options'][$i] - ); - } - else if ($poll['poll_options'][$i] != $cur_poll_options[$i]) - { - $sql = 'UPDATE ' . POLL_OPTIONS_TABLE . " - SET poll_option_text = '" . $db->sql_escape($poll['poll_options'][$i]) . "' - WHERE poll_option_id = " . $cur_poll_options[$i]['poll_option_id'] . ' - AND topic_id = ' . $data['topic_id']; - $db->sql_query($sql); - } - } - } - - $db->sql_multi_insert(POLL_OPTIONS_TABLE, $sql_insert_ary); - - if (sizeof($poll['poll_options']) < sizeof($cur_poll_options)) - { - $sql = 'DELETE FROM ' . POLL_OPTIONS_TABLE . ' - WHERE poll_option_id > ' . sizeof($poll['poll_options']) . ' - AND topic_id = ' . $data['topic_id']; - $db->sql_query($sql); - } - - // If edited, we would need to reset votes (since options can be re-ordered above, you can't be sure if the change is for changing the text or adding an option - if ($mode == 'edit' && sizeof($poll['poll_options']) != sizeof($cur_poll_options)) - { - $db->sql_query('DELETE FROM ' . POLL_VOTES_TABLE . ' WHERE topic_id = ' . $data['topic_id']); - $db->sql_query('UPDATE ' . POLL_OPTIONS_TABLE . ' SET poll_option_total = 0 WHERE topic_id = ' . $data['topic_id']); - } - } - - // Submit Attachments - if (!empty($data['attachment_data']) && $data['post_id'] && in_array($mode, array('post', 'reply', 'quote', 'edit'))) - { - $space_taken = $files_added = 0; - $orphan_rows = array(); - - foreach ($data['attachment_data'] as $pos => $attach_row) - { - $orphan_rows[(int) $attach_row['attach_id']] = array(); - } - - if (sizeof($orphan_rows)) - { - $sql = 'SELECT attach_id, filesize, physical_filename - FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set('attach_id', array_keys($orphan_rows)) . ' - AND is_orphan = 1 - AND poster_id = ' . $user->data['user_id']; - $result = $db->sql_query($sql); - - $orphan_rows = array(); - while ($row = $db->sql_fetchrow($result)) - { - $orphan_rows[$row['attach_id']] = $row; - } - $db->sql_freeresult($result); - } - - foreach ($data['attachment_data'] as $pos => $attach_row) - { - if ($attach_row['is_orphan'] && !isset($orphan_rows[$attach_row['attach_id']])) - { - continue; - } - - if (!$attach_row['is_orphan']) - { - // update entry in db if attachment already stored in db and filespace - $sql = 'UPDATE ' . ATTACHMENTS_TABLE . " - SET attach_comment = '" . $db->sql_escape($attach_row['attach_comment']) . "' - WHERE attach_id = " . (int) $attach_row['attach_id'] . ' - AND is_orphan = 0'; - $db->sql_query($sql); - } - else - { - // insert attachment into db - if (!@file_exists($phpbb_root_path . $config['upload_path'] . '/' . basename($orphan_rows[$attach_row['attach_id']]['physical_filename']))) - { - continue; - } - - $space_taken += $orphan_rows[$attach_row['attach_id']]['filesize']; - $files_added++; - - $attach_sql = array( - 'post_msg_id' => $data['post_id'], - 'topic_id' => $data['topic_id'], - 'is_orphan' => 0, - 'poster_id' => $poster_id, - 'attach_comment' => $attach_row['attach_comment'], - ); - - $sql = 'UPDATE ' . ATTACHMENTS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $attach_sql) . ' - WHERE attach_id = ' . $attach_row['attach_id'] . ' - AND is_orphan = 1 - AND poster_id = ' . $user->data['user_id']; - $db->sql_query($sql); - } - } - - if ($space_taken && $files_added) - { - set_config('upload_dir_size', $config['upload_dir_size'] + $space_taken, true); - set_config('num_files', $config['num_files'] + $files_added, true); - } - } - - // we need to update the last forum information - // only applicable if the topic is not global and it is approved - // we also check to make sure we are not dealing with globaling the latest topic (pretty rare but still needs to be checked) - if ($topic_type != POST_GLOBAL && !$make_global && ($post_approved || !$data['post_approved'])) - { - // the last post makes us update the forum table. This can happen if... - // We make a new topic - // We reply to a topic - // We edit the last post in a topic and this post is the latest in the forum (maybe) - // We edit the only post in the topic - // We edit the first post in the topic and all the other posts are not approved - if (($post_mode == 'post' || $post_mode == 'reply') && $post_approved) - { - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_id = ' . $data['post_id']; - $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = '" . $db->sql_escape($subject) . "'"; - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_time = ' . $current_time; - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_poster_id = ' . (int) $user->data['user_id']; - $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = '" . $db->sql_escape((!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : '')) . "'"; - $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_colour = '" . $db->sql_escape($user->data['user_colour']) . "'"; - } - else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies'])) - { - // this does not _necessarily_ mean that we must update the info again, - // it just means that we might have to - $sql = 'SELECT forum_last_post_id, forum_last_post_subject - FROM ' . FORUMS_TABLE . ' - WHERE forum_id = ' . (int) $data['forum_id']; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // this post is the latest post in the forum, better update - if ($row['forum_last_post_id'] == $data['post_id']) - { - if ($post_approved && $row['forum_last_post_subject'] !== $subject) - { - // the only data that can really be changed is the post's subject - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_subject = \'' . $db->sql_escape($subject) . '\''; - } - else if ($data['post_approved'] !== $post_approved) - { - // we need a fresh change of socks, everything has become invalidated - $sql = 'SELECT MAX(topic_last_post_id) as last_post_id - FROM ' . TOPICS_TABLE . ' - WHERE forum_id = ' . (int) $data['forum_id'] . ' - AND topic_approved = 1'; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // any posts left in this forum? - if (!empty($row['last_post_id'])) - { - $sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.user_id, u.username, u.user_colour - FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u - WHERE p.poster_id = u.user_id - AND p.post_id = ' . (int) $row['last_post_id']; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // salvation, a post is found! jam it into the forums table - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_id = ' . (int) $row['post_id']; - $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = '" . $db->sql_escape($row['post_subject']) . "'"; - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_time = ' . (int) $row['post_time']; - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_poster_id = ' . (int) $row['poster_id']; - $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = '" . $db->sql_escape(($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username']) . "'"; - $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_colour = '" . $db->sql_escape($row['user_colour']) . "'"; - } - else - { - // just our luck, the last topic in the forum has just been turned unapproved... - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_id = 0'; - $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = ''"; - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_time = 0'; - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_poster_id = 0'; - $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = ''"; - $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_colour = ''"; - } - } - } - } - } - else if ($make_global) - { - // somebody decided to be a party pooper, we must recalculate the whole shebang (maybe) - $sql = 'SELECT forum_last_post_id - FROM ' . FORUMS_TABLE . ' - WHERE forum_id = ' . (int) $data['forum_id']; - $result = $db->sql_query($sql); - $forum_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // we made a topic global, go get new data - if ($topic_row['topic_type'] != POST_GLOBAL && $topic_type == POST_GLOBAL && $forum_row['forum_last_post_id'] == $topic_row['topic_last_post_id']) - { - // we need a fresh change of socks, everything has become invalidated - $sql = 'SELECT MAX(topic_last_post_id) as last_post_id - FROM ' . TOPICS_TABLE . ' - WHERE forum_id = ' . (int) $data['forum_id'] . ' - AND topic_approved = 1'; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // any posts left in this forum? - if (!empty($row['last_post_id'])) - { - $sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.user_id, u.username, u.user_colour - FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u - WHERE p.poster_id = u.user_id - AND p.post_id = ' . (int) $row['last_post_id']; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // salvation, a post is found! jam it into the forums table - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_id = ' . (int) $row['post_id']; - $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = '" . $db->sql_escape($row['post_subject']) . "'"; - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_time = ' . (int) $row['post_time']; - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_poster_id = ' . (int) $row['poster_id']; - $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = '" . $db->sql_escape(($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username']) . "'"; - $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_colour = '" . $db->sql_escape($row['user_colour']) . "'"; - } - else - { - // just our luck, the last topic in the forum has just been globalized... - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_id = 0'; - $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = ''"; - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_time = 0'; - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_poster_id = 0'; - $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = ''"; - $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_colour = ''"; - } - } - else if ($topic_row['topic_type'] == POST_GLOBAL && $topic_type != POST_GLOBAL && $forum_row['forum_last_post_id'] < $topic_row['topic_last_post_id']) - { - // this post has a higher id, it is newer - $sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.user_id, u.username, u.user_colour - FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u - WHERE p.poster_id = u.user_id - AND p.post_id = ' . (int) $topic_row['topic_last_post_id']; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // salvation, a post is found! jam it into the forums table - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_id = ' . (int) $row['post_id']; - $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_post_subject = '" . $db->sql_escape($row['post_subject']) . "'"; - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_post_time = ' . (int) $row['post_time']; - $sql_data[FORUMS_TABLE]['stat'][] = 'forum_last_poster_id = ' . (int) $row['poster_id']; - $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_name = '" . $db->sql_escape(($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username']) . "'"; - $sql_data[FORUMS_TABLE]['stat'][] = "forum_last_poster_colour = '" . $db->sql_escape($row['user_colour']) . "'"; - } - } - - // topic sync time! - // simply, we update if it is a reply or the last post is edited - if ($post_approved) - { - // reply requires the whole thing - if ($post_mode == 'reply') - { - $sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_post_id = ' . (int) $data['post_id']; - $sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_poster_id = ' . (int) $user->data['user_id']; - $sql_data[TOPICS_TABLE]['stat'][] = "topic_last_poster_name = '" . $db->sql_escape((!$user->data['is_registered'] && $username) ? $username : (($user->data['user_id'] != ANONYMOUS) ? $user->data['username'] : '')) . "'"; - $sql_data[TOPICS_TABLE]['stat'][] = "topic_last_poster_colour = '" . (($user->data['user_id'] != ANONYMOUS) ? $db->sql_escape($user->data['user_colour']) : '') . "'"; - $sql_data[TOPICS_TABLE]['stat'][] = "topic_last_post_subject = '" . $db->sql_escape($subject) . "'"; - $sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_post_time = ' . (int) $current_time; - } - else if ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies'])) - { - // only the subject can be changed from edit - $sql_data[TOPICS_TABLE]['stat'][] = "topic_last_post_subject = '" . $db->sql_escape($subject) . "'"; - } - } - else if (!$data['post_approved'] && ($post_mode == 'edit_last_post' || $post_mode == 'edit_topic' || ($post_mode == 'edit_first_post' && !$data['topic_replies']))) - { - // like having the rug pulled from under us - $sql = 'SELECT MAX(post_id) as last_post_id - FROM ' . POSTS_TABLE . ' - WHERE topic_id = ' . (int) $data['topic_id'] . ' - AND post_approved = 1'; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // any posts left in this forum? - if (!empty($row['last_post_id'])) - { - $sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.user_id, u.username, u.user_colour - FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u - WHERE p.poster_id = u.user_id - AND p.post_id = ' . (int) $row['last_post_id']; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // salvation, a post is found! jam it into the topics table - $sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_post_id = ' . (int) $row['post_id']; - $sql_data[TOPICS_TABLE]['stat'][] = "topic_last_post_subject = '" . $db->sql_escape($row['post_subject']) . "'"; - $sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_post_time = ' . (int) $row['post_time']; - $sql_data[TOPICS_TABLE]['stat'][] = 'topic_last_poster_id = ' . (int) $row['poster_id']; - $sql_data[TOPICS_TABLE]['stat'][] = "topic_last_poster_name = '" . $db->sql_escape(($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username']) . "'"; - $sql_data[TOPICS_TABLE]['stat'][] = "topic_last_poster_colour = '" . $db->sql_escape($row['user_colour']) . "'"; - } - } - - // Update total post count, do not consider moderated posts/topics - if ($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id'])) - { - if ($post_mode == 'post') - { - set_config('num_topics', $config['num_topics'] + 1, true); - set_config('num_posts', $config['num_posts'] + 1, true); - } - - if ($post_mode == 'reply') - { - set_config('num_posts', $config['num_posts'] + 1, true); - } - } - - // Update forum stats - $where_sql = array(POSTS_TABLE => 'post_id = ' . $data['post_id'], TOPICS_TABLE => 'topic_id = ' . $data['topic_id'], FORUMS_TABLE => 'forum_id = ' . $data['forum_id'], USERS_TABLE => 'user_id = ' . $user->data['user_id']); - - foreach ($sql_data as $table => $update_ary) - { - if (isset($update_ary['stat']) && implode('', $update_ary['stat'])) - { - $sql = "UPDATE $table SET " . implode(', ', $update_ary['stat']) . ' WHERE ' . $where_sql[$table]; - $db->sql_query($sql); - } - } - - // Delete topic shadows (if any exist). We do not need a shadow topic for an global announcement - if ($make_global) - { - $sql = 'DELETE FROM ' . TOPICS_TABLE . ' - WHERE topic_moved_id = ' . $data['topic_id']; - $db->sql_query($sql); - } - - // Committing the transaction before updating search index - $db->sql_transaction('commit'); - - // Delete draft if post was loaded... - $draft_id = request_var('draft_loaded', 0); - if ($draft_id) - { - $sql = 'DELETE FROM ' . DRAFTS_TABLE . " - WHERE draft_id = $draft_id - AND user_id = {$user->data['user_id']}"; - $db->sql_query($sql); - } - - // Index message contents - if ($update_message && $data['enable_indexing']) - { - // Select the search method and do some additional checks to ensure it can actually be utilised - $search_type = basename($config['search_type']); - - if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx)) - { - trigger_error('NO_SUCH_SEARCH_MODULE'); - } - - if (!class_exists($search_type)) - { - include("{$phpbb_root_path}includes/search/$search_type.$phpEx"); - } - - $error = false; - $search = new $search_type($error); - - if ($error) - { - trigger_error($error); - } - - $search->index($mode, $data['post_id'], $data['message'], $subject, $poster_id, ($topic_type == POST_GLOBAL) ? 0 : $data['forum_id']); - } - - // Topic Notification, do not change if moderator is changing other users posts... - if ($user->data['user_id'] == $poster_id) - { - if (!$data['notify_set'] && $data['notify']) - { - $sql = 'INSERT INTO ' . TOPICS_WATCH_TABLE . ' (user_id, topic_id) - VALUES (' . $user->data['user_id'] . ', ' . $data['topic_id'] . ')'; - $db->sql_query($sql); - } - else if ($data['notify_set'] && !$data['notify']) - { - $sql = 'DELETE FROM ' . TOPICS_WATCH_TABLE . ' - WHERE user_id = ' . $user->data['user_id'] . ' - AND topic_id = ' . $data['topic_id']; - $db->sql_query($sql); - } - } - - if ($mode == 'post' || $mode == 'reply' || $mode == 'quote') - { - // Mark this topic as posted to - markread('post', $data['forum_id'], $data['topic_id'], $data['post_time']); - } - - // Mark this topic as read - // We do not use post_time here, this is intended (post_time can have a date in the past if editing a message) - markread('topic', $data['forum_id'], $data['topic_id'], time()); - - // - if ($config['load_db_lastread'] && $user->data['is_registered']) - { - $sql = 'SELECT mark_time - FROM ' . FORUMS_TRACK_TABLE . ' - WHERE user_id = ' . $user->data['user_id'] . ' - AND forum_id = ' . $data['forum_id']; - $result = $db->sql_query($sql); - $f_mark_time = (int) $db->sql_fetchfield('mark_time'); - $db->sql_freeresult($result); - } - else if ($config['load_anon_lastread'] || $user->data['is_registered']) - { - $f_mark_time = false; - } - - if (($config['load_db_lastread'] && $user->data['is_registered']) || $config['load_anon_lastread'] || $user->data['is_registered']) - { - // Update forum info - $sql = 'SELECT forum_last_post_time - FROM ' . FORUMS_TABLE . ' - WHERE forum_id = ' . $data['forum_id']; - $result = $db->sql_query($sql); - $forum_last_post_time = (int) $db->sql_fetchfield('forum_last_post_time'); - $db->sql_freeresult($result); - - update_forum_tracking_info($data['forum_id'], $forum_last_post_time, $f_mark_time, false); - } - - // Send Notifications - if ($mode != 'edit' && $mode != 'delete' && ($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id']))) - { - user_notification($mode, $subject, $data['topic_title'], $data['forum_name'], $data['forum_id'], $data['topic_id'], $data['post_id']); - } - - $params = $add_anchor = ''; - - if ($auth->acl_get('f_noapprove', $data['forum_id']) || $auth->acl_get('m_approve', $data['forum_id'])) - { - $params .= '&t=' . $data['topic_id']; - - if ($mode != 'post') - { - $params .= '&p=' . $data['post_id']; - $add_anchor = '#p' . $data['post_id']; - } - } - else if ($mode != 'post' && $post_mode != 'edit_first_post' && $post_mode != 'edit_topic') - { - $params .= '&t=' . $data['topic_id']; - } - - $url = (!$params) ? "{$phpbb_root_path}viewforum.$phpEx" : "{$phpbb_root_path}viewtopic.$phpEx"; - $url = append_sid($url, 'f=' . $data['forum_id'] . $params) . $add_anchor; - - return $url; -} - -?> \ No newline at end of file diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php deleted file mode 100644 index bffa64158a..0000000000 --- a/phpBB/includes/functions_privmsgs.php +++ /dev/null @@ -1,1806 +0,0 @@ - array( - RULE_IS_LIKE => array('check0' => 'message_subject', 'function' => 'preg_match("/" . preg_quote({STRING}, "/") . "/i", {CHECK0})'), - RULE_IS_NOT_LIKE => array('check0' => 'message_subject', 'function' => '!(preg_match("/" . preg_quote({STRING}, "/") . "/i", {CHECK0}))'), - RULE_IS => array('check0' => 'message_subject', 'function' => '{CHECK0} == {STRING}'), - RULE_IS_NOT => array('check0' => 'message_subject', 'function' => '{CHECK0} != {STRING}'), - RULE_BEGINS_WITH => array('check0' => 'message_subject', 'function' => 'preg_match("/^" . preg_quote({STRING}, "/") . "/i", {CHECK0})'), - RULE_ENDS_WITH => array('check0' => 'message_subject', 'function' => 'preg_match("/" . preg_quote({STRING}, "/") . "$/i", {CHECK0})'), - ), - - CHECK_SENDER => array( - RULE_IS_LIKE => array('check0' => 'username', 'function' => 'preg_match("/" . preg_quote({STRING}, "/") . "/i", {CHECK0})'), - RULE_IS_NOT_LIKE => array('check0' => 'username', 'function' => '!(preg_match("/" . preg_quote({STRING}, "/") . "/i", {CHECK0}))'), - RULE_IS => array('check0' => 'username', 'function' => '{CHECK0} == {STRING}'), - RULE_IS_NOT => array('check0' => 'username', 'function' => '{CHECK0} != {STRING}'), - RULE_BEGINS_WITH => array('check0' => 'username', 'function' => 'preg_match("/^" . preg_quote({STRING}, "/") . "/i", {CHECK0})'), - RULE_ENDS_WITH => array('check0' => 'username', 'function' => 'preg_match("/" . preg_quote({STRING}, "/") . "$/i", {CHECK0})'), - RULE_IS_FRIEND => array('check0' => 'friend', 'function' => '{CHECK0} == 1'), - RULE_IS_FOE => array('check0' => 'foe', 'function' => '{CHECK0} == 1'), - RULE_IS_USER => array('check0' => 'author_id', 'function' => '{CHECK0} == {USER_ID}'), - RULE_IS_GROUP => array('check0' => 'author_in_group', 'function' => 'in_array({GROUP_ID}, {CHECK0})'), - ), - - CHECK_MESSAGE => array( - RULE_IS_LIKE => array('check0' => 'message_text', 'function' => 'preg_match("/" . preg_quote({STRING}, "/") . "/i", {CHECK0})'), - RULE_IS_NOT_LIKE => array('check0' => 'message_text', 'function' => '!(preg_match("/" . preg_quote({STRING}, "/") . "/i", {CHECK0}))'), - RULE_IS => array('check0' => 'message_text', 'function' => '{CHECK0} == {STRING}'), - RULE_IS_NOT => array('check0' => 'message_text', 'function' => '{CHECK0} != {STRING}'), - ), - - CHECK_STATUS => array( - RULE_ANSWERED => array('check0' => 'pm_replied', 'function' => '{CHECK0} == 1'), - RULE_FORWARDED => array('check0' => 'pm_forwarded', 'function' => '{CHECK0} == 1'), - ), - - CHECK_TO => array( - RULE_TO_GROUP => array('check0' => 'to', 'check1' => 'bcc', 'check2' => 'user_in_group', 'function' => 'in_array("g_" . {CHECK2}, {CHECK0}) || in_array("g_" . {CHECK2}, {CHECK1})'), - RULE_TO_ME => array('check0' => 'to', 'check1' => 'bcc', 'function' => 'in_array("u_" . $user_id, {CHECK0}) || in_array("u_" . $user_id, {CHECK1})'), - ) -); - -/** -* This is for defining which condition fields to show for which Rule -*/ -$global_rule_conditions = array( - RULE_IS_LIKE => 'text', - RULE_IS_NOT_LIKE => 'text', - RULE_IS => 'text', - RULE_IS_NOT => 'text', - RULE_BEGINS_WITH => 'text', - RULE_ENDS_WITH => 'text', - RULE_IS_USER => 'user', - RULE_IS_GROUP => 'group' -); - -/** -* Get all folder -*/ -function get_folder($user_id, $folder_id = false) -{ - global $db, $user, $template; - global $phpbb_root_path, $phpEx; - - $folder = array(); - - // Get folder information - $sql = 'SELECT folder_id, COUNT(msg_id) as num_messages, SUM(pm_unread) as num_unread - FROM ' . PRIVMSGS_TO_TABLE . " - WHERE user_id = $user_id - AND folder_id <> " . PRIVMSGS_NO_BOX . ' - GROUP BY folder_id'; - $result = $db->sql_query($sql); - - $num_messages = $num_unread = array(); - while ($row = $db->sql_fetchrow($result)) - { - $num_messages[(int) $row['folder_id']] = $row['num_messages']; - $num_unread[(int) $row['folder_id']] = $row['num_unread']; - } - $db->sql_freeresult($result); - - // Make sure the default boxes are defined - $available_folder = array(PRIVMSGS_INBOX, PRIVMSGS_OUTBOX, PRIVMSGS_SENTBOX); - - foreach ($available_folder as $default_folder) - { - if (!isset($num_messages[$default_folder])) - { - $num_messages[$default_folder] = 0; - } - - if (!isset($num_unread[$default_folder])) - { - $num_unread[$default_folder] = 0; - } - } - - // Adjust unread status for outbox - $num_unread[PRIVMSGS_OUTBOX] = $num_messages[PRIVMSGS_OUTBOX]; - - $folder[PRIVMSGS_INBOX] = array( - 'folder_name' => $user->lang['PM_INBOX'], - 'num_messages' => $num_messages[PRIVMSGS_INBOX], - 'unread_messages' => $num_unread[PRIVMSGS_INBOX] - ); - - // Custom Folder - $sql = 'SELECT folder_id, folder_name, pm_count - FROM ' . PRIVMSGS_FOLDER_TABLE . " - WHERE user_id = $user_id"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $folder[$row['folder_id']] = array( - 'folder_name' => $row['folder_name'], - 'num_messages' => $row['pm_count'], - 'unread_messages' => ((isset($num_unread[$row['folder_id']])) ? $num_unread[$row['folder_id']] : 0) - ); - } - $db->sql_freeresult($result); - - $folder[PRIVMSGS_OUTBOX] = array( - 'folder_name' => $user->lang['PM_OUTBOX'], - 'num_messages' => $num_messages[PRIVMSGS_OUTBOX], - 'unread_messages' => $num_unread[PRIVMSGS_OUTBOX] - ); - - $folder[PRIVMSGS_SENTBOX] = array( - 'folder_name' => $user->lang['PM_SENTBOX'], - 'num_messages' => $num_messages[PRIVMSGS_SENTBOX], - 'unread_messages' => $num_unread[PRIVMSGS_SENTBOX] - ); - - // Define Folder Array for template designers (and for making custom folders usable by the template too) - foreach ($folder as $f_id => $folder_ary) - { - $folder_id_name = ($f_id == PRIVMSGS_INBOX) ? 'inbox' : (($f_id == PRIVMSGS_OUTBOX) ? 'outbox' : 'sentbox'); - - $template->assign_block_vars('folder', array( - 'FOLDER_ID' => $f_id, - 'FOLDER_NAME' => $folder_ary['folder_name'], - 'NUM_MESSAGES' => $folder_ary['num_messages'], - 'UNREAD_MESSAGES' => $folder_ary['unread_messages'], - - 'U_FOLDER' => ($f_id > 0) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=' . $f_id) : append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=' . $folder_id_name), - - 'S_CUR_FOLDER' => ($f_id === $folder_id) ? true : false, - 'S_UNREAD_MESSAGES' => ($folder_ary['unread_messages']) ? true : false, - 'S_CUSTOM_FOLDER' => ($f_id > 0) ? true : false) - ); - } - - return $folder; -} - -/** -* Delete Messages From Sentbox -* we are doing this here because this saves us a bunch of checks and queries -*/ -function clean_sentbox($num_sentbox_messages) -{ - global $db, $user, $config; - - // Check Message Limit - if ($user->data['message_limit'] && $num_sentbox_messages > $user->data['message_limit']) - { - // Delete old messages - $sql = 'SELECT t.msg_id - FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p - WHERE t.msg_id = p.msg_id - AND t.user_id = ' . $user->data['user_id'] . ' - AND t.folder_id = ' . PRIVMSGS_SENTBOX . ' - ORDER BY p.message_time ASC'; - $result = $db->sql_query_limit($sql, ($num_sentbox_messages - $user->data['message_limit'])); - - $delete_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $delete_ids[] = $row['msg_id']; - } - $db->sql_freeresult($result); - delete_pm($user->data['user_id'], $delete_ids, PRIVMSGS_SENTBOX); - } -} - -/** -* Check Rule against Message Information -*/ -function check_rule(&$rules, &$rule_row, &$message_row, $user_id) -{ - global $user, $config; - - if (!isset($rules[$rule_row['rule_check']][$rule_row['rule_connection']])) - { - return false; - } - - $check_ary = $rules[$rule_row['rule_check']][$rule_row['rule_connection']]; - - // Replace Check Literals - $evaluate = $check_ary['function']; - $evaluate = preg_replace('/{(CHECK[0-9])}/', '$message_row[$check_ary[strtolower("\1")]]', $evaluate); - - // Replace Rule Literals - $evaluate = preg_replace('/{(STRING|USER_ID|GROUP_ID)}/', '$rule_row["rule_" . strtolower("\1")]', $evaluate); - - // Evil Statement - $result = false; - eval('$result = (' . $evaluate . ') ? true : false;'); - - if (!$result) - { - return false; - } - - switch ($rule_row['rule_action']) - { - case ACTION_PLACE_INTO_FOLDER: - return array('action' => $rule_row['rule_action'], 'folder_id' => $rule_row['rule_folder_id']); - break; - - case ACTION_MARK_AS_READ: - case ACTION_MARK_AS_IMPORTANT: - return array('action' => $rule_row['rule_action'], 'pm_unread' => $message_row['pm_unread'], 'pm_marked' => $message_row['pm_marked']); - break; - - case ACTION_DELETE_MESSAGE: - global $db, $auth; - - // Check for admins/mods - users are not allowed to remove those messages... - // We do the check here to make sure the data we use is consistent - $sql = 'SELECT user_id, user_type, user_permissions - FROM ' . USERS_TABLE . ' - WHERE user_id = ' . (int) $message_row['author_id']; - $result = $db->sql_query($sql); - $userdata = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $auth2 = new auth(); - $auth2->acl($userdata); - - if (!$auth2->acl_get('a_') && !$auth2->acl_get('m_') && !$auth2->acl_getf_global('m_')) - { - return array('action' => $rule_row['rule_action'], 'pm_unread' => $message_row['pm_unread'], 'pm_marked' => $message_row['pm_marked']); - } - - return false; - break; - - default: - return false; - } - - return false; -} - -/** -* Update user PM count -*/ -function update_pm_counts() -{ - global $user, $db; - - // Update unread count - $sql = 'SELECT COUNT(msg_id) as num_messages - FROM ' . PRIVMSGS_TO_TABLE . ' - WHERE pm_unread = 1 - AND folder_id <> ' . PRIVMSGS_OUTBOX . ' - AND user_id = ' . $user->data['user_id']; - $result = $db->sql_query($sql); - $user->data['user_unread_privmsg'] = (int) $db->sql_fetchfield('num_messages'); - $db->sql_freeresult($result); - - // Update new pm count - $sql = 'SELECT COUNT(msg_id) as num_messages - FROM ' . PRIVMSGS_TO_TABLE . ' - WHERE pm_new = 1 - AND folder_id IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ') - AND user_id = ' . $user->data['user_id']; - $result = $db->sql_query($sql); - $user->data['user_new_privmsg'] = (int) $db->sql_fetchfield('num_messages'); - $db->sql_freeresult($result); - - $db->sql_query('UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array( - 'user_unread_privmsg' => (int) $user->data['user_unread_privmsg'], - 'user_new_privmsg' => (int) $user->data['user_new_privmsg'], - )) . ' WHERE user_id = ' . $user->data['user_id']); - - // Ok, here we need to repair something, other boxes than privmsgs_no_box and privmsgs_hold_box should not carry the pm_new flag. - if (!$user->data['user_new_privmsg']) - { - $sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . ' - SET pm_new = 0 - WHERE pm_new = 1 - AND folder_id NOT IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ') - AND user_id = ' . $user->data['user_id']; - $db->sql_query($sql); - } -} - -/** -* Place new messages into appropriate folder -*/ -function place_pm_into_folder(&$global_privmsgs_rules, $release = false) -{ - global $db, $user, $config; - - if (!$user->data['user_new_privmsg']) - { - return array('not_moved' => 0, 'removed' => 0); - } - - $user_message_rules = (int) $user->data['user_message_rules']; - $user_id = (int) $user->data['user_id']; - - $action_ary = $move_into_folder = array(); - $num_removed = 0; - - // Newly processing on-hold messages - if ($release) - { - $sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . ' - SET folder_id = ' . PRIVMSGS_NO_BOX . ' - WHERE folder_id = ' . PRIVMSGS_HOLD_BOX . " - AND user_id = $user_id"; - $db->sql_query($sql); - } - - // Get those messages not yet placed into any box - $retrieve_sql = 'SELECT t.*, p.*, u.username, u.user_id, u.group_id - FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . " u - WHERE t.user_id = $user_id - AND p.author_id = u.user_id - AND t.folder_id = " . PRIVMSGS_NO_BOX . ' - AND t.msg_id = p.msg_id'; - - // Just place into the appropriate arrays if no rules need to be checked - if (!$user_message_rules) - { - $result = $db->sql_query($retrieve_sql); - - while ($row = $db->sql_fetchrow($result)) - { - $action_ary[$row['msg_id']][] = array('action' => false); - } - $db->sql_freeresult($result); - } - else - { - $user_rules = $zebra = $check_rows = array(); - $user_ids = $memberships = array(); - - // First of all, grab all rules and retrieve friends/foes - $sql = 'SELECT * - FROM ' . PRIVMSGS_RULES_TABLE . " - WHERE user_id = $user_id"; - $result = $db->sql_query($sql); - $user_rules = $db->sql_fetchrowset($result); - $db->sql_freeresult($result); - - if (sizeof($user_rules)) - { - $sql = 'SELECT zebra_id, friend, foe - FROM ' . ZEBRA_TABLE . " - WHERE user_id = $user_id"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $zebra[$row['zebra_id']] = $row; - } - $db->sql_freeresult($result); - } - - // Now build a bare-bone check_row array - $result = $db->sql_query($retrieve_sql); - - while ($row = $db->sql_fetchrow($result)) - { - $check_rows[] = array_merge($row, array( - 'to' => explode(':', $row['to_address']), - 'bcc' => explode(':', $row['bcc_address']), - 'friend' => (isset($zebra[$row['author_id']])) ? $zebra[$row['author_id']]['friend'] : 0, - 'foe' => (isset($zebra[$row['author_id']])) ? $zebra[$row['author_id']]['foe'] : 0, - 'user_in_group' => array($user->data['group_id']), - 'author_in_group' => array()) - ); - - $user_ids[] = $row['user_id']; - } - $db->sql_freeresult($result); - - // Retrieve user memberships - if (sizeof($user_ids)) - { - $sql = 'SELECT * - FROM ' . USER_GROUP_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', $user_ids) . ' - AND user_pending = 0'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $memberships[$row['user_id']][] = $row['group_id']; - } - $db->sql_freeresult($result); - } - - // Now place into the appropriate folder - foreach ($check_rows as $row) - { - // Add membership if set - if (isset($memberships[$row['author_id']])) - { - $row['author_in_group'] = $memberships[$row['user_id']]; - } - - // Check Rule - this should be very quick since we have all information we need - $is_match = false; - foreach ($user_rules as $rule_row) - { - if (($action = check_rule($global_privmsgs_rules, $rule_row, $row, $user_id)) !== false) - { - $is_match = true; - $action_ary[$row['msg_id']][] = $action; - } - } - - if (!$is_match) - { - $action_ary[$row['msg_id']][] = array('action' => false); - } - } - - unset($user_rules, $zebra, $check_rows, $user_ids, $memberships); - } - - // We place actions into arrays, to save queries. - $sql = $unread_ids = $delete_ids = $important_ids = array(); - - foreach ($action_ary as $msg_id => $msg_ary) - { - // It is allowed to execute actions more than once, except placing messages into folder - $folder_action = $message_removed = false; - - foreach ($msg_ary as $pos => $rule_ary) - { - if ($folder_action && $rule_ary['action'] == ACTION_PLACE_INTO_FOLDER) - { - continue; - } - - switch ($rule_ary['action']) - { - case ACTION_PLACE_INTO_FOLDER: - // Folder actions have precedence, so we will remove any other ones - $folder_action = true; - $move_into_folder[(int) $rule_ary['folder_id']][] = $msg_id; - break; - - case ACTION_MARK_AS_READ: - if ($rule_ary['pm_unread']) - { - $unread_ids[] = $msg_id; - } - break; - - case ACTION_DELETE_MESSAGE: - $delete_ids[] = $msg_id; - $message_removed = true; - break; - - case ACTION_MARK_AS_IMPORTANT: - if (!$rule_ary['pm_marked']) - { - $important_ids[] = $msg_id; - } - break; - } - } - - // We place this here because it could happen that the messages are doubled if a rule marks a message and then moves it into a specific - // folder. Here we simply move the message into the INBOX if it gets not removed and also not put into a custom folder. - if (!$folder_action && !$message_removed) - { - $move_into_folder[PRIVMSGS_INBOX][] = $msg_id; - } - } - - // Do not change the order of processing - // The number of queries needed to be executed here highly depends on the defined rules and are - // only gone through if new messages arrive. - - // Delete messages - if (sizeof($delete_ids)) - { - $num_removed += sizeof($delete_ids); - delete_pm($user_id, $delete_ids, PRIVMSGS_NO_BOX); - } - - // Set messages to Unread - if (sizeof($unread_ids)) - { - $sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . ' - SET pm_unread = 0 - WHERE ' . $db->sql_in_set('msg_id', $unread_ids) . " - AND user_id = $user_id - AND folder_id = " . PRIVMSGS_NO_BOX; - $db->sql_query($sql); - } - - // mark messages as important - if (sizeof($important_ids)) - { - $sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . ' - SET pm_marked = 1 - pm_marked - WHERE folder_id = ' . PRIVMSGS_NO_BOX . " - AND user_id = $user_id - AND " . $db->sql_in_set('msg_id', $important_ids); - $db->sql_query($sql); - } - - // Move into folder - $folder = array(); - - if (sizeof($move_into_folder)) - { - // Determine Full Folder Action - we need the move to folder id later eventually - $full_folder_action = ($user->data['user_full_folder'] == FULL_FOLDER_NONE) ? ($config['full_folder_action'] - (FULL_FOLDER_NONE*(-1))) : $user->data['user_full_folder']; - - $sql_folder = array_keys($move_into_folder); - if ($full_folder_action >= 0) - { - $sql_folder[] = $full_folder_action; - } - - $sql = 'SELECT folder_id, pm_count - FROM ' . PRIVMSGS_FOLDER_TABLE . ' - WHERE ' . $db->sql_in_set('folder_id', $sql_folder) . " - AND user_id = $user_id"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $folder[(int) $row['folder_id']] = (int) $row['pm_count']; - } - $db->sql_freeresult($result); - - unset($sql_folder); - - if (isset($move_into_folder[PRIVMSGS_INBOX])) - { - $sql = 'SELECT COUNT(msg_id) as num_messages - FROM ' . PRIVMSGS_TO_TABLE . " - WHERE user_id = $user_id - AND folder_id = " . PRIVMSGS_INBOX; - $result = $db->sql_query($sql); - $folder[PRIVMSGS_INBOX] = (int) $db->sql_fetchfield('num_messages'); - $db->sql_freeresult($result); - } - } - - // Here we have ideally only one folder to move into - foreach ($move_into_folder as $folder_id => $msg_ary) - { - $dest_folder = $folder_id; - $full_folder_action = FULL_FOLDER_NONE; - - // Check Message Limit - we calculate with the complete array, most of the time it is one message - // But we are making sure that the other way around works too (more messages in queue than allowed to be stored) - if ($user->data['message_limit'] && $folder[$folder_id] && ($folder[$folder_id] + sizeof($msg_ary)) > $user->data['message_limit']) - { - $full_folder_action = ($user->data['user_full_folder'] == FULL_FOLDER_NONE) ? ($config['full_folder_action'] - (FULL_FOLDER_NONE*(-1))) : $user->data['user_full_folder']; - - // If destination folder itself is full... - if ($full_folder_action >= 0 && ($folder[$full_folder_action] + sizeof($msg_ary)) > $user->data['message_limit']) - { - $full_folder_action = $config['full_folder_action'] - (FULL_FOLDER_NONE*(-1)); - } - - // If Full Folder Action is to move to another folder, we simply adjust the destination folder - if ($full_folder_action >= 0) - { - $dest_folder = $full_folder_action; - } - else if ($full_folder_action == FULL_FOLDER_DELETE) - { - // Delete some messages. NOTE: Ordered by msg_id here instead of message_time! - $sql = 'SELECT msg_id - FROM ' . PRIVMSGS_TO_TABLE . " - WHERE user_id = $user_id - AND folder_id = $dest_folder - ORDER BY msg_id ASC"; - $result = $db->sql_query_limit($sql, (($folder[$dest_folder] + sizeof($msg_ary)) - $user->data['message_limit'])); - - $delete_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $delete_ids[] = $row['msg_id']; - } - $db->sql_freeresult($result); - - $num_removed += sizeof($delete_ids); - delete_pm($user_id, $delete_ids, $dest_folder); - } - } - - // - if ($full_folder_action == FULL_FOLDER_HOLD) - { - $sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . ' - SET folder_id = ' . PRIVMSGS_HOLD_BOX . ' - WHERE folder_id = ' . PRIVMSGS_NO_BOX . " - AND user_id = $user_id - AND " . $db->sql_in_set('msg_id', $msg_ary); - $db->sql_query($sql); - } - else - { - $sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . " - SET folder_id = $dest_folder, pm_new = 0 - WHERE folder_id = " . PRIVMSGS_NO_BOX . " - AND user_id = $user_id - AND pm_new = 1 - AND " . $db->sql_in_set('msg_id', $msg_ary); - $db->sql_query($sql); - - if ($dest_folder != PRIVMSGS_INBOX) - { - $sql = 'UPDATE ' . PRIVMSGS_FOLDER_TABLE . ' - SET pm_count = pm_count + ' . (int) $db->sql_affectedrows() . " - WHERE folder_id = $dest_folder - AND user_id = $user_id"; - $db->sql_query($sql); - } - } - } - - if (sizeof($action_ary)) - { - // Move from OUTBOX to SENTBOX - // We are not checking any full folder status here... SENTBOX is a special treatment (old messages get deleted) - $sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . ' - SET folder_id = ' . PRIVMSGS_SENTBOX . ' - WHERE folder_id = ' . PRIVMSGS_OUTBOX . ' - AND ' . $db->sql_in_set('msg_id', array_keys($action_ary)); - $db->sql_query($sql); - } - - // Update new/unread count - update_pm_counts(); - - // Now check how many messages got not moved... - $sql = 'SELECT COUNT(msg_id) as num_messages - FROM ' . PRIVMSGS_TO_TABLE . " - WHERE user_id = $user_id - AND folder_id = " . PRIVMSGS_HOLD_BOX; - $result = $db->sql_query($sql); - $num_not_moved = (int) $db->sql_fetchfield('num_messages'); - $db->sql_freeresult($result); - - return array('not_moved' => $num_not_moved, 'removed' => $num_removed); -} - -/** -* Move PM from one to another folder -*/ -function move_pm($user_id, $message_limit, $move_msg_ids, $dest_folder, $cur_folder_id) -{ - global $db, $user; - global $phpbb_root_path, $phpEx; - - $num_moved = 0; - - if (!is_array($move_msg_ids)) - { - $move_msg_ids = array($move_msg_ids); - } - - if (sizeof($move_msg_ids) && !in_array($dest_folder, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX, PRIVMSGS_SENTBOX)) && - !in_array($cur_folder_id, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX)) && $cur_folder_id != $dest_folder) - { - // We have to check the destination folder ;) - if ($dest_folder != PRIVMSGS_INBOX) - { - $sql = 'SELECT folder_id, folder_name, pm_count - FROM ' . PRIVMSGS_FOLDER_TABLE . " - WHERE folder_id = $dest_folder - AND user_id = $user_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error('NOT_AUTHORISED'); - } - - if ($message_limit && $row['pm_count'] + sizeof($move_msg_ids) > $message_limit) - { - $message = sprintf($user->lang['NOT_ENOUGH_SPACE_FOLDER'], $row['folder_name']) . '

    '; - $message .= sprintf($user->lang['CLICK_RETURN_FOLDER'], '', '', $row['folder_name']); - trigger_error($message); - } - } - else - { - $sql = 'SELECT COUNT(msg_id) as num_messages - FROM ' . PRIVMSGS_TO_TABLE . ' - WHERE folder_id = ' . PRIVMSGS_INBOX . " - AND user_id = $user_id"; - $result = $db->sql_query($sql); - $num_messages = (int) $db->sql_fetchfield('num_messages'); - $db->sql_freeresult($result); - - if ($message_limit && $num_messages + sizeof($move_msg_ids) > $message_limit) - { - $message = sprintf($user->lang['NOT_ENOUGH_SPACE_FOLDER'], $user->lang['PM_INBOX']) . '

    '; - $message .= sprintf($user->lang['CLICK_RETURN_FOLDER'], '', '', $user->lang['PM_INBOX']); - trigger_error($message); - } - } - - $sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . " - SET folder_id = $dest_folder - WHERE folder_id = $cur_folder_id - AND user_id = $user_id - AND " . $db->sql_in_set('msg_id', $move_msg_ids); - $db->sql_query($sql); - $num_moved = $db->sql_affectedrows(); - - // Update pm counts - if ($num_moved) - { - if (!in_array($cur_folder_id, array(PRIVMSGS_INBOX, PRIVMSGS_OUTBOX, PRIVMSGS_SENTBOX))) - { - $sql = 'UPDATE ' . PRIVMSGS_FOLDER_TABLE . " - SET pm_count = pm_count - $num_moved - WHERE folder_id = $cur_folder_id - AND user_id = $user_id"; - $db->sql_query($sql); - } - - if ($dest_folder != PRIVMSGS_INBOX) - { - $sql = 'UPDATE ' . PRIVMSGS_FOLDER_TABLE . " - SET pm_count = pm_count + $num_moved - WHERE folder_id = $dest_folder - AND user_id = $user_id"; - $db->sql_query($sql); - } - } - } - else if (in_array($cur_folder_id, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX))) - { - trigger_error('CANNOT_MOVE_SPECIAL'); - } - - return $num_moved; -} - -/** -* Update unread message status -*/ -function update_unread_status($unread, $msg_id, $user_id, $folder_id) -{ - if (!$unread) - { - return; - } - - global $db, $user; - - $sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . " - SET pm_unread = 0 - WHERE msg_id = $msg_id - AND user_id = $user_id - AND folder_id = $folder_id"; - $db->sql_query($sql); - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_unread_privmsg = user_unread_privmsg - 1 - WHERE user_id = $user_id"; - $db->sql_query($sql); - - if ($user->data['user_id'] == $user_id) - { - $user->data['user_unread_privmsg']--; - - // Try to cope with previous wrong conversions... - if ($user->data['user_unread_privmsg'] < 0) - { - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_unread_privmsg = 0 - WHERE user_id = $user_id"; - $db->sql_query($sql); - - $user->data['user_unread_privmsg'] = 0; - } - } -} - -/** -* Handle all actions possible with marked messages -*/ -function handle_mark_actions($user_id, $mark_action) -{ - global $db, $user, $phpbb_root_path, $phpEx; - - $msg_ids = request_var('marked_msg_id', array(0)); - $cur_folder_id = request_var('cur_folder_id', PRIVMSGS_NO_BOX); - $confirm = (isset($_POST['confirm'])) ? true : false; - - if (!sizeof($msg_ids)) - { - return false; - } - - switch ($mark_action) - { - case 'mark_important': - - $sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . " - SET pm_marked = 1 - pm_marked - WHERE folder_id = $cur_folder_id - AND user_id = $user_id - AND " . $db->sql_in_set('msg_id', $msg_ids); - $db->sql_query($sql); - - break; - - case 'delete_marked': - - if (confirm_box(true)) - { - delete_pm($user_id, $msg_ids, $cur_folder_id); - - $success_msg = (sizeof($msg_ids) == 1) ? 'MESSAGE_DELETED' : 'MESSAGES_DELETED'; - $redirect = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=' . $cur_folder_id); - - meta_refresh(3, $redirect); - trigger_error($user->lang[$success_msg] . '

    ' . sprintf($user->lang['RETURN_FOLDER'], '', '')); - } - else - { - $s_hidden_fields = array( - 'cur_folder_id' => $cur_folder_id, - 'mark_option' => 'delete_marked', - 'submit_mark' => true, - 'marked_msg_id' => $msg_ids - ); - - confirm_box(false, 'DELETE_MARKED_PM', build_hidden_fields($s_hidden_fields)); - } - - break; - - default: - return false; - } - - return true; -} - -/** -* Delete PM(s) -*/ -function delete_pm($user_id, $msg_ids, $folder_id) -{ - global $db, $user; - - $user_id = (int) $user_id; - $folder_id = (int) $folder_id; - - if (!$user_id) - { - return false; - } - - if (!is_array($msg_ids)) - { - if (!$msg_ids) - { - return false; - } - $msg_ids = array($msg_ids); - } - - if (!sizeof($msg_ids)) - { - return false; - } - - // Get PM Information for later deleting - $sql = 'SELECT msg_id, pm_unread, pm_new - FROM ' . PRIVMSGS_TO_TABLE . ' - WHERE ' . $db->sql_in_set('msg_id', array_map('intval', $msg_ids)) . " - AND folder_id = $folder_id - AND user_id = $user_id"; - $result = $db->sql_query($sql); - - $delete_rows = array(); - $num_unread = $num_new = $num_deleted = 0; - while ($row = $db->sql_fetchrow($result)) - { - $num_unread += (int) $row['pm_unread']; - $num_new += (int) $row['pm_new']; - - $delete_rows[$row['msg_id']] = 1; - } - $db->sql_freeresult($result); - unset($msg_ids); - - if (!sizeof($delete_rows)) - { - return false; - } - - // if no one has read the message yet (meaning it is in users outbox) - // then mark the message as deleted... - if ($folder_id == PRIVMSGS_OUTBOX) - { - // Remove PM from Outbox - $sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . " - WHERE user_id = $user_id AND folder_id = " . PRIVMSGS_OUTBOX . ' - AND ' . $db->sql_in_set('msg_id', array_keys($delete_rows)); - $db->sql_query($sql); - - // Update PM Information for safety - $sql = 'UPDATE ' . PRIVMSGS_TABLE . " SET message_text = '' - WHERE " . $db->sql_in_set('msg_id', array_keys($delete_rows)); - $db->sql_query($sql); - - // Set delete flag for those intended to receive the PM - // We do not remove the message actually, to retain some basic information (sent time for example) - $sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . ' - SET pm_deleted = 1 - WHERE ' . $db->sql_in_set('msg_id', array_keys($delete_rows)); - $db->sql_query($sql); - - $num_deleted = $db->sql_affectedrows(); - } - else - { - // Delete private message data - $sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . " - WHERE user_id = $user_id - AND folder_id = $folder_id - AND " . $db->sql_in_set('msg_id', array_keys($delete_rows)); - $db->sql_query($sql); - $num_deleted = $db->sql_affectedrows(); - } - - // if folder id is user defined folder then decrease pm_count - if (!in_array($folder_id, array(PRIVMSGS_INBOX, PRIVMSGS_OUTBOX, PRIVMSGS_SENTBOX, PRIVMSGS_NO_BOX))) - { - $sql = 'UPDATE ' . PRIVMSGS_FOLDER_TABLE . " - SET pm_count = pm_count - $num_deleted - WHERE folder_id = $folder_id"; - $db->sql_query($sql); - } - - // Update unread and new status field - if ($num_unread || $num_new) - { - $set_sql = ($num_unread) ? 'user_unread_privmsg = user_unread_privmsg - ' . $num_unread : ''; - - if ($num_new) - { - $set_sql .= ($set_sql != '') ? ', ' : ''; - $set_sql .= 'user_new_privmsg = user_new_privmsg - ' . $num_new; - } - - $db->sql_query('UPDATE ' . USERS_TABLE . " SET $set_sql WHERE user_id = $user_id"); - - $user->data['user_new_privmsg'] -= $num_new; - $user->data['user_unread_privmsg'] -= $num_unread; - } - - // Now we have to check which messages we can delete completely - $sql = 'SELECT msg_id - FROM ' . PRIVMSGS_TO_TABLE . ' - WHERE ' . $db->sql_in_set('msg_id', array_keys($delete_rows)); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - unset($delete_rows[$row['msg_id']]); - } - $db->sql_freeresult($result); - - $delete_ids = array_keys($delete_rows); - - if (sizeof($delete_ids)) - { - $sql = 'DELETE FROM ' . PRIVMSGS_TABLE . ' - WHERE ' . $db->sql_in_set('msg_id', $delete_ids); - $db->sql_query($sql); - } - - return true; -} - -/** -* Rebuild message header -*/ -function rebuild_header($check_ary) -{ - global $db; - - $address = array(); - - foreach ($check_ary as $check_type => $address_field) - { - // Split Addresses into users and groups - preg_match_all('/:?(u|g)_([0-9]+):?/', $address_field, $match); - - $u = $g = array(); - foreach ($match[1] as $id => $type) - { - ${$type}[] = (int) $match[2][$id]; - } - - $_types = array('u', 'g'); - foreach ($_types as $type) - { - if (sizeof($$type)) - { - foreach ($$type as $id) - { - $address[$type][$id] = $check_type; - } - } - } - } - - return $address; -} - -/** -* Print out/assign recipient information -*/ -function write_pm_addresses($check_ary, $author_id, $plaintext = false) -{ - global $db, $user, $template, $phpbb_root_path, $phpEx; - - $addresses = array(); - - foreach ($check_ary as $check_type => $address_field) - { - if (!is_array($address_field)) - { - // Split Addresses into users and groups - preg_match_all('/:?(u|g)_([0-9]+):?/', $address_field, $match); - - $u = $g = array(); - foreach ($match[1] as $id => $type) - { - ${$type}[] = (int) $match[2][$id]; - } - } - else - { - $u = $address_field['u']; - $g = $address_field['g']; - } - - $address = array(); - if (sizeof($u)) - { - $sql = 'SELECT user_id, username, user_colour - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', $u) . ' - AND user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if ($check_type == 'to' || $author_id == $user->data['user_id'] || $row['user_id'] == $user->data['user_id']) - { - if ($plaintext) - { - $address[] = $row['username']; - } - else - { - $address['user'][$row['user_id']] = array('name' => $row['username'], 'colour' => $row['user_colour']); - } - } - } - $db->sql_freeresult($result); - } - - if (sizeof($g)) - { - if ($plaintext) - { - $sql = 'SELECT group_name, group_type - FROM ' . GROUPS_TABLE . ' - WHERE ' . $db->sql_in_set('group_id', $g); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if ($check_type == 'to' || $author_id == $user->data['user_id'] || $row['user_id'] == $user->data['user_id']) - { - $address[] = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']; - } - } - $db->sql_freeresult($result); - } - else - { - $sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type, ug.user_id - FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug - WHERE ' . $db->sql_in_set('g.group_id', $g) . ' - AND g.group_id = ug.group_id - AND ug.user_pending = 0'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if (!isset($address['group'][$row['group_id']])) - { - if ($check_type == 'to' || $author_id == $user->data['user_id'] || $row['user_id'] == $user->data['user_id']) - { - $row['group_name'] = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']; - $address['group'][$row['group_id']] = array('name' => $row['group_name'], 'colour' => $row['group_colour']); - } - } - - if (isset($address['user'][$row['user_id']])) - { - $address['user'][$row['user_id']]['in_group'] = $row['group_id']; - } - } - $db->sql_freeresult($result); - } - } - - if (sizeof($address) && !$plaintext) - { - $template->assign_var('S_' . strtoupper($check_type) . '_RECIPIENT', true); - - foreach ($address as $type => $adr_ary) - { - foreach ($adr_ary as $id => $row) - { - $tpl_ary = array( - 'IS_GROUP' => ($type == 'group') ? true : false, - 'IS_USER' => ($type == 'user') ? true : false, - 'UG_ID' => $id, - 'NAME' => $row['name'], - 'COLOUR' => ($row['colour']) ? '#' . $row['colour'] : '', - 'TYPE' => $type, - ); - - if ($type == 'user') - { - $tpl_ary = array_merge($tpl_ary, array( - 'U_VIEW' => get_username_string('profile', $id, $row['name'], $row['colour']), - 'NAME_FULL' => get_username_string('full', $id, $row['name'], $row['colour']), - )); - } - else - { - $tpl_ary = array_merge($tpl_ary, array( - 'U_VIEW' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $id), - )); - } - - $template->assign_block_vars($check_type . '_recipient', $tpl_ary); - } - } - } - - $addresses[$check_type] = $address; - } - - return $addresses; -} - -/** -* Get folder status -*/ -function get_folder_status($folder_id, $folder) -{ - global $db, $user, $config; - - if (isset($folder[$folder_id])) - { - $folder = $folder[$folder_id]; - } - else - { - return false; - } - - $return = array( - 'folder_name' => $folder['folder_name'], - 'cur' => $folder['num_messages'], - 'remaining' => ($user->data['message_limit']) ? $user->data['message_limit'] - $folder['num_messages'] : 0, - 'max' => $user->data['message_limit'], - 'percent' => ($user->data['message_limit']) ? (($user->data['message_limit'] > 0) ? round(($folder['num_messages'] / $user->data['message_limit']) * 100) : 100) : 0, - ); - - $return['message'] = sprintf($user->lang['FOLDER_STATUS_MSG'], $return['percent'], $return['cur'], $return['max']); - - return $return; -} - -// -// COMPOSE MESSAGES -// - -/** -* Submit PM -*/ -function submit_pm($mode, $subject, &$data, $put_in_outbox = true) -{ - global $db, $auth, $config, $phpEx, $template, $user, $phpbb_root_path; - - // We do not handle erasing pms here - if ($mode == 'delete') - { - return false; - } - - $current_time = time(); - - // Collect some basic information about which tables and which rows to update/insert - $sql_data = array(); - $root_level = 0; - - // Recipient Information - $recipients = $to = $bcc = array(); - - if ($mode != 'edit') - { - // Build Recipient List - // u|g => array($user_id => 'to'|'bcc') - $_types = array('u', 'g'); - foreach ($_types as $ug_type) - { - if (isset($data['address_list'][$ug_type]) && sizeof($data['address_list'][$ug_type])) - { - foreach ($data['address_list'][$ug_type] as $id => $field) - { - $id = (int) $id; - - // Do not rely on the address list being "valid" - if (!$id || ($ug_type == 'u' && $id == ANONYMOUS)) - { - continue; - } - - $field = ($field == 'to') ? 'to' : 'bcc'; - if ($ug_type == 'u') - { - $recipients[$id] = $field; - } - ${$field}[] = $ug_type . '_' . $id; - } - } - } - - if (isset($data['address_list']['g']) && sizeof($data['address_list']['g'])) - { - $sql = 'SELECT u.user_type, ug.group_id, ug.user_id - FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug - WHERE ' . $db->sql_in_set('ug.group_id', array_keys($data['address_list']['g'])) . ' - AND ug.user_pending = 0 - AND u.user_id = ug.user_id - AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $field = ($data['address_list']['g'][$row['group_id']] == 'to') ? 'to' : 'bcc'; - $recipients[$row['user_id']] = $field; - } - $db->sql_freeresult($result); - } - - if (!sizeof($recipients)) - { - trigger_error('NO_RECIPIENT'); - } - } - - $db->sql_transaction('begin'); - - $sql = ''; - - switch ($mode) - { - case 'reply': - case 'quote': - $root_level = ($data['reply_from_root_level']) ? $data['reply_from_root_level'] : $data['reply_from_msg_id']; - - // Set message_replied switch for this user - $sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . ' - SET pm_replied = 1 - WHERE user_id = ' . $data['from_user_id'] . ' - AND msg_id = ' . $data['reply_from_msg_id']; - - // no break - - case 'forward': - case 'post': - case 'quotepost': - $sql_data = array( - 'root_level' => $root_level, - 'author_id' => $data['from_user_id'], - 'icon_id' => $data['icon_id'], - 'author_ip' => $data['from_user_ip'], - 'message_time' => $current_time, - 'enable_bbcode' => $data['enable_bbcode'], - 'enable_smilies' => $data['enable_smilies'], - 'enable_magic_url' => $data['enable_urls'], - 'enable_sig' => $data['enable_sig'], - 'message_subject' => $subject, - 'message_text' => $data['message'], - 'message_attachment'=> (!empty($data['attachment_data'])) ? 1 : 0, - 'bbcode_bitfield' => $data['bbcode_bitfield'], - 'bbcode_uid' => $data['bbcode_uid'], - 'to_address' => implode(':', $to), - 'bcc_address' => implode(':', $bcc) - ); - break; - - case 'edit': - $sql_data = array( - 'icon_id' => $data['icon_id'], - 'message_edit_time' => $current_time, - 'enable_bbcode' => $data['enable_bbcode'], - 'enable_smilies' => $data['enable_smilies'], - 'enable_magic_url' => $data['enable_urls'], - 'enable_sig' => $data['enable_sig'], - 'message_subject' => $subject, - 'message_text' => $data['message'], - 'message_attachment'=> (!empty($data['attachment_data'])) ? 1 : 0, - 'bbcode_bitfield' => $data['bbcode_bitfield'], - 'bbcode_uid' => $data['bbcode_uid'] - ); - break; - } - - if (sizeof($sql_data)) - { - $query = ''; - - if ($mode == 'post' || $mode == 'reply' || $mode == 'quote' || $mode == 'quotepost' || $mode == 'forward') - { - $db->sql_query('INSERT INTO ' . PRIVMSGS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_data)); - $data['msg_id'] = $db->sql_nextid(); - } - else if ($mode == 'edit') - { - $sql = 'UPDATE ' . PRIVMSGS_TABLE . ' - SET message_edit_count = message_edit_count + 1, ' . $db->sql_build_array('UPDATE', $sql_data) . ' - WHERE msg_id = ' . $data['msg_id']; - $db->sql_query($sql); - } - } - - if ($mode != 'edit') - { - if ($sql) - { - $db->sql_query($sql); - } - unset($sql); - - $sql_ary = array(); - foreach ($recipients as $user_id => $type) - { - $sql_ary[] = array( - 'msg_id' => (int) $data['msg_id'], - 'user_id' => (int) $user_id, - 'author_id' => (int) $data['from_user_id'], - 'folder_id' => PRIVMSGS_NO_BOX, - 'pm_new' => 1, - 'pm_unread' => 1, - 'pm_forwarded' => ($mode == 'forward') ? 1 : 0 - ); - } - - $db->sql_multi_insert(PRIVMSGS_TO_TABLE, $sql_ary); - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_new_privmsg = user_new_privmsg + 1, user_unread_privmsg = user_unread_privmsg + 1, user_last_privmsg = ' . time() . ' - WHERE ' . $db->sql_in_set('user_id', array_keys($recipients)); - $db->sql_query($sql); - - // Put PM into outbox - if ($put_in_outbox) - { - $db->sql_query('INSERT INTO ' . PRIVMSGS_TO_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'msg_id' => (int) $data['msg_id'], - 'user_id' => (int) $data['from_user_id'], - 'author_id' => (int) $data['from_user_id'], - 'folder_id' => PRIVMSGS_OUTBOX, - 'pm_new' => 0, - 'pm_unread' => 0, - 'pm_forwarded' => ($mode == 'forward') ? 1 : 0)) - ); - } - } - - // Set user last post time - if ($mode == 'reply' || $mode == 'quote' || $mode == 'quotepost' || $mode == 'forward' || $mode == 'post') - { - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_lastpost_time = $current_time - WHERE user_id = " . $data['from_user_id']; - $db->sql_query($sql); - } - - // Submit Attachments - if (!empty($data['attachment_data']) && $data['msg_id'] && in_array($mode, array('post', 'reply', 'quote', 'quotepost', 'edit', 'forward'))) - { - $space_taken = $files_added = 0; - $orphan_rows = array(); - - foreach ($data['attachment_data'] as $pos => $attach_row) - { - $orphan_rows[(int) $attach_row['attach_id']] = array(); - } - - if (sizeof($orphan_rows)) - { - $sql = 'SELECT attach_id, filesize, physical_filename - FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set('attach_id', array_keys($orphan_rows)) . ' - AND in_message = 1 - AND is_orphan = 1 - AND poster_id = ' . $user->data['user_id']; - $result = $db->sql_query($sql); - - $orphan_rows = array(); - while ($row = $db->sql_fetchrow($result)) - { - $orphan_rows[$row['attach_id']] = $row; - } - $db->sql_freeresult($result); - } - - foreach ($data['attachment_data'] as $pos => $attach_row) - { - if ($attach_row['is_orphan'] && !isset($orphan_rows[$attach_row['attach_id']])) - { - continue; - } - - if (!$attach_row['is_orphan']) - { - // update entry in db if attachment already stored in db and filespace - $sql = 'UPDATE ' . ATTACHMENTS_TABLE . " - SET attach_comment = '" . $db->sql_escape($attach_row['attach_comment']) . "' - WHERE attach_id = " . (int) $attach_row['attach_id'] . ' - AND is_orphan = 0'; - $db->sql_query($sql); - } - else - { - // insert attachment into db - if (!@file_exists($phpbb_root_path . $config['upload_path'] . '/' . basename($orphan_rows[$attach_row['attach_id']]['physical_filename']))) - { - continue; - } - - $space_taken += $orphan_rows[$attach_row['attach_id']]['filesize']; - $files_added++; - - $attach_sql = array( - 'post_msg_id' => $data['msg_id'], - 'topic_id' => 0, - 'is_orphan' => 0, - 'poster_id' => $data['from_user_id'], - 'attach_comment' => $attach_row['attach_comment'], - ); - - $sql = 'UPDATE ' . ATTACHMENTS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $attach_sql) . ' - WHERE attach_id = ' . $attach_row['attach_id'] . ' - AND is_orphan = 1 - AND poster_id = ' . $user->data['user_id']; - $db->sql_query($sql); - } - } - - if ($space_taken && $files_added) - { - set_config('upload_dir_size', $config['upload_dir_size'] + $space_taken, true); - set_config('num_files', $config['num_files'] + $files_added, true); - } - } - - // Delete draft if post was loaded... - $draft_id = request_var('draft_loaded', 0); - if ($draft_id) - { - $sql = 'DELETE FROM ' . DRAFTS_TABLE . " - WHERE draft_id = $draft_id - AND user_id = " . $data['from_user_id']; - $db->sql_query($sql); - } - - $db->sql_transaction('commit'); - - // Send Notifications - if ($mode != 'edit') - { - pm_notification($mode, $data['from_username'], $recipients, $subject, $data['message']); - } - - return $data['msg_id']; -} - -/** -* PM Notification -*/ -function pm_notification($mode, $author, $recipients, $subject, $message) -{ - global $db, $user, $config, $phpbb_root_path, $phpEx, $auth; - - $subject = censor_text($subject); - - unset($recipients[ANONYMOUS], $recipients[$user->data['user_id']]); - - if (!sizeof($recipients)) - { - return; - } - - // Get banned User ID's - $sql = 'SELECT ban_userid - FROM ' . BANLIST_TABLE . ' - WHERE ' . $db->sql_in_set('ban_userid', array_map('intval', array_keys($recipients))) . ' - AND ban_exclude = 0'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - unset($recipients[$row['ban_userid']]); - } - $db->sql_freeresult($result); - - if (!sizeof($recipients)) - { - return; - } - - $sql = 'SELECT user_id, username, user_email, user_lang, user_notify_pm, user_notify_type, user_jabber - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', array_map('intval', array_keys($recipients))); - $result = $db->sql_query($sql); - - $msg_list_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['user_notify_pm'] == 1 && trim($row['user_email'])) - { - $msg_list_ary[] = array( - 'method' => $row['user_notify_type'], - 'email' => $row['user_email'], - 'jabber' => $row['user_jabber'], - 'name' => $row['username'], - 'lang' => $row['user_lang'] - ); - } - } - $db->sql_freeresult($result); - - if (!sizeof($msg_list_ary)) - { - return; - } - - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - $messenger = new messenger(); - - foreach ($msg_list_ary as $pos => $addr) - { - $messenger->template('privmsg_notify', $addr['lang']); - - $messenger->to($addr['email'], $addr['name']); - $messenger->im($addr['jabber'], $addr['name']); - - $messenger->assign_vars(array( - 'SUBJECT' => htmlspecialchars_decode($subject), - 'AUTHOR_NAME' => htmlspecialchars_decode($author), - 'USERNAME' => htmlspecialchars_decode($addr['name']), - - 'U_INBOX' => generate_board_url() . "/ucp.$phpEx?i=pm&folder=inbox") - ); - - $messenger->send($addr['method']); - } - unset($msg_list_ary); - - $messenger->save_queue(); - - unset($messenger); -} - -/** -* Display Message History -*/ -function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode = false) -{ - global $db, $user, $config, $template, $phpbb_root_path, $phpEx, $auth, $bbcode; - - // Get History Messages (could be newer) - $sql = 'SELECT t.*, p.*, u.* - FROM ' . PRIVMSGS_TABLE . ' p, ' . PRIVMSGS_TO_TABLE . ' t, ' . USERS_TABLE . ' u - WHERE t.msg_id = p.msg_id - AND p.author_id = u.user_id - AND t.folder_id NOT IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ") - AND t.user_id = $user_id"; - - if (!$message_row['root_level']) - { - $sql .= " AND (p.root_level = $msg_id OR (p.root_level = 0 AND p.msg_id = $msg_id))"; - } - else - { - $sql .= " AND (p.root_level = " . $message_row['root_level'] . ' OR p.msg_id = ' . $message_row['root_level'] . ')'; - } - $sql .= ' ORDER BY p.message_time DESC'; - - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - - if (!$row) - { - $db->sql_freeresult($result); - return false; - } - - $rowset = array(); - $bbcode_bitfield = ''; - $folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm') . '&folder='; - - do - { - $folder_id = (int) $row['folder_id']; - - $row['folder'][] = (isset($folder[$folder_id])) ? '' . $folder[$folder_id]['folder_name'] . '' : $user->lang['UNKNOWN_FOLDER']; - - if (isset($rowset[$row['msg_id']])) - { - $rowset[$row['msg_id']]['folder'][] = (isset($folder[$folder_id])) ? '' . $folder[$folder_id]['folder_name'] . '' : $user->lang['UNKNOWN_FOLDER']; - } - else - { - $rowset[$row['msg_id']] = $row; - $bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']); - } - } - while ($row = $db->sql_fetchrow($result)); - $db->sql_freeresult($result); - - $title = $row['message_subject']; - - if (sizeof($rowset) == 1 && !$in_post_mode) - { - return false; - } - - // Instantiate BBCode class - if ((empty($bbcode) || $bbcode === false) && $bbcode_bitfield !== '') - { - if (!class_exists('bbcode')) - { - include($phpbb_root_path . 'includes/bbcode.' . $phpEx); - } - $bbcode = new bbcode(base64_encode($bbcode_bitfield)); - } - - $title = censor_text($title); - - $url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm'); - $next_history_pm = $previous_history_pm = $prev_id = 0; - - foreach ($rowset as $id => $row) - { - $author_id = $row['author_id']; - $folder_id = (int) $row['folder_id']; - - $subject = $row['message_subject']; - $message = $row['message_text']; - - $message = censor_text($message); - - if ($row['bbcode_bitfield']) - { - $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); - } - - $message = bbcode_nl2br($message); - $message = smiley_text($message, !$row['enable_smilies']); - - $subject = censor_text($subject); - - if ($id == $msg_id) - { - $next_history_pm = next($rowset); - $next_history_pm = (sizeof($next_history_pm)) ? (int) $next_history_pm['msg_id'] : 0; - $previous_history_pm = $prev_id; - } - - $template->assign_block_vars('history_row', array( - 'MESSAGE_AUTHOR_FULL' => get_username_string('full', $author_id, $row['username'], $row['user_colour'], $row['username']), - 'MESSAGE_AUTHOR_COLOUR' => get_username_string('colour', $author_id, $row['username'], $row['user_colour'], $row['username']), - 'MESSAGE_AUTHOR' => get_username_string('username', $author_id, $row['username'], $row['user_colour'], $row['username']), - 'U_MESSAGE_AUTHOR' => get_username_string('profile', $author_id, $row['username'], $row['user_colour'], $row['username']), - - 'SUBJECT' => $subject, - 'SENT_DATE' => $user->format_date($row['message_time']), - 'MESSAGE' => $message, - 'FOLDER' => implode(', ', $row['folder']), - - 'S_CURRENT_MSG' => ($row['msg_id'] == $msg_id), - 'S_AUTHOR_DELETED' => ($author_id == ANONYMOUS) ? true : false, - 'S_IN_POST_MODE' => $in_post_mode, - - 'MSG_ID' => $row['msg_id'], - 'U_VIEW_MESSAGE' => "$url&f=$folder_id&p=" . $row['msg_id'], - 'U_QUOTE' => (!$in_post_mode && $auth->acl_get('u_sendpm') && $author_id != ANONYMOUS && $author_id != $user->data['user_id']) ? "$url&mode=compose&action=quote&f=" . $folder_id . "&p=" . $row['msg_id'] : '', - 'U_POST_REPLY_PM' => ($author_id != $user->data['user_id'] && $author_id != ANONYMOUS && $auth->acl_get('u_sendpm')) ? "$url&mode=compose&action=reply&f=$folder_id&p=" . $row['msg_id'] : '') - ); - unset($rowset[$id]); - $prev_id = $id; - } - - $template->assign_vars(array( - 'QUOTE_IMG' => $user->img('icon_post_quote', $user->lang['REPLY_WITH_QUOTE']), - 'HISTORY_TITLE' => $title, - - 'U_VIEW_NEXT_HISTORY' => ($next_history_pm) ? "$url&p=" . $next_history_pm : '', - 'U_VIEW_PREVIOUS_HISTORY' => ($previous_history_pm) ? "$url&p=" . $previous_history_pm : '', - )); - - return true; -} - -?> \ No newline at end of file diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php deleted file mode 100644 index bd344a801d..0000000000 --- a/phpBB/includes/functions_profile_fields.php +++ /dev/null @@ -1,1090 +0,0 @@ - 'int', FIELD_STRING => 'string', FIELD_TEXT => 'text', FIELD_BOOL => 'bool', FIELD_DROPDOWN => 'dropdown', FIELD_DATE => 'date'); - private $profile_cache = array(); - private $options_lang = array(); - - /** - * Assign editable fields to template, mode can be profile (for profile change) or register (for registration) - * Called by ucp_profile and ucp_register - * @access public - */ - public function generate_profile_fields($mode, $lang_id) - { - global $db, $template, $auth; - - $sql_where = ''; - switch ($mode) - { - case 'register': - // If the field is required we show it on the registration page and do not show hidden fields - $sql_where .= ' AND (f.field_show_on_reg = 1 OR f.field_required = 1) AND f.field_hide = 0'; - break; - - case 'profile': - // Show hidden fields to moderators/admins - if (!$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_')) - { - $sql_where .= ' AND f.field_hide = 0'; - } - break; - - default: - trigger_error('Wrong profile mode specified', E_USER_ERROR); - break; - } - - $sql = 'SELECT l.*, f.* - FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . " f - WHERE f.field_active = 1 - $sql_where - AND l.lang_id = $lang_id - AND l.field_id = f.field_id - ORDER BY f.field_order"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - // Return templated field - $tpl_snippet = $this->process_field_row('change', $row); - - // Some types are multivalue, we can't give them a field_id as we would not know which to pick - $type = (int) $row['field_type']; - - $template->assign_block_vars('profile_fields', array( - 'LANG_NAME' => $row['lang_name'], - 'LANG_EXPLAIN' => $row['lang_explain'], - 'FIELD' => $tpl_snippet, - 'FIELD_ID' => ($type == FIELD_DATE || ($type == FIELD_BOOL && $row['field_length'] == '1')) ? '' : 'pf_' . $row['field_ident'], - 'S_REQUIRED' => ($row['field_required']) ? true : false) - ); - } - $db->sql_freeresult($result); - } - - /** - * Validate entered profile field data - * @access public - */ - public function validate_profile_field($field_type, &$field_value, $field_data) - { - switch ($field_type) - { - case FIELD_INT: - case FIELD_DROPDOWN: - $field_value = (int) $field_value; - break; - - case FIELD_BOOL: - $field_value = (bool) $field_value; - break; - } - - switch ($field_type) - { - case FIELD_DATE: - $field_validate = explode('-', $field_value); - - $day = (isset($field_validate[0])) ? (int) $field_validate[0] : 0; - $month = (isset($field_validate[1])) ? (int) $field_validate[1] : 0; - $year = (isset($field_validate[2])) ? (int) $field_validate[2] : 0; - - if ((!$day || !$month || !$year) && !$field_data['field_required']) - { - return false; - } - - if ((!$day || !$month || !$year) && $field_data['field_required']) - { - return 'FIELD_REQUIRED'; - } - - if ($day < 0 || $day > 31 || $month < 0 || $month > 12 || ($year < 1901 && $year > 0) || $year > gmdate('Y', time()) + 50) - { - return 'FIELD_INVALID_DATE'; - } - - if (checkdate($month, $day, $year) === false) - { - return 'FIELD_INVALID_DATE'; - } - break; - - case FIELD_BOOL: - if (!$field_value && $field_data['field_required']) - { - return 'FIELD_REQUIRED'; - } - break; - - case FIELD_INT: - if (empty($field_value) && !$field_data['field_required']) - { - return false; - } - - if ($field_value < $field_data['field_minlen']) - { - return 'FIELD_TOO_SMALL'; - } - else if ($field_value > $field_data['field_maxlen']) - { - return 'FIELD_TOO_LARGE'; - } - break; - - case FIELD_DROPDOWN: - if ($field_value == $field_data['field_novalue'] && $field_data['field_required']) - { - return 'FIELD_REQUIRED'; - } - break; - - case FIELD_STRING: - case FIELD_TEXT: - if (empty($field_value) && !$field_data['field_required']) - { - return false; - } - else if (empty($field_value) && $field_data['field_required']) - { - return 'FIELD_REQUIRED'; - } - - if ($field_data['field_minlen'] && utf8_strlen($field_value) < $field_data['field_minlen']) - { - return 'FIELD_TOO_SHORT'; - } - else if ($field_data['field_maxlen'] && utf8_strlen($field_value) > $field_data['field_maxlen']) - { - return 'FIELD_TOO_LONG'; - } - - if (!empty($field_data['field_validation']) && $field_data['field_validation'] != '.*') - { - $field_validate = ($field_type == FIELD_STRING) ? $field_value : bbcode_nl2br($field_value); - if (!preg_match('#^' . str_replace('\\\\', '\\', $field_data['field_validation']) . '$#i', $field_validate)) - { - return 'FIELD_INVALID_CHARS'; - } - } - break; - } - - return false; - } - - /** - * Build profile cache, used for display - * @access private - */ - private function build_cache() - { - global $db, $user, $auth; - - $this->profile_cache = array(); - - // Display hidden/no_view fields for admin/moderator - $sql = 'SELECT l.*, f.* - FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f - WHERE l.lang_id = ' . $user->get_iso_lang_id() . ' - AND f.field_active = 1 ' . - ((!$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_')) ? ' AND f.field_hide = 0 ' : '') . ' - AND f.field_no_view = 0 - AND l.field_id = f.field_id - ORDER BY f.field_order'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $this->profile_cache[$row['field_ident']] = $row; - } - $db->sql_freeresult($result); - } - - /** - * Get language entries for options and store them here for later use - */ - private function get_option_lang($field_id, $lang_id, $field_type, $preview) - { - global $db; - - if ($preview) - { - $lang_options = (!is_array($this->vars['lang_options'])) ? explode("\n", $this->vars['lang_options']) : $this->vars['lang_options']; - - // @todo: ref optimize - foreach ($lang_options as $num => $var) - { - $this->options_lang[$field_id][$lang_id][($num + 1)] = $var; - } - } - else - { - $sql = 'SELECT option_id, lang_value - FROM ' . PROFILE_FIELDS_LANG_TABLE . " - WHERE field_id = $field_id - AND lang_id = $lang_id - AND field_type = $field_type - ORDER BY option_id"; - $result = $db->sql_query($sql); - - // @todo: ref optimize - while ($row = $db->sql_fetchrow($result)) - { - $this->options_lang[$field_id][$lang_id][($row['option_id'] + 1)] = $row['lang_value']; - } - $db->sql_freeresult($result); - } - } - - /** - * Submit profile field - * @access public - */ - public function submit_cp_field($mode, $lang_id, &$cp_data, &$cp_error) - { - global $auth, $db, $user; - - $sql_where = ''; - switch ($mode) - { - case 'register': - // If the field is required we show it on the registration page and do not show hidden fields - $sql_where .= ' AND (f.field_show_on_reg = 1 OR f.field_required = 1) AND f.field_hide = 0'; - break; - - case 'profile': - // Show hidden fields to moderators/admins - if (!$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_')) - { - $sql_where .= ' AND f.field_hide = 0'; - } - break; - - default: - trigger_error('Wrong profile mode specified', E_USER_ERROR); - break; - } - - $sql = 'SELECT l.*, f.* - FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . " f - WHERE l.lang_id = $lang_id - AND f.field_active = 1 - $sql_where - AND l.field_id = f.field_id - ORDER BY f.field_order"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $cp_data['pf_' . $row['field_ident']] = $this->get_profile_field($row); - $check_value = $cp_data['pf_' . $row['field_ident']]; - - if (($cp_result = $this->validate_profile_field($row['field_type'], $check_value, $row)) !== false) - { - // If not and only showing common error messages, use this one - $error = ''; - switch ($cp_result) - { - case 'FIELD_INVALID_DATE': - case 'FIELD_REQUIRED': - $error = sprintf($user->lang[$cp_result], $row['lang_name']); - break; - - case 'FIELD_TOO_SHORT': - case 'FIELD_TOO_SMALL': - $error = sprintf($user->lang[$cp_result], $row['lang_name'], $row['field_minlen']); - break; - - case 'FIELD_TOO_LONG': - case 'FIELD_TOO_LARGE': - $error = sprintf($user->lang[$cp_result], $row['lang_name'], $row['field_maxlen']); - break; - - case 'FIELD_INVALID_CHARS': - switch ($row['field_validation']) - { - case '[0-9]+': - $error = sprintf($user->lang[$cp_result . '_NUMBERS_ONLY'], $row['lang_name']); - break; - - case '[\w]+': - $error = sprintf($user->lang[$cp_result . '_ALPHA_ONLY'], $row['lang_name']); - break; - - case '[\w_\+\. \-\[\]]+': - $error = sprintf($user->lang[$cp_result . '_SPACERS_ONLY'], $row['lang_name']); - break; - } - break; - } - - if ($error != '') - { - $cp_error[] = $error; - } - } - } - $db->sql_freeresult($result); - } - - /** - * Assign fields to template, used for viewprofile, viewtopic and memberlist (if load setting is enabled) - * This is directly connected to the user -> mode == grab is to grab the user specific fields, mode == show is for assigning the row to the template - * @access public - */ - public function generate_profile_fields_template($mode, $user_id = 0, $profile_row = false) - { - global $db; - - if ($mode == 'grab') - { - if (!is_array($user_id)) - { - $user_id = array($user_id); - } - - if (!sizeof($this->profile_cache)) - { - $this->build_cache(); - } - - if (!sizeof($user_id)) - { - return array(); - } - - $sql = 'SELECT * - FROM ' . PROFILE_FIELDS_DATA_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', array_map('intval', $user_id)); - $result = $db->sql_query($sql); - - $field_data = array(); - while ($row = $db->sql_fetchrow($result)) - { - $field_data[$row['user_id']] = $row; - } - $db->sql_freeresult($result); - - $user_fields = array(); - - // Go through the fields in correct order - foreach (array_keys($this->profile_cache) as $used_ident) - { - foreach ($field_data as $user_id => $row) - { - $user_fields[$user_id][$used_ident]['value'] = $row['pf_' . $used_ident]; - $user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident]; - } - } - - return $user_fields; - } - else if ($mode == 'show') - { - // $profile_row == $user_fields[$row['user_id']]; - $tpl_fields = array(); - $tpl_fields['row'] = $tpl_fields['blockrow'] = array(); - - foreach ($profile_row as $ident => $ident_ary) - { - $value = $this->get_profile_value($ident_ary); - - if ($value === NULL) - { - continue; - } - - $tpl_fields['row'] += array( - 'PROFILE_' . strtoupper($ident) . '_VALUE' => $value, - 'PROFILE_' . strtoupper($ident) . '_TYPE' => $ident_ary['data']['field_type'], - 'PROFILE_' . strtoupper($ident) . '_NAME' => $ident_ary['data']['lang_name'], - 'PROFILE_' . strtoupper($ident) . '_EXPLAIN'=> $ident_ary['data']['lang_explain'], - - 'S_PROFILE_' . strtoupper($ident) => true - ); - - $tpl_fields['blockrow'][] = array( - 'PROFILE_FIELD_VALUE' => $value, - 'PROFILE_FIELD_TYPE' => $ident_ary['data']['field_type'], - 'PROFILE_FIELD_NAME' => $ident_ary['data']['lang_name'], - 'PROFILE_FIELD_EXPLAIN' => $ident_ary['data']['lang_explain'], - - 'S_PROFILE_' . strtoupper($ident) => true - ); - } - - return $tpl_fields; - } - else - { - trigger_error('Wrong mode for custom profile', E_USER_ERROR); - } - } - - /** - * Get Profile Value for display - */ - private function get_profile_value($ident_ary) - { - $value = $ident_ary['value']; - $field_type = $ident_ary['data']['field_type']; - - switch (self::$profile_types[$field_type]) - { - case 'int': - if ($value == '') - { - return NULL; - } - return (int) $value; - break; - - case 'string': - case 'text': - if (!$value) - { - return NULL; - } - - $value = make_clickable($value); - $value = censor_text($value); - $value = bbcode_nl2br($value); - return $value; - break; - - // case 'datetime': - case 'date': - $date = explode('-', $value); - $day = (isset($date[0])) ? (int) $date[0] : 0; - $month = (isset($date[1])) ? (int) $date[1] : 0; - $year = (isset($date[2])) ? (int) $date[2] : 0; - - if (!$day && !$month && !$year) - { - return NULL; - } - else if ($day && $month && $year) - { - global $user; - return $user->format_date(mktime(0, 0, 0, $month, $day, $year), $user->lang['DATE_FORMAT'], true); - } - - return $value; - break; - - case 'dropdown': - $field_id = $ident_ary['data']['field_id']; - $lang_id = $ident_ary['data']['lang_id']; - if (!isset($this->options_lang[$field_id][$lang_id])) - { - $this->get_option_lang($field_id, $lang_id, FIELD_DROPDOWN, false); - } - - if ($value == $ident_ary['data']['field_novalue']) - { - return NULL; - } - - $value = (int) $value; - - // User not having a value assigned - if (!isset($this->options_lang[$field_id][$lang_id][$value])) - { - return NULL; - } - - return $this->options_lang[$field_id][$lang_id][$value]; - break; - - case 'bool': - $field_id = $ident_ary['data']['field_id']; - $lang_id = $ident_ary['data']['lang_id']; - if (!isset($this->options_lang[$field_id][$lang_id])) - { - $this->get_option_lang($field_id, $lang_id, FIELD_BOOL, false); - } - - if ($ident_ary['data']['field_length'] == 1) - { - return (isset($this->options_lang[$field_id][$lang_id][(int) $value])) ? $this->options_lang[$field_id][$lang_id][(int) $value] : NULL; - } - else if (!$value) - { - return NULL; - } - else - { - return $this->options_lang[$field_id][$lang_id][(int) ($value) + 1]; - } - break; - - default: - trigger_error('Unknown profile type', E_USER_ERROR); - break; - } - } - - /** - * Get field value for registration/profile - * @access private - */ - private function get_var($field_validation, &$profile_row, $default_value, $preview) - { - global $user; - - $profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident']; - $user_ident = $profile_row['field_ident']; - // checkbox - only testing for isset - if ($profile_row['field_type'] == FIELD_BOOL && $profile_row['field_length'] == 2) - { - $value = (isset($_REQUEST[$profile_row['field_ident']])) ? true : ((!isset($user->profile_fields[$user_ident]) || $preview) ? $default_value : $user->profile_fields[$user_ident]); - } - else if ($profile_row['field_type'] == FIELD_INT) - { - if (isset($_REQUEST[$profile_row['field_ident']])) - { - $value = ($_REQUEST[$profile_row['field_ident']] === '') ? NULL : request_var($profile_row['field_ident'], $default_value); - } - else - { - if (!$preview && isset($user->profile_fields[$user_ident]) && is_null($user->profile_fields[$user_ident])) - { - $value = NULL; - } - else if (!isset($user->profile_fields[$user_ident]) || $preview) - { - $value = $default_value; - } - else - { - $value = $user->profile_fields[$user_ident]; - } - } - - return (is_null($value)) ? '' : (int) $value; - } - else - { - $value = (isset($_REQUEST[$profile_row['field_ident']])) ? request_var($profile_row['field_ident'], $default_value, true) : ((!isset($user->profile_fields[$user_ident]) || $preview) ? $default_value : $user->profile_fields[$user_ident]); - - if (gettype($value) == 'string') - { - $value = utf8_normalize_nfc($value); - } - } - - switch ($field_validation) - { - case 'int': - return (int) $value; - break; - } - - return $value; - } - - /** - * Process int-type - * @access private - */ - private function generate_int($profile_row, $preview = false) - { - global $template; - - $profile_row['field_value'] = $this->get_var('int', $profile_row, $profile_row['field_default_value'], $preview); - $template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER)); - } - - /** - * Process date-type - * @access private - */ - private function generate_date($profile_row, $preview = false) - { - global $user, $template; - - $profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident']; - $user_ident = $profile_row['field_ident']; - - $now = getdate(); - - if (!isset($_REQUEST[$profile_row['field_ident'] . '_day'])) - { - if ($profile_row['field_default_value'] == 'now') - { - $profile_row['field_default_value'] = sprintf('%2d-%2d-%4d', $now['mday'], $now['mon'], $now['year']); - } - list($day, $month, $year) = explode('-', ((!isset($user->profile_fields[$user_ident]) || $preview) ? $profile_row['field_default_value'] : $user->profile_fields[$user_ident])); - } - else - { - if ($preview && $profile_row['field_default_value'] == 'now') - { - $profile_row['field_default_value'] = sprintf('%2d-%2d-%4d', $now['mday'], $now['mon'], $now['year']); - list($day, $month, $year) = explode('-', ((!isset($user->profile_fields[$user_ident]) || $preview) ? $profile_row['field_default_value'] : $user->profile_fields[$user_ident])); - } - else - { - $day = request_var($profile_row['field_ident'] . '_day', 0); - $month = request_var($profile_row['field_ident'] . '_month', 0); - $year = request_var($profile_row['field_ident'] . '_year', 0); - } - } - - $profile_row['s_day_options'] = ''; - for ($i = 1; $i < 32; $i++) - { - $profile_row['s_day_options'] .= '"; - } - - $profile_row['s_month_options'] = ''; - for ($i = 1; $i < 13; $i++) - { - $profile_row['s_month_options'] .= '"; - } - - $profile_row['s_year_options'] = ''; - for ($i = $now['year'] - 100; $i <= $now['year'] + 100; $i++) - { - $profile_row['s_year_options'] .= '"; - } - unset($now); - - $profile_row['field_value'] = 0; - $template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER)); - } - - /** - * Process bool-type - * @access private - */ - private function generate_bool($profile_row, $preview = false) - { - global $template; - - $value = $this->get_var('int', $profile_row, $profile_row['field_default_value'], $preview); - - $profile_row['field_value'] = $value; - $template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER)); - - if ($profile_row['field_length'] == 1) - { - if (!isset($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']]) || !sizeof($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']])) - { - $this->get_option_lang($profile_row['field_id'], $profile_row['lang_id'], FIELD_BOOL, $preview); - } - - foreach ($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']] as $option_id => $option_value) - { - $template->assign_block_vars('bool.options', array( - 'OPTION_ID' => $option_id, - 'CHECKED' => ($value == $option_id) ? ' checked="checked"' : '', - 'VALUE' => $option_value) - ); - } - } - } - - /** - * Process string-type - * @access private - */ - private function generate_string($profile_row, $preview = false) - { - global $template; - - $profile_row['field_value'] = $this->get_var('string', $profile_row, $profile_row['lang_default_value'], $preview); - $template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER)); - } - - /** - * Process text-type - * @access private - */ - private function generate_text($profile_row, $preview = false) - { - global $template; - global $user, $phpEx, $phpbb_root_path; - - $field_length = explode('|', $profile_row['field_length']); - $profile_row['field_rows'] = $field_length[0]; - $profile_row['field_cols'] = $field_length[1]; - - $profile_row['field_value'] = $this->get_var('string', $profile_row, $profile_row['lang_default_value'], $preview); - $template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER)); - } - - /** - * Process dropdown-type - * @access private - */ - private function generate_dropdown($profile_row, $preview = false) - { - global $user, $template; - - $value = $this->get_var('int', $profile_row, $profile_row['field_default_value'], $preview); - - if (!isset($this->options_lang[$profile_row['field_id']]) || !isset($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']]) || !sizeof($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']])) - { - $this->get_option_lang($profile_row['field_id'], $profile_row['lang_id'], FIELD_DROPDOWN, $preview); - } - - $profile_row['field_value'] = $value; - $template->assign_block_vars(self::$profile_types[$profile_row['field_type']], array_change_key_case($profile_row, CASE_UPPER)); - - foreach ($this->options_lang[$profile_row['field_id']][$profile_row['lang_id']] as $option_id => $option_value) - { - $template->assign_block_vars('dropdown.options', array( - 'OPTION_ID' => $option_id, - 'SELECTED' => ($value == $option_id) ? ' selected="selected"' : '', - 'VALUE' => $option_value) - ); - } - } - - /** - * Return Templated value/field. Possible values for $mode are: - * change == user is able to set/enter profile values; preview == just show the value - * @access private - */ - private function process_field_row($mode, $profile_row) - { - global $template; - - $preview = ($mode == 'preview') ? true : false; - - // set template filename - $template->set_filenames(array( - 'cp_body' => 'custom_profile_fields.html') - ); - - // empty previously filled blockvars - foreach (self::$profile_types as $field_case => $field_type) - { - $template->destroy_block_vars($field_type); - } - - // Assign template variables - $type_func = 'generate_' . self::$profile_types[$profile_row['field_type']]; - $this->$type_func($profile_row, $preview); - - // Return templated data - return $template->assign_display('cp_body'); - } - - /** - * Build Array for user insertion into custom profile fields table - */ - public static function build_insert_sql_array($cp_data) - { - global $db, $user, $auth; - - $sql_not_in = array(); - foreach ($cp_data as $key => $null) - { - $sql_not_in[] = (strncmp($key, 'pf_', 3) === 0) ? substr($key, 3) : $key; - } - - $sql = 'SELECT f.field_type, f.field_ident, f.field_default_value, l.lang_default_value - FROM ' . PROFILE_LANG_TABLE . ' l, ' . PROFILE_FIELDS_TABLE . ' f - WHERE l.lang_id = ' . $user->get_iso_lang_id() . ' - ' . ((sizeof($sql_not_in)) ? ' AND ' . $db->sql_in_set('f.field_ident', $sql_not_in, true) : '') . ' - AND l.field_id = f.field_id'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if ($row['field_default_value'] == 'now' && $row['field_type'] == FIELD_DATE) - { - $now = getdate(); - $row['field_default_value'] = sprintf('%2d-%2d-%4d', $now['mday'], $now['mon'], $now['year']); - } - - $cp_data['pf_' . $row['field_ident']] = (in_array($row['field_type'], array(FIELD_TEXT, FIELD_STRING))) ? $row['lang_default_value'] : $row['field_default_value']; - } - $db->sql_freeresult($result); - - return $cp_data; - } - - /** - * Get profile field value on submit - * @access private - */ - private function get_profile_field($profile_row) - { - global $phpbb_root_path, $phpEx; - global $config; - - $var_name = 'pf_' . $profile_row['field_ident']; - - switch ($profile_row['field_type']) - { - case FIELD_DATE: - - if (!isset($_REQUEST[$var_name . '_day'])) - { - if ($profile_row['field_default_value'] == 'now') - { - $now = getdate(); - $profile_row['field_default_value'] = sprintf('%2d-%2d-%4d', $now['mday'], $now['mon'], $now['year']); - } - list($day, $month, $year) = explode('-', $profile_row['field_default_value']); - } - else - { - $day = request_var($var_name . '_day', 0); - $month = request_var($var_name . '_month', 0); - $year = request_var($var_name . '_year', 0); - } - - $var = sprintf('%2d-%2d-%4d', $day, $month, $year); - break; - - case FIELD_BOOL: - // Checkbox - if ($profile_row['field_length'] == 2) - { - $var = (isset($_REQUEST[$var_name])) ? 1 : 0; - } - else - { - $var = request_var($var_name, (int) $profile_row['field_default_value']); - } - break; - - case FIELD_STRING: - case FIELD_TEXT: - $var = utf8_normalize_nfc(request_var($var_name, (string) $profile_row['field_default_value'], true)); - break; - - case FIELD_INT: - if (isset($_REQUEST[$var_name]) && $_REQUEST[$var_name] === '') - { - $var = NULL; - } - else - { - $var = request_var($var_name, (int) $profile_row['field_default_value']); - } - break; - - case FIELD_DROPDOWN: - $var = request_var($var_name, (int) $profile_row['field_default_value']); - break; - - default: - $var = request_var($var_name, $profile_row['field_default_value']); - break; - } - - return $var; - } -} - -/** -* Custom Profile Fields ACP -* @package phpBB3 -*/ -class custom_profile_admin extends custom_profile -{ - public $vars = array(); - - /** - * Return possible validation options - */ - public function validate_options() - { - global $user; - - $validate_ary = array('CHARS_ANY' => '.*', 'NUMBERS_ONLY' => '[0-9]+', 'ALPHA_ONLY' => '[\w]+', 'ALPHA_SPACERS' => '[\w_\+\. \-\[\]]+'); - - $validate_options = ''; - foreach ($validate_ary as $lang => $value) - { - $selected = ($this->vars['field_validation'] == $value) ? ' selected="selected"' : ''; - $validate_options .= ''; - } - - return $validate_options; - } - - /** - * Get string options for second step in ACP - */ - public function get_string_options() - { - global $user; - - $options = array( - 0 => array('TITLE' => $user->lang['FIELD_LENGTH'], 'FIELD' => ''), - 1 => array('TITLE' => $user->lang['MIN_FIELD_CHARS'], 'FIELD' => ''), - 2 => array('TITLE' => $user->lang['MAX_FIELD_CHARS'], 'FIELD' => ''), - 3 => array('TITLE' => $user->lang['FIELD_VALIDATION'], 'FIELD' => '') - ); - - return $options; - } - - /** - * Get text options for second step in ACP - */ - public function get_text_options() - { - global $user; - - $options = array( - 0 => array('TITLE' => $user->lang['FIELD_LENGTH'], 'FIELD' => ' ' . $user->lang['ROWS'] . '
    ' . $user->lang['COLUMNS'] . ' '), - 1 => array('TITLE' => $user->lang['MIN_FIELD_CHARS'], 'FIELD' => ''), - 2 => array('TITLE' => $user->lang['MAX_FIELD_CHARS'], 'FIELD' => ''), - 3 => array('TITLE' => $user->lang['FIELD_VALIDATION'], 'FIELD' => '') - ); - - return $options; - } - - /** - * Get int options for second step in ACP - */ - public function get_int_options() - { - global $user; - - $options = array( - 0 => array('TITLE' => $user->lang['FIELD_LENGTH'], 'FIELD' => ''), - 1 => array('TITLE' => $user->lang['MIN_FIELD_NUMBER'], 'FIELD' => ''), - 2 => array('TITLE' => $user->lang['MAX_FIELD_NUMBER'], 'FIELD' => ''), - 3 => array('TITLE' => $user->lang['DEFAULT_VALUE'], 'FIELD' => '') - ); - - return $options; - } - - /** - * Get bool options for second step in ACP - */ - public function get_bool_options() - { - global $user, $config, $lang_defs; - - $default_lang_id = $lang_defs['iso'][$config['default_lang']]; - - $profile_row = array( - 'var_name' => 'field_default_value', - 'field_id' => 1, - 'lang_name' => $this->vars['lang_name'], - 'lang_explain' => $this->vars['lang_explain'], - 'lang_id' => $default_lang_id, - 'field_default_value' => $this->vars['field_default_value'], - 'field_ident' => 'field_default_value', - 'field_type' => FIELD_BOOL, - 'field_length' => $this->vars['field_length'], - 'lang_options' => $this->vars['lang_options'] - ); - - $options = array( - 0 => array('TITLE' => $user->lang['FIELD_TYPE'], 'EXPLAIN' => $user->lang['BOOL_TYPE_EXPLAIN'], 'FIELD' => ''), - 1 => array('TITLE' => $user->lang['DEFAULT_VALUE'], 'FIELD' => $this->process_field_row('preview', $profile_row)) - ); - - return $options; - } - - /** - * Get dropdown options for second step in ACP - */ - public function get_dropdown_options() - { - global $user, $config, $lang_defs; - - $default_lang_id = $lang_defs['iso'][$config['default_lang']]; - - $profile_row[0] = array( - 'var_name' => 'field_default_value', - 'field_id' => 1, - 'lang_name' => $this->vars['lang_name'], - 'lang_explain' => $this->vars['lang_explain'], - 'lang_id' => $default_lang_id, - 'field_default_value' => $this->vars['field_default_value'], - 'field_ident' => 'field_default_value', - 'field_type' => FIELD_DROPDOWN, - 'lang_options' => $this->vars['lang_options'] - ); - - $profile_row[1] = $profile_row[0]; - $profile_row[1]['var_name'] = 'field_novalue'; - $profile_row[1]['field_ident'] = 'field_novalue'; - $profile_row[1]['field_default_value'] = $this->vars['field_novalue']; - - $options = array( - 0 => array('TITLE' => $user->lang['DEFAULT_VALUE'], 'FIELD' => $this->process_field_row('preview', $profile_row[0])), - 1 => array('TITLE' => $user->lang['NO_VALUE_OPTION'], 'EXPLAIN' => $user->lang['NO_VALUE_OPTION_EXPLAIN'], 'FIELD' => $this->process_field_row('preview', $profile_row[1])) - ); - - return $options; - } - - /** - * Get date options for second step in ACP - */ - public function get_date_options() - { - global $user, $config, $lang_defs; - - $default_lang_id = $lang_defs['iso'][$config['default_lang']]; - - $profile_row = array( - 'var_name' => 'field_default_value', - 'lang_name' => $this->vars['lang_name'], - 'lang_explain' => $this->vars['lang_explain'], - 'lang_id' => $default_lang_id, - 'field_default_value' => $this->vars['field_default_value'], - 'field_ident' => 'field_default_value', - 'field_type' => FIELD_DATE, - 'field_length' => $this->vars['field_length'] - ); - - $always_now = request_var('always_now', -1); - if ($always_now == -1) - { - $s_checked = ($this->vars['field_default_value'] == 'now') ? true : false; - } - else - { - $s_checked = ($always_now) ? true : false; - } - - $options = array( - 0 => array('TITLE' => $user->lang['DEFAULT_VALUE'], 'FIELD' => $this->process_field_row('preview', $profile_row)), - 1 => array('TITLE' => $user->lang['ALWAYS_TODAY'], 'FIELD' => ''), - ); - - return $options; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/functions_search.php b/phpBB/includes/functions_search.php new file mode 100644 index 0000000000..277a8563de --- /dev/null +++ b/phpBB/includes/functions_search.php @@ -0,0 +1,498 @@ +', '`', '\'', '"', '|', ',', '@', '_', '?', '%', '-', '~', '+', '.', '[', ']', '{', '}', ':', '\\', '/', '=', '#', '\'', ';', '!'); + static $drop_char_replace = array(' ', ' ', ' ', ' ', ' ', ' ', ' ', '', '', ' ', ' ', ' ', ' ', '', ' ', ' ', '', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' , ' ', ' ', ' ', ' ', ' ', ' '); + + $entry = ' ' . strip_tags(strtolower($entry)) . ' '; + + if ( $mode == 'post' ) + { + // Replace line endings by a space + $entry = preg_replace('/[\n\r]/is', ' ', $entry); + // HTML entities like   + $entry = preg_replace('/\b&[a-z]+;\b/', ' ', $entry); + // Remove URL's + $entry = preg_replace('/\b[a-z0-9]+:\/\/[a-z0-9\.\-]+(\/[a-z0-9\?\.%_\-\+=&\/]+)?/', ' ', $entry); + // Quickly remove BBcode. + $entry = preg_replace('/\[img:[a-z0-9]{10,}\].*?\[\/img:[a-z0-9]{10,}\]/', ' ', $entry); + $entry = preg_replace('/\[\/?url(=.*?)?\]/', ' ', $entry); + $entry = preg_replace('/\[\/?[a-z\*=\+\-]+(\:?[0-9a-z]+)?:[a-z0-9]{10,}(\:[a-z0-9]+)?=?.*?\]/', ' ', $entry); + } + else if ( $mode == 'search' ) + { + $entry = str_replace(' +', ' and ', $entry); + $entry = str_replace(' -', ' not ', $entry); + } + + // + // Filter out strange characters like ^, $, &, change "it's" to "its" + // + for($i = 0; $i < count($drop_char_match); $i++) + { + $entry = str_replace($drop_char_match[$i], $drop_char_replace[$i], $entry); + } + + if ( $mode == 'post' ) + { + $entry = str_replace('*', ' ', $entry); + + // 'words' that consist of <3 or >20 characters are removed. + $entry = preg_replace('/[ ]([\S]{1,2}|[\S]{21,})[ ]/',' ', $entry); + } + + if ( !empty($stopword_list) ) + { + for ($j = 0; $j < count($stopword_list); $j++) + { + $stopword = trim($stopword_list[$j]); + + if ( $mode == 'post' || ( $stopword != 'not' && $stopword != 'and' && $stopword != 'or' ) ) + { + $entry = str_replace(' ' . trim($stopword) . ' ', ' ', $entry); + } + } + } + + if ( !empty($synonym_list) ) + { + for ($j = 0; $j < count($synonym_list); $j++) + { + list($replace_synonym, $match_synonym) = split(' ', trim(strtolower($synonym_list[$j]))); + if ( $mode == 'post' || ( $match_synonym != 'not' && $match_synonym != 'and' && $match_synonym != 'or' ) ) + { + $entry = str_replace(' ' . trim($match_synonym) . ' ', ' ' . trim($replace_synonym) . ' ', $entry); + } + } + } + + return $entry; +} + +function split_words($entry, $mode = 'post') +{ + // If you experience problems with the new method, uncomment this block. +/* + $rex = ( $mode == 'post' ) ? "/\b([\w±µ-ÿ][\w±µ-ÿ']*[\w±µ-ÿ]+|[\w±µ-ÿ]+?)\b/" : '/(\*?[a-z0-9±µ-ÿ]+\*?)|\b([a-z0-9±µ-ÿ]+)\b/'; + preg_match_all($rex, $entry, $split_entries); + + return $split_entries[1]; +*/ + // Trim 1+ spaces to one space and split this trimmed string into words. + return explode(' ', trim(preg_replace('#\s+#', ' ', $entry))); +} + +function add_search_words($mode, $post_id, $post_text, $post_title = '') +{ + global $db, $phpbb_root_path, $board_config, $lang; + + $stopword_array = @file($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . "/search_stopwords.txt"); + $synonym_array = @file($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . "/search_synonyms.txt"); + + $search_raw_words = array(); + $search_raw_words['text'] = split_words(clean_words('post', $post_text, $stopword_array, $synonym_array)); + $search_raw_words['title'] = split_words(clean_words('post', $post_title, $stopword_array, $synonym_array)); + + @set_time_limit(0); + + $word = array(); + $word_insert_sql = array(); + while ( list($word_in, $search_matches) = @each($search_raw_words) ) + { + $word_insert_sql[$word_in] = ''; + if ( !empty($search_matches) ) + { + for ($i = 0; $i < count($search_matches); $i++) + { + $search_matches[$i] = trim($search_matches[$i]); + + if( $search_matches[$i] != '' ) + { + $word[] = $search_matches[$i]; + if ( !strstr($word_insert_sql[$word_in], "'" . $search_matches[$i] . "'") ) + { + $word_insert_sql[$word_in] .= ( $word_insert_sql[$word_in] != "" ) ? ", '" . $search_matches[$i] . "'" : "'" . $search_matches[$i] . "'"; + } + } + } + } + } + + if ( count($word) ) + { + sort($word); + + $prev_word = ''; + $word_text_sql = ''; + $temp_word = array(); + for($i = 0; $i < count($word); $i++) + { + if ( $word[$i] != $prev_word ) + { + $temp_word[] = $word[$i]; + $word_text_sql .= ( ( $word_text_sql != '' ) ? ', ' : '' ) . "'" . $word[$i] . "'"; + } + $prev_word = $word[$i]; + } + $word = $temp_word; + + $check_words = array(); + switch( SQL_LAYER ) + { + case 'postgresql': + case 'msaccess': + case 'mssql-odbc': + case 'oracle': + case 'db2': + $sql = "SELECT word_id, word_text + FROM " . SEARCH_WORD_TABLE . " + WHERE word_text IN ($word_text_sql)"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not select words', '', __LINE__, __FILE__, $sql); + } + + while ( $row = $db->sql_fetchrow($result) ) + { + $check_words[$row['word_text']] = $row['word_id']; + } + break; + } + + $value_sql = ''; + $match_word = array(); + for ($i = 0; $i < count($word); $i++) + { + $new_match = true; + if ( isset($check_words[$word[$i]]) ) + { + $new_match = false; + } + + if ( $new_match ) + { + switch( SQL_LAYER ) + { + case 'mysql': + case 'mysql4': + $value_sql .= ( ( $value_sql != '' ) ? ', ' : '' ) . '(\'' . $word[$i] . '\', 0)'; + break; + case 'mssql': + case 'mssql-odbc': + $value_sql .= ( ( $value_sql != '' ) ? ' UNION ALL ' : '' ) . "SELECT '" . $word[$i] . "', 0"; + break; + default: + $sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text, word_common) + VALUES ('" . $word[$i] . "', 0)"; + if( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not insert new word', '', __LINE__, __FILE__, $sql); + } + break; + } + } + } + + if ( $value_sql != '' ) + { + switch ( SQL_LAYER ) + { + case 'mysql': + case 'mysql4': + $sql = "INSERT IGNORE INTO " . SEARCH_WORD_TABLE . " (word_text, word_common) + VALUES $value_sql"; + break; + case 'mssql': + case 'mssql-odbc': + $sql = "INSERT INTO " . SEARCH_WORD_TABLE . " (word_text, word_common) + $value_sql"; + break; + } + + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not insert new word', '', __LINE__, __FILE__, $sql); + } + } + } + + while( list($word_in, $match_sql) = @each($word_insert_sql) ) + { + $title_match = ( $word_in == 'title' ) ? 1 : 0; + + if ( $match_sql != '' ) + { + $sql = "INSERT INTO " . SEARCH_MATCH_TABLE . " (post_id, word_id, title_match) + SELECT $post_id, word_id, $title_match + FROM " . SEARCH_WORD_TABLE . " + WHERE word_text IN ($match_sql)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not insert new word matches', '', __LINE__, __FILE__, $sql); + } + } + } + + if ($mode == 'single') + { + remove_common('single', 4/10, $word); + } + + return; +} + +// +// Check if specified words are too common now +// +function remove_common($mode, $fraction, $word_id_list = array()) +{ + global $db; + + $sql = "SELECT COUNT(post_id) AS total_posts + FROM " . POSTS_TABLE; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain post count', '', __LINE__, __FILE__, $sql); + } + + $row = $db->sql_fetchrow($result); + + if ( $row['total_posts'] >= 100 ) + { + $common_threshold = floor($row['total_posts'] * $fraction); + + if ( $mode == 'single' && count($word_id_list) ) + { + $word_id_sql = ''; + for($i = 0; $i < count($word_id_list); $i++) + { + $word_id_sql .= ( ( $word_id_sql != '' ) ? ', ' : '' ) . "'" . $word_id_list[$i] . "'"; + } + + $sql = "SELECT m.word_id + FROM " . SEARCH_MATCH_TABLE . " m, " . SEARCH_WORD_TABLE . " w + WHERE w.word_text IN ($word_id_sql) + AND m.word_id = w.word_id + GROUP BY m.word_id + HAVING COUNT(m.word_id) > $common_threshold"; + } + else + { + $sql = "SELECT word_id + FROM " . SEARCH_MATCH_TABLE . " + GROUP BY word_id + HAVING COUNT(word_id) > $common_threshold"; + } + + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain common word list', '', __LINE__, __FILE__, $sql); + } + + $common_word_id = ''; + while ( $row = $db->sql_fetchrow($result) ) + { + $common_word_id .= ( ( $common_word_id != '' ) ? ', ' : '' ) . $row['word_id']; + } + $db->sql_freeresult($result); + + if ( $common_word_id != '' ) + { + $sql = "UPDATE " . SEARCH_WORD_TABLE . " + SET word_common = " . TRUE . " + WHERE word_id IN ($common_word_id)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete word list entry', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . SEARCH_MATCH_TABLE . " + WHERE word_id IN ($common_word_id)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete word match entry', '', __LINE__, __FILE__, $sql); + } + } + } + + return; +} + +function remove_search_post($post_id_sql) +{ + global $db; + + $words_removed = false; + + switch ( SQL_LAYER ) + { + case 'mysql': + case 'mysql4': + $sql = "SELECT word_id + FROM " . SEARCH_MATCH_TABLE . " + WHERE post_id IN ($post_id_sql) + GROUP BY word_id"; + if ( $result = $db->sql_query($sql) ) + { + $word_id_sql = ''; + while ( $row = $db->sql_fetchrow($result) ) + { + $word_id_sql .= ( $word_id_sql != '' ) ? ', ' . $row['word_id'] : $row['word_id']; + } + + $sql = "SELECT word_id + FROM " . SEARCH_MATCH_TABLE . " + WHERE word_id IN ($word_id_sql) + GROUP BY word_id + HAVING COUNT(word_id) = 1"; + if ( $result = $db->sql_query($sql) ) + { + $word_id_sql = ''; + while ( $row = $db->sql_fetchrow($result) ) + { + $word_id_sql .= ( $word_id_sql != '' ) ? ', ' . $row['word_id'] : $row['word_id']; + } + + if ( $word_id_sql != '' ) + { + $sql = "DELETE FROM " . SEARCH_WORD_TABLE . " + WHERE word_id IN ($word_id_sql)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete word list entry', '', __LINE__, __FILE__, $sql); + } + + $words_removed = $db->sql_affectedrows(); + } + } + } + break; + + default: + $sql = "DELETE FROM " . SEARCH_WORD_TABLE . " + WHERE word_id IN ( + SELECT word_id + FROM " . SEARCH_MATCH_TABLE . " + WHERE word_id IN ( + SELECT word_id + FROM " . SEARCH_MATCH_TABLE . " + WHERE post_id IN ($post_id_sql) + GROUP BY word_id + ) + GROUP BY word_id + HAVING COUNT(word_id) = 1 + )"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete old words from word table', '', __LINE__, __FILE__, $sql); + } + + $words_removed = $db->sql_affectedrows(); + + break; + } + + $sql = "DELETE FROM " . SEARCH_MATCH_TABLE . " + WHERE post_id IN ($post_id_sql)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Error in deleting post', '', __LINE__, __FILE__, $sql); + } + + return $words_removed; +} + +// +// Username search +// +function username_search($search_match) +{ + global $db, $board_config, $template, $lang, $images, $theme, $phpEx, $phpbb_root_path; + global $starttime, $gen_simple_header; + + $gen_simple_header = TRUE; + + $username_list = ''; + if ( !empty($search_match) ) + { + $username_search = preg_replace('/\*/', '%', phpbb_clean_username($search_match)); + + $sql = "SELECT username + FROM " . USERS_TABLE . " + WHERE username LIKE '" . str_replace("\'", "''", $username_search) . "' AND user_id <> " . ANONYMOUS . " + ORDER BY username"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain search results', '', __LINE__, __FILE__, $sql); + } + + if ( $row = $db->sql_fetchrow($result) ) + { + do + { + $username_list .= ''; + } + while ( $row = $db->sql_fetchrow($result) ); + } + else + { + $username_list .= ''; + } + $db->sql_freeresult($result); + } + + $page_title = $lang['Search']; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + $template->set_filenames(array( + 'search_user_body' => 'search_username.tpl') + ); + + $template->assign_vars(array( + 'USERNAME' => (!empty($search_match)) ? phpbb_clean_username($search_match) : '', + + 'L_CLOSE_WINDOW' => $lang['Close_window'], + 'L_SEARCH_USERNAME' => $lang['Find_username'], + 'L_UPDATE_USERNAME' => $lang['Select_username'], + 'L_SELECT' => $lang['Select'], + 'L_SEARCH' => $lang['Search'], + 'L_SEARCH_EXPLAIN' => $lang['Search_author_explain'], + 'L_CLOSE_WINDOW' => $lang['Close_window'], + + 'S_USERNAME_OPTIONS' => $username_list, + 'S_SEARCH_ACTION' => append_sid("search.$phpEx?mode=searchuser")) + ); + + if ( $username_list != '' ) + { + $template->assign_block_vars('switch_select_name', array()); + } + + $template->pparse('search_user_body'); + + include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + + return; +} + +?> \ No newline at end of file diff --git a/phpBB/includes/functions_selects.php b/phpBB/includes/functions_selects.php new file mode 100644 index 0000000000..ffaecf37bb --- /dev/null +++ b/phpBB/includes/functions_selects.php @@ -0,0 +1,111 @@ +'; + while ( list($displayname, $filename) = @each($lang) ) + { + $selected = ( strtolower($default) == strtolower($filename) ) ? ' selected="selected"' : ''; + $lang_select .= ''; + } + $lang_select .= ''; + + return $lang_select; +} + +// +// Pick a template/theme combo, +// +function style_select($default_style, $select_name = "style", $dirname = "templates") +{ + global $db; + + $sql = "SELECT themes_id, style_name + FROM " . THEMES_TABLE . " + ORDER BY template_name, themes_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't query themes table", "", __LINE__, __FILE__, $sql); + } + + $style_select = '"; + + return $style_select; +} + +// +// Pick a timezone +// +function tz_select($default, $select_name = 'timezone') +{ + global $sys_timezone, $lang; + + if ( !isset($default) ) + { + $default == $sys_timezone; + } + $tz_select = ''; + + return $tz_select; +} + +?> \ No newline at end of file diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php deleted file mode 100644 index 5ff04b9826..0000000000 --- a/phpBB/includes/functions_template.php +++ /dev/null @@ -1,756 +0,0 @@ -template = &$template; - } - - /** - * Load template source from file - * @access private - */ - public function _tpl_load_file($handle, $store_in_db = false) - { - // Try and open template for read - if (!file_exists($this->template->files[$handle])) - { - trigger_error("template->_tpl_load_file(): File {$this->template->files[$handle]} does not exist or is empty", E_USER_ERROR); - } - - $this->template->compiled_code[$handle] = $this->compile(trim(@file_get_contents($this->template->files[$handle]))); - - // Actually compile the code now. - $this->compile_write($handle, $this->template->compiled_code[$handle]); - - // Store in database if required... - if ($store_in_db) - { - global $db, $user; - - $sql_ary = array( - 'template_id' => $user->theme['template_id'], - 'template_filename' => $this->template->filename[$handle], - 'template_included' => '', - 'template_mtime' => time(), - 'template_data' => trim(@file_get_contents($this->template->files[$handle])), - ); - - $sql = 'INSERT INTO ' . STYLES_TEMPLATE_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - $db->sql_query($sql); - } - } - - /** - * Remove any PHP tags that do not belong, these regular expressions are derived from - * the ones that exist in zend_language_scanner.l - * @access private - */ - private function remove_php_tags(&$code) - { - // This matches the information gathered from the internal PHP lexer - $match = array( - '#<([\?%])=?.*?\1>#s', - '#.*?#s', - '#<\?php(?:\r\n?|[ \n\t]).*?\?>#s' - ); - - $code = preg_replace($match, '', $code); - } - - /** - * The all seeing all doing compile method. Parts are inspired by or directly from Smarty - * @access private - */ - public function compile($code, $no_echo = false, $echo_var = '') - { - global $config; - - if ($echo_var) - { - global $$echo_var; - } - - // Remove any "loose" php ... we want to give admins the ability - // to switch on/off PHP for a given template. Allowing unchecked - // php is a no-no. There is a potential issue here in that non-php - // content may be removed ... however designers should use entities - // if they wish to display < and > - $this->remove_php_tags($code); - - // Pull out all block/statement level elements and separate plain text - preg_match_all('#(.*?)#s', $code, $matches); - $php_blocks = $matches[1]; - $code = preg_replace('#.*?#s', '', $code); - - preg_match_all('##', $code, $matches); - $include_blocks = $matches[1]; - $code = preg_replace('##', '', $code); - - preg_match_all('##', $code, $matches); - $includephp_blocks = $matches[1]; - $code = preg_replace('##', '', $code); - - preg_match_all('##', $code, $blocks, PREG_SET_ORDER); - - $text_blocks = preg_split('##', $code); - - for ($i = 0, $j = sizeof($text_blocks); $i < $j; $i++) - { - $this->compile_var_tags($text_blocks[$i]); - } - $compile_blocks = array(); - - for ($curr_tb = 0, $tb_size = sizeof($blocks); $curr_tb < $tb_size; $curr_tb++) - { - $block_val = &$blocks[$curr_tb]; - - switch ($block_val[1]) - { - case 'BEGIN': - $this->block_else_level[] = false; - $compile_blocks[] = 'compile_tag_block($block_val[2]) . ' ?>'; - break; - - case 'BEGINELSE': - $this->block_else_level[sizeof($this->block_else_level) - 1] = true; - $compile_blocks[] = ''; - break; - - case 'END': - array_pop($this->block_names); - $compile_blocks[] = 'block_else_level)) ? '}' : '}}') . ' ?>'; - break; - - case 'IF': - $compile_blocks[] = 'compile_tag_if($block_val[2], false) . ' ?>'; - break; - - case 'ELSE': - $compile_blocks[] = ''; - break; - - case 'ELSEIF': - $compile_blocks[] = 'compile_tag_if($block_val[2], true) . ' ?>'; - break; - - case 'ENDIF': - $compile_blocks[] = ''; - break; - - case 'DEFINE': - $compile_blocks[] = 'compile_tag_define($block_val[2], true) . ' ?>'; - break; - - case 'UNDEFINE': - $compile_blocks[] = 'compile_tag_define($block_val[2], false) . ' ?>'; - break; - - case 'INCLUDE': - $temp = array_shift($include_blocks); - $compile_blocks[] = 'compile_tag_include($temp) . ' ?>'; - $this->template->_tpl_include($temp, false); - break; - - case 'INCLUDEPHP': - $compile_blocks[] = ($config['tpl_allow_php']) ? 'compile_tag_include_php(array_shift($includephp_blocks)) . ' ?>' : ''; - break; - - case 'PHP': - $compile_blocks[] = ($config['tpl_allow_php']) ? '' : ''; - break; - - default: - $this->compile_var_tags($block_val[0]); - $trim_check = trim($block_val[0]); - $compile_blocks[] = (!$no_echo) ? ((!empty($trim_check)) ? $block_val[0] : '') : ((!empty($trim_check)) ? $block_val[0] : ''); - break; - } - } - - $template_php = ''; - for ($i = 0, $size = sizeof($text_blocks); $i < $size; $i++) - { - $trim_check_text = trim($text_blocks[$i]); - $template_php .= (!$no_echo) ? (($trim_check_text != '') ? $text_blocks[$i] : '') . ((isset($compile_blocks[$i])) ? $compile_blocks[$i] : '') : (($trim_check_text != '') ? $text_blocks[$i] : '') . ((isset($compile_blocks[$i])) ? $compile_blocks[$i] : ''); - } - - // There will be a number of occasions where we switch into and out of - // PHP mode instantaneously. Rather than "burden" the parser with this - // we'll strip out such occurences, minimising such switching - $template_php = str_replace(' ?>generate_block_varref($namespace, $varname, true, $var_val[2]); - - $text_blocks = str_replace($var_val[0], $new, $text_blocks); - } - - // This will handle the remaining root-level varrefs - // transform vars prefixed by L_ into their language variable pendant if nothing is set within the tpldata array - if (strpos($text_blocks, '{L_') !== false) - { - $text_blocks = preg_replace('#\{L_([a-z0-9\-_]*)\}#is', "_rootref['L_\\1'])) ? \$this->_rootref['L_\\1'] : ((isset(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '{ \\1 }')); ?>", $text_blocks); - } - - // Handle addslashed language variables prefixed with LA_ - // If a template variable already exist, it will be used in favor of it... - if (strpos($text_blocks, '{LA_') !== false) - { - $text_blocks = preg_replace('#\{LA_([a-z0-9\-_]*)\}#is', "_rootref['LA_\\1'])) ? \$this->_rootref['LA_\\1'] : ((isset(\$this->_rootref['L_\\1'])) ? addslashes(\$this->_rootref['L_\\1']) : ((isset(\$user->lang['\\1'])) ? addslashes(\$user->lang['\\1']) : '{ \\1 }'))); ?>", $text_blocks); - } - - // Handle remaining varrefs - $text_blocks = preg_replace('#\{([a-z0-9\-_]*)\}#is', "_rootref['\\1'])) ? \$this->_rootref['\\1'] : ''; ?>", $text_blocks); - $text_blocks = preg_replace('#\{\$([a-z0-9\-_]*)\}#is', "_tpldata['DEFINE']['.']['\\1'])) ? \$this->_tpldata['DEFINE']['.']['\\1'] : ''; ?>", $text_blocks); - - return; - } - - /** - * Compile blocks - * @access private - */ - private function compile_tag_block($tag_args) - { - $no_nesting = false; - - // Is the designer wanting to call another loop in a loop? - if (strpos($tag_args, '!') === 0) - { - // Count the number if ! occurrences (not allowed in vars) - $no_nesting = substr_count($tag_args, '!'); - $tag_args = substr($tag_args, $no_nesting); - } - - // Allow for control of looping (indexes start from zero): - // foo(2) : Will start the loop on the 3rd entry - // foo(-2) : Will start the loop two entries from the end - // foo(3,4) : Will start the loop on the fourth entry and end it on the fifth - // foo(3,-4) : Will start the loop on the fourth entry and end it four from last - if (preg_match('#^([^()]*)\(([\-\d]+)(?:,([\-\d]+))?\)$#', $tag_args, $match)) - { - $tag_args = $match[1]; - - if ($match[2] < 0) - { - $loop_start = '($_' . $tag_args . '_count ' . $match[2] . ' < 0 ? 0 : $_' . $tag_args . '_count ' . $match[2] . ')'; - } - else - { - $loop_start = '($_' . $tag_args . '_count < ' . $match[2] . ' ? $_' . $tag_args . '_count : ' . $match[2] . ')'; - } - - if (strlen($match[3]) < 1 || $match[3] == -1) - { - $loop_end = '$_' . $tag_args . '_count'; - } - else if ($match[3] >= 0) - { - $loop_end = '(' . ($match[3] + 1) . ' > $_' . $tag_args . '_count ? $_' . $tag_args . '_count : ' . ($match[3] + 1) . ')'; - } - else //if ($match[3] < -1) - { - $loop_end = '$_' . $tag_args . '_count' . ($match[3] + 1); - } - } - else - { - $loop_start = 0; - $loop_end = '$_' . $tag_args . '_count'; - } - - $tag_template_php = ''; - array_push($this->block_names, $tag_args); - - if ($no_nesting !== false) - { - // We need to implode $no_nesting times from the end... - $block = array_slice($this->block_names, -$no_nesting); - } - else - { - $block = $this->block_names; - } - - if (sizeof($block) < 2) - { - // Block is not nested. - $tag_template_php = '$_' . $tag_args . "_count = (isset(\$this->_tpldata['$tag_args'])) ? sizeof(\$this->_tpldata['$tag_args']) : 0;"; - $varref = "\$this->_tpldata['$tag_args']"; - } - else - { - // This block is nested. - // Generate a namespace string for this block. - $namespace = implode('.', $block); - - // Get a reference to the data array for this block that depends on the - // current indices of all parent blocks. - $varref = $this->generate_block_data_ref($namespace, false); - - // Create the for loop code to iterate over this block. - $tag_template_php = '$_' . $tag_args . '_count = (isset(' . $varref . ')) ? sizeof(' . $varref . ') : 0;'; - } - - $tag_template_php .= 'if ($_' . $tag_args . '_count) {'; - - /** - * The following uses foreach for iteration instead of a for loop, foreach is faster but requires PHP to make a copy of the contents of the array which uses more memory - * - * if (!$offset) - * { - * $tag_template_php .= 'foreach (' . $varref . ' as $_' . $tag_args . '_i => $_' . $tag_args . '_val){'; - * } - * - */ - - $tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){'; - $tag_template_php .= '$_'. $tag_args . '_val = &' . $varref . '[$_'. $tag_args. '_i];'; - - return $tag_template_php; - } - - /** - * Compile IF tags - much of this is from Smarty with - * some adaptions for our block level methods - * @access private - */ - private function compile_tag_if($tag_args, $elseif) - { - // Tokenize args for 'if' tag. - preg_match_all('/(?: - "[^"\\\\]*(?:\\\\.[^"\\\\]*)*" | - \'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\' | - [(),] | - [^\s(),]+)/x', $tag_args, $match); - - $tokens = $match[0]; - $is_arg_stack = array(); - - for ($i = 0, $size = sizeof($tokens); $i < $size; $i++) - { - $token = &$tokens[$i]; - - switch ($token) - { - case '!==': - case '===': - case '<<': - case '>>': - case '|': - case '^': - case '&': - case '~': - case ')': - case ',': - case '+': - case '-': - case '*': - case '/': - case '@': - break; - - case '==': - case 'eq': - $token = '=='; - break; - - case '!=': - case '<>': - case 'ne': - case 'neq': - $token = '!='; - break; - - case '<': - case 'lt': - $token = '<'; - break; - - case '<=': - case 'le': - case 'lte': - $token = '<='; - break; - - case '>': - case 'gt': - $token = '>'; - break; - - case '>=': - case 'ge': - case 'gte': - $token = '>='; - break; - - case '&&': - case 'and': - $token = '&&'; - break; - - case '||': - case 'or': - $token = '||'; - break; - - case '!': - case 'not': - $token = '!'; - break; - - case '%': - case 'mod': - $token = '%'; - break; - - case '(': - array_push($is_arg_stack, $i); - break; - - case 'is': - $is_arg_start = ($tokens[$i-1] == ')') ? array_pop($is_arg_stack) : $i-1; - $is_arg = implode(' ', array_slice($tokens, $is_arg_start, $i - $is_arg_start)); - - $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i+1)); - - array_splice($tokens, $is_arg_start, sizeof($tokens), $new_tokens); - - $i = $is_arg_start; - - // no break - - default: - if (preg_match('#^((?:[a-z0-9\-_]+\.)+)?(\$)?(?=[A-Z])([A-Z0-9\-_]+)#s', $token, $varrefs)) - { - $token = (!empty($varrefs[1])) ? $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']' : (($varrefs[2]) ? '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[3] . '\']' : '$this->_rootref[\'' . $varrefs[3] . '\']'); - } - else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs)) - { - // Allow checking if loops are set with .loopname - // It is also possible to check the loop count by doing for example - $blocks = explode('.', $varrefs[1]); - - // If the block is nested, we have a reference that we can grab. - // If the block is not nested, we just go and grab the block from _tpldata - if (sizeof($blocks) > 1) - { - $block = array_pop($blocks); - $namespace = implode('.', $blocks); - $varref = $this->generate_block_data_ref($namespace, true); - - // Add the block reference for the last child. - $varref .= "['" . $block . "']"; - } - else - { - $varref = '$this->_tpldata'; - - // Add the block reference for the last child. - $varref .= "['" . $blocks[0] . "']"; - } - $token = "sizeof($varref)"; - } - - break; - } - } - - return (($elseif) ? '} else if (' : 'if (') . (implode(' ', $tokens) . ') { '); - } - - /** - * Compile DEFINE tags - * @access private - */ - private function compile_tag_define($tag_args, $op) - { - preg_match('#^((?:[a-z0-9\-_]+\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (\'?)([^\']*)(\'?))?$#', $tag_args, $match); - - if (empty($match[2]) || (!isset($match[4]) && $op)) - { - return ''; - } - - if (!$op) - { - return 'unset(' . (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ');'; - } - - // Are we a string? - if ($match[3] && $match[5]) - { - $match[4] = str_replace(array('\\\'', '\\\\', '\''), array('\'', '\\', '\\\''), $match[4]); - - // Compile reference, we allow template variables in defines... - $match[4] = $this->compile($match[4]); - - // Now replace the php code - $match[4] = "'" . str_replace(array(''), array("' . ", " . '"), $match[4]) . "'"; - } - else - { - preg_match('#true|false|\.#i', $match[4], $type); - - switch (strtolower($type[0])) - { - case 'true': - case 'false': - $match[4] = strtoupper($match[4]); - break; - - case '.': - $match[4] = doubleval($match[4]); - break; - - default: - $match[4] = intval($match[4]); - break; - } - } - - return (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ' = ' . $match[4] . ';'; - } - - /** - * Compile INCLUDE tag - * @access private - */ - private function compile_tag_include($tag_args) - { - return "\$this->_tpl_include('$tag_args');"; - } - - /** - * Compile INCLUDE_PHP tag - * @access private - */ - private function compile_tag_include_php($tag_args) - { - return "include('" . $tag_args . "');"; - } - - /** - * parse expression - * This is from Smarty - * @access private - */ - private function _parse_is_expr($is_arg, array $tokens) - { - $expr_end = 0; - $negate_expr = false; - - if (($first_token = array_shift($tokens)) == 'not') - { - $negate_expr = true; - $expr_type = array_shift($tokens); - } - else - { - $expr_type = $first_token; - } - - switch ($expr_type) - { - case 'even': - if (@$tokens[$expr_end] == 'by') - { - $expr_end++; - $expr_arg = $tokens[$expr_end++]; - $expr = "!(($is_arg / $expr_arg) % $expr_arg)"; - } - else - { - $expr = "!($is_arg & 1)"; - } - break; - - case 'odd': - if (@$tokens[$expr_end] == 'by') - { - $expr_end++; - $expr_arg = $tokens[$expr_end++]; - $expr = "(($is_arg / $expr_arg) % $expr_arg)"; - } - else - { - $expr = "($is_arg & 1)"; - } - break; - - case 'div': - if (@$tokens[$expr_end] == 'by') - { - $expr_end++; - $expr_arg = $tokens[$expr_end++]; - $expr = "!($is_arg % $expr_arg)"; - } - break; - } - - if ($negate_expr) - { - $expr = "!($expr)"; - } - - array_splice($tokens, 0, $expr_end, $expr); - - return $tokens; - } - - /** - * Generates a reference to the given variable inside the given (possibly nested) - * block namespace. This is a string of the form: - * ' . $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['varname'] . ' - * It's ready to be inserted into an "echo" line in one of the templates. - * NOTE: expects a trailing "." on the namespace. - * @access private - */ - private function generate_block_varref($namespace, $varname, $echo = true, $defop = false) - { - // Strip the trailing period. - $namespace = substr($namespace, 0, -1); - - // Get a reference to the data block for this namespace. - $varref = $this->generate_block_data_ref($namespace, true, $defop); - // Prepend the necessary code to stick this in an echo line. - - // Append the variable reference. - $varref .= "['$varname']"; - $varref = ($echo) ? "" : ((isset($varref)) ? $varref : ''); - - return $varref; - } - - /** - * Generates a reference to the array of data values for the given - * (possibly nested) block namespace. This is a string of the form: - * $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['$childN'] - * - * If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above. - * NOTE: does not expect a trailing "." on the blockname. - * @access private - */ - private function generate_block_data_ref($blockname, $include_last_iterator, $defop = false) - { - // Get an array of the blocks involved. - $blocks = explode('.', $blockname); - $blockcount = sizeof($blocks) - 1; - - // DEFINE is not an element of any referenced variable, we must use _tpldata to access it - if ($defop) - { - $varref = '$this->_tpldata[\'DEFINE\']'; - // Build up the string with everything but the last child. - for ($i = 0; $i < $blockcount; $i++) - { - $varref .= "['" . $blocks[$i] . "'][\$_" . $blocks[$i] . '_i]'; - } - // Add the block reference for the last child. - $varref .= "['" . $blocks[$blockcount] . "']"; - // Add the iterator for the last child if requried. - if ($include_last_iterator) - { - $varref .= '[$_' . $blocks[$blockcount] . '_i]'; - } - return $varref; - } - else if ($include_last_iterator) - { - return '$_'. $blocks[$blockcount] . '_val'; - } - else - { - return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']'; - } - } - - /** - * Write compiled file to cache directory - * @access private - */ - public function compile_write($handle, $data) - { - global $phpEx; - - $filename = $this->template->cachepath . str_replace('/', '.', $this->template->filename[$handle]) . '.' . $phpEx; - - if ($fp = @fopen($filename, 'wb')) - { - @flock($fp, LOCK_EX); - @fwrite($fp, $data); - @flock($fp, LOCK_UN); - @fclose($fp); - - @chmod($filename, 0666); - } - - return; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/functions_transfer.php b/phpBB/includes/functions_transfer.php deleted file mode 100644 index 9eb32a7b45..0000000000 --- a/phpBB/includes/functions_transfer.php +++ /dev/null @@ -1,805 +0,0 @@ -file_perms = 0644; - $this->dir_perms = 0777; - - // We use the store directory as temporary path to circumvent open basedir restrictions - $this->tmp_path = $phpbb_root_path . 'store/'; - } - - /** - * Write file to location - */ - public function write_file($destination_file = '', $contents = '') - { - global $phpbb_root_path; - - $destination_file = $this->root_path . str_replace($phpbb_root_path, '', $destination_file); - - // need to create a temp file and then move that temp file. - // ftp functions can only move files around and can't create. - // This means that the users will need to have access to write - // temporary files or have write access on a folder within phpBB - // like the cache folder. If the user can't do either, then - // he/she needs to use the fsock ftp method - $temp_name = tempnam($this->tmp_path, 'transfer_'); - @unlink($temp_name); - - $fp = @fopen($temp_name, 'w'); - - if (!$fp) - { - trigger_error('Unable to create temporary file ' . $temp_name, E_USER_ERROR); - } - - @fwrite($fp, $contents); - @fclose($fp); - - $result = $this->overwrite_file($temp_name, $destination_file); - - // remove temporary file now - @unlink($temp_name); - - return $result; - } - - /** - * Moving file into location. If the destination file already exists it gets overwritten - */ - public function overwrite_file($source_file, $destination_file) - { - /** - * @todo generally think about overwriting files in another way, by creating a temporary file and then renaming it - * @todo check for the destination file existance too - */ - $this->_delete($destination_file); - $result = $this->_put($source_file, $destination_file); - $this->_chmod($destination_file, $this->file_perms); - - return $result; - } - - /** - * Create directory structure - */ - public function make_dir($dir) - { - global $phpbb_root_path; - - $dir = str_replace($phpbb_root_path, '', $dir); - $dir = explode('/', $dir); - $dirs = ''; - - for ($i = 0, $total = sizeof($dir); $i < $total; $i++) - { - $result = true; - - if (strpos($dir[$i], '.') === 0) - { - continue; - } - $cur_dir = $dir[$i] . '/'; - - if (!file_exists($phpbb_root_path . $dirs . $cur_dir)) - { - // create the directory - $result = $this->_mkdir($dir[$i]); - $this->_chmod($dir[$i], $this->dir_perms); - } - - $this->_chdir($this->root_path . $dirs . $dir[$i]); - $dirs .= $cur_dir; - } - - $this->_chdir($this->root_path); - - /** - * @todo stack result into array to make sure every path creation has been taken care of - */ - return $result; - } - - /** - * Copy file from source location to destination location - */ - public function copy_file($from_loc, $to_loc) - { - global $phpbb_root_path; - - $from_loc = ((strpos($from_loc, $phpbb_root_path) !== 0) ? $phpbb_root_path : '') . $from_loc; - $to_loc = $this->root_path . str_replace($phpbb_root_path, '', $to_loc); - - if (!file_exists($from_loc)) - { - return false; - } - - $result = $this->overwrite_file($from_loc, $to_loc); - - return $result; - } - - /** - * Remove file - */ - public function delete_file($file) - { - global $phpbb_root_path; - - $file = $this->root_path . str_replace($phpbb_root_path, '', $file); - - return $this->_delete($file); - } - - /** - * Remove directory - * @todo remove child directories? - */ - public function remove_dir($dir) - { - global $phpbb_root_path; - - $dir = $this->root_path . str_replace($phpbb_root_path, '', $dir); - - return $this->_rmdir($dir); - } - - /** - * Rename a file or folder - */ - public function rename($old_handle, $new_handle) - { - global $phpbb_root_path; - - $old_handle = $this->root_path . str_replace($phpbb_root_path, '', $old_handle); - - return $this->_rename($old_handle, $new_handle); - } - - /** - * Check if a specified file exist... - */ - public function file_exists($directory, $filename) - { - global $phpbb_root_path; - - $directory = $this->root_path . str_replace($phpbb_root_path, '', $directory); - - $this->_chdir($directory); - $result = $this->_ls(''); - - if ($result !== false && is_array($result)) - { - return (in_array($filename, $result)) ? true : false; - } - - return false; - } - - /** - * Open session - */ - public function open_session() - { - return $this->_init(); - } - - /** - * Close current session - */ - public function close_session() - { - return $this->_close(); - } - - /** - * Determine methods able to be used - */ - public static function methods() - { - $methods = array(); - $disabled_functions = explode(',', @ini_get('disable_functions')); - - if (@extension_loaded('ftp')) - { - $methods[] = 'ftp'; - } - - if (!in_array('fsockopen', $disabled_functions)) - { - $methods[] = 'ftp_fsock'; - } - - return $methods; - } -} - -/** -* FTP transfer class -* @package phpBB3 -*/ -class ftp extends transfer -{ - /** - * Standard parameters for FTP session - */ - function __construct($host, $username, $password, $root_path, $port = 21, $timeout = 10) - { - $this->host = $host; - $this->port = $port; - $this->username = $username; - $this->password = $password; - $this->timeout = $timeout; - - // Make sure $this->root_path is layed out the same way as the $user->page['root_script_path'] value (/ at the end) - $this->root_path = str_replace('\\', '/', $this->root_path); - - if (!empty($root_path)) - { - $this->root_path = (($root_path[0] != '/' ) ? '/' : '') . $root_path . ((substr($root_path, -1, 1) == '/') ? '' : '/'); - } - - // Init some needed values - parent::__construct(); - - return; - } - - /** - * Requests data - */ - private function data() - { - global $user; - - return array( - 'host' => 'localhost', - 'username' => 'anonymous', - 'password' => '', - 'root_path' => $user->page['root_script_path'], - 'port' => 21, - 'timeout' => 10 - ); - } - - /** - * Init FTP Session - * @access private - */ - private function _init() - { - // connect to the server - $this->connection = @ftp_connect($this->host, $this->port, $this->timeout); - - if (!$this->connection) - { - return 'ERR_CONNECTING_SERVER'; - } - - // attempt to turn pasv mode on - @ftp_pasv($this->connection, true); - - // login to the server - if (!@ftp_login($this->connection, $this->username, $this->password)) - { - return 'ERR_UNABLE_TO_LOGIN'; - } - - // change to the root directory - if (!$this->_chdir($this->root_path)) - { - return 'ERR_CHANGING_DIRECTORY'; - } - - return true; - } - - /** - * Create Directory (MKDIR) - * @access private - */ - private function _mkdir($dir) - { - return @ftp_mkdir($this->connection, $dir); - } - - /** - * Remove directory (RMDIR) - * @access private - */ - private function _rmdir($dir) - { - return @ftp_rmdir($this->connection, $dir); - } - - /** - * Rename file - * @access private - */ - private function _rename($old_handle, $new_handle) - { - return @ftp_rename($this->connection, $old_handle, $new_handle); - } - - /** - * Change current working directory (CHDIR) - * @access private - */ - private function _chdir($dir = '') - { - if ($dir && $dir !== '/') - { - if (substr($dir, -1, 1) == '/') - { - $dir = substr($dir, 0, -1); - } - } - - return @ftp_chdir($this->connection, $dir); - } - - /** - * change file permissions (CHMOD) - * @access private - */ - private function _chmod($file, $perms) - { - if (function_exists('ftp_chmod')) - { - $err = @ftp_chmod($this->connection, $perms, $file); - } - else - { - // Unfortunatly CHMOD is not expecting an octal value... - // We need to transform the integer (which was an octal) to an octal representation (to get the int) and then pass as is. ;) - $chmod_cmd = 'CHMOD ' . base_convert($perms, 10, 8) . ' ' . $file; - $err = $this->_site($chmod_cmd); - } - - return $err; - } - - /** - * Upload file to location (PUT) - * @access private - */ - private function _put($from_file, $to_file) - { - // get the file extension - $file_extension = strtolower(substr(strrchr($to_file, '.'), 1)); - - // We only use the BINARY file mode to cicumvent rewrite actions from ftp server (mostly linefeeds being replaced) - $mode = FTP_BINARY; - - $to_dir = dirname($to_file); - $to_file = basename($to_file); - $this->_chdir($to_dir); - - $result = @ftp_put($this->connection, $to_file, $from_file, $mode); - $this->_chdir($this->root_path); - - return $result; - } - - /** - * Delete file (DELETE) - * @access private - */ - private function _delete($file) - { - return @ftp_delete($this->connection, $file); - } - - /** - * Close ftp session (CLOSE) - * @access private - */ - private function _close() - { - if (!$this->connection) - { - return false; - } - - return @ftp_quit($this->connection); - } - - /** - * Return current working directory (CWD) - * At the moment not used by parent class - * @access private - */ - private function _cwd() - { - return @ftp_pwd($this->connection); - } - - /** - * Return list of files in a given directory (LS) - * @access private - */ - private function _ls($dir = './') - { - return @ftp_nlist($this->connection, $dir); - } - - /** - * FTP SITE command (ftp-only function) - * @access private - */ - private function _site($command) - { - return @ftp_site($this->connection, $command); - } -} - -/** -* FTP fsock transfer class -* -* @author wGEric -* @package phpBB3 -*/ -class ftp_fsock extends transfer -{ - var $data_connection; - - /** - * Standard parameters for FTP session - */ - function __construct($host, $username, $password, $root_path, $port = 21, $timeout = 10) - { - $this->host = $host; - $this->port = $port; - $this->username = $username; - $this->password = $password; - $this->timeout = $timeout; - - // Make sure $this->root_path is layed out the same way as the $user->page['root_script_path'] value (/ at the end) - $this->root_path = str_replace('\\', '/', $this->root_path); - - if (!empty($root_path)) - { - $this->root_path = (($root_path[0] != '/' ) ? '/' : '') . $root_path . ((substr($root_path, -1, 1) == '/') ? '' : '/'); - } - - // Init some needed values - parent::__construct(); - - return; - } - - /** - * Requests data - */ - private function data() - { - global $user; - - return array( - 'host' => 'localhost', - 'username' => 'anonymous', - 'password' => '', - 'root_path' => $user->page['root_script_path'], - 'port' => 21, - 'timeout' => 10 - ); - } - - /** - * Init FTP Session - * @access private - */ - private function _init() - { - $errno = 0; - $errstr = ''; - - // connect to the server - $this->connection = @fsockopen($this->host, $this->port, $errno, $errstr, $this->timeout); - - if (!$this->connection || !$this->_check_command()) - { - return 'ERR_CONNECTING_SERVER'; - } - - @stream_set_timeout($this->connection, $this->timeout); - - // login - if (!$this->_send_command('USER', $this->username)) - { - return 'ERR_UNABLE_TO_LOGIN'; - } - - if (!$this->_send_command('PASS', $this->password)) - { - return 'ERR_UNABLE_TO_LOGIN'; - } - - // change to the root directory - if (!$this->_chdir($this->root_path)) - { - return 'ERR_CHANGING_DIRECTORY'; - } - - return true; - } - - /** - * Create Directory (MKDIR) - * @access private - */ - private function _mkdir($dir) - { - return $this->_send_command('MKD', $dir); - } - - /** - * Remove directory (RMDIR) - * @access private - */ - private function _rmdir($dir) - { - return $this->_send_command('RMD', $dir); - } - - /** - * Rename File - * @access private - */ - private function _rename($old_handle, $new_handle) - { - $this->_send_command('RNFR', $old_handle); - return $this->_send_command('RNTO', $new_handle); - } - - /** - * Change current working directory (CHDIR) - * @access private - */ - function _chdir($dir = '') - { - if ($dir && $dir !== '/') - { - if (substr($dir, -1, 1) == '/') - { - $dir = substr($dir, 0, -1); - } - } - - return $this->_send_command('CWD', $dir); - } - - /** - * change file permissions (CHMOD) - * @access private - */ - private function _chmod($file, $perms) - { - // Unfortunatly CHMOD is not expecting an octal value... - // We need to transform the integer (which was an octal) to an octal representation (to get the int) and then pass as is. ;) - return $this->_send_command('SITE CHMOD', base_convert($perms, 10, 8) . ' ' . $file); - } - - /** - * Upload file to location (PUT) - * @access private - */ - private function _put($from_file, $to_file) - { - // We only use the BINARY file mode to cicumvent rewrite actions from ftp server (mostly linefeeds being replaced) - // 'I' == BINARY - // 'A' == ASCII - if (!$this->_send_command('TYPE', 'I')) - { - return false; - } - - // open the connection to send file over - if (!$this->_open_data_connection()) - { - return false; - } - - $this->_send_command('STOR', $to_file, false); - - // send the file - $fp = @fopen($from_file, 'rb'); - while (!@feof($fp)) - { - @fwrite($this->data_connection, @fread($fp, 4096)); - } - @fclose($fp); - - // close connection - $this->_close_data_connection(); - - return $this->_check_command(); - } - - /** - * Delete file (DELETE) - * @access private - */ - private function _delete($file) - { - return $this->_send_command('DELE', $file); - } - - /** - * Close ftp session (CLOSE) - * @access private - */ - private function _close() - { - if (!$this->connection) - { - return false; - } - - return $this->_send_command('QUIT'); - } - - /** - * Return current working directory (CWD) - * At the moment not used by parent class - * @access private - */ - private function _cwd() - { - $this->_send_command('PWD', '', false); - return preg_replace('#^[0-9]{3} "(.+)" .+\r\n#', '\\1', $this->_check_command(true)); - } - - /** - * Return list of files in a given directory (LS) - * @access private - */ - private function _ls($dir = './') - { - if (!$this->_open_data_connection()) - { - return false; - } - - $this->_send_command('NLST', $dir); - - $list = array(); - while (!@feof($this->data_connection)) - { - $list[] = preg_replace('#[\r\n]#', '', @fgets($this->data_connection, 512)); - } - $this->_close_data_connection(); - - return $list; - } - - /** - * Send a command to server (FTP fsock only function) - * @access private - */ - private function _send_command($command, $args = '', $check = true) - { - if (!empty($args)) - { - $command = "$command $args"; - } - - fwrite($this->connection, $command . "\r\n"); - - if ($check === true && !$this->_check_command()) - { - return false; - } - - return true; - } - - /** - * Opens a connection to send data (FTP fosck only function) - * @access private - */ - private function _open_data_connection() - { - $this->_send_command('PASV', '', false); - - if (!$ip_port = $this->_check_command(true)) - { - return false; - } - - // open the connection to start sending the file - if (!preg_match('#[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+#', $ip_port, $temp)) - { - // bad ip and port - return false; - } - - $temp = explode(',', $temp[0]); - $server_ip = $temp[0] . '.' . $temp[1] . '.' . $temp[2] . '.' . $temp[3]; - $server_port = $temp[4] * 256 + $temp[5]; - $errno = 0; - $errstr = ''; - - if (!$this->data_connection = @fsockopen($server_ip, $server_port, $errno, $errstr, $this->timeout)) - { - return false; - } - @stream_set_timeout($this->data_connection, $this->timeout); - - return true; - } - - /** - * Closes a connection used to send data - * @access private - */ - private function _close_data_connection() - { - return @fclose($this->data_connection); - } - - /** - * Check to make sure command was successful (FTP fsock only function) - * @access private - */ - private function _check_command($return = false) - { - $response = ''; - - do - { - $result = @fgets($this->connection, 512); - $response .= $result; - } - while (substr($response, 3, 1) != ' '); - - if (!preg_match('#^[123]#', $response)) - { - return false; - } - - return ($return) ? $response : true; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php deleted file mode 100644 index 6301896ff9..0000000000 --- a/phpBB/includes/functions_upload.php +++ /dev/null @@ -1,898 +0,0 @@ -init_error = true; - return; - } - - $this->filename = $upload_ary['tmp_name']; - $this->filesize = $upload_ary['size']; - $name = trim(htmlspecialchars(basename($upload_ary['name']))); - $this->realname = $this->uploadname = (STRIP) ? stripslashes($name) : $name; - $this->mimetype = $upload_ary['type']; - - // Opera adds the name to the mime type - $this->mimetype = (strpos($this->mimetype, '; name') !== false) ? str_replace(strstr($this->mimetype, '; name'), '', $this->mimetype) : $this->mimetype; - - if (!$this->mimetype) - { - $this->mimetype = 'application/octetstream'; - } - - $this->extension = strtolower($this->get_extension($this->realname)); - - // Try to get real filesize from temporary folder (not always working) ;) - $this->filesize = (@filesize($this->filename)) ? @filesize($this->filename) : $this->filesize; - - $this->width = $this->height = 0; - $this->file_moved = false; - - $this->local = (isset($upload_ary['local_mode'])) ? true : false; - $this->upload = $upload_namespace; - } - - /** - * Cleans destination filename - * - * @param real|unique|unique_ext $mode real creates a realname, filtering some characters, lowering every character. Unique creates an unique filename - * @param string $prefix Prefix applied to filename - * @access public - */ - function clean_filename($mode = 'unique', $prefix = '', $user_id = '') - { - if ($this->init_error) - { - return; - } - - switch ($mode) - { - case 'real': - // Remove every extension from filename (to not let the mime bug being exposed) - if (strpos($this->realname, '.') !== false) - { - $this->realname = substr($this->realname, 0, strpos($this->realname, '.')); - } - - // Replace any chars which may cause us problems with _ - $bad_chars = array("'", "\\", ' ', '/', ':', '*', '?', '"', '<', '>', '|'); - - $this->realname = rawurlencode(str_replace($bad_chars, '_', strtolower($this->realname))); - $this->realname = preg_replace("/%(\w{2})/", '_', $this->realname); - - $this->realname = $prefix . $this->realname . '.' . $this->extension; - break; - - case 'unique': - $this->realname = $prefix . md5(unique_id()); - break; - - case 'avatar': - $this->extension = strtolower($this->extension); - $this->realname = $prefix . $user_id . '.' . $this->extension; - - break; - - case 'unique_ext': - default: - $this->realname = $prefix . md5(unique_id()) . '.' . $this->extension; - break; - } - } - - /** - * Get property from file object - */ - function get($property) - { - if ($this->init_error || !isset($this->$property)) - { - return false; - } - - return $this->$property; - } - - /** - * Check if file is an image (mimetype) - * - * @return true if it is an image, false if not - */ - function is_image() - { - return (strpos($this->mimetype, 'image/') !== false) ? true : false; - } - - /** - * Check if the file got correctly uploaded - * - * @return true if it is a valid upload, false if not - */ - function is_uploaded() - { - if (!$this->local && !is_uploaded_file($this->filename)) - { - return false; - } - - if ($this->local && !file_exists($this->filename)) - { - return false; - } - - return true; - } - - /** - * Remove file - */ - function remove() - { - if ($this->file_moved) - { - @unlink($this->destination_file); - } - } - - /** - * Get file extension - */ - function get_extension($filename) - { - if (strpos($filename, '.') === false) - { - return ''; - } - - $filename = explode('.', $filename); - return array_pop($filename); - } - - /** - * Get mimetype. Utilize mime_content_type if the function exist. - * Not used at the moment... - */ - function get_mimetype($filename) - { - $mimetype = ''; - - if (function_exists('mime_content_type')) - { - $mimetype = mime_content_type($filename); - } - - // Some browsers choke on a mimetype of application/octet-stream - if (!$mimetype || $mimetype == 'application/octet-stream') - { - $mimetype = 'application/octetstream'; - } - - return $mimetype; - } - - /** - * Get filesize - */ - function get_filesize($filename) - { - return @filesize($filename); - } - - /** - * Move file to destination folder - * The phpbb_root_path variable will be applied to the destination path - * - * @param string $destination_path Destination path, for example $config['avatar_path'] - * @param bool $overwrite If set to true, an already existing file will be overwritten - * @param octal $chmod Permission mask for chmodding the file after a successful move - * @access public - */ - function move_file($destination, $overwrite = false, $skip_image_check = false, $chmod = 0666) - { - global $user, $phpbb_root_path; - - if (sizeof($this->error)) - { - return false; - } - - // We need to trust the admin in specifying valid upload directories and an attacker not being able to overwrite it... - $this->destination_path = $phpbb_root_path . $destination; - - // Check if the destination path exist... - if (!file_exists($this->destination_path)) - { - @unlink($this->filename); - return false; - } - - $upload_mode = (@ini_get('open_basedir') || @ini_get('safe_mode')) ? 'move' : 'copy'; - $upload_mode = ($this->local) ? 'local' : $upload_mode; - $this->destination_file = $this->destination_path . '/' . basename($this->realname); - - // Check if the file already exist, else there is something wrong... - if (file_exists($this->destination_file) && !$overwrite) - { - @unlink($this->filename); - } - else - { - if (file_exists($this->destination_file)) - { - @unlink($this->destination_file); - } - - switch ($upload_mode) - { - case 'copy': - - if (!@copy($this->filename, $this->destination_file)) - { - if (!@move_uploaded_file($this->filename, $this->destination_file)) - { - $this->error[] = sprintf($user->lang[$this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR'], $this->destination_file); - return false; - } - } - - @unlink($this->filename); - - break; - - case 'move': - - if (!@move_uploaded_file($this->filename, $this->destination_file)) - { - if (!@copy($this->filename, $this->destination_file)) - { - $this->error[] = sprintf($user->lang[$this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR'], $this->destination_file); - return false; - } - } - - @unlink($this->filename); - - break; - - case 'local': - - if (!@copy($this->filename, $this->destination_file)) - { - $this->error[] = sprintf($user->lang[$this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR'], $this->destination_file); - return false; - } - @unlink($this->filename); - - break; - } - - @chmod($this->destination_file, $chmod); - } - - // Try to get real filesize from destination folder - $this->filesize = (@filesize($this->destination_file)) ? @filesize($this->destination_file) : $this->filesize; - - if ($this->is_image() && !$skip_image_check) - { - $this->width = $this->height = 0; - - if (($this->image_info = @getimagesize($this->destination_file)) !== false) - { - $this->width = $this->image_info[0]; - $this->height = $this->image_info[1]; - - if (!empty($this->image_info['mime'])) - { - $this->mimetype = $this->image_info['mime']; - } - - // Check image type - $types = $this->upload->image_types(); - - if (!isset($types[$this->image_info[2]]) || !in_array($this->extension, $types[$this->image_info[2]])) - { - if (!isset($types[$this->image_info[2]])) - { - $this->error[] = sprintf($user->lang['IMAGE_FILETYPE_INVALID'], $this->image_info[2], $this->mimetype); - } - else - { - $this->error[] = sprintf($user->lang['IMAGE_FILETYPE_MISMATCH'], $types[$this->image_info[2]][0], $this->extension); - } - } - - // Make sure the dimensions match a valid image - if (empty($this->width) || empty($this->height)) - { - $this->error[] = $user->lang['ATTACHED_IMAGE_NOT_IMAGE']; - } - } - else - { - $this->error[] = $user->lang['UNABLE_GET_IMAGE_SIZE']; - } - } - - $this->file_moved = true; - $this->additional_checks(); - unset($this->upload); - - return true; - } - - /** - * Performing additional checks - */ - function additional_checks() - { - global $user; - - if (!$this->file_moved) - { - return false; - } - - // Filesize is too big or it's 0 if it was larger than the maxsize in the upload form - if ($this->upload->max_filesize && ($this->get('filesize') > $this->upload->max_filesize || $this->filesize == 0)) - { - $size_lang = ($this->upload->max_filesize >= 1048576) ? $user->lang['MB'] : (($this->upload->max_filesize >= 1024) ? $user->lang['KB'] : $user->lang['BYTES'] ); - $max_filesize = get_formatted_filesize($this->upload->max_filesize, false); - - $this->error[] = sprintf($user->lang[$this->upload->error_prefix . 'WRONG_FILESIZE'], $max_filesize, $size_lang); - - return false; - } - - if (!$this->upload->valid_dimensions($this)) - { - $this->error[] = sprintf($user->lang[$this->upload->error_prefix . 'WRONG_SIZE'], $this->upload->min_width, $this->upload->min_height, $this->upload->max_width, $this->upload->max_height, $this->width, $this->height); - - return false; - } - - return true; - } -} - -/** -* Class for assigning error messages before a real filespec class can be assigned -* -* @package phpBB3 -*/ -class fileerror extends filespec -{ - function fileerror($error_msg) - { - $this->error[] = $error_msg; - } -} - -/** -* File upload class -* Init class (all parameters optional and able to be set/overwritten separately) - scope is global and valid for all uploads -* -* @package phpBB3 -*/ -class fileupload -{ - var $allowed_extensions = array(); - var $max_filesize = 0; - var $min_width = 0; - var $min_height = 0; - var $max_width = 0; - var $max_height = 0; - var $error_prefix = ''; - - /** - * Init file upload class. - * - * @param string $error_prefix Used error messages will get prefixed by this string - * @param array $allowed_extensions Array of allowed extensions, for example array('jpg', 'jpeg', 'gif', 'png') - * @param int $max_filesize Maximum filesize - * @param int $min_width Minimum image width (only checked for images) - * @param int $min_height Minimum image height (only checked for images) - * @param int $max_width Maximum image width (only checked for images) - * @param int $max_height Maximum image height (only checked for images) - * - */ - function __construct($error_prefix = '', $allowed_extensions = false, $max_filesize = false, $min_width = false, $min_height = false, $max_width = false, $max_height = false) - { - $this->set_allowed_extensions($allowed_extensions); - $this->set_max_filesize($max_filesize); - $this->set_allowed_dimensions($min_width, $min_height, $max_width, $max_height); - $this->set_error_prefix($error_prefix); - } - - /** - * Reset vars - */ - function reset_vars() - { - $this->max_filesize = 0; - $this->min_width = $this->min_height = $this->max_width = $this->max_height = 0; - $this->error_prefix = ''; - $this->allowed_extensions = array(); - } - - /** - * Set allowed extensions - */ - function set_allowed_extensions($allowed_extensions) - { - if ($allowed_extensions !== false && is_array($allowed_extensions)) - { - $this->allowed_extensions = $allowed_extensions; - } - } - - /** - * Set allowed dimensions - */ - function set_allowed_dimensions($min_width, $min_height, $max_width, $max_height) - { - $this->min_width = (int) $min_width; - $this->min_height = (int) $min_height; - $this->max_width = (int) $max_width; - $this->max_height = (int) $max_height; - } - - /** - * Set maximum allowed filesize - */ - function set_max_filesize($max_filesize) - { - if ($max_filesize !== false && (int) $max_filesize) - { - $this->max_filesize = (int) $max_filesize; - } - } - - /** - * Set error prefix - */ - function set_error_prefix($error_prefix) - { - $this->error_prefix = $error_prefix; - } - - /** - * Form upload method - * Upload file from users harddisk - * - * @param string $form_name Form name assigned to the file input field (if it is an array, the key has to be specified) - * @return object $file Object "filespec" is returned, all further operations can be done with this object - * @access public - */ - function form_upload($form_name) - { - global $user; - - unset($_FILES[$form_name]['local_mode']); - $file = new filespec($_FILES[$form_name], $this); - - if ($file->init_error) - { - $file->error[] = ''; - return $file; - } - - // Error array filled? - if (isset($_FILES[$form_name]['error'])) - { - $error = $this->assign_internal_error($_FILES[$form_name]['error']); - - if ($error !== false) - { - $file->error[] = $error; - return $file; - } - } - - // Check if empty file got uploaded (not catched by is_uploaded_file) - if (isset($_FILES[$form_name]['size']) && $_FILES[$form_name]['size'] == 0) - { - $file->error[] = $user->lang[$this->error_prefix . 'EMPTY_FILEUPLOAD']; - return $file; - } - - // PHP Upload filesize exceeded - if ($file->get('filename') == 'none') - { - $file->error[] = (@ini_get('upload_max_filesize') == '') ? $user->lang[$this->error_prefix . 'PHP_SIZE_NA'] : sprintf($user->lang[$this->error_prefix . 'PHP_SIZE_OVERRUN'], @ini_get('upload_max_filesize')); - return $file; - } - - // Not correctly uploaded - if (!$file->is_uploaded()) - { - $file->error[] = $user->lang[$this->error_prefix . 'NOT_UPLOADED']; - return $file; - } - - $this->common_checks($file); - - return $file; - } - - /** - * Move file from another location to phpBB - */ - function local_upload($source_file, $filedata = false) - { - global $user; - - $form_name = 'local'; - - $_FILES[$form_name]['local_mode'] = true; - $_FILES[$form_name]['tmp_name'] = $source_file; - - if ($filedata === false) - { - $_FILES[$form_name]['name'] = basename($source_file); - $_FILES[$form_name]['size'] = 0; - $mimetype = ''; - - if (function_exists('mime_content_type')) - { - $mimetype = mime_content_type($source_file); - } - - // Some browsers choke on a mimetype of application/octet-stream - if (!$mimetype || $mimetype == 'application/octet-stream') - { - $mimetype = 'application/octetstream'; - } - - $_FILES[$form_name]['type'] = $mimetype; - } - else - { - $_FILES[$form_name]['name'] = $filedata['realname']; - $_FILES[$form_name]['size'] = $filedata['size']; - $_FILES[$form_name]['type'] = $filedata['type']; - } - - $file = new filespec($_FILES[$form_name], $this); - - if ($file->init_error) - { - $file->error[] = ''; - return $file; - } - - if (isset($_FILES[$form_name]['error'])) - { - $error = $this->assign_internal_error($_FILES[$form_name]['error']); - - if ($error !== false) - { - $file->error[] = $error; - return $file; - } - } - - // PHP Upload filesize exceeded - if ($file->get('filename') == 'none') - { - $file->error[] = (@ini_get('upload_max_filesize') == '') ? $user->lang[$this->error_prefix . 'PHP_SIZE_NA'] : sprintf($user->lang[$this->error_prefix . 'PHP_SIZE_OVERRUN'], @ini_get('upload_max_filesize')); - return $file; - } - - // Not correctly uploaded - if (!$file->is_uploaded()) - { - $file->error[] = $user->lang[$this->error_prefix . 'NOT_UPLOADED']; - return $file; - } - - $this->common_checks($file); - - return $file; - } - - /** - * Remote upload method - * Uploads file from given url - * - * @param string $upload_url URL pointing to file to upload, for example http://www.foobar.com/example.gif - * @return object $file Object "filespec" is returned, all further operations can be done with this object - * @access public - */ - function remote_upload($upload_url) - { - global $user, $phpbb_root_path; - - $upload_ary = array(); - $upload_ary['local_mode'] = true; - - if (!preg_match('#^(https?://).*?\.(' . implode('|', $this->allowed_extensions) . ')$#i', $upload_url, $match)) - { - $file = new fileerror($user->lang[$this->error_prefix . 'URL_INVALID']); - return $file; - } - - if (empty($match[2])) - { - $file = new fileerror($user->lang[$this->error_prefix . 'URL_INVALID']); - return $file; - } - - $url = parse_url($upload_url); - - $host = $url['host']; - $path = $url['path']; - $port = (!empty($url['port'])) ? (int) $url['port'] : 80; - - $upload_ary['type'] = 'application/octet-stream'; - - $url['path'] = explode('.', $url['path']); - $ext = array_pop($url['path']); - - $url['path'] = implode('', $url['path']); - $upload_ary['name'] = basename($url['path']) . (($ext) ? '.' . $ext : ''); - $filename = $url['path']; - $filesize = 0; - - $errno = 0; - $errstr = ''; - - if (!($fsock = @fsockopen($host, $port, $errno, $errstr))) - { - $file = new fileerror($user->lang[$this->error_prefix . 'NOT_UPLOADED']); - return $file; - } - - // Make sure $path not beginning with / - if (strpos($path, '/') === 0) - { - $path = substr($path, 1); - } - - fputs($fsock, 'GET /' . $path . " HTTP/1.1\r\n"); - fputs($fsock, "HOST: " . $host . "\r\n"); - fputs($fsock, "Connection: close\r\n\r\n"); - - $get_info = false; - $data = ''; - while (!@feof($fsock)) - { - if ($get_info) - { - $data .= @fread($fsock, 1024); - } - else - { - $line = @fgets($fsock, 1024); - - if ($line == "\r\n") - { - $get_info = true; - } - else - { - if (stripos($line, 'content-type: ') !== false) - { - $upload_ary['type'] = rtrim(str_replace('content-type: ', '', strtolower($line))); - } - else if (stripos($line, '404 not found') !== false) - { - $file = new fileerror($user->lang[$this->error_prefix . 'URL_NOT_FOUND']); - return $file; - } - } - } - } - @fclose($fsock); - - if (empty($data)) - { - $file = new fileerror($user->lang[$this->error_prefix . 'EMPTY_REMOTE_DATA']); - return $file; - } - - $tmp_path = (!@ini_get('safe_mode')) ? false : $phpbb_root_path . 'cache'; - $filename = tempnam($tmp_path, unique_id() . '-'); - - if (!($fp = @fopen($filename, 'wb'))) - { - $file = new fileerror($user->lang[$this->error_prefix . 'NOT_UPLOADED']); - return $file; - } - - $upload_ary['size'] = fwrite($fp, $data); - fclose($fp); - unset($data); - - $upload_ary['tmp_name'] = $filename; - - $file = new filespec($upload_ary, $this); - $this->common_checks($file); - - return $file; - } - - /** - * Assign internal error - * @access private - */ - function assign_internal_error($errorcode) - { - global $user; - - switch ($errorcode) - { - case 1: - $error = (@ini_get('upload_max_filesize') == '') ? $user->lang[$this->error_prefix . 'PHP_SIZE_NA'] : sprintf($user->lang[$this->error_prefix . 'PHP_SIZE_OVERRUN'], @ini_get('upload_max_filesize')); - break; - - case 2: - $size_lang = ($this->max_filesize >= 1048576) ? $user->lang['MB'] : (($this->max_filesize >= 1024) ? $user->lang['KB'] : $user->lang['BYTES'] ); - $max_filesize = get_formatted_filesize($this->max_filesize, false); - - $error = sprintf($user->lang[$this->error_prefix . 'WRONG_FILESIZE'], $max_filesize, $size_lang); - break; - - case 3: - $error = $user->lang[$this->error_prefix . 'PARTIAL_UPLOAD']; - break; - - case 4: - $error = $user->lang[$this->error_prefix . 'NOT_UPLOADED']; - break; - - case 6: - $error = 'Temporary folder could not be found. Please check your PHP installation.'; - break; - - default: - $error = false; - break; - } - - return $error; - } - - /** - * Perform common checks - */ - function common_checks(&$file) - { - global $user; - - // Filesize is too big or it's 0 if it was larger than the maxsize in the upload form - if ($this->max_filesize && ($file->get('filesize') > $this->max_filesize || $file->get('filesize') == 0)) - { - $size_lang = ($this->max_filesize >= 1048576) ? $user->lang['MB'] : (($this->max_filesize >= 1024) ? $user->lang['KB'] : $user->lang['BYTES'] ); - $max_filesize = get_formatted_filesize($this->max_filesize, false); - - $file->error[] = sprintf($user->lang[$this->error_prefix . 'WRONG_FILESIZE'], $max_filesize, $size_lang); - } - - // check Filename - if (preg_match("#[\\/:*?\"<>|]#i", $file->get('realname'))) - { - $file->error[] = sprintf($user->lang[$this->error_prefix . 'INVALID_FILENAME'], $file->get('realname')); - } - - // Invalid Extension - if (!$this->valid_extension($file)) - { - $file->error[] = sprintf($user->lang[$this->error_prefix . 'DISALLOWED_EXTENSION'], $file->get('extension')); - } - } - - /** - * Check for allowed extension - */ - function valid_extension(&$file) - { - return (in_array($file->get('extension'), $this->allowed_extensions)) ? true : false; - } - - /** - * Check for allowed dimension - */ - function valid_dimensions(&$file) - { - if (!$this->max_width && !$this->max_height && !$this->min_width && !$this->min_height) - { - return true; - } - - if (($file->get('width') > $this->max_width && $this->max_width) || - ($file->get('height') > $this->max_height && $this->max_height) || - ($file->get('width') < $this->min_width && $this->min_width) || - ($file->get('height') < $this->min_height && $this->min_height)) - { - return false; - } - - return true; - } - - /** - * Check if form upload is valid - */ - function is_valid($form_name) - { - return (isset($_FILES[$form_name]) && $_FILES[$form_name]['name'] != 'none') ? true : false; - } - - /** - * Return image type/extension mapping - */ - function image_types() - { - return array( - 1 => array('gif'), - 2 => array('jpg', 'jpeg'), - 3 => array('png'), - 4 => array('swf'), - 5 => array('psd'), - 6 => array('bmp'), - 7 => array('tif', 'tiff'), - 8 => array('tif', 'tiff'), - 9 => array('jpg', 'jpeg'), - 10 => array('jpg', 'jpeg'), - 11 => array('jpg', 'jpeg'), - 12 => array('jpg', 'jpeg'), - 13 => array('swc'), - 14 => array('iff'), - 15 => array('wbmp'), - 16 => array('xbm'), - ); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php deleted file mode 100644 index ded50fe0c0..0000000000 --- a/phpBB/includes/functions_user.php +++ /dev/null @@ -1,3264 +0,0 @@ -sql_in_set($sql_where, $sql_in); - - if ($user_type !== false && !empty($user_type)) - { - $sql .= ' AND ' . $db->sql_in_set('user_type', $user_type); - } - - $result = $db->sql_query($sql); - - if (!($row = $db->sql_fetchrow($result))) - { - $db->sql_freeresult($result); - return 'NO_USERS'; - } - - do - { - $username_ary[$row['user_id']] = $row['username']; - $user_id_ary[] = $row['user_id']; - } - while ($row = $db->sql_fetchrow($result)); - $db->sql_freeresult($result); - - return false; -} - -/** -* Get latest registered username and update database to reflect it -*/ -function update_last_username() -{ - global $db; - - // Get latest username - $sql = 'SELECT user_id, username, user_colour - FROM ' . USERS_TABLE . ' - WHERE user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ') - ORDER BY user_id DESC'; - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - set_config('newest_user_id', $row['user_id'], true); - set_config('newest_username', $row['username'], true); - set_config('newest_user_colour', $row['user_colour'], true); - } -} - -/** -* Updates a username across all relevant tables/fields -* -* @param string $old_name the old/current username -* @param string $new_name the new username -*/ -function user_update_name($old_name, $new_name) -{ - global $config, $db, $cache; - - $update_ary = array( - FORUMS_TABLE => array('forum_last_poster_name'), - MODERATOR_CACHE_TABLE => array('username'), - POSTS_TABLE => array('post_username'), - TOPICS_TABLE => array('topic_first_poster_name', 'topic_last_poster_name'), - ); - - foreach ($update_ary as $table => $field_ary) - { - foreach ($field_ary as $field) - { - $sql = "UPDATE $table - SET $field = '" . $db->sql_escape($new_name) . "' - WHERE $field = '" . $db->sql_escape($old_name) . "'"; - $db->sql_query($sql); - } - } - - if ($config['newest_username'] == $old_name) - { - set_config('newest_username', $new_name, true); - } - - // Because some tables/caches use username-specific data we need to purge this here. - $cache->destroy('sql', MODERATOR_CACHE_TABLE); -} - -/** -* Adds an user -* -* @param mixed $user_row An array containing the following keys (and the appropriate values): username, group_id (the group to place the user in), user_email and the user_type(usually 0). Additional entries not overridden by defaults will be forwarded. -* @param string $cp_data custom profile fields, see custom_profile::build_insert_sql_array -* @return: the new user's ID. -*/ -function user_add($user_row, $cp_data = false) -{ - global $db, $user, $auth, $config, $phpbb_root_path, $phpEx; - - if (empty($user_row['username']) || !isset($user_row['group_id']) || !isset($user_row['user_email']) || !isset($user_row['user_type'])) - { - return false; - } - - $username_clean = utf8_clean_string($user_row['username']); - - if (empty($username_clean)) - { - return false; - } - - $sql_ary = array( - 'username' => $user_row['username'], - 'username_clean' => $username_clean, - 'user_password' => (isset($user_row['user_password'])) ? $user_row['user_password'] : '', - 'user_pass_convert' => 0, - 'user_email' => strtolower($user_row['user_email']), - 'user_email_hash' => hexdec(crc32(strtolower($user_row['user_email'])) . strlen($user_row['user_email'])), - 'group_id' => $user_row['group_id'], - 'user_type' => $user_row['user_type'], - ); - - // These are the additional vars able to be specified - $additional_vars = array( - 'user_permissions' => '', - 'user_timezone' => $config['board_timezone'], - 'user_dateformat' => $config['default_dateformat'], - 'user_lang' => $config['default_lang'], - 'user_style' => $config['default_style'], - 'user_allow_pm' => 1, - 'user_actkey' => '', - 'user_ip' => '', - 'user_regdate' => time(), - 'user_passchg' => time(), - 'user_options' => 895, - - 'user_inactive_reason' => 0, - 'user_inactive_time' => 0, - 'user_lastmark' => time(), - 'user_lastvisit' => 0, - 'user_lastpost_time' => 0, - 'user_lastpage' => '', - 'user_posts' => 0, - 'user_dst' => (int) $config['board_dst'], - 'user_colour' => '', - 'user_occ' => '', - 'user_interests' => '', - 'user_avatar' => '', - 'user_avatar_type' => 0, - 'user_avatar_width' => 0, - 'user_avatar_height' => 0, - 'user_new_privmsg' => 0, - 'user_unread_privmsg' => 0, - 'user_last_privmsg' => 0, - 'user_message_rules' => 0, - 'user_full_folder' => PRIVMSGS_NO_BOX, - 'user_emailtime' => 0, - - 'user_notify' => 0, - 'user_notify_pm' => 1, - 'user_notify_type' => NOTIFY_EMAIL, - 'user_allow_pm' => 1, - 'user_allow_viewonline' => 1, - 'user_allow_viewemail' => 1, - 'user_allow_massemail' => 1, - - 'user_sig' => '', - 'user_sig_bbcode_uid' => '', - 'user_sig_bbcode_bitfield' => '', - - 'user_form_salt' => unique_id(), - ); - - // Now fill the sql array with not required variables - foreach ($additional_vars as $key => $default_value) - { - $sql_ary[$key] = (isset($user_row[$key])) ? $user_row[$key] : $default_value; - } - - // Any additional variables in $user_row not covered above? - $remaining_vars = array_diff(array_keys($user_row), array_keys($sql_ary)); - - // Now fill our sql array with the remaining vars - if (sizeof($remaining_vars)) - { - foreach ($remaining_vars as $key) - { - $sql_ary[$key] = $user_row[$key]; - } - } - - $sql = 'INSERT INTO ' . USERS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - $db->sql_query($sql); - - $user_id = $db->sql_nextid(); - - // Insert Custom Profile Fields - if ($cp_data !== false && sizeof($cp_data)) - { - $cp_data['user_id'] = (int) $user_id; - - if (!class_exists('custom_profile')) - { - include_once($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx); - } - - $sql = 'INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . ' ' . - $db->sql_build_array('INSERT', custom_profile::build_insert_sql_array($cp_data)); - $db->sql_query($sql); - } - - // Place into appropriate group... - $sql = 'INSERT INTO ' . USER_GROUP_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'user_id' => (int) $user_id, - 'group_id' => (int) $user_row['group_id'], - 'user_pending' => 0) - ); - $db->sql_query($sql); - - // Now make it the users default group... - group_set_user_default($user_row['group_id'], array($user_id), false); - - // set the newest user and adjust the user count if the user is a normal user and no activation mail is sent - if ($user_row['user_type'] == USER_NORMAL) - { - set_config('newest_user_id', $user_id, true); - set_config('newest_username', $user_row['username'], true); - set_config('num_users', $config['num_users'] + 1, true); - - $sql = 'SELECT group_colour - FROM ' . GROUPS_TABLE . ' - WHERE group_id = ' . (int) $user_row['group_id']; - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - set_config('newest_user_colour', $row['group_colour'], true); - } - - return $user_id; -} - -/** -* Remove User -*/ -function user_delete($mode, $user_id, $post_username = false) -{ - global $cache, $config, $db, $user, $auth; - global $phpbb_root_path, $phpEx; - - $sql = 'SELECT * - FROM ' . USERS_TABLE . ' - WHERE user_id = ' . $user_id; - $result = $db->sql_query($sql); - $user_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$user_row) - { - return false; - } - - $db->sql_transaction('begin'); - - // Before we begin, we will remove the reports the user issued. - $sql = 'SELECT r.post_id, p.topic_id - FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . ' p - WHERE r.user_id = ' . $user_id . ' - AND p.post_id = r.post_id'; - $result = $db->sql_query($sql); - - $report_posts = $report_topics = array(); - while ($row = $db->sql_fetchrow($result)) - { - $report_posts[] = $row['post_id']; - $report_topics[] = $row['topic_id']; - } - $db->sql_freeresult($result); - - if (sizeof($report_posts)) - { - $report_posts = array_unique($report_posts); - $report_topics = array_unique($report_topics); - - // Get a list of topics that still contain reported posts - $sql = 'SELECT DISTINCT topic_id - FROM ' . POSTS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $report_topics) . ' - AND post_reported = 1 - AND ' . $db->sql_in_set('post_id', $report_posts, true); - $result = $db->sql_query($sql); - - $keep_report_topics = array(); - while ($row = $db->sql_fetchrow($result)) - { - $keep_report_topics[] = $row['topic_id']; - } - $db->sql_freeresult($result); - - if (sizeof($keep_report_topics)) - { - $report_topics = array_diff($report_topics, $keep_report_topics); - } - unset($keep_report_topics); - - // Now set the flags back - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET post_reported = 0 - WHERE ' . $db->sql_in_set('post_id', $report_posts); - $db->sql_query($sql); - - if (sizeof($report_topics)) - { - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET topic_reported = 0 - WHERE ' . $db->sql_in_set('topic_id', $report_topics); - $db->sql_query($sql); - } - } - - // Remove reports - $db->sql_query('DELETE FROM ' . REPORTS_TABLE . ' WHERE user_id = ' . $user_id); - - if ($user_row['user_avatar'] && $user_row['user_avatar_type'] == AVATAR_UPLOAD) - { - avatar_delete('user', $user_row); - } - - switch ($mode) - { - case 'retain': - - if ($post_username === false) - { - $post_username = $user->lang['GUEST']; - } - - // If the user is inactive and newly registered we assume no posts from this user being there... - if ($user_row['user_type'] == USER_INACTIVE && $user_row['user_inactive_reason'] == INACTIVE_REGISTER && !$user_row['user_posts']) - { - } - else - { - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET forum_last_poster_id = ' . ANONYMOUS . ", forum_last_poster_name = '" . $db->sql_escape($post_username) . "', forum_last_poster_colour = '' - WHERE forum_last_poster_id = $user_id"; - $db->sql_query($sql); - - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET poster_id = ' . ANONYMOUS . ", post_username = '" . $db->sql_escape($post_username) . "' - WHERE poster_id = $user_id"; - $db->sql_query($sql); - - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET post_edit_user = ' . ANONYMOUS . " - WHERE post_edit_user = $user_id"; - $db->sql_query($sql); - - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET topic_poster = ' . ANONYMOUS . ", topic_first_poster_name = '" . $db->sql_escape($post_username) . "', topic_first_poster_colour = '' - WHERE topic_poster = $user_id"; - $db->sql_query($sql); - - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET topic_last_poster_id = ' . ANONYMOUS . ", topic_last_poster_name = '" . $db->sql_escape($post_username) . "', topic_last_poster_colour = '' - WHERE topic_last_poster_id = $user_id"; - $db->sql_query($sql); - - // Since we change every post by this author, we need to count this amount towards the anonymous user - - // Update the post count for the anonymous user - if ($user_row['user_posts']) - { - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_posts = user_posts + ' . $user_row['user_posts'] . ' - WHERE user_id = ' . ANONYMOUS; - $db->sql_query($sql); - } - } - break; - - case 'remove': - - if (!function_exists('delete_posts')) - { - include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); - } - - $sql = 'SELECT topic_id, COUNT(post_id) AS total_posts - FROM ' . POSTS_TABLE . " - WHERE poster_id = $user_id - GROUP BY topic_id"; - $result = $db->sql_query($sql); - - $topic_id_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - $topic_id_ary[$row['topic_id']] = $row['total_posts']; - } - $db->sql_freeresult($result); - - if (sizeof($topic_id_ary)) - { - $sql = 'SELECT topic_id, topic_replies, topic_replies_real - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', array_keys($topic_id_ary)); - $result = $db->sql_query($sql); - - $del_topic_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - if (max($row['topic_replies'], $row['topic_replies_real']) + 1 == $topic_id_ary[$row['topic_id']]) - { - $del_topic_ary[] = $row['topic_id']; - } - } - $db->sql_freeresult($result); - - if (sizeof($del_topic_ary)) - { - $sql = 'DELETE FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $del_topic_ary); - $db->sql_query($sql); - } - } - - // Delete posts, attachments, etc. - delete_posts('poster_id', $user_id); - - break; - } - - $table_ary = array(USERS_TABLE, USER_GROUP_TABLE, TOPICS_WATCH_TABLE, FORUMS_WATCH_TABLE, ACL_USERS_TABLE, TOPICS_TRACK_TABLE, TOPICS_POSTED_TABLE, FORUMS_TRACK_TABLE, PROFILE_FIELDS_DATA_TABLE, MODERATOR_CACHE_TABLE); - - foreach ($table_ary as $table) - { - $sql = "DELETE FROM $table - WHERE user_id = $user_id"; - $db->sql_query($sql); - } - - $cache->destroy('sql', MODERATOR_CACHE_TABLE); - - // Remove any undelivered mails... - $sql = 'SELECT msg_id, user_id - FROM ' . PRIVMSGS_TO_TABLE . ' - WHERE author_id = ' . $user_id . ' - AND folder_id = ' . PRIVMSGS_NO_BOX; - $result = $db->sql_query($sql); - - $undelivered_msg = $undelivered_user = array(); - while ($row = $db->sql_fetchrow($result)) - { - $undelivered_msg[] = $row['msg_id']; - $undelivered_user[$row['user_id']][] = true; - } - $db->sql_freeresult($result); - - if (sizeof($undelivered_msg)) - { - $sql = 'DELETE FROM ' . PRIVMSGS_TABLE . ' - WHERE ' . $db->sql_in_set('msg_id', $undelivered_msg); - $db->sql_query($sql); - } - - $sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . ' - WHERE author_id = ' . $user_id . ' - AND folder_id = ' . PRIVMSGS_NO_BOX; - $db->sql_query($sql); - - // Delete all to-information - $sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . ' - WHERE user_id = ' . $user_id; - $db->sql_query($sql); - - // Set the remaining author id to anonymous - this way users are still able to read messages from users being removed - $sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . ' - SET author_id = ' . ANONYMOUS . ' - WHERE author_id = ' . $user_id; - $db->sql_query($sql); - - $sql = 'UPDATE ' . PRIVMSGS_TABLE . ' - SET author_id = ' . ANONYMOUS . ' - WHERE author_id = ' . $user_id; - $db->sql_query($sql); - - foreach ($undelivered_user as $_user_id => $ary) - { - if ($_user_id == $user_id) - { - continue; - } - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_new_privmsg = user_new_privmsg - ' . sizeof($ary) . ', - user_unread_privmsg = user_unread_privmsg - ' . sizeof($ary) . ' - WHERE user_id = ' . $_user_id; - $db->sql_query($sql); - } - - // Reset newest user info if appropriate - if ($config['newest_user_id'] == $user_id) - { - update_last_username(); - } - - // Decrement number of users if this user is active - if ($user_row['user_type'] != USER_INACTIVE && $user_row['user_type'] != USER_IGNORE) - { - set_config('num_users', $config['num_users'] - 1, true); - } - - $db->sql_transaction('commit'); - - return false; -} - -/** -* Flips user_type from active to inactive and vice versa, handles group membership updates -* -* @param string $mode can be flip for flipping from active/inactive, activate or deactivate -*/ -function user_active_flip($mode, $user_id_ary, $reason = INACTIVE_MANUAL) -{ - global $config, $db, $user, $auth; - - $deactivated = $activated = 0; - $sql_statements = array(); - - if (!is_array($user_id_ary)) - { - $user_id_ary = array($user_id_ary); - } - - if (!sizeof($user_id_ary)) - { - return; - } - - $sql = 'SELECT user_id, group_id, user_type, user_inactive_reason - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', $user_id_ary); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $sql_ary = array(); - - if ($row['user_type'] == USER_IGNORE || $row['user_type'] == USER_FOUNDER || - ($mode == 'activate' && $row['user_type'] != USER_INACTIVE) || - ($mode == 'deactivate' && $row['user_type'] == USER_INACTIVE)) - { - continue; - } - - if ($row['user_type'] == USER_INACTIVE) - { - $activated++; - } - else - { - $deactivated++; - - // Remove the users session key... - $user->reset_login_keys($row['user_id']); - } - - $sql_ary += array( - 'user_type' => ($row['user_type'] == USER_NORMAL) ? USER_INACTIVE : USER_NORMAL, - 'user_inactive_time' => ($row['user_type'] == USER_NORMAL) ? time() : 0, - 'user_inactive_reason' => ($row['user_type'] == USER_NORMAL) ? $reason : 0, - ); - - $sql_statements[$row['user_id']] = $sql_ary; - } - $db->sql_freeresult($result); - - if (sizeof($sql_statements)) - { - foreach ($sql_statements as $user_id => $sql_ary) - { - $sql = 'UPDATE ' . USERS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_id = ' . $user_id; - $db->sql_query($sql); - } - - $auth->acl_clear_prefetch(array_keys($sql_statements)); - } - - if ($deactivated) - { - set_config('num_users', $config['num_users'] - $deactivated, true); - } - - if ($activated) - { - set_config('num_users', $config['num_users'] + $activated, true); - } - - // Update latest username - update_last_username(); -} - -/** -* Add a ban or ban exclusion to the banlist. Bans either a user, an IP or an email address -* -* @param string $mode Type of ban. One of the following: user, ip, email -* @param mixed $ban Banned entity. Either string or array with usernames, ips or email addresses -* @param int $ban_len Ban length in minutes -* @param string $ban_len_other Ban length as a date (YYYY-MM-DD) -* @param boolean $ban_exclude Exclude these entities from banning? -* @param string $ban_reason String describing the reason for this ban -* @return boolean -*/ -function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reason, $ban_give_reason = '') -{ - global $db, $user, $auth, $cache; - - // Delete stale bans - $sql = 'DELETE FROM ' . BANLIST_TABLE . ' - WHERE ban_end < ' . time() . ' - AND ban_end <> 0'; - $db->sql_query($sql); - - $ban_list = (!is_array($ban)) ? array_unique(explode("\n", $ban)) : $ban; - $ban_list_log = implode(', ', $ban_list); - - $current_time = time(); - - // Set $ban_end to the unix time when the ban should end. 0 is a permanent ban. - if ($ban_len) - { - if ($ban_len != -1 || !$ban_len_other) - { - $ban_end = max($current_time, $current_time + ($ban_len) * 60); - } - else - { - $ban_other = explode('-', $ban_len_other); - if (sizeof($ban_other) == 3 && ((int)$ban_other[0] < 9999) && - (strlen($ban_other[0]) == 4) && (strlen($ban_other[1]) == 2) && (strlen($ban_other[2]) == 2)) - { - $ban_end = max($current_time, gmmktime(0, 0, 0, (int)$ban_other[1], (int)$ban_other[2], (int)$ban_other[0])); - } - else - { - trigger_error('LENGTH_BAN_INVALID'); - } - } - } - else - { - $ban_end = 0; - } - - $founder = $founder_names = array(); - - if (!$ban_exclude) - { - // Create a list of founder... - $sql = 'SELECT user_id, user_email, username_clean - FROM ' . USERS_TABLE . ' - WHERE user_type = ' . USER_FOUNDER; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $founder[$row['user_id']] = $row['user_email']; - $founder_names[$row['user_id']] = $row['username_clean']; - } - $db->sql_freeresult($result); - } - - $banlist_ary = array(); - - switch ($mode) - { - case 'user': - $type = 'ban_userid'; - - if (in_array('*', $ban_list)) - { - // Ban all users (it's a good thing that you can exclude people) - $banlist_ary[] = '*'; - } - else - { - // Select the relevant user_ids. - $sql_usernames = array(); - - foreach ($ban_list as $username) - { - $username = trim($username); - if ($username != '') - { - $clean_name = utf8_clean_string($username); - if ($clean_name == $user->data['username_clean']) - { - trigger_error('CANNOT_BAN_YOURSELF', E_USER_WARNING); - } - if (in_array($clean_name, $founder_names)) - { - trigger_error('CANNOT_BAN_FOUNDER', E_USER_WARNING); - } - $sql_usernames[] = $clean_name; - } - } - - // Make sure we have been given someone to ban - if (!sizeof($sql_usernames)) - { - trigger_error('NO_USER_SPECIFIED'); - } - - $sql = 'SELECT user_id - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('username_clean', $sql_usernames); - - // Do not allow banning yourself - if (sizeof($founder)) - { - $sql .= ' AND ' . $db->sql_in_set('user_id', array_merge(array_keys($founder), array($user->data['user_id'])), true); - } - else - { - $sql .= ' AND user_id <> ' . $user->data['user_id']; - } - - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - do - { - $banlist_ary[] = (int) $row['user_id']; - } - while ($row = $db->sql_fetchrow($result)); - } - else - { - trigger_error('NO_USERS'); - } - $db->sql_freeresult($result); - } - break; - - case 'ip': - $type = 'ban_ip'; - - foreach ($ban_list as $ban_item) - { - if (preg_match('#^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})[ ]*\-[ ]*([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$#', trim($ban_item), $ip_range_explode)) - { - // This is an IP range - // Don't ask about all this, just don't ask ... ! - $ip_1_counter = $ip_range_explode[1]; - $ip_1_end = $ip_range_explode[5]; - - while ($ip_1_counter <= $ip_1_end) - { - $ip_2_counter = ($ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[2] : 0; - $ip_2_end = ($ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[6]; - - if ($ip_2_counter == 0 && $ip_2_end == 254) - { - $ip_2_counter = 256; - $ip_2_fragment = 256; - - $banlist_ary[] = "$ip_1_counter.*"; - } - - while ($ip_2_counter <= $ip_2_end) - { - $ip_3_counter = ($ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[3] : 0; - $ip_3_end = ($ip_2_counter < $ip_2_end || $ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[7]; - - if ($ip_3_counter == 0 && $ip_3_end == 254) - { - $ip_3_counter = 256; - $ip_3_fragment = 256; - - $banlist_ary[] = "$ip_1_counter.$ip_2_counter.*"; - } - - while ($ip_3_counter <= $ip_3_end) - { - $ip_4_counter = ($ip_3_counter == $ip_range_explode[3] && $ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[4] : 0; - $ip_4_end = ($ip_3_counter < $ip_3_end || $ip_2_counter < $ip_2_end) ? 254 : $ip_range_explode[8]; - - if ($ip_4_counter == 0 && $ip_4_end == 254) - { - $ip_4_counter = 256; - $ip_4_fragment = 256; - - $banlist_ary[] = "$ip_1_counter.$ip_2_counter.$ip_3_counter.*"; - } - - while ($ip_4_counter <= $ip_4_end) - { - $banlist_ary[] = "$ip_1_counter.$ip_2_counter.$ip_3_counter.$ip_4_counter"; - $ip_4_counter++; - } - $ip_3_counter++; - } - $ip_2_counter++; - } - $ip_1_counter++; - } - } - else if (preg_match('#^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$#', trim($ban_item)) || preg_match('#^[a-f0-9:]+\*?$#i', trim($ban_item))) - { - // Normal IP address - $banlist_ary[] = trim($ban_item); - } - else if (preg_match('#^\*$#', trim($ban_item))) - { - // Ban all IPs - $banlist_ary[] = '*'; - } - else if (preg_match('#^([\w\-_]\.?){2,}$#is', trim($ban_item))) - { - // hostname - $ip_ary = gethostbynamel(trim($ban_item)); - - if (!empty($ip_ary)) - { - foreach ($ip_ary as $ip) - { - if ($ip) - { - if (strlen($ip) > 40) - { - continue; - } - - $banlist_ary[] = $ip; - } - } - } - } - else - { - trigger_error('NO_IPS_DEFINED'); - } - } - break; - - case 'email': - $type = 'ban_email'; - - foreach ($ban_list as $ban_item) - { - $ban_item = trim($ban_item); - - if (preg_match('#^.*?@*|(([a-z0-9\-]+\.)+([a-z]{2,3}))$#i', $ban_item)) - { - if (strlen($ban_item) > 100) - { - continue; - } - - if (!sizeof($founder) || !in_array($ban_item, $founder)) - { - $banlist_ary[] = $ban_item; - } - } - } - - if (sizeof($ban_list) == 0) - { - trigger_error('NO_EMAILS_DEFINED'); - } - break; - - default: - trigger_error('NO_MODE'); - break; - } - - // Fetch currently set bans of the specified type and exclude state. Prevent duplicate bans. - $sql_where = ($type == 'ban_userid') ? 'ban_userid <> 0' : "$type <> ''"; - - $sql = "SELECT $type - FROM " . BANLIST_TABLE . " - WHERE $sql_where - AND ban_exclude = $ban_exclude"; - $result = $db->sql_query($sql); - - // Reset $sql_where, because we use it later... - $sql_where = ''; - - if ($row = $db->sql_fetchrow($result)) - { - $banlist_ary_tmp = array(); - do - { - switch ($mode) - { - case 'user': - $banlist_ary_tmp[] = $row['ban_userid']; - break; - - case 'ip': - $banlist_ary_tmp[] = $row['ban_ip']; - break; - - case 'email': - $banlist_ary_tmp[] = $row['ban_email']; - break; - } - } - while ($row = $db->sql_fetchrow($result)); - - $banlist_ary = array_unique(array_diff($banlist_ary, $banlist_ary_tmp)); - unset($banlist_ary_tmp); - } - $db->sql_freeresult($result); - - // We have some entities to ban - if (sizeof($banlist_ary)) - { - $sql_ary = array(); - - foreach ($banlist_ary as $ban_entry) - { - $sql_ary[] = array( - $type => $ban_entry, - 'ban_start' => (int) $current_time, - 'ban_end' => (int) $ban_end, - 'ban_exclude' => (int) $ban_exclude, - 'ban_reason' => (string) $ban_reason, - 'ban_give_reason' => (string) $ban_give_reason, - ); - } - - $db->sql_multi_insert(BANLIST_TABLE, $sql_ary); - - // If we are banning we want to logout anyone matching the ban - if (!$ban_exclude) - { - switch ($mode) - { - case 'user': - $sql_where = (in_array('*', $banlist_ary)) ? '' : 'WHERE ' . $db->sql_in_set('session_user_id', $banlist_ary); - break; - - case 'ip': - $sql_where = 'WHERE ' . $db->sql_in_set('session_ip', $banlist_ary); - break; - - case 'email': - $banlist_ary_sql = array(); - - foreach ($banlist_ary as $ban_entry) - { - $banlist_ary_sql[] = (string) str_replace('*', '%', $ban_entry); - } - - $sql = 'SELECT user_id - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_email', $banlist_ary_sql); - $result = $db->sql_query($sql); - - $sql_in = array(); - - if ($row = $db->sql_fetchrow($result)) - { - do - { - $sql_in[] = $row['user_id']; - } - while ($row = $db->sql_fetchrow($result)); - - $sql_where = 'WHERE ' . $db->sql_in_set('session_user_id', $sql_in); - } - $db->sql_freeresult($result); - break; - } - - if (isset($sql_where) && $sql_where) - { - $sql = 'DELETE FROM ' . SESSIONS_TABLE . " - $sql_where"; - $db->sql_query($sql); - - if ($mode == 'user') - { - $sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . ' ' . ((in_array('*', $banlist_ary)) ? '' : 'WHERE ' . $db->sql_in_set('user_id', $banlist_ary)); - $db->sql_query($sql); - } - } - } - - // Update log - $log_entry = ($ban_exclude) ? 'LOG_BAN_EXCLUDE_' : 'LOG_BAN_'; - - // Add to moderator and admin log - add_log('admin', $log_entry . strtoupper($mode), $ban_reason, $ban_list_log); - add_log('mod', 0, 0, $log_entry . strtoupper($mode), $ban_reason, $ban_list_log); - - $cache->destroy('sql', BANLIST_TABLE); - - return true; - } - - // There was nothing to ban/exclude. But destroying the cache because of the removal of stale bans. - $cache->destroy('sql', BANLIST_TABLE); - - return false; -} - -/** -* Unban User -*/ -function user_unban($mode, $ban) -{ - global $db, $user, $auth, $cache; - - // Delete stale bans - $sql = 'DELETE FROM ' . BANLIST_TABLE . ' - WHERE ban_end < ' . time() . ' - AND ban_end <> 0'; - $db->sql_query($sql); - - if (!is_array($ban)) - { - $ban = array($ban); - } - - $unban_sql = array_map('intval', $ban); - - if (sizeof($unban_sql)) - { - // Grab details of bans for logging information later - switch ($mode) - { - case 'user': - $sql = 'SELECT u.username AS unban_info - FROM ' . USERS_TABLE . ' u, ' . BANLIST_TABLE . ' b - WHERE ' . $db->sql_in_set('b.ban_id', $unban_sql) . ' - AND u.user_id = b.ban_userid'; - break; - - case 'email': - $sql = 'SELECT ban_email AS unban_info - FROM ' . BANLIST_TABLE . ' - WHERE ' . $db->sql_in_set('ban_id', $unban_sql); - break; - - case 'ip': - $sql = 'SELECT ban_ip AS unban_info - FROM ' . BANLIST_TABLE . ' - WHERE ' . $db->sql_in_set('ban_id', $unban_sql); - break; - } - $result = $db->sql_query($sql); - - $l_unban_list = ''; - while ($row = $db->sql_fetchrow($result)) - { - $l_unban_list .= (($l_unban_list != '') ? ', ' : '') . $row['unban_info']; - } - $db->sql_freeresult($result); - - $sql = 'DELETE FROM ' . BANLIST_TABLE . ' - WHERE ' . $db->sql_in_set('ban_id', $unban_sql); - $db->sql_query($sql); - - // Add to moderator and admin log - add_log('admin', 'LOG_UNBAN_' . strtoupper($mode), $l_unban_list); - add_log('mod', 0, 0, 'LOG_UNBAN_' . strtoupper($mode), $l_unban_list); - } - - $cache->destroy('sql', BANLIST_TABLE); - - return false; -} - -/** -* Whois facility -*/ -function user_ipwhois($ip) -{ - $ipwhois = ''; - - // Check IP - // Only supporting IPv4 at the moment... - if (empty($ip) || !preg_match(get_preg_expression('ipv4'), $ip)) - { - return ''; - } - - $match = array( - '#RIPE\.NET#is' => 'whois.ripe.net', - '#whois\.apnic\.net#is' => 'whois.apnic.net', - '#nic\.ad\.jp#is' => 'whois.nic.ad.jp', - '#whois\.registro\.br#is' => 'whois.registro.br' - ); - - if (($fsk = @fsockopen('whois.arin.net', 43))) - { - fputs($fsk, "$ip\n"); - while (!feof($fsk)) - { - $ipwhois .= fgets($fsk, 1024); - } - @fclose($fsk); - } - - foreach (array_keys($match) as $server) - { - if (preg_match($server, $ipwhois)) - { - $ipwhois = ''; - if (($fsk = @fsockopen($match[$server], 43))) - { - fputs($fsk, "$ip\n"); - while (!feof($fsk)) - { - $ipwhois .= fgets($fsk, 1024); - } - @fclose($fsk); - } - break; - } - } - - $ipwhois = htmlspecialchars($ipwhois); - - // Magic URL ;) - return trim(make_clickable($ipwhois, false, '')); -} - -/** -* Data validation ... used primarily but not exclusively by ucp modules -* -* "Master" function for validating a range of data types -*/ -function validate_data($data, $val_ary) -{ - $error = array(); - - foreach ($val_ary as $var => $val_seq) - { - if (!is_array($val_seq[0])) - { - $val_seq = array($val_seq); - } - - foreach ($val_seq as $validate) - { - $function = array_shift($validate); - array_unshift($validate, $data[$var]); - - if ($result = call_user_func_array('validate_' . $function, $validate)) - { - $error[] = $result . '_' . strtoupper($var); - } - } - } - - return $error; -} - -/** -* Validate String -* -* @return boolean|string Either false if validation succeeded or a string which will be used as the error message (with the variable name appended) -*/ -function validate_string($string, $optional = false, $min = 0, $max = 0) -{ - if (empty($string) && $optional) - { - return false; - } - - if ($min && utf8_strlen(htmlspecialchars_decode($string)) < $min) - { - return 'TOO_SHORT'; - } - else if ($max && utf8_strlen(htmlspecialchars_decode($string)) > $max) - { - return 'TOO_LONG'; - } - - return false; -} - -/** -* Validate Number -* -* @return boolean|string Either false if validation succeeded or a string which will be used as the error message (with the variable name appended) -*/ -function validate_num($num, $optional = false, $min = 0, $max = 1E99) -{ - if (empty($num) && $optional) - { - return false; - } - - if ($num < $min) - { - return 'TOO_SMALL'; - } - else if ($num > $max) - { - return 'TOO_LARGE'; - } - - return false; -} - -/** -* Validate Date -* @param String $string a date in the dd-mm-yyyy format -* @return boolean -*/ -function validate_date($date_string, $optional = false) -{ - $date = explode('-', $date_string); - if ((empty($date) || sizeof($date) != 3) && $optional) - { - return false; - } - else if ($optional) - { - for ($field = 0; $field <= 1; $field++) - { - $date[$field] = (int) $date[$field]; - if (empty($date[$field])) - { - $date[$field] = 1; - } - } - $date[2] = (int) $date[2]; - // assume an arbitrary leap year - if (empty($date[2])) - { - $date[2] = 1980; - } - } - - if (sizeof($date) != 3 || !checkdate($date[1], $date[0], $date[2])) - { - return 'INVALID'; - } - - return false; -} - - -/** -* Validate Match -* -* @return boolean|string Either false if validation succeeded or a string which will be used as the error message (with the variable name appended) -*/ -function validate_match($string, $optional = false, $match = '') -{ - if (empty($string) && $optional) - { - return false; - } - - if (empty($match)) - { - return false; - } - - if (!preg_match($match, $string)) - { - return 'WRONG_DATA'; - } - - return false; -} - -/** -* Check to see if the username has been taken, or if it is disallowed. -* Also checks if it includes the " character, which we don't allow in usernames. -* Used for registering, changing names, and posting anonymously with a username -* -* @param string $username The username to check -* @param string $allowed_username An allowed username, default being $user->data['username'] -* -* @return mixed Either false if validation succeeded or a string which will be used as the error message (with the variable name appended) -*/ -function validate_username($username, $allowed_username = false) -{ - global $config, $db, $user, $cache; - - $clean_username = utf8_clean_string($username); - $allowed_username = ($allowed_username === false) ? $user->data['username_clean'] : utf8_clean_string($allowed_username); - - if ($allowed_username == $clean_username) - { - return false; - } - - // ... fast checks first. - if (strpos($username, '"') !== false || strpos($username, '"') !== false || empty($clean_username)) - { - return 'INVALID_CHARS'; - } - - $mbstring = $pcre = false; - - // generic UTF-8 character types supported - switch ($config['allow_name_chars']) - { - case 'USERNAME_CHARS_ANY': - $regex = '.+'; - break; - - case 'USERNAME_ALPHA_ONLY': - $regex = '[A-Za-z0-9]+'; - break; - - case 'USERNAME_ALPHA_SPACERS': - $regex = '[A-Za-z0-9-[\]_+ ]+'; - break; - - case 'USERNAME_LETTER_NUM': - $regex = '[\p{Lu}\p{Ll}\p{N}]+'; - break; - - case 'USERNAME_LETTER_NUM_SPACERS': - $regex = '[-\]_+ [\p{Lu}\p{Ll}\p{N}]+'; - break; - - case 'USERNAME_ASCII': - default: - $regex = '[\x01-\x7F]+'; - break; - } - - if (!preg_match('#^' . $regex . '$#u', $username)) - { - return 'INVALID_CHARS'; - } - - $sql = 'SELECT username - FROM ' . USERS_TABLE . " - WHERE username_clean = '" . $db->sql_escape($clean_username) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - return 'USERNAME_TAKEN'; - } - - $sql = 'SELECT group_name - FROM ' . GROUPS_TABLE . " - WHERE group_name = '" . $db->sql_escape($clean_username) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - return 'USERNAME_TAKEN'; - } - - $bad_usernames = cache::obtain_disallowed_usernames(); - - foreach ($bad_usernames as $bad_username) - { - if (preg_match('#^' . $bad_username . '$#', $clean_username)) - { - return 'USERNAME_DISALLOWED'; - } - } - - return false; -} - -/** -* Check to see if the password meets the complexity settings -* -* @return boolean|string Either false if validation succeeded or a string which will be used as the error message (with the variable name appended) -*/ -function validate_password($password) -{ - global $config, $db, $user; - - if (!$password) - { - return false; - } - - // generic UTF-8 character types supported - $upp = '\p{Lu}'; - $low = '\p{Ll}'; - $let = '\p{L}'; - $num = '\p{N}'; - $sym = '[^\p{Lu}\p{Ll}\p{N}]'; - - $chars = array(); - - switch ($config['pass_complex']) - { - case 'PASS_TYPE_CASE': - $chars[] = $low; - $chars[] = $upp; - break; - - case 'PASS_TYPE_ALPHA': - $chars[] = $let; - $chars[] = $num; - break; - - case 'PASS_TYPE_SYMBOL': - $chars[] = $low; - $chars[] = $upp; - $chars[] = $num; - $chars[] = $sym; - break; - } - - if ($pcre) - { - foreach ($chars as $char) - { - if (!preg_match('#' . $char . '#u', $password)) - { - return 'INVALID_CHARS'; - } - } - } - else if ($mbstring) - { - foreach ($chars as $char) - { - if (mb_ereg($char, $password) === false) - { - return 'INVALID_CHARS'; - } - } - } - - return false; -} - -/** -* Check to see if email address is banned or already present in the DB -* -* @param string $email The email to check -* @param string $allowed_email An allowed email, default being $user->data['user_email'] -* -* @return mixed Either false if validation succeeded or a string which will be used as the error message (with the variable name appended) -*/ -function validate_email($email, $allowed_email = false) -{ - global $config, $db, $user; - - $email = strtolower($email); - $allowed_email = ($allowed_email === false) ? strtolower($user->data['user_email']) : strtolower($allowed_email); - - if ($allowed_email == $email) - { - return false; - } - - if (!preg_match('/^' . get_preg_expression('email') . '$/i', $email)) - { - return 'EMAIL_INVALID'; - } - - // Check MX record. - // The idea for this is from reading the UseBB blog/announcement. :) - if ($config['email_check_mx']) - { - list(, $domain) = explode('@', $email); - - if (phpbb_checkdnsrr($domain, 'A') === false && phpbb_checkdnsrr($domain, 'MX') === false) - { - return 'DOMAIN_NO_MX_RECORD'; - } - } - - if ($user->check_ban(false, false, $email, true) == true) - { - return 'EMAIL_BANNED'; - } - - if (!$config['allow_emailreuse']) - { - $sql = 'SELECT user_email_hash - FROM ' . USERS_TABLE . " - WHERE user_email_hash = " . hexdec(crc32($email) . strlen($email)); - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - return 'EMAIL_TAKEN'; - } - } - - return false; -} - -/** -* Validate jabber address -* Taken from the jabber class within flyspray (see author notes) -* -* @author flyspray.org -*/ -function validate_jabber($jid) -{ - if (!$jid) - { - return false; - } - - $seperator_pos = strpos($jid, '@'); - - if ($seperator_pos === false) - { - return 'WRONG_DATA'; - } - - $username = substr($jid, 0, $seperator_pos); - $realm = substr($jid, $seperator_pos + 1); - - if (strlen($username) == 0 || strlen($realm) < 3) - { - return 'WRONG_DATA'; - } - - $arr = explode('.', $realm); - - if (sizeof($arr) == 0) - { - return 'WRONG_DATA'; - } - - foreach ($arr as $part) - { - if (substr($part, 0, 1) == '-' || substr($part, -1, 1) == '-') - { - return 'WRONG_DATA'; - } - - if (!preg_match("@^[a-zA-Z0-9-.]+$@", $part)) - { - return 'WRONG_DATA'; - } - } - - $boundary = array(array(0, 127), array(192, 223), array(224, 239), array(240, 247), array(248, 251), array(252, 253)); - - // Prohibited Characters RFC3454 + RFC3920 - $prohibited = array( - // Table C.1.1 - array(0x0020, 0x0020), // SPACE - // Table C.1.2 - array(0x00A0, 0x00A0), // NO-BREAK SPACE - array(0x1680, 0x1680), // OGHAM SPACE MARK - array(0x2000, 0x2001), // EN QUAD - array(0x2001, 0x2001), // EM QUAD - array(0x2002, 0x2002), // EN SPACE - array(0x2003, 0x2003), // EM SPACE - array(0x2004, 0x2004), // THREE-PER-EM SPACE - array(0x2005, 0x2005), // FOUR-PER-EM SPACE - array(0x2006, 0x2006), // SIX-PER-EM SPACE - array(0x2007, 0x2007), // FIGURE SPACE - array(0x2008, 0x2008), // PUNCTUATION SPACE - array(0x2009, 0x2009), // THIN SPACE - array(0x200A, 0x200A), // HAIR SPACE - array(0x200B, 0x200B), // ZERO WIDTH SPACE - array(0x202F, 0x202F), // NARROW NO-BREAK SPACE - array(0x205F, 0x205F), // MEDIUM MATHEMATICAL SPACE - array(0x3000, 0x3000), // IDEOGRAPHIC SPACE - // Table C.2.1 - array(0x0000, 0x001F), // [CONTROL CHARACTERS] - array(0x007F, 0x007F), // DELETE - // Table C.2.2 - array(0x0080, 0x009F), // [CONTROL CHARACTERS] - array(0x06DD, 0x06DD), // ARABIC END OF AYAH - array(0x070F, 0x070F), // SYRIAC ABBREVIATION MARK - array(0x180E, 0x180E), // MONGOLIAN VOWEL SEPARATOR - array(0x200C, 0x200C), // ZERO WIDTH NON-JOINER - array(0x200D, 0x200D), // ZERO WIDTH JOINER - array(0x2028, 0x2028), // LINE SEPARATOR - array(0x2029, 0x2029), // PARAGRAPH SEPARATOR - array(0x2060, 0x2060), // WORD JOINER - array(0x2061, 0x2061), // FUNCTION APPLICATION - array(0x2062, 0x2062), // INVISIBLE TIMES - array(0x2063, 0x2063), // INVISIBLE SEPARATOR - array(0x206A, 0x206F), // [CONTROL CHARACTERS] - array(0xFEFF, 0xFEFF), // ZERO WIDTH NO-BREAK SPACE - array(0xFFF9, 0xFFFC), // [CONTROL CHARACTERS] - array(0x1D173, 0x1D17A), // [MUSICAL CONTROL CHARACTERS] - // Table C.3 - array(0xE000, 0xF8FF), // [PRIVATE USE, PLANE 0] - array(0xF0000, 0xFFFFD), // [PRIVATE USE, PLANE 15] - array(0x100000, 0x10FFFD), // [PRIVATE USE, PLANE 16] - // Table C.4 - array(0xFDD0, 0xFDEF), // [NONCHARACTER CODE POINTS] - array(0xFFFE, 0xFFFF), // [NONCHARACTER CODE POINTS] - array(0x1FFFE, 0x1FFFF), // [NONCHARACTER CODE POINTS] - array(0x2FFFE, 0x2FFFF), // [NONCHARACTER CODE POINTS] - array(0x3FFFE, 0x3FFFF), // [NONCHARACTER CODE POINTS] - array(0x4FFFE, 0x4FFFF), // [NONCHARACTER CODE POINTS] - array(0x5FFFE, 0x5FFFF), // [NONCHARACTER CODE POINTS] - array(0x6FFFE, 0x6FFFF), // [NONCHARACTER CODE POINTS] - array(0x7FFFE, 0x7FFFF), // [NONCHARACTER CODE POINTS] - array(0x8FFFE, 0x8FFFF), // [NONCHARACTER CODE POINTS] - array(0x9FFFE, 0x9FFFF), // [NONCHARACTER CODE POINTS] - array(0xAFFFE, 0xAFFFF), // [NONCHARACTER CODE POINTS] - array(0xBFFFE, 0xBFFFF), // [NONCHARACTER CODE POINTS] - array(0xCFFFE, 0xCFFFF), // [NONCHARACTER CODE POINTS] - array(0xDFFFE, 0xDFFFF), // [NONCHARACTER CODE POINTS] - array(0xEFFFE, 0xEFFFF), // [NONCHARACTER CODE POINTS] - array(0xFFFFE, 0xFFFFF), // [NONCHARACTER CODE POINTS] - array(0x10FFFE, 0x10FFFF), // [NONCHARACTER CODE POINTS] - // Table C.5 - array(0xD800, 0xDFFF), // [SURROGATE CODES] - // Table C.6 - array(0xFFF9, 0xFFF9), // INTERLINEAR ANNOTATION ANCHOR - array(0xFFFA, 0xFFFA), // INTERLINEAR ANNOTATION SEPARATOR - array(0xFFFB, 0xFFFB), // INTERLINEAR ANNOTATION TERMINATOR - array(0xFFFC, 0xFFFC), // OBJECT REPLACEMENT CHARACTER - array(0xFFFD, 0xFFFD), // REPLACEMENT CHARACTER - // Table C.7 - array(0x2FF0, 0x2FFB), // [IDEOGRAPHIC DESCRIPTION CHARACTERS] - // Table C.8 - array(0x0340, 0x0340), // COMBINING GRAVE TONE MARK - array(0x0341, 0x0341), // COMBINING ACUTE TONE MARK - array(0x200E, 0x200E), // LEFT-TO-RIGHT MARK - array(0x200F, 0x200F), // RIGHT-TO-LEFT MARK - array(0x202A, 0x202A), // LEFT-TO-RIGHT EMBEDDING - array(0x202B, 0x202B), // RIGHT-TO-LEFT EMBEDDING - array(0x202C, 0x202C), // POP DIRECTIONAL FORMATTING - array(0x202D, 0x202D), // LEFT-TO-RIGHT OVERRIDE - array(0x202E, 0x202E), // RIGHT-TO-LEFT OVERRIDE - array(0x206A, 0x206A), // INHIBIT SYMMETRIC SWAPPING - array(0x206B, 0x206B), // ACTIVATE SYMMETRIC SWAPPING - array(0x206C, 0x206C), // INHIBIT ARABIC FORM SHAPING - array(0x206D, 0x206D), // ACTIVATE ARABIC FORM SHAPING - array(0x206E, 0x206E), // NATIONAL DIGIT SHAPES - array(0x206F, 0x206F), // NOMINAL DIGIT SHAPES - // Table C.9 - array(0xE0001, 0xE0001), // LANGUAGE TAG - array(0xE0020, 0xE007F), // [TAGGING CHARACTERS] - // RFC3920 - array(0x22, 0x22), // " - array(0x26, 0x26), // & - array(0x27, 0x27), // ' - array(0x2F, 0x2F), // / - array(0x3A, 0x3A), // : - array(0x3C, 0x3C), // < - array(0x3E, 0x3E), // > - array(0x40, 0x40) // @ - ); - - $pos = 0; - $result = true; - - // @todo: rewrite this! - while ($pos < strlen($username)) - { - $len = $uni = 0; - for ($i = 0; $i <= 5; $i++) - { - if (ord($username[$pos]) >= $boundary[$i][0] && ord($username[$pos]) <= $boundary[$i][1]) - { - $len = $i + 1; - $uni = (ord($username[$pos]) - $boundary[$i][0]) * pow(2, $i * 6); - - for ($k = 1; $k < $len; $k++) - { - $uni += (ord($username[$pos + $k]) - 128) * pow(2, ($i - $k) * 6); - } - - break; - } - } - - if ($len == 0) - { - return 'WRONG_DATA'; - } - - foreach ($prohibited as $pval) - { - if ($uni >= $pval[0] && $uni <= $pval[1]) - { - $result = false; - break 2; - } - } - - $pos = $pos + $len; - } - - if (!$result) - { - return 'WRONG_DATA'; - } - - return false; -} - -/** -* Remove avatar -*/ -function avatar_delete($mode, $row, $clean_db = false) -{ - global $phpbb_root_path, $config, $db, $user; - - // Check if the users avatar is actually *not* a group avatar - if ($mode == 'user') - { - if (strpos($row['user_avatar'], 'g') === 0 || (((int)$row['user_avatar'] !== 0) && ((int)$row['user_avatar'] !== (int)$row['user_id']))) - { - return false; - } - } - - if ($clean_db) - { - avatar_remove_db($row[$mode . '_avatar']); - } - $filename = get_avatar_filename($row[$mode . '_avatar']); - if (file_exists($phpbb_root_path . $config['avatar_path'] . '/' . $filename)) - { - @unlink($phpbb_root_path . $config['avatar_path'] . '/' . $filename); - return true; - } - - return false; -} - -/** -* Remote avatar linkage -*/ -function avatar_remote($data, &$error) -{ - global $config, $db, $user, $phpbb_root_path, $phpEx; - - if (!preg_match('#^(http|https|ftp)://#i', $data['remotelink'])) - { - $data['remotelink'] = 'http://' . $data['remotelink']; - } - if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $data['remotelink'])) - { - $error[] = $user->lang['AVATAR_URL_INVALID']; - return false; - } - - // Make sure getimagesize works... - if (($image_data = @getimagesize($data['remotelink'])) === false && (empty($data['width']) || empty($data['height']))) - { - $error[] = $user->lang['UNABLE_GET_IMAGE_SIZE']; - return false; - } - - if (!empty($image_data) && ($image_data[0] < 2 || $image_data[1] < 2)) - { - $error[] = $user->lang['AVATAR_NO_SIZE']; - return false; - } - - $width = ($data['width'] && $data['height']) ? $data['width'] : $image_data[0]; - $height = ($data['width'] && $data['height']) ? $data['height'] : $image_data[1]; - - if ($width < 2 || $height < 2) - { - $error[] = $user->lang['AVATAR_NO_SIZE']; - return false; - } - - // Check image type - include_once($phpbb_root_path . 'includes/functions_upload.' . $phpEx); - $types = fileupload::image_types(); - $extension = strtolower(filespec::get_extension($data['remotelink'])); - - if (!empty($image_data) && (!isset($types[$image_data[2]]) || !in_array($extension, $types[$image_data[2]]))) - { - if (!isset($types[$image_data[2]])) - { - $error[] = $user->lang['UNABLE_GET_IMAGE_SIZE']; - } - else - { - $error[] = sprintf($user->lang['IMAGE_FILETYPE_MISMATCH'], $types[$image_data[2]][0], $extension); - } - return false; - } - - if ($config['avatar_max_width'] || $config['avatar_max_height']) - { - if ($width > $config['avatar_max_width'] || $height > $config['avatar_max_height']) - { - $error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height'], $width, $height); - return false; - } - } - - if ($config['avatar_min_width'] || $config['avatar_min_height']) - { - if ($width < $config['avatar_min_width'] || $height < $config['avatar_min_height']) - { - $error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height'], $width, $height); - return false; - } - } - - return array(AVATAR_REMOTE, $data['remotelink'], $width, $height); -} - -/** -* Avatar upload using the upload class -*/ -function avatar_upload($data, &$error) -{ - global $phpbb_root_path, $config, $db, $user, $phpEx; - - // Init upload class - include_once($phpbb_root_path . 'includes/functions_upload.' . $phpEx); - $upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $config['avatar_filesize'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height']); - - if (!empty($_FILES['uploadfile']['name'])) - { - $file = $upload->form_upload('uploadfile'); - } - else - { - $file = $upload->remote_upload($data['uploadurl']); - } - - $prefix = $config['avatar_salt'] . '_'; - $file->clean_filename('avatar', $prefix, $data['user_id']); - - $destination = $config['avatar_path']; - - // Adjust destination path (no trailing slash) - if (substr($destination, -1, 1) == '/' || substr($destination, -1, 1) == '\\') - { - $destination = substr($destination, 0, -1); - } - - $destination = str_replace(array('../', '..\\', './', '.\\'), '', $destination); - if ($destination && ($destination[0] == '/' || $destination[0] == "\\")) - { - $destination = ''; - } - - // Move file and overwrite any existing image - $file->move_file($destination, true); - - if (sizeof($file->error)) - { - $file->remove(); - $error = array_merge($error, $file->error); - } - - return array(AVATAR_UPLOAD, $data['user_id'] . '_' . time() . '.' . $file->get('extension'), $file->get('width'), $file->get('height')); -} - -/** -* Generates avatar filename from the database entry -*/ -function get_avatar_filename($avatar_entry) -{ - global $config; - - - if ($avatar_entry[0] === 'g') - { - $avatar_group = true; - $avatar_entry = substr($avatar_entry, 1); - } - else - { - $avatar_group = false; - } - $ext = substr(strrchr($avatar_entry, '.'), 1); - $avatar_entry = intval($avatar_entry); - return $config['avatar_salt'] . '_' . (($avatar_group) ? 'g' : '') . $avatar_entry . '.' . $ext; -} - -/** -* Avatar Gallery -*/ -function avatar_gallery($category, $avatar_select, $items_per_column, $block_var = 'avatar_row') -{ - global $user, $cache, $template; - global $config, $phpbb_root_path; - - $avatar_list = array(); - - $path = $phpbb_root_path . $config['avatar_gallery_path']; - - if (!file_exists($path) || !is_dir($path)) - { - $avatar_list = array($user->lang['NO_AVATAR_CATEGORY'] => array()); - } - else - { - // Collect images - $dp = @opendir($path); - - if (!$dp) - { - return array($user->lang['NO_AVATAR_CATEGORY'] => array()); - } - - while (($file = readdir($dp)) !== false) - { - if ($file[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $file) && is_dir("$path/$file")) - { - $avatar_row_count = $avatar_col_count = 0; - - if ($dp2 = @opendir("$path/$file")) - { - while (($sub_file = readdir($dp2)) !== false) - { - if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $sub_file)) - { - $avatar_list[$file][$avatar_row_count][$avatar_col_count] = array( - 'file' => "$file/$sub_file", - 'filename' => $sub_file, - 'name' => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $sub_file))), - ); - $avatar_col_count++; - if ($avatar_col_count == $items_per_column) - { - $avatar_row_count++; - $avatar_col_count = 0; - } - } - } - closedir($dp2); - } - } - } - closedir($dp); - } - - if (!sizeof($avatar_list)) - { - $avatar_list = array($user->lang['NO_AVATAR_CATEGORY'] => array()); - } - - @ksort($avatar_list); - - $category = (!$category) ? key($avatar_list) : $category; - $avatar_categories = array_keys($avatar_list); - - $s_category_options = ''; - foreach ($avatar_categories as $cat) - { - $s_category_options .= ''; - } - - $template->assign_vars(array( - 'S_AVATARS_ENABLED' => true, - 'S_IN_AVATAR_GALLERY' => true, - 'S_CAT_OPTIONS' => $s_category_options) - ); - - $avatar_list = (isset($avatar_list[$category])) ? $avatar_list[$category] : array(); - - foreach ($avatar_list as $avatar_row_ary) - { - $template->assign_block_vars($block_var, array()); - - foreach ($avatar_row_ary as $avatar_col_ary) - { - $template->assign_block_vars($block_var . '.avatar_column', array( - 'AVATAR_IMAGE' => $phpbb_root_path . $config['avatar_gallery_path'] . '/' . $avatar_col_ary['file'], - 'AVATAR_NAME' => $avatar_col_ary['name'], - 'AVATAR_FILE' => $avatar_col_ary['filename']) - ); - - $template->assign_block_vars($block_var . '.avatar_option_column', array( - 'AVATAR_IMAGE' => $phpbb_root_path . $config['avatar_gallery_path'] . '/' . $avatar_col_ary['file'], - 'S_OPTIONS_AVATAR' => $avatar_col_ary['filename']) - ); - } - } - - return $avatar_list; -} - - -/** -* Tries to (re-)establish avatar dimensions -*/ -function avatar_get_dimensions($avatar, $avatar_type, &$error, $current_x = 0, $current_y = 0) -{ - global $config, $phpbb_root_path, $user; - - switch ($avatar_type) - { - case AVATAR_REMOTE : - break; - - case AVATAR_UPLOAD : - $avatar = $phpbb_root_path . $config['avatar_path'] . '/' . get_avatar_filename($avatar); - break; - - case AVATAR_GALLERY : - $avatar = $phpbb_root_path . $config['avatar_gallery_path'] . '/' . $avatar ; - break; - } - - // Make sure getimagesize works... - if (($image_data = @getimagesize($avatar)) === false) - { - $error[] = $user->lang['UNABLE_GET_IMAGE_SIZE']; - return false; - } - - if ($image_data[0] < 2 || $image_data[1] < 2) - { - $error[] = $user->lang['AVATAR_NO_SIZE']; - return false; - } - - // try to maintain ratio - if (!(empty($current_x) && empty($current_y))) - { - if ($current_x != 0) - { - $image_data[1] = (int) floor(($current_x / $image_data[0]) * $image_data[1]); - $image_data[1] = min($config['avatar_max_height'], $image_data[1]); - $image_data[1] = max($config['avatar_min_height'], $image_data[1]); - } - if ($current_y != 0) - { - $image_data[0] = (int) floor(($current_y / $image_data[1]) * $image_data[0]); - $image_data[0] = min($config['avatar_max_width'], $image_data[1]); - $image_data[0] = max($config['avatar_min_width'], $image_data[1]); - } - } - return array($image_data[0], $image_data[1]); -} - -/** -* Uploading/Changing user avatar -*/ -function avatar_process_user(&$error, $custom_userdata = false) -{ - global $config, $phpbb_root_path, $auth, $user, $db; - - $data = array( - 'uploadurl' => request_var('uploadurl', ''), - 'remotelink' => request_var('remotelink', ''), - 'width' => request_var('width', 0), - 'height' => request_var('height', 0), - ); - - $error = validate_data($data, array( - 'uploadurl' => array('string', true, 5, 255), - 'remotelink' => array('string', true, 5, 255), - 'width' => array('string', true, 1, 3), - 'height' => array('string', true, 1, 3), - )); - - if (sizeof($error)) - { - return false; - } - - $sql_ary = array(); - - if ($custom_userdata === false) - { - $userdata = &$user->data; - } - else - { - $userdata = &$custom_userdata; - } - - $data['user_id'] = $userdata['user_id']; - $change_avatar = ($custom_userdata === false) ? $auth->acl_get('u_chgavatar') : true; - $avatar_select = basename(request_var('avatar_select', '')); - - // Can we upload? - $can_upload = ($config['allow_avatar_upload'] && file_exists($phpbb_root_path . $config['avatar_path']) && @is_writable($phpbb_root_path . $config['avatar_path']) && $change_avatar && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false; - - if ((!empty($_FILES['uploadfile']['name']) || $data['uploadurl']) && $can_upload) - { - list($sql_ary['user_avatar_type'], $sql_ary['user_avatar'], $sql_ary['user_avatar_width'], $sql_ary['user_avatar_height']) = avatar_upload($data, $error); - } - else if ($data['remotelink'] && $change_avatar && $config['allow_avatar_remote']) - { - list($sql_ary['user_avatar_type'], $sql_ary['user_avatar'], $sql_ary['user_avatar_width'], $sql_ary['user_avatar_height']) = avatar_remote($data, $error); - } - else if ($avatar_select && $change_avatar && $config['allow_avatar_local']) - { - $category = basename(request_var('category', '')); - - $sql_ary['user_avatar_type'] = AVATAR_GALLERY; - $sql_ary['user_avatar'] = $avatar_select; - - // check avatar gallery - if (!is_dir($phpbb_root_path . $config['avatar_gallery_path'] . '/' . $category)) - { - $sql_ary['user_avatar'] = ''; - $sql_ary['user_avatar_type'] = $sql_ary['user_avatar_width'] = $sql_ary['user_avatar_height'] = 0; - } - else - { - list($sql_ary['user_avatar_width'], $sql_ary['user_avatar_height']) = getimagesize($phpbb_root_path . $config['avatar_gallery_path'] . '/' . $category . '/' . $sql_ary['user_avatar']); - $sql_ary['user_avatar'] = $category . '/' . $sql_ary['user_avatar']; - } - } - else if (isset($_POST['delete']) && $change_avatar) - { - $sql_ary['user_avatar'] = ''; - $sql_ary['user_avatar_type'] = $sql_ary['user_avatar_width'] = $sql_ary['user_avatar_height'] = 0; - } - else if (!empty($userdata['user_avatar'])) - { - // Only update the dimensions - - if (empty($data['width']) || empty($data['height'])) - { - if ($dims = avatar_get_dimensions($userdata['user_avatar'], $userdata['user_avatar_type'], $error, $data['width'], $data['height'])) - { - list($guessed_x, $guessed_y) = $dims; - if (empty($data['width'])) - { - $data['width'] = $guessed_x; - } - if (empty($data['height'])) - { - $data['height'] = $guessed_y; - } - } - } - if (($config['avatar_max_width'] || $config['avatar_max_height']) && - (($data['width'] != $userdata['user_avatar_width']) || $data['height'] != $userdata['user_avatar_height'])) - { - if ($data['width'] > $config['avatar_max_width'] || $data['height'] > $config['avatar_max_height']) - { - $error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height'], $data['width'], $data['height']); - } - } - - if (!sizeof($error)) - { - if ($config['avatar_min_width'] || $config['avatar_min_height']) - { - if ($data['width'] < $config['avatar_min_width'] || $data['height'] < $config['avatar_min_height']) - { - $error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height'], $data['width'], $data['height']); - } - } - } - - if (!sizeof($error)) - { - $sql_ary['user_avatar_width'] = $data['width']; - $sql_ary['user_avatar_height'] = $data['height']; - } - } - - if (!sizeof($error)) - { - // Do we actually have any data to update? - if (sizeof($sql_ary)) - { - $sql = 'UPDATE ' . USERS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_id = ' . (($custom_userdata === false) ? $user->data['user_id'] : $custom_userdata['user_id']); - $db->sql_query($sql); - - if (isset($sql_ary['user_avatar'])) - { - $userdata = ($custom_userdata === false) ? $user->data : $custom_userdata; - - // Delete old avatar if present - if ((!empty($userdata['user_avatar']) && empty($sql_ary['user_avatar']) && $userdata['user_avatar_type'] == AVATAR_UPLOAD) - || ( !empty($userdata['user_avatar']) && !empty($sql_ary['user_avatar']) && $userdata['user_avatar_type'] == AVATAR_UPLOAD && $sql_ary['user_avatar_type'] != AVATAR_UPLOAD)) - { - avatar_delete('user', $userdata); - } - } - } - } - - return (sizeof($error)) ? false : true; -} - -// -// Usergroup functions -// - -/** -* Add or edit a group. If we're editing a group we only update user -* parameters such as rank, etc. if they are changed -*/ -function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow_desc_bbcode = false, $allow_desc_urls = false, $allow_desc_smilies = false) -{ - global $phpbb_root_path, $config, $db, $user, $file_upload; - - $error = array(); - $attribute_ary = array( - 'group_colour' => 'string', - 'group_rank' => 'int', - 'group_avatar' => 'string', - 'group_avatar_type' => 'int', - 'group_avatar_width' => 'int', - 'group_avatar_height' => 'int', - - 'group_receive_pm' => 'int', - 'group_legend' => 'int', - 'group_message_limit' => 'int', - - 'group_founder_manage' => 'int', - ); - - // Those are group-only attributes - $group_only_ary = array('group_receive_pm', 'group_legend', 'group_message_limit', 'group_founder_manage'); - - // Check data. Limit group name length. - if (!utf8_strlen($name) || utf8_strlen($name) > 60) - { - $error[] = (!utf8_strlen($name)) ? $user->lang['GROUP_ERR_USERNAME'] : $user->lang['GROUP_ERR_USER_LONG']; - } - - $err = group_validate_groupname($group_id, $name); - if (!empty($err)) - { - $error[] = $user->lang[$err]; - } - - if (!in_array($type, array(GROUP_OPEN, GROUP_CLOSED, GROUP_HIDDEN, GROUP_SPECIAL, GROUP_FREE))) - { - $error[] = $user->lang['GROUP_ERR_TYPE']; - } - - if (!sizeof($error)) - { - $user_ary = array(); - $sql_ary = array( - 'group_name' => (string) $name, - 'group_name_clean' => (string) utf8_clean_string($name), - 'group_desc' => (string) $desc, - 'group_desc_uid' => '', - 'group_desc_bitfield' => '', - 'group_type' => (int) $type, - ); - - // Parse description - if ($desc) - { - generate_text_for_storage($sql_ary['group_desc'], $sql_ary['group_desc_uid'], $sql_ary['group_desc_bitfield'], $sql_ary['group_desc_options'], $allow_desc_bbcode, $allow_desc_urls, $allow_desc_smilies); - } - - if (sizeof($group_attributes)) - { - foreach ($attribute_ary as $attribute => $_type) - { - if (isset($group_attributes[$attribute])) - { - settype($group_attributes[$attribute], $_type); - $sql_ary[$attribute] = $group_attributes[$attribute]; - } - } - } - - // Setting the log message before we set the group id (if group gets added) - $log = ($group_id) ? 'LOG_GROUP_UPDATED' : 'LOG_GROUP_CREATED'; - - $query = ''; - - if ($group_id) - { - $sql = 'SELECT user_id - FROM ' . USERS_TABLE . ' - WHERE group_id = ' . $group_id; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $user_ary[] = $row['user_id']; - } - $db->sql_freeresult($result); - - if (isset($sql_ary['group_avatar']) && !$sql_ary['group_avatar']) - { - remove_default_avatar($group_id, $user_ary); - } - if (isset($sql_ary['group_rank']) && !$sql_ary['group_rank']) - { - remove_default_rank($group_id, $user_ary); - } - - $sql = 'UPDATE ' . GROUPS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " - WHERE group_id = $group_id"; - $db->sql_query($sql); - - // Since we may update the name too, we need to do this on other tables too... - $sql = 'UPDATE ' . MODERATOR_CACHE_TABLE . " - SET group_name = '" . $db->sql_escape($sql_ary['group_name']) . "' - WHERE group_id = $group_id"; - $db->sql_query($sql); - } - else - { - $sql = 'INSERT INTO ' . GROUPS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - $db->sql_query($sql); - } - - if (!$group_id) - { - $group_id = $db->sql_nextid(); - if (isset($sql_ary['group_avatar_type']) && $sql_ary['group_avatar_type'] == AVATAR_UPLOAD) - { - group_correct_avatar($group_id, $sql_ary['group_avatar']); - } - } - - // Set user attributes - $sql_ary = array(); - if (sizeof($group_attributes)) - { - foreach ($attribute_ary as $attribute => $_type) - { - if (isset($group_attributes[$attribute]) && !in_array($attribute, $group_only_ary)) - { - // If we are about to set an avatar, we will not overwrite user avatars if no group avatar is set... - if (strpos($attribute, 'group_avatar') === 0 && !$group_attributes[$attribute]) - { - continue; - } - - $sql_ary[$attribute] = $group_attributes[$attribute]; - } - } - } - - if (sizeof($sql_ary) && sizeof($user_ary)) - { - group_set_user_default($group_id, $user_ary, $sql_ary); - } - - $name = ($type == GROUP_SPECIAL) ? $user->lang['G_' . $name] : $name; - add_log('admin', $log, $name); - - group_update_listings($group_id); - } - - return (sizeof($error)) ? $error : false; -} - - -/** -* Changes a group avatar's filename to conform to the naming scheme -*/ -function group_correct_avatar($group_id, $old_entry) -{ - global $config, $db, $phpbb_root_path; - - $group_id = (int)$group_id; - $ext = substr(strrchr($old_entry, '.'), 1); - $old_filename = get_avatar_filename($old_entry); - $new_filename = $config['avatar_salt'] . "_g$group_id.$ext"; - $new_entry = 'g' . $group_id . '_' . substr(time(), -5) . ".$ext"; - - $avatar_path = $phpbb_root_path . $config['avatar_path']; - if (@rename($avatar_path . '/'. $old_filename, $avatar_path . '/' . $new_filename)) - { - $sql = 'UPDATE ' . GROUPS_TABLE . ' - SET group_avatar = \'' . $db->sql_escape($new_entry) . "' - WHERE group_id = $group_id"; - $db->sql_query($sql); - } -} - - -/** -* Remove avatar also for users not having the group as default -*/ -function avatar_remove_db($avatar_name) -{ - global $config, $db; - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_avatar = '', - user_avatar_type = 0 - WHERE user_avatar = '" . $db->sql_escape($avatar_name) . '\''; - $db->sql_query($sql); -} - - -/** -* Group Delete -*/ -function group_delete($group_id, $group_name = false) -{ - global $db, $phpbb_root_path, $phpEx; - - if (!$group_name) - { - $group_name = get_group_name($group_id); - } - - $start = 0; - - do - { - $user_id_ary = $username_ary = array(); - - // Batch query for group members, call group_user_del - $sql = 'SELECT u.user_id, u.username - FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . " u - WHERE ug.group_id = $group_id - AND u.user_id = ug.user_id"; - $result = $db->sql_query_limit($sql, 200, $start); - - if ($row = $db->sql_fetchrow($result)) - { - do - { - $user_id_ary[] = $row['user_id']; - $username_ary[] = $row['username']; - - $start++; - } - while ($row = $db->sql_fetchrow($result)); - - group_user_del($group_id, $user_id_ary, $username_ary, $group_name); - } - else - { - $start = 0; - } - $db->sql_freeresult($result); - } - while ($start); - - // Delete group - $sql = 'DELETE FROM ' . GROUPS_TABLE . " - WHERE group_id = $group_id"; - $db->sql_query($sql); - - // Delete auth entries from the groups table - $sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . " - WHERE group_id = $group_id"; - $db->sql_query($sql); - - // Re-cache moderators - if (!function_exists('cache_moderators')) - { - include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); - } - - cache_moderators(); - - add_log('admin', 'LOG_GROUP_DELETE', $group_name); - - // Return false - no error - return false; -} - -/** -* Add user(s) to group -* -* @return mixed false if no errors occurred, else the user lang string for the relevant error, for example 'NO_USER' -*/ -function group_user_add($group_id, $user_id_ary = false, $username_ary = false, $group_name = false, $default = false, $leader = 0, $pending = 0, $group_attributes = false) -{ - global $db, $auth; - - // We need both username and user_id info - $result = user_get_id_name($user_id_ary, $username_ary); - - if (!sizeof($user_id_ary) || $result !== false) - { - return 'NO_USER'; - } - - // Remove users who are already members of this group - $sql = 'SELECT user_id, group_leader - FROM ' . USER_GROUP_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', $user_id_ary) . " - AND group_id = $group_id"; - $result = $db->sql_query($sql); - - $add_id_ary = $update_id_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - $add_id_ary[] = (int) $row['user_id']; - - if ($leader && !$row['group_leader']) - { - $update_id_ary[] = (int) $row['user_id']; - } - } - $db->sql_freeresult($result); - - // Do all the users exist in this group? - $add_id_ary = array_diff($user_id_ary, $add_id_ary); - - // If we have no users - if (!sizeof($add_id_ary) && !sizeof($update_id_ary)) - { - return 'GROUP_USERS_EXIST'; - } - - $db->sql_transaction('begin'); - - // Insert the new users - if (sizeof($add_id_ary)) - { - $sql_ary = array(); - - foreach ($add_id_ary as $user_id) - { - $sql_ary[] = array( - 'user_id' => (int) $user_id, - 'group_id' => (int) $group_id, - 'group_leader' => (int) $leader, - 'user_pending' => (int) $pending, - ); - } - - $db->sql_multi_insert(USER_GROUP_TABLE, $sql_ary); - } - - if (sizeof($update_id_ary)) - { - $sql = 'UPDATE ' . USER_GROUP_TABLE . ' - SET group_leader = 1 - WHERE ' . $db->sql_in_set('user_id', $update_id_ary) . " - AND group_id = $group_id"; - $db->sql_query($sql); - } - - if ($default) - { - group_set_user_default($group_id, $user_id_ary, $group_attributes); - } - - $db->sql_transaction('commit'); - - // Clear permissions cache of relevant users - $auth->acl_clear_prefetch($user_id_ary); - - if (!$group_name) - { - $group_name = get_group_name($group_id); - } - - $log = ($leader) ? 'LOG_MODS_ADDED' : 'LOG_USERS_ADDED'; - - add_log('admin', $log, $group_name, implode(', ', $username_ary)); - - group_update_listings($group_id); - - // Return false - no error - return false; -} - -/** -* Remove a user/s from a given group. When we remove users we update their -* default group_id. We do this by examining which "special" groups they belong -* to. The selection is made based on a reasonable priority system -* -* @return false if no errors occurred, else the user lang string for the relevant error, for example 'NO_USER' -*/ -function group_user_del($group_id, $user_id_ary = false, $username_ary = false, $group_name = false) -{ - global $db, $auth; - - $group_order = array('ADMINISTRATORS', 'GLOBAL_MODERATORS', 'REGISTERED_COPPA', 'REGISTERED', 'BOTS', 'GUESTS'); - - // We need both username and user_id info - $result = user_get_id_name($user_id_ary, $username_ary); - - if (!sizeof($user_id_ary) || $result !== false) - { - return 'NO_USER'; - } - - $clean_group_order = array_map('utf8_clean_string', $group_order); - - $sql = 'SELECT * - FROM ' . GROUPS_TABLE . ' - WHERE ' . $db->sql_in_set('group_name_clean', $clean_group_order); - $result = $db->sql_query($sql); - - $group_order_id = $special_group_data = array(); - while ($row = $db->sql_fetchrow($result)) - { - $group_order_id[$row['group_name']] = $row['group_id']; - - $special_group_data[$row['group_id']] = array( - 'group_colour' => $row['group_colour'], - 'group_rank' => $row['group_rank'], - ); - - // Only set the group avatar if one is defined... - if ($row['group_avatar']) - { - $special_group_data[$row['group_id']] = array_merge($special_group_data[$row['group_id']], array( - 'group_avatar' => $row['group_avatar'], - 'group_avatar_type' => $row['group_avatar_type'], - 'group_avatar_width' => $row['group_avatar_width'], - 'group_avatar_height' => $row['group_avatar_height']) - ); - } - } - $db->sql_freeresult($result); - - // Get users default groups - we only need to reset default group membership if the group from which the user gets removed is set as default - $sql = 'SELECT user_id, group_id - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', $user_id_ary); - $result = $db->sql_query($sql); - - $default_groups = array(); - while ($row = $db->sql_fetchrow($result)) - { - $default_groups[$row['user_id']] = $row['group_id']; - } - $db->sql_freeresult($result); - - // What special group memberships exist for these users? - $sql = 'SELECT g.group_id, g.group_name_clean, ug.user_id - FROM ' . USER_GROUP_TABLE . ' ug, ' . GROUPS_TABLE . ' g - WHERE ' . $db->sql_in_set('ug.user_id', $user_id_ary) . " - AND g.group_id = ug.group_id - AND g.group_id <> $group_id - AND g.group_type = " . GROUP_SPECIAL . ' - ORDER BY ug.user_id, g.group_id'; - $result = $db->sql_query($sql); - - $temp_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - if ($default_groups[$row['user_id']] == $group_id && (!isset($temp_ary[$row['user_id']]) || array_search($row['group_name_clean'], $clean_group_order) < $temp_ary[$row['user_id']])) - { - $temp_ary[$row['user_id']] = $row['group_id']; - } - } - $db->sql_freeresult($result); - - $sql_where_ary = array(); - foreach ($temp_ary as $uid => $gid) - { - $sql_where_ary[$gid][] = $uid; - } - unset($temp_ary); - - foreach ($special_group_data as $gid => $default_data_ary) - { - if (isset($sql_where_ary[$gid]) && sizeof($sql_where_ary[$gid])) - { - remove_default_rank($group_id, $sql_where_ary[$gid]); - remove_default_avatar($group_id, $sql_where_ary[$gid]); - group_set_user_default($gid, $sql_where_ary[$gid], $default_data_ary); - } - } - unset($special_group_data); - - $sql = 'DELETE FROM ' . USER_GROUP_TABLE . " - WHERE group_id = $group_id - AND " . $db->sql_in_set('user_id', $user_id_ary); - $db->sql_query($sql); - - // Clear permissions cache of relevant users - $auth->acl_clear_prefetch($user_id_ary); - - if (!$group_name) - { - $group_name = get_group_name($group_id); - } - - $log = 'LOG_GROUP_REMOVE'; - - add_log('admin', $log, $group_name, implode(', ', $username_ary)); - - group_update_listings($group_id); - - // Return false - no error - return false; -} - - -/** -* Removes the group avatar of the default group from the users in user_ids who have that group as default. -*/ -function remove_default_avatar($group_id, $user_ids) -{ - global $db; - - if (!is_array($user_ids)) - { - $user_ids = array($user_ids); - } - if (empty($user_ids)) - { - return false; - } - - $user_ids = array_map('intval', $user_ids); - - $sql = 'SELECT * - FROM ' . GROUPS_TABLE . ' - WHERE group_id = ' . (int)$group_id; - $result = $db->sql_query($sql); - if (!$row = $db->sql_fetchrow($result)) - { - $db->sql_freeresult($result); - return false; - } - $db->sql_freeresult($result); - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_avatar = '', - user_avatar_type = 0, - user_avatar_width = 0, - user_avatar_height = 0 - WHERE group_id = " . (int) $group_id . " - AND user_avatar = '" . $db->sql_escape($row['group_avatar']) . "' - AND " . $db->sql_in_set('user_id', $user_ids); - - $db->sql_query($sql); -} - -/** -* Removes the group rank of the default group from the users in user_ids who have that group as default. -*/ -function remove_default_rank($group_id, $user_ids) -{ - global $db; - - if (!is_array($user_ids)) - { - $user_ids = array($user_ids); - } - if (empty($user_ids)) - { - return false; - } - - $user_ids = array_map('intval', $user_ids); - - $sql = 'SELECT * - FROM ' . GROUPS_TABLE . ' - WHERE group_id = ' . (int)$group_id; - $result = $db->sql_query($sql); - if (!$row = $db->sql_fetchrow($result)) - { - $db->sql_freeresult($result); - return false; - } - $db->sql_freeresult($result); - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_rank = 0 - WHERE group_id = ' . (int)$group_id . ' - AND user_rank <> 0 - AND user_rank = ' . (int)$row['group_rank'] . ' - AND ' . $db->sql_in_set('user_id', $user_ids); - $db->sql_query($sql); -} - -/** -* This is used to promote (to leader), demote or set as default a member/s -*/ -function group_user_attributes($action, $group_id, $user_id_ary = false, $username_ary = false, $group_name = false, $group_attributes = false) -{ - global $db, $auth, $phpbb_root_path, $phpEx, $config; - - // We need both username and user_id info - $result = user_get_id_name($user_id_ary, $username_ary); - - if (!sizeof($user_id_ary) || $result !== false) - { - return false; - } - - if (!$group_name) - { - $group_name = get_group_name($group_id); - } - - switch ($action) - { - case 'demote': - case 'promote': - $sql = 'UPDATE ' . USER_GROUP_TABLE . ' - SET group_leader = ' . (($action == 'promote') ? 1 : 0) . " - WHERE group_id = $group_id - AND " . $db->sql_in_set('user_id', $user_id_ary); - $db->sql_query($sql); - - $log = ($action == 'promote') ? 'LOG_GROUP_PROMOTED' : 'LOG_GROUP_DEMOTED'; - break; - - case 'approve': - // Make sure we only approve those which are pending ;) - $sql = 'SELECT u.user_id, u.user_email, u.username, u.username_clean, u.user_notify_type, u.user_jabber, u.user_lang - FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug - WHERE ug.group_id = ' . $group_id . ' - AND ug.user_pending = 1 - AND ug.user_id = u.user_id - AND ' . $db->sql_in_set('ug.user_id', $user_id_ary); - $result = $db->sql_query($sql); - - $user_id_ary = $email_users = array(); - while ($row = $db->sql_fetchrow($result)) - { - $user_id_ary[] = $row['user_id']; - $email_users[] = $row; - } - $db->sql_freeresult($result); - - if (!sizeof($user_id_ary)) - { - return false; - } - - $sql = 'UPDATE ' . USER_GROUP_TABLE . " - SET user_pending = 0 - WHERE group_id = $group_id - AND " . $db->sql_in_set('user_id', $user_id_ary); - $db->sql_query($sql); - - // Send approved email to users... - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - $messenger = new messenger(); - - foreach ($email_users as $row) - { - $messenger->template('group_approved', $row['user_lang']); - - $messenger->to($row['user_email'], $row['username']); - $messenger->im($row['user_jabber'], $row['username']); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($row['username']), - 'GROUP_NAME' => htmlspecialchars_decode($group_name), - 'U_GROUP' => generate_board_url() . "/ucp.$phpEx?i=groups&mode=membership") - ); - - $messenger->send($row['user_notify_type']); - } - - $messenger->save_queue(); - - $log = 'LOG_USERS_APPROVED'; - break; - - case 'default': - $sql = 'SELECT user_id, group_id FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', $user_id_ary, false, true); - $result = $db->sql_query($sql); - - $groups = array(); - while ($row = $db->sql_fetchrow($result)) - { - if (!isset($groups[$row['group_id']])) - { - $groups[$row['group_id']] = array(); - } - $groups[$row['group_id']][] = $row['user_id']; - } - $db->sql_freeresult($result); - - foreach ($groups as $gid => $uids) - { - remove_default_rank($gid, $uids); - remove_default_avatar($gid, $uids); - } - group_set_user_default($group_id, $user_id_ary, $group_attributes); - $log = 'LOG_GROUP_DEFAULTS'; - break; - } - - // Clear permissions cache of relevant users - $auth->acl_clear_prefetch($user_id_ary); - - add_log('admin', $log, $group_name, implode(', ', $username_ary)); - - group_update_listings($group_id); - - return true; -} - -/** -* A small version of validate_username to check for a group name's existence. To be called directly. -*/ -function group_validate_groupname($group_id, $group_name) -{ - global $config, $db; - - $group_name = utf8_clean_string($group_name); - - if (!empty($group_id)) - { - $sql = 'SELECT group_name_clean - FROM ' . GROUPS_TABLE . ' - WHERE group_id = ' . (int) $group_id; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - return false; - } - - $allowed_groupname = utf8_clean_string($row['group_name']); - - if ($allowed_groupname == $group_name) - { - return false; - } - } - - $sql = 'SELECT group_name - FROM ' . GROUPS_TABLE . " - WHERE group_name_clean = '" . $db->sql_escape(utf8_clean_string($group_name)) . "'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - return 'GROUP_NAME_TAKEN'; - } - - return false; -} - -/** -* Set users default group -* -* @private -*/ -function group_set_user_default($group_id, $user_id_ary, $group_attributes = false, $update_listing = false) -{ - global $db; - - if (empty($user_id_ary)) - { - return; - } - - $attribute_ary = array( - 'group_colour' => 'string', - 'group_rank' => 'int', - 'group_avatar' => 'string', - 'group_avatar_type' => 'int', - 'group_avatar_width' => 'int', - 'group_avatar_height' => 'int', - ); - - $sql_ary = array( - 'group_id' => $group_id - ); - - // Were group attributes passed to the function? If not we need to obtain them - if ($group_attributes === false) - { - $sql = 'SELECT ' . implode(', ', array_keys($attribute_ary)) . ' - FROM ' . GROUPS_TABLE . " - WHERE group_id = $group_id"; - $result = $db->sql_query($sql); - $group_attributes = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - } - - foreach ($attribute_ary as $attribute => $type) - { - if (isset($group_attributes[$attribute])) - { - // If we are about to set an avatar or rank, we will not overwrite with empty, unless we are not actually changing the default group - if ((strpos($attribute, 'group_avatar') === 0 || strpos($attribute, 'group_rank') === 0) && !$group_attributes[$attribute]) - { - continue; - } - - settype($group_attributes[$attribute], $type); - $sql_ary[str_replace('group_', 'user_', $attribute)] = $group_attributes[$attribute]; - } - } - - // Before we update the user attributes, we will make a list of those having now the group avatar assigned - if (isset($sql_ary['user_avatar'])) - { - // Ok, get the original avatar data from users having an uploaded one (we need to remove these from the filesystem) - $sql = 'SELECT user_id, group_id, user_avatar - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', $user_id_ary) . ' - AND user_avatar_type = ' . AVATAR_UPLOAD; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - avatar_delete('user', $row); - } - $db->sql_freeresult($result); - } - else - { - unset($sql_ary['user_avatar_type']); - unset($sql_ary['user_avatar_height']); - unset($sql_ary['user_avatar_width']); - } - - $sql = 'UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE ' . $db->sql_in_set('user_id', $user_id_ary); - $db->sql_query($sql); - - if (isset($sql_ary['user_colour'])) - { - // Update any cached colour information for these users - $sql = 'UPDATE ' . FORUMS_TABLE . " SET forum_last_poster_colour = '" . $db->sql_escape($sql_ary['user_colour']) . "' - WHERE " . $db->sql_in_set('forum_last_poster_id', $user_id_ary); - $db->sql_query($sql); - - $sql = 'UPDATE ' . TOPICS_TABLE . " SET topic_first_poster_colour = '" . $db->sql_escape($sql_ary['user_colour']) . "' - WHERE " . $db->sql_in_set('topic_poster', $user_id_ary); - $db->sql_query($sql); - - $sql = 'UPDATE ' . TOPICS_TABLE . " SET topic_last_poster_colour = '" . $db->sql_escape($sql_ary['user_colour']) . "' - WHERE " . $db->sql_in_set('topic_last_poster_id', $user_id_ary); - $db->sql_query($sql); - - global $config; - - if (in_array($config['newest_user_id'], $user_id_ary)) - { - set_config('newest_user_colour', $sql_ary['user_colour'], true); - } - } - - if ($update_listing) - { - group_update_listings($group_id); - } -} - -/** -* Get group name -*/ -function get_group_name($group_id) -{ - global $db, $user; - - $sql = 'SELECT group_name, group_type - FROM ' . GROUPS_TABLE . ' - WHERE group_id = ' . (int) $group_id; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - return ''; - } - - return ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']; -} - -/** -* Obtain either the members of a specified group, the groups the specified user is subscribed to -* or checking if a specified user is in a specified group. This function does not return pending memberships. -* -* Note: Never use this more than once... first group your users/groups -*/ -function group_memberships($group_id_ary = false, $user_id_ary = false, $return_bool = false) -{ - global $db; - - if (!$group_id_ary && !$user_id_ary) - { - return true; - } - - if ($user_id_ary) - { - $user_id_ary = (!is_array($user_id_ary)) ? array($user_id_ary) : $user_id_ary; - } - - if ($group_id_ary) - { - $group_id_ary = (!is_array($group_id_ary)) ? array($group_id_ary) : $group_id_ary; - } - - $sql = 'SELECT ug.*, u.username, u.username_clean, u.user_email - FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . ' u - WHERE ug.user_id = u.user_id - AND ug.user_pending = 0 AND '; - - if ($group_id_ary) - { - $sql .= ' ' . $db->sql_in_set('ug.group_id', $group_id_ary); - } - - if ($user_id_ary) - { - $sql .= ($group_id_ary) ? ' AND ' : ' '; - $sql .= $db->sql_in_set('ug.user_id', $user_id_ary); - } - - $result = ($return_bool) ? $db->sql_query_limit($sql, 1) : $db->sql_query($sql); - - $row = $db->sql_fetchrow($result); - - if ($return_bool) - { - $db->sql_freeresult($result); - return ($row) ? true : false; - } - - if (!$row) - { - return false; - } - - $return = array(); - - do - { - $return[] = $row; - } - while ($row = $db->sql_fetchrow($result)); - - $db->sql_freeresult($result); - - return $return; -} - -/** -* Re-cache moderators and foes if group has a_ or m_ permissions -*/ -function group_update_listings($group_id) -{ - global $auth; - - $hold_ary = $auth->acl_group_raw_data($group_id, array('a_', 'm_')); - - if (!sizeof($hold_ary)) - { - return; - } - - $mod_permissions = $admin_permissions = false; - - foreach ($hold_ary as $g_id => $forum_ary) - { - foreach ($forum_ary as $forum_id => $auth_ary) - { - foreach ($auth_ary as $auth_option => $setting) - { - if ($mod_permissions && $admin_permissions) - { - break 3; - } - - if ($setting != ACL_YES) - { - continue; - } - - if ($auth_option == 'm_') - { - $mod_permissions = true; - } - - if ($auth_option == 'a_') - { - $admin_permissions = true; - } - } - } - } - - if ($mod_permissions) - { - if (!function_exists('cache_moderators')) - { - global $phpbb_root_path, $phpEx; - include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); - } - cache_moderators(); - } - - if ($mod_permissions || $admin_permissions) - { - if (!function_exists('update_foes')) - { - global $phpbb_root_path, $phpEx; - include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); - } - update_foes(array($group_id)); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/functions_validate.php b/phpBB/includes/functions_validate.php new file mode 100644 index 0000000000..fdb4ab1788 --- /dev/null +++ b/phpBB/includes/functions_validate.php @@ -0,0 +1,205 @@ +sql_query($sql)) + { + while ($row = $db->sql_fetchrow($result)) + { + if (($userdata['session_logged_in'] && $row['username'] != $userdata['username']) || !$userdata['session_logged_in']) + { + $db->sql_freeresult($result); + return array('error' => true, 'error_msg' => $lang['Username_taken']); + } + } + } + $db->sql_freeresult($result); + + $sql = "SELECT group_name + FROM " . GROUPS_TABLE . " + WHERE LOWER(group_name) = '" . strtolower($username) . "'"; + if ($result = $db->sql_query($sql)) + { + if ($row = $db->sql_fetchrow($result)) + { + $db->sql_freeresult($result); + return array('error' => true, 'error_msg' => $lang['Username_taken']); + } + } + $db->sql_freeresult($result); + + $sql = "SELECT disallow_username + FROM " . DISALLOW_TABLE; + if ($result = $db->sql_query($sql)) + { + if ($row = $db->sql_fetchrow($result)) + { + do + { + if (preg_match("#\b(" . str_replace("\*", ".*?", preg_quote($row['disallow_username'], '#')) . ")\b#i", $username)) + { + $db->sql_freeresult($result); + return array('error' => true, 'error_msg' => $lang['Username_disallowed']); + } + } + while($row = $db->sql_fetchrow($result)); + } + } + $db->sql_freeresult($result); + + $sql = "SELECT word + FROM " . WORDS_TABLE; + if ($result = $db->sql_query($sql)) + { + if ($row = $db->sql_fetchrow($result)) + { + do + { + if (preg_match("#\b(" . str_replace("\*", ".*?", preg_quote($row['word'], '#')) . ")\b#i", $username)) + { + $db->sql_freeresult($result); + return array('error' => true, 'error_msg' => $lang['Username_disallowed']); + } + } + while ($row = $db->sql_fetchrow($result)); + } + } + $db->sql_freeresult($result); + + // Don't allow " and ALT-255 in username. + if (strstr($username, '"') || strstr($username, '"') || strstr($username, chr(160)) || strstr($username, chr(173))) + { + return array('error' => true, 'error_msg' => $lang['Username_invalid']); + } + + return array('error' => false, 'error_msg' => ''); +} + +// +// Check to see if email address is banned +// or already present in the DB +// +function validate_email($email) +{ + global $db, $lang; + + if ($email != '') + { + if (preg_match('/^[a-z0-9&\'\.\-_\+]+@[a-z0-9\-]+\.([a-z0-9\-]+\.)*?[a-z]+$/is', $email)) + { + $sql = "SELECT ban_email + FROM " . BANLIST_TABLE; + if ($result = $db->sql_query($sql)) + { + if ($row = $db->sql_fetchrow($result)) + { + do + { + $match_email = str_replace('*', '.*?', $row['ban_email']); + if (preg_match('/^' . $match_email . '$/is', $email)) + { + $db->sql_freeresult($result); + return array('error' => true, 'error_msg' => $lang['Email_banned']); + } + } + while($row = $db->sql_fetchrow($result)); + } + } + $db->sql_freeresult($result); + + $sql = "SELECT user_email + FROM " . USERS_TABLE . " + WHERE user_email = '" . str_replace("\'", "''", $email) . "'"; + if (!($result = $db->sql_query($sql))) + { + message_die(GENERAL_ERROR, "Couldn't obtain user email information.", "", __LINE__, __FILE__, $sql); + } + + if ($row = $db->sql_fetchrow($result)) + { + return array('error' => true, 'error_msg' => $lang['Email_taken']); + } + $db->sql_freeresult($result); + + return array('error' => false, 'error_msg' => ''); + } + } + + return array('error' => true, 'error_msg' => $lang['Email_invalid']); +} + +// +// Does supplementary validation of optional profile fields. This expects common stuff like trim() and strip_tags() +// to have already been run. Params are passed by-ref, so we can set them to the empty string if they fail. +// +function validate_optional_fields(&$icq, &$aim, &$msnm, &$yim, &$website, &$location, &$occupation, &$interests, &$sig) +{ + $check_var_length = array('aim', 'msnm', 'yim', 'location', 'occupation', 'interests', 'sig'); + + for($i = 0; $i < count($check_var_length); $i++) + { + if (strlen($$check_var_length[$i]) < 2) + { + $$check_var_length[$i] = ''; + } + } + + // ICQ number has to be only numbers. + if (!preg_match('/^[0-9]+$/', $icq)) + { + $icq = ''; + } + + // website has to start with http://, followed by something with length at least 3 that + // contains at least one dot. + if ($website != "") + { + if (!preg_match('#^http[s]?:\/\/#i', $website)) + { + $website = 'http://' . $website; + } + + if (!preg_match('#^http[s]?\\:\\/\\/[a-z0-9\-]+\.([a-z0-9\-]+\.)?[a-z]+#i', $website)) + { + $website = ''; + } + } + + return; +} + +?> \ No newline at end of file diff --git a/phpBB/includes/hooks/index.php b/phpBB/includes/hooks/index.php deleted file mode 100644 index 7db4eec96c..0000000000 --- a/phpBB/includes/hooks/index.php +++ /dev/null @@ -1,250 +0,0 @@ - $method) - { - $this->add_hook($method); - } - - if (function_exists('phpbb_hook_register')) - { - phpbb_hook_register($this); - } - } - - /** - * Register function/method to be called within hook - * This function is normally called by the modification/application to attach/register the functions. - * - * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__) - * @param mixed $hook The replacement function/method to be called. Passing function name or array with object/class definition - * @param string $mode Specify the priority/chain mode. 'normal' -> hook gets appended to the chain. 'standalone' -> only the specified hook gets called - later hooks are not able to overwrite this (E_NOTICE is triggered then). 'first' -> hook is called as the first one within the chain. 'last' -> hook is called as the last one within the chain. - */ - function register($definition, $hook, $mode = 'normal') - { - $class = (!is_array($definition)) ? '__global' : $definition[0]; - $function = (!is_array($definition)) ? $definition : $definition[1]; - - // Method able to be hooked? - if (isset($this->hooks[$class][$function])) - { - switch ($mode) - { - case 'standalone': - if (!isset($this->hooks[$class][$function]['standalone'])) - { - $this->hooks[$class][$function] = array('standalone' => $hook); - } - else - { - trigger_error('Hook not able to be called standalone, previous hook already standalone.', E_NOTICE); - } - break; - - case 'first': - case 'last': - $this->hooks[$class][$function][$mode][] = $hook; - break; - - case 'normal': - default: - $this->hooks[$class][$function]['normal'][] = $hook; - break; - } - } - } - - /** - * Calling all functions/methods attached to a specified hook. - * Called by the function allowing hooks... - * - * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__) - * @return bool False if no hook got executed, true otherwise - */ - function call_hook($definition) - { - $class = (!is_array($definition)) ? '__global' : $definition[0]; - $function = (!is_array($definition)) ? $definition : $definition[1]; - - if (!empty($this->hooks[$class][$function])) - { - // Developer tries to call a hooked function within the hooked function... - if ($this->current_hook !== NULL && $this->current_hook['class'] === $class && $this->current_hook['function'] === $function) - { - return false; - } - - // Call the hook with the arguments attached and store result - $arguments = func_get_args(); - $this->current_hook = array('class' => $class, 'function' => $function); - $arguments[0] = &$this; - - // Call the hook chain... - if (isset($this->hooks[$class][$function]['standalone'])) - { - $this->hook_result[$class][$function] = call_user_func_array($this->hooks[$class][$function]['standalone'], $arguments); - } - else - { - foreach (array('first', 'normal', 'last') as $mode) - { - if (!isset($this->hooks[$class][$function][$mode])) - { - continue; - } - - foreach ($this->hooks[$class][$function][$mode] as $hook) - { - $this->hook_result[$class][$function] = call_user_func_array($hook, $arguments); - } - } - } - - $this->current_hook = NULL; - return true; - } - - $this->current_hook = NULL; - return false; - } - - /** - * Get result from previously called functions/methods for the same hook - * - * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__) - * @return mixed False if nothing returned if there is no result, else array('result' => ... ) - */ - function previous_hook_result($definition) - { - $class = (!is_array($definition)) ? '__global' : $definition[0]; - $function = (!is_array($definition)) ? $definition : $definition[1]; - - if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function])) - { - return array('result' => $this->hook_result[$class][$function]); - } - - return false; - } - - /** - * Check if the called functions/methods returned something. - * - * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__) - * @return bool True if results are there, false if not - */ - function hook_return($definition) - { - $class = (!is_array($definition)) ? '__global' : $definition[0]; - $function = (!is_array($definition)) ? $definition : $definition[1]; - - if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function])) - { - return true; - } - - return false; - } - - /** - * Give actual result from called functions/methods back. - * - * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__) - * @return mixed The result - */ - function hook_return_result($definition) - { - $class = (!is_array($definition)) ? '__global' : $definition[0]; - $function = (!is_array($definition)) ? $definition : $definition[1]; - - if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function])) - { - $result = $this->hook_result[$class][$function]; - unset($this->hook_result[$class][$function]); - return $result; - } - - return; - } - - /** - * Add new function to the allowed hooks. - * - * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__) - */ - function add_hook($definition) - { - if (!is_array($definition)) - { - $definition = array('__global', $definition); - } - - $this->hooks[$definition[0]][$definition[1]] = array(); - } - - /** - * Remove function from the allowed hooks. - * - * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__) - */ - function remove_hook($definition) - { - $class = (!is_array($definition)) ? '__global' : $definition[0]; - $function = (!is_array($definition)) ? $definition : $definition[1]; - - if (isset($this->hooks[$class][$function])) - { - unset($this->hooks[$class][$function]); - - if (isset($this->hook_result[$class][$function])) - { - unset($this->hook_result[$class][$function]); - } - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/mcp/info/mcp_ban.php b/phpBB/includes/mcp/info/mcp_ban.php deleted file mode 100644 index 383df30498..0000000000 --- a/phpBB/includes/mcp/info/mcp_ban.php +++ /dev/null @@ -1,39 +0,0 @@ - 'mcp_ban', - 'title' => 'MCP_BAN', - 'version' => '1.0.0', - 'modes' => array( - 'user' => array('title' => 'MCP_BAN_USERNAMES', 'auth' => 'acl_m_ban', 'cat' => array('MCP_BAN')), - 'ip' => array('title' => 'MCP_BAN_IPS', 'auth' => 'acl_m_ban', 'cat' => array('MCP_BAN')), - 'email' => array('title' => 'MCP_BAN_EMAILS', 'auth' => 'acl_m_ban', 'cat' => array('MCP_BAN')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/mcp/info/mcp_logs.php b/phpBB/includes/mcp/info/mcp_logs.php deleted file mode 100644 index fe2f9fa1d7..0000000000 --- a/phpBB/includes/mcp/info/mcp_logs.php +++ /dev/null @@ -1,39 +0,0 @@ - 'mcp_logs', - 'title' => 'MCP_LOGS', - 'version' => '1.0.0', - 'modes' => array( - 'front' => array('title' => 'MCP_LOGS_FRONT', 'auth' => 'acl_m_ || aclf_m_', 'cat' => array('MCP_LOGS')), - 'forum_logs' => array('title' => 'MCP_LOGS_FORUM_VIEW', 'auth' => 'acl_m_,$id', 'cat' => array('MCP_LOGS')), - 'topic_logs' => array('title' => 'MCP_LOGS_TOPIC_VIEW', 'auth' => 'acl_m_,$id', 'cat' => array('MCP_LOGS')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/mcp/info/mcp_main.php b/phpBB/includes/mcp/info/mcp_main.php deleted file mode 100644 index 9755cdfc07..0000000000 --- a/phpBB/includes/mcp/info/mcp_main.php +++ /dev/null @@ -1,40 +0,0 @@ - 'mcp_main', - 'title' => 'MCP_MAIN', - 'version' => '1.0.0', - 'modes' => array( - 'front' => array('title' => 'MCP_MAIN_FRONT', 'auth' => '', 'cat' => array('MCP_MAIN')), - 'forum_view' => array('title' => 'MCP_MAIN_FORUM_VIEW', 'auth' => 'acl_m_,$id', 'cat' => array('MCP_MAIN')), - 'topic_view' => array('title' => 'MCP_MAIN_TOPIC_VIEW', 'auth' => 'acl_m_,$id', 'cat' => array('MCP_MAIN')), - 'post_details' => array('title' => 'MCP_MAIN_POST_DETAILS', 'auth' => 'acl_m_,$id || (!$id && aclf_m_)', 'cat' => array('MCP_MAIN')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/mcp/info/mcp_notes.php b/phpBB/includes/mcp/info/mcp_notes.php deleted file mode 100644 index afe232e5b5..0000000000 --- a/phpBB/includes/mcp/info/mcp_notes.php +++ /dev/null @@ -1,38 +0,0 @@ - 'mcp_notes', - 'title' => 'MCP_NOTES', - 'version' => '1.0.0', - 'modes' => array( - 'front' => array('title' => 'MCP_NOTES_FRONT', 'auth' => '', 'cat' => array('MCP_NOTES')), - 'user_notes' => array('title' => 'MCP_NOTES_USER', 'auth' => '', 'cat' => array('MCP_NOTES')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/mcp/info/mcp_queue.php b/phpBB/includes/mcp/info/mcp_queue.php deleted file mode 100644 index 7a256642b9..0000000000 --- a/phpBB/includes/mcp/info/mcp_queue.php +++ /dev/null @@ -1,39 +0,0 @@ - 'mcp_queue', - 'title' => 'MCP_QUEUE', - 'version' => '1.0.0', - 'modes' => array( - 'unapproved_topics' => array('title' => 'MCP_QUEUE_UNAPPROVED_TOPICS', 'auth' => 'aclf_m_approve', 'cat' => array('MCP_QUEUE')), - 'unapproved_posts' => array('title' => 'MCP_QUEUE_UNAPPROVED_POSTS', 'auth' => 'aclf_m_approve', 'cat' => array('MCP_QUEUE')), - 'approve_details' => array('title' => 'MCP_QUEUE_APPROVE_DETAILS', 'auth' => 'acl_m_approve,$id || (!$id && aclf_m_approve)', 'cat' => array('MCP_QUEUE')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/mcp/info/mcp_reports.php b/phpBB/includes/mcp/info/mcp_reports.php deleted file mode 100644 index 3893ba5abb..0000000000 --- a/phpBB/includes/mcp/info/mcp_reports.php +++ /dev/null @@ -1,39 +0,0 @@ - 'mcp_reports', - 'title' => 'MCP_REPORTS', - 'version' => '1.0.0', - 'modes' => array( - 'reports' => array('title' => 'MCP_REPORTS_OPEN', 'auth' => 'aclf_m_report', 'cat' => array('MCP_REPORTS')), - 'reports_closed' => array('title' => 'MCP_REPORTS_CLOSED', 'auth' => 'aclf_m_report', 'cat' => array('MCP_REPORTS')), - 'report_details' => array('title' => 'MCP_REPORT_DETAILS', 'auth' => 'acl_m_report,$id || (!$id && aclf_m_report)', 'cat' => array('MCP_REPORTS')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/mcp/info/mcp_warn.php b/phpBB/includes/mcp/info/mcp_warn.php deleted file mode 100644 index 2b0b09f75a..0000000000 --- a/phpBB/includes/mcp/info/mcp_warn.php +++ /dev/null @@ -1,40 +0,0 @@ - 'mcp_warn', - 'title' => 'MCP_WARN', - 'version' => '1.0.0', - 'modes' => array( - 'front' => array('title' => 'MCP_WARN_FRONT', 'auth' => 'aclf_m_warn', 'cat' => array('MCP_WARN')), - 'list' => array('title' => 'MCP_WARN_LIST', 'auth' => 'aclf_m_warn', 'cat' => array('MCP_WARN')), - 'warn_user' => array('title' => 'MCP_WARN_USER', 'auth' => 'aclf_m_warn', 'cat' => array('MCP_WARN')), - 'warn_post' => array('title' => 'MCP_WARN_POST', 'auth' => 'acl_m_warn && acl_f_read,$id', 'cat' => array('MCP_WARN')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/mcp/mcp_ban.php b/phpBB/includes/mcp/mcp_ban.php deleted file mode 100644 index cb6211abda..0000000000 --- a/phpBB/includes/mcp/mcp_ban.php +++ /dev/null @@ -1,190 +0,0 @@ -add_lang(array('acp/ban', 'acp/users')); - $this->tpl_name = 'mcp_ban'; - - // Ban submitted? - if ($bansubmit) - { - // Grab the list of entries - $ban = request_var('ban', '', ($mode === 'user') ? true : false); - - if ($mode === 'user') - { - $ban = utf8_normalize_nfc($ban); - } - - $ban_len = request_var('banlength', 0); - $ban_len_other = request_var('banlengthother', ''); - $ban_exclude = request_var('banexclude', 0); - $ban_reason = utf8_normalize_nfc(request_var('banreason', '', true)); - $ban_give_reason = utf8_normalize_nfc(request_var('bangivereason', '', true)); - - if ($ban) - { - if (confirm_box(true)) - { - user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reason, $ban_give_reason); - - trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . '

    « ' . $user->lang['BACK_TO_PREV'] . ''); - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'mode' => $mode, - 'ban' => $ban, - 'bansubmit' => true, - 'banlength' => $ban_len, - 'banlengthother' => $ban_len_other, - 'banexclude' => $ban_exclude, - 'banreason' => $ban_reason, - 'bangivereason' => $ban_give_reason))); - } - } - } - else if ($unbansubmit) - { - $ban = request_var('unban', array('')); - - if ($ban) - { - if (confirm_box(true)) - { - user_unban($mode, $ban); - - trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . '

    « ' . $user->lang['BACK_TO_PREV'] . ''); - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'mode' => $mode, - 'unbansubmit' => true, - 'unban' => $ban))); - } - } - } - - // Ban length options - $ban_end_text = array(0 => $user->lang['PERMANENT'], 30 => $user->lang['30_MINS'], 60 => $user->lang['1_HOUR'], 360 => $user->lang['6_HOURS'], 1440 => $user->lang['1_DAY'], 10080 => $user->lang['7_DAYS'], 20160 => $user->lang['2_WEEKS'], 40320 => $user->lang['1_MONTH'], -1 => $user->lang['UNTIL'] . ' -> '); - - $ban_end_options = ''; - foreach ($ban_end_text as $length => $text) - { - $ban_end_options .= ''; - } - - // Define language vars - $this->page_title = $user->lang[strtoupper($mode) . '_BAN']; - - $l_ban_explain = $user->lang[strtoupper($mode) . '_BAN_EXPLAIN']; - $l_ban_exclude_explain = $user->lang[strtoupper($mode) . '_BAN_EXCLUDE_EXPLAIN']; - $l_unban_title = $user->lang[strtoupper($mode) . '_UNBAN']; - $l_unban_explain = $user->lang[strtoupper($mode) . '_UNBAN_EXPLAIN']; - $l_no_ban_cell = $user->lang[strtoupper($mode) . '_NO_BANNED']; - - switch ($mode) - { - case 'user': - $l_ban_cell = $user->lang['USERNAME']; - break; - - case 'ip': - $l_ban_cell = $user->lang['IP_HOSTNAME']; - break; - - case 'email': - $l_ban_cell = $user->lang['EMAIL_ADDRESS']; - break; - } - - acp_ban::display_ban_options($mode); - - $template->assign_vars(array( - 'L_TITLE' => $this->page_title, - 'L_EXPLAIN' => $l_ban_explain, - 'L_UNBAN_TITLE' => $l_unban_title, - 'L_UNBAN_EXPLAIN' => $l_unban_explain, - 'L_BAN_CELL' => $l_ban_cell, - 'L_BAN_EXCLUDE_EXPLAIN' => $l_ban_exclude_explain, - 'L_NO_BAN_CELL' => $l_no_ban_cell, - - 'S_USERNAME_BAN' => ($mode == 'user') ? true : false, - - 'U_ACTION' => $this->u_action, - 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=mcp_ban&field=ban'), - )); - - if ($mode != 'user') - { - return; - } - - // As a "service" we will check if any post id is specified and populate the username of the poster id if given - $post_id = request_var('p', 0); - $user_id = request_var('u', 0); - $username = false; - - if ($user_id && $user_id <> ANONYMOUS) - { - $sql = 'SELECT username - FROM ' . USERS_TABLE . ' - WHERE user_id = ' . $user_id; - $result = $db->sql_query($sql); - $username = (string) $db->sql_fetchfield('username'); - $db->sql_freeresult($result); - } - else if ($post_id) - { - $post_info = get_post_data($post_id, 'm_ban'); - - if (sizeof($post_info) && !empty($post_info[$post_id])) - { - $username = $post_info[$post_id]['username']; - } - } - - if ($username) - { - $template->assign_var('USERNAMES', $username); - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php deleted file mode 100644 index 3bc4e9cf03..0000000000 --- a/phpBB/includes/mcp/mcp_forum.php +++ /dev/null @@ -1,447 +0,0 @@ -add_lang(array('viewtopic', 'viewforum')); - - include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx); - - // merge_topic is the quickmod action, merge_topics is the mcp_forum action, and merge_select is the mcp_topic action - $merge_select = ($action == 'merge_select' || $action == 'merge_topic' || $action == 'merge_topics') ? true : false; - - if ($merge_select) - { - // Fixes a "bug" that makes forum_view use the same ordering as topic_view - unset($_POST['sk'], $_POST['sd'], $_REQUEST['sk'], $_REQUEST['sd']); - } - - $forum_id = $forum_info['forum_id']; - $start = request_var('start', 0); - $topic_id_list = request_var('topic_id_list', array(0)); - $post_id_list = request_var('post_id_list', array(0)); - $source_topic_ids = array(request_var('t', 0)); - $to_topic_id = request_var('to_topic_id', 0); - - $url_extra = ''; - $url_extra .= ($forum_id) ? "&f=$forum_id" : ''; - $url_extra .= ($GLOBALS['topic_id']) ? '&t=' . $GLOBALS['topic_id'] : ''; - $url_extra .= ($GLOBALS['post_id']) ? '&p=' . $GLOBALS['post_id'] : ''; - $url_extra .= ($GLOBALS['user_id']) ? '&u=' . $GLOBALS['user_id'] : ''; - - $url = append_sid("{$phpbb_root_path}mcp.$phpEx?$url_extra"); - - // Resync Topics - switch ($action) - { - case 'resync': - $topic_ids = request_var('topic_id_list', array(0)); - mcp_resync_topics($topic_ids); - break; - - case 'merge_topics': - $source_topic_ids = $topic_id_list; - case 'merge_topic': - if ($to_topic_id) - { - merge_topics($forum_id, $source_topic_ids, $to_topic_id); - } - break; - } - - $selected_ids = ''; - if (sizeof($post_id_list) && $action != 'merge_topics') - { - foreach ($post_id_list as $num => $post_id) - { - $selected_ids .= '&post_id_list[' . $num . ']=' . $post_id; - } - } - else if (sizeof($topic_id_list) && $action == 'merge_topics') - { - foreach ($topic_id_list as $num => $topic_id) - { - $selected_ids .= '&topic_id_list[' . $num . ']=' . $topic_id; - } - } - - make_jumpbox($url . "&i=$id&action=$action&mode=$mode" . (($merge_select) ? $selected_ids : ''), $forum_id, false, 'm_', true); - - $topics_per_page = ($forum_info['forum_topics_per_page']) ? $forum_info['forum_topics_per_page'] : $config['topics_per_page']; - - $sort_days = $total = 0; - $sort_key = $sort_dir = ''; - $sort_by_sql = $sort_order_sql = array(); - mcp_sorting('viewforum', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id); - - $forum_topics = ($total == -1) ? $forum_info['forum_topics'] : $total; - $limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : ''; - - $template->assign_vars(array( - 'ACTION' => $action, - 'FORUM_NAME' => $forum_info['forum_name'], - 'FORUM_DESCRIPTION' => generate_text_for_display($forum_info['forum_desc'], $forum_info['forum_desc_uid'], $forum_info['forum_desc_bitfield'], $forum_info['forum_desc_options']), - - 'REPORTED_IMG' => $user->img('icon_topic_reported', 'TOPIC_REPORTED'), - 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'TOPIC_UNAPPROVED'), - 'LAST_POST_IMG' => $user->img('icon_topic_latest', 'VIEW_LATEST_POST'), - 'NEWEST_POST_IMG' => $user->img('icon_topic_newest', 'VIEW_NEWEST_POST'), - - 'S_CAN_REPORT' => $auth->acl_get('m_report', $forum_id), - 'S_CAN_DELETE' => $auth->acl_get('m_delete', $forum_id), - 'S_CAN_MERGE' => $auth->acl_get('m_merge', $forum_id), - 'S_CAN_MOVE' => $auth->acl_get('m_move', $forum_id), - 'S_CAN_FORK' => $auth->acl_get('m_', $forum_id), - 'S_CAN_LOCK' => $auth->acl_get('m_lock', $forum_id), - 'S_CAN_SYNC' => $auth->acl_get('m_', $forum_id), - 'S_CAN_APPROVE' => $auth->acl_get('m_approve', $forum_id), - 'S_MERGE_SELECT' => ($merge_select) ? true : false, - 'S_CAN_MAKE_NORMAL' => $auth->acl_gets('f_sticky', 'f_announce', $forum_id), - 'S_CAN_MAKE_STICKY' => $auth->acl_get('f_sticky', $forum_id), - 'S_CAN_MAKE_ANNOUNCE' => $auth->acl_get('f_announce', $forum_id), - - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id), - 'U_VIEW_FORUM_LOGS' => ($auth->acl_gets('a_', 'm_', $forum_id) && $module->loaded('logs')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=logs&mode=forum_logs&f=' . $forum_id) : '', - - 'S_MCP_ACTION' => $url . "&i=$id&forum_action=$action&mode=$mode&start=$start" . (($merge_select) ? $selected_ids : ''), - - 'PAGINATION' => generate_pagination($url . "&i=$id&action=$action&mode=$mode&sd=$sort_dir&sk=$sort_key&st=$sort_days" . (($merge_select) ? $selected_ids : ''), $forum_topics, $topics_per_page, $start), - 'PAGE_NUMBER' => on_page($forum_topics, $topics_per_page, $start), - 'TOTAL_TOPICS' => ($forum_topics == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $forum_topics), - )); - - // Grab icons - $icons = cache::obtain_icons(); - - $topic_rows = array(); - - if ($config['load_db_lastread']) - { - $read_tracking_join = ' LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id AND tt.user_id = ' . $user->data['user_id'] . ')'; - $read_tracking_select = ', tt.mark_time'; - } - else - { - $read_tracking_join = $read_tracking_select = ''; - } - - $sql = "SELECT t.topic_id - FROM " . TOPICS_TABLE . " t - WHERE t.forum_id IN($forum_id, 0) - " . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . " - $limit_time_sql - ORDER BY t.topic_type DESC, $sort_order_sql"; - $result = $db->sql_query_limit($sql, $topics_per_page, $start); - - $topic_list = $topic_tracking_info = array(); - - while ($row = $db->sql_fetchrow($result)) - { - $topic_list[] = $row['topic_id']; - } - $db->sql_freeresult($result); - - $sql = "SELECT t.*$read_tracking_select - FROM " . TOPICS_TABLE . " t $read_tracking_join - WHERE " . $db->sql_in_set('t.topic_id', $topic_list); - - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - $topic_rows[$row['topic_id']] = $row; - } - $db->sql_freeresult($result); - - // If there is more than one page, but we have no topic list, then the start parameter is... erm... out of sync - if (!sizeof($topic_list) && $forum_topics && $start > 0) - { - redirect($url . "&i=$id&action=$action&mode=$mode"); - } - - // Get topic tracking info - if (sizeof($topic_list)) - { - if ($config['load_db_lastread']) - { - $topic_tracking_info = get_topic_tracking($forum_id, $topic_list, $topic_rows, array($forum_id => $forum_info['mark_time']), array()); - } - else - { - $topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_list, array()); - } - } - - foreach ($topic_list as $topic_id) - { - $topic_title = ''; - - $row = &$topic_rows[$topic_id]; - - $replies = ($auth->acl_get('m_approve', $forum_id)) ? $row['topic_replies_real'] : $row['topic_replies']; - - if ($row['topic_status'] == ITEM_MOVED) - { - $unread_topic = false; - } - else - { - $unread_topic = (isset($topic_tracking_info[$topic_id]) && $row['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false; - } - - // Get folder img, topic status/type related information - $folder_img = $folder_alt = $topic_type = ''; - topic_status($row, $replies, $unread_topic, $folder_img, $folder_alt, $topic_type); - - $topic_title = censor_text($row['topic_title']); - - $topic_unapproved = (!$row['topic_approved'] && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false; - $posts_unapproved = ($row['topic_approved'] && $row['topic_replies'] < $row['topic_replies_real'] && $auth->acl_get('m_approve', $row['forum_id'])) ? true : false; - $u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? $url . '&i=queue&mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . '&t=' . $row['topic_id'] : ''; - - $topic_row = array( - 'ATTACH_ICON_IMG' => ($auth->acl_get('u_download') && $auth->acl_get('f_download', $row['forum_id']) && $row['topic_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', - 'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt), - 'TOPIC_FOLDER_IMG_SRC' => $user->img($folder_img, $folder_alt, false, '', 'src'), - 'TOPIC_ICON_IMG' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '', - 'TOPIC_ICON_IMG_WIDTH' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '', - 'TOPIC_ICON_IMG_HEIGHT' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '', - 'UNAPPROVED_IMG' => ($topic_unapproved || $posts_unapproved) ? $user->img('icon_topic_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '', - - 'TOPIC_AUTHOR' => get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - 'TOPIC_AUTHOR_COLOUR' => get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - 'TOPIC_AUTHOR_FULL' => get_username_string('full', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - 'U_TOPIC_AUTHOR' => get_username_string('profile', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - - 'LAST_POST_AUTHOR' => get_username_string('username', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - 'LAST_POST_AUTHOR_COLOUR' => get_username_string('colour', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - 'LAST_POST_AUTHOR_FULL' => get_username_string('full', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - 'U_LAST_POST_AUTHOR' => get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - - 'TOPIC_TYPE' => $topic_type, - 'TOPIC_TITLE' => $topic_title, - 'REPLIES' => ($auth->acl_get('m_approve', $row['forum_id'])) ? $row['topic_replies_real'] : $row['topic_replies'], - 'LAST_POST_TIME' => $user->format_date($row['topic_last_post_time']), - 'FIRST_POST_TIME' => $user->format_date($row['topic_time']), - 'LAST_POST_SUBJECT' => $row['topic_last_post_subject'], - 'LAST_VIEW_TIME' => $user->format_date($row['topic_last_view_time']), - - 'S_TOPIC_REPORTED' => (!empty($row['topic_reported']) && $auth->acl_get('m_report', $row['forum_id'])) ? true : false, - 'S_TOPIC_UNAPPROVED' => $topic_unapproved, - 'S_POSTS_UNAPPROVED' => $posts_unapproved, - 'S_UNREAD_TOPIC' => $unread_topic, - ); - - if ($row['topic_status'] == ITEM_MOVED) - { - $topic_row = array_merge($topic_row, array( - 'U_VIEW_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t={$row['topic_moved_id']}"), - 'U_DELETE_TOPIC' => ($auth->acl_get('m_delete', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&f=$forum_id&topic_id_list[]={$row['topic_id']}&mode=forum_view&action=delete_topic") : '', - 'S_MOVED_TOPIC' => true, - 'TOPIC_ID' => $row['topic_moved_id'], - )); - } - else - { - if ($action == 'merge_topic' || $action == 'merge_topics') - { - $u_select_topic = $url . "&i=$id&mode=forum_view&action=$action&to_topic_id=" . $row['topic_id'] . $selected_ids; - } - else - { - $u_select_topic = $url . "&i=$id&mode=topic_view&action=merge&to_topic_id=" . $row['topic_id'] . $selected_ids; - } - $topic_row = array_merge($topic_row, array( - 'U_VIEW_TOPIC' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&f=$forum_id&t={$row['topic_id']}&mode=topic_view"), - - 'S_SELECT_TOPIC' => ($merge_select && !in_array($row['topic_id'], $source_topic_ids)) ? true : false, - 'U_SELECT_TOPIC' => $u_select_topic, - 'U_MCP_QUEUE' => $u_mcp_queue, - 'U_MCP_REPORT' => ($auth->acl_get('m_report', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=topic_view&t=' . $row['topic_id'] . '&action=reports') : '', - 'TOPIC_ID' => $row['topic_id'], - 'S_TOPIC_CHECKED' => ($topic_id_list && in_array($row['topic_id'], $topic_id_list)) ? true : false, - )); - } - - $template->assign_block_vars('topicrow', $topic_row); - } - unset($topic_rows); -} - -/** -* Resync topics -*/ -function mcp_resync_topics($topic_ids) -{ - global $auth, $db, $template, $phpEx, $user, $phpbb_root_path; - - if (!sizeof($topic_ids)) - { - trigger_error('NO_TOPIC_SELECTED'); - } - - if (!check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_'))) - { - return; - } - - // Sync everything and perform extra checks separately - sync('topic_reported', 'topic_id', $topic_ids, false, true); - sync('topic_attachment', 'topic_id', $topic_ids, false, true); - sync('topic', 'topic_id', $topic_ids, true, false); - - $sql = 'SELECT topic_id, forum_id, topic_title - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $topic_ids); - $result = $db->sql_query($sql); - - // Log this action - while ($row = $db->sql_fetchrow($result)) - { - add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_TOPIC_RESYNC', $row['topic_title']); - } - $db->sql_freeresult($result); - - $msg = (sizeof($topic_ids) == 1) ? $user->lang['TOPIC_RESYNC_SUCCESS'] : $user->lang['TOPICS_RESYNC_SUCCESS']; - - $redirect = request_var('redirect', $user->data['session_page']); - - meta_refresh(3, $redirect); - trigger_error($msg . '

    ' . sprintf($user->lang['RETURN_PAGE'], '', '')); - - return; -} - -/** -* Merge selected topics into selected topic -*/ -function merge_topics($forum_id, $topic_ids, $to_topic_id) -{ - global $db, $template, $user, $phpEx, $phpbb_root_path, $auth; - - if (!sizeof($topic_ids)) - { - $template->assign_var('MESSAGE', $user->lang['NO_TOPIC_SELECTED']); - return; - } - if (!$to_topic_id) - { - $template->assign_var('MESSAGE', $user->lang['NO_FINAL_TOPIC_SELECTED']); - return; - } - - $topic_data = get_topic_data(array($to_topic_id), 'm_merge'); - - if (!sizeof($topic_data)) - { - $template->assign_var('MESSAGE', $user->lang['NO_FINAL_TOPIC_SELECTED']); - return; - } - - $topic_data = $topic_data[$to_topic_id]; - - $post_id_list = request_var('post_id_list', array(0)); - $start = request_var('start', 0); - - if (!sizeof($post_id_list) && sizeof($topic_ids)) - { - $sql = 'SELECT post_id - FROM ' . POSTS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $topic_ids); - $result = $db->sql_query($sql); - - $post_id_list = array(); - while ($row = $db->sql_fetchrow($result)) - { - $post_id_list[] = $row['post_id']; - } - $db->sql_freeresult($result); - } - - if (!sizeof($post_id_list)) - { - $template->assign_var('MESSAGE', $user->lang['NO_POST_SELECTED']); - return; - } - - if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_merge'))) - { - return; - } - - $redirect = request_var('redirect', build_url(array('_f_', 'quickmod'))); - - $s_hidden_fields = build_hidden_fields(array( - 'i' => 'main', - 'f' => $forum_id, - 'post_id_list' => $post_id_list, - 'to_topic_id' => $to_topic_id, - 'mode' => 'forum_view', - 'action' => 'merge_topics', - 'start' => $start, - 'redirect' => $redirect, - 'topic_id_list' => $topic_ids) - ); - $success_msg = $return_link = ''; - - if (confirm_box(true)) - { - $to_forum_id = $topic_data['forum_id']; - - move_posts($post_id_list, $to_topic_id); - add_log('mod', $to_forum_id, $to_topic_id, 'LOG_MERGE', $topic_data['topic_title']); - - // Message and return links - $success_msg = 'POSTS_MERGED_SUCCESS'; - - // If the topic no longer exist, we will update the topic watch table. - // To not let it error out on users watching both topics, we just return on an error... - $db->sql_return_on_error(true); - $db->sql_query('UPDATE ' . TOPICS_WATCH_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids)); - $db->sql_return_on_error(false); - - $db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids)); - - // Link to the new topic - $return_link .= (($return_link) ? '

    ' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '', ''); - } - else - { - confirm_box(false, 'MERGE_TOPICS', $s_hidden_fields); - } - - $redirect = request_var('redirect', "index.$phpEx"); - $redirect = reapply_sid($redirect); - - if (!$success_msg) - { - return; - } - else - { - meta_refresh(3, append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$to_forum_id&t=$to_topic_id")); - trigger_error($user->lang[$success_msg] . '

    ' . $return_link); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php deleted file mode 100644 index 707fe22685..0000000000 --- a/phpBB/includes/mcp/mcp_front.php +++ /dev/null @@ -1,280 +0,0 @@ -loaded('queue')) - { - $forum_list = get_forum_list('m_approve'); - $post_list = array(); - $forum_names = array(); - - $forum_id = request_var('f', 0); - - $template->assign_var('S_SHOW_UNAPPROVED', (!empty($forum_list)) ? true : false); - - if (!empty($forum_list)) - { - $sql = 'SELECT COUNT(post_id) AS total - FROM ' . POSTS_TABLE . ' - WHERE forum_id IN (0, ' . implode(', ', $forum_list) . ') - AND post_approved = 0'; - $result = $db->sql_query($sql); - $total = (int) $db->sql_fetchfield('total'); - $db->sql_freeresult($result); - - if ($total) - { - $global_id = $forum_list[0]; - - $sql = 'SELECT forum_id, forum_name - FROM ' . FORUMS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $forum_list); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $forum_names[$row['forum_id']] = $row['forum_name']; - } - $db->sql_freeresult($result); - - $sql = 'SELECT post_id - FROM ' . POSTS_TABLE . ' - WHERE forum_id IN (0, ' . implode(', ', $forum_list) . ') - AND post_approved = 0 - ORDER BY post_time DESC'; - $result = $db->sql_query_limit($sql, 5); - - while ($row = $db->sql_fetchrow($result)) - { - $post_list[] = $row['post_id']; - } - $db->sql_freeresult($result); - - if (empty($post_list)) - { - $total = 0; - } - } - - if ($total) - { - $sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.username, u.username_clean, t.topic_id, t.topic_title, t.topic_first_post_id, p.forum_id - FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . ' u - WHERE ' . $db->sql_in_set('p.post_id', $post_list) . ' - AND t.topic_id = p.topic_id - AND p.poster_id = u.user_id - ORDER BY p.post_time DESC'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $global_topic = ($row['forum_id']) ? false : true; - if ($global_topic) - { - $row['forum_id'] = $global_id; - } - - $template->assign_block_vars('unapproved', array( - 'U_POST_DETAILS' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&f=' . $row['forum_id'] . '&p=' . $row['post_id']), - 'U_MCP_FORUM' => (!$global_topic) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=forum_view&f=' . $row['forum_id']) : '', - 'U_MCP_TOPIC' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=topic_view&f=' . $row['forum_id'] . '&t=' . $row['topic_id']), - 'U_FORUM' => (!$global_topic) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : '', - 'U_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&t=' . $row['topic_id']), - 'U_AUTHOR' => ($row['poster_id'] == ANONYMOUS) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['poster_id']), - - 'FORUM_NAME' => (!$global_topic) ? $forum_names[$row['forum_id']] : $user->lang['GLOBAL_ANNOUNCEMENT'], - 'POST_ID' => $row['post_id'], - 'TOPIC_TITLE' => $row['topic_title'], - 'AUTHOR' => ($row['poster_id'] == ANONYMOUS) ? (($row['post_username']) ? $row['post_username'] : $user->lang['GUEST']) : $row['username'], - 'SUBJECT' => ($row['post_subject']) ? $row['post_subject'] : $user->lang['NO_SUBJECT'], - 'POST_TIME' => $user->format_date($row['post_time'])) - ); - } - $db->sql_freeresult($result); - } - - $template->assign_vars(array( - 'S_MCP_QUEUE_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue"), - )); - - if ($total == 0) - { - $template->assign_vars(array( - 'L_UNAPPROVED_TOTAL' => $user->lang['UNAPPROVED_POSTS_ZERO_TOTAL'], - 'S_HAS_UNAPPROVED_POSTS' => false) - ); - } - else - { - $template->assign_vars(array( - 'L_UNAPPROVED_TOTAL' => ($total == 1) ? $user->lang['UNAPPROVED_POST_TOTAL'] : sprintf($user->lang['UNAPPROVED_POSTS_TOTAL'], $total), - 'S_HAS_UNAPPROVED_POSTS' => true) - ); - } - } - } - - // Latest 5 reported - if ($module->loaded('reports')) - { - $forum_list = get_forum_list('m_report'); - - $template->assign_var('S_SHOW_REPORTS', (!empty($forum_list)) ? true : false); - - if (!empty($forum_list)) - { - $sql = 'SELECT COUNT(r.report_id) AS total - FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . ' p - WHERE r.post_id = p.post_id - AND r.report_closed = 0 - AND p.forum_id IN (0, ' . implode(', ', $forum_list) . ')'; - $result = $db->sql_query($sql); - $total = (int) $db->sql_fetchfield('total'); - $db->sql_freeresult($result); - - if ($total) - { - $global_id = $forum_list[0]; - - $sql = $db->sql_build_query('SELECT', array( - 'SELECT' => 'r.report_time, p.post_id, p.post_subject, p.post_time, u.username, u.username_clean, u.user_colour, u.user_id, u2.username as author_name, u2.username_clean as author_name_clean, u2.user_colour as author_colour, u2.user_id as author_id, t.topic_id, t.topic_title, f.forum_id, f.forum_name', - - 'FROM' => array( - REPORTS_TABLE => 'r', - REPORTS_REASONS_TABLE => 'rr', - TOPICS_TABLE => 't', - USERS_TABLE => array('u', 'u2'), - POSTS_TABLE => 'p' - ), - - 'LEFT_JOIN' => array( - array( - 'FROM' => array(FORUMS_TABLE => 'f'), - 'ON' => 'f.forum_id = p.forum_id' - ) - ), - - 'WHERE' => 'r.post_id = p.post_id - AND r.report_closed = 0 - AND r.reason_id = rr.reason_id - AND p.topic_id = t.topic_id - AND r.user_id = u.user_id - AND p.poster_id = u2.user_id - AND p.forum_id IN (0, ' . implode(', ', $forum_list) . ')', - - 'ORDER_BY' => 'p.post_time DESC' - )); - $result = $db->sql_query_limit($sql, 5); - - while ($row = $db->sql_fetchrow($result)) - { - $global_topic = ($row['forum_id']) ? false : true; - if ($global_topic) - { - $row['forum_id'] = $global_id; - } - - $template->assign_block_vars('report', array( - 'U_POST_DETAILS' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'f=' . $row['forum_id'] . '&p=' . $row['post_id'] . "&i=reports&mode=report_details"), - 'U_MCP_FORUM' => (!$global_topic) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'f=' . $row['forum_id'] . "&i=$id&mode=forum_view") : '', - 'U_MCP_TOPIC' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'f=' . $row['forum_id'] . '&t=' . $row['topic_id'] . "&i=$id&mode=topic_view"), - 'U_FORUM' => (!$global_topic) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : '', - 'U_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&t=' . $row['topic_id']), - - 'REPORTER_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), - 'REPORTER' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']), - 'REPORTER_COLOUR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']), - 'U_REPORTER' => get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']), - - 'AUTHOR_FULL' => get_username_string('full', $row['author_id'], $row['author_name'], $row['author_colour']), - 'AUTHOR' => get_username_string('username', $row['author_id'], $row['author_name'], $row['author_colour']), - 'AUTHOR_COLOUR' => get_username_string('colour', $row['author_id'], $row['author_name'], $row['author_colour']), - 'U_AUTHOR' => get_username_string('profile', $row['author_id'], $row['author_name'], $row['author_colour']), - - 'FORUM_NAME' => (!$global_topic) ? $row['forum_name'] : $user->lang['GLOBAL_ANNOUNCEMENT'], - 'TOPIC_TITLE' => $row['topic_title'], - 'SUBJECT' => ($row['post_subject']) ? $row['post_subject'] : $user->lang['NO_SUBJECT'], - 'REPORT_TIME' => $user->format_date($row['report_time']), - 'POST_TIME' => $user->format_date($row['post_time']), - )); - } - } - - if ($total == 0) - { - $template->assign_vars(array( - 'L_REPORTS_TOTAL' => $user->lang['REPORTS_ZERO_TOTAL'], - 'S_HAS_REPORTS' => false) - ); - } - else - { - $template->assign_vars(array( - 'L_REPORTS_TOTAL' => ($total == 1) ? $user->lang['REPORT_TOTAL'] : sprintf($user->lang['REPORTS_TOTAL'], $total), - 'S_HAS_REPORTS' => true) - ); - } - } - } - - // Latest 5 logs - if ($module->loaded('logs')) - { - $forum_list = get_forum_list('m_'); - - if (!empty($forum_list)) - { - // Add forum_id 0 for global announcements - $forum_list[] = 0; - - $log_count = 0; - $log = array(); - view_log('mod', $log, $log_count, 5, 0, $forum_list); - - foreach ($log as $row) - { - $template->assign_block_vars('log', array( - 'USERNAME' => $row['username_full'], - 'IP' => $row['ip'], - 'TIME' => $user->format_date($row['time']), - 'ACTION' => $row['action'], - 'U_VIEW_TOPIC' => (!empty($row['viewtopic'])) ? $row['viewtopic'] : '', - 'U_VIEWLOGS' => (!empty($row['viewlogs'])) ? $row['viewlogs'] : '') - ); - } - } - - $template->assign_vars(array( - 'S_SHOW_LOGS' => (!empty($forum_list)) ? true : false, - 'S_HAS_LOGS' => (!empty($log)) ? true : false) - ); - } - - $template->assign_var('S_MCP_ACTION', append_sid("{$phpbb_root_path}mcp.$phpEx")); - make_jumpbox(append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=forum_view'), 0, false, 'm_', true); -} - -?> \ No newline at end of file diff --git a/phpBB/includes/mcp/mcp_logs.php b/phpBB/includes/mcp/mcp_logs.php deleted file mode 100755 index 6c74e65f5b..0000000000 --- a/phpBB/includes/mcp/mcp_logs.php +++ /dev/null @@ -1,214 +0,0 @@ -p_master = &$p_master; - } - - function main($id, $mode) - { - global $auth, $db, $user, $template; - global $config, $phpbb_root_path, $phpEx; - - $user->add_lang('acp/common'); - - $action = request_var('action', array('' => '')); - - if (is_array($action)) - { - list($action, ) = each($action); - } - else - { - $action = request_var('action', ''); - } - - // Set up general vars - $start = request_var('start', 0); - $deletemark = ($action == 'del_marked') ? true : false; - $deleteall = ($action == 'del_all') ? true : false; - $marked = request_var('mark', array(0)); - - // Sort keys - $sort_days = request_var('st', 0); - $sort_key = request_var('sk', 't'); - $sort_dir = request_var('sd', 'd'); - - $this->tpl_name = 'mcp_logs'; - $this->page_title = 'MCP_LOGS'; - - $forum_list = get_forum_list('m_'); - $forum_list[] = 0; - - $forum_id = $topic_id = 0; - - switch ($mode) - { - case 'front': - break; - - case 'forum_logs': - $forum_id = request_var('f', 0); - - if (!in_array($forum_id, $forum_list)) - { - trigger_error('NOT_AUTHORISED'); - } - - $forum_list = array($forum_id); - break; - - case 'topic_logs': - $topic_id = request_var('t', 0); - - $sql = 'SELECT forum_id - FROM ' . TOPICS_TABLE . ' - WHERE topic_id = ' . $topic_id; - $result = $db->sql_query($sql); - $forum_id = (int) $db->sql_fetchfield('forum_id'); - $db->sql_freeresult($result); - - if (!in_array($forum_id, $forum_list)) - { - trigger_error('NOT_AUTHORISED'); - } - - $forum_list = array($forum_id); - break; - } - - // Delete entries if requested and able - if (($deletemark || $deleteall) && $auth->acl_get('a_clearlogs')) - { - if (confirm_box(true)) - { - if ($deletemark && sizeof($marked)) - { - $sql = 'DELETE FROM ' . LOG_TABLE . ' - WHERE log_type = ' . LOG_MOD . ' - AND ' . $db->sql_in_set('forum_id', $forum_list) . ' - AND ' . $db->sql_in_set('log_id', $marked); - $db->sql_query($sql); - - add_log('admin', 'LOG_CLEAR_MOD'); - } - else if ($deleteall) - { - $sql = 'DELETE FROM ' . LOG_TABLE . ' - WHERE log_type = ' . LOG_MOD . ' - AND ' . $db->sql_in_set('forum_id', $forum_list); - - if ($mode == 'topic_logs') - { - $sql .= ' AND topic_id = ' . $topic_id; - } - $db->sql_query($sql); - - add_log('admin', 'LOG_CLEAR_MOD'); - } - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'f' => $forum_id, - 't' => $topic_id, - 'start' => $start, - 'delmarked' => $deletemark, - 'delall' => $deleteall, - 'mark' => $marked, - 'st' => $sort_days, - 'sk' => $sort_key, - 'sd' => $sort_dir, - 'i' => $id, - 'mode' => $mode, - 'action' => request_var('action', array('' => '')))) - ); - } - } - - // Sorting - $limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); - $sort_by_text = array('u' => $user->lang['SORT_USERNAME'], 't' => $user->lang['SORT_DATE'], 'i' => $user->lang['SORT_IP'], 'o' => $user->lang['SORT_ACTION']); - $sort_by_sql = array('u' => 'u.username_clean', 't' => 'l.log_time', 'i' => 'l.log_ip', 'o' => 'l.log_operation'); - - $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = ''; - gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); - - // Define where and sort sql for use in displaying logs - $sql_where = ($sort_days) ? (time() - ($sort_days * 86400)) : 0; - $sql_sort = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC'); - - // Grab log data - $log_data = array(); - $log_count = 0; - view_log('mod', $log_data, $log_count, $config['topics_per_page'], $start, $forum_list, $topic_id, 0, $sql_where, $sql_sort); - - $template->assign_vars(array( - 'PAGE_NUMBER' => on_page($log_count, $config['topics_per_page'], $start), - 'TOTAL' => ($log_count == 1) ? $user->lang['TOTAL_LOG'] : sprintf($user->lang['TOTAL_LOGS'], $log_count), - 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param", $log_count, $config['topics_per_page'], $start), - - 'L_TITLE' => $user->lang['MCP_LOGS'], - - 'U_POST_ACTION' => $this->u_action, - 'S_CLEAR_ALLOWED' => ($auth->acl_get('a_clearlogs')) ? true : false, - 'S_SELECT_SORT_DIR' => $s_sort_dir, - 'S_SELECT_SORT_KEY' => $s_sort_key, - 'S_SELECT_SORT_DAYS' => $s_limit_days, - 'S_LOGS' => ($log_count > 0), - ) - ); - - foreach ($log_data as $row) - { - $data = array(); - - $checks = array('viewtopic', 'viewforum'); - foreach ($checks as $check) - { - if (isset($row[$check]) && $row[$check]) - { - $data[] = '' . $user->lang['LOGVIEW_' . strtoupper($check)] . ''; - } - } - - $template->assign_block_vars('log', array( - 'USERNAME' => $row['username_full'], - 'IP' => $row['ip'], - 'DATE' => $user->format_date($row['time']), - 'ACTION' => $row['action'], - 'DATA' => (sizeof($data)) ? implode(' | ', $data) : '', - 'ID' => $row['id'], - ) - ); - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php deleted file mode 100644 index 3b4f27d751..0000000000 --- a/phpBB/includes/mcp/mcp_main.php +++ /dev/null @@ -1,1227 +0,0 @@ -p_master = &$p_master; - } - - function main($id, $mode) - { - global $auth, $db, $user, $template, $action; - global $config, $phpbb_root_path, $phpEx; - - $quickmod = ($mode == 'quickmod') ? true : false; - - switch ($action) - { - case 'lock': - case 'unlock': - $topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0)); - - if (!sizeof($topic_ids)) - { - trigger_error('NO_TOPIC_SELECTED'); - } - - lock_unlock($action, $topic_ids); - break; - - case 'lock_post': - case 'unlock_post': - - $post_ids = (!$quickmod) ? request_var('post_id_list', array(0)) : array(request_var('p', 0)); - - if (!sizeof($post_ids)) - { - trigger_error('NO_POST_SELECTED'); - } - - lock_unlock($action, $post_ids); - break; - - case 'make_announce': - case 'make_sticky': - case 'make_global': - case 'make_normal': - - $topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0)); - - if (!sizeof($topic_ids)) - { - trigger_error('NO_TOPIC_SELECTED'); - } - - change_topic_type($action, $topic_ids); - break; - - case 'move': - $user->add_lang('viewtopic'); - - $topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0)); - - if (!sizeof($topic_ids)) - { - trigger_error('NO_TOPIC_SELECTED'); - } - - mcp_move_topic($topic_ids); - break; - - case 'fork': - $user->add_lang('viewtopic'); - - $topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0)); - - if (!sizeof($topic_ids)) - { - trigger_error('NO_TOPIC_SELECTED'); - } - - mcp_fork_topic($topic_ids); - break; - - case 'delete_topic': - $user->add_lang('viewtopic'); - - $topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0)); - - if (!sizeof($topic_ids)) - { - trigger_error('NO_TOPIC_SELECTED'); - } - - mcp_delete_topic($topic_ids); - break; - - case 'delete_post': - $user->add_lang('posting'); - - $post_ids = (!$quickmod) ? request_var('post_id_list', array(0)) : array(request_var('p', 0)); - - if (!sizeof($post_ids)) - { - trigger_error('NO_POST_SELECTED'); - } - - mcp_delete_post($post_ids); - break; - } - - switch ($mode) - { - case 'front': - include($phpbb_root_path . 'includes/mcp/mcp_front.' . $phpEx); - - $user->add_lang('acp/common'); - - mcp_front_view($id, $mode, $action); - - $this->tpl_name = 'mcp_front'; - $this->page_title = 'MCP_MAIN'; - break; - - case 'forum_view': - include($phpbb_root_path . 'includes/mcp/mcp_forum.' . $phpEx); - - $user->add_lang('viewforum'); - - $forum_id = request_var('f', 0); - - $forum_info = get_forum_data($forum_id, 'm_', true); - - if (!sizeof($forum_info)) - { - $this->main('main', 'front'); - return; - } - - $forum_info = $forum_info[$forum_id]; - - mcp_forum_view($id, $mode, $action, $forum_info); - - $this->tpl_name = 'mcp_forum'; - $this->page_title = 'MCP_MAIN_FORUM_VIEW'; - break; - - case 'topic_view': - include($phpbb_root_path . 'includes/mcp/mcp_topic.' . $phpEx); - - mcp_topic_view($id, $mode, $action); - - $this->tpl_name = 'mcp_topic'; - $this->page_title = 'MCP_MAIN_TOPIC_VIEW'; - break; - - case 'post_details': - include($phpbb_root_path . 'includes/mcp/mcp_post.' . $phpEx); - - mcp_post_details($id, $mode, $action); - - $this->tpl_name = ($action == 'whois') ? 'mcp_whois' : 'mcp_post'; - $this->page_title = 'MCP_MAIN_POST_DETAILS'; - break; - - default: - trigger_error('NO_MODE', E_USER_ERROR); - break; - } - } -} - -/** -* Lock/Unlock Topic/Post -*/ -function lock_unlock($action, $ids) -{ - global $auth, $user, $db, $phpEx, $phpbb_root_path; - - if ($action == 'lock' || $action == 'unlock') - { - $table = TOPICS_TABLE; - $sql_id = 'topic_id'; - $set_id = 'topic_status'; - $l_prefix = 'TOPIC'; - } - else - { - $table = POSTS_TABLE; - $sql_id = 'post_id'; - $set_id = 'post_edit_locked'; - $l_prefix = 'POST'; - } - - $orig_ids = $ids; - - if (!check_ids($ids, $table, $sql_id, array('m_lock'))) - { - // Make sure that for f_user_lock only the lock action is triggered. - if ($action != 'lock') - { - return; - } - - $ids = $orig_ids; - - if (!check_ids($ids, $table, $sql_id, array('f_user_lock'))) - { - return; - } - } - unset($orig_ids); - - $redirect = request_var('redirect', build_url(array('_f_', 'action', 'quickmod'))); - - $s_hidden_fields = build_hidden_fields(array( - $sql_id . '_list' => $ids, - 'action' => $action, - 'redirect' => $redirect) - ); - $success_msg = ''; - - if (confirm_box(true)) - { - $sql = "UPDATE $table - SET $set_id = " . (($action == 'lock' || $action == 'lock_post') ? ITEM_LOCKED : ITEM_UNLOCKED) . ' - WHERE ' . $db->sql_in_set($sql_id, $ids); - $db->sql_query($sql); - - $data = ($action == 'lock' || $action == 'unlock') ? get_topic_data($ids) : get_post_data($ids); - - foreach ($data as $id => $row) - { - add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_' . strtoupper($action), $row['topic_title']); - } - - $success_msg = $l_prefix . ((sizeof($ids) == 1) ? '' : 'S') . '_' . (($action == 'lock' || $action == 'lock_post') ? 'LOCKED' : 'UNLOCKED') . '_SUCCESS'; - } - else - { - confirm_box(false, strtoupper($action) . '_' . $l_prefix . ((sizeof($ids) == 1) ? '' : 'S'), $s_hidden_fields); - } - - $redirect = request_var('redirect', "index.$phpEx"); - $redirect = reapply_sid($redirect); - - if (!$success_msg) - { - redirect($redirect); - } - else - { - meta_refresh(2, $redirect); - trigger_error($user->lang[$success_msg] . '

    ' . sprintf($user->lang['RETURN_PAGE'], '', '')); - } -} - -/** -* Change Topic Type -*/ -function change_topic_type($action, $topic_ids) -{ - global $auth, $user, $db, $phpEx, $phpbb_root_path; - - // For changing topic types, we only allow operations in one forum. - $forum_id = check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('f_announce', 'f_sticky', 'm_'), true); - - if ($forum_id === false) - { - return; - } - - switch ($action) - { - case 'make_announce': - $new_topic_type = POST_ANNOUNCE; - $check_acl = 'f_announce'; - $l_new_type = (sizeof($topic_ids) == 1) ? 'MCP_MAKE_ANNOUNCEMENT' : 'MCP_MAKE_ANNOUNCEMENTS'; - break; - - case 'make_global': - $new_topic_type = POST_GLOBAL; - $check_acl = 'f_announce'; - $l_new_type = (sizeof($topic_ids) == 1) ? 'MCP_MAKE_GLOBAL' : 'MCP_MAKE_GLOBALS'; - break; - - case 'make_sticky': - $new_topic_type = POST_STICKY; - $check_acl = 'f_sticky'; - $l_new_type = (sizeof($topic_ids) == 1) ? 'MCP_MAKE_STICKY' : 'MCP_MAKE_STICKIES'; - break; - - default: - $new_topic_type = POST_NORMAL; - $check_acl = ''; - $l_new_type = (sizeof($topic_ids) == 1) ? 'MCP_MAKE_NORMAL' : 'MCP_MAKE_NORMALS'; - break; - } - - $redirect = request_var('redirect', build_url(array('_f_', 'action', 'quickmod'))); - - $s_hidden_fields = array( - 'topic_id_list' => $topic_ids, - 'f' => $forum_id, - 'action' => $action, - 'redirect' => $redirect, - ); - $success_msg = ''; - - if (confirm_box(true)) - { - if ($new_topic_type != POST_GLOBAL) - { - $sql = 'UPDATE ' . TOPICS_TABLE . " - SET topic_type = $new_topic_type - WHERE " . $db->sql_in_set('topic_id', $topic_ids) . ' - AND forum_id <> 0'; - $db->sql_query($sql); - - // Reset forum id if a global topic is within the array - $to_forum_id = request_var('to_forum_id', 0); - - if ($to_forum_id) - { - $sql = 'UPDATE ' . TOPICS_TABLE . " - SET topic_type = $new_topic_type, forum_id = $to_forum_id - WHERE " . $db->sql_in_set('topic_id', $topic_ids) . ' - AND forum_id = 0'; - $db->sql_query($sql); - - // Update forum_ids for all posts - $sql = 'UPDATE ' . POSTS_TABLE . " - SET forum_id = $to_forum_id - WHERE " . $db->sql_in_set('topic_id', $topic_ids) . ' - AND forum_id = 0'; - $db->sql_query($sql); - - // Do a little forum sync stuff - $sql = 'SELECT SUM(t.topic_replies + t.topic_approved) as topic_posts, COUNT(t.topic_approved) as topics_authed - FROM ' . TOPICS_TABLE . ' t - WHERE ' . $db->sql_in_set('t.topic_id', $topic_ids); - $result = $db->sql_query($sql); - $row_data = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $sync_sql = array(); - - if ($row_data['topic_posts']) - { - $sync_sql[$to_forum_id][] = 'forum_posts = forum_posts + ' . (int) $row_data['topic_posts']; - } - - if ($row_data['topics_authed']) - { - $sync_sql[$to_forum_id][] = 'forum_topics = forum_topics + ' . (int) $row_data['topics_authed']; - } - - $sync_sql[$to_forum_id][] = 'forum_topics_real = forum_topics_real + ' . (int) sizeof($topic_ids); - - foreach ($sync_sql as $forum_id_key => $array) - { - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET ' . implode(', ', $array) . ' - WHERE forum_id = ' . $forum_id_key; - $db->sql_query($sql); - } - - sync('forum', 'forum_id', $to_forum_id); - } - } - else - { - // Get away with those topics already being a global announcement by re-calculating $topic_ids - $sql = 'SELECT topic_id - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $topic_ids) . ' - AND forum_id <> 0'; - $result = $db->sql_query($sql); - - $topic_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $topic_ids[] = $row['topic_id']; - } - $db->sql_freeresult($result); - - if (sizeof($topic_ids)) - { - // Delete topic shadows for global announcements - $sql = 'DELETE FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_moved_id', $topic_ids); - $db->sql_query($sql); - - $sql = 'UPDATE ' . TOPICS_TABLE . " - SET topic_type = $new_topic_type, forum_id = 0 - WHERE " . $db->sql_in_set('topic_id', $topic_ids); - $db->sql_query($sql); - - // Update forum_ids for all posts - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET forum_id = 0 - WHERE ' . $db->sql_in_set('topic_id', $topic_ids); - $db->sql_query($sql); - - // Do a little forum sync stuff - $sql = 'SELECT SUM(t.topic_replies + t.topic_approved) as topic_posts, COUNT(t.topic_approved) as topics_authed - FROM ' . TOPICS_TABLE . ' t - WHERE ' . $db->sql_in_set('t.topic_id', $topic_ids); - $result = $db->sql_query($sql); - $row_data = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $sync_sql = array(); - - if ($row_data['topic_posts']) - { - $sync_sql[$forum_id][] = 'forum_posts = forum_posts - ' . (int) $row_data['topic_posts']; - } - - if ($row_data['topics_authed']) - { - $sync_sql[$forum_id][] = 'forum_topics = forum_topics - ' . (int) $row_data['topics_authed']; - } - - $sync_sql[$forum_id][] = 'forum_topics_real = forum_topics_real - ' . (int) sizeof($topic_ids); - - foreach ($sync_sql as $forum_id_key => $array) - { - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET ' . implode(', ', $array) . ' - WHERE forum_id = ' . $forum_id_key; - $db->sql_query($sql); - } - - sync('forum', 'forum_id', $forum_id); - } - } - - $success_msg = (sizeof($topic_ids) == 1) ? 'TOPIC_TYPE_CHANGED' : 'TOPICS_TYPE_CHANGED'; - - if (sizeof($topic_ids)) - { - $data = get_topic_data($topic_ids); - - foreach ($data as $topic_id => $row) - { - add_log('mod', $forum_id, $topic_id, 'LOG_TOPIC_TYPE_CHANGED', $row['topic_title']); - } - } - } - else - { - // Global topic involved? - $global_involved = false; - - if ($new_topic_type != POST_GLOBAL) - { - $sql = 'SELECT forum_id - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $topic_ids) . ' - AND forum_id = 0'; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - $global_involved = true; - } - } - - if ($global_involved) - { - global $template; - - $template->assign_vars(array( - 'S_FORUM_SELECT' => make_forum_select(request_var('f', $forum_id), false, false, true, true), - 'S_CAN_LEAVE_SHADOW' => false, - 'ADDITIONAL_MSG' => (sizeof($topic_ids) == 1) ? $user->lang['SELECT_FORUM_GLOBAL_ANNOUNCEMENT'] : $user->lang['SELECT_FORUM_GLOBAL_ANNOUNCEMENTS']) - ); - - confirm_box(false, $l_new_type, build_hidden_fields($s_hidden_fields), 'mcp_move.html'); - } - else - { - confirm_box(false, $l_new_type, build_hidden_fields($s_hidden_fields)); - } - } - - $redirect = request_var('redirect', "index.$phpEx"); - $redirect = reapply_sid($redirect); - - if (!$success_msg) - { - redirect($redirect); - } - else - { - meta_refresh(2, $redirect); - trigger_error($user->lang[$success_msg] . '

    ' . sprintf($user->lang['RETURN_PAGE'], '', '')); - } -} - -/** -* Move Topic -*/ -function mcp_move_topic($topic_ids) -{ - global $auth, $user, $db, $template; - global $phpEx, $phpbb_root_path; - - // Here we limit the operation to one forum only - $forum_id = check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_move'), true); - - if ($forum_id === false) - { - return; - } - - $to_forum_id = request_var('to_forum_id', 0); - $redirect = request_var('redirect', build_url(array('_f_', 'action', 'quickmod'))); - $additional_msg = $success_msg = ''; - - $s_hidden_fields = build_hidden_fields(array( - 'topic_id_list' => $topic_ids, - 'f' => $forum_id, - 'action' => 'move', - 'redirect' => $redirect) - ); - - if ($to_forum_id) - { - $forum_data = get_forum_data($to_forum_id); - - if (!sizeof($forum_data)) - { - $additional_msg = $user->lang['FORUM_NOT_EXIST']; - } - else - { - $forum_data = $forum_data[$to_forum_id]; - - if ($forum_data['forum_type'] != FORUM_POST) - { - $additional_msg = $user->lang['FORUM_NOT_POSTABLE']; - } - else if (!$auth->acl_get('f_post', $to_forum_id)) - { - $additional_msg = $user->lang['USER_CANNOT_POST']; - } - else if ($forum_id == $to_forum_id) - { - $additional_msg = $user->lang['CANNOT_MOVE_SAME_FORUM']; - } - } - } - else if (isset($_POST['confirm'])) - { - $additional_msg = $user->lang['FORUM_NOT_EXIST']; - } - - if (!$to_forum_id || $additional_msg) - { - unset($_POST['confirm']); - unset($_REQUEST['confirm_key']); - } - - if (confirm_box(true)) - { - $topic_data = get_topic_data($topic_ids); - $leave_shadow = (isset($_POST['move_leave_shadow'])) ? true : false; - - $topics_moved = sizeof($topic_ids); - $topics_authed_moved = 0; - $forum_sync_data = array(); - - $forum_sync_data[$forum_id] = current($topic_data); - $forum_sync_data[$to_forum_id] = $forum_data; - - foreach ($topic_data as $topic_id => $topic_info) - { - if ($topic_info['topic_approved'] == '1') - { - $topics_authed_moved++; - } - } - - $db->sql_transaction('begin'); - - $sql = 'SELECT SUM(t.topic_replies + t.topic_approved) as topic_posts - FROM ' . TOPICS_TABLE . ' t - WHERE ' . $db->sql_in_set('t.topic_id', $topic_ids); - $result = $db->sql_query($sql); - $row_data = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $sync_sql = array(); - - if ($row_data['topic_posts']) - { - $sync_sql[$forum_id][] = 'forum_posts = forum_posts - ' . (int) $row_data['topic_posts']; - $sync_sql[$to_forum_id][] = 'forum_posts = forum_posts + ' . (int) $row_data['topic_posts']; - } - - if ($topics_authed_moved) - { - $sync_sql[$to_forum_id][] = 'forum_topics = forum_topics + ' . (int) $topics_authed_moved; - } - - $sync_sql[$to_forum_id][] = 'forum_topics_real = forum_topics_real + ' . (int) $topics_moved; - - // Move topics, but do not resync yet - move_topics($topic_ids, $to_forum_id, false); - - $forum_ids = array($to_forum_id); - foreach ($topic_data as $topic_id => $row) - { - // Get the list of forums to resync, add a log entry - $forum_ids[] = $row['forum_id']; - add_log('mod', $to_forum_id, $topic_id, 'LOG_MOVE', $row['forum_name']); - - // If we have moved a global announcement, we need to correct the topic type - if ($row['topic_type'] == POST_GLOBAL) - { - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET topic_type = ' . POST_ANNOUNCE . ' - WHERE topic_id = ' . (int) $row['topic_id']; - $db->sql_query($sql); - } - - // Leave a redirection if required and only if the topic is visible to users - if ($leave_shadow && $row['topic_approved'] && $row['topic_type'] != POST_GLOBAL) - { - $shadow = array( - 'forum_id' => (int) $row['forum_id'], - 'icon_id' => (int) $row['icon_id'], - 'topic_attachment' => (int) $row['topic_attachment'], - 'topic_approved' => 1, - 'topic_reported' => (int) $row['topic_reported'], - 'topic_title' => (string) $row['topic_title'], - 'topic_poster' => (int) $row['topic_poster'], - 'topic_time' => (int) $row['topic_time'], - 'topic_time_limit' => (int) $row['topic_time_limit'], - 'topic_views' => (int) $row['topic_views'], - 'topic_replies' => (int) $row['topic_replies'], - 'topic_replies_real' => (int) $row['topic_replies_real'], - 'topic_status' => ITEM_MOVED, - 'topic_type' => POST_NORMAL, - 'topic_first_post_id' => (int) $row['topic_first_post_id'], - 'topic_first_poster_colour'=>(string) $row['topic_first_poster_colour'], - 'topic_first_poster_name'=> (string) $row['topic_first_poster_name'], - 'topic_last_post_id' => (int) $row['topic_last_post_id'], - 'topic_last_poster_id' => (int) $row['topic_last_poster_id'], - 'topic_last_poster_colour'=>(string) $row['topic_last_poster_colour'], - 'topic_last_poster_name'=> (string) $row['topic_last_poster_name'], - 'topic_last_post_subject'=> (string) $row['topic_last_post_subject'], - 'topic_last_post_time' => (int) $row['topic_last_post_time'], - 'topic_last_view_time' => (int) $row['topic_last_view_time'], - 'topic_moved_id' => (int) $row['topic_id'], - 'topic_bumped' => (int) $row['topic_bumped'], - 'topic_bumper' => (int) $row['topic_bumper'], - 'poll_title' => (string) $row['poll_title'], - 'poll_start' => (int) $row['poll_start'], - 'poll_length' => (int) $row['poll_length'], - 'poll_max_options' => (int) $row['poll_max_options'], - 'poll_last_vote' => (int) $row['poll_last_vote'] - ); - - $db->sql_query('INSERT INTO ' . TOPICS_TABLE . $db->sql_build_array('INSERT', $shadow)); - - $topics_authed_moved--; - $topics_moved--; - } - } - unset($topic_data); - - $sync_sql[$forum_id][] = 'forum_topics_real = forum_topics_real - ' . (int) $topics_moved; - - if ($topics_authed_moved) - { - $sync_sql[$forum_id][] = 'forum_topics = forum_topics - ' . (int) $topics_authed_moved; - } - - $success_msg = (sizeof($topic_ids) == 1) ? 'TOPIC_MOVED_SUCCESS' : 'TOPICS_MOVED_SUCCESS'; - - foreach ($sync_sql as $forum_id_key => $array) - { - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET ' . implode(', ', $array) . ' - WHERE forum_id = ' . $forum_id_key; - $db->sql_query($sql); - } - - $db->sql_transaction('commit'); - - sync('forum', 'forum_id', array($forum_id, $to_forum_id)); - } - else - { - $template->assign_vars(array( - 'S_FORUM_SELECT' => make_forum_select($to_forum_id, $forum_id, false, true, true, true), - 'S_CAN_LEAVE_SHADOW' => true, - 'ADDITIONAL_MSG' => $additional_msg) - ); - - confirm_box(false, 'MOVE_TOPIC' . ((sizeof($topic_ids) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_move.html'); - } - - $redirect = request_var('redirect', "index.$phpEx"); - $redirect = reapply_sid($redirect); - - if (!$success_msg) - { - redirect($redirect); - } - else - { - meta_refresh(3, $redirect); - - $message = $user->lang[$success_msg]; - $message .= '

    ' . sprintf($user->lang['RETURN_PAGE'], '', ''); - $message .= '

    ' . sprintf($user->lang['RETURN_FORUM'], '', ''); - $message .= '

    ' . sprintf($user->lang['RETURN_NEW_FORUM'], '', ''); - - trigger_error($message); - } -} - -/** -* Delete Topics -*/ -function mcp_delete_topic($topic_ids) -{ - global $auth, $user, $db, $phpEx, $phpbb_root_path; - - if (!check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_delete'))) - { - return; - } - - $redirect = request_var('redirect', build_url(array('_f_', 'action', 'quickmod'))); - $forum_id = request_var('f', 0); - - $s_hidden_fields = build_hidden_fields(array( - 'topic_id_list' => $topic_ids, - 'f' => $forum_id, - 'action' => 'delete_topic', - 'redirect' => $redirect) - ); - $success_msg = ''; - - if (confirm_box(true)) - { - $success_msg = (sizeof($topic_ids) == 1) ? 'TOPIC_DELETED_SUCCESS' : 'TOPICS_DELETED_SUCCESS'; - - $data = get_topic_data($topic_ids); - - foreach ($data as $topic_id => $row) - { - add_log('mod', $row['forum_id'], 0, 'LOG_TOPIC_DELETED', $row['topic_title']); - } - - $return = delete_topics('topic_id', $topic_ids); - } - else - { - confirm_box(false, (sizeof($topic_ids) == 1) ? 'DELETE_TOPIC' : 'DELETE_TOPICS', $s_hidden_fields); - } - - $redirect = request_var('redirect', "index.$phpEx"); - $redirect = reapply_sid($redirect); - - if (!$success_msg) - { - redirect($redirect); - } - else - { - $redirect_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id); - meta_refresh(3, $redirect_url); - trigger_error($user->lang[$success_msg] . '

    ' . sprintf($user->lang['RETURN_FORUM'], '', '')); - } -} - -/** -* Delete Posts -*/ -function mcp_delete_post($post_ids) -{ - global $auth, $user, $db, $phpEx, $phpbb_root_path; - - if (!check_ids($post_ids, POSTS_TABLE, 'post_id', array('m_delete'))) - { - return; - } - - $redirect = request_var('redirect', build_url(array('_f_', 'action', 'quickmod'))); - $forum_id = request_var('f', 0); - - $s_hidden_fields = build_hidden_fields(array( - 'post_id_list' => $post_ids, - 'f' => $forum_id, - 'action' => 'delete_post', - 'redirect' => $redirect) - ); - $success_msg = ''; - - if (confirm_box(true)) - { - if (!function_exists('delete_posts')) - { - include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); - } - - // Count the number of topics that are affected - // I did not use COUNT(DISTINCT ...) because I remember having problems - // with it on older versions of MySQL -- Ashe - - $sql = 'SELECT DISTINCT topic_id - FROM ' . POSTS_TABLE . ' - WHERE ' . $db->sql_in_set('post_id', $post_ids); - $result = $db->sql_query($sql); - - $topic_id_list = array(); - while ($row = $db->sql_fetchrow($result)) - { - $topic_id_list[] = $row['topic_id']; - } - $affected_topics = sizeof($topic_id_list); - $db->sql_freeresult($result); - - $post_data = get_post_data($post_ids); - - foreach ($post_data as $id => $row) - { - add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_DELETE_POST', $row['post_subject']); - } - - // Now delete the posts, topics and forums are automatically resync'ed - delete_posts('post_id', $post_ids); - - $sql = 'SELECT COUNT(topic_id) AS topics_left - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $topic_id_list); - $result = $db->sql_query_limit($sql, 1); - - $deleted_topics = ($row = $db->sql_fetchrow($result)) ? ($affected_topics - $row['topics_left']) : $affected_topics; - $db->sql_freeresult($result); - - $topic_id = request_var('t', 0); - - // Return links - $return_link = array(); - if ($affected_topics == 1 && !$deleted_topics && $topic_id) - { - $return_link[] = sprintf($user->lang['RETURN_TOPIC'], '', ''); - } - $return_link[] = sprintf($user->lang['RETURN_FORUM'], '', ''); - - if (sizeof($post_ids) == 1) - { - if ($deleted_topics) - { - // We deleted the only post of a topic, which in turn has - // been removed from the database - $success_msg = $user->lang['TOPIC_DELETED_SUCCESS']; - } - else - { - $success_msg = $user->lang['POST_DELETED_SUCCESS']; - } - } - else - { - if ($deleted_topics) - { - // Some of topics disappeared - $success_msg = $user->lang['POSTS_DELETED_SUCCESS'] . '

    ' . $user->lang['EMPTY_TOPICS_REMOVED_WARNING']; - } - else - { - $success_msg = $user->lang['POSTS_DELETED_SUCCESS']; - } - } - } - else - { - confirm_box(false, (sizeof($post_ids) == 1) ? 'DELETE_POST' : 'DELETE_POSTS', $s_hidden_fields); - } - - $redirect = request_var('redirect', "index.$phpEx"); - $redirect = reapply_sid($redirect); - - if (!$success_msg) - { - redirect($redirect); - } - else - { - meta_refresh(3, $redirect); - trigger_error($success_msg . '

    ' . sprintf($user->lang['RETURN_PAGE'], '', '') . '

    ' . implode('

    ', $return_link)); - } -} - -/** -* Fork Topic -*/ -function mcp_fork_topic($topic_ids) -{ - global $auth, $user, $db, $template, $config; - global $phpEx, $phpbb_root_path; - - if (!check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_'))) - { - return; - } - - $to_forum_id = request_var('to_forum_id', 0); - $forum_id = request_var('f', 0); - $redirect = request_var('redirect', build_url(array('_f_', 'action', 'quickmod'))); - $additional_msg = $success_msg = ''; - - $s_hidden_fields = build_hidden_fields(array( - 'topic_id_list' => $topic_ids, - 'f' => $forum_id, - 'action' => 'fork', - 'redirect' => $redirect) - ); - - if ($to_forum_id) - { - $forum_data = get_forum_data($to_forum_id); - - if (!sizeof($topic_ids)) - { - $additional_msg = $user->lang['NO_TOPIC_SELECTED']; - } - else if (!sizeof($forum_data)) - { - $additional_msg = $user->lang['FORUM_NOT_EXIST']; - } - else - { - $forum_data = $forum_data[$to_forum_id]; - - if ($forum_data['forum_type'] != FORUM_POST) - { - $additional_msg = $user->lang['FORUM_NOT_POSTABLE']; - } - else if (!$auth->acl_get('f_post', $to_forum_id)) - { - $additional_msg = $user->lang['USER_CANNOT_POST']; - } - } - } - else if (isset($_POST['confirm'])) - { - $additional_msg = $user->lang['FORUM_NOT_EXIST']; - } - - if ($additional_msg) - { - unset($_POST['confirm']); - unset($_REQUEST['confirm_key']); - } - - if (confirm_box(true)) - { - $topic_data = get_topic_data($topic_ids); - - $total_posts = 0; - $new_topic_id_list = array(); - - foreach ($topic_data as $topic_id => $topic_row) - { - $sql_ary = array( - 'forum_id' => (int) $to_forum_id, - 'icon_id' => (int) $topic_row['icon_id'], - 'topic_attachment' => (int) $topic_row['topic_attachment'], - 'topic_approved' => 1, - 'topic_reported' => 0, - 'topic_title' => (string) $topic_row['topic_title'], - 'topic_poster' => (int) $topic_row['topic_poster'], - 'topic_time' => (int) $topic_row['topic_time'], - 'topic_replies' => (int) $topic_row['topic_replies_real'], - 'topic_replies_real' => (int) $topic_row['topic_replies_real'], - 'topic_status' => (int) $topic_row['topic_status'], - 'topic_type' => (int) $topic_row['topic_type'], - 'topic_first_poster_name' => (string) $topic_row['topic_first_poster_name'], - 'topic_last_poster_id' => (int) $topic_row['topic_last_poster_id'], - 'topic_last_poster_name' => (string) $topic_row['topic_last_poster_name'], - 'topic_last_post_time' => (int) $topic_row['topic_last_post_time'], - 'topic_last_view_time' => (int) $topic_row['topic_last_view_time'], - 'topic_bumped' => (int) $topic_row['topic_bumped'], - 'topic_bumper' => (int) $topic_row['topic_bumper'], - 'poll_title' => (string) $topic_row['poll_title'], - 'poll_start' => (int) $topic_row['poll_start'], - 'poll_length' => (int) $topic_row['poll_length'] - ); - - $db->sql_query('INSERT INTO ' . TOPICS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); - $new_topic_id = $db->sql_nextid(); - $new_topic_id_list[$topic_id] = $new_topic_id; - - if ($topic_row['poll_start']) - { - $poll_rows = array(); - - $sql = 'SELECT * - FROM ' . POLL_OPTIONS_TABLE . " - WHERE topic_id = $topic_id"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $sql_ary = array( - 'poll_option_id' => (int) $row['poll_option_id'], - 'topic_id' => (int) $new_topic_id, - 'poll_option_text' => (string) $row['poll_option_text'], - 'poll_option_total' => 0 - ); - - $db->sql_query('INSERT INTO ' . POLL_OPTIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); - } - } - - $sql = 'SELECT * - FROM ' . POSTS_TABLE . " - WHERE topic_id = $topic_id - ORDER BY post_time ASC"; - $result = $db->sql_query($sql); - - $post_rows = array(); - while ($row = $db->sql_fetchrow($result)) - { - $post_rows[] = $row; - } - $db->sql_freeresult($result); - - if (!sizeof($post_rows)) - { - continue; - } - - $total_posts += sizeof($post_rows); - foreach ($post_rows as $row) - { - $sql_ary = array( - 'topic_id' => (int) $new_topic_id, - 'forum_id' => (int) $to_forum_id, - 'poster_id' => (int) $row['poster_id'], - 'icon_id' => (int) $row['icon_id'], - 'poster_ip' => (string) $row['poster_ip'], - 'post_time' => (int) $row['post_time'], - 'post_approved' => 1, - 'post_reported' => 0, - 'enable_bbcode' => (int) $row['enable_bbcode'], - 'enable_smilies' => (int) $row['enable_smilies'], - 'enable_magic_url' => (int) $row['enable_magic_url'], - 'enable_sig' => (int) $row['enable_sig'], - 'post_username' => (string) $row['post_username'], - 'post_subject' => (string) $row['post_subject'], - 'post_text' => (string) $row['post_text'], - 'post_edit_reason' => (string) $row['post_edit_reason'], - 'post_edit_user' => (int) $row['post_edit_user'], - 'post_checksum' => (string) $row['post_checksum'], - 'post_attachment' => (int) $row['post_attachment'], - 'bbcode_bitfield' => $row['bbcode_bitfield'], - 'bbcode_uid' => (string) $row['bbcode_uid'], - 'post_edit_time' => (int) $row['post_edit_time'], - 'post_edit_count' => (int) $row['post_edit_count'], - 'post_edit_locked' => (int) $row['post_edit_locked'], - 'post_postcount' => 0, - ); - - $db->sql_query('INSERT INTO ' . POSTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); - $new_post_id = $db->sql_nextid(); - - // Copy whether the topic is dotted - markread('post', $to_forum_id, $new_topic_id, 0, $row['poster_id']); - - // Copy Attachments - if ($row['post_attachment']) - { - $sql = 'SELECT * FROM ' . ATTACHMENTS_TABLE . " - WHERE post_msg_id = {$row['post_id']} - AND topic_id = $topic_id - AND in_message = 0"; - $result = $db->sql_query($sql); - - $sql_ary = array(); - while ($attach_row = $db->sql_fetchrow($result)) - { - $sql_ary[] = array( - 'post_msg_id' => (int) $new_post_id, - 'topic_id' => (int) $new_topic_id, - 'in_message' => 0, - 'is_orphan' => (int) $attach_row['is_orphan'], - 'poster_id' => (int) $attach_row['poster_id'], - 'physical_filename' => (string) basename($attach_row['physical_filename']), - 'real_filename' => (string) basename($attach_row['real_filename']), - 'download_count' => (int) $attach_row['download_count'], - 'attach_comment' => (string) $attach_row['attach_comment'], - 'extension' => (string) $attach_row['extension'], - 'mimetype' => (string) $attach_row['mimetype'], - 'filesize' => (int) $attach_row['filesize'], - 'filetime' => (int) $attach_row['filetime'], - 'thumbnail' => (int) $attach_row['thumbnail'] - ); - } - $db->sql_freeresult($result); - - if (sizeof($sql_ary)) - { - $db->sql_multi_insert(ATTACHMENTS_TABLE, $sql_ary); - } - } - } - - $sql = 'SELECT user_id, notify_status - FROM ' . TOPICS_WATCH_TABLE . ' - WHERE topic_id = ' . $topic_id; - $result = $db->sql_query($sql); - - $sql_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - $sql_ary[] = array( - 'topic_id' => (int) $new_topic_id, - 'user_id' => (int) $row['user_id'], - 'notify_status' => (int) $row['notify_status'], - ); - } - $db->sql_freeresult($result); - - if (sizeof($sql_ary)) - { - $db->sql_multi_insert(TOPICS_WATCH_TABLE, $sql_ary); - } - } - - // Sync new topics, parent forums and board stats - sync('topic', 'topic_id', $new_topic_id_list); - - $sync_sql = array(); - - $sync_sql[$to_forum_id][] = 'forum_posts = forum_posts + ' . $total_posts; - $sync_sql[$to_forum_id][] = 'forum_topics = forum_topics + ' . sizeof($new_topic_id_list); - $sync_sql[$to_forum_id][] = 'forum_topics_real = forum_topics_real + ' . sizeof($new_topic_id_list); - - foreach ($sync_sql as $forum_id_key => $array) - { - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET ' . implode(', ', $array) . ' - WHERE forum_id = ' . $forum_id_key; - $db->sql_query($sql); - } - - sync('forum', 'forum_id', $to_forum_id); - set_config('num_topics', $config['num_topics'] + sizeof($new_topic_id_list), true); - set_config('num_posts', $config['num_posts'] + $total_posts, true); - - foreach ($new_topic_id_list as $topic_id => $new_topic_id) - { - add_log('mod', $to_forum_id, $new_topic_id, 'LOG_FORK', $topic_row['forum_name']); - } - - $success_msg = (sizeof($topic_ids) == 1) ? 'TOPIC_FORKED_SUCCESS' : 'TOPICS_FORKED_SUCCESS'; - } - else - { - $template->assign_vars(array( - 'S_FORUM_SELECT' => make_forum_select($to_forum_id, false, false, true, true, true), - 'S_CAN_LEAVE_SHADOW' => false, - 'ADDITIONAL_MSG' => $additional_msg) - ); - - confirm_box(false, 'FORK_TOPIC' . ((sizeof($topic_ids) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_move.html'); - } - - $redirect = request_var('redirect', "index.$phpEx"); - $redirect = reapply_sid($redirect); - - if (!$success_msg) - { - redirect($redirect); - } - else - { - $redirect_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id); - meta_refresh(3, $redirect_url); - $return_link = sprintf($user->lang['RETURN_FORUM'], '', ''); - - if ($forum_id != $to_forum_id) - { - $return_link .= '

    ' . sprintf($user->lang['RETURN_NEW_FORUM'], '', ''); - } - - trigger_error($user->lang[$success_msg] . '

    ' . $return_link); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php deleted file mode 100755 index b4804d56ea..0000000000 --- a/phpBB/includes/mcp/mcp_notes.php +++ /dev/null @@ -1,244 +0,0 @@ -p_master = &$p_master; - } - - function main($id, $mode) - { - global $auth, $db, $user, $template; - global $config, $phpbb_root_path, $phpEx; - - $action = request_var('action', array('' => '')); - - if (is_array($action)) - { - list($action, ) = each($action); - } - - $this->page_title = 'MCP_NOTES'; - - switch ($mode) - { - case 'front': - $template->assign_vars(array( - 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=mcp&field=username&select_single=true'), - 'U_POST_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes'), - - 'L_TITLE' => $user->lang['MCP_NOTES'], - )); - - $this->tpl_name = 'mcp_notes_front'; - break; - - case 'user_notes': - $user->add_lang('acp/common'); - - $this->mcp_notes_user_view($action); - $this->tpl_name = 'mcp_notes_user'; - break; - } - } - - /** - * Display user notes - */ - function mcp_notes_user_view($action) - { - global $phpEx, $phpbb_root_path, $config; - global $template, $db, $user, $auth; - - $user_id = request_var('u', 0); - $username = request_var('username', '', true); - $start = request_var('start', 0); - $st = request_var('st', 0); - $sk = request_var('sk', 'b'); - $sd = request_var('sd', 'd'); - - add_form_key('mcp_notes'); - - $sql_where = ($user_id) ? "user_id = $user_id" : "username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'"; - - $sql = 'SELECT * - FROM ' . USERS_TABLE . " - WHERE $sql_where"; - $result = $db->sql_query($sql); - $userrow = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$userrow) - { - trigger_error('NO_USER'); - } - - $user_id = $userrow['user_id']; - - // Populate user id to the currently active module (this module) - // The following method is another way of adjusting module urls. It is the easy variant if we want - // to directly adjust the current module url based on data retrieved within the same module. - if (strpos($this->u_action, "&u=$user_id") === false) - { - $this->p_master->adjust_url('&u=' . $user_id); - $this->u_action .= "&u=$user_id"; - } - - $deletemark = ($action == 'del_marked') ? true : false; - $deleteall = ($action == 'del_all') ? true : false; - $marked = request_var('marknote', array(0)); - $usernote = utf8_normalize_nfc(request_var('usernote', '', true)); - - // Handle any actions - if (($deletemark || $deleteall) && $auth->acl_get('a_clearlogs')) - { - $where_sql = ''; - if ($deletemark && $marked) - { - $sql_in = array(); - foreach ($marked as $mark) - { - $sql_in[] = $mark; - } - $where_sql = ' AND ' . $db->sql_in_set('log_id', $sql_in); - unset($sql_in); - } - - if ($where_sql || $deleteall) - { - if (check_form_key('mcp_notes')) - { - $sql = 'DELETE FROM ' . LOG_TABLE . ' - WHERE log_type = ' . LOG_USERS . " - AND reportee_id = $user_id - $where_sql"; - $db->sql_query($sql); - - add_log('admin', 'LOG_CLEAR_USER', $userrow['username']); - - $msg = ($deletemark) ? 'MARKED_NOTES_DELETED' : 'ALL_NOTES_DELETED'; - } - else - { - $msg = 'FORM_INVALID'; - } - $redirect = $this->u_action . '&u=' . $user_id; - meta_refresh(3, $redirect); - trigger_error($user->lang[$msg] . '

    ' . sprintf($user->lang['RETURN_PAGE'], '', '')); - } - } - - if ($usernote && $action == 'add_feedback') - { - if (check_form_key('mcp_notes')) - { - add_log('admin', 'LOG_USER_FEEDBACK', $userrow['username']); - add_log('mod', 0, 0, 'LOG_USER_FEEDBACK', $userrow['username']); - - add_log('user', $user_id, 'LOG_USER_GENERAL', $usernote); - $msg = $user->lang['USER_FEEDBACK_ADDED']; - } - else - { - $msg = $user->lang['FORM_INVALID']; - } - $redirect = $this->u_action; - meta_refresh(3, $redirect); - - trigger_error($msg . '

    ' . sprintf($user->lang['RETURN_PAGE'], '', '')); - } - - // Generate the appropriate user information for the user we are looking at - if (!function_exists('get_user_avatar')) - { - include($phpbb_root_path . 'includes/functions_display.' . $phpEx); - } - - $rank_title = $rank_img = ''; - $avatar_img = get_user_avatar($userrow['user_avatar'], $userrow['user_avatar_type'], $userrow['user_avatar_width'], $userrow['user_avatar_height']); - - $limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); - $sort_by_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_DATE'], 'c' => $user->lang['SORT_IP'], 'd' => $user->lang['SORT_ACTION']); - $sort_by_sql = array('a' => 'u.username_clean', 'b' => 'l.log_time', 'c' => 'l.log_ip', 'd' => 'l.log_operation'); - - $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = ''; - gen_sort_selects($limit_days, $sort_by_text, $st, $sk, $sd, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); - - // Define where and sort sql for use in displaying logs - $sql_where = ($st) ? (time() - ($st * 86400)) : 0; - $sql_sort = $sort_by_sql[$sk] . ' ' . (($sd == 'd') ? 'DESC' : 'ASC'); - - $log_data = array(); - $log_count = 0; - view_log('user', $log_data, $log_count, $config['posts_per_page'], $start, 0, 0, $user_id, $sql_where, $sql_sort); - - if ($log_count) - { - $template->assign_var('S_USER_NOTES', true); - - foreach ($log_data as $row) - { - $template->assign_block_vars('usernotes', array( - 'REPORT_BY' => $row['username_full'], - 'REPORT_AT' => $user->format_date($row['time']), - 'ACTION' => $row['action'], - 'IP' => $row['ip'], - 'ID' => $row['id']) - ); - } - } - - $template->assign_vars(array( - 'U_POST_ACTION' => $this->u_action, - 'S_CLEAR_ALLOWED' => ($auth->acl_get('a_clearlogs')) ? true : false, - 'S_SELECT_SORT_DIR' => $s_sort_dir, - 'S_SELECT_SORT_KEY' => $s_sort_key, - 'S_SELECT_SORT_DAYS' => $s_limit_days, - - 'L_TITLE' => $user->lang['MCP_NOTES_USER'], - - 'PAGE_NUMBER' => on_page($log_count, $config['posts_per_page'], $start), - 'PAGINATION' => generate_pagination($this->u_action . "&st=$st&sk=$sk&sd=$sd", $log_count, $config['posts_per_page'], $start), - 'TOTAL_REPORTS' => ($log_count == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $log_count), - - 'USERNAME' => $userrow['username'], - 'USER_COLOR' => (!empty($userrow['user_colour'])) ? $userrow['user_colour'] : '', - 'RANK_TITLE' => $rank_title, - 'JOINED' => $user->format_date($userrow['user_regdate']), - 'POSTS' => ($userrow['user_posts']) ? $userrow['user_posts'] : 0, - 'WARNINGS' => ($userrow['user_warnings']) ? $userrow['user_warnings'] : 0, - - 'AVATAR_IMG' => $avatar_img, - 'RANK_IMG' => $rank_img, - ) - ); - } - -} - -?> \ No newline at end of file diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php deleted file mode 100644 index 8d4ea46e31..0000000000 --- a/phpBB/includes/mcp/mcp_post.php +++ /dev/null @@ -1,501 +0,0 @@ -add_lang('posting'); - - $post_id = request_var('p', 0); - $start = request_var('start', 0); - - // Get post data - $post_info = get_post_data(array($post_id), false, true); - - add_form_key('mcp_post_details'); - - if (!sizeof($post_info)) - { - trigger_error('POST_NOT_EXIST'); - } - - $post_info = $post_info[$post_id]; - $url = append_sid("{$phpbb_root_path}mcp.$phpEx?" . extra_url()); - - switch ($action) - { - case 'whois': - - if ($auth->acl_get('m_info', $post_info['forum_id'])) - { - $ip = request_var('ip', ''); - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - - $template->assign_vars(array( - 'RETURN_POST' => sprintf($user->lang['RETURN_POST'], '', ''), - 'U_RETURN_POST' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&mode=$mode&p=$post_id"), - 'L_RETURN_POST' => sprintf($user->lang['RETURN_POST'], '', ''), - 'WHOIS' => user_ipwhois($ip), - )); - } - - // We're done with the whois page so return - return; - - break; - - case 'chgposter': - case 'chgposter_ip': - - if ($action == 'chgposter') - { - $username = request_var('username', '', true); - $sql_where = "username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'"; - } - else - { - $new_user_id = request_var('u', 0); - $sql_where = 'user_id = ' . $new_user_id; - } - - $sql = 'SELECT * - FROM ' . USERS_TABLE . ' - WHERE ' . $sql_where; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error('NO_USER'); - } - - if ($auth->acl_get('m_chgposter', $post_info['forum_id'])) - { - if (check_form_key('mcp_post_details')) - { - change_poster($post_info, $row); - } - else - { - trigger_error('FORM_INVALID'); - } - } - - break; - } - - // Set some vars - $users_ary = $usernames_ary = array(); - $attachments = $extensions = array(); - $post_id = $post_info['post_id']; - $topic_tracking_info = array(); - - // Get topic tracking info - if ($config['load_db_lastread']) - { - $tmp_topic_data = array($post_info['topic_id'] => $post_info); - $topic_tracking_info = get_topic_tracking($post_info['forum_id'], $post_info['topic_id'], $tmp_topic_data, array($post_info['forum_id'] => $post_info['forum_mark_time'])); - unset($tmp_topic_data); - } - else - { - $topic_tracking_info = get_complete_topic_tracking($post_info['forum_id'], $post_info['topic_id']); - } - - $post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false; - - // Process message, leave it uncensored - $message = $post_info['post_text']; - - if ($post_info['bbcode_bitfield']) - { - include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); - $bbcode = new bbcode($post_info['bbcode_bitfield']); - $bbcode->bbcode_second_pass($message, $post_info['bbcode_uid'], $post_info['bbcode_bitfield']); - } - - $message = bbcode_nl2br($message); - $message = smiley_text($message); - - if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id'])) - { - $extensions = cache::obtain_attach_extensions($post_info['forum_id']); - - $sql = 'SELECT * - FROM ' . ATTACHMENTS_TABLE . ' - WHERE post_msg_id = ' . $post_id . ' - AND in_message = 0 - ORDER BY filetime DESC, post_msg_id ASC'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $attachments[] = $row; - } - $db->sql_freeresult($result); - - if (sizeof($attachments)) - { - $update_count = array(); - parse_attachments($post_info['forum_id'], $message, $attachments, $update_count); - } - - // Display not already displayed Attachments for this post, we already parsed them. ;) - if (!empty($attachments)) - { - $template->assign_var('S_HAS_ATTACHMENTS', true); - - foreach ($attachments as $attachment) - { - $template->assign_block_vars('attachment', array( - 'DISPLAY_ATTACHMENT' => $attachment) - ); - } - } - } - - $template->assign_vars(array( - 'U_MCP_ACTION' => "$url&i=main&quickmod=1", // Use this for mode paramaters - 'U_POST_ACTION' => "$url&i=$id&mode=post_details", // Use this for action parameters - 'U_APPROVE_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&p=$post_id&f={$post_info['forum_id']}"), - - 'S_CAN_VIEWIP' => $auth->acl_get('m_info', $post_info['forum_id']), - 'S_CAN_CHGPOSTER' => $auth->acl_get('m_chgposter', $post_info['forum_id']), - 'S_CAN_LOCK_POST' => $auth->acl_get('m_lock', $post_info['forum_id']), - 'S_CAN_DELETE_POST' => $auth->acl_get('m_delete', $post_info['forum_id']), - - 'S_POST_REPORTED' => ($post_info['post_reported']) ? true : false, - 'S_POST_UNAPPROVED' => (!$post_info['post_approved']) ? true : false, - 'S_POST_LOCKED' => ($post_info['post_edit_locked']) ? true : false, - 'S_USER_NOTES' => true, - 'S_CLEAR_ALLOWED' => ($auth->acl_get('a_clearlogs')) ? true : false, - - 'U_EDIT' => ($auth->acl_get('m_edit', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&f={$post_info['forum_id']}&p={$post_info['post_id']}") : '', - 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=mcp_chgposter&field=username&select_single=true'), - 'U_MCP_APPROVE' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&f=' . $post_info['forum_id'] . '&p=' . $post_id), - 'U_MCP_REPORT' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=report_details&f=' . $post_info['forum_id'] . '&p=' . $post_id), - 'U_MCP_USER_NOTES' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $post_info['user_id']), - 'U_MCP_WARN_USER' => ($auth->acl_get('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user&u=' . $post_info['user_id']) : '', - 'U_VIEW_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&p=' . $post_info['post_id'] . '#p' . $post_info['post_id']), - 'U_VIEW_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&t=' . $post_info['topic_id']), - - 'MINI_POST_IMG' => ($post_unread) ? $user->img('icon_post_target_unread', 'NEW_POST') : $user->img('icon_post_target', 'POST'), - - 'RETURN_TOPIC' => sprintf($user->lang['RETURN_TOPIC'], '", ''), - 'RETURN_FORUM' => sprintf($user->lang['RETURN_FORUM'], '', ''), - 'REPORTED_IMG' => $user->img('icon_topic_reported', $user->lang['POST_REPORTED']), - 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', $user->lang['POST_UNAPPROVED']), - 'EDIT_IMG' => $user->img('icon_post_edit', $user->lang['EDIT_POST']), - 'SEARCH_IMG' => $user->img('icon_user_search', $user->lang['SEARCH']), - - 'POST_AUTHOR_FULL' => get_username_string('full', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']), - 'POST_AUTHOR_COLOUR' => get_username_string('colour', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']), - 'POST_AUTHOR' => get_username_string('username', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']), - 'U_POST_AUTHOR' => get_username_string('profile', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']), - - 'POST_PREVIEW' => $message, - 'POST_SUBJECT' => $post_info['post_subject'], - 'POST_DATE' => $user->format_date($post_info['post_time']), - 'POST_IP' => $post_info['poster_ip'], - 'POST_IPADDR' => ($auth->acl_get('m_info', $post_info['forum_id']) && request_var('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '', - 'POST_ID' => $post_info['post_id'], - - 'U_LOOKUP_IP' => ($auth->acl_get('m_info', $post_info['forum_id'])) ? "$url&i=$id&mode=$mode&lookup={$post_info['poster_ip']}#ip" : '', - 'U_WHOIS' => ($auth->acl_get('m_info', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&mode=$mode&action=whois&p=$post_id&ip={$post_info['poster_ip']}") : '', - )); - - // Get User Notes - $log_data = array(); - $log_count = 0; - view_log('user', $log_data, $log_count, $config['posts_per_page'], 0, 0, 0, $post_info['user_id']); - - if ($log_count) - { - $template->assign_var('S_USER_NOTES', true); - - foreach ($log_data as $row) - { - $template->assign_block_vars('usernotes', array( - 'REPORT_BY' => $row['username_full'], - 'REPORT_AT' => $user->format_date($row['time']), - 'ACTION' => $row['action'], - 'ID' => $row['id']) - ); - } - } - - // Get Reports - if ($auth->acl_get('m_', $post_info['forum_id'])) - { - $sql = 'SELECT r.*, re.*, u.user_id, u.username - FROM ' . REPORTS_TABLE . ' r, ' . USERS_TABLE . ' u, ' . REPORTS_REASONS_TABLE . " re - WHERE r.post_id = $post_id - AND r.reason_id = re.reason_id - AND u.user_id = r.user_id - ORDER BY r.report_time DESC"; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - $template->assign_var('S_SHOW_REPORTS', true); - - do - { - // If the reason is defined within the language file, we will use the localized version, else just use the database entry... - if (isset($user->lang['report_reasons']['TITLE'][strtoupper($row['reason_title'])]) && isset($user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])])) - { - $row['reson_description'] = $user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])]; - $row['reason_title'] = $user->lang['report_reasons']['TITLE'][strtoupper($row['reason_title'])]; - } - - $template->assign_block_vars('reports', array( - 'REPORT_ID' => $row['report_id'], - 'REASON_TITLE' => $row['reason_title'], - 'REASON_DESC' => $row['reason_description'], - 'REPORTER' => ($row['user_id'] != ANONYMOUS) ? $row['username'] : $user->lang['GUEST'], - 'U_REPORTER' => ($row['user_id'] != ANONYMOUS) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['user_id']) : '', - 'USER_NOTIFY' => ($row['user_notify']) ? true : false, - 'REPORT_TIME' => $user->format_date($row['report_time']), - 'REPORT_TEXT' => bbcode_nl2br(trim($row['report_text'])), - )); - } - while ($row = $db->sql_fetchrow($result)); - } - $db->sql_freeresult($result); - } - - // Get IP - if ($auth->acl_get('m_info', $post_info['forum_id'])) - { - $rdns_ip_num = request_var('rdns', ''); - - if ($rdns_ip_num != 'all') - { - $template->assign_vars(array( - 'U_LOOKUP_ALL' => "$url&i=main&mode=post_details&rdns=all") - ); - } - - // Get other users who've posted under this IP - $sql = 'SELECT poster_id, COUNT(poster_id) as postings - FROM ' . POSTS_TABLE . " - WHERE poster_ip = '" . $db->sql_escape($post_info['poster_ip']) . "' - GROUP BY poster_id - ORDER BY postings DESC"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - // Fill the user select list with users who have posted under this IP - if ($row['poster_id'] != $post_info['poster_id']) - { - $users_ary[$row['poster_id']] = $row; - } - } - $db->sql_freeresult($result); - - if (sizeof($users_ary)) - { - // Get the usernames - $sql = 'SELECT user_id, username - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', array_keys($users_ary)); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $users_ary[$row['user_id']]['username'] = $row['username']; - $usernames_ary[utf8_clean_string($row['username'])] = $users_ary[$row['user_id']]; - } - $db->sql_freeresult($result); - - foreach ($users_ary as $user_id => $user_row) - { - $template->assign_block_vars('userrow', array( - 'USERNAME' => ($user_id == ANONYMOUS) ? $user->lang['GUEST'] : $user_row['username'], - 'NUM_POSTS' => $user_row['postings'], - 'L_POST_S' => ($user_row['postings'] == 1) ? $user->lang['POST'] : $user->lang['POSTS'], - - 'U_PROFILE' => ($user_id == ANONYMOUS) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $user_id), - 'U_SEARCHPOSTS' => append_sid("{$phpbb_root_path}search.$phpEx", 'author_id=' . $user_id . '&sr=topics')) - ); - } - } - - // Get other IP's this user has posted under - - // A compound index on poster_id, poster_ip (posts table) would help speed up this query a lot, - // but the extra size is only valuable if there are persons having more than a thousands posts. - // This is better left to the really really big forums. - - $sql = 'SELECT poster_ip, COUNT(poster_ip) AS postings - FROM ' . POSTS_TABLE . ' - WHERE poster_id = ' . $post_info['poster_id'] . " - GROUP BY poster_ip - ORDER BY postings DESC"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $hostname = (($rdns_ip_num == $row['poster_ip'] || $rdns_ip_num == 'all') && $row['poster_ip']) ? @gethostbyaddr($row['poster_ip']) : ''; - - $template->assign_block_vars('iprow', array( - 'IP' => $row['poster_ip'], - 'HOSTNAME' => $hostname, - 'NUM_POSTS' => $row['postings'], - 'L_POST_S' => ($row['postings'] == 1) ? $user->lang['POST'] : $user->lang['POSTS'], - - 'U_LOOKUP_IP' => ($rdns_ip_num == $row['poster_ip'] || $rdns_ip_num == 'all') ? '' : "$url&i=$id&mode=post_details&rdns={$row['poster_ip']}#ip", - 'U_WHOIS' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&mode=$mode&action=whois&p=$post_id&ip={$row['poster_ip']}")) - ); - } - $db->sql_freeresult($result); - - $user_select = ''; - - if (sizeof($usernames_ary)) - { - ksort($usernames_ary); - - foreach ($usernames_ary as $row) - { - $user_select .= '\n"; - } - } - - $template->assign_var('S_USER_SELECT', $user_select); - } - -} - -/** -* Change a post's poster -*/ -function change_poster(&$post_info, $userdata) -{ - global $auth, $db, $config, $phpbb_root_path, $phpEx; - - if (empty($userdata) || $userdata['user_id'] == $post_info['user_id']) - { - return; - } - - $post_id = $post_info['post_id']; - - $sql = 'UPDATE ' . POSTS_TABLE . " - SET poster_id = {$userdata['user_id']} - WHERE post_id = $post_id"; - $db->sql_query($sql); - - // Resync topic/forum if needed - if ($post_info['topic_last_post_id'] == $post_id || $post_info['forum_last_post_id'] == $post_id || $post_info['topic_first_post_id'] == $post_id) - { - sync('topic', 'topic_id', $post_info['topic_id'], false, false); - sync('forum', 'forum_id', $post_info['forum_id'], false, false); - } - - // Adjust post counts - if ($post_info['post_postcount']) - { - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_posts = user_posts - 1 - WHERE user_id = ' . $post_info['user_id'] .' - AND user_posts > 0'; - $db->sql_query($sql); - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_posts = user_posts + 1 - WHERE user_id = ' . $userdata['user_id']; - $db->sql_query($sql); - } - - // Add posted to information for this topic for the new user - markread('post', $post_info['forum_id'], $post_info['topic_id'], time(), $userdata['user_id']); - - // Remove the dotted topic option if the old user has no more posts within this topic - if ($config['load_db_track'] && $post_info['user_id'] != ANONYMOUS) - { - $sql = 'SELECT topic_id - FROM ' . POSTS_TABLE . ' - WHERE topic_id = ' . $post_info['topic_id'] . ' - AND poster_id = ' . $post_info['user_id']; - $result = $db->sql_query_limit($sql, 1); - $topic_id = (int) $db->sql_fetchfield('topic_id'); - $db->sql_freeresult($result); - - if (!$topic_id) - { - $sql = 'DELETE FROM ' . TOPICS_POSTED_TABLE . ' - WHERE user_id = ' . $post_info['user_id'] . ' - AND topic_id = ' . $post_info['topic_id']; - $db->sql_query($sql); - } - } - - // change the poster_id within the attachments table, else the data becomes out of sync and errors displayed because of wrong ownership - if ($post_info['post_attachment']) - { - $sql = 'UPDATE ' . ATTACHMENTS_TABLE . ' - SET poster_id = ' . $userdata['user_id'] . ' - WHERE poster_id = ' . $post_info['user_id'] . ' - AND post_msg_id = ' . $post_info['post_id'] . ' - AND topic_id = ' . $post_info['topic_id']; - $db->sql_query($sql); - } - - // refresh search cache of this post - $search_type = basename($config['search_type']); - - if (file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx)) - { - require("{$phpbb_root_path}includes/search/$search_type.$phpEx"); - - // We do some additional checks in the module to ensure it can actually be utilised - $error = false; - $search = new $search_type($error); - - if (!$error && method_exists($search, 'destroy_cache')) - { - $search->destroy_cache(array(), array($post_info['user_id'], $userdata['user_id'])); - } - } - - $from_username = $post_info['username']; - $to_username = $userdata['username']; - - // Renew post info - $post_info = get_post_data(array($post_id), false, true); - - if (!sizeof($post_info)) - { - trigger_error('POST_NOT_EXIST'); - } - - $post_info = $post_info[$post_id]; - - // Now add log entry - add_log('mod', $post_info['forum_id'], $post_info['topic_id'], 'LOG_MCP_CHANGE_POSTER', $post_info['topic_title'], $from_username, $to_username); -} - -?> \ No newline at end of file diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php deleted file mode 100644 index 88fc9cb13d..0000000000 --- a/phpBB/includes/mcp/mcp_queue.php +++ /dev/null @@ -1,997 +0,0 @@ -p_master = &$p_master; - } - - function main($id, $mode) - { - global $auth, $db, $user, $template, $cache; - global $config, $phpbb_root_path, $phpEx, $action; - - include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx); - - $forum_id = request_var('f', 0); - $start = request_var('start', 0); - - $this->page_title = 'MCP_QUEUE'; - - switch ($action) - { - case 'approve': - case 'disapprove': - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - - $post_id_list = request_var('post_id_list', array(0)); - - if (!sizeof($post_id_list)) - { - trigger_error('NO_POST_SELECTED'); - } - - if ($action == 'approve') - { - approve_post($post_id_list, 'queue', $mode); - } - else - { - disapprove_post($post_id_list, 'queue', $mode); - } - - break; - } - - switch ($mode) - { - case 'approve_details': - - $this->tpl_name = 'mcp_post'; - - $user->add_lang('posting'); - - $post_id = request_var('p', 0); - $topic_id = request_var('t', 0); - - if ($topic_id) - { - $topic_info = get_topic_data(array($topic_id), 'm_approve'); - if (isset($topic_info[$topic_id]['topic_first_post_id'])) - { - $post_id = (int) $topic_info[$topic_id]['topic_first_post_id']; - } - else - { - $topic_id = 0; - } - } - - $post_info = get_post_data(array($post_id), 'm_approve', true); - - if (!sizeof($post_info)) - { - trigger_error('NO_POST_SELECTED'); - } - - $post_info = $post_info[$post_id]; - - if ($post_info['topic_first_post_id'] != $post_id && topic_review($post_info['topic_id'], $post_info['forum_id'], 'topic_review', 0, false)) - { - $template->assign_vars(array( - 'S_TOPIC_REVIEW' => true, - 'TOPIC_TITLE' => $post_info['topic_title']) - ); - } - - $extensions = $attachments = $topic_tracking_info = array(); - - // Get topic tracking info - if ($config['load_db_lastread']) - { - $tmp_topic_data = array($post_info['topic_id'] => $post_info); - $topic_tracking_info = get_topic_tracking($post_info['forum_id'], $post_info['topic_id'], $tmp_topic_data, array($post_info['forum_id'] => $post_info['forum_mark_time'])); - unset($tmp_topic_data); - } - else - { - $topic_tracking_info = get_complete_topic_tracking($post_info['forum_id'], $post_info['topic_id']); - } - - $post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false; - - // Process message, leave it uncensored - $message = $post_info['post_text']; - - if ($post_info['bbcode_bitfield']) - { - include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); - $bbcode = new bbcode($post_info['bbcode_bitfield']); - $bbcode->bbcode_second_pass($message, $post_info['bbcode_uid'], $post_info['bbcode_bitfield']); - } - - $message = bbcode_nl2br($message); - $message = smiley_text($message); - - if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id'])) - { - $extensions = cache::obtain_attach_extensions($post_info['forum_id']); - - $sql = 'SELECT * - FROM ' . ATTACHMENTS_TABLE . ' - WHERE post_msg_id = ' . $post_id . ' - AND in_message = 0 - ORDER BY filetime DESC, post_msg_id ASC'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $attachments[] = $row; - } - $db->sql_freeresult($result); - - if (sizeof($attachments)) - { - $update_count = array(); - parse_attachments($post_info['forum_id'], $message, $attachments, $update_count); - } - - // Display not already displayed Attachments for this post, we already parsed them. ;) - if (!empty($attachments)) - { - $template->assign_var('S_HAS_ATTACHMENTS', true); - - foreach ($attachments as $attachment) - { - $template->assign_block_vars('attachment', array( - 'DISPLAY_ATTACHMENT' => $attachment) - ); - } - } - } - - $post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&p=' . $post_info['post_id'] . '#p' . $post_info['post_id']); - $topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&t=' . $post_info['topic_id']); - - $template->assign_vars(array( - 'S_MCP_QUEUE' => true, - 'U_APPROVE_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&p=$post_id&f=$forum_id"), - 'S_CAN_VIEWIP' => $auth->acl_get('m_info', $post_info['forum_id']), - 'S_POST_REPORTED' => $post_info['post_reported'], - 'S_POST_UNAPPROVED' => !$post_info['post_approved'], - 'S_POST_LOCKED' => $post_info['post_edit_locked'], - 'S_USER_NOTES' => true, - - 'U_EDIT' => ($auth->acl_get('m_edit', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&f={$post_info['forum_id']}&p={$post_info['post_id']}") : '', - 'U_MCP_APPROVE' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&f=' . $post_info['forum_id'] . '&p=' . $post_id), - 'U_MCP_REPORT' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=report_details&f=' . $post_info['forum_id'] . '&p=' . $post_id), - 'U_MCP_USER_NOTES' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $post_info['user_id']), - 'U_MCP_WARN_USER' => ($auth->acl_get('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user&u=' . $post_info['user_id']) : '', - 'U_VIEW_POST' => $post_url, - 'U_VIEW_TOPIC' => $topic_url, - - 'MINI_POST_IMG' => ($post_unread) ? $user->img('icon_post_target_unread', 'NEW_POST') : $user->img('icon_post_target', 'POST'), - - 'RETURN_QUEUE' => sprintf($user->lang['RETURN_QUEUE'], '", ''), - 'RETURN_POST' => sprintf($user->lang['RETURN_POST'], '', ''), - 'RETURN_TOPIC_SIMPLE' => sprintf($user->lang['RETURN_TOPIC_SIMPLE'], '', ''), - 'REPORTED_IMG' => $user->img('icon_topic_reported', $user->lang['POST_REPORTED']), - 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', $user->lang['POST_UNAPPROVED']), - 'EDIT_IMG' => $user->img('icon_post_edit', $user->lang['EDIT_POST']), - - 'POST_AUTHOR_FULL' => get_username_string('full', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']), - 'POST_AUTHOR_COLOUR' => get_username_string('colour', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']), - 'POST_AUTHOR' => get_username_string('username', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']), - 'U_POST_AUTHOR' => get_username_string('profile', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']), - - 'POST_PREVIEW' => $message, - 'POST_SUBJECT' => $post_info['post_subject'], - 'POST_DATE' => $user->format_date($post_info['post_time']), - 'POST_IP' => $post_info['poster_ip'], - 'POST_IPADDR' => ($auth->acl_get('m_info', $post_info['forum_id']) && request_var('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '', - 'POST_ID' => $post_info['post_id'], - - 'U_LOOKUP_IP' => ($auth->acl_get('m_info', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&f=' . $post_info['forum_id'] . '&p=' . $post_id . '&lookup=' . $post_info['poster_ip']) . '#ip' : '', - )); - - break; - - case 'unapproved_topics': - case 'unapproved_posts': - $user->add_lang(array('viewtopic', 'viewforum')); - - $topic_id = request_var('t', 0); - $forum_info = array(); - - if ($topic_id) - { - $topic_info = get_topic_data(array($topic_id)); - - if (!sizeof($topic_info)) - { - trigger_error('TOPIC_NOT_EXIST'); - } - - $topic_info = $topic_info[$topic_id]; - $forum_id = $topic_info['forum_id']; - } - - $forum_list_approve = get_forum_list('m_approve', false, true); - - if (!$forum_id) - { - $forum_list = array(); - foreach ($forum_list_approve as $row) - { - $forum_list[] = $row['forum_id']; - } - - if (!sizeof($forum_list)) - { - trigger_error('NOT_MODERATOR'); - } - - $global_id = $forum_list[0]; - - $forum_list = implode(', ', $forum_list); - - $sql = 'SELECT SUM(forum_topics) as sum_forum_topics - FROM ' . FORUMS_TABLE . " - WHERE forum_id IN (0, $forum_list)"; - $result = $db->sql_query($sql); - $forum_info['forum_topics'] = (int) $db->sql_fetchfield('sum_forum_topics'); - $db->sql_freeresult($result); - } - else - { - $forum_info = get_forum_data(array($forum_id), 'm_approve'); - - if (!sizeof($forum_info)) - { - trigger_error('NOT_MODERATOR'); - } - - $forum_info = $forum_info[$forum_id]; - $forum_list = $forum_id; - $global_id = $forum_id; - } - - $forum_options = ''; - foreach ($forum_list_approve as $row) - { - $forum_options .= ''; - } - - $sort_days = $total = 0; - $sort_key = $sort_dir = ''; - $sort_by_sql = $sort_order_sql = array(); - mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id); - - $forum_topics = ($total == -1) ? $forum_info['forum_topics'] : $total; - $limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : ''; - - $forum_names = array(); - - if ($mode == 'unapproved_posts') - { - $sql = 'SELECT p.post_id - FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . " - WHERE p.forum_id IN (0, $forum_list) - AND p.post_approved = 0 - " . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = p.poster_id' : '') . ' - ' . (($topic_id) ? 'AND p.topic_id = ' . $topic_id : '') . " - AND t.topic_id = p.topic_id - AND t.topic_first_post_id <> p.post_id - $limit_time_sql - ORDER BY $sort_order_sql"; - $result = $db->sql_query_limit($sql, $config['topics_per_page'], $start); - - $i = 0; - $post_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $post_ids[] = $row['post_id']; - $row_num[$row['post_id']] = $i++; - } - $db->sql_freeresult($result); - - if (sizeof($post_ids)) - { - $sql = 'SELECT t.topic_id, t.topic_title, t.forum_id, p.post_id, p.post_subject, p.post_username, p.poster_id, p.post_time, u.username, u.username_clean, u.user_colour - FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . ' u - WHERE ' . $db->sql_in_set('p.post_id', $post_ids) . ' - AND t.topic_id = p.topic_id - AND u.user_id = p.poster_id - ORDER BY ' . $sort_order_sql; - $result = $db->sql_query($sql); - - $post_data = $rowset = array(); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['forum_id']) - { - $forum_names[] = $row['forum_id']; - } - $post_data[$row['post_id']] = $row; - } - $db->sql_freeresult($result); - - foreach ($post_ids as $post_id) - { - $rowset[] = $post_data[$post_id]; - } - unset($post_data, $post_ids); - } - else - { - $rowset = array(); - } - } - else - { - $sql = 'SELECT t.forum_id, t.topic_id, t.topic_title, t.topic_title AS post_subject, t.topic_time AS post_time, t.topic_poster AS poster_id, t.topic_first_post_id AS post_id, t.topic_first_poster_name AS username, t.topic_first_poster_colour AS user_colour - FROM ' . TOPICS_TABLE . " t - WHERE forum_id IN (0, $forum_list) - AND topic_approved = 0 - $limit_time_sql - ORDER BY $sort_order_sql"; - $result = $db->sql_query_limit($sql, $config['topics_per_page'], $start); - - $rowset = array(); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['forum_id']) - { - $forum_names[] = $row['forum_id']; - } - $rowset[] = $row; - } - $db->sql_freeresult($result); - } - - if (sizeof($forum_names)) - { - // Select the names for the forum_ids - $sql = 'SELECT forum_id, forum_name - FROM ' . FORUMS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $forum_names); - $result = $db->sql_query($sql, 3600); - - $forum_names = array(); - while ($row = $db->sql_fetchrow($result)) - { - $forum_names[$row['forum_id']] = $row['forum_name']; - } - $db->sql_freeresult($result); - } - - foreach ($rowset as $row) - { - $global_topic = ($row['forum_id']) ? false : true; - if ($global_topic) - { - $row['forum_id'] = $global_id; - } - - if (empty($row['post_username'])) - { - $row['post_username'] = $user->lang['GUEST']; - } - - $template->assign_block_vars('postrow', array( - 'U_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&t=' . $row['topic_id']), - 'U_VIEWFORUM' => (!$global_topic) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : '', - 'U_VIEWPOST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&p=' . $row['post_id']) . (($mode == 'unapproved_posts') ? '#p' . $row['post_id'] : ''), - 'U_VIEW_DETAILS' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&start=$start&mode=approve_details&f={$row['forum_id']}&p={$row['post_id']}" . (($mode == 'unapproved_topics') ? "&t={$row['topic_id']}" : '')), - - 'POST_AUTHOR_FULL' => get_username_string('full', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']), - 'POST_AUTHOR_COLOUR' => get_username_string('colour', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']), - 'POST_AUTHOR' => get_username_string('username', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']), - 'U_POST_AUTHOR' => get_username_string('profile', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']), - - 'POST_ID' => $row['post_id'], - 'FORUM_NAME' => (!$global_topic) ? $forum_names[$row['forum_id']] : $user->lang['GLOBAL_ANNOUNCEMENT'], - 'POST_SUBJECT' => $row['post_subject'], - 'TOPIC_TITLE' => $row['topic_title'], - 'POST_TIME' => $user->format_date($row['post_time'])) - ); - } - unset($rowset, $forum_names); - - // Now display the page - $template->assign_vars(array( - 'L_DISPLAY_ITEMS' => ($mode == 'unapproved_posts') ? $user->lang['DISPLAY_POSTS'] : $user->lang['DISPLAY_TOPICS'], - 'L_EXPLAIN' => ($mode == 'unapproved_posts') ? $user->lang['MCP_QUEUE_UNAPPROVED_POSTS_EXPLAIN'] : $user->lang['MCP_QUEUE_UNAPPROVED_TOPICS_EXPLAIN'], - 'L_TITLE' => ($mode == 'unapproved_posts') ? $user->lang['MCP_QUEUE_UNAPPROVED_POSTS'] : $user->lang['MCP_QUEUE_UNAPPROVED_TOPICS'], - 'L_ONLY_TOPIC' => ($topic_id) ? sprintf($user->lang['ONLY_TOPIC'], $topic_info['topic_title']) : '', - - 'S_FORUM_OPTIONS' => $forum_options, - 'S_MCP_ACTION' => build_url(array('t', 'f', 'sd', 'st', 'sk')), - 'S_TOPICS' => ($mode == 'unapproved_posts') ? false : true, - - 'PAGINATION' => generate_pagination($this->u_action . "&f=$forum_id&st=$sort_days&sk=$sort_key&sd=$sort_dir", $total, $config['topics_per_page'], $start), - 'PAGE_NUMBER' => on_page($total, $config['topics_per_page'], $start), - 'TOPIC_ID' => $topic_id, - 'TOTAL' => ($total == 1) ? (($mode == 'unapproved_posts') ? $user->lang['VIEW_TOPIC_POST'] : $user->lang['VIEW_FORUM_TOPIC']) : sprintf((($mode == 'unapproved_posts') ? $user->lang['VIEW_TOPIC_POSTS'] : $user->lang['VIEW_FORUM_TOPICS']), $total), - )); - - $this->tpl_name = 'mcp_queue'; - break; - } - } -} - -/** -* Approve Post/Topic -*/ -function approve_post($post_id_list, $id, $mode) -{ - global $db, $template, $user, $config; - global $phpEx, $phpbb_root_path; - - if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve'))) - { - trigger_error('NOT_AUTHORISED'); - } - - $redirect = request_var('redirect', build_url(array('_f_', 'quickmod'))); - $success_msg = ''; - - $s_hidden_fields = build_hidden_fields(array( - 'i' => $id, - 'mode' => $mode, - 'post_id_list' => $post_id_list, - 'action' => 'approve', - 'redirect' => $redirect) - ); - - $post_info = get_post_data($post_id_list, 'm_approve'); - - if (confirm_box(true)) - { - $notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false; - - // If Topic -> total_topics = total_topics+1, total_posts = total_posts+1, forum_topics = forum_topics+1, forum_posts = forum_posts+1 - // If Post -> total_posts = total_posts+1, forum_posts = forum_posts+1, topic_replies = topic_replies+1 - - $total_topics = $total_posts = 0; - $forum_topics_posts = $topic_approve_sql = $topic_replies_sql = $post_approve_sql = $topic_id_list = $forum_id_list = $approve_log = array(); - - $update_forum_information = false; - - foreach ($post_info as $post_id => $post_data) - { - $topic_id_list[$post_data['topic_id']] = 1; - - if ($post_data['forum_id']) - { - $forum_id_list[$post_data['forum_id']] = 1; - } - - // Topic or Post. ;) - if ($post_data['topic_first_post_id'] == $post_id) - { - if ($post_data['forum_id']) - { - if (!isset($forum_topics_posts[$post_data['forum_id']])) - { - $forum_topics_posts[$post_data['forum_id']] = array( - 'forum_posts' => 0, - 'forum_topics' => 0 - ); - } - - $total_topics++; - $forum_topics_posts[$post_data['forum_id']]['forum_topics']++; - } - $topic_approve_sql[] = $post_data['topic_id']; - - $approve_log[] = array( - 'type' => 'topic', - 'post_subject' => $post_data['post_subject'], - 'forum_id' => $post_data['forum_id'], - 'topic_id' => $post_data['topic_id'], - ); - } - else - { - if (!isset($topic_replies_sql[$post_data['topic_id']])) - { - $topic_replies_sql[$post_data['topic_id']] = 0; - } - $topic_replies_sql[$post_data['topic_id']]++; - - $approve_log[] = array( - 'type' => 'post', - 'post_subject' => $post_data['post_subject'], - 'forum_id' => $post_data['forum_id'], - 'topic_id' => $post_data['topic_id'], - ); - } - - if ($post_data['forum_id']) - { - if (!isset($forum_topics_posts[$post_data['forum_id']])) - { - $forum_topics_posts[$post_data['forum_id']] = array( - 'forum_posts' => 0, - 'forum_topics' => 0 - ); - } - - $total_posts++; - $forum_topics_posts[$post_data['forum_id']]['forum_posts']++; - - // Increment by topic_replies if we approve a topic... - // This works because we do not adjust the topic_replies when re-approving a topic after an edit. - if ($post_data['topic_first_post_id'] == $post_id && $post_data['topic_replies']) - { - $total_posts += $post_data['topic_replies']; - $forum_topics_posts[$post_data['forum_id']]['forum_posts'] += $post_data['topic_replies']; - } - } - - $post_approve_sql[] = $post_id; - - // If the post is newer than the last post information stored we need to update the forum information - if ($post_data['post_time'] >= $post_data['forum_last_post_time']) - { - $update_forum_information = true; - } - } - - if (sizeof($topic_approve_sql)) - { - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET topic_approved = 1 - WHERE ' . $db->sql_in_set('topic_id', $topic_approve_sql); - $db->sql_query($sql); - } - - if (sizeof($post_approve_sql)) - { - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET post_approved = 1 - WHERE ' . $db->sql_in_set('post_id', $post_approve_sql); - $db->sql_query($sql); - } - - foreach ($approve_log as $log_data) - { - add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_APPROVED' : 'LOG_POST_APPROVED', $log_data['post_subject']); - } - - if (sizeof($topic_replies_sql)) - { - foreach ($topic_replies_sql as $topic_id => $num_replies) - { - $sql = 'UPDATE ' . TOPICS_TABLE . " - SET topic_replies = topic_replies + $num_replies - WHERE topic_id = $topic_id"; - $db->sql_query($sql); - } - } - - if (sizeof($forum_topics_posts)) - { - foreach ($forum_topics_posts as $forum_id => $row) - { - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET '; - $sql .= ($row['forum_topics']) ? "forum_topics = forum_topics + {$row['forum_topics']}" : ''; - $sql .= ($row['forum_topics'] && $row['forum_posts']) ? ', ' : ''; - $sql .= ($row['forum_posts']) ? "forum_posts = forum_posts + {$row['forum_posts']}" : ''; - $sql .= " WHERE forum_id = $forum_id"; - - $db->sql_query($sql); - } - } - - if ($total_topics) - { - set_config('num_topics', $config['num_topics'] + $total_topics, true); - } - - if ($total_posts) - { - set_config('num_posts', $config['num_posts'] + $total_posts, true); - } - unset($topic_approve_sql, $topic_replies_sql, $post_approve_sql); - - update_post_information('topic', array_keys($topic_id_list)); - - if ($update_forum_information) - { - update_post_information('forum', array_keys($forum_id_list)); - } - unset($topic_id_list, $forum_id_list); - - $messenger = new messenger(); - - // Notify Poster? - if ($notify_poster) - { - foreach ($post_info as $post_id => $post_data) - { - if ($post_data['poster_id'] == ANONYMOUS) - { - continue; - } - - $email_template = ($post_data['post_id'] == $post_data['topic_first_post_id'] && $post_data['post_id'] == $post_data['topic_last_post_id']) ? 'topic_approved' : 'post_approved'; - - $messenger->template($email_template, $post_data['user_lang']); - - $messenger->to($post_data['user_email'], $post_data['username']); - $messenger->im($post_data['user_jabber'], $post_data['username']); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($post_data['username']), - 'POST_SUBJECT' => htmlspecialchars_decode(censor_text($post_data['post_subject'])), - 'TOPIC_TITLE' => htmlspecialchars_decode(censor_text($post_data['topic_title'])), - - 'U_VIEW_TOPIC' => generate_board_url() . "/viewtopic.$phpEx?f={$post_data['forum_id']}&t={$post_data['topic_id']}&e=0", - 'U_VIEW_POST' => generate_board_url() . "/viewtopic.$phpEx?f={$post_data['forum_id']}&t={$post_data['topic_id']}&p=$post_id&e=$post_id") - ); - - $messenger->send($post_data['user_notify_type']); - } - } - - $messenger->save_queue(); - - // Send out normal user notifications - $email_sig = str_replace('
    ', "\n", "-- \n" . $config['board_email_sig']); - - foreach ($post_info as $post_id => $post_data) - { - if ($post_id == $post_data['topic_first_post_id'] && $post_id == $post_data['topic_last_post_id']) - { - // Forum Notifications - user_notification('post', $post_data['topic_title'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id); - } - else - { - // Topic Notifications - user_notification('reply', $post_data['post_subject'], $post_data['topic_title'], $post_data['forum_name'], $post_data['forum_id'], $post_data['topic_id'], $post_id); - } - } - - if (sizeof($post_id_list) == 1) - { - $post_data = $post_info[$post_id_list[0]]; - $post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f={$post_data['forum_id']}&t={$post_data['topic_id']}&p={$post_data['post_id']}") . '#p' . $post_data['post_id']; - } - unset($post_info); - - if ($total_topics) - { - $success_msg = ($total_topics == 1) ? 'TOPIC_APPROVED_SUCCESS' : 'TOPICS_APPROVED_SUCCESS'; - } - else - { - $success_msg = (sizeof($post_id_list) == 1) ? 'POST_APPROVED_SUCCESS' : 'POSTS_APPROVED_SUCCESS'; - } - } - else - { - $show_notify = false; - - foreach ($post_info as $post_data) - { - if ($post_data['poster_id'] == ANONYMOUS) - { - continue; - } - else - { - $show_notify = true; - break; - } - } - - $template->assign_vars(array( - 'S_NOTIFY_POSTER' => $show_notify, - 'S_APPROVE' => true) - ); - - confirm_box(false, 'APPROVE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html'); - } - - $redirect = request_var('redirect', "index.$phpEx"); - $redirect = reapply_sid($redirect); - - if (!$success_msg) - { - redirect($redirect); - } - else - { - meta_refresh(3, $redirect); - - // If approving one post, also give links back to post... - $add_message = ''; - if (sizeof($post_id_list) == 1 && !empty($post_url)) - { - $add_message = '

    ' . sprintf($user->lang['RETURN_POST'], '', ''); - } - - trigger_error($user->lang[$success_msg] . '

    ' . sprintf($user->lang['RETURN_PAGE'], "", '') . $add_message); - } -} - -/** -* Disapprove Post/Topic -*/ -function disapprove_post($post_id_list, $id, $mode) -{ - global $db, $template, $user, $config; - global $phpEx, $phpbb_root_path; - - if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve'))) - { - trigger_error('NOT_AUTHORISED'); - } - - $redirect = request_var('redirect', build_url(array('t', 'mode', '_f_', 'quickmod')) . "&mode=$mode"); - $reason = utf8_normalize_nfc(request_var('reason', '', true)); - $reason_id = request_var('reason_id', 0); - $success_msg = $additional_msg = ''; - - $s_hidden_fields = build_hidden_fields(array( - 'i' => $id, - 'mode' => $mode, - 'post_id_list' => $post_id_list, - 'action' => 'disapprove', - 'redirect' => $redirect) - ); - - $notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false; - $disapprove_reason = ''; - - if ($reason_id) - { - $sql = 'SELECT reason_title, reason_description - FROM ' . REPORTS_REASONS_TABLE . " - WHERE reason_id = $reason_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row || (!$reason && strtolower($row['reason_title']) == 'other')) - { - $additional_msg = $user->lang['NO_REASON_DISAPPROVAL']; - unset($_POST['confirm']); - } - else - { - // If the reason is defined within the language file, we will use the localized version, else just use the database entry... - $disapprove_reason = (strtolower($row['reason_title']) != 'other') ? ((isset($user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])])) ? $user->lang['report_reasons']['DESCRIPTION'][strtoupper($row['reason_title'])] : $row['reason_description']) : ''; - $disapprove_reason .= ($reason) ? "\n\n" . $reason : ''; - } - } - - $post_info = get_post_data($post_id_list, 'm_approve'); - - if (confirm_box(true)) - { - - // If Topic -> forum_topics_real -= 1 - // If Post -> topic_replies_real -= 1 - - $num_disapproved = 0; - $forum_topics_real = $topic_id_list = $forum_id_list = $topic_replies_real_sql = $post_disapprove_sql = $disapprove_log = array(); - - foreach ($post_info as $post_id => $post_data) - { - $topic_id_list[$post_data['topic_id']] = 1; - - if ($post_data['forum_id']) - { - $forum_id_list[$post_data['forum_id']] = 1; - } - - // Topic or Post. ;) - /** - * @todo this probably is a different method than the one used by delete_posts, does this cause counter inconsistency? - */ - if ($post_data['topic_first_post_id'] == $post_id && $post_data['topic_last_post_id'] == $post_id) - { - if ($post_data['forum_id']) - { - if (!isset($forum_topics_real[$post_data['forum_id']])) - { - $forum_topics_real[$post_data['forum_id']] = 0; - } - $forum_topics_real[$post_data['forum_id']]++; - $num_disapproved++; - } - - $disapprove_log[] = array( - 'type' => 'topic', - 'post_subject' => $post_data['post_subject'], - 'forum_id' => $post_data['forum_id'], - 'topic_id' => 0, // useless to log a topic id, as it will be deleted - ); - } - else - { - if (!isset($topic_replies_real_sql[$post_data['topic_id']])) - { - $topic_replies_real_sql[$post_data['topic_id']] = 0; - } - $topic_replies_real_sql[$post_data['topic_id']]++; - - $disapprove_log[] = array( - 'type' => 'post', - 'post_subject' => $post_data['post_subject'], - 'forum_id' => $post_data['forum_id'], - 'topic_id' => $post_data['topic_id'], - ); - } - - $post_disapprove_sql[] = $post_id; - } - - unset($post_data); - - if (sizeof($forum_topics_real)) - { - foreach ($forum_topics_real as $forum_id => $topics_real) - { - $sql = 'UPDATE ' . FORUMS_TABLE . " - SET forum_topics_real = forum_topics_real - $topics_real - WHERE forum_id = $forum_id"; - $db->sql_query($sql); - } - } - - if (sizeof($topic_replies_real_sql)) - { - foreach ($topic_replies_real_sql as $topic_id => $num_replies) - { - $sql = 'UPDATE ' . TOPICS_TABLE . " - SET topic_replies_real = topic_replies_real - $num_replies - WHERE topic_id = $topic_id"; - $db->sql_query($sql); - } - } - - if (sizeof($post_disapprove_sql)) - { - if (!function_exists('delete_posts')) - { - include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); - } - - // We do not check for permissions here, because the moderator allowed approval/disapproval should be allowed to delete the disapproved posts - delete_posts('post_id', $post_disapprove_sql); - - foreach ($disapprove_log as $log_data) - { - add_log('mod', $log_data['forum_id'], $log_data['topic_id'], ($log_data['type'] == 'topic') ? 'LOG_TOPIC_DISAPPROVED' : 'LOG_POST_DISAPPROVED', $log_data['post_subject'], $disapprove_reason); - } - } - unset($post_disapprove_sql, $topic_replies_real_sql); - - update_post_information('topic', array_keys($topic_id_list)); - - if (sizeof($forum_id_list)) - { - update_post_information('forum', array_keys($forum_id_list)); - } - unset($topic_id_list, $forum_id_list); - - $messenger = new messenger(); - - // Notify Poster? - if ($notify_poster) - { - foreach ($post_info as $post_id => $post_data) - { - if ($post_data['poster_id'] == ANONYMOUS) - { - continue; - } - - $email_template = ($post_data['post_id'] == $post_data['topic_first_post_id'] && $post_data['post_id'] == $post_data['topic_last_post_id']) ? 'topic_disapproved' : 'post_disapproved'; - - $messenger->template($email_template, $post_data['user_lang']); - - $messenger->to($post_data['user_email'], $post_data['username']); - $messenger->im($post_data['user_jabber'], $post_data['username']); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($post_data['username']), - 'REASON' => htmlspecialchars_decode($disapprove_reason), - 'POST_SUBJECT' => htmlspecialchars_decode(censor_text($post_data['post_subject'])), - 'TOPIC_TITLE' => htmlspecialchars_decode(censor_text($post_data['topic_title']))) - ); - - $messenger->send($post_data['user_notify_type']); - } - } - unset($post_info, $disapprove_reason); - - $messenger->save_queue(); - - if (sizeof($forum_topics_real)) - { - $success_msg = ($num_disapproved == 1) ? 'TOPIC_DISAPPROVED_SUCCESS' : 'TOPICS_DISAPPROVED_SUCCESS'; - } - else - { - $success_msg = (sizeof($post_id_list) == 1) ? 'POST_DISAPPROVED_SUCCESS' : 'POSTS_DISAPPROVED_SUCCESS'; - } - } - else - { - include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx); - - display_reasons($reason_id); - - $show_notify = false; - - foreach ($post_info as $post_data) - { - if ($post_data['poster_id'] == ANONYMOUS) - { - continue; - } - else - { - $show_notify = true; - break; - } - } - - $template->assign_vars(array( - 'S_NOTIFY_POSTER' => $show_notify, - 'S_APPROVE' => false, - 'REASON' => $reason, - 'ADDITIONAL_MSG' => $additional_msg) - ); - - confirm_box(false, 'DISAPPROVE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html'); - } - - $redirect = request_var('redirect', "index.$phpEx"); - $redirect = reapply_sid($redirect); - - if (!$success_msg) - { - redirect($redirect); - } - else - { - meta_refresh(3, $redirect); - trigger_error($user->lang[$success_msg] . '

    ' . sprintf($user->lang['RETURN_PAGE'], "", '')); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php deleted file mode 100755 index 4e607b79c7..0000000000 --- a/phpBB/includes/mcp/mcp_reports.php +++ /dev/null @@ -1,644 +0,0 @@ -p_master = &$p_master; - } - - function main($id, $mode) - { - global $auth, $db, $user, $template, $cache; - global $config, $phpbb_root_path, $phpEx, $action; - - include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx); - - $forum_id = request_var('f', 0); - $start = request_var('start', 0); - - $this->page_title = 'MCP_REPORTS'; - - switch ($action) - { - case 'close': - case 'delete': - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - - $report_id_list = request_var('report_id_list', array(0)); - - if (!sizeof($report_id_list)) - { - trigger_error('NO_REPORT_SELECTED'); - } - - close_report($report_id_list, $mode, $action); - - break; - } - - switch ($mode) - { - case 'report_details': - - $user->add_lang('posting'); - - $post_id = request_var('p', 0); - - // closed reports are accessed by report id - $report_id = request_var('r', 0); - - $sql = 'SELECT r.post_id, r.user_id, r.report_id, r.report_closed, report_time, r.report_text, rr.reason_title, rr.reason_description, u.username, u.username_clean, u.user_colour - FROM ' . REPORTS_TABLE . ' r, ' . REPORTS_REASONS_TABLE . ' rr, ' . USERS_TABLE . ' u - WHERE ' . (($report_id) ? 'r.report_id = ' . $report_id : "r.post_id = $post_id") . ' - AND rr.reason_id = r.reason_id - AND r.user_id = u.user_id - ORDER BY report_closed ASC'; - $result = $db->sql_query_limit($sql, 1); - $report = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$report) - { - trigger_error('NO_REPORT'); - } - - if (!$report_id && $report['report_closed']) - { - trigger_error('REPORT_CLOSED'); - } - - $post_id = $report['post_id']; - $report_id = $report['report_id']; - - $post_info = get_post_data(array($post_id), 'm_report', true); - - if (!sizeof($post_info)) - { - trigger_error('NO_REPORT_SELECTED'); - } - - $post_info = $post_info[$post_id]; - - $reason = array('title' => $report['reason_title'], 'description' => $report['reason_description']); - if (isset($user->lang['report_reasons']['TITLE'][strtoupper($reason['title'])]) && isset($user->lang['report_reasons']['DESCRIPTION'][strtoupper($reason['title'])])) - { - $reason['description'] = $user->lang['report_reasons']['DESCRIPTION'][strtoupper($reason['title'])]; - $reason['title'] = $user->lang['report_reasons']['TITLE'][strtoupper($reason['title'])]; - } - - if (topic_review($post_info['topic_id'], $post_info['forum_id'], 'topic_review', 0, false)) - { - $template->assign_vars(array( - 'S_TOPIC_REVIEW' => true, - 'TOPIC_TITLE' => $post_info['topic_title']) - ); - } - - $topic_tracking_info = $extensions = $attachments = array(); - // Get topic tracking info - if ($config['load_db_lastread']) - { - $tmp_topic_data = array($post_info['topic_id'] => $post_info); - $topic_tracking_info = get_topic_tracking($post_info['forum_id'], $post_info['topic_id'], $tmp_topic_data, array($post_info['forum_id'] => $post_info['forum_mark_time'])); - unset($tmp_topic_data); - } - else - { - $topic_tracking_info = get_complete_topic_tracking($post_info['forum_id'], $post_info['topic_id']); - } - - $post_unread = (isset($topic_tracking_info[$post_info['topic_id']]) && $post_info['post_time'] > $topic_tracking_info[$post_info['topic_id']]) ? true : false; - - // Process message, leave it uncensored - $message = $post_info['post_text']; - - if ($post_info['bbcode_bitfield']) - { - include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); - $bbcode = new bbcode($post_info['bbcode_bitfield']); - $bbcode->bbcode_second_pass($message, $post_info['bbcode_uid'], $post_info['bbcode_bitfield']); - } - - $message = bbcode_nl2br($message); - $message = smiley_text($message); - - if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id'])) - { - $extensions = cache::obtain_attach_extensions($post_info['forum_id']); - - $sql = 'SELECT * - FROM ' . ATTACHMENTS_TABLE . ' - WHERE post_msg_id = ' . $post_id . ' - AND in_message = 0 - ORDER BY filetime DESC, post_msg_id ASC'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $attachments[] = $row; - } - $db->sql_freeresult($result); - - if (sizeof($attachments)) - { - $update_count = array(); - parse_attachments($post_info['forum_id'], $message, $attachments, $update_count); - } - - // Display not already displayed Attachments for this post, we already parsed them. ;) - if (!empty($attachments)) - { - $template->assign_var('S_HAS_ATTACHMENTS', true); - - foreach ($attachments as $attachment) - { - $template->assign_block_vars('attachment', array( - 'DISPLAY_ATTACHMENT' => $attachment) - ); - } - } - } - - $template->assign_vars(array( - 'S_MCP_REPORT' => true, - 'S_CLOSE_ACTION' => $this->u_action . '&p=' . $post_id . '&f=' . $forum_id, - 'S_CAN_VIEWIP' => $auth->acl_get('m_info', $post_info['forum_id']), - 'S_POST_REPORTED' => $post_info['post_reported'], - 'S_POST_UNAPPROVED' => !$post_info['post_approved'], - 'S_POST_LOCKED' => $post_info['post_edit_locked'], - 'S_USER_NOTES' => true, - - 'U_EDIT' => ($auth->acl_get('m_edit', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&f={$post_info['forum_id']}&p={$post_info['post_id']}") : '', - 'U_MCP_APPROVE' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&f=' . $post_info['forum_id'] . '&p=' . $post_id), - 'U_MCP_REPORT' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=report_details&f=' . $post_info['forum_id'] . '&p=' . $post_id), - 'U_MCP_REPORTER_NOTES' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $report['user_id']), - 'U_MCP_USER_NOTES' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $post_info['user_id']), - 'U_MCP_WARN_REPORTER' => ($auth->acl_get('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user&u=' . $report['user_id']) : '', - 'U_MCP_WARN_USER' => ($auth->acl_get('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user&u=' . $post_info['user_id']) : '', - 'U_VIEW_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&p=' . $post_info['post_id'] . '#p' . $post_info['post_id']), - 'U_VIEW_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&t=' . $post_info['topic_id']), - - 'EDIT_IMG' => $user->img('icon_post_edit', $user->lang['EDIT_POST']), - 'MINI_POST_IMG' => ($post_unread) ? $user->img('icon_post_target_unread', 'NEW_POST') : $user->img('icon_post_target', 'POST'), - 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', $user->lang['POST_UNAPPROVED']), - - 'RETURN_REPORTS' => sprintf($user->lang['RETURN_REPORTS'], '', ''), - 'REPORTED_IMG' => $user->img('icon_topic_reported', $user->lang['POST_REPORTED']), - 'REPORT_DATE' => $user->format_date($report['report_time']), - 'REPORT_ID' => $report_id, - 'REPORT_REASON_TITLE' => $reason['title'], - 'REPORT_REASON_DESCRIPTION' => $reason['description'], - 'REPORT_TEXT' => $report['report_text'], - - 'POST_AUTHOR_FULL' => get_username_string('full', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']), - 'POST_AUTHOR_COLOUR' => get_username_string('colour', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']), - 'POST_AUTHOR' => get_username_string('username', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']), - 'U_POST_AUTHOR' => get_username_string('profile', $post_info['user_id'], $post_info['username'], $post_info['user_colour'], $post_info['post_username']), - - 'REPORTER_FULL' => get_username_string('full', $report['user_id'], $report['username'], $report['user_colour']), - 'REPORTER_COLOUR' => get_username_string('colour', $report['user_id'], $report['username'], $report['user_colour']), - 'REPORTER_NAME' => get_username_string('username', $report['user_id'], $report['username'], $report['user_colour']), - 'U_VIEW_REPORTER_PROFILE' => get_username_string('profile', $report['user_id'], $report['username'], $report['user_colour']), - - 'POST_PREVIEW' => $message, - 'POST_SUBJECT' => ($post_info['post_subject']) ? $post_info['post_subject'] : $user->lang['NO_SUBJECT'], - 'POST_DATE' => $user->format_date($post_info['post_time']), - 'POST_IP' => $post_info['poster_ip'], - 'POST_IPADDR' => ($auth->acl_get('m_info', $post_info['forum_id']) && request_var('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '', - 'POST_ID' => $post_info['post_id'], - - 'U_LOOKUP_IP' => ($auth->acl_get('m_info', $post_info['forum_id'])) ? $this->u_action . '&r=' . $report_id . '&p=' . $post_id . '&f=' . $forum_id . '&lookup=' . $post_info['poster_ip'] . '#ip' : '', - )); - - $this->tpl_name = 'mcp_post'; - - break; - - case 'reports': - case 'reports_closed': - $topic_id = request_var('t', 0); - - $forum_info = array(); - $forum_list_reports = get_forum_list('m_report', false, true); - - if ($topic_id && $forum_id) - { - $topic_info = get_topic_data(array($topic_id)); - - if (!sizeof($topic_info)) - { - trigger_error('TOPIC_NOT_EXIST'); - } - - $topic_info = $topic_info[$topic_id]; - $forum_id = $topic_info['forum_id']; - } - else if ($topic_id && !$forum_id) - { - $topic_id = 0; - } - - $forum_list = array(); - - if (!$forum_id) - { - foreach ($forum_list_reports as $row) - { - $forum_list[] = $row['forum_id']; - } - - if (!sizeof($forum_list)) - { - trigger_error('NOT_MODERATOR'); - } - - $global_id = $forum_list[0]; - - $sql = 'SELECT SUM(forum_topics) as sum_forum_topics - FROM ' . FORUMS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $forum_list); - $result = $db->sql_query($sql); - $forum_info['forum_topics'] = (int) $db->sql_fetchfield('sum_forum_topics'); - $db->sql_freeresult($result); - } - else - { - $forum_info = get_forum_data(array($forum_id), 'm_report'); - - if (!sizeof($forum_info)) - { - trigger_error('NOT_MODERATOR'); - } - - $forum_info = $forum_info[$forum_id]; - $forum_list = array($forum_id); - $global_id = $forum_id; - } - - $forum_list[] = 0; - $forum_data = array(); - - $forum_options = ''; - foreach ($forum_list_reports as $row) - { - $forum_options .= ''; - $forum_data[$row['forum_id']] = $row; - } - unset($forum_list_reports); - - $sort_days = $total = 0; - $sort_key = $sort_dir = ''; - $sort_by_sql = $sort_order_sql = array(); - mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id); - - $forum_topics = ($total == -1) ? $forum_info['forum_topics'] : $total; - $limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : ''; - - if ($mode == 'reports') - { - $report_state = 'AND p.post_reported = 1 AND r.report_closed = 0'; - } - else - { - $report_state = 'AND r.report_closed = 1'; - } - - $sql = 'SELECT r.report_id - FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . REPORTS_TABLE . ' r ' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . (($sort_order_sql[0] == 'r') ? ', ' . USERS_TABLE . ' ru' : '') . ' - WHERE ' . $db->sql_in_set('p.forum_id', $forum_list) . " - $report_state - AND r.post_id = p.post_id - " . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = p.poster_id' : '') . ' - ' . (($sort_order_sql[0] == 'r') ? 'AND ru.user_id = p.poster_id' : '') . ' - ' . (($topic_id) ? 'AND p.topic_id = ' . $topic_id : '') . " - AND t.topic_id = p.topic_id - $limit_time_sql - ORDER BY $sort_order_sql"; - $result = $db->sql_query_limit($sql, $config['topics_per_page'], $start); - - $i = 0; - $report_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $report_ids[] = $row['report_id']; - $row_num[$row['report_id']] = $i++; - } - $db->sql_freeresult($result); - - if (sizeof($report_ids)) - { - $sql = 'SELECT t.forum_id, t.topic_id, t.topic_title, p.post_id, p.post_subject, p.post_username, p.poster_id, p.post_time, u.username, u.username_clean, u.user_colour, r.user_id as reporter_id, ru.username as reporter_name, ru.user_colour as reporter_colour, r.report_time, r.report_id - FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . ' u, ' . USERS_TABLE . ' ru - WHERE ' . $db->sql_in_set('r.report_id', $report_ids) . ' - AND t.topic_id = p.topic_id - AND r.post_id = p.post_id - AND u.user_id = p.poster_id - AND ru.user_id = r.user_id - ORDER BY ' . $sort_order_sql; - $result = $db->sql_query($sql); - - $report_data = $rowset = array(); - while ($row = $db->sql_fetchrow($result)) - { - $global_topic = ($row['forum_id']) ? false : true; - if ($global_topic) - { - $row['forum_id'] = $global_id; - } - - $template->assign_block_vars('postrow', array( - 'U_VIEWFORUM' => (!$global_topic) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : '', - 'U_VIEWPOST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id'] . '&p=' . $row['post_id']) . '#p' . $row['post_id'], - 'U_VIEW_DETAILS' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=reports&start=$start&mode=report_details&f={$row['forum_id']}&r={$row['report_id']}"), - - 'POST_AUTHOR_FULL' => get_username_string('full', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']), - 'POST_AUTHOR_COLOUR' => get_username_string('colour', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']), - 'POST_AUTHOR' => get_username_string('username', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']), - 'U_POST_AUTHOR' => get_username_string('profile', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']), - - 'REPORTER_FULL' => get_username_string('full', $row['reporter_id'], $row['reporter_name'], $row['reporter_colour']), - 'REPORTER_COLOUR' => get_username_string('colour', $row['reporter_id'], $row['reporter_name'], $row['reporter_colour']), - 'REPORTER' => get_username_string('username', $row['reporter_id'], $row['reporter_name'], $row['reporter_colour']), - 'U_REPORTER' => get_username_string('profile', $row['reporter_id'], $row['reporter_name'], $row['reporter_colour']), - - 'FORUM_NAME' => (!$global_topic) ? $forum_data[$row['forum_id']]['forum_name'] : $user->lang['GLOBAL_ANNOUNCEMENT'], - 'POST_ID' => $row['post_id'], - 'POST_SUBJECT' => ($row['post_subject']) ? $row['post_subject'] : $user->lang['NO_SUBJECT'], - 'POST_TIME' => $user->format_date($row['post_time']), - 'REPORT_ID' => $row['report_id'], - 'REPORT_TIME' => $user->format_date($row['report_time']), - 'TOPIC_TITLE' => $row['topic_title']) - ); - } - $db->sql_freeresult($result); - unset($report_ids, $row); - } - - // Now display the page - $template->assign_vars(array( - 'L_EXPLAIN' => ($mode == 'reports') ? $user->lang['MCP_REPORTS_OPEN_EXPLAIN'] : $user->lang['MCP_REPORTS_CLOSED_EXPLAIN'], - 'L_TITLE' => ($mode == 'reports') ? $user->lang['MCP_REPORTS_OPEN'] : $user->lang['MCP_REPORTS_CLOSED'], - 'L_ONLY_TOPIC' => ($topic_id) ? sprintf($user->lang['ONLY_TOPIC'], $topic_info['topic_title']) : '', - - 'S_MCP_ACTION' => $this->u_action, - 'S_FORUM_OPTIONS' => $forum_options, - 'S_CLOSED' => ($mode == 'reports_closed') ? true : false, - - 'PAGINATION' => generate_pagination($this->u_action . "&f=$forum_id&t=$topic_id&st=$sort_days&sk=$sort_key&sd=$sort_dir", $total, $config['topics_per_page'], $start), - 'PAGE_NUMBER' => on_page($total, $config['topics_per_page'], $start), - 'TOPIC_ID' => $topic_id, - 'TOTAL' => $total, - 'TOTAL_REPORTS' => ($total == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $total), - ) - ); - - $this->tpl_name = 'mcp_reports'; - break; - } - } -} - -/** -* Closes a report -*/ -function close_report($report_id_list, $mode, $action) -{ - global $db, $template, $user, $config; - global $phpEx, $phpbb_root_path; - - $sql = 'SELECT r.post_id - FROM ' . REPORTS_TABLE . ' r - WHERE ' . $db->sql_in_set('r.report_id', $report_id_list); - $result = $db->sql_query($sql); - - $post_id_list = array(); - while ($row = $db->sql_fetchrow($result)) - { - $post_id_list[] = $row['post_id']; - } - $post_id_list = array_unique($post_id_list); - - if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_report'))) - { - trigger_error('NOT_AUTHORISED'); - } - - if ($action == 'delete' && strpos($user->data['session_page'], 'mode=report_details') !== false) - { - $redirect = request_var('redirect', build_url(array('mode', '_f_', 'r', 'quickmod')) . '&mode=reports'); - } - else if ($action == 'close' && !request_var('r', 0)) - { - $redirect = request_var('redirect', build_url(array('mode', '_f_', 'p', 'quickmod')) . '&mode=reports'); - } - else - { - $redirect = request_var('redirect', build_url(array('_f_', 'quickmod'))); - } - $success_msg = ''; - $forum_ids = array(); - $topic_ids = array(); - - $s_hidden_fields = build_hidden_fields(array( - 'i' => 'reports', - 'mode' => $mode, - 'report_id_list' => $report_id_list, - 'action' => $action, - 'redirect' => $redirect) - ); - - if (confirm_box(true)) - { - $post_info = get_post_data($post_id_list, 'm_report'); - - $sql = 'SELECT r.report_id, r.post_id, r.report_closed, r.user_id, r.user_notify, u.username, u.username_clean, u.user_email, u.user_jabber, u.user_lang, u.user_notify_type - FROM ' . REPORTS_TABLE . ' r, ' . USERS_TABLE . ' u - WHERE ' . $db->sql_in_set('r.report_id', $report_id_list) . ' - ' . (($action == 'close') ? 'AND r.report_closed = 0' : '') . ' - AND r.user_id = u.user_id'; - $result = $db->sql_query($sql); - - $reports = $close_report_posts = $close_report_topics = $notify_reporters = $report_id_list = array(); - while ($report = $db->sql_fetchrow($result)) - { - $reports[$report['report_id']] = $report; - $report_id_list[] = $report['report_id']; - - if (!$report['report_closed']) - { - $close_report_posts[] = $report['post_id']; - $close_report_topics[] = $post_info[$report['post_id']]['topic_id']; - } - - if ($report['user_notify'] && !$report['report_closed']) - { - $notify_reporters[$report['report_id']] = &$reports[$report['report_id']]; - } - } - $db->sql_freeresult($result); - - if (sizeof($reports)) - { - $close_report_posts = array_unique($close_report_posts); - $close_report_topics = array_unique($close_report_topics); - - if (sizeof($close_report_posts)) - { - // Get a list of topics that still contain reported posts - $sql = 'SELECT DISTINCT topic_id - FROM ' . POSTS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $close_report_topics) . ' - AND post_reported = 1 - AND ' . $db->sql_in_set('post_id', $close_report_posts, true); - $result = $db->sql_query($sql); - - $keep_report_topics = array(); - while ($row = $db->sql_fetchrow($result)) - { - $keep_report_topics[] = $row['topic_id']; - } - $db->sql_freeresult($result); - - $close_report_topics = array_diff($close_report_topics, $keep_report_topics); - unset($keep_report_topics); - } - - $db->sql_transaction('begin'); - - if ($action == 'close') - { - $sql = 'UPDATE ' . REPORTS_TABLE . ' - SET report_closed = 1 - WHERE ' . $db->sql_in_set('report_id', $report_id_list); - } - else - { - $sql = 'DELETE FROM ' . REPORTS_TABLE . ' - WHERE ' . $db->sql_in_set('report_id', $report_id_list); - } - $db->sql_query($sql); - - - if (sizeof($close_report_posts)) - { - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET post_reported = 0 - WHERE ' . $db->sql_in_set('post_id', $close_report_posts); - $db->sql_query($sql); - - if (sizeof($close_report_topics)) - { - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET topic_reported = 0 - WHERE ' . $db->sql_in_set('topic_id', $close_report_topics); - $db->sql_query($sql); - } - } - - $db->sql_transaction('commit'); - } - unset($close_report_posts, $close_report_topics); - - foreach ($reports as $report) - { - add_log('mod', $post_info[$report['post_id']]['forum_id'], $post_info[$report['post_id']]['topic_id'], 'LOG_REPORT_' . strtoupper($action) . 'D', $post_info[$report['post_id']]['post_subject']); - } - - $messenger = new messenger(); - - // Notify reporters - if (sizeof($notify_reporters)) - { - foreach ($notify_reporters as $report_id => $reporter) - { - if ($reporter['user_id'] == ANONYMOUS) - { - continue; - } - - $post_id = $reporter['post_id']; - - $messenger->template('report_' . $action . 'd', $reporter['user_lang']); - - $messenger->to($reporter['user_email'], $reporter['username']); - $messenger->im($reporter['user_jabber'], $reporter['username']); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($reporter['username']), - 'CLOSER_NAME' => htmlspecialchars_decode($user->data['username']), - 'POST_SUBJECT' => htmlspecialchars_decode(censor_text($post_info[$post_id]['post_subject'])), - 'TOPIC_TITLE' => htmlspecialchars_decode(censor_text($post_info[$post_id]['topic_title']))) - ); - - $messenger->send($reporter['user_notify_type']); - } - } - - foreach ($post_info as $post) - { - $forum_ids[$post['forum_id']] = $post['forum_id']; - $topic_ids[$post['topic_id']] = $post['topic_id']; - } - - unset($notify_reporters, $post_info, $reports); - - $messenger->save_queue(); - - $success_msg = (sizeof($report_id_list) == 1) ? 'REPORT_' . strtoupper($action) . 'D_SUCCESS' : 'REPORTS_' . strtoupper($action) . 'D_SUCCESS'; - } - else - { - confirm_box(false, $user->lang[strtoupper($action) . '_REPORT' . ((sizeof($report_id_list) == 1) ? '' : 'S') . '_CONFIRM'], $s_hidden_fields); - } - - $redirect = request_var('redirect', "index.$phpEx"); - $redirect = reapply_sid($redirect); - - if (!$success_msg) - { - redirect($redirect); - } - else - { - meta_refresh(3, $redirect); - $return_forum = ''; - if (sizeof($forum_ids == 1)) - { - $return_forum = sprintf($user->lang['RETURN_FORUM'], '', '') . '

    '; - } - $return_topic = ''; - if (sizeof($topic_ids == 1)) - { - $return_topic = sprintf($user->lang['RETURN_TOPIC'], '', '') . '

    '; - } - - trigger_error($user->lang[$success_msg] . '

    ' . $return_forum . $return_topic . sprintf($user->lang['RETURN_PAGE'], "", '')); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php deleted file mode 100644 index ca566b1524..0000000000 --- a/phpBB/includes/mcp/mcp_topic.php +++ /dev/null @@ -1,622 +0,0 @@ -add_lang('viewtopic'); - - $topic_id = request_var('t', 0); - $topic_info = get_topic_data(array($topic_id), false, true); - - if (!sizeof($topic_info)) - { - trigger_error('TOPIC_NOT_EXIST'); - } - - $topic_info = $topic_info[$topic_id]; - - // Set up some vars - $icon_id = request_var('icon', 0); - $subject = utf8_normalize_nfc(request_var('subject', '', true)); - $start = request_var('start', 0); - $sort_days_old = request_var('st_old', 0); - $forum_id = request_var('f', 0); - $to_topic_id = request_var('to_topic_id', 0); - $to_forum_id = request_var('to_forum_id', 0); - $post_id_list = request_var('post_id_list', array(0)); - $sort = isset($_POST['sort']) ? true : false; - - // Split Topic? - if ($action == 'split_all' || $action == 'split_beyond') - { - if (!$sort) - { - split_topic($action, $topic_id, $to_forum_id, $subject); - } - $action = 'split'; - } - - // Merge Posts? - if ($action == 'merge_posts') - { - if (!$sort) - { - merge_posts($topic_id, $to_topic_id); - } - $action = 'merge'; - } - - if ($action == 'split' && !$subject) - { - $subject = $topic_info['topic_title']; - } - - // Approve posts? - if ($action == 'approve' && $auth->acl_get('m_approve', $topic_info['forum_id'])) - { - include($phpbb_root_path . 'includes/mcp/mcp_queue.' . $phpEx); - include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx); - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - - if (!sizeof($post_id_list)) - { - trigger_error('NO_POST_SELECTED'); - } - - if (!$sort) - { - approve_post($post_id_list, $id, $mode); - } - } - - // Jumpbox, sort selects and that kind of things - make_jumpbox($url . "&i=$id&mode=forum_view", $topic_info['forum_id'], false, 'm_', true); - $where_sql = ($action == 'reports') ? 'WHERE post_reported = 1 AND ' : 'WHERE'; - - $sort_days = $total = 0; - $sort_key = $sort_dir = ''; - $sort_by_sql = $sort_order_sql = array(); - mcp_sorting('viewtopic', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $topic_info['forum_id'], $topic_id, $where_sql); - - $limit_time_sql = ($sort_days) ? 'AND p.post_time >= ' . (time() - ($sort_days * 86400)) : ''; - - if ($total == -1) - { - $total = $topic_info['topic_replies'] + 1; - } - - $posts_per_page = max(0, request_var('posts_per_page', intval($config['posts_per_page']))); - if ($posts_per_page == 0) - { - $posts_per_page = $total; - } - if (!empty($sort_days_old) && $sort_days_old != $sort_days) - { - $start = 0; - } - - $sql = 'SELECT u.username, u.username_clean, u.user_colour, p.* - FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u - WHERE ' . (($action == 'reports') ? 'p.post_reported = 1 AND ' : '') . ' - p.topic_id = ' . $topic_id . ' ' . - ((!$auth->acl_get('m_approve', $topic_info['forum_id'])) ? ' AND p.post_approved = 1 ' : '') . ' - AND p.poster_id = u.user_id ' . - $limit_time_sql . ' - ORDER BY ' . $sort_order_sql; - $result = $db->sql_query_limit($sql, $posts_per_page, $start); - - $rowset = $post_id_list = array(); - $bbcode_bitfield = ''; - while ($row = $db->sql_fetchrow($result)) - { - $rowset[] = $row; - $post_id_list[] = $row['post_id']; - $bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']); - } - $db->sql_freeresult($result); - - if ($bbcode_bitfield !== '') - { - include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); - $bbcode = new bbcode(base64_encode($bbcode_bitfield)); - } - - $topic_tracking_info = array(); - - // Get topic tracking info - if ($config['load_db_lastread']) - { - $tmp_topic_data = array($topic_id => $topic_info); - $topic_tracking_info = get_topic_tracking($topic_info['forum_id'], $topic_id, $tmp_topic_data, array($topic_info['forum_id'] => $topic_info['forum_mark_time'])); - unset($tmp_topic_data); - } - else - { - $topic_tracking_info = get_complete_topic_tracking($topic_info['forum_id'], $topic_id); - } - - $has_unapproved_posts = false; - - // Grab extensions - $extensions = $attachments = array(); - if ($topic_info['topic_attachment'] && sizeof($post_id_list)) - { - $extensions = cache::obtain_attach_extensions($topic_info['forum_id']); - - // Get attachments... - if ($auth->acl_get('u_download') && $auth->acl_get('f_download', $topic_info['forum_id'])) - { - $sql = 'SELECT * - FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set('post_msg_id', $post_id_list) . ' - AND in_message = 0 - ORDER BY filetime DESC, post_msg_id ASC'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $attachments[$row['post_msg_id']][] = $row; - } - $db->sql_freeresult($result); - } - } - - foreach ($rowset as $i => $row) - { - $message = $row['post_text']; - $post_subject = ($row['post_subject'] != '') ? $row['post_subject'] : $topic_info['topic_title']; - - if ($row['bbcode_bitfield']) - { - $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); - } - - $message = bbcode_nl2br($message); - $message = smiley_text($message); - - if (!empty($attachments[$row['post_id']])) - { - $update_count = array(); - parse_attachments($topic_info['forum_id'], $message, $attachments[$row['post_id']], $update_count); - } - - if (!$row['post_approved']) - { - $has_unapproved_posts = true; - } - - $post_unread = (isset($topic_tracking_info[$topic_id]) && $row['post_time'] > $topic_tracking_info[$topic_id]) ? true : false; - - $template->assign_block_vars('postrow', array( - 'POST_AUTHOR_FULL' => get_username_string('full', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']), - 'POST_AUTHOR_COLOUR' => get_username_string('colour', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']), - 'POST_AUTHOR' => get_username_string('username', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']), - 'U_POST_AUTHOR' => get_username_string('profile', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']), - - 'POST_DATE' => $user->format_date($row['post_time']), - 'POST_SUBJECT' => $post_subject, - 'MESSAGE' => $message, - 'POST_ID' => $row['post_id'], - 'RETURN_TOPIC' => sprintf($user->lang['RETURN_TOPIC'], '', ''), - - 'MINI_POST_IMG' => ($post_unread) ? $user->img('icon_post_target_unread', 'NEW_POST') : $user->img('icon_post_target', 'POST'), - - 'S_POST_REPORTED' => ($row['post_reported']) ? true : false, - 'S_POST_UNAPPROVED' => ($row['post_approved']) ? false : true, - 'S_CHECKED' => ($post_id_list && in_array(intval($row['post_id']), $post_id_list)) ? true : false, - 'S_HAS_ATTACHMENTS' => (!empty($attachments[$row['post_id']])) ? true : false, - - 'U_POST_DETAILS' => "$url&i=$id&p={$row['post_id']}&mode=post_details" . (($forum_id) ? "&f=$forum_id" : ''), - 'U_MCP_APPROVE' => ($auth->acl_get('m_approve', $topic_info['forum_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&f=' . $topic_info['forum_id'] . '&p=' . $row['post_id']) : '', - 'U_MCP_REPORT' => ($auth->acl_get('m_report', $topic_info['forum_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=report_details&f=' . $topic_info['forum_id'] . '&p=' . $row['post_id']) : '') - ); - - // Display not already displayed Attachments for this post, we already parsed them. ;) - if (!empty($attachments[$row['post_id']])) - { - foreach ($attachments[$row['post_id']] as $attachment) - { - $template->assign_block_vars('postrow.attachment', array( - 'DISPLAY_ATTACHMENT' => $attachment) - ); - } - } - - unset($rowset[$i]); - } - - // Display topic icons for split topic - $s_topic_icons = false; - - if ($auth->acl_get('m_split', $topic_info['forum_id'])) - { - include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx); - $s_topic_icons = posting_gen_topic_icons('', $icon_id); - - // Has the user selected a topic for merge? - if ($to_topic_id) - { - $to_topic_info = get_topic_data(array($to_topic_id), 'm_merge'); - - if (!sizeof($to_topic_info)) - { - $to_topic_id = 0; - } - else - { - $to_topic_info = $to_topic_info[$to_topic_id]; - - if (!$to_topic_info['enable_icons'] || $auth->acl_get('!f_icons', $topic_info['forum_id'])) - { - $s_topic_icons = false; - } - } - } - } - - $s_hidden_fields = build_hidden_fields(array( - 'st_old' => $sort_days, - )); - - $template->assign_vars(array( - 'TOPIC_TITLE' => $topic_info['topic_title'], - 'U_VIEW_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $topic_info['forum_id'] . '&t=' . $topic_info['topic_id']), - - 'TO_TOPIC_ID' => $to_topic_id, - 'TO_TOPIC_INFO' => ($to_topic_id) ? sprintf($user->lang['YOU_SELECTED_TOPIC'], $to_topic_id, '' . $to_topic_info['topic_title'] . '') : '', - - 'SPLIT_SUBJECT' => $subject, - 'POSTS_PER_PAGE' => $posts_per_page, - 'ACTION' => $action, - - 'REPORTED_IMG' => $user->img('icon_topic_reported', 'POST_REPORTED', false, true), - 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'POST_UNAPPROVED', false, true), - - 'S_MCP_ACTION' => "$url&i=$id&mode=$mode&action=$action&start=$start", - 'S_FORUM_SELECT' => ($to_forum_id) ? make_forum_select($to_forum_id, false, false, true, true, true) : make_forum_select($topic_info['forum_id'], false, false, true, true, true), - 'S_CAN_SPLIT' => ($auth->acl_get('m_split', $topic_info['forum_id'])) ? true : false, - 'S_CAN_MERGE' => ($auth->acl_get('m_merge', $topic_info['forum_id'])) ? true : false, - 'S_CAN_DELETE' => ($auth->acl_get('m_delete', $topic_info['forum_id'])) ? true : false, - 'S_CAN_APPROVE' => ($has_unapproved_posts && $auth->acl_get('m_approve', $topic_info['forum_id'])) ? true : false, - 'S_CAN_LOCK' => ($auth->acl_get('m_lock', $topic_info['forum_id'])) ? true : false, - 'S_CAN_REPORT' => ($auth->acl_get('m_report', $topic_info['forum_id'])) ? true : false, - 'S_REPORT_VIEW' => ($action == 'reports') ? true : false, - 'S_MERGE_VIEW' => ($action == 'merge') ? true : false, - 'S_SPLIT_VIEW' => ($action == 'split') ? true : false, - - 'S_HIDDEN_FIELDS' => $s_hidden_fields, - - 'S_SHOW_TOPIC_ICONS' => $s_topic_icons, - 'S_TOPIC_ICON' => $icon_id, - - 'U_SELECT_TOPIC' => "$url&i=$id&mode=forum_view&action=merge_select" . (($forum_id) ? "&f=$forum_id" : ''), - - 'RETURN_TOPIC' => sprintf($user->lang['RETURN_TOPIC'], '', ''), - 'RETURN_FORUM' => sprintf($user->lang['RETURN_FORUM'], '', ''), - - 'PAGE_NUMBER' => on_page($total, $posts_per_page, $start), - 'PAGINATION' => (!$posts_per_page) ? '' : generate_pagination(append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&t={$topic_info['topic_id']}&mode=$mode&action=$action&to_topic_id=$to_topic_id&posts_per_page=$posts_per_page&st=$sort_days&sk=$sort_key&sd=$sort_dir"), $total, $posts_per_page, $start), - 'TOTAL_POSTS' => ($total == 1) ? $user->lang['VIEW_TOPIC_POST'] : sprintf($user->lang['VIEW_TOPIC_POSTS'], $total), - )); -} - -/** -* Split topic -*/ -function split_topic($action, $topic_id, $to_forum_id, $subject) -{ - global $db, $template, $user, $phpEx, $phpbb_root_path, $auth; - - $post_id_list = request_var('post_id_list', array(0)); - $forum_id = request_var('forum_id', 0); - $start = request_var('start', 0); - - if (!sizeof($post_id_list)) - { - $template->assign_var('MESSAGE', $user->lang['NO_POST_SELECTED']); - return; - } - - if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_split'))) - { - return; - } - - $post_id = $post_id_list[0]; - $post_info = get_post_data(array($post_id)); - - if (!sizeof($post_info)) - { - $template->assign_var('MESSAGE', $user->lang['NO_POST_SELECTED']); - return; - } - - $post_info = $post_info[$post_id]; - $subject = trim($subject); - - // Make some tests - if (!$subject) - { - $template->assign_var('MESSAGE', $user->lang['EMPTY_SUBJECT']); - return; - } - - if ($to_forum_id <= 0) - { - $template->assign_var('MESSAGE', $user->lang['NO_DESTINATION_FORUM']); - return; - } - - $forum_info = get_forum_data(array($to_forum_id), 'm_split'); - - if (!sizeof($forum_info)) - { - $template->assign_var('MESSAGE', $user->lang['NOT_MODERATOR']); - return; - } - - $forum_info = $forum_info[$to_forum_id]; - - if ($forum_info['forum_type'] != FORUM_POST) - { - $template->assign_var('MESSAGE', $user->lang['FORUM_NOT_POSTABLE']); - return; - } - - $redirect = request_var('redirect', build_url(array('_f_', 'quickmod'))); - - $s_hidden_fields = build_hidden_fields(array( - 'i' => 'main', - 'post_id_list' => $post_id_list, - 'f' => $forum_id, - 'mode' => 'topic_view', - 'start' => $start, - 'action' => $action, - 't' => $topic_id, - 'redirect' => $redirect, - 'subject' => $subject, - 'to_forum_id' => $to_forum_id, - 'icon' => request_var('icon', 0)) - ); - $success_msg = $return_link = ''; - - if (confirm_box(true)) - { - if ($action == 'split_beyond') - { - $sort_days = $total = 0; - $sort_key = $sort_dir = ''; - $sort_by_sql = $sort_order_sql = array(); - mcp_sorting('viewtopic', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $forum_id, $topic_id); - - $limit_time_sql = ($sort_days) ? 'AND t.topic_last_post_time >= ' . (time() - ($sort_days * 86400)) : ''; - - if ($sort_order_sql[0] == 'u') - { - $sql = 'SELECT p.post_id, p.forum_id, p.post_approved - FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u - WHERE p.topic_id = $topic_id - AND p.poster_id = u.user_id - $limit_time_sql - ORDER BY $sort_order_sql"; - } - else - { - $sql = 'SELECT p.post_id, p.forum_id, p.post_approved - FROM ' . POSTS_TABLE . " p - WHERE p.topic_id = $topic_id - $limit_time_sql - ORDER BY $sort_order_sql"; - } - $result = $db->sql_query_limit($sql, 0, $start); - - $store = false; - $post_id_list = array(); - while ($row = $db->sql_fetchrow($result)) - { - // If split from selected post (split_beyond), we split the unapproved items too. - if (!$row['post_approved'] && !$auth->acl_get('m_approve', $row['forum_id'])) - { -// continue; - } - - // Start to store post_ids as soon as we see the first post that was selected - if ($row['post_id'] == $post_id) - { - $store = true; - } - - if ($store) - { - $post_id_list[] = $row['post_id']; - } - } - $db->sql_freeresult($result); - } - - if (!sizeof($post_id_list)) - { - trigger_error('NO_POST_SELECTED'); - } - - $icon_id = request_var('icon', 0); - - $sql_ary = array( - 'forum_id' => $to_forum_id, - 'topic_title' => $subject, - 'icon_id' => $icon_id, - 'topic_approved'=> 1 - ); - - $sql = 'INSERT INTO ' . TOPICS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - $db->sql_query($sql); - - $to_topic_id = $db->sql_nextid(); - move_posts($post_id_list, $to_topic_id); - - $topic_info = get_topic_data(array($topic_id)); - $topic_info = $topic_info[$topic_id]; - - add_log('mod', $to_forum_id, $to_topic_id, 'LOG_SPLIT_DESTINATION', $subject); - add_log('mod', $forum_id, $topic_id, 'LOG_SPLIT_SOURCE', $topic_info['topic_title']); - - // Change topic title of first post - $sql = 'UPDATE ' . POSTS_TABLE . " - SET post_subject = '" . $db->sql_escape($subject) . "' - WHERE post_id = {$post_id_list[0]}"; - $db->sql_query($sql); - - $success_msg = 'TOPIC_SPLIT_SUCCESS'; - - // Link back to both topics - $return_link = sprintf($user->lang['RETURN_TOPIC'], '', '') . '

    ' . sprintf($user->lang['RETURN_NEW_TOPIC'], '', ''); - } - else - { - confirm_box(false, ($action == 'split_all') ? 'SPLIT_TOPIC_ALL' : 'SPLIT_TOPIC_BEYOND', $s_hidden_fields); - } - - $redirect = request_var('redirect', "index.$phpEx"); - $redirect = reapply_sid($redirect); - - if (!$success_msg) - { - return; - } - else - { - meta_refresh(3, append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$to_forum_id&t=$to_topic_id")); - trigger_error($user->lang[$success_msg] . '

    ' . $return_link); - } -} - -/** -* Merge selected posts into selected topic -*/ -function merge_posts($topic_id, $to_topic_id) -{ - global $db, $template, $user, $phpEx, $phpbb_root_path, $auth; - - if (!$to_topic_id) - { - $template->assign_var('MESSAGE', $user->lang['NO_FINAL_TOPIC_SELECTED']); - return; - } - - $topic_data = get_topic_data(array($to_topic_id), 'm_merge'); - - if (!sizeof($topic_data)) - { - $template->assign_var('MESSAGE', $user->lang['NO_FINAL_TOPIC_SELECTED']); - return; - } - - $topic_data = $topic_data[$to_topic_id]; - - $post_id_list = request_var('post_id_list', array(0)); - $start = request_var('start', 0); - - if (!sizeof($post_id_list)) - { - $template->assign_var('MESSAGE', $user->lang['NO_POST_SELECTED']); - return; - } - - if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_merge'))) - { - return; - } - - $redirect = request_var('redirect', build_url(array('_f_', 'quickmod'))); - - $s_hidden_fields = build_hidden_fields(array( - 'i' => 'main', - 'post_id_list' => $post_id_list, - 'to_topic_id' => $to_topic_id, - 'mode' => 'topic_view', - 'action' => 'merge_posts', - 'start' => $start, - 'redirect' => $redirect, - 't' => $topic_id) - ); - $success_msg = $return_link = ''; - - if (confirm_box(true)) - { - $to_forum_id = $topic_data['forum_id']; - - move_posts($post_id_list, $to_topic_id); - add_log('mod', $to_forum_id, $to_topic_id, 'LOG_MERGE', $topic_data['topic_title']); - - // Message and return links - $success_msg = 'POSTS_MERGED_SUCCESS'; - - // Does the original topic still exist? If yes, link back to it - $sql = 'SELECT forum_id - FROM ' . TOPICS_TABLE . ' - WHERE topic_id = ' . $topic_id; - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - $return_link .= sprintf($user->lang['RETURN_TOPIC'], '', ''); - } - else - { - // If the topic no longer exist, we will update the topic watch table. - // To not let it error out on users watching both topics, we just return on an error... - $db->sql_return_on_error(true); - $db->sql_query('UPDATE ' . TOPICS_WATCH_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE topic_id = ' . (int) $topic_id); - $db->sql_return_on_error(false); - - $db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE topic_id = ' . (int) $topic_id); - } - - // Link to the new topic - $return_link .= (($return_link) ? '

    ' : '') . sprintf($user->lang['RETURN_NEW_TOPIC'], '', ''); - } - else - { - confirm_box(false, 'MERGE_POSTS', $s_hidden_fields); - } - - $redirect = request_var('redirect', "index.$phpEx"); - $redirect = reapply_sid($redirect); - - if (!$success_msg) - { - return; - } - else - { - meta_refresh(3, append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$to_forum_id&t=$to_topic_id")); - trigger_error($user->lang[$success_msg] . '

    ' . $return_link); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php deleted file mode 100755 index 6751ef41bf..0000000000 --- a/phpBB/includes/mcp/mcp_warn.php +++ /dev/null @@ -1,466 +0,0 @@ -p_master = &$p_master; - } - - function main($id, $mode) - { - global $auth, $db, $user, $template; - global $config, $phpbb_root_path, $phpEx; - - $action = request_var('action', array('' => '')); - - if (is_array($action)) - { - list($action, ) = each($action); - } - - $this->page_title = 'MCP_WARN'; - - add_form_key('mcp_warn'); - - switch ($mode) - { - case 'front': - $this->mcp_warn_front_view(); - $this->tpl_name = 'mcp_warn_front'; - break; - - case 'list': - $this->mcp_warn_list_view($action); - $this->tpl_name = 'mcp_warn_list'; - break; - - case 'warn_post': - $this->mcp_warn_post_view($action); - $this->tpl_name = 'mcp_warn_post'; - break; - - case 'warn_user': - $this->mcp_warn_user_view($action); - $this->tpl_name = 'mcp_warn_user'; - break; - } - } - - /** - * Generates the summary on the main page of the warning module - */ - function mcp_warn_front_view() - { - global $phpEx, $phpbb_root_path, $config; - global $template, $db, $user, $auth; - - $template->assign_vars(array( - 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=mcp&field=username&select_single=true'), - 'U_POST_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user'), - )); - - // Obtain a list of the 5 naughtiest users.... - // These are the 5 users with the highest warning count - $highest = array(); - $count = 0; - - view_warned_users($highest, $count, 5); - - foreach ($highest as $row) - { - $template->assign_block_vars('highest', array( - 'U_NOTES' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $row['user_id']), - - 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), - 'USERNAME' => $row['username'], - 'USERNAME_COLOUR' => ($row['user_colour']) ? '#' . $row['user_colour'] : '', - 'U_USER' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['user_id']), - - 'WARNING_TIME' => $user->format_date($row['user_last_warning']), - 'WARNINGS' => $row['user_warnings'], - )); - } - - // And now the 5 most recent users to get in trouble - $sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_colour, u.user_warnings, w.warning_time - FROM ' . USERS_TABLE . ' u, ' . WARNINGS_TABLE . ' w - WHERE u.user_id = w.user_id - ORDER BY w.warning_time DESC'; - $result = $db->sql_query_limit($sql, 5); - - while ($row = $db->sql_fetchrow($result)) - { - $template->assign_block_vars('latest', array( - 'U_NOTES' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $row['user_id']), - - 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), - 'USERNAME' => $row['username'], - 'USERNAME_COLOUR' => ($row['user_colour']) ? '#' . $row['user_colour'] : '', - 'U_USER' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['user_id']), - - 'WARNING_TIME' => $user->format_date($row['warning_time']), - 'WARNINGS' => $row['user_warnings'], - )); - } - $db->sql_freeresult($result); - } - - /** - * Lists all users with warnings - */ - function mcp_warn_list_view($action) - { - global $phpEx, $phpbb_root_path, $config; - global $template, $db, $user, $auth; - - $user->add_lang('memberlist'); - - $start = request_var('start', 0); - $st = request_var('st', 0); - $sk = request_var('sk', 'b'); - $sd = request_var('sd', 'd'); - - $limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); - $sort_by_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_DATE'], 'c' => $user->lang['SORT_WARNINGS']); - $sort_by_sql = array('a' => 'username_clean', 'b' => 'user_last_warning', 'c' => 'user_warnings'); - - $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = ''; - gen_sort_selects($limit_days, $sort_by_text, $st, $sk, $sd, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); - - // Define where and sort sql for use in displaying logs - $sql_where = ($st) ? (time() - ($st * 86400)) : 0; - $sql_sort = $sort_by_sql[$sk] . ' ' . (($sd == 'd') ? 'DESC' : 'ASC'); - - $users = array(); - $user_count = 0; - - view_warned_users($users, $user_count, $config['topics_per_page'], $start, $sql_where, $sql_sort); - - foreach ($users as $row) - { - $template->assign_block_vars('user', array( - 'U_NOTES' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $row['user_id']), - - 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), - 'USERNAME' => $row['username'], - 'USERNAME_COLOUR' => ($row['user_colour']) ? '#' . $row['user_colour'] : '', - 'U_USER' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['user_id']), - - 'WARNING_TIME' => $user->format_date($row['user_last_warning']), - 'WARNINGS' => $row['user_warnings'], - )); - } - - $template->assign_vars(array( - 'U_POST_ACTION' => $this->u_action, - 'S_CLEAR_ALLOWED' => ($auth->acl_get('a_clearlogs')) ? true : false, - 'S_SELECT_SORT_DIR' => $s_sort_dir, - 'S_SELECT_SORT_KEY' => $s_sort_key, - 'S_SELECT_SORT_DAYS' => $s_limit_days, - - 'PAGE_NUMBER' => on_page($user_count, $config['topics_per_page'], $start), - 'PAGINATION' => generate_pagination(append_sid("{$phpbb_root_path}mcp.$phpEx", "i=warn&mode=list&st=$st&sk=$sk&sd=$sd"), $user_count, $config['topics_per_page'], $start), - 'TOTAL_USERS' => ($user_count == 1) ? $user->lang['LIST_USER'] : sprintf($user->lang['LIST_USERS'], $user_count), - )); - } - - /** - * Handles warning the user when the warning is for a specific post - */ - function mcp_warn_post_view($action) - { - global $phpEx, $phpbb_root_path, $config; - global $template, $db, $user, $auth; - - $post_id = request_var('p', 0); - $forum_id = request_var('f', 0); - $notify = (isset($_REQUEST['notify_user'])) ? true : false; - $warning = utf8_normalize_nfc(request_var('warning', '', true)); - - $sql = 'SELECT u.*, p.* - FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u - WHERE post_id = $post_id - AND u.user_id = p.poster_id"; - $result = $db->sql_query($sql); - $user_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$user_row) - { - trigger_error('NO_POST'); - } - - // There is no point issuing a warning to ignored users (ie anonymous and bots) - if ($user_row['user_type'] == USER_IGNORE) - { - trigger_error('CANNOT_WARN_ANONYMOUS'); - } - - // Prevent someone from warning themselves - if ($user_row['user_id'] == $user->data['user_id']) - { - trigger_error('CANNOT_WARN_SELF'); - } - - // Check if there is already a warning for this post to prevent multiple - // warnings for the same offence - $sql = 'SELECT post_id - FROM ' . WARNINGS_TABLE . " - WHERE post_id = $post_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - trigger_error('ALREADY_WARNED'); - } - - $user_id = $user_row['user_id']; - - if (strpos($this->u_action, "&f=$forum_id&p=$post_id") === false) - { - $this->p_master->adjust_url("&f=$forum_id&p=$post_id"); - $this->u_action .= "&f=$forum_id&p=$post_id"; - } - - if ($warning && $action == 'add_warning') - { - if (check_form_key('mcp_warn')) - { - add_warning($user_row, $warning, $notify, $post_id); - $msg = $user->lang['USER_WARNING_ADDED']; - } - else - { - $msg = $user->lang['FORM_INVALID']; - } - $redirect = append_sid("{$phpbb_root_path}mcp.$phpEx", "i=notes&mode=user_notes&u=$user_id"); - meta_refresh(2, $redirect); - trigger_error($user->lang['USER_WARNING_ADDED'] . '

    ' . sprintf($user->lang['RETURN_PAGE'], '', '')); - } - - // OK, they didn't submit a warning so lets build the page for them to do so - - // We want to make the message available here as a reminder - // Parse the message and subject - $message = censor_text($user_row['post_text']); - - // Second parse bbcode here - if ($user_row['bbcode_bitfield']) - { - include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); - - $bbcode = new bbcode($user_row['bbcode_bitfield']); - $bbcode->bbcode_second_pass($message, $user_row['bbcode_uid'], $user_row['bbcode_bitfield']); - } - - $message = bbcode_nl2br($message); - $message = smiley_text($message); - - // Generate the appropriate user information for the user we are looking at - if (!function_exists('get_user_avatar')) - { - include($phpbb_root_path . 'includes/functions_display.' . $phpEx); - } - - $rank_title = $rank_img = ''; - $avatar_img = get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']); - - $template->assign_vars(array( - 'U_POST_ACTION' => $this->u_action, - - 'POST' => $message, - 'USERNAME' => $user_row['username'], - 'USER_COLOR' => (!empty($user_row['user_colour'])) ? $user_row['user_colour'] : '', - 'RANK_TITLE' => $rank_title, - 'JOINED' => $user->format_date($user_row['user_regdate']), - 'POSTS' => ($user_row['user_posts']) ? $user_row['user_posts'] : 0, - 'WARNINGS' => ($user_row['user_warnings']) ? $user_row['user_warnings'] : 0, - - 'AVATAR_IMG' => $avatar_img, - 'RANK_IMG' => $rank_img, - - 'L_WARNING_POST_DEFAULT' => sprintf($user->lang['WARNING_POST_DEFAULT'], generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&p=$post_id#p$post_id"), - )); - } - - /** - * Handles warning the user - */ - function mcp_warn_user_view($action) - { - global $phpEx, $phpbb_root_path, $config, $module; - global $template, $db, $user, $auth; - - $user_id = request_var('u', 0); - $username = request_var('username', '', true); - $notify = (isset($_REQUEST['notify_user'])) ? true : false; - $warning = utf8_normalize_nfc(request_var('warning', '', true)); - - $sql_where = ($user_id) ? "user_id = $user_id" : "username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'"; - - $sql = 'SELECT * - FROM ' . USERS_TABLE . ' - WHERE ' . $sql_where; - $result = $db->sql_query($sql); - $user_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$user_row) - { - trigger_error('NO_USER'); - } - - // Prevent someone from warning themselves - if ($user_row['user_id'] == $user->data['user_id']) - { - trigger_error('CANNOT_WARN_SELF'); - } - - $user_id = $user_row['user_id']; - - if (strpos($this->u_action, "&u=$user_id") === false) - { - $this->p_master->adjust_url('&u=' . $user_id); - $this->u_action .= "&u=$user_id"; - } - - if ($warning && $action == 'add_warning') - { - if (check_form_key('mcp_warn')) - { - add_warning($user_row, $warning, $notify); - $msg = $user->lang['USER_WARNING_ADDED']; - } - else - { - $msg = $user->lang['FORM_INVALID']; - } - $redirect = append_sid("{$phpbb_root_path}mcp.$phpEx", "i=notes&mode=user_notes&u=$user_id"); - meta_refresh(2, $redirect); - trigger_error($msg . '

    ' . sprintf($user->lang['RETURN_PAGE'], '', '')); - } - - // Generate the appropriate user information for the user we are looking at - if (!function_exists('get_user_avatar')) - { - include($phpbb_root_path . 'includes/functions_display.' . $phpEx); - } - - $rank_title = $rank_img = ''; - $avatar_img = get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']); - - // OK, they didn't submit a warning so lets build the page for them to do so - $template->assign_vars(array( - 'U_POST_ACTION' => $this->u_action, - - 'USERNAME' => $user_row['username'], - 'USER_COLOR' => (!empty($user_row['user_colour'])) ? $user_row['user_colour'] : '', - 'RANK_TITLE' => $rank_title, - 'JOINED' => $user->format_date($user_row['user_regdate']), - 'POSTS' => ($user_row['user_posts']) ? $user_row['user_posts'] : 0, - 'WARNINGS' => ($user_row['user_warnings']) ? $user_row['user_warnings'] : 0, - - 'AVATAR_IMG' => $avatar_img, - 'RANK_IMG' => $rank_img, - )); - - return $user_id; - } -} - -/** -* Insert the warning into the database -*/ -function add_warning($user_row, $warning, $send_pm = true, $post_id = 0) -{ - global $phpEx, $phpbb_root_path, $config; - global $template, $db, $user, $auth; - - if ($send_pm) - { - include_once($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx); - include_once($phpbb_root_path . 'includes/message_parser.' . $phpEx); - - $user_row['user_lang'] = (file_exists($phpbb_root_path . 'language/' . $user_row['user_lang'] . "/mcp.$phpEx")) ? $user_row['user_lang'] : $config['default_lang']; - include($phpbb_root_path . 'language/' . basename($user_row['user_lang']) . "/mcp.$phpEx"); - - $message_parser = new parse_message(); - - $message_parser->message = sprintf($lang['WARNING_PM_BODY'], $warning); - $message_parser->parse(true, true, true, false, false, true, true); - - $pm_data = array( - 'from_user_id' => $user->data['user_id'], - 'from_user_ip' => $user->ip, - 'from_username' => $user->data['username'], - 'enable_sig' => false, - 'enable_bbcode' => true, - 'enable_smilies' => true, - 'enable_urls' => false, - 'icon_id' => 0, - 'bbcode_bitfield' => $message_parser->bbcode_bitfield, - 'bbcode_uid' => $message_parser->bbcode_uid, - 'message' => $message_parser->message, - 'address_list' => array('u' => array($user_row['user_id'] => 'to')), - ); - - submit_pm('post', $lang['WARNING_PM_SUBJECT'], $pm_data, false); - } - - add_log('admin', 'LOG_USER_WARNING', $user_row['username']); - $log_id = add_log('user', $user_row['user_id'], 'LOG_USER_WARNING_BODY', $warning); - - $sql_ary = array( - 'user_id' => $user_row['user_id'], - 'post_id' => $post_id, - 'log_id' => $log_id, - 'warning_time' => time(), - ); - - $db->sql_query('INSERT INTO ' . WARNINGS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_warnings = user_warnings + 1, - user_last_warning = ' . time() . ' - WHERE user_id = ' . $user_row['user_id']; - $db->sql_query($sql); - - // We add this to the mod log too for moderators to see that a specific user got warned. - $sql = 'SELECT forum_id, topic_id - FROM ' . POSTS_TABLE . ' - WHERE post_id = ' . $post_id; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_USER_WARNING', $user_row['username']); -} - -?> \ No newline at end of file diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php deleted file mode 100644 index a923e9fca3..0000000000 --- a/phpBB/includes/message_parser.php +++ /dev/null @@ -1,1639 +0,0 @@ -bbcodes) - { - $this->bbcode_init(); - } - - global $user; - - $this->bbcode_bitfield = ''; - $bitfield = new bitfield(); - - foreach ($this->bbcodes as $bbcode_name => $bbcode_data) - { - if (isset($bbcode_data['disabled']) && $bbcode_data['disabled']) - { - foreach ($bbcode_data['regexp'] as $regexp => $replacement) - { - if (preg_match($regexp, $this->message)) - { - $this->warn_msg[] = sprintf($user->lang['UNAUTHORISED_BBCODE'] , '[' . $bbcode_name . ']'); - continue; - } - } - } - else - { - foreach ($bbcode_data['regexp'] as $regexp => $replacement) - { - // The pattern gets compiled and cached by the PCRE extension, - // it should not demand recompilation - if (preg_match($regexp, $this->message)) - { - $this->message = preg_replace($regexp, $replacement, $this->message); - $bitfield->set($bbcode_data['bbcode_id']); - } - } - } - } - - $this->bbcode_bitfield = $bitfield->get_base64(); - } - - /** - * Prepare some bbcodes for better parsing - */ - function prepare_bbcodes() - { - // Ok, seems like users instead want the no-parsing of urls, smilies, etc. after and before and within quote tags being tagged as "not a bug". - // Fine by me ;) Will ease our live... but do not come back and cry at us, we won't hear you. - - /* Add newline at the end and in front of each quote block to prevent parsing errors (urls, smilies, etc.) - if (strpos($this->message, '[quote') !== false && strpos($this->message, '[/quote]') !== false) - { - $this->message = str_replace("\r\n", "\n", $this->message); - - // We strip newlines and spaces after and before quotes in quotes (trimming) and then add exactly one newline - $this->message = preg_replace('#\[quote(=".*?")?\]\s*(.*?)\s*\[/quote\]#siu', '[quote\1]' . "\n" . '\2' ."\n[/quote]", $this->message); - } - */ - - // Add other checks which needs to be placed before actually parsing anything (be it bbcodes, smilies, urls...) - } - - /** - * Init bbcode data for later parsing - */ - function bbcode_init() - { - static $rowset; - - // This array holds all bbcode data. BBCodes will be processed in this - // order, so it is important to keep [code] in first position and - // [quote] in second position. - $this->bbcodes = array( - 'code' => array('bbcode_id' => 8, 'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#ise' => "\$this->bbcode_code('\$1', '\$2')")), - 'quote' => array('bbcode_id' => 0, 'regexp' => array('#\[quote(?:="(.*?)")?\](.+)\[/quote\]#ise' => "\$this->bbcode_quote('\$0')")), - 'attachment' => array('bbcode_id' => 12, 'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#ise' => "\$this->bbcode_attachment('\$1', '\$2')")), - 'b' => array('bbcode_id' => 1, 'regexp' => array('#\[b\](.*?)\[/b\]#ise' => "\$this->bbcode_strong('\$1')")), - 'i' => array('bbcode_id' => 2, 'regexp' => array('#\[i\](.*?)\[/i\]#ise' => "\$this->bbcode_italic('\$1')")), - 'url' => array('bbcode_id' => 3, 'regexp' => array('#\[url(=(.*))?\](.*)\[/url\]#iUe' => "\$this->validate_url('\$2', '\$3')")), - 'img' => array('bbcode_id' => 4, 'regexp' => array('#\[img\](.*)\[/img\]#iUe' => "\$this->bbcode_img('\$1')")), - 'size' => array('bbcode_id' => 5, 'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#ise' => "\$this->bbcode_size('\$1', '\$2')")), - 'color' => array('bbcode_id' => 6, 'regexp' => array('!\[color=(#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!ise' => "\$this->bbcode_color('\$1', '\$2')")), - 'u' => array('bbcode_id' => 7, 'regexp' => array('#\[u\](.*?)\[/u\]#ise' => "\$this->bbcode_underline('\$1')")), - 'list' => array('bbcode_id' => 9, 'regexp' => array('#\[list(?:=(?:[a-z0-9]|disc|circle|square))?].*\[/list]#ise' => "\$this->bbcode_parse_list('\$0')")), - 'email' => array('bbcode_id' => 10, 'regexp' => array('#\[email=?(.*?)?\](.*?)\[/email\]#ise' => "\$this->validate_email('\$1', '\$2')")), - 'flash' => array('bbcode_id' => 11, 'regexp' => array('#\[flash=([0-9]+),([0-9]+)\](.*?)\[/flash\]#ie' => "\$this->bbcode_flash('\$1', '\$2', '\$3')")) - ); - - // Zero the parsed items array - $this->parsed_items = array(); - - foreach ($this->bbcodes as $tag => $bbcode_data) - { - $this->parsed_items[$tag] = 0; - } - - if (!is_array($rowset)) - { - global $db; - $rowset = array(); - - $sql = 'SELECT * - FROM ' . BBCODES_TABLE; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $rowset[] = $row; - } - $db->sql_freeresult($result); - } - - foreach ($rowset as $row) - { - $this->bbcodes[$row['bbcode_tag']] = array( - 'bbcode_id' => (int) $row['bbcode_id'], - 'regexp' => array($row['first_pass_match'] => str_replace('$uid', $this->bbcode_uid, $row['first_pass_replace'])) - ); - } - } - - /** - * Making some pre-checks for bbcodes as well as increasing the number of parsed items - */ - function check_bbcode($bbcode, &$in) - { - // when using the /e modifier, preg_replace slashes double-quotes but does not - // seem to slash anything else - $in = str_replace("\r\n", "\n", str_replace('\"', '"', $in)); - - // Trimming here to make sure no empty bbcodes are parsed accidently - if (trim($in) == '') - { - return false; - } - - $this->parsed_items[$bbcode]++; - - return true; - } - - /** - * Transform some characters in valid bbcodes - */ - function bbcode_specialchars($text) - { - $str_from = array('<', '>', '[', ']', '.', ':'); - $str_to = array('<', '>', '[', ']', '.', ':'); - - return str_replace($str_from, $str_to, $text); - } - - /** - * Parse size tag - */ - function bbcode_size($stx, $in) - { - global $user, $config; - - if (!$this->check_bbcode('size', $in)) - { - return $in; - } - - if ($config['max_' . $this->mode . '_font_size'] && $config['max_' . $this->mode . '_font_size'] < $stx) - { - $this->warn_msg[] = sprintf($user->lang['MAX_FONT_SIZE_EXCEEDED'], $config['max_' . $this->mode . '_font_size']); - - return '[size=' . $stx . ']' . $in . '[/size]'; - } - - // Do not allow size=0 - if ($stx <= 0) - { - return '[size=' . $stx . ']' . $in . '[/size]'; - } - - return '[size=' . $stx . ':' . $this->bbcode_uid . ']' . $in . '[/size:' . $this->bbcode_uid . ']'; - } - - /** - * Parse color tag - */ - function bbcode_color($stx, $in) - { - if (!$this->check_bbcode('color', $in)) - { - return $in; - } - - return '[color=' . $stx . ':' . $this->bbcode_uid . ']' . $in . '[/color:' . $this->bbcode_uid . ']'; - } - - /** - * Parse u tag - */ - function bbcode_underline($in) - { - if (!$this->check_bbcode('u', $in)) - { - return $in; - } - - return '[u:' . $this->bbcode_uid . ']' . $in . '[/u:' . $this->bbcode_uid . ']'; - } - - /** - * Parse b tag - */ - function bbcode_strong($in) - { - if (!$this->check_bbcode('b', $in)) - { - return $in; - } - - return '[b:' . $this->bbcode_uid . ']' . $in . '[/b:' . $this->bbcode_uid . ']'; - } - - /** - * Parse i tag - */ - function bbcode_italic($in) - { - if (!$this->check_bbcode('i', $in)) - { - return $in; - } - - return '[i:' . $this->bbcode_uid . ']' . $in . '[/i:' . $this->bbcode_uid . ']'; - } - - /** - * Parse img tag - */ - function bbcode_img($in) - { - global $user, $config; - - if (!$this->check_bbcode('img', $in)) - { - return $in; - } - - $in = trim($in); - $error = false; - - $in = str_replace(' ', '%20', $in); - - // Checking urls - if (!preg_match('#^' . get_preg_expression('url') . '$#i', $in) && !preg_match('#^' . get_preg_expression('www_url') . '$#i', $in)) - { - return '[img]' . $in . '[/img]'; - } - - // Try to cope with a common user error... not specifying a protocol but only a subdomain - if (!preg_match('#^[a-z0-9]+://#i', $in)) - { - $in = 'http://' . $in; - } - - if ($config['max_' . $this->mode . '_img_height'] || $config['max_' . $this->mode . '_img_width']) - { - $stats = @getimagesize($in); - - if ($stats === false) - { - $error = true; - $this->warn_msg[] = $user->lang['UNABLE_GET_IMAGE_SIZE']; - } - else - { - if ($config['max_' . $this->mode . '_img_height'] && $config['max_' . $this->mode . '_img_height'] < $stats[1]) - { - $error = true; - $this->warn_msg[] = sprintf($user->lang['MAX_IMG_HEIGHT_EXCEEDED'], $config['max_' . $this->mode . '_img_height']); - } - - if ($config['max_' . $this->mode . '_img_width'] && $config['max_' . $this->mode . '_img_width'] < $stats[0]) - { - $error = true; - $this->warn_msg[] = sprintf($user->lang['MAX_IMG_WIDTH_EXCEEDED'], $config['max_' . $this->mode . '_img_width']); - } - } - } - - if ($error || $this->path_in_domain($in)) - { - return '[img]' . $in . '[/img]'; - } - - return '[img:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($in) . '[/img:' . $this->bbcode_uid . ']'; - } - - /** - * Parse flash tag - */ - function bbcode_flash($width, $height, $in) - { - global $user, $config; - - if (!$this->check_bbcode('flash', $in)) - { - return $in; - } - - $in = trim($in); - $error = false; - - // Apply the same size checks on flash files as on images - if ($config['max_' . $this->mode . '_img_height'] || $config['max_' . $this->mode . '_img_width']) - { - if ($config['max_' . $this->mode . '_img_height'] && $config['max_' . $this->mode . '_img_height'] < $height) - { - $error = true; - $this->warn_msg[] = sprintf($user->lang['MAX_FLASH_HEIGHT_EXCEEDED'], $config['max_' . $this->mode . '_img_height']); - } - - if ($config['max_' . $this->mode . '_img_width'] && $config['max_' . $this->mode . '_img_width'] < $width) - { - $error = true; - $this->warn_msg[] = sprintf($user->lang['MAX_FLASH_WIDTH_EXCEEDED'], $config['max_' . $this->mode . '_img_width']); - } - } - - if ($error || $this->path_in_domain($in)) - { - return '[flash=' . $width . ',' . $height . ']' . $in . '[/flash]'; - } - - return '[flash=' . $width . ',' . $height . ':' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($in) . '[/flash:' . $this->bbcode_uid . ']'; - } - - /** - * Parse inline attachments [ia] - */ - function bbcode_attachment($stx, $in) - { - if (!$this->check_bbcode('attachment', $in)) - { - return $in; - } - - return '[attachment=' . $stx . ':' . $this->bbcode_uid . ']' . trim($in) . '[/attachment:' . $this->bbcode_uid . ']'; - } - - /** - * Parse code text from code tag - * @private - */ - function bbcode_parse_code($stx, &$code) - { - switch (strtolower($stx)) - { - case 'php': - - $remove_tags = false; - $code = str_replace(array('<', '>'), array('<', '>'), $code); - - if (!preg_match('/\<\?.*?\?\>/is', $code)) - { - $remove_tags = true; - $code = ""; - } - - $conf = array('highlight.bg', 'highlight.comment', 'highlight.default', 'highlight.html', 'highlight.keyword', 'highlight.string'); - foreach ($conf as $ini_var) - { - @ini_set($ini_var, str_replace('highlight.', 'syntax', $ini_var)); - } - - // Because highlight_string is specialcharing the text (but we already did this before), we have to reverse this in order to get correct results - $code = htmlspecialchars_decode($code); - $code = highlight_string($code, true); - - $str_from = array('', '', '','[', ']', '.', ':'); - $str_to = array('', '', '', '[', ']', '.', ':'); - - if ($remove_tags) - { - $str_from[] = '<?php '; - $str_to[] = ''; - $str_from[] = '<?php '; - $str_to[] = ''; - } - - $code = str_replace($str_from, $str_to, $code); - $code = preg_replace('#^()\n?(.*?)\n?()$#is', '$1$2$3', $code); - - if ($remove_tags) - { - $code = preg_replace('#()?\?>()#', '$1 $2', $code); - } - - $code = preg_replace('#^(.*)#s', '$2', $code); - $code = preg_replace('#(?:\s++| )*+$#u', '', $code); - - // remove newline at the end - if (!empty($code) && substr($code, -1) == "\n") - { - $code = substr($code, 0, -1); - } - - return "[code=$stx:" . $this->bbcode_uid . ']' . $code . '[/code:' . $this->bbcode_uid . ']'; - break; - - default: - return '[code:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($code) . '[/code:' . $this->bbcode_uid . ']'; - break; - } - } - - /** - * Parse code tag - * Expects the argument to start right after the opening [code] tag and to end with [/code] - */ - function bbcode_code($stx, $in) - { - if (!$this->check_bbcode('code', $in)) - { - return $in; - } - - // We remove the hardcoded elements from the code block here because it is not used in code blocks - // Having it here saves us one preg_replace per message containing [code] blocks - // Additionally, magic url parsing should go after parsing bbcodes, but for safety those are stripped out too... - $htm_match = get_preg_expression('bbcode_htm'); - unset($htm_match[4], $htm_match[5]); - $htm_replace = array('\1', '\1', '\2', '\1'); - - $out = $code_block = ''; - $open = 1; - - while ($in) - { - // Determine position and tag length of next code block - preg_match('#(.*?)(\[code(?:=([a-z]+))?\])(.+)#is', $in, $buffer); - $pos = (isset($buffer[1])) ? strlen($buffer[1]) : false; - $tag_length = (isset($buffer[2])) ? strlen($buffer[2]) : false; - - // Determine position of ending code tag - $pos2 = stripos($in, '[/code]'); - - // Which is the next block, ending code or code block - if ($pos !== false && $pos < $pos2) - { - // Open new block - if (!$open) - { - $out .= substr($in, 0, $pos); - $in = substr($in, $pos); - $stx = (isset($buffer[3])) ? $buffer[3] : ''; - $code_block = ''; - } - else - { - // Already opened block, just append to the current block - $code_block .= substr($in, 0, $pos) . ((isset($buffer[2])) ? $buffer[2] : ''); - $in = substr($in, $pos); - } - - $in = substr($in, $tag_length); - $open++; - } - else - { - // Close the block - if ($open == 1) - { - $code_block .= substr($in, 0, $pos2); - $code_block = preg_replace($htm_match, $htm_replace, $code_block); - - // Parse this code block - $out .= $this->bbcode_parse_code($stx, $code_block); - $code_block = ''; - $open--; - } - else if ($open) - { - // Close one open tag... add to the current code block - $code_block .= substr($in, 0, $pos2 + 7); - $open--; - } - else - { - // end code without opening code... will be always outside code block - $out .= substr($in, 0, $pos2 + 7); - } - - $in = substr($in, $pos2 + 7); - } - } - - // if now $code_block has contents we need to parse the remaining code while removing the last closing tag to match up. - if ($code_block) - { - $code_block = substr($code_block, 0, -7); - $code_block = preg_replace($htm_match, $htm_replace, $code_block); - - $out .= $this->bbcode_parse_code($stx, $code_block); - } - - return $out; - } - - /** - * Parse list bbcode - * Expects the argument to start with a tag - */ - function bbcode_parse_list($in) - { - if (!$this->check_bbcode('list', $in)) - { - return $in; - } - - // $tok holds characters to stop at. Since the string starts with a '[' we'll get everything up to the first ']' which should be the opening [list] tag - $tok = ']'; - $out = '['; - - // First character is [ - $in = substr($in, 1); - $list_end_tags = $item_end_tags = array(); - - do - { - $pos = strlen($in); - - for ($i = 0, $tok_len = strlen($tok); $i < $tok_len; ++$i) - { - $tmp_pos = strpos($in, $tok[$i]); - - if ($tmp_pos !== false && $tmp_pos < $pos) - { - $pos = $tmp_pos; - } - } - - $buffer = substr($in, 0, $pos); - $tok = $in[$pos]; - - $in = substr($in, $pos + 1); - - if ($tok == ']') - { - // if $tok is ']' the buffer holds a tag - if (strtolower($buffer) == '/list' && sizeof($list_end_tags)) - { - // valid [/list] tag, check nesting so that we don't hit false positives - if (sizeof($item_end_tags) && sizeof($item_end_tags) >= sizeof($list_end_tags)) - { - // current li tag has not been closed - $out = preg_replace('/\n?\[$/', '[', $out) . array_pop($item_end_tags) . ']['; - } - - $out .= array_pop($list_end_tags) . ']'; - $tok = '['; - } - else if (preg_match('#^list(=[0-9a-z])?$#i', $buffer, $m)) - { - // sub-list, add a closing tag - if (empty($m[1]) || preg_match('/^(?:disc|square|circle)$/i', $m[1])) - { - array_push($list_end_tags, '/list:u:' . $this->bbcode_uid); - } - else - { - array_push($list_end_tags, '/list:o:' . $this->bbcode_uid); - } - $out .= 'list' . substr($buffer, 4) . ':' . $this->bbcode_uid . ']'; - $tok = '['; - } - else - { - if (($buffer == '*' || substr($buffer, -2) == '[*') && sizeof($list_end_tags)) - { - // the buffer holds a bullet tag and we have a [list] tag open - if (sizeof($item_end_tags) >= sizeof($list_end_tags)) - { - if (substr($buffer, -2) == '[*') - { - $out .= substr($buffer, 0, -2) . '['; - } - // current li tag has not been closed - if (preg_match('/\n\[$/', $out, $m)) - { - $out = preg_replace('/\n\[$/', '[', $out); - $buffer = array_pop($item_end_tags) . "]\n[*:" . $this->bbcode_uid; - } - else - { - $buffer = array_pop($item_end_tags) . '][*:' . $this->bbcode_uid; - } - } - else - { - $buffer = '*:' . $this->bbcode_uid; - } - - $item_end_tags[] = '/*:m:' . $this->bbcode_uid; - } - else if ($buffer == '/*') - { - array_pop($item_end_tags); - $buffer = '/*:' . $this->bbcode_uid; - } - - $out .= $buffer . $tok; - $tok = '[]'; - } - } - else - { - // Not within a tag, just add buffer to the return string - $out .= $buffer . $tok; - $tok = ($tok == '[') ? ']' : '[]'; - } - } - while ($in); - - // do we have some tags open? close them now - if (sizeof($item_end_tags)) - { - $out .= '[' . implode('][', $item_end_tags) . ']'; - } - if (sizeof($list_end_tags)) - { - $out .= '[' . implode('][', $list_end_tags) . ']'; - } - - return $out; - } - - /** - * Parse quote bbcode - * Expects the argument to start with a tag - */ - function bbcode_quote($in) - { - global $config, $user; - - /** - * If you change this code, make sure the cases described within the following reports are still working: - * #3572 - [quote="[test]test"]test [ test[/quote] - (correct: parsed) - * #14667 - [quote]test[/quote] test ] and [ test [quote]test[/quote] (correct: parsed) - * #14770 - [quote="["]test[/quote] (correct: parsed) - * [quote="[i]test[/i]"]test[/quote] (correct: parsed) - * [quote="[quote]test[/quote]"]test[/quote] (correct: parsed - Username displayed as [quote]test[/quote]) - * #20735 - [quote]test[/[/b]quote] test [/quote][/quote] test - (correct: quoted: "test[/[/b]quote] test" / non-quoted: "[/quote] test" - also failed if layout distorted) - */ - - $in = str_replace("\r\n", "\n", str_replace('\"', '"', trim($in))); - - if (!$in) - { - return ''; - } - - // To let the parser not catch tokens within quote_username quotes we encode them before we start this... - $in = preg_replace('#quote="(.*?)"\]#ie', "'quote="' . str_replace(array('[', ']'), array('[', ']'), '\$1') . '"]'", $in); - - $tok = ']'; - $out = '['; - - $in = substr($in, 1); - $close_tags = $error_ary = array(); - $buffer = ''; - - do - { - $pos = strlen($in); - for ($i = 0, $tok_len = strlen($tok); $i < $tok_len; ++$i) - { - $tmp_pos = strpos($in, $tok[$i]); - if ($tmp_pos !== false && $tmp_pos < $pos) - { - $pos = $tmp_pos; - } - } - - $buffer .= substr($in, 0, $pos); - $tok = $in[$pos]; - $in = substr($in, $pos + 1); - - if ($tok == ']') - { - if (strtolower($buffer) == '/quote' && sizeof($close_tags) && substr($out, -1, 1) == '[') - { - // we have found a closing tag - $out .= array_pop($close_tags) . ']'; - $tok = '['; - $buffer = ''; - - /* Add space at the end of the closing tag if not happened before to allow following urls/smilies to be parsed correctly - * Do not try to think for the user. :/ Do not parse urls/smilies if there is no space - is the same as with other bbcodes too. - * Also, we won't have any spaces within $in anyway, only adding up spaces -> #10982 - if (!$in || $in[0] !== ' ') - { - $out .= ' '; - }*/ - } - else if (preg_match('#^quote(?:="(.*?)")?$#is', $buffer, $m) && substr($out, -1, 1) == '[') - { - $this->parsed_items['quote']++; - - // the buffer holds a valid opening tag - if ($config['max_quote_depth'] && sizeof($close_tags) >= $config['max_quote_depth']) - { - // there are too many nested quotes - $error_ary['quote_depth'] = sprintf($user->lang['QUOTE_DEPTH_EXCEEDED'], $config['max_quote_depth']); - - $out .= $buffer . $tok; - $tok = '[]'; - $buffer = ''; - - continue; - } - - array_push($close_tags, '/quote:' . $this->bbcode_uid); - - if (isset($m[1]) && $m[1]) - { - $username = str_replace(array('[', ']'), array('[', ']'), $m[1]); - $username = preg_replace('#\[(?!b|i|u|color|url|email|/b|/i|/u|/color|/url|/email)#iU', '[$1', $username); - - $end_tags = array(); - $error = false; - - preg_match_all('#\[((?:/)?(?:[a-z]+))#i', $username, $tags); - foreach ($tags[1] as $tag) - { - if ($tag[0] != '/') - { - $end_tags[] = '/' . $tag; - } - else - { - $end_tag = array_pop($end_tags); - $error = ($end_tag != $tag) ? true : false; - } - } - - if ($error) - { - $username = $m[1]; - } - - $out .= 'quote="' . $username . '":' . $this->bbcode_uid . ']'; - } - else - { - $out .= 'quote:' . $this->bbcode_uid . ']'; - } - - $tok = '['; - $buffer = ''; - } - else if (preg_match('#^quote="(.*?)#is', $buffer, $m)) - { - // the buffer holds an invalid opening tag - $buffer .= ']'; - } - else - { - $out .= $buffer . $tok; - $tok = '[]'; - $buffer = ''; - } - } - else - { -/** -* Old quote code working fine, but having errors listed in bug #3572 -* -* $out .= $buffer . $tok; -* $tok = ($tok == '[') ? ']' : '[]'; -* $buffer = ''; -*/ - - $out .= $buffer . $tok; - - if ($tok == '[') - { - // Search the text for the next tok... if an ending quote comes first, then change tok to [] - $pos1 = stripos($in, '[/quote'); - // If the token ] comes first, we change it to ] - $pos2 = strpos($in, ']'); - // If the token [ comes first, we change it to [ - $pos3 = strpos($in, '['); - - if ($pos1 !== false && ($pos2 === false || $pos1 < $pos2) && ($pos3 === false || $pos1 < $pos3)) - { - $tok = '[]'; - } - else if ($pos3 !== false && ($pos2 === false || $pos3 < $pos2)) - { - $tok = '['; - } - else - { - $tok = ']'; - } - } - else - { - $tok = '[]'; - } - $buffer = ''; - } - } - while ($in); - - if (sizeof($close_tags)) - { - $out .= '[' . implode('][', $close_tags) . ']'; - } - - foreach ($error_ary as $error_msg) - { - $this->warn_msg[] = $error_msg; - } - - return $out; - } - - /** - * Validate email - */ - function validate_email($var1, $var2) - { - $var1 = str_replace("\r\n", "\n", str_replace('\"', '"', trim($var1))); - $var2 = str_replace("\r\n", "\n", str_replace('\"', '"', trim($var2))); - - $txt = $var2; - $email = ($var1) ? $var1 : $var2; - - $validated = true; - - if (!preg_match('/^' . get_preg_expression('email') . '$/i', $email)) - { - $validated = false; - } - - if (!$validated) - { - return '[email' . (($var1) ? "=$var1" : '') . ']' . $var2 . '[/email]'; - } - - $this->parsed_items['email']++; - - if ($var1) - { - $retval = '[email=' . $this->bbcode_specialchars($email) . ':' . $this->bbcode_uid . ']' . $txt . '[/email:' . $this->bbcode_uid . ']'; - } - else - { - $retval = '[email:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($email) . '[/email:' . $this->bbcode_uid . ']'; - } - - return $retval; - } - - /** - * Validate url - * - * @param string $var1 optional url parameter for url bbcode: [url(=$var1)]$var2[/url] - * @param string $var2 url bbcode content: [url(=$var1)]$var2[/url] - */ - function validate_url($var1, $var2) - { - global $config; - - $var1 = str_replace("\r\n", "\n", str_replace('\"', '"', trim($var1))); - $var2 = str_replace("\r\n", "\n", str_replace('\"', '"', trim($var2))); - - $url = ($var1) ? $var1 : $var2; - - if ($var1 && !$var2) - { - $var2 = $var1; - } - - if (!$url) - { - return '[url' . (($var1) ? '=' . $var1 : '') . ']' . $var2 . '[/url]'; - } - - $valid = false; - - $url = str_replace(' ', '%20', $url); - - // Checking urls - if (preg_match('#^' . get_preg_expression('url') . '$#i', $url) || - preg_match('#^' . get_preg_expression('www_url') . '$#i', $url) || - preg_match('#^' . preg_quote(generate_board_url(), '#') . get_preg_expression('relative_url') . '$#i', $url)) - { - $valid = true; - } - - if ($valid) - { - $this->parsed_items['url']++; - - // if there is no scheme, then add http schema - if (!preg_match('#^[a-z][a-z\d+\-.]*:/{2}#i', $url)) - { - $url = 'http://' . $url; - } - - // Is this a link to somewhere inside this board? If so then remove the session id from the url - if (strpos($url, generate_board_url()) !== false && strpos($url, 'sid=') !== false) - { - $url = preg_replace('/(&|\?)sid=[0-9a-f]{32}&/', '\1', $url); - $url = preg_replace('/(&|\?)sid=[0-9a-f]{32}$/', '', $url); - $url = append_sid($url); - } - - return ($var1) ? '[url=' . $this->bbcode_specialchars($url) . ':' . $this->bbcode_uid . ']' . $var2 . '[/url:' . $this->bbcode_uid . ']' : '[url:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($url) . '[/url:' . $this->bbcode_uid . ']'; - } - - return '[url' . (($var1) ? '=' . $var1 : '') . ']' . $var2 . '[/url]'; - } - - /** - * Check if url is pointing to this domain/script_path/php-file - * - * @param string $url the url to check - * @return true if the url is pointing to this domain/script_path/php-file, false if not - * - * @access private - */ - function path_in_domain($url) - { - global $config, $phpEx, $user; - - if ($config['force_server_vars']) - { - $check_path = $config['script_path']; - } - else - { - $check_path = ($user->page['root_script_path'] != '/') ? substr($user->page['root_script_path'], 0, -1) : '/'; - } - - // Is the user trying to link to a php file in this domain and script path? - if (strpos($url, ".{$phpEx}") !== false && strpos($url, $check_path) !== false) - { - $server_name = $user->host; - - // Forcing server vars is the only way to specify/override the protocol - if ($config['force_server_vars'] || !$server_name) - { - $server_name = $config['server_name']; - } - - // Check again in correct order... - $pos_ext = strpos($url, ".{$phpEx}"); - $pos_path = strpos($url, $check_path); - $pos_domain = strpos($url, $server_name); - - if ($pos_domain !== false && $pos_path >= $pos_domain && $pos_ext >= $pos_path) - { - // Ok, actually we allow linking to some files (this may be able to be extended in some way later...) - if (strpos($url, '/' . $check_path . '/download/file.' . $phpEx) !== 0) - { - return false; - } - - return true; - } - } - - return false; - } -} - -/** -* Main message parser for posting, pm, etc. takes raw message -* and parses it for attachments, bbcode and smilies -* @package phpBB3 -*/ -class parse_message extends bbcode_firstpass -{ - var $attachment_data = array(); - var $filename_data = array(); - - // Helps ironing out user error - var $message_status = ''; - - var $allow_img_bbcode = true; - var $allow_flash_bbcode = true; - var $allow_quote_bbcode = true; - var $allow_url_bbcode = true; - - var $mode; - - /** - * Init - give message here or manually - */ - function parse_message($message = '') - { - // Init BBCode UID - $this->bbcode_uid = substr(base_convert(unique_id(), 16, 36), 0, BBCODE_UID_LEN); - - if ($message) - { - $this->message = $message; - } - } - - /** - * Parse Message - */ - function parse($allow_bbcode, $allow_magic_url, $allow_smilies, $allow_img_bbcode = true, $allow_flash_bbcode = true, $allow_quote_bbcode = true, $allow_url_bbcode = true, $update_this_message = true, $mode = 'post') - { - global $config, $db, $user; - - $mode = ($mode != 'post') ? 'sig' : 'post'; - - $this->mode = $mode; - - $this->allow_img_bbcode = $allow_img_bbcode; - $this->allow_flash_bbcode = $allow_flash_bbcode; - $this->allow_quote_bbcode = $allow_quote_bbcode; - $this->allow_url_bbcode = $allow_url_bbcode; - - // If false, then $this->message won't be altered, the text will be returned instead. - if (!$update_this_message) - { - $tmp_message = $this->message; - $return_message = &$this->message; - } - - if ($this->message_status == 'display') - { - $this->decode_message(); - } - - // Do some general 'cleanup' first before processing message, - // e.g. remove excessive newlines(?), smilies(?) - $match = array('#(script|about|applet|activex|chrome):#i'); - $replace = array("\\1:"); - $this->message = preg_replace($match, $replace, trim($this->message)); - - // Message length check. 0 disables this check completely. - if ($config['max_' . $mode . '_chars'] > 0) - { - $msg_len = ($mode == 'post') ? utf8_strlen($this->message) : utf8_strlen(preg_replace('#\[\/?[a-z\*\+\-]+(=[\S]+)?\]#ius', ' ', $this->message)); - - if ((!$msg_len && $mode !== 'sig') || $config['max_' . $mode . '_chars'] && $msg_len > $config['max_' . $mode . '_chars']) - { - $this->warn_msg[] = (!$msg_len) ? $user->lang['TOO_FEW_CHARS'] : sprintf($user->lang['TOO_MANY_CHARS_' . strtoupper($mode)], $msg_len, $config['max_' . $mode . '_chars']); - return $this->warn_msg; - } - } - - // Check for "empty" message - if ($mode !== 'sig' && utf8_clean_string($this->message) === '') - { - $this->warn_msg[] = $user->lang['TOO_FEW_CHARS']; - return $this->warn_msg; - } - - // Prepare BBcode (just prepares some tags for better parsing) - if ($allow_bbcode && strpos($this->message, '[') !== false) - { - $this->bbcode_init(); - $disallow = array('img', 'flash', 'quote', 'url'); - foreach ($disallow as $bool) - { - if (!${'allow_' . $bool . '_bbcode'}) - { - $this->bbcodes[$bool]['disabled'] = true; - } - } - - $this->prepare_bbcodes(); - } - - // Parse smilies - if ($allow_smilies) - { - $this->smilies($config['max_' . $mode . '_smilies']); - } - - $num_urls = 0; - - // Parse BBCode - if ($allow_bbcode && strpos($this->message, '[') !== false) - { - $this->parse_bbcode(); - $num_urls += $this->parsed_items['url']; - } - - // Parse URL's - if ($allow_magic_url) - { - $this->magic_url(generate_board_url()); - - if ($config['max_' . $mode . '_urls']) - { - $num_urls += preg_match_all('#\' . $row['code'] . ''; - } - $db->sql_freeresult($result); - } - - if (sizeof($match)) - { - if ($max_smilies) - { - $num_matches = preg_match_all('#' . implode('|', $match) . '#', $this->message, $matches); - unset($matches); - - if ($num_matches !== false && $num_matches > $max_smilies) - { - $this->warn_msg[] = sprintf($user->lang['TOO_MANY_SMILIES'], $max_smilies); - return; - } - } - - // Make sure the delimiter # is added in front and at the end of every element within $match - $this->message = trim(preg_replace(explode(chr(0), '#' . implode('#' . chr(0) . '#', $match) . '#'), $replace, $this->message)); - } - } - - /** - * Parse Attachments - */ - function parse_attachments($form_name, $mode, $forum_id, $submit, $preview, $refresh, $is_message = false) - { - global $config, $auth, $user, $phpbb_root_path, $phpEx, $db; - - $error = array(); - - $num_attachments = sizeof($this->attachment_data); - $this->filename_data['filecomment'] = utf8_normalize_nfc(request_var('filecomment', '', true)); - $upload_file = (isset($_FILES[$form_name]) && $_FILES[$form_name]['name'] != 'none' && trim($_FILES[$form_name]['name'])) ? true : false; - - $add_file = (isset($_POST['add_file'])) ? true : false; - $delete_file = (isset($_POST['delete_file'])) ? true : false; - - // First of all adjust comments if changed - $actual_comment_list = utf8_normalize_nfc(request_var('comment_list', array(''), true)); - - foreach ($actual_comment_list as $comment_key => $comment) - { - if (!isset($this->attachment_data[$comment_key])) - { - continue; - } - - if ($this->attachment_data[$comment_key]['attach_comment'] != $actual_comment_list[$comment_key]) - { - $this->attachment_data[$comment_key]['attach_comment'] = $actual_comment_list[$comment_key]; - } - } - - $cfg = array(); - $cfg['max_attachments'] = ($is_message) ? $config['max_attachments_pm'] : $config['max_attachments']; - $forum_id = ($is_message) ? 0 : $forum_id; - - if ($submit && in_array($mode, array('post', 'reply', 'quote', 'edit')) && $upload_file) - { - if ($num_attachments < $cfg['max_attachments'] || $auth->acl_get('a_') || $auth->acl_get('m_', $forum_id)) - { - $filedata = upload_attachment($form_name, $forum_id, false, '', $is_message); - $error = $filedata['error']; - - if ($filedata['post_attach'] && !sizeof($error)) - { - $sql_ary = array( - 'physical_filename' => $filedata['physical_filename'], - 'attach_comment' => $this->filename_data['filecomment'], - 'real_filename' => $filedata['real_filename'], - 'extension' => $filedata['extension'], - 'mimetype' => $filedata['mimetype'], - 'filesize' => $filedata['filesize'], - 'filetime' => $filedata['filetime'], - 'thumbnail' => $filedata['thumbnail'], - 'is_orphan' => 1, - 'in_message' => ($is_message) ? 1 : 0, - 'poster_id' => $user->data['user_id'], - ); - - $db->sql_query('INSERT INTO ' . ATTACHMENTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); - - $new_entry = array( - 'attach_id' => $db->sql_nextid(), - 'is_orphan' => 1, - 'real_filename' => $filedata['real_filename'], - 'attach_comment'=> $this->filename_data['filecomment'], - ); - - $this->attachment_data = array_merge(array(0 => $new_entry), $this->attachment_data); - $this->message = preg_replace('#\[attachment=([0-9]+)\](.*?)\[\/attachment\]#e', "'[attachment='.(\\1 + 1).']\\2[/attachment]'", $this->message); - - $this->filename_data['filecomment'] = ''; - - // This Variable is set to false here, because Attachments are entered into the - // Database in two modes, one if the id_list is 0 and the second one if post_attach is true - // Since post_attach is automatically switched to true if an Attachment got added to the filesystem, - // but we are assigning an id of 0 here, we have to reset the post_attach variable to false. - // - // This is very relevant, because it could happen that the post got not submitted, but we do not - // know this circumstance here. We could be at the posting page or we could be redirected to the entered - // post. :) - $filedata['post_attach'] = false; - } - } - else - { - $error[] = sprintf($user->lang['TOO_MANY_ATTACHMENTS'], $cfg['max_attachments']); - } - } - - if ($preview || $refresh || sizeof($error)) - { - // Perform actions on temporary attachments - if ($delete_file) - { - include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); - - $index = array_keys(request_var('delete_file', array(0 => 0))); - $index = (!empty($index)) ? $index[0] : false; - - if ($index !== false && !empty($this->attachment_data[$index])) - { - // delete selected attachment - if ($this->attachment_data[$index]['is_orphan']) - { - $sql = 'SELECT attach_id, physical_filename, thumbnail - FROM ' . ATTACHMENTS_TABLE . ' - WHERE attach_id = ' . (int) $this->attachment_data[$index]['attach_id'] . ' - AND is_orphan = 1 - AND poster_id = ' . $user->data['user_id']; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - phpbb_unlink($row['physical_filename'], 'file'); - - if ($row['thumbnail']) - { - phpbb_unlink($row['physical_filename'], 'thumbnail'); - } - - $db->sql_query('DELETE FROM ' . ATTACHMENTS_TABLE . ' WHERE attach_id = ' . (int) $this->attachment_data[$index]['attach_id']); - } - } - else - { - delete_attachments('attach', array(intval($this->attachment_data[$index]['attach_id']))); - } - - unset($this->attachment_data[$index]); - $this->message = preg_replace('#\[attachment=([0-9]+)\](.*?)\[\/attachment\]#e', "(\\1 == \$index) ? '' : ((\\1 > \$index) ? '[attachment=' . (\\1 - 1) . ']\\2[/attachment]' : '\\0')", $this->message); - - // Reindex Array - $this->attachment_data = array_values($this->attachment_data); - } - } - else if (($add_file || $preview) && $upload_file) - { - if ($num_attachments < $cfg['max_attachments'] || $auth->acl_gets('m_', 'a_', $forum_id)) - { - $filedata = upload_attachment($form_name, $forum_id, false, '', $is_message); - $error = array_merge($error, $filedata['error']); - - if (!sizeof($error)) - { - $sql_ary = array( - 'physical_filename' => $filedata['physical_filename'], - 'attach_comment' => $this->filename_data['filecomment'], - 'real_filename' => $filedata['real_filename'], - 'extension' => $filedata['extension'], - 'mimetype' => $filedata['mimetype'], - 'filesize' => $filedata['filesize'], - 'filetime' => $filedata['filetime'], - 'thumbnail' => $filedata['thumbnail'], - 'is_orphan' => 1, - 'in_message' => ($is_message) ? 1 : 0, - 'poster_id' => $user->data['user_id'], - ); - - $db->sql_query('INSERT INTO ' . ATTACHMENTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); - - $new_entry = array( - 'attach_id' => $db->sql_nextid(), - 'is_orphan' => 1, - 'real_filename' => $filedata['real_filename'], - 'attach_comment'=> $this->filename_data['filecomment'], - ); - - $this->attachment_data = array_merge(array(0 => $new_entry), $this->attachment_data); - $this->message = preg_replace('#\[attachment=([0-9]+)\](.*?)\[\/attachment\]#e', "'[attachment='.(\\1 + 1).']\\2[/attachment]'", $this->message); - $this->filename_data['filecomment'] = ''; - } - } - else - { - $error[] = sprintf($user->lang['TOO_MANY_ATTACHMENTS'], $cfg['max_attachments']); - } - } - } - - foreach ($error as $error_msg) - { - $this->warn_msg[] = $error_msg; - } - } - - /** - * Get Attachment Data - */ - function get_submitted_attachment_data($check_user_id = false) - { - global $user, $db, $phpbb_root_path, $phpEx, $config; - - $this->filename_data['filecomment'] = utf8_normalize_nfc(request_var('filecomment', '', true)); - $attachment_data = (isset($_POST['attachment_data'])) ? $_POST['attachment_data'] : array(); - $this->attachment_data = array(); - - $check_user_id = ($check_user_id === false) ? $user->data['user_id'] : $check_user_id; - - if (!sizeof($attachment_data)) - { - return; - } - - $not_orphan = $orphan = array(); - - foreach ($attachment_data as $pos => $var_ary) - { - if ($var_ary['is_orphan']) - { - $orphan[(int) $var_ary['attach_id']] = $pos; - } - else - { - $not_orphan[(int) $var_ary['attach_id']] = $pos; - } - } - - // Regenerate already posted attachments - if (sizeof($not_orphan)) - { - // Get the attachment data, based on the poster id... - $sql = 'SELECT attach_id, is_orphan, real_filename, attach_comment - FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set('attach_id', array_keys($not_orphan)) . ' - AND poster_id = ' . $check_user_id; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $pos = $not_orphan[$row['attach_id']]; - $this->attachment_data[$pos] = $row; - set_var($this->attachment_data[$pos]['attach_comment'], $_POST['attachment_data'][$pos]['attach_comment'], 'string', true); - - unset($not_orphan[$row['attach_id']]); - } - $db->sql_freeresult($result); - } - - if (sizeof($not_orphan)) - { - trigger_error('NO_ACCESS_ATTACHMENT', E_USER_ERROR); - } - - // Regenerate newly uploaded attachments - if (sizeof($orphan)) - { - $sql = 'SELECT attach_id, is_orphan, real_filename, attach_comment - FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set('attach_id', array_keys($orphan)) . ' - AND poster_id = ' . $user->data['user_id'] . ' - AND is_orphan = 1'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $pos = $orphan[$row['attach_id']]; - $this->attachment_data[$pos] = $row; - set_var($this->attachment_data[$pos]['attach_comment'], $_POST['attachment_data'][$pos]['attach_comment'], 'string', true); - - unset($orphan[$row['attach_id']]); - } - $db->sql_freeresult($result); - } - - if (sizeof($orphan)) - { - trigger_error('NO_ACCESS_ATTACHMENT', E_USER_ERROR); - } - - ksort($this->attachment_data); - } - - /** - * Parse Poll - */ - function parse_poll(&$poll) - { - global $auth, $user, $config; - - $poll_max_options = $poll['poll_max_options']; - - // Parse Poll Option text ;) - $tmp_message = $this->message; - $this->message = $poll['poll_option_text']; - $bbcode_bitfield = $this->bbcode_bitfield; - - - $poll['poll_option_text'] = $this->parse($poll['enable_bbcode'], ($config['allow_post_links']) ? $poll['enable_urls'] : false, $poll['enable_smilies'], $poll['img_status'], false, false, $config['allow_post_links'], false); - - $bbcode_bitfield = base64_encode(base64_decode($bbcode_bitfield) | base64_decode($this->bbcode_bitfield)); - $this->message = $tmp_message; - - // Parse Poll Title - $tmp_message = $this->message; - $this->message = $poll['poll_title']; - $this->bbcode_bitfield = $bbcode_bitfield; - - $poll['poll_options'] = explode("\n", trim($poll['poll_option_text'])); - $poll['poll_options_size'] = sizeof($poll['poll_options']); - - if (!$poll['poll_title'] && $poll['poll_options_size']) - { - $this->warn_msg[] = $user->lang['NO_POLL_TITLE']; - } - else - { - if (utf8_strlen(preg_replace('#\[\/?[a-z\*\+\-]+(=[\S]+)?\]#ius', ' ', $this->message)) > 100) - { - $this->warn_msg[] = $user->lang['POLL_TITLE_TOO_LONG']; - } - $poll['poll_title'] = $this->parse($poll['enable_bbcode'], ($config['allow_post_links']) ? $poll['enable_urls'] : false, $poll['enable_smilies'], $poll['img_status'], false, false, $config['allow_post_links'], false); - if (strlen($poll['poll_title']) > 255) - { - $this->warn_msg[] = $user->lang['POLL_TITLE_COMP_TOO_LONG']; - } - } - - $this->bbcode_bitfield = base64_encode(base64_decode($bbcode_bitfield) | base64_decode($this->bbcode_bitfield)); - $this->message = $tmp_message; - unset($tmp_message); - - if (sizeof($poll['poll_options']) == 1) - { - $this->warn_msg[] = $user->lang['TOO_FEW_POLL_OPTIONS']; - } - else if ($poll['poll_options_size'] > (int) $config['max_poll_options']) - { - $this->warn_msg[] = $user->lang['TOO_MANY_POLL_OPTIONS']; - } - else if ($poll_max_options > $poll['poll_options_size']) - { - $this->warn_msg[] = $user->lang['TOO_MANY_USER_OPTIONS']; - } - - $poll['poll_max_options'] = ($poll['poll_max_options'] < 1) ? 1 : (($poll['poll_max_options'] > $config['max_poll_options']) ? $config['max_poll_options'] : $poll['poll_max_options']); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php new file mode 100644 index 0000000000..42e8667e42 --- /dev/null +++ b/phpBB/includes/page_header.php @@ -0,0 +1,490 @@ += '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) ) + { + if ( extension_loaded('zlib') ) + { + ob_start('ob_gzhandler'); + } + } + else if ( $phpver > '4.0' ) + { + if ( strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip') ) + { + if ( extension_loaded('zlib') ) + { + $do_gzip_compress = TRUE; + ob_start(); + ob_implicit_flush(0); + + header('Content-Encoding: gzip'); + } + } + } +} + +// +// Parse and show the overall header. +// +$template->set_filenames(array( + 'overall_header' => ( empty($gen_simple_header) ) ? 'overall_header.tpl' : 'simple_header.tpl') +); + +// +// Generate logged in/logged out status +// +if ( $userdata['session_logged_in'] ) +{ + $u_login_logout = 'login.'.$phpEx.'?logout=true&sid=' . $userdata['session_id']; + $l_login_logout = $lang['Logout'] . ' [ ' . $userdata['username'] . ' ]'; +} +else +{ + $u_login_logout = 'login.'.$phpEx; + $l_login_logout = $lang['Login']; +} + +$s_last_visit = ( $userdata['session_logged_in'] ) ? create_date($board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone']) : ''; + +// +// Get basic (usernames + totals) online +// situation +// +$logged_visible_online = 0; +$logged_hidden_online = 0; +$guests_online = 0; +$online_userlist = ''; +$l_online_users = ''; + +if (defined('SHOW_ONLINE')) +{ + + $user_forum_sql = ( !empty($forum_id) ) ? "AND s.session_page = " . intval($forum_id) : ''; + $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_ip + FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s + WHERE u.user_id = s.session_user_id + AND s.session_time >= ".( time() - 300 ) . " + $user_forum_sql + ORDER BY u.username ASC, s.session_ip ASC"; + if( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain user/online information', '', __LINE__, __FILE__, $sql); + } + + $userlist_ary = array(); + $userlist_visible = array(); + + $prev_user_id = 0; + $prev_user_ip = $prev_session_ip = ''; + + while( $row = $db->sql_fetchrow($result) ) + { + // User is logged in and therefor not a guest + if ( $row['session_logged_in'] ) + { + // Skip multiple sessions for one user + if ( $row['user_id'] != $prev_user_id ) + { + $style_color = ''; + if ( $row['user_level'] == ADMIN ) + { + $row['username'] = '' . $row['username'] . ''; + $style_color = 'style="color:#' . $theme['fontcolor3'] . '"'; + } + else if ( $row['user_level'] == MOD ) + { + $row['username'] = '' . $row['username'] . ''; + $style_color = 'style="color:#' . $theme['fontcolor2'] . '"'; + } + + if ( $row['user_allow_viewonline'] ) + { + $user_online_link = '' . $row['username'] . ''; + $logged_visible_online++; + } + else + { + $user_online_link = '' . $row['username'] . ''; + $logged_hidden_online++; + } + + if ( $row['user_allow_viewonline'] || $userdata['user_level'] == ADMIN ) + { + $online_userlist .= ( $online_userlist != '' ) ? ', ' . $user_online_link : $user_online_link; + } + } + + $prev_user_id = $row['user_id']; + } + else + { + // Skip multiple sessions for one user + if ( $row['session_ip'] != $prev_session_ip ) + { + $guests_online++; + } + } + + $prev_session_ip = $row['session_ip']; + } + $db->sql_freeresult($result); + + if ( empty($online_userlist) ) + { + $online_userlist = $lang['None']; + } + $online_userlist = ( ( isset($forum_id) ) ? $lang['Browsing_forum'] : $lang['Registered_users'] ) . ' ' . $online_userlist; + + $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online; + + if ( $total_online_users > $board_config['record_online_users']) + { + $board_config['record_online_users'] = $total_online_users; + $board_config['record_online_date'] = time(); + + $sql = "UPDATE " . CONFIG_TABLE . " + SET config_value = '$total_online_users' + WHERE config_name = 'record_online_users'"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql); + } + + $sql = "UPDATE " . CONFIG_TABLE . " + SET config_value = '" . $board_config['record_online_date'] . "' + WHERE config_name = 'record_online_date'"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update online user record (date)', '', __LINE__, __FILE__, $sql); + } + } + + if ( $total_online_users == 0 ) + { + $l_t_user_s = $lang['Online_users_zero_total']; + } + else if ( $total_online_users == 1 ) + { + $l_t_user_s = $lang['Online_user_total']; + } + else + { + $l_t_user_s = $lang['Online_users_total']; + } + + if ( $logged_visible_online == 0 ) + { + $l_r_user_s = $lang['Reg_users_zero_total']; + } + else if ( $logged_visible_online == 1 ) + { + $l_r_user_s = $lang['Reg_user_total']; + } + else + { + $l_r_user_s = $lang['Reg_users_total']; + } + + if ( $logged_hidden_online == 0 ) + { + $l_h_user_s = $lang['Hidden_users_zero_total']; + } + else if ( $logged_hidden_online == 1 ) + { + $l_h_user_s = $lang['Hidden_user_total']; + } + else + { + $l_h_user_s = $lang['Hidden_users_total']; + } + + if ( $guests_online == 0 ) + { + $l_g_user_s = $lang['Guest_users_zero_total']; + } + else if ( $guests_online == 1 ) + { + $l_g_user_s = $lang['Guest_user_total']; + } + else + { + $l_g_user_s = $lang['Guest_users_total']; + } + + $l_online_users = sprintf($l_t_user_s, $total_online_users); + $l_online_users .= sprintf($l_r_user_s, $logged_visible_online); + $l_online_users .= sprintf($l_h_user_s, $logged_hidden_online); + $l_online_users .= sprintf($l_g_user_s, $guests_online); +} + +// +// Obtain number of new private messages +// if user is logged in +// +if ( ($userdata['session_logged_in']) && (empty($gen_simple_header)) ) +{ + if ( $userdata['user_new_privmsg'] ) + { + $l_message_new = ( $userdata['user_new_privmsg'] == 1 ) ? $lang['New_pm'] : $lang['New_pms']; + $l_privmsgs_text = sprintf($l_message_new, $userdata['user_new_privmsg']); + + if ( $userdata['user_last_privmsg'] > $userdata['user_lastvisit'] ) + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_last_privmsg = " . $userdata['user_lastvisit'] . " + WHERE user_id = " . $userdata['user_id']; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update private message new/read time for user', '', __LINE__, __FILE__, $sql); + } + + $s_privmsg_new = 1; + $icon_pm = $images['pm_new_msg']; + } + else + { + $s_privmsg_new = 0; + $icon_pm = $images['pm_new_msg']; + } + } + else + { + $l_privmsgs_text = $lang['No_new_pm']; + + $s_privmsg_new = 0; + $icon_pm = $images['pm_no_new_msg']; + } + + if ( $userdata['user_unread_privmsg'] ) + { + $l_message_unread = ( $userdata['user_unread_privmsg'] == 1 ) ? $lang['Unread_pm'] : $lang['Unread_pms']; + $l_privmsgs_text_unread = sprintf($l_message_unread, $userdata['user_unread_privmsg']); + } + else + { + $l_privmsgs_text_unread = $lang['No_unread_pm']; + } +} +else +{ + $icon_pm = $images['pm_no_new_msg']; + $l_privmsgs_text = $lang['Login_check_pm']; + $l_privmsgs_text_unread = ''; + $s_privmsg_new = 0; +} + +// +// Generate HTML required for Mozilla Navigation bar +// +if (!isset($nav_links)) +{ + $nav_links = array(); +} + +$nav_links_html = ''; +$nav_link_proto = '' . "\n"; +while( list($nav_item, $nav_array) = @each($nav_links) ) +{ + if ( !empty($nav_array['url']) ) + { + $nav_links_html .= sprintf($nav_link_proto, $nav_item, append_sid($nav_array['url']), $nav_array['title']); + } + else + { + // We have a nested array, used for items like that can occur more than once. + while( list(,$nested_array) = each($nav_array) ) + { + $nav_links_html .= sprintf($nav_link_proto, $nav_item, $nested_array['url'], $nested_array['title']); + } + } +} + +// Format Timezone. We are unable to use array_pop here, because of PHP3 compatibility +$l_timezone = explode('.', $board_config['board_timezone']); +$l_timezone = (count($l_timezone) > 1 && $l_timezone[count($l_timezone)-1] != 0) ? $lang[sprintf('%.1f', $board_config['board_timezone'])] : $lang[number_format($board_config['board_timezone'])]; +// +// The following assigns all _common_ variables that may be used at any point +// in a template. +// +$template->assign_vars(array( + 'SITENAME' => $board_config['sitename'], + 'SITE_DESCRIPTION' => $board_config['site_desc'], + 'PAGE_TITLE' => $page_title, + 'LAST_VISIT_DATE' => sprintf($lang['You_last_visit'], $s_last_visit), + 'CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), + 'TOTAL_USERS_ONLINE' => $l_online_users, + 'LOGGED_IN_USER_LIST' => $online_userlist, + 'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], create_date($board_config['default_dateformat'], $board_config['record_online_date'], $board_config['board_timezone'])), + 'PRIVATE_MESSAGE_INFO' => $l_privmsgs_text, + 'PRIVATE_MESSAGE_INFO_UNREAD' => $l_privmsgs_text_unread, + 'PRIVATE_MESSAGE_NEW_FLAG' => $s_privmsg_new, + + 'PRIVMSG_IMG' => $icon_pm, + + 'L_USERNAME' => $lang['Username'], + 'L_PASSWORD' => $lang['Password'], + 'L_LOGIN_LOGOUT' => $l_login_logout, + 'L_LOGIN' => $lang['Login'], + 'L_LOG_ME_IN' => $lang['Log_me_in'], + 'L_AUTO_LOGIN' => $lang['Log_me_in'], + 'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']), + 'L_REGISTER' => $lang['Register'], + 'L_PROFILE' => $lang['Profile'], + 'L_SEARCH' => $lang['Search'], + 'L_PRIVATEMSGS' => $lang['Private_Messages'], + 'L_WHO_IS_ONLINE' => $lang['Who_is_Online'], + 'L_MEMBERLIST' => $lang['Memberlist'], + 'L_FAQ' => $lang['FAQ'], + 'L_USERGROUPS' => $lang['Usergroups'], + 'L_SEARCH_NEW' => $lang['Search_new'], + 'L_SEARCH_UNANSWERED' => $lang['Search_unanswered'], + 'L_SEARCH_SELF' => $lang['Search_your_posts'], + 'L_WHOSONLINE_ADMIN' => sprintf($lang['Admin_online_color'], '', ''), + 'L_WHOSONLINE_MOD' => sprintf($lang['Mod_online_color'], '', ''), + + 'U_SEARCH_UNANSWERED' => append_sid('search.'.$phpEx.'?search_id=unanswered'), + 'U_SEARCH_SELF' => append_sid('search.'.$phpEx.'?search_id=egosearch'), + 'U_SEARCH_NEW' => append_sid('search.'.$phpEx.'?search_id=newposts'), + 'U_INDEX' => append_sid('index.'.$phpEx), + 'U_REGISTER' => append_sid('profile.'.$phpEx.'?mode=register'), + 'U_PROFILE' => append_sid('profile.'.$phpEx.'?mode=editprofile'), + 'U_PRIVATEMSGS' => append_sid('privmsg.'.$phpEx.'?folder=inbox'), + 'U_PRIVATEMSGS_POPUP' => append_sid('privmsg.'.$phpEx.'?mode=newpm'), + 'U_SEARCH' => append_sid('search.'.$phpEx), + 'U_MEMBERLIST' => append_sid('memberlist.'.$phpEx), + 'U_MODCP' => append_sid('modcp.'.$phpEx), + 'U_FAQ' => append_sid('faq.'.$phpEx), + 'U_VIEWONLINE' => append_sid('viewonline.'.$phpEx), + 'U_LOGIN_LOGOUT' => append_sid($u_login_logout), + 'U_GROUP_CP' => append_sid('groupcp.'.$phpEx), + + 'S_CONTENT_DIRECTION' => $lang['DIRECTION'], + 'S_CONTENT_ENCODING' => $lang['ENCODING'], + 'S_CONTENT_DIR_LEFT' => $lang['LEFT'], + 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], + 'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone), + 'S_LOGIN_ACTION' => append_sid('login.'.$phpEx), + + 'T_HEAD_STYLESHEET' => $theme['head_stylesheet'], + 'T_BODY_BACKGROUND' => $theme['body_background'], + 'T_BODY_BGCOLOR' => '#'.$theme['body_bgcolor'], + 'T_BODY_TEXT' => '#'.$theme['body_text'], + 'T_BODY_LINK' => '#'.$theme['body_link'], + 'T_BODY_VLINK' => '#'.$theme['body_vlink'], + 'T_BODY_ALINK' => '#'.$theme['body_alink'], + 'T_BODY_HLINK' => '#'.$theme['body_hlink'], + 'T_TR_COLOR1' => '#'.$theme['tr_color1'], + 'T_TR_COLOR2' => '#'.$theme['tr_color2'], + 'T_TR_COLOR3' => '#'.$theme['tr_color3'], + 'T_TR_CLASS1' => $theme['tr_class1'], + 'T_TR_CLASS2' => $theme['tr_class2'], + 'T_TR_CLASS3' => $theme['tr_class3'], + 'T_TH_COLOR1' => '#'.$theme['th_color1'], + 'T_TH_COLOR2' => '#'.$theme['th_color2'], + 'T_TH_COLOR3' => '#'.$theme['th_color3'], + 'T_TH_CLASS1' => $theme['th_class1'], + 'T_TH_CLASS2' => $theme['th_class2'], + 'T_TH_CLASS3' => $theme['th_class3'], + 'T_TD_COLOR1' => '#'.$theme['td_color1'], + 'T_TD_COLOR2' => '#'.$theme['td_color2'], + 'T_TD_COLOR3' => '#'.$theme['td_color3'], + 'T_TD_CLASS1' => $theme['td_class1'], + 'T_TD_CLASS2' => $theme['td_class2'], + 'T_TD_CLASS3' => $theme['td_class3'], + 'T_FONTFACE1' => $theme['fontface1'], + 'T_FONTFACE2' => $theme['fontface2'], + 'T_FONTFACE3' => $theme['fontface3'], + 'T_FONTSIZE1' => $theme['fontsize1'], + 'T_FONTSIZE2' => $theme['fontsize2'], + 'T_FONTSIZE3' => $theme['fontsize3'], + 'T_FONTCOLOR1' => '#'.$theme['fontcolor1'], + 'T_FONTCOLOR2' => '#'.$theme['fontcolor2'], + 'T_FONTCOLOR3' => '#'.$theme['fontcolor3'], + 'T_SPAN_CLASS1' => $theme['span_class1'], + 'T_SPAN_CLASS2' => $theme['span_class2'], + 'T_SPAN_CLASS3' => $theme['span_class3'], + + 'NAV_LINKS' => $nav_links_html) +); + +// +// Login box? +// +if ( !$userdata['session_logged_in'] ) +{ + $template->assign_block_vars('switch_user_logged_out', array()); + // + // Allow autologin? + // + if (!isset($board_config['allow_autologin']) || $board_config['allow_autologin'] ) + { + $template->assign_block_vars('switch_allow_autologin', array()); + $template->assign_block_vars('switch_user_logged_out.switch_allow_autologin', array()); + } +} +else +{ + $template->assign_block_vars('switch_user_logged_in', array()); + + if ( !empty($userdata['user_popup_pm']) ) + { + $template->assign_block_vars('switch_enable_pm_popup', array()); + } +} + +// Add no-cache control for cookies if they are set +//$c_no_cache = (isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_sid']) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_data'])) ? 'no-cache="set-cookie", ' : ''; + +// Work around for "current" Apache 2 + PHP module which seems to not +// cope with private cache control setting +if (!empty($HTTP_SERVER_VARS['SERVER_SOFTWARE']) && strstr($HTTP_SERVER_VARS['SERVER_SOFTWARE'], 'Apache/2')) +{ + header ('Cache-Control: no-cache, pre-check=0, post-check=0'); +} +else +{ + header ('Cache-Control: private, pre-check=0, post-check=0, max-age=0'); +} +header ('Expires: 0'); +header ('Pragma: no-cache'); + +$template->pparse('overall_header'); + +?> \ No newline at end of file diff --git a/phpBB/includes/page_tail.php b/phpBB/includes/page_tail.php new file mode 100644 index 0000000000..2386034cda --- /dev/null +++ b/phpBB/includes/page_tail.php @@ -0,0 +1,76 @@ +' . $lang['Admin_panel'] . '

    ' : ''; + +$template->set_filenames(array( + 'overall_footer' => ( empty($gen_simple_header) ) ? 'overall_footer.tpl' : 'simple_footer.tpl') +); + +$template->assign_vars(array( + 'TRANSLATION_INFO' => (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : ''), + 'ADMIN_LINK' => $admin_link) +); + +$template->pparse('overall_footer'); + +// +// Close our DB connection. +// +$db->sql_close(); + +// +// Compress buffered output if required and send to browser +// +if ( $do_gzip_compress ) +{ + // + // Borrowed from php.net! + // + $gzip_contents = ob_get_contents(); + ob_end_clean(); + + $gzip_size = strlen($gzip_contents); + $gzip_crc = crc32($gzip_contents); + + $gzip_contents = gzcompress($gzip_contents, 9); + $gzip_contents = substr($gzip_contents, 0, strlen($gzip_contents) - 4); + + echo "\x1f\x8b\x08\x00\x00\x00\x00\x00"; + echo $gzip_contents; + echo pack('V', $gzip_crc); + echo pack('V', $gzip_size); +} + +exit; + +?> \ No newline at end of file diff --git a/phpBB/includes/prune.php b/phpBB/includes/prune.php new file mode 100644 index 0000000000..a01a08599e --- /dev/null +++ b/phpBB/includes/prune.php @@ -0,0 +1,175 @@ +sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain lists of topics to sync', '', __LINE__, __FILE__, $sql); + } + + while( $row = $db->sql_fetchrow($result) ) + { + sync('topic', $row['topic_id']); + } + + $db->sql_freeresult($result); + + $prune_all = ($prune_all) ? '' : 'AND t.topic_vote = 0 AND t.topic_type <> ' . POST_ANNOUNCE; + // + // Those without polls and announcements ... unless told otherwise! + // + $sql = "SELECT t.topic_id + FROM " . POSTS_TABLE . " p, " . TOPICS_TABLE . " t + WHERE t.forum_id = $forum_id + $prune_all + AND p.post_id = t.topic_last_post_id"; + if ( $prune_date != '' ) + { + $sql .= " AND p.post_time < $prune_date"; + } + + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain lists of topics to prune', '', __LINE__, __FILE__, $sql); + } + + $sql_topics = ''; + while( $row = $db->sql_fetchrow($result) ) + { + $sql_topics .= ( ( $sql_topics != '' ) ? ', ' : '' ) . $row['topic_id']; + } + $db->sql_freeresult($result); + + if( $sql_topics != '' ) + { + $sql = "SELECT post_id + FROM " . POSTS_TABLE . " + WHERE forum_id = $forum_id + AND topic_id IN ($sql_topics)"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain list of posts to prune', '', __LINE__, __FILE__, $sql); + } + + $sql_post = ''; + while ( $row = $db->sql_fetchrow($result) ) + { + $sql_post .= ( ( $sql_post != '' ) ? ', ' : '' ) . $row['post_id']; + } + $db->sql_freeresult($result); + + if ( $sql_post != '' ) + { + $sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " + WHERE topic_id IN ($sql_topics)"; + if ( !$db->sql_query($sql, BEGIN_TRANSACTION) ) + { + message_die(GENERAL_ERROR, 'Could not delete watched topics during prune', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE FROM " . TOPICS_TABLE . " + WHERE topic_id IN ($sql_topics)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete topics during prune', '', __LINE__, __FILE__, $sql); + } + + $pruned_topics = $db->sql_affectedrows(); + + $sql = "DELETE FROM " . POSTS_TABLE . " + WHERE post_id IN ($sql_post)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete post_text during prune', '', __LINE__, __FILE__, $sql); + } + + $pruned_posts = $db->sql_affectedrows(); + + $sql = "DELETE FROM " . POSTS_TEXT_TABLE . " + WHERE post_id IN ($sql_post)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete post during prune', '', __LINE__, __FILE__, $sql); + } + + remove_search_post($sql_post); + + return array ('topics' => $pruned_topics, 'posts' => $pruned_posts); + } + } + + return array('topics' => 0, 'posts' => 0); +} + +// +// Function auto_prune(), this function will read the configuration data from +// the auto_prune table and call the prune function with the necessary info. +// +function auto_prune($forum_id = 0) +{ + global $db, $lang; + + $sql = "SELECT * + FROM " . PRUNE_TABLE . " + WHERE forum_id = $forum_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not read auto_prune table', '', __LINE__, __FILE__, $sql); + } + + if ( $row = $db->sql_fetchrow($result) ) + { + if ( $row['prune_freq'] && $row['prune_days'] ) + { + $prune_date = time() - ( $row['prune_days'] * 86400 ); + $next_prune = time() + ( $row['prune_freq'] * 86400 ); + + prune($forum_id, $prune_date); + sync('forum', $forum_id); + + $sql = "UPDATE " . FORUMS_TABLE . " + SET prune_next = $next_prune + WHERE forum_id = $forum_id"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update forum table', '', __LINE__, __FILE__, $sql); + } + } + } + + return; +} + +?> \ No newline at end of file diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php deleted file mode 100644 index a119f866c4..0000000000 --- a/phpBB/includes/search/fulltext_mysql.php +++ /dev/null @@ -1,786 +0,0 @@ -word_length = array('min' => $config['fulltext_mysql_min_word_len'], 'max' => $config['fulltext_mysql_max_word_len']); - - $error = false; - } - - /** - * Checks for correct MySQL version and stores min/max word length in the config - */ - public function init() - { - global $db, $user; - - $result = $db->sql_query('SHOW TABLE STATUS LIKE \'' . POSTS_TABLE . '\''); - $info = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $engine = ''; - if (isset($info['Engine'])) - { - $engine = $info['Engine']; - } - else if (isset($info['Type'])) - { - $engine = $info['Type']; - } - - if ($engine != 'MyISAM') - { - return $user->lang['FULLTEXT_MYSQL_NOT_MYISAM']; - } - - $sql = 'SHOW VARIABLES - LIKE \'ft\_%\''; - $result = $db->sql_query($sql); - - $mysql_info = array(); - while ($row = $db->sql_fetchrow($result)) - { - $mysql_info[$row['Variable_name']] = $row['Value']; - } - $db->sql_freeresult($result); - - set_config('fulltext_mysql_max_word_len', $mysql_info['ft_max_word_len']); - set_config('fulltext_mysql_min_word_len', $mysql_info['ft_min_word_len']); - - return false; - } - - /** - * Splits keywords entered by a user into an array of words stored in $this->split_words - * Stores the tidied search query in $this->search_query - * - * @param string &$keywords Contains the keyword as entered by the user - * @param string $terms is either 'all' or 'any' - * @return bool false if no valid keywords were found and otherwise true - */ - public function split_keywords(&$keywords, $terms) - { - global $config; - - if ($terms == 'all') - { - $match = array('#\sand\s#iu', '#\sor\s#iu', '#\snot\s#iu', '#\+#', '#-#', '#\|#'); - $replace = array(' +', ' |', ' -', ' +', ' -', ' |'); - - $keywords = preg_replace($match, $replace, $keywords); - } - - // Filter out as above - $split_keywords = preg_replace("#[\n\r\t]+#", ' ', trim(htmlspecialchars_decode($keywords))); - - // Split words - $split_keywords = preg_replace('#([^\p{L}\p{N}\'*"()])#u', '$1$1', str_replace('\'\'', '\' \'', trim($split_keywords))); - - $matches = array(); - preg_match_all('#(?:[^\p{L}\p{N}*"()]|^)([+\-|]?(?:[\p{L}\p{N}*"()]+\'?)*[\p{L}\p{N}*"()])(?:[^\p{L}\p{N}*"()]|$)#u', $split_keywords, $matches); - $this->split_words = $matches[1]; - - // to allow phrase search, we need to concatenate quoted words - $tmp_split_words = array(); - $phrase = ''; - foreach ($this->split_words as $word) - { - if ($phrase) - { - $phrase .= ' ' . $word; - if (strpos($word, '"') !== false && substr_count($word, '"') % 2 == 1) - { - $tmp_split_words[] = $phrase; - $phrase = ''; - } - } - else if (strpos($word, '"') !== false && substr_count($word, '"') % 2 == 1) - { - $phrase = $word; - } - else - { - $tmp_split_words[] = $word . ' '; - } - } - if ($phrase) - { - $tmp_split_words[] = $phrase; - } - - $this->split_words = $tmp_split_words; - - unset($tmp_split_words); - unset($phrase); - - foreach ($this->split_words as $i => $word) - { - $clean_word = preg_replace('#^[+\-|"]#', '', $word); - - // check word length - $clean_len = utf8_strlen(str_replace('*', '', $clean_word)); - if (($clean_len < $config['fulltext_mysql_min_word_len']) || ($clean_len > $config['fulltext_mysql_max_word_len'])) - { - $this->common_words[] = $word; - unset($this->split_words[$i]); - } - } - - if ($terms == 'any') - { - $this->search_query = ''; - foreach ($this->split_words as $word) - { - if ((strpos($word, '+') === 0) || (strpos($word, '-') === 0) || (strpos($word, '|') === 0)) - { - $word = substr($word, 1); - } - $this->search_query .= $word . ' '; - } - } - else - { - $this->search_query = ''; - foreach ($this->split_words as $word) - { - if ((strpos($word, '+') === 0) || (strpos($word, '-') === 0)) - { - $this->search_query .= $word . ' '; - } - else if (strpos($word, '|') === 0) - { - $this->search_query .= substr($word, 1) . ' '; - } - else - { - $this->search_query .= '+' . $word . ' '; - } - } - } - - $this->search_query = utf8_htmlspecialchars($this->search_query); - - if ($this->search_query) - { - $this->split_words = array_values($this->split_words); - sort($this->split_words); - return true; - } - return false; - } - - /** - * Turns text into an array of words - */ - private function split_message($text) - { - global $config; - - // Split words - $text = preg_replace('#([^\p{L}\p{N}\'*])#u', '$1$1', str_replace('\'\'', '\' \'', trim($text))); - - $matches = array(); - preg_match_all('#(?:[^\p{L}\p{N}*]|^)([+\-|]?(?:[\p{L}\p{N}*]+\'?)*[\p{L}\p{N}*])(?:[^\p{L}\p{N}*]|$)#u', $text, $matches); - $text = $matches[1]; - - // remove too short or too long words - $text = array_values($text); - for ($i = 0, $n = sizeof($text); $i < $n; $i++) - { - $text[$i] = trim($text[$i]); - if (utf8_strlen($text[$i]) < $config['fulltext_mysql_min_word_len'] || utf8_strlen($text[$i]) > $config['fulltext_mysql_max_word_len']) - { - unset($text[$i]); - } - } - - return array_values($text); - } - - /** - * Performs a search on keywords depending on display specific params. You have to run split_keywords() first. - * - * @param string $type contains either posts or topics depending on what should be searched for - * @param string &$fields contains either titleonly (topic titles should be searched), msgonly (only message bodies should be searched), firstpost (only subject and body of the first post should be searched) or all (all post bodies and subjects should be searched) - * @param string &$terms is either 'all' (use query as entered, words without prefix should default to "have to be in field") or 'any' (ignore search query parts and just return all posts that contain any of the specified words) - * @param array &$sort_by_sql contains SQL code for the ORDER BY part of a query - * @param string &$sort_key is the key of $sort_by_sql for the selected sorting - * @param string &$sort_dir is either a or d representing ASC and DESC - * @param string &$sort_days specifies the maximum amount of days a post may be old - * @param array &$ex_fid_ary specifies an array of forum ids which should not be searched - * @param array &$m_approve_fid_ary specifies an array of forum ids in which the searcher is allowed to view unapproved posts - * @param int &$topic_id is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched - * @param array &$author_ary an array of author ids if the author should be ignored during the search the array is empty - * @param array &$id_ary passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered - * @param int $start indicates the first index of the page - * @param int $per_page number of ids each page is supposed to contain - * @return boolean|int total number of results - * - * @access public - */ - public function keyword_search($type, &$fields, &$terms, &$sort_by_sql, &$sort_key, &$sort_dir, &$sort_days, &$ex_fid_ary, &$m_approve_fid_ary, &$topic_id, &$author_ary, &$id_ary, $start, $per_page) - { - global $config, $db; - - // No keywords? No posts. - if (!$this->search_query) - { - return false; - } - - // generate a search_key from all the options to identify the results - $search_key = md5(implode('#', array( - implode(', ', $this->split_words), - $type, - $fields, - $terms, - $sort_days, - $sort_key, - $topic_id, - implode(',', $ex_fid_ary), - implode(',', $m_approve_fid_ary), - implode(',', $author_ary) - ))); - - // try reading the results from cache - $result_count = 0; - if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == self::SEARCH_RESULT_IN_CACHE) - { - return $result_count; - } - - $id_ary = array(); - - $join_topic = ($type == 'posts') ? false : true; - - // Build sql strings for sorting - $sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC'); - $sql_sort_table = $sql_sort_join = ''; - - switch ($sql_sort[0]) - { - case 'u': - $sql_sort_table = USERS_TABLE . ' u, '; - $sql_sort_join = ($type == 'posts') ? ' AND u.user_id = p.poster_id ' : ' AND u.user_id = t.topic_poster '; - break; - - case 't': - $join_topic = true; - break; - - case 'f': - $sql_sort_table = FORUMS_TABLE . ' f, '; - $sql_sort_join = ' AND f.forum_id = p.forum_id '; - break; - } - - // Build some display specific sql strings - switch ($fields) - { - case 'titleonly': - $sql_match = 'p.post_subject'; - $sql_match_where = ' AND p.post_id = t.topic_first_post_id'; - $join_topic = true; - break; - - case 'msgonly': - $sql_match = 'p.post_text'; - $sql_match_where = ''; - break; - - case 'firstpost': - $sql_match = 'p.post_subject, p.post_text'; - $sql_match_where = ' AND p.post_id = t.topic_first_post_id'; - $join_topic = true; - break; - - default: - $sql_match = 'p.post_subject, p.post_text'; - $sql_match_where = ''; - break; - } - - if (!sizeof($m_approve_fid_ary)) - { - $m_approve_fid_sql = ' AND p.post_approved = 1'; - } - else if ($m_approve_fid_ary === array(-1)) - { - $m_approve_fid_sql = ''; - } - else - { - $m_approve_fid_sql = ' AND (p.post_approved = 1 OR ' . $db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')'; - } - - $sql_select = (!$result_count) ? 'SQL_CALC_FOUND_ROWS ' : ''; - $sql_select = ($type == 'posts') ? $sql_select . 'p.post_id' : 'DISTINCT ' . $sql_select . 't.topic_id'; - $sql_from = ($join_topic) ? TOPICS_TABLE . ' t, ' : ''; - $field = ($type == 'posts') ? 'post_id' : 'topic_id'; - $sql_author = (sizeof($author_ary) == 1) ? ' = ' . $author_ary[0] : 'IN (' . implode(', ', $author_ary) . ')'; - - $sql_where_options = $sql_sort_join; - $sql_where_options .= ($topic_id) ? ' AND p.topic_id = ' . $topic_id : ''; - $sql_where_options .= ($join_topic) ? ' AND t.topic_id = p.topic_id' : ''; - $sql_where_options .= (sizeof($ex_fid_ary)) ? ' AND ' . $db->sql_in_set('p.forum_id', $ex_fid_ary, true) : ''; - $sql_where_options .= $m_approve_fid_sql; - $sql_where_options .= (sizeof($author_ary)) ? ' AND p.poster_id ' . $sql_author : ''; - $sql_where_options .= ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : ''; - $sql_where_options .= $sql_match_where; - - $sql = "SELECT $sql_select - FROM $sql_from$sql_sort_table" . POSTS_TABLE . " p - WHERE MATCH ($sql_match) AGAINST ('" . $db->sql_escape(htmlspecialchars_decode($this->search_query)) . "' IN BOOLEAN MODE) - $sql_where_options - ORDER BY $sql_sort"; - $result = $db->sql_query_limit($sql, $config['search_block_size'], $start); - - while ($row = $db->sql_fetchrow($result)) - { - $id_ary[] = $row[$field]; - } - $db->sql_freeresult($result); - - $id_ary = array_unique($id_ary); - - if (!sizeof($id_ary)) - { - return false; - } - - // if the total result count is not cached yet, retrieve it from the db - if (!$result_count) - { - $sql = 'SELECT FOUND_ROWS() as result_count'; - $result = $db->sql_query($sql); - $result_count = (int) $db->sql_fetchfield('result_count'); - $db->sql_freeresult($result); - - if (!$result_count) - { - return false; - } - } - - // store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page - $this->save_ids($search_key, implode(' ', $this->split_words), $author_ary, $result_count, $id_ary, $start, $sort_dir); - $id_ary = array_slice($id_ary, 0, (int) $per_page); - - return $result_count; - } - - /** - * Performs a search on an author's posts without caring about message contents. Depends on display specific params - * - * @param array &$id_ary passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered - * @param int $start indicates the first index of the page - * @param int $per_page number of ids each page is supposed to contain - * @return total number of results - */ - public function author_search($type, $firstpost_only, &$sort_by_sql, &$sort_key, &$sort_dir, &$sort_days, &$ex_fid_ary, &$m_approve_fid_ary, &$topic_id, &$author_ary, &$id_ary, $start, $per_page) - { - global $config, $db; - - // No author? No posts. - if (!sizeof($author_ary)) - { - return 0; - } - - // generate a search_key from all the options to identify the results - $search_key = md5(implode('#', array( - '', - $type, - ($firstpost_only) ? 'firstpost' : '', - '', - '', - $sort_days, - $sort_key, - $topic_id, - implode(',', $ex_fid_ary), - implode(',', $m_approve_fid_ary), - implode(',', $author_ary) - ))); - - // try reading the results from cache - $result_count = 0; - if ($this->obtain_ids($search_key, $result_count, $id_ary, $start, $per_page, $sort_dir) == self::SEARCH_RESULT_IN_CACHE) - { - return $result_count; - } - - $id_ary = array(); - - // Create some display specific sql strings - $sql_author = $db->sql_in_set('p.poster_id', $author_ary); - $sql_fora = (sizeof($ex_fid_ary)) ? ' AND ' . $db->sql_in_set('p.forum_id', $ex_fid_ary, true) : ''; - $sql_topic_id = ($topic_id) ? ' AND p.topic_id = ' . (int) $topic_id : ''; - $sql_time = ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : ''; - $sql_firstpost = ($firstpost_only) ? ' AND p.post_id = t.topic_first_post_id' : ''; - - // Build sql strings for sorting - $sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC'); - $sql_sort_table = $sql_sort_join = ''; - switch ($sql_sort[0]) - { - case 'u': - $sql_sort_table = USERS_TABLE . ' u, '; - $sql_sort_join = ($type == 'posts') ? ' AND u.user_id = p.poster_id ' : ' AND u.user_id = t.topic_poster '; - break; - - case 't': - $sql_sort_table = ($type == 'posts') ? TOPICS_TABLE . ' t, ' : ''; - $sql_sort_join = ($type == 'posts') ? ' AND t.topic_id = p.topic_id ' : ''; - break; - - case 'f': - $sql_sort_table = FORUMS_TABLE . ' f, '; - $sql_sort_join = ' AND f.forum_id = p.forum_id '; - break; - } - - if (!sizeof($m_approve_fid_ary)) - { - $m_approve_fid_sql = ' AND p.post_approved = 1'; - } - else if ($m_approve_fid_ary == array(-1)) - { - $m_approve_fid_sql = ''; - } - else - { - $m_approve_fid_sql = ' AND (p.post_approved = 1 OR ' . $db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')'; - } - - // If the cache was completely empty count the results - $calc_results = ($result_count) ? '' : 'SQL_CALC_FOUND_ROWS '; - - // Build the query for really selecting the post_ids - if ($type == 'posts') - { - $sql = "SELECT {$calc_results}p.post_id - FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . " - WHERE $sql_author - $sql_topic_id - $sql_firstpost - $m_approve_fid_sql - $sql_fora - $sql_sort_join - $sql_time - ORDER BY $sql_sort"; - $field = 'post_id'; - } - else - { - $sql = "SELECT {$calc_results}t.topic_id - FROM " . $sql_sort_table . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p - WHERE $sql_author - $sql_topic_id - $sql_firstpost - $m_approve_fid_sql - $sql_fora - AND t.topic_id = p.topic_id - $sql_sort_join - $sql_time - GROUP BY t.topic_id - ORDER BY $sql_sort"; - $field = 'topic_id'; - } - - // Only read one block of posts from the db and then cache it - $result = $db->sql_query_limit($sql, $config['search_block_size'], $start); - - while ($row = $db->sql_fetchrow($result)) - { - $id_ary[] = $row[$field]; - } - $db->sql_freeresult($result); - - // retrieve the total result count if needed - if (!$result_count) - { - $sql = 'SELECT FOUND_ROWS() as result_count'; - $result = $db->sql_query($sql); - $result_count = (int) $db->sql_fetchfield('result_count'); - $db->sql_freeresult($result); - - if (!$result_count) - { - return false; - } - } - - if (sizeof($id_ary)) - { - $this->save_ids($search_key, '', $author_ary, $result_count, $id_ary, $start, $sort_dir); - $id_ary = array_slice($id_ary, 0, $per_page); - - return $result_count; - } - return false; - } - - /** - * Destroys cached search results, that contained one of the new words in a post so the results won't be outdated. - * - * @param string $mode contains the post mode: edit, post, reply, quote ... - */ - public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id) - { - global $db; - - // Split old and new post/subject to obtain array of words - $split_text = $this->split_message($message); - $split_title = ($subject) ? $this->split_message($subject) : array(); - - $words = array_unique(array_merge($split_text, $split_title)); - - unset($split_text); - unset($split_title); - - // destroy cached search results containing any of the words removed or added - $this->destroy_cache($words, array($poster_id)); - - unset($words); - } - - /** - * Destroy cached results, that might be outdated after deleting a post - */ - public function index_remove($post_ids, $author_ids, $forum_ids) - { - $this->destroy_cache(array(), $author_ids); - } - - /** - * Destroy old cache entries - */ - public function tidy() - { - global $db, $config; - - // destroy too old cached search results - $this->destroy_cache(array()); - - set_config('search_last_gc', time(), true); - } - - /** - * Create fulltext index - */ - public function create_index($acp_module, $u_action) - { - global $db; - - // Make sure we can actually use MySQL with fulltext indexes - if ($error = $this->init()) - { - return $error; - } - - if (empty($this->stats)) - { - $this->get_stats(); - } - - $alter = array(); - - if (!isset($this->stats['post_subject'])) - { - $alter[] = 'ADD FULLTEXT (post_subject)'; - } - - if (!isset($this->stats['post_text'])) - { - $alter[] = 'MODIFY post_text mediumtext COLLATE utf8_unicode_ci NOT NULL'; - $alter[] = 'ADD FULLTEXT (post_text)'; - } - - if (!isset($this->stats['post_content'])) - { - $alter[] = 'ADD FULLTEXT post_content (post_subject, post_text)'; - } - - if (sizeof($alter)) - { - $db->sql_query('ALTER TABLE ' . POSTS_TABLE . ' ' . implode(', ', $alter)); - } - - $db->sql_query('TRUNCATE TABLE ' . SEARCH_RESULTS_TABLE); - - return false; - } - - /** - * Drop fulltext index - */ - public function delete_index($acp_module, $u_action) - { - global $db; - - // Make sure we can actually use MySQL with fulltext indexes - if ($error = $this->init()) - { - return $error; - } - - if (empty($this->stats)) - { - $this->get_stats(); - } - - $alter = array(); - - if (isset($this->stats['post_subject'])) - { - $alter[] = 'DROP INDEX post_subject'; - } - - if (isset($this->stats['post_text'])) - { - $alter[] = 'DROP INDEX post_text'; - } - - if (isset($this->stats['post_content'])) - { - $alter[] = 'DROP INDEX post_content'; - } - - if (sizeof($alter)) - { - $db->sql_query('ALTER TABLE ' . POSTS_TABLE . ' ' . implode(', ', $alter)); - } - - $db->sql_query('TRUNCATE TABLE ' . SEARCH_RESULTS_TABLE); - - return false; - } - - /** - * Returns true if both FULLTEXT indexes exist - */ - public function index_created() - { - if (empty($this->stats)) - { - $this->get_stats(); - } - - return (isset($this->stats['post_text']) && isset($this->stats['post_subject']) && isset($this->stats['post_content'])) ? true : false; - } - - /** - * Returns an associative array containing information about the indexes - */ - public function index_stats() - { - global $user; - - if (empty($this->stats)) - { - $this->get_stats(); - } - - return array( - $user->lang['FULLTEXT_MYSQL_TOTAL_POSTS'] => ($this->index_created()) ? $this->stats['total_posts'] : 0, - ); - } - - private function get_stats() - { - global $db; - - if ($db->dbms_type !== 'mysql') - { - $this->stats = array(); - return; - } - - $sql = 'SHOW INDEX - FROM ' . POSTS_TABLE; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - // deal with older MySQL versions which didn't use Index_type - $index_type = (isset($row['Index_type'])) ? $row['Index_type'] : $row['Comment']; - - if ($index_type == 'FULLTEXT') - { - if ($row['Key_name'] == 'post_text') - { - $this->stats['post_text'] = $row; - } - else if ($row['Key_name'] == 'post_subject') - { - $this->stats['post_subject'] = $row; - } - else if ($row['Key_name'] == 'post_content') - { - $this->stats['post_content'] = $row; - } - } - } - $db->sql_freeresult($result); - - $sql = 'SELECT COUNT(post_id) as total_posts - FROM ' . POSTS_TABLE; - $result = $db->sql_query($sql); - $this->stats['total_posts'] = (int) $db->sql_fetchfield('total_posts'); - $db->sql_freeresult($result); - } - - /** - * Display nothing, we force UTF-8 support in all versions of PHP - */ - function acp() - { - global $user, $config; - - $tpl = ''; - - // These are fields required in the config table - return array( - 'tpl' => $tpl, - 'config' => array() - ); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php deleted file mode 100755 index e38f095f6d..0000000000 --- a/phpBB/includes/search/fulltext_native.php +++ /dev/null @@ -1,1668 +0,0 @@ -word_length = array('min' => $config['fulltext_native_min_chars'], 'max' => $config['fulltext_native_max_chars']); - - /** - * Load the UTF tools - */ - if (!class_exists('utf_normalizer')) - { - include($phpbb_root_path . 'includes/utf/utf_normalizer.' . $phpEx); - } - - - $error = false; - } - - /** - * This function fills $this->search_query with the cleaned user search query. - * - * If $terms is 'any' then the words will be extracted from the search query - * and combined with | inside brackets. They will afterwards be treated like - * an standard search query. - * - * Then it analyses the query and fills the internal arrays $must_not_contain_ids, - * $must_contain_ids and $must_exclude_one_ids which are later used by keyword_search(). - * - * @param string $keywords contains the search query string as entered by the user - * @param string $terms is either 'all' (use search query as entered, default words to 'must be contained in post') - * or 'any' (find all posts containing at least one of the given words) - * @return boolean false if no valid keywords were found and otherwise true - * - * @access public - */ - public function split_keywords($keywords, $terms) - { - global $db, $user; - - $keywords = trim($this->cleanup($keywords, '+-|()*')); - - // allow word|word|word without brackets - if ((strpos($keywords, ' ') === false) && (strpos($keywords, '|') !== false) && (strpos($keywords, '(') === false)) - { - $keywords = '(' . $keywords . ')'; - } - - $open_bracket = $space = false; - for ($i = 0, $n = strlen($keywords); $i < $n; $i++) - { - if ($open_bracket !== false) - { - switch ($keywords[$i]) - { - case ')': - if ($open_bracket + 1 == $i) - { - $keywords[$i - 1] = '|'; - $keywords[$i] = '|'; - } - $open_bracket = false; - break; - case '(': - $keywords[$i] = '|'; - break; - case '+': - case '-': - case ' ': - $keywords[$i] = '|'; - break; - } - } - else - { - switch ($keywords[$i]) - { - case ')': - $keywords[$i] = ' '; - break; - case '(': - $open_bracket = $i; - $space = false; - break; - case '|': - $keywords[$i] = ' '; - break; - case '-': - case '+': - $space = $keywords[$i]; - break; - case ' ': - if ($space !== false) - { - $keywords[$i] = $space; - } - break; - default: - $space = false; - } - } - } - - if ($open_bracket) - { - $keywords .= ')'; - } - - $match = array( - '# +#', - '#\|\|+#', - '#(\+|\-)(?:\+|\-)+#', - '#\(\|#', - '#\|\)#', - ); - $replace = array( - ' ', - '|', - '$1', - '(', - ')', - ); - - $keywords = preg_replace($match, $replace, $keywords); - - // $keywords input format: each word separated by a space, words in a bracket are not separated - - // the user wants to search for any word, convert the search query - if ($terms == 'any') - { - $words = array(); - - preg_match_all('#([^\\s+\\-|()]+)(?:$|[\\s+\\-|()])#u', $keywords, $words); - if (sizeof($words[1])) - { - $keywords = '(' . implode('|', $words[1]) . ')'; - } - } - - // set the search_query which is shown to the user - $this->search_query = $keywords; - - $exact_words = array(); - preg_match_all('#([^\\s+\\-|*()]+)(?:$|[\\s+\\-|()])#u', $keywords, $exact_words); - $exact_words = $exact_words[1]; - - $common_ids = $words = array(); - - if (sizeof($exact_words)) - { - $sql = 'SELECT word_id, word_text, word_common - FROM ' . SEARCH_WORDLIST_TABLE . ' - WHERE ' . $db->sql_in_set('word_text', $exact_words); - $result = $db->sql_query($sql); - - // store an array of words and ids, remove common words - while ($row = $db->sql_fetchrow($result)) - { - if ($row['word_common']) - { - $this->common_words[] = $row['word_text']; - $common_ids[$row['word_text']] = (int) $row['word_id']; - continue; - } - - $words[$row['word_text']] = (int) $row['word_id']; - } - $db->sql_freeresult($result); - } - unset($exact_words); - - // now analyse the search query, first split it using the spaces - $query = explode(' ', $keywords); - - $this->must_contain_ids = array(); - $this->must_not_contain_ids = array(); - $this->must_exclude_one_ids = array(); - - $mode = ''; - $ignore_no_id = true; - - foreach ($query as $word) - { - if (empty($word)) - { - continue; - } - - // words which should not be included - if ($word[0] == '-') - { - $word = substr($word, 1); - - // a group of which at least one may not be in the resulting posts - if ($word[0] == '(') - { - $word = array_unique(explode('|', substr($word, 1, -1))); - $mode = 'must_exclude_one'; - } - // one word which should not be in the resulting posts - else - { - $mode = 'must_not_contain'; - } - $ignore_no_id = true; - } - // words which have to be included - else - { - // no prefix is the same as a +prefix - if ($word[0] == '+') - { - $word = substr($word, 1); - } - - // a group of words of which at least one word should be in every resulting post - if ($word[0] == '(') - { - $word = array_unique(explode('|', substr($word, 1, -1))); - } - $ignore_no_id = false; - $mode = 'must_contain'; - } - - if (empty($word)) - { - continue; - } - - // if this is an array of words then retrieve an id for each - if (is_array($word)) - { - $non_common_words = array(); - $id_words = array(); - foreach ($word as $i => $word_part) - { - if (strpos($word_part, '*') !== false) - { - $id_words[] = '\'' . $db->sql_escape(str_replace('*', '%', $word_part)) . '\''; - $non_common_words[] = $word_part; - } - else if (isset($words[$word_part])) - { - $id_words[] = $words[$word_part]; - $non_common_words[] = $word_part; - } - else - { - $len = utf8_strlen($word_part); - if ($len < $this->word_length['min'] || $len > $this->word_length['max']) - { - $this->common_words[] = $word_part; - } - } - } - if (sizeof($id_words)) - { - sort($id_words); - if (sizeof($id_words) > 1) - { - $this->{$mode . '_ids'}[] = $id_words; - } - else - { - $mode = ($mode == 'must_exclude_one') ? 'must_not_contain' : $mode; - $this->{$mode . '_ids'}[] = $id_words[0]; - } - } - // throw an error if we shall not ignore unexistant words - else if (!$ignore_no_id && sizeof($non_common_words)) - { - trigger_error(sprintf($user->lang['WORDS_IN_NO_POST'], implode(', ', $non_common_words))); - } - unset($non_common_words); - } - // else we only need one id - else if (($wildcard = strpos($word, '*') !== false) || isset($words[$word])) - { - if ($wildcard) - { - $len = utf8_strlen(str_replace('*', '', $word)); - if ($len >= $this->word_length['min'] && $len <= $this->word_length['max']) - { - $this->{$mode . '_ids'}[] = '\'' . $db->sql_escape(str_replace('*', '%', $word)) . '\''; - } - else - { - $this->common_words[] = $word; - } - } - else - { - $this->{$mode . '_ids'}[] = $words[$word]; - } - } - // throw an error if we shall not ignore unexistant words - else if (!$ignore_no_id) - { - if (!isset($common_ids[$word])) - { - $len = utf8_strlen($word); - if ($len >= $this->word_length['min'] && $len <= $this->word_length['max']) - { - trigger_error(sprintf($user->lang['WORD_IN_NO_POST'], $word)); - } - else - { - $this->common_words[] = $word; - } - } - } - else - { - $len = utf8_strlen($word); - if ($len < $this->word_length['min'] || $len > $this->word_length['max']) - { - $this->common_words[] = $word; - } - } - } - - // we can't search for negatives only - if (!sizeof($this->must_contain_ids)) - { - return false; - } - - sort($this->must_contain_ids); - sort($this->must_not_contain_ids); - sort($this->must_exclude_one_ids); - - if (!empty($this->search_query)) - { - return true; - } - return false; - } - - /** - * Performs a search on keywords depending on display specific params. You have to run split_keywords() first. - * - * @param string $type contains either posts or topics depending on what should be searched for - * @param string &$fields contains either titleonly (topic titles should be searched), msgonly (only message bodies should be searched), firstpost (only subject and body of the first post should be searched) or all (all post bodies and subjects should be searched) - * @param string &$terms is either 'all' (use query as entered, words without prefix should default to "have to be in field") or 'any' (ignore search query parts and just return all posts that contain any of the specified words) - * @param array &$sort_by_sql contains SQL code for the ORDER BY part of a query - * @param string &$sort_key is the key of $sort_by_sql for the selected sorting - * @param string &$sort_dir is either a or d representing ASC and DESC - * @param string &$sort_days specifies the maximum amount of days a post may be old - * @param array &$ex_fid_ary specifies an array of forum ids which should not be searched - * @param array &$m_approve_fid_ary specifies an array of forum ids in which the searcher is allowed to view unapproved posts - * @param int &$topic_id is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched - * @param array &$author_ary an array of author ids if the author should be ignored during the search the array is empty - * @param array &$id_ary passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered - * @param int $start indicates the first index of the page - * @param int $per_page number of ids each page is supposed to contain - * @return boolean|int total number of results - * - * @access public - */ - public function keyword_search($type, &$fields, &$terms, &$sort_by_sql, &$sort_key, &$sort_dir, &$sort_days, &$ex_fid_ary, &$m_approve_fid_ary, &$topic_id, &$author_ary, &$id_ary, $start, $per_page) - { - global $config, $db; - - // No keywords? No posts. - if (empty($this->search_query)) - { - return false; - } - - // generate a search_key from all the options to identify the results - $search_key = md5(implode('#', array( - serialize($this->must_contain_ids), - serialize($this->must_not_contain_ids), - serialize($this->must_exclude_one_ids), - $type, - $fields, - $terms, - $sort_days, - $sort_key, - $topic_id, - implode(',', $ex_fid_ary), - implode(',', $m_approve_fid_ary), - implode(',', $author_ary) - ))); - - // try reading the results from cache - $total_results = 0; - if ($this->obtain_ids($search_key, $total_results, $id_ary, $start, $per_page, $sort_dir) == self::SEARCH_RESULT_IN_CACHE) - { - return $total_results; - } - - $id_ary = array(); - - $sql_where = array(); - $group_by = false; - $m_num = 0; - $w_num = 0; - - $sql_array = array( - 'SELECT' => ($type == 'posts') ? 'p.post_id' : 'p.topic_id', - 'FROM' => array( - SEARCH_WORDMATCH_TABLE => array(), - SEARCH_WORDLIST_TABLE => array(), - POSTS_TABLE => 'p' - ), - 'LEFT_JOIN' => array() - ); - $sql_where[] = 'm0.post_id = p.post_id'; - - $title_match = ''; - $group_by = true; - // Build some display specific sql strings - switch ($fields) - { - case 'titleonly': - $title_match = 'title_match = 1'; - $group_by = false; - // no break - case 'firstpost': - $sql_array['FROM'][TOPICS_TABLE] = 't'; - $sql_where[] = 'p.post_id = t.topic_first_post_id'; - break; - - case 'msgonly': - $title_match = 'title_match = 0'; - $group_by = false; - break; - } - - if ($type == 'topics') - { - if (!isset($sql_array['FROM'][TOPICS_TABLE])) - { - $sql_array['FROM'][TOPICS_TABLE] = 't'; - $sql_where[] = 'p.topic_id = t.topic_id'; - } - $group_by = true; - } - - /** - * @todo Add a query optimizer (handle stuff like "+(4|3) +4") - */ - - foreach ($this->must_contain_ids as $subquery) - { - if (is_array($subquery)) - { - $group_by = true; - - $word_id_sql = array(); - $word_ids = array(); - foreach ($subquery as $id) - { - if (is_string($id)) - { - $sql_array['LEFT_JOIN'][] = array( - 'FROM' => array(SEARCH_WORDLIST_TABLE => 'w' . $w_num), - 'ON' => "w$w_num.word_text LIKE $id" - ); - $word_ids[] = "w$w_num.word_id"; - - $w_num++; - } - else - { - $word_ids[] = $id; - } - } - - $sql_where[] = $db->sql_in_set("m$m_num.word_id", $word_ids); - - unset($word_id_sql); - unset($word_ids); - } - else if (is_string($subquery)) - { - $sql_array['FROM'][SEARCH_WORDLIST_TABLE][] = 'w' . $w_num; - - $sql_where[] = "w$w_num.word_text LIKE $subquery"; - $sql_where[] = "m$m_num.word_id = w$w_num.word_id"; - - $group_by = true; - $w_num++; - } - else - { - $sql_where[] = "m$m_num.word_id = $subquery"; - } - - $sql_array['FROM'][SEARCH_WORDMATCH_TABLE][] = 'm' . $m_num; - - if ($title_match) - { - $sql_where[] = "m$m_num.$title_match"; - } - - if ($m_num != 0) - { - $sql_where[] = "m$m_num.post_id = m0.post_id"; - } - $m_num++; - } - - foreach ($this->must_not_contain_ids as $key => $subquery) - { - if (is_string($subquery)) - { - $sql_array['LEFT_JOIN'][] = array( - 'FROM' => array(SEARCH_WORDLIST_TABLE => 'w' . $w_num), - 'ON' => "w$w_num.word_text LIKE $subquery" - ); - - $this->must_not_contain_ids[$key] = "w$w_num.word_id"; - - $group_by = true; - $w_num++; - } - } - - if (sizeof($this->must_not_contain_ids)) - { - $sql_array['LEFT_JOIN'][] = array( - 'FROM' => array(SEARCH_WORDMATCH_TABLE => 'm' . $m_num), - 'ON' => $db->sql_in_set("m$m_num.word_id", $this->must_not_contain_ids) . (($title_match) ? " AND m$m_num.$title_match" : '') . " AND m$m_num.post_id = m0.post_id" - ); - - $sql_where[] = "m$m_num.word_id IS NULL"; - $m_num++; - } - - foreach ($this->must_exclude_one_ids as $ids) - { - $is_null_joins = array(); - foreach ($ids as $id) - { - if (is_string($id)) - { - $sql_array['LEFT_JOIN'][] = array( - 'FROM' => array(SEARCH_WORDLIST_TABLE => 'w' . $w_num), - 'ON' => "w$w_num.word_text LIKE $id" - ); - $id = "w$w_num.word_id"; - - $group_by = true; - $w_num++; - } - - $sql_array['LEFT_JOIN'][] = array( - 'FROM' => array(SEARCH_WORDMATCH_TABLE => 'm' . $m_num), - 'ON' => "m$m_num.word_id = $id AND m$m_num.post_id = m0.post_id" . (($title_match) ? " AND m$m_num.$title_match" : '') - ); - $is_null_joins[] = "m$m_num.word_id IS NULL"; - - $m_num++; - } - $sql_where[] = '(' . implode(' OR ', $is_null_joins) . ')'; - } - - if (!sizeof($m_approve_fid_ary)) - { - $sql_where[] = 'p.post_approved = 1'; - } - else if ($m_approve_fid_ary !== array(-1)) - { - $sql_where[] = '(p.post_approved = 1 OR ' . $db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')'; - } - - if ($topic_id) - { - $sql_where[] = 'p.topic_id = ' . $topic_id; - } - - if (sizeof($author_ary)) - { - $sql_where[] = $db->sql_in_set('p.poster_id', $author_ary); - } - - if (sizeof($ex_fid_ary)) - { - $sql_where[] = $db->sql_in_set('p.forum_id', $ex_fid_ary, true); - } - - if ($sort_days) - { - $sql_where[] = 'p.post_time >= ' . (time() - ($sort_days * 86400)); - } - - $sql_array['WHERE'] = implode(' AND ', $sql_where); - - $is_mysql = false; - // if the total result count is not cached yet, retrieve it from the db - if (!$total_results) - { - $sql = ''; - $sql_array_count = $sql_array; - - if ($db->dbms_type === 'mysql') - { - $sql_array['SELECT'] = 'SQL_CALC_FOUND_ROWS ' . $sql_array['SELECT']; - $is_mysql = true; - } - else - { - if (!$db->count_distinct) - { - $sql_array_count['SELECT'] = ($type == 'posts') ? 'DISTINCT p.post_id' : 'DISTINCT p.topic_id'; - $sql = 'SELECT COUNT(' . (($type == 'posts') ? 'post_id' : 'topic_id') . ') as total_results - FROM (' . $db->sql_build_query('SELECT', $sql_array_count) . ')'; - } - - $sql_array_count['SELECT'] = ($type == 'posts') ? 'COUNT(DISTINCT p.post_id) AS total_results' : 'COUNT(DISTINCT p.topic_id) AS total_results'; - $sql = (!$sql) ? $db->sql_build_query('SELECT', $sql_array_count) : $sql; - - $result = $db->sql_query($sql); - $total_results = (int) $db->sql_fetchfield('total_results'); - $db->sql_freeresult($result); - - if (!$total_results) - { - return false; - } - } - - unset($sql_array_count, $sql); - } - - // Build sql strings for sorting - $sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC'); - - switch ($sql_sort[0]) - { - case 'u': - $sql_array['FROM'][USERS_TABLE] = 'u'; - $sql_where[] = 'u.user_id = p.poster_id '; - break; - - case 't': - if (!isset($sql_array['FROM'][TOPICS_TABLE])) - { - $sql_array['FROM'][TOPICS_TABLE] = 't'; - $sql_where[] = 'p.topic_id = t.topic_id'; - } - break; - - case 'f': - $sql_array['FROM'][FORUMS_TABLE] = 'f'; - $sql_where[] = 'f.forum_id = p.forum_id'; - break; - } - - $sql_array['WHERE'] = implode(' AND ', $sql_where); - $sql_array['GROUP_BY'] = ($group_by) ? (($type == 'posts') ? 'p.post_id' : 'p.topic_id') . ', ' . $sort_by_sql[$sort_key] : ''; - $sql_array['ORDER_BY'] = $sql_sort; - - unset($sql_where, $sql_sort, $group_by); - - $sql = $db->sql_build_query('SELECT', $sql_array); - $result = $db->sql_query_limit($sql, $config['search_block_size'], $start); - - while ($row = $db->sql_fetchrow($result)) - { - $id_ary[] = $row[(($type == 'posts') ? 'post_id' : 'topic_id')]; - } - $db->sql_freeresult($result); - - if (!sizeof($id_ary)) - { - return false; - } - - // if we use mysql and the total result count is not cached yet, retrieve it from the db - if (!$total_results && $is_mysql) - { - $sql = 'SELECT FOUND_ROWS() as total_results'; - $result = $db->sql_query($sql); - $total_results = (int) $db->sql_fetchfield('total_results'); - $db->sql_freeresult($result); - - if (!$total_results) - { - return false; - } - } - - // store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page - $this->save_ids($search_key, $this->search_query, $author_ary, $total_results, $id_ary, $start, $sort_dir); - $id_ary = array_slice($id_ary, 0, (int) $per_page); - - return $total_results; - } - - /** - * Performs a search on an author's posts without caring about message contents. Depends on display specific params - * - * @param string $type contains either posts or topics depending on what should be searched for - * @param boolean $firstpost_only if true, only topic starting posts will be considered - * @param array &$sort_by_sql contains SQL code for the ORDER BY part of a query - * @param string &$sort_key is the key of $sort_by_sql for the selected sorting - * @param string &$sort_dir is either a or d representing ASC and DESC - * @param string &$sort_days specifies the maximum amount of days a post may be old - * @param array &$ex_fid_ary specifies an array of forum ids which should not be searched - * @param array &$m_approve_fid_ary specifies an array of forum ids in which the searcher is allowed to view unapproved posts - * @param int &$topic_id is set to 0 or a topic id, if it is not 0 then only posts in this topic should be searched - * @param array &$author_ary an array of author ids - * @param array &$id_ary passed by reference, to be filled with ids for the page specified by $start and $per_page, should be ordered - * @param int $start indicates the first index of the page - * @param int $per_page number of ids each page is supposed to contain - * @return boolean|int total number of results - * - * @access public - */ - public function author_search($type, $firstpost_only, &$sort_by_sql, &$sort_key, &$sort_dir, &$sort_days, &$ex_fid_ary, &$m_approve_fid_ary, &$topic_id, &$author_ary, &$id_ary, $start, $per_page) - { - global $config, $db; - - // No author? No posts. - if (!sizeof($author_ary)) - { - return 0; - } - - // generate a search_key from all the options to identify the results - $search_key = md5(implode('#', array( - '', - $type, - ($firstpost_only) ? 'firstpost' : '', - '', - '', - $sort_days, - $sort_key, - $topic_id, - implode(',', $ex_fid_ary), - implode(',', $m_approve_fid_ary), - implode(',', $author_ary) - ))); - - // try reading the results from cache - $total_results = 0; - if ($this->obtain_ids($search_key, $total_results, $id_ary, $start, $per_page, $sort_dir) == self::SEARCH_RESULT_IN_CACHE) - { - return $total_results; - } - - $id_ary = array(); - - // Create some display specific sql strings - $sql_author = $db->sql_in_set('p.poster_id', $author_ary); - $sql_fora = (sizeof($ex_fid_ary)) ? ' AND ' . $db->sql_in_set('p.forum_id', $ex_fid_ary, true) : ''; - $sql_time = ($sort_days) ? ' AND p.post_time >= ' . (time() - ($sort_days * 86400)) : ''; - $sql_topic_id = ($topic_id) ? ' AND p.topic_id = ' . (int) $topic_id : ''; - $sql_firstpost = ($firstpost_only) ? ' AND p.post_id = t.topic_first_post_id' : ''; - - // Build sql strings for sorting - $sql_sort = $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC'); - $sql_sort_table = $sql_sort_join = ''; - switch ($sql_sort[0]) - { - case 'u': - $sql_sort_table = USERS_TABLE . ' u, '; - $sql_sort_join = ' AND u.user_id = p.poster_id '; - break; - - case 't': - $sql_sort_table = ($type == 'posts') ? TOPICS_TABLE . ' t, ' : ''; - $sql_sort_join = ($type == 'posts') ? ' AND t.topic_id = p.topic_id ' : ''; - break; - - case 'f': - $sql_sort_table = FORUMS_TABLE . ' f, '; - $sql_sort_join = ' AND f.forum_id = p.forum_id '; - break; - } - - if (!sizeof($m_approve_fid_ary)) - { - $m_approve_fid_sql = ' AND p.post_approved = 1'; - } - else if ($m_approve_fid_ary == array(-1)) - { - $m_approve_fid_sql = ''; - } - else - { - $m_approve_fid_sql = ' AND (p.post_approved = 1 OR ' . $db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) . ')'; - } - - $select = ($type == 'posts') ? 'p.post_id' : 't.topic_id'; - $is_mysql = false; - - // If the cache was completely empty count the results - if (!$total_results) - { - if ($db->dbms_type === 'mysql') - { - $select = 'SQL_CALC_FOUND_ROWS ' . $select; - $is_mysql = true; - } - else - { - if ($type == 'posts') - { - $sql = 'SELECT COUNT(p.post_id) as total_results - FROM ' . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . " - WHERE $sql_author - $sql_topic_id - $sql_firstpost - $m_approve_fid_sql - $sql_fora - $sql_time"; - } - else - { - if ($db->count_distinct) - { - $sql = 'SELECT COUNT(DISTINCT t.topic_id) as total_results'; - } - else - { - $sql = 'SELECT COUNT(topic_id) as total_results - FROM (SELECT DISTINCT t.topic_id'; - } - - $sql .= ' FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p - WHERE $sql_author - $sql_topic_id - $sql_firstpost - $m_approve_fid_sql - $sql_fora - AND t.topic_id = p.topic_id - $sql_time" . (($db->count_distinct) ? '' : ')'); - } - $result = $db->sql_query($sql); - - $total_results = (int) $db->sql_fetchfield('total_results'); - $db->sql_freeresult($result); - - if (!$total_results) - { - return false; - } - } - } - - // Build the query for really selecting the post_ids - if ($type == 'posts') - { - $sql = "SELECT $select - FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($topic_id || $firstpost_only) ? ', ' . TOPICS_TABLE . ' t' : '') . " - WHERE $sql_author - $sql_topic_id - $sql_firstpost - $m_approve_fid_sql - $sql_fora - $sql_sort_join - $sql_time - ORDER BY $sql_sort"; - $field = 'post_id'; - } - else - { - $sql = "SELECT $select - FROM " . $sql_sort_table . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p - WHERE $sql_author - $sql_topic_id - $sql_firstpost - $m_approve_fid_sql - $sql_fora - AND t.topic_id = p.topic_id - $sql_sort_join - $sql_time - GROUP BY t.topic_id, " . $sort_by_sql[$sort_key] . ' - ORDER BY ' . $sql_sort; - $field = 'topic_id'; - } - - // Only read one block of posts from the db and then cache it - $result = $db->sql_query_limit($sql, $config['search_block_size'], $start); - - while ($row = $db->sql_fetchrow($result)) - { - $id_ary[] = $row[$field]; - } - $db->sql_freeresult($result); - - if (!$total_results && $is_mysql) - { - $sql = 'SELECT FOUND_ROWS() as total_results'; - $result = $db->sql_query($sql); - $total_results = (int) $db->sql_fetchfield('total_results'); - $db->sql_freeresult($result); - - if (!$total_results) - { - return false; - } - } - - if (sizeof($id_ary)) - { - $this->save_ids($search_key, '', $author_ary, $total_results, $id_ary, $start, $sort_dir); - $id_ary = array_slice($id_ary, 0, $per_page); - - return $total_results; - } - return false; - } - - /** - * Split a text into words of a given length - * - * The text is converted to UTF-8, cleaned up, and split. Then, words that - * conform to the defined length range are returned in an array. - * - * NOTE: duplicates are NOT removed from the return array - * - * @param string $text Text to split, encoded in UTF-8 - * @return array Array of UTF-8 words - * - * @access private - */ - private function split_message($text) - { - global $phpbb_root_path, $phpEx, $user; - - $match = $words = array(); - - /** - * Taken from the original code - */ - // Do not index code - $match[] = '#\[code(?:=.*?)?(\:?[0-9a-z]{5,})\].*?\[\/code(\:?[0-9a-z]{5,})\]#is'; - // BBcode - $match[] = '#\[\/?[a-z0-9\*\+\-]+(?:=.*?)?(?::[a-z])?(\:?[0-9a-z]{5,})\]#'; - - $min = $this->word_length['min']; - $max = $this->word_length['max']; - - $isset_min = $min - 1; - - /** - * Clean up the string, remove HTML tags, remove BBCodes - */ - $word = strtok($this->cleanup(preg_replace($match, ' ', strip_tags($text)), -1), ' '); - - while (strlen($word)) - { - if (strlen($word) > 255 || strlen($word) <= $isset_min) - { - /** - * Words longer than 255 bytes are ignored. This will have to be - * changed whenever we change the length of search_wordlist.word_text - * - * Words shorter than $isset_min bytes are ignored, too - */ - $word = strtok(' '); - continue; - } - - $len = utf8_strlen($word); - - /** - * Test whether the word is too short to be indexed. - * - * Note that this limit does NOT apply to CJK and Hangul - */ - if ($len < $min) - { - /** - * Note: this could be optimized. If the codepoint is lower than Hangul's range - * we know that it will also be lower than CJK ranges - */ - if ((strncmp($word, utf_normalizer::UTF8_HANGUL_FIRST, 3) < 0 || strncmp($word, utf_normalizer::UTF8_HANGUL_LAST, 3) > 0) - && (strncmp($word, utf_normalizer::UTF8_CJK_FIRST, 3) < 0 || strncmp($word, utf_normalizer::UTF8_CJK_LAST, 3) > 0) - && (strncmp($word, utf_normalizer::UTF8_CJK_B_FIRST, 4) < 0 || strncmp($word, utf_normalizer::UTF8_CJK_B_LAST, 4) > 0)) - { - $word = strtok(' '); - continue; - } - } - - $words[] = $word; - $word = strtok(' '); - } - - return $words; - } - - /** - * Updates wordlist and wordmatch tables when a message is posted or changed - * - * @param string $mode Contains the post mode: edit, post, reply, quote - * @param int $post_id The id of the post which is modified/created - * @param string &$message New or updated post content - * @param string &$subject New or updated post subject - * @param int $poster_id Post author's user id - * @param int $forum_id The id of the forum in which the post is located - * - * @access public - */ - public function index($mode, $post_id, &$message, &$subject, $poster_id, $forum_id) - { - global $config, $db, $user; - - if (!$config['fulltext_native_load_upd']) - { - /** - * The search indexer is disabled, return - */ - return; - } - - // Split old and new post/subject to obtain array of 'words' - $split_text = $this->split_message($message); - $split_title = $this->split_message($subject); - - $cur_words = array('post' => array(), 'title' => array()); - - $words = array(); - if ($mode == 'edit') - { - $words['add']['post'] = array(); - $words['add']['title'] = array(); - $words['del']['post'] = array(); - $words['del']['title'] = array(); - - $sql = 'SELECT w.word_id, w.word_text, m.title_match - FROM ' . SEARCH_WORDLIST_TABLE . ' w, ' . SEARCH_WORDMATCH_TABLE . " m - WHERE m.post_id = $post_id - AND w.word_id = m.word_id"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $which = ($row['title_match']) ? 'title' : 'post'; - $cur_words[$which][$row['word_text']] = $row['word_id']; - } - $db->sql_freeresult($result); - - $words['add']['post'] = array_diff($split_text, array_keys($cur_words['post'])); - $words['add']['title'] = array_diff($split_title, array_keys($cur_words['title'])); - $words['del']['post'] = array_diff(array_keys($cur_words['post']), $split_text); - $words['del']['title'] = array_diff(array_keys($cur_words['title']), $split_title); - } - else - { - $words['add']['post'] = $split_text; - $words['add']['title'] = $split_title; - $words['del']['post'] = array(); - $words['del']['title'] = array(); - } - unset($split_text); - unset($split_title); - - // Get unique words from the above arrays - $unique_add_words = array_unique(array_merge($words['add']['post'], $words['add']['title'])); - - // We now have unique arrays of all words to be added and removed and - // individual arrays of added and removed words for text and title. What - // we need to do now is add the new words (if they don't already exist) - // and then add (or remove) matches between the words and this post - if (sizeof($unique_add_words)) - { - $sql = 'SELECT word_id, word_text - FROM ' . SEARCH_WORDLIST_TABLE . ' - WHERE ' . $db->sql_in_set('word_text', $unique_add_words); - $result = $db->sql_query($sql); - - $word_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $word_ids[$row['word_text']] = $row['word_id']; - } - $db->sql_freeresult($result); - $new_words = array_diff($unique_add_words, array_keys($word_ids)); - - $db->sql_transaction('begin'); - if (sizeof($new_words)) - { - $sql_ary = array(); - - foreach ($new_words as $word) - { - $sql_ary[] = array('word_text' => (string) $word, 'word_count' => 0); - } - $db->sql_return_on_error(true); - $db->sql_multi_insert(SEARCH_WORDLIST_TABLE, $sql_ary); - $db->sql_return_on_error(false); - } - unset($new_words, $sql_ary); - } - else - { - $db->sql_transaction('begin'); - } - - // now update the search match table, remove links to removed words and add links to new words - foreach ($words['del'] as $word_in => $word_ary) - { - $title_match = ($word_in == 'title') ? 1 : 0; - - if (sizeof($word_ary)) - { - $sql_in = array(); - foreach ($word_ary as $word) - { - $sql_in[] = $cur_words[$word_in][$word]; - } - - $sql = 'DELETE FROM ' . SEARCH_WORDMATCH_TABLE . ' - WHERE ' . $db->sql_in_set('word_id', $sql_in) . ' - AND post_id = ' . intval($post_id) . " - AND title_match = $title_match"; - $db->sql_query($sql); - - $sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . ' - SET word_count = word_count - 1 - WHERE ' . $db->sql_in_set('word_id', $sql_in) . ' - AND word_count > 0'; - $db->sql_query($sql); - - unset($sql_in); - } - } - - $db->sql_return_on_error(true); - foreach ($words['add'] as $word_in => $word_ary) - { - $title_match = ($word_in == 'title') ? 1 : 0; - - if (sizeof($word_ary)) - { - $sql = 'INSERT INTO ' . SEARCH_WORDMATCH_TABLE . ' (post_id, word_id, title_match) - SELECT ' . (int) $post_id . ', word_id, ' . (int) $title_match . ' - FROM ' . SEARCH_WORDLIST_TABLE . ' - WHERE ' . $db->sql_in_set('word_text', $word_ary); - $db->sql_query($sql); - - $sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . ' - SET word_count = word_count + 1 - WHERE ' . $db->sql_in_set('word_text', $word_ary); - $db->sql_query($sql); - } - } - $db->sql_return_on_error(false); - - $db->sql_transaction('commit'); - - // destroy cached search results containing any of the words removed or added - $this->destroy_cache(array_unique(array_merge($words['add']['post'], $words['add']['title'], $words['del']['post'], $words['del']['title'])), array($poster_id)); - - unset($unique_add_words); - unset($words); - unset($cur_words); - } - - /** - * Removes entries from the wordmatch table for the specified post_ids - */ - public function index_remove($post_ids, $author_ids, $forum_ids) - { - global $db; - - if (sizeof($post_ids)) - { - $sql = 'SELECT w.word_id, w.word_text, m.title_match - FROM ' . SEARCH_WORDMATCH_TABLE . ' m, ' . SEARCH_WORDLIST_TABLE . ' w - WHERE ' . $db->sql_in_set('m.post_id', $post_ids) . ' - AND w.word_id = m.word_id'; - $result = $db->sql_query($sql); - - $message_word_ids = $title_word_ids = $word_texts = array(); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['title_match']) - { - $title_word_ids[] = $row['word_id']; - } - else - { - $message_word_ids[] = $row['word_id']; - } - $word_texts[] = $row['word_text']; - } - $db->sql_freeresult($result); - - if (sizeof($title_word_ids)) - { - $sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . ' - SET word_count = word_count - 1 - WHERE ' . $db->sql_in_set('word_id', $title_word_ids) . ' - AND word_count > 0'; - $db->sql_query($sql); - } - - if (sizeof($message_word_ids)) - { - $sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . ' - SET word_count = word_count - 1 - WHERE ' . $db->sql_in_set('word_id', $message_word_ids) . ' - AND word_count > 0'; - $db->sql_query($sql); - } - - unset($title_word_ids); - unset($message_word_ids); - - $sql = 'DELETE FROM ' . SEARCH_WORDMATCH_TABLE . ' - WHERE ' . $db->sql_in_set('post_id', $post_ids); - $db->sql_query($sql); - } - - $this->destroy_cache(array_unique($word_texts), $author_ids); - } - - /** - * Tidy up indexes: Tag 'common words' and remove - * words no longer referenced in the match table - */ - public function tidy() - { - global $db, $config; - - // Is the fulltext indexer disabled? If yes then we need not - // carry on ... it's okay ... I know when I'm not wanted boo hoo - if (!$config['fulltext_native_load_upd']) - { - set_config('search_last_gc', time(), true); - return; - } - - $destroy_cache_words = array(); - - // Remove common words - if ($config['num_posts'] >= 100 && $config['fulltext_native_common_thres']) - { - $common_threshold = ((double) $config['fulltext_native_common_thres']) / 100.0; - // First, get the IDs of common words - $sql = 'SELECT word_id, word_text - FROM ' . SEARCH_WORDLIST_TABLE . ' - WHERE word_count > ' . floor($config['num_posts'] * $common_threshold) . ' - OR word_common = 1'; - $result = $db->sql_query($sql); - - $sql_in = array(); - while ($row = $db->sql_fetchrow($result)) - { - $sql_in[] = $row['word_id']; - $destroy_cache_words[] = $row['word_text']; - } - $db->sql_freeresult($result); - - if (sizeof($sql_in)) - { - // Flag the words - $sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . ' - SET word_common = 1 - WHERE ' . $db->sql_in_set('word_id', $sql_in); - $db->sql_query($sql); - - // by setting search_last_gc to the new time here we make sure that if a user reloads because the - // following query takes too long, he won't run into it again - set_config('search_last_gc', time(), true); - - // Delete the matches - $sql = 'DELETE FROM ' . SEARCH_WORDMATCH_TABLE . ' - WHERE ' . $db->sql_in_set('word_id', $sql_in); - $db->sql_query($sql); - } - unset($sql_in); - } - - if (sizeof($destroy_cache_words)) - { - // destroy cached search results containing any of the words that are now common or were removed - $this->destroy_cache(array_unique($destroy_cache_words)); - } - - set_config('search_last_gc', time(), true); - } - - /** - * Deletes all words from the index - */ - public function delete_index($acp_module, $u_action) - { - global $db; - - if ($db->truncate) - { - $db->sql_query('TRUNCATE TABLE ' . SEARCH_WORDLIST_TABLE); - $db->sql_query('TRUNCATE TABLE ' . SEARCH_WORDMATCH_TABLE); - $db->sql_query('TRUNCATE TABLE ' . SEARCH_RESULTS_TABLE); - } - else - { - $db->sql_query('DELETE FROM ' . SEARCH_WORDLIST_TABLE); - $db->sql_query('DELETE FROM ' . SEARCH_WORDMATCH_TABLE); - $db->sql_query('DELETE FROM ' . SEARCH_RESULTS_TABLE); - } - } - - /** - * Returns true if both FULLTEXT indexes exist - */ - public function index_created() - { - if (!sizeof($this->stats)) - { - $this->get_stats(); - } - - return ($this->stats['total_words'] && $this->stats['total_matches']) ? true : false; - } - - /** - * Returns an associative array containing information about the indexes - */ - public function index_stats() - { - global $user; - - if (!sizeof($this->stats)) - { - $this->get_stats(); - } - - return array( - $user->lang['TOTAL_WORDS'] => $this->stats['total_words'], - $user->lang['TOTAL_MATCHES'] => $this->stats['total_matches']); - } - - private function get_stats() - { - global $db; - - $sql = 'SELECT COUNT(*) as total_words - FROM ' . SEARCH_WORDLIST_TABLE; - $result = $db->sql_query($sql); - $this->stats['total_words'] = (int) $db->sql_fetchfield('total_words'); - $db->sql_freeresult($result); - - $sql = 'SELECT COUNT(*) as total_matches - FROM ' . SEARCH_WORDMATCH_TABLE; - $result = $db->sql_query($sql); - $this->stats['total_matches'] = (int) $db->sql_fetchfield('total_matches'); - $db->sql_freeresult($result); - } - - /** - * Clean up a text to remove non-alphanumeric characters - * - * This method receives a UTF-8 string, normalizes and validates it, replaces all - * non-alphanumeric characters with strings then returns the result. - * - * Any number of "allowed chars" can be passed as a UTF-8 string in NFC. - * - * @param string $text Text to split, in UTF-8 (not normalized or sanitized) - * @param string $allowed_chars String of special chars to allow - * @return string Cleaned up text, only alphanumeric chars are left - * - * @todo normalizer::cleanup being able to be used? - */ - private function cleanup($text, $allowed_chars = null) - { - global $phpbb_root_path, $phpEx; - static $conv = array(), $conv_loaded = array(); - $words = $allow = array(); - - $utf_len_mask = array( - "\xC0" => 2, - "\xD0" => 2, - "\xE0" => 3, - "\xF0" => 4 - ); - - /** - * Replace HTML entities and NCRs - */ - $text = htmlspecialchars_decode(utf8_decode_ncr($text), ENT_QUOTES); - - /** - * Load the UTF-8 normalizer - * - * If we use it more widely, an instance of that class should be held in a - * a global variable instead - */ - utf_normalizer::nfc($text); - - /** - * The first thing we do is: - * - * - convert ASCII-7 letters to lowercase - * - remove the ASCII-7 non-alpha characters - * - remove the bytes that should not appear in a valid UTF-8 string: 0xC0, - * 0xC1 and 0xF5-0xFF - * - * @todo in theory, the third one is already taken care of during normalization and those chars should have been replaced by Unicode replacement chars - */ - $sb_match = "ISTCPAMELRDOJBNHFGVWUQKYXZ\r\n\t!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F\xC0\xC1\xF5\xF6\xF7\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF"; - $sb_replace = 'istcpamelrdojbnhfgvwuqkyxz '; - - /** - * This is the list of legal ASCII chars, it is automatically extended - * with ASCII chars from $allowed_chars - */ - $legal_ascii = ' eaisntroludcpmghbfvq10xy2j9kw354867z'; - - /** - * Prepare an array containing the extra chars to allow - */ - if (isset($allowed_chars[0])) - { - $pos = 0; - $len = strlen($allowed_chars); - do - { - $c = $allowed_chars[$pos]; - - if ($c < "\x80") - { - /** - * ASCII char - */ - $sb_pos = strpos($sb_match, $c); - if (is_int($sb_pos)) - { - /** - * Remove the char from $sb_match and its corresponding - * replacement in $sb_replace - */ - $sb_match = substr($sb_match, 0, $sb_pos) . substr($sb_match, $sb_pos + 1); - $sb_replace = substr($sb_replace, 0, $sb_pos) . substr($sb_replace, $sb_pos + 1); - $legal_ascii .= $c; - } - - ++$pos; - } - else - { - /** - * UTF-8 char - */ - $utf_len = $utf_len_mask[$c & "\xF0"]; - $allow[substr($allowed_chars, $pos, $utf_len)] = 1; - $pos += $utf_len; - } - } - while ($pos < $len); - } - - $text = strtr($text, $sb_match, $sb_replace); - $ret = ''; - - $pos = 0; - $len = strlen($text); - - do - { - /** - * Do all consecutive ASCII chars at once - */ - if ($spn = strspn($text, $legal_ascii, $pos)) - { - $ret .= substr($text, $pos, $spn); - $pos += $spn; - } - - if ($pos >= $len) - { - return $ret; - } - - /** - * Capture the UTF char - */ - $utf_len = $utf_len_mask[$text[$pos] & "\xF0"]; - $utf_char = substr($text, $pos, $utf_len); - $pos += $utf_len; - - if (($utf_char >= UTF8_HANGUL_FIRST && $utf_char <= UTF8_HANGUL_LAST) - || ($utf_char >= UTF8_CJK_FIRST && $utf_char <= UTF8_CJK_LAST) - || ($utf_char >= UTF8_CJK_B_FIRST && $utf_char <= UTF8_CJK_B_LAST)) - { - /** - * All characters within these ranges are valid - * - * We separate them with a space in order to index each character - * individually - */ - $ret .= ' ' . $utf_char . ' '; - continue; - } - - if (isset($allow[$utf_char])) - { - /** - * The char is explicitly allowed - */ - $ret .= $utf_char; - continue; - } - - if (isset($conv[$utf_char])) - { - /** - * The char is mapped to something, maybe to itself actually - */ - $ret .= $conv[$utf_char]; - continue; - } - - /** - * The char isn't mapped, but did we load its conversion table? - * - * The search indexer table is split into blocks. The block number of - * each char is equal to its codepoint right-shifted for 11 bits. It - * means that out of the 11, 16 or 21 meaningful bits of a 2-, 3- or - * 4- byte sequence we only keep the leftmost 0, 5 or 10 bits. Thus, - * all UTF chars encoded in 2 bytes are in the same first block. - */ - if (isset($utf_char[2])) - { - if (isset($utf_char[3])) - { - /** - * 1111 0nnn 10nn nnnn 10nx xxxx 10xx xxxx - * 0000 0111 0011 1111 0010 0000 - */ - $idx = ((ord($utf_char[0]) & 0x07) << 7) | ((ord($utf_char[1]) & 0x3F) << 1) | ((ord($utf_char[2]) & 0x20) >> 5); - } - else - { - /** - * 1110 nnnn 10nx xxxx 10xx xxxx - * 0000 0111 0010 0000 - */ - $idx = ((ord($utf_char[0]) & 0x07) << 1) | ((ord($utf_char[1]) & 0x20) >> 5); - } - } - else - { - /** - * 110x xxxx 10xx xxxx - * 0000 0000 0000 0000 - */ - $idx = 0; - } - - /** - * Check if the required conv table has been loaded already - */ - if (!isset($conv_loaded[$idx])) - { - $conv_loaded[$idx] = 1; - $file = $phpbb_root_path . 'includes/utf/data/search_indexer_' . $idx . '.' . $phpEx; - - if (file_exists($file)) - { - $conv += include($file); - } - } - - if (isset($conv[$utf_char])) - { - $ret .= $conv[$utf_char]; - } - else - { - /** - * We add an entry to the conversion table so that we - * don't have to convert to codepoint and perform the checks - * that are above this block - */ - $conv[$utf_char] = ' '; - $ret .= ' '; - } - } - while (1); - - return $ret; - } - - /** - * Returns a list of options for the ACP to display - */ - public function acp() - { - global $user, $config; - - - /** - * if we need any options, copied from fulltext_native for now, will have to be adjusted or removed - */ - - $tpl = ' -
    -

    ' . $user->lang['YES_SEARCH_UPDATE_EXPLAIN'] . '
    -
    -
    -
    -

    ' . $user->lang['MIN_SEARCH_CHARS_EXPLAIN'] . '
    -
    -
    -
    -

    ' . $user->lang['MAX_SEARCH_CHARS_EXPLAIN'] . '
    -
    -
    -
    -

    ' . $user->lang['COMMON_WORD_THRESHOLD_EXPLAIN'] . '
    -
    %
    -
    - '; - - // These are fields required in the config table - return array( - 'tpl' => $tpl, - 'config' => array('fulltext_native_load_upd' => 'bool', 'fulltext_native_min_chars' => 'integer:0:255', 'fulltext_native_max_chars' => 'integer:0:255', 'fulltext_native_common_thres' => 'double:0:100') - ); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/search/index.htm b/phpBB/includes/search/index.htm deleted file mode 100644 index ee1f723a7d..0000000000 --- a/phpBB/includes/search/index.htm +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/phpBB/includes/search/search.php b/phpBB/includes/search/search.php deleted file mode 100755 index e13a59caed..0000000000 --- a/phpBB/includes/search/search.php +++ /dev/null @@ -1,317 +0,0 @@ -ignore_words)) - { - global $user, $phpEx; - - $words = array(); - - if (file_exists("{$user->lang_path}/search_ignore_words.$phpEx")) - { - // include the file containing ignore words - include("{$user->lang_path}/search_ignore_words.$phpEx"); - } - - $this->ignore_words = $words; - unset($words); - } - } - - /** - * Stores a list of synonyms that should be replaced in $this->match_synonym and $this->replace_synonym and caches them - */ - public function get_synonyms() - { - if (!sizeof($this->match_synonym)) - { - global $user, $phpEx; - - $synonyms = array(); - - if (file_exists("{$user->lang_path}/search_synonyms.$phpEx")) - { - // include the file containing synonyms - include("{$user->lang_path}/search_synonyms.$phpEx"); - } - - $this->match_synonym = array_keys($synonyms); - $this->replace_synonym = array_values($synonyms); - - unset($synonyms); - } - } - - /** - * Retrieves cached search results - * - * @param int &$result_count will contain the number of all results for the search (not only for the current page) - * @param array &$id_ary is filled with the ids belonging to the requested page that are stored in the cache - * - * @return int SEARCH_RESULT_NOT_IN_CACHE or SEARCH_RESULT_IN_CACHE or SEARCH_RESULT_INCOMPLETE - */ - protected function obtain_ids($search_key, &$result_count, &$id_ary, $start, $per_page, $sort_dir) - { - global $cache; - - if (!($stored_ids = $cache->get('_search_results_' . $search_key))) - { - // no search results cached for this search_key - return self::SEARCH_RESULT_NOT_IN_CACHE; - } - else - { - $result_count = $stored_ids[-1]; - $reverse_ids = ($stored_ids[-2] != $sort_dir) ? true : false; - $complete = true; - - // change the start to the actual end of the current request if the sort direction differs - // from the dirction in the cache and reverse the ids later - if ($reverse_ids) - { - $start = $result_count - $start - $per_page; - - // the user requested a page past the last index - if ($start < 0) - { - return self::SEARCH_RESULT_NOT_IN_CACHE; - } - } - - for ($i = $start, $n = $start + $per_page; ($i < $n) && ($i < $result_count); $i++) - { - if (!isset($stored_ids[$i])) - { - $complete = false; - } - else - { - $id_ary[] = $stored_ids[$i]; - } - } - unset($stored_ids); - - if ($reverse_ids) - { - $id_ary = array_reverse($id_ary); - } - - if (!$complete) - { - return self::SEARCH_RESULT_INCOMPLETE; - } - return self::SEARCH_RESULT_IN_CACHE; - } - } - - /** - * Caches post/topic ids - * - * @param array &$id_ary contains a list of post or topic ids that shall be cached, the first element - * must have the absolute index $start in the result set. - */ - protected function save_ids($search_key, $keywords, $author_ary, $result_count, &$id_ary, $start, $sort_dir) - { - global $cache, $config, $db, $user; - - $length = min(sizeof($id_ary), $config['search_block_size']); - - // nothing to cache so exit - if (!$length) - { - return; - } - - $store_ids = array_slice($id_ary, 0, $length); - - // create a new resultset if there is none for this search_key yet - // or add the ids to the existing resultset - if (!($store = $cache->get('_search_results_' . $search_key))) - { - // add the current keywords to the recent searches in the cache which are listed on the search page - if (!empty($keywords) || sizeof($author_ary)) - { - $sql = 'SELECT search_time - FROM ' . SEARCH_RESULTS_TABLE . ' - WHERE search_key = \'' . $db->sql_escape($search_key) . '\''; - $result = $db->sql_query($sql); - - if (!$db->sql_fetchrow($result)) - { - $sql_ary = array( - 'search_key' => $search_key, - 'search_time' => time(), - 'search_keywords' => $keywords, - 'search_authors' => ' ' . implode(' ', $author_ary) . ' ' - ); - - $sql = 'INSERT INTO ' . SEARCH_RESULTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - $db->sql_query($sql); - } - $db->sql_freeresult($result); - } - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_last_search = ' . time() . ' - WHERE user_id = ' . $user->data['user_id']; - $db->sql_query($sql); - - $store = array(-1 => $result_count, -2 => $sort_dir); - $id_range = range($start, $start + $length - 1); - } - else - { - // we use one set of results for both sort directions so we have to calculate the indizes - // for the reversed array and we also have to reverse the ids themselves - if ($store[-2] != $sort_dir) - { - $store_ids = array_reverse($store_ids); - $id_range = range($store[-1] - $start - $length, $store[-1] - $start - 1); - } - else - { - $id_range = range($start, $start + $length - 1); - } - } - - $store_ids = array_combine($id_range, $store_ids); - - // append the ids - if (is_array($store_ids)) - { - $store += $store_ids; - - // if the cache is too big - if (sizeof($store) - 2 > 20 * $config['search_block_size']) - { - // remove everything in front of two blocks in front of the current start index - for ($i = 0, $n = $id_range[0] - 2 * $config['search_block_size']; $i < $n; $i++) - { - if (isset($store[$i])) - { - unset($store[$i]); - } - } - - // remove everything after two blocks after the current stop index - end($id_range); - for ($i = $store[-1] - 1, $n = current($id_range) + 2 * $config['search_block_size']; $i > $n; $i--) - { - if (isset($store[$i])) - { - unset($store[$i]); - } - } - } - $cache->put('_search_results_' . $search_key, $store, $config['search_store_results']); - - $sql = 'UPDATE ' . SEARCH_RESULTS_TABLE . ' - SET search_time = ' . time() . ' - WHERE search_key = \'' . $db->sql_escape($search_key) . '\''; - $db->sql_query($sql); - } - - unset($store); - unset($store_ids); - unset($id_range); - } - - /** - * Removes old entries from the search results table and removes searches with keywords that contain a word in $words. - */ - public function destroy_cache($words, $authors = false) - { - global $db, $cache, $config; - - // clear all searches that searched for the specified words - if (sizeof($words)) - { - $sql_where = ''; - foreach ($words as $word) - { - $sql_where .= " OR search_keywords " . $db->sql_like_expression($db->any_char . $word . $db->any_char); - } - - $sql = 'SELECT search_key - FROM ' . SEARCH_RESULTS_TABLE . " - WHERE search_keywords LIKE '%*%' $sql_where"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $cache->destroy('_search_results_' . $row['search_key']); - } - $db->sql_freeresult($result); - } - - // clear all searches that searched for the specified authors - if (is_array($authors) && sizeof($authors)) - { - $sql_where = ''; - foreach ($authors as $author) - { - $sql_where .= (($sql_where) ? ' OR ' : '') . 'search_authors LIKE \'% ' . (int) $author . ' %\''; - } - - $sql = 'SELECT search_key - FROM ' . SEARCH_RESULTS_TABLE . " - WHERE $sql_where"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $cache->destroy('_search_results_' . $row['search_key']); - } - $db->sql_freeresult($result); - } - - $sql = 'DELETE - FROM ' . SEARCH_RESULTS_TABLE . ' - WHERE search_time < ' . (time() - $config['search_store_results']); - $db->sql_query($sql); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php deleted file mode 100644 index d0c8c3abe6..0000000000 --- a/phpBB/includes/session.php +++ /dev/null @@ -1,1948 +0,0 @@ - %22, ' => %27, < -> %3C, > -> %3E - $find = array('"', "'", '<', '>'); - $replace = array('%22', '%27', '%3C', '%3E'); - - foreach ($args as $key => $argument) - { - if (strpos($argument, 'sid=') === 0 || strpos($argument, '_f_=') === 0) - { - continue; - } - - $use_args[str_replace($find, $replace, $key)] = str_replace($find, $replace, $argument); - } - unset($args); - - // The following examples given are for an request uri of {path to the phpbb directory}/adm/index.php?i=10&b=2 - - // The current query string - $query_string = trim(implode('&', $use_args)); - - // basenamed page name (for example: index.php) - $page_name = basename($script_name); - $page_name = urlencode(htmlspecialchars($page_name)); - - // current directory within the phpBB root (for example: adm) - $root_dirs = explode('/', str_replace('\\', '/', phpbb_realpath($root_path))); - $page_dirs = explode('/', str_replace('\\', '/', phpbb_realpath('./'))); - $intersection = array_intersect_assoc($root_dirs, $page_dirs); - - $root_dirs = array_diff_assoc($root_dirs, $intersection); - $page_dirs = array_diff_assoc($page_dirs, $intersection); - - $page_dir = str_repeat('../', sizeof($root_dirs)) . implode('/', $page_dirs); - - if ($page_dir && substr($page_dir, -1, 1) == '/') - { - $page_dir = substr($page_dir, 0, -1); - } - - // Current page from phpBB root (for example: adm/index.php?i=10&b=2) - $page = (($page_dir) ? $page_dir . '/' : '') . $page_name . (($query_string) ? "?$query_string" : ''); - - // The script path from the webroot to the current directory (for example: /phpBB3/adm/) : always prefixed with / and ends in / - $script_path = trim(str_replace('\\', '/', dirname($script_name))); - - // The script path from the webroot to the phpBB root (for example: /phpBB3/) - $script_dirs = explode('/', $script_path); - array_splice($script_dirs, -sizeof($page_dirs)); - $root_script_path = implode('/', $script_dirs) . (sizeof($root_dirs) ? '/' . implode('/', $root_dirs) : ''); - - // We are on the base level (phpBB root == webroot), lets adjust the variables a bit... - if (!$root_script_path) - { - $root_script_path = ($page_dir) ? str_replace($page_dir, '', $script_path) : $script_path; - } - - $script_path .= (substr($script_path, -1, 1) == '/') ? '' : '/'; - $root_script_path .= (substr($root_script_path, -1, 1) == '/') ? '' : '/'; - - $page_array += array( - 'page_name' => $page_name, - 'page_dir' => $page_dir, - - 'query_string' => $query_string, - 'script_path' => str_replace(' ', '%20', htmlspecialchars($script_path)), - 'root_script_path' => str_replace(' ', '%20', htmlspecialchars($root_script_path)), - - 'page' => $page - ); - - return $page_array; - } - - /** - * Start session management - * - * This is where all session activity begins. We gather various pieces of - * information from the client and server. We test to see if a session already - * exists. If it does, fine and dandy. If it doesn't we'll go on to create a - * new one ... pretty logical heh? We also examine the system load (if we're - * running on a system which makes such information readily available) and - * halt if it's above an admin definable limit. - * - * @param bool $update_session_page if true the session page gets updated. - * This can be set to circumvent certain scripts to update the users last visited page. - */ - function session_begin($update_session_page = true) - { - global $phpEx, $SID, $_SID, $_EXTRA_URL, $db, $config, $phpbb_root_path; - - // Give us some basic information - $this->time_now = time(); - $this->cookie_data = array('u' => 0, 'k' => ''); - $this->update_session_page = $update_session_page; - $this->browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : ''; - $this->forwarded_for = (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) ? (string) $_SERVER['HTTP_X_FORWARDED_FOR'] : ''; - $this->host = (!empty($_SERVER['HTTP_HOST'])) ? (string) strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME')); - $this->page = $this->extract_current_page($phpbb_root_path); - - // if the forwarded for header shall be checked we have to validate its contents - if ($config['forwarded_for_check']) - { - $this->forwarded_for = preg_replace('#, +#', ', ', $this->forwarded_for); - - // split the list of IPs - $ips = explode(', ', $this->forwarded_for); - foreach ($ips as $ip) - { - // check IPv4 first, the IPv6 is hopefully only going to be used very seldomly - if (!empty($ip) && !preg_match(get_preg_expression('ipv4'), $ip) && !preg_match(get_preg_expression('ipv6'), $ip)) - { - // contains invalid data, don't use the forwarded for header - $this->forwarded_for = ''; - break; - } - } - } - else - { - $this->forwarded_for = ''; - } - - // Add forum to the page for tracking online users - also adding a "x" to the end to properly identify the number - $this->page['page'] .= (isset($_REQUEST['f'])) ? ((strpos($this->page['page'], '?') !== false) ? '&' : '?') . '_f_=' . (int) $_REQUEST['f'] . 'x' : ''; - - if (isset($_COOKIE[$config['cookie_name'] . '_sid']) || isset($_COOKIE[$config['cookie_name'] . '_u'])) - { - $this->cookie_data['u'] = request_var($config['cookie_name'] . '_u', 0, false, true); - $this->cookie_data['k'] = request_var($config['cookie_name'] . '_k', '', false, true); - $this->session_id = request_var($config['cookie_name'] . '_sid', '', false, true); - - $SID = (defined('NEED_SID')) ? '?sid=' . $this->session_id : '?sid='; - $_SID = (defined('NEED_SID')) ? $this->session_id : ''; - - if (empty($this->session_id)) - { - $this->session_id = $_SID = request_var('sid', ''); - $SID = '?sid=' . $this->session_id; - $this->cookie_data = array('u' => 0, 'k' => ''); - } - } - else - { - $this->session_id = $_SID = request_var('sid', ''); - $SID = '?sid=' . $this->session_id; - } - - $_EXTRA_URL = array(); - - // Why no forwarded_for et al? Well, too easily spoofed. With the results of my recent requests - // it's pretty clear that in the majority of cases you'll at least be left with a proxy/cache ip. - $this->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? htmlspecialchars($_SERVER['REMOTE_ADDR']) : ''; - $this->load = false; - - // Load limit check (if applicable) - if ($config['limit_load'] || $config['limit_search_load']) - { - if ($load = @file_get_contents('/proc/loadavg')) - { - $this->load = array_slice(explode(' ', $load), 0, 1); - $this->load = floatval($this->load[0]); - } - else - { - set_config('limit_load', '0'); - set_config('limit_search_load', '0'); - } - } - - // Is session_id is set or session_id is set and matches the url param if required - if (!empty($this->session_id) && (!defined('NEED_SID') || (isset($_GET['sid']) && $this->session_id === $_GET['sid']))) - { - $sql = 'SELECT u.*, s.* - FROM ' . SESSIONS_TABLE . ' s, ' . USERS_TABLE . " u - WHERE s.session_id = '" . $db->sql_escape($this->session_id) . "' - AND u.user_id = s.session_user_id"; - $result = $db->sql_query($sql); - $this->data = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // Did the session exist in the DB? - if (isset($this->data['user_id'])) - { - // Validate IP length according to admin ... enforces an IP - // check on bots if admin requires this -// $quadcheck = ($config['ip_check_bot'] && $this->data['user_type'] & USER_BOT) ? 4 : $config['ip_check']; - - if (strpos($this->ip, ':') !== false && strpos($this->data['session_ip'], ':') !== false) - { - $s_ip = short_ipv6($this->data['session_ip'], $config['ip_check']); - $u_ip = short_ipv6($this->ip, $config['ip_check']); - } - else - { - $s_ip = implode('.', array_slice(explode('.', $this->data['session_ip']), 0, $config['ip_check'])); - $u_ip = implode('.', array_slice(explode('.', $this->ip), 0, $config['ip_check'])); - } - - $s_browser = ($config['browser_check']) ? trim(strtolower(substr($this->data['session_browser'], 0, 149))) : ''; - $u_browser = ($config['browser_check']) ? trim(strtolower(substr($this->browser, 0, 149))) : ''; - - $s_forwarded_for = ($config['forwarded_for_check']) ? substr($this->data['session_forwarded_for'], 0, 254) : ''; - $u_forwarded_for = ($config['forwarded_for_check']) ? substr($this->forwarded_for, 0, 254) : ''; - - if ($u_ip === $s_ip && $s_browser === $u_browser && $s_forwarded_for === $u_forwarded_for) - { - $session_expired = false; - - // Check whether the session is still valid if we have one - $method = basename(trim($config['auth_method'])); - include_once($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx); - - $method = 'validate_session_' . $method; - if (function_exists($method)) - { - if (!$method($this->data)) - { - $session_expired = true; - } - } - - if (!$session_expired) - { - // Check the session length timeframe if autologin is not enabled. - // Else check the autologin length... and also removing those having autologin enabled but no longer allowed board-wide. - if (!$this->data['session_autologin']) - { - if ($this->data['session_time'] < $this->time_now - ($config['session_length'] + 60)) - { - $session_expired = true; - } - } - else if (!$config['allow_autologin'] || ($config['max_autologin_time'] && $this->data['session_time'] < $this->time_now - (86400 * (int) $config['max_autologin_time']) + 60)) - { - $session_expired = true; - } - } - - if (!$session_expired) - { - // Only update session DB a minute or so after last update or if page changes - if ($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page'])) - { - $sql_ary = array('session_time' => $this->time_now); - - if ($this->update_session_page) - { - $sql_ary['session_page'] = substr($this->page['page'], 0, 199); - } - - $sql = 'UPDATE ' . SESSIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " - WHERE session_id = '" . $db->sql_escape($this->session_id) . "'"; - $db->sql_query($sql); - } - - $this->data['is_registered'] = ($this->data['user_id'] != ANONYMOUS && ($this->data['user_type'] == USER_NORMAL || $this->data['user_type'] == USER_FOUNDER)) ? true : false; - $this->data['is_bot'] = (!$this->data['is_registered'] && $this->data['user_id'] != ANONYMOUS) ? true : false; - $this->data['user_lang'] = basename($this->data['user_lang']); - - return true; - } - } - else - { - // Added logging temporarly to help debug bugs... - if (defined('DEBUG_EXTRA') && $this->data['user_id'] != ANONYMOUS) - { - add_log('critical', 'LOG_IP_BROWSER_FORWARDED_CHECK', $u_ip, $s_ip, $u_browser, $s_browser, htmlspecialchars($u_forwarded_for), htmlspecialchars($s_forwarded_for)); - } - } - } - } - - // If we reach here then no (valid) session exists. So we'll create a new one - return $this->session_create(); - } - - /** - * Create a new session - * - * If upon trying to start a session we discover there is nothing existing we - * jump here. Additionally this method is called directly during login to regenerate - * the session for the specific user. In this method we carry out a number of tasks; - * garbage collection, (search)bot checking, banned user comparison. Basically - * though this method will result in a new session for a specific user. - */ - function session_create($user_id = false, $set_admin = false, $persist_login = false, $viewonline = true) - { - global $SID, $_SID, $db, $config, $cache, $phpbb_root_path, $phpEx; - - $this->data = array(); - - /* Garbage collection ... remove old sessions updating user information - // if necessary. It means (potentially) 11 queries but only infrequently - if ($this->time_now > $config['session_last_gc'] + $config['session_gc']) - { - $this->session_gc(); - }*/ - - // Do we allow autologin on this board? No? Then override anything - // that may be requested here - if (!$config['allow_autologin']) - { - $this->cookie_data['k'] = $persist_login = false; - } - - /** - * Here we do a bot check, oh er saucy! No, not that kind of bot - * check. We loop through the list of bots defined by the admin and - * see if we have any useragent and/or IP matches. If we do, this is a - * bot, act accordingly - */ - $bot = false; - $active_bots = cache::obtain_bots(); - - foreach ($active_bots as $row) - { - if ($row['bot_agent'] && preg_match('#' . str_replace('\*', '.*?', preg_quote($row['bot_agent'], '#')) . '#i', $this->browser)) - { - $bot = $row['user_id']; - } - - // If ip is supplied, we will make sure the ip is matching too... - if ($row['bot_ip'] && ($bot || !$row['bot_agent'])) - { - // Set bot to false, then we only have to set it to true if it is matching - $bot = false; - - foreach (explode(',', $row['bot_ip']) as $bot_ip) - { - if (strpos($this->ip, $bot_ip) === 0) - { - $bot = (int) $row['user_id']; - break; - } - } - } - - if ($bot) - { - break; - } - } - - $method = basename(trim($config['auth_method'])); - include_once($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx); - - $method = 'autologin_' . $method; - if (function_exists($method)) - { - $this->data = $method(); - - if (sizeof($this->data)) - { - $this->cookie_data['k'] = ''; - $this->cookie_data['u'] = $this->data['user_id']; - } - } - - // If we're presented with an autologin key we'll join against it. - // Else if we've been passed a user_id we'll grab data based on that - if (isset($this->cookie_data['k']) && $this->cookie_data['k'] && $this->cookie_data['u'] && !sizeof($this->data)) - { - $sql = 'SELECT u.* - FROM ' . USERS_TABLE . ' u, ' . SESSIONS_KEYS_TABLE . ' k - WHERE u.user_id = ' . (int) $this->cookie_data['u'] . ' - AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ") - AND k.user_id = u.user_id - AND k.key_id = '" . $db->sql_escape(md5($this->cookie_data['k'])) . "'"; - $result = $db->sql_query($sql); - $this->data = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - $bot = false; - } - else if ($user_id !== false && !sizeof($this->data)) - { - $this->cookie_data['k'] = ''; - $this->cookie_data['u'] = $user_id; - - $sql = 'SELECT * - FROM ' . USERS_TABLE . ' - WHERE user_id = ' . (int) $this->cookie_data['u'] . ' - AND user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')'; - $result = $db->sql_query($sql); - $this->data = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - $bot = false; - } - - // If no data was returned one or more of the following occurred: - // Key didn't match one in the DB - // User does not exist - // User is inactive - // User is bot - if (!sizeof($this->data) || !is_array($this->data)) - { - $this->cookie_data['k'] = ''; - $this->cookie_data['u'] = ($bot) ? $bot : ANONYMOUS; - - if (!$bot) - { - $sql = 'SELECT * - FROM ' . USERS_TABLE . ' - WHERE user_id = ' . (int) $this->cookie_data['u']; - } - else - { - // We give bots always the same session if it is not yet expired. - $sql = 'SELECT u.*, s.* - FROM ' . USERS_TABLE . ' u - LEFT JOIN ' . SESSIONS_TABLE . ' s ON (s.session_user_id = u.user_id) - WHERE u.user_id = ' . (int) $bot; - } - - $result = $db->sql_query($sql); - $this->data = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - } - - if ($this->data['user_id'] != ANONYMOUS && !$bot) - { - $this->data['session_last_visit'] = (isset($this->data['session_time']) && $this->data['session_time']) ? $this->data['session_time'] : (($this->data['user_lastvisit']) ? $this->data['user_lastvisit'] : time()); - } - else - { - $this->data['session_last_visit'] = $this->time_now; - } - - // Force user id to be integer... - $this->data['user_id'] = (int) $this->data['user_id']; - - // At this stage we should have a filled data array, defined cookie u and k data. - // data array should contain recent session info if we're a real user and a recent - // session exists in which case session_id will also be set - - // Is user banned? Are they excluded? Won't return on ban, exists within method - if ($this->data['user_type'] != USER_FOUNDER) - { - if (!$config['forwarded_for_check']) - { - $this->check_ban($this->data['user_id'], $this->ip); - } - else - { - $ips = explode(', ', $this->forwarded_for); - $ips[] = $this->ip; - $this->check_ban($this->data['user_id'], $ips); - } - } - - $this->data['is_registered'] = (!$bot && $this->data['user_id'] != ANONYMOUS && ($this->data['user_type'] == USER_NORMAL || $this->data['user_type'] == USER_FOUNDER)) ? true : false; - $this->data['is_bot'] = ($bot) ? true : false; - - // If our friend is a bot, we re-assign a previously assigned session - if ($this->data['is_bot'] && $bot == $this->data['user_id'] && $this->data['session_id']) - { - // Only assign the current session if the ip, browser and forwarded_for match... - if (strpos($this->ip, ':') !== false && strpos($this->data['session_ip'], ':') !== false) - { - $s_ip = short_ipv6($this->data['session_ip'], $config['ip_check']); - $u_ip = short_ipv6($this->ip, $config['ip_check']); - } - else - { - $s_ip = implode('.', array_slice(explode('.', $this->data['session_ip']), 0, $config['ip_check'])); - $u_ip = implode('.', array_slice(explode('.', $this->ip), 0, $config['ip_check'])); - } - - $s_browser = ($config['browser_check']) ? trim(strtolower(substr($this->data['session_browser'], 0, 149))) : ''; - $u_browser = ($config['browser_check']) ? trim(strtolower(substr($this->browser, 0, 149))) : ''; - - $s_forwarded_for = ($config['forwarded_for_check']) ? substr($this->data['session_forwarded_for'], 0, 254) : ''; - $u_forwarded_for = ($config['forwarded_for_check']) ? substr($this->forwarded_for, 0, 254) : ''; - - if ($u_ip === $s_ip && $s_browser === $u_browser && $s_forwarded_for === $u_forwarded_for) - { - $this->session_id = $this->data['session_id']; - - // Only update session DB a minute or so after last update or if page changes - if ($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page'])) - { - $this->data['session_time'] = $this->data['session_last_visit'] = $this->time_now; - - $sql_ary = array('session_time' => $this->time_now, 'session_last_visit' => $this->time_now, 'session_admin' => 0); - - if ($this->update_session_page) - { - $sql_ary['session_page'] = substr($this->page['page'], 0, 199); - } - - $sql = 'UPDATE ' . SESSIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " - WHERE session_id = '" . $db->sql_escape($this->session_id) . "'"; - $db->sql_query($sql); - - // Update the last visit time - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_lastvisit = ' . (int) $this->data['session_time'] . ' - WHERE user_id = ' . (int) $this->data['user_id']; - $db->sql_query($sql); - } - - $SID = '?sid='; - $_SID = ''; - return true; - } - else - { - // If the ip and browser does not match make sure we only have one bot assigned to one session - $db->sql_query('DELETE FROM ' . SESSIONS_TABLE . ' WHERE session_user_id = ' . $this->data['user_id']); - } - } - - $session_autologin = (($this->cookie_data['k'] || $persist_login) && $this->data['is_registered']) ? true : false; - $set_admin = ($set_admin && $this->data['is_registered']) ? true : false; - - // Create or update the session - $sql_ary = array( - 'session_user_id' => (int) $this->data['user_id'], - 'session_start' => (int) $this->time_now, - 'session_last_visit' => (int) $this->data['session_last_visit'], - 'session_time' => (int) $this->time_now, - 'session_browser' => (string) trim(substr($this->browser, 0, 149)), - 'session_forwarded_for' => (string) $this->forwarded_for, - 'session_ip' => (string) $this->ip, - 'session_autologin' => ($session_autologin) ? 1 : 0, - 'session_admin' => ($set_admin) ? 1 : 0, - 'session_viewonline' => ($viewonline) ? 1 : 0, - ); - - if ($this->update_session_page) - { - $sql_ary['session_page'] = (string) substr($this->page['page'], 0, 199); - } - - $db->sql_return_on_error(true); - - $sql = 'DELETE - FROM ' . SESSIONS_TABLE . ' - WHERE session_id = \'' . $db->sql_escape($this->session_id) . '\' - AND session_user_id = ' . ANONYMOUS; - - if (!defined('IN_ERROR_HANDLER') && (!$this->session_id || !$db->sql_query($sql) || !$db->sql_affectedrows())) - { - // Limit new sessions in 1 minute period (if required) - if (empty($this->data['session_time']) && $config['active_sessions']) - { - $sql = 'SELECT COUNT(session_id) AS sessions - FROM ' . SESSIONS_TABLE . ' - WHERE session_time >= ' . ($this->time_now - 60); - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ((int) $row['sessions'] > (int) $config['active_sessions']) - { - header('HTTP/1.1 503 Service Unavailable'); - trigger_error('BOARD_UNAVAILABLE'); - } - } - } - - $this->session_id = $this->data['session_id'] = md5(unique_id()); - - $sql_ary['session_id'] = (string) $this->session_id; - $sql_ary['session_page'] = (string) substr($this->page['page'], 0, 199); - - $sql = 'INSERT INTO ' . SESSIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - $db->sql_query($sql); - - $db->sql_return_on_error(false); - - // Regenerate autologin/persistent login key - if ($session_autologin) - { - $this->set_login_key(); - } - - // refresh data - $SID = '?sid=' . $this->session_id; - $_SID = $this->session_id; - $this->data = array_merge($this->data, $sql_ary); - - if (!$bot) - { - $cookie_expire = $this->time_now + (($config['max_autologin_time']) ? 86400 * (int) $config['max_autologin_time'] : 31536000); - - $this->set_cookie('u', $this->cookie_data['u'], $cookie_expire); - $this->set_cookie('k', $this->cookie_data['k'], $cookie_expire); - $this->set_cookie('sid', $this->session_id, $cookie_expire); - - unset($cookie_expire); - - $sql = 'SELECT COUNT(session_id) AS sessions - FROM ' . SESSIONS_TABLE . ' - WHERE session_user_id = ' . (int) $this->data['user_id'] . ' - AND session_time >= ' . (int) ($this->time_now - (max($config['session_length'], $config['form_token_lifetime']))); - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ((int) $row['sessions'] <= 1 || empty($this->data['user_form_salt'])) - { - $this->data['user_form_salt'] = unique_id(); - // Update the form key - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_form_salt = \'' . $db->sql_escape($this->data['user_form_salt']) . '\' - WHERE user_id = ' . (int) $this->data['user_id']; - $db->sql_query($sql); - } - } - else - { - $this->data['session_time'] = $this->data['session_last_visit'] = $this->time_now; - - // Update the last visit time - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_lastvisit = ' . (int) $this->data['session_time'] . ' - WHERE user_id = ' . (int) $this->data['user_id']; - $db->sql_query($sql); - - $SID = '?sid='; - $_SID = ''; - } - - return true; - } - - /** - * Kills a session - * - * This method does what it says on the tin. It will delete a pre-existing session. - * It resets cookie information (destroying any autologin key within that cookie data) - * and update the users information from the relevant session data. It will then - * grab guest user information. - */ - function session_kill($new_session = true) - { - global $SID, $_SID, $db, $config, $phpbb_root_path, $phpEx; - - $sql = 'DELETE FROM ' . SESSIONS_TABLE . " - WHERE session_id = '" . $db->sql_escape($this->session_id) . "' - AND session_user_id = " . (int) $this->data['user_id']; - $db->sql_query($sql); - - // Allow connecting logout with external auth method logout - $method = basename(trim($config['auth_method'])); - include_once($phpbb_root_path . 'includes/auth/auth_' . $method . '.' . $phpEx); - - $method = 'logout_' . $method; - if (function_exists($method)) - { - $method($this->data, $new_session); - } - - if ($this->data['user_id'] != ANONYMOUS) - { - // Delete existing session, update last visit info first! - if (!isset($this->data['session_time'])) - { - $this->data['session_time'] = time(); - } - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_lastvisit = ' . (int) $this->data['session_time'] . ' - WHERE user_id = ' . (int) $this->data['user_id']; - $db->sql_query($sql); - - if ($this->cookie_data['k']) - { - $sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . ' - WHERE user_id = ' . (int) $this->data['user_id'] . " - AND key_id = '" . $db->sql_escape(md5($this->cookie_data['k'])) . "'"; - $db->sql_query($sql); - } - - // Reset the data array - $this->data = array(); - - $sql = 'SELECT * - FROM ' . USERS_TABLE . ' - WHERE user_id = ' . ANONYMOUS; - $result = $db->sql_query($sql); - $this->data = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - } - - $cookie_expire = $this->time_now - 31536000; - $this->set_cookie('u', '', $cookie_expire); - $this->set_cookie('k', '', $cookie_expire); - $this->set_cookie('sid', '', $cookie_expire); - unset($cookie_expire); - - $SID = '?sid='; - $this->session_id = $_SID = ''; - - // To make sure a valid session is created we create one for the anonymous user - if ($new_session) - { - $this->session_create(ANONYMOUS); - } - - return true; - } - - /** - * Session garbage collection - * - * This looks a lot more complex than it really is. Effectively we are - * deleting any sessions older than an admin definable limit. Due to the - * way in which we maintain session data we have to ensure we update user - * data before those sessions are destroyed. In addition this method - * removes autologin key information that is older than an admin defined - * limit. - */ - function session_gc() - { - global $db, $config; - - $batch_size = 10; - - if (!$this->time_now) - { - $this->time_now = time(); - } - - // Firstly, delete guest sessions - $sql = 'DELETE FROM ' . SESSIONS_TABLE . ' - WHERE session_user_id = ' . ANONYMOUS . ' - AND session_time < ' . (int) ($this->time_now - $config['session_length']); - $db->sql_query($sql); - - // Get expired sessions, only most recent for each user - $sql = 'SELECT session_user_id, session_page, MAX(session_time) AS recent_time - FROM ' . SESSIONS_TABLE . ' - WHERE session_time < ' . ($this->time_now - $config['session_length']) . ' - GROUP BY session_user_id, session_page'; - $result = $db->sql_query_limit($sql, $batch_size); - - $del_user_id = array(); - $del_sessions = 0; - - while ($row = $db->sql_fetchrow($result)) - { - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_lastvisit = ' . (int) $row['recent_time'] . ", user_lastpage = '" . $db->sql_escape($row['session_page']) . "' - WHERE user_id = " . (int) $row['session_user_id']; - $db->sql_query($sql); - - $del_user_id[] = (int) $row['session_user_id']; - $del_sessions++; - } - $db->sql_freeresult($result); - - if (sizeof($del_user_id)) - { - // Delete expired sessions - $sql = 'DELETE FROM ' . SESSIONS_TABLE . ' - WHERE ' . $db->sql_in_set('session_user_id', $del_user_id) . ' - AND session_time < ' . ($this->time_now - $config['session_length']); - $db->sql_query($sql); - } - - if ($del_sessions < $batch_size) - { - // Less than 10 users, update gc timer ... else we want gc - // called again to delete other sessions - set_config('session_last_gc', $this->time_now, true); - - if ($config['max_autologin_time']) - { - $sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . ' - WHERE last_login < ' . (time() - (86400 * (int) $config['max_autologin_time'])); - $db->sql_query($sql); - } - $this->confirm_gc(); - } - - return; - } - - function confirm_gc($type = 0) - { - global $db, $config; - - $sql = 'SELECT DISTINCT c.session_id - FROM ' . CONFIRM_TABLE . ' c - LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id) - WHERE s.session_id IS NULL' . - ((empty($type)) ? '' : ' AND c.confirm_type = ' . (int) $type); - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - $sql_in = array(); - do - { - $sql_in[] = (string) $row['session_id']; - } - while ($row = $db->sql_fetchrow($result)); - - if (sizeof($sql_in)) - { - $sql = 'DELETE FROM ' . CONFIRM_TABLE . ' - WHERE ' . $db->sql_in_set('session_id', $sql_in); - $db->sql_query($sql); - } - } - $db->sql_freeresult($result); - } - - - /** - * Sets a cookie - * - * Sets a cookie of the given name with the specified data for the given length of time. If no time is specified, a session cookie will be set. - * - * @param string $name Name of the cookie, will be automatically prefixed with the phpBB cookie name. track becomes [cookie_name]_track then. - * @param string $cookiedata The data to hold within the cookie - * @param int $cookietime The expiration time as UNIX timestamp. If 0 is provided, a session cookie is set. - */ - function set_cookie($name, $cookiedata, $cookietime) - { - global $config; - - $name_data = rawurlencode($config['cookie_name'] . '_' . $name) . '=' . rawurlencode($cookiedata); - $expire = gmdate('D, d-M-Y H:i:s \\G\\M\\T', $cookietime); - $domain = (!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain']; - - header('Set-Cookie: ' . $name_data . (($cookietime) ? '; expires=' . $expire : '') . '; path=' . $config['cookie_path'] . $domain . ((!$config['cookie_secure']) ? '' : '; secure') . '; HttpOnly', false); - } - - /** - * Check for banned user - * - * Checks whether the supplied user is banned by id, ip or email. If no parameters - * are passed to the method pre-existing session data is used. If $return is false - * this routine does not return on finding a banned user, it outputs a relevant - * message and stops execution. - * - * @param string|array $user_ips Can contain a string with one IP or an array of multiple IPs - */ - function check_ban($user_id = false, $user_ips = false, $user_email = false, $return = false) - { - global $config, $db; - - if (defined('IN_CHECK_BAN')) - { - return; - } - - $banned = false; - $cache_ttl = 3600; - $where_sql = array(); - - $sql = 'SELECT ban_ip, ban_userid, ban_email, ban_exclude, ban_give_reason, ban_end - FROM ' . BANLIST_TABLE . ' - WHERE '; - - // Determine which entries to check, only return those - if ($user_email === false) - { - $where_sql[] = "ban_email = ''"; - } - - if ($user_ips === false) - { - $where_sql[] = "(ban_ip = '' OR ban_exclude = 1)"; - } - - if ($user_id === false) - { - $where_sql[] = '(ban_userid = 0 OR ban_exclude = 1)'; - } - else - { - $cache_ttl = ($user_id == ANONYMOUS) ? 3600 : 0; - $_sql = '(ban_userid = ' . $user_id; - - if ($user_email !== false) - { - $_sql .= " OR ban_email <> ''"; - } - - if ($user_ips !== false) - { - $_sql .= " OR ban_ip <> ''"; - } - - $_sql .= ')'; - - $where_sql[] = $_sql; - } - - $sql .= (sizeof($where_sql)) ? implode(' AND ', $where_sql) : ''; - $result = $db->sql_query($sql, $cache_ttl); - - $ban_triggered_by = 'user'; - while ($row = $db->sql_fetchrow($result)) - { - if ($row['ban_end'] && $row['ban_end'] < time()) - { - continue; - } - - $ip_banned = false; - if (!empty($row['ban_ip'])) - { - if (!is_array($user_ips)) - { - $ip_banned = preg_match('#^' . str_replace('\*', '.*?', preg_quote($row['ban_ip'], '#')) . '$#i', $user_ips); - } - else - { - foreach ($user_ips as $user_ip) - { - if (preg_match('#^' . str_replace('\*', '.*?', preg_quote($row['ban_ip'], '#')) . '$#i', $user_ip)) - { - $ip_banned = true; - break; - } - } - } - } - - if ((!empty($row['ban_userid']) && intval($row['ban_userid']) == $user_id) || - $ip_banned || - (!empty($row['ban_email']) && preg_match('#^' . str_replace('\*', '.*?', preg_quote($row['ban_email'], '#')) . '$#i', $user_email))) - { - if (!empty($row['ban_exclude'])) - { - $banned = false; - break; - } - else - { - $banned = true; - $ban_row = $row; - - if (!empty($row['ban_userid']) && intval($row['ban_userid']) == $user_id) - { - $ban_triggered_by = 'user'; - } - else if ($ip_banned) - { - $ban_triggered_by = 'ip'; - } - else - { - $ban_triggered_by = 'email'; - } - - // Don't break. Check if there is an exclude rule for this user - } - } - } - $db->sql_freeresult($result); - - if ($banned && !$return) - { - global $template; - - // If the session is empty we need to create a valid one... - if (empty($this->session_id)) - { - // This seems to be no longer needed? - #14971 -// $this->session_create(ANONYMOUS); - } - - // Initiate environment ... since it won't be set at this stage - $this->setup(); - - // Logout the user, banned users are unable to use the normal 'logout' link - if ($this->data['user_id'] != ANONYMOUS) - { - $this->session_kill(); - } - - // We show a login box here to allow founders accessing the board if banned by IP - if (defined('IN_LOGIN') && $this->data['user_id'] == ANONYMOUS) - { - global $phpEx; - - $this->setup('ucp'); - $this->data['is_registered'] = $this->data['is_bot'] = false; - - // Set as a precaution to allow login_box() handling this case correctly as well as this function not being executed again. - define('IN_CHECK_BAN', 1); - - login_box("index.$phpEx"); - - // The false here is needed, else the user is able to circumvent the ban. - $this->session_kill(false); - } - - // Ok, we catch the case of an empty session id for the anonymous user... - // This can happen if the user is logging in, banned by username and the login_box() being called "again". - if (empty($this->session_id) && defined('IN_CHECK_BAN')) - { - $this->session_create(ANONYMOUS); - } - - - // Determine which message to output - $till_date = ($ban_row['ban_end']) ? $this->format_date($ban_row['ban_end']) : ''; - $message = ($ban_row['ban_end']) ? 'BOARD_BAN_TIME' : 'BOARD_BAN_PERM'; - - $message = sprintf($this->lang[$message], $till_date, '', ''); - $message .= ($ban_row['ban_give_reason']) ? '

    ' . sprintf($this->lang['BOARD_BAN_REASON'], $ban_row['ban_give_reason']) : ''; - $message .= '

    ' . $this->lang['BAN_TRIGGERED_BY_' . strtoupper($ban_triggered_by)] . ''; - - // To circumvent session_begin returning a valid value and the check_ban() not called on second page view, we kill the session again - $this->session_kill(false); - - trigger_error($message); - } - - return ($banned) ? true : false; - } - - /** - * Check if ip is blacklisted - * This should be called only where absolutly necessary - * - * Only IPv4 (rbldns does not support AAAA records/IPv6 lookups) - * - * @author satmd (from the php manual) - * @param string $mode register/post - spamcop for example is ommitted for posting - * @return false if ip is not blacklisted, else an array([checked server], [lookup]) - */ - function check_dnsbl($mode, $ip = false) - { - if ($ip === false) - { - $ip = $this->ip; - } - - $dnsbl_check = array( - 'list.dsbl.org' => 'http://dsbl.org/listing?', - 'sbl-xbl.spamhaus.org' => 'http://www.spamhaus.org/query/bl?ip=', - ); - - if ($mode == 'register') - { - $dnsbl_check['bl.spamcop.net'] = 'http://spamcop.net/bl.shtml?'; - } - - if ($ip) - { - $quads = explode('.', $ip); - $reverse_ip = $quads[3] . '.' . $quads[2] . '.' . $quads[1] . '.' . $quads[0]; - - // Need to be listed on all servers... - $listed = true; - $info = array(); - - foreach ($dnsbl_check as $dnsbl => $lookup) - { - if (phpbb_checkdnsrr($reverse_ip . '.' . $dnsbl . '.', 'A') === true) - { - $info = array($dnsbl, $lookup . $ip); - } - else - { - $listed = false; - } - } - - if ($listed) - { - return $info; - } - } - - return false; - } - - /** - * Check if URI is blacklisted - * This should be called only where absolutly necessary, for example on the submitted website field - * This function is not in use at the moment and is only included for testing purposes, it may not work at all! - * This means it is untested at the moment and therefore commented out - * - * @param string $uri URI to check - * @return true if uri is on blacklist, else false. Only blacklist is checked (~zero FP), no grey lists - function check_uribl($uri) - { - // Normally parse_url() is not intended to parse uris - // We need to get the top-level domain name anyway... change. - $uri = parse_url($uri); - - if ($uri === false || empty($uri['host'])) - { - return false; - } - - $uri = trim($uri['host']); - - if ($uri) - { - // One problem here... the return parameter for the "windows" method is different from what - // we expect... this may render this check useless... - if (phpbb_checkdnsrr($uri . '.multi.uribl.com.', 'A') === true) - { - return true; - } - } - - return false; - } - */ - - /** - * Set/Update a persistent login key - * - * This method creates or updates a persistent session key. When a user makes - * use of persistent (formerly auto-) logins a key is generated and stored in the - * DB. When they revisit with the same key it's automatically updated in both the - * DB and cookie. Multiple keys may exist for each user representing different - * browsers or locations. As with _any_ non-secure-socket no passphrase login this - * remains vulnerable to exploit. - */ - function set_login_key($user_id = false, $key = false, $user_ip = false) - { - global $config, $db; - - $user_id = ($user_id === false) ? $this->data['user_id'] : $user_id; - $user_ip = ($user_ip === false) ? $this->ip : $user_ip; - $key = ($key === false) ? (($this->cookie_data['k']) ? $this->cookie_data['k'] : false) : $key; - - $key_id = unique_id(hexdec(substr($this->session_id, 0, 8))); - - $sql_ary = array( - 'key_id' => (string) md5($key_id), - 'last_ip' => (string) $this->ip, - 'last_login' => (int) time() - ); - - if (!$key) - { - $sql_ary += array( - 'user_id' => (int) $user_id - ); - } - - if ($key) - { - $sql = 'UPDATE ' . SESSIONS_KEYS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_id = ' . (int) $user_id . " - AND key_id = '" . $db->sql_escape(md5($key)) . "'"; - } - else - { - $sql = 'INSERT INTO ' . SESSIONS_KEYS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - } - $db->sql_query($sql); - - $this->cookie_data['k'] = $key_id; - - return false; - } - - /** - * Reset all login keys for the specified user - * - * This method removes all current login keys for a specified (or the current) - * user. It will be called on password change to render old keys unusable - */ - function reset_login_keys($user_id = false) - { - global $config, $db; - - $user_id = ($user_id === false) ? $this->data['user_id'] : $user_id; - - $sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . ' - WHERE user_id = ' . (int) $user_id; - $db->sql_query($sql); - - // Let's also clear any current sessions for the specified user_id - // If it's the current user then we'll leave this session intact - $sql_where = 'session_user_id = ' . (int) $user_id; - $sql_where .= ($user_id === $this->data['user_id']) ? " AND session_id <> '" . $db->sql_escape($this->session_id) . "'" : ''; - - $sql = 'DELETE FROM ' . SESSIONS_TABLE . " - WHERE $sql_where"; - $db->sql_query($sql); - - // We're changing the password of the current user and they have a key - // Lets regenerate it to be safe - if ($user_id === $this->data['user_id'] && $this->cookie_data['k']) - { - $this->set_login_key($user_id); - } - } -} - - -/** -* Base user class -* -* This is the overarching class which contains (through session extend) -* all methods utilised for user functionality during a session. -* -* @package phpBB3 -*/ -class user extends session -{ - var $lang = array(); - var $help = array(); - var $theme = array(); - var $date_format; - var $timezone; - var $dst; - - var $lang_name; - var $lang_id = false; - var $lang_path; - var $img_lang; - var $img_array = array(); - - // Able to add new option (id 7) - var $keyoptions = array('viewimg' => 0, 'viewflash' => 1, 'viewsmilies' => 2, 'viewsigs' => 3, 'viewavatars' => 4, 'viewcensors' => 5, 'attachsig' => 6, 'bbcode' => 8, 'smilies' => 9, 'popuppm' => 10); - var $keyvalues = array(); - - /** - * Setup basic user-specific items (style, language, ...) - */ - function setup($lang_set = false, $style = false) - { - global $db, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache; - - if ($this->data['user_id'] != ANONYMOUS) - { - $this->lang_name = (file_exists($phpbb_root_path . 'language/' . $this->data['user_lang'] . "/common.$phpEx")) ? $this->data['user_lang'] : basename($config['default_lang']); - $this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/'; - - $this->date_format = $this->data['user_dateformat']; - $this->timezone = $this->data['user_timezone'] * 3600; - $this->dst = $this->data['user_dst'] * 3600; - } - else - { - $this->lang_name = basename($config['default_lang']); - $this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/'; - $this->date_format = $config['default_dateformat']; - $this->timezone = $config['board_timezone'] * 3600; - $this->dst = $config['board_dst'] * 3600; - - /** - * If a guest user is surfing, we try to guess his/her language first by obtaining the browser language - * If re-enabled we need to make sure only those languages installed are checked - * Commented out so we do not loose the code. - - if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) - { - $accept_lang_ary = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']); - - foreach ($accept_lang_ary as $accept_lang) - { - // Set correct format ... guess full xx_YY form - $accept_lang = substr($accept_lang, 0, 2) . '_' . strtoupper(substr($accept_lang, 3, 2)); - $accept_lang = basename($accept_lang); - - if (file_exists($phpbb_root_path . 'language/' . $accept_lang . "/common.$phpEx")) - { - $this->lang_name = $config['default_lang'] = $accept_lang; - $this->lang_path = $phpbb_root_path . 'language/' . $accept_lang . '/'; - break; - } - else - { - // No match on xx_YY so try xx - $accept_lang = substr($accept_lang, 0, 2); - $accept_lang = basename($accept_lang); - - if (file_exists($phpbb_root_path . 'language/' . $accept_lang . "/common.$phpEx")) - { - $this->lang_name = $config['default_lang'] = $accept_lang; - $this->lang_path = $phpbb_root_path . 'language/' . $accept_lang . '/'; - break; - } - } - } - } - */ - } - - // We include common language file here to not load it every time a custom language file is included - $lang = &$this->lang; - - if ((@include $this->lang_path . "common.$phpEx") === false) - { - die('Language file ' . $this->lang_name . "/common.$phpEx" . " couldn't be opened."); - } - - $this->add_lang($lang_set); - unset($lang_set); - - if (!empty($_GET['style']) && $auth->acl_get('a_styles')) - { - global $SID, $_EXTRA_URL; - - $style = request_var('style', 0); - $SID .= '&style=' . $style; - $_EXTRA_URL = array('style=' . $style); - } - else - { - // Set up style - $style = ($style) ? $style : ((!$config['override_user_style']) ? $this->data['user_style'] : $config['default_style']); - } - - $sql = 'SELECT s.style_id, t.template_storedb, t.template_path, t.template_id, t.bbcode_bitfield, c.theme_path, c.theme_name, c.theme_storedb, c.theme_id, i.imageset_path, i.imageset_id, i.imageset_name - FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i - WHERE s.style_id = $style - AND t.template_id = s.template_id - AND c.theme_id = s.theme_id - AND i.imageset_id = s.imageset_id"; - $result = $db->sql_query($sql, 3600); - $this->theme = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // User has wrong style - if (!$this->theme && $style == $this->data['user_style']) - { - $style = $this->data['user_style'] = $config['default_style']; - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_style = $style - WHERE user_id = {$this->data['user_id']}"; - $db->sql_query($sql); - - $sql = 'SELECT s.style_id, t.template_storedb, t.template_path, t.template_id, t.bbcode_bitfield, c.theme_path, c.theme_name, c.theme_storedb, c.theme_id, i.imageset_path, i.imageset_id, i.imageset_name - FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i - WHERE s.style_id = $style - AND t.template_id = s.template_id - AND c.theme_id = s.theme_id - AND i.imageset_id = s.imageset_id"; - $result = $db->sql_query($sql, 3600); - $this->theme = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - } - - if (!$this->theme) - { - trigger_error('Could not get style data', E_USER_ERROR); - } - - // Now parse the cfg file and cache it, - // we are only interested in the theme configuration for now - $parsed_items = cache::obtain_cfg_item($this->theme, 'theme'); - - $check_for = array( - 'parse_css_file' => (int) 0, - 'pagination_sep' => (string) ', ' - ); - - foreach ($check_for as $key => $default_value) - { - $this->theme[$key] = (isset($parsed_items[$key])) ? $parsed_items[$key] : $default_value; - settype($this->theme[$key], gettype($default_value)); - - if (is_string($default_value)) - { - $this->theme[$key] = htmlspecialchars($this->theme[$key]); - } - } - - // If the style author specified the theme needs to be cached - // (because of the used paths and variables) than make sure it is the case. - // For example, if the theme uses language-specific images it needs to be stored in db. - if (!$this->theme['theme_storedb'] && $this->theme['parse_css_file']) - { - $this->theme['theme_storedb'] = 1; - - $stylesheet = file_get_contents("{$phpbb_root_path}styles/{$this->theme['theme_path']}/theme/stylesheet.css"); - // Match CSS imports - $matches = array(); - preg_match_all('/@import url\(["\'](.*)["\']\);/i', $stylesheet, $matches); - - if (sizeof($matches)) - { - $content = ''; - foreach ($matches[0] as $idx => $match) - { - if ($content = @file_get_contents("{$phpbb_root_path}styles/{$this->theme['theme_path']}/theme/" . $matches[1][$idx])) - { - $content = trim($content); - } - else - { - $content = ''; - } - $stylesheet = str_replace($match, $content, $stylesheet); - } - unset($content); - } - - $stylesheet = str_replace('./', 'styles/' . $this->theme['theme_path'] . '/theme/', $stylesheet); - - $sql_ary = array( - 'theme_data' => $stylesheet, - 'theme_mtime' => time(), - 'theme_storedb' => 1 - ); - - $sql = 'UPDATE ' . STYLES_THEME_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE theme_id = ' . $this->theme['theme_id']; - $db->sql_query($sql); - - unset($sql_ary); - } - - $template->set_template(); - - $this->img_lang = (file_exists($phpbb_root_path . 'styles/' . $this->theme['imageset_path'] . '/imageset/' . $this->lang_name)) ? $this->lang_name : $config['default_lang']; - - $sql = 'SELECT image_name, image_filename, image_lang, image_height, image_width - FROM ' . STYLES_IMAGESET_DATA_TABLE . ' - WHERE imageset_id = ' . $this->theme['imageset_id'] . " - AND image_filename <> '' - AND image_lang IN ('" . $db->sql_escape($this->img_lang) . "', '')"; - $result = $db->sql_query($sql, 3600); - - $localised_images = false; - while ($row = $db->sql_fetchrow($result)) - { - if ($row['image_lang']) - { - $localised_images = true; - } - - $this->img_array[$row['image_name']] = $row; - } - $db->sql_freeresult($result); - - // there were no localised images, try to refresh the localised imageset for the user's language - if (!$localised_images) - { - // Attention: this code ignores the image definition list from acp_styles and just takes everything - // that the config file contains - $sql_ary = array(); - - $db->sql_transaction('begin'); - - $sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . ' - WHERE imageset_id = ' . $this->theme['imageset_id'] . ' - AND image_lang = \'' . $db->sql_escape($this->img_lang) . '\''; - $result = $db->sql_query($sql); - - if (@file_exists("{$phpbb_root_path}styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg")) - { - $cfg_data_imageset_data = parse_cfg_file("{$phpbb_root_path}styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg"); - foreach ($cfg_data_imageset_data as $image_name => $value) - { - if (strpos($value, '*') !== false) - { - if (substr($value, -1, 1) === '*') - { - list($image_filename, $image_height) = explode('*', $value); - $image_width = 0; - } - else - { - list($image_filename, $image_height, $image_width) = explode('*', $value); - } - } - else - { - $image_filename = $value; - $image_height = $image_width = 0; - } - - if (strpos($image_name, 'img_') === 0 && $image_filename) - { - $image_name = substr($image_name, 4); - $sql_ary[] = array( - 'image_name' => (string) $image_name, - 'image_filename' => (string) $image_filename, - 'image_height' => (int) $image_height, - 'image_width' => (int) $image_width, - 'imageset_id' => (int) $this->theme['imageset_id'], - 'image_lang' => (string) $this->img_lang, - ); - } - } - } - - if (sizeof($sql_ary)) - { - $db->sql_multi_insert(STYLES_IMAGESET_DATA_TABLE, $sql_ary); - $db->sql_transaction('commit'); - $cache->destroy('sql', STYLES_IMAGESET_DATA_TABLE); - - add_log('admin', 'LOG_IMAGESET_LANG_REFRESHED', $this->theme['imageset_name'], $this->img_lang); - } - else - { - $db->sql_transaction('commit'); - add_log('admin', 'LOG_IMAGESET_LANG_MISSING', $this->theme['imageset_name'], $this->img_lang); - } - } - - // Call phpbb_user_session_handler() in case external application want to "bend" some variables or replace classes... - // After calling it we continue script execution... - phpbb_user_session_handler(); - - // If this function got called from the error handler we are finished here. - if (defined('IN_ERROR_HANDLER')) - { - return; - } - - // Disable board if the install/ directory is still present - // For the brave development army we do not care about this, else we need to comment out this everytime we develop locally - if (!defined('DEBUG_EXTRA') && !defined('ADMIN_START') && !defined('IN_INSTALL') && !defined('IN_LOGIN') && file_exists($phpbb_root_path . 'install')) - { - // Adjust the message slightly according to the permissions - if ($auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_')) - { - $message = 'REMOVE_INSTALL'; - } - else - { - $message = (!empty($config['board_disable_msg'])) ? $config['board_disable_msg'] : 'BOARD_DISABLE'; - } - trigger_error($message); - } - - // Is board disabled and user not an admin or moderator? - if ($config['board_disable'] && !defined('IN_LOGIN') && !$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_')) - { - header('HTTP/1.1 503 Service Unavailable'); - - $message = (!empty($config['board_disable_msg'])) ? $config['board_disable_msg'] : 'BOARD_DISABLE'; - trigger_error($message); - } - - // Is load exceeded? - if ($config['limit_load'] && $this->load !== false) - { - if ($this->load > floatval($config['limit_load']) && !defined('IN_LOGIN')) - { - // Set board disabled to true to let the admins/mods get the proper notification - $config['board_disable'] = '1'; - - if (!$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_')) - { - header('HTTP/1.1 503 Service Unavailable'); - trigger_error('BOARD_UNAVAILABLE'); - } - } - } - - if (isset($this->data['session_viewonline'])) - { - // Make sure the user is able to hide his session - if (!$this->data['session_viewonline']) - { - // Reset online status if not allowed to hide the session... - if (!$auth->acl_get('u_hideonline')) - { - $sql = 'UPDATE ' . SESSIONS_TABLE . ' - SET session_viewonline = 1 - WHERE session_user_id = ' . $this->data['user_id']; - $db->sql_query($sql); - $this->data['session_viewonline'] = 1; - } - } - else if (!$this->data['user_allow_viewonline']) - { - // the user wants to hide and is allowed to -> cloaking device on. - if ($auth->acl_get('u_hideonline')) - { - $sql = 'UPDATE ' . SESSIONS_TABLE . ' - SET session_viewonline = 0 - WHERE session_user_id = ' . $this->data['user_id']; - $db->sql_query($sql); - $this->data['session_viewonline'] = 0; - } - } - } - - - // Does the user need to change their password? If so, redirect to the - // ucp profile reg_details page ... of course do not redirect if we're already in the ucp - if (!defined('IN_ADMIN') && !defined('ADMIN_START') && $config['chg_passforce'] && $this->data['is_registered'] && $auth->acl_get('u_chgpasswd') && $this->data['user_passchg'] < time() - ($config['chg_passforce'] * 86400)) - { - if (strpos($this->page['query_string'], 'mode=reg_details') === false && $this->page['page_name'] != "ucp.$phpEx") - { - redirect(append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=profile&mode=reg_details')); - } - } - - return; - } - - /** - * Add Language Items - use_db and use_help are assigned where needed (only use them to force inclusion) - * - * @param mixed $lang_set specifies the language entries to include - * @param bool $use_db internal variable for recursion, do not use - * @param bool $use_help internal variable for recursion, do not use - * - * Examples: - * - * $lang_set = array('posting', 'help' => 'faq'); - * $lang_set = array('posting', 'viewtopic', 'help' => array('bbcode', 'faq')) - * $lang_set = array(array('posting', 'viewtopic'), 'help' => array('bbcode', 'faq')) - * $lang_set = 'posting' - * $lang_set = array('help' => 'faq', 'db' => array('help:faq', 'posting')) - * - */ - function add_lang($lang_set, $use_db = false, $use_help = false) - { - global $phpEx; - - if (is_array($lang_set)) - { - foreach ($lang_set as $key => $lang_file) - { - // Please do not delete this line. - // We have to force the type here, else [array] language inclusion will not work - $key = (string) $key; - - if ($key == 'db') - { - $this->add_lang($lang_file, true, $use_help); - } - else if ($key == 'help') - { - $this->add_lang($lang_file, $use_db, true); - } - else if (!is_array($lang_file)) - { - $this->set_lang($this->lang, $this->help, $lang_file, $use_db, $use_help); - } - else - { - $this->add_lang($lang_file, $use_db, $use_help); - } - } - unset($lang_set); - } - else if ($lang_set) - { - $this->set_lang($this->lang, $this->help, $lang_set, $use_db, $use_help); - } - } - - /** - * Set language entry (called by add_lang) - * @access private - */ - function set_lang(&$lang, &$help, $lang_file, $use_db = false, $use_help = false) - { - global $phpEx; - - // Make sure the language path is set (if the user setup did not happen it is not set) - if (!$this->lang_path) - { - global $phpbb_root_path, $config; - - $this->lang_path = $phpbb_root_path . 'language/' . basename($config['default_lang']) . '/'; - } - - // $lang == $this->lang - // $help == $this->help - // - add appropriate variables here, name them as they are used within the language file... - if (!$use_db) - { - if ($use_help && strpos($lang_file, '/') !== false) - { - $language_filename = $this->lang_path . substr($lang_file, 0, stripos($lang_file, '/') + 1) . 'help_' . substr($lang_file, stripos($lang_file, '/') + 1) . '.' . $phpEx; - } - else - { - $language_filename = $this->lang_path . (($use_help) ? 'help_' : '') . $lang_file . '.' . $phpEx; - } - - if ((@include $language_filename) === false) - { - trigger_error('Language file ' . basename($language_filename) . ' couldn\'t be opened.', E_USER_ERROR); - } - } - else if ($use_db) - { - // Get Database Language Strings - // Put them into $lang if nothing is prefixed, put them into $help if help: is prefixed - // For example: help:faq, posting - } - } - - /** - * Format user date - */ - function format_date($gmepoch, $format = false, $forcedate = false) - { - static $midnight; - - $lang_dates = $this->lang['datetime']; - $format = (!$format) ? $this->date_format : $format; - - // Short representation of month in format - if ((strpos($format, '\M') === false && strpos($format, 'M') !== false) || (strpos($format, '\r') === false && strpos($format, 'r') !== false)) - { - $lang_dates['May'] = $lang_dates['May_short']; - } - - unset($lang_dates['May_short']); - - if (!$midnight) - { - list($d, $m, $y) = explode(' ', gmdate('j n Y', time() + $this->timezone + $this->dst)); - $midnight = gmmktime(0, 0, 0, $m, $d, $y) - $this->timezone - $this->dst; - } - - if (strpos($format, '|') === false || ($gmepoch < $midnight - 86400 && !$forcedate) || ($gmepoch > $midnight + 172800 && !$forcedate)) - { - return strtr(@gmdate(str_replace('|', '', $format), $gmepoch + $this->timezone + $this->dst), $lang_dates); - } - - if ($gmepoch > $midnight + 86400 && !$forcedate) - { - $format = substr($format, 0, strpos($format, '|')) . '||' . substr(strrchr($format, '|'), 1); - return str_replace('||', $this->lang['datetime']['TOMORROW'], strtr(@gmdate($format, $gmepoch + $this->timezone + $this->dst), $lang_dates)); - } - else if ($gmepoch > $midnight && !$forcedate) - { - $format = substr($format, 0, strpos($format, '|')) . '||' . substr(strrchr($format, '|'), 1); - return str_replace('||', $this->lang['datetime']['TODAY'], strtr(@gmdate($format, $gmepoch + $this->timezone + $this->dst), $lang_dates)); - } - else if ($gmepoch > $midnight - 86400 && !$forcedate) - { - $format = substr($format, 0, strpos($format, '|')) . '||' . substr(strrchr($format, '|'), 1); - return str_replace('||', $this->lang['datetime']['YESTERDAY'], strtr(@gmdate($format, $gmepoch + $this->timezone + $this->dst), $lang_dates)); - } - - return strtr(@gmdate(str_replace('|', '', $format), $gmepoch + $this->timezone + $this->dst), $lang_dates); - } - - /** - * Get language id currently used by the user - */ - function get_iso_lang_id() - { - global $config, $db; - - if (!empty($this->lang_id)) - { - return $this->lang_id; - } - - if (!$this->lang_name) - { - $this->lang_name = $config['default_lang']; - } - - $sql = 'SELECT lang_id - FROM ' . LANG_TABLE . " - WHERE lang_iso = '" . $db->sql_escape($this->lang_name) . "'"; - $result = $db->sql_query($sql); - $this->lang_id = (int) $db->sql_fetchfield('lang_id'); - $db->sql_freeresult($result); - - return $this->lang_id; - } - - /** - * Get users profile fields - */ - function get_profile_fields($user_id) - { - global $db; - - if (isset($this->profile_fields)) - { - return; - } - - $sql = 'SELECT * - FROM ' . PROFILE_FIELDS_DATA_TABLE . " - WHERE user_id = $user_id"; - $result = $db->sql_query_limit($sql, 1); - $this->profile_fields = (!($row = $db->sql_fetchrow($result))) ? array() : $row; - $db->sql_freeresult($result); - } - - /** - * Specify/Get image - */ - function img($img, $alt = '', $width = false, $suffix = '', $type = 'full_tag') - { - static $imgs; - global $phpbb_root_path; - - $img_data = &$imgs[$img]; - - if (empty($img_data)) - { - if (!isset($this->img_array[$img])) - { - // Do not fill the image to let designers decide what to do if the image is empty - $img_data = ''; - return $img_data; - } - - $img_data['src'] = $phpbb_root_path . 'styles/' . $this->theme['imageset_path'] . '/imageset/' . ($this->img_array[$img]['image_lang'] ? $this->img_array[$img]['image_lang'] .'/' : '') . $this->img_array[$img]['image_filename']; - $img_data['width'] = $this->img_array[$img]['image_width']; - $img_data['height'] = $this->img_array[$img]['image_height']; - } - - $alt = (!empty($this->lang[$alt])) ? $this->lang[$alt] : $alt; - - switch ($type) - { - case 'src': - return $img_data['src']; - break; - - case 'width': - return ($width === false) ? $img_data['width'] : $width; - break; - - case 'height': - return $img_data['height']; - break; - - default: - $use_width = ($width === false) ? $img_data['width'] : $width; - - return '' . $alt . ''; - break; - } - } - - /** - * Get option bit field from user options - */ - function optionget($key, $data = false) - { - if (!isset($this->keyvalues[$key])) - { - $var = ($data) ? $data : $this->data['user_options']; - $this->keyvalues[$key] = ($var & 1 << $this->keyoptions[$key]) ? true : false; - } - - return $this->keyvalues[$key]; - } - - /** - * Set option bit field for user options - */ - function optionset($key, $value, $data = false) - { - $var = ($data) ? $data : $this->data['user_options']; - - if ($value && !($var & 1 << $this->keyoptions[$key])) - { - $var += 1 << $this->keyoptions[$key]; - } - else if (!$value && ($var & 1 << $this->keyoptions[$key])) - { - $var -= 1 << $this->keyoptions[$key]; - } - else - { - return ($data) ? $var : false; - } - - if (!$data) - { - $this->data['user_options'] = $var; - return true; - } - else - { - return $var; - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/sessions.php b/phpBB/includes/sessions.php new file mode 100644 index 0000000000..f2557b8741 --- /dev/null +++ b/phpBB/includes/sessions.php @@ -0,0 +1,578 @@ +sql_query($sql))) + { + message_die(CRITICAL_ERROR, 'Error doing DB query userdata row fetch', '', __LINE__, __FILE__, $sql); + } + + $userdata = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + $enable_autologin = $login = 1; + } + else if (!$auto_create) + { + $sessiondata['autologinid'] = ''; + $sessiondata['userid'] = $user_id; + + $sql = 'SELECT * + FROM ' . USERS_TABLE . ' + WHERE user_id = ' . (int) $user_id . ' + AND user_active = 1'; + if (!($result = $db->sql_query($sql))) + { + message_die(CRITICAL_ERROR, 'Error doing DB query userdata row fetch', '', __LINE__, __FILE__, $sql); + } + + $userdata = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + $login = 1; + } + } + + // + // At this point either $userdata should be populated or + // one of the below is true + // * Key didn't match one in the DB + // * User does not exist + // * User is inactive + // + if (!sizeof($userdata) || !is_array($userdata) || !$userdata) + { + $sessiondata['autologinid'] = ''; + $sessiondata['userid'] = $user_id = ANONYMOUS; + $enable_autologin = $login = 0; + + $sql = 'SELECT * + FROM ' . USERS_TABLE . ' + WHERE user_id = ' . (int) $user_id; + if (!($result = $db->sql_query($sql))) + { + message_die(CRITICAL_ERROR, 'Error doing DB query userdata row fetch', '', __LINE__, __FILE__, $sql); + } + + $userdata = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + } + + + // + // Initial ban check against user id, IP and email address + // + preg_match('/(..)(..)(..)(..)/', $user_ip, $user_ip_parts); + + $sql = "SELECT ban_ip, ban_userid, ban_email + FROM " . BANLIST_TABLE . " + WHERE ban_ip IN ('" . $user_ip_parts[1] . $user_ip_parts[2] . $user_ip_parts[3] . $user_ip_parts[4] . "', '" . $user_ip_parts[1] . $user_ip_parts[2] . $user_ip_parts[3] . "ff', '" . $user_ip_parts[1] . $user_ip_parts[2] . "ffff', '" . $user_ip_parts[1] . "ffffff') + OR ban_userid = $user_id"; + if ( $user_id != ANONYMOUS ) + { + $sql .= " OR ban_email LIKE '" . str_replace("\'", "''", $userdata['user_email']) . "' + OR ban_email LIKE '" . substr(str_replace("\'", "''", $userdata['user_email']), strpos(str_replace("\'", "''", $userdata['user_email']), "@")) . "'"; + } + if ( !($result = $db->sql_query($sql)) ) + { + message_die(CRITICAL_ERROR, 'Could not obtain ban information', '', __LINE__, __FILE__, $sql); + } + + if ( $ban_info = $db->sql_fetchrow($result) ) + { + if ( $ban_info['ban_ip'] || $ban_info['ban_userid'] || $ban_info['ban_email'] ) + { + message_die(CRITICAL_MESSAGE, 'You_been_banned'); + } + } + + // + // Create or update the session + // + $sql = "UPDATE " . SESSIONS_TABLE . " + SET session_user_id = $user_id, session_start = $current_time, session_time = $current_time, session_page = $page_id, session_logged_in = $login, session_admin = $admin + WHERE session_id = '" . $session_id . "' + AND session_ip = '$user_ip'"; + if ( !$db->sql_query($sql) || !$db->sql_affectedrows() ) + { + $session_id = md5(dss_rand()); + + $sql = "INSERT INTO " . SESSIONS_TABLE . " + (session_id, session_user_id, session_start, session_time, session_ip, session_page, session_logged_in, session_admin) + VALUES ('$session_id', $user_id, $current_time, $current_time, '$user_ip', $page_id, $login, $admin)"; + if ( !$db->sql_query($sql) ) + { + message_die(CRITICAL_ERROR, 'Error creating new session', '', __LINE__, __FILE__, $sql); + } + } + + if ( $user_id != ANONYMOUS ) + { + $last_visit = ( $userdata['user_session_time'] > 0 ) ? $userdata['user_session_time'] : $current_time; + + if (!$admin) + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_session_time = $current_time, user_session_page = $page_id, user_lastvisit = $last_visit + WHERE user_id = $user_id"; + if ( !$db->sql_query($sql) ) + { + message_die(CRITICAL_ERROR, 'Error updating last visit time', '', __LINE__, __FILE__, $sql); + } + } + + $userdata['user_lastvisit'] = $last_visit; + + // + // Regenerate the auto-login key + // + if ($enable_autologin) + { + $auto_login_key = dss_rand() . dss_rand(); + + if (isset($sessiondata['autologinid']) && (string) $sessiondata['autologinid'] != '') + { + $sql = 'UPDATE ' . SESSIONS_KEYS_TABLE . " + SET last_ip = '$user_ip', key_id = '" . md5($auto_login_key) . "', last_login = $current_time + WHERE key_id = '" . md5($sessiondata['autologinid']) . "'"; + } + else + { + $sql = 'INSERT INTO ' . SESSIONS_KEYS_TABLE . "(key_id, user_id, last_ip, last_login) + VALUES ('" . md5($auto_login_key) . "', $user_id, '$user_ip', $current_time)"; + } + + if ( !$db->sql_query($sql) ) + { + message_die(CRITICAL_ERROR, 'Error updating session key', '', __LINE__, __FILE__, $sql); + } + + $sessiondata['autologinid'] = $auto_login_key; + unset($auto_login_key); + } + else + { + $sessiondata['autologinid'] = ''; + } + +// $sessiondata['autologinid'] = (!$admin) ? (( $enable_autologin && $sessionmethod == SESSION_METHOD_COOKIE ) ? $auto_login_key : '') : $sessiondata['autologinid']; + $sessiondata['userid'] = $user_id; + } + + $userdata['session_id'] = $session_id; + $userdata['session_ip'] = $user_ip; + $userdata['session_user_id'] = $user_id; + $userdata['session_logged_in'] = $login; + $userdata['session_page'] = $page_id; + $userdata['session_start'] = $current_time; + $userdata['session_time'] = $current_time; + $userdata['session_admin'] = $admin; + $userdata['session_key'] = $sessiondata['autologinid']; + + setcookie($cookiename . '_data', serialize($sessiondata), $current_time + 31536000, $cookiepath, $cookiedomain, $cookiesecure); + setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure); + + $SID = 'sid=' . $session_id; + + return $userdata; +} + +// +// Checks for a given user session, tidies session table and updates user +// sessions at each page refresh +// +function session_pagestart($user_ip, $thispage_id) +{ + global $db, $lang, $board_config; + global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID; + + $cookiename = $board_config['cookie_name']; + $cookiepath = $board_config['cookie_path']; + $cookiedomain = $board_config['cookie_domain']; + $cookiesecure = $board_config['cookie_secure']; + + $current_time = time(); + unset($userdata); + + if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) || isset($HTTP_COOKIE_VARS[$cookiename . '_data']) ) + { + $sessiondata = isset( $HTTP_COOKIE_VARS[$cookiename . '_data'] ) ? unserialize(stripslashes($HTTP_COOKIE_VARS[$cookiename . '_data'])) : array(); + $session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : ''; + $sessionmethod = SESSION_METHOD_COOKIE; + } + else + { + $sessiondata = array(); + $session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : ''; + $sessionmethod = SESSION_METHOD_GET; + } + + // + if (!preg_match('/^[A-Za-z0-9]*$/', $session_id)) + { + $session_id = ''; + } + + $thispage_id = (int) $thispage_id; + + // + // Does a session exist? + // + if ( !empty($session_id) ) + { + // + // session_id exists so go ahead and attempt to grab all + // data in preparation + // + $sql = "SELECT u.*, s.* + FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u + WHERE s.session_id = '$session_id' + AND u.user_id = s.session_user_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(CRITICAL_ERROR, 'Error doing DB query userdata row fetch', '', __LINE__, __FILE__, $sql); + } + + $userdata = $db->sql_fetchrow($result); + + // + // Did the session exist in the DB? + // + if ( isset($userdata['user_id']) ) + { + // + // Do not check IP assuming equivalence, if IPv4 we'll check only first 24 + // bits ... I've been told (by vHiker) this should alleviate problems with + // load balanced et al proxies while retaining some reliance on IP security. + // + $ip_check_s = substr($userdata['session_ip'], 0, 6); + $ip_check_u = substr($user_ip, 0, 6); + + if ($ip_check_s == $ip_check_u) + { + $SID = ($sessionmethod == SESSION_METHOD_GET || defined('IN_ADMIN')) ? 'sid=' . $session_id : ''; + + // + // Only update session DB a minute or so after last update + // + if ( $current_time - $userdata['session_time'] > 60 ) + { + // A little trick to reset session_admin on session re-usage + $update_admin = (!defined('IN_ADMIN') && $current_time - $userdata['session_time'] > ($board_config['session_length']+60)) ? ', session_admin = 0' : ''; + + $sql = "UPDATE " . SESSIONS_TABLE . " + SET session_time = $current_time, session_page = $thispage_id$update_admin + WHERE session_id = '" . $userdata['session_id'] . "'"; + if ( !$db->sql_query($sql) ) + { + message_die(CRITICAL_ERROR, 'Error updating sessions table', '', __LINE__, __FILE__, $sql); + } + + if ( $userdata['user_id'] != ANONYMOUS ) + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_session_time = $current_time, user_session_page = $thispage_id + WHERE user_id = " . $userdata['user_id']; + if ( !$db->sql_query($sql) ) + { + message_die(CRITICAL_ERROR, 'Error updating sessions table', '', __LINE__, __FILE__, $sql); + } + } + + session_clean($userdata['session_id']); + + setcookie($cookiename . '_data', serialize($sessiondata), $current_time + 31536000, $cookiepath, $cookiedomain, $cookiesecure); + setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure); + } + + // Add the session_key to the userdata array if it is set + if ( isset($sessiondata['autologinid']) && $sessiondata['autologinid'] != '' ) + { + $userdata['session_key'] = $sessiondata['autologinid']; + } + + return $userdata; + } + } + } + + // + // If we reach here then no (valid) session exists. So we'll create a new one, + // using the cookie user_id if available to pull basic user prefs. + // + $user_id = ( isset($sessiondata['userid']) ) ? intval($sessiondata['userid']) : ANONYMOUS; + + if ( !($userdata = session_begin($user_id, $user_ip, $thispage_id, TRUE)) ) + { + message_die(CRITICAL_ERROR, 'Error creating user session', '', __LINE__, __FILE__, $sql); + } + + return $userdata; + +} + +/** +* Terminates the specified session +* It will delete the entry in the sessions table for this session, +* remove the corresponding auto-login key and reset the cookies +*/ +function session_end($session_id, $user_id) +{ + global $db, $lang, $board_config, $userdata; + global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID; + + $cookiename = $board_config['cookie_name']; + $cookiepath = $board_config['cookie_path']; + $cookiedomain = $board_config['cookie_domain']; + $cookiesecure = $board_config['cookie_secure']; + + $current_time = time(); + + if (!preg_match('/^[A-Za-z0-9]*$/', $session_id)) + { + return; + } + + // + // Delete existing session + // + $sql = 'DELETE FROM ' . SESSIONS_TABLE . " + WHERE session_id = '$session_id' + AND session_user_id = $user_id"; + if ( !$db->sql_query($sql) ) + { + message_die(CRITICAL_ERROR, 'Error removing user session', '', __LINE__, __FILE__, $sql); + } + + // + // Remove this auto-login entry (if applicable) + // + if ( isset($userdata['session_key']) && $userdata['session_key'] != '' ) + { + $autologin_key = md5($userdata['session_key']); + $sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . ' + WHERE user_id = ' . (int) $user_id . " + AND key_id = '$autologin_key'"; + if ( !$db->sql_query($sql) ) + { + message_die(CRITICAL_ERROR, 'Error removing auto-login key', '', __LINE__, __FILE__, $sql); + } + } + + // + // We expect that message_die will be called after this function, + // but just in case it isn't, reset $userdata to the details for a guest + // + $sql = 'SELECT * + FROM ' . USERS_TABLE . ' + WHERE user_id = ' . ANONYMOUS; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(CRITICAL_ERROR, 'Error obtaining user details', '', __LINE__, __FILE__, $sql); + } + if ( !($userdata = $db->sql_fetchrow($result)) ) + { + message_die(CRITICAL_ERROR, 'Error obtaining user details', '', __LINE__, __FILE__, $sql); + } + $db->sql_freeresult($result); + + + setcookie($cookiename . '_data', '', $current_time - 31536000, $cookiepath, $cookiedomain, $cookiesecure); + setcookie($cookiename . '_sid', '', $current_time - 31536000, $cookiepath, $cookiedomain, $cookiesecure); + + return true; +} + +/** +* Removes expired sessions and auto-login keys from the database +*/ +function session_clean($session_id) +{ + global $board_config, $db; + + // + // Delete expired sessions + // + $sql = 'DELETE FROM ' . SESSIONS_TABLE . ' + WHERE session_time < ' . (time() - (int) $board_config['session_length']) . " + AND session_id <> '$session_id'"; + if ( !$db->sql_query($sql) ) + { + message_die(CRITICAL_ERROR, 'Error clearing sessions table', '', __LINE__, __FILE__, $sql); + } + + // + // Delete expired auto-login keys + // If max_autologin_time is not set then keys will never be deleted + // (same behaviour as old 2.0.x session code) + // + if (!empty($board_config['max_autologin_time']) && $board_config['max_autologin_time'] > 0) + { + $sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . ' + WHERE last_login < ' . (time() - (86400 * (int) $board_config['max_autologin_time'])); + $db->sql_query($sql); + } + + return true; +} + +/** +* Reset all login keys for the specified user +* Called on password changes +*/ +function session_reset_keys($user_id, $user_ip) +{ + global $db, $userdata, $board_config; + + $key_sql = ($user_id == $userdata['user_id'] && !empty($userdata['session_key'])) ? "AND key_id != '" . md5($userdata['session_key']) . "'" : ''; + + $sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . ' + WHERE user_id = ' . (int) $user_id . " + $key_sql"; + + if ( !$db->sql_query($sql) ) + { + message_die(CRITICAL_ERROR, 'Error removing auto-login keys', '', __LINE__, __FILE__, $sql); + } + + $where_sql = 'session_user_id = ' . (int) $user_id; + $where_sql .= ($user_id == $userdata['user_id']) ? " AND session_id <> '" . $userdata['session_id'] . "'" : ''; + $sql = 'DELETE FROM ' . SESSIONS_TABLE . " + WHERE $where_sql"; + if ( !$db->sql_query($sql) ) + { + message_die(CRITICAL_ERROR, 'Error removing user session(s)', '', __LINE__, __FILE__, $sql); + } + + if ( !empty($key_sql) ) + { + $auto_login_key = dss_rand() . dss_rand(); + + $current_time = time(); + + $sql = 'UPDATE ' . SESSIONS_KEYS_TABLE . " + SET last_ip = '$user_ip', key_id = '" . md5($auto_login_key) . "', last_login = $current_time + WHERE key_id = '" . md5($userdata['session_key']) . "'"; + + if ( !$db->sql_query($sql) ) + { + message_die(CRITICAL_ERROR, 'Error updating session key', '', __LINE__, __FILE__, $sql); + } + + // And now rebuild the cookie + $sessiondata['userid'] = $user_id; + $sessiondata['autologinid'] = $auto_login_key; + $cookiename = $board_config['cookie_name']; + $cookiepath = $board_config['cookie_path']; + $cookiedomain = $board_config['cookie_domain']; + $cookiesecure = $board_config['cookie_secure']; + + setcookie($cookiename . '_data', serialize($sessiondata), $current_time + 31536000, $cookiepath, $cookiedomain, $cookiesecure); + + $userdata['session_key'] = $auto_login_key; + unset($sessiondata); + unset($auto_login_key); + } +} + +// +// Append $SID to a url. Borrowed from phplib and modified. This is an +// extra routine utilised by the session code above and acts as a wrapper +// around every single URL and form action. If you replace the session +// code you must include this routine, even if it's empty. +// +function append_sid($url, $non_html_amp = false) +{ + global $SID; + + if ( !empty($SID) && !preg_match('#sid=#', $url) ) + { + $url .= ( ( strpos($url, '?') !== false ) ? ( ( $non_html_amp ) ? '&' : '&' ) : '?' ) . $SID; + } + + return $url; +} + +?> \ No newline at end of file diff --git a/phpBB/includes/smtp.php b/phpBB/includes/smtp.php new file mode 100644 index 0000000000..82e68cc96d --- /dev/null +++ b/phpBB/includes/smtp.php @@ -0,0 +1,210 @@ + 1) + { + $headers = join("\n", $headers); + } + else + { + $headers = $headers[0]; + } + } + $headers = chop($headers); + + // Make sure there are no bare linefeeds in the headers + $headers = preg_replace('#(?\r\n"); + server_parse($socket, "250", __LINE__); + + // Specify each user to send to and build to header. + $to_header = ''; + + // Add an additional bit of error checking to the To field. + $mail_to = (trim($mail_to) == '') ? 'Undisclosed-recipients:;' : trim($mail_to); + if (preg_match('#[^ ]+\@[^ ]+#', $mail_to)) + { + fputs($socket, "RCPT TO: <$mail_to>\r\n"); + server_parse($socket, "250", __LINE__); + } + + // Ok now do the CC and BCC fields... + @reset($bcc); + while(list(, $bcc_address) = each($bcc)) + { + // Add an additional bit of error checking to bcc header... + $bcc_address = trim($bcc_address); + if (preg_match('#[^ ]+\@[^ ]+#', $bcc_address)) + { + fputs($socket, "RCPT TO: <$bcc_address>\r\n"); + server_parse($socket, "250", __LINE__); + } + } + + @reset($cc); + while(list(, $cc_address) = each($cc)) + { + // Add an additional bit of error checking to cc header + $cc_address = trim($cc_address); + if (preg_match('#[^ ]+\@[^ ]+#', $cc_address)) + { + fputs($socket, "RCPT TO: <$cc_address>\r\n"); + server_parse($socket, "250", __LINE__); + } + } + + // Ok now we tell the server we are ready to start sending data + fputs($socket, "DATA\r\n"); + + // This is the last response code we look for until the end of the message. + server_parse($socket, "354", __LINE__); + + // Send the Subject Line... + fputs($socket, "Subject: $subject\r\n"); + + // Now the To Header. + fputs($socket, "To: $mail_to\r\n"); + + // Now any custom headers.... + fputs($socket, "$headers\r\n\r\n"); + + // Ok now we are ready for the message... + fputs($socket, "$message\r\n"); + + // Ok the all the ingredients are mixed in let's cook this puppy... + fputs($socket, ".\r\n"); + server_parse($socket, "250", __LINE__); + + // Now tell the server we are done and close the socket... + fputs($socket, "QUIT\r\n"); + fclose($socket); + + return TRUE; +} + +?> \ No newline at end of file diff --git a/phpBB/includes/sql_parse.php b/phpBB/includes/sql_parse.php new file mode 100644 index 0000000000..9761dd315c --- /dev/null +++ b/phpBB/includes/sql_parse.php @@ -0,0 +1,192 @@ + 0)) + { + if ($lines[$i][0] != "#") + { + $output .= $lines[$i] . "\n"; + } + else + { + $output .= "\n"; + } + // Trading a bit of speed for lower mem. use here. + $lines[$i] = ""; + } + } + + return $output; + +} + +// +// split_sql_file will split an uploaded sql file into single sql statements. +// Note: expects trim() to have already been run on $sql. +// +function split_sql_file($sql, $delimiter) +{ + // Split up our string into "possible" SQL statements. + $tokens = explode($delimiter, $sql); + + // try to save mem. + $sql = ""; + $output = array(); + + // we don't actually care about the matches preg gives us. + $matches = array(); + + // this is faster than calling count($oktens) every time thru the loop. + $token_count = count($tokens); + for ($i = 0; $i < $token_count; $i++) + { + // Don't wanna add an empty string as the last thing in the array. + if (($i != ($token_count - 1)) || (strlen($tokens[$i] > 0))) + { + // This is the total number of single quotes in the token. + $total_quotes = preg_match_all("/'/", $tokens[$i], $matches); + // Counts single quotes that are preceded by an odd number of backslashes, + // which means they're escaped quotes. + $escaped_quotes = preg_match_all("/(? \ No newline at end of file diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php index e5f57cfdc2..5a0a2ea0fb 100644 --- a/phpBB/includes/template.php +++ b/phpBB/includes/template.php @@ -1,527 +1,478 @@ $this->_tpldata[block][iteration#][child][iteration#][child2][iteration#][variablename] == value - * if it's a root-level variable, it'll be like this: - * --> $this->_tpldata[.][0][varname] == value - */ - private $_tpldata = array('.' => array(0 => array())); - private $_rootref; +class Template { + var $classname = "Template"; - // Root dir and hash of filenames for each template handle. - private $root = ''; - public $cachepath = ''; - public $files = array(); - public $filename = array(); + // variable that holds all the data we'll be substituting into + // the compiled templates. + // ... + // This will end up being a multi-dimensional array like this: + // $this->_tpldata[block.][iteration#][child.][iteration#][child2.][iteration#][variablename] == value + // if it's a root-level variable, it'll be like this: + // $this->_tpldata[.][0][varname] == value + var $_tpldata = array(); - // this will hash handle names to the compiled/uncompiled code for that handle. - public $compiled_code = array(); + // Hash of filenames for each template handle. + var $files = array(); + + // Root template directory. + var $root = ""; + + // this will hash handle names to the compiled code for that handle. + var $compiled_code = array(); + + // This will hold the uncompiled code for that handle. + var $uncompiled_code = array(); /** - * Set template location - * @access public - */ - public function set_template() + * Constructor. Simply sets the root dir. + * + */ + function Template($root = ".") { - global $phpbb_root_path, $user; + $this->set_rootdir($root); + } - if (file_exists($phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template')) + /** + * Destroys this template object. Should be called when you're done with it, in order + * to clear out the template data so you can load/parse a new template set. + */ + function destroy() + { + $this->_tpldata = array(); + } + + /** + * Sets the template root directory for this Template object. + */ + function set_rootdir($dir) + { + if (!is_dir($dir)) { - $this->root = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template'; - $this->cachepath = $phpbb_root_path . 'cache/tpl_' . $user->theme['template_path'] . '_'; - } - else - { - trigger_error('Template path could not be found: styles/' . $user->theme['template_path'] . '/template', E_USER_ERROR); + return false; } - $this->_rootref = &$this->_tpldata['.'][0]; - + $this->root = $dir; return true; } /** - * Set custom template location (able to use directory outside of phpBB) - * @access public - */ - public function set_custom_template($template_path, $template_name) + * Sets the template filenames for handles. $filename_array + * should be a hash of handle => filename pairs. + */ + function set_filenames($filename_array) { - global $phpbb_root_path; - - $this->root = $template_path; - $this->cachepath = $phpbb_root_path . 'cache/ctpl_' . $template_name . '_'; - - return true; - } - - /** - * Sets the template filenames for handles. $filename_array - * should be a hash of handle => filename pairs. - * @access public - */ - public function set_filenames(array $filename_array) - { - foreach ($filename_array as $handle => $filename) + if (!is_array($filename_array)) { - if (empty($filename)) - { - trigger_error("template->set_filenames: Empty filename specified for $handle", E_USER_ERROR); - } + return false; + } - $this->filename[$handle] = $filename; - $this->files[$handle] = $this->root . '/' . $filename; + reset($filename_array); + while(list($handle, $filename) = each($filename_array)) + { + $this->files[$handle] = $this->make_filename($filename); } return true; } + /** - * Destroy template data set - * @access public - */ - function __destruct() + * Load the file for the handle, compile the file, + * and run the compiled code. This will print out + * the results of executing the template. + */ + function pparse($handle) { - $this->_tpldata = array('.' => array(0 => array())); + if (!$this->loadfile($handle)) + { + die("Template->pparse(): Couldn't load template file for handle $handle"); + } + + // actually compile the template now. + if (!isset($this->compiled_code[$handle]) || empty($this->compiled_code[$handle])) + { + // Actually compile the code now. + $this->compiled_code[$handle] = $this->compile($this->uncompiled_code[$handle]); + } + + // Run the compiled code. + eval($this->compiled_code[$handle]); + return true; } /** - * Reset/empty complete block - * @access public - */ - public function destroy_block_vars($blockname) + * Inserts the uncompiled code for $handle as the + * value of $varname in the root-level. This can be used + * to effectively include a template in the middle of another + * template. + * Note that all desired assignments to the variables in $handle should be done + * BEFORE calling this function. + */ + function assign_var_from_handle($varname, $handle) { - if (strpos($blockname, '.') !== false) + if (!$this->loadfile($handle)) + { + die("Template->assign_var_from_handle(): Couldn't load template file for handle $handle"); + } + + // Compile it, with the "no echo statements" option on. + $_str = ""; + $code = $this->compile($this->uncompiled_code[$handle], true, '_str'); + + // evaluate the variable assignment. + eval($code); + // assign the value of the generated variable to the given varname. + $this->assign_var($varname, $_str); + + return true; + } + + /** + * Block-level variable assignment. Adds a new block iteration with the given + * variable assignments. Note that this should only be called once per block + * iteration. + */ + function assign_block_vars($blockname, $vararray) + { + if (strstr($blockname, '.')) { // Nested block. $blocks = explode('.', $blockname); $blockcount = sizeof($blocks) - 1; - - $str = &$this->_tpldata; + $str = '$this->_tpldata'; for ($i = 0; $i < $blockcount; $i++) { - $str = &$str[$blocks[$i]]; - $str = &$str[sizeof($str) - 1]; + $str .= '[\'' . $blocks[$i] . '.\']'; + eval('$lastiteration = sizeof(' . $str . ') - 1;'); + $str .= '[' . $lastiteration . ']'; } + // Now we add the block that we're actually assigning to. + // We're adding a new iteration to this block with the given + // variable assignments. + $str .= '[\'' . $blocks[$blockcount] . '.\'][] = $vararray;'; - unset($str[$blocks[$blockcount]]); + // Now we evaluate this assignment we've built up. + eval($str); } else { // Top-level block. - unset($this->_tpldata[$blockname]); + // Add a new iteration to this block with the variable assignments + // we were given. + $this->_tpldata[$blockname . '.'][] = $vararray; } return true; } /** - * Display handle - * @access public - */ - public function display($handle, $include_once = true) + * Root-level variable assignment. Adds to current assignments, overriding + * any existing variable assignment with the same name. + */ + function assign_vars($vararray) { - global $user, $phpbb_hook; - - if (!empty($phpbb_hook) && $phpbb_hook->call_hook(array(__CLASS__, __FUNCTION__), $handle, $include_once)) + reset ($vararray); + while (list($key, $val) = each($vararray)) { - if ($phpbb_hook->hook_return(array(__CLASS__, __FUNCTION__))) - { - return $phpbb_hook->hook_return_result(array(__CLASS__, __FUNCTION__)); - } - } - - if (defined('IN_ERROR_HANDLER')) - { - if ((E_NOTICE & error_reporting()) == E_NOTICE) - { - //error_reporting(error_reporting() ^ E_NOTICE); - } - } - - if ($filename = $this->_tpl_load($handle)) - { - ($include_once) ? include_once($filename) : include($filename); - } - else - { - eval(' ?>' . $this->compiled_code[$handle] . '_tpldata['.'][0][$key] = $val; } return true; } /** - * Display the handle and assign the output to a template variable or return the compiled result. - * @access public - */ - public function assign_display($handle, $template_var = '', $return_content = true, $include_once = false) + * Root-level variable assignment. Adds to current assignments, overriding + * any existing variable assignment with the same name. + */ + function assign_var($varname, $varval) { - ob_start(); - $this->display($handle, $include_once); - $contents = ob_get_clean(); - - if ($return_content) - { - return $contents; - } - - $this->assign_var($template_var, $contents); + $this->_tpldata['.'][0][$varname] = $varval; return true; } + /** - * Load a compiled template if possible, if not, recompile it - * @access private - */ - private function _tpl_load(&$handle) + * Generates a full path+filename for the given filename, which can either + * be an absolute name, or a name relative to the rootdir for this Template + * object. + */ + function make_filename($filename) { - global $user, $phpEx, $config; - - $filename = $this->cachepath . str_replace('/', '.', $this->filename[$handle]) . '.' . $phpEx; - - $recompile = (($config['load_tplcompile'] && @filemtime($filename) < filemtime($this->files[$handle])) || !file_exists($filename) || @filesize($filename) === 0) ? true : false; - - // Recompile page if the original template is newer, otherwise load the compiled version - if (!$recompile) + // Check if it's an absolute or relative path. + if (substr($filename, 0, 1) != '/') { - return $filename; + $filename = ($rp_filename = phpbb_realpath($this->root . '/' . $filename)) ? $rp_filename : $filename; } - global $db, $phpbb_root_path; - - if (!class_exists('template_compile')) + if (!file_exists($filename)) { - include($phpbb_root_path . 'includes/functions_template.' . $phpEx); + die("Template->make_filename(): Error - file $filename does not exist"); } - $compile = new template_compile($this); + return $filename; + } + + + /** + * If not already done, load the file for the given handle and populate + * the uncompiled_code[] hash with its code. Do not compile. + */ + function loadfile($handle) + { + // If the file for this handle is already loaded and compiled, do nothing. + if (isset($this->uncompiled_code[$handle]) && !empty($this->uncompiled_code[$handle])) + { + return true; + } // If we don't have a file assigned to this handle, die. if (!isset($this->files[$handle])) { - trigger_error("template->_tpl_load(): No file specified for handle $handle", E_USER_ERROR); + die("Template->loadfile(): No file specified for handle $handle"); } - // Just compile if no user object is present (happens within the installer) - if (!$user) + $filename = $this->files[$handle]; + + $str = implode("", @file($filename)); + if (empty($str)) { - $compile->_tpl_load_file($handle); - return false; + die("Template->loadfile(): File $filename for handle $handle is empty"); } - if (isset($user->theme['template_storedb']) && $user->theme['template_storedb']) - { - $sql = 'SELECT * - FROM ' . STYLES_TEMPLATE_DATA_TABLE . ' - WHERE template_id = ' . $user->theme['template_id'] . " - AND (template_filename = '" . $db->sql_escape($this->filename[$handle]) . "' - OR template_included " . $db->sql_like_expression($db->any_char . $this->filename[$handle] . ':' . $db->any_char) . ')'; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); + $this->uncompiled_code[$handle] = $str; - if ($row) + return true; + } + + + + /** + * Compiles the given string of code, and returns + * the result in a string. + * If "do_not_echo" is true, the returned code will not be directly + * executable, but can be used as part of a variable assignment + * for use in assign_code_from_handle(). + */ + function compile($code, $do_not_echo = false, $retvar = '') + { + // replace \ with \\ and then ' with \'. + $code = str_replace('\\', '\\\\', $code); + $code = str_replace('\'', '\\\'', $code); + + // change template varrefs into PHP varrefs + + // This one will handle varrefs WITH namespaces + $varrefs = array(); + preg_match_all('#\{(([a-z0-9\-_]+?\.)+?)([a-z0-9\-_]+?)\}#is', $code, $varrefs); + $varcount = sizeof($varrefs[1]); + for ($i = 0; $i < $varcount; $i++) + { + $namespace = $varrefs[1][$i]; + $varname = $varrefs[3][$i]; + $new = $this->generate_block_varref($namespace, $varname); + + $code = str_replace($varrefs[0][$i], $new, $code); + } + + // This will handle the remaining root-level varrefs + $code = preg_replace('#\{([a-z0-9\-_]*?)\}#is', '\' . ( ( isset($this->_tpldata[\'.\'][0][\'\1\']) ) ? $this->_tpldata[\'.\'][0][\'\1\'] : \'\' ) . \'', $code); + + // Break it up into lines. + $code_lines = explode("\n", $code); + + $block_nesting_level = 0; + $block_names = array(); + $block_names[0] = "."; + + // Second: prepend echo ', append ' . "\n"; to each line. + $line_count = sizeof($code_lines); + for ($i = 0; $i < $line_count; $i++) + { + $code_lines[$i] = chop($code_lines[$i]); + if (preg_match('##', $code_lines[$i], $m)) { - do - { - if ($row['template_mtime'] < filemtime($phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template/' . $row['template_filename'])) - { - if ($row['template_filename'] == $this->filename[$handle]) - { - $compile->_tpl_load_file($handle); - } - else - { - $this->files[$row['template_filename']] = $this->root . '/' . $row['template_filename']; - $compile->_tpl_load_file($row['template_filename']); - unset($this->compiled_code[$row['template_filename']]); - unset($this->files[$row['template_filename']]); - unset($this->filename[$row['template_filename']]); - } - } + $n[0] = $m[0]; + $n[1] = $m[1]; - if ($row['template_filename'] == $this->filename[$handle]) + // Added: dougk_ff7-Keeps templates from bombing if begin is on the same line as end.. I think. :) + if ( preg_match('##', $code_lines[$i], $n) ) + { + $block_nesting_level++; + $block_names[$block_nesting_level] = $m[1]; + if ($block_nesting_level < 2) { - $this->compiled_code[$handle] = $compile->compile(trim($row['template_data'])); - $compile->compile_write($handle, $this->compiled_code[$handle]); + // Block is not nested. + $code_lines[$i] = '$_' . $n[1] . '_count = ( isset($this->_tpldata[\'' . $n[1] . '.\']) ) ? sizeof($this->_tpldata[\'' . $n[1] . '.\']) : 0;'; + $code_lines[$i] .= "\n" . 'for ($_' . $n[1] . '_i = 0; $_' . $n[1] . '_i < $_' . $n[1] . '_count; $_' . $n[1] . '_i++)'; + $code_lines[$i] .= "\n" . '{'; } else { - // Only bother compiling if it doesn't already exist - if (!file_exists($this->cachepath . str_replace('/', '.', $row['template_filename']) . '.' . $phpEx)) - { - $this->filename[$row['template_filename']] = $row['template_filename']; - $compile->compile_write($row['template_filename'], $compile->compile(trim($row['template_data']))); - unset($this->filename[$row['template_filename']]); - } + // This block is nested. + + // Generate a namespace string for this block. + $namespace = implode('.', $block_names); + // strip leading period from root level.. + $namespace = substr($namespace, 2); + // Get a reference to the data array for this block that depends on the + // current indices of all parent blocks. + $varref = $this->generate_block_data_ref($namespace, false); + // Create the for loop code to iterate over this block. + $code_lines[$i] = '$_' . $n[1] . '_count = ( isset(' . $varref . ') ) ? sizeof(' . $varref . ') : 0;'; + $code_lines[$i] .= "\n" . 'for ($_' . $n[1] . '_i = 0; $_' . $n[1] . '_i < $_' . $n[1] . '_count; $_' . $n[1] . '_i++)'; + $code_lines[$i] .= "\n" . '{'; + } + + // We have the end of a block. + unset($block_names[$block_nesting_level]); + $block_nesting_level--; + $code_lines[$i] .= '} // END ' . $n[1]; + $m[0] = $n[0]; + $m[1] = $n[1]; + } + else + { + // We have the start of a block. + $block_nesting_level++; + $block_names[$block_nesting_level] = $m[1]; + if ($block_nesting_level < 2) + { + // Block is not nested. + $code_lines[$i] = '$_' . $m[1] . '_count = ( isset($this->_tpldata[\'' . $m[1] . '.\']) ) ? sizeof($this->_tpldata[\'' . $m[1] . '.\']) : 0;'; + $code_lines[$i] .= "\n" . 'for ($_' . $m[1] . '_i = 0; $_' . $m[1] . '_i < $_' . $m[1] . '_count; $_' . $m[1] . '_i++)'; + $code_lines[$i] .= "\n" . '{'; + } + else + { + // This block is nested. + + // Generate a namespace string for this block. + $namespace = implode('.', $block_names); + // strip leading period from root level.. + $namespace = substr($namespace, 2); + // Get a reference to the data array for this block that depends on the + // current indices of all parent blocks. + $varref = $this->generate_block_data_ref($namespace, false); + // Create the for loop code to iterate over this block. + $code_lines[$i] = '$_' . $m[1] . '_count = ( isset(' . $varref . ') ) ? sizeof(' . $varref . ') : 0;'; + $code_lines[$i] .= "\n" . 'for ($_' . $m[1] . '_i = 0; $_' . $m[1] . '_i < $_' . $m[1] . '_count; $_' . $m[1] . '_i++)'; + $code_lines[$i] .= "\n" . '{'; } } - while ($row = $db->sql_fetchrow($result)); + } + else if (preg_match('##', $code_lines[$i], $m)) + { + // We have the end of a block. + unset($block_names[$block_nesting_level]); + $block_nesting_level--; + $code_lines[$i] = '} // END ' . $m[1]; } else { - // Try to load from filesystem and instruct to insert into the styles table... - $compile->_tpl_load_file($handle, true); - return false; - } - $db->sql_freeresult($result); - - return false; - } - - $compile->_tpl_load_file($handle); - return false; - } - - /** - * Assign key variable pairs from an array - * @access public - */ - public function assign_vars(array $vararray) - { - foreach ($vararray as $key => $val) - { - $this->_rootref[$key] = $val; - } - - return true; - } - - /** - * Assign a single variable to a single key - * @access public - */ - public function assign_var($varname, $varval) - { - $this->_rootref[$varname] = $varval; - - return true; - } - - /** - * Assign key variable pairs from an array to a specified block - * @access public - */ - public function assign_block_vars($blockname, array $vararray) - { - if (strpos($blockname, '.') !== false) - { - // Nested block. - $blocks = explode('.', $blockname); - $blockcount = sizeof($blocks) - 1; - - $str = &$this->_tpldata; - for ($i = 0; $i < $blockcount; $i++) - { - $str = &$str[$blocks[$i]]; - $str = &$str[sizeof($str) - 1]; - } - - $s_row_count = isset($str[$blocks[$blockcount]]) ? sizeof($str[$blocks[$blockcount]]) : 0; - $vararray['S_ROW_COUNT'] = $s_row_count; - - // Assign S_FIRST_ROW - if (!$s_row_count) - { - $vararray['S_FIRST_ROW'] = true; - } - - // Now the tricky part, we always assign S_LAST_ROW and remove the entry before - // This is much more clever than going through the complete template data on display (phew) - $vararray['S_LAST_ROW'] = true; - if ($s_row_count > 0) - { - unset($str[$blocks[$blockcount]][($s_row_count - 1)]['S_LAST_ROW']); - } - - // Now we add the block that we're actually assigning to. - // We're adding a new iteration to this block with the given - // variable assignments. - $str[$blocks[$blockcount]][] = $vararray; - } - else - { - // Top-level block. - $s_row_count = (isset($this->_tpldata[$blockname])) ? sizeof($this->_tpldata[$blockname]) : 0; - $vararray['S_ROW_COUNT'] = $s_row_count; - - // Assign S_FIRST_ROW - if (!$s_row_count) - { - $vararray['S_FIRST_ROW'] = true; - } - - // We always assign S_LAST_ROW and remove the entry before - $vararray['S_LAST_ROW'] = true; - if ($s_row_count > 0) - { - unset($this->_tpldata[$blockname][($s_row_count - 1)]['S_LAST_ROW']); - } - - // Add a new iteration to this block with the variable assignments we were given. - $this->_tpldata[$blockname][] = $vararray; - } - - return true; - } - - /** - * Change already assigned key variable pair (one-dimensional - single loop entry) - * - * An example of how to use this function: - * {@example alter_block_array.php} - * - * @param string $blockname the blockname, for example 'loop' - * @param array $vararray the var array to insert/add or merge - * @param mixed $key Key to search for - * - * array: KEY => VALUE [the key/value pair to search for within the loop to determine the correct position] - * - * int: Position [the position to change or insert at directly given] - * - * If key is false the position is set to 0 - * If key is true the position is set to the last entry - * - * @param string $mode Mode to execute (valid modes are 'insert' and 'change') - * - * If insert, the vararray is inserted at the given position (position counting from zero). - * If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new value). - * - * Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array) - * and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars) - * - * @return bool false on error, true on success - * @access public - */ - public function alter_block_array($blockname, array $vararray, $key = false, $mode = 'insert') - { - if (strpos($blockname, '.') !== false) - { - // Nested blocks are not supported - return false; - } - - // Change key to zero (change first position) if false and to last position if true - if ($key === false || $key === true) - { - $key = ($key === false) ? 0 : sizeof($this->_tpldata[$blockname]); - } - - // Get correct position if array given - if (is_array($key)) - { - // Search array to get correct position - list($search_key, $search_value) = @each($key); - - $key = NULL; - foreach ($this->_tpldata[$blockname] as $i => $val_ary) - { - if ($val_ary[$search_key] === $search_value) + // We have an ordinary line of code. + if (!$do_not_echo) { - $key = $i; - break; + $code_lines[$i] = 'echo \'' . $code_lines[$i] . '\' . "\\n";'; + } + else + { + $code_lines[$i] = '$' . $retvar . '.= \'' . $code_lines[$i] . '\' . "\\n";'; } } - - // key/value pair not found - if ($key === NULL) - { - return false; - } } - // Insert Block - if ($mode == 'insert') - { - // Make sure we are not exceeding the last iteration - if ($key >= sizeof($this->_tpldata[$blockname])) - { - $key = sizeof($this->_tpldata[$blockname]); - unset($this->_tpldata[$blockname][($key - 1)]['S_LAST_ROW']); - $vararray['S_LAST_ROW'] = true; - } - else if ($key === 0) - { - unset($this->_tpldata[$blockname][0]['S_FIRST_ROW']); - $vararray['S_FIRST_ROW'] = true; - } + // Bring it back into a single string of lines of code. + $code = implode("\n", $code_lines); + return $code ; - // Re-position template blocks - for ($i = sizeof($this->_tpldata[$blockname]); $i > $key; $i--) - { - $this->_tpldata[$blockname][$i] = $this->_tpldata[$blockname][$i-1]; - $this->_tpldata[$blockname][$i]['S_ROW_COUNT'] = $i; - } - - // Insert vararray at given position - $vararray['S_ROW_COUNT'] = $key; - $this->_tpldata[$blockname][$key] = $vararray; - - return true; - } - - // Which block to change? - if ($mode == 'change') - { - if ($key == sizeof($this->_tpldata[$blockname])) - { - $key--; - } - - $this->_tpldata[$blockname][$key] = array_merge($this->_tpldata[$blockname][$key], $vararray); - return true; - } - - return false; } + /** - * Include a separate template - * @access private - */ - public function _tpl_include($filename, $include = true) + * Generates a reference to the given variable inside the given (possibly nested) + * block namespace. This is a string of the form: + * ' . $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['varname'] . ' + * It's ready to be inserted into an "echo" line in one of the templates. + * NOTE: expects a trailing "." on the namespace. + */ + function generate_block_varref($namespace, $varname) { - $handle = $filename; - $this->filename[$handle] = $filename; - $this->files[$handle] = $this->root . '/' . $filename; + // Strip the trailing period. + $namespace = substr($namespace, 0, strlen($namespace) - 1); - $filename = $this->_tpl_load($handle); + // Get a reference to the data block for this namespace. + $varref = $this->generate_block_data_ref($namespace, true); + // Prepend the necessary code to stick this in an echo line. - if ($include) - { - global $user; + // Append the variable reference. + $varref .= '[\'' . $varname . '\']'; + + $varref = '\' . ( ( isset(' . $varref . ') ) ? ' . $varref . ' : \'\' ) . \''; + + return $varref; - if ($filename) - { - include($filename); - return; - } - eval(' ?>' . $this->compiled_code[$handle] . '_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['$childN'] + * + * If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above. + * NOTE: does not expect a trailing "." on the blockname. + */ + function generate_block_data_ref($blockname, $include_last_iterator) + { + // Get an array of the blocks involved. + $blocks = explode(".", $blockname); + $blockcount = sizeof($blocks) - 1; + $varref = '$this->_tpldata'; + // Build up the string with everything but the last child. + for ($i = 0; $i < $blockcount; $i++) + { + $varref .= '[\'' . $blocks[$i] . '.\'][$_' . $blocks[$i] . '_i]'; + } + // Add the block reference for the last child. + $varref .= '[\'' . $blocks[$blockcount] . '.\']'; + // Add the iterator for the last child if requried. + if ($include_last_iterator) + { + $varref .= '[$_' . $blocks[$blockcount] . '_i]'; + } + + return $varref; + } + } ?> \ No newline at end of file diff --git a/phpBB/includes/topic_review.php b/phpBB/includes/topic_review.php new file mode 100644 index 0000000000..a9689acf11 --- /dev/null +++ b/phpBB/includes/topic_review.php @@ -0,0 +1,228 @@ +sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain topic information', '', __LINE__, __FILE__, $sql); + } + + if ( !($forum_row = $db->sql_fetchrow($result)) ) + { + message_die(GENERAL_MESSAGE, 'Topic_post_not_exist'); + } + $db->sql_freeresult($result); + + $forum_id = $forum_row['forum_id']; + $topic_title = $forum_row['topic_title']; + + // + // Start session management + // + $userdata = session_pagestart($user_ip, $forum_id); + init_userprefs($userdata); + // + // End session management + // + + $is_auth = array(); + $is_auth = auth(AUTH_ALL, $forum_id, $userdata, $forum_row); + + if ( !$is_auth['auth_read'] ) + { + message_die(GENERAL_MESSAGE, sprintf($lang['Sorry_auth_read'], $is_auth['auth_read_type'])); + } + } + + // + // Define censored word matches + // + if ( empty($orig_word) && empty($replacement_word) ) + { + $orig_word = array(); + $replacement_word = array(); + + obtain_word_list($orig_word, $replacement_word); + } + + // + // Dump out the page header and load viewtopic body template + // + if ( !$is_inline_review ) + { + $gen_simple_header = TRUE; + + $page_title = $lang['Topic_review'] . ' - ' . $topic_title; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + $template->set_filenames(array( + 'reviewbody' => 'posting_topic_review.tpl') + ); + } + + // + // Go ahead and pull all data for this topic + // + $sql = "SELECT u.username, u.user_id, p.*, pt.post_text, pt.post_subject, pt.bbcode_uid + FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt + WHERE p.topic_id = $topic_id + AND p.poster_id = u.user_id + AND p.post_id = pt.post_id + ORDER BY p.post_time DESC + LIMIT " . $board_config['posts_per_page']; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain post/user information', '', __LINE__, __FILE__, $sql); + } + + // + // Okay, let's do the loop, yeah come on baby let's do the loop + // and it goes like this ... + // + if ( $row = $db->sql_fetchrow($result) ) + { + $mini_post_img = $images['icon_minipost']; + $mini_post_alt = $lang['Post']; + + $i = 0; + do + { + $poster_id = $row['user_id']; + $poster = $row['username']; + + $post_date = create_date($board_config['default_dateformat'], $row['post_time'], $board_config['board_timezone']); + + // + // Handle anon users posting with usernames + // + if( $poster_id == ANONYMOUS && $row['post_username'] != '' ) + { + $poster = $row['post_username']; + $poster_rank = $lang['Guest']; + } + elseif ( $poster_id == ANONYMOUS ) + { + $poster = $lang['Guest']; + $poster_rank = ''; + } + + $post_subject = ( $row['post_subject'] != '' ) ? $row['post_subject'] : ''; + + $message = $row['post_text']; + $bbcode_uid = $row['bbcode_uid']; + + // + // If the board has HTML off but the post has HTML + // on then we process it, else leave it alone + // + if ( !$board_config['allow_html'] && $row['enable_html'] ) + { + $message = preg_replace('#(<)([\/]?.*?)(>)#is', '<\2>', $message); + } + + if ( $bbcode_uid != "" ) + { + $message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $message); + } + + $message = make_clickable($message); + + if ( count($orig_word) ) + { + $post_subject = preg_replace($orig_word, $replacement_word, $post_subject); + $message = preg_replace($orig_word, $replacement_word, $message); + } + + if ( $board_config['allow_smilies'] && $row['enable_smilies'] ) + { + $message = smilies_pass($message); + } + + $message = str_replace("\n", '
    ', $message); + + // + // Again this will be handled by the templating + // code at some point + // + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $template->assign_block_vars('postrow', array( + 'ROW_COLOR' => '#' . $row_color, + 'ROW_CLASS' => $row_class, + + 'MINI_POST_IMG' => $mini_post_img, + 'POSTER_NAME' => $poster, + 'POST_DATE' => $post_date, + 'POST_SUBJECT' => $post_subject, + 'MESSAGE' => $message, + + 'L_MINI_POST_ALT' => $mini_post_alt) + ); + + $i++; + } + while ( $row = $db->sql_fetchrow($result) ); + } + else + { + message_die(GENERAL_MESSAGE, 'Topic_post_not_exist', '', __LINE__, __FILE__, $sql); + } + $db->sql_freeresult($result); + + $template->assign_vars(array( + 'L_AUTHOR' => $lang['Author'], + 'L_MESSAGE' => $lang['Message'], + 'L_POSTED' => $lang['Posted'], + 'L_POST_SUBJECT' => $lang['Post_subject'], + 'L_TOPIC_REVIEW' => $lang['Topic_review']) + ); + + if ( !$is_inline_review ) + { + $template->pparse('reviewbody'); + include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + } +} + +?> \ No newline at end of file diff --git a/phpBB/includes/ucp/info/ucp_attachments.php b/phpBB/includes/ucp/info/ucp_attachments.php deleted file mode 100644 index 84edce446c..0000000000 --- a/phpBB/includes/ucp/info/ucp_attachments.php +++ /dev/null @@ -1,37 +0,0 @@ - 'ucp_attachments', - 'title' => 'UCP_ATTACHMENTS', - 'version' => '1.0.0', - 'modes' => array( - 'attachments' => array('title' => 'UCP_MAIN_ATTACHMENTS', 'auth' => 'acl_u_attach', 'cat' => array('UCP_MAIN')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/info/ucp_groups.php b/phpBB/includes/ucp/info/ucp_groups.php deleted file mode 100644 index 2002123c50..0000000000 --- a/phpBB/includes/ucp/info/ucp_groups.php +++ /dev/null @@ -1,38 +0,0 @@ - 'ucp_groups', - 'title' => 'UCP_USERGROUPS', - 'version' => '1.0.0', - 'modes' => array( - 'membership' => array('title' => 'UCP_USERGROUPS_MEMBER', 'auth' => '', 'cat' => array('UCP_USERGROUPS')), - 'manage' => array('title' => 'UCP_USERGROUPS_MANAGE', 'auth' => '', 'cat' => array('UCP_USERGROUPS')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/info/ucp_main.php b/phpBB/includes/ucp/info/ucp_main.php deleted file mode 100644 index 722b7865e6..0000000000 --- a/phpBB/includes/ucp/info/ucp_main.php +++ /dev/null @@ -1,40 +0,0 @@ - 'ucp_main', - 'title' => 'UCP_MAIN', - 'version' => '1.0.0', - 'modes' => array( - 'front' => array('title' => 'UCP_MAIN_FRONT', 'auth' => '', 'cat' => array('UCP_MAIN')), - 'subscribed' => array('title' => 'UCP_MAIN_SUBSCRIBED', 'auth' => '', 'cat' => array('UCP_MAIN')), - 'bookmarks' => array('title' => 'UCP_MAIN_BOOKMARKS', 'auth' => 'cfg_allow_bookmarks', 'cat' => array('UCP_MAIN')), - 'drafts' => array('title' => 'UCP_MAIN_DRAFTS', 'auth' => '', 'cat' => array('UCP_MAIN')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/info/ucp_pm.php b/phpBB/includes/ucp/info/ucp_pm.php deleted file mode 100644 index ade12005c0..0000000000 --- a/phpBB/includes/ucp/info/ucp_pm.php +++ /dev/null @@ -1,40 +0,0 @@ - 'ucp_pm', - 'title' => 'UCP_PM', - 'version' => '1.0.0', - 'modes' => array( - 'view' => array('title' => 'UCP_PM_VIEW', 'auth' => 'cfg_allow_privmsg', 'display' => false, 'cat' => array('UCP_PM')), - 'compose' => array('title' => 'UCP_PM_COMPOSE', 'auth' => 'cfg_allow_privmsg', 'cat' => array('UCP_PM')), - 'drafts' => array('title' => 'UCP_PM_DRAFTS', 'auth' => 'cfg_allow_privmsg', 'cat' => array('UCP_PM')), - 'options' => array('title' => 'UCP_PM_OPTIONS', 'auth' => 'cfg_allow_privmsg', 'cat' => array('UCP_PM')), - 'popup' => array('title' => 'UCP_PM_POPUP_TITLE', 'auth' => 'cfg_allow_privmsg', 'display' => false, 'cat' => array('UCP_PM')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/info/ucp_prefs.php b/phpBB/includes/ucp/info/ucp_prefs.php deleted file mode 100644 index 58359e8a19..0000000000 --- a/phpBB/includes/ucp/info/ucp_prefs.php +++ /dev/null @@ -1,39 +0,0 @@ - 'ucp_prefs', - 'title' => 'UCP_PREFS', - 'version' => '1.0.0', - 'modes' => array( - 'personal' => array('title' => 'UCP_PREFS_PERSONAL', 'auth' => '', 'cat' => array('UCP_PREFS')), - 'post' => array('title' => 'UCP_PREFS_POST', 'auth' => '', 'cat' => array('UCP_PREFS')), - 'view' => array('title' => 'UCP_PREFS_VIEW', 'auth' => '', 'cat' => array('UCP_PREFS')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/info/ucp_profile.php b/phpBB/includes/ucp/info/ucp_profile.php deleted file mode 100644 index 03a4c81f46..0000000000 --- a/phpBB/includes/ucp/info/ucp_profile.php +++ /dev/null @@ -1,40 +0,0 @@ - 'ucp_profile', - 'title' => 'UCP_PROFILE', - 'version' => '1.0.0', - 'modes' => array( - 'profile_info' => array('title' => 'UCP_PROFILE_PROFILE_INFO', 'auth' => '', 'cat' => array('UCP_PROFILE')), - 'signature' => array('title' => 'UCP_PROFILE_SIGNATURE', 'auth' => '', 'cat' => array('UCP_PROFILE')), - 'avatar' => array('title' => 'UCP_PROFILE_AVATAR', 'auth' => '', 'cat' => array('UCP_PROFILE')), - 'reg_details' => array('title' => 'UCP_PROFILE_REG_DETAILS', 'auth' => '', 'cat' => array('UCP_PROFILE')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/info/ucp_zebra.php b/phpBB/includes/ucp/info/ucp_zebra.php deleted file mode 100644 index 5fc1f8bee7..0000000000 --- a/phpBB/includes/ucp/info/ucp_zebra.php +++ /dev/null @@ -1,38 +0,0 @@ - 'ucp_zebra', - 'title' => 'UCP_ZEBRA', - 'version' => '1.0.0', - 'modes' => array( - 'friends' => array('title' => 'UCP_ZEBRA_FRIENDS', 'auth' => '', 'cat' => array('UCP_ZEBRA')), - 'foes' => array('title' => 'UCP_ZEBRA_FOES', 'auth' => '', 'cat' => array('UCP_ZEBRA')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php deleted file mode 100644 index 355c9898c2..0000000000 --- a/phpBB/includes/ucp/ucp_activate.php +++ /dev/null @@ -1,128 +0,0 @@ -sql_query($sql); - $user_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$user_row) - { - trigger_error('NO_USER'); - } - - if ($user_row['user_type'] <> USER_INACTIVE && !$user_row['user_newpasswd']) - { - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); - trigger_error('ALREADY_ACTIVATED'); - } - - if ($user_row['user_actkey'] != $key) - { - trigger_error('WRONG_ACTIVATION'); - } - - $update_password = ($user_row['user_newpasswd']) ? true : false; - - if ($update_password) - { - $sql_ary = array( - 'user_actkey' => '', - 'user_password' => $user_row['user_newpasswd'], - 'user_newpasswd' => '', - 'user_pass_convert' => 0, - ); - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_id = ' . $user_row['user_id']; - $db->sql_query($sql); - } - - if (!$update_password) - { - include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx); - - user_active_flip('activate', $user_row['user_id']); - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_actkey = '' - WHERE user_id = {$user_row['user_id']}"; - $db->sql_query($sql); - } - - if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !$update_password) - { - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - - $messenger = new messenger(false); - - $messenger->template('admin_welcome_activated', $user_row['user_lang']); - - $messenger->to($user_row['user_email'], $user_row['username']); - - $messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); - $messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']); - $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']); - $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($user_row['username'])) - ); - - $messenger->send($user_row['user_notify_type']); - - $message = 'ACCOUNT_ACTIVE_ADMIN'; - } - else - { - if (!$update_password) - { - $message = ($user_row['user_inactive_reason'] == INACTIVE_PROFILE) ? 'ACCOUNT_ACTIVE_PROFILE' : 'ACCOUNT_ACTIVE'; - } - else - { - $message = 'PASSWORD_ACTIVATED'; - } - } - - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); - trigger_error($user->lang[$message]); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/ucp_attachments.php b/phpBB/includes/ucp/ucp_attachments.php deleted file mode 100644 index 5685702de2..0000000000 --- a/phpBB/includes/ucp/ucp_attachments.php +++ /dev/null @@ -1,201 +0,0 @@ -data['user_id'] . ' - AND is_orphan = 0 - AND ' . $db->sql_in_set('attach_id', $delete_ids); - $result = $db->sql_query($sql); - - $delete_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $delete_ids[] = $row['attach_id']; - } - $db->sql_freeresult($result); - } - - if ($delete && sizeof($delete_ids)) - { - $s_hidden_fields = array( - 'delete' => 1 - ); - - foreach ($delete_ids as $attachment_id) - { - $s_hidden_fields['attachment'][$attachment_id] = 1; - } - - if (confirm_box(true)) - { - if (!function_exists('delete_attachments')) - { - include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); - } - - delete_attachments('attach', $delete_ids); - - meta_refresh(3, $this->u_action); - $message = ((sizeof($delete_ids) == 1) ? $user->lang['ATTACHMENT_DELETED'] : $user->lang['ATTACHMENTS_DELETED']) . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - trigger_error($message); - } - else - { - confirm_box(false, (sizeof($delete_ids) == 1) ? 'DELETE_ATTACHMENT' : 'DELETE_ATTACHMENTS', build_hidden_fields($s_hidden_fields)); - } - } - - // Select box eventually - $sort_key_text = array('a' => $user->lang['SORT_FILENAME'], 'b' => $user->lang['SORT_COMMENT'], 'c' => $user->lang['SORT_EXTENSION'], 'd' => $user->lang['SORT_SIZE'], 'e' => $user->lang['SORT_DOWNLOADS'], 'f' => $user->lang['SORT_POST_TIME'], 'g' => $user->lang['SORT_TOPIC_TITLE']); - $sort_key_sql = array('a' => 'a.real_filename', 'b' => 'a.attach_comment', 'c' => 'a.extension', 'd' => 'a.filesize', 'e' => 'a.download_count', 'f' => 'a.filetime', 'g' => 't.topic_title'); - - $sort_dir_text = array('a' => $user->lang['ASCENDING'], 'd' => $user->lang['DESCENDING']); - - $s_sort_key = ''; - foreach ($sort_key_text as $key => $value) - { - $selected = ($sort_key == $key) ? ' selected="selected"' : ''; - $s_sort_key .= ''; - } - - $s_sort_dir = ''; - foreach ($sort_dir_text as $key => $value) - { - $selected = ($sort_dir == $key) ? ' selected="selected"' : ''; - $s_sort_dir .= ''; - } - - if (!isset($sort_key_sql[$sort_key])) - { - $sort_key = 'a'; - } - - $order_by = $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC'); - - $sql = 'SELECT COUNT(attach_id) as num_attachments - FROM ' . ATTACHMENTS_TABLE . ' - WHERE poster_id = ' . $user->data['user_id'] . ' - AND is_orphan = 0'; - $result = $db->sql_query($sql); - $num_attachments = $db->sql_fetchfield('num_attachments'); - $db->sql_freeresult($result); - - $sql = 'SELECT a.*, t.topic_title, p.message_subject as message_title - FROM ' . ATTACHMENTS_TABLE . ' a - LEFT JOIN ' . TOPICS_TABLE . ' t ON (a.topic_id = t.topic_id AND a.in_message = 0) - LEFT JOIN ' . PRIVMSGS_TABLE . ' p ON (a.post_msg_id = p.msg_id AND a.in_message = 1) - WHERE a.poster_id = ' . $user->data['user_id'] . " - AND a.is_orphan = 0 - ORDER BY $order_by"; - $result = $db->sql_query_limit($sql, $config['topics_per_page'], $start); - - $row_count = 0; - if ($row = $db->sql_fetchrow($result)) - { - $template->assign_var('S_ATTACHMENT_ROWS', true); - - do - { - if ($row['in_message']) - { - $view_topic = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&p={$row['post_msg_id']}"); - } - else - { - $view_topic = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t={$row['topic_id']}&p={$row['post_msg_id']}") . "#p{$row['post_msg_id']}"; - } - - $template->assign_block_vars('attachrow', array( - 'ROW_NUMBER' => $row_count + ($start + 1), - 'FILENAME' => $row['real_filename'], - 'COMMENT' => bbcode_nl2br($row['attach_comment']), - 'EXTENSION' => $row['extension'], - 'SIZE' => get_formatted_filesize($row['filesize']), - 'DOWNLOAD_COUNT' => $row['download_count'], - 'POST_TIME' => $user->format_date($row['filetime']), - 'TOPIC_TITLE' => ($row['in_message']) ? $row['message_title'] : $row['topic_title'], - - 'ATTACH_ID' => $row['attach_id'], - 'POST_ID' => $row['post_msg_id'], - 'TOPIC_ID' => $row['topic_id'], - - 'S_IN_MESSAGE' => $row['in_message'], - - 'U_VIEW_ATTACHMENT' => append_sid("{$phpbb_root_path}download/file.$phpEx", 'id=' . $row['attach_id']), - 'U_VIEW_TOPIC' => $view_topic) - ); - - $row_count++; - } - while ($row = $db->sql_fetchrow($result)); - } - $db->sql_freeresult($result); - - $template->assign_vars(array( - 'PAGE_NUMBER' => on_page($num_attachments, $config['topics_per_page'], $start), - 'PAGINATION' => generate_pagination($this->u_action . "&sk=$sort_key&sd=$sort_dir", $num_attachments, $config['topics_per_page'], $start), - 'TOTAL_ATTACHMENTS' => $num_attachments, - - 'L_TITLE' => $user->lang['UCP_ATTACHMENTS'], - - 'U_SORT_FILENAME' => $this->u_action . "&sk=a&sd=" . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a'), - 'U_SORT_FILE_COMMENT' => $this->u_action . "&sk=b&sd=" . (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a'), - 'U_SORT_EXTENSION' => $this->u_action . "&sk=c&sd=" . (($sort_key == 'c' && $sort_dir == 'a') ? 'd' : 'a'), - 'U_SORT_FILESIZE' => $this->u_action . "&sk=d&sd=" . (($sort_key == 'd' && $sort_dir == 'a') ? 'd' : 'a'), - 'U_SORT_DOWNLOADS' => $this->u_action . "&sk=e&sd=" . (($sort_key == 'e' && $sort_dir == 'a') ? 'd' : 'a'), - 'U_SORT_POST_TIME' => $this->u_action . "&sk=f&sd=" . (($sort_key == 'f' && $sort_dir == 'a') ? 'd' : 'a'), - 'U_SORT_TOPIC_TITLE' => $this->u_action . "&sk=g&sd=" . (($sort_key == 'f' && $sort_dir == 'a') ? 'd' : 'a'), - - 'S_DISPLAY_MARK_ALL' => ($num_attachments) ? true : false, - 'S_DISPLAY_PAGINATION' => ($num_attachments) ? true : false, - 'S_UCP_ACTION' => $this->u_action, - 'S_SORT_OPTIONS' => $s_sort_key, - 'S_ORDER_SELECT' => $s_sort_dir) - ); - - $this->tpl_name = 'ucp_attachments'; - $this->page_title = 'UCP_ATTACHMENTS'; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/ucp_confirm.php b/phpBB/includes/ucp/ucp_confirm.php deleted file mode 100644 index e416ff4b88..0000000000 --- a/phpBB/includes/ucp/ucp_confirm.php +++ /dev/null @@ -1,79 +0,0 @@ -sql_escape($user->session_id) . "' - AND confirm_id = '" . $db->sql_escape($confirm_id) . "' - AND confirm_type = $type"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // If we have a row then grab data else create a new id - if (!$row) - { - exit; - } - - if ($config['captcha_gd']) - { - include($phpbb_root_path . 'includes/captcha/captcha_gd.' . $phpEx); - } - else - { - include($phpbb_root_path . 'includes/captcha/captcha_non_gd.' . $phpEx); - } - - captcha::execute($row['code'], $row['seed']); - exit; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php deleted file mode 100644 index d884e0d571..0000000000 --- a/phpBB/includes/ucp/ucp_groups.php +++ /dev/null @@ -1,1073 +0,0 @@ -add_lang('groups'); - - $return_page = '

    ' . sprintf($user->lang['RETURN_PAGE'], '', ''); - - $mark_ary = request_var('mark', array(0)); - $submit = (!empty($_POST['submit'])) ? true : false; - $delete = (!empty($_POST['delete'])) ? true : false; - $error = $data = array(); - - switch ($mode) - { - case 'membership': - - $this->page_title = 'UCP_USERGROUPS_MEMBER'; - - if ($submit || isset($_POST['change_default'])) - { - $action = (isset($_POST['change_default'])) ? 'change_default' : request_var('action', ''); - $group_id = ($action == 'change_default') ? request_var('default', 0) : request_var('selected', 0); - - if (!$group_id) - { - trigger_error('NO_GROUP_SELECTED'); - } - - $sql = 'SELECT group_id, group_name, group_type - FROM ' . GROUPS_TABLE . " - WHERE group_id IN ($group_id, {$user->data['group_id']})"; - $result = $db->sql_query($sql); - - $group_row = array(); - while ($row = $db->sql_fetchrow($result)) - { - $row['group_name'] = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']; - $group_row[$row['group_id']] = $row; - } - $db->sql_freeresult($result); - - if (!sizeof($group_row)) - { - trigger_error('GROUP_NOT_EXIST'); - } - - switch ($action) - { - case 'change_default': - // User already having this group set as default? - if ($group_id == $user->data['group_id']) - { - trigger_error($user->lang['ALREADY_DEFAULT_GROUP'] . $return_page); - } - - if (!$auth->acl_get('u_chggrp')) - { - trigger_error($user->lang['NOT_AUTHORISED'] . $return_page); - } - - // User needs to be member of the group in order to make it default - if (!group_memberships($group_id, $user->data['user_id'], true)) - { - trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page); - } - - if (confirm_box(true)) - { - group_user_attributes('default', $group_id, $user->data['user_id']); - - add_log('user', $user->data['user_id'], 'LOG_USER_GROUP_CHANGE', sprintf($user->lang['USER_GROUP_CHANGE'], $group_row[$user->data['group_id']]['group_name'], $group_row[$group_id]['group_name'])); - - meta_refresh(3, $this->u_action); - trigger_error($user->lang['CHANGED_DEFAULT_GROUP'] . $return_page); - } - else - { - $s_hidden_fields = array( - 'default' => $group_id, - 'change_default'=> true - ); - - confirm_box(false, sprintf($user->lang['GROUP_CHANGE_DEFAULT'], $group_row[$group_id]['group_name']), build_hidden_fields($s_hidden_fields)); - } - - break; - - case 'resign': - - // User tries to resign from default group but is not allowed to change it? - if ($group_id == $user->data['group_id'] && !$auth->acl_get('u_chggrp')) - { - trigger_error($user->lang['NOT_RESIGN_FROM_DEFAULT_GROUP'] . $return_page); - } - - if (!($row = group_memberships($group_id, $user->data['user_id']))) - { - trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page); - } - list(, $row) = each($row); - - $sql = 'SELECT group_type - FROM ' . GROUPS_TABLE . ' - WHERE group_id = ' . $group_id; - $result = $db->sql_query($sql); - $group_type = (int) $db->sql_fetchfield('group_type'); - $db->sql_freeresult($result); - - if ($group_type != GROUP_OPEN && $group_type != GROUP_FREE) - { - trigger_error($user->lang['CANNOT_RESIGN_GROUP'] . $return_page); - } - - if (confirm_box(true)) - { - group_user_del($group_id, $user->data['user_id']); - - add_log('user', $user->data['user_id'], 'LOG_USER_GROUP_RESIGN', $group_row[$group_id]['group_name']); - - meta_refresh(3, $this->u_action); - trigger_error($user->lang[($row['user_pending']) ? 'GROUP_RESIGNED_PENDING' : 'GROUP_RESIGNED_MEMBERSHIP'] . $return_page); - } - else - { - $s_hidden_fields = array( - 'selected' => $group_id, - 'action' => 'resign', - 'submit' => true - ); - - confirm_box(false, ($row['user_pending']) ? 'GROUP_RESIGN_PENDING' : 'GROUP_RESIGN_MEMBERSHIP', build_hidden_fields($s_hidden_fields)); - } - - break; - - case 'join': - - $sql = 'SELECT ug.*, u.username, u.username_clean, u.user_email - FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . ' u - WHERE ug.user_id = u.user_id - AND ug.group_id = ' . $group_id . ' - AND ug.user_id = ' . $user->data['user_id']; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - if ($row['user_pending']) - { - trigger_error($user->lang['ALREADY_IN_GROUP_PENDING'] . $return_page); - } - - trigger_error($user->lang['ALREADY_IN_GROUP'] . $return_page); - } - - // Check permission to join (open group or request) - if ($group_row[$group_id]['group_type'] != GROUP_OPEN && $group_row[$group_id]['group_type'] != GROUP_FREE) - { - trigger_error($user->lang['CANNOT_JOIN_GROUP'] . $return_page); - } - - if (confirm_box(true)) - { - if ($group_row[$group_id]['group_type'] == GROUP_FREE) - { - group_user_add($group_id, $user->data['user_id']); - - $email_template = 'group_added'; - } - else - { - group_user_add($group_id, $user->data['user_id'], false, false, false, 0, 1); - - $email_template = 'group_request'; - } - - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - $messenger = new messenger(); - - $sql = 'SELECT u.username, u.username_clean, u.user_email, u.user_notify_type, u.user_jabber, u.user_lang - FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . ' u - WHERE ug.user_id = u.user_id - AND ' . (($group_row[$group_id]['group_type'] == GROUP_FREE) ? "ug.user_id = {$user->data['user_id']}" : 'ug.group_leader = 1') . " - AND ug.group_id = $group_id"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $messenger->template($email_template, $row['user_lang']); - - $messenger->to($row['user_email'], $row['username']); - $messenger->im($row['user_jabber'], $row['username']); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($row['username']), - 'GROUP_NAME' => htmlspecialchars_decode($group_row[$group_id]['group_name']), - - 'U_PENDING' => generate_board_url() . "/ucp.$phpEx?i=groups&mode=manage&action=list&g=$group_id", - 'U_GROUP' => generate_board_url() . "/memberlist.$phpEx?mode=group&g=$group_id") - ); - - $messenger->send($row['user_notify_type']); - } - $db->sql_freeresult($result); - - $messenger->save_queue(); - - add_log('user', $user->data['user_id'], 'LOG_USER_GROUP_JOIN' . (($group_row[$group_id]['group_type'] == GROUP_FREE) ? '' : '_PENDING'), $group_row[$group_id]['group_name']); - - meta_refresh(3, $this->u_action); - trigger_error($user->lang[($group_row[$group_id]['group_type'] == GROUP_FREE) ? 'GROUP_JOINED' : 'GROUP_JOINED_PENDING'] . $return_page); - } - else - { - $s_hidden_fields = array( - 'selected' => $group_id, - 'action' => 'join', - 'submit' => true - ); - - confirm_box(false, ($group_row[$group_id]['group_type'] == GROUP_FREE) ? 'GROUP_JOIN' : 'GROUP_JOIN_PENDING', build_hidden_fields($s_hidden_fields)); - } - - break; - - case 'demote': - - if (!($row = group_memberships($group_id, $user->data['user_id']))) - { - trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page); - } - list(, $row) = each($row); - - if (!$row['group_leader']) - { - trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page); - } - - if (confirm_box(true)) - { - group_user_attributes('demote', $group_id, $user->data['user_id']); - - add_log('user', $user->data['user_id'], 'LOG_USER_GROUP_DEMOTE', $group_row[$group_id]['group_name']); - - meta_refresh(3, $this->u_action); - trigger_error($user->lang['USER_GROUP_DEMOTED'] . $return_page); - } - else - { - $s_hidden_fields = array( - 'selected' => $group_id, - 'action' => 'demote', - 'submit' => true - ); - - confirm_box(false, 'USER_GROUP_DEMOTE', build_hidden_fields($s_hidden_fields)); - } - - break; - } - } - - $sql = 'SELECT g.*, ug.group_leader, ug.user_pending - FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug - WHERE ug.user_id = ' . $user->data['user_id'] . ' - AND g.group_id = ug.group_id - ORDER BY g.group_type DESC, g.group_name'; - $result = $db->sql_query($sql); - - $group_id_ary = array(); - $leader_count = $member_count = $pending_count = 0; - while ($row = $db->sql_fetchrow($result)) - { - $block = ($row['group_leader']) ? 'leader' : (($row['user_pending']) ? 'pending' : 'member'); - - switch ($row['group_type']) - { - case GROUP_OPEN: - $group_status = 'OPEN'; - break; - - case GROUP_CLOSED: - $group_status = 'CLOSED'; - break; - - case GROUP_HIDDEN: - $group_status = 'HIDDEN'; - break; - - case GROUP_SPECIAL: - $group_status = 'SPECIAL'; - break; - - case GROUP_FREE: - $group_status = 'FREE'; - break; - } - - $template->assign_block_vars($block, array( - 'GROUP_ID' => $row['group_id'], - 'GROUP_NAME' => ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'], - 'GROUP_DESC' => ($row['group_type'] <> GROUP_SPECIAL) ? generate_text_for_display($row['group_desc'], $row['group_desc_uid'], $row['group_desc_bitfield'], $row['group_desc_options']) : $user->lang['GROUP_IS_SPECIAL'], - 'GROUP_SPECIAL' => ($row['group_type'] <> GROUP_SPECIAL) ? false : true, - 'GROUP_STATUS' => $user->lang['GROUP_IS_' . $group_status], - 'GROUP_COLOUR' => $row['group_colour'], - - 'U_VIEW_GROUP' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $row['group_id']), - - 'S_GROUP_DEFAULT' => ($row['group_id'] == $user->data['group_id']) ? true : false, - 'S_ROW_COUNT' => ${$block . '_count'}++) - ); - - $group_id_ary[] = $row['group_id']; - } - $db->sql_freeresult($result); - - // Hide hidden groups unless user is an admin with group privileges - $sql_and = ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? '<> ' . GROUP_SPECIAL : 'NOT IN (' . GROUP_SPECIAL . ', ' . GROUP_HIDDEN . ')'; - - $sql = 'SELECT group_id, group_name, group_colour, group_desc, group_desc_uid, group_desc_bitfield, group_desc_options, group_type, group_founder_manage - FROM ' . GROUPS_TABLE . ' - WHERE ' . ((sizeof($group_id_ary)) ? $db->sql_in_set('group_id', $group_id_ary, true) . ' AND ' : '') . " - group_type $sql_and - ORDER BY group_type DESC, group_name"; - $result = $db->sql_query($sql); - - $nonmember_count = 0; - while ($row = $db->sql_fetchrow($result)) - { - switch ($row['group_type']) - { - case GROUP_OPEN: - $group_status = 'OPEN'; - break; - - case GROUP_CLOSED: - $group_status = 'CLOSED'; - break; - - case GROUP_HIDDEN: - $group_status = 'HIDDEN'; - break; - - case GROUP_SPECIAL: - $group_status = 'SPECIAL'; - break; - - case GROUP_FREE: - $group_status = 'FREE'; - break; - } - - $template->assign_block_vars('nonmember', array( - 'GROUP_ID' => $row['group_id'], - 'GROUP_NAME' => ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'], - 'GROUP_DESC' => ($row['group_type'] <> GROUP_SPECIAL) ? generate_text_for_display($row['group_desc'], $row['group_desc_uid'], $row['group_desc_bitfield'], $row['group_desc_options']) : $user->lang['GROUP_IS_SPECIAL'], - 'GROUP_SPECIAL' => ($row['group_type'] <> GROUP_SPECIAL) ? false : true, - 'GROUP_CLOSED' => ($row['group_type'] <> GROUP_CLOSED || $auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? false : true, - 'GROUP_STATUS' => $user->lang['GROUP_IS_' . $group_status], - 'S_CAN_JOIN' => ($row['group_type'] == GROUP_OPEN || $row['group_type'] == GROUP_FREE) ? true : false, - 'GROUP_COLOUR' => $row['group_colour'], - - 'U_VIEW_GROUP' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $row['group_id']), - - 'S_ROW_COUNT' => $nonmember_count++) - ); - } - $db->sql_freeresult($result); - - $template->assign_vars(array( - 'S_CHANGE_DEFAULT' => ($auth->acl_get('u_chggrp')) ? true : false, - 'S_LEADER_COUNT' => $leader_count, - 'S_MEMBER_COUNT' => $member_count, - 'S_PENDING_COUNT' => $pending_count, - 'S_NONMEMBER_COUNT' => $nonmember_count, - - 'S_UCP_ACTION' => $this->u_action) - ); - - break; - - case 'manage': - - $this->page_title = 'UCP_USERGROUPS_MANAGE'; - $action = (isset($_POST['addusers'])) ? 'addusers' : request_var('action', ''); - $group_id = request_var('g', 0); - add_form_key('ucp_groups'); - - if ($group_id) - { - $sql = 'SELECT * - FROM ' . GROUPS_TABLE . " - WHERE group_id = $group_id"; - $result = $db->sql_query($sql); - $group_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$group_row) - { - trigger_error($user->lang['NO_GROUP'] . $return_page); - } - - // Check if the user is allowed to manage this group if set to founder only. - if ($user->data['user_type'] != USER_FOUNDER && $group_row['group_founder_manage']) - { - trigger_error($user->lang['NOT_ALLOWED_MANAGE_GROUP'] . $return_page, E_USER_WARNING); - } - } - - switch ($action) - { - case 'edit': - - include($phpbb_root_path . 'includes/functions_display.' . $phpEx); - - if (!$group_id) - { - trigger_error($user->lang['NO_GROUP'] . $return_page); - } - - if (!($row = group_memberships($group_id, $user->data['user_id']))) - { - trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page); - } - list(, $row) = each($row); - - if (!$row['group_leader']) - { - trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page); - } - - $file_uploads = (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on') ? true : false; - $user->add_lang(array('acp/groups', 'acp/common')); - - $data = $submit_ary = array(); - - $update = (isset($_POST['update'])) ? true : false; - - $error = array(); - - $avatar_select = basename(request_var('avatar_select', '')); - $category = basename(request_var('category', '')); - - $can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && @is_writable($phpbb_root_path . $config['avatar_path']) && $file_uploads) ? true : false; - - // Did we submit? - if ($update) - { - $group_name = utf8_normalize_nfc(request_var('group_name', '', true)); - $group_desc = utf8_normalize_nfc(request_var('group_desc', '', true)); - $group_type = request_var('group_type', GROUP_FREE); - - $allow_desc_bbcode = request_var('desc_parse_bbcode', false); - $allow_desc_urls = request_var('desc_parse_urls', false); - $allow_desc_smilies = request_var('desc_parse_smilies', false); - - $submit_ary = array( - 'colour' => request_var('group_colour', ''), - 'rank' => request_var('group_rank', 0), - 'receive_pm' => isset($_REQUEST['group_receive_pm']) ? 1 : 0, - 'message_limit' => request_var('group_message_limit', 0) - ); - - $data['uploadurl'] = request_var('uploadurl', ''); - $data['remotelink'] = request_var('remotelink', ''); - $data['width'] = request_var('width', ''); - $data['height'] = request_var('height', ''); - $delete = request_var('delete', ''); - - if (!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl'] || $data['remotelink']) - { - // Avatar stuff - $var_ary = array( - 'uploadurl' => array('string', true, 5, 255), - 'remotelink' => array('string', true, 5, 255), - 'width' => array('string', true, 1, 3), - 'height' => array('string', true, 1, 3), - ); - - if (!($error = validate_data($data, $var_ary))) - { - $data['user_id'] = "g$group_id"; - - if ((!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl']) && $can_upload) - { - list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_upload($data, $error); - } - else if ($data['remotelink']) - { - list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_remote($data, $error); - } - } - } - else if ($avatar_select && $config['allow_avatar_local']) - { - // check avatar gallery - if (is_dir($phpbb_root_path . $config['avatar_gallery_path'] . '/' . $category)) - { - $submit_ary['avatar_type'] = AVATAR_GALLERY; - - list($submit_ary['avatar_width'], $submit_ary['avatar_height']) = getimagesize($phpbb_root_path . $config['avatar_gallery_path'] . '/' . $category . '/' . $avatar_select); - $submit_ary['avatar'] = $category . '/' . $avatar_select; - } - } - else if ($delete) - { - $submit_ary['avatar'] = ''; - $submit_ary['avatar_type'] = $submit_ary['avatar_width'] = $submit_ary['avatar_height'] = 0; - } - else if ($data['width'] && $data['height']) - { - // Only update the dimensions? - if ($config['avatar_max_width'] || $config['avatar_max_height']) - { - if ($data['width'] > $config['avatar_max_width'] || $data['height'] > $config['avatar_max_height']) - { - $error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height'], $data['width'], $data['height']); - } - } - - if (!sizeof($error)) - { - if ($config['avatar_min_width'] || $config['avatar_min_height']) - { - if ($data['width'] < $config['avatar_min_width'] || $data['height'] < $config['avatar_min_height']) - { - $error[] = sprintf($user->lang['AVATAR_WRONG_SIZE'], $config['avatar_min_width'], $config['avatar_min_height'], $config['avatar_max_width'], $config['avatar_max_height'], $data['width'], $data['height']); - } - } - } - - if (!sizeof($error)) - { - $submit_ary['avatar_width'] = $data['width']; - $submit_ary['avatar_height'] = $data['height']; - } - } - - if ((isset($submit_ary['avatar']) && $submit_ary['avatar'] && (!isset($group_row['group_avatar']))) || $delete) - { - if (isset($group_row['group_avatar']) && $group_row['group_avatar']) - { - avatar_delete('group', $group_row, true); - } - } - - if (!check_form_key('ucp_groups')) - { - $error[] = $user->lang['FORM_INVALID']; - } - - if (!sizeof($error)) - { - // Only set the rank, colour, etc. if it's changed or if we're adding a new - // group. This prevents existing group members being updated if no changes - // were made. - - $group_attributes = array(); - $test_variables = array('rank', 'colour', 'avatar', 'avatar_type', 'avatar_width', 'avatar_height'); - foreach ($test_variables as $test) - { - if ($action == 'add' || (isset($submit_ary[$test]) && $group_row['group_' . $test] != $submit_ary[$test])) - { - $group_attributes['group_' . $test] = $group_row['group_' . $test] = $submit_ary[$test]; - } - } - - if (!($error = group_create($group_id, $group_type, $group_name, $group_desc, $group_attributes, $allow_desc_bbcode, $allow_desc_urls, $allow_desc_smilies))) - { - $cache->destroy('sql', GROUPS_TABLE); - - $message = ($action == 'edit') ? 'GROUP_UPDATED' : 'GROUP_CREATED'; - trigger_error($user->lang[$message] . $return_page); - } - } - - if (sizeof($error)) - { - $group_rank = $submit_ary['rank']; - - $group_desc_data = array( - 'text' => $group_desc, - 'allow_bbcode' => $allow_desc_bbcode, - 'allow_smilies' => $allow_desc_smilies, - 'allow_urls' => $allow_desc_urls - ); - } - } - else if (!$group_id) - { - $group_name = utf8_normalize_nfc(request_var('group_name', '', true)); - $group_desc_data = array( - 'text' => '', - 'allow_bbcode' => true, - 'allow_smilies' => true, - 'allow_urls' => true - ); - $group_rank = 0; - $group_type = GROUP_OPEN; - } - else - { - $group_name = $group_row['group_name']; - $group_desc_data = generate_text_for_edit($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_options']); - $group_type = $group_row['group_type']; - $group_rank = $group_row['group_rank']; - } - - $sql = 'SELECT * - FROM ' . RANKS_TABLE . ' - WHERE rank_special = 1 - ORDER BY rank_title'; - $result = $db->sql_query($sql); - - $rank_options = ''; - while ($row = $db->sql_fetchrow($result)) - { - $selected = ($group_rank && $row['rank_id'] == $group_rank) ? ' selected="selected"' : ''; - $rank_options .= ''; - } - $db->sql_freeresult($result); - - $type_free = ($group_type == GROUP_FREE) ? ' checked="checked"' : ''; - $type_open = ($group_type == GROUP_OPEN) ? ' checked="checked"' : ''; - $type_closed = ($group_type == GROUP_CLOSED) ? ' checked="checked"' : ''; - $type_hidden = ($group_type == GROUP_HIDDEN) ? ' checked="checked"' : ''; - - $avatar_img = (!empty($group_row['group_avatar'])) ? get_user_avatar($group_row['group_avatar'], $group_row['group_avatar_type'], $group_row['group_avatar_width'], $group_row['group_avatar_height'], 'GROUP_AVATAR') : ''; - - $display_gallery = (isset($_POST['display_gallery'])) ? true : false; - - if ($config['allow_avatar_local'] && $display_gallery) - { - avatar_gallery($category, $avatar_select, 4); - } - - $avatars_enabled = ($can_upload || ($config['allow_avatar_local'] || $config['allow_avatar_remote'])) ? true : false; - - - $template->assign_vars(array( - 'S_EDIT' => true, - 'S_INCLUDE_SWATCH' => true, - 'S_CAN_UPLOAD' => $can_upload, - 'S_FORM_ENCTYPE' => ($can_upload) ? ' enctype="multipart/form-data"' : '', - 'S_ERROR' => (sizeof($error)) ? true : false, - 'S_SPECIAL_GROUP' => ($group_type == GROUP_SPECIAL) ? true : false, - 'S_AVATARS_ENABLED' => $avatars_enabled, - 'S_DISPLAY_GALLERY' => ($config['allow_avatar_local'] && !$display_gallery) ? true : false, - 'S_IN_GALLERY' => ($config['allow_avatar_local'] && $display_gallery) ? true : false, - - 'ERROR_MSG' => (sizeof($error)) ? implode('
    ', $error) : '', - 'GROUP_NAME' => ($group_type == GROUP_SPECIAL) ? $user->lang['G_' . $group_name] : $group_name, - 'GROUP_INTERNAL_NAME' => $group_name, - 'GROUP_DESC' => $group_desc_data['text'], - 'GROUP_RECEIVE_PM' => (isset($group_row['group_receive_pm']) && $group_row['group_receive_pm']) ? ' checked="checked"' : '', - 'GROUP_MESSAGE_LIMIT' => (isset($group_row['group_message_limit'])) ? $group_row['group_message_limit'] : 0, - 'GROUP_COLOUR' => (isset($group_row['group_colour'])) ? $group_row['group_colour'] : '', - - 'S_DESC_BBCODE_CHECKED' => $group_desc_data['allow_bbcode'], - 'S_DESC_URLS_CHECKED' => $group_desc_data['allow_urls'], - 'S_DESC_SMILIES_CHECKED'=> $group_desc_data['allow_smilies'], - - 'S_RANK_OPTIONS' => $rank_options, - 'AVATAR' => $avatar_img, - 'AVATAR_IMAGE' => $avatar_img, - 'AVATAR_MAX_FILESIZE' => $config['avatar_filesize'], - 'AVATAR_WIDTH' => (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '', - 'AVATAR_HEIGHT' => (isset($group_row['group_avatar_height'])) ? $group_row['group_avatar_height'] : '', - - 'GROUP_TYPE_FREE' => GROUP_FREE, - 'GROUP_TYPE_OPEN' => GROUP_OPEN, - 'GROUP_TYPE_CLOSED' => GROUP_CLOSED, - 'GROUP_TYPE_HIDDEN' => GROUP_HIDDEN, - 'GROUP_TYPE_SPECIAL' => GROUP_SPECIAL, - - 'GROUP_FREE' => $type_free, - 'GROUP_OPEN' => $type_open, - 'GROUP_CLOSED' => $type_closed, - 'GROUP_HIDDEN' => $type_hidden, - - 'U_SWATCH' => append_sid("{$phpbb_root_path}adm/swatch.$phpEx", 'form=ucp&name=group_colour'), - 'S_UCP_ACTION' => $this->u_action . "&action=$action&g=$group_id", - 'L_AVATAR_EXPLAIN' => sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], $config['avatar_filesize'] / 1024), - )); - - break; - - case 'list': - - if (!$group_id) - { - trigger_error($user->lang['NO_GROUP'] . $return_page); - } - - if (!($row = group_memberships($group_id, $user->data['user_id']))) - { - trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page); - } - list(, $row) = each($row); - - if (!$row['group_leader']) - { - trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page); - } - - $user->add_lang(array('acp/groups', 'acp/common')); - $start = request_var('start', 0); - - // Grab the leaders - always, on every page... - $sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_colour, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending - FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug - WHERE ug.group_id = $group_id - AND u.user_id = ug.user_id - AND ug.group_leader = 1 - ORDER BY ug.group_leader DESC, ug.user_pending ASC, u.username_clean"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $template->assign_block_vars('leader', array( - 'USERNAME' => $row['username'], - 'USERNAME_COLOUR' => $row['user_colour'], - 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), - 'U_USER_VIEW' => get_username_string('profile', $row['user_id'], $row['username']), - 'S_GROUP_DEFAULT' => ($row['group_id'] == $group_id) ? true : false, - 'JOINED' => ($row['user_regdate']) ? $user->format_date($row['user_regdate']) : ' - ', - 'USER_POSTS' => $row['user_posts'], - 'USER_ID' => $row['user_id']) - ); - } - $db->sql_freeresult($result); - - // Total number of group members (non-leaders) - $sql = 'SELECT COUNT(user_id) AS total_members - FROM ' . USER_GROUP_TABLE . " - WHERE group_id = $group_id - AND group_leader = 0"; - $result = $db->sql_query($sql); - $total_members = (int) $db->sql_fetchfield('total_members'); - $db->sql_freeresult($result); - - // Grab the members - $sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_colour, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending - FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug - WHERE ug.group_id = $group_id - AND u.user_id = ug.user_id - AND ug.group_leader = 0 - ORDER BY ug.group_leader DESC, ug.user_pending ASC, u.username_clean"; - $result = $db->sql_query_limit($sql, $config['topics_per_page'], $start); - - $pending = false; - - while ($row = $db->sql_fetchrow($result)) - { - if ($row['user_pending'] && !$pending) - { - $template->assign_block_vars('member', array( - 'S_PENDING' => true) - ); - - $pending = true; - } - - $template->assign_block_vars('member', array( - 'USERNAME' => $row['username'], - 'USERNAME_COLOUR' => $row['user_colour'], - 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), - 'U_USER_VIEW' => get_username_string('profile', $row['user_id'], $row['username']), - 'S_GROUP_DEFAULT' => ($row['group_id'] == $group_id) ? true : false, - 'JOINED' => ($row['user_regdate']) ? $user->format_date($row['user_regdate']) : ' - ', - 'USER_POSTS' => $row['user_posts'], - 'USER_ID' => $row['user_id']) - ); - } - $db->sql_freeresult($result); - - $s_action_options = ''; - $options = array('default' => 'DEFAULT', 'approve' => 'APPROVE', 'deleteusers' => 'DELETE'); - - foreach ($options as $option => $lang) - { - $s_action_options .= ''; - } - - $template->assign_vars(array( - 'S_LIST' => true, - 'S_ACTION_OPTIONS' => $s_action_options, - 'S_ON_PAGE' => on_page($total_members, $config['topics_per_page'], $start), - 'PAGINATION' => generate_pagination($this->u_action . "&action=$action&g=$group_id", $total_members, $config['topics_per_page'], $start), - - 'U_ACTION' => $this->u_action . "&g=$group_id", - 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=ucp&field=usernames'), - )); - - break; - - case 'approve': - - if (!$group_id) - { - trigger_error($user->lang['NO_GROUP'] . $return_page); - } - - if (!($row = group_memberships($group_id, $user->data['user_id']))) - { - trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page); - } - list(, $row) = each($row); - - if (!$row['group_leader']) - { - trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page); - } - - $user->add_lang('acp/groups'); - - // Approve, demote or promote - group_user_attributes('approve', $group_id, $mark_ary, false, false); - - trigger_error($user->lang['USERS_APPROVED'] . '

    ' . sprintf($user->lang['RETURN_PAGE'], '', '')); - - break; - - case 'default': - - if (!$group_id) - { - trigger_error($user->lang['NO_GROUP'] . $return_page); - } - - if (!($row = group_memberships($group_id, $user->data['user_id']))) - { - trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page); - } - list(, $row) = each($row); - - if (!$row['group_leader']) - { - trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page); - } - - $group_row['group_name'] = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name']; - - if (confirm_box(true)) - { - if (!sizeof($mark_ary)) - { - $start = 0; - - do - { - $sql = 'SELECT user_id - FROM ' . USER_GROUP_TABLE . " - WHERE group_id = $group_id - ORDER BY user_id"; - $result = $db->sql_query_limit($sql, 200, $start); - - $mark_ary = array(); - if ($row = $db->sql_fetchrow($result)) - { - do - { - $mark_ary[] = $row['user_id']; - } - while ($row = $db->sql_fetchrow($result)); - - group_user_attributes('default', $group_id, $mark_ary, false, $group_row['group_name'], $group_row); - - $start = (sizeof($mark_ary) < 200) ? 0 : $start + 200; - } - else - { - $start = 0; - } - $db->sql_freeresult($result); - } - while ($start); - } - else - { - group_user_attributes('default', $group_id, $mark_ary, false, $group_row['group_name'], $group_row); - } - - $user->add_lang('acp/groups'); - - trigger_error($user->lang['GROUP_DEFS_UPDATED'] . '

    ' . sprintf($user->lang['RETURN_PAGE'], '', '')); - } - else - { - $user->add_lang('acp/common'); - - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'mark' => $mark_ary, - 'g' => $group_id, - 'i' => $id, - 'mode' => $mode, - 'action' => $action)) - ); - } - - break; - - case 'deleteusers': - - $user->add_lang(array('acp/groups', 'acp/common')); - - if (!($row = group_memberships($group_id, $user->data['user_id']))) - { - trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page); - } - list(, $row) = each($row); - - if (!$row['group_leader']) - { - trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page); - } - - $group_row['group_name'] = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name']; - - if (confirm_box(true)) - { - if (!$group_id) - { - trigger_error($user->lang['NO_GROUP'] . $return_page); - } - - $error = group_user_del($group_id, $mark_ary, false, $group_row['group_name']); - - if ($error) - { - trigger_error($user->lang[$error] . '

    ' . sprintf($user->lang['RETURN_PAGE'], '', '')); - } - - trigger_error($user->lang['GROUP_USERS_REMOVE'] . '

    ' . sprintf($user->lang['RETURN_PAGE'], '', '')); - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'mark' => $mark_ary, - 'g' => $group_id, - 'i' => $id, - 'mode' => $mode, - 'action' => $action)) - ); - } - - break; - - case 'addusers': - - $user->add_lang(array('acp/groups', 'acp/common')); - - $names = utf8_normalize_nfc(request_var('usernames', '', true)); - - if (!$group_id) - { - trigger_error($user->lang['NO_GROUP'] . $return_page); - } - - if (!$names) - { - trigger_error($user->lang['NO_USERS'] . $return_page); - } - - if (!($row = group_memberships($group_id, $user->data['user_id']))) - { - trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page); - } - list(, $row) = each($row); - - if (!$row['group_leader']) - { - trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page); - } - - $name_ary = array_unique(explode("\n", $names)); - $group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name']; - - $default = request_var('default', 0); - - if (confirm_box(true)) - { - // Add user/s to group - if ($error = group_user_add($group_id, false, $name_ary, $group_name, $default, 0, 0, $group_row)) - { - trigger_error($user->lang[$error] . $return_page); - } - - trigger_error($user->lang['GROUP_USERS_ADDED'] . '

    ' . sprintf($user->lang['RETURN_PAGE'], '', '')); - } - else - { - $s_hidden_fields = array( - 'default' => $default, - 'usernames' => $names, - 'g' => $group_id, - 'i' => $id, - 'mode' => $mode, - 'action' => $action - ); - confirm_box(false, sprintf($user->lang['GROUP_CONFIRM_ADD_USER' . ((sizeof($name_ary) == 1) ? '' : 'S')], implode(', ', $name_ary)), build_hidden_fields($s_hidden_fields)); - } - - trigger_error($user->lang['NO_USERS_ADDED'] . '

    ' . sprintf($user->lang['RETURN_PAGE'], '', '')); - - break; - - default: - $user->add_lang('acp/common'); - - $sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_desc, g.group_desc_uid, g.group_desc_bitfield, g.group_desc_options, g.group_type, ug.group_leader - FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug - WHERE ug.user_id = ' . $user->data['user_id'] . ' - AND g.group_id = ug.group_id - AND ug.group_leader = 1 - ORDER BY g.group_type DESC, g.group_name'; - $result = $db->sql_query($sql); - - while ($value = $db->sql_fetchrow($result)) - { - $template->assign_block_vars('leader', array( - 'GROUP_NAME' => ($value['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $value['group_name']] : $value['group_name'], - 'GROUP_DESC' => generate_text_for_display($value['group_desc'], $value['group_desc_uid'], $value['group_desc_bitfield'], $value['group_desc_options']), - 'GROUP_TYPE' => $value['group_type'], - 'GROUP_ID' => $value['group_id'], - 'GROUP_COLOUR' => $value['group_colour'], - - 'U_LIST' => $this->u_action . "&action=list&g={$value['group_id']}", - 'U_EDIT' => $this->u_action . "&action=edit&g={$value['group_id']}") - ); - } - $db->sql_freeresult($result); - - break; - } - - break; - } - - $this->tpl_name = 'ucp_groups_' . $mode; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php deleted file mode 100644 index 59d7431113..0000000000 --- a/phpBB/includes/ucp/ucp_main.php +++ /dev/null @@ -1,826 +0,0 @@ -p_master = &$p_master; - } - - function main($id, $mode) - { - global $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx; - - switch ($mode) - { - case 'front': - - $user->add_lang('memberlist'); - - $sql_from = TOPICS_TABLE . ' t '; - $sql_select = ''; - - if ($config['load_db_track']) - { - $sql_from .= ' LEFT JOIN ' . TOPICS_POSTED_TABLE . ' tp ON (tp.topic_id = t.topic_id - AND tp.user_id = ' . $user->data['user_id'] . ')'; - $sql_select .= ', tp.topic_posted'; - } - - if ($config['load_db_lastread']) - { - $sql_from .= ' LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id - AND tt.user_id = ' . $user->data['user_id'] . ')'; - $sql_select .= ', tt.mark_time'; - } - - $topic_type = $user->lang['VIEW_TOPIC_GLOBAL']; - $folder = 'global_read'; - $folder_new = 'global_unread'; - - // Get cleaned up list... return only those forums not having the f_read permission - $forum_ary = $auth->acl_getf('!f_read', true); - $forum_ary = array_unique(array_keys($forum_ary)); - - // Determine first forum the user is able to read into - for global announcement link - $sql = 'SELECT forum_id - FROM ' . FORUMS_TABLE . ' - WHERE forum_type = ' . FORUM_POST; - - if (sizeof($forum_ary)) - { - $sql .= ' AND ' . $db->sql_in_set('forum_id', $forum_ary, true); - } - $result = $db->sql_query_limit($sql, 1); - $g_forum_id = (int) $db->sql_fetchfield('forum_id'); - $db->sql_freeresult($result); - - $sql = "SELECT t.* $sql_select - FROM $sql_from - WHERE t.forum_id = 0 - AND t.topic_type = " . POST_GLOBAL . ' - ORDER BY t.topic_last_post_time DESC'; - - $topic_list = $rowset = array(); - // If the user can't see any forums, he can't read any posts because fid of 0 is invalid - if ($g_forum_id) - { - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $topic_list[] = $row['topic_id']; - $rowset[$row['topic_id']] = $row; - } - $db->sql_freeresult($result); - } - - $topic_tracking_info = array(); - if ($config['load_db_lastread']) - { - $topic_tracking_info = get_topic_tracking(0, $topic_list, $rowset, false, $topic_list); - } - else - { - $topic_tracking_info = get_complete_topic_tracking(0, $topic_list, $topic_list); - } - - foreach ($topic_list as $topic_id) - { - $row = &$rowset[$topic_id]; - - $forum_id = $row['forum_id']; - $topic_id = $row['topic_id']; - - $unread_topic = (isset($topic_tracking_info[$topic_id]) && $row['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false; - - $folder_img = ($unread_topic) ? $folder_new : $folder; - $folder_alt = ($unread_topic) ? 'NEW_POSTS' : (($row['topic_status'] == ITEM_LOCKED) ? 'TOPIC_LOCKED' : 'NO_NEW_POSTS'); - - if ($row['topic_status'] == ITEM_LOCKED) - { - $folder_img .= '_locked'; - } - - // Posted image? - if (!empty($row['topic_posted']) && $row['topic_posted']) - { - $folder_img .= '_mine'; - } - - $template->assign_block_vars('topicrow', array( - 'FORUM_ID' => $forum_id, - 'TOPIC_ID' => $topic_id, - 'TOPIC_AUTHOR' => get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - 'TOPIC_AUTHOR_COLOUR' => get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - 'TOPIC_AUTHOR_FULL' => get_username_string('full', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - 'FIRST_POST_TIME' => $user->format_date($row['topic_time']), - 'LAST_POST_SUBJECT' => censor_text($row['topic_last_post_subject']), - 'LAST_POST_TIME' => $user->format_date($row['topic_last_post_time']), - 'LAST_VIEW_TIME' => $user->format_date($row['topic_last_view_time']), - 'LAST_POST_AUTHOR' => get_username_string('username', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - 'LAST_POST_AUTHOR_COLOUR' => get_username_string('colour', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - 'LAST_POST_AUTHOR_FULL' => get_username_string('full', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - 'TOPIC_TITLE' => censor_text($row['topic_title']), - 'TOPIC_TYPE' => $topic_type, - - 'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt), - 'TOPIC_FOLDER_IMG_SRC' => $user->img($folder_img, $folder_alt, false, '', 'src'), - 'ATTACH_ICON_IMG' => ($auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_topic_attach', '') : '', - - 'S_USER_POSTED' => (!empty($row['topic_posted']) && $row['topic_posted']) ? true : false, - 'S_UNREAD' => $unread_topic, - - 'U_TOPIC_AUTHOR' => get_username_string('profile', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - 'U_LAST_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$g_forum_id&t=$topic_id&p=" . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'], - 'U_LAST_POST_AUTHOR' => get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - 'U_NEWEST_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$g_forum_id&t=$topic_id&view=unread") . '#unread', - 'U_VIEW_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$g_forum_id&t=$topic_id")) - ); - } - - if ($config['load_user_activity']) - { - if (!function_exists('display_user_activity')) - { - include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx); - } - display_user_activity($user->data); - } - - // Do the relevant calculations - $memberdays = max(1, round((time() - $user->data['user_regdate']) / 86400)); - $posts_per_day = $user->data['user_posts'] / $memberdays; - $percentage = ($config['num_posts']) ? min(100, ($user->data['user_posts'] / $config['num_posts']) * 100) : 0; - - $template->assign_vars(array( - 'USER_COLOR' => (!empty($user->data['user_colour'])) ? $user->data['user_colour'] : '', - 'JOINED' => $user->format_date($user->data['user_regdate']), - 'VISITED' => (empty($last_visit)) ? ' - ' : $user->format_date($last_visit), - 'WARNINGS' => ($user->data['user_warnings']) ? $user->data['user_warnings'] : 0, - 'POSTS' => ($user->data['user_posts']) ? $user->data['user_posts'] : 0, - 'POSTS_DAY' => sprintf($user->lang['POST_DAY'], $posts_per_day), - 'POSTS_PCT' => sprintf($user->lang['POST_PCT'], $percentage), - - 'OCCUPATION' => (!empty($row['user_occ'])) ? $row['user_occ'] : '', - 'INTERESTS' => (!empty($row['user_interests'])) ? $row['user_interests'] : '', - -// 'S_GROUP_OPTIONS' => $group_options, - - 'U_SEARCH_USER' => ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", 'author_id=' . $user->data['user_id'] . '&sr=posts') : '', - )); - - break; - - case 'subscribed': - - include($phpbb_root_path . 'includes/functions_display.' . $phpEx); - - $user->add_lang('viewforum'); - - add_form_key('ucp_front_subscribed'); - - $unwatch = (isset($_POST['unwatch'])) ? true : false; - - if ($unwatch) - { - if (check_form_key('ucp_front_subscribed')) - { - $forums = array_keys(request_var('f', array(0 => 0))); - $topics = array_keys(request_var('t', array(0 => 0))); - $msg = ''; - - if (sizeof($forums) || sizeof($topics)) - { - $l_unwatch = ''; - if (sizeof($forums)) - { - $sql = 'DELETE FROM ' . FORUMS_WATCH_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', $forums) . ' - AND user_id = ' . $user->data['user_id']; - $db->sql_query($sql); - - $l_unwatch .= '_FORUMS'; - } - - if (sizeof($topics)) - { - $sql = 'DELETE FROM ' . TOPICS_WATCH_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', $topics) . ' - AND user_id = ' . $user->data['user_id']; - $db->sql_query($sql); - - $l_unwatch .= '_TOPICS'; - } - $msg = $user->lang['UNWATCHED' . $l_unwatch]; - - } - } - else - { - $msg = $user->lang['FORM_INVALID']; - } - $message = $msg . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - meta_refresh(3, append_sid("{$phpbb_root_path}ucp.$phpEx", "i=$id&mode=subscribed")); - trigger_error($message); - } - - $forbidden_forums = array(); - - if ($config['allow_forum_notify']) - { - $forbidden_forums = $auth->acl_getf('!f_read', true); - $forbidden_forums = array_unique(array_keys($forbidden_forums)); - - $sql_array = array( - 'SELECT' => 'f.*', - - 'FROM' => array( - FORUMS_WATCH_TABLE => 'fw', - FORUMS_TABLE => 'f' - ), - - 'WHERE' => 'fw.user_id = ' . $user->data['user_id'] . ' - AND f.forum_id = fw.forum_id - AND ' . $db->sql_in_set('f.forum_id', $forbidden_forums, true, true), - - 'ORDER_BY' => 'left_id' - ); - - if ($config['load_db_lastread']) - { - $sql_array['LEFT_JOIN'] = array( - array( - 'FROM' => array(FORUMS_TRACK_TABLE => 'ft'), - 'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id' - ) - ); - - $sql_array['SELECT'] .= ', ft.mark_time '; - } - else - { - $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_track'])) ? ((STRIP) ? stripslashes($_COOKIE[$config['cookie_name'] . '_track']) : $_COOKIE[$config['cookie_name'] . '_track']) : ''; - $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array(); - } - - $sql = $db->sql_build_query('SELECT', $sql_array); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $forum_id = $row['forum_id']; - - if ($config['load_db_lastread']) - { - $forum_check = (!empty($row['mark_time'])) ? $row['mark_time'] : $user->data['user_lastmark']; - } - else - { - $forum_check = (isset($tracking_topics['f'][$forum_id])) ? (int) (base_convert($tracking_topics['f'][$forum_id], 36, 10) + $config['board_startdate']) : $user->data['user_lastmark']; - } - - $unread_forum = ($row['forum_last_post_time'] > $forum_check) ? true : false; - - // Which folder should we display? - if ($row['forum_status'] == ITEM_LOCKED) - { - $folder_image = ($unread_forum) ? 'forum_unread_locked' : 'forum_read_locked'; - $folder_alt = 'FORUM_LOCKED'; - } - else - { - $folder_image = ($unread_forum) ? 'forum_unread' : 'forum_read'; - $folder_alt = ($unread_forum) ? 'NEW_POSTS' : 'NO_NEW_POSTS'; - } - - // Create last post link information, if appropriate - if ($row['forum_last_post_id']) - { - $last_post_time = $user->format_date($row['forum_last_post_time']); - $last_post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&p=" . $row['forum_last_post_id']) . '#p' . $row['forum_last_post_id']; - } - else - { - $last_post_time = $last_post_url = ''; - } - - $template->assign_block_vars('forumrow', array( - 'FORUM_ID' => $forum_id, - 'FORUM_FOLDER_IMG' => $user->img($folder_image, $folder_alt), - 'FORUM_FOLDER_IMG_SRC' => $user->img($folder_image, $folder_alt, false, '', 'src'), - 'FORUM_IMAGE' => ($row['forum_image']) ? '' . $user->lang[$folder_alt] . '' : '', - 'FORUM_IMAGE_SRC' => ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '', - 'FORUM_NAME' => $row['forum_name'], - 'LAST_POST_SUBJECT' => $row['forum_last_post_subject'], - 'LAST_POST_TIME' => $last_post_time, - - 'LAST_POST_AUTHOR' => get_username_string('username', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']), - 'LAST_POST_AUTHOR_COLOUR' => get_username_string('colour', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']), - 'LAST_POST_AUTHOR_FULL' => get_username_string('full', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']), - 'U_LAST_POST_AUTHOR' => get_username_string('profile', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']), - - 'U_LAST_POST' => $last_post_url, - 'U_VIEWFORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id'])) - ); - } - $db->sql_freeresult($result); - } - - // Subscribed Topics - if ($config['allow_topic_notify']) - { - if (empty($forbidden_forums)) - { - $forbidden_forums = $auth->acl_getf('!f_read', true); - $forbidden_forums = array_unique(array_keys($forbidden_forums)); - } - $this->assign_topiclist('subscribed', $forbidden_forums); - } - - $template->assign_vars(array( - 'S_TOPIC_NOTIFY' => $config['allow_topic_notify'], - 'S_FORUM_NOTIFY' => $config['allow_forum_notify'], - )); - - break; - - case 'bookmarks': - - if (!$config['allow_bookmarks']) - { - $template->assign_vars(array( - 'S_NO_DISPLAY_BOOKMARKS' => true) - ); - break; - } - - include($phpbb_root_path . 'includes/functions_display.' . $phpEx); - - $user->add_lang('viewforum'); - - if (isset($_POST['unbookmark'])) - { - $s_hidden_fields = array('unbookmark' => 1); - $topics = (isset($_POST['t'])) ? array_keys(request_var('t', array(0 => 0))) : array(); - $url = $this->u_action; - - if (!sizeof($topics)) - { - trigger_error('NO_BOOKMARKS_SELECTED'); - } - - foreach ($topics as $topic_id) - { - $s_hidden_fields['t'][$topic_id] = 1; - } - - if (confirm_box(true)) - { - $sql = 'DELETE FROM ' . BOOKMARKS_TABLE . ' - WHERE user_id = ' . $user->data['user_id'] . ' - AND ' . $db->sql_in_set('topic_id', $topics); - $db->sql_query($sql); - - meta_refresh(3, $url); - $message = $user->lang['BOOKMARKS_REMOVED'] . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - trigger_error($message); - } - else - { - confirm_box(false, 'REMOVE_SELECTED_BOOKMARKS', build_hidden_fields($s_hidden_fields)); - } - } - $forbidden_forums = $auth->acl_getf('!f_read', true); - $forbidden_forums = array_unique(array_keys($forbidden_forums)); - - $this->assign_topiclist('bookmarks', $forbidden_forums); - - break; - - case 'drafts': - - $pm_drafts = ($this->p_master->p_name == 'pm') ? true : false; - $template->assign_var('S_SHOW_DRAFTS', true); - - $user->add_lang('posting'); - - $edit = (isset($_REQUEST['edit'])) ? true : false; - $submit = (isset($_POST['submit'])) ? true : false; - $draft_id = ($edit) ? intval($_REQUEST['edit']) : 0; - $delete = (isset($_POST['delete'])) ? true : false; - - $s_hidden_fields = ($edit) ? '' : ''; - $draft_subject = $draft_message = ''; - add_form_key('ucp_draft'); - - if ($delete) - { - if (check_form_key('ucp_draft')) - { - $drafts = array_keys(request_var('d', array(0 => 0))); - - if (sizeof($drafts)) - { - $sql = 'DELETE FROM ' . DRAFTS_TABLE . ' - WHERE ' . $db->sql_in_set('draft_id', $drafts) . ' - AND user_id = ' . $user->data['user_id']; - $db->sql_query($sql); - } - $msg = $user->lang['DRAFTS_DELETED']; - unset($drafts); - } - else - { - $msg = $user->lang['FORM_INVALID']; - } - $message = $msg . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - meta_refresh(3, $this->u_action); - trigger_error($message); - } - - if ($submit && $edit) - { - $draft_subject = utf8_normalize_nfc(request_var('subject', '', true)); - $draft_message = utf8_normalize_nfc(request_var('message', '', true)); - if (check_form_key('ucp_draft')) - { - if ($draft_message && $draft_subject) - { - $draft_row = array( - 'draft_subject' => $draft_subject, - 'draft_message' => $draft_message - ); - - $sql = 'UPDATE ' . DRAFTS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $draft_row) . " - WHERE draft_id = $draft_id - AND user_id = " . $user->data['user_id']; - $db->sql_query($sql); - - $message = $user->lang['DRAFT_UPDATED'] . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - - meta_refresh(3, $this->u_action); - trigger_error($message); - } - else - { - $template->assign_var('ERROR', ($draft_message == '') ? $user->lang['EMPTY_DRAFT'] : (($draft_subject == '') ? $user->lang['EMPTY_DRAFT_TITLE'] : '')); - } - } - else - { - $template->assign_var('ERROR', $user->lang['FORM_INVALID']); - } - } - - if (!$pm_drafts) - { - $sql = 'SELECT d.*, f.forum_name - FROM ' . DRAFTS_TABLE . ' d, ' . FORUMS_TABLE . ' f - WHERE d.user_id = ' . $user->data['user_id'] . ' ' . - (($edit) ? "AND d.draft_id = $draft_id" : '') . ' - AND f.forum_id = d.forum_id - ORDER BY d.save_time DESC'; - } - else - { - $sql = 'SELECT * FROM ' . DRAFTS_TABLE . ' - WHERE user_id = ' . $user->data['user_id'] . ' ' . - (($edit) ? "AND draft_id = $draft_id" : '') . ' - AND forum_id = 0 - AND topic_id = 0 - ORDER BY save_time DESC'; - } - $result = $db->sql_query($sql); - - $draftrows = $topic_ids = array(); - - while ($row = $db->sql_fetchrow($result)) - { - if ($row['topic_id']) - { - $topic_ids[] = (int) $row['topic_id']; - } - $draftrows[] = $row; - } - $db->sql_freeresult($result); - - if (sizeof($topic_ids)) - { - $sql = 'SELECT topic_id, forum_id, topic_title - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', array_unique($topic_ids)); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $topic_rows[$row['topic_id']] = $row; - } - $db->sql_freeresult($result); - } - unset($topic_ids); - - $template->assign_var('S_EDIT_DRAFT', $edit); - - $row_count = 0; - foreach ($draftrows as $draft) - { - $link_topic = $link_forum = $link_pm = false; - $insert_url = $view_url = $title = ''; - - if (isset($topic_rows[$draft['topic_id']]) && $auth->acl_get('f_read', $topic_rows[$draft['topic_id']]['forum_id'])) - { - $link_topic = true; - $view_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $topic_rows[$draft['topic_id']]['forum_id'] . '&t=' . $draft['topic_id']); - $title = $topic_rows[$draft['topic_id']]['topic_title']; - - $insert_url = append_sid("{$phpbb_root_path}posting.$phpEx", 'f=' . $topic_rows[$draft['topic_id']]['forum_id'] . '&t=' . $draft['topic_id'] . '&mode=reply&d=' . $draft['draft_id']); - } - else if ($auth->acl_get('f_read', $draft['forum_id'])) - { - $link_forum = true; - $view_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $draft['forum_id']); - $title = $draft['forum_name']; - - $insert_url = append_sid("{$phpbb_root_path}posting.$phpEx", 'f=' . $draft['forum_id'] . '&mode=post&d=' . $draft['draft_id']); - } - else if ($pm_drafts) - { - $link_pm = true; - $insert_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=$id&mode=compose&d=" . $draft['draft_id']); - } - - $template_row = array( - 'DATE' => $user->format_date($draft['save_time']), - 'DRAFT_MESSAGE' => ($submit) ? $draft_message : $draft['draft_message'], - 'DRAFT_SUBJECT' => ($submit) ? $draft_subject : $draft['draft_subject'], - 'TITLE' => $title, - - 'DRAFT_ID' => $draft['draft_id'], - 'FORUM_ID' => $draft['forum_id'], - 'TOPIC_ID' => $draft['topic_id'], - - 'U_VIEW' => $view_url, - 'U_VIEW_EDIT' => $this->u_action . '&edit=' . $draft['draft_id'], - 'U_INSERT' => $insert_url, - - 'S_LINK_TOPIC' => $link_topic, - 'S_LINK_FORUM' => $link_forum, - 'S_LINK_PM' => $link_pm, - 'S_HIDDEN_FIELDS' => $s_hidden_fields - ); - $row_count++; - - ($edit) ? $template->assign_vars($template_row) : $template->assign_block_vars('draftrow', $template_row); - } - - if (!$edit) - { - $template->assign_var('S_DRAFT_ROWS', $row_count); - } - - break; - } - - - $template->assign_vars(array( - 'L_TITLE' => $user->lang['UCP_MAIN_' . strtoupper($mode)], - - 'S_DISPLAY_MARK_ALL' => ($mode == 'watched' || ($mode == 'drafts' && !isset($_GET['edit']))) ? true : false, - 'S_HIDDEN_FIELDS' => (isset($s_hidden_fields)) ? $s_hidden_fields : '', - 'S_UCP_ACTION' => $this->u_action, - - 'LAST_POST_IMG' => $user->img('icon_topic_latest', 'VIEW_LATEST_POST'), - 'NEWEST_POST_IMG' => $user->img('icon_topic_newest', 'VIEW_NEWEST_POST'), - )); - - // Set desired template - $this->tpl_name = 'ucp_main_' . $mode; - $this->page_title = 'UCP_MAIN_' . strtoupper($mode); - } - - /** - * Build and assign topiclist for bookmarks/subscribed topics - */ - function assign_topiclist($mode = 'subscribed', $forbidden_forum_ary = array()) - { - global $user, $db, $template, $config, $auth, $phpbb_root_path, $phpEx; - - $table = ($mode == 'subscribed') ? TOPICS_WATCH_TABLE : BOOKMARKS_TABLE; - $start = request_var('start', 0); - - $sql_array = array( - 'SELECT' => 'COUNT(t.topic_id) as topics_count', - - 'FROM' => array( - $table => 'i', - TOPICS_TABLE => 't' - ), - - 'WHERE' => 'i.topic_id = t.topic_id - AND i.user_id = ' . $user->data['user_id'] . ' - AND ' . $db->sql_in_set('t.forum_id', $forbidden_forum_ary, true, true), - ); - $sql = $db->sql_build_query('SELECT', $sql_array); - $result = $db->sql_query($sql); - $topics_count = (int) $db->sql_fetchfield('topics_count'); - $db->sql_freeresult($result); - - if ($topics_count) - { - $template->assign_vars(array( - 'PAGINATION' => generate_pagination($this->u_action, $topics_count, $config['topics_per_page'], $start), - 'PAGE_NUMBER' => on_page($topics_count, $config['topics_per_page'], $start), - 'TOTAL_TOPICS' => ($topics_count == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $topics_count)) - ); - } - - if ($mode == 'subscribed') - { - $sql_array = array( - 'SELECT' => 't.*, f.forum_name', - - 'FROM' => array( - TOPICS_WATCH_TABLE => 'tw', - TOPICS_TABLE => 't' - ), - - 'WHERE' => 'tw.user_id = ' . $user->data['user_id'] . ' - AND t.topic_id = tw.topic_id - AND ' . $db->sql_in_set('t.forum_id', $forbidden_forum_ary, true, true), - - - 'ORDER_BY' => 't.topic_last_post_time DESC' - ); - - $sql_array['LEFT_JOIN'] = array(); - } - else - { - $sql_array = array( - 'SELECT' => 't.*, f.forum_name, b.topic_id as b_topic_id', - - 'FROM' => array( - BOOKMARKS_TABLE => 'b', - ), - - 'WHERE' => 'b.user_id = ' . $user->data['user_id'] . ' - AND ' . $db->sql_in_set('f.forum_id', $forbidden_forum_ary, true, true), - - 'ORDER_BY' => 't.topic_last_post_time DESC' - ); - - $sql_array['LEFT_JOIN'] = array(); - $sql_array['LEFT_JOIN'][] = array('FROM' => array(TOPICS_TABLE => 't'), 'ON' => 'b.topic_id = t.topic_id'); - } - - $sql_array['LEFT_JOIN'][] = array('FROM' => array(FORUMS_TABLE => 'f'), 'ON' => 't.forum_id = f.forum_id'); - - if ($config['load_db_lastread']) - { - $sql_array['LEFT_JOIN'][] = array('FROM' => array(FORUMS_TRACK_TABLE => 'ft'), 'ON' => 'ft.forum_id = t.forum_id AND ft.user_id = ' . $user->data['user_id']); - $sql_array['LEFT_JOIN'][] = array('FROM' => array(TOPICS_TRACK_TABLE => 'tt'), 'ON' => 'tt.topic_id = t.topic_id AND tt.user_id = ' . $user->data['user_id']); - $sql_array['SELECT'] .= ', tt.mark_time, ft.mark_time AS forum_mark_time'; - } - - if ($config['load_db_track']) - { - $sql_array['LEFT_JOIN'][] = array('FROM' => array(TOPICS_POSTED_TABLE => 'tp'), 'ON' => 'tp.topic_id = t.topic_id AND tp.user_id = ' . $user->data['user_id']); - $sql_array['SELECT'] .= ', tp.topic_posted'; - } - - $sql = $db->sql_build_query('SELECT', $sql_array); - $result = $db->sql_query_limit($sql, $config['topics_per_page'], $start); - - $topic_list = $topic_forum_list = $global_announce_list = $rowset = array(); - while ($row = $db->sql_fetchrow($result)) - { - $topic_id = (isset($row['b_topic_id'])) ? $row['b_topic_id'] : $row['topic_id']; - - $topic_list[] = $topic_id; - $rowset[$topic_id] = $row; - - $topic_forum_list[$row['forum_id']]['forum_mark_time'] = ($config['load_db_lastread']) ? $row['forum_mark_time'] : 0; - $topic_forum_list[$row['forum_id']]['topics'][] = $topic_id; - - if ($row['topic_type'] == POST_GLOBAL) - { - $global_announce_list[] = $topic_id; - } - } - $db->sql_freeresult($result); - - $topic_tracking_info = array(); - if ($config['load_db_lastread']) - { - foreach ($topic_forum_list as $f_id => $topic_row) - { - $topic_tracking_info += get_topic_tracking($f_id, $topic_row['topics'], $rowset, array($f_id => $topic_row['forum_mark_time']), ($f_id == 0) ? $global_announce_list : false); - } - } - else - { - foreach ($topic_forum_list as $f_id => $topic_row) - { - $topic_tracking_info += get_complete_topic_tracking($f_id, $topic_row['topics'], $global_announce_list); - } - } - - foreach ($topic_list as $topic_id) - { - $row = &$rowset[$topic_id]; - - $forum_id = $row['forum_id']; - $topic_id = (isset($row['b_topic_id'])) ? $row['b_topic_id'] : $row['topic_id']; - - $unread_topic = (isset($topic_tracking_info[$topic_id]) && $row['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false; - - // Replies - $replies = ($auth->acl_get('m_approve', $forum_id)) ? $row['topic_replies_real'] : $row['topic_replies']; - - if ($row['topic_status'] == ITEM_MOVED && !empty($row['topic_moved_id'])) - { - $topic_id = $row['topic_moved_id']; - } - - // Get folder img, topic status/type related information - $folder_img = $folder_alt = $topic_type = ''; - topic_status($row, $replies, $unread_topic, $folder_img, $folder_alt, $topic_type); - - $view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id"); - - // Send vars to template - $template->assign_block_vars('topicrow', array( - 'FORUM_ID' => $forum_id, - 'TOPIC_ID' => $topic_id, - 'FIRST_POST_TIME' => $user->format_date($row['topic_time']), - 'LAST_POST_SUBJECT' => $row['topic_last_post_subject'], - 'LAST_POST_TIME' => $user->format_date($row['topic_last_post_time']), - 'LAST_VIEW_TIME' => $user->format_date($row['topic_last_view_time']), - - 'TOPIC_AUTHOR' => get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - 'TOPIC_AUTHOR_COLOUR' => get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - 'TOPIC_AUTHOR_FULL' => get_username_string('full', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - 'U_TOPIC_AUTHOR' => get_username_string('profile', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - - 'LAST_POST_AUTHOR' => get_username_string('username', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - 'LAST_POST_AUTHOR_COLOUR' => get_username_string('colour', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - 'LAST_POST_AUTHOR_FULL' => get_username_string('full', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - 'U_LAST_POST_AUTHOR' => get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - - 'S_DELETED_TOPIC' => (!$row['topic_id']) ? true : false, - 'S_GLOBAL_TOPIC' => (!$forum_id) ? true : false, - - 'PAGINATION' => topic_generate_pagination($replies, append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . (($row['forum_id']) ? $row['forum_id'] : $forum_id) . "&t=$topic_id")), - 'REPLIES' => $replies, - 'VIEWS' => $row['topic_views'], - 'TOPIC_TITLE' => censor_text($row['topic_title']), - 'TOPIC_TYPE' => $topic_type, - 'FORUM_NAME' => $row['forum_name'], - - 'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt), - 'TOPIC_FOLDER_IMG_SRC' => $user->img($folder_img, $folder_alt, false, '', 'src'), - 'TOPIC_ICON_IMG' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '', - 'TOPIC_ICON_IMG_WIDTH' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '', - 'TOPIC_ICON_IMG_HEIGHT' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '', - 'ATTACH_ICON_IMG' => ($auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', - - 'S_TOPIC_TYPE' => $row['topic_type'], - 'S_USER_POSTED' => (!empty($row['topic_posted'])) ? true : false, - 'S_UNREAD_TOPIC' => $unread_topic, - - 'U_NEWEST_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&view=unread") . '#unread', - 'U_LAST_POST' => $view_topic_url . '&p=' . $row['topic_last_post_id'] . '#p' . $row['topic_last_post_id'], - 'U_VIEW_TOPIC' => $view_topic_url, - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id), - )); - } - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php deleted file mode 100644 index 46b23efb54..0000000000 --- a/phpBB/includes/ucp/ucp_pm.php +++ /dev/null @@ -1,424 +0,0 @@ -data['is_registered']) - { - trigger_error('NO_MESSAGE'); - } - - // Is PM disabled? - if (!$config['allow_privmsg']) - { - trigger_error('PM_DISABLED'); - } - - $user->add_lang('posting'); - $template->assign_var('S_PRIVMSGS', true); - - // Folder directly specified? - $folder_specified = request_var('folder', ''); - - if (!in_array($folder_specified, array('inbox', 'outbox', 'sentbox'))) - { - $folder_specified = (int) $folder_specified; - } - else - { - $folder_specified = ($folder_specified == 'inbox') ? PRIVMSGS_INBOX : (($folder_specified == 'outbox') ? PRIVMSGS_OUTBOX : PRIVMSGS_SENTBOX); - } - - if (!$folder_specified) - { - $mode = (!$mode) ? request_var('mode', 'view') : $mode; - } - else - { - $mode = 'view'; - } - - include($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx); - - switch ($mode) - { - // New private messages popup - case 'popup': - - $l_new_message = ''; - if ($user->data['is_registered']) - { - if ($user->data['user_new_privmsg']) - { - $l_new_message = ($user->data['user_new_privmsg'] == 1) ? $user->lang['YOU_NEW_PM'] : $user->lang['YOU_NEW_PMS']; - } - else - { - $l_new_message = $user->lang['YOU_NO_NEW_PM']; - } - } - - $template->assign_vars(array( - 'MESSAGE' => $l_new_message, - 'S_NOT_LOGGED_IN' => ($user->data['user_id'] == ANONYMOUS) ? true : false, - 'CLICK_TO_VIEW' => sprintf($user->lang['CLICK_VIEW_PRIVMSG'], '', ''), - 'U_INBOX' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox'), - 'UA_INBOX' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox', false)) - ); - - $tpl_file = 'ucp_pm_popup'; - break; - - // Compose message - case 'compose': - $action = request_var('action', 'post'); - - get_folder($user->data['user_id']); - - if (!$auth->acl_get('u_sendpm')) - { - trigger_error('NO_AUTH_SEND_MESSAGE'); - } - - include($phpbb_root_path . 'includes/ucp/ucp_pm_compose.' . $phpEx); - compose_pm($id, $mode, $action); - - $tpl_file = 'posting_body'; - break; - - case 'options': - $sql = 'SELECT group_message_limit - FROM ' . GROUPS_TABLE . ' - WHERE group_id = ' . $user->data['group_id']; - $result = $db->sql_query($sql, 3600); - $message_limit = (int) $db->sql_fetchfield('group_message_limit'); - $db->sql_freeresult($result); - - $user->data['message_limit'] = (!$message_limit) ? $config['pm_max_msgs'] : $message_limit; - - get_folder($user->data['user_id']); - - include($phpbb_root_path . 'includes/ucp/ucp_pm_options.' . $phpEx); - message_options($id, $mode, $global_privmsgs_rules, $global_rule_conditions); - - $tpl_file = 'ucp_pm_options'; - break; - - case 'drafts': - - get_folder($user->data['user_id']); - $this->p_name = 'pm'; - - // Call another module... please do not try this at home... Hoochie Coochie Man - include($phpbb_root_path . 'includes/ucp/ucp_main.' . $phpEx); - - $module = new ucp_main($this); - $module->u_action = $this->u_action; - $module->main($id, $mode); - - $this->tpl_name = $module->tpl_name; - $this->page_title = 'UCP_PM_DRAFTS'; - - unset($module); - return; - - break; - - case 'view': - - $sql = 'SELECT group_message_limit - FROM ' . GROUPS_TABLE . ' - WHERE group_id = ' . $user->data['group_id']; - $result = $db->sql_query($sql, 3600); - $message_limit = (int) $db->sql_fetchfield('group_message_limit'); - $db->sql_freeresult($result); - - $user->data['message_limit'] = (!$message_limit) ? $config['pm_max_msgs'] : $message_limit; - - if ($folder_specified) - { - $folder_id = $folder_specified; - $action = 'view_folder'; - } - else - { - $folder_id = request_var('f', PRIVMSGS_NO_BOX); - $action = request_var('action', 'view_folder'); - } - - $msg_id = request_var('p', 0); - $view = request_var('view', ''); - - // View message if specified - if ($msg_id) - { - $action = 'view_message'; - } - - if (!$auth->acl_get('u_readpm')) - { - trigger_error('NO_AUTH_READ_MESSAGE'); - } - - // Do not allow hold messages to be seen - if ($folder_id == PRIVMSGS_HOLD_BOX) - { - trigger_error('NO_AUTH_READ_HOLD_MESSAGE'); - } - - - // First Handle Mark actions and moving messages - $submit_mark = (isset($_POST['submit_mark'])) ? true : false; - $move_pm = (isset($_POST['move_pm'])) ? true : false; - $mark_option = request_var('mark_option', ''); - $dest_folder = request_var('dest_folder', PRIVMSGS_NO_BOX); - - // Is moving PM triggered through mark options? - if (!in_array($mark_option, array('mark_important', 'delete_marked')) && $submit_mark) - { - $move_pm = true; - $dest_folder = (int) $mark_option; - $submit_mark = false; - } - - // Move PM - if ($move_pm) - { - $move_msg_ids = (isset($_POST['marked_msg_id'])) ? request_var('marked_msg_id', array(0)) : array(); - $cur_folder_id = request_var('cur_folder_id', PRIVMSGS_NO_BOX); - - if (move_pm($user->data['user_id'], $user->data['message_limit'], $move_msg_ids, $dest_folder, $cur_folder_id)) - { - // Return to folder view if single message moved - if ($action == 'view_message') - { - $msg_id = 0; - $folder_id = request_var('cur_folder_id', PRIVMSGS_NO_BOX); - $action = 'view_folder'; - } - } - } - - // Message Mark Options - if ($submit_mark) - { - handle_mark_actions($user->data['user_id'], $mark_option); - } - - // If new messages arrived, place them into the appropriate folder - $num_not_moved = $num_removed = 0; - $release = request_var('release', 0); - - if ($user->data['user_new_privmsg'] && $action == 'view_folder') - { - $return = place_pm_into_folder($global_privmsgs_rules, $release); - $num_not_moved = $return['not_moved']; - $num_removed = $return['removed']; - } - - if (!$msg_id && $folder_id == PRIVMSGS_NO_BOX) - { - $folder_id = PRIVMSGS_INBOX; - } - else if ($msg_id && $folder_id == PRIVMSGS_NO_BOX) - { - $sql = 'SELECT folder_id - FROM ' . PRIVMSGS_TO_TABLE . " - WHERE msg_id = $msg_id - AND folder_id <> " . PRIVMSGS_NO_BOX . ' - AND user_id = ' . $user->data['user_id']; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error('NO_MESSAGE'); - } - $folder_id = (int) $row['folder_id']; - } - - $message_row = array(); - if ($action == 'view_message' && $msg_id) - { - // Get Message user want to see - if ($view == 'next' || $view == 'previous') - { - $sql_condition = ($view == 'next') ? '>' : '<'; - $sql_ordering = ($view == 'next') ? 'ASC' : 'DESC'; - - $sql = 'SELECT t.msg_id - FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . PRIVMSGS_TABLE . " p2 - WHERE p2.msg_id = $msg_id - AND t.folder_id = $folder_id - AND t.user_id = " . $user->data['user_id'] . " - AND t.msg_id = p.msg_id - AND p.message_time $sql_condition p2.message_time - ORDER BY p.message_time $sql_ordering"; - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - $message = ($view == 'next') ? 'NO_NEWER_PM' : 'NO_OLDER_PM'; - trigger_error($message); - } - else - { - $msg_id = $row['msg_id']; - } - } - - $sql = 'SELECT t.*, p.*, u.* - FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . ' u - WHERE t.user_id = ' . $user->data['user_id'] . " - AND p.author_id = u.user_id - AND t.folder_id = $folder_id - AND t.msg_id = p.msg_id - AND p.msg_id = $msg_id"; - $result = $db->sql_query($sql); - $message_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$message_row) - { - trigger_error('NO_MESSAGE'); - } - - // Update unread status - update_unread_status($message_row['pm_unread'], $message_row['msg_id'], $user->data['user_id'], $folder_id); - } - - $folder = get_folder($user->data['user_id'], $folder_id); - - $s_folder_options = $s_to_folder_options = ''; - foreach ($folder as $f_id => $folder_ary) - { - $option = '' . $folder_ary['folder_name'] . (($folder_ary['unread_messages']) ? ' [' . $folder_ary['unread_messages'] . '] ' : '') . ''; - - $s_to_folder_options .= ($f_id != PRIVMSGS_OUTBOX && $f_id != PRIVMSGS_SENTBOX) ? $option : ''; - $s_folder_options .= $option; - } - clean_sentbox($folder[PRIVMSGS_SENTBOX]['num_messages']); - - // Header for message view - folder and so on - $folder_status = get_folder_status($folder_id, $folder); - - $template->assign_vars(array( - 'CUR_FOLDER_ID' => $folder_id, - 'CUR_FOLDER_NAME' => $folder_status['folder_name'], - 'NUM_NOT_MOVED' => $num_not_moved, - 'NUM_REMOVED' => $num_removed, - 'RELEASE_MESSAGE_INFO' => sprintf($user->lang['RELEASE_MESSAGES'], '', ''), - 'NOT_MOVED_MESSAGES' => ($num_not_moved == 1) ? $user->lang['NOT_MOVED_MESSAGE'] : sprintf($user->lang['NOT_MOVED_MESSAGES'], $num_not_moved), - 'RULE_REMOVED_MESSAGES' => ($num_removed == 1) ? $user->lang['RULE_REMOVED_MESSAGE'] : sprintf($user->lang['RULE_REMOVED_MESSAGES'], $num_removed), - - 'S_FOLDER_OPTIONS' => $s_folder_options, - 'S_TO_FOLDER_OPTIONS' => $s_to_folder_options, - 'S_FOLDER_ACTION' => $this->u_action . '&action=view_folder', - 'S_PM_ACTION' => $this->u_action . '&action=' . $action, - - 'U_INBOX' => $this->u_action . '&folder=inbox', - 'U_OUTBOX' => $this->u_action . '&folder=outbox', - 'U_SENTBOX' => $this->u_action . '&folder=sentbox', - 'U_CREATE_FOLDER' => $this->u_action . '&mode=options', - 'U_CURRENT_FOLDER' => $this->u_action . '&folder=' . $folder_id, - - 'S_IN_INBOX' => ($folder_id == PRIVMSGS_INBOX) ? true : false, - 'S_IN_OUTBOX' => ($folder_id == PRIVMSGS_OUTBOX) ? true : false, - 'S_IN_SENTBOX' => ($folder_id == PRIVMSGS_SENTBOX) ? true : false, - - 'FOLDER_STATUS' => $folder_status['message'], - 'FOLDER_MAX_MESSAGES' => $folder_status['max'], - 'FOLDER_CUR_MESSAGES' => $folder_status['cur'], - 'FOLDER_REMAINING_MESSAGES' => $folder_status['remaining'], - 'FOLDER_PERCENT' => $folder_status['percent']) - ); - - if ($action == 'view_folder') - { - include($phpbb_root_path . 'includes/ucp/ucp_pm_viewfolder.' . $phpEx); - view_folder($id, $mode, $folder_id, $folder); - - $tpl_file = 'ucp_pm_viewfolder'; - } - else if ($action == 'view_message') - { - $template->assign_vars(array( - 'S_VIEW_MESSAGE' => true, - 'MSG_ID' => $msg_id) - ); - - if (!$msg_id) - { - trigger_error('NO_MESSAGE'); - } - - include($phpbb_root_path . 'includes/ucp/ucp_pm_viewmessage.' . $phpEx); - view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row); - - $tpl_file = ($view == 'print') ? 'ucp_pm_viewmessage_print' : 'ucp_pm_viewmessage'; - } - - break; - - default: - trigger_error('NO_ACTION_MODE', E_USER_ERROR); - break; - } - - $template->assign_vars(array( - 'L_TITLE' => $user->lang['UCP_PM_' . strtoupper($mode)], - 'S_UCP_ACTION' => $this->u_action . ((isset($action)) ? "&action=$action" : '')) - ); - - // Set desired template - $this->tpl_name = $tpl_file; - $this->page_title = 'UCP_PM_' . strtoupper($mode); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php deleted file mode 100644 index af592e3612..0000000000 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ /dev/null @@ -1,1172 +0,0 @@ -acl_get('u_masspm')) ? false : true; - - $error = array(); - $current_time = time(); - - // Was cancel pressed? If so then redirect to the appropriate page - if ($cancel || ($current_time - $lastclick < 2 && $submit)) - { - if ($msg_id) - { - redirect(append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=view&action=view_message&p=' . $msg_id)); - } - redirect(append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm')); - } - - // Output PM_TO box if message composing - if ($action != 'edit') - { - if ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) - { - $sql = 'SELECT g.group_id, g.group_name, g.group_type - FROM ' . GROUPS_TABLE . ' g'; - - if (!$auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) - { - $sql .= ' LEFT JOIN ' . USER_GROUP_TABLE . ' ug - ON ( - g.group_id = ug.group_id - AND ug.user_id = ' . $user->data['user_id'] . ' - AND ug.user_pending = 0 - ) - WHERE (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $user->data['user_id'] . ')'; - } - - $sql .= ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? ' WHERE ' : ' AND '; - - $sql .= 'g.group_receive_pm = 1 - ORDER BY g.group_type DESC, g.group_name ASC'; - $result = $db->sql_query($sql); - - $group_options = ''; - while ($row = $db->sql_fetchrow($result)) - { - $group_options .= '' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . ''; - } - $db->sql_freeresult($result); - } - - $template->assign_vars(array( - 'S_SHOW_PM_BOX' => true, - 'S_ALLOW_MASS_PM' => ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? true : false, - 'S_GROUP_OPTIONS' => ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? $group_options : '', - 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=searchuser&form=postform&field=username_list&select_single=$select_single"), - )); - } - - $sql = ''; - - // What is all this following SQL for? Well, we need to know - // some basic information in all cases before we do anything. - switch ($action) - { - case 'post': - if (!$auth->acl_get('u_sendpm')) - { - trigger_error('NO_AUTH_SEND_MESSAGE'); - } - break; - - case 'reply': - case 'quote': - case 'forward': - case 'quotepost': - if (!$msg_id) - { - trigger_error('NO_MESSAGE'); - } - - if (!$auth->acl_get('u_sendpm')) - { - trigger_error('NO_AUTH_SEND_MESSAGE'); - } - - if ($action == 'quotepost') - { - $sql = 'SELECT p.post_id as msg_id, p.forum_id, p.post_text as message_text, p.poster_id as author_id, p.post_time as message_time, p.bbcode_bitfield, p.bbcode_uid, p.enable_sig, p.enable_smilies, p.enable_magic_url, t.topic_title as message_subject, u.username as quote_username - FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . " u - WHERE p.post_id = $msg_id - AND t.topic_id = p.topic_id - AND u.user_id = p.poster_id"; - } - else - { - $sql = 'SELECT t.folder_id, p.*, u.username as quote_username - FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . ' u - WHERE t.user_id = ' . $user->data['user_id'] . " - AND p.author_id = u.user_id - AND t.msg_id = p.msg_id - AND p.msg_id = $msg_id"; - } - break; - - case 'edit': - if (!$msg_id) - { - trigger_error('NO_MESSAGE'); - } - - // check for outbox (not read) status, we do not allow editing if one user already having the message - $sql = 'SELECT p.*, t.folder_id - FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p - WHERE t.user_id = ' . $user->data['user_id'] . ' - AND t.folder_id = ' . PRIVMSGS_OUTBOX . " - AND t.msg_id = $msg_id - AND t.msg_id = p.msg_id"; - break; - - case 'delete': - if (!$auth->acl_get('u_pm_delete')) - { - trigger_error('NO_AUTH_DELETE_MESSAGE'); - } - - if (!$msg_id) - { - trigger_error('NO_MESSAGE'); - } - - $sql = 'SELECT msg_id, pm_unread, pm_new, author_id, folder_id - FROM ' . PRIVMSGS_TO_TABLE . ' - WHERE user_id = ' . $user->data['user_id'] . " - AND msg_id = $msg_id"; - break; - - case 'smilies': - generate_smilies('window', 0); - break; - - default: - trigger_error('NO_ACTION_MODE', E_USER_ERROR); - break; - } - - if ($action == 'forward' && (!$config['forward_pm'] || !$auth->acl_get('u_pm_forward'))) - { - trigger_error('NO_AUTH_FORWARD_MESSAGE'); - } - - if ($action == 'edit' && !$auth->acl_get('u_pm_edit')) - { - trigger_error('NO_AUTH_EDIT_MESSAGE'); - } - - if ($sql) - { - $result = $db->sql_query($sql); - $post = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$post) - { - // If editing it could be the recipient already read the message... - if ($action == 'edit') - { - $sql = 'SELECT p.*, t.folder_id - FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p - WHERE t.user_id = ' . $user->data['user_id'] . " - AND t.msg_id = $msg_id - AND t.msg_id = p.msg_id"; - $result = $db->sql_query($sql); - $post = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($post) - { - trigger_error('NO_EDIT_READ_MESSAGE'); - } - } - - trigger_error('NO_MESSAGE'); - } - - if ($action == 'quotepost') - { - if (($post['forum_id'] && !$auth->acl_get('f_read', $post['forum_id'])) || (!$post['forum_id'] && !$auth->acl_getf_global('f_read'))) - { - trigger_error('NOT_AUTHORISED'); - } - } - - $msg_id = (int) $post['msg_id']; - $folder_id = (isset($post['folder_id'])) ? $post['folder_id'] : 0; - $message_text = (isset($post['message_text'])) ? $post['message_text'] : ''; - - if ((!$post['author_id'] || ($post['author_id'] == ANONYMOUS && $action != 'delete')) && $msg_id) - { - trigger_error('NO_AUTHOR'); - } - - if ($action == 'quotepost') - { - // Decode text for message display - decode_message($message_text, $post['bbcode_uid']); - } - - if ($action != 'delete') - { - $enable_urls = $post['enable_magic_url']; - $enable_sig = (isset($post['enable_sig'])) ? $post['enable_sig'] : 0; - - $message_attachment = (isset($post['message_attachment'])) ? $post['message_attachment'] : 0; - $message_subject = $post['message_subject']; - $message_time = $post['message_time']; - $bbcode_uid = $post['bbcode_uid']; - - $quote_username = (isset($post['quote_username'])) ? $post['quote_username'] : ''; - $icon_id = (isset($post['icon_id'])) ? $post['icon_id'] : 0; - - if (($action == 'reply' || $action == 'quote' || $action == 'quotepost') && !sizeof($address_list) && !$refresh && !$submit && !$preview) - { - $address_list = array('u' => array($post['author_id'] => 'to')); - } - else if ($action == 'edit' && !sizeof($address_list) && !$refresh && !$submit && !$preview) - { - // Rebuild TO and BCC Header - $address_list = rebuild_header(array('to' => $post['to_address'], 'bcc' => $post['bcc_address'])); - } - - if ($action == 'quotepost') - { - $check_value = 0; - } - else - { - $check_value = (($post['enable_bbcode']+1) << 8) + (($post['enable_smilies']+1) << 4) + (($enable_urls+1) << 2) + (($post['enable_sig']+1) << 1); - } - } - } - else - { - $message_attachment = 0; - $message_text = $message_subject = ''; - - if ($to_user_id && $action == 'post') - { - $address_list['u'][$to_user_id] = 'to'; - } - else if ($to_group_id && $action == 'post') - { - $address_list['g'][$to_group_id] = 'to'; - } - $check_value = 0; - } - - if (($to_group_id || isset($address_list['g'])) && (!$config['allow_mass_pm'] || !$auth->acl_get('u_masspm'))) - { - trigger_error('NO_AUTH_GROUP_MESSAGE'); - } - - if ($action == 'edit' && !$refresh && !$preview && !$submit) - { - if (!($message_time > time() - ($config['pm_edit_time'] * 60) || !$config['pm_edit_time'])) - { - trigger_error('CANNOT_EDIT_MESSAGE_TIME'); - } - } - - if ($action == 'post') - { - $template->assign_var('S_NEW_MESSAGE', true); - } - - if (!isset($icon_id)) - { - $icon_id = 0; - } - - $message_parser = new parse_message(); - - $message_parser->message = ($action == 'reply') ? '' : $message_text; - unset($message_text); - - $s_action = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=$id&mode=$mode&action=$action", true, $user->session_id); - $s_action .= ($msg_id) ? "&p=$msg_id" : ''; - - // Delete triggered ? - if ($action == 'delete') - { - // Folder id has been determined by the SQL Statement - // $folder_id = request_var('f', PRIVMSGS_NO_BOX); - - // Do we need to confirm ? - if (confirm_box(true)) - { - delete_pm($user->data['user_id'], $msg_id, $folder_id); - - // jump to next message in "history"? nope, not for the moment. But able to be included later. - $meta_info = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&folder=$folder_id"); - $message = $user->lang['MESSAGE_DELETED']; - - meta_refresh(3, $meta_info); - $message .= '

    ' . sprintf($user->lang['RETURN_FOLDER'], '', ''); - trigger_error($message); - } - else - { - $s_hidden_fields = array( - 'p' => $msg_id, - 'f' => $folder_id, - 'action' => 'delete' - ); - - // "{$phpbb_root_path}ucp.$phpEx?i=pm&mode=compose" - confirm_box(false, 'DELETE_MESSAGE', build_hidden_fields($s_hidden_fields)); - } - - redirect(append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=view&action=view_message&p=' . $msg_id)); - } - - // Handle User/Group adding/removing - handle_message_list_actions($address_list, $error, $remove_u, $remove_g, $add_to, $add_bcc); - - // Check for too many recipients - if ((!$config['allow_mass_pm'] || !$auth->acl_get('u_masspm')) && num_recipients($address_list) > 1) - { - $address_list = get_recipient_pos($address_list, 1); - $error[] = $user->lang['TOO_MANY_RECIPIENTS']; - } - - // Always check if the submitted attachment data is valid and belongs to the user. - // Further down (especially in submit_post()) we do not check this again. - $message_parser->get_submitted_attachment_data(); - - if ($message_attachment && !$submit && !$refresh && !$preview && $action == 'edit') - { - // Do not change to SELECT * - $sql = 'SELECT attach_id, is_orphan, attach_comment, real_filename - FROM ' . ATTACHMENTS_TABLE . " - WHERE post_msg_id = $msg_id - AND in_message = 1 - AND is_orphan = 0 - ORDER BY filetime DESC"; - $result = $db->sql_query($sql); - $message_parser->attachment_data = array_merge($message_parser->attachment_data, $db->sql_fetchrowset($result)); - $db->sql_freeresult($result); - } - - if (!in_array($action, array('quote', 'edit', 'delete', 'forward'))) - { - $enable_sig = ($config['allow_sig'] && $config['allow_sig_pm'] && $auth->acl_get('u_sig') && $user->optionget('attachsig')); - $enable_smilies = ($config['allow_smilies'] && $auth->acl_get('u_pm_smilies') && $user->optionget('smilies')); - $enable_bbcode = ($config['allow_bbcode'] && $auth->acl_get('u_pm_bbcode') && $user->optionget('bbcode')); - $enable_urls = true; - } - - $enable_magic_url = $drafts = false; - - // User own some drafts? - if ($auth->acl_get('u_savedrafts') && $action != 'delete') - { - $sql = 'SELECT draft_id - FROM ' . DRAFTS_TABLE . ' - WHERE forum_id = 0 - AND topic_id = 0 - AND user_id = ' . $user->data['user_id'] . - (($draft_id) ? " AND draft_id <> $draft_id" : ''); - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - $drafts = true; - } - } - - if ($action == 'edit') - { - $message_parser->bbcode_uid = $bbcode_uid; - } - - $bbcode_status = ($config['allow_bbcode'] && $config['auth_bbcode_pm'] && $auth->acl_get('u_pm_bbcode')) ? true : false; - $smilies_status = ($config['allow_smilies'] && $config['auth_smilies_pm'] && $auth->acl_get('u_pm_smilies')) ? true : false; - $img_status = ($config['auth_img_pm'] && $auth->acl_get('u_pm_img')) ? true : false; - $flash_status = ($config['auth_flash_pm'] && $auth->acl_get('u_pm_flash')) ? true : false; - $url_status = ($config['allow_post_links']) ? true : false; - - // Save Draft - if ($save && $auth->acl_get('u_savedrafts')) - { - $subject = utf8_normalize_nfc(request_var('subject', '', true)); - $subject = (!$subject && $action != 'post') ? $user->lang['NEW_MESSAGE'] : $subject; - $message = utf8_normalize_nfc(request_var('message', '', true)); - - if ($subject && $message) - { - if (confirm_box(true)) - { - $sql = 'INSERT INTO ' . DRAFTS_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'user_id' => $user->data['user_id'], - 'topic_id' => 0, - 'forum_id' => 0, - 'save_time' => $current_time, - 'draft_subject' => $subject, - 'draft_message' => $message - ) - ); - $db->sql_query($sql); - - $redirect_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&mode=$mode"); - - meta_refresh(3, $redirect_url); - $message = $user->lang['DRAFT_SAVED'] . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - - trigger_error($message); - } - else - { - $s_hidden_fields = build_hidden_fields(array( - 'mode' => $mode, - 'action' => $action, - 'save' => true, - 'subject' => $subject, - 'message' => $message, - 'u' => $to_user_id, - 'g' => $to_group_id, - 'p' => $msg_id) - ); - $s_hidden_fields .= build_address_field($address_list); - - - confirm_box(false, 'SAVE_DRAFT', $s_hidden_fields); - } - } - else - { - if (utf8_clean_string($subject) === '') - { - $error[] = $user->lang['EMPTY_MESSAGE_SUBJECT']; - } - - if (utf8_clean_string($message) === '') - { - $error[] = $user->lang['TOO_FEW_CHARS']; - } - } - - unset($subject, $message); - } - - // Load Draft - if ($draft_id && $auth->acl_get('u_savedrafts')) - { - $sql = 'SELECT draft_subject, draft_message - FROM ' . DRAFTS_TABLE . " - WHERE draft_id = $draft_id - AND topic_id = 0 - AND forum_id = 0 - AND user_id = " . $user->data['user_id']; - $result = $db->sql_query_limit($sql, 1); - - if ($row = $db->sql_fetchrow($result)) - { - $message_parser->message = $row['draft_message']; - $message_subject = $row['draft_subject']; - - $template->assign_var('S_DRAFT_LOADED', true); - } - else - { - $draft_id = 0; - } - $db->sql_freeresult($result); - } - - // Load Drafts - if ($load && $drafts) - { - load_drafts(0, 0, $id); - } - - if ($submit || $preview || $refresh) - { - if (($submit || $preview) && !check_form_key('ucp_pm_compose')) - { - $error[] = $user->lang['FORM_INVALID']; - } - $subject = utf8_normalize_nfc(request_var('subject', '', true)); - $message_parser->message = utf8_normalize_nfc(request_var('message', '', true)); - - $icon_id = request_var('icon', 0); - - $enable_bbcode = (!$bbcode_status || isset($_POST['disable_bbcode'])) ? false : true; - $enable_smilies = (!$smilies_status || isset($_POST['disable_smilies'])) ? false : true; - $enable_urls = (isset($_POST['disable_magic_url'])) ? 0 : 1; - $enable_sig = (!$config['allow_sig'] ||!$config['allow_sig_pm']) ? false : ((isset($_POST['attach_sig'])) ? true : false); - - if ($submit) - { - $status_switch = (($enable_bbcode+1) << 8) + (($enable_smilies+1) << 4) + (($enable_urls+1) << 2) + (($enable_sig+1) << 1); - $status_switch = ($status_switch != $check_value); - } - else - { - $status_switch = 1; - } - - // Parse Attachments - before checksum is calculated - $message_parser->parse_attachments('fileupload', $action, 0, $submit, $preview, $refresh, true); - - if (sizeof($message_parser->warn_msg) && !($remove_u || $remove_g || $add_to || $add_bcc)) - { - $error[] = implode('
    ', $message_parser->warn_msg); - $message_parser->warn_msg = array(); - } - - // Parse message - $message_parser->parse($enable_bbcode, ($config['allow_post_links']) ? $enable_urls : false, $enable_smilies, $img_status, $flash_status, true, $config['allow_post_links']); - - // On a refresh we do not care about message parsing errors - if (sizeof($message_parser->warn_msg) && !$refresh) - { - $error[] = implode('
    ', $message_parser->warn_msg); - } - - if ($action != 'edit' && !$preview && !$refresh && $config['flood_interval'] && !$auth->acl_get('u_ignoreflood')) - { - // Flood check - $last_post_time = $user->data['user_lastpost_time']; - - if ($last_post_time) - { - if ($last_post_time && ($current_time - $last_post_time) < intval($config['flood_interval'])) - { - $error[] = $user->lang['FLOOD_ERROR']; - } - } - } - - // Subject defined - if ($submit) - { - if (utf8_clean_string($subject) === '') - { - $error[] = $user->lang['EMPTY_MESSAGE_SUBJECT']; - } - - if (!sizeof($address_list)) - { - $error[] = $user->lang['NO_RECIPIENT']; - } - } - - // Store message, sync counters - if (!sizeof($error) && $submit) - { - $pm_data = array( - 'msg_id' => (int) $msg_id, - 'from_user_id' => $user->data['user_id'], - 'from_user_ip' => $user->ip, - 'from_username' => $user->data['username'], - 'reply_from_root_level' => (isset($post['root_level'])) ? (int) $post['root_level'] : 0, - 'reply_from_msg_id' => (int) $msg_id, - 'icon_id' => (int) $icon_id, - 'enable_sig' => (bool) $enable_sig, - 'enable_bbcode' => (bool) $enable_bbcode, - 'enable_smilies' => (bool) $enable_smilies, - 'enable_urls' => (bool) $enable_urls, - 'bbcode_bitfield' => $message_parser->bbcode_bitfield, - 'bbcode_uid' => $message_parser->bbcode_uid, - 'message' => $message_parser->message, - 'attachment_data' => $message_parser->attachment_data, - 'filename_data' => $message_parser->filename_data, - 'address_list' => $address_list - ); - unset($message_parser); - - // ((!$message_subject) ? $subject : $message_subject) - $msg_id = submit_pm($action, $subject, $pm_data); - - $return_message_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=view&p=' . $msg_id); - $return_folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=outbox'); - meta_refresh(3, $return_message_url); - - $message = $user->lang['MESSAGE_STORED'] . '

    ' . sprintf($user->lang['VIEW_PRIVATE_MESSAGE'], '', '') . '

    ' . sprintf($user->lang['CLICK_RETURN_FOLDER'], '', '', $user->lang['PM_OUTBOX']); - trigger_error($message); - } - - $message_subject = $subject; - } - - // Preview - if (!sizeof($error) && $preview) - { - $user->add_lang('viewtopic'); - $preview_message = $message_parser->format_display($enable_bbcode, $enable_urls, $enable_smilies, false); - - $preview_signature = $user->data['user_sig']; - $preview_signature_uid = $user->data['user_sig_bbcode_uid']; - $preview_signature_bitfield = $user->data['user_sig_bbcode_bitfield']; - - // Signature - if ($enable_sig && $config['allow_sig'] && $preview_signature) - { - $parse_sig = new parse_message($preview_signature); - $parse_sig->bbcode_uid = $preview_signature_uid; - $parse_sig->bbcode_bitfield = $preview_signature_bitfield; - - $parse_sig->format_display($enable_bbcode, $enable_urls, $enable_smilies); - $preview_signature = $parse_sig->message; - unset($parse_sig); - } - else - { - $preview_signature = ''; - } - - // Attachment Preview - if (sizeof($message_parser->attachment_data)) - { - $template->assign_var('S_HAS_ATTACHMENTS', true); - - $update_count = array(); - $attachment_data = $message_parser->attachment_data; - - parse_attachments(false, $preview_message, $attachment_data, $update_count, true); - - foreach ($attachment_data as $i => $attachment) - { - $template->assign_block_vars('attachment', array( - 'DISPLAY_ATTACHMENT' => $attachment) - ); - } - unset($attachment_data); - } - - $preview_subject = censor_text($subject); - - if (!sizeof($error)) - { - $template->assign_vars(array( - 'PREVIEW_SUBJECT' => $preview_subject, - 'PREVIEW_MESSAGE' => $preview_message, - 'PREVIEW_SIGNATURE' => $preview_signature, - - 'S_DISPLAY_PREVIEW' => true) - ); - } - unset($message_text); - } - - // Decode text for message display - $bbcode_uid = (($action == 'quote' || $action == 'forward') && !$preview && !$refresh && !sizeof($error)) ? $bbcode_uid : $message_parser->bbcode_uid; - - $message_parser->decode_message($bbcode_uid); - - if (($action == 'quote' || $action == 'quotepost') && !$preview && !$refresh && !$submit) - { - if ($action == 'quotepost') - { - $post_id = request_var('p', 0); - if ($config['allow_post_links']) - { - $message_link = "[url=" . generate_board_url() . "/viewtopic.$phpEx?p={$post_id}#p{$post_id}]{$user->lang['SUBJECT']}: {$message_subject}[/url]\n\n"; - } - else - { - $message_link = $user->lang['SUBJECT'] . ': ' . $message_subject . " (" . generate_board_url() . "/viewtopic.$phpEx?p={$post_id}#p{$post_id})\n\n"; - } - } - else - { - $message_link = ''; - } - $message_parser->message = $message_link . '[quote="' . $quote_username . '"]' . censor_text(trim($message_parser->message)) . "[/quote]\n"; - } - - if (($action == 'reply' || $action == 'quote' || $action == 'quotepost') && !$preview && !$refresh) - { - $message_subject = ((!preg_match('/^Re:/', $message_subject)) ? 'Re: ' : '') . censor_text($message_subject); - } - - if ($action == 'forward' && !$preview && !$refresh && !$submit) - { - $fwd_to_field = write_pm_addresses(array('to' => $post['to_address']), 0, true); - - if ($config['allow_post_links']) - { - $quote_username_text = '[url=' . generate_board_url() . "/memberlist.$phpEx?mode=viewprofile&u={$post['author_id']}]{$quote_username}[/url]"; - } - else - { - $quote_username_text = $quote_username . ' (' . generate_board_url() . "/memberlist.$phpEx?mode=viewprofile&u={$post['author_id']})"; - } - - $forward_text = array(); - $forward_text[] = $user->lang['FWD_ORIGINAL_MESSAGE']; - $forward_text[] = sprintf($user->lang['FWD_SUBJECT'], censor_text($message_subject)); - $forward_text[] = sprintf($user->lang['FWD_DATE'], $user->format_date($message_time)); - $forward_text[] = sprintf($user->lang['FWD_FROM'], $quote_username_text); - $forward_text[] = sprintf($user->lang['FWD_TO'], implode(', ', $fwd_to_field['to'])); - - $message_parser->message = implode("\n", $forward_text) . "\n\n[quote=\"{$quote_username}\"]\n" . censor_text(trim($message_parser->message)) . "\n[/quote]"; - $message_subject = ((!preg_match('/^Fwd:/', $message_subject)) ? 'Fwd: ' : '') . censor_text($message_subject); - } - - $attachment_data = $message_parser->attachment_data; - $filename_data = $message_parser->filename_data; - $message_text = $message_parser->message; - unset($message_parser); - - // MAIN PM PAGE BEGINS HERE - - // Generate smiley listing - generate_smilies('inline', 0); - - // Generate PM Icons - $s_pm_icons = false; - if ($config['enable_pm_icons']) - { - $s_pm_icons = posting_gen_topic_icons($action, $icon_id); - } - - // Generate inline attachment select box - posting_gen_inline_attachments($attachment_data); - - // Build address list for display - // array('u' => array($author_id => 'to')); - if (sizeof($address_list)) - { - // Get Usernames and Group Names - $result = array(); - if (!empty($address_list['u'])) - { - $sql = 'SELECT user_id as id, username as name, user_colour as colour - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', array_map('intval', array_keys($address_list['u']))) . ' - ORDER BY username_clean ASC'; - $result['u'] = $db->sql_query($sql); - } - - if (!empty($address_list['g'])) - { - $sql = 'SELECT g.group_id AS id, g.group_name AS name, g.group_colour AS colour, g.group_type - FROM ' . GROUPS_TABLE . ' g'; - - if (!$auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) - { - $sql .= ' LEFT JOIN ' . USER_GROUP_TABLE . ' ug - ON ( - g.group_id = ug.group_id - AND ug.user_id = ' . $user->data['user_id'] . ' - AND ug.user_pending = 0 - ) - WHERE (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $user->data['user_id'] . ')'; - } - - $sql .= ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? ' WHERE ' : ' AND '; - - $sql .= 'g.group_receive_pm = 1 - AND ' . $db->sql_in_set('g.group_id', array_map('intval', array_keys($address_list['g']))) . ' - ORDER BY g.group_name ASC'; - - $result['g'] = $db->sql_query($sql); - } - - $u = $g = array(); - $_types = array('u', 'g'); - foreach ($_types as $type) - { - if (isset($result[$type]) && $result[$type]) - { - while ($row = $db->sql_fetchrow($result[$type])) - { - if ($type == 'g') - { - $row['name'] = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['name']] : $row['name']; - } - - ${$type}[$row['id']] = array('name' => $row['name'], 'colour' => $row['colour']); - } - $db->sql_freeresult($result[$type]); - } - } - - // Now Build the address list - $plain_address_field = ''; - foreach ($address_list as $type => $adr_ary) - { - foreach ($adr_ary as $id => $field) - { - if (!isset(${$type}[$id])) - { - unset($address_list[$type][$id]); - continue; - } - - $field = ($field == 'to') ? 'to' : 'bcc'; - $type = ($type == 'u') ? 'u' : 'g'; - $id = (int) $id; - - $tpl_ary = array( - 'IS_GROUP' => ($type == 'g') ? true : false, - 'IS_USER' => ($type == 'u') ? true : false, - 'UG_ID' => $id, - 'NAME' => ${$type}[$id]['name'], - 'COLOUR' => (${$type}[$id]['colour']) ? '#' . ${$type}[$id]['colour'] : '', - 'TYPE' => $type, - ); - - if ($type == 'u') - { - $tpl_ary = array_merge($tpl_ary, array( - 'U_VIEW' => get_username_string('profile', $id, ${$type}[$id]['name'], ${$type}[$id]['colour']), - 'NAME_FULL' => get_username_string('full', $id, ${$type}[$id]['name'], ${$type}[$id]['colour']), - )); - } - else - { - $tpl_ary = array_merge($tpl_ary, array( - 'U_VIEW' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $id), - )); - } - - $template->assign_block_vars($field . '_recipient', $tpl_ary); - } - } - } - - // Build hidden address list - $s_hidden_address_field = build_address_field($address_list); - - - $bbcode_checked = (isset($enable_bbcode)) ? !$enable_bbcode : (($config['allow_bbcode'] && $auth->acl_get('u_pm_bbcode')) ? !$user->optionget('bbcode') : 1); - $smilies_checked = (isset($enable_smilies)) ? !$enable_smilies : (($config['allow_smilies'] && $auth->acl_get('u_pm_smilies')) ? !$user->optionget('smilies') : 1); - $urls_checked = (isset($enable_urls)) ? !$enable_urls : 0; - $sig_checked = $enable_sig; - - switch ($action) - { - case 'post': - $page_title = $user->lang['POST_NEW_PM']; - break; - - case 'quote': - $page_title = $user->lang['POST_QUOTE_PM']; - break; - - case 'quotepost': - $page_title = $user->lang['POST_PM_POST']; - break; - - case 'reply': - $page_title = $user->lang['POST_REPLY_PM']; - break; - - case 'edit': - $page_title = $user->lang['POST_EDIT_PM']; - break; - - case 'forward': - $page_title = $user->lang['POST_FORWARD_PM']; - break; - - default: - trigger_error('NO_ACTION_MODE', E_USER_ERROR); - break; - } - - $s_hidden_fields = ''; - $s_hidden_fields .= (isset($check_value)) ? '' : ''; - $s_hidden_fields .= ($draft_id || isset($_REQUEST['draft_loaded'])) ? '' : ''; - - $form_enctype = (@ini_get('file_uploads') == '0' || strtolower(@ini_get('file_uploads')) == 'off' || @ini_get('file_uploads') == '0' || !$config['allow_pm_attach'] || !$auth->acl_get('u_pm_attach')) ? '' : ' enctype="multipart/form-data"'; - - // Start assigning vars for main posting page ... - $template->assign_vars(array( - 'L_POST_A' => $page_title, - 'L_ICON' => $user->lang['PM_ICON'], - 'L_MESSAGE_BODY_EXPLAIN' => (intval($config['max_post_chars'])) ? sprintf($user->lang['MESSAGE_BODY_EXPLAIN'], intval($config['max_post_chars'])) : '', - - 'SUBJECT' => (isset($message_subject)) ? $message_subject : '', - 'MESSAGE' => $message_text, - 'BBCODE_STATUS' => ($bbcode_status) ? sprintf($user->lang['BBCODE_IS_ON'], '', '') : sprintf($user->lang['BBCODE_IS_OFF'], '', ''), - 'IMG_STATUS' => ($img_status) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'], - 'FLASH_STATUS' => ($flash_status) ? $user->lang['FLASH_IS_ON'] : $user->lang['FLASH_IS_OFF'], - 'SMILIES_STATUS' => ($smilies_status) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'], - 'URL_STATUS' => ($url_status) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'], - 'MINI_POST_IMG' => $user->img('icon_post_target', $user->lang['PM']), - 'ERROR' => (sizeof($error)) ? implode('
    ', $error) : '', - - 'S_COMPOSE_PM' => true, - 'S_EDIT_POST' => ($action == 'edit'), - 'S_SHOW_PM_ICONS' => $s_pm_icons, - 'S_BBCODE_ALLOWED' => $bbcode_status, - 'S_BBCODE_CHECKED' => ($bbcode_checked) ? ' checked="checked"' : '', - 'S_SMILIES_ALLOWED' => $smilies_status, - 'S_SMILIES_CHECKED' => ($smilies_checked) ? ' checked="checked"' : '', - 'S_SIG_ALLOWED' => ($config['allow_sig'] && $config['allow_sig_pm'] && $auth->acl_get('u_sig')), - 'S_SIGNATURE_CHECKED' => ($sig_checked) ? ' checked="checked"' : '', - 'S_LINKS_ALLOWED' => $url_status, - 'S_MAGIC_URL_CHECKED' => ($urls_checked) ? ' checked="checked"' : '', - 'S_SAVE_ALLOWED' => ($auth->acl_get('u_savedrafts') && $action != 'edit') ? true : false, - 'S_HAS_DRAFTS' => ($auth->acl_get('u_savedrafts') && $drafts), - 'S_FORM_ENCTYPE' => $form_enctype, - - 'S_BBCODE_IMG' => $img_status, - 'S_BBCODE_FLASH' => $flash_status, - 'S_BBCODE_QUOTE' => true, - 'S_BBCODE_URL' => $url_status, - - 'S_POST_ACTION' => $s_action, - 'S_HIDDEN_ADDRESS_FIELD' => $s_hidden_address_field, - 'S_HIDDEN_FIELDS' => $s_hidden_fields, - - 'S_CLOSE_PROGRESS_WINDOW' => isset($_POST['add_file']), - 'U_PROGRESS_BAR' => append_sid("{$phpbb_root_path}posting.$phpEx", 'f=0&mode=popup'), - 'UA_PROGRESS_BAR' => addslashes(append_sid("{$phpbb_root_path}posting.$phpEx", 'f=0&mode=popup')), - )); - - // Build custom bbcodes array - display_custom_bbcodes(); - - // Attachment entry - if ($auth->acl_get('u_pm_attach') && $config['allow_pm_attach'] && $form_enctype) - { - posting_gen_attachment_entry($attachment_data, $filename_data); - } - - // Message History - if ($action == 'reply' || $action == 'quote' || $action == 'forward') - { - if (message_history($msg_id, $user->data['user_id'], $post, array(), true)) - { - $template->assign_var('S_DISPLAY_HISTORY', true); - } - } -} - -/** -* For composing messages, handle list actions -*/ -function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove_g, $add_to, $add_bcc) -{ - global $auth, $db, $user; - - // Delete User [TO/BCC] - if ($remove_u && !empty($_REQUEST['remove_u']) && is_array($_REQUEST['remove_u'])) - { - $remove_user_id = array_keys($_REQUEST['remove_u']); - - if (isset($remove_user_id[0])) - { - unset($address_list['u'][(int) $remove_user_id[0]]); - } - } - - // Delete Group [TO/BCC] - if ($remove_g && !empty($_REQUEST['remove_g']) && is_array($_REQUEST['remove_g'])) - { - $remove_group_id = array_keys($_REQUEST['remove_g']); - - if (isset($remove_group_id[0])) - { - unset($address_list['g'][(int) $remove_group_id[0]]); - } - } - - // Add User/Group [TO] - if ($add_to || $add_bcc) - { - $type = ($add_to) ? 'to' : 'bcc'; - - // Add Selected Groups - $group_list = request_var('group_list', array(0)); - - if (sizeof($group_list)) - { - foreach ($group_list as $group_id) - { - $address_list['g'][$group_id] = $type; - } - } - - // User ID's to add... - $user_id_ary = array(); - - // Build usernames to add - $usernames = (isset($_REQUEST['username'])) ? array(request_var('username', '', true)) : array(); - $username_list = request_var('username_list', '', true); - if ($username_list) - { - $usernames = array_merge($usernames, explode("\n", $username_list)); - } - - // Reveal the correct user_ids - if (sizeof($usernames)) - { - $user_id_ary = array(); - user_get_id_name($user_id_ary, $usernames, array(USER_NORMAL, USER_FOUNDER, USER_INACTIVE)); - - // If there are users not existing, we will at least print a notice... - if (!sizeof($user_id_ary)) - { - $error[] = $user->lang['PM_NO_USERS']; - } - } - - // Add Friends if specified - $friend_list = (is_array($_REQUEST['add_' . $type])) ? array_map('intval', array_keys($_REQUEST['add_' . $type])) : array(); - $user_id_ary = array_merge($user_id_ary, $friend_list); - - foreach ($user_id_ary as $user_id) - { - if ($user_id == ANONYMOUS) - { - continue; - } - - $address_list['u'][$user_id] = $type; - } - } - - // Check for disallowed recipients - if (!empty($address_list['u'])) - { - // We need to check their PM status (do they want to receive PM's?) - // Only check if not a moderator or admin, since they are allowed to override this user setting - if (!$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_')) - { - $sql = 'SELECT user_id - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', array_keys($address_list['u'])) . ' - AND user_allow_pm = 0'; - $result = $db->sql_query($sql); - - $removed = false; - while ($row = $db->sql_fetchrow($result)) - { - $removed = true; - unset($address_list['u'][$row['user_id']]); - } - $db->sql_freeresult($result); - - // print a notice about users not being added who do not want to receive pms - if ($removed) - { - $error[] = $user->lang['PM_USERS_REMOVED_NO_PM']; - } - } - } -} - -/** -* Build the hidden field for the recipients. Needed, as the variable is not read via request_var. -*/ -function build_address_field($address_list) -{ - $s_hidden_address_field = ''; - foreach ($address_list as $type => $adr_ary) - { - foreach ($adr_ary as $id => $field) - { - $s_hidden_address_field .= ''; - } - } - return $s_hidden_address_field; -} - -/** -* Return number of private message recipients -*/ -function num_recipients($address_list) -{ - $num_recipients = 0; - - foreach ($address_list as $field => $adr_ary) - { - $num_recipients += sizeof($adr_ary); - } - - return $num_recipients; -} - -/** -* Get recipient at position 'pos' -*/ -function get_recipient_pos($address_list, $position = 1) -{ - $recipient = array(); - - $count = 1; - foreach ($address_list as $field => $adr_ary) - { - foreach ($adr_ary as $id => $type) - { - if ($count == $position) - { - $recipient[$field][$id] = $type; - break 2; - } - $count++; - } - } - - return $recipient; -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php deleted file mode 100644 index 2d2ff23cab..0000000000 --- a/phpBB/includes/ucp/ucp_pm_options.php +++ /dev/null @@ -1,832 +0,0 @@ -data['user_id']; - $db->sql_query($sql); - - $user->data['user_full_folder'] = $set_folder_id; - - $message = $user->lang['FULL_FOLDER_OPTION_CHANGED'] . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - meta_refresh(3, $redirect_url); - trigger_error($message); - } - } - - // Add Folder - if (isset($_POST['addfolder'])) - { - if (check_form_key('ucp_pm_options')) - { - $folder_name = utf8_normalize_nfc(request_var('foldername', '', true)); - $msg = ''; - - if ($folder_name) - { - $sql = 'SELECT folder_name - FROM ' . PRIVMSGS_FOLDER_TABLE . " - WHERE folder_name = '" . $db->sql_escape($folder_name) . "' - AND user_id = " . $user->data['user_id']; - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - trigger_error(sprintf($user->lang['FOLDER_NAME_EXIST'], $folder_name)); - } - - $sql = 'SELECT COUNT(folder_id) as num_folder - FROM ' . PRIVMSGS_FOLDER_TABLE . ' - WHERE user_id = ' . $user->data['user_id']; - $result = $db->sql_query($sql); - $num_folder = (int) $db->sql_fetchfield('num_folder'); - $db->sql_freeresult($result); - - if ($num_folder >= $config['pm_max_boxes']) - { - trigger_error('MAX_FOLDER_REACHED'); - } - - $sql = 'INSERT INTO ' . PRIVMSGS_FOLDER_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'user_id' => (int) $user->data['user_id'], - 'folder_name' => $folder_name) - ); - $db->sql_query($sql); - $msg = $user->lang['FOLDER_ADDED']; - } - } - else - { - $msg = $user->lang['FORM_INVALID']; - } - $message = $msg . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - meta_refresh(3, $redirect_url); - trigger_error($message); - } - - // Rename folder - if (isset($_POST['rename_folder'])) - { - if (check_form_key('ucp_pm_options')) - { - $new_folder_name = utf8_normalize_nfc(request_var('new_folder_name', '', true)); - $rename_folder_id= request_var('rename_folder_id', 0); - - if (!$new_folder_name) - { - trigger_error('NO_NEW_FOLDER_NAME'); - } - - // Select custom folder - $sql = 'SELECT folder_name, pm_count - FROM ' . PRIVMSGS_FOLDER_TABLE . " - WHERE user_id = {$user->data['user_id']} - AND folder_id = $rename_folder_id"; - $result = $db->sql_query_limit($sql, 1); - $folder_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$folder_row) - { - trigger_error('CANNOT_RENAME_FOLDER'); - } - - $sql = 'UPDATE ' . PRIVMSGS_FOLDER_TABLE . " - SET folder_name = '" . $db->sql_escape($new_folder_name) . "' - WHERE folder_id = $rename_folder_id - AND user_id = {$user->data['user_id']}"; - $db->sql_query($sql); - $msg = $user->lang['FOLDER_RENAMED']; - } - else - { - $msg = $user->lang['FORM_INVALID']; - } - - $message = $msg . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - - meta_refresh(3, $redirect_url); - trigger_error($message); - } - - // Remove Folder - if (isset($_POST['remove_folder'])) - { - $remove_folder_id = request_var('remove_folder_id', 0); - - // Default to "move all messages to inbox" - $remove_action = request_var('remove_action', 1); - $move_to = request_var('move_to', PRIVMSGS_INBOX); - - // Move to same folder? - if ($remove_action == 1 && $remove_folder_id == $move_to) - { - trigger_error('CANNOT_MOVE_TO_SAME_FOLDER'); - } - - // Select custom folder - $sql = 'SELECT folder_name, pm_count - FROM ' . PRIVMSGS_FOLDER_TABLE . " - WHERE user_id = {$user->data['user_id']} - AND folder_id = $remove_folder_id"; - $result = $db->sql_query_limit($sql, 1); - $folder_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$folder_row) - { - trigger_error('CANNOT_REMOVE_FOLDER'); - } - - $s_hidden_fields = array( - 'remove_folder_id' => $remove_folder_id, - 'remove_action' => $remove_action, - 'move_to' => $move_to, - 'remove_folder' => 1 - ); - - // Do we need to confirm? - if (confirm_box(true)) - { - // Gather message ids - $sql = 'SELECT msg_id - FROM ' . PRIVMSGS_TO_TABLE . ' - WHERE user_id = ' . $user->data['user_id'] . " - AND folder_id = $remove_folder_id"; - $result = $db->sql_query($sql); - - $msg_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $msg_ids[] = (int) $row['msg_id']; - } - $db->sql_freeresult($result); - - // First of all, copy all messages to another folder... or delete all messages - switch ($remove_action) - { - // Move Messages - case 1: - $num_moved = move_pm($user->data['user_id'], $user->data['message_limit'], $msg_ids, $move_to, $remove_folder_id); - - // Something went wrong, only partially moved? - if ($num_moved != $folder_row['pm_count']) - { - trigger_error(sprintf($user->lang['MOVE_PM_ERROR'], $num_moved, $folder_row['pm_count'])); - } - break; - - // Remove Messages - case 2: - delete_pm($user->data['user_id'], $msg_ids, $remove_folder_id); - break; - } - - // Remove folder - $sql = 'DELETE FROM ' . PRIVMSGS_FOLDER_TABLE . " - WHERE user_id = {$user->data['user_id']} - AND folder_id = $remove_folder_id"; - $db->sql_query($sql); - - // Check full folder option. If the removed folder has been specified as destination switch back to inbox - if ($user->data['user_full_folder'] == $remove_folder_id) - { - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_full_folder = ' . PRIVMSGS_INBOX . ' - WHERE user_id = ' . $user->data['user_id']; - $db->sql_query($sql); - - $user->data['user_full_folder'] = PRIVMSGS_INBOX; - } - - // Now make sure the folder is not used for rules - // We assign another folder id (the one the messages got moved to) or assign the INBOX (to not have to remove any rule) - $sql = 'UPDATE ' . PRIVMSGS_RULES_TABLE . ' SET rule_folder_id = '; - $sql .= ($remove_action == 1) ? $move_to : PRIVMSGS_INBOX; - $sql .= ' WHERE rule_folder_id = ' . $remove_folder_id; - - $db->sql_query($sql); - - $meta_info = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&mode=$mode"); - $message = $user->lang['FOLDER_REMOVED']; - - meta_refresh(3, $meta_info); - $message .= '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - trigger_error($message); - } - else - { - confirm_box(false, 'REMOVE_FOLDER', build_hidden_fields($s_hidden_fields)); - } - } - - // Add Rule - if (isset($_POST['add_rule'])) - { - if (check_form_key('ucp_pm_options')) - { - $check_option = request_var('check_option', 0); - $rule_option = request_var('rule_option', 0); - $cond_option = request_var('cond_option', ''); - $action_option = explode('|', request_var('action_option', '')); - $rule_string = ($cond_option != 'none') ? utf8_normalize_nfc(request_var('rule_string', '', true)) : ''; - $rule_user_id = ($cond_option != 'none') ? request_var('rule_user_id', 0) : 0; - $rule_group_id = ($cond_option != 'none') ? request_var('rule_group_id', 0) : 0; - - $action = (int) $action_option[0]; - $folder_id = (int) $action_option[1]; - - if (!$action || !$check_option || !$rule_option || !$cond_option || ($cond_option != 'none' && !$rule_string)) - { - trigger_error('RULE_NOT_DEFINED'); - } - - if (($cond_option == 'user' && !$rule_user_id) || ($cond_option == 'group' && !$rule_group_id)) - { - trigger_error('RULE_NOT_DEFINED'); - } - - $rule_ary = array( - 'user_id' => $user->data['user_id'], - 'rule_check' => $check_option, - 'rule_connection' => $rule_option, - 'rule_string' => $rule_string, - 'rule_user_id' => $rule_user_id, - 'rule_group_id' => $rule_group_id, - 'rule_action' => $action, - 'rule_folder_id' => $folder_id - ); - - $sql = 'SELECT rule_id - FROM ' . PRIVMSGS_RULES_TABLE . ' - WHERE ' . $db->sql_build_array('SELECT', $rule_ary); - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - trigger_error('RULE_ALREADY_DEFINED'); - } - - $sql = 'INSERT INTO ' . PRIVMSGS_RULES_TABLE . ' ' . $db->sql_build_array('INSERT', $rule_ary); - $db->sql_query($sql); - - // Update users message rules - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_message_rules = 1 - WHERE user_id = ' . $user->data['user_id']; - $db->sql_query($sql); - - $msg = $user->lang['RULE_ADDED']; - } - else - { - $msg = $user->lang['FORM_INVALID']; - } - $message = $msg . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - meta_refresh(3, $redirect_url); - trigger_error($message); - } - - // Remove Rule - if (isset($_POST['delete_rule']) && !isset($_POST['cancel'])) - { - $delete_id = array_keys(request_var('delete_rule', array(0 => 0))); - $delete_id = (!empty($delete_id[0])) ? $delete_id[0] : 0; - - if (!$delete_id) - { - redirect(append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=' . $mode)); - } - - // Do we need to confirm? - if (confirm_box(true)) - { - $sql = 'DELETE FROM ' . PRIVMSGS_RULES_TABLE . ' - WHERE user_id = ' . $user->data['user_id'] . " - AND rule_id = $delete_id"; - $db->sql_query($sql); - - $meta_info = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=' . $mode); - $message = $user->lang['RULE_DELETED']; - - // Reset user_message_rules if no more assigned - $sql = 'SELECT rule_id - FROM ' . PRIVMSGS_RULES_TABLE . ' - WHERE user_id = ' . $user->data['user_id']; - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // Update users message rules - if (!$row) - { - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_message_rules = 0 - WHERE user_id = ' . $user->data['user_id']; - $db->sql_query($sql); - } - - meta_refresh(3, $meta_info); - $message .= '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - trigger_error($message); - } - else - { - confirm_box(false, 'DELETE_RULE', build_hidden_fields(array('delete_rule' => array($delete_id => 1)))); - } - } - - $folder = array(); - - $sql = 'SELECT COUNT(msg_id) as num_messages - FROM ' . PRIVMSGS_TO_TABLE . ' - WHERE user_id = ' . $user->data['user_id'] . ' - AND folder_id = ' . PRIVMSGS_INBOX; - $result = $db->sql_query($sql); - $num_messages = (int) $db->sql_fetchfield('num_messages'); - $db->sql_freeresult($result); - - $folder[PRIVMSGS_INBOX] = array( - 'folder_name' => $user->lang['PM_INBOX'], - 'message_status' => sprintf($user->lang['FOLDER_MESSAGE_STATUS'], $num_messages, $user->data['message_limit']) - ); - - $sql = 'SELECT folder_id, folder_name, pm_count - FROM ' . PRIVMSGS_FOLDER_TABLE . ' - WHERE user_id = ' . $user->data['user_id']; - $result = $db->sql_query($sql); - - $num_user_folder = 0; - while ($row = $db->sql_fetchrow($result)) - { - $num_user_folder++; - $folder[$row['folder_id']] = array( - 'folder_name' => $row['folder_name'], - 'message_status' => sprintf($user->lang['FOLDER_MESSAGE_STATUS'], $row['pm_count'], $user->data['message_limit']) - ); - } - $db->sql_freeresult($result); - - $s_full_folder_options = $s_to_folder_options = $s_folder_options = ''; - - if ($user->data['user_full_folder'] == FULL_FOLDER_NONE) - { - // -3 here to let the correct folder id be selected - $to_folder_id = $config['full_folder_action'] - 3; - } - else - { - $to_folder_id = $user->data['user_full_folder']; - } - - foreach ($folder as $folder_id => $folder_ary) - { - $s_full_folder_options .= ''; - $s_to_folder_options .= ''; - - if ($folder_id != PRIVMSGS_INBOX) - { - $s_folder_options .= ''; - } - } - - $s_delete_checked = ($user->data['user_full_folder'] == FULL_FOLDER_DELETE) ? ' checked="checked"' : ''; - $s_hold_checked = ($user->data['user_full_folder'] == FULL_FOLDER_HOLD) ? ' checked="checked"' : ''; - $s_move_checked = ($user->data['user_full_folder'] >= 0) ? ' checked="checked"' : ''; - - if ($user->data['user_full_folder'] == FULL_FOLDER_NONE) - { - switch ($config['full_folder_action']) - { - case 1: - $s_delete_checked = ' checked="checked"'; - break; - - case 2: - $s_hold_checked = ' checked="checked"'; - break; - } - } - - $template->assign_vars(array( - 'S_FULL_FOLDER_OPTIONS' => $s_full_folder_options, - 'S_TO_FOLDER_OPTIONS' => $s_to_folder_options, - 'S_FOLDER_OPTIONS' => $s_folder_options, - 'S_DELETE_CHECKED' => $s_delete_checked, - 'S_HOLD_CHECKED' => $s_hold_checked, - 'S_MOVE_CHECKED' => $s_move_checked, - 'S_MAX_FOLDER_REACHED' => ($num_user_folder >= $config['pm_max_boxes']) ? true : false, - 'S_MAX_FOLDER_ZERO' => ($config['pm_max_boxes'] == 0) ? true : false, - - 'DEFAULT_ACTION' => ($config['full_folder_action'] == 1) ? $user->lang['DELETE_OLDEST_MESSAGES'] : $user->lang['HOLD_NEW_MESSAGES'], - - 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=ucp&field=rule_string&select_single=true'), - )); - - $rule_lang = $action_lang = $check_lang = array(); - - // Build all three language arrays - preg_replace('#^((RULE|ACTION|CHECK)_([A-Z0-9_]+))$#e', "\${strtolower('\\2') . '_lang'}[constant('\\1')] = \$user->lang['PM_\\2']['\\3']", array_keys(get_defined_constants())); - - /* - Rule Ordering: - -> CHECK_* -> RULE_* [IN $global_privmsgs_rules:CHECK_*] -> [IF $rule_conditions[RULE_*] [|text|bool|user|group|own_group]] -> ACTION_* - */ - - $check_option = request_var('check_option', 0); - $rule_option = request_var('rule_option', 0); - $cond_option = request_var('cond_option', ''); - $action_option = request_var('action_option', ''); - $back = (isset($_REQUEST['back'])) ? request_var('back', array('' => 0)) : array(); - - if (sizeof($back)) - { - if ($action_option) - { - $action_option = ''; - } - else if ($cond_option) - { - $cond_option = ''; - } - else if ($rule_option) - { - $rule_option = 0; - } - else if ($check_option) - { - $check_option = 0; - } - } - - if (isset($back['action']) && $cond_option == 'none') - { - $back['cond'] = true; - } - - // Check - if (!isset($global_privmsgs_rules[$check_option])) - { - $check_option = 0; - } - - define_check_option(($check_option && !isset($back['rule'])) ? true : false, $check_option, $check_lang); - - if ($check_option && !isset($back['rule'])) - { - define_rule_option(($rule_option && !isset($back['cond'])) ? true : false, $rule_option, $rule_lang, $global_privmsgs_rules[$check_option]); - } - - if ($rule_option && !isset($back['cond'])) - { - if (!isset($global_rule_conditions[$rule_option])) - { - $cond_option = 'none'; - $template->assign_var('NONE_CONDITION', true); - } - else - { - define_cond_option(($cond_option && !isset($back['action'])) ? true : false, $cond_option, $rule_option, $global_rule_conditions); - } - } - - if ($cond_option && !isset($back['action'])) - { - define_action_option(false, $action_option, $action_lang, $folder); - } - - show_defined_rules($user->data['user_id'], $check_lang, $rule_lang, $action_lang, $folder); -} - -/** -* Defining check option for message rules -*/ -function define_check_option($hardcoded, $check_option, $check_lang) -{ - global $template; - - $s_check_options = ''; - if (!$hardcoded) - { - foreach ($check_lang as $value => $lang) - { - $s_check_options .= ''; - } - } - - $template->assign_vars(array( - 'S_CHECK_DEFINED' => true, - 'S_CHECK_SELECT' => ($hardcoded) ? false : true, - 'CHECK_CURRENT' => isset($check_lang[$check_option]) ? $check_lang[$check_option] : '', - 'S_CHECK_OPTIONS' => $s_check_options, - 'CHECK_OPTION' => $check_option) - ); -} - -/** -* Defining action option for message rules -*/ -function define_action_option($hardcoded, $action_option, $action_lang, $folder) -{ - global $db, $template, $user; - - $l_action = $s_action_options = ''; - if ($hardcoded) - { - $option = explode('|', $action_option); - $action = (int) $option[0]; - $folder_id = (int) $option[1]; - - $l_action = $action_lang[$action]; - if ($action == ACTION_PLACE_INTO_FOLDER) - { - $l_action .= ' -> ' . $folder[$folder_id]['folder_name']; - } - } - else - { - foreach ($action_lang as $action => $lang) - { - if ($action == ACTION_PLACE_INTO_FOLDER) - { - foreach ($folder as $folder_id => $folder_ary) - { - $s_action_options .= ''; - } - } - else - { - $s_action_options .= ''; - } - } - } - - $template->assign_vars(array( - 'S_ACTION_DEFINED' => true, - 'S_ACTION_SELECT' => ($hardcoded) ? false : true, - 'ACTION_CURRENT' => $l_action, - 'S_ACTION_OPTIONS' => $s_action_options, - 'ACTION_OPTION' => $action_option) - ); -} - -/** -* Defining rule option for message rules -*/ -function define_rule_option($hardcoded, $rule_option, $rule_lang, $check_ary) -{ - global $template; - - $s_rule_options = ''; - if (!$hardcoded) - { - foreach ($check_ary as $value => $_check) - { - $s_rule_options .= ''; - } - } - - $template->assign_vars(array( - 'S_RULE_DEFINED' => true, - 'S_RULE_SELECT' => !$hardcoded, - 'RULE_CURRENT' => isset($rule_lang[$rule_option]) ? $rule_lang[$rule_option] : '', - 'S_RULE_OPTIONS' => $s_rule_options, - 'RULE_OPTION' => $rule_option) - ); -} - -/** -* Defining condition option for message rules -*/ -function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule_conditions) -{ - global $db, $template, $auth, $user; - - $template->assign_vars(array( - 'S_COND_DEFINED' => true, - 'S_COND_SELECT' => (!$hardcoded && isset($global_rule_conditions[$rule_option])) ? true : false) - ); - - // Define COND_OPTION - if (!isset($global_rule_conditions[$rule_option])) - { - $template->assign_vars(array( - 'COND_OPTION' => 'none', - 'COND_CURRENT' => false) - ); - return; - } - - // Define Condition - $condition = $global_rule_conditions[$rule_option]; - $current_value = ''; - - switch ($condition) - { - case 'text': - $rule_string = utf8_normalize_nfc(request_var('rule_string', '', true)); - - $template->assign_vars(array( - 'S_TEXT_CONDITION' => true, - 'CURRENT_STRING' => $rule_string, - 'CURRENT_USER_ID' => 0, - 'CURRENT_GROUP_ID' => 0) - ); - - $current_value = $rule_string; - break; - - case 'user': - $rule_user_id = request_var('rule_user_id', 0); - $rule_string = utf8_normalize_nfc(request_var('rule_string', '', true)); - - if ($rule_string && !$rule_user_id) - { - $sql = 'SELECT user_id - FROM ' . USERS_TABLE . " - WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($rule_string)) . "'"; - $result = $db->sql_query($sql); - $rule_user_id = (int) $db->sql_fetchfield('user_id'); - $db->sql_freeresult($result); - - if (!$rule_user_id) - { - $rule_string = ''; - } - } - else if (!$rule_string && $rule_user_id) - { - $sql = 'SELECT username - FROM ' . USERS_TABLE . " - WHERE user_id = $rule_user_id"; - $result = $db->sql_query($sql); - $rule_string = $db->sql_fetchfield('username'); - $db->sql_freeresult($result); - - if (!$rule_string) - { - $rule_user_id = 0; - } - } - - $template->assign_vars(array( - 'S_USER_CONDITION' => true, - 'CURRENT_STRING' => $rule_string, - 'CURRENT_USER_ID' => $rule_user_id, - 'CURRENT_GROUP_ID' => 0) - ); - - $current_value = $rule_string; - break; - - case 'group': - $rule_group_id = request_var('rule_group_id', 0); - $rule_string = utf8_normalize_nfc(request_var('rule_string', '', true)); - - $sql = 'SELECT g.group_id, g.group_name, g.group_type - FROM ' . GROUPS_TABLE . ' g '; - - if (!$auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) - { - $sql .= 'LEFT JOIN ' . USER_GROUP_TABLE . ' ug - ON ( - g.group_id = ug.group_id - AND ug.user_id = ' . $user->data['user_id'] . ' - AND ug.user_pending = 0 - ) - WHERE (ug.user_id = ' . $user->data['user_id'] . ' OR g.group_type <> ' . GROUP_HIDDEN . ') - AND'; - } - else - { - $sql .= 'WHERE'; - } - - $sql .= " (g.group_name NOT IN ('GUESTS', 'BOTS') OR g.group_type <> " . GROUP_SPECIAL . ') - ORDER BY g.group_type DESC, g.group_name ASC'; - - $result = $db->sql_query($sql); - - $s_group_options = ''; - while ($row = $db->sql_fetchrow($result)) - { - if ($rule_group_id && ($row['group_id'] == $rule_group_id)) - { - $rule_string = (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']); - } - - $s_class = ($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : ''; - $s_selected = ($row['group_id'] == $rule_group_id) ? ' selected="selected"' : ''; - - $s_group_options .= ''; - } - $db->sql_freeresult($result); - - $template->assign_vars(array( - 'S_GROUP_CONDITION' => true, - 'S_GROUP_OPTIONS' => $s_group_options, - 'CURRENT_STRING' => $rule_string, - 'CURRENT_USER_ID' => 0, - 'CURRENT_GROUP_ID' => $rule_group_id) - ); - - $current_value = $rule_string; - break; - - default: - return; - } - - $template->assign_vars(array( - 'COND_OPTION' => $condition, - 'COND_CURRENT' => $current_value) - ); -} - -/** -* Display defined message rules -*/ -function show_defined_rules($user_id, $check_lang, $rule_lang, $action_lang, $folder) -{ - global $db, $template; - - $sql = 'SELECT * - FROM ' . PRIVMSGS_RULES_TABLE . ' - WHERE user_id = ' . $user_id . ' - ORDER BY rule_id ASC'; - $result = $db->sql_query($sql); - - $count = 0; - while ($row = $db->sql_fetchrow($result)) - { - $template->assign_block_vars('rule', array( - 'COUNT' => ++$count, - 'RULE_ID' => $row['rule_id'], - 'CHECK' => $check_lang[$row['rule_check']], - 'RULE' => $rule_lang[$row['rule_connection']], - 'STRING' => $row['rule_string'], - 'ACTION' => $action_lang[$row['rule_action']], - 'FOLDER' => ($row['rule_action'] == ACTION_PLACE_INTO_FOLDER) ? $folder[$row['rule_folder_id']]['folder_name'] : '') - ); - } - $db->sql_freeresult($result); -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php deleted file mode 100644 index 6ba08c36de..0000000000 --- a/phpBB/includes/ucp/ucp_pm_viewfolder.php +++ /dev/null @@ -1,570 +0,0 @@ -data['user_id']); - - if (!$submit_export) - { - $user->add_lang('viewforum'); - - // Grab icons - $icons = cache::obtain_icons(); - - $color_rows = array('marked', 'replied'); - - // only show the friend/foe color rows if the module is enabled - $zebra_enabled = false; - - $_module = new p_master(); - $_module->list_modules('ucp'); - $_module->set_active('zebra'); - - $zebra_enabled = ($_module->active_module === false) ? false : true; - - unset($_module); - - if ($zebra_enabled) - { - $color_rows = array_merge($color_rows, array('friend', 'foe')); - } - - foreach ($color_rows as $var) - { - $template->assign_block_vars('pm_colour_info', array( - 'IMG' => $user->img("pm_{$var}", ''), - 'CLASS' => "pm_{$var}_colour", - 'LANG' => $user->lang[strtoupper($var) . '_MESSAGE']) - ); - } - - $mark_options = array('mark_important', 'delete_marked'); - - $s_mark_options = ''; - foreach ($mark_options as $mark_option) - { - $s_mark_options .= ''; - } - - // We do the folder moving options here too, for template authors to use... - $s_folder_move_options = ''; - if ($folder_id != PRIVMSGS_NO_BOX && $folder_id != PRIVMSGS_OUTBOX) - { - foreach ($folder as $f_id => $folder_ary) - { - if ($f_id == PRIVMSGS_OUTBOX || $f_id == PRIVMSGS_SENTBOX || $f_id == $folder_id) - { - continue; - } - - $s_folder_move_options .= ''; - $s_folder_move_options .= sprintf($user->lang['MOVE_MARKED_TO_FOLDER'], $folder_ary['folder_name']); - $s_folder_move_options .= (($folder_ary['unread_messages']) ? ' [' . $folder_ary['unread_messages'] . '] ' : '') . ''; - } - } - $friend = $foe = array(); - - // Get friends and foes - $sql = 'SELECT * - FROM ' . ZEBRA_TABLE . ' - WHERE user_id = ' . $user->data['user_id']; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $friend[$row['zebra_id']] = $row['friend']; - $foe[$row['zebra_id']] = $row['foe']; - } - $db->sql_freeresult($result); - - $template->assign_vars(array( - 'S_MARK_OPTIONS' => $s_mark_options, - 'S_MOVE_MARKED_OPTIONS' => $s_folder_move_options) - ); - - // Okay, lets dump out the page ... - if (sizeof($folder_info['pm_list'])) - { - $address_list = array(); - - // Build Recipient List if in outbox/sentbox - max two additional queries - if ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) - { - $recipient_list = $address = array(); - - foreach ($folder_info['rowset'] as $message_id => $row) - { - $address[$message_id] = rebuild_header(array('to' => $row['to_address'], 'bcc' => $row['bcc_address'])); - $_save = array('u', 'g'); - foreach ($_save as $save) - { - if (isset($address[$message_id][$save]) && sizeof($address[$message_id][$save])) - { - foreach (array_keys($address[$message_id][$save]) as $ug_id) - { - $recipient_list[$save][$ug_id] = array('name' => $user->lang['NA'], 'colour' => ''); - } - } - } - } - - $_types = array('u', 'g'); - foreach ($_types as $ug_type) - { - if (!empty($recipient_list[$ug_type])) - { - if ($ug_type == 'u') - { - $sql = 'SELECT user_id as id, username as name, user_colour as colour - FROM ' . USERS_TABLE . ' - WHERE '; - } - else - { - $sql = 'SELECT group_id as id, group_name as name, group_colour as colour, group_type - FROM ' . GROUPS_TABLE . ' - WHERE '; - } - $sql .= $db->sql_in_set(($ug_type == 'u') ? 'user_id' : 'group_id', array_map('intval', array_keys($recipient_list[$ug_type]))); - - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if ($ug_type == 'g') - { - $row['name'] = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['name']] : $row['name']; - } - - $recipient_list[$ug_type][$row['id']] = array('name' => $row['name'], 'colour' => $row['colour']); - } - $db->sql_freeresult($result); - } - } - - foreach ($address as $message_id => $adr_ary) - { - foreach ($adr_ary as $type => $id_ary) - { - foreach ($id_ary as $ug_id => $_id) - { - if ($type == 'u') - { - $address_list[$message_id][] = get_username_string('full', $ug_id, $recipient_list[$type][$ug_id]['name'], $recipient_list[$type][$ug_id]['colour']); - } - else - { - $user_colour = ($recipient_list[$type][$ug_id]['colour']) ? ' style="font-weight: bold; color:#' . $recipient_list[$type][$ug_id]['colour'] . '"' : ''; - $link = ''; - $address_list[$message_id][] = $link . $recipient_list[$type][$ug_id]['name'] . (($link) ? '' : ''); - } - } - } - } - unset($recipient_list, $address); - } - - $data = array(); - - foreach ($folder_info['pm_list'] as $message_id) - { - $row = &$folder_info['rowset'][$message_id]; - - $folder_img = ($row['pm_unread']) ? 'pm_unread' : 'pm_read'; - $folder_alt = ($row['pm_unread']) ? 'NEW_MESSAGES' : 'NO_NEW_MESSAGES'; - - // Generate all URIs ... - $view_message_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=$id&mode=view&f=$folder_id&p=$message_id"); - $remove_message_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=$id&mode=compose&action=delete&p=$message_id"); - - $row_indicator = ''; - foreach ($color_rows as $var) - { - if (($var != 'friend' && $var != 'foe' && $row['pm_' . $var]) - || - (($var == 'friend' || $var == 'foe') && isset(${$var}[$row['author_id']]) && ${$var}[$row['author_id']])) - { - $row_indicator = $var; - break; - } - } - - // Send vars to template - $template->assign_block_vars('messagerow', array( - 'PM_CLASS' => ($row_indicator) ? 'pm_' . $row_indicator . '_colour' : '', - - 'MESSAGE_AUTHOR_FULL' => get_username_string('full', $row['author_id'], $row['username'], $row['user_colour'], $row['username']), - 'MESSAGE_AUTHOR_COLOUR' => get_username_string('colour', $row['author_id'], $row['username'], $row['user_colour'], $row['username']), - 'MESSAGE_AUTHOR' => get_username_string('username', $row['author_id'], $row['username'], $row['user_colour'], $row['username']), - 'U_MESSAGE_AUTHOR' => get_username_string('profile', $row['author_id'], $row['username'], $row['user_colour'], $row['username']), - - 'FOLDER_ID' => $folder_id, - 'MESSAGE_ID' => $message_id, - 'SENT_TIME' => $user->format_date($row['message_time']), - 'SUBJECT' => censor_text($row['message_subject']), - 'FOLDER' => (isset($folder[$row['folder_id']])) ? $folder[$row['folder_id']]['folder_name'] : '', - 'U_FOLDER' => (isset($folder[$row['folder_id']])) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'folder=' . $row['folder_id']) : '', - 'PM_ICON_IMG' => (!empty($icons[$row['icon_id']])) ? '' : '', - 'PM_ICON_URL' => (!empty($icons[$row['icon_id']])) ? $config['icons_path'] . '/' . $icons[$row['icon_id']]['img'] : '', - 'FOLDER_IMG' => $user->img($folder_img, $folder_alt), - 'FOLDER_IMG_SRC' => $user->img($folder_img, $folder_alt, false, '', 'src'), - 'PM_IMG' => ($row_indicator) ? $user->img('pm_' . $row_indicator, '') : '', - 'ATTACH_ICON_IMG' => ($auth->acl_get('u_pm_download') && $row['message_attachment'] && $config['allow_pm_attach']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', - - 'S_PM_DELETED' => ($row['pm_deleted']) ? true : false, - 'S_AUTHOR_DELETED' => ($row['author_id'] == ANONYMOUS) ? true : false, - - 'U_VIEW_PM' => ($row['pm_deleted']) ? '' : $view_message_url, - 'U_REMOVE_PM' => ($row['pm_deleted']) ? $remove_message_url : '', - 'RECIPIENTS' => ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? implode(', ', $address_list[$message_id]) : '') - ); - } - unset($folder_info['rowset']); - - $template->assign_vars(array( - 'S_SHOW_RECIPIENTS' => ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? true : false, - 'S_SHOW_COLOUR_LEGEND' => true, - - 'S_PM_ICONS' => ($config['enable_pm_icons']) ? true : false) - ); - } - } - else - { - $export_type = request_var('export_option', ''); - $enclosure = request_var('enclosure', ''); - $delimiter = request_var('delimiter', ''); - - if ($export_type == 'CSV' && ($delimiter === '' || $enclosure === '')) - { - $template->assign_var('PROMPT', true); - } - else - { - // Build Recipient List if in outbox/sentbox - $address = array(); - if ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) - { - foreach ($folder_info['rowset'] as $message_id => $row) - { - $address[$message_id] = rebuild_header(array('to' => $row['to_address'], 'bcc' => $row['bcc_address'])); - } - } - - foreach ($folder_info['pm_list'] as $message_id) - { - $row = &$folder_info['rowset'][$message_id]; - - include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx); - - $sql = 'SELECT p.message_text, p.bbcode_uid - FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . ' u - WHERE t.user_id = ' . $user->data['user_id'] . " - AND p.author_id = u.user_id - AND t.folder_id = $folder_id - AND t.msg_id = p.msg_id - AND p.msg_id = $message_id"; - $result = $db->sql_query_limit($sql, 1); - $message_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $_types = array('u', 'g'); - foreach ($_types as $ug_type) - { - if (isset($address[$message_id][$ug_type]) && sizeof($address[$message_id][$ug_type])) - { - if ($ug_type == 'u') - { - $sql = 'SELECT user_id as id, username as name - FROM ' . USERS_TABLE . ' - WHERE '; - } - else - { - $sql = 'SELECT group_id as id, group_name as name - FROM ' . GROUPS_TABLE . ' - WHERE '; - } - $sql .= $db->sql_in_set(($ug_type == 'u') ? 'user_id' : 'group_id', array_map('intval', array_keys($address[$message_id][$ug_type]))); - - $result = $db->sql_query($sql); - - while ($info_row = $db->sql_fetchrow($result)) - { - $address[$message_id][$ug_type][$address[$message_id][$ug_type][$info_row['id']]][] = $info_row['name']; - unset($address[$message_id][$ug_type][$info_row['id']]); - } - $db->sql_freeresult($result); - } - } - - decode_message($message_row['message_text'], $message_row['bbcode_uid']); - - $data[] = array( - 'subject' => censor_text($row['message_subject']), - 'sender' => $row['username'], - 'date' => $user->format_date($row['message_time']), - 'to' => ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? $address[$message_id] : '', - 'message' => $message_row['message_text'] - ); - } - - switch ($export_type) - { - case 'CSV': - case 'CSV_EXCEL': - $mimetype = 'text/csv'; - $filetype = 'csv'; - - if ($export_type == 'CSV_EXCEL') - { - $enclosure = '"'; - $delimiter = ','; - $newline = "\r\n"; - } - else - { - $newline = "\n"; - } - - $string = ''; - foreach ($data as $value) - { - $recipients = $value['to']; - $value['to'] = $value['bcc'] = ''; - - if (is_array($recipients)) - { - foreach ($recipients as $values) - { - $value['bcc'] .= (isset($values['bcc']) && is_array($values['bcc'])) ? ',' . implode(',', $values['bcc']) : ''; - $value['to'] .= (isset($values['to']) && is_array($values['to'])) ? ',' . implode(',', $values['to']) : ''; - } - - // Remove the commas which will appear before the first entry. - $value['to'] = substr($value['to'], 1); - $value['bcc'] = substr($value['bcc'], 1); - } - - foreach ($value as $tag => $text) - { - $cell = str_replace($enclosure, $enclosure . $enclosure, $text); - - if (strpos($cell, $enclosure) !== false || strpos($cell, $delimiter) !== false || strpos($cell, $newline) !== false) - { - $string .= $enclosure . $text . $enclosure . $delimiter; - } - else - { - $string .= $cell . $delimiter; - } - } - $string = substr($string, 0, -1) . $newline; - } - break; - - case 'XML': - $mimetype = 'application/xml'; - $filetype = 'xml'; - $string = '' . "\n"; - $string .= "\n"; - - foreach ($data as $value) - { - $string .= "\t\n"; - - if (is_array($value['to'])) - { - foreach ($value['to'] as $key => $values) - { - foreach ($values as $type => $types) - { - foreach ($types as $name) - { - $string .= "\t\t$name\n"; - } - } - } - } - - unset($value['to']); - - foreach ($value as $tag => $text) - { - $string .= "\t\t<$tag>$text\n"; - } - - $string .= "\t\n"; - } - $string .= ''; - break; - } - - header('Pragma: no-cache'); - header("Content-Type: $mimetype; name=\"data.$filetype\""); - header("Content-disposition: attachment; filename=data.$filetype"); - echo $string; - exit; - } - } -} - -/** -* Get Messages from folder/user -*/ -function get_pm_from($folder_id, $folder, $user_id) -{ - global $user, $db, $template, $config, $auth, $phpbb_root_path, $phpEx; - - $start = request_var('start', 0); - - // Additional vars later, pm ordering is mostly different from post ordering. :/ - $sort_days = request_var('st', 0); - $sort_key = request_var('sk', 't'); - $sort_dir = request_var('sd', 'd'); - - // PM ordering options - $limit_days = array(0 => $user->lang['ALL_MESSAGES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); - - // No sort by Author for sentbox/outbox (already only author available) - // Also, sort by msg_id for the time - private messages are not as prone to errors as posts are. - if ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) - { - $sort_by_text = array('t' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']); - $sort_by_sql = array('t' => 'p.msg_id', 's' => 'p.message_subject'); - } - else - { - $sort_by_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']); - $sort_by_sql = array('a' => 'u.username_clean', 't' => 'p.msg_id', 's' => 'p.message_subject'); - } - - $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = ''; - gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); - - $folder_sql = 't.folder_id = ' . (int) $folder_id; - - // Limit pms to certain time frame, obtain correct pm count - if ($sort_days) - { - $min_post_time = time() - ($sort_days * 86400); - - if (isset($_POST['sort'])) - { - $start = 0; - } - - $sql = 'SELECT COUNT(t.msg_id) AS pm_count - FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . " p - WHERE $folder_sql - AND t.user_id = $user_id - AND t.msg_id = p.msg_id - AND p.message_time >= $min_post_time"; - $result = $db->sql_query_limit($sql, 1); - $pm_count = (int) $db->sql_fetchfield('pm_count'); - $db->sql_freeresult($result); - - $sql_limit_time = "AND p.message_time >= $min_post_time"; - } - else - { - $pm_count = $folder[$folder_id]['num_messages']; - $sql_limit_time = ''; - } - - $template->assign_vars(array( - 'PAGINATION' => generate_pagination(append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&mode=view&action=view_folder&f=$folder_id&$u_sort_param"), $pm_count, $config['topics_per_page'], $start), - 'PAGE_NUMBER' => on_page($pm_count, $config['topics_per_page'], $start), - 'TOTAL_MESSAGES' => (($pm_count == 1) ? $user->lang['VIEW_PM_MESSAGE'] : sprintf($user->lang['VIEW_PM_MESSAGES'], $pm_count)), - - 'POST_IMG' => (!$auth->acl_get('u_sendpm')) ? $user->img('button_topic_locked', 'PM_LOCKED') : $user->img('button_pm_new', 'POST_PM'), - - 'L_NO_MESSAGES' => (!$auth->acl_get('u_sendpm')) ? $user->lang['POST_PM_LOCKED'] : $user->lang['NO_MESSAGES'], - - 'S_SELECT_SORT_DIR' => $s_sort_dir, - 'S_SELECT_SORT_KEY' => $s_sort_key, - 'S_SELECT_SORT_DAYS' => $s_limit_days, - 'S_TOPIC_ICONS' => ($config['enable_pm_icons']) ? true : false, - - 'U_POST_NEW_TOPIC' => ($auth->acl_get('u_sendpm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose') : '', - 'S_PM_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&mode=view&action=view_folder&f=$folder_id")) - ); - - // Grab all pm data - $rowset = $pm_list = array(); - - // If the user is trying to reach late pages, start searching from the end - $store_reverse = false; - $sql_limit = $config['topics_per_page']; - if ($start > $pm_count / 2) - { - $store_reverse = true; - - if ($start + $config['topics_per_page'] > $pm_count) - { - $sql_limit = min($config['topics_per_page'], max(1, $pm_count - $start)); - } - - // Select the sort order - $sql_sort_order = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'ASC' : 'DESC'); - $sql_start = max(0, $pm_count - $sql_limit - $start); - } - else - { - // Select the sort order - $sql_sort_order = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC'); - $sql_start = $start; - } - - $sql = 'SELECT t.*, p.root_level, p.message_time, p.message_subject, p.icon_id, p.to_address, p.message_attachment, p.bcc_address, u.username, u.username_clean, u.user_colour - FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . " u - WHERE t.user_id = $user_id - AND p.author_id = u.user_id - AND $folder_sql - AND t.msg_id = p.msg_id - $sql_limit_time - ORDER BY $sql_sort_order"; - $result = $db->sql_query_limit($sql, $sql_limit, $sql_start); - - while ($row = $db->sql_fetchrow($result)) - { - $rowset[$row['msg_id']] = $row; - $pm_list[] = $row['msg_id']; - } - $db->sql_freeresult($result); - - $pm_list = ($store_reverse) ? array_reverse($pm_list) : $pm_list; - - return array( - 'pm_count' => $pm_count, - 'pm_list' => $pm_list, - 'rowset' => $rowset - ); -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php deleted file mode 100644 index 31208d9b01..0000000000 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ /dev/null @@ -1,310 +0,0 @@ -add_lang(array('viewtopic', 'memberlist')); - - $msg_id = (int) $msg_id; - $folder_id = (int) $folder_id; - $author_id = (int) $message_row['author_id']; - - // Not able to view message, it was deleted by the sender - if ($message_row['pm_deleted']) - { - $meta_info = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&folder=$folder_id"); - $message = $user->lang['NO_AUTH_READ_REMOVED_MESSAGE']; - - $message .= '

    ' . sprintf($user->lang['RETURN_FOLDER'], '', ''); - trigger_error($message); - } - - // Do not allow hold messages to be seen - if ($folder_id == PRIVMSGS_HOLD_BOX) - { - trigger_error('NO_AUTH_READ_HOLD_MESSAGE'); - } - - // Grab icons - $icons = cache::obtain_icons(); - - $bbcode = false; - - // Instantiate BBCode if need be - if ($message_row['bbcode_bitfield']) - { - include($phpbb_root_path . 'includes/bbcode.' . $phpEx); - $bbcode = new bbcode($message_row['bbcode_bitfield']); - } - - // Assign TO/BCC Addresses to template - write_pm_addresses(array('to' => $message_row['to_address'], 'bcc' => $message_row['bcc_address']), $author_id); - - $user_info = get_user_information($author_id, $message_row); - - // Parse the message and subject - $message = censor_text($message_row['message_text']); - - // Second parse bbcode here - if ($message_row['bbcode_bitfield']) - { - $bbcode->bbcode_second_pass($message, $message_row['bbcode_uid'], $message_row['bbcode_bitfield']); - } - - // Always process smilies after parsing bbcodes - $message = bbcode_nl2br($message); - $message = smiley_text($message); - - // Replace naughty words such as farty pants - $message_row['message_subject'] = censor_text($message_row['message_subject']); - - // Editing information - if ($message_row['message_edit_count'] && $config['display_last_edited']) - { - $l_edit_time_total = ($message_row['message_edit_count'] == 1) ? $user->lang['EDITED_TIME_TOTAL'] : $user->lang['EDITED_TIMES_TOTAL']; - $l_edited_by = '

    ' . sprintf($l_edit_time_total, (!$message_row['message_edit_user']) ? $message_row['username'] : $message_row['message_edit_user'], $user->format_date($message_row['message_edit_time']), $message_row['message_edit_count']); - } - else - { - $l_edited_by = ''; - } - - // Pull attachment data - $display_notice = false; - $attachments = array(); - - if ($message_row['message_attachment'] && $config['allow_pm_attach']) - { - if ($auth->acl_get('u_pm_download')) - { - $sql = 'SELECT * - FROM ' . ATTACHMENTS_TABLE . " - WHERE post_msg_id = $msg_id - AND in_message = 1 - ORDER BY filetime DESC, post_msg_id ASC"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $attachments[] = $row; - } - $db->sql_freeresult($result); - - // No attachments exist, but message table thinks they do so go ahead and reset attach flags - if (!sizeof($attachments)) - { - $sql = 'UPDATE ' . PRIVMSGS_TABLE . " - SET message_attachment = 0 - WHERE msg_id = $msg_id"; - $db->sql_query($sql); - } - } - else - { - $display_notice = true; - } - } - - // Assign inline attachments - if (!empty($attachments)) - { - $update_count = array(); - parse_attachments(false, $message, $attachments, $update_count); - - // Update the attachment download counts - if (sizeof($update_count)) - { - $sql = 'UPDATE ' . ATTACHMENTS_TABLE . ' - SET download_count = download_count + 1 - WHERE ' . $db->sql_in_set('attach_id', array_unique($update_count)); - $db->sql_query($sql); - } - } - - $user_info['sig'] = ''; - - $signature = ($message_row['enable_sig'] && $config['allow_sig'] && $auth->acl_get('u_sig') && $user->optionget('viewsigs')) ? $user_info['user_sig'] : ''; - - // End signature parsing, only if needed - if ($signature) - { - $signature = censor_text($signature); - - if ($user_info['user_sig_bbcode_bitfield']) - { - if ($bbcode === false) - { - include($phpbb_root_path . 'includes/bbcode.' . $phpEx); - $bbcode = new bbcode($user_info['user_sig_bbcode_bitfield']); - } - - $bbcode->bbcode_second_pass($signature, $user_info['user_sig_bbcode_uid'], $user_info['user_sig_bbcode_bitfield']); - } - - $signature = bbcode_nl2br($signature); - $signature = smiley_text($signature); - } - - $url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm'); - - $template->assign_vars(array( - 'MESSAGE_AUTHOR_FULL' => get_username_string('full', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']), - 'MESSAGE_AUTHOR_COLOUR' => get_username_string('colour', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']), - 'MESSAGE_AUTHOR' => get_username_string('username', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']), - 'U_MESSAGE_AUTHOR' => get_username_string('profile', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']), - - 'RANK_TITLE' => $user_info['rank_title'], - 'RANK_IMG' => $user_info['rank_image'], - 'AUTHOR_AVATAR' => (isset($user_info['avatar'])) ? $user_info['avatar'] : '', - 'AUTHOR_JOINED' => $user->format_date($user_info['user_regdate']), - 'AUTHOR_POSTS' => (!empty($user_info['user_posts'])) ? $user_info['user_posts'] : '', - 'AUTHOR_FROM' => (!empty($user_info['user_from'])) ? $user_info['user_from'] : '', - - 'ONLINE_IMG' => (!$config['load_onlinetrack']) ? '' : ((isset($user_info['online']) && $user_info['online']) ? $user->img('icon_user_online', $user->lang['ONLINE']) : $user->img('icon_user_offline', $user->lang['OFFLINE'])), - 'S_ONLINE' => (!$config['load_onlinetrack']) ? false : ((isset($user_info['online']) && $user_info['online']) ? true : false), - 'DELETE_IMG' => $user->img('icon_post_delete', $user->lang['DELETE_MESSAGE']), - 'INFO_IMG' => $user->img('icon_post_info', $user->lang['VIEW_PM_INFO']), - 'PROFILE_IMG' => $user->img('icon_user_profile', $user->lang['READ_PROFILE']), - 'EMAIL_IMG' => $user->img('icon_contact_email', $user->lang['SEND_EMAIL']), - 'QUOTE_IMG' => $user->img('icon_post_quote', $user->lang['POST_QUOTE_PM']), - 'REPLY_IMG' => $user->img('button_pm_reply', $user->lang['POST_REPLY_PM']), - 'EDIT_IMG' => $user->img('icon_post_edit', $user->lang['POST_EDIT_PM']), - 'MINI_POST_IMG' => $user->img('icon_post_target', $user->lang['PM']), - - 'SENT_DATE' => $user->format_date($message_row['message_time']), - 'SUBJECT' => $message_row['message_subject'], - 'MESSAGE' => $message, - 'SIGNATURE' => ($message_row['enable_sig']) ? $signature : '', - 'EDITED_MESSAGE' => $l_edited_by, - 'MESSAGE_ID' => $message_row['msg_id'], - - 'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_info['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $author_id) : '', - 'U_WWW' => (!empty($user_info['user_website'])) ? $user_info['user_website'] : '', - 'U_ICQ' => ($user_info['user_icq']) ? 'http://www.icq.com/people/webmsg.php?to=' . urlencode($user_info['user_icq']) : '', - 'U_AIM' => ($user_info['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=aim&u=' . $author_id) : '', - 'U_YIM' => ($user_info['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($user_info['user_yim']) . '&.src=pg' : '', - 'U_MSN' => ($user_info['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=msnm&u=' . $author_id) : '', - 'U_JABBER' => ($user_info['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=jabber&u=' . $author_id) : '', - - 'U_DELETE' => ($auth->acl_get('u_pm_delete')) ? "$url&mode=compose&action=delete&f=$folder_id&p=" . $message_row['msg_id'] : '', - 'U_EMAIL' => $user_info['email'], - 'U_QUOTE' => ($auth->acl_get('u_sendpm') && $author_id != ANONYMOUS) ? "$url&mode=compose&action=quote&f=$folder_id&p=" . $message_row['msg_id'] : '', - 'U_EDIT' => (($message_row['message_time'] > time() - ($config['pm_edit_time'] * 60) || !$config['pm_edit_time']) && $folder_id == PRIVMSGS_OUTBOX && $auth->acl_get('u_pm_edit')) ? "$url&mode=compose&action=edit&f=$folder_id&p=" . $message_row['msg_id'] : '', - 'U_POST_REPLY_PM' => ($auth->acl_get('u_sendpm') && $author_id != ANONYMOUS) ? "$url&mode=compose&action=reply&f=$folder_id&p=" . $message_row['msg_id'] : '', - 'U_PREVIOUS_PM' => "$url&f=$folder_id&p=" . $message_row['msg_id'] . "&view=previous", - 'U_NEXT_PM' => "$url&f=$folder_id&p=" . $message_row['msg_id'] . "&view=next", - - 'S_HAS_ATTACHMENTS' => (sizeof($attachments)) ? true : false, - 'S_DISPLAY_NOTICE' => $display_notice && $message_row['message_attachment'], - 'S_AUTHOR_DELETED' => ($author_id == ANONYMOUS) ? true : false, - 'S_SPECIAL_FOLDER' => in_array($folder_id, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX)), - - 'U_PRINT_PM' => ($config['print_pm'] && $auth->acl_get('u_pm_printpm')) ? "$url&f=$folder_id&p=" . $message_row['msg_id'] . "&view=print" : '', - 'U_FORWARD_PM' => ($config['forward_pm'] && $auth->acl_get('u_pm_forward')) ? "$url&mode=compose&action=forward&f=$folder_id&p=" . $message_row['msg_id'] : '') - ); - - // Display not already displayed Attachments for this post, we already parsed them. ;) - if (isset($attachments) && sizeof($attachments)) - { - foreach ($attachments as $attachment) - { - $template->assign_block_vars('attachment', array( - 'DISPLAY_ATTACHMENT' => $attachment) - ); - } - } - - if (!isset($_REQUEST['view']) || $_REQUEST['view'] != 'print') - { - // Message History - if (message_history($msg_id, $user->data['user_id'], $message_row, $folder)) - { - $template->assign_var('S_DISPLAY_HISTORY', true); - } - } -} - -/** -* Get user information (only for message display) -*/ -function get_user_information($user_id, $user_row) -{ - global $db, $auth, $user, $cache; - global $phpbb_root_path, $phpEx, $config; - - if (!$user_id) - { - return array(); - } - - if (empty($user_row)) - { - $sql = 'SELECT * - FROM ' . USERS_TABLE . ' - WHERE user_id = ' . (int) $user_id; - $result = $db->sql_query($sql); - $user_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - } - - // Some standard values - $user_row['online'] = false; - $user_row['rank_title'] = $user_row['rank_image'] = $user_row['rank_image_src'] = $user_row['email'] = ''; - - // Generate online information for user - if ($config['load_onlinetrack']) - { - $sql = 'SELECT session_user_id, MAX(session_time) as online_time, MIN(session_viewonline) AS viewonline - FROM ' . SESSIONS_TABLE . " - WHERE session_user_id = $user_id - GROUP BY session_user_id"; - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $update_time = $config['load_online_time'] * 60; - if ($row) - { - $user_row['online'] = (time() - $update_time < $row['online_time'] && ($row['viewonline'])) ? true : false; - } - } - - if (!function_exists('get_user_avatar')) - { - include($phpbb_root_path . 'includes/functions_display.' . $phpEx); - } - - $user_row['avatar'] = ($user->optionget('viewavatars')) ? get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']) : ''; - - get_user_rank($user_row['user_rank'], $user_row['user_posts'], $user_row['rank_title'], $user_row['rank_image'], $user_row['rank_image_src']); - - if (!empty($user_row['user_allow_viewemail']) || $auth->acl_get('a_email')) - { - $user_row['email'] = ($config['board_email_form'] && $config['email_enable']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=email&u=$user_id") : ((($config['board_hide_emails'] && !$auth->acl_get('a_email')) || empty($user_row['user_email'])) ? '' : 'mailto:' . $user_row['user_email']); - } - - return $user_row; -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php deleted file mode 100644 index 3762cf25f6..0000000000 --- a/phpBB/includes/ucp/ucp_prefs.php +++ /dev/null @@ -1,351 +0,0 @@ - request_var('notifymethod', $user->data['user_notify_type']), - 'dateformat' => request_var('dateformat', $user->data['user_dateformat'], true), - 'lang' => basename(request_var('lang', $user->data['user_lang'])), - 'style' => request_var('style', (int) $user->data['user_style']), - 'tz' => request_var('tz', (float) $user->data['user_timezone']), - - 'dst' => request_var('dst', (bool) $user->data['user_dst']), - 'viewemail' => request_var('viewemail', (bool) $user->data['user_allow_viewemail']), - 'massemail' => request_var('massemail', (bool) $user->data['user_allow_massemail']), - 'hideonline' => request_var('hideonline', (bool) !$user->data['user_allow_viewonline']), - 'notifypm' => request_var('notifypm', (bool) $user->data['user_notify_pm']), - 'popuppm' => request_var('popuppm', (bool) $user->optionget('popuppm')), - 'allowpm' => request_var('allowpm', (bool) $user->data['user_allow_pm']), - ); - - if ($submit) - { - $data['style'] = ($config['override_user_style']) ? $config['default_style'] : $data['style']; - - $error = validate_data($data, array( - 'dateformat' => array('string', false, 1, 30), - 'lang' => array('match', false, '#^[a-z0-9_\-]{2,}$#i'), - 'tz' => array('num', false, -14, 14), - )); - - if (!check_form_key('ucp_prefs_personal')) - { - $error[] = 'FORM_INVALID'; - } - - if (!sizeof($error)) - { - $user->optionset('popuppm', $data['popuppm']); - - $sql_ary = array( - 'user_allow_pm' => $data['allowpm'], - 'user_allow_viewemail' => $data['viewemail'], - 'user_allow_massemail' => $data['massemail'], - 'user_allow_viewonline' => ($auth->acl_get('u_hideonline')) ? !$data['hideonline'] : $user->data['user_allow_viewonline'], - 'user_notify_type' => $data['notifymethod'], - 'user_notify_pm' => $data['notifypm'], - 'user_options' => $user->data['user_options'], - - 'user_dst' => $data['dst'], - 'user_dateformat' => $data['dateformat'], - 'user_lang' => $data['lang'], - 'user_timezone' => $data['tz'], - 'user_style' => $data['style'], - ); - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_id = ' . $user->data['user_id']; - $db->sql_query($sql); - - meta_refresh(3, $this->u_action); - $message = $user->lang['PREFERENCES_UPDATED'] . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - trigger_error($message); - } - - // Replace "error" strings with their real, localised form - $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); - } - - $dateformat_options = ''; - - foreach ($user->lang['dateformats'] as $format => $null) - { - $dateformat_options .= ''; - } - - $s_custom = false; - - $dateformat_options .= ''; - - $template->assign_vars(array( - 'ERROR' => (sizeof($error)) ? implode('
    ', $error) : '', - - 'S_NOTIFY_EMAIL' => ($data['notifymethod'] == NOTIFY_EMAIL) ? true : false, - 'S_NOTIFY_IM' => ($data['notifymethod'] == NOTIFY_IM) ? true : false, - 'S_NOTIFY_BOTH' => ($data['notifymethod'] == NOTIFY_BOTH) ? true : false, - 'S_VIEW_EMAIL' => $data['viewemail'], - 'S_MASS_EMAIL' => $data['massemail'], - 'S_ALLOW_PM' => $data['allowpm'], - 'S_HIDE_ONLINE' => $data['hideonline'], - 'S_NOTIFY_PM' => $data['notifypm'], - 'S_POPUP_PM' => $data['popuppm'], - 'S_DST' => $data['dst'], - - 'DATE_FORMAT' => $data['dateformat'], - 'A_DATE_FORMAT' => addslashes($data['dateformat']), - 'S_DATEFORMAT_OPTIONS' => $dateformat_options, - 'S_CUSTOM_DATEFORMAT' => $s_custom, - 'DEFAULT_DATEFORMAT' => $config['default_dateformat'], - 'A_DEFAULT_DATEFORMAT' => addslashes($config['default_dateformat']), - - 'S_LANG_OPTIONS' => language_select($data['lang']), - 'S_STYLE_OPTIONS' => ($config['override_user_style']) ? '' : style_select($data['style']), - 'S_TZ_OPTIONS' => tz_select($data['tz'], true), - 'S_CAN_HIDE_ONLINE' => ($auth->acl_get('u_hideonline')) ? true : false, - 'S_SELECT_NOTIFY' => ($config['jab_enable'] && $user->data['user_jabber'] && @extension_loaded('xml')) ? true : false) - ); - - break; - - case 'view': - - add_form_key('ucp_prefs_view'); - - $data = array( - 'topic_sk' => request_var('topic_sk', (!empty($user->data['user_topic_sortby_type'])) ? $user->data['user_topic_sortby_type'] : 't'), - 'topic_sd' => request_var('topic_sd', (!empty($user->data['user_topic_sortby_dir'])) ? $user->data['user_topic_sortby_dir'] : 'd'), - 'topic_st' => request_var('topic_st', (!empty($user->data['user_topic_show_days'])) ? $user->data['user_topic_show_days'] : 0), - - 'post_sk' => request_var('post_sk', (!empty($user->data['user_post_sortby_type'])) ? $user->data['user_post_sortby_type'] : 't'), - 'post_sd' => request_var('post_sd', (!empty($user->data['user_post_sortby_dir'])) ? $user->data['user_post_sortby_dir'] : 'a'), - 'post_st' => request_var('post_st', (!empty($user->data['user_post_show_days'])) ? $user->data['user_post_show_days'] : 0), - - 'images' => request_var('images', (bool) $user->optionget('viewimg')), - 'flash' => request_var('flash', (bool) $user->optionget('viewflash')), - 'smilies' => request_var('smilies', (bool) $user->optionget('viewsmilies')), - 'sigs' => request_var('sigs', (bool) $user->optionget('viewsigs')), - 'avatars' => request_var('avatars', (bool) $user->optionget('viewavatars')), - 'wordcensor' => request_var('wordcensor', (bool) $user->optionget('viewcensors')), - ); - - if ($submit) - { - $error = validate_data($data, array( - 'topic_sk' => array('string', false, 1, 1), - 'topic_sd' => array('string', false, 1, 1), - 'post_sk' => array('string', false, 1, 1), - 'post_sd' => array('string', false, 1, 1), - )); - - if (!check_form_key('ucp_prefs_view')) - { - $error[] = 'FORM_INVALID'; - } - - if (!sizeof($error)) - { - $user->optionset('viewimg', $data['images']); - $user->optionset('viewflash', $data['flash']); - $user->optionset('viewsmilies', $data['smilies']); - $user->optionset('viewsigs', $data['sigs']); - $user->optionset('viewavatars', $data['avatars']); - - if ($auth->acl_get('u_chgcensors')) - { - $user->optionset('viewcensors', $data['wordcensor']); - } - - $sql_ary = array( - 'user_options' => $user->data['user_options'], - 'user_topic_sortby_type' => $data['topic_sk'], - 'user_post_sortby_type' => $data['post_sk'], - 'user_topic_sortby_dir' => $data['topic_sd'], - 'user_post_sortby_dir' => $data['post_sd'], - - 'user_topic_show_days' => $data['topic_st'], - 'user_post_show_days' => $data['post_st'], - ); - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_id = ' . $user->data['user_id']; - $db->sql_query($sql); - - meta_refresh(3, $this->u_action); - $message = $user->lang['PREFERENCES_UPDATED'] . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - trigger_error($message); - } - - // Replace "error" strings with their real, localised form - $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); - } - - $sort_dir_text = array('a' => $user->lang['ASCENDING'], 'd' => $user->lang['DESCENDING']); - - // Topic ordering options - $limit_topic_days = array(0 => $user->lang['ALL_TOPICS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); - - $sort_by_topic_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 'r' => $user->lang['REPLIES'], 's' => $user->lang['SUBJECT'], 'v' => $user->lang['VIEWS']); - $sort_by_topic_sql = array('a' => 't.topic_first_poster_name', 't' => 't.topic_last_post_time', 'r' => 't.topic_replies', 's' => 't.topic_title', 'v' => 't.topic_views'); - - // Post ordering options - $limit_post_days = array(0 => $user->lang['ALL_POSTS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); - - $sort_by_post_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']); - $sort_by_post_sql = array('a' => 'u.username_clean', 't' => 'p.post_id', 's' => 'p.post_subject'); - - $_options = array('topic', 'post'); - foreach ($_options as $sort_option) - { - ${'s_limit_' . $sort_option . '_days'} = ''; - - ${'s_sort_' . $sort_option . '_key'} = ''; - - ${'s_sort_' . $sort_option . '_dir'} = ''; - } - - $template->assign_vars(array( - 'ERROR' => (sizeof($error)) ? implode('
    ', $error) : '', - - 'S_IMAGES' => $data['images'], - 'S_FLASH' => $data['flash'], - 'S_SMILIES' => $data['smilies'], - 'S_SIGS' => $data['sigs'], - 'S_AVATARS' => $data['avatars'], - 'S_DISABLE_CENSORS' => $data['wordcensor'], - - 'S_CHANGE_CENSORS' => ($auth->acl_get('u_chgcensors')) ? true : false, - - 'S_TOPIC_SORT_DAYS' => $s_limit_topic_days, - 'S_TOPIC_SORT_KEY' => $s_sort_topic_key, - 'S_TOPIC_SORT_DIR' => $s_sort_topic_dir, - 'S_POST_SORT_DAYS' => $s_limit_post_days, - 'S_POST_SORT_KEY' => $s_sort_post_key, - 'S_POST_SORT_DIR' => $s_sort_post_dir) - ); - - break; - - case 'post': - - $data = array( - 'bbcode' => request_var('bbcode', $user->optionget('bbcode')), - 'smilies' => request_var('smilies', $user->optionget('smilies')), - 'sig' => request_var('sig', $user->optionget('attachsig')), - 'notify' => request_var('notify', $user->data['user_notify']), - ); - add_form_key('ucp_prefs_post'); - - if ($submit) - { - if (check_form_key('ucp_prefs_post')) - { - $user->optionset('bbcode', $data['bbcode']); - $user->optionset('smilies', $data['smilies']); - $user->optionset('attachsig', $data['sig']); - - $sql_ary = array( - 'user_options' => $user->data['user_options'], - 'user_notify' => $data['notify'], - ); - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_id = ' . $user->data['user_id']; - $db->sql_query($sql); - - $msg = $user->lang['PREFERENCES_UPDATED']; - } - else - { - $msg = $user->lang['FORM_INVALID']; - } - meta_refresh(3, $this->u_action); - $message = $msg . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - trigger_error($message); - } - - $template->assign_vars(array( - 'S_BBCODE' => $data['bbcode'], - 'S_SMILIES' => $data['smilies'], - 'S_SIG' => $data['sig'], - 'S_NOTIFY' => $data['notify']) - ); - break; - } - - $template->assign_vars(array( - 'L_TITLE' => $user->lang['UCP_PREFS_' . strtoupper($mode)], - - 'S_HIDDEN_FIELDS' => $s_hidden_fields, - 'S_UCP_ACTION' => $this->u_action) - ); - - $this->tpl_name = 'ucp_prefs_' . $mode; - $this->page_title = 'UCP_PREFS_' . strtoupper($mode); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php deleted file mode 100644 index 65fef2d267..0000000000 --- a/phpBB/includes/ucp/ucp_profile.php +++ /dev/null @@ -1,636 +0,0 @@ -add_lang('posting'); - - $preview = (!empty($_POST['preview'])) ? true : false; - $submit = (!empty($_POST['submit'])) ? true : false; - $delete = (!empty($_POST['delete'])) ? true : false; - $error = $data = array(); - $s_hidden_fields = ''; - - switch ($mode) - { - case 'reg_details': - - $data = array( - 'username' => utf8_normalize_nfc(request_var('username', $user->data['username'], true)), - 'email' => strtolower(request_var('email', $user->data['user_email'])), - 'email_confirm' => strtolower(request_var('email_confirm', '')), - 'new_password' => request_var('new_password', '', true), - 'cur_password' => request_var('cur_password', '', true), - 'password_confirm' => request_var('password_confirm', '', true), - ); - - add_form_key('ucp_reg_details'); - - if ($submit) - { - // Do not check cur_password, it is the old one. - $check_ary = array( - 'new_password' => array( - array('string', true, $config['min_pass_chars'], $config['max_pass_chars']), - array('password')), - 'password_confirm' => array('string', true, $config['min_pass_chars'], $config['max_pass_chars']), - 'email' => array( - array('string', false, 6, 60), - array('email')), - 'email_confirm' => array('string', true, 6, 60), - ); - - if ($auth->acl_get('u_chgname') && $config['allow_namechange']) - { - $check_ary['username'] = array( - array('string', false, $config['min_name_chars'], $config['max_name_chars']), - array('username'), - ); - } - - $error = validate_data($data, $check_ary); - - if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && $data['password_confirm'] != $data['new_password']) - { - $error[] = 'NEW_PASSWORD_ERROR'; - } - - if (($data['new_password'] || ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email']) || ($data['username'] != $user->data['username'] && $auth->acl_get('u_chgname') && $config['allow_namechange'])) && !phpbb_check_hash($data['cur_password'], $user->data['user_password'])) - { - $error[] = 'CUR_PASSWORD_ERROR'; - } - - // Only check the new password against the previous password if there have been no errors - if (!sizeof($error) && $auth->acl_get('u_chgpasswd') && $data['new_password'] && phpbb_check_hash($data['new_password'], $user->data['user_password'])) - { - $error[] = 'SAME_PASSWORD_ERROR'; - } - - if ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email'] && $data['email_confirm'] != $data['email']) - { - $error[] = 'NEW_EMAIL_ERROR'; - } - - if (!check_form_key('ucp_reg_details')) - { - $error[] = 'FORM_INVALID'; - } - - if (!sizeof($error)) - { - $sql_ary = array( - 'username' => ($auth->acl_get('u_chgname') && $config['allow_namechange']) ? $data['username'] : $user->data['username'], - 'username_clean' => ($auth->acl_get('u_chgname') && $config['allow_namechange']) ? utf8_clean_string($data['username']) : $user->data['username_clean'], - 'user_email' => ($auth->acl_get('u_chgemail')) ? $data['email'] : $user->data['user_email'], - 'user_email_hash' => ($auth->acl_get('u_chgemail')) ? hexdec(crc32($data['email']) . strlen($data['email'])) : $user->data['user_email_hash'], - 'user_password' => ($auth->acl_get('u_chgpasswd') && $data['new_password']) ? phpbb_hash($data['new_password']) : $user->data['user_password'], - 'user_passchg' => ($auth->acl_get('u_chgpasswd') && $data['new_password']) ? time() : 0, - ); - - if ($auth->acl_get('u_chgname') && $config['allow_namechange'] && $data['username'] != $user->data['username']) - { - add_log('user', $user->data['user_id'], 'LOG_USER_UPDATE_NAME', $user->data['username'], $data['username']); - } - - if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && !phpbb_check_hash($data['new_password'], $user->data['user_password'])) - { - $user->reset_login_keys(); - add_log('user', $user->data['user_id'], 'LOG_USER_NEW_PASSWORD', $data['username']); - } - - if ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email']) - { - add_log('user', $user->data['user_id'], 'LOG_USER_UPDATE_EMAIL', $data['username'], $user->data['user_email'], $data['email']); - } - - $message = 'PROFILE_UPDATED'; - - if ($config['email_enable'] && $data['email'] != $user->data['user_email'] && $user->data['user_type'] != USER_FOUNDER && ($config['require_activation'] == USER_ACTIVATION_SELF || $config['require_activation'] == USER_ACTIVATION_ADMIN)) - { - $message = ($config['require_activation'] == USER_ACTIVATION_SELF) ? 'ACCOUNT_EMAIL_CHANGED' : 'ACCOUNT_EMAIL_CHANGED_ADMIN'; - - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - - $server_url = generate_board_url(); - - $user_actkey = gen_rand_string(10); - $key_len = 54 - (strlen($server_url)); - $key_len = ($key_len > 6) ? $key_len : 6; - $user_actkey = substr($user_actkey, 0, $key_len); - - $messenger = new messenger(false); - - $template_file = ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? 'user_activate_inactive' : 'user_activate'; - $messenger->template($template_file, $user->data['user_lang']); - - $messenger->to($data['email'], $data['username']); - - $messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); - $messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']); - $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']); - $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($data['username']), - 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user->data['user_id']}&k=$user_actkey") - ); - - $messenger->send(NOTIFY_EMAIL); - - if ($config['require_activation'] == USER_ACTIVATION_ADMIN) - { - // Grab an array of user_id's with a_user permissions ... these users can activate a user - $admin_ary = $auth->acl_get_list(false, 'a_user', false); - $admin_ary = (!empty($admin_ary[0]['a_user'])) ? $admin_ary[0]['a_user'] : array(); - - // Also include founders - $where_sql = ' WHERE user_type = ' . USER_FOUNDER; - - if (sizeof($admin_ary)) - { - $where_sql .= ' OR ' . $db->sql_in_set('user_id', $admin_ary); - } - - $sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type - FROM ' . USERS_TABLE . ' ' . - $where_sql; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $messenger->template('admin_activate', $row['user_lang']); - $messenger->to($row['user_email'], $row['username']); - $messenger->im($row['user_jabber'], $row['username']); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($data['username']), - 'U_USER_DETAILS' => "$server_url/memberlist.$phpEx?mode=viewprofile&u={$user->data['user_id']}", - 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user->data['user_id']}&k=$user_actkey") - ); - - $messenger->send($row['user_notify_type']); - } - $db->sql_freeresult($result); - } - - user_active_flip('deactivate', $user->data['user_id'], INACTIVE_PROFILE); - - // Because we want the profile to be reactivated we set user_newpasswd to empty (else the reactivation will fail) - $sql_ary['user_actkey'] = $user_actkey; - $sql_ary['user_newpasswd'] = ''; - } - - if (sizeof($sql_ary)) - { - $sql = 'UPDATE ' . USERS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_id = ' . $user->data['user_id']; - $db->sql_query($sql); - } - - // Need to update config, forum, topic, posting, messages, etc. - if ($data['username'] != $user->data['username'] && $auth->acl_get('u_chgname') && $config['allow_namechange']) - { - user_update_name($user->data['username'], $data['username']); - } - - // Now, we can remove the user completely (kill the session) - NOT BEFORE!!! - if (!empty($sql_ary['user_actkey'])) - { - meta_refresh(5, append_sid($phpbb_root_path . 'index.' . $phpEx)); - $message = $user->lang[$message] . '

    ' . sprintf($user->lang['RETURN_INDEX'], '', ''); - - // Because the user gets deactivated we log him out too, killing his session - $user->session_kill(); - } - else - { - meta_refresh(3, $this->u_action); - $message = $user->lang[$message] . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - } - - trigger_error($message); - } - - // Replace "error" strings with their real, localised form - $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); - } - - $template->assign_vars(array( - 'ERROR' => (sizeof($error)) ? implode('
    ', $error) : '', - - 'USERNAME' => $data['username'], - 'EMAIL' => $data['email'], - 'PASSWORD_CONFIRM' => $data['password_confirm'], - 'NEW_PASSWORD' => $data['new_password'], - 'CUR_PASSWORD' => '', - - 'L_USERNAME_EXPLAIN' => sprintf($user->lang[$config['allow_name_chars'] . '_EXPLAIN'], $config['min_name_chars'], $config['max_name_chars']), - 'L_CHANGE_PASSWORD_EXPLAIN' => sprintf($user->lang[$config['pass_complex'] . '_EXPLAIN'], $config['min_pass_chars'], $config['max_pass_chars']), - - 'S_FORCE_PASSWORD' => ($auth->acl_get('u_chgpasswd') && $config['chg_passforce'] && $user->data['user_passchg'] < time() - ($config['chg_passforce'] * 86400)) ? true : false, - 'S_CHANGE_USERNAME' => ($config['allow_namechange'] && $auth->acl_get('u_chgname')) ? true : false, - 'S_CHANGE_EMAIL' => ($auth->acl_get('u_chgemail')) ? true : false, - 'S_CHANGE_PASSWORD' => ($auth->acl_get('u_chgpasswd')) ? true : false) - ); - break; - - case 'profile_info': - - include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx); - - $cp = new custom_profile(); - - $cp_data = $cp_error = array(); - - $data = array( - 'icq' => request_var('icq', $user->data['user_icq']), - 'aim' => request_var('aim', $user->data['user_aim']), - 'msn' => request_var('msn', $user->data['user_msnm']), - 'yim' => request_var('yim', $user->data['user_yim']), - 'jabber' => utf8_normalize_nfc(request_var('jabber', $user->data['user_jabber'], true)), - 'website' => request_var('website', $user->data['user_website']), - 'location' => utf8_normalize_nfc(request_var('location', $user->data['user_from'], true)), - 'occupation' => utf8_normalize_nfc(request_var('occupation', $user->data['user_occ'], true)), - 'interests' => utf8_normalize_nfc(request_var('interests', $user->data['user_interests'], true)), - ); - - if ($config['allow_birthdays']) - { - $data['bday_day'] = $data['bday_month'] = $data['bday_year'] = 0; - - if ($user->data['user_birthday']) - { - list($data['bday_day'], $data['bday_month'], $data['bday_year']) = explode('-', $user->data['user_birthday']); - } - - $data['bday_day'] = request_var('bday_day', $data['bday_day']); - $data['bday_month'] = request_var('bday_month', $data['bday_month']); - $data['bday_year'] = request_var('bday_year', $data['bday_year']); - $data['user_birthday'] = sprintf('%2d-%2d-%4d', $data['bday_day'], $data['bday_month'], $data['bday_year']); - } - - add_form_key('ucp_profile_info'); - - if ($submit) - { - $validate_array = array( - 'icq' => array( - array('string', true, 3, 15), - array('match', true, '#^[0-9]+$#i')), - 'aim' => array('string', true, 3, 255), - 'msn' => array('string', true, 5, 255), - 'jabber' => array( - array('string', true, 5, 255), - array('jabber')), - 'yim' => array('string', true, 5, 255), - 'website' => array( - array('string', true, 12, 255), - array('match', true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')), - 'location' => array('string', true, 2, 255), - 'occupation' => array('string', true, 2, 500), - 'interests' => array('string', true, 2, 500), - ); - - if ($config['allow_birthdays']) - { - $validate_array = array_merge($validate_array, array( - 'bday_day' => array('num', true, 1, 31), - 'bday_month' => array('num', true, 1, 12), - 'bday_year' => array('num', true, 1901, gmdate('Y', time()) + 50), - 'user_birthday' => array('date', true), - )); - } - - $error = validate_data($data, $validate_array); - - // validate custom profile fields - $cp->submit_cp_field('profile', $user->get_iso_lang_id(), $cp_data, $cp_error); - - if (sizeof($cp_error)) - { - $error = array_merge($error, $cp_error); - } - - if (!check_form_key('ucp_profile_info')) - { - $error[] = 'FORM_INVALID'; - } - - if (!sizeof($error)) - { - $sql_ary = array( - 'user_icq' => $data['icq'], - 'user_aim' => $data['aim'], - 'user_msnm' => $data['msn'], - 'user_yim' => $data['yim'], - 'user_jabber' => $data['jabber'], - 'user_website' => $data['website'], - 'user_from' => $data['location'], - 'user_occ' => $data['occupation'], - 'user_interests'=> $data['interests'], - ); - - if ($config['allow_birthdays']) - { - $sql_ary['user_birthday'] = $data['user_birthday']; - } - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_id = ' . $user->data['user_id']; - $db->sql_query($sql); - - // Update Custom Fields - if (sizeof($cp_data)) - { - $sql = 'UPDATE ' . PROFILE_FIELDS_DATA_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $cp_data) . ' - WHERE user_id = ' . $user->data['user_id']; - $db->sql_query($sql); - - if (!$db->sql_affectedrows()) - { - $cp_data['user_id'] = (int) $user->data['user_id']; - - $db->sql_return_on_error(true); - - $sql = 'INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $cp_data); - $db->sql_query($sql); - - $db->sql_return_on_error(false); - } - } - - meta_refresh(3, $this->u_action); - $message = $user->lang['PROFILE_UPDATED'] . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - trigger_error($message); - } - - // Replace "error" strings with their real, localised form - $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); - } - - if ($config['allow_birthdays']) - { - $s_birthday_day_options = ''; - for ($i = 1; $i < 32; $i++) - { - $selected = ($i == $data['bday_day']) ? ' selected="selected"' : ''; - $s_birthday_day_options .= ""; - } - - $s_birthday_month_options = ''; - for ($i = 1; $i < 13; $i++) - { - $selected = ($i == $data['bday_month']) ? ' selected="selected"' : ''; - $s_birthday_month_options .= ""; - } - $s_birthday_year_options = ''; - - $now = getdate(); - $s_birthday_year_options = ''; - for ($i = $now['year'] - 100; $i < $now['year']; $i++) - { - $selected = ($i == $data['bday_year']) ? ' selected="selected"' : ''; - $s_birthday_year_options .= ""; - } - unset($now); - - $template->assign_vars(array( - 'S_BIRTHDAY_DAY_OPTIONS' => $s_birthday_day_options, - 'S_BIRTHDAY_MONTH_OPTIONS' => $s_birthday_month_options, - 'S_BIRTHDAY_YEAR_OPTIONS' => $s_birthday_year_options, - 'S_BIRTHDAYS_ENABLED' => true, - )); - } - - $template->assign_vars(array( - 'ERROR' => (sizeof($error)) ? implode('
    ', $error) : '', - - 'ICQ' => $data['icq'], - 'YIM' => $data['yim'], - 'AIM' => $data['aim'], - 'MSN' => $data['msn'], - 'JABBER' => $data['jabber'], - 'WEBSITE' => $data['website'], - 'LOCATION' => $data['location'], - 'OCCUPATION'=> $data['occupation'], - 'INTERESTS' => $data['interests'], - )); - - // Get additional profile fields and assign them to the template block var 'profile_fields' - $user->get_profile_fields($user->data['user_id']); - - $cp->generate_profile_fields('profile', $user->get_iso_lang_id()); - - break; - - case 'signature': - - if (!$auth->acl_get('u_sig')) - { - trigger_error('NO_AUTH_SIGNATURE'); - } - - include($phpbb_root_path . 'includes/functions_posting.' . $phpEx); - include($phpbb_root_path . 'includes/functions_display.' . $phpEx); - - $enable_bbcode = ($config['allow_sig_bbcode']) ? ((request_var('disable_bbcode', !$user->optionget('bbcode'))) ? false : true) : false; - $enable_smilies = ($config['allow_sig_smilies']) ? ((request_var('disable_smilies', !$user->optionget('smilies'))) ? false : true) : false; - $enable_urls = ($config['allow_sig_links']) ? ((request_var('disable_magic_url', false)) ? false : true) : false; - - $signature = utf8_normalize_nfc(request_var('signature', (string) $user->data['user_sig'], true)); - - add_form_key('ucp_sig'); - - if ($submit || $preview) - { - include($phpbb_root_path . 'includes/message_parser.' . $phpEx); - - if (!sizeof($error)) - { - $message_parser = new parse_message($signature); - - // Allowing Quote BBCode - $message_parser->parse($enable_bbcode, $enable_urls, $enable_smilies, $config['allow_sig_img'], $config['allow_sig_flash'], true, $config['allow_sig_links'], true, 'sig'); - - if (sizeof($message_parser->warn_msg)) - { - $error[] = implode('
    ', $message_parser->warn_msg); - } - - if (!check_form_key('ucp_sig')) - { - $error[] = 'FORM_INVALID'; - } - - if (!sizeof($error) && $submit) - { - $sql_ary = array( - 'user_sig' => (string) $message_parser->message, - 'user_sig_bbcode_uid' => (string) $message_parser->bbcode_uid, - 'user_sig_bbcode_bitfield' => $message_parser->bbcode_bitfield - ); - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_id = ' . $user->data['user_id']; - $db->sql_query($sql); - - $message = $user->lang['PROFILE_UPDATED'] . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - trigger_error($message); - } - } - - // Replace "error" strings with their real, localised form - $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); - } - - $signature_preview = ''; - if ($preview) - { - // Now parse it for displaying - $signature_preview = $message_parser->format_display($enable_bbcode, $enable_urls, $enable_smilies, false); - unset($message_parser); - } - - decode_message($signature, $user->data['user_sig_bbcode_uid']); - - $template->assign_vars(array( - 'ERROR' => (sizeof($error)) ? implode('
    ', $error) : '', - 'SIGNATURE' => $signature, - 'SIGNATURE_PREVIEW' => $signature_preview, - - 'S_BBCODE_CHECKED' => (!$enable_bbcode) ? ' checked="checked"' : '', - 'S_SMILIES_CHECKED' => (!$enable_smilies) ? ' checked="checked"' : '', - 'S_MAGIC_URL_CHECKED' => (!$enable_urls) ? ' checked="checked"' : '', - - 'BBCODE_STATUS' => ($config['allow_sig_bbcode']) ? sprintf($user->lang['BBCODE_IS_ON'], '', '') : sprintf($user->lang['BBCODE_IS_OFF'], '', ''), - 'SMILIES_STATUS' => ($config['allow_sig_smilies']) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'], - 'IMG_STATUS' => ($config['allow_sig_img']) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'], - 'FLASH_STATUS' => ($config['allow_sig_flash']) ? $user->lang['FLASH_IS_ON'] : $user->lang['FLASH_IS_OFF'], - 'URL_STATUS' => ($config['allow_sig_links']) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'], - - 'L_SIGNATURE_EXPLAIN' => sprintf($user->lang['SIGNATURE_EXPLAIN'], $config['max_sig_chars']), - - 'S_BBCODE_ALLOWED' => $config['allow_sig_bbcode'], - 'S_SMILIES_ALLOWED' => $config['allow_sig_smilies'], - 'S_BBCODE_IMG' => ($config['allow_sig_img']) ? true : false, - 'S_BBCODE_FLASH' => ($config['allow_sig_flash']) ? true : false, - 'S_LINKS_ALLOWED' => ($config['allow_sig_links']) ? true : false) - ); - - // Build custom bbcodes array - display_custom_bbcodes(); - - break; - - case 'avatar': - - include($phpbb_root_path . 'includes/functions_display.' . $phpEx); - - $display_gallery = request_var('display_gallery', '0'); - $avatar_select = basename(request_var('avatar_select', '')); - $category = basename(request_var('category', '')); - - $can_upload = ($config['allow_avatar_upload'] && file_exists($phpbb_root_path . $config['avatar_path']) && @is_writable($phpbb_root_path . $config['avatar_path']) && $auth->acl_get('u_chgavatar') && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false; - - add_form_key('ucp_avatar'); - - if ($submit) - { - if (check_form_key('ucp_avatar')) - { - if (avatar_process_user($error)) - { - meta_refresh(3, $this->u_action); - $message = $user->lang['PROFILE_UPDATED'] . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - trigger_error($message); - } - } - else - { - $error[] = 'FORM_INVALID'; - } - // Replace "error" strings with their real, localised form - $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); - } - - $template->assign_vars(array( - 'ERROR' => (sizeof($error)) ? implode('
    ', $error) : '', - 'AVATAR' => get_user_avatar($user->data['user_avatar'], $user->data['user_avatar_type'], $user->data['user_avatar_width'], $user->data['user_avatar_height']), - 'AVATAR_SIZE' => $config['avatar_filesize'], - - 'U_GALLERY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=profile&mode=avatar&display_gallery=1'), - - 'S_FORM_ENCTYPE' => ($can_upload) ? ' enctype="multipart/form-data"' : '', - - 'L_AVATAR_EXPLAIN' => sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], $config['avatar_filesize'] / 1024), - )); - - if ($display_gallery && $auth->acl_get('u_chgavatar') && $config['allow_avatar_local']) - { - avatar_gallery($category, $avatar_select, 4); - } - else - { - $avatars_enabled = ($can_upload || ($auth->acl_get('u_chgavatar') && ($config['allow_avatar_local'] || $config['allow_avatar_remote']))) ? true : false; - - $template->assign_vars(array( - 'AVATAR_WIDTH' => request_var('width', $user->data['user_avatar_width']), - 'AVATAR_HEIGHT' => request_var('height', $user->data['user_avatar_height']), - - 'S_AVATARS_ENABLED' => $avatars_enabled, - 'S_UPLOAD_AVATAR_FILE' => $can_upload, - 'S_UPLOAD_AVATAR_URL' => $can_upload, - 'S_LINK_AVATAR' => ($auth->acl_get('u_chgavatar') && $config['allow_avatar_remote']) ? true : false, - 'S_DISPLAY_GALLERY' => ($auth->acl_get('u_chgavatar') && $config['allow_avatar_local']) ? true : false) - ); - } - - break; - } - - $template->assign_vars(array( - 'L_TITLE' => $user->lang['UCP_PROFILE_' . strtoupper($mode)], - - 'S_HIDDEN_FIELDS' => $s_hidden_fields, - 'S_UCP_ACTION' => $this->u_action) - ); - - // Set desired template - $this->tpl_name = 'ucp_profile_' . $mode; - $this->page_title = 'UCP_PROFILE_' . strtoupper($mode); - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php deleted file mode 100644 index b56015efc0..0000000000 --- a/phpBB/includes/ucp/ucp_register.php +++ /dev/null @@ -1,563 +0,0 @@ -lang_name); - - - // not so fast, buddy - if (!check_form_key('ucp_register', false, '', false, $config['min_time_reg']) - && !check_form_key('ucp_register_terms', false, '', false, $config['min_time_terms'])) - { - $agreed = false; - } - - if ($agreed) - { - add_form_key('ucp_register'); - } - else - { - add_form_key('ucp_register_terms'); - } - - - if ($change_lang || $user_lang != $config['default_lang']) - { - $use_lang = ($change_lang) ? basename($change_lang) : basename($user_lang); - - if (file_exists($phpbb_root_path . 'language/' . $use_lang . '/')) - { - if ($change_lang) - { - $submit = false; - - // Setting back agreed to let the user view the agreement in his/her language - $agreed = (empty($_GET['change_lang'])) ? 0 : $agreed; - } - - $user->lang_name = $lang = $use_lang; - $user->lang_path = $phpbb_root_path . 'language/' . $lang . '/'; - $user->lang = array(); - $user->add_lang(array('common', 'ucp')); - } - else - { - $change_lang = ''; - $user_lang = $user->lang_name; - } - } - - $cp = new custom_profile(); - - $error = $cp_data = $cp_error = array(); - - // - if (!$agreed || ($coppa === false && $config['coppa_enable']) || ($coppa && !$config['coppa_enable'])) - { - $add_lang = ($change_lang) ? '&change_lang=' . urlencode($change_lang) : ''; - $add_coppa = ($coppa !== false) ? '&coppa=' . $coppa : ''; - - $s_hidden_fields = ($confirm_id) ? array('confirm_id' => $confirm_id) : array(); - - // If we change the language, we want to pass on some more possible parameter. - if ($change_lang) - { - // We do not include the password - $s_hidden_fields = array_merge($s_hidden_fields, array( - 'username' => utf8_normalize_nfc(request_var('username', '', true)), - 'email' => strtolower(request_var('email', '')), - 'email_confirm' => strtolower(request_var('email_confirm', '')), - 'confirm_code' => request_var('confirm_code', ''), - 'confirm_id' => request_var('confirm_id', ''), - 'lang' => $user->lang_name, - 'tz' => request_var('tz', (float) $config['board_timezone']), - )); - } - - if ($coppa === false && $config['coppa_enable']) - { - $now = getdate(); - $coppa_birthday = $user->format_date(mktime($now['hours'] + $user->data['user_dst'], $now['minutes'], $now['seconds'], $now['mon'], $now['mday'] - 1, $now['year'] - 13), $user->lang['DATE_FORMAT']); - unset($now); - - $template->assign_vars(array( - 'L_COPPA_NO' => sprintf($user->lang['UCP_COPPA_BEFORE'], $coppa_birthday), - 'L_COPPA_YES' => sprintf($user->lang['UCP_COPPA_ON_AFTER'], $coppa_birthday), - - 'U_COPPA_NO' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register&coppa=0' . $add_lang), - 'U_COPPA_YES' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register&coppa=1' . $add_lang), - - 'S_SHOW_COPPA' => true, - 'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields), - 'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register' . $add_lang), - )); - } - else - { - $template->assign_vars(array( - 'L_TERMS_OF_USE' => sprintf($user->lang['TERMS_OF_USE_CONTENT'], $config['sitename'], generate_board_url()), - - 'S_SHOW_COPPA' => false, - 'S_REGISTRATION' => true, - 'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields), - 'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register' . $add_lang . $add_coppa), - 'S_TIME' => 1000 * ((int) $config['min_time_terms']), - ) - ); - } - - $this->tpl_name = 'ucp_agreement'; - return; - } - - - // Try to manually determine the timezone and adjust the dst if the server date/time complies with the default setting +/- 1 - $timezone = date('Z') / 3600; - $is_dst = date('I'); - - if ($config['board_timezone'] == $timezone || $config['board_timezone'] == ($timezone - 1)) - { - $timezone = ($is_dst) ? $timezone - 1 : $timezone; - - if (!isset($user->lang['tz_zones'][(string) $timezone])) - { - $timezone = $config['board_timezone']; - } - } - else - { - $is_dst = $config['board_dst']; - $timezone = $config['board_timezone']; - } - - $data = array( - 'username' => utf8_normalize_nfc(request_var('username', '', true)), - 'new_password' => request_var('new_password', '', true), - 'password_confirm' => request_var('password_confirm', '', true), - 'email' => strtolower(request_var('email', '')), - 'email_confirm' => strtolower(request_var('email_confirm', '')), - 'confirm_code' => request_var('confirm_code', ''), - 'lang' => basename(request_var('lang', $user->lang_name)), - 'tz' => request_var('tz', (float) $timezone), - ); - - // Check and initialize some variables if needed - if ($submit) - { - $error = validate_data($data, array( - 'username' => array( - array('string', false, $config['min_name_chars'], $config['max_name_chars']), - array('username', '')), - 'new_password' => array( - array('string', false, $config['min_pass_chars'], $config['max_pass_chars']), - array('password')), - 'password_confirm' => array('string', false, $config['min_pass_chars'], $config['max_pass_chars']), - 'email' => array( - array('string', false, 6, 60), - array('email')), - 'email_confirm' => array('string', false, 6, 60), - 'confirm_code' => array('string', !$config['enable_confirm'], 5, 8), - 'tz' => array('num', false, -14, 14), - 'lang' => array('match', false, '#^[a-z_\-]{2,}$#i'), - )); - - // Replace "error" strings with their real, localised form - $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); - - // DNSBL check - if ($config['check_dnsbl']) - { - if (($dnsbl = $user->check_dnsbl('register')) !== false) - { - $error[] = sprintf($user->lang['IP_BLACKLISTED'], $user->ip, $dnsbl[1]); - } - } - - // validate custom profile fields - $cp->submit_cp_field('register', $user->get_iso_lang_id(), $cp_data, $error); - - // Visual Confirmation handling - $wrong_confirm = false; - if ($config['enable_confirm']) - { - if (!$confirm_id) - { - $error[] = $user->lang['CONFIRM_CODE_WRONG']; - $wrong_confirm = true; - } - else - { - $sql = 'SELECT code - FROM ' . CONFIRM_TABLE . " - WHERE confirm_id = '" . $db->sql_escape($confirm_id) . "' - AND session_id = '" . $db->sql_escape($user->session_id) . "' - AND confirm_type = " . CONFIRM_REG; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - if (strcasecmp($row['code'], $data['confirm_code']) === 0) - { - $sql = 'DELETE FROM ' . CONFIRM_TABLE . " - WHERE confirm_id = '" . $db->sql_escape($confirm_id) . "' - AND session_id = '" . $db->sql_escape($user->session_id) . "' - AND confirm_type = " . CONFIRM_REG; - $db->sql_query($sql); - } - else - { - $error[] = $user->lang['CONFIRM_CODE_WRONG']; - $wrong_confirm = true; - } - } - else - { - $error[] = $user->lang['CONFIRM_CODE_WRONG']; - $wrong_confirm = true; - } - } - } - - if (!sizeof($error)) - { - if ($data['new_password'] != $data['password_confirm']) - { - $error[] = $user->lang['NEW_PASSWORD_ERROR']; - } - - if ($data['email'] != $data['email_confirm']) - { - $error[] = $user->lang['NEW_EMAIL_ERROR']; - } - } - - if (!sizeof($error)) - { - $server_url = generate_board_url(); - - // Which group by default? - $group_name = ($coppa) ? 'REGISTERED_COPPA' : 'REGISTERED'; - - $sql = 'SELECT group_id - FROM ' . GROUPS_TABLE . " - WHERE group_name = '" . $db->sql_escape($group_name) . "' - AND group_type = " . GROUP_SPECIAL; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error('NO_GROUP'); - } - - $group_id = $row['group_id']; - - if (($coppa || - $config['require_activation'] == USER_ACTIVATION_SELF || - $config['require_activation'] == USER_ACTIVATION_ADMIN) && $config['email_enable']) - { - $user_actkey = gen_rand_string(10); - $key_len = 54 - (strlen($server_url)); - $key_len = ($key_len < 6) ? 6 : $key_len; - $user_actkey = substr($user_actkey, 0, $key_len); - - $user_type = USER_INACTIVE; - $user_inactive_reason = INACTIVE_REGISTER; - $user_inactive_time = time(); - } - else - { - $user_type = USER_NORMAL; - $user_actkey = ''; - $user_inactive_reason = 0; - $user_inactive_time = 0; - } - - $user_row = array( - 'username' => $data['username'], - 'user_password' => phpbb_hash($data['new_password']), - 'user_email' => $data['email'], - 'group_id' => (int) $group_id, - 'user_timezone' => (float) $data['tz'], - 'user_dst' => $is_dst, - 'user_lang' => $data['lang'], - 'user_type' => $user_type, - 'user_actkey' => $user_actkey, - 'user_ip' => $user->ip, - 'user_regdate' => time(), - 'user_inactive_reason' => $user_inactive_reason, - 'user_inactive_time' => $user_inactive_time, - ); - - // Register user... - $user_id = user_add($user_row, $cp_data); - - // This should not happen, because the required variables are listed above... - if ($user_id === false) - { - trigger_error('NO_USER', E_USER_ERROR); - } - - if ($coppa && $config['email_enable']) - { - $message = $user->lang['ACCOUNT_COPPA']; - $email_template = 'coppa_welcome_inactive'; - } - else if ($config['require_activation'] == USER_ACTIVATION_SELF && $config['email_enable']) - { - $message = $user->lang['ACCOUNT_INACTIVE']; - $email_template = 'user_welcome_inactive'; - } - else if ($config['require_activation'] == USER_ACTIVATION_ADMIN && $config['email_enable']) - { - $message = $user->lang['ACCOUNT_INACTIVE_ADMIN']; - $email_template = 'admin_welcome_inactive'; - } - else - { - $message = $user->lang['ACCOUNT_ADDED']; - $email_template = 'user_welcome'; - } - - if ($config['email_enable']) - { - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - - $messenger = new messenger(false); - - $messenger->template($email_template, $data['lang']); - - $messenger->to($data['email'], $data['username']); - - $messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); - $messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']); - $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']); - $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); - - $messenger->assign_vars(array( - 'WELCOME_MSG' => htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])), - 'USERNAME' => htmlspecialchars_decode($data['username']), - 'PASSWORD' => htmlspecialchars_decode($data['new_password']), - 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey") - ); - - if ($coppa) - { - $messenger->assign_vars(array( - 'FAX_INFO' => $config['coppa_fax'], - 'MAIL_INFO' => $config['coppa_mail'], - 'EMAIL_ADDRESS' => $data['email']) - ); - } - - $messenger->send(NOTIFY_EMAIL); - - if ($config['require_activation'] == USER_ACTIVATION_ADMIN) - { - // Grab an array of user_id's with a_user permissions ... these users can activate a user - $admin_ary = $auth->acl_get_list(false, 'a_user', false); - $admin_ary = (!empty($admin_ary[0]['a_user'])) ? $admin_ary[0]['a_user'] : array(); - - // Also include founders - $where_sql = ' WHERE user_type = ' . USER_FOUNDER; - - if (sizeof($admin_ary)) - { - $where_sql .= ' OR ' . $db->sql_in_set('user_id', $admin_ary); - } - - $sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type - FROM ' . USERS_TABLE . ' ' . - $where_sql; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $messenger->template('admin_activate', $row['user_lang']); - $messenger->to($row['user_email'], $row['username']); - $messenger->im($row['user_jabber'], $row['username']); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($data['username']), - 'U_USER_DETAILS' => "$server_url/memberlist.$phpEx?mode=viewprofile&u=$user_id", - 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey") - ); - - $messenger->send($row['user_notify_type']); - } - $db->sql_freeresult($result); - } - } - - $message = $message . '

    ' . sprintf($user->lang['RETURN_INDEX'], '', ''); - trigger_error($message); - } - } - - $s_hidden_fields = array( - 'agreed' => 'true', - 'change_lang' => 0, - ); - - if ($config['coppa_enable']) - { - $s_hidden_fields['coppa'] = $coppa; - } - $s_hidden_fields = build_hidden_fields($s_hidden_fields); - - $confirm_image = ''; - - // Visual Confirmation - Show images - - if ($config['enable_confirm']) - { - if ($change_lang) - { - $str = '&change_lang=' . $change_lang; - $sql = 'SELECT code - FROM ' . CONFIRM_TABLE . " - WHERE confirm_id = '" . $db->sql_escape($confirm_id) . "' - AND session_id = '" . $db->sql_escape($user->session_id) . "' - AND confirm_type = " . CONFIRM_REG; - $result = $db->sql_query($sql); - if (!$row = $db->sql_fetchrow($result)) - { - $confirm_id = ''; - } - $db->sql_freeresult($result); - } - else - { - $str = ''; - } - if (!$change_lang || !$confirm_id) - { - $user->confirm_gc(CONFIRM_REG); - - $sql = 'SELECT COUNT(session_id) AS attempts - FROM ' . CONFIRM_TABLE . " - WHERE session_id = '" . $db->sql_escape($user->session_id) . "' - AND confirm_type = " . CONFIRM_REG; - $result = $db->sql_query($sql); - $attempts = (int) $db->sql_fetchfield('attempts'); - $db->sql_freeresult($result); - - if ($config['max_reg_attempts'] && $attempts > $config['max_reg_attempts']) - { - trigger_error('TOO_MANY_REGISTERS'); - } - - $code = gen_rand_string(mt_rand(5, 8)); - $confirm_id = md5(unique_id($user->ip)); - $seed = hexdec(substr(unique_id(), 4, 10)); - - // compute $seed % 0x7fffffff - $seed -= 0x7fffffff * floor($seed / 0x7fffffff); - - $sql = 'INSERT INTO ' . CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'confirm_id' => (string) $confirm_id, - 'session_id' => (string) $user->session_id, - 'confirm_type' => (int) CONFIRM_REG, - 'code' => (string) $code, - 'seed' => (int) $seed) - ); - $db->sql_query($sql); - } - $confirm_image = ''; - $s_hidden_fields .= ''; - } - - // - $l_reg_cond = ''; - switch ($config['require_activation']) - { - case USER_ACTIVATION_SELF: - $l_reg_cond = $user->lang['UCP_EMAIL_ACTIVATE']; - break; - - case USER_ACTIVATION_ADMIN: - $l_reg_cond = $user->lang['UCP_ADMIN_ACTIVATE']; - break; - } - - $template->assign_vars(array( - 'ERROR' => (sizeof($error)) ? implode('
    ', $error) : '', - 'USERNAME' => $data['username'], - 'PASSWORD' => $data['new_password'], - 'PASSWORD_CONFIRM' => $data['password_confirm'], - 'EMAIL' => $data['email'], - 'EMAIL_CONFIRM' => $data['email_confirm'], - 'CONFIRM_IMG' => $confirm_image, - - 'L_CONFIRM_EXPLAIN' => sprintf($user->lang['CONFIRM_EXPLAIN'], '', ''), - 'L_REG_COND' => $l_reg_cond, - 'L_USERNAME_EXPLAIN' => sprintf($user->lang[$config['allow_name_chars'] . '_EXPLAIN'], $config['min_name_chars'], $config['max_name_chars']), - 'L_PASSWORD_EXPLAIN' => sprintf($user->lang[$config['pass_complex'] . '_EXPLAIN'], $config['min_pass_chars'], $config['max_pass_chars']), - - 'S_LANG_OPTIONS' => language_select($data['lang']), - 'S_TZ_OPTIONS' => tz_select($data['tz']), - 'S_CONFIRM_CODE' => ($config['enable_confirm']) ? true : false, - 'S_COPPA' => $coppa, - 'S_HIDDEN_FIELDS' => $s_hidden_fields, - 'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'), - 'S_TIME' => 1000 * ((int) $config['min_time_reg']), - ) - ); - - // - $user->profile_fields = array(); - - // Generate profile fields -> Template Block Variable profile_fields - $cp->generate_profile_fields('register', $user->get_iso_lang_id()); - - // - $this->tpl_name = 'ucp_register'; - $this->page_title = 'UCP_REGISTRATION'; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php deleted file mode 100644 index 12de817099..0000000000 --- a/phpBB/includes/ucp/ucp_remind.php +++ /dev/null @@ -1,116 +0,0 @@ -sql_escape($email) . "' - AND username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'"; - $result = $db->sql_query($sql); - $user_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$user_row) - { - trigger_error('NO_EMAIL_USER'); - } - - if ($user_row['user_type'] == USER_IGNORE) - { - trigger_error('NO_USER'); - } - - if ($user_row['user_type'] == USER_INACTIVE) - { - if ($user_row['user_inactive_reason'] == INACTIVE_MANUAL) - { - trigger_error('ACCOUNT_DEACTIVATED'); - } - else - { - trigger_error('ACCOUNT_NOT_ACTIVATED'); - } - } - - $server_url = generate_board_url(); - - $key_len = 54 - strlen($server_url); - $key_len = max(6, $key_len); // we want at least 6 - $key_len = ($config['max_pass_chars']) ? min($key_len, $config['max_pass_chars']) : $key_len; // we want at most $config['max_pass_chars'] - $user_actkey = substr(gen_rand_string(10), 0, $key_len); - $user_password = gen_rand_string(8); - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_newpasswd = '" . $db->sql_escape(phpbb_hash($user_password)) . "', user_actkey = '" . $db->sql_escape($user_actkey) . "' - WHERE user_id = " . $user_row['user_id']; - $db->sql_query($sql); - - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - - $messenger = new messenger(false); - - $messenger->template('user_activate_passwd', $user_row['user_lang']); - - $messenger->to($user_row['user_email'], $user_row['username']); - $messenger->im($user_row['user_jabber'], $user_row['username']); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($user_row['username']), - 'PASSWORD' => htmlspecialchars_decode($user_password), - 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k=$user_actkey") - ); - - $messenger->send($user_row['user_notify_type']); - - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); - - $message = $user->lang['PASSWORD_UPDATED'] . '

    ' . sprintf($user->lang['RETURN_INDEX'], '', ''); - trigger_error($message); - } - - $template->assign_vars(array( - 'USERNAME' => $username, - 'EMAIL' => $email, - 'S_PROFILE_ACTION' => append_sid($phpbb_root_path . 'ucp.' . $phpEx, 'mode=sendpassword')) - ); - - $this->tpl_name = 'ucp_remind'; - $this->page_title = 'UCP_REMIND'; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php deleted file mode 100644 index 48176a3989..0000000000 --- a/phpBB/includes/ucp/ucp_resend.php +++ /dev/null @@ -1,165 +0,0 @@ -sql_escape($email) . "' - AND username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'"; - $result = $db->sql_query($sql); - $user_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$user_row) - { - trigger_error('NO_EMAIL_USER'); - } - - if ($user_row['user_type'] == USER_IGNORE) - { - trigger_error('NO_USER'); - } - - if (!$user_row['user_actkey'] && $user_row['user_type'] != USER_INACTIVE) - { - trigger_error('ACCOUNT_ALREADY_ACTIVATED'); - } - - if (!$user_row['user_actkey'] || ($user_row['user_type'] == USER_INACTIVE && $user_row['user_inactive_reason'] == INACTIVE_MANUAL)) - { - trigger_error('ACCOUNT_DEACTIVATED'); - } - - // Determine coppa status on group (REGISTERED(_COPPA)) - $sql = 'SELECT group_name, group_type - FROM ' . GROUPS_TABLE . ' - WHERE group_id = ' . $user_row['group_id']; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error('NO_GROUP'); - } - - $coppa = ($row['group_name'] == 'REGISTERED_COPPA' && $row['group_type'] == GROUP_SPECIAL) ? true : false; - - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - $messenger = new messenger(false); - - if ($config['require_activation'] == USER_ACTIVATION_SELF || $coppa) - { - $messenger->template(($coppa) ? 'coppa_resend_inactive' : 'user_resend_inactive', $user_row['user_lang']); - $messenger->to($user_row['user_email'], $user_row['username']); - - $messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); - $messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']); - $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']); - $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); - - $messenger->assign_vars(array( - 'WELCOME_MSG' => htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])), - 'USERNAME' => htmlspecialchars_decode($user_row['username']), - 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}") - ); - - if ($coppa) - { - $messenger->assign_vars(array( - 'FAX_INFO' => $config['coppa_fax'], - 'MAIL_INFO' => $config['coppa_mail'], - 'EMAIL_ADDRESS' => $user_row['user_email']) - ); - } - - $messenger->send(NOTIFY_EMAIL); - } - - if ($config['require_activation'] == USER_ACTIVATION_ADMIN) - { - // Grab an array of user_id's with a_user permissions ... these users can activate a user - $admin_ary = $auth->acl_get_list(false, 'a_user', false); - - $sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('user_id', $admin_ary[0]['a_user']); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $messenger->template('admin_activate', $row['user_lang']); - $messenger->to($row['user_email'], $row['username']); - $messenger->im($row['user_jabber'], $row['username']); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($user_row['username']), - 'U_USER_DETAILS' => generate_board_url() . "/memberlist.$phpEx?mode=viewprofile&u={$user_row['user_id']}", - 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}") - ); - - $messenger->send($row['user_notify_type']); - } - $db->sql_freeresult($result); - } - - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); - - $message = ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? $user->lang['ACIVATION_EMAIL_SENT_ADMIN'] : $user->lang['ACTIVATION_EMAIL_SENT']; - $message .= '

    ' . sprintf($user->lang['RETURN_INDEX'], '', ''); - trigger_error($message); - } - - $template->assign_vars(array( - 'USERNAME' => $username, - 'EMAIL' => $email, - 'S_PROFILE_ACTION' => append_sid($phpbb_root_path . 'ucp.' . $phpEx, 'mode=resend_act')) - ); - - $this->tpl_name = 'ucp_resend'; - $this->page_title = 'UCP_RESEND'; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/ucp/ucp_zebra.php b/phpBB/includes/ucp/ucp_zebra.php deleted file mode 100644 index fb5df9394b..0000000000 --- a/phpBB/includes/ucp/ucp_zebra.php +++ /dev/null @@ -1,253 +0,0 @@ - array(0), - 'add' => '', - ); - - foreach ($var_ary as $var => $default) - { - $data[$var] = request_var($var, $default, true); - } - - if (!empty($data['add']) || sizeof($data['usernames'])) - { - if (confirm_box(true)) - { - if ($data['add']) - { - $data['add'] = array_map('trim', array_map('utf8_clean_string', explode("\n", $data['add']))); - - // Do these name/s exist on a list already? If so, ignore ... we could be - // 'nice' and automatically handle names added to one list present on - // the other (by removing the existing one) ... but I have a feeling this - // may lead to complaints - $sql = 'SELECT z.*, u.username, u.username_clean - FROM ' . ZEBRA_TABLE . ' z, ' . USERS_TABLE . ' u - WHERE z.user_id = ' . $user->data['user_id'] . ' - AND u.user_id = z.zebra_id'; - $result = $db->sql_query($sql); - - $friends = $foes = array(); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['friend']) - { - $friends[] = utf8_clean_string($row['username']); - } - else - { - $foes[] = utf8_clean_string($row['username']); - } - } - $db->sql_freeresult($result); - - // remove friends from the username array - $n = sizeof($data['add']); - $data['add'] = array_diff($data['add'], $friends); - - if (sizeof($data['add']) < $n && $mode == 'foes') - { - $error[] = $user->lang['NOT_ADDED_FOES_FRIENDS']; - } - - // remove foes from the username array - $n = sizeof($data['add']); - $data['add'] = array_diff($data['add'], $foes); - - if (sizeof($data['add']) < $n && $mode == 'friends') - { - $error[] = $user->lang['NOT_ADDED_FRIENDS_FOES']; - } - - // remove the user himself from the username array - $n = sizeof($data['add']); - $data['add'] = array_diff($data['add'], array(utf8_clean_string($user->data['username']))); - - if (sizeof($data['add']) < $n) - { - $error[] = $user->lang['NOT_ADDED_' . $l_mode . '_SELF']; - } - - unset($friends, $foes, $n); - - if (sizeof($data['add'])) - { - $sql = 'SELECT user_id, user_type - FROM ' . USERS_TABLE . ' - WHERE ' . $db->sql_in_set('username_clean', $data['add']) . ' - AND user_type <> ' . USER_INACTIVE; - $result = $db->sql_query($sql); - - $user_id_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['user_id'] != ANONYMOUS && $row['user_type'] != USER_IGNORE) - { - $user_id_ary[] = $row['user_id']; - } - else - { - $error[] = $user->lang['NOT_ADDED_' . $l_mode . '_ANONYMOUS']; - } - } - $db->sql_freeresult($result); - - if (sizeof($user_id_ary)) - { - // Remove users from foe list if they are admins or moderators - if ($mode == 'foes') - { - $perms = array(); - foreach ($auth->acl_get_list($user_id_ary, array('a_', 'm_')) as $forum_id => $forum_ary) - { - foreach ($forum_ary as $auth_option => $user_ary) - { - $perms = array_merge($perms, $user_ary); - } - } - - $perms = array_unique($perms); - - if (sizeof($perms)) - { - $error[] = $user->lang['NOT_ADDED_FOES_MOD_ADMIN']; - } - - // This may not be right ... it may yield true when perms equate to deny - $user_id_ary = array_diff($user_id_ary, $perms); - unset($perms); - } - - if (sizeof($user_id_ary)) - { - $sql_mode = ($mode == 'friends') ? 'friend' : 'foe'; - - $sql_ary = array(); - foreach ($user_id_ary as $zebra_id) - { - $sql_ary[] = array( - 'user_id' => (int) $user->data['user_id'], - 'zebra_id' => (int) $zebra_id, - $sql_mode => 1 - ); - } - - $db->sql_multi_insert(ZEBRA_TABLE, $sql_ary); - - $updated = true; - } - unset($user_id_ary); - } - else if (!sizeof($error)) - { - $error[] = $user->lang['USER_NOT_FOUND_OR_INACTIVE']; - } - } - } - else if (sizeof($data['usernames'])) - { - // Force integer values - $data['usernames'] = array_map('intval', $data['usernames']); - - $sql = 'DELETE FROM ' . ZEBRA_TABLE . ' - WHERE user_id = ' . $user->data['user_id'] . ' - AND ' . $db->sql_in_set('zebra_id', $data['usernames']); - $db->sql_query($sql); - - $updated = true; - } - - if ($updated) - { - meta_refresh(3, $this->u_action); - $message = $user->lang[$l_mode . '_UPDATED'] . '
    ' . implode('
    ', $error) . ((sizeof($error)) ? '
    ' : '') . '
    ' . sprintf($user->lang['RETURN_UCP'], '', ''); - trigger_error($message); - } - else - { - $template->assign_var('ERROR', implode('
    ', $error)); - } - } - else - { - confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( - 'mode' => $mode, - 'submit' => true, - 'usernames' => $data['usernames'], - 'add' => $data['add'])) - ); - } - } - } - - $sql_and = ($mode == 'friends') ? 'z.friend = 1' : 'z.foe = 1'; - $sql = 'SELECT z.*, u.username, u.username_clean - FROM ' . ZEBRA_TABLE . ' z, ' . USERS_TABLE . ' u - WHERE z.user_id = ' . $user->data['user_id'] . " - AND $sql_and - AND u.user_id = z.zebra_id - ORDER BY u.username_clean ASC"; - $result = $db->sql_query($sql); - - $s_username_options = ''; - while ($row = $db->sql_fetchrow($result)) - { - $s_username_options .= ''; - } - $db->sql_freeresult($result); - - $template->assign_vars(array( - 'L_TITLE' => $user->lang['UCP_ZEBRA_' . $l_mode], - - 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=ucp&field=add'), - - 'S_USERNAME_OPTIONS' => $s_username_options, - 'S_HIDDEN_FIELDS' => $s_hidden_fields, - 'S_UCP_ACTION' => $this->u_action) - ); - - $this->tpl_name = 'ucp_zebra_' . $mode; - $this->page_title = 'UCP_ZEBRA_' . $l_mode; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/usercp_activate.php b/phpBB/includes/usercp_activate.php new file mode 100644 index 0000000000..11f106364c --- /dev/null +++ b/phpBB/includes/usercp_activate.php @@ -0,0 +1,119 @@ +sql_query($sql)) ) +{ + message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql); +} + +if ( $row = $db->sql_fetchrow($result) ) +{ + if ( $row['user_active'] && trim($row['user_actkey']) == '' ) + { + $template->assign_vars(array( + 'META' => '') + ); + + message_die(GENERAL_MESSAGE, $lang['Already_activated']); + } + else if ((trim($row['user_actkey']) == trim($HTTP_GET_VARS['act_key'])) && (trim($row['user_actkey']) != '')) + { + if (intval($board_config['require_activation']) == USER_ACTIVATION_ADMIN && $row['user_newpasswd'] == '') + { + if (!$userdata['session_logged_in']) + { + redirect(append_sid('login.' . $phpEx . '?redirect=profile.' . $phpEx . '&mode=activate&' . POST_USERS_URL . '=' . $row['user_id'] . '&act_key=' . trim($HTTP_GET_VARS['act_key']))); + } + else if ($userdata['user_level'] != ADMIN) + { + message_die(GENERAL_MESSAGE, $lang['Not_Authorised']); + } + } + + $sql_update_pass = ( $row['user_newpasswd'] != '' ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : ''; + + $sql = "UPDATE " . USERS_TABLE . " + SET user_active = 1, user_actkey = ''" . $sql_update_pass . " + WHERE user_id = " . $row['user_id']; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not update users table', '', __LINE__, __FILE__, $sql_update); + } + + if ( intval($board_config['require_activation']) == USER_ACTIVATION_ADMIN && $sql_update_pass == '' ) + { + include($phpbb_root_path . 'includes/emailer.'.$phpEx); + $emailer = new emailer($board_config['smtp_delivery']); + + $emailer->from($board_config['board_email']); + $emailer->replyto($board_config['board_email']); + + $emailer->use_template('admin_welcome_activated', $row['user_lang']); + $emailer->email_address($row['user_email']); + $emailer->set_subject($lang['Account_activated_subject']); + + $emailer->assign_vars(array( + 'SITENAME' => $board_config['sitename'], + 'USERNAME' => $row['username'], + 'PASSWORD' => $password_confirm, + 'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('
    ', "\n", "-- \n" . $board_config['board_email_sig']) : '') + ); + $emailer->send(); + $emailer->reset(); + + $template->assign_vars(array( + 'META' => '') + ); + + message_die(GENERAL_MESSAGE, $lang['Account_active_admin']); + } + else + { + $template->assign_vars(array( + 'META' => '') + ); + + $message = ( $sql_update_pass == '' ) ? $lang['Account_active'] : $lang['Password_activated']; + message_die(GENERAL_MESSAGE, $message); + } + } + else + { + message_die(GENERAL_MESSAGE, $lang['Wrong_activation']); + } +} +else +{ + message_die(GENERAL_MESSAGE, $lang['No_such_user']); +} + +?> \ No newline at end of file diff --git a/phpBB/includes/usercp_avatar.php b/phpBB/includes/usercp_avatar.php new file mode 100644 index 0000000000..5d49f23882 --- /dev/null +++ b/phpBB/includes/usercp_avatar.php @@ -0,0 +1,406 @@ +' . $lang['Avatar_filetype'] : $lang['Avatar_filetype']; + break; + } + + return false; +} + +function user_avatar_delete($avatar_type, $avatar_file) +{ + global $board_config, $userdata; + + $avatar_file = basename($avatar_file); + if ( $avatar_type == USER_AVATAR_UPLOAD && $avatar_file != '' ) + { + if ( @file_exists(@phpbb_realpath('./' . $board_config['avatar_path'] . '/' . $avatar_file)) ) + { + @unlink('./' . $board_config['avatar_path'] . '/' . $avatar_file); + } + } + + return ", user_avatar = '', user_avatar_type = " . USER_AVATAR_NONE; +} + +function user_avatar_gallery($mode, &$error, &$error_msg, $avatar_filename, $avatar_category) +{ + global $board_config; + + $avatar_filename = phpbb_ltrim(basename($avatar_filename), "'"); + $avatar_category = phpbb_ltrim(basename($avatar_category), "'"); + + if(!preg_match('/(\.gif$|\.png$|\.jpg|\.jpeg)$/is', $avatar_filename)) + { + return ''; + } + + if ($avatar_filename == "" || $avatar_category == "") + { + return ''; + } + + if ( file_exists(@phpbb_realpath($board_config['avatar_gallery_path'] . '/' . $avatar_category . '/' . $avatar_filename)) && ($mode == 'editprofile') ) + { + $return = ", user_avatar = '" . str_replace("\'", "''", $avatar_category . '/' . $avatar_filename) . "', user_avatar_type = " . USER_AVATAR_GALLERY; + } + else + { + $return = ''; + } + return $return; +} + +function user_avatar_url($mode, &$error, &$error_msg, $avatar_filename) +{ + global $lang; + + if ( !preg_match('#^(http)|(ftp):\/\/#i', $avatar_filename) ) + { + $avatar_filename = 'http://' . $avatar_filename; + } + + $avatar_filename = substr($avatar_filename, 0, 100); + + if ( !preg_match("#^((ht|f)tp://)([^ \?&=\#\"\n\r\t<]*?(\.(jpg|jpeg|gif|png))$)#is", $avatar_filename) ) + { + $error = true; + $error_msg = ( !empty($error_msg) ) ? $error_msg . '
    ' . $lang['Wrong_remote_avatar_format'] : $lang['Wrong_remote_avatar_format']; + return; + } + + return ( $mode == 'editprofile' ) ? ", user_avatar = '" . str_replace("\'", "''", $avatar_filename) . "', user_avatar_type = " . USER_AVATAR_REMOTE : ''; + +} + +function user_avatar_upload($mode, $avatar_mode, &$current_avatar, &$current_type, &$error, &$error_msg, $avatar_filename, $avatar_realname, $avatar_filesize, $avatar_filetype) +{ + global $board_config, $db, $lang; + + $ini_val = ( @phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var'; + + $width = $height = 0; + $type = ''; + + if ( $avatar_mode == 'remote' && preg_match('/^(http:\/\/)?([\w\-\.]+)\:?([0-9]*)\/([^ \?&=\#\"\n\r\t<]*?(\.(jpg|jpeg|gif|png)))$/', $avatar_filename, $url_ary) ) + { + if ( empty($url_ary[4]) ) + { + $error = true; + $error_msg = ( !empty($error_msg) ) ? $error_msg . '
    ' . $lang['Incomplete_URL'] : $lang['Incomplete_URL']; + return; + } + + $base_get = '/' . $url_ary[4]; + $port = ( !empty($url_ary[3]) ) ? $url_ary[3] : 80; + + if ( !($fsock = @fsockopen($url_ary[2], $port, $errno, $errstr)) ) + { + $error = true; + $error_msg = ( !empty($error_msg) ) ? $error_msg . '
    ' . $lang['No_connection_URL'] : $lang['No_connection_URL']; + return; + } + + @fputs($fsock, "GET $base_get HTTP/1.1\r\n"); + @fputs($fsock, "HOST: " . $url_ary[2] . "\r\n"); + @fputs($fsock, "Connection: close\r\n\r\n"); + + unset($avatar_data); + while( !@feof($fsock) ) + { + $avatar_data .= @fread($fsock, $board_config['avatar_filesize']); + } + @fclose($fsock); + + if (!preg_match('#Content-Length\: ([0-9]+)[^ /][\s]+#i', $avatar_data, $file_data1) || !preg_match('#Content-Type\: image/[x\-]*([a-z]+)[\s]+#i', $avatar_data, $file_data2)) + { + $error = true; + $error_msg = ( !empty($error_msg) ) ? $error_msg . '
    ' . $lang['File_no_data'] : $lang['File_no_data']; + return; + } + + $avatar_filesize = $file_data1[1]; + $avatar_filetype = $file_data2[1]; + + if ( !$error && $avatar_filesize > 0 && $avatar_filesize < $board_config['avatar_filesize'] ) + { + $avatar_data = substr($avatar_data, strlen($avatar_data) - $avatar_filesize, $avatar_filesize); + + $tmp_path = ( !@$ini_val('safe_mode') ) ? '/tmp' : './' . $board_config['avatar_path'] . '/tmp'; + $tmp_filename = tempnam($tmp_path, uniqid(rand()) . '-'); + + $fptr = @fopen($tmp_filename, 'wb'); + $bytes_written = @fwrite($fptr, $avatar_data, $avatar_filesize); + @fclose($fptr); + + if ( $bytes_written != $avatar_filesize ) + { + @unlink($tmp_filename); + message_die(GENERAL_ERROR, 'Could not write avatar file to local storage. Please contact the board administrator with this message', '', __LINE__, __FILE__); + } + + list($width, $height, $type) = @getimagesize($tmp_filename); + } + else + { + $l_avatar_size = sprintf($lang['Avatar_filesize'], round($board_config['avatar_filesize'] / 1024)); + + $error = true; + $error_msg = ( !empty($error_msg) ) ? $error_msg . '
    ' . $l_avatar_size : $l_avatar_size; + } + } + else if ( ( file_exists(@phpbb_realpath($avatar_filename)) ) && preg_match('/\.(jpg|jpeg|gif|png)$/i', $avatar_realname) ) + { + if ( $avatar_filesize <= $board_config['avatar_filesize'] && $avatar_filesize > 0 ) + { + preg_match('#image\/[x\-]*([a-z]+)#', $avatar_filetype, $avatar_filetype); + $avatar_filetype = $avatar_filetype[1]; + } + else + { + $l_avatar_size = sprintf($lang['Avatar_filesize'], round($board_config['avatar_filesize'] / 1024)); + + $error = true; + $error_msg = ( !empty($error_msg) ) ? $error_msg . '
    ' . $l_avatar_size : $l_avatar_size; + return; + } + + list($width, $height, $type) = @getimagesize($avatar_filename); + } + + if ( !($imgtype = check_image_type($avatar_filetype, $error, $error_msg)) ) + { + return; + } + + switch ($type) + { + // GIF + case 1: + if ($imgtype != '.gif') + { + @unlink($tmp_filename); + message_die(GENERAL_ERROR, 'Unable to upload file', '', __LINE__, __FILE__); + } + break; + + // JPG, JPC, JP2, JPX, JB2 + case 2: + case 9: + case 10: + case 11: + case 12: + if ($imgtype != '.jpg' && $imgtype != '.jpeg') + { + @unlink($tmp_filename); + message_die(GENERAL_ERROR, 'Unable to upload file', '', __LINE__, __FILE__); + } + break; + + // PNG + case 3: + if ($imgtype != '.png') + { + @unlink($tmp_filename); + message_die(GENERAL_ERROR, 'Unable to upload file', '', __LINE__, __FILE__); + } + break; + + default: + @unlink($tmp_filename); + message_die(GENERAL_ERROR, 'Unable to upload file', '', __LINE__, __FILE__); + } + + if ( $width > 0 && $height > 0 && $width <= $board_config['avatar_max_width'] && $height <= $board_config['avatar_max_height'] ) + { + $new_filename = uniqid(rand()) . $imgtype; + + if ( $mode == 'editprofile' && $current_type == USER_AVATAR_UPLOAD && $current_avatar != '' ) + { + user_avatar_delete($current_type, $current_avatar); + } + + if( $avatar_mode == 'remote' ) + { + @copy($tmp_filename, './' . $board_config['avatar_path'] . "/$new_filename"); + @unlink($tmp_filename); + } + else + { + if ( @$ini_val('open_basedir') != '' ) + { + if ( @phpversion() < '4.0.3' ) + { + message_die(GENERAL_ERROR, 'open_basedir is set and your PHP version does not allow move_uploaded_file', '', __LINE__, __FILE__); + } + + $move_file = 'move_uploaded_file'; + } + else + { + $move_file = 'copy'; + } + + if (!is_uploaded_file($avatar_filename)) + { + message_die(GENERAL_ERROR, 'Unable to upload file', '', __LINE__, __FILE__); + } + $move_file($avatar_filename, './' . $board_config['avatar_path'] . "/$new_filename"); + } + + @chmod('./' . $board_config['avatar_path'] . "/$new_filename", 0777); + + $avatar_sql = ( $mode == 'editprofile' ) ? ", user_avatar = '$new_filename', user_avatar_type = " . USER_AVATAR_UPLOAD : "'$new_filename', " . USER_AVATAR_UPLOAD; + } + else + { + $l_avatar_size = sprintf($lang['Avatar_imagesize'], $board_config['avatar_max_width'], $board_config['avatar_max_height']); + + $error = true; + $error_msg = ( !empty($error_msg) ) ? $error_msg . '
    ' . $l_avatar_size : $l_avatar_size; + } + + return $avatar_sql; +} + +function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current_email, &$coppa, &$username, &$email, &$new_password, &$cur_password, &$password_confirm, &$icq, &$aim, &$msn, &$yim, &$website, &$location, &$occupation, &$interests, &$signature, &$viewemail, &$notifypm, &$popup_pm, &$notifyreply, &$attachsig, &$allowhtml, &$allowbbcode, &$allowsmilies, &$hideonline, &$style, &$language, &$timezone, &$dateformat, &$session_id) +{ + global $board_config, $db, $template, $lang, $images, $theme; + global $phpbb_root_path, $phpEx; + + $dir = @opendir($board_config['avatar_gallery_path']); + + $avatar_images = array(); + while( $file = @readdir($dir) ) + { + if( $file != '.' && $file != '..' && !is_file($board_config['avatar_gallery_path'] . '/' . $file) && !is_link($board_config['avatar_gallery_path'] . '/' . $file) ) + { + $sub_dir = @opendir($board_config['avatar_gallery_path'] . '/' . $file); + + $avatar_row_count = 0; + $avatar_col_count = 0; + while( $sub_file = @readdir($sub_dir) ) + { + if( preg_match('/(\.gif$|\.png$|\.jpg|\.jpeg)$/is', $sub_file) ) + { + $avatar_images[$file][$avatar_row_count][$avatar_col_count] = $sub_file; + $avatar_name[$file][$avatar_row_count][$avatar_col_count] = ucfirst(str_replace("_", " ", preg_replace('/^(.*)\..*$/', '\1', $sub_file))); + + $avatar_col_count++; + if( $avatar_col_count == 5 ) + { + $avatar_row_count++; + $avatar_col_count = 0; + } + } + } + } + } + + @closedir($dir); + + @ksort($avatar_images); + @reset($avatar_images); + + if( empty($category) ) + { + list($category, ) = each($avatar_images); + } + @reset($avatar_images); + + $s_categories = ''; + + $s_colspan = 0; + for($i = 0; $i < count($avatar_images[$category]); $i++) + { + $template->assign_block_vars("avatar_row", array()); + + $s_colspan = max($s_colspan, count($avatar_images[$category][$i])); + + for($j = 0; $j < count($avatar_images[$category][$i]); $j++) + { + $template->assign_block_vars('avatar_row.avatar_column', array( + "AVATAR_IMAGE" => $board_config['avatar_gallery_path'] . '/' . $category . '/' . $avatar_images[$category][$i][$j], + "AVATAR_NAME" => $avatar_name[$category][$i][$j]) + ); + + $template->assign_block_vars('avatar_row.avatar_option_column', array( + "S_OPTIONS_AVATAR" => $avatar_images[$category][$i][$j]) + ); + } + } + + $params = array('coppa', 'user_id', 'username', 'email', 'current_email', 'cur_password', 'new_password', 'password_confirm', 'icq', 'aim', 'msn', 'yim', 'website', 'location', 'occupation', 'interests', 'signature', 'viewemail', 'notifypm', 'popup_pm', 'notifyreply', 'attachsig', 'allowhtml', 'allowbbcode', 'allowsmilies', 'hideonline', 'style', 'language', 'timezone', 'dateformat'); + + $s_hidden_vars = ''; + + for($i = 0; $i < count($params); $i++) + { + $s_hidden_vars .= ''; + } + + $template->assign_vars(array( + 'L_AVATAR_GALLERY' => $lang['Avatar_gallery'], + 'L_SELECT_AVATAR' => $lang['Select_avatar'], + 'L_RETURN_PROFILE' => $lang['Return_profile'], + 'L_CATEGORY' => $lang['Select_category'], + + 'S_CATEGORY_SELECT' => $s_categories, + 'S_COLSPAN' => $s_colspan, + 'S_PROFILE_ACTION' => append_sid("profile.$phpEx?mode=$mode"), + 'S_HIDDEN_FIELDS' => $s_hidden_vars) + ); + + return; +} + +?> \ No newline at end of file diff --git a/phpBB/includes/usercp_confirm.php b/phpBB/includes/usercp_confirm.php new file mode 100644 index 0000000000..d1be3422e9 --- /dev/null +++ b/phpBB/includes/usercp_confirm.php @@ -0,0 +1,460 @@ +sql_query($sql); + +// If we have a row then grab data else create a new id +if ($row = $db->sql_fetchrow($result)) +{ + $db->sql_freeresult($result); + $code = $row['code']; +} +else +{ + exit; +} + +// We can we will generate a single filtered png +// Thanks to DavidMJ for emulating zlib within the code :) +$_png = define_filtered_pngs(); + +$total_width = 320; +$total_height = 50; +$img_height = 40; +$img_width = 0; +$l = 0; + +list($usec, $sec) = explode(' ', microtime()); +mt_srand($sec * $usec); + +$char_widths = array(); +for ($i = 0; $i < strlen($code); $i++) +{ + $char = $code{$i}; + + $width = mt_rand(0, 4); + $char_widths[] = $width; + $img_width += $_png[$char]['width'] - $width; +} + +$offset_x = mt_rand(0, $total_width - $img_width); +$offset_y = mt_rand(0, $total_height - $img_height); + +$image = ''; +$hold_chars = array(); +for ($i = 0; $i < $total_height; $i++) +{ + $image .= chr(0); + + if ($i > $offset_y && $i < $offset_y + $img_height) + { + $j = 0; + + for ($k = 0; $k < $offset_x; $k++) + { + $image .= chr(mt_rand(140, 255)); + } + + for ($k = 0; $k < strlen($code); $k++) + { + $char = $code{$k}; + + if (empty($hold_chars[$char])) + { + $hold_chars[$char] = explode("\n", chunk_split(base64_decode($_png[$char]['data']), $_png[$char]['width'] + 1, "\n")); + } + $image .= randomise(substr($hold_chars[$char][$l], 1), $char_widths[$j]); + $j++; + } + + for ($k = $offset_x + $img_width; $k < $total_width; $k++) + { + $image .= chr(mt_rand(140, 255)); + } + + $l++; + } + else + { + for ($k = 0; $k < $total_width; $k++) + { + $image .= chr(mt_rand(140, 255)); + } + } + +} +unset($hold); + +$image = create_png($image, $total_width, $total_height); + +// Output image +header('Content-Type: image/png'); +header('Cache-control: no-cache, no-store'); +echo $image; + +unset($image); +unset($_png); +exit; + + +// This is designed to randomise the pixels of the image data within +// certain limits so as to keep it readable. It also varies the image +// width a little +function randomise($scanline, $width) +{ + $new_line = ''; + $start = floor($width/2); + $end = strlen($scanline) - ceil($width/2); + + for ($i = $start; $i < $end; $i++) + { + $pixel = ord($scanline{$i}); + + if ($pixel < 190) + { + $new_line .= chr(mt_rand(0, 205)); + } + else if ($pixel > 190) + { + $new_line .= chr(mt_rand(145, 255)); + } + else + { + $new_line .= $scanline{$i}; + } + } + + return $new_line; +} + +// This creates a chunk of the given type, with the given data +// of the given length adding the relevant crc +function png_chunk($length, $type, $data) +{ + $raw = $type; + $raw .= $data; + $crc = crc32($raw); + $raw .= pack('C4', $crc >> 24, $crc >> 16, $crc >> 8, $crc); + + return pack('C4', $length >> 24, $length >> 16, $length >> 8, $length) . $raw; +} + +// Creates greyscale 8bit png - The PNG spec can be found at +// http://www.libpng.org/pub/png/spec/PNG-Contents.html we use +// png because it's a fully recognised open standard and supported +// by practically all modern browsers and OSs +function create_png($raw_image, $width, $height) +{ + // SIG + $image = pack('C8', 137, 80, 78, 71, 13, 10, 26, 10); + // IHDR + $raw = pack('C4', $width >> 24, $width >> 16, $width >> 8, $width); + $raw .= pack('C4', $height >> 24, $height >> 16, $height >> 8, $height); + $raw .= pack('C5', 8, 0, 0, 0, 0); + $image .= png_chunk(13, 'IHDR', $raw); + + if (@extension_loaded('zlib')) + { + $raw_image = gzcompress($raw_image); + $length = strlen($raw_image); + } + else + { + // The total length of this image, uncompressed, is just a calculation of pixels + $length = ($width + 1) * $height; + + // Adler-32 hash generation + // Optimized Adler-32 loop ported from the GNU Classpath project + $temp_length = $length; + $s1 = 1; + $s2 = $index = 0; + + while ($temp_length > 0) + { + // We can defer the modulo operation: + // s1 maximally grows from 65521 to 65521 + 255 * 3800 + // s2 maximally grows by 3800 * median(s1) = 2090079800 < 2^31 + $substract_value = ($temp_length < 3800) ? $temp_length : 3800; + $temp_length -= $substract_value; + + while (--$substract_value >= 0) + { + $s1 += ord($raw_image[$index]); + $s2 += $s1; + + $index++; + } + + $s1 %= 65521; + $s2 %= 65521; + } + $adler_hash = pack('N', ($s2 << 16) | $s1); + + // This is the same thing as gzcompress($raw_image, 0) but does not need zlib + $raw_image = pack('C3v2', 0x78, 0x01, 0x01, $length, ~$length) . $raw_image . $adler_hash; + + // The Zlib header + Adler hash make us add on 11 + $length += 11; + } + + // IDAT + $image .= png_chunk($length, 'IDAT', $raw_image); + // IEND + $image .= png_chunk(0, 'IEND', ''); + + return $image; +} + +// Each 'data' element is base64_encoded uncompressed IDAT +// png image data +function define_filtered_pngs() +{ + $_png = array( + '0' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A///////////////////olFAkBAAAGDyA4P///M31/////////////wD////////////////0dAgAAAAAAAAAAAAEcPipFGHn////////////AP//////////////6DAAAAAAAAAAAAAAAAAALSEAN+T///////////8A//////////////xAAAAAAAAAAAAAAAAAAAAAACPA/////////////wD/////////////oAAAAAAAAAAAAAAAAAAAAAAAev//////////////AP////////////8oAAAAAAAAPNj/zDAAAAAAAABD//////////////8A////////////1AAAAAAAABjw////5BAAAAAAAADo/////////////wD///////////+QAAAAAAAAbP//////QgAAAAAAAKj/////////////AP///////////1wAAAAAAACs/////8AXAAAAAAAAcP////////////8A////////////OAAAAAAAAND////dNwAAAAAAAABI/////////////wD///////////8gAAAAAAAA4P//7koACwAAAAAAACT/////////////AP///////////wgAAAAAAAD///VqAwaPAAAAAAAAEP////////////8A////////////AAAAAAAAAP/8kQYDavUAAAAAAAAA/////////////wD///////////8AAAAAAAAA/6kNAEru/wAAAAAAAAD/////////////AP///////////wAAAAAAAADAIwA33f//AAAAAAAAAP////////////8A////////////FAAAAAAAADYAI8D///8AAAAAAAAQ/////////////wD///////////8kAAAAAAAAAA2p////5AAAAAAAACD/////////////AP///////////0gAAAAAAAAFkfz////UAAAAAAAAQP////////////8A////////////cAAAAAAAAET1/////7AAAAAAAABo/////////////wD///////////+oAAAAAAAAXfX/////sAAAAAAAAGj/////////////AAAAALgAAAAAAAAwAAAAAAAAAAAAAAD////////////oAAAAAAAACOT////oEAAAAAAAAOD/////////////AP////////////8+AAAAAAAAKMz/zDQAAAAAAAA0//////////////8A////////////7jgAAAAAAAAAAAAAAAAAAAAAAKT//////////////wD///////////VqAwIAAAAAAAAAAAAAAAAAAAA8////////////////AP//////////rQcDaVEAAAAAAAAAAAAAAAAAKOj///////////////8A///////////nblnu/IAIAAAAAAAAAAAAAFzw/////////////////wD////////////79////+iITCAAAAAgSITg////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////w==', + 'width' => 40 + ), + '1' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////8BAAAAAAAP//////////////////AP////////////////////////9sAAAAAAAA//////////////////8A////////////////////////pAAAAAAAAAD//////////////////wD//////////////////////6wEAAAAAAAAAP//////////////////AP////////////////////h4AAAAAAAAAAAA//////////////////8A//////////////////ygJAAAAAAAAAAAAAD//////////////////wD//////////////9x8HAAAAAAAAAAAAAAAAP//////////////////AP//////////////AAAAAAAAAAAAAAAAAAAA//////////////////8A//////////////8AAAAAAAAAAAAAAAAAAAD//////////////////wD//////////////wAAAAAAAAR4AAAAAAAAAP//////////////////AP//////////////AAAAAAA4zP8AAAAAAAAA//////////////////8A//////////////8AAAA4sP///wAAAAAAAAD//////////////////wD//////////////yR80P//////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + '2' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP/////////////////okFAkCAAABCBIfNT///////////////////8A///////////////8hAgAAAAAAAAAAAAAAFTo/////////////////wD//////////////1QAAAAAAAAAAAAAAAAAACjo////////////////AP////////////+MAAAAAAAAAAAAAAAAAAAAADj///////////////8A////////////9BAAAAAAAAAAAAAAAAAAAAAAALD//////////////wD///////////+gAAAAAAAAAHjs+KwMAAAAAAAAVP//////////////AP///////////1gAAAAAAABM/////6QAAAAAAAAU//////////////8A////////////KAAAAAAAALj/////+AAAAAAAAAD//////////////wD///////////+MfGBMOCAI8P/////wAAAAAAAACP//////////////AP///////////////////////////5wAAAAAAAAw//////////////8A///////////////////////////oFAAAAAAAAHz//////////////wD/////////////////////////6CgAAAAAAAAE3P//////////////AP///////////////////////9ggAAAAAAAAAHT///////////////8A//////////////////////+0DAAAAAAAAAA8+P///////////////wD/////////////////////gAAAAAAAAAAAKOj/////////////////AP//////////////////9FAAAAAAAAAAADzw//////////////////8A/////////////////+g4AAAAAAAAAABk/P///////////////////wD////////////////oKAAAAAAAAAAMqP//////////////////////AP//////////////6CgAAAAAAAAAMNz///////////////////////8A//////////////g4AAAAAAAAAFT0/////////////////////////wD/////////////bAAAAAAAAABU/P//////////////////////////AP///////////8wAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A////////////SAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////9wAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////hAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////9AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////xAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + '3' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD////////////////8sGg0FAAAACA4cLz8////////////////////AP//////////////rBgAAAAAAAAAAAAAACTA//////////////////8A/////////////3QAAAAAAAAAAAAAAAAAAASs/////////////////wD///////////+YAAAAAAAAAAAAAAAAAAAAAAjc////////////////AP//////////6AwAAAAAAAAAAAAAAAAAAAAAAGT///////////////8A//////////94AAAAAAAABJDw/8g4AAAAAAAAHP///////////////wD//////////yAAAAAAAACE/////9gAAAAAAAAA////////////////AP///////////NSwiGQ4FOT//////AAAAAAAABD///////////////8A//////////////////////////+YAAAAAAAAVP///////////////wD//////////////////////P/ggAQAAAAAAATM////////////////AP////////////////////9gAAAAAAAAAAAElP////////////////8A/////////////////////0AAAAAAAAAAHLj//////////////////wD/////////////////////OAAAAAAAAAAwkPj/////////////////AP////////////////////8gAAAAAAAAAAAAINj///////////////8A/////////////////////xAAAAAAAAAAAAAAIPD//////////////wD/////////////////////uOz/4HgEAAAAAAAAhP//////////////AP///////////////////////////3wAAAAAAAAw//////////////8A////////////////////////////6AAAAAAAAAj//////////////wD/////////////////////////////AAAAAAAAAP//////////////AP//////////tJh8YEQoDNz//////+AAAAAAAAAY//////////////8A//////////88AAAAAAAAaP//////dAAAAAAAAEz//////////////wD//////////6QAAAAAAAAAdOD/5HQAAAAAAAAApP//////////////AP///////////CgAAAAAAAAAAAAAAAAAAAAAACD4//////////////8A////////////yAQAAAAAAAAAAAAAAAAAAAAEuP///////////////wD/////////////rAQAAAAAAAAAAAAAAAAABJD/////////////////AP//////////////zDQAAAAAAAAAAAAAACTA//////////////////8A/////////////////8BwOCAAAAAUNGi0/P///////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + '4' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////////////////////nAAAAAAAAAD///////////////8A/////////////////////////8AEAAAAAAAAAP///////////////wD////////////////////////gGAAAAAAAAAAA////////////////AP//////////////////////9DAAAAAAAAAAAAD///////////////8A//////////////////////9UAAAAAAAAAAAAAP///////////////wD/////////////////////hAAAAAAAAAAAAAAA////////////////AP///////////////////7QAAAAAAAAAAAAAAAD///////////////8A///////////////////UDAAAAAAUAAAAAAAAAP///////////////wD/////////////////7CQAAAAABMAAAAAAAAAA////////////////AP////////////////xEAAAAAACU/wAAAAAAAAD///////////////8A////////////////cAAAAAAAZP//AAAAAAAAAP///////////////wD//////////////6AAAAAAADz8//8AAAAAAAAA////////////////AP/////////////IBAAAAAAc6P///wAAAAAAAAD///////////////8A////////////5BgAAAAADMz/////AAAAAAAAAP///////////////wD///////////g0AAAAAACk//////8AAAAAAAAA////////////////AP//////////XAAAAAAAfP///////wAAAAAAAAD///////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A////////////////////////////AAAAAAAAAP///////////////wD///////////////////////////8AAAAAAAAA////////////////AP///////////////////////////wAAAAAAAAD///////////////8A////////////////////////////AAAAAAAAAP///////////////wD///////////////////////////8AAAAAAAAA////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + '5' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////////8AAAAAAAAAAAAAAAAAAAAAAA//////////////8A///////////////MAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////////6wAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////////iAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////////9kAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////////0QAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////////IAAAAAAAYP////////////////////////////8A//////////////wAAAAAAAB8/////////////////////////////wD/////////////3AAAAAAAAIj/////////////////////////////AP////////////+4AAAAAAAAoLRYHAAEKGTE//////////////////8A/////////////5QAAAAAAAAQAAAAAAAAAABY9P///////////////wD/////////////dAAAAAAAAAAAAAAAAAAAAAA89P//////////////AP////////////9QAAAAAAAAAAAAAAAAAAAAAABg//////////////8A/////////////zAAAAAAAAAAAAAAAAAAAAAAAADQ/////////////wD/////////////IAAAAAAAAGjY/+h4BAAAAAAAAGz/////////////AP//////////////9NS0lHSc//////90AAAAAAAALP////////////8A/////////////////////////////9QAAAAAAAAE/////////////wD//////////////////////////////wAAAAAAAAD/////////////AP/////////////////////////////8AAAAAAAAEP////////////8A////////////pIRwWEAgDOD//////8wAAAAAAAA8/////////////wD///////////9EAAAAAAAAaP//////ZAAAAAAAAHz/////////////AP///////////6QAAAAAAAAAaOD/4GQAAAAAAAAE4P////////////8A/////////////CQAAAAAAAAAAAAAAAAAAAAAAGD//////////////wD/////////////yAQAAAAAAAAAAAAAAAAAAAAc7P//////////////AP//////////////rAwAAAAAAAAAAAAAAAAAGNj///////////////8A////////////////0EAAAAAAAAAAAAAAAFTo/////////////////wD//////////////////8h4QCAAAAAcQHzU////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + '6' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////////////+0ZCwMAAAUNGjI////////////////////AP/////////////////EMAAAAAAAAAAAAABM6P////////////////8A////////////////lAQAAAAAAAAAAAAAAAAo6P///////////////wD//////////////6wAAAAAAAAAAAAAAAAAAABI////////////////AP/////////////oEAAAAAAAAAAAAAAAAAAAAACw//////////////8A/////////////3AAAAAAAAAoxP/YPAAAAAAAAEj//////////////wD////////////4EAAAAAAACOD////YDCBAVGiAoP//////////////AP///////////7gAAAAAAABY//////////////////////////////8A////////////eAAAAAAAAJT//////////////////////////////wD///////////9MAAAAAAAAvP/IXBgABCx03P//////////////////AP///////////ygAAAAAAADcdAAAAAAAAAAEiP////////////////8A////////////FAAAAAAAAFAAAAAAAAAAAAAAcP///////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAlP//////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAQ8P////////////8A////////////AAAAAAAAAABAyP/kZAAAAAAAAACQ/////////////wD///////////8MAAAAAAAALPj/////WAAAAAAAAET/////////////AP///////////yQAAAAAAACY///////MAAAAAAAAFP////////////8A////////////SAAAAAAAAMD///////wAAAAAAAAA/////////////wD///////////9wAAAAAAAAvP///////wAAAAAAAAD/////////////AP///////////7QAAAAAAACI///////UAAAAAAAAJP////////////8A////////////+AwAAAAAACDw/////2wAAAAAAABY/////////////wD/////////////cAAAAAAAADC8/Ox4AAAAAAAAAKj/////////////AP/////////////oEAAAAAAAAAAAAAAAAAAAAAAk/P////////////8A//////////////+oAAAAAAAAAAAAAAAAAAAABLj//////////////wD///////////////+QAAAAAAAAAAAAAAAAAACQ////////////////AP////////////////+0JAAAAAAAAAAAAAAkuP////////////////8A///////////////////8sGg0FAAADCxgqPz//////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + '7' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAABP////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAy4/////////////wD//////////////////////////+QUAAAAAAAEuP//////////////AP/////////////////////////8QAAAAAAAAKT///////////////8A/////////////////////////4wAAAAAAAB0/////////////////wD////////////////////////cCAAAAAAANPz/////////////////AP///////////////////////0QAAAAAAATY//////////////////8A//////////////////////+0AAAAAAAAeP///////////////////wD//////////////////////CQAAAAAABTw////////////////////AP////////////////////+gAAAAAAAAkP////////////////////8A/////////////////////ywAAAAAABDw/////////////////////wD///////////////////+4AAAAAAAAbP//////////////////////AP///////////////////1wAAAAAAADQ//////////////////////8A///////////////////4DAAAAAAAMP///////////////////////wD//////////////////7QAAAAAAAB8////////////////////////AP//////////////////aAAAAAAAAMj///////////////////////8A//////////////////8oAAAAAAAM/P///////////////////////wD/////////////////8AAAAAAAAET/////////////////////////AP////////////////+0AAAAAAAAcP////////////////////////8A/////////////////4wAAAAAAACY/////////////////////////wD/////////////////WAAAAAAAAMD/////////////////////////AP////////////////80AAAAAAAA4P////////////////////////8A/////////////////xAAAAAAAAD4/////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + '8' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD////////////////////IdDQUAAAEIEiA1P//////////////////AP/////////////////gRAAAAAAAAAAAAAAAROD///////////////8A////////////////0BgAAAAAAAAAAAAAAAAAEMj//////////////wD///////////////AcAAAAAAAAAAAAAAAAAAAAHPD/////////////AP//////////////hAAAAAAAAAAAAAAAAAAAAAAAhP////////////8A//////////////8sAAAAAAAAKMz/zCgAAAAAAAAs/////////////wD//////////////wAAAAAAAADM////zAAAAAAAAAD/////////////AP//////////////BAAAAAAAAP//////AAAAAAAABP////////////8A//////////////8sAAAAAAAAzP///9QAAAAAAAAw/////////////wD//////////////3wAAAAAAAAoyP/YNAAAAAAAAIT/////////////AP//////////////7BgAAAAAAAAAAAAAAAAAAAAc8P////////////8A////////////////xBgAAAAAAAAAAAAAAAAAGNj//////////////wD/////////////////tAQAAAAAAAAAAAAAAACo////////////////AP///////////////HAAAAAAAAAAAAAAAAAAAAB8//////////////8A//////////////9gAAAAAAAAAAAAAAAAAAAAAAB8/////////////wD/////////////wAAAAAAAAABk4P/UWAAAAAAAAATQ////////////AP////////////9UAAAAAAAAaP//////XAAAAAAAAGT///////////8A/////////////xgAAAAAAADg///////cAAAAAAAAJP///////////wD/////////////AAAAAAAAAP////////8AAAAAAAAA////////////AP////////////8AAAAAAAAA4P//////3AAAAAAAAAT///////////8A/////////////ygAAAAAAABg//////9cAAAAAAAALP///////////wD/////////////ZAAAAAAAAABY1P/cXAAAAAAAAABw////////////AP/////////////QAAAAAAAAAAAAAAAAAAAAAAAABNz///////////8A//////////////9gAAAAAAAAAAAAAAAAAAAAAAB0/////////////wD///////////////Q8AAAAAAAAAAAAAAAAAAAAUPz/////////////AP////////////////x4CAAAAAAAAAAAAAAAEIT8//////////////8A///////////////////smFQwGAAAABg0ZKT0/////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + '9' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////////////ysYCwMAAAUNGiw/P//////////////////AP////////////////+4JAAAAAAAAAAAAAAkuP////////////////8A////////////////lAQAAAAAAAAAAAAAAAAAkP///////////////wD//////////////8AEAAAAAAAAAAAAAAAAAAAAqP//////////////AP/////////////8JAAAAAAAAAAAAAAAAAAAAAAQ7P////////////8A/////////////6wAAAAAAAAAfOz8vCwAAAAAAABw/////////////wD/////////////WAAAAAAAAHD/////7BgAAAAAAAz4////////////AP////////////8kAAAAAAAA1P//////hAAAAAAAALT///////////8A/////////////wAAAAAAAAD///////+4AAAAAAAAcP///////////wD/////////////AAAAAAAAAPz//////8AAAAAAAABI////////////AP////////////8UAAAAAAAAzP//////lAAAAAAAACT///////////8A/////////////0QAAAAAAABY//////gsAAAAAAAADP///////////wD/////////////kAAAAAAAAABw5P/IPAAAAAAAAAAA////////////AP/////////////wEAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A//////////////+UAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD///////////////9wAAAAAAAAAAAAAFAAAAAAAAAU////////////AP////////////////+IBAAAAAAAAABw3AAAAAAAACj///////////8A///////////////////cdCwEABhcxP+8AAAAAAAATP///////////wD//////////////////////////////5AAAAAAAAB4////////////AP//////////////////////////////UAAAAAAAALj///////////8A//////////////+kgGxUQCAM2P///+AIAAAAAAAQ+P///////////wD//////////////0gAAAAAAAA42P/EKAAAAAAAAHD/////////////AP//////////////sAAAAAAAAAAAAAAAAAAAAAAQ6P////////////8A////////////////TAAAAAAAAAAAAAAAAAAAAKz//////////////wD////////////////oKAAAAAAAAAAAAAAAAASU////////////////AP/////////////////sUAAAAAAAAAAAAAAwxP////////////////8A////////////////////yHA0FAAADCxktP///////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'A' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD//////////////////+QAAAAAAAAAAAAAAOT/////////////////AP//////////////////kAAAAAAAAAAAAAAAkP////////////////8A//////////////////88AAAAAAAAAAAAAAA8/////////////////wD/////////////////5AAAAAAAAAAAAAAAAADk////////////////AP////////////////+QAAAAAAAAAAAAAAAAAJD///////////////8A/////////////////zwAAAAAAAAAAAAAAAAAPP///////////////wD////////////////kAAAAAAAAAAgAAAAAAAAA5P//////////////AP///////////////5AAAAAAAAAAgAAAAAAAAACQ//////////////8A////////////////PAAAAAAAAAz8HAAAAAAAADz//////////////wD//////////////+QAAAAAAAAAWP9kAAAAAAAAANz/////////////AP//////////////kAAAAAAAAACk/7wAAAAAAAAAhP////////////8A//////////////88AAAAAAAABOz//BQAAAAAAAAw/////////////wD/////////////4AAAAAAAAAA8////ZAAAAAAAAADc////////////AP////////////+EAAAAAAAAAIj///+8AAAAAAAAAIT///////////8A/////////////zAAAAAAAAAA2P////wQAAAAAAAAMP///////////wD////////////cAAAAAAAAACT//////1wAAAAAAAAA3P//////////AP///////////4QAAAAAAAAAAAAAAAAAAAAAAAAAAACE//////////8A////////////MAAAAAAAAAAAAAAAAAAAAAAAAAAAADD//////////wD//////////9wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANz/////////AP//////////hAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhP////////8A//////////8wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAw/////////wD/////////3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADc////////AP////////+EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIT///////8A/////////zAAAAAAAAAAhP///////////2QAAAAAAAAAMP///////wD////////cAAAAAAAAAADM////////////vAAAAAAAAAAA3P//////AP///////4QAAAAAAAAAHP/////////////4DAAAAAAAAACE//////8A////////MAAAAAAAAABk//////////////9cAAAAAAAAADD//////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'B' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAEDh83P///////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAEhP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAeP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAxP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAABY////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAABT///////////8A//////////8AAAAAAAAAAP/////4zEwAAAAAAAAAAP///////////wD//////////wAAAAAAAAAA////////7AAAAAAAAAAQ////////////AP//////////AAAAAAAAAAD////////sAAAAAAAAAEj///////////8A//////////8AAAAAAAAAAP/////4zEQAAAAAAAAAtP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAFz/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAiA/P////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAIjPj//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAGKz/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAJT///////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAABNz//////////wD//////////wAAAAAAAAAA///////sqCAAAAAAAAAAbP//////////AP//////////AAAAAAAAAAD/////////yAAAAAAAAAAs//////////8A//////////8AAAAAAAAAAP//////////AAAAAAAAAAT//////////wD//////////wAAAAAAAAAA/////////7wAAAAAAAAAAP//////////AP//////////AAAAAAAAAAD//////+ikGAAAAAAAAAAY//////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFT//////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsP//////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAADj///////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAc6P///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAATOj/////////////AP//////////AAAAAAAAAAAAAAAAAAAEIEBkkNj///////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'C' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////////////5JRULBAAAAgkTIDQ//////////////////8A////////////////1FAAAAAAAAAAAAAAAABAyP///////////////wD//////////////4gEAAAAAAAAAAAAAAAAAAAElP//////////////AP////////////9wAAAAAAAAAAAAAAAAAAAAAAAAlP////////////8A////////////kAAAAAAAAAAAAAAAAAAAAAAAAAAEyP///////////wD//////////9wIAAAAAAAAAAAAAAAAAAAAAAAAAAAw////////////AP//////////WAAAAAAAAAAAWMz/8JwQAAAAAAAAAACw//////////8A/////////+wEAAAAAAAAAID//////9QMAAAAAAAAAET//////////wD/////////nAAAAAAAAAAo/P///////3wAAAAABDBspP//////////AP////////9gAAAAAAAAAIz/////////3BxQjMT0//////////////8A/////////zQAAAAAAAAAzP///////////////////////////////wD/////////GAAAAAAAAADo////////////////////////////////AP////////8AAAAAAAAAAP////////////////////////////////8A/////////wAAAAAAAAAA/////////////////////////////////wD/////////AAAAAAAAAAD/////////////////////////////////AP////////8cAAAAAAAAAOj///////////////////////////////8A/////////zgAAAAAAAAA0P/////////kIGio7P///////////////wD/////////bAAAAAAAAACg/////////5wAAAAAMHS49P//////////AP////////+oAAAAAAAAAEz/////////PAAAAAAAAAAc//////////8A//////////QIAAAAAAAAALz//////6QAAAAAAAAAAGT//////////wD//////////3AAAAAAAAAADIzo/+SEBAAAAAAAAAAAyP//////////AP//////////7BAAAAAAAAAAAAAAAAAAAAAAAAAAAED///////////8A////////////rAAAAAAAAAAAAAAAAAAAAAAAAAAE0P///////////wD/////////////fAAAAAAAAAAAAAAAAAAAAAAAAJz/////////////AP//////////////iAQAAAAAAAAAAAAAAAAAAASY//////////////8A////////////////yEAAAAAAAAAAAAAAAAA8yP///////////////wD//////////////////9yIUCwQAAAAIEB4yP//////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'D' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////8AAAAAAAAAAAAAAAAADChQkOT/////////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAABGjw//////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAACDY/////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAABjk////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAED///////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAKj//////////wD///////////8AAAAAAAAAAP///+isSAAAAAAAAAAANP//////////AP///////////wAAAAAAAAAA////////hAAAAAAAAAAA2P////////8A////////////AAAAAAAAAAD/////////MAAAAAAAAACQ/////////wD///////////8AAAAAAAAAAP////////+MAAAAAAAAAFj/////////AP///////////wAAAAAAAAAA/////////8gAAAAAAAAAMP////////8A////////////AAAAAAAAAAD/////////5AAAAAAAAAAY/////////wD///////////8AAAAAAAAAAP//////////AAAAAAAAAAD/////////AP///////////wAAAAAAAAAA//////////8AAAAAAAAAAP////////8A////////////AAAAAAAAAAD//////////wAAAAAAAAAA/////////wD///////////8AAAAAAAAAAP/////////wAAAAAAAAABD/////////AP///////////wAAAAAAAAAA/////////9QAAAAAAAAAJP////////8A////////////AAAAAAAAAAD/////////qAAAAAAAAABI/////////wD///////////8AAAAAAAAAAP////////9QAAAAAAAAAHj/////////AP///////////wAAAAAAAAAA////////uAAAAAAAAAAAvP////////8A////////////AAAAAAAAAAD////w0HwEAAAAAAAAACT8/////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAoP//////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAADz8//////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAY6P///////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAKNz/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAACHT0//////////////8A////////////AAAAAAAAAAAAAAAAABg4bKj0/////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'E' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP//////////AAAAAAAAAAD///////////////////////////////8A//////////8AAAAAAAAAAP///////////////////////////////wD//////////wAAAAAAAAAA////////////////////////////////AP//////////AAAAAAAAAAD///////////////////////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////8AAAAAAAAAAP///////////////////////////////wD//////////wAAAAAAAAAA////////////////////////////////AP//////////AAAAAAAAAAD///////////////////////////////8A//////////8AAAAAAAAAAP///////////////////////////////wD//////////wAAAAAAAAAA////////////////////////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'F' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'G' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD//////////////////MB8TCgQAAAACCA4YJzs////////////////AP///////////////JQcAAAAAAAAAAAAAAAAAAhw8P////////////8A/////////////9gwAAAAAAAAAAAAAAAAAAAAAAAk2P///////////wD////////////EDAAAAAAAAAAAAAAAAAAAAAAAAAAc7P//////////AP//////////2AwAAAAAAAAAAAAAAAAAAAAAAAAAAABY//////////8A//////////wwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQ/////////wD/////////kAAAAAAAAAAAEHzQ/P/gmCAAAAAAAAAAAFz/////////AP////////wcAAAAAAAAACjg////////8CwAAAAAAAAgWP////////8A////////vAAAAAAAAAAI2P//////////yBRAcJjI8P///////////wD///////94AAAAAAAAAGD/////////////////////////////////AP///////0AAAAAAAAAAsP////////////////////////////////8A////////IAAAAAAAAADc/////////////////////////////////wD///////8AAAAAAAAAAP///////wAAAAAAAAAAAAAAAAD/////////AP///////wAAAAAAAAAA////////AAAAAAAAAAAAAAAAAP////////8A////////AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAA/////////wD///////8gAAAAAAAAAOD//////wAAAAAAAAAAAAAAAAD/////////AP///////0AAAAAAAAAAtP//////AAAAAAAAAAAAAAAAAP////////8A////////cAAAAAAAAABw//////8AAAAAAAAAAAAAAAAA/////////wD///////+8AAAAAAAAABDs////////////AAAAAAAAAAD/////////AP////////wYAAAAAAAAADz0//////////AAAAAAAAAAAP////////8A/////////5AAAAAAAAAAACCY4P//3KhcCAAAAAAAAAAA/////////wD/////////+CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AP//////////xAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIP////////8A////////////rAQAAAAAAAAAAAAAAAAAAAAAAAAAAGTw/////////wD/////////////vBQAAAAAAAAAAAAAAAAAAAAAADjI////////////AP//////////////8HAQAAAAAAAAAAAAAAAAAEiw//////////////8A//////////////////iwcEAgBAAABCA4aKDk/////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'H' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'I' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'J' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAj//////////////wD//////////+zMrIxwUDAQ//////wAAAAAAAAAIP//////////////AP//////////DAAAAAAAAADo////2AAAAAAAAAA0//////////////8A//////////8wAAAAAAAAAKj///+YAAAAAAAAAFj//////////////wD//////////2gAAAAAAAAAIND/yBgAAAAAAAAAkP//////////////AP//////////vAAAAAAAAAAAAAAAAAAAAAAAAADc//////////////8A////////////MAAAAAAAAAAAAAAAAAAAAAAAUP///////////////wD////////////EBAAAAAAAAAAAAAAAAAAAABjk////////////////AP////////////+sBAAAAAAAAAAAAAAAAAAY2P////////////////8A///////////////EMAAAAAAAAAAAAAAAVOj//////////////////wD/////////////////vHBAIAAAABg8fNT/////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'K' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////8AAAAAAAAAAP//////////wAQAAAAAAAAAAABw////////AP///////wAAAAAAAAAA/////////9AMAAAAAAAAAAAAcP////////8A////////AAAAAAAAAAD////////cGAAAAAAAAAAAAHD//////////wD///////8AAAAAAAAAAP//////6CgAAAAAAAAAAABs////////////AP///////wAAAAAAAAAA//////Q0AAAAAAAAAAAAVPz///////////8A////////AAAAAAAAAAD////8RAAAAAAAAAAAAFT8/////////////wD///////8AAAAAAAAAAP///1gAAAAAAAAAAABU/P//////////////AP///////wAAAAAAAAAA//9wAAAAAAAAAAAASPz///////////////8A////////AAAAAAAAAAD/jAAAAAAAAAAAADz0/////////////////wD///////8AAAAAAAAAAKQAAAAAAAAAAAA89P//////////////////AP///////wAAAAAAAAAABAAAAAAAAAAAFPT///////////////////8A////////AAAAAAAAAAAAAAAAAAAAAAAApP///////////////////wD///////8AAAAAAAAAAAAAAAAAAAAAAAAU8P//////////////////AP///////wAAAAAAAAAAAAAAAAAAAAAAAABk//////////////////8A////////AAAAAAAAAAAAAAAAAAAAAAAAAADE/////////////////wD///////8AAAAAAAAAAAAAAAAoEAAAAAAAACz8////////////////AP///////wAAAAAAAAAAAAAAGNiAAAAAAAAAAIj///////////////8A////////AAAAAAAAAAAAABjY//gYAAAAAAAACOD//////////////wD///////8AAAAAAAAAAAAY2P///5wAAAAAAAAASP//////////////AP///////wAAAAAAAAAAGNj//////CgAAAAAAAAAqP////////////8A////////AAAAAAAAAADI////////sAAAAAAAAAAc8P///////////wD///////8AAAAAAAAAAP//////////QAAAAAAAAABs////////////AP///////wAAAAAAAAAA///////////IAAAAAAAAAATI//////////8A////////AAAAAAAAAAD///////////9YAAAAAAAAADD8/////////wD///////8AAAAAAAAAAP///////////9wEAAAAAAAAAJD/////////AP///////wAAAAAAAAAA/////////////3AAAAAAAAAADOT///////8A////////AAAAAAAAAAD/////////////7BAAAAAAAAAAUP///////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'L' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'M' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//////8AAAAAAAAAAAAAAHz//////3wAAAAAAAAAAAAAAP///////wD//////wAAAAAAAAAAAAAATP//////UAAAAAAAAAAAAAAA////////AP//////AAAAAAAAAAAAAAAc//////8cAAAAAAAAAAAAAAD///////8A//////8AAAAAAAAAAAAAAADw////8AAAAAAAAAAAAAAAAP///////wD//////wAAAAAAAAAAAAAAALz////AAAAAAAAAAAAAAAAA////////AP//////AAAAAAAAAAAAAAAAkP///5AAAAAAAAAAAAAAAAD///////8A//////8AAAAAAAAAAAAAAABc////ZAAAAAAAAAAAAAAAAP///////wD//////wAAAAAAAAAoAAAAADD///8wAAAAACQAAAAAAAAA////////AP//////AAAAAAAAAFwAAAAABPz//AgAAAAAXAAAAAAAAAD///////8A//////8AAAAAAAAAkAAAAAAA0P/UAAAAAACQAAAAAAAAAP///////wD//////wAAAAAAAADMAAAAAACg/6gAAAAAAMQAAAAAAAAA////////AP//////AAAAAAAAAPgEAAAAAHD/dAAAAAAE+AAAAAAAAAD///////8A//////8AAAAAAAAA/zQAAAAAQP9IAAAAADD/AAAAAAAAAP///////wD//////wAAAAAAAAD/bAAAAAAQ/xQAAAAAaP8AAAAAAAAA////////AP//////AAAAAAAAAP+gAAAAAADQAAAAAACc/wAAAAAAAAD///////8A//////8AAAAAAAAA/9QAAAAAAGgAAAAAAND/AAAAAAAAAP///////wD//////wAAAAAAAAD//wwAAAAAFAAAAAAM/P8AAAAAAAAA////////AP//////AAAAAAAAAP//RAAAAAAAAAAAADz//wAAAAAAAAD///////8A//////8AAAAAAAAA//94AAAAAAAAAAAAcP//AAAAAAAAAP///////wD//////wAAAAAAAAD//7AAAAAAAAAAAACo//8AAAAAAAAA////////AP//////AAAAAAAAAP//5AAAAAAAAAAAANz//wAAAAAAAAD///////8A//////8AAAAAAAAA////HAAAAAAAAAAQ////AAAAAAAAAP///////wD//////wAAAAAAAAD///9QAAAAAAAAAEz///8AAAAAAAAA////////AP//////AAAAAAAAAP///4gAAAAAAAAAfP///wAAAAAAAAD///////8A//////8AAAAAAAAA////vAAAAAAAAACw////AAAAAAAAAP///////wD//////wAAAAAAAAD////wAAAAAAAAAOz///8AAAAAAAAA////////AP//////AAAAAAAAAP////8sAAAAAAAc/////wAAAAAAAAD///////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'N' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////AAAAAAAAALD/////////////AAAAAAAAAP//////////AP////////8AAAAAAAAAFOj///////////8AAAAAAAAA//////////8A/////////wAAAAAAAAAASP///////////wAAAAAAAAD//////////wD/////////AAAAAAAAAAAAkP//////////AAAAAAAAAP//////////AP////////8AAAAAAAAAAAAI1P////////8AAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAw+P///////wAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAABw////////AAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAC8//////8AAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAAABzs/////wAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAAAAAFD/////AAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAJz///8AAAAAAAAA//////////8A/////////wAAAAAAAAAUAAAAAAAADNz//wAAAAAAAAD//////////wD/////////AAAAAAAAALQAAAAAAAAANPz/AAAAAAAAAP//////////AP////////8AAAAAAAAA/2wAAAAAAAAAfP8AAAAAAAAA//////////8A/////////wAAAAAAAAD/+CwAAAAAAAAExAAAAAAAAAD//////////wD/////////AAAAAAAAAP//0AQAAAAAAAAgAAAAAAAAAP//////////AP////////8AAAAAAAAA////jAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAD/////RAAAAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAP/////kFAAAAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAA//////+sAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAD///////9kAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAP////////QkAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAA/////////8wEAAAAAAAAAAAA//////////8A/////////wAAAAAAAAD//////////4QAAAAAAAAAAAD//////////wD/////////AAAAAAAAAP///////////DwAAAAAAAAAAP//////////AP////////8AAAAAAAAA////////////4BAAAAAAAAAA//////////8A/////////wAAAAAAAAD/////////////qAAAAAAAAAD//////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'O' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A///////////////////0qGw4HAAAABw4aKT0/////////////////wD////////////////wcAwAAAAAAAAAAAAAAAho6P//////////////AP//////////////uBQAAAAAAAAAAAAAAAAAAAAMoP////////////8A/////////////6AEAAAAAAAAAAAAAAAAAAAAAAAAkP///////////wD///////////+4BAAAAAAAAAAAAAAAAAAAAAAAAAAAoP//////////AP//////////8BQAAAAAAAAAAAAAAAAAAAAAAAAAAAAM5P////////8A//////////9wAAAAAAAAAAAsrPD/7KQsAAAAAAAAAABg/////////wD/////////+BAAAAAAAAAAUPj///////hQAAAAAAAAAAjs////////AP////////+sAAAAAAAAABDw//////////AYAAAAAAAAAKD///////8A/////////2wAAAAAAAAAdP///////////3wAAAAAAAAAYP///////wD/////////OAAAAAAAAAC4////////////xAAAAAAAAAAw////////AP////////8cAAAAAAAAAOD////////////oAAAAAAAAABT///////8A/////////wAAAAAAAAAA//////////////8AAAAAAAAAAP///////wD/////////AAAAAAAAAAD//////////////wAAAAAAAAAA////////AP////////8AAAAAAAAAAP/////////////8AAAAAAAAAAD///////8A/////////xwAAAAAAAAA5P///////////+AAAAAAAAAAHP///////wD/////////NAAAAAAAAAC8////////////uAAAAAAAAAA4////////AP////////9oAAAAAAAAAHj///////////98AAAAAAAAAGT///////8A/////////6gAAAAAAAAAGPD/////////+BgAAAAAAAAApP///////wD/////////9AwAAAAAAAAAUPz///////xcAAAAAAAAAAjs////////AP//////////cAAAAAAAAAAALKjs//CwOAAAAAAAAAAAYP////////8A///////////wFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzk/////////wD///////////+4BAAAAAAAAAAAAAAAAAAAAAAAAAAAoP//////////AP////////////+QAAAAAAAAAAAAAAAAAAAAAAAAAJD///////////8A//////////////+sEAAAAAAAAAAAAAAAAAAAAAyg/////////////wD////////////////oZAgAAAAAAAAAAAAAAARg4P//////////////AP//////////////////9KhsOCAAAAAUMFyc7P////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'P' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP///////////wAAAAAAAAAAAAAAAAAACCxguP////////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAOOD//////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAGOD/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAARP////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAxP///////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAABo////////////AP///////////wAAAAAAAAAA////6JwMAAAAAAAAADD///////////8A////////////AAAAAAAAAAD//////6AAAAAAAAAADP///////////wD///////////8AAAAAAAAAAP//////9AAAAAAAAAAA////////////AP///////////wAAAAAAAAAA///////0AAAAAAAAAAD///////////8A////////////AAAAAAAAAAD//////5gAAAAAAAAAHP///////////wD///////////8AAAAAAAAAAP///9iICAAAAAAAAABI////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAJD///////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAI6P///////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAIT/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAABU/P////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAIhPz//////////////wD///////////8AAAAAAAAAAAAAAAAABCRMkOz/////////////////AP///////////wAAAAAAAAAA//////////////////////////////8A////////////AAAAAAAAAAD//////////////////////////////wD///////////8AAAAAAAAAAP//////////////////////////////AP///////////wAAAAAAAAAA//////////////////////////////8A////////////AAAAAAAAAAD//////////////////////////////wD///////////8AAAAAAAAAAP//////////////////////////////AP///////////wAAAAAAAAAA//////////////////////////////8A////////////AAAAAAAAAAD//////////////////////////////wD///////////8AAAAAAAAAAP//////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'Q' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////SoaDQcAAAAHDhoqPT///////////////////8A//////////////BwDAAAAAAAAAAAAAAACHDo/////////////////wD///////////+4FAAAAAAAAAAAAAAAAAAAABCo////////////////AP//////////nAQAAAAAAAAAAAAAAAAAAAAAAACQ//////////////8A/////////7gEAAAAAAAAAAAAAAAAAAAAAAAAAACg/////////////wD////////wFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzo////////////AP///////3AAAAAAAAAAACyo8P/sqCwAAAAAAAAAAGT///////////8A///////4EAAAAAAAAABM+P///////FQAAAAAAAAACPT//////////wD//////7AAAAAAAAAAFPD/////////9BgAAAAAAAAApP//////////AP//////bAAAAAAAAAB4////////////fAAAAAAAAABk//////////8A//////84AAAAAAAAALz///////////+8AAAAAAAAADT//////////wD//////xwAAAAAAAAA6P///////////+QAAAAAAAAAHP//////////AP//////AAAAAAAAAAD//////////////wAAAAAAAAAA//////////8A//////8AAAAAAAAAAP//////////////AAAAAAAAAAD//////////wD//////wAAAAAAAAAA/P////////////8AAAAAAAAAAP//////////AP//////GAAAAAAAAADg////////////4AAAAAAAAAAc//////////8A//////84AAAAAAAAALT////MJHTo//+8AAAAAAAAADT//////////wD//////2wAAAAAAAAAdP///2AAABCg/3wAAAAAAAAAZP//////////AP//////rAAAAAAAAAAY9P/sCAAAAABMGAAAAAAAAACk//////////8A///////4EAAAAAAAAABU/P+0OAAAAAAAAAAAAAAACPT//////////wD///////94AAAAAAAAAAA4sPD/gAAAAAAAAAAAAABk////////////AP////////AcAAAAAAAAAAAAAAAAAAAAAAAAAAAADOT///////////8A/////////7wEAAAAAAAAAAAAAAAAAAAAAAAAAACQ/////////////wD//////////6wEAAAAAAAAAAAAAAAAAAAAAAAAABSs////////////AP///////////7gUAAAAAAAAAAAAAAAAAAAAAAAAAABAwP////////8A//////////////BwDAAAAAAAAAAAAAAABAgAAAAAAAA8/////////wD////////////////0qGg0GAAAABgwXJjkxBgAAAAAALD/////////AP//////////////////////////////////5DQAAAAk/P////////8A////////////////////////////////////+GwAAJD//////////wD//////////////////////////////////////8A49P//////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'R' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////wAAAAAAAAAAAAAAAAAAAAQgOGSk+P///////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAcuP//////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAEsP////////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ6P///////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAADD///////////8A/////////wAAAAAAAAAA///////svDgAAAAAAAAACP///////////wD/////////AAAAAAAAAAD/////////7AAAAAAAAAAA////////////AP////////8AAAAAAAAAAP/////////cAAAAAAAAABD///////////8A/////////wAAAAAAAAAA//////DQoCQAAAAAAAAAQP///////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAACU////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAIPj///////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAzU/////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAA02P//////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAxctPz///////////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAEDY/////////////////wD/////////AAAAAAAAAAD/9LAsAAAAAAAAAAzc////////////////AP////////8AAAAAAAAAAP///+wkAAAAAAAAADD8//////////////8A/////////wAAAAAAAAAA/////8QAAAAAAAAAAJD//////////////wD/////////AAAAAAAAAAD//////1QAAAAAAAAAFPD/////////////AP////////8AAAAAAAAAAP//////3AQAAAAAAAAAgP////////////8A/////////wAAAAAAAAAA////////aAAAAAAAAAAM6P///////////wD/////////AAAAAAAAAAD////////oCAAAAAAAAABs////////////AP////////8AAAAAAAAAAP////////+AAAAAAAAAAATc//////////8A/////////wAAAAAAAAAA//////////AUAAAAAAAAAFj//////////wD/////////AAAAAAAAAAD//////////5AAAAAAAAAAAND/////////AP////////8AAAAAAAAAAP//////////+CQAAAAAAAAAQP////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'S' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP/////////////////8vHBEIAgAAAQgQHC8/P////////////////8A////////////////pCQAAAAAAAAAAAAAAAAcoP///////////////wD//////////////FwAAAAAAAAAAAAAAAAAAAAAXP//////////////AP////////////9oAAAAAAAAAAAAAAAAAAAAAAAAhP////////////8A////////////zAAAAAAAAAAAAAAAAAAAAAAAAAAI6P///////////wD///////////9cAAAAAAAAAAAAAAAAAAAAAAAAAACA////////////AP///////////xgAAAAAAAAAUOD/8KwkAAAAAAAAADj///////////8A////////////AAAAAAAAAAD0/////8wABCAgICxASP///////////wD///////////8MAAAAAAAAAMz/////////////////////////////AP///////////0AAAAAAAAAACFiQxPT///////////////////////8A////////////oAAAAAAAAAAAAAAAADBwtPT//////////////////wD////////////8QAAAAAAAAAAAAAAAAAAACFTA////////////////AP/////////////oOAAAAAAAAAAAAAAAAAAAAABM6P////////////8A///////////////4fAgAAAAAAAAAAAAAAAAAAAAY2P///////////wD/////////////////7IwwAAAAAAAAAAAAAAAAAAAo+P//////////AP/////////////////////koGw0BAAAAAAAAAAAAACU//////////8A///////////////////////////4uFgAAAAAAAAAADz//////////wD//////////2BgSEA0IBwA6P///////5QAAAAAAAAADP//////////AP//////////JAAAAAAAAACc/////////AAAAAAAAAAA//////////8A//////////9YAAAAAAAAACDo///////AAAAAAAAAABT//////////wD//////////6QAAAAAAAAAACCk7P/snBQAAAAAAAAAUP//////////AP//////////+BAAAAAAAAAAAAAAAAAAAAAAAAAAAACs//////////8A////////////kAAAAAAAAAAAAAAAAAAAAAAAAAAAOP///////////wD////////////8RAAAAAAAAAAAAAAAAAAAAAAAABjc////////////AP/////////////0PAAAAAAAAAAAAAAAAAAAAAAg2P////////////8A///////////////8hBQAAAAAAAAAAAAAAAAMdPT//////////////wD/////////////////+LRwSCAMAAAAHDhoqPT/////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'T' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'U' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////JAAAAAAAAADk/////////+gAAAAAAAAAHP//////////AP////////9MAAAAAAAAAJz/////////nAAAAAAAAABE//////////8A/////////4gAAAAAAAAAHOj//////+ggAAAAAAAAAHz//////////wD/////////0AAAAAAAAAAAIJzs/+ykIAAAAAAAAAAA0P//////////AP//////////QAAAAAAAAAAAAAAAAAAAAAAAAAAAAED///////////8A///////////IBAAAAAAAAAAAAAAAAAAAAAAAAAAE0P///////////wD///////////+YAAAAAAAAAAAAAAAAAAAAAAAAAJj/////////////AP////////////+UBAAAAAAAAAAAAAAAAAAAAASU//////////////8A///////////////IPAAAAAAAAAAAAAAAAAAwyP///////////////wD/////////////////0IxYOCAIAAAEIEiAyP//////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'V' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD//////zAAAAAAAAAAYP//////////////ZAAAAAAAAAAw////////AP//////kAAAAAAAAAAU/P////////////8UAAAAAAAAAJD///////8A///////oBAAAAAAAAADE////////////xAAAAAAAAAAE7P///////wD///////9MAAAAAAAAAHD///////////94AAAAAAAAAEz/////////AP///////6gAAAAAAAAAJP///////////yQAAAAAAAAArP////////8A////////+BAAAAAAAAAA1P/////////YAAAAAAAAABT4/////////wD/////////aAAAAAAAAACE/////////4QAAAAAAAAAbP//////////AP/////////EAAAAAAAAADT/////////OAAAAAAAAADM//////////8A//////////8kAAAAAAAAAOT//////+QAAAAAAAAAKP///////////wD//////////4QAAAAAAAAAmP//////nAAAAAAAAACI////////////AP//////////5AAAAAAAAABE//////9EAAAAAAAABOT///////////8A////////////QAAAAAAAAAT0////9AgAAAAAAABI/////////////wD///////////+gAAAAAAAAAKT///+kAAAAAAAAAKj/////////////AP////////////QIAAAAAAAAXP///1wAAAAAAAAM+P////////////8A/////////////1wAAAAAAAAM+P/8DAAAAAAAAGT//////////////wD/////////////vAAAAAAAAAC8/7wAAAAAAAAAxP//////////////AP//////////////HAAAAAAAAGj/aAAAAAAAACT///////////////8A//////////////94AAAAAAAAHP8cAAAAAAAAhP///////////////wD//////////////9gAAAAAAAAAkAAAAAAAAADk////////////////AP///////////////zgAAAAAAAAQAAAAAAAAQP////////////////8A////////////////lAAAAAAAAAAAAAAAAACg/////////////////wD////////////////sCAAAAAAAAAAAAAAADPT/////////////////AP////////////////9QAAAAAAAAAAAAAABg//////////////////8A/////////////////7AAAAAAAAAAAAAAAMD//////////////////wD//////////////////BQAAAAAAAAAAAAc////////////////////AP//////////////////cAAAAAAAAAAAAHz///////////////////8A///////////////////MAAAAAAAAAAAA3P///////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'W' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//8cAAAAAAAAALz/////4AAAAAAAAAAA6P////+8AAAAAAAAABz//wD//1QAAAAAAAAAjP////+gAAAAAAAAAACo/////4wAAAAAAAAAUP//AP//jAAAAAAAAABU/////2AAAAAAAAAAAGj/////VAAAAAAAAACM//8A///EAAAAAAAAACT/////IAAAAAAAAAAAKP////8kAAAAAAAAAMT//wD///gEAAAAAAAAAPD//+AAAAAAAAAAAAAA6P//8AAAAAAAAAAE9P//AP///zAAAAAAAAAAvP//oAAAAAAAAAAAAACo//+8AAAAAAAAADD///8A////bAAAAAAAAACM//9gAAAAAAAAAAAAAGT//4wAAAAAAAAAaP///wD///+kAAAAAAAAAFT//yAAAAAAAAAAAAAAIP//VAAAAAAAAACc////AP///9gAAAAAAAAAJP/gAAAAAAAAAAAAAAAA4P8kAAAAAAAAANT///8A/////xAAAAAAAAAA8KAAAAAAAAAAAAAAAACg8AAAAAAAAAAQ/////wD/////TAAAAAAAAAC8YAAAAAAAAAAAAAAAAGC8AAAAAAAAAET/////AP////+AAAAAAAAAAIwgAAAAAAAAAAAAAAAAIIwAAAAAAAAAfP////8A/////7gAAAAAAAAANAAAAAAAACwwAAAAAAAANAAAAAAAAACw/////wD/////8AAAAAAAAAAAAAAAAAAAdHgAAAAAAAAAAAAAAAAAAOz/////AP//////KAAAAAAAAAAAAAAAAAC4vAAAAAAAAAAAAAAAAAAg//////8A//////9gAAAAAAAAAAAAAAAACPj4CAAAAAAAAAAAAAAAAFj//////wD//////5QAAAAAAAAAAAAAAABE//9IAAAAAAAAAAAAAAAAkP//////AP//////0AAAAAAAAAAAAAAAAIj//4wAAAAAAAAAAAAAAADI//////8A///////8DAAAAAAAAAAAAAAAzP//1AAAAAAAAAAAAAAABPj//////wD///////88AAAAAAAAAAAAABT/////GAAAAAAAAAAAAAA0////////AP///////3QAAAAAAAAAAAAAWP////9gAAAAAAAAAAAAAHD///////8A////////sAAAAAAAAAAAAACg/////6QAAAAAAAAAAAAApP///////wD////////kAAAAAAAAAAAAAOT/////6AAAAAAAAAAAAADc////////AP////////8cAAAAAAAAAAAo////////MAAAAAAAAAAAEP////////8A/////////1QAAAAAAAAAAHD///////94AAAAAAAAAABM/////////wD/////////jAAAAAAAAAAAtP///////7wAAAAAAAAAAID/////////AP/////////EAAAAAAAAAAT0////////+AgAAAAAAAAAuP////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'X' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////9UAAAAAAAAAKz///////////+sAAAAAAAAAFD/////////AP///////+QQAAAAAAAAFOT/////////8BwAAAAAAAAM5P////////8A/////////5gAAAAAAAAATP////////9kAAAAAAAAAJD//////////wD//////////0AAAAAAAAAAoP//////wAAAAAAAAAA0/P//////////AP//////////2AgAAAAAAAAQ4P////gkAAAAAAAABMz///////////8A////////////iAAAAAAAAABA////dAAAAAAAAABw/////////////wD////////////8MAAAAAAAAACU/9AEAAAAAAAAHPD/////////////AP/////////////IBAAAAAAAAAzYMAAAAAAAAACs//////////////8A//////////////90AAAAAAAAABAAAAAAAAAATP///////////////wD///////////////QgAAAAAAAAAAAAAAAAAAzg////////////////AP///////////////7wAAAAAAAAAAAAAAAAAjP////////////////8A/////////////////2AAAAAAAAAAAAAAADD8/////////////////wD/////////////////7BQAAAAAAAAAAAAEyP//////////////////AP/////////////////gDAAAAAAAAAAAAAjY//////////////////8A/////////////////0AAAAAAAAAAAAAAADj8/////////////////wD///////////////+UAAAAAAAAAAAAAAAAAJD/////////////////AP//////////////4AwAAAAAAAAAAAAAAAAADOD///////////////8A//////////////9AAAAAAAAAAAAAAAAAAAAAQP///////////////wD/////////////nAAAAAAAAAAAWAAAAAAAAAAAlP//////////////AP///////////+QQAAAAAAAAAGD/YAAAAAAAAAAM4P////////////8A////////////TAAAAAAAAAAs9P/0LAAAAAAAAABM/////////////wD//////////6AAAAAAAAAADNT////UDAAAAAAAAACg////////////AP/////////kEAAAAAAAAACg//////+gAAAAAAAAABDk//////////8A/////////0wAAAAAAAAAYP////////9gAAAAAAAAAEz//////////wD///////+oAAAAAAAAACz0//////////QsAAAAAAAAAKT/////////AP//////7BQAAAAAAAAM1P///////////9QMAAAAAAAAFOz///////8A//////9UAAAAAAAAAKD//////////////6AAAAAAAAAAVP///////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'Y' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP///////1QAAAAAAAAAAGj//////////2gAAAAAAAAAAFT///////8A////////5BAAAAAAAAAAAMT////////EAAAAAAAAAAAQ5P///////wD/////////mAAAAAAAAAAAKPj/////+CgAAAAAAAAAAJj/////////AP//////////PAAAAAAAAAAAgP////+AAAAAAAAAAAA8//////////8A///////////YCAAAAAAAAAAE2P//2AQAAAAAAAAACNj//////////wD///////////+AAAAAAAAAAAA4//84AAAAAAAAAACA////////////AP////////////woAAAAAAAAAACUlAAAAAAAAAAAKPz///////////8A/////////////8gAAAAAAAAAABAQAAAAAAAAAADI/////////////wD//////////////2wAAAAAAAAAAAAAAAAAAAAAbP//////////////AP//////////////8BwAAAAAAAAAAAAAAAAAABzw//////////////8A////////////////tAAAAAAAAAAAAAAAAAAAtP///////////////wD/////////////////VAAAAAAAAAAAAAAAAFT/////////////////AP/////////////////oEAAAAAAAAAAAAAAQ6P////////////////8A//////////////////+cAAAAAAAAAAAAAJz//////////////////wD///////////////////9AAAAAAAAAAABA////////////////////AP///////////////////9gAAAAAAAAAANj///////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////8AAAAAAAAAAP////////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////8AAAAAAAAAAP////////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////8AAAAAAAAAAP////////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + 'Z' => array( + 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAQ//////////////8A/////////////////////////1AAAAAAAAAABLz//////////////wD///////////////////////98AAAAAAAAAACY////////////////AP//////////////////////pAAAAAAAAAAAaP////////////////8A/////////////////////8QIAAAAAAAAAET8/////////////////wD////////////////////gGAAAAAAAAAAo9P//////////////////AP//////////////////9CwAAAAAAAAAFNz///////////////////8A//////////////////xMAAAAAAAAAATA/////////////////////wD/////////////////eAAAAAAAAAAAnP//////////////////////AP///////////////5wAAAAAAAAAAHT///////////////////////8A///////////////ABAAAAAAAAABM/P///////////////////////wD/////////////3BQAAAAAAAAALPT/////////////////////////AP////////////QoAAAAAAAAABjg//////////////////////////8A///////////8SAAAAAAAAAAExP///////////////////////////wD//////////2wAAAAAAAAAAKD/////////////////////////////AP////////+YAAAAAAAAAAB8//////////////////////////////8A/////////wQAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', + 'width' => 40 + ), + ); + + return $_png; +} + +// These define base64_encoded raw png image data used +// when we cannot generate our own single png image +function define_raw_pngs() +{ + $_png = array( + '0' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QKCNGXKO6AAAAB3RJTUUH0wUOEDQ6EUG1VwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAXNJREFUeNpj/M9AHGAiUt2wVvhyaqAqKyOjpG3jQwaGv+e+IUn9RwJfSjjg4iwFP1aKJD6HyyErfGGAYrquIoP5E2wK/zigu0v5wH9sChdgeKDqP1aFGhBZmxv/z0Dd4IxV4RWIpMQHIPuJAITzAqEQETx7IFQIP5CQNoJwDmALxzMQCuyjg1chnBPYwtECwr8AZN41h0p6YHOjAkTuwf//77wYuCEcFWwKOWA2fM1iZuuHcASwKYQ55c9ENuasrxgRjKlwJS+D17v/hBUeUGYwv/sfn0IRiJQZJIbxuFEFagjvSlDUQNgK2GIGqpC1JRhIfoAqxBYz0DRhn8IMJO+giKEqhMaMJBeI3AHhIKdkRPqG8DlAifqFADyasKRHO6h1Z/6fMYEwTbCmx3cWGCl8CTaFwBhGz+M2/7EpXMvOnBmIok7jBVaFz/Mi3/1pQORrhpgPyOr+M8IL0j9/gKpeLjhy5QEwoDVsYuRR3cE4IktcAJNx8cJaZBeQAAAAAElFTkSuQmCC', + '1' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QMi//xxVKAAAAB3RJTUUH0wUOEDYLcqnX7wAAAAlwSFlzAAALEgAACxIB0t1+/AAAAHpJREFUeNpj/M9AHGAiUh1WhR8FGUGAsMKaD9iM/I8BlmCVwVS4hoUohT8qcNiFyv2zQIWBCIV3amRwu54RKcDRAgQ1KigIcJYK7CqR3QsCFmf+Y8qgeQakbANMAz6FKjUXECbj8zWa76nm61GFw1UhI10KqVGFNFQIADdK9Zj7PsV9AAAAAElFTkSuQmCC', + '2' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QMwPUBEjoAAAAB3RJTUUH0wUOEDUqFe2UcgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAQxJREFUeNpj/M9AHGAiUt2owkGrkAWF93LFgStPfjCwyGiYRGijqfyPAH9aOJAkQl78RwbICkNQjdB4gUNhD7qzLLAr/CKA4YENSAoRvl7zAUJXvPmxhgfCXILVMxEQvg+IDVUhgtVqDYjkDhD7B2aQIMIx5cOTN29evLAAsaEKObBajQzmQOQMcIQjHLwQgSisIaDwBdS5LHfwK7yhAHVVyX+8CrdAA5HB5gdehQ3Yoxpd4ZcAmDqbD//xKISEIjhU//zHoxDmXQaeFRhOZ8CmzuDOf3wKf8DsDfnyH6/CHJi6P//xKjyDJethVehBpMI7DPgVwrPCCgb8AK5wDwGFcNMF8EkCASOx1QcAGUxu1untnFIAAAAASUVORK5CYII=', + '3' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QMxBQugk2AAAAB3RJTUUH0wUOEDU3duv4qwAAAAlwSFlzAAALEgAACxIB0t1+/AAAATdJREFUeNpj/M9AHGAiUt0IVciCzPm7ZceZB28YGBQkLHwcmNFU/keANRJI4ioH/qMAJIUlaHatwaFwBrqrOO5gVfiCB8P9KVgVVkAtnPDh/wkLCFsGq0IFiGQLiH0D06P/GWHJ7O+NOzfuXLlzQRrEhgSawHscwYPurxAcwQMBf/4/aIAYyHIGr8IEeDhO+Y9XoQNUncwOVHGMRPEDSovc+IkzrpGDCQgUbuC1WgBhhsIHfAp3vPn/oIIFKfRxKQSDGohCA4IKX0DTD7YoRAWMUJ9iyQpbn4DBBWUQ5yFEDDnFw622gXAzwBxoYvfB5sYlUI0lD/4/gWWKJdgU/tHAcKjCD6y+PsGCpo4FJbaRgmcNqkqWCThTzxkTJHXo+Ro1HA9uOPHiATDlKJj4eKCVFIzDqWgGAK7GW/haPS+zAAAAAElFTkSuQmCC', + '4' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QMyqWttCEAAAAB3RJTUUH0wUOEDUxn4hdngAAAAlwSFlzAAALEgAACxIB0t1+/AAAAKBJREFUeNpj/M9AHGAiUh2FCucyQgCK4H9McIAFixwWhQ8kGIhS+MWAgTiFIQzEKWxhIE7hFgbiFF7hASkQIajwjQpInuUAIYV/XMDyU/4TUlgAlk75T0jhArCszR9CCk+AY07mxX8CCp+AY47nzH8CCn+YgOWW/CekMAYsVfMfl0JGmCBq4kNEDp2zAn0UMmItABjRvDykPTO43DgyFQIANP6pTFLWAdoAAAAASUVORK5CYII=', + '5' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QMzPy3XhEAAAAB3RJTUUH0wUOEDUk8lW5dQAAAAlwSFlzAAALEgAACxIB0t1+/AAAAQpJREFUeNpj/M9AHGAiUt2oQuIVfmREBzgU3iHWxAfEKiTaRFpZnfAfAbAr/AsxUYagiVCbeQgqhPpFYmukLCOrZupRNJUIB02BCAjAZCK+/Ed2LoJZgm6bzRfsCgMw3JWAXaEBpg8uIGSRPPMBQmXc+P+iggXCnoOQZUQK1K8PgEAjGcQs7QGL6FzG5mtkcAUiyYIQYcRRUkDTLEIWR1b4ixamQMPhrKUP3rx48eDNFXmwdyFiOthixgXqaTAnBcKpwRaOS6A6Mx78fwBVx/IAm8I/KsTGzAkWNHUyb7Ar/L8GNSlK3MCRev7/v+CApC7kBUoUoAX4yQ0nHjwAWqpiE6GNFgNDoAwHAKC2Q2lMNcCmAAAAAElFTkSuQmCC', + '6' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QNAObRd4vAAAAB3RJTUUH0wUOEDUc2lcB6wAAAAlwSFlzAAALEgAACxIB0t1+/AAAATtJREFUeNpj/M9AHGAiUh2Gwq2puryMjKKmmSfRVf5HBkcMEBI+L1CkUBROYUE2QuMFLoVr0CzzwKHwhQC6szZgV1gAtfHI/xs2mEYywsPxp8QHEMVxQ56B4aaJiIKIiIRCPDZf74DwI/5jB4hwPAChbAgG+BWoExlOxkoysuqW3sUV4BoQ/p0SqARLB44AF4HIByDMKMCuEIu7phCrUOADNl/DgMOJ/09SIMwPC7B5hgfC1/kB4kRAOC7YrFaByM0Ac85AOCLYrFaBhSMIQNPlG2wBDg3HP2CSGU/MuEAoiKVXUWxB9cwPiG8UwEGSg5FCMNOjwZ4/byqgpqwgMoWr/MGeZ1agqWPZgSNz/Z+AqnDCf1wK/29B8qbKDhQpRtTE8HfLjjMP3jDwKJh4hKCGJSPNC6lRhTRWCABWpdoxd/bZ4QAAAABJRU5ErkJggg==', + '7' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QNA18/fMoAAAAB3RJTUUH0wUOEDUVo4u5TwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAM9JREFUeNpj/M9AHGAiUt2oQnorZIGzGLFJIyJ40HqGhUiFPFuQ/YUFPBGBmLcDSQybwj8OEDOW/CegsAeiruQ/AYV3OMDqTP4QUugCceCN/wQUQn1a8Z+Awj8qYHUiHwgpXAAxcMJ/Qgp1wOoEPhBSuANiYM5/QgpjIAovEFL4gweszgAz0NASxZ4vYMqHYDKDBiIWhWhWa0CS1x9CVn+8AaYsmAlZfQRC6RDMChADGTQIKjxDrMI7EEoBi0JGlMJe8AOY+sFOSCEeQHQBAABCZ7xyT9fJhwAAAABJRU5ErkJggg==', + '8' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QNBeBnwpSAAAAB3RJTUUH0wUOEDUOKe5wowAAAAlwSFlzAAALEgAACxIB0t1+/AAAATVJREFUeNpj/M9AHGAiUt1AKmRB459cc+DBGwYWGQ2LEG1Umf/I4IELkozLA2QpFIUXJFDMEDiBQ+EHGTR3yHzArrAFwwct2BXqQGQ1zvw/owFh6mBXCDXmDJB5BsOrjEhxzfoHIgkiGCGB9xtrgEPtOwvEV6FWY4+ZAAgVc5LhZgKEGYI9wN+gBiPu4Pl/BFWlxA1cMfN/C0rUr8AVhX8K0KyuwaEwASNmarAqPACVTXnw/0oENBFewKYQGhYZYE4MVBM2hVAvQ1LhHQhHBVsUMjIgYhCdhy3PPASTd6GOxBYz0KhOQHajDjY3pkC1Rlz5fweqjqEAm8ILGK5gYLlDZICXYI+ZLzZo6gL+4EgUfyo4kJQJtCCpQ8kKQPB2zZ47L14AU5iMgUMAN7IM43AqHwdQIQAhMPz6Gz5V/wAAAABJRU5ErkJggg==', + '9' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QNCQ+T2tEAAAAB3RJTUUH0wUOEDUHUDLIBwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAUZJREFUeNpj/M9AHGAiUh26wr9rE3V5GRlFTTM3/kVT+R8Z7FBBSKjsQJFCUTiFBcWMCbgUHmBBs20FdoV/VNDUMQi8wapwDVS65s2fPToQZgFWhRFIkm8kwGyeH9gUQm2+Aua0QDhb4LJI4XgHQmmDSRMIZw+emIEENAeEcwObQhEIdQHiABRbUGPGBSIQAWL/gHqbB5tnJkC1Fjz5f8IGwxwkhR8EsCQarFE4hViF/wsQCgKgHsSu8H8HLFkUQL2rgUPh/zslOiwMEjFH/kND2geXQvQgqMAWhSjgAIRygAswIuXCpXfevHjz4M0ZdQaGhxo/wAnyBTuWmPnvARGxuPH/iAa+9Ph/A7r9Ai+wK/zvg6ZwzX8cCl9oICtjmfIfl8L/bwIQ6gyO/Met8P//EwUmwHTJo5OyBU2CkdaF1KhCWisEAM/sJxmZkdWnAAAAAElFTkSuQmCC', + 'A' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QFwy1U7TfAAAAB3RJTUUH0wUOEC0ZKCZtPQAAAAlwSFlzAAALEgAACxIB0t1+/AAAAO1JREFUeNrt1LERwiAUBuAHZ2GRwsIypQMwQEZwgBQpM4QDZBSLFI7gCA5gQWGRdA5gkTuMSh48eMTUnq96wH98B+QiDCwruTD3D76qF676ueAp0Y9lSBXeSkFWaLAje3T+kkzK4SgpBzZw8pqxJWcdOJuRsyGPbWDk0tS20zw9SXsobdfytJVXdzNsP61i6Zt3K7Ht0UeUgbPdjsrOXMd+2IS2C2qb271HVWi7YANcNXFQsUEVBTXwNdl46jYRxPl52dnwRUZbhkLSDmS8DnxFRWiULxg8UxvobefuRR8ZQYDKtffVVcQWv/RrfgJC4bd0upw4MQAAAABJRU5ErkJggg==', + 'B' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QGAusrz2zAAAAB3RJTUUH0wUOEC01Gv4B3gAAAAlwSFlzAAALEgAACxIB0t1+/AAAANJJREFUeNpj/M9AHGAiUh0tFTKiAUHL2rsoKv9DARZDWFr+IwA+hQwMFcQqZDhCrMIIYhWK4FYIYv8444PuV+wK//9/A+UJwBUSCHAL3OEIsdoFyttCpGdiiAtHjoY/RCnk6PlBbBRKrCE6CqcQq5DlDs5whIT3CgUI788EvOEIBCegXB2YPCNMBSNMISqf5TeUjysK90LpP/itfrFEAhZCMHkWdKMYUbk2MAah7BqD02pUYEFkgMu8IE6hD0IdpmegwSejoKLjoY7syaFU7A0HhQA2e4cJytImvAAAAABJRU5ErkJggg==', + 'C' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QGBbPqVFqAAAAB3RJTUUH0wUOEC4BEGemqAAAAAlwSFlzAAALEgAACxIB0t1+/AAAASlJREFUeNpj/M9AHGAiUt2owkGrkAWV+3TDgRtPPjBwyGiYBOijSv1HAlcCkGUcTiDLISvsQDOeZQp2hQWYDpuCTeEEbD44ganwDgc2vxpgKoyAyUWc+f9hjgCMtwFd4RuYRxog/ueBcl3QFc6BSmj8gfBrwE40yFmCrjABqrAH5mSZgJ4jX7AEjwlU4Zn/OAAsrp9AaRlccc0IzdeMsBilOPWQrBDmtpfEKnwBpZ8qZq58i6IS6vscKHcBcgQYlOz4gh6OK6AKfaB8G5hN6Aq/wBLPHjB3CczCFIzUA0u2PD0v/j9pgaf1ExgK3wgwYAEOWFL4GizqWC5gyzM1mArnEJkLZ2DPhf//n3BAVmeDkq8ZUZPL3TUn7gBLCgYFBYsAcxQZRmKrDwABNsv9SJSDwwAAAABJRU5ErkJggg==', + 'D' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QGC1+orhOAAAAB3RJTUUH0wUOEC4yr7fHvgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAM9JREFUeNpj/M9AHGAiUt1AKmSBsxiRhXlkNBxCpFFU/ocBTDMyPvxHADwKGRgUbhCpkEHiCZEKGRyIVciwArdCIPPFGg8YzwSvQiBogXFvEFD43wDKnQDl44yZGCh9glAU2sCsJqRQBkq/gMUw3G2wuP6PnU/H9PgRSgsQUvgESosQUngFSqsQUrgCSsNiCFcU7oBx9+CL6w8XamB5SeUPkelxAZEJ1+YPcQolXhCXFTTuEJULOUq+IOVrFgasQELBxMaHG1mEcTiVjwOoEADAIkCnGpmJKgAAAABJRU5ErkJggg==', + 'E' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QGDeDwEE0AAAAB3RJTUUH0wUOEC8CkHXGUwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAD5JREFUeNpj/M9AHGAiUt2owkGrkAXGYMQqjUgJQ8EzpPsa05+D140oMYTk4KEQ4MMqZqgUhcM1czESW30AABfqB1XDnLzcAAAAAElFTkSuQmCC', + 'F' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QGQe8AkDZAAAAB3RJTUUH0wUOEC8JB6cf2wAAAAlwSFlzAAALEgAACxIB0t1+/AAAADlJREFUeNpj/M9AHGAiUt3wUsiCYDJikUYE3lDwDDm+xvTp4HUjIoaQXTsUAnxYxcyoQryAcUSWuAAW/gZTg/yEMAAAAABJRU5ErkJggg==', + 'G' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QGRFI1vWIAAAAB3RJTUUH0wUOEC8QY8y3GwAAAAlwSFlzAAALEgAACxIB0t1+/AAAASZJREFUeNpj/M9AHGAiUt0IVciCwvt7ZM+FOy8+MDBwSEho2AQII8v9R4A/U2RQtHEUfEBIIim8YYBhn8oNLAqP8GBxmcwbDIU3sKljYIhAV/jHgAE7uICmcAJMQqDmwp//D2YowPgxqAr/wPyr8QAi8EEHwleIQFW4BxYicG+eEHEomHECET5QhRVQhQn/cQFoFJ6AKgwgFNcPoFwdnAoZIXmGERahKDwkIdqlR1j4PiRW4RVCCmExvQenQrSYEXiDiAoUBfC4loAK23yBSnzArhCRehRmAJPFnRUxHDgU/lDA7zZECj/Cgl2dAkaeWYNVZcoHDIX/94hgKLM4gS27/v9QIICizGMDkiQjSon7c8eBCw+e/GFgkZEwsHCRRpZiHE5FMwCa2YE+WcAOUwAAAABJRU5ErkJggg==', + 'H' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QGRw2Z4k1AAAAB3RJTUUH0wUOEC8agxleBQAAAAlwSFlzAAALEgAACxIB0t1+/AAAAD1JREFUeNpj/M9AHGAiUt2oQvyABUozQml4+KMLDAXPDAWFLGh8RlwKh4JnaB88GOlxELhxVCFewDgEynAAN2sFVHAvevkAAAAASUVORK5CYII=', + 'I' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QGSlg1E0WAAAAB3RJTUUH0wUOEC86uHd+zQAAAAlwSFlzAAALEgAACxIB0t1+/AAAAD5JREFUeNpj/M9AHGAiUt1AKmRBMBkxJJE9OhQ8Q32FjGhxDQsjjCQwFDwzqnCwKkRKZqO5EBMwDqcSl2iFAMMeB0s/kLo2AAAAAElFTkSuQmCC', + 'J' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QGywiiNsbAAAAB3RJTUUH0wUOEDAFw0tdbgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAKdJREFUeNpj/M9AHGAiUh3xClmwijJCaSR3Ud/qUYWjCklTyIHEhifctw8ePHgCxO+B7L9QMQlsChW+QOiX4gwMd6BiItisVoHSB6AYWQwM/kNBBszkC/9PwKyc8B8B4Ar3YPHMHWwK/xtgqAv4j1XhEfScK/EEu8L/a1BVStz4j0Ph/yPItoe8QFH3nxGlkNq75cKDB0DDVBwitNEcwjhwpdmoQrwAAN6ioiFapgUdAAAAAElFTkSuQmCC', + 'K' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QHAEoFhGpAAAAB3RJTUUH0wUOEDANzZDVXAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAPZJREFUeNpj/M9AHGAiUt2owgFSyAgFMOGDrDARxkKo0H8wYEDh/b/AAzepACqEVeEdCQx1WBW+0ICry/mPR+EXE7i6kD94FP5xwaYOi8IIrOowFRbA1Xkgq8NQ2ANXZ/PlPx6FS3CpQ1fIAmOIoKn7jxbXf2CMNxvQIxvVRAQQ+YDXaiSQQqxChiOEFGoIQGidP/gVStxogLI68CqUuPH/BzSVcTzAoxCo7v//ObBIxK0QrO7/H1iCXIFT4QkIFxbaMh9wKYQJO0D5OYQUnoDF/QkCCuHJ1+APAYV3YOloAgGF8JTO84SAwjfQiGQIgPAZqV4rAACnKSarzdlc4gAAAABJRU5ErkJggg==', + 'L' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QHA64qQw4AAAAB3RJTUUH0wUOEDAXMPIsJgAAAAlwSFlzAAALEgAACxIB0t1+/AAAADlJREFUeNpj/M9AHGAiUt2QUMiCYDJCaezhMBQ8M6pwVCEdFLJgCjEisRH5Zyh4hvoKGUdkQUq0QgARaARRV9jUFQAAAABJRU5ErkJggg==', + 'M' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QHBhMfblpAAAAB3RJTUUH0wUOEDAqaJpgNwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAPNJREFUeNrdlK0OgzAUhS8bCQYxMYmcmEAgEAgejQfZQyG2pAIxOYlATkAu691o2tvSYia2iv7lyzn3NG0jhG1tt5H7Aggom7ZuaKPhBFqKV+pFWDGjjcxStEAYXuvBkrKtoVX+gdRiK9i6sxjgeVGUMJzWwZLACaZOTqoAOAronmrlBuvPkQsIgHn8BqnE2AMmhaaYJ57jqTRFMwsDyW249XaJLhAujizm7UFM5XCUXTqiTvBLQYWRc7H3WWt+3NmlyGbOGh9q/45mjQxUb+CA6A2jSqu5MweX0ooQWLJxLYx6fz0GwmBOsww5GP3At/dX4Ayb7qpFI9y5ygAAAABJRU5ErkJggg==', + 'N' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QHC6DxyzwAAAAB3RJTUUH0wUOEDAye/b4YQAAAAlwSFlzAAALEgAACxIB0t1+/AAAALRJREFUeNpj/M9AHGAiUt0IV8gIARsRMlAROP8/BEB5Ii/+/0cVgXNRhRk8iFXIMIFYhRxXiFTIYPCDSIUMBcQqZNhDrEKZN0QqZAggViHDHIIKRSAUzx1CCrdAaZM/BBT+z4Eyaggp/KEDYbAcIaDw/wUWCEuBkML/PagBgFvhfxdiFT4RIVLh/zXEKvyfQqzCLypEKvx/hoVIhf9biFX4x4ZIhf8fCBCp8P8KNBHG4VQ0AwDEOyeZhO5p1AAAAABJRU5ErkJggg==', + 'O' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QHQExDSDoAAAAB3RJTUUH0wUOEDA4myMRfwAAAAlwSFlzAAALEgAACxIB0t1+/AAAATtJREFUeNpj/M9AHGAiUt3wUsiCyv265ciZJ08YGGRkDGwCuFGk/iOBDwU8SDIcGS+Q5JAV7hBBs45nAVaFC1gwXTYBi8IdWNQxMCzAUPhBBJs6Bp4n6AoLYFI6az78f7NEB8ZNQFP4QwAqEfADwg+A+f0NqsI1UHGBDzCnSKC6EhYzB6B0Cj+UwZ+CKgNTeAZKu8C94QGlL6DGjAyU+wAeXC+gIiIQLiM0KzDC9CFCBlWICsnsL3aFMDc+hcs8QZWBKYSF2g24whvYFZpA6T1whUegNCwyoYGxAmYyLGZ+wOxYghqFX2BpO+APmP8nBspHj2uk1LPizf8PGyxgXPTUQ3x6JDqF//8/AYs6bHkGmCYF0O3FnguBCSaFA0kZS8IDJDlG1IIUVFK8eABMWzI6DgHCyDKMI7LEBQCD5YgI9wbKGgAAAABJRU5ErkJggg==', + 'P' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QHQvR2Mn2AAAAB3RJTUUH0wUOEDEDMzPJGgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAKVJREFUeNpj/M9AHGAiUh05ChlRAKdu4k5Ulf9hANMQiwf/EQCfQgaJB0QqZHAhViHDEbg0AV8vwRM8QN0v5vBAOSfw+BrMWQDl8MClGeEKGGEKQcRXHmQemTGD1RMy+N14o4MDyvGAS7NgGMaIzPHAYyIy4HhBZMy0EBmFIX+IUsjRgqQOi2fAgEVBwyVGGEUEQw2O3EbLzDWSFDIOhtJsVCEWAAC/Yt2X+2PYcgAAAABJRU5ErkJggg==', + 'Q' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QHRxSC0wxAAAAB3RJTUUH0wUOEDEKSu9xvgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAW1JREFUeNpj/M9AHGAiUt2QUMiCzPm65cCZF08YGGRkDBx8uNFU/oeDDwU8SOIcBS/+IwOEwh0iaEYIrMCqcA4LprsmYFG4A4s6BoYFGAo/iGBTx8DzAl1hAUxKZ8WH/29W6MC4KWgKfwhAJXx+gPl/QmB+/4KqcANUXOQDVPiLBFRkCUwhJGb2wGzihzK4U6CMA6hReAbKc4F7wwFKX0CNGRkoB+HJJ1ARGZgAIziFM8J0IUIGXYjMZPaXkEJYYDyBiz+EuRFVoQKUdwWIz6qWvmRguAMVkUBVaIIUalPu9GgshIefAWrwrIHp//L/DQc4KjFiBi2uQ/7832KB5AX0uP5fAZOx2PDhfwNCIXrq+f9BhgEb4HmCkcL3YE3hSHkBnmfWYFMpsoaYXAgGDgcwFKLlaxYOCG2DqRCYrldkmIACUMIgZsaTI5Cg3IBNISp4AoovlT+EFf7/kYPkb3wK//8/YAGPGcYhUIYDAHBC9Yak1w7iAAAAAElFTkSuQmCC', + 'R' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QHSkEuIgSAAAAB3RJTUUH0wUOEDEUsOBM3QAAAAlwSFlzAAALEgAACxIB0t1+/AAAAOZJREFUeNpj/M9AHGAiUh0NFLJAaUY0YRkJHYcQdmSh/xCAzRCZHf8RAJ9CBpYNRCpkEHgBV4jfMx+mEOVGIDDAaTWY82aPBZTLgV8hUCkaH6cbP8B8gxHgyODjgwstMDfiVIgWQyFE+lrhB3EBznOFuJgxuUFMXPPEbPmDpA53FH55osKMIoAe4F826MDMvPMfj9WgWFGBBeIf/Ar/H4FxJhBQ+B8WzCIfCCi8A4uvBgIK/2fA/POCgMIXHFBuDqH02ABLM3cIKPwgAuVHEFD4fwJM4AIBhT9goe4AFWAcAsXesFIIAEvJyZHTCSiTAAAAAElFTkSuQmCC', + 'S' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QHTRnvuTLAAAAB3RJTUUH0wUOEDEbIF9RTAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAVZJREFUeNpj/M9AHGAiUt2oQvyABYX398CWK3de/GBgkVEw8HFgRpH7jwSWqCDLyCxAlkNS+CcG3boY7AozMB3Wgk3hGSw+4HgBl0b4egIWhT9mYPGMBFQg4MH/D2tgvrKASzPC0yMjlP7CDSTOmrDIMDDwiHBsxzSRBypw5j9WgFDoAPNAxIQjX/ApXIDsC4OCLV9wKfzjwIACOEIO4IiZFxbooePzAqvC/z9qONBUStzAqvD//zc9BqgqNX5gVwgETxbkmCClvSk4FYLdsCMCptAGI2YSGV78+PLmz5MX4mDu1ByIMM9n9JiBxe4caGChy8MZMMsUIEFyAMoVwVC4BGaEwpI3/9/MEYGlJQyFPwQYsIE1mL7GlnCR0iNSXLtgqpO4gy1mvtigq1NAxCBKgP9pEUFWxlOCnNIYUYrmn3v23Ljx5gsw88sYOPhwI0sxDoEyHAABtSc836a1EQAAAABJRU5ErkJggg==', + 'T' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QHgUdTbcyAAAAB3RJTUUH0wUOEDEgkVS4aAAAAAlwSFlzAAALEgAACxIB0t1+/AAAADdJREFUeNpj/M9AHGAiUt0IVcgCpRlxyMODeSh4hmiFjGipB+Z7jEQ1FDwzqnBU4WBSyDicimYAb/AFTaJpyH8AAAAASUVORK5CYII=', + 'U' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QHhEHl2NPAAAAB3RJTUUH0wUOEDEon48wWgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAKlJREFUeNpj/M9AHGAiUh3xClmgNCOUhrsEXYD6Vo8qHFVIuUIVKP0USr+E0jLoCjWg9A4ovQVNHJjUIaADZsILMPeFApRfA5X/D1N4AaZRYc6b/2+WwNQxXEBX+N8Bqxcc/mMoPMGCRR3LBUyF/2dgUTjjPxaF/6egm8ky5T9Whf9P2KCoMziBJPefEaWQurjnzIMXL34wsMhoWHiYo2hjHLjSbFQhXgAAKzejCLAOcVMAAAAASUVORK5CYII=', + 'V' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QHh/gL05IAAAAB3RJTUUH0wUOEDEuduyVbwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAVNJREFUeNpj/M9AHGAiUt2owoFRaMgIAYlIMqlQMUMo/z8ITIByRP78hwMRqNgECBei8AULVPQIXN0RqAjLGwgfYrW4B1R4DdzmLVDaQxjZ6v8roDwVuIkqMK3/ka3+/0MAKn4FKn4D5uof/5GtZmCPgEpsQHNDBDsDitVwt5tA+RZQ/pn/qFYj3PQEzHsC5WnA3QyPmQQU3+5AE0VYDTfDBcxzgQbik/8YVv93gMp9AbK/cEAD8T+m1TBb/oD8veEHhs0IE2GmxADZMRAmz4//WKxGkv3DA2Gm/MeqcA/Ujj1w1hHsCv/LQKQz/megRzyawgqIvAxMRwsuhbCEAEvGT3AphEUwNCU5IEv9R8lcUH9/wAxE5HAEgjccSBI8X3CbKOyBxAnhxm3i/w1IEgdQZFA98/+PCFydDKo6VKsZmGPQ0wgOq/+fgYvfQTORkeq1AgCIAvD7+THsDgAAAABJRU5ErkJggg==', + 'W' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QFhZRKnzkAAAAB3RJTUUH0wUOEDIR66frkQAAAAlwSFlzAAALEgAACxIB0t1+/AAAAXNJREFUeNrtlK1ywkAUhZdMZsJMKyIqKhAIBAKBiEBEVCDyCJV9iIo+Do9QGRERgUBEVCAqKhAIREVERURnTvfn3t27xSA6g+kOQ/ZkP/aec5NlBHXZSC7k/sE/AhUwoVkDPQ58/2RUQ2IC6B1XpN7MV8tg62/pUdjSDO7OwR2J0pbekpqZYlMG50bNSGwBDQ4pyV5YtCZ7mqZf1mO2IN2Jynba0XRx49pThjQCbEKWFfVRpIlBzlK4PuLdpxEWlTr4LHvYMEDOaTYS3HCW3DAJt8mmaSXYchZbOfEzkyYGZRbrEbX8qe7GMpLqFeyxV9F4fon1pwcxjxbqJpJTBPBJLoyHYSz1I3xq78aOMssepHZZHFjKhbX9/AZd6e9bsdABeyHTQXiE2PLO6PugCwiP/r1QVLYSlpXwKE1Wno7b7jY+hoWj0aegPyA9+jPrzgqwZJ0j8hhMVtElmDoD19FFPAvamc+sOXBm+KdYEzC63p/9D7Tr72kj/8qjAAAAAElFTkSuQmCC', + 'X' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QHi/G9n7kAAAAB3RJTUUH0wUOEDIXAsROpAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAT9JREFUeNpj/M9AHGAiUt3IVhjKCAFr4RJroSKBMIH/YPBEAMITeQLh//8gAxHggQlAFf6fAdXnA+WnQPkT/qMp/O8AlVkA5h2A8kz+YCi8wQGREngA5PxQgXBYzvzHUPi/A2qIA5BdAmUX/Mei8I8BVHbK/wssEJbMB2wK/5+ASvPcgGlZ8x+rQriFAmghgKHwiwJKXPA8wKXw/x4UhT3/cSr8n4CkzuAPHoVvRODqWE6gyPxHTT1ffiAUCjCgAhRtDkgSFnisnoJixAScCh/wEBk8DmiucsChcA5MQQSMMQWrQlgiZ0iAByey5QiFPlBZnS//v+hgxjZc4QKYKVeAnCswby3AUAi3eAGKNoEn6Ap94A5EjXUfNIUrEA6EALgzl6AohCUGsAMhAOZMkTfICkMw3I5wZgiEyzicimYAFRFkVwgDfJ0AAAAASUVORK5CYII=', + 'Y' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QHjkyIsu1AAAAB3RJTUUH0wUOEDIkvRQvsgAAAAlwSFlzAAALEgAACxIB0t1+/AAAANJJREFUeNrt1L0NgzAQBWAcUVB6AAZgBAoKhmAICoZgCAoKxmAECkbwABSUlBRILwF8duwYhFJEihJ37+6T5T9g8K6N20X3FdDDNjKKOeTIqZLtWcKBU73bCx1lPhgQNTWieY1zRLmGCZFQp1xTSSmBDUUgW754BF+GQLxAPUkMxMb0FlzUsqpKLXhxQPRqo+oIerggCvuMC7jhFJounA4gWhO2OIL6Jp/uzglHrh0fTyAaDRucQaTkUpxDQVBYDWZ/hYze6bsv/A8/DNlP/kgvwzuer4kCMGPZDgAAAABJRU5ErkJggg==', + 'Z' => 'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAAAAACpleexAAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTBQ4QHwfqWOdfAAAAB3RJTUUH0wUOEDIrLasyIwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAL5JREFUeNrl1C0OwkAQBWCWQIJEVPQIFT0GAlHBMRBIBKIHqahAIDlERY9R0UOs3ORh5qVLunmp5GfUZvczbzKzDqtltV7ofgtueHCp16h33xBGwn0KYqoTO/J868Csaj418e0cPujOkLDfmTsECcfcXOGhoC/NZQMUDBUDd5DwxiAtJGzprpCw48xVQcIhM1d6KOgLc/kIBcORgXtIeGGQOyRs6Oq0g7P92YbkRE7bRZhcwhh+6nLF5f7yx30B8Z7FgxzMWtEAAAAASUVORK5CYII=', + ); + + return $_png; +} + +?> \ No newline at end of file diff --git a/phpBB/includes/usercp_email.php b/phpBB/includes/usercp_email.php new file mode 100644 index 0000000000..79001b54f3 --- /dev/null +++ b/phpBB/includes/usercp_email.php @@ -0,0 +1,216 @@ +sql_query($sql) ) +{ + if ( $row = $db->sql_fetchrow($result) ) + { + + $username = $row['username']; + $user_email = $row['user_email']; + $user_lang = $row['user_lang']; + + if ( $row['user_viewemail'] || $userdata['user_level'] == ADMIN ) + { + if ( time() - $userdata['user_emailtime'] < $board_config['flood_interval'] ) + { + message_die(GENERAL_MESSAGE, $lang['Flood_email_limit']); + } + + if ( isset($HTTP_POST_VARS['submit']) ) + { + $error = FALSE; + + if ( !empty($HTTP_POST_VARS['subject']) ) + { + $subject = trim(stripslashes($HTTP_POST_VARS['subject'])); + } + else + { + $error = TRUE; + $error_msg = ( !empty($error_msg) ) ? $error_msg . '
    ' . $lang['Empty_subject_email'] : $lang['Empty_subject_email']; + } + + if ( !empty($HTTP_POST_VARS['message']) ) + { + $message = trim(stripslashes($HTTP_POST_VARS['message'])); + } + else + { + $error = TRUE; + $error_msg = ( !empty($error_msg) ) ? $error_msg . '
    ' . $lang['Empty_message_email'] : $lang['Empty_message_email']; + } + + if ( !$error ) + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_emailtime = " . time() . " + WHERE user_id = " . $userdata['user_id']; + if ( $result = $db->sql_query($sql) ) + { + include($phpbb_root_path . 'includes/emailer.'.$phpEx); + $emailer = new emailer($board_config['smtp_delivery']); + + $emailer->from($userdata['user_email']); + $emailer->replyto($userdata['user_email']); + + $email_headers = 'X-AntiAbuse: Board servername - ' . $server_name . "\n"; + $email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n"; + $email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n"; + $email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\n"; + + $emailer->use_template('profile_send_email', $user_lang); + $emailer->email_address($user_email); + $emailer->set_subject($subject); + $emailer->extra_headers($email_headers); + + $emailer->assign_vars(array( + 'SITENAME' => $board_config['sitename'], + 'BOARD_EMAIL' => $board_config['board_email'], + 'FROM_USERNAME' => $userdata['username'], + 'TO_USERNAME' => $username, + 'MESSAGE' => $message) + ); + $emailer->send(); + $emailer->reset(); + + if ( !empty($HTTP_POST_VARS['cc_email']) ) + { + $emailer->from($userdata['user_email']); + $emailer->replyto($userdata['user_email']); + $emailer->use_template('profile_send_email'); + $emailer->email_address($userdata['user_email']); + $emailer->set_subject($subject); + + $emailer->assign_vars(array( + 'SITENAME' => $board_config['sitename'], + 'BOARD_EMAIL' => $board_config['board_email'], + 'FROM_USERNAME' => $userdata['username'], + 'TO_USERNAME' => $username, + 'MESSAGE' => $message) + ); + $emailer->send(); + $emailer->reset(); + } + + $template->assign_vars(array( + 'META' => '') + ); + + $message = $lang['Email_sent'] . '

    ' . sprintf($lang['Click_return_index'], '', ''); + + message_die(GENERAL_MESSAGE, $message); + } + else + { + message_die(GENERAL_ERROR, 'Could not update last email time', '', __LINE__, __FILE__, $sql); + } + } + } + + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + $template->set_filenames(array( + 'body' => 'profile_send_email.tpl') + ); + make_jumpbox('viewforum.'.$phpEx); + + if ( $error ) + { + $template->set_filenames(array( + 'reg_header' => 'error_body.tpl') + ); + $template->assign_vars(array( + 'ERROR_MESSAGE' => $error_msg) + ); + $template->assign_var_from_handle('ERROR_BOX', 'reg_header'); + } + + $template->assign_vars(array( + 'USERNAME' => $username, + + 'S_HIDDEN_FIELDS' => '', + 'S_POST_ACTION' => append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL . "=$user_id"), + + 'L_SEND_EMAIL_MSG' => $lang['Send_email_msg'], + 'L_RECIPIENT' => $lang['Recipient'], + 'L_SUBJECT' => $lang['Subject'], + 'L_MESSAGE_BODY' => $lang['Message_body'], + 'L_MESSAGE_BODY_DESC' => $lang['Email_message_desc'], + 'L_EMPTY_SUBJECT_EMAIL' => $lang['Empty_subject_email'], + 'L_EMPTY_MESSAGE_EMAIL' => $lang['Empty_message_email'], + 'L_OPTIONS' => $lang['Options'], + 'L_CC_EMAIL' => $lang['CC_email'], + 'L_SPELLCHECK' => $lang['Spellcheck'], + 'L_SEND_EMAIL' => $lang['Send_email']) + ); + + $template->pparse('body'); + + include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + } + else + { + message_die(GENERAL_MESSAGE, $lang['User_prevent_email']); + } + } + else + { + message_die(GENERAL_MESSAGE, $lang['User_not_exist']); + } +} +else +{ + message_die(GENERAL_ERROR, 'Could not select user data', '', __LINE__, __FILE__, $sql); +} + +?> \ No newline at end of file diff --git a/phpBB/includes/usercp_register.php b/phpBB/includes/usercp_register.php new file mode 100644 index 0000000000..b472374576 --- /dev/null +++ b/phpBB/includes/usercp_register.php @@ -0,0 +1,1180 @@ +', '<', '"', '&'); + +// --------------------------------------- +// Load agreement template since user has not yet +// agreed to registration conditions/coppa +// +function show_coppa() +{ + global $userdata, $template, $lang, $phpbb_root_path, $phpEx; + + $template->set_filenames(array( + 'body' => 'agreement.tpl') + ); + + $template->assign_vars(array( + 'REGISTRATION' => $lang['Registration'], + 'AGREEMENT' => $lang['Reg_agreement'], + "AGREE_OVER_13" => $lang['Agree_over_13'], + "AGREE_UNDER_13" => $lang['Agree_under_13'], + 'DO_NOT_AGREE' => $lang['Agree_not'], + + "U_AGREE_OVER13" => append_sid("profile.$phpEx?mode=register&agreed=true"), + "U_AGREE_UNDER13" => append_sid("profile.$phpEx?mode=register&agreed=true&coppa=true")) + ); + + $template->pparse('body'); + +} +// +// --------------------------------------- + +$error = FALSE; +$error_msg = ''; +$page_title = ( $mode == 'editprofile' ) ? $lang['Edit_profile'] : $lang['Register']; + +if ( $mode == 'register' && !isset($HTTP_POST_VARS['agreed']) && !isset($HTTP_GET_VARS['agreed']) ) +{ + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + show_coppa(); + + include($phpbb_root_path . 'includes/page_tail.'.$phpEx); +} + +$coppa = ( empty($HTTP_POST_VARS['coppa']) && empty($HTTP_GET_VARS['coppa']) ) ? 0 : TRUE; + +// +// Check and initialize some variables if needed +// +if ( + isset($HTTP_POST_VARS['submit']) || + isset($HTTP_POST_VARS['avatargallery']) || + isset($HTTP_POST_VARS['submitavatar']) || + isset($HTTP_POST_VARS['cancelavatar']) || + $mode == 'register' ) +{ + include($phpbb_root_path . 'includes/functions_validate.'.$phpEx); + include($phpbb_root_path . 'includes/bbcode.'.$phpEx); + include($phpbb_root_path . 'includes/functions_post.'.$phpEx); + + if ( $mode == 'editprofile' ) + { + $user_id = intval($HTTP_POST_VARS['user_id']); + $current_email = trim(htmlspecialchars($HTTP_POST_VARS['current_email'])); + } + + $strip_var_list = array('email' => 'email', 'icq' => 'icq', 'aim' => 'aim', 'msn' => 'msn', 'yim' => 'yim', 'website' => 'website', 'location' => 'location', 'occupation' => 'occupation', 'interests' => 'interests', 'confirm_code' => 'confirm_code'); + + // Strip all tags from data ... may p**s some people off, bah, strip_tags is + // doing the job but can still break HTML output ... have no choice, have + // to use htmlspecialchars ... be prepared to be moaned at. + while( list($var, $param) = @each($strip_var_list) ) + { + if ( !empty($HTTP_POST_VARS[$param]) ) + { + $$var = trim(htmlspecialchars($HTTP_POST_VARS[$param])); + } + } + + $username = ( !empty($HTTP_POST_VARS['username']) ) ? phpbb_clean_username($HTTP_POST_VARS['username']) : ''; + + $trim_var_list = array('cur_password' => 'cur_password', 'new_password' => 'new_password', 'password_confirm' => 'password_confirm', 'signature' => 'signature'); + + while( list($var, $param) = @each($trim_var_list) ) + { + if ( !empty($HTTP_POST_VARS[$param]) ) + { + $$var = trim($HTTP_POST_VARS[$param]); + } + } + + $signature = (isset($signature)) ? str_replace('
    ', "\n", $signature) : ''; + $signature_bbcode_uid = ''; + + // Run some validation on the optional fields. These are pass-by-ref, so they'll be changed to + // empty strings if they fail. + validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature); + + $viewemail = ( isset($HTTP_POST_VARS['viewemail']) ) ? ( ($HTTP_POST_VARS['viewemail']) ? TRUE : 0 ) : 0; + $allowviewonline = ( isset($HTTP_POST_VARS['hideonline']) ) ? ( ($HTTP_POST_VARS['hideonline']) ? 0 : TRUE ) : TRUE; + $notifyreply = ( isset($HTTP_POST_VARS['notifyreply']) ) ? ( ($HTTP_POST_VARS['notifyreply']) ? TRUE : 0 ) : 0; + $notifypm = ( isset($HTTP_POST_VARS['notifypm']) ) ? ( ($HTTP_POST_VARS['notifypm']) ? TRUE : 0 ) : TRUE; + $popup_pm = ( isset($HTTP_POST_VARS['popup_pm']) ) ? ( ($HTTP_POST_VARS['popup_pm']) ? TRUE : 0 ) : TRUE; + $sid = (isset($HTTP_POST_VARS['sid'])) ? $HTTP_POST_VARS['sid'] : 0; + + if ( $mode == 'register' ) + { + $attachsig = ( isset($HTTP_POST_VARS['attachsig']) ) ? ( ($HTTP_POST_VARS['attachsig']) ? TRUE : 0 ) : $board_config['allow_sig']; + + $allowhtml = ( isset($HTTP_POST_VARS['allowhtml']) ) ? ( ($HTTP_POST_VARS['allowhtml']) ? TRUE : 0 ) : $board_config['allow_html']; + $allowbbcode = ( isset($HTTP_POST_VARS['allowbbcode']) ) ? ( ($HTTP_POST_VARS['allowbbcode']) ? TRUE : 0 ) : $board_config['allow_bbcode']; + $allowsmilies = ( isset($HTTP_POST_VARS['allowsmilies']) ) ? ( ($HTTP_POST_VARS['allowsmilies']) ? TRUE : 0 ) : $board_config['allow_smilies']; + } + else + { + $attachsig = ( isset($HTTP_POST_VARS['attachsig']) ) ? ( ($HTTP_POST_VARS['attachsig']) ? TRUE : 0 ) : $userdata['user_attachsig']; + + $allowhtml = ( isset($HTTP_POST_VARS['allowhtml']) ) ? ( ($HTTP_POST_VARS['allowhtml']) ? TRUE : 0 ) : $userdata['user_allowhtml']; + $allowbbcode = ( isset($HTTP_POST_VARS['allowbbcode']) ) ? ( ($HTTP_POST_VARS['allowbbcode']) ? TRUE : 0 ) : $userdata['user_allowbbcode']; + $allowsmilies = ( isset($HTTP_POST_VARS['allowsmilies']) ) ? ( ($HTTP_POST_VARS['allowsmilies']) ? TRUE : 0 ) : $userdata['user_allowsmile']; + } + + $user_style = ( isset($HTTP_POST_VARS['style']) ) ? intval($HTTP_POST_VARS['style']) : $board_config['default_style']; + + if ( !empty($HTTP_POST_VARS['language']) ) + { + if ( preg_match('/^[a-z_]+$/i', $HTTP_POST_VARS['language']) ) + { + $user_lang = htmlspecialchars($HTTP_POST_VARS['language']); + } + else + { + $error = true; + $error_msg = $lang['Fields_empty']; + } + } + else + { + $user_lang = $board_config['default_lang']; + } + + $user_timezone = ( isset($HTTP_POST_VARS['timezone']) ) ? doubleval($HTTP_POST_VARS['timezone']) : $board_config['board_timezone']; + + $sql = "SELECT config_value + FROM " . CONFIG_TABLE . " + WHERE config_name = 'default_dateformat'"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not select default dateformat', '', __LINE__, __FILE__, $sql); + } + $row = $db->sql_fetchrow($result); + $board_config['default_dateformat'] = $row['config_value']; + $user_dateformat = ( !empty($HTTP_POST_VARS['dateformat']) ) ? trim(htmlspecialchars($HTTP_POST_VARS['dateformat'])) : $board_config['default_dateformat']; + + $user_avatar_local = ( isset($HTTP_POST_VARS['avatarselect']) && !empty($HTTP_POST_VARS['submitavatar']) && $board_config['allow_avatar_local'] ) ? htmlspecialchars($HTTP_POST_VARS['avatarselect']) : ( ( isset($HTTP_POST_VARS['avatarlocal']) ) ? htmlspecialchars($HTTP_POST_VARS['avatarlocal']) : '' ); + $user_avatar_category = ( isset($HTTP_POST_VARS['avatarcatname']) && $board_config['allow_avatar_local'] ) ? htmlspecialchars($HTTP_POST_VARS['avatarcatname']) : '' ; + + $user_avatar_remoteurl = ( !empty($HTTP_POST_VARS['avatarremoteurl']) ) ? trim(htmlspecialchars($HTTP_POST_VARS['avatarremoteurl'])) : ''; + $user_avatar_upload = ( !empty($HTTP_POST_VARS['avatarurl']) ) ? trim($HTTP_POST_VARS['avatarurl']) : ( ( $HTTP_POST_FILES['avatar']['tmp_name'] != "none") ? $HTTP_POST_FILES['avatar']['tmp_name'] : '' ); + $user_avatar_name = ( !empty($HTTP_POST_FILES['avatar']['name']) ) ? $HTTP_POST_FILES['avatar']['name'] : ''; + $user_avatar_size = ( !empty($HTTP_POST_FILES['avatar']['size']) ) ? $HTTP_POST_FILES['avatar']['size'] : 0; + $user_avatar_filetype = ( !empty($HTTP_POST_FILES['avatar']['type']) ) ? $HTTP_POST_FILES['avatar']['type'] : ''; + + $user_avatar = ( empty($user_avatar_local) && $mode == 'editprofile' ) ? $userdata['user_avatar'] : ''; + $user_avatar_type = ( empty($user_avatar_local) && $mode == 'editprofile' ) ? $userdata['user_avatar_type'] : ''; + + if ( (isset($HTTP_POST_VARS['avatargallery']) || isset($HTTP_POST_VARS['submitavatar']) || isset($HTTP_POST_VARS['cancelavatar'])) && (!isset($HTTP_POST_VARS['submit'])) ) + { + $username = stripslashes($username); + $email = stripslashes($email); + $cur_password = htmlspecialchars(stripslashes($cur_password)); + $new_password = htmlspecialchars(stripslashes($new_password)); + $password_confirm = htmlspecialchars(stripslashes($password_confirm)); + + $icq = stripslashes($icq); + $aim = stripslashes($aim); + $msn = stripslashes($msn); + $yim = stripslashes($yim); + + $website = stripslashes($website); + $location = stripslashes($location); + $occupation = stripslashes($occupation); + $interests = stripslashes($interests); + $signature = htmlspecialchars(stripslashes($signature)); + + $user_lang = stripslashes($user_lang); + $user_dateformat = stripslashes($user_dateformat); + + if ( !isset($HTTP_POST_VARS['cancelavatar'])) + { + $user_avatar = $user_avatar_category . '/' . $user_avatar_local; + $user_avatar_type = USER_AVATAR_GALLERY; + } + } +} + +// +// Let's make sure the user isn't logged in while registering, +// and ensure that they were trying to register a second time +// (Prevents double registrations) +// +if ($mode == 'register' && ($userdata['session_logged_in'] || $username == $userdata['username'])) +{ + message_die(GENERAL_MESSAGE, $lang['Username_taken'], '', __LINE__, __FILE__); +} + +// +// Did the user submit? In this case build a query to update the users profile in the DB +// +if ( isset($HTTP_POST_VARS['submit']) ) +{ + include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx); + + // session id check + if ($sid == '' || $sid != $userdata['session_id']) + { + $error = true; + $error_msg .= ( ( isset($error_msg) ) ? '
    ' : '' ) . $lang['Session_invalid']; + } + + $passwd_sql = ''; + if ( $mode == 'editprofile' ) + { + if ( $user_id != $userdata['user_id'] ) + { + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
    ' : '' ) . $lang['Wrong_Profile']; + } + } + else if ( $mode == 'register' ) + { + if ( empty($username) || empty($new_password) || empty($password_confirm) || empty($email) ) + { + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
    ' : '' ) . $lang['Fields_empty']; + } + } + + if ($board_config['enable_confirm'] && $mode == 'register') + { + if (empty($HTTP_POST_VARS['confirm_id'])) + { + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
    ' : '' ) . $lang['Confirm_code_wrong']; + } + else + { + $confirm_id = htmlspecialchars($HTTP_POST_VARS['confirm_id']); + if (!preg_match('/^[A-Za-z0-9]+$/', $confirm_id)) + { + $confirm_id = ''; + } + + $sql = 'SELECT code + FROM ' . CONFIRM_TABLE . " + WHERE confirm_id = '$confirm_id' + AND session_id = '" . $userdata['session_id'] . "'"; + if (!($result = $db->sql_query($sql))) + { + message_die(GENERAL_ERROR, 'Could not obtain confirmation code', '', __LINE__, __FILE__, $sql); + } + + if ($row = $db->sql_fetchrow($result)) + { + if ($row['code'] != $confirm_code) + { + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
    ' : '' ) . $lang['Confirm_code_wrong']; + } + else + { + $sql = 'DELETE FROM ' . CONFIRM_TABLE . " + WHERE confirm_id = '$confirm_id' + AND session_id = '" . $userdata['session_id'] . "'"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Could not delete confirmation code', '', __LINE__, __FILE__, $sql); + } + } + } + else + { + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
    ' : '' ) . $lang['Confirm_code_wrong']; + } + $db->sql_freeresult($result); + } + } + + $passwd_sql = ''; + if ( !empty($new_password) && !empty($password_confirm) ) + { + if ( $new_password != $password_confirm ) + { + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
    ' : '' ) . $lang['Password_mismatch']; + } + else if ( strlen($new_password) > 32 ) + { + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
    ' : '' ) . $lang['Password_long']; + } + else + { + if ( $mode == 'editprofile' ) + { + $sql = "SELECT user_password + FROM " . USERS_TABLE . " + WHERE user_id = $user_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain user_password information', '', __LINE__, __FILE__, $sql); + } + + $row = $db->sql_fetchrow($result); + + if ( $row['user_password'] != md5($cur_password) ) + { + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
    ' : '' ) . $lang['Current_password_mismatch']; + } + } + + if ( !$error ) + { + $new_password = md5($new_password); + $passwd_sql = "user_password = '$new_password', "; + } + } + } + else if ( ( empty($new_password) && !empty($password_confirm) ) || ( !empty($new_password) && empty($password_confirm) ) ) + { + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
    ' : '' ) . $lang['Password_mismatch']; + } + + // + // Do a ban check on this email address + // + if ( $email != $userdata['user_email'] || $mode == 'register' ) + { + $result = validate_email($email); + if ( $result['error'] ) + { + $email = $userdata['user_email']; + + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
    ' : '' ) . $result['error_msg']; + } + + if ( $mode == 'editprofile' ) + { + $sql = "SELECT user_password + FROM " . USERS_TABLE . " + WHERE user_id = $user_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain user_password information', '', __LINE__, __FILE__, $sql); + } + + $row = $db->sql_fetchrow($result); + + if ( $row['user_password'] != md5($cur_password) ) + { + $email = $userdata['user_email']; + + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
    ' : '' ) . $lang['Current_password_mismatch']; + } + } + } + + $username_sql = ''; + if ( $board_config['allow_namechange'] || $mode == 'register' ) + { + if ( empty($username) ) + { + // Error is already triggered, since one field is empty. + $error = TRUE; + } + else if ( $username != $userdata['username'] || $mode == 'register') + { + if (strtolower($username) != strtolower($userdata['username']) || $mode == 'register') + { + $result = validate_username($username); + if ( $result['error'] ) + { + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
    ' : '' ) . $result['error_msg']; + } + } + + if (!$error) + { + $username_sql = "username = '" . str_replace("\'", "''", $username) . "', "; + } + } + } + + if ( $signature != '' ) + { + if ( strlen($signature) > $board_config['max_sig_chars'] ) + { + $error = TRUE; + $error_msg .= ( ( isset($error_msg) ) ? '
    ' : '' ) . $lang['Signature_too_long']; + } + + if ( !isset($signature_bbcode_uid) || $signature_bbcode_uid == '' ) + { + $signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : ''; + } + $signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid); + } + + if ( $website != '' ) + { + rawurlencode($website); + } + + $avatar_sql = ''; + + if ( isset($HTTP_POST_VARS['avatardel']) && $mode == 'editprofile' ) + { + $avatar_sql = user_avatar_delete($userdata['user_avatar_type'], $userdata['user_avatar']); + } + else + if ( ( !empty($user_avatar_upload) || !empty($user_avatar_name) ) && $board_config['allow_avatar_upload'] ) + { + if ( !empty($user_avatar_upload) ) + { + $avatar_mode = (empty($user_avatar_name)) ? 'remote' : 'local'; + $avatar_sql = user_avatar_upload($mode, $avatar_mode, $userdata['user_avatar'], $userdata['user_avatar_type'], $error, $error_msg, $user_avatar_upload, $user_avatar_name, $user_avatar_size, $user_avatar_filetype); + } + else if ( !empty($user_avatar_name) ) + { + $l_avatar_size = sprintf($lang['Avatar_filesize'], round($board_config['avatar_filesize'] / 1024)); + + $error = true; + $error_msg .= ( ( !empty($error_msg) ) ? '
    ' : '' ) . $l_avatar_size; + } + } + else if ( $user_avatar_remoteurl != '' && $board_config['allow_avatar_remote'] ) + { + user_avatar_delete($userdata['user_avatar_type'], $userdata['user_avatar']); + $avatar_sql = user_avatar_url($mode, $error, $error_msg, $user_avatar_remoteurl); + } + else if ( $user_avatar_local != '' && $board_config['allow_avatar_local'] ) + { + user_avatar_delete($userdata['user_avatar_type'], $userdata['user_avatar']); + $avatar_sql = user_avatar_gallery($mode, $error, $error_msg, $user_avatar_local, $user_avatar_category); + } + + if ( !$error ) + { + if ( $avatar_sql == '' ) + { + $avatar_sql = ( $mode == 'editprofile' ) ? '' : "'', " . USER_AVATAR_NONE; + } + + if ( $mode == 'editprofile' ) + { + if ( $email != $userdata['user_email'] && $board_config['require_activation'] != USER_ACTIVATION_NONE && $userdata['user_level'] != ADMIN ) + { + $user_active = 0; + + $user_actkey = gen_rand_string(true); + $key_len = 54 - ( strlen($server_url) ); + $key_len = ( $key_len > 6 ) ? $key_len : 6; + $user_actkey = substr($user_actkey, 0, $key_len); + + if ( $userdata['session_logged_in'] ) + { + session_end($userdata['session_id'], $userdata['user_id']); + } + } + else + { + $user_active = 1; + $user_actkey = ''; + } + + $sql = "UPDATE " . USERS_TABLE . " + SET " . $username_sql . $passwd_sql . "user_email = '" . str_replace("\'", "''", $email) ."', user_icq = '" . str_replace("\'", "''", $icq) . "', user_website = '" . str_replace("\'", "''", $website) . "', user_occ = '" . str_replace("\'", "''", $occupation) . "', user_from = '" . str_replace("\'", "''", $location) . "', user_interests = '" . str_replace("\'", "''", $interests) . "', user_sig = '" . str_replace("\'", "''", $signature) . "', user_sig_bbcode_uid = '$signature_bbcode_uid', user_viewemail = $viewemail, user_aim = '" . str_replace("\'", "''", str_replace(' ', '+', $aim)) . "', user_yim = '" . str_replace("\'", "''", $yim) . "', user_msnm = '" . str_replace("\'", "''", $msn) . "', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_notify = $notifyreply, user_notify_pm = $notifypm, user_popup_pm = $popup_pm, user_timezone = $user_timezone, user_dateformat = '" . str_replace("\'", "''", $user_dateformat) . "', user_lang = '" . str_replace("\'", "''", $user_lang) . "', user_style = $user_style, user_active = $user_active, user_actkey = '" . str_replace("\'", "''", $user_actkey) . "'" . $avatar_sql . " + WHERE user_id = $user_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not update users table', '', __LINE__, __FILE__, $sql); + } + + // We remove all stored login keys since the password has been updated + // and change the current one (if applicable) + if ( !empty($passwd_sql) ) + { + session_reset_keys($user_id, $user_ip); + } + + if ( !$user_active ) + { + // + // The users account has been deactivated, send them an email with a new activation key + // + include($phpbb_root_path . 'includes/emailer.'.$phpEx); + $emailer = new emailer($board_config['smtp_delivery']); + + if ( $board_config['require_activation'] != USER_ACTIVATION_ADMIN ) + { + $emailer->from($board_config['board_email']); + $emailer->replyto($board_config['board_email']); + + $emailer->use_template('user_activate', stripslashes($user_lang)); + $emailer->email_address($email); + $emailer->set_subject($lang['Reactivate']); + + $emailer->assign_vars(array( + 'SITENAME' => $board_config['sitename'], + 'USERNAME' => preg_replace($unhtml_specialchars_match, $unhtml_specialchars_replace, substr(str_replace("\'", "'", $username), 0, 25)), + 'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('
    ', "\n", "-- \n" . $board_config['board_email_sig']) : '', + + 'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey) + ); + $emailer->send(); + $emailer->reset(); + } + else if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) + { + $sql = 'SELECT user_email, user_lang + FROM ' . USERS_TABLE . ' + WHERE user_level = ' . ADMIN; + + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not select Administrators', '', __LINE__, __FILE__, $sql); + } + + while ($row = $db->sql_fetchrow($result)) + { + $emailer->from($board_config['board_email']); + $emailer->replyto($board_config['board_email']); + + $emailer->email_address(trim($row['user_email'])); + $emailer->use_template("admin_activate", $row['user_lang']); + $emailer->set_subject($lang['Reactivate']); + + $emailer->assign_vars(array( + 'USERNAME' => preg_replace($unhtml_specialchars_match, $unhtml_specialchars_replace, substr(str_replace("\'", "'", $username), 0, 25)), + 'EMAIL_SIG' => str_replace('
    ', "\n", "-- \n" . $board_config['board_email_sig']), + + 'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey) + ); + $emailer->send(); + $emailer->reset(); + } + $db->sql_freeresult($result); + } + + $message = $lang['Profile_updated_inactive'] . '

    ' . sprintf($lang['Click_return_index'], '', ''); + } + else + { + $message = $lang['Profile_updated'] . '

    ' . sprintf($lang['Click_return_index'], '', ''); + } + + $template->assign_vars(array( + "META" => '') + ); + + message_die(GENERAL_MESSAGE, $message); + } + else + { + $sql = "SELECT MAX(user_id) AS total + FROM " . USERS_TABLE; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql); + } + + if ( !($row = $db->sql_fetchrow($result)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql); + } + $user_id = $row['total'] + 1; + + // + // Get current date + // + $sql = "INSERT INTO " . USERS_TABLE . " (user_id, username, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_sig_bbcode_uid, user_avatar, user_avatar_type, user_viewemail, user_aim, user_yim, user_msnm, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_viewonline, user_notify, user_notify_pm, user_popup_pm, user_timezone, user_dateformat, user_lang, user_style, user_level, user_allow_pm, user_active, user_actkey) + VALUES ($user_id, '" . str_replace("\'", "''", $username) . "', " . time() . ", '" . str_replace("\'", "''", $new_password) . "', '" . str_replace("\'", "''", $email) . "', '" . str_replace("\'", "''", $icq) . "', '" . str_replace("\'", "''", $website) . "', '" . str_replace("\'", "''", $occupation) . "', '" . str_replace("\'", "''", $location) . "', '" . str_replace("\'", "''", $interests) . "', '" . str_replace("\'", "''", $signature) . "', '$signature_bbcode_uid', $avatar_sql, $viewemail, '" . str_replace("\'", "''", str_replace(' ', '+', $aim)) . "', '" . str_replace("\'", "''", $yim) . "', '" . str_replace("\'", "''", $msn) . "', $attachsig, $allowsmilies, $allowhtml, $allowbbcode, $allowviewonline, $notifyreply, $notifypm, $popup_pm, $user_timezone, '" . str_replace("\'", "''", $user_dateformat) . "', '" . str_replace("\'", "''", $user_lang) . "', $user_style, 0, 1, "; + if ( $board_config['require_activation'] == USER_ACTIVATION_SELF || $board_config['require_activation'] == USER_ACTIVATION_ADMIN || $coppa ) + { + $user_actkey = gen_rand_string(true); + $key_len = 54 - (strlen($server_url)); + $key_len = ( $key_len > 6 ) ? $key_len : 6; + $user_actkey = substr($user_actkey, 0, $key_len); + $sql .= "0, '" . str_replace("\'", "''", $user_actkey) . "')"; + } + else + { + $sql .= "1, '')"; + } + + if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) ) + { + message_die(GENERAL_ERROR, 'Could not insert data into users table', '', __LINE__, __FILE__, $sql); + } + + $sql = "INSERT INTO " . GROUPS_TABLE . " (group_name, group_description, group_single_user, group_moderator) + VALUES ('', 'Personal User', 1, 0)"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not insert data into groups table', '', __LINE__, __FILE__, $sql); + } + + $group_id = $db->sql_nextid(); + + $sql = "INSERT INTO " . USER_GROUP_TABLE . " (user_id, group_id, user_pending) + VALUES ($user_id, $group_id, 0)"; + if( !($result = $db->sql_query($sql, END_TRANSACTION)) ) + { + message_die(GENERAL_ERROR, 'Could not insert data into user_group table', '', __LINE__, __FILE__, $sql); + } + + if ( $coppa ) + { + $message = $lang['COPPA']; + $email_template = 'coppa_welcome_inactive'; + } + else if ( $board_config['require_activation'] == USER_ACTIVATION_SELF ) + { + $message = $lang['Account_inactive']; + $email_template = 'user_welcome_inactive'; + } + else if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) + { + $message = $lang['Account_inactive_admin']; + $email_template = 'admin_welcome_inactive'; + } + else + { + $message = $lang['Account_added']; + $email_template = 'user_welcome'; + } + + include($phpbb_root_path . 'includes/emailer.'.$phpEx); + $emailer = new emailer($board_config['smtp_delivery']); + + $emailer->from($board_config['board_email']); + $emailer->replyto($board_config['board_email']); + + $emailer->use_template($email_template, stripslashes($user_lang)); + $emailer->email_address($email); + $emailer->set_subject(sprintf($lang['Welcome_subject'], $board_config['sitename'])); + + if( $coppa ) + { + $emailer->assign_vars(array( + 'SITENAME' => $board_config['sitename'], + 'WELCOME_MSG' => sprintf($lang['Welcome_subject'], $board_config['sitename']), + 'USERNAME' => preg_replace($unhtml_specialchars_match, $unhtml_specialchars_replace, substr(str_replace("\'", "'", $username), 0, 25)), + 'PASSWORD' => $password_confirm, + 'EMAIL_SIG' => str_replace('
    ', "\n", "-- \n" . $board_config['board_email_sig']), + + 'FAX_INFO' => $board_config['coppa_fax'], + 'MAIL_INFO' => $board_config['coppa_mail'], + 'EMAIL_ADDRESS' => $email, + 'ICQ' => $icq, + 'AIM' => $aim, + 'YIM' => $yim, + 'MSN' => $msn, + 'WEB_SITE' => $website, + 'FROM' => $location, + 'OCC' => $occupation, + 'INTERESTS' => $interests, + 'SITENAME' => $board_config['sitename'])); + } + else + { + $emailer->assign_vars(array( + 'SITENAME' => $board_config['sitename'], + 'WELCOME_MSG' => sprintf($lang['Welcome_subject'], $board_config['sitename']), + 'USERNAME' => preg_replace($unhtml_specialchars_match, $unhtml_specialchars_replace, substr(str_replace("\'", "'", $username), 0, 25)), + 'PASSWORD' => $password_confirm, + 'EMAIL_SIG' => str_replace('
    ', "\n", "-- \n" . $board_config['board_email_sig']), + + 'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey) + ); + } + + $emailer->send(); + $emailer->reset(); + + if ( $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) + { + $sql = "SELECT user_email, user_lang + FROM " . USERS_TABLE . " + WHERE user_level = " . ADMIN; + + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not select Administrators', '', __LINE__, __FILE__, $sql); + } + + while ($row = $db->sql_fetchrow($result)) + { + $emailer->from($board_config['board_email']); + $emailer->replyto($board_config['board_email']); + + $emailer->email_address(trim($row['user_email'])); + $emailer->use_template("admin_activate", $row['user_lang']); + $emailer->set_subject($lang['New_account_subject']); + + $emailer->assign_vars(array( + 'USERNAME' => preg_replace($unhtml_specialchars_match, $unhtml_specialchars_replace, substr(str_replace("\'", "'", $username), 0, 25)), + 'EMAIL_SIG' => str_replace('
    ', "\n", "-- \n" . $board_config['board_email_sig']), + + 'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey) + ); + $emailer->send(); + $emailer->reset(); + } + $db->sql_freeresult($result); + } + + $message = $message . '

    ' . sprintf($lang['Click_return_index'], '', ''); + + message_die(GENERAL_MESSAGE, $message); + } // if mode == register + } +} // End of submit + + +if ( $error ) +{ + // + // If an error occured we need to stripslashes on returned data + // + $username = stripslashes($username); + $email = stripslashes($email); + $cur_password = ''; + $new_password = ''; + $password_confirm = ''; + + $icq = stripslashes($icq); + $aim = str_replace('+', ' ', stripslashes($aim)); + $msn = stripslashes($msn); + $yim = stripslashes($yim); + + $website = stripslashes($website); + $location = stripslashes($location); + $occupation = stripslashes($occupation); + $interests = stripslashes($interests); + $signature = stripslashes($signature); + $signature = ($signature_bbcode_uid != '') ? preg_replace("/:(([a-z0-9]+:)?)$signature_bbcode_uid(=|\])/si", '\\3', $signature) : $signature; + + $user_lang = stripslashes($user_lang); + $user_dateformat = stripslashes($user_dateformat); + +} +else if ( $mode == 'editprofile' && !isset($HTTP_POST_VARS['avatargallery']) && !isset($HTTP_POST_VARS['submitavatar']) && !isset($HTTP_POST_VARS['cancelavatar']) ) +{ + $user_id = $userdata['user_id']; + $username = $userdata['username']; + $email = $userdata['user_email']; + $cur_password = ''; + $new_password = ''; + $password_confirm = ''; + + $icq = $userdata['user_icq']; + $aim = str_replace('+', ' ', $userdata['user_aim']); + $msn = $userdata['user_msnm']; + $yim = $userdata['user_yim']; + + $website = $userdata['user_website']; + $location = $userdata['user_from']; + $occupation = $userdata['user_occ']; + $interests = $userdata['user_interests']; + $signature_bbcode_uid = $userdata['user_sig_bbcode_uid']; + $signature = ($signature_bbcode_uid != '') ? preg_replace("/:(([a-z0-9]+:)?)$signature_bbcode_uid(=|\])/si", '\\3', $userdata['user_sig']) : $userdata['user_sig']; + + $viewemail = $userdata['user_viewemail']; + $notifypm = $userdata['user_notify_pm']; + $popup_pm = $userdata['user_popup_pm']; + $notifyreply = $userdata['user_notify']; + $attachsig = $userdata['user_attachsig']; + $allowhtml = $userdata['user_allowhtml']; + $allowbbcode = $userdata['user_allowbbcode']; + $allowsmilies = $userdata['user_allowsmile']; + $allowviewonline = $userdata['user_allow_viewonline']; + + $user_avatar = ( $userdata['user_allowavatar'] ) ? $userdata['user_avatar'] : ''; + $user_avatar_type = ( $userdata['user_allowavatar'] ) ? $userdata['user_avatar_type'] : USER_AVATAR_NONE; + + $user_style = $userdata['user_style']; + $user_lang = $userdata['user_lang']; + $user_timezone = $userdata['user_timezone']; + $user_dateformat = $userdata['user_dateformat']; +} + +// +// Default pages +// +include($phpbb_root_path . 'includes/page_header.'.$phpEx); + +make_jumpbox('viewforum.'.$phpEx); + +if ( $mode == 'editprofile' ) +{ + if ( $user_id != $userdata['user_id'] ) + { + $error = TRUE; + $error_msg = $lang['Wrong_Profile']; + } +} + +if( isset($HTTP_POST_VARS['avatargallery']) && !$error ) +{ + include($phpbb_root_path . 'includes/usercp_avatar.'.$phpEx); + + $avatar_category = ( !empty($HTTP_POST_VARS['avatarcategory']) ) ? htmlspecialchars($HTTP_POST_VARS['avatarcategory']) : ''; + + $template->set_filenames(array( + 'body' => 'profile_avatar_gallery.tpl') + ); + + $allowviewonline = !$allowviewonline; + + display_avatar_gallery($mode, $avatar_category, $user_id, $email, $current_email, $coppa, $username, $email, $new_password, $cur_password, $password_confirm, $icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature, $viewemail, $notifypm, $popup_pm, $notifyreply, $attachsig, $allowhtml, $allowbbcode, $allowsmilies, $allowviewonline, $user_style, $user_lang, $user_timezone, $user_dateformat, $userdata['session_id']); +} +else +{ + include($phpbb_root_path . 'includes/functions_selects.'.$phpEx); + + if ( !isset($coppa) ) + { + $coppa = FALSE; + } + + if ( !isset($user_style) ) + { + $user_style = $board_config['default_style']; + } + + $avatar_img = ''; + if ( $user_avatar_type ) + { + switch( $user_avatar_type ) + { + case USER_AVATAR_UPLOAD: + $avatar_img = ( $board_config['allow_avatar_upload'] ) ? '' : ''; + break; + case USER_AVATAR_REMOTE: + $avatar_img = ( $board_config['allow_avatar_remote'] ) ? '' : ''; + break; + case USER_AVATAR_GALLERY: + $avatar_img = ( $board_config['allow_avatar_local'] ) ? '' : ''; + break; + } + } + + $s_hidden_fields = ''; + $s_hidden_fields .= ''; + if( $mode == 'editprofile' ) + { + $s_hidden_fields .= ''; + // + // Send the users current email address. If they change it, and account activation is turned on + // the user account will be disabled and the user will have to reactivate their account. + // + $s_hidden_fields .= ''; + } + + if ( !empty($user_avatar_local) ) + { + $s_hidden_fields .= ''; + } + + $html_status = ( $userdata['user_allowhtml'] && $board_config['allow_html'] ) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF']; + $bbcode_status = ( $userdata['user_allowbbcode'] && $board_config['allow_bbcode'] ) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF']; + $smilies_status = ( $userdata['user_allowsmile'] && $board_config['allow_smilies'] ) ? $lang['Smilies_are_ON'] : $lang['Smilies_are_OFF']; + + if ( $error ) + { + $template->set_filenames(array( + 'reg_header' => 'error_body.tpl') + ); + $template->assign_vars(array( + 'ERROR_MESSAGE' => $error_msg) + ); + $template->assign_var_from_handle('ERROR_BOX', 'reg_header'); + } + + $template->set_filenames(array( + 'body' => 'profile_add_body.tpl') + ); + + if ( $mode == 'editprofile' ) + { + $template->assign_block_vars('switch_edit_profile', array()); + } + + if ( ($mode == 'register') || ($board_config['allow_namechange']) ) + { + $template->assign_block_vars('switch_namechange_allowed', array()); + } + else + { + $template->assign_block_vars('switch_namechange_disallowed', array()); + } + + + // Visual Confirmation + $confirm_image = ''; + if (!empty($board_config['enable_confirm']) && $mode == 'register') + { + $sql = 'SELECT session_id + FROM ' . SESSIONS_TABLE; + if (!($result = $db->sql_query($sql))) + { + message_die(GENERAL_ERROR, 'Could not select session data', '', __LINE__, __FILE__, $sql); + } + + if ($row = $db->sql_fetchrow($result)) + { + $confirm_sql = ''; + do + { + $confirm_sql .= (($confirm_sql != '') ? ', ' : '') . "'" . $row['session_id'] . "'"; + } + while ($row = $db->sql_fetchrow($result)); + + $sql = 'DELETE FROM ' . CONFIRM_TABLE . " + WHERE session_id NOT IN ($confirm_sql)"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Could not delete stale confirm data', '', __LINE__, __FILE__, $sql); + } + } + $db->sql_freeresult($result); + + $sql = 'SELECT COUNT(session_id) AS attempts + FROM ' . CONFIRM_TABLE . " + WHERE session_id = '" . $userdata['session_id'] . "'"; + if (!($result = $db->sql_query($sql))) + { + message_die(GENERAL_ERROR, 'Could not obtain confirm code count', '', __LINE__, __FILE__, $sql); + } + + if ($row = $db->sql_fetchrow($result)) + { + if ($row['attempts'] > 3) + { + message_die(GENERAL_MESSAGE, $lang['Too_many_registers']); + } + } + $db->sql_freeresult($result); + + // Generate the required confirmation code + // NB 0 (zero) could get confused with O (the letter) so we make change it + $code = dss_rand(); + $code = substr(str_replace('0', 'Z', strtoupper(base_convert($code, 16, 35))), 2, 6); + + $confirm_id = md5(uniqid($user_ip)); + + $sql = 'INSERT INTO ' . CONFIRM_TABLE . " (confirm_id, session_id, code) + VALUES ('$confirm_id', '". $userdata['session_id'] . "', '$code')"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Could not insert new confirm code information', '', __LINE__, __FILE__, $sql); + } + + unset($code); + + $confirm_image = ''; + $s_hidden_fields .= ''; + + $template->assign_block_vars('switch_confirm', array()); + } + + + // + // Let's do an overall check for settings/versions which would prevent + // us from doing file uploads.... + // + $ini_val = ( phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var'; + $form_enctype = ( @$ini_val('file_uploads') == '0' || strtolower(@$ini_val('file_uploads') == 'off') || phpversion() == '4.0.4pl1' || !$board_config['allow_avatar_upload'] || ( phpversion() < '4.0.3' && @$ini_val('open_basedir') != '' ) ) ? '' : 'enctype="multipart/form-data"'; + + $template->assign_vars(array( + 'USERNAME' => isset($username) ? $username : '', + 'CUR_PASSWORD' => isset($cur_password) ? $cur_password : '', + 'NEW_PASSWORD' => isset($new_password) ? $new_password : '', + 'PASSWORD_CONFIRM' => isset($password_confirm) ? $password_confirm : '', + 'EMAIL' => isset($email) ? $email : '', + 'CONFIRM_IMG' => $confirm_image, + 'YIM' => $yim, + 'ICQ' => $icq, + 'MSN' => $msn, + 'AIM' => $aim, + 'OCCUPATION' => $occupation, + 'INTERESTS' => $interests, + 'LOCATION' => $location, + 'WEBSITE' => $website, + 'SIGNATURE' => str_replace('
    ', "\n", $signature), + 'VIEW_EMAIL_YES' => ( $viewemail ) ? 'checked="checked"' : '', + 'VIEW_EMAIL_NO' => ( !$viewemail ) ? 'checked="checked"' : '', + 'HIDE_USER_YES' => ( !$allowviewonline ) ? 'checked="checked"' : '', + 'HIDE_USER_NO' => ( $allowviewonline ) ? 'checked="checked"' : '', + 'NOTIFY_PM_YES' => ( $notifypm ) ? 'checked="checked"' : '', + 'NOTIFY_PM_NO' => ( !$notifypm ) ? 'checked="checked"' : '', + 'POPUP_PM_YES' => ( $popup_pm ) ? 'checked="checked"' : '', + 'POPUP_PM_NO' => ( !$popup_pm ) ? 'checked="checked"' : '', + 'ALWAYS_ADD_SIGNATURE_YES' => ( $attachsig ) ? 'checked="checked"' : '', + 'ALWAYS_ADD_SIGNATURE_NO' => ( !$attachsig ) ? 'checked="checked"' : '', + 'NOTIFY_REPLY_YES' => ( $notifyreply ) ? 'checked="checked"' : '', + 'NOTIFY_REPLY_NO' => ( !$notifyreply ) ? 'checked="checked"' : '', + 'ALWAYS_ALLOW_BBCODE_YES' => ( $allowbbcode ) ? 'checked="checked"' : '', + 'ALWAYS_ALLOW_BBCODE_NO' => ( !$allowbbcode ) ? 'checked="checked"' : '', + 'ALWAYS_ALLOW_HTML_YES' => ( $allowhtml ) ? 'checked="checked"' : '', + 'ALWAYS_ALLOW_HTML_NO' => ( !$allowhtml ) ? 'checked="checked"' : '', + 'ALWAYS_ALLOW_SMILIES_YES' => ( $allowsmilies ) ? 'checked="checked"' : '', + 'ALWAYS_ALLOW_SMILIES_NO' => ( !$allowsmilies ) ? 'checked="checked"' : '', + 'ALLOW_AVATAR' => $board_config['allow_avatar_upload'], + 'AVATAR' => $avatar_img, + 'AVATAR_SIZE' => $board_config['avatar_filesize'], + 'LANGUAGE_SELECT' => language_select($user_lang, 'language'), + 'STYLE_SELECT' => style_select($user_style, 'style'), + 'TIMEZONE_SELECT' => tz_select($user_timezone, 'timezone'), + 'DATE_FORMAT' => $user_dateformat, + 'HTML_STATUS' => $html_status, + 'BBCODE_STATUS' => sprintf($bbcode_status, '', ''), + 'SMILIES_STATUS' => $smilies_status, + + 'L_CURRENT_PASSWORD' => $lang['Current_password'], + 'L_NEW_PASSWORD' => ( $mode == 'register' ) ? $lang['Password'] : $lang['New_password'], + 'L_CONFIRM_PASSWORD' => $lang['Confirm_password'], + 'L_CONFIRM_PASSWORD_EXPLAIN' => ( $mode == 'editprofile' ) ? $lang['Confirm_password_explain'] : '', + 'L_PASSWORD_IF_CHANGED' => ( $mode == 'editprofile' ) ? $lang['password_if_changed'] : '', + 'L_PASSWORD_CONFIRM_IF_CHANGED' => ( $mode == 'editprofile' ) ? $lang['password_confirm_if_changed'] : '', + 'L_SUBMIT' => $lang['Submit'], + 'L_RESET' => $lang['Reset'], + 'L_ICQ_NUMBER' => $lang['ICQ'], + 'L_MESSENGER' => $lang['MSNM'], + 'L_YAHOO' => $lang['YIM'], + 'L_WEBSITE' => $lang['Website'], + 'L_AIM' => $lang['AIM'], + 'L_LOCATION' => $lang['Location'], + 'L_OCCUPATION' => $lang['Occupation'], + 'L_BOARD_LANGUAGE' => $lang['Board_lang'], + 'L_BOARD_STYLE' => $lang['Board_style'], + 'L_TIMEZONE' => $lang['Timezone'], + 'L_DATE_FORMAT' => $lang['Date_format'], + 'L_DATE_FORMAT_EXPLAIN' => $lang['Date_format_explain'], + 'L_YES' => $lang['Yes'], + 'L_NO' => $lang['No'], + 'L_INTERESTS' => $lang['Interests'], + 'L_ALWAYS_ALLOW_SMILIES' => $lang['Always_smile'], + 'L_ALWAYS_ALLOW_BBCODE' => $lang['Always_bbcode'], + 'L_ALWAYS_ALLOW_HTML' => $lang['Always_html'], + 'L_HIDE_USER' => $lang['Hide_user'], + 'L_ALWAYS_ADD_SIGNATURE' => $lang['Always_add_sig'], + + 'L_AVATAR_PANEL' => $lang['Avatar_panel'], + 'L_AVATAR_EXPLAIN' => sprintf($lang['Avatar_explain'], $board_config['avatar_max_width'], $board_config['avatar_max_height'], (round($board_config['avatar_filesize'] / 1024))), + 'L_UPLOAD_AVATAR_FILE' => $lang['Upload_Avatar_file'], + 'L_UPLOAD_AVATAR_URL' => $lang['Upload_Avatar_URL'], + 'L_UPLOAD_AVATAR_URL_EXPLAIN' => $lang['Upload_Avatar_URL_explain'], + 'L_AVATAR_GALLERY' => $lang['Select_from_gallery'], + 'L_SHOW_GALLERY' => $lang['View_avatar_gallery'], + 'L_LINK_REMOTE_AVATAR' => $lang['Link_remote_Avatar'], + 'L_LINK_REMOTE_AVATAR_EXPLAIN' => $lang['Link_remote_Avatar_explain'], + 'L_DELETE_AVATAR' => $lang['Delete_Image'], + 'L_CURRENT_IMAGE' => $lang['Current_Image'], + + 'L_SIGNATURE' => $lang['Signature'], + 'L_SIGNATURE_EXPLAIN' => sprintf($lang['Signature_explain'], $board_config['max_sig_chars']), + 'L_NOTIFY_ON_REPLY' => $lang['Always_notify'], + 'L_NOTIFY_ON_REPLY_EXPLAIN' => $lang['Always_notify_explain'], + 'L_NOTIFY_ON_PRIVMSG' => $lang['Notify_on_privmsg'], + 'L_POPUP_ON_PRIVMSG' => $lang['Popup_on_privmsg'], + 'L_POPUP_ON_PRIVMSG_EXPLAIN' => $lang['Popup_on_privmsg_explain'], + 'L_PREFERENCES' => $lang['Preferences'], + 'L_PUBLIC_VIEW_EMAIL' => $lang['Public_view_email'], + 'L_ITEMS_REQUIRED' => $lang['Items_required'], + 'L_REGISTRATION_INFO' => $lang['Registration_info'], + 'L_PROFILE_INFO' => $lang['Profile_info'], + 'L_PROFILE_INFO_NOTICE' => $lang['Profile_info_warn'], + 'L_EMAIL_ADDRESS' => $lang['Email_address'], + + 'L_CONFIRM_CODE_IMPAIRED' => sprintf($lang['Confirm_code_impaired'], '', ''), + 'L_CONFIRM_CODE' => $lang['Confirm_code'], + 'L_CONFIRM_CODE_EXPLAIN' => $lang['Confirm_code_explain'], + + 'S_ALLOW_AVATAR_UPLOAD' => $board_config['allow_avatar_upload'], + 'S_ALLOW_AVATAR_LOCAL' => $board_config['allow_avatar_local'], + 'S_ALLOW_AVATAR_REMOTE' => $board_config['allow_avatar_remote'], + 'S_HIDDEN_FIELDS' => $s_hidden_fields, + 'S_FORM_ENCTYPE' => $form_enctype, + 'S_PROFILE_ACTION' => append_sid("profile.$phpEx")) + ); + + // + // This is another cheat using the block_var capability + // of the templates to 'fake' an IF...ELSE...ENDIF solution + // it works well :) + // + if ( $mode != 'register' ) + { + if ( $userdata['user_allowavatar'] && ( $board_config['allow_avatar_upload'] || $board_config['allow_avatar_local'] || $board_config['allow_avatar_remote'] ) ) + { + $template->assign_block_vars('switch_avatar_block', array() ); + + if ( $board_config['allow_avatar_upload'] && file_exists(@phpbb_realpath('./' . $board_config['avatar_path'])) ) + { + if ( $form_enctype != '' ) + { + $template->assign_block_vars('switch_avatar_block.switch_avatar_local_upload', array() ); + } + $template->assign_block_vars('switch_avatar_block.switch_avatar_remote_upload', array() ); + } + + if ( $board_config['allow_avatar_remote'] ) + { + $template->assign_block_vars('switch_avatar_block.switch_avatar_remote_link', array() ); + } + + if ( $board_config['allow_avatar_local'] && file_exists(@phpbb_realpath('./' . $board_config['avatar_gallery_path'])) ) + { + $template->assign_block_vars('switch_avatar_block.switch_avatar_local_gallery', array() ); + } + } + } +} + +$template->pparse('body'); + +include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + +?> \ No newline at end of file diff --git a/phpBB/includes/usercp_sendpasswd.php b/phpBB/includes/usercp_sendpasswd.php new file mode 100644 index 0000000000..b8617a04b9 --- /dev/null +++ b/phpBB/includes/usercp_sendpasswd.php @@ -0,0 +1,138 @@ +sql_query($sql) ) + { + if ( $row = $db->sql_fetchrow($result) ) + { + if ( !$row['user_active'] ) + { + message_die(GENERAL_MESSAGE, $lang['No_send_account_inactive']); + } + + $username = $row['username']; + $user_id = $row['user_id']; + + $user_actkey = gen_rand_string(true); + $key_len = 54 - strlen($server_url); + $key_len = ($key_len > 6) ? $key_len : 6; + $user_actkey = substr($user_actkey, 0, $key_len); + $user_password = gen_rand_string(false); + + $sql = "UPDATE " . USERS_TABLE . " + SET user_newpasswd = '" . md5($user_password) . "', user_actkey = '$user_actkey' + WHERE user_id = " . $row['user_id']; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update new password information', '', __LINE__, __FILE__, $sql); + } + + include($phpbb_root_path . 'includes/emailer.'.$phpEx); + $emailer = new emailer($board_config['smtp_delivery']); + + $emailer->from($board_config['board_email']); + $emailer->replyto($board_config['board_email']); + + $emailer->use_template('user_activate_passwd', $row['user_lang']); + $emailer->email_address($row['user_email']); + $emailer->set_subject($lang['New_password_activation']); + + $emailer->assign_vars(array( + 'SITENAME' => $board_config['sitename'], + 'USERNAME' => $username, + 'PASSWORD' => $user_password, + 'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('
    ', "\n", "-- \n" . $board_config['board_email_sig']) : '', + + 'U_ACTIVATE' => $server_url . '?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey) + ); + $emailer->send(); + $emailer->reset(); + + $template->assign_vars(array( + 'META' => '') + ); + + $message = $lang['Password_updated'] . '

    ' . sprintf($lang['Click_return_index'], '', ''); + + message_die(GENERAL_MESSAGE, $message); + } + else + { + message_die(GENERAL_MESSAGE, $lang['No_email_match']); + } + } + else + { + message_die(GENERAL_ERROR, 'Could not obtain user information for sendpassword', '', __LINE__, __FILE__, $sql); + } +} +else +{ + $username = ''; + $email = ''; +} + +// +// Output basic page +// +include($phpbb_root_path . 'includes/page_header.'.$phpEx); + +$template->set_filenames(array( + 'body' => 'profile_send_pass.tpl') +); +make_jumpbox('viewforum.'.$phpEx); + +$template->assign_vars(array( + 'USERNAME' => $username, + 'EMAIL' => $email, + + 'L_SEND_PASSWORD' => $lang['Send_password'], + 'L_ITEMS_REQUIRED' => $lang['Items_required'], + 'L_EMAIL_ADDRESS' => $lang['Email_address'], + 'L_SUBMIT' => $lang['Submit'], + 'L_RESET' => $lang['Reset'], + + 'S_HIDDEN_FIELDS' => '', + 'S_PROFILE_ACTION' => append_sid("profile.$phpEx?mode=sendpassword")) +); + +$template->pparse('body'); + +include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + +?> \ No newline at end of file diff --git a/phpBB/includes/usercp_viewprofile.php b/phpBB/includes/usercp_viewprofile.php new file mode 100644 index 0000000000..daa115add1 --- /dev/null +++ b/phpBB/includes/usercp_viewprofile.php @@ -0,0 +1,249 @@ +sql_query($sql)) ) +{ + message_die(GENERAL_ERROR, 'Could not obtain ranks information', '', __LINE__, __FILE__, $sql); +} + +$ranksrow = array(); +while ( $row = $db->sql_fetchrow($result) ) +{ + $ranksrow[] = $row; +} +$db->sql_freeresult($result); + +// +// Output page header and profile_view template +// +$template->set_filenames(array( + 'body' => 'profile_view_body.tpl') +); +make_jumpbox('viewforum.'.$phpEx); + +// +// Calculate the number of days this user has been a member ($memberdays) +// Then calculate their posts per day +// +$regdate = $profiledata['user_regdate']; +$memberdays = max(1, round( ( time() - $regdate ) / 86400 )); +$posts_per_day = $profiledata['user_posts'] / $memberdays; + +// Get the users percentage of total posts +if ( $profiledata['user_posts'] != 0 ) +{ + $total_posts = get_db_stat('postcount'); + $percentage = ( $total_posts ) ? min(100, ($profiledata['user_posts'] / $total_posts) * 100) : 0; +} +else +{ + $percentage = 0; +} + +$avatar_img = ''; +if ( $profiledata['user_avatar_type'] && $profiledata['user_allowavatar'] ) +{ + switch( $profiledata['user_avatar_type'] ) + { + case USER_AVATAR_UPLOAD: + $avatar_img = ( $board_config['allow_avatar_upload'] ) ? '' : ''; + break; + case USER_AVATAR_REMOTE: + $avatar_img = ( $board_config['allow_avatar_remote'] ) ? '' : ''; + break; + case USER_AVATAR_GALLERY: + $avatar_img = ( $board_config['allow_avatar_local'] ) ? '' : ''; + break; + } +} + +$poster_rank = ''; +$rank_image = ''; +if ( $profiledata['user_rank'] ) +{ + for($i = 0; $i < count($ranksrow); $i++) + { + if ( $profiledata['user_rank'] == $ranksrow[$i]['rank_id'] && $ranksrow[$i]['rank_special'] ) + { + $poster_rank = $ranksrow[$i]['rank_title']; + $rank_image = ( $ranksrow[$i]['rank_image'] ) ? '' . $poster_rank . '
    ' : ''; + } + } +} +else +{ + for($i = 0; $i < count($ranksrow); $i++) + { + if ( $profiledata['user_posts'] >= $ranksrow[$i]['rank_min'] && !$ranksrow[$i]['rank_special'] ) + { + $poster_rank = $ranksrow[$i]['rank_title']; + $rank_image = ( $ranksrow[$i]['rank_image'] ) ? '' . $poster_rank . '
    ' : ''; + } + } +} + +$temp_url = append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=" . $profiledata['user_id']); +$pm_img = '' . $lang['Send_private_message'] . ''; +$pm = '' . $lang['Send_private_message'] . ''; + +if ( !empty($profiledata['user_viewemail']) || $userdata['user_level'] == ADMIN ) +{ + $email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $profiledata['user_id']) : 'mailto:' . $profiledata['user_email']; + + $email_img = '' . $lang['Send_email'] . ''; + $email = '' . $lang['Send_email'] . ''; +} +else +{ + $email_img = ' '; + $email = ' '; +} + +$www_img = ( $profiledata['user_website'] ) ? '' . $lang['Visit_website'] . '' : ' '; +$www = ( $profiledata['user_website'] ) ? '' . $profiledata['user_website'] . '' : ' '; + +if ( !empty($profiledata['user_icq']) ) +{ + $icq_status_img = ''; + $icq_img = '' . $lang['ICQ'] . ''; + $icq = '' . $lang['ICQ'] . ''; +} +else +{ + $icq_status_img = ' '; + $icq_img = ' '; + $icq = ' '; +} + +$aim_img = ( $profiledata['user_aim'] ) ? '' . $lang['AIM'] . '' : ' '; +$aim = ( $profiledata['user_aim'] ) ? '' . $lang['AIM'] . '' : ' '; + +$msn_img = ( $profiledata['user_msnm'] ) ? $profiledata['user_msnm'] : ' '; +$msn = $msn_img; + +$yim_img = ( $profiledata['user_yim'] ) ? '' . $lang['YIM'] . '' : ''; +$yim = ( $profiledata['user_yim'] ) ? '' . $lang['YIM'] . '' : ''; + +$temp_url = append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&showresults=posts"); +$search_img = '' . sprintf($lang['Search_user_posts'], $profiledata['username']) . ''; +$search = '' . sprintf($lang['Search_user_posts'], $profiledata['username']) . ''; + +// +// Generate page +// +$page_title = $lang['Viewing_profile']; +include($phpbb_root_path . 'includes/page_header.'.$phpEx); + +if (function_exists('get_html_translation_table')) +{ + $u_search_author = urlencode(strtr($profiledata['username'], array_flip(get_html_translation_table(HTML_ENTITIES)))); +} +else +{ + $u_search_author = urlencode(str_replace(array('&', ''', '"', '<', '>'), array('&', "'", '"', '<', '>'), $profiledata['username'])); +} + +$template->assign_vars(array( + 'USERNAME' => $profiledata['username'], + 'JOINED' => create_date($lang['DATE_FORMAT'], $profiledata['user_regdate'], $board_config['board_timezone']), + 'POSTER_RANK' => $poster_rank, + 'RANK_IMAGE' => $rank_image, + 'POSTS_PER_DAY' => $posts_per_day, + 'POSTS' => $profiledata['user_posts'], + 'PERCENTAGE' => $percentage . '%', + 'POST_DAY_STATS' => sprintf($lang['User_post_day_stats'], $posts_per_day), + 'POST_PERCENT_STATS' => sprintf($lang['User_post_pct_stats'], $percentage), + + 'SEARCH_IMG' => $search_img, + 'SEARCH' => $search, + 'PM_IMG' => $pm_img, + 'PM' => $pm, + 'EMAIL_IMG' => $email_img, + 'EMAIL' => $email, + 'WWW_IMG' => $www_img, + 'WWW' => $www, + 'ICQ_STATUS_IMG' => $icq_status_img, + 'ICQ_IMG' => $icq_img, + 'ICQ' => $icq, + 'AIM_IMG' => $aim_img, + 'AIM' => $aim, + 'MSN_IMG' => $msn_img, + 'MSN' => $msn, + 'YIM_IMG' => $yim_img, + 'YIM' => $yim, + + 'LOCATION' => ( $profiledata['user_from'] ) ? $profiledata['user_from'] : ' ', + 'OCCUPATION' => ( $profiledata['user_occ'] ) ? $profiledata['user_occ'] : ' ', + 'INTERESTS' => ( $profiledata['user_interests'] ) ? $profiledata['user_interests'] : ' ', + 'AVATAR_IMG' => $avatar_img, + + 'L_VIEWING_PROFILE' => sprintf($lang['Viewing_user_profile'], $profiledata['username']), + 'L_ABOUT_USER' => sprintf($lang['About_user'], $profiledata['username']), + 'L_AVATAR' => $lang['Avatar'], + 'L_POSTER_RANK' => $lang['Poster_rank'], + 'L_JOINED' => $lang['Joined'], + 'L_TOTAL_POSTS' => $lang['Total_posts'], + 'L_SEARCH_USER_POSTS' => sprintf($lang['Search_user_posts'], $profiledata['username']), + 'L_CONTACT' => $lang['Contact'], + 'L_EMAIL_ADDRESS' => $lang['Email_address'], + 'L_EMAIL' => $lang['Email'], + 'L_PM' => $lang['Private_Message'], + 'L_ICQ_NUMBER' => $lang['ICQ'], + 'L_YAHOO' => $lang['YIM'], + 'L_AIM' => $lang['AIM'], + 'L_MESSENGER' => $lang['MSNM'], + 'L_WEBSITE' => $lang['Website'], + 'L_LOCATION' => $lang['Location'], + 'L_OCCUPATION' => $lang['Occupation'], + 'L_INTERESTS' => $lang['Interests'], + + 'U_SEARCH_USER' => append_sid("search.$phpEx?search_author=" . $u_search_author), + + 'S_PROFILE_ACTION' => append_sid("profile.$phpEx")) +); + +$template->pparse('body'); + +include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + +?> \ No newline at end of file diff --git a/phpBB/includes/utf/data/case_fold_c.php b/phpBB/includes/utf/data/case_fold_c.php deleted file mode 100644 index 00de1ba349..0000000000 --- a/phpBB/includes/utf/data/case_fold_c.php +++ /dev/null @@ -1 +0,0 @@ -'a','B'=>'b','C'=>'c','D'=>'d','E'=>'e','F'=>'f','G'=>'g','H'=>'h','I'=>'i','J'=>'j','K'=>'k','L'=>'l','M'=>'m','N'=>'n','O'=>'o','P'=>'p','Q'=>'q','R'=>'r','S'=>'s','T'=>'t','U'=>'u','V'=>'v','W'=>'w','X'=>'x','Y'=>'y','Z'=>'z','µ'=>'μ','À'=>'à','Ã'=>'á','Â'=>'â','Ã'=>'ã','Ä'=>'ä','Ã…'=>'Ã¥','Æ'=>'æ','Ç'=>'ç','È'=>'è','É'=>'é','Ê'=>'ê','Ë'=>'ë','ÃŒ'=>'ì','Ã'=>'í','ÃŽ'=>'î','Ã'=>'ï','Ã'=>'ð','Ñ'=>'ñ','Ã’'=>'ò','Ó'=>'ó','Ô'=>'ô','Õ'=>'õ','Ö'=>'ö','Ø'=>'ø','Ù'=>'ù','Ú'=>'ú','Û'=>'û','Ü'=>'ü','Ã'=>'ý','Þ'=>'þ','Ä€'=>'Ä','Ä‚'=>'ă','Ä„'=>'Ä…','Ć'=>'ć','Ĉ'=>'ĉ','ÄŠ'=>'Ä‹','ÄŒ'=>'Ä','ÄŽ'=>'Ä','Ä'=>'Ä‘','Ä’'=>'Ä“','Ä”'=>'Ä•','Ä–'=>'Ä—','Ę'=>'Ä™','Äš'=>'Ä›','Äœ'=>'Ä','Äž'=>'ÄŸ','Ä '=>'Ä¡','Ä¢'=>'Ä£','Ĥ'=>'Ä¥','Ħ'=>'ħ','Ĩ'=>'Ä©','Ī'=>'Ä«','Ĭ'=>'Ä­','Ä®'=>'į','IJ'=>'ij','Ä´'=>'ĵ','Ķ'=>'Ä·','Ĺ'=>'ĺ','Ä»'=>'ļ','Ľ'=>'ľ','Ä¿'=>'Å€','Å'=>'Å‚','Ń'=>'Å„','Å…'=>'ņ','Ň'=>'ň','ÅŠ'=>'Å‹','ÅŒ'=>'Å','ÅŽ'=>'Å','Å'=>'Å‘','Å’'=>'Å“','Å”'=>'Å•','Å–'=>'Å—','Ř'=>'Å™','Åš'=>'Å›','Åœ'=>'Å','Åž'=>'ÅŸ','Å '=>'Å¡','Å¢'=>'Å£','Ť'=>'Å¥','Ŧ'=>'ŧ','Ũ'=>'Å©','Ū'=>'Å«','Ŭ'=>'Å­','Å®'=>'ů','Ű'=>'ű','Ų'=>'ų','Å´'=>'ŵ','Ŷ'=>'Å·','Ÿ'=>'ÿ','Ź'=>'ź','Å»'=>'ż','Ž'=>'ž','Å¿'=>'s','Æ'=>'É“','Æ‚'=>'ƃ','Æ„'=>'Æ…','Ɔ'=>'É”','Ƈ'=>'ƈ','Ɖ'=>'É–','ÆŠ'=>'É—','Æ‹'=>'ÆŒ','ÆŽ'=>'Ç','Æ'=>'É™','Æ'=>'É›','Æ‘'=>'Æ’','Æ“'=>'É ','Æ”'=>'É£','Æ–'=>'É©','Æ—'=>'ɨ','Ƙ'=>'Æ™','Æœ'=>'ɯ','Æ'=>'ɲ','ÆŸ'=>'ɵ','Æ '=>'Æ¡','Æ¢'=>'Æ£','Ƥ'=>'Æ¥','Ʀ'=>'Ê€','Ƨ'=>'ƨ','Æ©'=>'ʃ','Ƭ'=>'Æ­','Æ®'=>'ʈ','Ư'=>'ư','Ʊ'=>'ÊŠ','Ʋ'=>'Ê‹','Ƴ'=>'Æ´','Ƶ'=>'ƶ','Æ·'=>'Ê’','Ƹ'=>'ƹ','Ƽ'=>'ƽ','Ç„'=>'dž','Ç…'=>'dž','LJ'=>'lj','Lj'=>'lj','ÇŠ'=>'ÇŒ','Ç‹'=>'ÇŒ','Ç'=>'ÇŽ','Ç'=>'Ç','Ç‘'=>'Ç’','Ç“'=>'Ç”','Ç•'=>'Ç–','Ç—'=>'ǘ','Ç™'=>'Çš','Ç›'=>'Çœ','Çž'=>'ÇŸ','Ç '=>'Ç¡','Ç¢'=>'Ç£','Ǥ'=>'Ç¥','Ǧ'=>'ǧ','Ǩ'=>'Ç©','Ǫ'=>'Ç«','Ǭ'=>'Ç­','Ç®'=>'ǯ','DZ'=>'dz','Dz'=>'dz','Ç´'=>'ǵ','Ƕ'=>'Æ•','Ç·'=>'Æ¿','Ǹ'=>'ǹ','Ǻ'=>'Ç»','Ǽ'=>'ǽ','Ǿ'=>'Ç¿','È€'=>'È','È‚'=>'ȃ','È„'=>'È…','Ȇ'=>'ȇ','Ȉ'=>'ȉ','ÈŠ'=>'È‹','ÈŒ'=>'È','ÈŽ'=>'È','È'=>'È‘','È’'=>'È“','È”'=>'È•','È–'=>'È—','Ș'=>'È™','Èš'=>'È›','Èœ'=>'È','Èž'=>'ÈŸ','È '=>'Æž','È¢'=>'È£','Ȥ'=>'È¥','Ȧ'=>'ȧ','Ȩ'=>'È©','Ȫ'=>'È«','Ȭ'=>'È­','È®'=>'ȯ','Ȱ'=>'ȱ','Ȳ'=>'ȳ','Ⱥ'=>'â±¥','È»'=>'ȼ','Ƚ'=>'Æš','Ⱦ'=>'ⱦ','É'=>'É‚','Ƀ'=>'Æ€','É„'=>'ʉ','É…'=>'ÊŒ','Ɇ'=>'ɇ','Ɉ'=>'ɉ','ÉŠ'=>'É‹','ÉŒ'=>'É','ÉŽ'=>'É','Í…'=>'ι','Ά'=>'ά','Έ'=>'έ','Ή'=>'ή','Ί'=>'ί','ÎŒ'=>'ÏŒ','ÎŽ'=>'Ï','Î'=>'ÏŽ','Α'=>'α','Î’'=>'β','Γ'=>'γ','Δ'=>'δ','Ε'=>'ε','Ζ'=>'ζ','Η'=>'η','Θ'=>'θ','Ι'=>'ι','Κ'=>'κ','Λ'=>'λ','Μ'=>'μ','Î'=>'ν','Ξ'=>'ξ','Ο'=>'ο','Π'=>'Ï€','Ρ'=>'Ï','Σ'=>'σ','Τ'=>'Ï„','Î¥'=>'Ï…','Φ'=>'φ','Χ'=>'χ','Ψ'=>'ψ','Ω'=>'ω','Ϊ'=>'ÏŠ','Ϋ'=>'Ï‹','Ï‚'=>'σ','Ï'=>'β','Ï‘'=>'θ','Ï•'=>'φ','Ï–'=>'Ï€','Ϙ'=>'Ï™','Ïš'=>'Ï›','Ïœ'=>'Ï','Ïž'=>'ÏŸ','Ï '=>'Ï¡','Ï¢'=>'Ï£','Ϥ'=>'Ï¥','Ϧ'=>'ϧ','Ϩ'=>'Ï©','Ϫ'=>'Ï«','Ϭ'=>'Ï­','Ï®'=>'ϯ','ϰ'=>'κ','ϱ'=>'Ï','Ï´'=>'θ','ϵ'=>'ε','Ï·'=>'ϸ','Ϲ'=>'ϲ','Ϻ'=>'Ï»','Ͻ'=>'Í»','Ͼ'=>'ͼ','Ï¿'=>'ͽ','Ѐ'=>'Ñ','Ð'=>'Ñ‘','Ђ'=>'Ñ’','Ѓ'=>'Ñ“','Є'=>'Ñ”','Ð…'=>'Ñ•','І'=>'Ñ–','Ї'=>'Ñ—','Ј'=>'ј','Љ'=>'Ñ™','Њ'=>'Ñš','Ћ'=>'Ñ›','ÐŒ'=>'Ñœ','Ð'=>'Ñ','ÐŽ'=>'Ñž','Ð'=>'ÑŸ','Ð'=>'а','Б'=>'б','Ð’'=>'в','Г'=>'г','Д'=>'д','Е'=>'е','Ж'=>'ж','З'=>'з','И'=>'и','Й'=>'й','К'=>'к','Л'=>'л','М'=>'м','Ð'=>'н','О'=>'о','П'=>'п','Р'=>'Ñ€','С'=>'Ñ','Т'=>'Ñ‚','У'=>'у','Ф'=>'Ñ„','Ð¥'=>'Ñ…','Ц'=>'ц','Ч'=>'ч','Ш'=>'ш','Щ'=>'щ','Ъ'=>'ÑŠ','Ы'=>'Ñ‹','Ь'=>'ÑŒ','Э'=>'Ñ','Ю'=>'ÑŽ','Я'=>'Ñ','Ñ '=>'Ñ¡','Ñ¢'=>'Ñ£','Ѥ'=>'Ñ¥','Ѧ'=>'ѧ','Ѩ'=>'Ñ©','Ѫ'=>'Ñ«','Ѭ'=>'Ñ­','Ñ®'=>'ѯ','Ѱ'=>'ѱ','Ѳ'=>'ѳ','Ñ´'=>'ѵ','Ѷ'=>'Ñ·','Ѹ'=>'ѹ','Ѻ'=>'Ñ»','Ѽ'=>'ѽ','Ѿ'=>'Ñ¿','Ò€'=>'Ò','ÒŠ'=>'Ò‹','ÒŒ'=>'Ò','ÒŽ'=>'Ò','Ò'=>'Ò‘','Ò’'=>'Ò“','Ò”'=>'Ò•','Ò–'=>'Ò—','Ò˜'=>'Ò™','Òš'=>'Ò›','Òœ'=>'Ò','Òž'=>'ÒŸ','Ò '=>'Ò¡','Ò¢'=>'Ò£','Ò¤'=>'Ò¥','Ò¦'=>'Ò§','Ò¨'=>'Ò©','Òª'=>'Ò«','Ò¬'=>'Ò­','Ò®'=>'Ò¯','Ò°'=>'Ò±','Ò²'=>'Ò³','Ò´'=>'Òµ','Ò¶'=>'Ò·','Ò¸'=>'Ò¹','Òº'=>'Ò»','Ò¼'=>'Ò½','Ò¾'=>'Ò¿','Ó€'=>'Ó','Ó'=>'Ó‚','Óƒ'=>'Ó„','Ó…'=>'Ó†','Ó‡'=>'Óˆ','Ó‰'=>'ÓŠ','Ó‹'=>'ÓŒ','Ó'=>'ÓŽ','Ó'=>'Ó‘','Ó’'=>'Ó“','Ó”'=>'Ó•','Ó–'=>'Ó—','Ó˜'=>'Ó™','Óš'=>'Ó›','Óœ'=>'Ó','Óž'=>'ÓŸ','Ó '=>'Ó¡','Ó¢'=>'Ó£','Ó¤'=>'Ó¥','Ó¦'=>'Ó§','Ó¨'=>'Ó©','Óª'=>'Ó«','Ó¬'=>'Ó­','Ó®'=>'Ó¯','Ó°'=>'Ó±','Ó²'=>'Ó³','Ó´'=>'Óµ','Ó¶'=>'Ó·','Ó¸'=>'Ó¹','Óº'=>'Ó»','Ó¼'=>'Ó½','Ó¾'=>'Ó¿','Ô€'=>'Ô','Ô‚'=>'Ôƒ','Ô„'=>'Ô…','Ô†'=>'Ô‡','Ôˆ'=>'Ô‰','ÔŠ'=>'Ô‹','ÔŒ'=>'Ô','ÔŽ'=>'Ô','Ô'=>'Ô‘','Ô’'=>'Ô“','Ô±'=>'Õ¡','Ô²'=>'Õ¢','Ô³'=>'Õ£','Ô´'=>'Õ¤','Ôµ'=>'Õ¥','Ô¶'=>'Õ¦','Ô·'=>'Õ§','Ô¸'=>'Õ¨','Ô¹'=>'Õ©','Ôº'=>'Õª','Ô»'=>'Õ«','Ô¼'=>'Õ¬','Ô½'=>'Õ­','Ô¾'=>'Õ®','Ô¿'=>'Õ¯','Õ€'=>'Õ°','Õ'=>'Õ±','Õ‚'=>'Õ²','Õƒ'=>'Õ³','Õ„'=>'Õ´','Õ…'=>'Õµ','Õ†'=>'Õ¶','Õ‡'=>'Õ·','Õˆ'=>'Õ¸','Õ‰'=>'Õ¹','ÕŠ'=>'Õº','Õ‹'=>'Õ»','ÕŒ'=>'Õ¼','Õ'=>'Õ½','ÕŽ'=>'Õ¾','Õ'=>'Õ¿','Õ'=>'Ö€','Õ‘'=>'Ö','Õ’'=>'Ö‚','Õ“'=>'Öƒ','Õ”'=>'Ö„','Õ•'=>'Ö…','Õ–'=>'Ö†','á‚ '=>'â´€','á‚¡'=>'â´','á‚¢'=>'â´‚','á‚£'=>'â´ƒ','Ⴄ'=>'â´„','á‚¥'=>'â´…','Ⴆ'=>'â´†','á‚§'=>'â´‡','Ⴈ'=>'â´ˆ','á‚©'=>'â´‰','Ⴊ'=>'â´Š','á‚«'=>'â´‹','Ⴌ'=>'â´Œ','á‚­'=>'â´','á‚®'=>'â´Ž','Ⴏ'=>'â´','á‚°'=>'â´','Ⴑ'=>'â´‘','Ⴒ'=>'â´’','Ⴓ'=>'â´“','á‚´'=>'â´”','Ⴕ'=>'â´•','á‚¶'=>'â´–','á‚·'=>'â´—','Ⴘ'=>'â´˜','Ⴙ'=>'â´™','Ⴚ'=>'â´š','á‚»'=>'â´›','Ⴜ'=>'â´œ','Ⴝ'=>'â´','Ⴞ'=>'â´ž','á‚¿'=>'â´Ÿ','Ⴠ'=>'â´ ','áƒ'=>'â´¡','Ⴢ'=>'â´¢','Ⴣ'=>'â´£','Ⴤ'=>'â´¤','Ⴥ'=>'â´¥','Ḁ'=>'á¸','Ḃ'=>'ḃ','Ḅ'=>'ḅ','Ḇ'=>'ḇ','Ḉ'=>'ḉ','Ḋ'=>'ḋ','Ḍ'=>'á¸','Ḏ'=>'á¸','á¸'=>'ḑ','Ḓ'=>'ḓ','Ḕ'=>'ḕ','Ḗ'=>'ḗ','Ḙ'=>'ḙ','Ḛ'=>'ḛ','Ḝ'=>'á¸','Ḟ'=>'ḟ','Ḡ'=>'ḡ','Ḣ'=>'ḣ','Ḥ'=>'ḥ','Ḧ'=>'ḧ','Ḩ'=>'ḩ','Ḫ'=>'ḫ','Ḭ'=>'ḭ','Ḯ'=>'ḯ','Ḱ'=>'ḱ','Ḳ'=>'ḳ','Ḵ'=>'ḵ','Ḷ'=>'ḷ','Ḹ'=>'ḹ','Ḻ'=>'ḻ','Ḽ'=>'ḽ','Ḿ'=>'ḿ','á¹€'=>'á¹','Ṃ'=>'ṃ','Ṅ'=>'á¹…','Ṇ'=>'ṇ','Ṉ'=>'ṉ','Ṋ'=>'ṋ','Ṍ'=>'á¹','Ṏ'=>'á¹','á¹'=>'ṑ','á¹’'=>'ṓ','á¹”'=>'ṕ','á¹–'=>'á¹—','Ṙ'=>'á¹™','Ṛ'=>'á¹›','Ṝ'=>'á¹','Ṟ'=>'ṟ','á¹ '=>'ṡ','á¹¢'=>'á¹£','Ṥ'=>'á¹¥','Ṧ'=>'á¹§','Ṩ'=>'ṩ','Ṫ'=>'ṫ','Ṭ'=>'á¹­','á¹®'=>'ṯ','á¹°'=>'á¹±','á¹²'=>'á¹³','á¹´'=>'á¹µ','á¹¶'=>'á¹·','Ṹ'=>'á¹¹','Ṻ'=>'á¹»','á¹¼'=>'á¹½','á¹¾'=>'ṿ','Ẁ'=>'áº','Ẃ'=>'ẃ','Ẅ'=>'ẅ','Ẇ'=>'ẇ','Ẉ'=>'ẉ','Ẋ'=>'ẋ','Ẍ'=>'áº','Ẏ'=>'áº','áº'=>'ẑ','Ẓ'=>'ẓ','Ẕ'=>'ẕ','ẛ'=>'ṡ','Ạ'=>'ạ','Ả'=>'ả','Ấ'=>'ấ','Ầ'=>'ầ','Ẩ'=>'ẩ','Ẫ'=>'ẫ','Ậ'=>'ậ','Ắ'=>'ắ','Ằ'=>'ằ','Ẳ'=>'ẳ','Ẵ'=>'ẵ','Ặ'=>'ặ','Ẹ'=>'ẹ','Ẻ'=>'ẻ','Ẽ'=>'ẽ','Ế'=>'ế','Ề'=>'á»','Ể'=>'ể','Ễ'=>'á»…','Ệ'=>'ệ','Ỉ'=>'ỉ','Ị'=>'ị','Ọ'=>'á»','Ỏ'=>'á»','á»'=>'ố','á»’'=>'ồ','á»”'=>'ổ','á»–'=>'á»—','Ộ'=>'á»™','Ớ'=>'á»›','Ờ'=>'á»','Ở'=>'ở','á» '=>'ỡ','Ợ'=>'ợ','Ụ'=>'ụ','Ủ'=>'á»§','Ứ'=>'ứ','Ừ'=>'ừ','Ử'=>'á»­','á»®'=>'ữ','á»°'=>'á»±','Ỳ'=>'ỳ','á»´'=>'ỵ','á»¶'=>'á»·','Ỹ'=>'ỹ','Ἀ'=>'á¼€','Ἁ'=>'á¼','Ἂ'=>'ἂ','Ἃ'=>'ἃ','Ἄ'=>'ἄ','á¼'=>'á¼…','Ἆ'=>'ἆ','á¼'=>'ἇ','Ἐ'=>'á¼','á¼™'=>'ἑ','Ἒ'=>'á¼’','á¼›'=>'ἓ','Ἔ'=>'á¼”','á¼'=>'ἕ','Ἠ'=>'á¼ ','Ἡ'=>'ἡ','Ἢ'=>'á¼¢','Ἣ'=>'á¼£','Ἤ'=>'ἤ','á¼­'=>'á¼¥','á¼®'=>'ἦ','Ἧ'=>'á¼§','Ἰ'=>'á¼°','á¼¹'=>'á¼±','Ἲ'=>'á¼²','á¼»'=>'á¼³','á¼¼'=>'á¼´','á¼½'=>'á¼µ','á¼¾'=>'á¼¶','Ἷ'=>'á¼·','Ὀ'=>'á½€','Ὁ'=>'á½','Ὂ'=>'ὂ','Ὃ'=>'ὃ','Ὄ'=>'ὄ','á½'=>'á½…','á½™'=>'ὑ','á½›'=>'ὓ','á½'=>'ὕ','Ὗ'=>'á½—','Ὠ'=>'á½ ','Ὡ'=>'ὡ','Ὢ'=>'á½¢','Ὣ'=>'á½£','Ὤ'=>'ὤ','á½­'=>'á½¥','á½®'=>'ὦ','Ὧ'=>'á½§','Ᾰ'=>'á¾°','á¾¹'=>'á¾±','Ὰ'=>'á½°','á¾»'=>'á½±','á¾¾'=>'ι','Ὲ'=>'á½²','Έ'=>'á½³','Ὴ'=>'á½´','á¿‹'=>'á½µ','Ῐ'=>'á¿','á¿™'=>'á¿‘','Ὶ'=>'á½¶','á¿›'=>'á½·','Ῠ'=>'á¿ ','á¿©'=>'á¿¡','Ὺ'=>'ὺ','á¿«'=>'á½»','Ῥ'=>'á¿¥','Ὸ'=>'ὸ','Ό'=>'á½¹','Ὼ'=>'á½¼','á¿»'=>'á½½','Ω'=>'ω','K'=>'k','â„«'=>'Ã¥','Ⅎ'=>'â…Ž','â… '=>'â…°','â…¡'=>'â…±','â…¢'=>'â…²','â…£'=>'â…³','â…¤'=>'â…´','â…¥'=>'â…µ','â…¦'=>'â…¶','â…§'=>'â…·','â…¨'=>'â…¸','â…©'=>'â…¹','â…ª'=>'â…º','â…«'=>'â…»','â…¬'=>'â…¼','â…­'=>'â…½','â…®'=>'â…¾','â…¯'=>'â…¿','Ↄ'=>'ↄ','â’¶'=>'â“','â’·'=>'â“‘','â’¸'=>'â“’','â’¹'=>'â““','â’º'=>'â“”','â’»'=>'â“•','â’¼'=>'â“–','â’½'=>'â“—','â’¾'=>'ⓘ','â’¿'=>'â“™','â“€'=>'ⓚ','â“'=>'â“›','â“‚'=>'ⓜ','Ⓝ'=>'â“','â“„'=>'ⓞ','â“…'=>'ⓟ','Ⓠ'=>'â“ ','Ⓡ'=>'â“¡','Ⓢ'=>'â“¢','Ⓣ'=>'â“£','Ⓤ'=>'ⓤ','â“‹'=>'â“¥','Ⓦ'=>'ⓦ','â“'=>'â“§','Ⓨ'=>'ⓨ','â“'=>'â“©','â°€'=>'â°°','â°'=>'â°±','â°‚'=>'â°²','â°ƒ'=>'â°³','â°„'=>'â°´','â°…'=>'â°µ','â°†'=>'â°¶','â°‡'=>'â°·','â°ˆ'=>'â°¸','â°‰'=>'â°¹','â°Š'=>'â°º','â°‹'=>'â°»','â°Œ'=>'â°¼','â°'=>'â°½','â°Ž'=>'â°¾','â°'=>'â°¿','â°'=>'â±€','â°‘'=>'â±','â°’'=>'ⱂ','â°“'=>'ⱃ','â°”'=>'ⱄ','â°•'=>'â±…','â°–'=>'ⱆ','â°—'=>'ⱇ','â°˜'=>'ⱈ','â°™'=>'ⱉ','â°š'=>'ⱊ','â°›'=>'ⱋ','â°œ'=>'ⱌ','â°'=>'â±','â°ž'=>'ⱎ','â°Ÿ'=>'â±','â° '=>'â±','â°¡'=>'ⱑ','â°¢'=>'â±’','â°£'=>'ⱓ','â°¤'=>'â±”','â°¥'=>'ⱕ','â°¦'=>'â±–','â°§'=>'â±—','â°¨'=>'ⱘ','â°©'=>'â±™','â°ª'=>'ⱚ','â°«'=>'â±›','â°¬'=>'ⱜ','â°­'=>'â±','â°®'=>'ⱞ','â± '=>'ⱡ','â±¢'=>'É«','â±£'=>'áµ½','Ɽ'=>'ɽ','â±§'=>'ⱨ','Ⱪ'=>'ⱪ','Ⱬ'=>'ⱬ','â±µ'=>'â±¶','â²€'=>'â²','Ⲃ'=>'ⲃ','Ⲅ'=>'â²…','Ⲇ'=>'ⲇ','Ⲉ'=>'ⲉ','Ⲋ'=>'ⲋ','Ⲍ'=>'â²','Ⲏ'=>'â²','â²'=>'ⲑ','â²’'=>'ⲓ','â²”'=>'ⲕ','â²–'=>'â²—','Ⲙ'=>'â²™','Ⲛ'=>'â²›','Ⲝ'=>'â²','Ⲟ'=>'ⲟ','â² '=>'ⲡ','â²¢'=>'â²£','Ⲥ'=>'â²¥','Ⲧ'=>'â²§','Ⲩ'=>'ⲩ','Ⲫ'=>'ⲫ','Ⲭ'=>'â²­','â²®'=>'ⲯ','â²°'=>'â²±','â²²'=>'â²³','â²´'=>'â²µ','â²¶'=>'â²·','Ⲹ'=>'â²¹','Ⲻ'=>'â²»','â²¼'=>'â²½','â²¾'=>'ⲿ','â³€'=>'â³','Ⳃ'=>'ⳃ','Ⳅ'=>'â³…','Ⳇ'=>'ⳇ','Ⳉ'=>'ⳉ','Ⳋ'=>'ⳋ','Ⳍ'=>'â³','Ⳏ'=>'â³','â³'=>'ⳑ','â³’'=>'ⳓ','â³”'=>'ⳕ','â³–'=>'â³—','Ⳙ'=>'â³™','Ⳛ'=>'â³›','Ⳝ'=>'â³','Ⳟ'=>'ⳟ','â³ '=>'ⳡ','â³¢'=>'â³£','A'=>'ï½','ï¼¢'=>'b','ï¼£'=>'c','D'=>'d','ï¼¥'=>'ï½…','F'=>'f','ï¼§'=>'g','H'=>'h','I'=>'i','J'=>'j','K'=>'k','L'=>'l','ï¼­'=>'ï½','ï¼®'=>'n','O'=>'ï½','ï¼°'=>'ï½','ï¼±'=>'q','ï¼²'=>'ï½’','ï¼³'=>'s','ï¼´'=>'ï½”','ï¼µ'=>'u','ï¼¶'=>'ï½–','ï¼·'=>'ï½—','X'=>'x','ï¼¹'=>'ï½™','Z'=>'z','ð€'=>'ð¨','ð'=>'ð©','ð‚'=>'ðª','ðƒ'=>'ð«','ð„'=>'ð¬','ð…'=>'ð­','ð†'=>'ð®','ð‡'=>'ð¯','ðˆ'=>'ð°','ð‰'=>'ð±','ðŠ'=>'ð²','ð‹'=>'ð³','ðŒ'=>'ð´','ð'=>'ðµ','ðŽ'=>'ð¶','ð'=>'ð·','ð'=>'ð¸','ð‘'=>'ð¹','ð’'=>'ðº','ð“'=>'ð»','ð”'=>'ð¼','ð•'=>'ð½','ð–'=>'ð¾','ð—'=>'ð¿','ð˜'=>'ð‘€','ð™'=>'ð‘','ðš'=>'ð‘‚','ð›'=>'ð‘ƒ','ðœ'=>'ð‘„','ð'=>'ð‘…','ðž'=>'ð‘†','ðŸ'=>'ð‘‡','ð '=>'ð‘ˆ','ð¡'=>'ð‘‰','ð¢'=>'ð‘Š','ð£'=>'ð‘‹','ð¤'=>'ð‘Œ','ð¥'=>'ð‘','ð¦'=>'ð‘Ž','ð§'=>'ð‘'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/case_fold_f.php b/phpBB/includes/utf/data/case_fold_f.php deleted file mode 100644 index 7e2ffb25ec..0000000000 --- a/phpBB/includes/utf/data/case_fold_f.php +++ /dev/null @@ -1 +0,0 @@ -'ss','İ'=>'i̇','ʼn'=>'ʼn','ǰ'=>'jÌŒ','Î'=>'ϊÌ','ΰ'=>'ϋÌ','Ö‡'=>'Õ¥Ö‚','ẖ'=>'ẖ','ẗ'=>'ẗ','ẘ'=>'wÌŠ','ẙ'=>'yÌŠ','ẚ'=>'aʾ','á½'=>'Ï…Ì“','á½’'=>'ὒ','á½”'=>'Ï…Ì“Ì','á½–'=>'ὖ','á¾€'=>'ἀι','á¾'=>'á¼Î¹','ᾂ'=>'ἂι','ᾃ'=>'ἃι','ᾄ'=>'ἄι','á¾…'=>'ἅι','ᾆ'=>'ἆι','ᾇ'=>'ἇι','ᾈ'=>'ἀι','ᾉ'=>'á¼Î¹','ᾊ'=>'ἂι','ᾋ'=>'ἃι','ᾌ'=>'ἄι','á¾'=>'ἅι','ᾎ'=>'ἆι','á¾'=>'ἇι','á¾'=>'ἠι','ᾑ'=>'ἡι','á¾’'=>'ἢι','ᾓ'=>'ἣι','á¾”'=>'ἤι','ᾕ'=>'ἥι','á¾–'=>'ἦι','á¾—'=>'ἧι','ᾘ'=>'ἠι','á¾™'=>'ἡι','ᾚ'=>'ἢι','á¾›'=>'ἣι','ᾜ'=>'ἤι','á¾'=>'ἥι','ᾞ'=>'ἦι','ᾟ'=>'ἧι','á¾ '=>'ὠι','ᾡ'=>'ὡι','á¾¢'=>'ὢι','á¾£'=>'ὣι','ᾤ'=>'ὤι','á¾¥'=>'ὥι','ᾦ'=>'ὦι','á¾§'=>'ὧι','ᾨ'=>'ὠι','ᾩ'=>'ὡι','ᾪ'=>'ὢι','ᾫ'=>'ὣι','ᾬ'=>'ὤι','á¾­'=>'ὥι','á¾®'=>'ὦι','ᾯ'=>'ὧι','á¾²'=>'ὰι','á¾³'=>'αι','á¾´'=>'άι','á¾¶'=>'ᾶ','á¾·'=>'ᾶι','á¾¼'=>'αι','á¿‚'=>'ὴι','ῃ'=>'ηι','á¿„'=>'ήι','ῆ'=>'ῆ','ῇ'=>'ῆι','ῌ'=>'ηι','á¿’'=>'ῒ','á¿“'=>'ϊÌ','á¿–'=>'ῖ','á¿—'=>'ῗ','á¿¢'=>'ῢ','á¿£'=>'ϋÌ','ῤ'=>'ÏÌ“','ῦ'=>'Ï…Í‚','á¿§'=>'ῧ','ῲ'=>'ὼι','ῳ'=>'ωι','á¿´'=>'ώι','á¿¶'=>'ῶ','á¿·'=>'ῶι','ῼ'=>'ωι','ff'=>'ff','ï¬'=>'fi','fl'=>'fl','ffi'=>'ffi','ffl'=>'ffl','ſt'=>'st','st'=>'st','ﬓ'=>'Õ´Õ¶','ﬔ'=>'Õ´Õ¥','ﬕ'=>'Õ´Õ«','ﬖ'=>'Õ¾Õ¶','ﬗ'=>'Õ´Õ­'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/case_fold_s.php b/phpBB/includes/utf/data/case_fold_s.php deleted file mode 100644 index 5f09ffa1dd..0000000000 --- a/phpBB/includes/utf/data/case_fold_s.php +++ /dev/null @@ -1 +0,0 @@ -'á¾€','ᾉ'=>'á¾','ᾊ'=>'ᾂ','ᾋ'=>'ᾃ','ᾌ'=>'ᾄ','á¾'=>'á¾…','ᾎ'=>'ᾆ','á¾'=>'ᾇ','ᾘ'=>'á¾','á¾™'=>'ᾑ','ᾚ'=>'á¾’','á¾›'=>'ᾓ','ᾜ'=>'á¾”','á¾'=>'ᾕ','ᾞ'=>'á¾–','ᾟ'=>'á¾—','ᾨ'=>'á¾ ','ᾩ'=>'ᾡ','ᾪ'=>'á¾¢','ᾫ'=>'á¾£','ᾬ'=>'ᾤ','á¾­'=>'á¾¥','á¾®'=>'ᾦ','ᾯ'=>'á¾§','á¾¼'=>'á¾³','ῌ'=>'ῃ','ῼ'=>'ῳ'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/confusables.php b/phpBB/includes/utf/data/confusables.php deleted file mode 100644 index 7564978a26..0000000000 --- a/phpBB/includes/utf/data/confusables.php +++ /dev/null @@ -1 +0,0 @@ -'i','ǃ'=>'!','α'=>'a',' '=>' ','­'=>'','Û'=>'','Ü'=>'','á †'=>'','á Ž'=>'','​'=>'','‌'=>'','â€'=>'','
'=>'','
'=>'','â '=>'','â¡'=>'','â¢'=>'','â£'=>'','âª'=>'','â«'=>'','â¬'=>'','â­'=>'','â®'=>'','â¯'=>'',''=>'',''=>'',''=>'','ï¿»'=>'',''=>'','ð…³'=>'','ð…´'=>'','ð…µ'=>'','ð…¶'=>'','ð…·'=>'','ð…¸'=>'','ð…¹'=>'','ð…º'=>'','Û¬'=>'ÛŸ','̓'=>'Ì“','Ù'=>'Ì“','Öœ'=>'Ì','Í'=>'Ì','݇'=>'Ì','॔'=>'Ì','Í€'=>'Ì€','॓'=>'Ì€','ÌŒ'=>'̆','Ì‘'=>'Ì‚','Ö¯'=>'ÌŠ','ஂ'=>'ÌŠ','à¹'=>'ÌŠ','à»'=>'ÌŠ','ံ'=>'ÌŠ','ំ'=>'ÌŠ','៓'=>'ÌŠ','゚'=>'ÌŠ','゚'=>'ÌŠ','ͦ'=>'ÌŠ','Í‚'=>'̃','ׄ'=>'̇','Ö¹'=>'̇','ׂ'=>'̇','×'=>'̇','Ý'=>'̇','ं'=>'̇','ਂ'=>'̇','ં'=>'̇','à¯'=>'̇','Ì…'=>'Ì„','〬'=>'̉','̱'=>'Ì ','॒'=>'Ì ','̧'=>'Ì¡','̦'=>'Ì¡','̨'=>'Ì¢','़'=>'Ì£','়'=>'Ì£','਼'=>'Ì£','઼'=>'Ì£','଼'=>'Ì£','͇'=>'̳','̶'=>'̵','ﱞ'=>'ï¹²Ù‘','ﱟ'=>'ï¹´Ù‘','ï³²'=>'ï¹·Ù‘','ï± '=>'ï¹¶Ù‘','ï³³'=>'ï¹¹Ù‘','ﱡ'=>'ﹸّ','ï³´'=>'ï¹»Ù‘','ï±¢'=>'ﹺّ','ï±£'=>'ï¹¼Ù°','Ù´'=>'Ù”','Ý‚'=>'ܼ','౦'=>'o','೦'=>'o','゙'=>'ã‚™',' '=>' ',' '=>' ','â€'=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ','âŸ'=>' ',' '=>' ',' '=>' ',' '=>' ','`'=>'`','ï½€'=>'`','á¿€'=>'Ëœ','ï¼¾'=>'^','︿'=>'^','_'=>'_','ï¹'=>'_','﹎'=>'_','ï¹'=>'_','⌇'=>'︴','ï¼'=>'-','â€'=>'-','‑'=>'-','‒'=>'-','–'=>'-','﹘'=>'-','∼'=>'â“','ï½¥'=>'・','•'=>'・',','=>',','‚'=>',','Ù¬'=>'ØŒ','、'=>'ã€',';'=>';','ï¼›'=>';',':'=>':','Ö‰'=>':','︰'=>':','׃'=>':','â©´'=>'::=','.'=>'.','․'=>'.','Ü‚'=>'.','‥'=>'..','…'=>'...','。'=>'。','·'=>'·','‧'=>'·','∙'=>'·','â‹…'=>'·','á§'=>'·','ᔯ'=>'·4','áŒ'=>'·á','áŽ'=>'·áƒ','á'=>'·á„','á’'=>'·á…','á”'=>'·á†','á—'=>'·áŠ','á™'=>'·á‹','á·'=>'·á³','á‘€'=>'·á³','á‘‚'=>'·á´','á‘„'=>'·á¸','ᑆ'=>'·á¹','á‘—'=>'·ᑌ','á‘™'=>'·ᑎ','á‘›'=>'·á‘','á‘”'=>'·á‘','á‘'=>'·á‘','ᑟ'=>'·ᑑ','á‘¡'=>'·ᑕ','á‘£'=>'·ᑖ','á‘´'=>'·ᑫ','ᑸ'=>'·ᑮ','ᑼ'=>'·ᑰ','ᑾ'=>'·ᑲ','á’€'=>'·ᑳ','á’’'=>'·ᒉ','á’”'=>'·ᒋ','á’–'=>'·ᒌ','á’š'=>'·ᒎ','á’œ'=>'·á’','á’ž'=>'·ᒑ','á’¬'=>'·ᒣ','á’®'=>'·ᒥ','á’°'=>'·ᒦ','á’²'=>'·ᒧ','á’´'=>'·ᒨ','á’¶'=>'·L','á’¸'=>'·ᒫ','ᓉ'=>'·ᓀ','á“‹'=>'·ᓇ','á“'=>'·ᓈ','ᓜ'=>'·ᓓ','ᓞ'=>'·ᓕ','á“ '=>'·ᓖ','á“¢'=>'·ᓗ','ᓤ'=>'·ᓘ','ᓦ'=>'·ᓚ','ᓨ'=>'·ᓛ','á“¶'=>'·ᓭ','ᓸ'=>'·ᓯ','ᓺ'=>'·ᓰ','ᓼ'=>'·ᓱ','ᓾ'=>'·ᓲ','ᔀ'=>'·ᓴ','ᔂ'=>'·ᓵ','á”—'=>'·á”','á”™'=>'·ᔑ','á”›'=>'·ᔒ','á”'=>'·ᔓ','ᔟ'=>'·ᔔ','ᔡ'=>'·ᔕ','ᔣ'=>'·ᔖ','á”±'=>'·ᔨ','ᔳ'=>'·ᔩ','ᔵ'=>'·ᔪ','á”·'=>'·ᔫ','ᔹ'=>'·ᔭ','á”»'=>'·ᔮ','ᕎ'=>'·ᕌ','á•›'=>'·ᕚ','ᕨ'=>'·ᕧ','('=>'(','â‘´'=>'(1)','â’§'=>'(l)','⑽'=>'(10)','⑾'=>'(11)','â‘¿'=>'(12)','â’€'=>'(13)','â’'=>'(14)','â’‚'=>'(15)','â’ƒ'=>'(16)','â’„'=>'(17)','â’…'=>'(18)','â’†'=>'(19)','⑵'=>'(2)','â’‡'=>'(20)','â‘¶'=>'(3)','â‘·'=>'(4)','⑸'=>'(5)','⑹'=>'(6)','⑺'=>'(7)','â‘»'=>'(8)','⑼'=>'(9)','â’œ'=>'(a)','â’'=>'(b)','â’ž'=>'(c)','â’Ÿ'=>'(d)','â’ '=>'(e)','â’¡'=>'(f)','â’¢'=>'(g)','â’£'=>'(h)','â’¤'=>'(i)','â’¥'=>'(j)','â’¦'=>'(k)','â’¨'=>'(m)','â’©'=>'(n)','â’ª'=>'(o)','â’«'=>'(p)','â’¬'=>'(q)','â’­'=>'(r)','â’®'=>'(s)','â’¯'=>'(t)','â’°'=>'(u)','â’±'=>'(v)','â’²'=>'(w)','â’³'=>'(x)','â’´'=>'(y)','â’µ'=>'(z)','㈀'=>'(á„€)','㈎'=>'(ê°€)','ãˆ'=>'(á„‚)','ãˆ'=>'(나)','㈂'=>'(ᄃ)','ãˆ'=>'(다)','㈃'=>'(á„…)','㈑'=>'(ë¼)','㈄'=>'(ᄆ)','㈒'=>'(마)','㈅'=>'(ᄇ)','㈓'=>'(ë°”)','㈆'=>'(ᄉ)','㈔'=>'(사)','㈇'=>'(á„‹)','㈕'=>'(ì•„)','ãˆ'=>'(오전)','㈞'=>'(오후)','㈈'=>'(ᄌ)','㈖'=>'(ìž)','㈜'=>'(주)','㈉'=>'(ᄎ)','㈗'=>'(ì°¨)','㈊'=>'(á„)','㈘'=>'(ì¹´)','㈋'=>'(á„)','㈙'=>'(타)','㈌'=>'(á„‘)','㈚'=>'(파)','ãˆ'=>'(á„’)','㈛'=>'(하)','㈠'=>'(一)','㈦'=>'(七)','㈢'=>'(三)','㈨'=>'(ä¹)','㈡'=>'(二)','㈤'=>'(五)','㈹'=>'(代)','㈽'=>'(ä¼)','ã‰'=>'(休)','㈧'=>'(å…«)','㈥'=>'(å…­)','㈸'=>'(労)','㈩'=>'(å)','㈿'=>'(å”)','㈴'=>'(å)','㈺'=>'(呼)','㈣'=>'(å››)','㈯'=>'(土)','㈻'=>'(å­¦)','㈰'=>'(æ—¥)','㈪'=>'(月)','㈲'=>'(有)','㈭'=>'(木)','㈱'=>'(æ ª)','㈬'=>'(æ°´)','㈫'=>'(ç«)','㈵'=>'(特)','㈼'=>'(監)','㈳'=>'(社)','㈷'=>'(ç¥)','㉀'=>'(祭)','㉂'=>'(自)','㉃'=>'(至)','㈶'=>'(財)','㈾'=>'(資)','㈮'=>'(金)',')'=>')','ï¼»'=>'[','〔'=>'[','ï¼½'=>']','〕'=>']','ï½›'=>'{','ï½'=>'}','⦅'=>'⦅','ï½ '=>'⦆','ï½¢'=>'「','ï½£'=>'ã€','ï¼ '=>'@','*'=>'*','ï¼'=>'/','â„'=>'/','∕'=>'/','ï¼¼'=>'\\','&'=>'&','#'=>'#','ï¼…'=>'%','‶'=>'‵‵','‷'=>'‵‵‵','༌'=>'་','´'=>'ʹ','΄'=>'ʹ','´'=>'ʹ','\''=>'ʹ','''=>'ʹ','′'=>'ʹ','׳'=>'ʹ','Í´'=>'ʹ','ËŠ'=>'ʹ','"'=>'ʹʹ','"'=>'ʹʹ','″'=>'ʹʹ','〃'=>'ʹʹ','×´'=>'ʹʹ','ʺ'=>'ʹʹ','‴'=>'ʹʹʹ','â—'=>'ʹʹʹʹ','¯'=>'ˉ','ï¿£'=>'ˉ','‾'=>'ˉ','﹉'=>'ˉ','﹊'=>'ˉ','﹋'=>'ˉ','﹌'=>'ˉ','Ëš'=>'°','௵'=>'௳','ï¿©'=>'â†','ï¿«'=>'→','↑'=>'↑','↓'=>'↓','↵'=>'↲','⨡'=>'↾','ð››'=>'∂','ðœ•'=>'∂','ð'=>'∂','ðž‰'=>'∂','ðŸƒ'=>'∂','ð›'=>'∇','ð›»'=>'∇','ðœµ'=>'∇','ð¯'=>'∇','ðž©'=>'∇','+'=>'+','﬩'=>'+','‹'=>'<','<'=>'<','ï¼'=>'=','⩵'=>'==','â©¶'=>'===','›'=>'>','>'=>'>','ï¿¢'=>'¬','¦'=>'¦','〜'=>'~','~'=>'~','﹨'=>'∖','â‹€'=>'∧','â‹'=>'∨','â‹‚'=>'∩','⋃'=>'∪','∯'=>'∮∮','∰'=>'∮∮∮','≣'=>'≡','â™'=>'⊕','☉'=>'⊙','⟂'=>'⊥','â–·'=>'⊲','â¨'=>'⋈','⨽'=>'⌙','☸'=>'⎈','⎮'=>'⎥','│'=>'│','â–'=>'â–Œ','ï¿­'=>'â– ','â˜'=>'â–¡','ï¿®'=>'â—‹','⦾'=>'â—Ž','〛'=>'⟧','〈'=>'⟨','〈'=>'⟨','〉'=>'⟩','〉'=>'⟩','â§™'=>'⦚','〶'=>'〒','ï½°'=>'ー','ï¿ '=>'¢','$'=>'$','ï¿¡'=>'£','ï¿¥'=>'Y̵','₩'=>'W̵','ï¼'=>'0','ðŸŽ'=>'0','ðŸ˜'=>'0','ðŸ¢'=>'0','ðŸ¬'=>'0','ðŸ¶'=>'0','০'=>'0','à­¦'=>'0','௦'=>'0','á '=>'0','〇'=>'0','ðŽ'=>'0','ð‘‚'=>'0','ð‘¶'=>'0','ð’ª'=>'0','ð“ž'=>'0','ð”’'=>'0','ð•†'=>'0','ð•º'=>'0','ð–®'=>'0','ð—¢'=>'0','ð˜–'=>'0','ð™Š'=>'0','ð™¾'=>'0','ðš¶'=>'0','ð›°'=>'0','ðœª'=>'0','ð¤'=>'0','ðžž'=>'0','âµ”'=>'0','à´ '=>'0','⊖'=>'0̵','ðš¯'=>'0̵','ðš¹'=>'0̵','ð›©'=>'0̵','ð›³'=>'0̵','ðœ£'=>'0̵','ðœ­'=>'0̵','ð'=>'0̵','ð§'=>'0̵','ðž—'=>'0̵','ðž¡'=>'0̵','â´±'=>'0̵','Ꮎ'=>'0̵','Û°'=>'Ù ','á­œ'=>'á­','ã˜'=>'0点','1'=>'1','ðŸ'=>'1','ðŸ™'=>'1','ðŸ£'=>'1','ðŸ­'=>'1','ðŸ·'=>'1','â„'=>'1','â„‘'=>'1','ðˆ'=>'1','ð¼'=>'1','ð‘°'=>'1','ð“˜'=>'1','ð•€'=>'1','ð•´'=>'1','ð–¨'=>'1','ð—œ'=>'1','ð˜'=>'1','ð™„'=>'1','ð™¸'=>'1','l'=>'l','l'=>'l','â…¼'=>'1','â„“'=>'l','ð¥'=>'l','ð‘™'=>'l','ð’'=>'l','ð“'=>'l','ð“µ'=>'l','ð”©'=>'l','ð•'=>'l','ð–‘'=>'l','ð—…'=>'l','ð—¹'=>'l','ð˜­'=>'l','ð™¡'=>'l','ðš•'=>'l','ðš°'=>'l','ð›ª'=>'l','ðœ¤'=>'l','ðž'=>'l','ðž˜'=>'l','â‘ '=>'➀','É­'=>'lÌ¢','É«'=>'lÌ´','Æš'=>'l̵','Å‚'=>'lÌ·','Û±'=>'Ù¡','â’ˆ'=>'1.','Å€'=>'l·','á’·'=>'1·','â‘©'=>'➉','â’‘'=>'10.','ã©'=>'10æ—¥','㋉'=>'10月','ã¢'=>'10点','â’’'=>'11.','ãª'=>'11æ—¥','㋊'=>'11月','ã£'=>'11点','â’“'=>'12.','ã«'=>'12æ—¥','ã‹‹'=>'12月','ã¤'=>'12点','â’”'=>'13.','ã¬'=>'13æ—¥','ã¥'=>'13点','â’•'=>'14.','ã­'=>'14æ—¥','ã¦'=>'14点','â’–'=>'15.','ã®'=>'15æ—¥','ã§'=>'15点','â’—'=>'16.','ã¯'=>'16æ—¥','ã¨'=>'16点','â’˜'=>'17.','ã°'=>'17æ—¥','ã©'=>'17点','â’™'=>'18.','ã±'=>'18æ—¥','ãª'=>'18点','â’š'=>'19.','ã²'=>'19æ—¥','ã«'=>'19点','lj'=>'lj','ã '=>'1æ—¥','ã‹€'=>'1月','ã™'=>'1点','ï¼’'=>'2','ðŸ'=>'2','ðŸš'=>'2','ðŸ¤'=>'2','ðŸ®'=>'2','ðŸ¸'=>'2','á’¿'=>'2','â‘¡'=>'âž','Û²'=>'Ù¢','â’‰'=>'2.','â’›'=>'20.','ã³'=>'20æ—¥','ã¬'=>'20点','ã´'=>'21æ—¥','ã­'=>'21点','ãµ'=>'22æ—¥','ã®'=>'22点','ã¶'=>'23æ—¥','ã¯'=>'23点','ã·'=>'24æ—¥','ã°'=>'24点','ã¸'=>'25æ—¥','ã¹'=>'26æ—¥','ãº'=>'27æ—¥','ã»'=>'28æ—¥','ã¼'=>'29æ—¥','ã¡'=>'2æ—¥','ã‹'=>'2月','ãš'=>'2点','3'=>'3','ðŸ‘'=>'3','ðŸ›'=>'3','ðŸ¥'=>'3','ðŸ¯'=>'3','ðŸ¹'=>'3','â‘¢'=>'âž‚','Û³'=>'Ù£','â’Š'=>'3.','ã½'=>'30æ—¥','ã¾'=>'31æ—¥','ã¢'=>'3æ—¥','ã‹‚'=>'3月','ã›'=>'3点','ï¼”'=>'4','ðŸ’'=>'4','ðŸœ'=>'4','ðŸ¦'=>'4','ðŸ°'=>'4','ðŸº'=>'4','áŽ'=>'4','â‘£'=>'➃','â’‹'=>'4.','á”°'=>'4·','ã£'=>'4æ—¥','㋃'=>'4月','ãœ'=>'4点','5'=>'5','ðŸ“'=>'5','ðŸ'=>'5','ðŸ§'=>'5','ðŸ±'=>'5','ðŸ»'=>'5','⑤'=>'âž„','â’Œ'=>'5.','ã¤'=>'5æ—¥','ã‹„'=>'5月','ã'=>'5点','ï¼–'=>'6','ðŸ”'=>'6','ðŸž'=>'6','ðŸ¨'=>'6','ðŸ²'=>'6','ðŸ¼'=>'6','б'=>'6','â‘¥'=>'âž…','â’'=>'6.','ã¥'=>'6æ—¥','ã‹…'=>'6月','ãž'=>'6点','ï¼—'=>'7','ðŸ•'=>'7','ðŸŸ'=>'7','ðŸ©'=>'7','ðŸ³'=>'7','ðŸ½'=>'7','⑦'=>'➆','Û·'=>'Ù§','â’Ž'=>'7.','ã¦'=>'7æ—¥','㋆'=>'7月','ãŸ'=>'7点','ଃ'=>'8','৪'=>'8','੪'=>'8','8'=>'8','ðŸ–'=>'8','ðŸ '=>'8','ðŸª'=>'8','ðŸ´'=>'8','ðŸ¾'=>'8','È£'=>'8','â‘§'=>'➇','Û¸'=>'Ù¨','â’'=>'8.','ã§'=>'8æ—¥','㋇'=>'8月','ã '=>'8点','à©§'=>'9','à­¨'=>'9','à§­'=>'9','ï¼™'=>'9','ðŸ—'=>'9','ðŸ¡'=>'9','ðŸ«'=>'9','ðŸµ'=>'9','ðŸ¿'=>'9','⑨'=>'➈','Û¹'=>'Ù©','â’'=>'9.','ã¨'=>'9æ—¥','㋈'=>'9月','ã¡'=>'9点','ï½'=>'a','ðš'=>'a','ð‘Ž'=>'a','ð’‚'=>'a','ð’¶'=>'a','ð“ª'=>'a','ð”ž'=>'a','ð•’'=>'a','ð–†'=>'a','ð–º'=>'a','ð—®'=>'a','ð˜¢'=>'a','ð™–'=>'a','ðšŠ'=>'a','â„€'=>'a/c','â„'=>'a/s','æ'=>'ae','b'=>'b','ð›'=>'b','ð‘'=>'b','ð’ƒ'=>'b','ð’·'=>'b','ð“«'=>'b','ð”Ÿ'=>'b','ð•“'=>'b','ð–‡'=>'b','ð–»'=>'b','ð—¯'=>'b','ð˜£'=>'b','ð™—'=>'b','ðš‹'=>'b','É“'=>'bÌ”','ƃ'=>'bÌ„','Æ€'=>'b̵','c'=>'c','â…½'=>'c','ðœ'=>'c','ð‘'=>'c','ð’„'=>'c','ð’¸'=>'c','ð“¬'=>'c','ð” '=>'c','ð•”'=>'c','ð–ˆ'=>'c','ð–¼'=>'c','ð—°'=>'c','ð˜¤'=>'c','ð™˜'=>'c','ðšŒ'=>'c','ð›“'=>'c','ðœ'=>'c','ð‡'=>'c','ðž'=>'c','ðž»'=>'c','â„…'=>'c/o','℆'=>'c/u','d'=>'d','â…¾'=>'d','â…†'=>'d','ð'=>'d','ð‘‘'=>'d','ð’…'=>'d','ð’¹'=>'d','ð“­'=>'d','ð”¡'=>'d','ð••'=>'d','ð–‰'=>'d','ð–½'=>'d','ð—±'=>'d','ð˜¥'=>'d','ð™™'=>'d','ðš'=>'d','É—'=>'dÌ”','ÆŒ'=>'dÌ„','É–'=>'dÌ¢','Ä‘'=>'d̵','dz'=>'dz','dž'=>'dž','ï½…'=>'e','ℯ'=>'e','â…‡'=>'e','ðž'=>'e','ð‘’'=>'e','ð’†'=>'e','ð“®'=>'e','ð”¢'=>'e','ð•–'=>'e','ð–Š'=>'e','ð–¾'=>'e','ð—²'=>'e','ð˜¦'=>'e','ð™š'=>'e','ðšŽ'=>'e','â´¹'=>'E','É™'=>'Ç','Éš'=>'ÇËž','â‹´'=>'É›','ð›†'=>'É›','ð›œ'=>'É›','ðœ€'=>'É›','ðœ–'=>'É›','ðœº'=>'É›','ð'=>'É›','ð´'=>'É›','ðžŠ'=>'É›','ðž®'=>'É›','ðŸ„'=>'É›','f'=>'f','ðŸ'=>'f','ð‘“'=>'f','ð’‡'=>'f','ð’»'=>'f','ð“¯'=>'f','ð”£'=>'f','ð•—'=>'f','ð–‹'=>'f','ð–¿'=>'f','ð—³'=>'f','ð˜§'=>'f','ð™›'=>'f','ðš'=>'f','Æ’'=>'fÌ¡','g'=>'g','ℊ'=>'g','ð '=>'g','ð‘”'=>'g','ð’ˆ'=>'g','ð“°'=>'g','ð”¤'=>'g','ð•˜'=>'g','ð–Œ'=>'g','ð—€'=>'g','ð—´'=>'g','ð˜¨'=>'g','ð™œ'=>'g','ðš'=>'g','É¡'=>'g','É '=>'gÌ”','Ç¥'=>'g̵','h'=>'h','ℎ'=>'h','ð¡'=>'h','ð’‰'=>'h','ð’½'=>'h','ð“±'=>'h','ð”¥'=>'h','ð•™'=>'h','ð–'=>'h','ð—'=>'h','ð—µ'=>'h','ð˜©'=>'h','ð™'=>'h','ðš‘'=>'h','ɦ'=>'hÌ”','ħ'=>'h̵','â„'=>'h̵','῾'=>'Ê»','‘'=>'Ê»','‛'=>'Ê»','ʽ'=>'Ê»','â³'=>'i','i'=>'i','â…°'=>'i','ℹ'=>'i','â…ˆ'=>'i','ð¢'=>'i','ð‘–'=>'i','ð’Š'=>'i','ð’¾'=>'i','ð“²'=>'i','ð”¦'=>'i','ð•š'=>'i','ð–Ž'=>'i','ð—‚'=>'i','ð—¶'=>'i','ð˜ª'=>'i','ð™ž'=>'i','ðš’'=>'i','ı'=>'i','ðš¤'=>'i','ɪ'=>'i','É©'=>'i','ð›Š'=>'i','ðœ„'=>'i','ðœ¾'=>'i','ð¸'=>'i','ðž²'=>'i','ɨ'=>'i̵','â…±'=>'ii','â…²'=>'iii','ij'=>'ij','â…³'=>'iv','â…¸'=>'ix','j'=>'j','â…‰'=>'j','ð£'=>'j','ð‘—'=>'j','ð’‹'=>'j','ð’¿'=>'j','ð“³'=>'j','ð”§'=>'j','ð•›'=>'j','ð–'=>'j','ð—ƒ'=>'j','ð—·'=>'j','ð˜«'=>'j','ð™Ÿ'=>'j','ðš“'=>'j','ϳ'=>'j','ðš¥'=>'È·','k'=>'k','ð¤'=>'k','ð‘˜'=>'k','ð’Œ'=>'k','ð“€'=>'k','ð“´'=>'k','ð”¨'=>'k','ð•œ'=>'k','ð–'=>'k','ð—„'=>'k','ð—¸'=>'k','ð˜¬'=>'k','ð™ '=>'k','ðš”'=>'k','Æ™'=>'kÌ”','ï½'=>'m','â…¿'=>'m','ð¦'=>'m','ð‘š'=>'m','ð’Ž'=>'m','ð“‚'=>'m','ð“¶'=>'m','ð”ª'=>'m','ð•ž'=>'m','ð–’'=>'m','ð—†'=>'m','ð—º'=>'m','ð˜®'=>'m','ð™¢'=>'m','ðš–'=>'m','ɱ'=>'mÌ¡','n'=>'n','ð§'=>'n','ð‘›'=>'n','ð’'=>'n','ð“ƒ'=>'n','ð“·'=>'n','ð”«'=>'n','ð•Ÿ'=>'n','ð–“'=>'n','ð—‡'=>'n','ð—»'=>'n','ð˜¯'=>'n','ð™£'=>'n','ðš—'=>'n','ð'=>'N','ð‘'=>'N','ð‘µ'=>'N','ð’©'=>'N','ð“'=>'N','ð”‘'=>'N','ð•¹'=>'N','ð–­'=>'N','ð—¡'=>'N','ð˜•'=>'N','ð™‰'=>'N','ð™½'=>'N','ðš´'=>'N','ð›®'=>'N','ðœ¨'=>'N','ð¢'=>'N','ðžœ'=>'N','ɲ'=>'ņ','ɳ'=>'nÌ¢','Æž'=>'nÌ©','ð›ˆ'=>'nÌ©','ðœ‚'=>'nÌ©','ðœ¼'=>'nÌ©','ð¶'=>'nÌ©','ðž°'=>'nÌ©','ÇŒ'=>'nj','ï½'=>'o','â„´'=>'o','ð¨'=>'o','ð‘œ'=>'o','ð’'=>'o','ð“¸'=>'o','ð”¬'=>'o','ð• '=>'o','ð–”'=>'o','ð—ˆ'=>'o','ð—¼'=>'o','ð˜°'=>'o','ð™¤'=>'o','ðš˜'=>'o','á´'=>'o','ð›'=>'o','ðœŠ'=>'o','ð„'=>'o','ð¾'=>'o','ðž¸'=>'o','ɵ'=>'o̵','Ç¿'=>'o̵Ì','ø'=>'oÌ·','Å“'=>'oe','Æ¡'=>'oʼ','â´'=>'p','ï½'=>'p','ð©'=>'p','ð‘'=>'p','ð’‘'=>'p','ð“…'=>'p','ð“¹'=>'p','ð”­'=>'p','ð•¡'=>'p','ð–•'=>'p','ð—‰'=>'p','ð—½'=>'p','ð˜±'=>'p','ð™¥'=>'p','ðš™'=>'p','ð›’'=>'p','ð› '=>'p','ðœŒ'=>'p','ðœš'=>'p','ð†'=>'p','ð”'=>'p','ðž€'=>'p','ðžŽ'=>'p','ðžº'=>'p','ðŸˆ'=>'p','Æ¥'=>'pÌ”','q'=>'q','ðª'=>'q','ð‘ž'=>'q','ð’’'=>'q','ð“†'=>'q','ð“º'=>'q','ð”®'=>'q','ð•¢'=>'q','ð––'=>'q','ð—Š'=>'q','ð—¾'=>'q','ð˜²'=>'q','ð™¦'=>'q','ðšš'=>'q','ð'=>'Q','ð‘„'=>'Q','ð‘¸'=>'Q','ð’¬'=>'Q','ð“ '=>'Q','ð””'=>'Q','ð•¼'=>'Q','ð–°'=>'Q','ð—¤'=>'Q','ð˜˜'=>'Q','ð™Œ'=>'Q','ðš€'=>'Q','Ê '=>'qÌ”','ð›‹'=>'ĸ','ð›ž'=>'ĸ','ðœ…'=>'ĸ','ðœ˜'=>'ĸ','ðœ¿'=>'ĸ','ð’'=>'ĸ','ð¹'=>'ĸ','ðžŒ'=>'ĸ','ðž³'=>'ĸ','ðŸ†'=>'ĸ','ï½’'=>'r','ð«'=>'r','ð‘Ÿ'=>'r','ð’“'=>'r','ð“‡'=>'r','ð“»'=>'r','ð”¯'=>'r','ð•£'=>'r','ð–—'=>'r','ð—‹'=>'r','ð—¿'=>'r','ð˜³'=>'r','ð™§'=>'r','ðš›'=>'r','ɽ'=>'rÌ¢','ɼ'=>'rÌ©','s'=>'s','ð¬'=>'s','ð‘ '=>'s','ð’”'=>'s','ð“ˆ'=>'s','ð“¼'=>'s','ð”°'=>'s','ð•¤'=>'s','ð–˜'=>'s','ð—Œ'=>'s','ð˜€'=>'s','ð˜´'=>'s','ð™¨'=>'s','ðšœ'=>'s','ƽ'=>'s','Ê‚'=>'sÌ¢','∫'=>'ʃ','∬'=>'ʃʃ','∭'=>'ʃʃʃ','⨌'=>'ʃʃʃʃ','ï½”'=>'t','ð­'=>'t','ð‘¡'=>'t','ð’•'=>'t','ð“‰'=>'t','ð“½'=>'t','ð”±'=>'t','ð•¥'=>'t','ð–™'=>'t','ð—'=>'t','ð˜'=>'t','ð˜µ'=>'t','ð™©'=>'t','ðš'=>'t','ð‘‡'=>'T','ð‘»'=>'T','ð’¯'=>'T','ð“£'=>'T','ð”—'=>'T','ð•‹'=>'T','ð•¿'=>'T','ð–³'=>'T','ð—§'=>'T','ð˜›'=>'T','ð™'=>'T','ðšƒ'=>'T','ðš»'=>'T','ð›µ'=>'T','ðœ¯'=>'T','ð©'=>'T','ðž£'=>'T','Æ­'=>'tÌ”','È›'=>'Å£','Æ«'=>'Å£','ŧ'=>'t̵','u'=>'u','ð®'=>'u','ð‘¢'=>'u','ð’–'=>'u','ð“Š'=>'u','ð“¾'=>'u','ð”²'=>'u','ð•¦'=>'u','ð–š'=>'u','ð—Ž'=>'u','ð˜‚'=>'u','ð˜¶'=>'u','ð™ª'=>'u','ðšž'=>'u','ÊŠ'=>'u','Ê‹'=>'u','ð›–'=>'u','ðœ'=>'u','ðŠ'=>'u','ðž„'=>'u','ðž¾'=>'u','ð‘ˆ'=>'U','ð‘¼'=>'U','ð’°'=>'U','ð“¤'=>'U','ð”˜'=>'U','ð•Œ'=>'U','ð–€'=>'U','ð–´'=>'U','ð—¨'=>'U','ð˜œ'=>'U','ð™'=>'U','ðš„'=>'U','ï½–'=>'v','â…´'=>'v','ð¯'=>'v','ð‘£'=>'v','ð’—'=>'v','ð“‹'=>'v','ð“¿'=>'v','ð”³'=>'v','ð•§'=>'v','ð–›'=>'v','ð—'=>'v','ð˜ƒ'=>'v','ð˜·'=>'v','ð™«'=>'v','ðšŸ'=>'v','ð›Ž'=>'v','ðœˆ'=>'v','ð‚'=>'v','ð¼'=>'v','ðž¶'=>'v','â…µ'=>'vi','â…¶'=>'vii','â…·'=>'viii','ɯ'=>'w','ï½—'=>'w','ð°'=>'w','ð‘¤'=>'w','ð’˜'=>'w','ð“Œ'=>'w','ð”€'=>'w','ð”´'=>'w','ð•¨'=>'w','ð–œ'=>'w','ð—'=>'w','ð˜„'=>'w','ð˜¸'=>'w','ð™¬'=>'w','ðš '=>'w','ð‘Š'=>'W','ð‘¾'=>'W','ð’²'=>'W','ð“¦'=>'W','ð”š'=>'W','ð•Ž'=>'W','ð–‚'=>'W','ð–¶'=>'W','ð—ª'=>'W','ð˜ž'=>'W','ð™’'=>'W','ðš†'=>'W','×'=>'x','x'=>'x','â…¹'=>'x','ð±'=>'x','ð‘¥'=>'x','ð’™'=>'x','ð“'=>'x','ð”'=>'x','ð”µ'=>'x','ð•©'=>'x','ð–'=>'x','ð—‘'=>'x','ð˜…'=>'x','ð˜¹'=>'x','ð™­'=>'x','ðš¡'=>'x','á™­'=>'X','ð‘‹'=>'X','ð‘¿'=>'X','ð’³'=>'X','ð“§'=>'X','ð”›'=>'X','ð•'=>'X','ð–ƒ'=>'X','ð–·'=>'X','ð—«'=>'X','ð˜Ÿ'=>'X','ð™“'=>'X','ðš‡'=>'X','ðš¾'=>'X','ð›¸'=>'X','ðœ²'=>'X','ð¬'=>'X','ðž¦'=>'X','â…º'=>'xi','â…»'=>'xii','ï½™'=>'y','ð²'=>'y','ð‘¦'=>'y','ð’š'=>'y','ð“Ž'=>'y','ð”‚'=>'y','ð”¶'=>'y','ð•ª'=>'y','ð–ž'=>'y','ð—’'=>'y','ð˜†'=>'y','ð˜º'=>'y','ð™®'=>'y','ðš¢'=>'y','Æ´'=>'yÌ”','z'=>'z','ð³'=>'z','ð‘§'=>'z','ð’›'=>'z','ð“'=>'z','ð”ƒ'=>'z','ð”·'=>'z','ð•«'=>'z','ð–Ÿ'=>'z','ð—“'=>'z','ð˜‡'=>'z','ð˜»'=>'z','ð™¯'=>'z','ðš£'=>'z','È¥'=>'zÌ¡','Ê'=>'zÌ¢','ƶ'=>'z̵','È'=>'Ê’','?'=>'Ê”','?'=>'Ê”','â‡'=>'ʔʔ','âˆ'=>'ʔǃ','á¾½'=>'ʼ','᾿'=>'ʼ','’'=>'ʼ','ʾ'=>'ʼ','!'=>'ǃ','ï¼'=>'ǃ','â‰'=>'ǃʔ','‼'=>'ǃǃ','âº'=>'α','ð›‚'=>'α','ð›¼'=>'α','ðœ¶'=>'α','ð°'=>'α','ðžª'=>'α','ð›ƒ'=>'β','ð›½'=>'β','ðœ·'=>'β','ð±'=>'β','ðž«'=>'β','ℽ'=>'γ','ð›„'=>'γ','ð›¾'=>'γ','ðœ¸'=>'γ','ð²'=>'γ','ðž¬'=>'γ','ð›…'=>'δ','ð›¿'=>'δ','ðœ¹'=>'δ','ð³'=>'δ','ðž­'=>'δ','ðŸ‹'=>'Ï','ð›‡'=>'ζ','ðœ'=>'ζ','ðœ»'=>'ζ','ðµ'=>'ζ','ðž¯'=>'ζ','â¬'=>'θ','ð›‰'=>'θ','ð›'=>'θ','ðœƒ'=>'θ','ðœ—'=>'θ','ðœ½'=>'θ','ð‘'=>'θ','ð·'=>'θ','ðž‹'=>'θ','ðž±'=>'θ','ðŸ…'=>'θ','ð›Œ'=>'λ','ðœ†'=>'λ','ð€'=>'λ','ðº'=>'λ','ðž´'=>'λ','ð›¬'=>'Λ','ðœ¦'=>'Λ','ð '=>'Λ','ðžš'=>'Λ','ð›'=>'μ','ðœ‡'=>'μ','ð'=>'μ','ð»'=>'μ','ðžµ'=>'μ','ð›'=>'ξ','ðœ‰'=>'ξ','ðƒ'=>'ξ','ð½'=>'ξ','ðž·'=>'ξ','ð›¯'=>'Ξ','ðœ©'=>'Ξ','ð£'=>'Ξ','ðž'=>'Ξ','ℼ'=>'Ï€','ð›‘'=>'Ï€','ð›¡'=>'Ï€','ðœ‹'=>'Ï€','ðœ›'=>'Ï€','ð…'=>'Ï€','ð•'=>'Ï€','ð¿'=>'Ï€','ðž'=>'Ï€','ðž¹'=>'Ï€','ðŸ‰'=>'Ï€','á´¨'=>'Ï€','âˆ'=>'Π','ðš·'=>'Π','ð›±'=>'Π','ðœ«'=>'Π','ð¥'=>'Π','ðžŸ'=>'Π','ð›”'=>'σ','ðœŽ'=>'σ','ðˆ'=>'σ','ðž‚'=>'σ','ðž¼'=>'σ','ð›•'=>'Ï„','ðœ'=>'Ï„','ð‰'=>'Ï„','ðžƒ'=>'Ï„','ðž½'=>'Ï„','ð˜'=>'Y','ð‘Œ'=>'Y','ð’€'=>'Y','ð’´'=>'Y','ð“¨'=>'Y','ð”œ'=>'Y','ð•'=>'Y','ð–„'=>'Y','ð–¸'=>'Y','ð—¬'=>'Y','ð˜ '=>'Y','ð™”'=>'Y','ðšˆ'=>'Y','ðš¼'=>'Y','ð›¶'=>'Y','ðœ°'=>'Y','ðª'=>'Y','ðž¤'=>'Y','ð›—'=>'φ','ð›Ÿ'=>'φ','ðœ‘'=>'φ','ðœ™'=>'φ','ð‹'=>'φ','ð“'=>'φ','ðž…'=>'φ','ðž'=>'φ','ðž¿'=>'φ','ðŸ‡'=>'φ','ð›·'=>'Φ','ðœ±'=>'Φ','ð«'=>'Φ','ðž¥'=>'Φ','ð›˜'=>'χ','ðœ’'=>'χ','ðŒ'=>'χ','ðž†'=>'χ','ðŸ€'=>'χ','ð›™'=>'ψ','ðœ“'=>'ψ','ð'=>'ψ','ðž‡'=>'ψ','ðŸ'=>'ψ','ð›¹'=>'Ψ','ðœ³'=>'Ψ','ð­'=>'Ψ','ðž§'=>'Ψ','âµ'=>'ω','ð›š'=>'ω','ðœ”'=>'ω','ðŽ'=>'ω','ðžˆ'=>'ω','ðŸ‚'=>'ω','Ó•'=>'ae','Ò“'=>'r̵','Ò‘'=>'rᑊ','Ò—'=>'ж̩','Ò™'=>'з̡','Ó'=>'i','Ò‹'=>'й̡','Ò›'=>'ĸ̩','ÒŸ'=>'ĸ̵','á´«'=>'л','Ó†'=>'л̡','ÓŽ'=>'м̡','ÓŠ'=>'н̡','Óˆ'=>'н̡','Ò£'=>'н̩','Ó©'=>'o̵','ѳ'=>'o̵','Ò«'=>'cÌ¡','Ò­'=>'т̩','Ò¯'=>'y','Ò±'=>'y̵','Ñ›'=>'h̵','ѽ'=>'ѡ҃','ÓŒ'=>'Ò·','Ò¿'=>'ҽ̢','Ò'=>'Ь̵','Õ¦'=>'q','Õ¼'=>'n','ℵ'=>'×','ﬡ'=>'×','אָ'=>'אַ','אּ'=>'אַ','ï­'=>'×ל','â„¶'=>'ב','â„·'=>'×’','ℸ'=>'ד','ﬢ'=>'ד','ﬣ'=>'×”','ﬤ'=>'×›','ﬥ'=>'ל','ﬦ'=>'×','ﬠ'=>'×¢','ﬧ'=>'ר','ﬨ'=>'ת','ﺀ'=>'Ø¡','ﺂ'=>'Ø¢','ïº'=>'Ø¢','ﺄ'=>'Ø£','ﺃ'=>'Ø£','Ùµ'=>'أ','ï­‘'=>'Ù±','ï­'=>'Ù±','ﺆ'=>'ؤ','ﺅ'=>'ؤ','Ù¶'=>'ÙˆÙ”','ﺈ'=>'Ø¥','ﺇ'=>'Ø¥','ﺋ'=>'ئ','ﺌ'=>'ئ','ﺊ'=>'ئ','ﺉ'=>'ئ','ﯫ'=>'ئا','ﯪ'=>'ئا','ﯸ'=>'ئٻ','ﯷ'=>'ئٻ','ﯶ'=>'ئٻ','ï²—'=>'ئج','ï°€'=>'ئج','ﲘ'=>'ئح','ï°'=>'ئح','ï²™'=>'ئخ','ﱤ'=>'ئر','ï±¥'=>'ئز','ﲚ'=>'ئم','ﳟ'=>'ئم','ﱦ'=>'ئم','ï°‚'=>'ئم','ï±§'=>'ئن','ï²›'=>'ئه','ï³ '=>'ئه','ﯭ'=>'ئه','ﯬ'=>'ئه','ﯯ'=>'ئو','ﯮ'=>'ئو','ﯳ'=>'ئۆ','ﯲ'=>'ئۆ','ﯱ'=>'ئۇ','ﯰ'=>'ئۇ','ﯵ'=>'ئۈ','ﯴ'=>'ئۈ','ﯻ'=>'ئى','ﯺ'=>'ئى','ﱨ'=>'ئى','ﯹ'=>'ئى','ï°ƒ'=>'ئى','ﱩ'=>'ئى','ï°„'=>'ئى','ﺎ'=>'ا','ïº'=>'ا','ï´¼'=>'اً','ï´½'=>'اً','ï·³'=>'اكبر','ï·²'=>'الله','ﺑ'=>'ب','ﺒ'=>'ب','ïº'=>'ب','ïº'=>'ب','ﲜ'=>'بج','ï°…'=>'بج','ï²'=>'بح','ï°†'=>'بح','ï·‚'=>'بحى','ﲞ'=>'بخ','ï°‡'=>'بخ','ï¶ž'=>'بخى','ﱪ'=>'بر','ﱫ'=>'بز','ﲟ'=>'بم','ﳡ'=>'بم','ﱬ'=>'بم','ï°ˆ'=>'بم','ï±­'=>'بن','ï² '=>'به','ï³¢'=>'به','ï±®'=>'بى','ï°‰'=>'بى','ﱯ'=>'بى','ï°Š'=>'بى','ï­”'=>'Ù»','ï­•'=>'Ù»','ï­“'=>'Ù»','ï­’'=>'Ù»','Û'=>'Ù»','ﯦ'=>'Ù»','ﯧ'=>'Ù»','ﯥ'=>'Ù»','ﯤ'=>'Ù»','ï­˜'=>'Ù¾','ï­™'=>'Ù¾','ï­—'=>'Ù¾','ï­–'=>'Ù¾','ï­œ'=>'Ú€','ï­'=>'Ú€','ï­›'=>'Ú€','ï­š'=>'Ú€','ﺔ'=>'Ø©','ﺓ'=>'Ø©','ﺗ'=>'ت','ﺘ'=>'ت','ﺖ'=>'ت','ﺕ'=>'ت','ﲡ'=>'تج','ï°‹'=>'تج','ïµ'=>'تجم','ï¶ '=>'تجى','ï¶Ÿ'=>'تجى','ï²¢'=>'تح','ï°Œ'=>'تح','ïµ’'=>'تحج','ﵑ'=>'تحج','ﵓ'=>'تحم','ï²£'=>'تخ','ï°'=>'تخ','ïµ”'=>'تخم','ï¶¢'=>'تخى','ï¶¡'=>'تخى','ï±°'=>'تر','ï±±'=>'تز','ﲤ'=>'تم','ï³£'=>'تم','ï±²'=>'تم','ï°Ž'=>'تم','ﵕ'=>'تمج','ïµ–'=>'تمح','ïµ—'=>'تمخ','ﶤ'=>'تمى','ï¶£'=>'تمى','ï±³'=>'تن','ï²¥'=>'ته','ﳤ'=>'ته','ï±´'=>'تى','ï°'=>'تى','ï±µ'=>'تى','ï°'=>'تى','ﺛ'=>'Ø«','ﺜ'=>'Ø«','ﺚ'=>'Ø«','ﺙ'=>'Ø«','ï°‘'=>'ثج','ï±¶'=>'ثر','ï±·'=>'ثز','ﲦ'=>'ثم','ï³¥'=>'ثم','ﱸ'=>'ثم','ï°’'=>'ثم','ï±¹'=>'ثن','ﳦ'=>'ثه','ﱺ'=>'ثى','ï°“'=>'ثى','ï±»'=>'ثى','ï°”'=>'ثى','ï­¨'=>'Ù¹','ï­©'=>'Ù¹','ï­§'=>'Ù¹','ï­¦'=>'Ù¹','Ú»'=>'Ù¹','ﮢ'=>'Ù¹','ﮣ'=>'Ù¹','ﮡ'=>'Ù¹','ï® '=>'Ù¹','ï­ '=>'Ùº','ï­¡'=>'Ùº','ï­Ÿ'=>'Ùº','ï­ž'=>'Ùº','ï­¤'=>'Ù¿','ï­¥'=>'Ù¿','ï­£'=>'Ù¿','ï­¢'=>'Ù¿','ﺟ'=>'ج','ﺠ'=>'ج','ﺞ'=>'ج','ïº'=>'ج','ï²§'=>'جح','ï°•'=>'جح','ﶦ'=>'جحى','ï¶¾'=>'جحى','ï·»'=>'جل جلاله','ﲨ'=>'جم','ï°–'=>'جم','ïµ™'=>'جمح','ﵘ'=>'جمح','ï¶§'=>'جمى','ï¶¥'=>'جمى','ï´'=>'جى','ï´'=>'جى','ï´ž'=>'جى','ï´‚'=>'جى','ï­¸'=>'Úƒ','ï­¹'=>'Úƒ','ï­·'=>'Úƒ','ï­¶'=>'Úƒ','ï­´'=>'Ú„','ï­µ'=>'Ú„','ï­³'=>'Ú„','ï­²'=>'Ú„','ï­¼'=>'Ú†','ï­½'=>'Ú†','ï­»'=>'Ú†','ï­º'=>'Ú†','ﮀ'=>'Ú‡','ï®'=>'Ú‡','ï­¿'=>'Ú‡','ï­¾'=>'Ú‡','ﺣ'=>'Ø­','ﺤ'=>'Ø­','ﺢ'=>'Ø­','ﺡ'=>'Ø­','ﲩ'=>'حج','ï°—'=>'حج','ï¶¿'=>'حجى','ﲪ'=>'حم','ï°˜'=>'حم','ïµ›'=>'حمى','ﵚ'=>'حمى','ï´›'=>'حى','ﳿ'=>'حى','ï´œ'=>'حى','ï´€'=>'حى','ﺧ'=>'Ø®','ﺨ'=>'Ø®','ﺦ'=>'Ø®','ﺥ'=>'Ø®','ﲫ'=>'خج','ï°™'=>'خج','ï°š'=>'خح','ﲬ'=>'خم','ï°›'=>'خم','ï´Ÿ'=>'خى','ï´ƒ'=>'خى','ï´ '=>'خى','ï´„'=>'خى','ﺪ'=>'د','ﺩ'=>'د','ﺬ'=>'ذ','ﺫ'=>'ذ','ï±›'=>'ذٰ','ﮉ'=>'Úˆ','ﮈ'=>'Úˆ','ï®…'=>'ÚŒ','ﮄ'=>'ÚŒ','ﮃ'=>'Ú','ﮂ'=>'Ú','ﮇ'=>'ÚŽ','ﮆ'=>'ÚŽ','ﺮ'=>'ر','ﺭ'=>'ر','ﱜ'=>'رٰ','ï·¶'=>'رسول','ï·¼'=>'رىال','ﺰ'=>'ز','ﺯ'=>'ز','ï®'=>'Ú‘','ﮌ'=>'Ú‘','ﮋ'=>'Ú˜','ﮊ'=>'Ú˜','ﺳ'=>'س','ﺴ'=>'س','ﺲ'=>'س','ﺱ'=>'س','ï²­'=>'سج','ï´´'=>'سج','ï°œ'=>'سج','ïµ'=>'سجح','ﵞ'=>'سجى','ï²®'=>'سح','ï´µ'=>'سح','ï°'=>'سح','ﵜ'=>'سحج','ﲯ'=>'سخ','ï´¶'=>'سخ','ï°ž'=>'سخ','ﶨ'=>'سخى','ï·†'=>'سخى','ï´ª'=>'سر','ï´Ž'=>'سر','ï²°'=>'سم','ï³§'=>'سم','ï°Ÿ'=>'سم','ﵡ'=>'سمج','ïµ '=>'سمح','ﵟ'=>'سمح','ïµ£'=>'سمم','ïµ¢'=>'سمم','ï´±'=>'سه','ﳨ'=>'سه','ï´—'=>'سى','ï³»'=>'سى','ï´˜'=>'سى','ï³¼'=>'سى','ﺷ'=>'Ø´','ﺸ'=>'Ø´','ﺶ'=>'Ø´','ﺵ'=>'Ø´','ï´­'=>'شج','ï´·'=>'شج','ï´¥'=>'شج','ï´‰'=>'شج','ﵩ'=>'شجى','ï´®'=>'شح','ï´¸'=>'شح','ï´¦'=>'شح','ï´Š'=>'شح','ﵨ'=>'شحم','ïµ§'=>'شحم','ﶪ'=>'شحى','ï´¯'=>'شخ','ï´¹'=>'شخ','ï´§'=>'شخ','ï´‹'=>'شخ','ï´©'=>'شر','ï´'=>'شر','ï´°'=>'شم','ﳩ'=>'شم','ï´¨'=>'شم','ï´Œ'=>'شم','ﵫ'=>'شمخ','ﵪ'=>'شمخ','ïµ­'=>'شمم','ﵬ'=>'شمم','ï´²'=>'شه','ﳪ'=>'شه','ï´™'=>'شى','ï³½'=>'شى','ï´š'=>'شى','ï³¾'=>'شى','ﺻ'=>'ص','ﺼ'=>'ص','ﺺ'=>'ص','ﺹ'=>'ص','ï²±'=>'صح','ï° '=>'صح','ïµ¥'=>'صحح','ﵤ'=>'صحح','ï¶©'=>'صحى','ï²²'=>'صخ','ï´«'=>'صر','ï´'=>'صر','ï·µ'=>'صلعم','ï·¹'=>'صلى','ï·º'=>'صلى الله علىه وسلم','ï·°'=>'صلے','ï²³'=>'صم','ï°¡'=>'صم','ï·…'=>'صمم','ﵦ'=>'صمم','ï´¡'=>'صى','ï´…'=>'صى','ï´¢'=>'صى','ï´†'=>'صى','ﺿ'=>'ض','ﻀ'=>'ض','ﺾ'=>'ض','ﺽ'=>'ض','ï²´'=>'ضج','ï°¢'=>'ضج','ï²µ'=>'ضح','ï°£'=>'ضح','ïµ®'=>'ضحى','ï¶«'=>'ضحى','ï²¶'=>'ضخ','ï°¤'=>'ضخ','ïµ°'=>'ضخم','ﵯ'=>'ضخم','ï´¬'=>'ضر','ï´'=>'ضر','ï²·'=>'ضم','ï°¥'=>'ضم','ï´£'=>'ضى','ï´‡'=>'ضى','ï´¤'=>'ضى','ï´ˆ'=>'ضى','ﻃ'=>'Ø·','ﻄ'=>'Ø·','ﻂ'=>'Ø·','ï»'=>'Ø·','ﲸ'=>'طح','ï°¦'=>'طح','ï´³'=>'طم','ï´º'=>'طم','ï°§'=>'طم','ïµ²'=>'طمح','ïµ±'=>'طمح','ïµ³'=>'طمم','ïµ´'=>'طمى','ï´‘'=>'طى','ï³µ'=>'طى','ï´’'=>'طى','ï³¶'=>'طى','ﻇ'=>'ظ','ﻈ'=>'ظ','ﻆ'=>'ظ','ï»…'=>'ظ','ï²¹'=>'ظم','ï´»'=>'ظم','ï°¨'=>'ظم','ﻋ'=>'ع','ﻌ'=>'ع','ﻊ'=>'ع','ﻉ'=>'ع','ﲺ'=>'عج','ï°©'=>'عج','ï·„'=>'عجم','ïµµ'=>'عجم','ï··'=>'علىه','ï²»'=>'عم','ï°ª'=>'عم','ïµ·'=>'عمم','ïµ¶'=>'عمم','ﵸ'=>'عمى','ï¶¶'=>'عمى','ï´“'=>'عى','ï³·'=>'عى','ï´”'=>'عى','ﳸ'=>'عى','ï»'=>'غ','ï»'=>'غ','ﻎ'=>'غ','ï»'=>'غ','ï²¼'=>'غج','ï°«'=>'غج','ï²½'=>'غم','ï°¬'=>'غم','ïµ¹'=>'غمم','ïµ»'=>'غمى','ﵺ'=>'غمى','ï´•'=>'غى','ï³¹'=>'غى','ï´–'=>'غى','ﳺ'=>'غى','ﻓ'=>'Ù','ï»”'=>'Ù','ï»’'=>'Ù','ﻑ'=>'Ù','ï²¾'=>'ÙØ¬','ï°­'=>'ÙØ¬','ﲿ'=>'ÙØ­','ï°®'=>'ÙØ­','ï³€'=>'ÙØ®','ï°¯'=>'ÙØ®','ïµ½'=>'ÙØ®Ù…','ïµ¼'=>'ÙØ®Ù…','ï³'=>'ÙÙ…','ï°°'=>'ÙÙ…','ï·'=>'Ùمى','ï±¼'=>'ÙÙ‰','ï°±'=>'ÙÙ‰','ï±½'=>'ÙÙ‰','ï°²'=>'ÙÙ‰','ï­¬'=>'Ú¤','ï­­'=>'Ú¤','ï­«'=>'Ú¤','ï­ª'=>'Ú¤','ï­°'=>'Ú¦','ï­±'=>'Ú¦','ï­¯'=>'Ú¦','ï­®'=>'Ú¦','ï»—'=>'Ù‚','ﻘ'=>'Ù‚','ï»–'=>'Ù‚','ﻕ'=>'Ù‚','ﳂ'=>'قح','ï°³'=>'قح','ï·±'=>'قلے','ﳃ'=>'قم','ï°´'=>'قم','ï¶´'=>'قمح','ïµ¾'=>'قمح','ﵿ'=>'قمم','ï¶²'=>'قمى','ï±¾'=>'قى','ï°µ'=>'قى','ﱿ'=>'قى','ï°¶'=>'قى','ï»›'=>'Ùƒ','ﻜ'=>'Ùƒ','ﻚ'=>'Ùƒ','ï»™'=>'Ùƒ','Ú©'=>'Ùƒ','ï®'=>'Ùƒ','ﮑ'=>'Ùƒ','ï®'=>'Ùƒ','ﮎ'=>'Ùƒ','ï²€'=>'كا','ï°·'=>'كا','ﳄ'=>'كج','ï°¸'=>'كج','ï³…'=>'كح','ï°¹'=>'كح','ﳆ'=>'كخ','ï°º'=>'كخ','ﳇ'=>'كل','ﳫ'=>'كل','ï²'=>'كل','ï°»'=>'كل','ﳈ'=>'كم','ﳬ'=>'كم','ﲂ'=>'كم','ï°¼'=>'كم','ï·ƒ'=>'كمم','ï¶»'=>'كمم','ï¶·'=>'كمى','ﲃ'=>'كى','ï°½'=>'كى','ﲄ'=>'كى','ï°¾'=>'كى','ﯕ'=>'Ú­','ﯖ'=>'Ú­','ﯔ'=>'Ú­','ﯓ'=>'Ú­','ï®”'=>'Ú¯','ﮕ'=>'Ú¯','ﮓ'=>'Ú¯','ï®’'=>'Ú¯','ﮜ'=>'Ú±','ï®'=>'Ú±','ï®›'=>'Ú±','ﮚ'=>'Ú±','ﮘ'=>'Ú³','ï®™'=>'Ú³','ï®—'=>'Ú³','ï®–'=>'Ú³','ﻟ'=>'Ù„','ï» '=>'Ù„','ﻞ'=>'Ù„','ï»'=>'Ù„','ï»¶'=>'لآ','ﻵ'=>'لآ','ﻸ'=>'لأ','ï»·'=>'لأ','ﻺ'=>'لإ','ﻹ'=>'لإ','ﻼ'=>'لا','ï»»'=>'لا','ﳉ'=>'لج','ï°¿'=>'لج','ﶃ'=>'لجج','ï¶„'=>'لجج','ﶺ'=>'لجم','ï¶¼'=>'لجم','ﶬ'=>'لجى','ﳊ'=>'لح','ï±€'=>'لح','ï¶µ'=>'لحم','ï¶€'=>'لحم','ï¶‚'=>'لحى','ï¶'=>'لحى','ﳋ'=>'لخ','ï±'=>'لخ','ﶆ'=>'لخم','ï¶…'=>'لخم','ﳌ'=>'لم','ï³­'=>'لم','ï²…'=>'لم','ﱂ'=>'لم','ﶈ'=>'لمح','ﶇ'=>'لمح','ï¶­'=>'لمى','ï³'=>'له','ﲆ'=>'لى','ﱃ'=>'لى','ﲇ'=>'لى','ﱄ'=>'لى','ﻣ'=>'Ù…','ﻤ'=>'Ù…','ﻢ'=>'Ù…','ﻡ'=>'Ù…','ﲈ'=>'ما','ﳎ'=>'مج','ï±…'=>'مج','ï¶Œ'=>'مجح','ï¶’'=>'مجخ','ï¶'=>'مجم','ï·€'=>'مجى','ï³'=>'مح','ﱆ'=>'مح','ﶉ'=>'محج','ï¶Š'=>'محم','ï·´'=>'محمد','ï¶‹'=>'محى','ï³'=>'مخ','ﱇ'=>'مخ','ï¶Ž'=>'مخج','ï¶'=>'مخم','ï¶¹'=>'مخى','ﳑ'=>'مم','ﲉ'=>'مم','ﱈ'=>'مم','ï¶±'=>'ممى','ﱉ'=>'مى','ﱊ'=>'مى','ï»§'=>'Ù†','ﻨ'=>'Ù†','ﻦ'=>'Ù†','ﻥ'=>'Ù†','ï³’'=>'نج','ﱋ'=>'نج','ﶸ'=>'نجح','ï¶½'=>'نجح','ﶘ'=>'نجم','ï¶—'=>'نجم','ï¶™'=>'نجى','ï·‡'=>'نجى','ﳓ'=>'نح','ﱌ'=>'نح','ï¶•'=>'نحم','ï¶–'=>'نحى','ï¶³'=>'نحى','ï³”'=>'نخ','ï±'=>'نخ','ﲊ'=>'نر','ﲋ'=>'نز','ﳕ'=>'نم','ï³®'=>'نم','ﲌ'=>'نم','ﱎ'=>'نم','ï¶›'=>'نمى','ï¶š'=>'نمى','ï²'=>'نن','ï³–'=>'نه','ﳯ'=>'نه','ﲎ'=>'نى','ï±'=>'نى','ï²'=>'نى','ï±'=>'نى','ﮟ'=>'Úº','ﮞ'=>'Úº','ﻫ'=>'Ù‡','ﻬ'=>'Ù‡','ﻪ'=>'Ù‡','ﻩ'=>'Ù‡','Ú¾'=>'Ù‡','ﮬ'=>'Ù‡','ï®­'=>'Ù‡','ﮫ'=>'Ù‡','ﮪ'=>'Ù‡','Û'=>'Ù‡','ﮨ'=>'Ù‡','ﮩ'=>'Ù‡','ï®§'=>'Ù‡','ﮦ'=>'Ù‡','Û•'=>'Ù‡','ï³™'=>'هٰ','ï³—'=>'هج','ﱑ'=>'هج','ﳘ'=>'هم','ï±’'=>'هم','ï¶“'=>'همج','ï¶”'=>'همم','ﱓ'=>'هى','ï±”'=>'هى','ﮥ'=>'Û€','ﮤ'=>'Û€','ï»®'=>'Ùˆ','ï»­'=>'Ùˆ','ï·¸'=>'وسلم','ﯡ'=>'Û…','ﯠ'=>'Û…','ﯚ'=>'Û†','ﯙ'=>'Û†','ﯘ'=>'Û‡','ﯗ'=>'Û‡','Ù·'=>'Û‡Ù”','ï¯'=>'Û‡Ù”','ﯜ'=>'Ûˆ','ﯛ'=>'Ûˆ','ﯣ'=>'Û‰','ﯢ'=>'Û‰','ﯟ'=>'Û‹','ﯞ'=>'Û‹','ﯨ'=>'Ù‰','ﯩ'=>'Ù‰','ï»°'=>'Ù‰','ﻯ'=>'Ù‰','ÙŠ'=>'Ù‰','ﻳ'=>'Ù‰','ï»´'=>'Ù‰','ﻲ'=>'Ù‰','ï»±'=>'Ù‰','ÛŒ'=>'Ù‰','ﯾ'=>'Ù‰','ﯿ'=>'Ù‰','ﯽ'=>'Ù‰','ﯼ'=>'Ù‰','Ù¸'=>'Ù‰Ù”','ï²'=>'ىٰ','ï±'=>'ىٰ','ﳚ'=>'ىج','ﱕ'=>'ىج','ﶯ'=>'ىجى','ï³›'=>'ىح','ï±–'=>'ىح','ï¶®'=>'ىحى','ﳜ'=>'ىخ','ï±—'=>'ىخ','ﲑ'=>'ىر','ï²’'=>'ىز','ï³'=>'ىم','ï³°'=>'ىم','ﲓ'=>'ىم','ﱘ'=>'ىم','ï¶'=>'ىمم','ï¶œ'=>'ىمم','ï¶°'=>'ىمى','ï²”'=>'ىن','ﳞ'=>'ىه','ï³±'=>'ىه','ﲕ'=>'ىى','ï±™'=>'ىى','ï²–'=>'ىى','ﱚ'=>'ىى','Û§'=>'Û¦','ﮯ'=>'Û’','ï®®'=>'Û’','ï®±'=>'Û“','ï®°'=>'Û“','∃'=>'â´º','आ'=>'अा','ऒ'=>'अाॆ','ओ'=>'अाे','औ'=>'अाै','ऄ'=>'अॆ','ऑ'=>'अॉ','à¤'=>'à¤à¥…','ऎ'=>'à¤à¥†','à¤'=>'à¤à¥‡','ई'=>'रà¥à¤‡','আ'=>'অা','à§ '=>'ঋৃ','à§¡'=>'ঌৢ','ਉ'=>'ੳà©','ਊ'=>'ੳੂ','ਆ'=>'ਅਾ','à¨'=>'ਅੈ','ਔ'=>'ਅੌ','ਇ'=>'ੲਿ','ਈ'=>'ੲੀ','à¨'=>'ੲੇ','આ'=>'અા','ઑ'=>'અાૅ','ઓ'=>'અાે','ઔ'=>'અાૈ','àª'=>'અૅ','àª'=>'અે','àª'=>'અૈ','ଆ'=>'ଅା','௮'=>'à®…','à®°'=>'ஈ','ா'=>'ஈ','௫'=>'ஈà¯','௨'=>'உ','ஊ'=>'உள','௭'=>'எ','௷'=>'எவ','ஜ'=>'à®','௧'=>'க','௪'=>'ச','௬'=>'சà¯','௲'=>'சூ','௺'=>'நீ','ை'=>'ன','௴'=>'மீ','௰'=>'ய','ௗ'=>'ள','௸'=>'à®·','ொ'=>'ெஈ','ௌ'=>'ெள','ோ'=>'ேஈ','à± '=>'à°‹à°¾','ౡ'=>'ఌా','à°”'=>'ఒౌ','à°“'=>'ఒౕ','à°¢'=>'à°¡Ì£','à°­'=>'బ̣','à°·'=>'వ̣','à°¹'=>'వా','à°®'=>'à°µà±','ూ'=>'à±à°¾','ౄ'=>'ృా','ೡ'=>'ಌಾ','ಔ'=>'ఒౌ','à´ˆ'=>'ഇൗ','à´Š'=>'உൗ','à´'=>'എെ','à´“'=>'à´’à´¾','à´”'=>'ഒൗ','ൡ'=>'à´ž','൫'=>'à´¦àµà´°','à´Œ'=>'നூ','à´™'=>'നூ','൯'=>'à´¨àµ','à´±'=>'à´°','൪'=>'à´°àµ','൮'=>'à´µàµ','ീ'=>'ி','ൂ'=>'ூ','ൃ'=>'ூ','ൈ'=>'െെ','ฃ'=>'ข','ด'=>'ค','ต'=>'ค','ม'=>'ฆ','ซ'=>'ช','à¸'=>'ฎ','ท'=>'ฑ','ๅ'=>'า','ำ'=>'̊า','à¹'=>'เเ','ໜ'=>'ຫນ','à»'=>'ຫມ','ຳ'=>'̊າ','ཷ'=>'ྲཱྀ','ཹ'=>'ླཱྀ','á€'=>'o','ឣ'=>'អ','á§'=>'ᦞ','á­’'=>'á¬','á­“'=>'ᬑ','á­˜'=>'ᬨ','ᢖ'=>'ᡜ','á¡•'=>'á µ','á’'=>'Ꭱ','Ꮍ'=>'y','ð€'=>'A','ð´'=>'A','ð‘¨'=>'A','ð’œ'=>'A','ð“'=>'A','ð”„'=>'A','ð”¸'=>'A','ð•¬'=>'A','ð– '=>'A','ð—”'=>'A','ð˜ˆ'=>'A','ð˜¼'=>'A','ð™°'=>'A','ðš¨'=>'A','ð›¢'=>'A','ðœœ'=>'A','ð–'=>'A','ðž'=>'A','ð‰'=>'J','ð½'=>'J','ð‘±'=>'J','ð’¥'=>'J','ð“™'=>'J','ð”'=>'J','ð•'=>'J','ð•µ'=>'J','ð–©'=>'J','ð—'=>'J','ð˜‘'=>'J','ð™…'=>'J','ð™¹'=>'J','á§'=>'J','â‹¿'=>'E','â„°'=>'E','ð„'=>'E','ð¸'=>'E','ð‘¬'=>'E','ð“”'=>'E','ð”ˆ'=>'E','ð”¼'=>'E','ð•°'=>'E','ð–¤'=>'E','ð—˜'=>'E','ð˜Œ'=>'E','ð™€'=>'E','ð™´'=>'E','ðš¬'=>'E','ð›¦'=>'E','ðœ '=>'E','ðš'=>'E','ðž”'=>'E','ℾ'=>'Ꮁ','ðšª'=>'Ꮁ','ð›¤'=>'Ꮁ','ðœž'=>'Ꮁ','ð˜'=>'Ꮁ','ðž’'=>'Ꮁ','á”'=>'w','ℳ'=>'M','ðŒ'=>'M','ð‘€'=>'M','ð‘´'=>'M','ð“œ'=>'M','ð”'=>'M','ð•„'=>'M','ð•¸'=>'M','ð–¬'=>'M','ð— '=>'M','ð˜”'=>'M','ð™ˆ'=>'M','ð™¼'=>'M','ðš³'=>'M','ð›­'=>'M','ðœ§'=>'M','ð¡'=>'M','ðž›'=>'M','â„‹'=>'H','ℌ'=>'H','â„'=>'H','ð‡'=>'H','ð»'=>'H','ð‘¯'=>'H','ð“—'=>'H','ð•³'=>'H','ð–§'=>'H','ð—›'=>'H','ð˜'=>'H','ð™ƒ'=>'H','ð™·'=>'H','ðš®'=>'H','ð›¨'=>'H','ðœ¢'=>'H','ðœ'=>'H','ðž–'=>'H','ð†'=>'G','ðº'=>'G','ð‘®'=>'G','ð’¢'=>'G','ð“–'=>'G','ð”Š'=>'G','ð”¾'=>'G','ð•²'=>'G','ð–¦'=>'G','ð—š'=>'G','ð˜Ž'=>'G','ð™‚'=>'G','ð™¶'=>'G','á³'=>'G','ℤ'=>'Z','ℨ'=>'Z','ð™'=>'Z','ð‘'=>'Z','ð’'=>'Z','ð’µ'=>'Z','ð“©'=>'Z','ð–…'=>'Z','ð–¹'=>'Z','ð—­'=>'Z','ð˜¡'=>'Z','ð™•'=>'Z','ðš‰'=>'Z','ðš­'=>'Z','ð›§'=>'Z','ðœ¡'=>'Z','ð›'=>'Z','ðž•'=>'Z','ð’'=>'S','ð‘†'=>'S','ð‘º'=>'S','ð’®'=>'S','ð“¢'=>'S','ð”–'=>'S','ð•Š'=>'S','ð•¾'=>'S','ð–²'=>'S','ð—¦'=>'S','ð˜š'=>'S','ð™Ž'=>'S','ðš‚'=>'S','áš'=>'S','ð•'=>'V','ð‘‰'=>'V','ð‘½'=>'V','ð’±'=>'V','ð“¥'=>'V','ð”™'=>'V','ð•'=>'V','ð–'=>'V','ð–µ'=>'V','ð—©'=>'V','ð˜'=>'V','ð™‘'=>'V','ðš…'=>'V','â„’'=>'L','ð‹'=>'L','ð¿'=>'L','ð‘³'=>'L','ð“›'=>'L','ð”'=>'L','ð•ƒ'=>'L','ð•·'=>'L','ð–«'=>'L','ð—Ÿ'=>'L','ð˜“'=>'L','ð™‡'=>'L','ð™»'=>'L','∑'=>'C','â…€'=>'C','â„‚'=>'C','â„­'=>'C','ð‚'=>'C','ð¶'=>'C','ð‘ª'=>'C','ð’ž'=>'C','ð“’'=>'C','ð•®'=>'C','ð–¢'=>'C','ð—–'=>'C','ð˜Š'=>'C','ð˜¾'=>'C','ð™²'=>'C','ðšº'=>'C','ð›´'=>'C','ðœ®'=>'C','ð¨'=>'C','ðž¢'=>'C','â„™'=>'P','ð'=>'P','ð‘ƒ'=>'P','ð‘·'=>'P','ð’«'=>'P','ð“Ÿ'=>'P','ð”“'=>'P','ð•»'=>'P','ð–¯'=>'P','ð—£'=>'P','ð˜—'=>'P','ð™‹'=>'P','ð™¿'=>'P','ðš¸'=>'P','ð›²'=>'P','ðœ¬'=>'P','ð¦'=>'P','ðž '=>'P','ðŠ'=>'K','ð¾'=>'K','ð‘²'=>'K','ð’¦'=>'K','ð“š'=>'K','ð”Ž'=>'K','ð•‚'=>'K','ð•¶'=>'K','ð–ª'=>'K','ð—ž'=>'K','ð˜’'=>'K','ð™†'=>'K','ð™º'=>'K','ðš±'=>'K','ð›«'=>'K','ðœ¥'=>'K','ðŸ'=>'K','ðž™'=>'K','ℬ'=>'B','ð'=>'B','ðµ'=>'B','ð‘©'=>'B','ð“‘'=>'B','ð”…'=>'B','ð”¹'=>'B','ð•­'=>'B','ð–¡'=>'B','ð—•'=>'B','ð˜‰'=>'B','ð˜½'=>'B','ð™±'=>'B','ðš©'=>'B','ð›£'=>'B','ðœ'=>'B','ð—'=>'B','ðž‘'=>'B','á'=>'á·','∆'=>'áƒ','ðš«'=>'áƒ','ð›¥'=>'áƒ','ðœŸ'=>'áƒ','ð™'=>'áƒ','ðž“'=>'áƒ','á'=>'áƒÂ·','á‘'=>'á„·','á“'=>'á…·','á•'=>'á†Â·','á˜'=>'áŠÂ·','áš'=>'á‹Â·','á“‘'=>'á¡','á‘¶'=>'·P','ᑺ'=>'·d','á’˜'=>'·J','á‘'=>'á³Â·','ᑃ'=>'á´Â·','á‘…'=>'á¸Â·','ᑇ'=>'á¹Â·','ˈ'=>'ᑊ','ᑘ'=>'ᑌ·','á‘§'=>'ᑌᑊ','ᑚ'=>'ᑎ·','ᑨ'=>'ᑎᑊ','ᑜ'=>'á‘·','ᑞ'=>'á‘·','á‘©'=>'á‘ᑊ','á‘ '=>'ᑑ·','á‘¢'=>'ᑕ·','ᑪ'=>'ᑕᑊ','ᑤ'=>'ᑖ·','ᑵ'=>'ᑫ·','á’…'=>'ᑫᑊ','á‘·'=>'P·','á’†'=>'Pᑊ','ᑹ'=>'ᑮ·','á‘»'=>'d·','á’‡'=>'dᑊ','ᑽ'=>'ᑰ·','á‘¿'=>'ᑲ·','á’ˆ'=>'ᑲᑊ','á’'=>'ᑳ·','ᘃ'=>'á’‰','á’“'=>'ᒉ·','á’•'=>'ᒋ·','á’—'=>'ᒌ·','á’™'=>'J·','á’›'=>'ᒎ·','ᘂ'=>'á’','á’'=>'á’·','á’Ÿ'=>'ᒑ·','á’­'=>'ᒣ·','á’¯'=>'ᒥ·','á’±'=>'ᒦ·','á’³'=>'ᒧ·','á’µ'=>'ᒨ·','á’¹'=>'ᒫ·','ᓊ'=>'ᓀ·','ᓌ'=>'ᓇ·','ᓎ'=>'ᓈᒫ','ᘄ'=>'á““','á“'=>'ᓓ·','ᓟ'=>'ᓕ·','á“¡'=>'ᓖ·','á“£'=>'ᓗ·','á“¥'=>'ᓘ·','ᘇ'=>'ᓚ','á“§'=>'ᓚ·','á“©'=>'ᓛ·','á“·'=>'ᓭ·','ᓹ'=>'ᓯ·','á“»'=>'ᓰ·','ᓽ'=>'ᓱ·','á“¿'=>'ᓲ·','á”'=>'ᓴ·','ᔃ'=>'ᓵ·','ᔌ'=>'ᔋá¸','á”'=>'ᔋᑕ','ᔎ'=>'ᔋᑲ','á”'=>'ᔋá’','ᔘ'=>'á”·','ᔚ'=>'ᔑ·','ᔜ'=>'ᔒ·','ᔞ'=>'ᔓ·','á” '=>'ᔔ·','ᔢ'=>'ᔕ·','ᔤ'=>'ᔖ·','ᔲ'=>'ᔨ·','á”´'=>'ᔩ·','á”¶'=>'ᔪ·','ᔸ'=>'ᔫ·','ᔺ'=>'ᔭ·','ᔼ'=>'ᔮ·','á™®'=>'x','ᕽ'=>'x','ᘢ'=>'ᕃ','ᘣ'=>'ᕆ','ᘤ'=>'ᕊ','á•'=>'ᕌ·','ᙯ'=>'á•á‘«','ᕾ'=>'á•ᑬ','á•¿'=>'á•P','á–€'=>'á•á‘®','á–'=>'á•d','á–‚'=>'á•á‘°','á–ƒ'=>'á•ᑲ','á–„'=>'á•ᑳ','á–…'=>'á•á’ƒ','ᕜ'=>'ᕚ·','á•©'=>'ᕧ·','â„›'=>'R','ℜ'=>'R','â„'=>'R','ð‘'=>'R','ð‘…'=>'R','ð‘¹'=>'R','ð“¡'=>'R','ð•½'=>'R','ð–±'=>'R','ð—¥'=>'R','ð˜™'=>'R','ð™'=>'R','ðš'=>'R','á™°'=>'á–•á’‰','á–Ž'=>'á–•á’Š','á–'=>'á–•á’‹','á–'=>'á–•á’Œ','á–‘'=>'á–•J','á–’'=>'á–•á’Ž','á–“'=>'á–•á’','á–”'=>'á–•á’‘','á™±'=>'á––á’‹','ᙲ'=>'á––á’Œ','ᙳ'=>'á––J','á™´'=>'á––á’Ž','ᙵ'=>'á––á’','á™¶'=>'á––á’‘','ℱ'=>'F','ð…'=>'F','ð¹'=>'F','ð‘­'=>'F','ð“•'=>'F','ð”‰'=>'F','ð”½'=>'F','ð•±'=>'F','ð–¥'=>'F','ð—™'=>'F','ð˜'=>'F','ð™'=>'F','ð™µ'=>'F','ðŸŠ'=>'F','â……'=>'D','ðƒ'=>'D','ð·'=>'D','ð‘«'=>'D','ð’Ÿ'=>'D','ð““'=>'D','ð”‡'=>'D','ð”»'=>'D','ð•¯'=>'D','ð–£'=>'D','ð——'=>'D','ð˜‹'=>'D','ð˜¿'=>'D','ð™³'=>'D','á—ª'=>'D','â„§'=>'ᘮ','ᘴ'=>'ᘮ','ð›€'=>'ᘯ','ð›º'=>'ᘯ','ðœ´'=>'ᘯ','ð®'=>'ᘯ','ðž¨'=>'ᘯ','ᘵ'=>'ᘯ','ㄱ'=>'á„€','ᄀ'=>'á„€','ᆨ'=>'á„€','ㄲ'=>'á„','ï¾¢'=>'á„','ᆩ'=>'á„','ã„´'=>'á„‚','ᄂ'=>'á„‚','ᆫ'=>'á„‚','ã„·'=>'ᄃ','ï¾§'=>'ᄃ','ᆮ'=>'ᄃ','ㄸ'=>'á„„','ᄄ'=>'á„„','ㄹ'=>'á„…','ᄅ'=>'á„…','ᆯ'=>'á„…','ã…'=>'ᄆ','ï¾±'=>'ᄆ','ᆷ'=>'ᄆ','ã…‚'=>'ᄇ','ï¾²'=>'ᄇ','ᆸ'=>'ᄇ','ã…ƒ'=>'ᄈ','ï¾³'=>'ᄈ','ã……'=>'ᄉ','ï¾µ'=>'ᄉ','ᆺ'=>'ᄉ','ã…†'=>'ᄊ','ï¾¶'=>'ᄊ','ᆻ'=>'ᄊ','ã…‡'=>'á„‹','ï¾·'=>'á„‹','ᆼ'=>'á„‹','ã…ˆ'=>'ᄌ','ᄌ'=>'ᄌ','ᆽ'=>'ᄌ','ã…‰'=>'á„','ï¾¹'=>'á„','ã…Š'=>'ᄎ','ᄎ'=>'ᄎ','ᆾ'=>'ᄎ','ã…‹'=>'á„','ï¾»'=>'á„','ᆿ'=>'á„','ã…Œ'=>'á„','ï¾¼'=>'á„','ᇀ'=>'á„','ã…'=>'á„‘','ï¾½'=>'á„‘','á‡'=>'á„‘','ã…Ž'=>'á„’','ï¾¾'=>'á„’','ᇂ'=>'á„’','ᇅ'=>'á„“','ã…¥'=>'á„”','ã…¦'=>'á„•','ᇆ'=>'á„•','ᇊ'=>'á„—','á‡'=>'ᄘ','á‡'=>'á„™','ã…€'=>'ᄚ','ï¾°'=>'ᄚ','á„»'=>'ᄚ','ᆶ'=>'ᄚ','ã…®'=>'ᄜ','ᇜ'=>'ᄜ','ã…±'=>'á„','ᇢ'=>'á„','ã…²'=>'ᄞ','ã…³'=>'á„ ','ã…„'=>'á„¡','ï¾´'=>'á„¡','ᆹ'=>'á„¡','ã…´'=>'á„¢','ã…µ'=>'á„£','ã…¶'=>'á„§','ã…·'=>'á„©','ã…¸'=>'á„«','ᇦ'=>'á„«','ã…¹'=>'ᄬ','ã…º'=>'á„­','ᇧ'=>'á„­','ã…»'=>'á„®','ã…¼'=>'ᄯ','ᇨ'=>'ᄯ','ᇩ'=>'á„°','ã…½'=>'ᄲ','ᇪ'=>'ᄲ','ã…¾'=>'á„¶','ã…¿'=>'á…€','ᇫ'=>'á…€','ᇬ'=>'á…','ᇱ'=>'á……','ㆂ'=>'á……','ᇲ'=>'á…†','ㆃ'=>'á…†','ㆀ'=>'á…‡','ᇮ'=>'á…‡','ã†'=>'á…Œ','ᇰ'=>'á…Œ','ᇳ'=>'á…–','ㆄ'=>'á…—','ᇴ'=>'á…—','ㆅ'=>'á…˜','ㆆ'=>'á…™','ᇹ'=>'á…™','ã…¤'=>'á… ','ï¾ '=>'á… ','ã…'=>'á…¡','ï¿‚'=>'á…¡','ã…'=>'á…¢','ᅢ'=>'á…¢','ã…‘'=>'á…£','ï¿„'=>'á…£','ã…’'=>'á…¤','ï¿…'=>'á…¤','ã…“'=>'á…¥','ᅥ'=>'á…¥','ã…”'=>'á…¦','ᅦ'=>'á…¦','ã…•'=>'á…§','ᅧ'=>'á…§','ã…–'=>'á…¨','ï¿‹'=>'á…¨','ã…—'=>'á…©','ᅩ'=>'á…©','ã…˜'=>'á…ª','ï¿'=>'á…ª','ã…™'=>'á…«','ᅫ'=>'á…«','ã…š'=>'á…¬','ï¿'=>'á…¬','ã…›'=>'á…­','ï¿’'=>'á…­','ã…œ'=>'á…®','ï¿“'=>'á…®','ã…'=>'á…¯','ï¿”'=>'á…¯','ã…ž'=>'á…°','ï¿•'=>'á…°','ã…Ÿ'=>'á…±','ï¿–'=>'á…±','ã… '=>'á…²','ï¿—'=>'á…²','ã…¡'=>'一','ᅳ'=>'一','ã…¢'=>'á…´','ï¿›'=>'á…´','ã…£'=>'丨','ᅵ'=>'丨','ㆇ'=>'ᆄ','ᆆ'=>'ᆄ','ㆈ'=>'ᆅ','ㆉ'=>'ᆈ','ㆊ'=>'ᆑ','ㆋ'=>'ᆒ','ㆌ'=>'ᆔ','ã†'=>'ᆞ','ㆎ'=>'ᆡ','ㄳ'=>'ᆪ','ï¾£'=>'ᆪ','ㄵ'=>'ᆬ','ï¾¥'=>'ᆬ','ã„¶'=>'ᆭ','ᆭ'=>'ᆭ','ㄺ'=>'ᆰ','ᆰ'=>'ᆰ','ã„»'=>'ᆱ','ᆱ'=>'ᆱ','ㄼ'=>'ᆲ','ᆲ'=>'ᆲ','ㄽ'=>'ᆳ','ï¾­'=>'ᆳ','ㄾ'=>'ᆴ','ï¾®'=>'ᆴ','ã„¿'=>'ᆵ','ᆵ'=>'ᆵ','ã…§'=>'ᇇ','ã…¨'=>'ᇈ','ã…©'=>'ᇌ','ã…ª'=>'ᇎ','ã…«'=>'ᇓ','ã…¬'=>'ᇗ','ã…­'=>'ᇙ','ã…¯'=>'á‡','ã…°'=>'ᇟ','ï½§'=>'ã‚¡','ï½±'=>'ã‚¢','ィ'=>'ã‚£','ï½²'=>'イ','ゥ'=>'ã‚¥','ï½³'=>'ウ','ェ'=>'ã‚§','ï½´'=>'エ','ォ'=>'ã‚©','ï½µ'=>'オ','ï½¶'=>'ã‚«','ï½·'=>'ã‚­','ク'=>'ク','ï½¹'=>'ケ','コ'=>'コ','ï½»'=>'サ','ï½¼'=>'ã‚·','ï½½'=>'ス','ï½¾'=>'ã‚»','ソ'=>'ソ','ï¾€'=>'ã‚¿','ï¾'=>'ãƒ','ッ'=>'ッ','ツ'=>'ツ','テ'=>'テ','ト'=>'ト','ï¾…'=>'ナ','ニ'=>'ニ','ヌ'=>'ヌ','ネ'=>'ãƒ','ノ'=>'ノ','ハ'=>'ãƒ','ヒ'=>'ヒ','フ'=>'フ','ï¾'=>'ã¸','ホ'=>'ホ','ï¾'=>'マ','â§„'=>'〼','ï¾'=>'ミ','ム'=>'ム','ï¾’'=>'メ','モ'=>'モ','ャ'=>'ャ','ï¾”'=>'ヤ','ï½­'=>'ュ','ユ'=>'ユ','ï½®'=>'ョ','ï¾–'=>'ヨ','ï¾—'=>'ラ','リ'=>'リ','ï¾™'=>'ル','レ'=>'レ','ï¾›'=>'ロ','ワ'=>'ワ','ヲ'=>'ヲ','ï¾'=>'ン','ê’ž'=>'êŠ','ê’¬'=>'ê','ê’œ'=>'ꃀ','ê’¿'=>'ꉙ','ê’¾'=>'ꊱ','ê“€'=>'ꎫ','ê“‚'=>'ꎵ','ê’º'=>'ꎿ','ê’°'=>'ê‚','ð’ '=>'ð’†','—'=>'一','―'=>'一','−'=>'一','─'=>'一','â¼€'=>'一','不'=>'ä¸','ï©°'=>'並','|'=>'丨','|'=>'丨','∣'=>'丨','â¼'=>'丨','‖'=>'丨丨','∥'=>'丨丨','串'=>'串','⼂'=>'丶','ð¯ '=>'丸','丹'=>'丹','丽'=>'丽','⼃'=>'丿','乁'=>'ä¹','⼄'=>'ä¹™','亂'=>'亂','â¼…'=>'亅','了'=>'了','⼆'=>'二','⼇'=>'亠','亮'=>'亮','⼈'=>'人','ï§½'=>'什','仌'=>'仌','令'=>'令','你'=>'ä½ ','倂'=>'ä½µ','倂'=>'ä½µ','侀'=>'ä¾€','來'=>'來','例'=>'例','侮'=>'ä¾®','侮'=>'ä¾®','侻'=>'ä¾»','便'=>'便','值'=>'値','ï§”'=>'倫','偺'=>'åº','備'=>'å‚™','像'=>'åƒ','僚'=>'僚','僧'=>'僧','僧'=>'僧','⼉'=>'å„¿','兀'=>'å…€','ï©´'=>'å……','免'=>'å…','免'=>'å…','ð¯ '=>'å…”','ð¯ '=>'å…¤','⼊'=>'å…¥','內'=>'å…§','全'=>'å…¨','兩'=>'å…©','⼋'=>'å…«','ï§‘'=>'å…­','具'=>'å…·','冀'=>'冀','⼌'=>'冂','再'=>'å†','冒'=>'冒','冕'=>'冕','â¼'=>'冖','冗'=>'冗','冤'=>'冤','⼎'=>'冫','冬'=>'冬','况'=>'况','况'=>'况','冷'=>'冷','凉'=>'凉','凌'=>'凌','凜'=>'凜','凞'=>'凞','â¼'=>'几','ð¯ '=>'凵','â¼'=>'凵','⼑'=>'刀','刃'=>'刃','切'=>'切','ð¯¡'=>'切','列'=>'列','ï§'=>'利','ï§¿'=>'刺','刻'=>'刻','剆'=>'剆','割'=>'割','剷'=>'剷','劉'=>'劉','力'=>'力','â¼’'=>'力','ï¦'=>'劣','劳'=>'劳','ï©¶'=>'勇','勇'=>'勇','勉'=>'勉','勉'=>'勉','勒'=>'å‹’','勞'=>'勞','勤'=>'勤','勤'=>'勤','勵'=>'勵','⼓'=>'勹','ï©·'=>'勺','勺'=>'勺','包'=>'包','匆'=>'匆','â¼”'=>'匕','北'=>'北','北'=>'北','⼕'=>'匚','â¼–'=>'匸','ï§«'=>'匿','â¼—'=>'å','〸'=>'å','〹'=>'å„','〺'=>'å…','卉'=>'å‰','卑'=>'å‘','卑'=>'å‘','博'=>'åš','⼘'=>'åœ','â¼™'=>'å©','即'=>'å³','卵'=>'åµ','卽'=>'å½','卿'=>'å¿','卿'=>'å¿','卿'=>'å¿','⼚'=>'厂','â¼›'=>'厶','參'=>'åƒ','⼜'=>'åˆ','及'=>'åŠ','叟'=>'åŸ','â¼'=>'å£','句'=>'å¥','叫'=>'å«','叱'=>'å±','吆'=>'å†','ï§ž'=>'å','ï§­'=>'å','吸'=>'å¸','呂'=>'å‘‚','呈'=>'呈','周'=>'周','咞'=>'å’ž','咢'=>'å’¢','咽'=>'å’½','ð¯¡'=>'å“¶','唐'=>'å”','啓'=>'å•“','啟'=>'å•“','啕'=>'å••','啣'=>'å•£','善'=>'å–„','善'=>'å–„','喇'=>'å–‡','喙'=>'å–™','喙'=>'å–™','喝'=>'å–','喝'=>'å–','喫'=>'å–«','喳'=>'å–³','ï¨'=>'å—€','嗂'=>'å—‚','ï©»'=>'å—¢','嘆'=>'嘆','嘆'=>'嘆','噑'=>'噑','器'=>'器','ð¯¡'=>'å™´','⼞'=>'å›—','囹'=>'囹','圖'=>'圖','ð¯¡'=>'圗','⼟'=>'土','型'=>'åž‹','城'=>'城','埴'=>'埴','堍'=>'å ','報'=>'å ±','堲'=>'å ²','塀'=>'å¡€','ï¨'=>'塚','塚'=>'塚','塞'=>'塞','å¡«'=>'å¡¡','墨'=>'墨','壿'=>'墫','墬'=>'墬','墳'=>'墳','壘'=>'壘','壟'=>'壟','â¼ '=>'士','壮'=>'壮','売'=>'売','壷'=>'壷','⼡'=>'夂','夆'=>'夆','â¼¢'=>'夊','â¼£'=>'夕','ð¯¡'=>'多','夢'=>'夢','⼤'=>'大','奄'=>'奄','奈'=>'奈','契'=>'契','ï©¿'=>'奔','奢'=>'奢','ï¦'=>'女','â¼¥'=>'女','姘'=>'姘','姬'=>'姬','娛'=>'娛','娧'=>'娧','婢'=>'å©¢','婦'=>'婦','嬀'=>'媯','媵'=>'媵','嬈'=>'嬈','ïª'=>'嬨','嬾'=>'嬾','嬾'=>'嬾','⼦'=>'å­','â¼§'=>'宀','宅'=>'å®…','寃'=>'寃','寘'=>'寘','寧'=>'寧','寧'=>'寧','寧'=>'寧','寮'=>'寮','寳'=>'寳','⼨'=>'寸','寿'=>'寿','将'=>'å°†','⼩'=>'å°','尢'=>'å°¢','⼪'=>'å°¢','⼫'=>'å°¸','尿'=>'å°¿','屠'=>'å± ','屢'=>'å±¢','層'=>'層','ï§Ÿ'=>'å±¥','屮'=>'å±®','屮'=>'å±®','⼬'=>'å±®','â¼­'=>'å±±','岍'=>'å²','峀'=>'å³€','ï§•'=>'å´™','嵃'=>'嵃','嵐'=>'åµ','嵫'=>'嵫','嵮'=>'åµ®','嵼'=>'åµ¼','嶲'=>'å¶²','嶺'=>'嶺','â¼®'=>'å·›','ð¯¢'=>'å·¡','巢'=>'å·¢','⼯'=>'å·¥','â¼°'=>'å·±','巽'=>'å·½','â¼±'=>'å·¾','帲'=>'帡','帨'=>'帨','帽'=>'帽','幩'=>'幩','â¼²'=>'å¹²','年'=>'å¹´','â¼³'=>'幺','â¼´'=>'广','ï¨'=>'度','庰'=>'庰','庳'=>'庳','ð¯¢'=>'庶','廉'=>'廉','廊'=>'廊','廊'=>'廊','廒'=>'å»’','廓'=>'廓','廙'=>'å»™','廬'=>'廬','â¼µ'=>'å»´','ð¯¢'=>'廾','â¼¶'=>'廾','弄'=>'弄','â¼·'=>'弋','⼸'=>'弓','弢'=>'å¼¢','弢'=>'å¼¢','â¼¹'=>'å½','当'=>'当','⼺'=>'彡','形'=>'å½¢','彩'=>'彩','彫'=>'彫','â¼»'=>'å½³','律'=>'律','徚'=>'徚','復'=>'復','徭'=>'å¾­','â¼¼'=>'心','ð¯¢'=>'å¿','志'=>'å¿—','念'=>'念','忹'=>'忹','怒'=>'怒','怜'=>'怜','悁'=>'æ‚','悔'=>'æ‚”','悔'=>'æ‚”','惇'=>'惇','惘'=>'惘','惡'=>'惡','愈'=>'愈','ï§™'=>'æ…„','慈'=>'æ…ˆ','慌'=>'æ…Œ','慌'=>'æ…Œ','慎'=>'æ…Ž','慎'=>'æ…Ž','慠'=>'æ… ','慨'=>'æ…¨','慺'=>'æ…º','憎'=>'憎','憎'=>'憎','憎'=>'憎','ï¦'=>'æ†','憤'=>'憤','憯'=>'憯','憲'=>'憲','懞'=>'懞','ï©€'=>'懲','懲'=>'懲','懲'=>'懲','ï¤'=>'懶','懶'=>'懶','ï¦'=>'戀','â¼½'=>'戈','成'=>'æˆ','戛'=>'戛','ï§’'=>'戮','戴'=>'戴','â¼¾'=>'戶','⼿'=>'手','扝'=>'æ‰','抱'=>'抱','拉'=>'拉','拏'=>'æ‹','拓'=>'æ‹“','拔'=>'æ‹”','拼'=>'拼','拾'=>'拾','挽'=>'挽','捐'=>'æ','捨'=>'æ¨','捻'=>'æ»','掃'=>'掃','掠'=>'掠','ð¯£'=>'掩','ïª'=>'æ„','揅'=>'æ…','揤'=>'æ¤','ã©'=>'æ‰','搜'=>'æœ','搢'=>'æ¢','ïª'=>'æ‘’','摩'=>'æ‘©','摷'=>'æ‘·','摾'=>'摾','撚'=>'æ’š','撝'=>'æ’','擄'=>'æ“„','â½€'=>'支','â½'=>'æ”´','ï©'=>'æ•','敏'=>'æ•','ïª'=>'æ•–','敬'=>'敬','數'=>'數','⽂'=>'æ–‡','⽃'=>'æ–—','料'=>'æ–™','⽄'=>'æ–¤','â½…'=>'æ–¹','旅'=>'æ—…','⽆'=>'æ— ','ï©‚'=>'æ—¢','旣'=>'æ—£','⽇'=>'æ—¥','ï§ '=>'易','ð¯£'=>'晉','晩'=>'晚','䀿'=>'晣','晴'=>'æ™´','晴'=>'æ™´','ï§…'=>'暈','暑'=>'æš‘','ð¯£'=>'æš‘','暜'=>'æšœ','暴'=>'æš´','曆'=>'曆','⽈'=>'æ›°','ï¤'=>'æ›´','㫚'=>'æ›¶','書'=>'書','最'=>'最','⽉'=>'月','肦'=>'朌','èƒ'=>'æœ','胊'=>'æœ','è„'=>'朓','朗'=>'朗','朗'=>'朗','朗'=>'朗','è„§'=>'朘','望'=>'望','望'=>'望','朡'=>'朡','膧'=>'朣','⽊'=>'木','ï§¡'=>'æŽ','杓'=>'æ“','杖'=>'æ–','杞'=>'æž','柿'=>'æ®','杻'=>'æ»','枅'=>'æž…','ï§´'=>'æž—','柳'=>'柳','柺'=>'柺','ï§š'=>'æ —','栟'=>'æ Ÿ','桒'=>'æ¡’','梁'=>'æ¢','ï©„'=>'梅','梅'=>'梅','梎'=>'梎','ï§¢'=>'梨','椔'=>'椔','楂'=>'楂','樧'=>'æ¦','榣'=>'榣','槪'=>'槪','樂'=>'樂','樂'=>'樂','樂'=>'樂','樓'=>'樓','檨'=>'檨','櫓'=>'æ«“','櫛'=>'æ«›','ï¤'=>'欄','⽋'=>'欠','次'=>'次','歔'=>'æ­”','⽌'=>'æ­¢','歲'=>'æ­²','歷'=>'æ­·','歹'=>'æ­¹','â½'=>'æ­¹','殟'=>'殟','殮'=>'æ®®','⽎'=>'殳','殺'=>'殺','殺'=>'殺','殺'=>'殺','殻'=>'æ®»','â½'=>'毋','⺟'=>'æ¯','â½'=>'比','⽑'=>'毛','â½’'=>'æ°','⽓'=>'æ°”','â½”'=>'æ°´','汎'=>'汎','汧'=>'æ±§','沈'=>'沈','沿'=>'沿','泌'=>'泌','泍'=>'æ³','ï§£'=>'æ³¥','洖'=>'æ´–','洛'=>'æ´›','洞'=>'æ´ž','洴'=>'æ´´','派'=>'æ´¾','ï§Š'=>'æµ','流'=>'æµ','流'=>'æµ','浩'=>'浩','浪'=>'浪','ï©…'=>'æµ·','ð¯¤'=>'æµ·','浸'=>'浸','涅'=>'æ¶…','ï§µ'=>'æ·‹','ï¥'=>'æ·š','ï§–'=>'æ·ª','淹'=>'æ·¹','渚'=>'渚','港'=>'港','湮'=>'æ¹®','æ½™'=>'溈','ï§‹'=>'溜','溺'=>'溺','滇'=>'滇','滋'=>'滋','滋'=>'滋','滑'=>'滑','滛'=>'æ»›','漏'=>'æ¼','漢'=>'æ¼¢','漢'=>'æ¼¢','漣'=>'æ¼£','ð¯¤'=>'æ½®','濆'=>'濆','濫'=>'æ¿«','濾'=>'濾','瀛'=>'瀛','瀞'=>'瀞','瀞'=>'瀞','瀹'=>'瀹','灊'=>'çŠ','⽕'=>'ç«','灰'=>'ç°','灷'=>'ç·','災'=>'ç½','ï§»'=>'ç‚™','炭'=>'ç‚­','烈'=>'烈','烙'=>'烙','煅'=>'ç……','煉'=>'ç…‰','煮'=>'ç…®','煮'=>'ç…®','熜'=>'熜','ï§€'=>'燎','ï§®'=>'ç‡','爐'=>'çˆ','爛'=>'爛','爨'=>'爨','â½–'=>'爪','爫'=>'爫','⺤'=>'爫','爵'=>'爵','爵'=>'爵','â½—'=>'父','⽘'=>'爻','â½™'=>'爿','⽚'=>'片','牐'=>'ç‰','â½›'=>'牙','⽜'=>'牛','牢'=>'牢','犀'=>'犀','犕'=>'犕','â½'=>'犬','犯'=>'犯','狀'=>'ç‹€','狼'=>'狼','猪'=>'猪','猪'=>'猪','獵'=>'çµ','獺'=>'çº','⽞'=>'玄','率'=>'率','ï§›'=>'率','⽟'=>'玉','王'=>'王','玥'=>'玥','玲'=>'玲','珞'=>'çž','理'=>'ç†','ï§Œ'=>'ç‰','琢'=>'ç¢','瑇'=>'瑇','瑜'=>'瑜','瑩'=>'ç‘©','瑱'=>'瑱','瑱'=>'瑱','璅'=>'ç’…','璉'=>'ç’‰','璘'=>'ç’˜','瓊'=>'瓊','â½ '=>'瓜','⽡'=>'瓦','甆'=>'甆','â½¢'=>'甘','â½£'=>'生','甤'=>'甤','⽤'=>'用','â½¥'=>'ç”°','画'=>'ç”»','甾'=>'甾','ï§'=>'ç•™','略'=>'ç•¥','異'=>'ç•°','異'=>'ç•°','⽦'=>'ç–‹','â½§'=>'ç–’','ï§¥'=>'ç—¢','瘐'=>'ç˜','瘝'=>'ç˜','瘟'=>'瘟','ï§'=>'療','癩'=>'癩','⽨'=>'ç™¶','⽩'=>'白','⽪'=>'çš®','⽫'=>'çš¿','益'=>'益','益'=>'益','盛'=>'ç››','盧'=>'ç›§','⽬'=>'ç›®','直'=>'ç›´','直'=>'ç›´','省'=>'çœ','眞'=>'眞','真'=>'真','真'=>'真','着'=>'ç€','睊'=>'çŠ','睊'=>'çŠ','瞋'=>'çž‹','ïª'=>'çž§','â½­'=>'矛','â½®'=>'矢','⽯'=>'石','ç¡'=>'ç ”','硎'=>'硎','ï§Ž'=>'ç¡«','碌'=>'碌','ð¯¥'=>'碌','ï©‹'=>'碑','磊'=>'磊','磌'=>'磌','ð¯¥'=>'磌','磻'=>'磻','礪'=>'礪','â½°'=>'示','礼'=>'礼','社'=>'社','祈'=>'祈','ï©'=>'祉','ï©'=>'ç¥','ï©'=>'祖','祖'=>'祖','ï©‘'=>'ç¥','神'=>'神','祥'=>'祥','祿'=>'祿','ï©’'=>'ç¦','ï©“'=>'禎','福'=>'ç¦','福'=>'ç¦','禮'=>'禮','â½±'=>'禸','â½²'=>'禾','秊'=>'ç§Š','秫'=>'ç§«','稜'=>'稜','ï©”'=>'ç©€','穀'=>'ç©€','穊'=>'穊','穏'=>'ç©','â½³'=>'ç©´','ï©•'=>'çª','窱'=>'窱','ï§·'=>'ç«‹','â½´'=>'ç«‹','竮'=>'ç«®','â½µ'=>'竹','笠'=>'笠','ï©–'=>'節','節'=>'節','篆'=>'篆','築'=>'築','簾'=>'ç°¾','籠'=>'ç± ','â½¶'=>'ç±³','类'=>'ç±»','ï§¹'=>'ç²’','ï¨'=>'ç²¾','糒'=>'ç³’','糖'=>'ç³–','糣'=>'ç³£','糧'=>'ç³§','糨'=>'糨','â½·'=>'糸','紀'=>'ç´€','ï§'=>'ç´','索'=>'ç´¢','ï¥'=>'ç´¯','çµ¶'=>'絕','絛'=>'çµ›','絣'=>'çµ£','綠'=>'ç¶ ','綾'=>'ç¶¾','緇'=>'ç·‡','練'=>'ç·´','ï©—'=>'ç·´','練'=>'ç·´','縂'=>'縂','縉'=>'縉','ï¥'=>'縷','ï©™'=>'ç¹','繅'=>'ç¹…','⽸'=>'ç¼¶','缾'=>'ç¼¾','â½¹'=>'网','⺫'=>'ç½’','署'=>'ç½²','罹'=>'ç½¹','罺'=>'罺','ï¤'=>'ç¾…','⽺'=>'羊','羕'=>'羕','羚'=>'羚','羽'=>'ç¾½','â½»'=>'ç¾½','翺'=>'翺','老'=>'è€','â½¼'=>'è€','ï©›'=>'者','者'=>'者','者'=>'者','â½½'=>'而','â½¾'=>'耒','⽿'=>'耳','聆'=>'è†','聠'=>'è ','聯'=>'è¯','聰'=>'è°','聾'=>'è¾','â¾€'=>'è¿','â¾'=>'肉','肋'=>'è‚‹','肭'=>'è‚­','育'=>'育','㬵'=>'胶','è…'=>'胼','脃'=>'脃','脾'=>'脾','臘'=>'臘','⾂'=>'臣','ï§¶'=>'臨','⾃'=>'自','臭'=>'臭','⾄'=>'至','â¾…'=>'臼','舁'=>'èˆ','舁'=>'èˆ','舄'=>'舄','⾆'=>'舌','⾇'=>'舛','⾈'=>'舟','⾉'=>'艮','良'=>'良','⾊'=>'色','⾋'=>'艸','ï©'=>'艹','艹'=>'艹','ð¯¦'=>'芋','ð¯¦'=>'芑','芝'=>'èŠ','花'=>'花','芳'=>'芳','芽'=>'芽','若'=>'è‹¥','若'=>'è‹¥','苦'=>'苦','茝'=>'èŒ','茣'=>'茣','ï§¾'=>'茶','荒'=>'è’','荓'=>'è“','荣'=>'è£','莭'=>'莭','ð¯¦'=>'莽','菉'=>'è‰','菊'=>'èŠ','菌'=>'èŒ','菜'=>'èœ','菧'=>'è§','華'=>'è¯','菱'=>'è±','落'=>'è½','葉'=>'葉','著'=>'è‘—','著'=>'è‘—','蔿'=>'è’','蓮'=>'è“®','蓱'=>'蓱','蓳'=>'蓳','ï§‚'=>'蓼','蔖'=>'è”–','蕤'=>'蕤','藍'=>'è—','ï§°'=>'è—º','蘆'=>'蘆','蘒'=>'蘒','蘭'=>'蘭','è™'=>'蘷','ï¤'=>'蘿','⾌'=>'è™','虐'=>'è™','虜'=>'虜','虜'=>'虜','虧'=>'è™§','虩'=>'虩','â¾'=>'虫','蚈'=>'蚈','蚩'=>'èš©','蛢'=>'蛢','蜎'=>'蜎','蜨'=>'蜨','蝫'=>'è«','蝹'=>'è¹','蝹'=>'è¹','螆'=>'螆','螺'=>'螺','蟡'=>'蟡','ð¯§'=>'è ','蠟'=>'è Ÿ','⾎'=>'è¡€','行'=>'行','â¾'=>'行','衠'=>'è¡ ','衣'=>'è¡£','â¾'=>'è¡£','裂'=>'裂','ï§§'=>'è£','裗'=>'裗','裞'=>'裞','裡'=>'裡','裸'=>'裸','裺'=>'裺','ï© '=>'è¤','襁'=>'è¥','襤'=>'襤','⾑'=>'襾','覆'=>'覆','見'=>'見','â¾’'=>'見','ï©¡'=>'視','視'=>'視','⾓'=>'è§’','â¾”'=>'言','äš¶'=>'訞','詽'=>'訮','ð¯§'=>'誠','說'=>'說','說'=>'說','調'=>'調','請'=>'è«‹','諒'=>'è«’','ï¥'=>'è«–','諭'=>'è«­','ð¯§'=>'è«­','諸'=>'諸','諸'=>'諸','ï¥'=>'諾','諾'=>'諾','ï©¢'=>'è¬','謁'=>'è¬','ï©£'=>'謹','謹'=>'謹','ï§¼'=>'è­˜','讀'=>'讀','è®'=>'讆','ï«€'=>'變','變'=>'變','⾕'=>'è°·','â¾–'=>'豆','豈'=>'豈','豕'=>'豕','â¾—'=>'豕','⾘'=>'豸','â¾™'=>'è²','貫'=>'貫','賁'=>'è³','賂'=>'賂','賈'=>'賈','賓'=>'賓','ï©¥'=>'è´ˆ','ï«'=>'è´ˆ','贛'=>'è´›','⾚'=>'赤','â¾›'=>'èµ°','起'=>'èµ·','趆'=>'赿','⾜'=>'è¶³','趼'=>'è¶¼','跋'=>'è·‹','è·º'=>'è·¥','路'=>'è·¯','跰'=>'è·°','躛'=>'躗','â¾'=>'身','車'=>'車','⾞'=>'車','軔'=>'è»”','è¼§'=>'軿','輦'=>'輦','ï§—'=>'輪','ï«‚'=>'輸','輸'=>'輸','輻'=>'è¼»','ï¦'=>'è½¢','⾟'=>'è¾›','ð¯¦'=>'辞','辰'=>'è¾°','â¾ '=>'è¾°','⾡'=>'è¾µ','辶'=>'è¾¶','⻌'=>'è¾¶','連'=>'連','逸'=>'逸','ï©§'=>'逸','遲'=>'é²','遼'=>'é¼','邏'=>'é‚','â¾¢'=>'é‚‘','邔'=>'é‚”','郎'=>'郎','郱'=>'郱','都'=>'都','鄑'=>'é„‘','鄛'=>'é„›','â¾£'=>'é…‰','酪'=>'é…ª','ï«„'=>'醙','醴'=>'醴','⾤'=>'釆','ï§©'=>'里','â¾¥'=>'里','量'=>'é‡','金'=>'金','⾦'=>'金','鈴'=>'鈴','鈸'=>'鈸','ï«…'=>'鉶','鉼'=>'鉼','鋗'=>'é‹—','鋘'=>'鋘','錄'=>'錄','鍊'=>'éŠ','鎮'=>'鎭','鏹'=>'é¹','鐕'=>'é•','â¾§'=>'é•·','⾨'=>'é–€','開'=>'é–‹','閭'=>'é–­','閷'=>'é–·','⾩'=>'阜','阮'=>'阮','陋'=>'陋','降'=>'é™','陵'=>'陵','ï§“'=>'陸','陼'=>'陼','ï§œ'=>'隆','ï§±'=>'隣','⾪'=>'éš¶','隸'=>'隸','⾫'=>'éš¹','雃'=>'雃','離'=>'離','難'=>'難','難'=>'難','⾬'=>'雨','零'=>'é›¶','雷'=>'é›·','霣'=>'霣','露'=>'露','靈'=>'éˆ','â¾­'=>'é‘','靖'=>'é–','靖'=>'é–','â¾®'=>'éž','⾯'=>'é¢','â¾°'=>'é©','â¾±'=>'韋','韛'=>'韛','韠'=>'韠','â¾²'=>'韭','â¾³'=>'音','ï©©'=>'響','響'=>'響','â¾´'=>'é ','ï«‹'=>'é ‹','頋'=>'é ‹','頋'=>'é ‹','領'=>'é ˜','頩'=>'é ©','頻'=>'é »','頻'=>'é »','ï§'=>'類','â¾µ'=>'風','â¾¶'=>'飛','â»'=>'食','â¾·'=>'食','飢'=>'飢','飯'=>'飯','飼'=>'飼','館'=>'館','餩'=>'餩','⾸'=>'首','â¾¹'=>'香','馧'=>'馧','⾺'=>'馬','駂'=>'é§‚','駱'=>'é§±','駾'=>'é§¾','驪'=>'驪','â¾»'=>'骨','â¾¼'=>'高','â¾½'=>'髟','ï«'=>'鬒','鬒'=>'鬒','â¾¾'=>'鬥','⾿'=>'鬯','â¿€'=>'鬲','â¿'=>'鬼','â¿‚'=>'é­š','魯'=>'é­¯','鱀'=>'é±€','ï§²'=>'é±—','⿃'=>'é³¥','鳽'=>'é³½','ð¯¨'=>'éµ§','鶴'=>'é¶´','鷺'=>'é·º','鸞'=>'鸞','鹃'=>'鹂','â¿„'=>'é¹µ','鹿'=>'鹿','â¿…'=>'鹿','麗'=>'麗','ï§³'=>'麟','⿆'=>'麥','麻'=>'麻','⿇'=>'麻','⿈'=>'黃','⿉'=>'é»','黎'=>'黎','⿊'=>'黑','黹'=>'黹','â¿‹'=>'黹','⿌'=>'黽','黾'=>'黾','鼅'=>'é¼…','â¿'=>'鼎','鼏'=>'é¼','⿎'=>'鼓','鼖'=>'é¼–','â¿'=>'é¼ ','鼻'=>'é¼»','â¿'=>'é¼»','齃'=>'齃','â¿‘'=>'齊','â¿’'=>'é½’','ï§„'=>'é¾','â¿“'=>'é¾','ï«™'=>'龎','龜'=>'龜','龜'=>'龜','龜'=>'龜','â¿”'=>'龜','⻳'=>'龟','â¿•'=>'é¾ ','㒞'=>'ã’ž','㒹'=>'ã’¹','㒻'=>'ã’»','㓟'=>'㓟','㔕'=>'㔕','䎛'=>'ã–ˆ','㛮'=>'ã›®','㛼'=>'㛼','㞁'=>'ãž','㠯'=>'ã ¯','㡢'=>'ã¡¢','㡼'=>'㡼','㣇'=>'㣇','㣣'=>'㣣','㤜'=>'㤜','㤺'=>'㤺','㨮'=>'㨮','㩬'=>'㩬','㫤'=>'㫤','ð¯£'=>'㬈','㬙'=>'㬙','ä '=>'㬻','㭉'=>'ã­‰','ï«’'=>'ã®','㮝'=>'ã®','㰘'=>'ã°˜','㱎'=>'㱎','㴳'=>'ã´³','㶖'=>'ã¶–','㺬'=>'㺬','㺸'=>'㺸','㺸'=>'㺸','㼛'=>'ã¼›','㿼'=>'㿼','䀈'=>'䀈','ï«“'=>'䀘','ï«”'=>'䀹','䀹'=>'䀹','䁆'=>'ä†','䂖'=>'ä‚–','䃣'=>'䃣','䄯'=>'䄯','䈂'=>'䈂','䈧'=>'䈧','䊠'=>'䊠','䌁'=>'äŒ','䌴'=>'䌴','䍙'=>'ä™','ð¯¦'=>'ä•','䏙'=>'ä™','䐋'=>'ä‹','䑫'=>'ä‘«','䔫'=>'䔫','䕝'=>'ä•','䕡'=>'ä•¡','䕫'=>'ä•«','䗗'=>'ä——','䗹'=>'ä—¹','䘵'=>'䘵','ð¯§'=>'äš¾','䛇'=>'䛇','䦕'=>'䦕','䧦'=>'䧦','䩮'=>'ä©®','䩶'=>'ä©¶','䪲'=>'䪲','䬳'=>'䬳','䯎'=>'䯎','ð¯¨'=>'䳎','䳭'=>'ä³­','䳸'=>'䳸','䵖'=>'äµ–','𠄢'=>'ð „¢','𠔜'=>'𠔜','𠔥'=>'𠔥','𠕋'=>'ð •‹','ð¯ '=>'𠘺','𠠄'=>'ð  „','ð¯§'=>'𠣞','𠨬'=>'𠨬','𠭣'=>'ð ­£','𡓤'=>'𡓤','𡚨'=>'𡚨','𡛪'=>'𡛪','𡧈'=>'𡧈','𡬘'=>'𡬘','𡴋'=>'ð¡´‹','𡷤'=>'ð¡·¤','𡷦'=>'ð¡·¦','𢆃'=>'𢆃','𢆟'=>'𢆟','𢌱'=>'𢌱','𢌱'=>'𢌱','𢛔'=>'𢛔','ï«'=>'𢡄','ï«'=>'𢡊','𢬌'=>'𢬌','𢯱'=>'𢯱','𣀊'=>'𣀊','𣊸'=>'𣊸','𣍟'=>'ð£Ÿ','𣎓'=>'𣎓','𣎜'=>'𣎜','ð¯£'=>'ð£ƒ','ï«‘'=>'ð£•','𣑭'=>'𣑭','𣚣'=>'𣚣','𣢧'=>'𣢧','𣪍'=>'ð£ª','𣫺'=>'𣫺','𣲼'=>'𣲼','𣴞'=>'𣴞','ð¯¤'=>'𣻑','ð¯¤'=>'𣽞','𣾎'=>'𣾎','ð¯¤'=>'𤉣','𤎫'=>'𤎫','𤘈'=>'𤘈','𤜵'=>'𤜵','𤠔'=>'𤠔','𤰶'=>'𤰶','𤲒'=>'𤲒','𤾡'=>'𤾡','𤾸'=>'𤾸','𥁄'=>'ð¥„','𥃲'=>'𥃲','ð¯¥'=>'𥃳','𥄙'=>'𥄙','𥄳'=>'𥄳','ï«•'=>'𥉉','ð¯¥'=>'ð¥','𥘦'=>'𥘦','𥚚'=>'𥚚','𥛅'=>'𥛅','𥥼'=>'𥥼','ð¯¥'=>'𥪧','𥪧'=>'𥪧','𥮫'=>'𥮫','𥲀'=>'𥲀','ï«–'=>'ð¥³','𥾆'=>'𥾆','𦇚'=>'𦇚','𦈨'=>'𦈨','𦉇'=>'𦉇','𦋙'=>'𦋙','𦌾'=>'𦌾','𦓚'=>'𦓚','𦔣'=>'𦔣','𦖨'=>'𦖨','𦞧'=>'𦞧','𦞵'=>'𦞵','𦬼'=>'𦬼','𦰶'=>'𦰶','𦳕'=>'𦳕','𦵫'=>'𦵫','𦼬'=>'𦼬','𦾱'=>'𦾱','𧃒'=>'𧃒','𧏊'=>'ð§Š','𧙧'=>'ð§™§','𧢮'=>'ð§¢®','𧥦'=>'𧥦','𧲨'=>'𧲨','ï«—'=>'𧻓','𧼯'=>'𧼯','𨗒'=>'𨗒','𨗭'=>'𨗭','𨜮'=>'𨜮','𨯺'=>'𨯺','𨵷'=>'𨵷','𩅅'=>'ð©……','𩇟'=>'𩇟','𩈚'=>'𩈚','𩐊'=>'ð©Š','𩒖'=>'ð©’–','ð¯¨'=>'ð©–¶','𩬰'=>'𩬰','ð¯¨'=>'𪃎','𪄅'=>'𪄅','𪈎'=>'𪈎','𪊑'=>'𪊑','ð¯¢'=>'𪎒','ð¯¨'=>'𪘀','℃'=>'°C','℉'=>'°F','ℇ'=>'Æ','â„»'=>'FAX','â„•'=>'N','â„–'=>'No','ℚ'=>'Q','₨'=>'Rs','ð“'=>'T','â„¡'=>'TEL','ð”'=>'U','ð–'=>'W','â‚©'=>'W̵','ð—'=>'X','Â¥'=>'Y̵','ðš²'=>'Λ','ðšµ'=>'Ξ','â„¿'=>'Π','ϲ'=>'c','Ï’'=>'Y','ðš½'=>'Φ','ðš¿'=>'Ψ','Ñ£'=>'Ь̵','ਃ'=>'ঃ','ಃ'=>'à°ƒ','່'=>'่','់'=>'่','້'=>'้','໊'=>'๊','໋'=>'๋','៕'=>'๚','៚'=>'๛','ÑŠ'=>'ˉb','៙'=>'à¹','à³§'=>'à±§','૨'=>'२','೨'=>'౨','à«©'=>'३','૪'=>'४','à«®'=>'८','೯'=>'౯','а'=>'a','á'=>'b','á–¯'=>'b','Ñ'=>'c','Ô'=>'d','ᑯ'=>'d','е'=>'e','Ó™'=>'Ç','ε'=>'É›','Ñ”'=>'É›','Ö„'=>'f','Ö'=>'g','Ò»'=>'h','Õ°'=>'h','á‚'=>'h','á²'=>'hÌ”','ι'=>'i','Ñ–'=>'i','Ꭵ'=>'i','ј'=>'j','Õµ'=>'j','á—°'=>'m','Õ¸'=>'n','η'=>'nÌ©','à°‚'=>'o','ಂ'=>'o','à´‚'=>'o','०'=>'o','੦'=>'o','૦'=>'o','à¹'=>'o','à»'=>'o','ο'=>'o','о'=>'o','Ö…'=>'o','á€'=>'o','Ï'=>'p','Ñ€'=>'p','á´©'=>'á´˜','Õ£'=>'q','κ'=>'ĸ','к'=>'ĸ','á´¦'=>'r','г'=>'r','Ñ•'=>'s','Ï…'=>'u','Õ½'=>'u','ν'=>'v','ѵ'=>'v','Ꮃ'=>'w','á—¯'=>'w','Ñ…'=>'x','á•'=>'x','у'=>'y','Ꭹ'=>'y','Ó¡'=>'Ê’','ჳ'=>'Ê’','Ï©'=>'ƨ','ÑŒ'=>'Æ…','Ñ‹'=>'Æ…i','É‘'=>'α','Õ®'=>'δ','á•·'=>'δ','п'=>'Ï€','ɸ'=>'φ','Ñ„'=>'φ','Ê™'=>'в','Éœ'=>'з','á´'=>'м','Êœ'=>'н','É¢'=>'Ô','á´›'=>'Ñ‚','á´™'=>'Ñ','ઽ'=>'ऽ','à«'=>'à¥','à«‚'=>'ू','à©‹'=>'ॆ','à©'=>'à¥','à«'=>'à¥','à´‰'=>'உ','à´œ'=>'à®','à´£'=>'ண','à´´'=>'à®´','à´¿'=>'ி','àµ'=>'ூ','ಅ'=>'à°…','ಆ'=>'à°†','ಇ'=>'à°‡','ಒ'=>'à°’','ಓ'=>'ఒౕ','ಜ'=>'à°œ','ಞ'=>'à°ž','ಣ'=>'à°£','à°¥'=>'à°§Ö¼','ಯ'=>'à°¯','à° '=>'à°°Ö¼','ಱ'=>'à°±','ಲ'=>'à°²','à¶Œ'=>'à´¨àµà´¨','à®¶'=>'à´¶','ຈ'=>'จ','ບ'=>'บ','ປ'=>'ป','àº'=>'à¸','ພ'=>'พ','ຟ'=>'ฟ','àº'=>'ย','។'=>'ฯ','áž·'=>'ิ','ី'=>'ี','áž¹'=>'ึ','ឺ'=>'ื','ຸ'=>'ุ','ູ'=>'ู','á—…'=>'A','á’'=>'J','ᕼ'=>'H','á¯'=>'V','á‘­'=>'P','á—·'=>'B','ヘ'=>'ã¸','ð‘'=>'ðŽ‚','ð“'=>'ðŽ“','𒀸'=>'ðŽš','á…³'=>'一','Ç€'=>'丨','á…µ'=>'丨','Ꭺ'=>'A','á´'=>'B','áŸ'=>'C','á—ž'=>'D','Ꭼ'=>'E','á–´'=>'F','á€'=>'G','Ꮋ'=>'H','Ꭻ'=>'J','á¦'=>'K','áž'=>'L','Ꮇ'=>'M','á¢'=>'P','á–‡'=>'R','á•'=>'S','á™'=>'V','áƒ'=>'Z'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_0.php b/phpBB/includes/utf/data/search_indexer_0.php deleted file mode 100644 index 3304b18cdd..0000000000 --- a/phpBB/includes/utf/data/search_indexer_0.php +++ /dev/null @@ -1 +0,0 @@ -'0',1=>'1',2=>'2',3=>'3',4=>'4',5=>'5',6=>'6',7=>'7',8=>'8',9=>'9','A'=>'a','B'=>'b','C'=>'c','D'=>'d','E'=>'e','F'=>'f','G'=>'g','H'=>'h','I'=>'i','J'=>'j','K'=>'k','L'=>'l','M'=>'m','N'=>'n','O'=>'o','P'=>'p','Q'=>'q','R'=>'r','S'=>'s','T'=>'t','U'=>'u','V'=>'v','W'=>'w','X'=>'x','Y'=>'y','Z'=>'z','a'=>'a','b'=>'b','c'=>'c','d'=>'d','e'=>'e','f'=>'f','g'=>'g','h'=>'h','i'=>'i','j'=>'j','k'=>'k','l'=>'l','m'=>'m','n'=>'n','o'=>'o','p'=>'p','q'=>'q','r'=>'r','s'=>'s','t'=>'t','u'=>'u','v'=>'v','w'=>'w','x'=>'x','y'=>'y','z'=>'z','ª'=>'ª','²'=>'2','³'=>'3','µ'=>'µ','¹'=>'1','º'=>'º','¼'=>'1/4','½'=>'1/2','¾'=>'3/4','À'=>'à','Ã'=>'á','Â'=>'â','Ã'=>'ã','Ä'=>'ae','Ã…'=>'Ã¥','Æ'=>'ae','Ç'=>'ç','È'=>'è','É'=>'é','Ê'=>'ê','Ë'=>'ë','ÃŒ'=>'ì','Ã'=>'í','ÃŽ'=>'î','Ã'=>'ï','Ã'=>'ð','Ñ'=>'ñ','Ã’'=>'ò','Ó'=>'ó','Ô'=>'ô','Õ'=>'õ','Ö'=>'oe','Ø'=>'ø','Ù'=>'ù','Ú'=>'ú','Û'=>'û','Ü'=>'ü','Ã'=>'ý','Þ'=>'þ','ß'=>'ss','à'=>'à','á'=>'á','â'=>'â','ã'=>'ã','ä'=>'ae','Ã¥'=>'Ã¥','æ'=>'ae','ç'=>'ç','è'=>'è','é'=>'é','ê'=>'ê','ë'=>'ë','ì'=>'ì','í'=>'í','î'=>'î','ï'=>'ï','ð'=>'ð','ñ'=>'ñ','ò'=>'ò','ó'=>'ó','ô'=>'ô','õ'=>'õ','ö'=>'oe','ø'=>'ø','ù'=>'ù','ú'=>'ú','û'=>'û','ü'=>'ue','ý'=>'ý','þ'=>'þ','ÿ'=>'ÿ','Ä€'=>'Ä','Ä'=>'Ä','Ä‚'=>'ă','ă'=>'ă','Ä„'=>'Ä…','Ä…'=>'Ä…','Ć'=>'ć','ć'=>'ć','Ĉ'=>'ĉ','ĉ'=>'ĉ','ÄŠ'=>'Ä‹','Ä‹'=>'Ä‹','ÄŒ'=>'Ä','Ä'=>'Ä','ÄŽ'=>'Ä','Ä'=>'Ä','Ä'=>'Ä‘','Ä‘'=>'Ä‘','Ä’'=>'Ä“','Ä“'=>'Ä“','Ä”'=>'Ä•','Ä•'=>'Ä•','Ä–'=>'Ä—','Ä—'=>'Ä—','Ę'=>'Ä™','Ä™'=>'Ä™','Äš'=>'Ä›','Ä›'=>'Ä›','Äœ'=>'Ä','Ä'=>'Ä','Äž'=>'ÄŸ','ÄŸ'=>'ÄŸ','Ä '=>'Ä¡','Ä¡'=>'Ä¡','Ä¢'=>'Ä£','Ä£'=>'Ä£','Ĥ'=>'Ä¥','Ä¥'=>'Ä¥','Ħ'=>'ħ','ħ'=>'ħ','Ĩ'=>'Ä©','Ä©'=>'Ä©','Ī'=>'Ä«','Ä«'=>'Ä«','Ĭ'=>'Ä­','Ä­'=>'Ä­','Ä®'=>'į','į'=>'į','İ'=>'i','ı'=>'ı','IJ'=>'ij','ij'=>'ij','Ä´'=>'ĵ','ĵ'=>'ĵ','Ķ'=>'Ä·','Ä·'=>'Ä·','ĸ'=>'ĸ','Ĺ'=>'ĺ','ĺ'=>'ĺ','Ä»'=>'ļ','ļ'=>'ļ','Ľ'=>'ľ','ľ'=>'ľ','Ä¿'=>'Å€','Å€'=>'Å€','Å'=>'Å‚','Å‚'=>'Å‚','Ń'=>'Å„','Å„'=>'Å„','Å…'=>'ņ','ņ'=>'ņ','Ň'=>'ň','ň'=>'ň','ʼn'=>'ʼn','ÅŠ'=>'Å‹','Å‹'=>'Å‹','ÅŒ'=>'Å','Å'=>'Å','ÅŽ'=>'Å','Å'=>'Å','Å'=>'Å‘','Å‘'=>'Å‘','Å’'=>'oe','Å“'=>'oe','Å”'=>'Å•','Å•'=>'Å•','Å–'=>'Å—','Å—'=>'Å—','Ř'=>'Å™','Å™'=>'Å™','Åš'=>'Å›','Å›'=>'Å›','Åœ'=>'Å','Å'=>'Å','Åž'=>'ÅŸ','ÅŸ'=>'ÅŸ','Å '=>'Å¡','Å¡'=>'Å¡','Å¢'=>'Å£','Å£'=>'Å£','Ť'=>'Å¥','Å¥'=>'Å¥','Ŧ'=>'ŧ','ŧ'=>'ŧ','Ũ'=>'Å©','Å©'=>'Å©','Ū'=>'Å«','Å«'=>'Å«','Ŭ'=>'Å­','Å­'=>'Å­','Å®'=>'ů','ů'=>'ů','Ű'=>'ű','ű'=>'ű','Ų'=>'ų','ų'=>'ų','Å´'=>'ŵ','ŵ'=>'ŵ','Ŷ'=>'Å·','Å·'=>'Å·','Ÿ'=>'ÿ','Ź'=>'ź','ź'=>'ź','Å»'=>'ż','ż'=>'ż','Ž'=>'ž','ž'=>'ž','Å¿'=>'Å¿','Æ€'=>'Æ€','Æ'=>'É“','Æ‚'=>'ƃ','ƃ'=>'ƃ','Æ„'=>'Æ…','Æ…'=>'Æ…','Ɔ'=>'É”','Ƈ'=>'ƈ','ƈ'=>'ƈ','Ɖ'=>'É–','ÆŠ'=>'É—','Æ‹'=>'ÆŒ','ÆŒ'=>'ÆŒ','Æ'=>'Æ','ÆŽ'=>'Ç','Æ'=>'É™','Æ'=>'É›','Æ‘'=>'Æ’','Æ’'=>'Æ’','Æ“'=>'É ','Æ”'=>'É£','Æ•'=>'hv','Æ–'=>'É©','Æ—'=>'ɨ','Ƙ'=>'Æ™','Æ™'=>'Æ™','Æš'=>'Æš','Æ›'=>'Æ›','Æœ'=>'ɯ','Æ'=>'ɲ','Æž'=>'Æž','ÆŸ'=>'ɵ','Æ '=>'Æ¡','Æ¡'=>'Æ¡','Æ¢'=>'oi','Æ£'=>'oi','Ƥ'=>'Æ¥','Æ¥'=>'Æ¥','Ʀ'=>'yr','Ƨ'=>'ƨ','ƨ'=>'ƨ','Æ©'=>'ʃ','ƪ'=>'ƪ','Æ«'=>'Æ«','Ƭ'=>'Æ­','Æ­'=>'Æ­','Æ®'=>'ʈ','Ư'=>'ư','ư'=>'ư','Ʊ'=>'ÊŠ','Ʋ'=>'Ê‹','Ƴ'=>'Æ´','Æ´'=>'Æ´','Ƶ'=>'ƶ','ƶ'=>'ƶ','Æ·'=>'Ê’','Ƹ'=>'ƹ','ƹ'=>'ƹ','ƺ'=>'ƺ','Æ»'=>'Æ»','Ƽ'=>'ƽ','ƽ'=>'ƽ','ƾ'=>'ƾ','Æ¿'=>'Æ¿','Ç€'=>'Ç€','Ç'=>'Ç','Ç‚'=>'Ç‚','ǃ'=>'ǃ','Ç„'=>'dž','Ç…'=>'dž','dž'=>'dž','LJ'=>'lj','Lj'=>'lj','lj'=>'lj','ÇŠ'=>'nj','Ç‹'=>'ÇŒ','ÇŒ'=>'nj','Ç'=>'ÇŽ','ÇŽ'=>'ÇŽ','Ç'=>'Ç','Ç'=>'Ç','Ç‘'=>'Ç’','Ç’'=>'Ç’','Ç“'=>'Ç”','Ç”'=>'Ç”','Ç•'=>'Ç–','Ç–'=>'Ç–','Ç—'=>'ǘ','ǘ'=>'ǘ','Ç™'=>'Çš','Çš'=>'Çš','Ç›'=>'Çœ','Çœ'=>'Çœ','Ç'=>'Ç','Çž'=>'ÇŸ','ÇŸ'=>'ÇŸ','Ç '=>'Ç¡','Ç¡'=>'Ç¡','Ç¢'=>'Ç£','Ç£'=>'Ç£','Ǥ'=>'Ç¥','Ç¥'=>'Ç¥','Ǧ'=>'ǧ','ǧ'=>'ǧ','Ǩ'=>'Ç©','Ç©'=>'Ç©','Ǫ'=>'Ç«','Ç«'=>'Ç«','Ǭ'=>'Ç­','Ç­'=>'Ç­','Ç®'=>'ǯ','ǯ'=>'ǯ','ǰ'=>'ǰ','DZ'=>'dz','Dz'=>'dz','dz'=>'dz','Ç´'=>'ǵ','ǵ'=>'ǵ','Ƕ'=>'Æ•','Ç·'=>'Æ¿','Ǹ'=>'ǹ','ǹ'=>'ǹ','Ǻ'=>'Ç»','Ç»'=>'Ç»','Ǽ'=>'ǽ','ǽ'=>'ǽ','Ǿ'=>'Ç¿','Ç¿'=>'Ç¿','È€'=>'È','È'=>'È','È‚'=>'ȃ','ȃ'=>'ȃ','È„'=>'È…','È…'=>'È…','Ȇ'=>'ȇ','ȇ'=>'ȇ','Ȉ'=>'ȉ','ȉ'=>'ȉ','ÈŠ'=>'È‹','È‹'=>'È‹','ÈŒ'=>'È','È'=>'È','ÈŽ'=>'È','È'=>'È','È'=>'È‘','È‘'=>'È‘','È’'=>'È“','È“'=>'È“','È”'=>'È•','È•'=>'È•','È–'=>'È—','È—'=>'È—','Ș'=>'È™','È™'=>'È™','Èš'=>'È›','È›'=>'È›','Èœ'=>'È','È'=>'È','Èž'=>'ÈŸ','ÈŸ'=>'ÈŸ','È '=>'Æž','È¡'=>'È¡','È¢'=>'ou','È£'=>'ou','Ȥ'=>'È¥','È¥'=>'È¥','Ȧ'=>'ȧ','ȧ'=>'ȧ','Ȩ'=>'È©','È©'=>'È©','Ȫ'=>'È«','È«'=>'È«','Ȭ'=>'È­','È­'=>'È­','È®'=>'ȯ','ȯ'=>'ȯ','Ȱ'=>'ȱ','ȱ'=>'ȱ','Ȳ'=>'ȳ','ȳ'=>'ȳ','È´'=>'È´','ȵ'=>'ȵ','ȶ'=>'ȶ','È·'=>'È·','ȸ'=>'ȸ','ȹ'=>'ȹ','Ⱥ'=>'â±¥','È»'=>'ȼ','ȼ'=>'ȼ','Ƚ'=>'Æš','Ⱦ'=>'ⱦ','È¿'=>'È¿','É€'=>'É€','É'=>'É‚','É‚'=>'É‚','Ƀ'=>'Æ€','É„'=>'ʉ','É…'=>'ÊŒ','Ɇ'=>'ɇ','ɇ'=>'ɇ','Ɉ'=>'ɉ','ɉ'=>'ɉ','ÉŠ'=>'É‹','É‹'=>'É‹','ÉŒ'=>'É','É'=>'É','ÉŽ'=>'É','É'=>'É','É'=>'É','É‘'=>'É‘','É’'=>'É’','É“'=>'É“','É”'=>'É”','É•'=>'É•','É–'=>'É–','É—'=>'É—','ɘ'=>'ɘ','É™'=>'É™','Éš'=>'Éš','É›'=>'É›','Éœ'=>'Éœ','É'=>'É','Éž'=>'Éž','ÉŸ'=>'ÉŸ','É '=>'É ','É¡'=>'É¡','É¢'=>'É¢','É£'=>'É£','ɤ'=>'ɤ','É¥'=>'É¥','ɦ'=>'ɦ','ɧ'=>'ɧ','ɨ'=>'ɨ','É©'=>'É©','ɪ'=>'ɪ','É«'=>'É«','ɬ'=>'ɬ','É­'=>'É­','É®'=>'É®','ɯ'=>'ɯ','ɰ'=>'ɰ','ɱ'=>'ɱ','ɲ'=>'ɲ','ɳ'=>'ɳ','É´'=>'É´','ɵ'=>'ɵ','ɶ'=>'ɶ','É·'=>'É·','ɸ'=>'ɸ','ɹ'=>'ɹ','ɺ'=>'ɺ','É»'=>'É»','ɼ'=>'ɼ','ɽ'=>'ɽ','ɾ'=>'ɾ','É¿'=>'É¿','Ê€'=>'Ê€','Ê'=>'Ê','Ê‚'=>'Ê‚','ʃ'=>'ʃ','Ê„'=>'Ê„','Ê…'=>'Ê…','ʆ'=>'ʆ','ʇ'=>'ʇ','ʈ'=>'ʈ','ʉ'=>'ʉ','ÊŠ'=>'ÊŠ','Ê‹'=>'Ê‹','ÊŒ'=>'ÊŒ','Ê'=>'Ê','ÊŽ'=>'ÊŽ','Ê'=>'Ê','Ê'=>'Ê','Ê‘'=>'Ê‘','Ê’'=>'Ê’','Ê“'=>'Ê“','Ê”'=>'Ê”','Ê•'=>'Ê•','Ê–'=>'Ê–','Ê—'=>'Ê—','ʘ'=>'ʘ','Ê™'=>'Ê™','Êš'=>'Êš','Ê›'=>'Ê›','Êœ'=>'Êœ','Ê'=>'Ê','Êž'=>'Êž','ÊŸ'=>'ÊŸ','Ê '=>'Ê ','Ê¡'=>'Ê¡','Ê¢'=>'Ê¢','Ê£'=>'Ê£','ʤ'=>'ʤ','Ê¥'=>'Ê¥','ʦ'=>'ʦ','ʧ'=>'ʧ','ʨ'=>'ʨ','Ê©'=>'Ê©','ʪ'=>'ʪ','Ê«'=>'Ê«','ʬ'=>'ʬ','Ê­'=>'Ê­','Ê®'=>'Ê®','ʯ'=>'ʯ','ʰ'=>'ʰ','ʱ'=>'ʱ','ʲ'=>'ʲ','ʳ'=>'ʳ','Ê´'=>'Ê´','ʵ'=>'ʵ','ʶ'=>'ʶ','Ê·'=>'Ê·','ʸ'=>'ʸ','ʹ'=>'ʹ','ʺ'=>'ʺ','Ê»'=>'Ê»','ʼ'=>'ʼ','ʽ'=>'ʽ','ʾ'=>'ʾ','Ê¿'=>'Ê¿','Ë€'=>'Ë€','Ë'=>'Ë','ˆ'=>'ˆ','ˇ'=>'ˇ','ˈ'=>'ˈ','ˉ'=>'ˉ','ËŠ'=>'ËŠ','Ë‹'=>'Ë‹','ËŒ'=>'ËŒ','Ë'=>'Ë','ËŽ'=>'ËŽ','Ë'=>'Ë','Ë'=>'Ë','Ë‘'=>'Ë‘','Ë '=>'Ë ','Ë¡'=>'Ë¡','Ë¢'=>'Ë¢','Ë£'=>'Ë£','ˤ'=>'ˤ','Ë®'=>'Ë®','Ì€'=>'Ì€','Ì'=>'Ì','Ì‚'=>'Ì‚','̃'=>'̃','Ì„'=>'Ì„','Ì…'=>'Ì…','̆'=>'̆','̇'=>'̇','̈'=>'̈','̉'=>'̉','ÌŠ'=>'ÌŠ','Ì‹'=>'Ì‹','ÌŒ'=>'ÌŒ','Ì'=>'Ì','ÌŽ'=>'ÌŽ','Ì'=>'Ì','Ì'=>'Ì','Ì‘'=>'Ì‘','Ì’'=>'Ì’','Ì“'=>'Ì“','Ì”'=>'Ì”','Ì•'=>'Ì•','Ì–'=>'Ì–','Ì—'=>'Ì—','̘'=>'̘','Ì™'=>'Ì™','Ìš'=>'Ìš','Ì›'=>'Ì›','Ìœ'=>'Ìœ','Ì'=>'Ì','Ìž'=>'Ìž','ÌŸ'=>'ÌŸ','Ì '=>'Ì ','Ì¡'=>'Ì¡','Ì¢'=>'Ì¢','Ì£'=>'Ì£','̤'=>'̤','Ì¥'=>'Ì¥','̦'=>'̦','̧'=>'̧','̨'=>'̨','Ì©'=>'Ì©','̪'=>'̪','Ì«'=>'Ì«','̬'=>'̬','Ì­'=>'Ì­','Ì®'=>'Ì®','̯'=>'̯','̰'=>'̰','̱'=>'̱','̲'=>'̲','̳'=>'̳','Ì´'=>'Ì´','̵'=>'̵','̶'=>'̶','Ì·'=>'Ì·','̸'=>'̸','̹'=>'̹','̺'=>'̺','Ì»'=>'Ì»','̼'=>'̼','̽'=>'̽','̾'=>'̾','Ì¿'=>'Ì¿','Í€'=>'Í€','Í'=>'Í','Í‚'=>'Í‚','̓'=>'̓','Í„'=>'Í„','Í…'=>'Í…','͆'=>'͆','͇'=>'͇','͈'=>'͈','͉'=>'͉','ÍŠ'=>'ÍŠ','Í‹'=>'Í‹','ÍŒ'=>'ÍŒ','Í'=>'Í','ÍŽ'=>'ÍŽ','Í'=>'Í','Í'=>'Í','Í‘'=>'Í‘','Í’'=>'Í’','Í“'=>'Í“','Í”'=>'Í”','Í•'=>'Í•','Í–'=>'Í–','Í—'=>'Í—','͘'=>'͘','Í™'=>'Í™','Íš'=>'Íš','Í›'=>'Í›','Íœ'=>'Íœ','Í'=>'Í','Íž'=>'Íž','ÍŸ'=>'ÍŸ','Í '=>'Í ','Í¡'=>'Í¡','Í¢'=>'Í¢','Í£'=>'Í£','ͤ'=>'ͤ','Í¥'=>'Í¥','ͦ'=>'ͦ','ͧ'=>'ͧ','ͨ'=>'ͨ','Í©'=>'Í©','ͪ'=>'ͪ','Í«'=>'Í«','ͬ'=>'ͬ','Í­'=>'Í­','Í®'=>'Í®','ͯ'=>'ͯ','ͺ'=>'ͺ','Í»'=>'Í»','ͼ'=>'ͼ','ͽ'=>'ͽ','Ά'=>'ά','Έ'=>'έ','Ή'=>'ή','Ί'=>'ί','ÎŒ'=>'ÏŒ','ÎŽ'=>'Ï','Î'=>'ÏŽ','Î'=>'Î','Α'=>'α','Î’'=>'β','Γ'=>'γ','Δ'=>'δ','Ε'=>'ε','Ζ'=>'ζ','Η'=>'η','Θ'=>'θ','Ι'=>'ι','Κ'=>'κ','Λ'=>'λ','Μ'=>'μ','Î'=>'ν','Ξ'=>'ξ','Ο'=>'ο','Π'=>'Ï€','Ρ'=>'Ï','Σ'=>'σ','Τ'=>'Ï„','Î¥'=>'Ï…','Φ'=>'φ','Χ'=>'χ','Ψ'=>'ψ','Ω'=>'ω','Ϊ'=>'ÏŠ','Ϋ'=>'Ï‹','ά'=>'ά','έ'=>'έ','ή'=>'ή','ί'=>'ί','ΰ'=>'ΰ','α'=>'α','β'=>'β','γ'=>'γ','δ'=>'δ','ε'=>'ε','ζ'=>'ζ','η'=>'η','θ'=>'θ','ι'=>'ι','κ'=>'κ','λ'=>'λ','μ'=>'μ','ν'=>'ν','ξ'=>'ξ','ο'=>'ο','Ï€'=>'Ï€','Ï'=>'Ï','Ï‚'=>'Ï‚','σ'=>'σ','Ï„'=>'Ï„','Ï…'=>'Ï…','φ'=>'φ','χ'=>'χ','ψ'=>'ψ','ω'=>'ω','ÏŠ'=>'ÏŠ','Ï‹'=>'Ï‹','ÏŒ'=>'ÏŒ','Ï'=>'Ï','ÏŽ'=>'ÏŽ','Ï'=>'Ï','Ï‘'=>'Ï‘','Ï’'=>'Ï’','Ï“'=>'Ï“','Ï”'=>'Ï”','Ï•'=>'Ï•','Ï–'=>'Ï–','Ï—'=>'Ï—','Ϙ'=>'Ï™','Ï™'=>'Ï™','Ïš'=>'Ï›','Ï›'=>'Ï›','Ïœ'=>'Ï','Ï'=>'Ï','Ïž'=>'ÏŸ','ÏŸ'=>'ÏŸ','Ï '=>'Ï¡','Ï¡'=>'Ï¡','Ï¢'=>'Ï£','Ï£'=>'Ï£','Ϥ'=>'Ï¥','Ï¥'=>'Ï¥','Ϧ'=>'ϧ','ϧ'=>'ϧ','Ϩ'=>'Ï©','Ï©'=>'Ï©','Ϫ'=>'Ï«','Ï«'=>'Ï«','Ϭ'=>'Ï­','Ï­'=>'Ï­','Ï®'=>'ϯ','ϯ'=>'ϯ','ϰ'=>'ϰ','ϱ'=>'ϱ','ϲ'=>'ϲ','ϳ'=>'ϳ','Ï´'=>'θ','ϵ'=>'ϵ','Ï·'=>'ϸ','ϸ'=>'ϸ','Ϲ'=>'ϲ','Ϻ'=>'Ï»','Ï»'=>'Ï»','ϼ'=>'ϼ','Ͻ'=>'Í»','Ͼ'=>'ͼ','Ï¿'=>'ͽ','Ѐ'=>'Ñ','Ð'=>'Ñ‘','Ђ'=>'Ñ’','Ѓ'=>'Ñ“','Є'=>'Ñ”','Ð…'=>'Ñ•','І'=>'Ñ–','Ї'=>'Ñ—','Ј'=>'ј','Љ'=>'Ñ™','Њ'=>'Ñš','Ћ'=>'Ñ›','ÐŒ'=>'Ñœ','Ð'=>'Ñ','ÐŽ'=>'Ñž','Ð'=>'ÑŸ','Ð'=>'а','Б'=>'б','Ð’'=>'в','Г'=>'г','Д'=>'д','Е'=>'е','Ж'=>'ж','З'=>'з','И'=>'и','Й'=>'й','К'=>'к','Л'=>'л','М'=>'м','Ð'=>'н','О'=>'о','П'=>'п','Р'=>'Ñ€','С'=>'Ñ','Т'=>'Ñ‚','У'=>'у','Ф'=>'Ñ„','Ð¥'=>'Ñ…','Ц'=>'ц','Ч'=>'ч','Ш'=>'ш','Щ'=>'щ','Ъ'=>'ÑŠ','Ы'=>'Ñ‹','Ь'=>'ÑŒ','Э'=>'Ñ','Ю'=>'ÑŽ','Я'=>'Ñ','а'=>'а','б'=>'б','в'=>'в','г'=>'г','д'=>'д','е'=>'е','ж'=>'ж','з'=>'з','и'=>'и','й'=>'й','к'=>'к','л'=>'л','м'=>'м','н'=>'н','о'=>'о','п'=>'п','Ñ€'=>'Ñ€','Ñ'=>'Ñ','Ñ‚'=>'Ñ‚','у'=>'у','Ñ„'=>'Ñ„','Ñ…'=>'Ñ…','ц'=>'ц','ч'=>'ч','ш'=>'ш','щ'=>'щ','ÑŠ'=>'ÑŠ','Ñ‹'=>'Ñ‹','ÑŒ'=>'ÑŒ','Ñ'=>'Ñ','ÑŽ'=>'ÑŽ','Ñ'=>'Ñ','Ñ'=>'Ñ','Ñ‘'=>'Ñ‘','Ñ’'=>'Ñ’','Ñ“'=>'Ñ“','Ñ”'=>'Ñ”','Ñ•'=>'Ñ•','Ñ–'=>'Ñ–','Ñ—'=>'Ñ—','ј'=>'ј','Ñ™'=>'Ñ™','Ñš'=>'Ñš','Ñ›'=>'Ñ›','Ñœ'=>'Ñœ','Ñ'=>'Ñ','Ñž'=>'Ñž','ÑŸ'=>'ÑŸ','Ñ '=>'Ñ¡','Ñ¡'=>'Ñ¡','Ñ¢'=>'Ñ£','Ñ£'=>'Ñ£','Ѥ'=>'Ñ¥','Ñ¥'=>'Ñ¥','Ѧ'=>'ѧ','ѧ'=>'ѧ','Ѩ'=>'Ñ©','Ñ©'=>'Ñ©','Ѫ'=>'Ñ«','Ñ«'=>'Ñ«','Ѭ'=>'Ñ­','Ñ­'=>'Ñ­','Ñ®'=>'ѯ','ѯ'=>'ѯ','Ѱ'=>'ѱ','ѱ'=>'ѱ','Ѳ'=>'ѳ','ѳ'=>'ѳ','Ñ´'=>'ѵ','ѵ'=>'ѵ','Ѷ'=>'Ñ·','Ñ·'=>'Ñ·','Ѹ'=>'ѹ','ѹ'=>'ѹ','Ѻ'=>'Ñ»','Ñ»'=>'Ñ»','Ѽ'=>'ѽ','ѽ'=>'ѽ','Ѿ'=>'Ñ¿','Ñ¿'=>'Ñ¿','Ò€'=>'Ò','Ò'=>'Ò','Òƒ'=>'Òƒ','Ò„'=>'Ò„','Ò…'=>'Ò…','Ò†'=>'Ò†','Òˆ'=>'Òˆ','Ò‰'=>'Ò‰','ÒŠ'=>'Ò‹','Ò‹'=>'Ò‹','ÒŒ'=>'Ò','Ò'=>'Ò','ÒŽ'=>'Ò','Ò'=>'Ò','Ò'=>'Ò‘','Ò‘'=>'Ò‘','Ò’'=>'Ò“','Ò“'=>'Ò“','Ò”'=>'Ò•','Ò•'=>'Ò•','Ò–'=>'Ò—','Ò—'=>'Ò—','Ò˜'=>'Ò™','Ò™'=>'Ò™','Òš'=>'Ò›','Ò›'=>'Ò›','Òœ'=>'Ò','Ò'=>'Ò','Òž'=>'ÒŸ','ÒŸ'=>'ÒŸ','Ò '=>'Ò¡','Ò¡'=>'Ò¡','Ò¢'=>'Ò£','Ò£'=>'Ò£','Ò¤'=>'Ò¥','Ò¥'=>'Ò¥','Ò¦'=>'Ò§','Ò§'=>'Ò§','Ò¨'=>'Ò©','Ò©'=>'Ò©','Òª'=>'Ò«','Ò«'=>'Ò«','Ò¬'=>'Ò­','Ò­'=>'Ò­','Ò®'=>'Ò¯','Ò¯'=>'Ò¯','Ò°'=>'Ò±','Ò±'=>'Ò±','Ò²'=>'Ò³','Ò³'=>'Ò³','Ò´'=>'Òµ','Òµ'=>'Òµ','Ò¶'=>'Ò·','Ò·'=>'Ò·','Ò¸'=>'Ò¹','Ò¹'=>'Ò¹','Òº'=>'Ò»','Ò»'=>'Ò»','Ò¼'=>'Ò½','Ò½'=>'Ò½','Ò¾'=>'Ò¿','Ò¿'=>'Ò¿','Ó€'=>'Ó','Ó'=>'Ó‚','Ó‚'=>'Ó‚','Óƒ'=>'Ó„','Ó„'=>'Ó„','Ó…'=>'Ó†','Ó†'=>'Ó†','Ó‡'=>'Óˆ','Óˆ'=>'Óˆ','Ó‰'=>'ÓŠ','ÓŠ'=>'ÓŠ','Ó‹'=>'ÓŒ','ÓŒ'=>'ÓŒ','Ó'=>'ÓŽ','ÓŽ'=>'ÓŽ','Ó'=>'Ó','Ó'=>'Ó‘','Ó‘'=>'Ó‘','Ó’'=>'Ó“','Ó“'=>'Ó“','Ó”'=>'Ó•','Ó•'=>'Ó•','Ó–'=>'Ó—','Ó—'=>'Ó—','Ó˜'=>'Ó™','Ó™'=>'Ó™','Óš'=>'Ó›','Ó›'=>'Ó›','Óœ'=>'Ó','Ó'=>'Ó','Óž'=>'ÓŸ','ÓŸ'=>'ÓŸ','Ó '=>'Ó¡','Ó¡'=>'Ó¡','Ó¢'=>'Ó£','Ó£'=>'Ó£','Ó¤'=>'Ó¥','Ó¥'=>'Ó¥','Ó¦'=>'Ó§','Ó§'=>'Ó§','Ó¨'=>'Ó©','Ó©'=>'Ó©','Óª'=>'Ó«','Ó«'=>'Ó«','Ó¬'=>'Ó­','Ó­'=>'Ó­','Ó®'=>'Ó¯','Ó¯'=>'Ó¯','Ó°'=>'Ó±','Ó±'=>'Ó±','Ó²'=>'Ó³','Ó³'=>'Ó³','Ó´'=>'Óµ','Óµ'=>'Óµ','Ó¶'=>'Ó·','Ó·'=>'Ó·','Ó¸'=>'Ó¹','Ó¹'=>'Ó¹','Óº'=>'Ó»','Ó»'=>'Ó»','Ó¼'=>'Ó½','Ó½'=>'Ó½','Ó¾'=>'Ó¿','Ó¿'=>'Ó¿','Ô€'=>'Ô','Ô'=>'Ô','Ô‚'=>'Ôƒ','Ôƒ'=>'Ôƒ','Ô„'=>'Ô…','Ô…'=>'Ô…','Ô†'=>'Ô‡','Ô‡'=>'Ô‡','Ôˆ'=>'Ô‰','Ô‰'=>'Ô‰','ÔŠ'=>'Ô‹','Ô‹'=>'Ô‹','ÔŒ'=>'Ô','Ô'=>'Ô','ÔŽ'=>'Ô','Ô'=>'Ô','Ô'=>'Ô‘','Ô‘'=>'Ô‘','Ô’'=>'Ô“','Ô“'=>'Ô“','Ô±'=>'Õ¡','Ô²'=>'Õ¢','Ô³'=>'Õ£','Ô´'=>'Õ¤','Ôµ'=>'Õ¥','Ô¶'=>'Õ¦','Ô·'=>'Õ§','Ô¸'=>'Õ¨','Ô¹'=>'Õ©','Ôº'=>'Õª','Ô»'=>'Õ«','Ô¼'=>'Õ¬','Ô½'=>'Õ­','Ô¾'=>'Õ®','Ô¿'=>'Õ¯','Õ€'=>'Õ°','Õ'=>'Õ±','Õ‚'=>'Õ²','Õƒ'=>'Õ³','Õ„'=>'Õ´','Õ…'=>'Õµ','Õ†'=>'Õ¶','Õ‡'=>'Õ·','Õˆ'=>'Õ¸','Õ‰'=>'Õ¹','ÕŠ'=>'Õº','Õ‹'=>'Õ»','ÕŒ'=>'Õ¼','Õ'=>'Õ½','ÕŽ'=>'Õ¾','Õ'=>'Õ¿','Õ'=>'Ö€','Õ‘'=>'Ö','Õ’'=>'Ö‚','Õ“'=>'Öƒ','Õ”'=>'Ö„','Õ•'=>'Ö…','Õ–'=>'Ö†','Õ™'=>'Õ™','Õ¡'=>'Õ¡','Õ¢'=>'Õ¢','Õ£'=>'Õ£','Õ¤'=>'Õ¤','Õ¥'=>'Õ¥','Õ¦'=>'Õ¦','Õ§'=>'Õ§','Õ¨'=>'Õ¨','Õ©'=>'Õ©','Õª'=>'Õª','Õ«'=>'Õ«','Õ¬'=>'Õ¬','Õ­'=>'Õ­','Õ®'=>'Õ®','Õ¯'=>'Õ¯','Õ°'=>'Õ°','Õ±'=>'Õ±','Õ²'=>'Õ²','Õ³'=>'Õ³','Õ´'=>'Õ´','Õµ'=>'Õµ','Õ¶'=>'Õ¶','Õ·'=>'Õ·','Õ¸'=>'Õ¸','Õ¹'=>'Õ¹','Õº'=>'Õº','Õ»'=>'Õ»','Õ¼'=>'Õ¼','Õ½'=>'Õ½','Õ¾'=>'Õ¾','Õ¿'=>'Õ¿','Ö€'=>'Ö€','Ö'=>'Ö','Ö‚'=>'Ö‚','Öƒ'=>'Öƒ','Ö„'=>'Ö„','Ö…'=>'Ö…','Ö†'=>'Ö†','Ö‡'=>'Ö‡','Ö‘'=>'Ö‘','Ö’'=>'Ö’','Ö“'=>'Ö“','Ö”'=>'Ö”','Ö•'=>'Ö•','Ö–'=>'Ö–','Ö—'=>'Ö—','Ö˜'=>'Ö˜','Ö™'=>'Ö™','Öš'=>'Öš','Ö›'=>'Ö›','Öœ'=>'Öœ','Ö'=>'Ö','Öž'=>'Öž','ÖŸ'=>'ÖŸ','Ö '=>'Ö ','Ö¡'=>'Ö¡','Ö¢'=>'Ö¢','Ö£'=>'Ö£','Ö¤'=>'Ö¤','Ö¥'=>'Ö¥','Ö¦'=>'Ö¦','Ö§'=>'Ö§','Ö¨'=>'Ö¨','Ö©'=>'Ö©','Öª'=>'Öª','Ö«'=>'Ö«','Ö¬'=>'Ö¬','Ö­'=>'Ö­','Ö®'=>'Ö®','Ö¯'=>'Ö¯','Ö°'=>'Ö°','Ö±'=>'Ö±','Ö²'=>'Ö²','Ö³'=>'Ö³','Ö´'=>'Ö´','Öµ'=>'Öµ','Ö¶'=>'Ö¶','Ö·'=>'Ö·','Ö¸'=>'Ö¸','Ö¹'=>'Ö¹','Öº'=>'Öº','Ö»'=>'Ö»','Ö¼'=>'Ö¼','Ö½'=>'Ö½','Ö¿'=>'Ö¿','×'=>'×','ׂ'=>'ׂ','ׄ'=>'ׄ','×…'=>'×…','ׇ'=>'ׇ','×'=>'×','ב'=>'ב','×’'=>'×’','ד'=>'ד','×”'=>'×”','ו'=>'ו','×–'=>'×–','×—'=>'×—','ט'=>'ט','×™'=>'×™','ך'=>'ך','×›'=>'×›','ל'=>'ל','×'=>'×','מ'=>'מ','ן'=>'ן','× '=>'× ','ס'=>'ס','×¢'=>'×¢','×£'=>'×£','פ'=>'פ','×¥'=>'×¥','צ'=>'צ','×§'=>'×§','ר'=>'ר','ש'=>'ש','ת'=>'ת','×°'=>'×°','×±'=>'×±','ײ'=>'ײ','Ø'=>'Ø','Ø‘'=>'Ø‘','Ø’'=>'Ø’','Ø“'=>'Ø“','Ø”'=>'Ø”','Ø•'=>'Ø•','Ø¡'=>'Ø¡','Ø¢'=>'Ø¢','Ø£'=>'Ø£','ؤ'=>'ؤ','Ø¥'=>'Ø¥','ئ'=>'ئ','ا'=>'ا','ب'=>'ب','Ø©'=>'Ø©','ت'=>'ت','Ø«'=>'Ø«','ج'=>'ج','Ø­'=>'Ø­','Ø®'=>'Ø®','د'=>'د','ذ'=>'ذ','ر'=>'ر','ز'=>'ز','س'=>'س','Ø´'=>'Ø´','ص'=>'ص','ض'=>'ض','Ø·'=>'Ø·','ظ'=>'ظ','ع'=>'ع','غ'=>'غ','Ù€'=>'Ù€','Ù'=>'Ù','Ù‚'=>'Ù‚','Ùƒ'=>'Ùƒ','Ù„'=>'Ù„','Ù…'=>'Ù…','Ù†'=>'Ù†','Ù‡'=>'Ù‡','Ùˆ'=>'Ùˆ','Ù‰'=>'Ù‰','ÙŠ'=>'ÙŠ','Ù‹'=>'Ù‹','ÙŒ'=>'ÙŒ','Ù'=>'Ù','ÙŽ'=>'ÙŽ','Ù'=>'Ù','Ù'=>'Ù','Ù‘'=>'Ù‘','Ù’'=>'Ù’','Ù“'=>'Ù“','Ù”'=>'Ù”','Ù•'=>'Ù•','Ù–'=>'Ù–','Ù—'=>'Ù—','Ù˜'=>'Ù˜','Ù™'=>'Ù™','Ùš'=>'Ùš','Ù›'=>'Ù›','Ùœ'=>'Ùœ','Ù'=>'Ù','Ùž'=>'Ùž','Ù '=>'0','Ù¡'=>'1','Ù¢'=>'2','Ù£'=>'3','Ù¤'=>'4','Ù¥'=>'5','Ù¦'=>'6','Ù§'=>'7','Ù¨'=>'8','Ù©'=>'9','Ù®'=>'Ù®','Ù¯'=>'Ù¯','Ù°'=>'Ù°','Ù±'=>'Ù±','Ù²'=>'Ù²','Ù³'=>'Ù³','Ù´'=>'Ù´','Ùµ'=>'Ùµ','Ù¶'=>'Ù¶','Ù·'=>'Ù·','Ù¸'=>'Ù¸','Ù¹'=>'Ù¹','Ùº'=>'Ùº','Ù»'=>'Ù»','Ù¼'=>'Ù¼','Ù½'=>'Ù½','Ù¾'=>'Ù¾','Ù¿'=>'Ù¿','Ú€'=>'Ú€','Ú'=>'Ú','Ú‚'=>'Ú‚','Úƒ'=>'Úƒ','Ú„'=>'Ú„','Ú…'=>'Ú…','Ú†'=>'Ú†','Ú‡'=>'Ú‡','Úˆ'=>'Úˆ','Ú‰'=>'Ú‰','ÚŠ'=>'ÚŠ','Ú‹'=>'Ú‹','ÚŒ'=>'ÚŒ','Ú'=>'Ú','ÚŽ'=>'ÚŽ','Ú'=>'Ú','Ú'=>'Ú','Ú‘'=>'Ú‘','Ú’'=>'Ú’','Ú“'=>'Ú“','Ú”'=>'Ú”','Ú•'=>'Ú•','Ú–'=>'Ú–','Ú—'=>'Ú—','Ú˜'=>'Ú˜','Ú™'=>'Ú™','Úš'=>'Úš','Ú›'=>'Ú›','Úœ'=>'Úœ','Ú'=>'Ú','Úž'=>'Úž','ÚŸ'=>'ÚŸ','Ú '=>'Ú ','Ú¡'=>'Ú¡','Ú¢'=>'Ú¢','Ú£'=>'Ú£','Ú¤'=>'Ú¤','Ú¥'=>'Ú¥','Ú¦'=>'Ú¦','Ú§'=>'Ú§','Ú¨'=>'Ú¨','Ú©'=>'Ú©','Úª'=>'Úª','Ú«'=>'Ú«','Ú¬'=>'Ú¬','Ú­'=>'Ú­','Ú®'=>'Ú®','Ú¯'=>'Ú¯','Ú°'=>'Ú°','Ú±'=>'Ú±','Ú²'=>'Ú²','Ú³'=>'Ú³','Ú´'=>'Ú´','Úµ'=>'Úµ','Ú¶'=>'Ú¶','Ú·'=>'Ú·','Ú¸'=>'Ú¸','Ú¹'=>'Ú¹','Úº'=>'Úº','Ú»'=>'Ú»','Ú¼'=>'Ú¼','Ú½'=>'Ú½','Ú¾'=>'Ú¾','Ú¿'=>'Ú¿','Û€'=>'Û€','Û'=>'Û','Û‚'=>'Û‚','Ûƒ'=>'Ûƒ','Û„'=>'Û„','Û…'=>'Û…','Û†'=>'Û†','Û‡'=>'Û‡','Ûˆ'=>'Ûˆ','Û‰'=>'Û‰','ÛŠ'=>'ÛŠ','Û‹'=>'Û‹','ÛŒ'=>'ÛŒ','Û'=>'Û','ÛŽ'=>'ÛŽ','Û'=>'Û','Û'=>'Û','Û‘'=>'Û‘','Û’'=>'Û’','Û“'=>'Û“','Û•'=>'Û•','Û–'=>'Û–','Û—'=>'Û—','Û˜'=>'Û˜','Û™'=>'Û™','Ûš'=>'Ûš','Û›'=>'Û›','Ûœ'=>'Ûœ','Ûž'=>'Ûž','ÛŸ'=>'ÛŸ','Û '=>'Û ','Û¡'=>'Û¡','Û¢'=>'Û¢','Û£'=>'Û£','Û¤'=>'Û¤','Û¥'=>'Û¥','Û¦'=>'Û¦','Û§'=>'Û§','Û¨'=>'Û¨','Ûª'=>'Ûª','Û«'=>'Û«','Û¬'=>'Û¬','Û­'=>'Û­','Û®'=>'Û®','Û¯'=>'Û¯','Û°'=>'0','Û±'=>'1','Û²'=>'2','Û³'=>'3','Û´'=>'4','Ûµ'=>'5','Û¶'=>'6','Û·'=>'7','Û¸'=>'8','Û¹'=>'9','Ûº'=>'Ûº','Û»'=>'Û»','Û¼'=>'Û¼','Û¿'=>'Û¿','Ü'=>'Ü','Ü‘'=>'Ü‘','Ü’'=>'Ü’','Ü“'=>'Ü“','Ü”'=>'Ü”','Ü•'=>'Ü•','Ü–'=>'Ü–','Ü—'=>'Ü—','ܘ'=>'ܘ','Ü™'=>'Ü™','Üš'=>'Üš','Ü›'=>'Ü›','Üœ'=>'Üœ','Ü'=>'Ü','Üž'=>'Üž','ÜŸ'=>'ÜŸ','Ü '=>'Ü ','Ü¡'=>'Ü¡','Ü¢'=>'Ü¢','Ü£'=>'Ü£','ܤ'=>'ܤ','Ü¥'=>'Ü¥','ܦ'=>'ܦ','ܧ'=>'ܧ','ܨ'=>'ܨ','Ü©'=>'Ü©','ܪ'=>'ܪ','Ü«'=>'Ü«','ܬ'=>'ܬ','Ü­'=>'Ü­','Ü®'=>'Ü®','ܯ'=>'ܯ','ܰ'=>'ܰ','ܱ'=>'ܱ','ܲ'=>'ܲ','ܳ'=>'ܳ','Ü´'=>'Ü´','ܵ'=>'ܵ','ܶ'=>'ܶ','Ü·'=>'Ü·','ܸ'=>'ܸ','ܹ'=>'ܹ','ܺ'=>'ܺ','Ü»'=>'Ü»','ܼ'=>'ܼ','ܽ'=>'ܽ','ܾ'=>'ܾ','Ü¿'=>'Ü¿','Ý€'=>'Ý€','Ý'=>'Ý','Ý‚'=>'Ý‚','݃'=>'݃','Ý„'=>'Ý„','Ý…'=>'Ý…','݆'=>'݆','݇'=>'݇','݈'=>'݈','݉'=>'݉','ÝŠ'=>'ÝŠ','Ý'=>'Ý','ÝŽ'=>'ÝŽ','Ý'=>'Ý','Ý'=>'Ý','Ý‘'=>'Ý‘','Ý’'=>'Ý’','Ý“'=>'Ý“','Ý”'=>'Ý”','Ý•'=>'Ý•','Ý–'=>'Ý–','Ý—'=>'Ý—','ݘ'=>'ݘ','Ý™'=>'Ý™','Ýš'=>'Ýš','Ý›'=>'Ý›','Ýœ'=>'Ýœ','Ý'=>'Ý','Ýž'=>'Ýž','ÝŸ'=>'ÝŸ','Ý '=>'Ý ','Ý¡'=>'Ý¡','Ý¢'=>'Ý¢','Ý£'=>'Ý£','ݤ'=>'ݤ','Ý¥'=>'Ý¥','ݦ'=>'ݦ','ݧ'=>'ݧ','ݨ'=>'ݨ','Ý©'=>'Ý©','ݪ'=>'ݪ','Ý«'=>'Ý«','ݬ'=>'ݬ','Ý­'=>'Ý­','Þ€'=>'Þ€','Þ'=>'Þ','Þ‚'=>'Þ‚','Þƒ'=>'Þƒ','Þ„'=>'Þ„','Þ…'=>'Þ…','Þ†'=>'Þ†','Þ‡'=>'Þ‡','Þˆ'=>'Þˆ','Þ‰'=>'Þ‰','ÞŠ'=>'ÞŠ','Þ‹'=>'Þ‹','ÞŒ'=>'ÞŒ','Þ'=>'Þ','ÞŽ'=>'ÞŽ','Þ'=>'Þ','Þ'=>'Þ','Þ‘'=>'Þ‘','Þ’'=>'Þ’','Þ“'=>'Þ“','Þ”'=>'Þ”','Þ•'=>'Þ•','Þ–'=>'Þ–','Þ—'=>'Þ—','Þ˜'=>'Þ˜','Þ™'=>'Þ™','Þš'=>'Þš','Þ›'=>'Þ›','Þœ'=>'Þœ','Þ'=>'Þ','Þž'=>'Þž','ÞŸ'=>'ÞŸ','Þ '=>'Þ ','Þ¡'=>'Þ¡','Þ¢'=>'Þ¢','Þ£'=>'Þ£','Þ¤'=>'Þ¤','Þ¥'=>'Þ¥','Þ¦'=>'Þ¦','Þ§'=>'Þ§','Þ¨'=>'Þ¨','Þ©'=>'Þ©','Þª'=>'Þª','Þ«'=>'Þ«','Þ¬'=>'Þ¬','Þ­'=>'Þ­','Þ®'=>'Þ®','Þ¯'=>'Þ¯','Þ°'=>'Þ°','Þ±'=>'Þ±','߀'=>'0','ß'=>'1','ß‚'=>'2','߃'=>'3','ß„'=>'4','ß…'=>'5','߆'=>'6','߇'=>'7','߈'=>'8','߉'=>'9','ߊ'=>'ߊ','ß‹'=>'ß‹','ߌ'=>'ߌ','ß'=>'ß','ߎ'=>'ߎ','ß'=>'ß','ß'=>'ß','ß‘'=>'ß‘','ß’'=>'ß’','ß“'=>'ß“','ß”'=>'ß”','ß•'=>'ß•','ß–'=>'ß–','ß—'=>'ß—','ߘ'=>'ߘ','ß™'=>'ß™','ßš'=>'ßš','ß›'=>'ß›','ßœ'=>'ßœ','ß'=>'ß','ßž'=>'ßž','ߟ'=>'ߟ','ß '=>'ß ','ß¡'=>'ß¡','ߢ'=>'ߢ','ߣ'=>'ߣ','ߤ'=>'ߤ','ߥ'=>'ߥ','ߦ'=>'ߦ','ß§'=>'ß§','ߨ'=>'ߨ','ß©'=>'ß©','ߪ'=>'ߪ','ß«'=>'ß«','߬'=>'߬','ß­'=>'ß­','ß®'=>'ß®','߯'=>'߯','ß°'=>'ß°','ß±'=>'ß±','ß²'=>'ß²','ß³'=>'ß³','ß´'=>'ß´','ßµ'=>'ßµ','ߺ'=>'ߺ'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_1.php b/phpBB/includes/utf/data/search_indexer_1.php deleted file mode 100644 index 6173117ffc..0000000000 --- a/phpBB/includes/utf/data/search_indexer_1.php +++ /dev/null @@ -1 +0,0 @@ -'à¤','ं'=>'ं','ः'=>'ः','ऄ'=>'ऄ','अ'=>'अ','आ'=>'आ','इ'=>'इ','ई'=>'ई','उ'=>'उ','ऊ'=>'ऊ','ऋ'=>'ऋ','ऌ'=>'ऌ','à¤'=>'à¤','ऎ'=>'ऎ','à¤'=>'à¤','à¤'=>'à¤','ऑ'=>'ऑ','ऒ'=>'ऒ','ओ'=>'ओ','औ'=>'औ','क'=>'क','ख'=>'ख','ग'=>'ग','घ'=>'घ','ङ'=>'ङ','च'=>'च','छ'=>'छ','ज'=>'ज','à¤'=>'à¤','ञ'=>'ञ','ट'=>'ट','ठ'=>'ठ','ड'=>'ड','ढ'=>'ढ','ण'=>'ण','त'=>'त','थ'=>'थ','द'=>'द','ध'=>'ध','न'=>'न','ऩ'=>'ऩ','प'=>'प','फ'=>'फ','ब'=>'ब','भ'=>'भ','म'=>'म','य'=>'य','र'=>'र','ऱ'=>'ऱ','ल'=>'ल','ळ'=>'ळ','ऴ'=>'ऴ','व'=>'व','श'=>'श','ष'=>'ष','स'=>'स','ह'=>'ह','़'=>'़','ऽ'=>'ऽ','ा'=>'ा','ि'=>'ि','ी'=>'ी','à¥'=>'à¥','ू'=>'ू','ृ'=>'ृ','ॄ'=>'ॄ','ॅ'=>'ॅ','ॆ'=>'ॆ','े'=>'े','ै'=>'ै','ॉ'=>'ॉ','ॊ'=>'ॊ','ो'=>'ो','ौ'=>'ौ','à¥'=>'à¥','à¥'=>'à¥','॑'=>'॑','॒'=>'॒','॓'=>'॓','॔'=>'॔','क़'=>'क़','ख़'=>'ख़','ग़'=>'ग़','ज़'=>'ज़','ड़'=>'ड़','à¥'=>'à¥','फ़'=>'फ़','य़'=>'य़','ॠ'=>'ॠ','ॡ'=>'ॡ','ॢ'=>'ॢ','ॣ'=>'ॣ','०'=>'0','१'=>'1','२'=>'2','३'=>'3','४'=>'4','५'=>'5','६'=>'6','७'=>'7','८'=>'8','९'=>'9','ॻ'=>'ॻ','ॼ'=>'ॼ','ॽ'=>'ॽ','ॾ'=>'ॾ','ॿ'=>'ॿ','à¦'=>'à¦','ং'=>'ং','ঃ'=>'ঃ','অ'=>'অ','আ'=>'আ','ই'=>'ই','ঈ'=>'ঈ','উ'=>'উ','ঊ'=>'ঊ','ঋ'=>'ঋ','ঌ'=>'ঌ','à¦'=>'à¦','à¦'=>'à¦','ও'=>'ও','ঔ'=>'ঔ','ক'=>'ক','খ'=>'খ','গ'=>'গ','ঘ'=>'ঘ','ঙ'=>'ঙ','চ'=>'চ','ছ'=>'ছ','জ'=>'জ','à¦'=>'à¦','ঞ'=>'ঞ','ট'=>'ট','ঠ'=>'ঠ','ড'=>'ড','ঢ'=>'ঢ','ণ'=>'ণ','ত'=>'ত','থ'=>'থ','দ'=>'দ','ধ'=>'ধ','ন'=>'ন','প'=>'প','ফ'=>'ফ','ব'=>'ব','ভ'=>'ভ','ম'=>'ম','য'=>'য','র'=>'র','ল'=>'ল','শ'=>'শ','ষ'=>'ষ','স'=>'স','হ'=>'হ','়'=>'়','ঽ'=>'ঽ','া'=>'া','ি'=>'ি','à§€'=>'à§€','à§'=>'à§','à§‚'=>'à§‚','ৃ'=>'ৃ','à§„'=>'à§„','ে'=>'ে','ৈ'=>'ৈ','à§‹'=>'à§‹','à§Œ'=>'à§Œ','à§'=>'à§','à§Ž'=>'à§Ž','à§—'=>'à§—','à§œ'=>'à§œ','à§'=>'à§','à§Ÿ'=>'à§Ÿ','à§ '=>'à§ ','à§¡'=>'à§¡','à§¢'=>'à§¢','à§£'=>'à§£','০'=>'0','à§§'=>'1','২'=>'2','à§©'=>'3','৪'=>'4','à§«'=>'5','৬'=>'6','à§­'=>'7','à§®'=>'8','৯'=>'9','à§°'=>'à§°','à§±'=>'à§±','à§´'=>'1','à§µ'=>'2','à§¶'=>'3','à§·'=>'4','৸'=>'৸','à§¹'=>'16','à¨'=>'à¨','ਂ'=>'ਂ','ਃ'=>'ਃ','ਅ'=>'ਅ','ਆ'=>'ਆ','ਇ'=>'ਇ','ਈ'=>'ਈ','ਉ'=>'ਉ','ਊ'=>'ਊ','à¨'=>'à¨','à¨'=>'à¨','ਓ'=>'ਓ','ਔ'=>'ਔ','ਕ'=>'ਕ','ਖ'=>'ਖ','ਗ'=>'ਗ','ਘ'=>'ਘ','ਙ'=>'ਙ','ਚ'=>'ਚ','ਛ'=>'ਛ','ਜ'=>'ਜ','à¨'=>'à¨','ਞ'=>'ਞ','ਟ'=>'ਟ','ਠ'=>'ਠ','ਡ'=>'ਡ','ਢ'=>'ਢ','ਣ'=>'ਣ','ਤ'=>'ਤ','ਥ'=>'ਥ','ਦ'=>'ਦ','ਧ'=>'ਧ','ਨ'=>'ਨ','ਪ'=>'ਪ','ਫ'=>'ਫ','ਬ'=>'ਬ','ਭ'=>'ਭ','ਮ'=>'ਮ','ਯ'=>'ਯ','ਰ'=>'ਰ','ਲ'=>'ਲ','ਲ਼'=>'ਲ਼','ਵ'=>'ਵ','ਸ਼'=>'ਸ਼','ਸ'=>'ਸ','ਹ'=>'ਹ','਼'=>'਼','ਾ'=>'ਾ','ਿ'=>'ਿ','à©€'=>'à©€','à©'=>'à©','à©‚'=>'à©‚','ੇ'=>'ੇ','ੈ'=>'ੈ','à©‹'=>'à©‹','ੌ'=>'ੌ','à©'=>'à©','à©™'=>'à©™','ਗ਼'=>'ਗ਼','à©›'=>'à©›','ੜ'=>'ੜ','ਫ਼'=>'ਫ਼','੦'=>'0','à©§'=>'1','੨'=>'2','à©©'=>'3','੪'=>'4','à©«'=>'5','੬'=>'6','à©­'=>'7','à©®'=>'8','੯'=>'9','à©°'=>'à©°','ੱ'=>'ੱ','ੲ'=>'ੲ','ੳ'=>'ੳ','à©´'=>'à©´','àª'=>'àª','ં'=>'ં','ઃ'=>'ઃ','અ'=>'અ','આ'=>'આ','ઇ'=>'ઇ','ઈ'=>'ઈ','ઉ'=>'ઉ','ઊ'=>'ઊ','ઋ'=>'ઋ','ઌ'=>'ઌ','àª'=>'àª','àª'=>'àª','àª'=>'àª','ઑ'=>'ઑ','ઓ'=>'ઓ','ઔ'=>'ઔ','ક'=>'ક','ખ'=>'ખ','ગ'=>'ગ','ઘ'=>'ઘ','ઙ'=>'ઙ','ચ'=>'ચ','છ'=>'છ','જ'=>'જ','àª'=>'àª','ઞ'=>'ઞ','ટ'=>'ટ','ઠ'=>'ઠ','ડ'=>'ડ','ઢ'=>'ઢ','ણ'=>'ણ','ત'=>'ત','થ'=>'થ','દ'=>'દ','ધ'=>'ધ','ન'=>'ન','પ'=>'પ','ફ'=>'ફ','બ'=>'બ','ભ'=>'ભ','મ'=>'મ','ય'=>'ય','ર'=>'ર','લ'=>'લ','ળ'=>'ળ','વ'=>'વ','શ'=>'શ','ષ'=>'ષ','સ'=>'સ','હ'=>'હ','઼'=>'઼','ઽ'=>'ઽ','ા'=>'ા','િ'=>'િ','à«€'=>'à«€','à«'=>'à«','à«‚'=>'à«‚','ૃ'=>'ૃ','à«„'=>'à«„','à«…'=>'à«…','ે'=>'ે','ૈ'=>'ૈ','ૉ'=>'ૉ','à«‹'=>'à«‹','ૌ'=>'ૌ','à«'=>'à«','à«'=>'à«','à« '=>'à« ','à«¡'=>'à«¡','à«¢'=>'à«¢','à«£'=>'à«£','૦'=>'0','à«§'=>'1','૨'=>'2','à«©'=>'3','૪'=>'4','à««'=>'5','૬'=>'6','à«­'=>'7','à«®'=>'8','૯'=>'9','à¬'=>'à¬','ଂ'=>'ଂ','ଃ'=>'ଃ','ଅ'=>'ଅ','ଆ'=>'ଆ','ଇ'=>'ଇ','ଈ'=>'ଈ','ଉ'=>'ଉ','ଊ'=>'ଊ','ଋ'=>'ଋ','ଌ'=>'ଌ','à¬'=>'à¬','à¬'=>'à¬','ଓ'=>'ଓ','ଔ'=>'ଔ','କ'=>'କ','ଖ'=>'ଖ','ଗ'=>'ଗ','ଘ'=>'ଘ','ଙ'=>'ଙ','ଚ'=>'ଚ','ଛ'=>'ଛ','ଜ'=>'ଜ','à¬'=>'à¬','ଞ'=>'ଞ','ଟ'=>'ଟ','ଠ'=>'ଠ','ଡ'=>'ଡ','ଢ'=>'ଢ','ଣ'=>'ଣ','ତ'=>'ତ','ଥ'=>'ଥ','ଦ'=>'ଦ','ଧ'=>'ଧ','ନ'=>'ନ','ପ'=>'ପ','ଫ'=>'ଫ','ବ'=>'ବ','ଭ'=>'ଭ','ମ'=>'ମ','ଯ'=>'ଯ','ର'=>'ର','ଲ'=>'ଲ','ଳ'=>'ଳ','ଵ'=>'ଵ','ଶ'=>'ଶ','ଷ'=>'ଷ','ସ'=>'ସ','ହ'=>'ହ','଼'=>'଼','ଽ'=>'ଽ','ା'=>'ା','ି'=>'ି','à­€'=>'à­€','à­'=>'à­','à­‚'=>'à­‚','à­ƒ'=>'à­ƒ','à­‡'=>'à­‡','à­ˆ'=>'à­ˆ','à­‹'=>'à­‹','à­Œ'=>'à­Œ','à­'=>'à­','à­–'=>'à­–','à­—'=>'à­—','à­œ'=>'à­œ','à­'=>'à­','à­Ÿ'=>'à­Ÿ','à­ '=>'à­ ','à­¡'=>'à­¡','à­¦'=>'0','à­§'=>'1','à­¨'=>'2','à­©'=>'3','à­ª'=>'4','à­«'=>'5','à­¬'=>'6','à­­'=>'7','à­®'=>'8','à­¯'=>'9','à­±'=>'à­±','ஂ'=>'ஂ','ஃ'=>'ஃ','à®…'=>'à®…','ஆ'=>'ஆ','இ'=>'இ','ஈ'=>'ஈ','உ'=>'உ','ஊ'=>'ஊ','எ'=>'எ','à®'=>'à®','à®'=>'à®','à®’'=>'à®’','ஓ'=>'ஓ','à®”'=>'à®”','க'=>'க','à®™'=>'à®™','ச'=>'ச','ஜ'=>'ஜ','ஞ'=>'ஞ','ட'=>'ட','ண'=>'ண','த'=>'த','ந'=>'ந','ன'=>'ன','ப'=>'ப','à®®'=>'à®®','ய'=>'ய','à®°'=>'à®°','à®±'=>'à®±','ல'=>'ல','ள'=>'ள','à®´'=>'à®´','வ'=>'வ','à®¶'=>'à®¶','à®·'=>'à®·','ஸ'=>'ஸ','ஹ'=>'ஹ','ா'=>'ா','ி'=>'ி','ீ'=>'ீ','à¯'=>'à¯','ூ'=>'ூ','ெ'=>'ெ','ே'=>'ே','ை'=>'ை','ொ'=>'ொ','ோ'=>'ோ','ௌ'=>'ௌ','à¯'=>'à¯','ௗ'=>'ௗ','௦'=>'0','௧'=>'1','௨'=>'2','௩'=>'3','௪'=>'4','௫'=>'5','௬'=>'6','௭'=>'7','௮'=>'8','௯'=>'9','௰'=>'10','௱'=>'100','௲'=>'1000','à°'=>'à°','à°‚'=>'à°‚','à°ƒ'=>'à°ƒ','à°…'=>'à°…','à°†'=>'à°†','à°‡'=>'à°‡','à°ˆ'=>'à°ˆ','à°‰'=>'à°‰','à°Š'=>'à°Š','à°‹'=>'à°‹','à°Œ'=>'à°Œ','à°Ž'=>'à°Ž','à°'=>'à°','à°'=>'à°','à°’'=>'à°’','à°“'=>'à°“','à°”'=>'à°”','à°•'=>'à°•','à°–'=>'à°–','à°—'=>'à°—','à°˜'=>'à°˜','à°™'=>'à°™','à°š'=>'à°š','à°›'=>'à°›','à°œ'=>'à°œ','à°'=>'à°','à°ž'=>'à°ž','à°Ÿ'=>'à°Ÿ','à° '=>'à° ','à°¡'=>'à°¡','à°¢'=>'à°¢','à°£'=>'à°£','à°¤'=>'à°¤','à°¥'=>'à°¥','à°¦'=>'à°¦','à°§'=>'à°§','à°¨'=>'à°¨','à°ª'=>'à°ª','à°«'=>'à°«','à°¬'=>'à°¬','à°­'=>'à°­','à°®'=>'à°®','à°¯'=>'à°¯','à°°'=>'à°°','à°±'=>'à°±','à°²'=>'à°²','à°³'=>'à°³','à°µ'=>'à°µ','à°¶'=>'à°¶','à°·'=>'à°·','à°¸'=>'à°¸','à°¹'=>'à°¹','à°¾'=>'à°¾','à°¿'=>'à°¿','à±€'=>'à±€','à±'=>'à±','ూ'=>'ూ','ృ'=>'ృ','ౄ'=>'ౄ','ె'=>'ె','ే'=>'ే','ై'=>'ై','ొ'=>'ొ','ో'=>'ో','ౌ'=>'ౌ','à±'=>'à±','ౕ'=>'ౕ','à±–'=>'à±–','à± '=>'à± ','ౡ'=>'ౡ','౦'=>'0','à±§'=>'1','౨'=>'2','౩'=>'3','౪'=>'4','౫'=>'5','౬'=>'6','à±­'=>'7','à±®'=>'8','౯'=>'9','ಂ'=>'ಂ','ಃ'=>'ಃ','ಅ'=>'ಅ','ಆ'=>'ಆ','ಇ'=>'ಇ','ಈ'=>'ಈ','ಉ'=>'ಉ','ಊ'=>'ಊ','ಋ'=>'ಋ','ಌ'=>'ಌ','ಎ'=>'ಎ','à²'=>'à²','à²'=>'à²','ಒ'=>'ಒ','ಓ'=>'ಓ','ಔ'=>'ಔ','ಕ'=>'ಕ','ಖ'=>'ಖ','ಗ'=>'ಗ','ಘ'=>'ಘ','ಙ'=>'ಙ','ಚ'=>'ಚ','ಛ'=>'ಛ','ಜ'=>'ಜ','à²'=>'à²','ಞ'=>'ಞ','ಟ'=>'ಟ','ಠ'=>'ಠ','ಡ'=>'ಡ','ಢ'=>'ಢ','ಣ'=>'ಣ','ತ'=>'ತ','ಥ'=>'ಥ','ದ'=>'ದ','ಧ'=>'ಧ','ನ'=>'ನ','ಪ'=>'ಪ','ಫ'=>'ಫ','ಬ'=>'ಬ','ಭ'=>'ಭ','ಮ'=>'ಮ','ಯ'=>'ಯ','ರ'=>'ರ','ಱ'=>'ಱ','ಲ'=>'ಲ','ಳ'=>'ಳ','ವ'=>'ವ','ಶ'=>'ಶ','ಷ'=>'ಷ','ಸ'=>'ಸ','ಹ'=>'ಹ','಼'=>'಼','ಽ'=>'ಽ','ಾ'=>'ಾ','ಿ'=>'ಿ','à³€'=>'à³€','à³'=>'à³','ೂ'=>'ೂ','ೃ'=>'ೃ','ೄ'=>'ೄ','ೆ'=>'ೆ','ೇ'=>'ೇ','ೈ'=>'ೈ','ೊ'=>'ೊ','ೋ'=>'ೋ','ೌ'=>'ೌ','à³'=>'à³','ೕ'=>'ೕ','à³–'=>'à³–','ೞ'=>'ೞ','à³ '=>'à³ ','ೡ'=>'ೡ','à³¢'=>'à³¢','à³£'=>'à³£','೦'=>'0','à³§'=>'1','೨'=>'2','೩'=>'3','೪'=>'4','೫'=>'5','೬'=>'6','à³­'=>'7','à³®'=>'8','೯'=>'9','à´‚'=>'à´‚','à´ƒ'=>'à´ƒ','à´…'=>'à´…','à´†'=>'à´†','à´‡'=>'à´‡','à´ˆ'=>'à´ˆ','à´‰'=>'à´‰','à´Š'=>'à´Š','à´‹'=>'à´‹','à´Œ'=>'à´Œ','à´Ž'=>'à´Ž','à´'=>'à´','à´'=>'à´','à´’'=>'à´’','à´“'=>'à´“','à´”'=>'à´”','à´•'=>'à´•','à´–'=>'à´–','à´—'=>'à´—','à´˜'=>'à´˜','à´™'=>'à´™','à´š'=>'à´š','à´›'=>'à´›','à´œ'=>'à´œ','à´'=>'à´','à´ž'=>'à´ž','à´Ÿ'=>'à´Ÿ','à´ '=>'à´ ','à´¡'=>'à´¡','à´¢'=>'à´¢','à´£'=>'à´£','à´¤'=>'à´¤','à´¥'=>'à´¥','à´¦'=>'à´¦','à´§'=>'à´§','à´¨'=>'à´¨','à´ª'=>'à´ª','à´«'=>'à´«','à´¬'=>'à´¬','à´­'=>'à´­','à´®'=>'à´®','à´¯'=>'à´¯','à´°'=>'à´°','à´±'=>'à´±','à´²'=>'à´²','à´³'=>'à´³','à´´'=>'à´´','à´µ'=>'à´µ','à´¶'=>'à´¶','à´·'=>'à´·','à´¸'=>'à´¸','à´¹'=>'à´¹','à´¾'=>'à´¾','à´¿'=>'à´¿','ീ'=>'ീ','àµ'=>'àµ','ൂ'=>'ൂ','ൃ'=>'ൃ','െ'=>'െ','േ'=>'േ','ൈ'=>'ൈ','ൊ'=>'ൊ','ോ'=>'ോ','ൌ'=>'ൌ','àµ'=>'àµ','ൗ'=>'ൗ','ൠ'=>'ൠ','ൡ'=>'ൡ','൦'=>'0','൧'=>'1','൨'=>'2','൩'=>'3','൪'=>'4','൫'=>'5','൬'=>'6','൭'=>'7','൮'=>'8','൯'=>'9','à¶‚'=>'à¶‚','ඃ'=>'ඃ','à¶…'=>'à¶…','ආ'=>'ආ','ඇ'=>'ඇ','ඈ'=>'ඈ','ඉ'=>'ඉ','à¶Š'=>'à¶Š','à¶‹'=>'à¶‹','à¶Œ'=>'à¶Œ','à¶'=>'à¶','à¶Ž'=>'à¶Ž','à¶'=>'à¶','à¶'=>'à¶','à¶‘'=>'à¶‘','à¶’'=>'à¶’','à¶“'=>'à¶“','à¶”'=>'à¶”','à¶•'=>'à¶•','à¶–'=>'à¶–','à¶š'=>'à¶š','à¶›'=>'à¶›','à¶œ'=>'à¶œ','à¶'=>'à¶','à¶ž'=>'à¶ž','à¶Ÿ'=>'à¶Ÿ','à¶ '=>'à¶ ','à¶¡'=>'à¶¡','à¶¢'=>'à¶¢','à¶£'=>'à¶£','ඤ'=>'ඤ','à¶¥'=>'à¶¥','ඦ'=>'ඦ','à¶§'=>'à¶§','ඨ'=>'ඨ','à¶©'=>'à¶©','ඪ'=>'ඪ','à¶«'=>'à¶«','ඬ'=>'ඬ','à¶­'=>'à¶­','à¶®'=>'à¶®','ද'=>'ද','à¶°'=>'à¶°','à¶±'=>'à¶±','à¶³'=>'à¶³','à¶´'=>'à¶´','à¶µ'=>'à¶µ','à¶¶'=>'à¶¶','à¶·'=>'à¶·','ම'=>'ම','à¶¹'=>'à¶¹','ය'=>'ය','à¶»'=>'à¶»','à¶½'=>'à¶½','à·€'=>'à·€','à·'=>'à·','à·‚'=>'à·‚','à·ƒ'=>'à·ƒ','à·„'=>'à·„','à·…'=>'à·…','à·†'=>'à·†','à·Š'=>'à·Š','à·'=>'à·','à·'=>'à·','à·‘'=>'à·‘','à·’'=>'à·’','à·“'=>'à·“','à·”'=>'à·”','à·–'=>'à·–','à·˜'=>'à·˜','à·™'=>'à·™','à·š'=>'à·š','à·›'=>'à·›','à·œ'=>'à·œ','à·'=>'à·','à·ž'=>'à·ž','à·Ÿ'=>'à·Ÿ','à·²'=>'à·²','à·³'=>'à·³','à¸'=>'à¸','ข'=>'ข','ฃ'=>'ฃ','ค'=>'ค','ฅ'=>'ฅ','ฆ'=>'ฆ','ง'=>'ง','จ'=>'จ','ฉ'=>'ฉ','ช'=>'ช','ซ'=>'ซ','ฌ'=>'ฌ','à¸'=>'à¸','ฎ'=>'ฎ','à¸'=>'à¸','à¸'=>'à¸','ฑ'=>'ฑ','ฒ'=>'ฒ','ณ'=>'ณ','ด'=>'ด','ต'=>'ต','ถ'=>'ถ','ท'=>'ท','ธ'=>'ธ','น'=>'น','บ'=>'บ','ป'=>'ป','ผ'=>'ผ','à¸'=>'à¸','พ'=>'พ','ฟ'=>'ฟ','ภ'=>'ภ','ม'=>'ม','ย'=>'ย','ร'=>'ร','ฤ'=>'ฤ','ล'=>'ล','ฦ'=>'ฦ','ว'=>'ว','ศ'=>'ศ','ษ'=>'ษ','ส'=>'ส','ห'=>'ห','ฬ'=>'ฬ','อ'=>'อ','ฮ'=>'ฮ','ฯ'=>'ฯ','ะ'=>'ะ','ั'=>'ั','า'=>'า','ำ'=>'ำ','ิ'=>'ิ','ี'=>'ี','ึ'=>'ึ','ื'=>'ื','ุ'=>'ุ','ู'=>'ู','ฺ'=>'ฺ','เ'=>'เ','à¹'=>'à¹','โ'=>'โ','ใ'=>'ใ','ไ'=>'ไ','ๅ'=>'ๅ','ๆ'=>'ๆ','็'=>'็','่'=>'่','้'=>'้','๊'=>'๊','๋'=>'๋','์'=>'์','à¹'=>'à¹','๎'=>'๎','à¹'=>'0','๑'=>'1','๒'=>'2','๓'=>'3','๔'=>'4','๕'=>'5','๖'=>'6','๗'=>'7','๘'=>'8','๙'=>'9','àº'=>'àº','ຂ'=>'ຂ','ຄ'=>'ຄ','ງ'=>'ງ','ຈ'=>'ຈ','ຊ'=>'ຊ','àº'=>'àº','ດ'=>'ດ','ຕ'=>'ຕ','ຖ'=>'ຖ','ທ'=>'ທ','ນ'=>'ນ','ບ'=>'ບ','ປ'=>'ປ','ຜ'=>'ຜ','àº'=>'àº','ພ'=>'ພ','ຟ'=>'ຟ','ມ'=>'ມ','ຢ'=>'ຢ','ຣ'=>'ຣ','ລ'=>'ລ','ວ'=>'ວ','ສ'=>'ສ','ຫ'=>'ຫ','ອ'=>'ອ','ຮ'=>'ຮ','ຯ'=>'ຯ','ະ'=>'ະ','ັ'=>'ັ','າ'=>'າ','ຳ'=>'ຳ','ິ'=>'ິ','ີ'=>'ີ','ຶ'=>'ຶ','ື'=>'ື','ຸ'=>'ຸ','ູ'=>'ູ','ົ'=>'ົ','ຼ'=>'ຼ','ຽ'=>'ຽ','ເ'=>'ເ','à»'=>'à»','ໂ'=>'ໂ','ໃ'=>'ໃ','ໄ'=>'ໄ','ໆ'=>'ໆ','່'=>'່','້'=>'້','໊'=>'໊','໋'=>'໋','໌'=>'໌','à»'=>'à»','à»'=>'0','໑'=>'1','à»’'=>'2','໓'=>'3','à»”'=>'4','໕'=>'5','à»–'=>'6','à»—'=>'7','໘'=>'8','à»™'=>'9','ໜ'=>'ໜ','à»'=>'à»','ༀ'=>'ༀ','༘'=>'༘','༙'=>'༙','༠'=>'0','༡'=>'1','༢'=>'2','༣'=>'3','༤'=>'4','༥'=>'5','༦'=>'6','༧'=>'7','༨'=>'8','༩'=>'9','༪'=>'1/2','༫'=>'3/2','༬'=>'5/2','༭'=>'7/2','༮'=>'9/2','༯'=>'11/2','༰'=>'13/2','༱'=>'15/2','༲'=>'17/2','༳'=>'-1/2','༵'=>'༵','༷'=>'༷','༹'=>'༹','༾'=>'༾','༿'=>'༿','ཀ'=>'ཀ','à½'=>'à½','ག'=>'ག','གྷ'=>'གྷ','ང'=>'ང','ཅ'=>'ཅ','ཆ'=>'ཆ','ཇ'=>'ཇ','ཉ'=>'ཉ','ཊ'=>'ཊ','ཋ'=>'ཋ','ཌ'=>'ཌ','à½'=>'à½','ཎ'=>'ཎ','à½'=>'à½','à½'=>'à½','ད'=>'ད','དྷ'=>'དྷ','ན'=>'ན','པ'=>'པ','ཕ'=>'ཕ','བ'=>'བ','བྷ'=>'བྷ','མ'=>'མ','ཙ'=>'ཙ','ཚ'=>'ཚ','ཛ'=>'ཛ','ཛྷ'=>'ཛྷ','à½'=>'à½','ཞ'=>'ཞ','ཟ'=>'ཟ','འ'=>'འ','ཡ'=>'ཡ','ར'=>'ར','ལ'=>'ལ','ཤ'=>'ཤ','ཥ'=>'ཥ','ས'=>'ས','ཧ'=>'ཧ','ཨ'=>'ཨ','ཀྵ'=>'ཀྵ','ཪ'=>'ཪ','ཱ'=>'ཱ','ི'=>'ི','ཱི'=>'ཱི','ུ'=>'ུ','ཱུ'=>'ཱུ','ྲྀ'=>'ྲྀ','ཷ'=>'ཷ','ླྀ'=>'ླྀ','ཹ'=>'ཹ','ེ'=>'ེ','ཻ'=>'ཻ','ོ'=>'ོ','ཽ'=>'ཽ','ཾ'=>'ཾ','ཿ'=>'ཿ','ྀ'=>'ྀ','à¾'=>'à¾','ྂ'=>'ྂ','ྃ'=>'ྃ','྄'=>'྄','྆'=>'྆','྇'=>'྇','ྈ'=>'ྈ','ྉ'=>'ྉ','ྊ'=>'ྊ','ྋ'=>'ྋ','à¾'=>'à¾','ྑ'=>'ྑ','ྒ'=>'ྒ','ྒྷ'=>'ྒྷ','ྔ'=>'ྔ','ྕ'=>'ྕ','ྖ'=>'ྖ','ྗ'=>'ྗ','ྙ'=>'ྙ','ྚ'=>'ྚ','ྛ'=>'ྛ','ྜ'=>'ྜ','à¾'=>'à¾','ྞ'=>'ྞ','ྟ'=>'ྟ','ྠ'=>'ྠ','ྡ'=>'ྡ','ྡྷ'=>'ྡྷ','ྣ'=>'ྣ','ྤ'=>'ྤ','ྥ'=>'ྥ','ྦ'=>'ྦ','ྦྷ'=>'ྦྷ','ྨ'=>'ྨ','ྩ'=>'ྩ','ྪ'=>'ྪ','ྫ'=>'ྫ','ྫྷ'=>'ྫྷ','ྭ'=>'ྭ','ྮ'=>'ྮ','ྯ'=>'ྯ','ྰ'=>'ྰ','ྱ'=>'ྱ','ྲ'=>'ྲ','ླ'=>'ླ','ྴ'=>'ྴ','ྵ'=>'ྵ','ྶ'=>'ྶ','ྷ'=>'ྷ','ྸ'=>'ྸ','ྐྵ'=>'ྐྵ','ྺ'=>'ྺ','ྻ'=>'ྻ','ྼ'=>'ྼ','࿆'=>'࿆'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_19.php b/phpBB/includes/utf/data/search_indexer_19.php deleted file mode 100644 index e26f7d81a0..0000000000 --- a/phpBB/includes/utf/data/search_indexer_19.php +++ /dev/null @@ -1 +0,0 @@ -'é¾»'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_2.php b/phpBB/includes/utf/data/search_indexer_2.php deleted file mode 100644 index 751226ed22..0000000000 --- a/phpBB/includes/utf/data/search_indexer_2.php +++ /dev/null @@ -1 +0,0 @@ -'က','á€'=>'á€','ဂ'=>'ဂ','ဃ'=>'ဃ','င'=>'င','စ'=>'စ','ဆ'=>'ဆ','ဇ'=>'ဇ','ဈ'=>'ဈ','ဉ'=>'ဉ','ည'=>'ည','ဋ'=>'ဋ','ဌ'=>'ဌ','á€'=>'á€','ဎ'=>'ဎ','á€'=>'á€','á€'=>'á€','ထ'=>'ထ','ဒ'=>'ဒ','ဓ'=>'ဓ','န'=>'န','ပ'=>'ပ','ဖ'=>'ဖ','ဗ'=>'ဗ','ဘ'=>'ဘ','မ'=>'မ','ယ'=>'ယ','ရ'=>'ရ','လ'=>'လ','á€'=>'á€','သ'=>'သ','ဟ'=>'ဟ','ဠ'=>'ဠ','အ'=>'အ','ဣ'=>'ဣ','ဤ'=>'ဤ','ဥ'=>'ဥ','ဦ'=>'ဦ','ဧ'=>'ဧ','ဩ'=>'ဩ','ဪ'=>'ဪ','ာ'=>'ာ','ိ'=>'ိ','ီ'=>'ီ','ု'=>'ု','ူ'=>'ူ','ေ'=>'ေ','ဲ'=>'ဲ','ံ'=>'ံ','့'=>'့','း'=>'း','္'=>'္','á€'=>'0','á'=>'1','á‚'=>'2','áƒ'=>'3','á„'=>'4','á…'=>'5','á†'=>'6','á‡'=>'7','áˆ'=>'8','á‰'=>'9','á'=>'á','á‘'=>'á‘','á’'=>'á’','á“'=>'á“','á”'=>'á”','á•'=>'á•','á–'=>'á–','á—'=>'á—','á˜'=>'á˜','á™'=>'á™','á‚ '=>'â´€','á‚¡'=>'â´','á‚¢'=>'â´‚','á‚£'=>'â´ƒ','Ⴄ'=>'â´„','á‚¥'=>'â´…','Ⴆ'=>'â´†','á‚§'=>'â´‡','Ⴈ'=>'â´ˆ','á‚©'=>'â´‰','Ⴊ'=>'â´Š','á‚«'=>'â´‹','Ⴌ'=>'â´Œ','á‚­'=>'â´','á‚®'=>'â´Ž','Ⴏ'=>'â´','á‚°'=>'â´','Ⴑ'=>'â´‘','Ⴒ'=>'â´’','Ⴓ'=>'â´“','á‚´'=>'â´”','Ⴕ'=>'â´•','á‚¶'=>'â´–','á‚·'=>'â´—','Ⴘ'=>'â´˜','Ⴙ'=>'â´™','Ⴚ'=>'â´š','á‚»'=>'â´›','Ⴜ'=>'â´œ','Ⴝ'=>'â´','Ⴞ'=>'â´ž','á‚¿'=>'â´Ÿ','Ⴠ'=>'â´ ','áƒ'=>'â´¡','Ⴢ'=>'â´¢','Ⴣ'=>'â´£','Ⴤ'=>'â´¤','Ⴥ'=>'â´¥','áƒ'=>'áƒ','ბ'=>'ბ','გ'=>'გ','დ'=>'დ','ე'=>'ე','ვ'=>'ვ','ზ'=>'ზ','თ'=>'თ','ი'=>'ი','კ'=>'კ','ლ'=>'ლ','მ'=>'მ','ნ'=>'ნ','áƒ'=>'áƒ','პ'=>'პ','ჟ'=>'ჟ','რ'=>'რ','ს'=>'ს','ტ'=>'ტ','უ'=>'უ','ფ'=>'ფ','ქ'=>'ქ','ღ'=>'ღ','ყ'=>'ყ','შ'=>'შ','ჩ'=>'ჩ','ც'=>'ც','ძ'=>'ძ','წ'=>'წ','ჭ'=>'ჭ','ხ'=>'ხ','ჯ'=>'ჯ','ჰ'=>'ჰ','ჱ'=>'ჱ','ჲ'=>'ჲ','ჳ'=>'ჳ','ჴ'=>'ჴ','ჵ'=>'ჵ','ჶ'=>'ჶ','ჷ'=>'ჷ','ჸ'=>'ჸ','ჹ'=>'ჹ','ჺ'=>'ჺ','ჼ'=>'ჼ','á„€'=>'á„€','á„'=>'á„','á„‚'=>'á„‚','ᄃ'=>'ᄃ','á„„'=>'á„„','á„…'=>'á„…','ᄆ'=>'ᄆ','ᄇ'=>'ᄇ','ᄈ'=>'ᄈ','ᄉ'=>'ᄉ','ᄊ'=>'ᄊ','á„‹'=>'á„‹','ᄌ'=>'ᄌ','á„'=>'á„','ᄎ'=>'ᄎ','á„'=>'á„','á„'=>'á„','á„‘'=>'á„‘','á„’'=>'á„’','á„“'=>'á„“','á„”'=>'á„”','á„•'=>'á„•','á„–'=>'á„–','á„—'=>'á„—','ᄘ'=>'ᄘ','á„™'=>'á„™','ᄚ'=>'ᄚ','á„›'=>'á„›','ᄜ'=>'ᄜ','á„'=>'á„','ᄞ'=>'ᄞ','ᄟ'=>'ᄟ','á„ '=>'á„ ','á„¡'=>'á„¡','á„¢'=>'á„¢','á„£'=>'á„£','ᄤ'=>'ᄤ','á„¥'=>'á„¥','ᄦ'=>'ᄦ','á„§'=>'á„§','ᄨ'=>'ᄨ','á„©'=>'á„©','ᄪ'=>'ᄪ','á„«'=>'á„«','ᄬ'=>'ᄬ','á„­'=>'á„­','á„®'=>'á„®','ᄯ'=>'ᄯ','á„°'=>'á„°','ᄱ'=>'ᄱ','ᄲ'=>'ᄲ','ᄳ'=>'ᄳ','á„´'=>'á„´','ᄵ'=>'ᄵ','á„¶'=>'á„¶','á„·'=>'á„·','ᄸ'=>'ᄸ','ᄹ'=>'ᄹ','ᄺ'=>'ᄺ','á„»'=>'á„»','ᄼ'=>'ᄼ','ᄽ'=>'ᄽ','ᄾ'=>'ᄾ','á„¿'=>'á„¿','á…€'=>'á…€','á…'=>'á…','á…‚'=>'á…‚','á…ƒ'=>'á…ƒ','á…„'=>'á…„','á……'=>'á……','á…†'=>'á…†','á…‡'=>'á…‡','á…ˆ'=>'á…ˆ','á…‰'=>'á…‰','á…Š'=>'á…Š','á…‹'=>'á…‹','á…Œ'=>'á…Œ','á…'=>'á…','á…Ž'=>'á…Ž','á…'=>'á…','á…'=>'á…','á…‘'=>'á…‘','á…’'=>'á…’','á…“'=>'á…“','á…”'=>'á…”','á…•'=>'á…•','á…–'=>'á…–','á…—'=>'á…—','á…˜'=>'á…˜','á…™'=>'á…™','á…Ÿ'=>'á…Ÿ','á… '=>'á… ','á…¡'=>'á…¡','á…¢'=>'á…¢','á…£'=>'á…£','á…¤'=>'á…¤','á…¥'=>'á…¥','á…¦'=>'á…¦','á…§'=>'á…§','á…¨'=>'á…¨','á…©'=>'á…©','á…ª'=>'á…ª','á…«'=>'á…«','á…¬'=>'á…¬','á…­'=>'á…­','á…®'=>'á…®','á…¯'=>'á…¯','á…°'=>'á…°','á…±'=>'á…±','á…²'=>'á…²','á…³'=>'á…³','á…´'=>'á…´','á…µ'=>'á…µ','á…¶'=>'á…¶','á…·'=>'á…·','á…¸'=>'á…¸','á…¹'=>'á…¹','á…º'=>'á…º','á…»'=>'á…»','á…¼'=>'á…¼','á…½'=>'á…½','á…¾'=>'á…¾','á…¿'=>'á…¿','ᆀ'=>'ᆀ','á†'=>'á†','ᆂ'=>'ᆂ','ᆃ'=>'ᆃ','ᆄ'=>'ᆄ','ᆅ'=>'ᆅ','ᆆ'=>'ᆆ','ᆇ'=>'ᆇ','ᆈ'=>'ᆈ','ᆉ'=>'ᆉ','ᆊ'=>'ᆊ','ᆋ'=>'ᆋ','ᆌ'=>'ᆌ','á†'=>'á†','ᆎ'=>'ᆎ','á†'=>'á†','á†'=>'á†','ᆑ'=>'ᆑ','ᆒ'=>'ᆒ','ᆓ'=>'ᆓ','ᆔ'=>'ᆔ','ᆕ'=>'ᆕ','ᆖ'=>'ᆖ','ᆗ'=>'ᆗ','ᆘ'=>'ᆘ','ᆙ'=>'ᆙ','ᆚ'=>'ᆚ','ᆛ'=>'ᆛ','ᆜ'=>'ᆜ','á†'=>'á†','ᆞ'=>'ᆞ','ᆟ'=>'ᆟ','ᆠ'=>'ᆠ','ᆡ'=>'ᆡ','ᆢ'=>'ᆢ','ᆨ'=>'ᆨ','ᆩ'=>'ᆩ','ᆪ'=>'ᆪ','ᆫ'=>'ᆫ','ᆬ'=>'ᆬ','ᆭ'=>'ᆭ','ᆮ'=>'ᆮ','ᆯ'=>'ᆯ','ᆰ'=>'ᆰ','ᆱ'=>'ᆱ','ᆲ'=>'ᆲ','ᆳ'=>'ᆳ','ᆴ'=>'ᆴ','ᆵ'=>'ᆵ','ᆶ'=>'ᆶ','ᆷ'=>'ᆷ','ᆸ'=>'ᆸ','ᆹ'=>'ᆹ','ᆺ'=>'ᆺ','ᆻ'=>'ᆻ','ᆼ'=>'ᆼ','ᆽ'=>'ᆽ','ᆾ'=>'ᆾ','ᆿ'=>'ᆿ','ᇀ'=>'ᇀ','á‡'=>'á‡','ᇂ'=>'ᇂ','ᇃ'=>'ᇃ','ᇄ'=>'ᇄ','ᇅ'=>'ᇅ','ᇆ'=>'ᇆ','ᇇ'=>'ᇇ','ᇈ'=>'ᇈ','ᇉ'=>'ᇉ','ᇊ'=>'ᇊ','ᇋ'=>'ᇋ','ᇌ'=>'ᇌ','á‡'=>'á‡','ᇎ'=>'ᇎ','á‡'=>'á‡','á‡'=>'á‡','ᇑ'=>'ᇑ','ᇒ'=>'ᇒ','ᇓ'=>'ᇓ','ᇔ'=>'ᇔ','ᇕ'=>'ᇕ','ᇖ'=>'ᇖ','ᇗ'=>'ᇗ','ᇘ'=>'ᇘ','ᇙ'=>'ᇙ','ᇚ'=>'ᇚ','ᇛ'=>'ᇛ','ᇜ'=>'ᇜ','á‡'=>'á‡','ᇞ'=>'ᇞ','ᇟ'=>'ᇟ','ᇠ'=>'ᇠ','ᇡ'=>'ᇡ','ᇢ'=>'ᇢ','ᇣ'=>'ᇣ','ᇤ'=>'ᇤ','ᇥ'=>'ᇥ','ᇦ'=>'ᇦ','ᇧ'=>'ᇧ','ᇨ'=>'ᇨ','ᇩ'=>'ᇩ','ᇪ'=>'ᇪ','ᇫ'=>'ᇫ','ᇬ'=>'ᇬ','ᇭ'=>'ᇭ','ᇮ'=>'ᇮ','ᇯ'=>'ᇯ','ᇰ'=>'ᇰ','ᇱ'=>'ᇱ','ᇲ'=>'ᇲ','ᇳ'=>'ᇳ','ᇴ'=>'ᇴ','ᇵ'=>'ᇵ','ᇶ'=>'ᇶ','ᇷ'=>'ᇷ','ᇸ'=>'ᇸ','ᇹ'=>'ᇹ','ሀ'=>'ሀ','áˆ'=>'áˆ','ሂ'=>'ሂ','ሃ'=>'ሃ','ሄ'=>'ሄ','ህ'=>'ህ','ሆ'=>'ሆ','ሇ'=>'ሇ','ለ'=>'ለ','ሉ'=>'ሉ','ሊ'=>'ሊ','ላ'=>'ላ','ሌ'=>'ሌ','áˆ'=>'áˆ','ሎ'=>'ሎ','áˆ'=>'áˆ','áˆ'=>'áˆ','ሑ'=>'ሑ','ሒ'=>'ሒ','ሓ'=>'ሓ','ሔ'=>'ሔ','ሕ'=>'ሕ','ሖ'=>'ሖ','ሗ'=>'ሗ','መ'=>'መ','ሙ'=>'ሙ','ሚ'=>'ሚ','ማ'=>'ማ','ሜ'=>'ሜ','áˆ'=>'áˆ','ሞ'=>'ሞ','ሟ'=>'ሟ','ሠ'=>'ሠ','ሡ'=>'ሡ','ሢ'=>'ሢ','ሣ'=>'ሣ','ሤ'=>'ሤ','ሥ'=>'ሥ','ሦ'=>'ሦ','ሧ'=>'ሧ','ረ'=>'ረ','ሩ'=>'ሩ','ሪ'=>'ሪ','ራ'=>'ራ','ሬ'=>'ሬ','ር'=>'ር','ሮ'=>'ሮ','ሯ'=>'ሯ','ሰ'=>'ሰ','ሱ'=>'ሱ','ሲ'=>'ሲ','ሳ'=>'ሳ','ሴ'=>'ሴ','ስ'=>'ስ','ሶ'=>'ሶ','ሷ'=>'ሷ','ሸ'=>'ሸ','ሹ'=>'ሹ','ሺ'=>'ሺ','ሻ'=>'ሻ','ሼ'=>'ሼ','ሽ'=>'ሽ','ሾ'=>'ሾ','ሿ'=>'ሿ','ቀ'=>'ቀ','á‰'=>'á‰','ቂ'=>'ቂ','ቃ'=>'ቃ','ቄ'=>'ቄ','ቅ'=>'ቅ','ቆ'=>'ቆ','ቇ'=>'ቇ','ቈ'=>'ቈ','ቊ'=>'ቊ','ቋ'=>'ቋ','ቌ'=>'ቌ','á‰'=>'á‰','á‰'=>'á‰','ቑ'=>'ቑ','ቒ'=>'ቒ','ቓ'=>'ቓ','ቔ'=>'ቔ','ቕ'=>'ቕ','ቖ'=>'ቖ','ቘ'=>'ቘ','ቚ'=>'ቚ','ቛ'=>'ቛ','ቜ'=>'ቜ','á‰'=>'á‰','በ'=>'በ','ቡ'=>'ቡ','ቢ'=>'ቢ','ባ'=>'ባ','ቤ'=>'ቤ','ብ'=>'ብ','ቦ'=>'ቦ','ቧ'=>'ቧ','ቨ'=>'ቨ','ቩ'=>'ቩ','ቪ'=>'ቪ','ቫ'=>'ቫ','ቬ'=>'ቬ','ቭ'=>'ቭ','ቮ'=>'ቮ','ቯ'=>'ቯ','ተ'=>'ተ','ቱ'=>'ቱ','ቲ'=>'ቲ','ታ'=>'ታ','ቴ'=>'ቴ','ት'=>'ት','ቶ'=>'ቶ','ቷ'=>'ቷ','ቸ'=>'ቸ','ቹ'=>'ቹ','ቺ'=>'ቺ','ቻ'=>'ቻ','ቼ'=>'ቼ','ች'=>'ች','ቾ'=>'ቾ','ቿ'=>'ቿ','ኀ'=>'ኀ','áŠ'=>'áŠ','ኂ'=>'ኂ','ኃ'=>'ኃ','ኄ'=>'ኄ','ኅ'=>'ኅ','ኆ'=>'ኆ','ኇ'=>'ኇ','ኈ'=>'ኈ','ኊ'=>'ኊ','ኋ'=>'ኋ','ኌ'=>'ኌ','áŠ'=>'áŠ','áŠ'=>'áŠ','ኑ'=>'ኑ','ኒ'=>'ኒ','ና'=>'ና','ኔ'=>'ኔ','ን'=>'ን','ኖ'=>'ኖ','ኗ'=>'ኗ','ኘ'=>'ኘ','ኙ'=>'ኙ','ኚ'=>'ኚ','ኛ'=>'ኛ','ኜ'=>'ኜ','áŠ'=>'áŠ','ኞ'=>'ኞ','ኟ'=>'ኟ','አ'=>'አ','ኡ'=>'ኡ','ኢ'=>'ኢ','ኣ'=>'ኣ','ኤ'=>'ኤ','እ'=>'እ','ኦ'=>'ኦ','ኧ'=>'ኧ','ከ'=>'ከ','ኩ'=>'ኩ','ኪ'=>'ኪ','ካ'=>'ካ','ኬ'=>'ኬ','ክ'=>'ክ','ኮ'=>'ኮ','ኯ'=>'ኯ','ኰ'=>'ኰ','ኲ'=>'ኲ','ኳ'=>'ኳ','ኴ'=>'ኴ','ኵ'=>'ኵ','ኸ'=>'ኸ','ኹ'=>'ኹ','ኺ'=>'ኺ','ኻ'=>'ኻ','ኼ'=>'ኼ','ኽ'=>'ኽ','ኾ'=>'ኾ','á‹€'=>'á‹€','á‹‚'=>'á‹‚','ዃ'=>'ዃ','á‹„'=>'á‹„','á‹…'=>'á‹…','ወ'=>'ወ','ዉ'=>'ዉ','ዊ'=>'ዊ','á‹‹'=>'á‹‹','ዌ'=>'ዌ','á‹'=>'á‹','ዎ'=>'ዎ','á‹'=>'á‹','á‹'=>'á‹','á‹‘'=>'á‹‘','á‹’'=>'á‹’','á‹“'=>'á‹“','á‹”'=>'á‹”','á‹•'=>'á‹•','á‹–'=>'á‹–','ዘ'=>'ዘ','á‹™'=>'á‹™','ዚ'=>'ዚ','á‹›'=>'á‹›','ዜ'=>'ዜ','á‹'=>'á‹','ዞ'=>'ዞ','ዟ'=>'ዟ','á‹ '=>'á‹ ','á‹¡'=>'á‹¡','á‹¢'=>'á‹¢','á‹£'=>'á‹£','ዤ'=>'ዤ','á‹¥'=>'á‹¥','ዦ'=>'ዦ','á‹§'=>'á‹§','የ'=>'የ','á‹©'=>'á‹©','ዪ'=>'ዪ','á‹«'=>'á‹«','ዬ'=>'ዬ','á‹­'=>'á‹­','á‹®'=>'á‹®','ዯ'=>'ዯ','á‹°'=>'á‹°','ዱ'=>'ዱ','ዲ'=>'ዲ','ዳ'=>'ዳ','á‹´'=>'á‹´','ድ'=>'ድ','á‹¶'=>'á‹¶','á‹·'=>'á‹·','ዸ'=>'ዸ','ዹ'=>'ዹ','ዺ'=>'ዺ','á‹»'=>'á‹»','ዼ'=>'ዼ','ዽ'=>'ዽ','ዾ'=>'ዾ','á‹¿'=>'á‹¿','ጀ'=>'ጀ','áŒ'=>'áŒ','ጂ'=>'ጂ','ጃ'=>'ጃ','ጄ'=>'ጄ','ጅ'=>'ጅ','ጆ'=>'ጆ','ጇ'=>'ጇ','ገ'=>'ገ','ጉ'=>'ጉ','ጊ'=>'ጊ','ጋ'=>'ጋ','ጌ'=>'ጌ','áŒ'=>'áŒ','ጎ'=>'ጎ','áŒ'=>'áŒ','áŒ'=>'áŒ','ጒ'=>'ጒ','ጓ'=>'ጓ','ጔ'=>'ጔ','ጕ'=>'ጕ','ጘ'=>'ጘ','ጙ'=>'ጙ','ጚ'=>'ጚ','ጛ'=>'ጛ','ጜ'=>'ጜ','áŒ'=>'áŒ','ጞ'=>'ጞ','ጟ'=>'ጟ','ጠ'=>'ጠ','ጡ'=>'ጡ','ጢ'=>'ጢ','ጣ'=>'ጣ','ጤ'=>'ጤ','ጥ'=>'ጥ','ጦ'=>'ጦ','ጧ'=>'ጧ','ጨ'=>'ጨ','ጩ'=>'ጩ','ጪ'=>'ጪ','ጫ'=>'ጫ','ጬ'=>'ጬ','ጭ'=>'ጭ','ጮ'=>'ጮ','ጯ'=>'ጯ','ጰ'=>'ጰ','ጱ'=>'ጱ','ጲ'=>'ጲ','ጳ'=>'ጳ','ጴ'=>'ጴ','ጵ'=>'ጵ','ጶ'=>'ጶ','ጷ'=>'ጷ','ጸ'=>'ጸ','ጹ'=>'ጹ','ጺ'=>'ጺ','ጻ'=>'ጻ','ጼ'=>'ጼ','ጽ'=>'ጽ','ጾ'=>'ጾ','ጿ'=>'ጿ','á€'=>'á€','á'=>'á','á‚'=>'á‚','áƒ'=>'áƒ','á„'=>'á„','á…'=>'á…','á†'=>'á†','á‡'=>'á‡','áˆ'=>'áˆ','á‰'=>'á‰','áŠ'=>'áŠ','á‹'=>'á‹','áŒ'=>'áŒ','á'=>'á','áŽ'=>'áŽ','á'=>'á','á'=>'á','á‘'=>'á‘','á’'=>'á’','á“'=>'á“','á”'=>'á”','á•'=>'á•','á–'=>'á–','á—'=>'á—','á˜'=>'á˜','á™'=>'á™','áš'=>'áš','áŸ'=>'áŸ','á©'=>'1','áª'=>'2','á«'=>'3','á¬'=>'4','á­'=>'5','á®'=>'6','á¯'=>'7','á°'=>'8','á±'=>'9','á²'=>'10','á³'=>'20','á´'=>'30','áµ'=>'40','á¶'=>'50','á·'=>'60','á¸'=>'70','á¹'=>'80','áº'=>'90','á»'=>'100','á¼'=>'10000','ᎀ'=>'ᎀ','áŽ'=>'áŽ','ᎂ'=>'ᎂ','ᎃ'=>'ᎃ','ᎄ'=>'ᎄ','ᎅ'=>'ᎅ','ᎆ'=>'ᎆ','ᎇ'=>'ᎇ','ᎈ'=>'ᎈ','ᎉ'=>'ᎉ','ᎊ'=>'ᎊ','ᎋ'=>'ᎋ','ᎌ'=>'ᎌ','áŽ'=>'áŽ','ᎎ'=>'ᎎ','áŽ'=>'áŽ','Ꭰ'=>'Ꭰ','Ꭱ'=>'Ꭱ','Ꭲ'=>'Ꭲ','Ꭳ'=>'Ꭳ','Ꭴ'=>'Ꭴ','Ꭵ'=>'Ꭵ','Ꭶ'=>'Ꭶ','Ꭷ'=>'Ꭷ','Ꭸ'=>'Ꭸ','Ꭹ'=>'Ꭹ','Ꭺ'=>'Ꭺ','Ꭻ'=>'Ꭻ','Ꭼ'=>'Ꭼ','Ꭽ'=>'Ꭽ','Ꭾ'=>'Ꭾ','Ꭿ'=>'Ꭿ','Ꮀ'=>'Ꮀ','Ꮁ'=>'Ꮁ','Ꮂ'=>'Ꮂ','Ꮃ'=>'Ꮃ','Ꮄ'=>'Ꮄ','Ꮅ'=>'Ꮅ','Ꮆ'=>'Ꮆ','Ꮇ'=>'Ꮇ','Ꮈ'=>'Ꮈ','Ꮉ'=>'Ꮉ','Ꮊ'=>'Ꮊ','Ꮋ'=>'Ꮋ','Ꮌ'=>'Ꮌ','Ꮍ'=>'Ꮍ','Ꮎ'=>'Ꮎ','Ꮏ'=>'Ꮏ','á€'=>'á€','á'=>'á','á‚'=>'á‚','áƒ'=>'áƒ','á„'=>'á„','á…'=>'á…','á†'=>'á†','á‡'=>'á‡','áˆ'=>'áˆ','á‰'=>'á‰','áŠ'=>'áŠ','á‹'=>'á‹','áŒ'=>'áŒ','á'=>'á','áŽ'=>'áŽ','á'=>'á','á'=>'á','á‘'=>'á‘','á’'=>'á’','á“'=>'á“','á”'=>'á”','á•'=>'á•','á–'=>'á–','á—'=>'á—','á˜'=>'á˜','á™'=>'á™','áš'=>'áš','á›'=>'á›','áœ'=>'áœ','á'=>'á','áž'=>'áž','áŸ'=>'áŸ','á '=>'á ','á¡'=>'á¡','á¢'=>'á¢','á£'=>'á£','á¤'=>'á¤','á¥'=>'á¥','á¦'=>'á¦','á§'=>'á§','á¨'=>'á¨','á©'=>'á©','áª'=>'áª','á«'=>'á«','á¬'=>'á¬','á­'=>'á­','á®'=>'á®','á¯'=>'á¯','á°'=>'á°','á±'=>'á±','á²'=>'á²','á³'=>'á³','á´'=>'á´','á'=>'á','á‚'=>'á‚','áƒ'=>'áƒ','á„'=>'á„','á…'=>'á…','á†'=>'á†','á‡'=>'á‡','áˆ'=>'áˆ','á‰'=>'á‰','áŠ'=>'áŠ','á‹'=>'á‹','áŒ'=>'áŒ','á'=>'á','áŽ'=>'áŽ','á'=>'á','á'=>'á','á‘'=>'á‘','á’'=>'á’','á“'=>'á“','á”'=>'á”','á•'=>'á•','á–'=>'á–','á—'=>'á—','á˜'=>'á˜','á™'=>'á™','áš'=>'áš','á›'=>'á›','áœ'=>'áœ','á'=>'á','áž'=>'áž','áŸ'=>'áŸ','á '=>'á ','á¡'=>'á¡','á¢'=>'á¢','á£'=>'á£','á¤'=>'á¤','á¥'=>'á¥','á¦'=>'á¦','á§'=>'á§','á¨'=>'á¨','á©'=>'á©','áª'=>'áª','á«'=>'á«','á¬'=>'á¬','á­'=>'á­','á®'=>'á®','á¯'=>'á¯','á°'=>'á°','á±'=>'á±','á²'=>'á²','á³'=>'á³','á´'=>'á´','áµ'=>'áµ','á¶'=>'á¶','á·'=>'á·','á¸'=>'á¸','á¹'=>'á¹','áº'=>'áº','á»'=>'á»','á¼'=>'á¼','á½'=>'á½','á¾'=>'á¾','á¿'=>'á¿','á‘€'=>'á‘€','á‘'=>'á‘','á‘‚'=>'á‘‚','ᑃ'=>'ᑃ','á‘„'=>'á‘„','á‘…'=>'á‘…','ᑆ'=>'ᑆ','ᑇ'=>'ᑇ','ᑈ'=>'ᑈ','ᑉ'=>'ᑉ','ᑊ'=>'ᑊ','á‘‹'=>'á‘‹','ᑌ'=>'ᑌ','á‘'=>'á‘','ᑎ'=>'ᑎ','á‘'=>'á‘','á‘'=>'á‘','á‘‘'=>'á‘‘','á‘’'=>'á‘’','á‘“'=>'á‘“','á‘”'=>'á‘”','á‘•'=>'á‘•','á‘–'=>'á‘–','á‘—'=>'á‘—','ᑘ'=>'ᑘ','á‘™'=>'á‘™','ᑚ'=>'ᑚ','á‘›'=>'á‘›','ᑜ'=>'ᑜ','á‘'=>'á‘','ᑞ'=>'ᑞ','ᑟ'=>'ᑟ','á‘ '=>'á‘ ','á‘¡'=>'á‘¡','á‘¢'=>'á‘¢','á‘£'=>'á‘£','ᑤ'=>'ᑤ','á‘¥'=>'á‘¥','ᑦ'=>'ᑦ','á‘§'=>'á‘§','ᑨ'=>'ᑨ','á‘©'=>'á‘©','ᑪ'=>'ᑪ','á‘«'=>'á‘«','ᑬ'=>'ᑬ','á‘­'=>'á‘­','á‘®'=>'á‘®','ᑯ'=>'ᑯ','á‘°'=>'á‘°','ᑱ'=>'ᑱ','ᑲ'=>'ᑲ','ᑳ'=>'ᑳ','á‘´'=>'á‘´','ᑵ'=>'ᑵ','á‘¶'=>'á‘¶','á‘·'=>'á‘·','ᑸ'=>'ᑸ','ᑹ'=>'ᑹ','ᑺ'=>'ᑺ','á‘»'=>'á‘»','ᑼ'=>'ᑼ','ᑽ'=>'ᑽ','ᑾ'=>'ᑾ','á‘¿'=>'á‘¿','á’€'=>'á’€','á’'=>'á’','á’‚'=>'á’‚','á’ƒ'=>'á’ƒ','á’„'=>'á’„','á’…'=>'á’…','á’†'=>'á’†','á’‡'=>'á’‡','á’ˆ'=>'á’ˆ','á’‰'=>'á’‰','á’Š'=>'á’Š','á’‹'=>'á’‹','á’Œ'=>'á’Œ','á’'=>'á’','á’Ž'=>'á’Ž','á’'=>'á’','á’'=>'á’','á’‘'=>'á’‘','á’’'=>'á’’','á’“'=>'á’“','á’”'=>'á’”','á’•'=>'á’•','á’–'=>'á’–','á’—'=>'á’—','á’˜'=>'á’˜','á’™'=>'á’™','á’š'=>'á’š','á’›'=>'á’›','á’œ'=>'á’œ','á’'=>'á’','á’ž'=>'á’ž','á’Ÿ'=>'á’Ÿ','á’ '=>'á’ ','á’¡'=>'á’¡','á’¢'=>'á’¢','á’£'=>'á’£','á’¤'=>'á’¤','á’¥'=>'á’¥','á’¦'=>'á’¦','á’§'=>'á’§','á’¨'=>'á’¨','á’©'=>'á’©','á’ª'=>'á’ª','á’«'=>'á’«','á’¬'=>'á’¬','á’­'=>'á’­','á’®'=>'á’®','á’¯'=>'á’¯','á’°'=>'á’°','á’±'=>'á’±','á’²'=>'á’²','á’³'=>'á’³','á’´'=>'á’´','á’µ'=>'á’µ','á’¶'=>'á’¶','á’·'=>'á’·','á’¸'=>'á’¸','á’¹'=>'á’¹','á’º'=>'á’º','á’»'=>'á’»','á’¼'=>'á’¼','á’½'=>'á’½','á’¾'=>'á’¾','á’¿'=>'á’¿','á“€'=>'á“€','á“'=>'á“','á“‚'=>'á“‚','ᓃ'=>'ᓃ','á“„'=>'á“„','á“…'=>'á“…','ᓆ'=>'ᓆ','ᓇ'=>'ᓇ','ᓈ'=>'ᓈ','ᓉ'=>'ᓉ','ᓊ'=>'ᓊ','á“‹'=>'á“‹','ᓌ'=>'ᓌ','á“'=>'á“','ᓎ'=>'ᓎ','á“'=>'á“','á“'=>'á“','á“‘'=>'á“‘','á“’'=>'á“’','á““'=>'á““','á“”'=>'á“”','á“•'=>'á“•','á“–'=>'á“–','á“—'=>'á“—','ᓘ'=>'ᓘ','á“™'=>'á“™','ᓚ'=>'ᓚ','á“›'=>'á“›','ᓜ'=>'ᓜ','á“'=>'á“','ᓞ'=>'ᓞ','ᓟ'=>'ᓟ','á“ '=>'á“ ','á“¡'=>'á“¡','á“¢'=>'á“¢','á“£'=>'á“£','ᓤ'=>'ᓤ','á“¥'=>'á“¥','ᓦ'=>'ᓦ','á“§'=>'á“§','ᓨ'=>'ᓨ','á“©'=>'á“©','ᓪ'=>'ᓪ','á“«'=>'á“«','ᓬ'=>'ᓬ','á“­'=>'á“­','á“®'=>'á“®','ᓯ'=>'ᓯ','á“°'=>'á“°','ᓱ'=>'ᓱ','ᓲ'=>'ᓲ','ᓳ'=>'ᓳ','á“´'=>'á“´','ᓵ'=>'ᓵ','á“¶'=>'á“¶','á“·'=>'á“·','ᓸ'=>'ᓸ','ᓹ'=>'ᓹ','ᓺ'=>'ᓺ','á“»'=>'á“»','ᓼ'=>'ᓼ','ᓽ'=>'ᓽ','ᓾ'=>'ᓾ','á“¿'=>'á“¿','ᔀ'=>'ᔀ','á”'=>'á”','ᔂ'=>'ᔂ','ᔃ'=>'ᔃ','ᔄ'=>'ᔄ','á”…'=>'á”…','ᔆ'=>'ᔆ','ᔇ'=>'ᔇ','ᔈ'=>'ᔈ','ᔉ'=>'ᔉ','ᔊ'=>'ᔊ','ᔋ'=>'ᔋ','ᔌ'=>'ᔌ','á”'=>'á”','ᔎ'=>'ᔎ','á”'=>'á”','á”'=>'á”','ᔑ'=>'ᔑ','á”’'=>'á”’','ᔓ'=>'ᔓ','á””'=>'á””','ᔕ'=>'ᔕ','á”–'=>'á”–','á”—'=>'á”—','ᔘ'=>'ᔘ','á”™'=>'á”™','ᔚ'=>'ᔚ','á”›'=>'á”›','ᔜ'=>'ᔜ','á”'=>'á”','ᔞ'=>'ᔞ','ᔟ'=>'ᔟ','á” '=>'á” ','ᔡ'=>'ᔡ','ᔢ'=>'ᔢ','ᔣ'=>'ᔣ','ᔤ'=>'ᔤ','ᔥ'=>'ᔥ','ᔦ'=>'ᔦ','á”§'=>'á”§','ᔨ'=>'ᔨ','ᔩ'=>'ᔩ','ᔪ'=>'ᔪ','ᔫ'=>'ᔫ','ᔬ'=>'ᔬ','á”­'=>'á”­','á”®'=>'á”®','ᔯ'=>'ᔯ','á”°'=>'á”°','á”±'=>'á”±','ᔲ'=>'ᔲ','ᔳ'=>'ᔳ','á”´'=>'á”´','ᔵ'=>'ᔵ','á”¶'=>'á”¶','á”·'=>'á”·','ᔸ'=>'ᔸ','ᔹ'=>'ᔹ','ᔺ'=>'ᔺ','á”»'=>'á”»','ᔼ'=>'ᔼ','ᔽ'=>'ᔽ','ᔾ'=>'ᔾ','ᔿ'=>'ᔿ','á•€'=>'á•€','á•'=>'á•','á•‚'=>'á•‚','ᕃ'=>'ᕃ','á•„'=>'á•„','á•…'=>'á•…','ᕆ'=>'ᕆ','ᕇ'=>'ᕇ','ᕈ'=>'ᕈ','ᕉ'=>'ᕉ','ᕊ'=>'ᕊ','á•‹'=>'á•‹','ᕌ'=>'ᕌ','á•'=>'á•','ᕎ'=>'ᕎ','á•'=>'á•','á•'=>'á•','á•‘'=>'á•‘','á•’'=>'á•’','á•“'=>'á•“','á•”'=>'á•”','á••'=>'á••','á•–'=>'á•–','á•—'=>'á•—','ᕘ'=>'ᕘ','á•™'=>'á•™','ᕚ'=>'ᕚ','á•›'=>'á•›','ᕜ'=>'ᕜ','á•'=>'á•','ᕞ'=>'ᕞ','ᕟ'=>'ᕟ','á• '=>'á• ','á•¡'=>'á•¡','á•¢'=>'á•¢','á•£'=>'á•£','ᕤ'=>'ᕤ','á•¥'=>'á•¥','ᕦ'=>'ᕦ','á•§'=>'á•§','ᕨ'=>'ᕨ','á•©'=>'á•©','ᕪ'=>'ᕪ','á•«'=>'á•«','ᕬ'=>'ᕬ','á•­'=>'á•­','á•®'=>'á•®','ᕯ'=>'ᕯ','á•°'=>'á•°','ᕱ'=>'ᕱ','ᕲ'=>'ᕲ','ᕳ'=>'ᕳ','á•´'=>'á•´','ᕵ'=>'ᕵ','á•¶'=>'á•¶','á•·'=>'á•·','ᕸ'=>'ᕸ','ᕹ'=>'ᕹ','ᕺ'=>'ᕺ','á•»'=>'á•»','ᕼ'=>'ᕼ','ᕽ'=>'ᕽ','ᕾ'=>'ᕾ','á•¿'=>'á•¿','á–€'=>'á–€','á–'=>'á–','á–‚'=>'á–‚','á–ƒ'=>'á–ƒ','á–„'=>'á–„','á–…'=>'á–…','á–†'=>'á–†','á–‡'=>'á–‡','á–ˆ'=>'á–ˆ','á–‰'=>'á–‰','á–Š'=>'á–Š','á–‹'=>'á–‹','á–Œ'=>'á–Œ','á–'=>'á–','á–Ž'=>'á–Ž','á–'=>'á–','á–'=>'á–','á–‘'=>'á–‘','á–’'=>'á–’','á–“'=>'á–“','á–”'=>'á–”','á–•'=>'á–•','á––'=>'á––','á–—'=>'á–—','á–˜'=>'á–˜','á–™'=>'á–™','á–š'=>'á–š','á–›'=>'á–›','á–œ'=>'á–œ','á–'=>'á–','á–ž'=>'á–ž','á–Ÿ'=>'á–Ÿ','á– '=>'á– ','á–¡'=>'á–¡','á–¢'=>'á–¢','á–£'=>'á–£','á–¤'=>'á–¤','á–¥'=>'á–¥','á–¦'=>'á–¦','á–§'=>'á–§','á–¨'=>'á–¨','á–©'=>'á–©','á–ª'=>'á–ª','á–«'=>'á–«','á–¬'=>'á–¬','á–­'=>'á–­','á–®'=>'á–®','á–¯'=>'á–¯','á–°'=>'á–°','á–±'=>'á–±','á–²'=>'á–²','á–³'=>'á–³','á–´'=>'á–´','á–µ'=>'á–µ','á–¶'=>'á–¶','á–·'=>'á–·','á–¸'=>'á–¸','á–¹'=>'á–¹','á–º'=>'á–º','á–»'=>'á–»','á–¼'=>'á–¼','á–½'=>'á–½','á–¾'=>'á–¾','á–¿'=>'á–¿','á—€'=>'á—€','á—'=>'á—','á—‚'=>'á—‚','á—ƒ'=>'á—ƒ','á—„'=>'á—„','á—…'=>'á—…','á—†'=>'á—†','á—‡'=>'á—‡','á—ˆ'=>'á—ˆ','á—‰'=>'á—‰','á—Š'=>'á—Š','á—‹'=>'á—‹','á—Œ'=>'á—Œ','á—'=>'á—','á—Ž'=>'á—Ž','á—'=>'á—','á—'=>'á—','á—‘'=>'á—‘','á—’'=>'á—’','á—“'=>'á—“','á—”'=>'á—”','á—•'=>'á—•','á—–'=>'á—–','á——'=>'á——','á—˜'=>'á—˜','á—™'=>'á—™','á—š'=>'á—š','á—›'=>'á—›','á—œ'=>'á—œ','á—'=>'á—','á—ž'=>'á—ž','á—Ÿ'=>'á—Ÿ','á— '=>'á— ','á—¡'=>'á—¡','á—¢'=>'á—¢','á—£'=>'á—£','á—¤'=>'á—¤','á—¥'=>'á—¥','á—¦'=>'á—¦','á—§'=>'á—§','á—¨'=>'á—¨','á—©'=>'á—©','á—ª'=>'á—ª','á—«'=>'á—«','á—¬'=>'á—¬','á—­'=>'á—­','á—®'=>'á—®','á—¯'=>'á—¯','á—°'=>'á—°','á—±'=>'á—±','á—²'=>'á—²','á—³'=>'á—³','á—´'=>'á—´','á—µ'=>'á—µ','á—¶'=>'á—¶','á—·'=>'á—·','á—¸'=>'á—¸','á—¹'=>'á—¹','á—º'=>'á—º','á—»'=>'á—»','á—¼'=>'á—¼','á—½'=>'á—½','á—¾'=>'á—¾','á—¿'=>'á—¿','ᘀ'=>'ᘀ','á˜'=>'á˜','ᘂ'=>'ᘂ','ᘃ'=>'ᘃ','ᘄ'=>'ᘄ','ᘅ'=>'ᘅ','ᘆ'=>'ᘆ','ᘇ'=>'ᘇ','ᘈ'=>'ᘈ','ᘉ'=>'ᘉ','ᘊ'=>'ᘊ','ᘋ'=>'ᘋ','ᘌ'=>'ᘌ','á˜'=>'á˜','ᘎ'=>'ᘎ','á˜'=>'á˜','á˜'=>'á˜','ᘑ'=>'ᘑ','ᘒ'=>'ᘒ','ᘓ'=>'ᘓ','ᘔ'=>'ᘔ','ᘕ'=>'ᘕ','ᘖ'=>'ᘖ','ᘗ'=>'ᘗ','ᘘ'=>'ᘘ','ᘙ'=>'ᘙ','ᘚ'=>'ᘚ','ᘛ'=>'ᘛ','ᘜ'=>'ᘜ','á˜'=>'á˜','ᘞ'=>'ᘞ','ᘟ'=>'ᘟ','ᘠ'=>'ᘠ','ᘡ'=>'ᘡ','ᘢ'=>'ᘢ','ᘣ'=>'ᘣ','ᘤ'=>'ᘤ','ᘥ'=>'ᘥ','ᘦ'=>'ᘦ','ᘧ'=>'ᘧ','ᘨ'=>'ᘨ','ᘩ'=>'ᘩ','ᘪ'=>'ᘪ','ᘫ'=>'ᘫ','ᘬ'=>'ᘬ','ᘭ'=>'ᘭ','ᘮ'=>'ᘮ','ᘯ'=>'ᘯ','ᘰ'=>'ᘰ','ᘱ'=>'ᘱ','ᘲ'=>'ᘲ','ᘳ'=>'ᘳ','ᘴ'=>'ᘴ','ᘵ'=>'ᘵ','ᘶ'=>'ᘶ','ᘷ'=>'ᘷ','ᘸ'=>'ᘸ','ᘹ'=>'ᘹ','ᘺ'=>'ᘺ','ᘻ'=>'ᘻ','ᘼ'=>'ᘼ','ᘽ'=>'ᘽ','ᘾ'=>'ᘾ','ᘿ'=>'ᘿ','ᙀ'=>'ᙀ','á™'=>'á™','ᙂ'=>'ᙂ','ᙃ'=>'ᙃ','ᙄ'=>'ᙄ','á™…'=>'á™…','ᙆ'=>'ᙆ','ᙇ'=>'ᙇ','ᙈ'=>'ᙈ','ᙉ'=>'ᙉ','ᙊ'=>'ᙊ','ᙋ'=>'ᙋ','ᙌ'=>'ᙌ','á™'=>'á™','ᙎ'=>'ᙎ','á™'=>'á™','á™'=>'á™','ᙑ'=>'ᙑ','á™’'=>'á™’','ᙓ'=>'ᙓ','á™”'=>'á™”','ᙕ'=>'ᙕ','á™–'=>'á™–','á™—'=>'á™—','ᙘ'=>'ᙘ','á™™'=>'á™™','ᙚ'=>'ᙚ','á™›'=>'á™›','ᙜ'=>'ᙜ','á™'=>'á™','ᙞ'=>'ᙞ','ᙟ'=>'ᙟ','á™ '=>'á™ ','ᙡ'=>'ᙡ','ᙢ'=>'ᙢ','ᙣ'=>'ᙣ','ᙤ'=>'ᙤ','ᙥ'=>'ᙥ','ᙦ'=>'ᙦ','á™§'=>'á™§','ᙨ'=>'ᙨ','ᙩ'=>'ᙩ','ᙪ'=>'ᙪ','ᙫ'=>'ᙫ','ᙬ'=>'ᙬ','ᙯ'=>'ᙯ','á™°'=>'á™°','á™±'=>'á™±','ᙲ'=>'ᙲ','ᙳ'=>'ᙳ','á™´'=>'á™´','ᙵ'=>'ᙵ','á™¶'=>'á™¶','áš'=>'áš','áš‚'=>'áš‚','ᚃ'=>'ᚃ','áš„'=>'áš„','áš…'=>'áš…','ᚆ'=>'ᚆ','ᚇ'=>'ᚇ','ᚈ'=>'ᚈ','ᚉ'=>'ᚉ','ᚊ'=>'ᚊ','áš‹'=>'áš‹','ᚌ'=>'ᚌ','áš'=>'áš','ᚎ'=>'ᚎ','áš'=>'áš','áš'=>'áš','áš‘'=>'áš‘','áš’'=>'áš’','áš“'=>'áš“','áš”'=>'áš”','áš•'=>'áš•','áš–'=>'áš–','áš—'=>'áš—','ᚘ'=>'ᚘ','áš™'=>'áš™','ášš'=>'ášš','áš '=>'áš ','áš¡'=>'áš¡','ᚢ'=>'ᚢ','ᚣ'=>'ᚣ','ᚤ'=>'ᚤ','ᚥ'=>'ᚥ','ᚦ'=>'ᚦ','áš§'=>'áš§','ᚨ'=>'ᚨ','áš©'=>'áš©','ᚪ'=>'ᚪ','áš«'=>'áš«','ᚬ'=>'ᚬ','áš­'=>'áš­','áš®'=>'áš®','ᚯ'=>'ᚯ','áš°'=>'áš°','áš±'=>'áš±','áš²'=>'áš²','áš³'=>'áš³','áš´'=>'áš´','ášµ'=>'ášµ','áš¶'=>'áš¶','áš·'=>'áš·','ᚸ'=>'ᚸ','áš¹'=>'áš¹','ᚺ'=>'ᚺ','áš»'=>'áš»','áš¼'=>'áš¼','áš½'=>'áš½','áš¾'=>'áš¾','áš¿'=>'áš¿','ᛀ'=>'ᛀ','á›'=>'á›','ᛂ'=>'ᛂ','ᛃ'=>'ᛃ','ᛄ'=>'ᛄ','á›…'=>'á›…','ᛆ'=>'ᛆ','ᛇ'=>'ᛇ','ᛈ'=>'ᛈ','ᛉ'=>'ᛉ','ᛊ'=>'ᛊ','ᛋ'=>'ᛋ','ᛌ'=>'ᛌ','á›'=>'á›','ᛎ'=>'ᛎ','á›'=>'á›','á›'=>'á›','ᛑ'=>'ᛑ','á›’'=>'á›’','ᛓ'=>'ᛓ','á›”'=>'á›”','ᛕ'=>'ᛕ','á›–'=>'á›–','á›—'=>'á›—','ᛘ'=>'ᛘ','á›™'=>'á›™','ᛚ'=>'ᛚ','á››'=>'á››','ᛜ'=>'ᛜ','á›'=>'á›','ᛞ'=>'ᛞ','ᛟ'=>'ᛟ','á› '=>'á› ','ᛡ'=>'ᛡ','ᛢ'=>'ᛢ','ᛣ'=>'ᛣ','ᛤ'=>'ᛤ','ᛥ'=>'ᛥ','ᛦ'=>'ᛦ','á›§'=>'á›§','ᛨ'=>'ᛨ','ᛩ'=>'ᛩ','ᛪ'=>'ᛪ','á›®'=>'17','ᛯ'=>'18','á›°'=>'19','ᜀ'=>'ᜀ','áœ'=>'áœ','ᜂ'=>'ᜂ','ᜃ'=>'ᜃ','ᜄ'=>'ᜄ','ᜅ'=>'ᜅ','ᜆ'=>'ᜆ','ᜇ'=>'ᜇ','ᜈ'=>'ᜈ','ᜉ'=>'ᜉ','ᜊ'=>'ᜊ','ᜋ'=>'ᜋ','ᜌ'=>'ᜌ','ᜎ'=>'ᜎ','áœ'=>'áœ','áœ'=>'áœ','ᜑ'=>'ᜑ','ᜒ'=>'ᜒ','ᜓ'=>'ᜓ','᜔'=>'᜔','ᜠ'=>'ᜠ','ᜡ'=>'ᜡ','ᜢ'=>'ᜢ','ᜣ'=>'ᜣ','ᜤ'=>'ᜤ','ᜥ'=>'ᜥ','ᜦ'=>'ᜦ','ᜧ'=>'ᜧ','ᜨ'=>'ᜨ','ᜩ'=>'ᜩ','ᜪ'=>'ᜪ','ᜫ'=>'ᜫ','ᜬ'=>'ᜬ','ᜭ'=>'ᜭ','ᜮ'=>'ᜮ','ᜯ'=>'ᜯ','ᜰ'=>'ᜰ','ᜱ'=>'ᜱ','ᜲ'=>'ᜲ','ᜳ'=>'ᜳ','᜴'=>'᜴','á€'=>'á€','á'=>'á','á‚'=>'á‚','áƒ'=>'áƒ','á„'=>'á„','á…'=>'á…','á†'=>'á†','á‡'=>'á‡','áˆ'=>'áˆ','á‰'=>'á‰','áŠ'=>'áŠ','á‹'=>'á‹','áŒ'=>'áŒ','á'=>'á','áŽ'=>'áŽ','á'=>'á','á'=>'á','á‘'=>'á‘','á’'=>'á’','á“'=>'á“','á '=>'á ','á¡'=>'á¡','á¢'=>'á¢','á£'=>'á£','á¤'=>'á¤','á¥'=>'á¥','á¦'=>'á¦','á§'=>'á§','á¨'=>'á¨','á©'=>'á©','áª'=>'áª','á«'=>'á«','á¬'=>'á¬','á®'=>'á®','á¯'=>'á¯','á°'=>'á°','á²'=>'á²','á³'=>'á³','ក'=>'ក','áž'=>'áž','áž‚'=>'áž‚','ឃ'=>'ឃ','áž„'=>'áž„','áž…'=>'áž…','ឆ'=>'ឆ','ជ'=>'ជ','ឈ'=>'ឈ','ញ'=>'ញ','ដ'=>'ដ','áž‹'=>'áž‹','ឌ'=>'ឌ','áž'=>'áž','ណ'=>'ណ','áž'=>'áž','áž'=>'áž','áž‘'=>'áž‘','áž’'=>'áž’','áž“'=>'áž“','áž”'=>'áž”','áž•'=>'áž•','áž–'=>'áž–','áž—'=>'áž—','ម'=>'ម','áž™'=>'áž™','ážš'=>'ážš','áž›'=>'áž›','ážœ'=>'ážœ','áž'=>'áž','ážž'=>'ážž','ស'=>'ស','áž '=>'áž ','áž¡'=>'áž¡','អ'=>'អ','ឣ'=>'ឣ','ឤ'=>'ឤ','ឥ'=>'ឥ','ឦ'=>'ឦ','áž§'=>'áž§','ឨ'=>'ឨ','áž©'=>'áž©','ឪ'=>'ឪ','áž«'=>'áž«','ឬ'=>'ឬ','áž­'=>'áž­','áž®'=>'áž®','ឯ'=>'ឯ','áž°'=>'áž°','áž±'=>'áž±','áž²'=>'áž²','áž³'=>'áž³','áž¶'=>'áž¶','áž·'=>'áž·','ី'=>'ី','áž¹'=>'áž¹','ឺ'=>'ឺ','áž»'=>'áž»','áž¼'=>'áž¼','áž½'=>'áž½','áž¾'=>'áž¾','áž¿'=>'áž¿','ៀ'=>'ៀ','áŸ'=>'áŸ','ែ'=>'ែ','ៃ'=>'ៃ','ោ'=>'ោ','ៅ'=>'ៅ','ំ'=>'ំ','ះ'=>'ះ','ៈ'=>'ៈ','៉'=>'៉','៊'=>'៊','់'=>'់','៌'=>'៌','áŸ'=>'áŸ','៎'=>'៎','áŸ'=>'áŸ','áŸ'=>'áŸ','៑'=>'៑','្'=>'្','៓'=>'៓','ៗ'=>'ៗ','ៜ'=>'ៜ','áŸ'=>'áŸ','០'=>'0','១'=>'1','២'=>'2','៣'=>'3','៤'=>'4','៥'=>'5','៦'=>'6','៧'=>'7','៨'=>'8','៩'=>'9','៰'=>'0','៱'=>'1','៲'=>'2','៳'=>'3','៴'=>'4','៵'=>'5','៶'=>'6','៷'=>'7','៸'=>'8','៹'=>'9'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_20.php b/phpBB/includes/utf/data/search_indexer_20.php deleted file mode 100644 index caab3c540b..0000000000 --- a/phpBB/includes/utf/data/search_indexer_20.php +++ /dev/null @@ -1 +0,0 @@ -'ꀀ','ê€'=>'ê€','ꀂ'=>'ꀂ','ꀃ'=>'ꀃ','ꀄ'=>'ꀄ','ꀅ'=>'ꀅ','ꀆ'=>'ꀆ','ꀇ'=>'ꀇ','ꀈ'=>'ꀈ','ꀉ'=>'ꀉ','ꀊ'=>'ꀊ','ꀋ'=>'ꀋ','ꀌ'=>'ꀌ','ê€'=>'ê€','ꀎ'=>'ꀎ','ê€'=>'ê€','ê€'=>'ê€','ꀑ'=>'ꀑ','ꀒ'=>'ꀒ','ꀓ'=>'ꀓ','ꀔ'=>'ꀔ','ꀕ'=>'ꀕ','ꀖ'=>'ꀖ','ꀗ'=>'ꀗ','ꀘ'=>'ꀘ','ꀙ'=>'ꀙ','ꀚ'=>'ꀚ','ꀛ'=>'ꀛ','ꀜ'=>'ꀜ','ê€'=>'ê€','ꀞ'=>'ꀞ','ꀟ'=>'ꀟ','ꀠ'=>'ꀠ','ꀡ'=>'ꀡ','ꀢ'=>'ꀢ','ꀣ'=>'ꀣ','ꀤ'=>'ꀤ','ꀥ'=>'ꀥ','ꀦ'=>'ꀦ','ꀧ'=>'ꀧ','ꀨ'=>'ꀨ','ꀩ'=>'ꀩ','ꀪ'=>'ꀪ','ꀫ'=>'ꀫ','ꀬ'=>'ꀬ','ꀭ'=>'ꀭ','ꀮ'=>'ꀮ','ꀯ'=>'ꀯ','ꀰ'=>'ꀰ','ꀱ'=>'ꀱ','ꀲ'=>'ꀲ','ꀳ'=>'ꀳ','ꀴ'=>'ꀴ','ꀵ'=>'ꀵ','ꀶ'=>'ꀶ','ꀷ'=>'ꀷ','ꀸ'=>'ꀸ','ꀹ'=>'ꀹ','ꀺ'=>'ꀺ','ꀻ'=>'ꀻ','ꀼ'=>'ꀼ','ꀽ'=>'ꀽ','ꀾ'=>'ꀾ','ꀿ'=>'ꀿ','ê€'=>'ê€','ê'=>'ê','ê‚'=>'ê‚','êƒ'=>'êƒ','ê„'=>'ê„','ê…'=>'ê…','ê†'=>'ê†','ê‡'=>'ê‡','êˆ'=>'êˆ','ê‰'=>'ê‰','êŠ'=>'êŠ','ê‹'=>'ê‹','êŒ'=>'êŒ','ê'=>'ê','êŽ'=>'êŽ','ê'=>'ê','ê'=>'ê','ê‘'=>'ê‘','ê’'=>'ê’','ê“'=>'ê“','ê”'=>'ê”','ê•'=>'ê•','ê–'=>'ê–','ê—'=>'ê—','ê˜'=>'ê˜','ê™'=>'ê™','êš'=>'êš','ê›'=>'ê›','êœ'=>'êœ','ê'=>'ê','êž'=>'êž','êŸ'=>'êŸ','ê '=>'ê ','ê¡'=>'ê¡','ê¢'=>'ê¢','ê£'=>'ê£','ê¤'=>'ê¤','ê¥'=>'ê¥','ê¦'=>'ê¦','ê§'=>'ê§','ê¨'=>'ê¨','ê©'=>'ê©','êª'=>'êª','ê«'=>'ê«','ê¬'=>'ê¬','ê­'=>'ê­','ê®'=>'ê®','ê¯'=>'ê¯','ê°'=>'ê°','ê±'=>'ê±','ê²'=>'ê²','ê³'=>'ê³','ê´'=>'ê´','êµ'=>'êµ','ê¶'=>'ê¶','ê·'=>'ê·','ê¸'=>'ê¸','ê¹'=>'ê¹','êº'=>'êº','ê»'=>'ê»','ê¼'=>'ê¼','ê½'=>'ê½','ê¾'=>'ê¾','ê¿'=>'ê¿','ê‚€'=>'ê‚€','ê‚'=>'ê‚','ê‚‚'=>'ê‚‚','ꂃ'=>'ꂃ','ê‚„'=>'ê‚„','ê‚…'=>'ê‚…','ꂆ'=>'ꂆ','ꂇ'=>'ꂇ','ꂈ'=>'ꂈ','ꂉ'=>'ꂉ','ꂊ'=>'ꂊ','ê‚‹'=>'ê‚‹','ꂌ'=>'ꂌ','ê‚'=>'ê‚','ꂎ'=>'ꂎ','ê‚'=>'ê‚','ê‚'=>'ê‚','ê‚‘'=>'ê‚‘','ê‚’'=>'ê‚’','ê‚“'=>'ê‚“','ê‚”'=>'ê‚”','ê‚•'=>'ê‚•','ê‚–'=>'ê‚–','ê‚—'=>'ê‚—','ꂘ'=>'ꂘ','ê‚™'=>'ê‚™','ꂚ'=>'ꂚ','ê‚›'=>'ê‚›','ꂜ'=>'ꂜ','ê‚'=>'ê‚','ꂞ'=>'ꂞ','ꂟ'=>'ꂟ','ê‚ '=>'ê‚ ','ê‚¡'=>'ê‚¡','ê‚¢'=>'ê‚¢','ê‚£'=>'ê‚£','ꂤ'=>'ꂤ','ê‚¥'=>'ê‚¥','ꂦ'=>'ꂦ','ê‚§'=>'ê‚§','ꂨ'=>'ꂨ','ê‚©'=>'ê‚©','ꂪ'=>'ꂪ','ê‚«'=>'ê‚«','ꂬ'=>'ꂬ','ê‚­'=>'ê‚­','ê‚®'=>'ê‚®','ꂯ'=>'ꂯ','ê‚°'=>'ê‚°','ꂱ'=>'ꂱ','ꂲ'=>'ꂲ','ꂳ'=>'ꂳ','ê‚´'=>'ê‚´','ꂵ'=>'ꂵ','ê‚¶'=>'ê‚¶','ê‚·'=>'ê‚·','ꂸ'=>'ꂸ','ꂹ'=>'ꂹ','ꂺ'=>'ꂺ','ê‚»'=>'ê‚»','ꂼ'=>'ꂼ','ꂽ'=>'ꂽ','ꂾ'=>'ꂾ','ê‚¿'=>'ê‚¿','ꃀ'=>'ꃀ','êƒ'=>'êƒ','ꃂ'=>'ꃂ','ꃃ'=>'ꃃ','ꃄ'=>'ꃄ','ꃅ'=>'ꃅ','ꃆ'=>'ꃆ','ꃇ'=>'ꃇ','ꃈ'=>'ꃈ','ꃉ'=>'ꃉ','ꃊ'=>'ꃊ','ꃋ'=>'ꃋ','ꃌ'=>'ꃌ','êƒ'=>'êƒ','ꃎ'=>'ꃎ','êƒ'=>'êƒ','êƒ'=>'êƒ','ꃑ'=>'ꃑ','ꃒ'=>'ꃒ','ꃓ'=>'ꃓ','ꃔ'=>'ꃔ','ꃕ'=>'ꃕ','ꃖ'=>'ꃖ','ꃗ'=>'ꃗ','ꃘ'=>'ꃘ','ꃙ'=>'ꃙ','ꃚ'=>'ꃚ','ꃛ'=>'ꃛ','ꃜ'=>'ꃜ','êƒ'=>'êƒ','ꃞ'=>'ꃞ','ꃟ'=>'ꃟ','ꃠ'=>'ꃠ','ꃡ'=>'ꃡ','ꃢ'=>'ꃢ','ꃣ'=>'ꃣ','ꃤ'=>'ꃤ','ꃥ'=>'ꃥ','ꃦ'=>'ꃦ','ꃧ'=>'ꃧ','ꃨ'=>'ꃨ','ꃩ'=>'ꃩ','ꃪ'=>'ꃪ','ꃫ'=>'ꃫ','ꃬ'=>'ꃬ','ꃭ'=>'ꃭ','ꃮ'=>'ꃮ','ꃯ'=>'ꃯ','ꃰ'=>'ꃰ','ꃱ'=>'ꃱ','ꃲ'=>'ꃲ','ꃳ'=>'ꃳ','ꃴ'=>'ꃴ','ꃵ'=>'ꃵ','ꃶ'=>'ꃶ','ꃷ'=>'ꃷ','ꃸ'=>'ꃸ','ꃹ'=>'ꃹ','ꃺ'=>'ꃺ','ꃻ'=>'ꃻ','ꃼ'=>'ꃼ','ꃽ'=>'ꃽ','ꃾ'=>'ꃾ','ꃿ'=>'ꃿ','ê„€'=>'ê„€','ê„'=>'ê„','ê„‚'=>'ê„‚','ꄃ'=>'ꄃ','ê„„'=>'ê„„','ê„…'=>'ê„…','ꄆ'=>'ꄆ','ꄇ'=>'ꄇ','ꄈ'=>'ꄈ','ꄉ'=>'ꄉ','ꄊ'=>'ꄊ','ê„‹'=>'ê„‹','ꄌ'=>'ꄌ','ê„'=>'ê„','ꄎ'=>'ꄎ','ê„'=>'ê„','ê„'=>'ê„','ê„‘'=>'ê„‘','ê„’'=>'ê„’','ê„“'=>'ê„“','ê„”'=>'ê„”','ê„•'=>'ê„•','ê„–'=>'ê„–','ê„—'=>'ê„—','ꄘ'=>'ꄘ','ê„™'=>'ê„™','ꄚ'=>'ꄚ','ê„›'=>'ê„›','ꄜ'=>'ꄜ','ê„'=>'ê„','ꄞ'=>'ꄞ','ꄟ'=>'ꄟ','ê„ '=>'ê„ ','ê„¡'=>'ê„¡','ê„¢'=>'ê„¢','ê„£'=>'ê„£','ꄤ'=>'ꄤ','ê„¥'=>'ê„¥','ꄦ'=>'ꄦ','ê„§'=>'ê„§','ꄨ'=>'ꄨ','ê„©'=>'ê„©','ꄪ'=>'ꄪ','ê„«'=>'ê„«','ꄬ'=>'ꄬ','ê„­'=>'ê„­','ê„®'=>'ê„®','ꄯ'=>'ꄯ','ê„°'=>'ê„°','ꄱ'=>'ꄱ','ꄲ'=>'ꄲ','ꄳ'=>'ꄳ','ê„´'=>'ê„´','ꄵ'=>'ꄵ','ê„¶'=>'ê„¶','ê„·'=>'ê„·','ꄸ'=>'ꄸ','ꄹ'=>'ꄹ','ꄺ'=>'ꄺ','ê„»'=>'ê„»','ꄼ'=>'ꄼ','ꄽ'=>'ꄽ','ꄾ'=>'ꄾ','ê„¿'=>'ê„¿','ê…€'=>'ê…€','ê…'=>'ê…','ê…‚'=>'ê…‚','ê…ƒ'=>'ê…ƒ','ê…„'=>'ê…„','ê……'=>'ê……','ê…†'=>'ê…†','ê…‡'=>'ê…‡','ê…ˆ'=>'ê…ˆ','ê…‰'=>'ê…‰','ê…Š'=>'ê…Š','ê…‹'=>'ê…‹','ê…Œ'=>'ê…Œ','ê…'=>'ê…','ê…Ž'=>'ê…Ž','ê…'=>'ê…','ê…'=>'ê…','ê…‘'=>'ê…‘','ê…’'=>'ê…’','ê…“'=>'ê…“','ê…”'=>'ê…”','ê…•'=>'ê…•','ê…–'=>'ê…–','ê…—'=>'ê…—','ê…˜'=>'ê…˜','ê…™'=>'ê…™','ê…š'=>'ê…š','ê…›'=>'ê…›','ê…œ'=>'ê…œ','ê…'=>'ê…','ê…ž'=>'ê…ž','ê…Ÿ'=>'ê…Ÿ','ê… '=>'ê… ','ê…¡'=>'ê…¡','ê…¢'=>'ê…¢','ê…£'=>'ê…£','ê…¤'=>'ê…¤','ê…¥'=>'ê…¥','ê…¦'=>'ê…¦','ê…§'=>'ê…§','ê…¨'=>'ê…¨','ê…©'=>'ê…©','ê…ª'=>'ê…ª','ê…«'=>'ê…«','ê…¬'=>'ê…¬','ê…­'=>'ê…­','ê…®'=>'ê…®','ê…¯'=>'ê…¯','ê…°'=>'ê…°','ê…±'=>'ê…±','ê…²'=>'ê…²','ê…³'=>'ê…³','ê…´'=>'ê…´','ê…µ'=>'ê…µ','ê…¶'=>'ê…¶','ê…·'=>'ê…·','ê…¸'=>'ê…¸','ê…¹'=>'ê…¹','ê…º'=>'ê…º','ê…»'=>'ê…»','ê…¼'=>'ê…¼','ê…½'=>'ê…½','ê…¾'=>'ê…¾','ê…¿'=>'ê…¿','ꆀ'=>'ꆀ','ê†'=>'ê†','ꆂ'=>'ꆂ','ꆃ'=>'ꆃ','ꆄ'=>'ꆄ','ꆅ'=>'ꆅ','ꆆ'=>'ꆆ','ꆇ'=>'ꆇ','ꆈ'=>'ꆈ','ꆉ'=>'ꆉ','ꆊ'=>'ꆊ','ꆋ'=>'ꆋ','ꆌ'=>'ꆌ','ê†'=>'ê†','ꆎ'=>'ꆎ','ê†'=>'ê†','ê†'=>'ê†','ꆑ'=>'ꆑ','ꆒ'=>'ꆒ','ꆓ'=>'ꆓ','ꆔ'=>'ꆔ','ꆕ'=>'ꆕ','ꆖ'=>'ꆖ','ꆗ'=>'ꆗ','ꆘ'=>'ꆘ','ꆙ'=>'ꆙ','ꆚ'=>'ꆚ','ꆛ'=>'ꆛ','ꆜ'=>'ꆜ','ê†'=>'ê†','ꆞ'=>'ꆞ','ꆟ'=>'ꆟ','ꆠ'=>'ꆠ','ꆡ'=>'ꆡ','ꆢ'=>'ꆢ','ꆣ'=>'ꆣ','ꆤ'=>'ꆤ','ꆥ'=>'ꆥ','ꆦ'=>'ꆦ','ꆧ'=>'ꆧ','ꆨ'=>'ꆨ','ꆩ'=>'ꆩ','ꆪ'=>'ꆪ','ꆫ'=>'ꆫ','ꆬ'=>'ꆬ','ꆭ'=>'ꆭ','ꆮ'=>'ꆮ','ꆯ'=>'ꆯ','ꆰ'=>'ꆰ','ꆱ'=>'ꆱ','ꆲ'=>'ꆲ','ꆳ'=>'ꆳ','ꆴ'=>'ꆴ','ꆵ'=>'ꆵ','ꆶ'=>'ꆶ','ꆷ'=>'ꆷ','ꆸ'=>'ꆸ','ꆹ'=>'ꆹ','ꆺ'=>'ꆺ','ꆻ'=>'ꆻ','ꆼ'=>'ꆼ','ꆽ'=>'ꆽ','ꆾ'=>'ꆾ','ꆿ'=>'ꆿ','ꇀ'=>'ꇀ','ê‡'=>'ê‡','ꇂ'=>'ꇂ','ꇃ'=>'ꇃ','ꇄ'=>'ꇄ','ꇅ'=>'ꇅ','ꇆ'=>'ꇆ','ꇇ'=>'ꇇ','ꇈ'=>'ꇈ','ꇉ'=>'ꇉ','ꇊ'=>'ꇊ','ꇋ'=>'ꇋ','ꇌ'=>'ꇌ','ê‡'=>'ê‡','ꇎ'=>'ꇎ','ê‡'=>'ê‡','ê‡'=>'ê‡','ꇑ'=>'ꇑ','ꇒ'=>'ꇒ','ꇓ'=>'ꇓ','ꇔ'=>'ꇔ','ꇕ'=>'ꇕ','ꇖ'=>'ꇖ','ꇗ'=>'ꇗ','ꇘ'=>'ꇘ','ꇙ'=>'ꇙ','ꇚ'=>'ꇚ','ꇛ'=>'ꇛ','ꇜ'=>'ꇜ','ê‡'=>'ê‡','ꇞ'=>'ꇞ','ꇟ'=>'ꇟ','ꇠ'=>'ꇠ','ꇡ'=>'ꇡ','ꇢ'=>'ꇢ','ꇣ'=>'ꇣ','ꇤ'=>'ꇤ','ꇥ'=>'ꇥ','ꇦ'=>'ꇦ','ꇧ'=>'ꇧ','ꇨ'=>'ꇨ','ꇩ'=>'ꇩ','ꇪ'=>'ꇪ','ꇫ'=>'ꇫ','ꇬ'=>'ꇬ','ꇭ'=>'ꇭ','ꇮ'=>'ꇮ','ꇯ'=>'ꇯ','ꇰ'=>'ꇰ','ꇱ'=>'ꇱ','ꇲ'=>'ꇲ','ꇳ'=>'ꇳ','ꇴ'=>'ꇴ','ꇵ'=>'ꇵ','ꇶ'=>'ꇶ','ꇷ'=>'ꇷ','ꇸ'=>'ꇸ','ꇹ'=>'ꇹ','ꇺ'=>'ꇺ','ꇻ'=>'ꇻ','ꇼ'=>'ꇼ','ꇽ'=>'ꇽ','ꇾ'=>'ꇾ','ꇿ'=>'ꇿ','ꈀ'=>'ꈀ','êˆ'=>'êˆ','ꈂ'=>'ꈂ','ꈃ'=>'ꈃ','ꈄ'=>'ꈄ','ꈅ'=>'ꈅ','ꈆ'=>'ꈆ','ꈇ'=>'ꈇ','ꈈ'=>'ꈈ','ꈉ'=>'ꈉ','ꈊ'=>'ꈊ','ꈋ'=>'ꈋ','ꈌ'=>'ꈌ','êˆ'=>'êˆ','ꈎ'=>'ꈎ','êˆ'=>'êˆ','êˆ'=>'êˆ','ꈑ'=>'ꈑ','ꈒ'=>'ꈒ','ꈓ'=>'ꈓ','ꈔ'=>'ꈔ','ꈕ'=>'ꈕ','ꈖ'=>'ꈖ','ꈗ'=>'ꈗ','ꈘ'=>'ꈘ','ꈙ'=>'ꈙ','ꈚ'=>'ꈚ','ꈛ'=>'ꈛ','ꈜ'=>'ꈜ','êˆ'=>'êˆ','ꈞ'=>'ꈞ','ꈟ'=>'ꈟ','ꈠ'=>'ꈠ','ꈡ'=>'ꈡ','ꈢ'=>'ꈢ','ꈣ'=>'ꈣ','ꈤ'=>'ꈤ','ꈥ'=>'ꈥ','ꈦ'=>'ꈦ','ꈧ'=>'ꈧ','ꈨ'=>'ꈨ','ꈩ'=>'ꈩ','ꈪ'=>'ꈪ','ꈫ'=>'ꈫ','ꈬ'=>'ꈬ','ꈭ'=>'ꈭ','ꈮ'=>'ꈮ','ꈯ'=>'ꈯ','ꈰ'=>'ꈰ','ꈱ'=>'ꈱ','ꈲ'=>'ꈲ','ꈳ'=>'ꈳ','ꈴ'=>'ꈴ','ꈵ'=>'ꈵ','ꈶ'=>'ꈶ','ꈷ'=>'ꈷ','ꈸ'=>'ꈸ','ꈹ'=>'ꈹ','ꈺ'=>'ꈺ','ꈻ'=>'ꈻ','ꈼ'=>'ꈼ','ꈽ'=>'ꈽ','ꈾ'=>'ꈾ','ꈿ'=>'ꈿ','ꉀ'=>'ꉀ','ê‰'=>'ê‰','ꉂ'=>'ꉂ','ꉃ'=>'ꉃ','ꉄ'=>'ꉄ','ꉅ'=>'ꉅ','ꉆ'=>'ꉆ','ꉇ'=>'ꉇ','ꉈ'=>'ꉈ','ꉉ'=>'ꉉ','ꉊ'=>'ꉊ','ꉋ'=>'ꉋ','ꉌ'=>'ꉌ','ê‰'=>'ê‰','ꉎ'=>'ꉎ','ê‰'=>'ê‰','ê‰'=>'ê‰','ꉑ'=>'ꉑ','ꉒ'=>'ꉒ','ꉓ'=>'ꉓ','ꉔ'=>'ꉔ','ꉕ'=>'ꉕ','ꉖ'=>'ꉖ','ꉗ'=>'ꉗ','ꉘ'=>'ꉘ','ꉙ'=>'ꉙ','ꉚ'=>'ꉚ','ꉛ'=>'ꉛ','ꉜ'=>'ꉜ','ê‰'=>'ê‰','ꉞ'=>'ꉞ','ꉟ'=>'ꉟ','ꉠ'=>'ꉠ','ꉡ'=>'ꉡ','ꉢ'=>'ꉢ','ꉣ'=>'ꉣ','ꉤ'=>'ꉤ','ꉥ'=>'ꉥ','ꉦ'=>'ꉦ','ꉧ'=>'ꉧ','ꉨ'=>'ꉨ','ꉩ'=>'ꉩ','ꉪ'=>'ꉪ','ꉫ'=>'ꉫ','ꉬ'=>'ꉬ','ꉭ'=>'ꉭ','ꉮ'=>'ꉮ','ꉯ'=>'ꉯ','ꉰ'=>'ꉰ','ꉱ'=>'ꉱ','ꉲ'=>'ꉲ','ꉳ'=>'ꉳ','ꉴ'=>'ꉴ','ꉵ'=>'ꉵ','ꉶ'=>'ꉶ','ꉷ'=>'ꉷ','ꉸ'=>'ꉸ','ꉹ'=>'ꉹ','ꉺ'=>'ꉺ','ꉻ'=>'ꉻ','ꉼ'=>'ꉼ','ꉽ'=>'ꉽ','ꉾ'=>'ꉾ','ꉿ'=>'ꉿ','ꊀ'=>'ꊀ','êŠ'=>'êŠ','ꊂ'=>'ꊂ','ꊃ'=>'ꊃ','ꊄ'=>'ꊄ','ꊅ'=>'ꊅ','ꊆ'=>'ꊆ','ꊇ'=>'ꊇ','ꊈ'=>'ꊈ','ꊉ'=>'ꊉ','ꊊ'=>'ꊊ','ꊋ'=>'ꊋ','ꊌ'=>'ꊌ','êŠ'=>'êŠ','ꊎ'=>'ꊎ','êŠ'=>'êŠ','êŠ'=>'êŠ','ꊑ'=>'ꊑ','ꊒ'=>'ꊒ','ꊓ'=>'ꊓ','ꊔ'=>'ꊔ','ꊕ'=>'ꊕ','ꊖ'=>'ꊖ','ꊗ'=>'ꊗ','ꊘ'=>'ꊘ','ꊙ'=>'ꊙ','ꊚ'=>'ꊚ','ꊛ'=>'ꊛ','ꊜ'=>'ꊜ','êŠ'=>'êŠ','ꊞ'=>'ꊞ','ꊟ'=>'ꊟ','ꊠ'=>'ꊠ','ꊡ'=>'ꊡ','ꊢ'=>'ꊢ','ꊣ'=>'ꊣ','ꊤ'=>'ꊤ','ꊥ'=>'ꊥ','ꊦ'=>'ꊦ','ꊧ'=>'ꊧ','ꊨ'=>'ꊨ','ꊩ'=>'ꊩ','ꊪ'=>'ꊪ','ꊫ'=>'ꊫ','ꊬ'=>'ꊬ','ꊭ'=>'ꊭ','ꊮ'=>'ꊮ','ꊯ'=>'ꊯ','ꊰ'=>'ꊰ','ꊱ'=>'ꊱ','ꊲ'=>'ꊲ','ꊳ'=>'ꊳ','ꊴ'=>'ꊴ','ꊵ'=>'ꊵ','ꊶ'=>'ꊶ','ꊷ'=>'ꊷ','ꊸ'=>'ꊸ','ꊹ'=>'ꊹ','ꊺ'=>'ꊺ','ꊻ'=>'ꊻ','ꊼ'=>'ꊼ','ꊽ'=>'ꊽ','ꊾ'=>'ꊾ','ꊿ'=>'ꊿ','ê‹€'=>'ê‹€','ê‹'=>'ê‹','ê‹‚'=>'ê‹‚','ꋃ'=>'ꋃ','ê‹„'=>'ê‹„','ê‹…'=>'ê‹…','ꋆ'=>'ꋆ','ꋇ'=>'ꋇ','ꋈ'=>'ꋈ','ꋉ'=>'ꋉ','ꋊ'=>'ꋊ','ê‹‹'=>'ê‹‹','ꋌ'=>'ꋌ','ê‹'=>'ê‹','ꋎ'=>'ꋎ','ê‹'=>'ê‹','ê‹'=>'ê‹','ê‹‘'=>'ê‹‘','ê‹’'=>'ê‹’','ê‹“'=>'ê‹“','ê‹”'=>'ê‹”','ê‹•'=>'ê‹•','ê‹–'=>'ê‹–','ê‹—'=>'ê‹—','ꋘ'=>'ꋘ','ê‹™'=>'ê‹™','ꋚ'=>'ꋚ','ê‹›'=>'ê‹›','ꋜ'=>'ꋜ','ê‹'=>'ê‹','ꋞ'=>'ꋞ','ꋟ'=>'ꋟ','ê‹ '=>'ê‹ ','ê‹¡'=>'ê‹¡','ê‹¢'=>'ê‹¢','ê‹£'=>'ê‹£','ꋤ'=>'ꋤ','ê‹¥'=>'ê‹¥','ꋦ'=>'ꋦ','ê‹§'=>'ê‹§','ꋨ'=>'ꋨ','ê‹©'=>'ê‹©','ꋪ'=>'ꋪ','ê‹«'=>'ê‹«','ꋬ'=>'ꋬ','ê‹­'=>'ê‹­','ê‹®'=>'ê‹®','ꋯ'=>'ꋯ','ê‹°'=>'ê‹°','ꋱ'=>'ꋱ','ꋲ'=>'ꋲ','ꋳ'=>'ꋳ','ê‹´'=>'ê‹´','ꋵ'=>'ꋵ','ê‹¶'=>'ê‹¶','ê‹·'=>'ê‹·','ꋸ'=>'ꋸ','ꋹ'=>'ꋹ','ꋺ'=>'ꋺ','ê‹»'=>'ê‹»','ꋼ'=>'ꋼ','ꋽ'=>'ꋽ','ꋾ'=>'ꋾ','ê‹¿'=>'ê‹¿','ꌀ'=>'ꌀ','êŒ'=>'êŒ','ꌂ'=>'ꌂ','ꌃ'=>'ꌃ','ꌄ'=>'ꌄ','ꌅ'=>'ꌅ','ꌆ'=>'ꌆ','ꌇ'=>'ꌇ','ꌈ'=>'ꌈ','ꌉ'=>'ꌉ','ꌊ'=>'ꌊ','ꌋ'=>'ꌋ','ꌌ'=>'ꌌ','êŒ'=>'êŒ','ꌎ'=>'ꌎ','êŒ'=>'êŒ','êŒ'=>'êŒ','ꌑ'=>'ꌑ','ꌒ'=>'ꌒ','ꌓ'=>'ꌓ','ꌔ'=>'ꌔ','ꌕ'=>'ꌕ','ꌖ'=>'ꌖ','ꌗ'=>'ꌗ','ꌘ'=>'ꌘ','ꌙ'=>'ꌙ','ꌚ'=>'ꌚ','ꌛ'=>'ꌛ','ꌜ'=>'ꌜ','êŒ'=>'êŒ','ꌞ'=>'ꌞ','ꌟ'=>'ꌟ','ꌠ'=>'ꌠ','ꌡ'=>'ꌡ','ꌢ'=>'ꌢ','ꌣ'=>'ꌣ','ꌤ'=>'ꌤ','ꌥ'=>'ꌥ','ꌦ'=>'ꌦ','ꌧ'=>'ꌧ','ꌨ'=>'ꌨ','ꌩ'=>'ꌩ','ꌪ'=>'ꌪ','ꌫ'=>'ꌫ','ꌬ'=>'ꌬ','ꌭ'=>'ꌭ','ꌮ'=>'ꌮ','ꌯ'=>'ꌯ','ꌰ'=>'ꌰ','ꌱ'=>'ꌱ','ꌲ'=>'ꌲ','ꌳ'=>'ꌳ','ꌴ'=>'ꌴ','ꌵ'=>'ꌵ','ꌶ'=>'ꌶ','ꌷ'=>'ꌷ','ꌸ'=>'ꌸ','ꌹ'=>'ꌹ','ꌺ'=>'ꌺ','ꌻ'=>'ꌻ','ꌼ'=>'ꌼ','ꌽ'=>'ꌽ','ꌾ'=>'ꌾ','ꌿ'=>'ꌿ','ê€'=>'ê€','ê'=>'ê','ê‚'=>'ê‚','êƒ'=>'êƒ','ê„'=>'ê„','ê…'=>'ê…','ê†'=>'ê†','ê‡'=>'ê‡','êˆ'=>'êˆ','ê‰'=>'ê‰','êŠ'=>'êŠ','ê‹'=>'ê‹','êŒ'=>'êŒ','ê'=>'ê','êŽ'=>'êŽ','ê'=>'ê','ê'=>'ê','ê‘'=>'ê‘','ê’'=>'ê’','ê“'=>'ê“','ê”'=>'ê”','ê•'=>'ê•','ê–'=>'ê–','ê—'=>'ê—','ê˜'=>'ê˜','ê™'=>'ê™','êš'=>'êš','ê›'=>'ê›','êœ'=>'êœ','ê'=>'ê','êž'=>'êž','êŸ'=>'êŸ','ê '=>'ê ','ê¡'=>'ê¡','ê¢'=>'ê¢','ê£'=>'ê£','ê¤'=>'ê¤','ê¥'=>'ê¥','ê¦'=>'ê¦','ê§'=>'ê§','ê¨'=>'ê¨','ê©'=>'ê©','êª'=>'êª','ê«'=>'ê«','ê¬'=>'ê¬','ê­'=>'ê­','ê®'=>'ê®','ê¯'=>'ê¯','ê°'=>'ê°','ê±'=>'ê±','ê²'=>'ê²','ê³'=>'ê³','ê´'=>'ê´','êµ'=>'êµ','ê¶'=>'ê¶','ê·'=>'ê·','ê¸'=>'ê¸','ê¹'=>'ê¹','êº'=>'êº','ê»'=>'ê»','ê¼'=>'ê¼','ê½'=>'ê½','ê¾'=>'ê¾','ê¿'=>'ê¿','ꎀ'=>'ꎀ','êŽ'=>'êŽ','ꎂ'=>'ꎂ','ꎃ'=>'ꎃ','ꎄ'=>'ꎄ','ꎅ'=>'ꎅ','ꎆ'=>'ꎆ','ꎇ'=>'ꎇ','ꎈ'=>'ꎈ','ꎉ'=>'ꎉ','ꎊ'=>'ꎊ','ꎋ'=>'ꎋ','ꎌ'=>'ꎌ','êŽ'=>'êŽ','ꎎ'=>'ꎎ','êŽ'=>'êŽ','êŽ'=>'êŽ','ꎑ'=>'ꎑ','ꎒ'=>'ꎒ','ꎓ'=>'ꎓ','ꎔ'=>'ꎔ','ꎕ'=>'ꎕ','ꎖ'=>'ꎖ','ꎗ'=>'ꎗ','ꎘ'=>'ꎘ','ꎙ'=>'ꎙ','ꎚ'=>'ꎚ','ꎛ'=>'ꎛ','ꎜ'=>'ꎜ','êŽ'=>'êŽ','ꎞ'=>'ꎞ','ꎟ'=>'ꎟ','ꎠ'=>'ꎠ','ꎡ'=>'ꎡ','ꎢ'=>'ꎢ','ꎣ'=>'ꎣ','ꎤ'=>'ꎤ','ꎥ'=>'ꎥ','ꎦ'=>'ꎦ','ꎧ'=>'ꎧ','ꎨ'=>'ꎨ','ꎩ'=>'ꎩ','ꎪ'=>'ꎪ','ꎫ'=>'ꎫ','ꎬ'=>'ꎬ','ꎭ'=>'ꎭ','ꎮ'=>'ꎮ','ꎯ'=>'ꎯ','ꎰ'=>'ꎰ','ꎱ'=>'ꎱ','ꎲ'=>'ꎲ','ꎳ'=>'ꎳ','ꎴ'=>'ꎴ','ꎵ'=>'ꎵ','ꎶ'=>'ꎶ','ꎷ'=>'ꎷ','ꎸ'=>'ꎸ','ꎹ'=>'ꎹ','ꎺ'=>'ꎺ','ꎻ'=>'ꎻ','ꎼ'=>'ꎼ','ꎽ'=>'ꎽ','ꎾ'=>'ꎾ','ꎿ'=>'ꎿ','ê€'=>'ê€','ê'=>'ê','ê‚'=>'ê‚','êƒ'=>'êƒ','ê„'=>'ê„','ê…'=>'ê…','ê†'=>'ê†','ê‡'=>'ê‡','êˆ'=>'êˆ','ê‰'=>'ê‰','êŠ'=>'êŠ','ê‹'=>'ê‹','êŒ'=>'êŒ','ê'=>'ê','êŽ'=>'êŽ','ê'=>'ê','ê'=>'ê','ê‘'=>'ê‘','ê’'=>'ê’','ê“'=>'ê“','ê”'=>'ê”','ê•'=>'ê•','ê–'=>'ê–','ê—'=>'ê—','ê˜'=>'ê˜','ê™'=>'ê™','êš'=>'êš','ê›'=>'ê›','êœ'=>'êœ','ê'=>'ê','êž'=>'êž','êŸ'=>'êŸ','ê '=>'ê ','ê¡'=>'ê¡','ê¢'=>'ê¢','ê£'=>'ê£','ê¤'=>'ê¤','ê¥'=>'ê¥','ê¦'=>'ê¦','ê§'=>'ê§','ê¨'=>'ê¨','ê©'=>'ê©','êª'=>'êª','ê«'=>'ê«','ê¬'=>'ê¬','ê­'=>'ê­','ê®'=>'ê®','ê¯'=>'ê¯','ê°'=>'ê°','ê±'=>'ê±','ê²'=>'ê²','ê³'=>'ê³','ê´'=>'ê´','êµ'=>'êµ','ê¶'=>'ê¶','ê·'=>'ê·','ê¸'=>'ê¸','ê¹'=>'ê¹','êº'=>'êº','ê»'=>'ê»','ê¼'=>'ê¼','ê½'=>'ê½','ê¾'=>'ê¾','ê¿'=>'ê¿','ê€'=>'ê€','ê'=>'ê','ê‚'=>'ê‚','êƒ'=>'êƒ','ê„'=>'ê„','ê…'=>'ê…','ê†'=>'ê†','ê‡'=>'ê‡','êˆ'=>'êˆ','ê‰'=>'ê‰','êŠ'=>'êŠ','ê‹'=>'ê‹','êŒ'=>'êŒ','ê'=>'ê','êŽ'=>'êŽ','ê'=>'ê','ê'=>'ê','ê‘'=>'ê‘','ê’'=>'ê’','ê“'=>'ê“','ê”'=>'ê”','ê•'=>'ê•','ê–'=>'ê–','ê—'=>'ê—','ê˜'=>'ê˜','ê™'=>'ê™','êš'=>'êš','ê›'=>'ê›','êœ'=>'êœ','ê'=>'ê','êž'=>'êž','êŸ'=>'êŸ','ê '=>'ê ','ê¡'=>'ê¡','ê¢'=>'ê¢','ê£'=>'ê£','ê¤'=>'ê¤','ê¥'=>'ê¥','ê¦'=>'ê¦','ê§'=>'ê§','ê¨'=>'ê¨','ê©'=>'ê©','êª'=>'êª','ê«'=>'ê«','ê¬'=>'ê¬','ê­'=>'ê­','ê®'=>'ê®','ê¯'=>'ê¯','ê°'=>'ê°','ê±'=>'ê±','ê²'=>'ê²','ê³'=>'ê³','ê´'=>'ê´','êµ'=>'êµ','ê¶'=>'ê¶','ê·'=>'ê·','ê¸'=>'ê¸','ê¹'=>'ê¹','êº'=>'êº','ê»'=>'ê»','ê¼'=>'ê¼','ê½'=>'ê½','ê¾'=>'ê¾','ê¿'=>'ê¿','ê‘€'=>'ê‘€','ê‘'=>'ê‘','ê‘‚'=>'ê‘‚','ꑃ'=>'ꑃ','ê‘„'=>'ê‘„','ê‘…'=>'ê‘…','ꑆ'=>'ꑆ','ꑇ'=>'ꑇ','ꑈ'=>'ꑈ','ꑉ'=>'ꑉ','ꑊ'=>'ꑊ','ê‘‹'=>'ê‘‹','ꑌ'=>'ꑌ','ê‘'=>'ê‘','ꑎ'=>'ꑎ','ê‘'=>'ê‘','ê‘'=>'ê‘','ê‘‘'=>'ê‘‘','ê‘’'=>'ê‘’','ê‘“'=>'ê‘“','ê‘”'=>'ê‘”','ê‘•'=>'ê‘•','ê‘–'=>'ê‘–','ê‘—'=>'ê‘—','ꑘ'=>'ꑘ','ê‘™'=>'ê‘™','ꑚ'=>'ꑚ','ê‘›'=>'ê‘›','ꑜ'=>'ꑜ','ê‘'=>'ê‘','ꑞ'=>'ꑞ','ꑟ'=>'ꑟ','ê‘ '=>'ê‘ ','ê‘¡'=>'ê‘¡','ê‘¢'=>'ê‘¢','ê‘£'=>'ê‘£','ꑤ'=>'ꑤ','ê‘¥'=>'ê‘¥','ꑦ'=>'ꑦ','ê‘§'=>'ê‘§','ꑨ'=>'ꑨ','ê‘©'=>'ê‘©','ꑪ'=>'ꑪ','ê‘«'=>'ê‘«','ꑬ'=>'ꑬ','ê‘­'=>'ê‘­','ê‘®'=>'ê‘®','ꑯ'=>'ꑯ','ê‘°'=>'ê‘°','ꑱ'=>'ꑱ','ꑲ'=>'ꑲ','ꑳ'=>'ꑳ','ê‘´'=>'ê‘´','ꑵ'=>'ꑵ','ê‘¶'=>'ê‘¶','ê‘·'=>'ê‘·','ꑸ'=>'ꑸ','ꑹ'=>'ꑹ','ꑺ'=>'ꑺ','ê‘»'=>'ê‘»','ꑼ'=>'ꑼ','ꑽ'=>'ꑽ','ꑾ'=>'ꑾ','ê‘¿'=>'ê‘¿','ê’€'=>'ê’€','ê’'=>'ê’','ê’‚'=>'ê’‚','ê’ƒ'=>'ê’ƒ','ê’„'=>'ê’„','ê’…'=>'ê’…','ê’†'=>'ê’†','ê’‡'=>'ê’‡','ê’ˆ'=>'ê’ˆ','ê’‰'=>'ê’‰','ê’Š'=>'ê’Š','ê’‹'=>'ê’‹','ê’Œ'=>'ê’Œ','ꜗ'=>'ꜗ','ꜘ'=>'ꜘ','ꜙ'=>'ꜙ','ꜚ'=>'ꜚ'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_21.php b/phpBB/includes/utf/data/search_indexer_21.php deleted file mode 100644 index 7fc3e4dc09..0000000000 --- a/phpBB/includes/utf/data/search_indexer_21.php +++ /dev/null @@ -1 +0,0 @@ -'ê €','ê '=>'ê ','ê ‚'=>'ê ‚','ê ƒ'=>'ê ƒ','ê „'=>'ê „','ê …'=>'ê …','ê †'=>'ê †','ê ‡'=>'ê ‡','ê ˆ'=>'ê ˆ','ê ‰'=>'ê ‰','ê Š'=>'ê Š','ê ‹'=>'ê ‹','ê Œ'=>'ê Œ','ê '=>'ê ','ê Ž'=>'ê Ž','ê '=>'ê ','ê '=>'ê ','ê ‘'=>'ê ‘','ê ’'=>'ê ’','ê “'=>'ê “','ê ”'=>'ê ”','ê •'=>'ê •','ê –'=>'ê –','ê —'=>'ê —','ê ˜'=>'ê ˜','ê ™'=>'ê ™','ê š'=>'ê š','ê ›'=>'ê ›','ê œ'=>'ê œ','ê '=>'ê ','ê ž'=>'ê ž','ê Ÿ'=>'ê Ÿ','ê  '=>'ê  ','ê ¡'=>'ê ¡','ê ¢'=>'ê ¢','ê £'=>'ê £','ê ¤'=>'ê ¤','ê ¥'=>'ê ¥','ê ¦'=>'ê ¦','ê §'=>'ê §','ê¡€'=>'ê¡€','ê¡'=>'ê¡','ê¡‚'=>'ê¡‚','ꡃ'=>'ꡃ','ê¡„'=>'ê¡„','ê¡…'=>'ê¡…','ꡆ'=>'ꡆ','ꡇ'=>'ꡇ','ꡈ'=>'ꡈ','ꡉ'=>'ꡉ','ꡊ'=>'ꡊ','ê¡‹'=>'ê¡‹','ꡌ'=>'ꡌ','ê¡'=>'ê¡','ꡎ'=>'ꡎ','ê¡'=>'ê¡','ê¡'=>'ê¡','ê¡‘'=>'ê¡‘','ê¡’'=>'ê¡’','ê¡“'=>'ê¡“','ê¡”'=>'ê¡”','ê¡•'=>'ê¡•','ê¡–'=>'ê¡–','ê¡—'=>'ê¡—','ꡘ'=>'ꡘ','ê¡™'=>'ê¡™','ꡚ'=>'ꡚ','ê¡›'=>'ê¡›','ꡜ'=>'ꡜ','ê¡'=>'ê¡','ꡞ'=>'ꡞ','ꡟ'=>'ꡟ','ê¡ '=>'ê¡ ','ê¡¡'=>'ê¡¡','ê¡¢'=>'ê¡¢','ê¡£'=>'ê¡£','ꡤ'=>'ꡤ','ê¡¥'=>'ê¡¥','ꡦ'=>'ꡦ','ê¡§'=>'ê¡§','ꡨ'=>'ꡨ','ê¡©'=>'ê¡©','ꡪ'=>'ꡪ','ê¡«'=>'ê¡«','ꡬ'=>'ꡬ','ê¡­'=>'ê¡­','ê¡®'=>'ê¡®','ꡯ'=>'ꡯ','ê¡°'=>'ê¡°','ꡱ'=>'ꡱ','ꡲ'=>'ꡲ','ꡳ'=>'ꡳ','ê°€'=>'ê°€'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_26.php b/phpBB/includes/utf/data/search_indexer_26.php deleted file mode 100644 index b8718bd608..0000000000 --- a/phpBB/includes/utf/data/search_indexer_26.php +++ /dev/null @@ -1 +0,0 @@ -'힣'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_3.php b/phpBB/includes/utf/data/search_indexer_3.php deleted file mode 100644 index 41798c9e86..0000000000 --- a/phpBB/includes/utf/data/search_indexer_3.php +++ /dev/null @@ -1 +0,0 @@ -'á ‹','á Œ'=>'á Œ','á '=>'á ','á '=>'0','á ‘'=>'1','á ’'=>'2','á “'=>'3','á ”'=>'4','á •'=>'5','á –'=>'6','á —'=>'7','á ˜'=>'8','á ™'=>'9','á  '=>'á  ','á ¡'=>'á ¡','á ¢'=>'á ¢','á £'=>'á £','á ¤'=>'á ¤','á ¥'=>'á ¥','á ¦'=>'á ¦','á §'=>'á §','á ¨'=>'á ¨','á ©'=>'á ©','á ª'=>'á ª','á «'=>'á «','á ¬'=>'á ¬','á ­'=>'á ­','á ®'=>'á ®','á ¯'=>'á ¯','á °'=>'á °','á ±'=>'á ±','á ²'=>'á ²','á ³'=>'á ³','á ´'=>'á ´','á µ'=>'á µ','á ¶'=>'á ¶','á ·'=>'á ·','á ¸'=>'á ¸','á ¹'=>'á ¹','á º'=>'á º','á »'=>'á »','á ¼'=>'á ¼','á ½'=>'á ½','á ¾'=>'á ¾','á ¿'=>'á ¿','á¡€'=>'á¡€','á¡'=>'á¡','á¡‚'=>'á¡‚','ᡃ'=>'ᡃ','á¡„'=>'á¡„','á¡…'=>'á¡…','ᡆ'=>'ᡆ','ᡇ'=>'ᡇ','ᡈ'=>'ᡈ','ᡉ'=>'ᡉ','ᡊ'=>'ᡊ','á¡‹'=>'á¡‹','ᡌ'=>'ᡌ','á¡'=>'á¡','ᡎ'=>'ᡎ','á¡'=>'á¡','á¡'=>'á¡','á¡‘'=>'á¡‘','á¡’'=>'á¡’','á¡“'=>'á¡“','á¡”'=>'á¡”','á¡•'=>'á¡•','á¡–'=>'á¡–','á¡—'=>'á¡—','ᡘ'=>'ᡘ','á¡™'=>'á¡™','ᡚ'=>'ᡚ','á¡›'=>'á¡›','ᡜ'=>'ᡜ','á¡'=>'á¡','ᡞ'=>'ᡞ','ᡟ'=>'ᡟ','á¡ '=>'á¡ ','á¡¡'=>'á¡¡','á¡¢'=>'á¡¢','á¡£'=>'á¡£','ᡤ'=>'ᡤ','á¡¥'=>'á¡¥','ᡦ'=>'ᡦ','á¡§'=>'á¡§','ᡨ'=>'ᡨ','á¡©'=>'á¡©','ᡪ'=>'ᡪ','á¡«'=>'á¡«','ᡬ'=>'ᡬ','á¡­'=>'á¡­','á¡®'=>'á¡®','ᡯ'=>'ᡯ','á¡°'=>'á¡°','ᡱ'=>'ᡱ','ᡲ'=>'ᡲ','ᡳ'=>'ᡳ','á¡´'=>'á¡´','ᡵ'=>'ᡵ','á¡¶'=>'á¡¶','á¡·'=>'á¡·','ᢀ'=>'ᢀ','á¢'=>'á¢','ᢂ'=>'ᢂ','ᢃ'=>'ᢃ','ᢄ'=>'ᢄ','ᢅ'=>'ᢅ','ᢆ'=>'ᢆ','ᢇ'=>'ᢇ','ᢈ'=>'ᢈ','ᢉ'=>'ᢉ','ᢊ'=>'ᢊ','ᢋ'=>'ᢋ','ᢌ'=>'ᢌ','á¢'=>'á¢','ᢎ'=>'ᢎ','á¢'=>'á¢','á¢'=>'á¢','ᢑ'=>'ᢑ','ᢒ'=>'ᢒ','ᢓ'=>'ᢓ','ᢔ'=>'ᢔ','ᢕ'=>'ᢕ','ᢖ'=>'ᢖ','ᢗ'=>'ᢗ','ᢘ'=>'ᢘ','ᢙ'=>'ᢙ','ᢚ'=>'ᢚ','ᢛ'=>'ᢛ','ᢜ'=>'ᢜ','á¢'=>'á¢','ᢞ'=>'ᢞ','ᢟ'=>'ᢟ','ᢠ'=>'ᢠ','ᢡ'=>'ᢡ','ᢢ'=>'ᢢ','ᢣ'=>'ᢣ','ᢤ'=>'ᢤ','ᢥ'=>'ᢥ','ᢦ'=>'ᢦ','ᢧ'=>'ᢧ','ᢨ'=>'ᢨ','ᢩ'=>'ᢩ','ᤀ'=>'ᤀ','á¤'=>'á¤','ᤂ'=>'ᤂ','ᤃ'=>'ᤃ','ᤄ'=>'ᤄ','ᤅ'=>'ᤅ','ᤆ'=>'ᤆ','ᤇ'=>'ᤇ','ᤈ'=>'ᤈ','ᤉ'=>'ᤉ','ᤊ'=>'ᤊ','ᤋ'=>'ᤋ','ᤌ'=>'ᤌ','á¤'=>'á¤','ᤎ'=>'ᤎ','á¤'=>'á¤','á¤'=>'á¤','ᤑ'=>'ᤑ','ᤒ'=>'ᤒ','ᤓ'=>'ᤓ','ᤔ'=>'ᤔ','ᤕ'=>'ᤕ','ᤖ'=>'ᤖ','ᤗ'=>'ᤗ','ᤘ'=>'ᤘ','ᤙ'=>'ᤙ','ᤚ'=>'ᤚ','ᤛ'=>'ᤛ','ᤜ'=>'ᤜ','ᤠ'=>'ᤠ','ᤡ'=>'ᤡ','ᤢ'=>'ᤢ','ᤣ'=>'ᤣ','ᤤ'=>'ᤤ','ᤥ'=>'ᤥ','ᤦ'=>'ᤦ','ᤧ'=>'ᤧ','ᤨ'=>'ᤨ','ᤩ'=>'ᤩ','ᤪ'=>'ᤪ','ᤫ'=>'ᤫ','ᤰ'=>'ᤰ','ᤱ'=>'ᤱ','ᤲ'=>'ᤲ','ᤳ'=>'ᤳ','ᤴ'=>'ᤴ','ᤵ'=>'ᤵ','ᤶ'=>'ᤶ','ᤷ'=>'ᤷ','ᤸ'=>'ᤸ','᤹'=>'᤹','᤺'=>'᤺','᤻'=>'᤻','᥆'=>'0','᥇'=>'1','᥈'=>'2','᥉'=>'3','᥊'=>'4','᥋'=>'5','᥌'=>'6','á¥'=>'7','᥎'=>'8','á¥'=>'9','á¥'=>'á¥','ᥑ'=>'ᥑ','ᥒ'=>'ᥒ','ᥓ'=>'ᥓ','ᥔ'=>'ᥔ','ᥕ'=>'ᥕ','ᥖ'=>'ᥖ','ᥗ'=>'ᥗ','ᥘ'=>'ᥘ','ᥙ'=>'ᥙ','ᥚ'=>'ᥚ','ᥛ'=>'ᥛ','ᥜ'=>'ᥜ','á¥'=>'á¥','ᥞ'=>'ᥞ','ᥟ'=>'ᥟ','ᥠ'=>'ᥠ','ᥡ'=>'ᥡ','ᥢ'=>'ᥢ','ᥣ'=>'ᥣ','ᥤ'=>'ᥤ','ᥥ'=>'ᥥ','ᥦ'=>'ᥦ','ᥧ'=>'ᥧ','ᥨ'=>'ᥨ','ᥩ'=>'ᥩ','ᥪ'=>'ᥪ','ᥫ'=>'ᥫ','ᥬ'=>'ᥬ','ᥭ'=>'ᥭ','ᥰ'=>'ᥰ','ᥱ'=>'ᥱ','ᥲ'=>'ᥲ','ᥳ'=>'ᥳ','ᥴ'=>'ᥴ','ᦀ'=>'ᦀ','á¦'=>'á¦','ᦂ'=>'ᦂ','ᦃ'=>'ᦃ','ᦄ'=>'ᦄ','ᦅ'=>'ᦅ','ᦆ'=>'ᦆ','ᦇ'=>'ᦇ','ᦈ'=>'ᦈ','ᦉ'=>'ᦉ','ᦊ'=>'ᦊ','ᦋ'=>'ᦋ','ᦌ'=>'ᦌ','á¦'=>'á¦','ᦎ'=>'ᦎ','á¦'=>'á¦','á¦'=>'á¦','ᦑ'=>'ᦑ','ᦒ'=>'ᦒ','ᦓ'=>'ᦓ','ᦔ'=>'ᦔ','ᦕ'=>'ᦕ','ᦖ'=>'ᦖ','ᦗ'=>'ᦗ','ᦘ'=>'ᦘ','ᦙ'=>'ᦙ','ᦚ'=>'ᦚ','ᦛ'=>'ᦛ','ᦜ'=>'ᦜ','á¦'=>'á¦','ᦞ'=>'ᦞ','ᦟ'=>'ᦟ','ᦠ'=>'ᦠ','ᦡ'=>'ᦡ','ᦢ'=>'ᦢ','ᦣ'=>'ᦣ','ᦤ'=>'ᦤ','ᦥ'=>'ᦥ','ᦦ'=>'ᦦ','ᦧ'=>'ᦧ','ᦨ'=>'ᦨ','ᦩ'=>'ᦩ','ᦰ'=>'ᦰ','ᦱ'=>'ᦱ','ᦲ'=>'ᦲ','ᦳ'=>'ᦳ','ᦴ'=>'ᦴ','ᦵ'=>'ᦵ','ᦶ'=>'ᦶ','ᦷ'=>'ᦷ','ᦸ'=>'ᦸ','ᦹ'=>'ᦹ','ᦺ'=>'ᦺ','ᦻ'=>'ᦻ','ᦼ'=>'ᦼ','ᦽ'=>'ᦽ','ᦾ'=>'ᦾ','ᦿ'=>'ᦿ','á§€'=>'á§€','á§'=>'á§','á§‚'=>'á§‚','ᧃ'=>'ᧃ','á§„'=>'á§„','á§…'=>'á§…','ᧆ'=>'ᧆ','ᧇ'=>'ᧇ','ᧈ'=>'ᧈ','ᧉ'=>'ᧉ','á§'=>'0','á§‘'=>'1','á§’'=>'2','á§“'=>'3','á§”'=>'4','á§•'=>'5','á§–'=>'6','á§—'=>'7','᧘'=>'8','á§™'=>'9','ᨀ'=>'ᨀ','á¨'=>'á¨','ᨂ'=>'ᨂ','ᨃ'=>'ᨃ','ᨄ'=>'ᨄ','ᨅ'=>'ᨅ','ᨆ'=>'ᨆ','ᨇ'=>'ᨇ','ᨈ'=>'ᨈ','ᨉ'=>'ᨉ','ᨊ'=>'ᨊ','ᨋ'=>'ᨋ','ᨌ'=>'ᨌ','á¨'=>'á¨','ᨎ'=>'ᨎ','á¨'=>'á¨','á¨'=>'á¨','ᨑ'=>'ᨑ','ᨒ'=>'ᨒ','ᨓ'=>'ᨓ','ᨔ'=>'ᨔ','ᨕ'=>'ᨕ','ᨖ'=>'ᨖ','ᨗ'=>'ᨗ','ᨘ'=>'ᨘ','ᨙ'=>'ᨙ','ᨚ'=>'ᨚ','ᨛ'=>'ᨛ','ᬀ'=>'ᬀ','á¬'=>'á¬','ᬂ'=>'ᬂ','ᬃ'=>'ᬃ','ᬄ'=>'ᬄ','ᬅ'=>'ᬅ','ᬆ'=>'ᬆ','ᬇ'=>'ᬇ','ᬈ'=>'ᬈ','ᬉ'=>'ᬉ','ᬊ'=>'ᬊ','ᬋ'=>'ᬋ','ᬌ'=>'ᬌ','á¬'=>'á¬','ᬎ'=>'ᬎ','á¬'=>'á¬','á¬'=>'á¬','ᬑ'=>'ᬑ','ᬒ'=>'ᬒ','ᬓ'=>'ᬓ','ᬔ'=>'ᬔ','ᬕ'=>'ᬕ','ᬖ'=>'ᬖ','ᬗ'=>'ᬗ','ᬘ'=>'ᬘ','ᬙ'=>'ᬙ','ᬚ'=>'ᬚ','ᬛ'=>'ᬛ','ᬜ'=>'ᬜ','á¬'=>'á¬','ᬞ'=>'ᬞ','ᬟ'=>'ᬟ','ᬠ'=>'ᬠ','ᬡ'=>'ᬡ','ᬢ'=>'ᬢ','ᬣ'=>'ᬣ','ᬤ'=>'ᬤ','ᬥ'=>'ᬥ','ᬦ'=>'ᬦ','ᬧ'=>'ᬧ','ᬨ'=>'ᬨ','ᬩ'=>'ᬩ','ᬪ'=>'ᬪ','ᬫ'=>'ᬫ','ᬬ'=>'ᬬ','ᬭ'=>'ᬭ','ᬮ'=>'ᬮ','ᬯ'=>'ᬯ','ᬰ'=>'ᬰ','ᬱ'=>'ᬱ','ᬲ'=>'ᬲ','ᬳ'=>'ᬳ','᬴'=>'᬴','ᬵ'=>'ᬵ','ᬶ'=>'ᬶ','ᬷ'=>'ᬷ','ᬸ'=>'ᬸ','ᬹ'=>'ᬹ','ᬺ'=>'ᬺ','ᬻ'=>'ᬻ','ᬼ'=>'ᬼ','ᬽ'=>'ᬽ','ᬾ'=>'ᬾ','ᬿ'=>'ᬿ','á­€'=>'á­€','á­'=>'á­','á­‚'=>'á­‚','á­ƒ'=>'á­ƒ','á­„'=>'á­„','á­…'=>'á­…','á­†'=>'á­†','á­‡'=>'á­‡','á­ˆ'=>'á­ˆ','á­‰'=>'á­‰','á­Š'=>'á­Š','á­‹'=>'á­‹','á­'=>'0','á­‘'=>'1','á­’'=>'2','á­“'=>'3','á­”'=>'4','á­•'=>'5','á­–'=>'6','á­—'=>'7','á­˜'=>'8','á­™'=>'9','á­«'=>'á­«','á­¬'=>'á­¬','á­­'=>'á­­','á­®'=>'á­®','á­¯'=>'á­¯','á­°'=>'á­°','á­±'=>'á­±','á­²'=>'á­²','á­³'=>'á­³','á´€'=>'á´€','á´'=>'á´','á´‚'=>'á´‚','á´ƒ'=>'á´ƒ','á´„'=>'á´„','á´…'=>'á´…','á´†'=>'á´†','á´‡'=>'á´‡','á´ˆ'=>'á´ˆ','á´‰'=>'á´‰','á´Š'=>'á´Š','á´‹'=>'á´‹','á´Œ'=>'á´Œ','á´'=>'á´','á´Ž'=>'á´Ž','á´'=>'á´','á´'=>'á´','á´‘'=>'á´‘','á´’'=>'á´’','á´“'=>'á´“','á´”'=>'á´”','á´•'=>'á´•','á´–'=>'á´–','á´—'=>'á´—','á´˜'=>'á´˜','á´™'=>'á´™','á´š'=>'á´š','á´›'=>'á´›','á´œ'=>'á´œ','á´'=>'á´','á´ž'=>'á´ž','á´Ÿ'=>'á´Ÿ','á´ '=>'á´ ','á´¡'=>'á´¡','á´¢'=>'á´¢','á´£'=>'á´£','á´¤'=>'á´¤','á´¥'=>'á´¥','á´¦'=>'á´¦','á´§'=>'á´§','á´¨'=>'á´¨','á´©'=>'á´©','á´ª'=>'á´ª','á´«'=>'á´«','á´¬'=>'á´¬','á´­'=>'á´­','á´®'=>'á´®','á´¯'=>'á´¯','á´°'=>'á´°','á´±'=>'á´±','á´²'=>'á´²','á´³'=>'á´³','á´´'=>'á´´','á´µ'=>'á´µ','á´¶'=>'á´¶','á´·'=>'á´·','á´¸'=>'á´¸','á´¹'=>'á´¹','á´º'=>'á´º','á´»'=>'á´»','á´¼'=>'á´¼','á´½'=>'á´½','á´¾'=>'á´¾','á´¿'=>'á´¿','áµ€'=>'áµ€','áµ'=>'áµ','ᵂ'=>'ᵂ','ᵃ'=>'ᵃ','ᵄ'=>'ᵄ','áµ…'=>'áµ…','ᵆ'=>'ᵆ','ᵇ'=>'ᵇ','ᵈ'=>'ᵈ','ᵉ'=>'ᵉ','ᵊ'=>'ᵊ','ᵋ'=>'ᵋ','ᵌ'=>'ᵌ','áµ'=>'áµ','ᵎ'=>'ᵎ','áµ'=>'áµ','áµ'=>'áµ','ᵑ'=>'ᵑ','áµ’'=>'áµ’','ᵓ'=>'ᵓ','áµ”'=>'áµ”','ᵕ'=>'ᵕ','áµ–'=>'áµ–','áµ—'=>'áµ—','ᵘ'=>'ᵘ','áµ™'=>'áµ™','ᵚ'=>'ᵚ','áµ›'=>'áµ›','ᵜ'=>'ᵜ','áµ'=>'áµ','ᵞ'=>'ᵞ','ᵟ'=>'ᵟ','áµ '=>'áµ ','ᵡ'=>'ᵡ','áµ¢'=>'áµ¢','áµ£'=>'áµ£','ᵤ'=>'ᵤ','áµ¥'=>'áµ¥','ᵦ'=>'ᵦ','áµ§'=>'áµ§','ᵨ'=>'ᵨ','ᵩ'=>'ᵩ','ᵪ'=>'ᵪ','ᵫ'=>'ue','ᵬ'=>'ᵬ','áµ­'=>'áµ­','áµ®'=>'áµ®','ᵯ'=>'ᵯ','áµ°'=>'áµ°','áµ±'=>'áµ±','áµ²'=>'áµ²','áµ³'=>'áµ³','áµ´'=>'áµ´','áµµ'=>'áµµ','áµ¶'=>'áµ¶','áµ·'=>'áµ·','ᵸ'=>'ᵸ','áµ¹'=>'áµ¹','ᵺ'=>'ᵺ','áµ»'=>'áµ»','áµ¼'=>'áµ¼','áµ½'=>'áµ½','áµ¾'=>'áµ¾','ᵿ'=>'ᵿ','á¶€'=>'á¶€','á¶'=>'á¶','á¶‚'=>'á¶‚','ᶃ'=>'ᶃ','á¶„'=>'á¶„','á¶…'=>'á¶…','ᶆ'=>'ᶆ','ᶇ'=>'ᶇ','ᶈ'=>'ᶈ','ᶉ'=>'ᶉ','á¶Š'=>'á¶Š','á¶‹'=>'á¶‹','á¶Œ'=>'á¶Œ','á¶'=>'á¶','á¶Ž'=>'á¶Ž','á¶'=>'á¶','á¶'=>'á¶','á¶‘'=>'á¶‘','á¶’'=>'á¶’','á¶“'=>'á¶“','á¶”'=>'á¶”','á¶•'=>'á¶•','á¶–'=>'á¶–','á¶—'=>'á¶—','ᶘ'=>'ᶘ','á¶™'=>'á¶™','á¶š'=>'á¶š','á¶›'=>'á¶›','á¶œ'=>'á¶œ','á¶'=>'á¶','á¶ž'=>'á¶ž','á¶Ÿ'=>'á¶Ÿ','á¶ '=>'á¶ ','á¶¡'=>'á¶¡','á¶¢'=>'á¶¢','á¶£'=>'á¶£','ᶤ'=>'ᶤ','á¶¥'=>'á¶¥','ᶦ'=>'ᶦ','á¶§'=>'á¶§','ᶨ'=>'ᶨ','á¶©'=>'á¶©','ᶪ'=>'ᶪ','á¶«'=>'á¶«','ᶬ'=>'ᶬ','á¶­'=>'á¶­','á¶®'=>'á¶®','ᶯ'=>'ᶯ','á¶°'=>'á¶°','á¶±'=>'á¶±','á¶²'=>'á¶²','á¶³'=>'á¶³','á¶´'=>'á¶´','á¶µ'=>'á¶µ','á¶¶'=>'á¶¶','á¶·'=>'á¶·','ᶸ'=>'ᶸ','á¶¹'=>'á¶¹','ᶺ'=>'ᶺ','á¶»'=>'á¶»','á¶¼'=>'á¶¼','á¶½'=>'á¶½','á¶¾'=>'á¶¾','á¶¿'=>'á¶¿','á·€'=>'á·€','á·'=>'á·','á·‚'=>'á·‚','á·ƒ'=>'á·ƒ','á·„'=>'á·„','á·…'=>'á·…','á·†'=>'á·†','á·‡'=>'á·‡','á·ˆ'=>'á·ˆ','á·‰'=>'á·‰','á·Š'=>'á·Š','á·¾'=>'á·¾','á·¿'=>'á·¿','Ḁ'=>'á¸','á¸'=>'á¸','Ḃ'=>'ḃ','ḃ'=>'ḃ','Ḅ'=>'ḅ','ḅ'=>'ḅ','Ḇ'=>'ḇ','ḇ'=>'ḇ','Ḉ'=>'ḉ','ḉ'=>'ḉ','Ḋ'=>'ḋ','ḋ'=>'ḋ','Ḍ'=>'á¸','á¸'=>'á¸','Ḏ'=>'á¸','á¸'=>'á¸','á¸'=>'ḑ','ḑ'=>'ḑ','Ḓ'=>'ḓ','ḓ'=>'ḓ','Ḕ'=>'ḕ','ḕ'=>'ḕ','Ḗ'=>'ḗ','ḗ'=>'ḗ','Ḙ'=>'ḙ','ḙ'=>'ḙ','Ḛ'=>'ḛ','ḛ'=>'ḛ','Ḝ'=>'á¸','á¸'=>'á¸','Ḟ'=>'ḟ','ḟ'=>'ḟ','Ḡ'=>'ḡ','ḡ'=>'ḡ','Ḣ'=>'ḣ','ḣ'=>'ḣ','Ḥ'=>'ḥ','ḥ'=>'ḥ','Ḧ'=>'ḧ','ḧ'=>'ḧ','Ḩ'=>'ḩ','ḩ'=>'ḩ','Ḫ'=>'ḫ','ḫ'=>'ḫ','Ḭ'=>'ḭ','ḭ'=>'ḭ','Ḯ'=>'ḯ','ḯ'=>'ḯ','Ḱ'=>'ḱ','ḱ'=>'ḱ','Ḳ'=>'ḳ','ḳ'=>'ḳ','Ḵ'=>'ḵ','ḵ'=>'ḵ','Ḷ'=>'ḷ','ḷ'=>'ḷ','Ḹ'=>'ḹ','ḹ'=>'ḹ','Ḻ'=>'ḻ','ḻ'=>'ḻ','Ḽ'=>'ḽ','ḽ'=>'ḽ','Ḿ'=>'ḿ','ḿ'=>'ḿ','á¹€'=>'á¹','á¹'=>'á¹','Ṃ'=>'ṃ','ṃ'=>'ṃ','Ṅ'=>'á¹…','á¹…'=>'á¹…','Ṇ'=>'ṇ','ṇ'=>'ṇ','Ṉ'=>'ṉ','ṉ'=>'ṉ','Ṋ'=>'ṋ','ṋ'=>'ṋ','Ṍ'=>'á¹','á¹'=>'á¹','Ṏ'=>'á¹','á¹'=>'á¹','á¹'=>'ṑ','ṑ'=>'ṑ','á¹’'=>'ṓ','ṓ'=>'ṓ','á¹”'=>'ṕ','ṕ'=>'ṕ','á¹–'=>'á¹—','á¹—'=>'á¹—','Ṙ'=>'á¹™','á¹™'=>'á¹™','Ṛ'=>'á¹›','á¹›'=>'á¹›','Ṝ'=>'á¹','á¹'=>'á¹','Ṟ'=>'ṟ','ṟ'=>'ṟ','á¹ '=>'ṡ','ṡ'=>'ṡ','á¹¢'=>'á¹£','á¹£'=>'á¹£','Ṥ'=>'á¹¥','á¹¥'=>'á¹¥','Ṧ'=>'á¹§','á¹§'=>'á¹§','Ṩ'=>'ṩ','ṩ'=>'ṩ','Ṫ'=>'ṫ','ṫ'=>'ṫ','Ṭ'=>'á¹­','á¹­'=>'á¹­','á¹®'=>'ṯ','ṯ'=>'ṯ','á¹°'=>'á¹±','á¹±'=>'á¹±','á¹²'=>'á¹³','á¹³'=>'á¹³','á¹´'=>'á¹µ','á¹µ'=>'á¹µ','á¹¶'=>'á¹·','á¹·'=>'á¹·','Ṹ'=>'á¹¹','á¹¹'=>'á¹¹','Ṻ'=>'á¹»','á¹»'=>'á¹»','á¹¼'=>'á¹½','á¹½'=>'á¹½','á¹¾'=>'ṿ','ṿ'=>'ṿ','Ẁ'=>'áº','áº'=>'áº','Ẃ'=>'ẃ','ẃ'=>'ẃ','Ẅ'=>'ẅ','ẅ'=>'ẅ','Ẇ'=>'ẇ','ẇ'=>'ẇ','Ẉ'=>'ẉ','ẉ'=>'ẉ','Ẋ'=>'ẋ','ẋ'=>'ẋ','Ẍ'=>'áº','áº'=>'áº','Ẏ'=>'áº','áº'=>'áº','áº'=>'ẑ','ẑ'=>'ẑ','Ẓ'=>'ẓ','ẓ'=>'ẓ','Ẕ'=>'ẕ','ẕ'=>'ẕ','ẖ'=>'ẖ','ẗ'=>'ẗ','ẘ'=>'ẘ','ẙ'=>'ẙ','ẚ'=>'ẚ','ẛ'=>'ẛ','Ạ'=>'ạ','ạ'=>'ạ','Ả'=>'ả','ả'=>'ả','Ấ'=>'ấ','ấ'=>'ấ','Ầ'=>'ầ','ầ'=>'ầ','Ẩ'=>'ẩ','ẩ'=>'ẩ','Ẫ'=>'ẫ','ẫ'=>'ẫ','Ậ'=>'ậ','ậ'=>'ậ','Ắ'=>'ắ','ắ'=>'ắ','Ằ'=>'ằ','ằ'=>'ằ','Ẳ'=>'ẳ','ẳ'=>'ẳ','Ẵ'=>'ẵ','ẵ'=>'ẵ','Ặ'=>'ặ','ặ'=>'ặ','Ẹ'=>'ẹ','ẹ'=>'ẹ','Ẻ'=>'ẻ','ẻ'=>'ẻ','Ẽ'=>'ẽ','ẽ'=>'ẽ','Ế'=>'ế','ế'=>'ế','Ề'=>'á»','á»'=>'á»','Ể'=>'ể','ể'=>'ể','Ễ'=>'á»…','á»…'=>'á»…','Ệ'=>'ệ','ệ'=>'ệ','Ỉ'=>'ỉ','ỉ'=>'ỉ','Ị'=>'ị','ị'=>'ị','Ọ'=>'á»','á»'=>'á»','Ỏ'=>'á»','á»'=>'á»','á»'=>'ố','ố'=>'ố','á»’'=>'ồ','ồ'=>'ồ','á»”'=>'ổ','ổ'=>'ổ','á»–'=>'á»—','á»—'=>'á»—','Ộ'=>'á»™','á»™'=>'á»™','Ớ'=>'á»›','á»›'=>'á»›','Ờ'=>'á»','á»'=>'á»','Ở'=>'ở','ở'=>'ở','á» '=>'ỡ','ỡ'=>'ỡ','Ợ'=>'ợ','ợ'=>'ợ','Ụ'=>'ụ','ụ'=>'ụ','Ủ'=>'á»§','á»§'=>'á»§','Ứ'=>'ứ','ứ'=>'ứ','Ừ'=>'ừ','ừ'=>'ừ','Ử'=>'á»­','á»­'=>'á»­','á»®'=>'ữ','ữ'=>'ữ','á»°'=>'á»±','á»±'=>'á»±','Ỳ'=>'ỳ','ỳ'=>'ỳ','á»´'=>'ỵ','ỵ'=>'ỵ','á»¶'=>'á»·','á»·'=>'á»·','Ỹ'=>'ỹ','ỹ'=>'ỹ','á¼€'=>'á¼€','á¼'=>'á¼','ἂ'=>'ἂ','ἃ'=>'ἃ','ἄ'=>'ἄ','á¼…'=>'á¼…','ἆ'=>'ἆ','ἇ'=>'ἇ','Ἀ'=>'á¼€','Ἁ'=>'á¼','Ἂ'=>'ἂ','Ἃ'=>'ἃ','Ἄ'=>'ἄ','á¼'=>'á¼…','Ἆ'=>'ἆ','á¼'=>'ἇ','á¼'=>'á¼','ἑ'=>'ἑ','á¼’'=>'á¼’','ἓ'=>'ἓ','á¼”'=>'á¼”','ἕ'=>'ἕ','Ἐ'=>'á¼','á¼™'=>'ἑ','Ἒ'=>'á¼’','á¼›'=>'ἓ','Ἔ'=>'á¼”','á¼'=>'ἕ','á¼ '=>'á¼ ','ἡ'=>'ἡ','á¼¢'=>'á¼¢','á¼£'=>'á¼£','ἤ'=>'ἤ','á¼¥'=>'á¼¥','ἦ'=>'ἦ','á¼§'=>'á¼§','Ἠ'=>'á¼ ','Ἡ'=>'ἡ','Ἢ'=>'á¼¢','Ἣ'=>'á¼£','Ἤ'=>'ἤ','á¼­'=>'á¼¥','á¼®'=>'ἦ','Ἧ'=>'á¼§','á¼°'=>'á¼°','á¼±'=>'á¼±','á¼²'=>'á¼²','á¼³'=>'á¼³','á¼´'=>'á¼´','á¼µ'=>'á¼µ','á¼¶'=>'á¼¶','á¼·'=>'á¼·','Ἰ'=>'á¼°','á¼¹'=>'á¼±','Ἲ'=>'á¼²','á¼»'=>'á¼³','á¼¼'=>'á¼´','á¼½'=>'á¼µ','á¼¾'=>'á¼¶','Ἷ'=>'á¼·','á½€'=>'á½€','á½'=>'á½','ὂ'=>'ὂ','ὃ'=>'ὃ','ὄ'=>'ὄ','á½…'=>'á½…','Ὀ'=>'á½€','Ὁ'=>'á½','Ὂ'=>'ὂ','Ὃ'=>'ὃ','Ὄ'=>'ὄ','á½'=>'á½…','á½'=>'á½','ὑ'=>'ὑ','á½’'=>'á½’','ὓ'=>'ὓ','á½”'=>'á½”','ὕ'=>'ὕ','á½–'=>'á½–','á½—'=>'á½—','á½™'=>'ὑ','á½›'=>'ὓ','á½'=>'ὕ','Ὗ'=>'á½—','á½ '=>'á½ ','ὡ'=>'ὡ','á½¢'=>'á½¢','á½£'=>'á½£','ὤ'=>'ὤ','á½¥'=>'á½¥','ὦ'=>'ὦ','á½§'=>'á½§','Ὠ'=>'á½ ','Ὡ'=>'ὡ','Ὢ'=>'á½¢','Ὣ'=>'á½£','Ὤ'=>'ὤ','á½­'=>'á½¥','á½®'=>'ὦ','Ὧ'=>'á½§','á½°'=>'á½°','á½±'=>'á½±','á½²'=>'á½²','á½³'=>'á½³','á½´'=>'á½´','á½µ'=>'á½µ','á½¶'=>'á½¶','á½·'=>'á½·','ὸ'=>'ὸ','á½¹'=>'á½¹','ὺ'=>'ὺ','á½»'=>'á½»','á½¼'=>'á½¼','á½½'=>'á½½','á¾€'=>'á¾€','á¾'=>'á¾','ᾂ'=>'ᾂ','ᾃ'=>'ᾃ','ᾄ'=>'ᾄ','á¾…'=>'á¾…','ᾆ'=>'ᾆ','ᾇ'=>'ᾇ','ᾈ'=>'á¾€','ᾉ'=>'á¾','ᾊ'=>'ᾂ','ᾋ'=>'ᾃ','ᾌ'=>'ᾄ','á¾'=>'á¾…','ᾎ'=>'ᾆ','á¾'=>'ᾇ','á¾'=>'á¾','ᾑ'=>'ᾑ','á¾’'=>'á¾’','ᾓ'=>'ᾓ','á¾”'=>'á¾”','ᾕ'=>'ᾕ','á¾–'=>'á¾–','á¾—'=>'á¾—','ᾘ'=>'á¾','á¾™'=>'ᾑ','ᾚ'=>'á¾’','á¾›'=>'ᾓ','ᾜ'=>'á¾”','á¾'=>'ᾕ','ᾞ'=>'á¾–','ᾟ'=>'á¾—','á¾ '=>'á¾ ','ᾡ'=>'ᾡ','á¾¢'=>'á¾¢','á¾£'=>'á¾£','ᾤ'=>'ᾤ','á¾¥'=>'á¾¥','ᾦ'=>'ᾦ','á¾§'=>'á¾§','ᾨ'=>'á¾ ','ᾩ'=>'ᾡ','ᾪ'=>'á¾¢','ᾫ'=>'á¾£','ᾬ'=>'ᾤ','á¾­'=>'á¾¥','á¾®'=>'ᾦ','ᾯ'=>'á¾§','á¾°'=>'á¾°','á¾±'=>'á¾±','á¾²'=>'á¾²','á¾³'=>'á¾³','á¾´'=>'á¾´','á¾¶'=>'á¾¶','á¾·'=>'á¾·','Ᾰ'=>'á¾°','á¾¹'=>'á¾±','Ὰ'=>'á½°','á¾»'=>'á½±','á¾¼'=>'á¾³','á¾¾'=>'á¾¾','á¿‚'=>'á¿‚','ῃ'=>'ῃ','á¿„'=>'á¿„','ῆ'=>'ῆ','ῇ'=>'ῇ','Ὲ'=>'á½²','Έ'=>'á½³','Ὴ'=>'á½´','á¿‹'=>'á½µ','ῌ'=>'ῃ','á¿'=>'á¿','á¿‘'=>'á¿‘','á¿’'=>'á¿’','á¿“'=>'á¿“','á¿–'=>'á¿–','á¿—'=>'á¿—','Ῐ'=>'á¿','á¿™'=>'á¿‘','Ὶ'=>'á½¶','á¿›'=>'á½·','á¿ '=>'á¿ ','á¿¡'=>'á¿¡','á¿¢'=>'á¿¢','á¿£'=>'á¿£','ῤ'=>'ῤ','á¿¥'=>'á¿¥','ῦ'=>'ῦ','á¿§'=>'á¿§','Ῠ'=>'á¿ ','á¿©'=>'á¿¡','Ὺ'=>'ὺ','á¿«'=>'á½»','Ῥ'=>'á¿¥','ῲ'=>'ῲ','ῳ'=>'ῳ','á¿´'=>'á¿´','á¿¶'=>'á¿¶','á¿·'=>'á¿·','Ὸ'=>'ὸ','Ό'=>'á½¹','Ὼ'=>'á½¼','á¿»'=>'á½½','ῼ'=>'ῳ'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_31.php b/phpBB/includes/utf/data/search_indexer_31.php deleted file mode 100644 index 191365a313..0000000000 --- a/phpBB/includes/utf/data/search_indexer_31.php +++ /dev/null @@ -1 +0,0 @@ -'豈','ï¤'=>'ï¤','車'=>'車','賈'=>'賈','滑'=>'滑','串'=>'串','句'=>'句','龜'=>'龜','龜'=>'龜','契'=>'契','金'=>'金','喇'=>'喇','奈'=>'奈','ï¤'=>'ï¤','癩'=>'癩','ï¤'=>'ï¤','ï¤'=>'ï¤','螺'=>'螺','裸'=>'裸','邏'=>'邏','樂'=>'樂','洛'=>'洛','烙'=>'烙','珞'=>'珞','落'=>'落','酪'=>'酪','駱'=>'駱','亂'=>'亂','卵'=>'卵','ï¤'=>'ï¤','爛'=>'爛','蘭'=>'蘭','鸞'=>'鸞','嵐'=>'嵐','濫'=>'濫','藍'=>'藍','襤'=>'襤','拉'=>'拉','臘'=>'臘','蠟'=>'蠟','廊'=>'廊','朗'=>'朗','浪'=>'浪','狼'=>'狼','郎'=>'郎','來'=>'來','冷'=>'冷','勞'=>'勞','擄'=>'擄','櫓'=>'櫓','爐'=>'爐','盧'=>'盧','老'=>'老','蘆'=>'蘆','虜'=>'虜','路'=>'路','露'=>'露','魯'=>'魯','鷺'=>'鷺','碌'=>'碌','祿'=>'祿','綠'=>'綠','菉'=>'菉','錄'=>'錄','鹿'=>'鹿','ï¥'=>'ï¥','壟'=>'壟','弄'=>'弄','籠'=>'籠','聾'=>'聾','牢'=>'牢','磊'=>'磊','賂'=>'賂','雷'=>'雷','壘'=>'壘','屢'=>'屢','樓'=>'樓','ï¥'=>'ï¥','漏'=>'漏','ï¥'=>'ï¥','ï¥'=>'ï¥','陋'=>'陋','勒'=>'勒','肋'=>'肋','凜'=>'凜','凌'=>'凌','稜'=>'稜','綾'=>'綾','菱'=>'菱','陵'=>'陵','讀'=>'讀','拏'=>'拏','樂'=>'樂','ï¥'=>'ï¥','丹'=>'丹','寧'=>'寧','怒'=>'怒','率'=>'率','異'=>'異','北'=>'北','磻'=>'磻','便'=>'便','復'=>'復','不'=>'不','泌'=>'泌','數'=>'數','索'=>'索','參'=>'參','塞'=>'塞','省'=>'省','葉'=>'葉','說'=>'說','殺'=>'殺','辰'=>'辰','沈'=>'沈','拾'=>'拾','若'=>'若','掠'=>'掠','略'=>'略','亮'=>'亮','兩'=>'兩','凉'=>'凉','梁'=>'梁','糧'=>'糧','良'=>'良','諒'=>'諒','量'=>'量','勵'=>'勵','呂'=>'呂','ï¦'=>'ï¦','廬'=>'廬','旅'=>'旅','濾'=>'濾','礪'=>'礪','閭'=>'閭','驪'=>'驪','麗'=>'麗','黎'=>'黎','力'=>'力','曆'=>'曆','歷'=>'歷','ï¦'=>'ï¦','年'=>'年','ï¦'=>'ï¦','ï¦'=>'ï¦','撚'=>'撚','漣'=>'漣','煉'=>'煉','璉'=>'璉','秊'=>'秊','練'=>'練','聯'=>'聯','輦'=>'輦','蓮'=>'蓮','連'=>'連','鍊'=>'鍊','列'=>'列','ï¦'=>'ï¦','咽'=>'咽','烈'=>'烈','裂'=>'裂','說'=>'說','廉'=>'廉','念'=>'念','捻'=>'捻','殮'=>'殮','簾'=>'簾','獵'=>'獵','令'=>'令','囹'=>'囹','寧'=>'寧','嶺'=>'嶺','怜'=>'怜','玲'=>'玲','瑩'=>'瑩','羚'=>'羚','聆'=>'聆','鈴'=>'鈴','零'=>'零','靈'=>'靈','領'=>'領','例'=>'例','禮'=>'禮','醴'=>'醴','隸'=>'隸','惡'=>'惡','了'=>'了','僚'=>'僚','寮'=>'寮','尿'=>'尿','料'=>'料','樂'=>'樂','ï§€'=>'ï§€','ï§'=>'ï§','ï§‚'=>'ï§‚','遼'=>'遼','ï§„'=>'ï§„','ï§…'=>'ï§…','阮'=>'阮','劉'=>'劉','杻'=>'杻','柳'=>'柳','ï§Š'=>'ï§Š','ï§‹'=>'ï§‹','ï§Œ'=>'ï§Œ','ï§'=>'ï§','ï§Ž'=>'ï§Ž','ï§'=>'ï§','ï§'=>'ï§','ï§‘'=>'ï§‘','ï§’'=>'ï§’','ï§“'=>'ï§“','ï§”'=>'ï§”','ï§•'=>'ï§•','ï§–'=>'ï§–','ï§—'=>'ï§—','律'=>'律','ï§™'=>'ï§™','ï§š'=>'ï§š','ï§›'=>'ï§›','ï§œ'=>'ï§œ','ï§'=>'ï§','ï§ž'=>'ï§ž','ï§Ÿ'=>'ï§Ÿ','ï§ '=>'ï§ ','ï§¡'=>'ï§¡','ï§¢'=>'ï§¢','ï§£'=>'ï§£','理'=>'理','ï§¥'=>'ï§¥','罹'=>'罹','ï§§'=>'ï§§','裡'=>'裡','ï§©'=>'ï§©','離'=>'離','ï§«'=>'ï§«','溺'=>'溺','ï§­'=>'ï§­','ï§®'=>'ï§®','璘'=>'璘','ï§°'=>'ï§°','ï§±'=>'ï§±','ï§²'=>'ï§²','ï§³'=>'ï§³','ï§´'=>'ï§´','ï§µ'=>'ï§µ','ï§¶'=>'ï§¶','ï§·'=>'ï§·','笠'=>'笠','ï§¹'=>'ï§¹','狀'=>'狀','ï§»'=>'ï§»','ï§¼'=>'ï§¼','ï§½'=>'ï§½','ï§¾'=>'ï§¾','ï§¿'=>'ï§¿','切'=>'切','ï¨'=>'ï¨','拓'=>'拓','糖'=>'糖','宅'=>'宅','洞'=>'洞','暴'=>'暴','輻'=>'輻','行'=>'行','降'=>'降','見'=>'見','廓'=>'廓','兀'=>'兀','ï¨'=>'ï¨','﨎'=>'﨎','ï¨'=>'ï¨','ï¨'=>'ï¨','﨑'=>'﨑','晴'=>'晴','﨓'=>'﨓','﨔'=>'﨔','凞'=>'凞','猪'=>'猪','益'=>'益','礼'=>'礼','神'=>'神','祥'=>'祥','福'=>'福','靖'=>'靖','ï¨'=>'ï¨','羽'=>'羽','﨟'=>'﨟','蘒'=>'蘒','﨡'=>'﨡','諸'=>'諸','﨣'=>'﨣','﨤'=>'﨤','逸'=>'逸','都'=>'都','﨧'=>'﨧','﨨'=>'﨨','﨩'=>'﨩','飯'=>'飯','飼'=>'飼','館'=>'館','鶴'=>'鶴','侮'=>'侮','僧'=>'僧','免'=>'免','勉'=>'勉','勤'=>'勤','卑'=>'卑','喝'=>'喝','嘆'=>'嘆','器'=>'器','塀'=>'塀','墨'=>'墨','層'=>'層','屮'=>'屮','悔'=>'悔','慨'=>'慨','憎'=>'憎','ï©€'=>'ï©€','ï©'=>'ï©','ï©‚'=>'ï©‚','暑'=>'暑','ï©„'=>'ï©„','ï©…'=>'ï©…','渚'=>'渚','漢'=>'漢','煮'=>'煮','爫'=>'爫','琢'=>'琢','ï©‹'=>'ï©‹','社'=>'社','ï©'=>'ï©','祈'=>'祈','ï©'=>'ï©','ï©'=>'ï©','ï©‘'=>'ï©‘','ï©’'=>'ï©’','ï©“'=>'ï©“','ï©”'=>'ï©”','ï©•'=>'ï©•','ï©–'=>'ï©–','ï©—'=>'ï©—','縉'=>'縉','ï©™'=>'ï©™','署'=>'署','ï©›'=>'ï©›','臭'=>'臭','ï©'=>'ï©','艹'=>'艹','著'=>'著','ï© '=>'ï© ','ï©¡'=>'ï©¡','ï©¢'=>'ï©¢','ï©£'=>'ï©£','賓'=>'賓','ï©¥'=>'ï©¥','辶'=>'辶','ï©§'=>'ï©§','難'=>'難','ï©©'=>'ï©©','頻'=>'頻','ï©°'=>'ï©°','况'=>'况','全'=>'全','侀'=>'侀','ï©´'=>'ï©´','冀'=>'冀','ï©¶'=>'ï©¶','ï©·'=>'ï©·','喝'=>'喝','啕'=>'啕','喙'=>'喙','ï©»'=>'ï©»','塚'=>'塚','墳'=>'墳','奄'=>'奄','ï©¿'=>'ï©¿','婢'=>'婢','ïª'=>'ïª','廒'=>'廒','廙'=>'廙','彩'=>'彩','徭'=>'徭','惘'=>'惘','慎'=>'慎','愈'=>'愈','憎'=>'憎','慠'=>'慠','懲'=>'懲','戴'=>'戴','ïª'=>'ïª','搜'=>'搜','ïª'=>'ïª','ïª'=>'ïª','晴'=>'晴','朗'=>'朗','望'=>'望','杖'=>'杖','歹'=>'歹','殺'=>'殺','流'=>'流','滛'=>'滛','滋'=>'滋','漢'=>'漢','瀞'=>'瀞','煮'=>'煮','ïª'=>'ïª','爵'=>'爵','犯'=>'犯','猪'=>'猪','瑱'=>'瑱','甆'=>'甆','画'=>'画','瘝'=>'瘝','瘟'=>'瘟','益'=>'益','盛'=>'盛','直'=>'直','睊'=>'睊','着'=>'着','磌'=>'磌','窱'=>'窱','節'=>'節','类'=>'类','絛'=>'絛','練'=>'練','缾'=>'缾','者'=>'者','荒'=>'荒','華'=>'華','蝹'=>'蝹','襁'=>'襁','覆'=>'覆','視'=>'視','調'=>'調','諸'=>'諸','請'=>'請','謁'=>'謁','諾'=>'諾','諭'=>'諭','謹'=>'謹','ï«€'=>'ï«€','ï«'=>'ï«','ï«‚'=>'ï«‚','遲'=>'遲','ï«„'=>'ï«„','ï«…'=>'ï«…','陼'=>'陼','難'=>'難','靖'=>'靖','韛'=>'韛','響'=>'響','ï«‹'=>'ï«‹','頻'=>'頻','ï«'=>'ï«','龜'=>'龜','ï«'=>'ï«','ï«'=>'ï«','ï«‘'=>'ï«‘','ï«’'=>'ï«’','ï«“'=>'ï«“','ï«”'=>'ï«”','ï«•'=>'ï«•','ï«–'=>'ï«–','ï«—'=>'ï«—','齃'=>'齃','ï«™'=>'ï«™','ff'=>'ff','ï¬'=>'fi','fl'=>'fl','ffi'=>'ffi','ffl'=>'ffl','ſt'=>'ſt','st'=>'st','ﬓ'=>'ﬓ','ﬔ'=>'ﬔ','ﬕ'=>'ﬕ','ﬖ'=>'ﬖ','ﬗ'=>'ﬗ','ï¬'=>'ï¬','ﬞ'=>'ﬞ','ײַ'=>'ײַ','ﬠ'=>'ﬠ','ﬡ'=>'ﬡ','ﬢ'=>'ﬢ','ﬣ'=>'ﬣ','ﬤ'=>'ﬤ','ﬥ'=>'ﬥ','ﬦ'=>'ﬦ','ﬧ'=>'ﬧ','ﬨ'=>'ﬨ','שׁ'=>'שׁ','שׂ'=>'שׂ','שּׁ'=>'שּׁ','שּׂ'=>'שּׂ','אַ'=>'אַ','אָ'=>'אָ','אּ'=>'אּ','בּ'=>'בּ','גּ'=>'גּ','דּ'=>'דּ','הּ'=>'הּ','וּ'=>'וּ','זּ'=>'זּ','טּ'=>'טּ','יּ'=>'יּ','ךּ'=>'ךּ','כּ'=>'כּ','לּ'=>'לּ','מּ'=>'מּ','ï­€'=>'ï­€','ï­'=>'ï­','ï­ƒ'=>'ï­ƒ','ï­„'=>'ï­„','ï­†'=>'ï­†','ï­‡'=>'ï­‡','ï­ˆ'=>'ï­ˆ','ï­‰'=>'ï­‰','ï­Š'=>'ï­Š','ï­‹'=>'ï­‹','ï­Œ'=>'ï­Œ','ï­'=>'ï­','ï­Ž'=>'ï­Ž','ï­'=>'ï­','ï­'=>'ï­','ï­‘'=>'ï­‘','ï­’'=>'ï­’','ï­“'=>'ï­“','ï­”'=>'ï­”','ï­•'=>'ï­•','ï­–'=>'ï­–','ï­—'=>'ï­—','ï­˜'=>'ï­˜','ï­™'=>'ï­™','ï­š'=>'ï­š','ï­›'=>'ï­›','ï­œ'=>'ï­œ','ï­'=>'ï­','ï­ž'=>'ï­ž','ï­Ÿ'=>'ï­Ÿ','ï­ '=>'ï­ ','ï­¡'=>'ï­¡','ï­¢'=>'ï­¢','ï­£'=>'ï­£','ï­¤'=>'ï­¤','ï­¥'=>'ï­¥','ï­¦'=>'ï­¦','ï­§'=>'ï­§','ï­¨'=>'ï­¨','ï­©'=>'ï­©','ï­ª'=>'ï­ª','ï­«'=>'ï­«','ï­¬'=>'ï­¬','ï­­'=>'ï­­','ï­®'=>'ï­®','ï­¯'=>'ï­¯','ï­°'=>'ï­°','ï­±'=>'ï­±','ï­²'=>'ï­²','ï­³'=>'ï­³','ï­´'=>'ï­´','ï­µ'=>'ï­µ','ï­¶'=>'ï­¶','ï­·'=>'ï­·','ï­¸'=>'ï­¸','ï­¹'=>'ï­¹','ï­º'=>'ï­º','ï­»'=>'ï­»','ï­¼'=>'ï­¼','ï­½'=>'ï­½','ï­¾'=>'ï­¾','ï­¿'=>'ï­¿','ﮀ'=>'ﮀ','ï®'=>'ï®','ﮂ'=>'ﮂ','ﮃ'=>'ﮃ','ﮄ'=>'ﮄ','ï®…'=>'ï®…','ﮆ'=>'ﮆ','ﮇ'=>'ﮇ','ﮈ'=>'ﮈ','ﮉ'=>'ﮉ','ﮊ'=>'ﮊ','ﮋ'=>'ﮋ','ﮌ'=>'ﮌ','ï®'=>'ï®','ﮎ'=>'ﮎ','ï®'=>'ï®','ï®'=>'ï®','ﮑ'=>'ﮑ','ï®’'=>'ï®’','ﮓ'=>'ﮓ','ï®”'=>'ï®”','ﮕ'=>'ﮕ','ï®–'=>'ï®–','ï®—'=>'ï®—','ﮘ'=>'ﮘ','ï®™'=>'ï®™','ﮚ'=>'ﮚ','ï®›'=>'ï®›','ﮜ'=>'ﮜ','ï®'=>'ï®','ﮞ'=>'ﮞ','ﮟ'=>'ﮟ','ï® '=>'ï® ','ﮡ'=>'ﮡ','ﮢ'=>'ﮢ','ﮣ'=>'ﮣ','ﮤ'=>'ﮤ','ﮥ'=>'ﮥ','ﮦ'=>'ﮦ','ï®§'=>'ï®§','ﮨ'=>'ﮨ','ﮩ'=>'ﮩ','ﮪ'=>'ﮪ','ﮫ'=>'ﮫ','ﮬ'=>'ﮬ','ï®­'=>'ï®­','ï®®'=>'ï®®','ﮯ'=>'ﮯ','ï®°'=>'ï®°','ï®±'=>'ï®±','ﯓ'=>'ﯓ','ﯔ'=>'ﯔ','ﯕ'=>'ﯕ','ﯖ'=>'ﯖ','ﯗ'=>'ﯗ','ﯘ'=>'ﯘ','ﯙ'=>'ﯙ','ﯚ'=>'ﯚ','ﯛ'=>'ﯛ','ﯜ'=>'ﯜ','ï¯'=>'ï¯','ﯞ'=>'ﯞ','ﯟ'=>'ﯟ','ﯠ'=>'ﯠ','ﯡ'=>'ﯡ','ﯢ'=>'ﯢ','ﯣ'=>'ﯣ','ﯤ'=>'ﯤ','ﯥ'=>'ﯥ','ﯦ'=>'ﯦ','ﯧ'=>'ﯧ','ﯨ'=>'ﯨ','ﯩ'=>'ﯩ','ﯪ'=>'ﯪ','ﯫ'=>'ﯫ','ﯬ'=>'ﯬ','ﯭ'=>'ﯭ','ﯮ'=>'ﯮ','ﯯ'=>'ﯯ','ﯰ'=>'ﯰ','ﯱ'=>'ﯱ','ﯲ'=>'ﯲ','ﯳ'=>'ﯳ','ﯴ'=>'ﯴ','ﯵ'=>'ﯵ','ﯶ'=>'ﯶ','ﯷ'=>'ﯷ','ﯸ'=>'ﯸ','ﯹ'=>'ﯹ','ﯺ'=>'ﯺ','ﯻ'=>'ﯻ','ﯼ'=>'ﯼ','ﯽ'=>'ﯽ','ﯾ'=>'ﯾ','ﯿ'=>'ﯿ','ï°€'=>'ï°€','ï°'=>'ï°','ï°‚'=>'ï°‚','ï°ƒ'=>'ï°ƒ','ï°„'=>'ï°„','ï°…'=>'ï°…','ï°†'=>'ï°†','ï°‡'=>'ï°‡','ï°ˆ'=>'ï°ˆ','ï°‰'=>'ï°‰','ï°Š'=>'ï°Š','ï°‹'=>'ï°‹','ï°Œ'=>'ï°Œ','ï°'=>'ï°','ï°Ž'=>'ï°Ž','ï°'=>'ï°','ï°'=>'ï°','ï°‘'=>'ï°‘','ï°’'=>'ï°’','ï°“'=>'ï°“','ï°”'=>'ï°”','ï°•'=>'ï°•','ï°–'=>'ï°–','ï°—'=>'ï°—','ï°˜'=>'ï°˜','ï°™'=>'ï°™','ï°š'=>'ï°š','ï°›'=>'ï°›','ï°œ'=>'ï°œ','ï°'=>'ï°','ï°ž'=>'ï°ž','ï°Ÿ'=>'ï°Ÿ','ï° '=>'ï° ','ï°¡'=>'ï°¡','ï°¢'=>'ï°¢','ï°£'=>'ï°£','ï°¤'=>'ï°¤','ï°¥'=>'ï°¥','ï°¦'=>'ï°¦','ï°§'=>'ï°§','ï°¨'=>'ï°¨','ï°©'=>'ï°©','ï°ª'=>'ï°ª','ï°«'=>'ï°«','ï°¬'=>'ï°¬','ï°­'=>'ï°­','ï°®'=>'ï°®','ï°¯'=>'ï°¯','ï°°'=>'ï°°','ï°±'=>'ï°±','ï°²'=>'ï°²','ï°³'=>'ï°³','ï°´'=>'ï°´','ï°µ'=>'ï°µ','ï°¶'=>'ï°¶','ï°·'=>'ï°·','ï°¸'=>'ï°¸','ï°¹'=>'ï°¹','ï°º'=>'ï°º','ï°»'=>'ï°»','ï°¼'=>'ï°¼','ï°½'=>'ï°½','ï°¾'=>'ï°¾','ï°¿'=>'ï°¿','ï±€'=>'ï±€','ï±'=>'ï±','ﱂ'=>'ﱂ','ﱃ'=>'ﱃ','ﱄ'=>'ﱄ','ï±…'=>'ï±…','ﱆ'=>'ﱆ','ﱇ'=>'ﱇ','ﱈ'=>'ﱈ','ﱉ'=>'ﱉ','ﱊ'=>'ﱊ','ﱋ'=>'ﱋ','ﱌ'=>'ﱌ','ï±'=>'ï±','ﱎ'=>'ﱎ','ï±'=>'ï±','ï±'=>'ï±','ﱑ'=>'ﱑ','ï±’'=>'ï±’','ﱓ'=>'ﱓ','ï±”'=>'ï±”','ﱕ'=>'ﱕ','ï±–'=>'ï±–','ï±—'=>'ï±—','ﱘ'=>'ﱘ','ï±™'=>'ï±™','ﱚ'=>'ﱚ','ï±›'=>'ï±›','ﱜ'=>'ﱜ','ï±'=>'ï±','ﱞ'=>'ﱞ','ﱟ'=>'ﱟ','ï± '=>'ï± ','ﱡ'=>'ﱡ','ï±¢'=>'ï±¢','ï±£'=>'ï±£','ﱤ'=>'ﱤ','ï±¥'=>'ï±¥','ﱦ'=>'ﱦ','ï±§'=>'ï±§','ﱨ'=>'ﱨ','ﱩ'=>'ﱩ','ﱪ'=>'ﱪ','ﱫ'=>'ﱫ','ﱬ'=>'ﱬ','ï±­'=>'ï±­','ï±®'=>'ï±®','ﱯ'=>'ﱯ','ï±°'=>'ï±°','ï±±'=>'ï±±','ï±²'=>'ï±²','ï±³'=>'ï±³','ï±´'=>'ï±´','ï±µ'=>'ï±µ','ï±¶'=>'ï±¶','ï±·'=>'ï±·','ﱸ'=>'ﱸ','ï±¹'=>'ï±¹','ﱺ'=>'ﱺ','ï±»'=>'ï±»','ï±¼'=>'ï±¼','ï±½'=>'ï±½','ï±¾'=>'ï±¾','ﱿ'=>'ﱿ','ï²€'=>'ï²€','ï²'=>'ï²','ﲂ'=>'ﲂ','ﲃ'=>'ﲃ','ﲄ'=>'ﲄ','ï²…'=>'ï²…','ﲆ'=>'ﲆ','ﲇ'=>'ﲇ','ﲈ'=>'ﲈ','ﲉ'=>'ﲉ','ﲊ'=>'ﲊ','ﲋ'=>'ﲋ','ﲌ'=>'ﲌ','ï²'=>'ï²','ﲎ'=>'ﲎ','ï²'=>'ï²','ï²'=>'ï²','ﲑ'=>'ﲑ','ï²’'=>'ï²’','ﲓ'=>'ﲓ','ï²”'=>'ï²”','ﲕ'=>'ﲕ','ï²–'=>'ï²–','ï²—'=>'ï²—','ﲘ'=>'ﲘ','ï²™'=>'ï²™','ﲚ'=>'ﲚ','ï²›'=>'ï²›','ﲜ'=>'ﲜ','ï²'=>'ï²','ﲞ'=>'ﲞ','ﲟ'=>'ﲟ','ï² '=>'ï² ','ﲡ'=>'ﲡ','ï²¢'=>'ï²¢','ï²£'=>'ï²£','ﲤ'=>'ﲤ','ï²¥'=>'ï²¥','ﲦ'=>'ﲦ','ï²§'=>'ï²§','ﲨ'=>'ﲨ','ﲩ'=>'ﲩ','ﲪ'=>'ﲪ','ﲫ'=>'ﲫ','ﲬ'=>'ﲬ','ï²­'=>'ï²­','ï²®'=>'ï²®','ﲯ'=>'ﲯ','ï²°'=>'ï²°','ï²±'=>'ï²±','ï²²'=>'ï²²','ï²³'=>'ï²³','ï²´'=>'ï²´','ï²µ'=>'ï²µ','ï²¶'=>'ï²¶','ï²·'=>'ï²·','ﲸ'=>'ﲸ','ï²¹'=>'ï²¹','ﲺ'=>'ﲺ','ï²»'=>'ï²»','ï²¼'=>'ï²¼','ï²½'=>'ï²½','ï²¾'=>'ï²¾','ﲿ'=>'ﲿ','ï³€'=>'ï³€','ï³'=>'ï³','ﳂ'=>'ﳂ','ﳃ'=>'ﳃ','ﳄ'=>'ﳄ','ï³…'=>'ï³…','ﳆ'=>'ﳆ','ﳇ'=>'ﳇ','ﳈ'=>'ﳈ','ﳉ'=>'ﳉ','ﳊ'=>'ﳊ','ﳋ'=>'ﳋ','ﳌ'=>'ﳌ','ï³'=>'ï³','ﳎ'=>'ﳎ','ï³'=>'ï³','ï³'=>'ï³','ﳑ'=>'ﳑ','ï³’'=>'ï³’','ﳓ'=>'ﳓ','ï³”'=>'ï³”','ﳕ'=>'ﳕ','ï³–'=>'ï³–','ï³—'=>'ï³—','ﳘ'=>'ﳘ','ï³™'=>'ï³™','ﳚ'=>'ﳚ','ï³›'=>'ï³›','ﳜ'=>'ﳜ','ï³'=>'ï³','ﳞ'=>'ﳞ','ﳟ'=>'ﳟ','ï³ '=>'ï³ ','ﳡ'=>'ﳡ','ï³¢'=>'ï³¢','ï³£'=>'ï³£','ﳤ'=>'ﳤ','ï³¥'=>'ï³¥','ﳦ'=>'ﳦ','ï³§'=>'ï³§','ﳨ'=>'ﳨ','ﳩ'=>'ﳩ','ﳪ'=>'ﳪ','ﳫ'=>'ﳫ','ﳬ'=>'ﳬ','ï³­'=>'ï³­','ï³®'=>'ï³®','ﳯ'=>'ﳯ','ï³°'=>'ï³°','ï³±'=>'ï³±','ï³²'=>'ï³²','ï³³'=>'ï³³','ï³´'=>'ï³´','ï³µ'=>'ï³µ','ï³¶'=>'ï³¶','ï³·'=>'ï³·','ﳸ'=>'ﳸ','ï³¹'=>'ï³¹','ﳺ'=>'ﳺ','ï³»'=>'ï³»','ï³¼'=>'ï³¼','ï³½'=>'ï³½','ï³¾'=>'ï³¾','ﳿ'=>'ﳿ','ï´€'=>'ï´€','ï´'=>'ï´','ï´‚'=>'ï´‚','ï´ƒ'=>'ï´ƒ','ï´„'=>'ï´„','ï´…'=>'ï´…','ï´†'=>'ï´†','ï´‡'=>'ï´‡','ï´ˆ'=>'ï´ˆ','ï´‰'=>'ï´‰','ï´Š'=>'ï´Š','ï´‹'=>'ï´‹','ï´Œ'=>'ï´Œ','ï´'=>'ï´','ï´Ž'=>'ï´Ž','ï´'=>'ï´','ï´'=>'ï´','ï´‘'=>'ï´‘','ï´’'=>'ï´’','ï´“'=>'ï´“','ï´”'=>'ï´”','ï´•'=>'ï´•','ï´–'=>'ï´–','ï´—'=>'ï´—','ï´˜'=>'ï´˜','ï´™'=>'ï´™','ï´š'=>'ï´š','ï´›'=>'ï´›','ï´œ'=>'ï´œ','ï´'=>'ï´','ï´ž'=>'ï´ž','ï´Ÿ'=>'ï´Ÿ','ï´ '=>'ï´ ','ï´¡'=>'ï´¡','ï´¢'=>'ï´¢','ï´£'=>'ï´£','ï´¤'=>'ï´¤','ï´¥'=>'ï´¥','ï´¦'=>'ï´¦','ï´§'=>'ï´§','ï´¨'=>'ï´¨','ï´©'=>'ï´©','ï´ª'=>'ï´ª','ï´«'=>'ï´«','ï´¬'=>'ï´¬','ï´­'=>'ï´­','ï´®'=>'ï´®','ï´¯'=>'ï´¯','ï´°'=>'ï´°','ï´±'=>'ï´±','ï´²'=>'ï´²','ï´³'=>'ï´³','ï´´'=>'ï´´','ï´µ'=>'ï´µ','ï´¶'=>'ï´¶','ï´·'=>'ï´·','ï´¸'=>'ï´¸','ï´¹'=>'ï´¹','ï´º'=>'ï´º','ï´»'=>'ï´»','ï´¼'=>'ï´¼','ï´½'=>'ï´½','ïµ'=>'ïµ','ﵑ'=>'ﵑ','ïµ’'=>'ïµ’','ﵓ'=>'ﵓ','ïµ”'=>'ïµ”','ﵕ'=>'ﵕ','ïµ–'=>'ïµ–','ïµ—'=>'ïµ—','ﵘ'=>'ﵘ','ïµ™'=>'ïµ™','ﵚ'=>'ﵚ','ïµ›'=>'ïµ›','ﵜ'=>'ﵜ','ïµ'=>'ïµ','ﵞ'=>'ﵞ','ﵟ'=>'ﵟ','ïµ '=>'ïµ ','ﵡ'=>'ﵡ','ïµ¢'=>'ïµ¢','ïµ£'=>'ïµ£','ﵤ'=>'ﵤ','ïµ¥'=>'ïµ¥','ﵦ'=>'ﵦ','ïµ§'=>'ïµ§','ﵨ'=>'ﵨ','ﵩ'=>'ﵩ','ﵪ'=>'ﵪ','ﵫ'=>'ﵫ','ﵬ'=>'ﵬ','ïµ­'=>'ïµ­','ïµ®'=>'ïµ®','ﵯ'=>'ﵯ','ïµ°'=>'ïµ°','ïµ±'=>'ïµ±','ïµ²'=>'ïµ²','ïµ³'=>'ïµ³','ïµ´'=>'ïµ´','ïµµ'=>'ïµµ','ïµ¶'=>'ïµ¶','ïµ·'=>'ïµ·','ﵸ'=>'ﵸ','ïµ¹'=>'ïµ¹','ﵺ'=>'ﵺ','ïµ»'=>'ïµ»','ïµ¼'=>'ïµ¼','ïµ½'=>'ïµ½','ïµ¾'=>'ïµ¾','ﵿ'=>'ﵿ','ï¶€'=>'ï¶€','ï¶'=>'ï¶','ï¶‚'=>'ï¶‚','ﶃ'=>'ﶃ','ï¶„'=>'ï¶„','ï¶…'=>'ï¶…','ﶆ'=>'ﶆ','ﶇ'=>'ﶇ','ﶈ'=>'ﶈ','ﶉ'=>'ﶉ','ï¶Š'=>'ï¶Š','ï¶‹'=>'ï¶‹','ï¶Œ'=>'ï¶Œ','ï¶'=>'ï¶','ï¶Ž'=>'ï¶Ž','ï¶'=>'ï¶','ï¶’'=>'ï¶’','ï¶“'=>'ï¶“','ï¶”'=>'ï¶”','ï¶•'=>'ï¶•','ï¶–'=>'ï¶–','ï¶—'=>'ï¶—','ﶘ'=>'ﶘ','ï¶™'=>'ï¶™','ï¶š'=>'ï¶š','ï¶›'=>'ï¶›','ï¶œ'=>'ï¶œ','ï¶'=>'ï¶','ï¶ž'=>'ï¶ž','ï¶Ÿ'=>'ï¶Ÿ','ï¶ '=>'ï¶ ','ï¶¡'=>'ï¶¡','ï¶¢'=>'ï¶¢','ï¶£'=>'ï¶£','ﶤ'=>'ﶤ','ï¶¥'=>'ï¶¥','ﶦ'=>'ﶦ','ï¶§'=>'ï¶§','ﶨ'=>'ﶨ','ï¶©'=>'ï¶©','ﶪ'=>'ﶪ','ï¶«'=>'ï¶«','ﶬ'=>'ﶬ','ï¶­'=>'ï¶­','ï¶®'=>'ï¶®','ﶯ'=>'ﶯ','ï¶°'=>'ï¶°','ï¶±'=>'ï¶±','ï¶²'=>'ï¶²','ï¶³'=>'ï¶³','ï¶´'=>'ï¶´','ï¶µ'=>'ï¶µ','ï¶¶'=>'ï¶¶','ï¶·'=>'ï¶·','ﶸ'=>'ﶸ','ï¶¹'=>'ï¶¹','ﶺ'=>'ﶺ','ï¶»'=>'ï¶»','ï¶¼'=>'ï¶¼','ï¶½'=>'ï¶½','ï¶¾'=>'ï¶¾','ï¶¿'=>'ï¶¿','ï·€'=>'ï·€','ï·'=>'ï·','ï·‚'=>'ï·‚','ï·ƒ'=>'ï·ƒ','ï·„'=>'ï·„','ï·…'=>'ï·…','ï·†'=>'ï·†','ï·‡'=>'ï·‡','ï·°'=>'ï·°','ï·±'=>'ï·±','ï·²'=>'ï·²','ï·³'=>'ï·³','ï·´'=>'ï·´','ï·µ'=>'ï·µ','ï·¶'=>'ï·¶','ï··'=>'ï··','ï·¸'=>'ï·¸','ï·¹'=>'ï·¹','ï·º'=>'ï·º','ï·»'=>'ï·»','︀'=>'︀','ï¸'=>'ï¸','︂'=>'︂','︃'=>'︃','︄'=>'︄','︅'=>'︅','︆'=>'︆','︇'=>'︇','︈'=>'︈','︉'=>'︉','︊'=>'︊','︋'=>'︋','︌'=>'︌','ï¸'=>'ï¸','︎'=>'︎','ï¸'=>'ï¸','︠'=>'︠','︡'=>'︡','︢'=>'︢','︣'=>'︣','ï¹°'=>'ï¹°','ï¹±'=>'ï¹±','ï¹²'=>'ï¹²','ï¹³'=>'ï¹³','ï¹´'=>'ï¹´','ï¹¶'=>'ï¹¶','ï¹·'=>'ï¹·','ﹸ'=>'ﹸ','ï¹¹'=>'ï¹¹','ﹺ'=>'ﹺ','ï¹»'=>'ï¹»','ï¹¼'=>'ï¹¼','ï¹½'=>'ï¹½','ï¹¾'=>'ï¹¾','ﹿ'=>'ﹿ','ﺀ'=>'ﺀ','ïº'=>'ïº','ﺂ'=>'ﺂ','ﺃ'=>'ﺃ','ﺄ'=>'ﺄ','ﺅ'=>'ﺅ','ﺆ'=>'ﺆ','ﺇ'=>'ﺇ','ﺈ'=>'ﺈ','ﺉ'=>'ﺉ','ﺊ'=>'ﺊ','ﺋ'=>'ﺋ','ﺌ'=>'ﺌ','ïº'=>'ïº','ﺎ'=>'ﺎ','ïº'=>'ïº','ïº'=>'ïº','ﺑ'=>'ﺑ','ﺒ'=>'ﺒ','ﺓ'=>'ﺓ','ﺔ'=>'ﺔ','ﺕ'=>'ﺕ','ﺖ'=>'ﺖ','ﺗ'=>'ﺗ','ﺘ'=>'ﺘ','ﺙ'=>'ﺙ','ﺚ'=>'ﺚ','ﺛ'=>'ﺛ','ﺜ'=>'ﺜ','ïº'=>'ïº','ﺞ'=>'ﺞ','ﺟ'=>'ﺟ','ﺠ'=>'ﺠ','ﺡ'=>'ﺡ','ﺢ'=>'ﺢ','ﺣ'=>'ﺣ','ﺤ'=>'ﺤ','ﺥ'=>'ﺥ','ﺦ'=>'ﺦ','ﺧ'=>'ﺧ','ﺨ'=>'ﺨ','ﺩ'=>'ﺩ','ﺪ'=>'ﺪ','ﺫ'=>'ﺫ','ﺬ'=>'ﺬ','ﺭ'=>'ﺭ','ﺮ'=>'ﺮ','ﺯ'=>'ﺯ','ﺰ'=>'ﺰ','ﺱ'=>'ﺱ','ﺲ'=>'ﺲ','ﺳ'=>'ﺳ','ﺴ'=>'ﺴ','ﺵ'=>'ﺵ','ﺶ'=>'ﺶ','ﺷ'=>'ﺷ','ﺸ'=>'ﺸ','ﺹ'=>'ﺹ','ﺺ'=>'ﺺ','ﺻ'=>'ﺻ','ﺼ'=>'ﺼ','ﺽ'=>'ﺽ','ﺾ'=>'ﺾ','ﺿ'=>'ﺿ','ﻀ'=>'ﻀ','ï»'=>'ï»','ﻂ'=>'ﻂ','ﻃ'=>'ﻃ','ﻄ'=>'ﻄ','ï»…'=>'ï»…','ﻆ'=>'ﻆ','ﻇ'=>'ﻇ','ﻈ'=>'ﻈ','ﻉ'=>'ﻉ','ﻊ'=>'ﻊ','ﻋ'=>'ﻋ','ﻌ'=>'ﻌ','ï»'=>'ï»','ﻎ'=>'ﻎ','ï»'=>'ï»','ï»'=>'ï»','ﻑ'=>'ﻑ','ï»’'=>'ï»’','ﻓ'=>'ﻓ','ï»”'=>'ï»”','ﻕ'=>'ﻕ','ï»–'=>'ï»–','ï»—'=>'ï»—','ﻘ'=>'ﻘ','ï»™'=>'ï»™','ﻚ'=>'ﻚ','ï»›'=>'ï»›','ﻜ'=>'ﻜ','ï»'=>'ï»','ﻞ'=>'ﻞ','ﻟ'=>'ﻟ','ï» '=>'ï» ','ﻡ'=>'ﻡ','ﻢ'=>'ﻢ','ﻣ'=>'ﻣ','ﻤ'=>'ﻤ','ﻥ'=>'ﻥ','ﻦ'=>'ﻦ','ï»§'=>'ï»§','ﻨ'=>'ﻨ','ﻩ'=>'ﻩ','ﻪ'=>'ﻪ','ﻫ'=>'ﻫ','ﻬ'=>'ﻬ','ï»­'=>'ï»­','ï»®'=>'ï»®','ﻯ'=>'ﻯ','ï»°'=>'ï»°','ï»±'=>'ï»±','ﻲ'=>'ﻲ','ﻳ'=>'ﻳ','ï»´'=>'ï»´','ﻵ'=>'ﻵ','ï»¶'=>'ï»¶','ï»·'=>'ï»·','ﻸ'=>'ﻸ','ﻹ'=>'ﻹ','ﻺ'=>'ﻺ','ï»»'=>'ï»»','ﻼ'=>'ﻼ','ï¼'=>'0','1'=>'1','ï¼’'=>'2','3'=>'3','ï¼”'=>'4','5'=>'5','ï¼–'=>'6','ï¼—'=>'7','8'=>'8','ï¼™'=>'9','A'=>'ï½','ï¼¢'=>'b','ï¼£'=>'c','D'=>'d','ï¼¥'=>'ï½…','F'=>'f','ï¼§'=>'g','H'=>'h','I'=>'i','J'=>'j','K'=>'k','L'=>'l','ï¼­'=>'ï½','ï¼®'=>'n','O'=>'ï½','ï¼°'=>'ï½','ï¼±'=>'q','ï¼²'=>'ï½’','ï¼³'=>'s','ï¼´'=>'ï½”','ï¼µ'=>'u','ï¼¶'=>'ï½–','ï¼·'=>'ï½—','X'=>'x','ï¼¹'=>'ï½™','Z'=>'z','ï½'=>'ï½','b'=>'b','c'=>'c','d'=>'d','ï½…'=>'ï½…','f'=>'f','g'=>'g','h'=>'h','i'=>'i','j'=>'j','k'=>'k','l'=>'l','ï½'=>'ï½','n'=>'n','ï½'=>'ï½','ï½'=>'ï½','q'=>'q','ï½’'=>'ï½’','s'=>'s','ï½”'=>'ï½”','u'=>'u','ï½–'=>'ï½–','ï½—'=>'ï½—','x'=>'x','ï½™'=>'ï½™','z'=>'z','ヲ'=>'ヲ','ï½§'=>'ï½§','ィ'=>'ィ','ゥ'=>'ゥ','ェ'=>'ェ','ォ'=>'ォ','ャ'=>'ャ','ï½­'=>'ï½­','ï½®'=>'ï½®','ッ'=>'ッ','ï½°'=>'ï½°','ï½±'=>'ï½±','ï½²'=>'ï½²','ï½³'=>'ï½³','ï½´'=>'ï½´','ï½µ'=>'ï½µ','ï½¶'=>'ï½¶','ï½·'=>'ï½·','ク'=>'ク','ï½¹'=>'ï½¹','コ'=>'コ','ï½»'=>'ï½»','ï½¼'=>'ï½¼','ï½½'=>'ï½½','ï½¾'=>'ï½¾','ソ'=>'ソ','ï¾€'=>'ï¾€','ï¾'=>'ï¾','ツ'=>'ツ','テ'=>'テ','ト'=>'ト','ï¾…'=>'ï¾…','ニ'=>'ニ','ヌ'=>'ヌ','ネ'=>'ネ','ノ'=>'ノ','ハ'=>'ハ','ヒ'=>'ヒ','フ'=>'フ','ï¾'=>'ï¾','ホ'=>'ホ','ï¾'=>'ï¾','ï¾'=>'ï¾','ム'=>'ム','ï¾’'=>'ï¾’','モ'=>'モ','ï¾”'=>'ï¾”','ユ'=>'ユ','ï¾–'=>'ï¾–','ï¾—'=>'ï¾—','リ'=>'リ','ï¾™'=>'ï¾™','レ'=>'レ','ï¾›'=>'ï¾›','ワ'=>'ワ','ï¾'=>'ï¾','゙'=>'゙','゚'=>'゚','ï¾ '=>'ï¾ ','ᄀ'=>'ᄀ','ï¾¢'=>'ï¾¢','ï¾£'=>'ï¾£','ᄂ'=>'ᄂ','ï¾¥'=>'ï¾¥','ᆭ'=>'ᆭ','ï¾§'=>'ï¾§','ᄄ'=>'ᄄ','ᄅ'=>'ᄅ','ᆰ'=>'ᆰ','ᆱ'=>'ᆱ','ᆲ'=>'ᆲ','ï¾­'=>'ï¾­','ï¾®'=>'ï¾®','ᆵ'=>'ᆵ','ï¾°'=>'ï¾°','ï¾±'=>'ï¾±','ï¾²'=>'ï¾²','ï¾³'=>'ï¾³','ï¾´'=>'ï¾´','ï¾µ'=>'ï¾µ','ï¾¶'=>'ï¾¶','ï¾·'=>'ï¾·','ᄌ'=>'ᄌ','ï¾¹'=>'ï¾¹','ᄎ'=>'ᄎ','ï¾»'=>'ï¾»','ï¾¼'=>'ï¾¼','ï¾½'=>'ï¾½','ï¾¾'=>'ï¾¾','ï¿‚'=>'ï¿‚','ᅢ'=>'ᅢ','ï¿„'=>'ï¿„','ï¿…'=>'ï¿…','ᅥ'=>'ᅥ','ᅦ'=>'ᅦ','ᅧ'=>'ᅧ','ï¿‹'=>'ï¿‹','ᅩ'=>'ᅩ','ï¿'=>'ï¿','ᅫ'=>'ᅫ','ï¿'=>'ï¿','ï¿’'=>'ï¿’','ï¿“'=>'ï¿“','ï¿”'=>'ï¿”','ï¿•'=>'ï¿•','ï¿–'=>'ï¿–','ï¿—'=>'ï¿—','ᅳ'=>'ᅳ','ï¿›'=>'ï¿›','ᅵ'=>'ᅵ'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_32.php b/phpBB/includes/utf/data/search_indexer_32.php deleted file mode 100644 index 73ed2924ab..0000000000 --- a/phpBB/includes/utf/data/search_indexer_32.php +++ /dev/null @@ -1 +0,0 @@ -'ð€€','ð€'=>'ð€','ð€‚'=>'ð€‚','ð€ƒ'=>'ð€ƒ','ð€„'=>'ð€„','ð€…'=>'ð€…','ð€†'=>'ð€†','ð€‡'=>'ð€‡','ð€ˆ'=>'ð€ˆ','ð€‰'=>'ð€‰','ð€Š'=>'ð€Š','ð€‹'=>'ð€‹','ð€'=>'ð€','ð€Ž'=>'ð€Ž','ð€'=>'ð€','ð€'=>'ð€','ð€‘'=>'ð€‘','ð€’'=>'ð€’','ð€“'=>'ð€“','ð€”'=>'ð€”','ð€•'=>'ð€•','ð€–'=>'ð€–','ð€—'=>'ð€—','ð€˜'=>'ð€˜','ð€™'=>'ð€™','ð€š'=>'ð€š','ð€›'=>'ð€›','ð€œ'=>'ð€œ','ð€'=>'ð€','ð€ž'=>'ð€ž','ð€Ÿ'=>'ð€Ÿ','ð€ '=>'ð€ ','ð€¡'=>'ð€¡','ð€¢'=>'ð€¢','ð€£'=>'ð€£','ð€¤'=>'ð€¤','ð€¥'=>'ð€¥','ð€¦'=>'ð€¦','ð€¨'=>'ð€¨','ð€©'=>'ð€©','ð€ª'=>'ð€ª','ð€«'=>'ð€«','ð€¬'=>'ð€¬','ð€­'=>'ð€­','ð€®'=>'ð€®','ð€¯'=>'ð€¯','ð€°'=>'ð€°','ð€±'=>'ð€±','ð€²'=>'ð€²','ð€³'=>'ð€³','ð€´'=>'ð€´','ð€µ'=>'ð€µ','ð€¶'=>'ð€¶','ð€·'=>'ð€·','ð€¸'=>'ð€¸','ð€¹'=>'ð€¹','ð€º'=>'ð€º','ð€¼'=>'ð€¼','ð€½'=>'ð€½','ð€¿'=>'ð€¿','ð€'=>'ð€','ð'=>'ð','ð‚'=>'ð‚','ðƒ'=>'ðƒ','ð„'=>'ð„','ð…'=>'ð…','ð†'=>'ð†','ð‡'=>'ð‡','ðˆ'=>'ðˆ','ð‰'=>'ð‰','ðŠ'=>'ðŠ','ð‹'=>'ð‹','ðŒ'=>'ðŒ','ð'=>'ð','ð'=>'ð','ð‘'=>'ð‘','ð’'=>'ð’','ð“'=>'ð“','ð”'=>'ð”','ð•'=>'ð•','ð–'=>'ð–','ð—'=>'ð—','ð˜'=>'ð˜','ð™'=>'ð™','ðš'=>'ðš','ð›'=>'ð›','ðœ'=>'ðœ','ð'=>'ð','ð‚€'=>'ð‚€','ð‚'=>'ð‚','ð‚‚'=>'ð‚‚','ð‚ƒ'=>'ð‚ƒ','ð‚„'=>'ð‚„','ð‚…'=>'ð‚…','ð‚†'=>'ð‚†','ð‚‡'=>'ð‚‡','ð‚ˆ'=>'ð‚ˆ','ð‚‰'=>'ð‚‰','ð‚Š'=>'ð‚Š','ð‚‹'=>'ð‚‹','ð‚Œ'=>'ð‚Œ','ð‚'=>'ð‚','ð‚Ž'=>'ð‚Ž','ð‚'=>'ð‚','ð‚'=>'ð‚','ð‚‘'=>'ð‚‘','ð‚’'=>'ð‚’','ð‚“'=>'ð‚“','ð‚”'=>'ð‚”','ð‚•'=>'ð‚•','ð‚–'=>'ð‚–','ð‚—'=>'ð‚—','ð‚˜'=>'ð‚˜','ð‚™'=>'ð‚™','ð‚š'=>'ð‚š','ð‚›'=>'ð‚›','ð‚œ'=>'ð‚œ','ð‚'=>'ð‚','ð‚ž'=>'ð‚ž','ð‚Ÿ'=>'ð‚Ÿ','ð‚ '=>'ð‚ ','ð‚¡'=>'ð‚¡','ð‚¢'=>'ð‚¢','ð‚£'=>'ð‚£','ð‚¤'=>'ð‚¤','ð‚¥'=>'ð‚¥','ð‚¦'=>'ð‚¦','ð‚§'=>'ð‚§','ð‚¨'=>'ð‚¨','ð‚©'=>'ð‚©','ð‚ª'=>'ð‚ª','ð‚«'=>'ð‚«','ð‚¬'=>'ð‚¬','ð‚­'=>'ð‚­','ð‚®'=>'ð‚®','ð‚¯'=>'ð‚¯','ð‚°'=>'ð‚°','ð‚±'=>'ð‚±','ð‚²'=>'ð‚²','ð‚³'=>'ð‚³','ð‚´'=>'ð‚´','ð‚µ'=>'ð‚µ','ð‚¶'=>'ð‚¶','ð‚·'=>'ð‚·','ð‚¸'=>'ð‚¸','ð‚¹'=>'ð‚¹','ð‚º'=>'ð‚º','ð‚»'=>'ð‚»','ð‚¼'=>'ð‚¼','ð‚½'=>'ð‚½','ð‚¾'=>'ð‚¾','ð‚¿'=>'ð‚¿','ðƒ€'=>'ðƒ€','ðƒ'=>'ðƒ','ðƒ‚'=>'ðƒ‚','ðƒƒ'=>'ðƒƒ','ðƒ„'=>'ðƒ„','ðƒ…'=>'ðƒ…','ðƒ†'=>'ðƒ†','ðƒ‡'=>'ðƒ‡','ðƒˆ'=>'ðƒˆ','ðƒ‰'=>'ðƒ‰','ðƒŠ'=>'ðƒŠ','ðƒ‹'=>'ðƒ‹','ðƒŒ'=>'ðƒŒ','ðƒ'=>'ðƒ','ðƒŽ'=>'ðƒŽ','ðƒ'=>'ðƒ','ðƒ'=>'ðƒ','ðƒ‘'=>'ðƒ‘','ðƒ’'=>'ðƒ’','ðƒ“'=>'ðƒ“','ðƒ”'=>'ðƒ”','ðƒ•'=>'ðƒ•','ðƒ–'=>'ðƒ–','ðƒ—'=>'ðƒ—','ðƒ˜'=>'ðƒ˜','ðƒ™'=>'ðƒ™','ðƒš'=>'ðƒš','ðƒ›'=>'ðƒ›','ðƒœ'=>'ðƒœ','ðƒ'=>'ðƒ','ðƒž'=>'ðƒž','ðƒŸ'=>'ðƒŸ','ðƒ '=>'ðƒ ','ðƒ¡'=>'ðƒ¡','ðƒ¢'=>'ðƒ¢','ðƒ£'=>'ðƒ£','ðƒ¤'=>'ðƒ¤','ðƒ¥'=>'ðƒ¥','ðƒ¦'=>'ðƒ¦','ðƒ§'=>'ðƒ§','ðƒ¨'=>'ðƒ¨','ðƒ©'=>'ðƒ©','ðƒª'=>'ðƒª','ðƒ«'=>'ðƒ«','ðƒ¬'=>'ðƒ¬','ðƒ­'=>'ðƒ­','ðƒ®'=>'ðƒ®','ðƒ¯'=>'ðƒ¯','ðƒ°'=>'ðƒ°','ðƒ±'=>'ðƒ±','ðƒ²'=>'ðƒ²','ðƒ³'=>'ðƒ³','ðƒ´'=>'ðƒ´','ðƒµ'=>'ðƒµ','ðƒ¶'=>'ðƒ¶','ðƒ·'=>'ðƒ·','ðƒ¸'=>'ðƒ¸','ðƒ¹'=>'ðƒ¹','ðƒº'=>'ðƒº','ð„‡'=>'1','ð„ˆ'=>'2','ð„‰'=>'3','ð„Š'=>'4','ð„‹'=>'5','ð„Œ'=>'6','ð„'=>'7','ð„Ž'=>'8','ð„'=>'9','ð„'=>'10','ð„‘'=>'20','ð„’'=>'30','ð„“'=>'40','ð„”'=>'50','ð„•'=>'60','ð„–'=>'70','ð„—'=>'80','ð„˜'=>'90','ð„™'=>'100','ð„š'=>'200','ð„›'=>'300','ð„œ'=>'400','ð„'=>'500','ð„ž'=>'600','ð„Ÿ'=>'700','ð„ '=>'800','ð„¡'=>'900','ð„¢'=>'1000','ð„£'=>'2000','ð„¤'=>'3000','ð„¥'=>'4000','ð„¦'=>'5000','ð„§'=>'6000','ð„¨'=>'7000','ð„©'=>'8000','ð„ª'=>'9000','ð„«'=>'10000','ð„¬'=>'20000','ð„­'=>'30000','ð„®'=>'40000','ð„¯'=>'50000','ð„°'=>'60000','ð„±'=>'70000','ð„²'=>'80000','ð„³'=>'90000','ð…€'=>'1/4','ð…'=>'1/2','ð…‚'=>'1','ð…ƒ'=>'5','ð…„'=>'50','ð……'=>'500','ð…†'=>'5000','ð…‡'=>'50000','ð…ˆ'=>'5','ð…‰'=>'10','ð…Š'=>'50','ð…‹'=>'100','ð…Œ'=>'500','ð…'=>'1000','ð…Ž'=>'5000','ð…'=>'5','ð…'=>'10','ð…‘'=>'50','ð…’'=>'100','ð…“'=>'500','ð…”'=>'1000','ð…•'=>'10000','ð…–'=>'50000','ð…—'=>'10','ð…˜'=>'1','ð…™'=>'1','ð…š'=>'1','ð…›'=>'2','ð…œ'=>'2','ð…'=>'2','ð…ž'=>'2','ð…Ÿ'=>'5','ð… '=>'10','ð…¡'=>'10','ð…¢'=>'10','ð…£'=>'10','ð…¤'=>'10','ð…¥'=>'30','ð…¦'=>'50','ð…§'=>'50','ð…¨'=>'50','ð…©'=>'50','ð…ª'=>'100','ð…«'=>'300','ð…¬'=>'500','ð…­'=>'500','ð…®'=>'500','ð…¯'=>'500','ð…°'=>'500','ð…±'=>'1000','ð…²'=>'5000','ð…³'=>'5','ð…´'=>'50','ð…µ'=>'1/2','ð…¶'=>'1/2','ð…·'=>'2/3','ð…¸'=>'3/4','ð†Š'=>'0','ðŒ€'=>'ðŒ€','ðŒ'=>'ðŒ','ðŒ‚'=>'ðŒ‚','ðŒƒ'=>'ðŒƒ','ðŒ„'=>'ðŒ„','ðŒ…'=>'ðŒ…','ðŒ†'=>'ðŒ†','ðŒ‡'=>'ðŒ‡','ðŒˆ'=>'ðŒˆ','ðŒ‰'=>'ðŒ‰','ðŒŠ'=>'ðŒŠ','ðŒ‹'=>'ðŒ‹','ðŒŒ'=>'ðŒŒ','ðŒ'=>'ðŒ','ðŒŽ'=>'ðŒŽ','ðŒ'=>'ðŒ','ðŒ'=>'ðŒ','ðŒ‘'=>'ðŒ‘','ðŒ’'=>'ðŒ’','ðŒ“'=>'ðŒ“','ðŒ”'=>'ðŒ”','ðŒ•'=>'ðŒ•','ðŒ–'=>'ðŒ–','ðŒ—'=>'ðŒ—','ðŒ˜'=>'ðŒ˜','ðŒ™'=>'ðŒ™','ðŒš'=>'ðŒš','ðŒ›'=>'ðŒ›','ðŒœ'=>'ðŒœ','ðŒ'=>'ðŒ','ðŒž'=>'ðŒž','ðŒ '=>'1','ðŒ¡'=>'5','ðŒ¢'=>'10','ðŒ£'=>'50','ðŒ°'=>'ðŒ°','ðŒ±'=>'ðŒ±','ðŒ²'=>'ðŒ²','ðŒ³'=>'ðŒ³','ðŒ´'=>'ðŒ´','ðŒµ'=>'ðŒµ','ðŒ¶'=>'ðŒ¶','ðŒ·'=>'ðŒ·','ðŒ¸'=>'ðŒ¸','ðŒ¹'=>'ðŒ¹','ðŒº'=>'ðŒº','ðŒ»'=>'ðŒ»','ðŒ¼'=>'ðŒ¼','ðŒ½'=>'ðŒ½','ðŒ¾'=>'ðŒ¾','ðŒ¿'=>'ðŒ¿','ð€'=>'ð€','ð'=>'90','ð‚'=>'ð‚','ðƒ'=>'ðƒ','ð„'=>'ð„','ð…'=>'ð…','ð†'=>'ð†','ð‡'=>'ð‡','ðˆ'=>'ðˆ','ð‰'=>'ð‰','ðŠ'=>'900','ðŽ€'=>'ðŽ€','ðŽ'=>'ðŽ','ðŽ‚'=>'ðŽ‚','ðŽƒ'=>'ðŽƒ','ðŽ„'=>'ðŽ„','ðŽ…'=>'ðŽ…','ðކ'=>'ðކ','ðއ'=>'ðއ','ðŽˆ'=>'ðŽˆ','ðމ'=>'ðމ','ðŽŠ'=>'ðŽŠ','ðŽ‹'=>'ðŽ‹','ðŽŒ'=>'ðŽŒ','ðŽ'=>'ðŽ','ðŽŽ'=>'ðŽŽ','ðŽ'=>'ðŽ','ðŽ'=>'ðŽ','ðŽ‘'=>'ðŽ‘','ðŽ’'=>'ðŽ’','ðŽ“'=>'ðŽ“','ðŽ”'=>'ðŽ”','ðŽ•'=>'ðŽ•','ðŽ–'=>'ðŽ–','ðŽ—'=>'ðŽ—','ðŽ˜'=>'ðŽ˜','ðŽ™'=>'ðŽ™','ðŽš'=>'ðŽš','ðŽ›'=>'ðŽ›','ðŽœ'=>'ðŽœ','ðŽ'=>'ðŽ','ðŽ '=>'ðŽ ','ðŽ¡'=>'ðŽ¡','ðŽ¢'=>'ðŽ¢','ðŽ£'=>'ðŽ£','ðޤ'=>'ðޤ','ðŽ¥'=>'ðŽ¥','ðަ'=>'ðަ','ðާ'=>'ðާ','ðލ'=>'ðލ','ðŽ©'=>'ðŽ©','ðŽª'=>'ðŽª','ðŽ«'=>'ðŽ«','ðެ'=>'ðެ','ðŽ­'=>'ðŽ­','ðŽ®'=>'ðŽ®','ðޝ'=>'ðޝ','ðް'=>'ðް','ðޱ'=>'ðޱ','ð޲'=>'ð޲','ð޳'=>'ð޳','ðŽ´'=>'ðŽ´','ð޵'=>'ð޵','ð޶'=>'ð޶','ðŽ·'=>'ðŽ·','ðޏ'=>'ðޏ','ð޹'=>'ð޹','ðŽº'=>'ðŽº','ðŽ»'=>'ðŽ»','ð޼'=>'ð޼','ð޽'=>'ð޽','ð޾'=>'ð޾','ðŽ¿'=>'ðŽ¿','ð€'=>'ð€','ð'=>'ð','ð‚'=>'ð‚','ðƒ'=>'ðƒ','ðˆ'=>'ðˆ','ð‰'=>'ð‰','ðŠ'=>'ðŠ','ð‹'=>'ð‹','ðŒ'=>'ðŒ','ð'=>'ð','ðŽ'=>'ðŽ','ð'=>'ð','ð‘'=>'1','ð’'=>'2','ð“'=>'10','ð”'=>'20','ð•'=>'100','ð€'=>'ð¨','ð'=>'ð©','ð‚'=>'ðª','ðƒ'=>'ð«','ð„'=>'ð¬','ð…'=>'ð­','ð†'=>'ð®','ð‡'=>'ð¯','ðˆ'=>'ð°','ð‰'=>'ð±','ðŠ'=>'ð²','ð‹'=>'ð³','ðŒ'=>'ð´','ð'=>'ðµ','ðŽ'=>'ð¶','ð'=>'ð·','ð'=>'ð¸','ð‘'=>'ð¹','ð’'=>'ðº','ð“'=>'ð»','ð”'=>'ð¼','ð•'=>'ð½','ð–'=>'ð¾','ð—'=>'ð¿','ð˜'=>'ð‘€','ð™'=>'ð‘','ðš'=>'ð‘‚','ð›'=>'ð‘ƒ','ðœ'=>'ð‘„','ð'=>'ð‘…','ðž'=>'ð‘†','ðŸ'=>'ð‘‡','ð '=>'ð‘ˆ','ð¡'=>'ð‘‰','ð¢'=>'ð‘Š','ð£'=>'ð‘‹','ð¤'=>'ð‘Œ','ð¥'=>'ð‘','ð¦'=>'ð‘Ž','ð§'=>'ð‘','ð¨'=>'ð¨','ð©'=>'ð©','ðª'=>'ðª','ð«'=>'ð«','ð¬'=>'ð¬','ð­'=>'ð­','ð®'=>'ð®','ð¯'=>'ð¯','ð°'=>'ð°','ð±'=>'ð±','ð²'=>'ð²','ð³'=>'ð³','ð´'=>'ð´','ðµ'=>'ðµ','ð¶'=>'ð¶','ð·'=>'ð·','ð¸'=>'ð¸','ð¹'=>'ð¹','ðº'=>'ðº','ð»'=>'ð»','ð¼'=>'ð¼','ð½'=>'ð½','ð¾'=>'ð¾','ð¿'=>'ð¿','ð‘€'=>'ð‘€','ð‘'=>'ð‘','ð‘‚'=>'ð‘‚','ð‘ƒ'=>'ð‘ƒ','ð‘„'=>'ð‘„','ð‘…'=>'ð‘…','ð‘†'=>'ð‘†','ð‘‡'=>'ð‘‡','ð‘ˆ'=>'ð‘ˆ','ð‘‰'=>'ð‘‰','ð‘Š'=>'ð‘Š','ð‘‹'=>'ð‘‹','ð‘Œ'=>'ð‘Œ','ð‘'=>'ð‘','ð‘Ž'=>'ð‘Ž','ð‘'=>'ð‘','ð‘'=>'ð‘','ð‘‘'=>'ð‘‘','ð‘’'=>'ð‘’','ð‘“'=>'ð‘“','ð‘”'=>'ð‘”','ð‘•'=>'ð‘•','ð‘–'=>'ð‘–','ð‘—'=>'ð‘—','ð‘˜'=>'ð‘˜','ð‘™'=>'ð‘™','ð‘š'=>'ð‘š','ð‘›'=>'ð‘›','ð‘œ'=>'ð‘œ','ð‘'=>'ð‘','ð‘ž'=>'ð‘ž','ð‘Ÿ'=>'ð‘Ÿ','ð‘ '=>'ð‘ ','ð‘¡'=>'ð‘¡','ð‘¢'=>'ð‘¢','ð‘£'=>'ð‘£','ð‘¤'=>'ð‘¤','ð‘¥'=>'ð‘¥','ð‘¦'=>'ð‘¦','ð‘§'=>'ð‘§','ð‘¨'=>'ð‘¨','ð‘©'=>'ð‘©','ð‘ª'=>'ð‘ª','ð‘«'=>'ð‘«','ð‘¬'=>'ð‘¬','ð‘­'=>'ð‘­','ð‘®'=>'ð‘®','ð‘¯'=>'ð‘¯','ð‘°'=>'ð‘°','ð‘±'=>'ð‘±','ð‘²'=>'ð‘²','ð‘³'=>'ð‘³','ð‘´'=>'ð‘´','ð‘µ'=>'ð‘µ','ð‘¶'=>'ð‘¶','ð‘·'=>'ð‘·','ð‘¸'=>'ð‘¸','ð‘¹'=>'ð‘¹','ð‘º'=>'ð‘º','ð‘»'=>'ð‘»','ð‘¼'=>'ð‘¼','ð‘½'=>'ð‘½','ð‘¾'=>'ð‘¾','ð‘¿'=>'ð‘¿','ð’€'=>'ð’€','ð’'=>'ð’','ð’‚'=>'ð’‚','ð’ƒ'=>'ð’ƒ','ð’„'=>'ð’„','ð’…'=>'ð’…','ð’†'=>'ð’†','ð’‡'=>'ð’‡','ð’ˆ'=>'ð’ˆ','ð’‰'=>'ð’‰','ð’Š'=>'ð’Š','ð’‹'=>'ð’‹','ð’Œ'=>'ð’Œ','ð’'=>'ð’','ð’Ž'=>'ð’Ž','ð’'=>'ð’','ð’'=>'ð’','ð’‘'=>'ð’‘','ð’’'=>'ð’’','ð’“'=>'ð’“','ð’”'=>'ð’”','ð’•'=>'ð’•','ð’–'=>'ð’–','ð’—'=>'ð’—','ð’˜'=>'ð’˜','ð’™'=>'ð’™','ð’š'=>'ð’š','ð’›'=>'ð’›','ð’œ'=>'ð’œ','ð’'=>'ð’','ð’ '=>'0','ð’¡'=>'1','ð’¢'=>'2','ð’£'=>'3','ð’¤'=>'4','ð’¥'=>'5','ð’¦'=>'6','ð’§'=>'7','ð’¨'=>'8','ð’©'=>'9'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_33.php b/phpBB/includes/utf/data/search_indexer_33.php deleted file mode 100644 index 4e8762a646..0000000000 --- a/phpBB/includes/utf/data/search_indexer_33.php +++ /dev/null @@ -1 +0,0 @@ -'ð €','ð '=>'ð ','ð ‚'=>'ð ‚','ð ƒ'=>'ð ƒ','ð „'=>'ð „','ð …'=>'ð …','ð ˆ'=>'ð ˆ','ð Š'=>'ð Š','ð ‹'=>'ð ‹','ð Œ'=>'ð Œ','ð '=>'ð ','ð Ž'=>'ð Ž','ð '=>'ð ','ð '=>'ð ','ð ‘'=>'ð ‘','ð ’'=>'ð ’','ð “'=>'ð “','ð ”'=>'ð ”','ð •'=>'ð •','ð –'=>'ð –','ð —'=>'ð —','ð ˜'=>'ð ˜','ð ™'=>'ð ™','ð š'=>'ð š','ð ›'=>'ð ›','ð œ'=>'ð œ','ð '=>'ð ','ð ž'=>'ð ž','ð Ÿ'=>'ð Ÿ','ð  '=>'ð  ','ð ¡'=>'ð ¡','ð ¢'=>'ð ¢','ð £'=>'ð £','ð ¤'=>'ð ¤','ð ¥'=>'ð ¥','ð ¦'=>'ð ¦','ð §'=>'ð §','ð ¨'=>'ð ¨','ð ©'=>'ð ©','ð ª'=>'ð ª','ð «'=>'ð «','ð ¬'=>'ð ¬','ð ­'=>'ð ­','ð ®'=>'ð ®','ð ¯'=>'ð ¯','ð °'=>'ð °','ð ±'=>'ð ±','ð ²'=>'ð ²','ð ³'=>'ð ³','ð ´'=>'ð ´','ð µ'=>'ð µ','ð ·'=>'ð ·','ð ¸'=>'ð ¸','ð ¼'=>'ð ¼','ð ¿'=>'ð ¿','ð¤€'=>'ð¤€','ð¤'=>'ð¤','ð¤‚'=>'ð¤‚','ð¤ƒ'=>'ð¤ƒ','ð¤„'=>'ð¤„','ð¤…'=>'ð¤…','ð¤†'=>'ð¤†','ð¤‡'=>'ð¤‡','ð¤ˆ'=>'ð¤ˆ','ð¤‰'=>'ð¤‰','ð¤Š'=>'ð¤Š','ð¤‹'=>'ð¤‹','ð¤Œ'=>'ð¤Œ','ð¤'=>'ð¤','ð¤Ž'=>'ð¤Ž','ð¤'=>'ð¤','ð¤'=>'ð¤','ð¤‘'=>'ð¤‘','ð¤’'=>'ð¤’','ð¤“'=>'ð¤“','ð¤”'=>'ð¤”','ð¤•'=>'ð¤•','ð¤–'=>'1','ð¤—'=>'10','ð¤˜'=>'20','ð¤™'=>'100','ð¨€'=>'ð¨€','ð¨'=>'ð¨','ð¨‚'=>'ð¨‚','ð¨ƒ'=>'ð¨ƒ','ð¨…'=>'ð¨…','ð¨†'=>'ð¨†','ð¨Œ'=>'ð¨Œ','ð¨'=>'ð¨','ð¨Ž'=>'ð¨Ž','ð¨'=>'ð¨','ð¨'=>'ð¨','ð¨‘'=>'ð¨‘','ð¨’'=>'ð¨’','ð¨“'=>'ð¨“','ð¨•'=>'ð¨•','ð¨–'=>'ð¨–','ð¨—'=>'ð¨—','ð¨™'=>'ð¨™','ð¨š'=>'ð¨š','ð¨›'=>'ð¨›','ð¨œ'=>'ð¨œ','ð¨'=>'ð¨','ð¨ž'=>'ð¨ž','ð¨Ÿ'=>'ð¨Ÿ','ð¨ '=>'ð¨ ','ð¨¡'=>'ð¨¡','ð¨¢'=>'ð¨¢','ð¨£'=>'ð¨£','ð¨¤'=>'ð¨¤','ð¨¥'=>'ð¨¥','ð¨¦'=>'ð¨¦','ð¨§'=>'ð¨§','ð¨¨'=>'ð¨¨','ð¨©'=>'ð¨©','ð¨ª'=>'ð¨ª','ð¨«'=>'ð¨«','ð¨¬'=>'ð¨¬','ð¨­'=>'ð¨­','ð¨®'=>'ð¨®','ð¨¯'=>'ð¨¯','ð¨°'=>'ð¨°','ð¨±'=>'ð¨±','ð¨²'=>'ð¨²','ð¨³'=>'ð¨³','ð¨¸'=>'ð¨¸','ð¨¹'=>'ð¨¹','ð¨º'=>'ð¨º','ð¨¿'=>'ð¨¿','ð©€'=>'1','ð©'=>'2','ð©‚'=>'3','ð©ƒ'=>'4','ð©„'=>'10','ð©…'=>'20','ð©†'=>'100','ð©‡'=>'1000'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_36.php b/phpBB/includes/utf/data/search_indexer_36.php deleted file mode 100644 index 8bf908e514..0000000000 --- a/phpBB/includes/utf/data/search_indexer_36.php +++ /dev/null @@ -1 +0,0 @@ -'ð’€€','ð’€'=>'ð’€','𒀂'=>'𒀂','𒀃'=>'𒀃','𒀄'=>'𒀄','ð’€…'=>'ð’€…','𒀆'=>'𒀆','𒀇'=>'𒀇','𒀈'=>'𒀈','𒀉'=>'𒀉','𒀊'=>'𒀊','𒀋'=>'𒀋','𒀌'=>'𒀌','ð’€'=>'ð’€','𒀎'=>'𒀎','ð’€'=>'ð’€','ð’€'=>'ð’€','𒀑'=>'𒀑','ð’€’'=>'ð’€’','𒀓'=>'𒀓','ð’€”'=>'ð’€”','𒀕'=>'𒀕','ð’€–'=>'ð’€–','ð’€—'=>'ð’€—','𒀘'=>'𒀘','ð’€™'=>'ð’€™','𒀚'=>'𒀚','ð’€›'=>'ð’€›','𒀜'=>'𒀜','ð’€'=>'ð’€','𒀞'=>'𒀞','𒀟'=>'𒀟','ð’€ '=>'ð’€ ','𒀡'=>'𒀡','ð’€¢'=>'ð’€¢','ð’€£'=>'ð’€£','𒀤'=>'𒀤','ð’€¥'=>'ð’€¥','𒀦'=>'𒀦','ð’€§'=>'ð’€§','𒀨'=>'𒀨','𒀩'=>'𒀩','𒀪'=>'𒀪','𒀫'=>'𒀫','𒀬'=>'𒀬','ð’€­'=>'ð’€­','ð’€®'=>'ð’€®','𒀯'=>'𒀯','ð’€°'=>'ð’€°','ð’€±'=>'ð’€±','ð’€²'=>'ð’€²','ð’€³'=>'ð’€³','ð’€´'=>'ð’€´','ð’€µ'=>'ð’€µ','ð’€¶'=>'ð’€¶','ð’€·'=>'ð’€·','𒀸'=>'𒀸','ð’€¹'=>'ð’€¹','𒀺'=>'𒀺','ð’€»'=>'ð’€»','ð’€¼'=>'ð’€¼','ð’€½'=>'ð’€½','ð’€¾'=>'ð’€¾','𒀿'=>'𒀿','ð’€'=>'ð’€','ð’'=>'ð’','ð’‚'=>'ð’‚','ð’ƒ'=>'ð’ƒ','ð’„'=>'ð’„','ð’…'=>'ð’…','ð’†'=>'ð’†','ð’‡'=>'ð’‡','ð’ˆ'=>'ð’ˆ','ð’‰'=>'ð’‰','ð’Š'=>'ð’Š','ð’‹'=>'ð’‹','ð’Œ'=>'ð’Œ','ð’'=>'ð’','ð’Ž'=>'ð’Ž','ð’'=>'ð’','ð’'=>'ð’','ð’‘'=>'ð’‘','ð’’'=>'ð’’','ð’“'=>'ð’“','ð’”'=>'ð’”','ð’•'=>'ð’•','ð’–'=>'ð’–','ð’—'=>'ð’—','ð’˜'=>'ð’˜','ð’™'=>'ð’™','ð’š'=>'ð’š','ð’›'=>'ð’›','ð’œ'=>'ð’œ','ð’'=>'ð’','ð’ž'=>'ð’ž','ð’Ÿ'=>'ð’Ÿ','ð’ '=>'ð’ ','ð’¡'=>'ð’¡','ð’¢'=>'ð’¢','ð’£'=>'ð’£','ð’¤'=>'ð’¤','ð’¥'=>'ð’¥','ð’¦'=>'ð’¦','ð’§'=>'ð’§','ð’¨'=>'ð’¨','ð’©'=>'ð’©','ð’ª'=>'ð’ª','ð’«'=>'ð’«','ð’¬'=>'ð’¬','ð’­'=>'ð’­','ð’®'=>'ð’®','ð’¯'=>'ð’¯','ð’°'=>'ð’°','ð’±'=>'ð’±','ð’²'=>'ð’²','ð’³'=>'ð’³','ð’´'=>'ð’´','ð’µ'=>'ð’µ','ð’¶'=>'ð’¶','ð’·'=>'ð’·','ð’¸'=>'ð’¸','ð’¹'=>'ð’¹','ð’º'=>'ð’º','ð’»'=>'ð’»','ð’¼'=>'ð’¼','ð’½'=>'ð’½','ð’¾'=>'ð’¾','ð’¿'=>'ð’¿','ð’‚€'=>'ð’‚€','ð’‚'=>'ð’‚','ð’‚‚'=>'ð’‚‚','𒂃'=>'𒂃','ð’‚„'=>'ð’‚„','ð’‚…'=>'ð’‚…','𒂆'=>'𒂆','𒂇'=>'𒂇','𒂈'=>'𒂈','𒂉'=>'𒂉','ð’‚Š'=>'ð’‚Š','ð’‚‹'=>'ð’‚‹','ð’‚Œ'=>'ð’‚Œ','ð’‚'=>'ð’‚','ð’‚Ž'=>'ð’‚Ž','ð’‚'=>'ð’‚','ð’‚'=>'ð’‚','ð’‚‘'=>'ð’‚‘','ð’‚’'=>'ð’‚’','ð’‚“'=>'ð’‚“','ð’‚”'=>'ð’‚”','ð’‚•'=>'ð’‚•','ð’‚–'=>'ð’‚–','ð’‚—'=>'ð’‚—','𒂘'=>'𒂘','ð’‚™'=>'ð’‚™','ð’‚š'=>'ð’‚š','ð’‚›'=>'ð’‚›','ð’‚œ'=>'ð’‚œ','ð’‚'=>'ð’‚','ð’‚ž'=>'ð’‚ž','ð’‚Ÿ'=>'ð’‚Ÿ','ð’‚ '=>'ð’‚ ','ð’‚¡'=>'ð’‚¡','ð’‚¢'=>'ð’‚¢','ð’‚£'=>'ð’‚£','𒂤'=>'𒂤','ð’‚¥'=>'ð’‚¥','𒂦'=>'𒂦','ð’‚§'=>'ð’‚§','𒂨'=>'𒂨','ð’‚©'=>'ð’‚©','𒂪'=>'𒂪','ð’‚«'=>'ð’‚«','𒂬'=>'𒂬','ð’‚­'=>'ð’‚­','ð’‚®'=>'ð’‚®','𒂯'=>'𒂯','ð’‚°'=>'ð’‚°','ð’‚±'=>'ð’‚±','ð’‚²'=>'ð’‚²','ð’‚³'=>'ð’‚³','ð’‚´'=>'ð’‚´','ð’‚µ'=>'ð’‚µ','ð’‚¶'=>'ð’‚¶','ð’‚·'=>'ð’‚·','𒂸'=>'𒂸','ð’‚¹'=>'ð’‚¹','𒂺'=>'𒂺','ð’‚»'=>'ð’‚»','ð’‚¼'=>'ð’‚¼','ð’‚½'=>'ð’‚½','ð’‚¾'=>'ð’‚¾','ð’‚¿'=>'ð’‚¿','𒃀'=>'𒃀','ð’ƒ'=>'ð’ƒ','𒃂'=>'𒃂','𒃃'=>'𒃃','𒃄'=>'𒃄','ð’ƒ…'=>'ð’ƒ…','𒃆'=>'𒃆','𒃇'=>'𒃇','𒃈'=>'𒃈','𒃉'=>'𒃉','𒃊'=>'𒃊','𒃋'=>'𒃋','𒃌'=>'𒃌','ð’ƒ'=>'ð’ƒ','𒃎'=>'𒃎','ð’ƒ'=>'ð’ƒ','ð’ƒ'=>'ð’ƒ','𒃑'=>'𒃑','ð’ƒ’'=>'ð’ƒ’','𒃓'=>'𒃓','𒃔'=>'𒃔','𒃕'=>'𒃕','ð’ƒ–'=>'ð’ƒ–','ð’ƒ—'=>'ð’ƒ—','𒃘'=>'𒃘','𒃙'=>'𒃙','𒃚'=>'𒃚','𒃛'=>'𒃛','𒃜'=>'𒃜','ð’ƒ'=>'ð’ƒ','𒃞'=>'𒃞','𒃟'=>'𒃟','ð’ƒ '=>'ð’ƒ ','𒃡'=>'𒃡','𒃢'=>'𒃢','𒃣'=>'𒃣','𒃤'=>'𒃤','𒃥'=>'𒃥','𒃦'=>'𒃦','𒃧'=>'𒃧','𒃨'=>'𒃨','𒃩'=>'𒃩','𒃪'=>'𒃪','𒃫'=>'𒃫','𒃬'=>'𒃬','ð’ƒ­'=>'ð’ƒ­','𒃮'=>'𒃮','𒃯'=>'𒃯','ð’ƒ°'=>'ð’ƒ°','𒃱'=>'𒃱','𒃲'=>'𒃲','𒃳'=>'𒃳','ð’ƒ´'=>'ð’ƒ´','𒃵'=>'𒃵','𒃶'=>'𒃶','ð’ƒ·'=>'ð’ƒ·','𒃸'=>'𒃸','𒃹'=>'𒃹','𒃺'=>'𒃺','𒃻'=>'𒃻','𒃼'=>'𒃼','𒃽'=>'𒃽','𒃾'=>'𒃾','𒃿'=>'𒃿','ð’„€'=>'ð’„€','ð’„'=>'ð’„','ð’„‚'=>'ð’„‚','𒄃'=>'𒄃','ð’„„'=>'ð’„„','ð’„…'=>'ð’„…','𒄆'=>'𒄆','𒄇'=>'𒄇','𒄈'=>'𒄈','𒄉'=>'𒄉','ð’„Š'=>'ð’„Š','ð’„‹'=>'ð’„‹','ð’„Œ'=>'ð’„Œ','ð’„'=>'ð’„','ð’„Ž'=>'ð’„Ž','ð’„'=>'ð’„','ð’„'=>'ð’„','ð’„‘'=>'ð’„‘','ð’„’'=>'ð’„’','ð’„“'=>'ð’„“','ð’„”'=>'ð’„”','ð’„•'=>'ð’„•','ð’„–'=>'ð’„–','ð’„—'=>'ð’„—','𒄘'=>'𒄘','ð’„™'=>'ð’„™','ð’„š'=>'ð’„š','ð’„›'=>'ð’„›','ð’„œ'=>'ð’„œ','ð’„'=>'ð’„','ð’„ž'=>'ð’„ž','ð’„Ÿ'=>'ð’„Ÿ','ð’„ '=>'ð’„ ','ð’„¡'=>'ð’„¡','ð’„¢'=>'ð’„¢','ð’„£'=>'ð’„£','𒄤'=>'𒄤','ð’„¥'=>'ð’„¥','𒄦'=>'𒄦','ð’„§'=>'ð’„§','𒄨'=>'𒄨','ð’„©'=>'ð’„©','𒄪'=>'𒄪','ð’„«'=>'ð’„«','𒄬'=>'𒄬','ð’„­'=>'ð’„­','ð’„®'=>'ð’„®','𒄯'=>'𒄯','ð’„°'=>'ð’„°','ð’„±'=>'ð’„±','ð’„²'=>'ð’„²','ð’„³'=>'ð’„³','ð’„´'=>'ð’„´','ð’„µ'=>'ð’„µ','ð’„¶'=>'ð’„¶','ð’„·'=>'ð’„·','𒄸'=>'𒄸','ð’„¹'=>'ð’„¹','𒄺'=>'𒄺','ð’„»'=>'ð’„»','ð’„¼'=>'ð’„¼','ð’„½'=>'ð’„½','ð’„¾'=>'ð’„¾','ð’„¿'=>'ð’„¿','ð’…€'=>'ð’…€','ð’…'=>'ð’…','ð’…‚'=>'ð’…‚','ð’…ƒ'=>'ð’…ƒ','ð’…„'=>'ð’…„','ð’……'=>'ð’……','ð’…†'=>'ð’…†','ð’…‡'=>'ð’…‡','ð’…ˆ'=>'ð’…ˆ','ð’…‰'=>'ð’…‰','ð’…Š'=>'ð’…Š','ð’…‹'=>'ð’…‹','ð’…Œ'=>'ð’…Œ','ð’…'=>'ð’…','ð’…Ž'=>'ð’…Ž','ð’…'=>'ð’…','ð’…'=>'ð’…','ð’…‘'=>'ð’…‘','ð’…’'=>'ð’…’','ð’…“'=>'ð’…“','ð’…”'=>'ð’…”','ð’…•'=>'ð’…•','ð’…–'=>'ð’…–','ð’…—'=>'ð’…—','ð’…˜'=>'ð’…˜','ð’…™'=>'ð’…™','ð’…š'=>'ð’…š','ð’…›'=>'ð’…›','ð’…œ'=>'ð’…œ','ð’…'=>'ð’…','ð’…ž'=>'ð’…ž','ð’…Ÿ'=>'ð’…Ÿ','ð’… '=>'ð’… ','ð’…¡'=>'ð’…¡','ð’…¢'=>'ð’…¢','ð’…£'=>'ð’…£','ð’…¤'=>'ð’…¤','ð’…¥'=>'ð’…¥','ð’…¦'=>'ð’…¦','ð’…§'=>'ð’…§','ð’…¨'=>'ð’…¨','ð’…©'=>'ð’…©','ð’…ª'=>'ð’…ª','ð’…«'=>'ð’…«','ð’…¬'=>'ð’…¬','ð’…­'=>'ð’…­','ð’…®'=>'ð’…®','ð’…¯'=>'ð’…¯','ð’…°'=>'ð’…°','ð’…±'=>'ð’…±','ð’…²'=>'ð’…²','ð’…³'=>'ð’…³','ð’…´'=>'ð’…´','ð’…µ'=>'ð’…µ','ð’…¶'=>'ð’…¶','ð’…·'=>'ð’…·','ð’…¸'=>'ð’…¸','ð’…¹'=>'ð’…¹','ð’…º'=>'ð’…º','ð’…»'=>'ð’…»','ð’…¼'=>'ð’…¼','ð’…½'=>'ð’…½','ð’…¾'=>'ð’…¾','ð’…¿'=>'ð’…¿','𒆀'=>'𒆀','ð’†'=>'ð’†','𒆂'=>'𒆂','𒆃'=>'𒆃','𒆄'=>'𒆄','ð’†…'=>'ð’†…','𒆆'=>'𒆆','𒆇'=>'𒆇','𒆈'=>'𒆈','𒆉'=>'𒆉','𒆊'=>'𒆊','𒆋'=>'𒆋','𒆌'=>'𒆌','ð’†'=>'ð’†','𒆎'=>'𒆎','ð’†'=>'ð’†','ð’†'=>'ð’†','𒆑'=>'𒆑','ð’†’'=>'ð’†’','𒆓'=>'𒆓','𒆔'=>'𒆔','𒆕'=>'𒆕','ð’†–'=>'ð’†–','ð’†—'=>'ð’†—','𒆘'=>'𒆘','𒆙'=>'𒆙','𒆚'=>'𒆚','𒆛'=>'𒆛','𒆜'=>'𒆜','ð’†'=>'ð’†','𒆞'=>'𒆞','𒆟'=>'𒆟','ð’† '=>'ð’† ','𒆡'=>'𒆡','𒆢'=>'𒆢','𒆣'=>'𒆣','𒆤'=>'𒆤','𒆥'=>'𒆥','𒆦'=>'𒆦','𒆧'=>'𒆧','𒆨'=>'𒆨','𒆩'=>'𒆩','𒆪'=>'𒆪','𒆫'=>'𒆫','𒆬'=>'𒆬','ð’†­'=>'ð’†­','𒆮'=>'𒆮','𒆯'=>'𒆯','ð’†°'=>'ð’†°','𒆱'=>'𒆱','𒆲'=>'𒆲','𒆳'=>'𒆳','ð’†´'=>'ð’†´','𒆵'=>'𒆵','𒆶'=>'𒆶','ð’†·'=>'ð’†·','𒆸'=>'𒆸','𒆹'=>'𒆹','𒆺'=>'𒆺','𒆻'=>'𒆻','𒆼'=>'𒆼','𒆽'=>'𒆽','𒆾'=>'𒆾','𒆿'=>'𒆿','𒇀'=>'𒇀','ð’‡'=>'ð’‡','𒇂'=>'𒇂','𒇃'=>'𒇃','𒇄'=>'𒇄','ð’‡…'=>'ð’‡…','𒇆'=>'𒇆','𒇇'=>'𒇇','𒇈'=>'𒇈','𒇉'=>'𒇉','𒇊'=>'𒇊','𒇋'=>'𒇋','𒇌'=>'𒇌','ð’‡'=>'ð’‡','𒇎'=>'𒇎','ð’‡'=>'ð’‡','ð’‡'=>'ð’‡','𒇑'=>'𒇑','ð’‡’'=>'ð’‡’','𒇓'=>'𒇓','𒇔'=>'𒇔','𒇕'=>'𒇕','ð’‡–'=>'ð’‡–','ð’‡—'=>'ð’‡—','𒇘'=>'𒇘','𒇙'=>'𒇙','𒇚'=>'𒇚','𒇛'=>'𒇛','𒇜'=>'𒇜','ð’‡'=>'ð’‡','𒇞'=>'𒇞','𒇟'=>'𒇟','ð’‡ '=>'ð’‡ ','𒇡'=>'𒇡','𒇢'=>'𒇢','𒇣'=>'𒇣','𒇤'=>'𒇤','𒇥'=>'𒇥','𒇦'=>'𒇦','𒇧'=>'𒇧','𒇨'=>'𒇨','𒇩'=>'𒇩','𒇪'=>'𒇪','𒇫'=>'𒇫','𒇬'=>'𒇬','ð’‡­'=>'ð’‡­','𒇮'=>'𒇮','𒇯'=>'𒇯','ð’‡°'=>'ð’‡°','𒇱'=>'𒇱','𒇲'=>'𒇲','𒇳'=>'𒇳','ð’‡´'=>'ð’‡´','𒇵'=>'𒇵','𒇶'=>'𒇶','ð’‡·'=>'ð’‡·','𒇸'=>'𒇸','𒇹'=>'𒇹','𒇺'=>'𒇺','𒇻'=>'𒇻','𒇼'=>'𒇼','𒇽'=>'𒇽','𒇾'=>'𒇾','𒇿'=>'𒇿','𒈀'=>'𒈀','ð’ˆ'=>'ð’ˆ','𒈂'=>'𒈂','𒈃'=>'𒈃','𒈄'=>'𒈄','ð’ˆ…'=>'ð’ˆ…','𒈆'=>'𒈆','𒈇'=>'𒈇','𒈈'=>'𒈈','𒈉'=>'𒈉','𒈊'=>'𒈊','𒈋'=>'𒈋','𒈌'=>'𒈌','ð’ˆ'=>'ð’ˆ','𒈎'=>'𒈎','ð’ˆ'=>'ð’ˆ','ð’ˆ'=>'ð’ˆ','𒈑'=>'𒈑','ð’ˆ’'=>'ð’ˆ’','𒈓'=>'𒈓','𒈔'=>'𒈔','𒈕'=>'𒈕','ð’ˆ–'=>'ð’ˆ–','ð’ˆ—'=>'ð’ˆ—','𒈘'=>'𒈘','𒈙'=>'𒈙','𒈚'=>'𒈚','𒈛'=>'𒈛','𒈜'=>'𒈜','ð’ˆ'=>'ð’ˆ','𒈞'=>'𒈞','𒈟'=>'𒈟','ð’ˆ '=>'ð’ˆ ','𒈡'=>'𒈡','𒈢'=>'𒈢','𒈣'=>'𒈣','𒈤'=>'𒈤','𒈥'=>'𒈥','𒈦'=>'𒈦','𒈧'=>'𒈧','𒈨'=>'𒈨','𒈩'=>'𒈩','𒈪'=>'𒈪','𒈫'=>'𒈫','𒈬'=>'𒈬','ð’ˆ­'=>'ð’ˆ­','𒈮'=>'𒈮','𒈯'=>'𒈯','ð’ˆ°'=>'ð’ˆ°','𒈱'=>'𒈱','𒈲'=>'𒈲','𒈳'=>'𒈳','ð’ˆ´'=>'ð’ˆ´','𒈵'=>'𒈵','𒈶'=>'𒈶','ð’ˆ·'=>'ð’ˆ·','𒈸'=>'𒈸','𒈹'=>'𒈹','𒈺'=>'𒈺','𒈻'=>'𒈻','𒈼'=>'𒈼','𒈽'=>'𒈽','𒈾'=>'𒈾','𒈿'=>'𒈿','𒉀'=>'𒉀','ð’‰'=>'ð’‰','𒉂'=>'𒉂','𒉃'=>'𒉃','𒉄'=>'𒉄','ð’‰…'=>'ð’‰…','𒉆'=>'𒉆','𒉇'=>'𒉇','𒉈'=>'𒉈','𒉉'=>'𒉉','𒉊'=>'𒉊','𒉋'=>'𒉋','𒉌'=>'𒉌','ð’‰'=>'ð’‰','𒉎'=>'𒉎','ð’‰'=>'ð’‰','ð’‰'=>'ð’‰','𒉑'=>'𒉑','ð’‰’'=>'ð’‰’','𒉓'=>'𒉓','𒉔'=>'𒉔','𒉕'=>'𒉕','ð’‰–'=>'ð’‰–','ð’‰—'=>'ð’‰—','𒉘'=>'𒉘','𒉙'=>'𒉙','𒉚'=>'𒉚','𒉛'=>'𒉛','𒉜'=>'𒉜','ð’‰'=>'ð’‰','𒉞'=>'𒉞','𒉟'=>'𒉟','ð’‰ '=>'ð’‰ ','𒉡'=>'𒉡','𒉢'=>'𒉢','𒉣'=>'𒉣','𒉤'=>'𒉤','𒉥'=>'𒉥','𒉦'=>'𒉦','𒉧'=>'𒉧','𒉨'=>'𒉨','𒉩'=>'𒉩','𒉪'=>'𒉪','𒉫'=>'𒉫','𒉬'=>'𒉬','ð’‰­'=>'ð’‰­','𒉮'=>'𒉮','𒉯'=>'𒉯','ð’‰°'=>'ð’‰°','𒉱'=>'𒉱','𒉲'=>'𒉲','𒉳'=>'𒉳','ð’‰´'=>'ð’‰´','𒉵'=>'𒉵','𒉶'=>'𒉶','ð’‰·'=>'ð’‰·','𒉸'=>'𒉸','𒉹'=>'𒉹','𒉺'=>'𒉺','𒉻'=>'𒉻','𒉼'=>'𒉼','𒉽'=>'𒉽','𒉾'=>'𒉾','𒉿'=>'𒉿','ð’Š€'=>'ð’Š€','ð’Š'=>'ð’Š','ð’Š‚'=>'ð’Š‚','𒊃'=>'𒊃','ð’Š„'=>'ð’Š„','ð’Š…'=>'ð’Š…','𒊆'=>'𒊆','𒊇'=>'𒊇','𒊈'=>'𒊈','𒊉'=>'𒊉','ð’ŠŠ'=>'ð’ŠŠ','ð’Š‹'=>'ð’Š‹','ð’ŠŒ'=>'ð’ŠŒ','ð’Š'=>'ð’Š','ð’ŠŽ'=>'ð’ŠŽ','ð’Š'=>'ð’Š','ð’Š'=>'ð’Š','ð’Š‘'=>'ð’Š‘','ð’Š’'=>'ð’Š’','ð’Š“'=>'ð’Š“','ð’Š”'=>'ð’Š”','ð’Š•'=>'ð’Š•','ð’Š–'=>'ð’Š–','ð’Š—'=>'ð’Š—','𒊘'=>'𒊘','ð’Š™'=>'ð’Š™','ð’Šš'=>'ð’Šš','ð’Š›'=>'ð’Š›','ð’Šœ'=>'ð’Šœ','ð’Š'=>'ð’Š','ð’Šž'=>'ð’Šž','ð’ŠŸ'=>'ð’ŠŸ','ð’Š '=>'ð’Š ','ð’Š¡'=>'ð’Š¡','ð’Š¢'=>'ð’Š¢','ð’Š£'=>'ð’Š£','𒊤'=>'𒊤','ð’Š¥'=>'ð’Š¥','𒊦'=>'𒊦','𒊧'=>'𒊧','𒊨'=>'𒊨','ð’Š©'=>'ð’Š©','𒊪'=>'𒊪','ð’Š«'=>'ð’Š«','𒊬'=>'𒊬','ð’Š­'=>'ð’Š­','ð’Š®'=>'ð’Š®','𒊯'=>'𒊯','𒊰'=>'𒊰','𒊱'=>'𒊱','𒊲'=>'𒊲','𒊳'=>'𒊳','ð’Š´'=>'ð’Š´','𒊵'=>'𒊵','𒊶'=>'𒊶','ð’Š·'=>'ð’Š·','𒊸'=>'𒊸','𒊹'=>'𒊹','𒊺'=>'𒊺','ð’Š»'=>'ð’Š»','𒊼'=>'𒊼','𒊽'=>'𒊽','𒊾'=>'𒊾','ð’Š¿'=>'ð’Š¿','ð’‹€'=>'ð’‹€','ð’‹'=>'ð’‹','ð’‹‚'=>'ð’‹‚','𒋃'=>'𒋃','ð’‹„'=>'ð’‹„','ð’‹…'=>'ð’‹…','𒋆'=>'𒋆','𒋇'=>'𒋇','𒋈'=>'𒋈','𒋉'=>'𒋉','ð’‹Š'=>'ð’‹Š','ð’‹‹'=>'ð’‹‹','ð’‹Œ'=>'ð’‹Œ','ð’‹'=>'ð’‹','ð’‹Ž'=>'ð’‹Ž','ð’‹'=>'ð’‹','ð’‹'=>'ð’‹','ð’‹‘'=>'ð’‹‘','ð’‹’'=>'ð’‹’','ð’‹“'=>'ð’‹“','ð’‹”'=>'ð’‹”','ð’‹•'=>'ð’‹•','ð’‹–'=>'ð’‹–','ð’‹—'=>'ð’‹—','𒋘'=>'𒋘','ð’‹™'=>'ð’‹™','ð’‹š'=>'ð’‹š','ð’‹›'=>'ð’‹›','ð’‹œ'=>'ð’‹œ','ð’‹'=>'ð’‹','ð’‹ž'=>'ð’‹ž','ð’‹Ÿ'=>'ð’‹Ÿ','ð’‹ '=>'ð’‹ ','ð’‹¡'=>'ð’‹¡','ð’‹¢'=>'ð’‹¢','ð’‹£'=>'ð’‹£','𒋤'=>'𒋤','ð’‹¥'=>'ð’‹¥','𒋦'=>'𒋦','ð’‹§'=>'ð’‹§','𒋨'=>'𒋨','ð’‹©'=>'ð’‹©','𒋪'=>'𒋪','ð’‹«'=>'ð’‹«','𒋬'=>'𒋬','ð’‹­'=>'ð’‹­','ð’‹®'=>'ð’‹®','𒋯'=>'𒋯','ð’‹°'=>'ð’‹°','ð’‹±'=>'ð’‹±','ð’‹²'=>'ð’‹²','ð’‹³'=>'ð’‹³','ð’‹´'=>'ð’‹´','ð’‹µ'=>'ð’‹µ','ð’‹¶'=>'ð’‹¶','ð’‹·'=>'ð’‹·','𒋸'=>'𒋸','ð’‹¹'=>'ð’‹¹','𒋺'=>'𒋺','ð’‹»'=>'ð’‹»','ð’‹¼'=>'ð’‹¼','ð’‹½'=>'ð’‹½','ð’‹¾'=>'ð’‹¾','ð’‹¿'=>'ð’‹¿','𒌀'=>'𒌀','ð’Œ'=>'ð’Œ','𒌂'=>'𒌂','𒌃'=>'𒌃','𒌄'=>'𒌄','𒌅'=>'𒌅','𒌆'=>'𒌆','𒌇'=>'𒌇','𒌈'=>'𒌈','𒌉'=>'𒌉','𒌊'=>'𒌊','𒌋'=>'𒌋','𒌌'=>'𒌌','ð’Œ'=>'ð’Œ','𒌎'=>'𒌎','ð’Œ'=>'ð’Œ','ð’Œ'=>'ð’Œ','𒌑'=>'𒌑','𒌒'=>'𒌒','𒌓'=>'𒌓','𒌔'=>'𒌔','𒌕'=>'𒌕','𒌖'=>'𒌖','𒌗'=>'𒌗','𒌘'=>'𒌘','𒌙'=>'𒌙','𒌚'=>'𒌚','𒌛'=>'𒌛','𒌜'=>'𒌜','ð’Œ'=>'ð’Œ','𒌞'=>'𒌞','𒌟'=>'𒌟','𒌠'=>'𒌠','𒌡'=>'𒌡','𒌢'=>'𒌢','𒌣'=>'𒌣','𒌤'=>'𒌤','𒌥'=>'𒌥','𒌦'=>'𒌦','𒌧'=>'𒌧','𒌨'=>'𒌨','𒌩'=>'𒌩','𒌪'=>'𒌪','𒌫'=>'𒌫','𒌬'=>'𒌬','𒌭'=>'𒌭','𒌮'=>'𒌮','𒌯'=>'𒌯','𒌰'=>'𒌰','𒌱'=>'𒌱','𒌲'=>'𒌲','𒌳'=>'𒌳','𒌴'=>'𒌴','𒌵'=>'𒌵','𒌶'=>'𒌶','𒌷'=>'𒌷','𒌸'=>'𒌸','𒌹'=>'𒌹','𒌺'=>'𒌺','𒌻'=>'𒌻','𒌼'=>'𒌼','𒌽'=>'𒌽','𒌾'=>'𒌾','𒌿'=>'𒌿','ð’€'=>'ð’€','ð’'=>'ð’','ð’‚'=>'ð’‚','ð’ƒ'=>'ð’ƒ','ð’„'=>'ð’„','ð’…'=>'ð’…','ð’†'=>'ð’†','ð’‡'=>'ð’‡','ð’ˆ'=>'ð’ˆ','ð’‰'=>'ð’‰','ð’Š'=>'ð’Š','ð’‹'=>'ð’‹','ð’Œ'=>'ð’Œ','ð’'=>'ð’','ð’Ž'=>'ð’Ž','ð’'=>'ð’','ð’'=>'ð’','ð’‘'=>'ð’‘','ð’’'=>'ð’’','ð’“'=>'ð’“','ð’”'=>'ð’”','ð’•'=>'ð’•','ð’–'=>'ð’–','ð’—'=>'ð’—','ð’˜'=>'ð’˜','ð’™'=>'ð’™','ð’š'=>'ð’š','ð’›'=>'ð’›','ð’œ'=>'ð’œ','ð’'=>'ð’','ð’ž'=>'ð’ž','ð’Ÿ'=>'ð’Ÿ','ð’ '=>'ð’ ','ð’¡'=>'ð’¡','ð’¢'=>'ð’¢','ð’£'=>'ð’£','ð’¤'=>'ð’¤','ð’¥'=>'ð’¥','ð’¦'=>'ð’¦','ð’§'=>'ð’§','ð’¨'=>'ð’¨','ð’©'=>'ð’©','ð’ª'=>'ð’ª','ð’«'=>'ð’«','ð’¬'=>'ð’¬','ð’­'=>'ð’­','ð’®'=>'ð’®','ð’€'=>'2','ð’'=>'3','ð’‚'=>'4','ð’ƒ'=>'5','ð’„'=>'6','ð’…'=>'7','ð’†'=>'8','ð’‡'=>'9','ð’ˆ'=>'3','ð’‰'=>'4','ð’Š'=>'5','ð’‹'=>'6','ð’Œ'=>'7','ð’'=>'8','ð’Ž'=>'9','ð’'=>'4','ð’'=>'5','ð’‘'=>'6','ð’’'=>'7','ð’“'=>'8','ð’”'=>'9','ð’•'=>'1','ð’–'=>'2','ð’—'=>'3','ð’˜'=>'4','ð’™'=>'5','ð’š'=>'6','ð’›'=>'7','ð’œ'=>'8','ð’'=>'9','ð’ž'=>'1','ð’Ÿ'=>'2','ð’ '=>'3','ð’¡'=>'4','ð’¢'=>'5','ð’£'=>'2','ð’¤'=>'3','ð’¥'=>'3','ð’¦'=>'4','ð’§'=>'5','ð’¨'=>'6','ð’©'=>'7','ð’ª'=>'8','ð’«'=>'9','ð’¬'=>'1','ð’­'=>'2','ð’®'=>'3','ð’¯'=>'3','ð’°'=>'4','ð’±'=>'5','ð’²'=>'ð’²','ð’³'=>'ð’³','ð’´'=>'1','ð’µ'=>'2','ð’¶'=>'3','ð’·'=>'3','ð’¸'=>'4','ð’¹'=>'5','ð’º'=>'3','ð’»'=>'3','ð’¼'=>'4','ð’½'=>'4','ð’¾'=>'4','ð’¿'=>'4','ð’‘€'=>'6','ð’‘'=>'7','ð’‘‚'=>'7','𒑃'=>'7','ð’‘„'=>'8','ð’‘…'=>'8','𒑆'=>'9','𒑇'=>'9','𒑈'=>'9','𒑉'=>'9','ð’‘Š'=>'2','ð’‘‹'=>'3','ð’‘Œ'=>'4','ð’‘'=>'5','ð’‘Ž'=>'6','ð’‘'=>'1','ð’‘'=>'2','ð’‘‘'=>'3','ð’‘’'=>'4','ð’‘“'=>'4','ð’‘”'=>'5','ð’‘•'=>'5','ð’‘–'=>'ð’‘–','ð’‘—'=>'ð’‘—','𒑘'=>'1','ð’‘™'=>'2','ð’‘š'=>'1/3','ð’‘›'=>'2/3','ð’‘œ'=>'5/6','ð’‘'=>'1/3','ð’‘ž'=>'2/3','ð’‘Ÿ'=>'1/8','ð’‘ '=>'1/4','ð’‘¡'=>'1/6','ð’‘¢'=>'1/4'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_4.php b/phpBB/includes/utf/data/search_indexer_4.php deleted file mode 100644 index 51acbff1c2..0000000000 --- a/phpBB/includes/utf/data/search_indexer_4.php +++ /dev/null @@ -1 +0,0 @@ -'0','â±'=>'â±','â´'=>'4','âµ'=>'5','â¶'=>'6','â·'=>'7','â¸'=>'8','â¹'=>'9','â¿'=>'â¿','â‚€'=>'0','â‚'=>'1','â‚‚'=>'2','₃'=>'3','â‚„'=>'4','â‚…'=>'5','₆'=>'6','₇'=>'7','₈'=>'8','₉'=>'9','â‚'=>'â‚','â‚‘'=>'â‚‘','â‚’'=>'â‚’','â‚“'=>'â‚“','â‚”'=>'â‚”','âƒ'=>'âƒ','⃑'=>'⃑','⃒'=>'⃒','⃓'=>'⃓','⃔'=>'⃔','⃕'=>'⃕','⃖'=>'⃖','⃗'=>'⃗','⃘'=>'⃘','⃙'=>'⃙','⃚'=>'⃚','⃛'=>'⃛','⃜'=>'⃜','âƒ'=>'âƒ','⃞'=>'⃞','⃟'=>'⃟','⃠'=>'⃠','⃡'=>'⃡','⃢'=>'⃢','⃣'=>'⃣','⃤'=>'⃤','⃥'=>'⃥','⃦'=>'⃦','⃧'=>'⃧','⃨'=>'⃨','⃩'=>'⃩','⃪'=>'⃪','⃫'=>'⃫','⃬'=>'⃬','⃭'=>'⃭','⃮'=>'⃮','⃯'=>'⃯','â„‚'=>'â„‚','ℇ'=>'ℇ','ℊ'=>'ℊ','â„‹'=>'â„‹','ℌ'=>'ℌ','â„'=>'â„','ℎ'=>'ℎ','â„'=>'â„','â„'=>'â„','â„‘'=>'â„‘','â„’'=>'â„’','â„“'=>'â„“','â„•'=>'â„•','â„™'=>'â„™','ℚ'=>'ℚ','â„›'=>'â„›','ℜ'=>'ℜ','â„'=>'â„','ℤ'=>'ℤ','Ω'=>'ω','ℨ'=>'ℨ','K'=>'k','â„«'=>'Ã¥','ℬ'=>'ℬ','â„­'=>'â„­','ℯ'=>'ℯ','â„°'=>'â„°','ℱ'=>'ℱ','Ⅎ'=>'â…Ž','ℳ'=>'ℳ','â„´'=>'â„´','ℵ'=>'ℵ','â„¶'=>'â„¶','â„·'=>'â„·','ℸ'=>'ℸ','ℹ'=>'ℹ','ℼ'=>'ℼ','ℽ'=>'ℽ','ℾ'=>'ℾ','â„¿'=>'â„¿','â……'=>'â……','â…†'=>'â…†','â…‡'=>'â…‡','â…ˆ'=>'â…ˆ','â…‰'=>'â…‰','â…Ž'=>'â…Ž','â…“'=>'1/3','â…”'=>'2/3','â…•'=>'1/5','â…–'=>'2/5','â…—'=>'3/5','â…˜'=>'4/5','â…™'=>'1/6','â…š'=>'5/6','â…›'=>'1/8','â…œ'=>'3/8','â…'=>'5/8','â…ž'=>'7/8','â…Ÿ'=>'1','â… '=>'1','â…¡'=>'2','â…¢'=>'3','â…£'=>'4','â…¤'=>'5','â…¥'=>'6','â…¦'=>'7','â…§'=>'8','â…¨'=>'9','â…©'=>'10','â…ª'=>'11','â…«'=>'12','â…¬'=>'50','â…­'=>'100','â…®'=>'500','â…¯'=>'1000','â…°'=>'1','â…±'=>'2','â…²'=>'3','â…³'=>'4','â…´'=>'5','â…µ'=>'6','â…¶'=>'7','â…·'=>'8','â…¸'=>'9','â…¹'=>'10','â…º'=>'11','â…»'=>'12','â…¼'=>'50','â…½'=>'100','â…¾'=>'500','â…¿'=>'1000','ↀ'=>'1000','â†'=>'5000','ↂ'=>'10000','Ↄ'=>'ↄ','ↄ'=>'ↄ','â‘ '=>'1','â‘¡'=>'2','â‘¢'=>'3','â‘£'=>'4','⑤'=>'5','â‘¥'=>'6','⑦'=>'7','â‘§'=>'8','⑨'=>'9','â‘©'=>'10','⑪'=>'11','â‘«'=>'12','⑬'=>'13','â‘­'=>'14','â‘®'=>'15','⑯'=>'16','â‘°'=>'17','⑱'=>'18','⑲'=>'19','⑳'=>'20','â‘´'=>'1','⑵'=>'2','â‘¶'=>'3','â‘·'=>'4','⑸'=>'5','⑹'=>'6','⑺'=>'7','â‘»'=>'8','⑼'=>'9','⑽'=>'10','⑾'=>'11','â‘¿'=>'12','â’€'=>'13','â’'=>'14','â’‚'=>'15','â’ƒ'=>'16','â’„'=>'17','â’…'=>'18','â’†'=>'19','â’‡'=>'20','â’ˆ'=>'1','â’‰'=>'2','â’Š'=>'3','â’‹'=>'4','â’Œ'=>'5','â’'=>'6','â’Ž'=>'7','â’'=>'8','â’'=>'9','â’‘'=>'10','â’’'=>'11','â’“'=>'12','â’”'=>'13','â’•'=>'14','â’–'=>'15','â’—'=>'16','â’˜'=>'17','â’™'=>'18','â’š'=>'19','â’›'=>'20','⓪'=>'0','â“«'=>'11','⓬'=>'12','â“­'=>'13','â“®'=>'14','⓯'=>'15','â“°'=>'16','⓱'=>'17','⓲'=>'18','⓳'=>'19','â“´'=>'20','⓵'=>'1','â“¶'=>'2','â“·'=>'3','⓸'=>'4','⓹'=>'5','⓺'=>'6','â“»'=>'7','⓼'=>'8','⓽'=>'9','⓾'=>'10','â“¿'=>'0','â¶'=>'1','â·'=>'2','â¸'=>'3','â¹'=>'4','âº'=>'5','â»'=>'6','â¼'=>'7','â½'=>'8','â¾'=>'9','â¿'=>'10','➀'=>'1','âž'=>'2','âž‚'=>'3','➃'=>'4','âž„'=>'5','âž…'=>'6','➆'=>'7','➇'=>'8','➈'=>'9','➉'=>'10','➊'=>'1','âž‹'=>'2','➌'=>'3','âž'=>'4','➎'=>'5','âž'=>'6','âž'=>'7','âž‘'=>'8','âž’'=>'9','âž“'=>'10'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_448.php b/phpBB/includes/utf/data/search_indexer_448.php deleted file mode 100644 index 32ac28a549..0000000000 --- a/phpBB/includes/utf/data/search_indexer_448.php +++ /dev/null @@ -1 +0,0 @@ -'ó „€','ó „'=>'ó „','ó „‚'=>'ó „‚','󠄃'=>'󠄃','ó „„'=>'ó „„','ó „…'=>'ó „…','󠄆'=>'󠄆','󠄇'=>'󠄇','󠄈'=>'󠄈','󠄉'=>'󠄉','ó „Š'=>'ó „Š','ó „‹'=>'ó „‹','ó „Œ'=>'ó „Œ','ó „'=>'ó „','ó „Ž'=>'ó „Ž','ó „'=>'ó „','ó „'=>'ó „','ó „‘'=>'ó „‘','ó „’'=>'ó „’','ó „“'=>'ó „“','ó „”'=>'ó „”','ó „•'=>'ó „•','ó „–'=>'ó „–','ó „—'=>'ó „—','󠄘'=>'󠄘','ó „™'=>'ó „™','ó „š'=>'ó „š','ó „›'=>'ó „›','ó „œ'=>'ó „œ','ó „'=>'ó „','ó „ž'=>'ó „ž','ó „Ÿ'=>'ó „Ÿ','ó „ '=>'ó „ ','ó „¡'=>'ó „¡','ó „¢'=>'ó „¢','ó „£'=>'ó „£','󠄤'=>'󠄤','ó „¥'=>'ó „¥','󠄦'=>'󠄦','ó „§'=>'ó „§','󠄨'=>'󠄨','ó „©'=>'ó „©','󠄪'=>'󠄪','ó „«'=>'ó „«','󠄬'=>'󠄬','ó „­'=>'ó „­','ó „®'=>'ó „®','󠄯'=>'󠄯','ó „°'=>'ó „°','ó „±'=>'ó „±','ó „²'=>'ó „²','ó „³'=>'ó „³','ó „´'=>'ó „´','ó „µ'=>'ó „µ','ó „¶'=>'ó „¶','ó „·'=>'ó „·','󠄸'=>'󠄸','ó „¹'=>'ó „¹','󠄺'=>'󠄺','ó „»'=>'ó „»','ó „¼'=>'ó „¼','ó „½'=>'ó „½','ó „¾'=>'ó „¾','ó „¿'=>'ó „¿','ó …€'=>'ó …€','ó …'=>'ó …','ó …‚'=>'ó …‚','ó …ƒ'=>'ó …ƒ','ó …„'=>'ó …„','ó ……'=>'ó ……','ó …†'=>'ó …†','ó …‡'=>'ó …‡','ó …ˆ'=>'ó …ˆ','ó …‰'=>'ó …‰','ó …Š'=>'ó …Š','ó …‹'=>'ó …‹','ó …Œ'=>'ó …Œ','ó …'=>'ó …','ó …Ž'=>'ó …Ž','ó …'=>'ó …','ó …'=>'ó …','ó …‘'=>'ó …‘','ó …’'=>'ó …’','ó …“'=>'ó …“','ó …”'=>'ó …”','ó …•'=>'ó …•','ó …–'=>'ó …–','ó …—'=>'ó …—','ó …˜'=>'ó …˜','ó …™'=>'ó …™','ó …š'=>'ó …š','ó …›'=>'ó …›','ó …œ'=>'ó …œ','ó …'=>'ó …','ó …ž'=>'ó …ž','ó …Ÿ'=>'ó …Ÿ','ó … '=>'ó … ','ó …¡'=>'ó …¡','ó …¢'=>'ó …¢','ó …£'=>'ó …£','ó …¤'=>'ó …¤','ó …¥'=>'ó …¥','ó …¦'=>'ó …¦','ó …§'=>'ó …§','ó …¨'=>'ó …¨','ó …©'=>'ó …©','ó …ª'=>'ó …ª','ó …«'=>'ó …«','ó …¬'=>'ó …¬','ó …­'=>'ó …­','ó …®'=>'ó …®','ó …¯'=>'ó …¯','ó …°'=>'ó …°','ó …±'=>'ó …±','ó …²'=>'ó …²','ó …³'=>'ó …³','ó …´'=>'ó …´','ó …µ'=>'ó …µ','ó …¶'=>'ó …¶','ó …·'=>'ó …·','ó …¸'=>'ó …¸','ó …¹'=>'ó …¹','ó …º'=>'ó …º','ó …»'=>'ó …»','ó …¼'=>'ó …¼','ó …½'=>'ó …½','ó …¾'=>'ó …¾','ó …¿'=>'ó …¿','󠆀'=>'󠆀','ó †'=>'ó †','󠆂'=>'󠆂','󠆃'=>'󠆃','󠆄'=>'󠆄','ó †…'=>'ó †…','󠆆'=>'󠆆','󠆇'=>'󠆇','󠆈'=>'󠆈','󠆉'=>'󠆉','󠆊'=>'󠆊','󠆋'=>'󠆋','󠆌'=>'󠆌','ó †'=>'ó †','󠆎'=>'󠆎','ó †'=>'ó †','ó †'=>'ó †','󠆑'=>'󠆑','ó †’'=>'ó †’','󠆓'=>'󠆓','󠆔'=>'󠆔','󠆕'=>'󠆕','ó †–'=>'ó †–','ó †—'=>'ó †—','󠆘'=>'󠆘','󠆙'=>'󠆙','󠆚'=>'󠆚','󠆛'=>'󠆛','󠆜'=>'󠆜','ó †'=>'ó †','󠆞'=>'󠆞','󠆟'=>'󠆟','ó † '=>'ó † ','󠆡'=>'󠆡','󠆢'=>'󠆢','󠆣'=>'󠆣','󠆤'=>'󠆤','󠆥'=>'󠆥','󠆦'=>'󠆦','󠆧'=>'󠆧','󠆨'=>'󠆨','󠆩'=>'󠆩','󠆪'=>'󠆪','󠆫'=>'󠆫','󠆬'=>'󠆬','ó †­'=>'ó †­','󠆮'=>'󠆮','󠆯'=>'󠆯','ó †°'=>'ó †°','󠆱'=>'󠆱','󠆲'=>'󠆲','󠆳'=>'󠆳','ó †´'=>'ó †´','󠆵'=>'󠆵','󠆶'=>'󠆶','ó †·'=>'ó †·','󠆸'=>'󠆸','󠆹'=>'󠆹','󠆺'=>'󠆺','󠆻'=>'󠆻','󠆼'=>'󠆼','󠆽'=>'󠆽','󠆾'=>'󠆾','󠆿'=>'󠆿','󠇀'=>'󠇀','ó ‡'=>'ó ‡','󠇂'=>'󠇂','󠇃'=>'󠇃','󠇄'=>'󠇄','ó ‡…'=>'ó ‡…','󠇆'=>'󠇆','󠇇'=>'󠇇','󠇈'=>'󠇈','󠇉'=>'󠇉','󠇊'=>'󠇊','󠇋'=>'󠇋','󠇌'=>'󠇌','ó ‡'=>'ó ‡','󠇎'=>'󠇎','ó ‡'=>'ó ‡','ó ‡'=>'ó ‡','󠇑'=>'󠇑','ó ‡’'=>'ó ‡’','󠇓'=>'󠇓','󠇔'=>'󠇔','󠇕'=>'󠇕','ó ‡–'=>'ó ‡–','ó ‡—'=>'ó ‡—','󠇘'=>'󠇘','󠇙'=>'󠇙','󠇚'=>'󠇚','󠇛'=>'󠇛','󠇜'=>'󠇜','ó ‡'=>'ó ‡','󠇞'=>'󠇞','󠇟'=>'󠇟','ó ‡ '=>'ó ‡ ','󠇡'=>'󠇡','󠇢'=>'󠇢','󠇣'=>'󠇣','󠇤'=>'󠇤','󠇥'=>'󠇥','󠇦'=>'󠇦','󠇧'=>'󠇧','󠇨'=>'󠇨','󠇩'=>'󠇩','󠇪'=>'󠇪','󠇫'=>'󠇫','󠇬'=>'󠇬','ó ‡­'=>'ó ‡­','󠇮'=>'󠇮','󠇯'=>'󠇯'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_5.php b/phpBB/includes/utf/data/search_indexer_5.php deleted file mode 100644 index 0f1228a394..0000000000 --- a/phpBB/includes/utf/data/search_indexer_5.php +++ /dev/null @@ -1 +0,0 @@ -'â°°','â°'=>'â°±','â°‚'=>'â°²','â°ƒ'=>'â°³','â°„'=>'â°´','â°…'=>'â°µ','â°†'=>'â°¶','â°‡'=>'â°·','â°ˆ'=>'â°¸','â°‰'=>'â°¹','â°Š'=>'â°º','â°‹'=>'â°»','â°Œ'=>'â°¼','â°'=>'â°½','â°Ž'=>'â°¾','â°'=>'â°¿','â°'=>'â±€','â°‘'=>'â±','â°’'=>'ⱂ','â°“'=>'ⱃ','â°”'=>'ⱄ','â°•'=>'â±…','â°–'=>'ⱆ','â°—'=>'ⱇ','â°˜'=>'ⱈ','â°™'=>'ⱉ','â°š'=>'ⱊ','â°›'=>'ⱋ','â°œ'=>'ⱌ','â°'=>'â±','â°ž'=>'ⱎ','â°Ÿ'=>'â±','â° '=>'â±','â°¡'=>'ⱑ','â°¢'=>'â±’','â°£'=>'ⱓ','â°¤'=>'â±”','â°¥'=>'ⱕ','â°¦'=>'â±–','â°§'=>'â±—','â°¨'=>'ⱘ','â°©'=>'â±™','â°ª'=>'ⱚ','â°«'=>'â±›','â°¬'=>'ⱜ','â°­'=>'â±','â°®'=>'ⱞ','â°°'=>'â°°','â°±'=>'â°±','â°²'=>'â°²','â°³'=>'â°³','â°´'=>'â°´','â°µ'=>'â°µ','â°¶'=>'â°¶','â°·'=>'â°·','â°¸'=>'â°¸','â°¹'=>'â°¹','â°º'=>'â°º','â°»'=>'â°»','â°¼'=>'â°¼','â°½'=>'â°½','â°¾'=>'â°¾','â°¿'=>'â°¿','â±€'=>'â±€','â±'=>'â±','ⱂ'=>'ⱂ','ⱃ'=>'ⱃ','ⱄ'=>'ⱄ','â±…'=>'â±…','ⱆ'=>'ⱆ','ⱇ'=>'ⱇ','ⱈ'=>'ⱈ','ⱉ'=>'ⱉ','ⱊ'=>'ⱊ','ⱋ'=>'ⱋ','ⱌ'=>'ⱌ','â±'=>'â±','ⱎ'=>'ⱎ','â±'=>'â±','â±'=>'â±','ⱑ'=>'ⱑ','â±’'=>'â±’','ⱓ'=>'ⱓ','â±”'=>'â±”','ⱕ'=>'ⱕ','â±–'=>'â±–','â±—'=>'â±—','ⱘ'=>'ⱘ','â±™'=>'â±™','ⱚ'=>'ⱚ','â±›'=>'â±›','ⱜ'=>'ⱜ','â±'=>'â±','ⱞ'=>'ⱞ','â± '=>'ⱡ','ⱡ'=>'ⱡ','â±¢'=>'É«','â±£'=>'áµ½','Ɽ'=>'ɽ','â±¥'=>'â±¥','ⱦ'=>'ⱦ','â±§'=>'ⱨ','ⱨ'=>'ⱨ','Ⱪ'=>'ⱪ','ⱪ'=>'ⱪ','Ⱬ'=>'ⱬ','ⱬ'=>'ⱬ','â±´'=>'â±´','â±µ'=>'â±¶','â±¶'=>'â±¶','â±·'=>'â±·','â²€'=>'â²','â²'=>'â²','Ⲃ'=>'ⲃ','ⲃ'=>'ⲃ','Ⲅ'=>'â²…','â²…'=>'â²…','Ⲇ'=>'ⲇ','ⲇ'=>'ⲇ','Ⲉ'=>'ⲉ','ⲉ'=>'ⲉ','Ⲋ'=>'ⲋ','ⲋ'=>'ⲋ','Ⲍ'=>'â²','â²'=>'â²','Ⲏ'=>'â²','â²'=>'â²','â²'=>'ⲑ','ⲑ'=>'ⲑ','â²’'=>'ⲓ','ⲓ'=>'ⲓ','â²”'=>'ⲕ','ⲕ'=>'ⲕ','â²–'=>'â²—','â²—'=>'â²—','Ⲙ'=>'â²™','â²™'=>'â²™','Ⲛ'=>'â²›','â²›'=>'â²›','Ⲝ'=>'â²','â²'=>'â²','Ⲟ'=>'ⲟ','ⲟ'=>'ⲟ','â² '=>'ⲡ','ⲡ'=>'ⲡ','â²¢'=>'â²£','â²£'=>'â²£','Ⲥ'=>'â²¥','â²¥'=>'â²¥','Ⲧ'=>'â²§','â²§'=>'â²§','Ⲩ'=>'ⲩ','ⲩ'=>'ⲩ','Ⲫ'=>'ⲫ','ⲫ'=>'ⲫ','Ⲭ'=>'â²­','â²­'=>'â²­','â²®'=>'ⲯ','ⲯ'=>'ⲯ','â²°'=>'â²±','â²±'=>'â²±','â²²'=>'â²³','â²³'=>'â²³','â²´'=>'â²µ','â²µ'=>'â²µ','â²¶'=>'â²·','â²·'=>'â²·','Ⲹ'=>'â²¹','â²¹'=>'â²¹','Ⲻ'=>'â²»','â²»'=>'â²»','â²¼'=>'â²½','â²½'=>'â²½','â²¾'=>'ⲿ','ⲿ'=>'ⲿ','â³€'=>'â³','â³'=>'â³','Ⳃ'=>'ⳃ','ⳃ'=>'ⳃ','Ⳅ'=>'â³…','â³…'=>'â³…','Ⳇ'=>'ⳇ','ⳇ'=>'ⳇ','Ⳉ'=>'ⳉ','ⳉ'=>'ⳉ','Ⳋ'=>'ⳋ','ⳋ'=>'ⳋ','Ⳍ'=>'â³','â³'=>'â³','Ⳏ'=>'â³','â³'=>'â³','â³'=>'ⳑ','ⳑ'=>'ⳑ','â³’'=>'ⳓ','ⳓ'=>'ⳓ','â³”'=>'ⳕ','ⳕ'=>'ⳕ','â³–'=>'â³—','â³—'=>'â³—','Ⳙ'=>'â³™','â³™'=>'â³™','Ⳛ'=>'â³›','â³›'=>'â³›','Ⳝ'=>'â³','â³'=>'â³','Ⳟ'=>'ⳟ','ⳟ'=>'ⳟ','â³ '=>'ⳡ','ⳡ'=>'ⳡ','â³¢'=>'â³£','â³£'=>'â³£','ⳤ'=>'ⳤ','â³½'=>'1/2','â´€'=>'â´€','â´'=>'â´','â´‚'=>'â´‚','â´ƒ'=>'â´ƒ','â´„'=>'â´„','â´…'=>'â´…','â´†'=>'â´†','â´‡'=>'â´‡','â´ˆ'=>'â´ˆ','â´‰'=>'â´‰','â´Š'=>'â´Š','â´‹'=>'â´‹','â´Œ'=>'â´Œ','â´'=>'â´','â´Ž'=>'â´Ž','â´'=>'â´','â´'=>'â´','â´‘'=>'â´‘','â´’'=>'â´’','â´“'=>'â´“','â´”'=>'â´”','â´•'=>'â´•','â´–'=>'â´–','â´—'=>'â´—','â´˜'=>'â´˜','â´™'=>'â´™','â´š'=>'â´š','â´›'=>'â´›','â´œ'=>'â´œ','â´'=>'â´','â´ž'=>'â´ž','â´Ÿ'=>'â´Ÿ','â´ '=>'â´ ','â´¡'=>'â´¡','â´¢'=>'â´¢','â´£'=>'â´£','â´¤'=>'â´¤','â´¥'=>'â´¥','â´°'=>'â´°','â´±'=>'â´±','â´²'=>'â´²','â´³'=>'â´³','â´´'=>'â´´','â´µ'=>'â´µ','â´¶'=>'â´¶','â´·'=>'â´·','â´¸'=>'â´¸','â´¹'=>'â´¹','â´º'=>'â´º','â´»'=>'â´»','â´¼'=>'â´¼','â´½'=>'â´½','â´¾'=>'â´¾','â´¿'=>'â´¿','âµ€'=>'âµ€','âµ'=>'âµ','ⵂ'=>'ⵂ','ⵃ'=>'ⵃ','ⵄ'=>'ⵄ','âµ…'=>'âµ…','ⵆ'=>'ⵆ','ⵇ'=>'ⵇ','ⵈ'=>'ⵈ','ⵉ'=>'ⵉ','ⵊ'=>'ⵊ','ⵋ'=>'ⵋ','ⵌ'=>'ⵌ','âµ'=>'âµ','ⵎ'=>'ⵎ','âµ'=>'âµ','âµ'=>'âµ','ⵑ'=>'ⵑ','âµ’'=>'âµ’','ⵓ'=>'ⵓ','âµ”'=>'âµ”','ⵕ'=>'ⵕ','âµ–'=>'âµ–','âµ—'=>'âµ—','ⵘ'=>'ⵘ','âµ™'=>'âµ™','ⵚ'=>'ⵚ','âµ›'=>'âµ›','ⵜ'=>'ⵜ','âµ'=>'âµ','ⵞ'=>'ⵞ','ⵟ'=>'ⵟ','âµ '=>'âµ ','ⵡ'=>'ⵡ','âµ¢'=>'âµ¢','âµ£'=>'âµ£','ⵤ'=>'ⵤ','âµ¥'=>'âµ¥','ⵯ'=>'ⵯ','â¶€'=>'â¶€','â¶'=>'â¶','â¶‚'=>'â¶‚','ⶃ'=>'ⶃ','â¶„'=>'â¶„','â¶…'=>'â¶…','ⶆ'=>'ⶆ','ⶇ'=>'ⶇ','ⶈ'=>'ⶈ','ⶉ'=>'ⶉ','â¶Š'=>'â¶Š','â¶‹'=>'â¶‹','â¶Œ'=>'â¶Œ','â¶'=>'â¶','â¶Ž'=>'â¶Ž','â¶'=>'â¶','â¶'=>'â¶','â¶‘'=>'â¶‘','â¶’'=>'â¶’','â¶“'=>'â¶“','â¶”'=>'â¶”','â¶•'=>'â¶•','â¶–'=>'â¶–','â¶ '=>'â¶ ','â¶¡'=>'â¶¡','â¶¢'=>'â¶¢','â¶£'=>'â¶£','ⶤ'=>'ⶤ','â¶¥'=>'â¶¥','ⶦ'=>'ⶦ','ⶨ'=>'ⶨ','â¶©'=>'â¶©','ⶪ'=>'ⶪ','â¶«'=>'â¶«','ⶬ'=>'ⶬ','â¶­'=>'â¶­','â¶®'=>'â¶®','â¶°'=>'â¶°','â¶±'=>'â¶±','â¶²'=>'â¶²','â¶³'=>'â¶³','â¶´'=>'â¶´','â¶µ'=>'â¶µ','â¶¶'=>'â¶¶','ⶸ'=>'ⶸ','â¶¹'=>'â¶¹','ⶺ'=>'ⶺ','â¶»'=>'â¶»','â¶¼'=>'â¶¼','â¶½'=>'â¶½','â¶¾'=>'â¶¾','â·€'=>'â·€','â·'=>'â·','â·‚'=>'â·‚','â·ƒ'=>'â·ƒ','â·„'=>'â·„','â·…'=>'â·…','â·†'=>'â·†','â·ˆ'=>'â·ˆ','â·‰'=>'â·‰','â·Š'=>'â·Š','â·‹'=>'â·‹','â·Œ'=>'â·Œ','â·'=>'â·','â·Ž'=>'â·Ž','â·'=>'â·','â·‘'=>'â·‘','â·’'=>'â·’','â·“'=>'â·“','â·”'=>'â·”','â·•'=>'â·•','â·–'=>'â·–','â·˜'=>'â·˜','â·™'=>'â·™','â·š'=>'â·š','â·›'=>'â·›','â·œ'=>'â·œ','â·'=>'â·','â·ž'=>'â·ž'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_58.php b/phpBB/includes/utf/data/search_indexer_58.php deleted file mode 100644 index 8902bc7995..0000000000 --- a/phpBB/includes/utf/data/search_indexer_58.php +++ /dev/null @@ -1 +0,0 @@ -'ð…¥','ð…¦'=>'ð…¦','ð…§'=>'ð…§','ð…¨'=>'ð…¨','ð…©'=>'ð…©','ð…­'=>'ð…­','ð…®'=>'ð…®','ð…¯'=>'ð…¯','ð…°'=>'ð…°','ð…±'=>'ð…±','ð…²'=>'ð…²','ð…»'=>'ð…»','ð…¼'=>'ð…¼','ð…½'=>'ð…½','ð…¾'=>'ð…¾','ð…¿'=>'ð…¿','ð†€'=>'ð†€','ð†'=>'ð†','ð†‚'=>'ð†‚','ð†…'=>'ð†…','ð††'=>'ð††','ð†‡'=>'ð†‡','ð†ˆ'=>'ð†ˆ','ð†‰'=>'ð†‰','ð†Š'=>'ð†Š','ð†‹'=>'ð†‹','ð†ª'=>'ð†ª','ð†«'=>'ð†«','ð†¬'=>'ð†¬','ð†­'=>'ð†­','ð‰‚'=>'ð‰‚','ð‰ƒ'=>'ð‰ƒ','ð‰„'=>'ð‰„','ð '=>'1','ð¡'=>'2','ð¢'=>'3','ð£'=>'4','ð¤'=>'5','ð¥'=>'6','ð¦'=>'7','ð§'=>'8','ð¨'=>'9','ð©'=>'10','ðª'=>'20','ð«'=>'30','ð¬'=>'40','ð­'=>'50','ð®'=>'60','ð¯'=>'70','ð°'=>'80','ð±'=>'90','ð€'=>'ð€','ð'=>'ð','ð‚'=>'ð‚','ðƒ'=>'ðƒ','ð„'=>'ð„','ð…'=>'ð…','ð†'=>'ð†','ð‡'=>'ð‡','ðˆ'=>'ðˆ','ð‰'=>'ð‰','ðŠ'=>'ðŠ','ð‹'=>'ð‹','ðŒ'=>'ðŒ','ð'=>'ð','ðŽ'=>'ðŽ','ð'=>'ð','ð'=>'ð','ð‘'=>'ð‘','ð’'=>'ð’','ð“'=>'ð“','ð”'=>'ð”','ð•'=>'ð•','ð–'=>'ð–','ð—'=>'ð—','ð˜'=>'ð˜','ð™'=>'ð™','ðš'=>'ðš','ð›'=>'ð›','ðœ'=>'ðœ','ð'=>'ð','ðž'=>'ðž','ðŸ'=>'ðŸ','ð '=>'ð ','ð¡'=>'ð¡','ð¢'=>'ð¢','ð£'=>'ð£','ð¤'=>'ð¤','ð¥'=>'ð¥','ð¦'=>'ð¦','ð§'=>'ð§','ð¨'=>'ð¨','ð©'=>'ð©','ðª'=>'ðª','ð«'=>'ð«','ð¬'=>'ð¬','ð­'=>'ð­','ð®'=>'ð®','ð¯'=>'ð¯','ð°'=>'ð°','ð±'=>'ð±','ð²'=>'ð²','ð³'=>'ð³','ð´'=>'ð´','ðµ'=>'ðµ','ð¶'=>'ð¶','ð·'=>'ð·','ð¸'=>'ð¸','ð¹'=>'ð¹','ðº'=>'ðº','ð»'=>'ð»','ð¼'=>'ð¼','ð½'=>'ð½','ð¾'=>'ð¾','ð¿'=>'ð¿','ð‘€'=>'ð‘€','ð‘'=>'ð‘','ð‘‚'=>'ð‘‚','ð‘ƒ'=>'ð‘ƒ','ð‘„'=>'ð‘„','ð‘…'=>'ð‘…','ð‘†'=>'ð‘†','ð‘‡'=>'ð‘‡','ð‘ˆ'=>'ð‘ˆ','ð‘‰'=>'ð‘‰','ð‘Š'=>'ð‘Š','ð‘‹'=>'ð‘‹','ð‘Œ'=>'ð‘Œ','ð‘'=>'ð‘','ð‘Ž'=>'ð‘Ž','ð‘'=>'ð‘','ð‘'=>'ð‘','ð‘‘'=>'ð‘‘','ð‘’'=>'ð‘’','ð‘“'=>'ð‘“','ð‘”'=>'ð‘”','ð‘–'=>'ð‘–','ð‘—'=>'ð‘—','ð‘˜'=>'ð‘˜','ð‘™'=>'ð‘™','ð‘š'=>'ð‘š','ð‘›'=>'ð‘›','ð‘œ'=>'ð‘œ','ð‘'=>'ð‘','ð‘ž'=>'ð‘ž','ð‘Ÿ'=>'ð‘Ÿ','ð‘ '=>'ð‘ ','ð‘¡'=>'ð‘¡','ð‘¢'=>'ð‘¢','ð‘£'=>'ð‘£','ð‘¤'=>'ð‘¤','ð‘¥'=>'ð‘¥','ð‘¦'=>'ð‘¦','ð‘§'=>'ð‘§','ð‘¨'=>'ð‘¨','ð‘©'=>'ð‘©','ð‘ª'=>'ð‘ª','ð‘«'=>'ð‘«','ð‘¬'=>'ð‘¬','ð‘­'=>'ð‘­','ð‘®'=>'ð‘®','ð‘¯'=>'ð‘¯','ð‘°'=>'ð‘°','ð‘±'=>'ð‘±','ð‘²'=>'ð‘²','ð‘³'=>'ð‘³','ð‘´'=>'ð‘´','ð‘µ'=>'ð‘µ','ð‘¶'=>'ð‘¶','ð‘·'=>'ð‘·','ð‘¸'=>'ð‘¸','ð‘¹'=>'ð‘¹','ð‘º'=>'ð‘º','ð‘»'=>'ð‘»','ð‘¼'=>'ð‘¼','ð‘½'=>'ð‘½','ð‘¾'=>'ð‘¾','ð‘¿'=>'ð‘¿','ð’€'=>'ð’€','ð’'=>'ð’','ð’‚'=>'ð’‚','ð’ƒ'=>'ð’ƒ','ð’„'=>'ð’„','ð’…'=>'ð’…','ð’†'=>'ð’†','ð’‡'=>'ð’‡','ð’ˆ'=>'ð’ˆ','ð’‰'=>'ð’‰','ð’Š'=>'ð’Š','ð’‹'=>'ð’‹','ð’Œ'=>'ð’Œ','ð’'=>'ð’','ð’Ž'=>'ð’Ž','ð’'=>'ð’','ð’'=>'ð’','ð’‘'=>'ð’‘','ð’’'=>'ð’’','ð’“'=>'ð’“','ð’”'=>'ð’”','ð’•'=>'ð’•','ð’–'=>'ð’–','ð’—'=>'ð’—','ð’˜'=>'ð’˜','ð’™'=>'ð’™','ð’š'=>'ð’š','ð’›'=>'ð’›','ð’œ'=>'ð’œ','ð’ž'=>'ð’ž','ð’Ÿ'=>'ð’Ÿ','ð’¢'=>'ð’¢','ð’¥'=>'ð’¥','ð’¦'=>'ð’¦','ð’©'=>'ð’©','ð’ª'=>'ð’ª','ð’«'=>'ð’«','ð’¬'=>'ð’¬','ð’®'=>'ð’®','ð’¯'=>'ð’¯','ð’°'=>'ð’°','ð’±'=>'ð’±','ð’²'=>'ð’²','ð’³'=>'ð’³','ð’´'=>'ð’´','ð’µ'=>'ð’µ','ð’¶'=>'ð’¶','ð’·'=>'ð’·','ð’¸'=>'ð’¸','ð’¹'=>'ð’¹','ð’»'=>'ð’»','ð’½'=>'ð’½','ð’¾'=>'ð’¾','ð’¿'=>'ð’¿','ð“€'=>'ð“€','ð“'=>'ð“','ð“‚'=>'ð“‚','ð“ƒ'=>'ð“ƒ','ð“…'=>'ð“…','ð“†'=>'ð“†','ð“‡'=>'ð“‡','ð“ˆ'=>'ð“ˆ','ð“‰'=>'ð“‰','ð“Š'=>'ð“Š','ð“‹'=>'ð“‹','ð“Œ'=>'ð“Œ','ð“'=>'ð“','ð“Ž'=>'ð“Ž','ð“'=>'ð“','ð“'=>'ð“','ð“‘'=>'ð“‘','ð“’'=>'ð“’','ð““'=>'ð““','ð“”'=>'ð“”','ð“•'=>'ð“•','ð“–'=>'ð“–','ð“—'=>'ð“—','ð“˜'=>'ð“˜','ð“™'=>'ð“™','ð“š'=>'ð“š','ð“›'=>'ð“›','ð“œ'=>'ð“œ','ð“'=>'ð“','ð“ž'=>'ð“ž','ð“Ÿ'=>'ð“Ÿ','ð“ '=>'ð“ ','ð“¡'=>'ð“¡','ð“¢'=>'ð“¢','ð“£'=>'ð“£','ð“¤'=>'ð“¤','ð“¥'=>'ð“¥','ð“¦'=>'ð“¦','ð“§'=>'ð“§','ð“¨'=>'ð“¨','ð“©'=>'ð“©','ð“ª'=>'ð“ª','ð“«'=>'ð“«','ð“¬'=>'ð“¬','ð“­'=>'ð“­','ð“®'=>'ð“®','ð“¯'=>'ð“¯','ð“°'=>'ð“°','ð“±'=>'ð“±','ð“²'=>'ð“²','ð“³'=>'ð“³','ð“´'=>'ð“´','ð“µ'=>'ð“µ','ð“¶'=>'ð“¶','ð“·'=>'ð“·','ð“¸'=>'ð“¸','ð“¹'=>'ð“¹','ð“º'=>'ð“º','ð“»'=>'ð“»','ð“¼'=>'ð“¼','ð“½'=>'ð“½','ð“¾'=>'ð“¾','ð“¿'=>'ð“¿','ð”€'=>'ð”€','ð”'=>'ð”','ð”‚'=>'ð”‚','ð”ƒ'=>'ð”ƒ','ð”„'=>'ð”„','ð”…'=>'ð”…','ð”‡'=>'ð”‡','ð”ˆ'=>'ð”ˆ','ð”‰'=>'ð”‰','ð”Š'=>'ð”Š','ð”'=>'ð”','ð”Ž'=>'ð”Ž','ð”'=>'ð”','ð”'=>'ð”','ð”‘'=>'ð”‘','ð”’'=>'ð”’','ð”“'=>'ð”“','ð””'=>'ð””','ð”–'=>'ð”–','ð”—'=>'ð”—','ð”˜'=>'ð”˜','ð”™'=>'ð”™','ð”š'=>'ð”š','ð”›'=>'ð”›','ð”œ'=>'ð”œ','ð”ž'=>'ð”ž','ð”Ÿ'=>'ð”Ÿ','ð” '=>'ð” ','ð”¡'=>'ð”¡','ð”¢'=>'ð”¢','ð”£'=>'ð”£','ð”¤'=>'ð”¤','ð”¥'=>'ð”¥','ð”¦'=>'ð”¦','ð”§'=>'ð”§','ð”¨'=>'ð”¨','ð”©'=>'ð”©','ð”ª'=>'ð”ª','ð”«'=>'ð”«','ð”¬'=>'ð”¬','ð”­'=>'ð”­','ð”®'=>'ð”®','ð”¯'=>'ð”¯','ð”°'=>'ð”°','ð”±'=>'ð”±','ð”²'=>'ð”²','ð”³'=>'ð”³','ð”´'=>'ð”´','ð”µ'=>'ð”µ','ð”¶'=>'ð”¶','ð”·'=>'ð”·','ð”¸'=>'ð”¸','ð”¹'=>'ð”¹','ð”»'=>'ð”»','ð”¼'=>'ð”¼','ð”½'=>'ð”½','ð”¾'=>'ð”¾','ð•€'=>'ð•€','ð•'=>'ð•','ð•‚'=>'ð•‚','ð•ƒ'=>'ð•ƒ','ð•„'=>'ð•„','ð•†'=>'ð•†','ð•Š'=>'ð•Š','ð•‹'=>'ð•‹','ð•Œ'=>'ð•Œ','ð•'=>'ð•','ð•Ž'=>'ð•Ž','ð•'=>'ð•','ð•'=>'ð•','ð•’'=>'ð•’','ð•“'=>'ð•“','ð•”'=>'ð•”','ð••'=>'ð••','ð•–'=>'ð•–','ð•—'=>'ð•—','ð•˜'=>'ð•˜','ð•™'=>'ð•™','ð•š'=>'ð•š','ð•›'=>'ð•›','ð•œ'=>'ð•œ','ð•'=>'ð•','ð•ž'=>'ð•ž','ð•Ÿ'=>'ð•Ÿ','ð• '=>'ð• ','ð•¡'=>'ð•¡','ð•¢'=>'ð•¢','ð•£'=>'ð•£','ð•¤'=>'ð•¤','ð•¥'=>'ð•¥','ð•¦'=>'ð•¦','ð•§'=>'ð•§','ð•¨'=>'ð•¨','ð•©'=>'ð•©','ð•ª'=>'ð•ª','ð•«'=>'ð•«','ð•¬'=>'ð•¬','ð•­'=>'ð•­','ð•®'=>'ð•®','ð•¯'=>'ð•¯','ð•°'=>'ð•°','ð•±'=>'ð•±','ð•²'=>'ð•²','ð•³'=>'ð•³','ð•´'=>'ð•´','ð•µ'=>'ð•µ','ð•¶'=>'ð•¶','ð•·'=>'ð•·','ð•¸'=>'ð•¸','ð•¹'=>'ð•¹','ð•º'=>'ð•º','ð•»'=>'ð•»','ð•¼'=>'ð•¼','ð•½'=>'ð•½','ð•¾'=>'ð•¾','ð•¿'=>'ð•¿','ð–€'=>'ð–€','ð–'=>'ð–','ð–‚'=>'ð–‚','ð–ƒ'=>'ð–ƒ','ð–„'=>'ð–„','ð–…'=>'ð–…','ð–†'=>'ð–†','ð–‡'=>'ð–‡','ð–ˆ'=>'ð–ˆ','ð–‰'=>'ð–‰','ð–Š'=>'ð–Š','ð–‹'=>'ð–‹','ð–Œ'=>'ð–Œ','ð–'=>'ð–','ð–Ž'=>'ð–Ž','ð–'=>'ð–','ð–'=>'ð–','ð–‘'=>'ð–‘','ð–’'=>'ð–’','ð–“'=>'ð–“','ð–”'=>'ð–”','ð–•'=>'ð–•','ð––'=>'ð––','ð–—'=>'ð–—','ð–˜'=>'ð–˜','ð–™'=>'ð–™','ð–š'=>'ð–š','ð–›'=>'ð–›','ð–œ'=>'ð–œ','ð–'=>'ð–','ð–ž'=>'ð–ž','ð–Ÿ'=>'ð–Ÿ','ð– '=>'ð– ','ð–¡'=>'ð–¡','ð–¢'=>'ð–¢','ð–£'=>'ð–£','ð–¤'=>'ð–¤','ð–¥'=>'ð–¥','ð–¦'=>'ð–¦','ð–§'=>'ð–§','ð–¨'=>'ð–¨','ð–©'=>'ð–©','ð–ª'=>'ð–ª','ð–«'=>'ð–«','ð–¬'=>'ð–¬','ð–­'=>'ð–­','ð–®'=>'ð–®','ð–¯'=>'ð–¯','ð–°'=>'ð–°','ð–±'=>'ð–±','ð–²'=>'ð–²','ð–³'=>'ð–³','ð–´'=>'ð–´','ð–µ'=>'ð–µ','ð–¶'=>'ð–¶','ð–·'=>'ð–·','ð–¸'=>'ð–¸','ð–¹'=>'ð–¹','ð–º'=>'ð–º','ð–»'=>'ð–»','ð–¼'=>'ð–¼','ð–½'=>'ð–½','ð–¾'=>'ð–¾','ð–¿'=>'ð–¿','ð—€'=>'ð—€','ð—'=>'ð—','ð—‚'=>'ð—‚','ð—ƒ'=>'ð—ƒ','ð—„'=>'ð—„','ð—…'=>'ð—…','ð—†'=>'ð—†','ð—‡'=>'ð—‡','ð—ˆ'=>'ð—ˆ','ð—‰'=>'ð—‰','ð—Š'=>'ð—Š','ð—‹'=>'ð—‹','ð—Œ'=>'ð—Œ','ð—'=>'ð—','ð—Ž'=>'ð—Ž','ð—'=>'ð—','ð—'=>'ð—','ð—‘'=>'ð—‘','ð—’'=>'ð—’','ð—“'=>'ð—“','ð—”'=>'ð—”','ð—•'=>'ð—•','ð—–'=>'ð—–','ð——'=>'ð——','ð—˜'=>'ð—˜','ð—™'=>'ð—™','ð—š'=>'ð—š','ð—›'=>'ð—›','ð—œ'=>'ð—œ','ð—'=>'ð—','ð—ž'=>'ð—ž','ð—Ÿ'=>'ð—Ÿ','ð— '=>'ð— ','ð—¡'=>'ð—¡','ð—¢'=>'ð—¢','ð—£'=>'ð—£','ð—¤'=>'ð—¤','ð—¥'=>'ð—¥','ð—¦'=>'ð—¦','ð—§'=>'ð—§','ð—¨'=>'ð—¨','ð—©'=>'ð—©','ð—ª'=>'ð—ª','ð—«'=>'ð—«','ð—¬'=>'ð—¬','ð—­'=>'ð—­','ð—®'=>'ð—®','ð—¯'=>'ð—¯','ð—°'=>'ð—°','ð—±'=>'ð—±','ð—²'=>'ð—²','ð—³'=>'ð—³','ð—´'=>'ð—´','ð—µ'=>'ð—µ','ð—¶'=>'ð—¶','ð—·'=>'ð—·','ð—¸'=>'ð—¸','ð—¹'=>'ð—¹','ð—º'=>'ð—º','ð—»'=>'ð—»','ð—¼'=>'ð—¼','ð—½'=>'ð—½','ð—¾'=>'ð—¾','ð—¿'=>'ð—¿','ð˜€'=>'ð˜€','ð˜'=>'ð˜','ð˜‚'=>'ð˜‚','ð˜ƒ'=>'ð˜ƒ','ð˜„'=>'ð˜„','ð˜…'=>'ð˜…','ð˜†'=>'ð˜†','ð˜‡'=>'ð˜‡','ð˜ˆ'=>'ð˜ˆ','ð˜‰'=>'ð˜‰','ð˜Š'=>'ð˜Š','ð˜‹'=>'ð˜‹','ð˜Œ'=>'ð˜Œ','ð˜'=>'ð˜','ð˜Ž'=>'ð˜Ž','ð˜'=>'ð˜','ð˜'=>'ð˜','ð˜‘'=>'ð˜‘','ð˜’'=>'ð˜’','ð˜“'=>'ð˜“','ð˜”'=>'ð˜”','ð˜•'=>'ð˜•','ð˜–'=>'ð˜–','ð˜—'=>'ð˜—','ð˜˜'=>'ð˜˜','ð˜™'=>'ð˜™','ð˜š'=>'ð˜š','ð˜›'=>'ð˜›','ð˜œ'=>'ð˜œ','ð˜'=>'ð˜','ð˜ž'=>'ð˜ž','ð˜Ÿ'=>'ð˜Ÿ','ð˜ '=>'ð˜ ','ð˜¡'=>'ð˜¡','ð˜¢'=>'ð˜¢','ð˜£'=>'ð˜£','ð˜¤'=>'ð˜¤','ð˜¥'=>'ð˜¥','ð˜¦'=>'ð˜¦','ð˜§'=>'ð˜§','ð˜¨'=>'ð˜¨','ð˜©'=>'ð˜©','ð˜ª'=>'ð˜ª','ð˜«'=>'ð˜«','ð˜¬'=>'ð˜¬','ð˜­'=>'ð˜­','ð˜®'=>'ð˜®','ð˜¯'=>'ð˜¯','ð˜°'=>'ð˜°','ð˜±'=>'ð˜±','ð˜²'=>'ð˜²','ð˜³'=>'ð˜³','ð˜´'=>'ð˜´','ð˜µ'=>'ð˜µ','ð˜¶'=>'ð˜¶','ð˜·'=>'ð˜·','ð˜¸'=>'ð˜¸','ð˜¹'=>'ð˜¹','ð˜º'=>'ð˜º','ð˜»'=>'ð˜»','ð˜¼'=>'ð˜¼','ð˜½'=>'ð˜½','ð˜¾'=>'ð˜¾','ð˜¿'=>'ð˜¿','ð™€'=>'ð™€','ð™'=>'ð™','ð™‚'=>'ð™‚','ð™ƒ'=>'ð™ƒ','ð™„'=>'ð™„','ð™…'=>'ð™…','ð™†'=>'ð™†','ð™‡'=>'ð™‡','ð™ˆ'=>'ð™ˆ','ð™‰'=>'ð™‰','ð™Š'=>'ð™Š','ð™‹'=>'ð™‹','ð™Œ'=>'ð™Œ','ð™'=>'ð™','ð™Ž'=>'ð™Ž','ð™'=>'ð™','ð™'=>'ð™','ð™‘'=>'ð™‘','ð™’'=>'ð™’','ð™“'=>'ð™“','ð™”'=>'ð™”','ð™•'=>'ð™•','ð™–'=>'ð™–','ð™—'=>'ð™—','ð™˜'=>'ð™˜','ð™™'=>'ð™™','ð™š'=>'ð™š','ð™›'=>'ð™›','ð™œ'=>'ð™œ','ð™'=>'ð™','ð™ž'=>'ð™ž','ð™Ÿ'=>'ð™Ÿ','ð™ '=>'ð™ ','ð™¡'=>'ð™¡','ð™¢'=>'ð™¢','ð™£'=>'ð™£','ð™¤'=>'ð™¤','ð™¥'=>'ð™¥','ð™¦'=>'ð™¦','ð™§'=>'ð™§','ð™¨'=>'ð™¨','ð™©'=>'ð™©','ð™ª'=>'ð™ª','ð™«'=>'ð™«','ð™¬'=>'ð™¬','ð™­'=>'ð™­','ð™®'=>'ð™®','ð™¯'=>'ð™¯','ð™°'=>'ð™°','ð™±'=>'ð™±','ð™²'=>'ð™²','ð™³'=>'ð™³','ð™´'=>'ð™´','ð™µ'=>'ð™µ','ð™¶'=>'ð™¶','ð™·'=>'ð™·','ð™¸'=>'ð™¸','ð™¹'=>'ð™¹','ð™º'=>'ð™º','ð™»'=>'ð™»','ð™¼'=>'ð™¼','ð™½'=>'ð™½','ð™¾'=>'ð™¾','ð™¿'=>'ð™¿','ðš€'=>'ðš€','ðš'=>'ðš','ðš‚'=>'ðš‚','ðšƒ'=>'ðšƒ','ðš„'=>'ðš„','ðš…'=>'ðš…','ðš†'=>'ðš†','ðš‡'=>'ðš‡','ðšˆ'=>'ðšˆ','ðš‰'=>'ðš‰','ðšŠ'=>'ðšŠ','ðš‹'=>'ðš‹','ðšŒ'=>'ðšŒ','ðš'=>'ðš','ðšŽ'=>'ðšŽ','ðš'=>'ðš','ðš'=>'ðš','ðš‘'=>'ðš‘','ðš’'=>'ðš’','ðš“'=>'ðš“','ðš”'=>'ðš”','ðš•'=>'ðš•','ðš–'=>'ðš–','ðš—'=>'ðš—','ðš˜'=>'ðš˜','ðš™'=>'ðš™','ðšš'=>'ðšš','ðš›'=>'ðš›','ðšœ'=>'ðšœ','ðš'=>'ðš','ðšž'=>'ðšž','ðšŸ'=>'ðšŸ','ðš '=>'ðš ','ðš¡'=>'ðš¡','ðš¢'=>'ðš¢','ðš£'=>'ðš£','ðš¤'=>'ðš¤','ðš¥'=>'ðš¥','ðš¨'=>'ðš¨','ðš©'=>'ðš©','ðšª'=>'ðšª','ðš«'=>'ðš«','ðš¬'=>'ðš¬','ðš­'=>'ðš­','ðš®'=>'ðš®','ðš¯'=>'ðš¯','ðš°'=>'ðš°','ðš±'=>'ðš±','ðš²'=>'ðš²','ðš³'=>'ðš³','ðš´'=>'ðš´','ðšµ'=>'ðšµ','ðš¶'=>'ðš¶','ðš·'=>'ðš·','ðš¸'=>'ðš¸','ðš¹'=>'ðš¹','ðšº'=>'ðšº','ðš»'=>'ðš»','ðš¼'=>'ðš¼','ðš½'=>'ðš½','ðš¾'=>'ðš¾','ðš¿'=>'ðš¿','ð›€'=>'ð›€','ð›‚'=>'ð›‚','ð›ƒ'=>'ð›ƒ','ð›„'=>'ð›„','ð›…'=>'ð›…','ð›†'=>'ð›†','ð›‡'=>'ð›‡','ð›ˆ'=>'ð›ˆ','ð›‰'=>'ð›‰','ð›Š'=>'ð›Š','ð›‹'=>'ð›‹','ð›Œ'=>'ð›Œ','ð›'=>'ð›','ð›Ž'=>'ð›Ž','ð›'=>'ð›','ð›'=>'ð›','ð›‘'=>'ð›‘','ð›’'=>'ð›’','ð›“'=>'ð›“','ð›”'=>'ð›”','ð›•'=>'ð›•','ð›–'=>'ð›–','ð›—'=>'ð›—','ð›˜'=>'ð›˜','ð›™'=>'ð›™','ð›š'=>'ð›š','ð›œ'=>'ð›œ','ð›'=>'ð›','ð›ž'=>'ð›ž','ð›Ÿ'=>'ð›Ÿ','ð› '=>'ð› ','ð›¡'=>'ð›¡','ð›¢'=>'ð›¢','ð›£'=>'ð›£','ð›¤'=>'ð›¤','ð›¥'=>'ð›¥','ð›¦'=>'ð›¦','ð›§'=>'ð›§','ð›¨'=>'ð›¨','ð›©'=>'ð›©','ð›ª'=>'ð›ª','ð›«'=>'ð›«','ð›¬'=>'ð›¬','ð›­'=>'ð›­','ð›®'=>'ð›®','ð›¯'=>'ð›¯','ð›°'=>'ð›°','ð›±'=>'ð›±','ð›²'=>'ð›²','ð›³'=>'ð›³','ð›´'=>'ð›´','ð›µ'=>'ð›µ','ð›¶'=>'ð›¶','ð›·'=>'ð›·','ð›¸'=>'ð›¸','ð›¹'=>'ð›¹','ð›º'=>'ð›º','ð›¼'=>'ð›¼','ð›½'=>'ð›½','ð›¾'=>'ð›¾','ð›¿'=>'ð›¿','ðœ€'=>'ðœ€','ðœ'=>'ðœ','ðœ‚'=>'ðœ‚','ðœƒ'=>'ðœƒ','ðœ„'=>'ðœ„','ðœ…'=>'ðœ…','ðœ†'=>'ðœ†','ðœ‡'=>'ðœ‡','ðœˆ'=>'ðœˆ','ðœ‰'=>'ðœ‰','ðœŠ'=>'ðœŠ','ðœ‹'=>'ðœ‹','ðœŒ'=>'ðœŒ','ðœ'=>'ðœ','ðœŽ'=>'ðœŽ','ðœ'=>'ðœ','ðœ'=>'ðœ','ðœ‘'=>'ðœ‘','ðœ’'=>'ðœ’','ðœ“'=>'ðœ“','ðœ”'=>'ðœ”','ðœ–'=>'ðœ–','ðœ—'=>'ðœ—','ðœ˜'=>'ðœ˜','ðœ™'=>'ðœ™','ðœš'=>'ðœš','ðœ›'=>'ðœ›','ðœœ'=>'ðœœ','ðœ'=>'ðœ','ðœž'=>'ðœž','ðœŸ'=>'ðœŸ','ðœ '=>'ðœ ','ðœ¡'=>'ðœ¡','ðœ¢'=>'ðœ¢','ðœ£'=>'ðœ£','ðœ¤'=>'ðœ¤','ðœ¥'=>'ðœ¥','ðœ¦'=>'ðœ¦','ðœ§'=>'ðœ§','ðœ¨'=>'ðœ¨','ðœ©'=>'ðœ©','ðœª'=>'ðœª','ðœ«'=>'ðœ«','ðœ¬'=>'ðœ¬','ðœ­'=>'ðœ­','ðœ®'=>'ðœ®','ðœ¯'=>'ðœ¯','ðœ°'=>'ðœ°','ðœ±'=>'ðœ±','ðœ²'=>'ðœ²','ðœ³'=>'ðœ³','ðœ´'=>'ðœ´','ðœ¶'=>'ðœ¶','ðœ·'=>'ðœ·','ðœ¸'=>'ðœ¸','ðœ¹'=>'ðœ¹','ðœº'=>'ðœº','ðœ»'=>'ðœ»','ðœ¼'=>'ðœ¼','ðœ½'=>'ðœ½','ðœ¾'=>'ðœ¾','ðœ¿'=>'ðœ¿','ð€'=>'ð€','ð'=>'ð','ð‚'=>'ð‚','ðƒ'=>'ðƒ','ð„'=>'ð„','ð…'=>'ð…','ð†'=>'ð†','ð‡'=>'ð‡','ðˆ'=>'ðˆ','ð‰'=>'ð‰','ðŠ'=>'ðŠ','ð‹'=>'ð‹','ðŒ'=>'ðŒ','ð'=>'ð','ðŽ'=>'ðŽ','ð'=>'ð','ð‘'=>'ð‘','ð’'=>'ð’','ð“'=>'ð“','ð”'=>'ð”','ð•'=>'ð•','ð–'=>'ð–','ð—'=>'ð—','ð˜'=>'ð˜','ð™'=>'ð™','ðš'=>'ðš','ð›'=>'ð›','ðœ'=>'ðœ','ð'=>'ð','ðž'=>'ðž','ðŸ'=>'ðŸ','ð '=>'ð ','ð¡'=>'ð¡','ð¢'=>'ð¢','ð£'=>'ð£','ð¤'=>'ð¤','ð¥'=>'ð¥','ð¦'=>'ð¦','ð§'=>'ð§','ð¨'=>'ð¨','ð©'=>'ð©','ðª'=>'ðª','ð«'=>'ð«','ð¬'=>'ð¬','ð­'=>'ð­','ð®'=>'ð®','ð°'=>'ð°','ð±'=>'ð±','ð²'=>'ð²','ð³'=>'ð³','ð´'=>'ð´','ðµ'=>'ðµ','ð¶'=>'ð¶','ð·'=>'ð·','ð¸'=>'ð¸','ð¹'=>'ð¹','ðº'=>'ðº','ð»'=>'ð»','ð¼'=>'ð¼','ð½'=>'ð½','ð¾'=>'ð¾','ð¿'=>'ð¿','ðž€'=>'ðž€','ðž'=>'ðž','ðž‚'=>'ðž‚','ðžƒ'=>'ðžƒ','ðž„'=>'ðž„','ðž…'=>'ðž…','ðž†'=>'ðž†','ðž‡'=>'ðž‡','ðžˆ'=>'ðžˆ','ðžŠ'=>'ðžŠ','ðž‹'=>'ðž‹','ðžŒ'=>'ðžŒ','ðž'=>'ðž','ðžŽ'=>'ðžŽ','ðž'=>'ðž','ðž'=>'ðž','ðž‘'=>'ðž‘','ðž’'=>'ðž’','ðž“'=>'ðž“','ðž”'=>'ðž”','ðž•'=>'ðž•','ðž–'=>'ðž–','ðž—'=>'ðž—','ðž˜'=>'ðž˜','ðž™'=>'ðž™','ðžš'=>'ðžš','ðž›'=>'ðž›','ðžœ'=>'ðžœ','ðž'=>'ðž','ðžž'=>'ðžž','ðžŸ'=>'ðžŸ','ðž '=>'ðž ','ðž¡'=>'ðž¡','ðž¢'=>'ðž¢','ðž£'=>'ðž£','ðž¤'=>'ðž¤','ðž¥'=>'ðž¥','ðž¦'=>'ðž¦','ðž§'=>'ðž§','ðž¨'=>'ðž¨','ðžª'=>'ðžª','ðž«'=>'ðž«','ðž¬'=>'ðž¬','ðž­'=>'ðž­','ðž®'=>'ðž®','ðž¯'=>'ðž¯','ðž°'=>'ðž°','ðž±'=>'ðž±','ðž²'=>'ðž²','ðž³'=>'ðž³','ðž´'=>'ðž´','ðžµ'=>'ðžµ','ðž¶'=>'ðž¶','ðž·'=>'ðž·','ðž¸'=>'ðž¸','ðž¹'=>'ðž¹','ðžº'=>'ðžº','ðž»'=>'ðž»','ðž¼'=>'ðž¼','ðž½'=>'ðž½','ðž¾'=>'ðž¾','ðž¿'=>'ðž¿','ðŸ€'=>'ðŸ€','ðŸ'=>'ðŸ','ðŸ‚'=>'ðŸ‚','ðŸ„'=>'ðŸ„','ðŸ…'=>'ðŸ…','ðŸ†'=>'ðŸ†','ðŸ‡'=>'ðŸ‡','ðŸˆ'=>'ðŸˆ','ðŸ‰'=>'ðŸ‰','ðŸŠ'=>'ðŸŠ','ðŸ‹'=>'ðŸ‹','ðŸŽ'=>'0','ðŸ'=>'1','ðŸ'=>'2','ðŸ‘'=>'3','ðŸ’'=>'4','ðŸ“'=>'5','ðŸ”'=>'6','ðŸ•'=>'7','ðŸ–'=>'8','ðŸ—'=>'9','ðŸ˜'=>'0','ðŸ™'=>'1','ðŸš'=>'2','ðŸ›'=>'3','ðŸœ'=>'4','ðŸ'=>'5','ðŸž'=>'6','ðŸŸ'=>'7','ðŸ '=>'8','ðŸ¡'=>'9','ðŸ¢'=>'0','ðŸ£'=>'1','ðŸ¤'=>'2','ðŸ¥'=>'3','ðŸ¦'=>'4','ðŸ§'=>'5','ðŸ¨'=>'6','ðŸ©'=>'7','ðŸª'=>'8','ðŸ«'=>'9','ðŸ¬'=>'0','ðŸ­'=>'1','ðŸ®'=>'2','ðŸ¯'=>'3','ðŸ°'=>'4','ðŸ±'=>'5','ðŸ²'=>'6','ðŸ³'=>'7','ðŸ´'=>'8','ðŸµ'=>'9','ðŸ¶'=>'0','ðŸ·'=>'1','ðŸ¸'=>'2','ðŸ¹'=>'3','ðŸº'=>'4','ðŸ»'=>'5','ðŸ¼'=>'6','ðŸ½'=>'7','ðŸ¾'=>'8','ðŸ¿'=>'9'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_6.php b/phpBB/includes/utf/data/search_indexer_6.php deleted file mode 100644 index f6d2ac0665..0000000000 --- a/phpBB/includes/utf/data/search_indexer_6.php +++ /dev/null @@ -1 +0,0 @@ -'々','〆'=>'〆','〇'=>'0','〡'=>'1','〢'=>'2','〣'=>'3','〤'=>'4','〥'=>'5','〦'=>'6','〧'=>'7','〨'=>'8','〩'=>'9','〪'=>'〪','〫'=>'〫','〬'=>'〬','〭'=>'〭','〮'=>'〮','〯'=>'〯','〱'=>'〱','〲'=>'〲','〳'=>'〳','〴'=>'〴','〵'=>'〵','〸'=>'10','〹'=>'20','〺'=>'30','〻'=>'〻','〼'=>'〼','ã'=>'ã','ã‚'=>'ã‚','ãƒ'=>'ãƒ','ã„'=>'ã„','ã…'=>'ã…','ã†'=>'ã†','ã‡'=>'ã‡','ãˆ'=>'ãˆ','ã‰'=>'ã‰','ãŠ'=>'ãŠ','ã‹'=>'ã‹','ãŒ'=>'ãŒ','ã'=>'ã','ãŽ'=>'ãŽ','ã'=>'ã','ã'=>'ã','ã‘'=>'ã‘','ã’'=>'ã’','ã“'=>'ã“','ã”'=>'ã”','ã•'=>'ã•','ã–'=>'ã–','ã—'=>'ã—','ã˜'=>'ã˜','ã™'=>'ã™','ãš'=>'ãš','ã›'=>'ã›','ãœ'=>'ãœ','ã'=>'ã','ãž'=>'ãž','ãŸ'=>'ãŸ','ã '=>'ã ','ã¡'=>'ã¡','ã¢'=>'ã¢','ã£'=>'ã£','ã¤'=>'ã¤','ã¥'=>'ã¥','ã¦'=>'ã¦','ã§'=>'ã§','ã¨'=>'ã¨','ã©'=>'ã©','ãª'=>'ãª','ã«'=>'ã«','ã¬'=>'ã¬','ã­'=>'ã­','ã®'=>'ã®','ã¯'=>'ã¯','ã°'=>'ã°','ã±'=>'ã±','ã²'=>'ã²','ã³'=>'ã³','ã´'=>'ã´','ãµ'=>'ãµ','ã¶'=>'ã¶','ã·'=>'ã·','ã¸'=>'ã¸','ã¹'=>'ã¹','ãº'=>'ãº','ã»'=>'ã»','ã¼'=>'ã¼','ã½'=>'ã½','ã¾'=>'ã¾','ã¿'=>'ã¿','ã‚€'=>'ã‚€','ã‚'=>'ã‚','ã‚‚'=>'ã‚‚','ゃ'=>'ゃ','ã‚„'=>'ã‚„','ã‚…'=>'ã‚…','ゆ'=>'ゆ','ょ'=>'ょ','よ'=>'よ','ら'=>'ら','り'=>'り','ã‚‹'=>'ã‚‹','れ'=>'れ','ã‚'=>'ã‚','ゎ'=>'ゎ','ã‚'=>'ã‚','ã‚'=>'ã‚','ã‚‘'=>'ã‚‘','ã‚’'=>'ã‚’','ã‚“'=>'ã‚“','ã‚”'=>'ã‚”','ã‚•'=>'ã‚•','ã‚–'=>'ã‚–','ã‚™'=>'ã‚™','゚'=>'゚','ã‚'=>'ã‚','ゞ'=>'ゞ','ゟ'=>'ゟ','ã‚¡'=>'ã‚¡','ã‚¢'=>'ã‚¢','ã‚£'=>'ã‚£','イ'=>'イ','ã‚¥'=>'ã‚¥','ウ'=>'ウ','ã‚§'=>'ã‚§','エ'=>'エ','ã‚©'=>'ã‚©','オ'=>'オ','ã‚«'=>'ã‚«','ガ'=>'ガ','ã‚­'=>'ã‚­','ã‚®'=>'ã‚®','ク'=>'ク','ã‚°'=>'ã‚°','ケ'=>'ケ','ゲ'=>'ゲ','コ'=>'コ','ã‚´'=>'ã‚´','サ'=>'サ','ã‚¶'=>'ã‚¶','ã‚·'=>'ã‚·','ジ'=>'ジ','ス'=>'ス','ズ'=>'ズ','ã‚»'=>'ã‚»','ゼ'=>'ゼ','ソ'=>'ソ','ゾ'=>'ゾ','ã‚¿'=>'ã‚¿','ダ'=>'ダ','ãƒ'=>'ãƒ','ヂ'=>'ヂ','ッ'=>'ッ','ツ'=>'ツ','ヅ'=>'ヅ','テ'=>'テ','デ'=>'デ','ト'=>'ト','ド'=>'ド','ナ'=>'ナ','ニ'=>'ニ','ヌ'=>'ヌ','ãƒ'=>'ãƒ','ノ'=>'ノ','ãƒ'=>'ãƒ','ãƒ'=>'ãƒ','パ'=>'パ','ヒ'=>'ヒ','ビ'=>'ビ','ピ'=>'ピ','フ'=>'フ','ブ'=>'ブ','プ'=>'プ','ヘ'=>'ヘ','ベ'=>'ベ','ペ'=>'ペ','ホ'=>'ホ','ボ'=>'ボ','ãƒ'=>'ãƒ','マ'=>'マ','ミ'=>'ミ','ム'=>'ム','メ'=>'メ','モ'=>'モ','ャ'=>'ャ','ヤ'=>'ヤ','ュ'=>'ュ','ユ'=>'ユ','ョ'=>'ョ','ヨ'=>'ヨ','ラ'=>'ラ','リ'=>'リ','ル'=>'ル','レ'=>'レ','ロ'=>'ロ','ヮ'=>'ヮ','ワ'=>'ワ','ヰ'=>'ヰ','ヱ'=>'ヱ','ヲ'=>'ヲ','ン'=>'ン','ヴ'=>'ヴ','ヵ'=>'ヵ','ヶ'=>'ヶ','ヷ'=>'ヷ','ヸ'=>'ヸ','ヹ'=>'ヹ','ヺ'=>'ヺ','ー'=>'ー','ヽ'=>'ヽ','ヾ'=>'ヾ','ヿ'=>'ヿ','ã„…'=>'ã„…','ㄆ'=>'ㄆ','ㄇ'=>'ㄇ','ㄈ'=>'ㄈ','ㄉ'=>'ㄉ','ㄊ'=>'ㄊ','ã„‹'=>'ã„‹','ㄌ'=>'ㄌ','ã„'=>'ã„','ㄎ'=>'ㄎ','ã„'=>'ã„','ã„'=>'ã„','ã„‘'=>'ã„‘','ã„’'=>'ã„’','ã„“'=>'ã„“','ã„”'=>'ã„”','ã„•'=>'ã„•','ã„–'=>'ã„–','ã„—'=>'ã„—','ㄘ'=>'ㄘ','ã„™'=>'ã„™','ㄚ'=>'ㄚ','ã„›'=>'ã„›','ㄜ'=>'ㄜ','ã„'=>'ã„','ㄞ'=>'ㄞ','ㄟ'=>'ㄟ','ã„ '=>'ã„ ','ã„¡'=>'ã„¡','ã„¢'=>'ã„¢','ã„£'=>'ã„£','ㄤ'=>'ㄤ','ã„¥'=>'ã„¥','ㄦ'=>'ㄦ','ã„§'=>'ã„§','ㄨ'=>'ㄨ','ã„©'=>'ã„©','ㄪ'=>'ㄪ','ã„«'=>'ã„«','ㄬ'=>'ㄬ','ㄱ'=>'ㄱ','ㄲ'=>'ㄲ','ㄳ'=>'ㄳ','ã„´'=>'ã„´','ㄵ'=>'ㄵ','ã„¶'=>'ã„¶','ã„·'=>'ã„·','ㄸ'=>'ㄸ','ㄹ'=>'ㄹ','ㄺ'=>'ㄺ','ã„»'=>'ã„»','ㄼ'=>'ㄼ','ㄽ'=>'ㄽ','ㄾ'=>'ㄾ','ã„¿'=>'ã„¿','ã…€'=>'ã…€','ã…'=>'ã…','ã…‚'=>'ã…‚','ã…ƒ'=>'ã…ƒ','ã…„'=>'ã…„','ã……'=>'ã……','ã…†'=>'ã…†','ã…‡'=>'ã…‡','ã…ˆ'=>'ã…ˆ','ã…‰'=>'ã…‰','ã…Š'=>'ã…Š','ã…‹'=>'ã…‹','ã…Œ'=>'ã…Œ','ã…'=>'ã…','ã…Ž'=>'ã…Ž','ã…'=>'ã…','ã…'=>'ã…','ã…‘'=>'ã…‘','ã…’'=>'ã…’','ã…“'=>'ã…“','ã…”'=>'ã…”','ã…•'=>'ã…•','ã…–'=>'ã…–','ã…—'=>'ã…—','ã…˜'=>'ã…˜','ã…™'=>'ã…™','ã…š'=>'ã…š','ã…›'=>'ã…›','ã…œ'=>'ã…œ','ã…'=>'ã…','ã…ž'=>'ã…ž','ã…Ÿ'=>'ã…Ÿ','ã… '=>'ã… ','ã…¡'=>'ã…¡','ã…¢'=>'ã…¢','ã…£'=>'ã…£','ã…¤'=>'ã…¤','ã…¥'=>'ã…¥','ã…¦'=>'ã…¦','ã…§'=>'ã…§','ã…¨'=>'ã…¨','ã…©'=>'ã…©','ã…ª'=>'ã…ª','ã…«'=>'ã…«','ã…¬'=>'ã…¬','ã…­'=>'ã…­','ã…®'=>'ã…®','ã…¯'=>'ã…¯','ã…°'=>'ã…°','ã…±'=>'ã…±','ã…²'=>'ã…²','ã…³'=>'ã…³','ã…´'=>'ã…´','ã…µ'=>'ã…µ','ã…¶'=>'ã…¶','ã…·'=>'ã…·','ã…¸'=>'ã…¸','ã…¹'=>'ã…¹','ã…º'=>'ã…º','ã…»'=>'ã…»','ã…¼'=>'ã…¼','ã…½'=>'ã…½','ã…¾'=>'ã…¾','ã…¿'=>'ã…¿','ㆀ'=>'ㆀ','ã†'=>'ã†','ㆂ'=>'ㆂ','ㆃ'=>'ㆃ','ㆄ'=>'ㆄ','ㆅ'=>'ㆅ','ㆆ'=>'ㆆ','ㆇ'=>'ㆇ','ㆈ'=>'ㆈ','ㆉ'=>'ㆉ','ㆊ'=>'ㆊ','ㆋ'=>'ㆋ','ㆌ'=>'ㆌ','ã†'=>'ã†','ㆎ'=>'ㆎ','㆒'=>'1','㆓'=>'2','㆔'=>'3','㆕'=>'4','ㆠ'=>'ㆠ','ㆡ'=>'ㆡ','ㆢ'=>'ㆢ','ㆣ'=>'ㆣ','ㆤ'=>'ㆤ','ㆥ'=>'ㆥ','ㆦ'=>'ㆦ','ㆧ'=>'ㆧ','ㆨ'=>'ㆨ','ㆩ'=>'ㆩ','ㆪ'=>'ㆪ','ㆫ'=>'ㆫ','ㆬ'=>'ㆬ','ㆭ'=>'ㆭ','ㆮ'=>'ㆮ','ㆯ'=>'ㆯ','ㆰ'=>'ㆰ','ㆱ'=>'ㆱ','ㆲ'=>'ㆲ','ㆳ'=>'ㆳ','ㆴ'=>'ㆴ','ㆵ'=>'ㆵ','ㆶ'=>'ㆶ','ㆷ'=>'ㆷ','ㇰ'=>'ㇰ','ㇱ'=>'ㇱ','ㇲ'=>'ㇲ','ㇳ'=>'ㇳ','ㇴ'=>'ㇴ','ㇵ'=>'ㇵ','ㇶ'=>'ㇶ','ㇷ'=>'ㇷ','ㇸ'=>'ㇸ','ㇹ'=>'ㇹ','ㇺ'=>'ㇺ','ㇻ'=>'ㇻ','ㇼ'=>'ㇼ','ㇽ'=>'ㇽ','ㇾ'=>'ㇾ','ㇿ'=>'ㇿ','㈠'=>'1','㈡'=>'2','㈢'=>'3','㈣'=>'4','㈤'=>'5','㈥'=>'6','㈦'=>'7','㈧'=>'8','㈨'=>'9','㈩'=>'10','㉑'=>'21','㉒'=>'22','㉓'=>'23','㉔'=>'24','㉕'=>'25','㉖'=>'26','㉗'=>'27','㉘'=>'28','㉙'=>'29','㉚'=>'30','㉛'=>'31','㉜'=>'32','ã‰'=>'33','㉞'=>'34','㉟'=>'35','㊀'=>'1','ãŠ'=>'2','㊂'=>'3','㊃'=>'4','㊄'=>'5','㊅'=>'6','㊆'=>'7','㊇'=>'8','㊈'=>'9','㊉'=>'10','㊱'=>'36','㊲'=>'37','㊳'=>'38','㊴'=>'39','㊵'=>'40','㊶'=>'41','㊷'=>'42','㊸'=>'43','㊹'=>'44','㊺'=>'45','㊻'=>'46','㊼'=>'47','㊽'=>'48','㊾'=>'49','㊿'=>'50','ã€'=>'ã€'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_64.php b/phpBB/includes/utf/data/search_indexer_64.php deleted file mode 100644 index 44d0beb624..0000000000 --- a/phpBB/includes/utf/data/search_indexer_64.php +++ /dev/null @@ -1 +0,0 @@ -'ð €€'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_84.php b/phpBB/includes/utf/data/search_indexer_84.php deleted file mode 100644 index 5c3f1d54b8..0000000000 --- a/phpBB/includes/utf/data/search_indexer_84.php +++ /dev/null @@ -1 +0,0 @@ -'𪛖'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_9.php b/phpBB/includes/utf/data/search_indexer_9.php deleted file mode 100644 index bdf188291f..0000000000 --- a/phpBB/includes/utf/data/search_indexer_9.php +++ /dev/null @@ -1 +0,0 @@ -'ä¶µ','一'=>'一'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/search_indexer_95.php b/phpBB/includes/utf/data/search_indexer_95.php deleted file mode 100644 index b0f8eed3aa..0000000000 --- a/phpBB/includes/utf/data/search_indexer_95.php +++ /dev/null @@ -1 +0,0 @@ -'丽','ð¯ '=>'ð¯ ','乁'=>'乁','𠄢'=>'𠄢','你'=>'你','侮'=>'侮','侻'=>'侻','倂'=>'倂','偺'=>'偺','備'=>'備','僧'=>'僧','像'=>'像','㒞'=>'㒞','ð¯ '=>'ð¯ ','免'=>'免','ð¯ '=>'ð¯ ','ð¯ '=>'ð¯ ','具'=>'具','𠔜'=>'𠔜','㒹'=>'㒹','內'=>'內','再'=>'再','𠕋'=>'𠕋','冗'=>'冗','冤'=>'冤','仌'=>'仌','冬'=>'冬','况'=>'况','𩇟'=>'𩇟','ð¯ '=>'ð¯ ','刃'=>'刃','㓟'=>'㓟','刻'=>'刻','剆'=>'剆','割'=>'割','剷'=>'剷','㔕'=>'㔕','勇'=>'勇','勉'=>'勉','勤'=>'勤','勺'=>'勺','包'=>'包','匆'=>'匆','北'=>'北','卉'=>'卉','卑'=>'卑','博'=>'博','即'=>'即','卽'=>'卽','卿'=>'卿','卿'=>'卿','卿'=>'卿','𠨬'=>'𠨬','灰'=>'灰','及'=>'及','叟'=>'叟','𠭣'=>'𠭣','叫'=>'叫','叱'=>'叱','吆'=>'吆','咞'=>'咞','吸'=>'吸','呈'=>'呈','周'=>'周','咢'=>'咢','ð¯¡'=>'ð¯¡','唐'=>'唐','啓'=>'啓','啣'=>'啣','善'=>'善','善'=>'善','喙'=>'喙','喫'=>'喫','喳'=>'喳','嗂'=>'嗂','圖'=>'圖','嘆'=>'嘆','ð¯¡'=>'ð¯¡','噑'=>'噑','ð¯¡'=>'ð¯¡','ð¯¡'=>'ð¯¡','壮'=>'壮','城'=>'城','埴'=>'埴','堍'=>'堍','型'=>'型','堲'=>'堲','報'=>'報','墬'=>'墬','𡓤'=>'𡓤','売'=>'売','壷'=>'壷','夆'=>'夆','ð¯¡'=>'ð¯¡','夢'=>'夢','奢'=>'奢','𡚨'=>'𡚨','𡛪'=>'𡛪','姬'=>'姬','娛'=>'娛','娧'=>'娧','姘'=>'姘','婦'=>'婦','㛮'=>'㛮','㛼'=>'㛼','嬈'=>'嬈','嬾'=>'嬾','嬾'=>'嬾','𡧈'=>'𡧈','寃'=>'寃','寘'=>'寘','寧'=>'寧','寳'=>'寳','𡬘'=>'𡬘','寿'=>'寿','将'=>'将','当'=>'当','尢'=>'尢','㞁'=>'㞁','屠'=>'屠','屮'=>'屮','峀'=>'峀','岍'=>'岍','𡷤'=>'𡷤','嵃'=>'嵃','𡷦'=>'𡷦','嵮'=>'嵮','嵫'=>'嵫','嵼'=>'嵼','ð¯¢'=>'ð¯¢','巢'=>'巢','㠯'=>'㠯','巽'=>'巽','帨'=>'帨','帽'=>'帽','幩'=>'幩','㡢'=>'㡢','𢆃'=>'𢆃','㡼'=>'㡼','庰'=>'庰','庳'=>'庳','ð¯¢'=>'ð¯¢','廊'=>'廊','ð¯¢'=>'ð¯¢','ð¯¢'=>'ð¯¢','𢌱'=>'𢌱','𢌱'=>'𢌱','舁'=>'舁','弢'=>'弢','弢'=>'弢','㣇'=>'㣇','𣊸'=>'𣊸','𦇚'=>'𦇚','形'=>'形','彫'=>'彫','㣣'=>'㣣','徚'=>'徚','ð¯¢'=>'ð¯¢','志'=>'志','忹'=>'忹','悁'=>'悁','㤺'=>'㤺','㤜'=>'㤜','悔'=>'悔','𢛔'=>'𢛔','惇'=>'惇','慈'=>'慈','慌'=>'慌','慎'=>'慎','慌'=>'慌','慺'=>'慺','憎'=>'憎','憲'=>'憲','憤'=>'憤','憯'=>'憯','懞'=>'懞','懲'=>'懲','懶'=>'懶','成'=>'成','戛'=>'戛','扝'=>'扝','抱'=>'抱','拔'=>'拔','捐'=>'捐','𢬌'=>'𢬌','挽'=>'挽','拼'=>'拼','捨'=>'捨','掃'=>'掃','揤'=>'揤','𢯱'=>'𢯱','搢'=>'搢','揅'=>'揅','ð¯£'=>'ð¯£','㨮'=>'㨮','摩'=>'摩','摾'=>'摾','撝'=>'撝','摷'=>'摷','㩬'=>'㩬','敏'=>'敏','敬'=>'敬','𣀊'=>'𣀊','旣'=>'旣','書'=>'書','ð¯£'=>'ð¯£','㬙'=>'㬙','ð¯£'=>'ð¯£','ð¯£'=>'ð¯£','㫤'=>'㫤','冒'=>'冒','冕'=>'冕','最'=>'最','暜'=>'暜','肭'=>'肭','䏙'=>'䏙','朗'=>'朗','望'=>'望','朡'=>'朡','杞'=>'杞','杓'=>'杓','ð¯£'=>'ð¯£','㭉'=>'㭉','柺'=>'柺','枅'=>'枅','桒'=>'桒','梅'=>'梅','𣑭'=>'𣑭','梎'=>'梎','栟'=>'栟','椔'=>'椔','㮝'=>'㮝','楂'=>'楂','榣'=>'榣','槪'=>'槪','檨'=>'檨','𣚣'=>'𣚣','櫛'=>'櫛','㰘'=>'㰘','次'=>'次','𣢧'=>'𣢧','歔'=>'歔','㱎'=>'㱎','歲'=>'歲','殟'=>'殟','殺'=>'殺','殻'=>'殻','𣪍'=>'𣪍','𡴋'=>'𡴋','𣫺'=>'𣫺','汎'=>'汎','𣲼'=>'𣲼','沿'=>'沿','泍'=>'泍','汧'=>'汧','洖'=>'洖','派'=>'派','ð¯¤'=>'ð¯¤','流'=>'流','浩'=>'浩','浸'=>'浸','涅'=>'涅','𣴞'=>'𣴞','洴'=>'洴','港'=>'港','湮'=>'湮','㴳'=>'㴳','滋'=>'滋','滇'=>'滇','ð¯¤'=>'ð¯¤','淹'=>'淹','ð¯¤'=>'ð¯¤','ð¯¤'=>'ð¯¤','𣾎'=>'𣾎','濆'=>'濆','瀹'=>'瀹','瀞'=>'瀞','瀛'=>'瀛','㶖'=>'㶖','灊'=>'灊','災'=>'災','灷'=>'灷','炭'=>'炭','𠔥'=>'𠔥','煅'=>'煅','ð¯¤'=>'ð¯¤','熜'=>'熜','𤎫'=>'𤎫','爨'=>'爨','爵'=>'爵','牐'=>'牐','𤘈'=>'𤘈','犀'=>'犀','犕'=>'犕','𤜵'=>'𤜵','𤠔'=>'𤠔','獺'=>'獺','王'=>'王','㺬'=>'㺬','玥'=>'玥','㺸'=>'㺸','㺸'=>'㺸','瑇'=>'瑇','瑜'=>'瑜','瑱'=>'瑱','璅'=>'璅','瓊'=>'瓊','㼛'=>'㼛','甤'=>'甤','𤰶'=>'𤰶','甾'=>'甾','𤲒'=>'𤲒','異'=>'異','𢆟'=>'𢆟','瘐'=>'瘐','𤾡'=>'𤾡','𤾸'=>'𤾸','𥁄'=>'𥁄','㿼'=>'㿼','䀈'=>'䀈','直'=>'直','ð¯¥'=>'ð¯¥','𥃲'=>'𥃲','𥄙'=>'𥄙','𥄳'=>'𥄳','眞'=>'眞','真'=>'真','真'=>'真','睊'=>'睊','䀹'=>'䀹','瞋'=>'瞋','䁆'=>'䁆','䂖'=>'䂖','ð¯¥'=>'ð¯¥','硎'=>'硎','ð¯¥'=>'ð¯¥','ð¯¥'=>'ð¯¥','䃣'=>'䃣','𥘦'=>'𥘦','祖'=>'祖','𥚚'=>'𥚚','𥛅'=>'𥛅','福'=>'福','秫'=>'秫','䄯'=>'䄯','穀'=>'穀','穊'=>'穊','穏'=>'穏','𥥼'=>'𥥼','ð¯¥'=>'ð¯¥','𥪧'=>'𥪧','竮'=>'竮','䈂'=>'䈂','𥮫'=>'𥮫','篆'=>'篆','築'=>'築','䈧'=>'䈧','𥲀'=>'𥲀','糒'=>'糒','䊠'=>'䊠','糨'=>'糨','糣'=>'糣','紀'=>'紀','𥾆'=>'𥾆','絣'=>'絣','䌁'=>'䌁','緇'=>'緇','縂'=>'縂','繅'=>'繅','䌴'=>'䌴','𦈨'=>'𦈨','𦉇'=>'𦉇','䍙'=>'䍙','𦋙'=>'𦋙','罺'=>'罺','𦌾'=>'𦌾','羕'=>'羕','翺'=>'翺','者'=>'者','𦓚'=>'𦓚','𦔣'=>'𦔣','聠'=>'聠','𦖨'=>'𦖨','聰'=>'聰','𣍟'=>'𣍟','ð¯¦'=>'ð¯¦','育'=>'育','脃'=>'脃','䐋'=>'䐋','脾'=>'脾','媵'=>'媵','𦞧'=>'𦞧','𦞵'=>'𦞵','𣎓'=>'𣎓','𣎜'=>'𣎜','舁'=>'舁','舄'=>'舄','ð¯¦'=>'ð¯¦','䑫'=>'䑫','ð¯¦'=>'ð¯¦','ð¯¦'=>'ð¯¦','芝'=>'芝','劳'=>'劳','花'=>'花','芳'=>'芳','芽'=>'芽','苦'=>'苦','𦬼'=>'𦬼','若'=>'若','茝'=>'茝','荣'=>'荣','莭'=>'莭','茣'=>'茣','ð¯¦'=>'ð¯¦','菧'=>'菧','著'=>'著','荓'=>'荓','菊'=>'菊','菌'=>'菌','菜'=>'菜','𦰶'=>'𦰶','𦵫'=>'𦵫','𦳕'=>'𦳕','䔫'=>'䔫','蓱'=>'蓱','蓳'=>'蓳','蔖'=>'蔖','𧏊'=>'𧏊','蕤'=>'蕤','𦼬'=>'𦼬','䕝'=>'䕝','䕡'=>'䕡','𦾱'=>'𦾱','𧃒'=>'𧃒','䕫'=>'䕫','虐'=>'虐','虜'=>'虜','虧'=>'虧','虩'=>'虩','蚩'=>'蚩','蚈'=>'蚈','蜎'=>'蜎','蛢'=>'蛢','蝹'=>'蝹','蜨'=>'蜨','蝫'=>'蝫','螆'=>'螆','䗗'=>'䗗','蟡'=>'蟡','ð¯§'=>'ð¯§','䗹'=>'䗹','衠'=>'衠','衣'=>'衣','𧙧'=>'𧙧','裗'=>'裗','裞'=>'裞','䘵'=>'䘵','裺'=>'裺','㒻'=>'㒻','𧢮'=>'𧢮','𧥦'=>'𧥦','ð¯§'=>'ð¯§','䛇'=>'䛇','ð¯§'=>'ð¯§','ð¯§'=>'ð¯§','變'=>'變','豕'=>'豕','𧲨'=>'𧲨','貫'=>'貫','賁'=>'賁','贛'=>'贛','起'=>'起','𧼯'=>'𧼯','𠠄'=>'𠠄','跋'=>'跋','趼'=>'趼','跰'=>'跰','ð¯§'=>'ð¯§','軔'=>'軔','輸'=>'輸','𨗒'=>'𨗒','𨗭'=>'𨗭','邔'=>'邔','郱'=>'郱','鄑'=>'鄑','𨜮'=>'𨜮','鄛'=>'鄛','鈸'=>'鈸','鋗'=>'鋗','鋘'=>'鋘','鉼'=>'鉼','鏹'=>'鏹','鐕'=>'鐕','𨯺'=>'𨯺','開'=>'開','䦕'=>'䦕','閷'=>'閷','𨵷'=>'𨵷','䧦'=>'䧦','雃'=>'雃','嶲'=>'嶲','霣'=>'霣','𩅅'=>'𩅅','𩈚'=>'𩈚','䩮'=>'䩮','䩶'=>'䩶','韠'=>'韠','𩐊'=>'𩐊','䪲'=>'䪲','𩒖'=>'𩒖','頋'=>'頋','頋'=>'頋','頩'=>'頩','ð¯¨'=>'ð¯¨','飢'=>'飢','䬳'=>'䬳','餩'=>'餩','馧'=>'馧','駂'=>'駂','駾'=>'駾','䯎'=>'䯎','𩬰'=>'𩬰','鬒'=>'鬒','鱀'=>'鱀','鳽'=>'鳽','ð¯¨'=>'ð¯¨','䳭'=>'䳭','ð¯¨'=>'ð¯¨','ð¯¨'=>'ð¯¨','䳸'=>'䳸','𪄅'=>'𪄅','𪈎'=>'𪈎','𪊑'=>'𪊑','麻'=>'麻','䵖'=>'䵖','黹'=>'黹','黾'=>'黾','鼅'=>'鼅','鼏'=>'鼏','鼖'=>'鼖','鼻'=>'鼻','ð¯¨'=>'ð¯¨'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/utf_canonical_comp.php b/phpBB/includes/utf/data/utf_canonical_comp.php deleted file mode 100644 index a3ed3ee602..0000000000 --- a/phpBB/includes/utf/data/utf_canonical_comp.php +++ /dev/null @@ -1,2 +0,0 @@ -'À','AÌ'=>'Ã','AÌ‚'=>'Â','Ã'=>'Ã','Ä'=>'Ä','AÌŠ'=>'Ã…','Ç'=>'Ç','EÌ€'=>'È','EÌ'=>'É','EÌ‚'=>'Ê','Ë'=>'Ë','IÌ€'=>'ÃŒ','IÌ'=>'Ã','IÌ‚'=>'ÃŽ','Ï'=>'Ã','Ñ'=>'Ñ','OÌ€'=>'Ã’','OÌ'=>'Ó','OÌ‚'=>'Ô','Õ'=>'Õ','Ö'=>'Ö','UÌ€'=>'Ù','UÌ'=>'Ú','UÌ‚'=>'Û','Ü'=>'Ü','YÌ'=>'Ã','aÌ€'=>'à','aÌ'=>'á','aÌ‚'=>'â','ã'=>'ã','ä'=>'ä','aÌŠ'=>'Ã¥','ç'=>'ç','eÌ€'=>'è','eÌ'=>'é','eÌ‚'=>'ê','ë'=>'ë','iÌ€'=>'ì','iÌ'=>'í','iÌ‚'=>'î','ï'=>'ï','ñ'=>'ñ','oÌ€'=>'ò','oÌ'=>'ó','oÌ‚'=>'ô','õ'=>'õ','ö'=>'ö','uÌ€'=>'ù','uÌ'=>'ú','uÌ‚'=>'û','ü'=>'ü','yÌ'=>'ý','ÿ'=>'ÿ','AÌ„'=>'Ä€','aÌ„'=>'Ä','Ă'=>'Ä‚','ă'=>'ă','Ą'=>'Ä„','ą'=>'Ä…','CÌ'=>'Ć','cÌ'=>'ć','CÌ‚'=>'Ĉ','cÌ‚'=>'ĉ','Ċ'=>'ÄŠ','ċ'=>'Ä‹','CÌŒ'=>'ÄŒ','cÌŒ'=>'Ä','DÌŒ'=>'ÄŽ','dÌŒ'=>'Ä','EÌ„'=>'Ä’','eÌ„'=>'Ä“','Ĕ'=>'Ä”','ĕ'=>'Ä•','Ė'=>'Ä–','ė'=>'Ä—','Ę'=>'Ę','ę'=>'Ä™','EÌŒ'=>'Äš','eÌŒ'=>'Ä›','GÌ‚'=>'Äœ','gÌ‚'=>'Ä','Ğ'=>'Äž','ğ'=>'ÄŸ','Ġ'=>'Ä ','ġ'=>'Ä¡','Ģ'=>'Ä¢','ģ'=>'Ä£','HÌ‚'=>'Ĥ','hÌ‚'=>'Ä¥','Ĩ'=>'Ĩ','ĩ'=>'Ä©','IÌ„'=>'Ī','iÌ„'=>'Ä«','Ĭ'=>'Ĭ','ĭ'=>'Ä­','Į'=>'Ä®','į'=>'į','İ'=>'İ','JÌ‚'=>'Ä´','jÌ‚'=>'ĵ','Ķ'=>'Ķ','ķ'=>'Ä·','LÌ'=>'Ĺ','lÌ'=>'ĺ','Ļ'=>'Ä»','ļ'=>'ļ','LÌŒ'=>'Ľ','lÌŒ'=>'ľ','NÌ'=>'Ń','nÌ'=>'Å„','Ņ'=>'Å…','ņ'=>'ņ','NÌŒ'=>'Ň','nÌŒ'=>'ň','OÌ„'=>'ÅŒ','oÌ„'=>'Å','Ŏ'=>'ÅŽ','ŏ'=>'Å','OÌ‹'=>'Å','oÌ‹'=>'Å‘','RÌ'=>'Å”','rÌ'=>'Å•','Ŗ'=>'Å–','ŗ'=>'Å—','RÌŒ'=>'Ř','rÌŒ'=>'Å™','SÌ'=>'Åš','sÌ'=>'Å›','SÌ‚'=>'Åœ','sÌ‚'=>'Å','Ş'=>'Åž','ş'=>'ÅŸ','SÌŒ'=>'Å ','sÌŒ'=>'Å¡','Ţ'=>'Å¢','ţ'=>'Å£','TÌŒ'=>'Ť','tÌŒ'=>'Å¥','Ũ'=>'Ũ','ũ'=>'Å©','UÌ„'=>'Ū','uÌ„'=>'Å«','Ŭ'=>'Ŭ','ŭ'=>'Å­','UÌŠ'=>'Å®','uÌŠ'=>'ů','UÌ‹'=>'Ű','uÌ‹'=>'ű','Ų'=>'Ų','ų'=>'ų','WÌ‚'=>'Å´','wÌ‚'=>'ŵ','YÌ‚'=>'Ŷ','yÌ‚'=>'Å·','Ÿ'=>'Ÿ','ZÌ'=>'Ź','zÌ'=>'ź','Ż'=>'Å»','ż'=>'ż','ZÌŒ'=>'Ž','zÌŒ'=>'ž','OÌ›'=>'Æ ','oÌ›'=>'Æ¡','UÌ›'=>'Ư','uÌ›'=>'ư','AÌŒ'=>'Ç','aÌŒ'=>'ÇŽ','IÌŒ'=>'Ç','iÌŒ'=>'Ç','OÌŒ'=>'Ç‘','oÌŒ'=>'Ç’','UÌŒ'=>'Ç“','uÌŒ'=>'Ç”','Ǖ'=>'Ç•','ǖ'=>'Ç–','ÜÌ'=>'Ç—','üÌ'=>'ǘ','Ǚ'=>'Ç™','ǚ'=>'Çš','Ǜ'=>'Ç›','ǜ'=>'Çœ','Ǟ'=>'Çž','ǟ'=>'ÇŸ','Ǡ'=>'Ç ','ǡ'=>'Ç¡','Ǣ'=>'Ç¢','ǣ'=>'Ç£','GÌŒ'=>'Ǧ','gÌŒ'=>'ǧ','KÌŒ'=>'Ǩ','kÌŒ'=>'Ç©','Ǫ'=>'Ǫ','ǫ'=>'Ç«','Ǭ'=>'Ǭ','ǭ'=>'Ç­','Æ·ÌŒ'=>'Ç®','Ê’ÌŒ'=>'ǯ','jÌŒ'=>'ǰ','GÌ'=>'Ç´','gÌ'=>'ǵ','NÌ€'=>'Ǹ','nÌ€'=>'ǹ','Ã…Ì'=>'Ǻ','Ã¥Ì'=>'Ç»','ÆÌ'=>'Ǽ','æÌ'=>'ǽ','ØÌ'=>'Ǿ','øÌ'=>'Ç¿','AÌ'=>'È€','aÌ'=>'È','AÌ‘'=>'È‚','aÌ‘'=>'ȃ','EÌ'=>'È„','eÌ'=>'È…','EÌ‘'=>'Ȇ','eÌ‘'=>'ȇ','IÌ'=>'Ȉ','iÌ'=>'ȉ','IÌ‘'=>'ÈŠ','iÌ‘'=>'È‹','OÌ'=>'ÈŒ','oÌ'=>'È','OÌ‘'=>'ÈŽ','oÌ‘'=>'È','RÌ'=>'È','rÌ'=>'È‘','RÌ‘'=>'È’','rÌ‘'=>'È“','UÌ'=>'È”','uÌ'=>'È•','UÌ‘'=>'È–','uÌ‘'=>'È—','Ș'=>'Ș','ș'=>'È™','Ț'=>'Èš','ț'=>'È›','HÌŒ'=>'Èž','hÌŒ'=>'ÈŸ','Ȧ'=>'Ȧ','ȧ'=>'ȧ','Ȩ'=>'Ȩ','ȩ'=>'È©','Ȫ'=>'Ȫ','ȫ'=>'È«','Ȭ'=>'Ȭ','ȭ'=>'È­','Ȯ'=>'È®','ȯ'=>'ȯ','Ȱ'=>'Ȱ','ȱ'=>'ȱ','YÌ„'=>'Ȳ','yÌ„'=>'ȳ','̈Ì'=>'Í„','¨Ì'=>'Î…','ΑÌ'=>'Ά','ΕÌ'=>'Έ','ΗÌ'=>'Ή','ΙÌ'=>'Ί','ΟÌ'=>'ÎŒ','Î¥Ì'=>'ÎŽ','ΩÌ'=>'Î','ÏŠÌ'=>'Î','Ϊ'=>'Ϊ','Ϋ'=>'Ϋ','αÌ'=>'ά','εÌ'=>'έ','ηÌ'=>'ή','ιÌ'=>'ί','Ï‹Ì'=>'ΰ','ϊ'=>'ÏŠ','ϋ'=>'Ï‹','οÌ'=>'ÏŒ','Ï…Ì'=>'Ï','ωÌ'=>'ÏŽ','Ï’Ì'=>'Ï“','ϔ'=>'Ï”','Ѐ'=>'Ѐ','Ё'=>'Ð','ГÌ'=>'Ѓ','Ї'=>'Ї','КÌ'=>'ÐŒ','Ѝ'=>'Ð','Ў'=>'ÐŽ','Й'=>'Й','й'=>'й','ѐ'=>'Ñ','ё'=>'Ñ‘','гÌ'=>'Ñ“','ї'=>'Ñ—','кÌ'=>'Ñœ','ѝ'=>'Ñ','ў'=>'Ñž','Ñ´Ì'=>'Ѷ','ѵÌ'=>'Ñ·','Ӂ'=>'Ó','ӂ'=>'Ó‚','Ð̆'=>'Ó','ӑ'=>'Ó‘','Ð̈'=>'Ó’','ӓ'=>'Ó“','Ӗ'=>'Ó–','ӗ'=>'Ó—','Ӛ'=>'Óš','ӛ'=>'Ó›','Ӝ'=>'Óœ','ӝ'=>'Ó','Ӟ'=>'Óž','ӟ'=>'ÓŸ','Ӣ'=>'Ó¢','ӣ'=>'Ó£','Ӥ'=>'Ó¤','ӥ'=>'Ó¥','Ӧ'=>'Ó¦','ӧ'=>'Ó§','Ӫ'=>'Óª','ӫ'=>'Ó«','Ӭ'=>'Ó¬','Ñ̈'=>'Ó­','Ӯ'=>'Ó®','ӯ'=>'Ó¯','Ӱ'=>'Ó°','ӱ'=>'Ó±','Ӳ'=>'Ó²','ӳ'=>'Ó³','Ӵ'=>'Ó´','ӵ'=>'Óµ','Ӹ'=>'Ó¸','ӹ'=>'Ó¹','آ'=>'Ø¢','أ'=>'Ø£','ÙˆÙ”'=>'ؤ','إ'=>'Ø¥','ÙŠÙ”'=>'ئ','Û•Ù”'=>'Û€','ÛÙ”'=>'Û‚','Û’Ù”'=>'Û“','ऩ'=>'ऩ','ऱ'=>'ऱ','ऴ'=>'ऴ','ো'=>'à§‹','ৌ'=>'à§Œ','ୈ'=>'à­ˆ','ୋ'=>'à­‹','ୌ'=>'à­Œ','ஔ'=>'à®”','ொ'=>'ொ','ோ'=>'ோ','ௌ'=>'ௌ','ై'=>'ై','ೀ'=>'à³€','ೇ'=>'ೇ','ೈ'=>'ೈ','ೊ'=>'ೊ','ೋ'=>'ೋ','ൊ'=>'ൊ','ോ'=>'ോ','ൌ'=>'ൌ','ේ'=>'à·š','à·™à·'=>'à·œ','ෝ'=>'à·','ෞ'=>'à·ž','ཱི'=>'ཱི','ཱུ'=>'ཱུ','ཱྀ'=>'à¾','ဦ'=>'ဦ','ᬆ'=>'ᬆ','ᬈ'=>'ᬈ','ᬊ'=>'ᬊ','ᬌ'=>'ᬌ','á¬á¬µ'=>'ᬎ','ᬒ'=>'ᬒ','ᬻ'=>'ᬻ','ᬽ'=>'ᬽ','ᭀ'=>'á­€','ᭁ'=>'á­','ᭃ'=>'á­ƒ','AÌ¥'=>'Ḁ','aÌ¥'=>'á¸','Ḃ'=>'Ḃ','ḃ'=>'ḃ','BÌ£'=>'Ḅ','bÌ£'=>'ḅ','Ḇ'=>'Ḇ','ḇ'=>'ḇ','ÇÌ'=>'Ḉ','çÌ'=>'ḉ','Ḋ'=>'Ḋ','ḋ'=>'ḋ','DÌ£'=>'Ḍ','dÌ£'=>'á¸','Ḏ'=>'Ḏ','ḏ'=>'á¸','Ḑ'=>'á¸','ḑ'=>'ḑ','DÌ­'=>'Ḓ','dÌ­'=>'ḓ','Ä’Ì€'=>'Ḕ','ḕ'=>'ḕ','Ä’Ì'=>'Ḗ','Ä“Ì'=>'ḗ','EÌ­'=>'Ḙ','eÌ­'=>'ḙ','Ḛ'=>'Ḛ','ḛ'=>'ḛ','Ḝ'=>'Ḝ','ḝ'=>'á¸','Ḟ'=>'Ḟ','ḟ'=>'ḟ','GÌ„'=>'Ḡ','gÌ„'=>'ḡ','Ḣ'=>'Ḣ','ḣ'=>'ḣ','HÌ£'=>'Ḥ','hÌ£'=>'ḥ','Ḧ'=>'Ḧ','ḧ'=>'ḧ','Ḩ'=>'Ḩ','ḩ'=>'ḩ','HÌ®'=>'Ḫ','hÌ®'=>'ḫ','Ḭ'=>'Ḭ','ḭ'=>'ḭ','ÃÌ'=>'Ḯ','ïÌ'=>'ḯ','KÌ'=>'Ḱ','kÌ'=>'ḱ','KÌ£'=>'Ḳ','kÌ£'=>'ḳ','Ḵ'=>'Ḵ','ḵ'=>'ḵ','LÌ£'=>'Ḷ','lÌ£'=>'ḷ','Ḹ'=>'Ḹ','ḹ'=>'ḹ','Ḻ'=>'Ḻ','ḻ'=>'ḻ','LÌ­'=>'Ḽ','lÌ­'=>'ḽ','MÌ'=>'Ḿ','mÌ'=>'ḿ','Ṁ'=>'á¹€','ṁ'=>'á¹','MÌ£'=>'Ṃ','mÌ£'=>'ṃ','Ṅ'=>'Ṅ','ṅ'=>'á¹…','NÌ£'=>'Ṇ','nÌ£'=>'ṇ','Ṉ'=>'Ṉ','ṉ'=>'ṉ','NÌ­'=>'Ṋ','nÌ­'=>'ṋ','ÕÌ'=>'Ṍ','õÌ'=>'á¹','Ṏ'=>'Ṏ','ṏ'=>'á¹','Ṑ'=>'á¹','ÅÌ€'=>'ṑ','ÅŒÌ'=>'á¹’','ÅÌ'=>'ṓ','PÌ'=>'á¹”','pÌ'=>'ṕ','Ṗ'=>'á¹–','ṗ'=>'á¹—','Ṙ'=>'Ṙ','ṙ'=>'á¹™','RÌ£'=>'Ṛ','rÌ£'=>'á¹›','Ṝ'=>'Ṝ','ṝ'=>'á¹','Ṟ'=>'Ṟ','ṟ'=>'ṟ','Ṡ'=>'á¹ ','ṡ'=>'ṡ','SÌ£'=>'á¹¢','sÌ£'=>'á¹£','Ṥ'=>'Ṥ','ṥ'=>'á¹¥','Ṧ'=>'Ṧ','ṧ'=>'á¹§','Ṩ'=>'Ṩ','ṩ'=>'ṩ','Ṫ'=>'Ṫ','ṫ'=>'ṫ','TÌ£'=>'Ṭ','tÌ£'=>'á¹­','Ṯ'=>'á¹®','ṯ'=>'ṯ','TÌ­'=>'á¹°','tÌ­'=>'á¹±','Ṳ'=>'á¹²','ṳ'=>'á¹³','Ṵ'=>'á¹´','ṵ'=>'á¹µ','UÌ­'=>'á¹¶','uÌ­'=>'á¹·','ŨÌ'=>'Ṹ','Å©Ì'=>'á¹¹','Ṻ'=>'Ṻ','ṻ'=>'á¹»','Ṽ'=>'á¹¼','ṽ'=>'á¹½','VÌ£'=>'á¹¾','vÌ£'=>'ṿ','WÌ€'=>'Ẁ','wÌ€'=>'áº','WÌ'=>'Ẃ','wÌ'=>'ẃ','Ẅ'=>'Ẅ','ẅ'=>'ẅ','Ẇ'=>'Ẇ','ẇ'=>'ẇ','WÌ£'=>'Ẉ','wÌ£'=>'ẉ','Ẋ'=>'Ẋ','ẋ'=>'ẋ','Ẍ'=>'Ẍ','ẍ'=>'áº','Ẏ'=>'Ẏ','ẏ'=>'áº','ZÌ‚'=>'áº','zÌ‚'=>'ẑ','ZÌ£'=>'Ẓ','zÌ£'=>'ẓ','Ẕ'=>'Ẕ','ẕ'=>'ẕ','ẖ'=>'ẖ','ẗ'=>'ẗ','wÌŠ'=>'ẘ','yÌŠ'=>'ẙ','ẛ'=>'ẛ','AÌ£'=>'Ạ','aÌ£'=>'ạ','Ả'=>'Ả','ả'=>'ả','ÂÌ'=>'Ấ','âÌ'=>'ấ','Ầ'=>'Ầ','ầ'=>'ầ','Ẩ'=>'Ẩ','ẩ'=>'ẩ','Ẫ'=>'Ẫ','ẫ'=>'ẫ','Ậ'=>'Ậ','ậ'=>'ậ','Ä‚Ì'=>'Ắ','ăÌ'=>'ắ','Ằ'=>'Ằ','ằ'=>'ằ','Ẳ'=>'Ẳ','ẳ'=>'ẳ','Ẵ'=>'Ẵ','ẵ'=>'ẵ','Ặ'=>'Ặ','ặ'=>'ặ','EÌ£'=>'Ẹ','eÌ£'=>'ẹ','Ẻ'=>'Ẻ','ẻ'=>'ẻ','Ẽ'=>'Ẽ','ẽ'=>'ẽ','ÊÌ'=>'Ế','êÌ'=>'ế','Ề'=>'Ề','ề'=>'á»','Ể'=>'Ể','ể'=>'ể','Ễ'=>'Ễ','ễ'=>'á»…','Ệ'=>'Ệ','ệ'=>'ệ','Ỉ'=>'Ỉ','ỉ'=>'ỉ','IÌ£'=>'Ị','iÌ£'=>'ị','OÌ£'=>'Ọ','oÌ£'=>'á»','Ỏ'=>'Ỏ','ỏ'=>'á»','ÔÌ'=>'á»','ôÌ'=>'ố','Ồ'=>'á»’','ồ'=>'ồ','Ổ'=>'á»”','ổ'=>'ổ','Ỗ'=>'á»–','ỗ'=>'á»—','Ộ'=>'Ộ','á»Ì‚'=>'á»™','Æ Ì'=>'Ớ','Æ¡Ì'=>'á»›','Ờ'=>'Ờ','ờ'=>'á»','Ở'=>'Ở','ở'=>'ở','Ỡ'=>'á» ','ỡ'=>'ỡ','Ợ'=>'Ợ','ợ'=>'ợ','UÌ£'=>'Ụ','uÌ£'=>'ụ','Ủ'=>'Ủ','ủ'=>'á»§','ƯÌ'=>'Ứ','ưÌ'=>'ứ','Ừ'=>'Ừ','ừ'=>'ừ','Ử'=>'Ử','ử'=>'á»­','Ữ'=>'á»®','ữ'=>'ữ','Ự'=>'á»°','ự'=>'á»±','YÌ€'=>'Ỳ','yÌ€'=>'ỳ','YÌ£'=>'á»´','yÌ£'=>'ỵ','Ỷ'=>'á»¶','ỷ'=>'á»·','Ỹ'=>'Ỹ','ỹ'=>'ỹ','ἀ'=>'á¼€','ἁ'=>'á¼','ἂ'=>'ἂ','á¼Ì€'=>'ἃ','á¼€Ì'=>'ἄ','á¼Ì'=>'á¼…','ἆ'=>'ἆ','á¼Í‚'=>'ἇ','Ἀ'=>'Ἀ','Ἁ'=>'Ἁ','Ἂ'=>'Ἂ','Ἃ'=>'Ἃ','ἈÌ'=>'Ἄ','ἉÌ'=>'á¼','Ἆ'=>'Ἆ','Ἇ'=>'á¼','ἐ'=>'á¼','ἑ'=>'ἑ','á¼Ì€'=>'á¼’','ἓ'=>'ἓ','á¼Ì'=>'á¼”','ἑÌ'=>'ἕ','Ἐ'=>'Ἐ','Ἑ'=>'á¼™','Ἒ'=>'Ἒ','Ἓ'=>'á¼›','ἘÌ'=>'Ἔ','á¼™Ì'=>'á¼','ἠ'=>'á¼ ','ἡ'=>'ἡ','ἢ'=>'á¼¢','ἣ'=>'á¼£','á¼ Ì'=>'ἤ','ἡÌ'=>'á¼¥','á¼ Í‚'=>'ἦ','ἧ'=>'á¼§','Ἠ'=>'Ἠ','Ἡ'=>'Ἡ','Ἢ'=>'Ἢ','Ἣ'=>'Ἣ','ἨÌ'=>'Ἤ','ἩÌ'=>'á¼­','Ἦ'=>'á¼®','Ἧ'=>'Ἧ','ἰ'=>'á¼°','ἱ'=>'á¼±','á¼°Ì€'=>'á¼²','ἳ'=>'á¼³','á¼°Ì'=>'á¼´','á¼±Ì'=>'á¼µ','á¼°Í‚'=>'á¼¶','ἷ'=>'á¼·','Ἰ'=>'Ἰ','Ἱ'=>'á¼¹','Ἲ'=>'Ἲ','Ἳ'=>'á¼»','ἸÌ'=>'á¼¼','á¼¹Ì'=>'á¼½','Ἶ'=>'á¼¾','Ἷ'=>'Ἷ','ὀ'=>'á½€','ὁ'=>'á½','ὂ'=>'ὂ','á½Ì€'=>'ὃ','á½€Ì'=>'ὄ','á½Ì'=>'á½…','Ὀ'=>'Ὀ','Ὁ'=>'Ὁ','Ὂ'=>'Ὂ','Ὃ'=>'Ὃ','ὈÌ'=>'Ὄ','ὉÌ'=>'á½','Ï…Ì“'=>'á½','Ï…Ì”'=>'ὑ','á½Ì€'=>'á½’','ὓ'=>'ὓ','á½Ì'=>'á½”','ὑÌ'=>'ὕ','á½Í‚'=>'á½–','ὗ'=>'á½—','Ὑ'=>'á½™','Ὓ'=>'á½›','á½™Ì'=>'á½','Ὗ'=>'Ὗ','ὠ'=>'á½ ','ὡ'=>'ὡ','ὢ'=>'á½¢','ὣ'=>'á½£','á½ Ì'=>'ὤ','ὡÌ'=>'á½¥','á½ Í‚'=>'ὦ','ὧ'=>'á½§','Ὠ'=>'Ὠ','Ὡ'=>'Ὡ','Ὢ'=>'Ὢ','Ὣ'=>'Ὣ','ὨÌ'=>'Ὤ','ὩÌ'=>'á½­','Ὦ'=>'á½®','Ὧ'=>'Ὧ','ὰ'=>'á½°','ὲ'=>'á½²','ὴ'=>'á½´','ὶ'=>'á½¶','ὸ'=>'ὸ','Ï…Ì€'=>'ὺ','ὼ'=>'á½¼','ᾀ'=>'á¾€','á¼Í…'=>'á¾','ᾂ'=>'ᾂ','ᾃ'=>'ᾃ','ᾄ'=>'ᾄ','á¼…Í…'=>'á¾…','ᾆ'=>'ᾆ','ᾇ'=>'ᾇ','ᾈ'=>'ᾈ','ᾉ'=>'ᾉ','ᾊ'=>'ᾊ','ᾋ'=>'ᾋ','ᾌ'=>'ᾌ','á¼Í…'=>'á¾','ᾎ'=>'ᾎ','á¼Í…'=>'á¾','á¼ Í…'=>'á¾','ᾑ'=>'ᾑ','ᾒ'=>'á¾’','ᾓ'=>'ᾓ','ᾔ'=>'á¾”','ᾕ'=>'ᾕ','ᾖ'=>'á¾–','á¼§Í…'=>'á¾—','ᾘ'=>'ᾘ','ᾙ'=>'á¾™','ᾚ'=>'ᾚ','ᾛ'=>'á¾›','ᾜ'=>'ᾜ','á¼­Í…'=>'á¾','ᾞ'=>'ᾞ','ᾟ'=>'ᾟ','á½ Í…'=>'á¾ ','ᾡ'=>'ᾡ','ᾢ'=>'á¾¢','ᾣ'=>'á¾£','ᾤ'=>'ᾤ','ᾥ'=>'á¾¥','ᾦ'=>'ᾦ','á½§Í…'=>'á¾§','ᾨ'=>'ᾨ','ᾩ'=>'ᾩ','ᾪ'=>'ᾪ','ᾫ'=>'ᾫ','ᾬ'=>'ᾬ','á½­Í…'=>'á¾­','ᾮ'=>'á¾®','ᾯ'=>'ᾯ','ᾰ'=>'á¾°','ᾱ'=>'á¾±','á½°Í…'=>'á¾²','ᾳ'=>'á¾³','ᾴ'=>'á¾´','ᾶ'=>'á¾¶','á¾¶Í…'=>'á¾·','Ᾰ'=>'Ᾰ','Ᾱ'=>'á¾¹','Ὰ'=>'Ὰ','ᾼ'=>'á¾¼','῁'=>'á¿','á½´Í…'=>'á¿‚','ῃ'=>'ῃ','ῄ'=>'á¿„','ῆ'=>'ῆ','ῇ'=>'ῇ','Ὲ'=>'Ὲ','Ὴ'=>'Ὴ','ῌ'=>'ῌ','῍'=>'á¿','᾿Ì'=>'῎','῏'=>'á¿','ῐ'=>'á¿','ῑ'=>'á¿‘','ÏŠÌ€'=>'á¿’','ῖ'=>'á¿–','ÏŠÍ‚'=>'á¿—','Ῐ'=>'Ῐ','Ῑ'=>'á¿™','Ὶ'=>'Ὶ','῝'=>'á¿','῾Ì'=>'῞','῟'=>'῟','ῠ'=>'á¿ ','Ï…Ì„'=>'á¿¡','ῢ'=>'á¿¢','ÏÌ“'=>'ῤ','ÏÌ”'=>'á¿¥','Ï…Í‚'=>'ῦ','ῧ'=>'á¿§','Ῠ'=>'Ῠ','Ῡ'=>'á¿©','Ὺ'=>'Ὺ','Ῥ'=>'Ῥ','῭'=>'á¿­','ῲ'=>'ῲ','ῳ'=>'ῳ','ÏŽÍ…'=>'á¿´','ῶ'=>'á¿¶','á¿¶Í…'=>'á¿·','Ὸ'=>'Ὸ','Ὼ'=>'Ὼ','ῼ'=>'ῼ','â†Ì¸'=>'↚','↛'=>'↛','↮'=>'↮','â‡Ì¸'=>'â‡','⇎'=>'⇎','⇏'=>'â‡','∄'=>'∄','∉'=>'∉','∌'=>'∌','∤'=>'∤','∦'=>'∦','≁'=>'â‰','≄'=>'≄','≇'=>'≇','≉'=>'≉','≠'=>'≠','≢'=>'≢','â‰Ì¸'=>'≭','≮'=>'≮','≯'=>'≯','≰'=>'≰','≱'=>'≱','≴'=>'≴','≵'=>'≵','≸'=>'≸','≹'=>'≹','⊀'=>'⊀','⊁'=>'âŠ','⊄'=>'⊄','⊅'=>'⊅','⊈'=>'⊈','⊉'=>'⊉','⊬'=>'⊬','⊭'=>'⊭','⊮'=>'⊮','⊯'=>'⊯','⋠'=>'â‹ ','⋡'=>'â‹¡','⋢'=>'â‹¢','⋣'=>'â‹£','⋪'=>'⋪','⋫'=>'â‹«','⋬'=>'⋬','⋭'=>'â‹­','ã‹ã‚™'=>'ãŒ','ãã‚™'=>'ãŽ','ãã‚™'=>'ã','ã‘ã‚™'=>'ã’','ã“ã‚™'=>'ã”','ã•ã‚™'=>'ã–','ã—ã‚™'=>'ã˜','ã™ã‚™'=>'ãš','ã›ã‚™'=>'ãœ','ãã‚™'=>'ãž','ãŸã‚™'=>'ã ','ã¡ã‚™'=>'ã¢','ã¤ã‚™'=>'ã¥','ã¦ã‚™'=>'ã§','ã¨ã‚™'=>'ã©','ã¯ã‚™'=>'ã°','ã¯ã‚š'=>'ã±','ã²ã‚™'=>'ã³','ã²ã‚š'=>'ã´','ãµã‚™'=>'ã¶','ãµã‚š'=>'ã·','ã¸ã‚™'=>'ã¹','ã¸ã‚š'=>'ãº','ã»ã‚™'=>'ã¼','ã»ã‚š'=>'ã½','ã†ã‚™'=>'ã‚”','ã‚ã‚™'=>'ゞ','ã‚«ã‚™'=>'ガ','ã‚­ã‚™'=>'ã‚®','グ'=>'ã‚°','ゲ'=>'ゲ','ゴ'=>'ã‚´','ザ'=>'ã‚¶','ã‚·ã‚™'=>'ジ','ズ'=>'ズ','ゼ'=>'ゼ','ゾ'=>'ゾ','ã‚¿ã‚™'=>'ダ','ãƒã‚™'=>'ヂ','ヅ'=>'ヅ','デ'=>'デ','ド'=>'ド','ãƒã‚™'=>'ãƒ','ãƒã‚š'=>'パ','ビ'=>'ビ','ピ'=>'ピ','ブ'=>'ブ','プ'=>'プ','ベ'=>'ベ','ペ'=>'ペ','ボ'=>'ボ','ポ'=>'ãƒ','ヴ'=>'ヴ','ヷ'=>'ヷ','ヸ'=>'ヸ','ヹ'=>'ヹ','ヺ'=>'ヺ','ヾ'=>'ヾ'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/utf_canonical_decomp.php b/phpBB/includes/utf/data/utf_canonical_decomp.php deleted file mode 100644 index 460a0cf323..0000000000 --- a/phpBB/includes/utf/data/utf_canonical_decomp.php +++ /dev/null @@ -1,2 +0,0 @@ -'AÌ€','Ã'=>'AÌ','Â'=>'AÌ‚','Ã'=>'Ã','Ä'=>'Ä','Ã…'=>'AÌŠ','Ç'=>'Ç','È'=>'EÌ€','É'=>'EÌ','Ê'=>'EÌ‚','Ë'=>'Ë','ÃŒ'=>'IÌ€','Ã'=>'IÌ','ÃŽ'=>'IÌ‚','Ã'=>'Ï','Ñ'=>'Ñ','Ã’'=>'OÌ€','Ó'=>'OÌ','Ô'=>'OÌ‚','Õ'=>'Õ','Ö'=>'Ö','Ù'=>'UÌ€','Ú'=>'UÌ','Û'=>'UÌ‚','Ü'=>'Ü','Ã'=>'YÌ','à'=>'aÌ€','á'=>'aÌ','â'=>'aÌ‚','ã'=>'ã','ä'=>'ä','Ã¥'=>'aÌŠ','ç'=>'ç','è'=>'eÌ€','é'=>'eÌ','ê'=>'eÌ‚','ë'=>'ë','ì'=>'iÌ€','í'=>'iÌ','î'=>'iÌ‚','ï'=>'ï','ñ'=>'ñ','ò'=>'oÌ€','ó'=>'oÌ','ô'=>'oÌ‚','õ'=>'õ','ö'=>'ö','ù'=>'uÌ€','ú'=>'uÌ','û'=>'uÌ‚','ü'=>'ü','ý'=>'yÌ','ÿ'=>'ÿ','Ä€'=>'AÌ„','Ä'=>'aÌ„','Ä‚'=>'Ă','ă'=>'ă','Ä„'=>'Ą','Ä…'=>'ą','Ć'=>'CÌ','ć'=>'cÌ','Ĉ'=>'CÌ‚','ĉ'=>'cÌ‚','ÄŠ'=>'Ċ','Ä‹'=>'ċ','ÄŒ'=>'CÌŒ','Ä'=>'cÌŒ','ÄŽ'=>'DÌŒ','Ä'=>'dÌŒ','Ä’'=>'EÌ„','Ä“'=>'eÌ„','Ä”'=>'Ĕ','Ä•'=>'ĕ','Ä–'=>'Ė','Ä—'=>'ė','Ę'=>'Ę','Ä™'=>'ę','Äš'=>'EÌŒ','Ä›'=>'eÌŒ','Äœ'=>'GÌ‚','Ä'=>'gÌ‚','Äž'=>'Ğ','ÄŸ'=>'ğ','Ä '=>'Ġ','Ä¡'=>'ġ','Ä¢'=>'Ģ','Ä£'=>'ģ','Ĥ'=>'HÌ‚','Ä¥'=>'hÌ‚','Ĩ'=>'Ĩ','Ä©'=>'ĩ','Ī'=>'IÌ„','Ä«'=>'iÌ„','Ĭ'=>'Ĭ','Ä­'=>'ĭ','Ä®'=>'Į','į'=>'į','İ'=>'İ','Ä´'=>'JÌ‚','ĵ'=>'jÌ‚','Ķ'=>'Ķ','Ä·'=>'ķ','Ĺ'=>'LÌ','ĺ'=>'lÌ','Ä»'=>'Ļ','ļ'=>'ļ','Ľ'=>'LÌŒ','ľ'=>'lÌŒ','Ń'=>'NÌ','Å„'=>'nÌ','Å…'=>'Ņ','ņ'=>'ņ','Ň'=>'NÌŒ','ň'=>'nÌŒ','ÅŒ'=>'OÌ„','Å'=>'oÌ„','ÅŽ'=>'Ŏ','Å'=>'ŏ','Å'=>'OÌ‹','Å‘'=>'oÌ‹','Å”'=>'RÌ','Å•'=>'rÌ','Å–'=>'Ŗ','Å—'=>'ŗ','Ř'=>'RÌŒ','Å™'=>'rÌŒ','Åš'=>'SÌ','Å›'=>'sÌ','Åœ'=>'SÌ‚','Å'=>'sÌ‚','Åž'=>'Ş','ÅŸ'=>'ş','Å '=>'SÌŒ','Å¡'=>'sÌŒ','Å¢'=>'Ţ','Å£'=>'ţ','Ť'=>'TÌŒ','Å¥'=>'tÌŒ','Ũ'=>'Ũ','Å©'=>'ũ','Ū'=>'UÌ„','Å«'=>'uÌ„','Ŭ'=>'Ŭ','Å­'=>'ŭ','Å®'=>'UÌŠ','ů'=>'uÌŠ','Ű'=>'UÌ‹','ű'=>'uÌ‹','Ų'=>'Ų','ų'=>'ų','Å´'=>'WÌ‚','ŵ'=>'wÌ‚','Ŷ'=>'YÌ‚','Å·'=>'yÌ‚','Ÿ'=>'Ÿ','Ź'=>'ZÌ','ź'=>'zÌ','Å»'=>'Ż','ż'=>'ż','Ž'=>'ZÌŒ','ž'=>'zÌŒ','Æ '=>'OÌ›','Æ¡'=>'oÌ›','Ư'=>'UÌ›','ư'=>'uÌ›','Ç'=>'AÌŒ','ÇŽ'=>'aÌŒ','Ç'=>'IÌŒ','Ç'=>'iÌŒ','Ç‘'=>'OÌŒ','Ç’'=>'oÌŒ','Ç“'=>'UÌŒ','Ç”'=>'uÌŒ','Ç•'=>'Ǖ','Ç–'=>'ǖ','Ç—'=>'ÜÌ','ǘ'=>'üÌ','Ç™'=>'Ǚ','Çš'=>'ǚ','Ç›'=>'Ǜ','Çœ'=>'ǜ','Çž'=>'Ǟ','ÇŸ'=>'ǟ','Ç '=>'Ǡ','Ç¡'=>'ǡ','Ç¢'=>'Ǣ','Ç£'=>'ǣ','Ǧ'=>'GÌŒ','ǧ'=>'gÌŒ','Ǩ'=>'KÌŒ','Ç©'=>'kÌŒ','Ǫ'=>'Ǫ','Ç«'=>'ǫ','Ǭ'=>'Ǭ','Ç­'=>'ǭ','Ç®'=>'Æ·ÌŒ','ǯ'=>'Ê’ÌŒ','ǰ'=>'jÌŒ','Ç´'=>'GÌ','ǵ'=>'gÌ','Ǹ'=>'NÌ€','ǹ'=>'nÌ€','Ǻ'=>'AÌŠÌ','Ç»'=>'aÌŠÌ','Ǽ'=>'ÆÌ','ǽ'=>'æÌ','Ǿ'=>'ØÌ','Ç¿'=>'øÌ','È€'=>'AÌ','È'=>'aÌ','È‚'=>'AÌ‘','ȃ'=>'aÌ‘','È„'=>'EÌ','È…'=>'eÌ','Ȇ'=>'EÌ‘','ȇ'=>'eÌ‘','Ȉ'=>'IÌ','ȉ'=>'iÌ','ÈŠ'=>'IÌ‘','È‹'=>'iÌ‘','ÈŒ'=>'OÌ','È'=>'oÌ','ÈŽ'=>'OÌ‘','È'=>'oÌ‘','È'=>'RÌ','È‘'=>'rÌ','È’'=>'RÌ‘','È“'=>'rÌ‘','È”'=>'UÌ','È•'=>'uÌ','È–'=>'UÌ‘','È—'=>'uÌ‘','Ș'=>'Ș','È™'=>'ș','Èš'=>'Ț','È›'=>'ț','Èž'=>'HÌŒ','ÈŸ'=>'hÌŒ','Ȧ'=>'Ȧ','ȧ'=>'ȧ','Ȩ'=>'Ȩ','È©'=>'ȩ','Ȫ'=>'Ȫ','È«'=>'ȫ','Ȭ'=>'Ȭ','È­'=>'ȭ','È®'=>'Ȯ','ȯ'=>'ȯ','Ȱ'=>'Ȱ','ȱ'=>'ȱ','Ȳ'=>'YÌ„','ȳ'=>'yÌ„','Í€'=>'Ì€','Í'=>'Ì','̓'=>'Ì“','Í„'=>'̈Ì','Í´'=>'ʹ',';'=>';','Î…'=>'¨Ì','Ά'=>'ΑÌ','·'=>'·','Έ'=>'ΕÌ','Ή'=>'ΗÌ','Ί'=>'ΙÌ','ÎŒ'=>'ΟÌ','ÎŽ'=>'Î¥Ì','Î'=>'ΩÌ','Î'=>'ϊÌ','Ϊ'=>'Ϊ','Ϋ'=>'Ϋ','ά'=>'αÌ','έ'=>'εÌ','ή'=>'ηÌ','ί'=>'ιÌ','ΰ'=>'ϋÌ','ÏŠ'=>'ϊ','Ï‹'=>'ϋ','ÏŒ'=>'οÌ','Ï'=>'Ï…Ì','ÏŽ'=>'ωÌ','Ï“'=>'Ï’Ì','Ï”'=>'ϔ','Ѐ'=>'Ѐ','Ð'=>'Ё','Ѓ'=>'ГÌ','Ї'=>'Ї','ÐŒ'=>'КÌ','Ð'=>'Ѝ','ÐŽ'=>'Ў','Й'=>'Й','й'=>'й','Ñ'=>'ѐ','Ñ‘'=>'ё','Ñ“'=>'гÌ','Ñ—'=>'ї','Ñœ'=>'кÌ','Ñ'=>'ѝ','Ñž'=>'ў','Ѷ'=>'Ñ´Ì','Ñ·'=>'ѵÌ','Ó'=>'Ӂ','Ó‚'=>'ӂ','Ó'=>'Ð̆','Ó‘'=>'ӑ','Ó’'=>'Ð̈','Ó“'=>'ӓ','Ó–'=>'Ӗ','Ó—'=>'ӗ','Óš'=>'Ӛ','Ó›'=>'ӛ','Óœ'=>'Ӝ','Ó'=>'ӝ','Óž'=>'Ӟ','ÓŸ'=>'ӟ','Ó¢'=>'Ӣ','Ó£'=>'ӣ','Ó¤'=>'Ӥ','Ó¥'=>'ӥ','Ó¦'=>'Ӧ','Ó§'=>'ӧ','Óª'=>'Ӫ','Ó«'=>'ӫ','Ó¬'=>'Ӭ','Ó­'=>'Ñ̈','Ó®'=>'Ӯ','Ó¯'=>'ӯ','Ó°'=>'Ӱ','Ó±'=>'ӱ','Ó²'=>'Ӳ','Ó³'=>'ӳ','Ó´'=>'Ӵ','Óµ'=>'ӵ','Ó¸'=>'Ӹ','Ó¹'=>'ӹ','Ø¢'=>'آ','Ø£'=>'أ','ؤ'=>'ÙˆÙ”','Ø¥'=>'إ','ئ'=>'ÙŠÙ”','Û€'=>'Û•Ù”','Û‚'=>'ÛÙ”','Û“'=>'Û’Ù”','ऩ'=>'ऩ','ऱ'=>'ऱ','ऴ'=>'ऴ','क़'=>'क़','ख़'=>'ख़','ग़'=>'ग़','ज़'=>'ज़','ड़'=>'ड़','à¥'=>'ढ़','फ़'=>'फ़','य़'=>'य़','à§‹'=>'ো','à§Œ'=>'ৌ','à§œ'=>'ড়','à§'=>'ঢ়','à§Ÿ'=>'য়','ਲ਼'=>'ਲ਼','ਸ਼'=>'ਸ਼','à©™'=>'ਖ਼','ਗ਼'=>'ਗ਼','à©›'=>'ਜ਼','ਫ਼'=>'ਫ਼','à­ˆ'=>'ୈ','à­‹'=>'ୋ','à­Œ'=>'ୌ','à­œ'=>'ଡ଼','à­'=>'ଢ଼','à®”'=>'ஔ','ொ'=>'ொ','ோ'=>'ோ','ௌ'=>'ௌ','ై'=>'ై','à³€'=>'ೀ','ೇ'=>'ೇ','ೈ'=>'ೈ','ೊ'=>'ೊ','ೋ'=>'ೋ','ൊ'=>'ൊ','ോ'=>'ോ','ൌ'=>'ൌ','à·š'=>'ේ','à·œ'=>'à·™à·','à·'=>'à·™à·à·Š','à·ž'=>'ෞ','གྷ'=>'གྷ','à½'=>'ཌྷ','དྷ'=>'དྷ','བྷ'=>'བྷ','ཛྷ'=>'ཛྷ','ཀྵ'=>'ཀྵ','ཱི'=>'ཱི','ཱུ'=>'ཱུ','ྲྀ'=>'ྲྀ','ླྀ'=>'ླྀ','à¾'=>'ཱྀ','ྒྷ'=>'ྒྷ','à¾'=>'ྜྷ','ྡྷ'=>'ྡྷ','ྦྷ'=>'ྦྷ','ྫྷ'=>'ྫྷ','ྐྵ'=>'à¾à¾µ','ဦ'=>'ဦ','ᬆ'=>'ᬆ','ᬈ'=>'ᬈ','ᬊ'=>'ᬊ','ᬌ'=>'ᬌ','ᬎ'=>'á¬á¬µ','ᬒ'=>'ᬒ','ᬻ'=>'ᬻ','ᬽ'=>'ᬽ','á­€'=>'ᭀ','á­'=>'ᭁ','á­ƒ'=>'ᭃ','Ḁ'=>'AÌ¥','á¸'=>'aÌ¥','Ḃ'=>'Ḃ','ḃ'=>'ḃ','Ḅ'=>'BÌ£','ḅ'=>'bÌ£','Ḇ'=>'Ḇ','ḇ'=>'ḇ','Ḉ'=>'ÇÌ','ḉ'=>'çÌ','Ḋ'=>'Ḋ','ḋ'=>'ḋ','Ḍ'=>'DÌ£','á¸'=>'dÌ£','Ḏ'=>'Ḏ','á¸'=>'ḏ','á¸'=>'Ḑ','ḑ'=>'ḑ','Ḓ'=>'DÌ­','ḓ'=>'dÌ­','Ḕ'=>'Ḕ','ḕ'=>'ḕ','Ḗ'=>'EÌ„Ì','ḗ'=>'eÌ„Ì','Ḙ'=>'EÌ­','ḙ'=>'eÌ­','Ḛ'=>'Ḛ','ḛ'=>'ḛ','Ḝ'=>'Ḝ','á¸'=>'ḝ','Ḟ'=>'Ḟ','ḟ'=>'ḟ','Ḡ'=>'GÌ„','ḡ'=>'gÌ„','Ḣ'=>'Ḣ','ḣ'=>'ḣ','Ḥ'=>'HÌ£','ḥ'=>'hÌ£','Ḧ'=>'Ḧ','ḧ'=>'ḧ','Ḩ'=>'Ḩ','ḩ'=>'ḩ','Ḫ'=>'HÌ®','ḫ'=>'hÌ®','Ḭ'=>'Ḭ','ḭ'=>'ḭ','Ḯ'=>'ÏÌ','ḯ'=>'ïÌ','Ḱ'=>'KÌ','ḱ'=>'kÌ','Ḳ'=>'KÌ£','ḳ'=>'kÌ£','Ḵ'=>'Ḵ','ḵ'=>'ḵ','Ḷ'=>'LÌ£','ḷ'=>'lÌ£','Ḹ'=>'Ḹ','ḹ'=>'ḹ','Ḻ'=>'Ḻ','ḻ'=>'ḻ','Ḽ'=>'LÌ­','ḽ'=>'lÌ­','Ḿ'=>'MÌ','ḿ'=>'mÌ','á¹€'=>'Ṁ','á¹'=>'ṁ','Ṃ'=>'MÌ£','ṃ'=>'mÌ£','Ṅ'=>'Ṅ','á¹…'=>'ṅ','Ṇ'=>'NÌ£','ṇ'=>'nÌ£','Ṉ'=>'Ṉ','ṉ'=>'ṉ','Ṋ'=>'NÌ­','ṋ'=>'nÌ­','Ṍ'=>'ÕÌ','á¹'=>'õÌ','Ṏ'=>'Ṏ','á¹'=>'ṏ','á¹'=>'Ṑ','ṑ'=>'ṑ','á¹’'=>'OÌ„Ì','ṓ'=>'oÌ„Ì','á¹”'=>'PÌ','ṕ'=>'pÌ','á¹–'=>'Ṗ','á¹—'=>'ṗ','Ṙ'=>'Ṙ','á¹™'=>'ṙ','Ṛ'=>'RÌ£','á¹›'=>'rÌ£','Ṝ'=>'Ṝ','á¹'=>'ṝ','Ṟ'=>'Ṟ','ṟ'=>'ṟ','á¹ '=>'Ṡ','ṡ'=>'ṡ','á¹¢'=>'SÌ£','á¹£'=>'sÌ£','Ṥ'=>'SÌ̇','á¹¥'=>'sÌ̇','Ṧ'=>'Ṧ','á¹§'=>'ṧ','Ṩ'=>'Ṩ','ṩ'=>'ṩ','Ṫ'=>'Ṫ','ṫ'=>'ṫ','Ṭ'=>'TÌ£','á¹­'=>'tÌ£','á¹®'=>'Ṯ','ṯ'=>'ṯ','á¹°'=>'TÌ­','á¹±'=>'tÌ­','á¹²'=>'Ṳ','á¹³'=>'ṳ','á¹´'=>'Ṵ','á¹µ'=>'ṵ','á¹¶'=>'UÌ­','á¹·'=>'uÌ­','Ṹ'=>'ŨÌ','á¹¹'=>'ũÌ','Ṻ'=>'Ṻ','á¹»'=>'ṻ','á¹¼'=>'Ṽ','á¹½'=>'ṽ','á¹¾'=>'VÌ£','ṿ'=>'vÌ£','Ẁ'=>'WÌ€','áº'=>'wÌ€','Ẃ'=>'WÌ','ẃ'=>'wÌ','Ẅ'=>'Ẅ','ẅ'=>'ẅ','Ẇ'=>'Ẇ','ẇ'=>'ẇ','Ẉ'=>'WÌ£','ẉ'=>'wÌ£','Ẋ'=>'Ẋ','ẋ'=>'ẋ','Ẍ'=>'Ẍ','áº'=>'ẍ','Ẏ'=>'Ẏ','áº'=>'ẏ','áº'=>'ZÌ‚','ẑ'=>'zÌ‚','Ẓ'=>'ZÌ£','ẓ'=>'zÌ£','Ẕ'=>'Ẕ','ẕ'=>'ẕ','ẖ'=>'ẖ','ẗ'=>'ẗ','ẘ'=>'wÌŠ','ẙ'=>'yÌŠ','ẛ'=>'ẛ','Ạ'=>'AÌ£','ạ'=>'aÌ£','Ả'=>'Ả','ả'=>'ả','Ấ'=>'AÌ‚Ì','ấ'=>'aÌ‚Ì','Ầ'=>'Ầ','ầ'=>'ầ','Ẩ'=>'Ẩ','ẩ'=>'ẩ','Ẫ'=>'Ẫ','ẫ'=>'ẫ','Ậ'=>'Ậ','ậ'=>'ậ','Ắ'=>'ĂÌ','ắ'=>'ăÌ','Ằ'=>'Ằ','ằ'=>'ằ','Ẳ'=>'Ẳ','ẳ'=>'ẳ','Ẵ'=>'Ẵ','ẵ'=>'ẵ','Ặ'=>'Ặ','ặ'=>'ặ','Ẹ'=>'EÌ£','ẹ'=>'eÌ£','Ẻ'=>'Ẻ','ẻ'=>'ẻ','Ẽ'=>'Ẽ','ẽ'=>'ẽ','Ế'=>'EÌ‚Ì','ế'=>'eÌ‚Ì','Ề'=>'Ề','á»'=>'ề','Ể'=>'Ể','ể'=>'ể','Ễ'=>'Ễ','á»…'=>'ễ','Ệ'=>'Ệ','ệ'=>'ệ','Ỉ'=>'Ỉ','ỉ'=>'ỉ','Ị'=>'IÌ£','ị'=>'iÌ£','Ọ'=>'OÌ£','á»'=>'oÌ£','Ỏ'=>'Ỏ','á»'=>'ỏ','á»'=>'OÌ‚Ì','ố'=>'oÌ‚Ì','á»’'=>'Ồ','ồ'=>'ồ','á»”'=>'Ổ','ổ'=>'ổ','á»–'=>'Ỗ','á»—'=>'ỗ','Ộ'=>'Ộ','á»™'=>'ộ','Ớ'=>'OÌ›Ì','á»›'=>'oÌ›Ì','Ờ'=>'Ờ','á»'=>'ờ','Ở'=>'Ở','ở'=>'ở','á» '=>'Ỡ','ỡ'=>'ỡ','Ợ'=>'Ợ','ợ'=>'ợ','Ụ'=>'UÌ£','ụ'=>'uÌ£','Ủ'=>'Ủ','á»§'=>'ủ','Ứ'=>'UÌ›Ì','ứ'=>'uÌ›Ì','Ừ'=>'Ừ','ừ'=>'ừ','Ử'=>'Ử','á»­'=>'ử','á»®'=>'Ữ','ữ'=>'ữ','á»°'=>'Ự','á»±'=>'ự','Ỳ'=>'YÌ€','ỳ'=>'yÌ€','á»´'=>'YÌ£','ỵ'=>'yÌ£','á»¶'=>'Ỷ','á»·'=>'ỷ','Ỹ'=>'Ỹ','ỹ'=>'ỹ','á¼€'=>'ἀ','á¼'=>'ἁ','ἂ'=>'ἂ','ἃ'=>'ἃ','ἄ'=>'ἀÌ','á¼…'=>'ἁÌ','ἆ'=>'ἆ','ἇ'=>'ἇ','Ἀ'=>'Ἀ','Ἁ'=>'Ἁ','Ἂ'=>'Ἂ','Ἃ'=>'Ἃ','Ἄ'=>'ἈÌ','á¼'=>'ἉÌ','Ἆ'=>'Ἆ','á¼'=>'Ἇ','á¼'=>'ἐ','ἑ'=>'ἑ','á¼’'=>'ἒ','ἓ'=>'ἓ','á¼”'=>'ἐÌ','ἕ'=>'ἑÌ','Ἐ'=>'Ἐ','á¼™'=>'Ἑ','Ἒ'=>'Ἒ','á¼›'=>'Ἓ','Ἔ'=>'ἘÌ','á¼'=>'ἙÌ','á¼ '=>'ἠ','ἡ'=>'ἡ','á¼¢'=>'ἢ','á¼£'=>'ἣ','ἤ'=>'ἠÌ','á¼¥'=>'ἡÌ','ἦ'=>'ἦ','á¼§'=>'ἧ','Ἠ'=>'Ἠ','Ἡ'=>'Ἡ','Ἢ'=>'Ἢ','Ἣ'=>'Ἣ','Ἤ'=>'ἨÌ','á¼­'=>'ἩÌ','á¼®'=>'Ἦ','Ἧ'=>'Ἧ','á¼°'=>'ἰ','á¼±'=>'ἱ','á¼²'=>'ἲ','á¼³'=>'ἳ','á¼´'=>'ἰÌ','á¼µ'=>'ἱÌ','á¼¶'=>'ἶ','á¼·'=>'ἷ','Ἰ'=>'Ἰ','á¼¹'=>'Ἱ','Ἲ'=>'Ἲ','á¼»'=>'Ἳ','á¼¼'=>'ἸÌ','á¼½'=>'ἹÌ','á¼¾'=>'Ἶ','Ἷ'=>'Ἷ','á½€'=>'ὀ','á½'=>'ὁ','ὂ'=>'ὂ','ὃ'=>'ὃ','ὄ'=>'ὀÌ','á½…'=>'ὁÌ','Ὀ'=>'Ὀ','Ὁ'=>'Ὁ','Ὂ'=>'Ὂ','Ὃ'=>'Ὃ','Ὄ'=>'ὈÌ','á½'=>'ὉÌ','á½'=>'Ï…Ì“','ὑ'=>'Ï…Ì”','á½’'=>'ὒ','ὓ'=>'ὓ','á½”'=>'Ï…Ì“Ì','ὕ'=>'Ï…Ì”Ì','á½–'=>'ὖ','á½—'=>'ὗ','á½™'=>'Ὑ','á½›'=>'Ὓ','á½'=>'ὙÌ','Ὗ'=>'Ὗ','á½ '=>'ὠ','ὡ'=>'ὡ','á½¢'=>'ὢ','á½£'=>'ὣ','ὤ'=>'ὠÌ','á½¥'=>'ὡÌ','ὦ'=>'ὦ','á½§'=>'ὧ','Ὠ'=>'Ὠ','Ὡ'=>'Ὡ','Ὢ'=>'Ὢ','Ὣ'=>'Ὣ','Ὤ'=>'ὨÌ','á½­'=>'ὩÌ','á½®'=>'Ὦ','Ὧ'=>'Ὧ','á½°'=>'ὰ','á½±'=>'αÌ','á½²'=>'ὲ','á½³'=>'εÌ','á½´'=>'ὴ','á½µ'=>'ηÌ','á½¶'=>'ὶ','á½·'=>'ιÌ','ὸ'=>'ὸ','á½¹'=>'οÌ','ὺ'=>'Ï…Ì€','á½»'=>'Ï…Ì','á½¼'=>'ὼ','á½½'=>'ωÌ','á¾€'=>'ᾀ','á¾'=>'ᾁ','ᾂ'=>'ᾂ','ᾃ'=>'ᾃ','ᾄ'=>'ἀÌÍ…','á¾…'=>'ἁÌÍ…','ᾆ'=>'ᾆ','ᾇ'=>'ᾇ','ᾈ'=>'ᾈ','ᾉ'=>'ᾉ','ᾊ'=>'ᾊ','ᾋ'=>'ᾋ','ᾌ'=>'ἈÌÍ…','á¾'=>'ἉÌÍ…','ᾎ'=>'ᾎ','á¾'=>'ᾏ','á¾'=>'ᾐ','ᾑ'=>'ᾑ','á¾’'=>'ᾒ','ᾓ'=>'ᾓ','á¾”'=>'ἠÌÍ…','ᾕ'=>'ἡÌÍ…','á¾–'=>'ᾖ','á¾—'=>'ᾗ','ᾘ'=>'ᾘ','á¾™'=>'ᾙ','ᾚ'=>'ᾚ','á¾›'=>'ᾛ','ᾜ'=>'ἨÌÍ…','á¾'=>'ἩÌÍ…','ᾞ'=>'ᾞ','ᾟ'=>'ᾟ','á¾ '=>'ᾠ','ᾡ'=>'ᾡ','á¾¢'=>'ᾢ','á¾£'=>'ᾣ','ᾤ'=>'ὠÌÍ…','á¾¥'=>'ὡÌÍ…','ᾦ'=>'ᾦ','á¾§'=>'ᾧ','ᾨ'=>'ᾨ','ᾩ'=>'ᾩ','ᾪ'=>'ᾪ','ᾫ'=>'ᾫ','ᾬ'=>'ὨÌÍ…','á¾­'=>'ὩÌÍ…','á¾®'=>'ᾮ','ᾯ'=>'ᾯ','á¾°'=>'ᾰ','á¾±'=>'ᾱ','á¾²'=>'ᾲ','á¾³'=>'ᾳ','á¾´'=>'αÌÍ…','á¾¶'=>'ᾶ','á¾·'=>'ᾷ','Ᾰ'=>'Ᾰ','á¾¹'=>'Ᾱ','Ὰ'=>'Ὰ','á¾»'=>'ΑÌ','á¾¼'=>'ᾼ','á¾¾'=>'ι','á¿'=>'῁','á¿‚'=>'ῂ','ῃ'=>'ῃ','á¿„'=>'ηÌÍ…','ῆ'=>'ῆ','ῇ'=>'ῇ','Ὲ'=>'Ὲ','Έ'=>'ΕÌ','Ὴ'=>'Ὴ','á¿‹'=>'ΗÌ','ῌ'=>'ῌ','á¿'=>'῍','῎'=>'᾿Ì','á¿'=>'῏','á¿'=>'ῐ','á¿‘'=>'ῑ','á¿’'=>'ῒ','á¿“'=>'ϊÌ','á¿–'=>'ῖ','á¿—'=>'ῗ','Ῐ'=>'Ῐ','á¿™'=>'Ῑ','Ὶ'=>'Ὶ','á¿›'=>'ΙÌ','á¿'=>'῝','῞'=>'῾Ì','῟'=>'῟','á¿ '=>'ῠ','á¿¡'=>'Ï…Ì„','á¿¢'=>'ῢ','á¿£'=>'ϋÌ','ῤ'=>'ÏÌ“','á¿¥'=>'ÏÌ”','ῦ'=>'Ï…Í‚','á¿§'=>'ῧ','Ῠ'=>'Ῠ','á¿©'=>'Ῡ','Ὺ'=>'Ὺ','á¿«'=>'Î¥Ì','Ῥ'=>'Ῥ','á¿­'=>'῭','á¿®'=>'¨Ì','`'=>'`','ῲ'=>'ῲ','ῳ'=>'ῳ','á¿´'=>'ωÌÍ…','á¿¶'=>'ῶ','á¿·'=>'ῷ','Ὸ'=>'Ὸ','Ό'=>'ΟÌ','Ὼ'=>'Ὼ','á¿»'=>'ΩÌ','ῼ'=>'ῼ','´'=>'´',' '=>' ','â€'=>' ','Ω'=>'Ω','K'=>'K','â„«'=>'AÌŠ','↚'=>'â†Ì¸','↛'=>'↛','↮'=>'↮','â‡'=>'â‡Ì¸','⇎'=>'⇎','â‡'=>'⇏','∄'=>'∄','∉'=>'∉','∌'=>'∌','∤'=>'∤','∦'=>'∦','â‰'=>'≁','≄'=>'≄','≇'=>'≇','≉'=>'≉','≠'=>'≠','≢'=>'≢','≭'=>'â‰Ì¸','≮'=>'≮','≯'=>'≯','≰'=>'≰','≱'=>'≱','≴'=>'≴','≵'=>'≵','≸'=>'≸','≹'=>'≹','⊀'=>'⊀','âŠ'=>'⊁','⊄'=>'⊄','⊅'=>'⊅','⊈'=>'⊈','⊉'=>'⊉','⊬'=>'⊬','⊭'=>'⊭','⊮'=>'⊮','⊯'=>'⊯','â‹ '=>'⋠','â‹¡'=>'⋡','â‹¢'=>'⋢','â‹£'=>'⋣','⋪'=>'⋪','â‹«'=>'⋫','⋬'=>'⋬','â‹­'=>'⋭','〈'=>'〈','〉'=>'〉','⫝̸'=>'â«Ì¸','ãŒ'=>'ã‹ã‚™','ãŽ'=>'ãã‚™','ã'=>'ãã‚™','ã’'=>'ã‘ã‚™','ã”'=>'ã“ã‚™','ã–'=>'ã•ã‚™','ã˜'=>'ã—ã‚™','ãš'=>'ã™ã‚™','ãœ'=>'ã›ã‚™','ãž'=>'ãã‚™','ã '=>'ãŸã‚™','ã¢'=>'ã¡ã‚™','ã¥'=>'ã¤ã‚™','ã§'=>'ã¦ã‚™','ã©'=>'ã¨ã‚™','ã°'=>'ã¯ã‚™','ã±'=>'ã¯ã‚š','ã³'=>'ã²ã‚™','ã´'=>'ã²ã‚š','ã¶'=>'ãµã‚™','ã·'=>'ãµã‚š','ã¹'=>'ã¸ã‚™','ãº'=>'ã¸ã‚š','ã¼'=>'ã»ã‚™','ã½'=>'ã»ã‚š','ã‚”'=>'ã†ã‚™','ゞ'=>'ã‚ã‚™','ガ'=>'ã‚«ã‚™','ã‚®'=>'ã‚­ã‚™','ã‚°'=>'グ','ゲ'=>'ゲ','ã‚´'=>'ゴ','ã‚¶'=>'ザ','ジ'=>'ã‚·ã‚™','ズ'=>'ズ','ゼ'=>'ゼ','ゾ'=>'ゾ','ダ'=>'ã‚¿ã‚™','ヂ'=>'ãƒã‚™','ヅ'=>'ヅ','デ'=>'デ','ド'=>'ド','ãƒ'=>'ãƒã‚™','パ'=>'ãƒã‚š','ビ'=>'ビ','ピ'=>'ピ','ブ'=>'ブ','プ'=>'プ','ベ'=>'ベ','ペ'=>'ペ','ボ'=>'ボ','ãƒ'=>'ポ','ヴ'=>'ヴ','ヷ'=>'ヷ','ヸ'=>'ヸ','ヹ'=>'ヹ','ヺ'=>'ヺ','ヾ'=>'ヾ','豈'=>'豈','ï¤'=>'æ›´','車'=>'車','賈'=>'賈','滑'=>'滑','串'=>'串','句'=>'å¥','龜'=>'龜','龜'=>'龜','契'=>'契','金'=>'金','喇'=>'å–‡','奈'=>'奈','ï¤'=>'懶','癩'=>'癩','ï¤'=>'ç¾…','ï¤'=>'蘿','螺'=>'螺','裸'=>'裸','邏'=>'é‚','樂'=>'樂','洛'=>'æ´›','烙'=>'烙','珞'=>'çž','落'=>'è½','酪'=>'é…ª','駱'=>'é§±','亂'=>'亂','卵'=>'åµ','ï¤'=>'欄','爛'=>'爛','蘭'=>'蘭','鸞'=>'鸞','嵐'=>'åµ','濫'=>'æ¿«','藍'=>'è—','襤'=>'襤','拉'=>'拉','臘'=>'臘','蠟'=>'è Ÿ','廊'=>'廊','朗'=>'朗','浪'=>'浪','狼'=>'狼','郎'=>'郎','來'=>'來','冷'=>'冷','勞'=>'勞','擄'=>'æ“„','櫓'=>'æ«“','爐'=>'çˆ','盧'=>'ç›§','老'=>'è€','蘆'=>'蘆','虜'=>'虜','路'=>'è·¯','露'=>'露','魯'=>'é­¯','鷺'=>'é·º','碌'=>'碌','祿'=>'祿','綠'=>'ç¶ ','菉'=>'è‰','錄'=>'錄','鹿'=>'鹿','ï¥'=>'è«–','壟'=>'壟','弄'=>'弄','籠'=>'ç± ','聾'=>'è¾','牢'=>'牢','磊'=>'磊','賂'=>'賂','雷'=>'é›·','壘'=>'壘','屢'=>'å±¢','樓'=>'樓','ï¥'=>'æ·š','漏'=>'æ¼','ï¥'=>'ç´¯','ï¥'=>'縷','陋'=>'陋','勒'=>'å‹’','肋'=>'è‚‹','凜'=>'凜','凌'=>'凌','稜'=>'稜','綾'=>'ç¶¾','菱'=>'è±','陵'=>'陵','讀'=>'讀','拏'=>'æ‹','樂'=>'樂','ï¥'=>'諾','丹'=>'丹','寧'=>'寧','怒'=>'怒','率'=>'率','異'=>'ç•°','北'=>'北','磻'=>'磻','便'=>'便','復'=>'復','不'=>'ä¸','泌'=>'泌','數'=>'數','索'=>'ç´¢','參'=>'åƒ','塞'=>'塞','省'=>'çœ','葉'=>'葉','說'=>'說','殺'=>'殺','辰'=>'è¾°','沈'=>'沈','拾'=>'拾','若'=>'è‹¥','掠'=>'掠','略'=>'ç•¥','亮'=>'亮','兩'=>'å…©','凉'=>'凉','梁'=>'æ¢','糧'=>'ç³§','良'=>'良','諒'=>'è«’','量'=>'é‡','勵'=>'勵','呂'=>'å‘‚','ï¦'=>'女','廬'=>'廬','旅'=>'æ—…','濾'=>'濾','礪'=>'礪','閭'=>'é–­','驪'=>'驪','麗'=>'麗','黎'=>'黎','力'=>'力','曆'=>'曆','歷'=>'æ­·','ï¦'=>'è½¢','年'=>'å¹´','ï¦'=>'æ†','ï¦'=>'戀','撚'=>'æ’š','漣'=>'æ¼£','煉'=>'ç…‰','璉'=>'ç’‰','秊'=>'ç§Š','練'=>'ç·´','聯'=>'è¯','輦'=>'輦','蓮'=>'è“®','連'=>'連','鍊'=>'éŠ','列'=>'列','ï¦'=>'劣','咽'=>'å’½','烈'=>'烈','裂'=>'裂','說'=>'說','廉'=>'廉','念'=>'念','捻'=>'æ»','殮'=>'æ®®','簾'=>'ç°¾','獵'=>'çµ','令'=>'令','囹'=>'囹','寧'=>'寧','嶺'=>'嶺','怜'=>'怜','玲'=>'玲','瑩'=>'ç‘©','羚'=>'羚','聆'=>'è†','鈴'=>'鈴','零'=>'é›¶','靈'=>'éˆ','領'=>'é ˜','例'=>'例','禮'=>'禮','醴'=>'醴','隸'=>'隸','惡'=>'惡','了'=>'了','僚'=>'僚','寮'=>'寮','尿'=>'å°¿','料'=>'æ–™','樂'=>'樂','ï§€'=>'燎','ï§'=>'療','ï§‚'=>'蓼','遼'=>'é¼','ï§„'=>'é¾','ï§…'=>'暈','阮'=>'阮','劉'=>'劉','杻'=>'æ»','柳'=>'柳','ï§Š'=>'æµ','ï§‹'=>'溜','ï§Œ'=>'ç‰','ï§'=>'ç•™','ï§Ž'=>'ç¡«','ï§'=>'ç´','ï§'=>'類','ï§‘'=>'å…­','ï§’'=>'戮','ï§“'=>'陸','ï§”'=>'倫','ï§•'=>'å´™','ï§–'=>'æ·ª','ï§—'=>'輪','律'=>'律','ï§™'=>'æ…„','ï§š'=>'æ —','ï§›'=>'率','ï§œ'=>'隆','ï§'=>'利','ï§ž'=>'å','ï§Ÿ'=>'å±¥','ï§ '=>'易','ï§¡'=>'æŽ','ï§¢'=>'梨','ï§£'=>'æ³¥','理'=>'ç†','ï§¥'=>'ç—¢','罹'=>'ç½¹','ï§§'=>'è£','裡'=>'裡','ï§©'=>'里','離'=>'離','ï§«'=>'匿','溺'=>'溺','ï§­'=>'å','ï§®'=>'ç‡','璘'=>'ç’˜','ï§°'=>'è—º','ï§±'=>'隣','ï§²'=>'é±—','ï§³'=>'麟','ï§´'=>'æž—','ï§µ'=>'æ·‹','ï§¶'=>'臨','ï§·'=>'ç«‹','笠'=>'笠','ï§¹'=>'ç²’','狀'=>'ç‹€','ï§»'=>'ç‚™','ï§¼'=>'è­˜','ï§½'=>'什','ï§¾'=>'茶','ï§¿'=>'刺','切'=>'切','ï¨'=>'度','拓'=>'æ‹“','糖'=>'ç³–','宅'=>'å®…','洞'=>'æ´ž','暴'=>'æš´','輻'=>'è¼»','行'=>'行','降'=>'é™','見'=>'見','廓'=>'廓','兀'=>'å…€','ï¨'=>'å—€','ï¨'=>'塚','晴'=>'æ™´','凞'=>'凞','猪'=>'猪','益'=>'益','礼'=>'礼','神'=>'神','祥'=>'祥','福'=>'ç¦','靖'=>'é–','ï¨'=>'ç²¾','羽'=>'ç¾½','蘒'=>'蘒','諸'=>'諸','逸'=>'逸','都'=>'都','飯'=>'飯','飼'=>'飼','館'=>'館','鶴'=>'é¶´','侮'=>'ä¾®','僧'=>'僧','免'=>'å…','勉'=>'勉','勤'=>'勤','卑'=>'å‘','喝'=>'å–','嘆'=>'嘆','器'=>'器','塀'=>'å¡€','墨'=>'墨','層'=>'層','屮'=>'å±®','悔'=>'æ‚”','慨'=>'æ…¨','憎'=>'憎','ï©€'=>'懲','ï©'=>'æ•','ï©‚'=>'æ—¢','暑'=>'æš‘','ï©„'=>'梅','ï©…'=>'æµ·','渚'=>'渚','漢'=>'æ¼¢','煮'=>'ç…®','爫'=>'爫','琢'=>'ç¢','ï©‹'=>'碑','社'=>'社','ï©'=>'祉','祈'=>'祈','ï©'=>'ç¥','ï©'=>'祖','ï©‘'=>'ç¥','ï©’'=>'ç¦','ï©“'=>'禎','ï©”'=>'ç©€','ï©•'=>'çª','ï©–'=>'節','ï©—'=>'ç·´','縉'=>'縉','ï©™'=>'ç¹','署'=>'ç½²','ï©›'=>'者','臭'=>'臭','ï©'=>'艹','艹'=>'艹','著'=>'è‘—','ï© '=>'è¤','ï©¡'=>'視','ï©¢'=>'è¬','ï©£'=>'謹','賓'=>'賓','ï©¥'=>'è´ˆ','辶'=>'è¾¶','ï©§'=>'逸','難'=>'難','ï©©'=>'響','頻'=>'é »','ï©°'=>'並','况'=>'况','全'=>'å…¨','侀'=>'ä¾€','ï©´'=>'å……','冀'=>'冀','ï©¶'=>'勇','ï©·'=>'勺','喝'=>'å–','啕'=>'å••','喙'=>'å–™','ï©»'=>'å—¢','塚'=>'塚','墳'=>'墳','奄'=>'奄','ï©¿'=>'奔','婢'=>'å©¢','ïª'=>'嬨','廒'=>'å»’','廙'=>'å»™','彩'=>'彩','徭'=>'å¾­','惘'=>'惘','慎'=>'æ…Ž','愈'=>'愈','憎'=>'憎','慠'=>'æ… ','懲'=>'懲','戴'=>'戴','ïª'=>'æ„','搜'=>'æœ','ïª'=>'æ‘’','ïª'=>'æ•–','晴'=>'æ™´','朗'=>'朗','望'=>'望','杖'=>'æ–','歹'=>'æ­¹','殺'=>'殺','流'=>'æµ','滛'=>'æ»›','滋'=>'滋','漢'=>'æ¼¢','瀞'=>'瀞','煮'=>'ç…®','ïª'=>'çž§','爵'=>'爵','犯'=>'犯','猪'=>'猪','瑱'=>'瑱','甆'=>'甆','画'=>'ç”»','瘝'=>'ç˜','瘟'=>'瘟','益'=>'益','盛'=>'ç››','直'=>'ç›´','睊'=>'çŠ','着'=>'ç€','磌'=>'磌','窱'=>'窱','節'=>'節','类'=>'ç±»','絛'=>'çµ›','練'=>'ç·´','缾'=>'ç¼¾','者'=>'者','荒'=>'è’','華'=>'è¯','蝹'=>'è¹','襁'=>'è¥','覆'=>'覆','視'=>'視','調'=>'調','諸'=>'諸','請'=>'è«‹','謁'=>'è¬','諾'=>'諾','諭'=>'è«­','謹'=>'謹','ï«€'=>'變','ï«'=>'è´ˆ','ï«‚'=>'輸','遲'=>'é²','ï«„'=>'醙','ï«…'=>'鉶','陼'=>'陼','難'=>'難','靖'=>'é–','韛'=>'韛','響'=>'響','ï«‹'=>'é ‹','頻'=>'é »','ï«'=>'鬒','龜'=>'龜','ï«'=>'𢡊','ï«'=>'𢡄','ï«‘'=>'ð£•','ï«’'=>'ã®','ï«“'=>'䀘','ï«”'=>'䀹','ï«•'=>'𥉉','ï«–'=>'ð¥³','ï«—'=>'𧻓','齃'=>'齃','ï«™'=>'龎','ï¬'=>'×™Ö´','ײַ'=>'ײַ','שׁ'=>'ש×','שׂ'=>'שׂ','שּׁ'=>'שּ×','שּׂ'=>'שּׂ','אַ'=>'×Ö·','אָ'=>'×Ö¸','אּ'=>'×Ö¼','בּ'=>'בּ','גּ'=>'×’Ö¼','דּ'=>'דּ','הּ'=>'×”Ö¼','וּ'=>'וּ','זּ'=>'×–Ö¼','טּ'=>'טּ','יּ'=>'×™Ö¼','ךּ'=>'ךּ','כּ'=>'×›Ö¼','לּ'=>'לּ','מּ'=>'מּ','ï­€'=>'× Ö¼','ï­'=>'סּ','ï­ƒ'=>'×£Ö¼','ï­„'=>'פּ','ï­†'=>'צּ','ï­‡'=>'×§Ö¼','ï­ˆ'=>'רּ','ï­‰'=>'שּ','ï­Š'=>'תּ','ï­‹'=>'וֹ','ï­Œ'=>'בֿ','ï­'=>'×›Ö¿','ï­Ž'=>'פֿ','ð…ž'=>'ð…—ð…¥','ð…Ÿ'=>'ð…˜ð…¥','ð… '=>'ð…˜ð…¥ð…®','ð…¡'=>'ð…˜ð…¥ð…¯','ð…¢'=>'ð…˜ð…¥ð…°','ð…£'=>'ð…˜ð…¥ð…±','ð…¤'=>'ð…˜ð…¥ð…²','ð†»'=>'ð†¹ð…¥','ð†¼'=>'ð†ºð…¥','ð†½'=>'ð†¹ð…¥ð…®','ð†¾'=>'ð†ºð…¥ð…®','ð†¿'=>'ð†¹ð…¥ð…¯','ð‡€'=>'ð†ºð…¥ð…¯','丽'=>'丽','ð¯ '=>'丸','乁'=>'ä¹','𠄢'=>'ð „¢','你'=>'ä½ ','侮'=>'ä¾®','侻'=>'ä¾»','倂'=>'倂','偺'=>'åº','備'=>'å‚™','僧'=>'僧','像'=>'åƒ','㒞'=>'ã’ž','ð¯ '=>'𠘺','免'=>'å…','ð¯ '=>'å…”','ð¯ '=>'å…¤','具'=>'å…·','𠔜'=>'𠔜','㒹'=>'ã’¹','內'=>'å…§','再'=>'å†','𠕋'=>'ð •‹','冗'=>'冗','冤'=>'冤','仌'=>'仌','冬'=>'冬','况'=>'况','𩇟'=>'𩇟','ð¯ '=>'凵','刃'=>'刃','㓟'=>'㓟','刻'=>'刻','剆'=>'剆','割'=>'割','剷'=>'剷','㔕'=>'㔕','勇'=>'勇','勉'=>'勉','勤'=>'勤','勺'=>'勺','包'=>'包','匆'=>'匆','北'=>'北','卉'=>'å‰','卑'=>'å‘','博'=>'åš','即'=>'å³','卽'=>'å½','卿'=>'å¿','卿'=>'å¿','卿'=>'å¿','𠨬'=>'𠨬','灰'=>'ç°','及'=>'åŠ','叟'=>'åŸ','𠭣'=>'ð ­£','叫'=>'å«','叱'=>'å±','吆'=>'å†','咞'=>'å’ž','吸'=>'å¸','呈'=>'呈','周'=>'周','咢'=>'å’¢','ð¯¡'=>'å“¶','唐'=>'å”','啓'=>'å•“','啣'=>'å•£','善'=>'å–„','善'=>'å–„','喙'=>'å–™','喫'=>'å–«','喳'=>'å–³','嗂'=>'å—‚','圖'=>'圖','嘆'=>'嘆','ð¯¡'=>'圗','噑'=>'噑','ð¯¡'=>'å™´','ð¯¡'=>'切','壮'=>'壮','城'=>'城','埴'=>'埴','堍'=>'å ','型'=>'åž‹','堲'=>'å ²','報'=>'å ±','墬'=>'墬','𡓤'=>'𡓤','売'=>'売','壷'=>'壷','夆'=>'夆','ð¯¡'=>'多','夢'=>'夢','奢'=>'奢','𡚨'=>'𡚨','𡛪'=>'𡛪','姬'=>'姬','娛'=>'娛','娧'=>'娧','姘'=>'姘','婦'=>'婦','㛮'=>'ã›®','㛼'=>'㛼','嬈'=>'嬈','嬾'=>'嬾','嬾'=>'嬾','𡧈'=>'𡧈','寃'=>'寃','寘'=>'寘','寧'=>'寧','寳'=>'寳','𡬘'=>'𡬘','寿'=>'寿','将'=>'å°†','当'=>'当','尢'=>'å°¢','㞁'=>'ãž','屠'=>'å± ','屮'=>'å±®','峀'=>'å³€','岍'=>'å²','𡷤'=>'ð¡·¤','嵃'=>'嵃','𡷦'=>'ð¡·¦','嵮'=>'åµ®','嵫'=>'嵫','嵼'=>'åµ¼','ð¯¢'=>'å·¡','巢'=>'å·¢','㠯'=>'ã ¯','巽'=>'å·½','帨'=>'帨','帽'=>'帽','幩'=>'幩','㡢'=>'ã¡¢','𢆃'=>'𢆃','㡼'=>'㡼','庰'=>'庰','庳'=>'庳','ð¯¢'=>'庶','廊'=>'廊','ð¯¢'=>'𪎒','ð¯¢'=>'廾','𢌱'=>'𢌱','𢌱'=>'𢌱','舁'=>'èˆ','弢'=>'å¼¢','弢'=>'å¼¢','㣇'=>'㣇','𣊸'=>'𣊸','𦇚'=>'𦇚','形'=>'å½¢','彫'=>'彫','㣣'=>'㣣','徚'=>'徚','ð¯¢'=>'å¿','志'=>'å¿—','忹'=>'忹','悁'=>'æ‚','㤺'=>'㤺','㤜'=>'㤜','悔'=>'æ‚”','𢛔'=>'𢛔','惇'=>'惇','慈'=>'æ…ˆ','慌'=>'æ…Œ','慎'=>'æ…Ž','慌'=>'æ…Œ','慺'=>'æ…º','憎'=>'憎','憲'=>'憲','憤'=>'憤','憯'=>'憯','懞'=>'懞','懲'=>'懲','懶'=>'懶','成'=>'æˆ','戛'=>'戛','扝'=>'æ‰','抱'=>'抱','拔'=>'æ‹”','捐'=>'æ','𢬌'=>'𢬌','挽'=>'挽','拼'=>'拼','捨'=>'æ¨','掃'=>'掃','揤'=>'æ¤','𢯱'=>'𢯱','搢'=>'æ¢','揅'=>'æ…','ð¯£'=>'掩','㨮'=>'㨮','摩'=>'æ‘©','摾'=>'摾','撝'=>'æ’','摷'=>'æ‘·','㩬'=>'㩬','敏'=>'æ•','敬'=>'敬','𣀊'=>'𣀊','旣'=>'æ—£','書'=>'書','ð¯£'=>'晉','㬙'=>'㬙','ð¯£'=>'æš‘','ð¯£'=>'㬈','㫤'=>'㫤','冒'=>'冒','冕'=>'冕','最'=>'最','暜'=>'æšœ','肭'=>'è‚­','䏙'=>'ä™','朗'=>'朗','望'=>'望','朡'=>'朡','杞'=>'æž','杓'=>'æ“','ð¯£'=>'ð£ƒ','㭉'=>'ã­‰','柺'=>'柺','枅'=>'æž…','桒'=>'æ¡’','梅'=>'梅','𣑭'=>'𣑭','梎'=>'梎','栟'=>'æ Ÿ','椔'=>'椔','㮝'=>'ã®','楂'=>'楂','榣'=>'榣','槪'=>'槪','檨'=>'檨','𣚣'=>'𣚣','櫛'=>'æ«›','㰘'=>'ã°˜','次'=>'次','𣢧'=>'𣢧','歔'=>'æ­”','㱎'=>'㱎','歲'=>'æ­²','殟'=>'殟','殺'=>'殺','殻'=>'æ®»','𣪍'=>'ð£ª','𡴋'=>'ð¡´‹','𣫺'=>'𣫺','汎'=>'汎','𣲼'=>'𣲼','沿'=>'沿','泍'=>'æ³','汧'=>'æ±§','洖'=>'æ´–','派'=>'æ´¾','ð¯¤'=>'æµ·','流'=>'æµ','浩'=>'浩','浸'=>'浸','涅'=>'æ¶…','𣴞'=>'𣴞','洴'=>'æ´´','港'=>'港','湮'=>'æ¹®','㴳'=>'ã´³','滋'=>'滋','滇'=>'滇','ð¯¤'=>'𣻑','淹'=>'æ·¹','ð¯¤'=>'æ½®','ð¯¤'=>'𣽞','𣾎'=>'𣾎','濆'=>'濆','瀹'=>'瀹','瀞'=>'瀞','瀛'=>'瀛','㶖'=>'ã¶–','灊'=>'çŠ','災'=>'ç½','灷'=>'ç·','炭'=>'ç‚­','𠔥'=>'𠔥','煅'=>'ç……','ð¯¤'=>'𤉣','熜'=>'熜','𤎫'=>'𤎫','爨'=>'爨','爵'=>'爵','牐'=>'ç‰','𤘈'=>'𤘈','犀'=>'犀','犕'=>'犕','𤜵'=>'𤜵','𤠔'=>'𤠔','獺'=>'çº','王'=>'王','㺬'=>'㺬','玥'=>'玥','㺸'=>'㺸','㺸'=>'㺸','瑇'=>'瑇','瑜'=>'瑜','瑱'=>'瑱','璅'=>'ç’…','瓊'=>'瓊','㼛'=>'ã¼›','甤'=>'甤','𤰶'=>'𤰶','甾'=>'甾','𤲒'=>'𤲒','異'=>'ç•°','𢆟'=>'𢆟','瘐'=>'ç˜','𤾡'=>'𤾡','𤾸'=>'𤾸','𥁄'=>'ð¥„','㿼'=>'㿼','䀈'=>'䀈','直'=>'ç›´','ð¯¥'=>'𥃳','𥃲'=>'𥃲','𥄙'=>'𥄙','𥄳'=>'𥄳','眞'=>'眞','真'=>'真','真'=>'真','睊'=>'çŠ','䀹'=>'䀹','瞋'=>'çž‹','䁆'=>'ä†','䂖'=>'ä‚–','ð¯¥'=>'ð¥','硎'=>'硎','ð¯¥'=>'碌','ð¯¥'=>'磌','䃣'=>'䃣','𥘦'=>'𥘦','祖'=>'祖','𥚚'=>'𥚚','𥛅'=>'𥛅','福'=>'ç¦','秫'=>'ç§«','䄯'=>'䄯','穀'=>'ç©€','穊'=>'穊','穏'=>'ç©','𥥼'=>'𥥼','ð¯¥'=>'𥪧','𥪧'=>'𥪧','竮'=>'ç«®','䈂'=>'䈂','𥮫'=>'𥮫','篆'=>'篆','築'=>'築','䈧'=>'䈧','𥲀'=>'𥲀','糒'=>'ç³’','䊠'=>'䊠','糨'=>'糨','糣'=>'ç³£','紀'=>'ç´€','𥾆'=>'𥾆','絣'=>'çµ£','䌁'=>'äŒ','緇'=>'ç·‡','縂'=>'縂','繅'=>'ç¹…','䌴'=>'䌴','𦈨'=>'𦈨','𦉇'=>'𦉇','䍙'=>'ä™','𦋙'=>'𦋙','罺'=>'罺','𦌾'=>'𦌾','羕'=>'羕','翺'=>'翺','者'=>'者','𦓚'=>'𦓚','𦔣'=>'𦔣','聠'=>'è ','𦖨'=>'𦖨','聰'=>'è°','𣍟'=>'ð£Ÿ','ð¯¦'=>'ä•','育'=>'育','脃'=>'脃','䐋'=>'ä‹','脾'=>'脾','媵'=>'媵','𦞧'=>'𦞧','𦞵'=>'𦞵','𣎓'=>'𣎓','𣎜'=>'𣎜','舁'=>'èˆ','舄'=>'舄','ð¯¦'=>'辞','䑫'=>'ä‘«','ð¯¦'=>'芑','ð¯¦'=>'芋','芝'=>'èŠ','劳'=>'劳','花'=>'花','芳'=>'芳','芽'=>'芽','苦'=>'苦','𦬼'=>'𦬼','若'=>'è‹¥','茝'=>'èŒ','荣'=>'è£','莭'=>'莭','茣'=>'茣','ð¯¦'=>'莽','菧'=>'è§','著'=>'è‘—','荓'=>'è“','菊'=>'èŠ','菌'=>'èŒ','菜'=>'èœ','𦰶'=>'𦰶','𦵫'=>'𦵫','𦳕'=>'𦳕','䔫'=>'䔫','蓱'=>'蓱','蓳'=>'蓳','蔖'=>'è”–','𧏊'=>'ð§Š','蕤'=>'蕤','𦼬'=>'𦼬','䕝'=>'ä•','䕡'=>'ä•¡','𦾱'=>'𦾱','𧃒'=>'𧃒','䕫'=>'ä•«','虐'=>'è™','虜'=>'虜','虧'=>'è™§','虩'=>'虩','蚩'=>'èš©','蚈'=>'蚈','蜎'=>'蜎','蛢'=>'蛢','蝹'=>'è¹','蜨'=>'蜨','蝫'=>'è«','螆'=>'螆','䗗'=>'ä——','蟡'=>'蟡','ð¯§'=>'è ','䗹'=>'ä—¹','衠'=>'è¡ ','衣'=>'è¡£','𧙧'=>'ð§™§','裗'=>'裗','裞'=>'裞','䘵'=>'䘵','裺'=>'裺','㒻'=>'ã’»','𧢮'=>'ð§¢®','𧥦'=>'𧥦','ð¯§'=>'äš¾','䛇'=>'䛇','ð¯§'=>'誠','ð¯§'=>'è«­','變'=>'變','豕'=>'豕','𧲨'=>'𧲨','貫'=>'貫','賁'=>'è³','贛'=>'è´›','起'=>'èµ·','𧼯'=>'𧼯','𠠄'=>'ð  „','跋'=>'è·‹','趼'=>'è¶¼','跰'=>'è·°','ð¯§'=>'𠣞','軔'=>'è»”','輸'=>'輸','𨗒'=>'𨗒','𨗭'=>'𨗭','邔'=>'é‚”','郱'=>'郱','鄑'=>'é„‘','𨜮'=>'𨜮','鄛'=>'é„›','鈸'=>'鈸','鋗'=>'é‹—','鋘'=>'鋘','鉼'=>'鉼','鏹'=>'é¹','鐕'=>'é•','𨯺'=>'𨯺','開'=>'é–‹','䦕'=>'䦕','閷'=>'é–·','𨵷'=>'𨵷','䧦'=>'䧦','雃'=>'雃','嶲'=>'å¶²','霣'=>'霣','𩅅'=>'ð©……','𩈚'=>'𩈚','䩮'=>'ä©®','䩶'=>'ä©¶','韠'=>'韠','𩐊'=>'ð©Š','䪲'=>'䪲','𩒖'=>'ð©’–','頋'=>'é ‹','頋'=>'é ‹','頩'=>'é ©','ð¯¨'=>'ð©–¶','飢'=>'飢','䬳'=>'䬳','餩'=>'餩','馧'=>'馧','駂'=>'é§‚','駾'=>'é§¾','䯎'=>'䯎','𩬰'=>'𩬰','鬒'=>'鬒','鱀'=>'é±€','鳽'=>'é³½','ð¯¨'=>'䳎','䳭'=>'ä³­','ð¯¨'=>'éµ§','ð¯¨'=>'𪃎','䳸'=>'䳸','𪄅'=>'𪄅','𪈎'=>'𪈎','𪊑'=>'𪊑','麻'=>'麻','䵖'=>'äµ–','黹'=>'黹','黾'=>'黾','鼅'=>'é¼…','鼏'=>'é¼','鼖'=>'é¼–','鼻'=>'é¼»','ð¯¨'=>'𪘀'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/utf_compatibility_decomp.php b/phpBB/includes/utf/data/utf_compatibility_decomp.php deleted file mode 100644 index 08a7a047a4..0000000000 --- a/phpBB/includes/utf/data/utf_compatibility_decomp.php +++ /dev/null @@ -1,2 +0,0 @@ -' ','¨'=>' ̈','ª'=>'a','¯'=>' Ì„','²'=>'2','³'=>'3','´'=>' Ì','µ'=>'μ','¸'=>' ̧','¹'=>'1','º'=>'o','¼'=>'1â„4','½'=>'1â„2','¾'=>'3â„4','À'=>'AÌ€','Ã'=>'AÌ','Â'=>'AÌ‚','Ã'=>'Ã','Ä'=>'Ä','Ã…'=>'AÌŠ','Ç'=>'Ç','È'=>'EÌ€','É'=>'EÌ','Ê'=>'EÌ‚','Ë'=>'Ë','ÃŒ'=>'IÌ€','Ã'=>'IÌ','ÃŽ'=>'IÌ‚','Ã'=>'Ï','Ñ'=>'Ñ','Ã’'=>'OÌ€','Ó'=>'OÌ','Ô'=>'OÌ‚','Õ'=>'Õ','Ö'=>'Ö','Ù'=>'UÌ€','Ú'=>'UÌ','Û'=>'UÌ‚','Ü'=>'Ü','Ã'=>'YÌ','à'=>'aÌ€','á'=>'aÌ','â'=>'aÌ‚','ã'=>'ã','ä'=>'ä','Ã¥'=>'aÌŠ','ç'=>'ç','è'=>'eÌ€','é'=>'eÌ','ê'=>'eÌ‚','ë'=>'ë','ì'=>'iÌ€','í'=>'iÌ','î'=>'iÌ‚','ï'=>'ï','ñ'=>'ñ','ò'=>'oÌ€','ó'=>'oÌ','ô'=>'oÌ‚','õ'=>'õ','ö'=>'ö','ù'=>'uÌ€','ú'=>'uÌ','û'=>'uÌ‚','ü'=>'ü','ý'=>'yÌ','ÿ'=>'ÿ','Ä€'=>'AÌ„','Ä'=>'aÌ„','Ä‚'=>'Ă','ă'=>'ă','Ä„'=>'Ą','Ä…'=>'ą','Ć'=>'CÌ','ć'=>'cÌ','Ĉ'=>'CÌ‚','ĉ'=>'cÌ‚','ÄŠ'=>'Ċ','Ä‹'=>'ċ','ÄŒ'=>'CÌŒ','Ä'=>'cÌŒ','ÄŽ'=>'DÌŒ','Ä'=>'dÌŒ','Ä’'=>'EÌ„','Ä“'=>'eÌ„','Ä”'=>'Ĕ','Ä•'=>'ĕ','Ä–'=>'Ė','Ä—'=>'ė','Ę'=>'Ę','Ä™'=>'ę','Äš'=>'EÌŒ','Ä›'=>'eÌŒ','Äœ'=>'GÌ‚','Ä'=>'gÌ‚','Äž'=>'Ğ','ÄŸ'=>'ğ','Ä '=>'Ġ','Ä¡'=>'ġ','Ä¢'=>'Ģ','Ä£'=>'ģ','Ĥ'=>'HÌ‚','Ä¥'=>'hÌ‚','Ĩ'=>'Ĩ','Ä©'=>'ĩ','Ī'=>'IÌ„','Ä«'=>'iÌ„','Ĭ'=>'Ĭ','Ä­'=>'ĭ','Ä®'=>'Į','į'=>'į','İ'=>'İ','IJ'=>'IJ','ij'=>'ij','Ä´'=>'JÌ‚','ĵ'=>'jÌ‚','Ķ'=>'Ķ','Ä·'=>'ķ','Ĺ'=>'LÌ','ĺ'=>'lÌ','Ä»'=>'Ļ','ļ'=>'ļ','Ľ'=>'LÌŒ','ľ'=>'lÌŒ','Ä¿'=>'L·','Å€'=>'l·','Ń'=>'NÌ','Å„'=>'nÌ','Å…'=>'Ņ','ņ'=>'ņ','Ň'=>'NÌŒ','ň'=>'nÌŒ','ʼn'=>'ʼn','ÅŒ'=>'OÌ„','Å'=>'oÌ„','ÅŽ'=>'Ŏ','Å'=>'ŏ','Å'=>'OÌ‹','Å‘'=>'oÌ‹','Å”'=>'RÌ','Å•'=>'rÌ','Å–'=>'Ŗ','Å—'=>'ŗ','Ř'=>'RÌŒ','Å™'=>'rÌŒ','Åš'=>'SÌ','Å›'=>'sÌ','Åœ'=>'SÌ‚','Å'=>'sÌ‚','Åž'=>'Ş','ÅŸ'=>'ş','Å '=>'SÌŒ','Å¡'=>'sÌŒ','Å¢'=>'Ţ','Å£'=>'ţ','Ť'=>'TÌŒ','Å¥'=>'tÌŒ','Ũ'=>'Ũ','Å©'=>'ũ','Ū'=>'UÌ„','Å«'=>'uÌ„','Ŭ'=>'Ŭ','Å­'=>'ŭ','Å®'=>'UÌŠ','ů'=>'uÌŠ','Ű'=>'UÌ‹','ű'=>'uÌ‹','Ų'=>'Ų','ų'=>'ų','Å´'=>'WÌ‚','ŵ'=>'wÌ‚','Ŷ'=>'YÌ‚','Å·'=>'yÌ‚','Ÿ'=>'Ÿ','Ź'=>'ZÌ','ź'=>'zÌ','Å»'=>'Ż','ż'=>'ż','Ž'=>'ZÌŒ','ž'=>'zÌŒ','Å¿'=>'s','Æ '=>'OÌ›','Æ¡'=>'oÌ›','Ư'=>'UÌ›','ư'=>'uÌ›','Ç„'=>'DZÌŒ','Ç…'=>'DzÌŒ','dž'=>'dzÌŒ','LJ'=>'LJ','Lj'=>'Lj','lj'=>'lj','ÇŠ'=>'NJ','Ç‹'=>'Nj','ÇŒ'=>'nj','Ç'=>'AÌŒ','ÇŽ'=>'aÌŒ','Ç'=>'IÌŒ','Ç'=>'iÌŒ','Ç‘'=>'OÌŒ','Ç’'=>'oÌŒ','Ç“'=>'UÌŒ','Ç”'=>'uÌŒ','Ç•'=>'Ǖ','Ç–'=>'ǖ','Ç—'=>'ÜÌ','ǘ'=>'üÌ','Ç™'=>'Ǚ','Çš'=>'ǚ','Ç›'=>'Ǜ','Çœ'=>'ǜ','Çž'=>'Ǟ','ÇŸ'=>'ǟ','Ç '=>'Ǡ','Ç¡'=>'ǡ','Ç¢'=>'Ǣ','Ç£'=>'ǣ','Ǧ'=>'GÌŒ','ǧ'=>'gÌŒ','Ǩ'=>'KÌŒ','Ç©'=>'kÌŒ','Ǫ'=>'Ǫ','Ç«'=>'ǫ','Ǭ'=>'Ǭ','Ç­'=>'ǭ','Ç®'=>'Æ·ÌŒ','ǯ'=>'Ê’ÌŒ','ǰ'=>'jÌŒ','DZ'=>'DZ','Dz'=>'Dz','dz'=>'dz','Ç´'=>'GÌ','ǵ'=>'gÌ','Ǹ'=>'NÌ€','ǹ'=>'nÌ€','Ǻ'=>'AÌŠÌ','Ç»'=>'aÌŠÌ','Ǽ'=>'ÆÌ','ǽ'=>'æÌ','Ǿ'=>'ØÌ','Ç¿'=>'øÌ','È€'=>'AÌ','È'=>'aÌ','È‚'=>'AÌ‘','ȃ'=>'aÌ‘','È„'=>'EÌ','È…'=>'eÌ','Ȇ'=>'EÌ‘','ȇ'=>'eÌ‘','Ȉ'=>'IÌ','ȉ'=>'iÌ','ÈŠ'=>'IÌ‘','È‹'=>'iÌ‘','ÈŒ'=>'OÌ','È'=>'oÌ','ÈŽ'=>'OÌ‘','È'=>'oÌ‘','È'=>'RÌ','È‘'=>'rÌ','È’'=>'RÌ‘','È“'=>'rÌ‘','È”'=>'UÌ','È•'=>'uÌ','È–'=>'UÌ‘','È—'=>'uÌ‘','Ș'=>'Ș','È™'=>'ș','Èš'=>'Ț','È›'=>'ț','Èž'=>'HÌŒ','ÈŸ'=>'hÌŒ','Ȧ'=>'Ȧ','ȧ'=>'ȧ','Ȩ'=>'Ȩ','È©'=>'ȩ','Ȫ'=>'Ȫ','È«'=>'ȫ','Ȭ'=>'Ȭ','È­'=>'ȭ','È®'=>'Ȯ','ȯ'=>'ȯ','Ȱ'=>'Ȱ','ȱ'=>'ȱ','Ȳ'=>'YÌ„','ȳ'=>'yÌ„','ʰ'=>'h','ʱ'=>'ɦ','ʲ'=>'j','ʳ'=>'r','Ê´'=>'ɹ','ʵ'=>'É»','ʶ'=>'Ê','Ê·'=>'w','ʸ'=>'y','˘'=>' ̆','Ë™'=>' ̇','Ëš'=>' ÌŠ','Ë›'=>' ̨','Ëœ'=>' ̃','Ë'=>' Ì‹','Ë '=>'É£','Ë¡'=>'l','Ë¢'=>'s','Ë£'=>'x','ˤ'=>'Ê•','Í€'=>'Ì€','Í'=>'Ì','̓'=>'Ì“','Í„'=>'̈Ì','Í´'=>'ʹ','ͺ'=>' Í…',';'=>';','΄'=>' Ì','Î…'=>' ̈Ì','Ά'=>'ΑÌ','·'=>'·','Έ'=>'ΕÌ','Ή'=>'ΗÌ','Ί'=>'ΙÌ','ÎŒ'=>'ΟÌ','ÎŽ'=>'Î¥Ì','Î'=>'ΩÌ','Î'=>'ϊÌ','Ϊ'=>'Ϊ','Ϋ'=>'Ϋ','ά'=>'αÌ','έ'=>'εÌ','ή'=>'ηÌ','ί'=>'ιÌ','ΰ'=>'ϋÌ','ÏŠ'=>'ϊ','Ï‹'=>'ϋ','ÏŒ'=>'οÌ','Ï'=>'Ï…Ì','ÏŽ'=>'ωÌ','Ï'=>'β','Ï‘'=>'θ','Ï’'=>'Î¥','Ï“'=>'Î¥Ì','Ï”'=>'Ϋ','Ï•'=>'φ','Ï–'=>'Ï€','ϰ'=>'κ','ϱ'=>'Ï','ϲ'=>'Ï‚','Ï´'=>'Θ','ϵ'=>'ε','Ϲ'=>'Σ','Ѐ'=>'Ѐ','Ð'=>'Ё','Ѓ'=>'ГÌ','Ї'=>'Ї','ÐŒ'=>'КÌ','Ð'=>'Ѝ','ÐŽ'=>'Ў','Й'=>'Й','й'=>'й','Ñ'=>'ѐ','Ñ‘'=>'ё','Ñ“'=>'гÌ','Ñ—'=>'ї','Ñœ'=>'кÌ','Ñ'=>'ѝ','Ñž'=>'ў','Ѷ'=>'Ñ´Ì','Ñ·'=>'ѵÌ','Ó'=>'Ӂ','Ó‚'=>'ӂ','Ó'=>'Ð̆','Ó‘'=>'ӑ','Ó’'=>'Ð̈','Ó“'=>'ӓ','Ó–'=>'Ӗ','Ó—'=>'ӗ','Óš'=>'Ӛ','Ó›'=>'ӛ','Óœ'=>'Ӝ','Ó'=>'ӝ','Óž'=>'Ӟ','ÓŸ'=>'ӟ','Ó¢'=>'Ӣ','Ó£'=>'ӣ','Ó¤'=>'Ӥ','Ó¥'=>'ӥ','Ó¦'=>'Ӧ','Ó§'=>'ӧ','Óª'=>'Ӫ','Ó«'=>'ӫ','Ó¬'=>'Ӭ','Ó­'=>'Ñ̈','Ó®'=>'Ӯ','Ó¯'=>'ӯ','Ó°'=>'Ӱ','Ó±'=>'ӱ','Ó²'=>'Ӳ','Ó³'=>'ӳ','Ó´'=>'Ӵ','Óµ'=>'ӵ','Ó¸'=>'Ӹ','Ó¹'=>'ӹ','Ö‡'=>'Õ¥Ö‚','Ø¢'=>'آ','Ø£'=>'أ','ؤ'=>'ÙˆÙ”','Ø¥'=>'إ','ئ'=>'ÙŠÙ”','Ùµ'=>'اٴ','Ù¶'=>'وٴ','Ù·'=>'Û‡Ù´','Ù¸'=>'يٴ','Û€'=>'Û•Ù”','Û‚'=>'ÛÙ”','Û“'=>'Û’Ù”','ऩ'=>'ऩ','ऱ'=>'ऱ','ऴ'=>'ऴ','क़'=>'क़','ख़'=>'ख़','ग़'=>'ग़','ज़'=>'ज़','ड़'=>'ड़','à¥'=>'ढ़','फ़'=>'फ़','य़'=>'य़','à§‹'=>'ো','à§Œ'=>'ৌ','à§œ'=>'ড়','à§'=>'ঢ়','à§Ÿ'=>'য়','ਲ਼'=>'ਲ਼','ਸ਼'=>'ਸ਼','à©™'=>'ਖ਼','ਗ਼'=>'ਗ਼','à©›'=>'ਜ਼','ਫ਼'=>'ਫ਼','à­ˆ'=>'ୈ','à­‹'=>'ୋ','à­Œ'=>'ୌ','à­œ'=>'ଡ଼','à­'=>'ଢ଼','à®”'=>'ஔ','ொ'=>'ொ','ோ'=>'ோ','ௌ'=>'ௌ','ై'=>'ై','à³€'=>'ೀ','ೇ'=>'ೇ','ೈ'=>'ೈ','ೊ'=>'ೊ','ೋ'=>'ೋ','ൊ'=>'ൊ','ോ'=>'ോ','ൌ'=>'ൌ','à·š'=>'ේ','à·œ'=>'à·™à·','à·'=>'à·™à·à·Š','à·ž'=>'ෞ','ำ'=>'à¹à¸²','ຳ'=>'à»àº²','ໜ'=>'ຫນ','à»'=>'ຫມ','༌'=>'་','གྷ'=>'གྷ','à½'=>'ཌྷ','དྷ'=>'དྷ','བྷ'=>'བྷ','ཛྷ'=>'ཛྷ','ཀྵ'=>'ཀྵ','ཱི'=>'ཱི','ཱུ'=>'ཱུ','ྲྀ'=>'ྲྀ','ཷ'=>'ྲཱྀ','ླྀ'=>'ླྀ','ཹ'=>'ླཱྀ','à¾'=>'ཱྀ','ྒྷ'=>'ྒྷ','à¾'=>'ྜྷ','ྡྷ'=>'ྡྷ','ྦྷ'=>'ྦྷ','ྫྷ'=>'ྫྷ','ྐྵ'=>'à¾à¾µ','ဦ'=>'ဦ','ჼ'=>'ნ','ᬆ'=>'ᬆ','ᬈ'=>'ᬈ','ᬊ'=>'ᬊ','ᬌ'=>'ᬌ','ᬎ'=>'á¬á¬µ','ᬒ'=>'ᬒ','ᬻ'=>'ᬻ','ᬽ'=>'ᬽ','á­€'=>'ᭀ','á­'=>'ᭁ','á­ƒ'=>'ᭃ','á´¬'=>'A','á´­'=>'Æ','á´®'=>'B','á´°'=>'D','á´±'=>'E','á´²'=>'ÆŽ','á´³'=>'G','á´´'=>'H','á´µ'=>'I','á´¶'=>'J','á´·'=>'K','á´¸'=>'L','á´¹'=>'M','á´º'=>'N','á´¼'=>'O','á´½'=>'È¢','á´¾'=>'P','á´¿'=>'R','áµ€'=>'T','áµ'=>'U','ᵂ'=>'W','ᵃ'=>'a','ᵄ'=>'É','áµ…'=>'É‘','ᵆ'=>'á´‚','ᵇ'=>'b','ᵈ'=>'d','ᵉ'=>'e','ᵊ'=>'É™','ᵋ'=>'É›','ᵌ'=>'Éœ','áµ'=>'g','áµ'=>'k','áµ'=>'m','ᵑ'=>'Å‹','áµ’'=>'o','ᵓ'=>'É”','áµ”'=>'á´–','ᵕ'=>'á´—','áµ–'=>'p','áµ—'=>'t','ᵘ'=>'u','áµ™'=>'á´','ᵚ'=>'ɯ','áµ›'=>'v','ᵜ'=>'á´¥','áµ'=>'β','ᵞ'=>'γ','ᵟ'=>'δ','áµ '=>'φ','ᵡ'=>'χ','áµ¢'=>'i','áµ£'=>'r','ᵤ'=>'u','áµ¥'=>'v','ᵦ'=>'β','áµ§'=>'γ','ᵨ'=>'Ï','ᵩ'=>'φ','ᵪ'=>'χ','ᵸ'=>'н','á¶›'=>'É’','á¶œ'=>'c','á¶'=>'É•','á¶ž'=>'ð','á¶Ÿ'=>'Éœ','á¶ '=>'f','á¶¡'=>'ÉŸ','á¶¢'=>'É¡','á¶£'=>'É¥','ᶤ'=>'ɨ','á¶¥'=>'É©','ᶦ'=>'ɪ','á¶§'=>'áµ»','ᶨ'=>'Ê','á¶©'=>'É­','ᶪ'=>'á¶…','á¶«'=>'ÊŸ','ᶬ'=>'ɱ','á¶­'=>'ɰ','á¶®'=>'ɲ','ᶯ'=>'ɳ','á¶°'=>'É´','á¶±'=>'ɵ','á¶²'=>'ɸ','á¶³'=>'Ê‚','á¶´'=>'ʃ','á¶µ'=>'Æ«','á¶¶'=>'ʉ','á¶·'=>'ÊŠ','ᶸ'=>'á´œ','á¶¹'=>'Ê‹','ᶺ'=>'ÊŒ','á¶»'=>'z','á¶¼'=>'Ê','á¶½'=>'Ê‘','á¶¾'=>'Ê’','á¶¿'=>'θ','Ḁ'=>'AÌ¥','á¸'=>'aÌ¥','Ḃ'=>'Ḃ','ḃ'=>'ḃ','Ḅ'=>'BÌ£','ḅ'=>'bÌ£','Ḇ'=>'Ḇ','ḇ'=>'ḇ','Ḉ'=>'ÇÌ','ḉ'=>'çÌ','Ḋ'=>'Ḋ','ḋ'=>'ḋ','Ḍ'=>'DÌ£','á¸'=>'dÌ£','Ḏ'=>'Ḏ','á¸'=>'ḏ','á¸'=>'Ḑ','ḑ'=>'ḑ','Ḓ'=>'DÌ­','ḓ'=>'dÌ­','Ḕ'=>'Ḕ','ḕ'=>'ḕ','Ḗ'=>'EÌ„Ì','ḗ'=>'eÌ„Ì','Ḙ'=>'EÌ­','ḙ'=>'eÌ­','Ḛ'=>'Ḛ','ḛ'=>'ḛ','Ḝ'=>'Ḝ','á¸'=>'ḝ','Ḟ'=>'Ḟ','ḟ'=>'ḟ','Ḡ'=>'GÌ„','ḡ'=>'gÌ„','Ḣ'=>'Ḣ','ḣ'=>'ḣ','Ḥ'=>'HÌ£','ḥ'=>'hÌ£','Ḧ'=>'Ḧ','ḧ'=>'ḧ','Ḩ'=>'Ḩ','ḩ'=>'ḩ','Ḫ'=>'HÌ®','ḫ'=>'hÌ®','Ḭ'=>'Ḭ','ḭ'=>'ḭ','Ḯ'=>'ÏÌ','ḯ'=>'ïÌ','Ḱ'=>'KÌ','ḱ'=>'kÌ','Ḳ'=>'KÌ£','ḳ'=>'kÌ£','Ḵ'=>'Ḵ','ḵ'=>'ḵ','Ḷ'=>'LÌ£','ḷ'=>'lÌ£','Ḹ'=>'Ḹ','ḹ'=>'ḹ','Ḻ'=>'Ḻ','ḻ'=>'ḻ','Ḽ'=>'LÌ­','ḽ'=>'lÌ­','Ḿ'=>'MÌ','ḿ'=>'mÌ','á¹€'=>'Ṁ','á¹'=>'ṁ','Ṃ'=>'MÌ£','ṃ'=>'mÌ£','Ṅ'=>'Ṅ','á¹…'=>'ṅ','Ṇ'=>'NÌ£','ṇ'=>'nÌ£','Ṉ'=>'Ṉ','ṉ'=>'ṉ','Ṋ'=>'NÌ­','ṋ'=>'nÌ­','Ṍ'=>'ÕÌ','á¹'=>'õÌ','Ṏ'=>'Ṏ','á¹'=>'ṏ','á¹'=>'Ṑ','ṑ'=>'ṑ','á¹’'=>'OÌ„Ì','ṓ'=>'oÌ„Ì','á¹”'=>'PÌ','ṕ'=>'pÌ','á¹–'=>'Ṗ','á¹—'=>'ṗ','Ṙ'=>'Ṙ','á¹™'=>'ṙ','Ṛ'=>'RÌ£','á¹›'=>'rÌ£','Ṝ'=>'Ṝ','á¹'=>'ṝ','Ṟ'=>'Ṟ','ṟ'=>'ṟ','á¹ '=>'Ṡ','ṡ'=>'ṡ','á¹¢'=>'SÌ£','á¹£'=>'sÌ£','Ṥ'=>'SÌ̇','á¹¥'=>'sÌ̇','Ṧ'=>'Ṧ','á¹§'=>'ṧ','Ṩ'=>'Ṩ','ṩ'=>'ṩ','Ṫ'=>'Ṫ','ṫ'=>'ṫ','Ṭ'=>'TÌ£','á¹­'=>'tÌ£','á¹®'=>'Ṯ','ṯ'=>'ṯ','á¹°'=>'TÌ­','á¹±'=>'tÌ­','á¹²'=>'Ṳ','á¹³'=>'ṳ','á¹´'=>'Ṵ','á¹µ'=>'ṵ','á¹¶'=>'UÌ­','á¹·'=>'uÌ­','Ṹ'=>'ŨÌ','á¹¹'=>'ũÌ','Ṻ'=>'Ṻ','á¹»'=>'ṻ','á¹¼'=>'Ṽ','á¹½'=>'ṽ','á¹¾'=>'VÌ£','ṿ'=>'vÌ£','Ẁ'=>'WÌ€','áº'=>'wÌ€','Ẃ'=>'WÌ','ẃ'=>'wÌ','Ẅ'=>'Ẅ','ẅ'=>'ẅ','Ẇ'=>'Ẇ','ẇ'=>'ẇ','Ẉ'=>'WÌ£','ẉ'=>'wÌ£','Ẋ'=>'Ẋ','ẋ'=>'ẋ','Ẍ'=>'Ẍ','áº'=>'ẍ','Ẏ'=>'Ẏ','áº'=>'ẏ','áº'=>'ZÌ‚','ẑ'=>'zÌ‚','Ẓ'=>'ZÌ£','ẓ'=>'zÌ£','Ẕ'=>'Ẕ','ẕ'=>'ẕ','ẖ'=>'ẖ','ẗ'=>'ẗ','ẘ'=>'wÌŠ','ẙ'=>'yÌŠ','ẚ'=>'aʾ','ẛ'=>'ṡ','Ạ'=>'AÌ£','ạ'=>'aÌ£','Ả'=>'Ả','ả'=>'ả','Ấ'=>'AÌ‚Ì','ấ'=>'aÌ‚Ì','Ầ'=>'Ầ','ầ'=>'ầ','Ẩ'=>'Ẩ','ẩ'=>'ẩ','Ẫ'=>'Ẫ','ẫ'=>'ẫ','Ậ'=>'Ậ','ậ'=>'ậ','Ắ'=>'ĂÌ','ắ'=>'ăÌ','Ằ'=>'Ằ','ằ'=>'ằ','Ẳ'=>'Ẳ','ẳ'=>'ẳ','Ẵ'=>'Ẵ','ẵ'=>'ẵ','Ặ'=>'Ặ','ặ'=>'ặ','Ẹ'=>'EÌ£','ẹ'=>'eÌ£','Ẻ'=>'Ẻ','ẻ'=>'ẻ','Ẽ'=>'Ẽ','ẽ'=>'ẽ','Ế'=>'EÌ‚Ì','ế'=>'eÌ‚Ì','Ề'=>'Ề','á»'=>'ề','Ể'=>'Ể','ể'=>'ể','Ễ'=>'Ễ','á»…'=>'ễ','Ệ'=>'Ệ','ệ'=>'ệ','Ỉ'=>'Ỉ','ỉ'=>'ỉ','Ị'=>'IÌ£','ị'=>'iÌ£','Ọ'=>'OÌ£','á»'=>'oÌ£','Ỏ'=>'Ỏ','á»'=>'ỏ','á»'=>'OÌ‚Ì','ố'=>'oÌ‚Ì','á»’'=>'Ồ','ồ'=>'ồ','á»”'=>'Ổ','ổ'=>'ổ','á»–'=>'Ỗ','á»—'=>'ỗ','Ộ'=>'Ộ','á»™'=>'ộ','Ớ'=>'OÌ›Ì','á»›'=>'oÌ›Ì','Ờ'=>'Ờ','á»'=>'ờ','Ở'=>'Ở','ở'=>'ở','á» '=>'Ỡ','ỡ'=>'ỡ','Ợ'=>'Ợ','ợ'=>'ợ','Ụ'=>'UÌ£','ụ'=>'uÌ£','Ủ'=>'Ủ','á»§'=>'ủ','Ứ'=>'UÌ›Ì','ứ'=>'uÌ›Ì','Ừ'=>'Ừ','ừ'=>'ừ','Ử'=>'Ử','á»­'=>'ử','á»®'=>'Ữ','ữ'=>'ữ','á»°'=>'Ự','á»±'=>'ự','Ỳ'=>'YÌ€','ỳ'=>'yÌ€','á»´'=>'YÌ£','ỵ'=>'yÌ£','á»¶'=>'Ỷ','á»·'=>'ỷ','Ỹ'=>'Ỹ','ỹ'=>'ỹ','á¼€'=>'ἀ','á¼'=>'ἁ','ἂ'=>'ἂ','ἃ'=>'ἃ','ἄ'=>'ἀÌ','á¼…'=>'ἁÌ','ἆ'=>'ἆ','ἇ'=>'ἇ','Ἀ'=>'Ἀ','Ἁ'=>'Ἁ','Ἂ'=>'Ἂ','Ἃ'=>'Ἃ','Ἄ'=>'ἈÌ','á¼'=>'ἉÌ','Ἆ'=>'Ἆ','á¼'=>'Ἇ','á¼'=>'ἐ','ἑ'=>'ἑ','á¼’'=>'ἒ','ἓ'=>'ἓ','á¼”'=>'ἐÌ','ἕ'=>'ἑÌ','Ἐ'=>'Ἐ','á¼™'=>'Ἑ','Ἒ'=>'Ἒ','á¼›'=>'Ἓ','Ἔ'=>'ἘÌ','á¼'=>'ἙÌ','á¼ '=>'ἠ','ἡ'=>'ἡ','á¼¢'=>'ἢ','á¼£'=>'ἣ','ἤ'=>'ἠÌ','á¼¥'=>'ἡÌ','ἦ'=>'ἦ','á¼§'=>'ἧ','Ἠ'=>'Ἠ','Ἡ'=>'Ἡ','Ἢ'=>'Ἢ','Ἣ'=>'Ἣ','Ἤ'=>'ἨÌ','á¼­'=>'ἩÌ','á¼®'=>'Ἦ','Ἧ'=>'Ἧ','á¼°'=>'ἰ','á¼±'=>'ἱ','á¼²'=>'ἲ','á¼³'=>'ἳ','á¼´'=>'ἰÌ','á¼µ'=>'ἱÌ','á¼¶'=>'ἶ','á¼·'=>'ἷ','Ἰ'=>'Ἰ','á¼¹'=>'Ἱ','Ἲ'=>'Ἲ','á¼»'=>'Ἳ','á¼¼'=>'ἸÌ','á¼½'=>'ἹÌ','á¼¾'=>'Ἶ','Ἷ'=>'Ἷ','á½€'=>'ὀ','á½'=>'ὁ','ὂ'=>'ὂ','ὃ'=>'ὃ','ὄ'=>'ὀÌ','á½…'=>'ὁÌ','Ὀ'=>'Ὀ','Ὁ'=>'Ὁ','Ὂ'=>'Ὂ','Ὃ'=>'Ὃ','Ὄ'=>'ὈÌ','á½'=>'ὉÌ','á½'=>'Ï…Ì“','ὑ'=>'Ï…Ì”','á½’'=>'ὒ','ὓ'=>'ὓ','á½”'=>'Ï…Ì“Ì','ὕ'=>'Ï…Ì”Ì','á½–'=>'ὖ','á½—'=>'ὗ','á½™'=>'Ὑ','á½›'=>'Ὓ','á½'=>'ὙÌ','Ὗ'=>'Ὗ','á½ '=>'ὠ','ὡ'=>'ὡ','á½¢'=>'ὢ','á½£'=>'ὣ','ὤ'=>'ὠÌ','á½¥'=>'ὡÌ','ὦ'=>'ὦ','á½§'=>'ὧ','Ὠ'=>'Ὠ','Ὡ'=>'Ὡ','Ὢ'=>'Ὢ','Ὣ'=>'Ὣ','Ὤ'=>'ὨÌ','á½­'=>'ὩÌ','á½®'=>'Ὦ','Ὧ'=>'Ὧ','á½°'=>'ὰ','á½±'=>'αÌ','á½²'=>'ὲ','á½³'=>'εÌ','á½´'=>'ὴ','á½µ'=>'ηÌ','á½¶'=>'ὶ','á½·'=>'ιÌ','ὸ'=>'ὸ','á½¹'=>'οÌ','ὺ'=>'Ï…Ì€','á½»'=>'Ï…Ì','á½¼'=>'ὼ','á½½'=>'ωÌ','á¾€'=>'ᾀ','á¾'=>'ᾁ','ᾂ'=>'ᾂ','ᾃ'=>'ᾃ','ᾄ'=>'ἀÌÍ…','á¾…'=>'ἁÌÍ…','ᾆ'=>'ᾆ','ᾇ'=>'ᾇ','ᾈ'=>'ᾈ','ᾉ'=>'ᾉ','ᾊ'=>'ᾊ','ᾋ'=>'ᾋ','ᾌ'=>'ἈÌÍ…','á¾'=>'ἉÌÍ…','ᾎ'=>'ᾎ','á¾'=>'ᾏ','á¾'=>'ᾐ','ᾑ'=>'ᾑ','á¾’'=>'ᾒ','ᾓ'=>'ᾓ','á¾”'=>'ἠÌÍ…','ᾕ'=>'ἡÌÍ…','á¾–'=>'ᾖ','á¾—'=>'ᾗ','ᾘ'=>'ᾘ','á¾™'=>'ᾙ','ᾚ'=>'ᾚ','á¾›'=>'ᾛ','ᾜ'=>'ἨÌÍ…','á¾'=>'ἩÌÍ…','ᾞ'=>'ᾞ','ᾟ'=>'ᾟ','á¾ '=>'ᾠ','ᾡ'=>'ᾡ','á¾¢'=>'ᾢ','á¾£'=>'ᾣ','ᾤ'=>'ὠÌÍ…','á¾¥'=>'ὡÌÍ…','ᾦ'=>'ᾦ','á¾§'=>'ᾧ','ᾨ'=>'ᾨ','ᾩ'=>'ᾩ','ᾪ'=>'ᾪ','ᾫ'=>'ᾫ','ᾬ'=>'ὨÌÍ…','á¾­'=>'ὩÌÍ…','á¾®'=>'ᾮ','ᾯ'=>'ᾯ','á¾°'=>'ᾰ','á¾±'=>'ᾱ','á¾²'=>'ᾲ','á¾³'=>'ᾳ','á¾´'=>'αÌÍ…','á¾¶'=>'ᾶ','á¾·'=>'ᾷ','Ᾰ'=>'Ᾰ','á¾¹'=>'Ᾱ','Ὰ'=>'Ὰ','á¾»'=>'ΑÌ','á¾¼'=>'ᾼ','á¾½'=>' Ì“','á¾¾'=>'ι','᾿'=>' Ì“','á¿€'=>' Í‚','á¿'=>' ̈͂','á¿‚'=>'ῂ','ῃ'=>'ῃ','á¿„'=>'ηÌÍ…','ῆ'=>'ῆ','ῇ'=>'ῇ','Ὲ'=>'Ὲ','Έ'=>'ΕÌ','Ὴ'=>'Ὴ','á¿‹'=>'ΗÌ','ῌ'=>'ῌ','á¿'=>' ̓̀','῎'=>' Ì“Ì','á¿'=>' ̓͂','á¿'=>'ῐ','á¿‘'=>'ῑ','á¿’'=>'ῒ','á¿“'=>'ϊÌ','á¿–'=>'ῖ','á¿—'=>'ῗ','Ῐ'=>'Ῐ','á¿™'=>'Ῑ','Ὶ'=>'Ὶ','á¿›'=>'ΙÌ','á¿'=>' ̔̀','῞'=>' Ì”Ì','῟'=>' ̔͂','á¿ '=>'ῠ','á¿¡'=>'Ï…Ì„','á¿¢'=>'ῢ','á¿£'=>'ϋÌ','ῤ'=>'ÏÌ“','á¿¥'=>'ÏÌ”','ῦ'=>'Ï…Í‚','á¿§'=>'ῧ','Ῠ'=>'Ῠ','á¿©'=>'Ῡ','Ὺ'=>'Ὺ','á¿«'=>'Î¥Ì','Ῥ'=>'Ῥ','á¿­'=>' ̈̀','á¿®'=>' ̈Ì','`'=>'`','ῲ'=>'ῲ','ῳ'=>'ῳ','á¿´'=>'ωÌÍ…','á¿¶'=>'ῶ','á¿·'=>'ῷ','Ὸ'=>'Ὸ','Ό'=>'ΟÌ','Ὼ'=>'Ὼ','á¿»'=>'ΩÌ','ῼ'=>'ῼ','´'=>' Ì','῾'=>' Ì”',' '=>' ','â€'=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ',' '=>' ','‑'=>'â€','‗'=>' ̳','․'=>'.','‥'=>'..','…'=>'...',' '=>' ','″'=>'′′','‴'=>'′′′','‶'=>'‵‵','‷'=>'‵‵‵','‼'=>'!!','‾'=>' Ì…','â‡'=>'??','âˆ'=>'?!','â‰'=>'!?','â—'=>'′′′′','âŸ'=>' ','â°'=>'0','â±'=>'i','â´'=>'4','âµ'=>'5','â¶'=>'6','â·'=>'7','â¸'=>'8','â¹'=>'9','âº'=>'+','â»'=>'−','â¼'=>'=','â½'=>'(','â¾'=>')','â¿'=>'n','â‚€'=>'0','â‚'=>'1','â‚‚'=>'2','₃'=>'3','â‚„'=>'4','â‚…'=>'5','₆'=>'6','₇'=>'7','₈'=>'8','₉'=>'9','₊'=>'+','â‚‹'=>'−','₌'=>'=','â‚'=>'(','₎'=>')','â‚'=>'a','â‚‘'=>'e','â‚’'=>'o','â‚“'=>'x','â‚”'=>'É™','₨'=>'Rs','â„€'=>'a/c','â„'=>'a/s','â„‚'=>'C','℃'=>'°C','â„…'=>'c/o','℆'=>'c/u','ℇ'=>'Æ','℉'=>'°F','ℊ'=>'g','â„‹'=>'H','ℌ'=>'H','â„'=>'H','ℎ'=>'h','â„'=>'ħ','â„'=>'I','â„‘'=>'I','â„’'=>'L','â„“'=>'l','â„•'=>'N','â„–'=>'No','â„™'=>'P','ℚ'=>'Q','â„›'=>'R','ℜ'=>'R','â„'=>'R','â„ '=>'SM','â„¡'=>'TEL','â„¢'=>'TM','ℤ'=>'Z','Ω'=>'Ω','ℨ'=>'Z','K'=>'K','â„«'=>'AÌŠ','ℬ'=>'B','â„­'=>'C','ℯ'=>'e','â„°'=>'E','ℱ'=>'F','ℳ'=>'M','â„´'=>'o','ℵ'=>'×','â„¶'=>'ב','â„·'=>'×’','ℸ'=>'ד','ℹ'=>'i','â„»'=>'FAX','ℼ'=>'Ï€','ℽ'=>'γ','ℾ'=>'Γ','â„¿'=>'Π','â…€'=>'∑','â……'=>'D','â…†'=>'d','â…‡'=>'e','â…ˆ'=>'i','â…‰'=>'j','â…“'=>'1â„3','â…”'=>'2â„3','â…•'=>'1â„5','â…–'=>'2â„5','â…—'=>'3â„5','â…˜'=>'4â„5','â…™'=>'1â„6','â…š'=>'5â„6','â…›'=>'1â„8','â…œ'=>'3â„8','â…'=>'5â„8','â…ž'=>'7â„8','â…Ÿ'=>'1â„','â… '=>'I','â…¡'=>'II','â…¢'=>'III','â…£'=>'IV','â…¤'=>'V','â…¥'=>'VI','â…¦'=>'VII','â…§'=>'VIII','â…¨'=>'IX','â…©'=>'X','â…ª'=>'XI','â…«'=>'XII','â…¬'=>'L','â…­'=>'C','â…®'=>'D','â…¯'=>'M','â…°'=>'i','â…±'=>'ii','â…²'=>'iii','â…³'=>'iv','â…´'=>'v','â…µ'=>'vi','â…¶'=>'vii','â…·'=>'viii','â…¸'=>'ix','â…¹'=>'x','â…º'=>'xi','â…»'=>'xii','â…¼'=>'l','â…½'=>'c','â…¾'=>'d','â…¿'=>'m','↚'=>'â†Ì¸','↛'=>'↛','↮'=>'↮','â‡'=>'â‡Ì¸','⇎'=>'⇎','â‡'=>'⇏','∄'=>'∄','∉'=>'∉','∌'=>'∌','∤'=>'∤','∦'=>'∦','∬'=>'∫∫','∭'=>'∫∫∫','∯'=>'∮∮','∰'=>'∮∮∮','â‰'=>'≁','≄'=>'≄','≇'=>'≇','≉'=>'≉','≠'=>'≠','≢'=>'≢','≭'=>'â‰Ì¸','≮'=>'≮','≯'=>'≯','≰'=>'≰','≱'=>'≱','≴'=>'≴','≵'=>'≵','≸'=>'≸','≹'=>'≹','⊀'=>'⊀','âŠ'=>'⊁','⊄'=>'⊄','⊅'=>'⊅','⊈'=>'⊈','⊉'=>'⊉','⊬'=>'⊬','⊭'=>'⊭','⊮'=>'⊮','⊯'=>'⊯','â‹ '=>'⋠','â‹¡'=>'⋡','â‹¢'=>'⋢','â‹£'=>'⋣','⋪'=>'⋪','â‹«'=>'⋫','⋬'=>'⋬','â‹­'=>'⋭','〈'=>'〈','〉'=>'〉','â‘ '=>'1','â‘¡'=>'2','â‘¢'=>'3','â‘£'=>'4','⑤'=>'5','â‘¥'=>'6','⑦'=>'7','â‘§'=>'8','⑨'=>'9','â‘©'=>'10','⑪'=>'11','â‘«'=>'12','⑬'=>'13','â‘­'=>'14','â‘®'=>'15','⑯'=>'16','â‘°'=>'17','⑱'=>'18','⑲'=>'19','⑳'=>'20','â‘´'=>'(1)','⑵'=>'(2)','â‘¶'=>'(3)','â‘·'=>'(4)','⑸'=>'(5)','⑹'=>'(6)','⑺'=>'(7)','â‘»'=>'(8)','⑼'=>'(9)','⑽'=>'(10)','⑾'=>'(11)','â‘¿'=>'(12)','â’€'=>'(13)','â’'=>'(14)','â’‚'=>'(15)','â’ƒ'=>'(16)','â’„'=>'(17)','â’…'=>'(18)','â’†'=>'(19)','â’‡'=>'(20)','â’ˆ'=>'1.','â’‰'=>'2.','â’Š'=>'3.','â’‹'=>'4.','â’Œ'=>'5.','â’'=>'6.','â’Ž'=>'7.','â’'=>'8.','â’'=>'9.','â’‘'=>'10.','â’’'=>'11.','â’“'=>'12.','â’”'=>'13.','â’•'=>'14.','â’–'=>'15.','â’—'=>'16.','â’˜'=>'17.','â’™'=>'18.','â’š'=>'19.','â’›'=>'20.','â’œ'=>'(a)','â’'=>'(b)','â’ž'=>'(c)','â’Ÿ'=>'(d)','â’ '=>'(e)','â’¡'=>'(f)','â’¢'=>'(g)','â’£'=>'(h)','â’¤'=>'(i)','â’¥'=>'(j)','â’¦'=>'(k)','â’§'=>'(l)','â’¨'=>'(m)','â’©'=>'(n)','â’ª'=>'(o)','â’«'=>'(p)','â’¬'=>'(q)','â’­'=>'(r)','â’®'=>'(s)','â’¯'=>'(t)','â’°'=>'(u)','â’±'=>'(v)','â’²'=>'(w)','â’³'=>'(x)','â’´'=>'(y)','â’µ'=>'(z)','â’¶'=>'A','â’·'=>'B','â’¸'=>'C','â’¹'=>'D','â’º'=>'E','â’»'=>'F','â’¼'=>'G','â’½'=>'H','â’¾'=>'I','â’¿'=>'J','â“€'=>'K','â“'=>'L','â“‚'=>'M','Ⓝ'=>'N','â“„'=>'O','â“…'=>'P','Ⓠ'=>'Q','Ⓡ'=>'R','Ⓢ'=>'S','Ⓣ'=>'T','Ⓤ'=>'U','â“‹'=>'V','Ⓦ'=>'W','â“'=>'X','Ⓨ'=>'Y','â“'=>'Z','â“'=>'a','â“‘'=>'b','â“’'=>'c','â““'=>'d','â“”'=>'e','â“•'=>'f','â“–'=>'g','â“—'=>'h','ⓘ'=>'i','â“™'=>'j','ⓚ'=>'k','â“›'=>'l','ⓜ'=>'m','â“'=>'n','ⓞ'=>'o','ⓟ'=>'p','â“ '=>'q','â“¡'=>'r','â“¢'=>'s','â“£'=>'t','ⓤ'=>'u','â“¥'=>'v','ⓦ'=>'w','â“§'=>'x','ⓨ'=>'y','â“©'=>'z','⓪'=>'0','⨌'=>'∫∫∫∫','â©´'=>'::=','⩵'=>'==','â©¶'=>'===','⫝̸'=>'â«Ì¸','ⵯ'=>'ⵡ','⺟'=>'æ¯','⻳'=>'龟','â¼€'=>'一','â¼'=>'丨','⼂'=>'丶','⼃'=>'丿','⼄'=>'ä¹™','â¼…'=>'亅','⼆'=>'二','⼇'=>'亠','⼈'=>'人','⼉'=>'å„¿','⼊'=>'å…¥','⼋'=>'å…«','⼌'=>'冂','â¼'=>'冖','⼎'=>'冫','â¼'=>'几','â¼'=>'凵','⼑'=>'刀','â¼’'=>'力','⼓'=>'勹','â¼”'=>'匕','⼕'=>'匚','â¼–'=>'匸','â¼—'=>'å','⼘'=>'åœ','â¼™'=>'å©','⼚'=>'厂','â¼›'=>'厶','⼜'=>'åˆ','â¼'=>'å£','⼞'=>'å›—','⼟'=>'土','â¼ '=>'士','⼡'=>'夂','â¼¢'=>'夊','â¼£'=>'夕','⼤'=>'大','â¼¥'=>'女','⼦'=>'å­','â¼§'=>'宀','⼨'=>'寸','⼩'=>'å°','⼪'=>'å°¢','⼫'=>'å°¸','⼬'=>'å±®','â¼­'=>'å±±','â¼®'=>'å·›','⼯'=>'å·¥','â¼°'=>'å·±','â¼±'=>'å·¾','â¼²'=>'å¹²','â¼³'=>'幺','â¼´'=>'广','â¼µ'=>'å»´','â¼¶'=>'廾','â¼·'=>'弋','⼸'=>'弓','â¼¹'=>'å½','⼺'=>'彡','â¼»'=>'å½³','â¼¼'=>'心','â¼½'=>'戈','â¼¾'=>'戶','⼿'=>'手','â½€'=>'支','â½'=>'æ”´','⽂'=>'æ–‡','⽃'=>'æ–—','⽄'=>'æ–¤','â½…'=>'æ–¹','⽆'=>'æ— ','⽇'=>'æ—¥','⽈'=>'æ›°','⽉'=>'月','⽊'=>'木','⽋'=>'欠','⽌'=>'æ­¢','â½'=>'æ­¹','⽎'=>'殳','â½'=>'毋','â½'=>'比','⽑'=>'毛','â½’'=>'æ°','⽓'=>'æ°”','â½”'=>'æ°´','⽕'=>'ç«','â½–'=>'爪','â½—'=>'父','⽘'=>'爻','â½™'=>'爿','⽚'=>'片','â½›'=>'牙','⽜'=>'牛','â½'=>'犬','⽞'=>'玄','⽟'=>'玉','â½ '=>'瓜','⽡'=>'瓦','â½¢'=>'甘','â½£'=>'生','⽤'=>'用','â½¥'=>'ç”°','⽦'=>'ç–‹','â½§'=>'ç–’','⽨'=>'ç™¶','⽩'=>'白','⽪'=>'çš®','⽫'=>'çš¿','⽬'=>'ç›®','â½­'=>'矛','â½®'=>'矢','⽯'=>'石','â½°'=>'示','â½±'=>'禸','â½²'=>'禾','â½³'=>'ç©´','â½´'=>'ç«‹','â½µ'=>'竹','â½¶'=>'ç±³','â½·'=>'糸','⽸'=>'ç¼¶','â½¹'=>'网','⽺'=>'羊','â½»'=>'ç¾½','â½¼'=>'è€','â½½'=>'而','â½¾'=>'耒','⽿'=>'耳','â¾€'=>'è¿','â¾'=>'肉','⾂'=>'臣','⾃'=>'自','⾄'=>'至','â¾…'=>'臼','⾆'=>'舌','⾇'=>'舛','⾈'=>'舟','⾉'=>'艮','⾊'=>'色','⾋'=>'艸','⾌'=>'è™','â¾'=>'虫','⾎'=>'è¡€','â¾'=>'行','â¾'=>'è¡£','⾑'=>'襾','â¾’'=>'見','⾓'=>'è§’','â¾”'=>'言','⾕'=>'è°·','â¾–'=>'豆','â¾—'=>'豕','⾘'=>'豸','â¾™'=>'è²','⾚'=>'赤','â¾›'=>'èµ°','⾜'=>'è¶³','â¾'=>'身','⾞'=>'車','⾟'=>'è¾›','â¾ '=>'è¾°','⾡'=>'è¾µ','â¾¢'=>'é‚‘','â¾£'=>'é…‰','⾤'=>'釆','â¾¥'=>'里','⾦'=>'金','â¾§'=>'é•·','⾨'=>'é–€','⾩'=>'阜','⾪'=>'éš¶','⾫'=>'éš¹','⾬'=>'雨','â¾­'=>'é‘','â¾®'=>'éž','⾯'=>'é¢','â¾°'=>'é©','â¾±'=>'韋','â¾²'=>'韭','â¾³'=>'音','â¾´'=>'é ','â¾µ'=>'風','â¾¶'=>'飛','â¾·'=>'食','⾸'=>'首','â¾¹'=>'香','⾺'=>'馬','â¾»'=>'骨','â¾¼'=>'高','â¾½'=>'髟','â¾¾'=>'鬥','⾿'=>'鬯','â¿€'=>'鬲','â¿'=>'鬼','â¿‚'=>'é­š','⿃'=>'é³¥','â¿„'=>'é¹µ','â¿…'=>'鹿','⿆'=>'麥','⿇'=>'麻','⿈'=>'黃','⿉'=>'é»','⿊'=>'黑','â¿‹'=>'黹','⿌'=>'黽','â¿'=>'鼎','⿎'=>'鼓','â¿'=>'é¼ ','â¿'=>'é¼»','â¿‘'=>'齊','â¿’'=>'é½’','â¿“'=>'é¾','â¿”'=>'龜','â¿•'=>'é¾ ',' '=>' ','〶'=>'〒','〸'=>'å','〹'=>'å„','〺'=>'å…','ãŒ'=>'ã‹ã‚™','ãŽ'=>'ãã‚™','ã'=>'ãã‚™','ã’'=>'ã‘ã‚™','ã”'=>'ã“ã‚™','ã–'=>'ã•ã‚™','ã˜'=>'ã—ã‚™','ãš'=>'ã™ã‚™','ãœ'=>'ã›ã‚™','ãž'=>'ãã‚™','ã '=>'ãŸã‚™','ã¢'=>'ã¡ã‚™','ã¥'=>'ã¤ã‚™','ã§'=>'ã¦ã‚™','ã©'=>'ã¨ã‚™','ã°'=>'ã¯ã‚™','ã±'=>'ã¯ã‚š','ã³'=>'ã²ã‚™','ã´'=>'ã²ã‚š','ã¶'=>'ãµã‚™','ã·'=>'ãµã‚š','ã¹'=>'ã¸ã‚™','ãº'=>'ã¸ã‚š','ã¼'=>'ã»ã‚™','ã½'=>'ã»ã‚š','ã‚”'=>'ã†ã‚™','ã‚›'=>' ã‚™','゜'=>' ゚','ゞ'=>'ã‚ã‚™','ゟ'=>'より','ガ'=>'ã‚«ã‚™','ã‚®'=>'ã‚­ã‚™','ã‚°'=>'グ','ゲ'=>'ゲ','ã‚´'=>'ゴ','ã‚¶'=>'ザ','ジ'=>'ã‚·ã‚™','ズ'=>'ズ','ゼ'=>'ゼ','ゾ'=>'ゾ','ダ'=>'ã‚¿ã‚™','ヂ'=>'ãƒã‚™','ヅ'=>'ヅ','デ'=>'デ','ド'=>'ド','ãƒ'=>'ãƒã‚™','パ'=>'ãƒã‚š','ビ'=>'ビ','ピ'=>'ピ','ブ'=>'ブ','プ'=>'プ','ベ'=>'ベ','ペ'=>'ペ','ボ'=>'ボ','ãƒ'=>'ポ','ヴ'=>'ヴ','ヷ'=>'ヷ','ヸ'=>'ヸ','ヹ'=>'ヹ','ヺ'=>'ヺ','ヾ'=>'ヾ','ヿ'=>'コト','ㄱ'=>'á„€','ㄲ'=>'á„','ㄳ'=>'ᆪ','ã„´'=>'á„‚','ㄵ'=>'ᆬ','ã„¶'=>'ᆭ','ã„·'=>'ᄃ','ㄸ'=>'á„„','ㄹ'=>'á„…','ㄺ'=>'ᆰ','ã„»'=>'ᆱ','ㄼ'=>'ᆲ','ㄽ'=>'ᆳ','ㄾ'=>'ᆴ','ã„¿'=>'ᆵ','ã…€'=>'ᄚ','ã…'=>'ᄆ','ã…‚'=>'ᄇ','ã…ƒ'=>'ᄈ','ã…„'=>'á„¡','ã……'=>'ᄉ','ã…†'=>'ᄊ','ã…‡'=>'á„‹','ã…ˆ'=>'ᄌ','ã…‰'=>'á„','ã…Š'=>'ᄎ','ã…‹'=>'á„','ã…Œ'=>'á„','ã…'=>'á„‘','ã…Ž'=>'á„’','ã…'=>'á…¡','ã…'=>'á…¢','ã…‘'=>'á…£','ã…’'=>'á…¤','ã…“'=>'á…¥','ã…”'=>'á…¦','ã…•'=>'á…§','ã…–'=>'á…¨','ã…—'=>'á…©','ã…˜'=>'á…ª','ã…™'=>'á…«','ã…š'=>'á…¬','ã…›'=>'á…­','ã…œ'=>'á…®','ã…'=>'á…¯','ã…ž'=>'á…°','ã…Ÿ'=>'á…±','ã… '=>'á…²','ã…¡'=>'á…³','ã…¢'=>'á…´','ã…£'=>'á…µ','ã…¤'=>'á… ','ã…¥'=>'á„”','ã…¦'=>'á„•','ã…§'=>'ᇇ','ã…¨'=>'ᇈ','ã…©'=>'ᇌ','ã…ª'=>'ᇎ','ã…«'=>'ᇓ','ã…¬'=>'ᇗ','ã…­'=>'ᇙ','ã…®'=>'ᄜ','ã…¯'=>'á‡','ã…°'=>'ᇟ','ã…±'=>'á„','ã…²'=>'ᄞ','ã…³'=>'á„ ','ã…´'=>'á„¢','ã…µ'=>'á„£','ã…¶'=>'á„§','ã…·'=>'á„©','ã…¸'=>'á„«','ã…¹'=>'ᄬ','ã…º'=>'á„­','ã…»'=>'á„®','ã…¼'=>'ᄯ','ã…½'=>'ᄲ','ã…¾'=>'á„¶','ã…¿'=>'á…€','ㆀ'=>'á…‡','ã†'=>'á…Œ','ㆂ'=>'ᇱ','ㆃ'=>'ᇲ','ㆄ'=>'á…—','ㆅ'=>'á…˜','ㆆ'=>'á…™','ㆇ'=>'ᆄ','ㆈ'=>'ᆅ','ㆉ'=>'ᆈ','ㆊ'=>'ᆑ','ㆋ'=>'ᆒ','ㆌ'=>'ᆔ','ã†'=>'ᆞ','ㆎ'=>'ᆡ','㆒'=>'一','㆓'=>'二','㆔'=>'三','㆕'=>'å››','㆖'=>'上','㆗'=>'中','㆘'=>'下','㆙'=>'甲','㆚'=>'ä¹™','㆛'=>'丙','㆜'=>'ä¸','ã†'=>'天','㆞'=>'地','㆟'=>'人','㈀'=>'(á„€)','ãˆ'=>'(á„‚)','㈂'=>'(ᄃ)','㈃'=>'(á„…)','㈄'=>'(ᄆ)','㈅'=>'(ᄇ)','㈆'=>'(ᄉ)','㈇'=>'(á„‹)','㈈'=>'(ᄌ)','㈉'=>'(ᄎ)','㈊'=>'(á„)','㈋'=>'(á„)','㈌'=>'(á„‘)','ãˆ'=>'(á„’)','㈎'=>'(가)','ãˆ'=>'(á„‚á…¡)','ãˆ'=>'(다)','㈑'=>'(á„…á…¡)','㈒'=>'(마)','㈓'=>'(바)','㈔'=>'(사)','㈕'=>'(á„‹á…¡)','㈖'=>'(자)','㈗'=>'(차)','㈘'=>'(á„á…¡)','㈙'=>'(á„á…¡)','㈚'=>'(á„‘á…¡)','㈛'=>'(á„’á…¡)','㈜'=>'(주)','ãˆ'=>'(오전)','㈞'=>'(á„‹á…©á„’á…®)','㈠'=>'(一)','㈡'=>'(二)','㈢'=>'(三)','㈣'=>'(å››)','㈤'=>'(五)','㈥'=>'(å…­)','㈦'=>'(七)','㈧'=>'(å…«)','㈨'=>'(ä¹)','㈩'=>'(å)','㈪'=>'(月)','㈫'=>'(ç«)','㈬'=>'(æ°´)','㈭'=>'(木)','㈮'=>'(金)','㈯'=>'(土)','㈰'=>'(æ—¥)','㈱'=>'(æ ª)','㈲'=>'(有)','㈳'=>'(社)','㈴'=>'(å)','㈵'=>'(特)','㈶'=>'(財)','㈷'=>'(ç¥)','㈸'=>'(労)','㈹'=>'(代)','㈺'=>'(呼)','㈻'=>'(å­¦)','㈼'=>'(監)','㈽'=>'(ä¼)','㈾'=>'(資)','㈿'=>'(å”)','㉀'=>'(祭)','ã‰'=>'(休)','㉂'=>'(自)','㉃'=>'(至)','ã‰'=>'PTE','㉑'=>'21','㉒'=>'22','㉓'=>'23','㉔'=>'24','㉕'=>'25','㉖'=>'26','㉗'=>'27','㉘'=>'28','㉙'=>'29','㉚'=>'30','㉛'=>'31','㉜'=>'32','ã‰'=>'33','㉞'=>'34','㉟'=>'35','㉠'=>'á„€','㉡'=>'á„‚','㉢'=>'ᄃ','㉣'=>'á„…','㉤'=>'ᄆ','㉥'=>'ᄇ','㉦'=>'ᄉ','㉧'=>'á„‹','㉨'=>'ᄌ','㉩'=>'ᄎ','㉪'=>'á„','㉫'=>'á„','㉬'=>'á„‘','㉭'=>'á„’','㉮'=>'가','㉯'=>'á„‚á…¡','㉰'=>'다','㉱'=>'á„…á…¡','㉲'=>'마','㉳'=>'바','㉴'=>'사','㉵'=>'á„‹á…¡','㉶'=>'자','㉷'=>'차','㉸'=>'á„á…¡','㉹'=>'á„á…¡','㉺'=>'á„‘á…¡','㉻'=>'á„’á…¡','㉼'=>'참고','㉽'=>'주의','㉾'=>'á„‹á…®','㊀'=>'一','ãŠ'=>'二','㊂'=>'三','㊃'=>'å››','㊄'=>'五','㊅'=>'å…­','㊆'=>'七','㊇'=>'å…«','㊈'=>'ä¹','㊉'=>'å','㊊'=>'月','㊋'=>'ç«','㊌'=>'æ°´','ãŠ'=>'木','㊎'=>'金','ãŠ'=>'土','ãŠ'=>'æ—¥','㊑'=>'æ ª','㊒'=>'有','㊓'=>'社','㊔'=>'å','㊕'=>'特','㊖'=>'財','㊗'=>'ç¥','㊘'=>'労','㊙'=>'秘','㊚'=>'ç”·','㊛'=>'女','㊜'=>'é©','ãŠ'=>'優','㊞'=>'å°','㊟'=>'注','㊠'=>'é …','㊡'=>'休','㊢'=>'写','㊣'=>'æ­£','㊤'=>'上','㊥'=>'中','㊦'=>'下','㊧'=>'å·¦','㊨'=>'å³','㊩'=>'医','㊪'=>'å®—','㊫'=>'å­¦','㊬'=>'監','㊭'=>'ä¼','㊮'=>'資','㊯'=>'å”','㊰'=>'夜','㊱'=>'36','㊲'=>'37','㊳'=>'38','㊴'=>'39','㊵'=>'40','㊶'=>'41','㊷'=>'42','㊸'=>'43','㊹'=>'44','㊺'=>'45','㊻'=>'46','㊼'=>'47','㊽'=>'48','㊾'=>'49','㊿'=>'50','ã‹€'=>'1月','ã‹'=>'2月','ã‹‚'=>'3月','㋃'=>'4月','ã‹„'=>'5月','ã‹…'=>'6月','㋆'=>'7月','㋇'=>'8月','㋈'=>'9月','㋉'=>'10月','㋊'=>'11月','ã‹‹'=>'12月','㋌'=>'Hg','ã‹'=>'erg','㋎'=>'eV','ã‹'=>'LTD','ã‹'=>'ã‚¢','ã‹‘'=>'イ','ã‹’'=>'ウ','ã‹“'=>'エ','ã‹”'=>'オ','ã‹•'=>'ã‚«','ã‹–'=>'ã‚­','ã‹—'=>'ク','㋘'=>'ケ','ã‹™'=>'コ','㋚'=>'サ','ã‹›'=>'ã‚·','㋜'=>'ス','ã‹'=>'ã‚»','㋞'=>'ソ','㋟'=>'ã‚¿','ã‹ '=>'ãƒ','ã‹¡'=>'ツ','ã‹¢'=>'テ','ã‹£'=>'ト','㋤'=>'ナ','ã‹¥'=>'ニ','㋦'=>'ヌ','ã‹§'=>'ãƒ','㋨'=>'ノ','ã‹©'=>'ãƒ','㋪'=>'ヒ','ã‹«'=>'フ','㋬'=>'ヘ','ã‹­'=>'ホ','ã‹®'=>'マ','㋯'=>'ミ','ã‹°'=>'ム','㋱'=>'メ','㋲'=>'モ','㋳'=>'ヤ','ã‹´'=>'ユ','㋵'=>'ヨ','ã‹¶'=>'ラ','ã‹·'=>'リ','㋸'=>'ル','㋹'=>'レ','㋺'=>'ロ','ã‹»'=>'ワ','㋼'=>'ヰ','㋽'=>'ヱ','㋾'=>'ヲ','㌀'=>'ã‚¢ãƒã‚šãƒ¼ãƒˆ','ãŒ'=>'アルファ','㌂'=>'アンペア','㌃'=>'アール','㌄'=>'イニング','㌅'=>'インãƒ','㌆'=>'ウォン','㌇'=>'エスクード','㌈'=>'エーカー','㌉'=>'オンス','㌊'=>'オーム','㌋'=>'カイリ','㌌'=>'カラット','ãŒ'=>'カロリー','㌎'=>'ガロン','ãŒ'=>'ガンマ','ãŒ'=>'ギガ','㌑'=>'ギニー','㌒'=>'キュリー','㌓'=>'ギルダー','㌔'=>'キロ','㌕'=>'キログラム','㌖'=>'キロメートル','㌗'=>'キロワット','㌘'=>'グラム','㌙'=>'グラムトン','㌚'=>'クルゼイロ','㌛'=>'クローãƒ','㌜'=>'ケース','ãŒ'=>'コルナ','㌞'=>'コーポ','㌟'=>'サイクル','㌠'=>'サンãƒãƒ¼ãƒ ','㌡'=>'シリング','㌢'=>'センãƒ','㌣'=>'セント','㌤'=>'ダース','㌥'=>'デシ','㌦'=>'ドル','㌧'=>'トン','㌨'=>'ナノ','㌩'=>'ノット','㌪'=>'ãƒã‚¤ãƒ„','㌫'=>'ãƒã‚šãƒ¼ã‚»ãƒ³ãƒˆ','㌬'=>'ãƒã‚šãƒ¼ãƒ„','㌭'=>'ãƒã‚™ãƒ¼ãƒ¬ãƒ«','㌮'=>'ピアストル','㌯'=>'ピクル','㌰'=>'ピコ','㌱'=>'ビル','㌲'=>'ファラッド','㌳'=>'フィート','㌴'=>'ブッシェル','㌵'=>'フラン','㌶'=>'ヘクタール','㌷'=>'ペソ','㌸'=>'ペニヒ','㌹'=>'ヘルツ','㌺'=>'ペンス','㌻'=>'ページ','㌼'=>'ベータ','㌽'=>'ポイント','㌾'=>'ボルト','㌿'=>'ホン','ã€'=>'ポンド','ã'=>'ホール','ã‚'=>'ホーン','ãƒ'=>'マイクロ','ã„'=>'マイル','ã…'=>'マッãƒ','ã†'=>'マルク','ã‡'=>'マンション','ãˆ'=>'ミクロン','ã‰'=>'ミリ','ãŠ'=>'ミリãƒã‚™ãƒ¼ãƒ«','ã‹'=>'メガ','ãŒ'=>'メガトン','ã'=>'メートル','ãŽ'=>'ヤード','ã'=>'ヤール','ã'=>'ユアン','ã‘'=>'リットル','ã’'=>'リラ','ã“'=>'ルピー','ã”'=>'ルーブル','ã•'=>'レム','ã–'=>'レントゲン','ã—'=>'ワット','ã˜'=>'0点','ã™'=>'1点','ãš'=>'2点','ã›'=>'3点','ãœ'=>'4点','ã'=>'5点','ãž'=>'6点','ãŸ'=>'7点','ã '=>'8点','ã¡'=>'9点','ã¢'=>'10点','ã£'=>'11点','ã¤'=>'12点','ã¥'=>'13点','ã¦'=>'14点','ã§'=>'15点','ã¨'=>'16点','ã©'=>'17点','ãª'=>'18点','ã«'=>'19点','ã¬'=>'20点','ã­'=>'21点','ã®'=>'22点','ã¯'=>'23点','ã°'=>'24点','ã±'=>'hPa','ã²'=>'da','ã³'=>'AU','ã´'=>'bar','ãµ'=>'oV','ã¶'=>'pc','ã·'=>'dm','ã¸'=>'dm2','ã¹'=>'dm3','ãº'=>'IU','ã»'=>'å¹³æˆ','ã¼'=>'昭和','ã½'=>'大正','ã¾'=>'明治','ã¿'=>'æ ªå¼ä¼šç¤¾','㎀'=>'pA','ãŽ'=>'nA','㎂'=>'μA','㎃'=>'mA','㎄'=>'kA','㎅'=>'KB','㎆'=>'MB','㎇'=>'GB','㎈'=>'cal','㎉'=>'kcal','㎊'=>'pF','㎋'=>'nF','㎌'=>'μF','ãŽ'=>'μg','㎎'=>'mg','ãŽ'=>'kg','ãŽ'=>'Hz','㎑'=>'kHz','㎒'=>'MHz','㎓'=>'GHz','㎔'=>'THz','㎕'=>'μl','㎖'=>'ml','㎗'=>'dl','㎘'=>'kl','㎙'=>'fm','㎚'=>'nm','㎛'=>'μm','㎜'=>'mm','ãŽ'=>'cm','㎞'=>'km','㎟'=>'mm2','㎠'=>'cm2','㎡'=>'m2','㎢'=>'km2','㎣'=>'mm3','㎤'=>'cm3','㎥'=>'m3','㎦'=>'km3','㎧'=>'m∕s','㎨'=>'m∕s2','㎩'=>'Pa','㎪'=>'kPa','㎫'=>'MPa','㎬'=>'GPa','㎭'=>'rad','㎮'=>'rad∕s','㎯'=>'rad∕s2','㎰'=>'ps','㎱'=>'ns','㎲'=>'μs','㎳'=>'ms','㎴'=>'pV','㎵'=>'nV','㎶'=>'μV','㎷'=>'mV','㎸'=>'kV','㎹'=>'MV','㎺'=>'pW','㎻'=>'nW','㎼'=>'μW','㎽'=>'mW','㎾'=>'kW','㎿'=>'MW','ã€'=>'kΩ','ã'=>'MΩ','ã‚'=>'a.m.','ãƒ'=>'Bq','ã„'=>'cc','ã…'=>'cd','ã†'=>'C∕kg','ã‡'=>'Co.','ãˆ'=>'dB','ã‰'=>'Gy','ãŠ'=>'ha','ã‹'=>'HP','ãŒ'=>'in','ã'=>'KK','ãŽ'=>'KM','ã'=>'kt','ã'=>'lm','ã‘'=>'ln','ã’'=>'log','ã“'=>'lx','ã”'=>'mb','ã•'=>'mil','ã–'=>'mol','ã—'=>'PH','ã˜'=>'p.m.','ã™'=>'PPM','ãš'=>'PR','ã›'=>'sr','ãœ'=>'Sv','ã'=>'Wb','ãž'=>'V∕m','ãŸ'=>'A∕m','ã '=>'1æ—¥','ã¡'=>'2æ—¥','ã¢'=>'3æ—¥','ã£'=>'4æ—¥','ã¤'=>'5æ—¥','ã¥'=>'6æ—¥','ã¦'=>'7æ—¥','ã§'=>'8æ—¥','ã¨'=>'9æ—¥','ã©'=>'10æ—¥','ãª'=>'11æ—¥','ã«'=>'12æ—¥','ã¬'=>'13æ—¥','ã­'=>'14æ—¥','ã®'=>'15æ—¥','ã¯'=>'16æ—¥','ã°'=>'17æ—¥','ã±'=>'18æ—¥','ã²'=>'19æ—¥','ã³'=>'20æ—¥','ã´'=>'21æ—¥','ãµ'=>'22æ—¥','ã¶'=>'23æ—¥','ã·'=>'24æ—¥','ã¸'=>'25æ—¥','ã¹'=>'26æ—¥','ãº'=>'27æ—¥','ã»'=>'28æ—¥','ã¼'=>'29æ—¥','ã½'=>'30æ—¥','ã¾'=>'31æ—¥','ã¿'=>'gal','豈'=>'豈','ï¤'=>'æ›´','車'=>'車','賈'=>'賈','滑'=>'滑','串'=>'串','句'=>'å¥','龜'=>'龜','龜'=>'龜','契'=>'契','金'=>'金','喇'=>'å–‡','奈'=>'奈','ï¤'=>'懶','癩'=>'癩','ï¤'=>'ç¾…','ï¤'=>'蘿','螺'=>'螺','裸'=>'裸','邏'=>'é‚','樂'=>'樂','洛'=>'æ´›','烙'=>'烙','珞'=>'çž','落'=>'è½','酪'=>'é…ª','駱'=>'é§±','亂'=>'亂','卵'=>'åµ','ï¤'=>'欄','爛'=>'爛','蘭'=>'蘭','鸞'=>'鸞','嵐'=>'åµ','濫'=>'æ¿«','藍'=>'è—','襤'=>'襤','拉'=>'拉','臘'=>'臘','蠟'=>'è Ÿ','廊'=>'廊','朗'=>'朗','浪'=>'浪','狼'=>'狼','郎'=>'郎','來'=>'來','冷'=>'冷','勞'=>'勞','擄'=>'æ“„','櫓'=>'æ«“','爐'=>'çˆ','盧'=>'ç›§','老'=>'è€','蘆'=>'蘆','虜'=>'虜','路'=>'è·¯','露'=>'露','魯'=>'é­¯','鷺'=>'é·º','碌'=>'碌','祿'=>'祿','綠'=>'ç¶ ','菉'=>'è‰','錄'=>'錄','鹿'=>'鹿','ï¥'=>'è«–','壟'=>'壟','弄'=>'弄','籠'=>'ç± ','聾'=>'è¾','牢'=>'牢','磊'=>'磊','賂'=>'賂','雷'=>'é›·','壘'=>'壘','屢'=>'å±¢','樓'=>'樓','ï¥'=>'æ·š','漏'=>'æ¼','ï¥'=>'ç´¯','ï¥'=>'縷','陋'=>'陋','勒'=>'å‹’','肋'=>'è‚‹','凜'=>'凜','凌'=>'凌','稜'=>'稜','綾'=>'ç¶¾','菱'=>'è±','陵'=>'陵','讀'=>'讀','拏'=>'æ‹','樂'=>'樂','ï¥'=>'諾','丹'=>'丹','寧'=>'寧','怒'=>'怒','率'=>'率','異'=>'ç•°','北'=>'北','磻'=>'磻','便'=>'便','復'=>'復','不'=>'ä¸','泌'=>'泌','數'=>'數','索'=>'ç´¢','參'=>'åƒ','塞'=>'塞','省'=>'çœ','葉'=>'葉','說'=>'說','殺'=>'殺','辰'=>'è¾°','沈'=>'沈','拾'=>'拾','若'=>'è‹¥','掠'=>'掠','略'=>'ç•¥','亮'=>'亮','兩'=>'å…©','凉'=>'凉','梁'=>'æ¢','糧'=>'ç³§','良'=>'良','諒'=>'è«’','量'=>'é‡','勵'=>'勵','呂'=>'å‘‚','ï¦'=>'女','廬'=>'廬','旅'=>'æ—…','濾'=>'濾','礪'=>'礪','閭'=>'é–­','驪'=>'驪','麗'=>'麗','黎'=>'黎','力'=>'力','曆'=>'曆','歷'=>'æ­·','ï¦'=>'è½¢','年'=>'å¹´','ï¦'=>'æ†','ï¦'=>'戀','撚'=>'æ’š','漣'=>'æ¼£','煉'=>'ç…‰','璉'=>'ç’‰','秊'=>'ç§Š','練'=>'ç·´','聯'=>'è¯','輦'=>'輦','蓮'=>'è“®','連'=>'連','鍊'=>'éŠ','列'=>'列','ï¦'=>'劣','咽'=>'å’½','烈'=>'烈','裂'=>'裂','說'=>'說','廉'=>'廉','念'=>'念','捻'=>'æ»','殮'=>'æ®®','簾'=>'ç°¾','獵'=>'çµ','令'=>'令','囹'=>'囹','寧'=>'寧','嶺'=>'嶺','怜'=>'怜','玲'=>'玲','瑩'=>'ç‘©','羚'=>'羚','聆'=>'è†','鈴'=>'鈴','零'=>'é›¶','靈'=>'éˆ','領'=>'é ˜','例'=>'例','禮'=>'禮','醴'=>'醴','隸'=>'隸','惡'=>'惡','了'=>'了','僚'=>'僚','寮'=>'寮','尿'=>'å°¿','料'=>'æ–™','樂'=>'樂','ï§€'=>'燎','ï§'=>'療','ï§‚'=>'蓼','遼'=>'é¼','ï§„'=>'é¾','ï§…'=>'暈','阮'=>'阮','劉'=>'劉','杻'=>'æ»','柳'=>'柳','ï§Š'=>'æµ','ï§‹'=>'溜','ï§Œ'=>'ç‰','ï§'=>'ç•™','ï§Ž'=>'ç¡«','ï§'=>'ç´','ï§'=>'類','ï§‘'=>'å…­','ï§’'=>'戮','ï§“'=>'陸','ï§”'=>'倫','ï§•'=>'å´™','ï§–'=>'æ·ª','ï§—'=>'輪','律'=>'律','ï§™'=>'æ…„','ï§š'=>'æ —','ï§›'=>'率','ï§œ'=>'隆','ï§'=>'利','ï§ž'=>'å','ï§Ÿ'=>'å±¥','ï§ '=>'易','ï§¡'=>'æŽ','ï§¢'=>'梨','ï§£'=>'æ³¥','理'=>'ç†','ï§¥'=>'ç—¢','罹'=>'ç½¹','ï§§'=>'è£','裡'=>'裡','ï§©'=>'里','離'=>'離','ï§«'=>'匿','溺'=>'溺','ï§­'=>'å','ï§®'=>'ç‡','璘'=>'ç’˜','ï§°'=>'è—º','ï§±'=>'隣','ï§²'=>'é±—','ï§³'=>'麟','ï§´'=>'æž—','ï§µ'=>'æ·‹','ï§¶'=>'臨','ï§·'=>'ç«‹','笠'=>'笠','ï§¹'=>'ç²’','狀'=>'ç‹€','ï§»'=>'ç‚™','ï§¼'=>'è­˜','ï§½'=>'什','ï§¾'=>'茶','ï§¿'=>'刺','切'=>'切','ï¨'=>'度','拓'=>'æ‹“','糖'=>'ç³–','宅'=>'å®…','洞'=>'æ´ž','暴'=>'æš´','輻'=>'è¼»','行'=>'行','降'=>'é™','見'=>'見','廓'=>'廓','兀'=>'å…€','ï¨'=>'å—€','ï¨'=>'塚','晴'=>'æ™´','凞'=>'凞','猪'=>'猪','益'=>'益','礼'=>'礼','神'=>'神','祥'=>'祥','福'=>'ç¦','靖'=>'é–','ï¨'=>'ç²¾','羽'=>'ç¾½','蘒'=>'蘒','諸'=>'諸','逸'=>'逸','都'=>'都','飯'=>'飯','飼'=>'飼','館'=>'館','鶴'=>'é¶´','侮'=>'ä¾®','僧'=>'僧','免'=>'å…','勉'=>'勉','勤'=>'勤','卑'=>'å‘','喝'=>'å–','嘆'=>'嘆','器'=>'器','塀'=>'å¡€','墨'=>'墨','層'=>'層','屮'=>'å±®','悔'=>'æ‚”','慨'=>'æ…¨','憎'=>'憎','ï©€'=>'懲','ï©'=>'æ•','ï©‚'=>'æ—¢','暑'=>'æš‘','ï©„'=>'梅','ï©…'=>'æµ·','渚'=>'渚','漢'=>'æ¼¢','煮'=>'ç…®','爫'=>'爫','琢'=>'ç¢','ï©‹'=>'碑','社'=>'社','ï©'=>'祉','祈'=>'祈','ï©'=>'ç¥','ï©'=>'祖','ï©‘'=>'ç¥','ï©’'=>'ç¦','ï©“'=>'禎','ï©”'=>'ç©€','ï©•'=>'çª','ï©–'=>'節','ï©—'=>'ç·´','縉'=>'縉','ï©™'=>'ç¹','署'=>'ç½²','ï©›'=>'者','臭'=>'臭','ï©'=>'艹','艹'=>'艹','著'=>'è‘—','ï© '=>'è¤','ï©¡'=>'視','ï©¢'=>'è¬','ï©£'=>'謹','賓'=>'賓','ï©¥'=>'è´ˆ','辶'=>'è¾¶','ï©§'=>'逸','難'=>'難','ï©©'=>'響','頻'=>'é »','ï©°'=>'並','况'=>'况','全'=>'å…¨','侀'=>'ä¾€','ï©´'=>'å……','冀'=>'冀','ï©¶'=>'勇','ï©·'=>'勺','喝'=>'å–','啕'=>'å••','喙'=>'å–™','ï©»'=>'å—¢','塚'=>'塚','墳'=>'墳','奄'=>'奄','ï©¿'=>'奔','婢'=>'å©¢','ïª'=>'嬨','廒'=>'å»’','廙'=>'å»™','彩'=>'彩','徭'=>'å¾­','惘'=>'惘','慎'=>'æ…Ž','愈'=>'愈','憎'=>'憎','慠'=>'æ… ','懲'=>'懲','戴'=>'戴','ïª'=>'æ„','搜'=>'æœ','ïª'=>'æ‘’','ïª'=>'æ•–','晴'=>'æ™´','朗'=>'朗','望'=>'望','杖'=>'æ–','歹'=>'æ­¹','殺'=>'殺','流'=>'æµ','滛'=>'æ»›','滋'=>'滋','漢'=>'æ¼¢','瀞'=>'瀞','煮'=>'ç…®','ïª'=>'çž§','爵'=>'爵','犯'=>'犯','猪'=>'猪','瑱'=>'瑱','甆'=>'甆','画'=>'ç”»','瘝'=>'ç˜','瘟'=>'瘟','益'=>'益','盛'=>'ç››','直'=>'ç›´','睊'=>'çŠ','着'=>'ç€','磌'=>'磌','窱'=>'窱','節'=>'節','类'=>'ç±»','絛'=>'çµ›','練'=>'ç·´','缾'=>'ç¼¾','者'=>'者','荒'=>'è’','華'=>'è¯','蝹'=>'è¹','襁'=>'è¥','覆'=>'覆','視'=>'視','調'=>'調','諸'=>'諸','請'=>'è«‹','謁'=>'è¬','諾'=>'諾','諭'=>'è«­','謹'=>'謹','ï«€'=>'變','ï«'=>'è´ˆ','ï«‚'=>'輸','遲'=>'é²','ï«„'=>'醙','ï«…'=>'鉶','陼'=>'陼','難'=>'難','靖'=>'é–','韛'=>'韛','響'=>'響','ï«‹'=>'é ‹','頻'=>'é »','ï«'=>'鬒','龜'=>'龜','ï«'=>'𢡊','ï«'=>'𢡄','ï«‘'=>'ð£•','ï«’'=>'ã®','ï«“'=>'䀘','ï«”'=>'䀹','ï«•'=>'𥉉','ï«–'=>'ð¥³','ï«—'=>'𧻓','齃'=>'齃','ï«™'=>'龎','ff'=>'ff','ï¬'=>'fi','fl'=>'fl','ffi'=>'ffi','ffl'=>'ffl','ſt'=>'st','st'=>'st','ﬓ'=>'Õ´Õ¶','ﬔ'=>'Õ´Õ¥','ﬕ'=>'Õ´Õ«','ﬖ'=>'Õ¾Õ¶','ﬗ'=>'Õ´Õ­','ï¬'=>'×™Ö´','ײַ'=>'ײַ','ﬠ'=>'×¢','ﬡ'=>'×','ﬢ'=>'ד','ﬣ'=>'×”','ﬤ'=>'×›','ﬥ'=>'ל','ﬦ'=>'×','ﬧ'=>'ר','ﬨ'=>'ת','﬩'=>'+','שׁ'=>'ש×','שׂ'=>'שׂ','שּׁ'=>'שּ×','שּׂ'=>'שּׂ','אַ'=>'×Ö·','אָ'=>'×Ö¸','אּ'=>'×Ö¼','בּ'=>'בּ','גּ'=>'×’Ö¼','דּ'=>'דּ','הּ'=>'×”Ö¼','וּ'=>'וּ','זּ'=>'×–Ö¼','טּ'=>'טּ','יּ'=>'×™Ö¼','ךּ'=>'ךּ','כּ'=>'×›Ö¼','לּ'=>'לּ','מּ'=>'מּ','ï­€'=>'× Ö¼','ï­'=>'סּ','ï­ƒ'=>'×£Ö¼','ï­„'=>'פּ','ï­†'=>'צּ','ï­‡'=>'×§Ö¼','ï­ˆ'=>'רּ','ï­‰'=>'שּ','ï­Š'=>'תּ','ï­‹'=>'וֹ','ï­Œ'=>'בֿ','ï­'=>'×›Ö¿','ï­Ž'=>'פֿ','ï­'=>'×ל','ï­'=>'Ù±','ï­‘'=>'Ù±','ï­’'=>'Ù»','ï­“'=>'Ù»','ï­”'=>'Ù»','ï­•'=>'Ù»','ï­–'=>'Ù¾','ï­—'=>'Ù¾','ï­˜'=>'Ù¾','ï­™'=>'Ù¾','ï­š'=>'Ú€','ï­›'=>'Ú€','ï­œ'=>'Ú€','ï­'=>'Ú€','ï­ž'=>'Ùº','ï­Ÿ'=>'Ùº','ï­ '=>'Ùº','ï­¡'=>'Ùº','ï­¢'=>'Ù¿','ï­£'=>'Ù¿','ï­¤'=>'Ù¿','ï­¥'=>'Ù¿','ï­¦'=>'Ù¹','ï­§'=>'Ù¹','ï­¨'=>'Ù¹','ï­©'=>'Ù¹','ï­ª'=>'Ú¤','ï­«'=>'Ú¤','ï­¬'=>'Ú¤','ï­­'=>'Ú¤','ï­®'=>'Ú¦','ï­¯'=>'Ú¦','ï­°'=>'Ú¦','ï­±'=>'Ú¦','ï­²'=>'Ú„','ï­³'=>'Ú„','ï­´'=>'Ú„','ï­µ'=>'Ú„','ï­¶'=>'Úƒ','ï­·'=>'Úƒ','ï­¸'=>'Úƒ','ï­¹'=>'Úƒ','ï­º'=>'Ú†','ï­»'=>'Ú†','ï­¼'=>'Ú†','ï­½'=>'Ú†','ï­¾'=>'Ú‡','ï­¿'=>'Ú‡','ﮀ'=>'Ú‡','ï®'=>'Ú‡','ﮂ'=>'Ú','ﮃ'=>'Ú','ﮄ'=>'ÚŒ','ï®…'=>'ÚŒ','ﮆ'=>'ÚŽ','ﮇ'=>'ÚŽ','ﮈ'=>'Úˆ','ﮉ'=>'Úˆ','ﮊ'=>'Ú˜','ﮋ'=>'Ú˜','ﮌ'=>'Ú‘','ï®'=>'Ú‘','ﮎ'=>'Ú©','ï®'=>'Ú©','ï®'=>'Ú©','ﮑ'=>'Ú©','ï®’'=>'Ú¯','ﮓ'=>'Ú¯','ï®”'=>'Ú¯','ﮕ'=>'Ú¯','ï®–'=>'Ú³','ï®—'=>'Ú³','ﮘ'=>'Ú³','ï®™'=>'Ú³','ﮚ'=>'Ú±','ï®›'=>'Ú±','ﮜ'=>'Ú±','ï®'=>'Ú±','ﮞ'=>'Úº','ﮟ'=>'Úº','ï® '=>'Ú»','ﮡ'=>'Ú»','ﮢ'=>'Ú»','ﮣ'=>'Ú»','ﮤ'=>'Û•Ù”','ﮥ'=>'Û•Ù”','ﮦ'=>'Û','ï®§'=>'Û','ﮨ'=>'Û','ﮩ'=>'Û','ﮪ'=>'Ú¾','ﮫ'=>'Ú¾','ﮬ'=>'Ú¾','ï®­'=>'Ú¾','ï®®'=>'Û’','ﮯ'=>'Û’','ï®°'=>'Û’Ù”','ï®±'=>'Û’Ù”','ﯓ'=>'Ú­','ﯔ'=>'Ú­','ﯕ'=>'Ú­','ﯖ'=>'Ú­','ﯗ'=>'Û‡','ﯘ'=>'Û‡','ﯙ'=>'Û†','ﯚ'=>'Û†','ﯛ'=>'Ûˆ','ﯜ'=>'Ûˆ','ï¯'=>'Û‡Ù´','ﯞ'=>'Û‹','ﯟ'=>'Û‹','ﯠ'=>'Û…','ﯡ'=>'Û…','ﯢ'=>'Û‰','ﯣ'=>'Û‰','ﯤ'=>'Û','ﯥ'=>'Û','ﯦ'=>'Û','ﯧ'=>'Û','ﯨ'=>'Ù‰','ﯩ'=>'Ù‰','ﯪ'=>'ئا','ﯫ'=>'ئا','ﯬ'=>'ÙŠÙ”Û•','ﯭ'=>'ÙŠÙ”Û•','ﯮ'=>'ÙŠÙ”Ùˆ','ﯯ'=>'ÙŠÙ”Ùˆ','ﯰ'=>'ÙŠÙ”Û‡','ﯱ'=>'ÙŠÙ”Û‡','ﯲ'=>'ÙŠÙ”Û†','ﯳ'=>'ÙŠÙ”Û†','ﯴ'=>'ÙŠÙ”Ûˆ','ﯵ'=>'ÙŠÙ”Ûˆ','ﯶ'=>'ÙŠÙ”Û','ﯷ'=>'ÙŠÙ”Û','ﯸ'=>'ÙŠÙ”Û','ﯹ'=>'ÙŠÙ”Ù‰','ﯺ'=>'ÙŠÙ”Ù‰','ﯻ'=>'ÙŠÙ”Ù‰','ﯼ'=>'ÛŒ','ﯽ'=>'ÛŒ','ﯾ'=>'ÛŒ','ﯿ'=>'ÛŒ','ï°€'=>'ئج','ï°'=>'ئح','ï°‚'=>'ÙŠÙ”Ù…','ï°ƒ'=>'ÙŠÙ”Ù‰','ï°„'=>'ÙŠÙ”ÙŠ','ï°…'=>'بج','ï°†'=>'بح','ï°‡'=>'بخ','ï°ˆ'=>'بم','ï°‰'=>'بى','ï°Š'=>'بي','ï°‹'=>'تج','ï°Œ'=>'تح','ï°'=>'تخ','ï°Ž'=>'تم','ï°'=>'تى','ï°'=>'تي','ï°‘'=>'ثج','ï°’'=>'ثم','ï°“'=>'ثى','ï°”'=>'ثي','ï°•'=>'جح','ï°–'=>'جم','ï°—'=>'حج','ï°˜'=>'حم','ï°™'=>'خج','ï°š'=>'خح','ï°›'=>'خم','ï°œ'=>'سج','ï°'=>'سح','ï°ž'=>'سخ','ï°Ÿ'=>'سم','ï° '=>'صح','ï°¡'=>'صم','ï°¢'=>'ضج','ï°£'=>'ضح','ï°¤'=>'ضخ','ï°¥'=>'ضم','ï°¦'=>'طح','ï°§'=>'طم','ï°¨'=>'ظم','ï°©'=>'عج','ï°ª'=>'عم','ï°«'=>'غج','ï°¬'=>'غم','ï°­'=>'ÙØ¬','ï°®'=>'ÙØ­','ï°¯'=>'ÙØ®','ï°°'=>'ÙÙ…','ï°±'=>'ÙÙ‰','ï°²'=>'ÙÙŠ','ï°³'=>'قح','ï°´'=>'قم','ï°µ'=>'قى','ï°¶'=>'قي','ï°·'=>'كا','ï°¸'=>'كج','ï°¹'=>'كح','ï°º'=>'كخ','ï°»'=>'كل','ï°¼'=>'كم','ï°½'=>'كى','ï°¾'=>'كي','ï°¿'=>'لج','ï±€'=>'لح','ï±'=>'لخ','ﱂ'=>'لم','ﱃ'=>'لى','ﱄ'=>'لي','ï±…'=>'مج','ﱆ'=>'مح','ﱇ'=>'مخ','ﱈ'=>'مم','ﱉ'=>'مى','ﱊ'=>'مي','ﱋ'=>'نج','ﱌ'=>'نح','ï±'=>'نخ','ﱎ'=>'نم','ï±'=>'نى','ï±'=>'ني','ﱑ'=>'هج','ï±’'=>'هم','ﱓ'=>'هى','ï±”'=>'هي','ﱕ'=>'يج','ï±–'=>'يح','ï±—'=>'يخ','ﱘ'=>'يم','ï±™'=>'يى','ﱚ'=>'يي','ï±›'=>'ذٰ','ﱜ'=>'رٰ','ï±'=>'ىٰ','ﱞ'=>' ٌّ','ﱟ'=>' ÙÙ‘','ï± '=>' ÙŽÙ‘','ﱡ'=>' ÙÙ‘','ï±¢'=>' ÙÙ‘','ï±£'=>' ّٰ','ﱤ'=>'ئر','ï±¥'=>'ئز','ﱦ'=>'ÙŠÙ”Ù…','ï±§'=>'ÙŠÙ”Ù†','ﱨ'=>'ÙŠÙ”Ù‰','ﱩ'=>'ÙŠÙ”ÙŠ','ﱪ'=>'بر','ﱫ'=>'بز','ﱬ'=>'بم','ï±­'=>'بن','ï±®'=>'بى','ﱯ'=>'بي','ï±°'=>'تر','ï±±'=>'تز','ï±²'=>'تم','ï±³'=>'تن','ï±´'=>'تى','ï±µ'=>'تي','ï±¶'=>'ثر','ï±·'=>'ثز','ﱸ'=>'ثم','ï±¹'=>'ثن','ﱺ'=>'ثى','ï±»'=>'ثي','ï±¼'=>'ÙÙ‰','ï±½'=>'ÙÙŠ','ï±¾'=>'قى','ﱿ'=>'قي','ï²€'=>'كا','ï²'=>'كل','ﲂ'=>'كم','ﲃ'=>'كى','ﲄ'=>'كي','ï²…'=>'لم','ﲆ'=>'لى','ﲇ'=>'لي','ﲈ'=>'ما','ﲉ'=>'مم','ﲊ'=>'نر','ﲋ'=>'نز','ﲌ'=>'نم','ï²'=>'نن','ﲎ'=>'نى','ï²'=>'ني','ï²'=>'ىٰ','ﲑ'=>'ير','ï²’'=>'يز','ﲓ'=>'يم','ï²”'=>'ين','ﲕ'=>'يى','ï²–'=>'يي','ï²—'=>'ئج','ﲘ'=>'ئح','ï²™'=>'ئخ','ﲚ'=>'ÙŠÙ”Ù…','ï²›'=>'ÙŠÙ”Ù‡','ﲜ'=>'بج','ï²'=>'بح','ﲞ'=>'بخ','ﲟ'=>'بم','ï² '=>'به','ﲡ'=>'تج','ï²¢'=>'تح','ï²£'=>'تخ','ﲤ'=>'تم','ï²¥'=>'ته','ﲦ'=>'ثم','ï²§'=>'جح','ﲨ'=>'جم','ﲩ'=>'حج','ﲪ'=>'حم','ﲫ'=>'خج','ﲬ'=>'خم','ï²­'=>'سج','ï²®'=>'سح','ﲯ'=>'سخ','ï²°'=>'سم','ï²±'=>'صح','ï²²'=>'صخ','ï²³'=>'صم','ï²´'=>'ضج','ï²µ'=>'ضح','ï²¶'=>'ضخ','ï²·'=>'ضم','ﲸ'=>'طح','ï²¹'=>'ظم','ﲺ'=>'عج','ï²»'=>'عم','ï²¼'=>'غج','ï²½'=>'غم','ï²¾'=>'ÙØ¬','ﲿ'=>'ÙØ­','ï³€'=>'ÙØ®','ï³'=>'ÙÙ…','ﳂ'=>'قح','ﳃ'=>'قم','ﳄ'=>'كج','ï³…'=>'كح','ﳆ'=>'كخ','ﳇ'=>'كل','ﳈ'=>'كم','ﳉ'=>'لج','ﳊ'=>'لح','ﳋ'=>'لخ','ﳌ'=>'لم','ï³'=>'له','ﳎ'=>'مج','ï³'=>'مح','ï³'=>'مخ','ﳑ'=>'مم','ï³’'=>'نج','ﳓ'=>'نح','ï³”'=>'نخ','ﳕ'=>'نم','ï³–'=>'نه','ï³—'=>'هج','ﳘ'=>'هم','ï³™'=>'هٰ','ﳚ'=>'يج','ï³›'=>'يح','ﳜ'=>'يخ','ï³'=>'يم','ﳞ'=>'يه','ﳟ'=>'ÙŠÙ”Ù…','ï³ '=>'ÙŠÙ”Ù‡','ﳡ'=>'بم','ï³¢'=>'به','ï³£'=>'تم','ﳤ'=>'ته','ï³¥'=>'ثم','ﳦ'=>'ثه','ï³§'=>'سم','ﳨ'=>'سه','ﳩ'=>'شم','ﳪ'=>'شه','ﳫ'=>'كل','ﳬ'=>'كم','ï³­'=>'لم','ï³®'=>'نم','ﳯ'=>'نه','ï³°'=>'يم','ï³±'=>'يه','ï³²'=>'Ù€ÙŽÙ‘','ï³³'=>'Ù€ÙÙ‘','ï³´'=>'Ù€ÙÙ‘','ï³µ'=>'طى','ï³¶'=>'طي','ï³·'=>'عى','ﳸ'=>'عي','ï³¹'=>'غى','ﳺ'=>'غي','ï³»'=>'سى','ï³¼'=>'سي','ï³½'=>'شى','ï³¾'=>'شي','ﳿ'=>'حى','ï´€'=>'حي','ï´'=>'جى','ï´‚'=>'جي','ï´ƒ'=>'خى','ï´„'=>'خي','ï´…'=>'صى','ï´†'=>'صي','ï´‡'=>'ضى','ï´ˆ'=>'ضي','ï´‰'=>'شج','ï´Š'=>'شح','ï´‹'=>'شخ','ï´Œ'=>'شم','ï´'=>'شر','ï´Ž'=>'سر','ï´'=>'صر','ï´'=>'ضر','ï´‘'=>'طى','ï´’'=>'طي','ï´“'=>'عى','ï´”'=>'عي','ï´•'=>'غى','ï´–'=>'غي','ï´—'=>'سى','ï´˜'=>'سي','ï´™'=>'شى','ï´š'=>'شي','ï´›'=>'حى','ï´œ'=>'حي','ï´'=>'جى','ï´ž'=>'جي','ï´Ÿ'=>'خى','ï´ '=>'خي','ï´¡'=>'صى','ï´¢'=>'صي','ï´£'=>'ضى','ï´¤'=>'ضي','ï´¥'=>'شج','ï´¦'=>'شح','ï´§'=>'شخ','ï´¨'=>'شم','ï´©'=>'شر','ï´ª'=>'سر','ï´«'=>'صر','ï´¬'=>'ضر','ï´­'=>'شج','ï´®'=>'شح','ï´¯'=>'شخ','ï´°'=>'شم','ï´±'=>'سه','ï´²'=>'شه','ï´³'=>'طم','ï´´'=>'سج','ï´µ'=>'سح','ï´¶'=>'سخ','ï´·'=>'شج','ï´¸'=>'شح','ï´¹'=>'شخ','ï´º'=>'طم','ï´»'=>'ظم','ï´¼'=>'اً','ï´½'=>'اً','ïµ'=>'تجم','ﵑ'=>'تحج','ïµ’'=>'تحج','ﵓ'=>'تحم','ïµ”'=>'تخم','ﵕ'=>'تمج','ïµ–'=>'تمح','ïµ—'=>'تمخ','ﵘ'=>'جمح','ïµ™'=>'جمح','ﵚ'=>'حمي','ïµ›'=>'حمى','ﵜ'=>'سحج','ïµ'=>'سجح','ﵞ'=>'سجى','ﵟ'=>'سمح','ïµ '=>'سمح','ﵡ'=>'سمج','ïµ¢'=>'سمم','ïµ£'=>'سمم','ﵤ'=>'صحح','ïµ¥'=>'صحح','ﵦ'=>'صمم','ïµ§'=>'شحم','ﵨ'=>'شحم','ﵩ'=>'شجي','ﵪ'=>'شمخ','ﵫ'=>'شمخ','ﵬ'=>'شمم','ïµ­'=>'شمم','ïµ®'=>'ضحى','ﵯ'=>'ضخم','ïµ°'=>'ضخم','ïµ±'=>'طمح','ïµ²'=>'طمح','ïµ³'=>'طمم','ïµ´'=>'طمي','ïµµ'=>'عجم','ïµ¶'=>'عمم','ïµ·'=>'عمم','ﵸ'=>'عمى','ïµ¹'=>'غمم','ﵺ'=>'غمي','ïµ»'=>'غمى','ïµ¼'=>'ÙØ®Ù…','ïµ½'=>'ÙØ®Ù…','ïµ¾'=>'قمح','ﵿ'=>'قمم','ï¶€'=>'لحم','ï¶'=>'لحي','ï¶‚'=>'لحى','ﶃ'=>'لجج','ï¶„'=>'لجج','ï¶…'=>'لخم','ﶆ'=>'لخم','ﶇ'=>'لمح','ﶈ'=>'لمح','ﶉ'=>'محج','ï¶Š'=>'محم','ï¶‹'=>'محي','ï¶Œ'=>'مجح','ï¶'=>'مجم','ï¶Ž'=>'مخج','ï¶'=>'مخم','ï¶’'=>'مجخ','ï¶“'=>'همج','ï¶”'=>'همم','ï¶•'=>'نحم','ï¶–'=>'نحى','ï¶—'=>'نجم','ﶘ'=>'نجم','ï¶™'=>'نجى','ï¶š'=>'نمي','ï¶›'=>'نمى','ï¶œ'=>'يمم','ï¶'=>'يمم','ï¶ž'=>'بخي','ï¶Ÿ'=>'تجي','ï¶ '=>'تجى','ï¶¡'=>'تخي','ï¶¢'=>'تخى','ï¶£'=>'تمي','ﶤ'=>'تمى','ï¶¥'=>'جمي','ﶦ'=>'جحى','ï¶§'=>'جمى','ﶨ'=>'سخى','ï¶©'=>'صحي','ﶪ'=>'شحي','ï¶«'=>'ضحي','ﶬ'=>'لجي','ï¶­'=>'لمي','ï¶®'=>'يحي','ﶯ'=>'يجي','ï¶°'=>'يمي','ï¶±'=>'ممي','ï¶²'=>'قمي','ï¶³'=>'نحي','ï¶´'=>'قمح','ï¶µ'=>'لحم','ï¶¶'=>'عمي','ï¶·'=>'كمي','ﶸ'=>'نجح','ï¶¹'=>'مخي','ﶺ'=>'لجم','ï¶»'=>'كمم','ï¶¼'=>'لجم','ï¶½'=>'نجح','ï¶¾'=>'جحي','ï¶¿'=>'حجي','ï·€'=>'مجي','ï·'=>'Ùمي','ï·‚'=>'بحي','ï·ƒ'=>'كمم','ï·„'=>'عجم','ï·…'=>'صمم','ï·†'=>'سخي','ï·‡'=>'نجي','ï·°'=>'صلے','ï·±'=>'قلے','ï·²'=>'الله','ï·³'=>'اكبر','ï·´'=>'محمد','ï·µ'=>'صلعم','ï·¶'=>'رسول','ï··'=>'عليه','ï·¸'=>'وسلم','ï·¹'=>'صلى','ï·º'=>'صلى الله عليه وسلم','ï·»'=>'جل جلاله','ï·¼'=>'ریال','ï¸'=>',','︑'=>'ã€','︒'=>'。','︓'=>':','︔'=>';','︕'=>'!','︖'=>'?','︗'=>'〖','︘'=>'〗','︙'=>'...','︰'=>'..','︱'=>'—','︲'=>'–','︳'=>'_','︴'=>'_','︵'=>'(','︶'=>')','︷'=>'{','︸'=>'}','︹'=>'〔','︺'=>'〕','︻'=>'ã€','︼'=>'】','︽'=>'《','︾'=>'》','︿'=>'〈','ï¹€'=>'〉','ï¹'=>'「','﹂'=>'ã€','﹃'=>'『','﹄'=>'ã€','﹇'=>'[','﹈'=>']','﹉'=>' Ì…','﹊'=>' Ì…','﹋'=>' Ì…','﹌'=>' Ì…','ï¹'=>'_','﹎'=>'_','ï¹'=>'_','ï¹'=>',','﹑'=>'ã€','ï¹’'=>'.','ï¹”'=>';','﹕'=>':','ï¹–'=>'?','ï¹—'=>'!','﹘'=>'—','ï¹™'=>'(','﹚'=>')','ï¹›'=>'{','﹜'=>'}','ï¹'=>'〔','﹞'=>'〕','﹟'=>'#','ï¹ '=>'&','﹡'=>'*','ï¹¢'=>'+','ï¹£'=>'-','﹤'=>'<','ï¹¥'=>'>','﹦'=>'=','﹨'=>'\\','﹩'=>'$','﹪'=>'%','﹫'=>'@','ï¹°'=>' Ù‹','ï¹±'=>'ـً','ï¹²'=>' ÙŒ','ï¹´'=>' Ù','ï¹¶'=>' ÙŽ','ï¹·'=>'Ù€ÙŽ','ﹸ'=>' Ù','ï¹¹'=>'Ù€Ù','ﹺ'=>' Ù','ï¹»'=>'Ù€Ù','ï¹¼'=>' Ù‘','ï¹½'=>'ـّ','ï¹¾'=>' Ù’','ﹿ'=>'ـْ','ﺀ'=>'Ø¡','ïº'=>'آ','ﺂ'=>'آ','ﺃ'=>'أ','ﺄ'=>'أ','ﺅ'=>'ÙˆÙ”','ﺆ'=>'ÙˆÙ”','ﺇ'=>'إ','ﺈ'=>'إ','ﺉ'=>'ÙŠÙ”','ﺊ'=>'ÙŠÙ”','ﺋ'=>'ÙŠÙ”','ﺌ'=>'ÙŠÙ”','ïº'=>'ا','ﺎ'=>'ا','ïº'=>'ب','ïº'=>'ب','ﺑ'=>'ب','ﺒ'=>'ب','ﺓ'=>'Ø©','ﺔ'=>'Ø©','ﺕ'=>'ت','ﺖ'=>'ت','ﺗ'=>'ت','ﺘ'=>'ت','ﺙ'=>'Ø«','ﺚ'=>'Ø«','ﺛ'=>'Ø«','ﺜ'=>'Ø«','ïº'=>'ج','ﺞ'=>'ج','ﺟ'=>'ج','ﺠ'=>'ج','ﺡ'=>'Ø­','ﺢ'=>'Ø­','ﺣ'=>'Ø­','ﺤ'=>'Ø­','ﺥ'=>'Ø®','ﺦ'=>'Ø®','ﺧ'=>'Ø®','ﺨ'=>'Ø®','ﺩ'=>'د','ﺪ'=>'د','ﺫ'=>'ذ','ﺬ'=>'ذ','ﺭ'=>'ر','ﺮ'=>'ر','ﺯ'=>'ز','ﺰ'=>'ز','ﺱ'=>'س','ﺲ'=>'س','ﺳ'=>'س','ﺴ'=>'س','ﺵ'=>'Ø´','ﺶ'=>'Ø´','ﺷ'=>'Ø´','ﺸ'=>'Ø´','ﺹ'=>'ص','ﺺ'=>'ص','ﺻ'=>'ص','ﺼ'=>'ص','ﺽ'=>'ض','ﺾ'=>'ض','ﺿ'=>'ض','ﻀ'=>'ض','ï»'=>'Ø·','ﻂ'=>'Ø·','ﻃ'=>'Ø·','ﻄ'=>'Ø·','ï»…'=>'ظ','ﻆ'=>'ظ','ﻇ'=>'ظ','ﻈ'=>'ظ','ﻉ'=>'ع','ﻊ'=>'ع','ﻋ'=>'ع','ﻌ'=>'ع','ï»'=>'غ','ﻎ'=>'غ','ï»'=>'غ','ï»'=>'غ','ﻑ'=>'Ù','ï»’'=>'Ù','ﻓ'=>'Ù','ï»”'=>'Ù','ﻕ'=>'Ù‚','ï»–'=>'Ù‚','ï»—'=>'Ù‚','ﻘ'=>'Ù‚','ï»™'=>'Ùƒ','ﻚ'=>'Ùƒ','ï»›'=>'Ùƒ','ﻜ'=>'Ùƒ','ï»'=>'Ù„','ﻞ'=>'Ù„','ﻟ'=>'Ù„','ï» '=>'Ù„','ﻡ'=>'Ù…','ﻢ'=>'Ù…','ﻣ'=>'Ù…','ﻤ'=>'Ù…','ﻥ'=>'Ù†','ﻦ'=>'Ù†','ï»§'=>'Ù†','ﻨ'=>'Ù†','ﻩ'=>'Ù‡','ﻪ'=>'Ù‡','ﻫ'=>'Ù‡','ﻬ'=>'Ù‡','ï»­'=>'Ùˆ','ï»®'=>'Ùˆ','ﻯ'=>'Ù‰','ï»°'=>'Ù‰','ï»±'=>'ÙŠ','ﻲ'=>'ÙŠ','ﻳ'=>'ÙŠ','ï»´'=>'ÙŠ','ﻵ'=>'لآ','ï»¶'=>'لآ','ï»·'=>'لأ','ﻸ'=>'لأ','ﻹ'=>'لإ','ﻺ'=>'لإ','ï»»'=>'لا','ﻼ'=>'لا','ï¼'=>'!','"'=>'"','#'=>'#','$'=>'$','ï¼…'=>'%','&'=>'&','''=>'\'','('=>'(',')'=>')','*'=>'*','+'=>'+',','=>',','ï¼'=>'-','.'=>'.','ï¼'=>'/','ï¼'=>'0','1'=>'1','ï¼’'=>'2','3'=>'3','ï¼”'=>'4','5'=>'5','ï¼–'=>'6','ï¼—'=>'7','8'=>'8','ï¼™'=>'9',':'=>':','ï¼›'=>';','<'=>'<','ï¼'=>'=','>'=>'>','?'=>'?','ï¼ '=>'@','A'=>'A','ï¼¢'=>'B','ï¼£'=>'C','D'=>'D','ï¼¥'=>'E','F'=>'F','ï¼§'=>'G','H'=>'H','I'=>'I','J'=>'J','K'=>'K','L'=>'L','ï¼­'=>'M','ï¼®'=>'N','O'=>'O','ï¼°'=>'P','ï¼±'=>'Q','ï¼²'=>'R','ï¼³'=>'S','ï¼´'=>'T','ï¼µ'=>'U','ï¼¶'=>'V','ï¼·'=>'W','X'=>'X','ï¼¹'=>'Y','Z'=>'Z','ï¼»'=>'[','ï¼¼'=>'\\','ï¼½'=>']','ï¼¾'=>'^','_'=>'_','ï½€'=>'`','ï½'=>'a','b'=>'b','c'=>'c','d'=>'d','ï½…'=>'e','f'=>'f','g'=>'g','h'=>'h','i'=>'i','j'=>'j','k'=>'k','l'=>'l','ï½'=>'m','n'=>'n','ï½'=>'o','ï½'=>'p','q'=>'q','ï½’'=>'r','s'=>'s','ï½”'=>'t','u'=>'u','ï½–'=>'v','ï½—'=>'w','x'=>'x','ï½™'=>'y','z'=>'z','ï½›'=>'{','|'=>'|','ï½'=>'}','~'=>'~','⦅'=>'⦅','ï½ '=>'⦆','。'=>'。','ï½¢'=>'「','ï½£'=>'ã€','、'=>'ã€','ï½¥'=>'・','ヲ'=>'ヲ','ï½§'=>'ã‚¡','ィ'=>'ã‚£','ゥ'=>'ã‚¥','ェ'=>'ã‚§','ォ'=>'ã‚©','ャ'=>'ャ','ï½­'=>'ュ','ï½®'=>'ョ','ッ'=>'ッ','ï½°'=>'ー','ï½±'=>'ã‚¢','ï½²'=>'イ','ï½³'=>'ウ','ï½´'=>'エ','ï½µ'=>'オ','ï½¶'=>'ã‚«','ï½·'=>'ã‚­','ク'=>'ク','ï½¹'=>'ケ','コ'=>'コ','ï½»'=>'サ','ï½¼'=>'ã‚·','ï½½'=>'ス','ï½¾'=>'ã‚»','ソ'=>'ソ','ï¾€'=>'ã‚¿','ï¾'=>'ãƒ','ツ'=>'ツ','テ'=>'テ','ト'=>'ト','ï¾…'=>'ナ','ニ'=>'ニ','ヌ'=>'ヌ','ネ'=>'ãƒ','ノ'=>'ノ','ハ'=>'ãƒ','ヒ'=>'ヒ','フ'=>'フ','ï¾'=>'ヘ','ホ'=>'ホ','ï¾'=>'マ','ï¾'=>'ミ','ム'=>'ム','ï¾’'=>'メ','モ'=>'モ','ï¾”'=>'ヤ','ユ'=>'ユ','ï¾–'=>'ヨ','ï¾—'=>'ラ','リ'=>'リ','ï¾™'=>'ル','レ'=>'レ','ï¾›'=>'ロ','ワ'=>'ワ','ï¾'=>'ン','゙'=>'ã‚™','゚'=>'゚','ï¾ '=>'á… ','ᄀ'=>'á„€','ï¾¢'=>'á„','ï¾£'=>'ᆪ','ᄂ'=>'á„‚','ï¾¥'=>'ᆬ','ᆭ'=>'ᆭ','ï¾§'=>'ᄃ','ᄄ'=>'á„„','ᄅ'=>'á„…','ᆰ'=>'ᆰ','ᆱ'=>'ᆱ','ᆲ'=>'ᆲ','ï¾­'=>'ᆳ','ï¾®'=>'ᆴ','ᆵ'=>'ᆵ','ï¾°'=>'ᄚ','ï¾±'=>'ᄆ','ï¾²'=>'ᄇ','ï¾³'=>'ᄈ','ï¾´'=>'á„¡','ï¾µ'=>'ᄉ','ï¾¶'=>'ᄊ','ï¾·'=>'á„‹','ᄌ'=>'ᄌ','ï¾¹'=>'á„','ᄎ'=>'ᄎ','ï¾»'=>'á„','ï¾¼'=>'á„','ï¾½'=>'á„‘','ï¾¾'=>'á„’','ï¿‚'=>'á…¡','ᅢ'=>'á…¢','ï¿„'=>'á…£','ï¿…'=>'á…¤','ᅥ'=>'á…¥','ᅦ'=>'á…¦','ᅧ'=>'á…§','ï¿‹'=>'á…¨','ᅩ'=>'á…©','ï¿'=>'á…ª','ᅫ'=>'á…«','ï¿'=>'á…¬','ï¿’'=>'á…­','ï¿“'=>'á…®','ï¿”'=>'á…¯','ï¿•'=>'á…°','ï¿–'=>'á…±','ï¿—'=>'á…²','ᅳ'=>'á…³','ï¿›'=>'á…´','ᅵ'=>'á…µ','ï¿ '=>'¢','ï¿¡'=>'£','ï¿¢'=>'¬','ï¿£'=>' Ì„','¦'=>'¦','ï¿¥'=>'Â¥','₩'=>'â‚©','│'=>'│','ï¿©'=>'â†','↑'=>'↑','ï¿«'=>'→','↓'=>'↓','ï¿­'=>'â– ','ï¿®'=>'â—‹','ð…ž'=>'ð…—ð…¥','ð…Ÿ'=>'ð…˜ð…¥','ð… '=>'ð…˜ð…¥ð…®','ð…¡'=>'ð…˜ð…¥ð…¯','ð…¢'=>'ð…˜ð…¥ð…°','ð…£'=>'ð…˜ð…¥ð…±','ð…¤'=>'ð…˜ð…¥ð…²','ð†»'=>'ð†¹ð…¥','ð†¼'=>'ð†ºð…¥','ð†½'=>'ð†¹ð…¥ð…®','ð†¾'=>'ð†ºð…¥ð…®','ð†¿'=>'ð†¹ð…¥ð…¯','ð‡€'=>'ð†ºð…¥ð…¯','ð€'=>'A','ð'=>'B','ð‚'=>'C','ðƒ'=>'D','ð„'=>'E','ð…'=>'F','ð†'=>'G','ð‡'=>'H','ðˆ'=>'I','ð‰'=>'J','ðŠ'=>'K','ð‹'=>'L','ðŒ'=>'M','ð'=>'N','ðŽ'=>'O','ð'=>'P','ð'=>'Q','ð‘'=>'R','ð’'=>'S','ð“'=>'T','ð”'=>'U','ð•'=>'V','ð–'=>'W','ð—'=>'X','ð˜'=>'Y','ð™'=>'Z','ðš'=>'a','ð›'=>'b','ðœ'=>'c','ð'=>'d','ðž'=>'e','ðŸ'=>'f','ð '=>'g','ð¡'=>'h','ð¢'=>'i','ð£'=>'j','ð¤'=>'k','ð¥'=>'l','ð¦'=>'m','ð§'=>'n','ð¨'=>'o','ð©'=>'p','ðª'=>'q','ð«'=>'r','ð¬'=>'s','ð­'=>'t','ð®'=>'u','ð¯'=>'v','ð°'=>'w','ð±'=>'x','ð²'=>'y','ð³'=>'z','ð´'=>'A','ðµ'=>'B','ð¶'=>'C','ð·'=>'D','ð¸'=>'E','ð¹'=>'F','ðº'=>'G','ð»'=>'H','ð¼'=>'I','ð½'=>'J','ð¾'=>'K','ð¿'=>'L','ð‘€'=>'M','ð‘'=>'N','ð‘‚'=>'O','ð‘ƒ'=>'P','ð‘„'=>'Q','ð‘…'=>'R','ð‘†'=>'S','ð‘‡'=>'T','ð‘ˆ'=>'U','ð‘‰'=>'V','ð‘Š'=>'W','ð‘‹'=>'X','ð‘Œ'=>'Y','ð‘'=>'Z','ð‘Ž'=>'a','ð‘'=>'b','ð‘'=>'c','ð‘‘'=>'d','ð‘’'=>'e','ð‘“'=>'f','ð‘”'=>'g','ð‘–'=>'i','ð‘—'=>'j','ð‘˜'=>'k','ð‘™'=>'l','ð‘š'=>'m','ð‘›'=>'n','ð‘œ'=>'o','ð‘'=>'p','ð‘ž'=>'q','ð‘Ÿ'=>'r','ð‘ '=>'s','ð‘¡'=>'t','ð‘¢'=>'u','ð‘£'=>'v','ð‘¤'=>'w','ð‘¥'=>'x','ð‘¦'=>'y','ð‘§'=>'z','ð‘¨'=>'A','ð‘©'=>'B','ð‘ª'=>'C','ð‘«'=>'D','ð‘¬'=>'E','ð‘­'=>'F','ð‘®'=>'G','ð‘¯'=>'H','ð‘°'=>'I','ð‘±'=>'J','ð‘²'=>'K','ð‘³'=>'L','ð‘´'=>'M','ð‘µ'=>'N','ð‘¶'=>'O','ð‘·'=>'P','ð‘¸'=>'Q','ð‘¹'=>'R','ð‘º'=>'S','ð‘»'=>'T','ð‘¼'=>'U','ð‘½'=>'V','ð‘¾'=>'W','ð‘¿'=>'X','ð’€'=>'Y','ð’'=>'Z','ð’‚'=>'a','ð’ƒ'=>'b','ð’„'=>'c','ð’…'=>'d','ð’†'=>'e','ð’‡'=>'f','ð’ˆ'=>'g','ð’‰'=>'h','ð’Š'=>'i','ð’‹'=>'j','ð’Œ'=>'k','ð’'=>'l','ð’Ž'=>'m','ð’'=>'n','ð’'=>'o','ð’‘'=>'p','ð’’'=>'q','ð’“'=>'r','ð’”'=>'s','ð’•'=>'t','ð’–'=>'u','ð’—'=>'v','ð’˜'=>'w','ð’™'=>'x','ð’š'=>'y','ð’›'=>'z','ð’œ'=>'A','ð’ž'=>'C','ð’Ÿ'=>'D','ð’¢'=>'G','ð’¥'=>'J','ð’¦'=>'K','ð’©'=>'N','ð’ª'=>'O','ð’«'=>'P','ð’¬'=>'Q','ð’®'=>'S','ð’¯'=>'T','ð’°'=>'U','ð’±'=>'V','ð’²'=>'W','ð’³'=>'X','ð’´'=>'Y','ð’µ'=>'Z','ð’¶'=>'a','ð’·'=>'b','ð’¸'=>'c','ð’¹'=>'d','ð’»'=>'f','ð’½'=>'h','ð’¾'=>'i','ð’¿'=>'j','ð“€'=>'k','ð“'=>'l','ð“‚'=>'m','ð“ƒ'=>'n','ð“…'=>'p','ð“†'=>'q','ð“‡'=>'r','ð“ˆ'=>'s','ð“‰'=>'t','ð“Š'=>'u','ð“‹'=>'v','ð“Œ'=>'w','ð“'=>'x','ð“Ž'=>'y','ð“'=>'z','ð“'=>'A','ð“‘'=>'B','ð“’'=>'C','ð““'=>'D','ð“”'=>'E','ð“•'=>'F','ð“–'=>'G','ð“—'=>'H','ð“˜'=>'I','ð“™'=>'J','ð“š'=>'K','ð“›'=>'L','ð“œ'=>'M','ð“'=>'N','ð“ž'=>'O','ð“Ÿ'=>'P','ð“ '=>'Q','ð“¡'=>'R','ð“¢'=>'S','ð“£'=>'T','ð“¤'=>'U','ð“¥'=>'V','ð“¦'=>'W','ð“§'=>'X','ð“¨'=>'Y','ð“©'=>'Z','ð“ª'=>'a','ð“«'=>'b','ð“¬'=>'c','ð“­'=>'d','ð“®'=>'e','ð“¯'=>'f','ð“°'=>'g','ð“±'=>'h','ð“²'=>'i','ð“³'=>'j','ð“´'=>'k','ð“µ'=>'l','ð“¶'=>'m','ð“·'=>'n','ð“¸'=>'o','ð“¹'=>'p','ð“º'=>'q','ð“»'=>'r','ð“¼'=>'s','ð“½'=>'t','ð“¾'=>'u','ð“¿'=>'v','ð”€'=>'w','ð”'=>'x','ð”‚'=>'y','ð”ƒ'=>'z','ð”„'=>'A','ð”…'=>'B','ð”‡'=>'D','ð”ˆ'=>'E','ð”‰'=>'F','ð”Š'=>'G','ð”'=>'J','ð”Ž'=>'K','ð”'=>'L','ð”'=>'M','ð”‘'=>'N','ð”’'=>'O','ð”“'=>'P','ð””'=>'Q','ð”–'=>'S','ð”—'=>'T','ð”˜'=>'U','ð”™'=>'V','ð”š'=>'W','ð”›'=>'X','ð”œ'=>'Y','ð”ž'=>'a','ð”Ÿ'=>'b','ð” '=>'c','ð”¡'=>'d','ð”¢'=>'e','ð”£'=>'f','ð”¤'=>'g','ð”¥'=>'h','ð”¦'=>'i','ð”§'=>'j','ð”¨'=>'k','ð”©'=>'l','ð”ª'=>'m','ð”«'=>'n','ð”¬'=>'o','ð”­'=>'p','ð”®'=>'q','ð”¯'=>'r','ð”°'=>'s','ð”±'=>'t','ð”²'=>'u','ð”³'=>'v','ð”´'=>'w','ð”µ'=>'x','ð”¶'=>'y','ð”·'=>'z','ð”¸'=>'A','ð”¹'=>'B','ð”»'=>'D','ð”¼'=>'E','ð”½'=>'F','ð”¾'=>'G','ð•€'=>'I','ð•'=>'J','ð•‚'=>'K','ð•ƒ'=>'L','ð•„'=>'M','ð•†'=>'O','ð•Š'=>'S','ð•‹'=>'T','ð•Œ'=>'U','ð•'=>'V','ð•Ž'=>'W','ð•'=>'X','ð•'=>'Y','ð•’'=>'a','ð•“'=>'b','ð•”'=>'c','ð••'=>'d','ð•–'=>'e','ð•—'=>'f','ð•˜'=>'g','ð•™'=>'h','ð•š'=>'i','ð•›'=>'j','ð•œ'=>'k','ð•'=>'l','ð•ž'=>'m','ð•Ÿ'=>'n','ð• '=>'o','ð•¡'=>'p','ð•¢'=>'q','ð•£'=>'r','ð•¤'=>'s','ð•¥'=>'t','ð•¦'=>'u','ð•§'=>'v','ð•¨'=>'w','ð•©'=>'x','ð•ª'=>'y','ð•«'=>'z','ð•¬'=>'A','ð•­'=>'B','ð•®'=>'C','ð•¯'=>'D','ð•°'=>'E','ð•±'=>'F','ð•²'=>'G','ð•³'=>'H','ð•´'=>'I','ð•µ'=>'J','ð•¶'=>'K','ð•·'=>'L','ð•¸'=>'M','ð•¹'=>'N','ð•º'=>'O','ð•»'=>'P','ð•¼'=>'Q','ð•½'=>'R','ð•¾'=>'S','ð•¿'=>'T','ð–€'=>'U','ð–'=>'V','ð–‚'=>'W','ð–ƒ'=>'X','ð–„'=>'Y','ð–…'=>'Z','ð–†'=>'a','ð–‡'=>'b','ð–ˆ'=>'c','ð–‰'=>'d','ð–Š'=>'e','ð–‹'=>'f','ð–Œ'=>'g','ð–'=>'h','ð–Ž'=>'i','ð–'=>'j','ð–'=>'k','ð–‘'=>'l','ð–’'=>'m','ð–“'=>'n','ð–”'=>'o','ð–•'=>'p','ð––'=>'q','ð–—'=>'r','ð–˜'=>'s','ð–™'=>'t','ð–š'=>'u','ð–›'=>'v','ð–œ'=>'w','ð–'=>'x','ð–ž'=>'y','ð–Ÿ'=>'z','ð– '=>'A','ð–¡'=>'B','ð–¢'=>'C','ð–£'=>'D','ð–¤'=>'E','ð–¥'=>'F','ð–¦'=>'G','ð–§'=>'H','ð–¨'=>'I','ð–©'=>'J','ð–ª'=>'K','ð–«'=>'L','ð–¬'=>'M','ð–­'=>'N','ð–®'=>'O','ð–¯'=>'P','ð–°'=>'Q','ð–±'=>'R','ð–²'=>'S','ð–³'=>'T','ð–´'=>'U','ð–µ'=>'V','ð–¶'=>'W','ð–·'=>'X','ð–¸'=>'Y','ð–¹'=>'Z','ð–º'=>'a','ð–»'=>'b','ð–¼'=>'c','ð–½'=>'d','ð–¾'=>'e','ð–¿'=>'f','ð—€'=>'g','ð—'=>'h','ð—‚'=>'i','ð—ƒ'=>'j','ð—„'=>'k','ð—…'=>'l','ð—†'=>'m','ð—‡'=>'n','ð—ˆ'=>'o','ð—‰'=>'p','ð—Š'=>'q','ð—‹'=>'r','ð—Œ'=>'s','ð—'=>'t','ð—Ž'=>'u','ð—'=>'v','ð—'=>'w','ð—‘'=>'x','ð—’'=>'y','ð—“'=>'z','ð—”'=>'A','ð—•'=>'B','ð—–'=>'C','ð——'=>'D','ð—˜'=>'E','ð—™'=>'F','ð—š'=>'G','ð—›'=>'H','ð—œ'=>'I','ð—'=>'J','ð—ž'=>'K','ð—Ÿ'=>'L','ð— '=>'M','ð—¡'=>'N','ð—¢'=>'O','ð—£'=>'P','ð—¤'=>'Q','ð—¥'=>'R','ð—¦'=>'S','ð—§'=>'T','ð—¨'=>'U','ð—©'=>'V','ð—ª'=>'W','ð—«'=>'X','ð—¬'=>'Y','ð—­'=>'Z','ð—®'=>'a','ð—¯'=>'b','ð—°'=>'c','ð—±'=>'d','ð—²'=>'e','ð—³'=>'f','ð—´'=>'g','ð—µ'=>'h','ð—¶'=>'i','ð—·'=>'j','ð—¸'=>'k','ð—¹'=>'l','ð—º'=>'m','ð—»'=>'n','ð—¼'=>'o','ð—½'=>'p','ð—¾'=>'q','ð—¿'=>'r','ð˜€'=>'s','ð˜'=>'t','ð˜‚'=>'u','ð˜ƒ'=>'v','ð˜„'=>'w','ð˜…'=>'x','ð˜†'=>'y','ð˜‡'=>'z','ð˜ˆ'=>'A','ð˜‰'=>'B','ð˜Š'=>'C','ð˜‹'=>'D','ð˜Œ'=>'E','ð˜'=>'F','ð˜Ž'=>'G','ð˜'=>'H','ð˜'=>'I','ð˜‘'=>'J','ð˜’'=>'K','ð˜“'=>'L','ð˜”'=>'M','ð˜•'=>'N','ð˜–'=>'O','ð˜—'=>'P','ð˜˜'=>'Q','ð˜™'=>'R','ð˜š'=>'S','ð˜›'=>'T','ð˜œ'=>'U','ð˜'=>'V','ð˜ž'=>'W','ð˜Ÿ'=>'X','ð˜ '=>'Y','ð˜¡'=>'Z','ð˜¢'=>'a','ð˜£'=>'b','ð˜¤'=>'c','ð˜¥'=>'d','ð˜¦'=>'e','ð˜§'=>'f','ð˜¨'=>'g','ð˜©'=>'h','ð˜ª'=>'i','ð˜«'=>'j','ð˜¬'=>'k','ð˜­'=>'l','ð˜®'=>'m','ð˜¯'=>'n','ð˜°'=>'o','ð˜±'=>'p','ð˜²'=>'q','ð˜³'=>'r','ð˜´'=>'s','ð˜µ'=>'t','ð˜¶'=>'u','ð˜·'=>'v','ð˜¸'=>'w','ð˜¹'=>'x','ð˜º'=>'y','ð˜»'=>'z','ð˜¼'=>'A','ð˜½'=>'B','ð˜¾'=>'C','ð˜¿'=>'D','ð™€'=>'E','ð™'=>'F','ð™‚'=>'G','ð™ƒ'=>'H','ð™„'=>'I','ð™…'=>'J','ð™†'=>'K','ð™‡'=>'L','ð™ˆ'=>'M','ð™‰'=>'N','ð™Š'=>'O','ð™‹'=>'P','ð™Œ'=>'Q','ð™'=>'R','ð™Ž'=>'S','ð™'=>'T','ð™'=>'U','ð™‘'=>'V','ð™’'=>'W','ð™“'=>'X','ð™”'=>'Y','ð™•'=>'Z','ð™–'=>'a','ð™—'=>'b','ð™˜'=>'c','ð™™'=>'d','ð™š'=>'e','ð™›'=>'f','ð™œ'=>'g','ð™'=>'h','ð™ž'=>'i','ð™Ÿ'=>'j','ð™ '=>'k','ð™¡'=>'l','ð™¢'=>'m','ð™£'=>'n','ð™¤'=>'o','ð™¥'=>'p','ð™¦'=>'q','ð™§'=>'r','ð™¨'=>'s','ð™©'=>'t','ð™ª'=>'u','ð™«'=>'v','ð™¬'=>'w','ð™­'=>'x','ð™®'=>'y','ð™¯'=>'z','ð™°'=>'A','ð™±'=>'B','ð™²'=>'C','ð™³'=>'D','ð™´'=>'E','ð™µ'=>'F','ð™¶'=>'G','ð™·'=>'H','ð™¸'=>'I','ð™¹'=>'J','ð™º'=>'K','ð™»'=>'L','ð™¼'=>'M','ð™½'=>'N','ð™¾'=>'O','ð™¿'=>'P','ðš€'=>'Q','ðš'=>'R','ðš‚'=>'S','ðšƒ'=>'T','ðš„'=>'U','ðš…'=>'V','ðš†'=>'W','ðš‡'=>'X','ðšˆ'=>'Y','ðš‰'=>'Z','ðšŠ'=>'a','ðš‹'=>'b','ðšŒ'=>'c','ðš'=>'d','ðšŽ'=>'e','ðš'=>'f','ðš'=>'g','ðš‘'=>'h','ðš’'=>'i','ðš“'=>'j','ðš”'=>'k','ðš•'=>'l','ðš–'=>'m','ðš—'=>'n','ðš˜'=>'o','ðš™'=>'p','ðšš'=>'q','ðš›'=>'r','ðšœ'=>'s','ðš'=>'t','ðšž'=>'u','ðšŸ'=>'v','ðš '=>'w','ðš¡'=>'x','ðš¢'=>'y','ðš£'=>'z','ðš¤'=>'ı','ðš¥'=>'È·','ðš¨'=>'Α','ðš©'=>'Î’','ðšª'=>'Γ','ðš«'=>'Δ','ðš¬'=>'Ε','ðš­'=>'Ζ','ðš®'=>'Η','ðš¯'=>'Θ','ðš°'=>'Ι','ðš±'=>'Κ','ðš²'=>'Λ','ðš³'=>'Μ','ðš´'=>'Î','ðšµ'=>'Ξ','ðš¶'=>'Ο','ðš·'=>'Π','ðš¸'=>'Ρ','ðš¹'=>'Θ','ðšº'=>'Σ','ðš»'=>'Τ','ðš¼'=>'Î¥','ðš½'=>'Φ','ðš¾'=>'Χ','ðš¿'=>'Ψ','ð›€'=>'Ω','ð›'=>'∇','ð›‚'=>'α','ð›ƒ'=>'β','ð›„'=>'γ','ð›…'=>'δ','ð›†'=>'ε','ð›‡'=>'ζ','ð›ˆ'=>'η','ð›‰'=>'θ','ð›Š'=>'ι','ð›‹'=>'κ','ð›Œ'=>'λ','ð›'=>'μ','ð›Ž'=>'ν','ð›'=>'ξ','ð›'=>'ο','ð›‘'=>'Ï€','ð›’'=>'Ï','ð›“'=>'Ï‚','ð›”'=>'σ','ð›•'=>'Ï„','ð›–'=>'Ï…','ð›—'=>'φ','ð›˜'=>'χ','ð›™'=>'ψ','ð›š'=>'ω','ð››'=>'∂','ð›œ'=>'ε','ð›'=>'θ','ð›ž'=>'κ','ð›Ÿ'=>'φ','ð› '=>'Ï','ð›¡'=>'Ï€','ð›¢'=>'Α','ð›£'=>'Î’','ð›¤'=>'Γ','ð›¥'=>'Δ','ð›¦'=>'Ε','ð›§'=>'Ζ','ð›¨'=>'Η','ð›©'=>'Θ','ð›ª'=>'Ι','ð›«'=>'Κ','ð›¬'=>'Λ','ð›­'=>'Μ','ð›®'=>'Î','ð›¯'=>'Ξ','ð›°'=>'Ο','ð›±'=>'Π','ð›²'=>'Ρ','ð›³'=>'Θ','ð›´'=>'Σ','ð›µ'=>'Τ','ð›¶'=>'Î¥','ð›·'=>'Φ','ð›¸'=>'Χ','ð›¹'=>'Ψ','ð›º'=>'Ω','ð›»'=>'∇','ð›¼'=>'α','ð›½'=>'β','ð›¾'=>'γ','ð›¿'=>'δ','ðœ€'=>'ε','ðœ'=>'ζ','ðœ‚'=>'η','ðœƒ'=>'θ','ðœ„'=>'ι','ðœ…'=>'κ','ðœ†'=>'λ','ðœ‡'=>'μ','ðœˆ'=>'ν','ðœ‰'=>'ξ','ðœŠ'=>'ο','ðœ‹'=>'Ï€','ðœŒ'=>'Ï','ðœ'=>'Ï‚','ðœŽ'=>'σ','ðœ'=>'Ï„','ðœ'=>'Ï…','ðœ‘'=>'φ','ðœ’'=>'χ','ðœ“'=>'ψ','ðœ”'=>'ω','ðœ•'=>'∂','ðœ–'=>'ε','ðœ—'=>'θ','ðœ˜'=>'κ','ðœ™'=>'φ','ðœš'=>'Ï','ðœ›'=>'Ï€','ðœœ'=>'Α','ðœ'=>'Î’','ðœž'=>'Γ','ðœŸ'=>'Δ','ðœ '=>'Ε','ðœ¡'=>'Ζ','ðœ¢'=>'Η','ðœ£'=>'Θ','ðœ¤'=>'Ι','ðœ¥'=>'Κ','ðœ¦'=>'Λ','ðœ§'=>'Μ','ðœ¨'=>'Î','ðœ©'=>'Ξ','ðœª'=>'Ο','ðœ«'=>'Π','ðœ¬'=>'Ρ','ðœ­'=>'Θ','ðœ®'=>'Σ','ðœ¯'=>'Τ','ðœ°'=>'Î¥','ðœ±'=>'Φ','ðœ²'=>'Χ','ðœ³'=>'Ψ','ðœ´'=>'Ω','ðœµ'=>'∇','ðœ¶'=>'α','ðœ·'=>'β','ðœ¸'=>'γ','ðœ¹'=>'δ','ðœº'=>'ε','ðœ»'=>'ζ','ðœ¼'=>'η','ðœ½'=>'θ','ðœ¾'=>'ι','ðœ¿'=>'κ','ð€'=>'λ','ð'=>'μ','ð‚'=>'ν','ðƒ'=>'ξ','ð„'=>'ο','ð…'=>'Ï€','ð†'=>'Ï','ð‡'=>'Ï‚','ðˆ'=>'σ','ð‰'=>'Ï„','ðŠ'=>'Ï…','ð‹'=>'φ','ðŒ'=>'χ','ð'=>'ψ','ðŽ'=>'ω','ð'=>'∂','ð'=>'ε','ð‘'=>'θ','ð’'=>'κ','ð“'=>'φ','ð”'=>'Ï','ð•'=>'Ï€','ð–'=>'Α','ð—'=>'Î’','ð˜'=>'Γ','ð™'=>'Δ','ðš'=>'Ε','ð›'=>'Ζ','ðœ'=>'Η','ð'=>'Θ','ðž'=>'Ι','ðŸ'=>'Κ','ð '=>'Λ','ð¡'=>'Μ','ð¢'=>'Î','ð£'=>'Ξ','ð¤'=>'Ο','ð¥'=>'Π','ð¦'=>'Ρ','ð§'=>'Θ','ð¨'=>'Σ','ð©'=>'Τ','ðª'=>'Î¥','ð«'=>'Φ','ð¬'=>'Χ','ð­'=>'Ψ','ð®'=>'Ω','ð¯'=>'∇','ð°'=>'α','ð±'=>'β','ð²'=>'γ','ð³'=>'δ','ð´'=>'ε','ðµ'=>'ζ','ð¶'=>'η','ð·'=>'θ','ð¸'=>'ι','ð¹'=>'κ','ðº'=>'λ','ð»'=>'μ','ð¼'=>'ν','ð½'=>'ξ','ð¾'=>'ο','ð¿'=>'Ï€','ðž€'=>'Ï','ðž'=>'Ï‚','ðž‚'=>'σ','ðžƒ'=>'Ï„','ðž„'=>'Ï…','ðž…'=>'φ','ðž†'=>'χ','ðž‡'=>'ψ','ðžˆ'=>'ω','ðž‰'=>'∂','ðžŠ'=>'ε','ðž‹'=>'θ','ðžŒ'=>'κ','ðž'=>'φ','ðžŽ'=>'Ï','ðž'=>'Ï€','ðž'=>'Α','ðž‘'=>'Î’','ðž’'=>'Γ','ðž“'=>'Δ','ðž”'=>'Ε','ðž•'=>'Ζ','ðž–'=>'Η','ðž—'=>'Θ','ðž˜'=>'Ι','ðž™'=>'Κ','ðžš'=>'Λ','ðž›'=>'Μ','ðžœ'=>'Î','ðž'=>'Ξ','ðžž'=>'Ο','ðžŸ'=>'Π','ðž '=>'Ρ','ðž¡'=>'Θ','ðž¢'=>'Σ','ðž£'=>'Τ','ðž¤'=>'Î¥','ðž¥'=>'Φ','ðž¦'=>'Χ','ðž§'=>'Ψ','ðž¨'=>'Ω','ðž©'=>'∇','ðžª'=>'α','ðž«'=>'β','ðž¬'=>'γ','ðž­'=>'δ','ðž®'=>'ε','ðž¯'=>'ζ','ðž°'=>'η','ðž±'=>'θ','ðž²'=>'ι','ðž³'=>'κ','ðž´'=>'λ','ðžµ'=>'μ','ðž¶'=>'ν','ðž·'=>'ξ','ðž¸'=>'ο','ðž¹'=>'Ï€','ðžº'=>'Ï','ðž»'=>'Ï‚','ðž¼'=>'σ','ðž½'=>'Ï„','ðž¾'=>'Ï…','ðž¿'=>'φ','ðŸ€'=>'χ','ðŸ'=>'ψ','ðŸ‚'=>'ω','ðŸƒ'=>'∂','ðŸ„'=>'ε','ðŸ…'=>'θ','ðŸ†'=>'κ','ðŸ‡'=>'φ','ðŸˆ'=>'Ï','ðŸ‰'=>'Ï€','ðŸŠ'=>'Ïœ','ðŸ‹'=>'Ï','ðŸŽ'=>'0','ðŸ'=>'1','ðŸ'=>'2','ðŸ‘'=>'3','ðŸ’'=>'4','ðŸ“'=>'5','ðŸ”'=>'6','ðŸ•'=>'7','ðŸ–'=>'8','ðŸ—'=>'9','ðŸ˜'=>'0','ðŸ™'=>'1','ðŸš'=>'2','ðŸ›'=>'3','ðŸœ'=>'4','ðŸ'=>'5','ðŸž'=>'6','ðŸŸ'=>'7','ðŸ '=>'8','ðŸ¡'=>'9','ðŸ¢'=>'0','ðŸ£'=>'1','ðŸ¤'=>'2','ðŸ¥'=>'3','ðŸ¦'=>'4','ðŸ§'=>'5','ðŸ¨'=>'6','ðŸ©'=>'7','ðŸª'=>'8','ðŸ«'=>'9','ðŸ¬'=>'0','ðŸ­'=>'1','ðŸ®'=>'2','ðŸ¯'=>'3','ðŸ°'=>'4','ðŸ±'=>'5','ðŸ²'=>'6','ðŸ³'=>'7','ðŸ´'=>'8','ðŸµ'=>'9','ðŸ¶'=>'0','ðŸ·'=>'1','ðŸ¸'=>'2','ðŸ¹'=>'3','ðŸº'=>'4','ðŸ»'=>'5','ðŸ¼'=>'6','ðŸ½'=>'7','ðŸ¾'=>'8','ðŸ¿'=>'9','丽'=>'丽','ð¯ '=>'丸','乁'=>'ä¹','𠄢'=>'ð „¢','你'=>'ä½ ','侮'=>'ä¾®','侻'=>'ä¾»','倂'=>'倂','偺'=>'åº','備'=>'å‚™','僧'=>'僧','像'=>'åƒ','㒞'=>'ã’ž','ð¯ '=>'𠘺','免'=>'å…','ð¯ '=>'å…”','ð¯ '=>'å…¤','具'=>'å…·','𠔜'=>'𠔜','㒹'=>'ã’¹','內'=>'å…§','再'=>'å†','𠕋'=>'ð •‹','冗'=>'冗','冤'=>'冤','仌'=>'仌','冬'=>'冬','况'=>'况','𩇟'=>'𩇟','ð¯ '=>'凵','刃'=>'刃','㓟'=>'㓟','刻'=>'刻','剆'=>'剆','割'=>'割','剷'=>'剷','㔕'=>'㔕','勇'=>'勇','勉'=>'勉','勤'=>'勤','勺'=>'勺','包'=>'包','匆'=>'匆','北'=>'北','卉'=>'å‰','卑'=>'å‘','博'=>'åš','即'=>'å³','卽'=>'å½','卿'=>'å¿','卿'=>'å¿','卿'=>'å¿','𠨬'=>'𠨬','灰'=>'ç°','及'=>'åŠ','叟'=>'åŸ','𠭣'=>'ð ­£','叫'=>'å«','叱'=>'å±','吆'=>'å†','咞'=>'å’ž','吸'=>'å¸','呈'=>'呈','周'=>'周','咢'=>'å’¢','ð¯¡'=>'å“¶','唐'=>'å”','啓'=>'å•“','啣'=>'å•£','善'=>'å–„','善'=>'å–„','喙'=>'å–™','喫'=>'å–«','喳'=>'å–³','嗂'=>'å—‚','圖'=>'圖','嘆'=>'嘆','ð¯¡'=>'圗','噑'=>'噑','ð¯¡'=>'å™´','ð¯¡'=>'切','壮'=>'壮','城'=>'城','埴'=>'埴','堍'=>'å ','型'=>'åž‹','堲'=>'å ²','報'=>'å ±','墬'=>'墬','𡓤'=>'𡓤','売'=>'売','壷'=>'壷','夆'=>'夆','ð¯¡'=>'多','夢'=>'夢','奢'=>'奢','𡚨'=>'𡚨','𡛪'=>'𡛪','姬'=>'姬','娛'=>'娛','娧'=>'娧','姘'=>'姘','婦'=>'婦','㛮'=>'ã›®','㛼'=>'㛼','嬈'=>'嬈','嬾'=>'嬾','嬾'=>'嬾','𡧈'=>'𡧈','寃'=>'寃','寘'=>'寘','寧'=>'寧','寳'=>'寳','𡬘'=>'𡬘','寿'=>'寿','将'=>'å°†','当'=>'当','尢'=>'å°¢','㞁'=>'ãž','屠'=>'å± ','屮'=>'å±®','峀'=>'å³€','岍'=>'å²','𡷤'=>'ð¡·¤','嵃'=>'嵃','𡷦'=>'ð¡·¦','嵮'=>'åµ®','嵫'=>'嵫','嵼'=>'åµ¼','ð¯¢'=>'å·¡','巢'=>'å·¢','㠯'=>'ã ¯','巽'=>'å·½','帨'=>'帨','帽'=>'帽','幩'=>'幩','㡢'=>'ã¡¢','𢆃'=>'𢆃','㡼'=>'㡼','庰'=>'庰','庳'=>'庳','ð¯¢'=>'庶','廊'=>'廊','ð¯¢'=>'𪎒','ð¯¢'=>'廾','𢌱'=>'𢌱','𢌱'=>'𢌱','舁'=>'èˆ','弢'=>'å¼¢','弢'=>'å¼¢','㣇'=>'㣇','𣊸'=>'𣊸','𦇚'=>'𦇚','形'=>'å½¢','彫'=>'彫','㣣'=>'㣣','徚'=>'徚','ð¯¢'=>'å¿','志'=>'å¿—','忹'=>'忹','悁'=>'æ‚','㤺'=>'㤺','㤜'=>'㤜','悔'=>'æ‚”','𢛔'=>'𢛔','惇'=>'惇','慈'=>'æ…ˆ','慌'=>'æ…Œ','慎'=>'æ…Ž','慌'=>'æ…Œ','慺'=>'æ…º','憎'=>'憎','憲'=>'憲','憤'=>'憤','憯'=>'憯','懞'=>'懞','懲'=>'懲','懶'=>'懶','成'=>'æˆ','戛'=>'戛','扝'=>'æ‰','抱'=>'抱','拔'=>'æ‹”','捐'=>'æ','𢬌'=>'𢬌','挽'=>'挽','拼'=>'拼','捨'=>'æ¨','掃'=>'掃','揤'=>'æ¤','𢯱'=>'𢯱','搢'=>'æ¢','揅'=>'æ…','ð¯£'=>'掩','㨮'=>'㨮','摩'=>'æ‘©','摾'=>'摾','撝'=>'æ’','摷'=>'æ‘·','㩬'=>'㩬','敏'=>'æ•','敬'=>'敬','𣀊'=>'𣀊','旣'=>'æ—£','書'=>'書','ð¯£'=>'晉','㬙'=>'㬙','ð¯£'=>'æš‘','ð¯£'=>'㬈','㫤'=>'㫤','冒'=>'冒','冕'=>'冕','最'=>'最','暜'=>'æšœ','肭'=>'è‚­','䏙'=>'ä™','朗'=>'朗','望'=>'望','朡'=>'朡','杞'=>'æž','杓'=>'æ“','ð¯£'=>'ð£ƒ','㭉'=>'ã­‰','柺'=>'柺','枅'=>'æž…','桒'=>'æ¡’','梅'=>'梅','𣑭'=>'𣑭','梎'=>'梎','栟'=>'æ Ÿ','椔'=>'椔','㮝'=>'ã®','楂'=>'楂','榣'=>'榣','槪'=>'槪','檨'=>'檨','𣚣'=>'𣚣','櫛'=>'æ«›','㰘'=>'ã°˜','次'=>'次','𣢧'=>'𣢧','歔'=>'æ­”','㱎'=>'㱎','歲'=>'æ­²','殟'=>'殟','殺'=>'殺','殻'=>'æ®»','𣪍'=>'ð£ª','𡴋'=>'ð¡´‹','𣫺'=>'𣫺','汎'=>'汎','𣲼'=>'𣲼','沿'=>'沿','泍'=>'æ³','汧'=>'æ±§','洖'=>'æ´–','派'=>'æ´¾','ð¯¤'=>'æµ·','流'=>'æµ','浩'=>'浩','浸'=>'浸','涅'=>'æ¶…','𣴞'=>'𣴞','洴'=>'æ´´','港'=>'港','湮'=>'æ¹®','㴳'=>'ã´³','滋'=>'滋','滇'=>'滇','ð¯¤'=>'𣻑','淹'=>'æ·¹','ð¯¤'=>'æ½®','ð¯¤'=>'𣽞','𣾎'=>'𣾎','濆'=>'濆','瀹'=>'瀹','瀞'=>'瀞','瀛'=>'瀛','㶖'=>'ã¶–','灊'=>'çŠ','災'=>'ç½','灷'=>'ç·','炭'=>'ç‚­','𠔥'=>'𠔥','煅'=>'ç……','ð¯¤'=>'𤉣','熜'=>'熜','𤎫'=>'𤎫','爨'=>'爨','爵'=>'爵','牐'=>'ç‰','𤘈'=>'𤘈','犀'=>'犀','犕'=>'犕','𤜵'=>'𤜵','𤠔'=>'𤠔','獺'=>'çº','王'=>'王','㺬'=>'㺬','玥'=>'玥','㺸'=>'㺸','㺸'=>'㺸','瑇'=>'瑇','瑜'=>'瑜','瑱'=>'瑱','璅'=>'ç’…','瓊'=>'瓊','㼛'=>'ã¼›','甤'=>'甤','𤰶'=>'𤰶','甾'=>'甾','𤲒'=>'𤲒','異'=>'ç•°','𢆟'=>'𢆟','瘐'=>'ç˜','𤾡'=>'𤾡','𤾸'=>'𤾸','𥁄'=>'ð¥„','㿼'=>'㿼','䀈'=>'䀈','直'=>'ç›´','ð¯¥'=>'𥃳','𥃲'=>'𥃲','𥄙'=>'𥄙','𥄳'=>'𥄳','眞'=>'眞','真'=>'真','真'=>'真','睊'=>'çŠ','䀹'=>'䀹','瞋'=>'çž‹','䁆'=>'ä†','䂖'=>'ä‚–','ð¯¥'=>'ð¥','硎'=>'硎','ð¯¥'=>'碌','ð¯¥'=>'磌','䃣'=>'䃣','𥘦'=>'𥘦','祖'=>'祖','𥚚'=>'𥚚','𥛅'=>'𥛅','福'=>'ç¦','秫'=>'ç§«','䄯'=>'䄯','穀'=>'ç©€','穊'=>'穊','穏'=>'ç©','𥥼'=>'𥥼','ð¯¥'=>'𥪧','𥪧'=>'𥪧','竮'=>'ç«®','䈂'=>'䈂','𥮫'=>'𥮫','篆'=>'篆','築'=>'築','䈧'=>'䈧','𥲀'=>'𥲀','糒'=>'ç³’','䊠'=>'䊠','糨'=>'糨','糣'=>'ç³£','紀'=>'ç´€','𥾆'=>'𥾆','絣'=>'çµ£','䌁'=>'äŒ','緇'=>'ç·‡','縂'=>'縂','繅'=>'ç¹…','䌴'=>'䌴','𦈨'=>'𦈨','𦉇'=>'𦉇','䍙'=>'ä™','𦋙'=>'𦋙','罺'=>'罺','𦌾'=>'𦌾','羕'=>'羕','翺'=>'翺','者'=>'者','𦓚'=>'𦓚','𦔣'=>'𦔣','聠'=>'è ','𦖨'=>'𦖨','聰'=>'è°','𣍟'=>'ð£Ÿ','ð¯¦'=>'ä•','育'=>'育','脃'=>'脃','䐋'=>'ä‹','脾'=>'脾','媵'=>'媵','𦞧'=>'𦞧','𦞵'=>'𦞵','𣎓'=>'𣎓','𣎜'=>'𣎜','舁'=>'èˆ','舄'=>'舄','ð¯¦'=>'辞','䑫'=>'ä‘«','ð¯¦'=>'芑','ð¯¦'=>'芋','芝'=>'èŠ','劳'=>'劳','花'=>'花','芳'=>'芳','芽'=>'芽','苦'=>'苦','𦬼'=>'𦬼','若'=>'è‹¥','茝'=>'èŒ','荣'=>'è£','莭'=>'莭','茣'=>'茣','ð¯¦'=>'莽','菧'=>'è§','著'=>'è‘—','荓'=>'è“','菊'=>'èŠ','菌'=>'èŒ','菜'=>'èœ','𦰶'=>'𦰶','𦵫'=>'𦵫','𦳕'=>'𦳕','䔫'=>'䔫','蓱'=>'蓱','蓳'=>'蓳','蔖'=>'è”–','𧏊'=>'ð§Š','蕤'=>'蕤','𦼬'=>'𦼬','䕝'=>'ä•','䕡'=>'ä•¡','𦾱'=>'𦾱','𧃒'=>'𧃒','䕫'=>'ä•«','虐'=>'è™','虜'=>'虜','虧'=>'è™§','虩'=>'虩','蚩'=>'èš©','蚈'=>'蚈','蜎'=>'蜎','蛢'=>'蛢','蝹'=>'è¹','蜨'=>'蜨','蝫'=>'è«','螆'=>'螆','䗗'=>'ä——','蟡'=>'蟡','ð¯§'=>'è ','䗹'=>'ä—¹','衠'=>'è¡ ','衣'=>'è¡£','𧙧'=>'ð§™§','裗'=>'裗','裞'=>'裞','䘵'=>'䘵','裺'=>'裺','㒻'=>'ã’»','𧢮'=>'ð§¢®','𧥦'=>'𧥦','ð¯§'=>'äš¾','䛇'=>'䛇','ð¯§'=>'誠','ð¯§'=>'è«­','變'=>'變','豕'=>'豕','𧲨'=>'𧲨','貫'=>'貫','賁'=>'è³','贛'=>'è´›','起'=>'èµ·','𧼯'=>'𧼯','𠠄'=>'ð  „','跋'=>'è·‹','趼'=>'è¶¼','跰'=>'è·°','ð¯§'=>'𠣞','軔'=>'è»”','輸'=>'輸','𨗒'=>'𨗒','𨗭'=>'𨗭','邔'=>'é‚”','郱'=>'郱','鄑'=>'é„‘','𨜮'=>'𨜮','鄛'=>'é„›','鈸'=>'鈸','鋗'=>'é‹—','鋘'=>'鋘','鉼'=>'鉼','鏹'=>'é¹','鐕'=>'é•','𨯺'=>'𨯺','開'=>'é–‹','䦕'=>'䦕','閷'=>'é–·','𨵷'=>'𨵷','䧦'=>'䧦','雃'=>'雃','嶲'=>'å¶²','霣'=>'霣','𩅅'=>'ð©……','𩈚'=>'𩈚','䩮'=>'ä©®','䩶'=>'ä©¶','韠'=>'韠','𩐊'=>'ð©Š','䪲'=>'䪲','𩒖'=>'ð©’–','頋'=>'é ‹','頋'=>'é ‹','頩'=>'é ©','ð¯¨'=>'ð©–¶','飢'=>'飢','䬳'=>'䬳','餩'=>'餩','馧'=>'馧','駂'=>'é§‚','駾'=>'é§¾','䯎'=>'䯎','𩬰'=>'𩬰','鬒'=>'鬒','鱀'=>'é±€','鳽'=>'é³½','ð¯¨'=>'䳎','䳭'=>'ä³­','ð¯¨'=>'éµ§','ð¯¨'=>'𪃎','䳸'=>'䳸','𪄅'=>'𪄅','𪈎'=>'𪈎','𪊑'=>'𪊑','麻'=>'麻','䵖'=>'äµ–','黹'=>'黹','黾'=>'黾','鼅'=>'é¼…','鼏'=>'é¼','鼖'=>'é¼–','鼻'=>'é¼»','ð¯¨'=>'𪘀'); \ No newline at end of file diff --git a/phpBB/includes/utf/data/utf_nfc_qc.php b/phpBB/includes/utf/data/utf_nfc_qc.php deleted file mode 100644 index 03031f8b6d..0000000000 --- a/phpBB/includes/utf/data/utf_nfc_qc.php +++ /dev/null @@ -1,2 +0,0 @@ -1,'Í'=>1,'̓'=>1,'Í„'=>1,'Í´'=>1,';'=>1,'·'=>1,'क़'=>1,'ख़'=>1,'ग़'=>1,'ज़'=>1,'ड़'=>1,'à¥'=>1,'फ़'=>1,'य़'=>1,'à§œ'=>1,'à§'=>1,'à§Ÿ'=>1,'ਲ਼'=>1,'ਸ਼'=>1,'à©™'=>1,'ਗ਼'=>1,'à©›'=>1,'ਫ਼'=>1,'à­œ'=>1,'à­'=>1,'གྷ'=>1,'à½'=>1,'དྷ'=>1,'བྷ'=>1,'ཛྷ'=>1,'ཀྵ'=>1,'ཱི'=>1,'ཱུ'=>1,'ྲྀ'=>1,'ླྀ'=>1,'à¾'=>1,'ྒྷ'=>1,'à¾'=>1,'ྡྷ'=>1,'ྦྷ'=>1,'ྫྷ'=>1,'ྐྵ'=>1,'á½±'=>1,'á½³'=>1,'á½µ'=>1,'á½·'=>1,'á½¹'=>1,'á½»'=>1,'á½½'=>1,'á¾»'=>1,'á¾¾'=>1,'Έ'=>1,'á¿‹'=>1,'á¿“'=>1,'á¿›'=>1,'á¿£'=>1,'á¿«'=>1,'á¿®'=>1,'`'=>1,'Ό'=>1,'á¿»'=>1,'´'=>1,' '=>1,'â€'=>1,'Ω'=>1,'K'=>1,'â„«'=>1,'〈'=>1,'〉'=>1,'⫝̸'=>1,'豈'=>1,'ï¤'=>1,'車'=>1,'賈'=>1,'滑'=>1,'串'=>1,'句'=>1,'龜'=>1,'龜'=>1,'契'=>1,'金'=>1,'喇'=>1,'奈'=>1,'ï¤'=>1,'癩'=>1,'ï¤'=>1,'ï¤'=>1,'螺'=>1,'裸'=>1,'邏'=>1,'樂'=>1,'洛'=>1,'烙'=>1,'珞'=>1,'落'=>1,'酪'=>1,'駱'=>1,'亂'=>1,'卵'=>1,'ï¤'=>1,'爛'=>1,'蘭'=>1,'鸞'=>1,'嵐'=>1,'濫'=>1,'藍'=>1,'襤'=>1,'拉'=>1,'臘'=>1,'蠟'=>1,'廊'=>1,'朗'=>1,'浪'=>1,'狼'=>1,'郎'=>1,'來'=>1,'冷'=>1,'勞'=>1,'擄'=>1,'櫓'=>1,'爐'=>1,'盧'=>1,'老'=>1,'蘆'=>1,'虜'=>1,'路'=>1,'露'=>1,'魯'=>1,'鷺'=>1,'碌'=>1,'祿'=>1,'綠'=>1,'菉'=>1,'錄'=>1,'鹿'=>1,'ï¥'=>1,'壟'=>1,'弄'=>1,'籠'=>1,'聾'=>1,'牢'=>1,'磊'=>1,'賂'=>1,'雷'=>1,'壘'=>1,'屢'=>1,'樓'=>1,'ï¥'=>1,'漏'=>1,'ï¥'=>1,'ï¥'=>1,'陋'=>1,'勒'=>1,'肋'=>1,'凜'=>1,'凌'=>1,'稜'=>1,'綾'=>1,'菱'=>1,'陵'=>1,'讀'=>1,'拏'=>1,'樂'=>1,'ï¥'=>1,'丹'=>1,'寧'=>1,'怒'=>1,'率'=>1,'異'=>1,'北'=>1,'磻'=>1,'便'=>1,'復'=>1,'不'=>1,'泌'=>1,'數'=>1,'索'=>1,'參'=>1,'塞'=>1,'省'=>1,'葉'=>1,'說'=>1,'殺'=>1,'辰'=>1,'沈'=>1,'拾'=>1,'若'=>1,'掠'=>1,'略'=>1,'亮'=>1,'兩'=>1,'凉'=>1,'梁'=>1,'糧'=>1,'良'=>1,'諒'=>1,'量'=>1,'勵'=>1,'呂'=>1,'ï¦'=>1,'廬'=>1,'旅'=>1,'濾'=>1,'礪'=>1,'閭'=>1,'驪'=>1,'麗'=>1,'黎'=>1,'力'=>1,'曆'=>1,'歷'=>1,'ï¦'=>1,'年'=>1,'ï¦'=>1,'ï¦'=>1,'撚'=>1,'漣'=>1,'煉'=>1,'璉'=>1,'秊'=>1,'練'=>1,'聯'=>1,'輦'=>1,'蓮'=>1,'連'=>1,'鍊'=>1,'列'=>1,'ï¦'=>1,'咽'=>1,'烈'=>1,'裂'=>1,'說'=>1,'廉'=>1,'念'=>1,'捻'=>1,'殮'=>1,'簾'=>1,'獵'=>1,'令'=>1,'囹'=>1,'寧'=>1,'嶺'=>1,'怜'=>1,'玲'=>1,'瑩'=>1,'羚'=>1,'聆'=>1,'鈴'=>1,'零'=>1,'靈'=>1,'領'=>1,'例'=>1,'禮'=>1,'醴'=>1,'隸'=>1,'惡'=>1,'了'=>1,'僚'=>1,'寮'=>1,'尿'=>1,'料'=>1,'樂'=>1,'ï§€'=>1,'ï§'=>1,'ï§‚'=>1,'遼'=>1,'ï§„'=>1,'ï§…'=>1,'阮'=>1,'劉'=>1,'杻'=>1,'柳'=>1,'ï§Š'=>1,'ï§‹'=>1,'ï§Œ'=>1,'ï§'=>1,'ï§Ž'=>1,'ï§'=>1,'ï§'=>1,'ï§‘'=>1,'ï§’'=>1,'ï§“'=>1,'ï§”'=>1,'ï§•'=>1,'ï§–'=>1,'ï§—'=>1,'律'=>1,'ï§™'=>1,'ï§š'=>1,'ï§›'=>1,'ï§œ'=>1,'ï§'=>1,'ï§ž'=>1,'ï§Ÿ'=>1,'ï§ '=>1,'ï§¡'=>1,'ï§¢'=>1,'ï§£'=>1,'理'=>1,'ï§¥'=>1,'罹'=>1,'ï§§'=>1,'裡'=>1,'ï§©'=>1,'離'=>1,'ï§«'=>1,'溺'=>1,'ï§­'=>1,'ï§®'=>1,'璘'=>1,'ï§°'=>1,'ï§±'=>1,'ï§²'=>1,'ï§³'=>1,'ï§´'=>1,'ï§µ'=>1,'ï§¶'=>1,'ï§·'=>1,'笠'=>1,'ï§¹'=>1,'狀'=>1,'ï§»'=>1,'ï§¼'=>1,'ï§½'=>1,'ï§¾'=>1,'ï§¿'=>1,'切'=>1,'ï¨'=>1,'拓'=>1,'糖'=>1,'宅'=>1,'洞'=>1,'暴'=>1,'輻'=>1,'行'=>1,'降'=>1,'見'=>1,'廓'=>1,'兀'=>1,'ï¨'=>1,'ï¨'=>1,'晴'=>1,'凞'=>1,'猪'=>1,'益'=>1,'礼'=>1,'神'=>1,'祥'=>1,'福'=>1,'靖'=>1,'ï¨'=>1,'羽'=>1,'蘒'=>1,'諸'=>1,'逸'=>1,'都'=>1,'飯'=>1,'飼'=>1,'館'=>1,'鶴'=>1,'侮'=>1,'僧'=>1,'免'=>1,'勉'=>1,'勤'=>1,'卑'=>1,'喝'=>1,'嘆'=>1,'器'=>1,'塀'=>1,'墨'=>1,'層'=>1,'屮'=>1,'悔'=>1,'慨'=>1,'憎'=>1,'ï©€'=>1,'ï©'=>1,'ï©‚'=>1,'暑'=>1,'ï©„'=>1,'ï©…'=>1,'渚'=>1,'漢'=>1,'煮'=>1,'爫'=>1,'琢'=>1,'ï©‹'=>1,'社'=>1,'ï©'=>1,'祈'=>1,'ï©'=>1,'ï©'=>1,'ï©‘'=>1,'ï©’'=>1,'ï©“'=>1,'ï©”'=>1,'ï©•'=>1,'ï©–'=>1,'ï©—'=>1,'縉'=>1,'ï©™'=>1,'署'=>1,'ï©›'=>1,'臭'=>1,'ï©'=>1,'艹'=>1,'著'=>1,'ï© '=>1,'ï©¡'=>1,'ï©¢'=>1,'ï©£'=>1,'賓'=>1,'ï©¥'=>1,'辶'=>1,'ï©§'=>1,'難'=>1,'ï©©'=>1,'頻'=>1,'ï©°'=>1,'况'=>1,'全'=>1,'侀'=>1,'ï©´'=>1,'冀'=>1,'ï©¶'=>1,'ï©·'=>1,'喝'=>1,'啕'=>1,'喙'=>1,'ï©»'=>1,'塚'=>1,'墳'=>1,'奄'=>1,'ï©¿'=>1,'婢'=>1,'ïª'=>1,'廒'=>1,'廙'=>1,'彩'=>1,'徭'=>1,'惘'=>1,'慎'=>1,'愈'=>1,'憎'=>1,'慠'=>1,'懲'=>1,'戴'=>1,'ïª'=>1,'搜'=>1,'ïª'=>1,'ïª'=>1,'晴'=>1,'朗'=>1,'望'=>1,'杖'=>1,'歹'=>1,'殺'=>1,'流'=>1,'滛'=>1,'滋'=>1,'漢'=>1,'瀞'=>1,'煮'=>1,'ïª'=>1,'爵'=>1,'犯'=>1,'猪'=>1,'瑱'=>1,'甆'=>1,'画'=>1,'瘝'=>1,'瘟'=>1,'益'=>1,'盛'=>1,'直'=>1,'睊'=>1,'着'=>1,'磌'=>1,'窱'=>1,'節'=>1,'类'=>1,'絛'=>1,'練'=>1,'缾'=>1,'者'=>1,'荒'=>1,'華'=>1,'蝹'=>1,'襁'=>1,'覆'=>1,'視'=>1,'調'=>1,'諸'=>1,'請'=>1,'謁'=>1,'諾'=>1,'諭'=>1,'謹'=>1,'ï«€'=>1,'ï«'=>1,'ï«‚'=>1,'遲'=>1,'ï«„'=>1,'ï«…'=>1,'陼'=>1,'難'=>1,'靖'=>1,'韛'=>1,'響'=>1,'ï«‹'=>1,'頻'=>1,'ï«'=>1,'龜'=>1,'ï«'=>1,'ï«'=>1,'ï«‘'=>1,'ï«’'=>1,'ï«“'=>1,'ï«”'=>1,'ï«•'=>1,'ï«–'=>1,'ï«—'=>1,'齃'=>1,'ï«™'=>1,'ï¬'=>1,'ײַ'=>1,'שׁ'=>1,'שׂ'=>1,'שּׁ'=>1,'שּׂ'=>1,'אַ'=>1,'אָ'=>1,'אּ'=>1,'בּ'=>1,'גּ'=>1,'דּ'=>1,'הּ'=>1,'וּ'=>1,'זּ'=>1,'טּ'=>1,'יּ'=>1,'ךּ'=>1,'כּ'=>1,'לּ'=>1,'מּ'=>1,'ï­€'=>1,'ï­'=>1,'ï­ƒ'=>1,'ï­„'=>1,'ï­†'=>1,'ï­‡'=>1,'ï­ˆ'=>1,'ï­‰'=>1,'ï­Š'=>1,'ï­‹'=>1,'ï­Œ'=>1,'ï­'=>1,'ï­Ž'=>1,'ð…ž'=>1,'ð…Ÿ'=>1,'ð… '=>1,'ð…¡'=>1,'ð…¢'=>1,'ð…£'=>1,'ð…¤'=>1,'ð†»'=>1,'ð†¼'=>1,'ð†½'=>1,'ð†¾'=>1,'ð†¿'=>1,'ð‡€'=>1,'丽'=>1,'ð¯ '=>1,'乁'=>1,'𠄢'=>1,'你'=>1,'侮'=>1,'侻'=>1,'倂'=>1,'偺'=>1,'備'=>1,'僧'=>1,'像'=>1,'㒞'=>1,'ð¯ '=>1,'免'=>1,'ð¯ '=>1,'ð¯ '=>1,'具'=>1,'𠔜'=>1,'㒹'=>1,'內'=>1,'再'=>1,'𠕋'=>1,'冗'=>1,'冤'=>1,'仌'=>1,'冬'=>1,'况'=>1,'𩇟'=>1,'ð¯ '=>1,'刃'=>1,'㓟'=>1,'刻'=>1,'剆'=>1,'割'=>1,'剷'=>1,'㔕'=>1,'勇'=>1,'勉'=>1,'勤'=>1,'勺'=>1,'包'=>1,'匆'=>1,'北'=>1,'卉'=>1,'卑'=>1,'博'=>1,'即'=>1,'卽'=>1,'卿'=>1,'卿'=>1,'卿'=>1,'𠨬'=>1,'灰'=>1,'及'=>1,'叟'=>1,'𠭣'=>1,'叫'=>1,'叱'=>1,'吆'=>1,'咞'=>1,'吸'=>1,'呈'=>1,'周'=>1,'咢'=>1,'ð¯¡'=>1,'唐'=>1,'啓'=>1,'啣'=>1,'善'=>1,'善'=>1,'喙'=>1,'喫'=>1,'喳'=>1,'嗂'=>1,'圖'=>1,'嘆'=>1,'ð¯¡'=>1,'噑'=>1,'ð¯¡'=>1,'ð¯¡'=>1,'壮'=>1,'城'=>1,'埴'=>1,'堍'=>1,'型'=>1,'堲'=>1,'報'=>1,'墬'=>1,'𡓤'=>1,'売'=>1,'壷'=>1,'夆'=>1,'ð¯¡'=>1,'夢'=>1,'奢'=>1,'𡚨'=>1,'𡛪'=>1,'姬'=>1,'娛'=>1,'娧'=>1,'姘'=>1,'婦'=>1,'㛮'=>1,'㛼'=>1,'嬈'=>1,'嬾'=>1,'嬾'=>1,'𡧈'=>1,'寃'=>1,'寘'=>1,'寧'=>1,'寳'=>1,'𡬘'=>1,'寿'=>1,'将'=>1,'当'=>1,'尢'=>1,'㞁'=>1,'屠'=>1,'屮'=>1,'峀'=>1,'岍'=>1,'𡷤'=>1,'嵃'=>1,'𡷦'=>1,'嵮'=>1,'嵫'=>1,'嵼'=>1,'ð¯¢'=>1,'巢'=>1,'㠯'=>1,'巽'=>1,'帨'=>1,'帽'=>1,'幩'=>1,'㡢'=>1,'𢆃'=>1,'㡼'=>1,'庰'=>1,'庳'=>1,'ð¯¢'=>1,'廊'=>1,'ð¯¢'=>1,'ð¯¢'=>1,'𢌱'=>1,'𢌱'=>1,'舁'=>1,'弢'=>1,'弢'=>1,'㣇'=>1,'𣊸'=>1,'𦇚'=>1,'形'=>1,'彫'=>1,'㣣'=>1,'徚'=>1,'ð¯¢'=>1,'志'=>1,'忹'=>1,'悁'=>1,'㤺'=>1,'㤜'=>1,'悔'=>1,'𢛔'=>1,'惇'=>1,'慈'=>1,'慌'=>1,'慎'=>1,'慌'=>1,'慺'=>1,'憎'=>1,'憲'=>1,'憤'=>1,'憯'=>1,'懞'=>1,'懲'=>1,'懶'=>1,'成'=>1,'戛'=>1,'扝'=>1,'抱'=>1,'拔'=>1,'捐'=>1,'𢬌'=>1,'挽'=>1,'拼'=>1,'捨'=>1,'掃'=>1,'揤'=>1,'𢯱'=>1,'搢'=>1,'揅'=>1,'ð¯£'=>1,'㨮'=>1,'摩'=>1,'摾'=>1,'撝'=>1,'摷'=>1,'㩬'=>1,'敏'=>1,'敬'=>1,'𣀊'=>1,'旣'=>1,'書'=>1,'ð¯£'=>1,'㬙'=>1,'ð¯£'=>1,'ð¯£'=>1,'㫤'=>1,'冒'=>1,'冕'=>1,'最'=>1,'暜'=>1,'肭'=>1,'䏙'=>1,'朗'=>1,'望'=>1,'朡'=>1,'杞'=>1,'杓'=>1,'ð¯£'=>1,'㭉'=>1,'柺'=>1,'枅'=>1,'桒'=>1,'梅'=>1,'𣑭'=>1,'梎'=>1,'栟'=>1,'椔'=>1,'㮝'=>1,'楂'=>1,'榣'=>1,'槪'=>1,'檨'=>1,'𣚣'=>1,'櫛'=>1,'㰘'=>1,'次'=>1,'𣢧'=>1,'歔'=>1,'㱎'=>1,'歲'=>1,'殟'=>1,'殺'=>1,'殻'=>1,'𣪍'=>1,'𡴋'=>1,'𣫺'=>1,'汎'=>1,'𣲼'=>1,'沿'=>1,'泍'=>1,'汧'=>1,'洖'=>1,'派'=>1,'ð¯¤'=>1,'流'=>1,'浩'=>1,'浸'=>1,'涅'=>1,'𣴞'=>1,'洴'=>1,'港'=>1,'湮'=>1,'㴳'=>1,'滋'=>1,'滇'=>1,'ð¯¤'=>1,'淹'=>1,'ð¯¤'=>1,'ð¯¤'=>1,'𣾎'=>1,'濆'=>1,'瀹'=>1,'瀞'=>1,'瀛'=>1,'㶖'=>1,'灊'=>1,'災'=>1,'灷'=>1,'炭'=>1,'𠔥'=>1,'煅'=>1,'ð¯¤'=>1,'熜'=>1,'𤎫'=>1,'爨'=>1,'爵'=>1,'牐'=>1,'𤘈'=>1,'犀'=>1,'犕'=>1,'𤜵'=>1,'𤠔'=>1,'獺'=>1,'王'=>1,'㺬'=>1,'玥'=>1,'㺸'=>1,'㺸'=>1,'瑇'=>1,'瑜'=>1,'瑱'=>1,'璅'=>1,'瓊'=>1,'㼛'=>1,'甤'=>1,'𤰶'=>1,'甾'=>1,'𤲒'=>1,'異'=>1,'𢆟'=>1,'瘐'=>1,'𤾡'=>1,'𤾸'=>1,'𥁄'=>1,'㿼'=>1,'䀈'=>1,'直'=>1,'ð¯¥'=>1,'𥃲'=>1,'𥄙'=>1,'𥄳'=>1,'眞'=>1,'真'=>1,'真'=>1,'睊'=>1,'䀹'=>1,'瞋'=>1,'䁆'=>1,'䂖'=>1,'ð¯¥'=>1,'硎'=>1,'ð¯¥'=>1,'ð¯¥'=>1,'䃣'=>1,'𥘦'=>1,'祖'=>1,'𥚚'=>1,'𥛅'=>1,'福'=>1,'秫'=>1,'䄯'=>1,'穀'=>1,'穊'=>1,'穏'=>1,'𥥼'=>1,'ð¯¥'=>1,'𥪧'=>1,'竮'=>1,'䈂'=>1,'𥮫'=>1,'篆'=>1,'築'=>1,'䈧'=>1,'𥲀'=>1,'糒'=>1,'䊠'=>1,'糨'=>1,'糣'=>1,'紀'=>1,'𥾆'=>1,'絣'=>1,'䌁'=>1,'緇'=>1,'縂'=>1,'繅'=>1,'䌴'=>1,'𦈨'=>1,'𦉇'=>1,'䍙'=>1,'𦋙'=>1,'罺'=>1,'𦌾'=>1,'羕'=>1,'翺'=>1,'者'=>1,'𦓚'=>1,'𦔣'=>1,'聠'=>1,'𦖨'=>1,'聰'=>1,'𣍟'=>1,'ð¯¦'=>1,'育'=>1,'脃'=>1,'䐋'=>1,'脾'=>1,'媵'=>1,'𦞧'=>1,'𦞵'=>1,'𣎓'=>1,'𣎜'=>1,'舁'=>1,'舄'=>1,'ð¯¦'=>1,'䑫'=>1,'ð¯¦'=>1,'ð¯¦'=>1,'芝'=>1,'劳'=>1,'花'=>1,'芳'=>1,'芽'=>1,'苦'=>1,'𦬼'=>1,'若'=>1,'茝'=>1,'荣'=>1,'莭'=>1,'茣'=>1,'ð¯¦'=>1,'菧'=>1,'著'=>1,'荓'=>1,'菊'=>1,'菌'=>1,'菜'=>1,'𦰶'=>1,'𦵫'=>1,'𦳕'=>1,'䔫'=>1,'蓱'=>1,'蓳'=>1,'蔖'=>1,'𧏊'=>1,'蕤'=>1,'𦼬'=>1,'䕝'=>1,'䕡'=>1,'𦾱'=>1,'𧃒'=>1,'䕫'=>1,'虐'=>1,'虜'=>1,'虧'=>1,'虩'=>1,'蚩'=>1,'蚈'=>1,'蜎'=>1,'蛢'=>1,'蝹'=>1,'蜨'=>1,'蝫'=>1,'螆'=>1,'䗗'=>1,'蟡'=>1,'ð¯§'=>1,'䗹'=>1,'衠'=>1,'衣'=>1,'𧙧'=>1,'裗'=>1,'裞'=>1,'䘵'=>1,'裺'=>1,'㒻'=>1,'𧢮'=>1,'𧥦'=>1,'ð¯§'=>1,'䛇'=>1,'ð¯§'=>1,'ð¯§'=>1,'變'=>1,'豕'=>1,'𧲨'=>1,'貫'=>1,'賁'=>1,'贛'=>1,'起'=>1,'𧼯'=>1,'𠠄'=>1,'跋'=>1,'趼'=>1,'跰'=>1,'ð¯§'=>1,'軔'=>1,'輸'=>1,'𨗒'=>1,'𨗭'=>1,'邔'=>1,'郱'=>1,'鄑'=>1,'𨜮'=>1,'鄛'=>1,'鈸'=>1,'鋗'=>1,'鋘'=>1,'鉼'=>1,'鏹'=>1,'鐕'=>1,'𨯺'=>1,'開'=>1,'䦕'=>1,'閷'=>1,'𨵷'=>1,'䧦'=>1,'雃'=>1,'嶲'=>1,'霣'=>1,'𩅅'=>1,'𩈚'=>1,'䩮'=>1,'䩶'=>1,'韠'=>1,'𩐊'=>1,'䪲'=>1,'𩒖'=>1,'頋'=>1,'頋'=>1,'頩'=>1,'ð¯¨'=>1,'飢'=>1,'䬳'=>1,'餩'=>1,'馧'=>1,'駂'=>1,'駾'=>1,'䯎'=>1,'𩬰'=>1,'鬒'=>1,'鱀'=>1,'鳽'=>1,'ð¯¨'=>1,'䳭'=>1,'ð¯¨'=>1,'ð¯¨'=>1,'䳸'=>1,'𪄅'=>1,'𪈎'=>1,'𪊑'=>1,'麻'=>1,'䵖'=>1,'黹'=>1,'黾'=>1,'鼅'=>1,'鼏'=>1,'鼖'=>1,'鼻'=>1,'ð¯¨'=>1,'Ì€'=>0,'Ì'=>0,'Ì‚'=>0,'̃'=>0,'Ì„'=>0,'̆'=>0,'̇'=>0,'̈'=>0,'̉'=>0,'ÌŠ'=>0,'Ì‹'=>0,'ÌŒ'=>0,'Ì'=>0,'Ì‘'=>0,'Ì“'=>0,'Ì”'=>0,'Ì›'=>0,'Ì£'=>0,'̤'=>0,'Ì¥'=>0,'̦'=>0,'̧'=>0,'̨'=>0,'Ì­'=>0,'Ì®'=>0,'̰'=>0,'̱'=>0,'̸'=>0,'Í‚'=>0,'Í…'=>0,'Ù“'=>0,'Ù”'=>0,'Ù•'=>0,'़'=>0,'া'=>0,'à§—'=>0,'ା'=>0,'à­–'=>0,'à­—'=>0,'ா'=>0,'ௗ'=>0,'à±–'=>0,'ೂ'=>0,'ೕ'=>0,'à³–'=>0,'à´¾'=>0,'ൗ'=>0,'à·Š'=>0,'à·'=>0,'à·Ÿ'=>0,'ီ'=>0,'á…¡'=>0,'á…¢'=>0,'á…£'=>0,'á…¤'=>0,'á…¥'=>0,'á…¦'=>0,'á…§'=>0,'á…¨'=>0,'á…©'=>0,'á…ª'=>0,'á…«'=>0,'á…¬'=>0,'á…­'=>0,'á…®'=>0,'á…¯'=>0,'á…°'=>0,'á…±'=>0,'á…²'=>0,'á…³'=>0,'á…´'=>0,'á…µ'=>0,'ᆨ'=>0,'ᆩ'=>0,'ᆪ'=>0,'ᆫ'=>0,'ᆬ'=>0,'ᆭ'=>0,'ᆮ'=>0,'ᆯ'=>0,'ᆰ'=>0,'ᆱ'=>0,'ᆲ'=>0,'ᆳ'=>0,'ᆴ'=>0,'ᆵ'=>0,'ᆶ'=>0,'ᆷ'=>0,'ᆸ'=>0,'ᆹ'=>0,'ᆺ'=>0,'ᆻ'=>0,'ᆼ'=>0,'ᆽ'=>0,'ᆾ'=>0,'ᆿ'=>0,'ᇀ'=>0,'á‡'=>0,'ᇂ'=>0,'ᬵ'=>0,'ã‚™'=>0,'゚'=>0); \ No newline at end of file diff --git a/phpBB/includes/utf/data/utf_nfkc_qc.php b/phpBB/includes/utf/data/utf_nfkc_qc.php deleted file mode 100644 index da9a8a0e89..0000000000 --- a/phpBB/includes/utf/data/utf_nfkc_qc.php +++ /dev/null @@ -1,2 +0,0 @@ -1,'¨'=>1,'ª'=>1,'¯'=>1,'²'=>1,'³'=>1,'´'=>1,'µ'=>1,'¸'=>1,'¹'=>1,'º'=>1,'¼'=>1,'½'=>1,'¾'=>1,'IJ'=>1,'ij'=>1,'Ä¿'=>1,'Å€'=>1,'ʼn'=>1,'Å¿'=>1,'Ç„'=>1,'Ç…'=>1,'dž'=>1,'LJ'=>1,'Lj'=>1,'lj'=>1,'ÇŠ'=>1,'Ç‹'=>1,'ÇŒ'=>1,'DZ'=>1,'Dz'=>1,'dz'=>1,'ʰ'=>1,'ʱ'=>1,'ʲ'=>1,'ʳ'=>1,'Ê´'=>1,'ʵ'=>1,'ʶ'=>1,'Ê·'=>1,'ʸ'=>1,'˘'=>1,'Ë™'=>1,'Ëš'=>1,'Ë›'=>1,'Ëœ'=>1,'Ë'=>1,'Ë '=>1,'Ë¡'=>1,'Ë¢'=>1,'Ë£'=>1,'ˤ'=>1,'Í€'=>1,'Í'=>1,'̓'=>1,'Í„'=>1,'Í´'=>1,'ͺ'=>1,';'=>1,'΄'=>1,'Î…'=>1,'·'=>1,'Ï'=>1,'Ï‘'=>1,'Ï’'=>1,'Ï“'=>1,'Ï”'=>1,'Ï•'=>1,'Ï–'=>1,'ϰ'=>1,'ϱ'=>1,'ϲ'=>1,'Ï´'=>1,'ϵ'=>1,'Ϲ'=>1,'Ö‡'=>1,'Ùµ'=>1,'Ù¶'=>1,'Ù·'=>1,'Ù¸'=>1,'क़'=>1,'ख़'=>1,'ग़'=>1,'ज़'=>1,'ड़'=>1,'à¥'=>1,'फ़'=>1,'य़'=>1,'à§œ'=>1,'à§'=>1,'à§Ÿ'=>1,'ਲ਼'=>1,'ਸ਼'=>1,'à©™'=>1,'ਗ਼'=>1,'à©›'=>1,'ਫ਼'=>1,'à­œ'=>1,'à­'=>1,'ำ'=>1,'ຳ'=>1,'ໜ'=>1,'à»'=>1,'༌'=>1,'གྷ'=>1,'à½'=>1,'དྷ'=>1,'བྷ'=>1,'ཛྷ'=>1,'ཀྵ'=>1,'ཱི'=>1,'ཱུ'=>1,'ྲྀ'=>1,'ཷ'=>1,'ླྀ'=>1,'ཹ'=>1,'à¾'=>1,'ྒྷ'=>1,'à¾'=>1,'ྡྷ'=>1,'ྦྷ'=>1,'ྫྷ'=>1,'ྐྵ'=>1,'ჼ'=>1,'á´¬'=>1,'á´­'=>1,'á´®'=>1,'á´°'=>1,'á´±'=>1,'á´²'=>1,'á´³'=>1,'á´´'=>1,'á´µ'=>1,'á´¶'=>1,'á´·'=>1,'á´¸'=>1,'á´¹'=>1,'á´º'=>1,'á´¼'=>1,'á´½'=>1,'á´¾'=>1,'á´¿'=>1,'áµ€'=>1,'áµ'=>1,'ᵂ'=>1,'ᵃ'=>1,'ᵄ'=>1,'áµ…'=>1,'ᵆ'=>1,'ᵇ'=>1,'ᵈ'=>1,'ᵉ'=>1,'ᵊ'=>1,'ᵋ'=>1,'ᵌ'=>1,'áµ'=>1,'áµ'=>1,'áµ'=>1,'ᵑ'=>1,'áµ’'=>1,'ᵓ'=>1,'áµ”'=>1,'ᵕ'=>1,'áµ–'=>1,'áµ—'=>1,'ᵘ'=>1,'áµ™'=>1,'ᵚ'=>1,'áµ›'=>1,'ᵜ'=>1,'áµ'=>1,'ᵞ'=>1,'ᵟ'=>1,'áµ '=>1,'ᵡ'=>1,'áµ¢'=>1,'áµ£'=>1,'ᵤ'=>1,'áµ¥'=>1,'ᵦ'=>1,'áµ§'=>1,'ᵨ'=>1,'ᵩ'=>1,'ᵪ'=>1,'ᵸ'=>1,'á¶›'=>1,'á¶œ'=>1,'á¶'=>1,'á¶ž'=>1,'á¶Ÿ'=>1,'á¶ '=>1,'á¶¡'=>1,'á¶¢'=>1,'á¶£'=>1,'ᶤ'=>1,'á¶¥'=>1,'ᶦ'=>1,'á¶§'=>1,'ᶨ'=>1,'á¶©'=>1,'ᶪ'=>1,'á¶«'=>1,'ᶬ'=>1,'á¶­'=>1,'á¶®'=>1,'ᶯ'=>1,'á¶°'=>1,'á¶±'=>1,'á¶²'=>1,'á¶³'=>1,'á¶´'=>1,'á¶µ'=>1,'á¶¶'=>1,'á¶·'=>1,'ᶸ'=>1,'á¶¹'=>1,'ᶺ'=>1,'á¶»'=>1,'á¶¼'=>1,'á¶½'=>1,'á¶¾'=>1,'á¶¿'=>1,'ẚ'=>1,'ẛ'=>1,'á½±'=>1,'á½³'=>1,'á½µ'=>1,'á½·'=>1,'á½¹'=>1,'á½»'=>1,'á½½'=>1,'á¾»'=>1,'á¾½'=>1,'á¾¾'=>1,'᾿'=>1,'á¿€'=>1,'á¿'=>1,'Έ'=>1,'á¿‹'=>1,'á¿'=>1,'῎'=>1,'á¿'=>1,'á¿“'=>1,'á¿›'=>1,'á¿'=>1,'῞'=>1,'῟'=>1,'á¿£'=>1,'á¿«'=>1,'á¿­'=>1,'á¿®'=>1,'`'=>1,'Ό'=>1,'á¿»'=>1,'´'=>1,'῾'=>1,' '=>1,'â€'=>1,' '=>1,' '=>1,' '=>1,' '=>1,' '=>1,' '=>1,' '=>1,' '=>1,' '=>1,'‑'=>1,'‗'=>1,'․'=>1,'‥'=>1,'…'=>1,' '=>1,'″'=>1,'‴'=>1,'‶'=>1,'‷'=>1,'‼'=>1,'‾'=>1,'â‡'=>1,'âˆ'=>1,'â‰'=>1,'â—'=>1,'âŸ'=>1,'â°'=>1,'â±'=>1,'â´'=>1,'âµ'=>1,'â¶'=>1,'â·'=>1,'â¸'=>1,'â¹'=>1,'âº'=>1,'â»'=>1,'â¼'=>1,'â½'=>1,'â¾'=>1,'â¿'=>1,'â‚€'=>1,'â‚'=>1,'â‚‚'=>1,'₃'=>1,'â‚„'=>1,'â‚…'=>1,'₆'=>1,'₇'=>1,'₈'=>1,'₉'=>1,'₊'=>1,'â‚‹'=>1,'₌'=>1,'â‚'=>1,'₎'=>1,'â‚'=>1,'â‚‘'=>1,'â‚’'=>1,'â‚“'=>1,'â‚”'=>1,'₨'=>1,'â„€'=>1,'â„'=>1,'â„‚'=>1,'℃'=>1,'â„…'=>1,'℆'=>1,'ℇ'=>1,'℉'=>1,'ℊ'=>1,'â„‹'=>1,'ℌ'=>1,'â„'=>1,'ℎ'=>1,'â„'=>1,'â„'=>1,'â„‘'=>1,'â„’'=>1,'â„“'=>1,'â„•'=>1,'â„–'=>1,'â„™'=>1,'ℚ'=>1,'â„›'=>1,'ℜ'=>1,'â„'=>1,'â„ '=>1,'â„¡'=>1,'â„¢'=>1,'ℤ'=>1,'Ω'=>1,'ℨ'=>1,'K'=>1,'â„«'=>1,'ℬ'=>1,'â„­'=>1,'ℯ'=>1,'â„°'=>1,'ℱ'=>1,'ℳ'=>1,'â„´'=>1,'ℵ'=>1,'â„¶'=>1,'â„·'=>1,'ℸ'=>1,'ℹ'=>1,'â„»'=>1,'ℼ'=>1,'ℽ'=>1,'ℾ'=>1,'â„¿'=>1,'â…€'=>1,'â……'=>1,'â…†'=>1,'â…‡'=>1,'â…ˆ'=>1,'â…‰'=>1,'â…“'=>1,'â…”'=>1,'â…•'=>1,'â…–'=>1,'â…—'=>1,'â…˜'=>1,'â…™'=>1,'â…š'=>1,'â…›'=>1,'â…œ'=>1,'â…'=>1,'â…ž'=>1,'â…Ÿ'=>1,'â… '=>1,'â…¡'=>1,'â…¢'=>1,'â…£'=>1,'â…¤'=>1,'â…¥'=>1,'â…¦'=>1,'â…§'=>1,'â…¨'=>1,'â…©'=>1,'â…ª'=>1,'â…«'=>1,'â…¬'=>1,'â…­'=>1,'â…®'=>1,'â…¯'=>1,'â…°'=>1,'â…±'=>1,'â…²'=>1,'â…³'=>1,'â…´'=>1,'â…µ'=>1,'â…¶'=>1,'â…·'=>1,'â…¸'=>1,'â…¹'=>1,'â…º'=>1,'â…»'=>1,'â…¼'=>1,'â…½'=>1,'â…¾'=>1,'â…¿'=>1,'∬'=>1,'∭'=>1,'∯'=>1,'∰'=>1,'〈'=>1,'〉'=>1,'â‘ '=>1,'â‘¡'=>1,'â‘¢'=>1,'â‘£'=>1,'⑤'=>1,'â‘¥'=>1,'⑦'=>1,'â‘§'=>1,'⑨'=>1,'â‘©'=>1,'⑪'=>1,'â‘«'=>1,'⑬'=>1,'â‘­'=>1,'â‘®'=>1,'⑯'=>1,'â‘°'=>1,'⑱'=>1,'⑲'=>1,'⑳'=>1,'â‘´'=>1,'⑵'=>1,'â‘¶'=>1,'â‘·'=>1,'⑸'=>1,'⑹'=>1,'⑺'=>1,'â‘»'=>1,'⑼'=>1,'⑽'=>1,'⑾'=>1,'â‘¿'=>1,'â’€'=>1,'â’'=>1,'â’‚'=>1,'â’ƒ'=>1,'â’„'=>1,'â’…'=>1,'â’†'=>1,'â’‡'=>1,'â’ˆ'=>1,'â’‰'=>1,'â’Š'=>1,'â’‹'=>1,'â’Œ'=>1,'â’'=>1,'â’Ž'=>1,'â’'=>1,'â’'=>1,'â’‘'=>1,'â’’'=>1,'â’“'=>1,'â’”'=>1,'â’•'=>1,'â’–'=>1,'â’—'=>1,'â’˜'=>1,'â’™'=>1,'â’š'=>1,'â’›'=>1,'â’œ'=>1,'â’'=>1,'â’ž'=>1,'â’Ÿ'=>1,'â’ '=>1,'â’¡'=>1,'â’¢'=>1,'â’£'=>1,'â’¤'=>1,'â’¥'=>1,'â’¦'=>1,'â’§'=>1,'â’¨'=>1,'â’©'=>1,'â’ª'=>1,'â’«'=>1,'â’¬'=>1,'â’­'=>1,'â’®'=>1,'â’¯'=>1,'â’°'=>1,'â’±'=>1,'â’²'=>1,'â’³'=>1,'â’´'=>1,'â’µ'=>1,'â’¶'=>1,'â’·'=>1,'â’¸'=>1,'â’¹'=>1,'â’º'=>1,'â’»'=>1,'â’¼'=>1,'â’½'=>1,'â’¾'=>1,'â’¿'=>1,'â“€'=>1,'â“'=>1,'â“‚'=>1,'Ⓝ'=>1,'â“„'=>1,'â“…'=>1,'Ⓠ'=>1,'Ⓡ'=>1,'Ⓢ'=>1,'Ⓣ'=>1,'Ⓤ'=>1,'â“‹'=>1,'Ⓦ'=>1,'â“'=>1,'Ⓨ'=>1,'â“'=>1,'â“'=>1,'â“‘'=>1,'â“’'=>1,'â““'=>1,'â“”'=>1,'â“•'=>1,'â“–'=>1,'â“—'=>1,'ⓘ'=>1,'â“™'=>1,'ⓚ'=>1,'â“›'=>1,'ⓜ'=>1,'â“'=>1,'ⓞ'=>1,'ⓟ'=>1,'â“ '=>1,'â“¡'=>1,'â“¢'=>1,'â“£'=>1,'ⓤ'=>1,'â“¥'=>1,'ⓦ'=>1,'â“§'=>1,'ⓨ'=>1,'â“©'=>1,'⓪'=>1,'⨌'=>1,'â©´'=>1,'⩵'=>1,'â©¶'=>1,'⫝̸'=>1,'ⵯ'=>1,'⺟'=>1,'⻳'=>1,'â¼€'=>1,'â¼'=>1,'⼂'=>1,'⼃'=>1,'⼄'=>1,'â¼…'=>1,'⼆'=>1,'⼇'=>1,'⼈'=>1,'⼉'=>1,'⼊'=>1,'⼋'=>1,'⼌'=>1,'â¼'=>1,'⼎'=>1,'â¼'=>1,'â¼'=>1,'⼑'=>1,'â¼’'=>1,'⼓'=>1,'â¼”'=>1,'⼕'=>1,'â¼–'=>1,'â¼—'=>1,'⼘'=>1,'â¼™'=>1,'⼚'=>1,'â¼›'=>1,'⼜'=>1,'â¼'=>1,'⼞'=>1,'⼟'=>1,'â¼ '=>1,'⼡'=>1,'â¼¢'=>1,'â¼£'=>1,'⼤'=>1,'â¼¥'=>1,'⼦'=>1,'â¼§'=>1,'⼨'=>1,'⼩'=>1,'⼪'=>1,'⼫'=>1,'⼬'=>1,'â¼­'=>1,'â¼®'=>1,'⼯'=>1,'â¼°'=>1,'â¼±'=>1,'â¼²'=>1,'â¼³'=>1,'â¼´'=>1,'â¼µ'=>1,'â¼¶'=>1,'â¼·'=>1,'⼸'=>1,'â¼¹'=>1,'⼺'=>1,'â¼»'=>1,'â¼¼'=>1,'â¼½'=>1,'â¼¾'=>1,'⼿'=>1,'â½€'=>1,'â½'=>1,'⽂'=>1,'⽃'=>1,'⽄'=>1,'â½…'=>1,'⽆'=>1,'⽇'=>1,'⽈'=>1,'⽉'=>1,'⽊'=>1,'⽋'=>1,'⽌'=>1,'â½'=>1,'⽎'=>1,'â½'=>1,'â½'=>1,'⽑'=>1,'â½’'=>1,'⽓'=>1,'â½”'=>1,'⽕'=>1,'â½–'=>1,'â½—'=>1,'⽘'=>1,'â½™'=>1,'⽚'=>1,'â½›'=>1,'⽜'=>1,'â½'=>1,'⽞'=>1,'⽟'=>1,'â½ '=>1,'⽡'=>1,'â½¢'=>1,'â½£'=>1,'⽤'=>1,'â½¥'=>1,'⽦'=>1,'â½§'=>1,'⽨'=>1,'⽩'=>1,'⽪'=>1,'⽫'=>1,'⽬'=>1,'â½­'=>1,'â½®'=>1,'⽯'=>1,'â½°'=>1,'â½±'=>1,'â½²'=>1,'â½³'=>1,'â½´'=>1,'â½µ'=>1,'â½¶'=>1,'â½·'=>1,'⽸'=>1,'â½¹'=>1,'⽺'=>1,'â½»'=>1,'â½¼'=>1,'â½½'=>1,'â½¾'=>1,'⽿'=>1,'â¾€'=>1,'â¾'=>1,'⾂'=>1,'⾃'=>1,'⾄'=>1,'â¾…'=>1,'⾆'=>1,'⾇'=>1,'⾈'=>1,'⾉'=>1,'⾊'=>1,'⾋'=>1,'⾌'=>1,'â¾'=>1,'⾎'=>1,'â¾'=>1,'â¾'=>1,'⾑'=>1,'â¾’'=>1,'⾓'=>1,'â¾”'=>1,'⾕'=>1,'â¾–'=>1,'â¾—'=>1,'⾘'=>1,'â¾™'=>1,'⾚'=>1,'â¾›'=>1,'⾜'=>1,'â¾'=>1,'⾞'=>1,'⾟'=>1,'â¾ '=>1,'⾡'=>1,'â¾¢'=>1,'â¾£'=>1,'⾤'=>1,'â¾¥'=>1,'⾦'=>1,'â¾§'=>1,'⾨'=>1,'⾩'=>1,'⾪'=>1,'⾫'=>1,'⾬'=>1,'â¾­'=>1,'â¾®'=>1,'⾯'=>1,'â¾°'=>1,'â¾±'=>1,'â¾²'=>1,'â¾³'=>1,'â¾´'=>1,'â¾µ'=>1,'â¾¶'=>1,'â¾·'=>1,'⾸'=>1,'â¾¹'=>1,'⾺'=>1,'â¾»'=>1,'â¾¼'=>1,'â¾½'=>1,'â¾¾'=>1,'⾿'=>1,'â¿€'=>1,'â¿'=>1,'â¿‚'=>1,'⿃'=>1,'â¿„'=>1,'â¿…'=>1,'⿆'=>1,'⿇'=>1,'⿈'=>1,'⿉'=>1,'⿊'=>1,'â¿‹'=>1,'⿌'=>1,'â¿'=>1,'⿎'=>1,'â¿'=>1,'â¿'=>1,'â¿‘'=>1,'â¿’'=>1,'â¿“'=>1,'â¿”'=>1,'â¿•'=>1,' '=>1,'〶'=>1,'〸'=>1,'〹'=>1,'〺'=>1,'ã‚›'=>1,'゜'=>1,'ゟ'=>1,'ヿ'=>1,'ㄱ'=>1,'ㄲ'=>1,'ㄳ'=>1,'ã„´'=>1,'ㄵ'=>1,'ã„¶'=>1,'ã„·'=>1,'ㄸ'=>1,'ㄹ'=>1,'ㄺ'=>1,'ã„»'=>1,'ㄼ'=>1,'ㄽ'=>1,'ㄾ'=>1,'ã„¿'=>1,'ã…€'=>1,'ã…'=>1,'ã…‚'=>1,'ã…ƒ'=>1,'ã…„'=>1,'ã……'=>1,'ã…†'=>1,'ã…‡'=>1,'ã…ˆ'=>1,'ã…‰'=>1,'ã…Š'=>1,'ã…‹'=>1,'ã…Œ'=>1,'ã…'=>1,'ã…Ž'=>1,'ã…'=>1,'ã…'=>1,'ã…‘'=>1,'ã…’'=>1,'ã…“'=>1,'ã…”'=>1,'ã…•'=>1,'ã…–'=>1,'ã…—'=>1,'ã…˜'=>1,'ã…™'=>1,'ã…š'=>1,'ã…›'=>1,'ã…œ'=>1,'ã…'=>1,'ã…ž'=>1,'ã…Ÿ'=>1,'ã… '=>1,'ã…¡'=>1,'ã…¢'=>1,'ã…£'=>1,'ã…¤'=>1,'ã…¥'=>1,'ã…¦'=>1,'ã…§'=>1,'ã…¨'=>1,'ã…©'=>1,'ã…ª'=>1,'ã…«'=>1,'ã…¬'=>1,'ã…­'=>1,'ã…®'=>1,'ã…¯'=>1,'ã…°'=>1,'ã…±'=>1,'ã…²'=>1,'ã…³'=>1,'ã…´'=>1,'ã…µ'=>1,'ã…¶'=>1,'ã…·'=>1,'ã…¸'=>1,'ã…¹'=>1,'ã…º'=>1,'ã…»'=>1,'ã…¼'=>1,'ã…½'=>1,'ã…¾'=>1,'ã…¿'=>1,'ㆀ'=>1,'ã†'=>1,'ㆂ'=>1,'ㆃ'=>1,'ㆄ'=>1,'ㆅ'=>1,'ㆆ'=>1,'ㆇ'=>1,'ㆈ'=>1,'ㆉ'=>1,'ㆊ'=>1,'ㆋ'=>1,'ㆌ'=>1,'ã†'=>1,'ㆎ'=>1,'㆒'=>1,'㆓'=>1,'㆔'=>1,'㆕'=>1,'㆖'=>1,'㆗'=>1,'㆘'=>1,'㆙'=>1,'㆚'=>1,'㆛'=>1,'㆜'=>1,'ã†'=>1,'㆞'=>1,'㆟'=>1,'㈀'=>1,'ãˆ'=>1,'㈂'=>1,'㈃'=>1,'㈄'=>1,'㈅'=>1,'㈆'=>1,'㈇'=>1,'㈈'=>1,'㈉'=>1,'㈊'=>1,'㈋'=>1,'㈌'=>1,'ãˆ'=>1,'㈎'=>1,'ãˆ'=>1,'ãˆ'=>1,'㈑'=>1,'㈒'=>1,'㈓'=>1,'㈔'=>1,'㈕'=>1,'㈖'=>1,'㈗'=>1,'㈘'=>1,'㈙'=>1,'㈚'=>1,'㈛'=>1,'㈜'=>1,'ãˆ'=>1,'㈞'=>1,'㈠'=>1,'㈡'=>1,'㈢'=>1,'㈣'=>1,'㈤'=>1,'㈥'=>1,'㈦'=>1,'㈧'=>1,'㈨'=>1,'㈩'=>1,'㈪'=>1,'㈫'=>1,'㈬'=>1,'㈭'=>1,'㈮'=>1,'㈯'=>1,'㈰'=>1,'㈱'=>1,'㈲'=>1,'㈳'=>1,'㈴'=>1,'㈵'=>1,'㈶'=>1,'㈷'=>1,'㈸'=>1,'㈹'=>1,'㈺'=>1,'㈻'=>1,'㈼'=>1,'㈽'=>1,'㈾'=>1,'㈿'=>1,'㉀'=>1,'ã‰'=>1,'㉂'=>1,'㉃'=>1,'ã‰'=>1,'㉑'=>1,'㉒'=>1,'㉓'=>1,'㉔'=>1,'㉕'=>1,'㉖'=>1,'㉗'=>1,'㉘'=>1,'㉙'=>1,'㉚'=>1,'㉛'=>1,'㉜'=>1,'ã‰'=>1,'㉞'=>1,'㉟'=>1,'㉠'=>1,'㉡'=>1,'㉢'=>1,'㉣'=>1,'㉤'=>1,'㉥'=>1,'㉦'=>1,'㉧'=>1,'㉨'=>1,'㉩'=>1,'㉪'=>1,'㉫'=>1,'㉬'=>1,'㉭'=>1,'㉮'=>1,'㉯'=>1,'㉰'=>1,'㉱'=>1,'㉲'=>1,'㉳'=>1,'㉴'=>1,'㉵'=>1,'㉶'=>1,'㉷'=>1,'㉸'=>1,'㉹'=>1,'㉺'=>1,'㉻'=>1,'㉼'=>1,'㉽'=>1,'㉾'=>1,'㊀'=>1,'ãŠ'=>1,'㊂'=>1,'㊃'=>1,'㊄'=>1,'㊅'=>1,'㊆'=>1,'㊇'=>1,'㊈'=>1,'㊉'=>1,'㊊'=>1,'㊋'=>1,'㊌'=>1,'ãŠ'=>1,'㊎'=>1,'ãŠ'=>1,'ãŠ'=>1,'㊑'=>1,'㊒'=>1,'㊓'=>1,'㊔'=>1,'㊕'=>1,'㊖'=>1,'㊗'=>1,'㊘'=>1,'㊙'=>1,'㊚'=>1,'㊛'=>1,'㊜'=>1,'ãŠ'=>1,'㊞'=>1,'㊟'=>1,'㊠'=>1,'㊡'=>1,'㊢'=>1,'㊣'=>1,'㊤'=>1,'㊥'=>1,'㊦'=>1,'㊧'=>1,'㊨'=>1,'㊩'=>1,'㊪'=>1,'㊫'=>1,'㊬'=>1,'㊭'=>1,'㊮'=>1,'㊯'=>1,'㊰'=>1,'㊱'=>1,'㊲'=>1,'㊳'=>1,'㊴'=>1,'㊵'=>1,'㊶'=>1,'㊷'=>1,'㊸'=>1,'㊹'=>1,'㊺'=>1,'㊻'=>1,'㊼'=>1,'㊽'=>1,'㊾'=>1,'㊿'=>1,'ã‹€'=>1,'ã‹'=>1,'ã‹‚'=>1,'㋃'=>1,'ã‹„'=>1,'ã‹…'=>1,'㋆'=>1,'㋇'=>1,'㋈'=>1,'㋉'=>1,'㋊'=>1,'ã‹‹'=>1,'㋌'=>1,'ã‹'=>1,'㋎'=>1,'ã‹'=>1,'ã‹'=>1,'ã‹‘'=>1,'ã‹’'=>1,'ã‹“'=>1,'ã‹”'=>1,'ã‹•'=>1,'ã‹–'=>1,'ã‹—'=>1,'㋘'=>1,'ã‹™'=>1,'㋚'=>1,'ã‹›'=>1,'㋜'=>1,'ã‹'=>1,'㋞'=>1,'㋟'=>1,'ã‹ '=>1,'ã‹¡'=>1,'ã‹¢'=>1,'ã‹£'=>1,'㋤'=>1,'ã‹¥'=>1,'㋦'=>1,'ã‹§'=>1,'㋨'=>1,'ã‹©'=>1,'㋪'=>1,'ã‹«'=>1,'㋬'=>1,'ã‹­'=>1,'ã‹®'=>1,'㋯'=>1,'ã‹°'=>1,'㋱'=>1,'㋲'=>1,'㋳'=>1,'ã‹´'=>1,'㋵'=>1,'ã‹¶'=>1,'ã‹·'=>1,'㋸'=>1,'㋹'=>1,'㋺'=>1,'ã‹»'=>1,'㋼'=>1,'㋽'=>1,'㋾'=>1,'㌀'=>1,'ãŒ'=>1,'㌂'=>1,'㌃'=>1,'㌄'=>1,'㌅'=>1,'㌆'=>1,'㌇'=>1,'㌈'=>1,'㌉'=>1,'㌊'=>1,'㌋'=>1,'㌌'=>1,'ãŒ'=>1,'㌎'=>1,'ãŒ'=>1,'ãŒ'=>1,'㌑'=>1,'㌒'=>1,'㌓'=>1,'㌔'=>1,'㌕'=>1,'㌖'=>1,'㌗'=>1,'㌘'=>1,'㌙'=>1,'㌚'=>1,'㌛'=>1,'㌜'=>1,'ãŒ'=>1,'㌞'=>1,'㌟'=>1,'㌠'=>1,'㌡'=>1,'㌢'=>1,'㌣'=>1,'㌤'=>1,'㌥'=>1,'㌦'=>1,'㌧'=>1,'㌨'=>1,'㌩'=>1,'㌪'=>1,'㌫'=>1,'㌬'=>1,'㌭'=>1,'㌮'=>1,'㌯'=>1,'㌰'=>1,'㌱'=>1,'㌲'=>1,'㌳'=>1,'㌴'=>1,'㌵'=>1,'㌶'=>1,'㌷'=>1,'㌸'=>1,'㌹'=>1,'㌺'=>1,'㌻'=>1,'㌼'=>1,'㌽'=>1,'㌾'=>1,'㌿'=>1,'ã€'=>1,'ã'=>1,'ã‚'=>1,'ãƒ'=>1,'ã„'=>1,'ã…'=>1,'ã†'=>1,'ã‡'=>1,'ãˆ'=>1,'ã‰'=>1,'ãŠ'=>1,'ã‹'=>1,'ãŒ'=>1,'ã'=>1,'ãŽ'=>1,'ã'=>1,'ã'=>1,'ã‘'=>1,'ã’'=>1,'ã“'=>1,'ã”'=>1,'ã•'=>1,'ã–'=>1,'ã—'=>1,'ã˜'=>1,'ã™'=>1,'ãš'=>1,'ã›'=>1,'ãœ'=>1,'ã'=>1,'ãž'=>1,'ãŸ'=>1,'ã '=>1,'ã¡'=>1,'ã¢'=>1,'ã£'=>1,'ã¤'=>1,'ã¥'=>1,'ã¦'=>1,'ã§'=>1,'ã¨'=>1,'ã©'=>1,'ãª'=>1,'ã«'=>1,'ã¬'=>1,'ã­'=>1,'ã®'=>1,'ã¯'=>1,'ã°'=>1,'ã±'=>1,'ã²'=>1,'ã³'=>1,'ã´'=>1,'ãµ'=>1,'ã¶'=>1,'ã·'=>1,'ã¸'=>1,'ã¹'=>1,'ãº'=>1,'ã»'=>1,'ã¼'=>1,'ã½'=>1,'ã¾'=>1,'ã¿'=>1,'㎀'=>1,'ãŽ'=>1,'㎂'=>1,'㎃'=>1,'㎄'=>1,'㎅'=>1,'㎆'=>1,'㎇'=>1,'㎈'=>1,'㎉'=>1,'㎊'=>1,'㎋'=>1,'㎌'=>1,'ãŽ'=>1,'㎎'=>1,'ãŽ'=>1,'ãŽ'=>1,'㎑'=>1,'㎒'=>1,'㎓'=>1,'㎔'=>1,'㎕'=>1,'㎖'=>1,'㎗'=>1,'㎘'=>1,'㎙'=>1,'㎚'=>1,'㎛'=>1,'㎜'=>1,'ãŽ'=>1,'㎞'=>1,'㎟'=>1,'㎠'=>1,'㎡'=>1,'㎢'=>1,'㎣'=>1,'㎤'=>1,'㎥'=>1,'㎦'=>1,'㎧'=>1,'㎨'=>1,'㎩'=>1,'㎪'=>1,'㎫'=>1,'㎬'=>1,'㎭'=>1,'㎮'=>1,'㎯'=>1,'㎰'=>1,'㎱'=>1,'㎲'=>1,'㎳'=>1,'㎴'=>1,'㎵'=>1,'㎶'=>1,'㎷'=>1,'㎸'=>1,'㎹'=>1,'㎺'=>1,'㎻'=>1,'㎼'=>1,'㎽'=>1,'㎾'=>1,'㎿'=>1,'ã€'=>1,'ã'=>1,'ã‚'=>1,'ãƒ'=>1,'ã„'=>1,'ã…'=>1,'ã†'=>1,'ã‡'=>1,'ãˆ'=>1,'ã‰'=>1,'ãŠ'=>1,'ã‹'=>1,'ãŒ'=>1,'ã'=>1,'ãŽ'=>1,'ã'=>1,'ã'=>1,'ã‘'=>1,'ã’'=>1,'ã“'=>1,'ã”'=>1,'ã•'=>1,'ã–'=>1,'ã—'=>1,'ã˜'=>1,'ã™'=>1,'ãš'=>1,'ã›'=>1,'ãœ'=>1,'ã'=>1,'ãž'=>1,'ãŸ'=>1,'ã '=>1,'ã¡'=>1,'ã¢'=>1,'ã£'=>1,'ã¤'=>1,'ã¥'=>1,'ã¦'=>1,'ã§'=>1,'ã¨'=>1,'ã©'=>1,'ãª'=>1,'ã«'=>1,'ã¬'=>1,'ã­'=>1,'ã®'=>1,'ã¯'=>1,'ã°'=>1,'ã±'=>1,'ã²'=>1,'ã³'=>1,'ã´'=>1,'ãµ'=>1,'ã¶'=>1,'ã·'=>1,'ã¸'=>1,'ã¹'=>1,'ãº'=>1,'ã»'=>1,'ã¼'=>1,'ã½'=>1,'ã¾'=>1,'ã¿'=>1,'豈'=>1,'ï¤'=>1,'車'=>1,'賈'=>1,'滑'=>1,'串'=>1,'句'=>1,'龜'=>1,'龜'=>1,'契'=>1,'金'=>1,'喇'=>1,'奈'=>1,'ï¤'=>1,'癩'=>1,'ï¤'=>1,'ï¤'=>1,'螺'=>1,'裸'=>1,'邏'=>1,'樂'=>1,'洛'=>1,'烙'=>1,'珞'=>1,'落'=>1,'酪'=>1,'駱'=>1,'亂'=>1,'卵'=>1,'ï¤'=>1,'爛'=>1,'蘭'=>1,'鸞'=>1,'嵐'=>1,'濫'=>1,'藍'=>1,'襤'=>1,'拉'=>1,'臘'=>1,'蠟'=>1,'廊'=>1,'朗'=>1,'浪'=>1,'狼'=>1,'郎'=>1,'來'=>1,'冷'=>1,'勞'=>1,'擄'=>1,'櫓'=>1,'爐'=>1,'盧'=>1,'老'=>1,'蘆'=>1,'虜'=>1,'路'=>1,'露'=>1,'魯'=>1,'鷺'=>1,'碌'=>1,'祿'=>1,'綠'=>1,'菉'=>1,'錄'=>1,'鹿'=>1,'ï¥'=>1,'壟'=>1,'弄'=>1,'籠'=>1,'聾'=>1,'牢'=>1,'磊'=>1,'賂'=>1,'雷'=>1,'壘'=>1,'屢'=>1,'樓'=>1,'ï¥'=>1,'漏'=>1,'ï¥'=>1,'ï¥'=>1,'陋'=>1,'勒'=>1,'肋'=>1,'凜'=>1,'凌'=>1,'稜'=>1,'綾'=>1,'菱'=>1,'陵'=>1,'讀'=>1,'拏'=>1,'樂'=>1,'ï¥'=>1,'丹'=>1,'寧'=>1,'怒'=>1,'率'=>1,'異'=>1,'北'=>1,'磻'=>1,'便'=>1,'復'=>1,'不'=>1,'泌'=>1,'數'=>1,'索'=>1,'參'=>1,'塞'=>1,'省'=>1,'葉'=>1,'說'=>1,'殺'=>1,'辰'=>1,'沈'=>1,'拾'=>1,'若'=>1,'掠'=>1,'略'=>1,'亮'=>1,'兩'=>1,'凉'=>1,'梁'=>1,'糧'=>1,'良'=>1,'諒'=>1,'量'=>1,'勵'=>1,'呂'=>1,'ï¦'=>1,'廬'=>1,'旅'=>1,'濾'=>1,'礪'=>1,'閭'=>1,'驪'=>1,'麗'=>1,'黎'=>1,'力'=>1,'曆'=>1,'歷'=>1,'ï¦'=>1,'年'=>1,'ï¦'=>1,'ï¦'=>1,'撚'=>1,'漣'=>1,'煉'=>1,'璉'=>1,'秊'=>1,'練'=>1,'聯'=>1,'輦'=>1,'蓮'=>1,'連'=>1,'鍊'=>1,'列'=>1,'ï¦'=>1,'咽'=>1,'烈'=>1,'裂'=>1,'說'=>1,'廉'=>1,'念'=>1,'捻'=>1,'殮'=>1,'簾'=>1,'獵'=>1,'令'=>1,'囹'=>1,'寧'=>1,'嶺'=>1,'怜'=>1,'玲'=>1,'瑩'=>1,'羚'=>1,'聆'=>1,'鈴'=>1,'零'=>1,'靈'=>1,'領'=>1,'例'=>1,'禮'=>1,'醴'=>1,'隸'=>1,'惡'=>1,'了'=>1,'僚'=>1,'寮'=>1,'尿'=>1,'料'=>1,'樂'=>1,'ï§€'=>1,'ï§'=>1,'ï§‚'=>1,'遼'=>1,'ï§„'=>1,'ï§…'=>1,'阮'=>1,'劉'=>1,'杻'=>1,'柳'=>1,'ï§Š'=>1,'ï§‹'=>1,'ï§Œ'=>1,'ï§'=>1,'ï§Ž'=>1,'ï§'=>1,'ï§'=>1,'ï§‘'=>1,'ï§’'=>1,'ï§“'=>1,'ï§”'=>1,'ï§•'=>1,'ï§–'=>1,'ï§—'=>1,'律'=>1,'ï§™'=>1,'ï§š'=>1,'ï§›'=>1,'ï§œ'=>1,'ï§'=>1,'ï§ž'=>1,'ï§Ÿ'=>1,'ï§ '=>1,'ï§¡'=>1,'ï§¢'=>1,'ï§£'=>1,'理'=>1,'ï§¥'=>1,'罹'=>1,'ï§§'=>1,'裡'=>1,'ï§©'=>1,'離'=>1,'ï§«'=>1,'溺'=>1,'ï§­'=>1,'ï§®'=>1,'璘'=>1,'ï§°'=>1,'ï§±'=>1,'ï§²'=>1,'ï§³'=>1,'ï§´'=>1,'ï§µ'=>1,'ï§¶'=>1,'ï§·'=>1,'笠'=>1,'ï§¹'=>1,'狀'=>1,'ï§»'=>1,'ï§¼'=>1,'ï§½'=>1,'ï§¾'=>1,'ï§¿'=>1,'切'=>1,'ï¨'=>1,'拓'=>1,'糖'=>1,'宅'=>1,'洞'=>1,'暴'=>1,'輻'=>1,'行'=>1,'降'=>1,'見'=>1,'廓'=>1,'兀'=>1,'ï¨'=>1,'ï¨'=>1,'晴'=>1,'凞'=>1,'猪'=>1,'益'=>1,'礼'=>1,'神'=>1,'祥'=>1,'福'=>1,'靖'=>1,'ï¨'=>1,'羽'=>1,'蘒'=>1,'諸'=>1,'逸'=>1,'都'=>1,'飯'=>1,'飼'=>1,'館'=>1,'鶴'=>1,'侮'=>1,'僧'=>1,'免'=>1,'勉'=>1,'勤'=>1,'卑'=>1,'喝'=>1,'嘆'=>1,'器'=>1,'塀'=>1,'墨'=>1,'層'=>1,'屮'=>1,'悔'=>1,'慨'=>1,'憎'=>1,'ï©€'=>1,'ï©'=>1,'ï©‚'=>1,'暑'=>1,'ï©„'=>1,'ï©…'=>1,'渚'=>1,'漢'=>1,'煮'=>1,'爫'=>1,'琢'=>1,'ï©‹'=>1,'社'=>1,'ï©'=>1,'祈'=>1,'ï©'=>1,'ï©'=>1,'ï©‘'=>1,'ï©’'=>1,'ï©“'=>1,'ï©”'=>1,'ï©•'=>1,'ï©–'=>1,'ï©—'=>1,'縉'=>1,'ï©™'=>1,'署'=>1,'ï©›'=>1,'臭'=>1,'ï©'=>1,'艹'=>1,'著'=>1,'ï© '=>1,'ï©¡'=>1,'ï©¢'=>1,'ï©£'=>1,'賓'=>1,'ï©¥'=>1,'辶'=>1,'ï©§'=>1,'難'=>1,'ï©©'=>1,'頻'=>1,'ï©°'=>1,'况'=>1,'全'=>1,'侀'=>1,'ï©´'=>1,'冀'=>1,'ï©¶'=>1,'ï©·'=>1,'喝'=>1,'啕'=>1,'喙'=>1,'ï©»'=>1,'塚'=>1,'墳'=>1,'奄'=>1,'ï©¿'=>1,'婢'=>1,'ïª'=>1,'廒'=>1,'廙'=>1,'彩'=>1,'徭'=>1,'惘'=>1,'慎'=>1,'愈'=>1,'憎'=>1,'慠'=>1,'懲'=>1,'戴'=>1,'ïª'=>1,'搜'=>1,'ïª'=>1,'ïª'=>1,'晴'=>1,'朗'=>1,'望'=>1,'杖'=>1,'歹'=>1,'殺'=>1,'流'=>1,'滛'=>1,'滋'=>1,'漢'=>1,'瀞'=>1,'煮'=>1,'ïª'=>1,'爵'=>1,'犯'=>1,'猪'=>1,'瑱'=>1,'甆'=>1,'画'=>1,'瘝'=>1,'瘟'=>1,'益'=>1,'盛'=>1,'直'=>1,'睊'=>1,'着'=>1,'磌'=>1,'窱'=>1,'節'=>1,'类'=>1,'絛'=>1,'練'=>1,'缾'=>1,'者'=>1,'荒'=>1,'華'=>1,'蝹'=>1,'襁'=>1,'覆'=>1,'視'=>1,'調'=>1,'諸'=>1,'請'=>1,'謁'=>1,'諾'=>1,'諭'=>1,'謹'=>1,'ï«€'=>1,'ï«'=>1,'ï«‚'=>1,'遲'=>1,'ï«„'=>1,'ï«…'=>1,'陼'=>1,'難'=>1,'靖'=>1,'韛'=>1,'響'=>1,'ï«‹'=>1,'頻'=>1,'ï«'=>1,'龜'=>1,'ï«'=>1,'ï«'=>1,'ï«‘'=>1,'ï«’'=>1,'ï«“'=>1,'ï«”'=>1,'ï«•'=>1,'ï«–'=>1,'ï«—'=>1,'齃'=>1,'ï«™'=>1,'ff'=>1,'ï¬'=>1,'fl'=>1,'ffi'=>1,'ffl'=>1,'ſt'=>1,'st'=>1,'ﬓ'=>1,'ﬔ'=>1,'ﬕ'=>1,'ﬖ'=>1,'ﬗ'=>1,'ï¬'=>1,'ײַ'=>1,'ﬠ'=>1,'ﬡ'=>1,'ﬢ'=>1,'ﬣ'=>1,'ﬤ'=>1,'ﬥ'=>1,'ﬦ'=>1,'ﬧ'=>1,'ﬨ'=>1,'﬩'=>1,'שׁ'=>1,'שׂ'=>1,'שּׁ'=>1,'שּׂ'=>1,'אַ'=>1,'אָ'=>1,'אּ'=>1,'בּ'=>1,'גּ'=>1,'דּ'=>1,'הּ'=>1,'וּ'=>1,'זּ'=>1,'טּ'=>1,'יּ'=>1,'ךּ'=>1,'כּ'=>1,'לּ'=>1,'מּ'=>1,'ï­€'=>1,'ï­'=>1,'ï­ƒ'=>1,'ï­„'=>1,'ï­†'=>1,'ï­‡'=>1,'ï­ˆ'=>1,'ï­‰'=>1,'ï­Š'=>1,'ï­‹'=>1,'ï­Œ'=>1,'ï­'=>1,'ï­Ž'=>1,'ï­'=>1,'ï­'=>1,'ï­‘'=>1,'ï­’'=>1,'ï­“'=>1,'ï­”'=>1,'ï­•'=>1,'ï­–'=>1,'ï­—'=>1,'ï­˜'=>1,'ï­™'=>1,'ï­š'=>1,'ï­›'=>1,'ï­œ'=>1,'ï­'=>1,'ï­ž'=>1,'ï­Ÿ'=>1,'ï­ '=>1,'ï­¡'=>1,'ï­¢'=>1,'ï­£'=>1,'ï­¤'=>1,'ï­¥'=>1,'ï­¦'=>1,'ï­§'=>1,'ï­¨'=>1,'ï­©'=>1,'ï­ª'=>1,'ï­«'=>1,'ï­¬'=>1,'ï­­'=>1,'ï­®'=>1,'ï­¯'=>1,'ï­°'=>1,'ï­±'=>1,'ï­²'=>1,'ï­³'=>1,'ï­´'=>1,'ï­µ'=>1,'ï­¶'=>1,'ï­·'=>1,'ï­¸'=>1,'ï­¹'=>1,'ï­º'=>1,'ï­»'=>1,'ï­¼'=>1,'ï­½'=>1,'ï­¾'=>1,'ï­¿'=>1,'ﮀ'=>1,'ï®'=>1,'ﮂ'=>1,'ﮃ'=>1,'ﮄ'=>1,'ï®…'=>1,'ﮆ'=>1,'ﮇ'=>1,'ﮈ'=>1,'ﮉ'=>1,'ﮊ'=>1,'ﮋ'=>1,'ﮌ'=>1,'ï®'=>1,'ﮎ'=>1,'ï®'=>1,'ï®'=>1,'ﮑ'=>1,'ï®’'=>1,'ﮓ'=>1,'ï®”'=>1,'ﮕ'=>1,'ï®–'=>1,'ï®—'=>1,'ﮘ'=>1,'ï®™'=>1,'ﮚ'=>1,'ï®›'=>1,'ﮜ'=>1,'ï®'=>1,'ﮞ'=>1,'ﮟ'=>1,'ï® '=>1,'ﮡ'=>1,'ﮢ'=>1,'ﮣ'=>1,'ﮤ'=>1,'ﮥ'=>1,'ﮦ'=>1,'ï®§'=>1,'ﮨ'=>1,'ﮩ'=>1,'ﮪ'=>1,'ﮫ'=>1,'ﮬ'=>1,'ï®­'=>1,'ï®®'=>1,'ﮯ'=>1,'ï®°'=>1,'ï®±'=>1,'ﯓ'=>1,'ﯔ'=>1,'ﯕ'=>1,'ﯖ'=>1,'ﯗ'=>1,'ﯘ'=>1,'ﯙ'=>1,'ﯚ'=>1,'ﯛ'=>1,'ﯜ'=>1,'ï¯'=>1,'ﯞ'=>1,'ﯟ'=>1,'ﯠ'=>1,'ﯡ'=>1,'ﯢ'=>1,'ﯣ'=>1,'ﯤ'=>1,'ﯥ'=>1,'ﯦ'=>1,'ﯧ'=>1,'ﯨ'=>1,'ﯩ'=>1,'ﯪ'=>1,'ﯫ'=>1,'ﯬ'=>1,'ﯭ'=>1,'ﯮ'=>1,'ﯯ'=>1,'ﯰ'=>1,'ﯱ'=>1,'ﯲ'=>1,'ﯳ'=>1,'ﯴ'=>1,'ﯵ'=>1,'ﯶ'=>1,'ﯷ'=>1,'ﯸ'=>1,'ﯹ'=>1,'ﯺ'=>1,'ﯻ'=>1,'ﯼ'=>1,'ﯽ'=>1,'ﯾ'=>1,'ﯿ'=>1,'ï°€'=>1,'ï°'=>1,'ï°‚'=>1,'ï°ƒ'=>1,'ï°„'=>1,'ï°…'=>1,'ï°†'=>1,'ï°‡'=>1,'ï°ˆ'=>1,'ï°‰'=>1,'ï°Š'=>1,'ï°‹'=>1,'ï°Œ'=>1,'ï°'=>1,'ï°Ž'=>1,'ï°'=>1,'ï°'=>1,'ï°‘'=>1,'ï°’'=>1,'ï°“'=>1,'ï°”'=>1,'ï°•'=>1,'ï°–'=>1,'ï°—'=>1,'ï°˜'=>1,'ï°™'=>1,'ï°š'=>1,'ï°›'=>1,'ï°œ'=>1,'ï°'=>1,'ï°ž'=>1,'ï°Ÿ'=>1,'ï° '=>1,'ï°¡'=>1,'ï°¢'=>1,'ï°£'=>1,'ï°¤'=>1,'ï°¥'=>1,'ï°¦'=>1,'ï°§'=>1,'ï°¨'=>1,'ï°©'=>1,'ï°ª'=>1,'ï°«'=>1,'ï°¬'=>1,'ï°­'=>1,'ï°®'=>1,'ï°¯'=>1,'ï°°'=>1,'ï°±'=>1,'ï°²'=>1,'ï°³'=>1,'ï°´'=>1,'ï°µ'=>1,'ï°¶'=>1,'ï°·'=>1,'ï°¸'=>1,'ï°¹'=>1,'ï°º'=>1,'ï°»'=>1,'ï°¼'=>1,'ï°½'=>1,'ï°¾'=>1,'ï°¿'=>1,'ï±€'=>1,'ï±'=>1,'ﱂ'=>1,'ﱃ'=>1,'ﱄ'=>1,'ï±…'=>1,'ﱆ'=>1,'ﱇ'=>1,'ﱈ'=>1,'ﱉ'=>1,'ﱊ'=>1,'ﱋ'=>1,'ﱌ'=>1,'ï±'=>1,'ﱎ'=>1,'ï±'=>1,'ï±'=>1,'ﱑ'=>1,'ï±’'=>1,'ﱓ'=>1,'ï±”'=>1,'ﱕ'=>1,'ï±–'=>1,'ï±—'=>1,'ﱘ'=>1,'ï±™'=>1,'ﱚ'=>1,'ï±›'=>1,'ﱜ'=>1,'ï±'=>1,'ﱞ'=>1,'ﱟ'=>1,'ï± '=>1,'ﱡ'=>1,'ï±¢'=>1,'ï±£'=>1,'ﱤ'=>1,'ï±¥'=>1,'ﱦ'=>1,'ï±§'=>1,'ﱨ'=>1,'ﱩ'=>1,'ﱪ'=>1,'ﱫ'=>1,'ﱬ'=>1,'ï±­'=>1,'ï±®'=>1,'ﱯ'=>1,'ï±°'=>1,'ï±±'=>1,'ï±²'=>1,'ï±³'=>1,'ï±´'=>1,'ï±µ'=>1,'ï±¶'=>1,'ï±·'=>1,'ﱸ'=>1,'ï±¹'=>1,'ﱺ'=>1,'ï±»'=>1,'ï±¼'=>1,'ï±½'=>1,'ï±¾'=>1,'ﱿ'=>1,'ï²€'=>1,'ï²'=>1,'ﲂ'=>1,'ﲃ'=>1,'ﲄ'=>1,'ï²…'=>1,'ﲆ'=>1,'ﲇ'=>1,'ﲈ'=>1,'ﲉ'=>1,'ﲊ'=>1,'ﲋ'=>1,'ﲌ'=>1,'ï²'=>1,'ﲎ'=>1,'ï²'=>1,'ï²'=>1,'ﲑ'=>1,'ï²’'=>1,'ﲓ'=>1,'ï²”'=>1,'ﲕ'=>1,'ï²–'=>1,'ï²—'=>1,'ﲘ'=>1,'ï²™'=>1,'ﲚ'=>1,'ï²›'=>1,'ﲜ'=>1,'ï²'=>1,'ﲞ'=>1,'ﲟ'=>1,'ï² '=>1,'ﲡ'=>1,'ï²¢'=>1,'ï²£'=>1,'ﲤ'=>1,'ï²¥'=>1,'ﲦ'=>1,'ï²§'=>1,'ﲨ'=>1,'ﲩ'=>1,'ﲪ'=>1,'ﲫ'=>1,'ﲬ'=>1,'ï²­'=>1,'ï²®'=>1,'ﲯ'=>1,'ï²°'=>1,'ï²±'=>1,'ï²²'=>1,'ï²³'=>1,'ï²´'=>1,'ï²µ'=>1,'ï²¶'=>1,'ï²·'=>1,'ﲸ'=>1,'ï²¹'=>1,'ﲺ'=>1,'ï²»'=>1,'ï²¼'=>1,'ï²½'=>1,'ï²¾'=>1,'ﲿ'=>1,'ï³€'=>1,'ï³'=>1,'ﳂ'=>1,'ﳃ'=>1,'ﳄ'=>1,'ï³…'=>1,'ﳆ'=>1,'ﳇ'=>1,'ﳈ'=>1,'ﳉ'=>1,'ﳊ'=>1,'ﳋ'=>1,'ﳌ'=>1,'ï³'=>1,'ﳎ'=>1,'ï³'=>1,'ï³'=>1,'ﳑ'=>1,'ï³’'=>1,'ﳓ'=>1,'ï³”'=>1,'ﳕ'=>1,'ï³–'=>1,'ï³—'=>1,'ﳘ'=>1,'ï³™'=>1,'ﳚ'=>1,'ï³›'=>1,'ﳜ'=>1,'ï³'=>1,'ﳞ'=>1,'ﳟ'=>1,'ï³ '=>1,'ﳡ'=>1,'ï³¢'=>1,'ï³£'=>1,'ﳤ'=>1,'ï³¥'=>1,'ﳦ'=>1,'ï³§'=>1,'ﳨ'=>1,'ﳩ'=>1,'ﳪ'=>1,'ﳫ'=>1,'ﳬ'=>1,'ï³­'=>1,'ï³®'=>1,'ﳯ'=>1,'ï³°'=>1,'ï³±'=>1,'ï³²'=>1,'ï³³'=>1,'ï³´'=>1,'ï³µ'=>1,'ï³¶'=>1,'ï³·'=>1,'ﳸ'=>1,'ï³¹'=>1,'ﳺ'=>1,'ï³»'=>1,'ï³¼'=>1,'ï³½'=>1,'ï³¾'=>1,'ﳿ'=>1,'ï´€'=>1,'ï´'=>1,'ï´‚'=>1,'ï´ƒ'=>1,'ï´„'=>1,'ï´…'=>1,'ï´†'=>1,'ï´‡'=>1,'ï´ˆ'=>1,'ï´‰'=>1,'ï´Š'=>1,'ï´‹'=>1,'ï´Œ'=>1,'ï´'=>1,'ï´Ž'=>1,'ï´'=>1,'ï´'=>1,'ï´‘'=>1,'ï´’'=>1,'ï´“'=>1,'ï´”'=>1,'ï´•'=>1,'ï´–'=>1,'ï´—'=>1,'ï´˜'=>1,'ï´™'=>1,'ï´š'=>1,'ï´›'=>1,'ï´œ'=>1,'ï´'=>1,'ï´ž'=>1,'ï´Ÿ'=>1,'ï´ '=>1,'ï´¡'=>1,'ï´¢'=>1,'ï´£'=>1,'ï´¤'=>1,'ï´¥'=>1,'ï´¦'=>1,'ï´§'=>1,'ï´¨'=>1,'ï´©'=>1,'ï´ª'=>1,'ï´«'=>1,'ï´¬'=>1,'ï´­'=>1,'ï´®'=>1,'ï´¯'=>1,'ï´°'=>1,'ï´±'=>1,'ï´²'=>1,'ï´³'=>1,'ï´´'=>1,'ï´µ'=>1,'ï´¶'=>1,'ï´·'=>1,'ï´¸'=>1,'ï´¹'=>1,'ï´º'=>1,'ï´»'=>1,'ï´¼'=>1,'ï´½'=>1,'ïµ'=>1,'ﵑ'=>1,'ïµ’'=>1,'ﵓ'=>1,'ïµ”'=>1,'ﵕ'=>1,'ïµ–'=>1,'ïµ—'=>1,'ﵘ'=>1,'ïµ™'=>1,'ﵚ'=>1,'ïµ›'=>1,'ﵜ'=>1,'ïµ'=>1,'ﵞ'=>1,'ﵟ'=>1,'ïµ '=>1,'ﵡ'=>1,'ïµ¢'=>1,'ïµ£'=>1,'ﵤ'=>1,'ïµ¥'=>1,'ﵦ'=>1,'ïµ§'=>1,'ﵨ'=>1,'ﵩ'=>1,'ﵪ'=>1,'ﵫ'=>1,'ﵬ'=>1,'ïµ­'=>1,'ïµ®'=>1,'ﵯ'=>1,'ïµ°'=>1,'ïµ±'=>1,'ïµ²'=>1,'ïµ³'=>1,'ïµ´'=>1,'ïµµ'=>1,'ïµ¶'=>1,'ïµ·'=>1,'ﵸ'=>1,'ïµ¹'=>1,'ﵺ'=>1,'ïµ»'=>1,'ïµ¼'=>1,'ïµ½'=>1,'ïµ¾'=>1,'ﵿ'=>1,'ï¶€'=>1,'ï¶'=>1,'ï¶‚'=>1,'ﶃ'=>1,'ï¶„'=>1,'ï¶…'=>1,'ﶆ'=>1,'ﶇ'=>1,'ﶈ'=>1,'ﶉ'=>1,'ï¶Š'=>1,'ï¶‹'=>1,'ï¶Œ'=>1,'ï¶'=>1,'ï¶Ž'=>1,'ï¶'=>1,'ï¶’'=>1,'ï¶“'=>1,'ï¶”'=>1,'ï¶•'=>1,'ï¶–'=>1,'ï¶—'=>1,'ﶘ'=>1,'ï¶™'=>1,'ï¶š'=>1,'ï¶›'=>1,'ï¶œ'=>1,'ï¶'=>1,'ï¶ž'=>1,'ï¶Ÿ'=>1,'ï¶ '=>1,'ï¶¡'=>1,'ï¶¢'=>1,'ï¶£'=>1,'ﶤ'=>1,'ï¶¥'=>1,'ﶦ'=>1,'ï¶§'=>1,'ﶨ'=>1,'ï¶©'=>1,'ﶪ'=>1,'ï¶«'=>1,'ﶬ'=>1,'ï¶­'=>1,'ï¶®'=>1,'ﶯ'=>1,'ï¶°'=>1,'ï¶±'=>1,'ï¶²'=>1,'ï¶³'=>1,'ï¶´'=>1,'ï¶µ'=>1,'ï¶¶'=>1,'ï¶·'=>1,'ﶸ'=>1,'ï¶¹'=>1,'ﶺ'=>1,'ï¶»'=>1,'ï¶¼'=>1,'ï¶½'=>1,'ï¶¾'=>1,'ï¶¿'=>1,'ï·€'=>1,'ï·'=>1,'ï·‚'=>1,'ï·ƒ'=>1,'ï·„'=>1,'ï·…'=>1,'ï·†'=>1,'ï·‡'=>1,'ï·°'=>1,'ï·±'=>1,'ï·²'=>1,'ï·³'=>1,'ï·´'=>1,'ï·µ'=>1,'ï·¶'=>1,'ï··'=>1,'ï·¸'=>1,'ï·¹'=>1,'ï·º'=>1,'ï·»'=>1,'ï·¼'=>1,'ï¸'=>1,'︑'=>1,'︒'=>1,'︓'=>1,'︔'=>1,'︕'=>1,'︖'=>1,'︗'=>1,'︘'=>1,'︙'=>1,'︰'=>1,'︱'=>1,'︲'=>1,'︳'=>1,'︴'=>1,'︵'=>1,'︶'=>1,'︷'=>1,'︸'=>1,'︹'=>1,'︺'=>1,'︻'=>1,'︼'=>1,'︽'=>1,'︾'=>1,'︿'=>1,'ï¹€'=>1,'ï¹'=>1,'﹂'=>1,'﹃'=>1,'﹄'=>1,'﹇'=>1,'﹈'=>1,'﹉'=>1,'﹊'=>1,'﹋'=>1,'﹌'=>1,'ï¹'=>1,'﹎'=>1,'ï¹'=>1,'ï¹'=>1,'﹑'=>1,'ï¹’'=>1,'ï¹”'=>1,'﹕'=>1,'ï¹–'=>1,'ï¹—'=>1,'﹘'=>1,'ï¹™'=>1,'﹚'=>1,'ï¹›'=>1,'﹜'=>1,'ï¹'=>1,'﹞'=>1,'﹟'=>1,'ï¹ '=>1,'﹡'=>1,'ï¹¢'=>1,'ï¹£'=>1,'﹤'=>1,'ï¹¥'=>1,'﹦'=>1,'﹨'=>1,'﹩'=>1,'﹪'=>1,'﹫'=>1,'ï¹°'=>1,'ï¹±'=>1,'ï¹²'=>1,'ï¹´'=>1,'ï¹¶'=>1,'ï¹·'=>1,'ﹸ'=>1,'ï¹¹'=>1,'ﹺ'=>1,'ï¹»'=>1,'ï¹¼'=>1,'ï¹½'=>1,'ï¹¾'=>1,'ﹿ'=>1,'ﺀ'=>1,'ïº'=>1,'ﺂ'=>1,'ﺃ'=>1,'ﺄ'=>1,'ﺅ'=>1,'ﺆ'=>1,'ﺇ'=>1,'ﺈ'=>1,'ﺉ'=>1,'ﺊ'=>1,'ﺋ'=>1,'ﺌ'=>1,'ïº'=>1,'ﺎ'=>1,'ïº'=>1,'ïº'=>1,'ﺑ'=>1,'ﺒ'=>1,'ﺓ'=>1,'ﺔ'=>1,'ﺕ'=>1,'ﺖ'=>1,'ﺗ'=>1,'ﺘ'=>1,'ﺙ'=>1,'ﺚ'=>1,'ﺛ'=>1,'ﺜ'=>1,'ïº'=>1,'ﺞ'=>1,'ﺟ'=>1,'ﺠ'=>1,'ﺡ'=>1,'ﺢ'=>1,'ﺣ'=>1,'ﺤ'=>1,'ﺥ'=>1,'ﺦ'=>1,'ﺧ'=>1,'ﺨ'=>1,'ﺩ'=>1,'ﺪ'=>1,'ﺫ'=>1,'ﺬ'=>1,'ﺭ'=>1,'ﺮ'=>1,'ﺯ'=>1,'ﺰ'=>1,'ﺱ'=>1,'ﺲ'=>1,'ﺳ'=>1,'ﺴ'=>1,'ﺵ'=>1,'ﺶ'=>1,'ﺷ'=>1,'ﺸ'=>1,'ﺹ'=>1,'ﺺ'=>1,'ﺻ'=>1,'ﺼ'=>1,'ﺽ'=>1,'ﺾ'=>1,'ﺿ'=>1,'ﻀ'=>1,'ï»'=>1,'ﻂ'=>1,'ﻃ'=>1,'ﻄ'=>1,'ï»…'=>1,'ﻆ'=>1,'ﻇ'=>1,'ﻈ'=>1,'ﻉ'=>1,'ﻊ'=>1,'ﻋ'=>1,'ﻌ'=>1,'ï»'=>1,'ﻎ'=>1,'ï»'=>1,'ï»'=>1,'ﻑ'=>1,'ï»’'=>1,'ﻓ'=>1,'ï»”'=>1,'ﻕ'=>1,'ï»–'=>1,'ï»—'=>1,'ﻘ'=>1,'ï»™'=>1,'ﻚ'=>1,'ï»›'=>1,'ﻜ'=>1,'ï»'=>1,'ﻞ'=>1,'ﻟ'=>1,'ï» '=>1,'ﻡ'=>1,'ﻢ'=>1,'ﻣ'=>1,'ﻤ'=>1,'ﻥ'=>1,'ﻦ'=>1,'ï»§'=>1,'ﻨ'=>1,'ﻩ'=>1,'ﻪ'=>1,'ﻫ'=>1,'ﻬ'=>1,'ï»­'=>1,'ï»®'=>1,'ﻯ'=>1,'ï»°'=>1,'ï»±'=>1,'ﻲ'=>1,'ﻳ'=>1,'ï»´'=>1,'ﻵ'=>1,'ï»¶'=>1,'ï»·'=>1,'ﻸ'=>1,'ﻹ'=>1,'ﻺ'=>1,'ï»»'=>1,'ﻼ'=>1,'ï¼'=>1,'"'=>1,'#'=>1,'$'=>1,'ï¼…'=>1,'&'=>1,'''=>1,'('=>1,')'=>1,'*'=>1,'+'=>1,','=>1,'ï¼'=>1,'.'=>1,'ï¼'=>1,'ï¼'=>1,'1'=>1,'ï¼’'=>1,'3'=>1,'ï¼”'=>1,'5'=>1,'ï¼–'=>1,'ï¼—'=>1,'8'=>1,'ï¼™'=>1,':'=>1,'ï¼›'=>1,'<'=>1,'ï¼'=>1,'>'=>1,'?'=>1,'ï¼ '=>1,'A'=>1,'ï¼¢'=>1,'ï¼£'=>1,'D'=>1,'ï¼¥'=>1,'F'=>1,'ï¼§'=>1,'H'=>1,'I'=>1,'J'=>1,'K'=>1,'L'=>1,'ï¼­'=>1,'ï¼®'=>1,'O'=>1,'ï¼°'=>1,'ï¼±'=>1,'ï¼²'=>1,'ï¼³'=>1,'ï¼´'=>1,'ï¼µ'=>1,'ï¼¶'=>1,'ï¼·'=>1,'X'=>1,'ï¼¹'=>1,'Z'=>1,'ï¼»'=>1,'ï¼¼'=>1,'ï¼½'=>1,'ï¼¾'=>1,'_'=>1,'ï½€'=>1,'ï½'=>1,'b'=>1,'c'=>1,'d'=>1,'ï½…'=>1,'f'=>1,'g'=>1,'h'=>1,'i'=>1,'j'=>1,'k'=>1,'l'=>1,'ï½'=>1,'n'=>1,'ï½'=>1,'ï½'=>1,'q'=>1,'ï½’'=>1,'s'=>1,'ï½”'=>1,'u'=>1,'ï½–'=>1,'ï½—'=>1,'x'=>1,'ï½™'=>1,'z'=>1,'ï½›'=>1,'|'=>1,'ï½'=>1,'~'=>1,'⦅'=>1,'ï½ '=>1,'。'=>1,'ï½¢'=>1,'ï½£'=>1,'、'=>1,'ï½¥'=>1,'ヲ'=>1,'ï½§'=>1,'ィ'=>1,'ゥ'=>1,'ェ'=>1,'ォ'=>1,'ャ'=>1,'ï½­'=>1,'ï½®'=>1,'ッ'=>1,'ï½°'=>1,'ï½±'=>1,'ï½²'=>1,'ï½³'=>1,'ï½´'=>1,'ï½µ'=>1,'ï½¶'=>1,'ï½·'=>1,'ク'=>1,'ï½¹'=>1,'コ'=>1,'ï½»'=>1,'ï½¼'=>1,'ï½½'=>1,'ï½¾'=>1,'ソ'=>1,'ï¾€'=>1,'ï¾'=>1,'ツ'=>1,'テ'=>1,'ト'=>1,'ï¾…'=>1,'ニ'=>1,'ヌ'=>1,'ネ'=>1,'ノ'=>1,'ハ'=>1,'ヒ'=>1,'フ'=>1,'ï¾'=>1,'ホ'=>1,'ï¾'=>1,'ï¾'=>1,'ム'=>1,'ï¾’'=>1,'モ'=>1,'ï¾”'=>1,'ユ'=>1,'ï¾–'=>1,'ï¾—'=>1,'リ'=>1,'ï¾™'=>1,'レ'=>1,'ï¾›'=>1,'ワ'=>1,'ï¾'=>1,'゙'=>1,'゚'=>1,'ï¾ '=>1,'ᄀ'=>1,'ï¾¢'=>1,'ï¾£'=>1,'ᄂ'=>1,'ï¾¥'=>1,'ᆭ'=>1,'ï¾§'=>1,'ᄄ'=>1,'ᄅ'=>1,'ᆰ'=>1,'ᆱ'=>1,'ᆲ'=>1,'ï¾­'=>1,'ï¾®'=>1,'ᆵ'=>1,'ï¾°'=>1,'ï¾±'=>1,'ï¾²'=>1,'ï¾³'=>1,'ï¾´'=>1,'ï¾µ'=>1,'ï¾¶'=>1,'ï¾·'=>1,'ᄌ'=>1,'ï¾¹'=>1,'ᄎ'=>1,'ï¾»'=>1,'ï¾¼'=>1,'ï¾½'=>1,'ï¾¾'=>1,'ï¿‚'=>1,'ᅢ'=>1,'ï¿„'=>1,'ï¿…'=>1,'ᅥ'=>1,'ᅦ'=>1,'ᅧ'=>1,'ï¿‹'=>1,'ᅩ'=>1,'ï¿'=>1,'ᅫ'=>1,'ï¿'=>1,'ï¿’'=>1,'ï¿“'=>1,'ï¿”'=>1,'ï¿•'=>1,'ï¿–'=>1,'ï¿—'=>1,'ᅳ'=>1,'ï¿›'=>1,'ᅵ'=>1,'ï¿ '=>1,'ï¿¡'=>1,'ï¿¢'=>1,'ï¿£'=>1,'¦'=>1,'ï¿¥'=>1,'₩'=>1,'│'=>1,'ï¿©'=>1,'↑'=>1,'ï¿«'=>1,'↓'=>1,'ï¿­'=>1,'ï¿®'=>1,'ð…ž'=>1,'ð…Ÿ'=>1,'ð… '=>1,'ð…¡'=>1,'ð…¢'=>1,'ð…£'=>1,'ð…¤'=>1,'ð†»'=>1,'ð†¼'=>1,'ð†½'=>1,'ð†¾'=>1,'ð†¿'=>1,'ð‡€'=>1,'ð€'=>1,'ð'=>1,'ð‚'=>1,'ðƒ'=>1,'ð„'=>1,'ð…'=>1,'ð†'=>1,'ð‡'=>1,'ðˆ'=>1,'ð‰'=>1,'ðŠ'=>1,'ð‹'=>1,'ðŒ'=>1,'ð'=>1,'ðŽ'=>1,'ð'=>1,'ð'=>1,'ð‘'=>1,'ð’'=>1,'ð“'=>1,'ð”'=>1,'ð•'=>1,'ð–'=>1,'ð—'=>1,'ð˜'=>1,'ð™'=>1,'ðš'=>1,'ð›'=>1,'ðœ'=>1,'ð'=>1,'ðž'=>1,'ðŸ'=>1,'ð '=>1,'ð¡'=>1,'ð¢'=>1,'ð£'=>1,'ð¤'=>1,'ð¥'=>1,'ð¦'=>1,'ð§'=>1,'ð¨'=>1,'ð©'=>1,'ðª'=>1,'ð«'=>1,'ð¬'=>1,'ð­'=>1,'ð®'=>1,'ð¯'=>1,'ð°'=>1,'ð±'=>1,'ð²'=>1,'ð³'=>1,'ð´'=>1,'ðµ'=>1,'ð¶'=>1,'ð·'=>1,'ð¸'=>1,'ð¹'=>1,'ðº'=>1,'ð»'=>1,'ð¼'=>1,'ð½'=>1,'ð¾'=>1,'ð¿'=>1,'ð‘€'=>1,'ð‘'=>1,'ð‘‚'=>1,'ð‘ƒ'=>1,'ð‘„'=>1,'ð‘…'=>1,'ð‘†'=>1,'ð‘‡'=>1,'ð‘ˆ'=>1,'ð‘‰'=>1,'ð‘Š'=>1,'ð‘‹'=>1,'ð‘Œ'=>1,'ð‘'=>1,'ð‘Ž'=>1,'ð‘'=>1,'ð‘'=>1,'ð‘‘'=>1,'ð‘’'=>1,'ð‘“'=>1,'ð‘”'=>1,'ð‘–'=>1,'ð‘—'=>1,'ð‘˜'=>1,'ð‘™'=>1,'ð‘š'=>1,'ð‘›'=>1,'ð‘œ'=>1,'ð‘'=>1,'ð‘ž'=>1,'ð‘Ÿ'=>1,'ð‘ '=>1,'ð‘¡'=>1,'ð‘¢'=>1,'ð‘£'=>1,'ð‘¤'=>1,'ð‘¥'=>1,'ð‘¦'=>1,'ð‘§'=>1,'ð‘¨'=>1,'ð‘©'=>1,'ð‘ª'=>1,'ð‘«'=>1,'ð‘¬'=>1,'ð‘­'=>1,'ð‘®'=>1,'ð‘¯'=>1,'ð‘°'=>1,'ð‘±'=>1,'ð‘²'=>1,'ð‘³'=>1,'ð‘´'=>1,'ð‘µ'=>1,'ð‘¶'=>1,'ð‘·'=>1,'ð‘¸'=>1,'ð‘¹'=>1,'ð‘º'=>1,'ð‘»'=>1,'ð‘¼'=>1,'ð‘½'=>1,'ð‘¾'=>1,'ð‘¿'=>1,'ð’€'=>1,'ð’'=>1,'ð’‚'=>1,'ð’ƒ'=>1,'ð’„'=>1,'ð’…'=>1,'ð’†'=>1,'ð’‡'=>1,'ð’ˆ'=>1,'ð’‰'=>1,'ð’Š'=>1,'ð’‹'=>1,'ð’Œ'=>1,'ð’'=>1,'ð’Ž'=>1,'ð’'=>1,'ð’'=>1,'ð’‘'=>1,'ð’’'=>1,'ð’“'=>1,'ð’”'=>1,'ð’•'=>1,'ð’–'=>1,'ð’—'=>1,'ð’˜'=>1,'ð’™'=>1,'ð’š'=>1,'ð’›'=>1,'ð’œ'=>1,'ð’ž'=>1,'ð’Ÿ'=>1,'ð’¢'=>1,'ð’¥'=>1,'ð’¦'=>1,'ð’©'=>1,'ð’ª'=>1,'ð’«'=>1,'ð’¬'=>1,'ð’®'=>1,'ð’¯'=>1,'ð’°'=>1,'ð’±'=>1,'ð’²'=>1,'ð’³'=>1,'ð’´'=>1,'ð’µ'=>1,'ð’¶'=>1,'ð’·'=>1,'ð’¸'=>1,'ð’¹'=>1,'ð’»'=>1,'ð’½'=>1,'ð’¾'=>1,'ð’¿'=>1,'ð“€'=>1,'ð“'=>1,'ð“‚'=>1,'ð“ƒ'=>1,'ð“…'=>1,'ð“†'=>1,'ð“‡'=>1,'ð“ˆ'=>1,'ð“‰'=>1,'ð“Š'=>1,'ð“‹'=>1,'ð“Œ'=>1,'ð“'=>1,'ð“Ž'=>1,'ð“'=>1,'ð“'=>1,'ð“‘'=>1,'ð“’'=>1,'ð““'=>1,'ð“”'=>1,'ð“•'=>1,'ð“–'=>1,'ð“—'=>1,'ð“˜'=>1,'ð“™'=>1,'ð“š'=>1,'ð“›'=>1,'ð“œ'=>1,'ð“'=>1,'ð“ž'=>1,'ð“Ÿ'=>1,'ð“ '=>1,'ð“¡'=>1,'ð“¢'=>1,'ð“£'=>1,'ð“¤'=>1,'ð“¥'=>1,'ð“¦'=>1,'ð“§'=>1,'ð“¨'=>1,'ð“©'=>1,'ð“ª'=>1,'ð“«'=>1,'ð“¬'=>1,'ð“­'=>1,'ð“®'=>1,'ð“¯'=>1,'ð“°'=>1,'ð“±'=>1,'ð“²'=>1,'ð“³'=>1,'ð“´'=>1,'ð“µ'=>1,'ð“¶'=>1,'ð“·'=>1,'ð“¸'=>1,'ð“¹'=>1,'ð“º'=>1,'ð“»'=>1,'ð“¼'=>1,'ð“½'=>1,'ð“¾'=>1,'ð“¿'=>1,'ð”€'=>1,'ð”'=>1,'ð”‚'=>1,'ð”ƒ'=>1,'ð”„'=>1,'ð”…'=>1,'ð”‡'=>1,'ð”ˆ'=>1,'ð”‰'=>1,'ð”Š'=>1,'ð”'=>1,'ð”Ž'=>1,'ð”'=>1,'ð”'=>1,'ð”‘'=>1,'ð”’'=>1,'ð”“'=>1,'ð””'=>1,'ð”–'=>1,'ð”—'=>1,'ð”˜'=>1,'ð”™'=>1,'ð”š'=>1,'ð”›'=>1,'ð”œ'=>1,'ð”ž'=>1,'ð”Ÿ'=>1,'ð” '=>1,'ð”¡'=>1,'ð”¢'=>1,'ð”£'=>1,'ð”¤'=>1,'ð”¥'=>1,'ð”¦'=>1,'ð”§'=>1,'ð”¨'=>1,'ð”©'=>1,'ð”ª'=>1,'ð”«'=>1,'ð”¬'=>1,'ð”­'=>1,'ð”®'=>1,'ð”¯'=>1,'ð”°'=>1,'ð”±'=>1,'ð”²'=>1,'ð”³'=>1,'ð”´'=>1,'ð”µ'=>1,'ð”¶'=>1,'ð”·'=>1,'ð”¸'=>1,'ð”¹'=>1,'ð”»'=>1,'ð”¼'=>1,'ð”½'=>1,'ð”¾'=>1,'ð•€'=>1,'ð•'=>1,'ð•‚'=>1,'ð•ƒ'=>1,'ð•„'=>1,'ð•†'=>1,'ð•Š'=>1,'ð•‹'=>1,'ð•Œ'=>1,'ð•'=>1,'ð•Ž'=>1,'ð•'=>1,'ð•'=>1,'ð•’'=>1,'ð•“'=>1,'ð•”'=>1,'ð••'=>1,'ð•–'=>1,'ð•—'=>1,'ð•˜'=>1,'ð•™'=>1,'ð•š'=>1,'ð•›'=>1,'ð•œ'=>1,'ð•'=>1,'ð•ž'=>1,'ð•Ÿ'=>1,'ð• '=>1,'ð•¡'=>1,'ð•¢'=>1,'ð•£'=>1,'ð•¤'=>1,'ð•¥'=>1,'ð•¦'=>1,'ð•§'=>1,'ð•¨'=>1,'ð•©'=>1,'ð•ª'=>1,'ð•«'=>1,'ð•¬'=>1,'ð•­'=>1,'ð•®'=>1,'ð•¯'=>1,'ð•°'=>1,'ð•±'=>1,'ð•²'=>1,'ð•³'=>1,'ð•´'=>1,'ð•µ'=>1,'ð•¶'=>1,'ð•·'=>1,'ð•¸'=>1,'ð•¹'=>1,'ð•º'=>1,'ð•»'=>1,'ð•¼'=>1,'ð•½'=>1,'ð•¾'=>1,'ð•¿'=>1,'ð–€'=>1,'ð–'=>1,'ð–‚'=>1,'ð–ƒ'=>1,'ð–„'=>1,'ð–…'=>1,'ð–†'=>1,'ð–‡'=>1,'ð–ˆ'=>1,'ð–‰'=>1,'ð–Š'=>1,'ð–‹'=>1,'ð–Œ'=>1,'ð–'=>1,'ð–Ž'=>1,'ð–'=>1,'ð–'=>1,'ð–‘'=>1,'ð–’'=>1,'ð–“'=>1,'ð–”'=>1,'ð–•'=>1,'ð––'=>1,'ð–—'=>1,'ð–˜'=>1,'ð–™'=>1,'ð–š'=>1,'ð–›'=>1,'ð–œ'=>1,'ð–'=>1,'ð–ž'=>1,'ð–Ÿ'=>1,'ð– '=>1,'ð–¡'=>1,'ð–¢'=>1,'ð–£'=>1,'ð–¤'=>1,'ð–¥'=>1,'ð–¦'=>1,'ð–§'=>1,'ð–¨'=>1,'ð–©'=>1,'ð–ª'=>1,'ð–«'=>1,'ð–¬'=>1,'ð–­'=>1,'ð–®'=>1,'ð–¯'=>1,'ð–°'=>1,'ð–±'=>1,'ð–²'=>1,'ð–³'=>1,'ð–´'=>1,'ð–µ'=>1,'ð–¶'=>1,'ð–·'=>1,'ð–¸'=>1,'ð–¹'=>1,'ð–º'=>1,'ð–»'=>1,'ð–¼'=>1,'ð–½'=>1,'ð–¾'=>1,'ð–¿'=>1,'ð—€'=>1,'ð—'=>1,'ð—‚'=>1,'ð—ƒ'=>1,'ð—„'=>1,'ð—…'=>1,'ð—†'=>1,'ð—‡'=>1,'ð—ˆ'=>1,'ð—‰'=>1,'ð—Š'=>1,'ð—‹'=>1,'ð—Œ'=>1,'ð—'=>1,'ð—Ž'=>1,'ð—'=>1,'ð—'=>1,'ð—‘'=>1,'ð—’'=>1,'ð—“'=>1,'ð—”'=>1,'ð—•'=>1,'ð—–'=>1,'ð——'=>1,'ð—˜'=>1,'ð—™'=>1,'ð—š'=>1,'ð—›'=>1,'ð—œ'=>1,'ð—'=>1,'ð—ž'=>1,'ð—Ÿ'=>1,'ð— '=>1,'ð—¡'=>1,'ð—¢'=>1,'ð—£'=>1,'ð—¤'=>1,'ð—¥'=>1,'ð—¦'=>1,'ð—§'=>1,'ð—¨'=>1,'ð—©'=>1,'ð—ª'=>1,'ð—«'=>1,'ð—¬'=>1,'ð—­'=>1,'ð—®'=>1,'ð—¯'=>1,'ð—°'=>1,'ð—±'=>1,'ð—²'=>1,'ð—³'=>1,'ð—´'=>1,'ð—µ'=>1,'ð—¶'=>1,'ð—·'=>1,'ð—¸'=>1,'ð—¹'=>1,'ð—º'=>1,'ð—»'=>1,'ð—¼'=>1,'ð—½'=>1,'ð—¾'=>1,'ð—¿'=>1,'ð˜€'=>1,'ð˜'=>1,'ð˜‚'=>1,'ð˜ƒ'=>1,'ð˜„'=>1,'ð˜…'=>1,'ð˜†'=>1,'ð˜‡'=>1,'ð˜ˆ'=>1,'ð˜‰'=>1,'ð˜Š'=>1,'ð˜‹'=>1,'ð˜Œ'=>1,'ð˜'=>1,'ð˜Ž'=>1,'ð˜'=>1,'ð˜'=>1,'ð˜‘'=>1,'ð˜’'=>1,'ð˜“'=>1,'ð˜”'=>1,'ð˜•'=>1,'ð˜–'=>1,'ð˜—'=>1,'ð˜˜'=>1,'ð˜™'=>1,'ð˜š'=>1,'ð˜›'=>1,'ð˜œ'=>1,'ð˜'=>1,'ð˜ž'=>1,'ð˜Ÿ'=>1,'ð˜ '=>1,'ð˜¡'=>1,'ð˜¢'=>1,'ð˜£'=>1,'ð˜¤'=>1,'ð˜¥'=>1,'ð˜¦'=>1,'ð˜§'=>1,'ð˜¨'=>1,'ð˜©'=>1,'ð˜ª'=>1,'ð˜«'=>1,'ð˜¬'=>1,'ð˜­'=>1,'ð˜®'=>1,'ð˜¯'=>1,'ð˜°'=>1,'ð˜±'=>1,'ð˜²'=>1,'ð˜³'=>1,'ð˜´'=>1,'ð˜µ'=>1,'ð˜¶'=>1,'ð˜·'=>1,'ð˜¸'=>1,'ð˜¹'=>1,'ð˜º'=>1,'ð˜»'=>1,'ð˜¼'=>1,'ð˜½'=>1,'ð˜¾'=>1,'ð˜¿'=>1,'ð™€'=>1,'ð™'=>1,'ð™‚'=>1,'ð™ƒ'=>1,'ð™„'=>1,'ð™…'=>1,'ð™†'=>1,'ð™‡'=>1,'ð™ˆ'=>1,'ð™‰'=>1,'ð™Š'=>1,'ð™‹'=>1,'ð™Œ'=>1,'ð™'=>1,'ð™Ž'=>1,'ð™'=>1,'ð™'=>1,'ð™‘'=>1,'ð™’'=>1,'ð™“'=>1,'ð™”'=>1,'ð™•'=>1,'ð™–'=>1,'ð™—'=>1,'ð™˜'=>1,'ð™™'=>1,'ð™š'=>1,'ð™›'=>1,'ð™œ'=>1,'ð™'=>1,'ð™ž'=>1,'ð™Ÿ'=>1,'ð™ '=>1,'ð™¡'=>1,'ð™¢'=>1,'ð™£'=>1,'ð™¤'=>1,'ð™¥'=>1,'ð™¦'=>1,'ð™§'=>1,'ð™¨'=>1,'ð™©'=>1,'ð™ª'=>1,'ð™«'=>1,'ð™¬'=>1,'ð™­'=>1,'ð™®'=>1,'ð™¯'=>1,'ð™°'=>1,'ð™±'=>1,'ð™²'=>1,'ð™³'=>1,'ð™´'=>1,'ð™µ'=>1,'ð™¶'=>1,'ð™·'=>1,'ð™¸'=>1,'ð™¹'=>1,'ð™º'=>1,'ð™»'=>1,'ð™¼'=>1,'ð™½'=>1,'ð™¾'=>1,'ð™¿'=>1,'ðš€'=>1,'ðš'=>1,'ðš‚'=>1,'ðšƒ'=>1,'ðš„'=>1,'ðš…'=>1,'ðš†'=>1,'ðš‡'=>1,'ðšˆ'=>1,'ðš‰'=>1,'ðšŠ'=>1,'ðš‹'=>1,'ðšŒ'=>1,'ðš'=>1,'ðšŽ'=>1,'ðš'=>1,'ðš'=>1,'ðš‘'=>1,'ðš’'=>1,'ðš“'=>1,'ðš”'=>1,'ðš•'=>1,'ðš–'=>1,'ðš—'=>1,'ðš˜'=>1,'ðš™'=>1,'ðšš'=>1,'ðš›'=>1,'ðšœ'=>1,'ðš'=>1,'ðšž'=>1,'ðšŸ'=>1,'ðš '=>1,'ðš¡'=>1,'ðš¢'=>1,'ðš£'=>1,'ðš¤'=>1,'ðš¥'=>1,'ðš¨'=>1,'ðš©'=>1,'ðšª'=>1,'ðš«'=>1,'ðš¬'=>1,'ðš­'=>1,'ðš®'=>1,'ðš¯'=>1,'ðš°'=>1,'ðš±'=>1,'ðš²'=>1,'ðš³'=>1,'ðš´'=>1,'ðšµ'=>1,'ðš¶'=>1,'ðš·'=>1,'ðš¸'=>1,'ðš¹'=>1,'ðšº'=>1,'ðš»'=>1,'ðš¼'=>1,'ðš½'=>1,'ðš¾'=>1,'ðš¿'=>1,'ð›€'=>1,'ð›'=>1,'ð›‚'=>1,'ð›ƒ'=>1,'ð›„'=>1,'ð›…'=>1,'ð›†'=>1,'ð›‡'=>1,'ð›ˆ'=>1,'ð›‰'=>1,'ð›Š'=>1,'ð›‹'=>1,'ð›Œ'=>1,'ð›'=>1,'ð›Ž'=>1,'ð›'=>1,'ð›'=>1,'ð›‘'=>1,'ð›’'=>1,'ð›“'=>1,'ð›”'=>1,'ð›•'=>1,'ð›–'=>1,'ð›—'=>1,'ð›˜'=>1,'ð›™'=>1,'ð›š'=>1,'ð››'=>1,'ð›œ'=>1,'ð›'=>1,'ð›ž'=>1,'ð›Ÿ'=>1,'ð› '=>1,'ð›¡'=>1,'ð›¢'=>1,'ð›£'=>1,'ð›¤'=>1,'ð›¥'=>1,'ð›¦'=>1,'ð›§'=>1,'ð›¨'=>1,'ð›©'=>1,'ð›ª'=>1,'ð›«'=>1,'ð›¬'=>1,'ð›­'=>1,'ð›®'=>1,'ð›¯'=>1,'ð›°'=>1,'ð›±'=>1,'ð›²'=>1,'ð›³'=>1,'ð›´'=>1,'ð›µ'=>1,'ð›¶'=>1,'ð›·'=>1,'ð›¸'=>1,'ð›¹'=>1,'ð›º'=>1,'ð›»'=>1,'ð›¼'=>1,'ð›½'=>1,'ð›¾'=>1,'ð›¿'=>1,'ðœ€'=>1,'ðœ'=>1,'ðœ‚'=>1,'ðœƒ'=>1,'ðœ„'=>1,'ðœ…'=>1,'ðœ†'=>1,'ðœ‡'=>1,'ðœˆ'=>1,'ðœ‰'=>1,'ðœŠ'=>1,'ðœ‹'=>1,'ðœŒ'=>1,'ðœ'=>1,'ðœŽ'=>1,'ðœ'=>1,'ðœ'=>1,'ðœ‘'=>1,'ðœ’'=>1,'ðœ“'=>1,'ðœ”'=>1,'ðœ•'=>1,'ðœ–'=>1,'ðœ—'=>1,'ðœ˜'=>1,'ðœ™'=>1,'ðœš'=>1,'ðœ›'=>1,'ðœœ'=>1,'ðœ'=>1,'ðœž'=>1,'ðœŸ'=>1,'ðœ '=>1,'ðœ¡'=>1,'ðœ¢'=>1,'ðœ£'=>1,'ðœ¤'=>1,'ðœ¥'=>1,'ðœ¦'=>1,'ðœ§'=>1,'ðœ¨'=>1,'ðœ©'=>1,'ðœª'=>1,'ðœ«'=>1,'ðœ¬'=>1,'ðœ­'=>1,'ðœ®'=>1,'ðœ¯'=>1,'ðœ°'=>1,'ðœ±'=>1,'ðœ²'=>1,'ðœ³'=>1,'ðœ´'=>1,'ðœµ'=>1,'ðœ¶'=>1,'ðœ·'=>1,'ðœ¸'=>1,'ðœ¹'=>1,'ðœº'=>1,'ðœ»'=>1,'ðœ¼'=>1,'ðœ½'=>1,'ðœ¾'=>1,'ðœ¿'=>1,'ð€'=>1,'ð'=>1,'ð‚'=>1,'ðƒ'=>1,'ð„'=>1,'ð…'=>1,'ð†'=>1,'ð‡'=>1,'ðˆ'=>1,'ð‰'=>1,'ðŠ'=>1,'ð‹'=>1,'ðŒ'=>1,'ð'=>1,'ðŽ'=>1,'ð'=>1,'ð'=>1,'ð‘'=>1,'ð’'=>1,'ð“'=>1,'ð”'=>1,'ð•'=>1,'ð–'=>1,'ð—'=>1,'ð˜'=>1,'ð™'=>1,'ðš'=>1,'ð›'=>1,'ðœ'=>1,'ð'=>1,'ðž'=>1,'ðŸ'=>1,'ð '=>1,'ð¡'=>1,'ð¢'=>1,'ð£'=>1,'ð¤'=>1,'ð¥'=>1,'ð¦'=>1,'ð§'=>1,'ð¨'=>1,'ð©'=>1,'ðª'=>1,'ð«'=>1,'ð¬'=>1,'ð­'=>1,'ð®'=>1,'ð¯'=>1,'ð°'=>1,'ð±'=>1,'ð²'=>1,'ð³'=>1,'ð´'=>1,'ðµ'=>1,'ð¶'=>1,'ð·'=>1,'ð¸'=>1,'ð¹'=>1,'ðº'=>1,'ð»'=>1,'ð¼'=>1,'ð½'=>1,'ð¾'=>1,'ð¿'=>1,'ðž€'=>1,'ðž'=>1,'ðž‚'=>1,'ðžƒ'=>1,'ðž„'=>1,'ðž…'=>1,'ðž†'=>1,'ðž‡'=>1,'ðžˆ'=>1,'ðž‰'=>1,'ðžŠ'=>1,'ðž‹'=>1,'ðžŒ'=>1,'ðž'=>1,'ðžŽ'=>1,'ðž'=>1,'ðž'=>1,'ðž‘'=>1,'ðž’'=>1,'ðž“'=>1,'ðž”'=>1,'ðž•'=>1,'ðž–'=>1,'ðž—'=>1,'ðž˜'=>1,'ðž™'=>1,'ðžš'=>1,'ðž›'=>1,'ðžœ'=>1,'ðž'=>1,'ðžž'=>1,'ðžŸ'=>1,'ðž '=>1,'ðž¡'=>1,'ðž¢'=>1,'ðž£'=>1,'ðž¤'=>1,'ðž¥'=>1,'ðž¦'=>1,'ðž§'=>1,'ðž¨'=>1,'ðž©'=>1,'ðžª'=>1,'ðž«'=>1,'ðž¬'=>1,'ðž­'=>1,'ðž®'=>1,'ðž¯'=>1,'ðž°'=>1,'ðž±'=>1,'ðž²'=>1,'ðž³'=>1,'ðž´'=>1,'ðžµ'=>1,'ðž¶'=>1,'ðž·'=>1,'ðž¸'=>1,'ðž¹'=>1,'ðžº'=>1,'ðž»'=>1,'ðž¼'=>1,'ðž½'=>1,'ðž¾'=>1,'ðž¿'=>1,'ðŸ€'=>1,'ðŸ'=>1,'ðŸ‚'=>1,'ðŸƒ'=>1,'ðŸ„'=>1,'ðŸ…'=>1,'ðŸ†'=>1,'ðŸ‡'=>1,'ðŸˆ'=>1,'ðŸ‰'=>1,'ðŸŠ'=>1,'ðŸ‹'=>1,'ðŸŽ'=>1,'ðŸ'=>1,'ðŸ'=>1,'ðŸ‘'=>1,'ðŸ’'=>1,'ðŸ“'=>1,'ðŸ”'=>1,'ðŸ•'=>1,'ðŸ–'=>1,'ðŸ—'=>1,'ðŸ˜'=>1,'ðŸ™'=>1,'ðŸš'=>1,'ðŸ›'=>1,'ðŸœ'=>1,'ðŸ'=>1,'ðŸž'=>1,'ðŸŸ'=>1,'ðŸ '=>1,'ðŸ¡'=>1,'ðŸ¢'=>1,'ðŸ£'=>1,'ðŸ¤'=>1,'ðŸ¥'=>1,'ðŸ¦'=>1,'ðŸ§'=>1,'ðŸ¨'=>1,'ðŸ©'=>1,'ðŸª'=>1,'ðŸ«'=>1,'ðŸ¬'=>1,'ðŸ­'=>1,'ðŸ®'=>1,'ðŸ¯'=>1,'ðŸ°'=>1,'ðŸ±'=>1,'ðŸ²'=>1,'ðŸ³'=>1,'ðŸ´'=>1,'ðŸµ'=>1,'ðŸ¶'=>1,'ðŸ·'=>1,'ðŸ¸'=>1,'ðŸ¹'=>1,'ðŸº'=>1,'ðŸ»'=>1,'ðŸ¼'=>1,'ðŸ½'=>1,'ðŸ¾'=>1,'ðŸ¿'=>1,'丽'=>1,'ð¯ '=>1,'乁'=>1,'𠄢'=>1,'你'=>1,'侮'=>1,'侻'=>1,'倂'=>1,'偺'=>1,'備'=>1,'僧'=>1,'像'=>1,'㒞'=>1,'ð¯ '=>1,'免'=>1,'ð¯ '=>1,'ð¯ '=>1,'具'=>1,'𠔜'=>1,'㒹'=>1,'內'=>1,'再'=>1,'𠕋'=>1,'冗'=>1,'冤'=>1,'仌'=>1,'冬'=>1,'况'=>1,'𩇟'=>1,'ð¯ '=>1,'刃'=>1,'㓟'=>1,'刻'=>1,'剆'=>1,'割'=>1,'剷'=>1,'㔕'=>1,'勇'=>1,'勉'=>1,'勤'=>1,'勺'=>1,'包'=>1,'匆'=>1,'北'=>1,'卉'=>1,'卑'=>1,'博'=>1,'即'=>1,'卽'=>1,'卿'=>1,'卿'=>1,'卿'=>1,'𠨬'=>1,'灰'=>1,'及'=>1,'叟'=>1,'𠭣'=>1,'叫'=>1,'叱'=>1,'吆'=>1,'咞'=>1,'吸'=>1,'呈'=>1,'周'=>1,'咢'=>1,'ð¯¡'=>1,'唐'=>1,'啓'=>1,'啣'=>1,'善'=>1,'善'=>1,'喙'=>1,'喫'=>1,'喳'=>1,'嗂'=>1,'圖'=>1,'嘆'=>1,'ð¯¡'=>1,'噑'=>1,'ð¯¡'=>1,'ð¯¡'=>1,'壮'=>1,'城'=>1,'埴'=>1,'堍'=>1,'型'=>1,'堲'=>1,'報'=>1,'墬'=>1,'𡓤'=>1,'売'=>1,'壷'=>1,'夆'=>1,'ð¯¡'=>1,'夢'=>1,'奢'=>1,'𡚨'=>1,'𡛪'=>1,'姬'=>1,'娛'=>1,'娧'=>1,'姘'=>1,'婦'=>1,'㛮'=>1,'㛼'=>1,'嬈'=>1,'嬾'=>1,'嬾'=>1,'𡧈'=>1,'寃'=>1,'寘'=>1,'寧'=>1,'寳'=>1,'𡬘'=>1,'寿'=>1,'将'=>1,'当'=>1,'尢'=>1,'㞁'=>1,'屠'=>1,'屮'=>1,'峀'=>1,'岍'=>1,'𡷤'=>1,'嵃'=>1,'𡷦'=>1,'嵮'=>1,'嵫'=>1,'嵼'=>1,'ð¯¢'=>1,'巢'=>1,'㠯'=>1,'巽'=>1,'帨'=>1,'帽'=>1,'幩'=>1,'㡢'=>1,'𢆃'=>1,'㡼'=>1,'庰'=>1,'庳'=>1,'ð¯¢'=>1,'廊'=>1,'ð¯¢'=>1,'ð¯¢'=>1,'𢌱'=>1,'𢌱'=>1,'舁'=>1,'弢'=>1,'弢'=>1,'㣇'=>1,'𣊸'=>1,'𦇚'=>1,'形'=>1,'彫'=>1,'㣣'=>1,'徚'=>1,'ð¯¢'=>1,'志'=>1,'忹'=>1,'悁'=>1,'㤺'=>1,'㤜'=>1,'悔'=>1,'𢛔'=>1,'惇'=>1,'慈'=>1,'慌'=>1,'慎'=>1,'慌'=>1,'慺'=>1,'憎'=>1,'憲'=>1,'憤'=>1,'憯'=>1,'懞'=>1,'懲'=>1,'懶'=>1,'成'=>1,'戛'=>1,'扝'=>1,'抱'=>1,'拔'=>1,'捐'=>1,'𢬌'=>1,'挽'=>1,'拼'=>1,'捨'=>1,'掃'=>1,'揤'=>1,'𢯱'=>1,'搢'=>1,'揅'=>1,'ð¯£'=>1,'㨮'=>1,'摩'=>1,'摾'=>1,'撝'=>1,'摷'=>1,'㩬'=>1,'敏'=>1,'敬'=>1,'𣀊'=>1,'旣'=>1,'書'=>1,'ð¯£'=>1,'㬙'=>1,'ð¯£'=>1,'ð¯£'=>1,'㫤'=>1,'冒'=>1,'冕'=>1,'最'=>1,'暜'=>1,'肭'=>1,'䏙'=>1,'朗'=>1,'望'=>1,'朡'=>1,'杞'=>1,'杓'=>1,'ð¯£'=>1,'㭉'=>1,'柺'=>1,'枅'=>1,'桒'=>1,'梅'=>1,'𣑭'=>1,'梎'=>1,'栟'=>1,'椔'=>1,'㮝'=>1,'楂'=>1,'榣'=>1,'槪'=>1,'檨'=>1,'𣚣'=>1,'櫛'=>1,'㰘'=>1,'次'=>1,'𣢧'=>1,'歔'=>1,'㱎'=>1,'歲'=>1,'殟'=>1,'殺'=>1,'殻'=>1,'𣪍'=>1,'𡴋'=>1,'𣫺'=>1,'汎'=>1,'𣲼'=>1,'沿'=>1,'泍'=>1,'汧'=>1,'洖'=>1,'派'=>1,'ð¯¤'=>1,'流'=>1,'浩'=>1,'浸'=>1,'涅'=>1,'𣴞'=>1,'洴'=>1,'港'=>1,'湮'=>1,'㴳'=>1,'滋'=>1,'滇'=>1,'ð¯¤'=>1,'淹'=>1,'ð¯¤'=>1,'ð¯¤'=>1,'𣾎'=>1,'濆'=>1,'瀹'=>1,'瀞'=>1,'瀛'=>1,'㶖'=>1,'灊'=>1,'災'=>1,'灷'=>1,'炭'=>1,'𠔥'=>1,'煅'=>1,'ð¯¤'=>1,'熜'=>1,'𤎫'=>1,'爨'=>1,'爵'=>1,'牐'=>1,'𤘈'=>1,'犀'=>1,'犕'=>1,'𤜵'=>1,'𤠔'=>1,'獺'=>1,'王'=>1,'㺬'=>1,'玥'=>1,'㺸'=>1,'㺸'=>1,'瑇'=>1,'瑜'=>1,'瑱'=>1,'璅'=>1,'瓊'=>1,'㼛'=>1,'甤'=>1,'𤰶'=>1,'甾'=>1,'𤲒'=>1,'異'=>1,'𢆟'=>1,'瘐'=>1,'𤾡'=>1,'𤾸'=>1,'𥁄'=>1,'㿼'=>1,'䀈'=>1,'直'=>1,'ð¯¥'=>1,'𥃲'=>1,'𥄙'=>1,'𥄳'=>1,'眞'=>1,'真'=>1,'真'=>1,'睊'=>1,'䀹'=>1,'瞋'=>1,'䁆'=>1,'䂖'=>1,'ð¯¥'=>1,'硎'=>1,'ð¯¥'=>1,'ð¯¥'=>1,'䃣'=>1,'𥘦'=>1,'祖'=>1,'𥚚'=>1,'𥛅'=>1,'福'=>1,'秫'=>1,'䄯'=>1,'穀'=>1,'穊'=>1,'穏'=>1,'𥥼'=>1,'ð¯¥'=>1,'𥪧'=>1,'竮'=>1,'䈂'=>1,'𥮫'=>1,'篆'=>1,'築'=>1,'䈧'=>1,'𥲀'=>1,'糒'=>1,'䊠'=>1,'糨'=>1,'糣'=>1,'紀'=>1,'𥾆'=>1,'絣'=>1,'䌁'=>1,'緇'=>1,'縂'=>1,'繅'=>1,'䌴'=>1,'𦈨'=>1,'𦉇'=>1,'䍙'=>1,'𦋙'=>1,'罺'=>1,'𦌾'=>1,'羕'=>1,'翺'=>1,'者'=>1,'𦓚'=>1,'𦔣'=>1,'聠'=>1,'𦖨'=>1,'聰'=>1,'𣍟'=>1,'ð¯¦'=>1,'育'=>1,'脃'=>1,'䐋'=>1,'脾'=>1,'媵'=>1,'𦞧'=>1,'𦞵'=>1,'𣎓'=>1,'𣎜'=>1,'舁'=>1,'舄'=>1,'ð¯¦'=>1,'䑫'=>1,'ð¯¦'=>1,'ð¯¦'=>1,'芝'=>1,'劳'=>1,'花'=>1,'芳'=>1,'芽'=>1,'苦'=>1,'𦬼'=>1,'若'=>1,'茝'=>1,'荣'=>1,'莭'=>1,'茣'=>1,'ð¯¦'=>1,'菧'=>1,'著'=>1,'荓'=>1,'菊'=>1,'菌'=>1,'菜'=>1,'𦰶'=>1,'𦵫'=>1,'𦳕'=>1,'䔫'=>1,'蓱'=>1,'蓳'=>1,'蔖'=>1,'𧏊'=>1,'蕤'=>1,'𦼬'=>1,'䕝'=>1,'䕡'=>1,'𦾱'=>1,'𧃒'=>1,'䕫'=>1,'虐'=>1,'虜'=>1,'虧'=>1,'虩'=>1,'蚩'=>1,'蚈'=>1,'蜎'=>1,'蛢'=>1,'蝹'=>1,'蜨'=>1,'蝫'=>1,'螆'=>1,'䗗'=>1,'蟡'=>1,'ð¯§'=>1,'䗹'=>1,'衠'=>1,'衣'=>1,'𧙧'=>1,'裗'=>1,'裞'=>1,'䘵'=>1,'裺'=>1,'㒻'=>1,'𧢮'=>1,'𧥦'=>1,'ð¯§'=>1,'䛇'=>1,'ð¯§'=>1,'ð¯§'=>1,'變'=>1,'豕'=>1,'𧲨'=>1,'貫'=>1,'賁'=>1,'贛'=>1,'起'=>1,'𧼯'=>1,'𠠄'=>1,'跋'=>1,'趼'=>1,'跰'=>1,'ð¯§'=>1,'軔'=>1,'輸'=>1,'𨗒'=>1,'𨗭'=>1,'邔'=>1,'郱'=>1,'鄑'=>1,'𨜮'=>1,'鄛'=>1,'鈸'=>1,'鋗'=>1,'鋘'=>1,'鉼'=>1,'鏹'=>1,'鐕'=>1,'𨯺'=>1,'開'=>1,'䦕'=>1,'閷'=>1,'𨵷'=>1,'䧦'=>1,'雃'=>1,'嶲'=>1,'霣'=>1,'𩅅'=>1,'𩈚'=>1,'䩮'=>1,'䩶'=>1,'韠'=>1,'𩐊'=>1,'䪲'=>1,'𩒖'=>1,'頋'=>1,'頋'=>1,'頩'=>1,'ð¯¨'=>1,'飢'=>1,'䬳'=>1,'餩'=>1,'馧'=>1,'駂'=>1,'駾'=>1,'䯎'=>1,'𩬰'=>1,'鬒'=>1,'鱀'=>1,'鳽'=>1,'ð¯¨'=>1,'䳭'=>1,'ð¯¨'=>1,'ð¯¨'=>1,'䳸'=>1,'𪄅'=>1,'𪈎'=>1,'𪊑'=>1,'麻'=>1,'䵖'=>1,'黹'=>1,'黾'=>1,'鼅'=>1,'鼏'=>1,'鼖'=>1,'鼻'=>1,'ð¯¨'=>1,'Ì€'=>0,'Ì'=>0,'Ì‚'=>0,'̃'=>0,'Ì„'=>0,'̆'=>0,'̇'=>0,'̈'=>0,'̉'=>0,'ÌŠ'=>0,'Ì‹'=>0,'ÌŒ'=>0,'Ì'=>0,'Ì‘'=>0,'Ì“'=>0,'Ì”'=>0,'Ì›'=>0,'Ì£'=>0,'̤'=>0,'Ì¥'=>0,'̦'=>0,'̧'=>0,'̨'=>0,'Ì­'=>0,'Ì®'=>0,'̰'=>0,'̱'=>0,'̸'=>0,'Í‚'=>0,'Í…'=>0,'Ù“'=>0,'Ù”'=>0,'Ù•'=>0,'़'=>0,'া'=>0,'à§—'=>0,'ା'=>0,'à­–'=>0,'à­—'=>0,'ா'=>0,'ௗ'=>0,'à±–'=>0,'ೂ'=>0,'ೕ'=>0,'à³–'=>0,'à´¾'=>0,'ൗ'=>0,'à·Š'=>0,'à·'=>0,'à·Ÿ'=>0,'ီ'=>0,'á…¡'=>0,'á…¢'=>0,'á…£'=>0,'á…¤'=>0,'á…¥'=>0,'á…¦'=>0,'á…§'=>0,'á…¨'=>0,'á…©'=>0,'á…ª'=>0,'á…«'=>0,'á…¬'=>0,'á…­'=>0,'á…®'=>0,'á…¯'=>0,'á…°'=>0,'á…±'=>0,'á…²'=>0,'á…³'=>0,'á…´'=>0,'á…µ'=>0,'ᆨ'=>0,'ᆩ'=>0,'ᆪ'=>0,'ᆫ'=>0,'ᆬ'=>0,'ᆭ'=>0,'ᆮ'=>0,'ᆯ'=>0,'ᆰ'=>0,'ᆱ'=>0,'ᆲ'=>0,'ᆳ'=>0,'ᆴ'=>0,'ᆵ'=>0,'ᆶ'=>0,'ᆷ'=>0,'ᆸ'=>0,'ᆹ'=>0,'ᆺ'=>0,'ᆻ'=>0,'ᆼ'=>0,'ᆽ'=>0,'ᆾ'=>0,'ᆿ'=>0,'ᇀ'=>0,'á‡'=>0,'ᇂ'=>0,'ᬵ'=>0,'ã‚™'=>0,'゚'=>0); \ No newline at end of file diff --git a/phpBB/includes/utf/data/utf_normalizer_common.php b/phpBB/includes/utf/data/utf_normalizer_common.php deleted file mode 100644 index befc17d410..0000000000 --- a/phpBB/includes/utf/data/utf_normalizer_common.php +++ /dev/null @@ -1,4 +0,0 @@ -44032,'á„'=>44620,'á„‚'=>45208,'ᄃ'=>45796,'á„„'=>46384,'á„…'=>46972,'ᄆ'=>47560,'ᄇ'=>48148,'ᄈ'=>48736,'ᄉ'=>49324,'ᄊ'=>49912,'á„‹'=>50500,'ᄌ'=>51088,'á„'=>51676,'ᄎ'=>52264,'á„'=>52852,'á„'=>53440,'á„‘'=>54028,'á„’'=>54616,'á…¡'=>0,'á…¢'=>28,'á…£'=>56,'á…¤'=>84,'á…¥'=>112,'á…¦'=>140,'á…§'=>168,'á…¨'=>196,'á…©'=>224,'á…ª'=>252,'á…«'=>280,'á…¬'=>308,'á…­'=>336,'á…®'=>364,'á…¯'=>392,'á…°'=>420,'á…±'=>448,'á…²'=>476,'á…³'=>504,'á…´'=>532,'á…µ'=>560,'ᆧ'=>0,'ᆨ'=>1,'ᆩ'=>2,'ᆪ'=>3,'ᆫ'=>4,'ᆬ'=>5,'ᆭ'=>6,'ᆮ'=>7,'ᆯ'=>8,'ᆰ'=>9,'ᆱ'=>10,'ᆲ'=>11,'ᆳ'=>12,'ᆴ'=>13,'ᆵ'=>14,'ᆶ'=>15,'ᆷ'=>16,'ᆸ'=>17,'ᆹ'=>18,'ᆺ'=>19,'ᆻ'=>20,'ᆼ'=>21,'ᆽ'=>22,'ᆾ'=>23,'ᆿ'=>24,'ᇀ'=>25,'á‡'=>26,'ᇂ'=>27); -$GLOBALS['utf_jamo_type']=array('á„€'=>0,'á„'=>0,'á„‚'=>0,'ᄃ'=>0,'á„„'=>0,'á„…'=>0,'ᄆ'=>0,'ᄇ'=>0,'ᄈ'=>0,'ᄉ'=>0,'ᄊ'=>0,'á„‹'=>0,'ᄌ'=>0,'á„'=>0,'ᄎ'=>0,'á„'=>0,'á„'=>0,'á„‘'=>0,'á„’'=>0,'á…¡'=>1,'á…¢'=>1,'á…£'=>1,'á…¤'=>1,'á…¥'=>1,'á…¦'=>1,'á…§'=>1,'á…¨'=>1,'á…©'=>1,'á…ª'=>1,'á…«'=>1,'á…¬'=>1,'á…­'=>1,'á…®'=>1,'á…¯'=>1,'á…°'=>1,'á…±'=>1,'á…²'=>1,'á…³'=>1,'á…´'=>1,'á…µ'=>1,'ᆧ'=>2,'ᆨ'=>2,'ᆩ'=>2,'ᆪ'=>2,'ᆫ'=>2,'ᆬ'=>2,'ᆭ'=>2,'ᆮ'=>2,'ᆯ'=>2,'ᆰ'=>2,'ᆱ'=>2,'ᆲ'=>2,'ᆳ'=>2,'ᆴ'=>2,'ᆵ'=>2,'ᆶ'=>2,'ᆷ'=>2,'ᆸ'=>2,'ᆹ'=>2,'ᆺ'=>2,'ᆻ'=>2,'ᆼ'=>2,'ᆽ'=>2,'ᆾ'=>2,'ᆿ'=>2,'ᇀ'=>2,'á‡'=>2,'ᇂ'=>2); -$GLOBALS['utf_combining_class']=array('Ì€'=>230,'Ì'=>230,'Ì‚'=>230,'̃'=>230,'Ì„'=>230,'Ì…'=>230,'̆'=>230,'̇'=>230,'̈'=>230,'̉'=>230,'ÌŠ'=>230,'Ì‹'=>230,'ÌŒ'=>230,'Ì'=>230,'ÌŽ'=>230,'Ì'=>230,'Ì'=>230,'Ì‘'=>230,'Ì’'=>230,'Ì“'=>230,'Ì”'=>230,'Ì•'=>232,'Ì–'=>220,'Ì—'=>220,'̘'=>220,'Ì™'=>220,'Ìš'=>232,'Ì›'=>216,'Ìœ'=>220,'Ì'=>220,'Ìž'=>220,'ÌŸ'=>220,'Ì '=>220,'Ì¡'=>202,'Ì¢'=>202,'Ì£'=>220,'̤'=>220,'Ì¥'=>220,'̦'=>220,'̧'=>202,'̨'=>202,'Ì©'=>220,'̪'=>220,'Ì«'=>220,'̬'=>220,'Ì­'=>220,'Ì®'=>220,'̯'=>220,'̰'=>220,'̱'=>220,'̲'=>220,'̳'=>220,'Ì´'=>1,'̵'=>1,'̶'=>1,'Ì·'=>1,'̸'=>1,'̹'=>220,'̺'=>220,'Ì»'=>220,'̼'=>220,'̽'=>230,'̾'=>230,'Ì¿'=>230,'Í€'=>230,'Í'=>230,'Í‚'=>230,'̓'=>230,'Í„'=>230,'Í…'=>240,'͆'=>230,'͇'=>220,'͈'=>220,'͉'=>220,'ÍŠ'=>230,'Í‹'=>230,'ÍŒ'=>230,'Í'=>220,'ÍŽ'=>220,'Í'=>230,'Í‘'=>230,'Í’'=>230,'Í“'=>220,'Í”'=>220,'Í•'=>220,'Í–'=>220,'Í—'=>230,'͘'=>232,'Í™'=>220,'Íš'=>220,'Í›'=>230,'Íœ'=>233,'Í'=>234,'Íž'=>234,'ÍŸ'=>233,'Í '=>234,'Í¡'=>234,'Í¢'=>233,'Í£'=>230,'ͤ'=>230,'Í¥'=>230,'ͦ'=>230,'ͧ'=>230,'ͨ'=>230,'Í©'=>230,'ͪ'=>230,'Í«'=>230,'ͬ'=>230,'Í­'=>230,'Í®'=>230,'ͯ'=>230,'Òƒ'=>230,'Ò„'=>230,'Ò…'=>230,'Ò†'=>230,'Ö‘'=>220,'Ö’'=>230,'Ö“'=>230,'Ö”'=>230,'Ö•'=>230,'Ö–'=>220,'Ö—'=>230,'Ö˜'=>230,'Ö™'=>230,'Öš'=>222,'Ö›'=>220,'Öœ'=>230,'Ö'=>230,'Öž'=>230,'ÖŸ'=>230,'Ö '=>230,'Ö¡'=>230,'Ö¢'=>220,'Ö£'=>220,'Ö¤'=>220,'Ö¥'=>220,'Ö¦'=>220,'Ö§'=>220,'Ö¨'=>230,'Ö©'=>230,'Öª'=>220,'Ö«'=>230,'Ö¬'=>230,'Ö­'=>222,'Ö®'=>228,'Ö¯'=>230,'Ö°'=>10,'Ö±'=>11,'Ö²'=>12,'Ö³'=>13,'Ö´'=>14,'Öµ'=>15,'Ö¶'=>16,'Ö·'=>17,'Ö¸'=>18,'Ö¹'=>19,'Öº'=>19,'Ö»'=>20,'Ö¼'=>21,'Ö½'=>22,'Ö¿'=>23,'×'=>24,'ׂ'=>25,'ׄ'=>230,'×…'=>220,'ׇ'=>18,'Ø'=>230,'Ø‘'=>230,'Ø’'=>230,'Ø“'=>230,'Ø”'=>230,'Ø•'=>230,'Ù‹'=>27,'ÙŒ'=>28,'Ù'=>29,'ÙŽ'=>30,'Ù'=>31,'Ù'=>32,'Ù‘'=>33,'Ù’'=>34,'Ù“'=>230,'Ù”'=>230,'Ù•'=>220,'Ù–'=>220,'Ù—'=>230,'Ù˜'=>230,'Ù™'=>230,'Ùš'=>230,'Ù›'=>230,'Ùœ'=>220,'Ù'=>230,'Ùž'=>230,'Ù°'=>35,'Û–'=>230,'Û—'=>230,'Û˜'=>230,'Û™'=>230,'Ûš'=>230,'Û›'=>230,'Ûœ'=>230,'ÛŸ'=>230,'Û '=>230,'Û¡'=>230,'Û¢'=>230,'Û£'=>220,'Û¤'=>230,'Û§'=>230,'Û¨'=>230,'Ûª'=>220,'Û«'=>230,'Û¬'=>230,'Û­'=>220,'Ü‘'=>36,'ܰ'=>230,'ܱ'=>220,'ܲ'=>230,'ܳ'=>230,'Ü´'=>220,'ܵ'=>230,'ܶ'=>230,'Ü·'=>220,'ܸ'=>220,'ܹ'=>220,'ܺ'=>230,'Ü»'=>220,'ܼ'=>220,'ܽ'=>230,'ܾ'=>220,'Ü¿'=>230,'Ý€'=>230,'Ý'=>230,'Ý‚'=>220,'݃'=>230,'Ý„'=>220,'Ý…'=>230,'݆'=>220,'݇'=>230,'݈'=>220,'݉'=>230,'ÝŠ'=>230,'ß«'=>230,'߬'=>230,'ß­'=>230,'ß®'=>230,'߯'=>230,'ß°'=>230,'ß±'=>230,'ß²'=>220,'ß³'=>230,'़'=>7,'à¥'=>9,'॑'=>230,'॒'=>220,'॓'=>230,'॔'=>230,'়'=>7,'à§'=>9,'਼'=>7,'à©'=>9,'઼'=>7,'à«'=>9,'଼'=>7,'à­'=>9,'à¯'=>9,'à±'=>9,'ౕ'=>84,'à±–'=>91,'಼'=>7,'à³'=>9,'àµ'=>9,'à·Š'=>9,'ุ'=>103,'ู'=>103,'ฺ'=>9,'่'=>107,'้'=>107,'๊'=>107,'๋'=>107,'ຸ'=>118,'ູ'=>118,'່'=>122,'້'=>122,'໊'=>122,'໋'=>122,'༘'=>220,'༙'=>220,'༵'=>220,'༷'=>220,'༹'=>216,'ཱ'=>129,'ི'=>130,'ུ'=>132,'ེ'=>130,'ཻ'=>130,'ོ'=>130,'ཽ'=>130,'ྀ'=>130,'ྂ'=>230,'ྃ'=>230,'྄'=>9,'྆'=>230,'྇'=>230,'࿆'=>220,'့'=>7,'္'=>9,'áŸ'=>230,'᜔'=>9,'᜴'=>9,'្'=>9,'áŸ'=>230,'ᢩ'=>228,'᤹'=>222,'᤺'=>230,'᤻'=>220,'ᨗ'=>230,'ᨘ'=>220,'᬴'=>7,'á­„'=>9,'á­«'=>230,'á­¬'=>220,'á­­'=>230,'á­®'=>230,'á­¯'=>230,'á­°'=>230,'á­±'=>230,'á­²'=>230,'á­³'=>230,'á·€'=>230,'á·'=>230,'á·‚'=>220,'á·ƒ'=>230,'á·„'=>230,'á·…'=>230,'á·†'=>230,'á·‡'=>230,'á·ˆ'=>230,'á·‰'=>230,'á·Š'=>220,'á·¾'=>230,'á·¿'=>220,'âƒ'=>230,'⃑'=>230,'⃒'=>1,'⃓'=>1,'⃔'=>230,'⃕'=>230,'⃖'=>230,'⃗'=>230,'⃘'=>1,'⃙'=>1,'⃚'=>1,'⃛'=>230,'⃜'=>230,'⃡'=>230,'⃥'=>1,'⃦'=>1,'⃧'=>230,'⃨'=>220,'⃩'=>230,'⃪'=>1,'⃫'=>1,'⃬'=>220,'⃭'=>220,'⃮'=>220,'⃯'=>220,'〪'=>218,'〫'=>228,'〬'=>232,'〭'=>222,'〮'=>224,'〯'=>224,'ã‚™'=>8,'゚'=>8,'ê †'=>9,'ﬞ'=>26,'︠'=>230,'︡'=>230,'︢'=>230,'︣'=>230,'ð¨'=>220,'ð¨'=>230,'ð¨¸'=>230,'ð¨¹'=>1,'ð¨º'=>220,'ð¨¿'=>9,'ð…¥'=>216,'ð…¦'=>216,'ð…§'=>1,'ð…¨'=>1,'ð…©'=>1,'ð…­'=>226,'ð…®'=>216,'ð…¯'=>216,'ð…°'=>216,'ð…±'=>216,'ð…²'=>216,'ð…»'=>220,'ð…¼'=>220,'ð…½'=>220,'ð…¾'=>220,'ð…¿'=>220,'ð†€'=>220,'ð†'=>220,'ð†‚'=>220,'ð†…'=>230,'ð††'=>230,'ð†‡'=>230,'ð†ˆ'=>230,'ð†‰'=>230,'ð†Š'=>220,'ð†‹'=>220,'ð†ª'=>230,'ð†«'=>230,'ð†¬'=>230,'ð†­'=>230,'ð‰‚'=>230,'ð‰ƒ'=>230,'ð‰„'=>230); \ No newline at end of file diff --git a/phpBB/includes/utf/utf_normalizer.php b/phpBB/includes/utf/utf_normalizer.php deleted file mode 100644 index 5ed14d4ebb..0000000000 --- a/phpBB/includes/utf/utf_normalizer.php +++ /dev/null @@ -1,1516 +0,0 @@ - $str[$pos - 1]) : array(); - - // UTF char length array - // This array is used to determine the length of a UTF character. - // Be $c the result of ($str[$pos] & "\xF0") --where $str is the string we're operating on and $pos - // the position of the cursor--, if $utf_len_mask[$c] does not exist, the byte is an ASCII char. - // Otherwise, if $utf_len_mask[$c] is greater than 0, we have a the leading byte of a multibyte character - // whose length is $utf_len_mask[$c] and if it is equal to 0, the byte is a trailing byte. - $utf_len_mask = array( - // Leading bytes masks - "\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4, - // Trailing bytes masks - "\x80" => 0, "\x90" => 0, "\xA0" => 0, "\xB0" => 0 - ); - - $extra_check = array( - "\xED" => 1, "\xEF" => 1, "\xC0" => 1, "\xC1" => 1, "\xE0" => 1, "\xF0" => 1, - "\xF4" => 1, "\xF5" => 1, "\xF6" => 1, "\xF7" => 1, "\xF8" => 1, "\xF9" => 1, - "\xFA" => 1, "\xFB" => 1, "\xFC" => 1, "\xFD" => 1, "\xFE" => 1, "\xFF" => 1 - ); - - $utf_validation_mask = array( - 2 => "\xE0\xC0", - 3 => "\xF0\xC0\xC0", - 4 => "\xF8\xC0\xC0\xC0" - ); - - $utf_validation_check = array( - 2 => "\xC0\x80", - 3 => "\xE0\x80\x80", - 4 => "\xF0\x80\x80\x80" - ); - - // Main loop - do - { - // STEP 0: Capture the current char and buffer it - $c = $str[$pos]; - $c_mask = $c & "\xF0"; - - if (isset($utf_len_mask[$c_mask])) - { - // Byte at $pos is either a leading byte or a missplaced trailing byte - if ($utf_len = $utf_len_mask[$c_mask]) - { - // Capture the char - $buffer[++$i & 7] = $utf_char = substr($str, $pos, $utf_len); - - // Let's find out if a thorough check is needed - if (isset($qc[$utf_char])) - { - // If the UTF char is in the qc array then it may not be in normal form. We do nothing here, the actual processing is below this "if" block - } - else if (isset($utf_combining_class[$utf_char])) - { - if ($utf_combining_class[$utf_char] < $last_cc) - { - // A combining character that is NOT canonically ordered - } - else - { - // A combining character that IS canonically ordered, skip to the next char - $last_cc = $utf_combining_class[$utf_char]; - - $pos += $utf_len; - continue; - } - } - else - { - // At this point, $utf_char holds a UTF char that we know is not a NF[K]C_QC and is not a combining character. - // It can be a singleton, a canonical composite, a replacement char or an even an ill-formed bunch of bytes. Let's find out - $last_cc = 0; - - // Check that we have the correct number of trailing bytes - if (($utf_char & $utf_validation_mask[$utf_len]) != $utf_validation_check[$utf_len]) - { - // Current char isn't well-formed or legal: either one or several trailing bytes are missing, or the Unicode char - // has been encoded in a five- or six- byte sequence - if ($utf_char[0] >= "\xF8") - { - if ($utf_char[0] < "\xFC") - { - $trailing_bytes = 4; - } - else if ($utf_char[0] > "\xFD") - { - $trailing_bytes = 0; - } - else - { - $trailing_bytes = 5; - } - } - else - { - $trailing_bytes = $utf_len - 1; - } - - $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . self::UTF8_REPLACEMENT; - $pos += strspn($str, self::UTF8_TRAILING_BYTES, ++$pos, $trailing_bytes); - $tmp_pos = $pos; - - continue; - } - - if (isset($extra_check[$c])) - { - switch ($c) - { - // Note: 0xED is quite common in Korean - case "\xED": - if ($utf_char >= "\xED\xA0\x80") - { - // Surrogates (U+D800..U+DFFF) are not allowed in UTF-8 (UTF sequence 0xEDA080..0xEDBFBF) - $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . self::UTF8_REPLACEMENT; - $pos += $utf_len; - $tmp_pos = $pos; - continue 2; - } - break; - - // Note: 0xEF is quite common in Japanese - case "\xEF": - if ($utf_char == "\xEF\xBF\xBE" || $utf_char == "\xEF\xBF\xBF") - { - // U+FFFE and U+FFFF are explicitly disallowed (UTF sequence 0xEFBFBE..0xEFBFBF) - $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . self::UTF8_REPLACEMENT; - $pos += $utf_len; - $tmp_pos = $pos; - continue 2; - } - break; - - case "\xC0": - case "\xC1": - if ($utf_char <= "\xC1\xBF") - { - // Overlong sequence: Unicode char U+0000..U+007F encoded as a double-byte UTF char - $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . self::UTF8_REPLACEMENT; - $pos += $utf_len; - $tmp_pos = $pos; - continue 2; - } - break; - - case "\xE0": - if ($utf_char <= "\xE0\x9F\xBF") - { - // Unicode char U+0000..U+07FF encoded in 3 bytes - $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . self::UTF8_REPLACEMENT; - $pos += $utf_len; - $tmp_pos = $pos; - continue 2; - } - break; - - case "\xF0": - if ($utf_char <= "\xF0\x8F\xBF\xBF") - { - // Unicode char U+0000..U+FFFF encoded in 4 bytes - $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . self::UTF8_REPLACEMENT; - $pos += $utf_len; - $tmp_pos = $pos; - continue 2; - } - break; - - default: - // Five- and six- byte sequences do not need being checked for here anymore - if ($utf_char > UTF8_MAX) - { - // Out of the Unicode range - if ($utf_char[0] < "\xF8") - { - $trailing_bytes = 3; - } - else if ($utf_char[0] < "\xFC") - { - $trailing_bytes = 4; - } - else if ($utf_char[0] > "\xFD") - { - $trailing_bytes = 0; - } - else - { - $trailing_bytes = 5; - } - - $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . self::UTF8_REPLACEMENT; - $pos += strspn($str, self::UTF8_TRAILING_BYTES, ++$pos, $trailing_bytes); - $tmp_pos = $pos; - continue 2; - } - break; - } - } - - // The char is a valid starter, move the cursor and go on - $pos += $utf_len; - continue; - } - } - else - { - // A trailing byte came out of nowhere, we will advance the cursor and treat the this byte and all following trailing bytes as if - // each of them was a Unicode replacement char - $spn = strspn($str, self::UTF8_TRAILING_BYTES, $pos); - $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . str_repeat(self::UTF8_REPLACEMENT, $spn); - - $pos += $spn; - $tmp_pos = $pos; - continue; - } - - - // STEP 1: Decompose current char - - // We have found a character that is either: - // - in the NFC_QC/NFKC_QC list - // - a non-starter char that is not canonically ordered - // - // We are going to capture the shortest UTF sequence that satisfies these two conditions: - // - // 1 - If the sequence does not start at the begginning of the string, it must begin with a starter, - // and that starter must not have the NF[K]C_QC property equal to "MAYBE" - // - // 2 - If the sequence does not end at the end of the string, it must end with a non-starter and be - // immediately followed by a starter that is not on the QC list - // - $utf_seq = array(); - $last_cc = 0; - $lpos = $pos; - $pos += $utf_len; - - if (isset($decomp_map[$utf_char])) - { - $_pos = 0; - $_len = strlen($decomp_map[$utf_char]); - - do - { - $_utf_len =& $utf_len_mask[$decomp_map[$utf_char][$_pos] & "\xF0"]; - - if (isset($_utf_len)) - { - $utf_seq[] = substr($decomp_map[$utf_char], $_pos, $_utf_len); - $_pos += $_utf_len; - } - else - { - $utf_seq[] = $decomp_map[$utf_char][$_pos]; - ++$_pos; - } - } - while ($_pos < $_len); - } - else - { - // The char is not decomposable - $utf_seq = array($utf_char); - } - - - // STEP 2: Capture the starter - - // Check out the combining class of the first character of the UTF sequence - $k = 0; - if (isset($utf_combining_class[$utf_seq[0]]) || $qc[$utf_char] == self::UNICODE_QC_MAYBE) - { - // Not a starter, inspect previous characters - // The last 8 characters are kept in a buffer so that we don't have to capture them everytime. - // This is enough for all real-life strings but even if it wasn't, we can capture characters in backward mode, - // although it is slower than this method. - // - // In the following loop, $j starts at the previous buffered character ($i - 1, because current character is - // at offset $i) and process them in backward mode until we find a starter. - // - // $k is the index on each UTF character inside of our UTF sequence. At this time, $utf_seq contains one or more - // characters numbered 0 to n. $k starts at 0 and for each char we prepend we pre-decrement it and for numbering - $starter_found = 0; - $j_min = max(1, $i - 7); - - for ($j = $i - 1; $j >= $j_min && $lpos > $tmp_pos; --$j) - { - $utf_char = $buffer[$j & 7]; - $lpos -= strlen($utf_char); - - if (isset($decomp_map[$utf_char])) - { - // The char is a composite, decompose for storage - $decomp_seq = array(); - $_pos = 0; - $_len = strlen($decomp_map[$utf_char]); - - do - { - $c = $decomp_map[$utf_char][$_pos]; - $_utf_len =& $utf_len_mask[$c & "\xF0"]; - - if (isset($_utf_len)) - { - $decomp_seq[] = substr($decomp_map[$utf_char], $_pos, $_utf_len); - $_pos += $_utf_len; - } - else - { - $decomp_seq[] = $c; - ++$_pos; - } - } - while ($_pos < $_len); - - // Prepend the UTF sequence with our decomposed sequence - if (isset($decomp_seq[1])) - { - // The char expanded into several chars - $decomp_cnt = sizeof($decomp_seq); - - foreach ($decomp_seq as $decomp_i => $decomp_char) - { - $utf_seq[$k + $decomp_i - $decomp_cnt] = $decomp_char; - } - $k -= $decomp_cnt; - } - else - { - // Decomposed to a single char, easier to prepend - $utf_seq[--$k] = $decomp_seq[0]; - } - } - else - { - $utf_seq[--$k] = $utf_char; - } - - if (!isset($utf_combining_class[$utf_seq[$k]])) - { - // We have found our starter - $starter_found = 1; - break; - } - } - - if (!$starter_found && $lpos > $tmp_pos) - { - // The starter was not found in the buffer, let's rewind some more - do - { - // $utf_len_mask contains the masks of both leading bytes and trailing bytes. If $utf_en > 0 then it's a leading byte, otherwise it's a trailing byte. - $c = $str[--$lpos]; - $c_mask = $c & "\xF0"; - - if (isset($utf_len_mask[$c_mask])) - { - // UTF byte - if ($utf_len = $utf_len_mask[$c_mask]) - { - // UTF *leading* byte - $utf_char = substr($str, $lpos, $utf_len); - - if (isset($decomp_map[$utf_char])) - { - // Decompose the character - $decomp_seq = array(); - $_pos = 0; - $_len = strlen($decomp_map[$utf_char]); - - do - { - $c = $decomp_map[$utf_char][$_pos]; - $_utf_len =& $utf_len_mask[$c & "\xF0"]; - - if (isset($_utf_len)) - { - $decomp_seq[] = substr($decomp_map[$utf_char], $_pos, $_utf_len); - $_pos += $_utf_len; - } - else - { - $decomp_seq[] = $c; - ++$_pos; - } - } - while ($_pos < $_len); - - // Prepend the UTF sequence with our decomposed sequence - if (isset($decomp_seq[1])) - { - // The char expanded into several chars - $decomp_cnt = sizeof($decomp_seq); - foreach ($decomp_seq as $decomp_i => $utf_char) - { - $utf_seq[$k + $decomp_i - $decomp_cnt] = $utf_char; - } - $k -= $decomp_cnt; - } - else - { - // Decomposed to a single char, easier to prepend - $utf_seq[--$k] = $decomp_seq[0]; - } - } - else - { - $utf_seq[--$k] = $utf_char; - } - } - } - else - { - // ASCII char - $utf_seq[--$k] = $c; - } - } - while ($lpos > $tmp_pos); - } - } - - - // STEP 3: Capture following combining modifiers - - while ($pos < $len) - { - $c_mask = $str[$pos] & "\xF0"; - - if (isset($utf_len_mask[$c_mask])) - { - if ($utf_len = $utf_len_mask[$c_mask]) - { - $utf_char = substr($str, $pos, $utf_len); - } - else - { - // A trailing byte came out of nowhere - // Trailing bytes are replaced with Unicode replacement chars, we will just ignore it for now, break out of the loop - // as if it was a starter (replacement chars ARE starters) and let the next loop replace it - break; - } - - if (isset($utf_combining_class[$utf_char]) || isset($qc[$utf_char])) - { - // Combining character, add it to the sequence and move the cursor - if (isset($decomp_map[$utf_char])) - { - // Decompose the character - $_pos = 0; - $_len = strlen($decomp_map[$utf_char]); - - do - { - $c = $decomp_map[$utf_char][$_pos]; - $_utf_len =& $utf_len_mask[$c & "\xF0"]; - - if (isset($_utf_len)) - { - $utf_seq[] = substr($decomp_map[$utf_char], $_pos, $_utf_len); - $_pos += $_utf_len; - } - else - { - $utf_seq[] = $c; - ++$_pos; - } - } - while ($_pos < $_len); - } - else - { - $utf_seq[] = $utf_char; - } - - $pos += $utf_len; - } - else - { - // Combining class 0 and no QC, break out of the loop - // Note: we do not know if that character is valid. If it's not, the next iteration will replace it - break; - } - } - else - { - // ASCII chars are starters - break; - } - } - - - // STEP 4: Sort and combine - - // Here we sort... - $k_max = $k + sizeof($utf_seq); - - if (!$k && $k_max == 1) - { - // There is only one char in the UTF sequence, add it then jump to the next iteration of main loop - if (substr_compare($str, $utf_seq[0], $lpos, $pos - $lpos)) - { - $tmp .= substr($str, $tmp_pos, $lpos - $tmp_pos) . $utf_seq[0]; - $tmp_pos = $pos; - } - - continue; - } - - // ...there we combine - if (isset($utf_combining_class[$utf_seq[$k]])) - { - $starter = $nf_seq = ''; - } - else - { - $starter = $utf_seq[$k++]; - $nf_seq = ''; - } - $utf_sort = array(); - - // We add an empty char at the end of the UTF char sequence. It will act as a starter and trigger the sort/combine routine - // at the end of the string without altering it - $utf_seq[] = ''; - - do - { - $utf_char = $utf_seq[$k++]; - - if (isset($utf_combining_class[$utf_char])) - { - $utf_sort[$utf_combining_class[$utf_char]][] = $utf_char; - } - else - { - if (empty($utf_sort)) - { - // No combining characters... check for a composite of the two starters - if (isset($utf_canonical_comp[$starter . $utf_char])) - { - // Good ol' composite character - $starter = $utf_canonical_comp[$starter . $utf_char]; - } - else if (isset($utf_jamo_type[$utf_char])) - { - // Current char is a composable jamo - if (isset($utf_jamo_type[$starter]) && $utf_jamo_type[$starter] == self::UNICODE_JAMO_L && $utf_jamo_type[$utf_char] == self::UNICODE_JAMO_V) - { - // We have a L jamo followed by a V jamo, we are going to prefetch the next char to see if it's a T jamo - if (isset($utf_jamo_type[$utf_seq[$k]]) && $utf_jamo_type[$utf_seq[$k]] == self::UNICODE_JAMO_T) - { - // L+V+T jamos, combine to a LVT Hangul syllable ($k is incremented) - $cp = $utf_jamo_index[$starter] + $utf_jamo_index[$utf_char] + $utf_jamo_index[$utf_seq[$k]]; - ++$k; - } - else - { - // L+V jamos, combine to a LV Hangul syllable - $cp = $utf_jamo_index[$starter] + $utf_jamo_index[$utf_char]; - } - - $starter = chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F)); - } - else - { - // Non-composable jamo, just add it to the sequence - $nf_seq .= $starter; - $starter = $utf_char; - } - } - else - { - // No composite, just add the first starter to the sequence then continue with the other one - $nf_seq .= $starter; - $starter = $utf_char; - } - } - else - { - ksort($utf_sort); - - // For each class of combining characters - foreach ($utf_sort as $cc => $utf_chars) - { - $j = 0; - - do - { - // Look for a composite - if (isset($utf_canonical_comp[$starter . $utf_chars[$j]])) - { - // Found a composite, replace the starter - $starter = $utf_canonical_comp[$starter . $utf_chars[$j]]; - unset($utf_sort[$cc][$j]); - } - else - { - // No composite, all following characters in that class are blocked - break; - } - } - while (isset($utf_sort[$cc][++$j])); - } - - // Add the starter to the normalized sequence, followed by non-starters in canonical order - $nf_seq .= $starter; - - foreach ($utf_sort as $utf_chars) - { - if (!empty($utf_chars)) - { - $nf_seq .= implode('', $utf_chars); - } - } - - // Reset the array and go on - $utf_sort = array(); - $starter = $utf_char; - } - } - } - while ($k <= $k_max); - - $tmp .= substr($str, $tmp_pos, $lpos - $tmp_pos) . $nf_seq; - $tmp_pos = $pos; - } - else - { - // Only a ASCII char can make the program get here - // - // First we skip the current byte with ++$pos, then we quickly skip following ASCII chars with strspn(). - // - // The first two "if"'s here can be removed, with the consequences of being faster on latin text (lots of ASCII) and slower on - // multi-byte text (where the only ASCII chars are spaces and punctuation) - if (++$pos != $len) - { - if ($str[$pos] < "\x80") - { - $pos += strspn($str, self::UTF8_ASCII_RANGE, ++$pos); - $buffer[++$i & 7] = $str[$pos - 1]; - } - else - { - $buffer[++$i & 7] = $c; - } - } - } - } - while ($pos < $len); - - // Now is time to return the string - if ($tmp_pos) - { - // If the $tmp_pos cursor is not at the beggining of the string then at least one character was not in normal form. Replace $str with the fixed version - if ($tmp_pos == $len) - { - // The $tmp_pos cursor is at the end of $str, therefore $tmp holds the whole $str - return $tmp; - } - else - { - // The rightmost chunk of $str has not been appended to $tmp yet - return $tmp . substr($str, $tmp_pos); - } - } - - // The string was already in normal form - return $str; - } - - /** - * Decompose a UTF string - * - * @param string $str UTF string - * @param integer $pos Position of the first UTF char (in bytes) - * @param integer $len Length of the string (in bytes) - * @param array &$decomp_map Decomposition mapping, passed by reference but never modified - * @return string The string, decomposed and sorted canonically - * - * @access private - */ - private static function decompose($str, $pos, $len, &$decomp_map) - { - global $utf_combining_class; - - // Load some commonly-used tables - if (!isset($utf_combining_class)) - { - global $phpbb_root_path, $phpEx; - include($phpbb_root_path . 'includes/utf/data/utf_normalizer_common.' . $phpEx); - } - - // UTF char length array - $utf_len_mask = array( - // Leading bytes masks - "\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4, - // Trailing bytes masks - "\x80" => 0, "\x90" => 0, "\xA0" => 0, "\xB0" => 0 - ); - - // Some extra checks are triggered on the first byte of a UTF sequence - $extra_check = array( - "\xED" => 1, "\xEF" => 1, "\xC0" => 1, "\xC1" => 1, "\xE0" => 1, "\xF0" => 1, - "\xF4" => 1, "\xF5" => 1, "\xF6" => 1, "\xF7" => 1, "\xF8" => 1, "\xF9" => 1, - "\xFA" => 1, "\xFB" => 1, "\xFC" => 1, "\xFD" => 1, "\xFE" => 1, "\xFF" => 1 - ); - - // These masks are used to check if a UTF sequence is well formed. Here are the only 3 lengths we acknowledge: - // - 2-byte: 110? ???? 10?? ???? - // - 3-byte: 1110 ???? 10?? ???? 10?? ???? - // - 4-byte: 1111 0??? 10?? ???? 10?? ???? 10?? ???? - // Note that 5- and 6- byte sequences are automatically discarded - $utf_validation_mask = array( - 2 => "\xE0\xC0", - 3 => "\xF0\xC0\xC0", - 4 => "\xF8\xC0\xC0\xC0" - ); - - $utf_validation_check = array( - 2 => "\xC0\x80", - 3 => "\xE0\x80\x80", - 4 => "\xF0\x80\x80\x80" - ); - - $tmp = ''; - $starter_pos = $pos; - $tmp_pos = $last_cc = $sort = $dump = 0; - $utf_sort = array(); - - - // Main loop - do - { - // STEP 0: Capture the current char - - $cur_mask = $str[$pos] & "\xF0"; - if (isset($utf_len_mask[$cur_mask])) - { - if ($utf_len = $utf_len_mask[$cur_mask]) - { - // Multibyte char - $utf_char = substr($str, $pos, $utf_len); - $pos += $utf_len; - } - else - { - // A trailing byte came out of nowhere, we will treat it and all following trailing bytes as if each of them was a Unicode - // replacement char and we will advance the cursor - $spn = strspn($str, self::UTF8_TRAILING_BYTES, $pos); - - if ($dump) - { - $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos); - - // Dump combiners - if (!empty($utf_sort)) - { - if ($sort) - { - ksort($utf_sort); - } - - foreach ($utf_sort as $utf_chars) - { - $tmp .= implode('', $utf_chars); - } - } - - $tmp .= str_repeat(self::UTF8_REPLACEMENT, $spn); - $dump = $sort = 0; - } - else - { - $tmp .= substr($str, $tmp_pos, $pos - $tmp_pos) . str_repeat(self::UTF8_REPLACEMENT, $spn); - } - - $pos += $spn; - $tmp_pos = $starter_pos = $pos; - - $utf_sort = array(); - $last_cc = 0; - - continue; - } - - - // STEP 1: Decide what to do with current char - - // Now, in that order: - // - check if that character is decomposable - // - check if that character is a non-starter - // - check if that character requires extra checks to be performed - if (isset($decomp_map[$utf_char])) - { - // Decompose the char - $_pos = 0; - $_len = strlen($decomp_map[$utf_char]); - - do - { - $c = $decomp_map[$utf_char][$_pos]; - $_utf_len =& $utf_len_mask[$c & "\xF0"]; - - if (isset($_utf_len)) - { - $_utf_char = substr($decomp_map[$utf_char], $_pos, $_utf_len); - $_pos += $_utf_len; - - if (isset($utf_combining_class[$_utf_char])) - { - // The character decomposed to a non-starter, buffer it for sorting - $utf_sort[$utf_combining_class[$_utf_char]][] = $_utf_char; - - if ($utf_combining_class[$_utf_char] < $last_cc) - { - // Not canonically ordered, will require sorting - $sort = $dump = 1; - } - else - { - $dump = 1; - $last_cc = $utf_combining_class[$_utf_char]; - } - } - else - { - // This character decomposition contains a starter, dump the buffer and continue - if ($dump) - { - $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos); - - // Dump combiners - if (!empty($utf_sort)) - { - if ($sort) - { - ksort($utf_sort); - } - - foreach ($utf_sort as $utf_chars) - { - $tmp .= implode('', $utf_chars); - } - } - - $tmp .= $_utf_char; - $dump = $sort = 0; - } - else - { - $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos) . $_utf_char; - } - - $tmp_pos = $starter_pos = $pos; - $utf_sort = array(); - $last_cc = 0; - } - } - else - { - // This character decomposition contains an ASCII char, which is a starter. Dump the buffer and continue - ++$_pos; - - if ($dump) - { - $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos); - - // Dump combiners - if (!empty($utf_sort)) - { - if ($sort) - { - ksort($utf_sort); - } - - foreach ($utf_sort as $utf_chars) - { - $tmp .= implode('', $utf_chars); - } - } - - $tmp .= $c; - $dump = $sort = 0; - } - else - { - $tmp .= substr($str, $tmp_pos, $pos - $utf_len - $tmp_pos) . $c; - } - - $tmp_pos = $starter_pos = $pos; - $utf_sort = array(); - $last_cc = 0; - } - } - while ($_pos < $_len); - } - else if (isset($utf_combining_class[$utf_char])) - { - // Combining character - if ($utf_combining_class[$utf_char] < $last_cc) - { - // Not in canonical order - $sort = $dump = 1; - } - else - { - $last_cc = $utf_combining_class[$utf_char]; - } - - $utf_sort[$utf_combining_class[$utf_char]][] = $utf_char; - } - else - { - // Non-decomposable starter, check out if it's a Hangul syllable - if ($utf_char < self::UTF8_HANGUL_FIRST || $utf_char > self::UTF8_HANGUL_LAST) - { - // Nope, regular UTF char, check that we have the correct number of trailing bytes - if (($utf_char & $utf_validation_mask[$utf_len]) != $utf_validation_check[$utf_len]) - { - // Current char isn't well-formed or legal: either one or several trailing bytes are missing, or the Unicode char - // has been encoded in a five- or six- byte sequence. - // Move the cursor back to its original position then advance it to the position it should really be at - $pos -= $utf_len; - $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos); - - if (!empty($utf_sort)) - { - ksort($utf_sort); - - foreach ($utf_sort as $utf_chars) - { - $tmp .= implode('', $utf_chars); - } - $utf_sort = array(); - } - - // Add a replacement char then another replacement char for every trailing byte. - // - // @todo I'm not entirely sure that's how we're supposed to mark invalidated byte sequences, check this - $spn = strspn($str, self::UTF8_TRAILING_BYTES, ++$pos); - $tmp .= str_repeat(self::UTF8_REPLACEMENT, $spn + 1); - - $dump = $sort = 0; - - $pos += $spn; - $tmp_pos = $pos; - continue; - } - - if (isset($extra_check[$utf_char[0]])) - { - switch ($utf_char[0]) - { - // Note: 0xED is quite common in Korean - case "\xED": - if ($utf_char >= "\xED\xA0\x80") - { - // Surrogates (U+D800..U+DFFF) are not allowed in UTF-8 (UTF sequence 0xEDA080..0xEDBFBF) - $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos); - - if (!empty($utf_sort)) - { - ksort($utf_sort); - - foreach ($utf_sort as $utf_chars) - { - $tmp .= implode('', $utf_chars); - } - $utf_sort = array(); - } - - $tmp .= self::UTF8_REPLACEMENT; - $dump = $sort = 0; - - $tmp_pos = $starter_pos = $pos; - continue 2; - } - break; - - // Note: 0xEF is quite common in Japanese - case "\xEF": - if ($utf_char == "\xEF\xBF\xBE" || $utf_char == "\xEF\xBF\xBF") - { - // U+FFFE and U+FFFF are explicitly disallowed (UTF sequence 0xEFBFBE..0xEFBFBF) - $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos); - - if (!empty($utf_sort)) - { - ksort($utf_sort); - - foreach ($utf_sort as $utf_chars) - { - $tmp .= implode('', $utf_chars); - } - $utf_sort = array(); - } - - $tmp .= self::UTF8_REPLACEMENT; - $dump = $sort = 0; - - $tmp_pos = $starter_pos = $pos; - continue 2; - } - break; - - case "\xC0": - case "\xC1": - if ($utf_char <= "\xC1\xBF") - { - // Overlong sequence: Unicode char U+0000..U+007F encoded as a double-byte UTF char - $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos); - - if (!empty($utf_sort)) - { - ksort($utf_sort); - - foreach ($utf_sort as $utf_chars) - { - $tmp .= implode('', $utf_chars); - } - $utf_sort = array(); - } - - $tmp .= self::UTF8_REPLACEMENT; - $dump = $sort = 0; - - $tmp_pos = $starter_pos = $pos; - continue 2; - } - break; - - case "\xE0": - if ($utf_char <= "\xE0\x9F\xBF") - { - // Unicode char U+0000..U+07FF encoded in 3 bytes - $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos); - - if (!empty($utf_sort)) - { - ksort($utf_sort); - - foreach ($utf_sort as $utf_chars) - { - $tmp .= implode('', $utf_chars); - } - $utf_sort = array(); - } - - $tmp .= self::UTF8_REPLACEMENT; - $dump = $sort = 0; - - $tmp_pos = $starter_pos = $pos; - continue 2; - } - break; - - case "\xF0": - if ($utf_char <= "\xF0\x8F\xBF\xBF") - { - // Unicode char U+0000..U+FFFF encoded in 4 bytes - $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos); - - if (!empty($utf_sort)) - { - ksort($utf_sort); - - foreach ($utf_sort as $utf_chars) - { - $tmp .= implode('', $utf_chars); - } - $utf_sort = array(); - } - - $tmp .= self::UTF8_REPLACEMENT; - $dump = $sort = 0; - - $tmp_pos = $starter_pos = $pos; - continue 2; - } - break; - - default: - if ($utf_char > UTF8_MAX) - { - // Out of the Unicode range - $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos); - - if (!empty($utf_sort)) - { - ksort($utf_sort); - - foreach ($utf_sort as $utf_chars) - { - $tmp .= implode('', $utf_chars); - } - $utf_sort = array(); - } - - $tmp .= self::UTF8_REPLACEMENT; - $dump = $sort = 0; - - $tmp_pos = $starter_pos = $pos; - continue 2; - } - break; - } - } - } - else - { - // Hangul syllable - $idx = (((ord($utf_char[0]) & 0x0F) << 12) | ((ord($utf_char[1]) & 0x3F) << 6) | (ord($utf_char[2]) & 0x3F)) - self::UNICODE_HANGUL_SBASE; - - // LIndex can only range from 0 to 18, therefore it cannot influence the first two bytes of the L Jamo, which allows us to hardcode them (based on LBase). - // - // The same goes for VIndex, but for TIndex there's a catch: the value of the third byte could exceed 0xBF and we would have to increment the second byte - if ($t_index = $idx % self::UNICODE_HANGUL_TCOUNT) - { - if ($t_index < 25) - { - $utf_char = "\xE1\x84\x00\xE1\x85\x00\xE1\x86\x00"; - $utf_char[8] = chr(0xA7 + $t_index); - } - else - { - $utf_char = "\xE1\x84\x00\xE1\x85\x00\xE1\x87\x00"; - $utf_char[8] = chr(0x67 + $t_index); - } - } - else - { - $utf_char = "\xE1\x84\x00\xE1\x85\x00"; - } - - $utf_char[2] = chr(0x80 + (int) ($idx / self::UNICODE_HANGUL_NCOUNT)); - $utf_char[5] = chr(0xA1 + (int) (($idx % self::UNICODE_HANGUL_NCOUNT) / self::UNICODE_HANGUL_TCOUNT)); - - // Just like other decompositions, the resulting Jamos must be dumped to the tmp string - $dump = 1; - } - - // Do we need to dump stuff to the tmp string? - if ($dump) - { - $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos); - - // Dump combiners - if (!empty($utf_sort)) - { - if ($sort) - { - ksort($utf_sort); - } - - foreach ($utf_sort as $utf_chars) - { - $tmp .= implode('', $utf_chars); - } - } - - $tmp .= $utf_char; - $dump = $sort = 0; - $tmp_pos = $pos; - } - - $last_cc = 0; - $utf_sort = array(); - $starter_pos = $pos; - } - } - else - { - // ASCII char, which happens to be a starter (as any other ASCII char) - if ($dump) - { - $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos); - - // Dump combiners - if (!empty($utf_sort)) - { - if ($sort) - { - ksort($utf_sort); - } - - foreach ($utf_sort as $utf_chars) - { - $tmp .= implode('', $utf_chars); - } - } - - $tmp .= $str[$pos]; - $dump = $sort = 0; - $tmp_pos = ++$pos; - - $pos += strspn($str, self::UTF8_ASCII_RANGE, $pos); - } - else - { - $pos += strspn($str, self::UTF8_ASCII_RANGE, ++$pos); - } - - $last_cc = 0; - $utf_sort = array(); - $starter_pos = $pos; - } - } - while ($pos < $len); - - // Now is time to return the string - if ($dump) - { - $tmp .= substr($str, $tmp_pos, $starter_pos - $tmp_pos); - - // Dump combiners - if (!empty($utf_sort)) - { - if ($sort) - { - ksort($utf_sort); - } - - foreach ($utf_sort as $utf_chars) - { - $tmp .= implode('', $utf_chars); - } - } - - return $tmp; - } - else if ($tmp_pos) - { - // If the $tmp_pos cursor was moved then at least one character was not in normal form. Replace $str with the fixed version - if ($tmp_pos == $len) - { - // The $tmp_pos cursor is at the end of $str, therefore $tmp holds the whole $str - return $tmp; - } - else - { - // The rightmost chunk of $str has not been appended to $tmp yet - return $tmp . substr($str, $tmp_pos); - } - } - - // The string was already in normal form - return $str; - } -} - -?> \ No newline at end of file diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php deleted file mode 100644 index 1a4446ca65..0000000000 --- a/phpBB/includes/utf/utf_tools.php +++ /dev/null @@ -1,1520 +0,0 @@ -=')) - { - /** - * UTF-8 aware alternative to strrpos - * @ignore - */ - function utf8_strrpos($str, $needle, $offset = null) - { - // Emulate behaviour of strrpos rather than raising warning - if (empty($str)) - { - return false; - } - - if (is_null($offset)) - { - return mb_strrpos($str, $needle); - } - else - { - return mb_strrpos($str, $needle, $offset); - } - } - } - else - { - /** - * UTF-8 aware alternative to strrpos - * @ignore - */ - function utf8_strrpos($str, $needle, $offset = null) - { - // offset for mb_strrpos was added in 5.2.0 - if (is_null($offset)) - { - // Emulate behaviour of strrpos rather than raising warning - if (empty($str)) - { - return false; - } - - return mb_strrpos($str, $needle); - } - else - { - if (!is_int($offset)) - { - trigger_error('utf8_strrpos expects parameter 3 to be long', E_USER_ERROR); - return false; - } - - $str = mb_substr($str, $offset); - - if (false !== ($pos = mb_strrpos($str, $needle))) - { - return $pos + $offset; - } - - return false; - } - } - } - - /** - * UTF-8 aware alternative to strpos - * @ignore - */ - function utf8_strpos($str, $needle, $offset = null) - { - if (is_null($offset)) - { - return mb_strpos($str, $needle); - } - else - { - return mb_strpos($str, $needle, $offset); - } - } - - /** - * UTF-8 aware alternative to substr - * @ignore - */ - function utf8_substr($str, $offset, $length = null) - { - if (is_null($length)) - { - return mb_substr($str, $offset); - } - else - { - return mb_substr($str, $offset, $length); - } - } - - /** - * Return the length (in characters) of a UTF-8 string - * @ignore - */ - function utf8_strlen($text) - { - return mb_strlen($text, 'utf-8'); - } -} -else -{ - /** - * UTF-8 aware alternative to strrpos - * Find position of last occurrence of a char in a string - * - * @author Harry Fuecks - * @param string $str haystack - * @param string $needle needle - * @param integer $offset (optional) offset (from left) - * @return mixed integer position or FALSE on failure - */ - function utf8_strrpos($str, $needle, $offset = null) - { - if (is_null($offset)) - { - $ar = explode($needle, $str); - - if (sizeof($ar) > 1) - { - // Pop off the end of the string where the last match was made - array_pop($ar); - $str = join($needle, $ar); - - return utf8_strlen($str); - } - return false; - } - else - { - if (!is_int($offset)) - { - trigger_error('utf8_strrpos expects parameter 3 to be long', E_USER_ERROR); - return false; - } - - $str = utf8_substr($str, $offset); - - if (false !== ($pos = utf8_strrpos($str, $needle))) - { - return $pos + $offset; - } - - return false; - } - } - - /** - * UTF-8 aware alternative to strpos - * Find position of first occurrence of a string - * - * @author Harry Fuecks - * @param string $str haystack - * @param string $needle needle - * @param integer $offset offset in characters (from left) - * @return mixed integer position or FALSE on failure - */ - function utf8_strpos($str, $needle, $offset = null) - { - if (is_null($offset)) - { - $ar = explode($needle, $str); - if (sizeof($ar) > 1) - { - return utf8_strlen($ar[0]); - } - return false; - } - else - { - if (!is_int($offset)) - { - trigger_error('utf8_strpos: Offset must be an integer', E_USER_ERROR); - return false; - } - - $str = utf8_substr($str, $offset); - - if (false !== ($pos = utf8_strpos($str, $needle))) - { - return $pos + $offset; - } - - return false; - } - } - - /** - * UTF-8 aware alternative to substr - * Return part of a string given character offset (and optionally length) - * - * Note arguments: comparied to substr - if offset or length are - * not integers, this version will not complain but rather massages them - * into an integer. - * - * Note on returned values: substr documentation states false can be - * returned in some cases (e.g. offset > string length) - * mb_substr never returns false, it will return an empty string instead. - * This adopts the mb_substr approach - * - * Note on implementation: PCRE only supports repetitions of less than - * 65536, in order to accept up to MAXINT values for offset and length, - * we'll repeat a group of 65535 characters when needed. - * - * Note on implementation: calculating the number of characters in the - * string is a relatively expensive operation, so we only carry it out when - * necessary. It isn't necessary for +ve offsets and no specified length - * - * @author Chris Smith - * @param string $str - * @param integer $offset number of UTF-8 characters offset (from left) - * @param integer $length (optional) length in UTF-8 characters from offset - * @return mixed string or FALSE if failure - */ - function utf8_substr($str, $offset, $length = NULL) - { - // generates E_NOTICE - // for PHP4 objects, but not PHP5 objects - $str = (string) $str; - $offset = (int) $offset; - if (!is_null($length)) - { - $length = (int) $length; - } - - // handle trivial cases - if ($length === 0 || ($offset < 0 && $length < 0 && $length < $offset)) - { - return ''; - } - - // normalise negative offsets (we could use a tail - // anchored pattern, but they are horribly slow!) - if ($offset < 0) - { - // see notes - $strlen = utf8_strlen($str); - $offset = $strlen + $offset; - if ($offset < 0) - { - $offset = 0; - } - } - - $op = ''; - $lp = ''; - - // establish a pattern for offset, a - // non-captured group equal in length to offset - if ($offset > 0) - { - $ox = (int) ($offset / 65535); - $oy = $offset % 65535; - - if ($ox) - { - $op = '(?:.{65535}){' . $ox . '}'; - } - - $op = '^(?:' . $op . '.{' . $oy . '})'; - } - else - { - // offset == 0; just anchor the pattern - $op = '^'; - } - - // establish a pattern for length - if (is_null($length)) - { - // the rest of the string - $lp = '(.*)$'; - } - else - { - if (!isset($strlen)) - { - // see notes - $strlen = utf8_strlen($str); - } - - // another trivial case - if ($offset > $strlen) - { - return ''; - } - - if ($length > 0) - { - // reduce any length that would - // go passed the end of the string - $length = min($strlen - $offset, $length); - - $lx = (int) ($length / 65535); - $ly = $length % 65535; - - // negative length requires a captured group - // of length characters - if ($lx) - { - $lp = '(?:.{65535}){' . $lx . '}'; - } - $lp = '(' . $lp . '.{'. $ly . '})'; - } - else if ($length < 0) - { - if ($length < ($offset - $strlen)) - { - return ''; - } - - $lx = (int)((-$length) / 65535); - $ly = (-$length) % 65535; - - // negative length requires ... capture everything - // except a group of -length characters - // anchored at the tail-end of the string - if ($lx) - { - $lp = '(?:.{65535}){' . $lx . '}'; - } - $lp = '(.*)(?:' . $lp . '.{' . $ly . '})$'; - } - } - - if (!preg_match('#' . $op . $lp . '#us', $str, $match)) - { - return ''; - } - - return $match[1]; - } - - /** - * Return the length (in characters) of a UTF-8 string - * - * @param string $text UTF-8 string - * @return integer Length (in chars) of given string - */ - function utf8_strlen($text) - { - // Since utf8_decode is replacing multibyte characters to ? strlen works fine - return strlen(utf8_decode($text)); - } -} - -/** -* UTF-8 aware alternative to str_split -* Convert a string to an array -* -* @author Harry Fuecks -* @param string $str UTF-8 encoded -* @param int $split_len number to characters to split string by -* @return array characters in string reverses -*/ -function utf8_str_split($str, $split_len = 1) -{ - if (!is_int($split_len) || $split_len < 1) - { - return false; - } - - $len = utf8_strlen($str); - if ($len <= $split_len) - { - return array($str); - } - - preg_match_all('/.{' . $split_len . '}|[^\x00]{1,' . $split_len . '}$/us', $str, $ar); - return $ar[0]; -} - -/** -* UTF-8 aware alternative to strspn -* Find length of initial segment matching the mask -* -* @author Harry Fuecks -*/ -function utf8_strspn($str, $mask, $start = null, $length = null) -{ - if ($start !== null || $length !== null) - { - $str = utf8_substr($str, $start, $length); - } - - preg_match('/^[' . $mask . ']+/u', $str, $matches); - - if (isset($matches[0])) - { - return utf8_strlen($matches[0]); - } - - return 0; -} - -/** -* Replace all UTF-8 chars that are not in ASCII with their NCR -* -* @param string $text UTF-8 string in NFC -* @return string ASCII string using NCRs for non-ASCII chars -*/ -function utf8_encode_ncr($text) -{ - return preg_replace_callback('#[\\xC2-\\xF4][\\x80-\\xBF]{1,3}#', 'utf8_encode_ncr_callback', $text); -} - -/** -* Callback used in encode_ncr() -* -* Takes a UTF-8 char and replaces it with its NCR. Attention, $m is an array -* -* @param array $m 0-based numerically indexed array passed by preg_replace_callback() -* @return string A HTML NCR if the character is valid, or the original string otherwise -*/ -function utf8_encode_ncr_callback($m) -{ - return '&#' . utf8_ord($m[0]) . ';'; -} - -/** -* Converts a UTF-8 char to an NCR -* -* @param string $chr UTF-8 char -* @return integer UNICODE code point -*/ -function utf8_ord($chr) -{ - switch (strlen($chr)) - { - case 1: - return ord($chr); - break; - - case 2: - return ((ord($chr[0]) & 0x1F) << 6) | (ord($chr[1]) & 0x3F); - break; - - case 3: - return ((ord($chr[0]) & 0x0F) << 12) | ((ord($chr[1]) & 0x3F) << 6) | (ord($chr[2]) & 0x3F); - break; - - case 4: - return ((ord($chr[0]) & 0x07) << 18) | ((ord($chr[1]) & 0x3F) << 12) | ((ord($chr[2]) & 0x3F) << 6) | (ord($chr[3]) & 0x3F); - break; - - default: - return $chr; - } -} - -/** -* Converts an NCR to a UTF-8 char -* -* @param int $cp UNICODE code point -* @return string UTF-8 char -*/ -function utf8_chr($cp) -{ - if ($cp > 0xFFFF) - { - return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F)); - } - else if ($cp > 0x7FF) - { - return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F)); - } - else if ($cp > 0x7F) - { - return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F)); - } - else - { - return chr($cp); - } -} - -/** -* Convert Numeric Character References to UTF-8 chars -* -* Notes: -* - we do not convert NCRs recursively, if you pass &#38; it will return & -* - we DO NOT check for the existence of the Unicode characters, therefore an entity may be converted to an inexistent codepoint -* -* @param string $text String to convert, encoded in UTF-8 (no normal form required) -* @return string UTF-8 string where NCRs have been replaced with the actual chars -*/ -function utf8_decode_ncr($text) -{ - return preg_replace_callback('/&#([0-9]{1,6}|x[0-9A-F]{1,5});/i', 'utf8_decode_ncr_callback', $text); -} - -/** -* Callback used in decode_ncr() -* -* Takes a NCR (in decimal or hexadecimal) and returns a UTF-8 char. Attention, $m is an array. -* It will ignore most of invalid NCRs, but not all! -* -* @param array $m 0-based numerically indexed array passed by preg_replace_callback() -* @return string UTF-8 char -*/ -function utf8_decode_ncr_callback($m) -{ - $cp = (strncasecmp($m[1], 'x', 1)) ? $m[1] : hexdec(substr($m[1], 1)); - - return utf8_chr($cp); -} - -/** -* Case folds a unicode string as per Unicode 5.0, section 3.13 -* -* @param string $text text to be case folded -* @param string $option determines how we will fold the cases -* @return string case folded text -*/ -function utf8_case_fold($text, $option = 'full') -{ - static $uniarray = array(); - global $phpbb_root_path, $phpEx; - - // common is always set - if (!isset($uniarray['c'])) - { - $uniarray['c'] = include($phpbb_root_path . 'includes/utf/data/case_fold_c.' . $phpEx); - } - - // only set full if we need to - if ($option === 'full' && !isset($uniarray['f'])) - { - $uniarray['f'] = include($phpbb_root_path . 'includes/utf/data/case_fold_f.' . $phpEx); - } - - // only set simple if we need to - if ($option !== 'full' && !isset($uniarray['s'])) - { - $uniarray['s'] = include($phpbb_root_path . 'includes/utf/data/case_fold_s.' . $phpEx); - } - - // common is always replaced - $text = strtr($text, $uniarray['c']); - - if ($option === 'full') - { - // full replaces a character with multiple characters - $text = strtr($text, $uniarray['f']); - } - else - { - // simple replaces a character with another character - $text = strtr($text, $uniarray['s']); - } - - return $text; -} - -/** -* Takes the input and does a "special" case fold. It does minor normalization -* and returns NFKC compatable text -* -* @param string $text text to be case folded -* @param string $option determines how we will fold the cases -* @return string case folded text -*/ -function utf8_case_fold_nfkc($text, $option = 'full') -{ - static $fc_nfkc_closure = array( - "\xCD\xBA" => "\x20\xCE\xB9", - "\xCF\x92" => "\xCF\x85", - "\xCF\x93" => "\xCF\x8D", - "\xCF\x94" => "\xCF\x8B", - "\xCF\xB2" => "\xCF\x83", - "\xCF\xB9" => "\xCF\x83", - "\xE1\xB4\xAC" => "\x61", - "\xE1\xB4\xAD" => "\xC3\xA6", - "\xE1\xB4\xAE" => "\x62", - "\xE1\xB4\xB0" => "\x64", - "\xE1\xB4\xB1" => "\x65", - "\xE1\xB4\xB2" => "\xC7\x9D", - "\xE1\xB4\xB3" => "\x67", - "\xE1\xB4\xB4" => "\x68", - "\xE1\xB4\xB5" => "\x69", - "\xE1\xB4\xB6" => "\x6A", - "\xE1\xB4\xB7" => "\x6B", - "\xE1\xB4\xB8" => "\x6C", - "\xE1\xB4\xB9" => "\x6D", - "\xE1\xB4\xBA" => "\x6E", - "\xE1\xB4\xBC" => "\x6F", - "\xE1\xB4\xBD" => "\xC8\xA3", - "\xE1\xB4\xBE" => "\x70", - "\xE1\xB4\xBF" => "\x72", - "\xE1\xB5\x80" => "\x74", - "\xE1\xB5\x81" => "\x75", - "\xE1\xB5\x82" => "\x77", - "\xE2\x82\xA8" => "\x72\x73", - "\xE2\x84\x82" => "\x63", - "\xE2\x84\x83" => "\xC2\xB0\x63", - "\xE2\x84\x87" => "\xC9\x9B", - "\xE2\x84\x89" => "\xC2\xB0\x66", - "\xE2\x84\x8B" => "\x68", - "\xE2\x84\x8C" => "\x68", - "\xE2\x84\x8D" => "\x68", - "\xE2\x84\x90" => "\x69", - "\xE2\x84\x91" => "\x69", - "\xE2\x84\x92" => "\x6C", - "\xE2\x84\x95" => "\x6E", - "\xE2\x84\x96" => "\x6E\x6F", - "\xE2\x84\x99" => "\x70", - "\xE2\x84\x9A" => "\x71", - "\xE2\x84\x9B" => "\x72", - "\xE2\x84\x9C" => "\x72", - "\xE2\x84\x9D" => "\x72", - "\xE2\x84\xA0" => "\x73\x6D", - "\xE2\x84\xA1" => "\x74\x65\x6C", - "\xE2\x84\xA2" => "\x74\x6D", - "\xE2\x84\xA4" => "\x7A", - "\xE2\x84\xA8" => "\x7A", - "\xE2\x84\xAC" => "\x62", - "\xE2\x84\xAD" => "\x63", - "\xE2\x84\xB0" => "\x65", - "\xE2\x84\xB1" => "\x66", - "\xE2\x84\xB3" => "\x6D", - "\xE2\x84\xBB" => "\x66\x61\x78", - "\xE2\x84\xBE" => "\xCE\xB3", - "\xE2\x84\xBF" => "\xCF\x80", - "\xE2\x85\x85" => "\x64", - "\xE3\x89\x90" => "\x70\x74\x65", - "\xE3\x8B\x8C" => "\x68\x67", - "\xE3\x8B\x8E" => "\x65\x76", - "\xE3\x8B\x8F" => "\x6C\x74\x64", - "\xE3\x8D\xB1" => "\x68\x70\x61", - "\xE3\x8D\xB3" => "\x61\x75", - "\xE3\x8D\xB5" => "\x6F\x76", - "\xE3\x8D\xBA" => "\x69\x75", - "\xE3\x8E\x80" => "\x70\x61", - "\xE3\x8E\x81" => "\x6E\x61", - "\xE3\x8E\x82" => "\xCE\xBC\x61", - "\xE3\x8E\x83" => "\x6D\x61", - "\xE3\x8E\x84" => "\x6B\x61", - "\xE3\x8E\x85" => "\x6B\x62", - "\xE3\x8E\x86" => "\x6D\x62", - "\xE3\x8E\x87" => "\x67\x62", - "\xE3\x8E\x8A" => "\x70\x66", - "\xE3\x8E\x8B" => "\x6E\x66", - "\xE3\x8E\x8C" => "\xCE\xBC\x66", - "\xE3\x8E\x90" => "\x68\x7A", - "\xE3\x8E\x91" => "\x6B\x68\x7A", - "\xE3\x8E\x92" => "\x6D\x68\x7A", - "\xE3\x8E\x93" => "\x67\x68\x7A", - "\xE3\x8E\x94" => "\x74\x68\x7A", - "\xE3\x8E\xA9" => "\x70\x61", - "\xE3\x8E\xAA" => "\x6B\x70\x61", - "\xE3\x8E\xAB" => "\x6D\x70\x61", - "\xE3\x8E\xAC" => "\x67\x70\x61", - "\xE3\x8E\xB4" => "\x70\x76", - "\xE3\x8E\xB5" => "\x6E\x76", - "\xE3\x8E\xB6" => "\xCE\xBC\x76", - "\xE3\x8E\xB7" => "\x6D\x76", - "\xE3\x8E\xB8" => "\x6B\x76", - "\xE3\x8E\xB9" => "\x6D\x76", - "\xE3\x8E\xBA" => "\x70\x77", - "\xE3\x8E\xBB" => "\x6E\x77", - "\xE3\x8E\xBC" => "\xCE\xBC\x77", - "\xE3\x8E\xBD" => "\x6D\x77", - "\xE3\x8E\xBE" => "\x6B\x77", - "\xE3\x8E\xBF" => "\x6D\x77", - "\xE3\x8F\x80" => "\x6B\xCF\x89", - "\xE3\x8F\x81" => "\x6D\xCF\x89", - "\xE3\x8F\x83" => "\x62\x71", - "\xE3\x8F\x86" => "\x63\xE2\x88\x95\x6B\x67", - "\xE3\x8F\x87" => "\x63\x6F\x2E", - "\xE3\x8F\x88" => "\x64\x62", - "\xE3\x8F\x89" => "\x67\x79", - "\xE3\x8F\x8B" => "\x68\x70", - "\xE3\x8F\x8D" => "\x6B\x6B", - "\xE3\x8F\x8E" => "\x6B\x6D", - "\xE3\x8F\x97" => "\x70\x68", - "\xE3\x8F\x99" => "\x70\x70\x6D", - "\xE3\x8F\x9A" => "\x70\x72", - "\xE3\x8F\x9C" => "\x73\x76", - "\xE3\x8F\x9D" => "\x77\x62", - "\xE3\x8F\x9E" => "\x76\xE2\x88\x95\x6D", - "\xE3\x8F\x9F" => "\x61\xE2\x88\x95\x6D", - "\xF0\x9D\x90\x80" => "\x61", - "\xF0\x9D\x90\x81" => "\x62", - "\xF0\x9D\x90\x82" => "\x63", - "\xF0\x9D\x90\x83" => "\x64", - "\xF0\x9D\x90\x84" => "\x65", - "\xF0\x9D\x90\x85" => "\x66", - "\xF0\x9D\x90\x86" => "\x67", - "\xF0\x9D\x90\x87" => "\x68", - "\xF0\x9D\x90\x88" => "\x69", - "\xF0\x9D\x90\x89" => "\x6A", - "\xF0\x9D\x90\x8A" => "\x6B", - "\xF0\x9D\x90\x8B" => "\x6C", - "\xF0\x9D\x90\x8C" => "\x6D", - "\xF0\x9D\x90\x8D" => "\x6E", - "\xF0\x9D\x90\x8E" => "\x6F", - "\xF0\x9D\x90\x8F" => "\x70", - "\xF0\x9D\x90\x90" => "\x71", - "\xF0\x9D\x90\x91" => "\x72", - "\xF0\x9D\x90\x92" => "\x73", - "\xF0\x9D\x90\x93" => "\x74", - "\xF0\x9D\x90\x94" => "\x75", - "\xF0\x9D\x90\x95" => "\x76", - "\xF0\x9D\x90\x96" => "\x77", - "\xF0\x9D\x90\x97" => "\x78", - "\xF0\x9D\x90\x98" => "\x79", - "\xF0\x9D\x90\x99" => "\x7A", - "\xF0\x9D\x90\xB4" => "\x61", - "\xF0\x9D\x90\xB5" => "\x62", - "\xF0\x9D\x90\xB6" => "\x63", - "\xF0\x9D\x90\xB7" => "\x64", - "\xF0\x9D\x90\xB8" => "\x65", - "\xF0\x9D\x90\xB9" => "\x66", - "\xF0\x9D\x90\xBA" => "\x67", - "\xF0\x9D\x90\xBB" => "\x68", - "\xF0\x9D\x90\xBC" => "\x69", - "\xF0\x9D\x90\xBD" => "\x6A", - "\xF0\x9D\x90\xBE" => "\x6B", - "\xF0\x9D\x90\xBF" => "\x6C", - "\xF0\x9D\x91\x80" => "\x6D", - "\xF0\x9D\x91\x81" => "\x6E", - "\xF0\x9D\x91\x82" => "\x6F", - "\xF0\x9D\x91\x83" => "\x70", - "\xF0\x9D\x91\x84" => "\x71", - "\xF0\x9D\x91\x85" => "\x72", - "\xF0\x9D\x91\x86" => "\x73", - "\xF0\x9D\x91\x87" => "\x74", - "\xF0\x9D\x91\x88" => "\x75", - "\xF0\x9D\x91\x89" => "\x76", - "\xF0\x9D\x91\x8A" => "\x77", - "\xF0\x9D\x91\x8B" => "\x78", - "\xF0\x9D\x91\x8C" => "\x79", - "\xF0\x9D\x91\x8D" => "\x7A", - "\xF0\x9D\x91\xA8" => "\x61", - "\xF0\x9D\x91\xA9" => "\x62", - "\xF0\x9D\x91\xAA" => "\x63", - "\xF0\x9D\x91\xAB" => "\x64", - "\xF0\x9D\x91\xAC" => "\x65", - "\xF0\x9D\x91\xAD" => "\x66", - "\xF0\x9D\x91\xAE" => "\x67", - "\xF0\x9D\x91\xAF" => "\x68", - "\xF0\x9D\x91\xB0" => "\x69", - "\xF0\x9D\x91\xB1" => "\x6A", - "\xF0\x9D\x91\xB2" => "\x6B", - "\xF0\x9D\x91\xB3" => "\x6C", - "\xF0\x9D\x91\xB4" => "\x6D", - "\xF0\x9D\x91\xB5" => "\x6E", - "\xF0\x9D\x91\xB6" => "\x6F", - "\xF0\x9D\x91\xB7" => "\x70", - "\xF0\x9D\x91\xB8" => "\x71", - "\xF0\x9D\x91\xB9" => "\x72", - "\xF0\x9D\x91\xBA" => "\x73", - "\xF0\x9D\x91\xBB" => "\x74", - "\xF0\x9D\x91\xBC" => "\x75", - "\xF0\x9D\x91\xBD" => "\x76", - "\xF0\x9D\x91\xBE" => "\x77", - "\xF0\x9D\x91\xBF" => "\x78", - "\xF0\x9D\x92\x80" => "\x79", - "\xF0\x9D\x92\x81" => "\x7A", - "\xF0\x9D\x92\x9C" => "\x61", - "\xF0\x9D\x92\x9E" => "\x63", - "\xF0\x9D\x92\x9F" => "\x64", - "\xF0\x9D\x92\xA2" => "\x67", - "\xF0\x9D\x92\xA5" => "\x6A", - "\xF0\x9D\x92\xA6" => "\x6B", - "\xF0\x9D\x92\xA9" => "\x6E", - "\xF0\x9D\x92\xAA" => "\x6F", - "\xF0\x9D\x92\xAB" => "\x70", - "\xF0\x9D\x92\xAC" => "\x71", - "\xF0\x9D\x92\xAE" => "\x73", - "\xF0\x9D\x92\xAF" => "\x74", - "\xF0\x9D\x92\xB0" => "\x75", - "\xF0\x9D\x92\xB1" => "\x76", - "\xF0\x9D\x92\xB2" => "\x77", - "\xF0\x9D\x92\xB3" => "\x78", - "\xF0\x9D\x92\xB4" => "\x79", - "\xF0\x9D\x92\xB5" => "\x7A", - "\xF0\x9D\x93\x90" => "\x61", - "\xF0\x9D\x93\x91" => "\x62", - "\xF0\x9D\x93\x92" => "\x63", - "\xF0\x9D\x93\x93" => "\x64", - "\xF0\x9D\x93\x94" => "\x65", - "\xF0\x9D\x93\x95" => "\x66", - "\xF0\x9D\x93\x96" => "\x67", - "\xF0\x9D\x93\x97" => "\x68", - "\xF0\x9D\x93\x98" => "\x69", - "\xF0\x9D\x93\x99" => "\x6A", - "\xF0\x9D\x93\x9A" => "\x6B", - "\xF0\x9D\x93\x9B" => "\x6C", - "\xF0\x9D\x93\x9C" => "\x6D", - "\xF0\x9D\x93\x9D" => "\x6E", - "\xF0\x9D\x93\x9E" => "\x6F", - "\xF0\x9D\x93\x9F" => "\x70", - "\xF0\x9D\x93\xA0" => "\x71", - "\xF0\x9D\x93\xA1" => "\x72", - "\xF0\x9D\x93\xA2" => "\x73", - "\xF0\x9D\x93\xA3" => "\x74", - "\xF0\x9D\x93\xA4" => "\x75", - "\xF0\x9D\x93\xA5" => "\x76", - "\xF0\x9D\x93\xA6" => "\x77", - "\xF0\x9D\x93\xA7" => "\x78", - "\xF0\x9D\x93\xA8" => "\x79", - "\xF0\x9D\x93\xA9" => "\x7A", - "\xF0\x9D\x94\x84" => "\x61", - "\xF0\x9D\x94\x85" => "\x62", - "\xF0\x9D\x94\x87" => "\x64", - "\xF0\x9D\x94\x88" => "\x65", - "\xF0\x9D\x94\x89" => "\x66", - "\xF0\x9D\x94\x8A" => "\x67", - "\xF0\x9D\x94\x8D" => "\x6A", - "\xF0\x9D\x94\x8E" => "\x6B", - "\xF0\x9D\x94\x8F" => "\x6C", - "\xF0\x9D\x94\x90" => "\x6D", - "\xF0\x9D\x94\x91" => "\x6E", - "\xF0\x9D\x94\x92" => "\x6F", - "\xF0\x9D\x94\x93" => "\x70", - "\xF0\x9D\x94\x94" => "\x71", - "\xF0\x9D\x94\x96" => "\x73", - "\xF0\x9D\x94\x97" => "\x74", - "\xF0\x9D\x94\x98" => "\x75", - "\xF0\x9D\x94\x99" => "\x76", - "\xF0\x9D\x94\x9A" => "\x77", - "\xF0\x9D\x94\x9B" => "\x78", - "\xF0\x9D\x94\x9C" => "\x79", - "\xF0\x9D\x94\xB8" => "\x61", - "\xF0\x9D\x94\xB9" => "\x62", - "\xF0\x9D\x94\xBB" => "\x64", - "\xF0\x9D\x94\xBC" => "\x65", - "\xF0\x9D\x94\xBD" => "\x66", - "\xF0\x9D\x94\xBE" => "\x67", - "\xF0\x9D\x95\x80" => "\x69", - "\xF0\x9D\x95\x81" => "\x6A", - "\xF0\x9D\x95\x82" => "\x6B", - "\xF0\x9D\x95\x83" => "\x6C", - "\xF0\x9D\x95\x84" => "\x6D", - "\xF0\x9D\x95\x86" => "\x6F", - "\xF0\x9D\x95\x8A" => "\x73", - "\xF0\x9D\x95\x8B" => "\x74", - "\xF0\x9D\x95\x8C" => "\x75", - "\xF0\x9D\x95\x8D" => "\x76", - "\xF0\x9D\x95\x8E" => "\x77", - "\xF0\x9D\x95\x8F" => "\x78", - "\xF0\x9D\x95\x90" => "\x79", - "\xF0\x9D\x95\xAC" => "\x61", - "\xF0\x9D\x95\xAD" => "\x62", - "\xF0\x9D\x95\xAE" => "\x63", - "\xF0\x9D\x95\xAF" => "\x64", - "\xF0\x9D\x95\xB0" => "\x65", - "\xF0\x9D\x95\xB1" => "\x66", - "\xF0\x9D\x95\xB2" => "\x67", - "\xF0\x9D\x95\xB3" => "\x68", - "\xF0\x9D\x95\xB4" => "\x69", - "\xF0\x9D\x95\xB5" => "\x6A", - "\xF0\x9D\x95\xB6" => "\x6B", - "\xF0\x9D\x95\xB7" => "\x6C", - "\xF0\x9D\x95\xB8" => "\x6D", - "\xF0\x9D\x95\xB9" => "\x6E", - "\xF0\x9D\x95\xBA" => "\x6F", - "\xF0\x9D\x95\xBB" => "\x70", - "\xF0\x9D\x95\xBC" => "\x71", - "\xF0\x9D\x95\xBD" => "\x72", - "\xF0\x9D\x95\xBE" => "\x73", - "\xF0\x9D\x95\xBF" => "\x74", - "\xF0\x9D\x96\x80" => "\x75", - "\xF0\x9D\x96\x81" => "\x76", - "\xF0\x9D\x96\x82" => "\x77", - "\xF0\x9D\x96\x83" => "\x78", - "\xF0\x9D\x96\x84" => "\x79", - "\xF0\x9D\x96\x85" => "\x7A", - "\xF0\x9D\x96\xA0" => "\x61", - "\xF0\x9D\x96\xA1" => "\x62", - "\xF0\x9D\x96\xA2" => "\x63", - "\xF0\x9D\x96\xA3" => "\x64", - "\xF0\x9D\x96\xA4" => "\x65", - "\xF0\x9D\x96\xA5" => "\x66", - "\xF0\x9D\x96\xA6" => "\x67", - "\xF0\x9D\x96\xA7" => "\x68", - "\xF0\x9D\x96\xA8" => "\x69", - "\xF0\x9D\x96\xA9" => "\x6A", - "\xF0\x9D\x96\xAA" => "\x6B", - "\xF0\x9D\x96\xAB" => "\x6C", - "\xF0\x9D\x96\xAC" => "\x6D", - "\xF0\x9D\x96\xAD" => "\x6E", - "\xF0\x9D\x96\xAE" => "\x6F", - "\xF0\x9D\x96\xAF" => "\x70", - "\xF0\x9D\x96\xB0" => "\x71", - "\xF0\x9D\x96\xB1" => "\x72", - "\xF0\x9D\x96\xB2" => "\x73", - "\xF0\x9D\x96\xB3" => "\x74", - "\xF0\x9D\x96\xB4" => "\x75", - "\xF0\x9D\x96\xB5" => "\x76", - "\xF0\x9D\x96\xB6" => "\x77", - "\xF0\x9D\x96\xB7" => "\x78", - "\xF0\x9D\x96\xB8" => "\x79", - "\xF0\x9D\x96\xB9" => "\x7A", - "\xF0\x9D\x97\x94" => "\x61", - "\xF0\x9D\x97\x95" => "\x62", - "\xF0\x9D\x97\x96" => "\x63", - "\xF0\x9D\x97\x97" => "\x64", - "\xF0\x9D\x97\x98" => "\x65", - "\xF0\x9D\x97\x99" => "\x66", - "\xF0\x9D\x97\x9A" => "\x67", - "\xF0\x9D\x97\x9B" => "\x68", - "\xF0\x9D\x97\x9C" => "\x69", - "\xF0\x9D\x97\x9D" => "\x6A", - "\xF0\x9D\x97\x9E" => "\x6B", - "\xF0\x9D\x97\x9F" => "\x6C", - "\xF0\x9D\x97\xA0" => "\x6D", - "\xF0\x9D\x97\xA1" => "\x6E", - "\xF0\x9D\x97\xA2" => "\x6F", - "\xF0\x9D\x97\xA3" => "\x70", - "\xF0\x9D\x97\xA4" => "\x71", - "\xF0\x9D\x97\xA5" => "\x72", - "\xF0\x9D\x97\xA6" => "\x73", - "\xF0\x9D\x97\xA7" => "\x74", - "\xF0\x9D\x97\xA8" => "\x75", - "\xF0\x9D\x97\xA9" => "\x76", - "\xF0\x9D\x97\xAA" => "\x77", - "\xF0\x9D\x97\xAB" => "\x78", - "\xF0\x9D\x97\xAC" => "\x79", - "\xF0\x9D\x97\xAD" => "\x7A", - "\xF0\x9D\x98\x88" => "\x61", - "\xF0\x9D\x98\x89" => "\x62", - "\xF0\x9D\x98\x8A" => "\x63", - "\xF0\x9D\x98\x8B" => "\x64", - "\xF0\x9D\x98\x8C" => "\x65", - "\xF0\x9D\x98\x8D" => "\x66", - "\xF0\x9D\x98\x8E" => "\x67", - "\xF0\x9D\x98\x8F" => "\x68", - "\xF0\x9D\x98\x90" => "\x69", - "\xF0\x9D\x98\x91" => "\x6A", - "\xF0\x9D\x98\x92" => "\x6B", - "\xF0\x9D\x98\x93" => "\x6C", - "\xF0\x9D\x98\x94" => "\x6D", - "\xF0\x9D\x98\x95" => "\x6E", - "\xF0\x9D\x98\x96" => "\x6F", - "\xF0\x9D\x98\x97" => "\x70", - "\xF0\x9D\x98\x98" => "\x71", - "\xF0\x9D\x98\x99" => "\x72", - "\xF0\x9D\x98\x9A" => "\x73", - "\xF0\x9D\x98\x9B" => "\x74", - "\xF0\x9D\x98\x9C" => "\x75", - "\xF0\x9D\x98\x9D" => "\x76", - "\xF0\x9D\x98\x9E" => "\x77", - "\xF0\x9D\x98\x9F" => "\x78", - "\xF0\x9D\x98\xA0" => "\x79", - "\xF0\x9D\x98\xA1" => "\x7A", - "\xF0\x9D\x98\xBC" => "\x61", - "\xF0\x9D\x98\xBD" => "\x62", - "\xF0\x9D\x98\xBE" => "\x63", - "\xF0\x9D\x98\xBF" => "\x64", - "\xF0\x9D\x99\x80" => "\x65", - "\xF0\x9D\x99\x81" => "\x66", - "\xF0\x9D\x99\x82" => "\x67", - "\xF0\x9D\x99\x83" => "\x68", - "\xF0\x9D\x99\x84" => "\x69", - "\xF0\x9D\x99\x85" => "\x6A", - "\xF0\x9D\x99\x86" => "\x6B", - "\xF0\x9D\x99\x87" => "\x6C", - "\xF0\x9D\x99\x88" => "\x6D", - "\xF0\x9D\x99\x89" => "\x6E", - "\xF0\x9D\x99\x8A" => "\x6F", - "\xF0\x9D\x99\x8B" => "\x70", - "\xF0\x9D\x99\x8C" => "\x71", - "\xF0\x9D\x99\x8D" => "\x72", - "\xF0\x9D\x99\x8E" => "\x73", - "\xF0\x9D\x99\x8F" => "\x74", - "\xF0\x9D\x99\x90" => "\x75", - "\xF0\x9D\x99\x91" => "\x76", - "\xF0\x9D\x99\x92" => "\x77", - "\xF0\x9D\x99\x93" => "\x78", - "\xF0\x9D\x99\x94" => "\x79", - "\xF0\x9D\x99\x95" => "\x7A", - "\xF0\x9D\x99\xB0" => "\x61", - "\xF0\x9D\x99\xB1" => "\x62", - "\xF0\x9D\x99\xB2" => "\x63", - "\xF0\x9D\x99\xB3" => "\x64", - "\xF0\x9D\x99\xB4" => "\x65", - "\xF0\x9D\x99\xB5" => "\x66", - "\xF0\x9D\x99\xB6" => "\x67", - "\xF0\x9D\x99\xB7" => "\x68", - "\xF0\x9D\x99\xB8" => "\x69", - "\xF0\x9D\x99\xB9" => "\x6A", - "\xF0\x9D\x99\xBA" => "\x6B", - "\xF0\x9D\x99\xBB" => "\x6C", - "\xF0\x9D\x99\xBC" => "\x6D", - "\xF0\x9D\x99\xBD" => "\x6E", - "\xF0\x9D\x99\xBE" => "\x6F", - "\xF0\x9D\x99\xBF" => "\x70", - "\xF0\x9D\x9A\x80" => "\x71", - "\xF0\x9D\x9A\x81" => "\x72", - "\xF0\x9D\x9A\x82" => "\x73", - "\xF0\x9D\x9A\x83" => "\x74", - "\xF0\x9D\x9A\x84" => "\x75", - "\xF0\x9D\x9A\x85" => "\x76", - "\xF0\x9D\x9A\x86" => "\x77", - "\xF0\x9D\x9A\x87" => "\x78", - "\xF0\x9D\x9A\x88" => "\x79", - "\xF0\x9D\x9A\x89" => "\x7A", - "\xF0\x9D\x9A\xA8" => "\xCE\xB1", - "\xF0\x9D\x9A\xA9" => "\xCE\xB2", - "\xF0\x9D\x9A\xAA" => "\xCE\xB3", - "\xF0\x9D\x9A\xAB" => "\xCE\xB4", - "\xF0\x9D\x9A\xAC" => "\xCE\xB5", - "\xF0\x9D\x9A\xAD" => "\xCE\xB6", - "\xF0\x9D\x9A\xAE" => "\xCE\xB7", - "\xF0\x9D\x9A\xAF" => "\xCE\xB8", - "\xF0\x9D\x9A\xB0" => "\xCE\xB9", - "\xF0\x9D\x9A\xB1" => "\xCE\xBA", - "\xF0\x9D\x9A\xB2" => "\xCE\xBB", - "\xF0\x9D\x9A\xB3" => "\xCE\xBC", - "\xF0\x9D\x9A\xB4" => "\xCE\xBD", - "\xF0\x9D\x9A\xB5" => "\xCE\xBE", - "\xF0\x9D\x9A\xB6" => "\xCE\xBF", - "\xF0\x9D\x9A\xB7" => "\xCF\x80", - "\xF0\x9D\x9A\xB8" => "\xCF\x81", - "\xF0\x9D\x9A\xB9" => "\xCE\xB8", - "\xF0\x9D\x9A\xBA" => "\xCF\x83", - "\xF0\x9D\x9A\xBB" => "\xCF\x84", - "\xF0\x9D\x9A\xBC" => "\xCF\x85", - "\xF0\x9D\x9A\xBD" => "\xCF\x86", - "\xF0\x9D\x9A\xBE" => "\xCF\x87", - "\xF0\x9D\x9A\xBF" => "\xCF\x88", - "\xF0\x9D\x9B\x80" => "\xCF\x89", - "\xF0\x9D\x9B\x93" => "\xCF\x83", - "\xF0\x9D\x9B\xA2" => "\xCE\xB1", - "\xF0\x9D\x9B\xA3" => "\xCE\xB2", - "\xF0\x9D\x9B\xA4" => "\xCE\xB3", - "\xF0\x9D\x9B\xA5" => "\xCE\xB4", - "\xF0\x9D\x9B\xA6" => "\xCE\xB5", - "\xF0\x9D\x9B\xA7" => "\xCE\xB6", - "\xF0\x9D\x9B\xA8" => "\xCE\xB7", - "\xF0\x9D\x9B\xA9" => "\xCE\xB8", - "\xF0\x9D\x9B\xAA" => "\xCE\xB9", - "\xF0\x9D\x9B\xAB" => "\xCE\xBA", - "\xF0\x9D\x9B\xAC" => "\xCE\xBB", - "\xF0\x9D\x9B\xAD" => "\xCE\xBC", - "\xF0\x9D\x9B\xAE" => "\xCE\xBD", - "\xF0\x9D\x9B\xAF" => "\xCE\xBE", - "\xF0\x9D\x9B\xB0" => "\xCE\xBF", - "\xF0\x9D\x9B\xB1" => "\xCF\x80", - "\xF0\x9D\x9B\xB2" => "\xCF\x81", - "\xF0\x9D\x9B\xB3" => "\xCE\xB8", - "\xF0\x9D\x9B\xB4" => "\xCF\x83", - "\xF0\x9D\x9B\xB5" => "\xCF\x84", - "\xF0\x9D\x9B\xB6" => "\xCF\x85", - "\xF0\x9D\x9B\xB7" => "\xCF\x86", - "\xF0\x9D\x9B\xB8" => "\xCF\x87", - "\xF0\x9D\x9B\xB9" => "\xCF\x88", - "\xF0\x9D\x9B\xBA" => "\xCF\x89", - "\xF0\x9D\x9C\x8D" => "\xCF\x83", - "\xF0\x9D\x9C\x9C" => "\xCE\xB1", - "\xF0\x9D\x9C\x9D" => "\xCE\xB2", - "\xF0\x9D\x9C\x9E" => "\xCE\xB3", - "\xF0\x9D\x9C\x9F" => "\xCE\xB4", - "\xF0\x9D\x9C\xA0" => "\xCE\xB5", - "\xF0\x9D\x9C\xA1" => "\xCE\xB6", - "\xF0\x9D\x9C\xA2" => "\xCE\xB7", - "\xF0\x9D\x9C\xA3" => "\xCE\xB8", - "\xF0\x9D\x9C\xA4" => "\xCE\xB9", - "\xF0\x9D\x9C\xA5" => "\xCE\xBA", - "\xF0\x9D\x9C\xA6" => "\xCE\xBB", - "\xF0\x9D\x9C\xA7" => "\xCE\xBC", - "\xF0\x9D\x9C\xA8" => "\xCE\xBD", - "\xF0\x9D\x9C\xA9" => "\xCE\xBE", - "\xF0\x9D\x9C\xAA" => "\xCE\xBF", - "\xF0\x9D\x9C\xAB" => "\xCF\x80", - "\xF0\x9D\x9C\xAC" => "\xCF\x81", - "\xF0\x9D\x9C\xAD" => "\xCE\xB8", - "\xF0\x9D\x9C\xAE" => "\xCF\x83", - "\xF0\x9D\x9C\xAF" => "\xCF\x84", - "\xF0\x9D\x9C\xB0" => "\xCF\x85", - "\xF0\x9D\x9C\xB1" => "\xCF\x86", - "\xF0\x9D\x9C\xB2" => "\xCF\x87", - "\xF0\x9D\x9C\xB3" => "\xCF\x88", - "\xF0\x9D\x9C\xB4" => "\xCF\x89", - "\xF0\x9D\x9D\x87" => "\xCF\x83", - "\xF0\x9D\x9D\x96" => "\xCE\xB1", - "\xF0\x9D\x9D\x97" => "\xCE\xB2", - "\xF0\x9D\x9D\x98" => "\xCE\xB3", - "\xF0\x9D\x9D\x99" => "\xCE\xB4", - "\xF0\x9D\x9D\x9A" => "\xCE\xB5", - "\xF0\x9D\x9D\x9B" => "\xCE\xB6", - "\xF0\x9D\x9D\x9C" => "\xCE\xB7", - "\xF0\x9D\x9D\x9D" => "\xCE\xB8", - "\xF0\x9D\x9D\x9E" => "\xCE\xB9", - "\xF0\x9D\x9D\x9F" => "\xCE\xBA", - "\xF0\x9D\x9D\xA0" => "\xCE\xBB", - "\xF0\x9D\x9D\xA1" => "\xCE\xBC", - "\xF0\x9D\x9D\xA2" => "\xCE\xBD", - "\xF0\x9D\x9D\xA3" => "\xCE\xBE", - "\xF0\x9D\x9D\xA4" => "\xCE\xBF", - "\xF0\x9D\x9D\xA5" => "\xCF\x80", - "\xF0\x9D\x9D\xA6" => "\xCF\x81", - "\xF0\x9D\x9D\xA7" => "\xCE\xB8", - "\xF0\x9D\x9D\xA8" => "\xCF\x83", - "\xF0\x9D\x9D\xA9" => "\xCF\x84", - "\xF0\x9D\x9D\xAA" => "\xCF\x85", - "\xF0\x9D\x9D\xAB" => "\xCF\x86", - "\xF0\x9D\x9D\xAC" => "\xCF\x87", - "\xF0\x9D\x9D\xAD" => "\xCF\x88", - "\xF0\x9D\x9D\xAE" => "\xCF\x89", - "\xF0\x9D\x9E\x81" => "\xCF\x83", - "\xF0\x9D\x9E\x90" => "\xCE\xB1", - "\xF0\x9D\x9E\x91" => "\xCE\xB2", - "\xF0\x9D\x9E\x92" => "\xCE\xB3", - "\xF0\x9D\x9E\x93" => "\xCE\xB4", - "\xF0\x9D\x9E\x94" => "\xCE\xB5", - "\xF0\x9D\x9E\x95" => "\xCE\xB6", - "\xF0\x9D\x9E\x96" => "\xCE\xB7", - "\xF0\x9D\x9E\x97" => "\xCE\xB8", - "\xF0\x9D\x9E\x98" => "\xCE\xB9", - "\xF0\x9D\x9E\x99" => "\xCE\xBA", - "\xF0\x9D\x9E\x9A" => "\xCE\xBB", - "\xF0\x9D\x9E\x9B" => "\xCE\xBC", - "\xF0\x9D\x9E\x9C" => "\xCE\xBD", - "\xF0\x9D\x9E\x9D" => "\xCE\xBE", - "\xF0\x9D\x9E\x9E" => "\xCE\xBF", - "\xF0\x9D\x9E\x9F" => "\xCF\x80", - "\xF0\x9D\x9E\xA0" => "\xCF\x81", - "\xF0\x9D\x9E\xA1" => "\xCE\xB8", - "\xF0\x9D\x9E\xA2" => "\xCF\x83", - "\xF0\x9D\x9E\xA3" => "\xCF\x84", - "\xF0\x9D\x9E\xA4" => "\xCF\x85", - "\xF0\x9D\x9E\xA5" => "\xCF\x86", - "\xF0\x9D\x9E\xA6" => "\xCF\x87", - "\xF0\x9D\x9E\xA7" => "\xCF\x88", - "\xF0\x9D\x9E\xA8" => "\xCF\x89", - "\xF0\x9D\x9E\xBB" => "\xCF\x83", - "\xF0\x9D\x9F\x8A" => "\xCF\x9D", - ); - global $phpbb_root_path, $phpEx; - - // do the case fold - $text = utf8_case_fold($text, $option); - - if (!class_exists('utf_normalizer')) - { - global $phpbb_root_path, $phpEx; - include($phpbb_root_path . 'includes/utf/utf_normalizer.' . $phpEx); - } - - // convert to NFKC - utf_normalizer::nfkc($text); - - // FC_NFKC_Closure, http://www.unicode.org/Public/5.0.0/ucd/DerivedNormalizationProps.txt - $text = strtr($text, $fc_nfkc_closure); - - return $text; -} - -/** -* Assume the input is NFC: -* Takes the input and does a "special" case fold. It does minor normalization as well. -* -* @param string $text text to be case folded -* @param string $option determines how we will fold the cases -* @return string case folded text -*/ -function utf8_case_fold_nfc($text, $option = 'full') -{ - static $uniarray = array(); - static $ypogegrammeni = array( - "\xCD\xBA" => "\x20\xCD\x85", - "\xE1\xBE\x80" => "\xE1\xBC\x80\xCD\x85", - "\xE1\xBE\x81" => "\xE1\xBC\x81\xCD\x85", - "\xE1\xBE\x82" => "\xE1\xBC\x82\xCD\x85", - "\xE1\xBE\x83" => "\xE1\xBC\x83\xCD\x85", - "\xE1\xBE\x84" => "\xE1\xBC\x84\xCD\x85", - "\xE1\xBE\x85" => "\xE1\xBC\x85\xCD\x85", - "\xE1\xBE\x86" => "\xE1\xBC\x86\xCD\x85", - "\xE1\xBE\x87" => "\xE1\xBC\x87\xCD\x85", - "\xE1\xBE\x88" => "\xE1\xBC\x88\xCD\x85", - "\xE1\xBE\x89" => "\xE1\xBC\x89\xCD\x85", - "\xE1\xBE\x8A" => "\xE1\xBC\x8A\xCD\x85", - "\xE1\xBE\x8B" => "\xE1\xBC\x8B\xCD\x85", - "\xE1\xBE\x8C" => "\xE1\xBC\x8C\xCD\x85", - "\xE1\xBE\x8D" => "\xE1\xBC\x8D\xCD\x85", - "\xE1\xBE\x8E" => "\xE1\xBC\x8E\xCD\x85", - "\xE1\xBE\x8F" => "\xE1\xBC\x8F\xCD\x85", - "\xE1\xBE\x90" => "\xE1\xBC\xA0\xCD\x85", - "\xE1\xBE\x91" => "\xE1\xBC\xA1\xCD\x85", - "\xE1\xBE\x92" => "\xE1\xBC\xA2\xCD\x85", - "\xE1\xBE\x93" => "\xE1\xBC\xA3\xCD\x85", - "\xE1\xBE\x94" => "\xE1\xBC\xA4\xCD\x85", - "\xE1\xBE\x95" => "\xE1\xBC\xA5\xCD\x85", - "\xE1\xBE\x96" => "\xE1\xBC\xA6\xCD\x85", - "\xE1\xBE\x97" => "\xE1\xBC\xA7\xCD\x85", - "\xE1\xBE\x98" => "\xE1\xBC\xA8\xCD\x85", - "\xE1\xBE\x99" => "\xE1\xBC\xA9\xCD\x85", - "\xE1\xBE\x9A" => "\xE1\xBC\xAA\xCD\x85", - "\xE1\xBE\x9B" => "\xE1\xBC\xAB\xCD\x85", - "\xE1\xBE\x9C" => "\xE1\xBC\xAC\xCD\x85", - "\xE1\xBE\x9D" => "\xE1\xBC\xAD\xCD\x85", - "\xE1\xBE\x9E" => "\xE1\xBC\xAE\xCD\x85", - "\xE1\xBE\x9F" => "\xE1\xBC\xAF\xCD\x85", - "\xE1\xBE\xA0" => "\xE1\xBD\xA0\xCD\x85", - "\xE1\xBE\xA1" => "\xE1\xBD\xA1\xCD\x85", - "\xE1\xBE\xA2" => "\xE1\xBD\xA2\xCD\x85", - "\xE1\xBE\xA3" => "\xE1\xBD\xA3\xCD\x85", - "\xE1\xBE\xA4" => "\xE1\xBD\xA4\xCD\x85", - "\xE1\xBE\xA5" => "\xE1\xBD\xA5\xCD\x85", - "\xE1\xBE\xA6" => "\xE1\xBD\xA6\xCD\x85", - "\xE1\xBE\xA7" => "\xE1\xBD\xA7\xCD\x85", - "\xE1\xBE\xA8" => "\xE1\xBD\xA8\xCD\x85", - "\xE1\xBE\xA9" => "\xE1\xBD\xA9\xCD\x85", - "\xE1\xBE\xAA" => "\xE1\xBD\xAA\xCD\x85", - "\xE1\xBE\xAB" => "\xE1\xBD\xAB\xCD\x85", - "\xE1\xBE\xAC" => "\xE1\xBD\xAC\xCD\x85", - "\xE1\xBE\xAD" => "\xE1\xBD\xAD\xCD\x85", - "\xE1\xBE\xAE" => "\xE1\xBD\xAE\xCD\x85", - "\xE1\xBE\xAF" => "\xE1\xBD\xAF\xCD\x85", - "\xE1\xBE\xB2" => "\xE1\xBD\xB0\xCD\x85", - "\xE1\xBE\xB3" => "\xCE\xB1\xCD\x85", - "\xE1\xBE\xB4" => "\xCE\xAC\xCD\x85", - "\xE1\xBE\xB7" => "\xE1\xBE\xB6\xCD\x85", - "\xE1\xBE\xBC" => "\xCE\x91\xCD\x85", - "\xE1\xBF\x82" => "\xE1\xBD\xB4\xCD\x85", - "\xE1\xBF\x83" => "\xCE\xB7\xCD\x85", - "\xE1\xBF\x84" => "\xCE\xAE\xCD\x85", - "\xE1\xBF\x87" => "\xE1\xBF\x86\xCD\x85", - "\xE1\xBF\x8C" => "\xCE\x97\xCD\x85", - "\xE1\xBF\xB2" => "\xE1\xBD\xBC\xCD\x85", - "\xE1\xBF\xB3" => "\xCF\x89\xCD\x85", - "\xE1\xBF\xB4" => "\xCF\x8E\xCD\x85", - "\xE1\xBF\xB7" => "\xE1\xBF\xB6\xCD\x85", - "\xE1\xBF\xBC" => "\xCE\xA9\xCD\x85", - ); - global $phpbb_root_path, $phpEx; - - // perform a small trick, avoid further normalization on composed points that contain U+0345 in their decomposition - $text = strtr($text, $ypogegrammeni); - - // do the case fold - $text = utf8_case_fold($text, $option); - - return $text; -} - -/** -* A wrapper function for the normalizer which takes care of including the class if required and modifies the passed strings -* to be in NFC (Normalization Form Composition). -* -* @param mixed $strings a string or an array of strings to normalize -* @return mixed the normalized content, preserving array keys if array given. -*/ -function utf8_normalize_nfc($strings) -{ - if (empty($strings)) - { - return $strings; - } - - if (!class_exists('utf_normalizer')) - { - global $phpbb_root_path, $phpEx; - include($phpbb_root_path . 'includes/utf/utf_normalizer.' . $phpEx); - } - - if (!is_array($strings)) - { - utf_normalizer::nfc($strings); - } - else if (is_array($strings)) - { - foreach ($strings as $key => $string) - { - if (is_array($string)) - { - foreach ($string as $_key => $_string) - { - utf_normalizer::nfc($strings[$key][$_key]); - } - } - else - { - utf_normalizer::nfc($strings[$key]); - } - } - } - - return $strings; -} - -/** -* This function is used to generate a "clean" version of a string. -* Clean means that it is a case insensitive form (case folding) and that it is normalized (NFC). -* Additionally a homographs of one character are transformed into one specific character (preferably ASCII -* if it is an ASCII character). -* -* Please be aware that if you change something within this function or within -* functions used here you need to rebuild/update the username_clean column in the users table. And all other -* columns that store a clean string otherwise you will break this functionality. -* -* @param string $text An unclean string, mabye user input (has to be valid UTF-8!) -* @return string Cleaned up version of the input string -*/ -function utf8_clean_string($text) -{ - global $phpbb_root_path, $phpEx; - - static $homographs = array(); - if (empty($homographs)) - { - $homographs = include($phpbb_root_path . 'includes/utf/data/confusables.' . $phpEx); - } - - $text = utf8_case_fold_nfkc($text); - $text = strtr($text, $homographs); - // Other control characters - $text = preg_replace('#[\x00-\x1F\x7F]+|(?:\xC2[\x80-\x9F])+#', '', $text); - - // we need to reduce multiple spaces to a single one - $text = preg_replace('# {2,}#', ' ', $text); - - // we can use trim here as all the other space characters should have been turned - // into normal ASCII spaces by now - return trim($text); -} - -/** -* A wrapper for htmlspecialchars($value, ENT_COMPAT, 'UTF-8') -*/ -function utf8_htmlspecialchars(&$value) -{ - return htmlspecialchars($value, ENT_COMPAT, 'UTF-8'); -} - -/** -* Trying to convert returned system message to utf8 -* -* PHP assumes such messages are ISO-8859-1 so we'll do that too -* and if it breaks messages we'll blame it on them ;-) -*/ -function utf8_convert_message($message) -{ - // First of all check if conversion is neded at all, as there is no point - // in converting ASCII messages from ISO-8859-1 to UTF-8 - if (!preg_match('/[\x80-\xFF]/', $message)) - { - return utf8_htmlspecialchars($message); - } - - // else we need to convert some part of the message - return utf8_htmlspecialchars(utf8_encode($message)); -} - -/** -* UTF8-compatible wordwrap replacement -* -* @param string $string The input string -* @param int $width The column width. Defaults to 75. -* @param string $break The line is broken using the optional break parameter. Defaults to '\n'. -* @param bool $cut If the cut is set to TRUE, the string is always wrapped at the specified width. So if you have a word that is larger than the given width, it is broken apart. -* -* @return string the given string wrapped at the specified column. -* -*/ -function utf8_wordwrap($string, $width = 75, $break = "\n", $cut = false) -{ - // We first need to explode on $break, not destroying existing (intended) breaks - $lines = explode($break, $string); - $new_lines = array(0 => ''); - $index = 0; - - foreach ($lines as $line) - { - $words = explode(' ', $line); - - for ($i = 0, $size = sizeof($words); $i < $size; $i++) - { - $word = $words[$i]; - - // If cut is true we need to cut the word if it is > width chars - if ($cut && utf8_strlen($word) > $width) - { - $words[$i] = utf8_substr($word, $width); - $word = utf8_substr($word, 0, $width); - $i--; - } - - if (utf8_strlen($new_lines[$index] . $word) > $width) - { - $new_lines[$index] = substr($new_lines[$index], 0, -1); - $index++; - $new_lines[$index] = ''; - } - - $new_lines[$index] .= $word . ' '; - } - - $new_lines[$index] = substr($new_lines[$index], 0, -1); - $index++; - $new_lines[$index] = ''; - } - - unset($new_lines[$index]); - return implode($break, $new_lines); -} - -?> \ No newline at end of file diff --git a/phpBB/index.php b/phpBB/index.php index e1727c2f0a..438ddaab12 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -1,133 +1,470 @@ session_begin(); -$auth->acl($user->data); -$user->setup('viewforum'); +// +$userdata = session_pagestart($user_ip, PAGE_INDEX); +init_userprefs($userdata); +// +// End session management +// -display_forums('', $config['load_moderators']); +$viewcat = ( !empty($HTTP_GET_VARS[POST_CAT_URL]) ) ? $HTTP_GET_VARS[POST_CAT_URL] : -1; -// Set some stats, get posts count from forums data if we... hum... retrieve all forums data -$total_posts = $config['num_posts']; -$total_topics = $config['num_topics']; -$total_users = $config['num_users']; - -$l_total_user_s = ($total_users == 0) ? 'TOTAL_USERS_ZERO' : 'TOTAL_USERS_OTHER'; -$l_total_post_s = ($total_posts == 0) ? 'TOTAL_POSTS_ZERO' : 'TOTAL_POSTS_OTHER'; -$l_total_topic_s = ($total_topics == 0) ? 'TOTAL_TOPICS_ZERO' : 'TOTAL_TOPICS_OTHER'; - -// Grab group details for legend display -if ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) +if( isset($HTTP_GET_VARS['mark']) || isset($HTTP_POST_VARS['mark']) ) { - $sql = 'SELECT group_id, group_name, group_colour, group_type - FROM ' . GROUPS_TABLE . ' - WHERE group_legend = 1 - ORDER BY group_name ASC'; + $mark_read = ( isset($HTTP_POST_VARS['mark']) ) ? $HTTP_POST_VARS['mark'] : $HTTP_GET_VARS['mark']; } else { - $sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type - FROM ' . GROUPS_TABLE . ' g - LEFT JOIN ' . USER_GROUP_TABLE . ' ug - ON ( - g.group_id = ug.group_id - AND ug.user_id = ' . $user->data['user_id'] . ' - AND ug.user_pending = 0 - ) - WHERE g.group_legend = 1 - AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $user->data['user_id'] . ') - ORDER BY g.group_name ASC'; + $mark_read = ''; } -$result = $db->sql_query($sql); -$legend = ''; +// +// Handle marking posts +// +if( $mark_read == 'forums' ) +{ + if( $userdata['session_logged_in'] ) + { + setcookie($board_config['cookie_name'] . '_f_all', time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); + } + + $template->assign_vars(array( + "META" => '') + ); + + $message = $lang['Forums_marked_read'] . '

    ' . sprintf($lang['Click_return_index'], '', ' '); + + message_die(GENERAL_MESSAGE, $message); +} +// +// End handle marking posts +// + +$tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_t"]) : array(); +$tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_f"]) : array(); + +// +// If you don't use these stats on your index you may want to consider +// removing them +// +$total_posts = get_db_stat('postcount'); +$total_users = get_db_stat('usercount'); +$newest_userdata = get_db_stat('newestuser'); +$newest_user = $newest_userdata['username']; +$newest_uid = $newest_userdata['user_id']; + +if( $total_posts == 0 ) +{ + $l_total_post_s = $lang['Posted_articles_zero_total']; +} +else if( $total_posts == 1 ) +{ + $l_total_post_s = $lang['Posted_article_total']; +} +else +{ + $l_total_post_s = $lang['Posted_articles_total']; +} + +if( $total_users == 0 ) +{ + $l_total_user_s = $lang['Registered_users_zero_total']; +} +else if( $total_users == 1 ) +{ + $l_total_user_s = $lang['Registered_user_total']; +} +else +{ + $l_total_user_s = $lang['Registered_users_total']; +} + + +// +// Start page proper +// +$sql = "SELECT c.cat_id, c.cat_title, c.cat_order + FROM " . CATEGORIES_TABLE . " c + ORDER BY c.cat_order"; +if( !($result = $db->sql_query($sql)) ) +{ + message_die(GENERAL_ERROR, 'Could not query categories list', '', __LINE__, __FILE__, $sql); +} + +$category_rows = array(); while ($row = $db->sql_fetchrow($result)) { - $colour_text = ($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . '"' : ''; - - if ($row['group_name'] == 'BOTS') - { - $legend .= (($legend != '') ? ', ' : '') . '' . $user->lang['G_BOTS'] . '
    '; - } - else - { - $legend .= (($legend != '') ? ', ' : '') . '' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . ''; - } + $category_rows[] = $row; } $db->sql_freeresult($result); -// Generate birthday list if required ... -$birthday_list = ''; -if ($config['load_birthdays'] && $config['allow_birthdays']) +if( ( $total_categories = count($category_rows) ) ) { - $now = getdate(time() + $user->timezone + $user->dst - date('Z')); - $sql = 'SELECT user_id, username, user_colour, user_birthday - FROM ' . USERS_TABLE . " - WHERE user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', $now['mday'], $now['mon'])) . "%' - AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) + // + // Define appropriate SQL + // + switch(SQL_LAYER) { - $birthday_list .= (($birthday_list != '') ? ', ' : '') . get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']); + case 'postgresql': + $sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id + FROM " . FORUMS_TABLE . " f, " . POSTS_TABLE . " p, " . USERS_TABLE . " u + WHERE p.post_id = f.forum_last_post_id + AND u.user_id = p.poster_id + UNION ( + SELECT f.*, NULL, NULL, NULL, NULL + FROM " . FORUMS_TABLE . " f + WHERE NOT EXISTS ( + SELECT p.post_time + FROM " . POSTS_TABLE . " p + WHERE p.post_id = f.forum_last_post_id + ) + ) + ORDER BY cat_id, forum_order"; + break; - if ($age = (int) substr($row['user_birthday'], -4)) - { - $birthday_list .= ' (' . ($now['year'] - $age) . ')'; - } + case 'oracle': + $sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id + FROM " . FORUMS_TABLE . " f, " . POSTS_TABLE . " p, " . USERS_TABLE . " u + WHERE p.post_id = f.forum_last_post_id(+) + AND u.user_id = p.poster_id(+) + ORDER BY f.cat_id, f.forum_order"; + break; + + default: + $sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id + FROM (( " . FORUMS_TABLE . " f + LEFT JOIN " . POSTS_TABLE . " p ON p.post_id = f.forum_last_post_id ) + LEFT JOIN " . USERS_TABLE . " u ON u.user_id = p.poster_id ) + ORDER BY f.cat_id, f.forum_order"; + break; + } + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not query forums information', '', __LINE__, __FILE__, $sql); + } + + $forum_data = array(); + while( $row = $db->sql_fetchrow($result) ) + { + $forum_data[] = $row; } $db->sql_freeresult($result); + + if ( !($total_forums = count($forum_data)) ) + { + message_die(GENERAL_MESSAGE, $lang['No_forums']); + } + + // + // Obtain a list of topic ids which contain + // posts made since user last visited + // + if ($userdata['session_logged_in']) + { + // 60 days limit + if ($userdata['user_lastvisit'] < (time() - 5184000)) + { + $userdata['user_lastvisit'] = time() - 5184000; + } + + $sql = "SELECT t.forum_id, t.topic_id, p.post_time + FROM " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p + WHERE p.post_id = t.topic_last_post_id + AND p.post_time > " . $userdata['user_lastvisit'] . " + AND t.topic_moved_id = 0"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not query new topic information', '', __LINE__, __FILE__, $sql); + } + + $new_topic_data = array(); + while( $topic_data = $db->sql_fetchrow($result) ) + { + $new_topic_data[$topic_data['forum_id']][$topic_data['topic_id']] = $topic_data['post_time']; + } + $db->sql_freeresult($result); + } + + // + // Obtain list of moderators of each forum + // First users, then groups ... broken into two queries + // + $sql = "SELECT aa.forum_id, u.user_id, u.username + FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u + WHERE aa.auth_mod = " . TRUE . " + AND g.group_single_user = 1 + AND ug.group_id = aa.group_id + AND g.group_id = aa.group_id + AND u.user_id = ug.user_id + GROUP BY u.user_id, u.username, aa.forum_id + ORDER BY aa.forum_id, u.user_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql); + } + + $forum_moderators = array(); + while( $row = $db->sql_fetchrow($result) ) + { + $forum_moderators[$row['forum_id']][] = '' . $row['username'] . ''; + } + $db->sql_freeresult($result); + + $sql = "SELECT aa.forum_id, g.group_id, g.group_name + FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g + WHERE aa.auth_mod = " . TRUE . " + AND g.group_single_user = 0 + AND g.group_type <> " . GROUP_HIDDEN . " + AND ug.group_id = aa.group_id + AND g.group_id = aa.group_id + GROUP BY g.group_id, g.group_name, aa.forum_id + ORDER BY aa.forum_id, g.group_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql); + } + + while( $row = $db->sql_fetchrow($result) ) + { + $forum_moderators[$row['forum_id']][] = '' . $row['group_name'] . ''; + } + $db->sql_freeresult($result); + + // + // Find which forums are visible for this user + // + $is_auth_ary = array(); + $is_auth_ary = auth(AUTH_VIEW, AUTH_LIST_ALL, $userdata, $forum_data); + + // + // Start output of page + // + define('SHOW_ONLINE', true); + $page_title = $lang['Index']; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + $template->set_filenames(array( + 'body' => 'index_body.tpl') + ); + + $template->assign_vars(array( + 'TOTAL_POSTS' => sprintf($l_total_post_s, $total_posts), + 'TOTAL_USERS' => sprintf($l_total_user_s, $total_users), + 'NEWEST_USER' => sprintf($lang['Newest_user'], '', $newest_user, ''), + + 'FORUM_IMG' => $images['forum'], + 'FORUM_NEW_IMG' => $images['forum_new'], + 'FORUM_LOCKED_IMG' => $images['forum_locked'], + + 'L_FORUM' => $lang['Forum'], + 'L_TOPICS' => $lang['Topics'], + 'L_REPLIES' => $lang['Replies'], + 'L_VIEWS' => $lang['Views'], + 'L_POSTS' => $lang['Posts'], + 'L_LASTPOST' => $lang['Last_Post'], + 'L_NO_NEW_POSTS' => $lang['No_new_posts'], + 'L_NEW_POSTS' => $lang['New_posts'], + 'L_NO_NEW_POSTS_LOCKED' => $lang['No_new_posts_locked'], + 'L_NEW_POSTS_LOCKED' => $lang['New_posts_locked'], + 'L_ONLINE_EXPLAIN' => $lang['Online_explain'], + + 'L_MODERATOR' => $lang['Moderators'], + 'L_FORUM_LOCKED' => $lang['Forum_is_locked'], + 'L_MARK_FORUMS_READ' => $lang['Mark_all_forums'], + + 'U_MARK_READ' => append_sid("index.$phpEx?mark=forums")) + ); + + // + // Let's decide which categories we should display + // + $display_categories = array(); + + for ($i = 0; $i < $total_forums; $i++ ) + { + if ($is_auth_ary[$forum_data[$i]['forum_id']]['auth_view']) + { + $display_categories[$forum_data[$i]['cat_id']] = true; + } + } + + // + // Okay, let's build the index + // + for($i = 0; $i < $total_categories; $i++) + { + $cat_id = $category_rows[$i]['cat_id']; + + // + // Yes, we should, so first dump out the category + // title, then, if appropriate the forum list + // + if (isset($display_categories[$cat_id]) && $display_categories[$cat_id]) + { + $template->assign_block_vars('catrow', array( + 'CAT_ID' => $cat_id, + 'CAT_DESC' => $category_rows[$i]['cat_title'], + 'U_VIEWCAT' => append_sid("index.$phpEx?" . POST_CAT_URL . "=$cat_id")) + ); + + if ( $viewcat == $cat_id || $viewcat == -1 ) + { + for($j = 0; $j < $total_forums; $j++) + { + if ( $forum_data[$j]['cat_id'] == $cat_id ) + { + $forum_id = $forum_data[$j]['forum_id']; + + if ( $is_auth_ary[$forum_id]['auth_view'] ) + { + if ( $forum_data[$j]['forum_status'] == FORUM_LOCKED ) + { + $folder_image = $images['forum_locked']; + $folder_alt = $lang['Forum_locked']; + } + else + { + $unread_topics = false; + if ( $userdata['session_logged_in'] ) + { + if ( !empty($new_topic_data[$forum_id]) ) + { + $forum_last_post_time = 0; + + while( list($check_topic_id, $check_post_time) = @each($new_topic_data[$forum_id]) ) + { + if ( empty($tracking_topics[$check_topic_id]) ) + { + $unread_topics = true; + $forum_last_post_time = max($check_post_time, $forum_last_post_time); + + } + else + { + if ( $tracking_topics[$check_topic_id] < $check_post_time ) + { + $unread_topics = true; + $forum_last_post_time = max($check_post_time, $forum_last_post_time); + } + } + } + + if ( !empty($tracking_forums[$forum_id]) ) + { + if ( $tracking_forums[$forum_id] > $forum_last_post_time ) + { + $unread_topics = false; + } + } + + if ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) + { + if ( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] > $forum_last_post_time ) + { + $unread_topics = false; + } + } + + } + } + + $folder_image = ( $unread_topics ) ? $images['forum_new'] : $images['forum']; + $folder_alt = ( $unread_topics ) ? $lang['New_posts'] : $lang['No_new_posts']; + } + + $posts = $forum_data[$j]['forum_posts']; + $topics = $forum_data[$j]['forum_topics']; + + if ( $forum_data[$j]['forum_last_post_id'] ) + { + $last_post_time = create_date($board_config['default_dateformat'], $forum_data[$j]['post_time'], $board_config['board_timezone']); + + $last_post = $last_post_time . '
    '; + + $last_post .= ( $forum_data[$j]['user_id'] == ANONYMOUS ) ? ( ($forum_data[$j]['post_username'] != '' ) ? $forum_data[$j]['post_username'] . ' ' : $lang['Guest'] . ' ' ) : '' . $forum_data[$j]['username'] . ' '; + + $last_post .= '' . $lang['View_latest_post'] . ''; + } + else + { + $last_post = $lang['No_Posts']; + } + + if ( count($forum_moderators[$forum_id]) > 0 ) + { + $l_moderators = ( count($forum_moderators[$forum_id]) == 1 ) ? $lang['Moderator'] : $lang['Moderators']; + $moderator_list = implode(', ', $forum_moderators[$forum_id]); + } + else + { + $l_moderators = ' '; + $moderator_list = ' '; + } + + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $template->assign_block_vars('catrow.forumrow', array( + 'ROW_COLOR' => '#' . $row_color, + 'ROW_CLASS' => $row_class, + 'FORUM_FOLDER_IMG' => $folder_image, + 'FORUM_NAME' => $forum_data[$j]['forum_name'], + 'FORUM_DESC' => $forum_data[$j]['forum_desc'], + 'POSTS' => $forum_data[$j]['forum_posts'], + 'TOPICS' => $forum_data[$j]['forum_topics'], + 'LAST_POST' => $last_post, + 'MODERATORS' => $moderator_list, + + 'L_MODERATOR' => $l_moderators, + 'L_FORUM_FOLDER_ALT' => $folder_alt, + + 'U_VIEWFORUM' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id")) + ); + } + } + } + } + } + } // for ... categories + +}// if ... total_categories +else +{ + message_die(GENERAL_MESSAGE, $lang['No_forums']); } -// Assign index specific vars -$template->assign_vars(array( - 'TOTAL_POSTS' => sprintf($user->lang[$l_total_post_s], $total_posts), - 'TOTAL_TOPICS' => sprintf($user->lang[$l_total_topic_s], $total_topics), - 'TOTAL_USERS' => sprintf($user->lang[$l_total_user_s], $total_users), - 'NEWEST_USER' => sprintf($user->lang['NEWEST_USER'], get_username_string('full', $config['newest_user_id'], $config['newest_username'], $config['newest_user_colour'])), +// +// Generate the page +// +$template->pparse('body'); - 'LEGEND' => $legend, - 'BIRTHDAY_LIST' => $birthday_list, - - 'FORUM_IMG' => $user->img('forum_read', 'NO_NEW_POSTS'), - 'FORUM_NEW_IMG' => $user->img('forum_unread', 'NEW_POSTS'), - 'FORUM_LOCKED_IMG' => $user->img('forum_read_locked', 'NO_NEW_POSTS_LOCKED'), - 'FORUM_NEW_LOCKED_IMG' => $user->img('forum_unread_locked', 'NO_NEW_POSTS_LOCKED'), - - 'S_LOGIN_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'), - 'S_DISPLAY_BIRTHDAY_LIST' => ($config['load_birthdays']) ? true : false, - - 'U_MARK_FORUMS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}index.$phpEx", 'mark=forums') : '', - 'U_MCP' => ($auth->acl_get('m_') || $auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=front', true, $user->session_id) : '') -); - -// Output page -page_header($user->lang['INDEX']); - -$template->set_filenames(array( - 'body' => 'index_body.html') -); - -page_footer(); +include($phpbb_root_path . 'includes/page_tail.'.$phpEx); ?> \ No newline at end of file diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php deleted file mode 100644 index 518de114b8..0000000000 --- a/phpBB/install/convertors/convert_phpbb20.php +++ /dev/null @@ -1,920 +0,0 @@ - 'phpBB 2.0.x', - 'version' => '1.0.0', - 'phpbb_version' => '3.0.0', - 'author' => 'phpBB Group', - 'dbms' => $dbms, - 'dbhost' => $dbhost, - 'dbport' => $dbport, - 'dbuser' => $dbuser, - 'dbpasswd' => '', - 'dbname' => $dbname, - 'table_prefix' => 'phpbb_', - 'forum_path' => '../forums', - 'author_notes' => '', -); - -/** -* $tables is a list of the tables (minus prefix) which we expect to find in the -* source forum. It is used to guess the prefix if the specified prefix is incorrect -*/ -$tables = array( - 'auth_access', - 'banlist', - 'categories', - 'disallow', - 'forum_prune', - 'forums', - 'groups', - 'posts', - 'posts_text', - 'privmsgs', - 'privmsgs_text', - 'ranks', - 'smilies', - 'topics', - 'topics_watch', - 'user_group', - 'users', - 'vote_desc', - 'vote_results', - 'vote_voters', - 'words' -); - -/** -* $config_schema details how the board configuration information is stored in the source forum. -* -* 'table_format' can take the value 'file' to indicate a config file. In this case array_name -* is set to indicate the name of the array the config values are stored in -* 'table_format' can be an array if the values are stored in a table which is an assosciative array -* (as per phpBB 2.0.x) -* If left empty, values are assumed to be stored in a table where each config setting is -* a column (as per phpBB 1.x) -* -* In either of the latter cases 'table_name' indicates the name of the table in the database -* -* 'settings' is an array which maps the name of the config directive in the source forum -* to the config directive in phpBB3. It can either be a direct mapping or use a function. -* Please note that the contents of the old config value are passed to the function, therefore -* an in-built function requiring the variable passed by reference is not able to be used. Since -* empty() is such a function we created the function is_empty() to be used instead. -*/ -$config_schema = array( - 'table_name' => 'config', - 'table_format' => array('config_name' => 'config_value'), - 'settings' => array( - 'allow_bbcode' => 'allow_bbcode', - 'allow_smilies' => 'allow_smilies', - 'allow_sig' => 'allow_sig', - 'allow_namechange' => 'allow_namechange', - 'allow_avatar_local' => 'allow_avatar_local', - 'allow_avatar_remote' => 'allow_avatar_remote', - 'allow_avatar_upload' => 'allow_avatar_upload', - 'board_disable' => 'board_disable', - 'sitename' => 'phpbb_set_encoding(sitename)', - 'site_desc' => 'phpbb_set_encoding(site_desc)', - 'session_length' => 'session_length', - 'board_email_sig' => 'phpbb_set_encoding(board_email_sig)', - 'posts_per_page' => 'posts_per_page', - 'topics_per_page' => 'topics_per_page', - 'enable_confirm' => 'enable_confirm', - 'board_email_form' => 'board_email_form', - 'override_user_style' => 'override_user_style', - 'hot_threshold' => 'hot_threshold', - 'max_poll_options' => 'max_poll_options', - 'max_sig_chars' => 'max_sig_chars', - 'pm_max_msgs' => 'max_inbox_privmsgs', - 'smtp_delivery' => 'smtp_delivery', - 'smtp_host' => 'smtp_host', - 'smtp_username' => 'smtp_username', - 'smtp_password' => 'smtp_password', - 'require_activation' => 'require_activation', - 'flood_interval' => 'flood_interval', - 'avatar_filesize' => 'avatar_filesize', - 'avatar_max_width' => 'avatar_max_width', - 'avatar_max_height' => 'avatar_max_height', - 'default_dateformat' => 'default_dateformat', - 'board_timezone' => 'board_timezone', - 'allow_privmsg' => 'not(privmsg_disable)', - 'gzip_compress' => 'gzip_compress', - 'coppa_enable' => 'is_empty(coppa_mail)', - 'coppa_fax' => 'coppa_fax', - 'coppa_mail' => 'coppa_mail', - 'record_online_users' => 'record_online_users', - 'record_online_date' => 'record_online_date', - 'board_startdate' => 'board_startdate', - ) -); - -/** -* $test_file is the name of a file which is present on the source -* forum which can be used to check that the path specified by the -* user was correct -*/ -$test_file = 'modcp.php'; - -/** -* If this is set then we are not generating the first page of information but getting the conversion information. -*/ -if (!$get_info) -{ - // Test to see if the birthday MOD is installed on the source forum - // Niels' birthday mod - if (get_config_value('birthday_required') !== false || get_config_value('bday_require') !== false) - { - define('MOD_BIRTHDAY', true); - } - - // TerraFrost's validated birthday mod - if (get_config_value('bday_require') !== false) - { - define('MOD_BIRTHDAY_TERRA', true); - } - - // Test to see if the attachment MOD is installed on the source forum - // If it is, we will convert this data as well - $src_db->sql_return_on_error(true); - - $sql = "SELECT config_value - FROM {$convert->src_table_prefix}attachments_config - WHERE config_name = 'upload_dir'"; - $result = $src_db->sql_query($sql); - - if ($result && $row = $src_db->sql_fetchrow($result)) - { - // Here the constant is defined - define('MOD_ATTACHMENT', true); - - // Here i add more tables to be checked in the old forum - $tables += array( - 'attachments', - 'attachments_desc', - 'extensions', - 'extension_groups' - ); - - $src_db->sql_freeresult($result); - } - else if ($result) - { - $src_db->sql_freeresult($result); - } - - - /** - * Tests for further MODs can be included here. - * Please use constants for this, prefixing them with MOD_ - */ - - $src_db->sql_return_on_error(false); - - // Now let us set a temporary config variable for user id incrementing - $sql = "SELECT user_id - FROM {$convert->src_table_prefix}users - WHERE user_id = 1"; - $result = $src_db->sql_query($sql); - $user_id = (int) $src_db->sql_fetchfield('user_id'); - $src_db->sql_freeresult($result); - - // If there is a user id 1, we need to increment user ids. :/ - if ($user_id === 1) - { - // Try to get the maximum user id possible... - $sql = "SELECT MAX(user_id) AS max_user_id - FROM {$convert->src_table_prefix}users"; - $result = $src_db->sql_query($sql); - $user_id = (int) $src_db->sql_fetchfield('max_user_id'); - $src_db->sql_freeresult($result); - - set_config('increment_user_id', ($user_id + 1), true); - } - else - { - set_config('increment_user_id', 0, true); - } - - // Overwrite maximum avatar width/height - @define('DEFAULT_AVATAR_X_CUSTOM', get_config_value('avatar_max_width')); - @define('DEFAULT_AVATAR_Y_CUSTOM', get_config_value('avatar_max_height')); - -/** -* Description on how to use the convertor framework. -* -* 'schema' Syntax Description -* -> 'target' => Target Table. If not specified the next table will be handled -* -> 'primary' => Primary Key. If this is specified then this table is processed in batches -* -> 'query_first' => array('target' or 'src', Query to execute before beginning the process -* (if more than one then specified as array)) -* -> 'function_first' => Function to execute before beginning the process (if more than one then specified as array) -* (This is mostly useful if variables need to be given to the converting process) -* -> 'test_file' => This is not used at the moment but should be filled with a file from the old installation -* -* // DB Functions -* 'distinct' => Add DISTINCT to the select query -* 'where' => Add WHERE to the select query -* 'group_by' => Add GROUP BY to the select query -* 'left_join' => Add LEFT JOIN to the select query (if more than one joins specified as array) -* 'having' => Add HAVING to the select query -* -* // DB INSERT array -* This one consist of three parameters -* First Parameter: -* The key need to be filled within the target table -* If this is empty, the target table gets not assigned the source value -* Second Parameter: -* Source value. If the first parameter is specified, it will be assigned this value. -* If the first parameter is empty, this only gets added to the select query -* Third Parameter: -* Custom Function. Function to execute while storing source value into target table. -* The functions return value get stored. -* The function parameter consist of the value of the second parameter. -* -* types: -* - empty string == execute nothing -* - string == function to execute -* - array == complex execution instructions -* -* Complex execution instructions: -* @todo test complex execution instructions - in theory they will work fine -* -* By defining an array as the third parameter you are able to define some statements to be executed. The key -* is defining what to execute, numbers can be appended... -* -* 'function' => execute function -* 'execute' => run code, whereby all occurrences of {VALUE} get replaced by the last returned value. -* The result *must* be assigned/stored to {RESULT}. -* 'typecast' => typecast value -* -* The returned variables will be made always available to the next function to continue to work with. -* -* example (variable inputted is an integer of 1): -* -* array( -* 'function1' => 'increment_by_one', // returned variable is 2 -* 'typecast' => 'string', // typecast variable to be a string -* 'execute' => '{RESULT} = {VALUE} . ' is good';', // returned variable is '2 is good' -* 'function2' => 'replace_good_with_bad', // returned variable is '2 is bad' -* ), -* -*/ - - $convertor = array( - 'test_file' => 'viewtopic.php', - - 'avatar_path' => get_config_value('avatar_path') . '/', - 'avatar_gallery_path' => get_config_value('avatar_gallery_path') . '/', - 'smilies_path' => get_config_value('smilies_path') . '/', - 'upload_path' => (defined('MOD_ATTACHMENT')) ? phpbb_get_files_dir() . '/' : '', - 'thumbnails' => (defined('MOD_ATTACHMENT')) ? array('thumbs/', 't_') : '', - 'ranks_path' => false, // phpBB 2.0.x had no config value for a ranks path - - // We empty some tables to have clean data available - 'query_first' => array( - array('target', $convert->truncate_statement . SEARCH_RESULTS_TABLE), - array('target', $convert->truncate_statement . SEARCH_WORDLIST_TABLE), - array('target', $convert->truncate_statement . SEARCH_WORDMATCH_TABLE), - array('target', $convert->truncate_statement . LOG_TABLE), - ), - -// with this you are able to import all attachment files on the fly. For large boards this is not an option, therefore commented out by default. -// Instead every file gets copied while processing the corresponding attachment entry. -// if (defined("MOD_ATTACHMENT")) { import_attachment_files(); phpbb_copy_thumbnails(); } - - // phpBB2 allowed some similar usernames to coexist which would have the same - // username_clean in phpBB3 which is not possible, so we'll give the admin a list - // of user ids and usernames and let him deicde what he wants to do with them - 'execute_first' => ' - phpbb_check_username_collisions(); - import_avatar_gallery(); - if (defined("MOD_ATTACHMENT")) phpbb_import_attach_config(); - phpbb_insert_forums(); - ', - - 'execute_last' => array(' - add_bots(); - ', ' - update_folder_pm_count(); - ', ' - update_unread_count(); - ', ' - phpbb_convert_authentication(\'start\'); - ', ' - phpbb_convert_authentication(\'first\'); - ', ' - phpbb_convert_authentication(\'second\'); - ', ' - phpbb_convert_authentication(\'third\'); - '), - - 'schema' => array( - - array( - 'target' => (defined('MOD_ATTACHMENT')) ? ATTACHMENTS_TABLE : '', - 'primary' => 'attachments.attach_id', - 'query_first' => (defined('MOD_ATTACHMENT')) ? array('target', $convert->truncate_statement . ATTACHMENTS_TABLE) : '', - 'autoincrement' => 'attach_id', - - array('attach_id', 'attachments.attach_id', ''), - array('post_msg_id', 'attachments.post_id', ''), - array('topic_id', 'posts.topic_id', ''), - array('in_message', 0, ''), - array('is_orphan', 0, ''), - array('poster_id', 'attachments.user_id_1 AS poster_id', 'phpbb_user_id'), - array('physical_filename', 'attachments_desc.physical_filename', 'import_attachment'), - array('real_filename', 'attachments_desc.real_filename', 'phpbb_set_encoding'), - array('download_count', 'attachments_desc.download_count', ''), - array('attach_comment', 'attachments_desc.comment', array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')), - array('extension', 'attachments_desc.extension', ''), - array('mimetype', 'attachments_desc.mimetype', ''), - array('filesize', 'attachments_desc.filesize', ''), - array('filetime', 'attachments_desc.filetime', ''), - array('thumbnail', 'attachments_desc.thumbnail', ''), - - 'where' => 'attachments_desc.attach_id = attachments.attach_id AND attachments.privmsgs_id = 0 AND posts.post_id = attachments.post_id', - 'group_by' => 'attachments.attach_id' - ), - - array( - 'target' => (defined('MOD_ATTACHMENT')) ? ATTACHMENTS_TABLE : '', - 'primary' => 'attachments.attach_id', - 'autoincrement' => 'attach_id', - - array('attach_id', 'attachments.attach_id', ''), - array('post_msg_id', 'attachments.privmsgs_id', ''), - array('topic_id', 0, ''), - array('in_message', 1, ''), - array('is_orphan', 0, ''), - array('poster_id', 'attachments.user_id_1 AS poster_id', 'phpbb_user_id'), - array('physical_filename', 'attachments_desc.physical_filename', 'import_attachment'), - array('real_filename', 'attachments_desc.real_filename', ''), - array('download_count', 'attachments_desc.download_count', ''), - array('attach_comment', 'attachments_desc.comment', array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')), - array('extension', 'attachments_desc.extension', ''), - array('mimetype', 'attachments_desc.mimetype', ''), - array('filesize', 'attachments_desc.filesize', ''), - array('filetime', 'attachments_desc.filetime', ''), - array('thumbnail', 'attachments_desc.thumbnail', ''), - - 'where' => 'attachments_desc.attach_id = attachments.attach_id AND attachments.post_id = 0', - 'group_by' => 'attachments.attach_id' - ), - - array( - 'target' => (defined('MOD_ATTACHMENT')) ? EXTENSIONS_TABLE : '', - 'query_first' => (defined('MOD_ATTACHMENT')) ? array('target', $convert->truncate_statement . EXTENSIONS_TABLE) : '', - 'autoincrement' => 'extension_id', - - array('extension_id', 'extensions.ext_id', ''), - array('group_id', 'extensions.group_id', ''), - array('extension', 'extensions.extension', ''), - ), - - array( - 'target' => (defined('MOD_ATTACHMENT')) ? EXTENSION_GROUPS_TABLE : '', - 'query_first' => (defined('MOD_ATTACHMENT')) ? array('target', $convert->truncate_statement . EXTENSION_GROUPS_TABLE) : '', - 'autoincrement' => 'group_id', - - array('group_id', 'extension_groups.group_id', ''), - array('group_name', 'extension_groups.group_name', array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')), - array('cat_id', 'extension_groups.cat_id', 'phpbb_attachment_category'), - array('allow_group', 'extension_groups.allow_group', ''), - array('download_mode', 1, ''), - array('upload_icon', '', ''), - array('max_filesize', 'extension_groups.max_filesize', ''), - array('allowed_forums', 'extension_groups.forum_permissions', 'phpbb_attachment_forum_perms'), - array('allow_in_pm', 1, ''), - ), - - array( - 'target' => BANLIST_TABLE, - 'query_first' => array('target', $convert->truncate_statement . BANLIST_TABLE), - - array('ban_ip', 'banlist.ban_ip', 'decode_ban_ip'), - array('ban_userid', 'banlist.ban_userid', 'phpbb_user_id'), - array('ban_email', 'banlist.ban_email', ''), - array('ban_reason', '', ''), - array('ban_give_reason', '', ''), - - 'where' => "banlist.ban_ip NOT LIKE '%.%'", - ), - - array( - 'target' => BANLIST_TABLE, - - array('ban_ip', 'banlist.ban_ip', ''), - array('ban_userid', 0, ''), - array('ban_email', '', ''), - array('ban_reason', '', ''), - array('ban_give_reason', '', ''), - - 'where' => "banlist.ban_ip LIKE '%.%'", - ), - - array( - 'target' => DISALLOW_TABLE, - 'query_first' => array('target', $convert->truncate_statement . DISALLOW_TABLE), - - array('disallow_username', 'disallow.disallow_username', 'phpbb_disallowed_username'), - ), - - array( - 'target' => RANKS_TABLE, - 'query_first' => array('target', $convert->truncate_statement . RANKS_TABLE), - 'autoincrement' => 'rank_id', - - array('rank_id', 'ranks.rank_id', ''), - array('rank_title', 'ranks.rank_title', array('function1' => 'phpbb_set_default_encoding', 'function2' => 'utf8_htmlspecialchars')), - array('rank_min', 'ranks.rank_min', array('typecast' => 'int', 'execute' => '{RESULT} = ({VALUE}[0] < 0) ? 0 : {VALUE}[0];')), - array('rank_special', 'ranks.rank_special', ''), - array('rank_image', 'ranks.rank_image', 'import_rank'), - ), - - array( - 'target' => TOPICS_TABLE, - 'query_first' => array('target', $convert->truncate_statement . TOPICS_TABLE), - 'primary' => 'topics.topic_id', - 'autoincrement' => 'topic_id', - - array('topic_id', 'topics.topic_id', ''), - array('forum_id', 'topics.forum_id', ''), - array('icon_id', 0, ''), - array('topic_poster', 'topics.topic_poster AS poster_id', 'phpbb_user_id'), - array('topic_attachment', ((defined('MOD_ATTACHMENT')) ? 'topics.topic_attachment' : 0), ''), - array('topic_title', 'topics.topic_title', 'phpbb_set_encoding'), - array('topic_time', 'topics.topic_time', ''), - array('topic_views', 'topics.topic_views', ''), - array('topic_replies', 'topics.topic_replies', ''), - array('topic_replies_real', 'topics.topic_replies', ''), - array('topic_last_post_id', 'topics.topic_last_post_id', ''), - array('topic_status', 'topics.topic_status', 'is_topic_locked'), - array('topic_moved_id', 0, ''), - array('topic_type', 'topics.topic_type', 'phpbb_convert_topic_type'), - array('topic_first_post_id', 'topics.topic_first_post_id', ''), - - array('poll_title', 'vote_desc.vote_text', array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'utf8_htmlspecialchars')), - array('poll_start', 'vote_desc.vote_start', 'null_to_zero'), - array('poll_length', 'vote_desc.vote_length', 'null_to_zero'), - array('poll_max_options', 1, ''), - array('poll_vote_change', 0, ''), - - 'left_join' => 'topics LEFT JOIN vote_desc ON topics.topic_id = vote_desc.topic_id AND topics.topic_vote = 1', - 'where' => 'topics.topic_moved_id = 0', - ), - - array( - 'target' => TOPICS_TABLE, - 'primary' => 'topics.topic_id', - 'autoincrement' => 'topic_id', - - array('topic_id', 'topics.topic_id', ''), - array('forum_id', 'topics.forum_id', ''), - array('icon_id', 0, ''), - array('topic_poster', 'topics.topic_poster AS poster_id', 'phpbb_user_id'), - array('topic_attachment', ((defined('MOD_ATTACHMENT')) ? 'topics.topic_attachment' : 0), ''), - array('topic_title', 'topics.topic_title', 'phpbb_set_encoding'), - array('topic_time', 'topics.topic_time', ''), - array('topic_views', 'topics.topic_views', ''), - array('topic_replies', 'topics.topic_replies', ''), - array('topic_replies_real', 'topics.topic_replies', ''), - array('topic_last_post_id', 'topics.topic_last_post_id', ''), - array('topic_status', ITEM_MOVED, ''), - array('topic_moved_id', 'topics.topic_moved_id', ''), - array('topic_type', 'topics.topic_type', 'phpbb_convert_topic_type'), - array('topic_first_post_id', 'topics.topic_first_post_id', ''), - - array('poll_title', 'vote_desc.vote_text', array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'utf8_htmlspecialchars')), - array('poll_start', 'vote_desc.vote_start', 'null_to_zero'), - array('poll_length', 'vote_desc.vote_length', 'null_to_zero'), - array('poll_max_options', 1, ''), - array('poll_vote_change', 0, ''), - - 'left_join' => 'topics LEFT JOIN vote_desc ON topics.topic_id = vote_desc.topic_id AND topics.topic_vote = 1', - 'where' => 'topics.topic_moved_id <> 0', - ), - - array( - 'target' => TOPICS_WATCH_TABLE, - 'primary' => 'topics_watch.topic_id', - 'query_first' => array('target', $convert->truncate_statement . TOPICS_WATCH_TABLE), - - array('topic_id', 'topics_watch.topic_id', ''), - array('user_id', 'topics_watch.user_id', 'phpbb_user_id'), - array('notify_status', 'topics_watch.notify_status', ''), - ), - - array( - 'target' => SMILIES_TABLE, - 'query_first' => array('target', $convert->truncate_statement . SMILIES_TABLE), - 'autoincrement' => 'smiley_id', - - array('smiley_id', 'smilies.smilies_id', ''), - array('code', 'smilies.code', array('function1' => 'phpbb_smilie_html_decode', 'function2' => 'phpbb_set_encoding', 'function3' => 'utf8_htmlspecialchars')), - array('emotion', 'smilies.emoticon', 'phpbb_set_encoding'), - array('smiley_url', 'smilies.smile_url', 'import_smiley'), - array('smiley_width', 'smilies.smile_url', 'get_smiley_width'), - array('smiley_height', 'smilies.smile_url', 'get_smiley_height'), - array('smiley_order', 'smilies.smilies_id', ''), - array('display_on_posting', 'smilies.smilies_id', 'get_smiley_display'), - - 'order_by' => 'smilies.smilies_id ASC', - ), - - array( - 'target' => POLL_OPTIONS_TABLE, - 'primary' => 'vote_results.vote_option_id', - 'query_first' => array('target', $convert->truncate_statement . POLL_OPTIONS_TABLE), - - array('poll_option_id', 'vote_results.vote_option_id', ''), - array('topic_id', 'vote_desc.topic_id', ''), - array('', 'topics.topic_poster AS poster_id', 'phpbb_user_id'), - array('poll_option_text', 'vote_results.vote_option_text', array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')), - array('poll_option_total', 'vote_results.vote_result', ''), - - 'where' => 'vote_results.vote_id = vote_desc.vote_id', - 'left_join' => 'vote_desc LEFT JOIN topics ON topics.topic_id = vote_desc.topic_id', - ), - - array( - 'target' => POLL_VOTES_TABLE, - 'primary' => 'vote_desc.topic_id', - 'query_first' => array('target', $convert->truncate_statement . POLL_VOTES_TABLE), - - array('poll_option_id', VOTE_CONVERTED, ''), - array('topic_id', 'vote_desc.topic_id', ''), - array('vote_user_id', 'vote_voters.vote_user_id', 'phpbb_user_id'), - array('vote_user_ip', 'vote_voters.vote_user_ip', 'decode_ip'), - - 'where' => 'vote_voters.vote_id = vote_desc.vote_id', - ), - - array( - 'target' => WORDS_TABLE, - 'primary' => 'words.word_id', - 'query_first' => array('target', $convert->truncate_statement . WORDS_TABLE), - 'autoincrement' => 'word_id', - - array('word_id', 'words.word_id', ''), - array('word', 'words.word', 'phpbb_set_encoding'), - array('replacement', 'words.replacement', 'phpbb_set_encoding'), - ), - - array( - 'target' => POSTS_TABLE, - 'primary' => 'posts.post_id', - 'autoincrement' => 'post_id', - 'query_first' => array('target', $convert->truncate_statement . POSTS_TABLE), - 'execute_first' => ' - $config["max_post_chars"] = 0; - $config["max_quote_depth"] = 0; - ', - - array('post_id', 'posts.post_id', ''), - array('topic_id', 'posts.topic_id', ''), - array('forum_id', 'posts.forum_id', ''), - array('poster_id', 'posts.poster_id', 'phpbb_user_id'), - array('icon_id', 0, ''), - array('poster_ip', 'posts.poster_ip', 'decode_ip'), - array('post_time', 'posts.post_time', ''), - array('enable_bbcode', 'posts.enable_bbcode', ''), - array('', 'posts.enable_html', ''), - array('enable_smilies', 'posts.enable_smilies', ''), - array('enable_sig', 'posts.enable_sig', ''), - array('enable_magic_url', 1, ''), - array('post_username', 'posts.post_username', 'phpbb_set_encoding'), - array('post_subject', 'posts_text.post_subject', 'phpbb_set_encoding'), - array('post_attachment', ((defined('MOD_ATTACHMENT')) ? 'posts.post_attachment' : 0), ''), - array('post_edit_time', 'posts.post_edit_time', array('typecast' => 'int')), - array('post_edit_count', 'posts.post_edit_count', ''), - array('post_edit_reason', '', ''), - array('post_edit_user', '', 'phpbb_post_edit_user'), - - array('bbcode_uid', 'posts.post_time', 'make_uid'), - array('post_text', 'posts_text.post_text', 'phpbb_prepare_message'), - array('', 'posts_text.bbcode_uid AS old_bbcode_uid', ''), - array('bbcode_bitfield', '', 'get_bbcode_bitfield'), - array('post_checksum', '', ''), - - // Commented out inline search indexing, this takes up a LOT of time. :D - // @todo We either need to enable this or call the rebuild search functionality post convert -/* array('', '', 'search_indexing'), - array('', 'posts_text.post_text AS message', ''), - array('', 'posts_text.post_subject AS title', ''),*/ - - 'where' => 'posts.post_id = posts_text.post_id' - ), - - array( - 'target' => PRIVMSGS_TABLE, - 'primary' => 'privmsgs.privmsgs_id', - 'autoincrement' => 'msg_id', - 'query_first' => array( - array('target', $convert->truncate_statement . PRIVMSGS_TABLE), - array('target', $convert->truncate_statement . PRIVMSGS_RULES_TABLE), - ), - - 'execute_first' => ' - $config["max_post_chars"] = 0; - $config["max_quote_depth"] = 0; - ', - - array('msg_id', 'privmsgs.privmsgs_id', ''), - array('root_level', 0, ''), - array('author_id', 'privmsgs.privmsgs_from_userid AS poster_id', 'phpbb_user_id'), - array('icon_id', 0, ''), - array('author_ip', 'privmsgs.privmsgs_ip', 'decode_ip'), - array('message_time', 'privmsgs.privmsgs_date', ''), - array('enable_bbcode', 'privmsgs.privmsgs_enable_bbcode AS enable_bbcode', ''), - array('', 'privmsgs.privmsgs_enable_html AS enable_html', ''), - array('enable_smilies', 'privmsgs.privmsgs_enable_smilies AS enable_smilies', ''), - array('enable_magic_url', 1, ''), - array('enable_sig', 'privmsgs.privmsgs_attach_sig', ''), - array('message_subject', 'privmsgs.privmsgs_subject', 'phpbb_set_encoding'), // Already specialchared in 2.0.x - array('message_attachment', ((defined('MOD_ATTACHMENT')) ? 'privmsgs.privmsgs_attachment' : 0), ''), - array('message_edit_reason', '', ''), - array('message_edit_user', 0, ''), - array('message_edit_time', 0, ''), - array('message_edit_count', 0, ''), - - array('bbcode_uid', 'privmsgs.privmsgs_date AS post_time', 'make_uid'), - array('message_text', 'privmsgs_text.privmsgs_text', 'phpbb_prepare_message'), - array('', 'privmsgs_text.privmsgs_bbcode_uid AS old_bbcode_uid', ''), - array('bbcode_bitfield', '', 'get_bbcode_bitfield'), - array('to_address', 'privmsgs.privmsgs_to_userid', 'phpbb_privmsgs_to_userid'), - array('bcc_address', '', ''), - - 'where' => 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id' - ), - - array( - 'target' => PRIVMSGS_FOLDER_TABLE, - 'primary' => 'users.user_id', - 'query_first' => array('target', $convert->truncate_statement . PRIVMSGS_FOLDER_TABLE), - - array('user_id', 'users.user_id', 'phpbb_user_id'), - array('folder_name', $user->lang['CONV_SAVED_MESSAGES'], ''), - array('pm_count', 0, ''), - - 'where' => 'users.user_id <> -1', - ), - - // Inbox - array( - 'target' => PRIVMSGS_TO_TABLE, - 'primary' => 'privmsgs.privmsgs_id', - 'query_first' => array('target', $convert->truncate_statement . PRIVMSGS_TO_TABLE), - - array('msg_id', 'privmsgs.privmsgs_id', ''), - array('user_id', 'privmsgs.privmsgs_to_userid', 'phpbb_user_id'), - array('author_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'), - array('pm_deleted', 0, ''), - array('pm_new', 'privmsgs.privmsgs_type', 'phpbb_new_pm'), - array('pm_unread', 'privmsgs.privmsgs_type', 'phpbb_unread_pm'), - array('pm_replied', 0, ''), - array('pm_marked', 0, ''), - array('pm_forwarded', 0, ''), - array('folder_id', PRIVMSGS_INBOX, ''), - - 'where' => 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id - AND (privmsgs.privmsgs_type = 0 OR privmsgs.privmsgs_type = 1 OR privmsgs.privmsgs_type = 5)', - ), - - // Outbox - array( - 'target' => PRIVMSGS_TO_TABLE, - 'primary' => 'privmsgs.privmsgs_id', - - array('msg_id', 'privmsgs.privmsgs_id', ''), - array('user_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'), - array('author_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'), - array('pm_deleted', 0, ''), - array('pm_new', 0, ''), - array('pm_unread', 0, ''), - array('pm_replied', 0, ''), - array('pm_marked', 0, ''), - array('pm_forwarded', 0, ''), - array('folder_id', PRIVMSGS_OUTBOX, ''), - - 'where' => 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id - AND (privmsgs.privmsgs_type = 1 OR privmsgs.privmsgs_type = 5)', - ), - - // Sentbox - array( - 'target' => PRIVMSGS_TO_TABLE, - 'primary' => 'privmsgs.privmsgs_id', - - array('msg_id', 'privmsgs.privmsgs_id', ''), - array('user_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'), - array('author_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'), - array('pm_deleted', 0, ''), - array('pm_new', 'privmsgs.privmsgs_type', 'phpbb_new_pm'), - array('pm_unread', 'privmsgs.privmsgs_type', 'phpbb_unread_pm'), - array('pm_replied', 0, ''), - array('pm_marked', 0, ''), - array('pm_forwarded', 0, ''), - array('folder_id', PRIVMSGS_SENTBOX, ''), - - 'where' => 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id - AND privmsgs.privmsgs_type = 2', - ), - - // Savebox (SAVED IN) - array( - 'target' => PRIVMSGS_TO_TABLE, - 'primary' => 'privmsgs.privmsgs_id', - - array('msg_id', 'privmsgs.privmsgs_id', ''), - array('user_id', 'privmsgs.privmsgs_to_userid', 'phpbb_user_id'), - array('author_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'), - array('pm_deleted', 0, ''), - array('pm_new', 'privmsgs.privmsgs_type', 'phpbb_new_pm'), - array('pm_unread', 'privmsgs.privmsgs_type', 'phpbb_unread_pm'), - array('pm_replied', 0, ''), - array('pm_marked', 0, ''), - array('pm_forwarded', 0, ''), - array('folder_id', 'privmsgs.privmsgs_to_userid', 'phpbb_get_savebox_id'), - - 'where' => 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id - AND privmsgs.privmsgs_type = 3', - ), - - // Savebox (SAVED OUT) - array( - 'target' => PRIVMSGS_TO_TABLE, - 'primary' => 'privmsgs.privmsgs_id', - - array('msg_id', 'privmsgs.privmsgs_id', ''), - array('user_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'), - array('author_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'), - array('pm_deleted', 0, ''), - array('pm_new', 'privmsgs.privmsgs_type', 'phpbb_new_pm'), - array('pm_unread', 'privmsgs.privmsgs_type', 'phpbb_unread_pm'), - array('pm_replied', 0, ''), - array('pm_marked', 0, ''), - array('pm_forwarded', 0, ''), - array('folder_id', 'privmsgs.privmsgs_from_userid', 'phpbb_get_savebox_id'), - - 'where' => 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id - AND privmsgs.privmsgs_type = 4', - ), - - array( - 'target' => GROUPS_TABLE, - 'autoincrement' => 'group_id', - 'query_first' => array('target', $convert->truncate_statement . GROUPS_TABLE), - - array('group_id', 'groups.group_id', ''), - array('group_type', 'groups.group_type', 'phpbb_convert_group_type'), - array('group_display', 0, ''), - array('group_legend', 0, ''), - array('group_name', 'groups.group_name', 'phpbb_convert_group_name'), // phpbb_set_encoding called in phpbb_convert_group_name - array('group_name_clean', 'groups.group_name', 'phpbb_convert_group_name_clean'), // phpbb_set_encoding called in phpbb_convert_group_name - array('group_desc', 'groups.group_description', 'phpbb_set_encoding'), - - 'where' => 'groups.group_single_user = 0', - ), - - array( - 'target' => USER_GROUP_TABLE, - 'query_first' => array('target', $convert->truncate_statement . USER_GROUP_TABLE), - 'execute_first' => ' - add_default_groups(); - ', - - array('group_id', 'groups.group_id', ''), - array('user_id', 'groups.group_moderator', 'phpbb_user_id'), - array('group_leader', 1, ''), - array('user_pending', 0, ''), - - 'where' => 'groups.group_single_user = 0 AND groups.group_moderator <> 0', - ), - - array( - 'target' => USER_GROUP_TABLE, - - array('group_id', 'user_group.group_id', ''), - array('user_id', 'user_group.user_id', 'phpbb_user_id'), - array('group_leader', 0, ''), - array('user_pending', 'user_group.user_pending', ''), - - 'where' => 'user_group.group_id = groups.group_id AND groups.group_single_user = 0 AND groups.group_moderator <> user_group.user_id', - ), - - array( - 'target' => USERS_TABLE, - 'primary' => 'users.user_id', - 'autoincrement' => 'user_id', - 'query_first' => array( - array('target', 'DELETE FROM ' . USERS_TABLE . ' WHERE user_id <> ' . ANONYMOUS), - array('target', $convert->truncate_statement . BOTS_TABLE) - ), - - 'execute_last' => ' - remove_invalid_users(); - ', - - array('user_id', 'users.user_id', 'phpbb_user_id'), - array('', 'users.user_id AS poster_id', 'phpbb_user_id'), - array('user_type', 'users.user_active', 'set_user_type'), - array('group_id', 'users.user_level', 'phpbb_set_primary_group'), - array('user_regdate', 'users.user_regdate', ''), - array('username', 'users.username', 'phpbb_set_default_encoding'), // recode to utf8 with default lang - array('username_clean', 'users.username', array('function1' => 'phpbb_set_default_encoding', 'function2' => 'utf8_clean_string')), - array('user_password', 'users.user_password', ''), - array('user_pass_convert', 1, ''), - array('user_posts', 'users.user_posts', 'intval'), - array('user_email', 'users.user_email', 'strtolower'), - array('user_email_hash', 'users.user_email', 'gen_email_hash'), - array('user_birthday', ((defined('MOD_BIRTHDAY')) ? 'users.user_birthday' : ''), 'phpbb_get_birthday'), - array('user_lastvisit', 'users.user_lastvisit', 'intval'), - array('user_lastmark', 'users.user_lastvisit', 'intval'), - array('user_lang', $config['default_lang'], ''), - array('', 'users.user_lang', ''), - array('user_timezone', 'users.user_timezone', 'floatval'), - array('user_dateformat', 'users.user_dateformat', array('function1' => 'phpbb_set_encoding', 'function2' => 'fill_dateformat')), - array('user_inactive_reason', '', 'phpbb_inactive_reason'), - array('user_inactive_time', '', 'phpbb_inactive_time'), - - array('user_interests', 'users.user_interests', array('function1' => 'phpbb_set_encoding')), - array('user_occ', 'users.user_occ', array('function1' => 'phpbb_set_encoding')), - array('user_website', 'users.user_website', 'validate_website'), - array('user_jabber', '', ''), - array('user_msnm', 'users.user_msnm', array('function1' => 'phpbb_set_encoding')), - array('user_yim', 'users.user_yim', array('function1' => 'phpbb_set_encoding')), - array('user_aim', 'users.user_aim', array('function1' => 'phpbb_set_encoding')), - array('user_icq', 'users.user_icq', array('function1' => 'phpbb_set_encoding')), - array('user_from', 'users.user_from', array('function1' => 'phpbb_set_encoding')), - array('user_rank', 'users.user_rank', 'intval'), - array('user_permissions', '', ''), - - array('user_avatar', 'users.user_avatar', 'phpbb_import_avatar'), - array('user_avatar_type', 'users.user_avatar_type', 'phpbb_avatar_type'), - array('user_avatar_width', 'users.user_avatar', 'phpbb_get_avatar_width'), - array('user_avatar_height', 'users.user_avatar', 'phpbb_get_avatar_height'), - - array('user_new_privmsg', 'users.user_new_privmsg', ''), - array('user_unread_privmsg', 0, ''), //'users.user_unread_privmsg' - array('user_last_privmsg', 'users.user_last_privmsg', 'intval'), - array('user_emailtime', 'users.user_emailtime', 'null_to_zero'), - array('user_notify', 'users.user_notify', 'intval'), - array('user_notify_pm', 'users.user_notify_pm', 'intval'), - array('user_notify_type', NOTIFY_EMAIL, ''), - array('user_allow_pm', 'users.user_allow_pm', 'intval'), - array('user_allow_viewonline', 'users.user_allow_viewonline', 'intval'), - array('user_allow_viewemail', 'users.user_viewemail', 'intval'), - array('user_actkey', 'users.user_actkey', ''), - array('user_newpasswd', '', ''), // Users need to re-request their password... - array('user_style', $config['default_style'], ''), - - array('user_options', '', 'set_user_options'), - array('', 'users.user_popup_pm AS popuppm', ''), - array('', 'users.user_allowhtml AS html', ''), - array('', 'users.user_allowbbcode AS bbcode', ''), - array('', 'users.user_allowsmile AS smile', ''), - array('', 'users.user_attachsig AS attachsig',''), - - array('user_sig_bbcode_uid', 'users.user_regdate', 'make_uid'), - array('user_sig', 'users.user_sig', 'phpbb_prepare_message'), - array('', 'users.user_sig_bbcode_uid AS old_bbcode_uid', ''), - array('user_sig_bbcode_bitfield', '', 'get_bbcode_bitfield'), - array('', 'users.user_regdate AS post_time', ''), - - 'where' => 'users.user_id <> -1', - ), - ), - ); -} - -?> \ No newline at end of file diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php deleted file mode 100644 index 061abba0a0..0000000000 --- a/phpBB/install/convertors/functions_phpbb20.php +++ /dev/null @@ -1,1866 +0,0 @@ -sql_query($convert->truncate_statement . FORUMS_TABLE); - - // Determine the highest id used within the old forums table (we add the categories after the forum ids) - $sql = 'SELECT MAX(forum_id) AS max_forum_id - FROM ' . $convert->src_table_prefix . 'forums'; - $result = $src_db->sql_query($sql); - $max_forum_id = (int) $src_db->sql_fetchfield('max_forum_id'); - $src_db->sql_freeresult($result); - - $max_forum_id++; - - // pruning disabled globally? - $sql = "SELECT config_value - FROM {$convert->src_table_prefix}config - WHERE config_name = 'prune_enable'"; - $result = $src_db->sql_query($sql); - $prune_enabled = (int) $src_db->sql_fetchfield('config_value'); - $src_db->sql_freeresult($result); - - - // Insert categories - $sql = 'SELECT cat_id, cat_title - FROM ' . $convert->src_table_prefix . 'categories - ORDER BY cat_order'; - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - - $result = $src_db->sql_query($sql); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - - if ($db->dbms_type == 'mssql') - { - $db->sql_query('SET IDENTITY_INSERT ' . FORUMS_TABLE . ' ON'); - } - - $cats_added = array(); - while ($row = $src_db->sql_fetchrow($result)) - { - $sql_ary = array( - 'forum_id' => (int) $max_forum_id, - 'forum_name' => ($row['cat_title']) ? htmlspecialchars(phpbb_set_default_encoding($row['cat_title']), ENT_COMPAT, 'UTF-8') : $user->lang['CATEGORY'], - 'parent_id' => 0, - 'forum_parents' => '', - 'forum_desc' => '', - 'forum_type' => FORUM_CAT, - 'forum_status' => ITEM_UNLOCKED, - 'forum_rules' => '', - ); - - $sql = 'SELECT MAX(right_id) AS right_id - FROM ' . FORUMS_TABLE; - $_result = $db->sql_query($sql); - $cat_row = $db->sql_fetchrow($_result); - $db->sql_freeresult($_result); - - $sql_ary['left_id'] = (int) ($cat_row['right_id'] + 1); - $sql_ary['right_id'] = (int) ($cat_row['right_id'] + 2); - - $sql = 'INSERT INTO ' . FORUMS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - $db->sql_query($sql); - - $cats_added[$row['cat_id']] = $max_forum_id; - $max_forum_id++; - } - $src_db->sql_freeresult($result); - - // There may be installations having forums with non-existant category ids. - // We try to catch them and add them to an "unknown" category instead of leaving them out. - $sql = 'SELECT cat_id - FROM ' . $convert->src_table_prefix . 'forums - GROUP BY cat_id'; - $result = $src_db->sql_query($sql); - - $unknown_cat_id = false; - while ($row = $src_db->sql_fetchrow($result)) - { - // Catch those categories not been added before - if (!isset($cats_added[$row['cat_id']])) - { - $unknown_cat_id = true; - } - } - $src_db->sql_freeresult($result); - - // Is there at least one category not known? - if ($unknown_cat_id === true) - { - $unknown_cat_id = 'ghost'; - - $sql_ary = array( - 'forum_id' => (int) $max_forum_id, - 'forum_name' => (string) $user->lang['CATEGORY'], - 'parent_id' => 0, - 'forum_parents' => '', - 'forum_desc' => '', - 'forum_type' => FORUM_CAT, - 'forum_status' => ITEM_UNLOCKED, - 'forum_rules' => '', - ); - - $sql = 'SELECT MAX(right_id) AS right_id - FROM ' . FORUMS_TABLE; - $_result = $db->sql_query($sql); - $cat_row = $db->sql_fetchrow($_result); - $db->sql_freeresult($_result); - - $sql_ary['left_id'] = (int) ($cat_row['right_id'] + 1); - $sql_ary['right_id'] = (int) ($cat_row['right_id'] + 2); - - $sql = 'INSERT INTO ' . FORUMS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - $db->sql_query($sql); - - $cats_added[$unknown_cat_id] = $max_forum_id; - $max_forum_id++; - } - - // Now insert the forums - $sql = 'SELECT f.forum_id, f.forum_name, f.cat_id, f.forum_desc, f.forum_status, f.prune_enable, f.prune_next, fp.prune_days, fp.prune_freq FROM ' . $convert->src_table_prefix . 'forums f - LEFT JOIN ' . $convert->src_table_prefix . 'forum_prune fp ON f.forum_id = fp.forum_id - GROUP BY f.forum_id, f.forum_name, f.cat_id, f.forum_desc, f.forum_status, f.prune_enable, f.prune_next, f.forum_order, fp.prune_days, fp.prune_freq - ORDER BY f.cat_id, f.forum_order'; - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - - $result = $src_db->sql_query($sql); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - - while ($row = $src_db->sql_fetchrow($result)) - { - // Some might have forums here with an id not being "possible"... - // To be somewhat friendly we "change" the category id for those to a previously created ghost category - if (!isset($cats_added[$row['cat_id']]) && $unknown_cat_id !== false) - { - $row['cat_id'] = $unknown_cat_id; - } - - if (!isset($cats_added[$row['cat_id']])) - { - continue; - } - - // Define the new forums sql ary - $sql_ary = array( - 'forum_id' => (int) $row['forum_id'], - 'forum_name' => htmlspecialchars(phpbb_set_default_encoding($row['forum_name']), ENT_COMPAT, 'UTF-8'), - 'parent_id' => (int) $cats_added[$row['cat_id']], - 'forum_parents' => '', - 'forum_desc' => htmlspecialchars(phpbb_set_default_encoding($row['forum_desc']), ENT_COMPAT, 'UTF-8'), - 'forum_type' => FORUM_POST, - 'forum_status' => is_item_locked($row['forum_status']), - 'enable_prune' => ($prune_enabled) ? (int)$row['prune_enable'] : 0, - 'prune_next' => (int) null_to_zero($row['prune_next']), - 'prune_days' => (int) null_to_zero($row['prune_days']), - 'prune_viewed' => 0, - 'prune_freq' => (int) null_to_zero($row['prune_freq']), - - 'forum_flags' => phpbb_forum_flags(), - - // Default values - 'forum_desc_bitfield' => '', - 'forum_desc_options' => 7, - 'forum_desc_uid' => '', - 'forum_link' => '', - 'forum_password' => '', - 'forum_style' => 0, - 'forum_image' => '', - 'forum_rules' => '', - 'forum_rules_link' => '', - 'forum_rules_bitfield' => '', - 'forum_rules_options' => 7, - 'forum_rules_uid' => '', - 'forum_topics_per_page' => 0, - 'forum_posts' => 0, - 'forum_topics' => 0, - 'forum_topics_real' => 0, - 'forum_last_post_id' => 0, - 'forum_last_poster_id' => 0, - 'forum_last_post_subject' => '', - 'forum_last_post_time' => 0, - 'forum_last_poster_name' => '', - 'forum_last_poster_colour' => '', - 'display_on_index' => 1, - 'enable_indexing' => 1, - 'enable_icons' => 0, - ); - - // Now add the forums with proper left/right ids - $sql = 'SELECT left_id, right_id - FROM ' . FORUMS_TABLE . ' - WHERE forum_id = ' . $cats_added[$row['cat_id']]; - $_result = $db->sql_query($sql); - $cat_row = $db->sql_fetchrow($_result); - $db->sql_freeresult($_result); - - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET left_id = left_id + 2, right_id = right_id + 2 - WHERE left_id > ' . $cat_row['right_id']; - $db->sql_query($sql); - - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET right_id = right_id + 2 - WHERE ' . $cat_row['left_id'] . ' BETWEEN left_id AND right_id'; - $db->sql_query($sql); - - $sql_ary['left_id'] = (int) $cat_row['right_id']; - $sql_ary['right_id'] = (int) ($cat_row['right_id'] + 1); - - $sql = 'INSERT INTO ' . FORUMS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - $db->sql_query($sql); - } - $src_db->sql_freeresult($result); - - switch ($db->dbms_type) - { - case 'postgres': - $db->sql_query("SELECT SETVAL('" . FORUMS_TABLE . "_seq',(select case when max(forum_id)>0 then max(forum_id)+1 else 1 end from " . FORUMS_TABLE . '));'); - break; - - case 'mssql': - $db->sql_query('SET IDENTITY_INSERT ' . FORUMS_TABLE . ' OFF'); - break; - - case 'oracle': - $result = $db->sql_query('SELECT MAX(forum_id) as max_id FROM ' . FORUMS_TABLE); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $largest_id = (int) $row['max_id']; - - if ($largest_id) - { - $db->sql_query('DROP SEQUENCE ' . FORUMS_TABLE . '_seq'); - $db->sql_query('CREATE SEQUENCE ' . FORUMS_TABLE . '_seq START WITH ' . ($largest_id + 1)); - } - break; - } -} - -/** -* Function for recoding text with the default language -* -* @param string $text text to recode to utf8 -* @param bool $grab_user_lang if set to true the function tries to use $convert_row['user_lang'] (and falls back to $convert_row['poster_id']) instead of the boards default language -*/ -function phpbb_set_encoding($text, $grab_user_lang = true) -{ - global $lang_enc_array, $convert_row; - global $convert, $phpEx; - - /*static $lang_enc_array = array( - 'korean' => 'euc-kr', - 'serbian' => 'windows-1250', - 'polish' => 'iso-8859-2', - 'kurdish' => 'windows-1254', - 'slovak' => 'Windows-1250', - 'russian' => 'windows-1251', - 'estonian' => 'iso-8859-4', - 'chinese_simplified' => 'gb2312', - 'macedonian' => 'windows-1251', - 'azerbaijani' => 'UTF-8', - 'romanian' => 'iso-8859-2', - 'romanian_diacritice' => 'iso-8859-2', - 'lithuanian' => 'windows-1257', - 'turkish' => 'iso-8859-9', - 'ukrainian' => 'windows-1251', - 'japanese' => 'shift_jis', - 'hungarian' => 'ISO-8859-2', - 'romanian_no_diacritics' => 'iso-8859-2', - 'mongolian' => 'UTF-8', - 'slovenian' => 'windows-1250', - 'bosnian' => 'windows-1250', - 'czech' => 'Windows-1250', - 'farsi' => 'Windows-1256', - 'croatian' => 'windows-1250', - 'greek' => 'iso-8859-7', - 'russian_tu' => 'windows-1251', - 'sakha' => 'UTF-8', - 'serbian_cyrillic' => 'windows-1251', - 'bulgarian' => 'windows-1251', - 'chinese_traditional_taiwan' => 'big5', - 'chinese_traditional' => 'big5', - 'arabic' => 'windows-1256', - 'hebrew' => 'WINDOWS-1255', - 'thai' => 'windows-874', - //'chinese_traditional_taiwan' => 'utf-8' // custom modified, we may have to do an include :-( - );*/ - - if (empty($lang_enc_array)) - { - $lang_enc_array = array(); - } - - $get_lang = trim(get_config_value('default_lang')); - - // Do we need the users language encoding? - if ($grab_user_lang && !empty($convert_row)) - { - if (!empty($convert_row['user_lang'])) - { - $get_lang = trim($convert_row['user_lang']); - } - else if (!empty($convert_row['poster_id'])) - { - global $src_db, $same_db; - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - - $sql = 'SELECT user_lang - FROM ' . $convert->src_table_prefix . 'users - WHERE user_id = ' . (int) $convert_row['poster_id']; - $result = $src_db->sql_query($sql); - $get_lang = (string) $src_db->sql_fetchfield('user_lang'); - $src_db->sql_freeresult($result); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - - $get_lang = (!trim($get_lang)) ? trim(get_config_value('default_lang')) : trim($get_lang); - } - } - - if (!isset($lang_enc_array[$get_lang])) - { - $filename = $convert->options['forum_path'] . '/language/lang_' . $get_lang . '/lang_main.' . $phpEx; - - if (!file_exists($filename)) - { - $get_lang = trim(get_config_value('default_lang')); - } - - if (!isset($lang_enc_array[$get_lang])) - { - include($convert->options['forum_path'] . '/language/lang_' . $get_lang . '/lang_main.' . $phpEx); - $lang_enc_array[$get_lang] = $lang['ENCODING']; - unset($lang); - } - } - - $encoding = $lang_enc_array[$get_lang]; - - return utf8_recode($text, $lang_enc_array[$get_lang]); -} - -/** -* Same as phpbb_set_encoding, but forcing boards default language -*/ -function phpbb_set_default_encoding($text) -{ - return phpbb_set_encoding($text, false); -} - -/** -* Convert Birthday from Birthday MOD to phpBB Format -*/ -function phpbb_get_birthday($birthday = '') -{ - if (defined('MOD_BIRTHDAY_TERRA')) - { - $birthday = (string) $birthday; - - // stored as month, day, year - if (!$birthday) - { - return ' 0- 0- 0'; - } - - // We use the original mod code to retrieve the birthday (not ideal) - preg_match('/(..)(..)(....)/', sprintf('%08d', $birthday), $birthday_parts); - - $month = $birthday_parts[1]; - $day = $birthday_parts[2]; - $year = $birthday_parts[3]; - - return sprintf('%2d-%2d-%4d', $day, $month, $year); - } - else - { - $birthday = (int) $birthday; - - if (!$birthday || $birthday == 999999 || $birthday < 0) - { - return ' 0- 0- 0'; - } - - // The birthday mod from niels is using this code to transform to day/month/year - return gmdate('d-m-Y', $birthday * 86400 + 1); - } -} - -/** -* Return correct user id value -* Everyone's id will be one higher to allow the guest/anonymous user to have a positive id as well -*/ -function phpbb_user_id($user_id) -{ - global $config; - - // Increment user id if the old forum is having a user with the id 1 - if (!isset($config['increment_user_id'])) - { - global $src_db, $same_db, $convert; - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - - // Now let us set a temporary config variable for user id incrementing - $sql = "SELECT user_id - FROM {$convert->src_table_prefix}users - WHERE user_id = 1"; - $result = $src_db->sql_query($sql); - $id = (int) $src_db->sql_fetchfield('user_id'); - $src_db->sql_freeresult($result); - - // Try to get the maximum user id possible... - $sql = "SELECT MAX(user_id) AS max_user_id - FROM {$convert->src_table_prefix}users"; - $result = $src_db->sql_query($sql); - $max_id = (int) $src_db->sql_fetchfield('max_user_id'); - $src_db->sql_freeresult($result); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - - // If there is a user id 1, we need to increment user ids. :/ - if ($id === 1) - { - set_config('increment_user_id', ($max_id + 1), true); - $config['increment_user_id'] = $max_id + 1; - } - else - { - set_config('increment_user_id', 0, true); - $config['increment_user_id'] = 0; - } - } - - // If the old user id is -1 in 2.0.x it is the anonymous user... - if ($user_id == -1) - { - return ANONYMOUS; - } - - if (!empty($config['increment_user_id']) && $user_id == 1) - { - return $config['increment_user_id']; - } - - // A user id of 0 can happen, for example within the ban table if no user is banned... - // Within the posts and topics table this can be "dangerous" but is the fault of the user - // having mods installed (a poster id of 0 is not possible in 2.0.x). - // Therefore, we return the user id "as is". - - return (int) $user_id; -} - -/* Copy additional table fields from old forum to new forum if user wants this (for Mod compatibility for example) -function phpbb_copy_table_fields() -{ -} -*/ - -/** -* Convert authentication -* user, group and forum table has to be filled in order to work -*/ -function phpbb_convert_authentication($mode) -{ - global $db, $src_db, $same_db, $convert, $user, $config, $cache; - - if ($mode == 'start') - { - $db->sql_query($convert->truncate_statement . ACL_USERS_TABLE); - $db->sql_query($convert->truncate_statement . ACL_GROUPS_TABLE); - - // What we will do is handling all 2.0.x admins as founder to replicate what is common in 2.0.x. - // After conversion the main admin need to make sure he is removing permissions and the founder status if wanted. - - - // Grab user ids of users with user_level of ADMIN - $sql = "SELECT user_id - FROM {$convert->src_table_prefix}users - WHERE user_level = 1 - ORDER BY user_regdate ASC"; - $result = $src_db->sql_query($sql); - - while ($row = $src_db->sql_fetchrow($result)) - { - $user_id = (int) phpbb_user_id($row['user_id']); - // Set founder admin... - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_type = ' . USER_FOUNDER . " - WHERE user_id = $user_id"; - $db->sql_query($sql); - } - $src_db->sql_freeresult($result); - - $sql = 'SELECT group_id - FROM ' . GROUPS_TABLE . " - WHERE group_name_clean = '" . $db->sql_escape('bots') . "'"; - $result = $db->sql_query($sql); - $bot_group_id = (int) $db->sql_fetchfield('group_id'); - $db->sql_freeresult($result); - } - - // Grab forum auth information - $sql = "SELECT * - FROM {$convert->src_table_prefix}forums"; - $result = $src_db->sql_query($sql); - - $forum_access = array(); - while ($row = $src_db->sql_fetchrow($result)) - { - $forum_access[$row['forum_id']] = $row; - } - $src_db->sql_freeresult($result); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - // Grab user auth information from 2.0.x board - $sql = "SELECT ug.user_id, aa.* - FROM {$convert->src_table_prefix}auth_access aa, {$convert->src_table_prefix}user_group ug, {$convert->src_table_prefix}groups g, {$convert->src_table_prefix}forums f - WHERE g.group_id = aa.group_id - AND g.group_single_user = 1 - AND ug.group_id = g.group_id - AND f.forum_id = aa.forum_id"; - $result = $src_db->sql_query($sql); - - $user_access = array(); - while ($row = $src_db->sql_fetchrow($result)) - { - $user_access[$row['forum_id']][] = $row; - } - $src_db->sql_freeresult($result); - - // Grab group auth information - $sql = "SELECT g.group_id, aa.* - FROM {$convert->src_table_prefix}auth_access aa, {$convert->src_table_prefix}groups g - WHERE g.group_id = aa.group_id - AND g.group_single_user <> 1"; - $result = $src_db->sql_query($sql); - - $group_access = array(); - while ($row = $src_db->sql_fetchrow($result)) - { - $group_access[$row['forum_id']][] = $row; - } - $src_db->sql_freeresult($result); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - - // Add Forum Access List - $auth_map = array( - 'auth_view' => array('f_', 'f_list'), - 'auth_read' => array('f_read', 'f_search'), - 'auth_post' => array('f_post', 'f_bbcode', 'f_smilies', 'f_img', 'f_sigs', 'f_postcount', 'f_report', 'f_subscribe', 'f_print', 'f_email'), - 'auth_reply' => 'f_reply', - 'auth_edit' => 'f_edit', - 'auth_delete' => 'f_delete', - 'auth_pollcreate' => 'f_poll', - 'auth_vote' => 'f_vote', - 'auth_announce' => 'f_announce', - 'auth_sticky' => 'f_sticky', - 'auth_attachments' => array('f_attach', 'f_download'), - 'auth_download' => 'f_download', - ); - - // Define the ACL constants used in 2.0 to make the code slightly more readable - define('AUTH_ALL', 0); - define('AUTH_REG', 1); - define('AUTH_ACL', 2); - define('AUTH_MOD', 3); - define('AUTH_ADMIN', 5); - - // A mapping of the simple permissions used by 2.0 - $simple_auth_ary = array( - 'public' => array( - 'auth_view' => AUTH_ALL, - 'auth_read' => AUTH_ALL, - 'auth_post' => AUTH_ALL, - 'auth_reply' => AUTH_ALL, - 'auth_edit' => AUTH_REG, - 'auth_delete' => AUTH_REG, - 'auth_sticky' => AUTH_MOD, - 'auth_announce' => AUTH_MOD, - 'auth_vote' => AUTH_REG, - 'auth_pollcreate' => AUTH_REG, - ), - 'registered' => array( - 'auth_view' => AUTH_ALL, - 'auth_read' => AUTH_ALL, - 'auth_post' => AUTH_REG, - 'auth_reply' => AUTH_REG, - 'auth_edit' => AUTH_REG, - 'auth_delete' => AUTH_REG, - 'auth_sticky' => AUTH_MOD, - 'auth_announce' => AUTH_MOD, - 'auth_vote' => AUTH_REG, - 'auth_pollcreate' => AUTH_REG, - ), - 'registered_hidden' => array( - 'auth_view' => AUTH_REG, - 'auth_read' => AUTH_REG, - 'auth_post' => AUTH_REG, - 'auth_reply' => AUTH_REG, - 'auth_edit' => AUTH_REG, - 'auth_delete' => AUTH_REG, - 'auth_sticky' => AUTH_MOD, - 'auth_announce' => AUTH_MOD, - 'auth_vote' => AUTH_REG, - 'auth_pollcreate' => AUTH_REG, - ), - 'private' => array( - 'auth_view' => AUTH_ALL, - 'auth_read' => AUTH_ACL, - 'auth_post' => AUTH_ACL, - 'auth_reply' => AUTH_ACL, - 'auth_edit' => AUTH_ACL, - 'auth_delete' => AUTH_ACL, - 'auth_sticky' => AUTH_ACL, - 'auth_announce' => AUTH_MOD, - 'auth_vote' => AUTH_ACL, - 'auth_pollcreate' => AUTH_ACL, - ), - 'private_hidden' => array( - 'auth_view' => AUTH_ACL, - 'auth_read' => AUTH_ACL, - 'auth_post' => AUTH_ACL, - 'auth_reply' => AUTH_ACL, - 'auth_edit' => AUTH_ACL, - 'auth_delete' => AUTH_ACL, - 'auth_sticky' => AUTH_ACL, - 'auth_announce' => AUTH_MOD, - 'auth_vote' => AUTH_ACL, - 'auth_pollcreate' => AUTH_ACL, - ), - 'moderator' => array( - 'auth_view' => AUTH_ALL, - 'auth_read' => AUTH_MOD, - 'auth_post' => AUTH_MOD, - 'auth_reply' => AUTH_MOD, - 'auth_edit' => AUTH_MOD, - 'auth_delete' => AUTH_MOD, - 'auth_sticky' => AUTH_MOD, - 'auth_announce' => AUTH_MOD, - 'auth_vote' => AUTH_MOD, - 'auth_pollcreate' => AUTH_MOD, - ), - 'moderator_hidden' => array( - 'auth_view' => AUTH_MOD, - 'auth_read' => AUTH_MOD, - 'auth_post' => AUTH_MOD, - 'auth_reply' => AUTH_MOD, - 'auth_edit' => AUTH_MOD, - 'auth_delete' => AUTH_MOD, - 'auth_sticky' => AUTH_MOD, - 'auth_announce' => AUTH_MOD, - 'auth_vote' => AUTH_MOD, - 'auth_pollcreate' => AUTH_MOD, - ), - ); - - if ($mode == 'start') - { - user_group_auth('guests', 'SELECT user_id, {GUESTS} FROM ' . USERS_TABLE . ' WHERE user_id = ' . ANONYMOUS, false); - user_group_auth('registered', 'SELECT user_id, {REGISTERED} FROM ' . USERS_TABLE . ' WHERE user_id <> ' . ANONYMOUS . " AND group_id <> $bot_group_id", false); - - // Selecting from old table - if (!empty($config['increment_user_id'])) - { - $auth_sql = 'SELECT user_id, {ADMINISTRATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1 AND user_id <> 1'; - user_group_auth('administrators', $auth_sql, true); - - $auth_sql = 'SELECT ' . $config['increment_user_id'] . ' as user_id, {ADMINISTRATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1 AND user_id = 1'; - user_group_auth('administrators', $auth_sql, true); - } - else - { - $auth_sql = 'SELECT user_id, {ADMINISTRATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1'; - user_group_auth('administrators', $auth_sql, true); - } - - if (!empty($config['increment_user_id'])) - { - $auth_sql = 'SELECT user_id, {GLOBAL_MODERATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1 AND user_id <> 1'; - user_group_auth('global_moderators', $auth_sql, true); - - $auth_sql = 'SELECT ' . $config['increment_user_id'] . ' as user_id, {GLOBAL_MODERATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1 AND user_id = 1'; - user_group_auth('global_moderators', $auth_sql, true); - } - else - { - $auth_sql = 'SELECT user_id, {GLOBAL_MODERATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1'; - user_group_auth('global_moderators', $auth_sql, true); - } - } - else if ($mode == 'first') - { - // Go through all 2.0.x forums - foreach ($forum_access as $forum) - { - $new_forum_id = (int) $forum['forum_id']; - - // Administrators have full access to all forums whatever happens - mass_auth('group_role', $new_forum_id, 'administrators', 'FORUM_FULL'); - - $matched_type = ''; - foreach ($simple_auth_ary as $key => $auth_levels) - { - $matched = 1; - foreach ($auth_levels as $k => $level) - { - if ($forum[$k] != $auth_levels[$k]) - { - $matched = 0; - } - } - - if ($matched) - { - $matched_type = $key; - break; - } - } - - switch ($matched_type) - { - case 'public': - mass_auth('group_role', $new_forum_id, 'guests', 'FORUM_LIMITED'); - mass_auth('group_role', $new_forum_id, 'registered', 'FORUM_LIMITED_POLLS'); - mass_auth('group_role', $new_forum_id, 'bots', 'FORUM_BOT'); - break; - - case 'registered': - mass_auth('group_role', $new_forum_id, 'guests', 'FORUM_READONLY'); - mass_auth('group_role', $new_forum_id, 'bots', 'FORUM_BOT'); - - // no break; - - case 'registered_hidden': - mass_auth('group_role', $new_forum_id, 'registered', 'FORUM_POLLS'); - break; - - case 'private': - case 'private_hidden': - case 'moderator': - case 'moderator_hidden': - default: - // The permissions don't match a simple set, so we're going to have to map them directly - - // No post approval for all, in 2.0.x this feature does not exist - mass_auth('group', $new_forum_id, 'guests', 'f_noapprove', ACL_YES); - mass_auth('group', $new_forum_id, 'registered', 'f_noapprove', ACL_YES); - - // Go through authentication map - foreach ($auth_map as $old_auth_key => $new_acl) - { - // If old authentication key does not exist we continue - // This is helpful for mods adding additional authentication fields, we need to add them to the auth_map array - if (!isset($forum[$old_auth_key])) - { - continue; - } - - // Now set the new ACL correctly - switch ($forum[$old_auth_key]) - { - // AUTH_ALL - case AUTH_ALL: - mass_auth('group', $new_forum_id, 'guests', $new_acl, ACL_YES); - mass_auth('group', $new_forum_id, 'bots', $new_acl, ACL_YES); - mass_auth('group', $new_forum_id, 'registered', $new_acl, ACL_YES); - break; - - // AUTH_REG - case AUTH_REG: - mass_auth('group', $new_forum_id, 'registered', $new_acl, ACL_YES); - break; - - // AUTH_ACL - case AUTH_ACL: - // Go through the old group access list for this forum - if (isset($group_access[$forum['forum_id']])) - { - foreach ($group_access[$forum['forum_id']] as $index => $access) - { - // We only check for ACL_YES equivalence entry - if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1) - { - mass_auth('group', $new_forum_id, (int) $access['group_id'], $new_acl, ACL_YES); - } - } - } - - if (isset($user_access[$forum['forum_id']])) - { - foreach ($user_access[$forum['forum_id']] as $index => $access) - { - // We only check for ACL_YES equivalence entry - if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1) - { - mass_auth('user', $new_forum_id, (int) phpbb_user_id($access['user_id']), $new_acl, ACL_YES); - } - } - } - break; - - // AUTH_MOD - case AUTH_MOD: - if (isset($group_access[$forum['forum_id']])) - { - foreach ($group_access[$forum['forum_id']] as $index => $access) - { - // We only check for ACL_YES equivalence entry - if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1) - { - mass_auth('group', $new_forum_id, (int) $access['group_id'], $new_acl, ACL_YES); - } - } - } - - if (isset($user_access[$forum['forum_id']])) - { - foreach ($user_access[$forum['forum_id']] as $index => $access) - { - // We only check for ACL_YES equivalence entry - if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1) - { - mass_auth('user', $new_forum_id, (int) phpbb_user_id($access['user_id']), $new_acl, ACL_YES); - } - } - } - break; - } - } - break; - } - } - } - else if ($mode == 'second') - { - // Assign permission roles and other default permissions - - // guests having u_download and u_search ability - $db->sql_query('INSERT INTO ' . ACL_GROUPS_TABLE . ' (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) SELECT ' . get_group_id('guests') . ', 0, auth_option_id, 0, 1 FROM ' . ACL_OPTIONS_TABLE . " WHERE auth_option IN ('u_', 'u_download', 'u_search')"); - - // administrators/global mods having full user features - mass_auth('group_role', 0, 'administrators', 'USER_FULL'); - mass_auth('group_role', 0, 'global_moderators', 'USER_FULL'); - - // By default all converted administrators are given full access - mass_auth('group_role', 0, 'administrators', 'ADMIN_FULL'); - - // All registered users are assigned the standard user role - mass_auth('group_role', 0, 'registered', 'USER_STANDARD'); - mass_auth('group_role', 0, 'registered_coppa', 'USER_STANDARD'); - - // Instead of administrators being global moderators we give the MOD_FULL role to global mods (admins already assigned to this group) - mass_auth('group_role', 0, 'global_moderators', 'MOD_FULL'); - - // And now those who have had their avatar rights removed get assigned a more restrictive role - $sql = 'SELECT user_id FROM ' . $convert->src_table_prefix . 'users - WHERE user_allowavatar = 0 - AND user_id > 0'; - $result = $src_db->sql_query($sql); - - while ($row = $src_db->sql_fetchrow($result)) - { - mass_auth('user_role', 0, (int) phpbb_user_id($row['user_id']), 'USER_NOAVATAR'); - } - $src_db->sql_freeresult($result); - - // And the same for those who have had their PM rights removed - $sql = 'SELECT user_id FROM ' . $convert->src_table_prefix . 'users - WHERE user_allow_pm = 0 - AND user_id > 0'; - $result = $src_db->sql_query($sql); - - while ($row = $src_db->sql_fetchrow($result)) - { - mass_auth('user_role', 0, (int) phpbb_user_id($row['user_id']), 'USER_NOPM'); - } - $src_db->sql_freeresult($result); - } - else if ($mode == 'third') - { - // And now the moderators - // We make sure that they have at least standard access to the forums they moderate in addition to the moderating permissions - - $mod_post_map = array( - 'auth_announce' => 'f_announce', - 'auth_sticky' => 'f_sticky' - ); - - foreach ($user_access as $forum_id => $access_map) - { - $forum_id = (int) $forum_id; - - foreach ($access_map as $access) - { - if (isset($access['auth_mod']) && $access['auth_mod'] == 1) - { - mass_auth('user_role', $forum_id, (int) phpbb_user_id($access['user_id']), 'MOD_STANDARD'); - mass_auth('user_role', $forum_id, (int) phpbb_user_id($access['user_id']), 'FORUM_STANDARD'); - foreach ($mod_post_map as $old => $new) - { - if (isset($forum_access[$forum_id]) && isset($forum_access[$forum_id][$old]) && $forum_access[$forum_id][$old] == AUTH_MOD) - { - mass_auth('user', $forum_id, (int) phpbb_user_id($access['user_id']), $new, ACL_YES); - } - } - } - } - } - - foreach ($group_access as $forum_id => $access_map) - { - $forum_id = (int) $forum_id; - - foreach ($access_map as $access) - { - if (isset($access['auth_mod']) && $access['auth_mod'] == 1) - { - mass_auth('group_role', $forum_id, (int) $access['group_id'], 'MOD_STANDARD'); - mass_auth('group_role', $forum_id, (int) $access['group_id'], 'FORUM_STANDARD'); - foreach ($mod_post_map as $old => $new) - { - if (isset($forum_access[$forum_id]) && isset($forum_access[$forum_id][$old]) && $forum_access[$forum_id][$old] == AUTH_MOD) - { - mass_auth('group', $forum_id, (int) $access['group_id'], $new, ACL_YES); - } - } - } - } - } - - // We grant everyone readonly access to the categories to ensure that the forums are visible - $sql = 'SELECT forum_id, forum_name, parent_id, left_id, right_id - FROM ' . FORUMS_TABLE . ' - ORDER BY left_id ASC'; - $result = $db->sql_query($sql); - - $parent_forums = $forums = array(); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['parent_id'] == 0) - { - mass_auth('group_role', $row['forum_id'], 'administrators', 'FORUM_FULL'); - mass_auth('group_role', $row['forum_id'], 'global_moderators', 'FORUM_FULL'); - $parent_forums[] = $row; - } - else - { - $forums[] = $row; - } - } - $db->sql_freeresult($result); - - global $auth; - - // Let us see which groups have access to these forums... - foreach ($parent_forums as $row) - { - // Get the children - $branch = $forum_ids = array(); - - foreach ($forums as $key => $_row) - { - if ($_row['left_id'] > $row['left_id'] && $_row['left_id'] < $row['right_id']) - { - $branch[] = $_row; - $forum_ids[] = $_row['forum_id']; - continue; - } - } - - if (sizeof($forum_ids)) - { - // Now make sure the user is able to read these forums - $hold_ary = $auth->acl_group_raw_data(false, 'f_list', $forum_ids); - - if (empty($hold_ary)) - { - continue; - } - - foreach ($hold_ary as $g_id => $f_id_ary) - { - $set_group = false; - - foreach ($f_id_ary as $f_id => $auth_ary) - { - foreach ($auth_ary as $auth_option => $setting) - { - if ($setting == ACL_YES) - { - $set_group = true; - break 2; - } - } - } - - if ($set_group) - { - mass_auth('group', $row['forum_id'], $g_id, 'f_list', ACL_YES); - } - } - } - } - } -} - -/** -* Set primary group. -* Really simple and only based on user_level (remaining groups will be assigned later) -*/ -function phpbb_set_primary_group($user_level) -{ - global $convert_row; - - if ($user_level == 1) - { - return get_group_id('administrators'); - } -/* else if ($user_level == 2) - { - return get_group_id('global_moderators'); - } - else if ($user_level == 0 && $convert_row['user_active'])*/ - else if ($convert_row['user_active']) - { - return get_group_id('registered'); - } - - return 0; -} - -/** -* Convert the group name, making sure to avoid conflicts with 3.0 special groups -*/ -function phpbb_convert_group_name($group_name) -{ - $default_groups = array( - 'GUESTS', - 'REGISTERED', - 'REGISTERED_COPPA', - 'GLOBAL_MODERATORS', - 'ADMINISTRATORS', - 'BOTS', - ); - - if (in_array(strtoupper($group_name), $default_groups)) - { - return 'phpBB2 - ' . $group_name; - } - - return phpbb_set_default_encoding($group_name); -} - -/** -* Convert the group name, making sure to avoid conflicts with 3.0 special groups -*/ -function phpbb_convert_group_name_clean($group_name) -{ - $default_groups = array( - 'GUESTS', - 'REGISTERED', - 'REGISTERED_COPPA', - 'GLOBAL_MODERATORS', - 'ADMINISTRATORS', - 'BOTS', - ); - - if (in_array(strtoupper($group_name), $default_groups)) - { - return utf8_clean_string('phpBB2 - ' . $group_name); - } - - return utf8_clean_string(phpbb_set_default_encoding($group_name)); -} - -/** -* Convert the group type constants -*/ -function phpbb_convert_group_type($group_type) -{ - switch ($group_type) - { - case 0: - return GROUP_OPEN; - break; - - case 1: - return GROUP_CLOSED; - break; - - case 2: - return GROUP_HIDDEN; - break; - } - - // Never return GROUP_SPECIAL here, because only phpBB3's default groups are allowed to have this type set. - return GROUP_HIDDEN; -} - -/** -* Convert the topic type constants -*/ -function phpbb_convert_topic_type($topic_type) -{ - switch ($topic_type) - { - case 0: - return POST_NORMAL; - break; - - case 1: - return POST_STICKY; - break; - - case 2: - return POST_ANNOUNCE; - break; - - case 3: - return POST_GLOBAL; - break; - } - - return POST_NORMAL; -} - -function phpbb_replace_size($matches) -{ - return '[size=' . min(200, ceil(100.0 * (((double) $matches[1])/12.0))) . ':' . $matches[2] . ']'; -} - -/** -* Reparse the message stripping out the bbcode_uid values and adding new ones and setting the bitfield -* @todo What do we want to do about HTML in messages - currently it gets converted to the entities, but there may be some objections to this -*/ -function phpbb_prepare_message($message) -{ - global $phpbb_root_path, $phpEx, $db, $convert, $user, $config, $cache, $convert_row, $message_parser; - - if (!$message) - { - $convert->row['mp_bbcode_bitfield'] = $convert_row['mp_bbcode_bitfield'] = 0; - return ''; - } - - // Decode phpBB 2.0.x Message - if (isset($convert->row['old_bbcode_uid']) && $convert->row['old_bbcode_uid'] != '') - { - // Adjust size... - if (strpos($message, '[size=') !== false) - { - $message = preg_replace_callback('/\[size=(\d*):(' . $convert->row['old_bbcode_uid'] . ')\]/', 'phpbb_replace_size', $message); - } - - $message = preg_replace('/\:(([a-z0-9]:)?)' . $convert->row['old_bbcode_uid'] . '/s', '', $message); - } - - if (strpos($message, '[quote=') !== false) - { - $message = preg_replace('/\[quote="(.*?)"\]/s', '[quote="\1"]', $message); - $message = preg_replace('/\[quote=\\\"(.*?)\\\"\]/s', '[quote="\1"]', $message); - - // let's hope that this solves more problems than it causes. Deal with escaped quotes. - $message = str_replace('\"', '"', $message); - $message = str_replace('\"', '"', $message); - } - - // Already the new user id ;) - $user_id = $convert->row['poster_id']; - - $message = str_replace('<', '<', $message); - $message = str_replace('>', '>', $message); - $message = str_replace('
    ', "\n", $message); - - // make the post UTF-8 - $message = phpbb_set_encoding($message); - - $message_parser->warn_msg = array(); // Reset the errors from the previous message - $message_parser->bbcode_uid = make_uid($convert->row['post_time']); - $message_parser->message = $message; - unset($message); - - // Make sure options are set. -// $enable_html = (!isset($row['enable_html'])) ? false : $row['enable_html']; - $enable_bbcode = (!isset($convert->row['enable_bbcode'])) ? true : $convert->row['enable_bbcode']; - $enable_smilies = (!isset($convert->row['enable_smilies'])) ? true : $convert->row['enable_smilies']; - $enable_magic_url = (!isset($convert->row['enable_magic_url'])) ? true : $convert->row['enable_magic_url']; - - // parse($allow_bbcode, $allow_magic_url, $allow_smilies, $allow_img_bbcode = true, $allow_flash_bbcode = true, $allow_quote_bbcode = true, $allow_url_bbcode = true, $update_this_message = true, $mode = 'post') - $message_parser->parse($enable_bbcode, $enable_magic_url, $enable_smilies); - - if (sizeof($message_parser->warn_msg)) - { - $msg_id = isset($convert->row['post_id']) ? $convert->row['post_id'] : $convert->row['privmsgs_id']; - $convert->p_master->error('' . $user->lang['POST_ID'] . ': ' . $msg_id . ' ' . $user->lang['CONV_ERROR_MESSAGE_PARSER'] . ':

    ' . implode('
    ', $message_parser->warn_msg), __LINE__, __FILE__, true); - } - - $convert->row['mp_bbcode_bitfield'] = $convert_row['mp_bbcode_bitfield'] = $message_parser->bbcode_bitfield; - - $message = $message_parser->message; - unset($message_parser->message); - - return $message; -} - -/** -* Return the bitfield calculated by the previous function -*/ -function get_bbcode_bitfield() -{ - global $convert_row; - - return $convert_row['mp_bbcode_bitfield']; -} - -/** -* Determine the last user to edit a post -* In practice we only tracked edits by the original poster in 2.0.x so this will only be set if they had edited their own post -*/ -function phpbb_post_edit_user() -{ - global $convert_row, $config; - - if (isset($convert_row['post_edit_count'])) - { - return phpbb_user_id($convert_row['poster_id']); - } - - return 0; -} - -/** -* Obtain the path to uploaded files on the 2.0.x forum -* This is only used if the Attachment MOD was installed -*/ -function phpbb_get_files_dir() -{ - if (!defined('MOD_ATTACHMENT')) - { - return; - } - - global $src_db, $same_db, $convert, $user, $config, $cache; - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - $sql = 'SELECT config_value AS upload_dir - FROM ' . $convert->src_table_prefix . "attachments_config - WHERE config_name = 'upload_dir'"; - $result = $src_db->sql_query($sql); - $upload_path = $src_db->sql_fetchfield('upload_dir'); - $src_db->sql_freeresult($result); - - $sql = 'SELECT config_value AS ftp_upload - FROM ' . $convert->src_table_prefix . "attachments_config - WHERE config_name = 'allow_ftp_upload'"; - $result = $src_db->sql_query($sql); - $ftp_upload = (int) $src_db->sql_fetchfield('ftp_upload'); - $src_db->sql_freeresult($result); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - - if ($ftp_upload) - { - $convert->p_master->error($user->lang['CONV_ERROR_ATTACH_FTP_DIR'], __LINE__, __FILE__); - } - - return $upload_path; -} - -/** -* Copy thumbnails of uploaded images from the 2.0.x forum -* This is only used if the Attachment MOD was installed -*/ -function phpbb_copy_thumbnails() -{ - global $db, $convert, $user, $config, $cache, $phpbb_root_path; - - $src_path = $convert->options['forum_path'] . '/' . phpbb_get_files_dir() . '/thumbs/'; - - if ($handle = @opendir($src_path)) - { - while ($entry = readdir($handle)) - { - if ($entry[0] == '.') - { - continue; - } - - if (is_dir($src_path . $entry)) - { - continue; - } - else - { - copy_file($src_path . $entry, $config['upload_path'] . '/' . preg_replace('/^t_/', 'thumb_', $entry)); - @unlink($phpbb_root_path . $config['upload_path'] . '/thumbs/' . $entry); - } - } - closedir($handle); - } -} - -/** -* Convert the attachment category constants -* This is only used if the Attachment MOD was installed -*/ -function phpbb_attachment_category($cat_id) -{ - switch ($cat_id) - { - case 1: - return ATTACHMENT_CATEGORY_IMAGE; - break; - - case 2: - return ATTACHMENT_CATEGORY_WM; - break; - - case 3: - return ATTACHMENT_CATEGORY_FLASH; - break; - } - - return ATTACHMENT_CATEGORY_NONE; -} - -/** -* Obtain list of forums in which different attachment categories can be used -*/ -function phpbb_attachment_forum_perms($forum_permissions) -{ - if (empty($forum_permissions)) - { - return ''; - } - - // Decode forum permissions - $forum_ids = array(); - - $one_char_encoding = '#'; - $two_char_encoding = '.'; - - $auth_len = 1; - for ($pos = 0; $pos < strlen($forum_permissions); $pos += $auth_len) - { - $forum_auth = substr($forum_permissions, $pos, 1); - if ($forum_auth == $one_char_encoding) - { - $auth_len = 1; - continue; - } - else if ($forum_auth == $two_char_encoding) - { - $auth_len = 2; - $pos--; - continue; - } - - $forum_auth = substr($forum_permissions, $pos, $auth_len); - $forum_id = base64_unpack($forum_auth); - - $forum_ids[] = (int) $forum_id; - } - - if (sizeof($forum_ids)) - { - return attachment_forum_perms($forum_ids); - } - - return ''; -} - -/** -* Convert the avatar type constants -*/ -function phpbb_avatar_type($type) -{ - switch ($type) - { - case 1: - return AVATAR_UPLOAD; - break; - - case 2: - return AVATAR_REMOTE; - break; - - case 3: - return AVATAR_GALLERY; - break; - } - - return 0; -} - - -/** -* Just undos the replacing of '<' and '>' -*/ -function phpbb_smilie_html_decode($code) -{ - $code = str_replace('<', '<', $code); - return str_replace('>', '>', $code); -} - -/** -* Transfer avatars, copying the image if it was uploaded -*/ -function phpbb_import_avatar($user_avatar) -{ - global $convert_row; - - if (!$convert_row['user_avatar_type']) - { - return ''; - } - else if ($convert_row['user_avatar_type'] == 1) - { - // Uploaded avatar - return import_avatar($user_avatar, false, $convert_row['user_id']); - } - else if ($convert_row['user_avatar_type'] == 2) - { - // Remote avatar - return $user_avatar; - } - else if ($convert_row['user_avatar_type'] == 3) - { - // Gallery avatar - return $user_avatar; - } - - return ''; -} - - -/** -* Find out about the avatar's dimensions -*/ -function phpbb_get_avatar_height($user_avatar) -{ - global $convert_row; - - if (empty($convert_row['user_avatar_type'])) - { - return 0; - } - return get_avatar_height($user_avatar, 'phpbb_avatar_type', $convert_row['user_avatar_type']); -} - - -/** -* Find out about the avatar's dimensions -*/ -function phpbb_get_avatar_width($user_avatar) -{ - global $convert_row; - - if (empty($convert_row['user_avatar_type'])) - { - return 0; - } - - return get_avatar_width($user_avatar, 'phpbb_avatar_type', $convert_row['user_avatar_type']); -} - - -/** -* Calculate the correct to_address field for private messages -*/ -function phpbb_privmsgs_to_userid($to_userid) -{ - global $config; - - return 'u_' . phpbb_user_id($to_userid); -} - -/** -* Calculate whether a private message was unread using the bitfield -*/ -function phpbb_unread_pm($pm_type) -{ - return ($pm_type == 5) ? 1 : 0; -} - -/** -* Calculate whether a private message was new using the bitfield -*/ -function phpbb_new_pm($pm_type) -{ - return ($pm_type == 1) ? 1 : 0; -} - -/** -* Obtain the folder_id for the custom folder created to replace the savebox from 2.0.x (used to store saved private messages) -*/ -function phpbb_get_savebox_id($user_id) -{ - global $db; - - $user_id = phpbb_user_id($user_id); - - // Only one custom folder, check only one - $sql = 'SELECT folder_id - FROM ' . PRIVMSGS_FOLDER_TABLE . ' - WHERE user_id = ' . $user_id; - $result = $db->sql_query_limit($sql, 1); - $folder_id = (int) $db->sql_fetchfield('folder_id'); - $db->sql_freeresult($result); - - return $folder_id; -} - -/** -* Transfer attachment specific configuration options -* These were not stored in the main config table on 2.0.x -* This is only used if the Attachment MOD was installed -*/ -function phpbb_import_attach_config() -{ - global $db, $src_db, $same_db, $convert, $config; - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - - $sql = 'SELECT * - FROM ' . $convert->src_table_prefix . 'attachments_config'; - $result = $src_db->sql_query($sql); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - - $attach_config = array(); - while ($row = $src_db->sql_fetchrow($result)) - { - $attach_config[$row['config_name']] = $row['config_value']; - } - $src_db->sql_freeresult($result); - - set_config('allow_attachments', 1); - - // old attachment mod? Must be very old if this entry do not exist... - if (!empty($attach_config['display_order'])) - { - set_config('display_order', $attach_config['display_order']); - } - set_config('max_filesize', $attach_config['max_filesize']); - set_config('max_filesize_pm', $attach_config['max_filesize_pm']); - set_config('attachment_quota', $attach_config['attachment_quota']); - set_config('max_attachments', $attach_config['max_attachments']); - set_config('max_attachments_pm', $attach_config['max_attachments_pm']); - set_config('allow_pm_attach', $attach_config['allow_pm_attach']); - - set_config('img_display_inlined', $attach_config['img_display_inlined']); - set_config('img_max_width', $attach_config['img_max_width']); - set_config('img_max_height', $attach_config['img_max_height']); - set_config('img_link_width', $attach_config['img_link_width']); - set_config('img_link_height', $attach_config['img_link_height']); - set_config('img_create_thumbnail', $attach_config['img_create_thumbnail']); - set_config('img_max_thumb_width', 400); - set_config('img_min_thumb_filesize', $attach_config['img_min_thumb_filesize']); - set_config('img_imagick', $attach_config['img_imagick']); -} - -/** -* Calculate the date a user became inactive -*/ -function phpbb_inactive_time() -{ - global $convert_row; - - if ($convert_row['user_active']) - { - return 0; - } - - if ($convert_row['user_lastvisit']) - { - return $convert_row['user_lastvisit']; - } - - return $convert_row['user_regdate']; -} - -/** -* Calculate the reason a user became inactive -* We can't actually tell the difference between a manual deactivation and one for profile changes -* from the data available to assume the latter -*/ -function phpbb_inactive_reason() -{ - global $convert_row; - - if ($convert_row['user_active']) - { - return 0; - } - - if ($convert_row['user_lastvisit']) - { - return INACTIVE_PROFILE; - } - - return INACTIVE_REGISTER; -} - -/** -* Adjust 2.0.x disallowed names to 3.0.x format -*/ -function phpbb_disallowed_username($username) -{ - // Replace * with % - $username = phpbb_set_default_encoding(str_replace('*', '%', $username)); - return utf8_htmlspecialchars($username); -} - -/** -* Checks whether there are any usernames on the old board that would map to the same -* username_clean on phpBB3. Prints out a list if any exist and exits. -*/ -function phpbb_check_username_collisions() -{ - global $db, $src_db, $convert, $table_prefix, $user, $lang; - - // create a temporary table in which we store the clean usernames - $drop_sql = 'DROP TABLE ' . $table_prefix . 'userconv'; - switch ($db->dbms_type) - { - case 'firebird': - $create_sql = 'CREATE TABLE ' . $table_prefix . 'userconv ( - user_id INTEGER NOT NULL, - username_clean VARCHAR(255) CHARACTER SET UTF8 DEFAULT \'\' NOT NULL COLLATE UNICODE - )'; - break; - - case 'mssql': - $create_sql = 'CREATE TABLE [' . $table_prefix . 'userconv] ( - [user_id] [int] NOT NULL , - [username_clean] [varchar] (255) DEFAULT (\'\') NOT NULL - )'; - break; - - case 'mysql': - $create_sql = 'CREATE TABLE ' . $table_prefix . 'userconv ( - user_id mediumint(8) NOT NULL, - username_clean varchar(255) DEFAULT \'\' NOT NULL - ) CHARACTER SET `utf8` COLLATE `utf8_bin`'; - break; - - case 'oracle': - $create_sql = 'CREATE TABLE ' . $table_prefix . 'userconv ( - user_id number(8) NOT NULL, - username_clean varchar2(255) DEFAULT \'\' - )'; - break; - - case 'postgres': - $create_sql = 'CREATE TABLE ' . $table_prefix . 'userconv ( - user_id INT4 DEFAULT \'0\', - username_clean varchar_ci DEFAULT \'\' NOT NULL - )'; - break; - - case 'sqlite': - $create_sql = 'CREATE TABLE ' . $table_prefix . 'userconv ( - user_id INTEGER NOT NULL DEFAULT \'0\', - username_clean varchar(255) NOT NULL DEFAULT \'\' - )'; - break; - } - - $db->sql_return_on_error(true); - $db->sql_query($drop_sql); - $db->sql_return_on_error(false); - $db->sql_query($create_sql); - - // now select all user_ids and usernames and then convert the username (this can take quite a while!) - $sql = 'SELECT user_id, username - FROM ' . $convert->src_table_prefix . 'users'; - $result = $src_db->sql_query($sql); - - $insert_ary = array(); - $i = 0; - while ($row = $src_db->sql_fetchrow($result)) - { - $clean_name = utf8_clean_string(phpbb_set_default_encoding($row['username'])); - $insert_ary[] = array('user_id' => (int) $row['user_id'], 'username_clean' => (string) $clean_name); - - if ($i % 1000 == 999) - { - $db->sql_multi_insert($table_prefix . 'userconv', $insert_ary); - $insert_ary = array(); - } - $i++; - } - $src_db->sql_freeresult($result); - - if (sizeof($insert_ary)) - { - $db->sql_multi_insert($table_prefix . 'userconv', $insert_ary); - } - unset($insert_ary); - - // now find the clean version of the usernames that collide - $sql = 'SELECT username_clean - FROM ' . $table_prefix . 'userconv - GROUP BY username_clean - HAVING COUNT(user_id) > 1'; - $result = $db->sql_query($sql); - - $colliding_names = array(); - while ($row = $db->sql_fetchrow($result)) - { - $colliding_names[] = $row['username_clean']; - } - $db->sql_freeresult($result); - - // there was at least one collision, the admin will have to solve it before conversion can continue - if (sizeof($colliding_names)) - { - $sql = 'SELECT user_id, username_clean - FROM ' . $table_prefix . 'userconv - WHERE ' . $db->sql_in_set('username_clean', $colliding_names); - $result = $db->sql_query($sql); - unset($colliding_names); - - $colliding_user_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $colliding_user_ids[(int) $row['user_id']] = $row['username_clean']; - } - $db->sql_freeresult($result); - - $sql = 'SELECT username, user_id, user_posts - FROM ' . $convert->src_table_prefix . 'users - WHERE ' . $src_db->sql_in_set('user_id', array_keys($colliding_user_ids)); - $result = $src_db->sql_query($sql); - - $colliding_users = array(); - while ($row = $db->sql_fetchrow($result)) - { - $row['user_id'] = (int) $row['user_id']; - if (isset($colliding_user_ids[$row['user_id']])) - { - $colliding_users[$colliding_user_ids[$row['user_id']]][] = $row; - } - } - $db->sql_freeresult($result); - unset($colliding_user_ids); - - $list = ''; - foreach ($colliding_users as $username_clean => $users) - { - $list .= sprintf($user->lang['COLLIDING_CLEAN_USERNAME'], $username_clean) . "
    \n"; - foreach ($users as $i => $row) - { - $list .= sprintf($user->lang['COLLIDING_USER'], $row['user_id'], phpbb_set_default_encoding($row['username']), $row['user_posts']) . "
    \n"; - } - } - - $lang['INST_ERR_FATAL'] = $user->lang['CONV_ERR_FATAL']; - $convert->p_master->error('' . $user->lang['COLLIDING_USERNAMES_FOUND'] . '

    ' . $list . '', __LINE__, __FILE__); - } - - $db->sql_query($drop_sql); -} - -?> \ No newline at end of file diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php deleted file mode 100644 index 06eeecbc71..0000000000 --- a/phpBB/install/database_update.php +++ /dev/null @@ -1,1778 +0,0 @@ -INSTALL.html before attempting to update."); -} - -// Load Extensions -if (!empty($load_extensions)) -{ - $load_extensions = explode(',', $load_extensions); - - foreach ($load_extensions as $extension) - { - @dl(trim($extension)); - } -} - -// Include files -require($phpbb_root_path . 'includes/acm/acm_' . $acm_type . '.' . $phpEx); -require($phpbb_root_path . 'includes/cache.' . $phpEx); -require($phpbb_root_path . 'includes/template.' . $phpEx); -require($phpbb_root_path . 'includes/session.' . $phpEx); -require($phpbb_root_path . 'includes/auth.' . $phpEx); - -require($phpbb_root_path . 'includes/functions.' . $phpEx); - -if (file_exists($phpbb_root_path . 'includes/functions_content.' . $phpEx)) -{ - require($phpbb_root_path . 'includes/functions_content.' . $phpEx); -} - -require($phpbb_root_path . 'includes/functions_admin.' . $phpEx); -require($phpbb_root_path . 'includes/constants.' . $phpEx); -require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); -require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); - -// If we are on PHP >= 6.0.0 we do not need some code -if (version_compare(PHP_VERSION, '6.0.0-dev', '>=')) -{ - /** - * @ignore - */ - define('STRIP', false); -} -else -{ - set_magic_quotes_runtime(0); - define('STRIP', (get_magic_quotes_gpc()) ? true : false); -} - -$user = new user(); -$cache = new acm(); -$db = new $sql_db(); - -// Add own hook handler, if present. :o -if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx)) -{ - require($phpbb_root_path . 'includes/hooks/index.' . $phpEx); - $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display'))); - - foreach (cache::obtain_hooks() as $hook) - { - @include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx); - } -} -else -{ - $phpbb_hook = false; -} - -// Connect to DB -$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false); - -// We do not need this any longer, unset for safety purposes -unset($dbpasswd); - -$user->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? htmlspecialchars($_SERVER['REMOTE_ADDR']) : ''; - -$sql = "SELECT config_value - FROM " . CONFIG_TABLE . " - WHERE config_name = 'default_lang'"; -$result = $db->sql_query($sql); -$row = $db->sql_fetchrow($result); -$db->sql_freeresult($result); - -$language = basename(request_var('language', '')); - -if (!$language) -{ - $language = $row['config_value']; -} - -if (!file_exists($phpbb_root_path . 'language/' . $language)) -{ - die('No language found!'); -} - -// And finally, load the relevant language files -include($phpbb_root_path . 'language/' . $language . '/common.' . $phpEx); -include($phpbb_root_path . 'language/' . $language . '/acp/common.' . $phpEx); -include($phpbb_root_path . 'language/' . $language . '/install.' . $phpEx); - -// Set PHP error handler to ours -//set_error_handler('msg_handler'); - -// Define some variables for the database update -$inline_update = (request_var('type', 0)) ? true : false; - -// Database column types mapping -$dbms_type_map = array( - 'mysql' => array( - 'INT:' => 'int(%d)', - 'BINT' => 'bigint(20)', - 'UINT' => 'mediumint(8) UNSIGNED', - 'UINT:' => 'int(%d) UNSIGNED', - 'TINT:' => 'tinyint(%d)', - 'USINT' => 'smallint(4) UNSIGNED', - 'BOOL' => 'tinyint(1) UNSIGNED', - 'VCHAR' => 'varchar(255)', - 'VCHAR:' => 'varchar(%d)', - 'CHAR:' => 'char(%d)', - 'XSTEXT' => 'text', - 'XSTEXT_UNI'=> 'varchar(100)', - 'STEXT' => 'text', - 'STEXT_UNI' => 'varchar(255)', - 'TEXT' => 'text', - 'TEXT_UNI' => 'text', - 'MTEXT' => 'mediumtext', - 'MTEXT_UNI' => 'mediumtext', - 'TIMESTAMP' => 'int(11) UNSIGNED', - 'DECIMAL' => 'decimal(5,2)', - 'VCHAR_UNI' => 'varchar(255)', - 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar(255)', - 'VARBINARY' => 'varbinary(255)', - ), - - 'firebird' => array( - 'INT:' => 'INTEGER', - 'BINT' => 'DOUBLE PRECISION', - 'UINT' => 'INTEGER', - 'UINT:' => 'INTEGER', - 'TINT:' => 'INTEGER', - 'USINT' => 'INTEGER', - 'BOOL' => 'INTEGER', - 'VCHAR' => 'VARCHAR(255) CHARACTER SET NONE', - 'VCHAR:' => 'VARCHAR(%d) CHARACTER SET NONE', - 'CHAR:' => 'CHAR(%d) CHARACTER SET NONE', - 'XSTEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', - 'STEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', - 'TEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', - 'MTEXT' => 'BLOB SUB_TYPE TEXT CHARACTER SET NONE', - 'XSTEXT_UNI'=> 'VARCHAR(100) CHARACTER SET UTF8', - 'STEXT_UNI' => 'VARCHAR(255) CHARACTER SET UTF8', - 'TEXT_UNI' => 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8', - 'MTEXT_UNI' => 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8', - 'TIMESTAMP' => 'INTEGER', - 'DECIMAL' => 'DOUBLE PRECISION', - 'VCHAR_UNI' => 'VARCHAR(255) CHARACTER SET UTF8', - 'VCHAR_UNI:'=> 'VARCHAR(%d) CHARACTER SET UTF8', - 'VCHAR_CI' => 'VARCHAR(255) CHARACTER SET UTF8', - 'VARBINARY' => 'CHAR(255) CHARACTER SET NONE', - ), - - 'mssql' => array( - 'INT:' => '[int]', - 'BINT' => '[float]', - 'UINT' => '[int]', - 'UINT:' => '[int]', - 'TINT:' => '[int]', - 'USINT' => '[int]', - 'BOOL' => '[int]', - 'VCHAR' => '[varchar] (255)', - 'VCHAR:' => '[varchar] (%d)', - 'CHAR:' => '[char] (%d)', - 'XSTEXT' => '[varchar] (1000)', - 'STEXT' => '[varchar] (3000)', - 'TEXT' => '[varchar] (8000)', - 'MTEXT' => '[text]', - 'XSTEXT_UNI'=> '[varchar] (100)', - 'STEXT_UNI' => '[varchar] (255)', - 'TEXT_UNI' => '[varchar] (4000)', - 'MTEXT_UNI' => '[text]', - 'TIMESTAMP' => '[int]', - 'DECIMAL' => '[float]', - 'VCHAR_UNI' => '[varchar] (255)', - 'VCHAR_UNI:'=> '[varchar] (%d)', - 'VCHAR_CI' => '[varchar] (255)', - 'VARBINARY' => '[varchar] (255)', - ), - - 'oracle' => array( - 'INT:' => 'number(%d)', - 'BINT' => 'number(20)', - 'UINT' => 'number(8)', - 'UINT:' => 'number(%d)', - 'TINT:' => 'number(%d)', - 'USINT' => 'number(4)', - 'BOOL' => 'number(1)', - 'VCHAR' => 'varchar2(255 char)', - 'VCHAR:' => 'varchar2(%d char)', - 'CHAR:' => 'char(%d char)', - 'XSTEXT' => 'varchar2(1000 char)', - 'STEXT' => 'varchar2(3000 char)', - 'TEXT' => 'clob', - 'MTEXT' => 'clob', - 'XSTEXT_UNI'=> 'varchar2(100 char)', - 'STEXT_UNI' => 'varchar2(255 char)', - 'TEXT_UNI' => 'clob', - 'MTEXT_UNI' => 'clob', - 'TIMESTAMP' => 'number(11)', - 'DECIMAL' => 'number(5, 2)', - 'DECIMAL:' => 'number(%d, 2)', - 'PDECIMAL' => 'number(6, 3)', - 'PDECIMAL:' => 'number(%d, 3)', - 'VCHAR_UNI' => 'varchar2(255 char)', - 'VCHAR_UNI:'=> 'varchar2(%d char)', - 'VCHAR_CI' => 'varchar2(255 char)', - 'VARBINARY' => 'raw(255)', - ), - - 'db2' => array( - 'INT:' => 'integer', - 'BINT' => 'float', - 'UINT' => 'integer', - 'UINT:' => 'integer', - 'TINT:' => 'smallint', - 'USINT' => 'smallint', - 'BOOL' => 'smallint', - 'VCHAR' => 'varchar(255)', - 'VCHAR:' => 'varchar(%d)', - 'CHAR:' => 'char(%d)', - 'XSTEXT' => 'clob(65K)', - 'STEXT' => 'varchar(3000)', - 'TEXT' => 'clob(65K)', - 'MTEXT' => 'clob(16M)', - 'XSTEXT_UNI'=> 'varchar(100)', - 'STEXT_UNI' => 'varchar(255)', - 'TEXT_UNI' => 'clob(65K)', - 'MTEXT_UNI' => 'clob(16M)', - 'TIMESTAMP' => 'integer', - 'DECIMAL' => 'float', - 'VCHAR_UNI' => 'varchar(255)', - 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar(255)', - 'VARBINARY' => 'varchar(255)', - ), - - 'sqlite' => array( - 'INT:' => 'int(%d)', - 'BINT' => 'bigint(20)', - 'UINT' => 'INTEGER UNSIGNED', //'mediumint(8) UNSIGNED', - 'UINT:' => 'INTEGER UNSIGNED', // 'int(%d) UNSIGNED', - 'TINT:' => 'tinyint(%d)', - 'USINT' => 'INTEGER UNSIGNED', //'mediumint(4) UNSIGNED', - 'BOOL' => 'INTEGER UNSIGNED', //'tinyint(1) UNSIGNED', - 'VCHAR' => 'varchar(255)', - 'VCHAR:' => 'varchar(%d)', - 'CHAR:' => 'char(%d)', - 'XSTEXT' => 'text(65535)', - 'STEXT' => 'text(65535)', - 'TEXT' => 'text(65535)', - 'MTEXT' => 'mediumtext(16777215)', - 'XSTEXT_UNI'=> 'text(65535)', - 'STEXT_UNI' => 'text(65535)', - 'TEXT_UNI' => 'text(65535)', - 'MTEXT_UNI' => 'mediumtext(16777215)', - 'TIMESTAMP' => 'INTEGER UNSIGNED', //'int(11) UNSIGNED', - 'DECIMAL' => 'decimal(5,2)', - 'VCHAR_UNI' => 'varchar(255)', - 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar(255)', - 'VARBINARY' => 'blob', - ), - - 'postgres' => array( - 'INT:' => 'INT4', - 'BINT' => 'INT8', - 'UINT' => 'INT4', // unsigned - 'UINT:' => 'INT4', // unsigned - 'USINT' => 'INT2', // unsigned - 'BOOL' => 'boolean', // unsigned - 'TINT:' => 'INT2', - 'VCHAR' => 'varchar(255)', - 'VCHAR:' => 'varchar(%d)', - 'CHAR:' => 'char(%d)', - 'XSTEXT' => 'varchar(1000)', - 'STEXT' => 'varchar(3000)', - 'TEXT' => 'varchar(8000)', - 'MTEXT' => 'TEXT', - 'XSTEXT_UNI'=> 'varchar(100)', - 'STEXT_UNI' => 'varchar(255)', - 'TEXT_UNI' => 'varchar(4000)', - 'MTEXT_UNI' => 'TEXT', - 'TIMESTAMP' => 'INT4', // unsigned - 'DECIMAL' => 'decimal(5,2)', - 'VCHAR_UNI' => 'varchar(255)', - 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar(255)', - 'VARBINARY' => 'bytea', - ), -); - -// A list of types being unsigned for better reference in some db's -$unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP'); - -// Only an example, but also commented out -$database_update_info = array( -); - -// Determine mapping database type -$map_dbms = $db->dbms_type; - -$error_ary = array(); -$errored = false; - -header('Content-type: text/html; charset=UTF-8'); - -?> - - - - - - - - - -<?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?> - - - - - - -
    - - -
    -
    -
    - -
    -
    - -

    - -
    - -

    :: sql_layer; ?>
    -sql_query($sql); - -while ($row = $db->sql_fetchrow($result)) -{ - $config[$row['config_name']] = $row['config_value']; -} -$db->sql_freeresult($result); - -echo $lang['PREVIOUS_VERSION'] . ' :: ' . $config['version'] . '
    '; -echo $lang['UPDATED_VERSION'] . ' :: ' . $updates_to_version . '

    '; - -$current_version = str_replace('rc', 'RC', strtolower($config['version'])); -$latest_version = str_replace('rc', 'RC', strtolower($updates_to_version)); -$orig_version = $config['version']; - -// If the latest version and the current version are 'unequal', we will update the version_update_from, else we do not update anything. -if ($inline_update) -{ - if ($current_version !== $latest_version) - { - set_config('version_update_from', $orig_version); - } -} -else -{ - // If not called from the update script, we will actually remove the traces - $db->sql_query('DELETE FROM ' . CONFIG_TABLE . " WHERE config_name = 'version_update_from'"); -} - -// Checks/Operations that have to be completed prior to starting the update itself -$exit = false; - -if ($exit) -{ -?> - -
    -
    - -
    -
    -
    - - -
    - - - - - -

    - -

    - -
    -

    :: - - $schema_changes) -{ - if (version_compare($version, $current_version, '<')) - { - continue; - } - - if (!sizeof($schema_changes)) - { - continue; - } - - $no_updates = false; - - // Change columns? - if (!empty($schema_changes['change_columns'])) - { - foreach ($schema_changes['change_columns'] as $table => $columns) - { - foreach ($columns as $column_name => $column_data) - { - sql_column_change($map_dbms, $table, $column_name, $column_data); - } - } - } - - // Add columns? - if (!empty($schema_changes['add_columns'])) - { - foreach ($schema_changes['add_columns'] as $table => $columns) - { - foreach ($columns as $column_name => $column_data) - { - // Only add the column if it does not exist yet - if (!column_exists($map_dbms, $table, $column_name)) - { - sql_column_add($map_dbms, $table, $column_name, $column_data); - } - } - } - } - - // Remove keys? - if (!empty($schema_changes['drop_keys'])) - { - foreach ($schema_changes['drop_keys'] as $table => $indexes) - { - foreach ($indexes as $index_name) - { - sql_index_drop($map_dbms, $index_name, $table); - } - } - } - - // Drop columns? - if (!empty($schema_changes['drop_columns'])) - { - foreach ($schema_changes['drop_columns'] as $table => $columns) - { - foreach ($columns as $column) - { - sql_column_remove($map_dbms, $table, $column); - } - } - } - - // Add primary keys? - if (!empty($schema_changes['add_primary_keys'])) - { - foreach ($schema_changes['add_primary_keys'] as $table => $columns) - { - sql_create_primary_key($map_dbms, $table, $columns); - } - } - - // Add unqiue indexes? - if (!empty($schema_changes['add_unique_index'])) - { - foreach ($schema_changes['add_unique_index'] as $table => $index_array) - { - foreach ($index_array as $index_name => $column) - { - sql_create_unique_index($map_dbms, $index_name, $table, $column); - } - } - } - - // Add indexes? - if (!empty($schema_changes['add_index'])) - { - foreach ($schema_changes['add_index'] as $table => $index_array) - { - foreach ($index_array as $index_name => $column) - { - sql_create_index($map_dbms, $index_name, $table, $column); - } - } - } -} - -_write_result($no_updates, $errored, $error_ary); - -// Data updates -$error_ary = array(); -$errored = $no_updates = false; - -?> - -

    -

    -
    -

    :: - - - -

    -

    -
    -

    :: - -dbms_type) -{ - case 'mysql': - $sql = 'OPTIMIZE TABLE ' . $table_prefix . 'auth_access, ' . $table_prefix . 'banlist, ' . $table_prefix . 'categories, ' . $table_prefix . 'config, ' . $table_prefix . 'disallow, ' . $table_prefix . 'forum_prune, ' . $table_prefix . 'forums, ' . $table_prefix . 'groups, ' . $table_prefix . 'posts, ' . $table_prefix . 'posts_text, ' . $table_prefix . 'privmsgs, ' . $table_prefix . 'privmsgs_text, ' . $table_prefix . 'ranks, ' . $table_prefix . 'search_results, ' . $table_prefix . 'search_wordlist, ' . $table_prefix . 'search_wordmatch, ' . $table_prefix . 'sessions_keys' . $table_prefix . 'smilies, ' . $table_prefix . 'themes, ' . $table_prefix . 'themes_name, ' . $table_prefix . 'topics, ' . $table_prefix . 'topics_watch, ' . $table_prefix . 'user_group, ' . $table_prefix . 'users, ' . $table_prefix . 'vote_desc, ' . $table_prefix . 'vote_results, ' . $table_prefix . 'vote_voters, ' . $table_prefix . 'words'; - _sql($sql, $errored, $error_ary); - break; - - case 'postgresql': - _sql("VACUUM ANALYZE", $errored, $error_ary); - break; -} -*/ - -_write_result($no_updates, $errored, $error_ary); - -?> - -
    -

    - -
    - - - -

    - -

    - - - -

    - -

    " class="button1">

    - -purge(); - -?> - -
  • -
    - -
    -
    -
    - - -
    - - - - -\n{$sql}\n
    "; - } - - $db->sql_return_on_error(true); - - $result = $db->sql_query($sql); - if ($db->sql_error_triggered) - { - $errored = true; - $error_ary['sql'][] = $db->sql_error_sql; - $error_ary['error_code'][] = $db->_sql_error(); - } - - $db->sql_return_on_error(false); - - if ($echo_dot) - { - echo ". \n"; - flush(); - } - - return $result; -} - -function _write_result($no_updates, $errored, $error_ary) -{ - global $lang; - - if ($no_updates) - { - echo ' ' . $lang['NO_UPDATES_REQUIRED'] . '

    '; - } - else - { - echo ' ' . $lang['DONE'] . '

    ' . $lang['RESULT'] . ' :: '; - - if ($errored) - { - echo ' ' . $lang['SOME_QUERIES_FAILED'] . '
      '; - - for ($i = 0; $i < sizeof($error_ary['sql']); $i++) - { - echo '
    • ' . $lang['ERROR'] . ' :: ' . htmlspecialchars($error_ary['error_code'][$i]['message']) . '
      '; - echo $lang['SQL'] . ' :: ' . htmlspecialchars($error_ary['sql'][$i]) . '

    • '; - } - - echo '


    ' . $lang['SQL_FAILURE_EXPLAIN'] . '

    '; - } - else - { - echo '' . $lang['NO_ERRORS'] . '

    '; - } - } -} - -/** -* Check if a specified column exist -*/ -function column_exists($dbms, $table, $column_name) -{ - global $db; - - switch ($dbms) - { - case 'mysql': - $sql = "SHOW COLUMNS - FROM $table"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - // lower case just in case - if (strtolower($row['Field']) == $column_name) - { - $db->sql_freeresult($result); - return true; - } - } - $db->sql_freeresult($result); - return false; - break; - - // PostgreSQL has a way of doing this in a much simpler way but would - // not allow us to support all versions of PostgreSQL - case 'postgres': - $sql = "SELECT a.attname - FROM pg_class c, pg_attribute a - WHERE c.relname = '{$table}' - AND a.attnum > 0 - AND a.attrelid = c.oid"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - // lower case just in case - if (strtolower($row['attname']) == $column_name) - { - $db->sql_freeresult($result); - return true; - } - } - $db->sql_freeresult($result); - return false; - break; - - // same deal with PostgreSQL, we must perform more complex operations than - // we technically could - case 'mssql': - $sql = "SELECT c.name - FROM syscolumns c - LEFT JOIN sysobjects o ON c.id = o.id - WHERE o.name = '{$table}'"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - // lower case just in case - if (strtolower($row['name']) == $column_name) - { - $db->sql_freeresult($result); - return true; - } - } - $db->sql_freeresult($result); - return false; - break; - - case 'oracle': - $sql = "SELECT column_name - FROM user_tab_columns - WHERE table_name = '{$table}'"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - // lower case just in case - if (strtolower($row['column_name']) == $column_name) - { - $db->sql_freeresult($result); - return true; - } - } - $db->sql_freeresult($result); - return false; - break; - - case 'firebird': - $sql = "SELECT RDB\$FIELD_NAME as FNAME - FROM RDB\$RELATION_FIELDS - WHERE RDB\$RELATION_NAME = '{$table}'"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - // lower case just in case - if (strtolower($row['fname']) == $column_name) - { - $db->sql_freeresult($result); - return true; - } - } - $db->sql_freeresult($result); - return false; - break; - - // ugh, SQLite - case 'sqlite': - $sql = "SELECT sql - FROM sqlite_master - WHERE type = 'table' - AND name = '{$table}'"; - $result = $db->sql_query($sql); - - if (!$result) - { - return false; - } - - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - preg_match('#\((.*)\)#s', $row['sql'], $matches); - - $cols = trim($matches[1]); - $col_array = preg_split('/,(?![\s\w]+\))/m', $cols); - - foreach ($col_array as $declaration) - { - $entities = preg_split('#\s+#', trim($declaration)); - if ($entities[0] == 'PRIMARY') - { - continue; - } - - if (strtolower($entities[0]) == $column_name) - { - return true; - } - } - return false; - break; - } -} - -/** -* Function to prepare some column information for better usage -*/ -function prepare_column_data($dbms, $column_data, $table_name, $column_name) -{ - global $dbms_type_map, $unsigned_types; - - // Get type - if (strpos($column_data[0], ':') !== false) - { - list($orig_column_type, $column_length) = explode(':', $column_data[0]); - - if (!is_array($dbms_type_map[$dbms][$orig_column_type . ':'])) - { - $column_type = sprintf($dbms_type_map[$dbms][$orig_column_type . ':'], $column_length); - } - else - { - if (isset($dbms_type_map[$dbms][$orig_column_type . ':']['rule'])) - { - switch ($dbms_type_map[$dbms][$orig_column_type . ':']['rule'][0]) - { - case 'div': - $column_length /= $dbms_type_map[$dbms][$orig_column_type . ':']['rule'][1]; - $column_length = ceil($column_length); - $column_type = sprintf($dbms_type_map[$dbms][$orig_column_type . ':'][0], $column_length); - break; - } - } - - if (isset($dbms_type_map[$dbms][$orig_column_type . ':']['limit'])) - { - switch ($dbms_type_map[$dbms][$orig_column_type . ':']['limit'][0]) - { - case 'mult': - $column_length *= $dbms_type_map[$dbms][$orig_column_type . ':']['limit'][1]; - if ($column_length > $dbms_type_map[$dbms][$orig_column_type . ':']['limit'][2]) - { - $column_type = $dbms_type_map[$dbms][$orig_column_type . ':']['limit'][3]; - } - else - { - $column_type = sprintf($dbms_type_map[$dbms][$orig_column_type . ':'][0], $column_length); - } - break; - } - } - } - $orig_column_type .= ':'; - } - else - { - $orig_column_type = $column_data[0]; - $column_type = $dbms_type_map[$dbms][$column_data[0]]; - } - - // Adjust default value if db-dependant specified - if (is_array($column_data[1])) - { - $column_data[1] = (isset($column_data[1][$dbms])) ? $column_data[1][$dbms] : $column_data[1]['default']; - } - - $sql = ''; - $return_array = array(); - - switch ($dbms) - { - case 'firebird': - $sql .= " {$column_type} "; - - if (!is_null($column_data[1])) - { - $sql .= 'DEFAULT ' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ' '; - } - - $sql .= 'NOT NULL'; - - // This is a UNICODE column and thus should be given it's fair share - if (preg_match('/^X?STEXT_UNI|VCHAR_(CI|UNI:?)/', $column_data[0])) - { - $sql .= ' COLLATE UNICODE'; - } - - break; - - case 'mssql': - $sql .= " {$column_type} "; - $sql_default = " {$column_type} "; - - // For adding columns we need the default definition - if (!is_null($column_data[1])) - { - // For hexadecimal values do not use single quotes - if (strpos($column_data[1], '0x') === 0) - { - $sql_default .= 'DEFAULT (' . $column_data[1] . ') '; - } - else - { - $sql_default .= 'DEFAULT (' . ((is_numeric($column_data[1])) ? $column_data[1] : "'{$column_data[1]}'") . ') '; - } - } - - $sql .= 'NOT NULL'; - $sql_default .= 'NOT NULL'; - - $return_array['column_type_sql_default'] = $sql_default; - break; - - case 'mysql': - $sql .= " {$column_type} "; - - // For hexadecimal values do not use single quotes - if (!is_null($column_data[1]) && substr($column_type, -4) !== 'text' && substr($column_type, -4) !== 'blob') - { - $sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' "; - } - $sql .= 'NOT NULL'; - - if (isset($column_data[2])) - { - if ($column_data[2] == 'auto_increment') - { - $sql .= ' auto_increment'; - } - else if ($column_data[2] == 'true_sort') - { - $sql .= ' COLLATE utf8_unicode_ci'; - } - } - - break; - - case 'oracle': - $sql .= " {$column_type} "; - $sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : ''; - - // In Oracle empty strings ('') are treated as NULL. - // Therefore in oracle we allow NULL's for all DEFAULT '' entries - // Oracle does not like setting NOT NULL on a column that is already NOT NULL (this happens only on number fields) - if (preg_match('/number/i', $column_type)) - { - $sql .= ($column_data[1] === '') ? '' : 'NOT NULL'; - } - break; - - case 'postgres': - $return_array['column_type'] = $column_type; - - $sql .= " {$column_type} "; - - if (isset($column_data[2]) && $column_data[2] == 'auto_increment') - { - $default_val = "nextval('{$table_name}_seq')"; - } - else if (!is_null($column_data[1])) - { - $default_val = "'" . $column_data[1] . "'"; - $return_array['null'] = 'NOT NULL'; - $sql .= 'NOT NULL '; - } - - $return_array['default'] = $default_val; - - $sql .= "DEFAULT {$default_val}"; - - // Unsigned? Then add a CHECK contraint - if (in_array($orig_column_type, $unsigned_types)) - { - $return_array['constraint'] = "CHECK ({$column_name} >= 0)"; - $sql .= " CHECK ({$column_name} >= 0)"; - } - break; - - case 'sqlite': - if (isset($column_data[2]) && $column_data[2] == 'auto_increment') - { - $sql .= ' INTEGER PRIMARY KEY'; - } - else - { - $sql .= ' ' . $column_type; - } - - $sql .= ' NOT NULL '; - $sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : ''; - break; - } - - $return_array['column_type_sql'] = $sql; - - return $return_array; -} - -/** -* Add new column -*/ -function sql_column_add($dbms, $table_name, $column_name, $column_data) -{ - global $errored, $error_ary; - - $column_data = prepare_column_data($dbms, $column_data, $table_name, $column_name); - - switch ($dbms) - { - case 'firebird': - $sql = 'ALTER TABLE "' . $table_name . '" ADD "' . $column_name . '" ' . $column_data['column_type_sql']; - _sql($sql, $errored, $error_ary); - break; - - case 'mssql': - $sql = 'ALTER TABLE [' . $table_name . '] ADD [' . $column_name . '] ' . $column_data['column_type_sql_default']; - _sql($sql, $errored, $error_ary); - break; - - case 'mysql': - $sql = 'ALTER TABLE `' . $table_name . '` ADD COLUMN `' . $column_name . '` ' . $column_data['column_type_sql']; - _sql($sql, $errored, $error_ary); - break; - - case 'oracle': - $sql = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' ' . $column_data['column_type_sql']; - _sql($sql, $errored, $error_ary); - break; - - case 'postgres': - $sql = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type_sql']; - _sql($sql, $errored, $error_ary); - break; - - case 'sqlite': - if (version_compare(sqlite_libversion(), '3.0') == -1) - { - global $db; - $sql = "SELECT sql - FROM sqlite_master - WHERE type = 'table' - AND name = '{$table_name}' - ORDER BY type DESC, name;"; - $result = $db->sql_query($sql); - - if (!$result) - { - break; - } - - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $db->sql_transaction('begin'); - - // Create a backup table and populate it, destroy the existing one - $db->sql_query(preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql'])); - $db->sql_query('INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name); - $db->sql_query('DROP TABLE ' . $table_name); - - preg_match('#\((.*)\)#s', $row['sql'], $matches); - - $new_table_cols = trim($matches[1]); - $old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols); - $column_list = array(); - - foreach ($old_table_cols as $declaration) - { - $entities = preg_split('#\s+#', trim($declaration)); - if ($entities[0] == 'PRIMARY') - { - continue; - } - $column_list[] = $entities[0]; - } - - $columns = implode(',', $column_list); - - $new_table_cols = $column_name . ' ' . $column_data['column_type_sql'] . ',' . $new_table_cols; - - // create a new table and fill it up. destroy the temp one - $db->sql_query('CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');'); - $db->sql_query('INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'); - $db->sql_query('DROP TABLE ' . $table_name . '_temp'); - - $db->sql_transaction('commit'); - } - else - { - $sql = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' [' . $column_data['column_type_sql'] . ']'; - _sql($sql, $errored, $error_ary); - } - break; - } -} - -/** -* Drop column -*/ -function sql_column_remove($dbms, $table_name, $column_name) -{ - global $errored, $error_ary; - - switch ($dbms) - { - case 'firebird': - $sql = 'ALTER TABLE "' . $table_name . '" DROP "' . $column_name . '"'; - _sql($sql, $errored, $error_ary); - break; - - case 'mssql': - $sql = 'ALTER TABLE [' . $table_name . '] DROP COLUMN [' . $column_name . ']'; - _sql($sql, $errored, $error_ary); - break; - - case 'mysql': - $sql = 'ALTER TABLE `' . $table_name . '` DROP COLUMN `' . $column_name . '`'; - _sql($sql, $errored, $error_ary); - break; - - case 'oracle': - $sql = 'ALTER TABLE ' . $table_name . ' DROP ' . $column_name; - _sql($sql, $errored, $error_ary); - break; - - case 'postgres': - $sql = 'ALTER TABLE ' . $table_name . ' DROP COLUMN "' . $column_name . '"'; - _sql($sql, $errored, $error_ary); - break; - - case 'sqlite': - if (version_compare(sqlite_libversion(), '3.0') == -1) - { - global $db; - $sql = "SELECT sql - FROM sqlite_master - WHERE type = 'table' - AND name = '{$table_name}' - ORDER BY type DESC, name;"; - $result = $db->sql_query($sql); - - if (!$result) - { - break; - } - - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $db->sql_transaction('begin'); - - // Create a backup table and populate it, destroy the existing one - $db->sql_query(preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql'])); - $db->sql_query('INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name); - $db->sql_query('DROP TABLE ' . $table_name); - - preg_match('#\((.*)\)#s', $row['sql'], $matches); - - $new_table_cols = trim($matches[1]); - $old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols); - $column_list = array(); - - foreach ($old_table_cols as $declaration) - { - $entities = preg_split('#\s+#', trim($declaration)); - if ($entities[0] == 'PRIMARY' || $entities[0] === $column_name) - { - continue; - } - $column_list[] = $entities[0]; - } - - $columns = implode(',', $column_list); - - $new_table_cols = $new_table_cols = preg_replace('/' . $column_name . '[^,]+(?:,|$)/m', '', $new_table_cols); - - // create a new table and fill it up. destroy the temp one - $db->sql_query('CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');'); - $db->sql_query('INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'); - $db->sql_query('DROP TABLE ' . $table_name . '_temp'); - - $db->sql_transaction('commit'); - } - else - { - $sql = 'ALTER TABLE ' . $table_name . ' DROP COLUMN ' . $column_name; - _sql($sql, $errored, $error_ary); - } - break; - } -} - -function sql_index_drop($dbms, $index_name, $table_name) -{ - global $dbms_type_map, $db; - global $errored, $error_ary; - - switch ($dbms) - { - case 'mssql': - $sql = 'DROP INDEX ' . $table_name . '.' . $index_name; - _sql($sql, $errored, $error_ary); - break; - - case 'mysql': - $sql = 'DROP INDEX ' . $index_name . ' ON ' . $table_name; - _sql($sql, $errored, $error_ary); - break; - - case 'firebird': - case 'oracle': - case 'postgres': - case 'sqlite': - $sql = 'DROP INDEX ' . $table_name . '_' . $index_name; - _sql($sql, $errored, $error_ary); - break; - } -} - -function sql_create_primary_key($dbms, $table_name, $column) -{ - global $dbms_type_map, $db; - global $errored, $error_ary; - - switch ($dbms) - { - case 'firebird': - case 'postgres': - $sql = 'ALTER TABLE ' . $table_name . ' ADD PRIMARY KEY (' . implode(', ', $column) . ')'; - _sql($sql, $errored, $error_ary); - break; - - case 'mssql': - $sql = "ALTER TABLE [{$table_name}] WITH NOCHECK ADD "; - $sql .= "CONSTRAINT [PK_{$table_name}] PRIMARY KEY CLUSTERED ("; - $sql .= '[' . implode("],\n\t\t[", $column) . ']'; - $sql .= ') ON [PRIMARY]'; - _sql($sql, $errored, $error_ary); - break; - - case 'mysql': - $sql = 'ALTER TABLE ' . $table_name . ' ADD PRIMARY KEY (' . implode(', ', $column) . ')'; - _sql($sql, $errored, $error_ary); - break; - - case 'oracle': - $sql = 'ALTER TABLE ' . $table_name . 'add CONSTRAINT pk_' . $table_name . ' PRIMARY KEY (' . implode(', ', $column) . ')'; - _sql($sql, $errored, $error_ary); - break; - - case 'sqlite': - $sql = "SELECT sql - FROM sqlite_master - WHERE type = 'table' - AND name = '{$table_name}' - ORDER BY type DESC, name;"; - $result = _sql($sql, $errored, $error_ary); - - if (!$result) - { - break; - } - - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $db->sql_transaction('begin'); - - // Create a backup table and populate it, destroy the existing one - $db->sql_query(preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql'])); - $db->sql_query('INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name); - $db->sql_query('DROP TABLE ' . $table_name); - - preg_match('#\((.*)\)#s', $row['sql'], $matches); - - $new_table_cols = trim($matches[1]); - $old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols); - $column_list = array(); - - foreach ($old_table_cols as $declaration) - { - $entities = preg_split('#\s+#', trim($declaration)); - if ($entities[0] == 'PRIMARY') - { - continue; - } - $column_list[] = $entities[0]; - } - - $columns = implode(',', $column_list); - - // create a new table and fill it up. destroy the temp one - $db->sql_query('CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ', PRIMARY KEY (' . implode(', ', $column) . '));'); - $db->sql_query('INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'); - $db->sql_query('DROP TABLE ' . $table_name . '_temp'); - - $db->sql_transaction('commit'); - break; - } -} - -function sql_create_unique_index($dbms, $index_name, $table_name, $column) -{ - global $dbms_type_map, $db; - global $errored, $error_ary; - - switch ($dbms) - { - case 'firebird': - case 'postgres': - case 'oracle': - case 'sqlite': - $sql = 'CREATE UNIQUE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')'; - _sql($sql, $errored, $error_ary); - break; - - case 'mysql': - $sql = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')'; - _sql($sql, $errored, $error_ary); - break; - - case 'mssql': - $sql = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]'; - _sql($sql, $errored, $error_ary); - break; - } -} - -function sql_create_index($dbms, $index_name, $table_name, $column) -{ - global $dbms_type_map, $db; - global $errored, $error_ary; - - switch ($dbms) - { - case 'firebird': - case 'postgres': - case 'oracle': - case 'sqlite': - $sql = 'CREATE INDEX ' . $table_name . '_' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')'; - _sql($sql, $errored, $error_ary); - break; - - case 'mysql': - $sql = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')'; - _sql($sql, $errored, $error_ary); - break; - - case 'mssql': - $sql = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]'; - _sql($sql, $errored, $error_ary); - break; - } -} - -// List all of the indices that belong to a table, -// does not count: -// * UNIQUE indices -// * PRIMARY keys -function sql_list_index($dbms, $table_name) -{ - global $dbms_type_map, $db; - global $errored, $error_ary; - - $index_array = array(); - - if ($dbms == 'mssql') - { - $sql = "EXEC sp_statistics '$table_name'"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['TYPE'] == 3) - { - $index_array[] = $row['INDEX_NAME']; - } - } - $db->sql_freeresult($result); - } - else - { - switch ($dbms) - { - case 'firebird': - $sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name - FROM RDB\$INDICES - WHERE RDB\$RELATION_NAME = " . strtoupper($table_name) . " - AND RDB\$UNIQUE_FLAG IS NULL - AND RDB\$FOREIGN_KEY IS NULL"; - $col = 'index_name'; - break; - - case 'postgres': - $sql = "SELECT ic.relname as index_name - FROM pg_class bc, pg_class ic, pg_index i - WHERE (bc.oid = i.indrelid) - AND (ic.oid = i.indexrelid) - AND (bc.relname = '" . $table_name . "') - AND (i.indisunique != 't') - AND (i.indisprimary != 't')"; - $col = 'index_name'; - break; - - case 'mysql': - $sql = 'SHOW KEYS - FROM ' . $table_name; - $col = 'Key_name'; - break; - - case 'oracle': - $sql = "SELECT index_name - FROM user_indexes - WHERE table_name = '" . $table_name . "' - AND generated = 'N'"; - break; - - case 'sqlite': - $sql = "PRAGMA index_info('" . $table_name . "');"; - $col = 'name'; - break; - } - - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - if ($dbms == 'mysql' && !$row['Non_unique']) - { - continue; - } - - switch ($dbms) - { - case 'firebird': - case 'oracle': - case 'postgres': - case 'sqlite': - $row[$col] = substr($row[$col], strlen($table_name) + 1); - break; - } - - $index_array[] = $row[$col]; - } - $db->sql_freeresult($result); - } - - return array_map('strtolower', $index_array); -} - -// This is totally fake, never use it -// it exists only to mend bad update functions introduced -// * UNIQUE indices -// * PRIMARY keys -function sql_list_fake($dbms, $table_name) -{ - global $dbms_type_map, $db; - global $errored, $error_ary; - - $index_array = array(); - - if ($dbms == 'mssql') - { - $sql = "EXEC sp_statistics '$table_name'"; - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['TYPE'] == 3) - { - $index_array[] = $row['INDEX_NAME']; - } - } - $db->sql_freeresult($result); - } - else - { - switch ($dbms) - { - case 'firebird': - $sql = "SELECT LOWER(RDB\$INDEX_NAME) as index_name - FROM RDB\$INDICES - WHERE RDB\$RELATION_NAME = " . strtoupper($table_name) . " - AND RDB\$UNIQUE_FLAG IS NULL - AND RDB\$FOREIGN_KEY IS NULL"; - $col = 'index_name'; - break; - - case 'postgres': - $sql = "SELECT ic.relname as index_name - FROM pg_class bc, pg_class ic, pg_index i - WHERE (bc.oid = i.indrelid) - AND (ic.oid = i.indexrelid) - AND (bc.relname = '" . $table_name . "') - AND (i.indisunique != 't') - AND (i.indisprimary != 't')"; - $col = 'index_name'; - break; - - case 'mysql': - $sql = 'SHOW KEYS - FROM ' . $table_name; - $col = 'Key_name'; - break; - - case 'oracle': - $sql = "SELECT index_name - FROM user_indexes - WHERE table_name = '" . $table_name . "' - AND generated = 'N'"; - break; - - case 'sqlite': - $sql = "PRAGMA index_info('" . $table_name . "');"; - $col = 'name'; - break; - } - - $result = $db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) - { - if ($dbms == 'mysql' && !$row['Non_unique']) - { - continue; - } - - $index_array[] = $row[$col]; - } - $db->sql_freeresult($result); - } - - return array_map('strtolower', $index_array); -} - -/** -* Change column type (not name!) -*/ -function sql_column_change($dbms, $table_name, $column_name, $column_data) -{ - global $dbms_type_map, $db; - global $errored, $error_ary; - - $column_data = prepare_column_data($dbms, $column_data, $table_name, $column_name); - - switch ($dbms) - { - case 'firebird': - // Change type... - $sql = 'ALTER TABLE "' . $table_name . '" ALTER COLUMN "' . $column_name . '" TYPE ' . ' ' . $column_data['column_type_sql']; - _sql($sql, $errored, $error_ary); - break; - - case 'mssql': - $sql = 'ALTER TABLE [' . $table_name . '] ALTER COLUMN [' . $column_name . '] ' . $column_data['column_type_sql']; - _sql($sql, $errored, $error_ary); - break; - - case 'mysql': - $sql = 'ALTER TABLE `' . $table_name . '` CHANGE `' . $column_name . '` `' . $column_name . '` ' . $column_data['column_type_sql']; - _sql($sql, $errored, $error_ary); - break; - - case 'oracle': - $sql = 'ALTER TABLE ' . $table_name . ' MODIFY ' . $column_name . ' ' . $column_data['column_type_sql']; - _sql($sql, $errored, $error_ary); - break; - - case 'postgres': - $sql = 'ALTER TABLE ' . $table_name . ' '; - - $sql_array = array(); - $sql_array[] = 'ALTER COLUMN ' . $column_name . ' TYPE ' . $column_data['column_type']; - - if (isset($column_data['null'])) - { - if ($column_data['null'] == 'NOT NULL') - { - $sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET NOT NULL'; - } - else if ($column_data['null'] == 'NULL') - { - $sql_array[] = 'ALTER COLUMN ' . $column_name . ' DROP NOT NULL'; - } - } - - if (isset($column_data['default'])) - { - $sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET DEFAULT ' . $column_data['default']; - } - - // we don't want to double up on constraints if we change different number data types - if (isset($column_data['constraint'])) - { - $constraint_sql = "SELECT consrc as constraint_data - FROM pg_constraint, pg_class bc - WHERE conrelid = bc.oid - AND bc.relname = '{$table_name}' - AND NOT EXISTS ( - SELECT * - FROM pg_constraint as c, pg_inherits as i - WHERE i.inhrelid = pg_constraint.conrelid - AND c.conname = pg_constraint.conname - AND c.consrc = pg_constraint.consrc - AND c.conrelid = i.inhparent - )"; - - $constraint_exists = false; - - $result = $db->sql_query($constraint_sql); - while ($row = $db->sql_fetchrow($result)) - { - if (trim($row['constraint_data']) == trim($column_data['constraint'])) - { - $constraint_exists = true; - break; - } - } - $db->sql_freeresult($result); - - if (!$constraint_exists) - { - $sql_array[] = 'ADD ' . $column_data['constraint']; - } - } - - $sql .= implode(', ', $sql_array); - - _sql($sql, $errored, $error_ary); - break; - - case 'sqlite': - - $sql = "SELECT sql - FROM sqlite_master - WHERE type = 'table' - AND name = '{$table_name}' - ORDER BY type DESC, name;"; - $result = _sql($sql, $errored, $error_ary); - - if (!$result) - { - break; - } - - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $db->sql_transaction('begin'); - - // Create a temp table and populate it, destroy the existing one - $db->sql_query(preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql'])); - $db->sql_query('INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name); - $db->sql_query('DROP TABLE ' . $table_name); - - preg_match('#\((.*)\)#s', $row['sql'], $matches); - - $new_table_cols = trim($matches[1]); - $old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols); - $column_list = array(); - - foreach ($old_table_cols as $key => $declaration) - { - $entities = preg_split('#\s+#', trim($declaration)); - $column_list[] = $entities[0]; - if ($entities[0] == $column_name) - { - $old_table_cols[$key] = $column_name . ' ' . $column_data['column_type_sql']; - } - } - - $columns = implode(',', $column_list); - - // create a new table and fill it up. destroy the temp one - $db->sql_query('CREATE TABLE ' . $table_name . ' (' . implode(',', $old_table_cols) . ');'); - $db->sql_query('INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'); - $db->sql_query('DROP TABLE ' . $table_name . '_temp'); - - $db->sql_transaction('commit'); - - break; - } -} - -?> \ No newline at end of file diff --git a/phpBB/download/index.htm b/phpBB/install/index.htm old mode 100755 new mode 100644 similarity index 100% rename from phpBB/download/index.htm rename to phpBB/install/index.htm diff --git a/phpBB/install/index.php b/phpBB/install/index.php deleted file mode 100755 index 02d379a50f..0000000000 --- a/phpBB/install/index.php +++ /dev/null @@ -1,805 +0,0 @@ - true, - '_GET' => true, - '_POST' => true, - '_COOKIE' => true, - '_REQUEST' => true, - '_SERVER' => true, - '_SESSION' => true, - '_ENV' => true, - '_FILES' => true, - 'phpEx' => true, - 'phpbb_root_path' => true - ); - - // Not only will array_merge and array_keys give a warning if - // a parameter is not an array, array_merge will actually fail. - // So we check if _SESSION has been initialised. - if (!isset($_SESSION) || !is_array($_SESSION)) - { - $_SESSION = array(); - } - - // Merge all into one extremely huge array; unset this later - $input = array_merge( - array_keys($_GET), - array_keys($_POST), - array_keys($_COOKIE), - array_keys($_SERVER), - array_keys($_SESSION), - array_keys($_ENV), - array_keys($_FILES) - ); - - foreach ($input as $varname) - { - if (isset($not_unset[$varname])) - { - // Hacking attempt. No point in continuing unless it's a COOKIE - if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) - { - exit; - } - else - { - $cookie = &$_COOKIE; - while (isset($cookie['GLOBALS'])) - { - foreach ($cookie['GLOBALS'] as $registered_var => $value) - { - if (!isset($not_unset[$registered_var])) - { - unset($GLOBALS[$registered_var]); - } - } - $cookie = &$cookie['GLOBALS']; - } - } - } - - unset($GLOBALS[$varname]); - } - - unset($input); -} - -// If we are on PHP >= 6.0.0 we do not need some code -if (version_compare(PHP_VERSION, '6.0.0-dev', '>=')) -{ - /** - * @ignore - */ - define('STRIP', false); -} -else -{ - set_magic_quotes_runtime(0); - - // Be paranoid with passed vars - if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') - { - deregister_globals(); - } - - define('STRIP', (get_magic_quotes_gpc()) ? true : false); -} - -// Try to override some limits - maybe it helps some... -@set_time_limit(0); -$mem_limit = @ini_get('memory_limit'); -if (!empty($mem_limit)) -{ - $unit = strtolower(substr($mem_limit, -1, 1)); - $mem_limit = (int) $mem_limit; - - if ($unit == 'k') - { - $mem_limit = floor($mem_limit / 1024); - } - else if ($unit == 'g') - { - $mem_limit *= 1024; - } - else if (is_numeric($unit)) - { - $mem_limit = floor((int) ($mem_limit . $unit) / 1048576); - } - $mem_limit = max(128, $mem_limit) . 'M'; -} -else -{ - $mem_limit = '128M'; -} -@ini_set('memory_limit', $mem_limit); - -// Include essential scripts -require($phpbb_root_path . 'includes/functions.' . $phpEx); - -if (file_exists($phpbb_root_path . 'includes/functions_content.' . $phpEx)) -{ - require($phpbb_root_path . 'includes/functions_content.' . $phpEx); -} - -include($phpbb_root_path . 'includes/auth.' . $phpEx); -include($phpbb_root_path . 'includes/session.' . $phpEx); -include($phpbb_root_path . 'includes/template.' . $phpEx); -include($phpbb_root_path . 'includes/acm/acm_file.' . $phpEx); -include($phpbb_root_path . 'includes/cache.' . $phpEx); -include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); -include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); -require($phpbb_root_path . 'includes/functions_install.' . $phpEx); - -// Try and load an appropriate language if required -$language = basename(request_var('language', '')); - -if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !$language) -{ - $accept_lang_ary = explode(',', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE'])); - foreach ($accept_lang_ary as $accept_lang) - { - // Set correct format ... guess full xx_yy form - $accept_lang = substr($accept_lang, 0, 2) . '_' . substr($accept_lang, 3, 2); - - if (file_exists($phpbb_root_path . 'language/' . $accept_lang)) - { - $language = $accept_lang; - break; - } - else - { - // No match on xx_yy so try xx - $accept_lang = substr($accept_lang, 0, 2); - if (file_exists($phpbb_root_path . 'language/' . $accept_lang)) - { - $language = $accept_lang; - break; - } - } - } -} - -// No appropriate language found ... so let's use the first one in the language -// dir, this may or may not be English -if (!$language) -{ - $dir = @opendir($phpbb_root_path . 'language'); - - if (!$dir) - { - die('Unable to access the language directory'); - exit; - } - - while (($file = readdir($dir)) !== false) - { - $path = $phpbb_root_path . 'language/' . $file; - - if (!is_file($path) && !is_link($path) && file_exists($path . '/iso.txt')) - { - $language = $file; - break; - } - } - closedir($dir); -} - -if (!file_exists($phpbb_root_path . 'language/' . $language)) -{ - die('No language found!'); -} - -// And finally, load the relevant language files -include($phpbb_root_path . 'language/' . $language . '/common.' . $phpEx); -include($phpbb_root_path . 'language/' . $language . '/acp/common.' . $phpEx); -include($phpbb_root_path . 'language/' . $language . '/acp/board.' . $phpEx); -include($phpbb_root_path . 'language/' . $language . '/install.' . $phpEx); -include($phpbb_root_path . 'language/' . $language . '/posting.' . $phpEx); - -$mode = request_var('mode', 'overview'); -$sub = request_var('sub', ''); - -// Set PHP error handler to ours -set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler'); - -$user = new user(); -$auth = new auth(); -$cache = new acm(); -$template = new template(); - -// Add own hook handler, if present. :o -if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx)) -{ - require($phpbb_root_path . 'includes/hooks/index.' . $phpEx); - $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display'))); - - foreach (cache::obtain_hooks() as $hook) - { - @include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx); - } -} -else -{ - $phpbb_hook = false; -} - -// Set some standard variables we want to force -$config = array( - 'load_tplcompile' => '1' -); - -$template->set_custom_template('../adm/style', 'admin'); -$template->assign_var('T_TEMPLATE_PATH', '../adm/style'); - -// the acp template is never stored in the database -$user->theme['template_storedb'] = false; - -$install = new module(); - -$install->create('install', "index.$phpEx", $mode, $sub); -$install->load(); - -// Generate the page -$install->page_header(); -$install->generate_navigation(); - -$template->set_filenames(array( - 'body' => $install->get_tpl_name()) -); - -$install->page_footer(); - -/** -* @package install -*/ -class module -{ - var $id = 0; - var $type = 'install'; - var $module_ary = array(); - var $filename; - var $module_url = ''; - var $tpl_name = ''; - var $mode; - var $sub; - - /** - * Private methods, should not be overwritten - */ - function create($module_type, $module_url, $selected_mod = false, $selected_submod = false) - { - global $db, $config, $phpEx, $phpbb_root_path; - - $module = array(); - - // Grab module information using Bart's "neat-o-module" system (tm) - $dir = @opendir('.'); - - if (!$dir) - { - $this->error('Unable to access the installation directory', __LINE__, __FILE__); - } - - $setmodules = 1; - while (($file = readdir($dir)) !== false) - { - if (preg_match('#^install_(.*?)\.' . $phpEx . '$#', $file)) - { - include($file); - } - } - closedir($dir); - - unset($setmodules); - - if (!sizeof($module)) - { - $this->error('No installation modules found', __LINE__, __FILE__); - } - - // Order to use and count further if modules get assigned to the same position or not having an order - $max_module_order = 1000; - - foreach ($module as $row) - { - // Check any module pre-reqs - if ($row['module_reqs'] != '') - { - } - - // Module order not specified or module already assigned at this position? - if (!isset($row['module_order']) || isset($this->module_ary[$row['module_order']])) - { - $row['module_order'] = $max_module_order; - $max_module_order++; - } - - $this->module_ary[$row['module_order']]['name'] = $row['module_title']; - $this->module_ary[$row['module_order']]['filename'] = $row['module_filename']; - $this->module_ary[$row['module_order']]['subs'] = $row['module_subs']; - $this->module_ary[$row['module_order']]['stages'] = $row['module_stages']; - - if (strtolower($selected_mod) == strtolower($row['module_title'])) - { - $this->id = (int) $row['module_order']; - $this->filename = (string) $row['module_filename']; - $this->module_url = (string) $module_url; - $this->mode = (string) $selected_mod; - // Check that the sub-mode specified is valid or set a default if not - if (is_array($row['module_subs'])) - { - $this->sub = strtolower((in_array(strtoupper($selected_submod), $row['module_subs'])) ? $selected_submod : $row['module_subs'][0]); - } - else if (is_array($row['module_stages'])) - { - $this->sub = strtolower((in_array(strtoupper($selected_submod), $row['module_stages'])) ? $selected_submod : $row['module_stages'][0]); - } - else - { - $this->sub = ''; - } - } - } // END foreach - } // END create - - /** - * Load and run the relevant module if applicable - */ - function load($mode = false, $run = true) - { - global $phpbb_root_path, $phpEx; - - if ($run) - { - if (!empty($mode)) - { - $this->mode = $mode; - } - - $module = $this->filename; - if (!class_exists($module)) - { - $this->error('Module "' . htmlspecialchars($module) . '" not accessible.', __LINE__, __FILE__); - } - $this->module = new $module($this); - - if (method_exists($this->module, 'main')) - { - $this->module->main($this->mode, $this->sub); - } - } - } - - /** - * Output the standard page header - */ - function page_header() - { - if (defined('HEADER_INC')) - { - return; - } - - define('HEADER_INC', true); - global $template, $lang, $stage, $phpbb_root_path; - - $template->assign_vars(array( - 'L_CHANGE' => $lang['CHANGE'], - 'L_INSTALL_PANEL' => $lang['INSTALL_PANEL'], - 'L_SELECT_LANG' => $lang['SELECT_LANG'], - 'L_SKIP' => $lang['SKIP'], - 'PAGE_TITLE' => $this->get_page_title(), - 'T_IMAGE_PATH' => $phpbb_root_path . 'adm/images/', - - 'S_CONTENT_DIRECTION' => $lang['DIRECTION'], - 'S_CONTENT_FLOW_BEGIN' => ($lang['DIRECTION'] == 'ltr') ? 'left' : 'right', - 'S_CONTENT_FLOW_END' => ($lang['DIRECTION'] == 'ltr') ? 'right' : 'left', - 'S_CONTENT_ENCODING' => 'UTF-8', - - 'S_USER_LANG' => $lang['USER_LANG'], - ) - ); - - header('Content-type: text/html; charset=UTF-8'); - header('Cache-Control: private, no-cache="set-cookie"'); - header('Expires: 0'); - header('Pragma: no-cache'); - - return; - } - - /** - * Output the standard page footer - */ - function page_footer() - { - global $db, $template; - - $template->display('body'); - - // Close our DB connection. - if (!empty($db) && is_object($db)) - { - $db->sql_close(); - } - - if (function_exists('exit_handler')) - { - exit_handler(); - } - } - - /** - * Returns desired template name - */ - function get_tpl_name() - { - return $this->module->tpl_name . '.html'; - } - - /** - * Returns the desired page title - */ - function get_page_title() - { - global $lang; - - if (!isset($this->module->page_title)) - { - return ''; - } - - return (isset($lang[$this->module->page_title])) ? $lang[$this->module->page_title] : $this->module->page_title; - } - - /** - * Generate an HTTP/1.1 header to redirect the user to another page - * This is used during the installation when we do not have a database available to call the normal redirect function - * @param string $page The page to redirect to relative to the installer root path - */ - function redirect($page) - { - // HTTP_HOST is having the correct browser url in most cases... - $server_name = (!empty($_SERVER['HTTP_HOST'])) ? strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME')); - $server_port = (!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT'); - $secure = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 1 : 0; - - $script_name = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : getenv('PHP_SELF'); - if (!$script_name) - { - $script_name = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : getenv('REQUEST_URI'); - } - - // Replace backslashes and doubled slashes (could happen on some proxy setups) - $script_name = str_replace(array('\\', '//'), '/', $script_name); - $script_path = trim(dirname($script_name)); - - $url = (($secure) ? 'https://' : 'http://') . $server_name; - - if ($server_port && (($secure && $server_port <> 443) || (!$secure && $server_port <> 80))) - { - // HTTP HOST can carry a port number... - if (strpos($server_name, ':') === false) - { - $url .= ':' . $server_port; - } - } - - $url .= $script_path . '/' . $page; - header('Location: ' . $url); - exit; - } - - /** - * Generate the navigation tabs - */ - function generate_navigation() - { - global $lang, $template, $phpEx, $language; - - if (is_array($this->module_ary)) - { - @ksort($this->module_ary); - foreach ($this->module_ary as $cat_ary) - { - $cat = $cat_ary['name']; - $l_cat = (!empty($lang['CAT_' . $cat])) ? $lang['CAT_' . $cat] : preg_replace('#_#', ' ', $cat); - $cat = strtolower($cat); - $url = $this->module_url . "?mode=$cat&language=$language"; - - if ($this->mode == $cat) - { - $template->assign_block_vars('t_block1', array( - 'L_TITLE' => $l_cat, - 'S_SELECTED' => true, - 'U_TITLE' => $url, - )); - - if (is_array($this->module_ary[$this->id]['subs'])) - { - $subs = $this->module_ary[$this->id]['subs']; - foreach ($subs as $option) - { - $l_option = (!empty($lang['SUB_' . $option])) ? $lang['SUB_' . $option] : preg_replace('#_#', ' ', $option); - $option = strtolower($option); - $url = $this->module_url . '?mode=' . $this->mode . "&sub=$option&language=$language"; - - $template->assign_block_vars('l_block1', array( - 'L_TITLE' => $l_option, - 'S_SELECTED' => ($this->sub == $option), - 'U_TITLE' => $url, - )); - } - } - - if (is_array($this->module_ary[$this->id]['stages'])) - { - $subs = $this->module_ary[$this->id]['stages']; - $matched = false; - foreach ($subs as $option) - { - $l_option = (!empty($lang['STAGE_' . $option])) ? $lang['STAGE_' . $option] : preg_replace('#_#', ' ', $option); - $option = strtolower($option); - $matched = ($this->sub == $option) ? true : $matched; - - $template->assign_block_vars('l_block2', array( - 'L_TITLE' => $l_option, - 'S_SELECTED' => ($this->sub == $option), - 'S_COMPLETE' => !$matched, - )); - } - } - } - else - { - $template->assign_block_vars('t_block1', array( - 'L_TITLE' => $l_cat, - 'S_SELECTED' => false, - 'U_TITLE' => $url, - )); - } - } - } - } - - /** - * Output an error message - * If skip is true, return and continue execution, else exit - */ - function error($error, $line, $file, $skip = false) - { - global $lang, $db, $template; - - if ($skip) - { - $template->assign_block_vars('checks', array( - 'S_LEGEND' => true, - 'LEGEND' => $lang['INST_ERR'], - )); - - $template->assign_block_vars('checks', array( - 'TITLE' => basename($file) . ' [ ' . $line . ' ]', - 'RESULT' => '' . $error . '', - )); - - return; - } - - echo ''; - echo ''; - echo ''; - echo ''; - echo '' . $lang['INST_ERR_FATAL'] . ''; - echo ''; - echo ''; - echo ''; - echo '
    '; - echo ' '; - echo '
    '; - echo '
    '; - echo '
    '; - echo ' '; - echo '
    '; - echo '

    ' . $lang['INST_ERR_FATAL'] . '

    '; - echo '

    ' . $lang['INST_ERR_FATAL'] . "

    \n"; - echo '

    ' . basename($file) . ' [ ' . $line . " ]

    \n"; - echo '

    ' . $error . "

    \n"; - echo '
    '; - echo ' '; - echo '
    '; - echo '
    '; - echo '
    '; - echo ' '; - echo '
    '; - echo ''; - echo ''; - - if (!empty($db) && is_object($db)) - { - $db->sql_close(); - } - - exit_handler(); - } - - /** - * Output an error message for a database related problem - * If skip is true, return and continue execution, else exit - */ - function db_error($error, $sql, $line, $file, $skip = false) - { - global $lang, $db, $template; - - if ($skip) - { - $template->assign_block_vars('checks', array( - 'S_LEGEND' => true, - 'LEGEND' => $lang['INST_ERR_FATAL'], - )); - - $template->assign_block_vars('checks', array( - 'TITLE' => basename($file) . ' [ ' . $line . ' ]', - 'RESULT' => '' . $error . '
    » SQL:' . $sql, - )); - - return; - } - - $template->set_filenames(array( - 'body' => 'install_error.html') - ); - $this->page_header(); - $this->generate_navigation(); - - $template->assign_vars(array( - 'MESSAGE_TITLE' => $lang['INST_ERR_FATAL_DB'], - 'MESSAGE_TEXT' => '

    ' . basename($file) . ' [ ' . $line . ' ]

    SQL : ' . $sql . '

    ' . $error . '

    ', - )); - - // Rollback if in transaction - if ($db->transaction) - { - $db->sql_transaction('rollback'); - } - - $this->page_footer(); - } - - /** - * Generate the relevant HTML for an input field and the associated label and explanatory text - */ - function input_field($name, $type, $value='', $options='') - { - global $lang; - $tpl_type = explode(':', $type); - $tpl = ''; - - switch ($tpl_type[0]) - { - case 'text': - case 'password': - $size = (int) $tpl_type[1]; - $maxlength = (int) $tpl_type[2]; - - $tpl = ''; - break; - - case 'textarea': - $rows = (int) $tpl_type[1]; - $cols = (int) $tpl_type[2]; - - $tpl = ''; - break; - - case 'radio': - $key_yes = ($value) ? ' checked="checked" id="' . $name . '"' : ''; - $key_no = (!$value) ? ' checked="checked" id="' . $name . '"' : ''; - - $tpl_type_cond = explode('_', $tpl_type[1]); - $type_no = ($tpl_type_cond[0] == 'disabled' || $tpl_type_cond[0] == 'enabled') ? false : true; - - $tpl_no = ''; - $tpl_yes = ''; - - $tpl = ($tpl_type_cond[0] == 'yes' || $tpl_type_cond[0] == 'enabled') ? $tpl_yes . '  ' . $tpl_no : $tpl_no . '  ' . $tpl_yes; - break; - - case 'select': - eval('$s_options = ' . str_replace('{VALUE}', $value, $options) . ';'); - $tpl = ''; - break; - - case 'custom': - eval('$tpl = ' . str_replace('{VALUE}', $value, $options) . ';'); - break; - - default: - break; - } - - return $tpl; - } - - /** - * Generate the drop down of available language packs - */ - function inst_language_select($default = '') - { - global $phpbb_root_path, $phpEx; - - $dir = @opendir($phpbb_root_path . 'language'); - - if (!$dir) - { - $this->error('Unable to access the language directory', __LINE__, __FILE__); - } - - while ($file = readdir($dir)) - { - $path = $phpbb_root_path . 'language/' . $file; - - if ($file == '.' || $file == '..' || is_link($path) || is_file($path) || $file == 'CVS') - { - continue; - } - - if (file_exists($path . '/iso.txt')) - { - list($displayname, $localname) = @file($path . '/iso.txt'); - $lang[$localname] = $file; - } - } - closedir($dir); - - @asort($lang); - @reset($lang); - - $user_select = ''; - foreach ($lang as $displayname => $filename) - { - $selected = (strtolower($default) == strtolower($filename)) ? ' selected="selected"' : ''; - $user_select .= ''; - } - - return $user_select; - } -} - -?> \ No newline at end of file diff --git a/phpBB/install/install.php b/phpBB/install/install.php new file mode 100644 index 0000000000..35b99804a2 --- /dev/null +++ b/phpBB/install/install.php @@ -0,0 +1,1049 @@ + + + + + + +<?php echo $lang['Welcome_install'];?> + + + + + + + + + +
    + + + + + + + + + + + + + + + +
    + + + + +
    Forum Home


    + + + +


    + +
    + + + + + + + + + + + + + + + + + + + + + + 'ar([_-][a-z]+)?', + 'bulgarian' => 'bg', + 'catalan' => 'ca', + 'czech' => 'cs', + 'danish' => 'da', + 'german' => 'de([_-][a-z]+)?', + 'english' => 'en([_-][a-z]+)?', + 'estonian' => 'et', + 'finnish' => 'fi', + 'french' => 'fr([_-][a-z]+)?', + 'greek' => 'el', + 'spanish_argentina' => 'es[_-]ar', + 'spanish' => 'es([_-][a-z]+)?', + 'gaelic' => 'gd', + 'galego' => 'gl', + 'gujarati' => 'gu', + 'hebrew' => 'he', + 'hindi' => 'hi', + 'croatian' => 'hr', + 'hungarian' => 'hu', + 'icelandic' => 'is', + 'indonesian' => 'id([_-][a-z]+)?', + 'italian' => 'it([_-][a-z]+)?', + 'japanese' => 'ja([_-][a-z]+)?', + 'korean' => 'ko([_-][a-z]+)?', + 'latvian' => 'lv', + 'lithuanian' => 'lt', + 'macedonian' => 'mk', + 'dutch' => 'nl([_-][a-z]+)?', + 'norwegian' => 'no', + 'punjabi' => 'pa', + 'polish' => 'pl', + 'portuguese_brazil' => 'pt[_-]br', + 'portuguese' => 'pt([_-][a-z]+)?', + 'romanian' => 'ro([_-][a-z]+)?', + 'russian' => 'ru([_-][a-z]+)?', + 'slovenian' => 'sl([_-][a-z]+)?', + 'albanian' => 'sq', + 'serbian' => 'sr([_-][a-z]+)?', + 'slovak' => 'sv([_-][a-z]+)?', + 'swedish' => 'sv([_-][a-z]+)?', + 'thai' => 'th([_-][a-z]+)?', + 'turkish' => 'tr([_-][a-z]+)?', + 'ukranian' => 'uk([_-][a-z]+)?', + 'urdu' => 'ur', + 'viatnamese' => 'vi', + 'chinese_traditional_taiwan'=> 'zh[_-]tw', + 'chinese_simplified' => 'zh', + ); + + if (isset($HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE'])) + { + $accept_lang_ary = explode(',', $HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE']); + for ($i = 0; $i < sizeof($accept_lang_ary); $i++) + { + @reset($match_lang); + while (list($lang, $match) = each($match_lang)) + { + if (preg_match('#' . $match . '#i', trim($accept_lang_ary[$i]))) + { + if (file_exists(@phpbb_realpath($phpbb_root_path . 'language/lang_' . $lang))) + { + return $lang; + } + } + } + } + } + + return 'english'; + +} +// +// FUNCTIONS +// --------- + +// Begin +error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables +set_magic_quotes_runtime(0); // Disable magic_quotes_runtime + +// PHP5 with register_long_arrays off? +if (!isset($HTTP_POST_VARS) && isset($_POST)) +{ + $HTTP_POST_VARS = $_POST; + $HTTP_GET_VARS = $_GET; + $HTTP_SERVER_VARS = $_SERVER; + $HTTP_COOKIE_VARS = $_COOKIE; + $HTTP_ENV_VARS = $_ENV; + $HTTP_POST_FILES = $_FILES; + + // _SESSION is the only superglobal which is conditionally set + if (isset($_SESSION)) + { + $HTTP_SESSION_VARS = $_SESSION; + } +} + +// Slash data if it isn't slashed +if (!get_magic_quotes_gpc()) +{ + if (is_array($HTTP_GET_VARS)) + { + while (list($k, $v) = each($HTTP_GET_VARS)) + { + if (is_array($HTTP_GET_VARS[$k])) + { + while (list($k2, $v2) = each($HTTP_GET_VARS[$k])) + { + $HTTP_GET_VARS[$k][$k2] = addslashes($v2); + } + @reset($HTTP_GET_VARS[$k]); + } + else + { + $HTTP_GET_VARS[$k] = addslashes($v); + } + } + @reset($HTTP_GET_VARS); + } + + if (is_array($HTTP_POST_VARS)) + { + while (list($k, $v) = each($HTTP_POST_VARS)) + { + if (is_array($HTTP_POST_VARS[$k])) + { + while (list($k2, $v2) = each($HTTP_POST_VARS[$k])) + { + $HTTP_POST_VARS[$k][$k2] = addslashes($v2); + } + @reset($HTTP_POST_VARS[$k]); + } + else + { + $HTTP_POST_VARS[$k] = addslashes($v); + } + } + @reset($HTTP_POST_VARS); + } + + if (is_array($HTTP_COOKIE_VARS)) + { + while (list($k, $v) = each($HTTP_COOKIE_VARS)) + { + if (is_array($HTTP_COOKIE_VARS[$k])) + { + while (list($k2, $v2) = each($HTTP_COOKIE_VARS[$k])) + { + $HTTP_COOKIE_VARS[$k][$k2] = addslashes($v2); + } + @reset($HTTP_COOKIE_VARS[$k]); + } + else + { + $HTTP_COOKIE_VARS[$k] = addslashes($v); + } + } + @reset($HTTP_COOKIE_VARS); + } +} + +// Begin main prog +define('IN_PHPBB', true); +// Uncomment the following line to completely disable the ftp option... +// define('NO_FTP', true); +$phpbb_root_path = './../'; +include($phpbb_root_path.'extension.inc'); + +// Initialise some basic arrays +$userdata = array(); +$lang = array(); +$error = false; + +// Include some required functions +include($phpbb_root_path.'includes/constants.'.$phpEx); +include($phpbb_root_path.'includes/functions.'.$phpEx); +include($phpbb_root_path.'includes/sessions.'.$phpEx); + +// Define schema info +$available_dbms = array( + 'mysql'=> array( + 'LABEL' => 'MySQL 3.x', + 'SCHEMA' => 'mysql', + 'DELIM' => ';', + 'DELIM_BASIC' => ';', + 'COMMENTS' => 'remove_remarks' + ), + 'mysql4' => array( + 'LABEL' => 'MySQL 4.x/5.x', + 'SCHEMA' => 'mysql', + 'DELIM' => ';', + 'DELIM_BASIC' => ';', + 'COMMENTS' => 'remove_remarks' + ), + 'postgres' => array( + 'LABEL' => 'PostgreSQL 7.x', + 'SCHEMA' => 'postgres', + 'DELIM' => ';', + 'DELIM_BASIC' => ';', + 'COMMENTS' => 'remove_comments' + ), + 'mssql' => array( + 'LABEL' => 'MS SQL Server 7/2000', + 'SCHEMA' => 'mssql', + 'DELIM' => 'GO', + 'DELIM_BASIC' => ';', + 'COMMENTS' => 'remove_comments' + ), + 'msaccess' => array( + 'LABEL' => 'MS Access [ ODBC ]', + 'SCHEMA' => '', + 'DELIM' => '', + 'DELIM_BASIC' => ';', + 'COMMENTS' => '' + ), + 'mssql-odbc' => array( + 'LABEL' => 'MS SQL Server [ ODBC ]', + 'SCHEMA' => 'mssql', + 'DELIM' => 'GO', + 'DELIM_BASIC' => ';', + 'COMMENTS' => 'remove_comments' + ) +); + +// Obtain various vars +$confirm = (isset($HTTP_POST_VARS['confirm'])) ? true : false; +$cancel = (isset($HTTP_POST_VARS['cancel'])) ? true : false; + +if (isset($HTTP_POST_VARS['install_step']) || isset($HTTP_GET_VARS['install_step'])) +{ + $install_step = (isset($HTTP_POST_VARS['install_step'])) ? $HTTP_POST_VARS['install_step'] : $HTTP_GET_VARS['install_step']; +} +else +{ + $install_step = ''; +} + +$upgrade = (!empty($HTTP_POST_VARS['upgrade'])) ? $HTTP_POST_VARS['upgrade']: ''; +$upgrade_now = (!empty($HTTP_POST_VARS['upgrade_now'])) ? $HTTP_POST_VARS['upgrade_now']:''; + +$dbms = isset($HTTP_POST_VARS['dbms']) ? $HTTP_POST_VARS['dbms'] : ''; + +$dbhost = (!empty($HTTP_POST_VARS['dbhost'])) ? $HTTP_POST_VARS['dbhost'] : 'localhost'; +$dbuser = (!empty($HTTP_POST_VARS['dbuser'])) ? $HTTP_POST_VARS['dbuser'] : ''; +$dbpasswd = (!empty($HTTP_POST_VARS['dbpasswd'])) ? $HTTP_POST_VARS['dbpasswd'] : ''; +$dbname = (!empty($HTTP_POST_VARS['dbname'])) ? $HTTP_POST_VARS['dbname'] : ''; + +$table_prefix = (!empty($HTTP_POST_VARS['prefix'])) ? $HTTP_POST_VARS['prefix'] : ''; + +$admin_name = (!empty($HTTP_POST_VARS['admin_name'])) ? $HTTP_POST_VARS['admin_name'] : ''; +$admin_pass1 = (!empty($HTTP_POST_VARS['admin_pass1'])) ? $HTTP_POST_VARS['admin_pass1'] : ''; +$admin_pass2 = (!empty($HTTP_POST_VARS['admin_pass2'])) ? $HTTP_POST_VARS['admin_pass2'] : ''; + +$ftp_path = (!empty($HTTP_POST_VARS['ftp_path'])) ? $HTTP_POST_VARS['ftp_path'] : ''; +$ftp_user = (!empty($HTTP_POST_VARS['ftp_user'])) ? $HTTP_POST_VARS['ftp_user'] : ''; +$ftp_pass = (!empty($HTTP_POST_VARS['ftp_pass'])) ? $HTTP_POST_VARS['ftp_pass'] : ''; + +if (isset($HTTP_POST_VARS['lang']) && preg_match('#^[a-z_]+$#', $HTTP_POST_VARS['lang'])) +{ + $language = strip_tags($HTTP_POST_VARS['lang']); +} +else +{ + $language = guess_lang(); +} + +$board_email = (!empty($HTTP_POST_VARS['board_email'])) ? $HTTP_POST_VARS['board_email'] : ''; +$script_path = (!empty($HTTP_POST_VARS['script_path'])) ? $HTTP_POST_VARS['script_path'] : str_replace('install', '', dirname($HTTP_SERVER_VARS['PHP_SELF'])); + +if (!empty($HTTP_POST_VARS['server_name'])) +{ + $server_name = $HTTP_POST_VARS['server_name']; +} +else +{ + // Guess at some basic info used for install.. + if (!empty($HTTP_SERVER_VARS['SERVER_NAME']) || !empty($HTTP_ENV_VARS['SERVER_NAME'])) + { + $server_name = (!empty($HTTP_SERVER_VARS['SERVER_NAME'])) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME']; + } + else if (!empty($HTTP_SERVER_VARS['HTTP_HOST']) || !empty($HTTP_ENV_VARS['HTTP_HOST'])) + { + $server_name = (!empty($HTTP_SERVER_VARS['HTTP_HOST'])) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST']; + } + else + { + $server_name = ''; + } +} + +if (!empty($HTTP_POST_VARS['server_port'])) +{ + $server_port = $HTTP_POST_VARS['server_port']; +} +else +{ + if (!empty($HTTP_SERVER_VARS['SERVER_PORT']) || !empty($HTTP_ENV_VARS['SERVER_PORT'])) + { + $server_port = (!empty($HTTP_SERVER_VARS['SERVER_PORT'])) ? $HTTP_SERVER_VARS['SERVER_PORT'] : $HTTP_ENV_VARS['SERVER_PORT']; + } + else + { + $server_port = '80'; + } +} + +// Open config.php ... if it exists +if (@file_exists(@phpbb_realpath('config.'.$phpEx))) +{ + include($phpbb_root_path.'config.'.$phpEx); +} + +// Is phpBB already installed? Yes? Redirect to the index +if (defined("PHPBB_INSTALLED")) +{ + redirect('../index.'.$phpEx); +} + +// Import language file, setup template ... +include($phpbb_root_path.'language/lang_' . $language . '/lang_main.'.$phpEx); +include($phpbb_root_path.'language/lang_' . $language . '/lang_admin.'.$phpEx); + +// Ok for the time being I'm commenting this out whilst I'm working on +// better integration of the install with upgrade as per Bart's request +// JLH +if ($upgrade == 1) +{ + // require('upgrade.'.$phpEx); + $install_step = 1; +} + +// What do we need to do? +if (!empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == 1 && empty($HTTP_POST_VARS['upgrade_now'])) +{ + header('Content-Type: text/x-delimtext; name="config.' . $phpEx . '"'); + header('Content-disposition: attachment; filename="config.' . $phpEx . '"'); + + // We need to stripslashes no matter what the setting of magic_quotes_gpc is + // because we add slashes at the top if its off, and they are added automaticlly + // if it is on. + echo stripslashes($HTTP_POST_VARS['config_data']); + + exit; +} +else if (!empty($HTTP_POST_VARS['send_file']) && $HTTP_POST_VARS['send_file'] == 2) +{ + $s_hidden_fields = ''; + $s_hidden_fields .= ''; + + if ($upgrade == 1) + { + $s_hidden_fields .= ''; + } + + page_header($lang['ftp_instructs']); + +?> + + + + + + + + + + + + + + + +'; + $s_hidden_fields .= ''; + + // If we're upgrading ... + if ($upgrade == 1) + { + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + + page_upgrade_form(); + } + else + { + page_common_form($s_hidden_fields, $lang['Download_config']); + + } + + page_footer(); + exit; + } + else + { + // Write out a temp file... + $tmpfname = @tempnam('/tmp', 'cfg'); + + @unlink($tmpfname); // unlink for safety on php4.0.3+ + + $fp = @fopen($tmpfname, 'w'); + + @fwrite($fp, stripslashes($HTTP_POST_VARS['config_data'])); + + @fclose($fp); + + // Now ftp it across. + @ftp_chdir($conn_id, $ftp_dir); + + $res = ftp_put($conn_id, 'config.'.$phpEx, $tmpfname, FTP_ASCII); + + @ftp_quit($conn_id); + + unlink($tmpfname); + + if ($upgrade == 1) + { + require('upgrade.'.$phpEx); + exit; + } + + // Ok we are basically done with the install process let's go on + // and let the user configure their board now. We are going to do + // this by calling the admin_board.php from the normal board admin + // section. + $s_hidden_fields = ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + + page_header($lang['Inst_Step_2']); + page_common_form($s_hidden_fields, $lang['Finish_Install']); + page_footer(); + exit(); + } +} +else if ((empty($install_step) || $admin_pass1 != $admin_pass2 || empty($admin_pass1) || empty($dbhost))) +{ + // Ok we haven't installed before so lets work our way through the various + // steps of the install process. This could turn out to be quite a lengty + // process. + + // Step 0 gather the pertinant info for database setup... + // Namely dbms, dbhost, dbname, dbuser, and dbpasswd. + $instruction_text = $lang['Inst_Step_0']; + + if (!empty($install_step)) + { + if ((($HTTP_POST_VARS['admin_pass1'] != $HTTP_POST_VARS['admin_pass2'])) || + (empty($HTTP_POST_VARS['admin_pass1']) || empty($dbhost)) && $HTTP_POST_VARS['cur_lang'] == $language) + { + $error = $lang['Password_mismatch']; + } + } + + $dirname = $phpbb_root_path . 'language'; + $dir = opendir($dirname); + + $lang_options = array(); + while ($file = readdir($dir)) + { + if (preg_match('#^lang_#i', $file) && !is_file(@phpbb_realpath($dirname . '/' . $file)) && !is_link(@phpbb_realpath($dirname . '/' . $file))) + { + $filename = trim(str_replace('lang_', '', $file)); + $displayname = preg_replace('/^(.*?)_(.*)$/', '\1 [ \2 ]', $filename); + $displayname = preg_replace('/\[(.*?)_(.*)\]/', '[ \1 - \2 ]', $displayname); + $lang_options[$displayname] = $filename; + } + } + + closedir($dir); + + @asort($lang_options); + @reset($lang_options); + + $lang_select = ''; + + $dbms_select = ''; + + $upgrade_option = ''; + + $s_hidden_fields = ''; + + page_header($instruction_text); + +?> + + + + + : + + + + : + + + + : + + + + + + + : + + + + : + + + + : + + + + : + + + + : + " /> + + + + + + + + + + + : + + + + : + + + + : + + + + : + + + + : + + + + : + + + + : + + +sql_query($sql_query[$i]))) + { + $error = $db->sql_error(); + + page_header($lang['Install'], ''); + page_error($lang['Installer_Error'], $lang['Install_db_error'] . '
    ' . $error['message']); + page_footer(); + exit; + } + } + } + + // Ok tables have been built, let's fill in the basic information + $sql_query = @fread(@fopen($dbms_basic, 'r'), @filesize($dbms_basic)); + $sql_query = preg_replace('/phpbb_/', $table_prefix, $sql_query); + + $sql_query = $remove_remarks($sql_query); + $sql_query = split_sql_file($sql_query, $delimiter_basic); + + for($i = 0; $i < sizeof($sql_query); $i++) + { + if (trim($sql_query[$i]) != '') + { + if (!($result = $db->sql_query($sql_query[$i]))) + { + $error = $db->sql_error(); + + page_header($lang['Install'], ''); + page_error($lang['Installer_Error'], $lang['Install_db_error'] . '
    ' . $error['message']); + page_footer(); + exit; + } + } + } + } + + // Ok at this point they have entered their admin password, let's go + // ahead and create the admin account with some basic default information + // that they can customize later, and write out the config file. After + // this we are going to pass them over to the admin_forum.php script + // to set up their forum defaults. + $error = ''; + + // Update the default admin user with their information. + $sql = "INSERT INTO " . $table_prefix . "config (config_name, config_value) + VALUES ('board_startdate', " . time() . ")"; + if (!$db->sql_query($sql)) + { + $error .= "Could not insert board_startdate :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "

    "; + } + + $sql = "INSERT INTO " . $table_prefix . "config (config_name, config_value) + VALUES ('default_lang', '" . str_replace("\'", "''", $language) . "')"; + if (!$db->sql_query($sql)) + { + $error .= "Could not insert default_lang :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "

    "; + } + + $update_config = array( + 'board_email' => $board_email, + 'script_path' => $script_path, + 'server_port' => $server_port, + 'server_name' => $server_name, + ); + + while (list($config_name, $config_value) = each($update_config)) + { + $sql = "UPDATE " . $table_prefix . "config + SET config_value = '$config_value' + WHERE config_name = '$config_name'"; + if (!$db->sql_query($sql)) + { + $error .= "Could not insert default_lang :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "

    "; + } + } + + $admin_pass_md5 = ($confirm && $userdata['user_level'] == ADMIN) ? $admin_pass1 : md5($admin_pass1); + + $sql = "UPDATE " . $table_prefix . "users + SET username = '" . str_replace("\'", "''", $admin_name) . "', user_password='" . str_replace("\'", "''", $admin_pass_md5) . "', user_lang = '" . str_replace("\'", "''", $language) . "', user_email='" . str_replace("\'", "''", $board_email) . "' + WHERE username = 'Admin'"; + if (!$db->sql_query($sql)) + { + $error .= "Could not update admin info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "

    "; + } + + $sql = "UPDATE " . $table_prefix . "users + SET user_regdate = " . time(); + if (!$db->sql_query($sql)) + { + $error .= "Could not update user_regdate :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "

    "; + } + + if ($error != '') + { + page_header($lang['Install'], ''); + page_error($lang['Installer_Error'], $lang['Install_db_error'] . '

    ' . $error); + page_footer(); + exit; + } + } + + if (!$upgrade_now) + { + // Write out the config file. + $config_data = ''; // Done this to prevent highlighting editors getting confused! + + @umask(0111); + $no_open = FALSE; + + // Unable to open the file writeable do something here as an attempt + // to get around that... + if (!($fp = @fopen($phpbb_root_path . 'config.'.$phpEx, 'w'))) + { + $s_hidden_fields = ''; + + if (@extension_loaded('ftp') && !defined('NO_FTP')) + { + page_header($lang['Unwriteable_config'] . '

    ' . $lang['ftp_option'] . '

    '); + +?> + + + + + + + + + + + +'; + } + + if ($upgrade == 1) + { + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + + page_upgrade_form(); + + } + else + { + page_common_form($s_hidden_fields, $lang['Download_config']); + } + + page_footer(); + exit; + } + + $result = @fputs($fp, $config_data, strlen($config_data)); + + @fclose($fp); + $upgrade_now = $lang['upgrade_submit']; + } + + // First off let's check and see if we are supposed to be doing an upgrade. + if ($upgrade == 1 && $upgrade_now == $lang['upgrade_submit']) + { + define('INSTALLING', true); + require('upgrade.'.$phpEx); + exit; + } + + // Ok we are basically done with the install process let's go on + // and let the user configure their board now. We are going to do + // this by calling the admin_board.php from the normal board admin + // section. + $s_hidden_fields = ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + + page_header($lang['Inst_Step_2'], '../login.'.$phpEx); + page_common_form($s_hidden_fields, $lang['Finish_Install']); + page_footer(); + exit; + } +} + +?> diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php deleted file mode 100644 index c88471d1ca..0000000000 --- a/phpBB/install/install_convert.php +++ /dev/null @@ -1,2103 +0,0 @@ - 'install', - 'module_title' => 'CONVERT', - 'module_filename' => substr(basename(__FILE__), 0, -strlen($phpEx)-1), - 'module_order' => 20, - 'module_subs' => '', - 'module_stages' => array('INTRO', 'SETTINGS', 'IN_PROGRESS', 'FINAL'), - 'module_reqs' => '' - ); -} - -/** -* Class holding all convertor-specific details. -* @package install -*/ -class convert -{ - var $options = array(); - - var $convertor_tag = ''; - var $src_dbms = ''; - var $src_dbhost = ''; - var $src_dbport = ''; - var $src_dbuser = ''; - var $src_dbpasswd = ''; - var $src_dbname = ''; - var $src_table_prefix = ''; - - var $convertor_data = array(); - var $tables = array(); - var $config_schema = array(); - var $convertor = array(); - var $src_truncate_statement = 'DELETE FROM '; - var $truncate_statement = 'DELETE FROM '; - - var $fulltext_search; - - // Batch size, can be adjusted by the conversion file - // For big boards a value of 6000 seems to be optimal - var $batch_size = 2000; - // Number of rows to be inserted at once (extended insert) if supported - // For installations having enough memory a value of 60 may be good. - var $num_wait_rows = 20; - - // Mysqls internal recoding engine messing up with our (better) functions? We at least support more encodings than mysql so should use it in favor. - var $mysql_convert = false; - - var $p_master; - - function __construct(&$p_master) - { - $this->p_master = &$p_master; - } -} - -/** -* Convert class for conversions -* @package install -*/ -class install_convert extends module -{ - /** - * Variables used while converting, they are accessible from the global variable $convert - */ - function install_convert(&$p_master) - { - $this->p_master = &$p_master; - } - - function main($mode, $sub) - { - global $lang, $template, $phpbb_root_path, $phpEx, $cache, $config, $language, $table_prefix; - global $convert; - - $this->tpl_name = 'install_convert'; - $this->mode = $mode; - - $convert = new convert($this->p_master); - - switch ($sub) - { - case 'intro': - // Try opening config file - // @todo If phpBB is not installed, we need to do a cut-down installation here - // For now, we redirect to the installation script instead - if (@file_exists($phpbb_root_path . 'config.' . $phpEx)) - { - include($phpbb_root_path . 'config.' . $phpEx); - } - - if (!defined('PHPBB_INSTALLED')) - { - $template->assign_vars(array( - 'S_NOT_INSTALLED' => true, - 'TITLE' => $lang['BOARD_NOT_INSTALLED'], - 'BODY' => sprintf($lang['BOARD_NOT_INSTALLED_EXPLAIN'], append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=install&language=' . $language)), - )); - - return; - } - - require($phpbb_root_path . 'config.' . $phpEx); - require($phpbb_root_path . 'includes/constants.' . $phpEx); - require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); - require($phpbb_root_path . 'includes/functions_convert.' . $phpEx); - - $db = new $sql_db(); - $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true); - unset($dbpasswd); - - // We need to fill the config to let internal functions correctly work - $sql = 'SELECT * - FROM ' . CONFIG_TABLE; - $result = $db->sql_query($sql); - - $config = array(); - while ($row = $db->sql_fetchrow($result)) - { - $config[$row['config_name']] = $row['config_value']; - } - $db->sql_freeresult($result); - - // Detect if there is already a conversion in progress at this point and offer to resume - // It's quite possible that the user will get disconnected during a large conversion so they need to be able to resume it - $new_conversion = request_var('new_conv', 0); - - if ($new_conversion) - { - $config['convert_progress'] = ''; - $config['convert_db_server'] = ''; - $config['convert_db_user'] = ''; - $db->sql_query('DELETE FROM ' . CONFIG_TABLE . " - WHERE config_name = 'convert_progress' - OR config_name = 'convert_db_server' - OR config_name = 'convert_db_user'" - ); - } - - // Let's see if there is a conversion in the works... - $options = array(); - if (!empty($config['convert_progress']) && !empty($config['convert_db_server']) && !empty($config['convert_db_user']) && !empty($config['convert_options'])) - { - $options = unserialize($config['convert_progress']); - $options = array_merge($options, unserialize($config['convert_db_server']), unserialize($config['convert_db_user']), unserialize($config['convert_options'])); - } - - // This information should have already been checked once, but do it again for safety - if (!empty($options) && !empty($options['tag']) && - isset($options['dbms']) && - isset($options['dbhost']) && - isset($options['dbport']) && - isset($options['dbuser']) && - isset($options['dbpasswd']) && - isset($options['dbname']) && - isset($options['table_prefix'])) - { - $this->page_title = $lang['CONTINUE_CONVERT']; - - $template->assign_vars(array( - 'TITLE' => $lang['CONTINUE_CONVERT'], - 'BODY' => $lang['CONTINUE_CONVERT_BODY'], - 'L_NEW' => $lang['CONVERT_NEW_CONVERSION'], - 'L_CONTINUE' => $lang['CONTINUE_OLD_CONVERSION'], - 'S_CONTINUE' => true, - - 'U_NEW_ACTION' => $this->p_master->module_url . "?mode={$this->mode}&sub=intro&new_conv=1&language=$language", - 'U_CONTINUE_ACTION' => $this->p_master->module_url . "?mode={$this->mode}&sub=in_progress&tag={$options['tag']}{$options['step']}&language=$language", - )); - - return; - } - - $this->list_convertors($sub); - - break; - - case 'settings': - $this->get_convert_settings($sub); - break; - - case 'in_progress': - $this->convert_data($sub); - break; - - case 'final': - $this->page_title = $lang['CONVERT_COMPLETE']; - - $template->assign_vars(array( - 'TITLE' => $lang['CONVERT_COMPLETE'], - 'BODY' => $lang['CONVERT_COMPLETE_EXPLAIN'], - )); - - // If we reached this step (conversion completed) we want to purge the cache and log the user out. - // This is for making sure the session get not screwed due to the 3.0.x users table being completely new. - $cache->purge(); - - require($phpbb_root_path . 'config.' . $phpEx); - require($phpbb_root_path . 'includes/constants.' . $phpEx); - require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); - require($phpbb_root_path . 'includes/functions_convert.' . $phpEx); - - $db = new $sql_db(); - $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true); - unset($dbpasswd); - - $sql = 'SELECT config_value - FROM ' . CONFIG_TABLE . ' - WHERE config_name = \'search_type\''; - $result = $db->sql_query($sql); - - if ($db->sql_fetchfield('config_value') != 'fulltext_mysql') - { - $template->assign_vars(array( - 'S_ERROR_BOX' => true, - 'ERROR_TITLE' => $lang['SEARCH_INDEX_UNCONVERTED'], - 'ERROR_MSG' => $lang['SEARCH_INDEX_UNCONVERTED_EXPLAIN'], - )); - } - - if ($db->truncate) - { - $db->sql_query('TRUNCATE TABLE ' . SESSIONS_KEYS_TABLE); - $db->sql_query('TRUNCATE TABLE ' . SESSIONS_TABLE); - } - else - { - $db->sql_query('DELETE FROM ' . SESSIONS_KEYS_TABLE); - $db->sql_query('DELETE FROM ' . SESSIONS_TABLE); - } - - break; - } - } - - /** - * Generate a list of all available conversion modules - */ - function list_convertors($sub) - { - global $lang, $language, $template, $phpbb_root_path, $phpEx; - - $this->page_title = $lang['SUB_INTRO']; - - $template->assign_vars(array( - 'TITLE' => $lang['CONVERT_INTRO'], - 'BODY' => $lang['CONVERT_INTRO_BODY'], - - 'L_AUTHOR' => $lang['AUTHOR'], - 'L_AVAILABLE_CONVERTORS' => $lang['AVAILABLE_CONVERTORS'], - 'L_CONVERT' => $lang['CONVERT'], - 'L_NO_CONVERTORS' => $lang['NO_CONVERTORS'], - 'L_OPTIONS' => $lang['CONVERT_OPTIONS'], - 'L_SOFTWARE' => $lang['SOFTWARE'], - 'L_VERSION' => $lang['VERSION'], - - 'S_LIST' => true, - )); - - $convertors = $sort = array(); - $get_info = true; - - $handle = @opendir('./convertors/'); - - if (!$handle) - { - $this->error('Unable to access the convertors directory', __LINE__, __FILE__); - } - - while ($entry = readdir($handle)) - { - if (preg_match('/^convert_([a-z0-9_]+).' . $phpEx . '$/i', $entry, $m)) - { - include('./convertors/' . $entry); - if (isset($convertor_data)) - { - $sort[strtolower($convertor_data['forum_name'])] = sizeof($convertors); - - $convertors[] = array( - 'tag' => $m[1], - 'forum_name' => $convertor_data['forum_name'], - 'version' => $convertor_data['version'], - 'dbms' => $convertor_data['dbms'], - 'dbhost' => $convertor_data['dbhost'], - 'dbport' => $convertor_data['dbport'], - 'dbuser' => $convertor_data['dbuser'], - 'dbpasswd' => $convertor_data['dbpasswd'], - 'dbname' => $convertor_data['dbname'], - 'table_prefix' => $convertor_data['table_prefix'], - 'author' => $convertor_data['author'] - ); - } - unset($convertor_data); - } - } - closedir($handle); - - @ksort($sort); - - foreach ($sort as $void => $index) - { - $template->assign_block_vars('convertors', array( - 'AUTHOR' => $convertors[$index]['author'], - 'SOFTWARE' => $convertors[$index]['forum_name'], - 'VERSION' => $convertors[$index]['version'], - - 'U_CONVERT' => $this->p_master->module_url . "?mode={$this->mode}&language=$language&sub=settings&tag=" . $convertors[$index]['tag'], - )); - } - } - - /** - */ - function get_convert_settings($sub) - { - global $lang, $language, $template, $db, $phpbb_root_path, $phpEx, $config, $cache; - - require($phpbb_root_path . 'config.' . $phpEx); - require($phpbb_root_path . 'includes/constants.' . $phpEx); - require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); - require($phpbb_root_path . 'includes/functions_convert.' . $phpEx); - - $db = new $sql_db(); - $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true); - unset($dbpasswd); - - $this->page_title = $lang['STAGE_SETTINGS']; - - // We need to fill the config to let internal functions correctly work - $sql = 'SELECT * - FROM ' . CONFIG_TABLE; - $result = $db->sql_query($sql); - - $config = array(); - while ($row = $db->sql_fetchrow($result)) - { - $config[$row['config_name']] = $row['config_value']; - } - $db->sql_freeresult($result); - - $convertor_tag = request_var('tag', ''); - - if (empty($convertor_tag)) - { - $this->p_master->error($lang['NO_CONVERT_SPECIFIED'], __LINE__, __FILE__); - } - $get_info = true; - - // check security implications of direct inclusion - $convertor_tag = basename($convertor_tag); - if (!file_exists('./convertors/convert_' . $convertor_tag . '.' . $phpEx)) - { - $this->p_master->error($lang['CONVERT_NOT_EXIST'], __LINE__, __FILE__); - } - - include('./convertors/convert_' . $convertor_tag . '.' . $phpEx); - - // The test_file is a file that should be present in the location of the old board. - if (!isset($test_file)) - { - $this->p_master->error($lang['DEV_NO_TEST_FILE'], __LINE__, __FILE__); - } - - $submit = (isset($_POST['submit'])) ? true : false; - - $src_dbms = request_var('src_dbms', $convertor_data['dbms']); - $src_dbhost = request_var('src_dbhost', $convertor_data['dbhost']); - $src_dbport = request_var('src_dbport', $convertor_data['dbport']); - $src_dbuser = request_var('src_dbuser', $convertor_data['dbuser']); - $src_dbpasswd = request_var('src_dbpasswd', $convertor_data['dbpasswd']); - $src_dbname = request_var('src_dbname', $convertor_data['dbname']); - $src_table_prefix = request_var('src_table_prefix', $convertor_data['table_prefix']); - $forum_path = request_var('forum_path', $convertor_data['forum_path']); - $refresh = request_var('refresh', 1); - - // Default URL of the old board - // @todo Are we going to use this for attempting to convert URL references in posts, or should we remove it? - // -> We should convert old urls to the new relative urls format - // $src_url = request_var('src_url', 'Not in use at the moment'); - - // strip trailing slash from old forum path - $forum_path = (strlen($forum_path) && $forum_path[strlen($forum_path) - 1] == '/') ? substr($forum_path, 0, -1) : $forum_path; - - $error = array(); - if ($submit) - { - if (!file_exists('./../' . $forum_path . '/' . $test_file)) - { - $error[] = sprintf($lang['COULD_NOT_FIND_PATH'], $forum_path); - } - - $connect_test = false; - $available_dbms = get_available_dbms(false, true, true); - - if (!isset($available_dbms[$src_dbms]) || !$available_dbms[$src_dbms]['AVAILABLE']) - { - $error['db'][] = $lang['INST_ERR_NO_DB']; - $connect_test = false; - } - else - { - $connect_test = connect_check_db(true, $error, $available_dbms[$src_dbms], $src_table_prefix, $src_dbhost, $src_dbuser, htmlspecialchars_decode($src_dbpasswd), $src_dbname, $src_dbport, true, ($src_dbms == $dbms) ? false : true, false); - } - - // The forum prefix of the old and the new forum can only be the same if two different databases are used. - if ($src_table_prefix == $table_prefix && $src_dbms == $dbms && $src_dbhost == $dbhost && $src_dbport == $dbport && $src_dbname == $dbname) - { - $error[] = sprintf($lang['TABLE_PREFIX_SAME'], $src_table_prefix); - } - - // Check table prefix - if (!sizeof($error)) - { - // initiate database connection to old db if old and new db differ - global $src_db, $same_db; - $src_db = $same_db = false; - - if ($src_dbms != $dbms || $src_dbhost != $dbhost || $src_dbport != $dbport || $src_dbname != $dbname || $src_dbuser != $dbuser) - { - $sql_db = 'dbal_' . $src_dbms; - $src_db = new $sql_db(); - $src_db->sql_connect($src_dbhost, $src_dbuser, htmlspecialchars_decode($src_dbpasswd), $src_dbname, $src_dbport, false, true); - $same_db = false; - } - else - { - $src_db = $db; - $same_db = true; - } - - $src_db->sql_return_on_error(true); - $db->sql_return_on_error(true); - - // Try to select one row from the first table to see if the prefix is OK - $result = $src_db->sql_query_limit('SELECT * FROM ' . $src_table_prefix . $tables[0], 1); - - if (!$result) - { - $prefixes = array(); - - $tables_existing = get_tables($src_db); - $tables_existing = array_map('strtolower', $tables_existing); - foreach ($tables_existing as $table_name) - { - compare_table($tables, $table_name, $prefixes); - } - unset($tables_existing); - - foreach ($prefixes as $prefix => $count) - { - if ($count >= sizeof($tables)) - { - $possible_prefix = $prefix; - break; - } - } - - $msg = ''; - if (!empty($convertor_data['table_prefix'])) - { - $msg .= sprintf($lang['DEFAULT_PREFIX_IS'], $convertor_data['forum_name'], $convertor_data['table_prefix']); - } - - if (!empty($possible_prefix)) - { - $msg .= '
    '; - $msg .= ($possible_prefix == '*') ? $lang['BLANK_PREFIX_FOUND'] : sprintf($lang['PREFIX_FOUND'], $possible_prefix); - $src_table_prefix = ($possible_prefix == '*') ? '' : $possible_prefix; - } - - $error[] = $msg; - } - $src_db->sql_freeresult($result); - $src_db->sql_return_on_error(false); - } - - if (!sizeof($error)) - { - // Save convertor Status - set_config('convert_progress', serialize(array( - 'step' => '', - 'table_prefix' => $src_table_prefix, - 'tag' => $convertor_tag, - )), true); - set_config('convert_db_server', serialize(array( - 'dbms' => $src_dbms, - 'dbhost' => $src_dbhost, - 'dbport' => $src_dbport, - 'dbname' => $src_dbname, - )), true); - set_config('convert_db_user', serialize(array( - 'dbuser' => $src_dbuser, - 'dbpasswd' => $src_dbpasswd, - )), true); - - // Save options - set_config('convert_options', serialize(array('forum_path' => './../' . $forum_path, 'refresh' => $refresh)), true); - - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['VERIFY_OPTIONS'], - 'RESULT' => $lang['CONVERT_SETTINGS_VERIFIED'], - )); - - $template->assign_vars(array( - 'L_SUBMIT' => $lang['BEGIN_CONVERT'], -// 'S_HIDDEN' => $s_hidden_fields, - 'U_ACTION' => $this->p_master->module_url . "?mode={$this->mode}&sub=in_progress&tag=$convertor_tag&language=$language", - )); - - return; - } - else - { - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['VERIFY_OPTIONS'], - 'RESULT' => '' . implode('
    ', $error) . '
    ', - )); - } - } // end submit - - foreach ($this->convert_options as $config_key => $vars) - { - if (!is_array($vars) && strpos($config_key, 'legend') === false) - { - continue; - } - - if (strpos($config_key, 'legend') !== false) - { - $template->assign_block_vars('options', array( - 'S_LEGEND' => true, - 'LEGEND' => $lang[$vars]) - ); - - continue; - } - - $options = isset($vars['options']) ? $vars['options'] : ''; - - $template->assign_block_vars('options', array( - 'KEY' => $config_key, - 'TITLE' => $lang[$vars['lang']], - 'S_EXPLAIN' => $vars['explain'], - 'S_LEGEND' => false, - 'TITLE_EXPLAIN' => ($vars['explain']) ? $lang[$vars['lang'] . '_EXPLAIN'] : '', - 'CONTENT' => $this->p_master->input_field($config_key, $vars['type'], $$config_key, $options), - ) - ); - } - - $template->assign_vars(array( - 'TITLE' => $lang['STAGE_SETTINGS'], - 'BODY' => $lang['CONV_OPTIONS_BODY'], - 'L_SUBMIT' => $lang['BEGIN_CONVERT'], - 'U_ACTION' => $this->p_master->module_url . "?mode={$this->mode}&sub=settings&tag=$convertor_tag&language=$language", - )); - } - - /** - * The function which does the actual work (or dispatches it to the relevant places) - */ - function convert_data($sub) - { - global $template, $user, $phpbb_root_path, $phpEx, $db, $lang, $config, $cache; - global $convert, $convert_row, $message_parser, $skip_rows; - - require($phpbb_root_path . 'config.' . $phpEx); - require($phpbb_root_path . 'includes/constants.' . $phpEx); - require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); - require($phpbb_root_path . 'includes/functions_convert.' . $phpEx); - - $db = new $sql_db(); - $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true); - unset($dbpasswd); - - $sql = 'SELECT * - FROM ' . CONFIG_TABLE; - $result = $db->sql_query($sql); - - $config = array(); - while ($row = $db->sql_fetchrow($result)) - { - $config[$row['config_name']] = $row['config_value']; - } - $db->sql_freeresult($result); - - // Override a couple of config variables for the duration - $config['max_quote_depth'] = 0; - - // @todo Need to confirm that max post length in source is <= max post length in destination or there may be interesting formatting issues - $config['max_post_chars'] = 0; - - // Set up a user as well. We _should_ have enough of a database here at this point to do this - // and it helps for any core code we call - $user->session_begin(); - $user->page = $user->extract_current_page($phpbb_root_path); - - // This is a little bit of a fudge, but it allows the language entries to be available to the - // core code without us loading them again - $user->lang = &$lang; - - $this->page_title = $user->lang['STAGE_IN_PROGRESS']; - - $convert->options = array(); - if (isset($config['convert_progress'])) - { - $convert->options = unserialize($config['convert_progress']); - $convert->options = array_merge($convert->options, unserialize($config['convert_db_server']), unserialize($config['convert_db_user']), unserialize($config['convert_options'])); - } - - // This information should have already been checked once, but do it again for safety - if (empty($convert->options) || empty($convert->options['tag']) || - !isset($convert->options['dbms']) || - !isset($convert->options['dbhost']) || - !isset($convert->options['dbport']) || - !isset($convert->options['dbuser']) || - !isset($convert->options['dbpasswd']) || - !isset($convert->options['dbname']) || - !isset($convert->options['table_prefix'])) - { - $this->p_master->error($user->lang['NO_CONVERT_SPECIFIED'], __LINE__, __FILE__); - } - - // Make some short variables accessible, for easier referencing - $convert->convertor_tag = basename($convert->options['tag']); - $convert->src_dbms = $convert->options['dbms']; - $convert->src_dbhost = $convert->options['dbhost']; - $convert->src_dbport = $convert->options['dbport']; - $convert->src_dbuser = $convert->options['dbuser']; - $convert->src_dbpasswd = $convert->options['dbpasswd']; - $convert->src_dbname = $convert->options['dbname']; - $convert->src_table_prefix = $convert->options['table_prefix']; - - // initiate database connection to old db if old and new db differ - global $src_db, $same_db; - $src_db = $same_db = null; - if ($convert->src_dbms != $dbms || $convert->src_dbhost != $dbhost || $convert->src_dbport != $dbport || $convert->src_dbname != $dbname || $convert->src_dbuser != $dbuser) - { - if ($convert->src_dbms != $dbms) - { - require($phpbb_root_path . 'includes/db/' . $convert->src_dbms . '.' . $phpEx); - } - $sql_db = 'dbal_' . $convert->src_dbms; - $src_db = new $sql_db(); - $src_db->sql_connect($convert->src_dbhost, $convert->src_dbuser, htmlspecialchars_decode($convert->src_dbpasswd), $convert->src_dbname, $convert->src_dbport, false, true); - $same_db = false; - } - else - { - $src_db = $db; - $same_db = true; - } - - $convert->mysql_convert = false; - switch ($src_db->sql_layer) - { - case 'sqlite': - case 'firebird': - $convert->src_truncate_statement = 'DELETE FROM '; - break; - - // Thanks MySQL, for silently converting... - case 'mysql': - if (version_compare($src_db->mysql_version, '4.1.3', '>=')) - { - $convert->mysql_convert = true; - } - $convert->src_truncate_statement = 'TRUNCATE TABLE '; - break; - - case 'mysqli': - $convert->mysql_convert = true; - $convert->src_truncate_statement = 'TRUNCATE TABLE '; - break; - - default: - $convert->src_truncate_statement = 'TRUNCATE TABLE '; - break; - } - - if ($convert->mysql_convert && !$same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - - if ($db->truncate) - { - $convert->truncate_statement = 'TRUNCATE TABLE '; - } - else - { - $convert->truncate_statement = 'DELETE FROM '; - } - - $get_info = false; - - // check security implications of direct inclusion - if (!file_exists('./convertors/convert_' . $convert->convertor_tag . '.' . $phpEx)) - { - $this->p_master->error($user->lang['CONVERT_NOT_EXIST'], __LINE__, __FILE__); - } - - if (file_exists('./convertors/functions_' . $convert->convertor_tag . '.' . $phpEx)) - { - include('./convertors/functions_' . $convert->convertor_tag . '.' . $phpEx); - } - - $get_info = true; - include('./convertors/convert_' . $convert->convertor_tag . '.' . $phpEx); - - // Map some variables... - $convert->convertor_data = $convertor_data; - $convert->tables = $tables; - $convert->config_schema = $config_schema; - - // Now include the real data - $get_info = false; - include('./convertors/convert_' . $convert->convertor_tag . '.' . $phpEx); - - $convert->convertor_data = $convertor_data; - $convert->tables = $tables; - $convert->config_schema = $config_schema; - $convert->convertor = $convertor; - - // The test_file is a file that should be present in the location of the old board. - if (!file_exists($convert->options['forum_path'] . '/' . $test_file)) - { - $this->p_master->error(sprintf($user->lang['COULD_NOT_FIND_PATH'], $convert->options['forum_path']), __LINE__, __FILE__); - } - - $search_type = basename(trim($config['search_type'])); - - // For conversions we are a bit less strict and set to a search backend we know exist... - if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx)) - { - $search_type = 'fulltext_native'; - set_config('search_type', $search_type); - } - - if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx)) - { - trigger_error('NO_SUCH_SEARCH_MODULE'); - } - - require($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx); - - $error = false; - $convert->fulltext_search = new $search_type($error); - - if ($error) - { - trigger_error($error); - } - - include($phpbb_root_path . 'includes/message_parser.' . $phpEx); - $message_parser = new parse_message(); - - $jump = request_var('jump', 0); - $final_jump = request_var('final_jump', 0); - $sync_batch = request_var('sync_batch', -1); - $last_statement = request_var('last', 0); - - // We are running sync... - if ($sync_batch >= 0) - { - $this->sync_forums($sync_batch); - return; - } - - if ($jump) - { - $this->jump($jump, $last_statement); - return; - } - - if ($final_jump) - { - $this->final_jump($final_jump); - return; - } - - $current_table = request_var('current_table', 0); - $old_current_table = min(-1, $current_table - 1); - $skip_rows = request_var('skip_rows', 0); - - if (!$current_table && !$skip_rows) - { - if (empty($_REQUEST['confirm'])) - { - // If avatars / ranks / smilies folders are specified make sure they are writable - $bad_folders = array(); - - $local_paths = array( - 'avatar_path' => path($config['avatar_path']), - 'avatar_gallery_path' => path($config['avatar_gallery_path']), - 'icons_path' => path($config['icons_path']), - 'ranks_path' => path($config['ranks_path']), - 'smilies_path' => path($config['smilies_path']) - ); - - foreach ($local_paths as $folder => $local_path) - { - if (isset($convert->convertor[$folder])) - { - if (empty($convert->convertor['test_file'])) - { - // test_file is mandantory at the moment so this should never be reached, but just in case... - $this->p_master->error($user->lang['DEV_NO_TEST_FILE'], __LINE__, __FILE__); - } - - if (!$local_path || !@is_writable($phpbb_root_path . $local_path)) - { - if (!$local_path) - { - $bad_folders[] = sprintf($user->lang['CONFIG_PHPBB_EMPTY'], $folder); - } - else - { - $bad_folders[] = $local_path; - } - } - } - } - - if (sizeof($bad_folders)) - { - $msg = (sizeof($bad_folders) == 1) ? $user->lang['MAKE_FOLDER_WRITABLE'] : $user->lang['MAKE_FOLDERS_WRITABLE']; - sort($bad_folders); - $this->p_master->error(sprintf($msg, implode('
    ', $bad_folders)), __LINE__, __FILE__, true); - - $template->assign_vars(array( - 'L_SUBMIT' => $user->lang['INSTALL_TEST'], - 'U_ACTION' => $this->p_master->module_url . "?mode={$this->mode}&sub=in_progress&tag={$convert->convertor_tag}&language=$language", - )); - return; - } - - // Grab all the tables used in convertor - $missing_tables = $tables_list = $aliases = array(); - - foreach ($convert->convertor['schema'] as $schema) - { - // Skip those not used (because of addons/plugins not detected) - if (!$schema['target']) - { - continue; - } - - foreach ($schema as $key => $val) - { - // we're dealing with an array like: - // array('forum_status', 'forums.forum_status', 'is_item_locked') - if (is_int($key) && !empty($val[1])) - { - $temp_data = $val[1]; - if (!is_array($temp_data)) - { - $temp_data = array($temp_data); - } - - foreach ($temp_data as $val) - { - if (preg_match('/([a-z0-9_]+)\.([a-z0-9_]+)\)* ?A?S? ?([a-z0-9_]*?)\.?([a-z0-9_]*)$/i', $val, $m)) - { - $table = $convert->src_table_prefix . $m[1]; - $tables_list[$table] = $table; - - if (!empty($m[3])) - { - $aliases[] = $convert->src_table_prefix . $m[3]; - } - } - } - } - // 'left_join' => 'topics LEFT JOIN vote_desc ON topics.topic_id = vote_desc.topic_id AND topics.topic_vote = 1' - else if ($key == 'left_join') - { - // Convert the value if it wasn't an array already. - if (!is_array($val)) - { - $val = array($val); - } - - for ($j = 0; $j < sizeof($val); ++$j) - { - if (preg_match('/LEFT JOIN ([a-z0-9_]+) AS ([a-z0-9_]+)/i', $val[$j], $m)) - { - $table = $convert->src_table_prefix . $m[1]; - $tables_list[$table] = $table; - - if (!empty($m[2])) - { - $aliases[] = $convert->src_table_prefix . $m[2]; - } - } - } - } - } - } - - // Remove aliased tables from $tables_list - foreach ($aliases as $alias) - { - unset($tables_list[$alias]); - } - - // Check if the tables that we need exist - $src_db->sql_return_on_error(true); - foreach ($tables_list as $table => $null) - { - $sql = 'SELECT 1 FROM ' . $table; - $_result = $src_db->sql_query_limit($sql, 1); - - if (!$_result) - { - $missing_tables[] = $table; - } - $src_db->sql_freeresult($_result); - } - $src_db->sql_return_on_error(false); - - // Throw an error if some tables are missing - // We used to do some guessing here, but since we have a suggestion of possible values earlier, I don't see it adding anything here to do it again - - if (sizeof($missing_tables) == sizeof($tables_list)) - { - $this->p_master->error($user->lang['NO_TABLES_FOUND'] . ' ' . $user->lang['CHECK_TABLE_PREFIX'], __LINE__, __FILE__); - } - else if (sizeof($missing_tables)) - { - $this->p_master->error(sprintf($user->lang['TABLES_MISSING'], implode(', ', $missing_tables)) . '

    ' . $user->lang['CHECK_TABLE_PREFIX'], __LINE__, __FILE__); - } - - $url = $this->save_convert_progress('&confirm=1'); - $msg = $user->lang['PRE_CONVERT_COMPLETE']; - - if ($convert->convertor_data['author_notes']) - { - $msg .= '

    ' . sprintf($user->lang['AUTHOR_NOTES'], $convert->convertor_data['author_notes']); - } - - $template->assign_vars(array( - 'L_SUBMIT' => $user->lang['CONTINUE_CONVERT'], - 'L_MESSAGE' => $msg, - 'U_ACTION' => $url, - )); - - return; - } // if (empty($_REQUEST['confirm'])) - - $template->assign_block_vars('checks', array( - 'S_LEGEND' => true, - 'LEGEND' => $user->lang['STARTING_CONVERT'], - )); - - // Convert the config table and load the settings of the old board - if (!empty($convert->config_schema)) - { - restore_config($convert->config_schema); - - // Override a couple of config variables for the duration - $config['max_quote_depth'] = 0; - - // @todo Need to confirm that max post length in source is <= max post length in destination or there may be interesting formatting issues - $config['max_post_chars'] = 0; - } - - $template->assign_block_vars('checks', array( - 'TITLE' => $user->lang['CONFIG_CONVERT'], - 'RESULT' => $user->lang['DONE'], - )); - - // Now process queries and execute functions that have to be executed prior to the conversion - if (!empty($convert->convertor['execute_first'])) - { - eval($convert->convertor['execute_first']); - } - - if (!empty($convert->convertor['query_first'])) - { - if (!is_array($convert->convertor['query_first'])) - { - $convert->convertor['query_first'] = array('target', array($convert->convertor['query_first'])); - } - else if (!is_array($convert->convertor['query_first'][0])) - { - $convert->convertor['query_first'] = array(array($convert->convertor['query_first'][0], $convert->convertor['query_first'][1])); - } - - foreach ($convert->convertor['query_first'] as $query_first) - { - if ($query_first[0] == 'src') - { - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - - $src_db->sql_query($query_first[1]); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - } - else - { - $db->sql_query($query_first[1]); - } - } - } - - $template->assign_block_vars('checks', array( - 'TITLE' => $user->lang['PREPROCESS_STEP'], - 'RESULT' => $user->lang['DONE'], - )); - } // if (!$current_table && !$skip_rows) - - $template->assign_block_vars('checks', array( - 'S_LEGEND' => true, - 'LEGEND' => $user->lang['FILLING_TABLES'], - )); - - // This loop takes one target table and processes it - while ($current_table < sizeof($convert->convertor['schema'])) - { - $schema = $convert->convertor['schema'][$current_table]; - - // The target table isn't set, this can be because a module (for example the attachement mod) is taking care of this. - if (empty($schema['target'])) - { - $current_table++; - continue; - } - - $template->assign_block_vars('checks', array( - 'TITLE' => sprintf($user->lang['FILLING_TABLE'], $schema['target']), - )); - - // This is only the case when we first start working on the tables. - if (!$skip_rows) - { - // process execute_first and query_first for this table... - if (!empty($schema['execute_first'])) - { - eval($schema['execute_first']); - } - - if (!empty($schema['query_first'])) - { - if (!is_array($schema['query_first'])) - { - $schema['query_first'] = array('target', array($schema['query_first'])); - } - else if (!is_array($schema['query_first'][0])) - { - $schema['query_first'] = array(array($schema['query_first'][0], $schema['query_first'][1])); - } - - foreach ($schema['query_first'] as $query_first) - { - if ($query_first[0] == 'src') - { - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - $src_db->sql_query($query_first[1]); - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - } - else - { - $db->sql_query($query_first[1]); - } - } - } - - if (!empty($schema['autoincrement'])) - { - switch ($db->dbms_type) - { - case 'postgres': - $db->sql_query("SELECT SETVAL('" . $schema['target'] . "_seq',(select case when max(" . $schema['autoincrement'] . ")>0 then max(" . $schema['autoincrement'] . ")+1 else 1 end from " . $schema['target'] . '));'); - break; - - case 'oracle': - $result = $db->sql_query('SELECT MAX(' . $schema['autoincrement'] . ') as max_id FROM ' . $schema['target']); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $largest_id = (int) $row['max_id']; - - if ($largest_id) - { - $db->sql_query('DROP SEQUENCE ' . $schema['target'] . '_seq'); - $db->sql_query('CREATE SEQUENCE ' . $schema['target'] . '_seq START WITH ' . ($largest_id + 1)); - } - break; - } - } - } - - // Process execute_always for this table - // This is for code which needs to be executed on every pass of this table if - // it gets split because of time restrictions - if (!empty($schema['execute_always'])) - { - eval($schema['execute_always']); - } - - // - // Set up some variables - // - // $waiting_rows holds rows for multirows insertion (MySQL only) - // $src_tables holds unique tables with aliases to select from - // $src_fields will quickly refer source fields (or aliases) corresponding to the current index - // $select_fields holds the names of the fields to retrieve - // - - $sql_data = array( - 'source_fields' => array(), - 'target_fields' => array(), - 'source_tables' => array(), - 'select_fields' => array(), - ); - - // This statement is building the keys for later insertion. - $insert_query = $this->build_insert_query($schema, $sql_data, $current_table); - - // If no source table is affected, we skip the table - if (empty($sql_data['source_tables'])) - { - $skip_rows = 0; - $current_table++; - continue; - } - - $distinct = (!empty($schema['distinct'])) ? 'DISTINCT ' : ''; - - $sql = 'SELECT ' . $distinct . implode(', ', $sql_data['select_fields']) . " \nFROM " . implode(', ', $sql_data['source_tables']); - - // Where - $sql .= (!empty($schema['where'])) ? "\nWHERE (" . $schema['where'] . ')' : ''; - - // Group By - if (!empty($schema['group_by'])) - { - $schema['group_by'] = array($schema['group_by']); - foreach ($sql_data['select_fields'] as $select) - { - $alias = strpos(strtolower($select), ' as '); - $select = ($alias) ? substr($select, 0, $alias) : $select; - if (!in_array($select, $schema['group_by'])) - { - $schema['group_by'][] = $select; - } - } - } - $sql .= (!empty($schema['group_by'])) ? "\nGROUP BY " . implode(', ', $schema['group_by']) : ''; - - // Having - $sql .= (!empty($schema['having'])) ? "\nHAVING " . $schema['having'] : ''; - - // Order By - if (empty($schema['order_by']) && !empty($schema['primary'])) - { - $schema['order_by'] = $schema['primary']; - } - $sql .= (!empty($schema['order_by'])) ? "\nORDER BY " . $schema['order_by'] : ''; - - // Counting basically holds the amount of rows processed. - $counting = -1; - $batch_time = 0; - - while ($counting === -1 || ($counting >= $convert->batch_size && still_on_time())) - { - $old_current_table = $current_table; - - $rows = ''; - $waiting_rows = array(); - - if (!empty($batch_time)) - { - $mtime = explode(' ', microtime()); - $mtime = $mtime[0] + $mtime[1]; - $rows = ceil($counting/($mtime - $batch_time)) . " rows/s ($counting rows) | "; - } - - $template->assign_block_vars('checks', array( - 'TITLE' => "skip_rows = $skip_rows", - 'RESULT' => $rows . ((defined('DEBUG_EXTRA') && function_exists('memory_get_usage')) ? ceil(memory_get_usage()/1024) . ' ' . $user->lang['KIB'] : ''), - )); - - $mtime = explode(' ', microtime()); - $batch_time = $mtime[0] + $mtime[1]; - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - - // Take skip rows into account and only fetch batch_size amount of rows - $___result = $src_db->sql_query_limit($sql, $convert->batch_size, $skip_rows); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - - // This loop processes each row - $counting = 0; - - $convert->row = $convert_row = array(); - - if (!empty($schema['autoincrement'])) - { - switch ($db->dbms_type) - { - case 'mssql': - $db->sql_query('SET IDENTITY_INSERT ' . $schema['target'] . ' ON'); - break; - } - } - - // Now handle the rows until time is over or no more rows to process... - while ($counting === 0 || still_on_time()) - { - $convert_row = $src_db->sql_fetchrow($___result); - - if (!$convert_row) - { - // move to the next batch or table - break; - } - - // With this we are able to always save the last state - $convert->row = $convert_row; - - // Increment the counting variable, it stores the number of rows we have processed - $counting++; - - $insert_values = array(); - - $sql_flag = $this->process_row($schema, $sql_data, $insert_values); - - if ($sql_flag === true) - { - switch ($db->dbms_type) - { - // If MySQL, we'll wait to have num_wait_rows rows to submit at once - case 'mysql': - $waiting_rows[] = '(' . implode(', ', $insert_values) . ')'; - - if (sizeof($waiting_rows) >= $convert->num_wait_rows) - { - $errored = false; - - $db->sql_return_on_error(true); - - if (!$db->sql_query($insert_query . implode(', ', $waiting_rows))) - { - $errored = true; - } - $db->sql_return_on_error(false); - - if ($errored) - { - $db->sql_return_on_error(true); - - // Because it errored out we will try to insert the rows one by one... most of the time this - // is caused by duplicate entries - but we also do not want to miss one... - foreach ($waiting_rows as $waiting_sql) - { - if (!$db->sql_query($insert_query . $waiting_sql)) - { - $this->p_master->db_error($user->lang['DB_ERR_INSERT'], htmlspecialchars($insert_query . $waiting_sql) . '

    ' . htmlspecialchars(print_r($db->_sql_error(), true)), __LINE__, __FILE__, true); - } - } - - $db->sql_return_on_error(false); - } - - $waiting_rows = array(); - } - - break; - - default: - $insert_sql = $insert_query . '(' . implode(', ', $insert_values) . ')'; - - $db->sql_return_on_error(true); - - if (!$db->sql_query($insert_sql)) - { - $this->p_master->db_error($user->lang['DB_ERR_INSERT'], htmlspecialchars($insert_sql) . '

    ' . htmlspecialchars(print_r($db->_sql_error(), true)), __LINE__, __FILE__, true); - } - $db->sql_return_on_error(false); - - $waiting_rows = array(); - - break; - } - } - - $skip_rows++; - } - $src_db->sql_freeresult($___result); - - // We might still have some rows waiting - if (sizeof($waiting_rows)) - { - $errored = false; - $db->sql_return_on_error(true); - - if (!$db->sql_query($insert_query . implode(', ', $waiting_rows))) - { - $errored = true; - } - $db->sql_return_on_error(false); - - if ($errored) - { - $db->sql_return_on_error(true); - - // Because it errored out we will try to insert the rows one by one... most of the time this - // is caused by duplicate entries - but we also do not want to miss one... - foreach ($waiting_rows as $waiting_sql) - { - $db->sql_query($insert_query . $waiting_sql); - $this->p_master->db_error($user->lang['DB_ERR_INSERT'], htmlspecialchars($insert_query . $waiting_sql) . '

    ' . htmlspecialchars(print_r($db->_sql_error(), true)), __LINE__, __FILE__, true); - } - - $db->sql_return_on_error(false); - } - - $waiting_rows = array(); - } - - if (!empty($schema['autoincrement'])) - { - switch ($db->dbms_type) - { - case 'mssql': - $db->sql_query('SET IDENTITY_INSERT ' . $schema['target'] . ' OFF'); - break; - - case 'postgres': - $db->sql_query("SELECT SETVAL('" . $schema['target'] . "_seq',(select case when max(" . $schema['autoincrement'] . ")>0 then max(" . $schema['autoincrement'] . ")+1 else 1 end from " . $schema['target'] . '));'); - break; - - case 'oracle': - $result = $db->sql_query('SELECT MAX(' . $schema['autoincrement'] . ') as max_id FROM ' . $schema['target']); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $largest_id = (int) $row['max_id']; - - if ($largest_id) - { - $db->sql_query('DROP SEQUENCE ' . $schema['target'] . '_seq'); - $db->sql_query('CREATE SEQUENCE ' . $schema['target'] . '_seq START WITH ' . ($largest_id + 1)); - } - break; - } - } - } - - // When we reach this point, either the current table has been processed or we're running out of time. - if (still_on_time() && $counting < $convert->batch_size/* && !defined('DEBUG_EXTRA')*/) - { - $skip_rows = 0; - $current_table++; - } - else - {/* - if (still_on_time() && $counting < $convert->batch_size) - { - $skip_rows = 0; - $current_table++; - }*/ - - // Looks like we ran out of time. - $url = $this->save_convert_progress('&current_table=' . $current_table . '&skip_rows=' . $skip_rows); - - $current_table++; -// $percentage = ($skip_rows == 0) ? 0 : floor(100 / ($total_rows / $skip_rows)); - - $msg = sprintf($user->lang['STEP_PERCENT_COMPLETED'], $current_table, sizeof($convert->convertor['schema'])); - - $template->assign_vars(array( - 'L_MESSAGE' => $msg, - 'L_SUBMIT' => $user->lang['CONTINUE_CONVERT'], - 'U_ACTION' => $url, - )); - - $this->meta_refresh($url); - return; - } - } - - // Process execute_last then we'll be done - $url = $this->save_convert_progress('&jump=1'); - - $template->assign_vars(array( - 'L_SUBMIT' => $user->lang['FINAL_STEP'], - 'U_ACTION' => $url, - )); - - $this->meta_refresh($url); - return; - } - - /** - * Sync function being executed at the middle, some functions need to be executed after a successful sync. - */ - function sync_forums($sync_batch) - { - global $template, $user, $db, $phpbb_root_path, $phpEx, $config, $cache; - global $convert; - - $template->assign_block_vars('checks', array( - 'S_LEGEND' => true, - 'LEGEND' => $user->lang['SYNC_TOPICS'], - )); - - $batch_size = $convert->batch_size; - - $sql = 'SELECT MIN(topic_id) as min_value, MAX(topic_id) AS max_value - FROM ' . TOPICS_TABLE; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // Set values of minimum/maximum primary value for this table. - $primary_min = $row['min_value']; - $primary_max = $row['max_value']; - - if ($sync_batch == 0) - { - $sync_batch = (int) $primary_min; - } - - if ($sync_batch == 0) - { - $sync_batch = 1; - } - - // Fetch a batch of rows, process and insert them. - while ($sync_batch <= $primary_max && still_on_time()) - { - $end = ($sync_batch + $batch_size - 1); - - // Sync all topics in batch mode... - sync('topic_approved', 'range', 'topic_id BETWEEN ' . $sync_batch . ' AND ' . $end, true, false); - sync('topic', 'range', 'topic_id BETWEEN ' . $sync_batch . ' AND ' . $end, true, true); - - $template->assign_block_vars('checks', array( - 'TITLE' => sprintf($user->lang['SYNC_TOPIC_ID'], $sync_batch, ($sync_batch + $batch_size)) . ((defined('DEBUG_EXTRA') && function_exists('memory_get_usage')) ? ' [' . ceil(memory_get_usage()/1024) . ' ' . $user->lang['KIB'] . ']' : ''), - 'RESULT' => $user->lang['DONE'], - )); - - $sync_batch += $batch_size; - } - - if ($sync_batch >= $primary_max) - { - $url = $this->save_convert_progress('&final_jump=1'); - - $template->assign_vars(array( - 'L_SUBMIT' => $user->lang['CONTINUE_CONVERT'], - 'U_ACTION' => $url, - )); - - $this->meta_refresh($url); - return; - } - else - { - $sync_batch--; - } - - $url = $this->save_convert_progress('&sync_batch=' . $sync_batch); - - $template->assign_vars(array( - 'L_SUBMIT' => $user->lang['CONTINUE_CONVERT'], - 'U_ACTION' => $url, - )); - - $this->meta_refresh($url); - return; - } - - /** - * Save the convertor status - */ - function save_convert_progress($step) - { - global $convert, $language; - - // Save convertor Status - set_config('convert_progress', serialize(array( - 'step' => $step, - 'table_prefix' => $convert->src_table_prefix, - 'tag' => $convert->convertor_tag, - )), true); - - set_config('convert_db_server', serialize(array( - 'dbms' => $convert->src_dbms, - 'dbhost' => $convert->src_dbhost, - 'dbport' => $convert->src_dbport, - 'dbname' => $convert->src_dbname, - )), true); - - set_config('convert_db_user', serialize(array( - 'dbuser' => $convert->src_dbuser, - 'dbpasswd' => $convert->src_dbpasswd, - )), true); - - return $this->p_master->module_url . "?mode={$this->mode}&sub=in_progress&tag={$convert->convertor_tag}$step&language=$language"; - } - - /** - * Finish conversion, the last function to be called. - */ - function finish_conversion() - { - global $db, $phpbb_root_path, $convert, $config, $language, $user, $template; - - $db->sql_query('DELETE FROM ' . CONFIG_TABLE . " - WHERE config_name = 'convert_progress' - OR config_name = 'convert_options' - OR config_name = 'convert_db_server' - OR config_name = 'convert_db_user'"); - $db->sql_query('DELETE FROM ' . SESSIONS_TABLE); - - @unlink($phpbb_root_path . 'cache/data_global.php'); - cache_moderators(); - - // And finally, add a note to the log - add_log('admin', 'LOG_INSTALL_CONVERTED', $convert->convertor_data['forum_name'], $config['version']); - - $url = $this->p_master->module_url . "?mode={$this->mode}&sub=final&language=$language"; - - $template->assign_vars(array( - 'L_SUBMIT' => $user->lang['FINAL_STEP'], - 'U_ACTION' => $url, - )); - - $this->meta_refresh($url); - return; - } - - /** - * This function marks the steps after syncing - */ - function final_jump($final_jump) - { - global $template, $user, $src_db, $same_db, $db, $phpbb_root_path, $phpEx, $config, $cache; - global $convert; - - $template->assign_block_vars('checks', array( - 'S_LEGEND' => true, - 'LEGEND' => $user->lang['PROCESS_LAST'], - )); - - if ($final_jump == 1) - { - $db->sql_return_on_error(true); - - update_topics_posted(); - - $template->assign_block_vars('checks', array( - 'TITLE' => $user->lang['UPDATE_TOPICS_POSTED'], - 'RESULT' => $user->lang['DONE'], - )); - - if ($db->sql_error_triggered) - { - $template->assign_vars(array( - 'S_ERROR_BOX' => true, - 'ERROR_TITLE' => $user->lang['UPDATE_TOPICS_POSTED'], - 'ERROR_MSG' => $user->lang['UPDATE_TOPICS_POSTED_ERR'], - )); - } - $db->sql_return_on_error(false); - - $this->finish_conversion(); - return; - } - } - - /** - * This function marks the steps before syncing (jump=1) - */ - function jump($jump, $last_statement) - { - global $template, $user, $src_db, $same_db, $db, $phpbb_root_path, $phpEx, $config, $cache; - global $convert; - - $template->assign_block_vars('checks', array( - 'S_LEGEND' => true, - 'LEGEND' => $user->lang['PROCESS_LAST'], - )); - - if ($jump == 1) - { - // Execute 'last' statements/queries - if (!empty($convert->convertor['execute_last'])) - { - if (!is_array($convert->convertor['execute_last'])) - { - eval($convert->convertor['execute_last']); - } - else - { - while ($last_statement < sizeof($convert->convertor['execute_last'])) - { - eval($convert->convertor['execute_last'][$last_statement]); - - $template->assign_block_vars('checks', array( - 'TITLE' => $convert->convertor['execute_last'][$last_statement], - 'RESULT' => $user->lang['DONE'], - )); - - $last_statement++; - $url = $this->save_convert_progress('&jump=1&last=' . $last_statement); - - $percentage = ($last_statement == 0) ? 0 : floor(100 / (sizeof($convert->convertor['execute_last']) / $last_statement)); - $msg = sprintf($user->lang['STEP_PERCENT_COMPLETED'], $last_statement, sizeof($convert->convertor['execute_last']), $percentage); - - $template->assign_vars(array( - 'L_SUBMIT' => $user->lang['CONTINUE_LAST'], - 'L_MESSAGE' => $msg, - 'U_ACTION' => $url, - )); - - $this->meta_refresh($url); - return; - } - } - } - - if (!empty($convert->convertor['query_last'])) - { - if (!is_array($convert->convertor['query_last'])) - { - $convert->convertor['query_last'] = array('target', array($convert->convertor['query_last'])); - } - else if (!is_array($convert->convertor['query_last'][0])) - { - $convert->convertor['query_last'] = array(array($convert->convertor['query_last'][0], $convert->convertor['query_last'][1])); - } - - foreach ($convert->convertor['query_last'] as $query_last) - { - if ($query_last[0] == 'src') - { - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - - $src_db->sql_query($query_last[1]); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - } - else - { - $db->sql_query($query_last[1]); - } - } - } - - // Sanity check - $db->sql_return_on_error(false); - $src_db->sql_return_on_error(false); - - fix_empty_primary_groups(); - - if (!isset($config['board_startdate'])) - { - $sql = 'SELECT MIN(user_regdate) AS board_startdate - FROM ' . USERS_TABLE; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (($row['board_startdate'] < $config['board_startdate'] && $row['board_startdate'] > 0) || !isset($config['board_startdate'])) - { - set_config('board_startdate', $row['board_startdate']); - $db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_regdate = ' . $row['board_startdate'] . ' WHERE user_id = ' . ANONYMOUS); - } - } - - update_dynamic_config(); - - $template->assign_block_vars('checks', array( - 'TITLE' => $user->lang['CLEAN_VERIFY'], - 'RESULT' => $user->lang['DONE'], - )); - - $url = $this->save_convert_progress('&jump=2'); - - $template->assign_vars(array( - 'L_SUBMIT' => $user->lang['CONTINUE_CONVERT'], - 'U_ACTION' => $url, - )); - - $this->meta_refresh($url); - return; - } - - if ($jump == 2) - { - $db->sql_query('UPDATE ' . USERS_TABLE . " SET user_permissions = ''"); - - // TODO: sync() is likely going to bomb out on forums with a considerable amount of topics. - // TODO: the sync function is able to handle FROM-TO values, we should use them here (batch processing) - sync('forum', '', '', false, true); - $cache->destroy('sql', FORUMS_TABLE); - - $template->assign_block_vars('checks', array( - 'TITLE' => $user->lang['SYNC_FORUMS'], - 'RESULT' => $user->lang['DONE'], - )); - - // Continue with synchronizing the forums... - $url = $this->save_convert_progress('&sync_batch=0'); - - $template->assign_vars(array( - 'L_SUBMIT' => $user->lang['CONTINUE_CONVERT'], - 'U_ACTION' => $url, - )); - - $this->meta_refresh($url); - return; - } - } - - function build_insert_query(&$schema, &$sql_data, $current_table) - { - global $db, $user; - global $convert; - - // Can we use IGNORE with this DBMS? - $sql_ignore = ($db->dbms_type === 'mysql' && !defined('DEBUG_EXTRA')) ? 'IGNORE ' : ''; - $insert_query = 'INSERT ' . $sql_ignore . 'INTO ' . $schema['target'] . ' ('; - - $aliases = array(); - - $sql_data = array( - 'source_fields' => array(), - 'target_fields' => array(), - 'source_tables' => array(), - 'select_fields' => array(), - ); - - foreach ($schema as $key => $val) - { - // Example: array('group_name', 'extension_groups.group_name', 'htmlspecialchars'), - if (is_int($key)) - { - if (!empty($val[0])) - { - // Target fields - $sql_data['target_fields'][$val[0]] = $key; - $insert_query .= $val[0] . ', '; - } - - if (!is_array($val[1])) - { - $val[1] = array($val[1]); - } - - foreach ($val[1] as $valkey => $value_1) - { - // This should cover about any case: - // - // table.field => SELECT table.field FROM table - // table.field AS alias => SELECT table.field AS alias FROM table - // table.field AS table2.alias => SELECT table2.field AS alias FROM table table2 - // table.field AS table2.field => SELECT table2.field FROM table table2 - // - if (preg_match('/^([a-z0-9_]+)\.([a-z0-9_]+)( +AS +(([a-z0-9_]+?)\.)?([a-z0-9_]+))?$/i', $value_1, $m)) - { - // There is 'AS ...' in the field names - if (!empty($m[3])) - { - $value_1 = ($m[2] == $m[6]) ? $m[1] . '.' . $m[2] : $m[1] . '.' . $m[2] . ' AS ' . $m[6]; - - // Table alias: store it then replace the source table with it - if (!empty($m[5]) && $m[5] != $m[1]) - { - $aliases[$m[5]] = $m[1]; - $value_1 = str_replace($m[1] . '.' . $m[2], $m[5] . '.' . $m[2], $value_1); - } - } - else - { - // No table alias - $sql_data['source_tables'][$m[1]] = (empty($convert->src_table_prefix)) ? $m[1] : $convert->src_table_prefix . $m[1] . ' ' . $m[1]; - } - - $sql_data['select_fields'][$value_1] = $value_1; - $sql_data['source_fields'][$key][$valkey] = (!empty($m[6])) ? $m[6] : $m[2]; - } - } - } - else if ($key == 'where' || $key == 'group_by' || $key == 'order_by' || $key == 'having') - { - if (@preg_match_all('/([a-z0-9_]+)\.([a-z0-9_]+)/i', $val, $m)) - { - foreach ($m[1] as $value) - { - $sql_data['source_tables'][$value] = (empty($convert->src_table_prefix)) ? $value : $convert->src_table_prefix . $value . ' ' . $value; - } - } - } - } - - // Add the aliases to the list of tables - foreach ($aliases as $alias => $table) - { - $sql_data['source_tables'][$alias] = $convert->src_table_prefix . $table . ' ' . $alias; - } - - // 'left_join' => 'forums LEFT JOIN forum_prune ON forums.forum_id = forum_prune.forum_id', - if (!empty($schema['left_join'])) - { - if (!is_array($schema['left_join'])) - { - $schema['left_join'] = array($schema['left_join']); - } - - foreach ($schema['left_join'] as $left_join) - { - // This won't handle concatened LEFT JOINs - if (!preg_match('/([a-z0-9_]+) LEFT JOIN ([a-z0-9_]+) A?S? ?([a-z0-9_]*?) ?(ON|USING)(.*)/i', $left_join, $m)) - { - $this->p_master->error(sprintf($user->lang['NOT_UNDERSTAND'], 'LEFT JOIN', $left_join, $current_table, $schema['target']), __LINE__, __FILE__); - } - - if (!empty($aliases[$m[2]])) - { - if (!empty($m[3])) - { - $this->p_master->error(sprintf($user->lang['NAMING_CONFLICT'], $m[2], $m[3], $schema['left_join']), __LINE__, __FILE__); - } - - $m[2] = $aliases[$m[2]]; - $m[3] = $m[2]; - } - - $right_table = $convert->src_table_prefix . $m[2]; - if (!empty($m[3])) - { - unset($sql_data['source_tables'][$m[3]]); - } - else if ($m[2] != $m[1]) - { - unset($sql_data['source_tables'][$m[2]]); - } - - if (strpos($sql_data['source_tables'][$m[1]], "\nLEFT JOIN") !== false) - { - $sql_data['source_tables'][$m[1]] = '(' . $sql_data['source_tables'][$m[1]] . ")\nLEFT JOIN $right_table"; - } - else - { - $sql_data['source_tables'][$m[1]] .= "\nLEFT JOIN $right_table"; - } - - if (!empty($m[3])) - { - unset($sql_data['source_tables'][$m[3]]); - $sql_data['source_tables'][$m[1]] .= ' AS ' . $m[3]; - } - else if (!empty($convert->src_table_prefix)) - { - $sql_data['source_tables'][$m[1]] .= ' AS ' . $m[2]; - } - $sql_data['source_tables'][$m[1]] .= ' ' . $m[4] . $m[5]; - } - } - - // Remove ", " from the end of the insert query - $insert_query = substr($insert_query, 0, -2) . ') VALUES '; - - return $insert_query; - } - - /** - * Function for processing the currently handled row - */ - function process_row(&$schema, &$sql_data, &$insert_values) - { - global $template, $user, $phpbb_root_path, $phpEx, $db, $lang, $config, $cache; - global $convert, $convert_row; - - $sql_flag = false; - - foreach ($schema as $key => $fields) - { - // We are only interested in the lines with: - // array('comment', 'attachments_desc.comment', 'htmlspecialchars'), - if (is_int($key)) - { - if (!is_array($fields[1])) - { - $fields[1] = array($fields[1]); - } - - $firstkey_set = false; - $firstkey = 0; - - foreach ($fields[1] as $inner_key => $inner_value) - { - if (!$firstkey_set) - { - $firstkey = $inner_key; - $firstkey_set = true; - } - - $src_field = isset($sql_data['source_fields'][$key][$inner_key]) ? $sql_data['source_fields'][$key][$inner_key] : ''; - - if (!empty($src_field)) - { - $fields[1][$inner_key] = $convert->row[$src_field]; - } - } - - if (!empty($fields[0])) - { - // We have a target field, if we haven't set $sql_flag yet it will be set to TRUE. - // If a function has already set it to FALSE it won't change it. - if ($sql_flag === false) - { - $sql_flag = true; - } - - // No function assigned? - if (empty($fields[2])) - { - $value = $fields[1][$firstkey]; - } - else if (is_array($fields[2])) - { - // Execute complex function/eval/typecast - $value = $fields[1]; - - foreach ($fields[2] as $type => $execution) - { - if (strpos($type, 'typecast') === 0) - { - if (!is_array($value)) - { - $value = array($value); - } - $value = $value[0]; - settype($value, $execution); - } - else if (strpos($type, 'function') === 0) - { - if (!is_array($value)) - { - $value = array($value); - } - - $value = call_user_func_array($execution, $value); - } - else if (strpos($type, 'execute') === 0) - { - if (!is_array($value)) - { - $value = array($value); - } - - $execution = str_replace('{RESULT}', '$value', $execution); - $execution = str_replace('{VALUE}', '$value', $execution); - eval($execution); - } - } - } - else - { - $value = call_user_func_array($fields[2], $fields[1]); - } - - if (is_null($value)) - { - $value = ''; - } - - $insert_values[] = $db->_sql_validate_value($value); - } - else if (!empty($fields[2])) - { - if (is_array($fields[2])) - { - // Execute complex function/eval/typecast - $value = ''; - - foreach ($fields[2] as $type => $execution) - { - if (strpos($type, 'typecast') === 0) - { - $value = settype($value, $execution); - } - else if (strpos($type, 'function') === 0) - { - if (!is_array($value)) - { - $value = array($value); - } - - $value = call_user_func_array($execution, $value); - } - else if (strpos($type, 'execute') === 0) - { - if (!is_array($value)) - { - $value = array($value); - } - - $execution = str_replace('{RESULT}', '$value', $execution); - $execution = str_replace('{VALUE}', '$value', $execution); - eval($execution); - } - } - } - else - { - call_user_func_array($fields[2], $fields[1]); - } - } - } - } - - return $sql_flag; - } - - /** - * Own meta refresh function to be able to change the global time used - */ - function meta_refresh($url) - { - global $convert, $template; - - if ($convert->options['refresh']) - { - // Because we should not rely on correct settings, we simply use the relative path here directly. - $template->assign_vars(array( - 'S_REFRESH' => true, - 'META' => '') - ); - } - } - - /** - * The information below will be used to build the input fields presented to the user - */ - var $convert_options = array( - 'legend1' => 'SPECIFY_OPTIONS', - 'src_dbms' => array('lang' => 'DBMS', 'type' => 'select', 'options' => 'dbms_select(\'{VALUE}\', true)', 'explain' => false), - 'src_dbhost' => array('lang' => 'DB_HOST', 'type' => 'text:25:100', 'explain' => true), - 'src_dbport' => array('lang' => 'DB_PORT', 'type' => 'text:25:100', 'explain' => true), - 'src_dbname' => array('lang' => 'DB_NAME', 'type' => 'text:25:100', 'explain' => false), - 'src_dbuser' => array('lang' => 'DB_USERNAME', 'type' => 'text:25:100', 'explain' => false), - 'src_dbpasswd' => array('lang' => 'DB_PASSWORD', 'type' => 'password:25:100', 'explain' => false), - 'src_table_prefix' => array('lang' => 'TABLE_PREFIX', 'type' => 'text:25:100', 'explain' => false), - //'src_url' => array('lang' => 'FORUM_ADDRESS', 'type' => 'text:50:100', 'explain' => true), - 'forum_path' => array('lang' => 'FORUM_PATH', 'type' => 'text:25:100', 'explain' => true), - 'refresh' => array('lang' => 'REFRESH_PAGE', 'type' => 'radio:yes_no', 'explain' => true), - ); -} - -?> \ No newline at end of file diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php deleted file mode 100755 index e1eb249758..0000000000 --- a/phpBB/install/install_install.php +++ /dev/null @@ -1,2226 +0,0 @@ - 'install', - 'module_title' => 'INSTALL', - 'module_filename' => substr(basename(__FILE__), 0, -strlen($phpEx)-1), - 'module_order' => 10, - 'module_subs' => '', - 'module_stages' => array('INTRO', 'REQUIREMENTS', 'DATABASE', 'ADMINISTRATOR', 'CONFIG_FILE', 'ADVANCED', 'CREATE_TABLE', 'FINAL'), - 'module_reqs' => '' - ); -} - -/** -* Installation -* @package install -*/ -class install_install extends module -{ - function install_install(&$p_master) - { - $this->p_master = &$p_master; - } - - function main($mode, $sub) - { - global $lang, $template, $language, $phpbb_root_path; - - switch ($sub) - { - case 'intro': - $this->page_title = $lang['SUB_INTRO']; - - $template->assign_vars(array( - 'TITLE' => $lang['INSTALL_INTRO'], - 'BODY' => $lang['INSTALL_INTRO_BODY'], - 'L_SUBMIT' => $lang['NEXT_STEP'], - 'S_LANG_SELECT' => '', - 'U_ACTION' => $this->p_master->module_url . "?mode=$mode&sub=requirements&language=$language", - )); - - break; - - case 'requirements': - $this->check_server_requirements($mode, $sub); - - break; - - case 'database': - $this->obtain_database_settings($mode, $sub); - - break; - - case 'administrator': - $this->obtain_admin_settings($mode, $sub); - - break; - - case 'config_file': - $this->create_config_file($mode, $sub); - - break; - - case 'advanced': - $this->obtain_advanced_settings($mode, $sub); - - break; - - case 'create_table': - $this->load_schema($mode, $sub); - break; - - case 'final': - $this->build_search_index($mode, $sub); - $this->add_modules($mode, $sub); - $this->add_language($mode, $sub); - $this->add_bots($mode, $sub); - $this->email_admin($mode, $sub); - - // Remove the lock file - @unlink($phpbb_root_path . 'cache/install_lock'); - - break; - } - - $this->tpl_name = 'install_install'; - } - - /** - * Checks that the server we are installing on meets the requirements for running phpBB - */ - function check_server_requirements($mode, $sub) - { - global $lang, $template, $phpbb_root_path, $phpEx, $language; - - $this->page_title = $lang['STAGE_REQUIREMENTS']; - - $template->assign_vars(array( - 'TITLE' => $lang['REQUIREMENTS_TITLE'], - 'BODY' => $lang['REQUIREMENTS_EXPLAIN'], - )); - - $passed = array('php' => false, 'db' => false, 'files' => false, 'pcre' => false, 'imagesize' => false,); - - // Test for basic PHP settings - $template->assign_block_vars('checks', array( - 'S_LEGEND' => true, - 'LEGEND' => $lang['PHP_SETTINGS'], - 'LEGEND_EXPLAIN' => $lang['PHP_SETTINGS_EXPLAIN'], - )); - - // Test the minimum PHP version - $php_version = PHP_VERSION; - - if (version_compare($php_version, '5.1.0') < 0) - { - $result = '' . $lang['NO'] . ''; - } - else - { - $passed['php'] = true; - - // We also give feedback on whether we're running in safe mode - $result = '' . $lang['YES']; - if (@ini_get('safe_mode') == '1' || strtolower(@ini_get('safe_mode')) == 'on') - { - $result .= ', ' . $lang['PHP_SAFE_MODE']; - } - $result .= ''; - } - - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['PHP_VERSION_REQD'], - 'RESULT' => $result, - - 'S_EXPLAIN' => false, - 'S_LEGEND' => false, - )); - - // Check for register_globals being enabled - if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') - { - $result = '' . $lang['NO'] . ''; - } - else - { - $result = '' . $lang['YES'] . ''; - } - - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['PHP_REGISTER_GLOBALS'], - 'TITLE_EXPLAIN' => $lang['PHP_REGISTER_GLOBALS_EXPLAIN'], - 'RESULT' => $result, - - 'S_EXPLAIN' => true, - 'S_LEGEND' => false, - )); - - - // Check for url_fopen - if (@ini_get('allow_url_fopen') == '1' || strtolower(@ini_get('allow_url_fopen')) == 'on') - { - $result = '' . $lang['YES'] . ''; - } - else - { - $result = '' . $lang['NO'] . ''; - } - - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['PHP_URL_FOPEN_SUPPORT'], - 'TITLE_EXPLAIN' => $lang['PHP_URL_FOPEN_SUPPORT_EXPLAIN'], - 'RESULT' => $result, - - 'S_EXPLAIN' => true, - 'S_LEGEND' => false, - )); - - - // Check for getimagesize - if (@function_exists('getimagesize')) - { - $passed['imagesize'] = true; - $result = '' . $lang['YES'] . ''; - } - else - { - $result = '' . $lang['NO'] . ''; - } - - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['PHP_GETIMAGESIZE_SUPPORT'], - 'TITLE_EXPLAIN' => $lang['PHP_GETIMAGESIZE_SUPPORT_EXPLAIN'], - 'RESULT' => $result, - - 'S_EXPLAIN' => true, - 'S_LEGEND' => false, - )); - - // Check for PCRE UTF-8 support - if (@preg_match('//u', '')) - { - $passed['pcre'] = true; - $result = '' . $lang['YES'] . ''; - } - else - { - $result = '' . $lang['NO'] . ''; - } - - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['PCRE_UTF_SUPPORT'], - 'TITLE_EXPLAIN' => $lang['PCRE_UTF_SUPPORT_EXPLAIN'], - 'RESULT' => $result, - - 'S_EXPLAIN' => true, - 'S_LEGEND' => false, - )); - - // Check for PCRE unicode property support - if (@preg_match('/\p{Ll}/u', 'a')) - { - $passed['pcre'] = true; - $result = '' . $lang['YES'] . ''; - } - else - { - $result = '' . $lang['NO'] . ''; - } - - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['PCRE_UNI_PROP_SUPPORT'], - 'TITLE_EXPLAIN' => $lang['PCRE_UNI_PROP_SUPPORT_EXPLAIN'], - 'RESULT' => $result, - - 'S_EXPLAIN' => true, - 'S_LEGEND' => false, - )); - -/** -* Better not enabling and adding to the loaded extensions due to the specific requirements needed - if (!@extension_loaded('mbstring')) - { - can_load_dll('mbstring'); - } -*/ - - $passed['mbstring'] = true; - if (@extension_loaded('mbstring')) - { - // Test for available database modules - $template->assign_block_vars('checks', array( - 'S_LEGEND' => true, - 'LEGEND' => $lang['MBSTRING_CHECK'], - 'LEGEND_EXPLAIN' => $lang['MBSTRING_CHECK_EXPLAIN'], - )); - - $checks = array( - array('func_overload', '&', MB_OVERLOAD_MAIL|MB_OVERLOAD_STRING), - array('encoding_translation', '!=', 0), - array('http_input', '!=', 'pass'), - array('http_output', '!=', 'pass') - ); - - foreach ($checks as $mb_checks) - { - $ini_val = @ini_get('mbstring.' . $mb_checks[0]); - switch ($mb_checks[1]) - { - case '&': - if (intval($ini_val) & $mb_checks[2]) - { - $result = '' . $lang['NO'] . ''; - $passed['mbstring'] = false; - } - else - { - $result = '' . $lang['YES'] . ''; - } - break; - - case '!=': - if ($ini_val != $mb_checks[2]) - { - $result = '' . $lang['NO'] . ''; - $passed['mbstring'] = false; - } - else - { - $result = '' . $lang['YES'] . ''; - } - break; - } - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['MBSTRING_' . strtoupper($mb_checks[0])], - 'TITLE_EXPLAIN' => $lang['MBSTRING_' . strtoupper($mb_checks[0]) . '_EXPLAIN'], - 'RESULT' => $result, - - 'S_EXPLAIN' => true, - 'S_LEGEND' => false, - )); - } - } - - // Test for available database modules - $template->assign_block_vars('checks', array( - 'S_LEGEND' => true, - 'LEGEND' => $lang['PHP_SUPPORTED_DB'], - 'LEGEND_EXPLAIN' => $lang['PHP_SUPPORTED_DB_EXPLAIN'], - )); - - $available_dbms = get_available_dbms(false, true); - $passed['db'] = $available_dbms['ANY_DB_SUPPORT']; - unset($available_dbms['ANY_DB_SUPPORT']); - - foreach ($available_dbms as $db_name => $db_ary) - { - if (!$db_ary['AVAILABLE']) - { - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['DLL_' . strtoupper($db_name)], - 'RESULT' => '' . $lang['UNAVAILABLE'] . '', - - 'S_EXPLAIN' => false, - 'S_LEGEND' => false, - )); - } - else - { - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['DLL_' . strtoupper($db_name)], - 'RESULT' => '' . $lang['AVAILABLE'] . '', - - 'S_EXPLAIN' => false, - 'S_LEGEND' => false, - )); - } - } - - // Test for other modules - $template->assign_block_vars('checks', array( - 'S_LEGEND' => true, - 'LEGEND' => $lang['PHP_OPTIONAL_MODULE'], - 'LEGEND_EXPLAIN' => $lang['PHP_OPTIONAL_MODULE_EXPLAIN'], - )); - - foreach ($this->php_dlls_other as $dll) - { - if (!@extension_loaded($dll)) - { - if (!can_load_dll($dll)) - { - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['DLL_' . strtoupper($dll)], - 'RESULT' => '' . $lang['UNAVAILABLE'] . '', - - 'S_EXPLAIN' => false, - 'S_LEGEND' => false, - )); - continue; - } - } - - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['DLL_' . strtoupper($dll)], - 'RESULT' => '' . $lang['AVAILABLE'] . '', - - 'S_EXPLAIN' => false, - 'S_LEGEND' => false, - )); - } - - // Can we find Imagemagick anywhere on the system? - $exe = (DIRECTORY_SEPARATOR == '\\') ? '.exe' : ''; - - $magic_home = getenv('MAGICK_HOME'); - $img_imagick = ''; - if (empty($magic_home)) - { - $locations = array('C:/WINDOWS/', 'C:/WINNT/', 'C:/WINDOWS/SYSTEM/', 'C:/WINNT/SYSTEM/', 'C:/WINDOWS/SYSTEM32/', 'C:/WINNT/SYSTEM32/', '/usr/bin/', '/usr/sbin/', '/usr/local/bin/', '/usr/local/sbin/', '/opt/', '/usr/imagemagick/', '/usr/bin/imagemagick/'); - $path_locations = str_replace('\\', '/', (explode(($exe) ? ';' : ':', getenv('PATH')))); - - $locations = array_merge($path_locations, $locations); - foreach ($locations as $location) - { - // The path might not end properly, fudge it - if (substr($location, -1, 1) !== '/') - { - $location .= '/'; - } - - if (@is_readable($location . 'mogrify' . $exe) && @filesize($location . 'mogrify' . $exe) > 3000) - { - $img_imagick = str_replace('\\', '/', $location); - continue; - } - } - } - else - { - $img_imagick = str_replace('\\', '/', $magic_home); - } - - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['APP_MAGICK'], - 'RESULT' => ($img_imagick) ? '' . $lang['AVAILABLE'] . ', ' . $img_imagick . '' : '' . $lang['NO_LOCATION'] . '', - - 'S_EXPLAIN' => false, - 'S_LEGEND' => false, - )); - - // Check permissions on files/directories we need access to - $template->assign_block_vars('checks', array( - 'S_LEGEND' => true, - 'LEGEND' => $lang['FILES_REQUIRED'], - 'LEGEND_EXPLAIN' => $lang['FILES_REQUIRED_EXPLAIN'], - )); - - $directories = array('cache/', 'files/', 'store/'); - - umask(0); - - $passed['files'] = true; - foreach ($directories as $dir) - { - $exists = $write = false; - - // Try to create the directory if it does not exist - if (!file_exists($phpbb_root_path . $dir)) - { - @mkdir($phpbb_root_path . $dir, 0777); - @chmod($phpbb_root_path . $dir, 0777); - } - - // Now really check - if (file_exists($phpbb_root_path . $dir) && is_dir($phpbb_root_path . $dir)) - { - if (!@is_writable($phpbb_root_path . $dir)) - { - @chmod($phpbb_root_path . $dir, 0777); - } - $exists = true; - } - - // Now check if it is writable by storing a simple file - $fp = @fopen($phpbb_root_path . $dir . 'test_lock', 'wb'); - if ($fp !== false) - { - $write = true; - } - @fclose($fp); - - @unlink($phpbb_root_path . $dir . 'test_lock'); - - $passed['files'] = ($exists && $write && $passed['files']) ? true : false; - - $exists = ($exists) ? '' . $lang['FOUND'] . '' : '' . $lang['NOT_FOUND'] . ''; - $write = ($write) ? ', ' . $lang['WRITABLE'] . '' : (($exists) ? ', ' . $lang['UNWRITABLE'] . '' : ''); - - $template->assign_block_vars('checks', array( - 'TITLE' => $dir, - 'RESULT' => $exists . $write, - - 'S_EXPLAIN' => false, - 'S_LEGEND' => false, - )); - } - - // Check permissions on files/directories it would be useful access to - $template->assign_block_vars('checks', array( - 'S_LEGEND' => true, - 'LEGEND' => $lang['FILES_OPTIONAL'], - 'LEGEND_EXPLAIN' => $lang['FILES_OPTIONAL_EXPLAIN'], - )); - - $directories = array('config.' . $phpEx, 'images/avatars/upload/'); - - foreach ($directories as $dir) - { - $write = $exists = true; - if (file_exists($phpbb_root_path . $dir)) - { - if (!@is_writable($phpbb_root_path . $dir)) - { - $write = false; - } - } - else - { - $write = $exists = false; - } - - $exists_str = ($exists) ? '' . $lang['FOUND'] . '' : '' . $lang['NOT_FOUND'] . ''; - $write_str = ($write) ? ', ' . $lang['WRITABLE'] . '' : (($exists) ? ', ' . $lang['UNWRITABLE'] . '' : ''); - - $template->assign_block_vars('checks', array( - 'TITLE' => $dir, - 'RESULT' => $exists_str . $write_str, - - 'S_EXPLAIN' => false, - 'S_LEGEND' => false, - )); - } - - // And finally where do we want to go next (well today is taken isn't it :P) - $s_hidden_fields = ($img_imagick) ? '' : ''; - - $url = (!in_array(false, $passed)) ? $this->p_master->module_url . "?mode=$mode&sub=database&language=$language" : $this->p_master->module_url . "?mode=$mode&sub=requirements&language=$language "; - $submit = (!in_array(false, $passed)) ? $lang['INSTALL_START'] : $lang['INSTALL_TEST']; - - - $template->assign_vars(array( - 'L_SUBMIT' => $submit, - 'S_HIDDEN' => $s_hidden_fields, - 'U_ACTION' => $url, - )); - } - - /** - * Obtain the information required to connect to the database - */ - function obtain_database_settings($mode, $sub) - { - global $lang, $template, $phpEx; - - $this->page_title = $lang['STAGE_DATABASE']; - - // Obtain any submitted data - $data = $this->get_submitted_data(); - - $connect_test = false; - $error = array(); - $available_dbms = get_available_dbms(false, true); - - // Has the user opted to test the connection? - if (isset($_POST['testdb'])) - { - if (!isset($available_dbms[$data['dbms']]) || !$available_dbms[$data['dbms']]['AVAILABLE']) - { - $error['db'][] = $lang['INST_ERR_NO_DB']; - $connect_test = false; - } - else - { - $connect_test = connect_check_db(true, $error, $available_dbms[$data['dbms']], $data['table_prefix'], $data['dbhost'], $data['dbuser'], htmlspecialchars_decode($data['dbpasswd']), $data['dbname'], $data['dbport']); - } - - $template->assign_block_vars('checks', array( - 'S_LEGEND' => true, - 'LEGEND' => $lang['DB_CONNECTION'], - 'LEGEND_EXPLAIN' => false, - )); - - if ($connect_test) - { - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['DB_TEST'], - 'RESULT' => '' . $lang['SUCCESSFUL_CONNECT'] . '', - - 'S_EXPLAIN' => false, - 'S_LEGEND' => false, - )); - } - else - { - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['DB_TEST'], - 'RESULT' => '' . implode('
    ', $error) . '
    ', - - 'S_EXPLAIN' => false, - 'S_LEGEND' => false, - )); - } - } - - if (!$connect_test) - { - // Update the list of available DBMS modules to only contain those which can be used - $available_dbms_temp = array(); - foreach ($available_dbms as $type => $dbms_ary) - { - if (!$dbms_ary['AVAILABLE']) - { - continue; - } - - $available_dbms_temp[$type] = $dbms_ary; - } - - $available_dbms = &$available_dbms_temp; - - // And now for the main part of this page - $data['table_prefix'] = (!empty($data['table_prefix']) ? $data['table_prefix'] : 'phpbb_'); - - foreach ($this->db_config_options as $config_key => $vars) - { - if (!is_array($vars) && strpos($config_key, 'legend') === false) - { - continue; - } - - if (strpos($config_key, 'legend') !== false) - { - $template->assign_block_vars('options', array( - 'S_LEGEND' => true, - 'LEGEND' => $lang[$vars]) - ); - - continue; - } - - $options = isset($vars['options']) ? $vars['options'] : ''; - - $template->assign_block_vars('options', array( - 'KEY' => $config_key, - 'TITLE' => $lang[$vars['lang']], - 'S_EXPLAIN' => $vars['explain'], - 'S_LEGEND' => false, - 'TITLE_EXPLAIN' => ($vars['explain']) ? $lang[$vars['lang'] . '_EXPLAIN'] : '', - 'CONTENT' => $this->p_master->input_field($config_key, $vars['type'], $data[$config_key], $options), - ) - ); - } - } - - // And finally where do we want to go next (well today is taken isn't it :P) - $s_hidden_fields = ($data['img_imagick']) ? '' : ''; - $s_hidden_fields .= ''; - if ($connect_test) - { - foreach ($this->db_config_options as $config_key => $vars) - { - if (!is_array($vars)) - { - continue; - } - $s_hidden_fields .= ''; - } - } - - $url = ($connect_test) ? $this->p_master->module_url . "?mode=$mode&sub=administrator" : $this->p_master->module_url . "?mode=$mode&sub=database"; - $s_hidden_fields .= ($connect_test) ? '' : ''; - - $submit = $lang['NEXT_STEP']; - - $template->assign_vars(array( - 'L_SUBMIT' => $submit, - 'S_HIDDEN' => $s_hidden_fields, - 'U_ACTION' => $url, - )); - } - - /** - * Obtain the administrator's name, password and email address - */ - function obtain_admin_settings($mode, $sub) - { - global $lang, $template, $phpEx; - - $this->page_title = $lang['STAGE_ADMINISTRATOR']; - - // Obtain any submitted data - $data = $this->get_submitted_data(); - - if ($data['dbms'] == '') - { - // Someone's been silly and tried calling this page direct - // So we send them back to the start to do it again properly - $this->p_master->redirect("index.$phpEx?mode=install"); - } - - $s_hidden_fields = ($data['img_imagick']) ? '' : ''; - $passed = false; - - $data['default_lang'] = ($data['default_lang'] !== '') ? $data['default_lang'] : $data['language']; - - if (isset($_POST['check'])) - { - $error = array(); - - // Check the entered email address and password - if ($data['admin_name'] == '' || $data['admin_pass1'] == '' || $data['admin_pass2'] == '' || $data['board_email1'] == '' || $data['board_email2'] == '') - { - $error[] = $lang['INST_ERR_MISSING_DATA']; - } - - if ($data['admin_pass1'] != $data['admin_pass2'] && $data['admin_pass1'] != '') - { - $error[] = $lang['INST_ERR_PASSWORD_MISMATCH']; - } - - // Test against the default username rules - if ($data['admin_name'] != '' && utf8_strlen($data['admin_name']) < 3) - { - $error[] = $lang['INST_ERR_USER_TOO_SHORT']; - } - - if ($data['admin_name'] != '' && utf8_strlen($data['admin_name']) > 20) - { - $error[] = $lang['INST_ERR_USER_TOO_LONG']; - } - - // Test against the default password rules - if ($data['admin_pass1'] != '' && utf8_strlen($data['admin_pass1']) < 6) - { - $error[] = $lang['INST_ERR_PASSWORD_TOO_SHORT']; - } - - if ($data['admin_pass1'] != '' && utf8_strlen($data['admin_pass1']) > 30) - { - $error[] = $lang['INST_ERR_PASSWORD_TOO_LONG']; - } - - if ($data['board_email1'] != $data['board_email2'] && $data['board_email1'] != '') - { - $error[] = $lang['INST_ERR_EMAIL_MISMATCH']; - } - - if ($data['board_email1'] != '' && !preg_match('/^' . get_preg_expression('email') . '$/i', $data['board_email1'])) - { - $error[] = $lang['INST_ERR_EMAIL_INVALID']; - } - - $template->assign_block_vars('checks', array( - 'S_LEGEND' => true, - 'LEGEND' => $lang['STAGE_ADMINISTRATOR'], - 'LEGEND_EXPLAIN' => false, - )); - - if (!sizeof($error)) - { - $passed = true; - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['ADMIN_TEST'], - 'RESULT' => '' . $lang['TESTS_PASSED'] . '', - - 'S_EXPLAIN' => false, - 'S_LEGEND' => false, - )); - } - else - { - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['ADMIN_TEST'], - 'RESULT' => '' . implode('
    ', $error) . '
    ', - - 'S_EXPLAIN' => false, - 'S_LEGEND' => false, - )); - } - } - - if (!$passed) - { - foreach ($this->admin_config_options as $config_key => $vars) - { - if (!is_array($vars) && strpos($config_key, 'legend') === false) - { - continue; - } - - if (strpos($config_key, 'legend') !== false) - { - $template->assign_block_vars('options', array( - 'S_LEGEND' => true, - 'LEGEND' => $lang[$vars]) - ); - - continue; - } - - $options = isset($vars['options']) ? $vars['options'] : ''; - - $template->assign_block_vars('options', array( - 'KEY' => $config_key, - 'TITLE' => $lang[$vars['lang']], - 'S_EXPLAIN' => $vars['explain'], - 'S_LEGEND' => false, - 'TITLE_EXPLAIN' => ($vars['explain']) ? $lang[$vars['lang'] . '_EXPLAIN'] : '', - 'CONTENT' => $this->p_master->input_field($config_key, $vars['type'], $data[$config_key], $options), - ) - ); - } - } - else - { - foreach ($this->admin_config_options as $config_key => $vars) - { - if (!is_array($vars)) - { - continue; - } - $s_hidden_fields .= ''; - } - } - - $s_hidden_fields .= ($data['img_imagick']) ? '' : ''; - $s_hidden_fields .= ''; - - foreach ($this->db_config_options as $config_key => $vars) - { - if (!is_array($vars)) - { - continue; - } - $s_hidden_fields .= ''; - } - - $submit = $lang['NEXT_STEP']; - - $url = ($passed) ? $this->p_master->module_url . "?mode=$mode&sub=config_file" : $this->p_master->module_url . "?mode=$mode&sub=administrator"; - $s_hidden_fields .= ($passed) ? '' : ''; - - $template->assign_vars(array( - 'L_SUBMIT' => $submit, - 'S_HIDDEN' => $s_hidden_fields, - 'U_ACTION' => $url, - )); - } - - /** - * Writes the config file to disk, or if unable to do so offers alternative methods - */ - function create_config_file($mode, $sub) - { - global $lang, $template, $phpbb_root_path, $phpEx; - - $this->page_title = $lang['STAGE_CONFIG_FILE']; - - // Obtain any submitted data - $data = $this->get_submitted_data(); - - if ($data['dbms'] == '') - { - // Someone's been silly and tried calling this page direct - // So we send them back to the start to do it again properly - $this->p_master->redirect("index.$phpEx?mode=install"); - } - - $s_hidden_fields = ($data['img_imagick']) ? '' : ''; - $s_hidden_fields .= ''; - $written = false; - - // Create a list of any PHP modules we wish to have loaded - $load_extensions = array(); - $available_dbms = get_available_dbms($data['dbms']); - $check_exts = array_merge(array($available_dbms[$data['dbms']]['MODULE']), $this->php_dlls_other); - - foreach ($check_exts as $dll) - { - if (!@extension_loaded($dll)) - { - if (!can_load_dll($dll)) - { - continue; - } - - $load_extensions[] = $dll . '.' . PHP_SHLIB_SUFFIX; - } - } - - // Create a lock file to indicate that there is an install in progress - $fp = @fopen($phpbb_root_path . 'cache/install_lock', 'wb'); - if ($fp === false) - { - // We were unable to create the lock file - abort - $this->p_master->error($lang['UNABLE_WRITE_LOCK'], __LINE__, __FILE__); - } - @fclose($fp); - - @chmod($phpbb_root_path . 'cache/install_lock', 0666); - - $load_extensions = implode(',', $load_extensions); - - // Time to convert the data provided into a config file - $config_data = " $available_dbms[$data['dbms']]['DRIVER'], - 'dbhost' => $data['dbhost'], - 'dbport' => $data['dbport'], - 'dbname' => $data['dbname'], - 'dbuser' => $data['dbuser'], - 'dbpasswd' => htmlspecialchars_decode($data['dbpasswd']), - 'table_prefix' => $data['table_prefix'], - 'acm_type' => 'file', - 'load_extensions' => $load_extensions, - ); - - foreach ($config_data_array as $key => $value) - { - $config_data .= "\${$key} = '" . str_replace("'", "\\'", str_replace('\\', '\\\\', $value)) . "';\n"; - } - unset($config_data_array); - - $config_data .= "\n@define('PHPBB_INSTALLED', true);\n"; - $config_data .= "@define('DEBUG', true);\n"; - $config_data .= "@define('DEBUG_EXTRA', true);\n"; - $config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused! - - // Attempt to write out the config file directly. If it works, this is the easiest way to do it ... - if ((file_exists($phpbb_root_path . 'config.' . $phpEx) && is_writable($phpbb_root_path . 'config.' . $phpEx)) || is_writable($phpbb_root_path)) - { - // Assume it will work ... if nothing goes wrong below - $written = true; - - if (!($fp = @fopen($phpbb_root_path . 'config.' . $phpEx, 'w'))) - { - // Something went wrong ... so let's try another method - $written = false; - } - - if (!(@fwrite($fp, $config_data))) - { - // Something went wrong ... so let's try another method - $written = false; - } - - @fclose($fp); - - if ($written) - { - @chmod($phpbb_root_path . 'config.' . $phpEx, 0644); - } - } - - if (isset($_POST['dldone'])) - { - // Do a basic check to make sure that the file has been uploaded - // Note that all we check is that the file has _something_ in it - // We don't compare the contents exactly - if they can't upload - // a single file correctly, it's likely they will have other problems.... - if (filesize($phpbb_root_path . 'config.' . $phpEx) > 10) - { - $written = true; - } - } - - $config_options = array_merge($this->db_config_options, $this->admin_config_options); - - foreach ($config_options as $config_key => $vars) - { - if (!is_array($vars)) - { - continue; - } - $s_hidden_fields .= ''; - } - - if (!$written) - { - // OK, so it didn't work let's try the alternatives - - if (isset($_POST['dlconfig'])) - { - // They want a copy of the file to download, so send the relevant headers and dump out the data - header("Content-Type: text/x-delimtext; name=\"config.$phpEx\""); - header("Content-disposition: attachment; filename=config.$phpEx"); - echo $config_data; - exit; - } - - // The option to download the config file is always available, so output it here - $template->assign_vars(array( - 'BODY' => $lang['CONFIG_FILE_UNABLE_WRITE'], - 'L_DL_CONFIG' => $lang['DL_CONFIG'], - 'L_DL_CONFIG_EXPLAIN' => $lang['DL_CONFIG_EXPLAIN'], - 'L_DL_DONE' => $lang['DONE'], - 'L_DL_DOWNLOAD' => $lang['DL_DOWNLOAD'], - 'S_HIDDEN' => $s_hidden_fields, - 'S_SHOW_DOWNLOAD' => true, - 'U_ACTION' => $this->p_master->module_url . "?mode=$mode&sub=config_file", - )); - return; - } - else - { - $template->assign_vars(array( - 'BODY' => $lang['CONFIG_FILE_WRITTEN'], - 'L_SUBMIT' => $lang['NEXT_STEP'], - 'S_HIDDEN' => $s_hidden_fields, - 'U_ACTION' => $this->p_master->module_url . "?mode=$mode&sub=advanced", - )); - return; - } - } - - /** - * Provide an opportunity to customise some advanced settings during the install - * in case it is necessary for them to be set to access later - */ - function obtain_advanced_settings($mode, $sub) - { - global $lang, $template, $phpEx; - - $this->page_title = $lang['STAGE_ADVANCED']; - - // Obtain any submitted data - $data = $this->get_submitted_data(); - - if ($data['dbms'] == '') - { - // Someone's been silly and tried calling this page direct - // So we send them back to the start to do it again properly - $this->p_master->redirect("index.$phpEx?mode=install"); - } - - $s_hidden_fields = ($data['img_imagick']) ? '' : ''; - $s_hidden_fields .= ''; - - // HTTP_HOST is having the correct browser url in most cases... - $server_name = (!empty($_SERVER['HTTP_HOST'])) ? strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME')); - - $data['email_enable'] = ($data['email_enable'] !== '') ? $data['email_enable'] : true; - $data['server_name'] = ($data['server_name'] !== '') ? $data['server_name'] : $server_name; - $data['server_port'] = ($data['server_port'] !== '') ? $data['server_port'] : ((!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT')); - $data['server_protocol'] = ($data['server_protocol'] !== '') ? $data['server_protocol'] : ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://'); - $data['cookie_secure'] = ($data['cookie_secure'] !== '') ? $data['cookie_secure'] : ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? true : false); - - if ($data['script_path'] === '') - { - $name = (!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : getenv('PHP_SELF'); - if (!$name) - { - $name = (!empty($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : getenv('REQUEST_URI'); - } - - // Replace backslashes and doubled slashes (could happen on some proxy setups) - $name = str_replace(array('\\', '//', '/install'), '/', $name); - $data['script_path'] = trim(dirname($name)); - } - - foreach ($this->advanced_config_options as $config_key => $vars) - { - if (!is_array($vars) && strpos($config_key, 'legend') === false) - { - continue; - } - - if (strpos($config_key, 'legend') !== false) - { - $template->assign_block_vars('options', array( - 'S_LEGEND' => true, - 'LEGEND' => $lang[$vars]) - ); - - continue; - } - - $options = isset($vars['options']) ? $vars['options'] : ''; - - $template->assign_block_vars('options', array( - 'KEY' => $config_key, - 'TITLE' => $lang[$vars['lang']], - 'S_EXPLAIN' => $vars['explain'], - 'S_LEGEND' => false, - 'TITLE_EXPLAIN' => ($vars['explain']) ? $lang[$vars['lang'] . '_EXPLAIN'] : '', - 'CONTENT' => $this->p_master->input_field($config_key, $vars['type'], $data[$config_key], $options), - ) - ); - } - - $config_options = array_merge($this->db_config_options, $this->admin_config_options); - foreach ($config_options as $config_key => $vars) - { - if (!is_array($vars)) - { - continue; - } - $s_hidden_fields .= ''; - } - - $submit = $lang['NEXT_STEP']; - - $url = $this->p_master->module_url . "?mode=$mode&sub=create_table"; - - $template->assign_vars(array( - 'BODY' => $lang['STAGE_ADVANCED_EXPLAIN'], - 'L_SUBMIT' => $submit, - 'S_HIDDEN' => $s_hidden_fields, - 'U_ACTION' => $url, - )); - } - - /** - * Load the contents of the schema into the database and then alter it based on what has been input during the installation - */ - function load_schema($mode, $sub) - { - global $db, $lang, $template, $phpbb_root_path, $phpEx; - - $this->page_title = $lang['STAGE_CREATE_TABLE']; - $s_hidden_fields = ''; - - // Obtain any submitted data - $data = $this->get_submitted_data(); - - if ($data['dbms'] == '') - { - // Someone's been silly and tried calling this page direct - // So we send them back to the start to do it again properly - $this->p_master->redirect("index.$phpEx?mode=install"); - } - - // HTTP_HOST is having the correct browser url in most cases... - $server_name = (!empty($_SERVER['HTTP_HOST'])) ? strtolower($_SERVER['HTTP_HOST']) : ((!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME')); - $cookie_domain = ($data['server_name'] != '') ? $data['server_name'] : $server_name; - - // Try to come up with the best solution for cookie domain... - if (strpos($cookie_domain, 'www.') === 0) - { - $cookie_domain = str_replace('www.', '.', $cookie_domain); - } - - // If we get here and the extension isn't loaded it should be safe to just go ahead and load it - $available_dbms = get_available_dbms($data['dbms']); - - if (!isset($available_dbms[$data['dbms']])) - { - // Someone's been silly and tried providing a non-existant dbms - $this->p_master->redirect("index.$phpEx?mode=install"); - } - - $dbms = $available_dbms[$data['dbms']]['DRIVER']; - - // Load the appropriate database class if not already loaded - include($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); - - // Instantiate the database - $db = new $sql_db(); - $db->sql_connect($data['dbhost'], $data['dbuser'], htmlspecialchars_decode($data['dbpasswd']), $data['dbname'], $data['dbport'], false, false); - - // NOTE: trigger_error does not work here. - $db->sql_return_on_error(true); - - // Ok we have the db info go ahead and read in the relevant schema - // and work on building the table - $dbms_schema = 'schemas/' . $available_dbms[$data['dbms']]['SCHEMA'] . '_schema.sql'; - - // How should we treat this schema? - $remove_remarks = $available_dbms[$data['dbms']]['COMMENTS']; - $delimiter = $available_dbms[$data['dbms']]['DELIM']; - - - include($phpbb_root_path . 'includes/db/db_tools.php'); - include($phpbb_root_path . 'install/schemas/schema_data.php'); - - // we must do this so that we can handle the errors - phpbb_db_tools::$return_statements = true; - - foreach ($schema_data as $table_name => $table_data) - { - // Change prefix - $table_name = preg_replace('#phpbb_#i', $data['table_prefix'], $table_name); - - $statements = phpbb_db_tools::sql_create_table($table_name, $table_data); - - foreach ($statements as $sql) - { - if (!$db->sql_query($sql)) - { - $error = $db->sql_error(); - $this->p_master->db_error($error['message'], $sql, __LINE__, __FILE__); - } - } - } - - // Ok tables have been built, let's fill in the basic information - $sql_query = file_get_contents('schemas/schema_data.sql'); - - // Deal with any special comments - switch ($data['dbms']) - { - case 'mssql': - case 'mssql_odbc': - case 'mssql_2005': - $sql_query = preg_replace('#\# MSSQL IDENTITY (phpbb_[a-z_]+) (ON|OFF) \##s', 'SET IDENTITY_INSERT \1 \2;', $sql_query); - break; - - case 'postgres': - $sql_query = preg_replace('#\# POSTGRES (BEGIN|COMMIT) \##s', '\1; ', $sql_query); - break; - } - - // Change prefix - $sql_query = preg_replace('#phpbb_#i', $data['table_prefix'], $sql_query); - - // Change language strings... - $sql_query = preg_replace_callback('#\{L_([A-Z0-9\-_]*)\}#s', 'adjust_language_keys_callback', $sql_query); - - // Since there is only one schema file we know the comment style and are able to remove it directly with remove_remarks - remove_remarks($sql_query); - $sql_query = split_sql_file($sql_query, ';'); - - foreach ($sql_query as $sql) - { - //$sql = trim(str_replace('|', ';', $sql)); - if (!$db->sql_query($sql)) - { - $error = $db->sql_error(); - $this->p_master->db_error($error['message'], $sql, __LINE__, __FILE__); - } - } - unset($sql_query); - - $current_time = time(); - - $user_ip = (!empty($_SERVER['REMOTE_ADDR'])) ? htmlspecialchars($_SERVER['REMOTE_ADDR']) : ''; - - if ($data['script_path'] !== '/') - { - // Adjust destination path (no trailing slash) - if (substr($data['script_path'], -1) == '/') - { - $data['script_path'] = substr($data['script_path'], 0, -1); - } - - $data['script_path'] = str_replace(array('../', './'), '', $data['script_path']); - - if ($data['script_path'][0] != '/') - { - $data['script_path'] = '/' . $data['script_path']; - } - } - - // Set default config and post data, this applies to all DB's - $sql_ary = array( - 'INSERT INTO ' . $data['table_prefix'] . "config (config_name, config_value) - VALUES ('board_startdate', '$current_time')", - - 'INSERT INTO ' . $data['table_prefix'] . "config (config_name, config_value) - VALUES ('default_lang', '" . $db->sql_escape($data['default_lang']) . "')", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($data['img_imagick']) . "' - WHERE config_name = 'img_imagick'", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($data['server_name']) . "' - WHERE config_name = 'server_name'", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($data['server_port']) . "' - WHERE config_name = 'server_port'", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($data['board_email1']) . "' - WHERE config_name = 'board_email'", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($data['board_email1']) . "' - WHERE config_name = 'board_contact'", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($cookie_domain) . "' - WHERE config_name = 'cookie_domain'", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($lang['default_dateformat']) . "' - WHERE config_name = 'default_dateformat'", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($data['email_enable']) . "' - WHERE config_name = 'email_enable'", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($data['smtp_delivery']) . "' - WHERE config_name = 'smtp_delivery'", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($data['smtp_host']) . "' - WHERE config_name = 'smtp_host'", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($data['smtp_auth']) . "' - WHERE config_name = 'smtp_auth_method'", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($data['smtp_user']) . "' - WHERE config_name = 'smtp_username'", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($data['smtp_pass']) . "' - WHERE config_name = 'smtp_password'", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($data['cookie_secure']) . "' - WHERE config_name = 'cookie_secure'", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($data['force_server_vars']) . "' - WHERE config_name = 'force_server_vars'", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($data['script_path']) . "' - WHERE config_name = 'script_path'", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($data['server_protocol']) . "' - WHERE config_name = 'server_protocol'", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($data['admin_name']) . "' - WHERE config_name = 'newest_username'", - - 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . md5(mt_rand()) . "' - WHERE config_name = 'avatar_salt'", - - 'UPDATE ' . $data['table_prefix'] . "users - SET username = '" . $db->sql_escape($data['admin_name']) . "', user_password='" . $db->sql_escape(md5($data['admin_pass1'])) . "', user_ip = '" . $db->sql_escape($user_ip) . "', user_lang = '" . $db->sql_escape($data['default_lang']) . "', user_email='" . $db->sql_escape($data['board_email1']) . "', user_dateformat='" . $db->sql_escape($lang['default_dateformat']) . "', user_email_hash = " . hexdec(crc32($data['board_email1']) . strlen($data['board_email1'])) . ", username_clean = '" . $db->sql_escape(utf8_clean_string($data['admin_name'])) . "' - WHERE username = 'Admin'", - - 'UPDATE ' . $data['table_prefix'] . "moderator_cache - SET username = '" . $db->sql_escape($data['admin_name']) . "' - WHERE username = 'Admin'", - - 'UPDATE ' . $data['table_prefix'] . "forums - SET forum_last_poster_name = '" . $db->sql_escape($data['admin_name']) . "' - WHERE forum_last_poster_name = 'Admin'", - - 'UPDATE ' . $data['table_prefix'] . "topics - SET topic_first_poster_name = '" . $db->sql_escape($data['admin_name']) . "', topic_last_poster_name = '" . $db->sql_escape($data['admin_name']) . "' - WHERE topic_first_poster_name = 'Admin' - OR topic_last_poster_name = 'Admin'", - - 'UPDATE ' . $data['table_prefix'] . "users - SET user_regdate = $current_time", - - 'UPDATE ' . $data['table_prefix'] . "posts - SET post_time = $current_time, poster_ip = '" . $db->sql_escape($user_ip) . "'", - - 'UPDATE ' . $data['table_prefix'] . "topics - SET topic_time = $current_time, topic_last_post_time = $current_time", - - 'UPDATE ' . $data['table_prefix'] . "forums - SET forum_last_post_time = $current_time", - ); - - if (@extension_loaded('gd') || can_load_dll('gd')) - { - $sql_ary[] = 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '1' - WHERE config_name = 'captcha_gd'"; - } - - // We set a (semi-)unique cookie name to bypass login issues related to the cookie name. - $cookie_name = 'phpbb3_'; - $rand_str = md5(mt_rand()); - $rand_str = str_replace('0', 'z', base_convert($rand_str, 16, 35)); - $rand_str = substr($rand_str, 0, 5); - $cookie_name .= strtolower($rand_str); - - $sql_ary[] = 'UPDATE ' . $data['table_prefix'] . "config - SET config_value = '" . $db->sql_escape($cookie_name) . "' - WHERE config_name = 'cookie_name'"; - - foreach ($sql_ary as $sql) - { - //$sql = trim(str_replace('|', ';', $sql)); - - if (!$db->sql_query($sql)) - { - $error = $db->sql_error(); - $this->p_master->db_error($error['message'], $sql, __LINE__, __FILE__); - } - } - - $submit = $lang['NEXT_STEP']; - - $url = $this->p_master->module_url . "?mode=$mode&sub=final"; - - $template->assign_vars(array( - 'BODY' => $lang['STAGE_CREATE_TABLE_EXPLAIN'], - 'L_SUBMIT' => $submit, - 'S_HIDDEN' => build_hidden_fields($data), - 'U_ACTION' => $url, - )); - } - - /** - * Build the search index... - */ - function build_search_index($mode, $sub) - { - global $db, $lang, $phpbb_root_path, $phpEx, $config; - - // Obtain any submitted data - $data = $this->get_submitted_data(); - $table_prefix = $data['table_prefix']; - - // If we get here and the extension isn't loaded it should be safe to just go ahead and load it - $available_dbms = get_available_dbms($data['dbms']); - - if (!isset($available_dbms[$data['dbms']])) - { - // Someone's been silly and tried providing a non-existant dbms - $this->p_master->redirect("index.$phpEx?mode=install"); - } - - $dbms = $available_dbms[$data['dbms']]['DRIVER']; - - // Load the appropriate database class if not already loaded - include($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); - - // Instantiate the database - $db = new $sql_db(); - $db->sql_connect($data['dbhost'], $data['dbuser'], htmlspecialchars_decode($data['dbpasswd']), $data['dbname'], $data['dbport'], false, false); - - // NOTE: trigger_error does not work here. - $db->sql_return_on_error(true); - - include_once($phpbb_root_path . 'includes/constants.' . $phpEx); - include_once($phpbb_root_path . 'includes/search/fulltext_native.' . $phpEx); - - // Fill the config array - it is needed by those functions we call - $sql = 'SELECT * - FROM ' . CONFIG_TABLE; - $result = $db->sql_query($sql); - - $config = array(); - while ($row = $db->sql_fetchrow($result)) - { - $config[$row['config_name']] = $row['config_value']; - } - $db->sql_freeresult($result); - - $error = false; - $search = new fulltext_native($error); - - $sql = 'SELECT post_id, post_subject, post_text, poster_id, forum_id - FROM ' . POSTS_TABLE; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $search->index('post', $row['post_id'], $row['post_text'], $row['post_subject'], $row['poster_id'], $row['forum_id']); - } - $db->sql_freeresult($result); - } - - /** - * Populate the module tables - */ - function add_modules($mode, $sub) - { - global $db, $lang, $phpbb_root_path, $phpEx; - - include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx); - - $_module = &new acp_modules(); - $module_classes = array('acp', 'mcp', 'ucp'); - - // Add categories - foreach ($module_classes as $module_class) - { - $categories = array(); - - // Set the module class - $_module->module_class = $module_class; - - foreach ($this->module_categories[$module_class] as $cat_name => $subs) - { - $module_data = array( - 'module_basename' => '', - 'module_enabled' => 1, - 'module_display' => 1, - 'parent_id' => 0, - 'module_class' => $module_class, - 'module_langname' => $cat_name, - 'module_mode' => '', - 'module_auth' => '', - ); - - // Add category - $_module->update_module_data($module_data, true); - - // Check for last sql error happened - if ($db->sql_error_triggered) - { - $error = $db->sql_error($db->sql_error_sql); - $this->p_master->db_error($error['message'], $db->sql_error_sql, __LINE__, __FILE__); - } - - $categories[$cat_name]['id'] = (int) $module_data['module_id']; - $categories[$cat_name]['parent_id'] = 0; - - // Create sub-categories... - if (is_array($subs)) - { - foreach ($subs as $level2_name) - { - $module_data = array( - 'module_basename' => '', - 'module_enabled' => 1, - 'module_display' => 1, - 'parent_id' => (int) $categories[$cat_name]['id'], - 'module_class' => $module_class, - 'module_langname' => $level2_name, - 'module_mode' => '', - 'module_auth' => '', - ); - - $_module->update_module_data($module_data, true); - - // Check for last sql error happened - if ($db->sql_error_triggered) - { - $error = $db->sql_error($db->sql_error_sql); - $this->p_master->db_error($error['message'], $db->sql_error_sql, __LINE__, __FILE__); - } - - $categories[$level2_name]['id'] = (int) $module_data['module_id']; - $categories[$level2_name]['parent_id'] = (int) $categories[$cat_name]['id']; - } - } - } - - // Get the modules we want to add... returned sorted by name - $module_info = $_module->get_module_infos('', $module_class); - - foreach ($module_info as $module_basename => $fileinfo) - { - foreach ($fileinfo['modes'] as $module_mode => $row) - { - foreach ($row['cat'] as $cat_name) - { - if (!isset($categories[$cat_name])) - { - continue; - } - - $module_data = array( - 'module_basename' => $module_basename, - 'module_enabled' => 1, - 'module_display' => (isset($row['display'])) ? (int) $row['display'] : 1, - 'parent_id' => (int) $categories[$cat_name]['id'], - 'module_class' => $module_class, - 'module_langname' => $row['title'], - 'module_mode' => $module_mode, - 'module_auth' => $row['auth'], - ); - - $_module->update_module_data($module_data, true); - - // Check for last sql error happened - if ($db->sql_error_triggered) - { - $error = $db->sql_error($db->sql_error_sql); - $this->p_master->db_error($error['message'], $db->sql_error_sql, __LINE__, __FILE__); - } - } - } - } - - // Move some of the modules around since the code above will put them in the wrong place - if ($module_class == 'acp') - { - // Move main module 4 up... - $sql = 'SELECT * - FROM ' . MODULES_TABLE . " - WHERE module_basename = 'main' - AND module_class = 'acp' - AND module_mode = 'main'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $_module->move_module_by($row, 'move_up', 4); - - // Move permissions intro screen module 4 up... - $sql = 'SELECT * - FROM ' . MODULES_TABLE . " - WHERE module_basename = 'permissions' - AND module_class = 'acp' - AND module_mode = 'intro'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $_module->move_module_by($row, 'move_up', 4); - - // Move manage users screen module 5 up... - $sql = 'SELECT * - FROM ' . MODULES_TABLE . " - WHERE module_basename = 'users' - AND module_class = 'acp' - AND module_mode = 'overview'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $_module->move_module_by($row, 'move_up', 5); - } - - if ($module_class == 'ucp') - { - // Move attachment module 4 down... - $sql = 'SELECT * - FROM ' . MODULES_TABLE . " - WHERE module_basename = 'attachments' - AND module_class = 'ucp' - AND module_mode = 'attachments'"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $_module->move_module_by($row, 'move_down', 4); - } - - // And now for the special ones - // (these are modules which appear in multiple categories and thus get added manually to some for more control) - if (isset($this->module_extras[$module_class])) - { - foreach ($this->module_extras[$module_class] as $cat_name => $mods) - { - $sql = 'SELECT module_id, left_id, right_id - FROM ' . MODULES_TABLE . " - WHERE module_langname = '" . $db->sql_escape($cat_name) . "' - AND module_class = '" . $db->sql_escape($module_class) . "'"; - $result = $db->sql_query_limit($sql, 1); - $row2 = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - foreach ($mods as $mod_name) - { - $sql = 'SELECT * - FROM ' . MODULES_TABLE . " - WHERE module_langname = '" . $db->sql_escape($mod_name) . "' - AND module_class = '" . $db->sql_escape($module_class) . "' - AND module_basename <> ''"; - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $module_data = array( - 'module_basename' => $row['module_basename'], - 'module_enabled' => (int) $row['module_enabled'], - 'module_display' => (int) $row['module_display'], - 'parent_id' => (int) $row2['module_id'], - 'module_class' => $row['module_class'], - 'module_langname' => $row['module_langname'], - 'module_mode' => $row['module_mode'], - 'module_auth' => $row['module_auth'], - ); - - $_module->update_module_data($module_data, true); - - // Check for last sql error happened - if ($db->sql_error_triggered) - { - $error = $db->sql_error($db->sql_error_sql); - $this->p_master->db_error($error['message'], $db->sql_error_sql, __LINE__, __FILE__); - } - } - } - } - - $_module->remove_cache_file(); - } - } - - /** - * Populate the language tables - */ - function add_language($mode, $sub) - { - global $db, $lang, $phpbb_root_path, $phpEx; - - $dir = @opendir($phpbb_root_path . 'language'); - - if (!$dir) - { - $this->error('Unable to access the language directory', __LINE__, __FILE__); - } - - while (($file = readdir($dir)) !== false) - { - $path = $phpbb_root_path . 'language/' . $file; - - if ($file == '.' || $file == '..' || is_link($path) || is_file($path) || $file == 'CVS') - { - continue; - } - - if (is_dir($path) && file_exists($path . '/iso.txt')) - { - $lang_file = file("{$phpbb_root_path}language/$path/iso.txt"); - - $lang_pack = array( - 'lang_iso' => basename($path), - 'lang_dir' => basename($path), - 'lang_english_name' => trim(htmlspecialchars($lang_file[0])), - 'lang_local_name' => trim(htmlspecialchars($lang_file[1], ENT_COMPAT, 'UTF-8')), - 'lang_author' => trim(htmlspecialchars($lang_file[2], ENT_COMPAT, 'UTF-8')), - ); - - $db->sql_query('INSERT INTO ' . LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $lang_pack)); - - if ($db->sql_error_triggered) - { - $error = $db->sql_error($db->sql_error_sql); - $this->p_master->db_error($error['message'], $db->sql_error_sql, __LINE__, __FILE__); - } - - $valid_localized = array( - 'icon_back_top', 'icon_contact_aim', 'icon_contact_email', 'icon_contact_icq', 'icon_contact_jabber', 'icon_contact_msnm', 'icon_contact_pm', 'icon_contact_yahoo', 'icon_contact_www', 'icon_post_delete', 'icon_post_edit', 'icon_post_info', 'icon_post_quote', 'icon_post_report', 'icon_user_online', 'icon_user_offline', 'icon_user_profile', 'icon_user_search', 'icon_user_warn', 'button_pm_forward', 'button_pm_new', 'button_pm_reply', 'button_topic_locked', 'button_topic_new', 'button_topic_reply', - ); - - $sql_ary = array(); - - $sql = 'SELECT * - FROM ' . STYLES_IMAGESET_TABLE; - $result = $db->sql_query($sql); - - while ($imageset_row = $db->sql_fetchrow($result)) - { - if (@file_exists("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$lang_pack['lang_iso']}/imageset.cfg")) - { - $cfg_data_imageset_data = parse_cfg_file("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$lang_pack['lang_iso']}/imageset.cfg"); - foreach ($cfg_data_imageset_data as $image_name => $value) - { - if (strpos($value, '*') !== false) - { - if (substr($value, -1, 1) === '*') - { - list($image_filename, $image_height) = explode('*', $value); - $image_width = 0; - } - else - { - list($image_filename, $image_height, $image_width) = explode('*', $value); - } - } - else - { - $image_filename = $value; - $image_height = $image_width = 0; - } - - if (strpos($image_name, 'img_') === 0 && $image_filename) - { - $image_name = substr($image_name, 4); - if (in_array($image_name, $valid_localized)) - { - $sql_ary[] = array( - 'image_name' => (string) $image_name, - 'image_filename' => (string) $image_filename, - 'image_height' => (int) $image_height, - 'image_width' => (int) $image_width, - 'imageset_id' => (int) $imageset_row['imageset_id'], - 'image_lang' => (string) $lang_pack['lang_iso'], - ); - } - } - } - } - } - $db->sql_freeresult($result); - - if (sizeof($sql_ary)) - { - $db->sql_multi_insert(STYLES_IMAGESET_DATA_TABLE, $sql_ary); - - if ($db->sql_error_triggered) - { - $error = $db->sql_error($db->sql_error_sql); - $this->p_master->db_error($error['message'], $db->sql_error_sql, __LINE__, __FILE__); - } - } - } - } - closedir($dir); - } - - /** - * Add search robots to the database - */ - function add_bots($mode, $sub) - { - global $db, $lang, $phpbb_root_path, $phpEx, $config; - - // Obtain any submitted data - $data = $this->get_submitted_data(); - - // Fill the config array - it is needed by those functions we call - $sql = 'SELECT * - FROM ' . CONFIG_TABLE; - $result = $db->sql_query($sql); - - $config = array(); - while ($row = $db->sql_fetchrow($result)) - { - $config[$row['config_name']] = $row['config_value']; - } - $db->sql_freeresult($result); - - $sql = 'SELECT group_id - FROM ' . GROUPS_TABLE . " - WHERE group_name_clean = 'bots'"; - $result = $db->sql_query($sql); - $group_id = (int) $db->sql_fetchfield('group_id'); - $db->sql_freeresult($result); - - if (!$group_id) - { - // If we reach this point then something has gone very wrong - $this->p_master->error($lang['NO_GROUP'], __LINE__, __FILE__); - } - - if (!function_exists('user_add')) - { - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - } - - foreach ($this->bot_list as $bot_name => $bot_ary) - { - $user_row = array( - 'user_type' => USER_IGNORE, - 'group_id' => $group_id, - 'username' => $bot_name, - 'user_regdate' => time(), - 'user_password' => '', - 'user_colour' => '9E8DA7', - 'user_email' => '', - 'user_lang' => $data['default_lang'], - 'user_style' => 1, - 'user_timezone' => 0, - 'user_dateformat' => $lang['default_dateformat'], - 'user_allow_massemail' => 0, - ); - - $user_id = user_add($user_row); - - if (!$user_id) - { - // If we can't insert this user then continue to the next one to avoid inconsistant data - $this->p_master->db_error('Unable to insert bot into users table', $db->sql_error_sql, __LINE__, __FILE__, true); - continue; - } - - $sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'bot_active' => 1, - 'bot_name' => (string) $bot_name, - 'user_id' => (int) $user_id, - 'bot_agent' => (string) $bot_ary[0], - 'bot_ip' => (string) $bot_ary[1], - )); - - $result = $db->sql_query($sql); - } - } - - /** - * Sends an email to the board administrator with their password and some useful links - */ - function email_admin($mode, $sub) - { - global $auth, $config, $db, $lang, $template, $user, $phpbb_root_path, $phpEx; - - $this->page_title = $lang['STAGE_FINAL']; - - // Obtain any submitted data - $data = $this->get_submitted_data(); - - $sql = 'SELECT * - FROM ' . CONFIG_TABLE; - $result = $db->sql_query($sql); - - $config = array(); - while ($row = $db->sql_fetchrow($result)) - { - $config[$row['config_name']] = $row['config_value']; - } - $db->sql_freeresult($result); - - $user->session_begin(); - $auth->login($data['admin_name'], $data['admin_pass1'], false, true, true); - - // OK, Now that we've reached this point we can be confident that everything - // is installed and working......I hope :) - // So it's time to send an email to the administrator confirming the details - // they entered - - if ($config['email_enable']) - { - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - - $messenger = new messenger(false); - - $messenger->template('installed', $data['language']); - - $messenger->to($data['board_email1'], $data['admin_name']); - - $messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); - $messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']); - $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']); - $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); - - $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($data['admin_name']), - 'PASSWORD' => htmlspecialchars_decode($data['admin_pass1'])) - ); - - $messenger->send(NOTIFY_EMAIL); - } - - // And finally, add a note to the log - add_log('admin', 'LOG_INSTALL_INSTALLED', $config['version']); - - $template->assign_vars(array( - 'TITLE' => $lang['INSTALL_CONGRATS'], - 'BODY' => sprintf($lang['INSTALL_CONGRATS_EXPLAIN'], $config['version'], append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=convert&language=' . $data['language']), '../docs/README.html'), - 'L_SUBMIT' => $lang['INSTALL_LOGIN'], - 'U_ACTION' => append_sid($phpbb_root_path . 'adm/index.' . $phpEx), - )); - } - - /** - * Generate a list of available mail server authentication methods - */ - function mail_auth_select($selected_method) - { - global $lang; - - $auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5', 'POP-BEFORE-SMTP'); - $s_smtp_auth_options = ''; - - foreach ($auth_methods as $method) - { - $s_smtp_auth_options .= ''; - } - - return $s_smtp_auth_options; - } - - /** - * Get submitted data - */ - function get_submitted_data() - { - return array( - 'language' => basename(request_var('language', '')), - 'dbms' => request_var('dbms', ''), - 'dbhost' => request_var('dbhost', ''), - 'dbport' => request_var('dbport', ''), - 'dbuser' => request_var('dbuser', ''), - 'dbpasswd' => request_var('dbpasswd', '', true), - 'dbname' => request_var('dbname', ''), - 'table_prefix' => request_var('table_prefix', ''), - 'default_lang' => basename(request_var('default_lang', '')), - 'admin_name' => utf8_normalize_nfc(request_var('admin_name', '', true)), - 'admin_pass1' => request_var('admin_pass1', '', true), - 'admin_pass2' => request_var('admin_pass2', '', true), - 'board_email1' => strtolower(request_var('board_email1', '')), - 'board_email2' => strtolower(request_var('board_email2', '')), - 'img_imagick' => request_var('img_imagick', ''), - 'ftp_path' => request_var('ftp_path', ''), - 'ftp_user' => request_var('ftp_user', ''), - 'ftp_pass' => request_var('ftp_pass', ''), - 'email_enable' => request_var('email_enable', ''), - 'smtp_delivery' => request_var('smtp_delivery', ''), - 'smtp_host' => request_var('smtp_host', ''), - 'smtp_auth' => request_var('smtp_auth', ''), - 'smtp_user' => request_var('smtp_user', ''), - 'smtp_pass' => request_var('smtp_pass', ''), - 'cookie_secure' => request_var('cookie_secure', ''), - 'force_server_vars' => request_var('force_server_vars', ''), - 'server_protocol' => request_var('server_protocol', ''), - 'server_name' => request_var('server_name', ''), - 'server_port' => request_var('server_port', ''), - 'script_path' => request_var('script_path', ''), - ); - } - - /** - * The information below will be used to build the input fields presented to the user - */ - var $db_config_options = array( - 'legend1' => 'DB_CONFIG', - 'dbms' => array('lang' => 'DBMS', 'type' => 'select', 'options' => 'dbms_select(\'{VALUE}\')', 'explain' => false), - 'dbhost' => array('lang' => 'DB_HOST', 'type' => 'text:25:100', 'explain' => true), - 'dbport' => array('lang' => 'DB_PORT', 'type' => 'text:25:100', 'explain' => true), - 'dbname' => array('lang' => 'DB_NAME', 'type' => 'text:25:100', 'explain' => false), - 'dbuser' => array('lang' => 'DB_USERNAME', 'type' => 'text:25:100', 'explain' => false), - 'dbpasswd' => array('lang' => 'DB_PASSWORD', 'type' => 'password:25:100', 'explain' => false), - 'table_prefix' => array('lang' => 'TABLE_PREFIX', 'type' => 'text:25:100', 'explain' => false), - ); - var $admin_config_options = array( - 'legend1' => 'ADMIN_CONFIG', - 'default_lang' => array('lang' => 'DEFAULT_LANG', 'type' => 'select', 'options' => '$this->module->inst_language_select(\'{VALUE}\')', 'explain' => false), - 'admin_name' => array('lang' => 'ADMIN_USERNAME', 'type' => 'text:25:100', 'explain' => true), - 'admin_pass1' => array('lang' => 'ADMIN_PASSWORD', 'type' => 'password:25:100', 'explain' => true), - 'admin_pass2' => array('lang' => 'ADMIN_PASSWORD_CONFIRM', 'type' => 'password:25:100', 'explain' => false), - 'board_email1' => array('lang' => 'CONTACT_EMAIL', 'type' => 'text:25:100', 'explain' => false), - 'board_email2' => array('lang' => 'CONTACT_EMAIL_CONFIRM', 'type' => 'text:25:100', 'explain' => false), - ); - var $advanced_config_options = array( - 'legend1' => 'ACP_EMAIL_SETTINGS', - 'email_enable' => array('lang' => 'ENABLE_EMAIL', 'type' => 'radio:enabled_disabled', 'explain' => true), - 'smtp_delivery' => array('lang' => 'USE_SMTP', 'type' => 'radio:yes_no', 'explain' => true), - 'smtp_host' => array('lang' => 'SMTP_SERVER', 'type' => 'text:25:50', 'explain' => false), - 'smtp_auth' => array('lang' => 'SMTP_AUTH_METHOD', 'type' => 'select', 'options' => '$this->module->mail_auth_select(\'{VALUE}\')', 'explain' => true), - 'smtp_user' => array('lang' => 'SMTP_USERNAME', 'type' => 'text:25:255', 'explain' => true), - 'smtp_pass' => array('lang' => 'SMTP_PASSWORD', 'type' => 'password:25:255', 'explain' => true), - - 'legend2' => 'SERVER_URL_SETTINGS', - 'cookie_secure' => array('lang' => 'COOKIE_SECURE', 'type' => 'radio:enabled_disabled', 'explain' => true), - 'force_server_vars' => array('lang' => 'FORCE_SERVER_VARS', 'type' => 'radio:yes_no', 'explain' => true), - 'server_protocol' => array('lang' => 'SERVER_PROTOCOL', 'type' => 'text:10:10', 'explain' => true), - 'server_name' => array('lang' => 'SERVER_NAME', 'type' => 'text:40:255', 'explain' => true), - 'server_port' => array('lang' => 'SERVER_PORT', 'type' => 'text:5:5', 'explain' => true), - 'script_path' => array('lang' => 'SCRIPT_PATH', 'type' => 'text::255', 'explain' => true), - ); - - /** - * Specific PHP modules we may require for certain optional or extended features - */ - var $php_dlls_other = array('zlib', 'ftp', 'gd', 'xml'); - - /** - * A list of the web-crawlers/bots we recognise by default - * - * Candidates but not included: - * 'Accoona [Bot]' 'Accoona-AI-Agent/' - * 'ASPseek [Crawler]' 'ASPseek/' - * 'Boitho [Crawler]' 'boitho.com-dc/' - * 'Bunnybot [Bot]' 'powered by www.buncat.de' - * 'Cosmix [Bot]' 'cfetch/' - * 'Crawler Search [Crawler]' '.Crawler-Search.de' - * 'Findexa [Crawler]' 'Findexa Crawler (' - * 'GBSpider [Spider]' 'GBSpider v' - * 'genie [Bot]' 'genieBot (' - * 'Hogsearch [Bot]' 'oegp v. 1.3.0' - * 'Insuranco [Bot]' 'InsurancoBot' - * 'IRLbot [Bot]' 'http://irl.cs.tamu.edu/crawler' - * 'ISC Systems [Bot]' 'ISC Systems iRc Search' - * 'Jyxobot [Bot]' 'Jyxobot/' - * 'Kraehe [Metasuche]' '-DIE-KRAEHE- META-SEARCH-ENGINE/' - * 'LinkWalker' 'LinkWalker' - * 'MMSBot [Bot]' 'http://www.mmsweb.at/bot.html' - * 'Naver [Bot]' 'nhnbot@naver.com)' - * 'NetResearchServer' 'NetResearchServer/' - * 'Nimble [Crawler]' 'NimbleCrawler' - * 'Ocelli [Bot]' 'Ocelli/' - * 'Onsearch [Bot]' 'onCHECK-Robot' - * 'Orange [Spider]' 'OrangeSpider' - * 'Sproose [Bot]' 'http://www.sproose.com/bot' - * 'Susie [Sync]' '!Susie (http://www.sync2it.com/susie)' - * 'Tbot [Bot]' 'Tbot/' - * 'Thumbshots [Capture]' 'thumbshots-de-Bot' - * 'Vagabondo [Crawler]' 'http://webagent.wise-guys.nl/' - * 'Walhello [Bot]' 'appie 1.1 (www.walhello.com)' - * 'WissenOnline [Bot]' 'WissenOnline-Bot' - * 'WWWeasel [Bot]' 'WWWeasel Robot v' - * 'Xaldon [Spider]' 'Xaldon WebSpider' - */ - var $bot_list = array( - 'AdsBot [Google]' => array('AdsBot-Google', ''), - 'Alexa [Bot]' => array('ia_archiver', ''), - 'Alta Vista [Bot]' => array('Scooter/', ''), - 'Ask Jeeves [Bot]' => array('Ask Jeeves', ''), - 'Baidu [Spider]' => array('Baiduspider+(', ''), - 'Exabot [Bot]' => array('Exabot/', ''), - 'FAST Enterprise [Crawler]' => array('FAST Enterprise Crawler', ''), - 'FAST WebCrawler [Crawler]' => array('FAST-WebCrawler/', ''), - 'Francis [Bot]' => array('http://www.neomo.de/', ''), - 'Gigabot [Bot]' => array('Gigabot/', ''), - 'Google Adsense [Bot]' => array('Mediapartners-Google', ''), - 'Google Desktop' => array('Google Desktop', ''), - 'Google Feedfetcher' => array('Feedfetcher-Google', ''), - 'Google [Bot]' => array('Googlebot', ''), - 'Heise IT-Markt [Crawler]' => array('heise-IT-Markt-Crawler', ''), - 'Heritrix [Crawler]' => array('heritrix/1.', ''), - 'IBM Research [Bot]' => array('ibm.com/cs/crawler', ''), - 'ICCrawler - ICjobs' => array('ICCrawler - ICjobs', ''), - 'ichiro [Crawler]' => array('ichiro/2', ''), - 'Majestic-12 [Bot]' => array('MJ12bot/', ''), - 'Metager [Bot]' => array('MetagerBot/', ''), - 'MSN NewsBlogs' => array('msnbot-NewsBlogs/', ''), - 'MSN [Bot]' => array('msnbot/', ''), - 'MSNbot Media' => array('msnbot-media/', ''), - 'NG-Search [Bot]' => array('NG-Search/', ''), - 'Nutch [Bot]' => array('http://lucene.apache.org/nutch/', ''), - 'Nutch/CVS [Bot]' => array('NutchCVS/', ''), - 'OmniExplorer [Bot]' => array('OmniExplorer_Bot/', ''), - 'Online link [Validator]' => array('online link validator', ''), - 'psbot [Picsearch]' => array('psbot/0', ''), - 'Seekport [Bot]' => array('Seekbot/', ''), - 'Sensis [Crawler]' => array('Sensis Web Crawler', ''), - 'SEO Crawler' => array('SEO search Crawler/', ''), - 'Seoma [Crawler]' => array('Seoma [SEO Crawler]', ''), - 'SEOSearch [Crawler]' => array('SEOsearch/', ''), - 'Snappy [Bot]' => array('Snappy/1.1 ( http://www.urltrends.com/ )', ''), - 'Steeler [Crawler]' => array('http://www.tkl.iis.u-tokyo.ac.jp/~crawler/', ''), - 'Synoo [Bot]' => array('SynooBot/', ''), - 'Telekom [Bot]' => array('crawleradmin.t-info@telekom.de', ''), - 'TurnitinBot [Bot]' => array('TurnitinBot/', ''), - 'Voyager [Bot]' => array('voyager/1.0', ''), - 'W3 [Sitesearch]' => array('W3 SiteSearch Crawler', ''), - 'W3C [Linkcheck]' => array('W3C-checklink/', ''), - 'W3C [Validator]' => array('W3C_*Validator', ''), - 'WiseNut [Bot]' => array('http://www.WISEnutbot.com', ''), - 'YaCy [Bot]' => array('yacybot', ''), - 'Yahoo MMCrawler [Bot]' => array('Yahoo-MMCrawler/', ''), - 'Yahoo Slurp [Bot]' => array('Yahoo! DE Slurp', ''), - 'Yahoo [Bot]' => array('Yahoo! Slurp', ''), - 'YahooSeeker [Bot]' => array('YahooSeeker/', ''), - ); - - /** - * Define the module structure so that we can populate the database without - * needing to hard-code module_id values - */ - var $module_categories = array( - 'acp' => array( - 'ACP_CAT_GENERAL' => array( - 'ACP_QUICK_ACCESS', - 'ACP_BOARD_CONFIGURATION', - 'ACP_CLIENT_COMMUNICATION', - 'ACP_SERVER_CONFIGURATION', - ), - 'ACP_CAT_FORUMS' => array( - 'ACP_MANAGE_FORUMS', - 'ACP_FORUM_BASED_PERMISSIONS', - ), - 'ACP_CAT_POSTING' => array( - 'ACP_MESSAGES', - 'ACP_ATTACHMENTS', - ), - 'ACP_CAT_USERGROUP' => array( - 'ACP_CAT_USERS', - 'ACP_GROUPS', - 'ACP_USER_SECURITY', - ), - 'ACP_CAT_PERMISSIONS' => array( - 'ACP_GLOBAL_PERMISSIONS', - 'ACP_FORUM_BASED_PERMISSIONS', - 'ACP_PERMISSION_ROLES', - 'ACP_PERMISSION_MASKS', - ), - 'ACP_CAT_STYLES' => array( - 'ACP_STYLE_MANAGEMENT', - 'ACP_STYLE_COMPONENTS', - ), - 'ACP_CAT_MAINTENANCE' => array( - 'ACP_FORUM_LOGS', - 'ACP_CAT_DATABASE', - ), - 'ACP_CAT_SYSTEM' => array( - 'ACP_AUTOMATION', - 'ACP_GENERAL_TASKS', - 'ACP_MODULE_MANAGEMENT', - ), - 'ACP_CAT_DOT_MODS' => null, - ), - 'mcp' => array( - 'MCP_MAIN' => null, - 'MCP_QUEUE' => null, - 'MCP_REPORTS' => null, - 'MCP_NOTES' => null, - 'MCP_WARN' => null, - 'MCP_LOGS' => null, - 'MCP_BAN' => null, - ), - 'ucp' => array( - 'UCP_MAIN' => null, - 'UCP_PROFILE' => null, - 'UCP_PREFS' => null, - 'UCP_PM' => null, - 'UCP_USERGROUPS' => null, - 'UCP_ZEBRA' => null, - ), - ); - - var $module_extras = array( - 'acp' => array( - 'ACP_QUICK_ACCESS' => array( - 'ACP_MANAGE_USERS', - 'ACP_GROUPS_MANAGE', - 'ACP_MANAGE_FORUMS', - 'ACP_MOD_LOGS', - 'ACP_BOTS', - 'ACP_PHP_INFO', - ), - 'ACP_FORUM_BASED_PERMISSIONS' => array( - 'ACP_FORUM_PERMISSIONS', - 'ACP_FORUM_MODERATORS', - 'ACP_USERS_FORUM_PERMISSIONS', - 'ACP_GROUPS_FORUM_PERMISSIONS', - ), - ), - ); -} - -?> \ No newline at end of file diff --git a/phpBB/install/install_main.php b/phpBB/install/install_main.php deleted file mode 100755 index e9f35efa1d..0000000000 --- a/phpBB/install/install_main.php +++ /dev/null @@ -1,78 +0,0 @@ - 'install', - 'module_title' => 'OVERVIEW', - 'module_filename' => substr(basename(__FILE__), 0, -strlen($phpEx)-1), - 'module_order' => 0, - 'module_subs' => array('INTRO', 'LICENSE', 'SUPPORT'), - 'module_stages' => '', - 'module_reqs' => '' - ); -} - -/** -* Main Tab - Installation -* @package install -*/ -class install_main extends module -{ - function install_main(&$p_master) - { - $this->p_master = &$p_master; - } - - function main($mode, $sub) - { - global $lang, $template, $language; - - switch ($sub) - { - case 'intro' : - $title = $lang['SUB_INTRO']; - $body = $lang['OVERVIEW_BODY']; - break; - - case 'license' : - $title = $lang['GPL']; - $body = implode("
    \n", file('../docs/COPYING')); - break; - - case 'support' : - $title = $lang['SUB_SUPPORT']; - $body = $lang['SUPPORT_BODY']; - break; - } - - $this->tpl_name = 'install_main'; - $this->page_title = $title; - - $template->assign_vars(array( - 'TITLE' => $title, - 'BODY' => $body, - - 'S_LANG_SELECT' => '', - )); - } -} - -?> \ No newline at end of file diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php deleted file mode 100644 index d494007f3d..0000000000 --- a/phpBB/install/install_update.php +++ /dev/null @@ -1,1650 +0,0 @@ - 'update', - 'module_title' => 'UPDATE', - 'module_filename' => substr(basename(__FILE__), 0, -strlen($phpEx)-1), - 'module_order' => 30, - 'module_subs' => '', - 'module_stages' => array('INTRO', 'VERSION_CHECK', 'UPDATE_DB', 'FILE_CHECK', 'UPDATE_FILES'), - 'module_reqs' => '' - ); -} - -/** -* Update Installation -* @package install -*/ -class install_update extends module -{ - var $p_master; - var $update_info; - - var $old_location; - var $new_location; - var $latest_version; - var $current_version; - var $unequal_version; - - // Set to false - var $test_update = false; - - function install_update(&$p_master) - { - $this->p_master = &$p_master; - } - - function main($mode, $sub) - { - global $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth; - - $this->tpl_name = 'install_update'; - $this->page_title = 'UPDATE_INSTALLATION'; - $this->unequal_version = false; - - $this->old_location = $phpbb_root_path . 'install/update/old/'; - $this->new_location = $phpbb_root_path . 'install/update/new/'; - - // Init DB - require($phpbb_root_path . 'config.' . $phpEx); - require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); - require($phpbb_root_path . 'includes/constants.' . $phpEx); - - // Special options for conflicts/modified files - define('MERGE_NO_MERGE_NEW', 1); - define('MERGE_NO_MERGE_MOD', 2); - define('MERGE_NEW_FILE', 3); - define('MERGE_MOD_FILE', 4); - - $db = new $sql_db(); - - // Connect to DB - $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false); - - // We do not need this any longer, unset for safety purposes - unset($dbpasswd); - - $config = array(); - - $sql = 'SELECT config_name, config_value - FROM ' . CONFIG_TABLE; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $config[$row['config_name']] = $row['config_value']; - } - $db->sql_freeresult($result); - - // Force template recompile - $config['load_tplcompile'] = 1; - - // First of all, init the user session - $user->session_begin(); - $auth->acl($user->data); - - $user->setup('install'); - - // If we are within the intro page we need to make sure we get up-to-date version info - if ($sub == 'intro') - { - $cache->destroy('_version_info'); - } - - // Set custom template again. ;) - $template->set_custom_template('../adm/style', 'admin'); - - // still, the acp template is never stored in the database - $user->theme['template_storedb'] = false; - - // Get current and latest version - if (($latest_version = $cache->get('_version_info')) === false) - { - $this->latest_version = $this->get_file('version_info'); - $cache->put('_version_info', $this->latest_version); - } - else - { - $this->latest_version = $latest_version; - } - - // For the current version we trick a bit. ;) - $this->current_version = (!empty($config['version_update_from'])) ? $config['version_update_from'] : $config['version']; - - $up_to_date = (version_compare(str_replace('rc', 'RC', strtolower($this->current_version)), str_replace('rc', 'RC', strtolower($this->latest_version)), '<')) ? false : true; - - // Check for a valid update directory, else point the user to the phpbb.com website - if (!file_exists($phpbb_root_path . 'install/update') || !file_exists($phpbb_root_path . 'install/update/index.' . $phpEx) || !file_exists($this->old_location) || !file_exists($this->new_location)) - { - $template->assign_vars(array( - 'S_ERROR' => true, - 'ERROR_MSG' => ($up_to_date) ? $user->lang['NO_UPDATE_FILES_UP_TO_DATE'] : sprintf($user->lang['NO_UPDATE_FILES_OUTDATED'], $config['version'], $this->current_version, $this->latest_version)) - ); - - return; - } - - $this->update_info = $this->get_file('update_info'); - - // Make sure the update directory holds the correct information - // Since admins are able to run the update/checks more than once we only check if the current version is lower or equal than the version to which we update to. - if (version_compare(str_replace('rc', 'RC', strtolower($this->current_version)), str_replace('rc', 'RC', strtolower($this->update_info['version']['to'])), '>')) - { - $template->assign_vars(array( - 'S_ERROR' => true, - 'ERROR_MSG' => sprintf($user->lang['INCOMPATIBLE_UPDATE_FILES'], $config['version'], $this->update_info['version']['from'], $this->update_info['version']['to'])) - ); - - return; - } - - // Check if the update files stored are for the latest version... - if ($this->latest_version != $this->update_info['version']['to']) - { - $this->unequal_version = true; - - $template->assign_vars(array( - 'S_WARNING' => true, - 'WARNING_MSG' => sprintf($user->lang['OLD_UPDATE_FILES'], $this->update_info['version']['from'], $this->update_info['version']['to'], $this->latest_version)) - ); - } - - if ($this->test_update === false) - { - // Got the updater template itself updated? If so, we are able to directly use it - but only if all three files are present - if (in_array('adm/style/install_update.html', $this->update_info['files'])) - { - $this->tpl_name = '../../install/update/new/adm/style/install_update'; - } - - // What about the language file? Got it updated? - if (in_array('language/en/install.php', $this->update_info['files'])) - { - $lang = array(); - include($this->new_location . 'language/en/install.php'); - // only add new keys to user's language in english - $new_keys = array_diff(array_keys($lang), array_keys($user->lang)); - foreach ($new_keys as $i => $new_key) - { - $user->lang[$new_key] = $lang[$new_key]; - } - } - } - - // Include renderer and engine - $this->include_file('includes/diff/diff.' . $phpEx); - $this->include_file('includes/diff/engine.' . $phpEx); - $this->include_file('includes/diff/renderer.' . $phpEx); - - // Make sure we stay at the file check if checking the files again - if (!empty($_POST['check_again'])) - { - $sub = $this->p_master->sub = 'file_check'; - } - - switch ($sub) - { - case 'intro': - $this->page_title = 'UPDATE_INSTALLATION'; - - $template->assign_vars(array( - 'S_INTRO' => true, - 'U_ACTION' => append_sid($this->p_master->module_url, "mode=$mode&sub=version_check"), - )); - - // Make sure the update list is destroyed. - $cache->destroy('_update_list'); - $cache->destroy('_diff_files'); - break; - - case 'version_check': - $this->page_title = 'STAGE_VERSION_CHECK'; - - $template->assign_vars(array( - 'S_UP_TO_DATE' => $up_to_date, - 'S_VERSION_CHECK' => true, - - 'U_ACTION' => append_sid($this->p_master->module_url, "mode=$mode&sub=file_check"), - 'U_DB_UPDATE_ACTION' => append_sid($this->p_master->module_url, "mode=$mode&sub=update_db"), - - 'LATEST_VERSION' => $this->latest_version, - 'CURRENT_VERSION' => $this->current_version) - ); - - // Print out version the update package updates to - if ($this->unequal_version) - { - $template->assign_var('PACKAGE_VERSION', $this->update_info['version']['to']); - } - - break; - - case 'update_db': - - // Make sure the database update is valid for the latest version - $valid = false; - $updates_to_version = ''; - - if (file_exists($phpbb_root_path . 'install/database_update.' . $phpEx)) - { - include_once($phpbb_root_path . 'install/database_update.' . $phpEx); - - if ($updates_to_version === $this->update_info['version']['to']) - { - $valid = true; - } - } - - // Should not happen at all - if (!$valid) - { - trigger_error($user->lang['DATABASE_UPDATE_INFO_OLD'], E_USER_ERROR); - } - - // Just a precaution - $cache->purge(); - - // Redirect the user to the database update script with some explanations... - $template->assign_vars(array( - 'S_DB_UPDATE' => true, - 'S_DB_UPDATE_FINISHED' => ($config['version'] == $this->update_info['version']['to']) ? true : false, - 'U_DB_UPDATE' => append_sid($phpbb_root_path . 'install/database_update.' . $phpEx, 'type=1&language=' . $user->data['user_lang']), - 'U_DB_UPDATE_ACTION' => append_sid($this->p_master->module_url, "mode=$mode&sub=update_db"), - 'U_ACTION' => append_sid($this->p_master->module_url, "mode=$mode&sub=file_check"), - )); - - break; - - case 'file_check': - - // Make sure the previous file collection is no longer valid... - $cache->destroy('_diff_files'); - - $this->page_title = 'STAGE_FILE_CHECK'; - - // Now make sure our update list is correct if the admin refreshes - $action = request_var('action', ''); - - // We are directly within an update. To make sure our update list is correct we check its status. - $update_list = (!empty($_POST['check_again'])) ? false : $cache->get('_update_list'); - $modified = ($update_list !== false) ? @filemtime($cache->cache_dir . 'data_update_list.' . $phpEx) : 0; - - // Make sure the list is up-to-date - if ($update_list !== false) - { - $get_new_list = false; - foreach ($this->update_info['files'] as $file) - { - if (file_exists($phpbb_root_path . $file) && filemtime($phpbb_root_path . $file) > $modified) - { - $get_new_list = true; - break; - } - } - } - else - { - $get_new_list = true; - } - - if (!$get_new_list && $update_list['status'] != -1) - { - $get_new_list = true; - } - - if ($get_new_list) - { - $this->get_update_structure($update_list); - $cache->put('_update_list', $update_list); - - // Refresh the page if we are still not finished... - if ($update_list['status'] != -1) - { - $refresh_url = append_sid($this->p_master->module_url, "mode=$mode&sub=file_check"); - meta_refresh(2, $refresh_url); - - $template->assign_vars(array( - 'S_IN_PROGRESS' => true, - 'S_COLLECTED' => (int) $update_list['status'], - 'S_TO_COLLECT' => sizeof($this->update_info['files']), - 'L_IN_PROGRESS' => $user->lang['COLLECTING_FILE_DIFFS'], - 'L_IN_PROGRESS_EXPLAIN' => sprintf($user->lang['NUMBER_OF_FILES_COLLECTED'], (int) $update_list['status'], sizeof($this->update_info['files'])), - )); - - return; - } - } - - if ($action == 'diff') - { - $this->show_diff($update_list); - return; - } - - if (sizeof($update_list['no_update'])) - { - $template->assign_vars(array( - 'S_NO_UPDATE_FILES' => true, - 'NO_UPDATE_FILES' => implode(', ', array_map('htmlspecialchars', $update_list['no_update']))) - ); - } - - // Now assign the list to the template - foreach ($update_list as $status => $filelist) - { - if ($status == 'no_update' || !sizeof($filelist) || $status == 'status') - { - continue; - } - - $template->assign_block_vars('files', array( - 'S_STATUS' => true, - 'STATUS' => $status, - 'L_STATUS' => $user->lang['STATUS_' . strtoupper($status)], - 'TITLE' => $user->lang['FILES_' . strtoupper($status)], - 'EXPLAIN' => $user->lang['FILES_' . strtoupper($status) . '_EXPLAIN'], - ) - ); - - foreach ($filelist as $file_struct) - { - $s_binary = (!empty($this->update_info['binary']) && in_array($file_struct['filename'], $this->update_info['binary'])) ? true : false; - - $filename = htmlspecialchars($file_struct['filename']); - if (strrpos($filename, '/') !== false) - { - $dir_part = substr($filename, 0, strrpos($filename, '/') + 1); - $file_part = substr($filename, strrpos($filename, '/') + 1); - } - else - { - $dir_part = ''; - $file_part = $filename; - } - - $diff_url = append_sid($this->p_master->module_url, "mode=$mode&sub=file_check&action=diff&status=$status&file=" . urlencode($file_struct['filename'])); - - $template->assign_block_vars('files', array( - 'STATUS' => $status, - - 'FILENAME' => $filename, - 'DIR_PART' => $dir_part, - 'FILE_PART' => $file_part, - 'NUM_CONFLICTS' => (isset($file_struct['conflicts'])) ? $file_struct['conflicts'] : 0, - - 'S_CUSTOM' => ($file_struct['custom']) ? true : false, - 'S_BINARY' => $s_binary, - 'CUSTOM_ORIGINAL' => ($file_struct['custom']) ? $file_struct['original'] : '', - - 'U_SHOW_DIFF' => $diff_url, - 'L_SHOW_DIFF' => ($status != 'up_to_date') ? $user->lang['SHOW_DIFF_' . strtoupper($status)] : '', - - 'U_VIEW_MOD_FILE' => $diff_url . '&op=' . MERGE_MOD_FILE, - 'U_VIEW_NEW_FILE' => $diff_url . '&op=' . MERGE_NEW_FILE, - 'U_VIEW_NO_MERGE_MOD' => $diff_url . '&op=' . MERGE_NO_MERGE_MOD, - 'U_VIEW_NO_MERGE_NEW' => $diff_url . '&op=' . MERGE_NO_MERGE_NEW, - )); - } - } - - $all_up_to_date = true; - foreach ($update_list as $status => $filelist) - { - if ($status != 'up_to_date' && $status != 'custom' && $status != 'status' && sizeof($filelist)) - { - $all_up_to_date = false; - break; - } - } - - $template->assign_vars(array( - 'S_FILE_CHECK' => true, - 'S_ALL_UP_TO_DATE' => $all_up_to_date, - 'S_VERSION_UP_TO_DATE' => $up_to_date, - 'U_ACTION' => append_sid($this->p_master->module_url, "mode=$mode&sub=file_check"), - 'U_UPDATE_ACTION' => append_sid($this->p_master->module_url, "mode=$mode&sub=update_files"), - 'U_DB_UPDATE_ACTION' => append_sid($this->p_master->module_url, "mode=$mode&sub=update_db"), - )); - - if ($all_up_to_date) - { - // Add database update to log - add_log('admin', 'LOG_UPDATE_PHPBB', $this->current_version, $this->latest_version); - - // Refresh prosilver css data - this may cause some unhappy users, but - $sql = 'SELECT * - FROM ' . STYLES_THEME_TABLE . " - WHERE theme_name = 'prosilver'"; - $result = $db->sql_query($sql); - $theme = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($theme) - { - $recache = (empty($theme['theme_data'])) ? true : false; - $update_time = time(); - - // We test for stylesheet.css because it is faster and most likely the only file changed on common themes - if (!$recache && $theme['theme_mtime'] < @filemtime("{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme/stylesheet.css')) - { - $recache = true; - $update_time = @filemtime("{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme/stylesheet.css'); - } - else if (!$recache) - { - $last_change = $theme['theme_mtime']; - $dir = @opendir("{$phpbb_root_path}styles/{$theme['theme_path']}/theme"); - - if ($dir) - { - while (($entry = readdir($dir)) !== false) - { - if (substr(strrchr($entry, '.'), 1) == 'css' && $last_change < @filemtime("{$phpbb_root_path}styles/{$theme['theme_path']}/theme/{$entry}")) - { - $recache = true; - break; - } - } - closedir($dir); - } - } - - if ($recache) - { - include_once($phpbb_root_path . 'includes/acp/acp_styles.' . $phpEx); - - $theme['theme_data'] = acp_styles::db_theme_data($theme); - $theme['theme_mtime'] = $update_time; - - // Save CSS contents - $sql_ary = array( - 'theme_mtime' => $theme['theme_mtime'], - 'theme_data' => $theme['theme_data'] - ); - - $sql = 'UPDATE ' . STYLES_THEME_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE theme_id = ' . $theme['theme_id']; - $db->sql_query($sql); - - $cache->destroy('sql', STYLES_THEME_TABLE); - } - } - - $db->sql_return_on_error(true); - $db->sql_query('DELETE FROM ' . CONFIG_TABLE . " WHERE config_name = 'version_update_from'"); - $db->sql_return_on_error(false); - - $cache->purge(); - } - - break; - - case 'update_files': - - $this->page_title = 'STAGE_UPDATE_FILES'; - - $s_hidden_fields = ''; - $params = array(); - $conflicts = request_var('conflict', array('' => 0)); - $modified = request_var('modified', array('' => 0)); - - foreach ($conflicts as $filename => $merge_option) - { - $s_hidden_fields .= ''; - $params[] = 'conflict[' . urlencode($filename) . ']=' . urlencode($merge_option); - } - - foreach ($modified as $filename => $merge_option) - { - if (!$merge_option) - { - continue; - } - $s_hidden_fields .= ''; - $params[] = 'modified[' . urlencode($filename) . ']=' . urlencode($merge_option); - } - - $no_update = request_var('no_update', array(0 => '')); - - foreach ($no_update as $index => $filename) - { - $s_hidden_fields .= ''; - $params[] = 'no_update[]=' . urlencode($filename); - } - - // Before the user is choosing his preferred method, let's create the content list... - $update_list = $cache->get('_update_list'); - - if ($update_list === false) - { - trigger_error($user->lang['NO_UPDATE_INFO'], E_USER_ERROR); - } - - // Check if the conflicts data is valid - if (sizeof($conflicts)) - { - $conflict_filenames = array(); - foreach ($update_list['conflict'] as $files) - { - $conflict_filenames[] = $files['filename']; - } - - $new_conflicts = array(); - foreach ($conflicts as $filename => $diff_method) - { - if (in_array($filename, $conflict_filenames)) - { - $new_conflicts[$filename] = $diff_method; - } - } - - $conflicts = $new_conflicts; - } - - // Build list for modifications - if (sizeof($modified)) - { - $modified_filenames = array(); - foreach ($update_list['modified'] as $files) - { - $modified_filenames[] = $files['filename']; - } - - $new_modified = array(); - foreach ($modified as $filename => $diff_method) - { - if (in_array($filename, $modified_filenames)) - { - $new_modified[$filename] = $diff_method; - } - } - - $modified = $new_modified; - } - - // Check number of conflicting files, they need to be equal. For modified files the number can differ - if (sizeof($update_list['conflict']) != sizeof($conflicts)) - { - trigger_error($user->lang['MERGE_SELECT_ERROR'], E_USER_ERROR); - } - - // Before we do anything, let us diff the files and store the raw file information "somewhere" - $get_files = false; - $file_list = $cache->get('_diff_files'); - - if ($file_list === false || $file_list['status'] != -1) - { - $get_files = true; - } - - if ($get_files) - { - if ($file_list === false) - { - $file_list = array( - 'status' => 0, - ); - } - - $processed = 0; - foreach ($update_list as $status => $files) - { - if (!is_array($files)) - { - continue; - } - - foreach ($files as $file_struct) - { - // Skip this file if the user selected to not update it - if (in_array($file_struct['filename'], $no_update)) - { - continue; - } - - // Already handled... then skip of course... - if (isset($file_list[$file_struct['filename']])) - { - continue; - } - - // Refresh if we reach 5 diffs... - if ($processed >= 5) - { - $cache->put('_diff_files', $file_list); - - if (!empty($_REQUEST['download'])) - { - $params[] = 'download=1'; - } - - $redirect_url = append_sid($this->p_master->module_url, "mode=$mode&sub=update_files&" . implode('&', $params)); - meta_refresh(3, $redirect_url); - - $template->assign_vars(array( - 'S_IN_PROGRESS' => true, - 'L_IN_PROGRESS' => $user->lang['MERGING_FILES'], - 'L_IN_PROGRESS_EXPLAIN' => $user->lang['MERGING_FILES_EXPLAIN'], - )); - - return; - } - - $original_filename = ($file_struct['custom']) ? $file_struct['original'] : $file_struct['filename']; - - switch ($status) - { - case 'modified': - - $option = (isset($modified[$file_struct['filename']])) ? $modified[$file_struct['filename']] : 0; - - switch ($option) - { - case MERGE_NO_MERGE_NEW: - $contents = file_get_contents($this->new_location . $original_filename); - break; - - case MERGE_NO_MERGE_MOD: - $contents = file_get_contents($phpbb_root_path . $file_struct['filename']); - break; - - default: - $diff = $this->return_diff($this->old_location . $original_filename, $phpbb_root_path . $file_struct['filename'], $this->new_location . $original_filename); - - $contents = implode("\n", $diff->merged_output()); - unset($diff); - break; - } - - $file_list[$file_struct['filename']] = '_file_' . md5($file_struct['filename']); - $cache->put($file_list[$file_struct['filename']], base64_encode($contents)); - - $file_list['status']++; - $processed++; - - break; - - case 'conflict': - - $option = $conflicts[$file_struct['filename']]; - $contents = ''; - - switch ($option) - { - case MERGE_NO_MERGE_NEW: - $contents = file_get_contents($this->new_location . $original_filename); - break; - - case MERGE_NO_MERGE_MOD: - $contents = file_get_contents($phpbb_root_path . $file_struct['filename']); - break; - - default: - - $diff = $this->return_diff($this->old_location . $original_filename, $phpbb_root_path . $file_struct['filename'], $this->new_location . $original_filename); - - if ($option == MERGE_NEW_FILE) - { - $contents = implode("\n", $diff->merged_new_output()); - } - else if ($option == MERGE_MOD_FILE) - { - $contents = implode("\n", $diff->merged_orig_output()); - } - else - { - unset($diff); - break 2; - } - - unset($diff); - break; - } - - $file_list[$file_struct['filename']] = '_file_' . md5($file_struct['filename']); - $cache->put($file_list[$file_struct['filename']], base64_encode($contents)); - - $file_list['status']++; - $processed++; - - break; - } - } - } - } - - $file_list['status'] = -1; - $cache->put('_diff_files', $file_list); - - if (!empty($_REQUEST['download'])) - { - $this->include_file('includes/functions_compress.' . $phpEx); - - $use_method = request_var('use_method', ''); - $methods = array('.tar'); - - $available_methods = array('.tar.gz' => 'zlib', '.tar.bz2' => 'bz2', '.zip' => 'zlib'); - foreach ($available_methods as $type => $module) - { - if (!@extension_loaded($module)) - { - continue; - } - - $methods[] = $type; - } - - // Let the user decide in which format he wants to have the pack - if (!$use_method) - { - $this->page_title = 'SELECT_DOWNLOAD_FORMAT'; - - $radio_buttons = ''; - foreach ($methods as $method) - { - $radio_buttons .= ''; - } - - $template->assign_vars(array( - 'S_DOWNLOAD_FILES' => true, - 'U_ACTION' => append_sid($this->p_master->module_url, "mode=$mode&sub=update_files"), - 'RADIO_BUTTONS' => $radio_buttons, - 'S_HIDDEN_FIELDS' => $s_hidden_fields) - ); - - // To ease the update process create a file location map - $update_list = $cache->get('_update_list'); - $script_path = ($config['force_server_vars']) ? (($config['script_path'] == '/') ? '/' : $config['script_path'] . '/') : $user->page['root_script_path']; - - foreach ($update_list as $status => $files) - { - if ($status == 'up_to_date' || $status == 'no_update' || $status == 'status') - { - continue; - } - - foreach ($files as $file_struct) - { - if (in_array($file_struct['filename'], $no_update)) - { - continue; - } - - $template->assign_block_vars('location', array( - 'SOURCE' => htmlspecialchars($file_struct['filename']), - 'DESTINATION' => $script_path . htmlspecialchars($file_struct['filename']), - )); - } - } - return; - } - - if (!in_array($use_method, $methods)) - { - $use_method = '.tar'; - } - - $update_mode = 'download'; - } - else - { - $this->include_file('includes/functions_transfer.' . $phpEx); - - // Choose FTP, if not available use fsock... - $method = basename(request_var('method', '')); - $submit = (isset($_POST['submit'])) ? true : false; - $test_ftp_connection = request_var('test_connection', ''); - - if (!$method || !class_exists($method)) - { - $method = 'ftp'; - $methods = transfer::methods(); - - if (!in_array('ftp', $methods)) - { - $method = $methods[0]; - } - } - - $test_connection = false; - if ($test_ftp_connection || $submit) - { - $transfer = new $method(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', '')); - $test_connection = $transfer->open_session(); - - // Make sure that the directory is correct by checking for the existence of common.php - if ($test_connection === true) - { - // Check for common.php file - if (!$transfer->file_exists($phpbb_root_path, 'common.' . $phpEx)) - { - $test_connection = 'ERR_WRONG_PATH_TO_PHPBB'; - } - } - - $transfer->close_session(); - - // Make sure the login details are correct before continuing - if ($submit && $test_connection !== true) - { - $submit = false; - $test_ftp_connection = true; - } - } - - $s_hidden_fields .= build_hidden_fields(array('method' => $method)); - - if (!$submit) - { - $this->page_title = 'SELECT_FTP_SETTINGS'; - - if (!class_exists($method)) - { - trigger_error('Method does not exist.', E_USER_ERROR); - } - - $requested_data = call_user_func(array($method, 'data')); - foreach ($requested_data as $data => $default) - { - $template->assign_block_vars('data', array( - 'DATA' => $data, - 'NAME' => $user->lang[strtoupper($method . '_' . $data)], - 'EXPLAIN' => $user->lang[strtoupper($method . '_' . $data) . '_EXPLAIN'], - 'DEFAULT' => (!empty($_REQUEST[$data])) ? request_var($data, '') : $default - )); - } - - $template->assign_vars(array( - 'S_CONNECTION_SUCCESS' => ($test_ftp_connection && $test_connection === true) ? true : false, - 'S_CONNECTION_FAILED' => ($test_ftp_connection && $test_connection !== true) ? true : false, - 'ERROR_MSG' => ($test_ftp_connection && $test_connection !== true) ? $user->lang[$test_connection] : '', - - 'S_FTP_UPLOAD' => true, - 'UPLOAD_METHOD' => $method, - 'U_ACTION' => append_sid($this->p_master->module_url, "mode=$mode&sub=update_files"), - 'S_HIDDEN_FIELDS' => $s_hidden_fields) - ); - - return; - } - - $update_mode = 'upload'; - } - - // Now update the installation or download the archive... - $download_filename = 'update_' . $this->update_info['version']['from'] . '_to_' . $this->update_info['version']['to']; - $archive_filename = $download_filename . '_' . time() . '_' . unique_id(); - - // Now init the connection - if ($update_mode == 'download') - { - if ($use_method == '.zip') - { - $compress = new compress_zip('w', $phpbb_root_path . 'store/' . $archive_filename . $use_method); - } - else - { - $compress = new compress_tar('w', $phpbb_root_path . 'store/' . $archive_filename . $use_method, $use_method); - } - } - else - { - $transfer = new $method(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', '')); - $transfer->open_session(); - } - - // Ok, go through the update list and do the operations based on their status - foreach ($update_list as $status => $files) - { - if (!is_array($files)) - { - continue; - } - - foreach ($files as $file_struct) - { - // Skip this file if the user selected to not update it - if (in_array($file_struct['filename'], $no_update)) - { - continue; - } - - $original_filename = ($file_struct['custom']) ? $file_struct['original'] : $file_struct['filename']; - - switch ($status) - { - case 'new': - case 'new_conflict': - case 'not_modified': - - if ($update_mode == 'download') - { - $compress->add_custom_file($this->new_location . $original_filename, $file_struct['filename']); - } - else - { - if ($status != 'new') - { - $transfer->rename($file_struct['filename'], $file_struct['filename'] . '.bak'); - } - - // New directory too? - $dirname = dirname($file_struct['filename']); - - if ($dirname && !file_exists($phpbb_root_path . $dirname)) - { - $transfer->make_dir($dirname); - } - - $transfer->copy_file($this->new_location . $original_filename, $file_struct['filename']); - } - break; - - case 'modified': - - $contents = base64_decode($cache->get($file_list[$file_struct['filename']])); - - if ($update_mode == 'download') - { - $compress->add_data($contents, $file_struct['filename']); - } - else - { - // @todo add option to specify if a backup file should be created? - $transfer->rename($file_struct['filename'], $file_struct['filename'] . '.bak'); - $transfer->write_file($file_struct['filename'], $contents); - } - break; - - case 'conflict': - - $contents = base64_decode($cache->get($file_list[$file_struct['filename']])); - - if ($update_mode == 'download') - { - $compress->add_data($contents, $file_struct['filename']); - } - else - { - $transfer->rename($file_struct['filename'], $file_struct['filename'] . '.bak'); - $transfer->write_file($file_struct['filename'], $contents); - } - break; - } - } - } - - if ($update_mode == 'download') - { - $compress->close(); - - $compress->download($archive_filename, $download_filename); - @unlink($phpbb_root_path . 'store/' . $archive_filename . $use_method); - - exit; - } - else - { - $transfer->close_session(); - - $template->assign_vars(array( - 'S_UPLOAD_SUCCESS' => true, - 'U_ACTION' => append_sid($this->p_master->module_url, "mode=$mode&sub=file_check")) - ); - return; - } - - break; - - } - } - - /** - * Show file diff - */ - function show_diff(&$update_list) - { - global $phpbb_root_path, $template, $user; - - $this->tpl_name = 'install_update_diff'; - - // Got the diff template itself updated? If so, we are able to directly use it - if (in_array('adm/style/install_update_diff.html', $this->update_info['files'])) - { - $this->tpl_name = '../../install/update/new/adm/style/install_update_diff'; - } - - $this->page_title = 'VIEWING_FILE_DIFF'; - - $status = request_var('status', ''); - $file = request_var('file', ''); - $diff_mode = request_var('diff_mode', 'side_by_side'); - - // First of all make sure the file is within our file update list with the correct status - $found_entry = array(); - foreach ($update_list[$status] as $index => $file_struct) - { - if ($file_struct['filename'] === $file) - { - $found_entry = $update_list[$status][$index]; - } - } - - if (empty($found_entry)) - { - trigger_error($user->lang['FILE_DIFF_NOT_ALLOWED'], E_USER_ERROR); - } - - // If the status is 'up_to_date' then we do not need to show a diff - if ($status == 'up_to_date') - { - trigger_error($user->lang['FILE_ALREADY_UP_TO_DATE'], E_USER_ERROR); - } - - $original_file = ($found_entry['custom']) ? $found_entry['original'] : $file; - - // Get the correct diff - switch ($status) - { - case 'conflict': - $option = request_var('op', 0); - - switch ($option) - { - case MERGE_NO_MERGE_NEW: - case MERGE_NO_MERGE_MOD: - - $diff = $this->return_diff(array(), ($option == MERGE_NO_MERGE_NEW) ? $this->new_location . $original_file : $phpbb_root_path . $file); - - $template->assign_var('S_DIFF_NEW_FILE', true); - $diff_mode = 'inline'; - $this->page_title = 'VIEWING_FILE_CONTENTS'; - - break; - - case MERGE_NEW_FILE: - case MERGE_MOD_FILE: - - $diff = $this->return_diff($this->old_location . $original_file, $phpbb_root_path . $file, $this->new_location . $original_file); - - $tmp = array( - 'file1' => array(), - 'file2' => ($option == MERGE_NEW_FILE) ? implode("\n", $diff->merged_new_output()) : implode("\n", $diff->merged_orig_output()), - ); - - $diff = &new diff($tmp['file1'], $tmp['file2']); - - unset($tmp); - - $template->assign_var('S_DIFF_NEW_FILE', true); - $diff_mode = 'inline'; - $this->page_title = 'VIEWING_FILE_CONTENTS'; - - break; - - default: - - $diff = $this->return_diff($this->old_location . $original_file, $phpbb_root_path . $file, $this->new_location . $original_file); - - $template->assign_vars(array( - 'S_DIFF_CONFLICT_FILE' => true, - 'NUM_CONFLICTS' => $diff->merged_output(false, false, false, true)) - ); - - $diff = $this->return_diff($phpbb_root_path . $file, $diff->merged_output()); - break; - } - - break; - - case 'modified': - $option = request_var('op', 0); - - switch ($option) - { - case MERGE_NO_MERGE_NEW: - case MERGE_NO_MERGE_MOD: - - $diff = $this->return_diff(array(), ($option == MERGE_NO_MERGE_NEW) ? $this->new_location . $original_file : $phpbb_root_path . $file); - - $template->assign_var('S_DIFF_NEW_FILE', true); - $diff_mode = 'inline'; - $this->page_title = 'VIEWING_FILE_CONTENTS'; - - break; - - default: - $diff = $this->return_diff($this->old_location . $original_file, $phpbb_root_path . $original_file, $this->new_location . $file); - break; - } - break; - - case 'not_modified': - case 'new_conflict': - $diff = $this->return_diff($phpbb_root_path . $file, $this->new_location . $original_file); - break; - - case 'new': - - $diff = $this->return_diff(array(), $this->new_location . $original_file); - - $template->assign_var('S_DIFF_NEW_FILE', true); - $diff_mode = 'inline'; - $this->page_title = 'VIEWING_FILE_CONTENTS'; - - break; - } - - $diff_mode_options = ''; - foreach (array('side_by_side', 'inline', 'unified', 'raw') as $option) - { - $diff_mode_options .= ''; - } - - // Now the correct renderer - $render_class = 'diff_renderer_' . $diff_mode; - - if (!class_exists($render_class)) - { - trigger_error('Chosen diff mode is not supported', E_USER_ERROR); - } - - $renderer = &new $render_class(); - - $template->assign_vars(array( - 'DIFF_CONTENT' => $renderer->get_diff_content($diff), - 'DIFF_MODE' => $diff_mode, - 'S_DIFF_MODE_OPTIONS' => $diff_mode_options, - 'S_SHOW_DIFF' => true, - )); - - unset($diff, $renderer); - } - - /** - * Collect all file status infos we need for the update by diffing all files - */ - function get_update_structure(&$update_list) - { - global $phpbb_root_path, $phpEx, $user; - - if ($update_list === false) - { - $update_list = array( - 'up_to_date' => array(), - 'new' => array(), - 'not_modified' => array(), - 'modified' => array(), - 'new_conflict' => array(), - 'conflict' => array(), - 'no_update' => array(), - 'status' => 0, - ); - } - - /* if (!empty($this->update_info['custom'])) - { - foreach ($this->update_info['custom'] as $original_file => $file_ary) - { - foreach ($file_ary as $index => $file) - { - $this->make_update_diff($update_list, $original_file, $file, true); - } - } - } */ - - // Get a list of those files which are completely new by checking with file_exists... - $num_bytes_processed = 0; - - foreach ($this->update_info['files'] as $index => $file) - { - if (is_int($update_list['status']) && $index < $update_list['status']) - { - continue; - } - - if ($num_bytes_processed >= 500 * 1024) - { - return; - } - - if (!file_exists($phpbb_root_path . $file)) - { - // Make sure the update files are consistent by checking if the file is in new_files... - if (!file_exists($this->new_location . $file)) - { - trigger_error($user->lang['INCOMPLETE_UPDATE_FILES'], E_USER_ERROR); - } - - // If the file exists within the old directory the file got removed and we will write it back - // not a biggie, but we might want to state this circumstance separately later. - // if (file_exists($this->old_location . $file)) - // { - // $update_list['removed'][] = $file; - // } - - /* Only include a new file as new if the underlying path exist - // The path normally do not exist if the original style or language has been removed - if (file_exists($phpbb_root_path . dirname($file))) - { - $this->get_custom_info($update_list['new'], $file); - $update_list['new'][] = array('filename' => $file, 'custom' => false); - } - else - { - // Do not include style-related or language-related content - if (strpos($file, 'styles/') !== 0 && strpos($file, 'language/') !== 0) - { - $update_list['no_update'][] = $file; - } - }*/ - - if (file_exists($phpbb_root_path . dirname($file)) || (strpos($file, 'styles/') !== 0 && strpos($file, 'language/') !== 0)) - { - $this->get_custom_info($update_list['new'], $file); - $update_list['new'][] = array('filename' => $file, 'custom' => false); - } - - // unset($this->update_info['files'][$index]); - } - else - { - // not modified? - $this->make_update_diff($update_list, $file, $file); - } - - $num_bytes_processed += (file_exists($this->new_location . $file)) ? filesize($this->new_location . $file) : 100 * 1024; - $update_list['status']++; - } - - $update_list['status'] = -1; -/* if (!sizeof($this->update_info['files'])) - { - return $update_list; - } - - // Now diff the remaining files to get information about their status (not modified/modified/up-to-date) - - // not modified? - foreach ($this->update_info['files'] as $index => $file) - { - $this->make_update_diff($update_list, $file, $file); - } - - // Now to the styles... - if (empty($this->update_info['custom'])) - { - return $update_list; - } - - foreach ($this->update_info['custom'] as $original_file => $file_ary) - { - foreach ($file_ary as $index => $file) - { - $this->make_update_diff($update_list, $original_file, $file, true); - } - } - - return $update_list;*/ - } - - /** - * Compare files for storage in update_list - */ - function make_update_diff(&$update_list, $original_file, $file, $custom = false) - { - global $phpbb_root_path, $user; - - $update_ary = array('filename' => $file, 'custom' => $custom); - - if ($custom) - { - $update_ary['original'] = $original_file; - } - - // On a successfull update the new location file exists but the old one does not exist. - // Check for this circumstance, the new file need to be up-to-date with the current file then... - if (!file_exists($this->old_location . $original_file) && file_exists($this->new_location . $original_file) && file_exists($phpbb_root_path . $file)) - { - $tmp = array( - 'file1' => file_get_contents($this->new_location . $original_file), - 'file2' => file_get_contents($phpbb_root_path . $file), - ); - - // We need to diff the contents here to make sure the file is really the one we expect - $diff = &new diff($tmp['file1'], $tmp['file2'], false); - $empty = $diff->is_empty(); - - unset($tmp, $diff); - - // if there are no differences we have an up-to-date file... - if ($empty) - { - $update_list['up_to_date'][] = $update_ary; - return; - } - - // If no other status matches we have another file in the way... - $update_list['new_conflict'][] = $update_ary; - return; - } - - // Old file removed? - if (file_exists($this->old_location . $original_file) && !file_exists($this->new_location . $original_file)) - { - return; - } - - // Check for existance, else abort immediately - if (!file_exists($this->old_location . $original_file) || !file_exists($this->new_location . $original_file)) - { - trigger_error($user->lang['INCOMPLETE_UPDATE_FILES'], E_USER_ERROR); - } - - $tmp = array( - 'file1' => file_get_contents($this->old_location . $original_file), - 'file2' => file_get_contents($phpbb_root_path . $file), - ); - - // We need to diff the contents here to make sure the file is really the one we expect - $diff = &new diff($tmp['file1'], $tmp['file2'], false); - $empty_1 = $diff->is_empty(); - - unset($tmp, $diff); - - $tmp = array( - 'file1' => file_get_contents($this->new_location . $original_file), - 'file2' => file_get_contents($phpbb_root_path . $file), - ); - - // We need to diff the contents here to make sure the file is really the one we expect - $diff = &new diff($tmp['file1'], $tmp['file2'], false); - $empty_2 = $diff->is_empty(); - - unset($tmp, $diff); - - // If the file is not modified we are finished here... - if ($empty_1) - { - // Further check if it is already up to date - it could happen that non-modified files - // slip through - if ($empty_2) - { - $update_list['up_to_date'][] = $update_ary; - return; - } - - $update_list['not_modified'][] = $update_ary; - return; - } - - // If the file had been modified then we need to check if it is already up to date - - // if there are no differences we have an up-to-date file... - if ($empty_2) - { - $update_list['up_to_date'][] = $update_ary; - return; - } - - // if the file is modified we try to make sure a merge succeed - $tmp = array( - 'file1' => file_get_contents($this->old_location . $original_file), - 'file2' => file_get_contents($phpbb_root_path . $file), - 'file3' => file_get_contents($this->new_location . $original_file), - ); - - $diff = &new diff3($tmp['file1'], $tmp['file2'], $tmp['file3'], false); - - unset($tmp); - - if ($diff->merged_output(false, false, false, true)) - { - $update_ary['conflicts'] = $diff->_conflicting_blocks; - - // There is one special case... users having merged with a conflicting file... we need to check this - $tmp = array( - 'file1' => file_get_contents($phpbb_root_path . $file), - 'file2' => implode("\n", $diff->merged_orig_output()), - ); - - $diff = &new diff($tmp['file1'], $tmp['file2'], false); - $empty = $diff->is_empty(); - - if ($empty) - { - unset($update_ary['conflicts']); - unset($diff); - $update_list['up_to_date'][] = $update_ary; - return; - } - - $update_list['conflict'][] = $update_ary; - unset($diff); - - return; - } - - $tmp = array( - 'file1' => file_get_contents($phpbb_root_path . $file), - 'file2' => implode("\n", $diff->merged_output()), - ); - - // now compare the merged output with the original file to see if the modified file is up to date - $diff = &new diff($tmp['file1'], $tmp['file2'], false); - $empty = $diff->is_empty(); - - if ($empty) - { - unset($diff); - - $update_list['up_to_date'][] = $update_ary; - return; - } - - // If no other status matches we have a modified file... - $update_list['modified'][] = $update_ary; - } - - /** - * Update update_list with custom new files - */ - function get_custom_info(&$update_list, $file) - { - if (empty($this->update_info['custom'])) - { - return; - } - - if (isset($this->update_info['custom'][$file])) - { - foreach ($this->update_info['custom'][$file] as $_file) - { - $update_list[] = array('filename' => $_file, 'custom' => true, 'original' => $file); - } - } - } - - /** - * Get remote file - */ - function get_file($mode) - { - global $user, $db; - - $errstr = ''; - $errno = 0; - - switch ($mode) - { - case 'version_info': - global $phpbb_root_path, $phpEx; - $info = get_remote_file('www.phpbb.com', '/updatecheck', ((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno); - - if ($info !== false) - { - $info = explode("\n", $info); - $info = trim($info[0]); - } - - if ($this->test_update !== false) - { - $info = $this->test_update; - } - - // If info is false the fsockopen function may not be working. Instead get the latest version from our update file (and pray it is up-to-date) - if ($info === false) - { - $update_info = array(); - include($phpbb_root_path . 'install/update/index.php'); - $info = (empty($update_info) || !is_array($update_info)) ? false : $update_info; - - if ($info !== false) - { - $info = (!empty($info['version']['to'])) ? trim($info['version']['to']) : false; - } - } - break; - - case 'update_info': - global $phpbb_root_path, $phpEx; - - $update_info = array(); - include($phpbb_root_path . 'install/update/index.php'); - - $info = (empty($update_info) || !is_array($update_info)) ? false : $update_info; - $errstr = ($info === false) ? $user->lang['WRONG_INFO_FILE_FORMAT'] : ''; - - if ($info !== false) - { - // Adjust the update info file to hold some specific style-related information - $info['custom'] = array(); -/* - // Get custom installed styles... - $sql = 'SELECT template_name, template_path - FROM ' . STYLES_TEMPLATE_TABLE . " - WHERE LOWER(template_name) NOT IN ('subsilver2', 'prosilver')"; - $result = $db->sql_query($sql); - - $templates = array(); - while ($row = $db->sql_fetchrow($result)) - { - $templates[] = $row; - } - $db->sql_freeresult($result); - - if (sizeof($templates)) - { - foreach ($info['files'] as $filename) - { - // Template update? - if (strpos(strtolower($filename), 'styles/prosilver/template/') === 0) - { - foreach ($templates as $row) - { - $info['custom'][$filename][] = str_replace('/prosilver/', '/' . $row['template_path'] . '/', $filename); - } - } - } - } -*/ - } - break; - - default: - trigger_error('Mode for getting remote file not specified', E_USER_ERROR); - break; - } - - if ($info === false) - { - trigger_error($errstr, E_USER_ERROR); - } - - return $info; - } - - /** - * Function for including files... - */ - function include_file($filename) - { - global $phpbb_root_path, $phpEx; - - if (!empty($this->update_info['files']) && in_array($filename, $this->update_info['files'])) - { - include_once($this->new_location . $filename); - } - else - { - include_once($phpbb_root_path . $filename); - } - } - - /** - * Wrapper for returning a diff object - */ - function &return_diff() - { - $args = func_get_args(); - $three_way_diff = (func_num_args() > 2) ? true : false; - - $file1 = array_shift($args); - $file2 = array_shift($args); - - $tmp['file1'] = (!empty($file1) && is_string($file1)) ? file_get_contents($file1) : $file1; - $tmp['file2'] = (!empty($file2) && is_string($file2)) ? file_get_contents($file2) : $file2; - - if ($three_way_diff) - { - $file3 = array_shift($args); - $tmp['file3'] = (!empty($file3) && is_string($file3)) ? file_get_contents($file3) : $file3; - - $diff = &new diff3($tmp['file1'], $tmp['file2'], $tmp['file3']); - } - else - { - $diff = &new diff($tmp['file1'], $tmp['file2']); - } - - unset($tmp); - - return $diff; - } -} - -?> \ No newline at end of file diff --git a/phpBB/install/phpinfo.php b/phpBB/install/phpinfo.php deleted file mode 100644 index 6480abf34a..0000000000 --- a/phpBB/install/phpinfo.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/phpBB/install/schemas/ms_access_primer.zip b/phpBB/install/schemas/ms_access_primer.zip new file mode 100644 index 0000000000..04430dd3ba Binary files /dev/null and b/phpBB/install/schemas/ms_access_primer.zip differ diff --git a/phpBB/install/schemas/mssql_basic.sql b/phpBB/install/schemas/mssql_basic.sql new file mode 100644 index 0000000000..4436648308 --- /dev/null +++ b/phpBB/install/schemas/mssql_basic.sql @@ -0,0 +1,254 @@ +/* + + Basic DB data for phpBB2 devel (MSSQL) + + $Id$ + +*/ + +BEGIN TRANSACTION; + +/* + -- Config +*/ +INSERT INTO phpbb_config (config_name, config_value) VALUES ('config_id','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename','yourdomain.com'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_desc','A _little_ text to describe your forum'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name','phpbb2mysql'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path','/'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_domain',''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_secure','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_length','3600'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_html','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_html_tags','b,i,u,pre'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_bbcode','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_smilies','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_namechange','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_theme_create','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_local','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page','15'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page','50'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold','25'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_poll_options','10'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_chars','255'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_inbox_privmsgs','50'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sentbox_privmsgs','25'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_savebox_privmsgs','50'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig','Thanks, The Management'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email','youraddress@yourdomain.com'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_confirm', '1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_autologin','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_autologin_time','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host',''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_username',''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_password',''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('sendmail_fix','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('require_activation','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval','15'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_flood_interval','15'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_min_chars','3'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_login_attempts', '5'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('login_reset_time', '30'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_form','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_filesize','6144'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_width','80'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_height','80'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_path','images/avatars'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat','D M d, Y g:i a'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('prune_enable','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('privmsg_disable','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', ''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', ''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_users', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_date', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', 'www.yourdomain.tld'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.23'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('rand_seed', '0'); + +/* + -- Categories +*/ +SET IDENTITY_INSERT phpbb_categories ON; + +INSERT INTO phpbb_categories (cat_id, cat_title, cat_order) VALUES (1, 'Test category 1', 1); + +SET IDENTITY_INSERT phpbb_categories OFF; + + +/* + -- Forums +*/ +INSERT INTO phpbb_forums (forum_id, cat_id, forum_name, forum_desc, forum_status, forum_order, forum_posts, forum_topics, forum_last_post_id, prune_next, prune_enable, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_announce, auth_sticky, auth_pollcreate, auth_vote, auth_attachments) VALUES (1, 1, 'Test Forum 1', 'This is just a test forum, nothing special here.', '', 1, 1, 1, 1, '', 1, '', '', 1, 1, 1, 1, 3, 3, 1, 1, 3); + +/* + -- Users + Default Admin --> username: admin + password: admin (change this or remove it once everything is working!) +*/ +INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( -1, 'Anonymous', 0, 0, '', '', '', '', '', '', '', '', 0, NULL, '', '', '', 0, 0, 1, 1, 1, 0, 1, 1, NULL, '', '', 0, '', '', '', 0, 0); +INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_popup_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( 2, 'Admin', 1, 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', '', '', '', '', '', '', 1, 1, '', '', '', 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, '', 'english', 0, 'd M Y h:i a', '', '', 0, 1); + + +/* + -- Ranks +*/ +SET IDENTITY_INSERT phpbb_ranks ON; + +INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES (1, 'Site Admin', -1, 1, ''); + +SET IDENTITY_INSERT phpbb_ranks OFF; + + +/* + -- Groups +*/ +SET IDENTITY_INSERT phpbb_groups ON; + +INSERT INTO phpbb_groups (group_id, group_type, group_name, group_description, group_moderator, group_single_user) VALUES (1, 1, 'Anonymous', 'Personal User', '', 1); +INSERT INTO phpbb_groups (group_id, group_type, group_name, group_description, group_moderator, group_single_user) VALUES (2, 1, 'Admin', 'Personal User', '', 1); + +SET IDENTITY_INSERT phpbb_groups OFF; + +/* + -- User -> Group +*/ +INSERT INTO phpbb_user_group (group_id, user_id, user_pending) VALUES (1, -1, ''); +INSERT INTO phpbb_user_group (group_id, user_id, user_pending) VALUES (2, 2, ''); + + +/* + -- Demo Topic +*/ +SET IDENTITY_INSERT phpbb_topics ON; + +INSERT INTO phpbb_topics (topic_id, topic_title, topic_poster, topic_time, topic_views, topic_replies, forum_id, topic_status, topic_type, topic_vote, topic_first_post_id, topic_last_post_id, topic_moved_id) VALUES (1, 'Welcome to phpBB 2', 2, '972086460', 0, 0, 1, 0, 0, 0, 1, 1, ''); + +SET IDENTITY_INSERT phpbb_topics OFF; + + +/* + -- Demo Post +*/ +SET IDENTITY_INSERT phpbb_posts ON; + +INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, post_username, poster_ip) VALUES (1, 1, 1, 2, 972086460, NULL, '7F000001'); +INSERT INTO phpbb_posts_text (post_id, post_subject, post_text) VALUES (1, NULL, 'This is an example post in your phpBB 2 installation. You may delete this post, this topic and even this forum if you like since everything seems to be working!'); + +SET IDENTITY_INSERT phpbb_posts OFF; + + +/* + -- Themes +*/ +SET IDENTITY_INSERT phpbb_themes ON; + +INSERT INTO phpbb_themes (themes_id, template_name, style_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (1, 'subSilver', 'subSilver', 'subSilver.css', '', 'E5E5E5', '000000', '006699', '5493B4', '', 'DD6900', 'EFEFEF', 'DEE3E7', 'D1D7DC', '', '', '', '98AAB1', '006699', 'FFFFFF', 'cellpic1.gif', 'cellpic3.gif', 'cellpic2.jpg', 'FAFAFA', 'FFFFFF', '', 'row1', 'row2', '', 'Verdana, Arial, Helvetica, sans-serif', 'Trebuchet MS', 'Courier, ''Courier New'', sans-serif', 10, 11, 12, '444444', '006600', 'FFA34F', '', '', ''); + +SET IDENTITY_INSERT phpbb_themes OFF; + +INSERT INTO phpbb_themes_name (themes_id, tr_color1_name, tr_color2_name, tr_color3_name, tr_class1_name, tr_class2_name, tr_class3_name, th_color1_name, th_color2_name, th_color3_name, th_class1_name, th_class2_name, th_class3_name, td_color1_name, td_color2_name, td_color3_name, td_class1_name, td_class2_name, td_class3_name, fontface1_name, fontface2_name, fontface3_name, fontsize1_name, fontsize2_name, fontsize3_name, fontcolor1_name, fontcolor2_name, fontcolor3_name, span_class1_name, span_class2_name, span_class3_name) VALUES (1, 'The lightest row colour', 'The medium row color', 'The darkest row colour', '', '', '', 'Border round the whole page', 'Outer table border', 'Inner table border', 'Silver gradient picture', 'Blue gradient picture', 'Fade-out gradient on index', 'Background for quote boxes', 'All white areas', '', 'Background for topic posts', '2nd background for topic posts', '', 'Main fonts', 'Additional topic title font', 'Form fonts', 'Smallest font size', 'Medium font size', 'Normal font size (post body etc)', 'Quote & copyright text', 'Code text colour', 'Main table header text colour', '', '', ''); + + +/* + -- Smilies +*/ +SET IDENTITY_INSERT phpbb_smilies ON; + +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 1, ':D', 'icon_biggrin.gif', 'Very Happy'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 2, ':-D', 'icon_biggrin.gif', 'Very Happy'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 3, ':grin:', 'icon_biggrin.gif', 'Very Happy'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 4, ':)', 'icon_smile.gif', 'Smile'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 5, ':-)', 'icon_smile.gif', 'Smile'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 6, ':smile:', 'icon_smile.gif', 'Smile'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 7, ':(', 'icon_sad.gif', 'Sad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 8, ':-(', 'icon_sad.gif', 'Sad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 9, ':sad:', 'icon_sad.gif', 'Sad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 10, ':o', 'icon_surprised.gif', 'Surprised'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_surprised.gif', 'Surprised'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_surprised.gif', 'Surprised'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, ':shock:', 'icon_eek.gif', 'Shocked'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, ':?', 'icon_confused.gif', 'Confused'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':-?', 'icon_confused.gif', 'Confused'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, ':???:', 'icon_confused.gif', 'Confused'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, '8)', 'icon_cool.gif', 'Cool'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, '8-)', 'icon_cool.gif', 'Cool'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, ':cool:', 'icon_cool.gif', 'Cool'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, ':lol:', 'icon_lol.gif', 'Laughing'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':x', 'icon_mad.gif', 'Mad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':-x', 'icon_mad.gif', 'Mad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':mad:', 'icon_mad.gif', 'Mad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':P', 'icon_razz.gif', 'Razz'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':-P', 'icon_razz.gif', 'Razz'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':razz:', 'icon_razz.gif', 'Razz'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':oops:', 'icon_redface.gif', 'Embarassed'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':cry:', 'icon_cry.gif', 'Crying or Very sad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':evil:', 'icon_evil.gif', 'Evil or Very Mad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':twisted:', 'icon_twisted.gif', 'Twisted Evil'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ':wink:', 'icon_wink.gif', 'Wink'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ';)', 'icon_wink.gif', 'Wink'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ';-)', 'icon_wink.gif', 'Wink'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ':!:', 'icon_exclaim.gif', 'Exclamation'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ':?:', 'icon_question.gif', 'Question'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':idea:', 'icon_idea.gif', 'Idea'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':arrow:', 'icon_arrow.gif', 'Arrow'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':|', 'icon_neutral.gif', 'Neutral'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':-|', 'icon_neutral.gif', 'Neutral'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':neutral:', 'icon_neutral.gif', 'Neutral'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 42, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green'); + +SET IDENTITY_INSERT phpbb_smilies OFF; + + +/* + -- Search Words +*/ +SET IDENTITY_INSERT phpbb_search_wordlist ON; + +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 1, 'example', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 2, 'post', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 3, 'phpbb', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 4, 'installation', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 5, 'delete', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 6, 'topic', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 7, 'forum', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 8, 'since', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 9, 'everything', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 10, 'seems', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 11, 'working', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 12, 'welcome', 0 ); + +SET IDENTITY_INSERT phpbb_search_wordlist OFF; + + +/* + -- Search Word Matches +*/ +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 1, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 2, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 3, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 4, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 5, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 6, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 7, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 8, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 9, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 10, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 11, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 12, 1, 1 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 3, 1, 1 ); + +COMMIT; \ No newline at end of file diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql new file mode 100644 index 0000000000..74018873db --- /dev/null +++ b/phpBB/install/schemas/mssql_schema.sql @@ -0,0 +1,722 @@ +/* + + mssql_schema.sql for phpBB2 (c) 2001, phpBB Group + + $Id$ + +*/ + +BEGIN TRANSACTION +GO + +CREATE TABLE [phpbb_auth_access] ( + [group_id] [int] NULL , + [forum_id] [int] NULL , + [auth_view] [smallint] NOT NULL , + [auth_read] [smallint] NOT NULL , + [auth_post] [smallint] NOT NULL , + [auth_reply] [smallint] NOT NULL , + [auth_edit] [smallint] NOT NULL , + [auth_delete] [smallint] NOT NULL , + [auth_sticky] [smallint] NOT NULL , + [auth_announce] [smallint] NOT NULL , + [auth_vote] [smallint] NOT NULL , + [auth_pollcreate] [smallint] NOT NULL , + [auth_attachments] [smallint] NOT NULL , + [auth_mod] [smallint] NOT NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_banlist] ( + [ban_id] [int] IDENTITY (1, 1) NOT NULL , + [ban_userid] [int] NULL , + [ban_ip] [char] (8) NULL , + [ban_email] [varchar] (50) NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_categories] ( + [cat_id] [int] IDENTITY (1, 1) NOT NULL , + [cat_title] [varchar] (50) NOT NULL , + [cat_order] [int] NOT NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_config] ( + [config_name] [varchar] (255) NULL , + [config_value] [varchar] (255) NULL +) ON [PRIMARY] +GO + + +CREATE TABLE [phpbb_confirm] ( + [confirm_id] [char] (32) NOT NULL , + [session_id] [char] (32) NOT NULL , + [code] [char] (6) NOT NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_disallow] ( + [disallow_id] [int] IDENTITY (1, 1) NOT NULL , + [disallow_username] [varchar] (100) NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_forum_prune] ( + [prune_id] [int] IDENTITY (1, 1) NOT NULL , + [forum_id] [int] NOT NULL , + [prune_days] [int] NOT NULL , + [prune_freq] [int] NOT NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_forums] ( + [forum_id] [int] NOT NULL , + [cat_id] [int] NOT NULL , + [forum_name] [varchar] (100) NOT NULL , + [forum_desc] [varchar] (255) NULL , + [forum_status] [smallint] NOT NULL , + [forum_order] [int] NOT NULL , + [forum_posts] [int] NOT NULL , + [forum_topics] [smallint] NOT NULL , + [forum_last_post_id] [int] NOT NULL , + [prune_next] [int] NULL , + [prune_enable] [smallint] NOT NULL , + [auth_view] [smallint] NOT NULL , + [auth_read] [smallint] NOT NULL , + [auth_post] [smallint] NOT NULL , + [auth_reply] [smallint] NOT NULL , + [auth_edit] [smallint] NOT NULL , + [auth_delete] [smallint] NOT NULL , + [auth_sticky] [smallint] NOT NULL , + [auth_announce] [smallint] NOT NULL , + [auth_vote] [smallint] NOT NULL , + [auth_pollcreate] [smallint] NOT NULL , + [auth_attachments] [smallint] NOT NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_groups] ( + [group_id] [int] IDENTITY (1, 1) NOT NULL , + [group_type] [smallint] NULL , + [group_name] [varchar] (50) NOT NULL , + [group_description] [varchar] (255) NOT NULL , + [group_moderator] [int] NULL , + [group_single_user] [smallint] NOT NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_posts] ( + [post_id] [int] IDENTITY (1, 1) NOT NULL , + [topic_id] [int] NOT NULL , + [forum_id] [int] NOT NULL , + [poster_id] [int] NOT NULL , + [post_time] [int] NOT NULL , + [poster_ip] [char] (8) NULL , + [post_username] [char] (25) NULL , + [enable_bbcode] [smallint] NULL , + [enable_html] [smallint] NULL , + [enable_smilies] [smallint] NULL , + [enable_sig] [smallint] NULL , + [post_edit_time] [int] NULL , + [post_edit_count] [smallint] NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_posts_text] ( + [post_id] [int] NOT NULL , + [bbcode_uid] [char] (10) NULL , + [post_subject] [char] (60) NULL , + [post_text] [text] NULL +) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +GO + +CREATE TABLE [phpbb_privmsgs] ( + [privmsgs_id] [int] IDENTITY (1, 1) NOT NULL , + [privmsgs_type] [smallint] NOT NULL , + [privmsgs_subject] [varchar] (100) NOT NULL , + [privmsgs_from_userid] [int] NOT NULL , + [privmsgs_to_userid] [int] NOT NULL , + [privmsgs_date] [int] NOT NULL , + [privmsgs_ip] [char] (8) NOT NULL , + [privmsgs_enable_bbcode] [smallint] NULL , + [privmsgs_enable_html] [smallint] NULL , + [privmsgs_enable_smilies] [smallint] NULL , + [privmsgs_attach_sig] [smallint] NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_privmsgs_text] ( + [privmsgs_text_id] [int] NOT NULL , + [privmsgs_bbcode_uid] [char] (10) NULL , + [privmsgs_text] [text] NULL +) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +GO + +CREATE TABLE [phpbb_ranks] ( + [rank_id] [int] IDENTITY (1, 1) NOT NULL , + [rank_title] [varchar] (50) NOT NULL , + [rank_min] [int] NULL , + [rank_special] [smallint] NULL , + [rank_image] [varchar] (50) NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_search_results] ( + [search_id] [int] NOT NULL , + [session_id] [char] (32) NOT NULL , + [search_time] [int] NOT NULL , + [search_array] [text] NOT NULL +) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +GO + +CREATE TABLE [phpbb_search_wordlist] ( + [word_id] [int] IDENTITY (1, 1) NOT NULL , + [word_text] [varchar] (50) NOT NULL , + [word_common] [tinyint] NOT NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_search_wordmatch] ( + [post_id] [int] NOT NULL , + [word_id] [int] NOT NULL , + [title_match] [smallint] NOT NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_sessions] ( + [session_id] [char] (32) NOT NULL , + [session_user_id] [int] NOT NULL , + [session_start] [int] NULL , + [session_time] [int] NULL , + [session_ip] [char] (8) NOT NULL , + [session_page] [int] NULL , + [session_logged_in] [smallint] NULL, + [session_admin] [smallint] NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_sessions_keys] ( + [key_id] [char] (32) NOT NULL , + [user_id] [int] NOT NULL , + [last_ip] [char] (8) NOT NULL , + [last_login] [int] NOT NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_smilies] ( + [smilies_id] [int] IDENTITY (1, 1) NOT NULL , + [code] [varchar] (10) NOT NULL , + [smile_url] [varchar] (50) NOT NULL , + [emoticon] [varchar] (50) NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_themes] ( + [themes_id] [int] IDENTITY (1, 1) NOT NULL , + [template_name] [varchar] (30) NOT NULL , + [style_name] [varchar] (50) NOT NULL , + [head_stylesheet] [varchar] (50) NULL , + [body_background] [varchar] (50) NULL , + [body_bgcolor] [char] (6) NULL , + [body_text] [char] (6) NULL , + [body_link] [char] (6) NULL , + [body_vlink] [char] (6) NULL , + [body_alink] [char] (6) NULL , + [body_hlink] [char] (6) NULL , + [tr_color1] [char] (6) NULL , + [tr_color2] [char] (6) NULL , + [tr_color3] [char] (6) NULL , + [tr_class1] [varchar] (25) NULL , + [tr_class2] [varchar] (25) NULL , + [tr_class3] [varchar] (25) NULL , + [th_color1] [char] (6) NULL , + [th_color2] [char] (6) NULL , + [th_color3] [char] (6) NULL , + [th_class1] [varchar] (25) NULL , + [th_class2] [varchar] (25) NULL , + [th_class3] [varchar] (25) NULL , + [td_color1] [char] (6) NULL , + [td_color2] [char] (6) NULL , + [td_color3] [char] (6) NULL , + [td_class1] [varchar] (25) NULL , + [td_class2] [varchar] (25) NULL , + [td_class3] [varchar] (25) NULL , + [fontface1] [varchar] (50) NULL , + [fontface2] [varchar] (50) NULL , + [fontface3] [varchar] (50) NULL , + [fontsize1] [smallint] NULL , + [fontsize2] [smallint] NULL , + [fontsize3] [smallint] NULL , + [fontcolor1] [char] (6) NULL , + [fontcolor2] [char] (6) NULL , + [fontcolor3] [char] (6) NULL , + [span_class1] [varchar] (25) NULL , + [span_class2] [varchar] (25) NULL , + [span_class3] [varchar] (25) NULL , + [img_size_poll] [smallint] NULL , + [img_size_privmsg] [smallint] NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_themes_name] ( + [themes_id] [int] NOT NULL , + [tr_color1_name] [varchar] (50) NULL , + [tr_color2_name] [varchar] (50) NULL , + [tr_color3_name] [varchar] (50) NULL , + [tr_class1_name] [varchar] (50) NULL , + [tr_class2_name] [varchar] (50) NULL , + [tr_class3_name] [varchar] (50) NULL , + [th_color1_name] [varchar] (50) NULL , + [th_color2_name] [varchar] (50) NULL , + [th_color3_name] [varchar] (50) NULL , + [th_class1_name] [varchar] (50) NULL , + [th_class2_name] [varchar] (50) NULL , + [th_class3_name] [varchar] (50) NULL , + [td_color1_name] [varchar] (50) NULL , + [td_color2_name] [varchar] (50) NULL , + [td_color3_name] [varchar] (50) NULL , + [td_class1_name] [varchar] (50) NULL , + [td_class2_name] [varchar] (50) NULL , + [td_class3_name] [varchar] (50) NULL , + [fontface1_name] [varchar] (50) NULL , + [fontface2_name] [varchar] (50) NULL , + [fontface3_name] [varchar] (50) NULL , + [fontsize1_name] [varchar] (50) NULL , + [fontsize2_name] [varchar] (50) NULL , + [fontsize3_name] [varchar] (50) NULL , + [fontcolor1_name] [varchar] (50) NULL , + [fontcolor2_name] [varchar] (50) NULL , + [fontcolor3_name] [varchar] (50) NULL , + [span_class1_name] [varchar] (50) NULL , + [span_class2_name] [varchar] (50) NULL , + [span_class3_name] [varchar] (50) NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_topics] ( + [topic_id] [int] IDENTITY (1, 1) NOT NULL , + [forum_id] [int] NOT NULL , + [topic_title] [varchar] (60) NOT NULL , + [topic_poster] [int] NOT NULL , + [topic_time] [int] NOT NULL , + [topic_views] [int] NOT NULL , + [topic_replies] [int] NOT NULL , + [topic_status] [smallint] NOT NULL , + [topic_type] [smallint] NOT NULL , + [topic_vote] [smallint] NOT NULL , + [topic_first_post_id] [int] NULL , + [topic_last_post_id] [int] NULL , + [topic_moved_id] [int] NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_topics_watch] ( + [topic_id] [int] NOT NULL , + [user_id] [int] NOT NULL , + [notify_status] [smallint] NOT NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_user_group] ( + [group_id] [int] NOT NULL , + [user_id] [int] NOT NULL , + [user_pending] [smallint] NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_users] ( + [user_id] [int] NOT NULL , + [user_active] [smallint] NULL , + [username] [varchar] (25) NOT NULL , + [user_password] [varchar] (32) NOT NULL , + [user_session_time] [int] NOT NULL , + [user_session_page] [smallint] NOT NULL , + [user_lastvisit] [int] NOT NULL , + [user_regdate] [int] NOT NULL , + [user_level] [smallint] NOT NULL , + [user_posts] [int] NOT NULL , + [user_timezone] [decimal] (5,2) NOT NULL , + [user_style] [int] NULL , + [user_lang] [varchar] (255) NULL , + [user_dateformat] [varchar] (14) NOT NULL , + [user_new_privmsg] [smallint] NOT NULL , + [user_unread_privmsg] [smallint] NOT NULL , + [user_last_privmsg] [int] NOT NULL , + [user_login_tries] [smallint] NOT NULL , + [user_last_login_try] [int] NOT NULL , + [user_emailtime] [int] NOT NULL , + [user_viewemail] [smallint] NULL , + [user_attachsig] [smallint] NULL , + [user_allowhtml] [smallint] NULL , + [user_allowbbcode] [smallint] NULL , + [user_allowsmile] [smallint] NULL , + [user_allowavatar] [smallint] NULL , + [user_allow_pm] [smallint] NOT NULL , + [user_allow_viewonline] [smallint] NOT NULL , + [user_notify_pm] [smallint] NOT NULL , + [user_popup_pm] [smallint] NULL , + [user_rank] [int] NULL , + [user_avatar_type] [smallint] NULL , + [user_avatar] [varchar] (100) NULL , + [user_email] [varchar] (255) NULL , + [user_icq] [varchar] (15) NULL , + [user_website] [varchar] (100) NULL , + [user_occ] [varchar] (100) NULL , + [user_from] [varchar] (100) NULL , + [user_sig] [text] NULL , + [user_sig_bbcode_uid] [char] (10) NULL , + [user_aim] [varchar] (255) NULL , + [user_yim] [varchar] (255) NULL , + [user_msnm] [varchar] (255) NULL , + [user_interests] [varchar] (255) NULL , + [user_actkey] [varchar] (32) NULL , + [user_newpasswd] [varchar] (32) NULL , + [user_notify] [smallint] NOT NULL +) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +GO + +CREATE TABLE [phpbb_vote_desc] ( + [vote_id] [int] IDENTITY (1, 1) NOT NULL , + [topic_id] [int] NOT NULL , + [vote_text] [varchar] (255) NOT NULL , + [vote_start] [int] NOT NULL , + [vote_length] [int] NOT NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_vote_results] ( + [vote_id] [int] NOT NULL , + [vote_option_id] [int] NOT NULL , + [vote_option_text] [varchar] (255) NOT NULL , + [vote_result] [int] NOT NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_vote_voters] ( + [vote_id] [int] NOT NULL , + [vote_user_id] [int] NOT NULL , + [vote_user_ip] [char] (8) NOT NULL +) ON [PRIMARY] +GO + +CREATE TABLE [phpbb_words] ( + [word_id] [int] IDENTITY (1, 1) NOT NULL , + [word] [varchar] (255) NOT NULL , + [replacement] [varchar] (255) NOT NULL +) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_banlist] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_banlist] PRIMARY KEY CLUSTERED + ( + [ban_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_categories] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_categories] PRIMARY KEY CLUSTERED + ( + [cat_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_confirm] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_confirm] PRIMARY KEY CLUSTERED + ( + [session_id],[confirm_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_disallow] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_disallow] PRIMARY KEY CLUSTERED + ( + [disallow_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_forum_prune] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_forum_prune] PRIMARY KEY CLUSTERED + ( + [prune_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_forums] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_forums] PRIMARY KEY CLUSTERED + ( + [forum_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_groups] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_groups] PRIMARY KEY CLUSTERED + ( + [group_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_posts] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_posts] PRIMARY KEY CLUSTERED + ( + [post_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_privmsgs] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_privmsgs] PRIMARY KEY CLUSTERED + ( + [privmsgs_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_privmsgs_text] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_privmsgs_text] PRIMARY KEY CLUSTERED + ( + [privmsgs_text_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_ranks] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_ranks] PRIMARY KEY CLUSTERED + ( + [rank_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_search_results] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_search_results] PRIMARY KEY CLUSTERED + ( + [search_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_search_wordlist] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_search_wordlist] PRIMARY KEY CLUSTERED + ( + [word_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_smilies] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_smilies] PRIMARY KEY CLUSTERED + ( + [smilies_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_themes] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_themes] PRIMARY KEY CLUSTERED + ( + [themes_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_themes_name] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_themes_name] PRIMARY KEY CLUSTERED + ( + [themes_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_topics] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_topics] PRIMARY KEY CLUSTERED + ( + [topic_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_users] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_users] PRIMARY KEY CLUSTERED + ( + [user_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_vote_desc] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_vote_desc] PRIMARY KEY CLUSTERED + ( + [vote_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_words] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_words] PRIMARY KEY CLUSTERED + ( + [word_id] + ) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_auth_access] WITH NOCHECK ADD + CONSTRAINT [DF_phpbb_auth_access_auth_view] DEFAULT (0) FOR [auth_view], + CONSTRAINT [DF_phpbb_auth_access_auth_read] DEFAULT (0) FOR [auth_read], + CONSTRAINT [DF_phpbb_auth_access_auth_post] DEFAULT (0) FOR [auth_post], + CONSTRAINT [DF_phpbb_auth_access_auth_reply] DEFAULT (0) FOR [auth_reply], + CONSTRAINT [DF_phpbb_auth_access_auth_edit] DEFAULT (0) FOR [auth_edit], + CONSTRAINT [DF_phpbb_auth_access_auth_delete] DEFAULT (0) FOR [auth_delete], + CONSTRAINT [DF_phpbb_auth_access_auth_sticky] DEFAULT (0) FOR [auth_sticky], + CONSTRAINT [DF_phpbb_auth_access_auth_announce] DEFAULT (0) FOR [auth_announce], + CONSTRAINT [DF_phpbb_auth_access_auth_vote] DEFAULT (0) FOR [auth_vote], + CONSTRAINT [DF_phpbb_auth_access_auth_pollcreate] DEFAULT (0) FOR [auth_pollcreate], + CONSTRAINT [DF_phpbb_auth_access_auth_attachments] DEFAULT (0) FOR [auth_attachments], + CONSTRAINT [DF_phpbb_auth_access_auth_mod] DEFAULT (0) FOR [auth_mod] +GO + +ALTER TABLE [phpbb_forums] WITH NOCHECK ADD + CONSTRAINT [DF_phpbb_forums_forum_posts] DEFAULT (0) FOR [forum_posts], + CONSTRAINT [DF_phpbb_forums_forum_topics] DEFAULT (0) FOR [forum_topics], + CONSTRAINT [DF_phpbb_forums_forum_last_post_id] DEFAULT (0) FOR [forum_last_post_id], + CONSTRAINT [DF_phpbb_forums_prune_enable] DEFAULT (0) FOR [prune_enable], + CONSTRAINT [DF_phpbb_forums_auth_view] DEFAULT (0) FOR [auth_view], + CONSTRAINT [DF_phpbb_forums_auth_read] DEFAULT (0) FOR [auth_read], + CONSTRAINT [DF_phpbb_forums_auth_post] DEFAULT (0) FOR [auth_post], + CONSTRAINT [DF_phpbb_forums_auth_reply] DEFAULT (0) FOR [auth_reply], + CONSTRAINT [DF_phpbb_forums_auth_edit] DEFAULT (0) FOR [auth_edit], + CONSTRAINT [DF_phpbb_forums_auth_delete] DEFAULT (0) FOR [auth_delete], + CONSTRAINT [DF_phpbb_forums_auth_sticky] DEFAULT (0) FOR [auth_sticky], + CONSTRAINT [DF_phpbb_forums_auth_announce] DEFAULT (0) FOR [auth_announce], + CONSTRAINT [DF_phpbb_forums_auth_vote] DEFAULT (0) FOR [auth_vote], + CONSTRAINT [DF_phpbb_forums_auth_pollcreate] DEFAULT (0) FOR [auth_pollcreate], + CONSTRAINT [DF_phpbb_forums_auth_attachments] DEFAULT (0) FOR [auth_attachments] +GO + +ALTER TABLE [phpbb_confirm] WITH NOCHECK ADD + CONSTRAINT [DF_phpbb_confirm_confirm_id] DEFAULT ('') FOR [confirm_id], + CONSTRAINT [DF_phpbb_confirm_session_id] DEFAULT ('') FOR [session_id], + CONSTRAINT [DF_phpbb_confirm_code] DEFAULT ('') FOR [code] +GO + +ALTER TABLE [phpbb_posts] WITH NOCHECK ADD + CONSTRAINT [DF_phpbb_posts_enable_bbcode] DEFAULT (1) FOR [enable_bbcode], + CONSTRAINT [DF_phpbb_posts_enable_html] DEFAULT (0) FOR [enable_html], + CONSTRAINT [DF_phpbb_posts_enable_smilies] DEFAULT (1) FOR [enable_smilies], + CONSTRAINT [DF_phpbb_posts_enable_sig] DEFAULT (1) FOR [enable_sig], + CONSTRAINT [DF_phpbb_posts_post_edit_count] DEFAULT (0) FOR [post_edit_count] +GO + +ALTER TABLE [phpbb_search_results] WITH NOCHECK ADD + CONSTRAINT [DF_phpbb_search_results_search_time] DEFAULT (0) FOR [search_time] +GO + +ALTER TABLE [phpbb_search_wordlist] WITH NOCHECK ADD + CONSTRAINT [DF_phpbb_search_wordlist_word_common] DEFAULT (0) FOR [word_common] +GO + +ALTER TABLE [phpbb_topics] WITH NOCHECK ADD + CONSTRAINT [DF_phpbb_topics_topic_views] DEFAULT (0) FOR [topic_views], + CONSTRAINT [DF_phpbb_topics_topic_replies] DEFAULT (0) FOR [topic_replies], + CONSTRAINT [DF_phpbb_topics_topic_status] DEFAULT (0) FOR [topic_status], + CONSTRAINT [DF_phpbb_topics_topic_type] DEFAULT (0) FOR [topic_type], + CONSTRAINT [DF_phpbb_topics_topic_vote] DEFAULT (0) FOR [topic_vote], + CONSTRAINT [DF_phpbb_topics_topic_moved_id] DEFAULT (0) FOR topic_moved_id +GO + +ALTER TABLE [phpbb_users] WITH NOCHECK ADD + CONSTRAINT [DF_phpbb_users_user_level] DEFAULT (0) FOR [user_level], + CONSTRAINT [DF_phpbb_users_user_posts] DEFAULT (0) FOR [user_posts], + CONSTRAINT [DF_phpbb_users_user_session_time] DEFAULT (0) FOR [user_session_time], + CONSTRAINT [DF_phpbb_users_user_session_page] DEFAULT (0) FOR [user_session_page], + CONSTRAINT [DF_phpbb_users_user_lastvisit] DEFAULT (0) FOR [user_lastvisit], + CONSTRAINT [DF_phpbb_users_user_new_privmsg] DEFAULT (0) FOR [user_new_privmsg], + CONSTRAINT [DF_phpbb_users_user_unread_privmsg] DEFAULT (0) FOR [user_unread_privmsg], + CONSTRAINT [DF_phpbb_users_user_last_privmsg] DEFAULT (0) FOR [user_last_privmsg], + CONSTRAINT [DF_phpbb_users_user_login_tries] DEFAULT (0) FOR [user_login_tries], + CONSTRAINT [DF_phpbb_users_user_last_login_try] DEFAULT (0) FOR [user_last_login_try], + CONSTRAINT [DF_phpbb_users_user_emailtime] DEFAULT (0) FOR [user_emailtime], + CONSTRAINT [DF_phpbb_users_user_viewemail] DEFAULT (1) FOR [user_viewemail], + CONSTRAINT [DF_phpbb_users_user_attachsig] DEFAULT (1) FOR [user_attachsig], + CONSTRAINT [DF_phpbb_users_user_allowhtml] DEFAULT (0) FOR [user_allowhtml], + CONSTRAINT [DF_phpbb_users_user_allowbbcode] DEFAULT (1) FOR [user_allowbbcode], + CONSTRAINT [DF_phpbb_users_user_allowsmile] DEFAULT (1) FOR [user_allowsmile], + CONSTRAINT [DF_phpbb_users_user_allowavatar] DEFAULT (1) FOR [user_allowavatar], + CONSTRAINT [DF_phpbb_users_user_allow_pm] DEFAULT (1) FOR [user_allow_pm], + CONSTRAINT [DF_phpbb_users_user_allow_viewonline] DEFAULT (1) FOR [user_allow_viewonline], + CONSTRAINT [DF_phpbb_users_user_notify_pm] DEFAULT (0) FOR [user_notify_pm], + CONSTRAINT [DF_phpbb_users_user_popup_pm] DEFAULT (1) FOR [user_popup_pm], + CONSTRAINT [DF_phpbb_users_user_dateformat] DEFAULT('d M Y H:i') FOR [user_dateformat], + CONSTRAINT [DF_phpbb_users_user_avatar_type] DEFAULT (0) FOR [user_avatar_type] +GO + + CREATE INDEX [IX_phpbb_auth_access] ON [phpbb_auth_access]([group_id], [forum_id]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_banlist] ON [phpbb_banlist]([ban_userid], [ban_ip]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_categories] ON [phpbb_categories]([cat_order]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_forum_prune] ON [phpbb_forum_prune]([forum_id]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_forums] ON [phpbb_forums]([cat_id], [forum_order], [forum_last_post_id]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_groups] ON [phpbb_groups]([group_single_user]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_posts] ON [phpbb_posts]([topic_id], [forum_id], [poster_id]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_posts_text] ON [phpbb_posts_text]([post_id]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_privmsgs] ON [phpbb_privmsgs]([privmsgs_from_userid], [privmsgs_to_userid]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_ranks] ON [phpbb_ranks]([rank_min], [rank_special]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_search_results] ON [phpbb_search_results]([session_id]) ON [PRIMARY] +GO + + CREATE UNIQUE INDEX [IX_phpbb_search_wordlist] ON [phpbb_search_wordlist]([word_text]) WITH IGNORE_DUP_KEY ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_search_wordlist_1] ON [phpbb_search_wordlist]([word_common]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_search_wordmatch] ON [phpbb_search_wordmatch]([post_id]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_search_wordmatch_1] ON [phpbb_search_wordmatch]([word_id]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_sessions] ON [phpbb_sessions]([session_id], [session_user_id], [session_ip], [session_logged_in]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_sessions_keys] ON [phpbb_sessions_keys]([key_id], [user_id]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_sessions_keys_1] ON [phpbb_sessions_keys]([last_login]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_topics] ON [phpbb_topics]([forum_id], [topic_type], [topic_first_post_id], [topic_last_post_id]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_topics_watch] ON [phpbb_topics_watch]([topic_id], [user_id]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_users] ON [phpbb_users]([user_session_time]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_user_group] ON [phpbb_user_group]([group_id], [user_id]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_vote_desc] ON [phpbb_vote_desc]([topic_id]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_vote_results] ON [phpbb_vote_results]([vote_id]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_vote_results_1] ON [phpbb_vote_results]([vote_option_id]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_vote_voters] ON [phpbb_vote_voters]([vote_id]) ON [PRIMARY] +GO + + CREATE INDEX [IX_phpbb_vote_voters_1] ON [phpbb_vote_voters]([vote_user_id]) ON [PRIMARY] +GO + +COMMIT +GO \ No newline at end of file diff --git a/phpBB/install/schemas/mysql_basic.sql b/phpBB/install/schemas/mysql_basic.sql new file mode 100644 index 0000000000..61449199c9 --- /dev/null +++ b/phpBB/install/schemas/mysql_basic.sql @@ -0,0 +1,192 @@ +# +# Basic DB data for phpBB2 devel +# +# $Id$ + +# -- Config +INSERT INTO phpbb_config (config_name, config_value) VALUES ('config_id','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename','yourdomain.com'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_desc','A _little_ text to describe your forum'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name','phpbb2mysql'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path','/'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_domain',''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_secure','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_length','3600'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_html','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_html_tags','b,i,u,pre'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_bbcode','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_smilies','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_namechange','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_theme_create','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_local','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_confirm', '1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_autologin','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_autologin_time','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page','15'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page','50'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold','25'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_poll_options','10'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_chars','255'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_inbox_privmsgs','50'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sentbox_privmsgs','25'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_savebox_privmsgs','50'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig','Thanks, The Management'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email','youraddress@yourdomain.com'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host',''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_username',''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_password',''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('sendmail_fix','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('require_activation','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval','15'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_flood_interval','15'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_min_chars','3'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_login_attempts', '5'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('login_reset_time', '30'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_form','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_filesize','6144'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_width','80'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_height','80'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_path','images/avatars'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat','D M d, Y g:i a'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('prune_enable','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('privmsg_disable','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', ''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', ''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_users', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_date', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', 'www.myserver.tld'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.23'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('rand_seed', '0'); + + +# -- Categories +INSERT INTO phpbb_categories (cat_id, cat_title, cat_order) VALUES (1, 'Test category 1', 10); + + +# -- Forums +INSERT INTO phpbb_forums (forum_id, forum_name, forum_desc, cat_id, forum_order, forum_posts, forum_topics, forum_last_post_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_announce, auth_sticky, auth_pollcreate, auth_vote, auth_attachments) VALUES (1, 'Test Forum 1', 'This is just a test forum.', 1, 10, 1, 1, 1, 0, 0, 1, 1, 1, 1, 3, 3, 1, 1, 3); + + +# -- Users +INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( -1, 'Anonymous', 0, 0, '', '', '', '', '', '', '', '', 0, NULL, '', '', '', 0, 0, 1, 1, 1, 0, 1, 1, NULL, '', '', 0, '', '', '', 0, 0); + +# -- username: admin password: admin (change this or remove it once everything is working!) +INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_popup_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( 2, 'Admin', 1, 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', '', '', '', '', '', '', 1, 1, '', '', '', 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, '', 'english', 0, 'd M Y h:i a', '', '', 0, 1); + + +# -- Ranks +INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( 1, 'Site Admin', -1, 1, NULL); + + +# -- Groups +INSERT INTO phpbb_groups (group_id, group_name, group_description, group_single_user) VALUES (1, 'Anonymous', 'Personal User', 1); +INSERT INTO phpbb_groups (group_id, group_name, group_description, group_single_user) VALUES (2, 'Admin', 'Personal User', 1); + + +# -- User -> Group +INSERT INTO phpbb_user_group (group_id, user_id, user_pending) VALUES (1, -1, 0); +INSERT INTO phpbb_user_group (group_id, user_id, user_pending) VALUES (2, 2, 0); + + +# -- Demo Topic +INSERT INTO phpbb_topics (topic_id, topic_title, topic_poster, topic_time, topic_views, topic_replies, forum_id, topic_status, topic_type, topic_vote, topic_first_post_id, topic_last_post_id) VALUES (1, 'Welcome to phpBB 2', 2, '972086460', 0, 0, 1, 0, 0, 0, 1, 1); + + +# -- Demo Post +INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, post_username, poster_ip) VALUES (1, 1, 1, 2, 972086460, NULL, '7F000001'); +INSERT INTO phpbb_posts_text (post_id, post_subject, post_text) VALUES (1, NULL, 'This is an example post in your phpBB 2 installation. You may delete this post, this topic and even this forum if you like since everything seems to be working!'); + + +# -- Themes +INSERT INTO phpbb_themes (themes_id, template_name, style_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (1, 'subSilver', 'subSilver', 'subSilver.css', '', 'E5E5E5', '000000', '006699', '5493B4', '', 'DD6900', 'EFEFEF', 'DEE3E7', 'D1D7DC', '', '', '', '98AAB1', '006699', 'FFFFFF', 'cellpic1.gif', 'cellpic3.gif', 'cellpic2.jpg', 'FAFAFA', 'FFFFFF', '', 'row1', 'row2', '', 'Verdana, Arial, Helvetica, sans-serif', 'Trebuchet MS', 'Courier, ''Courier New'', sans-serif', 10, 11, 12, '444444', '006600', 'FFA34F', '', '', ''); + +INSERT INTO phpbb_themes_name (themes_id, tr_color1_name, tr_color2_name, tr_color3_name, tr_class1_name, tr_class2_name, tr_class3_name, th_color1_name, th_color2_name, th_color3_name, th_class1_name, th_class2_name, th_class3_name, td_color1_name, td_color2_name, td_color3_name, td_class1_name, td_class2_name, td_class3_name, fontface1_name, fontface2_name, fontface3_name, fontsize1_name, fontsize2_name, fontsize3_name, fontcolor1_name, fontcolor2_name, fontcolor3_name, span_class1_name, span_class2_name, span_class3_name) VALUES (1, 'The lightest row colour', 'The medium row color', 'The darkest row colour', '', '', '', 'Border round the whole page', 'Outer table border', 'Inner table border', 'Silver gradient picture', 'Blue gradient picture', 'Fade-out gradient on index', 'Background for quote boxes', 'All white areas', '', 'Background for topic posts', '2nd background for topic posts', '', 'Main fonts', 'Additional topic title font', 'Form fonts', 'Smallest font size', 'Medium font size', 'Normal font size (post body etc)', 'Quote & copyright text', 'Code text colour', 'Main table header text colour', '', '', ''); + + +# -- Smilies +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 1, ':D', 'icon_biggrin.gif', 'Very Happy'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 2, ':-D', 'icon_biggrin.gif', 'Very Happy'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 3, ':grin:', 'icon_biggrin.gif', 'Very Happy'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 4, ':)', 'icon_smile.gif', 'Smile'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 5, ':-)', 'icon_smile.gif', 'Smile'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 6, ':smile:', 'icon_smile.gif', 'Smile'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 7, ':(', 'icon_sad.gif', 'Sad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 8, ':-(', 'icon_sad.gif', 'Sad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 9, ':sad:', 'icon_sad.gif', 'Sad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 10, ':o', 'icon_surprised.gif', 'Surprised'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_surprised.gif', 'Surprised'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_surprised.gif', 'Surprised'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, ':shock:', 'icon_eek.gif', 'Shocked'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, ':?', 'icon_confused.gif', 'Confused'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':-?', 'icon_confused.gif', 'Confused'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, ':???:', 'icon_confused.gif', 'Confused'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, '8)', 'icon_cool.gif', 'Cool'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, '8-)', 'icon_cool.gif', 'Cool'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, ':cool:', 'icon_cool.gif', 'Cool'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, ':lol:', 'icon_lol.gif', 'Laughing'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':x', 'icon_mad.gif', 'Mad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':-x', 'icon_mad.gif', 'Mad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':mad:', 'icon_mad.gif', 'Mad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':P', 'icon_razz.gif', 'Razz'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':-P', 'icon_razz.gif', 'Razz'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':razz:', 'icon_razz.gif', 'Razz'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':oops:', 'icon_redface.gif', 'Embarassed'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':cry:', 'icon_cry.gif', 'Crying or Very sad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':evil:', 'icon_evil.gif', 'Evil or Very Mad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':twisted:', 'icon_twisted.gif', 'Twisted Evil'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ':wink:', 'icon_wink.gif', 'Wink'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ';)', 'icon_wink.gif', 'Wink'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ';-)', 'icon_wink.gif', 'Wink'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ':!:', 'icon_exclaim.gif', 'Exclamation'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ':?:', 'icon_question.gif', 'Question'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':idea:', 'icon_idea.gif', 'Idea'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':arrow:', 'icon_arrow.gif', 'Arrow'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':|', 'icon_neutral.gif', 'Neutral'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':-|', 'icon_neutral.gif', 'Neutral'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':neutral:', 'icon_neutral.gif', 'Neutral'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 42, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green'); + + +# -- wordlist +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 1, 'example', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 2, 'post', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 3, 'phpbb', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 4, 'installation', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 5, 'delete', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 6, 'topic', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 7, 'forum', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 8, 'since', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 9, 'everything', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 10, 'seems', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 11, 'working', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 12, 'welcome', 0 ); + + +# -- wordmatch +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 1, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 2, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 3, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 4, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 5, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 6, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 7, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 8, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 9, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 10, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 11, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 12, 1, 1 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 3, 1, 1 ); diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql new file mode 100644 index 0000000000..3a31b1b291 --- /dev/null +++ b/phpBB/install/schemas/mysql_schema.sql @@ -0,0 +1,583 @@ +# +# phpBB2 - MySQL schema +# +# $Id$ +# + +# +# Table structure for table 'phpbb_auth_access' +# +CREATE TABLE phpbb_auth_access ( + group_id mediumint(8) DEFAULT '0' NOT NULL, + forum_id smallint(5) UNSIGNED DEFAULT '0' NOT NULL, + auth_view tinyint(1) DEFAULT '0' NOT NULL, + auth_read tinyint(1) DEFAULT '0' NOT NULL, + auth_post tinyint(1) DEFAULT '0' NOT NULL, + auth_reply tinyint(1) DEFAULT '0' NOT NULL, + auth_edit tinyint(1) DEFAULT '0' NOT NULL, + auth_delete tinyint(1) DEFAULT '0' NOT NULL, + auth_sticky tinyint(1) DEFAULT '0' NOT NULL, + auth_announce tinyint(1) DEFAULT '0' NOT NULL, + auth_vote tinyint(1) DEFAULT '0' NOT NULL, + auth_pollcreate tinyint(1) DEFAULT '0' NOT NULL, + auth_attachments tinyint(1) DEFAULT '0' NOT NULL, + auth_mod tinyint(1) DEFAULT '0' NOT NULL, + KEY group_id (group_id), + KEY forum_id (forum_id) +); + + +# +# Table structure for table 'phpbb_user_group' +# +CREATE TABLE phpbb_user_group ( + group_id mediumint(8) DEFAULT '0' NOT NULL, + user_id mediumint(8) DEFAULT '0' NOT NULL, + user_pending tinyint(1), + KEY group_id (group_id), + KEY user_id (user_id) +); + +# +# Table structure for table 'phpbb_groups' +# +CREATE TABLE phpbb_groups ( + group_id mediumint(8) NOT NULL auto_increment, + group_type tinyint(4) DEFAULT '1' NOT NULL, + group_name varchar(40) NOT NULL, + group_description varchar(255) NOT NULL, + group_moderator mediumint(8) DEFAULT '0' NOT NULL, + group_single_user tinyint(1) DEFAULT '1' NOT NULL, + PRIMARY KEY (group_id), + KEY group_single_user (group_single_user) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_banlist' +# +CREATE TABLE phpbb_banlist ( + ban_id mediumint(8) UNSIGNED NOT NULL auto_increment, + ban_userid mediumint(8) NOT NULL, + ban_ip char(8) NOT NULL, + ban_email varchar(255), + PRIMARY KEY (ban_id), + KEY ban_ip_user_id (ban_ip, ban_userid) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_categories' +# +CREATE TABLE phpbb_categories ( + cat_id mediumint(8) UNSIGNED NOT NULL auto_increment, + cat_title varchar(100), + cat_order mediumint(8) UNSIGNED NOT NULL, + PRIMARY KEY (cat_id), + KEY cat_order (cat_order) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_config' +# +CREATE TABLE phpbb_config ( + config_name varchar(255) NOT NULL, + config_value varchar(255) NOT NULL, + PRIMARY KEY (config_name) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_confirm' +# +CREATE TABLE phpbb_confirm ( + confirm_id char(32) DEFAULT '' NOT NULL, + session_id char(32) DEFAULT '' NOT NULL, + code char(6) DEFAULT '' NOT NULL, + PRIMARY KEY (session_id,confirm_id) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_disallow' +# +CREATE TABLE phpbb_disallow ( + disallow_id mediumint(8) UNSIGNED NOT NULL auto_increment, + disallow_username varchar(25) DEFAULT '' NOT NULL, + PRIMARY KEY (disallow_id) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_forum_prune' +# +CREATE TABLE phpbb_forum_prune ( + prune_id mediumint(8) UNSIGNED NOT NULL auto_increment, + forum_id smallint(5) UNSIGNED NOT NULL, + prune_days smallint(5) UNSIGNED NOT NULL, + prune_freq smallint(5) UNSIGNED NOT NULL, + PRIMARY KEY(prune_id), + KEY forum_id (forum_id) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_forums' +# +CREATE TABLE phpbb_forums ( + forum_id smallint(5) UNSIGNED NOT NULL, + cat_id mediumint(8) UNSIGNED NOT NULL, + forum_name varchar(150), + forum_desc text, + forum_status tinyint(4) DEFAULT '0' NOT NULL, + forum_order mediumint(8) UNSIGNED DEFAULT '1' NOT NULL, + forum_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + forum_topics mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + forum_last_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + prune_next int(11), + prune_enable tinyint(1) DEFAULT '0' NOT NULL, + auth_view tinyint(2) DEFAULT '0' NOT NULL, + auth_read tinyint(2) DEFAULT '0' NOT NULL, + auth_post tinyint(2) DEFAULT '0' NOT NULL, + auth_reply tinyint(2) DEFAULT '0' NOT NULL, + auth_edit tinyint(2) DEFAULT '0' NOT NULL, + auth_delete tinyint(2) DEFAULT '0' NOT NULL, + auth_sticky tinyint(2) DEFAULT '0' NOT NULL, + auth_announce tinyint(2) DEFAULT '0' NOT NULL, + auth_vote tinyint(2) DEFAULT '0' NOT NULL, + auth_pollcreate tinyint(2) DEFAULT '0' NOT NULL, + auth_attachments tinyint(2) DEFAULT '0' NOT NULL, + PRIMARY KEY (forum_id), + KEY forums_order (forum_order), + KEY cat_id (cat_id), + KEY forum_last_post_id (forum_last_post_id) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_posts' +# +CREATE TABLE phpbb_posts ( + post_id mediumint(8) UNSIGNED NOT NULL auto_increment, + topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + forum_id smallint(5) UNSIGNED DEFAULT '0' NOT NULL, + poster_id mediumint(8) DEFAULT '0' NOT NULL, + post_time int(11) DEFAULT '0' NOT NULL, + poster_ip char(8) NOT NULL, + post_username varchar(25), + enable_bbcode tinyint(1) DEFAULT '1' NOT NULL, + enable_html tinyint(1) DEFAULT '0' NOT NULL, + enable_smilies tinyint(1) DEFAULT '1' NOT NULL, + enable_sig tinyint(1) DEFAULT '1' NOT NULL, + post_edit_time int(11), + post_edit_count smallint(5) UNSIGNED DEFAULT '0' NOT NULL, + PRIMARY KEY (post_id), + KEY forum_id (forum_id), + KEY topic_id (topic_id), + KEY poster_id (poster_id), + KEY post_time (post_time) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_posts_text' +# +CREATE TABLE phpbb_posts_text ( + post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + bbcode_uid char(10) DEFAULT '' NOT NULL, + post_subject char(60), + post_text text, + PRIMARY KEY (post_id) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_privmsgs' +# +CREATE TABLE phpbb_privmsgs ( + privmsgs_id mediumint(8) UNSIGNED NOT NULL auto_increment, + privmsgs_type tinyint(4) DEFAULT '0' NOT NULL, + privmsgs_subject varchar(255) DEFAULT '0' NOT NULL, + privmsgs_from_userid mediumint(8) DEFAULT '0' NOT NULL, + privmsgs_to_userid mediumint(8) DEFAULT '0' NOT NULL, + privmsgs_date int(11) DEFAULT '0' NOT NULL, + privmsgs_ip char(8) NOT NULL, + privmsgs_enable_bbcode tinyint(1) DEFAULT '1' NOT NULL, + privmsgs_enable_html tinyint(1) DEFAULT '0' NOT NULL, + privmsgs_enable_smilies tinyint(1) DEFAULT '1' NOT NULL, + privmsgs_attach_sig tinyint(1) DEFAULT '1' NOT NULL, + PRIMARY KEY (privmsgs_id), + KEY privmsgs_from_userid (privmsgs_from_userid), + KEY privmsgs_to_userid (privmsgs_to_userid) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_privmsgs_text' +# +CREATE TABLE phpbb_privmsgs_text ( + privmsgs_text_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + privmsgs_bbcode_uid char(10) DEFAULT '0' NOT NULL, + privmsgs_text text, + PRIMARY KEY (privmsgs_text_id) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_ranks' +# +CREATE TABLE phpbb_ranks ( + rank_id smallint(5) UNSIGNED NOT NULL auto_increment, + rank_title varchar(50) NOT NULL, + rank_min mediumint(8) DEFAULT '0' NOT NULL, + rank_special tinyint(1) DEFAULT '0', + rank_image varchar(255), + PRIMARY KEY (rank_id) +); + + +# -------------------------------------------------------- +# +# Table structure for table `phpbb_search_results` +# +CREATE TABLE phpbb_search_results ( + search_id int(11) UNSIGNED NOT NULL default '0', + session_id char(32) NOT NULL default '', + search_time int(11) DEFAULT '0' NOT NULL, + search_array mediumtext NOT NULL, + PRIMARY KEY (search_id), + KEY session_id (session_id) +); + + +# -------------------------------------------------------- +# +# Table structure for table `phpbb_search_wordlist` +# +CREATE TABLE phpbb_search_wordlist ( + word_text varchar(50) binary NOT NULL default '', + word_id mediumint(8) UNSIGNED NOT NULL auto_increment, + word_common tinyint(1) unsigned NOT NULL default '0', + PRIMARY KEY (word_text), + KEY word_id (word_id) +); + +# -------------------------------------------------------- +# +# Table structure for table `phpbb_search_wordmatch` +# +CREATE TABLE phpbb_search_wordmatch ( + post_id mediumint(8) UNSIGNED NOT NULL default '0', + word_id mediumint(8) UNSIGNED NOT NULL default '0', + title_match tinyint(1) NOT NULL default '0', + KEY post_id (post_id), + KEY word_id (word_id) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_sessions' +# +# Note that if you're running 3.23.x you may want to make +# this table a type HEAP. This type of table is stored +# within system memory and therefore for big busy boards +# is likely to be noticeably faster than continually +# writing to disk ... +# +CREATE TABLE phpbb_sessions ( + session_id char(32) DEFAULT '' NOT NULL, + session_user_id mediumint(8) DEFAULT '0' NOT NULL, + session_start int(11) DEFAULT '0' NOT NULL, + session_time int(11) DEFAULT '0' NOT NULL, + session_ip char(8) DEFAULT '0' NOT NULL, + session_page int(11) DEFAULT '0' NOT NULL, + session_logged_in tinyint(1) DEFAULT '0' NOT NULL, + session_admin tinyint(2) DEFAULT '0' NOT NULL, + PRIMARY KEY (session_id), + KEY session_user_id (session_user_id), + KEY session_id_ip_user_id (session_id, session_ip, session_user_id) +); + +# -------------------------------------------------------- +# +# Table structure for table `phpbb_sessions_keys` +# +CREATE TABLE phpbb_sessions_keys ( + key_id varchar(32) DEFAULT '0' NOT NULL, + user_id mediumint(8) DEFAULT '0' NOT NULL, + last_ip varchar(8) DEFAULT '0' NOT NULL, + last_login int(11) DEFAULT '0' NOT NULL, + PRIMARY KEY (key_id, user_id), + KEY last_login (last_login) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_smilies' +# +CREATE TABLE phpbb_smilies ( + smilies_id smallint(5) UNSIGNED NOT NULL auto_increment, + code varchar(50), + smile_url varchar(100), + emoticon varchar(75), + PRIMARY KEY (smilies_id) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_themes' +# +CREATE TABLE phpbb_themes ( + themes_id mediumint(8) UNSIGNED NOT NULL auto_increment, + template_name varchar(30) NOT NULL default '', + style_name varchar(30) NOT NULL default '', + head_stylesheet varchar(100) default NULL, + body_background varchar(100) default NULL, + body_bgcolor varchar(6) default NULL, + body_text varchar(6) default NULL, + body_link varchar(6) default NULL, + body_vlink varchar(6) default NULL, + body_alink varchar(6) default NULL, + body_hlink varchar(6) default NULL, + tr_color1 varchar(6) default NULL, + tr_color2 varchar(6) default NULL, + tr_color3 varchar(6) default NULL, + tr_class1 varchar(25) default NULL, + tr_class2 varchar(25) default NULL, + tr_class3 varchar(25) default NULL, + th_color1 varchar(6) default NULL, + th_color2 varchar(6) default NULL, + th_color3 varchar(6) default NULL, + th_class1 varchar(25) default NULL, + th_class2 varchar(25) default NULL, + th_class3 varchar(25) default NULL, + td_color1 varchar(6) default NULL, + td_color2 varchar(6) default NULL, + td_color3 varchar(6) default NULL, + td_class1 varchar(25) default NULL, + td_class2 varchar(25) default NULL, + td_class3 varchar(25) default NULL, + fontface1 varchar(50) default NULL, + fontface2 varchar(50) default NULL, + fontface3 varchar(50) default NULL, + fontsize1 tinyint(4) default NULL, + fontsize2 tinyint(4) default NULL, + fontsize3 tinyint(4) default NULL, + fontcolor1 varchar(6) default NULL, + fontcolor2 varchar(6) default NULL, + fontcolor3 varchar(6) default NULL, + span_class1 varchar(25) default NULL, + span_class2 varchar(25) default NULL, + span_class3 varchar(25) default NULL, + img_size_poll smallint(5) UNSIGNED, + img_size_privmsg smallint(5) UNSIGNED, + PRIMARY KEY (themes_id) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_themes_name' +# +CREATE TABLE phpbb_themes_name ( + themes_id smallint(5) UNSIGNED DEFAULT '0' NOT NULL, + tr_color1_name char(50), + tr_color2_name char(50), + tr_color3_name char(50), + tr_class1_name char(50), + tr_class2_name char(50), + tr_class3_name char(50), + th_color1_name char(50), + th_color2_name char(50), + th_color3_name char(50), + th_class1_name char(50), + th_class2_name char(50), + th_class3_name char(50), + td_color1_name char(50), + td_color2_name char(50), + td_color3_name char(50), + td_class1_name char(50), + td_class2_name char(50), + td_class3_name char(50), + fontface1_name char(50), + fontface2_name char(50), + fontface3_name char(50), + fontsize1_name char(50), + fontsize2_name char(50), + fontsize3_name char(50), + fontcolor1_name char(50), + fontcolor2_name char(50), + fontcolor3_name char(50), + span_class1_name char(50), + span_class2_name char(50), + span_class3_name char(50), + PRIMARY KEY (themes_id) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_topics' +# +CREATE TABLE phpbb_topics ( + topic_id mediumint(8) UNSIGNED NOT NULL auto_increment, + forum_id smallint(8) UNSIGNED DEFAULT '0' NOT NULL, + topic_title char(60) NOT NULL, + topic_poster mediumint(8) DEFAULT '0' NOT NULL, + topic_time int(11) DEFAULT '0' NOT NULL, + topic_views mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + topic_replies mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + topic_status tinyint(3) DEFAULT '0' NOT NULL, + topic_vote tinyint(1) DEFAULT '0' NOT NULL, + topic_type tinyint(3) DEFAULT '0' NOT NULL, + topic_first_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + topic_last_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + topic_moved_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + PRIMARY KEY (topic_id), + KEY forum_id (forum_id), + KEY topic_moved_id (topic_moved_id), + KEY topic_status (topic_status), + KEY topic_type (topic_type) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_topics_watch' +# +CREATE TABLE phpbb_topics_watch ( + topic_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0', + user_id mediumint(8) NOT NULL DEFAULT '0', + notify_status tinyint(1) NOT NULL default '0', + KEY topic_id (topic_id), + KEY user_id (user_id), + KEY notify_status (notify_status) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_users' +# +CREATE TABLE phpbb_users ( + user_id mediumint(8) NOT NULL, + user_active tinyint(1) DEFAULT '1', + username varchar(25) NOT NULL, + user_password varchar(32) NOT NULL, + user_session_time int(11) DEFAULT '0' NOT NULL, + user_session_page smallint(5) DEFAULT '0' NOT NULL, + user_lastvisit int(11) DEFAULT '0' NOT NULL, + user_regdate int(11) DEFAULT '0' NOT NULL, + user_level tinyint(4) DEFAULT '0', + user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + user_timezone decimal(5,2) DEFAULT '0' NOT NULL, + user_style tinyint(4), + user_lang varchar(255), + user_dateformat varchar(14) DEFAULT 'd M Y H:i' NOT NULL, + user_new_privmsg smallint(5) UNSIGNED DEFAULT '0' NOT NULL, + user_unread_privmsg smallint(5) UNSIGNED DEFAULT '0' NOT NULL, + user_last_privmsg int(11) DEFAULT '0' NOT NULL, + user_login_tries smallint(5) UNSIGNED DEFAULT '0' NOT NULL, + user_last_login_try int(11) DEFAULT '0' NOT NULL, + user_emailtime int(11), + user_viewemail tinyint(1), + user_attachsig tinyint(1), + user_allowhtml tinyint(1) DEFAULT '1', + user_allowbbcode tinyint(1) DEFAULT '1', + user_allowsmile tinyint(1) DEFAULT '1', + user_allowavatar tinyint(1) DEFAULT '1' NOT NULL, + user_allow_pm tinyint(1) DEFAULT '1' NOT NULL, + user_allow_viewonline tinyint(1) DEFAULT '1' NOT NULL, + user_notify tinyint(1) DEFAULT '1' NOT NULL, + user_notify_pm tinyint(1) DEFAULT '0' NOT NULL, + user_popup_pm tinyint(1) DEFAULT '0' NOT NULL, + user_rank int(11) DEFAULT '0', + user_avatar varchar(100), + user_avatar_type tinyint(4) DEFAULT '0' NOT NULL, + user_email varchar(255), + user_icq varchar(15), + user_website varchar(100), + user_from varchar(100), + user_sig text, + user_sig_bbcode_uid char(10), + user_aim varchar(255), + user_yim varchar(255), + user_msnm varchar(255), + user_occ varchar(100), + user_interests varchar(255), + user_actkey varchar(32), + user_newpasswd varchar(32), + PRIMARY KEY (user_id), + KEY user_session_time (user_session_time) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_vote_desc' +# +CREATE TABLE phpbb_vote_desc ( + vote_id mediumint(8) UNSIGNED NOT NULL auto_increment, + topic_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0', + vote_text text NOT NULL, + vote_start int(11) NOT NULL DEFAULT '0', + vote_length int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (vote_id), + KEY topic_id (topic_id) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_vote_results' +# +CREATE TABLE phpbb_vote_results ( + vote_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0', + vote_option_id tinyint(4) UNSIGNED NOT NULL DEFAULT '0', + vote_option_text varchar(255) NOT NULL, + vote_result int(11) NOT NULL DEFAULT '0', + KEY vote_option_id (vote_option_id), + KEY vote_id (vote_id) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_vote_voters' +# +CREATE TABLE phpbb_vote_voters ( + vote_id mediumint(8) UNSIGNED NOT NULL DEFAULT '0', + vote_user_id mediumint(8) NOT NULL DEFAULT '0', + vote_user_ip char(8) NOT NULL, + KEY vote_id (vote_id), + KEY vote_user_id (vote_user_id), + KEY vote_user_ip (vote_user_ip) +); + + +# -------------------------------------------------------- +# +# Table structure for table 'phpbb_words' +# +CREATE TABLE phpbb_words ( + word_id mediumint(8) UNSIGNED NOT NULL auto_increment, + word char(100) NOT NULL, + replacement char(100) NOT NULL, + PRIMARY KEY (word_id) +); diff --git a/phpBB/install/schemas/postgres_basic.sql b/phpBB/install/schemas/postgres_basic.sql new file mode 100644 index 0000000000..ecc0a74841 --- /dev/null +++ b/phpBB/install/schemas/postgres_basic.sql @@ -0,0 +1,191 @@ +/* +* Basic DB data for phpBB2 devel +* +* $Id$ +*/ + +-- Config +INSERT INTO phpbb_config (config_name, config_value) VALUES ('config_id','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename','yourdomain.com'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_desc','A _little_ text to describe your forum'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name','phpbb2mysql'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path','/'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_domain',''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_secure','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_length','3600'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_html','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_html_tags','b,i,u,pre'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_bbcode','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_smilies','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_namechange','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_theme_create','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_local','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_confirm', '1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_autologin','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_autologin_time','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page','15'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page','50'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold','25'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_poll_options','10'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_chars','255'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_inbox_privmsgs','50'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sentbox_privmsgs','25'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_savebox_privmsgs','50'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig','Thanks, The Management'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email','youraddress@yourdomain.com'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host',''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_username',''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_password',''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('sendmail_fix','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('require_activation','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval','15'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_flood_interval','15'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_min_chars','3'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_login_attempts', '5'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('login_reset_time', '30'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_form','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_filesize','6144'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_width','80'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_height','80'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_path','images/avatars'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path','images/avatars/gallery'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path','images/smiles'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat','D M d, Y g:i a'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('prune_enable','1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('privmsg_disable','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress','0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', ''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', ''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_users', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_date', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', 'www.yourdomain.tld'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.0.23'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('rand_seed', '0'); + +-- Categories +INSERT INTO phpbb_categories (cat_id, cat_title, cat_order) VALUES (1, 'Test category 1', 10); + + +-- Forums +INSERT INTO phpbb_forums (forum_id, forum_name, forum_desc, cat_id, forum_order, forum_posts, forum_topics, forum_last_post_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_announce, auth_sticky, auth_pollcreate, auth_vote, auth_attachments) VALUES (1, 'Test Forum 1', 'This is just a test forum.', 1, 10, 1, 1, 1, 0, 0, 1, 1, 1, 1, 3, 3, 1, 1, 3); + +-- Users +INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( -1, 'Anonymous', 0, 0, '', '', '', '', '', '', '', '', 0, NULL, '', '', '', 0, 0, 1, 1, 1, 0, 1, 1, NULL, '', '', 0, '', '', '', 0, 0); + +-- username: admin password: admin (change this or remove it once everything is working!) +INSERT INTO phpbb_users (user_id, username, user_level, user_regdate, user_password, user_email, user_icq, user_website, user_occ, user_from, user_interests, user_sig, user_viewemail, user_style, user_aim, user_yim, user_msnm, user_posts, user_attachsig, user_allowsmile, user_allowhtml, user_allowbbcode, user_allow_pm, user_notify_pm, user_popup_pm, user_allow_viewonline, user_rank, user_avatar, user_lang, user_timezone, user_dateformat, user_actkey, user_newpasswd, user_notify, user_active) VALUES ( 2, 'Admin', 1, 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', '', '', '', '', '', '', 1, 1, '', '', '', 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, '', 'english', 0, 'd M Y h:i a', '', '', 0, 1); + + +-- Ranks +INSERT INTO phpbb_ranks (rank_id, rank_title, rank_min, rank_special, rank_image) VALUES ( 1, 'Site Admin', -1, 1, NULL); + + +-- Groups +INSERT INTO phpbb_groups (group_id, group_name, group_description, group_single_user) VALUES (1, 'Anonymous', 'Personal User', 1); +INSERT INTO phpbb_groups (group_id, group_name, group_description, group_single_user) VALUES (2, 'Admin', 'Personal User', 1); + + +-- User -> Group +INSERT INTO phpbb_user_group (group_id, user_id, user_pending) VALUES (1, -1, 0); +INSERT INTO phpbb_user_group (group_id, user_id, user_pending) VALUES (2, 2, 0); + + +-- Demo Topic +INSERT INTO phpbb_topics (topic_id, topic_title, topic_poster, topic_time, topic_views, topic_replies, forum_id, topic_status, topic_type, topic_vote, topic_first_post_id, topic_last_post_id) VALUES (1, 'Welcome to phpBB 2', 2, '972086460', 0, 0, 1, 0, 0, 0, 1, 1); + + +-- Demo Post +INSERT INTO phpbb_posts (post_id, topic_id, forum_id, poster_id, post_time, post_username, poster_ip) VALUES (1, 1, 1, 2, 972086460, NULL, '7F000001'); +INSERT INTO phpbb_posts_text (post_id, post_subject, post_text) VALUES (1, NULL, 'This is an example post in your phpBB 2 installation. You may delete this post, this topic and even this forum if you like since everything seems to be working!'); + + +-- Themes +INSERT INTO phpbb_themes (themes_id, template_name, style_name, head_stylesheet, body_background, body_bgcolor, body_text, body_link, body_vlink, body_alink, body_hlink, tr_color1, tr_color2, tr_color3, tr_class1, tr_class2, tr_class3, th_color1, th_color2, th_color3, th_class1, th_class2, th_class3, td_color1, td_color2, td_color3, td_class1, td_class2, td_class3, fontface1, fontface2, fontface3, fontsize1, fontsize2, fontsize3, fontcolor1, fontcolor2, fontcolor3, span_class1, span_class2, span_class3) VALUES (1, 'subSilver', 'subSilver', 'subSilver.css', NULL, 'E5E5E5', '000000', '006699', '5493B4', '', 'DD6900', 'EFEFEF', 'DEE3E7', 'D1D7DC', NULL, NULL, NULL, '98AAB1', '006699', 'FFFFFF', 'cellpic1.gif', 'cellpic3.gif', 'cellpic2.jpg', 'FAFAFA', 'FFFFFF', NULL, 'row1', 'row2', NULL, 'Verdana, Arial, Helvetica, sans-serif', 'Trebuchet MS', 'Courier, ''Courier New'', sans-serif', 10, 11, 12, '444444', '006600', 'FFA34F', NULL, NULL, NULL); + +INSERT INTO phpbb_themes_name (themes_id, tr_color1_name, tr_color2_name, tr_color3_name, tr_class1_name, tr_class2_name, tr_class3_name, th_color1_name, th_color2_name, th_color3_name, th_class1_name, th_class2_name, th_class3_name, td_color1_name, td_color2_name, td_color3_name, td_class1_name, td_class2_name, td_class3_name, fontface1_name, fontface2_name, fontface3_name, fontsize1_name, fontsize2_name, fontsize3_name, fontcolor1_name, fontcolor2_name, fontcolor3_name, span_class1_name, span_class2_name, span_class3_name) VALUES (1, 'The lightest row colour', 'The medium row color', 'The darkest row colour', NULL, NULL, NULL, 'Border round the whole page', 'Outer table border', 'Inner table border', 'Silver gradient picture', 'Blue gradient picture', 'Fade-out gradient on index', 'Background for quote boxes', 'All white areas', NULL, 'Background for topic posts', '2nd background for topic posts', NULL, 'Main fonts', 'Additional topic title font', 'Form fonts', 'Smallest font size', 'Medium font size', 'Normal font size (post body etc)', 'Quote & copyright text', 'Code text colour', 'Main table header text colour', NULL, NULL, NULL); + + +-- Smilies +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 1, ':D', 'icon_biggrin.gif', 'Very Happy'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 2, ':-D', 'icon_biggrin.gif', 'Very Happy'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 3, ':grin:', 'icon_biggrin.gif', 'Very Happy'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 4, ':)', 'icon_smile.gif', 'Smile'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 5, ':-)', 'icon_smile.gif', 'Smile'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 6, ':smile:', 'icon_smile.gif', 'Smile'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 7, ':(', 'icon_sad.gif', 'Sad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 8, ':-(', 'icon_sad.gif', 'Sad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 9, ':sad:', 'icon_sad.gif', 'Sad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 10, ':o', 'icon_surprised.gif', 'Surprised'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_surprised.gif', 'Surprised'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_surprised.gif', 'Surprised'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 13, ':shock:', 'icon_eek.gif', 'Shocked'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 14, ':?', 'icon_confused.gif', 'Confused'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':-?', 'icon_confused.gif', 'Confused'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 16, ':???:', 'icon_confused.gif', 'Confused'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 17, '8)', 'icon_cool.gif', 'Cool'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 18, '8-)', 'icon_cool.gif', 'Cool'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 19, ':cool:', 'icon_cool.gif', 'Cool'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 20, ':lol:', 'icon_lol.gif', 'Laughing'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':x', 'icon_mad.gif', 'Mad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':-x', 'icon_mad.gif', 'Mad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':mad:', 'icon_mad.gif', 'Mad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':P', 'icon_razz.gif', 'Razz'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':-P', 'icon_razz.gif', 'Razz'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':razz:', 'icon_razz.gif', 'Razz'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':oops:', 'icon_redface.gif', 'Embarassed'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':cry:', 'icon_cry.gif', 'Crying or Very sad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':evil:', 'icon_evil.gif', 'Evil or Very Mad'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':twisted:', 'icon_twisted.gif', 'Twisted Evil'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 32, ':wink:', 'icon_wink.gif', 'Wink'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 33, ';)', 'icon_wink.gif', 'Wink'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 34, ';-)', 'icon_wink.gif', 'Wink'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 35, ':!:', 'icon_exclaim.gif', 'Exclamation'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 36, ':?:', 'icon_question.gif', 'Question'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':idea:', 'icon_idea.gif', 'Idea'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':arrow:', 'icon_arrow.gif', 'Arrow'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':|', 'icon_neutral.gif', 'Neutral'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':-|', 'icon_neutral.gif', 'Neutral'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':neutral:', 'icon_neutral.gif', 'Neutral'); +INSERT INTO phpbb_smilies (smilies_id, code, smile_url, emoticon) VALUES ( 42, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green'); + + +-- wordlist +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 1, 'example', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 2, 'post', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 3, 'phpbb', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 4, 'installation', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 5, 'delete', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 6, 'topic', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 7, 'forum', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 8, 'since', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 9, 'everything', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 10, 'seems', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 11, 'working', 0 ); +INSERT INTO phpbb_search_wordlist (word_id, word_text, word_common) VALUES ( 12, 'welcome', 0 ); + + +-- wordmatch +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 1, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 2, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 3, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 4, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 5, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 6, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 7, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 8, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 9, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 10, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 11, 1, 0 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 12, 1, 1 ); +INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES ( 3, 1, 1 ); diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql new file mode 100644 index 0000000000..f14c7503af --- /dev/null +++ b/phpBB/install/schemas/postgres_schema.sql @@ -0,0 +1,564 @@ +/* + phpBB2 PostgreSQL DB schema - phpBB group 2001 + + + $Id$ +*/ + +CREATE SEQUENCE phpbb_banlist_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; +CREATE SEQUENCE phpbb_categories_id_seq start 2 increment 1 maxvalue 2147483647 minvalue 1 cache 1; +CREATE SEQUENCE phpbb_disallow_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; +CREATE SEQUENCE phpbb_posts_id_seq start 2 increment 1 maxvalue 2147483647 minvalue 1 cache 1; +CREATE SEQUENCE phpbb_privmsgs_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; +CREATE SEQUENCE phpbb_ranks_id_seq start 2 increment 1 maxvalue 2147483647 minvalue 1 cache 1; +CREATE SEQUENCE phpbb_search_wordlist_id_seq start 13 increment 1 maxvalue 2147483647 minvalue 1 cache 1; +CREATE SEQUENCE phpbb_smilies_id_seq start 42 increment 1 maxvalue 2147483647 minvalue 1 cache 1; +CREATE SEQUENCE phpbb_themes_id_seq start 7 increment 1 maxvalue 2147483647 minvalue 1 cache 1; +CREATE SEQUENCE phpbb_topics_id_seq start 2 increment 1 maxvalue 2147483647 minvalue 1 cache 1; +CREATE SEQUENCE phpbb_users_id_seq start 3 increment 1 maxvalue 2147483647 minvalue 1 cache 1; +CREATE SEQUENCE phpbb_words_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; +CREATE SEQUENCE phpbb_groups_id_seq start 3 increment 1 maxvalue 2147483647 minvalue 1 cache 1; +CREATE SEQUENCE phpbb_forum_prune_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; +CREATE SEQUENCE phpbb_vote_desc_id_seq start 1 increment 1 maxvalue 2147483647 minvalue 1 cache 1; + +/* -------------------------------------------------------- + Table structure for table phpbb_auth_access +-------------------------------------------------------- */ +CREATE TABLE phpbb_auth_access ( + group_id int DEFAULT '0' NOT NULL, + forum_id int2 DEFAULT '0' NOT NULL, + auth_view int2 DEFAULT '0' NOT NULL, + auth_read int2 DEFAULT '0' NOT NULL, + auth_post int2 DEFAULT '0' NOT NULL, + auth_reply int2 DEFAULT '0' NOT NULL, + auth_edit int2 DEFAULT '0' NOT NULL, + auth_delete int2 DEFAULT '0' NOT NULL, + auth_sticky int2 DEFAULT '0' NOT NULL, + auth_announce int2 DEFAULT '0' NOT NULL, + auth_vote int2 DEFAULT '0' NOT NULL, + auth_pollcreate int2 DEFAULT '0' NOT NULL, + auth_attachments int2 DEFAULT '0' NOT NULL, + auth_mod int2 DEFAULT '0' NOT NULL, + CONSTRAINT phpbb_auth_access_pkey PRIMARY KEY (group_id, forum_id) +); + + +/* -------------------------------------------------------- + Table structure for table phpbb_confirm +-------------------------------------------------------- */ +CREATE TABLE phpbb_confirm ( + confirm_id char(32) DEFAULT '' NOT NULL, + session_id char(32) DEFAULT '' NOT NULL, + code char(6) DEFAULT '' NOT NULL, + CONSTRAINT phpbb_confirm_pkey PRIMARY KEY (session_id, confirm_id) +); + + +/* -------------------------------------------------------- + Table structure for table phpbb_groups +-------------------------------------------------------- */ +CREATE TABLE phpbb_groups ( + group_id int DEFAULT nextval('phpbb_groups_id_seq'::text) NOT NULL, + group_name varchar(40) NOT NULL, + group_type int2 DEFAULT '1' NOT NULL, + group_description varchar(255) NOT NULL, + group_moderator int4 DEFAULT '0' NOT NULL, + group_single_user int2 DEFAULT '0' NOT NULL, + CONSTRAINT phpbb_groups_pkey PRIMARY KEY (group_id) +); + + +/* -------------------------------------------------------- + Table structure for table phpbb_banlist +-------------------------------------------------------- */ +CREATE TABLE phpbb_banlist ( + ban_id int4 DEFAULT nextval('phpbb_banlist_id_seq'::text) NOT NULL, + ban_userid int4, + ban_ip char(8), + ban_email varchar(255), + CONSTRAINT phpbb_banlist_pkey PRIMARY KEY (ban_id) +); +CREATE INDEX ban_userid_phpbb_banlist_index ON phpbb_banlist (ban_userid); + + +/* -------------------------------------------------------- + Table structure for table phpbb_categories +-------------------------------------------------------- */ +CREATE TABLE phpbb_categories ( + cat_id int4 DEFAULT nextval('phpbb_categories_id_seq'::text) NOT NULL, + cat_title varchar(100), + cat_order int4, + CONSTRAINT phpbb_categories_pkey PRIMARY KEY (cat_id) +); + + +/* -------------------------------------------------------- + Table structure for table phpbb_config +-------------------------------------------------------- */ +CREATE TABLE phpbb_config ( + config_name varchar(255) NOT NULL, + config_value varchar(255) NOT NULL, + CONSTRAINT phpbb_config_pkey PRIMARY KEY (config_name) +); + + +/* -------------------------------------------------------- + Table structure for table phpbb_disallow +-------------------------------------------------------- */ +CREATE TABLE phpbb_disallow ( + disallow_id int4 DEFAULT nextval('phpbb_disallow_id_seq'::text) NOT NULL, + disallow_username varchar(25), + CONSTRAINT phpbb_disallow_pkey PRIMARY KEY (disallow_id) +); + + +/* -------------------------------------------------------- + Table structure for table phpbb_forums +-------------------------------------------------------- */ +CREATE TABLE phpbb_forums ( + forum_id int4 DEFAULT '0' NOT NULL, + cat_id int4, + forum_name varchar(150), + forum_desc text, + forum_status int2 DEFAULT '0' NOT NULL, + forum_order int4 DEFAULT '1' NOT NULL, + forum_posts int4 DEFAULT '0' NOT NULL, + forum_topics int4 DEFAULT '0' NOT NULL, + forum_last_post_id int4 DEFAULT '0' NOT NULL, + prune_enable int2 DEFAULT '0' NOT NULL, + prune_next int, + auth_view int2 DEFAULT '0' NOT NULL, + auth_read int2 DEFAULT '0' NOT NULL, + auth_post int2 DEFAULT '0' NOT NULL, + auth_reply int2 DEFAULT '0' NOT NULL, + auth_edit int2 DEFAULT '0' NOT NULL, + auth_delete int2 DEFAULT '0' NOT NULL, + auth_announce int2 DEFAULT '0' NOT NULL, + auth_sticky int2 DEFAULT '0' NOT NULL, + auth_pollcreate int2 DEFAULT '0' NOT NULL, + auth_vote int2 DEFAULT '0' NOT NULL, + auth_attachments int2 DEFAULT '0' NOT NULL, + CONSTRAINT phpbb_forums_pkey PRIMARY KEY (forum_id) +); +CREATE INDEX cat_id_phpbb_forums_index ON phpbb_forums (cat_id); +CREATE INDEX forum_id_phpbb_forums_index ON phpbb_forums (forum_id); +CREATE INDEX forums_order_phpbb_forums_index ON phpbb_forums (forum_order); +CREATE INDEX forum_last_post_id_phpbb_forums_index ON phpbb_forums (forum_last_post_id); + + +/* -------------------------------------------------------- + Table structure for table phpbb_forum_prune +-------------------------------------------------------- */ +CREATE TABLE phpbb_forum_prune ( + prune_id int4 DEFAULT nextval('phpbb_forum_prune_id_seq'::text) NOT NULL, + forum_id int4 NOT NULL, + prune_days int4 NOT NULL, + prune_freq int4 NOT NULL, + CONSTRAINT phpbb_forum_prune_pkey PRIMARY KEY (prune_id) +); +CREATE INDEX prune_id_phpbb_forum_prune_index ON phpbb_forum_prune (prune_id); +CREATE INDEX forum_id_phpbb_forum_prune_index ON phpbb_forum_prune (forum_id); + + +/* -------------------------------------------------------- + Table structure for table phpbb_posts +-------------------------------------------------------- */ +CREATE TABLE phpbb_posts ( + post_id int4 DEFAULT nextval('phpbb_posts_id_seq'::text) NOT NULL, + topic_id int4 DEFAULT '0' NOT NULL, + forum_id int4 DEFAULT '0' NOT NULL, + poster_id int4 DEFAULT '0' NOT NULL, + post_time int4 DEFAULT '0' NOT NULL, + post_username varchar(25), + poster_ip char(8) DEFAULT '' NOT NULL, + enable_bbcode int2 DEFAULT '1' NOT NULL, + enable_html int2 DEFAULT '0' NOT NULL, + enable_smilies int2 DEFAULT '1' NOT NULL, + enable_sig int2 DEFAULT '1' NOT NULL, + post_edit_time int4, + post_edit_count int2 DEFAULT '0' NOT NULL, + CONSTRAINT phpbb_posts_pkey PRIMARY KEY (post_id) +); +CREATE INDEX forum_id_phpbb_posts_index ON phpbb_posts (forum_id); +CREATE INDEX post_time_phpbb_posts_index ON phpbb_posts (post_time); +CREATE INDEX poster_id_phpbb_posts_index ON phpbb_posts (poster_id); +CREATE INDEX topic_id_phpbb_posts_index ON phpbb_posts (topic_id); + + +/* -------------------------------------------------------- + Table structure for table phpbb_posts_text +-------------------------------------------------------- */ +CREATE TABLE phpbb_posts_text ( + post_id int4 DEFAULT '0' NOT NULL, + bbcode_uid varchar(10) DEFAULT '' NOT NULL, + post_subject varchar(60), + post_text text, + CONSTRAINT phpbb_posts_text_pkey PRIMARY KEY (post_id) +); + + +/* -------------------------------------------------------- + Table structure for table phpbb_privmsgs +-------------------------------------------------------- */ +CREATE TABLE phpbb_privmsgs ( + privmsgs_id int4 DEFAULT nextval('phpbb_privmsgs_id_seq'::text) NOT NULL, + privmsgs_type int2 DEFAULT '0' NOT NULL, + privmsgs_subject varchar(255) DEFAULT '0' NOT NULL, + privmsgs_from_userid int4 DEFAULT '0' NOT NULL, + privmsgs_to_userid int4 DEFAULT '0' NOT NULL, + privmsgs_date int4 DEFAULT '0' NOT NULL, + privmsgs_ip char(8) NOT NULL, + privmsgs_enable_bbcode int2 DEFAULT '1' NOT NULL, + privmsgs_enable_html int2 DEFAULT '0' NOT NULL, + privmsgs_enable_smilies int2 DEFAULT '1' NOT NULL, + privmsgs_attach_sig int2 DEFAULT '1' NOT NULL, + CONSTRAINT phpbb_privmsgs_pkey PRIMARY KEY (privmsgs_id) +); +CREATE INDEX privmsgs_from_userid_phpbb_privmsgs_index ON phpbb_privmsgs (privmsgs_from_userid); +CREATE INDEX privmsgs_to_userid_phpbb_privmsgs_index ON phpbb_privmsgs (privmsgs_to_userid); + + +/* -------------------------------------------------------- + Table structure for table phpbb_privmsgs_text +-------------------------------------------------------- */ +CREATE TABLE phpbb_privmsgs_text ( + privmsgs_text_id int4 DEFAULT '0' NOT NULL, + privmsgs_bbcode_uid char(10) DEFAULT '0' NOT NULL, + privmsgs_text text, + CONSTRAINT phpbb_privmsgs_text_pkey PRIMARY KEY (privmsgs_text_id) +); + + +/* -------------------------------------------------------- + Table structure for table phpbb_ranks +-------------------------------------------------------- */ +CREATE TABLE phpbb_ranks ( + rank_id int4 DEFAULT nextval('phpbb_ranks_id_seq'::text) NOT NULL, + rank_title varchar(50) DEFAULT '' NOT NULL, + rank_min int4 DEFAULT '0' NOT NULL, + rank_special int2 DEFAULT '0', + rank_image varchar(255), + CONSTRAINT phpbb_ranks_pkey PRIMARY KEY (rank_id) +); + + +/* -------------------------------------------------------- + Table structure for table phpbb_search_results +-------------------------------------------------------- */ +CREATE TABLE phpbb_search_results ( + search_id int4 NOT NULL default '0', + session_id char(32) NOT NULL default '', + search_time int4 DEFAULT '0' NOT NULL, + search_array text NOT NULL, + CONSTRAINT phpbb_search_results_pkey PRIMARY KEY (search_id) +); +CREATE INDEX session_id_phpbb_search_results_index ON phpbb_search_results (session_id); + + +/* -------------------------------------------------------- + Table structure for table phpbb_search_wordlist +-------------------------------------------------------- */ +CREATE TABLE phpbb_search_wordlist ( + word_id int4 DEFAULT nextval('phpbb_search_wordlist_id_seq'::text) NOT NULL, + word_text varchar(50) NOT NULL DEFAULT '', + word_common int2 NOT NULL DEFAULT '0', + CONSTRAINT phpbb_search_wordlist_pkey PRIMARY KEY (word_text) +); +CREATE INDEX word_id_phpbb_search_wordlist_index ON phpbb_search_wordlist (word_id); + + +/* -------------------------------------------------------- + Table structure for table phpbb_search_wordmatch +-------------------------------------------------------- */ +CREATE TABLE phpbb_search_wordmatch ( + post_id int4 NOT NULL default '0', + word_id int4 NOT NULL default '0', + title_match int2 NOT NULL default '0' +); +CREATE INDEX word_id_phpbb_search_wordmatch_index ON phpbb_search_wordmatch (word_id); +CREATE INDEX post_id_phpbb_search_wordmatch_index ON phpbb_search_wordmatch (post_id); + + +/* -------------------------------------------------------- + Table structure for table phpbb_sessions +-------------------------------------------------------- */ +CREATE TABLE phpbb_sessions ( + session_id char(32) DEFAULT '0' NOT NULL, + session_user_id int4 DEFAULT '0' NOT NULL, + session_start int4 DEFAULT '0' NOT NULL, + session_time int4 DEFAULT '0' NOT NULL, + session_ip char(8) DEFAULT '0' NOT NULL, + session_page int4 DEFAULT '0' NOT NULL, + session_logged_in int2 DEFAULT '0' NOT NULL, + session_admin int2 DEFAULT '0' NOT NULL, + CONSTRAINT phpbb_session_pkey PRIMARY KEY (session_id) +); +CREATE INDEX session_user_id_phpbb_sessions_index ON phpbb_sessions (session_user_id); +CREATE INDEX session_id_ip_user_id_phpbb_sessions_index ON phpbb_sessions (session_id, session_ip, session_user_id); + +/* -------------------------------------------------------- + Table structure for table phpbb_sessions_keys +-------------------------------------------------------- */ +CREATE TABLE phpbb_sessions_keys ( + key_id char(32) DEFAULT '0' NOT NULL, + user_id int4 DEFAULT '0' NOT NULL, + last_ip char(8) DEFAULT '0' NOT NULL, + last_login int4 DEFAULT '0' NOT NULL, + CONSTRAINT phpbb_sessions_keys_pkey PRIMARY KEY (key_id, user_id) +); +CREATE INDEX last_login_phpbb_sessions_keys_index ON phpbb_sessions_keys (last_login); + +/* -------------------------------------------------------- + Table structure for table phpbb_smilies +-------------------------------------------------------- */ +CREATE TABLE phpbb_smilies ( + smilies_id int4 DEFAULT nextval('phpbb_smilies_id_seq'::text) NOT NULL, + code varchar(50), + smile_url varchar(100), + emoticon varchar(75), + CONSTRAINT phpbb_smilies_pkey PRIMARY KEY (smilies_id) +); + + +/* -------------------------------------------------------- + Table structure for table phpbb_themes +-------------------------------------------------------- */ +CREATE TABLE phpbb_themes ( + themes_id int4 DEFAULT nextval('phpbb_themes_id_seq'::text) NOT NULL, + style_name varchar(30), + template_name varchar(30) NOT NULL DEFAULT '', + head_stylesheet varchar(100), + body_background varchar(100), + body_bgcolor char(6), + body_text char(6), + body_link char(6), + body_vlink char(6), + body_alink char(6), + body_hlink char(6), + tr_color1 char(6), + tr_color2 char(6), + tr_color3 char(6), + tr_class1 varchar(25), + tr_class2 varchar(25), + tr_class3 varchar(25), + th_color1 char(6), + th_color2 char(6), + th_color3 char(6), + th_class1 varchar(25), + th_class2 varchar(25), + th_class3 varchar(25), + td_color1 char(6), + td_color2 char(6), + td_color3 char(6), + td_class1 varchar(25), + td_class2 varchar(25), + td_class3 varchar(25), + fontface1 varchar(50), + fontface2 varchar(50), + fontface3 varchar(50), + fontsize1 int2, + fontsize2 int2, + fontsize3 int2, + fontcolor1 char(6), + fontcolor2 char(6), + fontcolor3 char(6), + span_class1 varchar(25), + span_class2 varchar(25), + span_class3 varchar(25), + img_size_poll int2, + img_size_privmsg int2, + CONSTRAINT phpbb_themes_pkey PRIMARY KEY (themes_id) +); + + +/* -------------------------------------------------------- + Table structure for table phpbb_themes_name +-------------------------------------------------------- */ +CREATE TABLE phpbb_themes_name ( + themes_id int4 DEFAULT '0' NOT NULL, + tr_color1_name char(50), + tr_color2_name char(50), + tr_color3_name char(50), + tr_class1_name varchar(50), + tr_class2_name varchar(50), + tr_class3_name varchar(50), + th_color1_name char(50), + th_color2_name char(50), + th_color3_name char(50), + th_class1_name varchar(50), + th_class2_name varchar(50), + th_class3_name varchar(50), + td_color1_name char(50), + td_color2_name char(50), + td_color3_name char(50), + td_class1_name varchar(50), + td_class2_name varchar(50), + td_class3_name varchar(50), + fontface1_name varchar(50), + fontface2_name varchar(50), + fontface3_name varchar(50), + fontsize1_name varchar(50), + fontsize2_name varchar(50), + fontsize3_name varchar(50), + fontcolor1_name char(50), + fontcolor2_name char(50), + fontcolor3_name char(50), + span_class1_name varchar(50), + span_class2_name varchar(50), + span_class3_name varchar(50), + CONSTRAINT phpbb_themes_name_pkey PRIMARY KEY (themes_id) +); + + +/* -------------------------------------------------------- + Table structure for table phpbb_topics +-------------------------------------------------------- */ +CREATE TABLE phpbb_topics ( + topic_id int4 DEFAULT nextval('phpbb_topics_id_seq'::text) NOT NULL, + forum_id int4 DEFAULT '0' NOT NULL, + topic_title varchar(60) DEFAULT '' NOT NULL, + topic_poster int4 DEFAULT '0' NOT NULL, + topic_time int4 DEFAULT '0' NOT NULL, + topic_views int4 DEFAULT '0' NOT NULL, + topic_replies int4 DEFAULT '0' NOT NULL, + topic_status int2 DEFAULT '0' NOT NULL, + topic_vote int2 DEFAULT '0' NOT NULL, + topic_type int2 DEFAULT '0' NOT NULL, + topic_first_post_id int4 DEFAULT '0' NOT NULL, + topic_last_post_id int4 DEFAULT '0' NOT NULL, + topic_moved_id int4 DEFAULT '0' NOT NULL, + CONSTRAINT phpbb_topics_pkey PRIMARY KEY (topic_id) +); +CREATE INDEX forum_id_phpbb_topics_index ON phpbb_topics (forum_id); +CREATE INDEX topic_moved_id_phpbb_topics_index ON phpbb_topics (topic_moved_id); +CREATE INDEX topic_first_post_id_phpbb_topics_index ON phpbb_topics (topic_first_post_id); +CREATE INDEX topic_last_post_id_phpbb_topics_index ON phpbb_topics (topic_last_post_id); +CREATE INDEX topic_status_phpbb_topics_index ON phpbb_topics (topic_status); +CREATE INDEX topic_type_phpbb_topics_index ON phpbb_topics (topic_type); + + +/* -------------------------------------------------------- + Table structure for table phpbb_topics_watch +-------------------------------------------------------- */ +CREATE TABLE phpbb_topics_watch ( + topic_id int4, + user_id int4, + notify_status int2 NOT NULL default '0' +); +CREATE INDEX topic_id_phpbb_topics_watch_index ON phpbb_topics_watch (topic_id); +CREATE INDEX user_id_phpbb_topics_watch_index ON phpbb_topics_watch (user_id); + + +/* -------------------------------------------------------- + Table structure for table phpbb_user_group +-------------------------------------------------------- */ +CREATE TABLE phpbb_user_group ( + group_id int DEFAULT '0' NOT NULL, + user_id int DEFAULT '0' NOT NULL, + user_pending int2 +); +CREATE INDEX group_id_phpbb_user_group_index ON phpbb_user_group (group_id); +CREATE INDEX user_id_phpbb_user_group_index ON phpbb_user_group (user_id); + + +/* -------------------------------------------------------- + Table structure for table phpbb_users +-------------------------------------------------------- */ +CREATE TABLE phpbb_users ( + user_id int4 DEFAULT nextval('phpbb_users_id_seq'::text) NOT NULL, + user_active int2, + username varchar(25) DEFAULT '' NOT NULL, + user_regdate int4 DEFAULT '0' NOT NULL, + user_password varchar(32) DEFAULT '' NOT NULL, + user_session_time int4 DEFAULT '0' NOT NULL, + user_session_page int2 DEFAULT '0' NOT NULL, + user_lastvisit int4 DEFAULT '0' NOT NULL, + user_email varchar(255), + user_icq varchar(15), + user_website varchar(100), + user_occ varchar(100), + user_from varchar(100), + user_interests varchar(255), + user_sig text, + user_sig_bbcode_uid char(10), + user_style int4, + user_aim varchar(255), + user_yim varchar(255), + user_msnm varchar(255), + user_posts int4 DEFAULT '0' NOT NULL, + user_new_privmsg int2 DEFAULT '0' NOT NULL, + user_unread_privmsg int2 DEFAULT '0' NOT NULL, + user_last_privmsg int4 DEFAULT '0' NOT NULL, + user_login_tries int2 DEFAULT '0' NOT NULL, + user_last_login_try int4 DEFAULT '0' NOT NULL, + user_emailtime int4, + user_viewemail int2, + user_attachsig int2, + user_allowhtml int2 DEFAULT '1', + user_allowbbcode int2 DEFAULT '1', + user_allowsmile int2 DEFAULT '1', + user_allow_pm int2 DEFAULT '1' NOT NULL, + user_allowavatar int2 DEFAULT '1' NOT NULL, + user_allow_viewonline int2 DEFAULT '1' NOT NULL, + user_rank int4 DEFAULT '0', + user_avatar varchar(100), + user_avatar_type int2 DEFAULT '0' NOT NULL, + user_level int4 DEFAULT '0', + user_lang varchar(255), + user_timezone decimal(5,2) DEFAULT '0.0' NOT NULL, + user_dateformat varchar(14) DEFAULT 'd M Y H:i' NOT NULL, + user_notify_pm int2 DEFAULT '0' NOT NULL, + user_popup_pm int2 DEFAULT '0' NOT NULL, + user_notify int2, + user_actkey varchar(32), + user_newpasswd varchar(32), + CONSTRAINT phpbb_users_pkey PRIMARY KEY (user_id) +); + +CREATE INDEX user_session_time_phpbb_users_index ON phpbb_users (user_session_time); + +/* -------------------------------------------------------- + Table structure for table phpbb_vote_desc +-------------------------------------------------------- */ +CREATE TABLE phpbb_vote_desc ( + vote_id int4 DEFAULT nextval('phpbb_vote_desc_id_seq'::text) NOT NULL , + topic_id int4 NOT NULL DEFAULT '0', + vote_text text NOT NULL, + vote_start int4 DEFAULT '0' NOT NULL, + vote_length int4 DEFAULT '0' NOT NULL, + CONSTRAINT phpbb_vote_dsc_pkey PRIMARY KEY (vote_id) +); +CREATE INDEX topic_id_phpbb_vote_desc_index ON phpbb_vote_desc (topic_id); + +/* -------------------------------------------------------- + Table structure for table phpbb_vote_results +-------------------------------------------------------- */ +CREATE TABLE phpbb_vote_results ( + vote_id int4 NOT NULL DEFAULT '0', + vote_option_id int4 NOT NULL DEFAULT '0', + vote_option_text varchar(255) NOT NULL, + vote_result int4 NOT NULL DEFAULT '0' +); +CREATE INDEX option_id_phpbb_vote_results_index ON phpbb_vote_results (vote_option_id); + +/* -------------------------------------------------------- + Table structure for table phpbb_vote_voters +-------------------------------------------------------- */ +CREATE TABLE phpbb_vote_voters ( + vote_id int4 NOT NULL DEFAULT '0', + vote_user_id int4 NOT NULL DEFAULT '0', + vote_user_ip char(8) NOT NULL +); +CREATE INDEX vote_id_phpbb_vote_voters_index ON phpbb_vote_voters (vote_id); +CREATE INDEX vote_user_id_phpbb_vote_voters_index ON phpbb_vote_voters (vote_user_id); +CREATE INDEX vote_user_ip_phpbb_vote_voters_index ON phpbb_vote_voters (vote_user_ip); + +/* -------------------------------------------------------- + Table structure for table phpbb_words +-------------------------------------------------------- */ +CREATE TABLE phpbb_words ( + word_id int4 DEFAULT nextval('phpbb_words_id_seq'::text) NOT NULL, + word varchar(100) DEFAULT '' NOT NULL, + replacement varchar(100) DEFAULT '' NOT NULL, + CONSTRAINT phpbb_words_pkey PRIMARY KEY (word_id) +); diff --git a/phpBB/install/schemas/schema_data.php b/phpBB/install/schemas/schema_data.php deleted file mode 100644 index f600c01e4e..0000000000 --- a/phpBB/install/schemas/schema_data.php +++ /dev/null @@ -1,1092 +0,0 @@ - array( - 'attach_id' => array('UINT', NULL, 'auto_increment'), - 'post_msg_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), - 'in_message' => array('BOOL', 0), - 'poster_id' => array('UINT', 0), - 'is_orphan' => array('BOOL', 1), - 'physical_filename' => array('VCHAR', ''), - 'real_filename' => array('VCHAR', ''), - 'download_count' => array('UINT', 0), - 'attach_comment' => array('TEXT_UNI', ''), - 'extension' => array('VCHAR:100', ''), - 'mimetype' => array('VCHAR:100', ''), - 'filesize' => array('UINT:20', 0), - 'filetime' => array('TIMESTAMP', 0), - 'thumbnail' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'attach_id', - 'KEYS' => array( - 'filetime' => array('INDEX', 'filetime'), - 'post_msg_id' => array('INDEX', 'post_msg_id'), - 'topic_id' => array('INDEX', 'topic_id'), - 'poster_id' => array('INDEX', 'poster_id'), - 'is_orphan' => array('INDEX', 'is_orphan'), - ), -); - -$schema_data['phpbb_acl_groups'] = array( - 'COLUMNS' => array( - 'group_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'auth_option_id' => array('UINT', 0), - 'auth_role_id' => array('UINT', 0), - 'auth_setting' => array('TINT:2', 0), - ), - 'KEYS' => array( - 'group_id' => array('INDEX', 'group_id'), - 'auth_opt_id' => array('INDEX', 'auth_option_id'), - 'auth_role_id' => array('INDEX', 'auth_role_id'), - ), -); - -$schema_data['phpbb_acl_options'] = array( - 'COLUMNS' => array( - 'auth_option_id' => array('UINT', NULL, 'auto_increment'), - 'auth_option' => array('VCHAR:50', ''), - 'is_global' => array('BOOL', 0), - 'is_local' => array('BOOL', 0), - 'founder_only' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'auth_option_id', - 'KEYS' => array( - 'auth_option' => array('INDEX', 'auth_option'), - ), -); - -$schema_data['phpbb_acl_roles'] = array( - 'COLUMNS' => array( - 'role_id' => array('UINT', NULL, 'auto_increment'), - 'role_name' => array('VCHAR_UNI', ''), - 'role_description' => array('TEXT_UNI', ''), - 'role_type' => array('VCHAR:10', ''), - 'role_order' => array('USINT', 0), - ), - 'PRIMARY_KEY' => 'role_id', - 'KEYS' => array( - 'role_type' => array('INDEX', 'role_type'), - 'role_order' => array('INDEX', 'role_order'), - ), -); - -$schema_data['phpbb_acl_roles_data'] = array( - 'COLUMNS' => array( - 'role_id' => array('UINT', 0), - 'auth_option_id' => array('UINT', 0), - 'auth_setting' => array('TINT:2', 0), - ), - 'PRIMARY_KEY' => array('role_id', 'auth_option_id'), - 'KEYS' => array( - 'ath_op_id' => array('INDEX', 'auth_option_id'), - ), -); - -$schema_data['phpbb_acl_users'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'auth_option_id' => array('UINT', 0), - 'auth_role_id' => array('UINT', 0), - 'auth_setting' => array('TINT:2', 0), - ), - 'KEYS' => array( - 'user_id' => array('INDEX', 'user_id'), - 'auth_option_id' => array('INDEX', 'auth_option_id'), - 'auth_role_id' => array('INDEX', 'auth_role_id'), - ), -); - -$schema_data['phpbb_banlist'] = array( - 'COLUMNS' => array( - 'ban_id' => array('UINT', NULL, 'auto_increment'), - 'ban_userid' => array('UINT', 0), - 'ban_ip' => array('VCHAR:40', ''), - 'ban_email' => array('VCHAR_UNI:100', ''), - 'ban_start' => array('TIMESTAMP', 0), - 'ban_end' => array('TIMESTAMP', 0), - 'ban_exclude' => array('BOOL', 0), - 'ban_reason' => array('VCHAR_UNI', ''), - 'ban_give_reason' => array('VCHAR_UNI', ''), - ), - 'PRIMARY_KEY' => 'ban_id', - 'KEYS' => array( - 'ban_end' => array('INDEX', 'ban_end'), - 'ban_user' => array('INDEX', array('ban_userid', 'ban_exclude')), - 'ban_email' => array('INDEX', array('ban_email', 'ban_exclude')), - 'ban_ip' => array('INDEX', array('ban_ip', 'ban_exclude')), - ), -); - -$schema_data['phpbb_bbcodes'] = array( - 'COLUMNS' => array( - 'bbcode_id' => array('TINT:3', 0), - 'bbcode_tag' => array('VCHAR:16', ''), - 'bbcode_helpline' => array('VCHAR_UNI', ''), - 'display_on_posting' => array('BOOL', 0), - 'bbcode_match' => array('TEXT_UNI', ''), - 'bbcode_tpl' => array('MTEXT_UNI', ''), - 'first_pass_match' => array('MTEXT_UNI', ''), - 'first_pass_replace' => array('MTEXT_UNI', ''), - 'second_pass_match' => array('MTEXT_UNI', ''), - 'second_pass_replace' => array('MTEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'bbcode_id', - 'KEYS' => array( - 'display_on_post' => array('INDEX', 'display_on_posting'), - ), -); - -$schema_data['phpbb_bookmarks'] = array( - 'COLUMNS' => array( - 'topic_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - ), - 'PRIMARY_KEY' => array('topic_id', 'user_id'), -); - -$schema_data['phpbb_bots'] = array( - 'COLUMNS' => array( - 'bot_id' => array('UINT', NULL, 'auto_increment'), - 'bot_active' => array('BOOL', 1), - 'bot_name' => array('STEXT_UNI', ''), - 'user_id' => array('UINT', 0), - 'bot_agent' => array('VCHAR', ''), - 'bot_ip' => array('VCHAR', ''), - ), - 'PRIMARY_KEY' => 'bot_id', - 'KEYS' => array( - 'bot_active' => array('INDEX', 'bot_active'), - ), -); - -$schema_data['phpbb_config'] = array( - 'COLUMNS' => array( - 'config_name' => array('VCHAR', ''), - 'config_value' => array('VCHAR_UNI', ''), - 'is_dynamic' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'config_name', - 'KEYS' => array( - 'is_dynamic' => array('INDEX', 'is_dynamic'), - ), -); - -$schema_data['phpbb_confirm'] = array( - 'COLUMNS' => array( - 'confirm_id' => array('CHAR:32', ''), - 'session_id' => array('CHAR:32', ''), - 'confirm_type' => array('TINT:3', 0), - 'code' => array('VCHAR:8', ''), - 'seed' => array('UINT:10', 0), - ), - 'PRIMARY_KEY' => array('session_id', 'confirm_id'), - 'KEYS' => array( - 'confirm_type' => array('INDEX', 'confirm_type'), - ), -); - -$schema_data['phpbb_disallow'] = array( - 'COLUMNS' => array( - 'disallow_id' => array('UINT', NULL, 'auto_increment'), - 'disallow_username' => array('VCHAR_UNI:255', ''), - ), - 'PRIMARY_KEY' => 'disallow_id', -); - -$schema_data['phpbb_drafts'] = array( - 'COLUMNS' => array( - 'draft_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'save_time' => array('TIMESTAMP', 0), - 'draft_subject' => array('XSTEXT_UNI', ''), - 'draft_message' => array('MTEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'draft_id', - 'KEYS' => array( - 'save_time' => array('INDEX', 'save_time'), - ), -); - -$schema_data['phpbb_extensions'] = array( - 'COLUMNS' => array( - 'extension_id' => array('UINT', NULL, 'auto_increment'), - 'group_id' => array('UINT', 0), - 'extension' => array('VCHAR:100', ''), - ), - 'PRIMARY_KEY' => 'extension_id', -); - -$schema_data['phpbb_extension_groups'] = array( - 'COLUMNS' => array( - 'group_id' => array('UINT', NULL, 'auto_increment'), - 'group_name' => array('VCHAR_UNI', ''), - 'cat_id' => array('TINT:2', 0), - 'allow_group' => array('BOOL', 0), - 'download_mode' => array('BOOL', 1), - 'upload_icon' => array('VCHAR', ''), - 'max_filesize' => array('UINT:20', 0), - 'allowed_forums' => array('TEXT', ''), - 'allow_in_pm' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'group_id', -); - -$schema_data['phpbb_forums'] = array( - 'COLUMNS' => array( - 'forum_id' => array('UINT', NULL, 'auto_increment'), - 'parent_id' => array('UINT', 0), - 'left_id' => array('UINT', 0), - 'right_id' => array('UINT', 0), - 'forum_parents' => array('MTEXT', ''), - 'forum_name' => array('STEXT_UNI', ''), - 'forum_desc' => array('TEXT_UNI', ''), - 'forum_desc_bitfield' => array('VCHAR:255', ''), - 'forum_desc_options' => array('UINT:11', 7), - 'forum_desc_uid' => array('VCHAR:8', ''), - 'forum_link' => array('VCHAR_UNI', ''), - 'forum_password' => array('VCHAR_UNI:40', ''), - 'forum_style' => array('USINT', 0), - 'forum_image' => array('VCHAR', ''), - 'forum_rules' => array('TEXT_UNI', ''), - 'forum_rules_link' => array('VCHAR_UNI', ''), - 'forum_rules_bitfield' => array('VCHAR:255', ''), - 'forum_rules_options' => array('UINT:11', 7), - 'forum_rules_uid' => array('VCHAR:8', ''), - 'forum_topics_per_page' => array('TINT:4', 0), - 'forum_type' => array('TINT:4', 0), - 'forum_status' => array('TINT:4', 0), - 'forum_posts' => array('UINT', 0), - 'forum_topics' => array('UINT', 0), - 'forum_topics_real' => array('UINT', 0), - 'forum_last_post_id' => array('UINT', 0), - 'forum_last_poster_id' => array('UINT', 0), - 'forum_last_post_subject' => array('XSTEXT_UNI', ''), - 'forum_last_post_time' => array('TIMESTAMP', 0), - 'forum_last_poster_name'=> array('VCHAR_UNI', ''), - 'forum_last_poster_colour'=> array('VCHAR:6', ''), - 'forum_flags' => array('TINT:4', 32), - 'display_subforum_list' => array('BOOL', 1), - 'display_on_index' => array('BOOL', 1), - 'enable_indexing' => array('BOOL', 1), - 'enable_icons' => array('BOOL', 1), - 'enable_prune' => array('BOOL', 0), - 'prune_next' => array('TIMESTAMP', 0), - 'prune_days' => array('UINT', 0), - 'prune_viewed' => array('UINT', 0), - 'prune_freq' => array('UINT', 0), - ), - 'PRIMARY_KEY' => 'forum_id', - 'KEYS' => array( - 'left_right_id' => array('INDEX', array('left_id', 'right_id')), - 'forum_lastpost_id' => array('INDEX', 'forum_last_post_id'), - ), -); - -$schema_data['phpbb_forums_access'] = array( - 'COLUMNS' => array( - 'forum_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'session_id' => array('CHAR:32', ''), - ), - 'PRIMARY_KEY' => array('forum_id', 'user_id', 'session_id'), -); - -$schema_data['phpbb_forums_track'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'mark_time' => array('TIMESTAMP', 0), - ), - 'PRIMARY_KEY' => array('user_id', 'forum_id'), -); - -$schema_data['phpbb_forums_watch'] = array( - 'COLUMNS' => array( - 'forum_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'notify_status' => array('BOOL', 0), - ), - 'KEYS' => array( - 'forum_id' => array('INDEX', 'forum_id'), - 'user_id' => array('INDEX', 'user_id'), - 'notify_stat' => array('INDEX', 'notify_status'), - ), -); - -$schema_data['phpbb_groups'] = array( - 'COLUMNS' => array( - 'group_id' => array('UINT', NULL, 'auto_increment'), - 'group_type' => array('TINT:4', 1), - 'group_founder_manage' => array('BOOL', 0), - 'group_name' => array('VCHAR_UNI', ''), - 'group_name_clean' => array('VCHAR_UNI', ''), - 'group_desc' => array('TEXT_UNI', ''), - 'group_desc_bitfield' => array('VCHAR:255', ''), - 'group_desc_options' => array('UINT:11', 7), - 'group_desc_uid' => array('VCHAR:8', ''), - 'group_display' => array('BOOL', 0), - 'group_avatar' => array('VCHAR', ''), - 'group_avatar_type' => array('TINT:2', 0), - 'group_avatar_width' => array('USINT', 0), - 'group_avatar_height' => array('USINT', 0), - 'group_rank' => array('UINT', 0), - 'group_colour' => array('VCHAR:6', ''), - 'group_sig_chars' => array('UINT', 0), - 'group_receive_pm' => array('BOOL', 0), - 'group_message_limit' => array('UINT', 0), - 'group_legend' => array('BOOL', 1), - ), - 'PRIMARY_KEY' => 'group_id', - 'KEYS' => array( - 'group_legend' => array('INDEX', 'group_legend'), - ), -); - -$schema_data['phpbb_icons'] = array( - 'COLUMNS' => array( - 'icons_id' => array('UINT', NULL, 'auto_increment'), - 'icons_url' => array('VCHAR', ''), - 'icons_width' => array('TINT:4', 0), - 'icons_height' => array('TINT:4', 0), - 'icons_order' => array('UINT', 0), - 'display_on_posting' => array('BOOL', 1), - ), - 'PRIMARY_KEY' => 'icons_id', - 'KEYS' => array( - 'display_on_posting' => array('INDEX', 'display_on_posting'), - ), -); - -$schema_data['phpbb_lang'] = array( - 'COLUMNS' => array( - 'lang_id' => array('TINT:4', NULL, 'auto_increment'), - 'lang_iso' => array('VCHAR:30', ''), - 'lang_dir' => array('VCHAR:30', ''), - 'lang_english_name' => array('VCHAR_UNI:100', ''), - 'lang_local_name' => array('VCHAR_UNI:255', ''), - 'lang_author' => array('VCHAR_UNI:255', ''), - ), - 'PRIMARY_KEY' => 'lang_id', - 'KEYS' => array( - 'lang_iso' => array('INDEX', 'lang_iso'), - ), -); - -$schema_data['phpbb_log'] = array( - 'COLUMNS' => array( - 'log_id' => array('UINT', NULL, 'auto_increment'), - 'log_type' => array('TINT:4', 0), - 'user_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), - 'reportee_id' => array('UINT', 0), - 'log_ip' => array('VCHAR:40', ''), - 'log_time' => array('TIMESTAMP', 0), - 'log_operation' => array('TEXT_UNI', ''), - 'log_data' => array('MTEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'log_id', - 'KEYS' => array( - 'log_type' => array('INDEX', 'log_type'), - 'forum_id' => array('INDEX', 'forum_id'), - 'topic_id' => array('INDEX', 'topic_id'), - 'reportee_id' => array('INDEX', 'reportee_id'), - 'user_id' => array('INDEX', 'user_id'), - ), -); - -$schema_data['phpbb_moderator_cache'] = array( - 'COLUMNS' => array( - 'forum_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'username' => array('VCHAR_UNI:255', ''), - 'group_id' => array('UINT', 0), - 'group_name' => array('VCHAR_UNI', ''), - 'display_on_index' => array('BOOL', 1), - ), - 'KEYS' => array( - 'disp_idx' => array('INDEX', 'display_on_index'), - 'forum_id' => array('INDEX', 'forum_id'), - ), -); - -$schema_data['phpbb_modules'] = array( - 'COLUMNS' => array( - 'module_id' => array('UINT', NULL, 'auto_increment'), - 'module_enabled' => array('BOOL', 1), - 'module_display' => array('BOOL', 1), - 'module_basename' => array('VCHAR', ''), - 'module_class' => array('VCHAR:10', ''), - 'parent_id' => array('UINT', 0), - 'left_id' => array('UINT', 0), - 'right_id' => array('UINT', 0), - 'module_langname' => array('VCHAR', ''), - 'module_mode' => array('VCHAR', ''), - 'module_auth' => array('VCHAR', ''), - ), - 'PRIMARY_KEY' => 'module_id', - 'KEYS' => array( - 'left_right_id' => array('INDEX', array('left_id', 'right_id')), - 'module_enabled' => array('INDEX', 'module_enabled'), - 'class_left_id' => array('INDEX', array('module_class', 'left_id')), - ), -); - -$schema_data['phpbb_poll_options'] = array( - 'COLUMNS' => array( - 'poll_option_id' => array('TINT:4', 0), - 'topic_id' => array('UINT', 0), - 'poll_option_text' => array('TEXT_UNI', ''), - 'poll_option_total' => array('UINT', 0), - ), - 'KEYS' => array( - 'poll_opt_id' => array('INDEX', 'poll_option_id'), - 'topic_id' => array('INDEX', 'topic_id'), - ), -); - -$schema_data['phpbb_poll_votes'] = array( - 'COLUMNS' => array( - 'topic_id' => array('UINT', 0), - 'poll_option_id' => array('TINT:4', 0), - 'vote_user_id' => array('UINT', 0), - 'vote_user_ip' => array('VCHAR:40', ''), - ), - 'KEYS' => array( - 'topic_id' => array('INDEX', 'topic_id'), - 'vote_user_id' => array('INDEX', 'vote_user_id'), - 'vote_user_ip' => array('INDEX', 'vote_user_ip'), - ), -); - -$schema_data['phpbb_posts'] = array( - 'COLUMNS' => array( - 'post_id' => array('UINT', NULL, 'auto_increment'), - 'topic_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'poster_id' => array('UINT', 0), - 'icon_id' => array('UINT', 0), - 'poster_ip' => array('VCHAR:40', ''), - 'post_time' => array('TIMESTAMP', 0), - 'post_approved' => array('BOOL', 1), - 'post_reported' => array('BOOL', 0), - 'enable_bbcode' => array('BOOL', 1), - 'enable_smilies' => array('BOOL', 1), - 'enable_magic_url' => array('BOOL', 1), - 'enable_sig' => array('BOOL', 1), - 'post_username' => array('VCHAR_UNI:255', ''), - 'post_subject' => array('XSTEXT_UNI', '', 'true_sort'), - 'post_text' => array('MTEXT_UNI', ''), - 'post_checksum' => array('VCHAR:32', ''), - 'post_attachment' => array('BOOL', 0), - 'bbcode_bitfield' => array('VCHAR:255', ''), - 'bbcode_uid' => array('VCHAR:8', ''), - 'post_postcount' => array('BOOL', 1), - 'post_edit_time' => array('TIMESTAMP', 0), - 'post_edit_reason' => array('STEXT_UNI', ''), - 'post_edit_user' => array('UINT', 0), - 'post_edit_count' => array('USINT', 0), - 'post_edit_locked' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'post_id', - 'KEYS' => array( - 'forum_id' => array('INDEX', 'forum_id'), - 'topic_id' => array('INDEX', 'topic_id'), - 'poster_ip' => array('INDEX', 'poster_ip'), - 'poster_id' => array('INDEX', 'poster_id'), - 'post_approved' => array('INDEX', 'post_approved'), - 'tid_post_time' => array('INDEX', array('topic_id', 'post_time')), - ), -); - -$schema_data['phpbb_privmsgs'] = array( - 'COLUMNS' => array( - 'msg_id' => array('UINT', NULL, 'auto_increment'), - 'root_level' => array('UINT', 0), - 'author_id' => array('UINT', 0), - 'icon_id' => array('UINT', 0), - 'author_ip' => array('VCHAR:40', ''), - 'message_time' => array('TIMESTAMP', 0), - 'enable_bbcode' => array('BOOL', 1), - 'enable_smilies' => array('BOOL', 1), - 'enable_magic_url' => array('BOOL', 1), - 'enable_sig' => array('BOOL', 1), - 'message_subject' => array('XSTEXT_UNI', ''), - 'message_text' => array('MTEXT_UNI', ''), - 'message_edit_reason' => array('STEXT_UNI', ''), - 'message_edit_user' => array('UINT', 0), - 'message_attachment' => array('BOOL', 0), - 'bbcode_bitfield' => array('VCHAR:255', ''), - 'bbcode_uid' => array('VCHAR:8', ''), - 'message_edit_time' => array('TIMESTAMP', 0), - 'message_edit_count' => array('USINT', 0), - 'to_address' => array('TEXT_UNI', ''), - 'bcc_address' => array('TEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'msg_id', - 'KEYS' => array( - 'author_ip' => array('INDEX', 'author_ip'), - 'message_time' => array('INDEX', 'message_time'), - 'author_id' => array('INDEX', 'author_id'), - 'root_level' => array('INDEX', 'root_level'), - ), -); - -$schema_data['phpbb_privmsgs_folder'] = array( - 'COLUMNS' => array( - 'folder_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT', 0), - 'folder_name' => array('VCHAR_UNI', ''), - 'pm_count' => array('UINT', 0), - ), - 'PRIMARY_KEY' => 'folder_id', - 'KEYS' => array( - 'user_id' => array('INDEX', 'user_id'), - ), -); - -$schema_data['phpbb_privmsgs_rules'] = array( - 'COLUMNS' => array( - 'rule_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT', 0), - 'rule_check' => array('UINT', 0), - 'rule_connection' => array('UINT', 0), - 'rule_string' => array('VCHAR_UNI', ''), - 'rule_user_id' => array('UINT', 0), - 'rule_group_id' => array('UINT', 0), - 'rule_action' => array('UINT', 0), - 'rule_folder_id' => array('INT:11', 0), - ), - 'PRIMARY_KEY' => 'rule_id', - 'KEYS' => array( - 'user_id' => array('INDEX', 'user_id'), - ), -); - -$schema_data['phpbb_privmsgs_to'] = array( - 'COLUMNS' => array( - 'msg_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'author_id' => array('UINT', 0), - 'pm_deleted' => array('BOOL', 0), - 'pm_new' => array('BOOL', 1), - 'pm_unread' => array('BOOL', 1), - 'pm_replied' => array('BOOL', 0), - 'pm_marked' => array('BOOL', 0), - 'pm_forwarded' => array('BOOL', 0), - 'folder_id' => array('INT:11', 0), - ), - 'KEYS' => array( - 'msg_id' => array('INDEX', 'msg_id'), - 'author_id' => array('INDEX', 'author_id'), - 'usr_flder_id' => array('INDEX', array('user_id', 'folder_id')), - ), -); - -$schema_data['phpbb_profile_fields'] = array( - 'COLUMNS' => array( - 'field_id' => array('UINT', NULL, 'auto_increment'), - 'field_name' => array('VCHAR_UNI', ''), - 'field_type' => array('TINT:4', 0), - 'field_ident' => array('VCHAR:20', ''), - 'field_length' => array('VCHAR:20', ''), - 'field_minlen' => array('VCHAR', ''), - 'field_maxlen' => array('VCHAR', ''), - 'field_novalue' => array('VCHAR_UNI', ''), - 'field_default_value' => array('VCHAR_UNI', ''), - 'field_validation' => array('VCHAR_UNI:20', ''), - 'field_required' => array('BOOL', 0), - 'field_show_on_reg' => array('BOOL', 0), - 'field_hide' => array('BOOL', 0), - 'field_no_view' => array('BOOL', 0), - 'field_active' => array('BOOL', 0), - 'field_order' => array('UINT', 0), - ), - 'PRIMARY_KEY' => 'field_id', - 'KEYS' => array( - 'fld_type' => array('INDEX', 'field_type'), - 'fld_ordr' => array('INDEX', 'field_order'), - ), -); - -$schema_data['phpbb_profile_fields_data'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - ), - 'PRIMARY_KEY' => 'user_id', -); - -$schema_data['phpbb_profile_fields_lang'] = array( - 'COLUMNS' => array( - 'field_id' => array('UINT', 0), - 'lang_id' => array('UINT', 0), - 'option_id' => array('UINT', 0), - 'field_type' => array('TINT:4', 0), - 'lang_value' => array('VCHAR_UNI', ''), - ), - 'PRIMARY_KEY' => array('field_id', 'lang_id', 'option_id'), -); - -$schema_data['phpbb_profile_lang'] = array( - 'COLUMNS' => array( - 'field_id' => array('UINT', 0), - 'lang_id' => array('UINT', 0), - 'lang_name' => array('VCHAR_UNI', ''), - 'lang_explain' => array('TEXT_UNI', ''), - 'lang_default_value' => array('VCHAR_UNI', ''), - ), - 'PRIMARY_KEY' => array('field_id', 'lang_id'), -); - -$schema_data['phpbb_ranks'] = array( - 'COLUMNS' => array( - 'rank_id' => array('UINT', NULL, 'auto_increment'), - 'rank_title' => array('VCHAR_UNI', ''), - 'rank_min' => array('UINT', 0), - 'rank_special' => array('BOOL', 0), - 'rank_image' => array('VCHAR', ''), - ), - 'PRIMARY_KEY' => 'rank_id', -); - -$schema_data['phpbb_reports'] = array( - 'COLUMNS' => array( - 'report_id' => array('UINT', NULL, 'auto_increment'), - 'reason_id' => array('USINT', 0), - 'post_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'user_notify' => array('BOOL', 0), - 'report_closed' => array('BOOL', 0), - 'report_time' => array('TIMESTAMP', 0), - 'report_text' => array('MTEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'report_id', -); - -$schema_data['phpbb_reports_reasons'] = array( - 'COLUMNS' => array( - 'reason_id' => array('USINT', NULL, 'auto_increment'), - 'reason_title' => array('VCHAR_UNI', ''), - 'reason_description' => array('MTEXT_UNI', ''), - 'reason_order' => array('USINT', 0), - ), - 'PRIMARY_KEY' => 'reason_id', -); - -$schema_data['phpbb_search_results'] = array( - 'COLUMNS' => array( - 'search_key' => array('VCHAR:32', ''), - 'search_time' => array('TIMESTAMP', 0), - 'search_keywords' => array('MTEXT_UNI', ''), - 'search_authors' => array('MTEXT', ''), - ), - 'PRIMARY_KEY' => 'search_key', -); - -$schema_data['phpbb_search_wordlist'] = array( - 'COLUMNS' => array( - 'word_id' => array('UINT', NULL, 'auto_increment'), - 'word_text' => array('VCHAR_UNI', ''), - 'word_common' => array('BOOL', 0), - 'word_count' => array('UINT', 0), - ), - 'PRIMARY_KEY' => 'word_id', - 'KEYS' => array( - 'wrd_txt' => array('UNIQUE', 'word_text'), - 'wrd_cnt' => array('INDEX', 'word_count'), - ), -); - -$schema_data['phpbb_search_wordmatch'] = array( - 'COLUMNS' => array( - 'post_id' => array('UINT', 0), - 'word_id' => array('UINT', 0), - 'title_match' => array('BOOL', 0), - ), - 'KEYS' => array( - 'unq_mtch' => array('UNIQUE', array('word_id', 'post_id', 'title_match')), - 'word_id' => array('INDEX', 'word_id'), - 'post_id' => array('INDEX', 'post_id'), - ), -); - -$schema_data['phpbb_sessions'] = array( - 'COLUMNS' => array( - 'session_id' => array('CHAR:32', ''), - 'session_user_id' => array('UINT', 0), - 'session_last_visit' => array('TIMESTAMP', 0), - 'session_start' => array('TIMESTAMP', 0), - 'session_time' => array('TIMESTAMP', 0), - 'session_ip' => array('VCHAR:40', ''), - 'session_browser' => array('VCHAR:150', ''), - 'session_forwarded_for' => array('VCHAR:255', ''), - 'session_page' => array('VCHAR_UNI', ''), - 'session_viewonline' => array('BOOL', 1), - 'session_autologin' => array('BOOL', 0), - 'session_admin' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'session_id', - 'KEYS' => array( - 'session_time' => array('INDEX', 'session_time'), - 'session_user_id' => array('INDEX', 'session_user_id'), - ), -); - -$schema_data['phpbb_sessions_keys'] = array( - 'COLUMNS' => array( - 'key_id' => array('CHAR:32', ''), - 'user_id' => array('UINT', 0), - 'last_ip' => array('VCHAR:40', ''), - 'last_login' => array('TIMESTAMP', 0), - ), - 'PRIMARY_KEY' => array('key_id', 'user_id'), - 'KEYS' => array( - 'last_login' => array('INDEX', 'last_login'), - ), -); - -$schema_data['phpbb_sitelist'] = array( - 'COLUMNS' => array( - 'site_id' => array('UINT', NULL, 'auto_increment'), - 'site_ip' => array('VCHAR:40', ''), - 'site_hostname' => array('VCHAR', ''), - 'ip_exclude' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'site_id', -); - -$schema_data['phpbb_smilies'] = array( - 'COLUMNS' => array( - 'smiley_id' => array('UINT', NULL, 'auto_increment'), - // We may want to set 'code' to VCHAR:50 or check if unicode support is possible... at the moment only ASCII characters are allowed. - 'code' => array('VCHAR_UNI:50', ''), - 'emotion' => array('VCHAR_UNI:50', ''), - 'smiley_url' => array('VCHAR:50', ''), - 'smiley_width' => array('USINT', 0), - 'smiley_height' => array('USINT', 0), - 'smiley_order' => array('UINT', 0), - 'display_on_posting'=> array('BOOL', 1), - ), - 'PRIMARY_KEY' => 'smiley_id', - 'KEYS' => array( - 'display_on_post' => array('INDEX', 'display_on_posting'), - ), -); - -$schema_data['phpbb_styles'] = array( - 'COLUMNS' => array( - 'style_id' => array('USINT', NULL, 'auto_increment'), - 'style_name' => array('VCHAR_UNI:255', ''), - 'style_copyright' => array('VCHAR_UNI', ''), - 'style_active' => array('BOOL', 1), - 'template_id' => array('USINT', 0), - 'theme_id' => array('USINT', 0), - 'imageset_id' => array('USINT', 0), - ), - 'PRIMARY_KEY' => 'style_id', - 'KEYS' => array( - 'style_name' => array('UNIQUE', 'style_name'), - 'template_id' => array('INDEX', 'template_id'), - 'theme_id' => array('INDEX', 'theme_id'), - 'imageset_id' => array('INDEX', 'imageset_id'), - ), -); - -$schema_data['phpbb_styles_template'] = array( - 'COLUMNS' => array( - 'template_id' => array('USINT', NULL, 'auto_increment'), - 'template_name' => array('VCHAR_UNI:255', ''), - 'template_copyright' => array('VCHAR_UNI', ''), - 'template_path' => array('VCHAR:100', ''), - 'bbcode_bitfield' => array('VCHAR:255', 'kNg='), - 'template_storedb' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'template_id', - 'KEYS' => array( - 'tmplte_nm' => array('UNIQUE', 'template_name'), - ), -); - -$schema_data['phpbb_styles_template_data'] = array( - 'COLUMNS' => array( - 'template_id' => array('USINT', 0), - 'template_filename' => array('VCHAR:100', ''), - 'template_included' => array('TEXT', ''), - 'template_mtime' => array('TIMESTAMP', 0), - 'template_data' => array('MTEXT_UNI', ''), - ), - 'KEYS' => array( - 'tid' => array('INDEX', 'template_id'), - 'tfn' => array('INDEX', 'template_filename'), - ), -); - -$schema_data['phpbb_styles_theme'] = array( - 'COLUMNS' => array( - 'theme_id' => array('USINT', NULL, 'auto_increment'), - 'theme_name' => array('VCHAR_UNI:255', ''), - 'theme_copyright' => array('VCHAR_UNI', ''), - 'theme_path' => array('VCHAR:100', ''), - 'theme_storedb' => array('BOOL', 0), - 'theme_mtime' => array('TIMESTAMP', 0), - 'theme_data' => array('MTEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'theme_id', - 'KEYS' => array( - 'theme_name' => array('UNIQUE', 'theme_name'), - ), -); - -$schema_data['phpbb_styles_imageset'] = array( - 'COLUMNS' => array( - 'imageset_id' => array('USINT', NULL, 'auto_increment'), - 'imageset_name' => array('VCHAR_UNI:255', ''), - 'imageset_copyright' => array('VCHAR_UNI', ''), - 'imageset_path' => array('VCHAR:100', ''), - ), - 'PRIMARY_KEY' => 'imageset_id', - 'KEYS' => array( - 'imgset_nm' => array('UNIQUE', 'imageset_name'), - ), -); - -$schema_data['phpbb_styles_imageset_data'] = array( - 'COLUMNS' => array( - 'image_id' => array('USINT', NULL, 'auto_increment'), - 'image_name' => array('VCHAR:200', ''), - 'image_filename' => array('VCHAR:200', ''), - 'image_lang' => array('VCHAR:30', ''), - 'image_height' => array('USINT', 0), - 'image_width' => array('USINT', 0), - 'imageset_id' => array('USINT', 0), - ), - 'PRIMARY_KEY' => 'image_id', - 'KEYS' => array( - 'i_d' => array('INDEX', 'imageset_id'), - ), -); - -$schema_data['phpbb_topics'] = array( - 'COLUMNS' => array( - 'topic_id' => array('UINT', NULL, 'auto_increment'), - 'forum_id' => array('UINT', 0), - 'icon_id' => array('UINT', 0), - 'topic_attachment' => array('BOOL', 0), - 'topic_approved' => array('BOOL', 1), - 'topic_reported' => array('BOOL', 0), - 'topic_title' => array('XSTEXT_UNI', '', 'true_sort'), - 'topic_poster' => array('UINT', 0), - 'topic_time' => array('TIMESTAMP', 0), - 'topic_time_limit' => array('TIMESTAMP', 0), - 'topic_views' => array('UINT', 0), - 'topic_replies' => array('UINT', 0), - 'topic_replies_real' => array('UINT', 0), - 'topic_status' => array('TINT:3', 0), - 'topic_type' => array('TINT:3', 0), - 'topic_first_post_id' => array('UINT', 0), - 'topic_first_poster_name' => array('VCHAR_UNI', ''), - 'topic_first_poster_colour' => array('VCHAR:6', ''), - 'topic_last_post_id' => array('UINT', 0), - 'topic_last_poster_id' => array('UINT', 0), - 'topic_last_poster_name' => array('VCHAR_UNI', ''), - 'topic_last_poster_colour' => array('VCHAR:6', ''), - 'topic_last_post_subject' => array('XSTEXT_UNI', ''), - 'topic_last_post_time' => array('TIMESTAMP', 0), - 'topic_last_view_time' => array('TIMESTAMP', 0), - 'topic_moved_id' => array('UINT', 0), - 'topic_bumped' => array('BOOL', 0), - 'topic_bumper' => array('UINT', 0), - 'poll_title' => array('STEXT_UNI', ''), - 'poll_start' => array('TIMESTAMP', 0), - 'poll_length' => array('TIMESTAMP', 0), - 'poll_max_options' => array('TINT:4', 1), - 'poll_last_vote' => array('TIMESTAMP', 0), - 'poll_vote_change' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => 'topic_id', - 'KEYS' => array( - 'forum_id' => array('INDEX', 'forum_id'), - 'forum_id_type' => array('INDEX', array('forum_id', 'topic_type')), - 'last_post_time' => array('INDEX', 'topic_last_post_time'), - 'topic_approved' => array('INDEX', 'topic_approved'), - 'forum_appr_last' => array('INDEX', array('forum_id', 'topic_approved', 'topic_last_post_id')), - 'fid_time_moved' => array('INDEX', array('forum_id', 'topic_last_post_time', 'topic_moved_id')), - ), -); - -$schema_data['phpbb_topics_track'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), - 'forum_id' => array('UINT', 0), - 'mark_time' => array('TIMESTAMP', 0), - ), - 'PRIMARY_KEY' => array('user_id', 'topic_id'), - 'KEYS' => array( - 'forum_id' => array('INDEX', 'forum_id'), - ), -); - -$schema_data['phpbb_topics_posted'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - 'topic_id' => array('UINT', 0), - 'topic_posted' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => array('user_id', 'topic_id'), -); - -$schema_data['phpbb_topics_watch'] = array( - 'COLUMNS' => array( - 'topic_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'notify_status' => array('BOOL', 0), - ), - 'KEYS' => array( - 'topic_id' => array('INDEX', 'topic_id'), - 'user_id' => array('INDEX', 'user_id'), - 'notify_stat' => array('INDEX', 'notify_status'), - ), -); - -$schema_data['phpbb_user_group'] = array( - 'COLUMNS' => array( - 'group_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'group_leader' => array('BOOL', 0), - 'user_pending' => array('BOOL', 1), - ), - 'KEYS' => array( - 'group_id' => array('INDEX', 'group_id'), - 'user_id' => array('INDEX', 'user_id'), - 'group_leader' => array('INDEX', 'group_leader'), - ), -); - -$schema_data['phpbb_users'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', NULL, 'auto_increment'), - 'user_type' => array('TINT:2', 0), - 'group_id' => array('UINT', 3), - 'user_permissions' => array('MTEXT', ''), - 'user_perm_from' => array('UINT', 0), - 'user_ip' => array('VCHAR:40', ''), - 'user_regdate' => array('TIMESTAMP', 0), - 'username' => array('VCHAR_UNI', ''), - 'username_clean' => array('VCHAR_UNI', ''), - 'user_password' => array('VCHAR_UNI:40', ''), - 'user_passchg' => array('TIMESTAMP', 0), - 'user_pass_convert' => array('BOOL', 0), - 'user_email' => array('VCHAR_UNI:100', ''), - 'user_email_hash' => array('BINT', 0), - 'user_birthday' => array('VCHAR:10', ''), - 'user_lastvisit' => array('TIMESTAMP', 0), - 'user_lastmark' => array('TIMESTAMP', 0), - 'user_lastpost_time' => array('TIMESTAMP', 0), - 'user_lastpage' => array('VCHAR_UNI:200', ''), - 'user_last_confirm_key' => array('VCHAR:10', ''), - 'user_last_search' => array('TIMESTAMP', 0), - 'user_warnings' => array('TINT:4', 0), - 'user_last_warning' => array('TIMESTAMP', 0), - 'user_login_attempts' => array('TINT:4', 0), - 'user_inactive_reason' => array('TINT:2', 0), - 'user_inactive_time' => array('TIMESTAMP', 0), - 'user_posts' => array('UINT', 0), - 'user_lang' => array('VCHAR:30', ''), - 'user_timezone' => array('DECIMAL', 0), - 'user_dst' => array('BOOL', 0), - 'user_dateformat' => array('VCHAR_UNI:30', 'd M Y H:i'), - 'user_style' => array('USINT', 0), - 'user_rank' => array('UINT', 0), - 'user_colour' => array('VCHAR:6', ''), - 'user_new_privmsg' => array('INT:4', 0), - 'user_unread_privmsg' => array('INT:4', 0), - 'user_last_privmsg' => array('TIMESTAMP', 0), - 'user_message_rules' => array('BOOL', 0), - 'user_full_folder' => array('INT:11', -3), - 'user_emailtime' => array('TIMESTAMP', 0), - 'user_topic_show_days' => array('USINT', 0), - 'user_topic_sortby_type' => array('VCHAR:1', 't'), - 'user_topic_sortby_dir' => array('VCHAR:1', 'd'), - 'user_post_show_days' => array('USINT', 0), - 'user_post_sortby_type' => array('VCHAR:1', 't'), - 'user_post_sortby_dir' => array('VCHAR:1', 'a'), - 'user_notify' => array('BOOL', 0), - 'user_notify_pm' => array('BOOL', 1), - 'user_notify_type' => array('TINT:4', 0), - 'user_allow_pm' => array('BOOL', 1), - 'user_allow_viewonline' => array('BOOL', 1), - 'user_allow_viewemail' => array('BOOL', 1), - 'user_allow_massemail' => array('BOOL', 1), - 'user_options' => array('UINT:11', 895), - 'user_avatar' => array('VCHAR', ''), - 'user_avatar_type' => array('TINT:2', 0), - 'user_avatar_width' => array('USINT', 0), - 'user_avatar_height' => array('USINT', 0), - 'user_sig' => array('MTEXT_UNI', ''), - 'user_sig_bbcode_uid' => array('VCHAR:8', ''), - 'user_sig_bbcode_bitfield' => array('VCHAR:255', ''), - 'user_from' => array('VCHAR_UNI:100', ''), - 'user_icq' => array('VCHAR:15', ''), - 'user_aim' => array('VCHAR_UNI', ''), - 'user_yim' => array('VCHAR_UNI', ''), - 'user_msnm' => array('VCHAR_UNI', ''), - 'user_jabber' => array('VCHAR_UNI', ''), - 'user_website' => array('VCHAR_UNI:200', ''), - 'user_occ' => array('TEXT_UNI', ''), - 'user_interests' => array('TEXT_UNI', ''), - 'user_actkey' => array('VCHAR:32', ''), - 'user_newpasswd' => array('VCHAR_UNI:40', ''), - 'user_form_salt' => array('VCHAR_UNI:32', ''), - - ), - 'PRIMARY_KEY' => 'user_id', - 'KEYS' => array( - 'user_birthday' => array('INDEX', 'user_birthday'), - 'user_email_hash' => array('INDEX', 'user_email_hash'), - 'user_type' => array('INDEX', 'user_type'), - 'username_clean' => array('UNIQUE', 'username_clean'), - ), -); - -$schema_data['phpbb_warnings'] = array( - 'COLUMNS' => array( - 'warning_id' => array('UINT', NULL, 'auto_increment'), - 'user_id' => array('UINT', 0), - 'post_id' => array('UINT', 0), - 'log_id' => array('UINT', 0), - 'warning_time' => array('TIMESTAMP', 0), - ), - 'PRIMARY_KEY' => 'warning_id', -); - -$schema_data['phpbb_words'] = array( - 'COLUMNS' => array( - 'word_id' => array('UINT', NULL, 'auto_increment'), - 'word' => array('VCHAR_UNI', ''), - 'replacement' => array('VCHAR_UNI', ''), - ), - 'PRIMARY_KEY' => 'word_id', -); - -$schema_data['phpbb_zebra'] = array( - 'COLUMNS' => array( - 'user_id' => array('UINT', 0), - 'zebra_id' => array('UINT', 0), - 'friend' => array('BOOL', 0), - 'foe' => array('BOOL', 0), - ), - 'PRIMARY_KEY' => array('user_id', 'zebra_id'), - 'KEYS' => array( - 'zebra_user' => array('INDEX', array('zebra_id', 'user_id')), - ), -); - -?> \ No newline at end of file diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql deleted file mode 100644 index 4b5c32de8c..0000000000 --- a/phpBB/install/schemas/schema_data.sql +++ /dev/null @@ -1,781 +0,0 @@ -# -# $Id$ -# - -# POSTGRES BEGIN # - -# -- Config -INSERT INTO phpbb_config (config_name, config_value) VALUES ('active_sessions', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_attachments', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_autologin', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_local', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_bbcode', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_birthdays', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_bookmarks', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_emailreuse', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_forum_notify', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_mass_pm', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_name_chars', 'USERNAME_CHARS_ANY'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_namechange', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_nocensors', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_pm_attach', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_post_flash', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_post_links', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_privmsg', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_bbcode', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_flash', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_img', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_links', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_pm', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_smilies', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_smilies', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_topic_notify', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('attachment_quota', '52428800'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_bbcode_pm', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_flash_pm', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_img_pm', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_method', 'db'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_smilies_pm', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_filesize', '6144'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_gallery_path', 'images/avatars/gallery'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_height', '90'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_max_width', '90'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_min_height', '20'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_min_width', '20'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_path', 'images/avatars/upload'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('avatar_salt', 'phpbb_avatar'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_contact', 'contact@yourdomain.tld'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_disable_msg', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_dst', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email', 'address@yourdomain.tld'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_form', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_email_sig', '{L_CONFIG_BOARD_EMAIL_SIG}'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_hide_emails', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('browser_check', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('bump_interval', '10'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('bump_type', 'd'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('cache_gc', '7200'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_foreground_noise', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_x_grid', '25'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_y_grid', '25'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('check_dnsbl', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('chg_passforce', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_domain', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_name', 'phpbb3'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_path', '/'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('cookie_secure', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_enable', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('database_gc', '604800'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat', 'D M d, Y g:i a'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_last_edited', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_order', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('edit_time', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_check_mx', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_enable', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_function_name', 'mail'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('email_package_size', '50'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_confirm', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_pm_icons', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_post_confirm', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval', '15'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('force_server_vars', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('form_token_lifetime', '7200'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('form_token_mintime', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('form_token_sid_guests', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('forward_pm', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('forwarded_for_check', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('full_folder_action', '2'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_mysql_max_word_len', '254'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_mysql_min_word_len', '4'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_native_common_thres', '5'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_native_load_upd', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_native_max_chars', '14'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_native_min_chars', '3'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold', '25'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('icons_path', 'images/icons'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_create_thumbnail', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_display_inlined', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_imagick', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_link_height', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_link_width', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_height', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_thumb_width', '400'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_width', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_min_thumb_filesize', '12000'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_check', '3'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_enable', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_host', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_password', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_package_size', '20'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_port', '5222'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_use_ssl', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_username', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_base_dn', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_email', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_password', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_port', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_server', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_uid', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_user', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_user_filter', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('limit_load', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('limit_search_load', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_anon_lastread', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_birthdays', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_memberlist', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewprofile', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewtopic', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_lastread', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_track', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jumpbox', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_moderators', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online_guests', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online_time', '5'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_onlinetrack', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_search', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_tplcompile', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_user_activity', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_attachments', '3'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_attachments_pm', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_autologin_time', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_filesize', '262144'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_filesize_pm', '262144'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_login_attempts', '3'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_name_chars', '20'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_pass_chars', '30'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_poll_options', '10'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_chars', '60000'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_font_size', '200'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_img_height', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_img_width', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_smilies', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_post_urls', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_quote_depth', '3'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_reg_attempts', '5'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_chars', '255'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_font_size', '200'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_img_height', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_img_width', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_smilies', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_urls', '5'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_name_chars', '3'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_pass_chars', '6'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_search_author_chars', '3'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_time_reg', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_time_terms', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('pass_complex', 'PASS_TYPE_ANY'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_edit_time', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_boxes', '4'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_msgs', '50'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page', '10'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('print_pm', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('queue_interval', '600'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('ranks_path', 'images/ranks'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('require_activation', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_block_size', '250'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_gc', '7200'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_indexing_state', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_interval', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_anonymous_interval', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_type', 'fulltext_native'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_store_results', '1800'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_deny', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_empty_referer', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_downloads', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_protocol', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_gc', '3600'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_length', '3600'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_desc', '{L_CONFIG_SITE_DESC}'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename', '{L_CONFIG_SITENAME}'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path', 'images/smilies'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_auth_method', 'PLAIN'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_password', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_port', '25'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_username', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page', '25'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); - -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('cache_last_gc', '0', 1); -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('cron_lock', '0', 1); -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('database_last_gc', '0', 1); -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('last_queue_run', '0', 1); -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('newest_user_colour', 'AA0000', 1); -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('newest_user_id', '2', 1); -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('newest_username', '', 1); -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('num_files', '0', 1); -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('num_posts', '1', 1); -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('num_topics', '1', 1); -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('num_users', '1', 1); -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('rand_seed', '0', 1); -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('rand_seed_last_update', '0', 1); -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('record_online_date', '0', 1); -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('record_online_users', '0', 1); -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('search_last_gc', '0', 1); -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('session_last_gc', '0', 1); -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('upload_dir_size', '0', 1); -INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('warnings_last_gc', '0', 1); - -# -- Forum related auth options -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_announce', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_attach', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_bbcode', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_bump', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_delete', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_download', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_edit', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_email', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_flash', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_icons', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_ignoreflood', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_img', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_list', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_noapprove', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_poll', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_post', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_postcount', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_print', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_read', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_reply', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_report', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_search', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_sigs', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_smilies', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_sticky', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_subscribe', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_user_lock', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_vote', 1); -INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_votechg', 1); - -# -- Moderator related auth options -INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_', 1, 1); -INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_approve', 1, 1); -INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_chgposter', 1, 1); -INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_delete', 1, 1); -INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_edit', 1, 1); -INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_info', 1, 1); -INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_lock', 1, 1); -INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_merge', 1, 1); -INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_move', 1, 1); -INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_report', 1, 1); -INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_split', 1, 1); - -# -- Global moderator auth option (not a local option) -INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_ban', 0, 1); -INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_warn', 0, 1); - -# -- Admin related auth options -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_aauth', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_attach', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_authgroups', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_authusers', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_backup', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_ban', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_bbcode', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_board', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_bots', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_clearlogs', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_email', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_fauth', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_forum', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_forumadd', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_forumdel', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_group', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_groupadd', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_groupdel', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_icons', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_jabber', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_language', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_mauth', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_modules', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_names', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_phpinfo', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_profile', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_prune', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_ranks', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_reasons', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_roles', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_search', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_server', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_styles', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_switchperm', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_uauth', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_user', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_userdel', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_viewauth', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_viewlogs', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_words', 1); - -# -- User related auth options -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_attach', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_chgavatar', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_chgcensors', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_chgemail', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_chggrp', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_chgname', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_chgpasswd', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_download', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_hideonline', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_ignoreflood', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_masspm', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_attach', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_bbcode', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_delete', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_download', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_edit', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_emailpm', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_flash', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_forward', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_img', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_printpm', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_smilies', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_readpm', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_savedrafts', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_search', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sendemail', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sendim', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sendpm', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sig', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_viewonline', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_viewprofile', 1); - - -# -- standard auth roles -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_ADMIN_STANDARD', 'ROLE_DESCRIPTION_ADMIN_STANDARD', 'a_', 1); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_ADMIN_FORUM', 'ROLE_DESCRIPTION_ADMIN_FORUM', 'a_', 3); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_ADMIN_USERGROUP', 'ROLE_DESCRIPTION_ADMIN_USERGROUP', 'a_', 4); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_ADMIN_FULL', 'ROLE_DESCRIPTION_ADMIN_FULL', 'a_', 2); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_USER_FULL', 'ROLE_DESCRIPTION_USER_FULL', 'u_', 3); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_USER_STANDARD', 'ROLE_DESCRIPTION_USER_STANDARD', 'u_', 1); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_USER_LIMITED', 'ROLE_DESCRIPTION_USER_LIMITED', 'u_', 2); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_USER_NOPM', 'ROLE_DESCRIPTION_USER_NOPM', 'u_', 4); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_USER_NOAVATAR', 'ROLE_DESCRIPTION_USER_NOAVATAR', 'u_', 5); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_MOD_FULL', 'ROLE_DESCRIPTION_MOD_FULL', 'm_', 3); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_MOD_STANDARD', 'ROLE_DESCRIPTION_MOD_STANDARD', 'm_', 1); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_MOD_SIMPLE', 'ROLE_DESCRIPTION_MOD_SIMPLE', 'm_', 2); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_MOD_QUEUE', 'ROLE_DESCRIPTION_MOD_QUEUE', 'm_', 4); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_FORUM_FULL', 'ROLE_DESCRIPTION_FORUM_FULL', 'f_', 7); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_FORUM_STANDARD', 'ROLE_DESCRIPTION_FORUM_STANDARD', 'f_', 5); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_FORUM_NOACCESS', 'ROLE_DESCRIPTION_FORUM_NOACCESS', 'f_', 1); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_FORUM_READONLY', 'ROLE_DESCRIPTION_FORUM_READONLY', 'f_', 2); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_FORUM_LIMITED', 'ROLE_DESCRIPTION_FORUM_LIMITED', 'f_', 3); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_FORUM_BOT', 'ROLE_DESCRIPTION_FORUM_BOT', 'f_', 9); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_FORUM_ONQUEUE', 'ROLE_DESCRIPTION_FORUM_ONQUEUE', 'f_', 8); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_FORUM_POLLS', 'ROLE_DESCRIPTION_FORUM_POLLS', 'f_', 6); -INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('ROLE_FORUM_LIMITED_POLLS', 'ROLE_DESCRIPTION_FORUM_LIMITED_POLLS', 'f_', 4); - - -# -- phpbb_styles -INSERT INTO phpbb_styles (style_name, style_copyright, style_active, template_id, theme_id, imageset_id) VALUES ('prosilver', '© phpBB Group', 1, 1, 1, 1); - -# -- phpbb_styles_imageset -INSERT INTO phpbb_styles_imageset (imageset_name, imageset_copyright, imageset_path) VALUES ('prosilver', '© phpBB Group', 'prosilver'); - -# -- phpbb_styles_imageset_data -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('site_logo', 'site_logo.gif', '', 52, 139, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_link', 'forum_link.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_read', 'forum_read.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_read_locked', 'forum_read_locked.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_read_subforum', 'forum_read_subforum.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_unread', 'forum_unread.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_unread_locked', 'forum_unread_locked.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_unread_subforum', 'forum_unread_subforum.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_moved', 'topic_moved.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read', 'topic_read.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_mine', 'topic_read_mine.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_hot', 'topic_read_hot.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_hot_mine', 'topic_read_hot_mine.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_locked', 'topic_read_locked.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_locked_mine', 'topic_read_locked_mine.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread', 'topic_unread.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_mine', 'topic_unread_mine.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_hot', 'topic_unread_hot.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_hot_mine', 'topic_unread_hot_mine.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_locked', 'topic_unread_locked.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_locked_mine', 'topic_unread_locked_mine.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read', 'sticky_read.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read_mine', 'sticky_read_mine.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read_locked', 'sticky_read_locked.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read_locked_mine', 'sticky_read_locked_mine.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread', 'sticky_unread.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread_mine', 'sticky_unread_mine.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread_locked', 'sticky_unread_locked.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread_locked_mine', 'sticky_unread_locked_mine.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read', 'announce_read.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read_mine', 'announce_read_mine.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read_locked', 'announce_read_locked.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read_locked_mine', 'announce_read_locked_mine.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread', 'announce_unread.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread_mine', 'announce_unread_mine.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread_locked', 'announce_unread_locked.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread_locked_mine', 'announce_unread_locked_mine.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read', 'announce_read.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read_mine', 'announce_read_mine.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read_locked', 'announce_read_locked.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read_locked_mine', 'announce_read_locked_mine.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread', 'announce_unread.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread_mine', 'announce_unread_mine.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread_locked', 'announce_unread_locked.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread_locked_mine', 'announce_unread_locked_mine.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('pm_read', 'topic_read.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('pm_unread', 'topic_unread.gif', '', 27, 27, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_back_top', 'icon_back_top.gif', '', 11, 11, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_aim', 'icon_contact_aim.gif', '', 20, 20, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_email', 'icon_contact_email.gif', '', 20, 20, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_icq', 'icon_contact_icq.gif', '', 20, 20, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_jabber', 'icon_contact_jabber.gif', '', 20, 20, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_msnm', 'icon_contact_msnm.gif', '', 20, 20, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_www', 'icon_contact_www.gif', '', 20, 20, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_yahoo', 'icon_contact_yahoo.gif', '', 20, 20, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_delete', 'icon_post_delete.gif', '', 20, 20, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_info', 'icon_post_info.gif', '', 20, 20, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_report', 'icon_post_report.gif', '', 20, 20, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_target', 'icon_post_target.gif', '', 9, 11, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_target_unread', 'icon_post_target_unread.gif', '', 9, 11, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_attach', 'icon_topic_attach.gif', '', 10, 7, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_latest', 'icon_topic_latest.gif', '', 9, 11, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_newest', 'icon_topic_newest.gif', '', 9, 11, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_reported', 'icon_topic_reported.gif', '', 14, 16, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_unapproved', 'icon_topic_unapproved.gif', '', 14, 16, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_warn', 'icon_user_warn.gif', '', 20, 20, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('subforum_read', 'subforum_read.gif', '', 9, 11, 1); -INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('subforum_unread', 'subforum_unread.gif', '', 9, 11, 1); - -# -- phpbb_styles_template -INSERT INTO phpbb_styles_template (template_name, template_copyright, template_path, bbcode_bitfield, template_storedb) VALUES ('prosilver', '© phpBB Group', 'prosilver', 'lNg=', 0); - -# -- phpbb_styles_theme -INSERT INTO phpbb_styles_theme (theme_name, theme_copyright, theme_path, theme_storedb, theme_data) VALUES ('prosilver', '© phpBB Group', 'prosilver', 1, ''); - -# -- Forums -INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts, forum_topics, forum_topics_real, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_poster_colour, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_days, prune_viewed, forum_parents) VALUES ('{L_FORUMS_FIRST_CATEGORY}', '', 1, 4, 0, 0, 1, 1, 1, 1, 2, 'Admin', 'AA0000', 972086460, '', '', '', '', '', '', '', 0, 0, ''); - -INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts, forum_topics, forum_topics_real, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_poster_colour, forum_last_post_subject, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_days, prune_viewed, forum_parents) VALUES ('{L_FORUMS_TEST_FORUM_TITLE}', '{L_FORUMS_TEST_FORUM_DESC}', 2, 3, 1, 1, 1, 1, 1, 1, 2, 'Admin', 'AA0000', '{L_TOPICS_TOPIC_TITLE}', 972086460, '', '', '', '', '', '', '', 0, 0, ''); - -# -- Users / Anonymous user -INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd, user_allow_massemail) VALUES (2, 1, 'Anonymous', 'anonymous', 0, '', '', 'en', 1, 0, '', 0, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 0); - -# -- username: Admin password: admin (change this or remove it once everything is working!) -INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd) VALUES (3, 5, 'Admin', 'admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', ''); - -# -- Groups -INSERT INTO phpbb_groups (group_name, group_name_clean, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('GUESTS', 'guests', 3, 0, '', 0, '', '', ''); -INSERT INTO phpbb_groups (group_name, group_name_clean, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('REGISTERED', 'registered', 3, 0, '', 0, '', '', ''); -INSERT INTO phpbb_groups (group_name, group_name_clean, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('REGISTERED_COPPA', 'registered_coppa', 3, 0, '', 0, '', '', ''); -INSERT INTO phpbb_groups (group_name, group_name_clean, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('GLOBAL_MODERATORS', 'global_moderators', 3, 0, '00AA00', 1, '', '', ''); -INSERT INTO phpbb_groups (group_name, group_name_clean, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('ADMINISTRATORS', 'administrators', 3, 1, 'AA0000', 1, '', '', ''); -INSERT INTO phpbb_groups (group_name, group_name_clean, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('BOTS', 'bots', 3, 0, '9E8DA7', 0, '', '', ''); - -# -- User -> Group -INSERT INTO phpbb_user_group (group_id, user_id, user_pending, group_leader) VALUES (1, 1, 0, 0); -INSERT INTO phpbb_user_group (group_id, user_id, user_pending, group_leader) VALUES (2, 2, 0, 0); -INSERT INTO phpbb_user_group (group_id, user_id, user_pending, group_leader) VALUES (4, 2, 0, 0); -INSERT INTO phpbb_user_group (group_id, user_id, user_pending, group_leader) VALUES (5, 2, 0, 1); - -# -- Ranks -INSERT INTO phpbb_ranks (rank_title, rank_min, rank_special, rank_image) VALUES ('{L_RANKS_SITE_ADMIN_TITLE}', 0, 1, ''); - -# -- Roles data - -# Standard Admin (a_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 1, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'a_%' AND auth_option NOT IN ('a_switchperm', 'a_jabber', 'a_phpinfo', 'a_server', 'a_backup', 'a_styles', 'a_clearlogs', 'a_modules', 'a_language', 'a_email', 'a_bots', 'a_search', 'a_aauth', 'a_roles'); - -# Forum admin (a_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 2, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'a_%' AND auth_option IN ('a_', 'a_authgroups', 'a_authusers', 'a_fauth', 'a_forum', 'a_forumadd', 'a_forumdel', 'a_mauth', 'a_prune', 'a_uauth', 'a_viewauth', 'a_viewlogs'); - -# User and Groups Admin (a_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 3, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'a_%' AND auth_option IN ('a_', 'a_authgroups', 'a_authusers', 'a_ban', 'a_group', 'a_groupadd', 'a_groupdel', 'a_ranks', 'a_uauth', 'a_user', 'a_viewauth', 'a_viewlogs'); - -# Full Admin (a_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 4, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'a_%'; - -# All Features (u_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 5, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%'; - -# Standard Features (u_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 6, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_flash', 'u_pm_forward'); - -# Limited Features (u_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 7, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_pm_flash', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim'); - -# No Private Messages (u_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 8, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_', 'u_chgavatar', 'u_chgcensors', 'u_chgemail', 'u_chgpasswd', 'u_download', 'u_hideonline', 'u_sig', 'u_viewprofile'); -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 8, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_readpm', 'u_sendpm', 'u_masspm'); - -# No Avatar (u_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_chgavatar', 'u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_pm_flash', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim'); -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_chgavatar'); - -# Full Moderator (m_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 10, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%'; - -# Standard Moderator (m_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 11, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%' AND auth_option NOT IN ('m_ban', 'm_chgposter'); - -# Simple Moderator (m_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 12, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%' AND auth_option IN ('m_', 'm_delete', 'm_edit', 'm_info', 'm_report'); - -# Queue Moderator (m_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 13, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%' AND auth_option IN ('m_', 'm_approve', 'm_edit'); - -# Full Access (f_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 14, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%'; - -# Standard Access (f_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 15, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_flash', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock'); - -# No Access (f_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 16, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option = 'f_'; - -# Read Only Access (f_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 17, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_', 'f_download', 'f_list', 'f_read', 'f_search', 'f_subscribe', 'f_print'); - -# Limited Access (f_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 18, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_attach', 'f_bump', 'f_delete', 'f_flash', 'f_icons', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock', 'f_votechg'); - -# Bot Access (f_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 19, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_', 'f_download', 'f_list', 'f_read', 'f_print'); - -# On Moderation Queue (f_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 20, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_bump', 'f_delete', 'f_flash', 'f_icons', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock', 'f_votechg', 'f_noapprove'); -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 20, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove'); - -# Standard Access + Polls (f_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 21, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_flash', 'f_ignoreflood', 'f_sticky', 'f_user_lock'); - -# Limited Access + Polls (f_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 22, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_attach', 'f_bump', 'f_delete', 'f_flash', 'f_icons', 'f_ignoreflood', 'f_sticky', 'f_user_lock', 'f_votechg'); - -# Permissions - -# GUESTS - u_download and u_search ability -INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) SELECT 1, 0, auth_option_id, 0, 1 FROM phpbb_acl_options WHERE auth_option IN ('u_', 'u_download', 'u_search'); - -# Admin user - full user features -INSERT INTO phpbb_acl_users (user_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (2, 0, 0, 5, 0); - -# ADMINISTRATOR Group - full user features -INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (5, 0, 0, 5, 0); - -# ADMINISTRATOR Group - standard admin -INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (5, 0, 0, 1, 0); - -# REGISTERED and REGISTERED_COPPA having standard user features -INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (2, 0, 0, 6, 0); -INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (3, 0, 0, 6, 0); - -# GLOBAL_MODERATORS having full user features -INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (4, 0, 0, 5, 0); - -# GLOBAL_MODERATORS having full global moderator access -INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (4, 0, 0, 10, 0); - -# Giving all groups read only access to the first category -# since administrators and moderators are already within the registered users group we do not need to set them here -INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (1, 1, 0, 17, 0); -INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (2, 1, 0, 17, 0); -INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (3, 1, 0, 17, 0); -INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (6, 1, 0, 17, 0); - -# Giving access to the first forum - -# guests having read only access -INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (1, 2, 0, 17, 0); - -# registered and registered_coppa having standard access -INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (2, 2, 0, 15, 0); -INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (3, 2, 0, 15, 0); - -# global moderators having standard access + polls -INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (4, 2, 0, 21, 0); - -# administrators having full forum and full moderator access -INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (5, 2, 0, 14, 0); -INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (5, 2, 0, 10, 0); - -# Bots having bot access -INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (6, 2, 0, 19, 0); - - -# -- Demo Topic -INSERT INTO phpbb_topics (topic_title, topic_poster, topic_time, topic_views, topic_replies, topic_replies_real, forum_id, topic_status, topic_type, topic_first_post_id, topic_first_poster_name, topic_first_poster_colour, topic_last_post_id, topic_last_poster_id, topic_last_poster_name, topic_last_poster_colour, topic_last_post_subject, topic_last_post_time, topic_last_view_time, poll_title) VALUES ('{L_TOPICS_TOPIC_TITLE}', 2, 972086460, 0, 0, 0, 2, 0, 0, 1, 'Admin', 'AA0000', 1, 2, 'Admin', 'AA0000', '{L_TOPICS_TOPIC_TITLE}', 972086460, 972086460, ''); - -# -- Demo Post -INSERT INTO phpbb_posts (topic_id, forum_id, poster_id, icon_id, post_time, post_username, poster_ip, post_subject, post_text, post_checksum, bbcode_uid) VALUES (1, 2, 2, 0, 972086460, '', '127.0.0.1', '{L_TOPICS_TOPIC_TITLE}', '{L_DEFAULT_INSTALL_POST}', '5dd683b17f641daf84c040bfefc58ce9', ''); - -# -- Admin posted to the demo topic -INSERT INTO phpbb_topics_posted (user_id, topic_id, topic_posted) VALUES (2, 1, 1); - -# -- Smilies -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':D', 'icon_e_biggrin.gif', '{L_SMILIES_VERY_HAPPY}', 15, 17, 1); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-D', 'icon_e_biggrin.gif', '{L_SMILIES_VERY_HAPPY}', 15, 17, 2); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':grin:', 'icon_e_biggrin.gif', '{L_SMILIES_VERY_HAPPY}', 15, 17, 3); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':)', 'icon_e_smile.gif', '{L_SMILIES_SMILE}', 15, 17, 4); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-)', 'icon_e_smile.gif', '{L_SMILIES_SMILE}', 15, 17, 5); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':smile:', 'icon_e_smile.gif', '{L_SMILIES_SMILE}', 15, 17, 6); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (';)', 'icon_e_wink.gif', '{L_SMILIES_WINK}', 15, 17, 7); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (';-)', 'icon_e_wink.gif', '{L_SMILIES_WINK}', 15, 17, 8); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':wink:', 'icon_e_wink.gif', '{L_SMILIES_WINK}', 15, 17, 9); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':(', 'icon_e_sad.gif', '{L_SMILIES_SAD}', 15, 17, 10); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-(', 'icon_e_sad.gif', '{L_SMILIES_SAD}', 15, 17, 11); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':sad:', 'icon_e_sad.gif', '{L_SMILIES_SAD}', 15, 17, 12); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':o', 'icon_e_surprised.gif', '{L_SMILIES_SURPRISED}', 15, 17, 13); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-o', 'icon_e_surprised.gif', '{L_SMILIES_SURPRISED}', 15, 17, 14); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':eek:', 'icon_e_surprised.gif', '{L_SMILIES_SURPRISED}', 15, 17, 15); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':shock:', 'icon_eek.gif', '{L_SMILIES_SHOCKED}', 15, 15, 16); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':?', 'icon_e_confused.gif', '{L_SMILIES_CONFUSED}', 15, 17, 17); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-?', 'icon_e_confused.gif', '{L_SMILIES_CONFUSED}', 15, 17, 18); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':???:', 'icon_e_confused.gif', '{L_SMILIES_CONFUSED}', 15, 17, 19); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES ('8-)', 'icon_cool.gif', '{L_SMILIES_COOL}', 15, 17, 20); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':cool:', 'icon_cool.gif', '{L_SMILIES_COOL}', 15, 17, 21); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':lol:', 'icon_lol.gif', '{L_SMILIES_LAUGHING}', 15, 17, 22); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':x', 'icon_mad.gif', '{L_SMILIES_MAD}', 15, 17, 23); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-x', 'icon_mad.gif', '{L_SMILIES_MAD}', 15, 17, 24); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':mad:', 'icon_mad.gif', '{L_SMILIES_MAD}', 15, 17, 25); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':P', 'icon_razz.gif', '{L_SMILIES_RAZZ}', 15, 17, 26); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-P', 'icon_razz.gif', '{L_SMILIES_RAZZ}', 15, 17, 27); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':razz:', 'icon_razz.gif', '{L_SMILIES_RAZZ}', 15, 17, 28); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':oops:', 'icon_redface.gif', '{L_SMILIES_EMARRASSED}', 15, 17, 29); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':cry:', 'icon_cry.gif', '{L_SMILIES_CRYING}', 15, 17, 30); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':evil:', 'icon_evil.gif', '{L_SMILIES_EVIL}', 15, 17, 31); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':twisted:', 'icon_twisted.gif', '{L_SMILIES_TWISTED_EVIL}', 15, 17, 32); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':roll:', 'icon_rolleyes.gif', '{L_SMILIES_ROLLING_EYES}', 15, 17, 33); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':!:', 'icon_exclaim.gif', '{L_SMILIES_EXCLAMATION}', 15, 17, 34); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':?:', 'icon_question.gif', '{L_SMILIES_QUESTION}', 15, 17, 35); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':idea:', 'icon_idea.gif', '{L_SMILIES_IDEA}', 15, 17, 36); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':arrow:', 'icon_arrow.gif', '{L_SMILIES_ARROW}', 15, 17, 37); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':|', 'icon_neutral.gif', '{L_SMILIES_NEUTRAL}', 15, 17, 38); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-|', 'icon_neutral.gif', '{L_SMILIES_NEUTRAL}', 15, 17, 39); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':mrgreen:', 'icon_mrgreen.gif', '{L_SMILIES_MR_GREEN}', 15, 17, 40); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':geek:', 'icon_e_geek.gif', '{L_SMILIES_GEEK}', 17, 17, 41); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':ugeek:', 'icon_e_ugeek.gif', '{L_SMILIES_UBER_GEEK}', 17, 18, 42); -# -- icons -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/fire.gif', 16, 16, 1, 1); -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/redface.gif', 16, 16, 9, 1); -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/mrgreen.gif', 16, 16, 10, 1); -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/heart.gif', 16, 16, 4, 1); -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/star.gif', 16, 16, 2, 1); -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/radioactive.gif', 16, 16, 3, 1); -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/thinking.gif', 16, 16, 5, 1); -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/info.gif', 16, 16, 8, 1); -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/question.gif', 16, 16, 6, 1); -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/alert.gif', 16, 16, 7, 1); - -# -- reasons -INSERT INTO phpbb_reports_reasons (reason_title, reason_description, reason_order) VALUES ('warez', '{L_REPORT_WAREZ}', 1); -INSERT INTO phpbb_reports_reasons (reason_title, reason_description, reason_order) VALUES ('spam', '{L_REPORT_SPAM}', 2); -INSERT INTO phpbb_reports_reasons (reason_title, reason_description, reason_order) VALUES ('off_topic', '{L_REPORT_OFF_TOPIC}', 3); -INSERT INTO phpbb_reports_reasons (reason_title, reason_description, reason_order) VALUES ('other', '{L_REPORT_OTHER}', 4); - -# -- extension_groups -INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('{L_EXT_GROUP_IMAGES}', 1, 1, 1, '', 0, ''); -INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('{L_EXT_GROUP_ARCHIVES}', 0, 1, 1, '', 0, ''); -INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('{L_EXT_GROUP_PLAIN_TEXT}', 0, 0, 1, '', 0, ''); -INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('{L_EXT_GROUP_DOCUMENTS}', 0, 0, 1, '', 0, ''); -INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('{L_EXT_GROUP_REAL_MEDIA}', 3, 0, 1, '', 0, ''); -INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('{L_EXT_GROUP_WINDOWS_MEDIA}', 2, 0, 1, '', 0, ''); -INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('{L_EXT_GROUP_FLASH_FILES}', 5, 0, 1, '', 0, ''); -INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('{L_EXT_GROUP_QUICKTIME_MEDIA}', 6, 0, 1, '', 0, ''); -INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('{L_EXT_GROUP_DOWNLOADABLE_FILES}', 0, 0, 1, '', 0, ''); - -# -- extensions -INSERT INTO phpbb_extensions (group_id, extension) VALUES (1, 'gif'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (1, 'png'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (1, 'jpeg'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (1, 'jpg'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (1, 'tif'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (1, 'tiff'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (1, 'tga'); - -INSERT INTO phpbb_extensions (group_id, extension) VALUES (2, 'gtar'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (2, 'gz'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (2, 'tar'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (2, 'zip'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (2, 'rar'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (2, 'ace'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (2, 'torrent'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (2, 'tgz'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (2, 'bz2'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (2, '7z'); - -INSERT INTO phpbb_extensions (group_id, extension) VALUES (3, 'txt'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (3, 'c'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (3, 'h'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (3, 'cpp'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (3, 'hpp'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (3, 'diz'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (3, 'csv'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (3, 'ini'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (3, 'log'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (3, 'js'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (3, 'xml'); - -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'xls'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'xlsx'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'xlsm'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'xlsb'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'doc'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'docx'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'docm'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'dot'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'dotx'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'dotm'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'pdf'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'ai'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'ps'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'ppt'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'pptx'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'pptm'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'odg'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'odp'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'ods'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'odt'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (4, 'rtf'); - -INSERT INTO phpbb_extensions (group_id, extension) VALUES (5, 'rm'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (5, 'ram'); - -INSERT INTO phpbb_extensions (group_id, extension) VALUES (6, 'wma'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (6, 'wmv'); - -INSERT INTO phpbb_extensions (group_id, extension) VALUES (7, 'swf'); - -INSERT INTO phpbb_extensions (group_id, extension) VALUES (8, 'mov'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (8, 'm4v'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (8, 'm4a'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (8, 'mp4'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (8, '3gp'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (8, '3g2'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (8, 'qt'); - -INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'mpeg'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'mpg'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'mp3'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogg'); -INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogm'); - -# POSTGRES COMMIT # \ No newline at end of file diff --git a/phpBB/install/update_to_latest.php b/phpBB/install/update_to_latest.php new file mode 100644 index 0000000000..19d03503c0 --- /dev/null +++ b/phpBB/install/update_to_latest.php @@ -0,0 +1,1183 @@ +sql_query($sql))) + { + $errored = true; + $error_ary['sql'][] = (is_array($sql)) ? $sql[$i] : $sql; + $error_ary['error_code'][] = $db->sql_error(); + } + + if ($echo_dot) + { + echo ". \n"; + flush(); + } + + return $result; +} + +@set_time_limit(120); + +define('IN_PHPBB', 1); +$phpbb_root_path = './../'; +include($phpbb_root_path . 'extension.inc'); +include($phpbb_root_path . 'config.'.$phpEx); +if(!isset($dbms)) +{ + die("Please read: INSTALL.html before attempting to update."); +} +include($phpbb_root_path . 'includes/constants.'.$phpEx); +include($phpbb_root_path . 'includes/functions.'.$phpEx); +include($phpbb_root_path . 'includes/functions_admin.'.$phpEx); +include($phpbb_root_path . 'includes/functions_search.'.$phpEx); +include($phpbb_root_path . 'includes/db.'.$phpEx); + + +// +// +// +$updates_to_version = '.0.23'; +// +// +// + +?> + + + + + + + + + + + + + +
    + + + + +
    Forum HomeUpdating to latest stable release
    + +
    + +

    Information

    + +Database type    :: ' . SQL_LAYER . '
    '; + +$sql = "SELECT config_value + FROM " . CONFIG_TABLE . " + WHERE config_name = 'version'"; +if (!($result = $db->sql_query($sql))) +{ + die("Couldn't obtain version info"); +} + +$row = $db->sql_fetchrow($result); + +$sql = array(); + +switch ($row['config_value']) +{ + case '': + echo 'Previous version :: < RC-3


    '; + break; + case 'RC-3': + echo 'Previous version :: RC-3


    '; + break; + case 'RC-4': + echo 'Previous version :: RC-4


    '; + break; + default: + echo 'Previous version :: 2' . $row['config_value'] . '
    '; + break; +} + +echo 'Updated version  :: 2' . $updates_to_version . '

    ' ."\n"; + +// +// Schema updates +// +switch ($row['config_value']) +{ + case '': + switch (SQL_LAYER) + { + case 'mysql': + case 'mysql4': + $sql[] = "ALTER TABLE " . USERS_TABLE . " DROP + COLUMN user_autologin_key"; + + $sql[] = "ALTER TABLE " . RANKS_TABLE . " DROP + COLUMN rank_max"; + + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ADD COLUMN user_session_time int(11) DEFAULT '0' NOT NULL, + ADD COLUMN user_session_page smallint(5) DEFAULT '0' NOT NULL, + ADD INDEX (user_session_time)"; + $sql[] = "ALTER TABLE " . SEARCH_TABLE . " + MODIFY search_id int(11) NOT NULL"; + + $sql[] = "ALTER TABLE " . TOPICS_TABLE . " + MODIFY topic_moved_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + ADD COLUMN topic_first_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + ADD INDEX (topic_first_post_id)"; + + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN tr_class1_name varchar(50) NULL, + ADD COLUMN tr_class2_name varchar(50) NULL, + ADD COLUMN tr_class3_name varchar(50) NULL, + ADD COLUMN th_class1_name varchar(50) NULL, + ADD COLUMN th_class2_name varchar(50) NULL, + ADD COLUMN th_class3_name varchar(50) NULL, + ADD COLUMN td_class1_name varchar(50) NULL, + ADD COLUMN td_class2_name varchar(50) NULL, + ADD COLUMN td_class3_name varchar(50) NULL, + ADD COLUMN span_class1_name varchar(50) NULL, + ADD COLUMN span_class2_name varchar(50) NULL, + ADD COLUMN span_class3_name varchar(50) NULL"; + break; + case 'postgresql': + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ADD COLUMN user_session_time int4"; + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ADD COLUMN user_session_page int2"; + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ALTER COLUMN user_session_time SET DEFAULT '0'"; + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ALTER COLUMN user_session_page SET DEFAULT '0'"; + $sql[] = "CREATE INDEX user_session_time_" . $table_prefix . "users_index + ON " . USERS_TABLE . " (user_session_time)"; + + $sql[] = "ALTER TABLE " . TOPICS_TABLE . " + ADD COLUMN topic_first_post_id int4"; + $sql[] = "CREATE INDEX topic_first_post_id_" . $table_prefix . "topics_index + ON " . TOPICS_TABLE . " (topic_first_post_id)"; + + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN tr_class1_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN tr_class2_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN tr_class3_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN th_class1_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN th_class2_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN th_class3_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN td_class1_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN td_class2_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN td_class3_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN span_class1_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN span_class2_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN span_class3_name varchar(50) NULL"; + break; + + case 'mssql-odbc': + case 'mssql': + $sql[] = "ALTER TABLE " . USERS_TABLE . " DROP + COLUMN user_autologin_key"; + + $sql[] = "ALTER TABLE " . USERS_TABLE . " ADD + user_session_time int NOT NULL, + user_session_page smallint NOT NULL, + CONSTRAINT [DF_" . $table_prefix . "users_user_session_time] DEFAULT (0) FOR [user_session_time], + CONSTRAINT [DF_" . $table_prefix . "users_user_session_page] DEFAULT (0) FOR [user_session_page]"; + $sql[] = "CREATE INDEX [IX_" . $table_prefix . "users] + ON [" . USERS_TABLE . "]([user_session_time]) ON [PRIMARY]"; + + /* --------------------------------------------------------------------- + DROP FORUM TABLE -- if this may cause you problems you can safely + comment it out, remember to manually remove the IDENTITY setting on + the forum_id column + --------------------------------------------------------------------- */ + $sql [] = "ALTER TABLE " . FORUMS_TABLE . " DROP + CONSTRAINT [DF_" . $table_prefix . "forums_forum_posts], + CONSTRAINT [DF_" . $table_prefix . "forums_forum_topics], + CONSTRAINT [DF_" . $table_prefix . "forums_forum_last_post_id], + CONSTRAINT [DF_" . $table_prefix . "forums_prune_enable], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_view], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_read], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_post], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_reply], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_edit], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_delete], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_sticky], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_announce], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_vote], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_pollcreate], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_attachments]"; + $sql[] = "CREATE TABLE Tmp_" . FORUMS_TABLE . " + (forum_id int NOT NULL, cat_id int NOT NULL, forum_name varchar(100) NOT NULL, forum_desc varchar(255) NULL, forum_status smallint NOT NULL, forum_order int NOT NULL, forum_posts int NOT NULL, forum_topics smallint NOT NULL, forum_last_post_id int NOT NULL, prune_next int NULL, prune_enable smallint NOT NULL, auth_view smallint NOT NULL, auth_read smallint NOT NULL, auth_post smallint NOT NULL, auth_reply smallint NOT NULL, auth_edit smallint NOT NULL, auth_delete smallint NOT NULL, auth_sticky smallint NOT NULL, auth_announce smallint NOT NULL, auth_vote smallint NOT NULL, auth_pollcreate smallint NOT NULL, auth_attachments smallint NOT NULL) ON [PRIMARY]"; + $sql[] = "ALTER TABLE [Tmp_" . FORUMS_TABLE . "] WITH NOCHECK ADD + CONSTRAINT [DF_" . $table_prefix . "forums_forum_posts] DEFAULT (0) FOR [forum_posts], + CONSTRAINT [DF_" . $table_prefix . "forums_forum_topics] DEFAULT (0) FOR [forum_topics], + CONSTRAINT [DF_" . $table_prefix . "forums_forum_last_post_id] DEFAULT (0) FOR [forum_last_post_id], + CONSTRAINT [DF_" . $table_prefix . "forums_prune_enable] DEFAULT (0) FOR [prune_enable], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_view] DEFAULT (0) FOR [auth_view], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_read] DEFAULT (0) FOR [auth_read], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_post] DEFAULT (0) FOR [auth_post], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_reply] DEFAULT (0) FOR [auth_reply], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_edit] DEFAULT (0) FOR [auth_edit], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_delete] DEFAULT (0) FOR [auth_delete], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_sticky] DEFAULT (0) FOR [auth_sticky], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_announce] DEFAULT (0) FOR [auth_announce], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_vote] DEFAULT (0) FOR [auth_vote], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_pollcreate] DEFAULT (0) FOR [auth_pollcreate], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_attachments] DEFAULT (0) FOR [auth_attachments]"; + $sql[] = "INSERT INTO Tmp_" . FORUMS_TABLE . " (forum_id, cat_id, forum_name, forum_desc, forum_status, forum_order, forum_posts, forum_topics, forum_last_post_id, prune_next, prune_enable, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_sticky, auth_announce, auth_vote, auth_pollcreate, auth_attachments) + SELECT forum_id, cat_id, forum_name, forum_desc, forum_status, forum_order, forum_posts, forum_topics, forum_last_post_id, prune_next, prune_enable, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_sticky, auth_announce, auth_vote, auth_pollcreate, auth_attachments FROM " . FORUMS_TABLE . " TABLOCKX"; + $sql[] = "DROP TABLE " . FORUMS_TABLE; + $sql[] = "EXECUTE sp_rename N'Tmp_" . FORUMS_TABLE . "', N'" . FORUMS_TABLE . "', 'OBJECT'"; + $sql[] = "ALTER TABLE " . FORUMS_TABLE . " ADD + CONSTRAINT [PK_" . $table_prefix . "forums] PRIMARY KEY CLUSTERED (forum_id) ON [PRIMARY]"; + $sql[] = "CREATE NONCLUSTERED INDEX [IX_" . $table_prefix . "forums] + ON " . FORUMS_TABLE . " (cat_id, forum_order, forum_last_post_id) ON [PRIMARY]"; + /* -------------------------------------------------------------- + END OF DROP FORUM -- don't remove anything after this point! + -------------------------------------------------------------- */ + + $sql[] = "DROP INDEX " . RANKS_TABLE . ".IX_" . $table_prefix . "ranks"; + $sql[] = "ALTER TABLE " . RANKS_TABLE . " DROP + COLUMN rank_max"; + $sql[] = "CREATE INDEX [IX_" . $table_prefix . "ranks] + ON [" . RANKS_TABLE . "]([rank_min], [rank_special]) ON [PRIMARY]"; + + $sql[] = "DROP INDEX " . TOPICS_TABLE . ".IX_" . $table_prefix . "topics"; + $sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD + topic_first_post_id int NULL, + CONSTRAINT [DF_" . $table_prefix . "topics_topic_first_post_id] FOR [topic_first_post_id]"; + $sql[] = "CREATE INDEX [IX_" . $table_prefix . "topics] + ON [" . TOPICS_TABLE . "]([forum_id], [topic_type], [topic_first_post_id], [topic_last_post_id]) ON [PRIMARY]"; + + $sql[] = "ALTER TABLE " . SEARCH_WORD_TABLE . " DROP + CONSTRAINT [PK_" . $table_prefix . "search_wordlist]"; + $sql[] = "CREATE UNIQUE INDEX [IX_" . $table_prefix . "search_wordlist] + ON [" . SEARCH_WORD_TABLE . "]([word_text]) WITH IGNORE_DUP_KEY ON [PRIMARY]"; + $sql[] = "CREATE INDEX [IX_" . $table_prefix . "search_wordlist_1] + ON [" . SEARCH_WORD_TABLE . "]([word_common]) ON [PRIMARY]"; + + $sql[] = "CREATE INDEX [IX_" . $table_prefix . "search_wordmatch_1] + ON [" . SEARCH_MATCH_TABLE . "]([word_id]) ON [PRIMARY]"; + + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " ADD + tr_class1_name varchar(50) NULL, + tr_class2_name varchar(50) NULL, + tr_class3_name varchar(50) NULL, + th_class1_name varchar(50) NULL, + th_class2_name varchar(50) NULL, + th_class3_name varchar(50) NULL, + td_class1_name varchar(50) NULL, + td_class2_name varchar(50) NULL, + td_class3_name varchar(50) NULL, + span_class1_name varchar(50) NULL, + span_class2_name varchar(50) NULL, + span_class3_name varchar(50) NULL"; + break; + + case 'msaccess': + $sql[] = "ALTER TABLE " . USERS_TABLE . " DROP + COLUMN user_autologin_key"; + + $sql[] = "ALTER TABLE " . USERS_TABLE . " ADD + user_session_time int NOT NULL, + user_session_page smallint NOT NULL"; + $sql[] = "CREATE INDEX user_session_time + ON " . USERS_TABLE . " (user_session_time)"; + + $sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD + topic_first_post_id int NULL"; + $sql[] = "CREATE INDEX topic_first_post_id + ON " . TOPICS_TABLE . " (topic_first_post_id)"; + + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " ADD + tr_class1_name varchar(50) NULL, + tr_class2_name varchar(50) NULL, + tr_class3_name varchar(50) NULL, + th_class1_name varchar(50) NULL, + th_class2_name varchar(50) NULL, + th_class3_name varchar(50) NULL, + td_class1_name varchar(50) NULL, + td_class2_name varchar(50) NULL, + td_class3_name varchar(50) NULL, + span_class1_name varchar(50) NULL, + span_class2_name varchar(50) NULL, + span_class3_name varchar(50) NULL"; + break; + + default: + die("No DB LAYER found!"); + break; + } + + case 'RC-3': + case 'RC-4': + case '.0.0': + switch (SQL_LAYER) + { + case 'mysql': + case 'mysql4': + $sql[] = "ALTER TABLE " . USERS_TABLE . " + MODIFY COLUMN user_id mediumint(8) NOT NULL, + MODIFY COLUMN user_timezone decimal(5,2) DEFAULT '0' NOT NULL"; + break; + case 'postgresql': + $sql[] = "ALTER TABLE " . USERS_TABLE . " + RENAME COLUMN user_timezone TO user_timezone_old"; + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ADD COLUMN user_timezone decimal(5)"; + break; + case 'mssql': + case 'mssql-odbc': + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ALTER COLUMN [user_timezone] [decimal] (5,2) NOT NULL"; + break; + } + + case '.0.1': + switch (SQL_LAYER) + { + case 'mysql': + case 'mysql4': + $sql[] = "ALTER TABLE " . GROUPS_TABLE . " + MODIFY COLUMN group_id mediumint(8) NOT NULL auto_increment"; + break; + case 'mssql': + case 'mssql-odbc': + /* --------------------------------------------------------------------- + DROP GROUP TABLE -- if this may cause you problems you can safely + comment it out, remember to manually add the IDENTITY setting on + the group_id column + --------------------------------------------------------------------- */ + $sql[] = "CREATE TABLE Tmp_" . GROUPS_TABLE . " + (group_id int IDENTITY (1, 1) NOT NULL, group_type smallint NULL, group_name varchar(50) NOT NULL, group_description varchar(255) NOT NULL, group_moderator int NULL, group_single_user smallint NOT NULL) ON [PRIMARY]"; + $sql[] = "SET IDENTITY_INSERT " . GROUPS_TABLE . " ON"; + $sql[] = "INSERT INTO Tmp_" . GROUPS_TABLE . " (group_id, group_type, group_name, group_description, group_moderator, group_single_user) + SELECT group_id, group_type, group_name, group_description, group_moderator, group_single_user FROM " . GROUPS_TABLE . " TABLOCKX"; + $sql[] = "SET IDENTITY_INSERT " . GROUPS_TABLE . " OFF"; + $sql[] = "DROP TABLE " . GROUPS_TABLE; + $sql[] = "EXECUTE sp_rename N'Tmp_" . GROUPS_TABLE . "', N'" . GROUPS_TABLE . "', 'OBJECT'"; + $sql[] = "ALTER TABLE " . GROUPS_TABLE . " ADD + CONSTRAINT [PK_" . $table_prefix . "groups] PRIMARY KEY CLUSTERED (group_id) ON [PRIMARY]"; + $sql[] = "CREATE INDEX [IX_" . $table_prefix . "groups] + ON " . GROUPS_TABLE . " (group_single_user) ON [PRIMARY]"; + /* -------------------------------------------------------------- + END OF DROP GROUP -- don't remove anything after this point! + -------------------------------------------------------------- */ + break; + + } + + case '.0.2': + + case '.0.3': + + switch (SQL_LAYER) + { + case 'mysql': + case 'mysql4': + // Add indexes to post_id in search match table (+ word_id for MS Access) + $sql[] = "ALTER TABLE " . SEARCH_MATCH_TABLE . " + ADD INDEX post_id (post_id)"; + + // Modify user_timezone to decimal(5,2) for mysql ... mysql4/mssql/pgsql/msaccess + // should be completely unaffected + // Change default user_notify to 0 + $sql[] = "ALTER TABLE " . USERS_TABLE . " + MODIFY COLUMN user_timezone decimal(5,2) DEFAULT '0' NOT NULL, + MODIFY COLUMN user_notify tinyint(1) DEFAULT '0' NOT NULL"; + + // Adjust field type for prune_days, prune_freq ... was too small + $sql[] = "ALTER TABLE " . PRUNE_TABLE . " + MODIFY COLUMN prune_days smallint(5) UNSIGNED NOT NULL, + MODIFY COLUMN prune_freq smallint(5) UNSIGNED NOT NULL"; + break; + + case 'msaccess': + // Add indexes to post_id in search match table (+ word_id for MS Access) + $sql[] = "CREATE INDEX " . SEARCH_MATCH_TABLE . " + ON " . SEARCH_MATCH_TABLE . " ([post_id])"; + $sql[] = "CREATE INDEX " . SEARCH_MATCH_TABLE . "_1 + ON " . SEARCH_MATCH_TABLE . " ([word_id])"; + break; + + case 'postgresql': + // Add indexes to post_id in search match table (+ word_id for MS Access) + $sql[] = "CREATE INDEX post_id_" . SEARCH_MATCH_TABLE . " + ON " . SEARCH_MATCH_TABLE . " (post_id)"; + + // Regenerate groups table with incremented group_id for pgsql + // ... missing in 2.0.3 ... + $sql[] = "CREATE SEQUENCE " . GROUPS_TABLE . "_id_seq start 3 increment 1 maxvalue 2147483647 minvalue 1 cache 1"; + $sql[] = "CREATE TABLE tmp_" . GROUPS_TABLE . " + AS SELECT group_id, group_name, group_type, group_description, group_moderator, group_single_user + FROM " . GROUPS_TABLE; + $sql[] = "DROP TABLE " . GROUPS_TABLE; + $sql[] = "CREATE TABLE {$table_prefix}groups (group_id int DEFAULT nextval('" . GROUPS_TABLE . "_id_seq'::text) NOT NULL, group_name varchar(40) NOT NULL, group_type int2 DEFAULT '1' NOT NULL, group_description varchar(255) NOT NULL, group_moderator int4 DEFAULT '0' NOT NULL, group_single_user int2 DEFAULT '0' NOT NULL, CONSTRAINT {$table_prefix}groups_pkey PRIMARY KEY (group_id))"; + $sql[] = "INSERT INTO " . GROUPS_TABLE . " (group_id, group_name, group_type, group_description, group_moderator, group_single_user) + SELECT group_id, group_name, group_type, group_description, group_moderator, group_single_user + FROM tmp_" . GROUPS_TABLE; + $sql[] = "DROP TABLE tmp_" . GROUPS_TABLE; + break; + } + + case '.0.4': + + switch (SQL_LAYER) + { + case 'mssql': + case 'mssql-odbc': + // Add missing defaults to MSSQL post table schema, failed in previous updates + $sql[] = "ALTER TABLE [" . POSTS_TABLE . "] WITH NOCHECK ADD + CONSTRAINT [DF_" . POSTS_TABLE . "_enable_bbcode] DEFAULT (1) FOR [enable_bbcode], + CONSTRAINT [DF_" . POSTS_TABLE . "_enable_html] DEFAULT (0) FOR [enable_html], + CONSTRAINT [DF_" . POSTS_TABLE . "_enable_smilies] DEFAULT (1) FOR [enable_smilies], + CONSTRAINT [DF_" . POSTS_TABLE . "_enable_sig] DEFAULT (1) FOR [enable_sig], + CONSTRAINT [DF_" . POSTS_TABLE . "_post_edit_count] DEFAULT (0) FOR [post_edit_count]"; + break; + } + + // Add tables for visual confirmation ... saves me the trouble of writing a seperate + // script :D + switch (SQL_LAYER) + { + case 'mysql': + case 'mysql4': + $sql[] = 'CREATE TABLE ' . $table_prefix . 'confirm (confirm_id char(32) DEFAULT \'\' NOT NULL, session_id char(32) DEFAULT \'\' NOT NULL, code char(6) DEFAULT \'\' NOT NULL, PRIMARY KEY (session_id, confirm_id))'; + break; + + case 'mssql': + case 'mssql-odbc': + $sql[] = 'CREATE TABLE [' . $table_prefix . 'confirm] ([confirm_id] [char] (32) NOT NULL , [session_id] [char] (32) NOT NULL , [code] [char] (6) NOT NULL ) ON [PRIMARY]'; + $sql[] = 'ALTER TABLE [' . $table_prefix . 'confirm] WITH NOCHECK ADD CONSTRAINT [PK_' . $table_prefix . 'confirm] PRIMARY KEY CLUSTERED ( [session_id],[confirm_id]) ON [PRIMARY]'; + $sql[] = 'ALTER TABLE [' . $table_prefix . 'confirm] WITH NOCHECK ADD CONSTRAINT [DF_' . $table_prefix . 'confirm_confirm_id] DEFAULT (\'\') FOR [confirm_id], CONSTRAINT [DF_' . $table_prefix . 'confirm_session_id] DEFAULT (\'\') FOR [session_id], CONSTRAINT [DF_' . $table_prefix . 'confirm_code] DEFAULT (\'\') FOR [code]'; + break; + + case 'msaccess': + $sql[] = 'CREATE TABLE ' . $table_prefix . 'confirm (confirm_id char(32) NOT NULL, session_id char(32) NOT NULL, code char(6) NOT NULL)'; + $sql[] = 'ALTER TABLE ' . $table_prefix . 'confirm ADD (PRIMARY KEY (session_id, confirm_id))'; + break; + + case 'postgresql': + $sql[] = 'CREATE TABLE ' . $table_prefix . 'confirm (confirm_id char(32) DEFAULT \'\' NOT NULL, session_id char(32) DEFAULT \'\' NOT NULL, code char(6) DEFAULT \'\' NOT NULL, CONSTRAINT {$table_prefix}confirm_pkey PRIMARY KEY (session_id, confirm_id))'; + break; + } + + case '.0.5': + case '.0.6': + case '.0.7': + case '.0.8': + case '.0.9': + case '.0.10': + case '.0.11': + case '.0.12': + case '.0.13': + case '.0.14': + + switch (SQL_LAYER) + { + case 'mysql': + case 'mysql4': + $sql[] = "ALTER TABLE " . SESSIONS_TABLE . " + ADD COLUMN session_admin tinyint(2) DEFAULT '0' NOT NULL"; + break; + + case 'postgresql': + $sql[] = "ALTER TABLE " . SESSIONS_TABLE . " + ADD COLUMN session_admin int2"; + $sql[] = "ALTER TABLE " . SESSIONS_TABLE . " + ALTER COLUMN session_admin SET DEFAULT '0'"; + break; + + case 'mssql-odbc': + case 'mssql': + $sql[] = "ALTER TABLE " . SESSIONS_TABLE . " ADD + session_admin smallint NOT NULL, + CONSTRAINT [DF_" . $table_prefix . "sessions_session_admin] DEFAULT (0) FOR [session_admin]"; + break; + + case 'msaccess': + $sql[] = "ALTER TABLE " . SESSIONS_TABLE . " ADD + session_admin smallint NOT NULL"; + break; + } + + case '.0.15': + case '.0.16': + case '.0.17': + // Add tables for session keys + switch (SQL_LAYER) + { + case 'mysql': + case 'mysql4': + $sql[] = 'CREATE TABLE ' . $table_prefix . 'sessions_keys (key_id varchar(32) DEFAULT \'0\' NOT NULL, user_id mediumint(8) DEFAULT \'0\' NOT NULL, last_ip varchar(8) DEFAULT \'0\' NOT NULL, last_login int(11) DEFAULT \'0\' NOT NULL, PRIMARY KEY (key_id, user_id), KEY last_login (last_login))'; + break; + + case 'mssql': + case 'mssql-odbc': + $sql[] = 'CREATE TABLE [' . $table_prefix . 'sessions_keys] ([key_id] [char] (32) NOT NULL , [user_id] [int] NOT NULL , [last_ip] [char] (8) NOT NULL , [last_login] [int] NOT NULL) ON [PRIMARY]'; + + $sql[] = 'CREATE INDEX [IX_' . $table_prefix . 'sessions_keys] ON [' . $table_prefix . 'sessions_keys]([key_id], [user_id]) ON [PRIMARY]'; + $sql[] = 'CREATE INDEX [IX_' . $table_prefix . 'sessions_keys_1] ON [' . $table_prefix . 'sessions_keys]([last_login]) ON [PRIMARY]'; + break; + + case 'msaccess': + $sql[] = 'CREATE TABLE ' . $table_prefix . 'sessions_keys (key_id char(32) NOT NULL, user_id int NOT NULL, last_ip char(8) NOT NULL, last_login int NOT NULL)'; + $sql[] = 'ALTER TABLE ' . $table_prefix . 'sessions_keys ADD PRIMARY KEY (key_id, user_id)'; + break; + + case 'postgresql': + $sql[] = 'CREATE TABLE ' . $table_prefix . 'sessions_keys (key_id char(32) DEFAULT \'0\' NOT NULL, user_id int4 DEFAULT \'0\' NOT NULL, last_ip char(8) DEFAULT \'0\' NOT NULL, last_login int4 DEFAULT \'0\' NOT NULL, CONSTRAINT ' . $table_prefix . 'sessions_keys_pkey PRIMARY KEY (key_id, user_id))'; + $sql[] = 'CREATE INDEX last_login_' . $table_prefix . 'sessions_keys_index ON ' . $table_prefix . 'sessions_keys (last_login)'; + break; + } + + case '.0.18': + + // Add login columns to user table + switch (SQL_LAYER) + { + case 'mysql': + case 'mysql4': + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ADD COLUMN user_login_tries smallint(5) UNSIGNED DEFAULT '0' NOT NULL"; + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ADD COLUMN user_last_login_try int(11) DEFAULT '0' NOT NULL"; + break; + + case 'postgresql': + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ADD COLUMN user_login_tries int2"; + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ALTER COLUMN user_login_tries SET DEFAULT '0'"; + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ADD COLUMN user_last_login_try int4"; + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ALTER COLUMN user_last_login_try SET DEFAULT '0'"; + break; + + case 'mssql-odbc': + case 'mssql': + $sql[] = "ALTER TABLE " . USERS_TABLE . " ADD + user_login_tries smallint NOT NULL, + CONSTRAINT [DF_" . $table_prefix . "users_user_login_tries] DEFAULT (0) FOR [user_login_tries]"; + $sql[] = "ALTER TABLE " . USERS_TABLE . " ADD + user_last_login_try int NOT NULL, + CONSTRAINT [DF_" . $table_prefix . "users_user_last_login_try] DEFAULT (0) FOR [user_last_login_try]"; + break; + + case 'msaccess': + $sql[] = "ALTER TABLE " . USERS_TABLE . " ADD + user_login_tries smallint NOT NULL"; + $sql[] = "ALTER TABLE " . USERS_TABLE . " ADD + user_last_login_try int NOT NULL"; + break; + } + + case '.0.19': + + // Add search time to the search table + switch (SQL_LAYER) + { + case 'mysql': + case 'mysql4': + $sql[] = "ALTER TABLE " . SEARCH_TABLE . " + ADD COLUMN search_time int(11) DEFAULT '0' NOT NULL"; + break; + + case 'postgresql': + $sql[] = "ALTER TABLE " . SEARCH_TABLE . " + ADD COLUMN search_time int4"; + $sql[] = "ALTER TABLE " . SEARCH_TABLE . " + ALTER COLUMN search_time SET DEFAULT '0'"; + break; + + case 'mssql-odbc': + case 'mssql': + $sql[] = "ALTER TABLE " . SEARCH_TABLE . " ADD + search_time int NOT NULL, + CONSTRAINT [DF_" . $table_prefix . "search_results_search_time] DEFAULT (0) FOR [search_time]"; + break; + + case 'msaccess': + $sql[] = "ALTER TABLE " . SEARCH_TABLE . " ADD + search_time int NOT NULL"; + break; + } + + break; + + case '.0.21': + + // MySQL only change + switch (SQL_LAYER) + { + case 'mysql': + case 'mysql4': + $sql[] = 'ALTER TABLE ' . SEARCH_TABLE . ' + MODIFY COLUMN search_array MEDIUMTEXT NOT NULL'; + } + + break; +} + +echo "

    Updating database schema

    \n"; +echo "

    Progress :: "; +flush(); + +$error_ary = array(); +$errored = false; +if (count($sql)) +{ + for ($i = 0; $i < count($sql); $i++) + { + _sql($sql[$i], $errored, $error_ary); + } + + echo " Done
    Result   :: \n"; + + if ($errored) + { + echo " Some queries failed, the statements and errors are listing below\n

      "; + + for ($i = 0; $i < count($error_ary['sql']); $i++) + { + echo "
    • Error :: " . $error_ary['error_code'][$i]['message'] . "
      "; + echo "SQL   :: " . $error_ary['sql'][$i] . "

    • "; + } + + echo "
    \n

    This is probably nothing to worry about, update will continue. Should this fail to complete you may need to seek help at our development board. See README for details on how to obtain advice.

    \n"; + } + else + { + echo "No errors\n"; + } +} +else +{ + echo " No updates required

    \n"; +} + +// +// Data updates +// +unset($sql); +$error_ary = array(); +$errored = false; + +echo "

    Updating data

    \n"; +echo "

    Progress :: "; +flush(); + +switch ($row['config_value']) +{ + case '': + $sql = "SELECT themes_id + FROM " . THEMES_TABLE . " + WHERE template_name = 'subSilver'"; + $result = _sql($sql, $errored, $error_ary); + + if ($row = $db->sql_fetchrow($result)) + { + $theme_id = $row['themes_id']; + + $sql = "UPDATE " . THEMES_TABLE . " + SET head_stylesheet = 'subSilver.css', body_background = '', body_bgcolor = 'E5E5E5', body_text = '000000', body_link = '006699', body_vlink = '5493B4', body_alink = '', body_hlink = 'DD6900', tr_color1 = 'EFEFEF', tr_color2 = 'DEE3E7', tr_color3 = 'D1D7DC', tr_class1 = '', tr_class2 = '', tr_class3 = '', th_color1 = '98AAB1', th_color2 = '006699', th_color3 = 'FFFFFF', th_class1 = 'cellpic1.gif', th_class2 = 'cellpic3.gif', th_class3 = 'cellpic2.jpg', td_color1 = 'FAFAFA', td_color2 = 'FFFFFF', td_color3 = '', td_class1 = 'row1', td_class2 = 'row2', td_class3 = '', fontface1 = 'Verdana, Arial, Helvetica, sans-serif', fontface2 = 'Trebuchet MS', fontface3 = 'Courier, ''Courier New'', sans-serif', fontsize1 = 10, fontsize2 = 11, fontsize3 = 12, fontcolor1 = '444444', fontcolor2 = '006600', fontcolor3 = 'FFA34F', span_class1 = '', span_class2 = '', span_class3 = '' + WHERE themes_id = $theme_id"; + _sql($sql, $errored, $error_ary); + + $sql = "DELETE FROM " . THEMES_NAME_TABLE . " + WHERE themes_id = $theme_id"; + _sql($sql, $errored, $error_ary); + + $sql = "INSERT INTO " . THEMES_NAME_TABLE . " (themes_id, tr_color1_name, tr_color2_name, tr_color3_name, tr_class1_name, tr_class2_name, tr_class3_name, th_color1_name, th_color2_name, th_color3_name, th_class1_name, th_class2_name, th_class3_name, td_color1_name, td_color2_name, td_color3_name, td_class1_name, td_class2_name, td_class3_name, fontface1_name, fontface2_name, fontface3_name, fontsize1_name, fontsize2_name, fontsize3_name, fontcolor1_name, fontcolor2_name, fontcolor3_name, span_class1_name, span_class2_name, span_class3_name) + VALUES ($theme_id, 'The lightest row colour', 'The medium row color', 'The darkest row colour', '', '', '', 'Border round the whole page', 'Outer table border', 'Inner table border', 'Silver gradient picture', 'Blue gradient picture', 'Fade-out gradient on index', 'Background for quote boxes', 'All white areas', '', 'Background for topic posts', '2nd background for topic posts', '', 'Main fonts', 'Additional topic title font', 'Form fonts', 'Smallest font size', 'Medium font size', 'Normal font size (post body etc)', 'Quote & copyright text', 'Code text colour', 'Main table header text colour', '', '', '')"; + _sql($sql, $errored, $error_ary); + } + $db->sql_freeresult($result); + + $sql = "SELECT MIN(post_id) AS first_post_id, topic_id + FROM " . POSTS_TABLE . " + GROUP BY topic_id + ORDER BY topic_id ASC"; + $result = _sql($sql, $errored, $error_ary); + + if ($row = $db->sql_fetchrow($result)) + { + do + { + $sql = "UPDATE " . TOPICS_TABLE . " + SET topic_first_post_id = " . $row['first_post_id'] . " + WHERE topic_id = " . $row['topic_id']; + _sql($sql, $errored, $error_ary); + } + while ($row = $db->sql_fetchrow($result)); + } + $db->sql_freeresult($result); + + $sql = "SELECT DISTINCT u.user_id + FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug, " . AUTH_ACCESS_TABLE . " aa + WHERE aa.auth_mod = 1 + AND ug.group_id = aa.group_id + AND u.user_id = ug.user_id + AND u.user_level <> " . ADMIN; + $result = _sql($sql, $errored, $error_ary); + + $mod_user = array(); + while ($row = $db->sql_fetchrow($result)) + { + $mod_user[] = $row['user_id']; + } + $db->sql_freeresult($result); + + if (count($mod_user)) + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_level = " . MOD . " + WHERE user_id IN (" . implode(', ', $mod_user) . ")"; + _sql($sql, $errored, $error_ary); + } + + $sql = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value) + VALUES ('server_name', 'www.myserver.tld')"; + _sql($sql, $errored, $error_ary); + + $sql = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value) + VALUES ('script_path', '/phpBB2/')"; + _sql($sql, $errored, $error_ary); + + $sql = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value) + VALUES ('server_port', '80')"; + _sql($sql, $errored, $error_ary); + + $sql = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value) + VALUES ('record_online_users', '1')"; + _sql($sql, $errored, $error_ary); + + $sql = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value) + VALUES ('record_online_date', '" . time() . "')"; + _sql($sql, $errored, $error_ary); + + case 'RC-3': + case 'RC-4': + case '.0.0': + case '.0.1': + if (SQL_LAYER == 'postgresql') + { + $sql = "SELECT user_id, user_timezone_old + FROM " . USERS_TABLE; + $result = _sql($sql, $errored, $error_ary); + + while ($row = $db->sql_fetchrow($result)) + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_timezone = " . $row['user_timezone_old'] . " + WHERE user_id = " . $row['user_id']; + _sql($sql, $errored, $error_ary); + } + $db->sql_freeresult($result); + } + + $sql = "SELECT topic_id, topic_moved_id + FROM " . TOPICS_TABLE . " + WHERE topic_moved_id <> 0 + AND topic_status = " . TOPIC_MOVED; + $result = _sql($sql, $errored, $error_ary); + + $topic_ary = array(); + while ($row = $db->sql_fetchrow($result)) + { + $topic_ary[$row['topic_id']] = $row['topic_moved_id']; + } + $db->sql_freeresult($result); + + while (list($topic_id, $topic_moved_id) = each($topic_ary)) + { + $sql = "SELECT MAX(post_id) AS last_post, MIN(post_id) AS first_post, COUNT(post_id) AS total_posts + FROM " . POSTS_TABLE . " + WHERE topic_id = $topic_moved_id"; + $result = _sql($sql, $errored, $error_ary); + + $sql = ($row = $db->sql_fetchrow($result)) ? "UPDATE " . TOPICS_TABLE . " SET topic_replies = " . ($row['total_posts'] - 1) . ", topic_first_post_id = " . $row['first_post'] . ", topic_last_post_id = " . $row['last_post'] . " WHERE topic_id = $topic_id" : "DELETE FROM " . TOPICS_TABLE . " WHERE topic_id = " . $row['topic_id']; + _sql($sql, $errored, $error_ary); + } + + unset($sql); + + sync('all forums'); + + case '.0.2': + + case '.0.3': + + // Topics will resync automatically + + // Remove stop words from search match and search words + $dirname = 'language'; + $dir = opendir($phpbb_root_path . $dirname); + + while ($file = readdir($dir)) + { + if (preg_match("#^lang_#i", $file) && !is_file($phpbb_root_path . $dirname . "/" . $file) && !is_link($phpbb_root_path . $dirname . "/" . $file) && file_exists($phpbb_root_path . $dirname . "/" . $file . '/search_stopwords.txt')) + { + + $stopword_list = trim(preg_replace('#([\w\.\-_\+\'-\\\]+?)[ \n\r]*?(,|$)#', '\'\1\'\2', str_replace("'", "\'", implode(', ', file($phpbb_root_path . $dirname . "/" . $file . '/search_stopwords.txt'))))); + + $sql = "SELECT word_id + FROM " . SEARCH_WORD_TABLE . " + WHERE word_text IN ($stopword_list)"; + $result = _sql($sql, $errored, $error_ary); + + $word_id_sql = ''; + if ($row = $db->sql_fetchrow($result)) + { + do + { + $word_id_sql .= (($word_id_sql != '') ? ', ' : '') . $row['word_id']; + } + while ($row = $db->sql_fetchrow($result)); + + $sql = "DELETE FROM " . SEARCH_WORD_TABLE . " + WHERE word_id IN ($word_id_sql)"; + _sql($sql, $errored, $error_ary); + + $sql = "DELETE FROM " . SEARCH_MATCH_TABLE . " + WHERE word_id IN ($word_id_sql)"; + _sql($sql, $errored, $error_ary); + } + $db->sql_freeresult($result); + } + } + closedir($dir); + + // Mark common words ... + remove_common('global', 4/10); + + // remove superfluous polls ... grab polls with topics then delete polls + // not in that list + $sql = "SELECT v.vote_id + FROM " . TOPICS_TABLE . " t, " . VOTE_DESC_TABLE . " v + WHERE v.topic_id = t.topic_id"; + $result = _sql($sql, $errored, $error_ary); + + $vote_id_sql = ''; + if ($row = $db->sql_fetchrow($result)) + { + do + { + $vote_id_sql .= (($vote_id_sql != '') ? ', ' : '') . $row['vote_id']; + } + while ($row = $db->sql_fetchrow($result)); + + $sql = "DELETE FROM " . VOTE_DESC_TABLE . " + WHERE vote_id NOT IN ($vote_id_sql)"; + _sql($sql, $errored, $error_ary); + + $sql = "DELETE FROM " . VOTE_RESULTS_TABLE . " + WHERE vote_id NOT IN ($vote_id_sql)"; + _sql($sql, $errored, $error_ary); + + $sql = "DELETE FROM " . VOTE_USERS_TABLE . " + WHERE vote_id NOT IN ($vote_id_sql)"; + _sql($sql, $errored, $error_ary); + } + $db->sql_freeresult($result); + + // update pm counters + $sql = "SELECT privmsgs_to_userid, COUNT(privmsgs_id) AS unread_count + FROM " . PRIVMSGS_TABLE . " + WHERE privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " + GROUP BY privmsgs_to_userid"; + $result = _sql($sql, $errored, $error_ary); + + if ($row = $db->sql_fetchrow($result)) + { + $update_users = array(); + do + { + $update_users[$row['unread_count']][] = $row['privmsgs_to_userid']; + } + while ($row = $db->sql_fetchrow($result)); + + while (list($num, $user_ary) = each($update_users)) + { + $user_ids = implode(', ', $user_ary); + + $sql = "UPDATE " . USERS_TABLE . " + SET user_unread_privmsg = $num + WHERE user_id IN ($user_ids)"; + _sql($sql, $errored, $error_ary); + } + unset($update_list); + } + $db->sql_freeresult($result); + + $sql = "SELECT privmsgs_to_userid, COUNT(privmsgs_id) AS new_count + FROM " . PRIVMSGS_TABLE . " + WHERE privmsgs_type = " . PRIVMSGS_NEW_MAIL . " + GROUP BY privmsgs_to_userid"; + $result = _sql($sql, $errored, $error_ary); + + if ($row = $db->sql_fetchrow($result)) + { + $update_users = array(); + do + { + $update_users[$row['new_count']][] = $row['privmsgs_to_userid']; + } + while ($row = $db->sql_fetchrow($result)); + + while (list($num, $user_ary) = each($update_users)) + { + $user_ids = implode(', ', $user_ary); + + $sql = "UPDATE " . USERS_TABLE . " + SET user_new_privmsg = $num + WHERE user_id IN ($user_ids)"; + _sql($sql, $errored, $error_ary); + } + unset($update_list); + } + $db->sql_freeresult($result); + + // Remove superfluous watched topics + $sql = "SELECT t.topic_id + FROM " . TOPICS_TABLE . " t, " . TOPICS_WATCH_TABLE . " w + WHERE w.topic_id = t.topic_id"; + $result = _sql($sql, $errored, $error_ary); + + $topic_id_sql = ''; + if ($row = $db->sql_fetchrow($result)) + { + do + { + $topic_id_sql .= (($topic_id_sql != '') ? ', ' : '') . $row['topic_id']; + } + while ($row = $db->sql_fetchrow($result)); + + $sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " + WHERE topic_id NOT IN ($topic_id_sql)"; + _sql($sql, $errored, $error_ary); + } + $db->sql_freeresult($result); + + // Reset any email addresses which are non-compliant ... something + // not done in the upgrade script and thus which may affect some + // mysql users + switch (SQL_LAYER) + { + case 'mysql': + $sql = "UPDATE " . USERS_TABLE . " + SET user_email = '' + WHERE user_email NOT REGEXP '^[a-zA-Z0-9_\+\.\-]+@.*[a-zA-Z0-9_\-]+\.[a-zA-Z]{2,}$'"; + _sql($sql, $errored, $error_ary); + } + + case '.0.4': + + // Add the confirmation code switch ... save time and trouble elsewhere + $sql = 'INSERT INTO ' . CONFIG_TABLE . " (config_name, config_value) + VALUES ('enable_confirm', '0')"; + _sql($sql, $errored, $error_ary); + + $sql = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value) + VALUES ('sendmail_fix', '0')"; + _sql($sql, $errored, $error_ary); + + case '.0.5': + + $sql = "SELECT user_id, username + FROM " . USERS_TABLE; + $result = _sql($sql, $errored, $error_ary); + + while ($row = $db->sql_fetchrow($result)) + { + if (!preg_match('#(>)|(<)|(")|(&)#', $row['username'])) + { + if ($row['username'] != htmlspecialchars($row['username'])) + { + $sql = "UPDATE " . USERS_TABLE . " + SET username = '" . str_replace("'", "''", htmlspecialchars($row['username'])) . "' + WHERE user_id = " . $row['user_id']; + _sql($sql, $errored, $error_ary); + } + } + } + $db->sql_freeresult($result); + + case '.0.6': + case '.0.7': + case '.0.8': + case '.0.9': + case '.0.10': + case '.0.11': + case '.0.12': + case '.0.13': + case '.0.14': + + $sql = 'UPDATE ' . USERS_TABLE . ' SET user_allowhtml = 1 WHERE user_id = ' . ANONYMOUS; + _sql($sql, $errored, $error_ary); + + case '.0.15': + case '.0.16': + case '.0.17': + + $sql = 'UPDATE ' . USERS_TABLE . ' SET user_active = 0 WHERE user_id = ' . ANONYMOUS; + _sql($sql, $errored, $error_ary); + + $sql = 'INSERT INTO ' . CONFIG_TABLE . " (config_name, config_value) + VALUES ('allow_autologin', '1')"; + _sql($sql, $errored, $error_ary); + + $sql = 'INSERT INTO ' . CONFIG_TABLE . " (config_name, config_value) + VALUES ('max_autologin_time', '0')"; + _sql($sql, $errored, $error_ary); + + case '.0.18': + + $sql = 'INSERT INTO ' . CONFIG_TABLE . " (config_name, config_value) + VALUES ('max_login_attempts', '5')"; + _sql($sql, $errored, $error_ary); + + $sql = 'INSERT INTO ' . CONFIG_TABLE . " (config_name, config_value) + VALUES ('login_reset_time', '30')"; + _sql($sql, $errored, $error_ary); + + case '.0.19': + + $sql = 'INSERT INTO ' . CONFIG_TABLE . " (config_name, config_value) + VALUES ('search_flood_interval', '15')"; + _sql($sql, $errored, $error_ary); + + $sql = 'INSERT INTO ' . CONFIG_TABLE . " (config_name, config_value) + VALUES ('rand_seed', '0')"; + _sql($sql, $errored, $error_ary); + + case '.0.20': + + $sql = 'INSERT INTO ' . CONFIG_TABLE . " (config_name, config_value) + VALUES ('search_min_chars', '3')"; + _sql($sql, $errored, $error_ary); + + // We reset those having autologin enabled and forcing the re-assignment of a session id + // since there have been changes to the way these are handled from previous versions + $sql = 'DELETE FROM ' . SESSIONS_TABLE; + _sql($sql, $errored, $error_ary); + + $sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE; + _sql($sql, $errored, $error_ary); + + break; + + default: + echo " No updates were required

    \n"; + break; +} + +echo "

    Updating version and optimizing tables

    \n"; +echo "

    Progress :: "; +flush(); + +// update the version +$sql = "UPDATE " . CONFIG_TABLE . " + SET config_value = '$updates_to_version' + WHERE config_name = 'version'"; +_sql($sql, $errored, $error_ary); + +// Optimize/vacuum analyze the tables where appropriate +// this should be done for each version in future along with +// the version number update +switch (SQL_LAYER) +{ + case 'mysql': + case 'mysql4': + $sql = 'OPTIMIZE TABLE ' . $table_prefix . 'auth_access, ' . $table_prefix . 'banlist, ' . $table_prefix . 'categories, ' . $table_prefix . 'config, ' . $table_prefix . 'disallow, ' . $table_prefix . 'forum_prune, ' . $table_prefix . 'forums, ' . $table_prefix . 'groups, ' . $table_prefix . 'posts, ' . $table_prefix . 'posts_text, ' . $table_prefix . 'privmsgs, ' . $table_prefix . 'privmsgs_text, ' . $table_prefix . 'ranks, ' . $table_prefix . 'search_results, ' . $table_prefix . 'search_wordlist, ' . $table_prefix . 'search_wordmatch, ' . $table_prefix . 'sessions_keys, ' . $table_prefix . 'smilies, ' . $table_prefix . 'themes, ' . $table_prefix . 'themes_name, ' . $table_prefix . 'topics, ' . $table_prefix . 'topics_watch, ' . $table_prefix . 'user_group, ' . $table_prefix . 'users, ' . $table_prefix . 'vote_desc, ' . $table_prefix . 'vote_results, ' . $table_prefix . 'vote_voters, ' . $table_prefix . 'words'; + _sql($sql, $errored, $error_ary); + break; + + case 'postgresql': + _sql("VACUUM ANALYZE", $errored, $error_ary); + break; +} + +echo " Done
    Result   :: \n"; + +if ($errored) +{ + echo " Some queries failed, the statements and errors are listing below\n

    \n

    This is probably nothing to worry about, update will continue. Should this fail to complete you may need to seek help at our development board. See README for details on how to obtain advice.

    \n"; +} +else +{ + echo "No errors\n"; +} + +echo "

    Update completed

    \n"; +echo "\n" . '

    Please make sure you have updated your board files too, this file is only updating your database.

    '; +echo "\n

    You should now visit the General Configuration settings page in the Administration Panel and check the General Configuration of the board. If you updated from versions prior to RC-3 you must update some entries. If you do not do this emails sent from the board will contain incorrect information. Don't forget to delete this file!

    \n"; + +?> + +
    + + + diff --git a/phpBB/install/upgrade.php b/phpBB/install/upgrade.php new file mode 100644 index 0000000000..2fc478e3a1 --- /dev/null +++ b/phpBB/install/upgrade.php @@ -0,0 +1,1942 @@ + 1, + 'Feb' => 2, + 'Mar' => 3, + 'Apr' => 4, + 'May' => 5, + 'Jun' => 6, + 'Jul' => 7, + 'Aug' => 8, + 'Sep' => 9, + 'Sept' => 9, + 'Oct' => 10, + 'Nov' => 11, + 'Dec' => 12 +); + +// --------------- +// Begin functions +// +function common_header() +{ +?> + + + + + + + + + + + + + +
    + + + + +
    Forum HomeUpgrading to phpBB 2.0
    + +
    + + + +
    + + + +sql_query($sql)) ) + { + print "
    \n"; + print "$errormsg
    "; + + $sql_error = $db->sql_error(); + print $sql_error['code'] .": ". $sql_error['message']. "
    \n"; + + print "
    $sql
    "; + print "
    \n"; + + return FALSE; + } + else + { + return $result; + } +} + +function smiley_replace($text = '') +{ + global $db; + + static $search, $replace; + + // Did we get the smiley info in a previous call? + if ( !is_array($search) ) + { + $sql = "SELECT code, smile_url + FROM smiles"; + $result = query($sql, "Unable to get list of smilies from the DB"); + + $smilies = $db->sql_fetchrowset($result); + @usort($smilies, 'smiley_sort'); + + $search = array(); + $replace = array(); + for($i = 0; $i < count($smilies); $i++) + { + $search[] = '//i'; + $replace[] = $smilies[$i]['code']; + } + } + + return ( $text != '' ) ? preg_replace($search, $replace, $text) : ''; + +} + +function get_schema() +{ + global $table_prefix; + + $schemafile = file('schemas/mysql_schema.sql'); + $tabledata = 0; + + for($i=0; $i < count($schemafile); $i++) + { + $line = $schemafile[$i]; + + if ( preg_match('/^CREATE TABLE (\w+)/i', $line, $matches) ) + { + // Start of a new table definition, set some variables and go to the next line. + $tabledata = 1; + // Replace the 'phpbb_' prefix by the user defined prefix. + $table = str_replace('phpbb_', $table_prefix, $matches[1]); + $table_def[$table] = "CREATE TABLE $table (\n"; + continue; + } + + if ( preg_match('/^\);/', $line) ) + { + // End of the table definition + // After this we will skip everything until the next 'CREATE' line + $tabledata = 0; + $table_def[$table] .= ')'; // We don't need the closing semicolon + } + + if ( $tabledata == 1 ) + { + // We are inside a table definition, parse this line. + // Add the current line to the complete table definition: + $table_def[$table] .= $line; + if ( preg_match('/^\s*(\w+)\s+(\w+)\(([\d,]+)\)(.*)$/', $line, $matches) ) + { + // This is a column definition + $field = $matches[1]; + $type = $matches[2]; + $size = $matches[3]; + + preg_match('/DEFAULT (NULL|\'.*?\')[,\s](.*)$/i', $matches[4], $match); + $default = $match[1]; + + $notnull = ( preg_match('/NOT NULL/i', $matches[4]) ) ? 1 : 0; + $auto_increment = ( preg_match('/auto_increment/i', $matches[4]) ) ? 1 : 0; + + $field_def[$table][$field] = array( + 'type' => $type, + 'size' => $size, + 'default' => $default, + 'notnull' => $notnull, + 'auto_increment' => $auto_increment + ); + } + + if ( preg_match('/\s*PRIMARY\s+KEY\s*\((.*)\).*/', $line, $matches) ) + { + // Primary key + $key_def[$table]['PRIMARY'] = $matches[1]; + } + else if ( preg_match('/\s*KEY\s+(\w+)\s*\((.*)\)/', $line, $matches) ) + { + // Normal key + $key_def[$table][$matches[1]] = $matches[2]; + } + else if ( preg_match('/^\s*(\w+)\s*(.*?),?\s*$/', $line, $matches) ) + { + // Column definition + $create_def[$table][$matches[1]] = $matches[2]; + } + else + { + // It's a bird! It's a plane! It's something we didn't expect ;( + } + } + } + + $schema['field_def'] = $field_def; + $schema['table_def'] = $table_def; + $schema['create_def'] = $create_def; + $schema['key_def'] = $key_def; + + return $schema; +} + +function get_inserts() +{ + global $table_prefix; + + $insertfile = file('schemas/mysql_basic.sql'); + + for($i = 0; $i < count($insertfile); $i++) + { + if ( preg_match('/(INSERT INTO (\w+)\s.*);/i', str_replace('phpbb_', $table_prefix, $insertfile[$i]), $matches) ) + { + $returnvalue[$matches[2]][] = $matches[1]; + } + } + + return $returnvalue; +} + +function lock_tables($state, $tables= '') +{ + if ( $state == 1 ) + { + if ( is_array($tables) ) + { + $tables = join(' WRITE, ', $tables); + } + + query("LOCK TABLES $tables WRITE", "Couldn't do: $sql"); + } + else + { + query("UNLOCK TABLES", "Couldn't unlock all tables"); + } +} + +function output_table_content($content) +{ + echo $content . "\n"; + + return; +} + +// +// Nathan's bbcode2 conversion routines +// +function bbdecode($message) +{ + // Undo [code] + $code_start_html = '
    Code:
    ';
    +	$code_end_html = '

    '; + $message = str_replace($code_start_html, '[code]', $message); + $message = str_replace($code_end_html, '[/code]', $message); + + // Undo [quote] + $quote_start_html = '
    Quote:
    '; + $quote_end_html = '

    '; + $message = str_replace($quote_start_html, '[quote]', $message); + $message = str_replace($quote_end_html, '[/quote]', $message); + + // Undo [b] and [i] + $message = preg_replace("#(.*?)#s", "[b]\\1[/b]", $message); + $message = preg_replace("#(.*?)#s", "[i]\\1[/i]", $message); + + // Undo [url] (long form) + $message = preg_replace("#(.*?)#s", "[url=\\1\\2]\\3[/url]", $message); + + // Undo [url] (short form) + $message = preg_replace("#(.*?)#s", "[url]\\3[/url]", $message); + + // Undo [email] + $message = preg_replace("#(.*?)#s", "[email]\\1[/email]", $message); + + // Undo [img] + $message = preg_replace("##s", "[img]\\1[/img]", $message); + + // Undo lists (unordered/ordered) + + //
  • tags: + $message = str_replace('
  • ', '[*]', $message); + + // [list] tags: + $message = str_replace('
      ', '[list]', $message); + + // [list=x] tags: + $message = preg_replace('#
        #si', "[list=\\1]", $message); + + // [/list] tags: + $message = str_replace('
    ', '[/list]', $message); + $message = str_replace('', '[/list]', $message); + + return $message; +} + +// +// Alternative for in_array() which is only available in PHP4 +// +function inarray($needle, $haystack) +{ + for( $i = 0 ; $i < sizeof($haystack) ; $i++ ) + { + if ( $haystack[$i] == $needle ) + { + return true; + } + } + + return false; +} + +function end_step($next) +{ + print "
    Next step: $next

    \n"; + exit; +} +// +// End functions +// ------------- + + +// +// Start at the beginning if the user hasn't specified a specific starting point. +// +$next = ( isset($HTTP_GET_VARS['next']) ) ? $HTTP_GET_VARS['next'] : 'start'; + +// If debug is set we'll do all steps in one go. +$debug = 1; + +// Parse the MySQL schema file into some arrays. +$schema = get_schema(); + +$table_def = $schema['table_def']; +$field_def = $schema['field_def']; +$key_def = $schema['key_def']; +$create_def = $schema['create_def']; + +// +// Get mysql_basic data +// +$inserts = get_inserts(); + +// +// Get smiley data +// +smiley_replace(); + +common_header(); + +if ( !empty($next) ) +{ + switch($next) + { + case 'start': + end_step('initial_drops'); + + case 'initial_drops': + print " * Dropping sessions and themes tables :: "; + flush(); + + query("DROP TABLE sessions", "Couldn't drop table 'sessions'"); + query("DROP TABLE themes", "Couldn't drop table 'themes'"); + + print "OK
    \n"; + + end_step('mod_old_tables'); + + case 'mod_old_tables': + $modtables = array( + "banlist" => "banlist", + "catagories" => "categories", + "config" => "old_config", + "forums" => "forums", + "disallow" => "disallow", + "posts" => "posts", + "posts_text" => "posts_text", + "priv_msgs" => "privmsgs", + "ranks" => "ranks", + "smiles" => "smilies", + "topics" => "topics", + "users" => "users", + "words" => "words" + ); + + while( list($old, $new) = each($modtables) ) + { + $result = query("SHOW INDEX FROM $old", "Couldn't get list of indices for table $old"); + + while( $row = $db->sql_fetchrow($result) ) + { + $index = $row['Key_name']; + if ( $index != 'PRIMARY' ) + { + query("ALTER TABLE $old DROP INDEX $index", "Couldn't DROP INDEX $old.$index"); + } + } + + // Rename table + $new = $table_prefix . $new; + + print " * Renaming '$old' to '$new' :: "; + flush(); + query("ALTER TABLE $old RENAME $new", "Failed to rename $old to $new"); + print "OK
    \n"; + + } + end_step('create_tables'); + + case 'create_tables': + // Create array with tables in 'old' database + $result = query('SHOW TABLES', "Couldn't get list of current tables"); + + while( $table = $db->sql_fetchrow($result) ) + { + $currenttables[] = $table[0]; + } + + // Check what tables we need to CREATE + while( list($table, $definition) = each($table_def) ) + { + if ( !inarray($table, $currenttables) ) + { + print " * Creating $table :: "; + + query($definition, "Couldn't create table $table"); + + print "OK
    \n"; + } + } + + end_step('create_config'); + + case 'create_config': + print " * Inserting new values into new layout config table :: "; + + @reset($inserts); + while( list($table, $inserts_table) = each($inserts) ) + { + if ( $table == CONFIG_TABLE ) + { + $per_pct = ceil( count($inserts_table) / 40 ); + $inc = 0; + + while( list($nr, $insert) = each($inserts_table) ) + { + query($insert, "Couldn't insert value into config table"); + + $inc++; + if ( $inc == $per_pct ) + { + print "."; + flush(); + $inc = 0; + } + } + } + } + + print " OK
    \n"; + + end_step('convert_config'); + + case 'convert_config': + print " * Converting configuration table :: "; + + $sql = "SELECT * + FROM $table_prefix" . "old_config"; + $result = query($sql, "Couldn't get info from old config table"); + + $oldconfig = $db->sql_fetchrow($result); + + // + // We don't need several original config types and two others + // have changed name ... so take account of this. + // + $ignore_configs = array("selected", "admin_passwd", "override_themes", "allow_sig"); + $rename_configs = array( + "email_from" => "board_email", + "email_sig" => "board_email_sig" + ); + + while( list($name, $value) = each($oldconfig) ) + { + if ( is_int($name) ) + { + continue; + } + + if ( !inarray($name, $ignore_configs) ) + { + $name = ( !empty($rename_configs[$name]) ) ? $rename_configs[$name] : $name; + + // phpBB 1.x has some problems with escaping strings in the database. Try to correct for + // this by removing all slashes and then escaping once. + $sql = "REPLACE INTO " . CONFIG_TABLE . " (config_name, config_value) + VALUES ('$name', '".addslashes(stripslashes(stripslashes($value)))."')"; + query($sql, "Couldn't update config table with values from old config table"); + } + } + + $sql = "UPDATE " . CONFIG_TABLE . " + SET config_value = 'dutch' + WHERE config_name = 'default_lang' && config_value = 'nederlands'"; + query($sql, "Couldn't rename 'nederlands' to 'dutch' in config table"); + + print "OK
    \n"; + end_step('convert_ips'); + + case 'convert_ips': + $names = array( + POSTS_TABLE => array( + 'id' => 'post_id', + 'field' => 'poster_ip' + ), + PRIVMSGS_TABLE => array( + 'id' => 'msg_id', + 'field' => 'poster_ip' + ), + BANLIST_TABLE => array( + 'id' => 'ban_id', + 'field' => 'ban_ip' + ) + ); + + lock_tables(1, array(POSTS_TABLE, PRIVMSGS_TABLE, BANLIST_TABLE)); + + $batchsize = 2000; + while( list($table, $data_array) = each($names) ) + { + $sql = "SELECT MAX(" . $data_array['id'] . ") AS max_id + FROM $table"; + $result = query($sql, "Couldn't obtain ip data from $table (" . $fields . ")"); + + $row = $db->sql_fetchrow($result); + + $maxid = $row['max_id']; + + for($i = 0; $i <= $maxid; $i += $batchsize) + { + $batchstart = $i; + $batchend = $i + $batchsize; + + $field_id = $data_array['id']; + $field = $data_array['field']; + + print " * Converting IP format '" . $field . "' / '$table' ( $batchstart to $batchend ) :: "; + flush(); + + $sql = "SELECT $field_id, $field + FROM $table + WHERE $field_id + BETWEEN $batchstart + AND $batchend"; + $result = query($sql, "Couldn't obtain ip data from $table (" . $fields . ")"); + + $per_pct = ceil( $db->sql_numrows($result) / 40 ); + $inc = 0; + + while( $row = $db->sql_fetchrow($result) ) + { + $sql = "UPDATE $table + SET $field = '" . encode_ip($row[$field]) . "' + WHERE $field_id = " . $row[$field_id]; + query($sql, "Couldn't convert IP format of $field in $table with $field_id of " . $rowset[$field_id]); + + $inc++; + if ( $inc == $per_pct ) + { + print "."; + flush(); + $inc = 0; + } + } + + print " OK
    \n"; + } + } + + lock_tables(0); + end_step('convert_dates'); + + case 'convert_dates': + $names = array( + POSTS_TABLE => array('post_time'), + TOPICS_TABLE => array('topic_time'), + PRIVMSGS_TABLE => array('msg_time') + ); + + lock_tables(1, array(POSTS_TABLE, TOPICS_TABLE, PRIVMSGS_TABLE)); + + while( list($table, $fields) = each($names) ) + { + print " * Converting date format of $fields[$i] in $table :: "; + flush(); + + for($i = 0; $i < count($fields); $i++) + { + $sql = "UPDATE $table + SET " . $fields[$i] . " = UNIX_TIMESTAMP(" . $fields[$i] . ")"; + query($sql, "Couldn't convert date format of $table(" . $fields[$i] . ")"); + } + + print "OK
    \n"; + } + + lock_tables(0); + end_step('fix_addslashes'); + + case 'fix_addslashes': + $slashfields[TOPICS_TABLE] = array('topic_title'); + $slashfields[FORUMS_TABLE] = array('forum_desc', 'forum_name'); + $slashfields[CATEGORIES_TABLE] = array('cat_title'); + $slashfields[WORDS_TABLE] = array('word', 'replacement'); + $slashfields[RANKS_TABLE] = array('rank_title'); + $slashfields[DISALLOW_TABLE] = array('disallow_username'); + + //convert smilies? + $slashes = array( + "\\'" => "'", + "\\\"" => "\"", + "\\\\" => "\\"); + $slashes = array( + "\\'" => "'", + "\\\"" => "\"", + "\\\\" => "\\"); + + lock_tables(1, array(TOPICS_TABLE, FORUMS_TABLE, CATEGORIES_TABLE, WORDS_TABLE, RANKS_TABLE, DISALLOW_TABLE, SMILIES_TABLE)); + + while( list($table, $fields) = each($slashfields) ) + { + print " * Removing slashes from $table table :: "; + flush(); + + while( list($nr, $field) = each($fields) ) + { + @reset($slashes); + while( list($search, $replace) = each($slashes) ) + { + $sql = "UPDATE $table + SET $field = REPLACE($field, '" . addslashes($search) . "', '" . addslashes($replace) . "')"; + query($sql, "Couldn't remove extraneous slashes from the old data."); + } + } + + print "OK
    \n"; + } + + lock_tables(0); + end_step('remove_topics'); + + case 'remove_topics': + print " * Removing posts with no corresponding topics :: "; + flush(); + + $sql = "SELECT p.post_id + FROM " . POSTS_TABLE . " p + LEFT JOIN " . TOPICS_TABLE . " t ON p.topic_id = t.topic_id + WHERE t.topic_id IS NULL"; + $result = query($sql, "Couldn't obtain list of deleted topics"); + + $post_total = $db->sql_numrows($result); + + if ( $post_total ) + { + $post_id_ary = array(); + while( $row = $db->sql_fetchrow($result) ) + { + $post_id_ary[] = $row['post_id']; + } + + $sql = "DELETE FROM " . POSTS_TABLE . " + WHERE post_id IN (" . implode(", ", $post_id_ary) . ")"; + query($sql, "Couldn't update posts to remove deleted user poster_id values"); + + $sql = "DELETE FROM " . POSTS_TEXT_TABLE . " + WHERE post_id IN (" . implode(", ", $post_id_ary) . ")"; + query($sql, "Couldn't update posts to remove deleted user poster_id values"); + } + + echo "OK ( Removed $post_total posts )
    \n"; + end_step('convert_users'); + + case 'convert_users': + // + // Completely remove old soft-deleted users + // + $sql = "DELETE FROM " . USERS_TABLE . " + WHERE user_level = -1"; + query($sql, "Couldn't delete old soft-deleted users"); + + $sql = "SELECT COUNT(*) AS total, MAX(user_id) AS maxid + FROM " . USERS_TABLE; + $result = query($sql, "Couldn't get max user_id."); + + $row = $db->sql_fetchrow($result); + + $totalposts = $row['total']; + $maxid = $row['maxid']; + + $sql = "ALTER TABLE " . USERS_TABLE . " + ADD user_sig_bbcode_uid CHAR(10), + MODIFY user_sig text"; + query($sql, "Couldn't add user_sig_bbcode_uid field to users table"); + + $super_mods = array(); + $first_admin = -2; + + $batchsize = 1000; + for($i = -1; $i <= $maxid; $i += $batchsize) + { + $batchstart = $i; + $batchend = $i + $batchsize; + + print " * Converting Users ( $batchstart to $batchend ) :: "; + flush(); + + $sql = "SELECT * + FROM " . USERS_TABLE . " + WHERE user_id + BETWEEN $batchstart + AND $batchend"; + $result = query($sql, "Couldn't get ". USERS_TABLE .".user_id $batchstart to $batchend"); + + // Array with user fields that we want to check for invalid data (to few characters) + $checklength = array( + 'user_occ', + 'user_website', + 'user_email', + 'user_from', + 'user_intrest', + 'user_aim', + 'user_yim', + 'user_msnm'); + + lock_tables(1, array(USERS_TABLE, GROUPS_TABLE, USER_GROUP_TABLE, POSTS_TABLE)); + + $per_pct = ceil( $db->sql_numrows($result) / 40 ); + $inc = 0; + + while( $row = $db->sql_fetchrow($result) ) + { + $sql = "INSERT INTO " . GROUPS_TABLE . " (group_name, group_description, group_single_user) + VALUES ('" . addslashes($row['username']) . "', 'Personal User', 1)"; + query($sql, "Wasn't able to insert user ".$row['user_id']." into table ".GROUPS_TABLE); + + $group_id = $db->sql_nextid(); + + $sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending) + VALUES ($group_id, " . $row['user_id'] . ", 0)"; + query($sql, "Wasn't able to insert user ".$row['user_id']." into table ".USER_GROUP_TABLE); + + if ( is_int($row['user_regdate']) ) + { + // We already converted this post to the new style BBcode, skip this post. + continue; + } + + // + // Nathan's bbcode2 conversion + // + + // undo 1.2.x encoding.. + $row['user_sig'] = bbdecode(stripslashes($row['user_sig'])); + $row['user_sig'] = undo_make_clickable($row['user_sig']); + $row['user_sig'] = str_replace("
    ", "\n", $row['user_sig']); + + // make a uid + $uid = make_bbcode_uid(); + + // do 2.x first-pass encoding.. + $row['user_sig'] = bbencode_first_pass($row['user_sig'], $uid); + $row['user_sig'] = addslashes($row['user_sig']); + + // Check for invalid info like '-' and '?' for a lot of fields + @reset($checklength); + while($field = each($checklength)) + { + $row[$field[1]] = strlen($row[$field[1]]) < 3 ? '' : $row[$field[1]]; + } + + preg_match('/(.*?) (\d{1,2}), (\d{4})/', $row['user_regdate'], $parts); + $row['user_regdate'] = gmmktime(0, 0, 0, $months[$parts[1]], $parts[2], $parts[3]); + + $website = $row['user_website']; + if ( substr(strtolower($website), 0, 7) != "http://" ) + { + $website = "http://" . $website; + } + if( strtolower($website) == 'http://' ) + { + $website = ''; + } + $row['user_website'] = addslashes($website); + + $row['user_icq'] = (ereg("^[0-9]+$", $row['user_icq'])) ? $row['user_icq'] : ''; + @reset($checklength); + + while($field = each($checklength)) + { + if ( strlen($row[$field[1]]) < 3 ) + { + $row[$field[1]] = ''; + } + $row[$field[1]] = addslashes($row[$field[1]]); + } + + // + // Is user a super moderator? + // + if( $row['user_level'] == 3 ) + { + $super_mods[] = $row['user_id']; + } + + $row['user_level'] = ( $row['user_level'] == 4 ) ? ADMIN : USER; + + // + // Used to define a 'practical' group moderator user_id + // for super mods a little latter. + // + if( $first_admin == -2 && $row['user_level'] == ADMIN ) + { + $first_admin = $row['user_id']; + } + + // + // Dutch language files have been renamed from 'nederlands' to 'dutch' + // + if( $row['user_lang'] == 'nederlands' ) + { + $row['user_lang'] = 'dutch'; + } + + $sql = "UPDATE " . USERS_TABLE . " + SET + user_sig = '" . $row['user_sig'] . "', + user_sig_bbcode_uid = '$uid', + user_regdate = '" . $row['user_regdate'] . "', + user_website = '" . $row['user_website'] . "', + user_occ = '" . $row['user_occ'] . "', + user_email = '" . $row['user_email'] . "', + user_from = '" . $row['user_from'] . "', + user_intrest = '" . $row['user_intrest'] . "', + user_aim = '" . $row['user_aim'] . "', + user_yim = '" . $row['user_yim'] . "', + user_msnm = '" . $row['user_msnm'] . "', + user_level = '" . $row['user_level'] . "', + user_desmile = NOT(user_desmile), + user_bbcode = 1, + user_theme = 1 + WHERE user_id = " . $row['user_id']; + query($sql, "Couldn't update ".USERS_TABLE." table with new BBcode and regdate for user_id ".$row['user_id']); + + $inc++; + if ( $inc == $per_pct ) + { + print "."; + flush(); + $inc = 0; + } + } + + // Set any non-standard (like) email addresses to nothing + // could do this above as a preg_ but this one query may + // be faster + $sql = "UPDATE " . USERS_TABLE . " + SET user_email = '' + WHERE user_email NOT REGEXP '^[a-zA-Z0-9_\+\.\-]+@.*[a-zA-Z0-9\-_]+\.[a-zA-Z]{2,}$'"; + query($sql, "Couldn't update ".USERS_TABLE." table non-standard user_email entries"); + + print " OK
    \n"; + + lock_tables(0); + } + + // + // Handle super-mods, create hidden group for them + // + // Iterate trough access table + if( count($super_mods) && $first_admin != -2 ) + { + print "\n
    \n * Creating new group for super moderators :: "; + flush(); + + $sql = "INSERT INTO " . GROUPS_TABLE . " (group_type, group_name, group_description, group_moderator, group_single_user) + VALUES (" . GROUP_HIDDEN . ", 'Super Moderators', 'Converted super moderators', $first_admin, 0)"; + $result = query($sql, "Couldn't create group for ".$row['forum_name']); + + $group_id = $db->sql_nextid(); + + if ( $group_id <= 0 ) + { + print "Group creation failed. Aborting creation of groups...
    \n"; + continue 2; + } + + print "OK
    \n"; + + print " * Updating auth_access for super moderator group :: "; + flush(); + + $sql = "SELECT forum_id + FROM " . FORUMS_TABLE; + $result = query($sql, "Couldn't obtain forum_id list"); + + while( $row = $db->sql_fetchrow($result) ) + { + $sql = "INSERT INTO " . AUTH_ACCESS_TABLE . " (group_id, forum_id, auth_mod) + VALUES ($group_id, " . $row['forum_id'] . ", 1)"; + $result_insert = query($sql, "Unable to set group auth access for super mods."); + } + + for($i = 0; $i < count($super_mods); $i++) + { + $sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending) + VALUES ($group_id, " . $super_mods[$i] . ", 0)"; + query($sql, "Unable to add user_id $user_id to group_id $group_id (super mods)
    \n"); + } + + print "OK
    \n"; + } + + end_step('convert_posts'); + + case 'convert_posts': + print " * Adding enable_sig field to " . POSTS_TABLE . " :: "; + flush(); + $sql = "ALTER TABLE " . POSTS_TABLE . " + ADD enable_sig tinyint(1) DEFAULT '1' NOT NULL"; + $result = query($sql, "Couldn't add enable_sig field to " . POSTS_TABLE . "."); + print "OK
    \n"; + + print " * Adding enable_bbcode field to " . POSTS_TEXT_TABLE . " :: "; + flush(); + $sql = "ALTER TABLE " . POSTS_TEXT_TABLE . " + ADD enable_bbcode tinyint(1) DEFAULT '1' NOT NULL"; + $result = query($sql, "Couldn't add enable_bbcode field to " . POSTS_TABLE . "."); + print "OK
    \n"; + + print " * Adding bbcode_uid field to " . POSTS_TEXT_TABLE . " :: "; + flush(); + $sql = "ALTER TABLE " . POSTS_TEXT_TABLE . " + ADD bbcode_uid char(10) NOT NULL"; + $result = query($sql, "Couldn't add bbcode_uid field to " . POSTS_TABLE . "."); + print "OK
    \n"; + + print " * Adding post_edit_time field to " . POSTS_TABLE . " :: "; + flush(); + $sql = "ALTER TABLE " . POSTS_TABLE . " + ADD post_edit_time int(11)"; + $result = query($sql, "Couldn't add post_edit_time field to " . POSTS_TABLE . "."); + print "OK
    \n"; + + print " * Adding post_edit_count field to " . POSTS_TABLE . " :: "; + flush(); + $sql = "ALTER TABLE " . POSTS_TABLE . " + ADD post_edit_count smallint(5) UNSIGNED DEFAULT '0' NOT NULL"; + $result = query($sql, "Couldn't add post_edit_count field to " . POSTS_TABLE . "."); + print "OK
    \n
    \n"; + + $sql = "SELECT COUNT(*) as total, MAX(post_id) as maxid + FROM " . POSTS_TEXT_TABLE; + $result = query($sql, "Couldn't get max post_id."); + + $maxid = $db->sql_fetchrow($result); + + $totalposts = $maxid['total']; + $maxid = $maxid['maxid']; + + $batchsize = 2000; + for($i = 0; $i <= $maxid; $i += $batchsize) + { + $batchstart = $i + 1; + $batchend = $i + $batchsize; + + print " * Converting BBcode ( $batchstart to $batchend ) :: "; + flush(); + + $sql = "SELECT * + FROM " . POSTS_TEXT_TABLE . " + WHERE post_id + BETWEEN $batchstart + AND $batchend"; + $result = query($sql, "Couldn't get ". POSTS_TEXT_TABLE .".post_id $batchstart to $batchend"); + + lock_tables(1, array(POSTS_TEXT_TABLE, POSTS_TABLE)); + + $per_pct = ceil( $db->sql_numrows($result) / 40 ); + $inc = 0; + + while( $row = $db->sql_fetchrow($result) ) + { + if ( $row['bbcode_uid'] != '' ) + { + // We already converted this post to the new style BBcode, skip this post. + continue; + } + + // + // Nathan's bbcode2 conversion + // + // undo 1.2.x encoding.. + $row['post_text'] = bbdecode(stripslashes($row['post_text'])); + $row['post_text'] = undo_make_clickable($row['post_text']); + $row['post_text'] = str_replace('
    ', "\n", $row['post_text']); + + // make a uid + $uid = make_bbcode_uid(); + + // do 2.x first-pass encoding.. + $row['post_text'] = smiley_replace($row['post_text']); + $row['post_text'] = bbencode_first_pass($row['post_text'], $uid); + $row['post_text'] = addslashes($row['post_text']); + + $edited_sql = ""; + if ( preg_match('/^(.*?)([\n]+\[ This message was .*?)$/s', $row['post_text'], $matches) ) + { + $row['post_text'] = $matches[1]; + $edit_info = $matches[2]; + + $edit_times = count(explode(' message ', $edit_info)) - 1; // Taken from example for substr_count in annotated PHP manual + + if ( preg_match('/^.* by: (.*?) on (....)-(..)-(..) (..):(..) \]<\/font>/s', $edit_info, $matches) ) + { + $edited_user = $matches[1]; + $edited_time = gmmktime($matches[5], $matches[6], 0, $matches[3], $matches[4], $matches[2]); + + // + // This isn't strictly correct since 2.0 won't include and edit + // statement if the edit wasn't by the user who posted ... + // + $edited_sql = ", post_edit_time = $edited_time, post_edit_count = $edit_times"; + } + } + + if ( preg_match("/^(.*?)\n-----------------\n.*$/is", $row['post_text'], $matches) ) + { + $row['post_text'] = $matches[1]; + $enable_sig = 1; + } + else + { + $checksig = preg_replace('/\[addsig\]$/', '', $row['post_text']); + $enable_sig = ( strlen($checksig) == strlen($row['post_text']) ) ? 0 : 1; + } + + $sql = "UPDATE " . POSTS_TEXT_TABLE . " + SET post_text = '$checksig', bbcode_uid = '$uid' + WHERE post_id = " . $row['post_id']; + query($sql, "Couldn't update " . POSTS_TEXT_TABLE . " table with new BBcode for post_id :: " . $row['post_id']); + + $sql = "UPDATE " . POSTS_TABLE . " + SET enable_sig = $enable_sig" . $edited_sql . " + WHERE post_id = " . $row['post_id']; + query($sql, "Couldn't update " . POSTS_TABLE . " table with signature status for post with post_id :: " . $row['post_id']); + + $inc++; + if ( $inc == $per_pct ) + { + print '.'; + flush(); + $inc = 0; + } + } + + print " OK
    \n"; + + lock_tables(0); + } + + print "
    \n * Updating poster_id for deleted users :: "; + flush(); + + $sql = "SELECT DISTINCT p.post_id + FROM " . POSTS_TABLE . " p + LEFT JOIN " . USERS_TABLE . " u ON p.poster_id = u.user_id + WHERE u.user_id IS NULL"; + $result = query($sql, "Couldn't obtain list of deleted users"); + + $users_removed = $db->sql_numrows($result); + + if ( $users_removed ) + { + $post_id_ary = array(); + while( $row = $db->sql_fetchrow($result) ) + { + $post_id_ary[] = $row['post_id']; + } + + $sql = "UPDATE " . POSTS_TABLE . " + SET poster_id = " . ANONYMOUS . ", enable_sig = 0 + WHERE post_id IN (" . implode(", ", $post_id_ary) . ")"; + query($sql, "Couldn't update posts to remove deleted user poster_id values"); + } + + print "OK ( Removed $users_removed non-existent user references )
    \n"; + + end_step('convert_privmsgs'); + + case 'convert_privmsgs': + $sql = "SELECT COUNT(*) as total, max(msg_id) as maxid + FROM " . PRIVMSGS_TABLE; + $result = query($sql, "Couldn't get max privmsgs_id."); + + $maxid = $db->sql_fetchrow($result); + + $totalposts = $maxid['total']; + $maxid = $maxid['maxid']; + + $sql = "ALTER TABLE " . PRIVMSGS_TABLE . " + ADD privmsgs_subject VARCHAR(255), + ADD privmsgs_attach_sig TINYINT(1) DEFAULT 1"; + query($sql, "Couldn't add privmsgs_subject field to " . PRIVMSGS_TABLE . " table"); + + $batchsize = 2000; + for($i = 0; $i <= $maxid; $i += $batchsize) + { + $batchstart = $i + 1; + $batchend = $i + $batchsize; + + print " * Converting Private Message ( $batchstart to $batchend ) :: "; + flush(); + + $sql = "SELECT * + FROM " . PRIVMSGS_TABLE . " + WHERE msg_id + BETWEEN $batchstart + AND $batchend"; + $result = query($sql, "Couldn't get " . POSTS_TEXT_TABLE . " post_id $batchstart to $batchend"); + + lock_tables(1, array(PRIVMSGS_TABLE, PRIVMSGS_TEXT_TABLE)); + + $per_pct = ceil( $db->sql_numrows($result) / 40 ); + $inc = 0; + + while( $row = $db->sql_fetchrow($result) ) + { + if ( $row['msg_text'] == NULL ) + { + // We already converted this post to the new style BBcode, skip this post. + continue; + } + // + // Nathan's bbcode2 conversion + // + // undo 1.2.x encoding.. + $row['msg_text'] = bbdecode(stripslashes($row['msg_text'])); + $row['msg_text'] = undo_make_clickable($row['msg_text']); + $row['msg_text'] = str_replace("
    ", "\n", $row['msg_text']); + + // make a uid + $uid = make_bbcode_uid(); + + // do 2.x first-pass encoding.. + $row['msg_text'] = smiley_replace($row['msg_text']); + $row['msg_text'] = bbencode_first_pass($row['msg_text'], $uid); + + $checksig = preg_replace('/\[addsig\]$/', '', $row['msg_text']); + $enable_sig = (strlen($checksig) == strlen($row['msg_text'])) ? 0 : 1; + + if ( preg_match("/^(.*?)\n-----------------\n.*$/is", $checksig, $matches) ) + { + $checksig = $matches[1]; + $enable_sig = 1; + } + + $row['msg_text'] = $checksig; + + $row['msg_status'] = ($row['msg_status'] == 1) ? PRIVMSGS_READ_MAIL : PRIVMSGS_NEW_MAIL; + + // Subject contains first 60 characters of msg, remove any BBCode tags + $subject = addslashes(strip_tags(substr($row['msg_text'], 0, 60))); + $subject = preg_replace("/\[.*?\:(([a-z0-9]:)?)$uid.*?\]/si", "", $subject); + + $row['msg_text'] = addslashes($row['msg_text']); + + $sql = "INSERT INTO " . PRIVMSGS_TEXT_TABLE . " (privmsgs_text_id, privmsgs_bbcode_uid, privmsgs_text) + VALUES ('" . $row['msg_id'] . "', '$uid', '" . $row['msg_text'] . "')"; + query($sql, "Couldn't insert PrivMsg text into " . PRIVMSGS_TEXT_TABLE . " table msg_id " . $row['msg_id']); + + $sql = "UPDATE " . PRIVMSGS_TABLE . " + SET msg_text = NULL, msg_status = " . $row['msg_status'] . ", privmsgs_subject = '$subject', privmsgs_attach_sig = $enable_sig + WHERE msg_id = " . $row['msg_id']; + query($sql, "Couldn't update " . PRIVMSGS_TABLE . " table for msg_id " . $row['post_id']); + + $inc++; + if ( $inc == $per_pct ) + { + print '.'; + flush(); + $inc = 0; + } + } + + print " OK
    \n"; + } + + lock_tables(0); + end_step('convert_moderators'); + + case 'convert_moderators'; + $sql = "SELECT * + FROM forum_mods"; + $result = query($sql, "Couldn't get list with all forum moderators"); + + while( $row = $db->sql_fetchrow($result) ) + { + // Check if this moderator and this forum still exist + $sql = "SELECT user_id + FROM " . USERS_TABLE . ", " . FORUMS_TABLE . " + WHERE user_id = " . $row['user_id'] . " + AND forum_id = " . $row['forum_id']; + $check_data = query($sql, "Couldn't check if user " . $row['user_id'] . " and forum " . $row['forum_id'] . " exist"); + + if ( !($rowtest = $db->sql_fetchrow($check_data)) ) + { + // Either the moderator or the forum have been deleted, this line in forum_mods was redundant, skip it. + continue; + } + + $sql = "SELECT g.group_id + FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug + WHERE g.group_id = ug.group_id + AND ug.user_id = " . $row['user_id'] . " + AND g.group_single_user = 1"; + $insert_group = query($sql, "Couldn't get group number for user " . $row['user_id'] . "."); + + $group_id = $db->sql_fetchrow($insert_group); + $group_id = $group_id['group_id']; + + print " * Adding moderator for forum " . $row['forum_id'] . " :: "; + flush(); + + $sql = "INSERT INTO " . AUTH_ACCESS_TABLE . " (group_id, forum_id, auth_mod) VALUES ($group_id, ".$row['forum_id'].", 1)"; + query($sql, "Couldn't set moderator (user_id = " . $row['user_id'] . ") for forum " . $row['forum_id'] . "."); + + print "OK
    \n"; + } + + print " * Setting correct user_level for moderators ::"; + flush(); + + $sql = "SELECT DISTINCT u.user_id + FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug, " . AUTH_ACCESS_TABLE . " aa + WHERE aa.auth_mod = 1 + AND ug.group_id = aa.group_id + AND u.user_id = ug.user_id + AND u.user_level <> " . ADMIN; + $result = query($sql, "Couldn't obtain list of moderators"); + + if ( $row = $db->sql_fetchrow($result) ) + { + $ug_sql = ''; + + do + { + $ug_sql .= ( ( $ug_sql != '' ) ? ', ' : '' ) . $row['user_id']; + } + while ( $row = $db->sql_fetchrow($result) ); + + $sql = "UPDATE " . USERS_TABLE . " + SET user_level = " . MOD . " + WHERE user_id IN ($ug_sql)"; + query($sql, "Couldn't set moderator status for users"); + } + + print "OK
    \n"; + + end_step('convert_privforums'); + + case 'convert_privforums': + $sql = "SELECT fa.*, f.forum_name + FROM forum_access fa + LEFT JOIN " . FORUMS_TABLE . " f ON fa.forum_id = f.forum_id + ORDER BY fa.forum_id, fa.user_id"; + $forum_access = query($sql, "Couldn't get list with special forum access (forum_access)"); + + $forum_id = -1; + while( $row = $db->sql_fetchrow($forum_access) ) + { + // Iterate trough access table + if ( $row['forum_id'] != $forum_id ) + { + // This is a new forum, create new group. + $forum_id = $row['forum_id']; + + print " * Creating new group for forum $forum_id :: "; + flush(); + + $sql = "INSERT INTO " . GROUPS_TABLE . " (group_type, group_name, group_description, group_moderator, group_single_user) + VALUES (" . GROUP_HIDDEN . ", '" . addslashes($row['forum_name']) . " Group', 'Converted Private Forum Group', " . $row['user_id'] . ", 0)"; + $result = query($sql, "Couldn't create group for ".$row['forum_name']); + + $group_id = $db->sql_nextid(); + + if ( $group_id <= 0 ) + { + print "Group creation failed. Aborting creation of groups...
    \n"; + continue 2; + } + + print "OK
    \n"; + + print " * Creating auth_access group for forum $forum_id :: "; + flush(); + + $sql = "INSERT INTO " . AUTH_ACCESS_TABLE . " (group_id, forum_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_sticky, auth_announce, auth_vote, auth_pollcreate) + VALUES ($group_id, $forum_id, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1)"; + $result = query($sql, "Unable to set group auth access."); + + if ( $db->sql_affectedrows($result) <= 0 ) + { + print "Group creation failed. Aborting creation of groups...
    \n"; + continue 2; + } + + print "OK
    \n"; + } + + // Add user to the group + $user_id = $row['user_id']; + + $sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending) + VALUES ($group_id, $user_id, 0)"; + query($sql, "Unable to add user_id $user_id to group_id $group_id
    \n"); + } + + end_step('update_schema'); + + case 'update_schema': + $rename = array( + $table_prefix . "users" => array( + "user_interests" => "user_intrest", + "user_allowsmile" => "user_desmile", + "user_allowhtml" => "user_html", + "user_allowbbcode" => "user_bbcode", + "user_style" => "user_theme" + ), + $table_prefix . "privmsgs" => array( + "privmsgs_id" => "msg_id", + "privmsgs_from_userid" => "from_userid", + "privmsgs_to_userid" => "to_userid", + "privmsgs_date" => "msg_time", + "privmsgs_ip" => "poster_ip", + "privmsgs_type" => "msg_status" + ), + $table_prefix . "smilies" => array( + "smilies_id" => "id" + ) + ); + + $schema = get_schema(); + + $table_def = $schema['table_def']; + $field_def = $schema['field_def']; + + // Loop tables in schema + while (list($table, $table_def) = @each($field_def)) + { + // Loop fields in table + print " * Updating table '$table' :: "; + flush(); + + $sql = "SHOW FIELDS + FROM $table"; + $result = query($sql, "Can't get definition of current $table table"); + + while( $row = $db->sql_fetchrow($result) ) + { + $current_fields[] = $row['Field']; + } + + $alter_sql = "ALTER TABLE $table "; + while (list($field, $definition) = each($table_def)) + { + if ( $field == '' ) + { + // Skip empty fields if any (shouldn't be needed) + continue; + } + + $type = $definition['type']; + $size = $definition['size']; + + $default = isset($definition['default']) ? "DEFAULT " . $definition['default'] : ''; + + $notnull = $definition['notnull'] == 1 ? 'NOT NULL' : ''; + + $auto_increment = $definition['auto_increment'] == 1 ? 'auto_increment' : ''; + + $oldfield = isset($rename[$table][$field]) ? $rename[$table][$field] : $field; + + if ( !inarray($field, $current_fields) && $oldfield == $field ) + { + // If the current is not a key of $current_def and it is not a field that is + // to be renamed then the field doesn't currently exist. + $changes[] = " ADD $field " . $create_def[$table][$field]; + } + else + { + $changes[] = " CHANGE $oldfield $field " . $create_def[$table][$field]; + } + } + + $alter_sql .= join(',', $changes); + unset($changes); + unset($current_fields); + + $sql = "SHOW INDEX + FROM $table"; + $result = query($sql, "Couldn't get list of indices for table $table"); + + unset($indices); + + while( $row = $db->sql_fetchrow($result) ) + { + $indices[] = $row['Key_name']; + } + + while ( list($key_name, $key_field) = each($key_def[$table]) ) + { + if ( !inarray($key_name, $indices) ) + { + $alter_sql .= ($key_name == 'PRIMARY') ? ", ADD PRIMARY KEY ($key_field)" : ", ADD INDEX $key_name ($key_field)"; + } + } + query($alter_sql, "Couldn't alter table $table"); + + print "OK
    \n"; + flush(); + } + + end_step('convert_forums'); + + case 'convert_forums': + $sql = "SELECT * + FROM " . FORUMS_TABLE; + $result = query($sql, "Couldn't get list with all forums"); + + while( $row = $db->sql_fetchrow($result) ) + { + print " * Converting forum '" . $row['forum_name'] . "' :: "; + flush(); + + // forum_access: (only concerns posting) + // 1 = Registered users only + // 2 = Anonymous Posting + // 3 = Moderators/Administrators only + switch( $row['forum_access'] ) + { + case 1: + // Public forum, no anonymous posting + $auth_view = AUTH_ALL; + $auth_read = AUTH_ALL; + $auth_post = AUTH_REG; + $auth_reply = AUTH_REG; + $auth_edit = AUTH_REG; + $auth_delete = AUTH_REG; + $auth_vote = AUTH_REG; + $auth_pollcreate = AUTH_REG; + $auth_sticky = AUTH_MOD; + $auth_announce = AUTH_MOD; + break; + case 2: + $auth_post = AUTH_ALL; + $auth_reply = AUTH_ALL; + $auth_edit = AUTH_REG; + $auth_delete = AUTH_REG; + $auth_vote = AUTH_ALL; + $auth_pollcreate = AUTH_ALL; + $auth_sticky = AUTH_MOD; + $auth_announce = AUTH_MOD; + break; + default: + $auth_post = AUTH_MOD; + $auth_reply = AUTH_MOD; + $auth_edit = AUTH_MOD; + $auth_delete = AUTH_MOD; + $auth_vote = AUTH_MOD; + $auth_pollcreate = AUTH_MOD; + $auth_sticky = AUTH_MOD; + $auth_announce = AUTH_MOD; + break; + } + + // Old auth structure: + // forum_type: (only concerns viewing) + // 0 = Public + // 1 = Private + switch( $row['forum_type'] ) + { + case 0: + $auth_view = AUTH_ALL; + $auth_read = AUTH_ALL; + break; + default: + // + // Make it really private ... + // + $auth_view = AUTH_ACL; + $auth_read = AUTH_ACL; + $auth_post = AUTH_ACL; + $auth_reply = AUTH_ACL; + $auth_edit = AUTH_ACL; + $auth_delete = AUTH_ACL; + $auth_vote = AUTH_ACL; + $auth_pollcreate = AUTH_ACL; + $auth_sticky = AUTH_ACL; + $auth_announce = AUTH_MOD; + break; + } + + $sql = "UPDATE " . FORUMS_TABLE . " SET + auth_view = $auth_view, + auth_read = $auth_read, + auth_post = $auth_post, + auth_reply = $auth_reply, + auth_edit = $auth_edit, + auth_delete = $auth_delete, + auth_vote = $auth_vote, + auth_pollcreate = $auth_pollcreate, + auth_sticky = $auth_sticky, + auth_announce = $auth_announce + WHERE forum_id = ". $row['forum_id']; + query($sql, "Was unable to update forum permissions!"); + + print "OK
    \n"; + } + + end_step('insert_themes'); + + case 'insert_themes': + print " * Inserting new values into themes table :: "; + + @reset($inserts); + while( list($table, $inserts_table) = each($inserts) ) + { + if ( $table == THEMES_TABLE ) + { + $per_pct = ceil( count($inserts_table) / 40 ); + $inc = 0; + + while( list($nr, $insert) = each($inserts_table) ) + { + query($insert, "Couldn't insert value into " . THEMES_TABLE); + + $inc++; + if ( $inc == $per_pct ) + { + print "."; + flush(); + $inc = 0; + } + } + } + } + + print " OK
    \n"; + end_step('update_topics'); + + case 'update_topics': + $sql = "SELECT MAX(topic_id) AS max_topic + FROM " . TOPICS_TABLE; + $result = query($sql, "Couldn't get max topic id"); + + $row = $db->sql_fetchrow($result); + + $maxid = $row['max_topic']; + + lock_tables(1, array(TOPICS_TABLE, POSTS_TABLE)); + + $batchsize = 1000; + for($i = 0; $i <= $maxid; $i += $batchsize) + { + $batchstart = $i + 1; + $batchend = $i + $batchsize; + + print " * Setting topic first post_id ( $batchstart to $batchend ) :: "; + flush(); + + $sql = "SELECT MIN(post_id) AS first_post_id, topic_id + FROM " . POSTS_TABLE . " + WHERE topic_id + BETWEEN $batchstart + AND $batchend + GROUP BY topic_id + ORDER BY topic_id ASC"; + $result = query($sql, "Couldn't get post id data"); + + $per_pct = ceil( $db->sql_numrows($result) / 40 ); + $inc = 0; + + if ( $row = $db->sql_fetchrow($result) ) + { + do + { + $sql = "UPDATE " . TOPICS_TABLE . " + SET topic_first_post_id = " . $row['first_post_id'] . " + WHERE topic_id = " . $row['topic_id']; + query($sql, "Couldn't update topic first post id in topic :: $topic_id"); + + $inc++; + if ( $inc == $per_pct ) + { + print "."; + flush(); + $inc = 0; + } + } + while ( $row = $db->sql_fetchrow($result) ); + } + + print " OK
    \n"; + } + + lock_tables(0); + end_step('final_configuration'); + + case 'final_configuration': + // + // Update forum last post information + // + $sql = "SELECT forum_id, forum_name + FROM " . FORUMS_TABLE; + $f_result = query($sql, "Couldn't obtain forum_ids"); + + while( $forum_row = $db->sql_fetchrow($f_result) ) + { + print " * Updating '" . $forum_row['forum_name'] . "' post info :: "; + flush(); + + $id = $forum_row['forum_id']; + + $sql = "SELECT MIN(p.post_id) AS first_post, MAX(p.post_id) AS last_post + FROM " . POSTS_TABLE . " p, " . TOPICS_TABLE . " t + WHERE p.forum_id = $id + AND p.topic_id = t.topic_id"; + $result = query($sql, "Could not get post ID forum post information :: $id"); + + if ( $row = $db->sql_fetchrow($result) ) + { + $first_post = ( $row['first_post'] ) ? $row['first_post'] : 0; + $last_post = ($row['last_post']) ? $row['last_post'] : 0; + } + else + { + $first_post = 0; + $last_post = 0; + } + + $sql = "SELECT COUNT(post_id) AS total + FROM " . POSTS_TABLE . " + WHERE forum_id = $id"; + $result = query($sql, "Could not get post count forum post information :: $id"); + + if ( $row = $db->sql_fetchrow($result) ) + { + $total_posts = ($row['total']) ? $row['total'] : 0; + } + else + { + $total_posts = 0; + } + + $sql = "SELECT COUNT(topic_id) AS total + FROM " . TOPICS_TABLE . " + WHERE forum_id = $id + AND topic_status <> " . TOPIC_MOVED; + $result = query($sql, "Could not get topic count forum post information :: $id"); + + if ( $row = $db->sql_fetchrow($result) ) + { + $total_topics = ($row['total']) ? $row['total'] : 0; + } + else + { + $total_topics = 0; + } + + $sql = "UPDATE " . FORUMS_TABLE . " + SET forum_last_post_id = $last_post, forum_posts = $total_posts, forum_topics = $total_topics + WHERE forum_id = $id"; + query($sql, "Could not update forum post information :: $id"); + + print "OK
    \n"; + } + + print "
    \n * Update default user and finalise configuration :: "; + flush(); + + // + // Update the default admin user with their information. + // + $sql = "SELECT MIN(user_regdate) AS oldest_time + FROM " . USERS_TABLE . " + WHERE user_regdate > 0 AND user_id > 0"; + $result = query($sql, "Couldn't obtain oldest post time"); + + $row = $db->sql_fetchrow($result); + + $sql = "INSERT INTO " . $table_prefix . "config (config_name, config_value) + VALUES ('board_startdate', " . $row['oldest_time'] . ")"; + query($sql, "Couldn't insert board_startdate"); + + $sql = "UPDATE " . $table_prefix . "config + SET config_value = '" . $server_name . "' + WHERE config_name = 'server_name' + OR config_name = 'cookie_domain'"; + query($sql, "Couldn't insert Board Server domain"); + + $sql = "UPDATE " . $table_prefix . "config + SET config_value = '" . $server_port . "' + WHERE config_name = 'server_port'"; + query($sql, "Couldn't insert Board server port"); + + $sql = "UPDATE " . $table_prefix . "config + SET config_value = '" . $board_email . "' + WHERE config_name = 'board_email'"; + query($sql, "Couldn't insert Board admin email"); + + $sql = "UPDATE " . $table_prefix . "config + SET config_value = '" . $script_path . "' + WHERE config_name = 'script_path'"; + query($sql, "Couldn't insert Board script path"); + + // + // Change session table to HEAP if MySQL version matches + // + $sql = "SELECT VERSION() AS mysql_version"; + $result = query($sql, "Couldn't obtain MySQL Version"); + + $row = $db->sql_fetchrow($result); + + $version = $row['mysql_version']; + + if ( preg_match("/^(3\.23)|(4\.)/", $version) ) + { + $sql = "ALTER TABLE " . $table_prefix . "sessions + TYPE=HEAP MAX_ROWS=500"; + $db->sql_query($sql); + } + + echo "OK
    \n"; + end_step('drop_fields'); + + case 'drop_fields': + $fields = array( + BANLIST_TABLE => array("ban_start", "ban_end", "ban_time_type"), + FORUMS_TABLE => array("forum_access", "forum_moderator", "forum_type"), + PRIVMSGS_TABLE => array("msg_text"), + RANKS_TABLE => array("rank_max"), + SMILIES_TABLE => array("emotion"), + TOPICS_TABLE => array("topic_notify") + ); + + while( list($table, $field_data) = each($fields) ) + { + for($i = 0; $i < count($field_data); $i++) + { + print " * Drop field '" . $field_data[$i] . "' in '$table' :: "; + flush(); + + $sql = "ALTER TABLE $table + DROP COLUMN " . $field_data[$i]; + query($sql, "Couldn't drop field :: " . $field_data[$i] . " from table :: $table"); + + print "OK
    \n"; + + } + } + + end_step('drop_tables'); + + case 'drop_tables': + $drop_tables = array('access', 'forum_access', 'forum_mods', 'headermetafooter', 'whosonline', $table_prefix . 'old_config'); + + for($i = 0; $i < count($drop_tables); $i++) + { + print " * Dropping table '" . $drop_tables[$i] . "' :: "; + flush(); + + $sql = "DROP TABLE " . $drop_tables[$i]; + query($sql, "Couldn't drop table :: " . $drop_tables[$i]); + + print "OK
    \n"; + } + + end_step('fulltext_search_indexing'); + + case 'fulltext_search_indexing': + // + // Generate search word list + // + // Fetch a batch of posts_text entries + // + $sql = "SELECT COUNT(*) as total, MAX(post_id) as max_post_id + FROM " . POSTS_TEXT_TABLE; + $result = query($sql, "Couldn't get post count totals"); + + $max_post_id = $db->sql_fetchrow($result); + + $totalposts = $max_post_id['total']; + $max_post_id = $max_post_id['max_post_id']; + $per_percent = round(( $totalposts / 500 ) * 10); + + $postcounter = ( !isset($HTTP_GET_VARS['batchstart']) ) ? 0 : $HTTP_GET_VARS['batchstart']; + + $batchsize = 150; // Process this many posts per loop + $batchcount = 0; + $total_percent = 0; + + for(;$postcounter <= $max_post_id; $postcounter += $batchsize) + { + $batchstart = $postcounter + 1; + $batchend = $postcounter + $batchsize; + $batchcount++; + + print " * Fulltext Indexing ( $batchstart to $batchend ) :: "; + flush(); + + $sql = "SELECT * + FROM " . POSTS_TEXT_TABLE ." + WHERE post_id + BETWEEN $batchstart + AND $batchend"; + $posts_result = query($sql, "Couldn't obtain post_text"); + + $per_pct = ceil( $db->sql_numrows($posts_result) / 40 ); + $inc = 0; + + if ( $row = $db->sql_fetchrow($posts_result) ) + { + do + { + add_search_words('global', $row['post_id'], $row['post_text'], $row['post_subject']); + + $inc++; + if ( $inc == $per_pct ) + { + print "."; + flush(); + $inc = 0; + } + } + while( $row = $db->sql_fetchrow($posts_result) ); + } + + $db->sql_freeresult($posts_result); + + // Remove common words after the first 2 batches and after every 4th batch after that. + if ( $batchcount % 4 == 3 ) + { + remove_common('global', 4/10); + } + + print " OK
    \n"; + } + + echo "\n

    \n\nUPGRADE COMPLETED
    \n"; + } +} + +print "
    If the upgrade completed without error you may click Here to proceed to the index
    "; + +common_footer(); + +?> \ No newline at end of file diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php deleted file mode 100644 index 6edae1a4cc..0000000000 --- a/phpBB/language/en/acp/attachments.php +++ /dev/null @@ -1,162 +0,0 @@ - 'Here you can configure the main settings for attachments and the associated special categories.', - 'ACP_EXTENSION_GROUPS_EXPLAIN' => 'Here you can add, delete, modify or disable your extension groups. Further options include the assignment of a special category to them, changing the download mechanism and defining an upload icon which will be displayed in front of the attachment which belongs to the group.', - 'ACP_MANAGE_EXTENSIONS_EXPLAIN' => 'Here you can manage your allowed extensions. To activate your extensions, please refer to the extension groups management panel. We strongly recommend not to allow scripting extensions (such as php, php3, php4, phtml, pl, cgi, py, rb, asp, aspx, and so forth…).', - 'ACP_ORPHAN_ATTACHMENTS_EXPLAIN' => 'Here you are able to see orphaned files. This happens mostly if users are attaching files but not submitting the post. You are able to delete the files or attach them to existing posts. Attaching to posts requires a valid post ID, you have to determine this ID by yourself. This will assign the already uploaded attachment to the post you entered.', - 'ADD_EXTENSION' => 'Add extension', - 'ADD_EXTENSION_GROUP' => 'Add extension group', - 'ADMIN_UPLOAD_ERROR' => 'Errors while trying to attach file: “%sâ€.', - 'ALLOWED_FORUMS' => 'Allowed forums', - 'ALLOWED_FORUMS_EXPLAIN' => 'Able to post the assigned extensions at the selected (or all if selected) forums.', - 'ALLOWED_IN_PM_POST' => 'Allowed', - 'ALLOW_ATTACHMENTS' => 'Allow attachments', - 'ALLOW_ALL_FORUMS' => 'Allow all forums', - 'ALLOW_IN_PM' => 'Allowed in private messaging', - 'ALLOW_PM_ATTACHMENTS' => 'Allow attachments in private messages', - 'ALLOW_SELECTED_FORUMS' => 'Only forums selected below', - 'ASSIGNED_EXTENSIONS' => 'Assigned extensions', - 'ASSIGNED_GROUP' => 'Assigned extension group', - 'ATTACH_EXTENSIONS_URL' => 'Extensions', - 'ATTACH_EXT_GROUPS_URL' => 'Extension groups', - 'ATTACH_ID' => 'ID', - 'ATTACH_MAX_FILESIZE' => 'Maximum file size', - 'ATTACH_MAX_FILESIZE_EXPLAIN' => 'Maximum size of each file, with 0 being unlimited.', - 'ATTACH_MAX_PM_FILESIZE' => 'Maximum file size messaging', - 'ATTACH_MAX_PM_FILESIZE_EXPLAIN' => 'Maximum drive space available per user for private message attachments, with 0 being unlimited.', - 'ATTACH_ORPHAN_URL' => 'Orphan attachments', - 'ATTACH_POST_ID' => 'Post ID', - 'ATTACH_QUOTA' => 'Total attachment quota', - 'ATTACH_QUOTA_EXPLAIN' => 'Maximum drive space available for attachments for the whole board, with 0 being unlimited.', - 'ATTACH_TO_POST' => 'Attach file to post', - - 'CAT_FLASH_FILES' => 'Flash files', - 'CAT_IMAGES' => 'Images', - 'CAT_QUICKTIME_FILES' => 'Quicktime media files', - 'CAT_RM_FILES' => 'RealMedia media files', - 'CAT_WM_FILES' => 'Windows Media media files', - 'CREATE_GROUP' => 'Create new group', - 'CREATE_THUMBNAIL' => 'Create thumbnail', - 'CREATE_THUMBNAIL_EXPLAIN' => 'Create a thumbnail in all possible situations.', - - 'DEFINE_ALLOWED_IPS' => 'Define allowed IPs/hostnames', - 'DEFINE_DISALLOWED_IPS' => 'Define disallowed IPs/hostnames', - 'DOWNLOAD_ADD_IPS_EXPLAIN' => 'To specify several different IPs or hostnames enter each on a new line. To specify a range of IP addresses separate the start and end with a hyphen (-), to specify a wildcard use “*â€.', - 'DOWNLOAD_REMOVE_IPS_EXPLAIN' => 'You can remove (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IPs have a blue background.', - 'DISPLAY_INLINED' => 'Display images inline', - 'DISPLAY_INLINED_EXPLAIN' => 'If set to No image attachments will show as a link.', - 'DISPLAY_ORDER' => 'Attachment display order', - 'DISPLAY_ORDER_EXPLAIN' => 'Display attachments ordered by time.', - - 'EDIT_EXTENSION_GROUP' => 'Edit extension group', - 'EXCLUDE_ENTERED_IP' => 'Enable this to exclude the entered IP/hostname.', - 'EXCLUDE_FROM_ALLOWED_IP' => 'Exclude IP from allowed IPs/hostnames', - 'EXCLUDE_FROM_DISALLOWED_IP' => 'Exclude IP from disallowed IPs/hostnames', - 'EXTENSIONS_UPDATED' => 'Extensions successfully updated.', - 'EXTENSION_EXIST' => 'The extension %s already exists.', - 'EXTENSION_GROUP' => 'Extension group', - 'EXTENSION_GROUPS' => 'Extension groups', - 'EXTENSION_GROUP_DELETED' => 'Extension group successfully deleted.', - 'EXTENSION_GROUP_EXIST' => 'The extension group %s already exists.', - - 'GO_TO_EXTENSIONS' => 'Go to extension management screen', - 'GROUP_NAME' => 'Group name', - - 'IMAGE_LINK_SIZE' => 'Image link dimensions', - 'IMAGE_LINK_SIZE_EXPLAIN' => 'Display image attachment as an inline text link if image is larger than this. To disable this behaviour, set the values to 0px by 0px.', - 'IMAGICK_PATH' => 'Imagemagick path', - 'IMAGICK_PATH_EXPLAIN' => 'Full path to the imagemagick convert application, e.g. /usr/bin/.', - - 'MAX_ATTACHMENTS' => 'Max attachments per post', - 'MAX_ATTACHMENTS_PM' => 'Max attachments per message', - 'MAX_EXTGROUP_FILESIZE' => 'Maximum file size', - 'MAX_IMAGE_SIZE' => 'Maximum image dimensions', - 'MAX_IMAGE_SIZE_EXPLAIN' => 'Maximum size of image attachments. Set both values to 0px by 0px to disable dimension checking.', - 'MAX_THUMB_WIDTH' => 'Maximum thumbnail width in pixel', - 'MAX_THUMB_WIDTH_EXPLAIN' => 'A generated thumbnail will not exceed the width set here.', - 'MIN_THUMB_FILESIZE' => 'Minimum thumbnail file size', - 'MIN_THUMB_FILESIZE_EXPLAIN' => 'Do not create a thumbnail for images smaller than this.', - 'MODE_INLINE' => 'Inline', - 'MODE_PHYSICAL' => 'Physical', - - 'NOT_ALLOWED_IN_PM' => 'Only allowed in posts', - 'NOT_ALLOWED_IN_PM_POST' => 'Not allowed', - 'NOT_ASSIGNED' => 'Not assigned', - 'NO_EXT_GROUP' => 'None', - 'NO_EXT_GROUP_NAME' => 'No group name entered', - 'NO_EXT_GROUP_SPECIFIED' => 'No extension group specified.', - 'NO_FILE_CAT' => 'None', - 'NO_IMAGE' => 'No image', - 'NO_THUMBNAIL_SUPPORT' => 'Thumbnail support has been disabled. For proper functionality either the GD extension need to be available or imagemagick being installed. Both were not found.', - 'NO_UPLOAD_DIR' => 'The upload directory you specified does not exist.', - 'NO_WRITE_UPLOAD' => 'The upload directory you specified cannot be written to. Please alter the permissions to allow the webserver to write to it.', - - 'ONLY_ALLOWED_IN_PM' => 'Only allowed in private messages', - 'ORDER_ALLOW_DENY' => 'Allow', - 'ORDER_DENY_ALLOW' => 'Deny', - - 'REMOVE_ALLOWED_IPS' => 'Remove or un-exclude allowed IPs/hostnames', - 'REMOVE_DISALLOWED_IPS' => 'Remove or un-exclude disallowed IPs/hostnames', - - 'SEARCH_IMAGICK' => 'Search for Imagemagick', - 'SECURE_ALLOW_DENY' => 'Allow/Deny list', - 'SECURE_ALLOW_DENY_EXPLAIN' => 'Change the default behaviour when secure downloads are enabled of the Allow/Deny list to that of a whitelist (Allow) or a blacklist (Deny).', - 'SECURE_DOWNLOADS' => 'Enable secure downloads', - 'SECURE_DOWNLOADS_EXPLAIN' => 'With this option enabled, downloads are limited to IP’s/hostnames you define.', - 'SECURE_DOWNLOAD_NOTICE' => 'Secure Downloads are not enabled. The settings below will be applied after enabling secure downloads.', - 'SECURE_DOWNLOAD_UPDATE_SUCCESS'=> 'The IP list has been updated successfully.', - 'SECURE_EMPTY_REFERRER' => 'Allow empty referrer', - 'SECURE_EMPTY_REFERRER_EXPLAIN' => 'Secure downloads are based on referrers. Do you want to allow downloads for those omitting the referrer?', - 'SETTINGS_CAT_IMAGES' => 'Image category settings', - 'SPECIAL_CATEGORY' => 'Special category', - 'SPECIAL_CATEGORY_EXPLAIN' => 'Special categories differ between the way presented within posts.', - 'SUCCESSFULLY_UPLOADED' => 'Successfully uploaded.', - 'SUCCESS_EXTENSION_GROUP_ADD' => 'Extension group successfully added.', - 'SUCCESS_EXTENSION_GROUP_EDIT' => 'Extension group successfully updated.', - - 'UPLOADING_FILES' => 'Uploading files', - 'UPLOADING_FILE_TO' => 'Uploading file “%1$s†to post number %2$d…', - 'UPLOAD_DENIED_FORUM' => 'You do not have the permission to upload files to forum “%sâ€.', - 'UPLOAD_DIR' => 'Upload directory', - 'UPLOAD_DIR_EXPLAIN' => 'Storage path for attachments. Please note that if you change this directory while already having uploaded attachments you need to manually copy the files to their new location.', - 'UPLOAD_ICON' => 'Upload icon', - 'UPLOAD_NOT_DIR' => 'The upload location you specified does not appear to be a directory.', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php deleted file mode 100644 index 5fcbb1fa69..0000000000 --- a/phpBB/language/en/acp/ban.php +++ /dev/null @@ -1,82 +0,0 @@ - '1 hour', - '30_MINS' => '30 minutes', - '6_HOURS' => '6 hours', - - 'ACP_BAN_EXPLAIN' => 'Here you can control the banning of users by name, IP or e-mail address. These methods prevent a user reaching any part of the board. You can give a short (maximum 3000 characters) reason for the ban if you wish. This will be displayed in the admin log. The duration of a ban can also be specified. If you want the ban to end on a specific date rather than after a set time period select Until -> for the ban length and enter a date in YYYY-MM-DD format.', - - 'BAN_EXCLUDE' => 'Exclude from banning', - 'BAN_LENGTH' => 'Length of ban', - 'BAN_REASON' => 'Reason for ban', - 'BAN_GIVE_REASON' => 'Reason shown to the banned', - 'BAN_UPDATE_SUCCESSFUL' => 'The banlist has been updated successfully.', - - 'EMAIL_BAN' => 'Ban one or more e-mail addresses', - 'EMAIL_BAN_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered e-mail address from all current bans.', - 'EMAIL_BAN_EXPLAIN' => 'To specify more than one e-mail address enter each on a new line. To match partial addresses use * as the wildcard, e.g. *@hotmail.com, *@*.domain.tld, etc.', - 'EMAIL_NO_BANNED' => 'No banned e-mail addresses', - 'EMAIL_UNBAN' => 'Un-ban or un-exclude e-mails', - 'EMAIL_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple e-mail addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded e-mail addresses are emphasised.', - - 'IP_BAN' => 'Ban one or more IPs', - 'IP_BAN_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered IP from all current bans.', - 'IP_BAN_EXPLAIN' => 'To specify several different IPs or hostnames enter each on a new line. To specify a range of IP addresses separate the start and end with a hyphen (-), to specify a wildcard use “*â€.', - 'IP_HOSTNAME' => 'IP addresses or hostnames', - 'IP_NO_BANNED' => 'No banned IP addresses', - 'IP_UNBAN' => 'Un-ban or un-exclude IPs', - 'IP_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IPs are emphasised.', - - 'LENGTH_BAN_INVALID' => 'The date has to be formatted YYYY-MM-DD.', - - 'PERMANENT' => 'Permanent', - - 'UNTIL' => 'Until', - 'USER_BAN' => 'Ban one or more usernames', - 'USER_BAN_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered users from all current bans.', - 'USER_BAN_EXPLAIN' => 'You can ban multiple users in one go by entering each name on a new line. Use the Find a member facility to look up and add one or more users automatically.', - 'USER_NO_BANNED' => 'No banned usernames', - 'USER_UNBAN' => 'Un-ban or un-exclude usernames', - 'USER_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users are emphasised.', - - -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php deleted file mode 100644 index 0cc1064916..0000000000 --- a/phpBB/language/en/acp/board.php +++ /dev/null @@ -1,459 +0,0 @@ - 'Here you can determine the basic operation of your board, give it a fitting name and description, and among other settings adjust the default values for timezone and language.', - 'CUSTOM_DATEFORMAT' => 'Custom…', - 'DEFAULT_DATE_FORMAT' => 'Date format', - 'DEFAULT_DATE_FORMAT_EXPLAIN' => 'The date format is the same as the PHP date function.', - 'DEFAULT_LANGUAGE' => 'Default language', - 'DEFAULT_STYLE' => 'Default style', - 'DISABLE_BOARD' => 'Disable board', - 'DISABLE_BOARD_EXPLAIN' => 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.', - 'OVERRIDE_STYLE' => 'Override user style', - 'OVERRIDE_STYLE_EXPLAIN' => 'Replaces user’s style with the default.', - 'SITE_DESC' => 'Site description', - 'SITE_NAME' => 'Site name', - 'SYSTEM_DST' => 'Enable Summer Time/DST', - 'SYSTEM_TIMEZONE' => 'System timezone', - 'WARNINGS_EXPIRE' => 'Warning duration', - 'WARNINGS_EXPIRE_EXPLAIN' => 'Number of days that will elapse before the warning will automatically expire from a user’s record.', -)); - -// Board Features -$lang = array_merge($lang, array( - 'ACP_BOARD_FEATURES_EXPLAIN' => 'Here you can enable/disable several board features.', - - 'ALLOW_ATTACHMENTS' => 'Allow attachments', - 'ALLOW_BIRTHDAYS' => 'Allow birthdays', - 'ALLOW_BIRTHDAYS_EXPLAIN' => 'Allow birthdays to be entered and age being displayed in profiles. Please note the birthday list within the board index is controlled by a separate load setting.', - 'ALLOW_BOOKMARKS' => 'Allow bookmarking topics', - 'ALLOW_BOOKMARKS_EXPLAIN' => 'User is able to store personal bookmarks.', - 'ALLOW_BBCODE' => 'Allow BBCode', - 'ALLOW_FORUM_NOTIFY' => 'Allow subscribing to forums', - 'ALLOW_NAME_CHANGE' => 'Allow username changes', - 'ALLOW_NO_CENSORS' => 'Allow disabling of word censoring', - 'ALLOW_NO_CENSORS_EXPLAIN' => 'Users can choose to disable the automatic word censoring of posts and private messages.', - 'ALLOW_PM_ATTACHMENTS' => 'Allow attachments in private messages', - 'ALLOW_SIG' => 'Allow signatures', - 'ALLOW_SIG_BBCODE' => 'Allow BBCode in user signatures', - 'ALLOW_SIG_FLASH' => 'Allow use of [FLASH] BBCode tag in user signatures', - 'ALLOW_SIG_IMG' => 'Allow use of [IMG] BBCode tag in user signatures', - 'ALLOW_SIG_LINKS' => 'Allow use of links in user signatures', - 'ALLOW_SIG_LINKS_EXPLAIN' => 'If disallowed the [URL] BBCode tag and automatic/magic URLs are disabled.', - 'ALLOW_SIG_SMILIES' => 'Allow use of smilies in user signatures', - 'ALLOW_SMILIES' => 'Allow smilies', - 'ALLOW_TOPIC_NOTIFY' => 'Allow subscribing to topics', - 'BOARD_PM' => 'Private messaging', - 'BOARD_PM_EXPLAIN' => 'Enable or disable private messaging for all users.', -)); - -// Avatar Settings -$lang = array_merge($lang, array( - 'ACP_AVATAR_SETTINGS_EXPLAIN' => 'Avatars are generally small, unique images a user can associate with themselves. Depending on the style they are usually displayed below the username when viewing topics. Here you can determine how users can define their avatars. Please note that in order to upload avatars you need to have created the directory you name below and ensure it can be written to by the web server. Please also note that file size limits are only imposed on uploaded avatars, they do not apply to remotely linked images.', - - 'ALLOW_LOCAL' => 'Enable gallery avatars', - 'ALLOW_REMOTE' => 'Enable remote avatars', - 'ALLOW_REMOTE_EXPLAIN' => 'Avatars linked to from another website.', - 'ALLOW_UPLOAD' => 'Enable avatar uploading', - 'AVATAR_GALLERY_PATH' => 'Avatar gallery path', - 'AVATAR_GALLERY_PATH_EXPLAIN' => 'Path under your phpBB root directory for pre-loaded images, e.g. images/avatars/gallery.', - 'AVATAR_STORAGE_PATH' => 'Avatar storage path', - 'AVATAR_STORAGE_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. images/avatars/upload.', - 'MAX_AVATAR_SIZE' => 'Maximum avatar dimensions', - 'MAX_AVATAR_SIZE_EXPLAIN' => 'Width x Height in pixels.', - 'MAX_FILESIZE' => 'Maximum avatar file size', - 'MAX_FILESIZE_EXPLAIN' => 'For uploaded avatar files.', - 'MIN_AVATAR_SIZE' => 'Minimum avatar dimensions', - 'MIN_AVATAR_SIZE_EXPLAIN' => 'Width x Height in pixels.', -)); - -// Message Settings -$lang = array_merge($lang, array( - 'ACP_MESSAGE_SETTINGS_EXPLAIN' => 'Here you can set all default settings for private messaging.', - - 'ALLOW_BBCODE_PM' => 'Allow BBCode in private messages', - 'ALLOW_FLASH_PM' => 'Allow use of [FLASH] BBCode tag', - 'ALLOW_FLASH_PM_EXPLAIN' => 'Note that the ability to use flash in private messages, if enabled here, also depends on the permissions.', - 'ALLOW_FORWARD_PM' => 'Allow forwarding of private messages', - 'ALLOW_IMG_PM' => 'Allow use of [IMG] BBCode tag', - 'ALLOW_MASS_PM' => 'Allow sending of private messages to multiple users and groups', - 'ALLOW_PRINT_PM' => 'Allow print view in private messaging', - 'ALLOW_QUOTE_PM' => 'Allow quotes in private messages', - 'ALLOW_SIG_PM' => 'Allow signature in private messages', - 'ALLOW_SMILIES_PM' => 'Allow smilies in private messages', - 'BOXES_LIMIT' => 'Maximum private messages per box', - 'BOXES_LIMIT_EXPLAIN' => 'Users may receive no more than this many messages in each of their private message boxes. Set this value to 0 to allow unlimited messages.', - 'BOXES_MAX' => 'Maximum private message folders', - 'BOXES_MAX_EXPLAIN' => 'By default users may create this many personal folders for private messages.', - 'ENABLE_PM_ICONS' => 'Enable use of topic icons in private messages', - 'FULL_FOLDER_ACTION' => 'Full folder default action', - 'FULL_FOLDER_ACTION_EXPLAIN'=> 'Default action to take if a user’s folder is full assuming the user’s folder action, if set at all, is not applicable. The only exception is for the “Sent messages†folder where the default action is always to delete old messages.', - 'HOLD_NEW_MESSAGES' => 'Hold new messages', - 'PM_EDIT_TIME' => 'Limit editing time', - 'PM_EDIT_TIME_EXPLAIN' => 'Limits the time available to edit a private message not already delivered. Setting the value to 0 disables this behaviour.', -)); - -// Post Settings -$lang = array_merge($lang, array( - 'ACP_POST_SETTINGS_EXPLAIN' => 'Here you can set all default settings for posting.', - 'ALLOW_POST_LINKS' => 'Allow links in posts/private messages', - 'ALLOW_POST_LINKS_EXPLAIN' => 'If disallowed the [URL] BBCode tag and automatic/magic URLs are disabled.', - 'ALLOW_POST_FLASH' => 'Allow use of [FLASH] BBCode tag in posts. ', - 'ALLOW_POST_FLASH_EXPLAIN' => 'If disallowed the [FLASH] BBCode tag is disabled in posts. Otherwise the permission system controls which users can use the [FLASH] BBCode tag.', - - 'BUMP_INTERVAL' => 'Bump interval', - 'BUMP_INTERVAL_EXPLAIN' => 'Number of minutes, hours or days between the last post to a topic and the ability to bump this topic.', - 'CHAR_LIMIT' => 'Maximum characters per post', - 'CHAR_LIMIT_EXPLAIN' => 'The number of characters allowed within a post. Set to 0 for unlimited characters.', - 'DISPLAY_LAST_EDITED' => 'Display last edited time information', - 'DISPLAY_LAST_EDITED_EXPLAIN' => 'Choose if the last edited by information to be displayed on posts.', - 'EDIT_TIME' => 'Limit editing time', - 'EDIT_TIME_EXPLAIN' => 'Limits the time available to edit a new post. Setting the value to 0 disables this behaviour.', - 'FLOOD_INTERVAL' => 'Flood interval', - 'FLOOD_INTERVAL_EXPLAIN' => 'Number of seconds a user must wait between posting new messages. To enable users to ignore this alter their permissions.', - 'HOT_THRESHOLD' => 'Popular topic threshold', - 'HOT_THRESHOLD_EXPLAIN' => 'Posts per topic threshold required for the popular topic annotation. Set to 0 to disable popular topics.', - 'MAX_POLL_OPTIONS' => 'Maximum number of poll options', - 'MAX_POST_FONT_SIZE' => 'Maximum font size per post', - 'MAX_POST_FONT_SIZE_EXPLAIN' => 'Maximum font size allowed in a post. Set to 0 for unlimited font size.', - 'MAX_POST_IMG_HEIGHT' => 'Maximum image height per post', - 'MAX_POST_IMG_HEIGHT_EXPLAIN' => 'Maximum height of an image/flash file in postings. Set to 0 for unlimited size.', - 'MAX_POST_IMG_WIDTH' => 'Maximum image width per post', - 'MAX_POST_IMG_WIDTH_EXPLAIN' => 'Maximum width of an image/flash file in postings. Set to 0 for unlimited size.', - 'MAX_POST_URLS' => 'Maximum links per post', - 'MAX_POST_URLS_EXPLAIN' => 'Maximum number of URLs in a post. Set to 0 for unlimited links.', - 'POSTING' => 'Posting', - 'POSTS_PER_PAGE' => 'Posts per page', - 'QUOTE_DEPTH_LIMIT' => 'Maximum nested quotes per post', - 'QUOTE_DEPTH_LIMIT_EXPLAIN' => 'Maximum number of nested quotes in a post. Set to 0 for unlimited depth.', - 'SMILIES_LIMIT' => 'Maximum smilies per post', - 'SMILIES_LIMIT_EXPLAIN' => 'Maximum number of smilies in a post. Set to 0 for unlimited smilies.', - 'TOPICS_PER_PAGE' => 'Topics per page', -)); - -// Signature Settings -$lang = array_merge($lang, array( - 'ACP_SIGNATURE_SETTINGS_EXPLAIN' => 'Here you can set all default settings for signatures.', - - 'MAX_SIG_FONT_SIZE' => 'Maximum signature font size', - 'MAX_SIG_FONT_SIZE_EXPLAIN' => 'Maximum font size allowed in user signatures. Set to 0 for unlimited size.', - 'MAX_SIG_IMG_HEIGHT' => 'Maximum signature image height', - 'MAX_SIG_IMG_HEIGHT_EXPLAIN' => 'Maximum height of an image/flash file in user signatures. Set to 0 for unlimited height.', - 'MAX_SIG_IMG_WIDTH' => 'Maximum signature image width', - 'MAX_SIG_IMG_WIDTH_EXPLAIN' => 'Maximum width of an image/flash file in user signatures. Set to 0 for unlimited width.', - 'MAX_SIG_LENGTH' => 'Maximum signature length', - 'MAX_SIG_LENGTH_EXPLAIN' => 'Maximum number of characters in user signatures.', - 'MAX_SIG_SMILIES' => 'Maximum smilies per signature', - 'MAX_SIG_SMILIES_EXPLAIN' => 'Maximum smilies allowed in user signatures. Set to 0 for unlimited smilies.', - 'MAX_SIG_URLS' => 'Maximum signature links', - 'MAX_SIG_URLS_EXPLAIN' => 'Maximum number of links in user signatures. Set to 0 for unlimited links.', -)); - -// Registration Settings -$lang = array_merge($lang, array( - 'ACP_REGISTER_SETTINGS_EXPLAIN' => 'Here you are able to define registration and profile related settings.', - - 'ACC_ACTIVATION' => 'Account activation', - 'ACC_ACTIVATION_EXPLAIN' => 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations.', - 'ACC_ADMIN' => 'By Admin', - 'ACC_DISABLE' => 'Disable', - 'ACC_NONE' => 'None', - 'ACC_USER' => 'By User', -// 'ACC_USER_ADMIN' => 'User + Admin', - 'ALLOW_EMAIL_REUSE' => 'Allow e-mail address re-use', - 'ALLOW_EMAIL_REUSE_EXPLAIN' => 'Different users can register with the same e-mail address.', - 'COPPA' => 'COPPA', - 'COPPA_FAX' => 'COPPA fax number', - 'COPPA_MAIL' => 'COPPA mailing address', - 'COPPA_MAIL_EXPLAIN' => 'This is the mailing address where parents will send COPPA registration forms.', - 'ENABLE_COPPA' => 'Enable COPPA', - 'ENABLE_COPPA_EXPLAIN' => 'This requires users to declare whether they are 13 or over for compliance with the U.S. COPPA. If this is disabled the COPPA specific groups will no longer be displayed.', - 'MAX_CHARS' => 'Max', - 'MIN_CHARS' => 'Min', - 'MIN_TIME_REG' => 'Minimum time for registration', - 'MIN_TIME_REG_EXPLAIN' => 'The registration form cannot be submitted before this time has passed.', - 'MIN_TIME_TERMS' => 'Minimum time for accepting terms', - 'MIN_TIME_TERMS_EXPLAIN' => 'The terms page cannot be skipped before this time has passed.', - 'NO_AUTH_PLUGIN' => 'No suitable auth plugin found.', - 'PASSWORD_LENGTH' => 'Password length', - 'PASSWORD_LENGTH_EXPLAIN' => 'Minimum and maximum number of characters in passwords.', - 'REG_LIMIT' => 'Registration attempts', - 'REG_LIMIT_EXPLAIN' => 'Number of attempts users can make at the confirmation code before being locked out that session.', - 'USERNAME_ALPHA_ONLY' => 'Alphanumeric only', - 'USERNAME_ALPHA_SPACERS' => 'Alphanumeric and spacers', - 'USERNAME_ASCII' => 'ASCII (no international unicode)', - 'USERNAME_LETTER_NUM' => 'Any letter and number', - 'USERNAME_LETTER_NUM_SPACERS' => 'Any letter, number, and spacer', - 'USERNAME_CHARS' => 'Limit username chars', - 'USERNAME_CHARS_ANY' => 'Any character', - 'USERNAME_CHARS_EXPLAIN' => 'Restrict type of characters that may be used in usernames, spacers are: space, -, +, _, [ and ].', - 'USERNAME_LENGTH' => 'Username length', - 'USERNAME_LENGTH_EXPLAIN' => 'Minimum and maximum number of characters in usernames.', -)); - -// Visual Confirmation Settings -$lang = array_merge($lang, array( - 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you are able to define visual confirmation defaults and CAPTCHA settings.', - - 'CAPTCHA_GD' => 'GD CAPTCHA', - 'CAPTCHA_GD_FOREGROUND_NOISE' => 'GD CAPTCHA foreground noise', - 'CAPTCHA_GD_EXPLAIN' => 'Use GD to make a more advanced CAPTCHA.', - 'CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN' => 'Use foreground noise to make the GD based CAPTCHA harder.', - 'CAPTCHA_GD_X_GRID' => 'GD CAPTCHA background noise x-axis', - 'CAPTCHA_GD_X_GRID_EXPLAIN' => 'Use lower settings of this to make the GD based CAPTCHA harder. 0 will disable x-axis background noise.', - 'CAPTCHA_GD_Y_GRID' => 'GD CAPTCHA background noise y-axis', - 'CAPTCHA_GD_Y_GRID_EXPLAIN' => 'Use lower settings of this to make the GD based CAPTCHA harder. 0 will disable y-axis background noise.', - - 'CAPTCHA_PREVIEW_MSG' => 'Your changes to the visual confirmation setting were not saved. This is just a preview.', - 'CAPTCHA_PREVIEW_EXPLAIN' => 'The CAPTCHA as it will look like using the current settings. Use the preview button to refresh. Note that captchas are randomized and will differ from one view to the next.', - 'VISUAL_CONFIRM_POST' => 'Enable visual confirmation for guest postings', - 'VISUAL_CONFIRM_POST_EXPLAIN' => 'Requires anonymous users to enter a random code matching an image to help prevent mass postings.', - 'VISUAL_CONFIRM_REG' => 'Enable visual confirmation for registrations', - 'VISUAL_CONFIRM_REG_EXPLAIN' => 'Requires new users to enter a random code matching an image to help prevent mass registrations.', -)); - -// Cookie Settings -$lang = array_merge($lang, array( - 'ACP_COOKIE_SETTINGS_EXPLAIN' => 'These details define the data used to send cookies to your users browsers. In most cases the default values for the cookie settings should be sufficient. If you do need to change any do so with care, incorrect settings can prevent users logging in.', - - 'COOKIE_DOMAIN' => 'Cookie domain', - 'COOKIE_NAME' => 'Cookie name', - 'COOKIE_PATH' => 'Cookie path', - 'COOKIE_SECURE' => 'Cookie secure', - 'COOKIE_SECURE_EXPLAIN' => 'If your server is running via SSL set this to enabled else leave as disabled. Having this enabled and not running via SSL will result in server errors during redirects.', - 'ONLINE_LENGTH' => 'View online time span', - 'ONLINE_LENGTH_EXPLAIN' => 'Number of minutes after which inactive users will not appear in “Who is online†listings. The higher this value the greater is the processing required to generate the listing.', - 'SESSION_LENGTH' => 'Session length', - 'SESSION_LENGTH_EXPLAIN' => 'Sessions will expire after this time, in seconds.', -)); - -// Load Settings -$lang = array_merge($lang, array( - 'ACP_LOAD_SETTINGS_EXPLAIN' => 'Here you can enable and disable certain board functions to reduce the amount of processing required. On most servers there is no need to disable any functions. However on certain systems or in shared hosting environments it may be beneficial to disable capabilities you do not really need. You can also specify limits for system load and active sessions beyond which the board will go offline.', - - 'CUSTOM_PROFILE_FIELDS' => 'Custom profile fields', - 'LIMIT_LOAD' => 'Limit system load', - 'LIMIT_LOAD_EXPLAIN' => 'If the system’s 1-minute load average exceeds this value the board will automatically go offline. A value of 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers and where this information is accessible. The value here resets itself to 0 if phpBB was unable to get the load limit.', - 'LIMIT_SESSIONS' => 'Limit sessions', - 'LIMIT_SESSIONS_EXPLAIN' => 'If the number of sessions exceeds this value within a one minute period the board will go offline. Set to 0 for unlimited sessions.', - 'LOAD_CPF_MEMBERLIST' => 'Allow styles to display custom profile fields in memberlist', - 'LOAD_CPF_VIEWPROFILE' => 'Display custom profile fields in user profiles', - 'LOAD_CPF_VIEWTOPIC' => 'Display custom profile fields on topic pages', - 'LOAD_USER_ACTIVITY' => 'Show user’s activity', - 'LOAD_USER_ACTIVITY_EXPLAIN' => 'Displays active topic/forum in user profiles and user control panel. It is recommended to disable this on boards with more than one million posts.', - 'RECOMPILE_STYLES' => 'Recompile stale style components', - 'RECOMPILE_STYLES_EXPLAIN' => 'Check for updated style components on filesystem and recompile.', - 'YES_ANON_READ_MARKING' => 'Enable topic marking for guests', - 'YES_ANON_READ_MARKING_EXPLAIN' => 'Stores read/unread status information for guests. If disabled posts are always read for guests.', - 'YES_BIRTHDAYS' => 'Enable birthday listing', - 'YES_BIRTHDAYS_EXPLAIN' => 'If disabled the birthday listing is no longer displayed. To let this setting take effect the birthday feature need to be enabled too.', - 'YES_JUMPBOX' => 'Enable display of jumpbox', - 'YES_MODERATORS' => 'Enable display of moderators', - 'YES_ONLINE' => 'Enable online user listings', - 'YES_ONLINE_EXPLAIN' => 'Display online user information on index, forum and topic pages.', - 'YES_ONLINE_GUESTS' => 'Enable online guest listings in viewonline', - 'YES_ONLINE_GUESTS_EXPLAIN' => 'Allow display of guest user information in viewonline.', - 'YES_ONLINE_TRACK' => 'Enable display of user online/offline information', - 'YES_ONLINE_TRACK_EXPLAIN' => 'Display online information for user in profiles and topic pages.', - 'YES_POST_MARKING' => 'Enable dotted topics', - 'YES_POST_MARKING_EXPLAIN' => 'Indicates whether user has posted to a topic.', - 'YES_READ_MARKING' => 'Enable server-side topic marking', - 'YES_READ_MARKING_EXPLAIN' => 'Stores read/unread status information in the database rather than a cookie.', -)); - -// Auth settings -$lang = array_merge($lang, array( - 'ACP_AUTH_SETTINGS_EXPLAIN' => 'phpBB supports authentication plug-ins, or modules. These allow you determine how users are authenticated when they log into the board. By default three plug-ins are provided; DB, LDAP and Apache. Not all methods require additional information so only fill out fields if they are relevant to the selected method.', - - 'AUTH_METHOD' => 'Select an authentication method', - - 'APACHE_SETUP_BEFORE_USE' => 'You have to setup apache authentication before you switch phpBB to this authentication method. Keep in mind that the username you use for apache authentication has to be the same as your phpBB username. Apache authentication can only be used with mod_php (not with a CGI version) and safe_mode disabled.', - - 'LDAP_DN' => 'LDAP base dn', - 'LDAP_DN_EXPLAIN' => 'This is the Distinguished Name, locating the user information, e.g. o=My Company,c=US.', - 'LDAP_EMAIL' => 'LDAP e-mail attribute', - 'LDAP_EMAIL_EXPLAIN' => 'Set this to the name of your user entry e-mail attribute (if one exists) in order to automatically set the e-mail address for new users. Leaving this empty results in empty e-mail address for users who log in for the first time.', - 'LDAP_INCORRECT_USER_PASSWORD' => 'Binding to LDAP server failed with specified user/password.', - 'LDAP_NO_EMAIL' => 'The specified e-mail attribute does not exist.', - 'LDAP_NO_IDENTITY' => 'Could not find a login identity for %s.', - 'LDAP_PASSWORD' => 'LDAP password', - 'LDAP_PASSWORD_EXPLAIN' => 'Leave blank to use anonymous binding. Else fill in the password for the above user. Required for Active Directory Servers. WARNING: This password will be stored as plain text in the database visible to everybody who can access your database or who can view this configuration page.', - 'LDAP_PORT' => 'LDAP server port', - 'LDAP_PORT_EXPLAIN' => 'Optionally you can specify a port which should be used to connect to the LDAP server instead of the default port 389.', - 'LDAP_SERVER' => 'LDAP server name', - 'LDAP_SERVER_EXPLAIN' => 'If using LDAP this is the hostname or IP address of the LDAP server. Alternatively you can specify an URL like ldap://hostname:port/', - 'LDAP_UID' => 'LDAP uid', - 'LDAP_UID_EXPLAIN' => 'This is the key under which to search for a given login identity, e.g. uid, sn, etc.', - 'LDAP_USER' => 'LDAP user dn', - 'LDAP_USER_EXPLAIN' => 'Leave blank to use anonymous binding. If filled in phpBB uses the specified distinguished name on login attempts to find the correct user, e.g. uid=Username,ou=MyUnit,o=MyCompany,c=US. Required for Active Directory Servers.', - 'LDAP_USER_FILTER' => 'LDAP user filter', - 'LDAP_USER_FILTER_EXPLAIN' => 'Optionally you can further limit the searched objects with additional filters. For example objectClass=posixGroup would result in the use of (&(uid=$username)(objectClass=posixGroup))', -)); - -// Server Settings -$lang = array_merge($lang, array( - 'ACP_SERVER_SETTINGS_EXPLAIN' => 'Here you define server and domain dependant settings. Please ensure the data you enter is accurate, errors will result in e-mails containing incorrect information. When entering the domain name remember it does include http:// or other protocol term. Only alter the port number if you know your server uses a different value, port 80 is correct in most cases.', - - 'ENABLE_GZIP' => 'Enable GZip compression', - 'ENABLE_GZIP_EXPLAIN' => 'Generated content will be compressed prior to sending it to the user. This can reduce network traffic but will also increase CPU usage on both server and client side.', - 'FORCE_SERVER_VARS' => 'Force server URL settings', - 'FORCE_SERVER_VARS_EXPLAIN' => 'If set to yes the server settings defined here will be used in favour of the automatically determined values.', - 'ICONS_PATH' => 'Post icons storage path', - 'ICONS_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. images/icons.', - 'PATH_SETTINGS' => 'Path settings', - 'RANKS_PATH' => 'Rank image storage path', - 'RANKS_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. images/ranks.', - 'SCRIPT_PATH' => 'Script path', - 'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB is located relative to the domain name, e.g. /phpBB3.', - 'SERVER_NAME' => 'Domain name', - 'SERVER_NAME_EXPLAIN' => 'The domain name this board runs from (for example: www.example.com).', - 'SERVER_PORT' => 'Server port', - 'SERVER_PORT_EXPLAIN' => 'The port your server is running on, usually 80, only change if different.', - 'SERVER_PROTOCOL' => 'Server protocol', - 'SERVER_PROTOCOL_EXPLAIN' => 'This is used as the server protocol if these settings are forced. If empty or not forced the protocol is determined by the cookie secure settings (http:// or https://).', - 'SERVER_URL_SETTINGS' => 'Server URL settings', - 'SMILIES_PATH' => 'Smilies storage path', - 'SMILIES_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. images/smilies.', - 'UPLOAD_ICONS_PATH' => 'Extension group icons storage path', - 'UPLOAD_ICONS_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. images/upload_icons.', -)); - -// Security Settings -$lang = array_merge($lang, array( - 'ACP_SECURITY_SETTINGS_EXPLAIN' => 'Here you are able to define session and login related settings.', - - 'ALL' => 'All', - 'ALLOW_AUTOLOGIN' => 'Allow persistent logins', - 'ALLOW_AUTOLOGIN_EXPLAIN' => 'Determines whether users can autologin when they visit the board.', - 'AUTOLOGIN_LENGTH' => 'Persistent login key expiration length (in days)', - 'AUTOLOGIN_LENGTH_EXPLAIN' => 'Number of days after which persistent login keys are removed or zero to disable.', - 'BROWSER_VALID' => 'Validate browser', - 'BROWSER_VALID_EXPLAIN' => 'Enables browser validation for each session improving security.', - 'CHECK_DNSBL' => 'Check IP against DNS Blackhole List', - 'CHECK_DNSBL_EXPLAIN' => 'If enabled the user’s IP address is checked against the following DNSBL services on registration and posting: spamcop.net, dsbl.org and www.spamhaus.org. This lookup may take a while, depending on the server’s configuration. If slowdowns are experienced or too many false positives reported it is recommended to disable this check.', - 'CLASS_B' => 'A.B', - 'CLASS_C' => 'A.B.C', - 'EMAIL_CHECK_MX' => 'Check e-mail domain for valid MX record', - 'EMAIL_CHECK_MX_EXPLAIN' => 'If enabled, the e-mail domain provided on registration and profile changes is checked for a valid MX record.', - 'FORCE_PASS_CHANGE' => 'Force password change', - 'FORCE_PASS_CHANGE_EXPLAIN' => 'Require user to change their password after a set number of days. Setting this value to 0 disables this behaviour.', - 'FORM_TIME_MAX' => 'Maximum time to submit forms', - 'FORM_TIME_MAX_EXPLAIN' => 'The time a user has to submit a form. Use -1 to disable. Note that a form might become invalid if the session expires, regardless of this setting.', - 'FORM_TIME_MIN' => 'Minimum time to submit forms', - 'FORM_TIME_MIN_EXPLAIN' => 'Submissions faster than this time are ignored by the board. Use 0 to disable.', - 'FORM_SID_GUESTS' => 'Tie forms to guest sessions', - 'FORM_SID_GUESTS_EXPLAIN' => 'If enabled, the form token issued to guests will be session-exclusive. This can cause problems with some ISPs.', - 'FORWARDED_FOR_VALID' => 'Validated X_FORWARDED_FOR header', - 'FORWARDED_FOR_VALID_EXPLAIN' => 'Sessions will only be continued if the sent X_FORWARDED_FOR header equals the one sent with the previous request. Bans will be checked against IPs in X_FORWARDED_FOR too.', - 'IP_VALID' => 'Session IP validation', - 'IP_VALID_EXPLAIN' => 'Determines how much of the users IP is used to validate a session; All compares the complete address, A.B.C the first x.x.x, A.B the first x.x, None disables checking. On IPv6 addresses A.B.C compares the first 4 blocks and A.B the first 3 blocks.', - 'MAX_LOGIN_ATTEMPTS' => 'Maximum number of login attempts', - 'MAX_LOGIN_ATTEMPTS_EXPLAIN' => 'After this number of failed logins the user needs to additionally confirm his login visually (visual confirmation).', - 'NO_IP_VALIDATION' => 'None', - 'PASSWORD_TYPE' => 'Password complexity', - 'PASSWORD_TYPE_EXPLAIN' => 'Determines how complex a password needs to be when set or altered, subsequent options include the previous ones.', - 'PASS_TYPE_ALPHA' => 'Must contain letters and numbers', - 'PASS_TYPE_ANY' => 'No requirements', - 'PASS_TYPE_CASE' => 'Must be mixed case', - 'PASS_TYPE_SYMBOL' => 'Must contain symbols', - 'TPL_ALLOW_PHP' => 'Allow php in templates', - 'TPL_ALLOW_PHP_EXPLAIN' => 'If this option is enabled, PHP and INCLUDEPHP statements will be recognised and parsed in templates.', -)); - -// Email Settings -$lang = array_merge($lang, array( - 'ACP_EMAIL_SETTINGS_EXPLAIN' => 'This information is used when the board sends e-mails to your users. Please ensure the e-mail address you specify is valid, any bounced or undeliverable messages will likely be sent to that address. If your host does not provide a native (PHP based) e-mail service you can instead send messages directly using SMTP. This requires the address of an appropriate server (ask your provider if necessary). If the server requires authentication (and only if it does) enter the necessary username, password and authentication method.', - - 'ADMIN_EMAIL' => 'Return e-mail address', - 'ADMIN_EMAIL_EXPLAIN' => 'This will be used as the return address on all e-mails, the technical contact e-mail address. It will always be used as the Return-Path and Sender address in e-mails.', - 'BOARD_EMAIL_FORM' => 'Users send e-mail via board', - 'BOARD_EMAIL_FORM_EXPLAIN' => 'Instead of showing the users e-mail address users are able to send e-mails via the board.', - 'BOARD_HIDE_EMAILS' => 'Hide e-mail addresses', - 'BOARD_HIDE_EMAILS_EXPLAIN' => 'This function keeps e-mail addresses completely private.', - 'CONTACT_EMAIL' => 'Contact e-mail address', - 'CONTACT_EMAIL_EXPLAIN' => 'This address will be used whenever a specific contact point is needed, e.g. spam, error output, etc. It will always be used as the From and Reply-To address in e-mails.', - 'EMAIL_FUNCTION_NAME' => 'E-mail function name', - 'EMAIL_FUNCTION_NAME_EXPLAIN' => 'The e-mail function used to send mails through PHP.', - 'EMAIL_PACKAGE_SIZE' => 'E-mail package size', - 'EMAIL_PACKAGE_SIZE_EXPLAIN' => 'This is the number of maximum e-mails sent out in one package. This setting is applied to the internal message queue; set this value to 0 if you have problems with non-delivered notification emails.', - 'EMAIL_SIG' => 'E-mail signature', - 'EMAIL_SIG_EXPLAIN' => 'This text will be attached to all e-mails the board sends.', - 'ENABLE_EMAIL' => 'Enable board-wide e-mails', - 'ENABLE_EMAIL_EXPLAIN' => 'If this is set to disabled no e-mails will be sent by the board at all.', - 'SMTP_AUTH_METHOD' => 'Authentication method for SMTP', - 'SMTP_AUTH_METHOD_EXPLAIN' => 'Only used if a username/password is set, ask your provider if you are unsure which method to use.', - 'SMTP_CRAM_MD5' => 'CRAM-MD5', - 'SMTP_DIGEST_MD5' => 'DIGEST-MD5', - 'SMTP_LOGIN' => 'LOGIN', - 'SMTP_PASSWORD' => 'SMTP password', - 'SMTP_PASSWORD_EXPLAIN' => 'Only enter a password if your SMTP server requires it.', - 'SMTP_PLAIN' => 'PLAIN', - 'SMTP_POP_BEFORE_SMTP' => 'POP-BEFORE-SMTP', - 'SMTP_PORT' => 'SMTP server port', - 'SMTP_PORT_EXPLAIN' => 'Only change this if you know your SMTP server is on a different port.', - 'SMTP_SERVER' => 'SMTP server address', - 'SMTP_SETTINGS' => 'SMTP settings', - 'SMTP_USERNAME' => 'SMTP username', - 'SMTP_USERNAME_EXPLAIN' => 'Only enter a username if your SMTP server requires it.', - 'USE_SMTP' => 'Use SMTP server for e-mail', - 'USE_SMTP_EXPLAIN' => 'Select “Yes†if you want or have to send e-mail via a named server instead of the local mail function.', -)); - -// Jabber settings -$lang = array_merge($lang, array( - 'ACP_JABBER_SETTINGS_EXPLAIN' => 'Here you can enable and control the use of Jabber for instant messaging and board notifications. Jabber is an open source protocol and therefore available for use by anyone. Some Jabber servers include gateways or transports which allow you to contact users on other networks. Not all servers offer all transports and changes in protocols can prevent transports from operating. Please be sure to enter already registered account details - phpBB will use the details you enter here as is.', - - 'JAB_ENABLE' => 'Enable Jabber', - 'JAB_ENABLE_EXPLAIN' => 'Enables use of Jabber messaging and notifications.', - 'JAB_GTALK_NOTE' => 'Please note that GTalk will not work because the dns_get_record function could not be found. This function is not available in PHP4, and is not implemented on Windows platforms. It currently does not work on BSD-based systems, including Mac OS.', - 'JAB_PACKAGE_SIZE' => 'Jabber package size', - 'JAB_PACKAGE_SIZE_EXPLAIN' => 'This is the number of messages sent in one package. If set to 0 the message is sent immediately and will not be queued for later sending.', - 'JAB_PASSWORD' => 'Jabber password', - 'JAB_PORT' => 'Jabber port', - 'JAB_PORT_EXPLAIN' => 'Leave blank unless you know it is not port 5222.', - 'JAB_SERVER' => 'Jabber server', - 'JAB_SERVER_EXPLAIN' => 'See %sjabber.org%s for a list of servers.', - 'JAB_SETTINGS_CHANGED' => 'Jabber settings changed successfully.', - 'JAB_USE_SSL' => 'Use SSL to connect', - 'JAB_USE_SSL_EXPLAIN' => 'If enabled a secure connection is tried to be established. The Jabber port will be modified to 5223 if port 5222 is specified.', - 'JAB_USERNAME' => 'Jabber username', - 'JAB_USERNAME_EXPLAIN' => 'Specify a registered username. The username will not be checked for validity.', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/acp/bots.php b/phpBB/language/en/acp/bots.php deleted file mode 100644 index 3b63f2ea2e..0000000000 --- a/phpBB/language/en/acp/bots.php +++ /dev/null @@ -1,73 +0,0 @@ - 'Manage bots', - 'BOTS_EXPLAIN' => '“Botsâ€, “spiders†or “crawlers†are automated agents most commonly used by search engines to update their databases. Since they rarely make proper use of sessions they can distort visitor counts, increase load and sometimes fail to index sites correctly. Here you can define a special type of user to overcome these problems.', - 'BOT_ACTIVATE' => 'Activate', - 'BOT_ACTIVE' => 'Bot active', - 'BOT_ADD' => 'Add bot', - 'BOT_ADDED' => 'New bot successfully added.', - 'BOT_AGENT' => 'Agent match', - 'BOT_AGENT_EXPLAIN' => 'A string matching the bots browser agent, partial matches are allowed.', - 'BOT_DEACTIVATE' => 'Deactivate', - 'BOT_DELETED' => 'Bot deleted successfully.', - 'BOT_EDIT' => 'Edit bots', - 'BOT_EDIT_EXPLAIN' => 'Here you can add or edit an existing bot entry. You may define an agent string and/or one or more IP addresses (or range of addresses) to match. Be careful when defining matching agent strings or addresses. You may also specify a style and language that the bot will view the board using. This may allow you to reduce bandwidth use by setting a simple style for bots. Remember to set appropriate permissions for the special Bot usergroup.', - 'BOT_LANG' => 'Bot language', - 'BOT_LANG_EXPLAIN' => 'The language presented to the bot as it browses.', - 'BOT_LAST_VISIT' => 'Last visit', - 'BOT_IP' => 'Bot IP address', - 'BOT_IP_EXPLAIN' => 'Partial matches are allowed, separate addresses with a comma.', - 'BOT_NAME' => 'Bot name', - 'BOT_NAME_EXPLAIN' => 'Used only for your own information.', - 'BOT_NAME_TAKEN' => 'The name is already in use on your board and can’t be used for the Bot.', - 'BOT_NEVER' => 'Never', - 'BOT_STYLE' => 'Bot style', - 'BOT_STYLE_EXPLAIN' => 'The style used for the board by the bot.', - 'BOT_UPDATED' => 'Existing bot updated successfully.', - - 'ERR_BOT_AGENT_MATCHES_UA' => 'The bot agent you supplied is similar to the one you are currently using. Please adjust the agent for this bot.', - 'ERR_BOT_NO_IP' => 'The IP addresses you supplied were invalid or the hostname could not be resolved.', - 'ERR_BOT_NO_MATCHES' => 'You must supply at least one of an agent or IP for this bot match.', - - 'NO_BOT' => 'Found no bot with the specified ID.', - 'NO_BOT_GROUP' => 'Unable to find special bot group.', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php deleted file mode 100644 index 0c6014bc24..0000000000 --- a/phpBB/language/en/acp/common.php +++ /dev/null @@ -1,679 +0,0 @@ - 'Administrators', - 'ACP_ADMIN_LOGS' => 'Admin log', - 'ACP_ADMIN_ROLES' => 'Admin roles', - 'ACP_ATTACHMENTS' => 'Attachments', - 'ACP_ATTACHMENT_SETTINGS' => 'Attachment settings', - 'ACP_AUTH_SETTINGS' => 'Authentication', - 'ACP_AUTOMATION' => 'Automation', - 'ACP_AVATAR_SETTINGS' => 'Avatar settings', - - 'ACP_BACKUP' => 'Backup', - 'ACP_BAN' => 'Banning', - 'ACP_BAN_EMAILS' => 'Ban e-mails', - 'ACP_BAN_IPS' => 'Ban IPs', - 'ACP_BAN_USERNAMES' => 'Ban usernames', - 'ACP_BBCODES' => 'BBCodes', - 'ACP_BOARD_CONFIGURATION' => 'Board configuration', - 'ACP_BOARD_FEATURES' => 'Board features', - 'ACP_BOARD_MANAGEMENT' => 'Board management', - 'ACP_BOARD_SETTINGS' => 'Board settings', - 'ACP_BOTS' => 'Spiders/Robots', - - 'ACP_CAPTCHA' => 'CAPTCHA', - - 'ACP_CAT_DATABASE' => 'Database', - 'ACP_CAT_DOT_MODS' => '.MODs', - 'ACP_CAT_FORUMS' => 'Forums', - 'ACP_CAT_GENERAL' => 'General', - 'ACP_CAT_MAINTENANCE' => 'Maintenance', - 'ACP_CAT_PERMISSIONS' => 'Permissions', - 'ACP_CAT_POSTING' => 'Posting', - 'ACP_CAT_STYLES' => 'Styles', - 'ACP_CAT_SYSTEM' => 'System', - 'ACP_CAT_USERGROUP' => 'Users and Groups', - 'ACP_CAT_USERS' => 'Users', - 'ACP_CLIENT_COMMUNICATION' => 'Client communication', - 'ACP_COOKIE_SETTINGS' => 'Cookie settings', - 'ACP_CRITICAL_LOGS' => 'Error log', - 'ACP_CUSTOM_PROFILE_FIELDS' => 'Custom profile fields', - - 'ACP_DATABASE' => 'Database management', - 'ACP_DISALLOW' => 'Disallow', - 'ACP_DISALLOW_USERNAMES' => 'Disallow usernames', - - 'ACP_EMAIL_SETTINGS' => 'E-mail settings', - 'ACP_EXTENSION_GROUPS' => 'Manage extension groups', - - 'ACP_FORUM_BASED_PERMISSIONS' => 'Forum based permissions', - 'ACP_FORUM_LOGS' => 'Forum logs', - 'ACP_FORUM_MANAGEMENT' => 'Forum management', - 'ACP_FORUM_MODERATORS' => 'Forum moderators', - 'ACP_FORUM_PERMISSIONS' => 'Forum permissions', - 'ACP_FORUM_ROLES' => 'Forum roles', - - 'ACP_GENERAL_CONFIGURATION' => 'General configuration', - 'ACP_GENERAL_TASKS' => 'General tasks', - 'ACP_GLOBAL_MODERATORS' => 'Global moderators', - 'ACP_GLOBAL_PERMISSIONS' => 'Global permissions', - 'ACP_GROUPS' => 'Groups', - 'ACP_GROUPS_FORUM_PERMISSIONS' => 'Groups’ forum permissions', - 'ACP_GROUPS_MANAGE' => 'Manage groups', - 'ACP_GROUPS_MANAGEMENT' => 'Group management', - 'ACP_GROUPS_PERMISSIONS' => 'Groups’ permissions', - - 'ACP_ICONS' => 'Topic icons', - 'ACP_ICONS_SMILIES' => 'Topic icons/smilies', - 'ACP_IMAGESETS' => 'Imagesets', - 'ACP_INACTIVE_USERS' => 'Inactive users', - 'ACP_INDEX' => 'ACP index', - - 'ACP_JABBER_SETTINGS' => 'Jabber settings', - - 'ACP_LANGUAGE' => 'Language management', - 'ACP_LANGUAGE_PACKS' => 'Language packs', - 'ACP_LOAD_SETTINGS' => 'Load settings', - 'ACP_LOGGING' => 'Logging', - - 'ACP_MAIN' => 'ACP index', - 'ACP_MANAGE_EXTENSIONS' => 'Manage extensions', - 'ACP_MANAGE_FORUMS' => 'Manage forums', - 'ACP_MANAGE_RANKS' => 'Manage ranks', - 'ACP_MANAGE_REASONS' => 'Manage report/denial reasons', - 'ACP_MANAGE_USERS' => 'Manage users', - 'ACP_MASS_EMAIL' => 'Mass e-mail', - 'ACP_MESSAGES' => 'Messages', - 'ACP_MESSAGE_SETTINGS' => 'Private message settings', - 'ACP_MODULE_MANAGEMENT' => 'Module management', - 'ACP_MOD_LOGS' => 'Moderator log', - 'ACP_MOD_ROLES' => 'Moderator roles', - - 'ACP_ORPHAN_ATTACHMENTS' => 'Orphaned attachments', - - 'ACP_PERMISSIONS' => 'Permissions', - 'ACP_PERMISSION_MASKS' => 'Permission masks', - 'ACP_PERMISSION_ROLES' => 'Permission roles', - 'ACP_PERMISSION_TRACE' => 'Permission trace', - 'ACP_PHP_INFO' => 'PHP information', - 'ACP_POST_SETTINGS' => 'Post settings', - 'ACP_PRUNE_FORUMS' => 'Prune forums', - 'ACP_PRUNE_USERS' => 'Prune users', - 'ACP_PRUNING' => 'Pruning', - - 'ACP_QUICK_ACCESS' => 'Quick access', - - 'ACP_RANKS' => 'Ranks', - 'ACP_REASONS' => 'Report/denial reasons', - 'ACP_REGISTER_SETTINGS' => 'User registration settings', - - 'ACP_RESTORE' => 'Restore', - - 'ACP_SEARCH' => 'Search configuration', - 'ACP_SEARCH_INDEX' => 'Search index', - 'ACP_SEARCH_SETTINGS' => 'Search settings', - - 'ACP_SECURITY_SETTINGS' => 'Security settings', - 'ACP_SERVER_CONFIGURATION' => 'Server configuration', - 'ACP_SERVER_SETTINGS' => 'Server settings', - 'ACP_SIGNATURE_SETTINGS' => 'Signature settings', - 'ACP_SMILIES' => 'Smilies', - 'ACP_STYLE_COMPONENTS' => 'Style components', - 'ACP_STYLE_MANAGEMENT' => 'Style management', - 'ACP_STYLES' => 'Styles', - - 'ACP_TEMPLATES' => 'Templates', - 'ACP_THEMES' => 'Themes', - - 'ACP_UPDATE' => 'Updating', - 'ACP_USERS_FORUM_PERMISSIONS' => 'Users’ forum permissions', - 'ACP_USERS_LOGS' => 'User logs', - 'ACP_USERS_PERMISSIONS' => 'Users’ permissions', - 'ACP_USER_ATTACH' => 'Attachments', - 'ACP_USER_AVATAR' => 'Avatar', - 'ACP_USER_FEEDBACK' => 'Feedback', - 'ACP_USER_GROUPS' => 'Groups', - 'ACP_USER_MANAGEMENT' => 'User management', - 'ACP_USER_OVERVIEW' => 'Overview', - 'ACP_USER_PERM' => 'Permissions', - 'ACP_USER_PREFS' => 'Preferences', - 'ACP_USER_PROFILE' => 'Profile', - 'ACP_USER_RANK' => 'Rank', - 'ACP_USER_ROLES' => 'User roles', - 'ACP_USER_SECURITY' => 'User security', - 'ACP_USER_SIG' => 'Signature', - - 'ACP_VC_SETTINGS' => 'Visual confirmation settings', - 'ACP_VC_CAPTCHA_DISPLAY' => 'CAPTCHA image preview', - 'ACP_VERSION_CHECK' => 'Check for updates', - 'ACP_VIEW_ADMIN_PERMISSIONS' => 'View administrative permissions', - 'ACP_VIEW_FORUM_MOD_PERMISSIONS' => 'View forum moderation permissions', - 'ACP_VIEW_FORUM_PERMISSIONS' => 'View forum-based permissions', - 'ACP_VIEW_GLOBAL_MOD_PERMISSIONS' => 'View global moderation permissions', - 'ACP_VIEW_USER_PERMISSIONS' => 'View user-based permissions', - - 'ACP_WORDS' => 'Word censoring', - - 'ACTION' => 'Action', - 'ACTIONS' => 'Actions', - 'ACTIVATE' => 'Activate', - 'ADD' => 'Add', - 'ADMIN' => 'Administration', - 'ADMIN_INDEX' => 'Admin index', - 'ADMIN_PANEL' => 'Administration Control Panel', - - 'BACK' => 'Back', - - 'COLOUR_SWATCH' => 'Web-safe colour swatch', - 'CONFIG_UPDATED' => 'Configuration updated successfully.', - - 'DEACTIVATE' => 'Deactivate', - 'DIRECTORY_DOES_NOT_EXIST' => 'The entered path “%s†does not exist.', - 'DIRECTORY_NOT_DIR' => 'The entered path “%s†is not a directory.', - 'DIRECTORY_NOT_WRITABLE' => 'The entered path “%s†is not writable.', - 'DISABLE' => 'Disable', - 'DOWNLOAD' => 'Download', - 'DOWNLOAD_AS' => 'Download as', - 'DOWNLOAD_STORE' => 'Download or store file', - 'DOWNLOAD_STORE_EXPLAIN' => 'You may directly download the file or save it in your store/ folder.', - - 'EDIT' => 'Edit', - 'ENABLE' => 'Enable', - 'EXPORT_DOWNLOAD' => 'Download', - 'EXPORT_STORE' => 'Store', - - 'GENERAL_OPTIONS' => 'General options', - 'GENERAL_SETTINGS' => 'General settings', - 'GLOBAL_MASK' => 'Global permission mask', - - 'INSTALL' => 'Install', - 'IP' => 'User IP', - 'IP_HOSTNAME' => 'IP addresses or hostnames', - - 'LOGGED_IN_AS' => 'You are logged in as:', - 'LOGIN_ADMIN' => 'To administer the board you must be an authenticated user.', - 'LOGIN_ADMIN_CONFIRM' => 'To administer the board you must re-authenticate yourself.', - 'LOGIN_ADMIN_SUCCESS' => 'You have successfully authenticated and will now be redirected to the Administration Control Panel.', - 'LOOK_UP_FORUM' => 'Select a forum', - 'LOOK_UP_FORUMS_EXPLAIN'=> 'You are able to select more than one forum.', - - 'MANAGE' => 'Manage', - 'MENU_TOGGLE' => 'Hide or display the side menu', - 'MOVE_DOWN' => 'Move down', - 'MOVE_UP' => 'Move up', - - 'NOTIFY' => 'Notification', - 'NO_ADMIN' => 'You are not authorised to administrate this board.', - 'NO_EMAILS_DEFINED' => 'No valid e-mail addresses found.', - 'NO_PASSWORD_SUPPLIED' => 'You need to enter your password to access the Administration Control Panel.', - - 'OFF' => 'Off', - 'ON' => 'On', - - 'PARSE_BBCODE' => 'Parse BBCode', - 'PARSE_SMILIES' => 'Parse smilies', - 'PARSE_URLS' => 'Parse links', - 'PERMISSIONS_TRANSFERRED' => 'Permissions transferred', - 'PERMISSIONS_TRANSFERRED_EXPLAIN' => 'You currently have the permissions from %1$s. You are able to browse the board with this user’s permissions, but not access the administration control panel since admin permissions were not transferred. You can revert to your permission set at any time.', - 'PIXEL' => 'px', - 'PROCEED_TO_ACP' => '%sProceed to the ACP%s', - - 'REMIND' => 'Remind', - 'RESYNC' => 'Resynchronise', - 'RETURN_TO' => 'Return to…', - - 'SELECT_ANONYMOUS' => 'Select anonymous user', - 'SELECT_OPTION' => 'Select option', - - 'UCP' => 'User Control Panel', - 'USERNAMES_EXPLAIN' => 'Place each username on a separate line.', - 'USER_CONTROL_PANEL' => 'User Control Panel', - - 'WARNING' => 'Warning', -)); - -// PHP info -$lang = array_merge($lang, array( - 'ACP_PHP_INFO_EXPLAIN' => 'This page lists information on the version of PHP installed on this server. It includes details of loaded modules, available variables and default settings. This information may be useful when diagnosing problems. Please be aware that some hosting companies will limit what information is displayed here for security reasons. You are advised to not give out any details on this page except when asked by official team members on the support forums.', - - 'NO_PHPINFO_AVAILABLE' => 'Information about your PHP configuration is unable to be determined. Phpinfo() has been disabled for security reasons.', -)); - -// Logs -$lang = array_merge($lang, array( - 'ACP_ADMIN_LOGS_EXPLAIN' => 'This lists all the actions carried out by board administrators. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.', - 'ACP_CRITICAL_LOGS_EXPLAIN' => 'This lists the actions carried out by the board itself. This log provides you with information you are able to use for solving specific problems, for example non-delivery of e-mails. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.', - 'ACP_MOD_LOGS_EXPLAIN' => 'This lists all actions done on forums, topics and posts as well as actions carried out on users by moderators, including banning. You can sort by username, date, IP or action. If you have appropriate permissions you can also clear individual operations or the log as a whole.', - 'ACP_USERS_LOGS_EXPLAIN' => 'This lists all actions carried out by users or on users (reports, warnings and user notes).', - 'ALL_ENTRIES' => 'All entries', - - 'DISPLAY_LOG' => 'Display entries from previous', - - 'NO_ENTRIES' => 'No log entries for this period.', - - 'SORT_IP' => 'IP address', - 'SORT_DATE' => 'Date', - 'SORT_ACTION' => 'Log action', -)); - -// Index page -$lang = array_merge($lang, array( - 'ADMIN_INTRO' => 'Thank you for choosing phpBB as your board solution. This screen will give you a quick overview of all the various statistics of your board. The links on the left hand side of this screen allow you to control every aspect of your board experience. Each page will have instructions on how to use the tools.', - 'ADMIN_LOG' => 'Logged administrator actions', - 'ADMIN_LOG_INDEX_EXPLAIN' => 'This gives an overview of the last five actions carried out by board administrators. A full copy of the log can be viewed from the appropriate menu item or following the link below.', - 'AVATAR_DIR_SIZE' => 'Avatar directory size', - - 'BOARD_STARTED' => 'Board started', - 'BOARD_VERSION' => 'Board version', - - 'DATABASE_SERVER_INFO' => 'Database server', - 'DATABASE_SIZE' => 'Database size', - - 'FILES_PER_DAY' => 'Attachments per day', - 'FORUM_STATS' => 'Board statistics', - - 'GZIP_COMPRESSION' => 'GZip compression', - - 'NOT_AVAILABLE' => 'Not available', - 'NUMBER_FILES' => 'Number of attachments', - 'NUMBER_POSTS' => 'Number of posts', - 'NUMBER_TOPICS' => 'Number of topics', - 'NUMBER_USERS' => 'Number of users', - 'NUMBER_ORPHAN' => 'Orphan attachments', - - 'POSTS_PER_DAY' => 'Posts per day', - - 'PURGE_CACHE' => 'Purge the cache', - 'PURGE_CACHE_CONFIRM' => 'Are you sure you wish to purge the cache?', - 'PURGE_CACHE_EXPLAIN' => 'Purge all cache related items, this includes any cached template files or queries.', - - 'RESET_DATE' => 'Reset board’s start date', - 'RESET_DATE_CONFIRM' => 'Are you sure you wish to reset the board’s start date?', - 'RESET_ONLINE' => 'Reset most users ever online', - 'RESET_ONLINE_CONFIRM' => 'Are you sure you wish to reset the most users ever online counter?', - 'RESYNC_POSTCOUNTS' => 'Resynchronise post counts', - 'RESYNC_POSTCOUNTS_EXPLAIN' => 'Only existing posts will be taken into consideration. Pruned posts will not be counted.', - 'RESYNC_POSTCOUNTS_CONFIRM' => 'Are you sure you wish to resynchronise post counts?', - 'RESYNC_POST_MARKING' => 'Resynchronise dotted topics', - 'RESYNC_POST_MARKING_CONFIRM' => 'Are you sure you wish to resynchronise dotted topics?', - 'RESYNC_POST_MARKING_EXPLAIN' => 'First unmarks all topics and then correctly marks topics that have seen any activity during the past six months.', - 'RESYNC_STATS' => 'Resynchronise statistics', - 'RESYNC_STATS_CONFIRM' => 'Are you sure you wish to resynchronise statistics?', - 'RESYNC_STATS_EXPLAIN' => 'Recalculates the total number of posts, topics, users and files.', - 'RUN' => 'Run now', - - 'STATISTIC' => 'Statistic', - 'STATISTIC_RESYNC_OPTIONS' => 'Resynchronise or reset statistics', - - 'TOPICS_PER_DAY' => 'Topics per day', - - 'UPLOAD_DIR_SIZE' => 'Size of posted attachments', - 'USERS_PER_DAY' => 'Users per day', - - 'VALUE' => 'Value', - 'VIEW_ADMIN_LOG' => 'View administrator log', - 'VIEW_INACTIVE_USERS' => 'View inactive users', - - 'WELCOME_PHPBB' => 'Welcome to phpBB', -)); - -// Inactive Users -$lang = array_merge($lang, array( - 'INACTIVE_DATE' => 'Inactive date', - 'INACTIVE_REASON' => 'Reason', - 'INACTIVE_REASON_MANUAL' => 'Account deactivated by administrator', - 'INACTIVE_REASON_PROFILE' => 'Profile details changed', - 'INACTIVE_REASON_REGISTER' => 'Newly registered account', - 'INACTIVE_REASON_REMIND' => 'Forced user account reactivation', - 'INACTIVE_REASON_UNKNOWN' => 'Unknown', - 'INACTIVE_USERS' => 'Inactive users', - 'INACTIVE_USERS_EXPLAIN' => 'This is a list of users who have registered but whose accounts are inactive. You can activate, delete or remind (by sending an e-mail) these users if you wish.', - 'INACTIVE_USERS_EXPLAIN_INDEX' => 'This is a list of the last 10 registered users who have inactive accounts. A full list is available from the appropriate menu item or by following the link below from where you can activate, delete or remind (by sending an e-mail) these users if you wish.', - - 'NO_INACTIVE_USERS' => 'No inactive users', - - 'SORT_INACTIVE' => 'Inactive date', - 'SORT_LAST_VISIT' => 'Last visit', - 'SORT_REASON' => 'Reason', - 'SORT_REG_DATE' => 'Registration date', - - 'USER_IS_INACTIVE' => 'User is inactive', -)); - -// Log Entries -$lang = array_merge($lang, array( - 'LOG_ACL_ADD_USER_GLOBAL_U_' => 'Added or edited users’ user permissions
    » %s', - 'LOG_ACL_ADD_GROUP_GLOBAL_U_' => 'Added or edited groups’ user permissions
    » %s', - 'LOG_ACL_ADD_USER_GLOBAL_M_' => 'Added or edited users’ global moderator permissions
    » %s', - 'LOG_ACL_ADD_GROUP_GLOBAL_M_' => 'Added or edited groups’ global moderator permissions
    » %s', - 'LOG_ACL_ADD_USER_GLOBAL_A_' => 'Added or edited users’ administrator permissions
    » %s', - 'LOG_ACL_ADD_GROUP_GLOBAL_A_' => 'Added or edited groups’ administrator permissions
    » %s', - - 'LOG_ACL_ADD_ADMIN_GLOBAL_A_' => 'Added or edited Administrators
    » %s', - 'LOG_ACL_ADD_MOD_GLOBAL_M_' => 'Added or edited Global Moderators
    » %s', - - 'LOG_ACL_ADD_USER_LOCAL_F_' => 'Added or edited users’ forum access from %1$s
    » %2$s', - 'LOG_ACL_ADD_USER_LOCAL_M_' => 'Added or edited users’ forum moderator access from %1$s
    » %2$s', - 'LOG_ACL_ADD_GROUP_LOCAL_F_' => 'Added or edited groups’ forum access from %1$s
    » %2$s', - 'LOG_ACL_ADD_GROUP_LOCAL_M_' => 'Added or edited groups’ forum moderator access from %1$s
    » %2$s', - - 'LOG_ACL_ADD_MOD_LOCAL_M_' => 'Added or edited Moderators from %1$s
    » %2$s', - 'LOG_ACL_ADD_FORUM_LOCAL_F_' => 'Added or edited forum permissions from %1$s
    » %2$s', - - 'LOG_ACL_DEL_ADMIN_GLOBAL_A_' => 'Removed Administrators
    » %s', - 'LOG_ACL_DEL_MOD_GLOBAL_M_' => 'Removed Global Moderators
    » %s', - 'LOG_ACL_DEL_MOD_LOCAL_M_' => 'Removed Moderators from %1$s
    » %2$s', - 'LOG_ACL_DEL_FORUM_LOCAL_F_' => 'Removed User/Group forum permissions from %1$s
    » %2$s', - - 'LOG_ACL_TRANSFER_PERMISSIONS' => 'Permissions transferred from
    » %s', - 'LOG_ACL_RESTORE_PERMISSIONS' => 'Own permissions restored after using permissions from
    » %s', - - 'LOG_ADMIN_AUTH_FAIL' => 'Failed administration login attempt', - 'LOG_ADMIN_AUTH_SUCCESS' => 'Successful administration login', - - 'LOG_ATTACHMENTS_DELETED' => 'Removed user attachments
    » %s', - - 'LOG_ATTACH_EXT_ADD' => 'Added or edited attachment extension
    » %s', - 'LOG_ATTACH_EXT_DEL' => 'Removed attachment extension
    » %s', - 'LOG_ATTACH_EXT_UPDATE' => 'Updated attachment extension
    » %s', - 'LOG_ATTACH_EXTGROUP_ADD' => 'Added extension group
    » %s', - 'LOG_ATTACH_EXTGROUP_EDIT' => 'Edited extension group
    » %s', - 'LOG_ATTACH_EXTGROUP_DEL' => 'Removed extension group
    » %s', - 'LOG_ATTACH_FILEUPLOAD' => 'Orphan File uploaded to Post
    » ID %1$d - %2$s', - 'LOG_ATTACH_ORPHAN_DEL' => 'Orphan Files deleted
    » %s', - - 'LOG_BAN_EXCLUDE_USER' => 'Excluded user from ban for reason “%1$sâ€
    » %2$s', - 'LOG_BAN_EXCLUDE_IP' => 'Excluded IP from ban for reason “%1$sâ€
    » %2$s', - 'LOG_BAN_EXCLUDE_EMAIL' => 'Excluded e-mail from ban for reason “%1$sâ€
    » %2$s', - 'LOG_BAN_USER' => 'Banned user for reason “%1$sâ€
    » %2$s', - 'LOG_BAN_IP' => 'Banned IP for reason “%1$sâ€
    » %2$s', - 'LOG_BAN_EMAIL' => 'Banned e-mail for reason “%1$sâ€
    » %2$s', - 'LOG_UNBAN_USER' => 'Unbanned user
    » %s', - 'LOG_UNBAN_IP' => 'Unbanned IP
    » %s', - 'LOG_UNBAN_EMAIL' => 'Unbanned e-mail
    » %s', - - 'LOG_BBCODE_ADD' => 'Added new BBCode
    » %s', - 'LOG_BBCODE_EDIT' => 'Edited BBCode
    » %s', - 'LOG_BBCODE_DELETE' => 'Deleted BBCode
    » %s', - - 'LOG_BOT_ADDED' => 'New bot added
    » %s', - 'LOG_BOT_DELETE' => 'Deleted bot
    » %s', - 'LOG_BOT_UPDATED' => 'Existing bot updated
    » %s', - - 'LOG_CLEAR_ADMIN' => 'Cleared admin log', - 'LOG_CLEAR_CRITICAL' => 'Cleared error log', - 'LOG_CLEAR_MOD' => 'Cleared moderator log', - 'LOG_CLEAR_USER' => 'Cleared user log
    » %s', - 'LOG_CLEAR_USERS' => 'Cleared user logs', - - 'LOG_CONFIG_ATTACH' => 'Altered attachment settings', - 'LOG_CONFIG_AUTH' => 'Altered authentication settings', - 'LOG_CONFIG_AVATAR' => 'Altered avatar settings', - 'LOG_CONFIG_COOKIE' => 'Altered cookie settings', - 'LOG_CONFIG_EMAIL' => 'Altered e-mail settings', - 'LOG_CONFIG_FEATURES' => 'Altered board features', - 'LOG_CONFIG_LOAD' => 'Altered load settings', - 'LOG_CONFIG_MESSAGE' => 'Altered private message settings', - 'LOG_CONFIG_POST' => 'Altered post settings', - 'LOG_CONFIG_REGISTRATION' => 'Altered user registration settings', - 'LOG_CONFIG_SEARCH' => 'Altered search settings', - 'LOG_CONFIG_SECURITY' => 'Altered security settings', - 'LOG_CONFIG_SERVER' => 'Altered server settings', - 'LOG_CONFIG_SETTINGS' => 'Altered board settings', - 'LOG_CONFIG_SIGNATURE' => 'Altered signature settings', - 'LOG_CONFIG_VISUAL' => 'Altered visual confirmation settings', - - 'LOG_APPROVE_TOPIC' => 'Approved topic
    » %s', - 'LOG_BUMP_TOPIC' => 'User bumped topic
    » %s', - 'LOG_DELETE_POST' => 'Deleted post
    » %s', - 'LOG_DELETE_TOPIC' => 'Deleted topic
    » %s', - 'LOG_FORK' => 'Copied topic
    » from %s', - 'LOG_LOCK' => 'Locked topic
    » %s', - 'LOG_LOCK_POST' => 'Locked post
    » %s', - 'LOG_MERGE' => 'Merged posts into topic
    » %s', - 'LOG_MOVE' => 'Moved topic
    » from %s', - 'LOG_POST_APPROVED' => 'Approved post
    » %s', - 'LOG_POST_DISAPPROVED' => 'Disapproved post “%1$s†with the following reason
    » %2$s', - 'LOG_POST_EDITED' => 'Edited post “%1$s†written by
    » %2$s', - 'LOG_REPORT_CLOSED' => 'Closed report
    » %s', - 'LOG_REPORT_DELETED' => 'Deleted report
    » %s', - 'LOG_SPLIT_DESTINATION' => 'Moved split posts
    » to %s', - 'LOG_SPLIT_SOURCE' => 'Split posts
    » from %s', - - 'LOG_TOPIC_DELETED' => 'Deleted topic
    » %s', - 'LOG_TOPIC_APPROVED' => 'Approved topic
    » %s', - 'LOG_TOPIC_DISAPPROVED' => 'Disapproved topic “%1$s†with the following reason
    %2$s', - 'LOG_TOPIC_RESYNC' => 'Resynchronised topic counters
    » %s', - 'LOG_TOPIC_TYPE_CHANGED' => 'Changed topic type
    » %s', - 'LOG_UNLOCK' => 'Unlocked topic
    » %s', - 'LOG_UNLOCK_POST' => 'Unlocked post
    » %s', - - 'LOG_DISALLOW_ADD' => 'Added disallowed username
    » %s', - 'LOG_DISALLOW_DELETE' => 'Deleted disallowed username', - - 'LOG_DB_BACKUP' => 'Database backup', - 'LOG_DB_DELETE' => 'Deleted database backup', - 'LOG_DB_RESTORE' => 'Restored database backup', - - 'LOG_DOWNLOAD_EXCLUDE_IP' => 'Excluded IP/hostname from download list
    » %s', - 'LOG_DOWNLOAD_IP' => 'Added IP/hostname to download list
    » %s', - 'LOG_DOWNLOAD_REMOVE_IP' => 'Removed IP/hostname from download list
    » %s', - - 'LOG_ERROR_JABBER' => 'Jabber error
    » %s', - 'LOG_ERROR_EMAIL' => 'E-mail error
    » %s', - - 'LOG_FORUM_ADD' => 'Created new forum
    » %s', - 'LOG_FORUM_DEL_FORUM' => 'Deleted forum
    » %s', - 'LOG_FORUM_DEL_FORUMS' => 'Deleted forum and its subforums
    » %s', - 'LOG_FORUM_DEL_MOVE_FORUMS' => 'Deleted forum and moved subforums to %1$s
    » %2$s', - 'LOG_FORUM_DEL_MOVE_POSTS' => 'Deleted forum and moved posts to %1$s
    » %2$s', - 'LOG_FORUM_DEL_MOVE_POSTS_FORUMS' => 'Deleted forum and its subforums, moved messages to %1$s
    » %2$s', - 'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS' => 'Deleted forum, moved posts to %1$s and subforums to %2$s
    » %3$s', - 'LOG_FORUM_DEL_POSTS' => 'Deleted forum and its messages
    » %s', - 'LOG_FORUM_DEL_POSTS_FORUMS' => 'Deleted forum, its messages and subforums
    » %s', - 'LOG_FORUM_DEL_POSTS_MOVE_FORUMS' => 'Deleted forum and its messages, moved subforums to %1$s
    » %2$s', - 'LOG_FORUM_EDIT' => 'Edited forum details
    » %s', - 'LOG_FORUM_MOVE_DOWN' => 'Moved forum %1$s below %2$s', - 'LOG_FORUM_MOVE_UP' => 'Moved forum %1$s above %2$s', - 'LOG_FORUM_SYNC' => 'Re-synchronised forum
    » %s', - - 'LOG_GROUP_CREATED' => 'New usergroup created
    » %s', - 'LOG_GROUP_DEFAULTS' => 'Group “%1$s†made default for members
    » %2$s', - 'LOG_GROUP_DELETE' => 'Usergroup deleted
    » %s', - 'LOG_GROUP_DEMOTED' => 'Leaders demoted in usergroup %1$s
    » %2$s', - 'LOG_GROUP_PROMOTED' => 'Members promoted to leader in usergroup %1$s
    » %2$s', - 'LOG_GROUP_REMOVE' => 'Members removed from usergroup %1$s
    » %2$s', - 'LOG_GROUP_UPDATED' => 'Usergroup details updated
    » %s', - 'LOG_MODS_ADDED' => 'Added new leaders to usergroup %1$s
    » %2$s', - 'LOG_USERS_APPROVED' => 'Users approved in usergroup %1$s
    » %2$s', - 'LOG_USERS_ADDED' => 'Added new members to usergroup %1$s
    » %2$s', - - 'LOG_IMAGESET_ADD_DB' => 'Added new imageset to database
    » %s', - 'LOG_IMAGESET_ADD_FS' => 'Add new imageset on filesystem
    » %s', - 'LOG_IMAGESET_DELETE' => 'Deleted imageset
    » %s', - 'LOG_IMAGESET_EDIT_DETAILS' => 'Edited imageset details
    » %s', - 'LOG_IMAGESET_EDIT' => 'Edited imageset
    » %s', - 'LOG_IMAGESET_EXPORT' => 'Exported imageset
    » %s', - 'LOG_IMAGESET_LANG_MISSING' => 'Imageset misses “%2$s†localisation
    » %1$s', - 'LOG_IMAGESET_LANG_REFRESHED' => 'Refreshed “%2$s†localisation of imageset
    » %1$s', - 'LOG_IMAGESET_REFRESHED' => 'Refreshed imageset
    » %s', - - 'LOG_INACTIVE_ACTIVATE' => 'Activated inactive users
    » %s', - 'LOG_INACTIVE_DELETE' => 'Deleted inactive users
    » %s', - 'LOG_INACTIVE_REMIND' => 'Sent reminder e-mails to inactive users
    » %s', - 'LOG_INSTALL_CONVERTED' => 'Converted from %1$s to phpBB %2$s', - 'LOG_INSTALL_INSTALLED' => 'Installed phpBB %s', - - 'LOG_IP_BROWSER_FORWARDED_CHECK' => 'Session IP/browser/X_FORWARDED_FOR check failed
    »User IP “%1$s†checked against session IP “%2$sâ€, user browser string “%3$s†checked against session browser string “%4$s†and user X_FORWARDED_FOR string “%5$s†checked against session X_FORWARDED_FOR string “%6$sâ€.', - - 'LOG_JAB_CHANGED' => 'Jabber account changed', - 'LOG_JAB_PASSCHG' => 'Jabber password changed', - 'LOG_JAB_REGISTER' => 'Jabber account registered', - 'LOG_JAB_SETTINGS_CHANGED' => 'Jabber settings changed', - - 'LOG_LANGUAGE_PACK_DELETED' => 'Deleted language pack
    » %s', - 'LOG_LANGUAGE_PACK_INSTALLED' => 'Installed language pack
    » %s', - 'LOG_LANGUAGE_PACK_UPDATED' => 'Updated language pack details
    » %s', - 'LOG_LANGUAGE_FILE_REPLACED' => 'Replaced language file
    » %s', - 'LOG_LANGUAGE_FILE_SUBMITTED' => 'Submitted language file and placed in store folder
    » %s', - - 'LOG_MASS_EMAIL' => 'Sent mass e-mail
    » %s', - - 'LOG_MCP_CHANGE_POSTER' => 'Changed poster in topic “%1$sâ€
    » from %2$s to %3$s', - - 'LOG_MODULE_DISABLE' => 'Module disabled
    » %s', - 'LOG_MODULE_ENABLE' => 'Module enabled
    » %s', - 'LOG_MODULE_MOVE_DOWN' => 'Module moved down
    » %1$s below %2$s', - 'LOG_MODULE_MOVE_UP' => 'Module moved up
    » %1$s above %2$s', - 'LOG_MODULE_REMOVED' => 'Module removed
    » %s', - 'LOG_MODULE_ADD' => 'Module added
    » %s', - 'LOG_MODULE_EDIT' => 'Module edited
    » %s', - - 'LOG_A_ROLE_ADD' => 'Admin role added
    » %s', - 'LOG_A_ROLE_EDIT' => 'Admin role edited
    » %s', - 'LOG_A_ROLE_REMOVED' => 'Admin role removed
    » %s', - 'LOG_F_ROLE_ADD' => 'Forum role added
    » %s', - 'LOG_F_ROLE_EDIT' => 'Forum role edited
    » %s', - 'LOG_F_ROLE_REMOVED' => 'Forum role removed
    » %s', - 'LOG_M_ROLE_ADD' => 'Moderator role added
    » %s', - 'LOG_M_ROLE_EDIT' => 'Moderator role edited
    » %s', - 'LOG_M_ROLE_REMOVED' => 'Moderator role removed
    » %s', - 'LOG_U_ROLE_ADD' => 'User role added
    » %s', - 'LOG_U_ROLE_EDIT' => 'User role edited
    » %s', - 'LOG_U_ROLE_REMOVED' => 'User role removed
    » %s', - - 'LOG_PROFILE_FIELD_ACTIVATE' => 'Profile field activated
    » %s', - 'LOG_PROFILE_FIELD_CREATE' => 'Profile field added
    » %s', - 'LOG_PROFILE_FIELD_DEACTIVATE' => 'Profile field deactivated
    » %s', - 'LOG_PROFILE_FIELD_EDIT' => 'Profile field changed
    » %s', - 'LOG_PROFILE_FIELD_REMOVED' => 'Profile field removed
    » %s', - - 'LOG_PRUNE' => 'Pruned forums
    » %s', - 'LOG_AUTO_PRUNE' => 'Auto-pruned forums
    » %s', - 'LOG_PRUNE_USER_DEAC' => 'Users deactivated
    » %s', - 'LOG_PRUNE_USER_DEL_DEL' => 'Users pruned and posts deleted
    » %s', - 'LOG_PRUNE_USER_DEL_ANON' => 'Users pruned and posts retained
    » %s', - - 'LOG_PURGE_CACHE' => 'Purged cache', - - 'LOG_RANK_ADDED' => 'Added new rank
    » %s', - 'LOG_RANK_REMOVED' => 'Removed rank
    » %s', - 'LOG_RANK_UPDATED' => 'Updated rank
    » %s', - - 'LOG_REASON_ADDED' => 'Added report/denial reason
    » %s', - 'LOG_REASON_REMOVED' => 'Removed report/denial reason
    » %s', - 'LOG_REASON_UPDATED' => 'Updated report/denial reason
    » %s', - - 'LOG_RESET_DATE' => 'Board start date reset', - 'LOG_RESET_ONLINE' => 'Most users online reset', - 'LOG_RESYNC_POSTCOUNTS' => 'User post counts resynchronised', - 'LOG_RESYNC_POST_MARKING' => 'Dotted topics resynchronised', - 'LOG_RESYNC_STATS' => 'Post, topic and user statistics resynchronised', - - 'LOG_SEARCH_INDEX_CREATED' => 'Created search index for
    » %s', - 'LOG_SEARCH_INDEX_REMOVED' => 'Removed search index for
    » %s', - 'LOG_STYLE_ADD' => 'Added new style
    » %s', - 'LOG_STYLE_DELETE' => 'Deleted style
    » %s', - 'LOG_STYLE_EDIT_DETAILS' => 'Edited style
    » %s', - 'LOG_STYLE_EXPORT' => 'Exported style
    » %s', - - 'LOG_TEMPLATE_ADD_DB' => 'Added new template set to database
    » %s', - 'LOG_TEMPLATE_ADD_FS' => 'Add new template set on filesystem
    » %s', - 'LOG_TEMPLATE_CACHE_CLEARED' => 'Deleted cached versions of template files in template set %1$s
    » %2$s', - 'LOG_TEMPLATE_DELETE' => 'Deleted template set
    » %s', - 'LOG_TEMPLATE_EDIT' => 'Edited template set %1$s
    » %2$s', - 'LOG_TEMPLATE_EDIT_DETAILS' => 'Edited template details
    » %s', - 'LOG_TEMPLATE_EXPORT' => 'Exported template set
    » %s', - 'LOG_TEMPLATE_REFRESHED' => 'Refreshed template set
    » %s', - - 'LOG_THEME_ADD_DB' => 'Added new theme to database
    » %s', - 'LOG_THEME_ADD_FS' => 'Add new theme on filesystem
    » %s', - 'LOG_THEME_DELETE' => 'Theme deleted
    » %s', - 'LOG_THEME_EDIT_DETAILS' => 'Edited theme details
    » %s', - 'LOG_THEME_EDIT' => 'Edited theme %1$s', - 'LOG_THEME_EDIT_FILE' => 'Edited theme %1$s
    » Modified file %2$s', - 'LOG_THEME_EXPORT' => 'Exported theme
    » %s', - 'LOG_THEME_REFRESHED' => 'Refreshed theme
    » %s', - - 'LOG_UPDATE_DATABASE' => 'Updated Database from version %1$s to version %2$s', - 'LOG_UPDATE_PHPBB' => 'Updated phpBB from version %1$s to version %2$s', - - 'LOG_USER_ACTIVE' => 'User activated
    » %s', - 'LOG_USER_BAN_USER' => 'Banned User via user management for reason “%1$sâ€
    » %2$s', - 'LOG_USER_BAN_IP' => 'Banned IP via user management for reason “%1$sâ€
    » %2$s', - 'LOG_USER_BAN_EMAIL' => 'Banned e-mail via user management for reason “%1$sâ€
    » %2$s', - 'LOG_USER_DELETED' => 'Deleted user
    » %s', - 'LOG_USER_DEL_ATTACH' => 'Removed all attachments made by the user
    » %s', - 'LOG_USER_DEL_AVATAR' => 'Removed user avatar
    » %s', - 'LOG_USER_DEL_POSTS' => 'Removed all posts made by the user
    » %s', - 'LOG_USER_DEL_SIG' => 'Removed user signature
    » %s', - 'LOG_USER_INACTIVE' => 'User deactivated
    » %s', - 'LOG_USER_MOVE_POSTS' => 'Moved user posts
    » posts by “%1$s†to forum “%2$sâ€', - 'LOG_USER_NEW_PASSWORD' => 'Changed user password
    » %s', - 'LOG_USER_REACTIVATE' => 'Forced user account reactivation
    » %s', - 'LOG_USER_UPDATE_EMAIL' => 'User “%1$s†changed e-mail
    » from “%2$s†to “%3$sâ€', - 'LOG_USER_UPDATE_NAME' => 'Changed username
    » from “%1$s†to “%2$sâ€', - 'LOG_USER_USER_UPDATE' => 'Updated user details
    » %s', - - 'LOG_USER_ACTIVE_USER' => 'User account activated', - 'LOG_USER_DEL_AVATAR_USER' => 'User avatar removed', - 'LOG_USER_DEL_SIG_USER' => 'User signature removed', - 'LOG_USER_FEEDBACK' => 'Added user feedback
    » %s', - 'LOG_USER_GENERAL' => 'Entry added:
    » %s', - 'LOG_USER_INACTIVE_USER' => 'User account de-activated', - 'LOG_USER_LOCK' => 'User locked own topic
    » %s', - 'LOG_USER_MOVE_POSTS_USER' => 'Moved all posts to forum» %s', - 'LOG_USER_REACTIVATE_USER' => 'Forced user account reactivation', - 'LOG_USER_UNLOCK' => 'User unlocked own topic
    » %s', - 'LOG_USER_WARNING' => 'Added user warning
    » %s', - 'LOG_USER_WARNING_BODY' => 'The following warning was issued to this user
    » %s', - - 'LOG_USER_GROUP_CHANGE' => 'User changed default group
    » %s', - 'LOG_USER_GROUP_DEMOTE' => 'User demoted as leaders from usergroup
    » %s', - 'LOG_USER_GROUP_JOIN' => 'User joined group
    » %s', - 'LOG_USER_GROUP_JOIN_PENDING' => 'User joined group and needs to be approved
    » %s', - 'LOG_USER_GROUP_RESIGN' => 'User resigned membership from group
    » %s', - - 'LOG_WORD_ADD' => 'Added word censor
    » %s', - 'LOG_WORD_DELETE' => 'Deleted word censor
    » %s', - 'LOG_WORD_EDIT' => 'Edited word censor
    » %s', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php deleted file mode 100644 index 7100fcb1e3..0000000000 --- a/phpBB/language/en/acp/database.php +++ /dev/null @@ -1,75 +0,0 @@ - 'Here you can backup all your phpBB related data. You may store the resulting archive in your store/ folder or download it directly. Depending on your server configuration you may be able to compress the file in a number of formats.', - 'ACP_RESTORE_EXPLAIN' => 'This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may use a gzip or bzip2 compressed text file and it will automatically be decompressed. WARNING This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete. Backups are stored in the store/ folder and are assumed to be generated by phpBB’s backup functionality. Restoring backups that were not created by the built in system may or may not work.', - - 'BACKUP_DELETE' => 'The backup file has been deleted successfully.', - 'BACKUP_INVALID' => 'The selected file to backup is invalid.', - 'BACKUP_OPTIONS' => 'Backup options', - 'BACKUP_SUCCESS' => 'The backup file has been created successfully.', - 'BACKUP_TYPE' => 'Backup type', - - 'DATABASE' => 'Database utilities', - 'DATA_ONLY' => 'Data only', - 'DELETE_BACKUP' => 'Delete backup', - 'DELETE_SELECTED_BACKUP' => 'Are you sure you want to delete the selected backup?', - 'DESELECT_ALL' => 'Deselect all', - 'DOWNLOAD_BACKUP' => 'Download backup', - - 'FILE_TYPE' => 'File type', - 'FULL_BACKUP' => 'Full', - - 'RESTORE_FAILURE' => 'The backup file may be corrupt.', - 'RESTORE_OPTIONS' => 'Restore options', - 'RESTORE_SUCCESS' => 'The database has been successfully restored.

    Your board should be back to the state it was when the backup was made.', - - 'SELECT_ALL' => 'Select all', - 'SELECT_FILE' => 'Select a file', - 'START_BACKUP' => 'Start backup', - 'START_RESTORE' => 'Start restore', - 'STORE_AND_DOWNLOAD' => 'Store and download', - 'STORE_LOCAL' => 'Store file locally', - 'STRUCTURE_ONLY' => 'Structure only', - - 'TABLE_SELECT' => 'Table select', - 'TABLE_SELECT_ERROR'=> 'You must select at least one table.', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/acp/email.php b/phpBB/language/en/acp/email.php deleted file mode 100644 index 4427bfff01..0000000000 --- a/phpBB/language/en/acp/email.php +++ /dev/null @@ -1,67 +0,0 @@ - 'Here you can e-mail a message to either all of your users or all users of a specific group having the option to receive mass e-mails enabled. To achieve this an e-mail will be sent out to the administrative e-mail address supplied, with a blind carbon copy sent to all recipients. The default setting is to only include 50 recipients in such an e-mail, for more recipients more e-mails will be sent. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time, you will be notified when the script has completed.', - 'ALL_USERS' => 'All users', - - 'COMPOSE' => 'Compose', - - 'EMAIL_SEND_ERROR' => 'There were one or more errors while sending the e-mail. Please check the %sError log%s for detailed error messages.', - 'EMAIL_SENT' => 'This message has been sent.', - 'EMAIL_SENT_QUEUE' => 'This message has been queued for sending.', - - 'LOG_SESSION' => 'Log mail session to critical log', - - 'SEND_IMMEDIATELY' => 'Send immediately', - 'SEND_TO_GROUP' => 'Send to group', - 'SEND_TO_USERS' => 'Send to users', - 'SEND_TO_USERS_EXPLAIN' => 'Entering names here will override any group selected above. Enter each username on a new line.', - - 'MAIL_HIGH_PRIORITY' => 'High', - 'MAIL_LOW_PRIORITY' => 'Low', - 'MAIL_NORMAL_PRIORITY' => 'Normal', - 'MAIL_PRIORITY' => 'Mail priority', - 'MASS_MESSAGE' => 'Your message', - 'MASS_MESSAGE_EXPLAIN' => 'Please note that you may enter only plain text. All markup will be removed before sending.', - - 'NO_EMAIL_MESSAGE' => 'You must enter a message.', - 'NO_EMAIL_SUBJECT' => 'You must specify a subject for your message.', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php deleted file mode 100644 index 84f280c779..0000000000 --- a/phpBB/language/en/acp/forums.php +++ /dev/null @@ -1,154 +0,0 @@ - 'Auto-prune post age', - 'AUTO_PRUNE_DAYS_EXPLAIN' => 'Number of days since last post after which topic is removed.', - 'AUTO_PRUNE_FREQ' => 'Auto-prune frequency', - 'AUTO_PRUNE_FREQ_EXPLAIN' => 'Time in days between pruning events.', - 'AUTO_PRUNE_VIEWED' => 'Auto-prune post viewed age', - 'AUTO_PRUNE_VIEWED_EXPLAIN' => 'Number of days since topic was viewed after which topic is removed.', - - 'COPY_PERMISSIONS' => 'Copy permissions from', - 'COPY_PERMISSIONS_ADD_EXPLAIN' => 'Once created, the forum will have the same permissions as the one you select here. If no forum is selected the newly created forum will not be visible until permissions had been set.', - 'COPY_PERMISSIONS_EDIT_EXPLAIN' => 'If you select to copy permissions, the forum will have the same permissions as the one you select here. This will overwrite any permissions you have previously set for this forum with the permissions of the forum you select here. If no forum is selected the current permissions will be kept.', - 'CREATE_FORUM' => 'Create new forum', - - 'DECIDE_MOVE_DELETE_CONTENT' => 'Delete content or move to forum', - 'DECIDE_MOVE_DELETE_SUBFORUMS' => 'Delete subforums or move to forum', - 'DEFAULT_STYLE' => 'Default style', - 'DELETE_ALL_POSTS' => 'Delete posts', - 'DELETE_SUBFORUMS' => 'Delete subforums and posts', - 'DISPLAY_ACTIVE_TOPICS' => 'Enable active topics', - 'DISPLAY_ACTIVE_TOPICS_EXPLAIN' => 'If set to yes active topics in selected subforums will be displayed under this category.', - - 'EDIT_FORUM' => 'Edit forum', - 'ENABLE_INDEXING' => 'Enable search indexing', - 'ENABLE_INDEXING_EXPLAIN' => 'If set to yes posts made to this forum will be indexed for searching.', - 'ENABLE_POST_REVIEW' => 'Enable post review', - 'ENABLE_POST_REVIEW_EXPLAIN' => 'If set to yes users are able to review their post if new posts were made to the topic while users wrote theirs. This should be disabled for chat forums.', - 'ENABLE_RECENT' => 'Display active topics', - 'ENABLE_RECENT_EXPLAIN' => 'If set to yes topics made to this forum will be shown in the active topics list.', - 'ENABLE_TOPIC_ICONS' => 'Enable topic icons', - - 'FORUM_ADMIN' => 'Forum administration', - 'FORUM_ADMIN_EXPLAIN' => 'In phpBB3 there are no categories, everything is forum based. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum. You need to copy or set appropriate permissions for newly created forums to have them displayed.', - 'FORUM_AUTO_PRUNE' => 'Enable auto-pruning', - 'FORUM_AUTO_PRUNE_EXPLAIN' => 'Prunes the forum of topics, set the frequency/age parameters below.', - 'FORUM_CREATED' => 'Forum created successfully.', - 'FORUM_DATA_NEGATIVE' => 'Pruning parameters cannot be negative.', - 'FORUM_DESC_TOO_LONG' => 'The forum description is too long, it must be less than 4000 characters.', - 'FORUM_DELETE' => 'Delete forum', - 'FORUM_DELETE_EXPLAIN' => 'The form below will allow you to delete a forum. If the forum is postable you are able to decide where you want to put all topics (or forums) it contained.', - 'FORUM_DELETED' => 'Forum successfully deleted.', - 'FORUM_DESC' => 'Description', - 'FORUM_DESC_EXPLAIN' => 'Any HTML markup entered here will be displayed as is.', - 'FORUM_EDIT_EXPLAIN' => 'The form below will allow you to customise this forum. Please note that moderation and post count controls are set via forum permissions for each user or usergroup.', - 'FORUM_IMAGE' => 'Forum image', - 'FORUM_IMAGE_EXPLAIN' => 'Location, relative to the phpBB root directory, of an additional image to associate with this forum.', - 'FORUM_LINK_EXPLAIN' => 'Full URL (including the protocol, i.e.: http://) to the destination location that clicking this forum will take the user, e.g.: http://www.phpbb.com/.', - 'FORUM_LINK_TRACK' => 'Track link redirects', - 'FORUM_LINK_TRACK_EXPLAIN' => 'Records the number of times a forum link was clicked.', - 'FORUM_NAME' => 'Forum name', - 'FORUM_NAME_EMPTY' => 'You must enter a name for this forum.', - 'FORUM_PARENT' => 'Parent forum', - 'FORUM_PASSWORD' => 'Forum password', - 'FORUM_PASSWORD_CONFIRM' => 'Confirm forum password', - 'FORUM_PASSWORD_CONFIRM_EXPLAIN' => 'Only needs to be set if a forum password is entered.', - 'FORUM_PASSWORD_EXPLAIN' => 'Defines a password for this forum, use the permission system in preference.', - 'FORUM_PASSWORD_UNSET' => 'Remove forum password', - 'FORUM_PASSWORD_UNSET_EXPLAIN' => 'Check here if you want to remove the forum password.', - 'FORUM_PASSWORD_OLD' => 'The forum password is using an old encryption and should be changed.', - 'FORUM_PASSWORD_MISMATCH' => 'The passwords you entered did not match.', - 'FORUM_PRUNE_SETTINGS' => 'Forum prune settings', - 'FORUM_RESYNCED' => 'Forum “%s†successfully resynced', - 'FORUM_RULES_EXPLAIN' => 'Forum rules are displayed at any page within the given forum.', - 'FORUM_RULES_LINK' => 'Link to forum rules', - 'FORUM_RULES_LINK_EXPLAIN' => 'You are able to enter the URL of the page/post containing your forum rules here. This setting will override the forum rules text you specified.', - 'FORUM_RULES_PREVIEW' => 'Forum rules preview', - 'FORUM_RULES_TOO_LONG' => 'The forum rules must be less than 4000 characters.', - 'FORUM_SETTINGS' => 'Forum settings', - 'FORUM_STATUS' => 'Forum status', - 'FORUM_STYLE' => 'Forum style', - 'FORUM_TOPICS_PAGE' => 'Topics per page', - 'FORUM_TOPICS_PAGE_EXPLAIN' => 'If non-zero this value will override the default topics per page setting.', - 'FORUM_TYPE' => 'Forum type', - 'FORUM_UPDATED' => 'Forum information updated successfully.', - - 'FORUM_WITH_SUBFORUMS_NOT_TO_LINK' => 'You want to change a postable forum having subforums to a link. Please move all subforums out of this forum before you proceed, because after changing to a link you are no longer able to see the subforums currently connected to this forum.', - - 'GENERAL_FORUM_SETTINGS' => 'General forum settings', - - 'LINK' => 'Link', - 'LIST_INDEX' => 'List subforum in parent-forum’s legend', - 'LIST_INDEX_EXPLAIN' => 'Displays this forum on the index and elsewhere as a link within the legend of its parent-forum if the parent-forum’s “List subforums in legend†option is enabled.', - 'LIST_SUBFORUMS' => 'List subforums in legend', - 'LIST_SUBFORUMS_EXPLAIN' => 'Displays this forum’s subforums on the index and elsewhere as a link within the legend if their “List subforum in parent-forum’s legend†option is enabled.', - 'LOCKED' => 'Locked', - - 'MOVE_POSTS_NO_POSTABLE_FORUM' => 'The forum you selected for moving the posts to is not postable. Please select a postable forum.', - 'MOVE_POSTS_TO' => 'Move posts to', - 'MOVE_SUBFORUMS_TO' => 'Move subforums to', - - 'NO_DESTINATION_FORUM' => 'You have not specified a forum to move content to.', - 'NO_FORUM_ACTION' => 'No action defined for what happens with the forum content.', - 'NO_PARENT' => 'No parent', - 'NO_PERMISSIONS' => 'Do not copy permissions', - 'NO_PERMISSION_FORUM_ADD' => 'You do not have the necessary permissions to add forums.', - 'NO_PERMISSION_FORUM_DELETE' => 'You do not have the necessary permissions to delete forums.', - - 'PARENT_IS_LINK_FORUM' => 'The parent you specified is a forum link. Link forums are not able to hold other forums, please specify a category or forum as the parent forum.', - 'PARENT_NOT_EXIST' => 'Parent does not exist.', - 'PRUNE_ANNOUNCEMENTS' => 'Prune announcements', - 'PRUNE_STICKY' => 'Prune stickies', - 'PRUNE_OLD_POLLS' => 'Prune old polls', - 'PRUNE_OLD_POLLS_EXPLAIN' => 'Removes topics with polls not voted in for post age days.', - - 'REDIRECT_ACL' => 'Now you are able to %sset permissions%s for this forum.', - - 'SYNC_IN_PROGRESS' => 'Synchronizing forum', - 'SYNC_IN_PROGRESS_EXPLAIN' => 'Currently resyncing topic range %1$d/%2$d.', - - 'TYPE_CAT' => 'Category', - 'TYPE_FORUM' => 'Forum', - 'TYPE_LINK' => 'Link', - - 'UNLOCKED' => 'Unlocked', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php deleted file mode 100644 index 714cbe7f0d..0000000000 --- a/phpBB/language/en/acp/groups.php +++ /dev/null @@ -1,126 +0,0 @@ - 'From this panel you can administrate all your usergroups. You can delete, create and edit existing groups. Furthermore, you may choose group leaders, toggle open/hidden/closed group status and set the group name and description.', - 'ADD_USERS' => 'Add users', - 'ADD_USERS_EXPLAIN' => 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Additionally you can define them as group leaders. Please enter each username on a separate line.', - - 'COPY_PERMISSIONS' => 'Copy permissions from', - 'COPY_PERMISSIONS_EXPLAIN' => 'Once created, the group will have the same permissions as the one you select here.', - 'CREATE_GROUP' => 'Create new group', - - 'GROUPS_NO_MEMBERS' => 'This group has no members', - 'GROUPS_NO_MODS' => 'No group leaders defined', - - 'GROUP_APPROVE' => 'Approve member', - 'GROUP_APPROVED' => 'Approved members', - 'GROUP_AVATAR' => 'Group avatar', - 'GROUP_AVATAR_EXPLAIN' => 'This image will be displayed in the Group Control Panel.', - 'GROUP_CLOSED' => 'Closed', - 'GROUP_COLOR' => 'Group colour', - 'GROUP_COLOR_EXPLAIN' => 'Defines the colour members’ usernames will appear in, leave blank for user default.', - 'GROUP_CONFIRM_ADD_USER' => 'Are you sure that you want to add the user %1$s to the group?', - 'GROUP_CONFIRM_ADD_USERS' => 'Are you sure that you want to add the users %1$s to the group?', - 'GROUP_CREATED' => 'Group has been created successfully.', - 'GROUP_DEFAULT' => 'Make group default for member', - 'GROUP_DEFS_UPDATED' => 'Default group set for all selected members.', - 'GROUP_DELETE' => 'Remove member from group', - 'GROUP_DELETED' => 'Group deleted and user default groups set successfully.', - 'GROUP_DEMOTE' => 'Demote group leader', - 'GROUP_DESC' => 'Group description', - 'GROUP_DETAILS' => 'Group details', - 'GROUP_EDIT_EXPLAIN' => 'Here you can edit an existing group. You can change its name, description and type (open, closed, etc.). You can also set certain group wide options such as colouration, rank, etc. Changes made here override users’ current settings. Please note that group members can override group-avatar settings, unless you set appropriate user permissions.', - 'GROUP_ERR_USERS_EXIST' => 'The specified users are already members of this group.', - 'GROUP_FOUNDER_MANAGE' => 'Founder manage only', - 'GROUP_FOUNDER_MANAGE_EXPLAIN' => 'Restrict management of this group to founders only. Users having group permissions are still able to see this group as well as this group’s members.', - 'GROUP_HIDDEN' => 'Hidden', - 'GROUP_LANG' => 'Group language', - 'GROUP_LEAD' => 'Group leaders', - 'GROUP_LEADERS_ADDED' => 'New leaders added to group successfully.', - 'GROUP_LEGEND' => 'Display group in legend', - 'GROUP_LIST' => 'Current members', - 'GROUP_LIST_EXPLAIN' => 'This is a complete list of all the current users with membership of this group. You can delete members (except in certain special groups) or add new ones as you see fit.', - 'GROUP_MEMBERS' => 'Group members', - 'GROUP_MEMBERS_EXPLAIN' => 'This is a complete listing of all the members of this usergroup. It includes separate sections for leaders, pending and existing members. From here you can manage all aspects of who has membership of this group and what their role is. To remove a leader but keep them in the group use Demote rather than delete. Similarly use Promote to make an existing member a leader.', - 'GROUP_MESSAGE_LIMIT' => 'Group private message limit per folder', - 'GROUP_MESSAGE_LIMIT_EXPLAIN' => 'This setting overrides the per-user folder message limit. A value of 0 means the user default limit will be used.', - 'GROUP_MODS_ADDED' => 'New group leaders added successfully.', - 'GROUP_MODS_DEMOTED' => 'Group leaders demoted successfully.', - 'GROUP_MODS_PROMOTED' => 'Group members promoted successfully.', - 'GROUP_NAME' => 'Group name', - 'GROUP_NAME_TAKEN' => 'The group name you entered is already in use, please select an alternative.', - 'GROUP_OPEN' => 'Open', - 'GROUP_PENDING' => 'Pending members', - 'GROUP_PROMOTE' => 'Promote to group leader', - 'GROUP_RANK' => 'Group rank', - 'GROUP_RECEIVE_PM' => 'Group able to receive private messages', - 'GROUP_RECEIVE_PM_EXPLAIN' => 'Please note that hidden groups are not able to be messaged, regardless of this setting.', - 'GROUP_REQUEST' => 'Request', - 'GROUP_SETTINGS_SAVE' => 'Group wide settings', - 'GROUP_TYPE' => 'Group type', - 'GROUP_TYPE_EXPLAIN' => 'This determines which users can join or view this group.', - 'GROUP_UPDATED' => 'Group preferences updated successfully.', - - 'GROUP_USERS_ADDED' => 'New users added to group successfully.', - 'GROUP_USERS_EXIST' => 'The selected users are already members.', - 'GROUP_USERS_REMOVE' => 'Users removed from group and new defaults set successfully.', - - 'MAKE_DEFAULT_FOR_ALL' => 'Make default group for every member', - 'MEMBERS' => 'Members', - - 'NO_GROUP' => 'No group specified.', - 'NO_GROUPS_CREATED' => 'No groups created yet.', - 'NO_PERMISSIONS' => 'Do not copy permissions', - 'NO_USERS' => 'You haven’t entered any users.', - 'NO_USERS_ADDED' => 'No users were added to the group.', - - 'SPECIAL_GROUPS' => 'Pre-defined groups', - 'SPECIAL_GROUPS_EXPLAIN' => 'Pre-defined groups are special groups, they cannot be deleted or directly modified. However you can still add users and alter basic settings.', - - 'TOTAL_MEMBERS' => 'Members', - - 'USERS_APPROVED' => 'Users approved successfully.', - 'USER_DEFAULT' => 'User default', - 'USER_DEF_GROUPS' => 'User defined groups', - 'USER_DEF_GROUPS_EXPLAIN' => 'These are groups created by you or another admin on this board. You can manage memberships as well as edit group properties or even delete the group.', - 'USER_GROUP_DEFAULT' => 'Set as default group', - 'USER_GROUP_DEFAULT_EXPLAIN' => 'Saying yes here will set this group as the default group for the added users.', - 'USER_GROUP_LEADER' => 'Set as group leader', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/acp/index.htm b/phpBB/language/en/acp/index.htm deleted file mode 100644 index ee1f723a7d..0000000000 --- a/phpBB/language/en/acp/index.htm +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php deleted file mode 100644 index a10148942b..0000000000 --- a/phpBB/language/en/acp/language.php +++ /dev/null @@ -1,102 +0,0 @@ - 'Admin language files', - 'ACP_LANGUAGE_PACKS_EXPLAIN' => 'Here you are able to install/remove language packs.', - - 'EMAIL_FILES' => 'E-mail templates', - - 'FILE_CONTENTS' => 'File contents', - 'FILE_FROM_STORAGE' => 'File from storage folder', - - 'HELP_FILES' => 'Help files', - - 'INSTALLED_LANGUAGE_PACKS' => 'Installed language packs', - 'INVALID_LANGUAGE_PACK' => 'The selected language pack seems to be not valid. Please verify the language pack and upload it again if necessary.', - 'INVALID_UPLOAD_METHOD' => 'The selected upload method is not valid, please choose a different method.', - - 'LANGUAGE_DETAILS_UPDATED' => 'Language details successfully updated.', - 'LANGUAGE_ENTRIES' => 'Language entries', - 'LANGUAGE_ENTRIES_EXPLAIN' => 'Here you are able to change existing language pack entries or not already translated ones.
    Note: Once you changed a language file, the changes will be stored within a separate folder for you to download. The changes will not be seen by your users until you replace the original language files at your webspace (by uploading them).', - 'LANGUAGE_FILES' => 'Language files', - 'LANGUAGE_KEY' => 'Language key', - 'LANGUAGE_PACK_ALREADY_INSTALLED' => 'This language pack is already installed.', - 'LANGUAGE_PACK_DELETED' => 'The language pack %s has been removed successfully. All users using this language have been reset to the boards default language.', - 'LANGUAGE_PACK_DETAILS' => 'Language pack details', - 'LANGUAGE_PACK_INSTALLED' => 'The language pack %s has been successfully installed.', - 'LANGUAGE_PACK_ISO' => 'ISO', - 'LANGUAGE_PACK_LOCALNAME' => 'Local name', - 'LANGUAGE_PACK_NAME' => 'Name', - 'LANGUAGE_PACK_NOT_EXIST' => 'The selected language pack does not exist.', - 'LANGUAGE_PACK_USED_BY' => 'Used by (including robots)', - 'LANGUAGE_VARIABLE' => 'Language variable', - 'LANG_AUTHOR' => 'Language pack author', - 'LANG_ENGLISH_NAME' => 'English name', - 'LANG_ISO_CODE' => 'ISO code', - 'LANG_LOCAL_NAME' => 'Local name', - - 'MISSING_LANGUAGE_FILE' => 'Missing language file: %s', - 'MISSING_LANG_VARIABLES' => 'Missing language variables', - 'MODS_FILES' => 'MODs language files', - - 'NO_FILE_SELECTED' => 'You haven’t specified a language file.', - 'NO_LANG_ID' => 'You haven’t specified a language pack.', - 'NO_REMOVE_DEFAULT_LANG' => 'You are not able to remove the default language pack.
    If you want to remove this language pack, change your boards default language first.', - 'NO_UNINSTALLED_LANGUAGE_PACKS' => 'No uninstalled language packs', - - 'REMOVE_FROM_STORAGE_FOLDER' => 'Remove from storage folder', - - 'SELECT_DOWNLOAD_FORMAT' => 'Select download format', - 'SUBMIT_AND_DOWNLOAD' => 'Submit and download file', - 'SUBMIT_AND_UPLOAD' => 'Submit and upload file', - - 'THOSE_MISSING_LANG_FILES' => 'The following language files are missing from the %s language folder', - 'THOSE_MISSING_LANG_VARIABLES' => 'The following language variables are missing from the %s language pack', - - 'UNINSTALLED_LANGUAGE_PACKS' => 'Uninstalled language packs', - - 'UNABLE_TO_WRITE_FILE' => 'The file could not be written to %s.', - 'UPLOAD_COMPLETED' => 'The upload was completed successfully.', - 'UPLOAD_FAILED' => 'The upload failed for unknown reasons. You may need to replace the relevant file manually.', - 'UPLOAD_METHOD' => 'Upload method', - 'UPLOAD_SETTINGS' => 'Upload settings', - - 'WRONG_LANGUAGE_FILE' => 'Selected language file is invalid.', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/acp/modules.php b/phpBB/language/en/acp/modules.php deleted file mode 100644 index 875b24a94b..0000000000 --- a/phpBB/language/en/acp/modules.php +++ /dev/null @@ -1,84 +0,0 @@ - 'Here you are able to manage all kind of modules. Please note that the ACP has a three-level menu structure (Category -> Category -> Module) whereby the others having a two-level menu structure (Category -> Module) which must be kept. Please also be aware that you may lock out yourself if you disable or delete the modules responsible for the module management itself.', - 'ADD_MODULE' => 'Add module', - 'ADD_MODULE_CONFIRM' => 'Are you sure you want to add the selected module with the selected mode?', - 'ADD_MODULE_TITLE' => 'Add module', - - 'CANNOT_REMOVE_MODULE' => 'Unable to remove module, it has assigned children. Please remove or move all children before performing this action.', - 'CATEGORY' => 'Category', - 'CHOOSE_MODE' => 'Choose module mode', - 'CHOOSE_MODE_EXPLAIN' => 'Choose the modules mode being used.', - 'CHOOSE_MODULE' => 'Choose module', - 'CHOOSE_MODULE_EXPLAIN' => 'Choose the file being called by this module.', - 'CREATE_MODULE' => 'Create new module', - - 'DEACTIVATED_MODULE' => 'Deactivated module', - 'DELETE_MODULE' => 'Delete module', - 'DELETE_MODULE_CONFIRM' => 'Are you sure you want to remove this module?', - - 'EDIT_MODULE' => 'Edit module', - 'EDIT_MODULE_EXPLAIN' => 'Here you are able to enter module specific settings.', - - 'HIDDEN_MODULE' => 'Hidden module', - - 'MODULE' => 'Module', - 'MODULE_ADDED' => 'Module successfully added.', - 'MODULE_DELETED' => 'Module successfully removed.', - 'MODULE_DISPLAYED' => 'Module displayed', - 'MODULE_DISPLAYED_EXPLAIN' => 'If you do not wish to display this module, but want to use it, set this to no.', - 'MODULE_EDITED' => 'Module successfully edited.', - 'MODULE_ENABLED' => 'Module enabled', - 'MODULE_LANGNAME' => 'Module language name', - 'MODULE_LANGNAME_EXPLAIN' => 'Enter the displayed module name. Use language constant if name is served from language file.', - 'MODULE_TYPE' => 'Module type', - - 'NO_CATEGORY_TO_MODULE' => 'Unable to turn category into module. Please remove/move all children before performing this action.', - 'NO_MODULE' => 'No module found.', - 'NO_MODULE_ID' => 'No module id specified.', - 'NO_MODULE_LANGNAME' => 'No module language name specified.', - 'NO_PARENT' => 'No Parent', - - 'PARENT' => 'Parent', - 'PARENT_NO_EXIST' => 'Parent does not exist.', - - 'SELECT_MODULE' => 'Select a module', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php deleted file mode 100644 index bba425d076..0000000000 --- a/phpBB/language/en/acp/permissions.php +++ /dev/null @@ -1,277 +0,0 @@ - ' -

    Permissions are highly granular and grouped into four major sections, which are:

    - -

    Global Permissions

    -

    These are used to control access on a global level and apply to the entire bulletin board. They are further divided into Users’ Permissions, Groups’ Permissions, Administrators and Global Moderators.

    - -

    Forum Based Permissions

    -

    These are used to control access on a per forum basis. They are further divided into Forum Permissions, Forum Moderators, Users’ Forum Permissions and Groups’ Forum Permissions.

    - -

    Permission Roles

    -

    These are used to create different sets of permissions for the different permission types later being able to be assigned on a role-based basis. The default roles should cover the administration of bulletin boards large and small, though within each of the four divisions, you can add/edit/delete roles as you see fit.

    - -

    Permission Masks

    -

    These are used to view the effective permissions assigned to Users, Moderators (Local and Global), Administrators or Forums.

    - -
    - -

    For further information on setting up and managing permissions on your phpBB3 board, please see Chapter 1.5 of our Quick Start Guide.

    - ', - - 'ACL_NEVER' => 'Never', - 'ACL_SET' => 'Setting permissions', - 'ACL_SET_EXPLAIN' => 'Permissions are based on a simple YES/NO system. Setting an option to NEVER for a user or usergroup overrides any other value assigned to it. If you do not wish to assign a value for an option for this user or group select NO. If values are assigned for this option elsewhere they will be used in preference, else NEVER is assumed. All objects marked (with the checkbox in front of them) will copy the permission set you defined.', - 'ACL_SETTING' => 'Setting', - - 'ACL_TYPE_A_' => 'Administrative permissions', - 'ACL_TYPE_F_' => 'Forum permissions', - 'ACL_TYPE_M_' => 'Moderative permissions', - 'ACL_TYPE_U_' => 'User permissions', - - 'ACL_TYPE_GLOBAL_A_' => 'Administrative permissions', - 'ACL_TYPE_GLOBAL_U_' => 'User permissions', - 'ACL_TYPE_GLOBAL_M_' => 'Global Moderator permissions', - 'ACL_TYPE_LOCAL_M_' => 'Forum Moderator permissions', - 'ACL_TYPE_LOCAL_F_' => 'Forum permissions', - - 'ACL_NO' => 'No', - 'ACL_VIEW' => 'Viewing permissions', - 'ACL_VIEW_EXPLAIN' => 'Here you can see the effective permissions the user/group is having. A red square indicates that the user/group does not have the permission, a green square indicates that the user/group does have the permission.', - 'ACL_YES' => 'Yes', - - 'ACP_ADMINISTRATORS_EXPLAIN' => 'Here you can assign administrator permissions to users or groups. All users with administrator permissions can view the administration control panel.', - 'ACP_FORUM_MODERATORS_EXPLAIN' => 'Here you can assign users and groups as forum moderators. To assign users access to forums, to define global moderative permissions or administrators please use the appropriate page.', - 'ACP_FORUM_PERMISSIONS_EXPLAIN' => 'Here you can alter which users and groups can access which forums. To assign moderators or define administrators please use the appropriate page.', - 'ACP_GLOBAL_MODERATORS_EXPLAIN' => 'Here you can assign global moderator permissions to users or groups. These moderators are like ordinary moderators except they have access to every forum on your board.', - 'ACP_GROUPS_FORUM_PERMISSIONS_EXPLAIN' => 'Here you can assign forum permissions to groups.', - 'ACP_GROUPS_PERMISSIONS_EXPLAIN' => 'Here you can assign global permissions to groups - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. Individual users permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group’s permissions.', - 'ACP_ADMIN_ROLES_EXPLAIN' => 'Here you are able to manage the roles for administrative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.', - 'ACP_FORUM_ROLES_EXPLAIN' => 'Here you are able to manage the roles for forum permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.', - 'ACP_MOD_ROLES_EXPLAIN' => 'Here you are able to manage the roles for moderative permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.', - 'ACP_USER_ROLES_EXPLAIN' => 'Here you are able to manage the roles for user permissions. Roles are effective permissions, if you change a role the items having this role assigned will change it’s permissions too.', - 'ACP_USERS_FORUM_PERMISSIONS_EXPLAIN' => 'Here you can assign forum permissions to users.', - 'ACP_USERS_PERMISSIONS_EXPLAIN' => 'Here you can assign global permissions to users - user permissions, global moderator permissions and administrator permissions. User permissions include capabilities such as the use of avatars, sending private messages, et cetera; global moderator permissions such as approving posts, manage topics, manage bans, et cetera and lastly administrator permissions such as altering permissions, define custom BBCodes, manage forums, et cetera. To alter these settings for large numbers of users the Group permissions system is the preferred method. User’s permissions should only be changed in rare occasions, the preferred method is putting users in groups and assigning the group’s permissions.', - 'ACP_VIEW_ADMIN_PERMISSIONS_EXPLAIN' => 'Here you can view the effective administrative permissions assigned to the selected users/groups.', - 'ACP_VIEW_GLOBAL_MOD_PERMISSIONS_EXPLAIN' => 'Here you can view the global moderative permissions assigned to the selected users/groups.', - 'ACP_VIEW_FORUM_PERMISSIONS_EXPLAIN' => 'Here you can view the forum permissions assigned to the selected users/groups and forums.', - 'ACP_VIEW_FORUM_MOD_PERMISSIONS_EXPLAIN' => 'Here you can view the forum moderator permissions assigned to the selected users/groups and forums.', - 'ACP_VIEW_USER_PERMISSIONS_EXPLAIN' => 'Here you can view the effective user permissions assigned to the selected users/groups.', - - 'ADD_GROUPS' => 'Add groups', - 'ADD_PERMISSIONS' => 'Add permissions', - 'ADD_USERS' => 'Add users', - 'ADVANCED_PERMISSIONS' => 'Advanced Permissions', - 'ALL_GROUPS' => 'Select all groups', - 'ALL_NEVER' => 'All NEVER', - 'ALL_NO' => 'All NO', - 'ALL_USERS' => 'Select all users', - 'ALL_YES' => 'All YES', - 'APPLY_ALL_PERMISSIONS' => 'Apply all permissions', - 'APPLY_PERMISSIONS' => 'Apply permissions', - 'APPLY_PERMISSIONS_EXPLAIN' => 'The permissions and role defined for this item will only be applied to this item and all checked items.', - 'AUTH_UPDATED' => 'Permissions have been updated.', - - 'CREATE_ROLE' => 'Create role', - 'CREATE_ROLE_FROM' => 'Use settings from…', - 'CUSTOM' => 'Custom…', - - 'DEFAULT' => 'Default', - 'DELETE_ROLE' => 'Delete role', - 'DELETE_ROLE_CONFIRM' => 'Are you sure you want to remove this role? Items having this role assigned will not lose their permission settings.', - 'DISPLAY_ROLE_ITEMS' => 'View items using this role', - - 'EDIT_PERMISSIONS' => 'Edit permissions', - 'EDIT_ROLE' => 'Edit role', - - 'GROUPS_NOT_ASSIGNED' => 'No group assigned to this role', - - 'LOOK_UP_GROUP' => 'Look up usergroup', - 'LOOK_UP_USER' => 'Look up user', - - 'MANAGE_GROUPS' => 'Manage groups', - 'MANAGE_USERS' => 'Manage users', - - 'NO_AUTH_SETTING_FOUND' => 'Permission settings not defined.', - 'NO_ROLE_ASSIGNED' => 'No role assigned…', - 'NO_ROLE_ASSIGNED_EXPLAIN' => 'Setting to this role does not change permissions on the right. If you want to unset/remove all permissions you should use the “All NO†link.', - 'NO_ROLE_AVAILABLE' => 'No role available', - 'NO_ROLE_NAME_SPECIFIED' => 'Please give the role a name.', - 'NO_ROLE_SELECTED' => 'Role could not be found.', - 'NO_USER_GROUP_SELECTED' => 'You haven’t selected any user or group.', - - 'ONLY_FORUM_DEFINED' => 'You only defined forums in your selection. Please also select at least one user or one group.', - - 'PERMISSION_APPLIED_TO_ALL' => 'Permissions and role will also be applied to all checked objects', - 'PLUS_SUBFORUMS' => '+Subforums', - - 'REMOVE_PERMISSIONS' => 'Remove permissions', - 'REMOVE_ROLE' => 'Remove role', - 'RESULTING_PERMISSION' => 'Resulting permission', - 'ROLE' => 'Role', - 'ROLE_ADD_SUCCESS' => 'Role successfully added.', - 'ROLE_ASSIGNED_TO' => 'Users/Groups assigned to %s', - 'ROLE_DELETED' => 'Role successfully removed.', - 'ROLE_DESCRIPTION' => 'Role description', - - 'ROLE_ADMIN_FORUM' => 'Forum Admin', - 'ROLE_ADMIN_FULL' => 'Full Admin', - 'ROLE_ADMIN_STANDARD' => 'Standard Admin', - 'ROLE_ADMIN_USERGROUP' => 'User and Groups Admin', - 'ROLE_FORUM_BOT' => 'Bot Access', - 'ROLE_FORUM_FULL' => 'Full Access', - 'ROLE_FORUM_LIMITED' => 'Limited Access', - 'ROLE_FORUM_LIMITED_POLLS' => 'Limited Access + Polls', - 'ROLE_FORUM_NOACCESS' => 'No Access', - 'ROLE_FORUM_ONQUEUE' => 'On Moderation Queue', - 'ROLE_FORUM_POLLS' => 'Standard Access + Polls', - 'ROLE_FORUM_READONLY' => 'Read Only Access', - 'ROLE_FORUM_STANDARD' => 'Standard Access', - 'ROLE_MOD_FULL' => 'Full Moderator', - 'ROLE_MOD_QUEUE' => 'Queue Moderator', - 'ROLE_MOD_SIMPLE' => 'Simple Moderator', - 'ROLE_MOD_STANDARD' => 'Standard Moderator', - 'ROLE_USER_FULL' => 'All Features', - 'ROLE_USER_LIMITED' => 'Limited Features', - 'ROLE_USER_NOAVATAR' => 'No Avatar', - 'ROLE_USER_NOPM' => 'No Private Messages', - 'ROLE_USER_STANDARD' => 'Standard Features', - - 'ROLE_DESCRIPTION_ADMIN_FORUM' => 'Can access the forum management and forum permission settings.', - 'ROLE_DESCRIPTION_ADMIN_FULL' => 'Has access to all administrative functions of this board.
    Not recommended.', - 'ROLE_DESCRIPTION_ADMIN_STANDARD' => 'Has access to most administrative features but is not allowed to use server or system related tools.', - 'ROLE_DESCRIPTION_ADMIN_USERGROUP' => 'Can manage groups and users: Able to change permissions, settings, manage bans, and manage ranks.', - 'ROLE_DESCRIPTION_FORUM_BOT' => 'This role is recommended for bots and search spiders.', - 'ROLE_DESCRIPTION_FORUM_FULL' => 'Can use all forum features, including posting of announcements and stickies. Can also ignore the flood limit.
    Not recommended for normal users.', - 'ROLE_DESCRIPTION_FORUM_LIMITED' => 'Can use some forum features, but cannot attach files or use post icons.', - 'ROLE_DESCRIPTION_FORUM_LIMITED_POLLS' => 'As per Limited Access but can also create polls.', - 'ROLE_DESCRIPTION_FORUM_NOACCESS' => 'Can neither see nor access the forum.', - 'ROLE_DESCRIPTION_FORUM_ONQUEUE' => 'Can use most forum features including attachments, but posts and topics need to be approved by a moderator.', - 'ROLE_DESCRIPTION_FORUM_POLLS' => 'Like Standard Access but can also create polls.', - 'ROLE_DESCRIPTION_FORUM_READONLY' => 'Can read the forum, but cannot create new topics or reply to posts.', - 'ROLE_DESCRIPTION_FORUM_STANDARD' => 'Can use most forum features including attachments and deleting own topics, but cannot lock own topics, and cannot create polls.', - 'ROLE_DESCRIPTION_MOD_FULL' => 'Can use all moderating features, including banning.', - 'ROLE_DESCRIPTION_MOD_QUEUE' => 'Can use the Moderation Queue to validate and edit posts, but nothing else.', - 'ROLE_DESCRIPTION_MOD_SIMPLE' => 'Can only use basic topic actions. Cannot send warnings or use moderation queue.', - 'ROLE_DESCRIPTION_MOD_STANDARD' => 'Can use most moderating tools, but cannot ban users or change the post author.', - 'ROLE_DESCRIPTION_USER_FULL' => 'Can use all available forum features for users, including changing the user name or ignoring the flood limit.
    Not recommended.', - 'ROLE_DESCRIPTION_USER_LIMITED' => 'Can access some of the user features. Attachments, e-mails, or instant messages are not allowed.', - 'ROLE_DESCRIPTION_USER_NOAVATAR' => 'Has a limited feature set and is not allowed to use the Avatar feature.', - 'ROLE_DESCRIPTION_USER_NOPM' => 'Has a limited feature set, and is not allowed to use Private Messages.', - 'ROLE_DESCRIPTION_USER_STANDARD' => 'Can access most but not all user features. Cannot change user name or ignore the flood limit, for instance.', - - 'ROLE_DESCRIPTION_EXPLAIN' => 'You are able to enter a short explanation of what the role is doing or for what it is meant for. The text you enter here will be displayed within the permissions screens too.', - 'ROLE_DESCRIPTION_LONG' => 'The role description is too long, please limit it to 4000 characters.', - 'ROLE_DETAILS' => 'Role details', - 'ROLE_EDIT_SUCCESS' => 'Role successfully edited.', - 'ROLE_NAME' => 'Role name', - 'ROLE_NAME_ALREADY_EXIST' => 'A role named %s already exist for the specified permission type.', - 'ROLE_NOT_ASSIGNED' => 'Role has not been assigned yet.', - - 'SELECTED_FORUM_NOT_EXIST' => 'The selected forum(s) do not exist.', - 'SELECTED_GROUP_NOT_EXIST' => 'The selected group(s) do not exist.', - 'SELECTED_USER_NOT_EXIST' => 'The selected user(s) do not exist.', - 'SELECT_FORUM_SUBFORUM_EXPLAIN' => 'The forum you select here will include all subforums into the selection.', - 'SELECT_ROLE' => 'Select role…', - 'SELECT_TYPE' => 'Select type', - 'SET_PERMISSIONS' => 'Set permissions', - 'SET_ROLE_PERMISSIONS' => 'Set role permissions', - 'SET_USERS_PERMISSIONS' => 'Set users permissions', - 'SET_USERS_FORUM_PERMISSIONS' => 'Set users forum permissions', - - 'TRACE_DEFAULT' => 'By default every permission is NO (unset). So the permission can be overwritten by other settings.', - 'TRACE_FOR' => 'Trace for', - 'TRACE_GLOBAL_SETTING' => '%s (global)', - 'TRACE_GROUP_NEVER_TOTAL_NEVER' => 'This group’s permission is set to NEVER like the total result so the old result is kept.', - 'TRACE_GROUP_NEVER_TOTAL_NEVER_LOCAL' => 'This group’s permission for this forum is set to NEVER like the total result so the old result is kept.', - 'TRACE_GROUP_NEVER_TOTAL_NO' => 'This group’s permission is set to NEVER which becomes the new total value because it wasn’t set yet (set to NO).', - 'TRACE_GROUP_NEVER_TOTAL_NO_LOCAL' => 'This group’s permission for this forum is set to NEVER which becomes the new total value because it wasn’t set yet (set to NO).', - 'TRACE_GROUP_NEVER_TOTAL_YES' => 'This group’s permission is set to NEVER which overwrites the total YES to a NEVER for this user.', - 'TRACE_GROUP_NEVER_TOTAL_YES_LOCAL' => 'This group’s permission for this forum is set to NEVER which overwrites the total YES to a NEVER for this user.', - 'TRACE_GROUP_NO' => 'The permission is NO for this group so the old total value is kept.', - 'TRACE_GROUP_NO_LOCAL' => 'The permission is NO for this group within this forum so the old total value is kept.', - 'TRACE_GROUP_YES_TOTAL_NEVER' => 'This group’s permission is set to YES but the total NEVER cannot be overwritten.', - 'TRACE_GROUP_YES_TOTAL_NEVER_LOCAL' => 'This group’s permission for this forum is set to YES but the total NEVER cannot be overwritten.', - 'TRACE_GROUP_YES_TOTAL_NO' => 'This group’s permission is set to YES which becomes the new total value because it wasn’t set yet (set to NO).', - 'TRACE_GROUP_YES_TOTAL_NO_LOCAL' => 'This group’s permission for this forum is set to YES which becomes the new total value because it wasn’t set yet (set to NO).', - 'TRACE_GROUP_YES_TOTAL_YES' => 'This group’s permission is set to YES and the total permission is already set to YES, so the total result is kept.', - 'TRACE_GROUP_YES_TOTAL_YES_LOCAL' => 'This group’s permission for this forum is set to YES and the total permission is already set to YES, so the total result is kept.', - 'TRACE_PERMISSION' => 'Trace permission - %s', - 'TRACE_RESULT' => 'Trace result', - 'TRACE_SETTING' => 'Trace setting', - - 'TRACE_USER_GLOBAL_YES_TOTAL_YES' => 'The forum independent user permission evaluates to YES but the total permission is already set to YES, so the total result is kept. %sTrace global permission%s', - 'TRACE_USER_GLOBAL_YES_TOTAL_NEVER' => 'The forum independent user permission evaluates to YES which overwrites the current local result NEVER. %sTrace global permission%s', - 'TRACE_USER_GLOBAL_NEVER_TOTAL_KEPT' => 'The forum independent user permission evaluates to NEVER which doesn’t influence the local permission. %sTrace global permission%s', - - 'TRACE_USER_FOUNDER' => 'The user has the founder type set, therefore admin permissions are set to YES by default.', - 'TRACE_USER_KEPT' => 'The user’s permission is NO so the old total value is kept.', - 'TRACE_USER_KEPT_LOCAL' => 'The user’s permission for this forum is NO so the old total value is kept.', - 'TRACE_USER_NEVER_TOTAL_NEVER' => 'The user’s permission is set to NEVER and the total value is set to NEVER, so nothing is changed.', - 'TRACE_USER_NEVER_TOTAL_NEVER_LOCAL' => 'The user’s permission for this forum is set to NEVER and the total value is set to NEVER, so nothing is changed.', - 'TRACE_USER_NEVER_TOTAL_NO' => 'The user’s permission is set to NEVER which becomes the total value because it was set to NO.', - 'TRACE_USER_NEVER_TOTAL_NO_LOCAL' => 'The user’s permission for this forum is set to NEVER which becomes the total value because it was set to NO.', - 'TRACE_USER_NEVER_TOTAL_YES' => 'The user’s permission is set to NEVER and overwrites the previous YES.', - 'TRACE_USER_NEVER_TOTAL_YES_LOCAL' => 'The user’s permission for this forum is set to NEVER and overwrites the previous YES.', - 'TRACE_USER_NO_TOTAL_NO' => 'The user’s permission is NO and the total value was set to NO so it defaults to NEVER.', - 'TRACE_USER_NO_TOTAL_NO_LOCAL' => 'The user’s permission for this forum is NO and the total value was set to NO so it defaults to NEVER.', - 'TRACE_USER_YES_TOTAL_NEVER' => 'The user’s permission is set to YES but the total NEVER cannot be overwritten.', - 'TRACE_USER_YES_TOTAL_NEVER_LOCAL' => 'The user’s permission for this forum is set to YES but the total NEVER cannot be overwritten.', - 'TRACE_USER_YES_TOTAL_NO' => 'The user’s permission is set to YES which becomes the total value because it was set to NO.', - 'TRACE_USER_YES_TOTAL_NO_LOCAL' => 'The user’s permission for this forum is set to YES which becomes the total value because it was set to NO.', - 'TRACE_USER_YES_TOTAL_YES' => 'The user’s permission is set to YES and the total value is set to YES, so nothing is changed.', - 'TRACE_USER_YES_TOTAL_YES_LOCAL' => 'The user’s permission for this forum is set to YES and the total value is set to YES, so nothing is changed.', - 'TRACE_WHO' => 'Who', - 'TRACE_TOTAL' => 'Total', - - 'USERS_NOT_ASSIGNED' => 'No user assigned to this role', - 'USER_IS_MEMBER_OF_DEFAULT' => 'is a member of the following pre-defined groups', - 'USER_IS_MEMBER_OF_CUSTOM' => 'is a member of the following user defined groups', - - 'VIEW_ASSIGNED_ITEMS' => 'View assigned items', - 'VIEW_LOCAL_PERMS' => 'Local permissions', - 'VIEW_GLOBAL_PERMS' => 'Global permissions', - 'VIEW_PERMISSIONS' => 'View permissions', - - 'WRONG_PERMISSION_TYPE' => 'Wrong permission type selected.', - 'WRONG_PERMISSION_SETTING_FORMAT' => 'The permission settings are in a wrong format, phpBB is not able to process them correctly.', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php deleted file mode 100644 index 8f090667b4..0000000000 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ /dev/null @@ -1,240 +0,0 @@ - -* -* if (empty($lang) || !is_array($lang)) -* { -* $lang = array(); -* } -* -* // Adding new category -* $lang['permission_cat']['bugs'] = 'Bugs'; -* -* // Adding new permission set -* $lang['permission_type']['bug_'] = 'Bug Permissions'; -* -* // Adding the permissions -* $lang = array_merge($lang, array( -* 'acl_bug_view' => array('lang' => 'Can view bug reports', 'cat' => 'bugs'), -* 'acl_bug_post' => array('lang' => 'Can post bugs', 'cat' => 'post'), // Using a phpBB category here -* )); -* -* -*/ - -// Define categories and permission types -$lang = array_merge($lang, array( - 'permission_cat' => array( - 'actions' => 'Actions', - 'content' => 'Content', - 'forums' => 'Forums', - 'misc' => 'Misc', - 'permissions' => 'Permissions', - 'pm' => 'Private messages', - 'polls' => 'Polls', - 'post' => 'Post', - 'post_actions' => 'Post actions', - 'posting' => 'Posting', - 'profile' => 'Profile', - 'settings' => 'Settings', - 'topic_actions' => 'Topic actions', - 'user_group' => 'Users & Groups', - ), - - // With defining 'global' here we are able to specify what is printed out if the permission is within the global scope. - 'permission_type' => array( - 'u_' => 'User permissions', - 'a_' => 'Admin permissions', - 'm_' => 'Moderator permissions', - 'f_' => 'Forum permissions', - 'global' => array( - 'm_' => 'Global moderator permissions', - ), - ), -)); - -// User Permissions -$lang = array_merge($lang, array( - 'acl_u_viewprofile' => array('lang' => 'Can view profiles, memberlist and online list', 'cat' => 'profile'), - 'acl_u_chgname' => array('lang' => 'Can change username', 'cat' => 'profile'), - 'acl_u_chgpasswd' => array('lang' => 'Can change password', 'cat' => 'profile'), - 'acl_u_chgemail' => array('lang' => 'Can change e-mail address', 'cat' => 'profile'), - 'acl_u_chgavatar' => array('lang' => 'Can change avatar', 'cat' => 'profile'), - 'acl_u_chggrp' => array('lang' => 'Can change default usergroup', 'cat' => 'profile'), - - 'acl_u_attach' => array('lang' => 'Can attach files', 'cat' => 'post'), - 'acl_u_download' => array('lang' => 'Can download files', 'cat' => 'post'), - 'acl_u_savedrafts' => array('lang' => 'Can save drafts', 'cat' => 'post'), - 'acl_u_chgcensors' => array('lang' => 'Can disable word censors', 'cat' => 'post'), - 'acl_u_sig' => array('lang' => 'Can use signature', 'cat' => 'post'), - - 'acl_u_sendpm' => array('lang' => 'Can send private messages', 'cat' => 'pm'), - 'acl_u_masspm' => array('lang' => 'Can send pm to multiple users and groups', 'cat' => 'pm'), - 'acl_u_readpm' => array('lang' => 'Can read private messages', 'cat' => 'pm'), - 'acl_u_pm_edit' => array('lang' => 'Can edit own private messages', 'cat' => 'pm'), - 'acl_u_pm_delete' => array('lang' => 'Can remove private messages from own folder', 'cat' => 'pm'), - 'acl_u_pm_forward' => array('lang' => 'Can forward private messages', 'cat' => 'pm'), - 'acl_u_pm_emailpm' => array('lang' => 'Can e-mail private messages', 'cat' => 'pm'), - 'acl_u_pm_printpm' => array('lang' => 'Can print private messages', 'cat' => 'pm'), - 'acl_u_pm_attach' => array('lang' => 'Can attach files in private messages', 'cat' => 'pm'), - 'acl_u_pm_download' => array('lang' => 'Can download files in private messages', 'cat' => 'pm'), - 'acl_u_pm_bbcode' => array('lang' => 'Can post BBCode in private messages', 'cat' => 'pm'), - 'acl_u_pm_smilies' => array('lang' => 'Can post smilies in private messages', 'cat' => 'pm'), - 'acl_u_pm_img' => array('lang' => 'Can post images in private messages', 'cat' => 'pm'), - 'acl_u_pm_flash' => array('lang' => 'Can post Flash in private messages', 'cat' => 'pm'), - - 'acl_u_sendemail' => array('lang' => 'Can send e-mails', 'cat' => 'misc'), - 'acl_u_sendim' => array('lang' => 'Can send instant messages', 'cat' => 'misc'), - 'acl_u_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'misc'), - 'acl_u_hideonline' => array('lang' => 'Can hide online status', 'cat' => 'misc'), - 'acl_u_viewonline' => array('lang' => 'Can view hidden online users', 'cat' => 'misc'), - 'acl_u_search' => array('lang' => 'Can search board', 'cat' => 'misc'), -)); - -// Forum Permissions -$lang = array_merge($lang, array( - 'acl_f_list' => array('lang' => 'Can see forum', 'cat' => 'post'), - 'acl_f_read' => array('lang' => 'Can read forum', 'cat' => 'post'), - 'acl_f_post' => array('lang' => 'Can start new topics', 'cat' => 'post'), - 'acl_f_reply' => array('lang' => 'Can reply to topics', 'cat' => 'post'), - 'acl_f_icons' => array('lang' => 'Can use topic/post icons', 'cat' => 'post'), - 'acl_f_announce' => array('lang' => 'Can post announcements', 'cat' => 'post'), - 'acl_f_sticky' => array('lang' => 'Can post stickies', 'cat' => 'post'), - - 'acl_f_poll' => array('lang' => 'Can create polls', 'cat' => 'polls'), - 'acl_f_vote' => array('lang' => 'Can vote in polls', 'cat' => 'polls'), - 'acl_f_votechg' => array('lang' => 'Can change existing vote', 'cat' => 'polls'), - - 'acl_f_attach' => array('lang' => 'Can attach files', 'cat' => 'content'), - 'acl_f_download' => array('lang' => 'Can download files', 'cat' => 'content'), - 'acl_f_sigs' => array('lang' => 'Can use signatures', 'cat' => 'content'), - 'acl_f_bbcode' => array('lang' => 'Can post BBCode', 'cat' => 'content'), - 'acl_f_smilies' => array('lang' => 'Can post smilies', 'cat' => 'content'), - 'acl_f_img' => array('lang' => 'Can post images', 'cat' => 'content'), - 'acl_f_flash' => array('lang' => 'Can post Flash', 'cat' => 'content'), - - 'acl_f_edit' => array('lang' => 'Can edit own posts', 'cat' => 'actions'), - 'acl_f_delete' => array('lang' => 'Can delete own posts', 'cat' => 'actions'), - 'acl_f_user_lock' => array('lang' => 'Can lock own topics', 'cat' => 'actions'), - 'acl_f_bump' => array('lang' => 'Can bump topics', 'cat' => 'actions'), - 'acl_f_report' => array('lang' => 'Can report posts', 'cat' => 'actions'), - 'acl_f_subscribe' => array('lang' => 'Can subscribe forum', 'cat' => 'actions'), - 'acl_f_print' => array('lang' => 'Can print topics', 'cat' => 'actions'), - 'acl_f_email' => array('lang' => 'Can e-mail topics', 'cat' => 'actions'), - - 'acl_f_search' => array('lang' => 'Can search the forum', 'cat' => 'misc'), - 'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'misc'), - 'acl_f_postcount' => array('lang' => 'Increment post counter
    Please note that this setting only affects new posts.', 'cat' => 'misc'), - 'acl_f_noapprove' => array('lang' => 'Can post without approval', 'cat' => 'misc'), -)); - -// Moderator Permissions -$lang = array_merge($lang, array( - 'acl_m_edit' => array('lang' => 'Can edit posts', 'cat' => 'post_actions'), - 'acl_m_delete' => array('lang' => 'Can delete posts', 'cat' => 'post_actions'), - 'acl_m_approve' => array('lang' => 'Can approve posts', 'cat' => 'post_actions'), - 'acl_m_report' => array('lang' => 'Can close and delete reports', 'cat' => 'post_actions'), - 'acl_m_chgposter' => array('lang' => 'Can change post author', 'cat' => 'post_actions'), - - 'acl_m_move' => array('lang' => 'Can move topics', 'cat' => 'topic_actions'), - 'acl_m_lock' => array('lang' => 'Can lock topics', 'cat' => 'topic_actions'), - 'acl_m_split' => array('lang' => 'Can split topics', 'cat' => 'topic_actions'), - 'acl_m_merge' => array('lang' => 'Can merge topics', 'cat' => 'topic_actions'), - - 'acl_m_info' => array('lang' => 'Can view post details', 'cat' => 'misc'), - 'acl_m_warn' => array('lang' => 'Can issue warnings
    This setting is only assigned globally. It is not forum based.', 'cat' => 'misc'), // This moderator setting is only global (and not local) - 'acl_m_ban' => array('lang' => 'Can manage bans
    This setting is only assigned globally. It is not forum based.', 'cat' => 'misc'), // This moderator setting is only global (and not local) -)); - -// Admin Permissions -$lang = array_merge($lang, array( - 'acl_a_board' => array('lang' => 'Can alter board settings/check for updates', 'cat' => 'settings'), - 'acl_a_server' => array('lang' => 'Can alter server/communication settings', 'cat' => 'settings'), - 'acl_a_jabber' => array('lang' => 'Can alter Jabber settings', 'cat' => 'settings'), - 'acl_a_phpinfo' => array('lang' => 'Can view php settings', 'cat' => 'settings'), - - 'acl_a_forum' => array('lang' => 'Can manage forums', 'cat' => 'forums'), - 'acl_a_forumadd' => array('lang' => 'Can add new forums', 'cat' => 'forums'), - 'acl_a_forumdel' => array('lang' => 'Can delete forums', 'cat' => 'forums'), - 'acl_a_prune' => array('lang' => 'Can prune forums', 'cat' => 'forums'), - - 'acl_a_icons' => array('lang' => 'Can alter topic/post icons and smilies', 'cat' => 'posting'), - 'acl_a_words' => array('lang' => 'Can alter word censors', 'cat' => 'posting'), - 'acl_a_bbcode' => array('lang' => 'Can define BBCode tags', 'cat' => 'posting'), - 'acl_a_attach' => array('lang' => 'Can alter attachment related settings', 'cat' => 'posting'), - - 'acl_a_user' => array('lang' => 'Can manage users
    This also includes seeing the users browser agent within the viewonline list.', 'cat' => 'user_group'), - 'acl_a_userdel' => array('lang' => 'Can delete/prune users', 'cat' => 'user_group'), - 'acl_a_group' => array('lang' => 'Can manage groups', 'cat' => 'user_group'), - 'acl_a_groupadd' => array('lang' => 'Can add new groups', 'cat' => 'user_group'), - 'acl_a_groupdel' => array('lang' => 'Can delete groups', 'cat' => 'user_group'), - 'acl_a_ranks' => array('lang' => 'Can manage ranks', 'cat' => 'user_group'), - 'acl_a_profile' => array('lang' => 'Can manage custom profile fields', 'cat' => 'user_group'), - 'acl_a_names' => array('lang' => 'Can manage disallowed names', 'cat' => 'user_group'), - 'acl_a_ban' => array('lang' => 'Can manage bans', 'cat' => 'user_group'), - - 'acl_a_viewauth' => array('lang' => 'Can view permission masks', 'cat' => 'permissions'), - 'acl_a_authgroups' => array('lang' => 'Can alter permissions for individual groups', 'cat' => 'permissions'), - 'acl_a_authusers' => array('lang' => 'Can alter permissions for individual users', 'cat' => 'permissions'), - 'acl_a_fauth' => array('lang' => 'Can alter forum permission class', 'cat' => 'permissions'), - 'acl_a_mauth' => array('lang' => 'Can alter moderator permission class', 'cat' => 'permissions'), - 'acl_a_aauth' => array('lang' => 'Can alter admin permission class', 'cat' => 'permissions'), - 'acl_a_uauth' => array('lang' => 'Can alter user permission class', 'cat' => 'permissions'), - 'acl_a_roles' => array('lang' => 'Can manage roles', 'cat' => 'permissions'), - 'acl_a_switchperm' => array('lang' => 'Can use others permissions', 'cat' => 'permissions'), - - 'acl_a_styles' => array('lang' => 'Can manage styles', 'cat' => 'misc'), - 'acl_a_viewlogs' => array('lang' => 'Can view logs', 'cat' => 'misc'), - 'acl_a_clearlogs' => array('lang' => 'Can clear logs', 'cat' => 'misc'), - 'acl_a_modules' => array('lang' => 'Can manage modules', 'cat' => 'misc'), - 'acl_a_language' => array('lang' => 'Can manage language packs', 'cat' => 'misc'), - 'acl_a_email' => array('lang' => 'Can send mass e-mail', 'cat' => 'misc'), - 'acl_a_bots' => array('lang' => 'Can manage bots', 'cat' => 'misc'), - 'acl_a_reasons' => array('lang' => 'Can manage report/denial reasons', 'cat' => 'misc'), - 'acl_a_backup' => array('lang' => 'Can backup/restore database', 'cat' => 'misc'), - 'acl_a_search' => array('lang' => 'Can manage search backends and settings', 'cat' => 'misc'), -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php deleted file mode 100644 index ebde75cfaa..0000000000 --- a/phpBB/language/en/acp/posting.php +++ /dev/null @@ -1,271 +0,0 @@ - 'BBCode is a special implementation of HTML offering greater control over what and how something is displayed. From this page you can add, remove and edit custom BBCodes.', - 'ADD_BBCODE' => 'Add a new BBCode', - - 'BBCODE_ADDED' => 'BBCode added successfully.', - 'BBCODE_EDITED' => 'BBCode edited successfully.', - 'BBCODE_NOT_EXIST' => 'The BBCode you selected does not exist.', - 'BBCODE_HELPLINE' => 'Help line', - 'BBCODE_HELPLINE_EXPLAIN' => 'This field contains the mouse over text of the BBCode.', - 'BBCODE_HELPLINE_TEXT' => 'Help line text', - 'BBCODE_INVALID_TAG_NAME' => 'The BBCode tag name that you selected already exists.', - 'BBCODE_INVALID' => 'Your BBCode is constructed in an invalid form.', - 'BBCODE_OPEN_ENDED_TAG' => 'Your custom BBCode must contain both an opening and a closing tag.', - 'BBCODE_TAG' => 'Tag', - 'BBCODE_TAG_TOO_LONG' => 'The tag name you selected is too long.', - 'BBCODE_TAG_DEF_TOO_LONG' => 'The tag definition that you have entered is too long, please shorten your tag definition.', - 'BBCODE_USAGE' => 'BBCode usage', - 'BBCODE_USAGE_EXAMPLE' => '[highlight={COLOR}]{TEXT}[/highlight]

    [font={SIMPLETEXT1}]{SIMPLETEXT2}[/font]', - 'BBCODE_USAGE_EXPLAIN' => 'Here you define how to use the BBCode. Replace any variable input by the corresponding token (%ssee below%s).', - - 'EXAMPLE' => 'Example:', - 'EXAMPLES' => 'Examples:', - - 'HTML_REPLACEMENT' => 'HTML replacement', - 'HTML_REPLACEMENT_EXAMPLE' => '<span style="background-color: {COLOR};">{TEXT}</span>

    <span style="font-family: {SIMPLETEXT1};">{SIMPLETEXT2}</span>', - 'HTML_REPLACEMENT_EXPLAIN' => 'Here you define the default HTML replacement. Do not forget to put back tokens you used above!', - - 'TOKEN' => 'Token', - 'TOKENS' => 'Tokens', - 'TOKENS_EXPLAIN' => 'Tokens are placeholders for user input. The input will be validated only if it matches the corresponding definition. If needed, you can number them by adding a number as the last character between the braces, e.g. {TEXT1}, {TEXT2}.

    Within the HTML replacement you can also use any language string present in your language/ directory like this: {L_<STRINGNAME>} where <STRINGNAME> is the name of the translated string you want to add. For example, {L_WROTE} will be displayed as "wrote" or its translation according to user’s locale.

    Please note that only tokens listed below are able to be used within custom BBCodes.', - 'TOKEN_DEFINITION' => 'What can it be?', - 'TOO_MANY_BBCODES' => 'You cannot create any more BBCodes. Please remove one or more BBCodes then try again.', - - 'tokens' => array( - 'TEXT' => 'Any text, including foreign characters, numbers, etc… You should not use this token in HTML tags. Instead try to use IDENTIFIER or SIMPLETEXT.', - 'SIMPLETEXT' => 'Characters from the latin alphabet (A-Z), numbers, spaces, commas, dots, minus, plus, hyphen and underscore', - 'IDENTIFIER' => 'Characters from the latin alphabet (A-Z), numbers, hyphen and underscore', - 'NUMBER' => 'Any series of digits', - 'EMAIL' => 'A valid e-mail address', - 'URL' => 'A valid URL using any protocol (http, ftp, etc… cannot be used for javascript exploits). If none is given, "http://" is prefixed to the string.', - 'LOCAL_URL' => 'A local URL. The URL must be relative to the topic page and cannot contain a server name or protocol.', - 'COLOR' => 'A HTML colour, can be either in the numeric form #FF1234 or a CSS colour keyword such as fuchsia or InactiveBorder' - ) -)); - -// Smilies and topic icons -$lang = array_merge($lang, array( - 'ACP_ICONS_EXPLAIN' => 'From this page you can add, remove and edit the icons users may add to their topics or posts. These icons are generally displayed next to topic titles on the forum listing, or the post subjects in topic listings. You can also install and create new packages of icons.', - 'ACP_SMILIES_EXPLAIN' => 'Smilies or emoticons are typically small, sometimes animated images used to convey an emotion or feeling. From this page you can add, remove and edit the emoticons users can use in their posts and private messages. You can also install and create new packages of smilies.', - 'ADD_SMILIES' => 'Add multiple smilies', - 'ADD_SMILEY_CODE' => 'Add additional smiley code', - 'ADD_ICONS' => 'Add multiple icons', - 'AFTER_ICONS' => 'After %s', - 'AFTER_SMILIES' => 'After %s', - - 'CODE' => 'Code', - 'CURRENT_ICONS' => 'Current icons', - 'CURRENT_ICONS_EXPLAIN' => 'Choose what to do with the currently installed icons.', - 'CURRENT_SMILIES' => 'Current smilies', - 'CURRENT_SMILIES_EXPLAIN' => 'Choose what to do with the currently installed smilies.', - - 'DISPLAY_ON_POSTING' => 'Display on posting page', - 'DISPLAY_POSTING' => 'On posting page', - 'DISPLAY_POSTING_NO' => 'Not on posting page', - - - - 'EDIT_ICONS' => 'Edit icons', - 'EDIT_SMILIES' => 'Edit smilies', - 'EMOTION' => 'Emotion', - 'EXPORT_ICONS' => 'Export and download icons.pak', - 'EXPORT_ICONS_EXPLAIN' => '%sOn clicking this link, the configuration for your installed icons will be packaged into icons.pak which once downloaded can be used to create a .zip or .tgz file containing all of your icons plus this icons.pak configuration file%s.', - 'EXPORT_SMILIES' => 'Export and download smilies.pak', - 'EXPORT_SMILIES_EXPLAIN' => '%sOn clicking this link, the configuration for your installed smilies will be packaged into smilies.pak which once downloaded can be used to create a .zip or .tgz file containing all of your smilies plus this smilies.pak configuration file%s.', - - 'FIRST' => 'First', - - 'ICONS_ADD' => 'Add a new icon', - 'ICONS_NONE_ADDED' => 'No icons were added.', - 'ICONS_ONE_ADDED' => 'The icon has been added successfully.', - 'ICONS_ADDED' => 'The icons have been added successfully.', - 'ICONS_CONFIG' => 'Icon configuration', - 'ICONS_DELETED' => 'The icon has been removed successfully.', - 'ICONS_EDIT' => 'Edit icon', - 'ICONS_ONE_EDITED' => 'The icon has been updated successfully.', - 'ICONS_NONE_EDITED' => 'No icons were updated.', - 'ICONS_EDITED' => 'The icons have been updated successfully.', - 'ICONS_HEIGHT' => 'Icon height', - 'ICONS_IMAGE' => 'Icon image', - 'ICONS_IMPORTED' => 'The icons pack has been installed successfully.', - 'ICONS_IMPORT_SUCCESS' => 'The icons pack was imported successfully.', - 'ICONS_LOCATION' => 'Icon location', - 'ICONS_NOT_DISPLAYED' => 'The following icons are not displayed on the posting page', - 'ICONS_ORDER' => 'Icon order', - 'ICONS_URL' => 'Icon image file', - 'ICONS_WIDTH' => 'Icon width', - 'IMPORT_ICONS' => 'Install icons package', - 'IMPORT_SMILIES' => 'Install smilies package', - - 'KEEP_ALL' => 'Keep all', - - 'MASS_ADD_SMILIES' => 'Add multiple smilies', - - 'NO_ICONS_ADD' => 'There are no icons available for adding.', - 'NO_ICONS_EDIT' => 'There are no icons available for modifying.', - 'NO_ICONS_EXPORT' => 'You have no icons with which to create a package.', - 'NO_ICONS_PAK' => 'No icon packages found.', - 'NO_SMILIES_ADD' => 'There are no smilies available for adding.', - 'NO_SMILIES_EDIT' => 'There are no smilies available for modifying.', - 'NO_SMILIES_EXPORT' => 'You have no smilies with which to create a package.', - 'NO_SMILIES_PAK' => 'No smiley packages found.', - - 'PAK_FILE_NOT_READABLE' => 'Could not read .pak file.', - - 'REPLACE_MATCHES' => 'Replace matches', - - 'SELECT_PACKAGE' => 'Select a package file', - 'SMILIES_ADD' => 'Add a new smiley', - 'SMILIES_NONE_ADDED' => 'No smilies were added.', - 'SMILIES_ONE_ADDED' => 'The smiley has been added successfully.', - 'SMILIES_ADDED' => 'The smilies have been added successfully.', - 'SMILIES_CODE' => 'Smiley code', - 'SMILIES_CONFIG' => 'Smiley configuration', - 'SMILIES_DELETED' => 'The smiley has been removed successfully.', - 'SMILIES_EDIT' => 'Edit smiley', - 'SMILIE_NO_CODE' => 'The smilie “%s†was ignored, as there was no code entered.', - 'SMILIE_NO_EMOTION' => 'The smilie “%s†was ignored, as there was no emotion entered.', - 'SMILIES_NONE_EDITED' => 'No smilies were updated.', - 'SMILIES_ONE_EDITED' => 'The smiley has been updated successfully.', - 'SMILIES_EDITED' => 'The smilies have been updated successfully.', - 'SMILIES_EMOTION' => 'Emotion', - 'SMILIES_HEIGHT' => 'Smiley height', - 'SMILIES_IMAGE' => 'Smiley image', - 'SMILIES_IMPORTED' => 'The smilies pack has been installed successfully.', - 'SMILIES_IMPORT_SUCCESS' => 'The smilies pack was imported successfully.', - 'SMILIES_LOCATION' => 'Smiley location', - 'SMILIES_NOT_DISPLAYED' => 'The following smilies are not displayed on the posting page', - 'SMILIES_ORDER' => 'Smiley order', - 'SMILIES_URL' => 'Smiley image file', - 'SMILIES_WIDTH' => 'Smiley width', - - 'WRONG_PAK_TYPE' => 'The specified package does not contain the appropriate data.', -)); - -// Word censors -$lang = array_merge($lang, array( - 'ACP_WORDS_EXPLAIN' => 'From this control panel you can add, edit, and remove words that will be automatically censored on your forums. In addition people will not be allowed to register with usernames containing these words. Wildcards (*) are accepted in the word field, e.g. *test* will match detestable, test* would match testing, *test would match detest.', - 'ADD_WORD' => 'Add new word', - - 'EDIT_WORD' => 'Edit word censor', - 'ENTER_WORD' => 'You must enter a word and its replacement.', - - 'NO_WORD' => 'No word selected for editing.', - - 'REPLACEMENT' => 'Replacement', - - 'UPDATE_WORD' => 'Update word censor', - - 'WORD' => 'Word', - 'WORD_ADDED' => 'The word censor has been successfully added.', - 'WORD_REMOVED' => 'The selected word censor has been successfully removed.', - 'WORD_UPDATED' => 'The selected word censor has been successfully updated.', -)); - -// Ranks -$lang = array_merge($lang, array( - 'ACP_RANKS_EXPLAIN' => 'Using this form you can add, edit, view and delete ranks. You can also create special ranks which can be applied to a user via the user management facility.', - 'ADD_RANK' => 'Add new rank', - - 'MUST_SELECT_RANK' => 'You must select a rank.', - - 'NO_ASSIGNED_RANK' => 'No special rank assigned.', - 'NO_RANK_TITLE' => 'You haven’t specified a title for the rank.', - 'NO_UPDATE_RANKS' => 'The rank was successfully deleted. However user accounts using this rank were not updated. You will need to manually reset the rank on these accounts.', - - 'RANK_ADDED' => 'The rank was successfully added.', - 'RANK_IMAGE' => 'Rank image', - 'RANK_IMAGE_EXPLAIN' => 'Use this to define a small image associated with the rank. The path is relative to the root phpBB directory.', - 'RANK_MINIMUM' => 'Minimum posts', - 'RANK_REMOVED' => 'The rank was successfully deleted.', - 'RANK_SPECIAL' => 'Set as special rank', - 'RANK_TITLE' => 'Rank title', - 'RANK_UPDATED' => 'The rank was successfully updated.', -)); - -// Disallow Usernames -$lang = array_merge($lang, array( - 'ACP_DISALLOW_EXPLAIN' => 'Here you can control usernames which will not be allowed to be used. Disallowed usernames are allowed to contain a wildcard character of *. Please note that you will not be allowed to specify any username that has already been registered, you must first delete that name then disallow it.', - 'ADD_DISALLOW_EXPLAIN' => 'You can disallow a username using the wildcard character * to match any character.', - 'ADD_DISALLOW_TITLE' => 'Add a disallowed username', - - 'DELETE_DISALLOW_EXPLAIN' => 'You can remove a disallowed username by selecting the username from this list and clicking submit.', - 'DELETE_DISALLOW_TITLE' => 'Remove a disallowed username', - 'DISALLOWED_ALREADY' => 'The name you entered could not be disallowed. It either already exists in the list, exists in the word censor list, or a matching username is present.', - 'DISALLOWED_DELETED' => 'The disallowed username has been successfully removed.', - 'DISALLOW_SUCCESSFUL' => 'The disallowed username has been successfully added.', - - 'NO_DISALLOWED' => 'No disallowed usernames', - 'NO_USERNAME_SPECIFIED' => 'You haven’t selected or entered a username to operate with.', -)); - -// Reasons -$lang = array_merge($lang, array( - 'ACP_REASONS_EXPLAIN' => 'Here you can manage the reasons used in reports and denial messages when disapproving posts. There is one default reason (marked with a *) you are not able to remove, this reason is normally used for custom messages if no reason fits.', - 'ADD_NEW_REASON' => 'Add new reason', - 'AVAILABLE_TITLES' => 'Available localised reason titles', - - 'IS_NOT_TRANSLATED' => 'Reason has not been localised.', - 'IS_NOT_TRANSLATED_EXPLAIN' => 'Reason has not been localised. If you want to provide the localised form, specify the correct key from the language files report reasons section.', - 'IS_TRANSLATED' => 'Reason has been localised.', - 'IS_TRANSLATED_EXPLAIN' => 'Reason has been localised. If the title you enter here is specified within the language files report reasons section, the localised form of the title and description will be used.', - - 'NO_REASON' => 'Reason could not be found.', - 'NO_REASON_INFO' => 'You have to specify a title and a description for this reason.', - 'NO_REMOVE_DEFAULT_REASON' => 'You are not able to remove the default reason “Otherâ€.', - - 'REASON_ADD' => 'Add report/denial reason', - 'REASON_ADDED' => 'Report/denial reason successfully added.', - 'REASON_ALREADY_EXIST' => 'A reason with this title already exist, please enter another title for this reason.', - 'REASON_DESCRIPTION' => 'Reason description', - 'REASON_DESC_TRANSLATED' => 'Displayed reason description', - 'REASON_EDIT' => 'Edit report/denial reason', - 'REASON_EDIT_EXPLAIN' => 'Here you are able to add or edit a reason. If the reason is translated the localised version is used instead of the description entered here.', - 'REASON_REMOVED' => 'Report/denial reason successfully removed.', - 'REASON_TITLE' => 'Reason title', - 'REASON_TITLE_TRANSLATED' => 'Displayed reason title', - 'REASON_UPDATED' => 'Report/denial reason successfully updated.', - - 'USED_IN_REPORTS' => 'Used in reports', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php deleted file mode 100644 index ca63c9c639..0000000000 --- a/phpBB/language/en/acp/profile.php +++ /dev/null @@ -1,154 +0,0 @@ - 'Successfully added custom profile field.', - 'ALPHA_ONLY' => 'Alphanumeric only', - 'ALPHA_SPACERS' => 'Alphanumeric and spacers', - 'ALWAYS_TODAY' => 'Always the current date', - - 'BOOL_ENTRIES_EXPLAIN' => 'Enter your options now', - 'BOOL_TYPE_EXPLAIN' => 'Define the type, either a checkbox or radio buttons. A checkbox will only be displayed if it is checked for a given user. In that case the second language option will be used. Radio buttons will display regardless of their value.', - - 'CHANGED_PROFILE_FIELD' => 'Successfully changed profile field.', - 'CHARS_ANY' => 'Any character', - 'CHECKBOX' => 'Checkbox', - 'COLUMNS' => 'Columns', - 'CP_LANG_DEFAULT_VALUE' => 'Default value', - 'CP_LANG_EXPLAIN' => 'Field description', - 'CP_LANG_EXPLAIN_EXPLAIN' => 'The explanation for this field presented to the user.', - 'CP_LANG_NAME' => 'Field name/title presented to the user', - 'CP_LANG_OPTIONS' => 'Options', - 'CREATE_NEW_FIELD' => 'Create new field', - 'CUSTOM_FIELDS_NOT_TRANSLATED' => 'At least one custom profile field has not yet been translated. Please enter the required information by clicking on the “Translate†link.', - - 'DEFAULT_ISO_LANGUAGE' => 'Default language [%s]', - 'DEFAULT_LANGUAGE_NOT_FILLED' => 'The language entries for the default language are not filled for this profile field.', - 'DEFAULT_VALUE' => 'Default value', - 'DELETE_PROFILE_FIELD' => 'Remove profile field', - 'DELETE_PROFILE_FIELD_CONFIRM' => 'Are you sure you want to delete this profile field?', - 'DISPLAY_AT_PROFILE' => 'Display in user control panel', - 'DISPLAY_AT_PROFILE_EXPLAIN' => 'The user is able to change this profile field within the user control panel.', - 'DISPLAY_AT_REGISTER' => 'Display at registration screen', - 'DISPLAY_AT_REGISTER_EXPLAIN' => 'If this option is enabled, the field will be displayed on registration and able to be changed within the user control panel.', - 'DISPLAY_PROFILE_FIELD' => 'Display profile field', - 'DISPLAY_PROFILE_FIELD_EXPLAIN' => 'The profile field will be shown in all places allowed within the load settings. Setting this to “no†will hide the field from topic pages, profiles and the memberlist.', - 'DROPDOWN_ENTRIES_EXPLAIN' => 'Enter your options now, every option in one line.', - - 'EDIT_DROPDOWN_LANG_EXPLAIN' => 'Please note that you are able to change your options text and also able to add new options to the end. It is not advised to add new options between existing options - this could result in wrong options assigned to your users. This can also happen if you remove options in-between. Removing options from the end result in users having assigned this item now reverting back to the default one.', - 'EMPTY_FIELD_IDENT' => 'Empty field identification', - 'EMPTY_USER_FIELD_NAME' => 'Please enter a field name/title', - 'ENTRIES' => 'Entries', - 'EVERYTHING_OK' => 'Everything OK', - - 'FIELD_BOOL' => 'Boolean (Yes/No)', - 'FIELD_DATE' => 'Date', - 'FIELD_DESCRIPTION' => 'Field description', - 'FIELD_DESCRIPTION_EXPLAIN' => 'The explanation for this field presented to the user.', - 'FIELD_DROPDOWN' => 'Dropdown box', - 'FIELD_IDENT' => 'Field identification', - 'FIELD_IDENT_ALREADY_EXIST' => 'The chosen field identification already exist. Please choose another name.', - 'FIELD_IDENT_EXPLAIN' => 'The field identification is a name to identify the profile field within the database and the templates.', - 'FIELD_INT' => 'Numbers', - 'FIELD_LENGTH' => 'Length of input box', - 'FIELD_NOT_FOUND' => 'Profile field not found.', - 'FIELD_STRING' => 'Single text field', - 'FIELD_TEXT' => 'Textarea', - 'FIELD_TYPE' => 'Field type', - 'FIELD_TYPE_EXPLAIN' => 'You are not able to change the field type later.', - 'FIELD_VALIDATION' => 'Field validation', - 'FIRST_OPTION' => 'First option', - - 'HIDE_PROFILE_FIELD' => 'Hide profile field', - 'HIDE_PROFILE_FIELD_EXPLAIN' => 'Only administrators and moderators are able to see/fill out this profile field. If this option is enabled, the profile field will be only displayed in users’ profiles.', - - 'INVALID_CHARS_FIELD_IDENT' => 'Field identification can only contain lowercase a-z and _', - 'INVALID_FIELD_IDENT_LEN' => 'Field identification can only be 17 characters long', - 'ISO_LANGUAGE' => 'Language [%s]', - - 'LANG_SPECIFIC_OPTIONS' => 'Language specific options [%s]', - - 'MAX_FIELD_CHARS' => 'Maximum number of characters', - 'MAX_FIELD_NUMBER' => 'Highest allowed number', - 'MIN_FIELD_CHARS' => 'Minimum number of characters', - 'MIN_FIELD_NUMBER' => 'Lowest allowed number', - - 'NO_FIELD_ENTRIES' => 'No entries defined', - 'NO_FIELD_ID' => 'No field id specified.', - 'NO_FIELD_TYPE' => 'No Field type specified.', - 'NO_VALUE_OPTION' => 'Option equal to non entered value', - 'NO_VALUE_OPTION_EXPLAIN' => 'Value for a non-entry. If the field is required, the user gets an error if he choose the option selected here.', - 'NUMBERS_ONLY' => 'Only numbers (0-9)', - - 'PROFILE_BASIC_OPTIONS' => 'Basic options', - 'PROFILE_FIELD_ACTIVATED' => 'Profile field successfully activated.', - 'PROFILE_FIELD_DEACTIVATED' => 'Profile field successfully deactivated.', - 'PROFILE_LANG_OPTIONS' => 'Language specific options', - 'PROFILE_TYPE_OPTIONS' => 'Profile type specific options', - - 'RADIO_BUTTONS' => 'Radio buttons', - 'REMOVED_PROFILE_FIELD' => 'Successfully removed profile field.', - 'REQUIRED_FIELD' => 'Required field', - 'REQUIRED_FIELD_EXPLAIN' => 'Force profile field to be filled out or specified by user. This will display the profile field at registration and within the user control panel.', - 'ROWS' => 'Rows', - - 'SAVE' => 'Save', - 'SECOND_OPTION' => 'Second option', - 'STEP_1_EXPLAIN_CREATE' => 'Here you can enter the first basic parameters of your new profile field. This information is needed for the second step where you’ll be able to set remaining options and tweak your profile field further.', - 'STEP_1_EXPLAIN_EDIT' => 'Here you can change the basic parameters of your profile field. The relevant options are re-calculated within the second step.', - 'STEP_1_TITLE_CREATE' => 'Add profile field', - 'STEP_1_TITLE_EDIT' => 'Edit profile field', - 'STEP_2_EXPLAIN_CREATE' => 'Here you are able to define some common options you may want to adjust.', - 'STEP_2_EXPLAIN_EDIT' => 'Here you are able to change some common options.
    Please note that changes to profile fields will not affect existing profile fields entered by your users.', - 'STEP_2_TITLE_CREATE' => 'Profile type specific options', - 'STEP_2_TITLE_EDIT' => 'Profile type specific options', - 'STEP_3_EXPLAIN_CREATE' => 'Since you have more than one board language installed, you have to fill out the remaining language items too. The profile field will work with the default language enabled, you are able to fill out the remaining language items later too.', - 'STEP_3_EXPLAIN_EDIT' => 'Since you have more than one board language installed, you now can change or add the remaining language items too. The profile field will work with the default language enabled.', - 'STEP_3_TITLE_CREATE' => 'Remaining language definitions', - 'STEP_3_TITLE_EDIT' => 'Language definitions', - 'STRING_DEFAULT_VALUE_EXPLAIN' => 'Enter a default phrase to be displayed, a default value. Leave empty if you want to show it empty at the first place.', - - 'TEXT_DEFAULT_VALUE_EXPLAIN' => 'Enter a default text to be displayed, a default value. Leave empty if you want to show it empty at the first place.', - 'TRANSLATE' => 'Translate', - - 'USER_FIELD_NAME' => 'Field name/title presented to the user', - - 'VISIBILITY_OPTION' => 'Visibility option', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php deleted file mode 100644 index 31e14d62a1..0000000000 --- a/phpBB/language/en/acp/prune.php +++ /dev/null @@ -1,91 +0,0 @@ - 'Here you can delete (or deactivate) users from your board. This can be done in a variety of ways; by post count, last activity, etc. Each of these criteria can be combined, i.e. you can prune users last active before 2002-01-01 with fewer than 10 posts. Alternatively you can enter a list of users directly into the text box, any criteria entered will be ignored. Take care with this facility! Once a user is deleted there is no way back.', - - 'DEACTIVATE_DELETE' => 'Deactivate or delete', - 'DEACTIVATE_DELETE_EXPLAIN' => 'Choose whether to deactivate users or delete them entirely, note there is no undo!', - 'DELETE_USERS' => 'Delete', - 'DELETE_USER_POSTS' => 'Delete pruned user posts', - 'DELETE_USER_POSTS_EXPLAIN' => 'Removes posts made by deleted users, has no effect if users are deactivated.', - - 'JOINED_EXPLAIN' => 'Enter a date in YYYY-MM-DD format.', - - 'LAST_ACTIVE_EXPLAIN' => 'Enter a date in YYYY-MM-DD format.', - - 'PRUNE_USERS_LIST' => 'Users to be pruned', - 'PRUNE_USERS_LIST_DELETE' => 'With the selected critera for pruning users the following accounts will be removed.', - 'PRUNE_USERS_LIST_DEACTIVATE' => 'With the selected critera for pruning users the following accounts will be deactivated.', - - 'SELECT_USERS_EXPLAIN' => 'Enter specific usernames here, they will be used in preference to the criteria above.', - - 'USER_DEACTIVATE_SUCCESS' => 'The selected users have been deactivated successfully.', - 'USER_DELETE_SUCCESS' => 'The selected users have been deleted successfully.', - 'USER_PRUNE_FAILURE' => 'No users fit the selected criteria.', - - 'WRONG_ACTIVE_JOINED_DATE' => 'The date entered is wrong, it is expected in YYYY-MM-DD format.', -)); - -// Forum Pruning -$lang = array_merge($lang, array( - 'ACP_PRUNE_FORUMS_EXPLAIN' => 'This will delete any topic which has not been posted to or viewed within the number of days you select. If you do not enter a number then all topics will be deleted. By default, it will not remove topics in which polls are still running nor will it remove stickies and announcements.', - - 'FORUM_PRUNE' => 'Forum prune', - - 'NO_PRUNE' => 'No forums pruned.', - - 'SELECTED_FORUM' => 'Selected forum', - 'SELECTED_FORUMS' => 'Selected forums', - - 'POSTS_PRUNED' => 'Posts pruned', - 'PRUNE_ANNOUNCEMENTS' => 'Prune announcements', - 'PRUNE_FINISHED_POLLS' => 'Prune closed polls', - 'PRUNE_FINISHED_POLLS_EXPLAIN' => 'Removes topics with polls which have ended.', - 'PRUNE_FORUM_CONFIRM' => 'Are you sure you want to prune the selected forums with the settings specified? Once removed, there is no way to recover the pruned posts and topics.', - 'PRUNE_NOT_POSTED' => 'Days since last posted', - 'PRUNE_NOT_VIEWED' => 'Days since last viewed', - 'PRUNE_OLD_POLLS' => 'Prune old polls', - 'PRUNE_OLD_POLLS_EXPLAIN' => 'Removes topics with polls not voted in for post age days.', - 'PRUNE_STICKY' => 'Prune stickies', - 'PRUNE_SUCCESS' => 'Pruning of forums was successful.', - - 'TOPICS_PRUNED' => 'Topics pruned', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php deleted file mode 100644 index 16fa7fdf6e..0000000000 --- a/phpBB/language/en/acp/search.php +++ /dev/null @@ -1,101 +0,0 @@ - 'Here you can manage the search backend’s indexes. Since you normally use only one backend you should delete all indexes that you do not make use of. After altering some of the search settings (e.g. the number of minimum/maximum chars) it might be worth recreating the index so it reflects those changes.', - 'ACP_SEARCH_SETTINGS_EXPLAIN' => 'Here you can define what search backend will be used for indexing posts and performing searches. You can set various options that can influence how much processing these actions require. Some of these settings are the same for all search engine backends.', - - 'COMMON_WORD_THRESHOLD' => 'Common word threshold', - 'COMMON_WORD_THRESHOLD_EXPLAIN' => 'Words which are contained in a greater percentage of all posts will be regarded as common. Common words are ignored in search queries. Set to zero to disable. Only takes effect if there are more than 100 posts.', - 'CONFIRM_SEARCH_BACKEND' => 'Are you sure you wish to switch to a different search backend? After changing the search backend you will have to create an index for the new search backend. If you don’t plan on switching back to the old search backend you can also delete the old backend’s index in order to free system resources.', - 'CONTINUE_DELETING_INDEX' => 'Continue previous index removal process', - 'CONTINUE_DELETING_INDEX_EXPLAIN' => 'An index removal process has been started. In order to access the search index page you will have to complete it or cancel it.', - 'CONTINUE_INDEXING' => 'Continue previous indexing process', - 'CONTINUE_INDEXING_EXPLAIN' => 'An indexing process has been started. In order to access the search index page you will have to complete it or cancel it.', - 'CREATE_INDEX' => 'Create index', - - 'DELETE_INDEX' => 'Delete index', - 'DELETING_INDEX_IN_PROGRESS' => 'Deleting the index in progress', - 'DELETING_INDEX_IN_PROGRESS_EXPLAIN' => 'The search backend is currently cleaning its index. This can take a few minutes.', - - 'FULLTEXT_MYSQL_INCOMPATIBLE_VERSION' => 'The MySQL fulltext backend can only be used with MySQL4 and above.', - 'FULLTEXT_MYSQL_NOT_MYISAM' => 'MySQL fulltext indexes can only be used with MyISAM tables.', - 'FULLTEXT_MYSQL_TOTAL_POSTS' => 'Total number of indexed posts', - - 'GENERAL_SEARCH_SETTINGS' => 'General search settings', - 'GO_TO_SEARCH_INDEX' => 'Go to search index page', - - 'INDEX_STATS' => 'Index statistics', - 'INDEXING_IN_PROGRESS' => 'Indexing in progress', - 'INDEXING_IN_PROGRESS_EXPLAIN' => 'The search backend is currently indexing all posts on the board. This can take from a few minutes to a few hours depending on your board’s size.', - - 'LIMIT_SEARCH_LOAD' => 'Search page system load limit', - 'LIMIT_SEARCH_LOAD_EXPLAIN' => 'If the 1 minute system load exceeds this value the search page will go offline, 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers.', - - 'MAX_SEARCH_CHARS' => 'Max characters indexed by search', - 'MAX_SEARCH_CHARS_EXPLAIN' => 'Words with no more than this many characters will be indexed for searching.', - 'MIN_SEARCH_CHARS' => 'Min characters indexed by search', - 'MIN_SEARCH_CHARS_EXPLAIN' => 'Words with at least this many characters will be indexed for searching.', - 'MIN_SEARCH_AUTHOR_CHARS' => 'Min author name characters', - 'MIN_SEARCH_AUTHOR_CHARS_EXPLAIN' => 'Users have to enter at least this many characters of the name when performing a wildcard author search. If the author’s username is shorter than this number you can still search for the author’s posts by entering the complete username.', - - 'PROGRESS_BAR' => 'Progress bar', - - 'SEARCH_GUEST_INTERVAL' => 'Guest search flood interval', - 'SEARCH_GUEST_INTERVAL_EXPLAIN' => 'Number of seconds guests must wait between searches. If one guest searches all others have to wait until the time interval passed.', - 'SEARCH_INDEX_CREATE_REDIRECT' => 'All posts up to post id %1$d have now been indexed, of which %2$d posts were within this step.
    The current rate of indexing is approximately %3$.1f posts per second.
    Indexing in progress…', - 'SEARCH_INDEX_DELETE_REDIRECT' => 'All posts up to post id %1$d have been removed from the search index.
    Deleting in progress…', - 'SEARCH_INDEX_CREATED' => 'Successfully indexed all posts in the board database.', - 'SEARCH_INDEX_REMOVED' => 'Successfully deleted the search index for this backend.', - 'SEARCH_INTERVAL' => 'User search flood interval', - 'SEARCH_INTERVAL_EXPLAIN' => 'Number of seconds users must wait between searches. This interval is checked independently for each user.', - 'SEARCH_STORE_RESULTS' => 'Search result cache length', - 'SEARCH_STORE_RESULTS_EXPLAIN' => 'Cached search results will expire after this time, in seconds. Set to 0 if you want to disable search cache.', - 'SEARCH_TYPE' => 'Search backend', - 'SEARCH_TYPE_EXPLAIN' => 'phpBB allows you to choose the backend that is used for searching text in post contents. By default the search will use phpBB’s own fulltext search.', - 'SWITCHED_SEARCH_BACKEND' => 'You switched the search backend. In order to use the new search backend you should make sure that there is an index for the backend you chose.', - - 'TOTAL_WORDS' => 'Total number of indexed words', - 'TOTAL_MATCHES' => 'Total number of word to post relations indexed', - - 'YES_SEARCH' => 'Enable search facilities', - 'YES_SEARCH_EXPLAIN' => 'Enables user facing search functionality including member search.', - 'YES_SEARCH_UPDATE' => 'Enable fulltext updating', - 'YES_SEARCH_UPDATE_EXPLAIN' => 'Updating of fulltext indexes when posting, overridden if search is disabled.', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php deleted file mode 100644 index a6333fcba0..0000000000 --- a/phpBB/language/en/acp/styles.php +++ /dev/null @@ -1,425 +0,0 @@ - 'Imagesets comprise all the button, forum, folder, etc. and other non-style specific images used by the board. Here you can edit, export or delete existing imagesets and import or activate new sets.', - 'ACP_STYLES_EXPLAIN' => 'Here you can manage the available styles on your board. A style consists of a template, theme and imageset. You may alter existing styles, delete, deactivate, reactivate, create or import new ones. You can also see what a style will look like using the preview function. The current default style is noted by the presence of an asterisk (*). Also listed is the total user count for each style, note that overriding user styles will not be reflected here.', - 'ACP_TEMPLATES_EXPLAIN' => 'A template set comprises all the markup used to generate the layout of your board. Here you can edit existing template sets, delete, export, import and preview sets. You can also modify the templating code used to generate BBCode.', - 'ACP_THEMES_EXPLAIN' => 'From here you can create, install, edit, delete and export themes. A theme is the combination of colours and images that are applied to your templates to define the basic look of your board. The range of options open to you depends on the configuration of your server and phpBB installation, see the manual for further details. Please note that when creating new themes the use of an existing theme as a basis is optional.', - 'ADD_IMAGESET' => 'Create imageset', - 'ADD_IMAGESET_EXPLAIN' => 'Here you can create a new imageset. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this imageset on an existing one. You may also be able to upload or import (from the store directory) a imageset archive. If you upload or import an archive the imageset name can be optionally taken from the archive name (to do this leave the imageset name blank).', - 'ADD_STYLE' => 'Create style', - 'ADD_STYLE_EXPLAIN' => 'Here you can create a new style. Depending on your server configuration and file permissions you may have additional options. For example you may be able to base this style on an existing one. You may also be able to upload or import (from the store directory) a style archive. If you upload or import an archive the style name will be determined automatically.', - 'ADD_TEMPLATE' => 'Create template', - 'ADD_TEMPLATE_EXPLAIN' => 'Here you can add a new template. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this template set on an existing one. You may also be able to upload or import (from the store directory) a template archive. If you upload or import an archive the template name can be optionally taken from the archive name (to do this leave the template name blank).', - 'ADD_THEME' => 'Create theme', - 'ADD_THEME_EXPLAIN' => 'Here you can add a new theme. Depending on your server configuration and file permissions you may have additional options here. For example you may be able to base this theme on an existing one. You may also be able to upload or import (from the store directory) a theme archive. If you upload or import an archive the theme name can be optionally taken from the archive name (to do this leave the theme name blank).', - 'ARCHIVE_FORMAT' => 'Archive file type', - 'AUTOMATIC_EXPLAIN' => 'Leave blank to attempt automatic detection.', - - 'BACKGROUND' => 'Background', - 'BACKGROUND_COLOUR' => 'Background colour', - 'BACKGROUND_IMAGE' => 'Background image', - 'BACKGROUND_REPEAT' => 'Background repeat', - 'BOLD' => 'Bold', - - 'CACHE' => 'Cache', - 'CACHE_CACHED' => 'Cached', - 'CACHE_FILENAME' => 'Template file', - 'CACHE_FILESIZE' => 'File size', - 'CACHE_MODIFIED' => 'Modified', - 'CONFIRM_IMAGESET_REFRESH' => 'Are you sure you wish to refresh all imageset data? The settings from the imageset configuration file will overwrite all modifications to the imageset which have been carried out with the imageset editor.', - 'CONFIRM_TEMPLATE_CLEAR_CACHE' => 'Are you sure you wish to clear all cached versions of your template files?', - 'CONFIRM_TEMPLATE_REFRESH' => 'Are you sure you wish to refresh all template data in the database with the contents of the template files on the filesystem? This will overwrite all modifications which have been carried out with the template editor while the template was stored in the database.', - 'CONFIRM_THEME_REFRESH' => 'Are you sure you wish to refresh the theme data stored in the database with the contents of the theme on the filesystem? This will overwrite all modifications which have been carried out with the theme editor while the theme was stored in the database.', - 'COPYRIGHT' => 'Copyright', - 'CREATE_IMAGESET' => 'Create new imageset', - 'CREATE_STYLE' => 'Create new style', - 'CREATE_TEMPLATE' => 'Create new template set', - 'CREATE_THEME' => 'Create new theme', - 'CURRENT_IMAGE' => 'Current image', - - 'DEACTIVATE_DEFAULT' => 'You cannot deactivate the default style.', - 'DELETE_FROM_FS' => 'Delete from filesystem', - 'DELETE_IMAGESET' => 'Delete imageset', - 'DELETE_IMAGESET_EXPLAIN' => 'Here you can remove the selected imageset from the database. Additionally, if you have permission you can elect to remove the set from the filesystem. Please note that there is no undo capability. When the imageset is deleted it is gone for good. It is recommended that you first export your set for possible future use.', - 'DELETE_STYLE' => 'Delete style', - 'DELETE_STYLE_EXPLAIN' => 'Here you can remove the selected style. You cannot remove all the style elements from here. These must be deleted individually via their respective forms. Take care in deleting styles there is no undo facility.', - 'DELETE_TEMPLATE' => 'Delete template', - 'DELETE_TEMPLATE_EXPLAIN' => 'Here you can remove the selected template set from the database. Additionally, if you have permission you can elect to remove the set from the filesystem. Please note that there is no undo capability. When the templates are deleted they are gone for good. It is recommended that you first export your set for possible future use.', - 'DELETE_THEME' => 'Delete theme', - 'DELETE_THEME_EXPLAIN' => 'Here you can remove the selected theme from the database. Additionally, if you have permission you can elect to remove the theme from the filesystem. Please note that there is no undo capability. When the theme is deleted it is gone for good. It is recommended that you first export your theme for possible future use.', - 'DETAILS' => 'Details', - 'DIMENSIONS_EXPLAIN' => 'Selecting yes here will include width/height parameters.', - - 'EDIT_DETAILS_IMAGESET' => 'Edit imageset details', - 'EDIT_DETAILS_IMAGESET_EXPLAIN' => 'Here you can edit certain imageset details such as its name.', - 'EDIT_DETAILS_STYLE' => 'Edit style', - 'EDIT_DETAILS_STYLE_EXPLAIN' => 'Using the form below you can modify this existing style. You may alter the combination of template, theme and imageset which define the style itself. You may also make the style the default one.', - 'EDIT_DETAILS_TEMPLATE' => 'Edit template details', - 'EDIT_DETAILS_TEMPLATE_EXPLAIN' => 'Here you can edit certain template details such as its name. You may also have the option to switch storage of the stylesheet from the filesystem to the database and vice versa. This option depends on your PHP configuration and whether your template set can be written to by the web server.', - 'EDIT_DETAILS_THEME' => 'Edit theme details', - 'EDIT_DETAILS_THEME_EXPLAIN' => 'Here you can edit certain theme details such as its name. You may also have the option to switch storage of the stylesheet from the filesystem to the database and vice versa. This option depends on your PHP configuration and whether your stylesheet can be written to by the web server.', - 'EDIT_IMAGESET' => 'Edit imageset', - 'EDIT_IMAGESET_EXPLAIN' => 'Here you can edit the individual images which define the imageset. You can also specify dimensions for the image. Dimensions are optional, specifying them can overcome certain rendering issues with some browsers. By not specifying them you reduce the size of the database record a little.', - 'EDIT_TEMPLATE' => 'Edit template', - 'EDIT_TEMPLATE_EXPLAIN' => 'Here you can edit your template set directly. Please remember that these edits are permanent and cannot be undone once submitted. If PHP can write to the template files in your styles directory any changes here will be written directly to those files. If PHP cannot write to those files they will be copied into the database and all changes will only be reflected there. Please take care when editing your template set, remember to close all replacement variable terms {XXXX} and conditional statements.', - 'EDIT_TEMPLATE_STORED_DB' => 'The template file was unwritable so the template set is now stored in the database containing the modified file.', - 'EDIT_THEME' => 'Edit theme', - 'EDIT_THEME_EXPLAIN' => 'Here you can edit the selected theme, changing colours, images, etc.', - 'EDIT_THEME_STORED_DB' => 'The stylesheet file was unwritable so the stylesheet is now stored in the database containing your modification.', - 'EDIT_THEME_STORE_PARSED' => 'The theme requires that its stylesheet is parsed. This is only possible if it’s stored in the database.', - 'EXPORT' => 'Export', - - 'FOREGROUND' => 'Foreground', - 'FONT_COLOUR' => 'Font colour', - 'FONT_FACE' => 'Font face', - 'FONT_FACE_EXPLAIN' => 'You can specify multiple fonts separated by commas. If a user doesn’t have the first font installed the first other working font will be chosen.', - 'FONT_SIZE' => 'Font size', - - 'GLOBAL_IMAGES' => 'Global', - - 'HIDE_CSS' => 'Hide raw CSS', - - 'IMAGE_WIDTH' => 'Image width', - 'IMAGE_HEIGHT' => 'Image height', - 'IMAGE' => 'Image', - 'IMAGE_NAME' => 'Image name', - 'IMAGE_PARAMETER' => 'Parameter', - 'IMAGE_VALUE' => 'Value', - 'IMAGESET_ADDED' => 'New imageset added on filesystem.', - 'IMAGESET_ADDED_DB' => 'New imageset added to database.', - 'IMAGESET_DELETED' => 'Imageset deleted successfully.', - 'IMAGESET_DELETED_FS' => 'Imageset removed from database but some files may remain on the filesystem.', - 'IMAGESET_DETAILS_UPDATED' => 'Imageset details successfully updated.', - 'IMAGESET_ERR_ARCHIVE' => 'Please select an archive method.', - 'IMAGESET_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters.', - 'IMAGESET_ERR_NAME_CHARS' => 'The imageset name can only contain alphanumeric characters, -, +, _ and space.', - 'IMAGESET_ERR_NAME_EXIST' => 'A imageset with that name already exists.', - 'IMAGESET_ERR_NAME_LONG' => 'The imageset name can be no longer than 30 characters.', - 'IMAGESET_ERR_NOT_IMAGESET' => 'The archive you specified does not contain a valid imageset.', - 'IMAGESET_ERR_STYLE_NAME' => 'You must supply a name for this imageset.', - 'IMAGESET_EXPORT' => 'Export imageset', - 'IMAGESET_EXPORT_EXPLAIN' => 'Here you can export an imageset in the form of an archive. This archive will contain all the data necessary to install the set of images on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', - 'IMAGESET_EXPORTED' => 'Imageset exported successfully and stored in %s.', - 'IMAGESET_NAME' => 'Imageset name', - 'IMAGESET_REFRESHED' => 'Imageset refreshed successfully.', - 'IMAGESET_UPDATED' => 'Imageset updated successfully.', - 'ITALIC' => 'Italic', - - 'IMG_CAT_BUTTONS' => 'Localised buttons', - 'IMG_CAT_CUSTOM' => 'Custom images', - 'IMG_CAT_FOLDERS' => 'Topic icons', - 'IMG_CAT_FORUMS' => 'Forum icons', - 'IMG_CAT_ICONS' => 'General icons', - 'IMG_CAT_LOGOS' => 'Logos', - 'IMG_CAT_POLLS' => 'Polling images', - 'IMG_CAT_UI' => 'General user interface elements', - 'IMG_CAT_USER' => 'Additional images', - - 'IMG_SITE_LOGO' => 'Main logo', - 'IMG_UPLOAD_BAR' => 'Upload progress bar', - 'IMG_POLL_LEFT' => 'Poll left end', - 'IMG_POLL_CENTER' => 'Poll centre', - 'IMG_POLL_RIGHT' => 'Poll right end', - 'IMG_ICON_FRIEND' => 'Add as friend', - 'IMG_ICON_FOE' => 'Add as foe', - - 'IMG_FORUM_LINK' => 'Forum link', - 'IMG_FORUM_READ' => 'Forum', - 'IMG_FORUM_READ_LOCKED' => 'Forum locked', - 'IMG_FORUM_READ_SUBFORUM' => 'Subforum', - 'IMG_FORUM_UNREAD' => 'Forum new posts', - 'IMG_FORUM_UNREAD_LOCKED' => 'Forum new posts locked', - 'IMG_FORUM_UNREAD_SUBFORUM' => 'Subforum new posts', - 'IMG_SUBFORUM_READ' => 'Legend subforum', - 'IMG_SUBFORUM_UNREAD' => 'Legend subforum new posts', - - 'IMG_TOPIC_MOVED' => 'Topic moved', - - 'IMG_TOPIC_READ' => 'Topic', - 'IMG_TOPIC_READ_MINE' => 'Topic posted to', - 'IMG_TOPIC_READ_HOT' => 'Topic popular', - 'IMG_TOPIC_READ_HOT_MINE' => 'Topic popular posted to', - 'IMG_TOPIC_READ_LOCKED' => 'Topic locked', - 'IMG_TOPIC_READ_LOCKED_MINE' => 'Topic locked posted to', - - 'IMG_TOPIC_UNREAD' => 'Topic new posts', - 'IMG_TOPIC_UNREAD_MINE' => 'Topic posted to new', - 'IMG_TOPIC_UNREAD_HOT' => 'Topic popular new posts', - 'IMG_TOPIC_UNREAD_HOT_MINE' => 'Topic popular posted to new', - 'IMG_TOPIC_UNREAD_LOCKED' => 'Topic locked new', - 'IMG_TOPIC_UNREAD_LOCKED_MINE' => 'Topic locked posted to new', - - 'IMG_STICKY_READ' => 'Sticky topic', - 'IMG_STICKY_READ_MINE' => 'Sticky topic posted to', - 'IMG_STICKY_READ_LOCKED' => 'Sticky topic locked', - 'IMG_STICKY_READ_LOCKED_MINE' => 'Sticky topic locked posted to', - 'IMG_STICKY_UNREAD' => 'Sticky topic new posts', - 'IMG_STICKY_UNREAD_MINE' => 'Sticky topic posted to new', - 'IMG_STICKY_UNREAD_LOCKED' => 'Sticky topic locked new posts', - 'IMG_STICKY_UNREAD_LOCKED_MINE' => 'Sticky topic locked posted to new', - - 'IMG_ANNOUNCE_READ' => 'Announcement', - 'IMG_ANNOUNCE_READ_MINE' => 'Announcement posted to', - 'IMG_ANNOUNCE_READ_LOCKED' => 'Announcement locked', - 'IMG_ANNOUNCE_READ_LOCKED_MINE' => 'Announcement locked posted to', - 'IMG_ANNOUNCE_UNREAD' => 'Announcement new posts', - 'IMG_ANNOUNCE_UNREAD_MINE' => 'Announcement posted to new', - 'IMG_ANNOUNCE_UNREAD_LOCKED' => 'Announcement locked new posts', - 'IMG_ANNOUNCE_UNREAD_LOCKED_MINE' => 'Announcement locked posted to new', - - 'IMG_GLOBAL_READ' => 'Global', - 'IMG_GLOBAL_READ_MINE' => 'Global posted to', - 'IMG_GLOBAL_READ_LOCKED' => 'Global locked', - 'IMG_GLOBAL_READ_LOCKED_MINE' => 'Global locked posted to', - 'IMG_GLOBAL_UNREAD' => 'Global new posts', - 'IMG_GLOBAL_UNREAD_MINE' => 'Global posted to new', - 'IMG_GLOBAL_UNREAD_LOCKED' => 'Global locked new posts', - 'IMG_GLOBAL_UNREAD_LOCKED_MINE' => 'Global locked posted to new', - - 'IMG_PM_READ' => 'Read private message', - 'IMG_PM_UNREAD' => 'Unread private message', - - 'IMG_ICON_BACK_TOP' => 'Top', - - 'IMG_ICON_CONTACT_AIM' => 'AIM', - 'IMG_ICON_CONTACT_EMAIL' => 'Send e-mail', - 'IMG_ICON_CONTACT_ICQ' => 'ICQ', - 'IMG_ICON_CONTACT_JABBER' => 'Jabber', - 'IMG_ICON_CONTACT_MSNM' => 'MSNM', - 'IMG_ICON_CONTACT_PM' => 'Send message', - 'IMG_ICON_CONTACT_YAHOO' => 'YIM', - 'IMG_ICON_CONTACT_WWW' => 'Website', - - 'IMG_ICON_POST_DELETE' => 'Delete post', - 'IMG_ICON_POST_EDIT' => 'Edit post', - 'IMG_ICON_POST_INFO' => 'Show post details', - 'IMG_ICON_POST_QUOTE' => 'Quote post', - 'IMG_ICON_POST_REPORT' => 'Report post', - 'IMG_ICON_POST_TARGET' => 'Minipost', - 'IMG_ICON_POST_TARGET_UNREAD' => 'New minipost', - - - 'IMG_ICON_TOPIC_ATTACH' => 'Attachment', - 'IMG_ICON_TOPIC_LATEST' => 'Last post', - 'IMG_ICON_TOPIC_NEWEST' => 'Last unread post', - 'IMG_ICON_TOPIC_REPORTED' => 'Post reported', - 'IMG_ICON_TOPIC_UNAPPROVED' => 'Post unapproved', - - 'IMG_ICON_USER_ONLINE' => 'User online', - 'IMG_ICON_USER_OFFLINE' => 'User offline', - 'IMG_ICON_USER_PROFILE' => 'Show profile', - 'IMG_ICON_USER_SEARCH' => 'Search posts', - 'IMG_ICON_USER_WARN' => 'Warn user', - - 'IMG_BUTTON_PM_FORWARD' => 'Forward private message', - 'IMG_BUTTON_PM_NEW' => 'New private message', - 'IMG_BUTTON_PM_REPLY' => 'Reply private message', - 'IMG_BUTTON_TOPIC_LOCKED' => 'Topic locked', - 'IMG_BUTTON_TOPIC_NEW' => 'New topic', - 'IMG_BUTTON_TOPIC_REPLY' => 'Reply topic', - - 'IMG_USER_ICON1' => 'User defined image 1', - 'IMG_USER_ICON2' => 'User defined image 2', - 'IMG_USER_ICON3' => 'User defined image 3', - 'IMG_USER_ICON4' => 'User defined image 4', - 'IMG_USER_ICON5' => 'User defined image 5', - 'IMG_USER_ICON6' => 'User defined image 6', - 'IMG_USER_ICON7' => 'User defined image 7', - 'IMG_USER_ICON8' => 'User defined image 8', - 'IMG_USER_ICON9' => 'User defined image 9', - 'IMG_USER_ICON10' => 'User defined image 10', - - 'INCLUDE_DIMENSIONS' => 'Include dimensions', - 'INCLUDE_IMAGESET' => 'Include imageset', - 'INCLUDE_TEMPLATE' => 'Include template', - 'INCLUDE_THEME' => 'Include theme', - 'INSTALL_IMAGESET' => 'Install imageset', - 'INSTALL_IMAGESET_EXPLAIN' => 'Here you can install your selected imageset. You can edit certain details if you wish or use the installation defaults.', - 'INSTALL_STYLE' => 'Install style', - 'INSTALL_STYLE_EXPLAIN' => 'Here you can install a new style and if appropriate the corresponding style elements. If you already have the relevant style elements installed they will not be overwritten. Some styles require existing style elements to already be installed. If you try installing such a style and do not have the required elements you will be notified.', - 'INSTALL_TEMPLATE' => 'Install Template', - 'INSTALL_TEMPLATE_EXPLAIN' => 'Here you can install a new template set. Depending on your server configuration you may have a number of options here.', - 'INSTALL_THEME' => 'Install theme', - 'INSTALL_THEME_EXPLAIN' => 'Here you can install your selected theme. You can edit certain details if you wish or use the installation defaults.', - 'INSTALLED_IMAGESET' => 'Installed imagesets', - 'INSTALLED_STYLE' => 'Installed styles', - 'INSTALLED_TEMPLATE' => 'Installed templates', - 'INSTALLED_THEME' => 'Installed themes', - - 'LINE_SPACING' => 'Line spacing', - 'LOCALISED_IMAGES' => 'Localised', - - 'NO_CLASS' => 'Cannot find class in stylesheet.', - 'NO_IMAGESET' => 'Cannot find imageset on filesystem.', - 'NO_IMAGE' => 'No image', - 'NO_IMAGE_ERROR' => 'Cannot find image on filesystem.', - 'NO_STYLE' => 'Cannot find style on filesystem.', - 'NO_TEMPLATE' => 'Cannot find template on filesystem.', - 'NO_THEME' => 'Cannot find theme on filesystem.', - 'NO_UNINSTALLED_IMAGESET' => 'No uninstalled imagesets detected.', - 'NO_UNINSTALLED_STYLE' => 'No uninstalled styles detected.', - 'NO_UNINSTALLED_TEMPLATE' => 'No uninstalled templates detected.', - 'NO_UNINSTALLED_THEME' => 'No uninstalled themes detected.', - 'NO_UNIT' => 'None', - - 'ONLY_IMAGESET' => 'This is the only remaining imageset, you cannot delete it.', - 'ONLY_STYLE' => 'This is the only remaining style, you cannot delete it.', - 'ONLY_TEMPLATE' => 'This is the only remaining template set, you cannot delete it.', - 'ONLY_THEME' => 'This is the only remaining theme, you cannot delete it.', - 'OPTIONAL_BASIS' => 'Optional basis', - - 'REFRESH' => 'Refresh', - 'REPEAT_NO' => 'None', - 'REPEAT_X' => 'Only horizontally', - 'REPEAT_Y' => 'Only vertically', - 'REPEAT_ALL' => 'Both directions', - 'REPLACE_IMAGESET' => 'Replace imageset with', - 'REPLACE_IMAGESET_EXPLAIN' => 'This imageset will replace the one you are deleting in any styles that use it.', - 'REPLACE_STYLE' => 'Replace style with', - 'REPLACE_STYLE_EXPLAIN' => 'This style will replace the one being deleted for members that use it.', - 'REPLACE_TEMPLATE' => 'Replace template with', - 'REPLACE_TEMPLATE_EXPLAIN' => 'This template set will replace the one you are deleting in any styles that use it.', - 'REPLACE_THEME' => 'Replace theme with', - 'REPLACE_THEME_EXPLAIN' => 'This theme will replace the one you are deleting in any styles that use it.', - 'REQUIRES_IMAGESET' => 'This style requires the %s imageset to be installed.', - 'REQUIRES_TEMPLATE' => 'This style requires the %s template set to be installed.', - 'REQUIRES_THEME' => 'This style requires the %s theme to be installed.', - - 'SELECT_IMAGE' => 'Select image', - 'SELECT_TEMPLATE' => 'Select template file', - 'SELECT_THEME' => 'Select theme file', - 'SELECTED_IMAGE' => 'Selected image', - 'SELECTED_IMAGESET' => 'Selected imageset', - 'SELECTED_TEMPLATE' => 'Selected template', - 'SELECTED_TEMPLATE_FILE' => 'Selected template file', - 'SELECTED_THEME' => 'Selected theme', - 'SELECTED_THEME_FILE' => 'Selected theme file', - 'STORE_DATABASE' => 'Database', - 'STORE_FILESYSTEM' => 'Filesystem', - 'STYLE_ACTIVATE' => 'Activate', - 'STYLE_ACTIVE' => 'Active', - 'STYLE_ADDED' => 'Style added successfully.', - 'STYLE_DEACTIVATE' => 'Deactivate', - 'STYLE_DEFAULT' => 'Make default style', - 'STYLE_DELETED' => 'Style deleted successfully.', - 'STYLE_DETAILS_UPDATED' => 'Style edited successfully.', - 'STYLE_ERR_ARCHIVE' => 'Please select an archive method.', - 'STYLE_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters.', - 'STYLE_ERR_MORE_ELEMENTS' => 'You must select at least one style element.', - 'STYLE_ERR_NAME_CHARS' => 'The style name can only contain alphanumeric characters, -, +, _ and space.', - 'STYLE_ERR_NAME_EXIST' => 'A style with that name already exists.', - 'STYLE_ERR_NAME_LONG' => 'The style name can be no longer than 30 characters.', - 'STYLE_ERR_NO_IDS' => 'You must select a template, theme and imageset for this style.', - 'STYLE_ERR_NOT_STYLE' => 'The imported or uploaded file did not contain a valid style archive.', - 'STYLE_ERR_STYLE_NAME' => 'You must supply a name for this style.', - 'STYLE_EXPORT' => 'Export style', - 'STYLE_EXPORT_EXPLAIN' => 'Here you can export a style in the form of an archive. A style does not need to contain all elements but it must contain at least one. For example if you have created a new theme and imageset for a commonly used template you could simply export the theme and imageset and omit the template. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', - 'STYLE_EXPORTED' => 'Style exported successfully and stored in %s.', - 'STYLE_IMAGESET' => 'Imageset', - 'STYLE_NAME' => 'Style name', - 'STYLE_TEMPLATE' => 'Template', - 'STYLE_THEME' => 'Theme', - 'STYLE_USED_BY' => 'Used by (including robots)', - - 'TEMPLATE_ADDED' => 'Template set added and stored on filesystem.', - 'TEMPLATE_ADDED_DB' => 'Template set added and stored in database.', - 'TEMPLATE_CACHE' => 'Template cache', - 'TEMPLATE_CACHE_EXPLAIN' => 'By default phpBB caches the compiled version of its templates. This decreases the load on the server each time a page is viewed and thus may reduce the page generation time. Here you can view the cache status of each file and delete individual files or the entire cache.', - 'TEMPLATE_CACHE_CLEARED' => 'Template cache cleared successfully.', - 'TEMPLATE_CACHE_EMPTY' => 'There are no cached templates.', - 'TEMPLATE_DELETED' => 'Template set deleted successfully.', - 'TEMPLATE_DELETED_FS' => 'Template set removed from database but some files may remain on the filesystem.', - 'TEMPLATE_DETAILS_UPDATED' => 'Template details successfully updated.', - 'TEMPLATE_EDITOR' => 'Raw HTML template editor', - 'TEMPLATE_EDITOR_HEIGHT' => 'Template editor height', - 'TEMPLATE_ERR_ARCHIVE' => 'Please select an archive method.', - 'TEMPLATE_ERR_CACHE_READ' => 'The cache directory used to store cached versions of template files could not be opened.', - 'TEMPLATE_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters.', - 'TEMPLATE_ERR_NAME_CHARS' => 'The template name can only contain alphanumeric characters, -, +, _ and space.', - 'TEMPLATE_ERR_NAME_EXIST' => 'A template set with that name already exists.', - 'TEMPLATE_ERR_NAME_LONG' => 'The template name can be no longer than 30 characters.', - 'TEMPLATE_ERR_NOT_TEMPLATE' => 'The archive you specified does not contain a valid template set.', - 'TEMPLATE_ERR_STYLE_NAME' => 'You must supply a name for this template.', - 'TEMPLATE_EXPORT' => 'Export templates', - 'TEMPLATE_EXPORT_EXPLAIN' => 'Here you can export a template set in the form of an archive. This archive will contain all the files necessary to install the templates on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', - 'TEMPLATE_EXPORTED' => 'Templates exported successfully and stored in %s.', - 'TEMPLATE_FILE' => 'Template file', - 'TEMPLATE_FILE_UPDATED' => 'Template file updated successfully.', - 'TEMPLATE_LOCATION' => 'Store templates in', - 'TEMPLATE_LOCATION_EXPLAIN' => 'Images are always stored on the filesystem.', - 'TEMPLATE_NAME' => 'Template name', - 'TEMPLATE_REFRESHED' => 'Template refreshed successfully.', - - 'THEME_ADDED' => 'New theme added on filesystem.', - 'THEME_ADDED_DB' => 'New theme added to database.', - 'THEME_CLASS_ADDED' => 'Custom class added successfully.', - 'THEME_DELETED' => 'Theme deleted successfully.', - 'THEME_DELETED_FS' => 'Theme removed from database but files remain on the filesystem.', - 'THEME_DETAILS_UPDATED' => 'Theme details successfully updated.', - 'THEME_EDITOR' => 'Theme editor', - 'THEME_EDITOR_HEIGHT' => 'Theme editor height', - 'THEME_ERR_ARCHIVE' => 'Please select an archive method.', - 'THEME_ERR_CLASS_CHARS' => 'Only alphanumeric characters plus ., :, -, _ and # are valid in class names.', - 'THEME_ERR_COPY_LONG' => 'The copyright can be no longer than 60 characters.', - 'THEME_ERR_NAME_CHARS' => 'The theme name can only contain alphanumeric characters, -, +, _ and space.', - 'THEME_ERR_NAME_EXIST' => 'A theme with that name already exists.', - 'THEME_ERR_NAME_LONG' => 'The theme name can be no longer than 30 characters.', - 'THEME_ERR_NOT_THEME' => 'The archive you specified does not contain a valid theme.', - 'THEME_ERR_REFRESH_FS' => 'This theme is stored on the filesystem so there is no need to refresh it.', - 'THEME_ERR_STYLE_NAME' => 'You must supply a name for this theme.', - 'THEME_FILE' => 'Theme file', - 'THEME_EXPORT' => 'Export Theme', - 'THEME_EXPORT_EXPLAIN' => 'Here you can export a theme in the form of an archive. This archive will contain all the data necessary to install the theme on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', - 'THEME_EXPORTED' => 'Theme exported successfully and stored in %s.', - 'THEME_LOCATION' => 'Store stylesheet in', - 'THEME_LOCATION_EXPLAIN' => 'Images are always stored on the filesystem.', - 'THEME_NAME' => 'Theme name', - 'THEME_REFRESHED' => 'Theme refreshed successfully.', - 'THEME_UPDATED' => 'Theme updated successfully.', - - 'UNDERLINE' => 'Underline', - 'UNINSTALLED_IMAGESET' => 'Uninstalled imagesets', - 'UNINSTALLED_STYLE' => 'Uninstalled styles', - 'UNINSTALLED_TEMPLATE' => 'Uninstalled templates', - 'UNINSTALLED_THEME' => 'Uninstalled themes', - 'UNSET' => 'Undefined', - -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php deleted file mode 100644 index 0217238a0d..0000000000 --- a/phpBB/language/en/acp/users.php +++ /dev/null @@ -1,132 +0,0 @@ - 'Signature preview', - 'AT_LEAST_ONE_FOUNDER' => 'You are not able to change this founder to a normal user. There needs to be at least one founder enabled for this board. If you want to change this users founder status, promote another user to be a founder first.', - - 'BAN_ALREADY_ENTERED' => 'The ban had been previously entered successfully. The ban list has not been updated.', - 'BAN_SUCCESSFUL' => 'Ban entered successfully.', - - 'CANNOT_BAN_FOUNDER' => 'You are not allowed to ban founder accounts.', - 'CANNOT_BAN_YOURSELF' => 'You are not allowed to ban yourself.', - 'CANNOT_DEACTIVATE_BOT' => 'You are not allowed to deactivate bot accounts. Please deactivate the bot within the bots page instead.', - 'CANNOT_DEACTIVATE_FOUNDER' => 'You are not allowed to deactivate founder accounts.', - 'CANNOT_DEACTIVATE_YOURSELF' => 'You are not allowed to deactivate your own account.', - 'CANNOT_FORCE_REACT_BOT' => 'You are not allowed to force reactivation on bot accounts. Please deactivate the bot within the bots page instead.', - 'CANNOT_FORCE_REACT_FOUNDER' => 'You are not allowed to force reactivation on founder accounts.', - 'CANNOT_FORCE_REACT_YOURSELF' => 'You are not allowed to force reactivation of your own account.', - 'CANNOT_REMOVE_ANONYMOUS' => 'You are not able to remove the guest user account.', - 'CANNOT_REMOVE_YOURSELF' => 'You are not allowed to remove your own user account.', - 'CANNOT_SET_FOUNDER_IGNORED' => 'You are not able to promote ignored users to be founders.', - 'CANNOT_SET_FOUNDER_INACTIVE' => 'You need to activate users before you promote them to founders, only activated users are able to be promoted.', - 'CONFIRM_EMAIL_EXPLAIN' => 'You only need to specify this if you are changing the users e-mail address.', - - 'DELETE_POSTS' => 'Delete posts', - 'DELETE_USER' => 'Delete user', - 'DELETE_USER_EXPLAIN' => 'Please note that deleting a user is final, they cannot be recovered.', - - 'FORCE_REACTIVATION_SUCCESS' => 'Successfully forced reactivation.', - 'FOUNDER' => 'Founder', - 'FOUNDER_EXPLAIN' => 'Founders have all administrative permissions and can never be banned, deleted or altered by non-founder members.', - - 'GROUP_APPROVE' => 'Approve member', - 'GROUP_DEFAULT' => 'Make group default for member', - 'GROUP_DELETE' => 'Remove member from group', - 'GROUP_DEMOTE' => 'Demote group leader', - 'GROUP_PROMOTE' => 'Promote to group leader', - - 'IP_WHOIS_FOR' => 'IP whois for %s', - - 'LAST_ACTIVE' => 'Last active', - - 'MOVE_POSTS_EXPLAIN' => 'Please select the forum to which you wish to move all the posts this user has made.', - - 'NO_SPECIAL_RANK' => 'No special rank assigned', - 'NOT_MANAGE_FOUNDER' => 'You tried to manage a user with founder status. Only founders are allowed to manage other founders.', - - 'QUICK_TOOLS' => 'Quick tools', - - 'REGISTERED' => 'Registered', - 'REGISTERED_IP' => 'Registered from IP', - 'RETAIN_POSTS' => 'Retain posts', - - 'SELECT_FORM' => 'Select form', - 'SELECT_USER' => 'Select user', - - 'USER_ADMIN' => 'User administration', - 'USER_ADMIN_ACTIVATE' => 'Activate account', - 'USER_ADMIN_ACTIVATED' => 'User activated successfully.', - 'USER_ADMIN_AVATAR_REMOVED' => 'Successfully removed avatar from user account.', - 'USER_ADMIN_BAN_EMAIL' => 'Ban by e-mail', - 'USER_ADMIN_BAN_EMAIL_REASON' => 'E-mail address banned via user management', - 'USER_ADMIN_BAN_IP' => 'Ban by IP', - 'USER_ADMIN_BAN_IP_REASON' => 'IP banned via user management', - 'USER_ADMIN_BAN_NAME_REASON' => 'Username banned via user management', - 'USER_ADMIN_BAN_USER' => 'Ban by username', - 'USER_ADMIN_DEACTIVATE' => 'Deactivate account', - 'USER_ADMIN_DEACTIVED' => 'User deactivated successfully.', - 'USER_ADMIN_DEL_ATTACH' => 'Delete all attachments', - 'USER_ADMIN_DEL_AVATAR' => 'Delete avatar', - 'USER_ADMIN_DEL_POSTS' => 'Delete all posts', - 'USER_ADMIN_DEL_SIG' => 'Delete signature', - 'USER_ADMIN_EXPLAIN' => 'Here you can change your users information and certain specific options.', - 'USER_ADMIN_FORCE' => 'Force reactivation', - 'USER_ADMIN_MOVE_POSTS' => 'Move all posts', - 'USER_ADMIN_SIG_REMOVED' => 'Successfully removed signature from user account.', - 'USER_ATTACHMENTS_REMOVED' => 'Successfully removed all attachments made by this user.', - 'USER_AVATAR_UPDATED' => 'Successfully updated user avatars details.', - 'USER_CUSTOM_PROFILE_FIELDS' => 'Custom profile fields', - 'USER_DELETED' => 'User deleted successfully.', - 'USER_GROUP_ADD' => 'Add user to group', - 'USER_GROUP_NORMAL' => 'User defined groups user is a member of', - 'USER_GROUP_PENDING' => 'Groups user is in pending mode', - 'USER_GROUP_SPECIAL' => 'Pre-defined groups user is a member of', - 'USER_NO_ATTACHMENTS' => 'There are no attached files to display.', - 'USER_OVERVIEW_UPDATED' => 'User details updated.', - 'USER_POSTS_DELETED' => 'Successfully removed all posts made by this user.', - 'USER_POSTS_MOVED' => 'Successfully moved users posts to target forum.', - 'USER_PREFS_UPDATED' => 'User preferences updated.', - 'USER_PROFILE' => 'User profile', - 'USER_PROFILE_UPDATED' => 'User profile updated.', - 'USER_RANK' => 'User rank', - 'USER_RANK_UPDATED' => 'User rank updated.', - 'USER_SIG_UPDATED' => 'User signature successfully updated.', - 'USER_TOOLS' => 'Basic tools', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php deleted file mode 100644 index 8e739206c5..0000000000 --- a/phpBB/language/en/common.php +++ /dev/null @@ -1,825 +0,0 @@ - '', - 'DIRECTION' => 'ltr', - 'DATE_FORMAT' => '|d M Y|', // 01 Jan 2007 (with Relative days enabled) - 'USER_LANG' => 'en-gb', - - '1_DAY' => '1 day', - '1_MONTH' => '1 month', - '1_YEAR' => '1 year', - '2_WEEKS' => '2 weeks', - '3_MONTHS' => '3 months', - '6_MONTHS' => '6 months', - '7_DAYS' => '7 days', - - 'ACCOUNT_ALREADY_ACTIVATED' => 'Your account has already been activated.', - 'ACCOUNT_DEACTIVATED' => 'Your account has been manually deactivated and is only able to be reactivated by an administrator.', - 'ACCOUNT_NOT_ACTIVATED' => 'Your account has not been activated yet.', - 'ACP' => 'Administration Control Panel', - 'ACTIVE' => 'active', - 'ACTIVE_ERROR' => 'The specified username is currently inactive. If you have problems activating your account, please contact a board administrator.', - 'ADMINISTRATOR' => 'Administrator', - 'ADMINISTRATORS' => 'Administrators', - 'AGE' => 'Age', - 'AIM' => 'AIM', - 'ALLOWED' => 'Allowed', - 'ALL_FILES' => 'All files', - 'ALL_FORUMS' => 'All forums', - 'ALL_MESSAGES' => 'All messages', - 'ALL_POSTS' => 'All posts', - 'ALL_TIMES' => 'All times are %1$s %2$s', - 'ALL_TOPICS' => 'All Topics', - 'AND' => 'And', - 'ARE_WATCHING_FORUM' => 'You have subscribed to be notified of new posts in this forum.', - 'ARE_WATCHING_TOPIC' => 'You have subscribed to be notified of new posts in this topic.', - 'ASCENDING' => 'Ascending', - 'ATTACHMENTS' => 'Attachments', - 'ATTACHED_IMAGE_NOT_IMAGE' => 'The image file you tried to attach is invalid.', - 'AUTHOR' => 'Author', - 'AUTH_NO_PROFILE_CREATED' => 'The creation of a user profile was unsuccessful.', - 'AVATAR_DISALLOWED_EXTENSION' => 'This file cannot be displayed because the extension %s is not allowed.', - 'AVATAR_EMPTY_REMOTE_DATA' => 'The specified avatar could not be uploaded because the remote data appears to be invalid or corrupted.', - 'AVATAR_EMPTY_FILEUPLOAD' => 'The uploaded avatar file is empty.', - 'AVATAR_INVALID_FILENAME' => '%s is an invalid filename.', - 'AVATAR_NOT_UPLOADED' => 'Avatar could not be uploaded.', - 'AVATAR_NO_SIZE' => 'The width or height of the linked avatar could not be determined. Please enter them manually.', - 'AVATAR_PARTIAL_UPLOAD' => 'The specified file was only partially uploaded.', - 'AVATAR_PHP_SIZE_NA' => 'The avatar’s filesize is too large.
    The maximum allowed filesize set in php.ini could not be determined.', - 'AVATAR_PHP_SIZE_OVERRUN' => 'The avatar’s filesize is too large. The maximum allowed upload size is %d MB.
    Please note this is set in php.ini and cannot be overridden.', - 'AVATAR_URL_INVALID' => 'The URL you specified is invalid.', - 'AVATAR_URL_NOT_FOUND' => 'The file specified could not be found.', - 'AVATAR_WRONG_FILESIZE' => 'The avatar’s filesize must be between 0 and %1d %2s.', - 'AVATAR_WRONG_SIZE' => 'The submitted avatar is %5$d pixels wide and %6$d pixels high. Avatars must be at least %1$d pixels wide and %2$d pixels high, but no larger than %3$d pixels wide and %4$d pixels high.', - - 'BACK_TO_TOP' => 'Top', - 'BACK_TO_PREV' => 'Back to previous page', - 'BAN_TRIGGERED_BY_EMAIL'=> 'A ban has been issued on your e-mail address.', - 'BAN_TRIGGERED_BY_IP' => 'A ban has been issued on your IP address.', - 'BAN_TRIGGERED_BY_USER' => 'A ban has been issued on your username.', - 'BBCODE_GUIDE' => 'BBCode guide', - 'BCC' => 'BCC', - 'BIRTHDAYS' => 'Birthdays', - 'BOARD_BAN_PERM' => 'You have been permanently banned from this board.

    Please contact the %2$sBoard Administrator%3$s for more information.', - 'BOARD_BAN_REASON' => 'Reason given for ban: %s', - 'BOARD_BAN_TIME' => 'You have been banned from this board until %1$s.

    Please contact the %2$sBoard Administrator%3$s for more information.', - 'BOARD_DISABLE' => 'Sorry but this board is currently unavailable.', - 'BOARD_DISABLED' => 'This board is currently disabled.', - 'BOARD_UNAVAILABLE' => 'Sorry but the board is temporarily unavailable, please try again in a few minutes.', - 'BROWSING_FORUM_GUEST' => 'Users browsing this forum: %1$s and %2$d guest', - 'BROWSING_FORUM_GUESTS' => 'Users browsing this forum: %1$s and %2$d guests', - 'BYTES' => 'Bytes', - - 'CANCEL' => 'Cancel', - 'CHANGE' => 'Change', - 'CHANGE_FONT_SIZE' => 'Change font size', - 'CHANGING_PREFERENCES' => 'Changing board preferences', - 'CHANGING_PROFILE' => 'Changing profile settings', - 'CLICK_VIEW_PRIVMSG' => '%sGo to your inbox%s', - 'COLLAPSE_VIEW' => 'Collapse view', - 'CLOSE_WINDOW' => 'Close window', - 'COLOUR_SWATCH' => 'Colour swatch', - 'COMMA_SEPARATOR' => ', ', // Used in pagination of ACP & prosilver, use localised comma if appropriate, eg: Ideographic or Arabic - 'CONFIRM' => 'Confirm', - 'CONFIRM_CODE' => 'Confirmation code', - 'CONFIRM_CODE_EXPLAIN' => 'Enter the code exactly as it appears. All letters are case insensitive, there is no zero.', - 'CONFIRM_CODE_WRONG' => 'The confirmation code you entered was incorrect.', - 'CONFIRM_OPERATION' => 'Are you sure you wish to carry out this operation?', - 'CONGRATULATIONS' => 'Congratulations to', - 'CONNECTION_FAILED' => 'Connection failed.', - 'CONNECTION_SUCCESS' => 'Connection was successful!', - 'COOKIES_DELETED' => 'All board cookies successfully deleted.', - 'CURRENT_TIME' => 'It is currently %s', - - 'DAY' => 'Day', - 'DAYS' => 'Days', - 'DELETE' => 'Delete', - 'DELETE_ALL' => 'Delete all', - 'DELETE_COOKIES' => 'Delete all board cookies', - 'DELETE_MARKED' => 'Delete marked', - 'DELETE_POST' => 'Delete post', - 'DELIMITER' => 'Delimiter', - 'DESCENDING' => 'Descending', - 'DISABLED' => 'Disabled', - 'DISPLAY' => 'Display', - 'DISPLAY_GUESTS' => 'Display guests', - 'DISPLAY_MESSAGES' => 'Display messages from previous', - 'DISPLAY_POSTS' => 'Display posts from previous', - 'DISPLAY_TOPICS' => 'Display topics from previous', - 'DOWNLOADED' => 'Downloaded', - 'DOWNLOADING_FILE' => 'Downloading file', - 'DOWNLOAD_COUNT' => 'Downloaded %d time', - 'DOWNLOAD_COUNTS' => 'Downloaded %d times', - 'DOWNLOAD_COUNT_NONE' => 'Not downloaded yet', - 'VIEWED_COUNT' => 'Viewed %d time', - 'VIEWED_COUNTS' => 'Viewed %d times', - 'VIEWED_COUNT_NONE' => 'Not viewed yet', - - 'EDIT_POST' => 'Edit post', - 'EMAIL' => 'E-mail', - 'EMAIL_ADDRESS' => 'E-mail address', - 'EMAIL_SMTP_ERROR_RESPONSE' => 'Ran into problems sending e-mail at Line %1$s. Response: %2$s.', - 'EMPTY_SUBJECT' => 'You must specify a subject when posting a new topic.', - 'EMPTY_MESSAGE_SUBJECT' => 'You must specify a subject when composing a new message.', - 'ENABLED' => 'Enabled', - 'ENCLOSURE' => 'Enclosure', - 'ERR_CHANGING_DIRECTORY' => 'Unable to change directory.', - 'ERR_CONNECTING_SERVER' => 'Error connecting to the server.', - 'ERR_JAB_AUTH' => 'Could not authorise on Jabber server.', - 'ERR_JAB_CONNECT' => 'Could not connect to Jabber server.', - 'ERR_UNABLE_TO_LOGIN' => 'The specified username or password is incorrect.', - 'ERR_WRONG_PATH_TO_PHPBB' => 'The phpBB path specified appears to be invalid.', - 'EXPAND_VIEW' => 'Expand view', - 'EXTENSION' => 'Extension', - 'EXTENSION_DISABLED_AFTER_POSTING' => 'The extension %s has been deactivated and can no longer be displayed.', - - 'FAQ' => 'FAQ', - 'FAQ_EXPLAIN' => 'Frequently Asked Questions', - 'FILENAME' => 'Filename', - 'FILESIZE' => 'File size', - 'FILEDATE' => 'File date', - 'FILE_COMMENT' => 'File comment', - 'FILE_NOT_FOUND' => 'The requested file could not be found.', - 'FIND_USERNAME' => 'Find a member', - 'FOLDER' => 'Folder', - 'FORGOT_PASS' => 'I forgot my password', - 'FORM_INVALID' => 'The submitted form was invalid. Try submitting again.', - 'FORUM' => 'Forum', - 'FORUMS' => 'Forums', - 'FORUMS_MARKED' => 'All forums have been marked read.', - 'FORUM_CAT' => 'Forum category', - 'FORUM_INDEX' => 'Board index', - 'FORUM_LINK' => 'Forum link', - 'FORUM_LOCATION' => 'Forum location', - 'FORUM_LOCKED' => 'Forum locked', - 'FORUM_RULES' => 'Forum rules', - 'FORUM_RULES_LINK' => 'Please click here to view the forum rules', - 'FROM' => 'from', - 'FSOCK_DISABLED' => 'The operation could not be completed because the fsockopen function has been disabled or the server being queried could not be found.', - - 'FTP_FSOCK_HOST' => 'FTP host', - 'FTP_FSOCK_HOST_EXPLAIN' => 'FTP server used to connect your site.', - 'FTP_FSOCK_PASSWORD' => 'FTP password', - 'FTP_FSOCK_PASSWORD_EXPLAIN' => 'Password for your FTP username.', - 'FTP_FSOCK_PORT' => 'FTP port', - 'FTP_FSOCK_PORT_EXPLAIN' => 'Port used to connect to your server.', - 'FTP_FSOCK_ROOT_PATH' => 'Path to phpBB', - 'FTP_FSOCK_ROOT_PATH_EXPLAIN' => 'Path from the root to your phpBB board.', - 'FTP_FSOCK_TIMEOUT' => 'FTP timeout', - 'FTP_FSOCK_TIMEOUT_EXPLAIN' => 'The amount of time, in seconds, that the system will wait for a reply from your server.', - 'FTP_FSOCK_USERNAME' => 'FTP username', - 'FTP_FSOCK_USERNAME_EXPLAIN' => 'Username used to connect to your server.', - - 'FTP_HOST' => 'FTP host', - 'FTP_HOST_EXPLAIN' => 'FTP server used to connect your site.', - 'FTP_PASSWORD' => 'FTP password', - 'FTP_PASSWORD_EXPLAIN' => 'Password for your FTP username.', - 'FTP_PORT' => 'FTP port', - 'FTP_PORT_EXPLAIN' => 'Port used to connect to your server.', - 'FTP_ROOT_PATH' => 'Path to phpBB', - 'FTP_ROOT_PATH_EXPLAIN' => 'Path from the root to your phpBB board.', - 'FTP_TIMEOUT' => 'FTP timeout', - 'FTP_TIMEOUT_EXPLAIN' => 'The amount of time, in seconds, that the system will wait for a reply from your server.', - 'FTP_USERNAME' => 'FTP username', - 'FTP_USERNAME_EXPLAIN' => 'Username used to connect to your server.', - - 'GENERAL_ERROR' => 'General Error', - 'GO' => 'Go', - 'GOTO_PAGE' => 'Go to page', - 'GROUP' => 'Group', - 'GROUPS' => 'Groups', - 'GROUP_ERR_TYPE' => 'Inappropriate group type specified.', - 'GROUP_ERR_USERNAME' => 'No group name specified.', - 'GROUP_ERR_USER_LONG' => 'Group names cannot exceed 60 characters. The specified group name is too long.', - 'GUEST' => 'Guest', - 'GUEST_USERS_ONLINE' => 'There are %d guest users online', - 'GUEST_USERS_TOTAL' => '%d guests', - 'GUEST_USERS_ZERO_ONLINE' => 'There are 0 guest users online', - 'GUEST_USERS_ZERO_TOTAL' => '0 guests', - 'GUEST_USER_ONLINE' => 'There is %d guest user online', - 'GUEST_USER_TOTAL' => '%d guest', - 'G_ADMINISTRATORS' => 'Administrators', - 'G_BOTS' => 'Bots', - 'G_GUESTS' => 'Guests', - 'G_REGISTERED' => 'Registered users', - 'G_REGISTERED_COPPA' => 'Registered COPPA users', - 'G_GLOBAL_MODERATORS' => 'Global moderators', - - 'HIDDEN_USERS_ONLINE' => '%d hidden users online', - 'HIDDEN_USERS_TOTAL' => '%d hidden and ', - 'HIDDEN_USERS_ZERO_ONLINE' => '0 hidden users online', - 'HIDDEN_USERS_ZERO_TOTAL' => '0 hidden and ', - 'HIDDEN_USER_ONLINE' => '%d hidden user online', - 'HIDDEN_USER_TOTAL' => '%d hidden and ', - 'HIDE_GUESTS' => 'Hide guests', - 'HIDE_ME' => 'Hide my online status this session', - 'HOURS' => 'Hours', - 'HOME' => 'Home', - - 'ICQ' => 'ICQ', - 'ICQ_STATUS' => 'ICQ status', - 'IF' => 'If', - 'IMAGE' => 'Image', - 'IMAGE_FILETYPE_INVALID' => 'Image file type %d for mimetype %s not supported.', - 'IMAGE_FILETYPE_MISMATCH' => 'Image file type mismatch: expected extension %1$s but extension %2$s given.', - 'IN' => 'in', - 'INDEX' => 'Index page', - 'INFORMATION' => 'Information', - 'INTERESTS' => 'Interests', - 'INVALID_DIGEST_CHALLENGE' => 'Invalid digest challenge.', - 'INVALID_EMAIL_LOG' => '%s possibly an invalid e-mail address?', - 'IP' => 'IP', - 'IP_BLACKLISTED' => 'Your IP %1$s has been blocked because it is blacklisted. For details please see %2$s.', - - 'JABBER' => 'Jabber', - 'JOINED' => 'Joined', - 'JUMP_PAGE' => 'Enter the page number you wish to go to.', - 'JUMP_TO' => 'Jump to', - 'JUMP_TO_PAGE' => 'Click to jump to page…', - - 'KB' => 'KB', - 'KIB' => 'KiB', - - 'LAST_POST' => 'Last post', - 'LAST_UPDATED' => 'Last updated', - 'LAST_VISIT' => 'Last visit', - 'LDAP_NO_LDAP_EXTENSION' => 'LDAP extension not available.', - 'LDAP_NO_SERVER_CONNECTION' => 'Could not connect to LDAP server.', - 'LEGEND' => 'Legend', - 'LOCATION' => 'Location', - 'LOCK_POST' => 'Lock post', - 'LOCK_POST_EXPLAIN' => 'Prevent editing', - 'LOCK_TOPIC' => 'Lock topic', - 'LOGIN' => 'Login', - 'LOGIN_CHECK_PM' => 'Log in to check your private messages.', - 'LOGIN_CONFIRMATION' => 'Confirmation of login', - 'LOGIN_CONFIRM_EXPLAIN' => 'To prevent brute forcing accounts the board requires you to enter a confirmation code after a maximum amount of failed logins. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.', - 'LOGIN_ERROR_ATTEMPTS' => 'You exceeded the maximum allowed number of login attempts. In addition to your username and password you now also have to enter the confirm code from the image you see below.', - 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE' => 'You have not been authenticated by Apache.', - 'LOGIN_ERROR_PASSWORD' => 'You have specified an incorrect password. Please check your password and try again. If you continue to have problems please contact the %sBoard Administrator%s.', - 'LOGIN_ERROR_PASSWORD_CONVERT' => 'It was not possible to convert your password when updating this bulletin board’s software. Please %srequest a new password%s. If you continue to have problems please contact the %sBoard Administrator%s.', - 'LOGIN_ERROR_USERNAME' => 'You have specified an incorrect username. Please check your username and try again. If you continue to have problems please contact the %sBoard Administrator%s.', - 'LOGIN_FORUM' => 'To view or post in this forum you must enter its password.', - 'LOGIN_INFO' => 'In order to login you must be registered. Registering takes only a few moments but gives you increased capabilities. The board administrator may also grant additional permissions to registered users. Before you register please ensure you are familiar with our terms of use and related policies. Please ensure you read any forum rules as you navigate around the board.', - 'LOGIN_VIEWFORUM' => 'The board requires you to be registered and logged in to view this forum.', - 'LOGIN_EXPLAIN_EDIT' => 'In order to edit posts in this forum you have to be registered and logged in.', - 'LOGIN_EXPLAIN_VIEWONLINE' => 'In order to view the online list you have to be registered and logged in.', - 'LOGOUT' => 'Logout', - 'LOGOUT_USER' => 'Logout [ %s ]', - 'LOG_ME_IN' => 'Log me on automatically each visit', - - 'MARK' => 'Mark', - 'MARK_ALL' => 'Mark all', - 'MARK_FORUMS_READ' => 'Mark forums read', - 'MB' => 'MB', - 'MIB' => 'MiB', - 'MCP' => 'Moderator Control Panel', - 'MEMBERLIST' => 'Members', - 'MEMBERLIST_EXPLAIN' => 'View complete list of members', - 'MERGE' => 'Merge', - 'MERGE_POSTS' => 'Merge posts', - 'MERGE_TOPIC' => 'Merge topic', - 'MESSAGE' => 'Message', - 'MESSAGES' => 'Messages', - 'MESSAGE_BODY' => 'Message body', - 'MINUTES' => 'Minutes', - 'MODERATE' => 'Moderate', - 'MODERATOR' => 'Moderator', - 'MODERATORS' => 'Moderators', - 'MONTH' => 'Month', - 'MOVE' => 'Move', - 'MSNM' => 'MSNM/WLM', - - 'NA' => 'N/A', - 'NEWEST_USER' => 'Our newest member %s', - 'NEW_MESSAGE' => 'New message', - 'NEW_MESSAGES' => 'New messages', - 'NEW_PM' => '%d new message', - 'NEW_PMS' => '%d new messages', - 'NEW_POST' => 'New post', - 'NEW_POSTS' => 'New posts', - 'NEXT' => 'Next', // Used in pagination - 'NEXT_STEP' => 'Next', - 'NEVER' => 'Never', - 'NO' => 'No', - 'NOT_ALLOWED_MANAGE_GROUP' => 'You are not allowed to manage this group.', - 'NOT_AUTHORISED' => 'You are not authorised to access this area.', - 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', - 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', - 'NOTIFY_ADMIN' => 'Please notify the board administrator or webmaster.', - 'NOTIFY_ADMIN_EMAIL' => 'Please notify the board administrator or webmaster: %1$s', - 'NO_ACCESS_ATTACHMENT' => 'You are not allowed to access this file.', - 'NO_ACTION' => 'No action specified.', - 'NO_ADMINISTRATORS' => 'No administrators assigned at this board.', - 'NO_AUTH_ADMIN' => 'Access to the Administration Control Panel is not allowed as you do not have administrative permissions.', - 'NO_AUTH_ADMIN_USER_DIFFER' => 'You are not able to re-authenticate as a different user.', - 'NO_AUTH_OPERATION' => 'You do not have the necessary permissions to complete this operation.', - 'NO_CONNECT_TO_SMTP_HOST' => 'Could not connect to smtp host : %1$s : %2$s', - 'NO_BIRTHDAYS' => 'No birthdays today', - 'NO_EMAIL_MESSAGE' => 'E-mail message was blank.', - 'NO_EMAIL_RESPONSE_CODE' => 'Could not get mail server response codes.', - 'NO_EMAIL_SUBJECT' => 'No e-mail subject specified.', - 'NO_FORUM' => 'The forum you selected does not exist.', - 'NO_FORUMS' => 'This board has no forums.', - 'NO_GROUP' => 'The requested usergroup does not exist.', - 'NO_GROUP_MEMBERS' => 'This group currently has no members.', - 'NO_IPS_DEFINED' => 'No IP addresses or hostnames defined', - 'NO_MEMBERS' => 'No members found for this search criterion.', - 'NO_MESSAGES' => 'No messages', - 'NO_MODE' => 'No mode specified.', - 'NO_MODERATORS' => 'No moderators assigned at this board.', - 'NO_NEW_MESSAGES' => 'No new messages', - 'NO_NEW_PM' => '0 new messages', - 'NO_NEW_POSTS' => 'No new posts', - 'NO_ONLINE_USERS' => 'No registered users', - 'NO_POSTS' => 'No posts', - 'NO_POSTS_TIME_FRAME' => 'No posts exist inside this topic for the selected time frame.', - 'NO_SUBJECT' => 'No subject specified', // Used for posts having no subject defined but displayed within management pages. - 'NO_SUCH_SEARCH_MODULE' => 'The specified search backend doesn’t exist.', - 'NO_SUPPORTED_AUTH_METHODS' => 'No supported authentication methods.', - 'NO_TOPIC' => 'The requested topic does not exist.', - 'NO_TOPIC_FORUM' => 'The topic or forum no longer exists.', - 'NO_TOPICS' => 'There are no topics or posts in this forum.', - 'NO_TOPICS_TIME_FRAME' => 'No topics exist inside this forum for the selected time frame.', - 'NO_UNREAD_PM' => '0 unread messages', - 'NO_UPLOAD_FORM_FOUND' => 'Upload initiated but no valid file upload form found.', - 'NO_USER' => 'The requested user does not exist.', - 'NO_USERS' => 'The requested users do not exist.', - 'NO_USER_SPECIFIED' => 'No username was specified.', - - 'OCCUPATION' => 'Occupation', - 'OFFLINE' => 'Offline', - 'ONLINE' => 'Online', - 'ONLINE_BUDDIES' => 'Online friends', - 'ONLINE_USERS_TOTAL' => 'In total there are %d users online :: ', - 'ONLINE_USERS_ZERO_TOTAL' => 'In total there are 0 users online :: ', - 'ONLINE_USER_TOTAL' => 'In total there is %d user online :: ', - 'OPTIONS' => 'Options', - - 'PAGE_OF' => 'Page %1$d of %2$d', - 'PASSWORD' => 'Password', - 'PLAY_QUICKTIME_FILE' => 'Play Quicktime file', - 'PM' => 'PM', - 'POSTING_MESSAGE' => 'Posting message in %s', - 'POSTING_PRIVATE_MESSAGE' => 'Composing private message', - 'POST' => 'Post', - 'POST_ANNOUNCEMENT' => 'Announce', - 'POST_STICKY' => 'Sticky', - 'POSTED' => 'Posted', - 'POSTED_IN_FORUM' => 'in', - 'POSTED_ON_DATE' => 'on', - 'POSTS' => 'Posts', - 'POSTS_UNAPPROVED' => 'At least one post in this topic has not been approved.', - 'POST_BY_AUTHOR' => 'by', - 'POST_BY_FOE' => 'This post was made by %1$s who is currently on your ignore list. %2$sDisplay this post%3$s.', - 'POST_DAY' => '%.2f posts per day', - 'POST_DETAILS' => 'Post details', - 'POST_NEW_TOPIC' => 'Post new topic', - 'POST_PCT' => '%.2f%% of all posts', - 'POST_PCT_ACTIVE' => '%.2f%% of user’s posts', - 'POST_PCT_ACTIVE_OWN' => '%.2f%% of your posts', - 'POST_REPLY' => 'Post a reply', - 'POST_REPORTED' => 'Click to view report', - 'POST_SUBJECT' => 'Post subject', - 'POST_TIME' => 'Post time', - 'POST_TOPIC' => 'Post a new topic', - 'POST_UNAPPROVED' => 'This post is waiting for approval', - 'PREVIEW' => 'Preview', - 'PREVIOUS' => 'Previous', // Used in pagination - 'PREVIOUS_STEP' => 'Previous', - 'PRIVACY' => 'Privacy policy', - 'PRIVATE_MESSAGE' => 'Private message', - 'PRIVATE_MESSAGES' => 'Private messages', - 'PRIVATE_MESSAGING' => 'Private messaging', - 'PROFILE' => 'User Control Panel', - - 'READING_FORUM' => 'Viewing topics in %s', - 'READING_GLOBAL_ANNOUNCE' => 'Reading global announcement', - 'READING_LINK' => 'Following forum link %s', - 'READING_TOPIC' => 'Reading topic in %s', - 'READ_PROFILE' => 'Profile', - 'REASON' => 'Reason', - 'RECORD_ONLINE_USERS' => 'Most users ever online was %1$s on %2$s', - 'REDIRECT' => 'Redirect', - 'REDIRECTS' => 'Total redirects', - 'REGISTER' => 'Register', - 'REGISTERED_USERS' => 'Registered users:', - 'REG_USERS_ONLINE' => 'There are %d registered users and ', - 'REG_USERS_TOTAL' => '%d registered, ', - 'REG_USERS_ZERO_ONLINE' => 'There are 0 registered users and ', - 'REG_USERS_ZERO_TOTAL' => '0 registered, ', - 'REG_USER_ONLINE' => 'There is %d registered user and ', - 'REG_USER_TOTAL' => '%d registered, ', - 'REMOVE' => 'Remove', - 'REMOVE_INSTALL' => 'Please delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.', - 'REPLIES' => 'Replies', - 'REPLY_WITH_QUOTE' => 'Reply with quote', - 'REPLYING_GLOBAL_ANNOUNCE' => 'Replying to global announcement', - 'REPLYING_MESSAGE' => 'Replying to message in %s', - 'REPORT_BY' => 'Report by', - 'REPORT_POST' => 'Report this post', - 'REPORTING_POST' => 'Reporting post', - 'RESEND_ACTIVATION' => 'Resend activation e-mail', - 'RESET' => 'Reset', - 'RESTORE_PERMISSIONS' => 'Restore permissions', - 'RETURN_INDEX' => '%sReturn to the index page%s', - 'RETURN_FORUM' => '%sReturn to the forum last visited%s', - 'RETURN_PAGE' => '%sReturn to the previous page%s', - 'RETURN_TOPIC' => '%sReturn to the topic last visited%s', - 'RETURN_TO' => 'Return to', - 'RULES_ATTACH_CAN' => 'You can post attachments in this forum', - 'RULES_ATTACH_CANNOT' => 'You cannot post attachments in this forum', - 'RULES_DELETE_CAN' => 'You can delete your posts in this forum', - 'RULES_DELETE_CANNOT' => 'You cannot delete your posts in this forum', - 'RULES_DOWNLOAD_CAN' => 'You can download attachments in this forum', - 'RULES_DOWNLOAD_CANNOT' => 'You cannot download attachments in this forum', - 'RULES_EDIT_CAN' => 'You can edit your posts in this forum', - 'RULES_EDIT_CANNOT' => 'You cannot edit your posts in this forum', - 'RULES_LOCK_CAN' => 'You can lock your topics in this forum', - 'RULES_LOCK_CANNOT' => 'You cannot lock your topics in this forum', - 'RULES_POST_CAN' => 'You can post new topics in this forum', - 'RULES_POST_CANNOT' => 'You cannot post new topics in this forum', - 'RULES_REPLY_CAN' => 'You can reply to topics in this forum', - 'RULES_REPLY_CANNOT' => 'You cannot reply to topics in this forum', - 'RULES_VOTE_CAN' => 'You can vote in polls in this forum', - 'RULES_VOTE_CANNOT' => 'You cannot vote in polls in this forum', - - 'SEARCH' => 'Search', - 'SEARCH_MINI' => 'Search…', - 'SEARCH_ADV' => 'Advanced search', - 'SEARCH_ADV_EXPLAIN' => 'View the advanced search options', - 'SEARCH_KEYWORDS' => 'Search for keywords', - 'SEARCHING_FORUMS' => 'Searching forums', - 'SEARCH_ACTIVE_TOPICS' => 'View active topics', - 'SEARCH_FOR' => 'Search for', - 'SEARCH_FORUM' => 'Search this forum…', - 'SEARCH_NEW' => 'View new posts', - 'SEARCH_POSTS_BY' => 'Search posts by', - 'SEARCH_SELF' => 'View your posts', - 'SEARCH_TOPIC' => 'Search this topic…', - 'SEARCH_UNANSWERED' => 'View unanswered posts', - 'SECONDS' => 'Seconds', - 'SELECT' => 'Select', - 'SELECT_ALL_CODE' => 'Select all', - 'SELECT_DESTINATION_FORUM' => 'Please select a destination forum', - 'SELECT_FORUM' => 'Select a forum', - 'SEND_EMAIL' => 'E-mail', - 'SEND_EMAIL_USER' => 'E-mail', // Used as: {L_SEND_EMAIL_USER} {USERNAME} -> E-mail UserX - 'SEND_PRIVATE_MESSAGE' => 'Send private message', - 'SETTINGS' => 'Settings', - 'SIGNATURE' => 'Signature', - 'SKIP' => 'Skip to content', - 'SMTP_NO_AUTH_SUPPORT' => 'SMTP server does not support authentication.', - 'SORRY_AUTH_READ' => 'You are not authorised to read this forum.', - 'SORRY_AUTH_VIEW_ATTACH' => 'You are not authorised to download this attachment.', - 'SORT_BY' => 'Sort by', - 'SORT_JOINED' => 'Joined date', - 'SORT_LOCATION' => 'Location', - 'SORT_RANK' => 'Rank', - 'SORT_TOPIC_TITLE' => 'Topic title', - 'SORT_USERNAME' => 'Username', - 'SPLIT_TOPIC' => 'Split topic', - 'SQL_ERROR_OCCURRED' => 'An SQL error occurred while fetching this page. Please contact the %sBoard Administrator%s if this problem persists.', - 'STATISTICS' => 'Statistics', - 'START_WATCHING_FORUM' => 'Subscribe forum', - 'START_WATCHING_TOPIC' => 'Subscribe topic', - 'STOP_WATCHING_FORUM' => 'Unsubscribe forum', - 'STOP_WATCHING_TOPIC' => 'Unsubscribe topic', - 'SUBFORUM' => 'Subforum', - 'SUBFORUMS' => 'Subforums', - 'SUBJECT' => 'Subject', - 'SUBMIT' => 'Submit', - - 'TERMS_USE' => 'Terms of use', - 'TEST_CONNECTION' => 'Test connection', - 'THE_TEAM' => 'The team', - 'TIME' => 'Time', - - 'TOO_LONG_AIM' => 'The screenname you entered is too long.', - 'TOO_LONG_CONFIRM_CODE' => 'The confirm code you entered is too long.', - 'TOO_LONG_DATEFORMAT' => 'The date format you entered is too long.', - 'TOO_LONG_ICQ' => 'The ICQ number you entered is too long.', - 'TOO_LONG_INTERESTS' => 'The interests you entered is too long.', - 'TOO_LONG_JABBER' => 'The Jabber account name you entered is too long.', - 'TOO_LONG_LOCATION' => 'The location you entered is too long.', - 'TOO_LONG_MSN' => 'The MSNM/WLM name you entered is too long.', - 'TOO_LONG_NEW_PASSWORD' => 'The password you entered is too long.', - 'TOO_LONG_OCCUPATION' => 'The occupation you entered is too long.', - 'TOO_LONG_PASSWORD_CONFIRM' => 'The password confirmation you entered is too long.', - 'TOO_LONG_USER_PASSWORD' => 'The password you entered is too long.', - 'TOO_LONG_USERNAME' => 'The username you entered is too long.', - 'TOO_LONG_EMAIL' => 'The e-mail address you entered is too long.', - 'TOO_LONG_EMAIL_CONFIRM' => 'The e-mail address confirmation you entered is too long.', - 'TOO_LONG_WEBSITE' => 'The website address you entered is too long.', - 'TOO_LONG_YIM' => 'The Yahoo! Messenger name you entered is too long.', - - 'TOO_MANY_VOTE_OPTIONS' => 'You have tried to vote for too many options.', - - 'TOO_SHORT_AIM' => 'The screenname you entered is too short.', - 'TOO_SHORT_CONFIRM_CODE' => 'The confirm code you entered is too short.', - 'TOO_SHORT_DATEFORMAT' => 'The date format you entered is too short.', - 'TOO_SHORT_ICQ' => 'The ICQ number you entered is too short.', - 'TOO_SHORT_INTERESTS' => 'The interests you entered is too short.', - 'TOO_SHORT_JABBER' => 'The Jabber account name you entered is too short.', - 'TOO_SHORT_LOCATION' => 'The location you entered is too short.', - 'TOO_SHORT_MSN' => 'The MSNM/WLM name you entered is too short.', - 'TOO_SHORT_NEW_PASSWORD' => 'The password you entered is too short.', - 'TOO_SHORT_OCCUPATION' => 'The occupation you entered is too short.', - 'TOO_SHORT_PASSWORD_CONFIRM' => 'The password confirmation you entered is too short.', - 'TOO_SHORT_USER_PASSWORD' => 'The password you entered is too short.', - 'TOO_SHORT_USERNAME' => 'The username you entered is too short.', - 'TOO_SHORT_EMAIL' => 'The e-mail address you entered is too short.', - 'TOO_SHORT_EMAIL_CONFIRM' => 'The e-mail address confirmation you entered is too short.', - 'TOO_SHORT_WEBSITE' => 'The website address you entered is too short.', - 'TOO_SHORT_YIM' => 'The Yahoo! Messenger name you entered is too short.', - - 'TOPIC' => 'Topic', - 'TOPICS' => 'Topics', - 'TOPIC_ICON' => 'Topic icon', - 'TOPIC_LOCKED' => 'This topic is locked, you cannot edit posts or make further replies.', - 'TOPIC_LOCKED_SHORT'=> 'Topic locked', - 'TOPIC_MOVED' => 'Moved topic', - 'TOPIC_REVIEW' => 'Topic review', - 'TOPIC_TITLE' => 'Topic title', - 'TOPIC_UNAPPROVED' => 'This topic has not been approved', - 'TOTAL_ATTACHMENTS' => 'Attachment(s)', - 'TOTAL_LOG' => '1 log', - 'TOTAL_LOGS' => '%d logs', - 'TOTAL_NO_PM' => '0 private messages in total', - 'TOTAL_PM' => '1 private message in total', - 'TOTAL_PMS' => '%d private messages in total', - 'TOTAL_POSTS' => 'Total posts', - 'TOTAL_POSTS_OTHER' => 'Total posts %d', - 'TOTAL_POSTS_ZERO' => 'Total posts 0', - 'TOPIC_REPORTED' => 'This topic has been reported', - 'TOTAL_TOPICS_OTHER'=> 'Total topics %d', - 'TOTAL_TOPICS_ZERO' => 'Total topics 0', - 'TOTAL_USERS_OTHER' => 'Total members %d', - 'TOTAL_USERS_ZERO' => 'Total members 0', - 'TRACKED_PHP_ERROR' => 'Tracked PHP errors: %s', - - 'UNABLE_GET_IMAGE_SIZE' => 'It was not possible to determine the dimensions of the image.', - 'UNABLE_TO_DELIVER_FILE'=> 'Unable to deliver file.', - 'UNKNOWN_BROWSER' => 'Unknown browser', - 'UNMARK_ALL' => 'Unmark all', - 'UNREAD_MESSAGES' => 'Unread messages', - 'UNREAD_PM' => '%d unread message', - 'UNREAD_PMS' => '%d unread messages', - 'UNWATCHED_FORUMS' => 'You are no longer subscribed to the selected forums.', - 'UNWATCHED_TOPICS' => 'You are no longer subscribed to the selected topics.', - 'UNWATCHED_FORUMS_TOPICS' => 'You are no longer subscribed to the selected entries.', - 'UPDATE' => 'Update', - 'UPLOAD_IN_PROGRESS' => 'The upload is currently in progress.', - 'URL_REDIRECT' => 'If your browser does not support meta redirection %splease click HERE to be redirected%s.', - 'USERGROUPS' => 'Groups', - 'USERNAME' => 'Username', - 'USERNAMES' => 'Usernames', - 'USER_AVATAR' => 'User avatar', - 'USER_CANNOT_READ' => 'You cannot read posts in this forum.', - 'USER_POST' => '%d Post', - 'USER_POSTS' => '%d Posts', - 'USERS' => 'Users', - 'USE_PERMISSIONS' => 'Test out user’s permissions', - - 'VARIANT_DATE_SEPARATOR' => ' / ', // Used in date format dropdown, eg: "Today, 13:37 / 01 Jan 2007, 13:37" ... to join a relative date with calendar date - 'VIEWED' => 'Viewed', - 'VIEWING_FAQ' => 'Viewing FAQ', - 'VIEWING_MEMBERS' => 'Viewing member details', - 'VIEWING_ONLINE' => 'Viewing who is online', - 'VIEWING_MCP' => 'Viewing moderator control panel', - 'VIEWING_MEMBER_PROFILE' => 'Viewing member profile', - 'VIEWING_PRIVATE_MESSAGES' => 'Viewing private messages', - 'VIEWING_REGISTER' => 'Registering account', - 'VIEWING_UCP' => 'Viewing user control panel', - 'VIEWS' => 'Views', - 'VIEW_BOOKMARKS' => 'View bookmarks', - 'VIEW_FORUM_LOGS' => 'View Logs', - 'VIEW_LATEST_POST' => 'View the latest post', - 'VIEW_NEWEST_POST' => 'View first unread post', - 'VIEW_NOTES' => 'View user notes', - 'VIEW_ONLINE_TIME' => 'based on users active over the past %d minute', - 'VIEW_ONLINE_TIMES' => 'based on users active over the past %d minutes', - 'VIEW_TOPIC' => 'View topic', - 'VIEW_TOPIC_ANNOUNCEMENT' => 'Announcement: ', - 'VIEW_TOPIC_GLOBAL' => 'Global Announcement: ', - 'VIEW_TOPIC_LOCKED' => 'Locked: ', - 'VIEW_TOPIC_LOGS' => 'View logs', - 'VIEW_TOPIC_MOVED' => 'Moved: ', - 'VIEW_TOPIC_POLL' => 'Poll: ', - 'VIEW_TOPIC_STICKY' => 'Sticky: ', - 'VISIT_WEBSITE' => 'Visit website', - - 'WARNINGS' => 'Warnings', - 'WARN_USER' => 'Warn user', - 'WELCOME_SUBJECT' => 'Welcome to %s forums', - 'WEBSITE' => 'Website', - 'WHOIS' => 'Whois', - 'WHO_IS_ONLINE' => 'Who is online', - 'WRONG_PASSWORD' => 'You entered an incorrect password.', - - 'WRONG_DATA_ICQ' => 'The number you entered is not a valid ICQ number.', - 'WRONG_DATA_JABBER' => 'The name you entered is not a valid Jabber account name.', - 'WRONG_DATA_LANG' => 'The language you specified is not valid.', - 'WRONG_DATA_WEBSITE' => 'The website address has to be a valid URL, including the protocol. For example http://www.example.com/.', - 'WROTE' => 'wrote', - - 'YEAR' => 'Year', - 'YEAR_MONTH_DAY' => '(YYYY-MM-DD)', - 'YES' => 'Yes', - 'YIM' => 'YIM', - 'YOU_LAST_VISIT' => 'Last visit was: %s', - 'YOU_NEW_PM' => 'A new private message is waiting for you in your Inbox.', - 'YOU_NEW_PMS' => 'New private messages are waiting for you in your Inbox.', - 'YOU_NO_NEW_PM' => 'No new private messages are waiting for you.', - - 'datetime' => array( - 'TODAY' => 'Today', - 'TOMORROW' => 'Tomorrow', - 'YESTERDAY' => 'Yesterday', - - 'Sunday' => 'Sunday', - 'Monday' => 'Monday', - 'Tuesday' => 'Tuesday', - 'Wednesday' => 'Wednesday', - 'Thursday' => 'Thursday', - 'Friday' => 'Friday', - 'Saturday' => 'Saturday', - - 'Sun' => 'Sun', - 'Mon' => 'Mon', - 'Tue' => 'Tue', - 'Wed' => 'Wed', - 'Thu' => 'Thu', - 'Fri' => 'Fri', - 'Sat' => 'Sat', - - 'January' => 'January', - 'February' => 'February', - 'March' => 'March', - 'April' => 'April', - 'May' => 'May', - 'June' => 'June', - 'July' => 'July', - 'August' => 'August', - 'September' => 'September', - 'October' => 'October', - 'November' => 'November', - 'December' => 'December', - - 'Jan' => 'Jan', - 'Feb' => 'Feb', - 'Mar' => 'Mar', - 'Apr' => 'Apr', - 'May_short' => 'May', // Short representation of "May". May_short used because in English the short and long date are the same for May. - 'Jun' => 'Jun', - 'Jul' => 'Jul', - 'Aug' => 'Aug', - 'Sep' => 'Sep', - 'Oct' => 'Oct', - 'Nov' => 'Nov', - 'Dec' => 'Dec', - ), - - 'tz' => array( - '-12' => 'UTC - 12 hours', - '-11' => 'UTC - 11 hours', - '-10' => 'UTC - 10 hours', - '-9.5' => 'UTC - 9:30 hours', - '-9' => 'UTC - 9 hours', - '-8' => 'UTC - 8 hours', - '-7' => 'UTC - 7 hours', - '-6' => 'UTC - 6 hours', - '-5' => 'UTC - 5 hours', - '-4' => 'UTC - 4 hours', - '-3.5' => 'UTC - 3:30 hours', - '-3' => 'UTC - 3 hours', - '-2' => 'UTC - 2 hours', - '-1' => 'UTC - 1 hour', - '0' => 'UTC', - '1' => 'UTC + 1 hour', - '2' => 'UTC + 2 hours', - '3' => 'UTC + 3 hours', - '3.5' => 'UTC + 3:30 hours', - '4' => 'UTC + 4 hours', - '4.5' => 'UTC + 4:30 hours', - '5' => 'UTC + 5 hours', - '5.5' => 'UTC + 5:30 hours', - '5.75' => 'UTC + 5:45 hours', - '6' => 'UTC + 6 hours', - '6.5' => 'UTC + 6:30 hours', - '7' => 'UTC + 7 hours', - '8' => 'UTC + 8 hours', - '8.75' => 'UTC + 8:45 hours', - '9' => 'UTC + 9 hours', - '9.5' => 'UTC + 9:30 hours', - '10' => 'UTC + 10 hours', - '10.5' => 'UTC + 10:30 hours', - '11' => 'UTC + 11 hours', - '11.5' => 'UTC + 11:30 hours', - '12' => 'UTC + 12 hours', - '12.75' => 'UTC + 12:45 hours', - '13' => 'UTC + 13 hours', - '14' => 'UTC + 14 hours', - 'dst' => '[ DST ]', - ), - - 'tz_zones' => array( - '-12' => '[UTC - 12] Baker Island Time', - '-11' => '[UTC - 11] Niue Time, Samoa Standard Time', - '-10' => '[UTC - 10] Hawaii-Aleutian Standard Time, Cook Island Time', - '-9.5' => '[UTC - 9:30] Marquesas Islands Time', - '-9' => '[UTC - 9] Alaska Standard Time, Gambier Island Time', - '-8' => '[UTC - 8] Pacific Standard Time', - '-7' => '[UTC - 7] Mountain Standard Time', - '-6' => '[UTC - 6] Central Standard Time', - '-5' => '[UTC - 5] Eastern Standard Time', - '-4' => '[UTC - 4] Atlantic Standard Time', - '-3.5' => '[UTC - 3:30] Newfoundland Standard Time', - '-3' => '[UTC - 3] Amazon Standard Time, Central Greenland Time', - '-2' => '[UTC - 2] Fernando de Noronha Time, South Georgia & the South Sandwich Islands Time', - '-1' => '[UTC - 1] Azores Standard Time, Cape Verde Time, Eastern Greenland Time', - '0' => '[UTC] Western European Time, Greenwich Mean Time', - '1' => '[UTC + 1] Central European Time, West African Time', - '2' => '[UTC + 2] Eastern European Time, Central African Time', - '3' => '[UTC + 3] Moscow Standard Time, Eastern African Time', - '3.5' => '[UTC + 3:30] Iran Standard Time', - '4' => '[UTC + 4] Gulf Standard Time, Samara Standard Time', - '4.5' => '[UTC + 4:30] Afghanistan Time', - '5' => '[UTC + 5] Pakistan Standard Time, Yekaterinburg Standard Time', - '5.5' => '[UTC + 5:30] Indian Standard Time, Sri Lanka Time', - '5.75' => '[UTC + 5:45] Nepal Time', - '6' => '[UTC + 6] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time', - '6.5' => '[UTC + 6:30] Cocos Islands Time, Myanmar Time', - '7' => '[UTC + 7] Indochina Time, Krasnoyarsk Standard Time', - '8' => '[UTC + 8] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time', - '8.75' => '[UTC + 8:45] Southeastern Western Australia Standard Time', - '9' => '[UTC + 9] Japan Standard Time, Korea Standard Time, Chita Standard Time', - '9.5' => '[UTC + 9:30] Australian Central Standard Time', - '10' => '[UTC + 10] Australian Eastern Standard Time, Vladivostok Standard Time', - '10.5' => '[UTC + 10:30] Lord Howe Standard Time', - '11' => '[UTC + 11] Solomon Island Time, Magadan Standard Time', - '11.5' => '[UTC + 11:30] Norfolk Island Time', - '12' => '[UTC + 12] New Zealand Time, Fiji Time, Kamchatka Standard Time', - '12.75' => '[UTC + 12:45] Chatham Islands Time', - '13' => '[UTC + 13] Tonga Time, Phoenix Islands Time', - '14' => '[UTC + 14] Line Island Time', - ), - - // The value is only an example and will get replaced by the current time on view - 'dateformats' => array( - 'd M Y, H:i' => '01 Jan 2007, 13:37', - 'd M Y H:i' => '01 Jan 2007 13:37', - 'M jS, \'y, H:i' => 'Jan 1st, \'07, 13:37', - 'D M d, Y g:i a' => 'Mon Jan 01, 2007 1:37 pm', - 'F jS, Y, g:i a' => 'January 1st, 2007, 1:37 pm', - '|d M Y|, H:i' => 'Today, 13:37 / 01 Jan 2007, 13:37', - '|F jS, Y|, g:i a' => 'Today, 1:37 pm / January 1st, 2007, 1:37 pm' - ), - - // The default dateformat which will be used on new installs in this language - // Translators should change this if a the usual date format is different - 'default_dateformat' => 'D M d, Y g:i a', // Mon Jan 01, 2007 1:37 pm - -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/email/admin_activate.txt b/phpBB/language/en/email/admin_activate.txt deleted file mode 100644 index 8b11f1b450..0000000000 --- a/phpBB/language/en/email/admin_activate.txt +++ /dev/null @@ -1,14 +0,0 @@ -Subject: Activate user account - -Hello, - -The account owned by "{USERNAME}" has been deactivated or newly created, you should check the details of this user (if required) and handle it appropriately. - -Use this link to view the user's profile: -{U_USER_DETAILS} - -Use this link to activate the account: -{U_ACTIVATE} - - -{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/admin_send_email.txt b/phpBB/language/en/email/admin_send_email.txt deleted file mode 100644 index 6687404527..0000000000 --- a/phpBB/language/en/email/admin_send_email.txt +++ /dev/null @@ -1,14 +0,0 @@ - -The following is an e-mail sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address: - -{CONTACT_EMAIL} - -Include this full e-mail (particularly the headers). - -Message sent to you follows: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -{MESSAGE} - - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/admin_welcome_activated.txt b/phpBB/language/en/email/admin_welcome_activated.txt deleted file mode 100644 index c16a403f00..0000000000 --- a/phpBB/language/en/email/admin_welcome_activated.txt +++ /dev/null @@ -1,7 +0,0 @@ -Subject: Account activated - -Hello {USERNAME}, - -Your account on "{SITENAME}" has now been activated, you may login using the username and password you received in a previous e-mail. - -{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/coppa_resend_inactive.txt b/phpBB/language/en/email/coppa_resend_inactive.txt deleted file mode 100644 index 9d43ca4f85..0000000000 --- a/phpBB/language/en/email/coppa_resend_inactive.txt +++ /dev/null @@ -1,42 +0,0 @@ -Subject: Welcome to "{SITENAME}" - -{WELCOME_MSG} - -In compliance with the COPPA your account is currently inactive. - -Please print this message out and have your parent or guardian sign and date it. Then fax it to: - -{FAX_INFO} - -OR mail it to: - -{MAIL_INFO} - ------------------------------- CUT HERE ------------------------------ -Permission to participate at "{SITENAME}" - {U_BOARD} - -Username: {USERNAME} -E-mail: {EMAIL_ADDRESS} - -I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO "{SITENAME}" TO STORE THIS INFORMATION. -I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. -I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM "{SITENAME}" AT ANY TIME. - - -Parent or guardian -(print your name here): _____________________ - -(sign here): __________________ - -Date: _______________ - ------------------------------- CUT HERE ------------------------------ - - -Once the administrator has received the above form via fax or regular mail your account will be activated. - -Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account. - -Thank you for registering. - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/email_notify.txt b/phpBB/language/en/email/email_notify.txt deleted file mode 100644 index 0d0ac7fc28..0000000000 --- a/phpBB/language/en/email/email_notify.txt +++ /dev/null @@ -1,17 +0,0 @@ -Subject: "{SITENAME}" - E-mail a friend - -Hello {TO_USERNAME}, - -This e-mail was sent from "{SITENAME}" by {FROM_USERNAME} who thought you may be interested in the following topic: - -{TOPIC_NAME} - -You can find it at: - -{U_TOPIC} - -A message from {FROM_USERNAME} may also be included below. Please note that this message has not been seen or approved by the board administrators. If you wish to complain about having received this e-mail please contact the board administrator at {BOARD_CONTACT}. Please quote the message headers when contacting this address. - ----------- - -{MESSAGE} \ No newline at end of file diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt deleted file mode 100644 index fae5a83885..0000000000 --- a/phpBB/language/en/email/forum_notify.txt +++ /dev/null @@ -1,19 +0,0 @@ -Subject: Forum post notification - "{FORUM_NAME}" - -Hello {USERNAME}, - -You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new reply to the topic "{TOPIC_TITLE}" since your last visit. You can use the following link to view the last unread reply, no more notifications will be sent until you visit the topic. - -{U_NEWEST_POST} - -If you want to view the topic, click the following link: -{U_TOPIC} - -If you want to view the forum, click the following link: -{U_FORUM} - -If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link: - -{U_STOP_WATCHING_FORUM} - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/group_added.txt b/phpBB/language/en/email/group_added.txt deleted file mode 100644 index 9464aae094..0000000000 --- a/phpBB/language/en/email/group_added.txt +++ /dev/null @@ -1,11 +0,0 @@ -Subject: You have been added to this usergroup - -Congratulations, - -You have been added to the "{GROUP_NAME}" group on "{SITENAME}". -This action was done by a group leader or the site administrator, contact them for more information. - -You can view your groups information here: -{U_GROUP} - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/index.htm b/phpBB/language/en/email/index.htm deleted file mode 100644 index ee1f723a7d..0000000000 --- a/phpBB/language/en/email/index.htm +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/phpBB/language/en/email/installed.txt b/phpBB/language/en/email/installed.txt deleted file mode 100644 index 4d9286bd65..0000000000 --- a/phpBB/language/en/email/installed.txt +++ /dev/null @@ -1,20 +0,0 @@ -Subject: phpBB installed - -Congratulations, - -You have successfully installed phpBB on your server. - -This e-mail contains important information on your installation that you should keep safe. The password has been encrypted in the database and cannot be recovered, although you can request a new password should you lose this one. - ----------------------------- -Username: {USERNAME} -Password: {PASSWORD} - -Board URL: {U_BOARD} ----------------------------- - -Useful information on your phpBB installation can be found in the docs folder of your installation and on phpBB.com's support page - http://www.phpbb.com/support/ - -In order to keep the board safe and secure, it is highly recommended that you keep current with software releases which can be easily done by subscribing to phpBB.com's mailing list, located at the above URL. - -{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/newtopic_notify.txt b/phpBB/language/en/email/newtopic_notify.txt deleted file mode 100644 index 1c471a3c01..0000000000 --- a/phpBB/language/en/email/newtopic_notify.txt +++ /dev/null @@ -1,13 +0,0 @@ -Subject: New topic notification - "{FORUM_NAME}" - -Hello {USERNAME}, - -You are receiving this notification because you are watching the forum, "{FORUM_NAME}" at "{SITENAME}". This forum has received a new topic since your last visit, "{TOPIC_TITLE}". You can use the following link to view forum, no more notifications will be sent until you visit the forum. - -{U_FORUM} - -If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link: - -{U_STOP_WATCHING_FORUM} - -{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/post_approved.txt b/phpBB/language/en/email/post_approved.txt deleted file mode 100644 index e715b54026..0000000000 --- a/phpBB/language/en/email/post_approved.txt +++ /dev/null @@ -1,14 +0,0 @@ -Subject: Post approved - "{POST_SUBJECT}" - -Hello {USERNAME}, - -You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was approved by a moderator or administrator. - -If you want to view the post, click the following link: -{U_VIEW_POST} - -If you want to view the topic, click the following link: -{U_VIEW_TOPIC} - - -{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/post_disapproved.txt b/phpBB/language/en/email/post_disapproved.txt deleted file mode 100644 index 3bc64bb611..0000000000 --- a/phpBB/language/en/email/post_disapproved.txt +++ /dev/null @@ -1,12 +0,0 @@ -Subject: Post disapproved - "{POST_SUBJECT}" - -Hello {USERNAME}, - -You are receiving this notification because your post "{POST_SUBJECT}" at "{SITENAME}" was disapproved by a moderator or administrator. - -The following reason was given for the disapproval: - -{REASON} - - -{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/privmsg_notify.txt b/phpBB/language/en/email/privmsg_notify.txt deleted file mode 100644 index d363df7973..0000000000 --- a/phpBB/language/en/email/privmsg_notify.txt +++ /dev/null @@ -1,15 +0,0 @@ -Subject: New private message has arrived - -Hello {USERNAME}, - -You have received a new private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject: - -{SUBJECT} - -You can view your new message by clicking on the following link: - -{U_INBOX} - -You have requested that you be notified on this event, remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile. - -{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/profile_send_email.txt b/phpBB/language/en/email/profile_send_email.txt deleted file mode 100644 index 9fb19e7eb1..0000000000 --- a/phpBB/language/en/email/profile_send_email.txt +++ /dev/null @@ -1,13 +0,0 @@ - -Hello {TO_USERNAME}, - -The following is an e-mail sent to you by {FROM_USERNAME} via your account on "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address: - -{BOARD_CONTACT} - -Include this full e-mail (particularly the headers). Please note that the reply address to this e-mail has been set to that of {FROM_USERNAME}. - -Message sent to you follows -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -{MESSAGE} diff --git a/phpBB/language/en/email/profile_send_im.txt b/phpBB/language/en/email/profile_send_im.txt deleted file mode 100644 index 02c820c69d..0000000000 --- a/phpBB/language/en/email/profile_send_im.txt +++ /dev/null @@ -1,13 +0,0 @@ - -Hello {TO_USERNAME}, - -The following is a message sent to you by {FROM_USERNAME} via your account on "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address: - -{BOARD_CONTACT} - -Include this full message. Please note that the sender address has been set to the boards IM account. - -Message sent to you follows -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -{MESSAGE} diff --git a/phpBB/language/en/email/report_closed.txt b/phpBB/language/en/email/report_closed.txt deleted file mode 100644 index eb7ef22b5e..0000000000 --- a/phpBB/language/en/email/report_closed.txt +++ /dev/null @@ -1,8 +0,0 @@ -Subject: Report closed - "{POST_SUBJECT}" - -Hello {USERNAME}, - -You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was handled by a moderator or by an administrator. The report was afterwards closed. If you have further questions contact {CLOSER_NAME} with a personal message. - - -{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/report_deleted.txt b/phpBB/language/en/email/report_deleted.txt deleted file mode 100644 index 4292ca2239..0000000000 --- a/phpBB/language/en/email/report_deleted.txt +++ /dev/null @@ -1,8 +0,0 @@ -Subject: Report deleted - "{POST_SUBJECT}" - -Hello {USERNAME}, - -You are receiving this notification because the report you filed on the post "{POST_SUBJECT}" in "{TOPIC_TITLE}" at "{SITENAME}" was deleted by a moderator or by an administrator. - - -{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/topic_approved.txt b/phpBB/language/en/email/topic_approved.txt deleted file mode 100644 index ffda378d30..0000000000 --- a/phpBB/language/en/email/topic_approved.txt +++ /dev/null @@ -1,11 +0,0 @@ -Subject: Topic approved - "{TOPIC_TITLE}" - -Hello {USERNAME}, - -You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was approved by a moderator or administrator. - -If you want to view the topic, click the following link: -{U_VIEW_TOPIC} - - -{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/topic_disapproved.txt b/phpBB/language/en/email/topic_disapproved.txt deleted file mode 100644 index 49ef58bf39..0000000000 --- a/phpBB/language/en/email/topic_disapproved.txt +++ /dev/null @@ -1,12 +0,0 @@ -Subject: Topic disapproved - "{TOPIC_TITLE}" - -Hello {USERNAME}, - -You are receiving this notification because your topic "{TOPIC_TITLE}" at "{SITENAME}" was disapproved by a moderator or administrator. - -The following reason was given for the disapproval: - -{REASON} - - -{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt deleted file mode 100644 index 99587b28e0..0000000000 --- a/phpBB/language/en/email/topic_notify.txt +++ /dev/null @@ -1,20 +0,0 @@ -Subject: Topic reply notification - "{TOPIC_TITLE}" - -Hello {USERNAME}, - -You are receiving this notification because you are watching the topic, "{TOPIC_TITLE}" at "{SITENAME}". This topic has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. - -If you want to view the newest post made since your last visit, click the following link: -{U_NEWEST_POST} - -If you want to view the topic, click the following link: -{U_TOPIC} - -If you want to view the forum, click the following link: -{U_FORUM} - -If you no longer wish to watch this topic you can either click the "Unsubscribe topic" link found at the bottom of the topic above, or by clicking the following link: - -{U_STOP_WATCHING_TOPIC} - -{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/user_activate_inactive.txt b/phpBB/language/en/email/user_activate_inactive.txt deleted file mode 100644 index a90773d48c..0000000000 --- a/phpBB/language/en/email/user_activate_inactive.txt +++ /dev/null @@ -1,7 +0,0 @@ -Subject: Your account has been deactivated - -Hello {USERNAME}, - -Your account on "{SITENAME}" has been deactivated, most likely due to changes made to your profile. The administrator of the board will need to activate it before you can log in. You will receive another notification when this has occurred. - -{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/user_reactivate_account.txt b/phpBB/language/en/email/user_reactivate_account.txt deleted file mode 100644 index b5639d0b7a..0000000000 --- a/phpBB/language/en/email/user_reactivate_account.txt +++ /dev/null @@ -1,19 +0,0 @@ -Subject: Reactivate your account on "{SITENAME}" - -A board administrator requested that your account be reactivated. Your account is currently inactive. -Please follow the steps listed here to reactivate your account. - -Please keep this e-mail for your records. Your account information is as follows: - ----------------------------- -Username: {USERNAME} ----------------------------- - -Your password has been encrypted in our database. Should you forget your password you can request a new one which will be activated in the same way as this account. - -Please visit the following link to reactivate your account: - -{U_ACTIVATE} - - -{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/user_remind_inactive.txt b/phpBB/language/en/email/user_remind_inactive.txt deleted file mode 100644 index 49dea02044..0000000000 --- a/phpBB/language/en/email/user_remind_inactive.txt +++ /dev/null @@ -1,11 +0,0 @@ -Subject: Inactive account reminder - -Hello {USERNAME}, - -On {REGISTER_DATE} you registered a new account at "{SITENAME}". To date you have not activated this account which is a prerequisite for board login. For your convenience the activation link is repeated below. - -{U_ACTIVATE} - -Thank you for registering at "{SITENAME}", we look forward to your participation. - -{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/user_resend_inactive.txt b/phpBB/language/en/email/user_resend_inactive.txt deleted file mode 100644 index 5635801b80..0000000000 --- a/phpBB/language/en/email/user_resend_inactive.txt +++ /dev/null @@ -1,20 +0,0 @@ -Subject: Welcome to "{SITENAME}" - -{WELCOME_MSG} - -Please keep this e-mail for your records. Your account information is as follows: - ----------------------------- -Username: {USERNAME} ----------------------------- - -Your password has been encrypted in our database. Should you forget your password you can request a new one which will be activated in the same way as this account. - -Your account is currently inactive. You cannot use it until you visit the following link: - -{U_ACTIVATE} - - -Thank you for registering. - -{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php deleted file mode 100644 index 9f72d4070f..0000000000 --- a/phpBB/language/en/groups.php +++ /dev/null @@ -1,96 +0,0 @@ - 'The selected group is already your default group.', - 'ALREADY_IN_GROUP' => 'You are already a member of the selected group.', - 'ALREADY_IN_GROUP_PENDING' => 'You already requested joining the selected group.', - - 'CANNOT_JOIN_GROUP' => 'You are not able to join this group. You are only able to join open and freely open groups.', - 'CANNOT_RESIGN_GROUP' => 'You are not able to resign from this group. You are only able to resign from open and freely open groups.', - 'CHANGED_DEFAULT_GROUP' => 'Successfully changed default group.', - - 'GROUP_AVATAR' => 'Group avatar', - 'GROUP_CHANGE_DEFAULT' => 'Are you sure you want to change your default membership to the group “%sâ€?', - 'GROUP_CLOSED' => 'Closed', - 'GROUP_DESC' => 'Group description', - 'GROUP_HIDDEN' => 'Hidden', - 'GROUP_INFORMATION' => 'Usergroup information', - 'GROUP_IS_CLOSED' => 'This is a closed group, new members can only join upon invitation of a group leader.', - 'GROUP_IS_FREE' => 'This is a freely open group, all new members are welcome.', - 'GROUP_IS_HIDDEN' => 'This is a hidden group, only members of this group can view its membership.', - 'GROUP_IS_OPEN' => 'This is an open group, members can apply to join.', - 'GROUP_IS_SPECIAL' => 'This is a special group, special groups are managed by the board administrators.', - 'GROUP_JOIN' => 'Join group', - 'GROUP_JOIN_CONFIRM' => 'Are you sure you want to join the selected group?', - 'GROUP_JOIN_PENDING' => 'Request to join group', - 'GROUP_JOIN_PENDING_CONFIRM' => 'Are you sure you want to request joining the selected group?', - 'GROUP_JOINED' => 'Successfully joined selected group.', - 'GROUP_JOINED_PENDING' => 'Successfully requested group membership. Please wait for a group leader to approve your membership.', - 'GROUP_LIST' => 'Manage users', - 'GROUP_MEMBERS' => 'Group members', - 'GROUP_NAME' => 'Group name', - 'GROUP_OPEN' => 'Open', - 'GROUP_RANK' => 'Group rank', - 'GROUP_RESIGN_MEMBERSHIP' => 'Resign group membership', - 'GROUP_RESIGN_MEMBERSHIP_CONFIRM' => 'Are you sure you want to resign your membership from the selected group?', - 'GROUP_RESIGN_PENDING' => 'Resign a pending group membership', - 'GROUP_RESIGN_PENDING_CONFIRM' => 'Are you sure you want to resign your pending membership from the selected group?', - 'GROUP_RESIGNED_MEMBERSHIP' => 'You were successfully removed from the selected group.', - 'GROUP_RESIGNED_PENDING' => 'Your pending membership was successfully removed from the selected group.', - 'GROUP_TYPE' => 'Group type', - 'GROUP_UNDISCLOSED' => 'Hidden group', - 'FORUM_UNDISCLOSED' => 'Moderating hidden forum(s)', - - 'LOGIN_EXPLAIN_GROUP' => 'You need to login to view group details.', - - 'NO_LEADERS' => 'You are not a leader of any group.', - 'NOT_LEADER_OF_GROUP' => 'The requested operation cannot be taken because you are not a leader of the selected group.', - 'NOT_MEMBER_OF_GROUP' => 'The requested operation cannot be taken because you are not a member of the selected group or your membership has not been approved yet.', - 'NOT_RESIGN_FROM_DEFAULT_GROUP' => 'You are not allowed to resign from your default group.', - - 'PRIMARY_GROUP' => 'Primary group', - - 'REMOVE_SELECTED' => 'Remove selected', - - 'USER_GROUP_CHANGE' => 'From “%1$s†group to “%2$sâ€', - 'USER_GROUP_DEMOTE' => 'Demote leadership', - 'USER_GROUP_DEMOTE_CONFIRM' => 'Are you sure you want to demote as group leader from the selected group?', - 'USER_GROUP_DEMOTED' => 'Successfully demoted your leadership.', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php deleted file mode 100644 index 00b00c9e19..0000000000 --- a/phpBB/language/en/help_bbcode.php +++ /dev/null @@ -1,111 +0,0 @@ - '--', - 1 => 'Introduction' - ), - array( - 0 => 'What is BBCode?', - 1 => 'BBCode is a special implementation of HTML. Whether you can actually use BBCode in your posts on the forum is determined by the administrator. In addition you can disable BBCode on a per post basis via the posting form. BBCode itself is similar in style to HTML, tags are enclosed in square brackets [ and ] rather than < and > and it offers greater control over what and how something is displayed. Depending on the template you are using you may find adding BBCode to your posts is made much easier through a clickable interface above the message area on the posting form. Even with this you may find the following guide useful.' - ), - array( - 0 => '--', - 1 => 'Text Formatting' - ), - array( - 0 => 'How to create bold, italic and underlined text', - 1 => 'BBCode includes tags to allow you to quickly change the basic style of your text. This is achieved in the following ways:
    • To make a piece of text bold enclose it in [b][/b], e.g.

      [b]Hello[/b]

      will become Hello
    • For underlining use [u][/u], for example:

      [u]Good Morning[/u]

      becomes Good Morning
    • To italicise text use [i][/i], e.g.

      This is [i]Great![/i]

      would give This is Great!
    ' - ), - array( - 0 => 'How to change the text colour or size', - 1 => 'To alter the colour or size of your text the following tags can be used. Keep in mind that how the output appears will depend on the viewers browser and system:
    • Changing the colour of text is achieved by wrapping it in [color=][/color]. You can specify either a recognised colour name (eg. red, blue, yellow, etc.) or the hexadecimal triplet alternative, e.g. #FFFFFF, #000000. For example, to create red text you could use:

      [color=red]Hello![/color]

      or

      [color=#FF0000]Hello![/color]

      Both will output Hello!
    • Changing the text size is achieved in a similar way using [size=][/size]. This tag is dependent on the template the user has selected but the recommended format is a numerical value representing the text size in percent, starting at 20 (very small) through to 200 (very large) by default. For example:

      [size=30]SMALL[/size]

      will generally be SMALL

      whereas:

      [size=200]HUGE![/size]

      will be HUGE!
    ' - ), - array( - 0 => 'Can I combine formatting tags?', - 1 => 'Yes, of course you can, for example to get someones attention you may write:

    [size=200][color=red][b]LOOK AT ME![/b][/color][/size]

    this would output LOOK AT ME!

    We don’t recommend you output lots of text that looks like this though! Remember it is up to you, the poster, to ensure tags are closed correctly. For example the following is incorrect:

    [b][u]This is wrong[/b][/u]' - ), - array( - 0 => '--', - 1 => 'Quoting and outputting fixed-width text' - ), - array( - 0 => 'Quoting text in replies', - 1 => 'There are two ways you can quote text, with a reference or without.
    • When you utilise the Quote function to reply to a post on the board you should notice that the post text is added to the message window enclosed in a [quote=""][/quote] block. This method allows you to quote with a reference to a person or whatever else you choose to put! For example to quote a piece of text Mr. Blobby wrote you would enter:

      [quote="Mr. Blobby"]The text Mr. Blobby wrote would go here[/quote]

      The resulting output will automatically add "Mr. Blobby wrote:" before the actual text. Remember you must include the quotation marks "" around the name you are quoting, they are not optional.
    • The second method allows you to blindly quote something. To utilise this enclose the text in [quote][/quote] tags. When you view the message it will simply show the text within a quotation block.
    ' - ), - array( - 0 => 'Outputting code or fixed width data', - 1 => 'If you want to output a piece of code or in fact anything that requires a fixed width, e.g. Courier type font you should enclose the text in [code][/code] tags, e.g.

    [code]echo "This is some code";[/code]

    All formatting used within [code][/code] tags is retained when you later view it. PHP syntax highlighting can be enabled using [code=php][/code] and is recommended when posting PHP code samples as it improves readability.' - ), - array( - 0 => '--', - 1 => 'Generating lists' - ), - array( - 0 => 'Creating an Unordered list', - 1 => 'BBCode supports two types of lists, unordered and ordered. They are essentially the same as their HTML equivalents. An unordered list outputs each item in your list sequentially one after the other indenting each with a bullet character. To create an unordered list you use [list][/list] and define each item within the list using [*]. For example to list your favourite colours you could use:

    [list]
    [*]Red
    [*]Blue
    [*]Yellow
    [/list]

    This would generate the following list:
    • Red
    • Blue
    • Yellow
    ' - ), - array( - 0 => 'Creating an Ordered list', - 1 => 'The second type of list, an ordered list, gives you control over what is output before each item. To create an ordered list you use [list=1][/list] to create a numbered list or alternatively [list=a][/list] for an alphabetical list. As with the unordered list, items are specified using [*]. For example:

    [list=1]
    [*]Go to the shops
    [*]Buy a new computer
    [*]Swear at computer when it crashes
    [/list]

    will generate the following:
    1. Go to the shops
    2. Buy a new computer
    3. Swear at computer when it crashes
    Whereas for an alphabetical list you would use:

    [list=a]
    [*]The first possible answer
    [*]The second possible answer
    [*]The third possible answer
    [/list]

    giving
    1. The first possible answer
    2. The second possible answer
    3. The third possible answer
    ' - ), - array( - 0 => '--', - 1 => 'Creating Links' - ), - array( - 0 => 'Linking to another site', - 1 => 'phpBB BBCode supports a number of ways of creating URIs (Uniform Resource Indicators) better known as URLs.
    • The first of these uses the [url=][/url] tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:

      [url=http://www.phpbb.com/]Visit phpBB![/url]

      This would generate the following link, Visit phpBB! Please notice that the link opens in the same window or a new window depending on the users browser preferences.
    • If you want the URL itself displayed as the link you can do this by simply using:

      [url]http://www.phpbb.com/[/url]

      This would generate the following link, http://www.phpbb.com/
    • Additionally, phpBB features something called Magic Links, this will turn any syntactically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to www.phpbb.com being output when you view the message.
    • The same thing applies equally to e-mail addresses, you can either specify an address explicitly for example:

      [email]no.one@domain.adr[/email]

      which will output no.one@domain.adr or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.
    As with all the BBCode tags you can wrap URLs around any of the other tags such as [img][/img] (see next entry), [b][/b], etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:

    [url=http://www.google.com/][img]http://www.google.com/intl/en_ALL/images/logo.gif[/url][/img]

    is not correct which may lead to your post being deleted so take care.' - ), - array( - 0 => '--', - 1 => 'Showing images in posts' - ), - array( - 0 => 'Adding an image to a post', - 1 => 'phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are: many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot exist only on your computer for example, unless you run a webserver!). To display an image you must surround the URL pointing to the image with [img][/img] tags. For example:

    [img]http://www.google.com/intl/en_ALL/images/logo.gif[/img]

    As noted in the URL section above you can wrap an image in a [url][/url] tag if you wish, e.g.

    [url=http://www.google.com/][img]http://www.google.com/intl/en_ALL/images/logo.gif[/img][/url]

    would generate:

    ' - ), - array( - 0 => 'Adding attachments into a post', - 1 => 'Attachments can now be placed in any part of a post by using the new [attachment=][/attachment] BBCode, if the attachments functionality has been enabled by a board administrator and if you are given the appropriate permissions to create attachments. Within the posting screen is a drop-down box (respectively a button) for placing attachments inline.' - ), - array( - 0 => '--', - 1 => 'Other matters' - ), - array( - 0 => 'Can I add my own tags?', - 1 => 'If you are an administrator on this board and have the proper permissions, you can add further BBCodes through the Custom BBCodes section.' - ) -); - -?> \ No newline at end of file diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php deleted file mode 100644 index 354d432d51..0000000000 --- a/phpBB/language/en/help_faq.php +++ /dev/null @@ -1,339 +0,0 @@ - '--', - 1 => 'Login and Registration Issues' - ), - array( - 0 => 'Why can’t I login?', - 1 => 'There are several reasons why this could occur. First, ensure your username and password are correct. If they are, contact the board owner to make sure you haven’t been banned. It is also possible the website owner has a configuration error on their end, and they would need to fix it.' - ), - array( - 0 => 'Why do I need to register at all?', - 1 => 'You may not have to, it is up to the administrator of the board as to whether you need to register in order to post messages. However; registration will give you access to additional features not available to guest users such as definable avatar images, private messaging, emailing of fellow users, usergroup subscription, etc. It only takes a few moments to register so it is recommended you do so.' - ), - array( - 0 => 'Why do I get logged off automatically?', - 1 => 'If you do not check the Log me in automatically box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means the board administrator has disabled this feature.' - ), - array( - 0 => 'How do I prevent my username appearing in the online user listings?', - 1 => 'Within your User Control Panel, under “Board preferencesâ€, you will find the option Hide your online status. Enable this option with Yes and you will only appear to the administrators, moderators and yourself. You will be counted as a hidden user.' - ), - array( - 0 => 'I’ve lost my password!', - 1 => 'Don’t panic! While your password cannot be retrieved, it can easily be reset. Visit the login page and click I’ve forgotten my password. Follow the instructions and you should be able to log in again shortly.' - ), - array( - 0 => 'I registered but cannot login!', - 1 => 'First, check your username and password. If they are correct, then one of two things may have happened. If COPPA support is enabled and you specified being under 13 years old during registration, you will have to follow the instructions you received. Some boards will also require new registrations to be activated, either by yourself or by an administrator before you can logon; this information was present during registration. If you were sent an e-mail, follow the instructions. If you did not receive an e-mail, you may have provided an incorrect e-mail address or the e-mail may have been picked up by a spam filer. If you are sure the e-mail address you provided is correct, try contacting an administrator.' - ), - array( - 0 => 'I registered in the past but cannot login any more?!', - 1 => 'Attempt to locate the e-mail sent to you when you first registered, check your username and password and try again. It is possible an administrator has deactivated or deleted your account for some reason. Also, many boards periodically remove users who have not posted for a long time to reduce the size of the database. If this has happened, try registering again and being more involved in discussions.' - ), - array( - 0 => 'What is COPPA?', - 1 => 'COPPA, or the Child Online Privacy and Protection Act of 1998, is a law in the United States requiring websites which can potentially collect information from minors under the age of 13 to have written parental consent or some other method of legal guardian acknowledgment, allowing the collection of personally identifiable information from a minor under the age of 13. If you are unsure if this applies to you as someone trying to register or to the website you are trying to register on, contact legal counsel for assistance. Please note that the phpBB Group cannot provide legal advice and is not a point of contact for legal concerns of any kind, except as outlined below.', - ), - array( - 0 => 'Why can’t I register?', - 1 => 'It is possible the website owner has banned your IP address or disallowed the username you are attempting to register. The website owner could have also disabled registration to prevent new visitors from signing up. Contact a board administrator for assistance.', - ), - array( - 0 => 'What does the “Delete all board cookies†do?', - 1 => '“Delete all board cookies†deletes the cookies created by phpBB which keep you authenticated and logged into the board. It also provides functions such as read tracking if they have been enabled by the board owner. If you are having login or logout problems, deleting board cookies may help.', - ), - array( - 0 => '--', - 1 => 'User Preferences and settings' - ), - array( - 0 => 'How do I change my settings?', - 1 => 'If you are a registered user, all your settings are stored in the board database. To alter them, visit your User Control Panel; a link can usually be found at the top of board pages. This system will allow you to change all your settings and preferences.' - ), - array( - 0 => 'The times are not correct!', - 1 => 'It is possible the time displayed is from a timezone different from the one you are in. If this is the case, visit your User Control Panel and change your timezone to match your particular area, e.g. London, Paris, New York, Sydney, etc. Please note that changing the timezone, like most settings, can only be done by registered users. If you are not registered, this is a good time to do so.' - ), - array( - 0 => 'I changed the timezone and the time is still wrong!', - 1 => 'If you are sure you have set the timezone and Summer Time/DST correctly and the time is still incorrect, then the time stored on the server clock is incorrect. Please notify an administrator to correct the problem.' - ), - array( - 0 => 'My language is not in the list!', - 1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking the board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the phpBB website (see link at the bottom of board pages).' - ), - array( - 0 => 'How do I show an image below my username?', - 1 => 'There are two images that may appear below a username when viewing posts. Depending on the used style, the first may be an image associated with your rank, generally in the form of stars, blocks or dots, indicating how many posts you have made or your status on the board. The second, usually a larger image, is known as an avatar and is generally unique or personal to each user. It is up to the board administrator to enable avatars and to choose the way in which avatars can be made available. If you are unable to use avatars, contact a board administrator and ask them for their reasons.' - ), - array( - 0 => 'What is my rank and how do I change it?', - 1 => 'Ranks, which appear below your username, indicate the number of posts you have made or identify certain users, e.g. moderators and administrators. In general, you cannot directly change the wording of any board ranks as they are set by the board administrator. Please do not abuse the board by posting unnecessarily just to increase your rank. Most boards will not tolerate this and the moderator or administrator will simply lower your post count.' - ), - array( - 0 => 'When I click the e-mail link for a user it asks me to login?', - 1 => 'Only registered users can send e-mail to other users via the built-in e-mail form, and only if the administrator has enabled this feature. This is to prevent malicious use of the e-mail system by anonymous users.' - ), - array( - 0 => '--', - 1 => 'Posting Issues' - ), - array( - 0 => 'How do I post a topic in a forum?', - 1 => 'To post a new topic in a forum, click the relevant button on either the forum or topic screens. You may need to register before you can post a message. A list of your permissions in each forum is available at the bottom of the forum and topic screens. Example: You can post new topics, You can vote in polls, etc.' - ), - array( - 0 => 'How do I edit or delete a post?', - 1 => 'Unless you are a board administrator or moderator, you can only edit or delete your own posts. You can edit a post by clicking the edit button for the relevant post, sometimes for only a limited time after the post was made. If someone has already replied to the post, you will find a small piece of text output below the post when you return to the topic which lists the number of times you edited it along with the date and time. This will only appear if someone has made a reply; it will not appear if a moderator or administrator edited the post, though they may leave a note as to why they’ve edited the post at their own digression. Please note that normal users cannot delete a post once someone has replied.' - ), - array( - 0 => 'How do I add a signature to my post?', - 1 => 'To add a signature to a post you must first create one via your User Control Panel. Once created, you can check the Add signature box on the posting form to add your signature. You can also add a signature by default to all your posts by checking the appropriate radio button in your profile. If you do so, you can still prevent a signature being added to individual posts by un-checking the add signature box within the posting form.' - ), - array( - 0 => 'How do I create a poll?', - 1 => 'When posting a new topic or editing the first post of a topic, click the “Poll creation†tab below the main posting form; if you cannot see this, you do not have appropriate permissions to create polls. Enter a title and at least two options in the appropriate fields, making sure each option is on a separate line in the textarea. You can also set the number of options users may select during voting under “Options per userâ€, a time limit in days for the poll (0 for infinite duration) and lastly the option to allow users to amend their votes.' - ), - array( - 0 => 'Why can’t I add more poll options?', - 1 => 'The limit for poll options is set by the board administrator. If you feel you need to add more options to your poll then the allowed amount, contact the board administrator.' - ), - array( - 0 => 'How do I edit or delete a poll?', - 1 => 'As with posts, polls can only be edited by the original poster, a moderator or an administrator. To edit a poll, click to edit the first post in the topic; this always has the poll associated with it. If no one has cast a vote, users can delete the poll or edit any poll option. However, if members have already placed votes, only moderators or administrators can edit or delete it. This prevents the poll’s options from being changed mid-way through a poll.' - ), - array( - 0 => 'Why can’t I access a forum?', - 1 => 'Some forums may be limited to certain users or groups. To view, read, post or perform another action you may need special permissions. Contact a moderator or board administrator to grant you access.' - ), - array( - 0 => 'Why can’t I add attachments?', - 1 => 'Attachment permissions are granted on a per forum, per group, or per user basis. The board administrator may not have allowed attachments to be added for the specific forum you are posting in, or perhaps only certain groups can post attachments. Contact the board administrator if you are unsure about why you are unable to add attachments.' - ), - array( - 0 => 'Why did I receive a warning?', - 1 => 'Each board administrator has their own set of rules for their site. If you have broken a rule, you may be issued a warning. Please note that this is the board administrator’s decision, and the phpBB Group has nothing to do with the warnings on the given site. Contact the board administrator if you are unsure about why you were issued a warning.' - ), - array( - 0 => 'How can I report posts to a moderator?', - 1 => 'If the board administrator has allowed it, you should see a button for reporting posts next to the post you wish to report. Clicking this will walk you through the steps necessary to report the post.' - ), - array( - 0 => 'What is the “Save†button for in topic posting?', - 1 => 'This allows you to save passages to be completed and submitted at a later date. To reload a saved passage, visit the User Control Panel.' - ), - array( - 0 => 'Why does my post need to be approved?', - 1 => 'The board administrator may have decided that posts in the forum you are posting to require review before submission. It is also possible that the administrator has placed you in a group of users whose posts require review before submission. Please contact the board administrator for further details.' - ), - array( - 0 => 'How do I bump my topic?', - 1 => 'By clicking the “Bump topic†link when you are viewing it, you can “bump†the topic to the top of the forum on the first page. However, if you do not see this, then topic bumping may be disabled or the time allowance between bumps has not yet been reached. It is also possible to bump the topic simply by replying to it, however, be sure to follow the board rules when doing so.' - ), - array( - 0 => '--', - 1 => 'Formatting and Topic Types' - ), - array( - 0 => 'What is BBCode?', - 1 => 'BBCode is a special implementation of HTML, offering great formatting control on particular objects in a post. The use of BBCode is granted by the administrator, but it can also be disabled on a per post basis from the posting form. BBCode itself is similar in style to HTML, but tags are enclosed in square brackets [ and ] rather than < and >. For more information on BBCode see the guide which can be accessed from the posting page.' - ), - array( - 0 => 'Can I use HTML?', - 1 => 'No. It is not possible to post HTML on this board and have it rendered as HTML. Most formatting which can be carried out using HTML can be applied using BBCode instead.' - ), - array( - 0 => 'What are Smilies?', - 1 => 'Smilies, or Emoticons, are small images which can be used to express a feeling using a short code, e.g. :) denotes happy, while :( denotes sad. The full list of emoticons can be seen in the posting form. Try not to overuse smilies, however, as they can quickly render a post unreadable and a moderator may edit them out or remove the post altogether. The board administrator may also have set a limit to the number of smilies you may use within a post.' - ), - array( - 0 => 'Can I post images?', - 1 => 'Yes, images can be shown in your posts. If the administrator has allowed attachments, you may be able to upload the image to the board. Otherwise, you must link to an image stored on a publicly accessible web server, e.g. http://www.example.com/my-picture.gif. You cannot link to pictures stored on your own PC (unless it is a publicly accessible server) nor images stored behind authentication mechanisms, e.g. hotmail or yahoo mailboxes, password protected sites, etc. To display the image use the BBCode [img] tag.' - ), - array( - 0 => 'What are global announcements?', - 1 => 'Global announcements contain important information and you should read them whenever possible. They will appear at the top of every forum and within your User Control Panel. Global announcement permissions are granted by the board administrator.' - ), - array( - 0 => 'What are announcements?', - 1 => 'Announcements often contain important information for the forum you are currently reading and you should read them whenever possible. Announcements appear at the top of every page in the forum to which they are posted. As with global announcements, announcement permissions are granted by the board administrator.' - ), - array( - 0 => 'What are sticky topics?', - 1 => 'Sticky topics within the forum appear below announcements and only on the first page. They are often quite important so you should read them whenever possible. As with announcements and global announcements, sticky topic permissions are granted by the board administrator.' - ), - array( - 0 => 'What are locked topics?', - 1 => 'Locked topics are topics where users can no longer reply and any poll it contained was automatically ended. Topics may be locked for many reasons and were set this way by either the forum moderator or board administrator. You may also be able to lock your own topics depending on the permissions you are granted by the board administrator.' - ), - array( - 0 => 'What are topic icons?', - 1 => 'Topic icons are author chosen images associated with posts to indicate their content. The ability to use topic icons depends on the permissions set by the board administrator.' - ), - array( - 0 => '--', - 1 => 'User Levels and Groups' - ), - array( - 0 => 'What are Administrators?', - 1 => 'Administrators are members assigned with the highest level of control over the entire board. These members can control all facets of board operation, including setting permissions, banning users, creating usergroups or moderators, etc., dependent upon the board founder and what permissions he or she has given the other administrators. They may also have full moderator capabilities in all forums, depending on the settings put forth by the board founder.' - ), - array( - 0 => 'What are Moderators?', - 1 => 'Moderators are individuals (or groups of individuals) who look after the forums from day to day. They have the authority to edit or delete posts and lock, unlock, move, delete and split topics in the forum they moderate. Generally, moderators are present to prevent users from going off-topic or posting abusive or offensive material.' - ), - array( - 0 => 'What are usergroups?', - 1 => 'Usergroups are groups of users that divide the community into manageable sections board administrators can work with. Each user can belong to several groups and each group can be assigned individual permissions. This provides an easy way for administrators to change permissions for many users at once, such as changing moderator permissions or granting users access to a private forum.' - ), - array( - 0 => 'Where are the usergroups and how do I join one?', - 1 => 'You can view all usergroups via the “Usergroups†link within your User Control Panel. If you would like to join one, proceed by clicking the appropriate button. Not all groups have open access, however. Some may require approval to join, some may be closed and some may even have hidden memberships. If the group is open, you can join it by clicking the appropriate button. If a group requires approval to join you may request to join by clicking the appropriate button. The user group leader will need to approve your request and may ask why you want to join the group. Please do not harass a group leader if they reject your request; they will have their reasons.' - ), - array( - 0 => 'How do I become a usergroup leader?', - 1 => 'A usergroup leader is usually assigned when usergroups are initially created by a board administrator. If you are interested in creating a usergroup, your first point of contact should be an administrator; try sending a private message.', - ), - array( - 0 => 'Why do some usergroups appear in a different colour?', - 1 => 'It is possible for the board administrator to assign a colour to the members of a usergroup to make it easy to identify the members of this group.' - ), - array( - 0 => 'What is a “Default usergroupâ€?', - 1 => 'If you are a member of more than one usergroup, your default is used to determine which group colour and group rank should be shown for you by default. The board administrator may grant you permission to change your default usergroup via your User Control Panel.' - ), - array( - 0 => 'What is “The team†link?', - 1 => 'This page provides you with a list of board staff, including board administrators and moderators and other details such as the forums they moderate.' - ), - array( - 0 => '--', - 1 => 'Private Messaging' - ), - array( - 0 => 'I cannot send private messages!', - 1 => 'There are three reasons for this; you are not registered and/or not logged on, the board administrator has disabled private messaging for the entire board, or the board administrator has prevented you from sending messages. Contact a board administrator for more information.' - ), - array( - 0 => 'I keep getting unwanted private messages!', - 1 => 'You can block a user from sending you private messages by using message rules within your User Control Panel. If you are receiving abusive private messages from a particular user, inform a board administrator; they have the power to prevent a user from sending private messages.' - ), - array( - 0 => 'I have received a spamming or abusive e-mail from someone on this board!', - 1 => 'We are sorry to hear that. The e-mail form feature of this board includes safeguards to try and track users who send such posts, so e-mail the board administrator with a full copy of the e-mail you received. It is very important that this includes the headers that contain the details of the user that sent the e-mail. The board administrator can then take action.' - ), - array( - 0 => '--', - 1 => 'Friends and Foes' - ), - array( - 0 => 'What are my Friends and Foes lists?', - 1 => 'You can use these lists to organise other members of the board. Members added to your friends list will be listed within your User Control Panel for quick access to see their online status and to send them private messages. Subject to template support, posts from these users may also be highlighted. If you add a user to your foes list, any posts they make will be hidden by default.' - ), - array( - 0 => 'How can I add / remove users to my Friends or Foes list?', - 1 => 'You can add users to your list in two ways. Within each user’s profile, there is a link to add them to either your Friend or Foe list. Alternatively, from your User Control Panel, you can directly add users by entering their member name. You may also remove users from your list using the same page.' - ), - array( - 0 => '--', - 1 => 'Searching the Forums' - ), - array( - 0 => 'How can I search a forum or forums?', - 1 => 'Enter a search term in the search box located on the index, forum or topic pages. Advanced search can be accessed by clicking the “Advance Search†link which is available on all pages on the forum. How to access the search may depend on the style used.' - ), - array( - 0 => 'Why does my search return no results?', - 1 => 'Your search was probably too vague and included many common terms which are not indexed by phpBB3. Be more specific and use the options available within Advanced search.' - ), - array( - 0 => 'Why does my search return a blank page!?', - 1 => 'Your search returned too many results for the webserver to handle. Use “Advanced search†and be more specific in the terms used and forums that are to be searched.' - ), - array( - 0 => 'How do I search for members?', - 1 => 'Visit to the “Members†page and click the “Find a member†link.' - ), - array( - 0 => 'How can I find my own posts and topics?', - 1 => 'Your own posts can be retrieved either by clicking the “Search user’s posts†within the User Control Panel or via your own profile page. To search for your topics, use the Advanced search page and fill in the various options appropriately.' - ), - array( - 0 => '--', - 1 => 'Topic Subscriptions and Bookmarks' - ), - array( - 0 => 'What is the difference between bookmarking and subscribing?', - 1 => 'Bookmarking in phpBB3 is much like bookmarking in your web browser. You aren’t alerted when there’s an update, but you can come back to the topic later. Subscribing, however, will notify you when there is an update to the topic or forum on the board via your preferred method or methods.' - ), - array( - 0 => 'How do I subscribe to specific forums or topics?', - 1 => 'To subscribe to a specific forum, click the “Subscribe forum†link upon entering the forum. To subscribe to a topic, reply to the topic with the subscribe checkbox checked or click the “Subscribe topic†link within the topic itself.' - ), - array( - 0 => 'How do I remove my subscriptions?', - 1 => 'To remove your subscriptions, go to your User Control Panel and follow the links to your subscriptions.' - ), - array( - 0 => '--', - 1 => 'Attachments' - ), - array( - 0 => 'What attachments are allowed on this board?', - 1 => 'Each board administrator can allow or disallow certain attachment types. If you are unsure what is allowed to be uploaded, contact the board administrator for assistance.' - ), - array( - 0 => 'How do I find all my attachments?', - 1 => 'To find your list of attachments that you have uploaded, go to your User Control Panel and follow the links to the attachments section.' - ), - array( - 0 => '--', - 1 => 'phpBB 3 Issues' - ), - array( - 0 => 'Who wrote this bulletin board?', - 1 => 'This software (in its unmodified form) is produced, released and is copyright phpBB Group. It is made available under the GNU General Public License and may be freely distributed. See the link for more details.' - ), - array( - 0 => 'Why isn’t X feature available?', - 1 => 'This software was written by and licensed through phpBB Group. If you believe a feature needs to be added, please visit the phpbb.com website and see what phpBB Group have to say. Please do not post feature requests to the board at phpbb.com, the group uses SourceForge to handle tasking of new features. Please read through the forums and see what, if any, our position may already be for a feature and then follow the procedure given there.' - ), - array( - 0 => 'Who do I contact about abusive and/or legal matters related to this board?', - 1 => 'Any of the administrators listed on the “The team†page should be an appropriate point of contact for your complaints. If this still gets no response then you should contact the owner of the domain (do a whois lookup) or, if this is running on a free service (e.g. Yahoo!, free.fr, f2s.com, etc.), the management or abuse department of that service. Please note that the phpBB Group has absolutely no jurisdiction and cannot in any way be held liable over how, where or by whom this board is used. Do not contact the phpBB Group in relation to any legal (cease and desist, liable, defamatory comment, etc.) matter not directly related to the phpBB.com website or the discrete software of phpBB itself. If you do e-mail phpBB Group about any third party use of this software then you should expect a terse response or no response at all.' - ) -); - -?> \ No newline at end of file diff --git a/phpBB/language/en/index.htm b/phpBB/language/en/index.htm deleted file mode 100644 index ee1f723a7d..0000000000 --- a/phpBB/language/en/index.htm +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php deleted file mode 100755 index 3f3eb7165b..0000000000 --- a/phpBB/language/en/install.php +++ /dev/null @@ -1,629 +0,0 @@ - 'Administrator configuration', - 'ADMIN_PASSWORD' => 'Administrator password', - 'ADMIN_PASSWORD_CONFIRM' => 'Confirm administrator password', - 'ADMIN_PASSWORD_EXPLAIN' => 'Please enter a password between 6 and 30 characters in length.', - 'ADMIN_TEST' => 'Check administrator settings', - 'ADMIN_USERNAME' => 'Administrator username', - 'ADMIN_USERNAME_EXPLAIN' => 'Please enter a username between 3 and 20 characters in length.', - 'APP_MAGICK' => 'Imagemagick support [ Attachments ]', - 'AUTHOR_NOTES' => 'Author notes
    » %s', - 'AVAILABLE' => 'Available', - 'AVAILABLE_CONVERTORS' => 'Available convertors', - - 'BEGIN_CONVERT' => 'Begin conversion', - 'BLANK_PREFIX_FOUND' => 'A scan of your tables has shown a valid installation using no table prefix.', - 'BOARD_NOT_INSTALLED' => 'No installation found', - 'BOARD_NOT_INSTALLED_EXPLAIN' => 'The phpBB Unified Convertor Framework requires a default installation of phpBB3 to function, please proceed by first installing phpBB3.', - - 'CATEGORY' => 'Category', - 'CACHE_STORE' => 'Cache type', - 'CACHE_STORE_EXPLAIN' => 'The physical location where data is cached, filesystem is preferred.', - 'CAT_CONVERT' => 'Convert', - 'CAT_INSTALL' => 'Install', - 'CAT_OVERVIEW' => 'Overview', - 'CAT_UPDATE' => 'Update', - 'CHANGE' => 'Change', - 'CHECK_TABLE_PREFIX' => 'Please check your table prefix and try again.', - 'CLEAN_VERIFY' => 'Cleaning up and verifying the final structure', - 'CLEANING_USERNAMES' => 'Cleaning usernames', - 'COLLIDING_CLEAN_USERNAME' => '%s is the clean username for:', - 'COLLIDING_USERNAMES_FOUND' => 'Colliding usernames were found on your old board. In order to complete the conversion please delete or rename these users so that there is only one user on your old board for each clean username.', - 'COLLIDING_USER' => '» user id: %d username: %s (%d posts)', - 'CONFIG_CONVERT' => 'Converting the configuration', - 'CONFIG_FILE_UNABLE_WRITE' => 'It was not possible to write the configuration file. Alternative methods for this file to be created are presented below.', - 'CONFIG_FILE_WRITTEN' => 'The configuration file has been written. You may now proceed to the next step of the installation.', - 'CONFIG_PHPBB_EMPTY' => 'The phpBB3 config variable for “%s†is empty.', - 'CONFIG_RETRY' => 'Retry', - 'CONTACT_EMAIL_CONFIRM' => 'Confirm contact e-mail', - 'CONTINUE_CONVERT' => 'Continue conversion', - 'CONTINUE_CONVERT_BODY' => 'A previous conversion attempt has been determined. You are now able to choose between starting a new conversion or continuing the conversion.', - 'CONTINUE_LAST' => 'Continue last statements', - 'CONTINUE_OLD_CONVERSION' => 'Continue previously started conversion', - 'CONVERT' => 'Convert', - 'CONVERT_COMPLETE' => 'Conversion completed', - 'CONVERT_COMPLETE_EXPLAIN' => 'You have now successfully converted your board to phpBB 3.0. You can now login and access your board. Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory. Remember that help on using phpBB is available online via the Documentation and the support forums.', - 'CONVERT_INTRO' => 'Welcome to the phpBB Unified Convertor Framework', - 'CONVERT_INTRO_BODY' => 'From here, you are able to import data from other (installed) board systems. The list below shows all the conversion modules currently available. If there is no convertor shown in this list for the board software you wish to convert from, please check our website where further conversion modules may be available for download.', - 'CONVERT_NEW_CONVERSION' => 'New conversion', - 'CONVERT_NOT_EXIST' => 'The specified convertor does not exist.', - 'CONVERT_OPTIONS' => 'Options', - 'CONVERT_SETTINGS_VERIFIED' => 'The information you entered has been verified. To start the conversion process, push the button below to begin.', - 'CONV_ERR_FATAL' => 'Fatal conversion error', - - 'CONV_ERROR_ATTACH_FTP_DIR' => 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.', - 'CONV_ERROR_CONFIG_EMPTY' => 'There is no configuration information available for the conversion.', - 'CONV_ERROR_FORUM_ACCESS' => 'Unable to get forum access information.', - 'CONV_ERROR_GET_CATEGORIES' => 'Unable to get categories.', - 'CONV_ERROR_GET_CONFIG' => 'Could not retrieve your board configuration.', - 'CONV_ERROR_COULD_NOT_READ' => 'Unable to access/read “%sâ€.', - 'CONV_ERROR_GROUP_ACCESS' => 'Unable to get group authentication information.', - 'CONV_ERROR_INCONSISTENT_GROUPS' => 'Inconsistency in groups table detected in add_bots() - you need to add all special groups if you do it manually.', - 'CONV_ERROR_INSERT_BOT' => 'Unable to insert bot into users table.', - 'CONV_ERROR_INSERT_BOTGROUP' => 'Unable to insert bot into bots table.', - 'CONV_ERROR_INSERT_USER_GROUP' => 'Unable to insert user into user_group table.', - 'CONV_ERROR_MESSAGE_PARSER' => 'Message parser error', - 'CONV_ERROR_NO_AVATAR_PATH' => 'Note to developer: you must specify $convertor[\'avatar_path\'] to use %s.', - 'CONV_ERROR_NO_FORUM_PATH' => 'The relative path to the source board has not been specified.', - 'CONV_ERROR_NO_GALLERY_PATH' => 'Note to developer: you must specify $convertor[\'avatar_gallery_path\'] to use %s.', - 'CONV_ERROR_NO_GROUP' => 'Group “%1$s†could not be found in %2$s.', - 'CONV_ERROR_NO_RANKS_PATH' => 'Note to developer: you must specify $convertor[\'ranks_path\'] to use %s.', - 'CONV_ERROR_NO_SMILIES_PATH' => 'Note to developer: you must specify $convertor[\'smilies_path\'] to use %s.', - 'CONV_ERROR_NO_UPLOAD_DIR' => 'Note to developer: you must specify $convertor[\'upload_path\'] to use %s.', - 'CONV_ERROR_PERM_SETTING' => 'Unable to insert/update permission setting.', - 'CONV_ERROR_PM_COUNT' => 'Unable to select folder pm count.', - 'CONV_ERROR_REPLACE_CATEGORY' => 'Unable to insert new forum replacing old category.', - 'CONV_ERROR_REPLACE_FORUM' => 'Unable to insert new forum replacing old forum.', - 'CONV_ERROR_USER_ACCESS' => 'Unable to get user authentication information.', - 'CONV_ERROR_WRONG_GROUP' => 'Wrong group “%1$s†defined in %2$s.', - 'CONV_OPTIONS_BODY' => 'This page collects the data required to access the source board. Enter the database details of your former board; the converter will not change anything in the database given below. The source board should be disabled to allow a consistent conversion.', - 'CONV_SAVED_MESSAGES' => 'Saved messages', - - 'COULD_NOT_COPY' => 'Could not copy file %1$s to %2$s

    Please check that the target directory exists and is writable by the webserver.', - 'COULD_NOT_FIND_PATH' => 'Could not find path to your former board. Please check your settings and try again.
    » %s was specified as the source path.', - - 'DBMS' => 'Database type', - 'DB_CONFIG' => 'Database configuration', - 'DB_CONNECTION' => 'Database connection', - 'DB_ERR_INSERT' => 'Error while processing INSERT query.', - 'DB_ERR_LAST' => 'Error while processing query_last.', - 'DB_ERR_QUERY_FIRST' => 'Error while executing query_first.', - 'DB_ERR_QUERY_FIRST_TABLE' => 'Error while executing query_first, %s (“%sâ€).', - 'DB_ERR_SELECT' => 'Error while running SELECT query.', - 'DB_HOST' => 'Database server hostname or DSN', - 'DB_HOST_EXPLAIN' => 'DSN stands for Data Source Name and is relevant only for ODBC installs.', - 'DB_NAME' => 'Database name', - 'DB_PASSWORD' => 'Database password', - 'DB_PORT' => 'Database server port', - 'DB_PORT_EXPLAIN' => 'Leave this blank unless you know the server operates on a non-standard port.', - 'DB_USERNAME' => 'Database username', - 'DB_TEST' => 'Test connection', - 'DEFAULT_LANG' => 'Default board language', - 'DEFAULT_PREFIX_IS' => 'The convertor was not able to find tables with the specified prefix. Please make sure you have entered the correct details for the board you are converting from. The default table prefix for %1$s is %2$s.', - 'DEV_NO_TEST_FILE' => 'No value has been specified for the test_file variable in the convertor. If you are a user of this convertor, you should not be seeing this error, please report this message to the convertor author. If you are a convertor author, you must specify the name of a file which exists in the source board to allow the path to it to be verified.', - 'DIRECTORIES_AND_FILES' => 'Directory and file setup', - 'DISABLE_KEYS' => 'Disabling keys', - 'DLL_DB2' => 'DB2', - 'DLL_FIREBIRD' => 'Firebird', - 'DLL_FTP' => 'Remote FTP support [ Installation ]', - 'DLL_GD' => 'GD graphics support [ Visual Confirmation ]', - 'DLL_MBSTRING' => 'Multi-byte character support', - 'DLL_MSSQL' => 'MSSQL Server 2000+', - 'DLL_MSSQL_2005' => 'MSSQL Server 2005+', - 'DLL_MSSQL_ODBC' => 'MSSQL Server 2000+ via ODBC', - 'DLL_MYSQL' => 'MySQL', - 'DLL_MYSQLI' => 'MySQL with MySQLi Extension', - 'DLL_ORACLE' => 'Oracle', - 'DLL_POSTGRES' => 'PostgreSQL 7.x/8.x', - 'DLL_SQLITE' => 'SQLite', - 'DLL_XML' => 'XML support [ Jabber ]', - 'DLL_ZLIB' => 'zlib compression support [ gz, .tar.gz, .zip ]', - 'DL_CONFIG' => 'Download config', - 'DL_CONFIG_EXPLAIN' => 'You may download the complete config.php to your own PC. You will then need to upload the file manually, replacing any existing config.php in your phpBB 3.0 root directory. Please remember to upload the file in ASCII format (see your FTP application documentation if you are unsure how to achieve this). When you have uploaded the config.php please click “Done†to move to the next stage.', - 'DL_DOWNLOAD' => 'Download', - 'DONE' => 'Done', - - 'ENABLE_KEYS' => 'Re-enabling keys. This can take a while.', - - 'FILES_OPTIONAL' => 'Optional files and directories', - 'FILES_OPTIONAL_EXPLAIN' => 'Optional - These files, directories or permission settings are not required. The installation system will attempt to use various techniques to create them if they do not exist or cannot be written to. However, the presence of these will speed installation.', - 'FILES_REQUIRED' => 'Files and Directories', - 'FILES_REQUIRED_EXPLAIN' => 'Required - In order to function correctly phpBB needs to be able to access or write to certain files or directories. If you see “Not Found†you need to create the relevant file or directory. If you see “Unwritable†you need to change the permissions on the file or directory to allow phpBB to write to it.', - 'FILLING_TABLE' => 'Filling table %s', - 'FILLING_TABLES' => 'Filling tables', - 'FINAL_STEP' => 'Process final step', - 'FORUM_ADDRESS' => 'Board address', - 'FORUM_ADDRESS_EXPLAIN' => 'This is the URL of your former board, for example http://www.example.com/phpBB2/. If an address is entered here and not left empty every instance of this address will be replaced by your new board address within messages, private messages and signatures.', - 'FORUM_PATH' => 'Board path', - 'FORUM_PATH_EXPLAIN' => 'This is the relative path on disk to your former board from the root of this phpBB3 installation.', - 'FOUND' => 'Found', - 'FTP_CONFIG' => 'Transfer config by FTP', - 'FTP_CONFIG_EXPLAIN' => 'phpBB has detected the presence of the FTP module on this server. You may attempt to install your config.php via this if you wish. You will need to supply the information listed below. Remember your username and password are those to your server! (ask your hosting provider for details if you are unsure what these are).', - 'FTP_PATH' => 'FTP path', - 'FTP_PATH_EXPLAIN' => 'This is the path from your root directory to that of phpBB, e.g. htdocs/phpBB3/.', - 'FTP_UPLOAD' => 'Upload', - - 'GPL' => 'General Public License', - - 'INITIAL_CONFIG' => 'Basic configuration', - 'INITIAL_CONFIG_EXPLAIN' => 'Now that install has determined your server can run phpBB you need to supply some specific information. If you do not know how to connect to your database please contact your hosting provider (in the first instance) or use the phpBB support forums. When entering data please ensure you check it thoroughly before continuing.', - 'INSTALL_CONGRATS' => 'Congratulations!', - 'INSTALL_CONGRATS_EXPLAIN' => ' -

    You have now successfully installed phpBB %1$s. From here, you have two options as to what to do with your newly installed phpBB3:

    -

    Convert an existing board to phpBB3

    -

    The phpBB Unified Convertor Framework supports the conversion of phpBB 2.0.x and other board systems to phpBB3. If you have an existing board that you wish to convert, please proceed on to the convertor.

    -

    Go live with your phpBB3!

    -

    Clicking the button below will take you to your Administration Control Panel (ACP). Take some time to examine the options available to you. Remember that help is available online via the Documentation and the support forums, see the README for further information.

    Please now delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.

    ', - 'INSTALL_INTRO' => 'Welcome to Installation', - - 'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB3 onto your server.

    In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:

    - -
      -
    • The Database Type - the database you will be using.
    • -
    • The Database server hostname or DSN - the address of the database server.
    • -
    • The Database server port - the port of the database server (most of the time this is not needed).
    • -
    • The Database name - the name of the database on the server.
    • -
    • The Database username and Database password - the login data to access the database.
    • -
    - -

    Note: if you are installing using SQLite, you should enter the full path to your database file in the DSN field and leave the username and password fields blank. For security reasons, you should make sure that the database file is not stored in a location accessible from the web.

    - -

    phpBB3 supports the following databases:

    -
      -
    • MySQL 4.1 or above (MySQLi supported)
    • -
    • PostgreSQL 7.3+
    • -
    • SQLite 2.8.2+
    • -
    • Firebird 2.0+
    • -
    • MS SQL Server 2000 or above (directly or via ODBC)
    • -
    • Oracle
    • -
    • IBM DB2
    • -
    - -

    Only those databases supported on your server will be displayed.', - 'INSTALL_INTRO_NEXT' => 'To commence the installation, please press the button below.', - 'INSTALL_LOGIN' => 'Login', - 'INSTALL_NEXT' => 'Next stage', - 'INSTALL_NEXT_FAIL' => 'Some tests failed and you should correct these problems before proceeding to the next stage. Failure to do so may result in an incomplete installation.', - 'INSTALL_NEXT_PASS' => 'All the basic tests have been passed and you may proceed to the next stage of installation. If you have changed any permissions, modules, etc. and wish to re-test you can do so if you wish.', - 'INSTALL_PANEL' => 'Installation Panel', - 'INSTALL_SEND_CONFIG' => 'Unfortunately phpBB could not write the configuration information directly to your config.php. This may be because the file does not exist or is not writable. A number of options will be listed below enabling you to complete installation of config.php.', - 'INSTALL_START' => 'Start install', - 'INSTALL_TEST' => 'Test again', - 'INST_ERR' => 'Installation error', - 'INST_ERR_DB_CONNECT' => 'Could not connect to the database, see error message below.', - 'INST_ERR_DB_FORUM_PATH' => 'The database file specified is within your board directory tree. You should put this file in a non web-accessible location.', - 'INST_ERR_DB_NO_ERROR' => 'No error message given.', - 'INST_ERR_DB_NO_MYSQL' => 'The version of MySQL installed on the target server must be at least 4.1, phpBB 3.1 cannot be installed on an older version.', - 'INST_ERR_DB_NO_MYSQLI' => 'The version of MySQL installed on the target server must be at least 4.1, phpBB 3.1 cannot be installed on an older version.', - 'INST_ERR_DB_NO_SQLITE' => 'The version of the SQLite extension you have installed is too old, it must be upgraded to at least 2.8.2.', - 'INST_ERR_DB_NO_ORACLE' => 'The version of Oracle installed on the target server must be at least 9.2, phpBB 3.1 cannot be installed on an older version.', - 'INST_ERR_DB_NO_ORACLE_NLS' => 'You must configure Oracle so that the NLS_CHARACTERSET parameter is set to ALU32UTF8.', - 'INST_ERR_DB_NO_FIREBIRD' => 'The version of Firebird installed on this machine is older than 2.0, please upgrade to a newer version.', - 'INST_ERR_DB_NO_FIREBIRD_PS'=> 'The database you selected for Firebird has a page size less than 8192, it must be at least 8192.', - 'INST_ERR_DB_NO_POSTGRES' => 'The database you have selected was not created in UNICODE or UTF8 encoding. Try installing with a database in UNICODE or UTF8 encoding.', - 'INST_ERR_DB_NO_NAME' => 'No database name specified.', - 'INST_ERR_EMAIL_INVALID' => 'The e-mail address you entered is invalid.', - 'INST_ERR_EMAIL_MISMATCH' => 'The e-mails you entered did not match.', - 'INST_ERR_FATAL' => 'Fatal installation error', - 'INST_ERR_FATAL_DB' => 'A fatal and unrecoverable database error has occurred. This may be because the specified user does not have appropriate permissions to CREATE TABLES or INSERT data, etc. Further information may be given below. Please contact your hosting provider in the first instance or the support forums of phpBB for further assistance.', - 'INST_ERR_FTP_PATH' => 'Could not change to the given directory, please check the path.', - 'INST_ERR_FTP_LOGIN' => 'Could not login to FTP server, check your username and password.', - 'INST_ERR_MISSING_DATA' => 'You must fill out all fields in this block.', - 'INST_ERR_NO_DB' => 'Cannot load the PHP module for the selected database type.', - 'INST_ERR_PASSWORD_MISMATCH' => 'The passwords you entered did not match.', - 'INST_ERR_PASSWORD_TOO_LONG' => 'The password you entered is too long. The maximum length is 30 characters.', - 'INST_ERR_PASSWORD_TOO_SHORT' => 'The password you entered is too short. The minimum length is 6 characters.', - 'INST_ERR_PREFIX' => 'Tables with the specified prefix already exist, please choose an alternative.', - 'INST_ERR_PREFIX_INVALID' => 'The table prefix you have specified is invalid for your database. Please try another, removing characters such as the hyphen.', - 'INST_ERR_PREFIX_TOO_LONG' => 'The table prefix you have specified is too long. The maximum length is %d characters.', - 'INST_ERR_USER_TOO_LONG' => 'The username you entered is too long. The maximum length is 20 characters.', - 'INST_ERR_USER_TOO_SHORT' => 'The username you entered is too short. The minimum length is 3 characters.', - 'INVALID_PRIMARY_KEY' => 'Invalid primary key : %s', - - 'LONG_SCRIPT_EXECUTION' => 'Please note that this can take a while... Please do not stop the script.', - - // mbstring - 'MBSTRING_CHECK' => 'mbstring extension check', - 'MBSTRING_CHECK_EXPLAIN' => 'Required - mbstring is a PHP extension that provides multibyte string functions. Certain features of mbstring are not compatible with phpBB and must be disabled.', - 'MBSTRING_FUNC_OVERLOAD' => 'Function overloading', - 'MBSTRING_FUNC_OVERLOAD_EXPLAIN' => 'mbstring.func_overload must be set to either 0 or 4.', - 'MBSTRING_ENCODING_TRANSLATION' => 'Transparent character encoding', - 'MBSTRING_ENCODING_TRANSLATION_EXPLAIN' => 'mbstring.encoding_translation must be set to 0.', - 'MBSTRING_HTTP_INPUT' => 'HTTP input character conversion', - 'MBSTRING_HTTP_INPUT_EXPLAIN' => 'mbstring.http_input must be set to pass.', - 'MBSTRING_HTTP_OUTPUT' => 'HTTP output character conversion', - 'MBSTRING_HTTP_OUTPUT_EXPLAIN' => 'mbstring.http_output must be set to pass.', - - 'MAKE_FOLDER_WRITABLE' => 'Please make sure that this folder exists and is writable by the webserver then try again:
    »%s.', - 'MAKE_FOLDERS_WRITABLE' => 'Please make sure that these folders exist and are writable by the webserver then try again:
    »%s.', - - 'NAMING_CONFLICT' => 'Naming conflict: %s and %s are both aliases

    %s', - 'NEXT_STEP' => 'Proceed to next step', - 'NOT_FOUND' => 'Cannot find', - 'NOT_UNDERSTAND' => 'Could not understand %s #%d, table %s (“%sâ€)', - 'NO_CONVERTORS' => 'No convertors are available for use.', - 'NO_CONVERT_SPECIFIED' => 'No convertor specified.', - 'NO_LOCATION' => 'Cannot determine location. If you know Imagemagick is installed, you may specify the location later within your administration control panel', - 'NO_TABLES_FOUND' => 'No tables found.', - - 'OVERVIEW_BODY' => 'Welcome to phpBB3!

    phpBBâ„¢ is the most widely used open source bulletin board solution in the world. phpBB3 is the latest installment in a seven year long package lineup. Like its predecessors, phpBB3 is feature-rich, user-friendly, and fully supported by the phpBB Team. phpBB3 greatly improves on what made phpBB2 popular, and adds commonly requested features that were not present in previous versions. We hope it exceeds your expectations.

    This installation system will guide you through installing phpBB3, updating to the latest version of phpBB3 from past releases, as well as converting to phpBB3 from a different discussion board system (including phpBB2). For more information, we encourage you to read the installation guide.

    To read the phpBB3 license or learn about obtaining support and our stance on it, please select the respective options from the side menu. To continue, please select the appropriate tab above.', - - 'PCRE_UTF_SUPPORT' => 'PCRE UTF-8 support', - 'PCRE_UTF_SUPPORT_EXPLAIN' => 'phpBB will not run if your PHP installation is not compiled with UTF-8 support in the PCRE extension.', - 'PCRE_UNI_PROP_SUPPORT' => 'PCRE Unicode Property support', - 'PCRE_UNI_PROP_SUPPORT_EXPLAIN' => 'phpBB will not run if your PHP installation is not compiled with Unicode Property support in the PCRE extension.', - 'PHP_GETIMAGESIZE_SUPPORT' => 'PHP function getimagesize() is available', - 'PHP_GETIMAGESIZE_SUPPORT_EXPLAIN' => 'Required - In order for phpBB to function correctly, the getimagesize function needs to be available.', - 'PHP_OPTIONAL_MODULE' => 'Optional modules', - 'PHP_OPTIONAL_MODULE_EXPLAIN' => 'Optional - These modules or applications are optional. However, if they are available they will enable extra features.', - 'PHP_SUPPORTED_DB' => 'Supported databases', - 'PHP_SUPPORTED_DB_EXPLAIN' => 'Required - You must have support for at least one compatible database within PHP. If no database modules are shown as available you should contact your hosting provider or review the relevant PHP installation documentation for advice.', - 'PHP_REGISTER_GLOBALS' => 'PHP setting register_globals is disabled', - 'PHP_REGISTER_GLOBALS_EXPLAIN' => 'phpBB will still run if this setting is enabled, but if possible, it is recommended that register_globals is disabled on your PHP install for security reasons.', - 'PHP_SAFE_MODE' => 'Safe mode', - 'PHP_SETTINGS' => 'PHP version and settings', - 'PHP_SETTINGS_EXPLAIN' => 'Required - You must be running at least version 5.1.0 of PHP in order to install phpBB. If safe mode is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.', - 'PHP_URL_FOPEN_SUPPORT' => 'PHP setting allow_url_fopen is enabled', - 'PHP_URL_FOPEN_SUPPORT_EXPLAIN' => 'Optional - This setting is optional, however certain phpBB functions like off-site avatars will not work properly without it. ', - 'PHP_VERSION_REQD' => 'PHP version >= 5.1.0', - 'POST_ID' => 'Post ID', - 'PREFIX_FOUND' => 'A scan of your tables has shown a valid installation using %s as table prefix.', - 'PREPROCESS_STEP' => 'Executing pre-processing functions/queries', - 'PRE_CONVERT_COMPLETE' => 'All pre-conversion steps have successfully been completed. You may now begin the actual conversion process. Please note that you may have to manually do and adjust several things. After conversion, especially check the permissions assigned, rebuild your search index which is not converted and also make sure files got copied correctly, for example avatars and smilies.', - 'PROCESS_LAST' => 'Processing last statements', - - 'REFRESH_PAGE' => 'Refresh page to continue conversion', - 'REFRESH_PAGE_EXPLAIN' => 'If set to yes, the convertor will refresh the page to continue the conversion after having finished a step. If this is your first conversion for testing purposes and to determine any errors in advance, we suggest to set this to No.', - 'REQUIREMENTS_TITLE' => 'Installation compatibility', - 'REQUIREMENTS_EXPLAIN' => 'Before proceeding with the full installation phpBB will carry out some tests on your server configuration and files to ensure that you are able to install and run phpBB. Please ensure you read through the results thoroughly and do not proceed until all the required tests are passed. If you wish to use any of the features depending on the optional tests, you should ensure that these tests are passed also.', - 'RETRY_WRITE' => 'Retry writing config', - 'RETRY_WRITE_EXPLAIN' => 'If you wish you can change the permissions on config.php to allow phpBB to write to it. Should you wish to do that you can click Retry below to try again. Remember to return the permissions on config.php after phpBB has finished installation.', - - 'SCRIPT_PATH' => 'Script path', - 'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB is located relative to the domain name, e.g. /phpBB3.', - 'SELECT_LANG' => 'Select language', - 'SERVER_CONFIG' => 'Server configuration', - 'SEARCH_INDEX_UNCONVERTED' => 'Search index was not converted', - 'SEARCH_INDEX_UNCONVERTED_EXPLAIN' => 'Your old search index was not converted. Searching will always yield an empty result. To create a new search index go to the Administration Control Panel, select Maintenance and then choose Search index from the submenu.', - 'SOFTWARE' => 'Board software', - 'SPECIFY_OPTIONS' => 'Specify conversion options', - 'STAGE_ADMINISTRATOR' => 'Administrator details', - 'STAGE_ADVANCED' => 'Advanced settings', - 'STAGE_ADVANCED_EXPLAIN' => 'The settings on this page are only necessary to set if you know that you require something different from the default. If you are unsure, just proceed to the next page, as these settings can be altered from the Administration Control Panel later.', - 'STAGE_CONFIG_FILE' => 'Configuration file', - 'STAGE_CREATE_TABLE' => 'Create database tables', - 'STAGE_CREATE_TABLE_EXPLAIN' => 'The database tables used by phpBB 3.0 have been created and populated with some initial data. Proceed to the next screen to finish installing phpBB.', - 'STAGE_DATABASE' => 'Database settings', - 'STAGE_FINAL' => 'Final stage', - 'STAGE_INTRO' => 'Introduction', - 'STAGE_IN_PROGRESS' => 'Conversion in progress', - 'STAGE_REQUIREMENTS' => 'Requirements', - 'STAGE_SETTINGS' => 'Settings', - 'STARTING_CONVERT' => 'Starting conversion process', - 'STEP_PERCENT_COMPLETED' => 'Step %d of %d', - 'SUB_INTRO' => 'Introduction', - 'SUB_LICENSE' => 'License', - 'SUB_SUPPORT' => 'Support', - 'SUCCESSFUL_CONNECT' => 'Successful connection', - 'SUPPORT_BODY' => 'Full support will be provided for the current stable release of phpBB3, free of charge. This includes:

    • installation
    • configuration
    • technical questions
    • problems relating to potential bugs in the software
    • updating from Release Candidate (RC) versions to the latest stable version
    • converting from phpBB 2.0.x to phpBB3
    • converting from other discussion board software to phpBB3 (please see the Convertors Forum)

    We encourage users still running beta versions of phpBB3 to replace their installation with a fresh copy of the latest version.

    MODs / Styles

    For issues relating to MODs, please post in the appropriate Modifications Forum.
    For issues relating to styles, templates and imagesets, please post in the appropriate Styles Forum.

    If your question relates to a specific package, please post directly in the topic dedicated to the package.

    Obtaining Support

    The phpBB Welcome Package
    Support Section
    Quick Start Guide

    To ensure you stay up to date with the latest news and releases, why not subscribe to our mailing list?

    ', - 'SYNC_FORUMS' => 'Starting to synchronise forums', - 'SYNC_POST_COUNT' => 'Synchronising post_counts', - 'SYNC_POST_COUNT_ID' => 'Synchronising post_counts from entry %1$s to %2$s.', - 'SYNC_TOPICS' => 'Starting to synchronise topics', - 'SYNC_TOPIC_ID' => 'Synchronising topics from topic_id %1$s to %2$s.', - - 'TABLES_MISSING' => 'Could not find these tables
    » %s.', - 'TABLE_PREFIX' => 'Prefix for tables in database', - 'TABLE_PREFIX_SAME' => 'The table prefix needs to be the one used by the software you are converting from.
    » Specified table prefix was %s.', - 'TESTS_PASSED' => 'Tests passed', - 'TESTS_FAILED' => 'Tests failed', - - 'UNABLE_WRITE_LOCK' => 'Unable to write lock file.', - 'UNAVAILABLE' => 'Unavailable', - 'UNWRITABLE' => 'Unwritable', - 'UPDATE_TOPICS_POSTED' => 'Generating topics posted information', - 'UPDATE_TOPICS_POSTED_ERR' => 'An error occured while generating topics posted information. You can retry this step in the ACP after the conversion process is completed.', - 'VERIFY_OPTIONS' => 'Verifying conversion options', - 'VERSION' => 'Version', - - 'WELCOME_INSTALL' => 'Welcome to phpBB3 Installation', - 'WRITABLE' => 'Writable', -)); - -// Updater -$lang = array_merge($lang, array( - 'ALL_FILES_UP_TO_DATE' => 'All files are up to date with the latest phpBB version. You should now login to your board and check if everything is working fine. Do not forget to delete, rename or move your install directory!', - 'ARCHIVE_FILE' => 'Source file within archive', - - 'BACK' => 'Back', - 'BINARY_FILE' => 'Binary file', - 'BOT' => 'Spider/Robot', - - 'CHANGE_CLEAN_NAMES' => 'The method used to make sure a username is not used by multiple users has been changed. There are some users which have the same name when compared with the new method. You have to delete or rename these users to make sure that each name is only used by one user before you can proceed.', - 'CHECK_FILES' => 'Check files', - 'CHECK_FILES_AGAIN' => 'Check files again', - 'CHECK_FILES_EXPLAIN' => 'Within the next step all files will be checked against the update files - this can take a while if this is the first file check.', - 'CHECK_FILES_UP_TO_DATE' => 'According to your database your version is up to date. You may want to proceed with the file check to make sure all files are really up to date with the latest phpBB version.', - 'CHECK_UPDATE_DATABASE' => 'Continue update process', - 'COLLECTED_INFORMATION' => 'File information', - 'COLLECTED_INFORMATION_EXPLAIN' => 'The list below shows information about the files needing an update. Please read the information in front of every status block to see what they mean and what you may need to do to perform a successful update.', - 'COLLECTING_FILE_DIFFS' => 'Collecting file differences', - 'COMPLETE_LOGIN_TO_BOARD' => 'You should now login to your board and check if everything is working fine. Do not forget to delete, rename or move your install directory!', - 'CONTINUE_UPDATE_NOW' => 'Continue the update process now', - 'CURRENT_FILE' => 'Beginning of current original file', - 'CURRENT_VERSION' => 'Current version', - - 'DATABASE_TYPE' => 'Database type', - 'DATABASE_UPDATE_INFO_OLD' => 'The database update file within the install directory is outdated. Please make sure you uploaded the correct version of the file.', - 'DELETE_USER_REMOVE' => 'Delete user and remove posts', - 'DELETE_USER_RETAIN' => 'Delete user but keep posts', - 'DESTINATION' => 'Destination file', - 'DIFF_INLINE' => 'Inline', - 'DIFF_RAW' => 'Raw unified diff', - 'DIFF_SEP_EXPLAIN' => 'End of current original file / Beginning of new updated file', - 'DIFF_SIDE_BY_SIDE' => 'Side by Side', - 'DIFF_UNIFIED' => 'Unified diff', - 'DO_NOT_UPDATE' => 'Do not update this file', - 'DONE' => 'Done', - 'DOWNLOAD' => 'Download', - 'DOWNLOAD_AS' => 'Download as', - 'DOWNLOAD_UPDATE_METHOD' => 'Download modified files archive', - 'DOWNLOAD_UPDATE_METHOD_EXPLAIN' => 'Once downloaded you should unpack the archive. You will find the modified files you need to upload to your phpBB root directory within it. Please upload the files to their respective locations then. After you have uploaded all files, please check the files again with the other button below.', - - 'ERROR' => 'Error', - 'EDIT_USERNAME' => 'Edit username', - - 'FILE_ALREADY_UP_TO_DATE' => 'File is already up to date.', - 'FILE_DIFF_NOT_ALLOWED' => 'File not allowed to be diffed.', - 'FILE_USED' => 'Information used from', // Single file - 'FILES_CONFLICT' => 'Conflict files', - 'FILES_CONFLICT_EXPLAIN' => 'The following files are modified and do not represent the original files from the old version. phpBB determined that these files create conflicts if they are tried to be merged. Please investigate the conflicts and try to manually resolve them or continue the update choosing the preferred merging method. If you resolve the conflicts manually check the files again after you modified them. You are also able to choose between the preferred merge method for every file. The first one will result in a file where the conflicting lines from your old file will be lost, the other one will result in loosing the changes from the newer file.', - 'FILES_MODIFIED' => 'Modified files', - 'FILES_MODIFIED_EXPLAIN' => 'The following files are modified and do not represent the original files from the old version. The updated file will be a merge between your modifications and the new file.', - 'FILES_NEW' => 'New files', - 'FILES_NEW_EXPLAIN' => 'The following files currently do not exist within your installation. These files will be added to your installation.', - 'FILES_NEW_CONFLICT' => 'New conflicting files', - 'FILES_NEW_CONFLICT_EXPLAIN' => 'The following files are new within the latest version but it has been determined that there is already a file with the same name within the same position. This file will be overwritten by the new file.', - 'FILES_NOT_MODIFIED' => 'Not modified files', - 'FILES_NOT_MODIFIED_EXPLAIN' => 'The following files are not modified and represent the original phpBB files from the version you want to update from.', - 'FILES_UP_TO_DATE' => 'Already updated files', - 'FILES_UP_TO_DATE_EXPLAIN' => 'The following files are already up to date and do not need to be updated.', - 'FTP_SETTINGS' => 'FTP settings', - 'FTP_UPDATE_METHOD' => 'FTP upload', - - 'INCOMPATIBLE_UPDATE_FILES' => 'The update files found are incompatible with your installed version. Your installed version is %1$s and the update file is for updating phpBB %2$s to %3$s.', - 'INCOMPLETE_UPDATE_FILES' => 'The update files are incomplete.', - 'INLINE_UPDATE_SUCCESSFUL' => 'The database update was successful. Now you need to continue the update process.', - - 'KEEP_OLD_NAME' => 'Keep username', - - 'LATEST_VERSION' => 'Latest version', - 'LINE' => 'Line', - 'LINE_ADDED' => 'Added', - 'LINE_MODIFIED' => 'Modified', - 'LINE_REMOVED' => 'Removed', - 'LINE_UNMODIFIED' => 'Unmodified', - 'LOGIN_UPDATE_EXPLAIN' => 'In order to update your installation you need to login first.', - - 'MAPPING_FILE_STRUCTURE' => 'To ease the upload here are the file locations which map your phpBB installation.', - - 'MERGE_MODIFICATIONS_OPTION' => 'Merge modifications', - - 'MERGE_NO_MERGE_NEW_OPTION' => 'Do not merge - use new file', - 'MERGE_NO_MERGE_MOD_OPTION' => 'Do not merge - use currently installed file', - 'MERGE_MOD_FILE_OPTION' => 'Merge differences and use modified code within conflicting block', - 'MERGE_NEW_FILE_OPTION' => 'Merge differences and use new file code within conflicting block', - 'MERGE_SELECT_ERROR' => 'Conflicting file merge modes are not correctly selected.', - 'MERGING_FILES' => 'Merging differences', - 'MERGING_FILES_EXPLAIN' => 'Currently collecting final file changes.

    Please wait until phpBB has completed all operations on changed files.', - - 'NEW_FILE' => 'End of new updated file', - 'NEW_USERNAME' => 'New username', - 'NO_AUTH_UPDATE' => 'Not authorised to update', - 'NO_ERRORS' => 'No errors', - 'NO_UPDATE_FILES' => 'Not updating the following files', - 'NO_UPDATE_FILES_EXPLAIN' => 'The following files are new or modified but the directory they normally reside in could not be found on your installation. If this list contains files to other directories than language/ or styles/ than you may have modified your directory structure and the update may be incomplete.', - 'NO_UPDATE_FILES_OUTDATED' => 'No valid update directory was found, please make sure you uploaded the relevant files.

    Your installation does not seem to be up to date. Updates are available for your version of phpBB %1$s, please visit http://www.phpbb.com/downloads/ to obtain the correct package to update from Version %2$s to Version %3$s.', - 'NO_UPDATE_FILES_UP_TO_DATE' => 'Your version is up to date. There is no need to run the update tool. If you want to make an integrity check on your files make sure you uploaded the correct update files.', - 'NO_UPDATE_INFO' => 'Update file information could not be found.', - 'NO_UPDATES_REQUIRED' => 'No updates required', - 'NO_VISIBLE_CHANGES' => 'No visible changes', - 'NOTICE' => 'Notice', - 'NUM_CONFLICTS' => 'Number of conflicts', - 'NUMBER_OF_FILES_COLLECTED' => 'Currently differences of %1$d of %2$d files have been checked.
    Please wait until all files are checked.', - - 'OLD_UPDATE_FILES' => 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.', - - 'PACKAGE_UPDATES_TO' => 'Current package updates to version', - 'PERFORM_DATABASE_UPDATE' => 'Perform database update', - 'PERFORM_DATABASE_UPDATE_EXPLAIN' => 'Below you will find a button to the database update script. The database update can take a while, so please do not stop the execution if it seems to hang. After the database update has been performed just follow the instructions to continue the update process.', - 'PREVIOUS_VERSION' => 'Previous version', - 'PROGRESS' => 'Progress', - - 'RESULT' => 'Result', - 'RUN_DATABASE_SCRIPT' => 'Update my database now', - - 'SELECT_DIFF_MODE' => 'Select diff mode', - 'SELECT_DOWNLOAD_FORMAT' => 'Select download archive format', - 'SELECT_FTP_SETTINGS' => 'Select FTP settings', - 'SHOW_DIFF_CONFLICT' => 'Show differences/conflicts', - 'SHOW_DIFF_FINAL' => 'Show resulting file', - 'SHOW_DIFF_MODIFIED' => 'Show merged differences', - 'SHOW_DIFF_NEW' => 'Show file contents', - 'SHOW_DIFF_NEW_CONFLICT' => 'Show differences', - 'SHOW_DIFF_NOT_MODIFIED' => 'Show differences', - 'SOME_QUERIES_FAILED' => 'Some queries failed, the statements and errors are listing below.', - 'SQL' => 'SQL', - 'SQL_FAILURE_EXPLAIN' => 'This is probably nothing to worry about, update will continue. Should this fail to complete you may need to seek help at our support forums. See README for details on how to obtain advice.', - 'STAGE_FILE_CHECK' => 'Check files', - 'STAGE_UPDATE_DB' => 'Update database', - 'STAGE_UPDATE_FILES' => 'Update files', - 'STAGE_VERSION_CHECK' => 'Version check', - 'STATUS_CONFLICT' => 'Modified file producing conflicts', - 'STATUS_MODIFIED' => 'Modified file', - 'STATUS_NEW' => 'New file', - 'STATUS_NEW_CONFLICT' => 'Conflicting new file', - 'STATUS_NOT_MODIFIED' => 'Not modified file', - 'STATUS_UP_TO_DATE' => 'Already updated file', - - 'TOGGLE_DISPLAY' => 'View/Hide file list', - - 'UPDATE_COMPLETED' => 'Update completed', - 'UPDATE_DATABASE' => 'Update database', - 'UPDATE_DATABASE_EXPLAIN' => 'Within the next step the database will be updated.', - 'UPDATE_DATABASE_SCHEMA' => 'Updating database schema', - 'UPDATE_FILES' => 'Update files', - 'UPDATE_FILES_NOTICE' => 'Please make sure you have updated your board files too, this file is only updating your database.', - 'UPDATE_INSTALLATION' => 'Update phpBB installation', - 'UPDATE_INSTALLATION_EXPLAIN' => 'With this option, it is possible to update your phpBB installation to the latest version.
    During the process all of your files will be checked for their integrity. You are able to review all differences and files before the update.

    The file update itself can be done in two different ways.

    Manual Update

    With this update you only download your personal set of changed files to make sure you do not lose your file modifications you may have done. After you downloaded this package you need to manually upload the files to their correct position under your phpBB root directory. Once done, you are able to do the file check stage again to see if you moved the files to their correct location.

    Automatic Update with FTP

    This method is similar to the first one but without the need to download the changed files and uploading them on your own. This will be done for you. In order to use this method you need to know your FTP login details since you will be asked for them. Once finished you will be redirected to the file check again to make sure everything got updated correctly.

    ', - 'UPDATE_INSTRUCTIONS' => ' - -

    Release announcement

    - -

    Please read the release announcement for the latest version before you continue your update process, it may contain useful information. It also contains full download links as well as the change log.

    - -
    - -

    How to update your installation with the Automatic Update Package

    - -

    The recommended way of updating your installation listed here is only valid for the automatic update package. You are also able to update your installation using the methods listed within the INSTALL.html document. The steps for updating phpBB3 automatically are:

    - -
      -
    • Go to the phpBB.com downloads page and download the "Automatic Update Package" archive.

    • -
    • Unpack the archive.

    • -
    • Upload the complete uncompressed install folder to your phpBB root directory (where your config.php file is).

    • -
    - -

    Once uploaded your board will be offline for normal users due to the install directory you uploaded now present.

    - Now start the update process by pointing your browser to the install folder.
    -
    - You will then be guided through the update process. You will be notified once the update is complete. -

    - ', - 'UPDATE_INSTRUCTIONS_INCOMPLETE' => ' - -

    Incomplete update detected

    - -

    phpBB detected an incomplete automatic update. Please make sure you followed every step within the automatic update tool. Below you will find the link again, or go directly to your install directory.

    - ', - 'UPDATE_METHOD' => 'Update method', - 'UPDATE_METHOD_EXPLAIN' => 'You are now able to choose your preferred update method. Using the FTP upload will present you with a form you need to enter your FTP account details into. With this method the files will be automatically moved to the new location and backups of the old files being created by appending .bak to the filename. If you choose to download the modified files you are able to unpack and upload them to their correct location manually later.', - 'UPDATE_REQUIRES_FILE' => 'The updater requires that the following file is present: %s', - 'UPDATE_SUCCESS' => 'Update was successful', - 'UPDATE_SUCCESS_EXPLAIN' => 'Successfully updated all files. The next step involves checking all files again to make sure the files got updated correctly.', - 'UPDATE_VERSION_OPTIMIZE' => 'Updating version and optimising tables', - 'UPDATING_DATA' => 'Updating data', - 'UPDATING_TO_LATEST_STABLE' => 'Updating database to latest stable release', - 'UPDATED_VERSION' => 'Updated version', - 'UPLOAD_METHOD' => 'Upload method', - - 'UPDATE_DB_SUCCESS' => 'Database update was successful.', - 'USER_ACTIVE' => 'Active user', - 'USER_INACTIVE' => 'Inactive user', - - 'VERSION_CHECK' => 'Version check', - 'VERSION_CHECK_EXPLAIN' => 'Checks to see if the version of phpBB you are currently running is up to date.', - 'VERSION_NOT_UP_TO_DATE' => 'Your version of phpBB is not up to date. Please continue the update process.', - 'VERSION_NOT_UP_TO_DATE_ACP'=> 'Your version of phpBB is not up to date.
    Below you will find a link to the release announcement for the latest version as well as instructions on how to perform the update.', - 'VERSION_UP_TO_DATE' => 'Your installation is up to date, no updates are available for your version of phpBB. You may want to continue anyway to perform a file validity check.', - 'VERSION_UP_TO_DATE_ACP' => 'Your installation is up to date, no updates are available for your version of phpBB. You do not need to update your installation.', - 'VIEWING_FILE_CONTENTS' => 'Viewing file contents', - 'VIEWING_FILE_DIFF' => 'Viewing file differences', - - 'WRONG_INFO_FILE_FORMAT' => 'Wrong info file format', -)); - -// Default database schema entries... -$lang = array_merge($lang, array( - 'CONFIG_BOARD_EMAIL_SIG' => 'Thanks, The Management', - 'CONFIG_SITE_DESC' => 'A short text to describe your forum', - 'CONFIG_SITENAME' => 'yourdomain.com', - - 'DEFAULT_INSTALL_POST' => 'This is an example post in your phpBB3 installation. Everything seems to be working. You may delete this post if you like and continue to set up your board. During the installation process your first category and your first forum are assigned an appropriate set of permissions for the predefined usergroups administrators, bots, global moderators, guests, registered users and registered COPPA users. If you also choose to delete your first category and your first forum, do not forget to assign permissions for all these usergroups for all new categories and forums you create. It is recommended to rename your first category and your first forum and copy permissions from these while creating new categories and forums. Have fun!', - - 'EXT_GROUP_ARCHIVES' => 'Archives', - 'EXT_GROUP_DOCUMENTS' => 'Documents', - 'EXT_GROUP_DOWNLOADABLE_FILES' => 'Downloadable Files', - 'EXT_GROUP_FLASH_FILES' => 'Flash Files', - 'EXT_GROUP_IMAGES' => 'Images', - 'EXT_GROUP_PLAIN_TEXT' => 'Plain Text', - 'EXT_GROUP_QUICKTIME_MEDIA' => 'Quicktime Media', - 'EXT_GROUP_REAL_MEDIA' => 'Real Media', - 'EXT_GROUP_WINDOWS_MEDIA' => 'Windows Media', - - 'FORUMS_FIRST_CATEGORY' => 'Your first category', - 'FORUMS_TEST_FORUM_DESC' => 'Description of your first forum.', - 'FORUMS_TEST_FORUM_TITLE' => 'Your first forum', - - 'RANKS_SITE_ADMIN_TITLE' => 'Site Admin', - 'REPORT_WAREZ' => 'The post contains links to illegal or pirated software.', - 'REPORT_SPAM' => 'The reported post has the only purpose to advertise for a website or another product.', - 'REPORT_OFF_TOPIC' => 'The reported post is off topic.', - 'REPORT_OTHER' => 'The reported post does not fit into any other category, please use the further information field.', - - 'SMILIES_ARROW' => 'Arrow', - 'SMILIES_CONFUSED' => 'Confused', - 'SMILIES_COOL' => 'Cool', - 'SMILIES_CRYING' => 'Crying or Very Sad', - 'SMILIES_EMARRASSED' => 'Embarrassed', - 'SMILIES_EVIL' => 'Evil or Very Mad', - 'SMILIES_EXCLAMATION' => 'Exclamation', - 'SMILIES_GEEK' => 'Geek', - 'SMILIES_IDEA' => 'Idea', - 'SMILIES_LAUGHING' => 'Laughing', - 'SMILIES_MAD' => 'Mad', - 'SMILIES_MR_GREEN' => 'Mr. Green', - 'SMILIES_NEUTRAL' => 'Neutral', - 'SMILIES_QUESTION' => 'Question', - 'SMILIES_RAZZ' => 'Razz', - 'SMILIES_ROLLING_EYES' => 'Rolling Eyes', - 'SMILIES_SAD' => 'Sad', - 'SMILIES_SHOCKED' => 'Shocked', - 'SMILIES_SMILE' => 'Smile', - 'SMILIES_SURPRISED' => 'Surprised', - 'SMILIES_TWISTED_EVIL' => 'Twisted Evil', - 'SMILIES_UBER_GEEK' => 'Uber Geek', - 'SMILIES_VERY_HAPPY' => 'Very Happy', - 'SMILIES_WINK' => 'Wink', - - 'TOPICS_TOPIC_TITLE' => 'Welcome to phpBB3', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/iso.txt b/phpBB/language/en/iso.txt deleted file mode 100644 index c421dd4316..0000000000 --- a/phpBB/language/en/iso.txt +++ /dev/null @@ -1,3 +0,0 @@ -British English -British English -phpBB Group \ No newline at end of file diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php deleted file mode 100644 index f53babdc69..0000000000 --- a/phpBB/language/en/mcp.php +++ /dev/null @@ -1,375 +0,0 @@ - 'Action', - 'ACTION_NOTE' => 'Action/Note', - 'ADD_FEEDBACK' => 'Add feedback', - 'ADD_FEEDBACK_EXPLAIN' => 'If you would like to add a report on this please fill out the following form. Only use plain text; HTML, BBCode, etc. are not permitted.', - 'ADD_WARNING' => 'Add warning', - 'ADD_WARNING_EXPLAIN' => 'To send a warning to this user please fill out the following form. Only use plain text; HTML, BBCode, etc. are not permitted.', - 'ALL_ENTRIES' => 'All entries', - 'ALL_NOTES_DELETED' => 'Successfully removed all user notes.', - 'ALL_REPORTS' => 'All reports', - 'ALREADY_REPORTED' => 'This post has already been reported.', - 'ALREADY_WARNED' => 'A warning has already been issued for this post.', - 'APPROVE' => 'Approve', - 'APPROVE_POST' => 'Approve post', - 'APPROVE_POST_CONFIRM' => 'Are you sure you want to approve this post?', - 'APPROVE_POSTS' => 'Approve posts', - 'APPROVE_POSTS_CONFIRM' => 'Are you sure you want to approve the selected posts?', - - 'CANNOT_MOVE_SAME_FORUM'=> 'You cannot move a topic to the forum it’s already in.', - 'CANNOT_WARN_ANONYMOUS' => 'You cannot warn unregistered guest users.', - 'CANNOT_WARN_SELF' => 'You cannot warn yourself.', - 'CAN_LEAVE_BLANK' => 'This can be left blank.', - 'CHANGE_POSTER' => 'Change poster', - 'CLOSE_REPORT' => 'Close report', - 'CLOSE_REPORT_CONFIRM' => 'Are you sure you want to close the selected report?', - 'CLOSE_REPORTS' => 'Close reports', - 'CLOSE_REPORTS_CONFIRM' => 'Are you sure you want to close the selected reports?', - - 'DELETE_POSTS' => 'Delete posts', - 'DELETE_POSTS_CONFIRM' => 'Are you sure you want to delete these posts?', - 'DELETE_POST_CONFIRM' => 'Are you sure you want to delete this post?', - 'DELETE_REPORT' => 'Delete report', - 'DELETE_REPORT_CONFIRM' => 'Are you sure you want to delete the selected report?', - 'DELETE_REPORTS' => 'Delete reports', - 'DELETE_REPORTS_CONFIRM' => 'Are you sure you want to delete the selected reports?', - 'DELETE_SHADOW_TOPIC' => 'Delete shadow topic', - 'DELETE_TOPICS' => 'Delete selected topics', - 'DELETE_TOPICS_CONFIRM' => 'Are you sure you want to delete these topics?', - 'DELETE_TOPIC_CONFIRM' => 'Are you sure you want to delete this topic?', - 'DISAPPROVE' => 'Disapprove', - 'DISAPPROVE_REASON' => 'Reason for disapproval', - 'DISAPPROVE_POST' => 'Disapprove post', - 'DISAPPROVE_POST_CONFIRM' => 'Are you sure you want to disapprove this post?', - 'DISAPPROVE_POSTS' => 'Disapprove posts', - 'DISAPPROVE_POSTS_CONFIRM' => 'Are you sure you want to disapprove the selected posts?', - 'DISPLAY_LOG' => 'Display entries from previous', - 'DISPLAY_OPTIONS' => 'Display options', - - 'EMPTY_REPORT' => 'You must enter a description when selecting this reason.', - 'EMPTY_TOPICS_REMOVED_WARNING' => 'Please note that one or several topics have been removed from the database because they were or become empty.', - - 'FEEDBACK' => 'Feedback', - 'FORK' => 'Copy', - 'FORK_TOPIC' => 'Copy topic', - 'FORK_TOPIC_CONFIRM' => 'Are you sure you want to copy this topic?', - 'FORK_TOPICS' => 'Copy selected topics', - 'FORK_TOPICS_CONFIRM' => 'Are you sure you want to copy the selected topics?', - 'FORUM_DESC' => 'Description', - 'FORUM_NAME' => 'Forum name', - 'FORUM_NOT_EXIST' => 'The forum you selected does not exist.', - 'FORUM_NOT_POSTABLE' => 'The forum you selected cannot be posted to.', - 'FORUM_STATUS' => 'Forum status', - 'FORUM_STYLE' => 'Forum style', - - 'GLOBAL_ANNOUNCEMENT' => 'Global announcement', - - 'IP_INFO' => 'IP address information', - 'IPS_POSTED_FROM' => 'IP addresses this user has posted from', - - 'LATEST_LOGS' => 'Latest 5 logged actions', - 'LATEST_REPORTED' => 'Latest 5 reports', - 'LATEST_UNAPPROVED' => 'Latest 5 posts awaiting approval', - 'LATEST_WARNING_TIME' => 'Latest warning issued', - 'LATEST_WARNINGS' => 'Latest 5 warnings', - 'LEAVE_SHADOW' => 'Leave shadow topic in place', - 'LIST_REPORT' => '1 report', - 'LIST_REPORTS' => '%d reports', - 'LOCK' => 'Lock', - 'LOCK_POST_POST' => 'Lock post', - 'LOCK_POST_POST_CONFIRM' => 'Are you sure you want to prevent editing this post?', - 'LOCK_POST_POSTS' => 'Lock selected posts', - 'LOCK_POST_POSTS_CONFIRM' => 'Are you sure you want to prevent editing the selected posts?', - 'LOCK_TOPIC_CONFIRM' => 'Are you sure you want to lock this topic?', - 'LOCK_TOPICS' => 'Lock selected topics', - 'LOCK_TOPICS_CONFIRM' => 'Are you sure you want to lock all selected topics?', - 'LOGS_CURRENT_TOPIC' => 'Currently viewing logs of:', - 'LOGIN_EXPLAIN_MCP' => 'To moderate this forum you must login.', - 'LOGVIEW_VIEWTOPIC' => 'View topic', - 'LOGVIEW_VIEWLOGS' => 'View topic log', - 'LOGVIEW_VIEWFORUM' => 'View forum', - 'LOOKUP_ALL' => 'Look up all IPs', - 'LOOKUP_IP' => 'Look up IP', - - 'MARKED_NOTES_DELETED' => 'Successfully removed all marked user notes.', - - 'MCP_ADD' => 'Add a warning', - - 'MCP_BAN' => 'Banning', - 'MCP_BAN_EMAILS' => 'Ban e-mails', - 'MCP_BAN_IPS' => 'Ban IPs', - 'MCP_BAN_USERNAMES' => 'Ban Usernames', - - 'MCP_LOGS' => 'Moderator logs', - 'MCP_LOGS_FRONT' => 'Front page', - 'MCP_LOGS_FORUM_VIEW' => 'Forum logs', - 'MCP_LOGS_TOPIC_VIEW' => 'Topic logs', - - 'MCP_MAIN' => 'Main', - 'MCP_MAIN_FORUM_VIEW' => 'View forum', - 'MCP_MAIN_FRONT' => 'Front page', - 'MCP_MAIN_POST_DETAILS' => 'Post details', - 'MCP_MAIN_TOPIC_VIEW' => 'View topic', - 'MCP_MAKE_ANNOUNCEMENT' => 'Modify to “Announcementâ€', - 'MCP_MAKE_ANNOUNCEMENT_CONFIRM' => 'Are you sure you want to change this topic to an “Announcementâ€?', - 'MCP_MAKE_ANNOUNCEMENTS' => 'Modify to “Announcementsâ€', - 'MCP_MAKE_ANNOUNCEMENTS_CONFIRM'=> 'Are you sure you want to change the selected topics to “Announcementsâ€?', - 'MCP_MAKE_GLOBAL' => 'Modify to “Global announcementâ€', - 'MCP_MAKE_GLOBAL_CONFIRM' => 'Are you sure you want to change this topic to a “Global announcementâ€?', - 'MCP_MAKE_GLOBALS' => 'Modify to “Global announcementsâ€', - 'MCP_MAKE_GLOBALS_CONFIRM' => 'Are you sure you want to change the selected topics to “Global announcementsâ€?', - 'MCP_MAKE_STICKY' => 'Modify to “Stickyâ€', - 'MCP_MAKE_STICKY_CONFIRM' => 'Are you sure you want to change this topic to a “Stickyâ€?', - 'MCP_MAKE_STICKIES' => 'Modify to “Stickiesâ€', - 'MCP_MAKE_STICKIES_CONFIRM' => 'Are you sure you want to change the selected topics to “Stickiesâ€?', - 'MCP_MAKE_NORMAL' => 'Modify to “Standard Topicâ€', - 'MCP_MAKE_NORMAL_CONFIRM' => 'Are you sure you want to change this topic to a “Standard Topicâ€?', - 'MCP_MAKE_NORMALS' => 'Modify to “Standard Topicsâ€', - 'MCP_MAKE_NORMALS_CONFIRM' => 'Are you sure you want to change the selected topics to “Standard Topicsâ€?', - - 'MCP_NOTES' => 'User notes', - 'MCP_NOTES_FRONT' => 'Front page', - 'MCP_NOTES_USER' => 'User details', - - 'MCP_POST_REPORTS' => 'Reports issued on this post', - - 'MCP_REPORTS' => 'Reported posts', - 'MCP_REPORT_DETAILS' => 'Report details', - 'MCP_REPORTS_CLOSED' => 'Closed reports', - 'MCP_REPORTS_CLOSED_EXPLAIN' => 'This is a list of all reports about posts which have previously been resolved.', - 'MCP_REPORTS_OPEN' => 'Open reports', - 'MCP_REPORTS_OPEN_EXPLAIN' => 'This is a list of all reported posts which are still to be handled.', - - 'MCP_QUEUE' => 'Moderation queue', - 'MCP_QUEUE_APPROVE_DETAILS' => 'Approve details', - 'MCP_QUEUE_UNAPPROVED_POSTS' => 'Posts awaiting approval', - 'MCP_QUEUE_UNAPPROVED_POSTS_EXPLAIN' => 'This is a list of all posts which require approving before they will be visible to users.', - 'MCP_QUEUE_UNAPPROVED_TOPICS' => 'Topics awaiting approval', - 'MCP_QUEUE_UNAPPROVED_TOPICS_EXPLAIN' => 'This is a list of all topics which require approving before they will be visible to users.', - - 'MCP_VIEW_USER' => 'View warnings for a specific user', - - 'MCP_WARN' => 'Warnings', - 'MCP_WARN_FRONT' => 'Front page', - 'MCP_WARN_LIST' => 'List warnings', - 'MCP_WARN_POST' => 'Warn for specific post', - 'MCP_WARN_USER' => 'Warn user', - - 'MERGE_POSTS' => 'Merge posts', - 'MERGE_POSTS_CONFIRM' => 'Are you sure you want to merge the selected posts?', - 'MERGE_TOPIC_EXPLAIN' => 'Using the form below you can merge selected posts into another topic. These posts will not be reordered and will appear as if the users posted them to the new topic.
    Please enter the destination topic id or click on “Select topic†to search for one.', - 'MERGE_TOPIC_ID' => 'Destination topic identification number', - 'MERGE_TOPICS' => 'Merge topics', - 'MERGE_TOPICS_CONFIRM' => 'Are you sure you want to merge the selected topics?', - 'MODERATE_FORUM' => 'Moderate forum', - 'MODERATE_TOPIC' => 'Moderate topic', - 'MODERATE_POST' => 'Moderate post', - 'MOD_OPTIONS' => 'Moderator options', - 'MORE_INFO' => 'Further information', - 'MOST_WARNINGS' => 'Users with most warnings', - 'MOVE_TOPIC_CONFIRM' => 'Are you sure you want to move the topic into a new forum?', - 'MOVE_TOPICS' => 'Move selected topics', - 'MOVE_TOPICS_CONFIRM' => 'Are you sure you want to move the selected topics into a new forum?', - - 'NOTIFY_POSTER_APPROVAL' => 'Notify poster about approval?', - 'NOTIFY_POSTER_DISAPPROVAL' => 'Notify poster about disapproval?', - 'NOTIFY_USER_WARN' => 'Notify user about warning?', - 'NOT_MODERATOR' => 'You are not a moderator of this forum.', - 'NO_DESTINATION_FORUM' => 'Please select a forum for destination.', - 'NO_DESTINATION_FORUM_FOUND' => 'There is no destination forum available.', - 'NO_ENTRIES' => 'No log entries for this period.', - 'NO_FEEDBACK' => 'No feedback exists for this user.', - 'NO_FINAL_TOPIC_SELECTED' => 'You have to select a destination topic for merging posts.', - 'NO_MATCHES_FOUND' => 'No matches found.', - 'NO_POST' => 'You have to select a post in order to warn the user for a post.', - 'NO_POST_REPORT' => 'This post was not reported.', - 'NO_POST_SELECTED' => 'You must select at least one post to perform this action.', - 'NO_REASON_DISAPPROVAL' => 'Please give an appropriate reason for disapproval.', - 'NO_REPORT' => 'No report found', - 'NO_REPORTS' => 'No reports found', - 'NO_REPORT_SELECTED' => 'You must select at least one report to perform this action.', - 'NO_TOPIC_ICON' => 'None', - 'NO_TOPIC_SELECTED' => 'You must select at least one topic to perform this action.', - 'NO_TOPICS_QUEUE' => 'There are no topics waiting for approval.', - - 'ONLY_TOPIC' => 'Only topic “%sâ€', - 'OTHER_USERS' => 'Other users posting from this IP', - - 'POSTER' => 'Poster', - 'POSTS_APPROVED_SUCCESS' => 'The selected posts have been approved.', - 'POSTS_DELETED_SUCCESS' => 'The selected posts have been successfully removed from the database.', - 'POSTS_DISAPPROVED_SUCCESS' => 'The selected posts have been disapproved.', - 'POSTS_LOCKED_SUCCESS' => 'The selected posts have been locked successfully.', - 'POSTS_MERGED_SUCCESS' => 'The selected posts have been merged.', - 'POSTS_UNLOCKED_SUCCESS' => 'The selected posts have been unlocked successfully.', - 'POSTS_PER_PAGE' => 'Posts per page', - 'POSTS_PER_PAGE_EXPLAIN' => '(Set to 0 to view all posts.)', - 'POST_APPROVED_SUCCESS' => 'The selected post has been approved.', - 'POST_DELETED_SUCCESS' => 'The selected post has been successfully removed from the database.', - 'POST_DISAPPROVED_SUCCESS' => 'The selected post has been disapproved.', - 'POST_LOCKED_SUCCESS' => 'Post locked successfully.', - 'POST_NOT_EXIST' => 'The post you requested does not exist.', - 'POST_REPORTED_SUCCESS' => 'This post has been successfully reported.', - 'POST_UNLOCKED_SUCCESS' => 'Post unlocked successfully.', - - 'READ_USERNOTES' => 'User notes', - 'READ_WARNINGS' => 'User warnings', - 'REPORTER' => 'Reporter', - 'REPORTED' => 'Reported', - 'REPORTED_BY' => 'Reported by', - 'REPORTED_ON_DATE' => 'on', - 'REPORTS_CLOSED_SUCCESS' => 'The selected reports have been closed successfully.', - 'REPORTS_DELETED_SUCCESS' => 'The selected reports have been deleted successfully.', - 'REPORTS_TOTAL' => 'In total there are %d reports to review.', - 'REPORTS_ZERO_TOTAL' => 'There are no reports to review.', - 'REPORT_CLOSED' => 'This report has already been closed.', - 'REPORT_CLOSED_SUCCESS' => 'The selected report has been closed successfully.', - 'REPORT_DELETED_SUCCESS' => 'The selected report has been deleted successfully.', - 'REPORT_DETAILS' => 'Report details', - 'REPORT_MESSAGE' => 'Report this message', - 'REPORT_MESSAGE_EXPLAIN' => 'Use this form to report the selected message. Reporting should generally be used only if the message breaks forum rules.', - 'REPORT_NOTIFY' => 'Notify me', - 'REPORT_NOTIFY_EXPLAIN' => 'Informs you when your report is dealt with.', - 'REPORT_POST_EXPLAIN' => 'Use this form to report the selected post to the forum moderators and board administrators. Reporting should generally be used only if the post breaks forum rules.', - 'REPORT_REASON' => 'Report reason', - 'REPORT_TIME' => 'Report time', - 'REPORT_TOTAL' => 'In total there is 1 report to review.', - 'RESYNC' => 'Resync', - 'RETURN_MESSAGE' => '%sReturn to the message%s', - 'RETURN_NEW_FORUM' => '%sGo to the new forum%s', - 'RETURN_NEW_TOPIC' => '%sGo to the new topic%s', - 'RETURN_POST' => '%sReturn to the post%s', - 'RETURN_QUEUE' => '%sReturn to the queue%s', - 'RETURN_REPORTS' => '%sReturn to the reports%s', - 'RETURN_TOPIC_SIMPLE' => '%sReturn to the topic%s', - - 'SEARCH_POSTS_BY_USER' => 'Search posts by', - 'SELECT_ACTION' => 'Select desired action', - 'SELECT_FORUM_GLOBAL_ANNOUNCEMENT' => 'Please select the forum you wish this global announcement to be displayed.', - 'SELECT_FORUM_GLOBAL_ANNOUNCEMENTS' => 'One or more of the selected topics are global announcements. Please select the forum you wish these to be displayed.', - 'SELECT_MERGE' => 'Select for merge', - 'SELECT_TOPICS_FROM' => 'Select topics from', - 'SELECT_TOPIC' => 'Select topic', - 'SELECT_USER' => 'Select user', - 'SORT_ACTION' => 'Log action', - 'SORT_DATE' => 'Date', - 'SORT_IP' => 'IP address', - 'SORT_WARNINGS' => 'Warnings', - 'SPLIT_AFTER' => 'Split from selected post', - 'SPLIT_FORUM' => 'Forum for new topic', - 'SPLIT_POSTS' => 'Split selected posts', - 'SPLIT_SUBJECT' => 'New topic title', - 'SPLIT_TOPIC_ALL' => 'Split topic from selected posts', - 'SPLIT_TOPIC_ALL_CONFIRM' => 'Are you sure you want to split this topic?', - 'SPLIT_TOPIC_BEYOND' => 'Split topic at selected post', - 'SPLIT_TOPIC_BEYOND_CONFIRM' => 'Are you sure you want to split this topic at the selected post?', - 'SPLIT_TOPIC_EXPLAIN' => 'Using the form below you can split a topic in two, either by selecting the posts individually or by splitting at a selected post.', - - 'THIS_POST_IP' => 'IP for this post', - 'TOPICS_APPROVED_SUCCESS' => 'The selected topics have been approved.', - 'TOPICS_DELETED_SUCCESS' => 'The selected topics have been successfully removed from the database.', - 'TOPICS_DISAPPROVED_SUCCESS'=> 'The selected topics have been disapproved.', - 'TOPICS_FORKED_SUCCESS' => 'The selected topics have been copied successfully.', - 'TOPICS_LOCKED_SUCCESS' => 'The selected topics have been locked.', - 'TOPICS_MOVED_SUCCESS' => 'The selected topics have been moved successfully.', - 'TOPICS_RESYNC_SUCCESS' => 'The selected topics have been resynchronised.', - 'TOPICS_TYPE_CHANGED' => 'Topic types changed successfully.', - 'TOPICS_UNLOCKED_SUCCESS' => 'The selected topics have been unlocked.', - 'TOPIC_APPROVED_SUCCESS' => 'The selected topic has been approved.', - 'TOPIC_DELETED_SUCCESS' => 'The selected topic has been successfully removed from the database.', - 'TOPIC_DISAPPROVED_SUCCESS' => 'The selected topic has been disapproved.', - 'TOPIC_FORKED_SUCCESS' => 'The selected topic has been copied successfully.', - 'TOPIC_LOCKED_SUCCESS' => 'The selected topic has been locked.', - 'TOPIC_MOVED_SUCCESS' => 'The selected topic has been moved successfully.', - 'TOPIC_NOT_EXIST' => 'The topic you selected does not exist.', - 'TOPIC_RESYNC_SUCCESS' => 'The selected topic has been resynchronised.', - 'TOPIC_SPLIT_SUCCESS' => 'The selected topic has been split successfully.', - 'TOPIC_TIME' => 'Topic time', - 'TOPIC_TYPE_CHANGED' => 'Topic type changed successfully.', - 'TOPIC_UNLOCKED_SUCCESS' => 'The selected topic has been unlocked.', - 'TOTAL_WARNINGS' => 'Total Warnings', - - 'UNAPPROVED_POSTS_TOTAL' => 'In total there are %d posts waiting for approval.', - 'UNAPPROVED_POSTS_ZERO_TOTAL' => 'There are no posts waiting for approval.', - 'UNAPPROVED_POST_TOTAL' => 'In total there is 1 post waiting for approval.', - 'UNLOCK' => 'Unlock', - 'UNLOCK_POST' => 'Unlock post', - 'UNLOCK_POST_EXPLAIN' => 'Allow editing', - 'UNLOCK_POST_POST' => 'Unlock post', - 'UNLOCK_POST_POST_CONFIRM' => 'Are you sure you want to allow editing this post?', - 'UNLOCK_POST_POSTS' => 'Unlock selected posts', - 'UNLOCK_POST_POSTS_CONFIRM' => 'Are you sure you want to allow editing the selected posts?', - 'UNLOCK_TOPIC' => 'Unlock topic', - 'UNLOCK_TOPIC_CONFIRM' => 'Are you sure you want to unlock this topic?', - 'UNLOCK_TOPICS' => 'Unlock selected topics', - 'UNLOCK_TOPICS_CONFIRM' => 'Are you sure you want to unlock all selected topics?', - 'USER_CANNOT_POST' => 'You cannot post in this forum.', - 'USER_CANNOT_REPORT' => 'You cannot report posts in this forum.', - 'USER_FEEDBACK_ADDED' => 'User feedback added successfully.', - 'USER_WARNING_ADDED' => 'User warned successfully.', - - 'VIEW_DETAILS' => 'View details', - - 'WARNED_USERS' => 'Warned users', - 'WARNED_USERS_EXPLAIN' => 'This is a list of users with unexpired warnings issued to them.', - 'WARNING_PM_BODY' => 'The following is a warning which has been issued to you by an administrator or moderator of this site.[quote]%s[/quote]', - 'WARNING_PM_SUBJECT' => 'Board warning issued', - 'WARNING_POST_DEFAULT' => 'This is a warning regarding the following post made by you: %s .', - 'WARNINGS_ZERO_TOTAL' => 'No warnings exist.', - - 'YOU_SELECTED_TOPIC' => 'You selected topic number %d: %s.', - - 'report_reasons' => array( - 'TITLE' => array( - 'WAREZ' => 'Warez', - 'SPAM' => 'Spam', - 'OFF_TOPIC' => 'Off-topic', - 'OTHER' => 'Other', - ), - 'DESCRIPTION' => array( - 'WAREZ' => 'The post contains links to illegal or pirated software.', - 'SPAM' => 'The reported post has the only purpose to advertise for a website or another product.', - 'OFF_TOPIC' => 'The reported post is off topic.', - 'OTHER' => 'The reported post does not fit into any other category, please use the further information field.', - ) - ), -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php deleted file mode 100644 index ad4dd83ca4..0000000000 --- a/phpBB/language/en/memberlist.php +++ /dev/null @@ -1,145 +0,0 @@ - 'Profile', - 'ACTIVE_IN_FORUM' => 'Most active forum', - 'ACTIVE_IN_TOPIC' => 'Most active topic', - 'ADD_FOE' => 'Add foe', - 'ADD_FRIEND' => 'Add friend', - 'AFTER' => 'After', - - 'ALL' => 'All', - - 'BEFORE' => 'Before', - - 'CC_EMAIL' => 'Send a copy of this e-mail to yourself.', - 'CONTACT_USER' => 'Contact', - - 'DEST_LANG' => 'Language', - 'DEST_LANG_EXPLAIN' => 'Select an appropriate language (if available) for the recipient of this message.', - - 'EMAIL_BODY_EXPLAIN' => 'This message will be sent as plain text, do not include any HTML or BBCode. The return address for this message will be set to your e-mail address.', - 'EMAIL_DISABLED' => 'Sorry but all e-mail related functions have been disabled.', - 'EMAIL_SENT' => 'The e-mail has been sent.', - 'EMAIL_TOPIC_EXPLAIN' => 'This message will be sent as plain text, do not include any HTML or BBCode. Please note that the topic information is already included in the message. The return address for this message will be set to your e-mail address.', - 'EMPTY_ADDRESS_EMAIL' => 'You must provide a valid e-mail address for the recipient.', - 'EMPTY_MESSAGE_EMAIL' => 'You must enter a message to be emailed.', - 'EMPTY_MESSAGE_IM' => 'You must enter a message to be send.', - 'EMPTY_NAME_EMAIL' => 'You must enter the real name of the recipient.', - 'EMPTY_SUBJECT_EMAIL' => 'You must specify a subject for the e-mail.', - 'EQUAL_TO' => 'Equal to', - - 'FIND_USERNAME_EXPLAIN' => 'Use this form to search for specific members. You do not need to fill out all fields. To match partial data use * as a wildcard. When entering dates use the format YYYY-MM-DD, e.g. 2004-02-29. Use the mark checkboxes to select one or more usernames (several usernames may be accepted depending on the form itself) and click the Select Marked button to return to the previous form.', - 'FLOOD_EMAIL_LIMIT' => 'You cannot send another e-mail at this time. Please try again later.', - - 'GROUP_LEADER' => 'Group leader', - - 'HIDE_MEMBER_SEARCH' => 'Hide member search', - - 'IM_ADD_CONTACT' => 'Add Contact', - 'IM_AIM' => 'Please note that you need AOL Instant Messenger installed to use this.', - 'IM_AIM_EXPRESS' => 'AIM Express', - 'IM_DOWNLOAD_APP' => 'Download application', - 'IM_ICQ' => 'Please note that users may have selected to not receive unsolicited instant messages.', - 'IM_JABBER' => 'Please note that users may have selected to not receive unsolicited instant messages.', - 'IM_JABBER_SUBJECT' => 'This is an automated message please do not reply! Message from user %1$s at %2$s.', - 'IM_MESSAGE' => 'Your message', - 'IM_MSNM' => 'Please note that you need Windows Messenger installed to use this.', - 'IM_MSNM_BROWSER' => 'Your browser does not support this.', - 'IM_MSNM_CONNECT' => 'MSNM is not connected.\nYou have to connect to MSNM to continue.', - 'IM_NAME' => 'Your Name', - 'IM_NO_DATA' => 'There is no suitable contact information for this user.', - 'IM_NO_JABBER' => 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.', - 'IM_RECIPIENT' => 'Recipient', - 'IM_SEND' => 'Send message', - 'IM_SEND_MESSAGE' => 'Send message', - 'IM_SENT_JABBER' => 'Your message to %1$s has been sent successfully.', - 'IM_USER' => 'Send an instant message', - - 'LAST_ACTIVE' => 'Last active', - 'LESS_THAN' => 'Less than', - 'LIST_USER' => '1 user', - 'LIST_USERS' => '%d users', - 'LOGIN_EXPLAIN_LEADERS' => 'The board requires you to be registered and logged in to view the team listing.', - 'LOGIN_EXPLAIN_MEMBERLIST' => 'The board requires you to be registered and logged in to access the memberlist.', - 'LOGIN_EXPLAIN_SEARCHUSER' => 'The board requires you to be registered and logged in to search users.', - 'LOGIN_EXPLAIN_VIEWPROFILE' => 'The board requires you to be registered and logged in to view profiles.', - - 'MORE_THAN' => 'More than', - - 'NO_EMAIL' => 'You are not permitted to send e-mail to this user.', - 'NO_VIEW_USERS' => 'You are not authorised to view the member list or profiles.', - - 'ORDER' => 'Order', - 'OTHER' => 'Other', - - 'POST_IP' => 'Posted from IP/domain', - - 'RANK' => 'Rank', - 'REAL_NAME' => 'Recipient name', - 'RECIPIENT' => 'Recipient', - 'REMOVE_FOE' => 'Remove foe', - 'REMOVE_FRIEND' => 'Remove friend', - - 'SEARCH_USER_POSTS' => 'Search user’s posts', - 'SELECT_MARKED' => 'Select marked', - 'SELECT_SORT_METHOD' => 'Select sort method', - 'SEND_AIM_MESSAGE' => 'Send AIM message', - 'SEND_ICQ_MESSAGE' => 'Send ICQ message', - 'SEND_IM' => 'Instant messaging', - 'SEND_JABBER_MESSAGE' => 'Send Jabber message', - 'SEND_MESSAGE' => 'Message', - 'SEND_MSNM_MESSAGE' => 'Send MSNM/WLM message', - 'SEND_YIM_MESSAGE' => 'Send YIM message', - 'SORT_EMAIL' => 'E-mail', - 'SORT_LAST_ACTIVE' => 'Last active', - 'SORT_POST_COUNT' => 'Post count', - - 'USERNAME_BEGINS_WITH' => 'Username begins with', - 'USER_ADMIN' => 'Administrate user', - 'USER_FORUM' => 'User statistics', - 'USER_ONLINE' => 'Online', - 'USER_PRESENCE' => 'Board presence', - - 'VIEWING_PROFILE' => 'Viewing profile - %s', - 'VISITED' => 'Last visited', - - 'WWW' => 'Website', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/mods/index.htm b/phpBB/language/en/mods/index.htm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php deleted file mode 100644 index 76878c8f7c..0000000000 --- a/phpBB/language/en/posting.php +++ /dev/null @@ -1,221 +0,0 @@ - 'Upload attachment', - 'ADD_ATTACHMENT_EXPLAIN' => 'If you wish to attach one or more files enter the details below.', - 'ADD_FILE' => 'Add the file', - 'ADD_POLL' => 'Poll creation', - 'ADD_POLL_EXPLAIN' => 'If you do not want to add a poll to your topic leave the fields blank.', - 'ALREADY_DELETED' => 'Sorry but this message is already deleted.', - 'ATTACH_QUOTA_REACHED' => 'Sorry, the board attachment quota has been reached.', - 'ATTACH_SIG' => 'Attach a signature (signatures can be altered via the UCP)', - - 'BBCODE_A_HELP' => 'Inline uploaded attachment: [attachment=]filename.ext[/attachment]', - 'BBCODE_B_HELP' => 'Bold text: [b]text[/b]', - 'BBCODE_C_HELP' => 'Code display: [code]code[/code]', - 'BBCODE_E_HELP' => 'List: Add list element', - 'BBCODE_F_HELP' => 'Font size: [size=85]small text[/size]', - 'BBCODE_IS_OFF' => '%sBBCode%s is OFF', - 'BBCODE_IS_ON' => '%sBBCode%s is ON', - 'BBCODE_I_HELP' => 'Italic text: [i]text[/i]', - 'BBCODE_L_HELP' => 'List: [list]text[/list]', - 'BBCODE_LISTITEM_HELP' => 'List item: [*]text[/*]', - 'BBCODE_O_HELP' => 'Ordered list: [list=]text[/list]', - 'BBCODE_P_HELP' => 'Insert image: [img]http://image_url[/img]', - 'BBCODE_Q_HELP' => 'Quote text: [quote]text[/quote]', - 'BBCODE_S_HELP' => 'Font colour: [color=red]text[/color] Tip: you can also use color=#FF0000', - 'BBCODE_U_HELP' => 'Underline text: [u]text[/u]', - 'BBCODE_W_HELP' => 'Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url]', - 'BBCODE_D_HELP' => 'Flash: [flash=width,height]http://url[/flash]', - 'BUMP_ERROR' => 'You cannot bump this topic so soon after the last post.', - - 'CANNOT_DELETE_REPLIED' => 'Sorry but you may only delete posts which have not been replied to.', - 'CANNOT_EDIT_POST_LOCKED' => 'This post has been locked. You can no longer edit that post.', - 'CANNOT_EDIT_TIME' => 'You can no longer edit or delete that post.', - 'CANNOT_POST_ANNOUNCE' => 'Sorry but you cannot post announcements.', - 'CANNOT_POST_STICKY' => 'Sorry but you cannot post sticky topics.', - 'CHANGE_TOPIC_TO' => 'Change topic type to', - 'CLOSE_TAGS' => 'Close tags', - 'CURRENT_TOPIC' => 'Current topic', - - 'DELETE_FILE' => 'Delete file', - 'DELETE_MESSAGE' => 'Delete message', - 'DELETE_MESSAGE_CONFIRM' => 'Are you sure you want to delete this message?', - 'DELETE_OWN_POSTS' => 'Sorry but you can only delete your own posts.', - 'DELETE_POST_CONFIRM' => 'Are you sure you want to delete this post?', - 'DELETE_POST_WARN' => 'Once deleted the post cannot be recovered', - 'DISABLE_BBCODE' => 'Disable BBCode', - 'DISABLE_MAGIC_URL' => 'Do not automatically parse URLs', - 'DISABLE_SMILIES' => 'Disable smilies', - 'DISALLOWED_EXTENSION' => 'The extension %s is not allowed.', - 'DRAFT_LOADED' => 'Draft loaded into posting area, you may want to finish your post now.
    Your draft will be deleted after submitting this post.', - 'DRAFT_LOADED_PM' => 'Draft loaded into message area, you may want to finish your private message now.
    Your draft will be deleted after submitting this private message.', - 'DRAFT_SAVED' => 'Draft successfully saved.', - 'DRAFT_TITLE' => 'Draft title', - - 'EDIT_REASON' => 'Reason for editing this post', - 'EMPTY_FILEUPLOAD' => 'The uploaded file is empty.', - 'EMPTY_MESSAGE' => 'You must enter a message when posting.', - 'EMPTY_REMOTE_DATA' => 'File could not be uploaded, please try uploading the file manually.', - - 'FLASH_IS_OFF' => '[flash] is OFF', - 'FLASH_IS_ON' => '[flash] is ON', - 'FLOOD_ERROR' => 'You cannot make another post so soon after your last.', - 'FONT_COLOR' => 'Font colour', - 'FONT_COLOR_HIDE' => 'Hide font colour', - 'FONT_HUGE' => 'Huge', - 'FONT_LARGE' => 'Large', - 'FONT_NORMAL' => 'Normal', - 'FONT_SIZE' => 'Font size', - 'FONT_SMALL' => 'Small', - 'FONT_TINY' => 'Tiny', - - 'GENERAL_UPLOAD_ERROR' => 'Could not upload attachment to %s.', - - 'IMAGES_ARE_OFF' => '[img] is OFF', - 'IMAGES_ARE_ON' => '[img] is ON', - 'INVALID_FILENAME' => '%s is an invalid filename.', - - 'LOAD' => 'Load', - 'LOAD_DRAFT' => 'Load draft', - 'LOAD_DRAFT_EXPLAIN' => 'Here you are able to select the draft you want to continue writing. Your current post will be cancelled, all current post contents will be deleted. View, edit and delete drafts within your User Control Panel.', - 'LOGIN_EXPLAIN_BUMP' => 'You need to login in order to bump topics within this forum.', - 'LOGIN_EXPLAIN_DELETE' => 'You need to login in order to delete posts within this forum.', - 'LOGIN_EXPLAIN_POST' => 'You need to login in order to post within this forum.', - 'LOGIN_EXPLAIN_QUOTE' => 'You need to login in order to quote posts within this forum.', - 'LOGIN_EXPLAIN_REPLY' => 'You need to login in order to reply to topics within this forum.', - - 'MAX_FONT_SIZE_EXCEEDED' => 'You may only use fonts up to size %1$d.', - 'MAX_FLASH_HEIGHT_EXCEEDED' => 'Your flash files may only be up to %1$d pixels high.', - 'MAX_FLASH_WIDTH_EXCEEDED' => 'Your flash files may only be up to %1$d pixels wide.', - 'MAX_IMG_HEIGHT_EXCEEDED' => 'Your images may only be up to %1$d pixels high.', - 'MAX_IMG_WIDTH_EXCEEDED' => 'Your images may only be up to %1$d pixels wide.', - - 'MESSAGE_BODY_EXPLAIN' => 'Enter your message here, it may contain no more than %d characters.', - 'MESSAGE_DELETED' => 'This message has been deleted successfully.', - 'MORE_SMILIES' => 'View more smilies', - - 'NOTIFY_REPLY' => 'Notify me when a reply is posted', - 'NOT_UPLOADED' => 'File could not be uploaded.', - 'NO_DELETE_POLL_OPTIONS' => 'You cannot delete existing poll options.', - 'NO_PM_ICON' => 'No PM icon', - 'NO_POLL_TITLE' => 'You have to enter a poll title.', - 'NO_POST' => 'The requested post does not exist.', - 'NO_POST_MODE' => 'No post mode specified.', - - 'PARTIAL_UPLOAD' => 'The uploaded file was only partially uploaded.', - 'PHP_SIZE_NA' => 'The attachment’s file size is too large.
    Could not determine the maximum size defined by PHP in php.ini.', - 'PHP_SIZE_OVERRUN' => 'The attachment’s file size is too large, the maximum upload size is %d MB.
    Please note this is set in php.ini and cannot be overridden.', - 'PLACE_INLINE' => 'Place inline', - 'POLL_DELETE' => 'Delete poll', - 'POLL_FOR' => 'Run poll for', - 'POLL_FOR_EXPLAIN' => 'Enter 0 or leave blank for a never ending poll.', - 'POLL_MAX_OPTIONS' => 'Options per user', - 'POLL_MAX_OPTIONS_EXPLAIN' => 'This is the number of options each user may select when voting.', - 'POLL_OPTIONS' => 'Poll options', - 'POLL_OPTIONS_EXPLAIN' => 'Place each option on a new line. You may enter up to %d options.', - 'POLL_OPTIONS_EDIT_EXPLAIN' => 'Place each option on a new line. You may enter up to %d options. If you remove or add options all previous votes will be reset.', - 'POLL_QUESTION' => 'Poll question', - 'POLL_TITLE_TOO_LONG' => 'The poll title must contain fewer than 100 characters.', - 'POLL_TITLE_COMP_TOO_LONG' => 'The parsed size of your poll title is too large, consider removing BBCodes or smilies.', - 'POLL_VOTE_CHANGE' => 'Allow re-voting', - 'POLL_VOTE_CHANGE_EXPLAIN' => 'If enabled users are able to change their vote.', - 'POSTED_ATTACHMENTS' => 'Posted attachments', - 'POST_APPROVAL_NOTIFY' => 'You will be notified when your post has been approved.', - 'POST_CONFIRMATION' => 'Confirmation of post', - 'POST_CONFIRM_EXPLAIN' => 'To prevent automated posts the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.', - 'POST_DELETED' => 'This message has been deleted successfully.', - 'POST_EDITED' => 'This message has been edited successfully.', - 'POST_EDITED_MOD' => 'This message has been edited successfully, but it will need to be approved by a moderator before it is publicly viewable.', - 'POST_GLOBAL' => 'Global', - 'POST_ICON' => 'Post icon', - 'POST_NORMAL' => 'Normal', - 'POST_REVIEW' => 'Post review', - 'POST_REVIEW_EXPLAIN' => 'At least one new post has been made to this topic. You may wish to review your post in light of this.', - 'POST_STORED' => 'This message has been posted successfully.', - 'POST_STORED_MOD' => 'This message has been submitted successfully, but it will need to be approved by a moderator before it is publicly viewable.', - 'POST_TOPIC_AS' => 'Post topic as', - 'PROGRESS_BAR' => 'Progress bar', - - 'QUOTE_DEPTH_EXCEEDED' => 'You may embed only %1$d quotes within each other.', - - 'SAVE' => 'Save', - 'SAVE_DATE' => 'Saved at', - 'SAVE_DRAFT' => 'Save draft', - 'SAVE_DRAFT_CONFIRM' => 'Please note that saved drafts only include the subject and the message, any other element will be removed. Do you want to save your draft now?', - 'SMILIES' => 'Smilies', - 'SMILIES_ARE_OFF' => 'Smilies are OFF', - 'SMILIES_ARE_ON' => 'Smilies are ON', - 'STICKY_ANNOUNCE_TIME_LIMIT'=> 'Sticky/Announcement time limit', - 'STICK_TOPIC_FOR' => 'Stick topic for', - 'STICK_TOPIC_FOR_EXPLAIN' => 'Enter 0 or leave blank for a never ending Sticky/Announcement.', - 'STYLES_TIP' => 'Tip: Styles can be applied quickly to selected text.', - - 'TOO_FEW_CHARS' => 'Your message contains too few characters.', - 'TOO_FEW_POLL_OPTIONS' => 'You must enter at least two poll options.', - 'TOO_MANY_ATTACHMENTS' => 'Cannot add another attachment, %d is the maximum.', - 'TOO_MANY_CHARS' => 'Your message contains too many characters.', - 'TOO_MANY_CHARS_POST' => 'Your message contains %1$d characters. The maximum number of allowed characters is %2$d.', - 'TOO_MANY_CHARS_SIG' => 'Your signature contains %1$d characters. The maximum number of allowed characters is %2$d.', - 'TOO_MANY_POLL_OPTIONS' => 'You have tried to enter too many poll options.', - 'TOO_MANY_SMILIES' => 'Your message contains too many smilies. The maximum number of smilies allowed is %d.', - 'TOO_MANY_URLS' => 'Your message contains too many URLs. The maximum number of URLs allowed is %d.', - 'TOO_MANY_USER_OPTIONS' => 'You cannot specify more options per user than existing poll options.', - 'TOPIC_BUMPED' => 'Topic has been bumped successfully.', - - 'UNAUTHORISED_BBCODE' => 'You cannot use certain BBCodes: %s.', - 'UNGLOBALISE_EXPLAIN' => 'To switch this topic back from being global to a normal topic, you need to select the forum you wish this topic to be displayed.', - 'UPDATE_COMMENT' => 'Update comment', - 'URL_INVALID' => 'The URL you specified is invalid.', - 'URL_NOT_FOUND' => 'The file specified could not be found.', - 'URL_IS_OFF' => '[url] is OFF', - 'URL_IS_ON' => '[url] is ON', - 'USER_CANNOT_BUMP' => 'You cannot bump topics in this forum.', - 'USER_CANNOT_DELETE' => 'You cannot delete posts in this forum.', - 'USER_CANNOT_EDIT' => 'You cannot edit posts in this forum.', - 'USER_CANNOT_REPLY' => 'You cannot reply in this forum.', - 'USER_CANNOT_FORUM_POST' => 'You are not able to do posting operations on this forum due to the forum type not supporting it.', - - 'VIEW_MESSAGE' => '%sView your submitted message%s', - 'VIEW_PRIVATE_MESSAGE' => '%sView your submitted private message%s', - - 'WRONG_FILESIZE' => 'The file is too big, maximum allowed size is %1d %2s.', - 'WRONG_SIZE' => 'The image must be at least %1$d pixels wide, %2$d pixels high and at most %3$d pixels wide and %4$d pixels high. The submitted image is %5$d pixels wide and %6$d pixels high.', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php deleted file mode 100644 index 8e376b2602..0000000000 --- a/phpBB/language/en/search.php +++ /dev/null @@ -1,101 +0,0 @@ - 'All available', - 'ALL_RESULTS' => 'All results', - - 'DISPLAY_RESULTS' => 'Display results as', - - 'FOUND_SEARCH_MATCH' => 'Search found %d match', - 'FOUND_SEARCH_MATCHES' => 'Search found %d matches', - 'FOUND_MORE_SEARCH_MATCHES' => 'Search found more than %d matches', - - 'GLOBAL' => 'Global announcement', - - 'IGNORED_TERMS' => 'ignored', - 'IGNORED_TERMS_EXPLAIN' => 'The following words in your search query were ignored because they are too common words: %s.', - - 'JUMP_TO_POST' => 'Jump to post', - - 'LOGIN_EXPLAIN_EGOSEARCH' => 'The board requires you to be registered and logged in to view your own posts.', - - 'NO_KEYWORDS' => 'You must specify at least one word to search for. Each word must consist of at least %d characters and must not contain more than %d characters excluding wildcards.', - 'NO_RECENT_SEARCHES' => 'No searches have been carried out recently.', - 'NO_SEARCH' => 'Sorry but you are not permitted to use the search system.', - 'NO_SEARCH_RESULTS' => 'No suitable matches were found.', - 'NO_SEARCH_TIME' => 'Sorry but you cannot use search at this time. Please try again in a few minutes.', - 'WORD_IN_NO_POST' => 'No posts were found because the word %s is not contained in any post.', - 'WORDS_IN_NO_POST' => 'No posts were found because the words %s are not contained in any post.', - - 'POST_CHARACTERS' => 'characters of posts', - - 'RECENT_SEARCHES' => 'Recent searches', - 'RESULT_DAYS' => 'Limit results to previous', - 'RESULT_SORT' => 'Sort results by', - 'RETURN_FIRST' => 'Return first', - 'RETURN_TO_SEARCH_ADV' => 'Return to advanced search', - - 'SEARCHED_FOR' => 'Search term used', - 'SEARCHED_TOPIC' => 'Searched topic', - 'SEARCH_ALL_TERMS' => 'Search for all terms or use query as entered', - 'SEARCH_ANY_TERMS' => 'Search for any terms', - 'SEARCH_AUTHOR' => 'Search for author', - 'SEARCH_AUTHOR_EXPLAIN' => 'Use * as a wildcard for partial matches.', - 'SEARCH_FIRST_POST' => 'First post of topics only', - 'SEARCH_FORUMS' => 'Search in forums', - 'SEARCH_FORUMS_EXPLAIN' => 'Select the forum or forums you wish to search in. Subforums are searched automatically if you do not disable “search subforums“ below.', - 'SEARCH_IN_RESULTS' => 'Search these results', - 'SEARCH_KEYWORDS_EXPLAIN' => 'Place + in front of a word which must be found and - in front of a word which must not be found. Put a list of words separated by | into brackets if only one of the words must be found. Use * as a wildcard for partial matches.', - 'SEARCH_MSG_ONLY' => 'Message text only', - 'SEARCH_OPTIONS' => 'Search options', - 'SEARCH_QUERY' => 'Search query', - 'SEARCH_SUBFORUMS' => 'Search subforums', - 'SEARCH_TITLE_MSG' => 'Post subjects and message text', - 'SEARCH_TITLE_ONLY' => 'Topic titles only', - 'SEARCH_WITHIN' => 'Search within', - 'SORT_ASCENDING' => 'Ascending', - 'SORT_AUTHOR' => 'Author', - 'SORT_DESCENDING' => 'Descending', - 'SORT_FORUM' => 'Forum', - 'SORT_POST_SUBJECT' => 'Post subject', - 'SORT_TIME' => 'Post time', - - 'TOO_FEW_AUTHOR_CHARS' => 'You must specify at least %d characters of the authors name.', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/search_ignore_words.php b/phpBB/language/en/search_ignore_words.php deleted file mode 100644 index 2dfdc0df13..0000000000 --- a/phpBB/language/en/search_ignore_words.php +++ /dev/null @@ -1,272 +0,0 @@ - \ No newline at end of file diff --git a/phpBB/language/en/search_synonyms.php b/phpBB/language/en/search_synonyms.php deleted file mode 100644 index b85c39e5d5..0000000000 --- a/phpBB/language/en/search_synonyms.php +++ /dev/null @@ -1,191 +0,0 @@ - 'absence', - 'abridgement' => 'abridgment', - 'accomodate' => 'accommodate', - 'acknowledgment' => 'acknowledgement', - 'airplane' => 'aeroplane', - 'allright' => 'alright ', - 'andy' => 'andrew', - 'anemia' => 'anaemia', - 'anemic' => 'anaemic', - 'anesthesia' => 'anaesthesia', - 'appologize' => 'appologise', - 'archean' => 'archaean', - 'archeology' => 'archaeology', - 'archeozoic' => 'archaeozoic', - 'armor' => 'armour', - 'artic' => 'arctic', - 'attachment' => 'attachement', - 'attendence' => 'attendance', - - 'barbecue' => 'barbeque', - 'behavior' => 'behaviour', - 'biassed' => 'biased', - 'biol' => 'biology', - 'buletin' => 'bulletin', - - 'calender' => 'calendar', - 'canceled' => 'cancelled', - 'car' => 'automobile', - 'catalog' => 'catalogue', - 'cenozoic' => 'caenozoic', - 'center' => 'centre', - 'check' => 'cheque', - 'color' => 'colour', - 'comission' => 'commission', - 'comittee' => 'committee', - 'commitee' => 'committee', - 'conceed' => 'concede', - 'creating' => 'createing', - 'curiculum' => 'curriculum', - - 'defense' => 'defence', - 'develope' => 'develop', - 'discription' => 'description', - 'dulness' => 'dullness', - - 'encyclopedia' => 'encyclopaedia', - 'enroll' => 'enrol', - 'esthetic' => 'aesthetic', - 'etiology' => 'aetiology', - 'exhorbitant' => 'exorbitant', - 'exhuberant' => 'exuberant', - 'existance' => 'existence', - - 'favorite' => 'favourite', - 'fetus' => 'foetus', - 'ficticious' => 'fictitious', - 'flavor' => 'flavour', - 'flourescent' => 'fluorescent', - 'foriegn' => 'foreign', - 'fourty' => 'forty', - - 'gage' => 'guage', - 'geneology' => 'genealogy', - 'grammer' => 'grammar', - 'gray' => 'grey', - 'guerilla' => 'guerrilla', - 'gynecology' => 'gynaecology', - - 'harbor' => 'harbour', - 'heighth' => 'height', - 'hemaglobin' => 'haemaglobin', - 'hematin' => 'haematin', - 'hematite' => 'haematite', - 'hematology' => 'haematology', - 'honor' => 'honour', - - 'innoculate' => 'inoculate', - 'installment' => 'instalment', - 'irrelevent' => 'irrelevant', - 'irrevelant' => 'irrelevant', - - 'jeweler' => 'jeweller', - 'judgement' => 'judgment', - - 'labeled' => 'labelled', - 'labor' => 'labour', - 'laborer' => 'labourer', - 'laborers' => 'labourers', - 'laboring' => 'labouring', - 'licence' => 'license', - 'liesure' => 'leisure', - 'liquify' => 'liquefy', - - 'maintainance' => 'maintenance', - 'maintenence' => 'maintenance', - 'medieval' => 'mediaeval', - 'meter' => 'metre', - 'milage' => 'mileage', - 'millipede' => 'millepede', - 'miscelaneous' => 'miscellaneous', - 'morgage' => 'mortgage', - - 'noticable' => 'noticeable', - - 'occurence' => 'occurrence', - 'offense' => 'offence', - 'ommision' => 'omission', - 'ommission' => 'omission', - 'optimize' => 'optimise', - 'organize' => 'organise', - - 'pajamas' => 'pyjamas', - 'paleography' => 'palaeography', - 'paleolithic' => 'palaeolithic', - 'paleontological' => 'palaeontological', - 'paleontologist' => 'palaeontologist', - 'paleontology' => 'palaeontology', - 'paleozoic' => 'palaeozoic', - 'pamplet' => 'pamphlet', - 'paralell' => 'parallel', - 'parl' => 'parliament', - 'parlt' => 'parliament', - 'pediatric' => 'paediatric', - 'pediatrician' => 'paediatrician', - 'pediatrics' => 'paediatrics', - 'pedodontia' => 'paedodontia', - 'pedodontics' => 'paedodontics', - 'personel' => 'personnel', - 'practise' => 'practice', - 'program' => 'programme', - 'psych' => 'psychology', - - 'questionaire' => 'questionnaire', - - 'rarify' => 'rarefy', - 'reccomend' => 'recommend', - 'recieve' => 'receive', - 'resistence' => 'resistance', - 'restaraunt' => 'restaurant', - - 'savior' => 'saviour', - 'sep' => 'september', - 'seperate' => 'separate', - 'sept' => 'september', - 'sieze' => 'seize', - 'summarize' => 'summarise', - 'summerize' => 'summarise', - 'superceed' => 'supercede', - 'superintendant' => 'superintendent', - 'supersede' => 'supercede', - 'suprise' => 'surprise', - 'surprize' => 'surprise', - 'synchronise' => 'synchronize', - - 'temperary' => 'temporary', - 'theater' => 'theatre', - 'threshhold' => 'threshold', - 'transfered' => 'transferred', - 'truely' => 'truly', - 'truley' => 'truly', - - 'useable' => 'usable', - - 'valor' => 'valour', - 'vigor' => 'vigour', - 'vol' => 'volume', - - 'whack' => 'wack', - 'withold' => 'withhold', - - 'yeild' => 'yield', -); -?> \ No newline at end of file diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php deleted file mode 100644 index dfeb1f20dd..0000000000 --- a/phpBB/language/en/ucp.php +++ /dev/null @@ -1,541 +0,0 @@ - 'By accessing “%1$s†(hereinafter “weâ€, “usâ€, “ourâ€, “%1$sâ€, “%2$sâ€), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all of the following terms then please do not access and/or use “%1$sâ€. We may change these at any time and we’ll do our utmost in informing you, though it would be prudent to review this regularly yourself as your continued usage of “%1$s†after changes mean you agree to be legally bound by these terms as they are updated and/or amended.
    -
    - Our forums are powered by phpBB (hereinafter “theyâ€, “themâ€, “theirâ€, “phpBB softwareâ€, “www.phpbb.comâ€, “phpBB Groupâ€, “phpBB Teamsâ€) which is a bulletin board solution released under the “General Public License†(hereinafter “GPLâ€) and can be downloaded from www.phpbb.com. The phpBB software only facilitates internet based discussions, the phpBB Group are not responsible for what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: http://www.phpbb.com/.
    -
    - You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any laws be it of your country, the country where “%1$s†is hosted or International Law. Doing so may lead to you being immediately and permanently banned, with notification of your Internet Service Provider if deemed required by us. The IP address of all posts are recorded to aid in enforcing these conditions. You agree that “%1$s†have the right to remove, edit, move or close any topic at any time should we see fit. As a user you agree to any information you have entered to being stored in a database. While this information will not be disclosed to any third party without your consent, neither “%1$s†nor phpBB shall be held responsible for any hacking attempt that may lead to the data being compromised. - ', - - 'PRIVACY_POLICY' => 'This policy explains in detail how “%1$s†along with its affiliated companies (hereinafter “weâ€, “usâ€, “ourâ€, “%1$sâ€, “%2$sâ€) and phpBB (hereinafter “theyâ€, “themâ€, “theirâ€, “phpBB softwareâ€, “www.phpbb.comâ€, “phpBB Groupâ€, “phpBB Teamsâ€) use any information collected during any session of usage by you (hereinafter “your informationâ€).
    -
    - Your information is collected via two ways. Firstly, by browsing “%1$s†will cause the phpBB software to create a number of cookies, which are small text files that are downloaded on to your computer’s web browser temporary files. The first two cookies just contain a user identifier (hereinafter “user-idâ€) and an anonymous session identifier (hereinafter “session-idâ€), automatically assigned to you by the phpBB software. A third cookie will be created once you have browsed topics within “%1$s†and is used to store which topics have been read, thereby improving your user experience.
    -
    - We may also create cookies external to the phpBB software whilst browsing “%1$sâ€, though these are outside the scope of this document which is intended to only cover the pages created by the phpBB software. The second way in which we collect your information is by what you submit to us. This can be, and is not limited to: posting as an anonymous user (hereinafter “anonymous postsâ€), registering on “%1$s†(hereinafter “your accountâ€) and posts submitted by you after registration and whilst logged in (hereinafter “your postsâ€).
    -
    - Your account will at a bare minimum contain a uniquely identifiable name (hereinafter “your user nameâ€), a personal password used for logging into your account (hereinafter “your passwordâ€) and a personal, valid e-mail address (hereinafter “your e-mailâ€). Your information for your account at “%1$s†is protected by data-protection laws applicable in the country that hosts us. Any information beyond your user name, your password and your e-mail required by “%1$s†during the registration process are at our digression what is mandatory and what is optional. In all cases, you have the option of what information in your account is publicly displayed. Furthermore, within your account, you have the option to opt-in or opt-out of automatically generated e-mails from the phpBB software.
    -
    - Your password is ciphered (a one-way hash) so that it is secure. However, it is recommended that you do not reuse the same password across a number of different websites. Your password is the means of accessing your account at “%1$sâ€, so please guard it carefully and under no circumstance will anyone affiliated with “%1$sâ€, phpBB or another 3rd party, legitimately ask you for your password. Should you forget your password for your account, you can use the “I forgot my password†feature provided by the phpBB software. This process will ask you to submit your user name and your e-mail, then the phpBB software will generate a new password to reclaim your account.
    - ', -)); - -// Common language entries -$lang = array_merge($lang, array( - 'ACCOUNT_ACTIVE' => 'Your account has now been activated. Thank you for registering.', - 'ACCOUNT_ACTIVE_ADMIN' => 'The account has now been activated.', - 'ACCOUNT_ACTIVE_PROFILE' => 'Your account has now been successfully reactivated.', - 'ACCOUNT_ADDED' => 'Thank you for registering, your account has been created. You may now login with your username and password.', - 'ACCOUNT_COPPA' => 'Your account has been created but has to be approved, please check your e-mail for details.', - 'ACCOUNT_EMAIL_CHANGED' => 'Your account has been updated. However, this board requires account reactivation on e-mail changes. An activation key has been sent to the new e-mail address you provided. Please check your e-mail for further information.', - 'ACCOUNT_EMAIL_CHANGED_ADMIN' => 'Your account has been updated. However, this board requires account reactivation by the administrators on e-mail changes. An e-mail has been sent to them and you will be informed when your account has been reactivated.', - 'ACCOUNT_INACTIVE' => 'Your account has been created. However, this board requires account activation, an activation key has been sent to the e-mail address you provided. Please check your e-mail for further information.', - 'ACCOUNT_INACTIVE_ADMIN' => 'Your account has been created. However, this board requires account activation by the administrator group. An e-mail has been sent to them and you will be informed when your account has been activated.', - 'ACTIVATION_EMAIL_SENT' => 'The activation e-mail has been sent to your e-mail address.', - 'ACTIVATION_EMAIL_SENT_ADMIN' => 'The activation e-mail has been sent to the administrators e-mail addresses.', - 'ADD' => 'Add', - 'ADD_BCC' => 'Add [BCC]', - 'ADD_FOES' => 'Add new foes', - 'ADD_FOES_EXPLAIN' => 'You may enter several usernames each on a different line.', - 'ADD_FOLDER' => 'Add folder', - 'ADD_FRIENDS' => 'Add new friends', - 'ADD_FRIENDS_EXPLAIN' => 'You may enter several usernames each on a different line.', - 'ADD_NEW_RULE' => 'Add new rule', - 'ADD_RULE' => 'Add rule', - 'ADD_TO' => 'Add [To]', - 'ADMIN_EMAIL' => 'Administrators can e-mail me information', - 'AGREE' => 'I agree to these terms', - 'ALLOW_PM' => 'Allow users to send you private messages', - 'ALLOW_PM_EXPLAIN' => 'Note that administrators and moderators will always be able to send you messages.', - 'ALREADY_ACTIVATED' => 'You have already activated your account.', - 'ATTACHMENTS_EXPLAIN' => 'This is a list of attachments you have made in posts to this board.', - 'ATTACHMENTS_DELETED' => 'Attachments successfully deleted.', - 'ATTACHMENT_DELETED' => 'Attachment successfully deleted.', - 'AVATAR_CATEGORY' => 'Category', - 'AVATAR_EXPLAIN' => 'Maximum dimensions; width: %1$d pixels, height: %2$d pixels, file size: %3$.2lf KiB.', - 'AVATAR_FEATURES_DISABLED' => 'The avatar functionality is currently disabled.', - 'AVATAR_GALLERY' => 'Local gallery', - 'AVATAR_GENERAL_UPLOAD_ERROR' => 'Could not upload avatar to %s.', - 'AVATAR_PAGE' => 'Page', - - 'BACK_TO_DRAFTS' => 'Back to saved drafts', - 'BACK_TO_LOGIN' => 'Back to login screen', - 'BIRTHDAY' => 'Birthday', - 'BIRTHDAY_EXPLAIN' => 'Setting a year will list your age when it is your birthday.', - 'BOARD_DATE_FORMAT' => 'My date format', - 'BOARD_DATE_FORMAT_EXPLAIN' => 'The syntax used is identical to the PHP date() function.', - 'BOARD_DST' => 'Summer Time/DST is in effect', - 'BOARD_LANGUAGE' => 'My language', - 'BOARD_STYLE' => 'My board style', - 'BOARD_TIMEZONE' => 'My timezone', - 'BOOKMARKS' => 'Bookmarks', - 'BOOKMARKS_EXPLAIN' => 'You can bookmark topics for future reference. Select the checkbox for any bookmark you wish to delete, then press the Remove marked bookmarks button.', - 'BOOKMARKS_DISABLED' => 'Bookmarks are disabled on this board.', - 'BOOKMARKS_REMOVED' => 'Bookmarks removed successfully.', - - 'CANNOT_EDIT_MESSAGE_TIME' => 'You can no longer edit or delete that message.', - 'CANNOT_MOVE_TO_SAME_FOLDER'=> 'Messages cannot be moved to the folder you want to remove.', - 'CANNOT_MOVE_FROM_SPECIAL' => 'Messages cannot be moved from the outbox.', - 'CANNOT_RENAME_FOLDER' => 'This folder cannot be renamed.', - 'CANNOT_REMOVE_FOLDER' => 'This folder cannot be removed.', - 'CHANGE_DEFAULT_GROUP' => 'Change default group', - 'CHANGE_PASSWORD' => 'Change password', - 'CLICK_RETURN_FOLDER' => '%1$sReturn to your “%3$s†folder%2$s', - 'CONFIRMATION' => 'Confirmation of registration', - 'CONFIRM_CHANGES' => 'Confirm changes', - 'CONFIRM_EMAIL' => 'Confirm e-mail address', - 'CONFIRM_EMAIL_EXPLAIN' => 'You only need to specify this if you are changing your e-mail address.', - 'CONFIRM_EXPLAIN' => 'To prevent automated registrations the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.', - 'CONFIRM_PASSWORD' => 'Confirm password', - 'CONFIRM_PASSWORD_EXPLAIN' => 'You only need to confirm your password if you changed it above.', - 'COPPA_BIRTHDAY' => 'To continue with the registration procedure please tell us when you were born.', - 'COPPA_COMPLIANCE' => 'COPPA compliance', - 'COPPA_EXPLAIN' => 'Please note that clicking submit will create your account. However it cannot be activated until a parent or guardian approves your registration. You will be emailed a copy of the necessary form with details of where to send it.', - 'CREATE_FOLDER' => 'Add folder…', - 'CURRENT_IMAGE' => 'Current image', - 'CURRENT_PASSWORD' => 'Current password', - 'CURRENT_PASSWORD_EXPLAIN' => 'You must confirm your current password if you wish to change it, alter your e-mail address or username.', - 'CUR_PASSWORD_ERROR' => 'The current password you entered is incorrect.', - 'CUSTOM_DATEFORMAT' => 'Custom…', - - 'DEFAULT_ACTION' => 'Default action', - 'DEFAULT_ACTION_EXPLAIN' => 'This action will be triggered if none of the above is applicable.', - 'DEFAULT_ADD_SIG' => 'Attach my signature by default', - 'DEFAULT_BBCODE' => 'Enable BBCode by default', - 'DEFAULT_NOTIFY' => 'Notify me upon replies by default', - 'DEFAULT_SMILIES' => 'Enable smilies by default', - 'DEFINED_RULES' => 'Defined rules', - 'DELETED_TOPIC' => 'Topic has been removed.', - 'DELETE_ATTACHMENT' => 'Delete attachment', - 'DELETE_ATTACHMENTS' => 'Delete attachments', - 'DELETE_ATTACHMENT_CONFIRM' => 'Are you sure you want to delete this attachment?', - 'DELETE_ATTACHMENTS_CONFIRM'=> 'Are you sure you want to delete these attachments?', - 'DELETE_AVATAR' => 'Delete image', - 'DELETE_COOKIES_CONFIRM' => 'Are you sure you want to delete all cookies set by this board?', - 'DELETE_MARKED_PM' => 'Delete marked messages', - 'DELETE_MARKED_PM_CONFIRM' => 'Are you sure you want to delete all marked messages?', - 'DELETE_OLDEST_MESSAGES' => 'Delete oldest messages', - 'DELETE_MESSAGE' => 'Delete message', - 'DELETE_MESSAGE_CONFIRM' => 'Are you sure you want to delete this private message?', - 'DELETE_MESSAGES_IN_FOLDER' => 'Delete all messages within removed folder', - 'DELETE_RULE' => 'Delete rule', - 'DELETE_RULE_CONFIRM' => 'Are you sure you want to delete this rule?', - 'DEMOTE_SELECTED' => 'Demote selected', - 'DISABLE_CENSORS' => 'Enable word censoring', - 'DISPLAY_GALLERY' => 'Display gallery', - 'DOMAIN_NO_MX_RECORD_EMAIL' => 'The entered e-mail domain has no valid MX record.', - 'DOWNLOADS' => 'Downloads', - 'DRAFTS_DELETED' => 'All selected drafts were successfully deleted.', - 'DRAFTS_EXPLAIN' => 'Here you can view, edit and delete your saved drafts.', - 'DRAFT_UPDATED' => 'Draft successfully updated.', - - 'EDIT_DRAFT_EXPLAIN' => 'Here you are able to edit your draft. Drafts do not contain attachment and poll information.', - 'EMAIL_BANNED_EMAIL' => 'The e-mail address you entered is not allowed to be used.', - 'EMAIL_INVALID_EMAIL' => 'The e-mail address you entered is invalid.', - 'EMAIL_REMIND' => 'This must be the e-mail address associated with your account. If you have not changed this via your user control panel then it is the e-mail address you registered your account with.', - 'EMAIL_TAKEN_EMAIL' => 'The entered e-mail address is already in use.', - 'EMPTY_DRAFT' => 'You must enter a message to submit your changes.', - 'EMPTY_DRAFT_TITLE' => 'You must enter a draft title.', - 'EXPORT_AS_XML' => 'Export as XML', - 'EXPORT_AS_CSV' => 'Export as CSV', - 'EXPORT_AS_CSV_EXCEL' => 'Export as CSV (Excel)', - 'EXPORT_AS_TXT' => 'Export as TXT', - 'EXPORT_AS_MSG' => 'Export as MSG', - 'EXPORT_FOLDER' => 'Export this view', - - 'FIELD_REQUIRED' => 'The field “%s†must be completed.', - 'FIELD_TOO_SHORT' => 'The field “%1$s†is too short, a minimum of %2$d characters is required.', - 'FIELD_TOO_LONG' => 'The field “%1$s†is too long, a maximum of %2$d characters is allowed.', - 'FIELD_TOO_SMALL' => 'The value of “%1$s†is too small, a minimum value of %2$d is required.', - 'FIELD_TOO_LARGE' => 'The value of “%1$s†is too large, a maximum value of %2$d is allowed.', - 'FIELD_INVALID_CHARS_NUMBERS_ONLY' => 'The field “%s†has invalid characters, only numbers are allowed.', - 'FIELD_INVALID_CHARS_ALPHA_ONLY' => 'The field “%s†has invalid characters, only alphanumeric characters are allowed.', - 'FIELD_INVALID_CHARS_SPACERS_ONLY' => 'The field “%s†has invalid characters, only alphanumeric, space or -+_[] characters are allowed.', - 'FIELD_INVALID_DATE' => 'The field “%s†has an invalid date.', - - 'FOE_MESSAGE' => 'Message from foe', - 'FOES_EXPLAIN' => 'Foes are users which will be ignored by default. Posts by these users will not be fully visible. Personal messages from foes are still permitted. Please note that you cannot ignore moderators or administrators.', - 'FOES_UPDATED' => 'Your foes list has been updated successfully.', - 'FOLDER_ADDED' => 'Folder successfully added.', - 'FOLDER_MESSAGE_STATUS' => '%1$d from %2$d messages stored', - 'FOLDER_NAME_EXIST' => 'Folder %s already exists.', - 'FOLDER_OPTIONS' => 'Folder options', - 'FOLDER_RENAMED' => 'Folder successfully renamed.', - 'FOLDER_REMOVED' => 'Folder successfully removed.', - 'FOLDER_STATUS_MSG' => 'Folder is %1$d%% full (%2$d from %3$d messages stored)', - 'FORWARD_PM' => 'Forward PM', - 'FORCE_PASSWORD_EXPLAIN' => 'Before you may continue browsing the board you are required to change your password.', - 'FRIEND_MESSAGE' => 'Message from friend', - 'FRIENDS' => 'Friends', - 'FRIENDS_EXPLAIN' => 'Friends enable you quick access to members you communicate with frequently. If the template has relevant support any posts made by a friend may be highlighted.', - 'FRIENDS_OFFLINE' => 'Offline', - 'FRIENDS_ONLINE' => 'Online', - 'FRIENDS_UPDATED' => 'Your friends list has been updated successfully.', - 'FULL_FOLDER_OPTION_CHANGED'=> 'The action to take when a folder is full has been changed successfully.', - 'FWD_ORIGINAL_MESSAGE' => '-------- Original Message --------', - 'FWD_SUBJECT' => 'Subject: %s', - 'FWD_DATE' => 'Date: %s', - 'FWD_FROM' => 'From: %s', - 'FWD_TO' => 'To: %s', - - 'GLOBAL_ANNOUNCEMENT' => 'Global announcement', - - 'HIDE_ONLINE' => 'Hide my online status', - 'HIDE_ONLINE_EXPLAIN' => 'Changing this setting won’t become effective until your next visit to the board.', - 'HOLD_NEW_MESSAGES' => 'Do not accept new messages (New messages will be held back until enough space is available)', - 'HOLD_NEW_MESSAGES_SHORT' => 'New messages will be held back', - - 'IF_FOLDER_FULL' => 'If folder is full', - 'IMPORTANT_NEWS' => 'Important announcements', - 'INVALID_USER_BIRTHDAY' => 'The entered birthday is not a valid date.', - 'INVALID_CHARS_USERNAME' => 'The username contains forbidden characters.', - 'INVALID_CHARS_NEW_PASSWORD'=> 'The password does not contain the required characters.', - 'ITEMS_REQUIRED' => 'The items marked with * are required profile fields and need to be filled out.', - - 'JOIN_SELECTED' => 'Join selected', - - 'LANGUAGE' => 'Language', - 'LINK_REMOTE_AVATAR' => 'Link off-site', - 'LINK_REMOTE_AVATAR_EXPLAIN'=> 'Enter the URL of the location containing the avatar image you wish to link to.', - 'LINK_REMOTE_SIZE' => 'Avatar dimensions', - 'LINK_REMOTE_SIZE_EXPLAIN' => 'Specify the width and height of the avatar, leave blank to attempt automatic verification.', - 'LOGIN_EXPLAIN_UCP' => 'Please login in order to access the User Control Panel.', - 'LOGIN_REDIRECT' => 'You have been successfully logged in.', - 'LOGOUT_FAILED' => 'You were not logged out, as the request did not match your session. Please contact the board administrator if you continue to experience problems.', - 'LOGOUT_REDIRECT' => 'You have been successfully logged out.', - - 'MARK_IMPORTANT' => 'Mark/Unmark as important', - 'MARKED_MESSAGE' => 'Marked message', - 'MAX_FOLDER_REACHED' => 'Maximum number of allowed user defined folders reached.', - 'MESSAGE_BY_AUTHOR' => 'by', - 'MESSAGE_COLOURS' => 'Message colours', - 'MESSAGE_DELETED' => 'Message successfully deleted.', - 'MESSAGE_HISTORY' => 'Message history', - 'MESSAGE_REMOVED_FROM_OUTBOX' => 'This message has been removed by its author before it was delivered.', - 'MESSAGE_SENT_ON' => 'on', - 'MESSAGE_STORED' => 'This message has been sent successfully.', - 'MESSAGE_TO' => 'To', - 'MESSAGES_DELETED' => 'Messages successfully deleted', - 'MOVE_DELETED_MESSAGES_TO' => 'Move messages from removed folder to', - 'MOVE_DOWN' => 'Move down', - 'MOVE_MARKED_TO_FOLDER' => 'Move marked to %s', - 'MOVE_PM_ERROR' => 'An error occurred while moving the messages to the new folder, only %1d from %2d messages were moved.', - 'MOVE_TO_FOLDER' => 'Move to folder', - 'MOVE_UP' => 'Move up', - - 'NEW_EMAIL_ERROR' => 'The e-mail addresses you entered do not match.', - 'NEW_FOLDER_NAME' => 'New folder name', - 'NEW_PASSWORD' => 'New password', - 'NEW_PASSWORD_ERROR' => 'The passwords you entered do not match.', - 'NOTIFY_METHOD' => 'Notification method', - 'NOTIFY_METHOD_BOTH' => 'Both', - 'NOTIFY_METHOD_EMAIL' => 'E-mail only', - 'NOTIFY_METHOD_EXPLAIN' => 'Method for sending messages sent via this board.', - 'NOTIFY_METHOD_IM' => 'Jabber only', - 'NOTIFY_ON_PM' => 'Notify me on new private messages', - 'NOT_ADDED_FRIENDS_ANONYMOUS' => 'You cannot add the anonymous user to your friends list.', - 'NOT_ADDED_FRIENDS_FOES' => 'You cannot add users to your friends list who are on your foes list.', - 'NOT_ADDED_FRIENDS_SELF' => 'You cannot add yourself to the friends list.', - 'NOT_ADDED_FOES_MOD_ADMIN' => 'You cannot add administrators and moderators to your foes list.', - 'NOT_ADDED_FOES_ANONYMOUS' => 'You cannot add the anonymous user to your foes list.', - 'NOT_ADDED_FOES_FRIENDS' => 'You cannot add users to your foes list who are on your friends list.', - 'NOT_ADDED_FOES_SELF' => 'You cannot add yourself to the foes list.', - 'NOT_AGREE' => 'I do not agree to these terms', - 'NOT_ENOUGH_SPACE_FOLDER' => 'The destination folder “%s†seems to be full. The requested action has not been taken.', - 'NOT_MOVED_MESSAGE' => 'You have 1 private message currently on hold because of full folder.', - 'NOT_MOVED_MESSAGES' => 'You have %d private messages currently on hold because of full folder.', - 'NO_ACTION_MODE' => 'No message action specified.', - 'NO_AUTHOR' => 'No author defined for this message', - 'NO_AVATAR_CATEGORY' => 'None', - - 'NO_AUTH_DELETE_MESSAGE' => 'You are not authorised to delete private messages.', - 'NO_AUTH_EDIT_MESSAGE' => 'You are not authorised to edit private messages.', - 'NO_AUTH_FORWARD_MESSAGE' => 'You are not authorised to forward private messages.', - 'NO_AUTH_GROUP_MESSAGE' => 'You are not authorised to send private messages to groups.', - 'NO_AUTH_READ_MESSAGE' => 'You are not authorised to read private messages.', - 'NO_AUTH_READ_REMOVED_MESSAGE' => 'You are not able to read this message because it was removed by the author.', - 'NO_AUTH_SEND_MESSAGE' => 'You are not authorised sending private messages.', - 'NO_AUTH_SIGNATURE' => 'You are not authorised to define a signature.', - - 'NO_BCC_RECIPIENT' => 'None', - 'NO_BOOKMARKS' => 'You have no bookmarks.', - 'NO_BOOKMARKS_SELECTED' => 'You have selected no bookmarks.', - 'NO_EDIT_READ_MESSAGE' => 'Private message cannot be edited because it has already been read.', - 'NO_EMAIL_USER' => 'The e-mail/username information submitted could not be found.', - 'NO_FOES' => 'No foes currently defined', - 'NO_FRIENDS' => 'No friends currently defined', - 'NO_FRIENDS_OFFLINE' => 'No friends offline', - 'NO_FRIENDS_ONLINE' => 'No friends online', - 'NO_GROUP_SELECTED' => 'No group specified.', - 'NO_IMPORTANT_NEWS' => 'No important announcements present.', - 'NO_MESSAGE' => 'Private message could not be found.', - 'NO_NEW_FOLDER_NAME' => 'You have to specify a new folder name.', - 'NO_NEWER_PM' => 'No newer messages.', - 'NO_OLDER_PM' => 'No older messages.', - 'NO_PASSWORD_SUPPLIED' => 'You cannot login without a password.', - 'NO_RECIPIENT' => 'No recipient defined.', - 'NO_RULES_DEFINED' => 'No rules defined.', - 'NO_SAVED_DRAFTS' => 'No drafts saved.', - 'NO_TO_RECIPIENT' => 'None', - 'NO_WATCHED_FORUMS' => 'You are not subscribed to any forums.', - 'NO_WATCHED_TOPICS' => 'You are not subscribed to any topics.', - - 'PASS_TYPE_ALPHA_EXPLAIN' => 'Password must be between %1$d and %2$d characters long, must contain letters in mixed case and must contain numbers.', - 'PASS_TYPE_ANY_EXPLAIN' => 'Must be between %1$d and %2$d characters.', - 'PASS_TYPE_CASE_EXPLAIN' => 'Password must be between %1$d and %2$d characters long and must contain letters in mixed case.', - 'PASS_TYPE_SYMBOL_EXPLAIN' => 'Password must be between %1$d and %2$d characters long, must contain letters in mixed case, must contain numbers and must contain symbols.', - 'PASSWORD' => 'Password', - 'PASSWORD_ACTIVATED' => 'Your new password has been activated.', - 'PASSWORD_UPDATED' => 'Your password has been sent successfully to your original e-mail address.', - 'PERMISSIONS_RESTORED' => 'Successfully restored original permissions.', - 'PERMISSIONS_TRANSFERRED' => 'Successfully transferred permissions from %s, you are now able to browse the board with this user’s permissions.
    Please note that admin permissions were not transferred. You are able to revert to your permission set at any time.', - 'PM_DISABLED' => 'Private messaging has been disabled on this board.', - 'PM_FROM' => 'From', - 'PM_FROM_REMOVED_AUTHOR' => 'This message was sent by a user no longer registered.', - 'PM_ICON' => 'PM icon', - 'PM_INBOX' => 'Inbox', - 'PM_NO_USERS' => 'The requested users to be added do not exist.', - 'PM_OUTBOX' => 'Outbox', - 'PM_SENTBOX' => 'Sent messages', - 'PM_SUBJECT' => 'Message subject', - 'PM_TO' => 'Send to', - 'PM_USERS_REMOVED_NO_PM' => 'Some users couldn’t be added as they have disabled private message receipt.', - 'POPUP_ON_PM' => 'Pop up window on new private message', - 'POST_EDIT_PM' => 'Edit message', - 'POST_FORWARD_PM' => 'Forward message', - 'POST_NEW_PM' => 'Compose message', - 'POST_PM_LOCKED' => 'Private messaging is locked', - 'POST_PM_POST' => 'Quote post', - 'POST_QUOTE_PM' => 'Quote message', - 'POST_REPLY_PM' => 'Reply to message', - 'PRINT_PM' => 'Print view', - 'PREFERENCES_UPDATED' => 'Your preferences have been updated.', - 'PROFILE_INFO_NOTICE' => 'Please note that this information may be viewable to other members. Be careful when including any personal details. Any fields marked with a * must be completed.', - 'PROFILE_UPDATED' => 'Your profile has been updated.', - - 'RECIPIENT' => 'Recipient', - 'RECIPIENTS' => 'Recipients', - 'REGISTRATION' => 'Registration', - 'RELEASE_MESSAGES' => '%sRelease all on-hold messages%s… they will be re-sorted into the appropriate folder if enough space is made available.', - 'REMOVE_ADDRESS' => 'Remove address', - 'REMOVE_SELECTED_BOOKMARKS' => 'Remove selected bookmarks', - 'REMOVE_SELECTED_BOOKMARKS_CONFIRM' => 'Are you sure you want to delete all selected bookmarks?', - 'REMOVE_BOOKMARK_MARKED' => 'Remove marked bookmarks', - 'REMOVE_FOLDER' => 'Remove folder', - 'REMOVE_FOLDER_CONFIRM' => 'Are you sure you want to remove this folder?', - 'RENAME' => 'Rename', - 'RENAME_FOLDER' => 'Rename folder', - 'REPLIED_MESSAGE' => 'Replied to message', - 'RESIGN_SELECTED' => 'Resign selected', - 'RETURN_FOLDER' => '%1$sReturn to previous folder%2$s', - 'RETURN_UCP' => '%sReturn to the User Control Panel%s', - 'RULE_ADDED' => 'Rule successfully added.', - 'RULE_ALREADY_DEFINED' => 'This rule was defined previously.', - 'RULE_DELETED' => 'Rule successfully removed.', - 'RULE_NOT_DEFINED' => 'Rule not correctly specified.', - 'RULE_REMOVED_MESSAGE' => 'One private message had been removed due to private message filters.', - 'RULE_REMOVED_MESSAGES' => '%d private messages were removed due to private message filters.', - - 'SAME_PASSWORD_ERROR' => 'The new password you entered is the same as your current password.', - 'SEARCH_YOUR_POSTS' => 'Show your posts', - 'SEND_PASSWORD' => 'Send password', - 'SENT_AT' => 'Sent at', - 'SHOW_EMAIL' => 'Users can contact me by e-mail', - 'SIGNATURE_EXPLAIN' => 'This is a block of text that can be added to posts you make. There is a %d character limit.', - 'SIGNATURE_PREVIEW' => 'Your signature will appear like this in posts', - 'SIGNATURE_TOO_LONG' => 'Your signature is too long.', - 'SORT' => 'Sort', - 'SORT_COMMENT' => 'File comment', - 'SORT_DOWNLOADS' => 'Downloads', - 'SORT_EXTENSION' => 'Extension', - 'SORT_FILENAME' => 'Filename', - 'SORT_POST_TIME' => 'Post time', - 'SORT_SIZE' => 'File size', - - 'TIMEZONE' => 'Timezone', - 'TO' => 'To', - 'TOO_MANY_RECIPIENTS' => 'Too many recipients.', - 'TOO_MANY_REGISTERS' => 'You have exceeded the maximum number of registration attempts for this session. Please try again later.', - - 'UCP' => 'User Control Panel', - 'UCP_ACTIVATE' => 'Activate account', - 'UCP_ADMIN_ACTIVATE' => 'Please note that you will need to enter a valid e-mail address before your account is activated. The administrator will review your account and if approved you will receive an e-mail at the address you specified.', - 'UCP_AIM' => 'AOL Instant Messenger', - 'UCP_ATTACHMENTS' => 'Attachments', - 'UCP_COPPA_BEFORE' => 'Before %s', - 'UCP_COPPA_ON_AFTER' => 'On or after %s', - 'UCP_EMAIL_ACTIVATE' => 'Please note that you will need to enter a valid e-mail address before your account is activated. You will receive an e-mail at the address you provide that contains an account activation link.', - 'UCP_ICQ' => 'ICQ number', - 'UCP_JABBER' => 'Jabber address', - - 'UCP_MAIN' => 'Overview', - 'UCP_MAIN_ATTACHMENTS' => 'Manage attachments', - 'UCP_MAIN_BOOKMARKS' => 'Manage bookmarks', - 'UCP_MAIN_DRAFTS' => 'Manage drafts', - 'UCP_MAIN_FRONT' => 'Front page', - 'UCP_MAIN_SUBSCRIBED' => 'Manage subscriptions', - - 'UCP_MSNM' => 'MSN Messenger', - 'UCP_NO_ATTACHMENTS' => 'You have posted no files.', - - 'UCP_PREFS' => 'Board preferences', - 'UCP_PREFS_PERSONAL' => 'Edit global settings', - 'UCP_PREFS_POST' => 'Edit posting defaults', - 'UCP_PREFS_VIEW' => 'Edit display options', - - 'UCP_PM' => 'Private messages', - 'UCP_PM_COMPOSE' => 'Compose message', - 'UCP_PM_DRAFTS' => 'Manage PM drafts', - 'UCP_PM_OPTIONS' => 'Rules, folders & settings', - 'UCP_PM_POPUP' => 'Private messages', - 'UCP_PM_POPUP_TITLE' => 'Private message popup', - 'UCP_PM_UNREAD' => 'Unread messages', - 'UCP_PM_VIEW' => 'View messages', - - 'UCP_PROFILE' => 'Profile', - 'UCP_PROFILE_AVATAR' => 'Edit avatar', - 'UCP_PROFILE_PROFILE_INFO' => 'Edit profile', - 'UCP_PROFILE_REG_DETAILS' => 'Edit account settings', - 'UCP_PROFILE_SIGNATURE' => 'Edit signature', - - 'UCP_USERGROUPS' => 'Usergroups', - 'UCP_USERGROUPS_MEMBER' => 'Edit memberships', - 'UCP_USERGROUPS_MANAGE' => 'Manage groups', - - 'UCP_REGISTER_DISABLE' => 'Creating a new account is currently not possible.', - 'UCP_REMIND' => 'Send password', - 'UCP_RESEND' => 'Send activation e-mail', - 'UCP_WELCOME' => 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.', - 'UCP_YIM' => 'Yahoo Messenger', - 'UCP_ZEBRA' => 'Friends & Foes', - 'UCP_ZEBRA_FOES' => 'Manage foes', - 'UCP_ZEBRA_FRIENDS' => 'Manage friends', - 'UNKNOWN_FOLDER' => 'Unknown folder', - 'UNWATCH_MARKED' => 'Unwatch marked', - 'UPLOAD_AVATAR_FILE' => 'Upload from your machine', - 'UPLOAD_AVATAR_URL' => 'Upload from a URL', - 'UPLOAD_AVATAR_URL_EXPLAIN' => 'Enter the URL of the location containing the image. The image will be copied to this site.', - 'USERNAME_ALPHA_ONLY_EXPLAIN' => 'Username must be between %1$d and %2$d chars long and use only alphanumeric characters.', - 'USERNAME_ALPHA_SPACERS_EXPLAIN'=> 'Username must be between %1$d and %2$d chars long and use alphanumeric, space or -+_[] characters.', - 'USERNAME_ASCII_EXPLAIN' => 'Username must be between %1$d and %2$d chars long and use only ASCII characters, so no special symbols.', - 'USERNAME_LETTER_NUM_EXPLAIN' => 'Username must be between %1$d and %2$d chars long and use only letter or number characters.', - 'USERNAME_LETTER_NUM_SPACERS_EXPLAIN'=> 'Username must be between %1$d and %2$d chars long and use letter, number, space or -+_[] characters.', - 'USERNAME_CHARS_ANY_EXPLAIN' => 'Length must be between %1$d and %2$d characters.', - 'USERNAME_TAKEN_USERNAME' => 'The username you entered is already in use, please select an alternative.', - 'USERNAME_DISALLOWED_USERNAME' => 'The username you entered has been disallowed or contains a disallowed word. Please choose a different name.', - 'USER_NOT_FOUND_OR_INACTIVE' => 'The usernames you specified could either not be found or are not activated users.', - - 'VIEW_AVATARS' => 'Display avatars', - 'VIEW_EDIT' => 'View/Edit', - 'VIEW_FLASH' => 'Display Flash animations', - 'VIEW_IMAGES' => 'Display images within posts', - 'VIEW_NEXT_HISTORY' => 'Next PM in history', - 'VIEW_NEXT_PM' => 'Next PM', - 'VIEW_PM' => 'View message', - 'VIEW_PM_INFO' => 'Message details', - 'VIEW_PM_MESSAGE' => '1 message', - 'VIEW_PM_MESSAGES' => '%d messages', - 'VIEW_PREVIOUS_HISTORY' => 'Previous PM in history', - 'VIEW_PREVIOUS_PM' => 'Previous PM', - 'VIEW_SIGS' => 'Display signatures', - 'VIEW_SMILIES' => 'Display smilies as images', - 'VIEW_TOPICS_DAYS' => 'Display topics from previous days', - 'VIEW_TOPICS_DIR' => 'Display topic order direction', - 'VIEW_TOPICS_KEY' => 'Display topics ordering by', - 'VIEW_POSTS_DAYS' => 'Display posts from previous days', - 'VIEW_POSTS_DIR' => 'Display post order direction', - 'VIEW_POSTS_KEY' => 'Display posts ordering by', - - 'WATCHED_EXPLAIN' => 'Below is a list of forums and topics you are subscribed to. You will be notified of new posts in either. To unsubscribe mark the forum or topic and then press the Unwatch marked button.', - 'WATCHED_FORUMS' => 'Watched forums', - 'WATCHED_TOPICS' => 'Watched topics', - 'WRONG_ACTIVATION' => 'The activation key you supplied does not match any in the database.', - - 'YOUR_DETAILS' => 'Your activity', - 'YOUR_FOES' => 'Your foes', - 'YOUR_FOES_EXPLAIN' => 'To remove usernames select them and click submit.', - 'YOUR_FRIENDS' => 'Your friends', - 'YOUR_FRIENDS_EXPLAIN' => 'To remove usernames select them and click submit.', - 'YOUR_WARNINGS' => 'Your warning level', - - 'PM_ACTION' => array( - 'PLACE_INTO_FOLDER' => 'Place into folder', - 'MARK_AS_READ' => 'Mark as read', - 'MARK_AS_IMPORTANT' => 'Mark message', - 'DELETE_MESSAGE' => 'Delete message' - ), - 'PM_CHECK' => array( - 'SUBJECT' => 'Subject', - 'SENDER' => 'Sender', - 'MESSAGE' => 'Message', - 'STATUS' => 'Message status', - 'TO' => 'Sent To' - ), - 'PM_RULE' => array( - 'IS_LIKE' => 'is like', - 'IS_NOT_LIKE' => 'is not like', - 'IS' => 'is', - 'IS_NOT' => 'is not', - 'BEGINS_WITH' => 'begins with', - 'ENDS_WITH' => 'ends with', - 'IS_FRIEND' => 'is friend', - 'IS_FOE' => 'is foe', - 'IS_USER' => 'is user', - 'IS_GROUP' => 'is in usergroup', - 'ANSWERED' => 'answered', - 'FORWARDED' => 'forwarded', - 'TO_GROUP' => 'to my default usergroup', - 'TO_ME' => 'to me' - ), - - - 'GROUPS_EXPLAIN' => 'Usergroups enable board admins to better administer users. By default you will be placed in a specific group, this is your default group. This group defines how you may appear to other users, for example your username colouration, avatar, rank, etc. Depending on whether the administrator allows it you may be allowed to change your default group. You may also be placed in or allowed to join other groups. Some groups may give you additional permissions to view content or increase your capabilities in other areas.', - 'GROUP_LEADER' => 'Leaderships', - 'GROUP_MEMBER' => 'Memberships', - 'GROUP_PENDING' => 'Pending memberships', - 'GROUP_NONMEMBER' => 'Non-memberships', - 'GROUP_DETAILS' => 'Group details', - - 'NO_LEADER' => 'No group leaderships', - 'NO_MEMBER' => 'No group memberships', - 'NO_PENDING' => 'No pending memberships', - 'NO_NONMEMBER' => 'No non-member groups', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php deleted file mode 100644 index 546f91587d..0000000000 --- a/phpBB/language/en/viewforum.php +++ /dev/null @@ -1,66 +0,0 @@ - 'Active topics', - 'ANNOUNCEMENTS' => 'Announcements', - - 'FORUM_PERMISSIONS' => 'Forum permissions', - - 'ICON_ANNOUNCEMENT' => 'Announcement', - 'ICON_STICKY' => 'Sticky', - - 'LOGIN_NOTIFY_FORUM' => 'You have been notified about this forum, please login to view it.', - - 'MARK_TOPICS_READ' => 'Mark topics read', - - 'NEW_POSTS_HOT' => 'New posts [ Popular ]', - 'NEW_POSTS_LOCKED' => 'New posts [ Locked ]', - 'NO_NEW_POSTS_HOT' => 'No new posts [ Popular ]', - 'NO_NEW_POSTS_LOCKED' => 'No new posts [ Locked ]', - 'NO_READ_ACCESS' => 'You do not have the required permissions to read topics within this forum.', - - 'POST_FORUM_LOCKED' => 'Forum is locked', - - 'TOPICS_MARKED' => 'The topics for this forum have now been marked read.', - - 'VIEW_FORUM' => 'View forum', - 'VIEW_FORUM_TOPIC' => '1 topic', - 'VIEW_FORUM_TOPICS' => '%d topics', -)); - -?> \ No newline at end of file diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php deleted file mode 100644 index 337a21c11f..0000000000 --- a/phpBB/language/en/viewtopic.php +++ /dev/null @@ -1,112 +0,0 @@ - 'Attachment', - 'ATTACHMENT_FUNCTIONALITY_DISABLED' => 'The attachments feature has been disabled.', - - 'BOOKMARK_ADDED' => 'Bookmarked topic successfully.', - 'BOOKMARK_REMOVED' => 'Removed bookmarked topic successfully.', - 'BOOKMARK_TOPIC' => 'Bookmark topic', - 'BOOKMARK_TOPIC_REMOVE' => 'Remove from bookmarks', - 'BUMPED_BY' => 'Last bumped by %1$s on %2$s.', - 'BUMP_TOPIC' => 'Bump topic', - - 'CODE' => 'Code', - - 'DELETE_TOPIC' => 'Delete topic', - 'DOWNLOAD_NOTICE' => 'You do not have the required permissions to view the files attached to this post.', - - 'EDITED_TIMES_TOTAL' => 'Last edited by %1$s on %2$s, edited %3$d times in total.', - 'EDITED_TIME_TOTAL' => 'Last edited by %1$s on %2$s, edited %3$d time in total.', - 'EMAIL_TOPIC' => 'E-mail friend', - 'ERROR_NO_ATTACHMENT' => 'The selected attachment does not exist anymore.', - - 'FILE_NOT_FOUND_404' => 'The file %s does not exist.', - 'FORK_TOPIC' => 'Copy topic', - - 'LINKAGE_FORBIDDEN' => 'You are not authorised to view, download or link from/to this site.', - 'LOGIN_NOTIFY_TOPIC' => 'You have been notified about this topic, please login to view it.', - 'LOGIN_VIEWTOPIC' => 'The board requires you to be registered and logged in to view this topic.', - - 'MAKE_ANNOUNCE' => 'Change to “Announcementâ€', - 'MAKE_GLOBAL' => 'Change to “Globalâ€', - 'MAKE_NORMAL' => 'Change to “Standard Topicâ€', - 'MAKE_STICKY' => 'Change to “Stickyâ€', - 'MAX_OPTIONS_SELECT' => 'You may select up to %d options', - 'MAX_OPTION_SELECT' => 'You may select 1 option', - 'MISSING_INLINE_ATTACHMENT' => 'The attachment %s is no longer available', - 'MOVE_TOPIC' => 'Move topic', - - 'NO_ATTACHMENT_SELECTED'=> 'You haven’t selected an attachment to download or view.', - 'NO_NEWER_TOPICS' => 'There are no newer topics in this forum.', - 'NO_OLDER_TOPICS' => 'There are no older topics in this forum.', - 'NO_UNREAD_POSTS' => 'There are no new unread posts for this topic.', - 'NO_VOTE_OPTION' => 'You must specify an option when voting.', - 'NO_VOTES' => 'No votes', - - 'POLL_ENDED_AT' => 'Poll ended at %s', - 'POLL_RUN_TILL' => 'Poll runs till %s', - 'POLL_VOTED_OPTION' => 'You voted for this option', - 'PRINT_TOPIC' => 'Print view', - - 'QUICK_MOD' => 'Quick-mod tools', - 'QUOTE' => 'Quote', - - 'REPLY_TO_TOPIC' => 'Reply to topic', - 'RETURN_POST' => '%sReturn to the post%s', - - 'SUBMIT_VOTE' => 'Submit vote', - - 'TOTAL_VOTES' => 'Total votes', - - 'UNLOCK_TOPIC' => 'Unlock topic', - - 'VIEW_INFO' => 'Post details', - 'VIEW_NEXT_TOPIC' => 'Next topic', - 'VIEW_PREVIOUS_TOPIC' => 'Previous topic', - 'VIEW_RESULTS' => 'View results', - 'VIEW_TOPIC_POST' => '1 post', - 'VIEW_TOPIC_POSTS' => '%d posts', - 'VIEW_UNREAD_POST' => 'First unread post', - 'VISIT_WEBSITE' => 'WWW', - 'VOTE_SUBMITTED' => 'Your vote has been cast.', - 'VOTE_CONVERTED' => 'Changing votes is not supported for converted polls.', - -)); - -?> \ No newline at end of file diff --git a/phpBB/language/lang_english/email/admin_activate.tpl b/phpBB/language/lang_english/email/admin_activate.tpl new file mode 100644 index 0000000000..ea0af53880 --- /dev/null +++ b/phpBB/language/lang_english/email/admin_activate.tpl @@ -0,0 +1,10 @@ +Subject: New user account +Charset: iso-8859-1 + +Hello, + +The account owned by "{USERNAME}" has been deactivated or newly created, you should check the details of this user (if required) and activate it using the following link: + +{U_ACTIVATE} + +{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_english/email/admin_send_email.tpl b/phpBB/language/lang_english/email/admin_send_email.tpl new file mode 100644 index 0000000000..234f61df52 --- /dev/null +++ b/phpBB/language/lang_english/email/admin_send_email.tpl @@ -0,0 +1,12 @@ +Charset: iso-8859-1 + +The following is an email sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address: + +{BOARD_EMAIL} + +Include this full email (particularly the headers). + +Message sent to you follows: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +{MESSAGE} diff --git a/phpBB/language/lang_english/email/admin_welcome_activated.tpl b/phpBB/language/lang_english/email/admin_welcome_activated.tpl new file mode 100644 index 0000000000..3b7aa48362 --- /dev/null +++ b/phpBB/language/lang_english/email/admin_welcome_activated.tpl @@ -0,0 +1,8 @@ +Subject: Account Activated +Charset: iso-8859-1 + +Hello {USERNAME}, + +Your account on "{SITENAME}" has now been activated, you may login using the username and password you received in a previous email. + +{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/lang_english/email/admin_welcome_inactive.tpl similarity index 72% rename from phpBB/language/en/email/admin_welcome_inactive.txt rename to phpBB/language/lang_english/email/admin_welcome_inactive.tpl index 746d13da7a..905e71696b 100644 --- a/phpBB/language/en/email/admin_welcome_inactive.txt +++ b/phpBB/language/lang_english/email/admin_welcome_inactive.tpl @@ -1,17 +1,16 @@ -Subject: Welcome to "{SITENAME}" +Subject: Welcome to {SITENAME} Forums +Charset: iso-8859-1 {WELCOME_MSG} -Please keep this e-mail for your records. Your account information is as follows: +Please keep this email for your records. Your account information is as follows: ---------------------------- Username: {USERNAME} Password: {PASSWORD} - -Board URL: {U_BOARD} ---------------------------- -Your account is currently inactive, the administrator of the board will need to activate it before you can log in. You will receive another e-mail when this has occurred. +Your account is currently inactive, the administrator of the board will need to activate it before you can log in. You will receive another email when this has occured. Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account. diff --git a/phpBB/language/en/email/coppa_welcome_inactive.txt b/phpBB/language/lang_english/email/coppa_welcome_inactive.tpl similarity index 69% rename from phpBB/language/en/email/coppa_welcome_inactive.txt rename to phpBB/language/lang_english/email/coppa_welcome_inactive.tpl index f079ddb838..5d9b250846 100644 --- a/phpBB/language/en/email/coppa_welcome_inactive.txt +++ b/phpBB/language/lang_english/email/coppa_welcome_inactive.tpl @@ -1,8 +1,9 @@ -Subject: Welcome to "{SITENAME}" +Subject: Welcome to {SITENAME} Forums +Charset: iso-8859-1 {WELCOME_MSG} -In compliance with the COPPA your account is currently inactive. +In compliance with the COPPA act your account is currently inactive. Please print this message out and have your parent or guardian sign and date it. Then fax it to: @@ -13,18 +14,27 @@ OR mail it to: {MAIL_INFO} ------------------------------ CUT HERE ------------------------------ -Permission to participate at "{SITENAME}" - {U_BOARD} +Permission to Participate at {SITENAME} Username: {USERNAME} Password: {PASSWORD} -E-mail: {EMAIL_ADDRESS} +Email: {EMAIL_ADDRESS} -I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO "{SITENAME}" TO STORE THIS INFORMATION. +ICQ Number: {ICQ} +AIM Address: {AIM} +MSN Messenger: {MSN} +Yahoo Messenger: {YIM} +Web Site: {WEB_SITE} +From: {FROM} +Occupation: {OCC} +Interests: {INTERESTS} + +I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO {SITENAME} TO STORE THIS INFORMATION. I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. -I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM "{SITENAME}" AT ANY TIME. +I UNDERSTAND THAT I MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM {SITENAME} AT ANY TIME. -Parent or guardian +Parent or Guardian (print your name here): _____________________ (sign here): __________________ diff --git a/phpBB/language/lang_english/email/group_added.tpl b/phpBB/language/lang_english/email/group_added.tpl new file mode 100644 index 0000000000..5707da9031 --- /dev/null +++ b/phpBB/language/lang_english/email/group_added.tpl @@ -0,0 +1,12 @@ +Subject: You have been added to this usergroup +Charset: iso-8859-1 + +Congratulations, + +You have been added to the "{GROUP_NAME}" group on {SITENAME}. +This action was done by the group moderator or the site administrator, contact them for more information. + +You can view your groups information here: +{U_GROUPCP} + +{EMAIL_SIG} diff --git a/phpBB/language/en/email/group_approved.txt b/phpBB/language/lang_english/email/group_approved.tpl similarity index 54% rename from phpBB/language/en/email/group_approved.txt rename to phpBB/language/lang_english/email/group_approved.tpl index 24afefcd07..38773c513d 100644 --- a/phpBB/language/en/email/group_approved.txt +++ b/phpBB/language/lang_english/email/group_approved.tpl @@ -1,10 +1,11 @@ Subject: Your request has been approved +Charset: iso-8859-1 Congratulations, -Your request to join the "{GROUP_NAME}" group on "{SITENAME}" has been approved. +Your request to join the "{GROUP_NAME}" group on {SITENAME} has been approved. Click on the following link to see your group membership. -{U_GROUP} +{U_GROUPCP} {EMAIL_SIG} diff --git a/phpBB/language/en/email/group_request.txt b/phpBB/language/lang_english/email/group_request.tpl similarity index 56% rename from phpBB/language/en/email/group_request.txt rename to phpBB/language/lang_english/email/group_request.tpl index 85664857dd..4b0d129695 100644 --- a/phpBB/language/en/email/group_request.txt +++ b/phpBB/language/lang_english/email/group_request.tpl @@ -1,10 +1,11 @@ Subject: A request to join your group has been made +Charset: iso-8859-1 -Dear {USERNAME}, +Dear {GROUP_MODERATOR}, -A user has requested to join the group "{GROUP_NAME}" you moderate on "{SITENAME}". +A user has requested to join a group you moderate on {SITENAME}. To approve or deny this request for group membership please visit the following link: -{U_PENDING} +{U_GROUPCP} {EMAIL_SIG} diff --git a/phpBB/files/index.htm b/phpBB/language/lang_english/email/index.htm similarity index 100% rename from phpBB/files/index.htm rename to phpBB/language/lang_english/email/index.htm diff --git a/phpBB/language/lang_english/email/privmsg_notify.tpl b/phpBB/language/lang_english/email/privmsg_notify.tpl new file mode 100644 index 0000000000..2a96ee8c61 --- /dev/null +++ b/phpBB/language/lang_english/email/privmsg_notify.tpl @@ -0,0 +1,12 @@ +Subject: New Private Message has arrived +Charset: iso-8859-1 + +Hello {USERNAME}, + +You have received a new private message to your account on "{SITENAME}" and you have requested that you be notified on this event. You can view your new message by clicking on the following link: + +{U_INBOX} + +Remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile. + +{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/lang_english/email/profile_send_email.tpl b/phpBB/language/lang_english/email/profile_send_email.tpl new file mode 100644 index 0000000000..00dcde1e46 --- /dev/null +++ b/phpBB/language/lang_english/email/profile_send_email.tpl @@ -0,0 +1,14 @@ +Charset: iso-8859-1 + +Hello {TO_USERNAME}, + +The following is an email sent to you by {FROM_USERNAME} via your account on {SITENAME}. If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address: + +{BOARD_EMAIL} + +Include this full email (particularly the headers). Please note that the reply address to this email has been set to that of {FROM_USERNAME}. + +Message sent to you follows +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +{MESSAGE} diff --git a/phpBB/language/lang_english/email/topic_notify.tpl b/phpBB/language/lang_english/email/topic_notify.tpl new file mode 100644 index 0000000000..574f955c40 --- /dev/null +++ b/phpBB/language/lang_english/email/topic_notify.tpl @@ -0,0 +1,14 @@ +Subject: Topic Reply Notification - {TOPIC_TITLE} +Charset: iso-8859-1 + +Hello, + +You are receiving this email because you are watching the topic, "{TOPIC_TITLE}" at {SITENAME}. This topic has received a reply since your last visit. You can use the following link to view the replies made, no more notifications will be sent until you visit the topic. + +{U_TOPIC} + +If you no longer wish to watch this topic you can either click the "Stop watching this topic link" found at the bottom of the topic above, or by clicking the following link: + +{U_STOP_WATCHING_TOPIC} + +{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/language/en/email/user_activate.txt b/phpBB/language/lang_english/email/user_activate.tpl similarity index 88% rename from phpBB/language/en/email/user_activate.txt rename to phpBB/language/lang_english/email/user_activate.tpl index 7d7960c4c5..0adeb5bff2 100644 --- a/phpBB/language/en/email/user_activate.txt +++ b/phpBB/language/lang_english/email/user_activate.tpl @@ -1,4 +1,5 @@ Subject: Reactivate your account +Charset: iso-8859-1 Hello {USERNAME}, diff --git a/phpBB/language/en/email/user_activate_passwd.txt b/phpBB/language/lang_english/email/user_activate_passwd.tpl similarity index 56% rename from phpBB/language/en/email/user_activate_passwd.txt rename to phpBB/language/lang_english/email/user_activate_passwd.tpl index 695be115f8..0c2adc82ec 100644 --- a/phpBB/language/en/email/user_activate_passwd.txt +++ b/phpBB/language/lang_english/email/user_activate_passwd.tpl @@ -1,8 +1,9 @@ Subject: New password activation +Charset: iso-8859-1 Hello {USERNAME} -You are receiving this notification because you have (or someone pretending to be you has) requested a new password be sent for your account on "{SITENAME}". If you did not request this notification then please ignore it, if you keep receiving it please contact the board administrator. +You are receiving this email because you have (or someone pretending to be you has) requested a new password be sent for your account on {SITENAME}. If you did not request this email then please ignore it, if you keep receiving it please contact the board administrator. To use the new password you need to activate it. To do this click the link provided below. diff --git a/phpBB/language/en/email/user_welcome.txt b/phpBB/language/lang_english/email/user_welcome.tpl similarity index 71% rename from phpBB/language/en/email/user_welcome.txt rename to phpBB/language/lang_english/email/user_welcome.tpl index 6c3cee0b50..42dc56df3b 100644 --- a/phpBB/language/en/email/user_welcome.txt +++ b/phpBB/language/lang_english/email/user_welcome.tpl @@ -1,14 +1,13 @@ -Subject: Welcome to "{SITENAME}" +Subject: Welcome to {SITENAME} Forums +Charset: iso-8859-1 {WELCOME_MSG} -Please keep this e-mail for your records. Your account information is as follows: +Please keep this email for your records. Your account information is as follows: ---------------------------- Username: {USERNAME} Password: {PASSWORD} - -Board URL: {U_BOARD} ---------------------------- Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account. diff --git a/phpBB/language/en/email/user_welcome_inactive.txt b/phpBB/language/lang_english/email/user_welcome_inactive.tpl similarity index 76% rename from phpBB/language/en/email/user_welcome_inactive.txt rename to phpBB/language/lang_english/email/user_welcome_inactive.tpl index 4b6d96ddd8..6ece2d4faf 100644 --- a/phpBB/language/en/email/user_welcome_inactive.txt +++ b/phpBB/language/lang_english/email/user_welcome_inactive.tpl @@ -1,14 +1,13 @@ -Subject: Welcome to "{SITENAME}" +Subject: Welcome to {SITENAME} Forums +Charset: iso-8859-1 {WELCOME_MSG} -Please keep this e-mail for your records. Your account information is as follows: +Please keep this email for your records. Your account information is as follows: ---------------------------- Username: {USERNAME} Password: {PASSWORD} - -Board URL: {U_BOARD} ---------------------------- Your account is currently inactive. You cannot use it until you visit the following link: diff --git a/phpBB/images/avatars/upload/index.htm b/phpBB/language/lang_english/index.htm similarity index 100% rename from phpBB/images/avatars/upload/index.htm rename to phpBB/language/lang_english/index.htm diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php new file mode 100644 index 0000000000..ed915ca8ee --- /dev/null +++ b/phpBB/language/lang_english/lang_admin.php @@ -0,0 +1,766 @@ +Admin Index link in the left pane. To return to the index of your board, click the phpBB logo also in the left pane. The other links on the left hand side of this screen will allow you to control every aspect of your forum experience. Each screen will have instructions on how to use the tools.'; +$lang['Main_index'] = 'Forum Index'; +$lang['Forum_stats'] = 'Forum Statistics'; +$lang['Admin_Index'] = 'Admin Index'; +$lang['Preview_forum'] = 'Preview Forum'; + +$lang['Click_return_admin_index'] = 'Click %sHere%s to return to the Admin Index'; + +$lang['Statistic'] = 'Statistic'; +$lang['Value'] = 'Value'; +$lang['Number_posts'] = 'Number of posts'; +$lang['Posts_per_day'] = 'Posts per day'; +$lang['Number_topics'] = 'Number of topics'; +$lang['Topics_per_day'] = 'Topics per day'; +$lang['Number_users'] = 'Number of users'; +$lang['Users_per_day'] = 'Users per day'; +$lang['Board_started'] = 'Board started'; +$lang['Avatar_dir_size'] = 'Avatar directory size'; +$lang['Database_size'] = 'Database size'; +$lang['Gzip_compression'] ='Gzip compression'; +$lang['Not_available'] = 'Not available'; + +$lang['ON'] = 'ON'; // This is for GZip compression +$lang['OFF'] = 'OFF'; + + +// +// DB Utils +// +$lang['Database_Utilities'] = 'Database Utilities'; + +$lang['Restore'] = 'Restore'; +$lang['Backup'] = 'Backup'; +$lang['Restore_explain'] = 'This will perform a full restore of all phpBB tables from a saved file. If your server supports it, you may upload a gzip-compressed text file and it will automatically be decompressed. WARNING: This will overwrite any existing data. The restore may take a long time to process, so please do not move from this page until it is complete.'; +$lang['Backup_explain'] = 'Here you can back up all your phpBB-related data. If you have any additional custom tables in the same database with phpBB that you would like to back up as well, please enter their names, separated by commas, in the Additional Tables textbox below. If your server supports it you may also gzip-compress the file to reduce its size before download.'; + +$lang['Backup_options'] = 'Backup options'; +$lang['Start_backup'] = 'Start Backup'; +$lang['Full_backup'] = 'Full backup'; +$lang['Structure_backup'] = 'Structure-Only backup'; +$lang['Data_backup'] = 'Data only backup'; +$lang['Additional_tables'] = 'Additional tables'; +$lang['Gzip_compress'] = 'Gzip compress file'; +$lang['Select_file'] = 'Select a file'; +$lang['Start_Restore'] = 'Start Restore'; + +$lang['Restore_success'] = 'The Database has been successfully restored.

    Your board should be back to the state it was when the backup was made.'; +$lang['Backup_download'] = 'Your download will start shortly; please wait until it begins.'; +$lang['Backups_not_supported'] = 'Sorry, but database backups are not currently supported for your database system.'; + +$lang['Restore_Error_uploading'] = 'Error in uploading the backup file'; +$lang['Restore_Error_filename'] = 'Filename problem; please try an alternative file'; +$lang['Restore_Error_decompress'] = 'Cannot decompress a gzip file; please upload a plain text version'; +$lang['Restore_Error_no_file'] = 'No file was uploaded'; + + +// +// Auth pages +// +$lang['Select_a_User'] = 'Select a User'; +$lang['Select_a_Group'] = 'Select a Group'; +$lang['Select_a_Forum'] = 'Select a Forum'; +$lang['Auth_Control_User'] = 'User Permissions Control'; +$lang['Auth_Control_Group'] = 'Group Permissions Control'; +$lang['Auth_Control_Forum'] = 'Forum Permissions Control'; +$lang['Look_up_User'] = 'Look up User'; +$lang['Look_up_Group'] = 'Look up Group'; +$lang['Look_up_Forum'] = 'Look up Forum'; + +$lang['Group_auth_explain'] = 'Here you can alter the permissions and moderator status assigned to each user group. Do not forget when changing group permissions that individual user permissions may still allow the user entry to forums, etc. You will be warned if this is the case.'; +$lang['User_auth_explain'] = 'Here you can alter the permissions and moderator status assigned to each individual user. Do not forget when changing user permissions that group permissions may still allow the user entry to forums, etc. You will be warned if this is the case.'; +$lang['Forum_auth_explain'] = 'Here you can alter the authorisation levels of each forum. You will have both a simple and advanced method for doing this, where advanced offers greater control of each forum operation. Remember that changing the permission level of forums will affect which users can carry out the various operations within them.'; + +$lang['Simple_mode'] = 'Simple Mode'; +$lang['Advanced_mode'] = 'Advanced Mode'; +$lang['Moderator_status'] = 'Moderator status'; + +$lang['Allowed_Access'] = 'Allowed Access'; +$lang['Disallowed_Access'] = 'Disallowed Access'; +$lang['Is_Moderator'] = 'Is Moderator'; +$lang['Not_Moderator'] = 'Not Moderator'; + +$lang['Conflict_warning'] = 'Authorisation Conflict Warning'; +$lang['Conflict_access_userauth'] = 'This user still has access rights to this forum via group membership. You may want to alter the group permissions or remove this user the group to fully prevent them having access rights. The groups granting rights (and the forums involved) are noted below.'; +$lang['Conflict_mod_userauth'] = 'This user still has moderator rights to this forum via group membership. You may want to alter the group permissions or remove this user the group to fully prevent them having moderator rights. The groups granting rights (and the forums involved) are noted below.'; + +$lang['Conflict_access_groupauth'] = 'The following user (or users) still have access rights to this forum via their user permission settings. You may want to alter the user permissions to fully prevent them having access rights. The users granted rights (and the forums involved) are noted below.'; +$lang['Conflict_mod_groupauth'] = 'The following user (or users) still have moderator rights to this forum via their user permissions settings. You may want to alter the user permissions to fully prevent them having moderator rights. The users granted rights (and the forums involved) are noted below.'; + +$lang['Public'] = 'Public'; +$lang['Private'] = 'Private'; +$lang['Registered'] = 'Registered'; +$lang['Administrators'] = 'Administrators'; +$lang['Hidden'] = 'Hidden'; + +// These are displayed in the drop down boxes for advanced +// mode forum auth, try and keep them short! +$lang['Forum_ALL'] = 'ALL'; +$lang['Forum_REG'] = 'REG'; +$lang['Forum_PRIVATE'] = 'PRIVATE'; +$lang['Forum_MOD'] = 'MOD'; +$lang['Forum_ADMIN'] = 'ADMIN'; + +$lang['View'] = 'View'; +$lang['Read'] = 'Read'; +$lang['Post'] = 'Post'; +$lang['Reply'] = 'Reply'; +$lang['Edit'] = 'Edit'; +$lang['Delete'] = 'Delete'; +$lang['Sticky'] = 'Sticky'; +$lang['Announce'] = 'Announce'; +$lang['Vote'] = 'Vote'; +$lang['Pollcreate'] = 'Poll create'; + +$lang['Permissions'] = 'Permissions'; +$lang['Simple_Permission'] = 'Simple Permissions'; + +$lang['User_Level'] = 'User Level'; +$lang['Auth_User'] = 'User'; +$lang['Auth_Admin'] = 'Administrator'; +$lang['Group_memberships'] = 'Usergroup memberships'; +$lang['Usergroup_members'] = 'This group has the following members'; + +$lang['Forum_auth_updated'] = 'Forum permissions updated'; +$lang['User_auth_updated'] = 'User permissions updated'; +$lang['Group_auth_updated'] = 'Group permissions updated'; + +$lang['Auth_updated'] = 'Permissions have been updated'; +$lang['Click_return_userauth'] = 'Click %sHere%s to return to User Permissions'; +$lang['Click_return_groupauth'] = 'Click %sHere%s to return to Group Permissions'; +$lang['Click_return_forumauth'] = 'Click %sHere%s to return to Forum Permissions'; + + +// +// Banning +// +$lang['Ban_control'] = 'Ban Control'; +$lang['Ban_explain'] = 'Here you can control the banning of users. You can achieve this by banning either or both of a specific user or an individual or range of IP addresses or hostnames. These methods prevent a user from even reaching the index page of your board. To prevent a user from registering under a different username you can also specify a banned email address. Please note that banning an email address alone will not prevent that user from being able to log on or post to your board. You should use one of the first two methods to achieve this.'; +$lang['Ban_explain_warn'] = 'Please note that entering a range of IP addresses results in all the addresses between the start and end being added to the banlist. Attempts will be made to minimise the number of addresses added to the database by introducing wildcards automatically where appropriate. If you really must enter a range, try to keep it small or better yet state specific addresses.'; + +$lang['Select_username'] = 'Select a Username'; +$lang['Select_ip'] = 'Select an IP address'; +$lang['Select_email'] = 'Select an Email address'; + +$lang['Ban_username'] = 'Ban one or more specific users'; +$lang['Ban_username_explain'] = 'You can ban multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser'; + +$lang['Ban_IP'] = 'Ban one or more IP addresses or hostnames'; +$lang['IP_hostname'] = 'IP addresses or hostnames'; +$lang['Ban_IP_explain'] = 'To specify several different IP addresses or hostnames separate them with commas. To specify a range of IP addresses, separate the start and end with a hyphen (-); to specify a wildcard, use an asterisk (*).'; + +$lang['Ban_email'] = 'Ban one or more email addresses'; +$lang['Ban_email_explain'] = 'To specify more than one email address, separate them with commas. To specify a wildcard username, use * like *@hotmail.com'; + +$lang['Unban_username'] = 'Un-ban one or more specific users'; +$lang['Unban_username_explain'] = 'You can unban multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser'; + +$lang['Unban_IP'] = 'Un-ban one or more IP addresses'; +$lang['Unban_IP_explain'] = 'You can unban multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser'; + +$lang['Unban_email'] = 'Un-ban one or more email addresses'; +$lang['Unban_email_explain'] = 'You can unban multiple email addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser'; + +$lang['No_banned_users'] = 'No banned usernames'; +$lang['No_banned_ip'] = 'No banned IP addresses'; +$lang['No_banned_email'] = 'No banned email addresses'; + +$lang['Ban_update_sucessful'] = 'The banlist has been updated successfully'; +$lang['Click_return_banadmin'] = 'Click %sHere%s to return to Ban Control'; + + +// +// Configuration +// +$lang['General_Config'] = 'General Configuration'; +$lang['Config_explain'] = 'The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side.'; + +$lang['Click_return_config'] = 'Click %sHere%s to return to General Configuration'; + +$lang['General_settings'] = 'General Board Settings'; +$lang['Server_name'] = 'Domain Name'; +$lang['Server_name_explain'] = 'The domain name from which this board runs'; +$lang['Script_path'] = 'Script path'; +$lang['Script_path_explain'] = 'The path where phpBB2 is located relative to the domain name'; +$lang['Server_port'] = 'Server Port'; +$lang['Server_port_explain'] = 'The port your server is running on, usually 80. Only change if different'; +$lang['Site_name'] = 'Site name'; +$lang['Site_desc'] = 'Site description'; +$lang['Board_disable'] = 'Disable board'; +$lang['Board_disable_explain'] = 'This will make the board unavailable to users. Administrators are able to access the Administration Panel while the board is disabled.'; +$lang['Acct_activation'] = 'Enable account activation'; +$lang['Acc_None'] = 'None'; // These three entries are the type of activation +$lang['Acc_User'] = 'User'; +$lang['Acc_Admin'] = 'Admin'; + +$lang['Abilities_settings'] = 'User and Forum Basic Settings'; +$lang['Max_poll_options'] = 'Max number of poll options'; +$lang['Flood_Interval'] = 'Flood Interval'; +$lang['Flood_Interval_explain'] = 'Number of seconds a user must wait between posts'; +$lang['Board_email_form'] = 'User email via board'; +$lang['Board_email_form_explain'] = 'Users send email to each other via this board'; +$lang['Topics_per_page'] = 'Topics Per Page'; +$lang['Posts_per_page'] = 'Posts Per Page'; +$lang['Hot_threshold'] = 'Posts for Popular Threshold'; +$lang['Default_style'] = 'Default Style'; +$lang['Override_style'] = 'Override user style'; +$lang['Override_style_explain'] = 'Replaces users style with the default'; +$lang['Default_language'] = 'Default Language'; +$lang['Date_format'] = 'Date Format'; +$lang['System_timezone'] = 'System Timezone'; +$lang['Enable_gzip'] = 'Enable GZip Compression'; +$lang['Enable_prune'] = 'Enable Forum Pruning'; +$lang['Allow_HTML'] = 'Allow HTML'; +$lang['Allow_BBCode'] = 'Allow BBCode'; +$lang['Allowed_tags'] = 'Allowed HTML tags'; +$lang['Allowed_tags_explain'] = 'Separate tags with commas'; +$lang['Allow_smilies'] = 'Allow Smilies'; +$lang['Smilies_path'] = 'Smilies Storage Path'; +$lang['Smilies_path_explain'] = 'Path under your phpBB root dir, e.g. images/smiles'; +$lang['Allow_sig'] = 'Allow Signatures'; +$lang['Max_sig_length'] = 'Maximum signature length'; +$lang['Max_sig_length_explain'] = 'Maximum number of characters in user signatures'; +$lang['Allow_name_change'] = 'Allow Username changes'; + +$lang['Avatar_settings'] = 'Avatar Settings'; +$lang['Allow_local'] = 'Enable gallery avatars'; +$lang['Allow_remote'] = 'Enable remote avatars'; +$lang['Allow_remote_explain'] = 'Avatars linked to from another website'; +$lang['Allow_upload'] = 'Enable avatar uploading'; +$lang['Max_filesize'] = 'Maximum Avatar File Size'; +$lang['Max_filesize_explain'] = 'For uploaded avatar files'; +$lang['Max_avatar_size'] = 'Maximum Avatar Dimensions'; +$lang['Max_avatar_size_explain'] = '(Height x Width in pixels)'; +$lang['Avatar_storage_path'] = 'Avatar Storage Path'; +$lang['Avatar_storage_path_explain'] = 'Path under your phpBB root dir, e.g. images/avatars'; +$lang['Avatar_gallery_path'] = 'Avatar Gallery Path'; +$lang['Avatar_gallery_path_explain'] = 'Path under your phpBB root dir for pre-loaded images, e.g. images/avatars/gallery'; + +$lang['COPPA_settings'] = 'COPPA Settings'; +$lang['COPPA_fax'] = 'COPPA Fax Number'; +$lang['COPPA_mail'] = 'COPPA Mailing Address'; +$lang['COPPA_mail_explain'] = 'This is the mailing address to which parents will send COPPA registration forms'; + +$lang['Email_settings'] = 'Email Settings'; +$lang['Admin_email'] = 'Admin Email Address'; +$lang['Email_sig'] = 'Email Signature'; +$lang['Email_sig_explain'] = 'This text will be attached to all emails the board sends'; +$lang['Use_SMTP'] = 'Use SMTP Server for email'; +$lang['Use_SMTP_explain'] = 'Say yes if you want or have to send email via a named server instead of the local mail function'; +$lang['SMTP_server'] = 'SMTP Server Address'; +$lang['SMTP_username'] = 'SMTP Username'; +$lang['SMTP_username_explain'] = 'Only enter a username if your SMTP server requires it'; +$lang['SMTP_password'] = 'SMTP Password'; +$lang['SMTP_password_explain'] = 'Only enter a password if your SMTP server requires it'; + +$lang['Disable_privmsg'] = 'Private Messaging'; +$lang['Inbox_limits'] = 'Max posts in Inbox'; +$lang['Sentbox_limits'] = 'Max posts in Sentbox'; +$lang['Savebox_limits'] = 'Max posts in Savebox'; + +$lang['Cookie_settings'] = 'Cookie settings'; +$lang['Cookie_settings_explain'] = 'These details define how cookies are sent to your users\' browsers. In most cases the default values for the cookie settings should be sufficient, but if you need to change them do so with care -- incorrect settings can prevent users from logging in'; +$lang['Cookie_domain'] = 'Cookie domain'; +$lang['Cookie_name'] = 'Cookie name'; +$lang['Cookie_path'] = 'Cookie path'; +$lang['Cookie_secure'] = 'Cookie secure'; +$lang['Cookie_secure_explain'] = 'If your server is running via SSL, set this to enabled, else leave as disabled'; +$lang['Session_length'] = 'Session length [ seconds ]'; + +// Visual Confirmation +$lang['Visual_confirm'] = 'Enable Visual Confirmation'; +$lang['Visual_confirm_explain'] = 'Requires users enter a code defined by an image when registering.'; + +// Autologin Keys - added 2.0.18 +$lang['Allow_autologin'] = 'Allow automatic logins'; +$lang['Allow_autologin_explain'] = 'Determines whether users are allowed to select to be automatically logged in when visiting the forum'; +$lang['Autologin_time'] = 'Automatic login key expiry'; +$lang['Autologin_time_explain'] = 'How long a autologin key is valid for in days if the user does not visit the board. Set to zero to disable expiry.'; + +// Search Flood Control - added 2.0.20 +$lang['Search_Flood_Interval'] = 'Search Flood Interval'; +$lang['Search_Flood_Interval_explain'] = 'Number of seconds a user must wait between search requests'; + +// +// Forum Management +// +$lang['Forum_admin'] = 'Forum Administration'; +$lang['Forum_admin_explain'] = 'From this panel you can add, delete, edit, re-order and re-synchronise categories and forums'; +$lang['Edit_forum'] = 'Edit forum'; +$lang['Create_forum'] = 'Create new forum'; +$lang['Create_category'] = 'Create new category'; +$lang['Remove'] = 'Remove'; +$lang['Action'] = 'Action'; +$lang['Update_order'] = 'Update Order'; +$lang['Config_updated'] = 'Forum Configuration Updated Successfully'; +$lang['Edit'] = 'Edit'; +$lang['Delete'] = 'Delete'; +$lang['Move_up'] = 'Move up'; +$lang['Move_down'] = 'Move down'; +$lang['Resync'] = 'Resync'; +$lang['No_mode'] = 'No mode was set'; +$lang['Forum_edit_delete_explain'] = 'The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side'; + +$lang['Move_contents'] = 'Move all contents'; +$lang['Forum_delete'] = 'Delete Forum'; +$lang['Forum_delete_explain'] = 'The form below will allow you to delete a forum (or category) and decide where you want to put all topics (or forums) it contained.'; + +$lang['Status_locked'] = 'Locked'; +$lang['Status_unlocked'] = 'Unlocked'; +$lang['Forum_settings'] = 'General Forum Settings'; +$lang['Forum_name'] = 'Forum name'; +$lang['Forum_desc'] = 'Description'; +$lang['Forum_status'] = 'Forum status'; +$lang['Forum_pruning'] = 'Auto-pruning'; + +$lang['prune_freq'] = 'Check for topic age every'; +$lang['prune_days'] = 'Remove topics that have not been posted to in'; +$lang['Set_prune_data'] = 'You have turned on auto-prune for this forum but did not set a frequency or number of days to prune. Please go back and do so.'; + +$lang['Move_and_Delete'] = 'Move and Delete'; + +$lang['Delete_all_posts'] = 'Delete all posts'; +$lang['Nowhere_to_move'] = 'Nowhere to move to'; + +$lang['Edit_Category'] = 'Edit Category'; +$lang['Edit_Category_explain'] = 'Use this form to modify a category\'s name.'; + +$lang['Forums_updated'] = 'Forum and Category information updated successfully'; + +$lang['Must_delete_forums'] = 'You need to delete all forums before you can delete this category'; + +$lang['Click_return_forumadmin'] = 'Click %sHere%s to return to Forum Administration'; + + +// +// Smiley Management +// +$lang['smiley_title'] = 'Smiles Editing Utility'; +$lang['smile_desc'] = 'From this page you can add, remove and edit the emoticons or smileys that your users can use in their posts and private messages.'; + +$lang['smiley_config'] = 'Smiley Configuration'; +$lang['smiley_code'] = 'Smiley Code'; +$lang['smiley_url'] = 'Smiley Image File'; +$lang['smiley_emot'] = 'Smiley Emotion'; +$lang['smile_add'] = 'Add a new Smiley'; +$lang['Smile'] = 'Smile'; +$lang['Emotion'] = 'Emotion'; + +$lang['Select_pak'] = 'Select Pack (.pak) File'; +$lang['replace_existing'] = 'Replace Existing Smiley'; +$lang['keep_existing'] = 'Keep Existing Smiley'; +$lang['smiley_import_inst'] = 'You should unzip the smiley package and upload all files to the appropriate Smiley directory for your installation. Then select the correct information in this form to import the smiley pack.'; +$lang['smiley_import'] = 'Smiley Pack Import'; +$lang['choose_smile_pak'] = 'Choose a Smile Pack .pak file'; +$lang['import'] = 'Import Smileys'; +$lang['smile_conflicts'] = 'What should be done in case of conflicts'; +$lang['del_existing_smileys'] = 'Delete existing smileys before import'; +$lang['import_smile_pack'] = 'Import Smiley Pack'; +$lang['export_smile_pack'] = 'Create Smiley Pack'; +$lang['export_smiles'] = 'To create a smiley pack from your currently installed smileys, click %sHere%s to download the smiles.pak file. Name this file appropriately making sure to keep the .pak file extension. Then create a zip file containing all of your smiley images plus this .pak configuration file.'; + +$lang['smiley_add_success'] = 'The Smiley was successfully added'; +$lang['smiley_edit_success'] = 'The Smiley was successfully updated'; +$lang['smiley_import_success'] = 'The Smiley Pack was imported successfully!'; +$lang['smiley_del_success'] = 'The Smiley was successfully removed'; +$lang['Click_return_smileadmin'] = 'Click %sHere%s to return to Smiley Administration'; + +$lang['Confirm_delete_smiley'] = 'Are you sure you want to delete this Smiley?'; + +// +// User Management +// +$lang['User_admin'] = 'User Administration'; +$lang['User_admin_explain'] = 'Here you can change your users\' information and certain options. To modify the users\' permissions, please use the user and group permissions system.'; + +$lang['Look_up_user'] = 'Look up user'; + +$lang['Admin_user_fail'] = 'Couldn\'t update the user\'s profile.'; +$lang['Admin_user_updated'] = 'The user\'s profile was successfully updated.'; +$lang['Click_return_useradmin'] = 'Click %sHere%s to return to User Administration'; + +$lang['User_delete'] = 'Delete this user'; +$lang['User_delete_explain'] = 'Click here to delete this user; this cannot be undone.'; +$lang['User_deleted'] = 'User was successfully deleted.'; + +$lang['User_status'] = 'User is active'; +$lang['User_allowpm'] = 'Can send Private Messages'; +$lang['User_allowavatar'] = 'Can display avatar'; + +$lang['Admin_avatar_explain'] = 'Here you can see and delete the user\'s current avatar.'; + +$lang['User_special'] = 'Special admin-only fields'; +$lang['User_special_explain'] = 'These fields are not able to be modified by the users. Here you can set their status and other options that are not given to users.'; + + +// +// Group Management +// +$lang['Group_administration'] = 'Group Administration'; +$lang['Group_admin_explain'] = 'From this panel you can administer all your usergroups. You can delete, create and edit existing groups. You may choose moderators, toggle open/closed group status and set the group name and description'; +$lang['Error_updating_groups'] = 'There was an error while updating the groups'; +$lang['Updated_group'] = 'The group was successfully updated'; +$lang['Added_new_group'] = 'The new group was successfully created'; +$lang['Deleted_group'] = 'The group was successfully deleted'; +$lang['New_group'] = 'Create new group'; +$lang['Edit_group'] = 'Edit group'; +$lang['group_name'] = 'Group name'; +$lang['group_description'] = 'Group description'; +$lang['group_moderator'] = 'Group moderator'; +$lang['group_status'] = 'Group status'; +$lang['group_open'] = 'Open group'; +$lang['group_closed'] = 'Closed group'; +$lang['group_hidden'] = 'Hidden group'; +$lang['group_delete'] = 'Delete group'; +$lang['group_delete_check'] = 'Delete this group'; +$lang['submit_group_changes'] = 'Submit Changes'; +$lang['reset_group_changes'] = 'Reset Changes'; +$lang['No_group_name'] = 'You must specify a name for this group'; +$lang['No_group_moderator'] = 'You must specify a moderator for this group'; +$lang['No_group_mode'] = 'You must specify a mode for this group, open or closed'; +$lang['No_group_action'] = 'No action was specified'; +$lang['delete_group_moderator'] = 'Delete the old group moderator?'; +$lang['delete_moderator_explain'] = 'If you\'re changing the group moderator, check this box to remove the old moderator from the group. Otherwise, do not check it, and the user will become a regular member of the group.'; +$lang['Click_return_groupsadmin'] = 'Click %sHere%s to return to Group Administration.'; +$lang['Select_group'] = 'Select a group'; +$lang['Look_up_group'] = 'Look up group'; + + +// +// Prune Administration +// +$lang['Forum_Prune'] = 'Forum Prune'; +$lang['Forum_Prune_explain'] = 'This will delete any topic which has not been posted to within the number of days you select. If you do not enter a number then all topics will be deleted. It will not remove topics in which polls are still running nor will it remove announcements. You will need to remove those topics manually.'; +$lang['Do_Prune'] = 'Do Prune'; +$lang['All_Forums'] = 'All Forums'; +$lang['Prune_topics_not_posted'] = 'Prune topics with no replies in this many days'; +$lang['Topics_pruned'] = 'Topics pruned'; +$lang['Posts_pruned'] = 'Posts pruned'; +$lang['Prune_success'] = 'Pruning of forums was successful'; + + +// +// Word censor +// +$lang['Words_title'] = 'Word Censoring'; +$lang['Words_explain'] = 'From this control panel you can add, edit, and remove words that will be automatically censored on your forums. In addition people will not be allowed to register with usernames containing these words. Wildcards (*) are accepted in the word field. For example, *test* will match detestable, test* would match testing, *test would match detest.'; +$lang['Word'] = 'Word'; +$lang['Edit_word_censor'] = 'Edit word censor'; +$lang['Replacement'] = 'Replacement'; +$lang['Add_new_word'] = 'Add new word'; +$lang['Update_word'] = 'Update word censor'; + +$lang['Must_enter_word'] = 'You must enter a word and its replacement'; +$lang['No_word_selected'] = 'No word selected for editing'; + +$lang['Word_updated'] = 'The selected word censor has been successfully updated'; +$lang['Word_added'] = 'The word censor has been successfully added'; +$lang['Word_removed'] = 'The selected word censor has been successfully removed'; + +$lang['Click_return_wordadmin'] = 'Click %sHere%s to return to Word Censor Administration'; + +$lang['Confirm_delete_word'] = 'Are you sure you want to delete this word censor?'; + + +// +// Mass Email +// +$lang['Mass_email_explain'] = 'Here you can email a message to either all of your users or all users of a specific group. To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time and you will be notified when the script has completed'; +$lang['Compose'] = 'Compose'; + +$lang['Recipients'] = 'Recipients'; +$lang['All_users'] = 'All Users'; + +$lang['Email_successfull'] = 'Your message has been sent'; +$lang['Click_return_massemail'] = 'Click %sHere%s to return to the Mass Email form'; + + +// +// Ranks admin +// +$lang['Ranks_title'] = 'Rank Administration'; +$lang['Ranks_explain'] = 'Using this form you can add, edit, view and delete ranks. You can also create custom ranks which can be applied to a user via the user management facility'; + +$lang['Add_new_rank'] = 'Add new rank'; + +$lang['Rank_title'] = 'Rank Title'; +$lang['Rank_special'] = 'Set as Special Rank'; +$lang['Rank_minimum'] = 'Minimum Posts'; +$lang['Rank_maximum'] = 'Maximum Posts'; +$lang['Rank_image'] = 'Rank Image (Relative to phpBB2 root path)'; +$lang['Rank_image_explain'] = 'Use this to define a small image associated with the rank'; + +$lang['Must_select_rank'] = 'You must select a rank'; +$lang['No_assigned_rank'] = 'No special rank assigned'; + +$lang['Rank_updated'] = 'The rank was successfully updated'; +$lang['Rank_added'] = 'The rank was successfully added'; +$lang['Rank_removed'] = 'The rank was successfully deleted'; +$lang['No_update_ranks'] = 'The rank was successfully deleted. However, user accounts using this rank were not updated. You will need to manually reset the rank on these accounts'; + +$lang['Click_return_rankadmin'] = 'Click %sHere%s to return to Rank Administration'; + +$lang['Confirm_delete_rank'] = 'Are you sure you want to delete this rank?'; + +// +// Disallow Username Admin +// +$lang['Disallow_control'] = 'Username Disallow Control'; +$lang['Disallow_explain'] = 'Here you can control usernames which will not be allowed to be used. Disallowed usernames are allowed to contain a wildcard character of *. Please note that you will not be allowed to specify any username that has already been registered. You must first delete that name then disallow it.'; + +$lang['Delete_disallow'] = 'Delete'; +$lang['Delete_disallow_title'] = 'Remove a Disallowed Username'; +$lang['Delete_disallow_explain'] = 'You can remove a disallowed username by selecting the username from this list and clicking delete'; + +$lang['Add_disallow'] = 'Add'; +$lang['Add_disallow_title'] = 'Add a disallowed username'; +$lang['Add_disallow_explain'] = 'You can disallow a username using the wildcard character * to match any character'; + +$lang['No_disallowed'] = 'No Disallowed Usernames'; + +$lang['Disallowed_deleted'] = 'The disallowed username has been successfully removed'; +$lang['Disallow_successful'] = 'The disallowed username has been successfully added'; +$lang['Disallowed_already'] = 'The name you entered could not be disallowed. It either already exists in the list, exists in the word censor list, or a matching username is present.'; + +$lang['Click_return_disallowadmin'] = 'Click %sHere%s to return to Disallow Username Administration'; + + +// +// Styles Admin +// +$lang['Styles_admin'] = 'Styles Administration'; +$lang['Styles_explain'] = 'Using this facility you can add, remove and manage styles (templates and themes) available to your users'; +$lang['Styles_addnew_explain'] = 'The following list contains all the themes that are available for the templates you currently have. The items on this list have not yet been installed into the phpBB database. To install a theme, simply click the install link beside an entry.'; + +$lang['Select_template'] = 'Select a Template'; + +$lang['Style'] = 'Style'; +$lang['Template'] = 'Template'; +$lang['Install'] = 'Install'; +$lang['Download'] = 'Download'; + +$lang['Edit_theme'] = 'Edit Theme'; +$lang['Edit_theme_explain'] = 'In the form below you can edit the settings for the selected theme'; + +$lang['Create_theme'] = 'Create Theme'; +$lang['Create_theme_explain'] = 'Use the form below to create a new theme for a selected template. When entering colours (for which you should use hexadecimal notation) you must not include the initial #, i.e.. CCCCCC is valid, #CCCCCC is not'; + +$lang['Export_themes'] = 'Export Themes'; +$lang['Export_explain'] = 'In this panel you will be able to export the theme data for a selected template. Select the template from the list below and the script will create the theme configuration file and attempt to save it to the selected template directory. If it cannot save the file itself it will give you the option to download it. In order for the script to save the file you must give write access to the webserver for the selected template dir. For more information on this see the phpBB 2 users guide.'; + +$lang['Theme_installed'] = 'The selected theme has been installed successfully'; +$lang['Style_removed'] = 'The selected style has been removed from the database. To fully remove this style from your system you must delete the appropriate style from your templates directory.'; +$lang['Theme_info_saved'] = 'The theme information for the selected template has been saved. You should now return the permissions on the theme_info.cfg (and if applicable the selected template directory) to read-only'; +$lang['Theme_updated'] = 'The selected theme has been updated. You should now export the new theme settings'; +$lang['Theme_created'] = 'Theme created. You should now export the theme to the theme configuration file for safe keeping or use elsewhere'; + +$lang['Confirm_delete_style'] = 'Are you sure you want to delete this style?'; + +$lang['Download_theme_cfg'] = 'The exporter could not write the theme information file. Click the button below to download this file with your browser. Once you have downloaded it you can transfer it to the directory containing the template files. You can then package the files for distribution or use elsewhere if you desire'; +$lang['No_themes'] = 'The template you selected has no themes attached to it. To create a new theme click the Create New link on the left hand panel'; +$lang['No_template_dir'] = 'Could not open the template directory. It may be unreadable by the webserver or may not exist'; +$lang['Cannot_remove_style'] = 'You cannot remove the style selected since it is currently the forum default. Please change the default style and try again.'; +$lang['Style_exists'] = 'The style name to selected already exists, please go back and choose a different name.'; + +$lang['Click_return_styleadmin'] = 'Click %sHere%s to return to Style Administration'; + +$lang['Theme_settings'] = 'Theme Settings'; +$lang['Theme_element'] = 'Theme Element'; +$lang['Simple_name'] = 'Simple Name'; +$lang['Value'] = 'Value'; +$lang['Save_Settings'] = 'Save Settings'; + +$lang['Stylesheet'] = 'CSS Stylesheet'; +$lang['Stylesheet_explain'] = 'Filename for CSS stylesheet to use for this theme.'; +$lang['Background_image'] = 'Background Image'; +$lang['Background_color'] = 'Background Colour'; +$lang['Theme_name'] = 'Theme Name'; +$lang['Link_color'] = 'Link Colour'; +$lang['Text_color'] = 'Text Colour'; +$lang['VLink_color'] = 'Visited Link Colour'; +$lang['ALink_color'] = 'Active Link Colour'; +$lang['HLink_color'] = 'Hover Link Colour'; +$lang['Tr_color1'] = 'Table Row Colour 1'; +$lang['Tr_color2'] = 'Table Row Colour 2'; +$lang['Tr_color3'] = 'Table Row Colour 3'; +$lang['Tr_class1'] = 'Table Row Class 1'; +$lang['Tr_class2'] = 'Table Row Class 2'; +$lang['Tr_class3'] = 'Table Row Class 3'; +$lang['Th_color1'] = 'Table Header Colour 1'; +$lang['Th_color2'] = 'Table Header Colour 2'; +$lang['Th_color3'] = 'Table Header Colour 3'; +$lang['Th_class1'] = 'Table Header Class 1'; +$lang['Th_class2'] = 'Table Header Class 2'; +$lang['Th_class3'] = 'Table Header Class 3'; +$lang['Td_color1'] = 'Table Cell Colour 1'; +$lang['Td_color2'] = 'Table Cell Colour 2'; +$lang['Td_color3'] = 'Table Cell Colour 3'; +$lang['Td_class1'] = 'Table Cell Class 1'; +$lang['Td_class2'] = 'Table Cell Class 2'; +$lang['Td_class3'] = 'Table Cell Class 3'; +$lang['fontface1'] = 'Font Face 1'; +$lang['fontface2'] = 'Font Face 2'; +$lang['fontface3'] = 'Font Face 3'; +$lang['fontsize1'] = 'Font Size 1'; +$lang['fontsize2'] = 'Font Size 2'; +$lang['fontsize3'] = 'Font Size 3'; +$lang['fontcolor1'] = 'Font Colour 1'; +$lang['fontcolor2'] = 'Font Colour 2'; +$lang['fontcolor3'] = 'Font Colour 3'; +$lang['span_class1'] = 'Span Class 1'; +$lang['span_class2'] = 'Span Class 2'; +$lang['span_class3'] = 'Span Class 3'; +$lang['img_poll_size'] = 'Polling Image Size [px]'; +$lang['img_pm_size'] = 'Private Message Status size [px]'; + + +// +// Install Process +// +$lang['Welcome_install'] = 'Welcome to phpBB 2 Installation'; +$lang['Initial_config'] = 'Basic Configuration'; +$lang['DB_config'] = 'Database Configuration'; +$lang['Admin_config'] = 'Admin Configuration'; +$lang['continue_upgrade'] = 'Once you have downloaded your config file to your local machine you may\'Continue Upgrade\' button below to move forward with the upgrade process. Please wait to upload the config file until the upgrade process is complete.'; +$lang['upgrade_submit'] = 'Continue Upgrade'; + +$lang['Installer_Error'] = 'An error has occurred during installation'; +$lang['Previous_Install'] = 'A previous installation has been detected'; +$lang['Install_db_error'] = 'An error occurred trying to update the database'; + +$lang['Re_install'] = 'Your previous installation is still active.

    If you would like to re-install phpBB 2 you should click the Yes button below. Please be aware that doing so will destroy all existing data and no backups will be made! The administrator username and password you have used to login in to the board will be re-created after the re-installation and no other settings will be retained.

    Think carefully before pressing Yes!'; + +$lang['Inst_Step_0'] = 'Thank you for choosing phpBB 2. In order to complete this install please fill out the details requested below. Please note that the database you install into should already exist. If you are installing to a database that uses ODBC, e.g. MS Access you should first create a DSN for it before proceeding.'; + +$lang['Start_Install'] = 'Start Install'; +$lang['Finish_Install'] = 'Finish Installation'; + +$lang['Default_lang'] = 'Default board language'; +$lang['DB_Host'] = 'Database Server Hostname / DSN'; +$lang['DB_Name'] = 'Your Database Name'; +$lang['DB_Username'] = 'Database Username'; +$lang['DB_Password'] = 'Database Password'; +$lang['Database'] = 'Your Database'; +$lang['Install_lang'] = 'Choose Language for Installation'; +$lang['dbms'] = 'Database Type'; +$lang['Table_Prefix'] = 'Prefix for tables in database'; +$lang['Admin_Username'] = 'Administrator Username'; +$lang['Admin_Password'] = 'Administrator Password'; +$lang['Admin_Password_confirm'] = 'Administrator Password [ Confirm ]'; + +$lang['Inst_Step_2'] = 'Your admin username has been created. At this point your basic installation is complete. You will now be taken to a screen which will allow you to administer your new installation. Please be sure to check the General Configuration details and make any required changes. Thank you for choosing phpBB 2.'; + +$lang['Unwriteable_config'] = 'Your config file is un-writeable at present. A copy of the config file will be downloaded to your computer when you click the button below. You should upload this file to the same directory as phpBB 2. Once this is done you should log in using the administrator name and password you provided on the previous form and visit the admin control center (a link will appear at the bottom of each screen once logged in) to check the general configuration. Thank you for choosing phpBB 2.'; +$lang['Download_config'] = 'Download Config'; + +$lang['ftp_choose'] = 'Choose Download Method'; +$lang['ftp_option'] = '
    Since FTP extensions are enabled in this version of PHP you may also be given the option of first trying to automatically FTP the config file into place.'; +$lang['ftp_instructs'] = 'You have chosen to FTP the file to the account containing phpBB 2 automatically. Please enter the information below to facilitate this process. Note that the FTP path should be the exact path via FTP to your phpBB2 installation as if you were FTPing to it using any normal client.'; +$lang['ftp_info'] = 'Enter Your FTP Information'; +$lang['Attempt_ftp'] = 'Attempt to FTP config file into place'; +$lang['Send_file'] = 'Just send the file to me and I\'ll FTP it manually'; +$lang['ftp_path'] = 'FTP path to phpBB 2'; +$lang['ftp_username'] = 'Your FTP Username'; +$lang['ftp_password'] = 'Your FTP Password'; +$lang['Transfer_config'] = 'Start Transfer'; +$lang['NoFTP_config'] = 'The attempt to FTP the config file into place failed. Please download the config file and FTP it into place manually.'; + +$lang['Install'] = 'Install'; +$lang['Upgrade'] = 'Upgrade'; + + +$lang['Install_Method'] = 'Choose your installation method'; + +$lang['Install_No_Ext'] = 'The PHP configuration on your server doesn\'t support the database type that you chose'; + +$lang['Install_No_PCRE'] = 'phpBB2 Requires the Perl-Compatible Regular Expressions Module for PHP which your PHP configuration doesn\'t appear to support!'; + +// +// Version Check +// +$lang['Version_up_to_date'] = 'Your installation is up to date, no updates are available for your version of phpBB.'; +$lang['Version_not_up_to_date'] = 'Your installation does not seem to be up to date. Updates are available for your version of phpBB, please visit http://www.phpbb.com/downloads.php to obtain the latest version.'; +$lang['Latest_version_info'] = 'The latest available version is phpBB %s.'; +$lang['Current_version_info'] = 'You are running phpBB %s.'; +$lang['Connect_socket_error'] = 'Unable to open connection to phpBB Server, reported error is:
    %s'; +$lang['Socket_functions_disabled'] = 'Unable to use socket functions.'; +$lang['Mailing_list_subscribe_reminder'] = 'For the latest information on updates to phpBB, why not subscribe to our mailing list.'; +$lang['Version_information'] = 'Version Information'; + +// +// Login attempts configuration +// +$lang['Max_login_attempts'] = 'Allowed login attempts'; +$lang['Max_login_attempts_explain'] = 'The number of allowed board login attempts.'; +$lang['Login_reset_time'] = 'Login lock time'; +$lang['Login_reset_time_explain'] = 'Time in minutes the user have to wait until he is allowed to login again after exceeding the number of allowed login attempts.'; + +// +// That's all Folks! +// ------------------------------------------------- + +?> \ No newline at end of file diff --git a/phpBB/language/lang_english/lang_bbcode.php b/phpBB/language/lang_english/lang_bbcode.php new file mode 100644 index 0000000000..e4ce455333 --- /dev/null +++ b/phpBB/language/lang_english/lang_bbcode.php @@ -0,0 +1,75 @@ +
  • To make a piece of text bold enclose it in [b][/b], eg.

    [b]Hello[/b]

    will become Hello
  • For underlining use [u][/u], for example:

    [u]Good Morning[/u]

    becomes Good Morning
  • To italicise text use [i][/i], eg.

    This is [i]Great![/i]

    would give This is Great!
  • "); +$faq[] = array("How to change the text colour or size", "To alter the color or size of your text the following tags can be used. Keep in mind that how the output appears will depend on the viewers browser and system:
    • Changing the colour of text is achieved by wrapping it in [color=][/color]. You can specify either a recognised colour name (eg. red, blue, yellow, etc.) or the hexadecimal triplet alternative, eg. #FFFFFF, #000000. For example, to create red text you could use:

      [color=red]Hello![/color]

      or

      [color=#FF0000]Hello![/color]

      will both output Hello!
    • Changing the text size is achieved in a similar way using [size=][/size]. This tag is dependent on the template you are using but the recommended format is a numerical value representing the text size in pixels, starting at 1 (so tiny you will not see it) through to 29 (very large). For example:

      [size=9]SMALL[/size]

      will generally be SMALL

      whereas:

      [size=24]HUGE![/size]

      will be HUGE!
    "); +$faq[] = array("Can I combine formatting tags?", "Yes, of course you can; for example to get someones attention you may write:

    [size=18][color=red][b]LOOK AT ME![/b][/color][/size]

    this would output LOOK AT ME!

    We don't recommend you output lots of text that looks like this, though! Remember that it is up to you, the poster, to ensure that tags are closed correctly. For example, the following is incorrect:

    [b][u]This is wrong[/b][/u]"); + +$faq[] = array("--","Quoting and outputting fixed-width text"); +$faq[] = array("Quoting text in replies", "There are two ways you can quote text: with a reference or without.
    • When you utilise the Quote function to reply to a post on the board you should notice that the post text is added to the message window enclosed in a [quote=\"\"][/quote] block. This method allows you to quote with a reference to a person or whatever else you choose to put. For example, to quote a piece of text Mr. Blobby wrote, you would enter:

      [quote=\"Mr. Blobby\"]The text Mr. Blobby wrote would go here[/quote]

      The resulting output will automatically add: Mr. Blobby wrote: before the actual text. Remember that you must include the quotation marks \"\" around the name you are quoting -- they are not optional.
    • The second method allows you to blindly quote something. To utilise this enclose the text in [quote][/quote] tags. When you view the message it will simply show: Quote: before the text itself.
    "); +$faq[] = array("Outputting code or fixed width data", "If you want to output a piece of code or in fact anything that requires a fixed width with a Courier-type font, you should enclose the text in [code][/code] tags, eg.

    [code]echo \"This is some code\";[/code]

    All formatting used within [code][/code] tags is retained when you later view it."); + +$faq[] = array("--","Generating lists"); +$faq[] = array("Creating an Un-ordered list", "BBCode supports two types of lists, unordered and ordered. They are essentially the same as their HTML equivalents. An unordered list ouputs each item in your list sequentially one after the other indenting each with a bullet character. To create an unordered list you use [list][/list] and define each item within the list using [*]. For example, to list your favorite colours you could use:

    [list]
    [*]Red
    [*]Blue
    [*]Yellow
    [/list]

    This would generate the following list:
    • Red
    • Blue
    • Yellow
    "); +$faq[] = array("Creating an Ordered list", "The second type of list, an ordered list gives you control over what is output before each item. To create an ordered list you use [list=1][/list] to create a numbered list or alternatively [list=a][/list] for an alphabetical list. As with the unordered list items are specified using [*]. For example:

    [list=1]
    [*]Go to the shops
    [*]Buy a new computer
    [*]Swear at computer when it crashes
    [/list]

    will generate the following:
    1. Go to the shops
    2. Buy a new computer
    3. Swear at computer when it crashes
    Whereas for an alphabetical list you would use:

    [list=a]
    [*]The first possible answer
    [*]The second possible answer
    [*]The third possible answer
    [/list]

    giving
    1. The first possible answer
    2. The second possible answer
    3. The third possible answer
    "); + +$faq[] = array("--", "Creating Links"); +$faq[] = array("Linking to another site", "phpBB BBCode supports a number of ways of creating URIs, Uniform Resource Indicators better known as URLs.
    • The first of these uses the [url=][/url] tag; whatever you type after the = sign will cause the contents of that tag to act as a URL. For example, to link to phpBB.com you could use:

      [url=http://www.phpbb.com/]Visit phpBB![/url]

      This would generate the following link, Visit phpBB! You will notice the link opens in a new window so the user can continue browsing the forums if they wish.
    • If you want the URL itself displayed as the link you can do this by simply using:

      [url]http://www.phpbb.com/[/url]

      This would generate the following link: http://www.phpbb.com/
    • Additionally phpBB features something called Magic Linkswhich will turn any syntatically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to www.phpbb.com being output when you view the message.
    • The same thing applies equally to email addresses; you can either specify an address explicitly, like:

      [email]no.one@domain.adr[/email]

      which will output no.one@domain.adr or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.
    As with all the BBCode tags you can wrap URLs around any of the other tags such as [img][/img] (see next entry), [b][/b], etc. As with the formatting tags it is up to you to ensure the correct open and close order is following. For example:

    [url=http://www.phpbb.com/][img]http://www.phpbb.com/images/phplogo.gif[/url][/img]

    is not correct which may lead to your post being deleted so take care."); + +$faq[] = array("--", "Showing images in posts"); +$faq[] = array("Adding an image to a post", "phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are: many users do not appreciate lots of images being shown in posts and second, the image you display must already be available on the Internet (it cannot exist only on your computer, for example, unless you run a webserver!). There is currently no way of storing images locally with phpBB (all these issues are expected to be addressed in the next release of phpBB). To display an image, you must surround the URL pointing to the image with [img][/img] tags. For example:

    [img]http://www.phpbb.com/images/phplogo.gif[/img]

    As noted in the URL section above you can wrap an image in a [url][/url] tag if you wish, eg.

    [url=http://www.phpbb.com/][img]http://www.phpbb.com/images/phplogo.gif[/img][/url]

    would generate:

    \"\"
    "); + +$faq[] = array("--", "Other matters"); +$faq[] = array("Can I add my own tags?", "No, I am afraid not directly in phpBB 2.0. We are looking at offering customisable BBCode tags for the next major version."); + +// +// This ends the BBCode guide entries +// + +?> \ No newline at end of file diff --git a/phpBB/language/lang_english/lang_faq.php b/phpBB/language/lang_english/lang_faq.php new file mode 100644 index 0000000000..40d4264313 --- /dev/null +++ b/phpBB/language/lang_english/lang_faq.php @@ -0,0 +1,106 @@ +Log me in automatically box when you log in, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university cluster, etc."); +$faq[] = array("How do I prevent my username from appearing in the online user listings?", "In your profile you will find an option Hide your online status; if you switch this on you'll only appear to board administrators or to yourself. You will be counted as a hidden user."); +$faq[] = array("I've lost my password!", "Don't panic! While your password cannot be retrieved it can be reset. To do this go to the login page and click I've forgotten my password. Follow the instructions and you should be back online in no time."); +$faq[] = array("I registered but cannot log in!", "First check that you are entering the correct username and password. If they are okay then one of two things may have happened: if COPPA support is enabled and you clicked the I am under 13 years old link while registering then you will have to follow the instructions you received. If this is not the case then maybe your account need activating. Some boards will require all new registrations be activated, either by yourself or by the administrator before you can log on. When you registered it would have told you whether activation was required. If you were sent an email then follow the instructions; if you did not receive the email then check that your email address is valid. One reason activation is used is to reduce the possibility of rogue users abusing the board anonymously. If you are sure the email address you used is valid then try contacting the board administrator."); +$faq[] = array("I registered in the past but cannot log in anymore!", "The most likely reasons for this are: you entered an incorrect username or password (check the email you were sent when you first registered) or the administrator has deleted your account for some reason. If it is the latter case then perhaps you did not post anything? It is usual for boards to periodically remove users who have not posted anything so as to reduce the size of the database. Try registering again and get involved in discussions."); + + +$faq[] = array("--","User Preferences and settings"); +$faq[] = array("How do I change my settings?", "All your settings (if you are registered) are stored in the database. To alter them click the Profile link (generally shown at the top of pages but this may not be the case). This will allow you to change all your settings."); +$faq[] = array("The times are not correct!", "The times are almost certainly correct; however, what you may be seeing are times displayed in a timezone different from the one you are in. If this is the case, you should change your profile setting for the timezone to match your particular area, e.g. London, Paris, New York, Sydney, etc. Please note that changing the timezone, like most settings, can only be done by registered users. So if you are not registered, this is a good time to do so, if you pardon the pun!"); +$faq[] = array("I changed the timezone and the time is still wrong!", "If you are sure you have set the timezone correctly and the time is still different, the most likely answer is daylight savings time (or summer time as it is known in the UK and other places). The board is not designed to handle the changeovers between standard and daylight time so during summer months the time may be an hour different from the real local time."); +$faq[] = array("My language is not in the list!", "The most likely reasons for this are either the administrator did not install your language or someone has not translated this board into your language. Try asking the board administrator if they can install the language pack you need or if it does not exist, please feel free to create a new translation. More information can be found at the phpBB Group website (see link at bottom of pages)"); +$faq[] = array("How do I show an image below my username?", "There may be two images below a username when viewing posts. The first is an image associated with your rank; generally these take the form of stars or blocks indicating how many posts you have made or your status on the forums. Below this may be a larger image known as an avatar; this is generally unique or personal to each user. It is up to the board administrator to enable avatars and they have a choice over the way in which avatars can be made available. If you are unable to use avatars then this is the decision of the board admin and you should ask them their reasons (we're sure they'll be good!)"); +$faq[] = array("How do I change my rank?", "In general you cannot directly change the wording of any rank (ranks appear below your username in topics and on your profile depending on the style used). Most boards use ranks to indicate the number of posts you have made and to identify certain users. For example, moderators and administrators may have a special rank. Please do not abuse the board by posting unnecessarily just to increase your rank -- you will probably find the moderator or administrator will simply lower your post count."); +$faq[] = array("When I click the email link for a user it asks me to log in.", "Sorry, but only registered users can send email to people via the built-in email form (if the admin has enabled this feature). This is to prevent malicious use of the email system by anonymous users."); + + +$faq[] = array("--","Posting Issues"); +$faq[] = array("How do I post a topic in a forum?", "Easy -- click the relevant button on either the forum or topic screens. You may need to register before you can post a message. The facilities available to you are listed at the bottom of the forum and topic screens (the You can post new topics, You can vote in polls, etc. list)"); +$faq[] = array("How do I edit or delete a post?", "Unless you are the board admin or forum moderator you can only edit or delete your own posts. You can edit a post (sometimes for only a limited time after it was made) by clicking the edit button for the relevant post. If someone has already replied to the post, you will find a small piece of text output below the post when you return to the topic that lists the number of times you edited it. This will only appear if no one has replied; it also will not appear if moderators or administrators edit the post (they should leave a message saying what they altered and why). Please note that normal users cannot delete a post once someone has replied."); +$faq[] = array("How do I add a signature to my post?", "To add a signature to a post you must first create one; this is done via your profile. Once created you can check the Add Signature box on the posting form to add your signature. You can also add a signature by default to all your posts by checking the appropriate radio box in your profile. You can still prevent a signature being added to individual posts by un-checking the add signature box on the posting form."); +$faq[] = array("How do I create a poll?", "Creating a poll is easy -- when you post a new topic (or edit the first post of a topic, if you have permission) you should see a Add Poll form below the main posting box. If you cannot see this then you probably do not have rights to create polls. You should enter a title for the poll and then at least two options -- to set an option type in the poll question and click the Add option button. You can also set a time limit for the poll, 0 being an infinite amount. There will be a limit to the number of options you can list, which is set by the board administrator"); +$faq[] = array("How do I edit or delete a poll?", "As with posts, polls can only be edited by the original poster, a moderator, or board administrator. To edit a poll, click the first post in the topic, which always has the poll associated with it. If no one has cast a vote then users can delete the poll or edit any poll option. However, if people have already placed votes only moderators or administrators can edit or delete it; this is to prevent people rigging polls by changing options mid-way through a poll"); +$faq[] = array("Why can't I access a forum?", "Some forums may be limited to certain users or groups. To view, read, post, etc. you may need special authorization which only the forum moderator and board administrator can grant, so you should contact them."); +$faq[] = array("Why can't I vote in polls?", "Only registered users can vote in polls so as to prevent spoofing of results. If you have registered and still cannot vote then you probably do not have appropriate access rights."); + + +$faq[] = array("--","Formatting and Topic Types"); +$faq[] = array("What is BBCode?", "BBCode is a special implementation of HTML. Whether you can use BBCode is determined by the administrator. You can also disable it on a per post basis from the posting form. BBCode itself is similar in style to HTML: tags are enclosed in square braces [ and ] rather than < and > and it offers greater control over what and how something is displayed. For more information on BBCode see the guide which can be accessed from the posting page."); +$faq[] = array("Can I use HTML?", "That depends on whether the administrator allows you to; they have complete control over it. If you are allowed to use it, you will probably find only certain tags work. This is a safety feature to prevent people from abusing the board by using tags which may destroy the layout or cause other problems. If HTML is enabled you can disable it on a per post basis from the posting form."); +$faq[] = array("What are Smileys?", "Smileys, or Emoticons, are small graphical images which can be used to express some feeling using a short code, e.g. :) means happy, :( means sad. The full list of emoticons can be seen via the posting form. Try not to overuse smileys, though, as they can quickly render a post unreadable and a moderator may decide to edit them out or remove the post altogether."); +$faq[] = array("Can I post Images?", "Images can indeed be shown in your posts. However, there is no facility at present for uploading images directly to this board. Therefore you must link to an image stored on a publicly accessible web server, e.g. http://www.some-unknown-place.net/my-picture.gif. You cannot link to pictures stored on your own PC (unless it is a publicly accessible server) nor to images stored behind authentication mechanisms such as Hotmail or Yahoo mailboxes, password-protected sites, etc. To display the image use either the BBCode [img] tag or appropriate HTML (if allowed)."); +$faq[] = array("What are Announcements?", "Announcements often contain important information and you should read them as soon as possible. Announcements appear at the top of every page in the forum to which they are posted. Whether or not you can post an announcement depends on the permissions required, which are set by the administrator."); +$faq[] = array("What are Sticky topics?", "Sticky topics appear below any announcements in viewforum and only on the first page. They are often quite important so you should read them where possible. As with announcements the board administrator determines what permissions are required to post sticky topics in each forum."); +$faq[] = array("What are Locked topics?", "Locked topics are set this way by either the forum moderator or board administrator. You cannot reply to locked topics and any poll contained inside is automatically ended. Topics may be locked for many reasons."); + + +$faq[] = array("--","User Levels and Groups"); +$faq[] = array("What are Administrators?", "Administrators are people assigned the highest level of control over the entire board. These people can control all facets of board operation which include setting permissions, banning users, creating usergroups or moderators, etc. They also have full moderator capabilities in all the forums."); +$faq[] = array("What are Moderators?", "Moderators are individuals (or groups of individuals) whose job it is to look after the running of the forums from day to day. They have the power to edit or delete posts and lock, unlock, move, delete and split topics in the forum they moderate. Generally moderators are there to prevent people going off-topic or posting abusive or offensive material."); +$faq[] = array("What are Usergroups?", "Usergroups are a way in which board administrators can group users. Each user can belong to several groups (this differs from most other boards) and each group can be assigned individual access rights. This makes it easy for administrators to set up several users as moderators of a forum, or to give them access to a private forum, etc."); +$faq[] = array("How do I join a Usergroup?", "To join a usergroup click the usergroup link on the page header (dependent on template design) and you can then view all usergroups. Not all groups are open access -- some are closed and some may even have hidden memberships. If the board is open then you can request to join it by clicking the appropriate button. The user group moderator will need to approve your request; they may ask why you want to join the group. Please do not pester a group moderator if they turn your request down -- they will have their reasons."); +$faq[] = array("How do I become a Usergroup Moderator?", "Usergroups are initially created by the board administrator who also assigns a board moderator. If you are interested in creating a usergroup then your first point of contact should be the administrator, so try dropping them a private message."); + + +$faq[] = array("--","Private Messaging"); +$faq[] = array("I cannot send private messages!", "There are three reasons for this; you are not registered and/or not logged on, the board administrator has disabled private messaging for the entire board, or the board administrator has prevented you individually from sending messages. If it is the latter case you should try asking the administrator why."); +$faq[] = array("I keep getting unwanted private messages!", "In the future we will be adding an ignore list to the private messaging system. For now, though, if you keep receiving unwanted private messages from someone, inform the board administrator -- they have the power to prevent a user from sending private messages at all."); +$faq[] = array("I have received a spamming or abusive email from someone on this board!", "We are sorry to hear that. The email form feature of this board includes safeguards to try to track users who send such posts. You should email the board administrator with a full copy of the email you received and it is very important this include the headers (these list details of the user that sent the email). They can then take action."); + +// +// These entries should remain in all languages and for all modifications +// +$faq[] = array("--","phpBB 2 Issues"); +$faq[] = array("Who wrote this bulletin board?", "This software (in its unmodified form) is produced, released and is copyrighted phpBB Group. It is made available under the GNU General Public License and may be freely distributed; see link for more details"); +$faq[] = array("Why isn't X feature available?", "This software was written by and licensed through phpBB Group. If you believe a feature needs to be added then please visit the phpbb.com website and see what the phpBB Group has to say. Please do not post feature requests to the board at phpbb.com, as the Group uses sourceforge to handle tasking of new features. Please read through the forums and see what, if any, our position may already be for features and then follow the procedure given there."); +$faq[] = array("Whom do I contact about abusive and/or legal matters related to this board?", "You should contact the administrator of this board. If you cannot find who that is, you should first contact one of the forum moderators and ask them who you should in turn contact. If still get no response you should contact the owner of the domain (do a whois lookup) or, if this is running on a free service (e.g. yahoo, free.fr, f2s.com, etc.), the management or abuse department of that service. Please note that phpBB Group has absolutely no control and cannot in any way be held liable over how, where or by whom this board is used. It is absolutely pointless contacting phpBB Group in relation to any legal (cease and desist, liable, defamatory comment, etc.) matter not directly related to the phpbb.com website or the discrete software of phpBB itself. If you do email phpBB Group about any third party use of this software then you should expect a terse response or no response at all."); + +// +// This ends the FAQ entries +// + +?> \ No newline at end of file diff --git a/phpBB/language/lang_english/lang_main.php b/phpBB/language/lang_english/lang_main.php new file mode 100644 index 0000000000..5c9b972f01 --- /dev/null +++ b/phpBB/language/lang_english/lang_main.php @@ -0,0 +1,1027 @@ + $lang['message'] = 'text'; +// +// You should also try to set a locale and a character encoding (plus direction). The encoding and direction +// will be sent to the template. The locale may or may not work, it's dependent on OS support and the syntax +// varies ... give it your best guess! +// + +$lang['ENCODING'] = 'iso-8859-1'; +$lang['DIRECTION'] = 'ltr'; +$lang['LEFT'] = 'left'; +$lang['RIGHT'] = 'right'; +$lang['DATE_FORMAT'] = 'd M Y'; // This should be changed to the default date format for your language, php date() format + +// This is optional, if you would like a _SHORT_ message output +// along with our copyright message indicating you are the translator +// please add it here. +// $lang['TRANSLATION'] = ''; + +// +// Common, these terms are used +// extensively on several pages +// +$lang['Forum'] = 'Forum'; +$lang['Category'] = 'Category'; +$lang['Topic'] = 'Topic'; +$lang['Topics'] = 'Topics'; +$lang['Replies'] = 'Replies'; +$lang['Views'] = 'Views'; +$lang['Post'] = 'Post'; +$lang['Posts'] = 'Posts'; +$lang['Posted'] = 'Posted'; +$lang['Username'] = 'Username'; +$lang['Password'] = 'Password'; +$lang['Email'] = 'Email'; +$lang['Poster'] = 'Poster'; +$lang['Author'] = 'Author'; +$lang['Time'] = 'Time'; +$lang['Hours'] = 'Hours'; +$lang['Message'] = 'Message'; + +$lang['1_Day'] = '1 Day'; +$lang['7_Days'] = '7 Days'; +$lang['2_Weeks'] = '2 Weeks'; +$lang['1_Month'] = '1 Month'; +$lang['3_Months'] = '3 Months'; +$lang['6_Months'] = '6 Months'; +$lang['1_Year'] = '1 Year'; + +$lang['Go'] = 'Go'; +$lang['Jump_to'] = 'Jump to'; +$lang['Submit'] = 'Submit'; +$lang['Reset'] = 'Reset'; +$lang['Cancel'] = 'Cancel'; +$lang['Preview'] = 'Preview'; +$lang['Confirm'] = 'Confirm'; +$lang['Spellcheck'] = 'Spellcheck'; +$lang['Yes'] = 'Yes'; +$lang['No'] = 'No'; +$lang['Enabled'] = 'Enabled'; +$lang['Disabled'] = 'Disabled'; +$lang['Error'] = 'Error'; + +$lang['Next'] = 'Next'; +$lang['Previous'] = 'Previous'; +$lang['Goto_page'] = 'Goto page'; +$lang['Joined'] = 'Joined'; +$lang['IP_Address'] = 'IP Address'; + +$lang['Select_forum'] = 'Select a forum'; +$lang['View_latest_post'] = 'View latest post'; +$lang['View_newest_post'] = 'View newest post'; +$lang['Page_of'] = 'Page %d of %d'; // Replaces with: Page 1 of 2 for example + +$lang['ICQ'] = 'ICQ Number'; +$lang['AIM'] = 'AIM Address'; +$lang['MSNM'] = 'MSN Messenger'; +$lang['YIM'] = 'Yahoo Messenger'; + +$lang['Forum_Index'] = '%s Forum Index'; // eg. sitename Forum Index, %s can be removed if you prefer + +$lang['Post_new_topic'] = 'Post new topic'; +$lang['Reply_to_topic'] = 'Reply to topic'; +$lang['Reply_with_quote'] = 'Reply with quote'; + +$lang['Click_return_topic'] = 'Click %sHere%s to return to the topic'; // %s's here are for uris, do not remove! +$lang['Click_return_login'] = 'Click %sHere%s to try again'; +$lang['Click_return_forum'] = 'Click %sHere%s to return to the forum'; +$lang['Click_view_message'] = 'Click %sHere%s to view your message'; +$lang['Click_return_modcp'] = 'Click %sHere%s to return to the Moderator Control Panel'; +$lang['Click_return_group'] = 'Click %sHere%s to return to group information'; + +$lang['Admin_panel'] = 'Go to Administration Panel'; + +$lang['Board_disable'] = 'Sorry, but this board is currently unavailable. Please try again later.'; + + +// +// Global Header strings +// +$lang['Registered_users'] = 'Registered Users:'; +$lang['Browsing_forum'] = 'Users browsing this forum:'; +$lang['Online_users_zero_total'] = 'In total there are 0 users online :: '; +$lang['Online_users_total'] = 'In total there are %d users online :: '; +$lang['Online_user_total'] = 'In total there is %d user online :: '; +$lang['Reg_users_zero_total'] = '0 Registered, '; +$lang['Reg_users_total'] = '%d Registered, '; +$lang['Reg_user_total'] = '%d Registered, '; +$lang['Hidden_users_zero_total'] = '0 Hidden and '; +$lang['Hidden_user_total'] = '%d Hidden and '; +$lang['Hidden_users_total'] = '%d Hidden and '; +$lang['Guest_users_zero_total'] = '0 Guests'; +$lang['Guest_users_total'] = '%d Guests'; +$lang['Guest_user_total'] = '%d Guest'; +$lang['Record_online_users'] = 'Most users ever online was %s on %s'; // first %s = number of users, second %s is the date. + +$lang['Admin_online_color'] = '%sAdministrator%s'; +$lang['Mod_online_color'] = '%sModerator%s'; + +$lang['You_last_visit'] = 'You last visited on %s'; // %s replaced by date/time +$lang['Current_time'] = 'The time now is %s'; // %s replaced by time + +$lang['Search_new'] = 'View posts since last visit'; +$lang['Search_your_posts'] = 'View your posts'; +$lang['Search_unanswered'] = 'View unanswered posts'; + +$lang['Register'] = 'Register'; +$lang['Profile'] = 'Profile'; +$lang['Edit_profile'] = 'Edit your profile'; +$lang['Search'] = 'Search'; +$lang['Memberlist'] = 'Memberlist'; +$lang['FAQ'] = 'FAQ'; +$lang['BBCode_guide'] = 'BBCode Guide'; +$lang['Usergroups'] = 'Usergroups'; +$lang['Last_Post'] = 'Last Post'; +$lang['Moderator'] = 'Moderator'; +$lang['Moderators'] = 'Moderators'; + + +// +// Stats block text +// +$lang['Posted_articles_zero_total'] = 'Our users have posted a total of 0 articles'; // Number of posts +$lang['Posted_articles_total'] = 'Our users have posted a total of %d articles'; // Number of posts +$lang['Posted_article_total'] = 'Our users have posted a total of %d article'; // Number of posts +$lang['Registered_users_zero_total'] = 'We have 0 registered users'; // # registered users +$lang['Registered_users_total'] = 'We have %d registered users'; // # registered users +$lang['Registered_user_total'] = 'We have %d registered user'; // # registered users +$lang['Newest_user'] = 'The newest registered user is %s%s%s'; // a href, username, /a + +$lang['No_new_posts_last_visit'] = 'No new posts since your last visit'; +$lang['No_new_posts'] = 'No new posts'; +$lang['New_posts'] = 'New posts'; +$lang['New_post'] = 'New post'; +$lang['No_new_posts_hot'] = 'No new posts [ Popular ]'; +$lang['New_posts_hot'] = 'New posts [ Popular ]'; +$lang['No_new_posts_locked'] = 'No new posts [ Locked ]'; +$lang['New_posts_locked'] = 'New posts [ Locked ]'; +$lang['Forum_is_locked'] = 'Forum is locked'; + + +// +// Login +// +$lang['Enter_password'] = 'Please enter your username and password to log in.'; +$lang['Login'] = 'Log in'; +$lang['Logout'] = 'Log out'; + +$lang['Forgotten_password'] = 'I forgot my password'; + +$lang['Log_me_in'] = 'Log me on automatically each visit'; + +$lang['Error_login'] = 'You have specified an incorrect or inactive username, or an invalid password.'; + + +// +// Index page +// +$lang['Index'] = 'Index'; +$lang['No_Posts'] = 'No Posts'; +$lang['No_forums'] = 'This board has no forums'; + +$lang['Private_Message'] = 'Private Message'; +$lang['Private_Messages'] = 'Private Messages'; +$lang['Who_is_Online'] = 'Who is Online'; + +$lang['Mark_all_forums'] = 'Mark all forums read'; +$lang['Forums_marked_read'] = 'All forums have been marked read'; + + +// +// Viewforum +// +$lang['View_forum'] = 'View Forum'; + +$lang['Forum_not_exist'] = 'The forum you selected does not exist.'; +$lang['Reached_on_error'] = 'You have reached this page in error.'; + +$lang['Display_topics'] = 'Display topics from previous'; +$lang['All_Topics'] = 'All Topics'; + +$lang['Topic_Announcement'] = 'Announcement:'; +$lang['Topic_Sticky'] = 'Sticky:'; +$lang['Topic_Moved'] = 'Moved:'; +$lang['Topic_Poll'] = '[ Poll ]'; + +$lang['Mark_all_topics'] = 'Mark all topics read'; +$lang['Topics_marked_read'] = 'The topics for this forum have now been marked read'; + +$lang['Rules_post_can'] = 'You can post new topics in this forum'; +$lang['Rules_post_cannot'] = 'You cannot post new topics in this forum'; +$lang['Rules_reply_can'] = 'You can reply to topics in this forum'; +$lang['Rules_reply_cannot'] = 'You cannot reply to topics in this forum'; +$lang['Rules_edit_can'] = 'You can edit your posts in this forum'; +$lang['Rules_edit_cannot'] = 'You cannot edit your posts in this forum'; +$lang['Rules_delete_can'] = 'You can delete your posts in this forum'; +$lang['Rules_delete_cannot'] = 'You cannot delete your posts in this forum'; +$lang['Rules_vote_can'] = 'You can vote in polls in this forum'; +$lang['Rules_vote_cannot'] = 'You cannot vote in polls in this forum'; +$lang['Rules_moderate'] = 'You can %smoderate this forum%s'; // %s replaced by a href links, do not remove! + +$lang['No_topics_post_one'] = 'There are no posts in this forum.
    Click on the Post New Topic link on this page to post one.'; + + +// +// Viewtopic +// +$lang['View_topic'] = 'View topic'; + +$lang['Guest'] = 'Guest'; +$lang['Post_subject'] = 'Post subject'; +$lang['View_next_topic'] = 'View next topic'; +$lang['View_previous_topic'] = 'View previous topic'; +$lang['Submit_vote'] = 'Submit Vote'; +$lang['View_results'] = 'View Results'; + +$lang['No_newer_topics'] = 'There are no newer topics in this forum'; +$lang['No_older_topics'] = 'There are no older topics in this forum'; +$lang['Topic_post_not_exist'] = 'The topic or post you requested does not exist'; +$lang['No_posts_topic'] = 'No posts exist for this topic'; + +$lang['Display_posts'] = 'Display posts from previous'; +$lang['All_Posts'] = 'All Posts'; +$lang['Newest_First'] = 'Newest First'; +$lang['Oldest_First'] = 'Oldest First'; + +$lang['Back_to_top'] = 'Back to top'; + +$lang['Read_profile'] = 'View user\'s profile'; +$lang['Visit_website'] = 'Visit poster\'s website'; +$lang['ICQ_status'] = 'ICQ Status'; +$lang['Edit_delete_post'] = 'Edit/Delete this post'; +$lang['View_IP'] = 'View IP address of poster'; +$lang['Delete_post'] = 'Delete this post'; + +$lang['wrote'] = 'wrote'; // proceeds the username and is followed by the quoted text +$lang['Quote'] = 'Quote'; // comes before bbcode quote output. +$lang['Code'] = 'Code'; // comes before bbcode code output. + +$lang['Edited_time_total'] = 'Last edited by %s on %s; edited %d time in total'; // Last edited by me on 12 Oct 2001; edited 1 time in total +$lang['Edited_times_total'] = 'Last edited by %s on %s; edited %d times in total'; // Last edited by me on 12 Oct 2001; edited 2 times in total + +$lang['Lock_topic'] = 'Lock this topic'; +$lang['Unlock_topic'] = 'Unlock this topic'; +$lang['Move_topic'] = 'Move this topic'; +$lang['Delete_topic'] = 'Delete this topic'; +$lang['Split_topic'] = 'Split this topic'; + +$lang['Stop_watching_topic'] = 'Stop watching this topic'; +$lang['Start_watching_topic'] = 'Watch this topic for replies'; +$lang['No_longer_watching'] = 'You are no longer watching this topic'; +$lang['You_are_watching'] = 'You are now watching this topic'; + +$lang['Total_votes'] = 'Total Votes'; + +// +// Posting/Replying (Not private messaging!) +// +$lang['Message_body'] = 'Message body'; +$lang['Topic_review'] = 'Topic review'; + +$lang['No_post_mode'] = 'No post mode specified'; // If posting.php is called without a mode (newtopic/reply/delete/etc, shouldn't be shown normaly) + +$lang['Post_a_new_topic'] = 'Post a new topic'; +$lang['Post_a_reply'] = 'Post a reply'; +$lang['Post_topic_as'] = 'Post topic as'; +$lang['Edit_Post'] = 'Edit post'; +$lang['Options'] = 'Options'; + +$lang['Post_Announcement'] = 'Announcement'; +$lang['Post_Sticky'] = 'Sticky'; +$lang['Post_Normal'] = 'Normal'; + +$lang['Confirm_delete'] = 'Are you sure you want to delete this post?'; +$lang['Confirm_delete_poll'] = 'Are you sure you want to delete this poll?'; + +$lang['Flood_Error'] = 'You cannot make another post so soon after your last; please try again in a short while.'; +$lang['Empty_subject'] = 'You must specify a subject when posting a new topic.'; +$lang['Empty_message'] = 'You must enter a message when posting.'; +$lang['Forum_locked'] = 'This forum is locked: you cannot post, reply to, or edit topics.'; +$lang['Topic_locked'] = 'This topic is locked: you cannot edit posts or make replies.'; +$lang['No_post_id'] = 'You must select a post to edit'; +$lang['No_topic_id'] = 'You must select a topic to reply to'; +$lang['No_valid_mode'] = 'You can only post, reply, edit, or quote messages. Please return and try again.'; +$lang['No_such_post'] = 'There is no such post. Please return and try again.'; +$lang['Edit_own_posts'] = 'Sorry, but you can only edit your own posts.'; +$lang['Delete_own_posts'] = 'Sorry, but you can only delete your own posts.'; +$lang['Cannot_delete_replied'] = 'Sorry, but you may not delete posts that have been replied to.'; +$lang['Cannot_delete_poll'] = 'Sorry, but you cannot delete an active poll.'; +$lang['Empty_poll_title'] = 'You must enter a title for your poll.'; +$lang['To_few_poll_options'] = 'You must enter at least two poll options.'; +$lang['To_many_poll_options'] = 'You have tried to enter too many poll options.'; +$lang['Post_has_no_poll'] = 'This post has no poll.'; +$lang['Already_voted'] = 'You have already voted in this poll.'; +$lang['No_vote_option'] = 'You must specify an option when voting.'; + +$lang['Add_poll'] = 'Add a Poll'; +$lang['Add_poll_explain'] = 'If you do not want to add a poll to your topic, leave the fields blank.'; +$lang['Poll_question'] = 'Poll question'; +$lang['Poll_option'] = 'Poll option'; +$lang['Add_option'] = 'Add option'; +$lang['Update'] = 'Update'; +$lang['Delete'] = 'Delete'; +$lang['Poll_for'] = 'Run poll for'; +$lang['Days'] = 'Days'; // This is used for the Run poll for ... Days + in admin_forums for pruning +$lang['Poll_for_explain'] = '[ Enter 0 or leave blank for a never-ending poll ]'; +$lang['Delete_poll'] = 'Delete Poll'; + +$lang['Disable_HTML_post'] = 'Disable HTML in this post'; +$lang['Disable_BBCode_post'] = 'Disable BBCode in this post'; +$lang['Disable_Smilies_post'] = 'Disable Smilies in this post'; + +$lang['HTML_is_ON'] = 'HTML is ON'; +$lang['HTML_is_OFF'] = 'HTML is OFF'; +$lang['BBCode_is_ON'] = '%sBBCode%s is ON'; // %s are replaced with URI pointing to FAQ +$lang['BBCode_is_OFF'] = '%sBBCode%s is OFF'; +$lang['Smilies_are_ON'] = 'Smilies are ON'; +$lang['Smilies_are_OFF'] = 'Smilies are OFF'; + +$lang['Attach_signature'] = 'Attach signature (signatures can be changed in profile)'; +$lang['Notify'] = 'Notify me when a reply is posted'; + +$lang['Stored'] = 'Your message has been entered successfully.'; +$lang['Deleted'] = 'Your message has been deleted successfully.'; +$lang['Poll_delete'] = 'Your poll has been deleted successfully.'; +$lang['Vote_cast'] = 'Your vote has been cast.'; + +$lang['Topic_reply_notification'] = 'Topic Reply Notification'; + +$lang['bbcode_b_help'] = 'Bold text: [b]text[/b] (alt+b)'; +$lang['bbcode_i_help'] = 'Italic text: [i]text[/i] (alt+i)'; +$lang['bbcode_u_help'] = 'Underline text: [u]text[/u] (alt+u)'; +$lang['bbcode_q_help'] = 'Quote text: [quote]text[/quote] (alt+q)'; +$lang['bbcode_c_help'] = 'Code display: [code]code[/code] (alt+c)'; +$lang['bbcode_l_help'] = 'List: [list]text[/list] (alt+l)'; +$lang['bbcode_o_help'] = 'Ordered list: [list=]text[/list] (alt+o)'; +$lang['bbcode_p_help'] = 'Insert image: [img]http://image_url[/img] (alt+p)'; +$lang['bbcode_w_help'] = 'Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url] (alt+w)'; +$lang['bbcode_a_help'] = 'Close all open bbCode tags'; +$lang['bbcode_s_help'] = 'Font color: [color=red]text[/color] Tip: you can also use color=#FF0000'; +$lang['bbcode_f_help'] = 'Font size: [size=x-small]small text[/size]'; + +$lang['Emoticons'] = 'Emoticons'; +$lang['More_emoticons'] = 'View more Emoticons'; + +$lang['Font_color'] = 'Font colour'; +$lang['color_default'] = 'Default'; +$lang['color_dark_red'] = 'Dark Red'; +$lang['color_red'] = 'Red'; +$lang['color_orange'] = 'Orange'; +$lang['color_brown'] = 'Brown'; +$lang['color_yellow'] = 'Yellow'; +$lang['color_green'] = 'Green'; +$lang['color_olive'] = 'Olive'; +$lang['color_cyan'] = 'Cyan'; +$lang['color_blue'] = 'Blue'; +$lang['color_dark_blue'] = 'Dark Blue'; +$lang['color_indigo'] = 'Indigo'; +$lang['color_violet'] = 'Violet'; +$lang['color_white'] = 'White'; +$lang['color_black'] = 'Black'; + +$lang['Font_size'] = 'Font size'; +$lang['font_tiny'] = 'Tiny'; +$lang['font_small'] = 'Small'; +$lang['font_normal'] = 'Normal'; +$lang['font_large'] = 'Large'; +$lang['font_huge'] = 'Huge'; + +$lang['Close_Tags'] = 'Close Tags'; +$lang['Styles_tip'] = 'Tip: Styles can be applied quickly to selected text.'; + + +// +// Private Messaging +// +$lang['Private_Messaging'] = 'Private Messaging'; + +$lang['Login_check_pm'] = 'Log in to check your private messages'; +$lang['New_pms'] = 'You have %d new messages'; // You have 2 new messages +$lang['New_pm'] = 'You have %d new message'; // You have 1 new message +$lang['No_new_pm'] = 'You have no new messages'; +$lang['Unread_pms'] = 'You have %d unread messages'; +$lang['Unread_pm'] = 'You have %d unread message'; +$lang['No_unread_pm'] = 'You have no unread messages'; +$lang['You_new_pm'] = 'A new private message is waiting for you in your Inbox'; +$lang['You_new_pms'] = 'New private messages are waiting for you in your Inbox'; +$lang['You_no_new_pm'] = 'No new private messages are waiting for you'; + +$lang['Unread_message'] = 'Unread message'; +$lang['Read_message'] = 'Read message'; + +$lang['Read_pm'] = 'Read message'; +$lang['Post_new_pm'] = 'Post message'; +$lang['Post_reply_pm'] = 'Reply to message'; +$lang['Post_quote_pm'] = 'Quote message'; +$lang['Edit_pm'] = 'Edit message'; + +$lang['Inbox'] = 'Inbox'; +$lang['Outbox'] = 'Outbox'; +$lang['Savebox'] = 'Savebox'; +$lang['Sentbox'] = 'Sentbox'; +$lang['Flag'] = 'Flag'; +$lang['Subject'] = 'Subject'; +$lang['From'] = 'From'; +$lang['To'] = 'To'; +$lang['Date'] = 'Date'; +$lang['Mark'] = 'Mark'; +$lang['Sent'] = 'Sent'; +$lang['Saved'] = 'Saved'; +$lang['Delete_marked'] = 'Delete Marked'; +$lang['Delete_all'] = 'Delete All'; +$lang['Save_marked'] = 'Save Marked'; +$lang['Save_message'] = 'Save Message'; +$lang['Delete_message'] = 'Delete Message'; + +$lang['Display_messages'] = 'Display messages from previous'; // Followed by number of days/weeks/months +$lang['All_Messages'] = 'All Messages'; + +$lang['No_messages_folder'] = 'You have no messages in this folder'; + +$lang['PM_disabled'] = 'Private messaging has been disabled on this board.'; +$lang['Cannot_send_privmsg'] = 'Sorry, but the administrator has prevented you from sending private messages.'; +$lang['No_to_user'] = 'You must specify a username to whom to send this message.'; +$lang['No_such_user'] = 'Sorry, but no such user exists.'; + +$lang['Disable_HTML_pm'] = 'Disable HTML in this message'; +$lang['Disable_BBCode_pm'] = 'Disable BBCode in this message'; +$lang['Disable_Smilies_pm'] = 'Disable Smilies in this message'; + +$lang['Message_sent'] = 'Your message has been sent.'; + +$lang['Click_return_inbox'] = 'Click %sHere%s to return to your Inbox'; +$lang['Click_return_index'] = 'Click %sHere%s to return to the Index'; + +$lang['Send_a_new_message'] = 'Send a new private message'; +$lang['Send_a_reply'] = 'Reply to a private message'; +$lang['Edit_message'] = 'Edit private message'; + +$lang['Notification_subject'] = 'New Private Message has arrived!'; + +$lang['Find_username'] = 'Find a username'; +$lang['Find'] = 'Find'; +$lang['No_match'] = 'No matches found.'; + +$lang['No_post_id'] = 'No post ID was specified'; +$lang['No_such_folder'] = 'No such folder exists'; +$lang['No_folder'] = 'No folder specified'; + +$lang['Mark_all'] = 'Mark all'; +$lang['Unmark_all'] = 'Unmark all'; + +$lang['Confirm_delete_pm'] = 'Are you sure you want to delete this message?'; +$lang['Confirm_delete_pms'] = 'Are you sure you want to delete these messages?'; + +$lang['Inbox_size'] = 'Your Inbox is %d%% full'; // eg. Your Inbox is 50% full +$lang['Sentbox_size'] = 'Your Sentbox is %d%% full'; +$lang['Savebox_size'] = 'Your Savebox is %d%% full'; + +$lang['Click_view_privmsg'] = 'Click %sHere%s to visit your Inbox'; + + +// +// Profiles/Registration +// +$lang['Viewing_user_profile'] = 'Viewing profile :: %s'; // %s is username +$lang['About_user'] = 'All about %s'; // %s is username + +$lang['Preferences'] = 'Preferences'; +$lang['Items_required'] = 'Items marked with a * are required unless stated otherwise.'; +$lang['Registration_info'] = 'Registration Information'; +$lang['Profile_info'] = 'Profile Information'; +$lang['Profile_info_warn'] = 'This information will be publicly viewable'; +$lang['Avatar_panel'] = 'Avatar control panel'; +$lang['Avatar_gallery'] = 'Avatar gallery'; + +$lang['Website'] = 'Website'; +$lang['Location'] = 'Location'; +$lang['Contact'] = 'Contact'; +$lang['Email_address'] = 'E-mail address'; +$lang['Send_private_message'] = 'Send private message'; +$lang['Hidden_email'] = '[ Hidden ]'; +$lang['Interests'] = 'Interests'; +$lang['Occupation'] = 'Occupation'; +$lang['Poster_rank'] = 'Poster rank'; + +$lang['Total_posts'] = 'Total posts'; +$lang['User_post_pct_stats'] = '%.2f%% of total'; // 1.25% of total +$lang['User_post_day_stats'] = '%.2f posts per day'; // 1.5 posts per day +$lang['Search_user_posts'] = 'Find all posts by %s'; // Find all posts by username + +$lang['No_user_id_specified'] = 'Sorry, but that user does not exist.'; +$lang['Wrong_Profile'] = 'You cannot modify a profile that is not your own.'; + +$lang['Only_one_avatar'] = 'Only one type of avatar can be specified'; +$lang['File_no_data'] = 'The file at the URL you gave contains no data'; +$lang['No_connection_URL'] = 'A connection could not be made to the URL you gave'; +$lang['Incomplete_URL'] = 'The URL you entered is incomplete'; +$lang['Wrong_remote_avatar_format'] = 'The URL of the remote avatar is not valid'; +$lang['No_send_account_inactive'] = 'Sorry, but your password cannot be retrieved because your account is currently inactive. Please contact the forum administrator for more information.'; + +$lang['Always_smile'] = 'Always enable Smilies'; +$lang['Always_html'] = 'Always allow HTML'; +$lang['Always_bbcode'] = 'Always allow BBCode'; +$lang['Always_add_sig'] = 'Always attach my signature'; +$lang['Always_notify'] = 'Always notify me of replies'; +$lang['Always_notify_explain'] = 'Sends an e-mail when someone replies to a topic you have posted in. This can be changed whenever you post.'; + +$lang['Board_style'] = 'Board Style'; +$lang['Board_lang'] = 'Board Language'; +$lang['No_themes'] = 'No Themes In database'; +$lang['Timezone'] = 'Timezone'; +$lang['Date_format'] = 'Date format'; +$lang['Date_format_explain'] = 'The syntax used is identical to the PHP date() function.'; +$lang['Signature'] = 'Signature'; +$lang['Signature_explain'] = 'This is a block of text that can be added to posts you make. There is a %d character limit'; +$lang['Public_view_email'] = 'Always show my e-mail address'; + +$lang['Current_password'] = 'Current password'; +$lang['New_password'] = 'New password'; +$lang['Confirm_password'] = 'Confirm password'; +$lang['Confirm_password_explain'] = 'You must confirm your current password if you wish to change it or alter your e-mail address'; +$lang['password_if_changed'] = 'You only need to supply a password if you want to change it'; +$lang['password_confirm_if_changed'] = 'You only need to confirm your password if you changed it above'; + +$lang['Avatar'] = 'Avatar'; +$lang['Avatar_explain'] = 'Displays a small graphic image below your details in posts. Only one image can be displayed at a time, its width can be no greater than %d pixels, the height no greater than %d pixels, and the file size no more than %d KB.'; +$lang['Upload_Avatar_file'] = 'Upload Avatar from your machine'; +$lang['Upload_Avatar_URL'] = 'Upload Avatar from a URL'; +$lang['Upload_Avatar_URL_explain'] = 'Enter the URL of the location containing the Avatar image, it will be copied to this site.'; +$lang['Pick_local_Avatar'] = 'Select Avatar from the gallery'; +$lang['Link_remote_Avatar'] = 'Link to off-site Avatar'; +$lang['Link_remote_Avatar_explain'] = 'Enter the URL of the location containing the Avatar image you wish to link to.'; +$lang['Avatar_URL'] = 'URL of Avatar Image'; +$lang['Select_from_gallery'] = 'Select Avatar from gallery'; +$lang['View_avatar_gallery'] = 'Show gallery'; + +$lang['Select_avatar'] = 'Select avatar'; +$lang['Return_profile'] = 'Cancel avatar'; +$lang['Select_category'] = 'Select category'; + +$lang['Delete_Image'] = 'Delete Image'; +$lang['Current_Image'] = 'Current Image'; + +$lang['Notify_on_privmsg'] = 'Notify on new Private Message'; +$lang['Popup_on_privmsg'] = 'Pop up window on new Private Message'; +$lang['Popup_on_privmsg_explain'] = 'Some templates may open a new window to inform you when new private messages arrive.'; +$lang['Hide_user'] = 'Hide your online status'; + +$lang['Profile_updated'] = 'Your profile has been updated'; +$lang['Profile_updated_inactive'] = 'Your profile has been updated. However, you have changed vital details, thus your account is now inactive. Check your e-mail to find out how to reactivate your account, or if admin activation is required, wait for the administrator to reactivate it.'; + +$lang['Password_mismatch'] = 'The passwords you entered did not match.'; +$lang['Current_password_mismatch'] = 'The current password you supplied does not match that stored in the database.'; +$lang['Password_long'] = 'Your password must be no more than 32 characters.'; +$lang['Username_taken'] = 'Sorry, but this username has already been taken.'; +$lang['Username_invalid'] = 'Sorry, but this username contains an invalid character such as \'.'; +$lang['Username_disallowed'] = 'Sorry, but this username has been disallowed.'; +$lang['Email_taken'] = 'Sorry, but that e-mail address is already registered to a user.'; +$lang['Email_banned'] = 'Sorry, but this e-mail address has been banned.'; +$lang['Email_invalid'] = 'Sorry, but this e-mail address is invalid.'; +$lang['Signature_too_long'] = 'Your signature is too long.'; +$lang['Fields_empty'] = 'You must fill in the required fields.'; +$lang['Avatar_filetype'] = 'The avatar filetype must be .jpg, .gif or .png'; +$lang['Avatar_filesize'] = 'The avatar image file size must be less than %d KB'; // The avatar image file size must be less than 6 KB +$lang['Avatar_imagesize'] = 'The avatar must be less than %d pixels wide and %d pixels high'; + +$lang['Welcome_subject'] = 'Welcome to %s Forums'; // Welcome to my.com forums +$lang['New_account_subject'] = 'New user account'; +$lang['Account_activated_subject'] = 'Account Activated'; + +$lang['Account_added'] = 'Thank you for registering. Your account has been created. You may now log in with your username and password'; +$lang['Account_inactive'] = 'Your account has been created. However, this forum requires account activation. An activation key has been sent to the e-mail address you provided. Please check your e-mail for further information'; +$lang['Account_inactive_admin'] = 'Your account has been created. However, this forum requires account activation by the administrator. An e-mail has been sent to them and you will be informed when your account has been activated'; +$lang['Account_active'] = 'Your account has now been activated. Thank you for registering'; +$lang['Account_active_admin'] = 'The account has now been activated'; +$lang['Reactivate'] = 'Reactivate your account!'; +$lang['Already_activated'] = 'You have already activated your account'; +$lang['COPPA'] = 'Your account has been created but has to be approved. Please check your e-mail for details.'; + +$lang['Registration'] = 'Registration Agreement Terms'; +$lang['Reg_agreement'] = 'While the administrators and moderators of this forum will attempt to remove or edit any generally objectionable material as quickly as possible, it is impossible to review every message. Therefore you acknowledge that all posts made to these forums express the views and opinions of the author and not the administrators, moderators or webmaster (except for posts by these people) and hence will not be held liable.

    You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-oriented or any other material that may violate any applicable laws. Doing so may lead to you being immediately and permanently banned (and your service provider being informed). The IP address of all posts is recorded to aid in enforcing these conditions. You agree that the webmaster, administrator and moderators of this forum have the right to remove, edit, move or close any topic at any time should they see fit. As a user you agree to any information you have entered above being stored in a database. While this information will not be disclosed to any third party without your consent the webmaster, administrator and moderators cannot be held responsible for any hacking attempt that may lead to the data being compromised.

    This forum system uses cookies to store information on your local computer. These cookies do not contain any of the information you have entered above; they serve only to improve your viewing pleasure. The e-mail address is used only for confirming your registration details and password (and for sending new passwords should you forget your current one).

    By clicking Register below you agree to be bound by these conditions.'; + +$lang['Agree_under_13'] = 'I Agree to these terms and am under 13 years of age'; +$lang['Agree_over_13'] = 'I Agree to these terms and am over or exactly 13 years of age'; +$lang['Agree_not'] = 'I do not agree to these terms'; + +$lang['Wrong_activation'] = 'The activation key you supplied does not match any in the database.'; +$lang['Send_password'] = 'Send me a new password'; +$lang['Password_updated'] = 'A new password has been created; please check your e-mail for details on how to activate it.'; +$lang['No_email_match'] = 'The e-mail address you supplied does not match the one listed for that username.'; +$lang['New_password_activation'] = 'New password activation'; +$lang['Password_activated'] = 'Your account has been re-activated. To log in, please use the password supplied in the e-mail you received.'; + +$lang['Send_email_msg'] = 'Send an e-mail message'; +$lang['No_user_specified'] = 'No user was specified'; +$lang['User_prevent_email'] = 'This user does not wish to receive e-mail. Try sending them a private message.'; +$lang['User_not_exist'] = 'That user does not exist'; +$lang['CC_email'] = 'Send a copy of this e-mail to yourself'; +$lang['Email_message_desc'] = 'This message will be sent as plain text, so do not include any HTML or BBCode. The return address for this message will be set to your e-mail address.'; +$lang['Flood_email_limit'] = 'You cannot send another e-mail at this time. Try again later.'; +$lang['Recipient'] = 'Recipient'; +$lang['Email_sent'] = 'The e-mail has been sent.'; +$lang['Send_email'] = 'Send e-mail'; +$lang['Empty_subject_email'] = 'You must specify a subject for the e-mail.'; +$lang['Empty_message_email'] = 'You must enter a message to be e-mailed.'; + + +// +// Visual confirmation system strings +// +$lang['Confirm_code_wrong'] = 'The confirmation code you entered was incorrect'; +$lang['Too_many_registers'] = 'You have exceeded the number of registration attempts for this session. Please try again later.'; +$lang['Confirm_code_impaired'] = 'If you are visually impaired or cannot otherwise read this code please contact the %sAdministrator%s for help.'; +$lang['Confirm_code'] = 'Confirmation code'; +$lang['Confirm_code_explain'] = 'Enter the code exactly as you see it. The code is case sensitive and zero has a diagonal line through it.'; + + + +// +// Memberslist +// +$lang['Select_sort_method'] = 'Select sort method'; +$lang['Sort'] = 'Sort'; +$lang['Sort_Top_Ten'] = 'Top Ten Posters'; +$lang['Sort_Joined'] = 'Joined Date'; +$lang['Sort_Username'] = 'Username'; +$lang['Sort_Location'] = 'Location'; +$lang['Sort_Posts'] = 'Total posts'; +$lang['Sort_Email'] = 'Email'; +$lang['Sort_Website'] = 'Website'; +$lang['Sort_Ascending'] = 'Ascending'; +$lang['Sort_Descending'] = 'Descending'; +$lang['Order'] = 'Order'; + + +// +// Group control panel +// +$lang['Group_Control_Panel'] = 'Group Control Panel'; +$lang['Group_member_details'] = 'Group Membership Details'; +$lang['Group_member_join'] = 'Join a Group'; + +$lang['Group_Information'] = 'Group Information'; +$lang['Group_name'] = 'Group name'; +$lang['Group_description'] = 'Group description'; +$lang['Group_membership'] = 'Group membership'; +$lang['Group_Members'] = 'Group Members'; +$lang['Group_Moderator'] = 'Group Moderator'; +$lang['Pending_members'] = 'Pending Members'; + +$lang['Group_type'] = 'Group type'; +$lang['Group_open'] = 'Open group'; +$lang['Group_closed'] = 'Closed group'; +$lang['Group_hidden'] = 'Hidden group'; + +$lang['Current_memberships'] = 'Current memberships'; +$lang['Non_member_groups'] = 'Non-member groups'; +$lang['Memberships_pending'] = 'Memberships pending'; + +$lang['No_groups_exist'] = 'No Groups Exist'; +$lang['Group_not_exist'] = 'That user group does not exist'; + +$lang['Join_group'] = 'Join Group'; +$lang['No_group_members'] = 'This group has no members'; +$lang['Group_hidden_members'] = 'This group is hidden; you cannot view its membership'; +$lang['No_pending_group_members'] = 'This group has no pending members'; +$lang['Group_joined'] = 'You have successfully subscribed to this group.
    You will be notified when your subscription is approved by the group moderator.'; +$lang['Group_request'] = 'A request to join your group has been made.'; +$lang['Group_approved'] = 'Your request has been approved.'; +$lang['Group_added'] = 'You have been added to this usergroup.'; +$lang['Already_member_group'] = 'You are already a member of this group'; +$lang['User_is_member_group'] = 'User is already a member of this group'; +$lang['Group_type_updated'] = 'Successfully updated group type.'; + +$lang['Could_not_add_user'] = 'The user you selected does not exist.'; +$lang['Could_not_anon_user'] = 'You cannot make Anonymous a group member.'; + +$lang['Confirm_unsub'] = 'Are you sure you want to unsubscribe from this group?'; +$lang['Confirm_unsub_pending'] = 'Your subscription to this group has not yet been approved; are you sure you want to unsubscribe?'; + +$lang['Unsub_success'] = 'You have been un-subscribed from this group.'; + +$lang['Approve_selected'] = 'Approve Selected'; +$lang['Deny_selected'] = 'Deny Selected'; +$lang['Not_logged_in'] = 'You must be logged in to join a group.'; +$lang['Remove_selected'] = 'Remove Selected'; +$lang['Add_member'] = 'Add Member'; +$lang['Not_group_moderator'] = 'You are not this group\'s moderator, therefore you cannot perform that action.'; + +$lang['Login_to_join'] = 'Log in to join or manage group memberships'; +$lang['This_open_group'] = 'This is an open group: click to request membership'; +$lang['This_closed_group'] = 'This is a closed group: no more users accepted'; +$lang['This_hidden_group'] = 'This is a hidden group: automatic user addition is not allowed'; +$lang['Member_this_group'] = 'You are a member of this group'; +$lang['Pending_this_group'] = 'Your membership of this group is pending'; +$lang['Are_group_moderator'] = 'You are the group moderator'; +$lang['None'] = 'None'; + +$lang['Subscribe'] = 'Subscribe'; +$lang['Unsubscribe'] = 'Unsubscribe'; +$lang['View_Information'] = 'View Information'; + + +// +// Search +// +$lang['Search_query'] = 'Search Query'; +$lang['Search_options'] = 'Search Options'; + +$lang['Search_keywords'] = 'Search for Keywords'; +$lang['Search_keywords_explain'] = 'You can use AND to define words which must be in the results, OR to define words which may be in the result and NOT to define words which should not be in the result. Use * as a wildcard for partial matches'; +$lang['Search_author'] = 'Search for Author'; +$lang['Search_author_explain'] = 'Use * as a wildcard for partial matches'; + +$lang['Search_for_any'] = 'Search for any terms or use query as entered'; +$lang['Search_for_all'] = 'Search for all terms'; +$lang['Search_title_msg'] = 'Search topic title and message text'; +$lang['Search_msg_only'] = 'Search message text only'; + +$lang['Return_first'] = 'Return first'; // followed by xxx characters in a select box +$lang['characters_posts'] = 'characters of posts'; + +$lang['Search_previous'] = 'Search previous'; // followed by days, weeks, months, year, all in a select box + +$lang['Sort_by'] = 'Sort by'; +$lang['Sort_Time'] = 'Post Time'; +$lang['Sort_Post_Subject'] = 'Post Subject'; +$lang['Sort_Topic_Title'] = 'Topic Title'; +$lang['Sort_Author'] = 'Author'; +$lang['Sort_Forum'] = 'Forum'; + +$lang['Display_results'] = 'Display results as'; +$lang['All_available'] = 'All available'; +$lang['No_searchable_forums'] = 'You do not have permissions to search any forum on this site.'; + +$lang['No_search_match'] = 'No topics or posts met your search criteria'; +$lang['Found_search_match'] = 'Search found %d match'; // eg. Search found 1 match +$lang['Found_search_matches'] = 'Search found %d matches'; // eg. Search found 24 matches +$lang['Search_Flood_Error'] = 'You cannot make another search so soon after your last; please try again in a short while.'; + +$lang['Close_window'] = 'Close Window'; + + +// +// Auth related entries +// +// Note the %s will be replaced with one of the following 'user' arrays +$lang['Sorry_auth_announce'] = 'Sorry, but only %s can post announcements in this forum.'; +$lang['Sorry_auth_sticky'] = 'Sorry, but only %s can post sticky messages in this forum.'; +$lang['Sorry_auth_read'] = 'Sorry, but only %s can read topics in this forum.'; +$lang['Sorry_auth_post'] = 'Sorry, but only %s can post topics in this forum.'; +$lang['Sorry_auth_reply'] = 'Sorry, but only %s can reply to posts in this forum.'; +$lang['Sorry_auth_edit'] = 'Sorry, but only %s can edit posts in this forum.'; +$lang['Sorry_auth_delete'] = 'Sorry, but only %s can delete posts in this forum.'; +$lang['Sorry_auth_vote'] = 'Sorry, but only %s can vote in polls in this forum.'; + +// These replace the %s in the above strings +$lang['Auth_Anonymous_Users'] = 'anonymous users'; +$lang['Auth_Registered_Users'] = 'registered users'; +$lang['Auth_Users_granted_access'] = 'users granted special access'; +$lang['Auth_Moderators'] = 'moderators'; +$lang['Auth_Administrators'] = 'administrators'; + +$lang['Not_Moderator'] = 'You are not a moderator of this forum.'; +$lang['Not_Authorised'] = 'Not Authorised'; + +$lang['You_been_banned'] = 'You have been banned from this forum.
    Please contact the webmaster or board administrator for more information.'; + + +// +// Viewonline +// +$lang['Reg_users_zero_online'] = 'There are 0 Registered users and '; // There are 5 Registered and +$lang['Reg_users_online'] = 'There are %d Registered users and '; // There are 5 Registered and +$lang['Reg_user_online'] = 'There is %d Registered user and '; // There is 1 Registered and +$lang['Hidden_users_zero_online'] = '0 Hidden users online'; // 6 Hidden users online +$lang['Hidden_users_online'] = '%d Hidden users online'; // 6 Hidden users online +$lang['Hidden_user_online'] = '%d Hidden user online'; // 6 Hidden users online +$lang['Guest_users_online'] = 'There are %d Guest users online'; // There are 10 Guest users online +$lang['Guest_users_zero_online'] = 'There are 0 Guest users online'; // There are 10 Guest users online +$lang['Guest_user_online'] = 'There is %d Guest user online'; // There is 1 Guest user online +$lang['No_users_browsing'] = 'There are no users currently browsing this forum'; + +$lang['Online_explain'] = 'This data is based on users active over the past five minutes'; + +$lang['Forum_Location'] = 'Forum Location'; +$lang['Last_updated'] = 'Last Updated'; + +$lang['Forum_index'] = 'Forum index'; +$lang['Logging_on'] = 'Logging on'; +$lang['Posting_message'] = 'Posting a message'; +$lang['Searching_forums'] = 'Searching forums'; +$lang['Viewing_profile'] = 'Viewing profile'; +$lang['Viewing_online'] = 'Viewing who is online'; +$lang['Viewing_member_list'] = 'Viewing member list'; +$lang['Viewing_priv_msgs'] = 'Viewing Private Messages'; +$lang['Viewing_FAQ'] = 'Viewing FAQ'; + + +// +// Moderator Control Panel +// +$lang['Mod_CP'] = 'Moderator Control Panel'; +$lang['Mod_CP_explain'] = 'Using the form below you can perform mass moderation operations on this forum. You can lock, unlock, move or delete any number of topics.'; + +$lang['Select'] = 'Select'; +$lang['Delete'] = 'Delete'; +$lang['Move'] = 'Move'; +$lang['Lock'] = 'Lock'; +$lang['Unlock'] = 'Unlock'; + +$lang['Topics_Removed'] = 'The selected topics have been successfully removed from the database.'; +$lang['Topics_Locked'] = 'The selected topics have been locked.'; +$lang['Topics_Moved'] = 'The selected topics have been moved.'; +$lang['Topics_Unlocked'] = 'The selected topics have been unlocked.'; +$lang['No_Topics_Moved'] = 'No topics were moved.'; + +$lang['Confirm_delete_topic'] = 'Are you sure you want to remove the selected topic/s?'; +$lang['Confirm_lock_topic'] = 'Are you sure you want to lock the selected topic/s?'; +$lang['Confirm_unlock_topic'] = 'Are you sure you want to unlock the selected topic/s?'; +$lang['Confirm_move_topic'] = 'Are you sure you want to move the selected topic/s?'; + +$lang['Move_to_forum'] = 'Move to forum'; +$lang['Leave_shadow_topic'] = 'Leave shadow topic in old forum.'; + +$lang['Split_Topic'] = 'Split Topic Control Panel'; +$lang['Split_Topic_explain'] = 'Using the form below you can split a topic in two, either by selecting the posts individually or by splitting at a selected post'; +$lang['Split_title'] = 'New topic title'; +$lang['Split_forum'] = 'Forum for new topic'; +$lang['Split_posts'] = 'Split selected posts'; +$lang['Split_after'] = 'Split from selected post'; +$lang['Topic_split'] = 'The selected topic has been split successfully'; + +$lang['Too_many_error'] = 'You have selected too many posts. You can only select one post to split a topic after!'; + +$lang['None_selected'] = 'You have not selected any topics to perform this operation on. Please go back and select at least one.'; +$lang['New_forum'] = 'New forum'; + +$lang['This_posts_IP'] = 'IP address for this post'; +$lang['Other_IP_this_user'] = 'Other IP addresses this user has posted from'; +$lang['Users_this_IP'] = 'Users posting from this IP address'; +$lang['IP_info'] = 'IP Information'; +$lang['Lookup_IP'] = 'Look up IP address'; + + +// +// Timezones ... for display on each page +// +$lang['All_times'] = 'All times are %s'; // eg. All times are GMT - 12 Hours (times from next block) + +$lang['-12'] = 'GMT - 12 Hours'; +$lang['-11'] = 'GMT - 11 Hours'; +$lang['-10'] = 'GMT - 10 Hours'; +$lang['-9'] = 'GMT - 9 Hours'; +$lang['-8'] = 'GMT - 8 Hours'; +$lang['-7'] = 'GMT - 7 Hours'; +$lang['-6'] = 'GMT - 6 Hours'; +$lang['-5'] = 'GMT - 5 Hours'; +$lang['-4'] = 'GMT - 4 Hours'; +$lang['-3.5'] = 'GMT - 3.5 Hours'; +$lang['-3'] = 'GMT - 3 Hours'; +$lang['-2'] = 'GMT - 2 Hours'; +$lang['-1'] = 'GMT - 1 Hours'; +$lang['0'] = 'GMT'; +$lang['1'] = 'GMT + 1 Hour'; +$lang['2'] = 'GMT + 2 Hours'; +$lang['3'] = 'GMT + 3 Hours'; +$lang['3.5'] = 'GMT + 3.5 Hours'; +$lang['4'] = 'GMT + 4 Hours'; +$lang['4.5'] = 'GMT + 4.5 Hours'; +$lang['5'] = 'GMT + 5 Hours'; +$lang['5.5'] = 'GMT + 5.5 Hours'; +$lang['6'] = 'GMT + 6 Hours'; +$lang['6.5'] = 'GMT + 6.5 Hours'; +$lang['7'] = 'GMT + 7 Hours'; +$lang['8'] = 'GMT + 8 Hours'; +$lang['9'] = 'GMT + 9 Hours'; +$lang['9.5'] = 'GMT + 9.5 Hours'; +$lang['10'] = 'GMT + 10 Hours'; +$lang['11'] = 'GMT + 11 Hours'; +$lang['12'] = 'GMT + 12 Hours'; +$lang['13'] = 'GMT + 13 Hours'; + +// These are displayed in the timezone select box +$lang['tz']['-12'] = 'GMT - 12 Hours'; +$lang['tz']['-11'] = 'GMT - 11 Hours'; +$lang['tz']['-10'] = 'GMT - 10 Hours'; +$lang['tz']['-9'] = 'GMT - 9 Hours'; +$lang['tz']['-8'] = 'GMT - 8 Hours'; +$lang['tz']['-7'] = 'GMT - 7 Hours'; +$lang['tz']['-6'] = 'GMT - 6 Hours'; +$lang['tz']['-5'] = 'GMT - 5 Hours'; +$lang['tz']['-4'] = 'GMT - 4 Hours'; +$lang['tz']['-3.5'] = 'GMT - 3.5 Hours'; +$lang['tz']['-3'] = 'GMT - 3 Hours'; +$lang['tz']['-2'] = 'GMT - 2 Hours'; +$lang['tz']['-1'] = 'GMT - 1 Hours'; +$lang['tz']['0'] = 'GMT'; +$lang['tz']['1'] = 'GMT + 1 Hour'; +$lang['tz']['2'] = 'GMT + 2 Hours'; +$lang['tz']['3'] = 'GMT + 3 Hours'; +$lang['tz']['3.5'] = 'GMT + 3.5 Hours'; +$lang['tz']['4'] = 'GMT + 4 Hours'; +$lang['tz']['4.5'] = 'GMT + 4.5 Hours'; +$lang['tz']['5'] = 'GMT + 5 Hours'; +$lang['tz']['5.5'] = 'GMT + 5.5 Hours'; +$lang['tz']['6'] = 'GMT + 6 Hours'; +$lang['tz']['6.5'] = 'GMT + 6.5 Hours'; +$lang['tz']['7'] = 'GMT + 7 Hours'; +$lang['tz']['8'] = 'GMT + 8 Hours'; +$lang['tz']['9'] = 'GMT + 9 Hours'; +$lang['tz']['9.5'] = 'GMT + 9.5 Hours'; +$lang['tz']['10'] = 'GMT + 10 Hours'; +$lang['tz']['11'] = 'GMT + 11 Hours'; +$lang['tz']['12'] = 'GMT + 12 Hours'; +$lang['tz']['13'] = 'GMT + 13 Hours'; + +$lang['datetime']['Sunday'] = 'Sunday'; +$lang['datetime']['Monday'] = 'Monday'; +$lang['datetime']['Tuesday'] = 'Tuesday'; +$lang['datetime']['Wednesday'] = 'Wednesday'; +$lang['datetime']['Thursday'] = 'Thursday'; +$lang['datetime']['Friday'] = 'Friday'; +$lang['datetime']['Saturday'] = 'Saturday'; +$lang['datetime']['Sun'] = 'Sun'; +$lang['datetime']['Mon'] = 'Mon'; +$lang['datetime']['Tue'] = 'Tue'; +$lang['datetime']['Wed'] = 'Wed'; +$lang['datetime']['Thu'] = 'Thu'; +$lang['datetime']['Fri'] = 'Fri'; +$lang['datetime']['Sat'] = 'Sat'; +$lang['datetime']['January'] = 'January'; +$lang['datetime']['February'] = 'February'; +$lang['datetime']['March'] = 'March'; +$lang['datetime']['April'] = 'April'; +$lang['datetime']['May'] = 'May'; +$lang['datetime']['June'] = 'June'; +$lang['datetime']['July'] = 'July'; +$lang['datetime']['August'] = 'August'; +$lang['datetime']['September'] = 'September'; +$lang['datetime']['October'] = 'October'; +$lang['datetime']['November'] = 'November'; +$lang['datetime']['December'] = 'December'; +$lang['datetime']['Jan'] = 'Jan'; +$lang['datetime']['Feb'] = 'Feb'; +$lang['datetime']['Mar'] = 'Mar'; +$lang['datetime']['Apr'] = 'Apr'; +$lang['datetime']['May'] = 'May'; +$lang['datetime']['Jun'] = 'Jun'; +$lang['datetime']['Jul'] = 'Jul'; +$lang['datetime']['Aug'] = 'Aug'; +$lang['datetime']['Sep'] = 'Sep'; +$lang['datetime']['Oct'] = 'Oct'; +$lang['datetime']['Nov'] = 'Nov'; +$lang['datetime']['Dec'] = 'Dec'; + +// +// Errors (not related to a +// specific failure on a page) +// +$lang['Information'] = 'Information'; +$lang['Critical_Information'] = 'Critical Information'; + +$lang['General_Error'] = 'General Error'; +$lang['Critical_Error'] = 'Critical Error'; +$lang['An_error_occured'] = 'An Error Occurred'; +$lang['A_critical_error'] = 'A Critical Error Occurred'; + +$lang['Admin_reauthenticate'] = 'To administer the board you must re-authenticate yourself.'; +$lang['Login_attempts_exceeded'] = 'The maximum number of %s login attempts has been exceeded. You are not allowed to login for the next %s minutes.'; +$lang['Please_remove_install_contrib'] = 'Please ensure both the install/ and contrib/ directories are deleted'; + +$lang['Session_invalid'] = 'Invalid Session. Please resubmit the form.'; + +// +// That's all, Folks! +// ------------------------------------------------- + +?> \ No newline at end of file diff --git a/phpBB/language/lang_english/search_stopwords.txt b/phpBB/language/lang_english/search_stopwords.txt new file mode 100644 index 0000000000..5629d9a00b --- /dev/null +++ b/phpBB/language/lang_english/search_stopwords.txt @@ -0,0 +1,251 @@ +a +about +after +ago +all +almost +along +alot +also +am +an +and +answer +any +anybody +anybodys +anywhere +are +arent +around +as +ask +askd +at +bad +be +because +been +before +being +best +better +between +big +btw +but +by +can +cant +come +could +couldnt +day +days +days +did +didnt +do +does +doesnt +dont +down +each +etc +either +else +even +ever +every +everybody +everybodys +everyone +far +find +for +found +from +get +go +going +gone +good +got +gotten +had +has +have +havent +having +her +here +hers +him +his +home +how +hows +href +I +Ive +if +in +ini +into +is +isnt +it +its +its +just +know +large +less +like +liked +little +looking +look +looked +looking +lot +maybe +many +me +more +most +much +must +mustnt +my +near +need +never +new +news +no +none +not +nothing +now +of +off +often +old +on +once +only +oops +or +other +our +ours +out +over +page +please +put +question +questions +questioned +quote +rather +really +recent +said +saw +say +says +she +see +sees +should +sites +small +so +some +something +sometime +somewhere +soon +take +than +true +thank +that +thatd +thats +the +their +theirs +theres +theirs +them +then +there +these +they +theyll +theyd +theyre +this +those +though +through +thus +time +times +to +too +under +until +untrue +up +upon +use +users +version +very +via +want +was +way +we +well +went +were +werent +what +when +where +which +who +whom +whose +why +wide +will +with +within +without +wont +world +worse +worst +would +wrote +www +yes +yet +you +youd +youll +your +youre +yours +AFAIK +IIRC +LOL +ROTF +ROTFLMAO +YMMV diff --git a/phpBB/language/lang_english/search_synonyms.txt b/phpBB/language/lang_english/search_synonyms.txt new file mode 100644 index 0000000000..0359039e0e --- /dev/null +++ b/phpBB/language/lang_english/search_synonyms.txt @@ -0,0 +1,149 @@ +abcense absence +abridgement abridgment +accomodate accommodate +acknowledgment acknowledgement +airplane aeroplane +allright alright +andy andrew +anemia anaemia +anemic anaemic +anesthesia anaesthesia +appologize appologise +archean archaean +archeology archaeology +archeozoic archaeozoic +armor armour +artic arctic +attachment attachement +attendence attendance +barbecue barbeque +behavior behaviour +biassed biased +biol biology +buletin bulletin +calender calendar +canceled cancelled +car automobile +catalog catalogue +cenozoic caenozoic +center centre +check cheque +color colour +comission commission +comittee committee +commitee committee +conceed concede +creating createing +curiculum curriculum +defense defence +develope develop +discription description +dulness dullness +encyclopedia encyclopaedia +enroll enrol +esthetic aesthetic +etiology aetiology +exhorbitant exorbitant +exhuberant exuberant +existance existence +favorite favourite +fetus foetus +ficticious fictitious +flavor flavour +flourescent fluorescent +foriegn foreign +fourty forty +gage guage +geneology genealogy +grammer grammar +gray grey +guerilla guerrilla +gynecology gynaecology +harbor harbour +heighth height +hemaglobin haemaglobin +hematin haematin +hematite haematite +hematology haematology +honor honour +innoculate inoculate +installment instalment +irrelevent irrelevant +irrevelant irrelevant +jeweler jeweller +judgement judgment +labeled labelled +labor labour +laborer labourer +laborers labourers +laboring labouring +licence license +liesure leisure +liquify liquefy +maintainance maintenance +maintenence maintenance +medieval mediaeval +meter metre +milage mileage +millipede millepede +miscelaneous miscellaneous +morgage mortgage +noticable noticeable +occurence occurrence +offense offence +ommision omission +ommission omission +optimize optimize +organise organize +pajamas pyjamas +paleography palaeography +paleolithic palaeolithic +paleontological palaeontological +paleontologist palaeontologist +paleontology palaeontology +paleozoic palaeozoic +pamplet pamphlet +paralell parallel +parl parliament +parlt parliament +pediatric paediatric +pediatrician paediatrician +pediatrics paediatrics +pedodontia paedodontia +pedodontics paedodontics +personel personnel +practise practice +program programme +psych psychology +questionaire questionnaire +rarify rarefy +reccomend recommend +recieve receive +resistence resistance +restaraunt restaurant +savior saviour +sep september +seperate separate +sept september +sieze seize +summarize summarise +summerize summarise +superceed supercede +superintendant superintendent +supersede supercede +suprise surprise +surprize surprise +synchronise synchronize +temperary temporary +theater theatre +threshhold threshold +transfered transferred +truely truly +truley truly +useable usable +valor valour +vigor vigour +vol volume +whack wack +withold withhold +yeild yield diff --git a/phpBB/login.php b/phpBB/login.php new file mode 100644 index 0000000000..2e90b244f9 --- /dev/null +++ b/phpBB/login.php @@ -0,0 +1,265 @@ +sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Error in obtaining userdata', '', __LINE__, __FILE__, $sql); + } + + if( $row = $db->sql_fetchrow($result) ) + { + if( $row['user_level'] != ADMIN && $board_config['board_disable'] ) + { + redirect(append_sid("index.$phpEx", true)); + } + else + { + // If the last login is more than x minutes ago, then reset the login tries/time + if ($row['user_last_login_try'] && $board_config['login_reset_time'] && $row['user_last_login_try'] < (time() - ($board_config['login_reset_time'] * 60))) + { + $db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_login_tries = 0, user_last_login_try = 0 WHERE user_id = ' . $row['user_id']); + $row['user_last_login_try'] = $row['user_login_tries'] = 0; + } + + // Check to see if user is allowed to login again... if his tries are exceeded + if ($row['user_last_login_try'] && $board_config['login_reset_time'] && $board_config['max_login_attempts'] && + $row['user_last_login_try'] >= (time() - ($board_config['login_reset_time'] * 60)) && $row['user_login_tries'] >= $board_config['max_login_attempts'] && $userdata['user_level'] != ADMIN) + { + message_die(GENERAL_MESSAGE, sprintf($lang['Login_attempts_exceeded'], $board_config['max_login_attempts'], $board_config['login_reset_time'])); + } + + if( md5($password) == $row['user_password'] && $row['user_active'] ) + { + $autologin = ( isset($HTTP_POST_VARS['autologin']) ) ? TRUE : 0; + + $admin = (isset($HTTP_POST_VARS['admin'])) ? 1 : 0; + $session_id = session_begin($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin, $admin); + + // Reset login tries + $db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_login_tries = 0, user_last_login_try = 0 WHERE user_id = ' . $row['user_id']); + + if( $session_id ) + { + $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : "index.$phpEx"; + redirect(append_sid($url, true)); + } + else + { + message_die(CRITICAL_ERROR, "Couldn't start session : login", "", __LINE__, __FILE__); + } + } + // Only store a failed login attempt for an active user - inactive users can't login even with a correct password + elseif( $row['user_active'] ) + { + // Save login tries and last login + if ($row['user_id'] != ANONYMOUS) + { + $sql = 'UPDATE ' . USERS_TABLE . ' + SET user_login_tries = user_login_tries + 1, user_last_login_try = ' . time() . ' + WHERE user_id = ' . $row['user_id']; + $db->sql_query($sql); + } + } + + $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : ''; + $redirect = str_replace('?', '&', $redirect); + + if (strstr(urldecode($redirect), "\n") || strstr(urldecode($redirect), "\r") || strstr(urldecode($redirect), ';url')) + { + message_die(GENERAL_ERROR, 'Tried to redirect to potentially insecure url.'); + } + + $template->assign_vars(array( + 'META' => "") + ); + + $message = $lang['Error_login'] . '

    ' . sprintf($lang['Click_return_login'], "", '') . '

    ' . sprintf($lang['Click_return_index'], '', ''); + + message_die(GENERAL_MESSAGE, $message); + } + } + else + { + $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : ""; + $redirect = str_replace("?", "&", $redirect); + + if (strstr(urldecode($redirect), "\n") || strstr(urldecode($redirect), "\r") || strstr(urldecode($redirect), ';url')) + { + message_die(GENERAL_ERROR, 'Tried to redirect to potentially insecure url.'); + } + + $template->assign_vars(array( + 'META' => "") + ); + + $message = $lang['Error_login'] . '

    ' . sprintf($lang['Click_return_login'], "", '') . '

    ' . sprintf($lang['Click_return_index'], '', ''); + + message_die(GENERAL_MESSAGE, $message); + } + } + else if( ( isset($HTTP_GET_VARS['logout']) || isset($HTTP_POST_VARS['logout']) ) && $userdata['session_logged_in'] ) + { + // session id check + if ($sid == '' || $sid != $userdata['session_id']) + { + message_die(GENERAL_ERROR, 'Invalid_session'); + } + + if( $userdata['session_logged_in'] ) + { + session_end($userdata['session_id'], $userdata['user_id']); + } + + if (!empty($HTTP_POST_VARS['redirect']) || !empty($HTTP_GET_VARS['redirect'])) + { + $url = (!empty($HTTP_POST_VARS['redirect'])) ? htmlspecialchars($HTTP_POST_VARS['redirect']) : htmlspecialchars($HTTP_GET_VARS['redirect']); + $url = str_replace('&', '&', $url); + redirect(append_sid($url, true)); + } + else + { + redirect(append_sid("index.$phpEx", true)); + } + } + else + { + $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : "index.$phpEx"; + redirect(append_sid($url, true)); + } +} +else +{ + // + // Do a full login page dohickey if + // user not already logged in + // + if( !$userdata['session_logged_in'] || (isset($HTTP_GET_VARS['admin']) && $userdata['session_logged_in'] && $userdata['user_level'] == ADMIN)) + { + $page_title = $lang['Login']; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + $template->set_filenames(array( + 'body' => 'login_body.tpl') + ); + + $forward_page = ''; + + if( isset($HTTP_POST_VARS['redirect']) || isset($HTTP_GET_VARS['redirect']) ) + { + $forward_to = $HTTP_SERVER_VARS['QUERY_STRING']; + + if( preg_match("/^redirect=([a-z0-9\.#\/\?&=\+\-_]+)/si", $forward_to, $forward_matches) ) + { + $forward_to = ( !empty($forward_matches[3]) ) ? $forward_matches[3] : $forward_matches[1]; + $forward_match = explode('&', $forward_to); + + if(count($forward_match) > 1) + { + for($i = 1; $i < count($forward_match); $i++) + { + if( !ereg("sid=", $forward_match[$i]) ) + { + if( $forward_page != '' ) + { + $forward_page .= '&'; + } + $forward_page .= $forward_match[$i]; + } + } + $forward_page = $forward_match[0] . '?' . $forward_page; + } + else + { + $forward_page = $forward_match[0]; + } + } + } + + $username = ( $userdata['user_id'] != ANONYMOUS ) ? $userdata['username'] : ''; + + $s_hidden_fields = ''; + $s_hidden_fields .= (isset($HTTP_GET_VARS['admin'])) ? '' : ''; + + make_jumpbox('viewforum.'.$phpEx); + $template->assign_vars(array( + 'USERNAME' => $username, + + 'L_ENTER_PASSWORD' => (isset($HTTP_GET_VARS['admin'])) ? $lang['Admin_reauthenticate'] : $lang['Enter_password'], + 'L_SEND_PASSWORD' => $lang['Forgotten_password'], + + 'U_SEND_PASSWORD' => append_sid("profile.$phpEx?mode=sendpassword"), + + 'S_HIDDEN_FIELDS' => $s_hidden_fields) + ); + + $template->pparse('body'); + + include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + } + else + { + redirect(append_sid("index.$phpEx", true)); + } + +} + +?> \ No newline at end of file diff --git a/phpBB/mcp.php b/phpBB/mcp.php deleted file mode 100644 index cd6d20b19c..0000000000 --- a/phpBB/mcp.php +++ /dev/null @@ -1,836 +0,0 @@ -session_begin(); -$auth->acl($user->data); -$user->setup('mcp'); - -$module = new p_master(); - -// Setting a variable to let the style designer know where he is... -$template->assign_var('S_IN_MCP', true); - -// Basic parameter data -$id = request_var('i', ''); - -if (isset($_REQUEST['mode']) && is_array($_REQUEST['mode'])) -{ - $mode = request_var('mode', array('')); - list($mode, ) = each($mode); -} -else -{ - $mode = request_var('mode', ''); -} - -// Only Moderators can go beyond this point -if (!$user->data['is_registered']) -{ - if ($user->data['is_bot']) - { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); - } - - login_box('', $user->lang['LOGIN_EXPLAIN_MCP']); -} - -$quickmod = (isset($_REQUEST['quickmod'])) ? true : false; -$action = request_var('action', ''); -$action_ary = request_var('action', array('' => 0)); - -$forum_action = request_var('forum_action', ''); -if ($forum_action !== '' && !empty($_POST['sort'])) -{ - $action = $forum_action; -} - -if (sizeof($action_ary)) -{ - list($action, ) = each($action_ary); -} -unset($action_ary); - -if ($mode == 'topic_logs') -{ - $id = 'logs'; - $quickmod = false; -} - -$post_id = request_var('p', 0); -$topic_id = request_var('t', 0); -$forum_id = request_var('f', 0); -$user_id = request_var('u', 0); -$username = utf8_normalize_nfc(request_var('username', '', true)); - -if ($post_id) -{ - // We determine the topic and forum id here, to make sure the moderator really has moderative rights on this post - $sql = 'SELECT topic_id, forum_id - FROM ' . POSTS_TABLE . " - WHERE post_id = $post_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $topic_id = (int) $row['topic_id']; - $forum_id = (int) ($row['forum_id']) ? $row['forum_id'] : $forum_id; -} -else if ($topic_id) -{ - $sql = 'SELECT forum_id - FROM ' . TOPICS_TABLE . " - WHERE topic_id = $topic_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $forum_id = (int) $row['forum_id']; -} - -// If the user doesn't have any moderator powers (globally or locally) he can't access the mcp -if (!$auth->acl_getf_global('m_')) -{ - // Except he is using one of the quickmod tools for users - $user_quickmod_actions = array( - 'lock' => 'f_user_lock', - 'make_sticky' => 'f_sticky', - 'make_announce' => 'f_announce', - 'make_global' => 'f_announce', - 'make_normal' => array('f_announce', 'f_sticky') - ); - - $allow_user = false; - if ($quickmod && isset($user_quickmod_actions[$action]) && $user->data['is_registered'] && $auth->acl_gets($user_quickmod_actions[$action], $forum_id)) - { - $topic_info = get_topic_data(array($topic_id)); - if ($topic_info[$topic_id]['topic_poster'] == $user->data['user_id']) - { - $allow_user = true; - } - } - - if (!$allow_user) - { - trigger_error('NOT_AUTHORISED'); - } -} - -// if the user cannot read the forum he tries to access then we won't allow mcp access either -if ($forum_id && !$auth->acl_get('f_read', $forum_id)) -{ - trigger_error('NOT_AUTHORISED'); -} - -if ($forum_id) -{ - $module->acl_forum_id = $forum_id; -} - -// Instantiate module system and generate list of available modules -$module->list_modules('mcp'); - -if ($quickmod) -{ - $mode = 'quickmod'; - - switch ($action) - { - case 'lock': - case 'unlock': - case 'lock_post': - case 'unlock_post': - case 'make_sticky': - case 'make_announce': - case 'make_global': - case 'make_normal': - case 'fork': - case 'move': - case 'delete_post': - case 'delete_topic': - $module->load('mcp', 'main', 'quickmod'); - exit_handler(); - break; - - case 'topic_logs': - $module->set_active('logs', 'topic_logs'); - break; - - case 'merge_topic': - $module->set_active('main', 'forum_view'); - break; - - case 'split': - case 'merge': - $module->set_active('main', 'topic_view'); - break; - - default: - trigger_error("$action not allowed as quickmod"); - } -} -else -{ - // Select the active module - $module->set_active($id, $mode); -} - -// Hide some of the options if we don't have the relevant information to use them -if (!$post_id) -{ - $module->set_display('main', 'post_details', false); - $module->set_display('warn', 'warn_post', false); -} - -if ($mode == '' || $mode == 'unapproved_topics' || $mode == 'unapproved_posts') -{ - $module->set_display('queue', 'approve_details', false); -} - -if ($mode == '' || $mode == 'reports' || $mode == 'reports_closed') -{ - $module->set_display('reports', 'report_details', false); -} - -if (!$topic_id) -{ - $module->set_display('main', 'topic_view', false); - $module->set_display('logs', 'topic_logs', false); -} - -if (!$forum_id) -{ - $module->set_display('main', 'forum_view', false); - $module->set_display('logs', 'forum_logs', false); -} - -if (!$user_id && $username == '') -{ - $module->set_display('notes', 'user_notes', false); - $module->set_display('warn', 'warn_user', false); -} - -// Load and execute the relevant module -$module->load_active(); - -// Assign data to the template engine for the list of modules -$module->assign_tpl_vars(append_sid("{$phpbb_root_path}mcp.$phpEx")); - -// Generate urls for letting the moderation control panel being accessed in different modes -$template->assign_vars(array( - 'U_MCP' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main'), - 'U_MCP_FORUM' => ($forum_id) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=forum_view&f=$forum_id") : '', - 'U_MCP_TOPIC' => ($forum_id && $topic_id) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=topic_view&t=$topic_id") : '', - 'U_MCP_POST' => ($forum_id && $topic_id && $post_id) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=post_details&t=$topic_id&p=$post_id") : '', -)); - -// Generate the page, do not display/query online list -$module->display($module->get_page_title(), false); - -/** -* Functions used to generate additional URL paramters -*/ -function _module__url($mode, &$module_row) -{ - return extra_url(); -} - -function _module_notes_url($mode, &$module_row) -{ - if ($mode == 'front') - { - return ''; - } - - global $user_id; - return ($user_id) ? "&u=$user_id" : ''; -} - -function _module_warn_url($mode, &$module_row) -{ - if ($mode == 'front' || $mode == 'list') - { - global $forum_id; - - return ($forum_id) ? "&f=$forum_id" : ''; - } - - if ($mode == 'warn_post') - { - global $forum_id, $post_id; - - $url_extra = ($forum_id) ? "&f=$forum_id" : ''; - $url_extra .= ($post_id) ? "&p=$post_id" : ''; - - return $url_extra; - } - else - { - global $user_id; - - return ($user_id) ? "&u=$user_id" : ''; - } -} - -function _module_main_url($mode, &$module_row) -{ - return extra_url(); -} - -function _module_logs_url($mode, &$module_row) -{ - return extra_url(); -} - -function _module_ban_url($mode, &$module_row) -{ - return extra_url(); -} - -function _module_queue_url($mode, &$module_row) -{ - return extra_url(); -} - -function _module_reports_url($mode, &$module_row) -{ - return extra_url(); -} - -function extra_url() -{ - global $forum_id, $topic_id, $post_id, $user_id; - - $url_extra = ''; - $url_extra .= ($forum_id) ? "&f=$forum_id" : ''; - $url_extra .= ($topic_id) ? "&t=$topic_id" : ''; - $url_extra .= ($post_id) ? "&p=$post_id" : ''; - $url_extra .= ($user_id) ? "&u=$user_id" : ''; - - return $url_extra; -} - -/** -* Get simple topic data -*/ -function get_topic_data($topic_ids, $acl_list = false, $read_tracking = false) -{ - global $auth, $db, $config, $user; - static $rowset = array(); - - $topics = array(); - - if (!sizeof($topic_ids)) - { - return array(); - } - - // cache might not contain read tracking info, so we can't use it if read - // tracking information is requested - if (!$read_tracking) - { - $cache_topic_ids = array_intersect($topic_ids, array_keys($rowset)); - $topic_ids = array_diff($topic_ids, array_keys($rowset)); - } - else - { - $cache_topic_ids = array(); - } - - if (sizeof($topic_ids)) - { - $sql_array = array( - 'SELECT' => 't.*, f.*', - - 'FROM' => array( - TOPICS_TABLE => 't', - ), - - 'LEFT_JOIN' => array( - array( - 'FROM' => array(FORUMS_TABLE => 'f'), - 'ON' => 'f.forum_id = t.forum_id' - ) - ), - - 'WHERE' => $db->sql_in_set('t.topic_id', $topic_ids) - ); - - if ($read_tracking && $config['load_db_lastread']) - { - $sql_array['SELECT'] .= ', tt.mark_time, ft.mark_time as forum_mark_time'; - - $sql_array['LEFT_JOIN'][] = array( - 'FROM' => array(TOPICS_TRACK_TABLE => 'tt'), - 'ON' => 'tt.user_id = ' . $user->data['user_id'] . ' AND t.topic_id = tt.topic_id' - ); - - $sql_array['LEFT_JOIN'][] = array( - 'FROM' => array(FORUMS_TRACK_TABLE => 'ft'), - 'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND t.forum_id = ft.forum_id' - ); - } - - $sql = $db->sql_build_query('SELECT', $sql_array); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if (!$row['forum_id']) - { - // Global Announcement? - $row['forum_id'] = request_var('f', 0); - } - - $rowset[$row['topic_id']] = $row; - - if ($acl_list && !$auth->acl_gets($acl_list, $row['forum_id'])) - { - continue; - } - - $topics[$row['topic_id']] = $row; - } - $db->sql_freeresult($result); - } - - foreach ($cache_topic_ids as $id) - { - if (!$acl_list || $auth->acl_gets($acl_list, $rowset[$id]['forum_id'])) - { - $topics[$id] = $rowset[$id]; - } - } - - return $topics; -} - -/** -* Get simple post data -*/ -function get_post_data($post_ids, $acl_list = false, $read_tracking = false) -{ - global $db, $auth, $config, $user; - - $rowset = array(); - - if (!sizeof($post_ids)) - { - return array(); - } - - $sql_array = array( - 'SELECT' => 'p.*, u.*, t.*, f.*', - - 'FROM' => array( - USERS_TABLE => 'u', - POSTS_TABLE => 'p', - TOPICS_TABLE => 't', - ), - - 'LEFT_JOIN' => array( - array( - 'FROM' => array(FORUMS_TABLE => 'f'), - 'ON' => 'f.forum_id = t.forum_id' - ) - ), - - 'WHERE' => $db->sql_in_set('p.post_id', $post_ids) . ' - AND u.user_id = p.poster_id - AND t.topic_id = p.topic_id', - ); - - if ($read_tracking && $config['load_db_lastread']) - { - $sql_array['SELECT'] .= ', tt.mark_time, ft.mark_time as forum_mark_time'; - - $sql_array['LEFT_JOIN'][] = array( - 'FROM' => array(TOPICS_TRACK_TABLE => 'tt'), - 'ON' => 'tt.user_id = ' . $user->data['user_id'] . ' AND t.topic_id = tt.topic_id' - ); - - $sql_array['LEFT_JOIN'][] = array( - 'FROM' => array(FORUMS_TRACK_TABLE => 'ft'), - 'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND t.forum_id = ft.forum_id' - ); - } - - $sql = $db->sql_build_query('SELECT', $sql_array); - $result = $db->sql_query($sql); - unset($sql_array); - - while ($row = $db->sql_fetchrow($result)) - { - if (!$row['forum_id']) - { - // Global Announcement? - $row['forum_id'] = request_var('f', 0); - } - - if ($acl_list && !$auth->acl_gets($acl_list, $row['forum_id'])) - { - continue; - } - - if (!$row['post_approved'] && !$auth->acl_get('m_approve', $row['forum_id'])) - { - // Moderators without the permission to approve post should at least not see them. ;) - continue; - } - - $rowset[$row['post_id']] = $row; - } - $db->sql_freeresult($result); - - return $rowset; -} - -/** -* Get simple forum data -*/ -function get_forum_data($forum_id, $acl_list = 'f_list', $read_tracking = false) -{ - global $auth, $db, $user, $config; - - $rowset = array(); - - if (!is_array($forum_id)) - { - $forum_id = array($forum_id); - } - - if (!sizeof($forum_id)) - { - return array(); - } - - if ($read_tracking && $config['load_db_lastread']) - { - $read_tracking_join = ' LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.user_id = ' . $user->data['user_id'] . ' - AND ft.forum_id = f.forum_id)'; - $read_tracking_select = ', ft.mark_time'; - } - else - { - $read_tracking_join = $read_tracking_select = ''; - } - - $sql = "SELECT f.* $read_tracking_select - FROM " . FORUMS_TABLE . " f$read_tracking_join - WHERE " . $db->sql_in_set('f.forum_id', $forum_id); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if ($acl_list && !$auth->acl_gets($acl_list, $row['forum_id'])) - { - continue; - } - - if ($auth->acl_get('m_approve', $row['forum_id'])) - { - $row['forum_topics'] = $row['forum_topics_real']; - } - - $rowset[$row['forum_id']] = $row; - } - $db->sql_freeresult($result); - - return $rowset; -} - -/** -* sorting in mcp -* -* @param string $where_sql should either be WHERE (default if ommited) or end with AND or OR -*/ -function mcp_sorting($mode, &$sort_days, &$sort_key, &$sort_dir, &$sort_by_sql, &$sort_order_sql, &$total, $forum_id = 0, $topic_id = 0, $where_sql = 'WHERE') -{ - global $db, $user, $auth, $template; - - $sort_days = request_var('st', 0); - $min_time = ($sort_days) ? time() - ($sort_days * 86400) : 0; - - switch ($mode) - { - case 'viewforum': - $type = 'topics'; - $default_key = 't'; - $default_dir = 'd'; - - $sql = 'SELECT COUNT(topic_id) AS total - FROM ' . TOPICS_TABLE . " - $where_sql forum_id = $forum_id - AND topic_type NOT IN (" . POST_ANNOUNCE . ', ' . POST_GLOBAL . ") - AND topic_last_post_time >= $min_time"; - - if (!$auth->acl_get('m_approve', $forum_id)) - { - $sql .= 'AND topic_approved = 1'; - } - break; - - case 'viewtopic': - $type = 'posts'; - $default_key = 't'; - $default_dir = 'a'; - - $sql = 'SELECT COUNT(post_id) AS total - FROM ' . POSTS_TABLE . " - $where_sql topic_id = $topic_id - AND post_time >= $min_time"; - - if (!$auth->acl_get('m_approve', $forum_id)) - { - $sql .= 'AND post_approved = 1'; - } - break; - - case 'unapproved_posts': - $type = 'posts'; - $default_key = 't'; - $default_dir = 'd'; - $where_sql .= ($topic_id) ? ' topic_id = ' . $topic_id . ' AND' : ''; - - $sql = 'SELECT COUNT(post_id) AS total - FROM ' . POSTS_TABLE . " - $where_sql " . $db->sql_in_set('forum_id', ($forum_id) ? array($forum_id) : get_forum_list('m_approve')) . ' - AND post_approved = 0'; - - if ($min_time) - { - $sql .= ' AND post_time >= ' . $min_time; - } - break; - - case 'unapproved_topics': - $type = 'topics'; - $default_key = 't'; - $default_dir = 'd'; - - $sql = 'SELECT COUNT(topic_id) AS total - FROM ' . TOPICS_TABLE . " - $where_sql " . $db->sql_in_set('forum_id', ($forum_id) ? array($forum_id) : get_forum_list('m_approve')) . ' - AND topic_approved = 0'; - - if ($min_time) - { - $sql .= ' AND topic_time >= ' . $min_time; - } - break; - - case 'reports': - case 'reports_closed': - $type = 'reports'; - $default_key = 't'; - $default_dir = 'd'; - $limit_time_sql = ($min_time) ? "AND r.report_time >= $min_time" : ''; - - if ($topic_id) - { - $where_sql .= ' p.topic_id = ' . $topic_id; - } - else if ($forum_id) - { - $where_sql .= ' p.forum_id = ' . $forum_id; - } - else - { - $where_sql .= ' ' . $db->sql_in_set('p.forum_id', get_forum_list('!m_report'), true, true); - } - - if ($mode == 'reports') - { - $where_sql .= ' AND r.report_closed = 0'; - } - else - { - $where_sql .= ' AND r.report_closed = 1'; - } - - $sql = 'SELECT COUNT(r.report_id) AS total - FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . " p - $where_sql - AND p.post_id = r.post_id - $limit_time_sql"; - break; - - case 'viewlogs': - $type = 'logs'; - $default_key = 't'; - $default_dir = 'd'; - - $sql = 'SELECT COUNT(log_id) AS total - FROM ' . LOG_TABLE . " - $where_sql " . $db->sql_in_set('forum_id', ($forum_id) ? array($forum_id) : get_forum_list('m_')) . ' - AND log_time >= ' . $min_time . ' - AND log_type = ' . LOG_MOD; - break; - } - - $sort_key = request_var('sk', $default_key); - $sort_dir = request_var('sd', $default_dir); - $sort_dir_text = array('a' => $user->lang['ASCENDING'], 'd' => $user->lang['DESCENDING']); - - switch ($type) - { - case 'topics': - $limit_days = array(0 => $user->lang['ALL_TOPICS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); - $sort_by_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 'tt' => $user->lang['TOPIC_TIME'], 'r' => $user->lang['REPLIES'], 's' => $user->lang['SUBJECT'], 'v' => $user->lang['VIEWS']); - - $sort_by_sql = array('a' => 't.topic_first_poster_name', 't' => 't.topic_last_post_time', 'tt' => 't.topic_time', 'r' => (($auth->acl_get('m_approve', $forum_id)) ? 't.topic_replies_real' : 't.topic_replies'), 's' => 't.topic_title', 'v' => 't.topic_views'); - $limit_time_sql = ($min_time) ? "AND t.topic_last_post_time >= $min_time" : ''; - break; - - case 'posts': - $limit_days = array(0 => $user->lang['ALL_POSTS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); - $sort_by_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']); - $sort_by_sql = array('a' => 'u.username_clean', 't' => 'p.post_time', 's' => 'p.post_subject'); - $limit_time_sql = ($min_time) ? "AND p.post_time >= $min_time" : ''; - break; - - case 'reports': - $limit_days = array(0 => $user->lang['ALL_REPORTS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); - $sort_by_text = array('a' => $user->lang['AUTHOR'], 'r' => $user->lang['REPORTER'], 'p' => $user->lang['POST_TIME'], 't' => $user->lang['REPORT_TIME'], 's' => $user->lang['SUBJECT']); - $sort_by_sql = array('a' => 'u.username_clean', 'r' => 'ru.username', 'p' => 'p.post_time', 't' => 'r.report_time', 's' => 'p.post_subject'); - break; - - case 'logs': - $limit_days = array(0 => $user->lang['ALL_ENTRIES'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); - $sort_by_text = array('u' => $user->lang['SORT_USERNAME'], 't' => $user->lang['SORT_DATE'], 'i' => $user->lang['SORT_IP'], 'o' => $user->lang['SORT_ACTION']); - - $sort_by_sql = array('u' => 'u.username_clean', 't' => 'l.log_time', 'i' => 'l.log_ip', 'o' => 'l.log_operation'); - $limit_time_sql = ($min_time) ? "AND l.log_time >= $min_time" : ''; - break; - } - - if (!isset($sort_by_sql[$sort_key])) - { - $sort_key = $default_key; - } - - $sort_order_sql = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC'); - - $s_limit_days = $s_sort_key = $s_sort_dir = $sort_url = ''; - gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $sort_url); - - $template->assign_vars(array( - 'S_SELECT_SORT_DIR' => $s_sort_dir, - 'S_SELECT_SORT_KEY' => $s_sort_key, - 'S_SELECT_SORT_DAYS' => $s_limit_days) - ); - - if (($sort_days && $mode != 'viewlogs') || in_array($mode, array('reports', 'unapproved_topics', 'unapproved_posts')) || $where_sql != 'WHERE') - { - $result = $db->sql_query($sql); - $total = (int) $db->sql_fetchfield('total'); - $db->sql_freeresult($result); - } - else - { - $total = -1; - } -} - -/** -* Validate ids -* -* @param array &$ids The relevant ids to check -* @param string $table The table to find the ids in -* @param string $sql_id The ids relevant column name -* @param array $acl_list A list of permissions the user need to have -* @param mixed $singe_forum Limit to one forum id (int) or the first forum found (true) -* -* @return mixed False if no ids were able to be retrieved, true if at least one id left. -* Additionally, this value can be the forum_id assigned if $single_forum was set. -* Therefore checking the result for with !== false is the best method. -*/ -function check_ids(&$ids, $table, $sql_id, $acl_list = false, $single_forum = false) -{ - global $db, $auth; - - if (!is_array($ids) || empty($ids)) - { - return false; - } - - $sql = "SELECT $sql_id, forum_id FROM $table - WHERE " . $db->sql_in_set($sql_id, $ids); - $result = $db->sql_query($sql); - - $ids = array(); - $forum_id = false; - - while ($row = $db->sql_fetchrow($result)) - { - if ($acl_list && $row['forum_id'] && !$auth->acl_gets($acl_list, $row['forum_id'])) - { - continue; - } - - if ($acl_list && !$row['forum_id'] && !$auth->acl_getf_global($acl_list)) - { - continue; - } - - // Limit forum? If not, just assign the id. - if ($single_forum === false) - { - $ids[] = $row[$sql_id]; - continue; - } - - // Limit forum to a specific forum id? - // This can get really tricky, because we do not want to create a failure on global topics. :) - if ($row['forum_id']) - { - if ($single_forum !== true && $row['forum_id'] == (int) $single_forum) - { - $forum_id = (int) $single_forum; - } - else if ($forum_id === false) - { - $forum_id = $row['forum_id']; - } - - if ($row['forum_id'] == $forum_id) - { - $ids[] = $row[$sql_id]; - } - } - else - { - // Always add a global topic - $ids[] = $row[$sql_id]; - } - } - $db->sql_freeresult($result); - - if (!sizeof($ids)) - { - return false; - } - - // If forum id is false and ids populated we may have only global announcements selected (returning 0 because of (int) $forum_id) - - return ($single_forum === false) ? true : (int) $forum_id; -} - -?> \ No newline at end of file diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index ca71131bc1..b19c92bc00 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1,1580 +1,312 @@ session_begin(); -$auth->acl($user->data); -$user->setup(array('memberlist', 'groups')); +// +$userdata = session_pagestart($user_ip, PAGE_VIEWMEMBERS); +init_userprefs($userdata); +// +// End session management +// -// Grab data -$mode = request_var('mode', ''); -$action = request_var('action', ''); -$user_id = request_var('u', ANONYMOUS); -$username = request_var('un', '', true); -$group_id = request_var('g', 0); -$topic_id = request_var('t', 0); +$start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0; +$start = ($start < 0) ? 0 : $start; -// Check our mode... -if (!in_array($mode, array('', 'group', 'viewprofile', 'email', 'contact', 'searchuser', 'leaders'))) +if ( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) { - trigger_error('NO_MODE'); + $mode = ( isset($HTTP_POST_VARS['mode']) ) ? htmlspecialchars($HTTP_POST_VARS['mode']) : htmlspecialchars($HTTP_GET_VARS['mode']); +} +else +{ + $mode = 'joined'; } -switch ($mode) +if(isset($HTTP_POST_VARS['order'])) { - case 'email': - break; - - default: - // Can this user view profiles/memberlist? - if (!$auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) - { - if ($user->data['user_id'] != ANONYMOUS) - { - trigger_error('NO_VIEW_USERS'); - } - - login_box('', ((isset($user->lang['LOGIN_EXPLAIN_' . strtoupper($mode)])) ? $user->lang['LOGIN_EXPLAIN_' . strtoupper($mode)] : $user->lang['LOGIN_EXPLAIN_MEMBERLIST'])); - } - break; + $sort_order = ($HTTP_POST_VARS['order'] == 'ASC') ? 'ASC' : 'DESC'; +} +else if(isset($HTTP_GET_VARS['order'])) +{ + $sort_order = ($HTTP_GET_VARS['order'] == 'ASC') ? 'ASC' : 'DESC'; +} +else +{ + $sort_order = 'ASC'; } -$start = request_var('start', 0); -$submit = (isset($_POST['submit'])) ? true : false; +// +// Memberlist sorting +// +$mode_types_text = array($lang['Sort_Joined'], $lang['Sort_Username'], $lang['Sort_Location'], $lang['Sort_Posts'], $lang['Sort_Email'], $lang['Sort_Website'], $lang['Sort_Top_Ten']); +$mode_types = array('joined', 'username', 'location', 'posts', 'email', 'website', 'topten'); -$default_key = 'c'; -$sort_key = request_var('sk', $default_key); -$sort_dir = request_var('sd', 'a'); - - -// Grab rank information for later -$ranks = cache::obtain_ranks(); - - -// What do you want to do today? ... oops, I think that line is taken ... -switch ($mode) +$select_sort_mode = ''; -// Output the page -page_header($page_title); +$select_sort_order = ''; + +// +// Generate page +// +$page_title = $lang['Memberlist']; +include($phpbb_root_path . 'includes/page_header.'.$phpEx); $template->set_filenames(array( - 'body' => $template_html) + 'body' => 'memberlist_body.tpl') ); -make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); +make_jumpbox('viewforum.'.$phpEx); -page_footer(); +$template->assign_vars(array( + 'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'], + 'L_EMAIL' => $lang['Email'], + 'L_WEBSITE' => $lang['Website'], + 'L_FROM' => $lang['Location'], + 'L_ORDER' => $lang['Order'], + 'L_SORT' => $lang['Sort'], + 'L_SUBMIT' => $lang['Sort'], + 'L_AIM' => $lang['AIM'], + 'L_YIM' => $lang['YIM'], + 'L_MSNM' => $lang['MSNM'], + 'L_ICQ' => $lang['ICQ'], + 'L_JOINED' => $lang['Joined'], + 'L_POSTS' => $lang['Posts'], + 'L_PM' => $lang['Private_Message'], -/** -* Prepare profile data -*/ -function show_profile($data) + 'S_MODE_SELECT' => $select_sort_mode, + 'S_ORDER_SELECT' => $select_sort_order, + 'S_MODE_ACTION' => append_sid("memberlist.$phpEx")) +); + +switch( $mode ) { - global $config, $auth, $template, $user, $phpEx, $phpbb_root_path; - - $username = $data['username']; - $user_id = $data['user_id']; - - $rank_title = $rank_img = $rank_img_src = ''; - get_user_rank($data['user_rank'], $data['user_posts'], $rank_title, $rank_img, $rank_img_src); - - if (!empty($data['user_allow_viewemail']) || $auth->acl_get('a_email')) - { - $email = ($config['board_email_form'] && $config['email_enable']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=email&u=' . $user_id) : (($config['board_hide_emails'] && !$auth->acl_get('a_email')) ? '' : 'mailto:' . $data['user_email']); - } - else - { - $email = ''; - } - - if ($config['load_onlinetrack']) - { - $update_time = $config['load_online_time'] * 60; - $online = (time() - $update_time < $data['session_time'] && ((isset($data['session_viewonline']) && $data['session_viewonline']) || $auth->acl_get('u_viewonline'))) ? true : false; - } - else - { - $online = false; - } - - if ($data['user_allow_viewonline'] || $auth->acl_get('u_viewonline')) - { - $last_visit = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_lastvisit']; - } - else - { - $last_visit = ''; - } - - $age = ''; - - if ($config['allow_birthdays'] && $data['user_birthday']) - { - list($bday_day, $bday_month, $bday_year) = array_map('intval', explode('-', $data['user_birthday'])); - - if ($bday_year) - { - $now = getdate(time() + $user->timezone + $user->dst - date('Z')); - - $diff = $now['mon'] - $bday_month; - if ($diff == 0) - { - $diff = ($now['mday'] - $bday_day < 0) ? 1 : 0; - } - else - { - $diff = ($diff < 0) ? 1 : 0; - } - - $age = (int) ($now['year'] - $bday_year - $diff); - } - } - - // Dump it out to the template - return array( - 'AGE' => $age, - 'RANK_TITLE' => $rank_title, - 'JOINED' => $user->format_date($data['user_regdate']), - 'VISITED' => (empty($last_visit)) ? ' - ' : $user->format_date($last_visit), - 'POSTS' => ($data['user_posts']) ? $data['user_posts'] : 0, - 'WARNINGS' => isset($data['user_warnings']) ? $data['user_warnings'] : 0, - - 'USERNAME_FULL' => get_username_string('full', $user_id, $username, $data['user_colour']), - 'USERNAME' => get_username_string('username', $user_id, $username, $data['user_colour']), - 'USER_COLOR' => get_username_string('colour', $user_id, $username, $data['user_colour']), - 'U_VIEW_PROFILE' => get_username_string('profile', $user_id, $username, $data['user_colour']), - - 'A_USERNAME' => addslashes(get_username_string('username', $user_id, $username, $data['user_colour'])), - - 'ONLINE_IMG' => (!$config['load_onlinetrack']) ? '' : (($online) ? $user->img('icon_user_online', 'ONLINE') : $user->img('icon_user_offline', 'OFFLINE')), - 'S_ONLINE' => ($config['load_onlinetrack'] && $online) ? true : false, - 'RANK_IMG' => $rank_img, - 'RANK_IMG_SRC' => $rank_img_src, - 'ICQ_STATUS_IMG' => (!empty($data['user_icq'])) ? '' : '', - 'S_JABBER_ENABLED' => ($config['jab_enable']) ? true : false, - - 'U_SEARCH_USER' => ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id=$user_id&sr=posts") : '', - 'U_NOTES' => $auth->acl_getf_global('m_') ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $user_id, true, $user->session_id) : '', - 'U_WARN' => $auth->acl_get('m_warn') ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user&u=' . $user_id, true, $user->session_id) : '', - 'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($data['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $user_id) : '', - 'U_EMAIL' => $email, - 'U_WWW' => (!empty($data['user_website'])) ? $data['user_website'] : '', - 'U_ICQ' => ($data['user_icq']) ? 'http://www.icq.com/people/webmsg.php?to=' . urlencode($data['user_icq']) : '', - 'U_AIM' => ($data['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=aim&u=' . $user_id) : '', - 'U_YIM' => ($data['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($data['user_yim']) . '&.src=pg' : '', - 'U_MSN' => ($data['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=msnm&u=' . $user_id) : '', - 'U_JABBER' => ($data['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=jabber&u=' . $user_id) : '', - 'LOCATION' => ($data['user_from']) ? $data['user_from'] : '', - - 'USER_ICQ' => $data['user_icq'], - 'USER_AIM' => $data['user_aim'], - 'USER_YIM' => $data['user_yim'], - 'USER_MSN' => $data['user_msnm'], - 'USER_JABBER' => $data['user_jabber'], - 'USER_JABBER_IMG' => ($data['user_jabber']) ? $user->img('icon_contact_jabber', $data['user_jabber']) : '', - - 'L_VIEWING_PROFILE' => sprintf($user->lang['VIEWING_PROFILE'], $username), - ); + case 'joined': + $order_by = "user_regdate $sort_order LIMIT $start, " . $board_config['topics_per_page']; + break; + case 'username': + $order_by = "username $sort_order LIMIT $start, " . $board_config['topics_per_page']; + break; + case 'location': + $order_by = "user_from $sort_order LIMIT $start, " . $board_config['topics_per_page']; + break; + case 'posts': + $order_by = "user_posts $sort_order LIMIT $start, " . $board_config['topics_per_page']; + break; + case 'email': + $order_by = "user_email $sort_order LIMIT $start, " . $board_config['topics_per_page']; + break; + case 'website': + $order_by = "user_website $sort_order LIMIT $start, " . $board_config['topics_per_page']; + break; + case 'topten': + $order_by = "user_posts $sort_order LIMIT 10"; + break; + default: + $order_by = "user_regdate $sort_order LIMIT $start, " . $board_config['topics_per_page']; + break; } +$sql = "SELECT username, user_id, user_viewemail, user_posts, user_regdate, user_from, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_avatar, user_avatar_type, user_allowavatar + FROM " . USERS_TABLE . " + WHERE user_id <> " . ANONYMOUS . " + ORDER BY $order_by"; +if( !($result = $db->sql_query($sql)) ) +{ + message_die(GENERAL_ERROR, 'Could not query users', '', __LINE__, __FILE__, $sql); +} + +if ( $row = $db->sql_fetchrow($result) ) +{ + $i = 0; + do + { + $username = $row['username']; + $user_id = $row['user_id']; + + $from = ( !empty($row['user_from']) ) ? $row['user_from'] : ' '; + $joined = create_date($lang['DATE_FORMAT'], $row['user_regdate'], $board_config['board_timezone']); + $posts = ( $row['user_posts'] ) ? $row['user_posts'] : 0; + + $poster_avatar = ''; + if ( $row['user_avatar_type'] && $user_id != ANONYMOUS && $row['user_allowavatar'] ) + { + switch( $row['user_avatar_type'] ) + { + case USER_AVATAR_UPLOAD: + $poster_avatar = ( $board_config['allow_avatar_upload'] ) ? '' : ''; + break; + case USER_AVATAR_REMOTE: + $poster_avatar = ( $board_config['allow_avatar_remote'] ) ? '' : ''; + break; + case USER_AVATAR_GALLERY: + $poster_avatar = ( $board_config['allow_avatar_local'] ) ? '' : ''; + break; + } + } + + if ( !empty($row['user_viewemail']) || $userdata['user_level'] == ADMIN ) + { + $email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $user_id) : 'mailto:' . $row['user_email']; + + $email_img = '' . $lang['Send_email'] . ''; + $email = '' . $lang['Send_email'] . ''; + } + else + { + $email_img = ' '; + $email = ' '; + } + + $temp_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id"); + $profile_img = '' . $lang['Read_profile'] . ''; + $profile = '' . $lang['Read_profile'] . ''; + + $temp_url = append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=$user_id"); + $pm_img = '' . $lang['Send_private_message'] . ''; + $pm = '' . $lang['Send_private_message'] . ''; + + $www_img = ( $row['user_website'] ) ? '' . $lang['Visit_website'] . '' : ''; + $www = ( $row['user_website'] ) ? '' . $lang['Visit_website'] . '' : ''; + + if ( !empty($row['user_icq']) ) + { + $icq_status_img = ''; + $icq_img = '' . $lang['ICQ'] . ''; + $icq = '' . $lang['ICQ'] . ''; + } + else + { + $icq_status_img = ''; + $icq_img = ''; + $icq = ''; + } + + $aim_img = ( $row['user_aim'] ) ? '' . $lang['AIM'] . '' : ''; + $aim = ( $row['user_aim'] ) ? '' . $lang['AIM'] . '' : ''; + + $temp_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id"); + $msn_img = ( $row['user_msnm'] ) ? '' . $lang['MSNM'] . '' : ''; + $msn = ( $row['user_msnm'] ) ? '' . $lang['MSNM'] . '' : ''; + + $yim_img = ( $row['user_yim'] ) ? '' . $lang['YIM'] . '' : ''; + $yim = ( $row['user_yim'] ) ? '' . $lang['YIM'] . '' : ''; + + $temp_url = append_sid("search.$phpEx?search_author=" . urlencode($username) . "&showresults=posts"); + $search_img = '' . sprintf($lang['Search_user_posts'], $username) . ''; + $search = '' . sprintf($lang['Search_user_posts'], $username) . ''; + + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $template->assign_block_vars('memberrow', array( + 'ROW_NUMBER' => $i + ( $start + 1 ), + 'ROW_COLOR' => '#' . $row_color, + 'ROW_CLASS' => $row_class, + 'USERNAME' => $username, + 'FROM' => $from, + 'JOINED' => $joined, + 'POSTS' => $posts, + 'AVATAR_IMG' => $poster_avatar, + 'PROFILE_IMG' => $profile_img, + 'PROFILE' => $profile, + 'SEARCH_IMG' => $search_img, + 'SEARCH' => $search, + 'PM_IMG' => $pm_img, + 'PM' => $pm, + 'EMAIL_IMG' => $email_img, + 'EMAIL' => $email, + 'WWW_IMG' => $www_img, + 'WWW' => $www, + 'ICQ_STATUS_IMG' => $icq_status_img, + 'ICQ_IMG' => $icq_img, + 'ICQ' => $icq, + 'AIM_IMG' => $aim_img, + 'AIM' => $aim, + 'MSN_IMG' => $msn_img, + 'MSN' => $msn, + 'YIM_IMG' => $yim_img, + 'YIM' => $yim, + + 'U_VIEWPROFILE' => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id")) + ); + + $i++; + } + while ( $row = $db->sql_fetchrow($result) ); + $db->sql_freeresult($result); +} + +if ( $mode != 'topten' || $board_config['topics_per_page'] < 10 ) +{ + $sql = "SELECT count(*) AS total + FROM " . USERS_TABLE . " + WHERE user_id <> " . ANONYMOUS; + + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Error getting total users', '', __LINE__, __FILE__, $sql); + } + + if ( $total = $db->sql_fetchrow($result) ) + { + $total_members = $total['total']; + + $pagination = generate_pagination("memberlist.$phpEx?mode=$mode&order=$sort_order", $total_members, $board_config['topics_per_page'], $start). ' '; + } + $db->sql_freeresult($result); +} +else +{ + $pagination = ' '; + $total_members = 10; +} + +$template->assign_vars(array( + 'PAGINATION' => $pagination, + 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $total_members / $board_config['topics_per_page'] )), + + 'L_GOTO_PAGE' => $lang['Goto_page']) +); + +$template->pparse('body'); + +include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + ?> \ No newline at end of file diff --git a/phpBB/modcp.php b/phpBB/modcp.php new file mode 100644 index 0000000000..699a636f32 --- /dev/null +++ b/phpBB/modcp.php @@ -0,0 +1,1256 @@ +sql_query($sql)) ) + { + message_die(GENERAL_MESSAGE, 'Topic_post_not_exist'); + } + $topic_row = $db->sql_fetchrow($result); + + if (!$topic_row) + { + message_die(GENERAL_MESSAGE, 'Topic_post_not_exist'); + } + + $forum_topics = ( $topic_row['forum_topics'] == 0 ) ? 1 : $topic_row['forum_topics']; + $forum_id = $topic_row['forum_id']; + $forum_name = $topic_row['forum_name']; +} +else if ( !empty($forum_id) ) +{ + $sql = "SELECT forum_name, forum_topics + FROM " . FORUMS_TABLE . " + WHERE forum_id = " . $forum_id; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_MESSAGE, 'Forum_not_exist'); + } + $topic_row = $db->sql_fetchrow($result); + + if (!$topic_row) + { + message_die(GENERAL_MESSAGE, 'Forum_not_exist'); + } + + $forum_topics = ( $topic_row['forum_topics'] == 0 ) ? 1 : $topic_row['forum_topics']; + $forum_name = $topic_row['forum_name']; +} +else +{ + message_die(GENERAL_MESSAGE, 'Forum_not_exist'); +} + +// +// Start session management +// +$userdata = session_pagestart($user_ip, $forum_id); +init_userprefs($userdata); +// +// End session management +// + +// session id check +if ($sid == '' || $sid != $userdata['session_id']) +{ + message_die(GENERAL_ERROR, 'Invalid_session'); +} + +// +// Check if user did or did not confirm +// If they did not, forward them to the last page they were on +// +if ( isset($HTTP_POST_VARS['cancel']) ) +{ + if ( $topic_id ) + { + $redirect = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id"; + } + else if ( $forum_id ) + { + $redirect = "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"; + } + else + { + $redirect = "index.$phpEx"; + } + + redirect(append_sid($redirect, true)); +} + +// +// Start auth check +// +$is_auth = auth(AUTH_ALL, $forum_id, $userdata); + +if ( !$is_auth['auth_mod'] ) +{ + message_die(GENERAL_MESSAGE, $lang['Not_Moderator'], $lang['Not_Authorised']); +} +// +// End Auth Check +// + +// +// Do major work ... +// +switch( $mode ) +{ + case 'delete': + if (!$is_auth['auth_delete']) + { + message_die(GENERAL_MESSAGE, sprintf($lang['Sorry_auth_delete'], $is_auth['auth_delete_type'])); + } + + $page_title = $lang['Mod_CP']; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + if ( $confirm ) + { + if ( empty($HTTP_POST_VARS['topic_id_list']) && empty($topic_id) ) + { + message_die(GENERAL_MESSAGE, $lang['None_selected']); + } + + include($phpbb_root_path . 'includes/functions_search.'.$phpEx); + + $topics = ( isset($HTTP_POST_VARS['topic_id_list']) ) ? $HTTP_POST_VARS['topic_id_list'] : array($topic_id); + + $topic_id_sql = ''; + for($i = 0; $i < count($topics); $i++) + { + $topic_id_sql .= ( ( $topic_id_sql != '' ) ? ', ' : '' ) . intval($topics[$i]); + } + + $sql = "SELECT topic_id + FROM " . TOPICS_TABLE . " + WHERE topic_id IN ($topic_id_sql) + AND forum_id = $forum_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not get topic id information', '', __LINE__, __FILE__, $sql); + } + + $topic_id_sql = ''; + while ($row = $db->sql_fetchrow($result)) + { + $topic_id_sql .= (($topic_id_sql != '') ? ', ' : '') . intval($row['topic_id']); + } + $db->sql_freeresult($result); + + if ( $topic_id_sql == '') + { + message_die(GENERAL_MESSAGE, $lang['None_selected']); + } + + $sql = "SELECT poster_id, COUNT(post_id) AS posts + FROM " . POSTS_TABLE . " + WHERE topic_id IN ($topic_id_sql) + GROUP BY poster_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not get poster id information', '', __LINE__, __FILE__, $sql); + } + + $count_sql = array(); + while ( $row = $db->sql_fetchrow($result) ) + { + $count_sql[] = "UPDATE " . USERS_TABLE . " + SET user_posts = user_posts - " . $row['posts'] . " + WHERE user_id = " . $row['poster_id']; + } + $db->sql_freeresult($result); + + if ( sizeof($count_sql) ) + { + for($i = 0; $i < sizeof($count_sql); $i++) + { + if ( !$db->sql_query($count_sql[$i]) ) + { + message_die(GENERAL_ERROR, 'Could not update user post count information', '', __LINE__, __FILE__, $sql); + } + } + } + + $sql = "SELECT post_id + FROM " . POSTS_TABLE . " + WHERE topic_id IN ($topic_id_sql)"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not get post id information', '', __LINE__, __FILE__, $sql); + } + + $post_id_sql = ''; + while ( $row = $db->sql_fetchrow($result) ) + { + $post_id_sql .= ( ( $post_id_sql != '' ) ? ', ' : '' ) . intval($row['post_id']); + } + $db->sql_freeresult($result); + + $sql = "SELECT vote_id + FROM " . VOTE_DESC_TABLE . " + WHERE topic_id IN ($topic_id_sql)"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not get vote id information', '', __LINE__, __FILE__, $sql); + } + + $vote_id_sql = ''; + while ( $row = $db->sql_fetchrow($result) ) + { + $vote_id_sql .= ( ( $vote_id_sql != '' ) ? ', ' : '' ) . $row['vote_id']; + } + $db->sql_freeresult($result); + + // + // Got all required info so go ahead and start deleting everything + // + $sql = "DELETE + FROM " . TOPICS_TABLE . " + WHERE topic_id IN ($topic_id_sql) + OR topic_moved_id IN ($topic_id_sql)"; + if ( !$db->sql_query($sql, BEGIN_TRANSACTION) ) + { + message_die(GENERAL_ERROR, 'Could not delete topics', '', __LINE__, __FILE__, $sql); + } + + if ( $post_id_sql != '' ) + { + $sql = "DELETE + FROM " . POSTS_TABLE . " + WHERE post_id IN ($post_id_sql)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete posts', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE + FROM " . POSTS_TEXT_TABLE . " + WHERE post_id IN ($post_id_sql)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete posts text', '', __LINE__, __FILE__, $sql); + } + + remove_search_post($post_id_sql); + } + + if ( $vote_id_sql != '' ) + { + $sql = "DELETE + FROM " . VOTE_DESC_TABLE . " + WHERE vote_id IN ($vote_id_sql)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete vote descriptions', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE + FROM " . VOTE_RESULTS_TABLE . " + WHERE vote_id IN ($vote_id_sql)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete vote results', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE + FROM " . VOTE_USERS_TABLE . " + WHERE vote_id IN ($vote_id_sql)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete vote users', '', __LINE__, __FILE__, $sql); + } + } + + $sql = "DELETE + FROM " . TOPICS_WATCH_TABLE . " + WHERE topic_id IN ($topic_id_sql)"; + if ( !$db->sql_query($sql, END_TRANSACTION) ) + { + message_die(GENERAL_ERROR, 'Could not delete watched post list', '', __LINE__, __FILE__, $sql); + } + + sync('forum', $forum_id); + + if ( !empty($topic_id) ) + { + $redirect_page = "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&sid=" . $userdata['session_id']; + $l_redirect = sprintf($lang['Click_return_forum'], '', ''); + } + else + { + $redirect_page = "modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id&sid=" . $userdata['session_id']; + $l_redirect = sprintf($lang['Click_return_modcp'], '', ''); + } + + $template->assign_vars(array( + 'META' => '') + ); + + message_die(GENERAL_MESSAGE, $lang['Topics_Removed'] . '

    ' . $l_redirect); + } + else + { + // Not confirmed, show confirmation message + if ( empty($HTTP_POST_VARS['topic_id_list']) && empty($topic_id) ) + { + message_die(GENERAL_MESSAGE, $lang['None_selected']); + } + + $hidden_fields = ''; + + if ( isset($HTTP_POST_VARS['topic_id_list']) ) + { + $topics = $HTTP_POST_VARS['topic_id_list']; + for($i = 0; $i < count($topics); $i++) + { + $hidden_fields .= ''; + } + } + else + { + $hidden_fields .= ''; + } + + // + // Set template files + // + $template->set_filenames(array( + 'confirm' => 'confirm_body.tpl') + ); + + $template->assign_vars(array( + 'MESSAGE_TITLE' => $lang['Confirm'], + 'MESSAGE_TEXT' => $lang['Confirm_delete_topic'], + + 'L_YES' => $lang['Yes'], + 'L_NO' => $lang['No'], + + 'S_CONFIRM_ACTION' => append_sid("modcp.$phpEx"), + 'S_HIDDEN_FIELDS' => $hidden_fields) + ); + + $template->pparse('confirm'); + + include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + } + break; + + case 'move': + $page_title = $lang['Mod_CP']; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + if ( $confirm ) + { + if ( empty($HTTP_POST_VARS['topic_id_list']) && empty($topic_id) ) + { + message_die(GENERAL_MESSAGE, $lang['None_selected']); + } + + $new_forum_id = intval($HTTP_POST_VARS['new_forum']); + $old_forum_id = $forum_id; + + $sql = 'SELECT forum_id FROM ' . FORUMS_TABLE . ' + WHERE forum_id = ' . $new_forum_id; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not select from forums table', '', __LINE__, __FILE__, $sql); + } + + if (!$db->sql_fetchrow($result)) + { + message_die(GENERAL_MESSAGE, 'New forum does not exist'); + } + + $db->sql_freeresult($result); + + if ( $new_forum_id != $old_forum_id ) + { + $topics = ( isset($HTTP_POST_VARS['topic_id_list']) ) ? $HTTP_POST_VARS['topic_id_list'] : array($topic_id); + + $topic_list = ''; + for($i = 0; $i < count($topics); $i++) + { + $topic_list .= ( ( $topic_list != '' ) ? ', ' : '' ) . intval($topics[$i]); + } + + $sql = "SELECT * + FROM " . TOPICS_TABLE . " + WHERE topic_id IN ($topic_list) + AND forum_id = $old_forum_id + AND topic_status <> " . TOPIC_MOVED; + if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) ) + { + message_die(GENERAL_ERROR, 'Could not select from topic table', '', __LINE__, __FILE__, $sql); + } + + $row = $db->sql_fetchrowset($result); + $db->sql_freeresult($result); + + for($i = 0; $i < count($row); $i++) + { + $topic_id = $row[$i]['topic_id']; + + if ( isset($HTTP_POST_VARS['move_leave_shadow']) ) + { + // Insert topic in the old forum that indicates that the forum has moved. + $sql = "INSERT INTO " . TOPICS_TABLE . " (forum_id, topic_title, topic_poster, topic_time, topic_status, topic_type, topic_vote, topic_views, topic_replies, topic_first_post_id, topic_last_post_id, topic_moved_id) + VALUES ($old_forum_id, '" . addslashes(str_replace("\'", "''", $row[$i]['topic_title'])) . "', '" . str_replace("\'", "''", $row[$i]['topic_poster']) . "', " . $row[$i]['topic_time'] . ", " . TOPIC_MOVED . ", " . POST_NORMAL . ", " . $row[$i]['topic_vote'] . ", " . $row[$i]['topic_views'] . ", " . $row[$i]['topic_replies'] . ", " . $row[$i]['topic_first_post_id'] . ", " . $row[$i]['topic_last_post_id'] . ", $topic_id)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not insert shadow topic', '', __LINE__, __FILE__, $sql); + } + } + + $sql = "UPDATE " . TOPICS_TABLE . " + SET forum_id = $new_forum_id + WHERE topic_id = $topic_id"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update old topic', '', __LINE__, __FILE__, $sql); + } + + $sql = "UPDATE " . POSTS_TABLE . " + SET forum_id = $new_forum_id + WHERE topic_id = $topic_id"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update post topic ids', '', __LINE__, __FILE__, $sql); + } + } + + // Sync the forum indexes + sync('forum', $new_forum_id); + sync('forum', $old_forum_id); + + $message = $lang['Topics_Moved'] . '

    '; + + } + else + { + $message = $lang['No_Topics_Moved'] . '

    '; + } + + if ( !empty($topic_id) ) + { + $redirect_page = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&sid=" . $userdata['session_id']; + $message .= sprintf($lang['Click_return_topic'], '', ''); + } + else + { + $redirect_page = "modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id&sid=" . $userdata['session_id']; + $message .= sprintf($lang['Click_return_modcp'], '', ''); + } + + $message = $message . '

    ' . sprintf($lang['Click_return_forum'], '', ''); + + $template->assign_vars(array( + 'META' => '') + ); + + message_die(GENERAL_MESSAGE, $message); + } + else + { + if ( empty($HTTP_POST_VARS['topic_id_list']) && empty($topic_id) ) + { + message_die(GENERAL_MESSAGE, $lang['None_selected']); + } + + $hidden_fields = ''; + + if ( isset($HTTP_POST_VARS['topic_id_list']) ) + { + $topics = $HTTP_POST_VARS['topic_id_list']; + + for($i = 0; $i < count($topics); $i++) + { + $hidden_fields .= ''; + } + } + else + { + $hidden_fields .= ''; + } + + // + // Set template files + // + $template->set_filenames(array( + 'movetopic' => 'modcp_move.tpl') + ); + + $template->assign_vars(array( + 'MESSAGE_TITLE' => $lang['Confirm'], + 'MESSAGE_TEXT' => $lang['Confirm_move_topic'], + + 'L_MOVE_TO_FORUM' => $lang['Move_to_forum'], + 'L_LEAVESHADOW' => $lang['Leave_shadow_topic'], + 'L_YES' => $lang['Yes'], + 'L_NO' => $lang['No'], + + 'S_FORUM_SELECT' => make_forum_select('new_forum', $forum_id), + 'S_MODCP_ACTION' => append_sid("modcp.$phpEx"), + 'S_HIDDEN_FIELDS' => $hidden_fields) + ); + + $template->pparse('movetopic'); + + include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + } + break; + + case 'lock': + if ( empty($HTTP_POST_VARS['topic_id_list']) && empty($topic_id) ) + { + message_die(GENERAL_MESSAGE, $lang['None_selected']); + } + + $topics = ( isset($HTTP_POST_VARS['topic_id_list']) ) ? $HTTP_POST_VARS['topic_id_list'] : array($topic_id); + + $topic_id_sql = ''; + for($i = 0; $i < count($topics); $i++) + { + $topic_id_sql .= ( ( $topic_id_sql != '' ) ? ', ' : '' ) . intval($topics[$i]); + } + + $sql = "UPDATE " . TOPICS_TABLE . " + SET topic_status = " . TOPIC_LOCKED . " + WHERE topic_id IN ($topic_id_sql) + AND forum_id = $forum_id + AND topic_moved_id = 0"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not update topics table', '', __LINE__, __FILE__, $sql); + } + + if ( !empty($topic_id) ) + { + $redirect_page = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&sid=" . $userdata['session_id']; + $message = sprintf($lang['Click_return_topic'], '', ''); + } + else + { + $redirect_page = "modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id&sid=" . $userdata['session_id']; + $message = sprintf($lang['Click_return_modcp'], '', ''); + } + + $message = $message . '

    ' . sprintf($lang['Click_return_forum'], '', ''); + + $template->assign_vars(array( + 'META' => '') + ); + + message_die(GENERAL_MESSAGE, $lang['Topics_Locked'] . '

    ' . $message); + + break; + + case 'unlock': + if ( empty($HTTP_POST_VARS['topic_id_list']) && empty($topic_id) ) + { + message_die(GENERAL_MESSAGE, $lang['None_selected']); + } + + $topics = ( isset($HTTP_POST_VARS['topic_id_list']) ) ? $HTTP_POST_VARS['topic_id_list'] : array($topic_id); + + $topic_id_sql = ''; + for($i = 0; $i < count($topics); $i++) + { + $topic_id_sql .= ( ( $topic_id_sql != "") ? ', ' : '' ) . intval($topics[$i]); + } + + $sql = "UPDATE " . TOPICS_TABLE . " + SET topic_status = " . TOPIC_UNLOCKED . " + WHERE topic_id IN ($topic_id_sql) + AND forum_id = $forum_id + AND topic_moved_id = 0"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not update topics table', '', __LINE__, __FILE__, $sql); + } + + if ( !empty($topic_id) ) + { + $redirect_page = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&sid=" . $userdata['session_id']; + $message = sprintf($lang['Click_return_topic'], '', ''); + } + else + { + $redirect_page = "modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id&sid=" . $userdata['session_id']; + $message = sprintf($lang['Click_return_modcp'], '', ''); + } + + $message = $message . '

    ' . sprintf($lang['Click_return_forum'], '', ''); + + $template->assign_vars(array( + 'META' => '') + ); + + message_die(GENERAL_MESSAGE, $lang['Topics_Unlocked'] . '

    ' . $message); + + break; + + case 'split': + $page_title = $lang['Mod_CP']; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + $post_id_sql = ''; + + if (isset($HTTP_POST_VARS['split_type_all']) || isset($HTTP_POST_VARS['split_type_beyond'])) + { + $posts = $HTTP_POST_VARS['post_id_list']; + + for ($i = 0; $i < count($posts); $i++) + { + $post_id_sql .= (($post_id_sql != '') ? ', ' : '') . intval($posts[$i]); + } + } + + if ($post_id_sql != '') + { + $sql = "SELECT post_id + FROM " . POSTS_TABLE . " + WHERE post_id IN ($post_id_sql) + AND forum_id = $forum_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not get post id information', '', __LINE__, __FILE__, $sql); + } + + $post_id_sql = ''; + while ($row = $db->sql_fetchrow($result)) + { + $post_id_sql .= (($post_id_sql != '') ? ', ' : '') . intval($row['post_id']); + } + $db->sql_freeresult($result); + + if ($post_id_sql == '') + { + message_die(GENERAL_MESSAGE, $lang['None_selected']); + } + + $sql = "SELECT post_id, poster_id, topic_id, post_time + FROM " . POSTS_TABLE . " + WHERE post_id IN ($post_id_sql) + ORDER BY post_time ASC"; + if (!($result = $db->sql_query($sql))) + { + message_die(GENERAL_ERROR, 'Could not get post information', '', __LINE__, __FILE__, $sql); + } + + if ($row = $db->sql_fetchrow($result)) + { + $first_poster = $row['poster_id']; + $topic_id = $row['topic_id']; + $post_time = $row['post_time']; + + $user_id_sql = ''; + $post_id_sql = ''; + do + { + $user_id_sql .= (($user_id_sql != '') ? ', ' : '') . intval($row['poster_id']); + $post_id_sql .= (($post_id_sql != '') ? ', ' : '') . intval($row['post_id']);; + } + while ($row = $db->sql_fetchrow($result)); + + $post_subject = trim(htmlspecialchars($HTTP_POST_VARS['subject'])); + if (empty($post_subject)) + { + message_die(GENERAL_MESSAGE, $lang['Empty_subject']); + } + + $new_forum_id = intval($HTTP_POST_VARS['new_forum_id']); + $topic_time = time(); + + $sql = 'SELECT forum_id FROM ' . FORUMS_TABLE . ' + WHERE forum_id = ' . $new_forum_id; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not select from forums table', '', __LINE__, __FILE__, $sql); + } + + if (!$db->sql_fetchrow($result)) + { + message_die(GENERAL_MESSAGE, 'New forum does not exist'); + } + + $db->sql_freeresult($result); + + $sql = "INSERT INTO " . TOPICS_TABLE . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type) + VALUES ('" . str_replace("\'", "''", $post_subject) . "', $first_poster, " . $topic_time . ", $new_forum_id, " . TOPIC_UNLOCKED . ", " . POST_NORMAL . ")"; + if (!($db->sql_query($sql, BEGIN_TRANSACTION))) + { + message_die(GENERAL_ERROR, 'Could not insert new topic', '', __LINE__, __FILE__, $sql); + } + + $new_topic_id = $db->sql_nextid(); + + // Update topic watch table, switch users whose posts + // have moved, over to watching the new topic + $sql = "UPDATE " . TOPICS_WATCH_TABLE . " + SET topic_id = $new_topic_id + WHERE topic_id = $topic_id + AND user_id IN ($user_id_sql)"; + if (!$db->sql_query($sql)) + { + message_die(GENERAL_ERROR, 'Could not update topics watch table', '', __LINE__, __FILE__, $sql); + } + + $sql_where = (!empty($HTTP_POST_VARS['split_type_beyond'])) ? " post_time >= $post_time AND topic_id = $topic_id" : "post_id IN ($post_id_sql)"; + + $sql = "UPDATE " . POSTS_TABLE . " + SET topic_id = $new_topic_id, forum_id = $new_forum_id + WHERE $sql_where"; + if (!$db->sql_query($sql, END_TRANSACTION)) + { + message_die(GENERAL_ERROR, 'Could not update posts table', '', __LINE__, __FILE__, $sql); + } + + sync('topic', $new_topic_id); + sync('topic', $topic_id); + sync('forum', $new_forum_id); + sync('forum', $forum_id); + + $template->assign_vars(array( + 'META' => '') + ); + + $message = $lang['Topic_split'] . '

    ' . sprintf($lang['Click_return_topic'], '', ''); + message_die(GENERAL_MESSAGE, $message); + } + } + else + { + // + // Set template files + // + $template->set_filenames(array( + 'split_body' => 'modcp_split.tpl') + ); + + $sql = "SELECT u.username, p.*, pt.post_text, pt.bbcode_uid, pt.post_subject, p.post_username + FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt + WHERE p.topic_id = $topic_id + AND p.poster_id = u.user_id + AND p.post_id = pt.post_id + ORDER BY p.post_time ASC"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not get topic/post information', '', __LINE__, __FILE__, $sql); + } + + $s_hidden_fields = ''; + + if( ( $total_posts = $db->sql_numrows($result) ) > 0 ) + { + $postrow = $db->sql_fetchrowset($result); + + $template->assign_vars(array( + 'L_SPLIT_TOPIC' => $lang['Split_Topic'], + 'L_SPLIT_TOPIC_EXPLAIN' => $lang['Split_Topic_explain'], + 'L_AUTHOR' => $lang['Author'], + 'L_MESSAGE' => $lang['Message'], + 'L_SELECT' => $lang['Select'], + 'L_SPLIT_SUBJECT' => $lang['Split_title'], + 'L_SPLIT_FORUM' => $lang['Split_forum'], + 'L_POSTED' => $lang['Posted'], + 'L_SPLIT_POSTS' => $lang['Split_posts'], + 'L_SUBMIT' => $lang['Submit'], + 'L_SPLIT_AFTER' => $lang['Split_after'], + 'L_POST_SUBJECT' => $lang['Post_subject'], + 'L_MARK_ALL' => $lang['Mark_all'], + 'L_UNMARK_ALL' => $lang['Unmark_all'], + 'L_POST' => $lang['Post'], + + 'FORUM_NAME' => $forum_name, + + 'U_VIEW_FORUM' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"), + + 'S_SPLIT_ACTION' => append_sid("modcp.$phpEx"), + 'S_HIDDEN_FIELDS' => $s_hidden_fields, + 'S_FORUM_SELECT' => make_forum_select("new_forum_id", false, $forum_id)) + ); + + // + // Define censored word matches + // + $orig_word = array(); + $replacement_word = array(); + obtain_word_list($orig_word, $replacement_word); + + for($i = 0; $i < $total_posts; $i++) + { + $post_id = $postrow[$i]['post_id']; + $poster_id = $postrow[$i]['poster_id']; + $poster = $postrow[$i]['username']; + + $post_date = create_date($board_config['default_dateformat'], $postrow[$i]['post_time'], $board_config['board_timezone']); + + $bbcode_uid = $postrow[$i]['bbcode_uid']; + $message = $postrow[$i]['post_text']; + $post_subject = ( $postrow[$i]['post_subject'] != '' ) ? $postrow[$i]['post_subject'] : $topic_title; + + // + // If the board has HTML off but the post has HTML + // on then we process it, else leave it alone + // + if ( !$board_config['allow_html'] ) + { + if ( $postrow[$i]['enable_html'] ) + { + $message = preg_replace('#(<)([\/]?.*?)(>)#is', '<\\2>', $message); + } + } + + if ( $bbcode_uid != '' ) + { + $message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $message); + } + + if ( count($orig_word) ) + { + $post_subject = preg_replace($orig_word, $replacement_word, $post_subject); + $message = preg_replace($orig_word, $replacement_word, $message); + } + + $message = make_clickable($message); + + if ( $board_config['allow_smilies'] && $postrow[$i]['enable_smilies'] ) + { + $message = smilies_pass($message); + } + + $message = str_replace("\n", '
    ', $message); + + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $checkbox = ( $i > 0 ) ? '' : ' '; + + $template->assign_block_vars('postrow', array( + 'ROW_COLOR' => '#' . $row_color, + 'ROW_CLASS' => $row_class, + 'POSTER_NAME' => $poster, + 'POST_DATE' => $post_date, + 'POST_SUBJECT' => $post_subject, + 'MESSAGE' => $message, + 'POST_ID' => $post_id, + + 'S_SPLIT_CHECKBOX' => $checkbox) + ); + } + + $template->pparse('split_body'); + } + } + break; + + case 'ip': + $page_title = $lang['Mod_CP']; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + $rdns_ip_num = ( isset($HTTP_GET_VARS['rdns']) ) ? $HTTP_GET_VARS['rdns'] : ""; + + if ( !$post_id ) + { + message_die(GENERAL_MESSAGE, $lang['No_such_post']); + } + + // + // Set template files + // + $template->set_filenames(array( + 'viewip' => 'modcp_viewip.tpl') + ); + + // Look up relevent data for this post + $sql = "SELECT poster_ip, poster_id + FROM " . POSTS_TABLE . " + WHERE post_id = $post_id + AND forum_id = $forum_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not get poster IP information', '', __LINE__, __FILE__, $sql); + } + + if ( !($post_row = $db->sql_fetchrow($result)) ) + { + message_die(GENERAL_MESSAGE, $lang['No_such_post']); + } + + $ip_this_post = decode_ip($post_row['poster_ip']); + $ip_this_post = ( $rdns_ip_num == $ip_this_post ) ? htmlspecialchars(gethostbyaddr($ip_this_post)) : $ip_this_post; + + $poster_id = $post_row['poster_id']; + + $template->assign_vars(array( + 'L_IP_INFO' => $lang['IP_info'], + 'L_THIS_POST_IP' => $lang['This_posts_IP'], + 'L_OTHER_IPS' => $lang['Other_IP_this_user'], + 'L_OTHER_USERS' => $lang['Users_this_IP'], + 'L_LOOKUP_IP' => $lang['Lookup_IP'], + 'L_SEARCH' => $lang['Search'], + + 'SEARCH_IMG' => $images['icon_search'], + + 'IP' => $ip_this_post, + + 'U_LOOKUP_IP' => "modcp.$phpEx?mode=ip&" . POST_POST_URL . "=$post_id&" . POST_TOPIC_URL . "=$topic_id&rdns=$ip_this_post&sid=" . $userdata['session_id']) + ); + + // + // Get other IP's this user has posted under + // + $sql = "SELECT poster_ip, COUNT(*) AS postings + FROM " . POSTS_TABLE . " + WHERE poster_id = $poster_id + GROUP BY poster_ip + ORDER BY " . (( SQL_LAYER == 'msaccess' ) ? 'COUNT(*)' : 'postings' ) . " DESC"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not get IP information for this user', '', __LINE__, __FILE__, $sql); + } + + if ( $row = $db->sql_fetchrow($result) ) + { + $i = 0; + do + { + if ( $row['poster_ip'] == $post_row['poster_ip'] ) + { + $template->assign_vars(array( + 'POSTS' => $row['postings'] . ' ' . ( ( $row['postings'] == 1 ) ? $lang['Post'] : $lang['Posts'] )) + ); + continue; + } + + $ip = decode_ip($row['poster_ip']); + $ip = ( $rdns_ip_num == $row['poster_ip'] || $rdns_ip_num == 'all') ? htmlspecialchars(gethostbyaddr($ip)) : $ip; + + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $template->assign_block_vars('iprow', array( + 'ROW_COLOR' => '#' . $row_color, + 'ROW_CLASS' => $row_class, + 'IP' => $ip, + 'POSTS' => $row['postings'] . ' ' . ( ( $row['postings'] == 1 ) ? $lang['Post'] : $lang['Posts'] ), + + 'U_LOOKUP_IP' => "modcp.$phpEx?mode=ip&" . POST_POST_URL . "=$post_id&" . POST_TOPIC_URL . "=$topic_id&rdns=" . $row['poster_ip'] . "&sid=" . $userdata['session_id']) + ); + + $i++; + } + while ( $row = $db->sql_fetchrow($result) ); + } + + // + // Get other users who've posted under this IP + // + $sql = "SELECT u.user_id, u.username, COUNT(*) as postings + FROM " . USERS_TABLE ." u, " . POSTS_TABLE . " p + WHERE p.poster_id = u.user_id + AND p.poster_ip = '" . $post_row['poster_ip'] . "' + GROUP BY u.user_id, u.username + ORDER BY " . (( SQL_LAYER == 'msaccess' ) ? 'COUNT(*)' : 'postings' ) . " DESC"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not get posters information based on IP', '', __LINE__, __FILE__, $sql); + } + + if ( $row = $db->sql_fetchrow($result) ) + { + $i = 0; + do + { + $id = $row['user_id']; + $username = ( $id == ANONYMOUS ) ? $lang['Guest'] : $row['username']; + + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $template->assign_block_vars('userrow', array( + 'ROW_COLOR' => '#' . $row_color, + 'ROW_CLASS' => $row_class, + 'USERNAME' => $username, + 'POSTS' => $row['postings'] . ' ' . ( ( $row['postings'] == 1 ) ? $lang['Post'] : $lang['Posts'] ), + 'L_SEARCH_POSTS' => sprintf($lang['Search_user_posts'], $username), + + 'U_PROFILE' => ($id == ANONYMOUS) ? "modcp.$phpEx?mode=ip&" . POST_POST_URL . "=" . $post_id . "&" . POST_TOPIC_URL . "=" . $topic_id . "&sid=" . $userdata['session_id'] : append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$id"), + 'U_SEARCHPOSTS' => append_sid("search.$phpEx?search_author=" . (($id == ANONYMOUS) ? 'Anonymous' : urlencode($username)) . "&showresults=topics")) + ); + + $i++; + } + while ( $row = $db->sql_fetchrow($result) ); + } + + $template->pparse('viewip'); + + break; + + default: + $page_title = $lang['Mod_CP']; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + $template->assign_vars(array( + 'FORUM_NAME' => $forum_name, + + 'L_MOD_CP' => $lang['Mod_CP'], + 'L_MOD_CP_EXPLAIN' => $lang['Mod_CP_explain'], + 'L_SELECT' => $lang['Select'], + 'L_DELETE' => $lang['Delete'], + 'L_MOVE' => $lang['Move'], + 'L_LOCK' => $lang['Lock'], + 'L_UNLOCK' => $lang['Unlock'], + 'L_TOPICS' => $lang['Topics'], + 'L_REPLIES' => $lang['Replies'], + 'L_LASTPOST' => $lang['Last_Post'], + 'L_SELECT' => $lang['Select'], + + 'U_VIEW_FORUM' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"), + 'S_HIDDEN_FIELDS' => '', + 'S_MODCP_ACTION' => append_sid("modcp.$phpEx")) + ); + + $template->set_filenames(array( + 'body' => 'modcp_body.tpl') + ); + make_jumpbox('modcp.'.$phpEx); + + // + // Define censored word matches + // + $orig_word = array(); + $replacement_word = array(); + obtain_word_list($orig_word, $replacement_word); + + $sql = "SELECT t.*, u.username, u.user_id, p.post_time + FROM " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p + WHERE t.forum_id = $forum_id + AND t.topic_poster = u.user_id + AND p.post_id = t.topic_last_post_id + ORDER BY t.topic_type DESC, p.post_time DESC + LIMIT $start, " . $board_config['topics_per_page']; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain topic information', '', __LINE__, __FILE__, $sql); + } + + while ( $row = $db->sql_fetchrow($result) ) + { + $topic_title = ''; + + if ( $row['topic_status'] == TOPIC_LOCKED ) + { + $folder_img = $images['folder_locked']; + $folder_alt = $lang['Topic_locked']; + } + else + { + if ( $row['topic_type'] == POST_ANNOUNCE ) + { + $folder_img = $images['folder_announce']; + $folder_alt = $lang['Topic_Announcement']; + } + else if ( $row['topic_type'] == POST_STICKY ) + { + $folder_img = $images['folder_sticky']; + $folder_alt = $lang['Topic_Sticky']; + } + else + { + $folder_img = $images['folder']; + $folder_alt = $lang['No_new_posts']; + } + } + + $topic_id = $row['topic_id']; + $topic_type = $row['topic_type']; + $topic_status = $row['topic_status']; + + if ( $topic_type == POST_ANNOUNCE ) + { + $topic_type = $lang['Topic_Announcement'] . ' '; + } + else if ( $topic_type == POST_STICKY ) + { + $topic_type = $lang['Topic_Sticky'] . ' '; + } + else if ( $topic_status == TOPIC_MOVED ) + { + $topic_type = $lang['Topic_Moved'] . ' '; + } + else + { + $topic_type = ''; + } + + if ( $row['topic_vote'] ) + { + $topic_type .= $lang['Topic_Poll'] . ' '; + } + + $topic_title = $row['topic_title']; + if ( count($orig_word) ) + { + $topic_title = preg_replace($orig_word, $replacement_word, $topic_title); + } + + $u_view_topic = "modcp.$phpEx?mode=split&" . POST_TOPIC_URL . "=$topic_id&sid=" . $userdata['session_id']; + $topic_replies = $row['topic_replies']; + + $last_post_time = create_date($board_config['default_dateformat'], $row['post_time'], $board_config['board_timezone']); + + $template->assign_block_vars('topicrow', array( + 'U_VIEW_TOPIC' => $u_view_topic, + + 'TOPIC_FOLDER_IMG' => $folder_img, + 'TOPIC_TYPE' => $topic_type, + 'TOPIC_TITLE' => $topic_title, + 'REPLIES' => $topic_replies, + 'LAST_POST_TIME' => $last_post_time, + 'TOPIC_ID' => $topic_id, + + 'L_TOPIC_FOLDER_ALT' => $folder_alt) + ); + } + + $template->assign_vars(array( + 'PAGINATION' => generate_pagination("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id&sid=" . $userdata['session_id'], $forum_topics, $board_config['topics_per_page'], $start), + 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $forum_topics / $board_config['topics_per_page'] )), + 'L_GOTO_PAGE' => $lang['Goto_page']) + ); + + $template->pparse('body'); + + break; +} + +include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + +?> \ No newline at end of file diff --git a/phpBB/posting.php b/phpBB/posting.php index dfe7b348a7..22b93a3fdc 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1,1483 +1,1132 @@ 'post', 'preview' => 'preview', 'delete' => 'delete', 'poll_delete' => 'poll_delete', 'poll_add' => 'add_poll_option', 'poll_edit' => 'edit_poll_option', 'mode' => 'mode'); +while( list($var, $param) = @each($params) ) +{ + if ( !empty($HTTP_POST_VARS[$param]) || !empty($HTTP_GET_VARS[$param]) ) + { + $$var = ( !empty($HTTP_POST_VARS[$param]) ) ? htmlspecialchars($HTTP_POST_VARS[$param]) : htmlspecialchars($HTTP_GET_VARS[$param]); + } + else + { + $$var = ''; + } +} +$confirm = isset($HTTP_POST_VARS['confirm']) ? true : false; +$sid = (isset($HTTP_POST_VARS['sid'])) ? $HTTP_POST_VARS['sid'] : 0; + +$params = array('forum_id' => POST_FORUM_URL, 'topic_id' => POST_TOPIC_URL, 'post_id' => POST_POST_URL); +while( list($var, $param) = @each($params) ) +{ + if ( !empty($HTTP_POST_VARS[$param]) || !empty($HTTP_GET_VARS[$param]) ) + { + $$var = ( !empty($HTTP_POST_VARS[$param]) ) ? intval($HTTP_POST_VARS[$param]) : intval($HTTP_GET_VARS[$param]); + } + else + { + $$var = ''; + } +} + +$refresh = $preview || $poll_add || $poll_edit || $poll_delete; +$orig_word = $replacement_word = array(); + +// +// Set topic type +// +$topic_type = ( !empty($HTTP_POST_VARS['topictype']) ) ? intval($HTTP_POST_VARS['topictype']) : POST_NORMAL; +$topic_type = ( in_array($topic_type, array(POST_NORMAL, POST_STICKY, POST_ANNOUNCE)) ) ? $topic_type : POST_NORMAL; + +// +// If the mode is set to topic review then output +// that review ... +// +if ( $mode == 'topicreview' ) +{ + require($phpbb_root_path . 'includes/topic_review.'.$phpEx); + + topic_review($topic_id, false); + exit; +} +else if ( $mode == 'smilies' ) +{ + generate_smilies('window', PAGE_POSTING); + exit; +} + +// // Start session management -$user->session_begin(); -$auth->acl($user->data); +// +$userdata = session_pagestart($user_ip, PAGE_POSTING); +init_userprefs($userdata); +// +// End session management +// - -// Grab only parameters needed here -$post_id = request_var('p', 0); -$topic_id = request_var('t', 0); -$forum_id = request_var('f', 0); -$draft_id = request_var('d', 0); -$lastclick = request_var('lastclick', 0); - -$submit = (isset($_POST['post'])) ? true : false; -$preview = (isset($_POST['preview'])) ? true : false; -$save = (isset($_POST['save'])) ? true : false; -$load = (isset($_POST['load'])) ? true : false; -$delete = (isset($_POST['delete'])) ? true : false; -$cancel = (isset($_POST['cancel']) && !isset($_POST['save'])) ? true : false; - -$refresh = (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['cancel_unglobalise']) || $save || $load) ? true : false; -$mode = ($delete && !$preview && !$refresh && $submit) ? 'delete' : request_var('mode', ''); - -$error = $post_data = array(); -$current_time = time(); - - -// Was cancel pressed? If so then redirect to the appropriate page -if ($cancel || ($current_time - $lastclick < 2 && $submit)) +// +// Was cancel pressed? If so then redirect to the appropriate +// page, no point in continuing with any further checks +// +if ( isset($HTTP_POST_VARS['cancel']) ) { - $redirect = ($post_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $post_id) . '#p' . $post_id : (($topic_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . $topic_id) : (($forum_id) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) : append_sid("{$phpbb_root_path}index.$phpEx"))); - redirect($redirect); + if ( $post_id ) + { + $redirect = "viewtopic.$phpEx?" . POST_POST_URL . "=$post_id"; + $post_append = "#$post_id"; + } + else if ( $topic_id ) + { + $redirect = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id"; + $post_append = ''; + } + else if ( $forum_id ) + { + $redirect = "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"; + $post_append = ''; + } + else + { + $redirect = "index.$phpEx"; + $post_append = ''; + } + + redirect(append_sid($redirect, true) . $post_append); } -if (in_array($mode, array('post', 'reply', 'quote', 'edit', 'delete')) && !$forum_id) +// +// What auth type do we need to check? +// +$is_auth = array(); +switch( $mode ) { - trigger_error('NO_FORUM'); -} - -// We need to know some basic information in all cases before we do anything. -switch ($mode) -{ - case 'post': - $sql = 'SELECT * - FROM ' . FORUMS_TABLE . " - WHERE forum_id = $forum_id"; - break; - - case 'bump': - case 'reply': - if (!$topic_id) + case 'newtopic': + if ( $topic_type == POST_ANNOUNCE ) { - trigger_error('NO_TOPIC'); + $is_auth_type = 'auth_announce'; } - - $sql = 'SELECT f.*, t.* - FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f - WHERE t.topic_id = $topic_id - AND (f.forum_id = t.forum_id - OR f.forum_id = $forum_id)"; - break; - - case 'quote': - case 'edit': - case 'delete': - if (!$post_id) + else if ( $topic_type == POST_STICKY ) { - $user->setup('posting'); - trigger_error('NO_POST'); - } - - $sql = 'SELECT f.*, t.*, p.*, u.username, u.username_clean, u.user_sig, u.user_sig_bbcode_uid, u.user_sig_bbcode_bitfield - FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . ' f, ' . USERS_TABLE . " u - WHERE p.post_id = $post_id - AND t.topic_id = p.topic_id - AND u.user_id = p.poster_id - AND (f.forum_id = t.forum_id - OR f.forum_id = $forum_id)"; - break; - - case 'smilies': - $sql = ''; - generate_smilies('window', $forum_id); - break; - - case 'popup': - if ($forum_id) - { - $sql = 'SELECT forum_style - FROM ' . FORUMS_TABLE . ' - WHERE forum_id = ' . $forum_id; + $is_auth_type = 'auth_sticky'; } else { - upload_popup(); - garbage_collection(); - exit_handler(); + $is_auth_type = 'auth_post'; } - break; + break; + case 'reply': + case 'quote': + $is_auth_type = 'auth_reply'; + break; + case 'editpost': + $is_auth_type = 'auth_edit'; + break; + case 'delete': + case 'poll_delete': + $is_auth_type = 'auth_delete'; + break; + case 'vote': + $is_auth_type = 'auth_vote'; + break; + case 'topicreview': + $is_auth_type = 'auth_read'; + break; + default: + message_die(GENERAL_MESSAGE, $lang['No_post_mode']); + break; +} + +// +// Here we do various lookups to find topic_id, forum_id, post_id etc. +// Doing it here prevents spoofing (eg. faking forum_id, topic_id or post_id +// +$error_msg = ''; +$post_data = array(); +switch ( $mode ) +{ + case 'newtopic': + if ( empty($forum_id) ) + { + message_die(GENERAL_MESSAGE, $lang['Forum_not_exist']); + } + + $sql = "SELECT * + FROM " . FORUMS_TABLE . " + WHERE forum_id = $forum_id"; + break; + + case 'reply': + case 'vote': + if ( empty( $topic_id) ) + { + message_die(GENERAL_MESSAGE, $lang['No_topic_id']); + } + + $sql = "SELECT f.*, t.topic_status, t.topic_title, t.topic_type + FROM " . FORUMS_TABLE . " f, " . TOPICS_TABLE . " t + WHERE t.topic_id = $topic_id + AND f.forum_id = t.forum_id"; + break; + + case 'quote': + case 'editpost': + case 'delete': + case 'poll_delete': + if ( empty($post_id) ) + { + message_die(GENERAL_MESSAGE, $lang['No_post_id']); + } + + $select_sql = (!$submit) ? ', t.topic_title, p.enable_bbcode, p.enable_html, p.enable_smilies, p.enable_sig, p.post_username, pt.post_subject, pt.post_text, pt.bbcode_uid, u.username, u.user_id, u.user_sig, u.user_sig_bbcode_uid' : ''; + $from_sql = ( !$submit ) ? ", " . POSTS_TEXT_TABLE . " pt, " . USERS_TABLE . " u" : ''; + $where_sql = ( !$submit ) ? "AND pt.post_id = p.post_id AND u.user_id = p.poster_id" : ''; + + $sql = "SELECT f.*, t.topic_id, t.topic_status, t.topic_type, t.topic_first_post_id, t.topic_last_post_id, t.topic_vote, p.post_id, p.poster_id" . $select_sql . " + FROM " . POSTS_TABLE . " p, " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f" . $from_sql . " + WHERE p.post_id = $post_id + AND t.topic_id = p.topic_id + AND f.forum_id = p.forum_id + $where_sql"; + break; default: - $sql = ''; - break; + message_die(GENERAL_MESSAGE, $lang['No_valid_mode']); } -if (!$sql) +if ( ($result = $db->sql_query($sql)) && ($post_info = $db->sql_fetchrow($result)) ) { - $user->setup('posting'); - trigger_error('NO_POST_MODE'); -} - -$result = $db->sql_query($sql); -$post_data = $db->sql_fetchrow($result); -$db->sql_freeresult($result); - -if (!$post_data) -{ - if (!($mode == 'post' || $mode == 'bump' || $mode == 'reply')) - { - $user->setup('posting'); - } - trigger_error(($mode == 'post' || $mode == 'bump' || $mode == 'reply') ? 'NO_TOPIC' : 'NO_POST'); -} - -if ($mode == 'popup') -{ - upload_popup($post_data['forum_style']); - exit_handler(); -} - -$user->setup(array('posting', 'mcp', 'viewtopic'), $post_data['forum_style']); - -// Use post_row values in favor of submitted ones... -$forum_id = (!empty($post_data['forum_id'])) ? (int) $post_data['forum_id'] : (int) $forum_id; -$topic_id = (!empty($post_data['topic_id'])) ? (int) $post_data['topic_id'] : (int) $topic_id; -$post_id = (!empty($post_data['post_id'])) ? (int) $post_data['post_id'] : (int) $post_id; - -// Need to login to passworded forum first? -if ($post_data['forum_password']) -{ - login_forum_box(array( - 'forum_id' => $forum_id, - 'forum_password' => $post_data['forum_password']) - ); -} - -// Check permissions -if ($user->data['is_bot']) -{ - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); -} - -// Is the user able to read within this forum? -if (!$auth->acl_get('f_read', $forum_id)) -{ - if ($user->data['user_id'] != ANONYMOUS) - { - trigger_error('USER_CANNOT_READ'); - } - - login_box('', $user->lang['LOGIN_EXPLAIN_POST']); -} - -// Permission to do the action asked? -$is_authed = false; - -switch ($mode) -{ - case 'post': - if ($auth->acl_get('f_post', $forum_id)) - { - $is_authed = true; - } - break; - - case 'bump': - if ($auth->acl_get('f_bump', $forum_id)) - { - $is_authed = true; - } - break; - - case 'quote': - - $post_data['post_edit_locked'] = 0; - - // no break; - - case 'reply': - if ($auth->acl_get('f_reply', $forum_id)) - { - $is_authed = true; - } - break; - - case 'edit': - if ($user->data['is_registered'] && $auth->acl_gets('f_edit', 'm_edit', $forum_id)) - { - $is_authed = true; - } - break; - - case 'delete': - if ($user->data['is_registered'] && $auth->acl_gets('f_delete', 'm_delete', $forum_id)) - { - $is_authed = true; - } - break; -} - -if (!$is_authed) -{ - $check_auth = ($mode == 'quote') ? 'reply' : $mode; - - if ($user->data['is_registered']) - { - trigger_error('USER_CANNOT_' . strtoupper($check_auth)); - } - - login_box('', $user->lang['LOGIN_EXPLAIN_' . strtoupper($mode)]); -} - -// Is the user able to post within this forum? -if ($post_data['forum_type'] != FORUM_POST && in_array($mode, array('post', 'bump', 'quote', 'reply'))) -{ - trigger_error('USER_CANNOT_FORUM_POST'); -} - -// Forum/Topic locked? -if (($post_data['forum_status'] == ITEM_LOCKED || (isset($post_data['topic_status']) && $post_data['topic_status'] == ITEM_LOCKED)) && !$auth->acl_get('m_edit', $forum_id)) -{ - trigger_error(($post_data['forum_status'] == ITEM_LOCKED) ? 'FORUM_LOCKED' : 'TOPIC_LOCKED'); -} - -// Can we edit this post ... if we're a moderator with rights then always yes -// else it depends on editing times, lock status and if we're the correct user -if ($mode == 'edit' && !$auth->acl_get('m_edit', $forum_id)) -{ - if ($user->data['user_id'] != $post_data['poster_id']) - { - trigger_error('USER_CANNOT_EDIT'); - } - - if (!($post_data['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])) - { - trigger_error('CANNOT_EDIT_TIME'); - } - - if ($post_data['post_edit_locked']) - { - trigger_error('CANNOT_EDIT_POST_LOCKED'); - } -} - -// Handle delete mode... -if ($mode == 'delete') -{ - handle_post_delete($forum_id, $topic_id, $post_id, $post_data); - exit_handler(); -} - -// Handle bump mode... -if ($mode == 'bump') -{ - if ($bump_time = bump_topic_allowed($forum_id, $post_data['topic_bumped'], $post_data['topic_last_post_time'], $post_data['topic_poster'], $post_data['topic_last_poster_id'])) - { - $db->sql_transaction('begin'); - - $sql = 'UPDATE ' . POSTS_TABLE . " - SET post_time = $current_time - WHERE post_id = {$post_data['topic_last_post_id']} - AND topic_id = $topic_id"; - $db->sql_query($sql); - - $sql = 'UPDATE ' . TOPICS_TABLE . " - SET topic_last_post_time = $current_time, - topic_bumped = 1, - topic_bumper = " . $user->data['user_id'] . " - WHERE topic_id = $topic_id"; - $db->sql_query($sql); - - update_post_information('forum', $forum_id); - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_lastpost_time = $current_time - WHERE user_id = " . $user->data['user_id']; - $db->sql_query($sql); - - $db->sql_transaction('commit'); - - markread('post', $forum_id, $topic_id, $current_time); - - add_log('mod', $forum_id, $topic_id, 'LOG_BUMP_TOPIC', $post_data['topic_title']); - - $meta_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&p={$post_data['topic_last_post_id']}") . "#p{$post_data['topic_last_post_id']}"; - meta_refresh(3, $meta_url); - - $message = $user->lang['TOPIC_BUMPED'] . '

    ' . sprintf($user->lang['VIEW_MESSAGE'], '', ''); - $message .= '

    ' . sprintf($user->lang['RETURN_FORUM'], '', ''); - - trigger_error($message); - } - - trigger_error('BUMP_ERROR'); -} - -// Subject length limiting to 60 characters if first post... -if ($mode == 'post' || ($mode == 'edit' && $post_data['topic_first_post_id'] == $post_data['post_id'])) -{ - $template->assign_var('S_NEW_MESSAGE', true); -} - -// Determine some vars -if (isset($post_data['poster_id']) && $post_data['poster_id'] == ANONYMOUS) -{ - $post_data['quote_username'] = (!empty($post_data['post_username'])) ? $post_data['post_username'] : $user->lang['GUEST']; -} -else -{ - $post_data['quote_username'] = isset($post_data['username']) ? $post_data['username'] : ''; -} - -$post_data['post_edit_locked'] = (isset($post_data['post_edit_locked'])) ? (int) $post_data['post_edit_locked'] : 0; -$post_data['post_subject'] = (in_array($mode, array('quote', 'edit'))) ? $post_data['post_subject'] : ((isset($post_data['topic_title'])) ? $post_data['topic_title'] : ''); -$post_data['topic_time_limit'] = (isset($post_data['topic_time_limit'])) ? (($post_data['topic_time_limit']) ? (int) $post_data['topic_time_limit'] / 86400 : (int) $post_data['topic_time_limit']) : 0; -$post_data['poll_length'] = (!empty($post_data['poll_length'])) ? (int) $post_data['poll_length'] / 86400 : 0; -$post_data['poll_start'] = (!empty($post_data['poll_start'])) ? (int) $post_data['poll_start'] : 0; -$post_data['icon_id'] = (!isset($post_data['icon_id']) || in_array($mode, array('quote', 'reply'))) ? 0 : (int) $post_data['icon_id']; -$post_data['poll_options'] = array(); - -// Get Poll Data -if ($post_data['poll_start']) -{ - $sql = 'SELECT poll_option_text - FROM ' . POLL_OPTIONS_TABLE . " - WHERE topic_id = $topic_id - ORDER BY poll_option_id"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $post_data['poll_options'][] = trim($row['poll_option_text']); - } - $db->sql_freeresult($result); -} - -$orig_poll_options_size = sizeof($post_data['poll_options']); - -$message_parser = new parse_message(); - -if (isset($post_data['post_text'])) -{ - $message_parser->message = &$post_data['post_text']; - unset($post_data['post_text']); -} - -// Set some default variables -$uninit = array('post_attachment' => 0, 'poster_id' => $user->data['user_id'], 'enable_magic_url' => 0, 'topic_status' => 0, 'topic_type' => POST_NORMAL, 'post_subject' => '', 'topic_title' => '', 'post_time' => 0, 'post_edit_reason' => '', 'notify_set' => 0); - -foreach ($uninit as $var_name => $default_value) -{ - if (!isset($post_data[$var_name])) - { - $post_data[$var_name] = $default_value; - } -} -unset($uninit); - -// Always check if the submitted attachment data is valid and belongs to the user. -// Further down (especially in submit_post()) we do not check this again. -$message_parser->get_submitted_attachment_data($post_data['poster_id']); - -if ($post_data['post_attachment'] && !$submit && !$refresh && !$preview && $mode == 'edit') -{ - // Do not change to SELECT * - $sql = 'SELECT attach_id, is_orphan, attach_comment, real_filename - FROM ' . ATTACHMENTS_TABLE . " - WHERE post_msg_id = $post_id - AND in_message = 0 - AND is_orphan = 0 - ORDER BY filetime DESC"; - $result = $db->sql_query($sql); - $message_parser->attachment_data = array_merge($message_parser->attachment_data, $db->sql_fetchrowset($result)); - $db->sql_freeresult($result); -} - -if ($post_data['poster_id'] == ANONYMOUS) -{ - $post_data['username'] = ($mode == 'quote' || $mode == 'edit') ? trim($post_data['post_username']) : ''; -} -else -{ - $post_data['username'] = ($mode == 'quote' || $mode == 'edit') ? trim($post_data['username']) : ''; -} - -$post_data['enable_urls'] = $post_data['enable_magic_url']; - -if ($mode != 'edit') -{ - $post_data['enable_sig'] = ($config['allow_sig'] && $user->optionget('attachsig')) ? true: false; - $post_data['enable_smilies'] = ($config['allow_smilies'] && $user->optionget('smilies')) ? true : false; - $post_data['enable_bbcode'] = ($config['allow_bbcode'] && $user->optionget('bbcode')) ? true : false; - $post_data['enable_urls'] = true; -} - -$post_data['enable_magic_url'] = $post_data['drafts'] = false; - -// User own some drafts? -if ($user->data['is_registered'] && $auth->acl_get('u_savedrafts') && ($mode == 'reply' || $mode == 'post' || $mode == 'quote')) -{ - $sql = 'SELECT draft_id - FROM ' . DRAFTS_TABLE . ' - WHERE user_id = ' . $user->data['user_id'] . - (($forum_id) ? ' AND forum_id = ' . (int) $forum_id : '') . - (($topic_id) ? ' AND topic_id = ' . (int) $topic_id : '') . - (($draft_id) ? " AND draft_id <> $draft_id" : ''); - $result = $db->sql_query_limit($sql, 1); - - if ($db->sql_fetchrow($result)) - { - $post_data['drafts'] = true; - } - $db->sql_freeresult($result); -} - -$check_value = (($post_data['enable_bbcode']+1) << 8) + (($post_data['enable_smilies']+1) << 4) + (($post_data['enable_urls']+1) << 2) + (($post_data['enable_sig']+1) << 1); - -// Check if user is watching this topic -if ($mode != 'post' && $config['allow_topic_notify'] && $user->data['is_registered']) -{ - $sql = 'SELECT topic_id - FROM ' . TOPICS_WATCH_TABLE . ' - WHERE topic_id = ' . $topic_id . ' - AND user_id = ' . $user->data['user_id']; - $result = $db->sql_query($sql); - $post_data['notify_set'] = (int) $db->sql_fetchfield('topic_id'); - $db->sql_freeresult($result); -} - -// Do we want to edit our post ? -if ($mode == 'edit' && $post_data['bbcode_uid']) -{ - $message_parser->bbcode_uid = $post_data['bbcode_uid']; -} - -// HTML, BBCode, Smilies, Images and Flash status -$bbcode_status = ($config['allow_bbcode'] && $auth->acl_get('f_bbcode', $forum_id)) ? true : false; -$smilies_status = ($bbcode_status && $config['allow_smilies'] && $auth->acl_get('f_smilies', $forum_id)) ? true : false; -$img_status = ($bbcode_status && $auth->acl_get('f_img', $forum_id)) ? true : false; -$url_status = ($config['allow_post_links']) ? true : false; -$flash_status = ($bbcode_status && $auth->acl_get('f_flash', $forum_id) && $config['allow_post_flash']) ? true : false; -$quote_status = ($auth->acl_get('f_reply', $forum_id)) ? true : false; - -// Save Draft -if ($save && $user->data['is_registered'] && $auth->acl_get('u_savedrafts') && ($mode == 'reply' || $mode == 'post' || $mode == 'quote')) -{ - $subject = utf8_normalize_nfc(request_var('subject', '', true)); - $subject = (!$subject && $mode != 'post') ? $post_data['topic_title'] : $subject; - $message = utf8_normalize_nfc(request_var('message', '', true)); - - if ($subject && $message) - { - if (confirm_box(true)) - { - $sql = 'INSERT INTO ' . DRAFTS_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'user_id' => (int) $user->data['user_id'], - 'topic_id' => (int) $topic_id, - 'forum_id' => (int) $forum_id, - 'save_time' => (int) $current_time, - 'draft_subject' => (string) $subject, - 'draft_message' => (string) $message) - ); - $db->sql_query($sql); - - $meta_info = ($mode == 'post') ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) : append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id"); - - meta_refresh(3, $meta_info); - - $message = $user->lang['DRAFT_SAVED'] . '

    '; - $message .= ($mode != 'post') ? sprintf($user->lang['RETURN_TOPIC'], '', '') . '

    ' : ''; - $message .= sprintf($user->lang['RETURN_FORUM'], '', ''); - - trigger_error($message); - } - else - { - $s_hidden_fields = build_hidden_fields(array( - 'mode' => $mode, - 'save' => true, - 'f' => $forum_id, - 't' => $topic_id, - 'subject' => $subject, - 'message' => $message, - 'attachment_data' => $message_parser->attachment_data, - ) - ); - - confirm_box(false, 'SAVE_DRAFT', $s_hidden_fields); - } - } - else - { - if (utf8_clean_string($subject) === '') - { - $error[] = $user->lang['EMPTY_SUBJECT']; - } - - if (utf8_clean_string($message) === '') - { - $error[] = $user->lang['TOO_FEW_CHARS']; - } - } - unset($subject, $message); -} - -// Load requested Draft -if ($draft_id && ($mode == 'reply' || $mode == 'quote' || $mode == 'post') && $user->data['is_registered'] && $auth->acl_get('u_savedrafts')) -{ - $sql = 'SELECT draft_subject, draft_message - FROM ' . DRAFTS_TABLE . " - WHERE draft_id = $draft_id - AND user_id = " . $user->data['user_id']; - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); - if ($row) + $forum_id = $post_info['forum_id']; + $forum_name = $post_info['forum_name']; + + $is_auth = auth(AUTH_ALL, $forum_id, $userdata, $post_info); + + if ( $post_info['forum_status'] == FORUM_LOCKED && !$is_auth['auth_mod']) + { + message_die(GENERAL_MESSAGE, $lang['Forum_locked']); + } + else if ( $mode != 'newtopic' && $post_info['topic_status'] == TOPIC_LOCKED && !$is_auth['auth_mod']) + { + message_die(GENERAL_MESSAGE, $lang['Topic_locked']); + } + + if ( $mode == 'editpost' || $mode == 'delete' || $mode == 'poll_delete' ) { - $post_data['post_subject'] = $row['draft_subject']; - $message_parser->message = $row['draft_message']; + $topic_id = $post_info['topic_id']; - $template->assign_var('S_DRAFT_LOADED', true); - } - else - { - $draft_id = 0; - } -} + $post_data['poster_post'] = ( $post_info['poster_id'] == $userdata['user_id'] ) ? true : false; + $post_data['first_post'] = ( $post_info['topic_first_post_id'] == $post_id ) ? true : false; + $post_data['last_post'] = ( $post_info['topic_last_post_id'] == $post_id ) ? true : false; + $post_data['last_topic'] = ( $post_info['forum_last_post_id'] == $post_id ) ? true : false; + $post_data['has_poll'] = ( $post_info['topic_vote'] ) ? true : false; + $post_data['topic_type'] = $post_info['topic_type']; + $post_data['poster_id'] = $post_info['poster_id']; -// Load draft overview -if ($load && ($mode == 'reply' || $mode == 'quote' || $mode == 'post') && $post_data['drafts']) -{ - load_drafts($topic_id, $forum_id); -} - -$solved_captcha = false; - -if ($submit || $preview || $refresh) -{ - $post_data['topic_cur_post_id'] = request_var('topic_cur_post_id', 0); - $post_data['post_subject'] = utf8_normalize_nfc(request_var('subject', '', true)); - $message_parser->message = utf8_normalize_nfc(request_var('message', '', true)); - - $post_data['username'] = utf8_normalize_nfc(request_var('username', $post_data['username'], true)); - $post_data['post_edit_reason'] = (!empty($_POST['edit_reason']) && $mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? utf8_normalize_nfc(request_var('edit_reason', '', true)) : ''; - - $post_data['orig_topic_type'] = $post_data['topic_type']; - $post_data['topic_type'] = request_var('topic_type', (($mode != 'post') ? (int) $post_data['topic_type'] : POST_NORMAL)); - $post_data['topic_time_limit'] = request_var('topic_time_limit', (($mode != 'post') ? (int) $post_data['topic_time_limit'] : 0)); - $post_data['icon_id'] = request_var('icon', 0); - - $post_data['enable_bbcode'] = (!$bbcode_status || isset($_POST['disable_bbcode'])) ? false : true; - $post_data['enable_smilies'] = (!$smilies_status || isset($_POST['disable_smilies'])) ? false : true; - $post_data['enable_urls'] = (isset($_POST['disable_magic_url'])) ? 0 : 1; - $post_data['enable_sig'] = (!$config['allow_sig'] || !$auth->acl_get('f_sigs', $forum_id) || !$auth->acl_get('u_sig')) ? false : ((isset($_POST['attach_sig']) && $user->data['is_registered']) ? true : false); - - if ($config['allow_topic_notify'] && $user->data['is_registered']) - { - $notify = (isset($_POST['notify'])) ? true : false; - } - else - { - $notify = false; - } - - $topic_lock = (isset($_POST['lock_topic'])) ? true : false; - $post_lock = (isset($_POST['lock_post'])) ? true : false; - $poll_delete = (isset($_POST['poll_delete'])) ? true : false; - - if ($submit) - { - $status_switch = (($post_data['enable_bbcode']+1) << 8) + (($post_data['enable_smilies']+1) << 4) + (($post_data['enable_urls']+1) << 2) + (($post_data['enable_sig']+1) << 1); - $status_switch = ($status_switch != $check_value); - } - else - { - $status_switch = 1; - } - - // Delete Poll - if ($poll_delete && $mode == 'edit' && sizeof($post_data['poll_options']) && - ((!$post_data['poll_last_vote'] && $post_data['poster_id'] == $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id)) || $auth->acl_get('m_delete', $forum_id))) - { - if ($submit && check_form_key('posting')) + if ( $post_data['first_post'] && $post_data['has_poll'] ) { - $sql = 'DELETE FROM ' . POLL_OPTIONS_TABLE . " - WHERE topic_id = $topic_id"; - $db->sql_query($sql); - - $sql = 'DELETE FROM ' . POLL_VOTES_TABLE . " - WHERE topic_id = $topic_id"; - $db->sql_query($sql); - - $topic_sql = array( - 'poll_title' => '', - 'poll_start' => 0, - 'poll_length' => 0, - 'poll_last_vote' => 0, - 'poll_max_options' => 0, - 'poll_vote_change' => 0 - ); - - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $topic_sql) . " - WHERE topic_id = $topic_id"; - $db->sql_query($sql); - } - - $post_data['poll_title'] = $post_data['poll_option_text'] = ''; - $post_data['poll_vote_change'] = $post_data['poll_max_options'] = $post_data['poll_length'] = 0; - } - else - { - $post_data['poll_title'] = utf8_normalize_nfc(request_var('poll_title', '', true)); - $post_data['poll_length'] = request_var('poll_length', 0); - $post_data['poll_option_text'] = utf8_normalize_nfc(request_var('poll_option_text', '', true)); - $post_data['poll_max_options'] = request_var('poll_max_options', 1); - $post_data['poll_vote_change'] = ($auth->acl_get('f_votechg', $forum_id) && isset($_POST['poll_vote_change'])) ? 1 : 0; - } - - // If replying/quoting and last post id has changed - // give user option to continue submit or return to post - // notify and show user the post made between his request and the final submit - if (($mode == 'reply' || $mode == 'quote') && $post_data['topic_cur_post_id'] && $post_data['topic_cur_post_id'] != $post_data['topic_last_post_id']) - { - // Only do so if it is allowed forum-wide - if ($post_data['forum_flags'] & FORUM_FLAG_POST_REVIEW) - { - if (topic_review($topic_id, $forum_id, 'post_review', $post_data['topic_cur_post_id'])) + $sql = "SELECT * + FROM " . VOTE_DESC_TABLE . " vd, " . VOTE_RESULTS_TABLE . " vr + WHERE vd.topic_id = $topic_id + AND vr.vote_id = vd.vote_id + ORDER BY vr.vote_option_id"; + if ( !($result = $db->sql_query($sql)) ) { - $template->assign_var('S_POST_REVIEW', true); + message_die(GENERAL_ERROR, 'Could not obtain vote data for this topic', '', __LINE__, __FILE__, $sql); } - $submit = false; - $refresh = true; - } - } - - // Parse Attachments - before checksum is calculated - $message_parser->parse_attachments('fileupload', $mode, $forum_id, $submit, $preview, $refresh); - - // Grab md5 'checksum' of new message - $message_md5 = md5($message_parser->message); - - // Check checksum ... don't re-parse message if the same - $update_message = ($mode != 'edit' || $message_md5 != $post_data['post_checksum'] || $status_switch || strlen($post_data['bbcode_uid']) < BBCODE_UID_LEN) ? true : false; - - // Parse message - if ($update_message) - { - if (sizeof($message_parser->warn_msg)) - { - $error[] = implode('
    ', $message_parser->warn_msg); - $message_parser->warn_msg = array(); - } - - $message_parser->parse($post_data['enable_bbcode'], ($config['allow_post_links']) ? $post_data['enable_urls'] : false, $post_data['enable_smilies'], $img_status, $flash_status, $quote_status, $config['allow_post_links']); - - // On a refresh we do not care about message parsing errors - if (sizeof($message_parser->warn_msg) && $refresh) - { - $message_parser->warn_msg = array(); - } - } - else - { - $message_parser->bbcode_bitfield = $post_data['bbcode_bitfield']; - } - - if ($mode != 'edit' && !$preview && !$refresh && $config['flood_interval'] && !$auth->acl_get('f_ignoreflood', $forum_id)) - { - // Flood check - $last_post_time = 0; - - if ($user->data['is_registered']) - { - $last_post_time = $user->data['user_lastpost_time']; - } - else - { - $sql = 'SELECT post_time AS last_post_time - FROM ' . POSTS_TABLE . " - WHERE poster_ip = '" . $user->ip . "' - AND post_time > " . ($current_time - $config['flood_interval']); - $result = $db->sql_query_limit($sql, 1); - if ($row = $db->sql_fetchrow($result)) + $poll_options = array(); + $poll_results_sum = 0; + if ( $row = $db->sql_fetchrow($result) ) { - $last_post_time = $row['last_post_time']; + $poll_title = $row['vote_text']; + $poll_id = $row['vote_id']; + $poll_length = $row['vote_length'] / 86400; + + do + { + $poll_options[$row['vote_option_id']] = $row['vote_option_text']; + $poll_results_sum += $row['vote_result']; + } + while ( $row = $db->sql_fetchrow($result) ); } $db->sql_freeresult($result); - } - if ($last_post_time && ($current_time - $last_post_time) < intval($config['flood_interval'])) + $post_data['edit_poll'] = ( ( !$poll_results_sum || $is_auth['auth_mod'] ) && $post_data['first_post'] ) ? true : 0; + } + else { - $error[] = $user->lang['FLOOD_ERROR']; + $post_data['edit_poll'] = ($post_data['first_post'] && $is_auth['auth_pollcreate']) ? true : false; + } + + // + // Can this user edit/delete the post/poll? + // + if ( $post_info['poster_id'] != $userdata['user_id'] && !$is_auth['auth_mod'] ) + { + $message = ( $delete || $mode == 'delete' ) ? $lang['Delete_own_posts'] : $lang['Edit_own_posts']; + $message .= '

    ' . sprintf($lang['Click_return_topic'], '', ''); + + message_die(GENERAL_MESSAGE, $message); + } + else if ( !$post_data['last_post'] && !$is_auth['auth_mod'] && ( $mode == 'delete' || $delete ) ) + { + message_die(GENERAL_MESSAGE, $lang['Cannot_delete_replied']); + } + else if ( !$post_data['edit_poll'] && !$is_auth['auth_mod'] && ( $mode == 'poll_delete' || $poll_delete ) ) + { + message_die(GENERAL_MESSAGE, $lang['Cannot_delete_poll']); } } - - // Validate username - if (($post_data['username'] && !$user->data['is_registered']) || ($mode == 'edit' && $post_data['poster_id'] == ANONYMOUS && $post_data['username'] && $post_data['post_username'] && $post_data['post_username'] != $post_data['username'])) + else { - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - - if (($result = validate_username($post_data['username'], (!empty($post_data['post_username'])) ? $post_data['post_username'] : '')) !== false) + if ( $mode == 'quote' ) { - $user->add_lang('ucp'); - $error[] = $user->lang[$result . '_USERNAME']; + $topic_id = $post_info['topic_id']; } + if ( $mode == 'newtopic' ) + { + $post_data['topic_type'] = POST_NORMAL; + } + + $post_data['first_post'] = ( $mode == 'newtopic' ) ? true : 0; + $post_data['last_post'] = false; + $post_data['has_poll'] = false; + $post_data['edit_poll'] = false; + } + if ( $mode == 'poll_delete' && !isset($poll_id) ) + { + message_die(GENERAL_MESSAGE, $lang['No_such_post']); + } +} +else +{ + message_die(GENERAL_MESSAGE, $lang['No_such_post']); +} + +// +// The user is not authed, if they're not logged in then redirect +// them, else show them an error message +// +if ( !$is_auth[$is_auth_type] ) +{ + if ( $userdata['session_logged_in'] ) + { + message_die(GENERAL_MESSAGE, sprintf($lang['Sorry_' . $is_auth_type], $is_auth[$is_auth_type . "_type"])); } - if ($config['enable_post_confirm'] && !$user->data['is_registered'] && in_array($mode, array('quote', 'post', 'reply'))) + switch( $mode ) { - $confirm_id = request_var('confirm_id', ''); - $confirm_code = request_var('confirm_code', ''); + case 'newtopic': + $redirect = "mode=newtopic&" . POST_FORUM_URL . "=" . $forum_id; + break; + case 'reply': + case 'topicreview': + $redirect = "mode=reply&" . POST_TOPIC_URL . "=" . $topic_id; + break; + case 'quote': + case 'editpost': + $redirect = "mode=quote&" . POST_POST_URL ."=" . $post_id; + break; + } - $sql = 'SELECT code - FROM ' . CONFIRM_TABLE . " - WHERE confirm_id = '" . $db->sql_escape($confirm_id) . "' - AND session_id = '" . $db->sql_escape($user->session_id) . "' - AND confirm_type = " . CONFIRM_POST; - $result = $db->sql_query($sql); - $confirm_row = $db->sql_fetchrow($result); + redirect(append_sid("login.$phpEx?redirect=posting.$phpEx&" . $redirect, true)); +} + +// +// Set toggles for various options +// +if ( !$board_config['allow_html'] ) +{ + $html_on = 0; +} +else +{ + $html_on = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['disable_html']) ) ? 0 : TRUE ) : ( ( $userdata['user_id'] == ANONYMOUS ) ? $board_config['allow_html'] : $userdata['user_allowhtml'] ); +} + +if ( !$board_config['allow_bbcode'] ) +{ + $bbcode_on = 0; +} +else +{ + $bbcode_on = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['disable_bbcode']) ) ? 0 : TRUE ) : ( ( $userdata['user_id'] == ANONYMOUS ) ? $board_config['allow_bbcode'] : $userdata['user_allowbbcode'] ); +} + +if ( !$board_config['allow_smilies'] ) +{ + $smilies_on = 0; +} +else +{ + $smilies_on = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['disable_smilies']) ) ? 0 : TRUE ) : ( ( $userdata['user_id'] == ANONYMOUS ) ? $board_config['allow_smilies'] : $userdata['user_allowsmile'] ); +} + +if ( ($submit || $refresh) && $is_auth['auth_read']) +{ + $notify_user = ( !empty($HTTP_POST_VARS['notify']) ) ? TRUE : 0; +} +else +{ + if ( $mode != 'newtopic' && $userdata['session_logged_in'] && $is_auth['auth_read'] ) + { + $sql = "SELECT topic_id + FROM " . TOPICS_WATCH_TABLE . " + WHERE topic_id = $topic_id + AND user_id = " . $userdata['user_id']; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain topic watch information', '', __LINE__, __FILE__, $sql); + } + + $notify_user = ( $db->sql_fetchrow($result) ) ? TRUE : $userdata['user_notify']; $db->sql_freeresult($result); - - if (empty($confirm_row['code']) || strcasecmp($confirm_row['code'], $confirm_code) !== 0) - { - $error[] = $user->lang['CONFIRM_CODE_WRONG']; - } - else - { - $solved_captcha = true; - } - } - - // check form - if (($submit || $preview) && !check_form_key('posting')) - { - $error[] = $user->lang['FORM_INVALID']; - } - - // Parse subject - if (!$preview && !$refresh && utf8_clean_string($post_data['post_subject']) === '' && ($mode == 'post' || ($mode == 'edit' && $post_data['topic_first_post_id'] == $post_id))) - { - $error[] = $user->lang['EMPTY_SUBJECT']; - } - - $post_data['poll_last_vote'] = (isset($post_data['poll_last_vote'])) ? $post_data['poll_last_vote'] : 0; - - if ($post_data['poll_option_text'] && - ($mode == 'post' || ($mode == 'edit' && $post_id == $post_data['topic_first_post_id']/* && (!$post_data['poll_last_vote'] || $auth->acl_get('m_edit', $forum_id))*/)) - && $auth->acl_get('f_poll', $forum_id)) - { - $poll = array( - 'poll_title' => $post_data['poll_title'], - 'poll_length' => $post_data['poll_length'], - 'poll_max_options' => $post_data['poll_max_options'], - 'poll_option_text' => $post_data['poll_option_text'], - 'poll_start' => $post_data['poll_start'], - 'poll_last_vote' => $post_data['poll_last_vote'], - 'poll_vote_change' => $post_data['poll_vote_change'], - 'enable_bbcode' => $post_data['enable_bbcode'], - 'enable_urls' => $post_data['enable_urls'], - 'enable_smilies' => $post_data['enable_smilies'], - 'img_status' => $img_status - ); - - $message_parser->parse_poll($poll); - - $post_data['poll_options'] = (isset($poll['poll_options'])) ? $poll['poll_options'] : ''; - $post_data['poll_title'] = (isset($poll['poll_title'])) ? $poll['poll_title'] : ''; - - /* We reset votes, therefore also allow removing options - if ($post_data['poll_last_vote'] && ($poll['poll_options_size'] < $orig_poll_options_size)) - { - $message_parser->warn_msg[] = $user->lang['NO_DELETE_POLL_OPTIONS']; - }*/ } else { - $poll = array(); - } - - // Check topic type - if ($post_data['topic_type'] != POST_NORMAL && ($mode == 'post' || ($mode == 'edit' && $post_data['topic_first_post_id'] == $post_id))) - { - switch ($post_data['topic_type']) - { - case POST_GLOBAL: - case POST_ANNOUNCE: - $auth_option = 'f_announce'; - break; - - case POST_STICKY: - $auth_option = 'f_sticky'; - break; - - default: - $auth_option = ''; - break; - } - - if (!$auth->acl_get($auth_option, $forum_id)) - { - // There is a special case where a user edits his post whereby the topic type got changed by an admin/mod. - // Another case would be a mod not having sticky permissions for example but edit permissions. - if ($mode == 'edit') - { - // To prevent non-authed users messing around with the topic type we reset it to the original one. - $post_data['topic_type'] = $post_data['orig_topic_type']; - } - else - { - $error[] = $user->lang['CANNOT_POST_' . str_replace('F_', '', strtoupper($auth_option))]; - } - } - } - - if (sizeof($message_parser->warn_msg)) - { - $error[] = implode('
    ', $message_parser->warn_msg); - } - - // DNSBL check - if ($config['check_dnsbl'] && !$refresh) - { - if (($dnsbl = $user->check_dnsbl('post')) !== false) - { - $error[] = sprintf($user->lang['IP_BLACKLISTED'], $user->ip, $dnsbl[1]); - } - } - - // Store message, sync counters - if (!sizeof($error) && $submit) - { - // Check if we want to de-globalize the topic... and ask for new forum - if ($post_data['topic_type'] != POST_GLOBAL) - { - $sql = 'SELECT topic_type, forum_id - FROM ' . TOPICS_TABLE . " - WHERE topic_id = $topic_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row && !$row['forum_id'] && $row['topic_type'] == POST_GLOBAL) - { - $to_forum_id = request_var('to_forum_id', 0); - - if ($to_forum_id) - { - $sql = 'SELECT forum_type - FROM ' . FORUMS_TABLE . ' - WHERE forum_id = ' . $to_forum_id; - $result = $db->sql_query($sql); - $forum_type = (int) $db->sql_fetchfield('forum_type'); - $db->sql_freeresult($result); - - if ($forum_type != FORUM_POST || !$auth->acl_get('f_post', $to_forum_id)) - { - $to_forum_id = 0; - } - } - - if (!$to_forum_id) - { - include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); - - $template->assign_vars(array( - 'S_FORUM_SELECT' => make_forum_select(false, false, false, true, true, true), - 'S_UNGLOBALISE' => true) - ); - - $submit = false; - $refresh = true; - } - else - { - if (!$auth->acl_get('f_post', $to_forum_id)) - { - // This will only be triggered if the user tried to trick the forum. - trigger_error('NOT_AUTHORISED'); - } - - $forum_id = $to_forum_id; - } - } - } - - if ($submit) - { - // Lock/Unlock Topic - $change_topic_status = $post_data['topic_status']; - $perm_lock_unlock = ($auth->acl_get('m_lock', $forum_id) || ($auth->acl_get('f_user_lock', $forum_id) && $user->data['is_registered'] && !empty($post_data['topic_poster']) && $user->data['user_id'] == $post_data['topic_poster'] && $post_data['topic_status'] == ITEM_UNLOCKED)) ? true : false; - - if ($post_data['topic_status'] == ITEM_LOCKED && !$topic_lock && $perm_lock_unlock) - { - $change_topic_status = ITEM_UNLOCKED; - } - else if ($post_data['topic_status'] == ITEM_UNLOCKED && $topic_lock && $perm_lock_unlock) - { - $change_topic_status = ITEM_LOCKED; - } - - if ($change_topic_status != $post_data['topic_status']) - { - $sql = 'UPDATE ' . TOPICS_TABLE . " - SET topic_status = $change_topic_status - WHERE topic_id = $topic_id - AND topic_moved_id = 0"; - $db->sql_query($sql); - - $user_lock = ($auth->acl_get('f_user_lock', $forum_id) && $user->data['is_registered'] && $user->data['user_id'] == $post_data['topic_poster']) ? 'USER_' : ''; - - add_log('mod', $forum_id, $topic_id, 'LOG_' . $user_lock . (($change_topic_status == ITEM_LOCKED) ? 'LOCK' : 'UNLOCK'), $post_data['topic_title']); - } - - // Lock/Unlock Post Edit - if ($mode == 'edit' && $post_data['post_edit_locked'] == ITEM_LOCKED && !$post_lock && $auth->acl_get('m_edit', $forum_id)) - { - $post_data['post_edit_locked'] = ITEM_UNLOCKED; - } - else if ($mode == 'edit' && $post_data['post_edit_locked'] == ITEM_UNLOCKED && $post_lock && $auth->acl_get('m_edit', $forum_id)) - { - $post_data['post_edit_locked'] = ITEM_LOCKED; - } - - $data = array( - 'topic_title' => (empty($post_data['topic_title'])) ? $post_data['post_subject'] : $post_data['topic_title'], - 'topic_first_post_id' => (isset($post_data['topic_first_post_id'])) ? (int) $post_data['topic_first_post_id'] : 0, - 'topic_last_post_id' => (isset($post_data['topic_last_post_id'])) ? (int) $post_data['topic_last_post_id'] : 0, - 'topic_time_limit' => (int) $post_data['topic_time_limit'], - 'topic_attachment' => (isset($post_data['topic_attachment'])) ? (int) $post_data['topic_attachment'] : 0, - 'post_id' => (int) $post_id, - 'topic_id' => (int) $topic_id, - 'forum_id' => (int) $forum_id, - 'icon_id' => (int) $post_data['icon_id'], - 'poster_id' => (int) $post_data['poster_id'], - 'enable_sig' => (bool) $post_data['enable_sig'], - 'enable_bbcode' => (bool) $post_data['enable_bbcode'], - 'enable_smilies' => (bool) $post_data['enable_smilies'], - 'enable_urls' => (bool) $post_data['enable_urls'], - 'enable_indexing' => (bool) $post_data['enable_indexing'], - 'message_md5' => (string) $message_md5, - 'post_time' => (isset($post_data['post_time'])) ? (int) $post_data['post_time'] : $current_time, - 'post_checksum' => (isset($post_data['post_checksum'])) ? (string) $post_data['post_checksum'] : '', - 'post_edit_reason' => $post_data['post_edit_reason'], - 'post_edit_user' => ($mode == 'edit') ? $user->data['user_id'] : ((isset($post_data['post_edit_user'])) ? (int) $post_data['post_edit_user'] : 0), - 'forum_parents' => $post_data['forum_parents'], - 'forum_name' => $post_data['forum_name'], - 'notify' => $notify, - 'notify_set' => $post_data['notify_set'], - 'poster_ip' => (isset($post_data['poster_ip'])) ? $post_data['poster_ip'] : $user->ip, - 'post_edit_locked' => (int) $post_data['post_edit_locked'], - 'bbcode_bitfield' => $message_parser->bbcode_bitfield, - 'bbcode_uid' => $message_parser->bbcode_uid, - 'message' => $message_parser->message, - 'attachment_data' => $message_parser->attachment_data, - 'filename_data' => $message_parser->filename_data, - - 'topic_approved' => (isset($post_data['topic_approved'])) ? $post_data['topic_approved'] : false, - 'post_approved' => (isset($post_data['post_approved'])) ? $post_data['post_approved'] : false, - ); - - if ($mode == 'edit') - { - $data['topic_replies_real'] = $post_data['topic_replies_real']; - $data['topic_replies'] = $post_data['topic_replies']; - } - - unset($message_parser); - - $redirect_url = submit_post($mode, $post_data['post_subject'], $post_data['username'], $post_data['topic_type'], $poll, $data, $update_message); - $post_need_approval = (!$auth->acl_get('f_noapprove', $data['forum_id']) && !$auth->acl_get('m_approve', $data['forum_id'])) ? true : false; - - // If the post need approval we will wait a lot longer. - if ($post_need_approval) - { - meta_refresh(10, $redirect_url); - $message = ($mode == 'edit') ? $user->lang['POST_EDITED_MOD'] : $user->lang['POST_STORED_MOD']; - $message .= (($user->data['user_id'] == ANONYMOUS) ? '' : ' '. $user->lang['POST_APPROVAL_NOTIFY']); - } - else - { - meta_refresh(3, $redirect_url); - - $message = ($mode == 'edit') ? 'POST_EDITED' : 'POST_STORED'; - $message = $user->lang[$message] . '

    ' . sprintf($user->lang['VIEW_MESSAGE'], '', ''); - } - - $message .= '

    ' . sprintf($user->lang['RETURN_FORUM'], '', ''); - trigger_error($message); - } + $notify_user = ( $userdata['session_logged_in'] && $is_auth['auth_read'] ) ? $userdata['user_notify'] : 0; } } -// Preview -if (!sizeof($error) && $preview) +$attach_sig = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['attach_sig']) ) ? TRUE : 0 ) : ( ( $userdata['user_id'] == ANONYMOUS ) ? 0 : $userdata['user_attachsig'] ); + +// -------------------- +// What shall we do? +// +if ( ( $delete || $poll_delete || $mode == 'delete' ) && !$confirm ) { - $post_data['post_time'] = ($mode == 'edit') ? $post_data['post_time'] : $current_time; - - $preview_message = $message_parser->format_display($post_data['enable_bbcode'], $post_data['enable_urls'], $post_data['enable_smilies'], false); - - $preview_signature = ($mode == 'edit') ? $post_data['user_sig'] : $user->data['user_sig']; - $preview_signature_uid = ($mode == 'edit') ? $post_data['user_sig_bbcode_uid'] : $user->data['user_sig_bbcode_uid']; - $preview_signature_bitfield = ($mode == 'edit') ? $post_data['user_sig_bbcode_bitfield'] : $user->data['user_sig_bbcode_bitfield']; - - // Signature - if ($post_data['enable_sig'] && $config['allow_sig'] && $preview_signature && $auth->acl_get('f_sigs', $forum_id)) - { - $parse_sig = new parse_message($preview_signature); - $parse_sig->bbcode_uid = $preview_signature_uid; - $parse_sig->bbcode_bitfield = $preview_signature_bitfield; - - // Not sure about parameters for bbcode/smilies/urls... in signatures - $parse_sig->format_display($config['allow_sig_bbcode'], true, $config['allow_sig_smilies']); - $preview_signature = $parse_sig->message; - unset($parse_sig); - } - else - { - $preview_signature = ''; - } - - $preview_subject = censor_text($post_data['post_subject']); - - // Poll Preview - if (!$poll_delete && ($mode == 'post' || ($mode == 'edit' && $post_id == $post_data['topic_first_post_id']/* && (!$post_data['poll_last_vote'] || $auth->acl_get('m_edit', $forum_id))*/)) - && $auth->acl_get('f_poll', $forum_id)) - { - $parse_poll = new parse_message($post_data['poll_title']); - $parse_poll->bbcode_uid = $message_parser->bbcode_uid; - $parse_poll->bbcode_bitfield = $message_parser->bbcode_bitfield; - - $parse_poll->format_display($post_data['enable_bbcode'], $post_data['enable_urls'], $post_data['enable_smilies']); - - if ($post_data['poll_length']) - { - $poll_end = ($post_data['poll_length'] * 86400) + (($post_data['poll_start']) ? $post_data['poll_start'] : time()); - } - - $template->assign_vars(array( - 'S_HAS_POLL_OPTIONS' => (sizeof($post_data['poll_options'])), - 'S_IS_MULTI_CHOICE' => ($post_data['poll_max_options'] > 1) ? true : false, - - 'POLL_QUESTION' => $parse_poll->message, - - 'L_POLL_LENGTH' => ($post_data['poll_length']) ? sprintf($user->lang['POLL_RUN_TILL'], $user->format_date($poll_end)) : '', - 'L_MAX_VOTES' => ($post_data['poll_max_options'] == 1) ? $user->lang['MAX_OPTION_SELECT'] : sprintf($user->lang['MAX_OPTIONS_SELECT'], $post_data['poll_max_options'])) - ); - - $parse_poll->message = implode("\n", $post_data['poll_options']); - $parse_poll->format_display($post_data['enable_bbcode'], $post_data['enable_urls'], $post_data['enable_smilies']); - $preview_poll_options = explode('
    ', $parse_poll->message); - unset($parse_poll); - - foreach ($preview_poll_options as $key => $option) - { - $template->assign_block_vars('poll_option', array( - 'POLL_OPTION_CAPTION' => $option, - 'POLL_OPTION_ID' => $key + 1) - ); - } - unset($preview_poll_options); - } - - // Attachment Preview - if (sizeof($message_parser->attachment_data)) - { - $template->assign_var('S_HAS_ATTACHMENTS', true); - - $update_count = array(); - $attachment_data = $message_parser->attachment_data; - - parse_attachments($forum_id, $preview_message, $attachment_data, $update_count, true); - - foreach ($attachment_data as $i => $attachment) - { - $template->assign_block_vars('attachment', array( - 'DISPLAY_ATTACHMENT' => $attachment) - ); - } - unset($attachment_data); - } - - if (!sizeof($error)) - { - $template->assign_vars(array( - 'PREVIEW_SUBJECT' => $preview_subject, - 'PREVIEW_MESSAGE' => $preview_message, - 'PREVIEW_SIGNATURE' => $preview_signature, - - 'S_DISPLAY_PREVIEW' => true) - ); - } -} - -// Decode text for message display -$post_data['bbcode_uid'] = ($mode == 'quote' && !$preview && !$refresh && !sizeof($error)) ? $post_data['bbcode_uid'] : $message_parser->bbcode_uid; -$message_parser->decode_message($post_data['bbcode_uid']); - -if ($mode == 'quote' && !$submit && !$preview && !$refresh) -{ - $message_parser->message = '[quote="' . $post_data['quote_username'] . '"]' . censor_text(trim($message_parser->message)) . "[/quote]\n"; -} - -if (($mode == 'reply' || $mode == 'quote') && !$submit && !$preview && !$refresh) -{ - $post_data['post_subject'] = ((strpos($post_data['post_subject'], 'Re: ') !== 0) ? 'Re: ' : '') . censor_text($post_data['post_subject']); -} - -$attachment_data = $message_parser->attachment_data; -$filename_data = $message_parser->filename_data; -$post_data['post_text'] = $message_parser->message; - -if (sizeof($post_data['poll_options']) && $post_data['poll_title']) -{ - $message_parser->message = $post_data['poll_title']; - $message_parser->bbcode_uid = $post_data['bbcode_uid']; - - $message_parser->decode_message(); - $post_data['poll_title'] = $message_parser->message; - - $message_parser->message = implode("\n", $post_data['poll_options']); - $message_parser->decode_message(); - $post_data['poll_options'] = explode("\n", $message_parser->message); -} -unset($message_parser); - -// MAIN POSTING PAGE BEGINS HERE - -// Forum moderators? -$moderators = array(); -get_moderators($moderators, $forum_id); - -// Generate smiley listing -generate_smilies('inline', $forum_id); - -// Generate inline attachment select box -posting_gen_inline_attachments($attachment_data); - -// Do show topic type selection only in first post. -$topic_type_toggle = false; - -if ($mode == 'post' || ($mode == 'edit' && $post_id == $post_data['topic_first_post_id'])) -{ - $topic_type_toggle = posting_gen_topic_types($forum_id, $post_data['topic_type']); -} - -$s_topic_icons = false; -if ($post_data['enable_icons'] && $auth->acl_get('f_icons', $forum_id)) -{ - $s_topic_icons = posting_gen_topic_icons($mode, $post_data['icon_id']); -} - -$bbcode_checked = (isset($post_data['enable_bbcode'])) ? !$post_data['enable_bbcode'] : (($config['allow_bbcode']) ? !$user->optionget('bbcode') : 1); -$smilies_checked = (isset($post_data['enable_smilies'])) ? !$post_data['enable_smilies'] : (($config['allow_smilies']) ? !$user->optionget('smilies') : 1); -$urls_checked = (isset($post_data['enable_urls'])) ? !$post_data['enable_urls'] : 0; -$sig_checked = $post_data['enable_sig']; -$lock_topic_checked = (isset($topic_lock) && $topic_lock) ? $topic_lock : (($post_data['topic_status'] == ITEM_LOCKED) ? 1 : 0); -$lock_post_checked = (isset($post_lock)) ? $post_lock : $post_data['post_edit_locked']; - -// If the user is replying or posting and not already watching this topic but set to always being notified we need to overwrite this setting -$notify_set = ($mode != 'edit' && $config['allow_topic_notify'] && $user->data['is_registered'] && !$post_data['notify_set']) ? $user->data['user_notify'] : $post_data['notify_set']; -$notify_checked = (isset($notify)) ? $notify : (($mode == 'post') ? $user->data['user_notify'] : $notify_set); - -// Page title & action URL, include session_id for security purpose -$s_action = append_sid("{$phpbb_root_path}posting.$phpEx", "mode=$mode&f=$forum_id", true, $user->session_id); -$s_action .= ($topic_id) ? "&t=$topic_id" : ''; -$s_action .= ($post_id) ? "&p=$post_id" : ''; - -switch ($mode) -{ - case 'post': - $page_title = $user->lang['POST_TOPIC']; - break; - - case 'quote': - case 'reply': - $page_title = $user->lang['POST_REPLY']; - break; - - case 'delete': - case 'edit': - $page_title = $user->lang['EDIT_POST']; - break; -} - -// Build Navigation Links -generate_forum_nav($post_data); - -// Build Forum Rules -generate_forum_rules($post_data); - -if ($config['enable_post_confirm'] && !$user->data['is_registered'] && $solved_captcha === false && ($mode == 'post' || $mode == 'reply' || $mode == 'quote')) -{ - // Show confirm image - $sql = 'DELETE FROM ' . CONFIRM_TABLE . " - WHERE session_id = '" . $db->sql_escape($user->session_id) . "' - AND confirm_type = " . CONFIRM_POST; - $db->sql_query($sql); - - // Generate code - $code = gen_rand_string(mt_rand(5, 8)); - $confirm_id = md5(unique_id($user->ip)); - $seed = hexdec(substr(unique_id(), 4, 10)); - - // compute $seed % 0x7fffffff - $seed -= 0x7fffffff * floor($seed / 0x7fffffff); - - $sql = 'INSERT INTO ' . CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'confirm_id' => (string) $confirm_id, - 'session_id' => (string) $user->session_id, - 'confirm_type' => (int) CONFIRM_POST, - 'code' => (string) $code, - 'seed' => (int) $seed) - ); - $db->sql_query($sql); - - $template->assign_vars(array( - 'S_CONFIRM_CODE' => true, - 'CONFIRM_ID' => $confirm_id, - 'CONFIRM_IMAGE' => '', - 'L_POST_CONFIRM_EXPLAIN' => sprintf($user->lang['POST_CONFIRM_EXPLAIN'], '', ''), - )); -} - -$s_hidden_fields = ($mode == 'reply' || $mode == 'quote') ? '' : ''; -$s_hidden_fields .= ''; -$s_hidden_fields .= ($draft_id || isset($_REQUEST['draft_loaded'])) ? '' : ''; - -// Add the confirm id/code pair to the hidden fields, else an error is displayed on next submit/preview -if ($solved_captcha !== false) -{ - $s_hidden_fields .= build_hidden_fields(array( - 'confirm_id' => request_var('confirm_id', ''), - 'confirm_code' => request_var('confirm_code', '')) - ); -} - -$form_enctype = (@ini_get('file_uploads') == '0' || strtolower(@ini_get('file_uploads')) == 'off' || @ini_get('file_uploads') == '0' || !$config['allow_attachments'] || !$auth->acl_get('u_attach') || !$auth->acl_get('f_attach', $forum_id)) ? '' : ' enctype="multipart/form-data"'; -add_form_key('posting'); - - -// Start assigning vars for main posting page ... -$template->assign_vars(array( - 'L_POST_A' => $page_title, - 'L_ICON' => ($mode == 'reply' || $mode == 'quote' || ($mode == 'edit' && $post_id != $post_data['topic_first_post_id'])) ? $user->lang['POST_ICON'] : $user->lang['TOPIC_ICON'], - 'L_MESSAGE_BODY_EXPLAIN' => (intval($config['max_post_chars'])) ? sprintf($user->lang['MESSAGE_BODY_EXPLAIN'], intval($config['max_post_chars'])) : '', - - 'FORUM_NAME' => $post_data['forum_name'], - 'FORUM_DESC' => ($post_data['forum_desc']) ? generate_text_for_display($post_data['forum_desc'], $post_data['forum_desc_uid'], $post_data['forum_desc_bitfield'], $post_data['forum_desc_options']) : '', - 'TOPIC_TITLE' => censor_text($post_data['topic_title']), - 'MODERATORS' => (sizeof($moderators)) ? implode(', ', $moderators[$forum_id]) : '', - 'USERNAME' => ((!$preview && $mode != 'quote') || $preview) ? $post_data['username'] : '', - 'SUBJECT' => $post_data['post_subject'], - 'MESSAGE' => $post_data['post_text'], - 'BBCODE_STATUS' => ($bbcode_status) ? sprintf($user->lang['BBCODE_IS_ON'], '', '') : sprintf($user->lang['BBCODE_IS_OFF'], '', ''), - 'IMG_STATUS' => ($img_status) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'], - 'FLASH_STATUS' => ($flash_status) ? $user->lang['FLASH_IS_ON'] : $user->lang['FLASH_IS_OFF'], - 'SMILIES_STATUS' => ($smilies_status) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'], - 'URL_STATUS' => ($bbcode_status && $url_status) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'], - 'MINI_POST_IMG' => $user->img('icon_post_target', $user->lang['POST']), - 'POST_DATE' => ($post_data['post_time']) ? $user->format_date($post_data['post_time']) : '', - 'ERROR' => (sizeof($error)) ? implode('
    ', $error) : '', - 'TOPIC_TIME_LIMIT' => (int) $post_data['topic_time_limit'], - 'EDIT_REASON' => $post_data['post_edit_reason'], - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id"), - 'U_VIEW_TOPIC' => ($mode != 'post') ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id") : '', - 'U_PROGRESS_BAR' => append_sid("{$phpbb_root_path}posting.$phpEx", "f=$forum_id&mode=popup"), - 'UA_PROGRESS_BAR' => addslashes(append_sid("{$phpbb_root_path}posting.$phpEx", "f=$forum_id&mode=popup")), - - 'S_PRIVMSGS' => false, - 'S_CLOSE_PROGRESS_WINDOW' => (isset($_POST['add_file'])) ? true : false, - 'S_EDIT_POST' => ($mode == 'edit') ? true : false, - 'S_EDIT_REASON' => ($mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? true : false, - 'S_DISPLAY_USERNAME' => (!$user->data['is_registered'] || ($mode == 'edit' && $post_data['poster_id'] == ANONYMOUS)) ? true : false, - 'S_SHOW_TOPIC_ICONS' => $s_topic_icons, - 'S_DELETE_ALLOWED' => ($mode == 'edit' && (($post_id == $post_data['topic_last_post_id'] && $post_data['poster_id'] == $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id)) || $auth->acl_get('m_delete', $forum_id))) ? true : false, - 'S_BBCODE_ALLOWED' => $bbcode_status, - 'S_BBCODE_CHECKED' => ($bbcode_checked) ? ' checked="checked"' : '', - 'S_SMILIES_ALLOWED' => $smilies_status, - 'S_SMILIES_CHECKED' => ($smilies_checked) ? ' checked="checked"' : '', - 'S_SIG_ALLOWED' => ($auth->acl_get('f_sigs', $forum_id) && $config['allow_sig'] && $user->data['is_registered']) ? true : false, - 'S_SIGNATURE_CHECKED' => ($sig_checked) ? ' checked="checked"' : '', - 'S_NOTIFY_ALLOWED' => (!$user->data['is_registered'] || ($mode == 'edit' && $user->data['user_id'] != $post_data['poster_id']) || !$config['allow_topic_notify'] || !$config['email_enable']) ? false : true, - 'S_NOTIFY_CHECKED' => ($notify_checked) ? ' checked="checked"' : '', - 'S_LOCK_TOPIC_ALLOWED' => (($mode == 'edit' || $mode == 'reply' || $mode == 'quote') && ($auth->acl_get('m_lock', $forum_id) || ($auth->acl_get('f_user_lock', $forum_id) && $user->data['is_registered'] && !empty($post_data['topic_poster']) && $user->data['user_id'] == $post_data['topic_poster'] && $post_data['topic_status'] == ITEM_UNLOCKED))) ? true : false, - 'S_LOCK_TOPIC_CHECKED' => ($lock_topic_checked) ? ' checked="checked"' : '', - 'S_LOCK_POST_ALLOWED' => ($mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? true : false, - 'S_LOCK_POST_CHECKED' => ($lock_post_checked) ? ' checked="checked"' : '', - 'S_LINKS_ALLOWED' => $url_status, - 'S_MAGIC_URL_CHECKED' => ($urls_checked) ? ' checked="checked"' : '', - 'S_TYPE_TOGGLE' => $topic_type_toggle, - 'S_SAVE_ALLOWED' => ($auth->acl_get('u_savedrafts') && $user->data['is_registered'] && $mode != 'edit') ? true : false, - 'S_HAS_DRAFTS' => ($auth->acl_get('u_savedrafts') && $user->data['is_registered'] && $post_data['drafts']) ? true : false, - 'S_FORM_ENCTYPE' => $form_enctype, - - 'S_BBCODE_IMG' => $img_status, - 'S_BBCODE_URL' => $url_status, - 'S_BBCODE_FLASH' => $flash_status, - 'S_BBCODE_QUOTE' => $quote_status, - - 'S_POST_ACTION' => $s_action, - 'S_HIDDEN_FIELDS' => $s_hidden_fields) -); - -// Build custom bbcodes array -display_custom_bbcodes(); - -// Poll entry -if (($mode == 'post' || ($mode == 'edit' && $post_id == $post_data['topic_first_post_id']/* && (!$post_data['poll_last_vote'] || $auth->acl_get('m_edit', $forum_id))*/)) - && $auth->acl_get('f_poll', $forum_id)) -{ - $template->assign_vars(array( - 'S_SHOW_POLL_BOX' => true, - 'S_POLL_VOTE_CHANGE' => ($auth->acl_get('f_votechg', $forum_id)), - 'S_POLL_DELETE' => ($mode == 'edit' && sizeof($post_data['poll_options']) && ((!$post_data['poll_last_vote'] && $post_data['poster_id'] == $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id)) || $auth->acl_get('m_delete', $forum_id))), - 'S_POLL_DELETE_CHECKED' => (!empty($poll_delete)) ? true : false, - - 'L_POLL_OPTIONS_EXPLAIN' => sprintf($user->lang['POLL_OPTIONS_' . (($mode == 'edit') ? 'EDIT_' : '') . 'EXPLAIN'], $config['max_poll_options']), - - 'VOTE_CHANGE_CHECKED' => (!empty($post_data['poll_vote_change'])) ? ' checked="checked"' : '', - 'POLL_TITLE' => (isset($post_data['poll_title'])) ? $post_data['poll_title'] : '', - 'POLL_OPTIONS' => (!empty($post_data['poll_options'])) ? implode("\n", $post_data['poll_options']) : '', - 'POLL_MAX_OPTIONS' => (isset($post_data['poll_max_options'])) ? (int) $post_data['poll_max_options'] : 1, - 'POLL_LENGTH' => $post_data['poll_length']) - ); -} - -// Attachment entry -// Not using acl_gets here, because it is using OR logic -if ($auth->acl_get('f_attach', $forum_id) && $auth->acl_get('u_attach') && $config['allow_attachments'] && $form_enctype) -{ - posting_gen_attachment_entry($attachment_data, $filename_data); -} - -// Output page ... -page_header($page_title); - -$template->set_filenames(array( - 'body' => 'posting_body.html') -); - -make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); - -// Topic review -if ($mode == 'reply' || $mode == 'quote') -{ - if (topic_review($topic_id, $forum_id)) - { - $template->assign_var('S_DISPLAY_REVIEW', true); - } -} - -page_footer(); - -/** -* Show upload popup (progress bar) -*/ -function upload_popup($forum_style = 0) -{ - global $template, $user; - - ($forum_style) ? $user->setup('posting', $forum_style) : $user->setup('posting'); - - page_header($user->lang['PROGRESS_BAR']); + // + // Confirm deletion + // + $s_hidden_fields = ''; + $s_hidden_fields .= ( $delete || $mode == "delete" ) ? '' : ''; + $s_hidden_fields .= ''; + + $l_confirm = ( $delete || $mode == 'delete' ) ? $lang['Confirm_delete'] : $lang['Confirm_delete_poll']; + + // + // Output confirmation page + // + include($phpbb_root_path . 'includes/page_header.'.$phpEx); $template->set_filenames(array( - 'popup' => 'posting_progress_bar.html') + 'confirm_body' => 'confirm_body.tpl') ); $template->assign_vars(array( - 'PROGRESS_BAR' => $user->img('upload_bar', $user->lang['UPLOAD_IN_PROGRESS'])) + 'MESSAGE_TITLE' => $lang['Information'], + 'MESSAGE_TEXT' => $l_confirm, + + 'L_YES' => $lang['Yes'], + 'L_NO' => $lang['No'], + + 'S_CONFIRM_ACTION' => append_sid("posting.$phpEx"), + 'S_HIDDEN_FIELDS' => $s_hidden_fields) ); - $template->display('popup'); + $template->pparse('confirm_body'); + + include($phpbb_root_path . 'includes/page_tail.'.$phpEx); } - -/** -* Do the various checks required for removing posts as well as removing it -*/ -function handle_post_delete($forum_id, $topic_id, $post_id, &$post_data) +else if ( $mode == 'vote' ) { - global $user, $db, $auth; - global $phpbb_root_path, $phpEx; - - // If moderator removing post or user itself removing post, present a confirmation screen - if ($auth->acl_get('m_delete', $forum_id) || ($post_data['poster_id'] == $user->data['user_id'] && $user->data['is_registered'] && $auth->acl_get('f_delete', $forum_id) && $post_id == $post_data['topic_last_post_id'])) + // + // Vote in a poll + // + if ( !empty($HTTP_POST_VARS['vote_id']) ) { - $s_hidden_fields = build_hidden_fields(array( - 'p' => $post_id, - 'f' => $forum_id, - 'mode' => 'delete') - ); + $vote_option_id = intval($HTTP_POST_VARS['vote_id']); - if (confirm_box(true)) + $sql = "SELECT vd.vote_id + FROM " . VOTE_DESC_TABLE . " vd, " . VOTE_RESULTS_TABLE . " vr + WHERE vd.topic_id = $topic_id + AND vr.vote_id = vd.vote_id + AND vr.vote_option_id = $vote_option_id + GROUP BY vd.vote_id"; + if ( !($result = $db->sql_query($sql)) ) { - $data = array( - 'topic_first_post_id' => $post_data['topic_first_post_id'], - 'topic_last_post_id' => $post_data['topic_last_post_id'], - 'topic_replies_real' => $post_data['topic_replies_real'], - 'topic_approved' => $post_data['topic_approved'], - 'topic_type' => $post_data['topic_type'], - 'post_approved' => $post_data['post_approved'], - 'post_reported' => $post_data['post_reported'], - 'post_time' => $post_data['post_time'], - 'poster_id' => $post_data['poster_id'], - 'post_postcount' => $post_data['post_postcount'] - ); + message_die(GENERAL_ERROR, 'Could not obtain vote data for this topic', '', __LINE__, __FILE__, $sql); + } - $next_post_id = delete_post($forum_id, $topic_id, $post_id, $data); + if ( $vote_info = $db->sql_fetchrow($result) ) + { + $vote_id = $vote_info['vote_id']; - if ($next_post_id === false) + $sql = "SELECT * + FROM " . VOTE_USERS_TABLE . " + WHERE vote_id = $vote_id + AND vote_user_id = " . $userdata['user_id']; + if ( !($result2 = $db->sql_query($sql)) ) { - add_log('mod', $forum_id, $topic_id, 'LOG_DELETE_TOPIC', $post_data['topic_title']); + message_die(GENERAL_ERROR, 'Could not obtain user vote data for this topic', '', __LINE__, __FILE__, $sql); + } - $meta_info = append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id"); - $message = $user->lang['POST_DELETED']; + if ( !($row = $db->sql_fetchrow($result2)) ) + { + $sql = "UPDATE " . VOTE_RESULTS_TABLE . " + SET vote_result = vote_result + 1 + WHERE vote_id = $vote_id + AND vote_option_id = $vote_option_id"; + if ( !$db->sql_query($sql, BEGIN_TRANSACTION) ) + { + message_die(GENERAL_ERROR, 'Could not update poll result', '', __LINE__, __FILE__, $sql); + } + + $sql = "INSERT INTO " . VOTE_USERS_TABLE . " (vote_id, vote_user_id, vote_user_ip) + VALUES ($vote_id, " . $userdata['user_id'] . ", '$user_ip')"; + if ( !$db->sql_query($sql, END_TRANSACTION) ) + { + message_die(GENERAL_ERROR, "Could not insert user_id for poll", "", __LINE__, __FILE__, $sql); + } + + $message = $lang['Vote_cast']; } else { - add_log('mod', $forum_id, $topic_id, 'LOG_DELETE_POST', $post_data['post_subject']); - - $meta_info = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&p=$next_post_id") . "#p$next_post_id"; - $message = $user->lang['POST_DELETED'] . '

    ' . sprintf($user->lang['RETURN_TOPIC'], '', ''); + $message = $lang['Already_voted']; } - - meta_refresh(3, $meta_info); - $message .= '

    ' . sprintf($user->lang['RETURN_FORUM'], '', ''); - trigger_error($message); + $db->sql_freeresult($result2); } else { - confirm_box(false, 'DELETE_POST', $s_hidden_fields); + $message = $lang['No_vote_option']; + } + $db->sql_freeresult($result); + + $template->assign_vars(array( + 'META' => '') + ); + $message .= '

    ' . sprintf($lang['Click_view_message'], '', ''); + message_die(GENERAL_MESSAGE, $message); + } + else + { + redirect(append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id", true)); + } +} +else if ( $submit || $confirm ) +{ + // + // Submit post/vote (newtopic, edit, reply, etc.) + // + $return_message = ''; + $return_meta = ''; + + // session id check + if ($sid == '' || $sid != $userdata['session_id']) + { + $error_msg .= (!empty($error_msg)) ? '
    ' . $lang['Session_invalid'] : $lang['Session_invalid']; + } + + switch ( $mode ) + { + case 'editpost': + case 'newtopic': + case 'reply': + $username = ( !empty($HTTP_POST_VARS['username']) ) ? $HTTP_POST_VARS['username'] : ''; + $subject = ( !empty($HTTP_POST_VARS['subject']) ) ? trim($HTTP_POST_VARS['subject']) : ''; + $message = ( !empty($HTTP_POST_VARS['message']) ) ? $HTTP_POST_VARS['message'] : ''; + $poll_title = ( isset($HTTP_POST_VARS['poll_title']) && $is_auth['auth_pollcreate'] ) ? $HTTP_POST_VARS['poll_title'] : ''; + $poll_options = ( isset($HTTP_POST_VARS['poll_option_text']) && $is_auth['auth_pollcreate'] ) ? $HTTP_POST_VARS['poll_option_text'] : ''; + $poll_length = ( isset($HTTP_POST_VARS['poll_length']) && $is_auth['auth_pollcreate'] ) ? $HTTP_POST_VARS['poll_length'] : ''; + $bbcode_uid = ''; + + prepare_post($mode, $post_data, $bbcode_on, $html_on, $smilies_on, $error_msg, $username, $bbcode_uid, $subject, $message, $poll_title, $poll_options, $poll_length); + + if ( $error_msg == '' ) + { + $topic_type = ( $topic_type != $post_data['topic_type'] && !$is_auth['auth_sticky'] && !$is_auth['auth_announce'] ) ? $post_data['topic_type'] : $topic_type; + + submit_post($mode, $post_data, $return_message, $return_meta, $forum_id, $topic_id, $post_id, $poll_id, $topic_type, $bbcode_on, $html_on, $smilies_on, $attach_sig, $bbcode_uid, str_replace("\'", "''", $username), str_replace("\'", "''", $subject), str_replace("\'", "''", $message), str_replace("\'", "''", $poll_title), $poll_options, $poll_length); + } + break; + + case 'delete': + case 'poll_delete': + if ($error_msg != '') + { + message_die(GENERAL_MESSAGE, $error_msg); + } + + delete_post($mode, $post_data, $return_message, $return_meta, $forum_id, $topic_id, $post_id, $poll_id); + break; + } + + if ( $error_msg == '' ) + { + if ( $mode != 'editpost' ) + { + $user_id = ( $mode == 'reply' || $mode == 'newtopic' ) ? $userdata['user_id'] : $post_data['poster_id']; + update_post_stats($mode, $post_data, $forum_id, $topic_id, $post_id, $user_id); + } + + if ($error_msg == '' && $mode != 'poll_delete') + { + user_notification($mode, $post_data, $post_info['topic_title'], $forum_id, $topic_id, $post_id, $notify_user); + } + + if ( $mode == 'newtopic' || $mode == 'reply' ) + { + $tracking_topics = ( !empty($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) : array(); + $tracking_forums = ( !empty($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) : array(); + + if ( count($tracking_topics) + count($tracking_forums) == 100 && empty($tracking_topics[$topic_id]) ) + { + asort($tracking_topics); + unset($tracking_topics[key($tracking_topics)]); + } + + $tracking_topics[$topic_id] = time(); + + setcookie($board_config['cookie_name'] . '_t', serialize($tracking_topics), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); + } + + $template->assign_vars(array( + 'META' => $return_meta) + ); + message_die(GENERAL_MESSAGE, $return_message); + } +} + +if( $refresh || isset($HTTP_POST_VARS['del_poll_option']) || $error_msg != '' ) +{ + $username = ( !empty($HTTP_POST_VARS['username']) ) ? htmlspecialchars(trim(stripslashes($HTTP_POST_VARS['username']))) : ''; + $subject = ( !empty($HTTP_POST_VARS['subject']) ) ? htmlspecialchars(trim(stripslashes($HTTP_POST_VARS['subject']))) : ''; + $message = ( !empty($HTTP_POST_VARS['message']) ) ? htmlspecialchars(trim(stripslashes($HTTP_POST_VARS['message']))) : ''; + + $poll_title = ( !empty($HTTP_POST_VARS['poll_title']) ) ? htmlspecialchars(trim(stripslashes($HTTP_POST_VARS['poll_title']))) : ''; + $poll_length = ( isset($HTTP_POST_VARS['poll_length']) ) ? max(0, intval($HTTP_POST_VARS['poll_length'])) : 0; + + $poll_options = array(); + if ( !empty($HTTP_POST_VARS['poll_option_text']) ) + { + while( list($option_id, $option_text) = @each($HTTP_POST_VARS['poll_option_text']) ) + { + if( isset($HTTP_POST_VARS['del_poll_option'][$option_id]) ) + { + unset($poll_options[$option_id]); + } + else if ( !empty($option_text) ) + { + $poll_options[intval($option_id)] = htmlspecialchars(trim(stripslashes($option_text))); + } } } - // If we are here the user is not able to delete - present the correct error message - if ($post_data['poster_id'] != $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id)) + if ( isset($poll_add) && !empty($HTTP_POST_VARS['add_poll_option_text']) ) { - trigger_error('DELETE_OWN_POSTS'); + $poll_options[] = htmlspecialchars(trim(stripslashes($HTTP_POST_VARS['add_poll_option_text']))); } - if ($post_data['poster_id'] == $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id) && $post_id != $post_data['topic_last_post_id']) + if ( $mode == 'newtopic' || $mode == 'reply') { - trigger_error('CANNOT_DELETE_REPLIED'); + $user_sig = ( $userdata['user_sig'] != '' && $board_config['allow_sig'] ) ? $userdata['user_sig'] : ''; } + else if ( $mode == 'editpost' ) + { + $user_sig = ( $post_info['user_sig'] != '' && $board_config['allow_sig'] ) ? $post_info['user_sig'] : ''; + $userdata['user_sig_bbcode_uid'] = $post_info['user_sig_bbcode_uid']; + } + + if( $preview ) + { + $orig_word = array(); + $replacement_word = array(); + obtain_word_list($orig_word, $replacement_word); - trigger_error('USER_CANNOT_DELETE'); + $bbcode_uid = ( $bbcode_on ) ? make_bbcode_uid() : ''; + $preview_message = stripslashes(prepare_message(addslashes(unprepare_message($message)), $html_on, $bbcode_on, $smilies_on, $bbcode_uid)); + $preview_subject = $subject; + $preview_username = $username; + + // + // Finalise processing as per viewtopic + // + if( !$html_on ) + { + if( $user_sig != '' || !$userdata['user_allowhtml'] ) + { + $user_sig = preg_replace('#(<)([\/]?.*?)(>)#is', '<\2>', $user_sig); + } + } + + if( $attach_sig && $user_sig != '' && $userdata['user_sig_bbcode_uid'] ) + { + $user_sig = bbencode_second_pass($user_sig, $userdata['user_sig_bbcode_uid']); + } + + if( $bbcode_on ) + { + $preview_message = bbencode_second_pass($preview_message, $bbcode_uid); + } + + if( !empty($orig_word) ) + { + $preview_username = ( !empty($username) ) ? preg_replace($orig_word, $replacement_word, $preview_username) : ''; + $preview_subject = ( !empty($subject) ) ? preg_replace($orig_word, $replacement_word, $preview_subject) : ''; + $preview_message = ( !empty($preview_message) ) ? preg_replace($orig_word, $replacement_word, $preview_message) : ''; + } + + if( $user_sig != '' ) + { + $user_sig = make_clickable($user_sig); + } + $preview_message = make_clickable($preview_message); + + if( $smilies_on ) + { + if( $userdata['user_allowsmile'] && $user_sig != '' ) + { + $user_sig = smilies_pass($user_sig); + } + + $preview_message = smilies_pass($preview_message); + } + + if( $attach_sig && $user_sig != '' ) + { + $preview_message = $preview_message . '

    _________________
    ' . $user_sig; + } + + $preview_message = str_replace("\n", '
    ', $preview_message); + + $template->set_filenames(array( + 'preview' => 'posting_preview.tpl') + ); + + $template->assign_vars(array( + 'TOPIC_TITLE' => $preview_subject, + 'POST_SUBJECT' => $preview_subject, + 'POSTER_NAME' => $preview_username, + 'POST_DATE' => create_date($board_config['default_dateformat'], time(), $board_config['board_timezone']), + 'MESSAGE' => $preview_message, + + 'L_POST_SUBJECT' => $lang['Post_subject'], + 'L_PREVIEW' => $lang['Preview'], + 'L_POSTED' => $lang['Posted'], + 'L_POST' => $lang['Post']) + ); + $template->assign_var_from_handle('POST_PREVIEW_BOX', 'preview'); + } + else if( $error_msg != '' ) + { + $template->set_filenames(array( + 'reg_header' => 'error_body.tpl') + ); + $template->assign_vars(array( + 'ERROR_MESSAGE' => $error_msg) + ); + $template->assign_var_from_handle('ERROR_BOX', 'reg_header'); + } +} +else +{ + // + // User default entry point + // + if ( $mode == 'newtopic' ) + { + $user_sig = ( $userdata['user_sig'] != '' ) ? $userdata['user_sig'] : ''; + + $username = ($userdata['session_logged_in']) ? $userdata['username'] : ''; + $poll_title = ''; + $poll_length = ''; + $subject = ''; + $message = ''; + } + else if ( $mode == 'reply' ) + { + $user_sig = ( $userdata['user_sig'] != '' ) ? $userdata['user_sig'] : ''; + + $username = ( $userdata['session_logged_in'] ) ? $userdata['username'] : ''; + $subject = ''; + $message = ''; + + } + else if ( $mode == 'quote' || $mode == 'editpost' ) + { + $subject = ( $post_data['first_post'] ) ? $post_info['topic_title'] : $post_info['post_subject']; + $message = $post_info['post_text']; + + if ( $mode == 'editpost' ) + { + $attach_sig = ( $post_info['enable_sig'] && $post_info['user_sig'] != '' ) ? TRUE : 0; + $user_sig = $post_info['user_sig']; + + $html_on = ( $post_info['enable_html'] ) ? true : false; + $bbcode_on = ( $post_info['enable_bbcode'] ) ? true : false; + $smilies_on = ( $post_info['enable_smilies'] ) ? true : false; + } + else + { + $attach_sig = ( $userdata['user_attachsig'] ) ? TRUE : 0; + $user_sig = $userdata['user_sig']; + } + + if ( $post_info['bbcode_uid'] != '' ) + { + $message = preg_replace('/\:(([a-z0-9]:)?)' . $post_info['bbcode_uid'] . '/s', '', $message); + } + + $message = str_replace('<', '<', $message); + $message = str_replace('>', '>', $message); + $message = str_replace('
    ', "\n", $message); + + if ( $mode == 'quote' ) + { + $orig_word = array(); + $replacement_word = array(); + obtain_word_list($orig_word, $replace_word); + + $msg_date = create_date($board_config['default_dateformat'], $postrow['post_time'], $board_config['board_timezone']); + + // Use trim to get rid of spaces placed there by MS-SQL 2000 + $quote_username = ( trim($post_info['post_username']) != '' ) ? $post_info['post_username'] : $post_info['username']; + $message = '[quote="' . $quote_username . '"]' . $message . '[/quote]'; + + if ( !empty($orig_word) ) + { + $subject = ( !empty($subject) ) ? preg_replace($orig_word, $replace_word, $subject) : ''; + $message = ( !empty($message) ) ? preg_replace($orig_word, $replace_word, $message) : ''; + } + + if ( !preg_match('/^Re:/', $subject) && strlen($subject) > 0 ) + { + $subject = 'Re: ' . $subject; + } + + $mode = 'reply'; + } + else + { + $username = ( $post_info['user_id'] == ANONYMOUS && !empty($post_info['post_username']) ) ? $post_info['post_username'] : ''; + } + } } +// +// Signature toggle selection +// +if( $user_sig != '' ) +{ + $template->assign_block_vars('switch_signature_checkbox', array()); +} + +// +// HTML toggle selection +// +if ( $board_config['allow_html'] ) +{ + $html_status = $lang['HTML_is_ON']; + $template->assign_block_vars('switch_html_checkbox', array()); +} +else +{ + $html_status = $lang['HTML_is_OFF']; +} + +// +// BBCode toggle selection +// +if ( $board_config['allow_bbcode'] ) +{ + $bbcode_status = $lang['BBCode_is_ON']; + $template->assign_block_vars('switch_bbcode_checkbox', array()); +} +else +{ + $bbcode_status = $lang['BBCode_is_OFF']; +} + +// +// Smilies toggle selection +// +if ( $board_config['allow_smilies'] ) +{ + $smilies_status = $lang['Smilies_are_ON']; + $template->assign_block_vars('switch_smilies_checkbox', array()); +} +else +{ + $smilies_status = $lang['Smilies_are_OFF']; +} + +if( !$userdata['session_logged_in'] || ( $mode == 'editpost' && $post_info['poster_id'] == ANONYMOUS ) ) +{ + $template->assign_block_vars('switch_username_select', array()); +} + +// +// Notify checkbox - only show if user is logged in +// +if ( $userdata['session_logged_in'] && $is_auth['auth_read'] ) +{ + if ( $mode != 'editpost' || ( $mode == 'editpost' && $post_info['poster_id'] != ANONYMOUS ) ) + { + $template->assign_block_vars('switch_notify_checkbox', array()); + } +} + +// +// Delete selection +// +if ( $mode == 'editpost' && ( ( $is_auth['auth_delete'] && $post_data['last_post'] && ( !$post_data['has_poll'] || $post_data['edit_poll'] ) ) || $is_auth['auth_mod'] ) ) +{ + $template->assign_block_vars('switch_delete_checkbox', array()); +} + +// +// Topic type selection +// +$topic_type_toggle = ''; +if ( $mode == 'newtopic' || ( $mode == 'editpost' && $post_data['first_post'] ) ) +{ + $template->assign_block_vars('switch_type_toggle', array()); + + if( $is_auth['auth_sticky'] ) + { + $topic_type_toggle .= ' ' . $lang['Post_Normal'] . '  ' . $topic_type_toggle; + } +} + +$hidden_form_fields = ''; +$hidden_form_fields .= ''; + +switch( $mode ) +{ + case 'newtopic': + $page_title = $lang['Post_a_new_topic']; + $hidden_form_fields .= ''; + break; + + case 'reply': + $page_title = $lang['Post_a_reply']; + $hidden_form_fields .= ''; + break; + + case 'editpost': + $page_title = $lang['Edit_Post']; + $hidden_form_fields .= ''; + break; +} + +// Generate smilies listing for page output +generate_smilies('inline', PAGE_POSTING); + +// +// Include page header +// +include($phpbb_root_path . 'includes/page_header.'.$phpEx); + +$template->set_filenames(array( + 'body' => 'posting_body.tpl', + 'pollbody' => 'posting_poll_body.tpl', + 'reviewbody' => 'posting_topic_review.tpl') +); +make_jumpbox('viewforum.'.$phpEx); + +$template->assign_vars(array( + 'FORUM_NAME' => $forum_name, + 'L_POST_A' => $page_title, + 'L_POST_SUBJECT' => $lang['Post_subject'], + + 'U_VIEW_FORUM' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id")) +); + +// +// This enables the forum/topic title to be output for posting +// but not for privmsg (where it makes no sense) +// +$template->assign_block_vars('switch_not_privmsg', array()); + +// +// Output the data to the template +// +$template->assign_vars(array( + 'USERNAME' => $username, + 'SUBJECT' => $subject, + 'MESSAGE' => $message, + 'HTML_STATUS' => $html_status, + 'BBCODE_STATUS' => sprintf($bbcode_status, '', ''), + 'SMILIES_STATUS' => $smilies_status, + + 'L_SUBJECT' => $lang['Subject'], + 'L_MESSAGE_BODY' => $lang['Message_body'], + 'L_OPTIONS' => $lang['Options'], + 'L_PREVIEW' => $lang['Preview'], + 'L_SPELLCHECK' => $lang['Spellcheck'], + 'L_SUBMIT' => $lang['Submit'], + 'L_CANCEL' => $lang['Cancel'], + 'L_CONFIRM_DELETE' => $lang['Confirm_delete'], + 'L_DISABLE_HTML' => $lang['Disable_HTML_post'], + 'L_DISABLE_BBCODE' => $lang['Disable_BBCode_post'], + 'L_DISABLE_SMILIES' => $lang['Disable_Smilies_post'], + 'L_ATTACH_SIGNATURE' => $lang['Attach_signature'], + 'L_NOTIFY_ON_REPLY' => $lang['Notify'], + 'L_DELETE_POST' => $lang['Delete_post'], + + 'L_BBCODE_B_HELP' => $lang['bbcode_b_help'], + 'L_BBCODE_I_HELP' => $lang['bbcode_i_help'], + 'L_BBCODE_U_HELP' => $lang['bbcode_u_help'], + 'L_BBCODE_Q_HELP' => $lang['bbcode_q_help'], + 'L_BBCODE_C_HELP' => $lang['bbcode_c_help'], + 'L_BBCODE_L_HELP' => $lang['bbcode_l_help'], + 'L_BBCODE_O_HELP' => $lang['bbcode_o_help'], + 'L_BBCODE_P_HELP' => $lang['bbcode_p_help'], + 'L_BBCODE_W_HELP' => $lang['bbcode_w_help'], + 'L_BBCODE_A_HELP' => $lang['bbcode_a_help'], + 'L_BBCODE_S_HELP' => $lang['bbcode_s_help'], + 'L_BBCODE_F_HELP' => $lang['bbcode_f_help'], + 'L_EMPTY_MESSAGE' => $lang['Empty_message'], + + 'L_FONT_COLOR' => $lang['Font_color'], + 'L_COLOR_DEFAULT' => $lang['color_default'], + 'L_COLOR_DARK_RED' => $lang['color_dark_red'], + 'L_COLOR_RED' => $lang['color_red'], + 'L_COLOR_ORANGE' => $lang['color_orange'], + 'L_COLOR_BROWN' => $lang['color_brown'], + 'L_COLOR_YELLOW' => $lang['color_yellow'], + 'L_COLOR_GREEN' => $lang['color_green'], + 'L_COLOR_OLIVE' => $lang['color_olive'], + 'L_COLOR_CYAN' => $lang['color_cyan'], + 'L_COLOR_BLUE' => $lang['color_blue'], + 'L_COLOR_DARK_BLUE' => $lang['color_dark_blue'], + 'L_COLOR_INDIGO' => $lang['color_indigo'], + 'L_COLOR_VIOLET' => $lang['color_violet'], + 'L_COLOR_WHITE' => $lang['color_white'], + 'L_COLOR_BLACK' => $lang['color_black'], + + 'L_FONT_SIZE' => $lang['Font_size'], + 'L_FONT_TINY' => $lang['font_tiny'], + 'L_FONT_SMALL' => $lang['font_small'], + 'L_FONT_NORMAL' => $lang['font_normal'], + 'L_FONT_LARGE' => $lang['font_large'], + 'L_FONT_HUGE' => $lang['font_huge'], + + 'L_BBCODE_CLOSE_TAGS' => $lang['Close_Tags'], + 'L_STYLES_TIP' => $lang['Styles_tip'], + + 'U_VIEWTOPIC' => ( $mode == 'reply' ) ? append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&postorder=desc") : '', + 'U_REVIEW_TOPIC' => ( $mode == 'reply' ) ? append_sid("posting.$phpEx?mode=topicreview&" . POST_TOPIC_URL . "=$topic_id") : '', + + 'S_HTML_CHECKED' => ( !$html_on ) ? 'checked="checked"' : '', + 'S_BBCODE_CHECKED' => ( !$bbcode_on ) ? 'checked="checked"' : '', + 'S_SMILIES_CHECKED' => ( !$smilies_on ) ? 'checked="checked"' : '', + 'S_SIGNATURE_CHECKED' => ( $attach_sig ) ? 'checked="checked"' : '', + 'S_NOTIFY_CHECKED' => ( $notify_user ) ? 'checked="checked"' : '', + 'S_TYPE_TOGGLE' => $topic_type_toggle, + 'S_TOPIC_ID' => $topic_id, + 'S_POST_ACTION' => append_sid("posting.$phpEx"), + 'S_HIDDEN_FORM_FIELDS' => $hidden_form_fields) +); + +// +// Poll entry switch/output +// +if( ( $mode == 'newtopic' || ( $mode == 'editpost' && $post_data['edit_poll']) ) && $is_auth['auth_pollcreate'] ) +{ + $template->assign_vars(array( + 'L_ADD_A_POLL' => $lang['Add_poll'], + 'L_ADD_POLL_EXPLAIN' => $lang['Add_poll_explain'], + 'L_POLL_QUESTION' => $lang['Poll_question'], + 'L_POLL_OPTION' => $lang['Poll_option'], + 'L_ADD_OPTION' => $lang['Add_option'], + 'L_UPDATE_OPTION' => $lang['Update'], + 'L_DELETE_OPTION' => $lang['Delete'], + 'L_POLL_LENGTH' => $lang['Poll_for'], + 'L_DAYS' => $lang['Days'], + 'L_POLL_LENGTH_EXPLAIN' => $lang['Poll_for_explain'], + 'L_POLL_DELETE' => $lang['Delete_poll'], + + 'POLL_TITLE' => $poll_title, + 'POLL_LENGTH' => $poll_length) + ); + + if( $mode == 'editpost' && $post_data['edit_poll'] && $post_data['has_poll']) + { + $template->assign_block_vars('switch_poll_delete_toggle', array()); + } + + if( !empty($poll_options) ) + { + while( list($option_id, $option_text) = each($poll_options) ) + { + $template->assign_block_vars('poll_option_rows', array( + 'POLL_OPTION' => str_replace('"', '"', $option_text), + + 'S_POLL_OPTION_NUM' => $option_id) + ); + } + } + + $template->assign_var_from_handle('POLLBOX', 'pollbody'); +} + +// +// Topic review +// +if( $mode == 'reply' && $is_auth['auth_read'] ) +{ + require($phpbb_root_path . 'includes/topic_review.'.$phpEx); + topic_review($topic_id, true); + + $template->assign_block_vars('switch_inline_mode', array()); + $template->assign_var_from_handle('TOPIC_REVIEW_BOX', 'reviewbody'); +} + +$template->pparse('body'); + +include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + ?> \ No newline at end of file diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php new file mode 100644 index 0000000000..cd67561d11 --- /dev/null +++ b/phpBB/privmsg.php @@ -0,0 +1,2211 @@ +#', '#"#'); +$html_entities_replace = array('&', '<', '>', '"'); + +// +// Parameters +// +$submit = ( isset($HTTP_POST_VARS['post']) ) ? TRUE : 0; +$submit_search = ( isset($HTTP_POST_VARS['usersubmit']) ) ? TRUE : 0; +$submit_msgdays = ( isset($HTTP_POST_VARS['submit_msgdays']) ) ? TRUE : 0; +$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : 0; +$preview = ( isset($HTTP_POST_VARS['preview']) ) ? TRUE : 0; +$confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : 0; +$delete = ( isset($HTTP_POST_VARS['delete']) ) ? TRUE : 0; +$delete_all = ( isset($HTTP_POST_VARS['deleteall']) ) ? TRUE : 0; +$save = ( isset($HTTP_POST_VARS['save']) ) ? TRUE : 0; +$sid = (isset($HTTP_POST_VARS['sid'])) ? $HTTP_POST_VARS['sid'] : 0; + +$refresh = $preview || $submit_search; + +$mark_list = ( !empty($HTTP_POST_VARS['mark']) ) ? $HTTP_POST_VARS['mark'] : 0; + +if ( isset($HTTP_POST_VARS['folder']) || isset($HTTP_GET_VARS['folder']) ) +{ + $folder = ( isset($HTTP_POST_VARS['folder']) ) ? $HTTP_POST_VARS['folder'] : $HTTP_GET_VARS['folder']; + $folder = htmlspecialchars($folder); + + if ( $folder != 'inbox' && $folder != 'outbox' && $folder != 'sentbox' && $folder != 'savebox' ) + { + $folder = 'inbox'; + } +} +else +{ + $folder = 'inbox'; +} + +// +// Start session management +// +$userdata = session_pagestart($user_ip, PAGE_PRIVMSGS); +init_userprefs($userdata); +// +// End session management +// + +// +// Cancel +// +if ( $cancel ) +{ + redirect(append_sid("privmsg.$phpEx?folder=$folder", true)); +} + +// +// Var definitions +// +if ( !empty($HTTP_POST_VARS['mode']) || !empty($HTTP_GET_VARS['mode']) ) +{ + $mode = ( !empty($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; + $mode = htmlspecialchars($mode); +} +else +{ + $mode = ''; +} + +$start = ( !empty($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0; +$start = ($start < 0) ? 0 : $start; + +if ( isset($HTTP_POST_VARS[POST_POST_URL]) || isset($HTTP_GET_VARS[POST_POST_URL]) ) +{ + $privmsg_id = ( isset($HTTP_POST_VARS[POST_POST_URL]) ) ? intval($HTTP_POST_VARS[POST_POST_URL]) : intval($HTTP_GET_VARS[POST_POST_URL]); +} +else +{ + $privmsg_id = ''; +} + +$error = FALSE; + +// +// Define the box image links +// +$inbox_img = ( $folder != 'inbox' || $mode != '' ) ? '' . $lang['Inbox'] . '' : '' . $lang['Inbox'] . ''; +$inbox_url = ( $folder != 'inbox' || $mode != '' ) ? '' . $lang['Inbox'] . '' : $lang['Inbox']; + +$outbox_img = ( $folder != 'outbox' || $mode != '' ) ? '' . $lang['Outbox'] . '' : '' . $lang['Outbox'] . ''; +$outbox_url = ( $folder != 'outbox' || $mode != '' ) ? '' . $lang['Outbox'] . '' : $lang['Outbox']; + +$sentbox_img = ( $folder != 'sentbox' || $mode != '' ) ? '' . $lang['Sentbox'] . '' : '' . $lang['Sentbox'] . ''; +$sentbox_url = ( $folder != 'sentbox' || $mode != '' ) ? '' . $lang['Sentbox'] . '' : $lang['Sentbox']; + +$savebox_img = ( $folder != 'savebox' || $mode != '' ) ? '' . $lang['Savebox'] . '' : '' . $lang['Savebox'] . ''; +$savebox_url = ( $folder != 'savebox' || $mode != '' ) ? '' . $lang['Savebox'] . '' : $lang['Savebox']; + +// ---------- +// Start main +// +if ( $mode == 'newpm' ) +{ + $gen_simple_header = TRUE; + + $page_title = $lang['Private_Messaging']; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + $template->set_filenames(array( + 'body' => 'privmsgs_popup.tpl') + ); + + if ( $userdata['session_logged_in'] ) + { + if ( $userdata['user_new_privmsg'] ) + { + $l_new_message = ( $userdata['user_new_privmsg'] == 1 ) ? $lang['You_new_pm'] : $lang['You_new_pms']; + } + else + { + $l_new_message = $lang['You_no_new_pm']; + } + + $l_new_message .= '

    ' . sprintf($lang['Click_view_privmsg'], '', ''); + } + else + { + $l_new_message = $lang['Login_check_pm']; + } + + $template->assign_vars(array( + 'L_CLOSE_WINDOW' => $lang['Close_window'], + 'L_MESSAGE' => $l_new_message) + ); + + $template->pparse('body'); + + include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + +} +else if ( $mode == 'read' ) +{ + if ( !empty($HTTP_GET_VARS[POST_POST_URL]) ) + { + $privmsgs_id = intval($HTTP_GET_VARS[POST_POST_URL]); + } + else + { + message_die(GENERAL_ERROR, $lang['No_post_id']); + } + + if ( !$userdata['session_logged_in'] ) + { + redirect(append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode&" . POST_POST_URL . "=$privmsgs_id", true)); + } + + // + // SQL to pull appropriate message, prevents nosey people + // reading other peoples messages ... hopefully! + // + switch( $folder ) + { + case 'inbox': + $l_box_name = $lang['Inbox']; + $pm_sql_user = "AND pm.privmsgs_to_userid = " . $userdata['user_id'] . " + AND ( pm.privmsgs_type = " . PRIVMSGS_READ_MAIL . " + OR pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . " + OR pm.privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )"; + break; + case 'outbox': + $l_box_name = $lang['Outbox']; + $pm_sql_user = "AND pm.privmsgs_from_userid = " . $userdata['user_id'] . " + AND ( pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . " + OR pm.privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " ) "; + break; + case 'sentbox': + $l_box_name = $lang['Sentbox']; + $pm_sql_user = "AND pm.privmsgs_from_userid = " . $userdata['user_id'] . " + AND pm.privmsgs_type = " . PRIVMSGS_SENT_MAIL; + break; + case 'savebox': + $l_box_name = $lang['Savebox']; + $pm_sql_user = "AND ( ( pm.privmsgs_to_userid = " . $userdata['user_id'] . " + AND pm.privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) + OR ( pm.privmsgs_from_userid = " . $userdata['user_id'] . " + AND pm.privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " ) + )"; + break; + default: + message_die(GENERAL_ERROR, $lang['No_such_folder']); + break; + } + + // + // Major query obtains the message ... + // + $sql = "SELECT u.username AS username_1, u.user_id AS user_id_1, u2.username AS username_2, u2.user_id AS user_id_2, u.user_sig_bbcode_uid, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_avatar, pm.*, pmt.privmsgs_bbcode_uid, pmt.privmsgs_text + FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u, " . USERS_TABLE . " u2 + WHERE pm.privmsgs_id = $privmsgs_id + AND pmt.privmsgs_text_id = pm.privmsgs_id + $pm_sql_user + AND u.user_id = pm.privmsgs_from_userid + AND u2.user_id = pm.privmsgs_to_userid"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not query private message post information', '', __LINE__, __FILE__, $sql); + } + + // + // Did the query return any data? + // + if ( !($privmsg = $db->sql_fetchrow($result)) ) + { + redirect(append_sid("privmsg.$phpEx?folder=$folder", true)); + } + + $privmsg_id = $privmsg['privmsgs_id']; + + // + // Is this a new message in the inbox? If it is then save + // a copy in the posters sent box + // + if (($privmsg['privmsgs_type'] == PRIVMSGS_NEW_MAIL || $privmsg['privmsgs_type'] == PRIVMSGS_UNREAD_MAIL) && $folder == 'inbox') + { + // Update appropriate counter + switch ($privmsg['privmsgs_type']) + { + case PRIVMSGS_NEW_MAIL: + $sql = "user_new_privmsg = user_new_privmsg - 1"; + break; + case PRIVMSGS_UNREAD_MAIL: + $sql = "user_unread_privmsg = user_unread_privmsg - 1"; + break; + } + + $sql = "UPDATE " . USERS_TABLE . " + SET $sql + WHERE user_id = " . $userdata['user_id']; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update private message read status for user', '', __LINE__, __FILE__, $sql); + } + + $sql = "UPDATE " . PRIVMSGS_TABLE . " + SET privmsgs_type = " . PRIVMSGS_READ_MAIL . " + WHERE privmsgs_id = " . $privmsg['privmsgs_id']; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update private message read status', '', __LINE__, __FILE__, $sql); + } + + // Check to see if the poster has a 'full' sent box + $sql = "SELECT COUNT(privmsgs_id) AS sent_items, MIN(privmsgs_date) AS oldest_post_time + FROM " . PRIVMSGS_TABLE . " + WHERE privmsgs_type = " . PRIVMSGS_SENT_MAIL . " + AND privmsgs_from_userid = " . $privmsg['privmsgs_from_userid']; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain sent message info for sendee', '', __LINE__, __FILE__, $sql); + } + + $sql_priority = ( SQL_LAYER == 'mysql' ) ? 'LOW_PRIORITY' : ''; + + if ( $sent_info = $db->sql_fetchrow($result) ) + { + if ($board_config['max_sentbox_privmsgs'] && $sent_info['sent_items'] >= $board_config['max_sentbox_privmsgs']) + { + $sql = "SELECT privmsgs_id FROM " . PRIVMSGS_TABLE . " + WHERE privmsgs_type = " . PRIVMSGS_SENT_MAIL . " + AND privmsgs_date = " . $sent_info['oldest_post_time'] . " + AND privmsgs_from_userid = " . $privmsg['privmsgs_from_userid']; + if ( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not find oldest privmsgs', '', __LINE__, __FILE__, $sql); + } + $old_privmsgs_id = $db->sql_fetchrow($result); + $old_privmsgs_id = $old_privmsgs_id['privmsgs_id']; + + $sql = "DELETE $sql_priority FROM " . PRIVMSGS_TABLE . " + WHERE privmsgs_id = $old_privmsgs_id"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (sent)', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE $sql_priority FROM " . PRIVMSGS_TEXT_TABLE . " + WHERE privmsgs_text_id = $old_privmsgs_id"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (sent)', '', __LINE__, __FILE__, $sql); + } + } + } + + // + // This makes a copy of the post and stores it as a SENT message from the sendee. Perhaps + // not the most DB friendly way but a lot easier to manage, besides the admin will be able to + // set limits on numbers of storable posts for users ... hopefully! + // + $sql = "INSERT $sql_priority INTO " . PRIVMSGS_TABLE . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip, privmsgs_enable_html, privmsgs_enable_bbcode, privmsgs_enable_smilies, privmsgs_attach_sig) + VALUES (" . PRIVMSGS_SENT_MAIL . ", '" . str_replace("\'", "''", addslashes($privmsg['privmsgs_subject'])) . "', " . $privmsg['privmsgs_from_userid'] . ", " . $privmsg['privmsgs_to_userid'] . ", " . $privmsg['privmsgs_date'] . ", '" . $privmsg['privmsgs_ip'] . "', " . $privmsg['privmsgs_enable_html'] . ", " . $privmsg['privmsgs_enable_bbcode'] . ", " . $privmsg['privmsgs_enable_smilies'] . ", " . $privmsg['privmsgs_attach_sig'] . ")"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not insert private message sent info', '', __LINE__, __FILE__, $sql); + } + + $privmsg_sent_id = $db->sql_nextid(); + + $sql = "INSERT $sql_priority INTO " . PRIVMSGS_TEXT_TABLE . " (privmsgs_text_id, privmsgs_bbcode_uid, privmsgs_text) + VALUES ($privmsg_sent_id, '" . $privmsg['privmsgs_bbcode_uid'] . "', '" . str_replace("\'", "''", addslashes($privmsg['privmsgs_text'])) . "')"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not insert private message sent text', '', __LINE__, __FILE__, $sql); + } + } + + // + // Pick a folder, any folder, so long as it's one below ... + // + $post_urls = array( + 'post' => append_sid("privmsg.$phpEx?mode=post"), + 'reply' => append_sid("privmsg.$phpEx?mode=reply&" . POST_POST_URL . "=$privmsg_id"), + 'quote' => append_sid("privmsg.$phpEx?mode=quote&" . POST_POST_URL . "=$privmsg_id"), + 'edit' => append_sid("privmsg.$phpEx?mode=edit&" . POST_POST_URL . "=$privmsg_id") + ); + $post_icons = array( + 'post_img' => '' . $lang['Post_new_pm'] . '', + 'post' => '' . $lang['Post_new_pm'] . '', + 'reply_img' => '' . $lang['Post_reply_pm'] . '', + 'reply' => '' . $lang['Post_reply_pm'] . '', + 'quote_img' => '' . $lang['Post_quote_pm'] . '', + 'quote' => '' . $lang['Post_quote_pm'] . '', + 'edit_img' => '' . $lang['Edit_pm'] . '', + 'edit' => '' . $lang['Edit_pm'] . '' + ); + + if ( $folder == 'inbox' ) + { + $post_img = $post_icons['post_img']; + $reply_img = $post_icons['reply_img']; + $quote_img = $post_icons['quote_img']; + $edit_img = ''; + $post = $post_icons['post']; + $reply = $post_icons['reply']; + $quote = $post_icons['quote']; + $edit = ''; + $l_box_name = $lang['Inbox']; + } + else if ( $folder == 'outbox' ) + { + $post_img = $post_icons['post_img']; + $reply_img = ''; + $quote_img = ''; + $edit_img = $post_icons['edit_img']; + $post = $post_icons['post']; + $reply = ''; + $quote = ''; + $edit = $post_icons['edit']; + $l_box_name = $lang['Outbox']; + } + else if ( $folder == 'savebox' ) + { + if ( $privmsg['privmsgs_type'] == PRIVMSGS_SAVED_IN_MAIL ) + { + $post_img = $post_icons['post_img']; + $reply_img = $post_icons['reply_img']; + $quote_img = $post_icons['quote_img']; + $edit_img = ''; + $post = $post_icons['post']; + $reply = $post_icons['reply']; + $quote = $post_icons['quote']; + $edit = ''; + } + else + { + $post_img = $post_icons['post_img']; + $reply_img = ''; + $quote_img = ''; + $edit_img = ''; + $post = $post_icons['post']; + $reply = ''; + $quote = ''; + $edit = ''; + } + $l_box_name = $lang['Saved']; + } + else if ( $folder == 'sentbox' ) + { + $post_img = $post_icons['post_img']; + $reply_img = ''; + $quote_img = ''; + $edit_img = ''; + $post = $post_icons['post']; + $reply = ''; + $quote = ''; + $edit = ''; + $l_box_name = $lang['Sent']; + } + + $s_hidden_fields = ''; + + $page_title = $lang['Read_pm']; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + // + // Load templates + // + $template->set_filenames(array( + 'body' => 'privmsgs_read_body.tpl') + ); + make_jumpbox('viewforum.'.$phpEx); + + $template->assign_vars(array( + 'INBOX_IMG' => $inbox_img, + 'SENTBOX_IMG' => $sentbox_img, + 'OUTBOX_IMG' => $outbox_img, + 'SAVEBOX_IMG' => $savebox_img, + 'INBOX' => $inbox_url, + + 'POST_PM_IMG' => $post_img, + 'REPLY_PM_IMG' => $reply_img, + 'EDIT_PM_IMG' => $edit_img, + 'QUOTE_PM_IMG' => $quote_img, + 'POST_PM' => $post, + 'REPLY_PM' => $reply, + 'EDIT_PM' => $edit, + 'QUOTE_PM' => $quote, + + 'SENTBOX' => $sentbox_url, + 'OUTBOX' => $outbox_url, + 'SAVEBOX' => $savebox_url, + + 'BOX_NAME' => $l_box_name, + + 'L_MESSAGE' => $lang['Message'], + 'L_INBOX' => $lang['Inbox'], + 'L_OUTBOX' => $lang['Outbox'], + 'L_SENTBOX' => $lang['Sent'], + 'L_SAVEBOX' => $lang['Saved'], + 'L_FLAG' => $lang['Flag'], + 'L_SUBJECT' => $lang['Subject'], + 'L_POSTED' => $lang['Posted'], + 'L_DATE' => $lang['Date'], + 'L_FROM' => $lang['From'], + 'L_TO' => $lang['To'], + 'L_SAVE_MSG' => $lang['Save_message'], + 'L_DELETE_MSG' => $lang['Delete_message'], + + 'S_PRIVMSGS_ACTION' => append_sid("privmsg.$phpEx?folder=$folder"), + 'S_HIDDEN_FIELDS' => $s_hidden_fields) + ); + + $username_from = $privmsg['username_1']; + $user_id_from = $privmsg['user_id_1']; + $username_to = $privmsg['username_2']; + $user_id_to = $privmsg['user_id_2']; + + $post_date = create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); + + $temp_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $user_id_from); + $profile_img = '' . $lang['Read_profile'] . ''; + $profile = '' . $lang['Read_profile'] . ''; + + $temp_url = append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=$user_id_from"); + $pm_img = '' . $lang['Send_private_message'] . ''; + $pm = '' . $lang['Send_private_message'] . ''; + + if ( !empty($privmsg['user_viewemail']) || $userdata['user_level'] == ADMIN ) + { + $email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $user_id_from) : 'mailto:' . $privmsg['user_email']; + + $email_img = '' . $lang['Send_email'] . ''; + $email = '' . $lang['Send_email'] . ''; + } + else + { + $email_img = ''; + $email = ''; + } + + $www_img = ( $privmsg['user_website'] ) ? '' . $lang['Visit_website'] . '' : ''; + $www = ( $privmsg['user_website'] ) ? '' . $lang['Visit_website'] . '' : ''; + + if ( !empty($privmsg['user_icq']) ) + { + $icq_status_img = ''; + $icq_img = '' . $lang['ICQ'] . ''; + $icq = '' . $lang['ICQ'] . ''; + } + else + { + $icq_status_img = ''; + $icq_img = ''; + $icq = ''; + } + + $aim_img = ( $privmsg['user_aim'] ) ? '' . $lang['AIM'] . '' : ''; + $aim = ( $privmsg['user_aim'] ) ? '' . $lang['AIM'] . '' : ''; + + $temp_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id_from"); + $msn_img = ( $privmsg['user_msnm'] ) ? '' . $lang['MSNM'] . '' : ''; + $msn = ( $privmsg['user_msnm'] ) ? '' . $lang['MSNM'] . '' : ''; + + $yim_img = ( $privmsg['user_yim'] ) ? '' . $lang['YIM'] . '' : ''; + $yim = ( $privmsg['user_yim'] ) ? '' . $lang['YIM'] . '' : ''; + + $temp_url = append_sid("search.$phpEx?search_author=" . urlencode($username_from) . "&showresults=posts"); + $search_img = '' . sprintf($lang['Search_user_posts'], $username_from) . ''; + $search = '' . sprintf($lang['Search_user_posts'], $username_from) . ''; + + // + // Processing of post + // + $post_subject = $privmsg['privmsgs_subject']; + + $private_message = $privmsg['privmsgs_text']; + $bbcode_uid = $privmsg['privmsgs_bbcode_uid']; + + if ( $board_config['allow_sig'] ) + { + $user_sig = ( $privmsg['privmsgs_from_userid'] == $userdata['user_id'] ) ? $userdata['user_sig'] : $privmsg['user_sig']; + } + else + { + $user_sig = ''; + } + + $user_sig_bbcode_uid = ( $privmsg['privmsgs_from_userid'] == $userdata['user_id'] ) ? $userdata['user_sig_bbcode_uid'] : $privmsg['user_sig_bbcode_uid']; + + // + // If the board has HTML off but the post has HTML + // on then we process it, else leave it alone + // + if ( !$board_config['allow_html'] || !$userdata['user_allowhtml']) + { + if ( $user_sig != '') + { + $user_sig = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $user_sig); + } + + if ( $privmsg['privmsgs_enable_html'] ) + { + $private_message = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $private_message); + } + } + + if ( $user_sig != '' && $privmsg['privmsgs_attach_sig'] && $user_sig_bbcode_uid != '' ) + { + $user_sig = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($user_sig, $user_sig_bbcode_uid) : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $user_sig); + } + + if ( $bbcode_uid != '' ) + { + $private_message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($private_message, $bbcode_uid) : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $private_message); + } + + $private_message = make_clickable($private_message); + + if ( $privmsg['privmsgs_attach_sig'] && $user_sig != '' ) + { + $private_message .= '

    _________________
    ' . make_clickable($user_sig); + } + + $orig_word = array(); + $replacement_word = array(); + obtain_word_list($orig_word, $replacement_word); + + if ( count($orig_word) ) + { + $post_subject = preg_replace($orig_word, $replacement_word, $post_subject); + $private_message = preg_replace($orig_word, $replacement_word, $private_message); + } + + if ( $board_config['allow_smilies'] && $privmsg['privmsgs_enable_smilies'] ) + { + $private_message = smilies_pass($private_message); + } + + $private_message = str_replace("\n", '
    ', $private_message); + + // + // Dump it to the templating engine + // + $template->assign_vars(array( + 'MESSAGE_TO' => $username_to, + 'MESSAGE_FROM' => $username_from, + 'RANK_IMAGE' => $rank_image, + 'POSTER_JOINED' => $poster_joined, + 'POSTER_POSTS' => $poster_posts, + 'POSTER_FROM' => $poster_from, + 'POSTER_AVATAR' => $poster_avatar, + 'POST_SUBJECT' => $post_subject, + 'POST_DATE' => $post_date, + 'MESSAGE' => $private_message, + + 'PROFILE_IMG' => $profile_img, + 'PROFILE' => $profile, + 'SEARCH_IMG' => $search_img, + 'SEARCH' => $search, + 'EMAIL_IMG' => $email_img, + 'EMAIL' => $email, + 'WWW_IMG' => $www_img, + 'WWW' => $www, + 'ICQ_STATUS_IMG' => $icq_status_img, + 'ICQ_IMG' => $icq_img, + 'ICQ' => $icq, + 'AIM_IMG' => $aim_img, + 'AIM' => $aim, + 'MSN_IMG' => $msn_img, + 'MSN' => $msn, + 'YIM_IMG' => $yim_img, + 'YIM' => $yim) + ); + + $template->pparse('body'); + + include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + +} +else if ( ( $delete && $mark_list ) || $delete_all ) +{ + if ( !$userdata['session_logged_in'] ) + { + redirect(append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true)); + } + + if ( isset($mark_list) && !is_array($mark_list) ) + { + // Set to empty array instead of '0' if nothing is selected. + $mark_list = array(); + } + + if ( !$confirm ) + { + $s_hidden_fields = ''; + $s_hidden_fields .= ( isset($HTTP_POST_VARS['delete']) ) ? '' : ''; + $s_hidden_fields .= ''; + + for($i = 0; $i < count($mark_list); $i++) + { + $s_hidden_fields .= ''; + } + + // + // Output confirmation page + // + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + $template->set_filenames(array( + 'confirm_body' => 'confirm_body.tpl') + ); + $template->assign_vars(array( + 'MESSAGE_TITLE' => $lang['Information'], + 'MESSAGE_TEXT' => ( count($mark_list) == 1 ) ? $lang['Confirm_delete_pm'] : $lang['Confirm_delete_pms'], + + 'L_YES' => $lang['Yes'], + 'L_NO' => $lang['No'], + + 'S_CONFIRM_ACTION' => append_sid("privmsg.$phpEx?folder=$folder"), + 'S_HIDDEN_FIELDS' => $s_hidden_fields) + ); + + $template->pparse('confirm_body'); + + include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + + } + else if ($confirm && $sid === $userdata['session_id']) + { + $delete_sql_id = ''; + + if (!$delete_all) + { + for ($i = 0; $i < count($mark_list); $i++) + { + $delete_sql_id .= (($delete_sql_id != '') ? ', ' : '') . intval($mark_list[$i]); + } + $delete_sql_id = "AND privmsgs_id IN ($delete_sql_id)"; + } + + switch($folder) + { + case 'inbox': + $delete_type = "privmsgs_to_userid = " . $userdata['user_id'] . " AND ( + privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )"; + break; + + case 'outbox': + $delete_type = "privmsgs_from_userid = " . $userdata['user_id'] . " AND ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )"; + break; + + case 'sentbox': + $delete_type = "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_SENT_MAIL; + break; + + case 'savebox': + $delete_type = "( ( privmsgs_from_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " ) + OR ( privmsgs_to_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) )"; + break; + } + + $sql = "SELECT privmsgs_id + FROM " . PRIVMSGS_TABLE . " + WHERE $delete_type $delete_sql_id"; + + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain id list to delete messages', '', __LINE__, __FILE__, $sql); + } + + $mark_list = array(); + while ( $row = $db->sql_fetchrow($result) ) + { + $mark_list[] = $row['privmsgs_id']; + } + + unset($delete_type); + + if ( count($mark_list) ) + { + $delete_sql_id = ''; + for ($i = 0; $i < sizeof($mark_list); $i++) + { + $delete_sql_id .= (($delete_sql_id != '') ? ', ' : '') . intval($mark_list[$i]); + } + + if ($folder == 'inbox' || $folder == 'outbox') + { + switch ($folder) + { + case 'inbox': + $sql = "privmsgs_to_userid = " . $userdata['user_id']; + break; + case 'outbox': + $sql = "privmsgs_from_userid = " . $userdata['user_id']; + break; + } + + // Get information relevant to new or unread mail + // so we can adjust users counters appropriately + $sql = "SELECT privmsgs_to_userid, privmsgs_type + FROM " . PRIVMSGS_TABLE . " + WHERE privmsgs_id IN ($delete_sql_id) + AND $sql + AND privmsgs_type IN (" . PRIVMSGS_NEW_MAIL . ", " . PRIVMSGS_UNREAD_MAIL . ")"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain user id list for outbox messages', '', __LINE__, __FILE__, $sql); + } + + if ( $row = $db->sql_fetchrow($result)) + { + $update_users = $update_list = array(); + + do + { + switch ($row['privmsgs_type']) + { + case PRIVMSGS_NEW_MAIL: + $update_users['new'][$row['privmsgs_to_userid']]++; + break; + + case PRIVMSGS_UNREAD_MAIL: + $update_users['unread'][$row['privmsgs_to_userid']]++; + break; + } + } + while ($row = $db->sql_fetchrow($result)); + + if (sizeof($update_users)) + { + while (list($type, $users) = each($update_users)) + { + while (list($user_id, $dec) = each($users)) + { + $update_list[$type][$dec][] = $user_id; + } + } + unset($update_users); + + while (list($type, $dec_ary) = each($update_list)) + { + switch ($type) + { + case 'new': + $type = "user_new_privmsg"; + break; + + case 'unread': + $type = "user_unread_privmsg"; + break; + } + + while (list($dec, $user_ary) = each($dec_ary)) + { + $user_ids = implode(', ', $user_ary); + + $sql = "UPDATE " . USERS_TABLE . " + SET $type = $type - $dec + WHERE user_id IN ($user_ids)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update user pm counters', '', __LINE__, __FILE__, $sql); + } + } + } + unset($update_list); + } + } + $db->sql_freeresult($result); + } + + // Delete the messages + $delete_text_sql = "DELETE FROM " . PRIVMSGS_TEXT_TABLE . " + WHERE privmsgs_text_id IN ($delete_sql_id)"; + $delete_sql = "DELETE FROM " . PRIVMSGS_TABLE . " + WHERE privmsgs_id IN ($delete_sql_id) + AND "; + + switch( $folder ) + { + case 'inbox': + $delete_sql .= "privmsgs_to_userid = " . $userdata['user_id'] . " AND ( + privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )"; + break; + + case 'outbox': + $delete_sql .= "privmsgs_from_userid = " . $userdata['user_id'] . " AND ( + privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )"; + break; + + case 'sentbox': + $delete_sql .= "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_SENT_MAIL; + break; + + case 'savebox': + $delete_sql .= "( ( privmsgs_from_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " ) + OR ( privmsgs_to_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) )"; + break; + } + + if ( !$db->sql_query($delete_sql, BEGIN_TRANSACTION) ) + { + message_die(GENERAL_ERROR, 'Could not delete private message info', '', __LINE__, __FILE__, $delete_sql); + } + + if ( !$db->sql_query($delete_text_sql, END_TRANSACTION) ) + { + message_die(GENERAL_ERROR, 'Could not delete private message text', '', __LINE__, __FILE__, $delete_text_sql); + } + } + } +} +else if ( $save && $mark_list && $folder != 'savebox' && $folder != 'outbox' ) +{ + if ( !$userdata['session_logged_in'] ) + { + redirect(append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true)); + } + + if (sizeof($mark_list)) + { + // See if recipient is at their savebox limit + $sql = "SELECT COUNT(privmsgs_id) AS savebox_items, MIN(privmsgs_date) AS oldest_post_time + FROM " . PRIVMSGS_TABLE . " + WHERE ( ( privmsgs_to_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) + OR ( privmsgs_from_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . ") )"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain sent message info for sendee', '', __LINE__, __FILE__, $sql); + } + + $sql_priority = ( SQL_LAYER == 'mysql' ) ? 'LOW_PRIORITY' : ''; + + if ( $saved_info = $db->sql_fetchrow($result) ) + { + if ($board_config['max_savebox_privmsgs'] && $saved_info['savebox_items'] >= $board_config['max_savebox_privmsgs'] ) + { + $sql = "SELECT privmsgs_id FROM " . PRIVMSGS_TABLE . " + WHERE ( ( privmsgs_to_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) + OR ( privmsgs_from_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . ") ) + AND privmsgs_date = " . $saved_info['oldest_post_time']; + if ( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not find oldest privmsgs (save)', '', __LINE__, __FILE__, $sql); + } + $old_privmsgs_id = $db->sql_fetchrow($result); + $old_privmsgs_id = $old_privmsgs_id['privmsgs_id']; + + $sql = "DELETE $sql_priority FROM " . PRIVMSGS_TABLE . " + WHERE privmsgs_id = $old_privmsgs_id"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (save)', '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE $sql_priority FROM " . PRIVMSGS_TEXT_TABLE . " + WHERE privmsgs_text_id = $old_privmsgs_id"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (save)', '', __LINE__, __FILE__, $sql); + } + } + } + + $saved_sql_id = ''; + for ($i = 0; $i < sizeof($mark_list); $i++) + { + $saved_sql_id .= (($saved_sql_id != '') ? ', ' : '') . intval($mark_list[$i]); + } + + // Process request + $saved_sql = "UPDATE " . PRIVMSGS_TABLE; + + // Decrement read/new counters if appropriate + if ($folder == 'inbox' || $folder == 'outbox') + { + switch ($folder) + { + case 'inbox': + $sql = "privmsgs_to_userid = " . $userdata['user_id']; + break; + case 'outbox': + $sql = "privmsgs_from_userid = " . $userdata['user_id']; + break; + } + + // Get information relevant to new or unread mail + // so we can adjust users counters appropriately + $sql = "SELECT privmsgs_to_userid, privmsgs_type + FROM " . PRIVMSGS_TABLE . " + WHERE privmsgs_id IN ($saved_sql_id) + AND $sql + AND privmsgs_type IN (" . PRIVMSGS_NEW_MAIL . ", " . PRIVMSGS_UNREAD_MAIL . ")"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain user id list for outbox messages', '', __LINE__, __FILE__, $sql); + } + + if ( $row = $db->sql_fetchrow($result)) + { + $update_users = $update_list = array(); + + do + { + switch ($row['privmsgs_type']) + { + case PRIVMSGS_NEW_MAIL: + $update_users['new'][$row['privmsgs_to_userid']]++; + break; + + case PRIVMSGS_UNREAD_MAIL: + $update_users['unread'][$row['privmsgs_to_userid']]++; + break; + } + } + while ($row = $db->sql_fetchrow($result)); + + if (sizeof($update_users)) + { + while (list($type, $users) = each($update_users)) + { + while (list($user_id, $dec) = each($users)) + { + $update_list[$type][$dec][] = $user_id; + } + } + unset($update_users); + + while (list($type, $dec_ary) = each($update_list)) + { + switch ($type) + { + case 'new': + $type = "user_new_privmsg"; + break; + + case 'unread': + $type = "user_unread_privmsg"; + break; + } + + while (list($dec, $user_ary) = each($dec_ary)) + { + $user_ids = implode(', ', $user_ary); + + $sql = "UPDATE " . USERS_TABLE . " + SET $type = $type - $dec + WHERE user_id IN ($user_ids)"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update user pm counters', '', __LINE__, __FILE__, $sql); + } + } + } + unset($update_list); + } + } + $db->sql_freeresult($result); + } + + switch ($folder) + { + case 'inbox': + $saved_sql .= " SET privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " + WHERE privmsgs_to_userid = " . $userdata['user_id'] . " + AND ( privmsgs_type = " . PRIVMSGS_READ_MAIL . " + OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " + OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . ")"; + break; + + case 'outbox': + $saved_sql .= " SET privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " + WHERE privmsgs_from_userid = " . $userdata['user_id'] . " + AND ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " + OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " ) "; + break; + + case 'sentbox': + $saved_sql .= " SET privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " + WHERE privmsgs_from_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SENT_MAIL; + break; + } + + $saved_sql .= " AND privmsgs_id IN ($saved_sql_id)"; + + if ( !$db->sql_query($saved_sql) ) + { + message_die(GENERAL_ERROR, 'Could not save private messages', '', __LINE__, __FILE__, $saved_sql); + } + + redirect(append_sid("privmsg.$phpEx?folder=savebox", true)); + } +} +else if ( $submit || $refresh || $mode != '' ) +{ + if ( !$userdata['session_logged_in'] ) + { + $user_id = ( isset($HTTP_GET_VARS[POST_USERS_URL]) ) ? '&' . POST_USERS_URL . '=' . intval($HTTP_GET_VARS[POST_USERS_URL]) : ''; + redirect(append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode" . $user_id, true)); + } + + // + // Toggles + // + if ( !$board_config['allow_html'] ) + { + $html_on = 0; + } + else + { + $html_on = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['disable_html']) ) ? 0 : TRUE ) : $userdata['user_allowhtml']; + } + + if ( !$board_config['allow_bbcode'] ) + { + $bbcode_on = 0; + } + else + { + $bbcode_on = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['disable_bbcode']) ) ? 0 : TRUE ) : $userdata['user_allowbbcode']; + } + + if ( !$board_config['allow_smilies'] ) + { + $smilies_on = 0; + } + else + { + $smilies_on = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['disable_smilies']) ) ? 0 : TRUE ) : $userdata['user_allowsmile']; + } + + $attach_sig = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['attach_sig']) ) ? TRUE : 0 ) : $userdata['user_attachsig']; + $user_sig = ( $userdata['user_sig'] != '' && $board_config['allow_sig'] ) ? $userdata['user_sig'] : ""; + + if ( $submit && $mode != 'edit' ) + { + // + // Flood control + // + $sql = "SELECT MAX(privmsgs_date) AS last_post_time + FROM " . PRIVMSGS_TABLE . " + WHERE privmsgs_from_userid = " . $userdata['user_id']; + if ( $result = $db->sql_query($sql) ) + { + $db_row = $db->sql_fetchrow($result); + + $last_post_time = $db_row['last_post_time']; + $current_time = time(); + + if ( ( $current_time - $last_post_time ) < $board_config['flood_interval']) + { + message_die(GENERAL_MESSAGE, $lang['Flood_Error']); + } + } + // + // End Flood control + // + } + + if ($submit && $mode == 'edit') + { + $sql = 'SELECT privmsgs_from_userid + FROM ' . PRIVMSGS_TABLE . ' + WHERE privmsgs_id = ' . (int) $privmsg_id . ' + AND privmsgs_from_userid = ' . $userdata['user_id']; + + if (!($result = $db->sql_query($sql))) + { + message_die(GENERAL_ERROR, "Could not obtain message details", "", __LINE__, __FILE__, $sql); + } + + if (!($row = $db->sql_fetchrow($result))) + { + message_die(GENERAL_MESSAGE, $lang['No_such_post']); + } + $db->sql_freeresult($result); + + unset($row); + } + + if ( $submit ) + { + // session id check + if ($sid == '' || $sid != $userdata['session_id']) + { + $error = true; + $error_msg .= ( ( !empty($error_msg) ) ? '
    ' : '' ) . $lang['Session_invalid']; + } + + if ( !empty($HTTP_POST_VARS['username']) ) + { + $to_username = phpbb_clean_username($HTTP_POST_VARS['username']); + + $sql = "SELECT user_id, user_notify_pm, user_email, user_lang, user_active + FROM " . USERS_TABLE . " + WHERE username = '" . str_replace("\'", "''", $to_username) . "' + AND user_id <> " . ANONYMOUS; + if ( !($result = $db->sql_query($sql)) ) + { + $error = TRUE; + $error_msg = $lang['No_such_user']; + } + + if (!($to_userdata = $db->sql_fetchrow($result))) + { + $error = TRUE; + $error_msg = $lang['No_such_user']; + } + } + else + { + $error = TRUE; + $error_msg .= ( ( !empty($error_msg) ) ? '
    ' : '' ) . $lang['No_to_user']; + } + + $privmsg_subject = trim(htmlspecialchars($HTTP_POST_VARS['subject'])); + if ( empty($privmsg_subject) ) + { + $error = TRUE; + $error_msg .= ( ( !empty($error_msg) ) ? '
    ' : '' ) . $lang['Empty_subject']; + } + + if ( !empty($HTTP_POST_VARS['message']) ) + { + if ( !$error ) + { + if ( $bbcode_on ) + { + $bbcode_uid = make_bbcode_uid(); + } + + $privmsg_message = prepare_message($HTTP_POST_VARS['message'], $html_on, $bbcode_on, $smilies_on, $bbcode_uid); + + } + } + else + { + $error = TRUE; + $error_msg .= ( ( !empty($error_msg) ) ? '
    ' : '' ) . $lang['Empty_message']; + } + } + + if ( $submit && !$error ) + { + // + // Has admin prevented user from sending PM's? + // + if ( !$userdata['user_allow_pm'] ) + { + $message = $lang['Cannot_send_privmsg']; + message_die(GENERAL_MESSAGE, $message); + } + + $msg_time = time(); + + if ( $mode != 'edit' ) + { + // + // See if recipient is at their inbox limit + // + $sql = "SELECT COUNT(privmsgs_id) AS inbox_items, MIN(privmsgs_date) AS oldest_post_time + FROM " . PRIVMSGS_TABLE . " + WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " + OR privmsgs_type = " . PRIVMSGS_READ_MAIL . " + OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " ) + AND privmsgs_to_userid = " . $to_userdata['user_id']; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_MESSAGE, $lang['No_such_user']); + } + + $sql_priority = ( SQL_LAYER == 'mysql' ) ? 'LOW_PRIORITY' : ''; + + if ( $inbox_info = $db->sql_fetchrow($result) ) + { + if ($board_config['max_inbox_privmsgs'] && $inbox_info['inbox_items'] >= $board_config['max_inbox_privmsgs']) + { + $sql = "SELECT privmsgs_id FROM " . PRIVMSGS_TABLE . " + WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " + OR privmsgs_type = " . PRIVMSGS_READ_MAIL . " + OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " ) + AND privmsgs_date = " . $inbox_info['oldest_post_time'] . " + AND privmsgs_to_userid = " . $to_userdata['user_id']; + if ( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not find oldest privmsgs (inbox)', '', __LINE__, __FILE__, $sql); + } + $old_privmsgs_id = $db->sql_fetchrow($result); + $old_privmsgs_id = $old_privmsgs_id['privmsgs_id']; + + $sql = "DELETE $sql_priority FROM " . PRIVMSGS_TABLE . " + WHERE privmsgs_id = $old_privmsgs_id"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (inbox)'.$sql, '', __LINE__, __FILE__, $sql); + } + + $sql = "DELETE $sql_priority FROM " . PRIVMSGS_TEXT_TABLE . " + WHERE privmsgs_text_id = $old_privmsgs_id"; + if ( !$db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (inbox)', '', __LINE__, __FILE__, $sql); + } + } + } + + $sql_info = "INSERT INTO " . PRIVMSGS_TABLE . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip, privmsgs_enable_html, privmsgs_enable_bbcode, privmsgs_enable_smilies, privmsgs_attach_sig) + VALUES (" . PRIVMSGS_NEW_MAIL . ", '" . str_replace("\'", "''", $privmsg_subject) . "', " . $userdata['user_id'] . ", " . $to_userdata['user_id'] . ", $msg_time, '$user_ip', $html_on, $bbcode_on, $smilies_on, $attach_sig)"; + } + else + { + $sql_info = "UPDATE " . PRIVMSGS_TABLE . " + SET privmsgs_type = " . PRIVMSGS_NEW_MAIL . ", privmsgs_subject = '" . str_replace("\'", "''", $privmsg_subject) . "', privmsgs_from_userid = " . $userdata['user_id'] . ", privmsgs_to_userid = " . $to_userdata['user_id'] . ", privmsgs_date = $msg_time, privmsgs_ip = '$user_ip', privmsgs_enable_html = $html_on, privmsgs_enable_bbcode = $bbcode_on, privmsgs_enable_smilies = $smilies_on, privmsgs_attach_sig = $attach_sig + WHERE privmsgs_id = $privmsg_id"; + } + + if ( !($result = $db->sql_query($sql_info, BEGIN_TRANSACTION)) ) + { + message_die(GENERAL_ERROR, "Could not insert/update private message sent info.", "", __LINE__, __FILE__, $sql_info); + } + + if ( $mode != 'edit' ) + { + $privmsg_sent_id = $db->sql_nextid(); + + $sql = "INSERT INTO " . PRIVMSGS_TEXT_TABLE . " (privmsgs_text_id, privmsgs_bbcode_uid, privmsgs_text) + VALUES ($privmsg_sent_id, '" . $bbcode_uid . "', '" . str_replace("\'", "''", $privmsg_message) . "')"; + } + else + { + $sql = "UPDATE " . PRIVMSGS_TEXT_TABLE . " + SET privmsgs_text = '" . str_replace("\'", "''", $privmsg_message) . "', privmsgs_bbcode_uid = '$bbcode_uid' + WHERE privmsgs_text_id = $privmsg_id"; + } + + if ( !$db->sql_query($sql, END_TRANSACTION) ) + { + message_die(GENERAL_ERROR, "Could not insert/update private message sent text.", "", __LINE__, __FILE__, $sql); + } + + if ( $mode != 'edit' ) + { + // + // Add to the users new pm counter + // + $sql = "UPDATE " . USERS_TABLE . " + SET user_new_privmsg = user_new_privmsg + 1, user_last_privmsg = " . time() . " + WHERE user_id = " . $to_userdata['user_id']; + if ( !$status = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not update private message new/read status for user', '', __LINE__, __FILE__, $sql); + } + + if ( $to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']) && $to_userdata['user_active'] ) + { + $script_name = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path'])); + $script_name = ( $script_name != '' ) ? $script_name . '/privmsg.'.$phpEx : 'privmsg.'.$phpEx; + $server_name = trim($board_config['server_name']); + $server_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://'; + $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/'; + + include($phpbb_root_path . 'includes/emailer.'.$phpEx); + $emailer = new emailer($board_config['smtp_delivery']); + + $emailer->from($board_config['board_email']); + $emailer->replyto($board_config['board_email']); + + $emailer->use_template('privmsg_notify', $to_userdata['user_lang']); + $emailer->email_address($to_userdata['user_email']); + $emailer->set_subject($lang['Notification_subject']); + + $emailer->assign_vars(array( + 'USERNAME' => stripslashes($to_username), + 'SITENAME' => $board_config['sitename'], + 'EMAIL_SIG' => (!empty($board_config['board_email_sig'])) ? str_replace('
    ', "\n", "-- \n" . $board_config['board_email_sig']) : '', + + 'U_INBOX' => $server_protocol . $server_name . $server_port . $script_name . '?folder=inbox') + ); + + $emailer->send(); + $emailer->reset(); + } + } + + $template->assign_vars(array( + 'META' => '') + ); + + $msg = $lang['Message_sent'] . '

    ' . sprintf($lang['Click_return_inbox'], '', ' ') . '

    ' . sprintf($lang['Click_return_index'], '', ''); + + message_die(GENERAL_MESSAGE, $msg); + } + else if ( $preview || $refresh || $error ) + { + + // + // If we're previewing or refreshing then obtain the data + // passed to the script, process it a little, do some checks + // where neccessary, etc. + // + $to_username = (isset($HTTP_POST_VARS['username']) ) ? trim(htmlspecialchars(stripslashes($HTTP_POST_VARS['username']))) : ''; + + $privmsg_subject = ( isset($HTTP_POST_VARS['subject']) ) ? trim(htmlspecialchars(stripslashes($HTTP_POST_VARS['subject']))) : ''; + $privmsg_message = ( isset($HTTP_POST_VARS['message']) ) ? trim($HTTP_POST_VARS['message']) : ''; + // $privmsg_message = preg_replace('##si', '</textarea>', $privmsg_message); + + $user_sig = ( $board_config['allow_sig'] ) ? (($privmsg['privmsgs_type'] == PRIVMSGS_NEW_MAIL) ? $user_sig : $privmsg['user_sig']) : ''; + + $to_username = $privmsg['username']; + $to_userid = $privmsg['user_id']; + + } + else if ( $mode == 'reply' || $mode == 'quote' ) + { + + $sql = "SELECT pm.privmsgs_subject, pm.privmsgs_date, pmt.privmsgs_bbcode_uid, pmt.privmsgs_text, u.username, u.user_id + FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u + WHERE pm.privmsgs_id = $privmsg_id + AND pmt.privmsgs_text_id = pm.privmsgs_id + AND pm.privmsgs_to_userid = " . $userdata['user_id'] . " + AND u.user_id = pm.privmsgs_from_userid"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain private message for editing', '', __LINE__, __FILE__, $sql); + } + + if ( !($privmsg = $db->sql_fetchrow($result)) ) + { + redirect(append_sid("privmsg.$phpEx?folder=$folder", true)); + } + + $orig_word = $replacement_word = array(); + obtain_word_list($orig_word, $replacement_word); + + $privmsg_subject = ( ( !preg_match('/^Re:/', $privmsg['privmsgs_subject']) ) ? 'Re: ' : '' ) . $privmsg['privmsgs_subject']; + $privmsg_subject = preg_replace($orig_word, $replacement_word, $privmsg_subject); + + $to_username = $privmsg['username']; + $to_userid = $privmsg['user_id']; + + if ( $mode == 'quote' ) + { + $privmsg_message = $privmsg['privmsgs_text']; + $privmsg_bbcode_uid = $privmsg['privmsgs_bbcode_uid']; + + $privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$privmsg_bbcode_uid/si", '', $privmsg_message); + $privmsg_message = str_replace('
    ', "\n", $privmsg_message); + // $privmsg_message = preg_replace('##si', '</textarea>', $privmsg_message); + $privmsg_message = preg_replace($orig_word, $replacement_word, $privmsg_message); + + $msg_date = create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); + + $privmsg_message = '[quote="' . $to_username . '"]' . $privmsg_message . '[/quote]'; + + $mode = 'reply'; + } + } + else + { + $privmsg_subject = $privmsg_message = $to_username = ''; + } + } + + // + // Has admin prevented user from sending PM's? + // + if ( !$userdata['user_allow_pm'] && $mode != 'edit' ) + { + $message = $lang['Cannot_send_privmsg']; + message_die(GENERAL_MESSAGE, $message); + } + + // + // Start output, first preview, then errors then post form + // + $page_title = $lang['Send_private_message']; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + if ( $preview && !$error ) + { + $orig_word = array(); + $replacement_word = array(); + obtain_word_list($orig_word, $replacement_word); + + if ( $bbcode_on ) + { + $bbcode_uid = make_bbcode_uid(); + } + + $preview_message = stripslashes(prepare_message($privmsg_message, $html_on, $bbcode_on, $smilies_on, $bbcode_uid)); + $privmsg_message = stripslashes(preg_replace($html_entities_match, $html_entities_replace, $privmsg_message)); + + // + // Finalise processing as per viewtopic + // + if ( !$html_on || !$board_config['allow_html'] || !$userdata['user_allowhtml'] ) + { + if ( $user_sig != '' ) + { + $user_sig = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $user_sig); + } + } + + if ( $attach_sig && $user_sig != '' && $userdata['user_sig_bbcode_uid'] ) + { + $user_sig = bbencode_second_pass($user_sig, $userdata['user_sig_bbcode_uid']); + } + + if ( $bbcode_on ) + { + $preview_message = bbencode_second_pass($preview_message, $bbcode_uid); + } + + if ( $attach_sig && $user_sig != '' ) + { + $preview_message = $preview_message . '

    _________________
    ' . $user_sig; + } + + if ( count($orig_word) ) + { + $preview_subject = preg_replace($orig_word, $replacement_word, $privmsg_subject); + $preview_message = preg_replace($orig_word, $replacement_word, $preview_message); + } + else + { + $preview_subject = $privmsg_subject; + } + + if ( $smilies_on ) + { + $preview_message = smilies_pass($preview_message); + } + + $preview_message = make_clickable($preview_message); + $preview_message = str_replace("\n", '
    ', $preview_message); + + $s_hidden_fields = ''; + $s_hidden_fields .= ''; + + if ( isset($privmsg_id) ) + { + $s_hidden_fields .= ''; + } + + $template->set_filenames(array( + "preview" => 'privmsgs_preview.tpl') + ); + + $template->assign_vars(array( + 'TOPIC_TITLE' => $preview_subject, + 'POST_SUBJECT' => $preview_subject, + 'MESSAGE_TO' => $to_username, + 'MESSAGE_FROM' => $userdata['username'], + 'POST_DATE' => create_date($board_config['default_dateformat'], time(), $board_config['board_timezone']), + 'MESSAGE' => $preview_message, + + 'S_HIDDEN_FIELDS' => $s_hidden_fields, + + 'L_SUBJECT' => $lang['Subject'], + 'L_DATE' => $lang['Date'], + 'L_FROM' => $lang['From'], + 'L_TO' => $lang['To'], + 'L_PREVIEW' => $lang['Preview'], + 'L_POSTED' => $lang['Posted']) + ); + + $template->assign_var_from_handle('POST_PREVIEW_BOX', 'preview'); + } + + // + // Start error handling + // + if ($error) + { + $privmsg_message = htmlspecialchars($privmsg_message); + $template->set_filenames(array( + 'reg_header' => 'error_body.tpl') + ); + $template->assign_vars(array( + 'ERROR_MESSAGE' => $error_msg) + ); + $template->assign_var_from_handle('ERROR_BOX', 'reg_header'); + } + + // + // Load templates + // + $template->set_filenames(array( + 'body' => 'posting_body.tpl') + ); + make_jumpbox('viewforum.'.$phpEx); + + // + // Enable extensions in posting_body + // + $template->assign_block_vars('switch_privmsg', array()); + + // + // HTML toggle selection + // + if ( $board_config['allow_html'] ) + { + $html_status = $lang['HTML_is_ON']; + $template->assign_block_vars('switch_html_checkbox', array()); + } + else + { + $html_status = $lang['HTML_is_OFF']; + } + + // + // BBCode toggle selection + // + if ( $board_config['allow_bbcode'] ) + { + $bbcode_status = $lang['BBCode_is_ON']; + $template->assign_block_vars('switch_bbcode_checkbox', array()); + } + else + { + $bbcode_status = $lang['BBCode_is_OFF']; + } + + // + // Smilies toggle selection + // + if ( $board_config['allow_smilies'] ) + { + $smilies_status = $lang['Smilies_are_ON']; + $template->assign_block_vars('switch_smilies_checkbox', array()); + } + else + { + $smilies_status = $lang['Smilies_are_OFF']; + } + + // + // Signature toggle selection - only show if + // the user has a signature + // + if ( $user_sig != '' ) + { + $template->assign_block_vars('switch_signature_checkbox', array()); + } + + if ( $mode == 'post' ) + { + $post_a = $lang['Send_a_new_message']; + } + else if ( $mode == 'reply' ) + { + $post_a = $lang['Send_a_reply']; + $mode = 'post'; + } + else if ( $mode == 'edit' ) + { + $post_a = $lang['Edit_message']; + } + + $s_hidden_fields = ''; + $s_hidden_fields .= ''; + $s_hidden_fields .= ''; + if ( $mode == 'edit' ) + { + $s_hidden_fields .= ''; + } + + // + // Send smilies to template + // + generate_smilies('inline', PAGE_PRIVMSGS); + + $template->assign_vars(array( + 'SUBJECT' => $privmsg_subject, + 'USERNAME' => $to_username, + 'MESSAGE' => $privmsg_message, + 'HTML_STATUS' => $html_status, + 'SMILIES_STATUS' => $smilies_status, + 'BBCODE_STATUS' => sprintf($bbcode_status, '', ''), + 'FORUM_NAME' => $lang['Private_Message'], + + 'BOX_NAME' => $l_box_name, + 'INBOX_IMG' => $inbox_img, + 'SENTBOX_IMG' => $sentbox_img, + 'OUTBOX_IMG' => $outbox_img, + 'SAVEBOX_IMG' => $savebox_img, + 'INBOX' => $inbox_url, + 'SENTBOX' => $sentbox_url, + 'OUTBOX' => $outbox_url, + 'SAVEBOX' => $savebox_url, + + 'L_SUBJECT' => $lang['Subject'], + 'L_MESSAGE_BODY' => $lang['Message_body'], + 'L_OPTIONS' => $lang['Options'], + 'L_SPELLCHECK' => $lang['Spellcheck'], + 'L_PREVIEW' => $lang['Preview'], + 'L_SUBMIT' => $lang['Submit'], + 'L_CANCEL' => $lang['Cancel'], + 'L_POST_A' => $post_a, + 'L_FIND_USERNAME' => $lang['Find_username'], + 'L_FIND' => $lang['Find'], + 'L_DISABLE_HTML' => $lang['Disable_HTML_pm'], + 'L_DISABLE_BBCODE' => $lang['Disable_BBCode_pm'], + 'L_DISABLE_SMILIES' => $lang['Disable_Smilies_pm'], + 'L_ATTACH_SIGNATURE' => $lang['Attach_signature'], + + 'L_BBCODE_B_HELP' => $lang['bbcode_b_help'], + 'L_BBCODE_I_HELP' => $lang['bbcode_i_help'], + 'L_BBCODE_U_HELP' => $lang['bbcode_u_help'], + 'L_BBCODE_Q_HELP' => $lang['bbcode_q_help'], + 'L_BBCODE_C_HELP' => $lang['bbcode_c_help'], + 'L_BBCODE_L_HELP' => $lang['bbcode_l_help'], + 'L_BBCODE_O_HELP' => $lang['bbcode_o_help'], + 'L_BBCODE_P_HELP' => $lang['bbcode_p_help'], + 'L_BBCODE_W_HELP' => $lang['bbcode_w_help'], + 'L_BBCODE_A_HELP' => $lang['bbcode_a_help'], + 'L_BBCODE_S_HELP' => $lang['bbcode_s_help'], + 'L_BBCODE_F_HELP' => $lang['bbcode_f_help'], + 'L_EMPTY_MESSAGE' => $lang['Empty_message'], + + 'L_FONT_COLOR' => $lang['Font_color'], + 'L_COLOR_DEFAULT' => $lang['color_default'], + 'L_COLOR_DARK_RED' => $lang['color_dark_red'], + 'L_COLOR_RED' => $lang['color_red'], + 'L_COLOR_ORANGE' => $lang['color_orange'], + 'L_COLOR_BROWN' => $lang['color_brown'], + 'L_COLOR_YELLOW' => $lang['color_yellow'], + 'L_COLOR_GREEN' => $lang['color_green'], + 'L_COLOR_OLIVE' => $lang['color_olive'], + 'L_COLOR_CYAN' => $lang['color_cyan'], + 'L_COLOR_BLUE' => $lang['color_blue'], + 'L_COLOR_DARK_BLUE' => $lang['color_dark_blue'], + 'L_COLOR_INDIGO' => $lang['color_indigo'], + 'L_COLOR_VIOLET' => $lang['color_violet'], + 'L_COLOR_WHITE' => $lang['color_white'], + 'L_COLOR_BLACK' => $lang['color_black'], + + 'L_FONT_SIZE' => $lang['Font_size'], + 'L_FONT_TINY' => $lang['font_tiny'], + 'L_FONT_SMALL' => $lang['font_small'], + 'L_FONT_NORMAL' => $lang['font_normal'], + 'L_FONT_LARGE' => $lang['font_large'], + 'L_FONT_HUGE' => $lang['font_huge'], + + 'L_BBCODE_CLOSE_TAGS' => $lang['Close_Tags'], + 'L_STYLES_TIP' => $lang['Styles_tip'], + + 'S_HTML_CHECKED' => ( !$html_on ) ? ' checked="checked"' : '', + 'S_BBCODE_CHECKED' => ( !$bbcode_on ) ? ' checked="checked"' : '', + 'S_SMILIES_CHECKED' => ( !$smilies_on ) ? ' checked="checked"' : '', + 'S_SIGNATURE_CHECKED' => ( $attach_sig ) ? ' checked="checked"' : '', + 'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields, + 'S_POST_ACTION' => append_sid("privmsg.$phpEx"), + + 'U_SEARCH_USER' => append_sid("search.$phpEx?mode=searchuser"), + 'U_VIEW_FORUM' => append_sid("privmsg.$phpEx")) + ); + + $template->pparse('body'); + + include($phpbb_root_path . 'includes/page_tail.'.$phpEx); +} + +// +// Default page +// +if ( !$userdata['session_logged_in'] ) +{ + redirect(append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true)); +} + +// +// Update unread status +// +$sql = "UPDATE " . USERS_TABLE . " + SET user_unread_privmsg = user_unread_privmsg + user_new_privmsg, user_new_privmsg = 0, user_last_privmsg = " . $userdata['session_start'] . " + WHERE user_id = " . $userdata['user_id']; +if ( !$db->sql_query($sql) ) +{ + message_die(GENERAL_ERROR, 'Could not update private message new/read status for user', '', __LINE__, __FILE__, $sql); +} + +$sql = "UPDATE " . PRIVMSGS_TABLE . " + SET privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " + WHERE privmsgs_type = " . PRIVMSGS_NEW_MAIL . " + AND privmsgs_to_userid = " . $userdata['user_id']; +if ( !$db->sql_query($sql) ) +{ + message_die(GENERAL_ERROR, 'Could not update private message new/read status (2) for user', '', __LINE__, __FILE__, $sql); +} + +// +// Reset PM counters +// +$userdata['user_new_privmsg'] = 0; +$userdata['user_unread_privmsg'] = ( $userdata['user_new_privmsg'] + $userdata['user_unread_privmsg'] ); + +// +// Generate page +// +$page_title = $lang['Private_Messaging']; +include($phpbb_root_path . 'includes/page_header.'.$phpEx); + +// +// Load templates +// +$template->set_filenames(array( + 'body' => 'privmsgs_body.tpl') +); +make_jumpbox('viewforum.'.$phpEx); + +$orig_word = array(); +$replacement_word = array(); +obtain_word_list($orig_word, $replacement_word); + +// +// New message +// +$post_new_mesg_url = '' . $lang['Send_a_new_message'] . ''; + +// +// General SQL to obtain messages +// +$sql_tot = "SELECT COUNT(privmsgs_id) AS total + FROM " . PRIVMSGS_TABLE . " "; +$sql = "SELECT pm.privmsgs_type, pm.privmsgs_id, pm.privmsgs_date, pm.privmsgs_subject, u.user_id, u.username + FROM " . PRIVMSGS_TABLE . " pm, " . USERS_TABLE . " u "; +switch( $folder ) +{ + case 'inbox': + $sql_tot .= "WHERE privmsgs_to_userid = " . $userdata['user_id'] . " + AND ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " + OR privmsgs_type = " . PRIVMSGS_READ_MAIL . " + OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )"; + + $sql .= "WHERE pm.privmsgs_to_userid = " . $userdata['user_id'] . " + AND u.user_id = pm.privmsgs_from_userid + AND ( pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . " + OR pm.privmsgs_type = " . PRIVMSGS_READ_MAIL . " + OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )"; + break; + + case 'outbox': + $sql_tot .= "WHERE privmsgs_from_userid = " . $userdata['user_id'] . " + AND ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " + OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )"; + + $sql .= "WHERE pm.privmsgs_from_userid = " . $userdata['user_id'] . " + AND u.user_id = pm.privmsgs_to_userid + AND ( pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . " + OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )"; + break; + + case 'sentbox': + $sql_tot .= "WHERE privmsgs_from_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SENT_MAIL; + + $sql .= "WHERE pm.privmsgs_from_userid = " . $userdata['user_id'] . " + AND u.user_id = pm.privmsgs_to_userid + AND pm.privmsgs_type = " . PRIVMSGS_SENT_MAIL; + break; + + case 'savebox': + $sql_tot .= "WHERE ( ( privmsgs_to_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) + OR ( privmsgs_from_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . ") )"; + + $sql .= "WHERE u.user_id = pm.privmsgs_from_userid + AND ( ( pm.privmsgs_to_userid = " . $userdata['user_id'] . " + AND pm.privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) + OR ( pm.privmsgs_from_userid = " . $userdata['user_id'] . " + AND pm.privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " ) )"; + break; + + default: + message_die(GENERAL_MESSAGE, $lang['No_such_folder']); + break; +} + +// +// Show messages over previous x days/months +// +if ( $submit_msgdays && ( !empty($HTTP_POST_VARS['msgdays']) || !empty($HTTP_GET_VARS['msgdays']) ) ) +{ + $msg_days = ( !empty($HTTP_POST_VARS['msgdays']) ) ? intval($HTTP_POST_VARS['msgdays']) : intval($HTTP_GET_VARS['msgdays']); + $min_msg_time = time() - ($msg_days * 86400); + + $limit_msg_time_total = " AND privmsgs_date > $min_msg_time"; + $limit_msg_time = " AND pm.privmsgs_date > $min_msg_time "; + + if ( !empty($HTTP_POST_VARS['msgdays']) ) + { + $start = 0; + } +} +else +{ + $limit_msg_time = $limit_msg_time_total = ''; + $msg_days = 0; +} + +$sql .= $limit_msg_time . " ORDER BY pm.privmsgs_date DESC LIMIT $start, " . $board_config['topics_per_page']; +$sql_all_tot = $sql_tot; +$sql_tot .= $limit_msg_time_total; + +// +// Get messages +// +if ( !($result = $db->sql_query($sql_tot)) ) +{ + message_die(GENERAL_ERROR, 'Could not query private message information', '', __LINE__, __FILE__, $sql_tot); +} + +$pm_total = ( $row = $db->sql_fetchrow($result) ) ? $row['total'] : 0; + +if ( !($result = $db->sql_query($sql_all_tot)) ) +{ + message_die(GENERAL_ERROR, 'Could not query private message information', '', __LINE__, __FILE__, $sql_tot); +} + +$pm_all_total = ( $row = $db->sql_fetchrow($result) ) ? $row['total'] : 0; + +// +// Build select box +// +$previous_days = array(0, 1, 7, 14, 30, 90, 180, 364); +$previous_days_text = array($lang['All_Posts'], $lang['1_Day'], $lang['7_Days'], $lang['2_Weeks'], $lang['1_Month'], $lang['3_Months'], $lang['6_Months'], $lang['1_Year']); + +$select_msg_days = ''; +for($i = 0; $i < count($previous_days); $i++) +{ + $selected = ( $msg_days == $previous_days[$i] ) ? ' selected="selected"' : ''; + $select_msg_days .= ''; +} + +// +// Define correct icons +// +switch ( $folder ) +{ + case 'inbox': + $l_box_name = $lang['Inbox']; + break; + case 'outbox': + $l_box_name = $lang['Outbox']; + break; + case 'savebox': + $l_box_name = $lang['Savebox']; + break; + case 'sentbox': + $l_box_name = $lang['Sentbox']; + break; +} +$post_pm = append_sid("privmsg.$phpEx?mode=post"); +$post_pm_img = '' . $lang['Post_new_pm'] . ''; +$post_pm = '' . $lang['Post_new_pm'] . ''; + +// +// Output data for inbox status +// +if ( $folder != 'outbox' ) +{ + $inbox_limit_pct = ( $board_config['max_' . $folder . '_privmsgs'] > 0 ) ? round(( $pm_all_total / $board_config['max_' . $folder . '_privmsgs'] ) * 100) : 100; + $inbox_limit_img_length = ( $board_config['max_' . $folder . '_privmsgs'] > 0 ) ? round(( $pm_all_total / $board_config['max_' . $folder . '_privmsgs'] ) * $board_config['privmsg_graphic_length']) : $board_config['privmsg_graphic_length']; + $inbox_limit_remain = ( $board_config['max_' . $folder . '_privmsgs'] > 0 ) ? $board_config['max_' . $folder . '_privmsgs'] - $pm_all_total : 0; + + $template->assign_block_vars('switch_box_size_notice', array()); + + switch( $folder ) + { + case 'inbox': + $l_box_size_status = sprintf($lang['Inbox_size'], $inbox_limit_pct); + break; + case 'sentbox': + $l_box_size_status = sprintf($lang['Sentbox_size'], $inbox_limit_pct); + break; + case 'savebox': + $l_box_size_status = sprintf($lang['Savebox_size'], $inbox_limit_pct); + break; + default: + $l_box_size_status = ''; + break; + } +} +else +{ + $inbox_limit_img_length = $inbox_limit_pct = $l_box_size_status = ''; +} + +// +// Dump vars to template +// +$template->assign_vars(array( + 'BOX_NAME' => $l_box_name, + 'INBOX_IMG' => $inbox_img, + 'SENTBOX_IMG' => $sentbox_img, + 'OUTBOX_IMG' => $outbox_img, + 'SAVEBOX_IMG' => $savebox_img, + 'INBOX' => $inbox_url, + 'SENTBOX' => $sentbox_url, + 'OUTBOX' => $outbox_url, + 'SAVEBOX' => $savebox_url, + + 'POST_PM_IMG' => $post_pm_img, + 'POST_PM' => $post_pm, + + 'INBOX_LIMIT_IMG_WIDTH' => $inbox_limit_img_length, + 'INBOX_LIMIT_PERCENT' => $inbox_limit_pct, + + 'BOX_SIZE_STATUS' => $l_box_size_status, + + 'L_INBOX' => $lang['Inbox'], + 'L_OUTBOX' => $lang['Outbox'], + 'L_SENTBOX' => $lang['Sent'], + 'L_SAVEBOX' => $lang['Saved'], + 'L_MARK' => $lang['Mark'], + 'L_FLAG' => $lang['Flag'], + 'L_SUBJECT' => $lang['Subject'], + 'L_DATE' => $lang['Date'], + 'L_DISPLAY_MESSAGES' => $lang['Display_messages'], + 'L_FROM_OR_TO' => ( $folder == 'inbox' || $folder == 'savebox' ) ? $lang['From'] : $lang['To'], + 'L_MARK_ALL' => $lang['Mark_all'], + 'L_UNMARK_ALL' => $lang['Unmark_all'], + 'L_DELETE_MARKED' => $lang['Delete_marked'], + 'L_DELETE_ALL' => $lang['Delete_all'], + 'L_SAVE_MARKED' => $lang['Save_marked'], + + 'S_PRIVMSGS_ACTION' => append_sid("privmsg.$phpEx?folder=$folder"), + 'S_HIDDEN_FIELDS' => '', + 'S_POST_NEW_MSG' => $post_new_mesg_url, + 'S_SELECT_MSG_DAYS' => $select_msg_days, + + 'U_POST_NEW_TOPIC' => append_sid("privmsg.$phpEx?mode=post")) +); + +// +// Okay, let's build the correct folder +// +if ( !($result = $db->sql_query($sql)) ) +{ + message_die(GENERAL_ERROR, 'Could not query private messages', '', __LINE__, __FILE__, $sql); +} + +if ( $row = $db->sql_fetchrow($result) ) +{ + $i = 0; + do + { + $privmsg_id = $row['privmsgs_id']; + + $flag = $row['privmsgs_type']; + + $icon_flag = ( $flag == PRIVMSGS_NEW_MAIL || $flag == PRIVMSGS_UNREAD_MAIL ) ? $images['pm_unreadmsg'] : $images['pm_readmsg']; + $icon_flag_alt = ( $flag == PRIVMSGS_NEW_MAIL || $flag == PRIVMSGS_UNREAD_MAIL ) ? $lang['Unread_message'] : $lang['Read_message']; + + $msg_userid = $row['user_id']; + $msg_username = $row['username']; + + $u_from_user_profile = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$msg_userid"); + + $msg_subject = $row['privmsgs_subject']; + + if ( count($orig_word) ) + { + $msg_subject = preg_replace($orig_word, $replacement_word, $msg_subject); + } + + $u_subject = append_sid("privmsg.$phpEx?folder=$folder&mode=read&" . POST_POST_URL . "=$privmsg_id"); + + $msg_date = create_date($board_config['default_dateformat'], $row['privmsgs_date'], $board_config['board_timezone']); + + if ( $flag == PRIVMSGS_NEW_MAIL && $folder == 'inbox' ) + { + $msg_subject = '' . $msg_subject . ''; + $msg_date = '' . $msg_date . ''; + $msg_username = '' . $msg_username . ''; + } + + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + $i++; + + $template->assign_block_vars('listrow', array( + 'ROW_COLOR' => '#' . $row_color, + 'ROW_CLASS' => $row_class, + 'FROM' => $msg_username, + 'SUBJECT' => $msg_subject, + 'DATE' => $msg_date, + 'PRIVMSG_FOLDER_IMG' => $icon_flag, + + 'L_PRIVMSG_FOLDER_ALT' => $icon_flag_alt, + + 'S_MARK_ID' => $privmsg_id, + + 'U_READ' => $u_subject, + 'U_FROM_USER_PROFILE' => $u_from_user_profile) + ); + } + while( $row = $db->sql_fetchrow($result) ); + + $template->assign_vars(array( + 'PAGINATION' => generate_pagination("privmsg.$phpEx?folder=$folder", $pm_total, $board_config['topics_per_page'], $start), + 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $pm_total / $board_config['topics_per_page'] )), + + 'L_GOTO_PAGE' => $lang['Goto_page']) + ); + +} +else +{ + $template->assign_vars(array( + 'L_NO_MESSAGES' => $lang['No_messages_folder']) + ); + + $template->assign_block_vars("switch_no_messages", array() ); +} + +$template->pparse('body'); + +include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + +?> \ No newline at end of file diff --git a/phpBB/profile.php b/phpBB/profile.php new file mode 100644 index 0000000000..5fbe60d536 --- /dev/null +++ b/phpBB/profile.php @@ -0,0 +1,124 @@ + 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/'; + +$server_url = $server_protocol . $server_name . $server_port . $script_name; + +// ----------------------- +// Page specific functions +// +function gen_rand_string($hash) +{ + $rand_str = dss_rand(); + + return ( $hash ) ? md5($rand_str) : substr($rand_str, 0, 8); +} +// +// End page specific functions +// --------------------------- + +// +// Start of program proper +// +if ( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) +{ + $mode = ( isset($HTTP_GET_VARS['mode']) ) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode']; + $mode = htmlspecialchars($mode); + + if ( $mode == 'viewprofile' ) + { + include($phpbb_root_path . 'includes/usercp_viewprofile.'.$phpEx); + exit; + } + else if ( $mode == 'editprofile' || $mode == 'register' ) + { + if ( !$userdata['session_logged_in'] && $mode == 'editprofile' ) + { + redirect(append_sid("login.$phpEx?redirect=profile.$phpEx&mode=editprofile", true)); + } + + include($phpbb_root_path . 'includes/usercp_register.'.$phpEx); + exit; + } + else if ( $mode == 'confirm' ) + { + // Visual Confirmation + if ( $userdata['session_logged_in'] ) + { + exit; + } + + include($phpbb_root_path . 'includes/usercp_confirm.'.$phpEx); + exit; + } + else if ( $mode == 'sendpassword' ) + { + include($phpbb_root_path . 'includes/usercp_sendpasswd.'.$phpEx); + exit; + } + else if ( $mode == 'activate' ) + { + include($phpbb_root_path . 'includes/usercp_activate.'.$phpEx); + exit; + } + else if ( $mode == 'email' ) + { + include($phpbb_root_path . 'includes/usercp_email.'.$phpEx); + exit; + } +} + +redirect(append_sid("index.$phpEx", true)); + +?> \ No newline at end of file diff --git a/phpBB/report.php b/phpBB/report.php deleted file mode 100644 index 03df91135d..0000000000 --- a/phpBB/report.php +++ /dev/null @@ -1,168 +0,0 @@ -session_begin(); -$auth->acl($user->data); -$user->setup('mcp'); - -$forum_id = request_var('f', 0); -$post_id = request_var('p', 0); -$reason_id = request_var('reason_id', 0); -$report_text = utf8_normalize_nfc(request_var('report_text', '', true)); -$user_notify = ($user->data['is_registered']) ? request_var('notify', 0) : false; - -$submit = (isset($_POST['submit'])) ? true : false; - -if (!$post_id) -{ - trigger_error('NO_POST_SELECTED'); -} - -$redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&p=$post_id") . "#p$post_id"; - -// Has the report been cancelled? -if (isset($_POST['cancel'])) -{ - redirect($redirect_url); -} - -// Grab all relevant data -$sql = 'SELECT t.*, p.* - FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . " t - WHERE p.post_id = $post_id - AND p.topic_id = t.topic_id"; -$result = $db->sql_query($sql); -$report_data = $db->sql_fetchrow($result); -$db->sql_freeresult($result); - -if (!$report_data) -{ - trigger_error('POST_NOT_EXIST'); -} - -$forum_id = (int) ($report_data['forum_id']) ? $report_data['forum_id'] : $forum_id; -$topic_id = (int) $report_data['topic_id']; - -$sql = 'SELECT * - FROM ' . FORUMS_TABLE . ' - WHERE forum_id = ' . $forum_id; -$result = $db->sql_query($sql); -$forum_data = $db->sql_fetchrow($result); -$db->sql_freeresult($result); - -if (!$forum_data) -{ - trigger_error('FORUM_NOT_EXIST'); -} - -// Check required permissions -$acl_check_ary = array('f_list' => 'POST_NOT_EXIST', 'f_read' => 'USER_CANNOT_READ', 'f_report' => 'USER_CANNOT_REPORT'); - -foreach ($acl_check_ary as $acl => $error) -{ - if (!$auth->acl_get($acl, $forum_id)) - { - trigger_error($error); - } -} -unset($acl_check_ary); - -if ($report_data['post_reported']) -{ - $message = $user->lang['ALREADY_REPORTED']; - $message .= '

    ' . sprintf($user->lang['RETURN_TOPIC'], '', ''); - trigger_error($message); -} - -// Submit report? -if ($submit && $reason_id) -{ - $sql = 'SELECT * - FROM ' . REPORTS_REASONS_TABLE . " - WHERE reason_id = $reason_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row || (!$report_text && strtolower($row['reason_title']) == 'other')) - { - trigger_error('EMPTY_REPORT'); - } - - $sql_ary = array( - 'reason_id' => (int) $reason_id, - 'post_id' => $post_id, - 'user_id' => (int) $user->data['user_id'], - 'user_notify' => (int) $user_notify, - 'report_closed' => 0, - 'report_time' => (int) time(), - 'report_text' => (string) $report_text - ); - - $sql = 'INSERT INTO ' . REPORTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - $db->sql_query($sql); - $report_id = $db->sql_nextid(); - - if (!$report_data['post_reported']) - { - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET post_reported = 1 - WHERE post_id = ' . $post_id; - $db->sql_query($sql); - } - - if (!$report_data['topic_reported']) - { - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET topic_reported = 1 - WHERE topic_id = ' . $report_data['topic_id'] . ' - OR topic_moved_id = ' . $report_data['topic_id']; - $db->sql_query($sql); - } - - meta_refresh(3, $redirect_url); - - $message = $user->lang['POST_REPORTED_SUCCESS'] . '

    ' . sprintf($user->lang['RETURN_TOPIC'], '', ''); - trigger_error($message); -} - -// Generate the reasons -display_reasons($reason_id); - -$template->assign_vars(array( - 'REPORT_TEXT' => $report_text, - 'S_REPORT_ACTION' => append_sid("{$phpbb_root_path}report.$phpEx", 'f=' . $forum_id . '&p=' . $post_id), - - 'S_NOTIFY' => $user_notify, - 'S_CAN_NOTIFY' => ($user->data['is_registered']) ? true : false) -); - -generate_forum_nav($forum_data); - -// Start output of page -page_header($user->lang['REPORT_POST']); - -$template->set_filenames(array( - 'body' => 'report_body.html') -); - -page_footer(); - -?> \ No newline at end of file diff --git a/phpBB/search.php b/phpBB/search.php index c67581490b..306f195979 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -1,1080 +1,1434 @@ session_begin(); -$auth->acl($user->data); -$user->setup('search'); +// +$userdata = session_pagestart($user_ip, PAGE_SEARCH); +init_userprefs($userdata); +// +// End session management +// +// // Define initial vars -$mode = request_var('mode', ''); -$search_id = request_var('search_id', ''); -$start = max(request_var('start', 0), 0); -$post_id = request_var('p', 0); -$topic_id = request_var('t', 0); -$view = request_var('view', ''); - -$submit = request_var('submit', false); -$keywords = utf8_normalize_nfc(request_var('keywords', '', true)); -$add_keywords = utf8_normalize_nfc(request_var('add_keywords', '', true)); -$author = request_var('author', '', true); -$author_id = request_var('author_id', 0); -$show_results = ($topic_id) ? 'posts' : request_var('sr', 'posts'); -$show_results = ($show_results == 'posts') ? 'posts' : 'topics'; -$search_terms = request_var('terms', 'all'); -$search_fields = request_var('sf', 'all'); -$search_child = request_var('sc', true); - -$sort_days = request_var('st', 0); -$sort_key = request_var('sk', 't'); -$sort_dir = request_var('sd', 'd'); - -$return_chars = request_var('ch', ($topic_id) ? -1 : 300); -$search_forum = request_var('fid', array(0)); - -// Is user able to search? Has search been disabled? -if (!$auth->acl_get('u_search') || !$auth->acl_getf_global('f_search') || !$config['load_search']) +// +if ( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) ) { - $template->assign_var('S_NO_SEARCH', true); - trigger_error('NO_SEARCH'); + $mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; +} +else +{ + $mode = ''; } -// Check search load limit -if ($user->load && $config['limit_search_load'] && ($user->load > doubleval($config['limit_search_load']))) +if ( isset($HTTP_POST_VARS['search_keywords']) || isset($HTTP_GET_VARS['search_keywords']) ) { - $template->assign_var('S_NO_SEARCH', true); - trigger_error('NO_SEARCH_TIME'); + $search_keywords = ( isset($HTTP_POST_VARS['search_keywords']) ) ? $HTTP_POST_VARS['search_keywords'] : $HTTP_GET_VARS['search_keywords']; +} +else +{ + $search_keywords = ''; } -// Check flood limit ... if applicable -$interval = ($user->data['user_id'] == ANONYMOUS) ? $config['search_anonymous_interval'] : $config['search_interval']; -if ($interval && !$auth->acl_get('u_ignoreflood')) +if ( isset($HTTP_POST_VARS['search_author']) || isset($HTTP_GET_VARS['search_author'])) { - if ($user->data['user_last_search'] > time() - $interval) - { - $template->assign_var('S_NO_SEARCH', true); - trigger_error('NO_SEARCH_TIME'); - } + $search_author = ( isset($HTTP_POST_VARS['search_author']) ) ? $HTTP_POST_VARS['search_author'] : $HTTP_GET_VARS['search_author']; + $search_author = phpbb_clean_username($search_author); +} +else +{ + $search_author = ''; } -// Define some vars -$limit_days = array(0 => $user->lang['ALL_RESULTS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); -$sort_by_text = array('a' => $user->lang['SORT_AUTHOR'], 't' => $user->lang['SORT_TIME'], 'f' => $user->lang['SORT_FORUM'], 'i' => $user->lang['SORT_TOPIC_TITLE'], 's' => $user->lang['SORT_POST_SUBJECT']); +$search_id = ( isset($HTTP_GET_VARS['search_id']) ) ? $HTTP_GET_VARS['search_id'] : ''; -$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = ''; -gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); +$show_results = ( isset($HTTP_POST_VARS['show_results']) ) ? $HTTP_POST_VARS['show_results'] : 'posts'; +$show_results = ($show_results == 'topics') ? 'topics' : 'posts'; -if ($keywords || $author || $author_id || $search_id || $submit) +if ( isset($HTTP_POST_VARS['search_terms']) ) { - // clear arrays - $id_ary = array(); + $search_terms = ( $HTTP_POST_VARS['search_terms'] == 'all' ) ? 1 : 0; +} +else +{ + $search_terms = 0; +} - // egosearch is an author search - if ($search_id == 'egosearch') +if ( isset($HTTP_POST_VARS['search_fields']) ) +{ + $search_fields = ( $HTTP_POST_VARS['search_fields'] == 'all' ) ? 1 : 0; +} +else +{ + $search_fields = 0; +} + +$return_chars = ( isset($HTTP_POST_VARS['return_chars']) ) ? intval($HTTP_POST_VARS['return_chars']) : 200; + +$search_cat = ( isset($HTTP_POST_VARS['search_cat']) ) ? intval($HTTP_POST_VARS['search_cat']) : -1; +$search_forum = ( isset($HTTP_POST_VARS['search_forum']) ) ? intval($HTTP_POST_VARS['search_forum']) : -1; + +$sort_by = ( isset($HTTP_POST_VARS['sort_by']) ) ? intval($HTTP_POST_VARS['sort_by']) : 0; + +if ( isset($HTTP_POST_VARS['sort_dir']) ) +{ + $sort_dir = ( $HTTP_POST_VARS['sort_dir'] == 'DESC' ) ? 'DESC' : 'ASC'; +} +else +{ + $sort_dir = 'DESC'; +} + +if ( !empty($HTTP_POST_VARS['search_time']) || !empty($HTTP_GET_VARS['search_time'])) +{ + $search_time = time() - ( ( ( !empty($HTTP_POST_VARS['search_time']) ) ? intval($HTTP_POST_VARS['search_time']) : intval($HTTP_GET_VARS['search_time']) ) * 86400 ); + $topic_days = (!empty($HTTP_POST_VARS['search_time'])) ? intval($HTTP_POST_VARS['search_time']) : intval($HTTP_GET_VARS['search_time']); +} +else +{ + $search_time = 0; + $topic_days = 0; +} + +$start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0; +$start = ($start < 0) ? 0 : $start; + +$sort_by_types = array($lang['Sort_Time'], $lang['Sort_Post_Subject'], $lang['Sort_Topic_Title'], $lang['Sort_Author'], $lang['Sort_Forum']); + +// +// encoding match for workaround +// +$multibyte_charset = 'utf-8, big5, shift_jis, euc-kr, gb2312'; + +// +// Begin core code +// +if ( $mode == 'searchuser' ) +{ + // + // This handles the simple windowed user search functions called from various other scripts + // + if ( isset($HTTP_POST_VARS['search_username']) ) { - $author_id = $user->data['user_id']; - - if ($user->data['user_id'] == ANONYMOUS) - { - login_box('', $user->lang['LOGIN_EXPLAIN_EGOSEARCH']); - } - } - - // If we are looking for authors get their ids - $author_id_ary = array(); - if ($author_id) - { - $author_id_ary[] = $author_id; - } - else if ($author) - { - if ((strpos($author, '*') !== false) && (utf8_strlen(str_replace(array('*', '%'), '', $author)) < $config['min_search_author_chars'])) - { - trigger_error(sprintf($user->lang['TOO_FEW_AUTHOR_CHARS'], $config['min_search_author_chars'])); - } - - $sql_where = (strpos($author, '*') !== false) ? ' username_clean ' . $db->sql_like_expression(str_replace('*', $db->any_char, utf8_clean_string($author))) : " username_clean = '" . $db->sql_escape(utf8_clean_string($author)) . "'"; - - $sql = 'SELECT user_id - FROM ' . USERS_TABLE . " - WHERE $sql_where - AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')'; - $result = $db->sql_query_limit($sql, 100); - - while ($row = $db->sql_fetchrow($result)) - { - $author_id_ary[] = (int) $row['user_id']; - } - $db->sql_freeresult($result); - - if (!sizeof($author_id_ary)) - { - trigger_error('NO_SEARCH_RESULTS'); - } - } - - // if we search in an existing search result just add the additional keywords. But we need to use "all search terms"-mode - // so we can keep the old keywords in their old mode, but add the new ones as required words - if ($add_keywords) - { - if ($search_terms == 'all') - { - $keywords .= ' ' . $add_keywords; - } - else - { - $search_terms = 'all'; - $keywords = implode(' |', explode(' ', preg_replace('#\s+#u', ' ', $keywords))) . ' ' .$add_keywords; - } - } - - // Which forums should not be searched? Author searches are also carried out in unindexed forums - if (empty($keywords) && sizeof($author_id_ary)) - { - $ex_fid_ary = array_keys($auth->acl_getf('!f_read', true)); + username_search($HTTP_POST_VARS['search_username']); } else { - $ex_fid_ary = array_unique(array_merge(array_keys($auth->acl_getf('!f_read', true)), array_keys($auth->acl_getf('!f_search', true)))); + username_search(''); } - $not_in_fid = (sizeof($ex_fid_ary)) ? 'WHERE ' . $db->sql_in_set('f.forum_id', $ex_fid_ary, true) . " OR (f.forum_password <> '' AND fa.user_id <> " . (int) $user->data['user_id'] . ')' : ""; + exit; +} +else if ( $search_keywords != '' || $search_author != '' || $search_id ) +{ + $store_vars = array('search_results', 'total_match_count', 'split_search', 'sort_by', 'sort_dir', 'show_results', 'return_chars'); + $search_results = ''; - $sql = 'SELECT f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.right_id, f.forum_password, fa.user_id - FROM ' . FORUMS_TABLE . ' f - LEFT JOIN ' . FORUMS_ACCESS_TABLE . " fa ON (fa.forum_id = f.forum_id - AND fa.session_id = '" . $db->sql_escape($user->session_id) . "') - $not_in_fid - ORDER BY f.left_id"; - $result = $db->sql_query($sql); + // + // Search ID Limiter, decrease this value if you experience further timeout problems with searching forums + $limiter = 5000; + $current_time = time(); - $right_id = 0; - $reset_search_forum = true; - while ($row = $db->sql_fetchrow($result)) + // + // Cycle through options ... + // + if ( $search_id == 'newposts' || $search_id == 'egosearch' || $search_id == 'unanswered' || $search_keywords != '' || $search_author != '' ) { - if ($row['forum_password'] && $row['user_id'] != $user->data['user_id']) + // + // Flood control + // + $where_sql = ($userdata['user_id'] == ANONYMOUS) ? "se.session_ip = '$user_ip'" : 'se.session_user_id = ' . $userdata['user_id']; + $sql = 'SELECT MAX(sr.search_time) AS last_search_time + FROM ' . SEARCH_TABLE . ' sr, ' . SESSIONS_TABLE . " se + WHERE sr.session_id = se.session_id + AND $where_sql"; + if ($result = $db->sql_query($sql)) { - $ex_fid_ary[] = (int) $row['forum_id']; - continue; - } - - if (sizeof($search_forum)) - { - if ($search_child) + if ($row = $db->sql_fetchrow($result)) { - if (in_array($row['forum_id'], $search_forum) && $row['right_id'] > $right_id) + if (intval($row['last_search_time']) > 0 && ($current_time - intval($row['last_search_time'])) < intval($board_config['search_flood_interval'])) { - $right_id = (int) $row['right_id']; - } - else if ($row['right_id'] < $right_id) - { - continue; + message_die(GENERAL_MESSAGE, $lang['Search_Flood_Error']); } } - - if (!in_array($row['forum_id'], $search_forum)) + } + if ( $search_id == 'newposts' || $search_id == 'egosearch' || ( $search_author != '' && $search_keywords == '' ) ) + { + if ( $search_id == 'newposts' ) { - $ex_fid_ary[] = (int) $row['forum_id']; - $reset_search_forum = false; - } - } - } - $db->sql_freeresult($result); + if ( $userdata['session_logged_in'] ) + { + $sql = "SELECT post_id + FROM " . POSTS_TABLE . " + WHERE post_time >= " . $userdata['user_lastvisit']; + } + else + { + redirect(append_sid("login.$phpEx?redirect=search.$phpEx&search_id=newposts", true)); + } - // find out in which forums the user is allowed to view approved posts - if ($auth->acl_get('m_approve')) - { - $m_approve_fid_ary = array(-1); - $m_approve_fid_sql = ''; - } - else if ($auth->acl_getf_global('m_approve')) - { - $m_approve_fid_ary = array_diff(array_keys($auth->acl_getf('!m_approve', true)), $ex_fid_ary); - $m_approve_fid_sql = ' AND (p.post_approved = 1' . ((sizeof($m_approve_fid_ary)) ? ' OR ' . $db->sql_in_set('p.forum_id', $m_approve_fid_ary, true) : '') . ')'; - } - else - { - $m_approve_fid_ary = array(); - $m_approve_fid_sql = ' AND p.post_approved = 1'; - } - - if ($reset_search_forum) - { - $search_forum = array(); - } - - // Select which method we'll use to obtain the post_id or topic_id information - $search_type = basename($config['search_type']); - - if (!file_exists($phpbb_root_path . 'includes/search/' . $search_type . '.' . $phpEx)) - { - trigger_error('NO_SUCH_SEARCH_MODULE'); - } - - require("{$phpbb_root_path}includes/search/$search_type.$phpEx"); - - // We do some additional checks in the module to ensure it can actually be utilised - $error = false; - $search = new $search_type($error); - - if ($error) - { - trigger_error($error); - } - - // let the search module split up the keywords - if ($keywords) - { - $correct_query = $search->split_keywords($keywords, $search_terms); - if (!$correct_query || (empty($search->search_query) && !sizeof($author_id_ary) && !$search_id)) - { - $ignored = (sizeof($search->common_words)) ? sprintf($user->lang['IGNORED_TERMS_EXPLAIN'], implode(' ', $search->common_words)) . '
    ' : ''; - trigger_error($ignored . sprintf($user->lang['NO_KEYWORDS'], $search->word_length['min'], $search->word_length['max'])); - } - } - - if (!$keywords && sizeof($author_id_ary)) - { - // if it is an author search we want to show topics by default - $show_results = ($topic_id) ? 'posts' : request_var('sr', ($search_id == 'egosearch') ? 'topics' : 'posts'); - $show_results = ($show_results == 'posts') ? 'posts' : 'topics'; - } - - // define some variables needed for retrieving post_id/topic_id information - $sort_by_sql = array('a' => 'u.username_clean', 't' => (($show_results == 'posts') ? 'p.post_time' : 't.topic_last_post_time'), 'f' => 'f.forum_id', 'i' => 't.topic_title', 's' => (($show_results == 'posts') ? 'p.post_subject' : 't.topic_title')); - - // pre-made searches - $sql = $field = $l_search_title = ''; - if ($search_id) - { - switch ($search_id) - { - // Oh holy Bob, bring us some activity... - case 'active_topics': - $l_search_title = $user->lang['SEARCH_ACTIVE_TOPICS']; $show_results = 'topics'; - $sort_key = 't'; - $sort_dir = 'd'; - $sort_days = request_var('st', 7); - $sort_by_sql['t'] = 't.topic_last_post_time'; - - gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); - $s_sort_key = $s_sort_dir = ''; - - $last_post_time_sql = ($sort_days) ? ' AND t.topic_last_post_time > ' . (time() - ($sort_days * 24 * 3600)) : ''; - - $sql = 'SELECT t.topic_last_post_time, t.topic_id - FROM ' . TOPICS_TABLE . " t - WHERE t.topic_moved_id = 0 - $last_post_time_sql - " . str_replace(array('p.', 'post_'), array('t.', 'topic_'), $m_approve_fid_sql) . ' - ' . ((sizeof($ex_fid_ary)) ? ' AND ' . $db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '') . ' - ORDER BY t.topic_last_post_time DESC'; - $field = 'topic_id'; - break; - - case 'unanswered': - $l_search_title = $user->lang['SEARCH_UNANSWERED']; - $show_results = request_var('sr', 'topics'); - $show_results = ($show_results == 'posts') ? 'posts' : 'topics'; - $sort_by_sql['t'] = ($show_results == 'posts') ? 'p.post_time' : 't.topic_last_post_time'; - $sort_by_sql['s'] = ($show_results == 'posts') ? 'p.post_subject' : 't.topic_title'; - $sql_sort = 'ORDER BY ' . $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC'); - - $sort_join = ($sort_key == 'f') ? FORUMS_TABLE . ' f, ' : ''; - $sql_sort = ($sort_key == 'f') ? ' AND f.forum_id = p.forum_id ' . $sql_sort : $sql_sort; - - if ($sort_days) + $sort_by = 0; + $sort_dir = 'DESC'; + } + else if ( $search_id == 'egosearch' ) + { + if ( $userdata['session_logged_in'] ) { - $last_post_time = 'AND p.post_time > ' . (time() - ($sort_days * 24 * 3600)); + $sql = "SELECT post_id + FROM " . POSTS_TABLE . " + WHERE poster_id = " . $userdata['user_id']; } else { - $last_post_time = ''; + redirect(append_sid("login.$phpEx?redirect=search.$phpEx&search_id=egosearch", true)); } - - if ($sort_key == 'a') - { - $sort_join = USERS_TABLE . ' u, '; - $sql_sort = ' AND u.user_id = p.poster_id ' . $sql_sort; - } - if ($show_results == 'posts') - { - $sql = "SELECT p.post_id - FROM $sort_join" . POSTS_TABLE . ' p, ' . TOPICS_TABLE . " t - WHERE t.topic_replies = 0 - AND p.topic_id = t.topic_id - $last_post_time - $m_approve_fid_sql - " . ((sizeof($ex_fid_ary)) ? ' AND ' . $db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '') . " - $sql_sort"; - $field = 'post_id'; - } - else - { - $sql = 'SELECT DISTINCT ' . $sort_by_sql[$sort_key] . ", p.topic_id - FROM $sort_join" . POSTS_TABLE . ' p, ' . TOPICS_TABLE . " t - WHERE t.topic_replies = 0 - AND t.topic_moved_id = 0 - AND p.topic_id = t.topic_id - $last_post_time - $m_approve_fid_sql - " . ((sizeof($ex_fid_ary)) ? ' AND ' . $db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '') . " - $sql_sort"; - $field = 'topic_id'; - } - break; - - case 'newposts': - $l_search_title = $user->lang['SEARCH_NEW']; - // force sorting - $show_results = (request_var('sr', 'topics') == 'posts') ? 'posts' : 'topics'; - $sort_key = 't'; - $sort_dir = 'd'; - $sort_by_sql['t'] = ($show_results == 'posts') ? 'p.post_time' : 't.topic_last_post_time'; - $sql_sort = 'ORDER BY ' . $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC'); - - gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); - $s_sort_key = $s_sort_dir = $u_sort_param = $s_limit_days = ''; - - if ($show_results == 'posts') - { - $sql = 'SELECT p.post_id - FROM ' . POSTS_TABLE . ' p - WHERE p.post_time > ' . $user->data['user_lastvisit'] . " - $m_approve_fid_sql - " . ((sizeof($ex_fid_ary)) ? ' AND ' . $db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '') . " - $sql_sort"; - $field = 'post_id'; - } - else - { - $sql = 'SELECT t.topic_id - FROM ' . TOPICS_TABLE . ' t - WHERE t.topic_last_post_time > ' . $user->data['user_lastvisit'] . ' - AND t.topic_moved_id = 0 - ' . str_replace(array('p.', 'post_'), array('t.', 'topic_'), $m_approve_fid_sql) . ' - ' . ((sizeof($ex_fid_ary)) ? 'AND ' . $db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '') . " - $sql_sort"; - $field = 'topic_id'; - } - break; - - case 'egosearch': - $l_search_title = $user->lang['SEARCH_SELF']; - break; - } - } - - // show_results should not change after this - $per_page = ($show_results == 'posts') ? $config['posts_per_page'] : $config['topics_per_page']; - $total_match_count = 0; - - if ($search_id) - { - if ($sql) - { - // only return up to 1000 ids (the last one will be removed later) - $result = $db->sql_query_limit($sql, 1001 - $start, $start); - - while ($row = $db->sql_fetchrow($result)) - { - $id_ary[] = $row[$field]; - } - $db->sql_freeresult($result); - - $total_match_count = sizeof($id_ary) + $start; - $id_ary = array_slice($id_ary, 0, $per_page); - } - else - { - $search_id = ''; - } - } - - // make sure that some arrays are always in the same order - sort($ex_fid_ary); - sort($m_approve_fid_ary); - sort($author_id_ary); - - if (!empty($search->search_query)) - { - $total_match_count = $search->keyword_search($show_results, $search_fields, $search_terms, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_id_ary, $id_ary, $start, $per_page); - } - else if (sizeof($author_id_ary)) - { - $firstpost_only = ($search_fields === 'firstpost') ? true : false; - $total_match_count = $search->author_search($show_results, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_id_ary, $id_ary, $start, $per_page); - } - - // For some searches we need to print out the "no results" page directly to allow re-sorting/refining the search options. - if (!sizeof($id_ary) && !$search_id) - { - trigger_error('NO_SEARCH_RESULTS'); - } - - $sql_where = ''; - - if (sizeof($id_ary)) - { - $sql_where .= $db->sql_in_set(($show_results == 'posts') ? 'p.post_id' : 't.topic_id', $id_ary); - $sql_where .= (sizeof($ex_fid_ary)) ? ' AND (' . $db->sql_in_set('f.forum_id', $ex_fid_ary, true) . ' OR f.forum_id IS NULL)' : ''; - $sql_where .= ($show_results == 'posts') ? $m_approve_fid_sql : str_replace(array('p.post_approved', 'p.forum_id'), array('t.topic_approved', 't.forum_id'), $m_approve_fid_sql); - } - - if ($show_results == 'posts') - { - include($phpbb_root_path . 'includes/functions_posting.' . $phpEx); - } - else - { - include($phpbb_root_path . 'includes/functions_display.' . $phpEx); - } - - $user->add_lang('viewtopic'); - - // Grab icons - $icons = cache::obtain_icons(); - - // Output header - if ($search_id && ($total_match_count > 1000)) - { - // limit the number to 1000 for pre-made searches - $total_match_count--; - $l_search_matches = sprintf($user->lang['FOUND_MORE_SEARCH_MATCHES'], $total_match_count); - } - else - { - $l_search_matches = ($total_match_count == 1) ? sprintf($user->lang['FOUND_SEARCH_MATCH'], $total_match_count) : sprintf($user->lang['FOUND_SEARCH_MATCHES'], $total_match_count); - } - - // define some vars for urls - $hilit = implode('|', explode(' ', preg_replace('#\s+#u', ' ', str_replace(array('+', '-', '|', '(', ')', '"'), ' ', $keywords)))); - $u_hilit = urlencode(htmlspecialchars_decode(str_replace('|', ' ', $hilit))); - $u_show_results = ($show_results != 'posts') ? '&sr=' . $show_results : ''; - $u_search_forum = implode('&fid%5B%5D=', $search_forum); - - $u_search = append_sid("{$phpbb_root_path}search.$phpEx", $u_sort_param . $u_show_results); - $u_search .= ($search_id) ? '&search_id=' . $search_id : ''; - $u_search .= ($u_hilit) ? '&keywords=' . urlencode(htmlspecialchars_decode($search->search_query)) : ''; - $u_search .= ($topic_id) ? '&t=' . $topic_id : ''; - $u_search .= ($author) ? '&author=' . urlencode(htmlspecialchars_decode($author)) : ''; - $u_search .= ($author_id) ? '&author_id=' . $author_id : ''; - $u_search .= ($u_search_forum) ? '&fid%5B%5D=' . $u_search_forum : ''; - $u_search .= (!$search_child) ? '&sc=0' : ''; - $u_search .= ($search_fields != 'all') ? '&sf=' . $search_fields : ''; - $u_search .= ($return_chars != 300) ? '&ch=' . $return_chars : ''; - - $template->assign_vars(array( - 'SEARCH_TITLE' => $l_search_title, - 'SEARCH_MATCHES' => $l_search_matches, - 'SEARCH_WORDS' => $search->search_query, - 'IGNORED_WORDS' => (sizeof($search->common_words)) ? implode(' ', $search->common_words) : '', - 'PAGINATION' => generate_pagination($u_search, $total_match_count, $per_page, $start), - 'PAGE_NUMBER' => on_page($total_match_count, $per_page, $start), - 'TOTAL_MATCHES' => $total_match_count, - 'SEARCH_IN_RESULTS' => ($search_id) ? false : true, - - 'S_SELECT_SORT_DIR' => $s_sort_dir, - 'S_SELECT_SORT_KEY' => $s_sort_key, - 'S_SELECT_SORT_DAYS' => $s_limit_days, - 'S_SEARCH_ACTION' => $u_search, - 'S_SHOW_TOPICS' => ($show_results == 'posts') ? false : true, - - 'GOTO_PAGE_IMG' => $user->img('icon_post_target', 'GOTO_PAGE'), - 'NEWEST_POST_IMG' => $user->img('icon_topic_newest', 'VIEW_NEWEST_POST'), - 'REPORTED_IMG' => $user->img('icon_topic_reported', 'TOPIC_REPORTED'), - 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'TOPIC_UNAPPROVED'), - 'LAST_POST_IMG' => $user->img('icon_topic_latest', 'VIEW_LATEST_POST'), - - 'U_SEARCH_WORDS' => $u_search, - )); - - if ($sql_where) - { - if ($show_results == 'posts') - { - // @todo Joining this query to the one below? - $sql = 'SELECT zebra_id, friend, foe - FROM ' . ZEBRA_TABLE . ' - WHERE user_id = ' . $user->data['user_id']; - $result = $db->sql_query($sql); - - $zebra = array(); - while ($row = $db->sql_fetchrow($result)) - { - $zebra[($row['friend']) ? 'friend' : 'foe'][] = $row['zebra_id']; - } - $db->sql_freeresult($result); - - $sql = 'SELECT p.*, f.forum_id, f.forum_name, t.*, u.username, u.username_clean, u.user_sig, u.user_sig_bbcode_uid, u.user_colour - FROM ' . POSTS_TABLE . ' p - LEFT JOIN ' . TOPICS_TABLE . ' t ON (p.topic_id = t.topic_id) - LEFT JOIN ' . FORUMS_TABLE . ' f ON (p.forum_id = f.forum_id) - LEFT JOIN ' . USERS_TABLE . " u ON (p.poster_id = u.user_id) - WHERE $sql_where"; - } - else - { - $sql_from = TOPICS_TABLE . ' t - LEFT JOIN ' . FORUMS_TABLE . ' f ON (f.forum_id = t.forum_id) - ' . (($sort_key == 'a') ? ' LEFT JOIN ' . USERS_TABLE . ' u ON (u.user_id = t.topic_poster) ' : ''); - $sql_select = 't.*, f.forum_id, f.forum_name'; - - if ($user->data['is_registered']) - { - if ($config['load_db_track']) - { - $sql_from .= ' LEFT JOIN ' . TOPICS_POSTED_TABLE . ' tp ON (tp.user_id = ' . $user->data['user_id'] . ' - AND t.topic_id = tp.topic_id)'; - $sql_select .= ', tp.topic_posted'; - } - - if ($config['load_db_lastread']) - { - $sql_from .= ' LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.user_id = ' . $user->data['user_id'] . ' - AND t.topic_id = tt.topic_id) - LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.user_id = ' . $user->data['user_id'] . ' - AND ft.forum_id = f.forum_id)'; - $sql_select .= ', tt.mark_time, ft.mark_time as f_mark_time'; - } - } - - if ($config['load_anon_lastread'] || ($user->data['is_registered'] && !$config['load_db_lastread'])) - { - $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_track'])) ? ((STRIP) ? stripslashes($_COOKIE[$config['cookie_name'] . '_track']) : $_COOKIE[$config['cookie_name'] . '_track']) : ''; - $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array(); - } - - $sql = "SELECT $sql_select - FROM $sql_from - WHERE $sql_where"; - } - $sql .= ' ORDER BY ' . $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC'); - $result = $db->sql_query($sql); - $result_topic_id = 0; - - $rowset = array(); - - if ($show_results == 'topics') - { - $forums = $rowset = $shadow_topic_list = array(); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['topic_status'] == ITEM_MOVED) - { - $shadow_topic_list[$row['topic_moved_id']] = $row['topic_id']; - } - - $rowset[$row['topic_id']] = $row; - - if (!isset($forums[$row['forum_id']]) && $user->data['is_registered'] && $config['load_db_lastread']) - { - $forums[$row['forum_id']]['mark_time'] = $row['f_mark_time']; - } - $forums[$row['forum_id']]['topic_list'][] = $row['topic_id']; - $forums[$row['forum_id']]['rowset'][$row['topic_id']] = &$rowset[$row['topic_id']]; - } - $db->sql_freeresult($result); - - // If we have some shadow topics, update the rowset to reflect their topic information - if (sizeof($shadow_topic_list)) - { - $sql = 'SELECT * - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', array_keys($shadow_topic_list)); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $orig_topic_id = $shadow_topic_list[$row['topic_id']]; - - // We want to retain some values - $row = array_merge($row, array( - 'topic_moved_id' => $rowset[$orig_topic_id]['topic_moved_id'], - 'topic_status' => $rowset[$orig_topic_id]['topic_status'], - 'forum_name' => $rowset[$orig_topic_id]['forum_name']) - ); - - $rowset[$orig_topic_id] = $row; - } - $db->sql_freeresult($result); - } - unset($shadow_topic_list); - - foreach ($forums as $forum_id => $forum) - { - if ($user->data['is_registered'] && $config['load_db_lastread']) - { - $topic_tracking_info[$forum_id] = get_topic_tracking($forum_id, $forum['topic_list'], $forum['rowset'], array($forum_id => $forum['mark_time']), ($forum_id) ? false : $forum['topic_list']); - } - else if ($config['load_anon_lastread'] || $user->data['is_registered']) - { - $topic_tracking_info[$forum_id] = get_complete_topic_tracking($forum_id, $forum['topic_list'], ($forum_id) ? false : $forum['topic_list']); - - if (!$user->data['is_registered']) - { - $user->data['user_lastmark'] = (isset($tracking_topics['l'])) ? (int) (base_convert($tracking_topics['l'], 36, 10) + $config['board_startdate']) : 0; - } - } - } - unset($forums); - } - else - { - $bbcode_bitfield = $text_only_message = ''; - $attach_list = array(); - - while ($row = $db->sql_fetchrow($result)) - { - // We pre-process some variables here for later usage - $row['post_text'] = censor_text($row['post_text']); - - $text_only_message = $row['post_text']; - // make list items visible as such - if ($row['bbcode_uid']) - { - $text_only_message = str_replace('[*:' . $row['bbcode_uid'] . ']', '⋅ ', $text_only_message); - // no BBCode in text only message - strip_bbcode($text_only_message, $row['bbcode_uid']); - } - - if ($return_chars == -1 || utf8_strlen($text_only_message) < ($return_chars + 3)) - { - $row['display_text_only'] = false; - $bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']); - - // Does this post have an attachment? If so, add it to the list - if ($row['post_attachment'] && $config['allow_attachments']) - { - $attach_list[$row['forum_id']][] = $row['post_id']; - } - } - else - { - $row['post_text'] = $text_only_message; - $row['display_text_only'] = true; - } - - $rowset[] = $row; - } - $db->sql_freeresult($result); - - unset($text_only_message); - - // Instantiate BBCode if needed - if ($bbcode_bitfield !== '') - { - include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); - $bbcode = new bbcode(base64_encode($bbcode_bitfield)); - } - - // Pull attachment data - if (sizeof($attach_list)) - { - $use_attach_list = $attach_list; - $attach_list = array(); - - foreach ($use_attach_list as $forum_id => $_list) - { - if ($auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id)) - { - $attach_list = array_merge($attach_list, $_list); - } - } - } - - if (sizeof($attach_list)) - { - $sql = 'SELECT * - FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set('post_msg_id', $attach_list) . ' - AND in_message = 0 - ORDER BY filetime DESC, post_msg_id ASC'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $attachments[$row['post_msg_id']][] = $row; - } - $db->sql_freeresult($result); - } - } - - if ($hilit) - { - // Remove bad highlights - $hilit_array = array_filter(explode('|', $hilit), 'strlen'); - foreach ($hilit_array as $key => $value) - { - $hilit_array[$key] = str_replace('\*', '\w*?', preg_quote($value, '#')); - $hilit_array[$key] = preg_replace('#(^|\s)\\\\w\*\?(\s|$)#', '$1\w+?$2', $hilit_array[$key]); - } - $hilit = implode('|', $hilit_array); - } - - foreach ($rowset as $row) - { - $forum_id = $row['forum_id']; - $result_topic_id = $row['topic_id']; - $topic_title = censor_text($row['topic_title']); - - // we need to select a forum id for this global topic - if (!$forum_id) - { - if (!isset($g_forum_id)) - { - // Get a list of forums the user cannot read - $forum_ary = array_unique(array_keys($auth->acl_getf('!f_read', true))); - - // Determine first forum the user is able to read (must not be a category) - $sql = 'SELECT forum_id - FROM ' . FORUMS_TABLE . ' - WHERE forum_type = ' . FORUM_POST; - - if (sizeof($forum_ary)) - { - $sql .= ' AND ' . $db->sql_in_set('forum_id', $forum_ary, true); - } - - $result = $db->sql_query_limit($sql, 1); - $g_forum_id = (int) $db->sql_fetchfield('forum_id'); - } - $u_forum_id = $g_forum_id; + $show_results = 'topics'; + $sort_by = 0; + $sort_dir = 'DESC'; } else { - $u_forum_id = $forum_id; - } + $search_author = str_replace('*', '%', trim($search_author)); - $view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$u_forum_id&t=$result_topic_id" . (($u_hilit) ? "&hilit=$u_hilit" : '')); - - $replies = ($auth->acl_get('m_approve', $forum_id)) ? $row['topic_replies_real'] : $row['topic_replies']; - - if ($show_results == 'topics') - { - $folder_img = $folder_alt = $topic_type = ''; - topic_status($row, $replies, (isset($topic_tracking_info[$forum_id][$row['topic_id']]) && $row['topic_last_post_time'] > $topic_tracking_info[$forum_id][$row['topic_id']]) ? true : false, $folder_img, $folder_alt, $topic_type); - - $unread_topic = (isset($topic_tracking_info[$forum_id][$row['topic_id']]) && $row['topic_last_post_time'] > $topic_tracking_info[$forum_id][$row['topic_id']]) ? true : false; - - $topic_unapproved = (!$row['topic_approved'] && $auth->acl_get('m_approve', $forum_id)) ? true : false; - $posts_unapproved = ($row['topic_approved'] && $row['topic_replies'] < $row['topic_replies_real'] && $auth->acl_get('m_approve', $forum_id)) ? true : false; - $u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&t=$result_topic_id", true, $user->session_id) : ''; - - $row['topic_title'] = preg_replace('#(?!<.*)(?]*(?:)#is', '$1', $row['topic_title']); - - $tpl_ary = array( - 'TOPIC_AUTHOR' => get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - 'TOPIC_AUTHOR_COLOUR' => get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - 'TOPIC_AUTHOR_FULL' => get_username_string('full', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - 'FIRST_POST_TIME' => $user->format_date($row['topic_time']), - 'LAST_POST_SUBJECT' => $row['topic_last_post_subject'], - 'LAST_POST_TIME' => $user->format_date($row['topic_last_post_time']), - 'LAST_VIEW_TIME' => $user->format_date($row['topic_last_view_time']), - 'LAST_POST_AUTHOR' => get_username_string('username', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - 'LAST_POST_AUTHOR_COLOUR' => get_username_string('colour', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - 'LAST_POST_AUTHOR_FULL' => get_username_string('full', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - - 'PAGINATION' => topic_generate_pagination($replies, $view_topic_url), - 'TOPIC_TYPE' => $topic_type, - - 'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt), - 'TOPIC_FOLDER_IMG_SRC' => $user->img($folder_img, $folder_alt, false, '', 'src'), - 'TOPIC_ICON_IMG' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '', - 'TOPIC_ICON_IMG_WIDTH' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '', - 'TOPIC_ICON_IMG_HEIGHT' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '', - 'ATTACH_ICON_IMG' => ($auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', - 'UNAPPROVED_IMG' => ($topic_unapproved || $posts_unapproved) ? $user->img('icon_topic_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '', - - 'S_TOPIC_GLOBAL' => (!$forum_id) ? true : false, - 'S_TOPIC_TYPE' => $row['topic_type'], - 'S_USER_POSTED' => (!empty($row['mark_type'])) ? true : false, - 'S_UNREAD_TOPIC' => $unread_topic, - - 'S_TOPIC_REPORTED' => (!empty($row['topic_reported']) && $auth->acl_get('m_report', $forum_id)) ? true : false, - 'S_TOPIC_UNAPPROVED' => $topic_unapproved, - 'S_POSTS_UNAPPROVED' => $posts_unapproved, - - 'U_LAST_POST' => $view_topic_url . '&p=' . $row['topic_last_post_id'] . '#p' . $row['topic_last_post_id'], - 'U_LAST_POST_AUTHOR' => get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - 'U_TOPIC_AUTHOR' => get_username_string('profile', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - 'U_NEWEST_POST' => $view_topic_url . '&view=unread#unread', - 'U_MCP_REPORT' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=reports&t=' . $result_topic_id, true, $user->session_id), - 'U_MCP_QUEUE' => $u_mcp_queue, - ); - } - else - { - if ((isset($zebra['foe']) && in_array($row['poster_id'], $zebra['foe'])) && (!$view || $view != 'show' || $post_id != $row['post_id'])) + if( ( strpos($search_author, '%') !== false ) && ( strlen(str_replace('%', '', $search_author)) < $board_config['search_min_chars'] ) ) { - $template->assign_block_vars('searchresults', array( - 'S_IGNORE_POST' => true, + $search_author = ''; + } - 'L_IGNORE_POST' => sprintf($user->lang['POST_BY_FOE'], $row['username'], "', '')) - ); + $sql = "SELECT user_id + FROM " . USERS_TABLE . " + WHERE username LIKE '" . str_replace("\'", "''", $search_author) . "'"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Couldn't obtain list of matching users (searching for: $search_author)", "", __LINE__, __FILE__, $sql); + } + $matching_userids = ''; + if ( $row = $db->sql_fetchrow($result) ) + { + do + { + $matching_userids .= ( ( $matching_userids != '' ) ? ', ' : '' ) . $row['user_id']; + } + while( $row = $db->sql_fetchrow($result) ); + } + else + { + message_die(GENERAL_MESSAGE, $lang['No_search_match']); + } + + $sql = "SELECT post_id + FROM " . POSTS_TABLE . " + WHERE poster_id IN ($matching_userids)"; + + if ($search_time) + { + $sql .= " AND post_time >= " . $search_time; + } + } + + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain matched posts list', '', __LINE__, __FILE__, $sql); + } + + $search_ids = array(); + while( $row = $db->sql_fetchrow($result) ) + { + $search_ids[] = $row['post_id']; + } + $db->sql_freeresult($result); + + $total_match_count = count($search_ids); + + } + else if ( $search_keywords != '' ) + { + $stopword_array = @file($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/search_stopwords.txt'); + $synonym_array = @file($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/search_synonyms.txt'); + + $split_search = array(); + $stripped_keywords = stripslashes($search_keywords); + $split_search = ( !strstr($multibyte_charset, $lang['ENCODING']) ) ? split_words(clean_words('search', $stripped_keywords, $stopword_array, $synonym_array), 'search') : split(' ', $search_keywords); + unset($stripped_keywords); + + $search_msg_only = ( !$search_fields ) ? "AND m.title_match = 0" : ( ( strstr($multibyte_charset, $lang['ENCODING']) ) ? '' : '' ); + + $word_count = 0; + $current_match_type = 'or'; + + $word_match = array(); + $result_list = array(); + + for($i = 0; $i < count($split_search); $i++) + { + if ( strlen(str_replace(array('*', '%'), '', trim($split_search[$i]))) < $board_config['search_min_chars'] ) + { + $split_search[$i] = ''; continue; } - // Replace naughty words such as farty pants - $row['post_subject'] = censor_text($row['post_subject']); + switch ( $split_search[$i] ) + { + case 'and': + $current_match_type = 'and'; + break; - if ($row['display_text_only']) - { - // now find context for the searched words - $row['post_text'] = get_context($row['post_text'], array_filter(explode('|', $hilit), 'strlen'), $return_chars); - $row['post_text'] = bbcode_nl2br($row['post_text']); - } - else - { - // Second parse bbcode here - if ($row['bbcode_bitfield']) - { - $bbcode->bbcode_second_pass($row['post_text'], $row['bbcode_uid'], $row['bbcode_bitfield']); + case 'or': + $current_match_type = 'or'; + break; + + case 'not': + $current_match_type = 'not'; + break; + + default: + if ( !empty($search_terms) ) + { + $current_match_type = 'and'; + } + + if ( !strstr($multibyte_charset, $lang['ENCODING']) ) + { + $match_word = str_replace('*', '%', $split_search[$i]); + $sql = "SELECT m.post_id + FROM " . SEARCH_WORD_TABLE . " w, " . SEARCH_MATCH_TABLE . " m + WHERE w.word_text LIKE '$match_word' + AND m.word_id = w.word_id + AND w.word_common <> 1 + $search_msg_only"; + } + else + { + $match_word = addslashes('%' . str_replace('*', '', $split_search[$i]) . '%'); + $search_msg_only = ( $search_fields ) ? "OR post_subject LIKE '$match_word'" : ''; + $sql = "SELECT post_id + FROM " . POSTS_TEXT_TABLE . " + WHERE post_text LIKE '$match_word' + $search_msg_only"; + } + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain matched posts list', '', __LINE__, __FILE__, $sql); + } + + $row = array(); + while( $temp_row = $db->sql_fetchrow($result) ) + { + $row[$temp_row['post_id']] = 1; + + if ( !$word_count ) + { + $result_list[$temp_row['post_id']] = 1; + } + else if ( $current_match_type == 'or' ) + { + $result_list[$temp_row['post_id']] = 1; + } + else if ( $current_match_type == 'not' ) + { + $result_list[$temp_row['post_id']] = 0; + } + } + + if ( $current_match_type == 'and' && $word_count ) + { + @reset($result_list); + while( list($post_id, $match_count) = @each($result_list) ) + { + if ( !$row[$post_id] ) + { + $result_list[$post_id] = 0; + } + } + } + + $word_count++; + + $db->sql_freeresult($result); } - - $row['post_text'] = bbcode_nl2br($row['post_text']); - $row['post_text'] = smiley_text($row['post_text']); - - if (!empty($attachments[$row['post_id']])) - { - parse_attachments($forum_id, $row['post_text'], $attachments[$row['post_id']], $update_count); - - // we only display inline attachments - unset($attachments[$row['post_id']]); - } - } - - if ($hilit) - { - // post highlighting - $row['post_text'] = preg_replace('#(?!<.*)(?]*(?:)#is', '$1', $row['post_text']); - $row['post_subject'] = preg_replace('#(?!<.*)(?]*(?:)#is', '$1', $row['post_subject']); - } - - $tpl_ary = array( - 'POST_AUTHOR_FULL' => get_username_string('full', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']), - 'POST_AUTHOR_COLOUR' => get_username_string('colour', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']), - 'POST_AUTHOR' => get_username_string('username', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']), - 'U_POST_AUTHOR' => get_username_string('profile', $row['poster_id'], $row['username'], $row['user_colour'], $row['post_username']), - - 'POST_SUBJECT' => $row['post_subject'], - 'POST_DATE' => (!empty($row['post_time'])) ? $user->format_date($row['post_time']) : '', - 'MESSAGE' => $row['post_text'] - ); } - $template->assign_block_vars('searchresults', array_merge($tpl_ary, array( - 'FORUM_ID' => $forum_id, - 'TOPIC_ID' => $result_topic_id, - 'POST_ID' => ($show_results == 'posts') ? $row['post_id'] : false, + @reset($result_list); - 'FORUM_TITLE' => $row['forum_name'], - 'TOPIC_TITLE' => $topic_title, - 'TOPIC_REPLIES' => $replies, - 'TOPIC_VIEWS' => $row['topic_views'], - - 'U_VIEW_TOPIC' => $view_topic_url, - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id), - 'U_VIEW_POST' => (!empty($row['post_id'])) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=" . $row['topic_id'] . '&p=' . $row['post_id'] . (($u_hilit) ? '&hilit=' . $u_hilit : '')) . '#p' . $row['post_id'] : '') - )); + $search_ids = array(); + while( list($post_id, $matches) = each($result_list) ) + { + if ( $matches ) + { + $search_ids[] = $post_id; + } + } + + unset($result_list); + $total_match_count = count($search_ids); } - if ($topic_id && ($topic_id == $result_topic_id)) + // + // If user is logged in then we'll check to see which (if any) private + // forums they are allowed to view and include them in the search. + // + // If not logged in we explicitly prevent searching of private forums + // + $auth_sql = ''; + if ( $search_forum != -1 ) { - $template->assign_vars(array( - 'SEARCH_TOPIC' => $topic_title, - 'U_SEARCH_TOPIC' => $view_topic_url - )); - } - } - unset($rowset); + $is_auth = auth(AUTH_READ, $search_forum, $userdata); - page_header(($l_search_title) ? $l_search_title : $user->lang['SEARCH']); + if ( !$is_auth['auth_read'] ) + { + message_die(GENERAL_MESSAGE, $lang['No_searchable_forums']); + } - $template->set_filenames(array( - 'body' => 'search_results.html') - ); - make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); - - page_footer(); -} - - -// Search forum -$s_forums = ''; -$sql = 'SELECT f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.left_id, f.right_id, f.forum_password, fa.user_id - FROM ' . FORUMS_TABLE . ' f - LEFT JOIN ' . FORUMS_ACCESS_TABLE . " fa ON (fa.forum_id = f.forum_id - AND fa.session_id = '" . $db->sql_escape($user->session_id) . "') - ORDER BY f.left_id ASC"; -$result = $db->sql_query($sql); - -$right = $cat_right = $padding_inc = 0; -$padding = $forum_list = $holding = ''; -$pad_store = array('0' => ''); - -while ($row = $db->sql_fetchrow($result)) -{ - if ($row['forum_type'] == FORUM_CAT && ($row['left_id'] + 1 == $row['right_id'])) - { - // Non-postable forum with no subforums, don't display - continue; - } - - if ($row['forum_type'] == FORUM_LINK || ($row['forum_password'] && !$row['user_id'])) - { - // if this forum is a link or password protected (user has not entered the password yet) then skip to the next branch - continue; - } - - if ($row['left_id'] < $right) - { - $padding .= '   '; - $pad_store[$row['parent_id']] = $padding; - } - else if ($row['left_id'] > $right + 1) - { - if (isset($pad_store[$row['parent_id']])) - { - $padding = $pad_store[$row['parent_id']]; + $auth_sql = "f.forum_id = $search_forum"; } else { - continue; + $is_auth_ary = auth(AUTH_READ, AUTH_LIST_ALL, $userdata); + + if ( $search_cat != -1 ) + { + $auth_sql = "f.cat_id = $search_cat"; + } + + $ignore_forum_sql = ''; + while( list($key, $value) = each($is_auth_ary) ) + { + if ( !$value['auth_read'] ) + { + $ignore_forum_sql .= ( ( $ignore_forum_sql != '' ) ? ', ' : '' ) . $key; + } + } + + if ( $ignore_forum_sql != '' ) + { + $auth_sql .= ( $auth_sql != '' ) ? " AND f.forum_id NOT IN ($ignore_forum_sql) " : "f.forum_id NOT IN ($ignore_forum_sql) "; + } } - } - $right = $row['right_id']; + // + // Author name search + // + if ( $search_author != '' ) + { + $search_author = str_replace('*', '%', trim($search_author)); - if ($auth->acl_gets('!f_search', '!f_list', $row['forum_id'])) - { - // if the user does not have permissions to search or see this forum skip only this forum/category - continue; - } + if( ( strpos($search_author, '%') !== false ) && ( strlen(str_replace('%', '', $search_author)) < $board_config['search_min_chars'] ) ) + { + $search_author = ''; + } + } - $selected = (in_array($row['forum_id'], $search_forum)) ? ' selected="selected"' : ''; + if ( $total_match_count ) + { + if ( $show_results == 'topics' ) + { + // + // This one is a beast, try to seperate it a bit (workaround for connection timeouts) + // + $search_id_chunks = array(); + $count = 0; + $chunk = 0; - if ($row['left_id'] > $cat_right) - { - // make sure we don't forget anything - $s_forums .= $holding; - $holding = ''; - } + if (count($search_ids) > $limiter) + { + for ($i = 0; $i < count($search_ids); $i++) + { + if ($count == $limiter) + { + $chunk++; + $count = 0; + } + + $search_id_chunks[$chunk][$count] = $search_ids[$i]; + $count++; + } + } + else + { + $search_id_chunks[0] = $search_ids; + } - if ($row['right_id'] - $row['left_id'] > 1) - { - $cat_right = max($cat_right, $row['right_id']); + $search_ids = array(); - $holding .= ''; + for ($i = 0; $i < count($search_id_chunks); $i++) + { + $where_sql = ''; + + if ( $search_time ) + { + $where_sql .= ( $search_author == '' && $auth_sql == '' ) ? " AND post_time >= $search_time " : " AND p.post_time >= $search_time "; + } + + if ( $search_author == '' && $auth_sql == '' ) + { + $sql = "SELECT topic_id + FROM " . POSTS_TABLE . " + WHERE post_id IN (" . implode(", ", $search_id_chunks[$i]) . ") + $where_sql + GROUP BY topic_id"; + } + else + { + $from_sql = POSTS_TABLE . " p"; + + if ( $search_author != '' ) + { + $from_sql .= ", " . USERS_TABLE . " u"; + $where_sql .= " AND u.user_id = p.poster_id AND u.username LIKE '$search_author' "; + } + + if ( $auth_sql != '' ) + { + $from_sql .= ", " . FORUMS_TABLE . " f"; + $where_sql .= " AND f.forum_id = p.forum_id AND $auth_sql"; + } + + $sql = "SELECT p.topic_id + FROM $from_sql + WHERE p.post_id IN (" . implode(", ", $search_id_chunks[$i]) . ") + $where_sql + GROUP BY p.topic_id"; + } + + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain topic ids', '', __LINE__, __FILE__, $sql); + } + + while ($row = $db->sql_fetchrow($result)) + { + $search_ids[] = $row['topic_id']; + } + $db->sql_freeresult($result); + } + + $total_match_count = sizeof($search_ids); + + } + else if ( $search_author != '' || $search_time || $auth_sql != '' ) + { + $search_id_chunks = array(); + $count = 0; + $chunk = 0; + + if (count($search_ids) > $limiter) + { + for ($i = 0; $i < count($search_ids); $i++) + { + if ($count == $limiter) + { + $chunk++; + $count = 0; + } + + $search_id_chunks[$chunk][$count] = $search_ids[$i]; + $count++; + } + } + else + { + $search_id_chunks[0] = $search_ids; + } + + $search_ids = array(); + + for ($i = 0; $i < count($search_id_chunks); $i++) + { + $where_sql = ( $search_author == '' && $auth_sql == '' ) ? 'post_id IN (' . implode(', ', $search_id_chunks[$i]) . ')' : 'p.post_id IN (' . implode(', ', $search_id_chunks[$i]) . ')'; + $select_sql = ( $search_author == '' && $auth_sql == '' ) ? 'post_id' : 'p.post_id'; + $from_sql = ( $search_author == '' && $auth_sql == '' ) ? POSTS_TABLE : POSTS_TABLE . ' p'; + + if ( $search_time ) + { + $where_sql .= ( $search_author == '' && $auth_sql == '' ) ? " AND post_time >= $search_time " : " AND p.post_time >= $search_time"; + } + + if ( $auth_sql != '' ) + { + $from_sql .= ", " . FORUMS_TABLE . " f"; + $where_sql .= " AND f.forum_id = p.forum_id AND $auth_sql"; + } + + if ( $search_author != '' ) + { + $from_sql .= ", " . USERS_TABLE . " u"; + $where_sql .= " AND u.user_id = p.poster_id AND u.username LIKE '$search_author'"; + } + + $sql = "SELECT " . $select_sql . " + FROM $from_sql + WHERE $where_sql"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain post ids', '', __LINE__, __FILE__, $sql); + } + + while( $row = $db->sql_fetchrow($result) ) + { + $search_ids[] = $row['post_id']; + } + $db->sql_freeresult($result); + } + + $total_match_count = count($search_ids); + } + } + else if ( $search_id == 'unanswered' ) + { + if ( $auth_sql != '' ) + { + $sql = "SELECT t.topic_id, f.forum_id + FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f + WHERE t.topic_replies = 0 + AND t.forum_id = f.forum_id + AND t.topic_moved_id = 0 + AND $auth_sql"; + } + else + { + $sql = "SELECT topic_id + FROM " . TOPICS_TABLE . " + WHERE topic_replies = 0 + AND topic_moved_id = 0"; + } + + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain post ids', '', __LINE__, __FILE__, $sql); + } + + $search_ids = array(); + while( $row = $db->sql_fetchrow($result) ) + { + $search_ids[] = $row['topic_id']; + } + $db->sql_freeresult($result); + + $total_match_count = count($search_ids); + + // + // Basic requirements + // + $show_results = 'topics'; + $sort_by = 0; + $sort_dir = 'DESC'; + } + else + { + message_die(GENERAL_MESSAGE, $lang['No_search_match']); + } + + // + // Delete old data from the search result table + // + $sql = 'DELETE FROM ' . SEARCH_TABLE . ' + WHERE search_time < ' . ($current_time - (int) $board_config['session_length']); + if ( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not delete old search id sessions', '', __LINE__, __FILE__, $sql); + } + + // + // Store new result data + // + $search_results = implode(', ', $search_ids); + $per_page = ( $show_results == 'posts' ) ? $board_config['posts_per_page'] : $board_config['topics_per_page']; + + // + // Combine both results and search data (apart from original query) + // so we can serialize it and place it in the DB + // + $store_search_data = array(); + + // + // Limit the character length (and with this the results displayed at all following pages) to prevent + // truncated result arrays. Normally, search results above 12000 are affected. + // - to include or not to include + /* + $max_result_length = 60000; + if (strlen($search_results) > $max_result_length) + { + $search_results = substr($search_results, 0, $max_result_length); + $search_results = substr($search_results, 0, strrpos($search_results, ',')); + $total_match_count = count(explode(', ', $search_results)); + } + */ + + for($i = 0; $i < count($store_vars); $i++) + { + $store_search_data[$store_vars[$i]] = $$store_vars[$i]; + } + + $result_array = serialize($store_search_data); + unset($store_search_data); + + mt_srand ((double) microtime() * 1000000); + $search_id = mt_rand(); + + $sql = "UPDATE " . SEARCH_TABLE . " + SET search_id = $search_id, search_time = $current_time, search_array = '" . str_replace("\'", "''", $result_array) . "' + WHERE session_id = '" . $userdata['session_id'] . "'"; + if ( !($result = $db->sql_query($sql)) || !$db->sql_affectedrows() ) + { + $sql = "INSERT INTO " . SEARCH_TABLE . " (search_id, session_id, search_time, search_array) + VALUES($search_id, '" . $userdata['session_id'] . "', $current_time, '" . str_replace("\'", "''", $result_array) . "')"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not insert search results', '', __LINE__, __FILE__, $sql); + } + } } else { - $s_forums .= $holding . ''; - $holding = ''; + $search_id = intval($search_id); + if ( $search_id ) + { + $sql = "SELECT search_array + FROM " . SEARCH_TABLE . " + WHERE search_id = $search_id + AND session_id = '". $userdata['session_id'] . "'"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain search results', '', __LINE__, __FILE__, $sql); + } + + if ( $row = $db->sql_fetchrow($result) ) + { + $search_data = unserialize($row['search_array']); + for($i = 0; $i < count($store_vars); $i++) + { + $$store_vars[$i] = $search_data[$store_vars[$i]]; + } + } + } + } + + // + // Look up data ... + // + if ( $search_results != '' ) + { + if ( $show_results == 'posts' ) + { + $sql = "SELECT pt.post_text, pt.bbcode_uid, pt.post_subject, p.*, f.forum_id, f.forum_name, t.*, u.username, u.user_id, u.user_sig, u.user_sig_bbcode_uid + FROM " . FORUMS_TABLE . " f, " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TEXT_TABLE . " pt + WHERE p.post_id IN ($search_results) + AND pt.post_id = p.post_id + AND f.forum_id = p.forum_id + AND p.topic_id = t.topic_id + AND p.poster_id = u.user_id"; + } + else + { + $sql = "SELECT t.*, f.forum_id, f.forum_name, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_username, p2.post_username AS post_username2, p2.post_time + FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2, " . USERS_TABLE . " u2 + WHERE t.topic_id IN ($search_results) + AND t.topic_poster = u.user_id + AND f.forum_id = t.forum_id + AND p.post_id = t.topic_first_post_id + AND p2.post_id = t.topic_last_post_id + AND u2.user_id = p2.poster_id"; + } + + $per_page = ( $show_results == 'posts' ) ? $board_config['posts_per_page'] : $board_config['topics_per_page']; + + $sql .= " ORDER BY "; + switch ( $sort_by ) + { + case 1: + $sql .= ( $show_results == 'posts' ) ? 'pt.post_subject' : 't.topic_title'; + break; + case 2: + $sql .= 't.topic_title'; + break; + case 3: + $sql .= 'u.username'; + break; + case 4: + $sql .= 'f.forum_id'; + break; + default: + $sql .= ( $show_results == 'posts' ) ? 'p.post_time' : 'p2.post_time'; + break; + } + $sql .= " $sort_dir LIMIT $start, " . $per_page; + + if ( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, 'Could not obtain search results', '', __LINE__, __FILE__, $sql); + } + + $searchset = array(); + while( $row = $db->sql_fetchrow($result) ) + { + $searchset[] = $row; + } + + $db->sql_freeresult($result); + + // + // Define censored word matches + // + $orig_word = array(); + $replacement_word = array(); + obtain_word_list($orig_word, $replacement_word); + + // + // Output header + // + $page_title = $lang['Search']; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + if ( $show_results == 'posts' ) + { + $template->set_filenames(array( + 'body' => 'search_results_posts.tpl') + ); + } + else + { + $template->set_filenames(array( + 'body' => 'search_results_topics.tpl') + ); + } + make_jumpbox('viewforum.'.$phpEx); + + $l_search_matches = ( $total_match_count == 1 ) ? sprintf($lang['Found_search_match'], $total_match_count) : sprintf($lang['Found_search_matches'], $total_match_count); + + $template->assign_vars(array( + 'L_SEARCH_MATCHES' => $l_search_matches, + 'L_TOPIC' => $lang['Topic']) + ); + + $highlight_active = ''; + $highlight_match = array(); + for($j = 0; $j < count($split_search); $j++ ) + { + $split_word = $split_search[$j]; + + if ( $split_word != 'and' && $split_word != 'or' && $split_word != 'not' ) + { + $highlight_match[] = '#\b(' . str_replace("*", "([\w]+)?", $split_word) . ')\b#is'; + $highlight_active .= " " . $split_word; + + for ($k = 0; $k < count($synonym_array); $k++) + { + list($replace_synonym, $match_synonym) = split(' ', trim(strtolower($synonym_array[$k]))); + + if ( $replace_synonym == $split_word ) + { + $highlight_match[] = '#\b(' . str_replace("*", "([\w]+)?", $replace_synonym) . ')\b#is'; + $highlight_active .= ' ' . $match_synonym; + } + } + } + } + + $highlight_active = urlencode(trim($highlight_active)); + + $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) : array(); + $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) : array(); + + for($i = 0; $i < count($searchset); $i++) + { + $forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $searchset[$i]['forum_id']); + $topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . '=' . $searchset[$i]['topic_id'] . "&highlight=$highlight_active"); + $post_url = append_sid("viewtopic.$phpEx?" . POST_POST_URL . '=' . $searchset[$i]['post_id'] . "&highlight=$highlight_active") . '#' . $searchset[$i]['post_id']; + + $post_date = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']); + + $message = $searchset[$i]['post_text']; + $topic_title = $searchset[$i]['topic_title']; + + $forum_id = $searchset[$i]['forum_id']; + $topic_id = $searchset[$i]['topic_id']; + + if ( $show_results == 'posts' ) + { + if ( isset($return_chars) ) + { + $bbcode_uid = $searchset[$i]['bbcode_uid']; + + // + // If the board has HTML off but the post has HTML + // on then we process it, else leave it alone + // + if ( $return_chars != -1 ) + { + $message = strip_tags($message); + $message = preg_replace("/\[.*?:$bbcode_uid:?.*?\]/si", '', $message); + $message = preg_replace('/\[url\]|\[\/url\]/si', '', $message); + $message = ( strlen($message) > $return_chars ) ? substr($message, 0, $return_chars) . ' ...' : $message; + } + else + { + if ( !$board_config['allow_html'] ) + { + if ( $postrow[$i]['enable_html'] ) + { + $message = preg_replace('#(<)([\/]?.*?)(>)#is', '<\\2>', $message); + } + } + + if ( $bbcode_uid != '' ) + { + $message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $message); + } + + $message = make_clickable($message); + + if ( $highlight_active ) + { + if ( preg_match('/<.*>/', $message) ) + { + $message = preg_replace($highlight_match, '\1', $message); + + $end_html = 0; + $start_html = 1; + $temp_message = ''; + $message = ' ' . $message . ' '; + + while( $start_html = strpos($message, '<', $start_html) ) + { + $grab_length = $start_html - $end_html - 1; + $temp_message .= substr($message, $end_html + 1, $grab_length); + + if ( $end_html = strpos($message, '>', $start_html) ) + { + $length = $end_html - $start_html + 1; + $hold_string = substr($message, $start_html, $length); + + if ( strrpos(' ' . $hold_string, '<') != 1 ) + { + $end_html = $start_html + 1; + $end_counter = 1; + + while ( $end_counter && $end_html < strlen($message) ) + { + if ( substr($message, $end_html, 1) == '>' ) + { + $end_counter--; + } + else if ( substr($message, $end_html, 1) == '<' ) + { + $end_counter++; + } + + $end_html++; + } + + $length = $end_html - $start_html + 1; + $hold_string = substr($message, $start_html, $length); + $hold_string = str_replace('', '', $hold_string); + $hold_string = str_replace('', '', $hold_string); + } + else if ( $hold_string == '' ) + { + $hold_string = str_replace('', '', $hold_string); + } + else if ( $hold_string == '' ) + { + $hold_string = str_replace('', '', $hold_string); + } + + $temp_message .= $hold_string; + + $start_html += $length; + } + else + { + $start_html = strlen($message); + } + } + + $grab_length = strlen($message) - $end_html - 1; + $temp_message .= substr($message, $end_html + 1, $grab_length); + + $message = trim($temp_message); + } + else + { + $message = preg_replace($highlight_match, '\1', $message); + } + } + } + + if ( count($orig_word) ) + { + $topic_title = preg_replace($orig_word, $replacement_word, $topic_title); + $post_subject = ( $searchset[$i]['post_subject'] != "" ) ? preg_replace($orig_word, $replacement_word, $searchset[$i]['post_subject']) : $topic_title; + + $message = preg_replace($orig_word, $replacement_word, $message); + } + else + { + $post_subject = ( $searchset[$i]['post_subject'] != '' ) ? $searchset[$i]['post_subject'] : $topic_title; + } + + if ($board_config['allow_smilies'] && $searchset[$i]['enable_smilies']) + { + $message = smilies_pass($message); + } + + $message = str_replace("\n", '
    ', $message); + + } + + $poster = ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '' : ''; + $poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? $searchset[$i]['username'] : ( ( $searchset[$i]['post_username'] != "" ) ? $searchset[$i]['post_username'] : $lang['Guest'] ); + $poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '' : ''; + + if ( $userdata['session_logged_in'] && $searchset[$i]['post_time'] > $userdata['user_lastvisit'] ) + { + if ( !empty($tracking_topics[$topic_id]) && !empty($tracking_forums[$forum_id]) ) + { + $topic_last_read = ( $tracking_topics[$topic_id] > $tracking_forums[$forum_id] ) ? $tracking_topics[$topic_id] : $tracking_forums[$forum_id]; + } + else if ( !empty($tracking_topics[$topic_id]) || !empty($tracking_forums[$forum_id]) ) + { + $topic_last_read = ( !empty($tracking_topics[$topic_id]) ) ? $tracking_topics[$topic_id] : $tracking_forums[$forum_id]; + } + + if ( $searchset[$i]['post_time'] > $topic_last_read ) + { + $mini_post_img = $images['icon_minipost_new']; + $mini_post_alt = $lang['New_post']; + } + else + { + $mini_post_img = $images['icon_minipost']; + $mini_post_alt = $lang['Post']; + } + } + else + { + $mini_post_img = $images['icon_minipost']; + $mini_post_alt = $lang['Post']; + } + + $template->assign_block_vars("searchresults", array( + 'TOPIC_TITLE' => $topic_title, + 'FORUM_NAME' => $searchset[$i]['forum_name'], + 'POST_SUBJECT' => $post_subject, + 'POST_DATE' => $post_date, + 'POSTER_NAME' => $poster, + 'TOPIC_REPLIES' => $searchset[$i]['topic_replies'], + 'TOPIC_VIEWS' => $searchset[$i]['topic_views'], + 'MESSAGE' => $message, + 'MINI_POST_IMG' => $mini_post_img, + + 'L_MINI_POST_ALT' => $mini_post_alt, + + 'U_POST' => $post_url, + 'U_TOPIC' => $topic_url, + 'U_FORUM' => $forum_url) + ); + } + else + { + $message = ''; + + if ( count($orig_word) ) + { + $topic_title = preg_replace($orig_word, $replacement_word, $searchset[$i]['topic_title']); + } + + $topic_type = $searchset[$i]['topic_type']; + + if ($topic_type == POST_ANNOUNCE) + { + $topic_type = $lang['Topic_Announcement'] . ' '; + } + else if ($topic_type == POST_STICKY) + { + $topic_type = $lang['Topic_Sticky'] . ' '; + } + else + { + $topic_type = ''; + } + + if ( $searchset[$i]['topic_vote'] ) + { + $topic_type .= $lang['Topic_Poll'] . ' '; + } + + $views = $searchset[$i]['topic_views']; + $replies = $searchset[$i]['topic_replies']; + + if ( ( $replies + 1 ) > $board_config['posts_per_page'] ) + { + $total_pages = ceil( ( $replies + 1 ) / $board_config['posts_per_page'] ); + $goto_page = ' [ ' . $lang['Goto_page'] . '' . $lang['Goto_page'] . ': '; + + $times = 1; + for($j = 0; $j < $replies + 1; $j += $board_config['posts_per_page']) + { + $goto_page .= '' . $times . ''; + if ( $times == 1 && $total_pages > 4 ) + { + $goto_page .= ' ... '; + $times = $total_pages - 3; + $j += ( $total_pages - 4 ) * $board_config['posts_per_page']; + } + else if ( $times < $total_pages ) + { + $goto_page .= ', '; + } + $times++; + } + $goto_page .= ' ] '; + } + else + { + $goto_page = ''; + } + + if ( $searchset[$i]['topic_status'] == TOPIC_MOVED ) + { + $topic_type = $lang['Topic_Moved'] . ' '; + $topic_id = $searchset[$i]['topic_moved_id']; + + $folder_image = '' . $lang['No_new_posts'] . ''; + $newest_post_img = ''; + } + else + { + if ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) + { + $folder = $images['folder_locked']; + $folder_new = $images['folder_locked_new']; + } + else if ( $searchset[$i]['topic_type'] == POST_ANNOUNCE ) + { + $folder = $images['folder_announce']; + $folder_new = $images['folder_announce_new']; + } + else if ( $searchset[$i]['topic_type'] == POST_STICKY ) + { + $folder = $images['folder_sticky']; + $folder_new = $images['folder_sticky_new']; + } + else + { + if ( $replies >= $board_config['hot_threshold'] ) + { + $folder = $images['folder_hot']; + $folder_new = $images['folder_hot_new']; + } + else + { + $folder = $images['folder']; + $folder_new = $images['folder_new']; + } + } + + if ( $userdata['session_logged_in'] ) + { + if ( $searchset[$i]['post_time'] > $userdata['user_lastvisit'] ) + { + if ( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) + { + + $unread_topics = true; + + if ( !empty($tracking_topics[$topic_id]) ) + { + if ( $tracking_topics[$topic_id] > $searchset[$i]['post_time'] ) + { + $unread_topics = false; + } + } + + if ( !empty($tracking_forums[$forum_id]) ) + { + if ( $tracking_forums[$forum_id] > $searchset[$i]['post_time'] ) + { + $unread_topics = false; + } + } + + if ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) + { + if ( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] > $searchset[$i]['post_time'] ) + { + $unread_topics = false; + } + } + + if ( $unread_topics ) + { + $folder_image = $folder_new; + $folder_alt = $lang['New_posts']; + + $newest_post_img = '' . $lang['View_newest_post'] . ' '; + } + else + { + $folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts']; + + $folder_image = $folder; + $folder_alt = $folder_alt; + $newest_post_img = ''; + } + + } + else if ( $searchset[$i]['post_time'] > $userdata['user_lastvisit'] ) + { + $folder_image = $folder_new; + $folder_alt = $lang['New_posts']; + + $newest_post_img = '' . $lang['View_newest_post'] . ' '; + } + else + { + $folder_image = $folder; + $folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts']; + $newest_post_img = ''; + } + } + else + { + $folder_image = $folder; + $folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts']; + $newest_post_img = ''; + } + } + else + { + $folder_image = $folder; + $folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts']; + $newest_post_img = ''; + } + } + + + $topic_author = ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '' : ''; + $topic_author .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? $searchset[$i]['username'] : ( ( $searchset[$i]['post_username'] != '' ) ? $searchset[$i]['post_username'] : $lang['Guest'] ); + + $topic_author .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '' : ''; + + $first_post_time = create_date($board_config['default_dateformat'], $searchset[$i]['topic_time'], $board_config['board_timezone']); + + $last_post_time = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']); + + $last_post_author = ( $searchset[$i]['id2'] == ANONYMOUS ) ? ( ($searchset[$i]['post_username2'] != '' ) ? $searchset[$i]['post_username2'] . ' ' : $lang['Guest'] . ' ' ) : '' . $searchset[$i]['user2'] . ''; + + $last_post_url = '' . $lang['View_latest_post'] . ''; + + $template->assign_block_vars('searchresults', array( + 'FORUM_NAME' => $searchset[$i]['forum_name'], + 'FORUM_ID' => $forum_id, + 'TOPIC_ID' => $topic_id, + 'FOLDER' => $folder_image, + 'NEWEST_POST_IMG' => $newest_post_img, + 'TOPIC_FOLDER_IMG' => $folder_image, + 'GOTO_PAGE' => $goto_page, + 'REPLIES' => $replies, + 'TOPIC_TITLE' => $topic_title, + 'TOPIC_TYPE' => $topic_type, + 'VIEWS' => $views, + 'TOPIC_AUTHOR' => $topic_author, + 'FIRST_POST_TIME' => $first_post_time, + 'LAST_POST_TIME' => $last_post_time, + 'LAST_POST_AUTHOR' => $last_post_author, + 'LAST_POST_IMG' => $last_post_url, + + 'L_TOPIC_FOLDER_ALT' => $folder_alt, + + 'U_VIEW_FORUM' => $forum_url, + 'U_VIEW_TOPIC' => $topic_url) + ); + } + } + + $base_url = "search.$phpEx?search_id=$search_id"; + + $template->assign_vars(array( + 'PAGINATION' => generate_pagination($base_url, $total_match_count, $per_page, $start), + 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $per_page ) + 1 ), ceil( $total_match_count / $per_page )), + + 'L_AUTHOR' => $lang['Author'], + 'L_MESSAGE' => $lang['Message'], + 'L_FORUM' => $lang['Forum'], + 'L_TOPICS' => $lang['Topics'], + 'L_REPLIES' => $lang['Replies'], + 'L_VIEWS' => $lang['Views'], + 'L_POSTS' => $lang['Posts'], + 'L_LASTPOST' => $lang['Last_Post'], + 'L_POSTED' => $lang['Posted'], + 'L_SUBJECT' => $lang['Subject'], + + 'L_GOTO_PAGE' => $lang['Goto_page']) + ); + + $template->pparse('body'); + + include($phpbb_root_path . 'includes/page_tail.'.$phpEx); + } + else + { + message_die(GENERAL_MESSAGE, $lang['No_search_match']); } } -if ($holding) +// +// Search forum +// +$sql = "SELECT c.cat_title, c.cat_id, f.forum_name, f.forum_id + FROM " . CATEGORIES_TABLE . " c, " . FORUMS_TABLE . " f + WHERE f.cat_id = c.cat_id + ORDER BY c.cat_order, f.forum_order"; +$result = $db->sql_query($sql); +if ( !$result ) { - $s_forums .= $holding; + message_die(GENERAL_ERROR, 'Could not obtain forum_name/forum_id', '', __LINE__, __FILE__, $sql); } -$db->sql_freeresult($result); -unset($pad_store); +$is_auth_ary = auth(AUTH_READ, AUTH_LIST_ALL, $userdata); -if (!$s_forums) +$s_forums = ''; +while( $row = $db->sql_fetchrow($result) ) { - trigger_error('NO_SEARCH'); + if ( $is_auth_ary[$row['forum_id']]['auth_read'] ) + { + $s_forums .= ''; + if ( empty($list_cat[$row['cat_id']]) ) + { + $list_cat[$row['cat_id']] = $row['cat_title']; + } + } } +if ( $s_forums != '' ) +{ + $s_forums = '' . $s_forums; + + // + // Category to search + // + $s_categories = ''; + while( list($cat_id, $cat_title) = @each($list_cat)) + { + $s_categories .= ''; + } +} +else +{ + message_die(GENERAL_MESSAGE, $lang['No_searchable_forums']); +} + +// // Number of chars returned -$s_characters = ''; +// +$s_characters = ''; $s_characters .= ''; $s_characters .= ''; $s_characters .= ''; -for ($i = 100; $i <= 1000 ; $i += 100) +for($i = 100; $i < 1100 ; $i += 100) { - $selected = ($i == 300) ? ' selected="selected"' : ''; + $selected = ( $i == 200 ) ? ' selected="selected"' : ''; $s_characters .= ''; } -$s_hidden_fields = array('t' => $topic_id); - -if ($_SID) +// +// Sorting +// +$s_sort_by = ""; +for($i = 0; $i < count($sort_by_types); $i++) { - $s_hidden_fields['sid'] = $_SID; + $s_sort_by .= ''; } -if (!empty($_EXTRA_URL)) +// +// Search time +// +$previous_days = array(0, 1, 7, 14, 30, 90, 180, 364); +$previous_days_text = array($lang['All_Posts'], $lang['1_Day'], $lang['7_Days'], $lang['2_Weeks'], $lang['1_Month'], $lang['3_Months'], $lang['6_Months'], $lang['1_Year']); + +$s_time = ''; +for($i = 0; $i < count($previous_days); $i++) { - foreach ($_EXTRA_URL as $url_param) - { - $url_param = explode('=', $url_param, 2); - $s_hidden_fields[$url_param[0]] = $url_param[1]; - } -} - -$template->assign_vars(array( - 'S_SEARCH_ACTION' => "{$phpbb_root_path}search.$phpEx", - 'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields), - 'S_CHARACTER_OPTIONS' => $s_characters, - 'S_FORUM_OPTIONS' => $s_forums, - 'S_SELECT_SORT_DIR' => $s_sort_dir, - 'S_SELECT_SORT_KEY' => $s_sort_key, - 'S_SELECT_SORT_DAYS' => $s_limit_days, - 'S_IN_SEARCH' => true, -)); - -// only show recent searches to search administrators -if ($auth->acl_get('a_search')) -{ - $sql = 'SELECT search_time, search_keywords - FROM ' . SEARCH_RESULTS_TABLE . ' - WHERE ' . $db->sql_function('length_text', 'search_keywords') . ' > 0 - ORDER BY search_time DESC'; - $result = $db->sql_query_limit($sql, 5); - - while ($row = $db->sql_fetchrow($result)) - { - $keywords = $row['search_keywords']; - - $template->assign_block_vars('recentsearch', array( - 'KEYWORDS' => $keywords, - 'TIME' => $user->format_date($row['search_time']), - - 'U_KEYWORDS' => append_sid("{$phpbb_root_path}search.$phpEx", 'keywords=' . urlencode(htmlspecialchars_decode($keywords))) - )); - } - $db->sql_freeresult($result); + $selected = ( $topic_days == $previous_days[$i] ) ? ' selected="selected"' : ''; + $s_time .= ''; } +// // Output the basic page -page_header($user->lang['SEARCH']); +// +$page_title = $lang['Search']; +include($phpbb_root_path . 'includes/page_header.'.$phpEx); $template->set_filenames(array( - 'body' => 'search_body.html') + 'body' => 'search_body.tpl') ); -make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); +make_jumpbox('viewforum.'.$phpEx); -page_footer(); +$template->assign_vars(array( + 'L_SEARCH_QUERY' => $lang['Search_query'], + 'L_SEARCH_OPTIONS' => $lang['Search_options'], + 'L_SEARCH_KEYWORDS' => $lang['Search_keywords'], + 'L_SEARCH_KEYWORDS_EXPLAIN' => $lang['Search_keywords_explain'], + 'L_SEARCH_AUTHOR' => $lang['Search_author'], + 'L_SEARCH_AUTHOR_EXPLAIN' => $lang['Search_author_explain'], + 'L_SEARCH_ANY_TERMS' => $lang['Search_for_any'], + 'L_SEARCH_ALL_TERMS' => $lang['Search_for_all'], + 'L_SEARCH_MESSAGE_ONLY' => $lang['Search_msg_only'], + 'L_SEARCH_MESSAGE_TITLE' => $lang['Search_title_msg'], + 'L_CATEGORY' => $lang['Category'], + 'L_RETURN_FIRST' => $lang['Return_first'], + 'L_CHARACTERS' => $lang['characters_posts'], + 'L_SORT_BY' => $lang['Sort_by'], + 'L_SORT_ASCENDING' => $lang['Sort_Ascending'], + 'L_SORT_DESCENDING' => $lang['Sort_Descending'], + 'L_SEARCH_PREVIOUS' => $lang['Search_previous'], + 'L_DISPLAY_RESULTS' => $lang['Display_results'], + 'L_FORUM' => $lang['Forum'], + 'L_TOPICS' => $lang['Topics'], + 'L_POSTS' => $lang['Posts'], + + 'S_SEARCH_ACTION' => append_sid("search.$phpEx?mode=results"), + 'S_CHARACTER_OPTIONS' => $s_characters, + 'S_FORUM_OPTIONS' => $s_forums, + 'S_CATEGORY_OPTIONS' => $s_categories, + 'S_TIME_OPTIONS' => $s_time, + 'S_SORT_OPTIONS' => $s_sort_by, + 'S_HIDDEN_FIELDS' => '') +); + +$template->pparse('body'); + +include($phpbb_root_path . 'includes/page_tail.'.$phpEx); ?> \ No newline at end of file diff --git a/phpBB/store/.htaccess b/phpBB/store/.htaccess deleted file mode 100644 index aa5afc1640..0000000000 --- a/phpBB/store/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ - - Order Allow,Deny - Deny from All - \ No newline at end of file diff --git a/phpBB/style.php b/phpBB/style.php deleted file mode 100644 index 7dfd3886ff..0000000000 --- a/phpBB/style.php +++ /dev/null @@ -1,289 +0,0 @@ -sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false)) - { - exit; - } - unset($dbpasswd); - - $config = cache::obtain_config(); - $user = false; - - if ($sid) - { - $sql = 'SELECT u.user_id, u.user_lang - FROM ' . SESSIONS_TABLE . ' s, ' . USERS_TABLE . " u - WHERE s.session_id = '" . $db->sql_escape($sid) . "' - AND s.session_user_id = u.user_id"; - $result = $db->sql_query($sql); - $user = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - } - - $recompile = $config['load_tplcompile']; - if (!$user) - { - $id = $config['default_style']; - $recompile = false; - $user = array('user_id' => ANONYMOUS); - } - - $sql = 'SELECT s.style_id, c.theme_data, c.theme_path, c.theme_name, c.theme_mtime, i.*, t.template_path - FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . ' i - WHERE s.style_id = ' . $id . ' - AND t.template_id = s.template_id - AND c.theme_id = s.theme_id - AND i.imageset_id = s.imageset_id'; - $result = $db->sql_query($sql, 300); - $theme = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$theme) - { - exit; - } - - if ($user['user_id'] == ANONYMOUS) - { - $user['user_lang'] = $config['default_lang']; - } - - $user_image_lang = (file_exists($phpbb_root_path . 'styles/' . $theme['imageset_path'] . '/imageset/' . $user['user_lang'])) ? $user['user_lang'] : $config['default_lang']; - - $sql = 'SELECT * - FROM ' . STYLES_IMAGESET_DATA_TABLE . ' - WHERE imageset_id = ' . $theme['imageset_id'] . " - AND image_filename <> '' - AND image_lang IN ('" . $db->sql_escape($user_image_lang) . "', '')"; - $result = $db->sql_query($sql, 3600); - - $img_array = array(); - while ($row = $db->sql_fetchrow($result)) - { - $img_array[$row['image_name']] = $row; - } - $db->sql_freeresult($result); - - // gzip_compression - if ($config['gzip_compress']) - { - // IE6 is not able to compress the style (do not ask us why!) - $browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? strtolower(htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT'])) : ''; - - if ($browser && strpos($browser, 'msie 6.0') === false && @extension_loaded('zlib') && !headers_sent()) - { - ob_start('ob_gzhandler'); - } - } - - // Expire time of seven days if not recached - $expire_time = 7 * 86400; - $recache = false; - - // Re-cache stylesheet data if necessary - if ($recompile || empty($theme['theme_data'])) - { - $recache = (empty($theme['theme_data'])) ? true : false; - $update_time = time(); - - // We test for stylesheet.css because it is faster and most likely the only file changed on common themes - if (!$recache && $theme['theme_mtime'] < @filemtime("{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme/stylesheet.css')) - { - $recache = true; - $update_time = @filemtime("{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme/stylesheet.css'); - } - else if (!$recache) - { - $last_change = $theme['theme_mtime']; - $dir = @opendir("{$phpbb_root_path}styles/{$theme['theme_path']}/theme"); - - if ($dir) - { - while (($entry = readdir($dir)) !== false) - { - if (substr(strrchr($entry, '.'), 1) == 'css' && $last_change < @filemtime("{$phpbb_root_path}styles/{$theme['theme_path']}/theme/{$entry}")) - { - $recache = true; - break; - } - } - closedir($dir); - } - } - } - - if ($recache) - { - if (!class_exists('acp_styles')) - { - include($phpbb_root_path . 'includes/acp/acp_styles.' . $phpEx); - } - - $theme['theme_data'] = acp_styles::db_theme_data($theme); - $theme['theme_mtime'] = $update_time; - - // Save CSS contents - $sql_ary = array( - 'theme_mtime' => $theme['theme_mtime'], - 'theme_data' => $theme['theme_data'] - ); - - $sql = 'UPDATE ' . STYLES_THEME_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " - WHERE theme_id = $id"; - $db->sql_query($sql); - - $cache->destroy('sql', STYLES_THEME_TABLE); - } - - // Only set the expire time if the theme changed data is older than 30 minutes - to cope with changes from the ACP - if ($recache || $theme['theme_mtime'] > (time() - 1800)) - { - header('Expires: 0'); - } - else - { - header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + $expire_time)); - } - - header('Content-type: text/css; charset=UTF-8'); - - // Parse Theme Data - $replace = array( - '{T_THEME_PATH}' => "{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme', - '{T_TEMPLATE_PATH}' => "{$phpbb_root_path}styles/" . $theme['template_path'] . '/template', - '{T_IMAGESET_PATH}' => "{$phpbb_root_path}styles/" . $theme['imageset_path'] . '/imageset', - '{T_IMAGESET_LANG_PATH}' => "{$phpbb_root_path}styles/" . $theme['imageset_path'] . '/imageset/' . $user_image_lang, - '{T_STYLESHEET_NAME}' => $theme['theme_name'], - '{S_USER_LANG}' => $user['user_lang'] - ); - - $theme['theme_data'] = str_replace(array_keys($replace), array_values($replace), $theme['theme_data']); - - $matches = array(); - preg_match_all('#\{IMG_([A-Za-z0-9_]*?)_(WIDTH|HEIGHT|SRC)\}#', $theme['theme_data'], $matches); - - $imgs = $find = $replace = array(); - if (isset($matches[0]) && sizeof($matches[0])) - { - foreach ($matches[1] as $i => $img) - { - $img = strtolower($img); - $find[] = $matches[0][$i]; - - if (!isset($img_array[$img])) - { - $replace[] = ''; - continue; - } - - if (!isset($imgs[$img])) - { - $img_data = &$img_array[$img]; - $imgsrc = ($img_data['image_lang'] ? $img_data['image_lang'] . '/' : '') . $img_data['image_filename']; - $imgs[$img] = array( - 'src' => $phpbb_root_path . 'styles/' . $theme['imageset_path'] . '/imageset/' . $imgsrc, - 'width' => $img_data['image_width'], - 'height' => $img_data['image_height'], - ); - } - - switch ($matches[2][$i]) - { - case 'SRC': - $replace[] = $imgs[$img]['src']; - break; - - case 'WIDTH': - $replace[] = $imgs[$img]['width']; - break; - - case 'HEIGHT': - $replace[] = $imgs[$img]['height']; - break; - - default: - continue; - } - } - - if (sizeof($find)) - { - $theme['theme_data'] = str_replace($find, $replace, $theme['theme_data']); - } - } - - echo $theme['theme_data']; - - if (!empty($cache)) - { - $cache->unload(); - } - $db->sql_close(); -} - -exit; - -?> \ No newline at end of file diff --git a/phpBB/styles/prosilver/imageset/announce_read.gif b/phpBB/styles/prosilver/imageset/announce_read.gif deleted file mode 100644 index 33e4a5e852..0000000000 Binary files a/phpBB/styles/prosilver/imageset/announce_read.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/announce_read_locked.gif b/phpBB/styles/prosilver/imageset/announce_read_locked.gif deleted file mode 100644 index 76ead8a02c..0000000000 Binary files a/phpBB/styles/prosilver/imageset/announce_read_locked.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/announce_read_locked_mine.gif b/phpBB/styles/prosilver/imageset/announce_read_locked_mine.gif deleted file mode 100644 index 2105d21f10..0000000000 Binary files a/phpBB/styles/prosilver/imageset/announce_read_locked_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/announce_read_mine.gif b/phpBB/styles/prosilver/imageset/announce_read_mine.gif deleted file mode 100644 index ad928330e6..0000000000 Binary files a/phpBB/styles/prosilver/imageset/announce_read_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/announce_unread.gif b/phpBB/styles/prosilver/imageset/announce_unread.gif deleted file mode 100644 index 4a789f70f0..0000000000 Binary files a/phpBB/styles/prosilver/imageset/announce_unread.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/announce_unread_locked.gif b/phpBB/styles/prosilver/imageset/announce_unread_locked.gif deleted file mode 100644 index 76dcc6ca71..0000000000 Binary files a/phpBB/styles/prosilver/imageset/announce_unread_locked.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/announce_unread_locked_mine.gif b/phpBB/styles/prosilver/imageset/announce_unread_locked_mine.gif deleted file mode 100644 index 53782fc3dc..0000000000 Binary files a/phpBB/styles/prosilver/imageset/announce_unread_locked_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/announce_unread_mine.gif b/phpBB/styles/prosilver/imageset/announce_unread_mine.gif deleted file mode 100644 index e01e920b59..0000000000 Binary files a/phpBB/styles/prosilver/imageset/announce_unread_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/en/button_pm_forward.gif b/phpBB/styles/prosilver/imageset/en/button_pm_forward.gif deleted file mode 100644 index 3384df34be..0000000000 Binary files a/phpBB/styles/prosilver/imageset/en/button_pm_forward.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/en/button_pm_new.gif b/phpBB/styles/prosilver/imageset/en/button_pm_new.gif deleted file mode 100644 index cc0381c6b2..0000000000 Binary files a/phpBB/styles/prosilver/imageset/en/button_pm_new.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/en/button_pm_reply.gif b/phpBB/styles/prosilver/imageset/en/button_pm_reply.gif deleted file mode 100644 index 3275b06d52..0000000000 Binary files a/phpBB/styles/prosilver/imageset/en/button_pm_reply.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/en/button_topic_locked.gif b/phpBB/styles/prosilver/imageset/en/button_topic_locked.gif deleted file mode 100644 index b08918a24f..0000000000 Binary files a/phpBB/styles/prosilver/imageset/en/button_topic_locked.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/en/button_topic_new.gif b/phpBB/styles/prosilver/imageset/en/button_topic_new.gif deleted file mode 100644 index 5b7b1e0e60..0000000000 Binary files a/phpBB/styles/prosilver/imageset/en/button_topic_new.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/en/button_topic_reply.gif b/phpBB/styles/prosilver/imageset/en/button_topic_reply.gif deleted file mode 100644 index e900c80c70..0000000000 Binary files a/phpBB/styles/prosilver/imageset/en/button_topic_reply.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/en/icon_contact_pm.gif b/phpBB/styles/prosilver/imageset/en/icon_contact_pm.gif deleted file mode 100644 index ec190118fe..0000000000 Binary files a/phpBB/styles/prosilver/imageset/en/icon_contact_pm.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/en/icon_post_edit.gif b/phpBB/styles/prosilver/imageset/en/icon_post_edit.gif deleted file mode 100644 index 19006f95a7..0000000000 Binary files a/phpBB/styles/prosilver/imageset/en/icon_post_edit.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/en/icon_post_quote.gif b/phpBB/styles/prosilver/imageset/en/icon_post_quote.gif deleted file mode 100644 index c3708a1477..0000000000 Binary files a/phpBB/styles/prosilver/imageset/en/icon_post_quote.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/en/icon_user_online.gif b/phpBB/styles/prosilver/imageset/en/icon_user_online.gif deleted file mode 100644 index 6b571ffce0..0000000000 Binary files a/phpBB/styles/prosilver/imageset/en/icon_user_online.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/en/imageset.cfg b/phpBB/styles/prosilver/imageset/en/imageset.cfg deleted file mode 100644 index a23eb170fb..0000000000 --- a/phpBB/styles/prosilver/imageset/en/imageset.cfg +++ /dev/null @@ -1,35 +0,0 @@ -# -# phpBB Imageset Configuration File -# -# @package phpBB3 -# @copyright (c) 2006 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License -# -# -# At the left is the name, please do not change this -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# -# - -# Images -img_icon_contact_pm = icon_contact_pm.gif*20*28 - -img_icon_post_edit = icon_post_edit.gif*20*42 -img_icon_post_quote = icon_post_quote.gif*20*54 - -img_icon_user_online = icon_user_online.gif*58*58 -img_icon_user_offline = -img_icon_user_search = - -img_button_pm_forward = button_pm_forward.gif*25*96 -img_button_pm_new = button_pm_new.gif*25*84 -img_button_pm_reply = button_pm_reply.gif*25*96 - -img_button_topic_locked = button_topic_locked.gif*25*88 -img_button_topic_new = button_topic_new.gif*25*96 -img_button_topic_reply = button_topic_reply.gif*25*96 diff --git a/phpBB/styles/prosilver/imageset/en/index.htm b/phpBB/styles/prosilver/imageset/en/index.htm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/phpBB/styles/prosilver/imageset/forum_link.gif b/phpBB/styles/prosilver/imageset/forum_link.gif deleted file mode 100644 index 01fb1c4e1e..0000000000 Binary files a/phpBB/styles/prosilver/imageset/forum_link.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/forum_read.gif b/phpBB/styles/prosilver/imageset/forum_read.gif deleted file mode 100644 index 82ceee0784..0000000000 Binary files a/phpBB/styles/prosilver/imageset/forum_read.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/forum_read_locked.gif b/phpBB/styles/prosilver/imageset/forum_read_locked.gif deleted file mode 100644 index 450bf28c3c..0000000000 Binary files a/phpBB/styles/prosilver/imageset/forum_read_locked.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/forum_read_subforum.gif b/phpBB/styles/prosilver/imageset/forum_read_subforum.gif deleted file mode 100644 index 5e97bc94ce..0000000000 Binary files a/phpBB/styles/prosilver/imageset/forum_read_subforum.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/forum_unread.gif b/phpBB/styles/prosilver/imageset/forum_unread.gif deleted file mode 100644 index 5a305d2470..0000000000 Binary files a/phpBB/styles/prosilver/imageset/forum_unread.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/forum_unread_locked.gif b/phpBB/styles/prosilver/imageset/forum_unread_locked.gif deleted file mode 100644 index 34f1d46ad7..0000000000 Binary files a/phpBB/styles/prosilver/imageset/forum_unread_locked.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/forum_unread_subforum.gif b/phpBB/styles/prosilver/imageset/forum_unread_subforum.gif deleted file mode 100644 index 5ddd1b2cba..0000000000 Binary files a/phpBB/styles/prosilver/imageset/forum_unread_subforum.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_back_top.gif b/phpBB/styles/prosilver/imageset/icon_back_top.gif deleted file mode 100644 index 4d2b8f3822..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_back_top.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_contact_aim.gif b/phpBB/styles/prosilver/imageset/icon_contact_aim.gif deleted file mode 100644 index be039fcde2..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_contact_aim.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_contact_email.gif b/phpBB/styles/prosilver/imageset/icon_contact_email.gif deleted file mode 100644 index caa3683005..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_contact_email.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_contact_icq.gif b/phpBB/styles/prosilver/imageset/icon_contact_icq.gif deleted file mode 100644 index 48a09373eb..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_contact_icq.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_contact_jabber.gif b/phpBB/styles/prosilver/imageset/icon_contact_jabber.gif deleted file mode 100644 index e335433e97..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_contact_jabber.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_contact_msnm.gif b/phpBB/styles/prosilver/imageset/icon_contact_msnm.gif deleted file mode 100644 index b82253599b..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_contact_msnm.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_contact_www.gif b/phpBB/styles/prosilver/imageset/icon_contact_www.gif deleted file mode 100644 index 83cee9728d..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_contact_www.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_contact_yahoo.gif b/phpBB/styles/prosilver/imageset/icon_contact_yahoo.gif deleted file mode 100644 index 305f297fdb..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_contact_yahoo.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_offline.gif b/phpBB/styles/prosilver/imageset/icon_offline.gif deleted file mode 100644 index c5e41a41db..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_offline.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_online.gif b/phpBB/styles/prosilver/imageset/icon_online.gif deleted file mode 100644 index 18e43cd0c6..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_online.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_post_delete.gif b/phpBB/styles/prosilver/imageset/icon_post_delete.gif deleted file mode 100644 index f51ffc24a6..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_post_delete.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_post_info.gif b/phpBB/styles/prosilver/imageset/icon_post_info.gif deleted file mode 100644 index af089d8656..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_post_info.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_post_report.gif b/phpBB/styles/prosilver/imageset/icon_post_report.gif deleted file mode 100644 index 72c6ae89d0..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_post_report.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_post_target.gif b/phpBB/styles/prosilver/imageset/icon_post_target.gif deleted file mode 100644 index a29dbffa35..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_post_target.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_post_target_unread.gif b/phpBB/styles/prosilver/imageset/icon_post_target_unread.gif deleted file mode 100644 index e97eeb2b2e..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_post_target_unread.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_rate_bad.gif b/phpBB/styles/prosilver/imageset/icon_rate_bad.gif deleted file mode 100644 index 7901889408..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_rate_bad.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_rate_good.gif b/phpBB/styles/prosilver/imageset/icon_rate_good.gif deleted file mode 100644 index 6d23034d71..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_rate_good.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_topic_attach.gif b/phpBB/styles/prosilver/imageset/icon_topic_attach.gif deleted file mode 100644 index 9a70638650..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_topic_attach.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_topic_latest.gif b/phpBB/styles/prosilver/imageset/icon_topic_latest.gif deleted file mode 100644 index d79d31ac43..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_topic_latest.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_topic_newest.gif b/phpBB/styles/prosilver/imageset/icon_topic_newest.gif deleted file mode 100644 index 0aa19884b5..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_topic_newest.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_topic_reported.gif b/phpBB/styles/prosilver/imageset/icon_topic_reported.gif deleted file mode 100644 index 006b1e2291..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_topic_reported.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_topic_unapproved.gif b/phpBB/styles/prosilver/imageset/icon_topic_unapproved.gif deleted file mode 100644 index 09d8f387a7..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_topic_unapproved.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/icon_user_warn.gif b/phpBB/styles/prosilver/imageset/icon_user_warn.gif deleted file mode 100755 index 9c4ad98e5c..0000000000 Binary files a/phpBB/styles/prosilver/imageset/icon_user_warn.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/imageset.cfg b/phpBB/styles/prosilver/imageset/imageset.cfg deleted file mode 100644 index 83b5cdb710..0000000000 --- a/phpBB/styles/prosilver/imageset/imageset.cfg +++ /dev/null @@ -1,116 +0,0 @@ -# -# phpBB Imageset Configuration File -# -# @package phpBB3 -# @copyright (c) 2006 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License -# -# -# At the left is the name, please do not change this -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# -# - -# General Information about this style -name = prosilver -copyright = © phpBB Group, 2007 -version = 3.0.0 - -# Images -img_site_logo = site_logo.gif*52*139 -img_poll_left = -img_poll_center = -img_poll_right = -img_icon_friend = -img_icon_foe = - -img_forum_link = forum_link.gif*27*27 -img_forum_read = forum_read.gif*27*27 -img_forum_read_locked = forum_read_locked.gif*27*27 -img_forum_read_subforum = forum_read_subforum.gif*27*27 -img_forum_unread = forum_unread.gif*27*27 -img_forum_unread_locked = forum_unread_locked.gif*27*27 -img_forum_unread_subforum = forum_unread_subforum.gif*27*27 - -img_topic_moved = topic_moved.gif*27*27 - -img_topic_read = topic_read.gif*27*27 -img_topic_read_mine = topic_read_mine.gif*27*27 -img_topic_read_hot = topic_read_hot.gif*27*27 -img_topic_read_hot_mine = topic_read_hot_mine.gif*27*27 -img_topic_read_locked = topic_read_locked.gif*27*27 -img_topic_read_locked_mine = topic_read_locked_mine.gif*27*27 - -img_topic_unread = topic_unread.gif*27*27 -img_topic_unread_mine = topic_unread_mine.gif*27*27 -img_topic_unread_hot = topic_unread_hot.gif*27*27 -img_topic_unread_hot_mine = topic_unread_hot_mine.gif*27*27 -img_topic_unread_locked = topic_unread_locked.gif*27*27 -img_topic_unread_locked_mine = topic_unread_locked_mine.gif*27*27 - -img_sticky_read = sticky_read.gif*27*27 -img_sticky_read_mine = sticky_read_mine.gif*27*27 -img_sticky_read_locked = sticky_read_locked.gif*27*27 -img_sticky_read_locked_mine = sticky_read_locked_mine.gif*27*27 -img_sticky_unread = sticky_unread.gif*27*27 -img_sticky_unread_mine = sticky_unread_mine.gif*27*27 -img_sticky_unread_locked = sticky_unread_locked.gif*27*27 -img_sticky_unread_locked_mine = sticky_unread_locked_mine.gif*27*27 - -img_announce_read = announce_read.gif*27*27 -img_announce_read_mine = announce_read_mine.gif*27*27 -img_announce_read_locked = announce_read_locked.gif*27*27 -img_announce_read_locked_mine = announce_read_locked_mine.gif*27*27 -img_announce_unread = announce_unread.gif*27*27 -img_announce_unread_mine = announce_unread_mine.gif*27*27 -img_announce_unread_locked = announce_unread_locked.gif*27*27 -img_announce_unread_locked_mine = announce_unread_locked_mine.gif*27*27 - -img_global_read = announce_read.gif*27*27 -img_global_read_mine = announce_read_mine.gif*27*27 -img_global_read_locked = announce_read_locked.gif*27*27 -img_global_read_locked_mine = announce_read_locked_mine.gif*27*27 -img_global_unread = announce_unread.gif*27*27 -img_global_unread_mine = announce_unread_mine.gif*27*27 -img_global_unread_locked = announce_unread_locked.gif*27*27 -img_global_unread_locked_mine = announce_unread_locked_mine.gif*27*27 - -img_subforum_read = subforum_read.gif*9*11 -img_subforum_unread = subforum_unread.gif*9*11 - -img_pm_read = topic_read.gif*27*27 -img_pm_unread = topic_unread.gif*27*27 - -img_icon_back_top = icon_back_top.gif*11*11 - -img_icon_contact_aim = icon_contact_aim.gif*20*20 -img_icon_contact_email = icon_contact_email.gif*20*20 -img_icon_contact_icq = icon_contact_icq.gif*20*20 -img_icon_contact_jabber = icon_contact_jabber.gif*20*20 -img_icon_contact_msnm = icon_contact_msnm.gif*20*20 - -img_icon_contact_www = icon_contact_www.gif*20*20 -img_icon_contact_yahoo = icon_contact_yahoo.gif*20*20 - -img_icon_post_delete = icon_post_delete.gif*20*20 - -img_icon_post_info = icon_post_info.gif*20*20 - -img_icon_post_report = icon_post_report.gif*20*20 -img_icon_post_target = icon_post_target.gif*9*11 -img_icon_post_target_unread = icon_post_target_unread.gif*9*11 - -img_icon_topic_attach = icon_topic_attach.gif*10*7 -img_icon_topic_latest = icon_topic_latest.gif*9*11 -img_icon_topic_newest = icon_topic_newest.gif*9*11 -img_icon_topic_reported = icon_topic_reported.gif*14*16 -img_icon_topic_unapproved = icon_topic_unapproved.gif*14*16 - -img_icon_user_profile = - -img_icon_user_warn = icon_user_warn.gif*20*20 diff --git a/phpBB/styles/prosilver/imageset/index.htm b/phpBB/styles/prosilver/imageset/index.htm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/phpBB/styles/prosilver/imageset/site_logo.gif b/phpBB/styles/prosilver/imageset/site_logo.gif deleted file mode 100644 index 909114c377..0000000000 Binary files a/phpBB/styles/prosilver/imageset/site_logo.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/sticky_read.gif b/phpBB/styles/prosilver/imageset/sticky_read.gif deleted file mode 100644 index 59e42833db..0000000000 Binary files a/phpBB/styles/prosilver/imageset/sticky_read.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/sticky_read_locked.gif b/phpBB/styles/prosilver/imageset/sticky_read_locked.gif deleted file mode 100644 index 79f581be79..0000000000 Binary files a/phpBB/styles/prosilver/imageset/sticky_read_locked.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/sticky_read_locked_mine.gif b/phpBB/styles/prosilver/imageset/sticky_read_locked_mine.gif deleted file mode 100644 index ad056086e5..0000000000 Binary files a/phpBB/styles/prosilver/imageset/sticky_read_locked_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/sticky_read_mine.gif b/phpBB/styles/prosilver/imageset/sticky_read_mine.gif deleted file mode 100644 index 49e8b3f01c..0000000000 Binary files a/phpBB/styles/prosilver/imageset/sticky_read_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/sticky_unread.gif b/phpBB/styles/prosilver/imageset/sticky_unread.gif deleted file mode 100644 index ae6d5954b1..0000000000 Binary files a/phpBB/styles/prosilver/imageset/sticky_unread.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/sticky_unread_locked.gif b/phpBB/styles/prosilver/imageset/sticky_unread_locked.gif deleted file mode 100644 index 5792b8649a..0000000000 Binary files a/phpBB/styles/prosilver/imageset/sticky_unread_locked.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/sticky_unread_locked_mine.gif b/phpBB/styles/prosilver/imageset/sticky_unread_locked_mine.gif deleted file mode 100644 index 93495770c8..0000000000 Binary files a/phpBB/styles/prosilver/imageset/sticky_unread_locked_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/sticky_unread_mine.gif b/phpBB/styles/prosilver/imageset/sticky_unread_mine.gif deleted file mode 100644 index 2580ca0518..0000000000 Binary files a/phpBB/styles/prosilver/imageset/sticky_unread_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/subforum_read.gif b/phpBB/styles/prosilver/imageset/subforum_read.gif deleted file mode 100644 index 595595c296..0000000000 Binary files a/phpBB/styles/prosilver/imageset/subforum_read.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/subforum_unread.gif b/phpBB/styles/prosilver/imageset/subforum_unread.gif deleted file mode 100644 index b2b661dc78..0000000000 Binary files a/phpBB/styles/prosilver/imageset/subforum_unread.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/topic_moved.gif b/phpBB/styles/prosilver/imageset/topic_moved.gif deleted file mode 100644 index 3275cd6ef9..0000000000 Binary files a/phpBB/styles/prosilver/imageset/topic_moved.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/topic_read.gif b/phpBB/styles/prosilver/imageset/topic_read.gif deleted file mode 100644 index 0347ffc1e9..0000000000 Binary files a/phpBB/styles/prosilver/imageset/topic_read.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/topic_read_hot.gif b/phpBB/styles/prosilver/imageset/topic_read_hot.gif deleted file mode 100644 index dcb6f3bd60..0000000000 Binary files a/phpBB/styles/prosilver/imageset/topic_read_hot.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/topic_read_hot_mine.gif b/phpBB/styles/prosilver/imageset/topic_read_hot_mine.gif deleted file mode 100644 index 1e5498a9be..0000000000 Binary files a/phpBB/styles/prosilver/imageset/topic_read_hot_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/topic_read_locked.gif b/phpBB/styles/prosilver/imageset/topic_read_locked.gif deleted file mode 100644 index 83bc8bd02f..0000000000 Binary files a/phpBB/styles/prosilver/imageset/topic_read_locked.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/topic_read_locked_mine.gif b/phpBB/styles/prosilver/imageset/topic_read_locked_mine.gif deleted file mode 100644 index 360f9d989a..0000000000 Binary files a/phpBB/styles/prosilver/imageset/topic_read_locked_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/topic_read_mine.gif b/phpBB/styles/prosilver/imageset/topic_read_mine.gif deleted file mode 100644 index 4972a4e0a5..0000000000 Binary files a/phpBB/styles/prosilver/imageset/topic_read_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/topic_unread.gif b/phpBB/styles/prosilver/imageset/topic_unread.gif deleted file mode 100644 index 542a998258..0000000000 Binary files a/phpBB/styles/prosilver/imageset/topic_unread.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/topic_unread_hot.gif b/phpBB/styles/prosilver/imageset/topic_unread_hot.gif deleted file mode 100644 index e712f6e827..0000000000 Binary files a/phpBB/styles/prosilver/imageset/topic_unread_hot.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/topic_unread_hot_mine.gif b/phpBB/styles/prosilver/imageset/topic_unread_hot_mine.gif deleted file mode 100644 index fa8b167c64..0000000000 Binary files a/phpBB/styles/prosilver/imageset/topic_unread_hot_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/topic_unread_locked.gif b/phpBB/styles/prosilver/imageset/topic_unread_locked.gif deleted file mode 100644 index 4fb8fa9517..0000000000 Binary files a/phpBB/styles/prosilver/imageset/topic_unread_locked.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/topic_unread_locked_mine.gif b/phpBB/styles/prosilver/imageset/topic_unread_locked_mine.gif deleted file mode 100644 index 4ee6cfe423..0000000000 Binary files a/phpBB/styles/prosilver/imageset/topic_unread_locked_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/imageset/topic_unread_mine.gif b/phpBB/styles/prosilver/imageset/topic_unread_mine.gif deleted file mode 100644 index e73da38df7..0000000000 Binary files a/phpBB/styles/prosilver/imageset/topic_unread_mine.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg deleted file mode 100644 index f1ea67f7ce..0000000000 --- a/phpBB/styles/prosilver/style.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# -# phpBB Style Configuration File -# -# @package phpBB3 -# @copyright (c) 2005 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License -# -# -# At the left is the name, please do not change this -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# -# - -# General Information about this style -name = prosilver -copyright = © phpBB Group, 2007 -version = 3.0.0 \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/attachment.html b/phpBB/styles/prosilver/template/attachment.html deleted file mode 100644 index 7472abaee6..0000000000 --- a/phpBB/styles/prosilver/template/attachment.html +++ /dev/null @@ -1,122 +0,0 @@ - - - -

    [{_file.DENIED_MESSAGE}]

    - - - -
    -
    {_file.DOWNLOAD_NAME}
    -
    {_file.COMMENT}
    -
    - - - - -
    -
    {_file.DOWNLOAD_NAME}
    -
    {_file.COMMENT}
    -
    {_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}
    -
    - - - -
    -
    {_file.UPLOAD_ICON} {_file.DOWNLOAD_NAME}
    -
    {_file.COMMENT}
    -
    ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - -

    - [ {L_PLAY_QUICKTIME_FILE} ] - {_file.DOWNLOAD_NAME} [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ]

    - - - - diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html deleted file mode 100644 index bb90c46ced..0000000000 --- a/phpBB/styles/prosilver/template/bbcode.html +++ /dev/null @@ -1,40 +0,0 @@ -
      -
        -
      - -
        -
      - -
    • -
    • - -
      {USERNAME} {L_WROTE}: -
      -
      - -
      {L_CODE}: {L_SELECT_ALL_CODE}
      -
      - -
      -
      - - - - - - - - - - -{TEXT} - -{TEXT} - -{L_IMAGE} - -{DESCRIPTION} - -{DESCRIPTION} - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/confirm_body.html b/phpBB/styles/prosilver/template/confirm_body.html deleted file mode 100644 index 5b783915a4..0000000000 --- a/phpBB/styles/prosilver/template/confirm_body.html +++ /dev/null @@ -1,20 +0,0 @@ - - -
      -
      -
      - -

      {MESSAGE_TITLE}

      -

      {MESSAGE_TEXT}

      - -
      - {S_HIDDEN_FIELDS} -   - -
      - -
      -
      -
      - - diff --git a/phpBB/styles/prosilver/template/custom_profile_fields.html b/phpBB/styles/prosilver/template/custom_profile_fields.html deleted file mode 100644 index 44c68f532b..0000000000 --- a/phpBB/styles/prosilver/template/custom_profile_fields.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - checked="checked" /> - - - - - - - - - - - - diff --git a/phpBB/styles/prosilver/template/drafts.html b/phpBB/styles/prosilver/template/drafts.html deleted file mode 100644 index 838569ebf6..0000000000 --- a/phpBB/styles/prosilver/template/drafts.html +++ /dev/null @@ -1,44 +0,0 @@ - - - -
      -
      - -

      {L_LOAD_DRAFT}

      -

      {L_LOAD_DRAFT_EXPLAIN}

      - -
      -
      - -
      -
      - -
        -
      • -
        -
        {L_LOAD_DRAFT}
        -
        {L_SAVE_DATE}
        -
        -
      • -
      - - -
      -
      - diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js deleted file mode 100644 index 5631ab67d1..0000000000 --- a/phpBB/styles/prosilver/template/editor.js +++ /dev/null @@ -1,403 +0,0 @@ -/** -* bbCode control by subBlue design [ www.subBlue.com ] -* Includes unixsafe colour palette selector by SHS` -*/ - -// Startup variables -var imageTag = false; -var theSelection = false; - -// Check for Browser & Platform for PC & IE specific bits -// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html -var clientPC = navigator.userAgent.toLowerCase(); // Get client info -var clientVer = parseInt(navigator.appVersion); // Get browser version - -var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1)); -var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1)); - -var baseHeight; -onload_functions.push('initInsertions()'); - -/** -* Shows the help messages in the helpline window -*/ -function helpline(help) -{ - document.forms[form_name].helpbox.value = help_line[help]; -} - -/** -* Fix a bug involving the TextRange object. From -* http://www.frostjedi.com/terra/scripts/demo/caretBug.html -*/ -function initInsertions() -{ - var doc; - - if (document.forms[form_name]) - { - doc = document; - } - else - { - doc = opener.document; - } - - var textarea = doc.forms[form_name].elements[text_name]; - - if (is_ie && typeof(baseHeight) != 'number') - { - textarea.focus(); - baseHeight = doc.selection.createRange().duplicate().boundingHeight; - - if (!document.forms[form_name]) - { - document.body.focus(); - } - } -} - -/** -* bbstyle -*/ -function bbstyle(bbnumber) -{ - if (bbnumber != -1) - { - bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]); - } - else - { - insert_text('[*]'); - document.forms[form_name].elements[text_name].focus(); - } -} - -/** -* Apply bbcodes -*/ -function bbfontstyle(bbopen, bbclose) -{ - theSelection = false; - - var textarea = document.forms[form_name].elements[text_name]; - - textarea.focus(); - - if ((clientVer >= 4) && is_ie && is_win) - { - // Get text selection - theSelection = document.selection.createRange().text; - - if (theSelection) - { - // Add tags around selection - document.selection.createRange().text = bbopen + theSelection + bbclose; - document.forms[form_name].elements[text_name].focus(); - theSelection = ''; - return; - } - } - else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0)) - { - mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose); - document.forms[form_name].elements[text_name].focus(); - theSelection = ''; - return; - } - - //The new position for the cursor after adding the bbcode - var caret_pos = getCaretPosition(textarea).start; - var new_pos = caret_pos + bbopen.length; - - // Open tag - insert_text(bbopen + bbclose); - - // Center the cursor when we don't have a selection - // Gecko and proper browsers - if (!isNaN(textarea.selectionStart)) - { - textarea.selectionStart = new_pos; - textarea.selectionEnd = new_pos; - } - // IE - else if (document.selection) - { - var range = textarea.createTextRange(); - range.move("character", new_pos); - range.select(); - storeCaret(textarea); - } - - textarea.focus(); - return; -} - -/** -* Insert text at position -*/ -function insert_text(text, spaces, popup) -{ - var textarea; - - if (!popup) - { - textarea = document.forms[form_name].elements[text_name]; - } - else - { - textarea = opener.document.forms[form_name].elements[text_name]; - } - if (spaces) - { - text = ' ' + text + ' '; - } - - if (!isNaN(textarea.selectionStart)) - { - var sel_start = textarea.selectionStart; - var sel_end = textarea.selectionEnd; - - mozWrap(textarea, text, '') - textarea.selectionStart = sel_start + text.length; - textarea.selectionEnd = sel_end + text.length; - } - else if (textarea.createTextRange && textarea.caretPos) - { - if (baseHeight != textarea.caretPos.boundingHeight) - { - textarea.focus(); - storeCaret(textarea); - } - - var caret_pos = textarea.caretPos; - caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text; - } - else - { - textarea.value = textarea.value + text; - } - if (!popup) - { - textarea.focus(); - } -} - -/** -* Add inline attachment at position -*/ -function attach_inline(index, filename) -{ - insert_text('[attachment=' + index + ']' + filename + '[/attachment]'); - document.forms[form_name].elements[text_name].focus(); -} - -/** -* Add quote text to message -*/ -function addquote(post_id, username) -{ - var message_name = 'message_' + post_id; - var theSelection = ''; - var divarea = false; - - if (document.all) - { - divarea = document.all[message_name]; - } - else - { - divarea = document.getElementById(message_name); - } - - // Get text selection - not only the post content :( - if (window.getSelection) - { - theSelection = window.getSelection().toString(); - } - else if (document.getSelection) - { - theSelection = document.getSelection(); - } - else if (document.selection) - { - theSelection = document.selection.createRange().text; - } - - if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null) - { - if (divarea.innerHTML) - { - theSelection = divarea.innerHTML.replace(/
      /ig, '\n'); - theSelection = theSelection.replace(//ig, '\n'); - theSelection = theSelection.replace(/<\;/ig, '<'); - theSelection = theSelection.replace(/>\;/ig, '>'); - theSelection = theSelection.replace(/&\;/ig, '&'); - theSelection = theSelection.replace(/ \;/ig, ' '); - } - else if (document.all) - { - theSelection = divarea.innerText; - } - else if (divarea.textContent) - { - theSelection = divarea.textContent; - } - else if (divarea.firstChild.nodeValue) - { - theSelection = divarea.firstChild.nodeValue; - } - } - - if (theSelection) - { - insert_text('[quote="' + username + '"]' + theSelection + '[/quote]'); - } - - return; -} - -/** -* From http://www.massless.org/mozedit/ -*/ -function mozWrap(txtarea, open, close) -{ - var selLength = txtarea.textLength; - var selStart = txtarea.selectionStart; - var selEnd = txtarea.selectionEnd; - var scrollTop = txtarea.scrollTop; - - if (selEnd == 1 || selEnd == 2) - { - selEnd = selLength; - } - - var s1 = (txtarea.value).substring(0,selStart); - var s2 = (txtarea.value).substring(selStart, selEnd) - var s3 = (txtarea.value).substring(selEnd, selLength); - - txtarea.value = s1 + open + s2 + close + s3; - txtarea.selectionStart = selEnd + open.length + close.length; - txtarea.selectionEnd = txtarea.selectionStart; - txtarea.focus(); - txtarea.scrollTop = scrollTop; - - return; -} - -/** -* Insert at Caret position. Code from -* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130 -*/ -function storeCaret(textEl) -{ - if (textEl.createTextRange) - { - textEl.caretPos = document.selection.createRange().duplicate(); - } -} - -/** -* Color pallette -*/ -function colorPalette(dir, width, height) -{ - var r = 0, g = 0, b = 0; - var numberList = new Array(6); - var color = ''; - - numberList[0] = '00'; - numberList[1] = '40'; - numberList[2] = '80'; - numberList[3] = 'BF'; - numberList[4] = 'FF'; - - document.writeln(''); - - for (r = 0; r < 5; r++) - { - if (dir == 'h') - { - document.writeln(''); - } - - for (g = 0; g < 5; g++) - { - if (dir == 'v') - { - document.writeln(''); - } - - for (b = 0; b < 5; b++) - { - color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]); - document.write(''); - } - - if (dir == 'v') - { - document.writeln(''); - } - } - - if (dir == 'h') - { - document.writeln(''); - } - } - document.writeln('
      '); - document.write('#' + color + ''); - document.writeln('
      '); -} - - -/** -* Caret Position object -*/ -function caretPosition() -{ - var start = null; - var end = null; -} - - -/** -* Get the caret position in an textarea -*/ -function getCaretPosition(txtarea) -{ - var caretPos = new caretPosition(); - - // simple Gecko/Opera way - if(txtarea.selectionStart || txtarea.selectionStart == 0) - { - caretPos.start = txtarea.selectionStart; - caretPos.end = txtarea.selectionEnd; - } - // dirty and slow IE way - else if(document.selection) - { - - // get current selection - var range = document.selection.createRange(); - - // a new selection of the whole textarea - var range_all = document.body.createTextRange(); - range_all.moveToElementText(txtarea); - - // calculate selection start point by moving beginning of range_all to beginning of range - var sel_start; - for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++) - { - range_all.moveStart('character', 1); - } - - txtarea.sel_start = sel_start; - - // we ignore the end value for IE, this is already dirty enough and we don't need it - caretPos.start = txtarea.sel_start; - caretPos.end = txtarea.sel_start; - } - - return caretPos; -} \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/faq_body.html b/phpBB/styles/prosilver/template/faq_body.html deleted file mode 100644 index aec578985e..0000000000 --- a/phpBB/styles/prosilver/template/faq_body.html +++ /dev/null @@ -1,52 +0,0 @@ - - -

      {L_FAQ_TITLE}

      - - - - - - -
      - - -
      -
      - -
      -

      {faq_block.BLOCK_TITLE}

      - -
      -
      {faq_block.faq_row.FAQ_QUESTION}
      -
      {faq_block.faq_row.FAQ_ANSWER}
      -
      {L_BACK_TO_TOP}
      -
      -
      - -
      - -
      -
      - - - - diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js deleted file mode 100644 index 6694dfb61b..0000000000 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ /dev/null @@ -1,257 +0,0 @@ -/** -* phpBB3 forum functions -*/ - -/** -* Window popup -*/ -function popup(url, width, height, name) -{ - if (!name) - { - name = '_popup'; - } - - window.open(url.replace(/&/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width); - return false; -} - -/** -* Jump to page -*/ -function jumpto() -{ - var page = prompt(jump_page, on_page); - - if (page !== null && !isNaN(page) && page > 0) - { - document.location.href = base_url.replace(/&/g, '&') + '&start=' + ((page - 1) * per_page); - } -} - -/** -* Mark/unmark checklist -* id = ID of parent container, name = name prefix, state = state [true/false] -*/ -function marklist(id, name, state) -{ - var parent = document.getElementById(id); - if (!parent) - { - eval('parent = document.' + id); - } - - if (!parent) - { - return; - } - - var rb = parent.getElementsByTagName('input'); - - for (var r = 0; r < rb.length; r++) - { - if (rb[r].name.substr(0, name.length) == name) - { - rb[r].checked = state; - } - } -} - -/** -* Resize viewable area for attached image or topic review panel (possibly others to come) -* e = element -*/ -function viewableArea(e, itself) -{ - if (!e) return; - if (!itself) - { - e = e.parentNode; - } - - if (!e.vaHeight) - { - // Store viewable area height before changing style to auto - e.vaHeight = e.offsetHeight; - e.vaMaxHeight = e.style.maxHeight; - e.style.height = 'auto'; - e.style.maxHeight = 'none'; - e.style.overflow = 'visible'; - } - else - { - // Restore viewable area height to the default - e.style.height = e.vaHeight + 'px'; - e.style.overflow = 'auto'; - e.style.maxHeight = e.vaMaxHeight; - e.vaHeight = false; - } -} - -/** -* Set display of page element -* s[-1,0,1] = hide,toggle display,show -*/ -function dE(n, s) -{ - var e = document.getElementById(n); - - if (!s) - { - s = (e.style.display == '' || e.style.display == 'block') ? -1 : 1; - } - e.style.display = (s == 1) ? 'block' : 'none'; -} - -/** -* Alternate display of subPanels -*/ -function subPanels(p) -{ - var i, e, t; - - if (typeof(p) == 'string') - { - show_panel = p; - } - - for (i = 0; i < panels.length; i++) - { - e = document.getElementById(panels[i]); - t = document.getElementById(panels[i] + '-tab'); - - if (e) - { - if (panels[i] == show_panel) - { - e.style.display = 'block'; - if (t) - { - t.className = 'activetab'; - } - } - else - { - e.style.display = 'none'; - if (t) - { - t.className = ''; - } - } - } - } -} - -/** -* Call print preview -*/ -function printPage() -{ - if (is_ie) - { - printPreview(); - } - else - { - window.print(); - } -} - -/** -* Show/hide groups of blocks -* c = CSS style name -* e = checkbox element -* t = toggle dispay state (used to show 'grip-show' image in the profile block when hiding the profiles) -*/ -function displayBlocks(c, e, t) -{ - var s = (e.checked == true) ? 1 : -1; - - if (t) - { - s *= -1; - } - - var divs = document.getElementsByTagName("DIV"); - - for (var d = 0; d < divs.length; d++) - { - if (divs[d].className.indexOf(c) == 0) - { - divs[d].style.display = (s == 1) ? 'none' : 'block'; - } - } -} - -function selectCode(a) -{ - // Get ID of code block - var e = a.parentNode.parentNode.getElementsByTagName('CODE')[0]; - - // Not IE - if (window.getSelection) - { - var s = window.getSelection(); - // Safari - if (s.setBaseAndExtent) - { - s.setBaseAndExtent(e, 0, e, e.innerText.length - 1); - } - // Firefox and Opera - else - { - var r = document.createRange(); - r.selectNodeContents(e); - s.removeAllRanges(); - s.addRange(r); - } - } - // Some older browsers - else if (document.getSelection) - { - var s = document.getSelection(); - var r = document.createRange(); - r.selectNodeContents(e); - s.removeAllRanges(); - s.addRange(r); - } - // IE - else if (document.selection) - { - var r = document.body.createTextRange(); - r.moveToElementText(e); - r.select(); - } -} - -/** -* Play quicktime file by determining it's width/height -* from the displayed rectangle area -*/ -function play_qt_file(obj) -{ - var rectangle = obj.GetRectangle(); - - if (rectangle) - { - rectangle = rectangle.split(','); - var x1 = parseInt(rectangle[0]); - var x2 = parseInt(rectangle[2]); - var y1 = parseInt(rectangle[1]); - var y2 = parseInt(rectangle[3]); - - var width = (x1 < 0) ? (x1 * -1) + x2 : x2 - x1; - var height = (y1 < 0) ? (y1 * -1) + y2 : y2 - y1; - } - else - { - var width = 200; - var height = 0; - } - - obj.width = width; - obj.height = height + 16; - - obj.SetControllerVisible(true); - obj.Play(); -} diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html deleted file mode 100644 index 29b75240c1..0000000000 --- a/phpBB/styles/prosilver/template/forumlist_body.html +++ /dev/null @@ -1,65 +0,0 @@ - - - -
    - - - - - - -
    -
    - -
      - - - -
    • -
      -
      - {forumrow.FORUM_IMAGE} - {forumrow.FORUM_NAME}
      - {forumrow.FORUM_DESC} - -
      {forumrow.L_MODERATOR_STR}: {forumrow.MODERATORS} - -
      {forumrow.L_SUBFORUM_STR} {forumrow.SUBFORUMS} -
      - -
      {L_REDIRECTS}: {forumrow.CLICKS}
      - -
      {forumrow.TOPICS} {L_TOPICS}
      -
      {forumrow.POSTS} {L_POSTS}
      -
      - {L_LAST_POST} {L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL} - {LAST_POST_IMG}
      {L_POSTED_ON_DATE} {forumrow.LAST_POST_TIME}{L_NO_POSTS}
      -
      - -
      -
    • - - - -
    - -
    -
    - - - -
    -
    - {L_NO_FORUMS} -
    -
    - diff --git a/phpBB/styles/prosilver/template/index.htm b/phpBB/styles/prosilver/template/index.htm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html deleted file mode 100644 index 43d8ad0309..0000000000 --- a/phpBB/styles/prosilver/template/index_body.html +++ /dev/null @@ -1,47 +0,0 @@ - - -

    {LAST_VISIT_DATE}{CURRENT_TIME}

    -

    {CURRENT_TIME}
    {L_MCP} ]

    {CURRENT_TIME}

    - - - - - - - - -
    -

    {L_LOGIN_LOGOUT}  •  {L_REGISTER}

    - -
    - - - -

    {L_WHO_IS_ONLINE}

    {L_WHO_IS_ONLINE}

    -

    {TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})
    {RECORD_USERS}

    {LOGGED_IN_USER_LIST} -
    {L_LEGEND}: {LEGEND}

    - - - -

    {L_BIRTHDAYS}

    -

    {L_CONGRATULATIONS}: {BIRTHDAY_LIST}{L_NO_BIRTHDAYS}

    - - - -

    {L_STATISTICS}

    -

    {TOTAL_POSTS} • {TOTAL_TOPICS} • {TOTAL_USERS} • {NEWEST_USER}

    - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html deleted file mode 100644 index 3ba7c3666d..0000000000 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ /dev/null @@ -1,33 +0,0 @@ - - -

    {L_RETURN_TO} {FORUM_NAME}

    - -

    {L_RETURN_TO} {L_INDEX}

    - -

    {L_RETURN_TO}: {SEARCH_TOPIC}

    - -

    {L_RETURN_TO_SEARCH_ADV}

    - - - -
    - - -
    - -
    - - - - -
    - - - -
    - diff --git a/phpBB/styles/prosilver/template/login_body.html b/phpBB/styles/prosilver/template/login_body.html deleted file mode 100644 index ac7ada28c9..0000000000 --- a/phpBB/styles/prosilver/template/login_body.html +++ /dev/null @@ -1,67 +0,0 @@ - - -
    -
    -
    - -
    -

    {LOGIN_EXPLAIN}{L_LOGIN}

    - -
    class="fields1"class="fields2"> -
    {LOGIN_ERROR}
    -
    -
    -
    -
    -
    -
    -
    - -
    {L_FORGOT_PASS}
    -
    {L_RESEND_ACTIVATION}
    - -
    - - -
    -

    {L_CONFIRM_CODE_EXPLAIN}
    -
    {CONFIRM_IMAGE}
    -
    -
    - - - -
    -
    -
    -
    - -
    -
     
    -
    {S_HIDDEN_FIELDS}
    -
    - -
    -
    -
    -
    - - -
    -
    - -
    -

    {L_REGISTER}

    -

    {L_LOGIN_INFO}

    -

    {L_TERMS_USE} | {L_PRIVACY}

    -
    -

    {L_REGISTER}

    -
    - -
    -
    - - -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/login_forum.html b/phpBB/styles/prosilver/template/login_forum.html deleted file mode 100644 index 1278a2e9a8..0000000000 --- a/phpBB/styles/prosilver/template/login_forum.html +++ /dev/null @@ -1,35 +0,0 @@ - - -

    {L_LOGIN} {FORUM_NAME}

    - -
    -{S_FORM_TOKEN} -
    -
    - -

    {L_LOGIN_FORUM}

    - -
    - -
    -
     
    -
    {LOGIN_ERROR}
    -
    - -
    -
    -
    -
    -
    -
     
    -
    {S_HIDDEN_FIELDS}
    -
    -
    - -
    -
    - -
    - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_approve.html b/phpBB/styles/prosilver/template/mcp_approve.html deleted file mode 100644 index 329205e2a2..0000000000 --- a/phpBB/styles/prosilver/template/mcp_approve.html +++ /dev/null @@ -1,53 +0,0 @@ - - -
    -
    - {S_FORM_TOKEN} -
    - -
    - -

    {MESSAGE_TITLE}

    -

    {ADDITIONAL_MSG}

    - -
    - -
    -
     
    -
    -
    - - - -
    -
    -
    -
    -
    -
    -

    {L_CAN_LEAVE_BLANK}
    -
    -
    - - -
    -
     
    -
    {MESSAGE_TEXT}
    -
    -
    - -
    - {S_HIDDEN_FIELDS}  - -
    - -
    - -
    -
    - -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_ban.html b/phpBB/styles/prosilver/template/mcp_ban.html deleted file mode 100644 index c803ba253f..0000000000 --- a/phpBB/styles/prosilver/template/mcp_ban.html +++ /dev/null @@ -1,128 +0,0 @@ - - - - -
    - -

    {L_TITLE}

    - -
    -
    - -

    {L_TITLE}

    -

    {L_EXPLAIN}

    - -
    -
    -
    -
    -
    {L_FIND_USERNAME}
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    - -
    -

    {L_BAN_EXCLUDE_EXPLAIN}
    -
    - - -
    -
    -
    - -
    -
    - -
    - {S_HIDDEN_FIELDS}  - - {S_FORM_TOKEN} -
    - -
    -
    - -

    {L_UNBAN_TITLE}

    -

    {L_UNBAN_EXPLAIN}

    - - -
    -
    -
    -
    -
    -
    -
    {L_BAN_LENGTH}:
    -
    -
    -
    -
    {L_BAN_REASON}:
    -
    -
    -
    -
    {L_BAN_GIVE_REASON}:
    -
    -
    -
    - -
    -
    - -
    - {S_HIDDEN_FIELDS}  - -
    - - - -

    {L_NO_BAN_CELL}

    - - - - - -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_footer.html b/phpBB/styles/prosilver/template/mcp_footer.html deleted file mode 100644 index 5a48d95f23..0000000000 --- a/phpBB/styles/prosilver/template/mcp_footer.html +++ /dev/null @@ -1,9 +0,0 @@ - - -
    - - - - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html deleted file mode 100644 index ceb10f4b76..0000000000 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ /dev/null @@ -1,107 +0,0 @@ - - - - - -

    {L_FORUM}: {FORUM_NAME}

    - -
    - -
    -
    - - - - - - -
      -
    • -
      -
      {L_TOPICS}
      -
      {L_REPLIES}
      -
      {L_LAST_POST}
      -
      {L_MARK}
      -
      -
    • -
    -
      - - -
    • -
      -
      style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"> - [ {L_SELECT_MERGE} ]   - {topicrow.TOPIC_TITLE} - {topicrow.UNAPPROVED_IMG} - {REPORTED_IMG} -  [ {L_DELETE_SHADOW_TOPIC} ] -
      - {topicrow.PAGINATION} - {topicrow.ATTACH_ICON_IMG} {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME}
      -
      {topicrow.REPLIES} {L_REPLIES}
      -
      {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} {L_POSTED_ON_DATE}
      {topicrow.LAST_POST_TIME}
      -
      -
      - checked="checked" />  -
      -
      -
    • - -
    - -
      -
    • {L_NO_TOPICS}

    • -
    - - -
    - {L_NEXT} - {L_PREVIOUS} - - - -
    - -
    - - - - - -
    -
    - -
    - - - - {S_FORM_TOKEN} -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html deleted file mode 100644 index a186d95970..0000000000 --- a/phpBB/styles/prosilver/template/mcp_front.html +++ /dev/null @@ -1,142 +0,0 @@ - - -

    {PAGE_TITLE}

    - - - -
    - -
    -
    - -

    {L_LATEST_UNAPPROVED}

    -

    {L_UNAPPROVED_TOTAL}

    - - -
      -
    • -
      -
      {L_VIEW_DETAILS}
      -
      {L_TOPIC} & {L_FORUM}
      -
      -
    • -
    - - -

    {L_UNAPPROVED_POSTS_ZERO_TOTAL}

    - - -
    - {S_FORM_TOKEN} -
    - - -
    -   - - -
    - -
    - - - -
    -
    - -

    {L_LATEST_REPORTED}

    -

    {L_REPORTS_TOTAL}

    - - -
      -
    • -
      -
      {L_VIEW_DETAILS}
      -
      {L_REPORTER} & {L_FORUM}
      -
      -
    • -
    -
      - - -
    • -
      -
      - {report.SUBJECT} {report.ATTACH_ICON_IMG}
      - {L_POSTED} {L_POST_BY_AUTHOR} {report.AUTHOR_FULL} {L_POSTED_ON_DATE} {report.POST_TIME} -
      -
      - {L_REPORTED} {L_POST_BY_AUTHOR} {report.REPORTER_FULL} {L_REPORTED_ON_DATE} {report.REPORT_TIME}
      - {L_FORUM}: {report.FORUM_NAME}
      -
      -
      -
    • - -
    - -

    {L_REPORTS_ZERO_TOTAL}

    - - -
    -
    - - - -
    -
    - -

    {L_LATEST_LOGS}

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {L_ACTION}{L_USERNAME}{L_IP}{L_VIEW_TOPIC}{L_VIEW_TOPIC_LOGS}{L_TIME}
    {log.ACTION}{log.USERNAME}{log.IP}{L_VIEW_TOPIC} {L_VIEW_TOPIC_LOGS} {log.TIME}
    {L_NO_ENTRIES}
    - -
    -
    - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_header.html b/phpBB/styles/prosilver/template/mcp_header.html deleted file mode 100644 index 9af0f4c4e6..0000000000 --- a/phpBB/styles/prosilver/template/mcp_header.html +++ /dev/null @@ -1,67 +0,0 @@ - - -

    {L_MCP}

    - - -

    - [ {L_MCP} | {L_MODERATE_FORUM} - | {L_MODERATE_TOPIC} - | {L_MODERATE_POST} ] -

    - - -
    - -
    - -
    -
    - -
    - - - -
    - -
    -

    {L_MESSAGE}

    -

    {MESSAGE}

    -

    {return_links.MESSAGE_LINK}

    -
    - - - -
    - -
    -

    {L_PLEASE_CONFIRM}

    -

    {CONFIRM_MESSAGE}

    - -
    - {S_HIDDEN_FIELDS}  - -
    -
    - -
    - diff --git a/phpBB/styles/prosilver/template/mcp_logs.html b/phpBB/styles/prosilver/template/mcp_logs.html deleted file mode 100644 index bf1e867be3..0000000000 --- a/phpBB/styles/prosilver/template/mcp_logs.html +++ /dev/null @@ -1,87 +0,0 @@ - - -

    {L_TITLE}

    - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {L_USERNAME}{L_IP}{L_TIME}{L_ACTION}{L_MARK}
    {log.USERNAME}{log.IP}{log.DATE}{log.ACTION}
    - {log.DATA} -
    {L_NO_ENTRIES}
    - - -
    - {L_NEXT} - {L_PREVIOUS} - - - - -
    - -
    - - - {S_FORM_TOKEN} -
    -
    - - -
    - -   - - -
    - - - {S_FORM_TOKEN} -
    -
    - - - -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_message.html b/phpBB/styles/prosilver/template/mcp_message.html deleted file mode 100644 index 1fde48b2cc..0000000000 --- a/phpBB/styles/prosilver/template/mcp_message.html +++ /dev/null @@ -1,8 +0,0 @@ - - -
    -

    {MESSAGE_TITLE}

    -

    {MESSAGE_TEXT}

    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_move.html b/phpBB/styles/prosilver/template/mcp_move.html deleted file mode 100644 index 804d76b14b..0000000000 --- a/phpBB/styles/prosilver/template/mcp_move.html +++ /dev/null @@ -1,36 +0,0 @@ - - -
    - -
    -
    - -
    -

    {MESSAGE_TITLE}

    -

    {ADDITIONAL_MSG}

    - -
    -
    -
    -
    -
    -
    -
    -
     
    -
    {MESSAGE_TEXT}
    -
    -
    - -
    - {S_HIDDEN_FIELDS}  - - {S_FORM_TOKEN} -
    - -
    - -
    -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_notes_front.html b/phpBB/styles/prosilver/template/mcp_notes_front.html deleted file mode 100644 index 045a7619ed..0000000000 --- a/phpBB/styles/prosilver/template/mcp_notes_front.html +++ /dev/null @@ -1,28 +0,0 @@ - - -
    - -

    {L_TITLE}

    - -
    -
    - -
    -
    -
    -
    -
    {L_FIND_USERNAME}
    -
    -
    - -
    -
    - -
    -   - - {S_FORM_TOKEN} -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html deleted file mode 100644 index a039aec04a..0000000000 --- a/phpBB/styles/prosilver/template/mcp_notes_user.html +++ /dev/null @@ -1,122 +0,0 @@ - - -
    - -

    {L_TITLE}

    - -
    -
    - -

    {USERNAME}{USERNAME}

    - -
    -
    -
    {AVATAR_IMG}
    -
    - -
    -
    -
    {L_RANK}:
    {RANK_TITLE}
    -
     {L_RANK}:
    {RANK_IMG}
    -
    {L_JOINED}:
    {JOINED}
    -
    {L_TOTAL_POSTS}:
    {POSTS}
    -
    {L_WARNINGS}:
    {WARNINGS}
    -
    -
    -
    - -
    -
    - -
    -
    - -

    {L_ADD_FEEDBACK}

    -

    {L_ADD_FEEDBACK_EXPLAIN}

    - -
    - -
    - -
    -
    - -
    - {S_HIDDEN_FIELDS}  - - {S_FORM_TOKEN} -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {L_REPORT_BY}{L_IP}{L_TIME}{L_ACTION_NOTE}{L_MARK}
    {usernotes.REPORT_BY}{usernotes.IP}{usernotes.REPORT_AT}{usernotes.ACTION}
    {L_NO_ENTRIES}
    - -
    - -
    - {L_NEXT} - {L_PREVIOUS} - - - -
    - -
    - - - -
    -
    - - -
    - -   -
    - -
    - -
    - -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html deleted file mode 100644 index b7c59b9a8b..0000000000 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ /dev/null @@ -1,284 +0,0 @@ - - - -

    {L_REPORT_DETAILS}

    - -
    -
    - -
    -

    {L_REPORT_REASON}: {REPORT_REASON_TITLE}

    -

    {L_REPORTED} {L_POST_BY_AUTHOR} {REPORTER_FULL} {L_REPORTED_ON_DATE} {REPORT_DATE}

    - -

    {L_REPORT_CLOSED}

    - -
    - - {REPORT_TEXT} - - {REPORT_REASON_DESCRIPTION} - -
    -
    - -
    -
    - -
    - -
    - -   - - - - {S_FORM_TOKEN} -
    -
    - - -

    {L_POST_DETAILS}

    - - -
    -
    - -
    - - - - -

    {POST_SUBJECT}

    -

    {MINI_POST_IMG} {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} {L_POSTED_ON_DATE} {POST_DATE}

    - - -
    - -

    -   - - - {S_FORM_TOKEN} -

    -
    - - - -

    - {REPORTED_IMG} {L_MESSAGE_REPORTED} -

    - - -
    - {POST_PREVIEW} -
    - - -
    -
    {L_ATTACHMENTS}
    - -
    {attachment.DISPLAY_ATTACHMENT}
    - -
    - - - -
    {SIGNATURE}
    - - - -
    -
    {L_THIS_POST_IP}: - {POST_IPADDR}{POST_IP} ({POST_IP}{L_LOOKUP_IP}) - - {POST_IPADDR} ({POST_IP}){POST_IP} ({L_LOOKUP_IP}) -
    - - -
    - -
    -
    - - -
    -
    - -

    {L_MOD_OPTIONS}

    - -
    - -
    -
    -
    -
    -
    - - -
    - [ {L_FIND_USERNAME} ] -
    -
    - {S_FORM_TOKEN} -
    -
    - - - -
    - -
    -
    -
    -
    -
    -
    - {S_FORM_TOKEN} -
    -
    - - -
    -
    - - - - -
    -
    - -

    {RETURN_QUEUE} | {RETURN_TOPIC_SIMPLE} | {RETURN_POST}{RETURN_REPORTS} | {L_VIEW_TOPIC}{RETURN_TOPIC}

    - -
    -
    - - - - - - -
    -
    - -
    - - -

    {L_FEEDBACK}

    - - - {L_REPORTED_BY}: {usernotes.REPORT_BY} {L_REPORTED_ON_DATE} {usernotes.REPORT_AT} -
    -
    {usernotes.ACTION}
    - -
    - - - -
    -   - -
    - - - -

    {L_ADD_FEEDBACK}

    -

    {L_ADD_FEEDBACK_EXPLAIN}

    - -
    - -
    - -
    -   - - {S_FORM_TOKEN} -
    -
    - -
    -
    - - - -
    -
    - -

    {L_MCP_POST_REPORTS}

    - - - {L_REPORTED_BY}: {reports.REPORTER}{reports.REPORTER} {L_REPORTED_ON_DATE} {reports.REPORT_TIME} -

    {reports.REASON_TITLE}: {reports.REASON_DESC}
    {reports.REPORT_TEXT}

    - - -
    -
    - - - -
    -
    - -

    {L_THIS_POST_IP}: - {POST_IPADDR}{POST_IP} ({POST_IP}{L_LOOKUP_IP}) - - {POST_IPADDR} ({POST_IP}){POST_IP} ({L_LOOKUP_IP}) -

    - - - - - - - - - - - - - - - - - - - - -
    {L_OTHER_USERS}{L_POSTS}
    {userrow.USERNAME}{userrow.USERNAME}{userrow.NUM_POSTS}
    {L_NO_MATCHES_FOUND}
    - - - - - - - - - - - - - - - - - - - - -
    {L_IPS_POSTED_FROM}{L_POSTS}
    {iprow.HOSTNAME} ({iprow.IP}){iprow.IP} ({L_LOOKUP_IP}){iprow.NUM_POSTS}
    {L_NO_MATCHES_FOUND}
    - -

    {L_LOOKUP_ALL}

    - -
    -
    - - - - - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html deleted file mode 100644 index e2f140667c..0000000000 --- a/phpBB/styles/prosilver/template/mcp_queue.html +++ /dev/null @@ -1,96 +0,0 @@ - - -
    - -
    - - - {S_FORM_TOKEN} -
    - -

    {L_TITLE}

    - -
    -
    - -

    {L_EXPLAIN}

    - - - -
      -
    • -
      -
      {L_TOPIC}{L_POST}
      -
      {L_TOPIC} & {L_FORUM}
      -
      {L_MARK}
      -
      -
    • -
    - - -
    - {L_NEXT} - {L_PREVIOUS} - - - - -
    - -
    - - - -

    {L_NO_TOPICS_QUEUE}{L_UNAPPROVED_POSTS_ZERO_TOTAL}

    - - -
    -
    - - -
    -   - - -
    - -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html deleted file mode 100644 index bc878f496c..0000000000 --- a/phpBB/styles/prosilver/template/mcp_reports.html +++ /dev/null @@ -1,85 +0,0 @@ - - -
    - -
    - - - {S_FORM_TOKEN} -
    - -

    {L_TITLE}

    - -
    -
    - -

    {L_EXPLAIN}

    - - - -
      -
    • -
      -
      {L_VIEW_DETAILS}
      -
      {L_REPORTER} & {L_FORUM}
      -
      {L_MARK}
      -
      -
    • -
    -
      - - -
    • -
      -
      - {postrow.POST_SUBJECT} {postrow.ATTACH_ICON_IMG}
      - {L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} {L_POSTED_ON_DATE} {postrow.POST_TIME} -
      -
      - {postrow.REPORTER_FULL} {L_REPORTED_ON_DATE} {postrow.REPORT_TIME}
      - {L_FORUM}: {postrow.FORUM_NAME}
      -
      -
      -
      -
    • - -
    - -
    - {L_NEXT} - {L_PREVIOUS} - - - - -
    -
    - - - -

    {L_NO_REPORTS}

    - - -
    -
    - - -
    - -   - -
    - -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html deleted file mode 100644 index 4ffd7dd4f1..0000000000 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ /dev/null @@ -1,170 +0,0 @@ - - -

    {L_TOPIC}: {TOPIC_TITLE}

    - - - -
    - -
    - -
    - -
    -
    - -
    -
    -

    {L_POSTS_PER_PAGE_EXPLAIN}
    -
    -
    -
    -
    -
    {S_SELECT_SORT_DAYS}  
    -
    -
    - - -
    -

    {L_SPLIT_TOPIC_EXPLAIN}

    - - -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -
    -
    -
    - - - -
    -

    {L_MERGE_TOPIC_EXPLAIN}

    -
    -
    -
    - - {L_SELECT_TOPIC} -
    -
    {TO_TOPIC_INFO}
    -
    -
    - - -
    -
    - -
    -
    - -

    - {L_EXPAND_VIEW} - {L_TOPIC_REVIEW}: {TOPIC_TITLE} -

    - -
    - -
    -
    - -
    -
    {L_POST_DETAILS} | {L_SELECT}: checked="checked" />
    - -

    {postrow.POST_SUBJECT}

    -

    {postrow.MINI_POST_IMG} {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} [ {L_POST_DETAILS} ]

    - - -

    - {UNAPPROVED_IMG} {L_POST_UNAPPROVED} - {REPORTED_IMG} {L_POST_REPORTED} -

    - - -
    {postrow.MESSAGE}
    - - -
    -
    {L_ATTACHMENTS}
    - -
    {postrow.attachment.DISPLAY_ATTACHMENT}
    - -
    - - -
    - -
    -
    - -
    - -
    - - - - - -
    -
    - -
    -   - - -{S_HIDDEN_FIELDS} -{S_FORM_TOKEN} -
    - -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_viewlogs.html b/phpBB/styles/prosilver/template/mcp_viewlogs.html deleted file mode 100644 index 264152d3ae..0000000000 --- a/phpBB/styles/prosilver/template/mcp_viewlogs.html +++ /dev/null @@ -1,53 +0,0 @@ - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - {S_FORM_TOKEN} -
    -
    {L_DISPLAY_OPTIONS}
    {L_DISPLAY_LOG}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
    {L_USERNAME}{L_IP}{L_TIME}{L_ACTION}
    {L_LOGS_CURRENT_TOPIC} {TOPIC_NAME}
    {log.USERNAME}{log.IP}{log.TIME}{log.ACTION}{L_VIEW_TOPIC} | {L_VIEW_TOPIC_LOGS}
    {L_NO_ENTRIES}
    -
    - - - - - - -
    {L_GOTO_PAGE} {L_PREVIOUS}  {PAGINATION}  {L_NEXT}
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_warn_front.html b/phpBB/styles/prosilver/template/mcp_warn_front.html deleted file mode 100644 index fc8fa37fab..0000000000 --- a/phpBB/styles/prosilver/template/mcp_warn_front.html +++ /dev/null @@ -1,97 +0,0 @@ - - -
    - -

    {L_WARN_USER}

    - -
    -
    - -

    {L_SELECT_USER}

    - -
    -
    -
    -
    -
    {L_FIND_USERNAME}
    -
    -
    - -
    -
    - -
    -   - - {S_FORM_TOKEN} -
    -
    - -
    -
    - -

    {L_MOST_WARNINGS}

    - - - - - - - - - - - - - - - - - - - - - - -
    {L_USERNAME}{L_WARNINGS}{L_LATEST_WARNING_TIME}
    {highest.USERNAME_FULL}{highest.WARNINGS}{highest.WARNING_TIME}{L_VIEW_NOTES}
    - -

    {L_WARNINGS_ZERO_TOTAL}

    - - -
    -
    - -
    -
    - -

    {L_LATEST_WARNINGS}

    - - - - - - - - - - - - - - - - - - - - - -
    {L_USERNAME}{L_TIME}{L_TOTAL_WARNINGS}
    {latest.USERNAME_FULL}{latest.WARNING_TIME}{latest.WARNINGS}{L_VIEW_NOTES}
    - -

    {L_WARNINGS_ZERO_TOTAL}

    - - -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_warn_list.html b/phpBB/styles/prosilver/template/mcp_warn_list.html deleted file mode 100644 index 3da7c4c389..0000000000 --- a/phpBB/styles/prosilver/template/mcp_warn_list.html +++ /dev/null @@ -1,66 +0,0 @@ - - -
    - -

    {L_WARNED_USERS}

    - -
    -
    - -

    {L_WARNED_USERS_EXPLAIN}

    - - - - - - - - - - - - - - - - - - - - - - - - -
    {L_USERNAME}{L_WARNINGS}{L_LATEST_WARNING_TIME}
    {user.USERNAME_FULL}{user.WARNINGS}{user.WARNING_TIME}{L_VIEW_NOTES}
    - -
    - - - -
    -
    - - - -

    {L_WARNINGS_ZERO_TOTAL}

    - - -
    - -{S_FORM_TOKEN} -
    - -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_warn_post.html b/phpBB/styles/prosilver/template/mcp_warn_post.html deleted file mode 100644 index 5937598a52..0000000000 --- a/phpBB/styles/prosilver/template/mcp_warn_post.html +++ /dev/null @@ -1,72 +0,0 @@ - - -
    - -

    {L_MCP_WARN_POST}

    - -
    -
    - -

    {USERNAME}{USERNAME}

    - -
    -
    -
    {AVATAR_IMG}
    -
    - -
    -
    -
    {L_RANK}:
    {RANK_TITLE}
    -
     {L_RANK}:
    {RANK_IMG}
    -
    {L_JOINED}:
    {JOINED}
    -
    {L_TOTAL_POSTS}:
    {POSTS}
    -
    {L_WARNINGS}:
    {WARNINGS}
    -
    -
    -
    - -
    -
    - -
    -
    - -

    {L_POST_DETAILS}

    - -
    - -
    - {POST} -
    - -
    - -
    -
    - -
    -
    - -

    {L_ADD_WARNING}

    -

    {L_ADD_WARNING_EXPLAIN}

    - -
    - -

    -
    -
     
    -
    -
    -
    - -
    -
    - -
    -   - - {S_FORM_TOKEN} -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_warn_user.html b/phpBB/styles/prosilver/template/mcp_warn_user.html deleted file mode 100644 index c807a6b640..0000000000 --- a/phpBB/styles/prosilver/template/mcp_warn_user.html +++ /dev/null @@ -1,56 +0,0 @@ - - -
    - -

    {L_WARN_USER}

    - -
    -
    - -

    {USERNAME}{USERNAME}

    - -
    -
    -
    {AVATAR_IMG}
    -
    - -
    -
    -
    {L_RANK}:
    {RANK_TITLE}
    -
     {L_RANK}:
    {RANK_IMG}
    -
    {L_JOINED}:
    {JOINED}
    -
    {L_TOTAL_POSTS}:
    {POSTS}
    -
    {L_WARNINGS}:
    {WARNINGS}
    -
    -
    -
    - -
    -
    - -
    -
    - -

    {L_ADD_WARNING}

    -

    {L_ADD_WARNING_EXPLAIN}

    - -
    - -

    -
    -
     
    -
    -
    -
    - -
    -
    - -
    -   - - {S_FORM_TOKEN} -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_whois.html b/phpBB/styles/prosilver/template/mcp_whois.html deleted file mode 100644 index 5872bd0b91..0000000000 --- a/phpBB/styles/prosilver/template/mcp_whois.html +++ /dev/null @@ -1,16 +0,0 @@ - -

    {L_WHOIS}

    - -
    -
    - -

    {L_RETURN_POST}

    -
    -
    {WHOIS}
    -
    -

    {L_RETURN_POST}

    - -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html deleted file mode 100644 index 6846432b2e..0000000000 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ /dev/null @@ -1,174 +0,0 @@ - - - -
    - - - - - - - - - - - - - - - style="color:#{GROUP_COLOR};">{GROUP_NAME} -

    {GROUP_DESC} {GROUP_TYPE}

    -

    - {AVATAR_IMG} - {RANK_IMG} - {GROUP_RANK} -

    - - -

    {PAGE_TITLE}: {SEARCH_WORDS}

    - -
    -
    - - - -
    -
    - - -
    -
    - - - - - - - - - - - - - - - - - - - - - -
    {L_RANK}{L_GROUP_LEADER}{L_USERNAME}{L_POSTS}{L_WEBSITE}{L_COMMA_SEPARATOR}{L_LOCATION}{L_JOINED}{L_LAST_ACTIVE}
     
    - -
    -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {L_GROUP_MEMBERS}    
    {memberrow.RANK_IMG}{memberrow.RANK_TITLE} {memberrow.USERNAME_FULL}
    {L_SELECT} ]
    {memberrow.POSTS}{memberrow.POSTS}
    {memberrow.LOCATION}
     
    {memberrow.JOINED}{memberrow.VISITED} 
    {L_NO_MEMBERS}
    - -
    -
    - - -
    - - -
    - - - - -
    - - - -
    - {L_PREVIOUS} - {L_NEXT} - - -
    - - -
    - -
    - - - - - - - - - diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html deleted file mode 100644 index e8870d8921..0000000000 --- a/phpBB/styles/prosilver/template/memberlist_email.html +++ /dev/null @@ -1,65 +0,0 @@ - - -

    {L_SEND_EMAIL_USER} {USERNAME}

    - -
    - -
    -
    - -
    -

    {ERROR_MESSAGE}

    -
    - -
    -
    -
    {USERNAME}
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    - {L_DEST_LANG_EXPLAIN}
    -
    -
    - -
    -

    - {L_EMAIL_BODY_EXPLAIN}
    -
    -
    -
    -
     
    -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -{S_FORM_TOKEN} -
    - -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html deleted file mode 100644 index 9bb1f90a58..0000000000 --- a/phpBB/styles/prosilver/template/memberlist_im.html +++ /dev/null @@ -1,157 +0,0 @@ - - - -

    {L_SEND_IM}

    - -
    - -
    -
    - -

    {L_SEND_IM_EXPLAIN}

    - -
    -
    -
    -
    {USERNAME} [ {IM_CONTACT} ] {PRESENCE_IMG}
    -
    - - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
     
    -
    -
    - - - - - - -
    -
     
    -
    {L_IM_ADD_CONTACT}
    -
    {L_IM_SEND_MESSAGE}
    -
    {L_IM_DOWNLOAD_APP} | {L_IM_AIM_EXPRESS}
    -
    - - - -
    -
     
    -
    -
    {L_IM_ADD_CONTACT}
    -
    {L_IM_SEND_MESSAGE}
    -
    - - - -
    -
    -
    -
    -
    -
     
    -
    -
    - - - -
    -
     
    -
    {L_IM_NO_JABBER}
    -
    - - - -
    -
     
    -
    {L_IM_SENT_JABBER}
    -
    - - {S_FORM_TOKEN} -
    - -
    -
    -{L_CLOSE_WINDOW} -
    - - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/memberlist_leaders.html b/phpBB/styles/prosilver/template/memberlist_leaders.html deleted file mode 100644 index 88b4510a71..0000000000 --- a/phpBB/styles/prosilver/template/memberlist_leaders.html +++ /dev/null @@ -1,76 +0,0 @@ - - -

    {PAGE_TITLE}

    - -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - -
    {L_RANK} {L_ADMINISTRATORS}{L_PRIMARY_GROUP}{L_FORUMS}
    {admin.RANK_IMG}{admin.RANK_TITLE}{admin.USERNAME_FULL} - style="font-weight: bold; color:#{admin.GROUP_COLOR}" href="{admin.U_GROUP}">{admin.GROUP_NAME} - - {admin.GROUP_NAME} - -
    {L_NO_MEMBERS}
    - -
    -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - -
    {L_MODERATORS}  
    {mod.RANK_IMG}{mod.RANK_TITLE}{mod.USERNAME_FULL} - style="font-weight: bold; color:#{mod.GROUP_COLOR}" href="{mod.U_GROUP}">{mod.GROUP_NAME} - - {mod.GROUP_NAME} - {L_ALL_FORUMS}
    {L_NO_MEMBERS}
    - -
    -
    - -
    - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html deleted file mode 100644 index 1d1d45bf8e..0000000000 --- a/phpBB/styles/prosilver/template/memberlist_search.html +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - -

    {L_FIND_USERNAME}

    - -
    -
    -
    - -

    {L_FIND_USERNAME_EXPLAIN}

    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    - -
    - -
    -   - - {S_FORM_TOKEN} -
    - -
    -
    - -
    diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html deleted file mode 100644 index 53f516b193..0000000000 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ /dev/null @@ -1,110 +0,0 @@ - - -

    {PAGE_TITLE}

    - -
    -
    -
    - - -
    -
    {AVATAR_IMG}
    -
    {RANK_TITLE}
    -
    {RANK_IMG}
    -
    - - -
    -
    {L_USERNAME}:
    -
    - {USERNAME} - [ {L_USER_ADMIN} ] - [ {L_USE_PERMISSIONS} ] -
    - -
    {L_RANK}:
    {RANK_TITLE}
    -
     {L_RANK}:
    {RANK_IMG}
    - -
    {L_USER_IS_INACTIVE}:
    {USER_INACTIVE_REASON}
    -
    {L_LOCATION}:
    {LOCATION}
    -
    {L_AGE}:
    {AGE}
    -
    {L_OCCUPATION}:
    {OCCUPATION}
    -
    {L_INTERESTS}:
    {INTERESTS}
    -
    {L_USERGROUPS}:
    -
    {custom_fields.PROFILE_FIELD_NAME}:
    {custom_fields.PROFILE_FIELD_VALUE}
    - - -
     
    {L_ADD_FRIEND}
    -
     
    {L_ADD_FOE}
    - - -
     
    {L_REMOVE_FRIEND}
    - -
     
    {L_REMOVE_FOE}
    - - - -
    - -
    -
    - -
    -
    -
    - -

    {L_CONTACT_USER} {USERNAME}

    - -
    -
    {L_EMAIL_ADDRESS}:
    {L_SEND_EMAIL_USER} {USERNAME}
    -
    {L_WEBSITE}:
    {U_WWW}
    -
    {L_PM}:
    {L_SEND_PRIVATE_MESSAGE}
    - -
    {L_MSNM}:
    {L_SEND_MSNM_MESSAGE}{USER_MSN}
    -
    {L_YIM}:
    {L_SEND_YIM_MESSAGE}{USER_YIM}
    -
    {L_AIM}:
    {L_SEND_AIM_MESSAGE}{USER_AIM}
    -
    {L_ICQ}:
    {L_SEND_ICQ_MESSAGE}{USER_ICQ}
    -
    {L_JABBER}:
    {L_SEND_JABBER_MESSAGE}
    {L_JABBER}:
    {USER_JABBER}
    - - -
    {postrow.PROFILE_FIELD1_NAME}:
    {postrow.PROFILE_FIELD1_VALUE}
    - -
    -
    - -
    -

    {L_USER_FORUM}

    -
    -
    {L_JOINED}:
    {JOINED}
    -
    {L_VISITED}:
    {VISITED}
    - -
    {L_WARNINGS}:
    -
    {WARNINGS} [ {L_VIEW_NOTES} | {L_WARN_USER} ]
    - -
    {L_TOTAL_POSTS}:
    {POSTS} | {L_SEARCH_USER_POSTS}
    ({POSTS_PCT} / {POSTS_DAY})
    - -
    {L_ACTIVE_IN_FORUM}:
    {ACTIVE_FORUM}
    ({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT}) -
    -
    {L_ACTIVE_IN_TOPIC}:
    {ACTIVE_TOPIC}
    ({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT}) -
    - -
    -
    -
    -
    - - -
    -
    - -

    {L_SIGNATURE}

    - -
    {SIGNATURE}
    - -
    -
    - - -
    - - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/message_body.html b/phpBB/styles/prosilver/template/message_body.html deleted file mode 100644 index eac7aeb2cb..0000000000 --- a/phpBB/styles/prosilver/template/message_body.html +++ /dev/null @@ -1,11 +0,0 @@ - - -
    -
    -

    {MESSAGE_TITLE}

    -

    {MESSAGE_TEXT}

    -

    {L_RETURN_TO_SEARCH_ADV}

    -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html deleted file mode 100644 index 1e84abe7f6..0000000000 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ /dev/null @@ -1,48 +0,0 @@ -
    - - - -
    - -
    - - {RUN_CRON_TASK} -
    - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html deleted file mode 100644 index dba717a0ba..0000000000 --- a/phpBB/styles/prosilver/template/overall_header.html +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - - - - - - -{META} -{SITENAME} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_TITLE} - - - - - - - - - - - - - - - - - - - - - - -
    - - - - -
    - - -
    -
    - {L_INFORMATION}: {L_BOARD_DISABLED} -
    -
    - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/posting_attach_body.html b/phpBB/styles/prosilver/template/posting_attach_body.html deleted file mode 100644 index d39405487d..0000000000 --- a/phpBB/styles/prosilver/template/posting_attach_body.html +++ /dev/null @@ -1,21 +0,0 @@ -
    -
    - -

    {L_ADD_ATTACHMENT_EXPLAIN}

    - -
    -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -
    - -
    -
    diff --git a/phpBB/styles/prosilver/template/posting_body.html b/phpBB/styles/prosilver/template/posting_body.html deleted file mode 100644 index 73b82700c5..0000000000 --- a/phpBB/styles/prosilver/template/posting_body.html +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html deleted file mode 100644 index 40f9503ca1..0000000000 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    - diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html deleted file mode 100644 index 6ec79dfb8b..0000000000 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ /dev/null @@ -1,259 +0,0 @@ -
    -

    {ERROR}

    - - - -
    - - -
    -
    -
    - -
    - {to_recipient.NAME} {to_recipient.NAME_FULL}  -   - -
    -
    - - -
    -
    -
    - -
    - {bcc_recipient.NAME}{bcc_recipient.NAME_FULL}  -   - -
    -
    - -
    -
    -
    {L_FIND_USERNAME}
    -
    -
    -
    - -
    -

    {L_FIND_USERNAME}
    - -
    - -
    - {to_recipient.NAME}{to_recipient.NAME_FULL}  -   - -
    - - -
    -
    - - -
    - - -
    -
    -
    -
    -
    - - -
    - - - - -
    -
    -
    -
    - - - -
    -
    -
    - - -
    -
    - - - -
    -
    -
    -
    - - - -
    -
    -
    -
    - -
    -

    {L_CONFIRM_CODE_EXPLAIN}
    -
    {CONFIRM_IMAGE}
    -
    -
    - - - - - -
    - - {L_SMILIES}
    - - {smiley.SMILEY_CODE} - - - -
    {L_MORE_SMILIES} - - - -
    - {BBCODE_STATUS}
    - - {IMG_STATUS}
    - {FLASH_STATUS}
    - {URL_STATUS}
    - {SMILIES_STATUS} - - - -
    - {L_BACK_TO_DRAFTS} - {L_TOPIC_REVIEW} - -
    - -
    - -
    -
    - - - - -
    -
    - - - -
    -
    -

    {L_POSTED_ATTACHMENTS}

    - -
    - - -
    - -
    -
    -
    {attach_row.FILENAME}
    -
    -   - -
    -
    - {attach_row.S_HIDDEN} -
    - - -
    - -
    -
    - - - -
    -
    -
    - {S_HIDDEN_ADDRESS_FIELD} - {S_HIDDEN_FIELDS} -   -   - onclick="document.getElementById('postform').action += '#preview';" />  -   - -
    - -
    -
    - - - - - - - -
    -
    - -
    - -
    - - -
    - - -
    - - -
    - - -
    - - -
    - - -
    - - - -
    - - - -
    -
    -
    -
    - - - -
    -
    -
    -
    {L_STICK_TOPIC_FOR_EXPLAIN}
    -
    - - - -
    -
    -
    -
    - -
    - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/posting_layout.html b/phpBB/styles/prosilver/template/posting_layout.html deleted file mode 100644 index b81c8162d7..0000000000 --- a/phpBB/styles/prosilver/template/posting_layout.html +++ /dev/null @@ -1,90 +0,0 @@ - - - -

    {TOPIC_TITLE}

    - -

    {FORUM_NAME}

    - - - -
    -
    - - - {L_FORUM_RULES} - - {L_FORUM_RULES}
    - {FORUM_RULES} - - -
    -
    - - -
    - - -
    -
    - -

    {L_INFORMATION}

    -

    {L_DRAFT_LOADED}

    - -
    -
    - - - - - - - -
    -
    -
    -

    {L_SELECT_DESTINATION_FORUM}

    -

    {L_UNGLOBALISE_EXPLAIN}

    -
    -
    -
    -
    - -
    -
     
    -
    -
    -
    - -
    -
    - - - - -
    -
    - -

    {L_POST_A}

    - - - - {S_FORM_TOKEN} -
    -
    - - - - - - - -
    - - - - - diff --git a/phpBB/styles/prosilver/template/posting_pm_layout.html b/phpBB/styles/prosilver/template/posting_pm_layout.html deleted file mode 100644 index 48812da102..0000000000 --- a/phpBB/styles/prosilver/template/posting_pm_layout.html +++ /dev/null @@ -1,35 +0,0 @@ - - - -
    -
    - -

    {L_INFORMATION}

    -

    {L_DRAFT_LOADED_PM}

    - -
    -
    - - - - - - -

    {L_TITLE}

    - -
    -
    - - - - -
    -
    - - - - - - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/posting_poll_body.html b/phpBB/styles/prosilver/template/posting_poll_body.html deleted file mode 100644 index ba0014ce57..0000000000 --- a/phpBB/styles/prosilver/template/posting_poll_body.html +++ /dev/null @@ -1,56 +0,0 @@ -
    -
    - - -

    {L_ADD_POLL_EXPLAIN}

    - - -
    - - -
    -
    -
    -
    - -
    -
    -
    -
    -
    -

    {L_POLL_OPTIONS_EXPLAIN}
    -
    -
    - -
    - -
    -
    -
    -
    {L_POLL_MAX_OPTIONS_EXPLAIN}
    -
    -
    -
    -
    -
    {L_POLL_FOR_EXPLAIN}
    -
    - - -
    - -
    -
    -
    -
    - - - -
    -
    -
    -
    - -
    - -
    -
    diff --git a/phpBB/styles/prosilver/template/posting_preview.html b/phpBB/styles/prosilver/template/posting_preview.html deleted file mode 100644 index 7ea1fb063d..0000000000 --- a/phpBB/styles/prosilver/template/posting_preview.html +++ /dev/null @@ -1,47 +0,0 @@ -
    -
    - - -
    -

    {L_PREVIEW}: {POLL_QUESTION}

    -

    {L_POLL_LENGTH}
    {L_MAX_VOTES}

    - -
    - -
    -
    -
    checked="checked" /> checked="checked" />
    -
    - -
    -
    - -
    -
    - -
    -
    - - - -
    -

    {L_PREVIEW}: {PREVIEW_SUBJECT}

    - -
    {PREVIEW_MESSAGE}
    - - -
    -
    {L_ATTACHMENTS}
    - -
    {attachment.DISPLAY_ATTACHMENT}
    - -
    - - -
    {PREVIEW_SIGNATURE}
    -
    - -
    -
    - -
    diff --git a/phpBB/styles/prosilver/template/posting_review.html b/phpBB/styles/prosilver/template/posting_review.html deleted file mode 100644 index 5953ea11f9..0000000000 --- a/phpBB/styles/prosilver/template/posting_review.html +++ /dev/null @@ -1,29 +0,0 @@ -

    {L_POST_REVIEW}

    - -

    {L_POST_REVIEW_EXPLAIN}

    - - -
    -
    - -
    -

    {post_review_row.POST_SUBJECT}

    -

    {post_review_row.MINI_POST_IMG}{post_review_row.MINI_POST_IMG} {L_POST_BY_AUTHOR} {post_review_row.POST_AUTHOR_FULL} {L_POSTED_ON_DATE} {post_review_row.POST_DATE}

    -
    {post_review_row.MESSAGE}
    - - -
    -
    {L_ATTACHMENTS}
    - -
    {post_review_row.attachment.DISPLAY_ATTACHMENT}
    - -
    - - -
    - -
    -
    - - -
    \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/posting_smilies.html b/phpBB/styles/prosilver/template/posting_smilies.html deleted file mode 100644 index dd0963baf5..0000000000 --- a/phpBB/styles/prosilver/template/posting_smilies.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - -

    {L_SMILIES}

    -
    -
    - - {smiley.SMILEY_CODE} - - -
    -
    -{L_CLOSE_WINDOW} - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html deleted file mode 100644 index ad51e4f264..0000000000 --- a/phpBB/styles/prosilver/template/posting_topic_review.html +++ /dev/null @@ -1,47 +0,0 @@ - -

    - {L_EXPAND_VIEW} - {L_TOPIC_REVIEW}: {TOPIC_TITLE} -

    - -
    - -
    -
    - -
    - - - - -

    {topic_review_row.POST_SUBJECT}

    -

    {topic_review_row.MINI_POST_IMG}{topic_review_row.MINI_POST_IMG} {L_POST_BY_AUTHOR} {topic_review_row.POST_AUTHOR_FULL} {L_POSTED_ON_DATE} {topic_review_row.POST_DATE}

    -
    {topic_review_row.MESSAGE}
    - - -
    -
    {L_ATTACHMENTS}
    - -
    {topic_review_row.attachment.DISPLAY_ATTACHMENT}
    - -
    - - - - - -
    -
    -
    - -
    - -
    - - -

    {L_BACK_TO_TOP}

    - -

    {L_BACK_TO_TOP}

    - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/report_body.html b/phpBB/styles/prosilver/template/report_body.html deleted file mode 100644 index b0c6e08049..0000000000 --- a/phpBB/styles/prosilver/template/report_body.html +++ /dev/null @@ -1,51 +0,0 @@ - - -

    {L_REPORT_POST}{L_REPORT_MESSAGE}

    - -
    -
    -
    - -
    -

    {L_REPORT_POST_EXPLAIN}{L_REPORT_MESSAGE_EXPLAIN}

    - -
    -
    -
    -
    -
    - -
    -

    {L_REPORT_NOTIFY_EXPLAIN}
    -
    - - -
    -
    - -
    -

    {L_CAN_LEAVE_BLANK}
    -
    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    -   - - {S_FORM_TOKEN} -
    -
    - -
    -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/search_body.html b/phpBB/styles/prosilver/template/search_body.html deleted file mode 100644 index f785fcf50a..0000000000 --- a/phpBB/styles/prosilver/template/search_body.html +++ /dev/null @@ -1,122 +0,0 @@ - - -

    {L_SEARCH}

    - -
    - -
    -
    -

    {L_SEARCH_QUERY}

    - -
    -
    -

    {L_SEARCH_KEYWORDS_EXPLAIN}
    -
    -
    -
    -
    -
    -

    {L_SEARCH_AUTHOR_EXPLAIN}
    -
    -
    -
    - -
    -
    - -
    -
    - -

    {L_SEARCH_OPTIONS}

    - -
    -
    -

    {L_SEARCH_FORUMS_EXPLAIN}
    -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    - -
    -
    -
    - - -
    -
    -
    -
    -
    {S_SELECT_SORT_KEY}  - - -
    -
    -
    -
    -
    {S_SELECT_SORT_DAYS}
    -
    -
    -
    -
    {L_POST_CHARACTERS}
    -
    -
    - -
    -
    - -
    -
    - -
    - {S_HIDDEN_FIELDS}  - -
    - -
    -
    - -
    - - -
    -
    - - - - - - - - - - - - - - - - - - - -
    {L_RECENT_SEARCHES}
    {recentsearch.KEYWORDS} {recentsearch.TIME}
    {L_NO_RECENT_SEARCHES}
    - -
    -
    - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html deleted file mode 100644 index 3924fa3944..0000000000 --- a/phpBB/styles/prosilver/template/search_results.html +++ /dev/null @@ -1,161 +0,0 @@ - - -

    {SEARCH_TITLE}{SEARCH_MATCHES}: {SEARCH_WORDS}

    -

    {L_IGNORED_TERMS}: {IGNORED_WORDS}

    - - -

    {L_RETURN_TO}: {SEARCH_TOPIC}

    - -

    {L_RETURN_TO_SEARCH_ADV}

    - - - -
    - -
    - - - - - - -
    - -
    - - - - - -
    - -
    -
      -
    • -
      -
      {L_TOPICS}
      -
      {L_REPLIES}
      -
      {L_VIEWS}
      -
      {L_LAST_POST}
      -
      -
    • -
    - - -
    -
    - -
    -
    - {L_NO_SEARCH_RESULTS} -
    -
    - - - - - -
    -
    - - -
    - {searchresults.L_IGNORE_POST} -
    - -
    -

    {searchresults.POST_SUBJECT}

    -
    {searchresults.MESSAGE}
    -
    - -
    -
    {L_POST_BY_AUTHOR} {searchresults.POST_AUTHOR_FULL}
    -
    {L_POSTED_ON_DATE} {searchresults.POST_DATE}
    -
     
    - -
    {L_FORUM}: {searchresults.FORUM_TITLE}
    -
    {L_TOPIC}: {searchresults.TOPIC_TITLE}
    - -
    {L_GLOBAL}: {searchresults.TOPIC_TITLE}
    - -
    {L_REPLIES}: {searchresults.TOPIC_REPLIES}
    -
    {L_VIEWS}: {searchresults.TOPIC_VIEWS}
    -
    - - - - - - -
    -
    - -
    -
    - {L_NO_SEARCH_RESULTS} -
    -
    - - - - -
    - -
    - {L_PREVIOUS} - {L_NEXT} - - - - -
    - -
    - -
    - - - - - - - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html deleted file mode 100644 index e64e209368..0000000000 --- a/phpBB/styles/prosilver/template/simple_footer.html +++ /dev/null @@ -1,20 +0,0 @@ -
    - - - -
    - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html deleted file mode 100644 index 5acf19f000..0000000000 --- a/phpBB/styles/prosilver/template/simple_header.html +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - -{META} -{SITENAME} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_TITLE} - - - - - - - - - - - - - - - - - - - - - -
    - -
    \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/styleswitcher.js b/phpBB/styles/prosilver/template/styleswitcher.js deleted file mode 100644 index c68215d13f..0000000000 --- a/phpBB/styles/prosilver/template/styleswitcher.js +++ /dev/null @@ -1,161 +0,0 @@ - -function fontsizeup() -{ - var active = getActiveStyleSheet(); - - switch (active) - { - case 'A--': - setActiveStyleSheet('A-'); - break; - - case 'A-': - setActiveStyleSheet('A'); - break; - - case 'A': - setActiveStyleSheet('A+'); - break; - - case 'A+': - setActiveStyleSheet('A++'); - break; - - case 'A++': - setActiveStyleSheet('A'); - break; - - default: - setActiveStyleSheet('A'); - break; - } -} - -function fontsizedown() -{ - active = getActiveStyleSheet(); - - switch (active) - { - case 'A++' : - setActiveStyleSheet('A+'); - break; - - case 'A+' : - setActiveStyleSheet('A'); - break; - - case 'A' : - setActiveStyleSheet('A-'); - break; - - case 'A-' : - setActiveStyleSheet('A--'); - break; - - case 'A--' : - break; - - default : - setActiveStyleSheet('A--'); - break; - } -} - -function setActiveStyleSheet(title) -{ - var i, a, main; - - for (i = 0; (a = document.getElementsByTagName('link')[i]); i++) - { - if (a.getAttribute('rel').indexOf('style') != -1 && a.getAttribute('title')) - { - a.disabled = true; - if (a.getAttribute('title') == title) - { - a.disabled = false; - } - } - } -} - -function getActiveStyleSheet() -{ - var i, a; - - for (i = 0; (a = document.getElementsByTagName('link')[i]); i++) - { - if (a.getAttribute('rel').indexOf('style') != -1 && a.getAttribute('title') && !a.disabled) - { - return a.getAttribute('title'); - } - } - - return null; -} - -function getPreferredStyleSheet() -{ - return ('A-'); -} - -function createCookie(name, value, days) -{ - if (days) - { - var date = new Date(); - date.setTime(date.getTime() + (days*24*60*60*1000)); - var expires = '; expires=' + date.toGMTString(); - } - else - { - expires = ''; - } - - document.cookie = name + '=' + value + expires + '; path=/'; -} - -function readCookie(name) -{ - var nameEQ = name + '='; - var ca = document.cookie.split(';'); - - for (var i = 0; i < ca.length; i++) - { - var c = ca[i]; - - while (c.charAt(0) == ' ') - { - c = c.substring(1, c.length); - } - - if (c.indexOf(nameEQ) == 0) - { - return c.substring(nameEQ.length, c.length); - } - } - - return null; -} - -function load_cookie() -{ - var cookie = readCookie('style_cookie'); - var title = cookie ? cookie : getPreferredStyleSheet(); - setActiveStyleSheet(title); -} - -function unload_cookie() -{ - var title = getActiveStyleSheet(); - createCookie('style_cookie', title, 365); -} - -onload_functions.push('load_cookie()'); -onunload_functions.push('unload_cookie()'); - -/* -var cookie = readCookie("style"); -var title = cookie ? cookie : getPreferredStyleSheet(); -setActiveStyleSheet(title); -*/ diff --git a/phpBB/styles/prosilver/template/template.cfg b/phpBB/styles/prosilver/template/template.cfg deleted file mode 100644 index 1251dcdce2..0000000000 --- a/phpBB/styles/prosilver/template/template.cfg +++ /dev/null @@ -1,25 +0,0 @@ -# -# phpBB Template Configuration File -# -# @package phpBB3 -# @copyright (c) 2006 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License -# -# -# At the left is the name, please do not change this -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# -# - -# General Information about this template -name = prosilver -copyright = © phpBB Group, 2007 -version = 3.0.0 - -# Defining a different template bitfield -template_bitfield = lNg= diff --git a/phpBB/styles/prosilver/template/ucp_agreement.html b/phpBB/styles/prosilver/template/ucp_agreement.html deleted file mode 100644 index 9aaee00d58..0000000000 --- a/phpBB/styles/prosilver/template/ucp_agreement.html +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - -
    - -
    -
    -
    -

    {SITENAME} - {L_REGISTRATION}

    -

    {L_COPPA_BIRTHDAY}{L_TERMS_OF_USE}

    -
    -
    -
    - -
    -
    -
    - - {L_COPPA_NO}  {L_COPPA_YES} - -   - - - {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} -
    -
    -
    -
    - - - -
    -
    -
    -

    {SITENAME} - {AGREEMENT_TITLE}

    -

    {AGREEMENT_TEXT}

    -
    -

    {L_BACK}

    -
    -
    -
    - - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html deleted file mode 100644 index 8052fdc435..0000000000 --- a/phpBB/styles/prosilver/template/ucp_attachments.html +++ /dev/null @@ -1,78 +0,0 @@ - - -
    - -

    {L_TITLE}

    - -
    -
    - -

    {L_ATTACHMENTS_EXPLAIN}

    - - - - - - - -
    - {L_NEXT} - {L_PREVIOUS} - - - - {S_FORM_TOKEN} -
    - -
    - - - -

    {L_UCP_NO_ATTACHMENTS}

    - - -
    -
    - - -
    - - - {S_FORM_TOKEN} -
    - -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html deleted file mode 100644 index d43e76e584..0000000000 --- a/phpBB/styles/prosilver/template/ucp_avatar_options.html +++ /dev/null @@ -1,70 +0,0 @@ - -
    -
    - -

    {L_AVATAR_FEATURES_DISABLED}

    - - -
    -

    {ERROR}

    -
    -

    {L_AVATAR_EXPLAIN}
    -
    {AVATAR}
    -
    -
    - - -
    -
    -
    -
    - - - -
    -

    {L_UPLOAD_AVATAR_URL_EXPLAIN}
    -
    -
    - - - -
    -

    {L_LINK_REMOTE_AVATAR_EXPLAIN}
    -
    -
    -
    -

    {L_LINK_REMOTE_SIZE_EXPLAIN}
    -
    - ×  - -
    -
    - -
    - - -
    -
    - -
    -
    - -

    {L_AVATAR_GALLERY}

    - -
    - - - -
    - - - - - -
    -
    diff --git a/phpBB/styles/prosilver/template/ucp_footer.html b/phpBB/styles/prosilver/template/ucp_footer.html deleted file mode 100644 index 4b3b14b4b7..0000000000 --- a/phpBB/styles/prosilver/template/ucp_footer.html +++ /dev/null @@ -1,15 +0,0 @@ - -
    -
    - -
    - - - -
    {S_FORM_TOKEN}
    - - - - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html deleted file mode 100644 index b64a3f63ea..0000000000 --- a/phpBB/styles/prosilver/template/ucp_groups_manage.html +++ /dev/null @@ -1,228 +0,0 @@ - - -

    {L_USERGROUPS}

    - -
    - -
    -
    - -

    {L_GROUPS_EXPLAIN}

    - - -

    {L_GROUP_DETAILS}

    - - -
    -

    {L_WARNING}

    -

    {ERROR_MSG}

    -
    - - -
    -
    -
    -
    style="color: #{GROUP_COLOUR};">{GROUP_NAME} -
    -
    -
    -
    -
    -
      
    -
    - -
    -

    {L_GROUP_TYPE_EXPLAIN}
    -
    - - - - -
    -
    - - - -
    - -
    -
    - -
    -
    -

    {L_GROUP_SETTINGS_SAVE}

    - -
    -
    -

    {L_GROUP_COLOR_EXPLAIN}
    -
        [ {L_COLOUR_SWATCH} ]
    -
    -
    -
    -
    -
    -
    - -
    -
    - - - -
    - {S_HIDDEN_FIELDS} -   -   -   - - {S_FORM_TOKEN} -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    {L_GROUP_LEAD}{L_GROUP_DEFAULT}{L_POSTS}{L_JOINED}{L_MARK}
    {leader.USERNAME_FULL}{L_YES}{L_NO}{leader.USER_POSTS}{leader.JOINED} 
    - - - - - - - - - - - - - - - -
    {L_GROUP_APPROVED}{L_GROUP_DEFAULT}{L_POSTS}{L_JOINED}{L_MARK}
    - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {L_GROUP_PENDING}{L_GROUP_DEFAULT}{L_POSTS}{L_JOINED}{L_MARK}
    {member.USERNAME_FULL}{L_YES}{L_NO}{member.USER_POSTS}{member.JOINED}
    {L_GROUPS_NO_MEMBERS}
    - - - - - - -
    - - - -
    - -
    -
    - -

    {L_ADD_USERS}

    - -

    {L_ADD_USERS_EXPLAIN}

    - -
    -
    -

    {L_USER_GROUP_DEFAULT_EXPLAIN}
    -
    - - -
    -
    -
    -

    {L_USERNAMES_EXPLAIN}
    -
    -
    {L_FIND_USERNAME}
    -
    -
    - -
    -
    - -
    - - {S_FORM_TOKEN} -
    - - - - -
      -
    • -
      -
      {L_GROUP_LEADER}
      -
      {L_OPTIONS}
      -
      -
    • -
    - - -

    {L_NO_LEADERS}

    - - - - - - -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_groups_membership.html b/phpBB/styles/prosilver/template/ucp_groups_membership.html deleted file mode 100644 index a147dbf89f..0000000000 --- a/phpBB/styles/prosilver/template/ucp_groups_membership.html +++ /dev/null @@ -1,164 +0,0 @@ - - -

    {L_USERGROUPS}

    - -
    - -
    -
    - -

    {L_GROUPS_EXPLAIN}

    - - -
      -
    • -
      -
      {L_GROUP_LEADER}
      -
      {L_SELECT}
      -
      -
    • -
    - - - - -
      -
    • -
      -
      {L_GROUP_MEMBER}
      -
      {L_SELECT}
      -
      -
    • -
    - - -
    -
    - - -
    -
    -
      -
    • -
      -
      {L_GROUP_PENDING}
      -
      {L_SELECT}
      -
      -
    • -
    - -
    -
    - - -
    -
    -
      -
    • -
      -
      {L_GROUP_NONMEMBER}
      -
      {L_SELECT}
      -
      -
    • -
    - -
    -
    - - - - -
    - -
    - - {S_FORM_TOKEN} -
    - - - -
    - -   - - {S_FORM_TOKEN} -
    - -
    - - -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_header.html b/phpBB/styles/prosilver/template/ucp_header.html deleted file mode 100644 index 4d008564c4..0000000000 --- a/phpBB/styles/prosilver/template/ucp_header.html +++ /dev/null @@ -1,101 +0,0 @@ - - -

    {L_UCP}

    - -
    - -
    - - -
    - - -
    -
    - -
    - -
    - - - -
    -
    - -
    -
    {L_FRIENDS}
    - - -
    {friends_online.USERNAME_FULL}
    - - - -
    {friends_offline.USERNAME_FULL}
    - -
    - -
    -
    - - - -
    -
    - -
    -
    {L_MESSAGE_COLOURS}
    - -
    {pm_colour_info.IMG} {pm_colour_info.LANG}
    - -
    - -
    -
    - - -
    - -
    diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html deleted file mode 100644 index a2bfb6cb9e..0000000000 --- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - -

    {L_TITLE}

    - -
    -
    - -

    {L_BOOKMARKS_EXPLAIN}

    - - -

    {L_BOOKMARKS_DISABLED}

    - - - -
      -
    • -
      -
      {L_BOOKMARKS}
      -
      {L_LAST_POST}
      -
      -
    • -
    - - - -

    {L_NO_BOOKMARKS}

    - - - - -
    -
    - - -
    - - - {S_FORM_TOKEN} -
    - - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_main_drafts.html b/phpBB/styles/prosilver/template/ucp_main_drafts.html deleted file mode 100644 index dffe0a37ef..0000000000 --- a/phpBB/styles/prosilver/template/ucp_main_drafts.html +++ /dev/null @@ -1,73 +0,0 @@ - - -
    - -

    {L_TITLE}

    - -
    -
    - -

    {L_DRAFTS_EXPLAIN}

    - - - - -
    -
    - -
    - {S_HIDDEN_FIELDS}  - - {S_FORM_TOKEN} -
    - - - - -
      -
    • -
      -
      {L_DRAFT_TITLE}
      -
      {L_SAVE_DATE}
      -
      {L_MARK}
      -
      -
    • -
    - - -

    {L_NO_SAVED_DRAFTS}

    - - -
    -
    - - -
    - - - {S_FORM_TOKEN} -
    - - - - - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html deleted file mode 100644 index fa27a81ecb..0000000000 --- a/phpBB/styles/prosilver/template/ucp_main_front.html +++ /dev/null @@ -1,45 +0,0 @@ - - -

    {L_TITLE}

    - -
    -
    - -

    {L_UCP_WELCOME}

    - - -

    {L_IMPORTANT_NEWS}

    - -
      - -
    • -
      -
      style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"> - {NEWEST_POST_IMG} {topicrow.TOPIC_TITLE}
      - {topicrow.PAGINATION} - {topicrow.ATTACH_ICON_IMG} {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME} -
      -
      {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} - {LAST_POST_IMG}
      {L_POSTED_ON_DATE} {topicrow.LAST_POST_TIME}
      -
      -
      -
    • - -
    - - -

    {L_YOUR_DETAILS}

    - -
    -
    {L_JOINED}:
    {JOINED}
    -
    {L_VISITED}:
    {LAST_VISIT_YOU}
    -
    {L_TOTAL_POSTS}:
    {POSTS} | {L_SEARCH_YOUR_POSTS}
    ({POSTS_DAY} / {POSTS_PCT}){POSTS}
    -
    {L_ACTIVE_IN_FORUM}:
    {ACTIVE_FORUM}
    ({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})
    -
    {L_ACTIVE_IN_TOPIC}:
    {ACTIVE_TOPIC}
    ({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})
    -
    {L_YOUR_WARNINGS}:
    {WARNING_IMG} [{WARNINGS}]
    -
    - -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html deleted file mode 100644 index 9dd28a0956..0000000000 --- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html +++ /dev/null @@ -1,90 +0,0 @@ - - -
    - -

    {L_TITLE}

    -
    -
    - -

    {L_WATCHED_EXPLAIN}

    - - -
      -
    • -
      -
      {L_WATCHED_FORUMS}
      -
      {L_MARK}
      -
      -
    • -
    - - -

    {L_NO_WATCHED_FORUMS}

    - - - -
      -
    • -
      -
      {L_WATCHED_TOPICS}
      -
      {L_LAST_POST}
      -
      -
    • -
    - - - -

    {L_NO_WATCHED_TOPICS}

    - - -
    -
    - - -
    - - - {S_FORM_TOKEN} -
    - -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html deleted file mode 100644 index cadb44e914..0000000000 --- a/phpBB/styles/prosilver/template/ucp_pm_history.html +++ /dev/null @@ -1,33 +0,0 @@ - -

    - {L_EXPAND_VIEW} - {L_MESSAGE_HISTORY}: {HISTORY_TITLE} -

    - -
    - -
    -
    - -
    - - - - -

    class="current">{history_row.SUBJECT}

    -

    {history_row.MINI_POST_IMG} {L_SENT_AT}: {history_row.SENT_DATE}
    - {L_MESSAGE_BY_AUTHOR} {history_row.MESSAGE_AUTHOR_FULL}

    -
    - {history_row.MESSAGE} -
    -
    - -
    -
    - -
    - -
    -

    {L_BACK_TO_TOP}

    diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_footer.html b/phpBB/styles/prosilver/template/ucp_pm_message_footer.html deleted file mode 100644 index acf6f24af1..0000000000 --- a/phpBB/styles/prosilver/template/ucp_pm_message_footer.html +++ /dev/null @@ -1,2 +0,0 @@ -
    {S_FORM_TOKEN}
    - diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html deleted file mode 100644 index f9eb1cc102..0000000000 --- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html +++ /dev/null @@ -1,28 +0,0 @@ -

    {L_TITLE}: {CUR_FOLDER_NAME}

    - -
    - -
    -
    - -

    {FOLDER_STATUS}

    - - - - - - - - diff --git a/phpBB/styles/prosilver/template/ucp_pm_options.html b/phpBB/styles/prosilver/template/ucp_pm_options.html deleted file mode 100644 index a8693ac9b9..0000000000 --- a/phpBB/styles/prosilver/template/ucp_pm_options.html +++ /dev/null @@ -1,131 +0,0 @@ - - -

    {L_TITLE}

    - - - -
    -
    - -

    {ERROR_MESSAGE}

    -

    {NOTIFICATION_MESSAGE}

    - -

    {L_DEFINED_RULES}

    - -
      - -
    1. {L_IF} {rule.CHECK} {rule.RULE} {rule.STRING} | {rule.ACTION}: {rule.FOLDER}
    2. - -
    3. {L_NO_RULES_DEFINED}
    4. - -
    - -

    {L_ADD_NEW_RULE}

    - -
    - - -
    -
    for="check_option">{L_IF}:
    -
    - {CHECK_CURRENT} -
    -
    - - - -
    -
    -
    {RULE_CURRENT}
    -
    - - - - -
    -
    -
    - - - - -  [ {L_FIND_USERNAME} ] - - {L_NO_GROUPS} - - - - {COND_CURRENT} - -
    -
    - - - - - - - - -
    -
    -
    {ACTION_CURRENT}
    -
    - - -
    - -

    {L_FOLDER_OPTIONS}

    - -
    - - -
    -
    -
    {L_MAX_FOLDER_REACHED}
    -
    -
    - - - - - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - - -
    - -
    -
    -
    -
    -
    -
    - - -
    -

    {L_DEFAULT_ACTION_EXPLAIN}
    -
    {DEFAULT_ACTION}
    -
    -
    -
    - -
    - {S_FORM_TOKEN} -
    - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_pm_popup.html b/phpBB/styles/prosilver/template/ucp_pm_popup.html deleted file mode 100644 index 325362dc4d..0000000000 --- a/phpBB/styles/prosilver/template/ucp_pm_popup.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - -
    -
    -
    -

    {L_LOGIN_CHECK_PM}{MESSAGE}

    {CLICK_TO_VIEW}

    -

    {L_CLOSE_WINDOW}

    -
    -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html deleted file mode 100644 index 86323a1c42..0000000000 --- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - -

    {L_EXPORT_AS_CSV}

    -
    -
    -
    -

    {L_OPTIONS}

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -   -   - {S_FORM_TOKEN} -
    -
    - - - - -
    -

    {RULE_REMOVED_MESSAGES}

    -
    - - - -
    -

    {NOT_MOVED_MESSAGES}
    {RELEASE_MESSAGE_INFO}

    -
    - - - -
      -
    • -
      -
      {L_MESSAGE}
      -
      {L_MARK}
      -
      -
    • -
    -
      - - -
    • -
      - style="background-image: url({messagerow.PM_ICON_URL}); background-repeat: no-repeat;"> - - - {L_DELETE_MESSAGE}
      - {L_MESSAGE_REMOVED_FROM_OUTBOX} - - {messagerow.SUBJECT} - - -
      {L_PM_FROM_REMOVED_AUTHOR} - - - {REPORTED_IMG} {messagerow.ATTACH_ICON_IMG}
      - {L_MESSAGE_TO} {messagerow.RECIPIENTS}{L_MESSAGE_BY_AUTHOR} {messagerow.MESSAGE_AUTHOR_FULL} {L_MESSAGE_SENT_ON} {messagerow.SENT_TIME} - -
      {L_SENT_AT} {messagerow.SENT_TIME}
      -
      {messagerow.FOLDER}{L_UNKNOWN_FOLDER}
      -
      -
      -
    • - - -
    - -

    {L_NO_MESSAGES}

    - - - -
    -

    - - -
    - -
    - - - - -
    -
    - - -
    - {L_PREVIOUS} - {L_NEXT} - - - - -
    - - - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html deleted file mode 100644 index 4c244782d8..0000000000 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ /dev/null @@ -1,112 +0,0 @@ - - - - -
    -
    - - -
    - {L_VIEW_PREVIOUS_HISTORY} - {L_VIEW_NEXT_HISTORY} -
    - - - -
    -
    - -
    - - - - - -

    {SUBJECT}

    - -

    - {L_SENT_AT}: {SENT_DATE} -
    {L_PM_FROM}: {MESSAGE_AUTHOR_FULL} -
    {L_TO}: {to_recipient.NAME_FULL}{to_recipient.NAME}  -
    {L_BCC}: {bcc_recipient.NAME_FULL}{bcc_recipient.NAME}  -

    - - -
    {MESSAGE}
    - - -
    -
    {L_ATTACHMENTS}
    - -
    {attachment.DISPLAY_ATTACHMENT}
    - -
    - - - -
    {L_DOWNLOAD_NOTICE}
    - - - -
    {EDITED_MESSAGE} -
    {L_REASON}: {EDIT_REASON} -
    - - - -
    {SIGNATURE}
    - -
    - -
    -
    {AUTHOR_AVATAR}
    {MESSAGE_AUTHOR_FULL}
    -
    {RANK_TITLE}
    -
    {RANK_IMG}
    -
     
    -
    {L_POSTS}: {AUTHOR_POSTS}
    -
    {L_JOINED}: {AUTHOR_JOINED}
    -
    {L_LOCATION}: {AUTHOR_FROM}
    - - -
    - -
    - -
    - - - -
    -
    - - -
    - {L_VIEW_PREVIOUS_PM} - {L_VIEW_NEXT_PM} - -   - - - - -
    - - - - - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html deleted file mode 100644 index 2f2778f496..0000000000 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - -{SITENAME} :: {PAGE_TITLE} - - - - - - - - - - - - - - - - - -
    {SITENAME}
    {L_PRIVATE_MESSAGING}

    {SUBJECT}
    {PAGE_NUMBER}
    - -
    - - - - - - - - - - - - - - - - - - - - - - - -
    {L_PM_FROM}: {MESSAGE_AUTHOR} [ {SENT_DATE} ]
    {L_TO}: - - class="sep">{to_recipient.NAME}  - -
    {L_BCC}: - - class="sep">{bcc_recipient.NAME}  - -

    {MESSAGE}
    - -
    - - - - - - - - - - -
    {PAGE_NUMBER}{S_TIMEZONE}
    Powered by phpBB © 2000, 2002, 2005, 2007 phpBB Group
    http://www.phpbb.com/
    - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html deleted file mode 100644 index 9022346627..0000000000 --- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html +++ /dev/null @@ -1,144 +0,0 @@ - - -
    - -

    {L_TITLE}

    - -
    -
    - -
    -

    {ERROR}

    -
    -
    -
    - - -
    -
    -
    -
    -
    - - -
    -
    -
    -

    {L_ALLOW_PM_EXPLAIN}
    -
    - - -
    -
    - -
    -

    {L_HIDE_ONLINE_EXPLAIN}
    -
    - - -
    -
    - - -
    -
    -
    - - - -
    -
    - -
    -
    -
    - - -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    - - -
    -
    -
    -

    {L_BOARD_DATE_FORMAT_EXPLAIN}
    -
    - -
    - -
    -
    - -
    -
    - -
    - {S_HIDDEN_FIELDS}  - - {S_FORM_TOKEN} -
    -
    - - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_prefs_post.html b/phpBB/styles/prosilver/template/ucp_prefs_post.html deleted file mode 100644 index 74af90ca5a..0000000000 --- a/phpBB/styles/prosilver/template/ucp_prefs_post.html +++ /dev/null @@ -1,51 +0,0 @@ - - -
    - -

    {L_TITLE}

    -
    -
    - -
    -

    {ERROR}

    -
    -
    -
    - - -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    - - -
    -
    -
    - -
    -
    - -
    - {S_HIDDEN_FIELDS}  - - {S_FORM_TOKEN} -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_prefs_view.html b/phpBB/styles/prosilver/template/ucp_prefs_view.html deleted file mode 100644 index dc773584df..0000000000 --- a/phpBB/styles/prosilver/template/ucp_prefs_view.html +++ /dev/null @@ -1,94 +0,0 @@ - - -
    - -

    {L_TITLE}

    - -
    -
    - -
    -

    {ERROR}

    -
    -
    -
    - - -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    - - -
    -
    - -
    -
    -
    - - -
    -
    - -
    -
    -
    -
    {S_TOPIC_SORT_DAYS}
    -
    -
    -
    -
    {S_TOPIC_SORT_KEY}
    -
    -
    -
    -
    {S_TOPIC_SORT_DIR}
    -
    -
    -
    -
    -
    {S_POST_SORT_DAYS}
    -
    -
    -
    -
    {S_POST_SORT_KEY}
    -
    -
    -
    -
    {S_POST_SORT_DIR}
    -
    -
    - -
    -
    - -
    - {S_HIDDEN_FIELDS}  - - {S_FORM_TOKEN} -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_profile_avatar.html b/phpBB/styles/prosilver/template/ucp_profile_avatar.html deleted file mode 100644 index 2669ed3c22..0000000000 --- a/phpBB/styles/prosilver/template/ucp_profile_avatar.html +++ /dev/null @@ -1,19 +0,0 @@ - - -
    - -

    {L_TITLE}

    - - - -
    - {S_HIDDEN_FIELDS} -   -   -   - - {S_FORM_TOKEN} -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html deleted file mode 100644 index 1bd54619b9..0000000000 --- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html +++ /dev/null @@ -1,79 +0,0 @@ - - -
    - -

    {L_TITLE}

    - -
    -
    -

    {L_PROFILE_INFO_NOTICE}

    - -
    -

    {ERROR}

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -

    {L_BIRTHDAY_EXPLAIN}
    -
    - - - -
    -
    - - -
    -
    for="{profile_fields.FIELD_ID}">{profile_fields.LANG_NAME}: * -
    {profile_fields.LANG_EXPLAIN}
    -
    {profile_fields.ERROR}
    -
    {profile_fields.FIELD}
    -
    - -
    - -
    -
    - -
    - {S_HIDDEN_FIELDS}  - - {S_FORM_TOKEN} -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html deleted file mode 100644 index edd58d5e25..0000000000 --- a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html +++ /dev/null @@ -1,63 +0,0 @@ - - -
    - -

    {L_TITLE}

    -
    -
    - - -

    {L_FORCE_PASSWORD_EXPLAIN}

    - - -
    -

    {ERROR}

    -
    -

    {L_USERNAME_EXPLAIN}
    -
    {USERNAME}
    -
    -
    -
    -
    {EMAIL}
    -
    - -
    -

    {L_CONFIRM_EMAIL_EXPLAIN}
    -
    -
    - - -
    -

    {L_CHANGE_PASSWORD_EXPLAIN}
    -
    -
    -
    -

    {L_CONFIRM_PASSWORD_EXPLAIN}
    -
    -
    - -
    -
    -
    - -
    -
    - -
    -
    -

    {L_CURRENT_PASSWORD_EXPLAIN}
    -
    -
    -
    - -
    -
    - -
    - {S_HIDDEN_FIELDS}  - - {S_FORM_TOKEN} -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_profile_signature.html b/phpBB/styles/prosilver/template/ucp_profile_signature.html deleted file mode 100644 index dbaeac3254..0000000000 --- a/phpBB/styles/prosilver/template/ucp_profile_signature.html +++ /dev/null @@ -1,51 +0,0 @@ - - -
    - -

    {L_TITLE}

    - - -
    -
    -

    {L_SIGNATURE_PREVIEW}

    -
    -
    {SIGNATURE_PREVIEW}
    -
    -
    -
    - - -
    -
    - -

    {L_SIGNATURE_EXPLAIN}

    - - - -

    {L_OPTIONS}

    -
    - -
    - - -
    - - -
    - - -
    - -
    -
    - -
    - {S_HIDDEN_FIELDS} -   -   - - {S_FORM_TOKEN} -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html deleted file mode 100644 index 5b5309ce93..0000000000 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ /dev/null @@ -1,142 +0,0 @@ - - - - -
    - -
    -
    - -

    {SITENAME} - {L_REGISTRATION}

    - -
    -
    {ERROR}
    - -
    {L_REG_COND}
    - - -
    {L_ITEMS_REQUIRED}
    - - -
    -

    {L_USERNAME_EXPLAIN}
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    {L_PASSWORD_EXPLAIN}
    -
    -
    -
    -
    -
    -
    - -
    - -
    -
    -
    -
    -
    -
    -
    -
    - - -
    -
    for="{profile_fields.FIELD_ID}">{profile_fields.LANG_NAME}: * -
    {profile_fields.LANG_EXPLAIN} -
    {profile_fields.ERROR}
    -
    {profile_fields.FIELD}
    -
    - -
    - - -
    -
    - -
    -
    - -

    {L_CONFIRMATION}

    -

    {L_CONFIRM_EXPLAIN}

    - -
    -
    -
    -
    {CONFIRM_IMG}
    -
    -
    {L_CONFIRM_CODE_EXPLAIN}
    -
    -
    - - - -
    -
    - -
    -
    - -

    {L_COPPA_COMPLIANCE}

    - -

    {L_COPPA_EXPLAIN}

    - - -
    -
    - -
    -
    - -
    - {S_HIDDEN_FIELDS} -   - - {S_FORM_TOKEN} -
    - -
    -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_remind.html b/phpBB/styles/prosilver/template/ucp_remind.html deleted file mode 100644 index 7dbc23b733..0000000000 --- a/phpBB/styles/prosilver/template/ucp_remind.html +++ /dev/null @@ -1,32 +0,0 @@ - - -
    - -
    -
    - -
    -

    {L_SEND_PASSWORD}

    - -
    -
    -
    -
    -
    -
    -

    {L_EMAIL_REMIND}
    -
    -
    -
    -
     
    -
    {S_HIDDEN_FIELDS} 
    -
    - {S_FORM_TOKEN} -
    -
    - -
    -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_resend.html b/phpBB/styles/prosilver/template/ucp_resend.html deleted file mode 100644 index 840e972995..0000000000 --- a/phpBB/styles/prosilver/template/ucp_resend.html +++ /dev/null @@ -1,32 +0,0 @@ - - - -
    - -
    -
    - -
    -

    {L_UCP_RESEND}

    - -
    -
    -
    -
    -
    -
    -

    {L_EMAIL_REMIND}
    -
    -
    -
    -
     
    -
    {S_HIDDEN_FIELDS}{S_FORM_TOKEN} 
    -
    -
    -
    - -
    -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_zebra_foes.html b/phpBB/styles/prosilver/template/ucp_zebra_foes.html deleted file mode 100644 index 3c1b1cddce..0000000000 --- a/phpBB/styles/prosilver/template/ucp_zebra_foes.html +++ /dev/null @@ -1,41 +0,0 @@ - - -
    - -

    {L_TITLE}

    - -
    -
    - -

    {L_FOES_EXPLAIN}

    - -
    -

    {ERROR}

    -
    -

    {L_YOUR_FOES_EXPLAIN}
    -
    - - - - {L_NO_FOES} - -
    -
    -
    -

    {L_ADD_FOES_EXPLAIN}
    -
    -
    {L_FIND_USERNAME}
    -
    -
    - -
    -
    - -
    - {S_HIDDEN_FIELDS}  - - {S_FORM_TOKEN} -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/ucp_zebra_friends.html b/phpBB/styles/prosilver/template/ucp_zebra_friends.html deleted file mode 100644 index 1e0efbfdf8..0000000000 --- a/phpBB/styles/prosilver/template/ucp_zebra_friends.html +++ /dev/null @@ -1,41 +0,0 @@ - - -
    - -

    {L_TITLE}

    - -
    -
    - -

    {L_FRIENDS_EXPLAIN}

    - -
    -

    {ERROR}

    -
    -

    {L_YOUR_FRIENDS_EXPLAIN}
    -
    - - - - {L_NO_FRIENDS} - -
    -
    -
    -

    {L_ADD_FRIENDS_EXPLAIN}
    -
    -
    {L_FIND_USERNAME}
    -
    -
    - -
    -
    - -
    - {S_HIDDEN_FIELDS}  - - {S_FORM_TOKEN} -
    -
    - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html deleted file mode 100644 index 50518964c9..0000000000 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ /dev/null @@ -1,214 +0,0 @@ - -

    {L_MCP} ]

    -

    {FORUM_NAME}

    - - -

    - - {FORUM_DESC}
    - {L_MODERATOR}{L_MODERATORS}: {MODERATORS} -

    - - - -
    -
    - - - {L_FORUM_RULES} - - {L_FORUM_RULES}
    - {FORUM_RULES} - - -
    -
    - - - - - - - - - - -
    style="margin-top: 2em;"> - - - - - - - - - - - - - -
    - - - - -
    -
    - {L_NO_READ_ACCESS} -
    -
    - - - -
    - -
    -
    - -
    -

    {L_LOGIN_LOGOUT}  •  {L_REGISTER}

    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
     
    -
    -
    -
    -
    - -
    -
    - - - - - - - - - - - - - - -
    -
    -
      -
    • -
      -
      {L_ACTIVE_TOPICS}{L_ANNOUNCEMENTS}{L_TOPICS}
      -
      {L_REPLIES}
      -
      {L_VIEWS}
      -
      {L_LAST_POST}
      -
      -
    • -
    -
      - - -
    • -
      - style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">{NEWEST_POST_IMG} {topicrow.TOPIC_TITLE} - {topicrow.UNAPPROVED_IMG} - {REPORTED_IMG}
      - {topicrow.PAGINATION} - {topicrow.ATTACH_ICON_IMG} {L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME} - -
      {topicrow.REPLIES} {L_REPLIES}
      -
      {topicrow.VIEWS} {L_VIEWS}
      -
      {L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} - {LAST_POST_IMG}
      {L_POSTED_ON_DATE} {topicrow.LAST_POST_TIME}
      -
      -
      -
    • - - -
    -
    -
    - - - - -
    -
    - {L_NO_TOPICS} -
    -
    - - - - - -
    - {L_PREVIOUS} - {L_NEXT} - - - -
    -
    -
    - - - -
    - - - - - - - -
    - - - - - -

    {L_WHO_IS_ONLINE}

    -

    {LOGGED_IN_USER_LIST}

    - - - -

    {L_FORUM_PERMISSIONS}

    -

    {rules.RULE}

    - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html deleted file mode 100644 index b111d743f9..0000000000 --- a/phpBB/styles/prosilver/template/viewonline_body.html +++ /dev/null @@ -1,57 +0,0 @@ - - -

    {TOTAL_REGISTERED_USERS_ONLINE}

    -

    {TOTAL_GUEST_USERS_ONLINE}{L_SWITCH_GUEST_DISPLAY}

    - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {L_USERNAME}{L_FORUM_LOCATION}{L_LAST_UPDATED}
    {user_row.USERNAME_FULL} {L_IP}: {user_row.USER_IP} » {L_WHOIS} -
    {user_row.USER_BROWSER}
    {user_row.FORUM_LOCATION}{user_row.LASTUPDATE}
    {L_NO_ONLINE_USERS}{L_SWITCH_GUEST_DISPLAY}
    - -
    -
    - - -
    - {L_PREVIOUS}{L_PREVIOUS}{L_NEXT}{L_NEXT} -
    - - -

    {L_LEGEND}: {LEGEND}

    - - - - - diff --git a/phpBB/styles/prosilver/template/viewonline_whois.html b/phpBB/styles/prosilver/template/viewonline_whois.html deleted file mode 100644 index a9c6473727..0000000000 --- a/phpBB/styles/prosilver/template/viewonline_whois.html +++ /dev/null @@ -1,16 +0,0 @@ - - -

    {L_WHOIS}

    - -
    -
    - -
    -
    {WHOIS}
    -
    - -
    -
    -{L_CLOSE_WINDOW} - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html deleted file mode 100644 index ee89b3b15f..0000000000 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ /dev/null @@ -1,271 +0,0 @@ - -

    {L_MCP} ]

    -

    {TOPIC_TITLE}

    - -{FORUM_DESC}
    - - -

    - - {L_MODERATOR}{L_MODERATORS}: {MODERATORS} - - -

    - - - -
    -
    - - - {L_FORUM_RULES} - - {L_FORUM_RULES}
    - {FORUM_RULES} - - -
    -
    - - -
    - - - - - - - - - - - -
    -
    - - -
    - -
    -
    - -
    -

    {POLL_QUESTION}

    -

    {L_POLL_LENGTH}
    {L_MAX_VOTES}

    - -
    - -
    title="{L_POLL_VOTED_OPTION}"> -
    {poll_option.POLL_OPTION_CAPTION}
    -
    checked="checked" /> checked="checked" />
    -
    {poll_option.POLL_OPTION_RESULT}
    -
    {L_NO_VOTES}{poll_option.POLL_OPTION_PERCENT}
    -
    - - - -
    -
     
    -
    {L_TOTAL_VOTES} : {TOTAL_VOTES}
    -
    - - - -
    -
     
    -
    -
    - - - -
    -
     
    -
    {L_VIEW_RESULTS}
    -
    - -
    -
    - -
    - {S_FORM_TOKEN} - {S_HIDDEN_FIELDS} -
    - - -
    -
    - - - - -
    -
    - -
    - -
    {postrow.L_IGNORE_POST}
    - - - - - - - - -

    class="first"> {postrow.POST_SUBJECT}

    -

    {postrow.MINI_POST_IMG}{postrow.MINI_POST_IMG}{L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} {L_POSTED_ON_DATE} {postrow.POST_DATE}

    - - -

    - {UNAPPROVED_IMG} {L_POST_UNAPPROVED} - {REPORTED_IMG} {L_POST_REPORTED} -

    - - -
    {postrow.MESSAGE}
    - - -
    -
    {L_ATTACHMENTS}
    - -
    {postrow.attachment.DISPLAY_ATTACHMENT}
    - -
    - - -
    {L_DOWNLOAD_NOTICE}
    - -
    {postrow.EDITED_MESSAGE} -
    {L_REASON}: {postrow.EDIT_REASON} -
    - - -
    {postrow.BUMPED_MESSAGE}
    -
    {postrow.SIGNATURE}
    - - -
    - - -
    -
    - - {postrow.POSTER_AVATAR}{postrow.POSTER_AVATAR}
    - - {postrow.POST_AUTHOR_FULL}{postrow.POST_AUTHOR_FULL} -
    - -
    {postrow.RANK_TITLE}
    {postrow.RANK_IMG}
    - -
     
    - -
    {L_POSTS}: {postrow.POSTER_POSTS}
    -
    {L_JOINED}: {postrow.POSTER_JOINED}
    -
    {L_LOCATION}: {postrow.POSTER_FROM}
    - - - -
    {postrow.PROFILE_FIELD1_NAME}: {postrow.PROFILE_FIELD1_VALUE}
    - - - -
    {postrow.custom_fields.PROFILE_FIELD_NAME}: {postrow.custom_fields.PROFILE_FIELD_VALUE}
    - - - - -
    - -
    - - - -
    - - - - -
    -
    - -
    - - - -
    - -
    - {L_PREVIOUS} - {L_NEXT} - - -
    - -
    -
    - - -
    - - - - - -
    - - - - -
    -
    - {S_TOPIC_MOD} - {S_FORM_TOKEN} -
    -
    - - - -

    {L_WHO_IS_ONLINE}

    -

    {LOGGED_IN_USER_LIST}

    - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html deleted file mode 100644 index 45c7010867..0000000000 --- a/phpBB/styles/prosilver/template/viewtopic_print.html +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - -{META} -{SITENAME} • {PAGE_TITLE} - - - - - -
    - - - - -
    -
    {PAGE_NUMBER}
    - -
    -

    {postrow.POST_SUBJECT}

    -
    {postrow.MINI_POST_IMG}{L_POSTED}: {postrow.POST_DATE}
    -
    {L_POST_BY_AUTHOR} style="color: {postrow.POST_AUTHOR_COLOUR}">{postrow.POST_AUTHOR}
    -
    {postrow.MESSAGE}
    -
    -
    - -
    - - - -
    - - - \ No newline at end of file diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css deleted file mode 100644 index fc0b306a6c..0000000000 --- a/phpBB/styles/prosilver/theme/bidi.css +++ /dev/null @@ -1,722 +0,0 @@ -/* proSilver RTL definitions ----------------------------------------- */ - -/** -* common.css -*/ -.rtl h1 { - margin-right: 0; - margin-left: 200px; -} - -.rtl p.right { - text-align: left; -} - -.rtl div.rules ul { - margin-left: 0; - margin-right: 20px; -} - -/* Main blocks ----------------------------------------- */ -.rtl #logo { - float: right; - padding: 10px 10px 0 13px; -} - -/* Search box ---------------------------------------------- */ -.rtl #search-box { - float: left; - text-align: left; - margin-right: 0; - margin-left: 5px; -} - -.rtl #search-box li { - text-align: left; -} - -.rtl #search-box img { - margin-right: 0; - margin-left: 3px; -} - -.rtl #site-description { - float: right; -} - -.rtl #site-description h1 { - margin-left: 0; -} - -/* Round cornered boxes and backgrounds ----------------------------------------- */ -.rtl .post { - background-position: 0 0; -} - -/* Horizontal lists -----------------------------------------*/ -.rtl ul.linklist li { - float: right; - margin-right: 0; - margin-left: 5px; -} - -.rtl ul.linklist li.rightside, .rtl p.rightside { - float: left; - margin-right: 5px; - margin-left: 0; - text-align: left; -} - -.rtl ul.leftside li, .rtl ul.rightside li { - float: left; -} - -.rtl ul.leftside { - float: right; - margin-left: 5px; - margin-right: 0; - text-align: right; -} - -.rtl ul.rightside { - float: left; - margin-left: -5px; - margin-right: 5px; - text-align: left; -} - -/* Table styles -----------------------------------------*/ -.rtl table.table1 thead th { - padding: 0 3px 4px 0; -} - -.rtl table.table1 thead th span { - padding-left: 0; - padding-right: 7px; -} - -.rtl table.table1 tbody th { - text-align: right; -} - -/* Specific column styles */ -.rtl table.table1 .name { text-align: right; } -.rtl table.table1 .joined { text-align: right; } -.rtl table.table1 .active { text-align: right; } -.rtl table.table1 .info { text-align: right; } -.rtl table.table1 thead .autocol { padding-left: 0; padding-right: 1em; } - -.rtl table.table1 span.rank-img { - float: left; -} - -.rtl table.info tbody th { - text-align: left; -} - -.rtl .forumbg table.table1 { - margin: 0 -1px -1px -2px; -} - -/* Misc layout styles ----------------------------------------- */ -/* column[1-2] styles are containers for two column layouts - Also see tweaks.css */ -.rtl .column1 { - float: right; - clear: right; -} - -.rtl .column2 { - float: left; - clear: left; -} - -/* General classes for placing floating blocks */ -.rtl .left-box { - float: right; - text-align: right; -} - -.rtl .right-box { - float: left; - text-align: left; -} - -.rtl dl.details dt { - float: right; - clear: right; - text-align: left; -} - -.rtl dl.details dd { - margin-right: 0; - margin-left: 0; - padding-right: 5px; - padding-left: 0; - float: right; -} - -*:first-child+html dl.details dd { - margin-right: 30%; - float: none; -} - -* html dl.details dd { - margin-right: 30%; - float: none; -} - -/* Pagination ----------------------------------------- */ -.rtl .pagination { - text-align: left; - float: left; - padding-left: 5px; -} - -/* Pagination in viewforum for multipage topics */ -.rtl .row .pagination { - float: left; - padding: 1px 0 1px 15px; -} - -.rtl .pagination span { - direction: ltr; -} - -.rtl .pagination span.page-sep { - display: inline; - visibility: hidden; - position: absolute; -} - -/* Miscellaneous styles ----------------------------------------- */ -.rtl #forum-permissions { - float: left; - padding-right: 5px; - padding-left: 0; - margin-right: 5px; - margin-left: 0; - text-align: left; -} - -.rtl .forabg { - width: 99%; /* fix for IE6 */ -} - -.rtl .forumbg { - width: 99%; /* fix for IE6 */ -} - -/** -* links.css -*/ - -/* Back to top of page */ -.rtl .back2top { - text-align: left; -} - -.rtl a.top { - float: left; -} - -.rtl a.top2 { - padding-left: 0; - padding-right: 15px; -} - -/** -* content.css -*/ -.rtl ul.topiclist dt { - float: right; -} - -.rtl ul.topiclist dl { - position: static; /* fix for IE6 */ -} - -.rtl ul.topiclist dd { - float: right; - border-right-width: 1px; - border-right-style: solid; - border-left: none; -} - -.rtl ul.topiclist li.row dt a.subforum { - padding: 0 0 0 12px; - background-position: 100% 100%; - position: static; -} - -.rtl .forum-image { - float: right; - margin-right: 0; - margin-left: 5px; -} - -.rtl li.header dt, .rtl li.header dd { - border-right-width: 0; -} - -.rtl li.header dd { - margin-left: 0; - margin-right: 1px; -} - -.rtl dl.icon { - background-position: 99.5% 50%; -} - -.rtl li.header dl.icon dt { - /* Tweak for headers alignment when folder icon used */ - padding-right: 0; - padding-left: 50px; -} - -.rtl dl.icon dt { - padding-left: 0; - padding-right: 45px; /* Space for folder icon */ - background-position: 99.5% 95%; /* Position of topic icon */ -} - -.rtl dd.lastpost span, .rtl ul.topiclist dd.searchby span, .rtl ul.topiclist dd.info span, .rtl ul.topiclist dd.time span, .rtl dd.redirect span, .rtl dd.moderation span { - padding-left: 0; - padding-right: 5px; -} - -.rtl dd.mark { - float: left !important; -} - -.rtl ul.topiclist dd.searchextra { - margin-left: 0; - margin-right: 5px; - border-right: none; -} - -/* Post body styles -----------------------------------------*/ -.rtl .postbody { - float: right; -} - -/* Topic review panel -----------------------------------------*/ -.rtl #topicreview { - padding-right: 0; - padding-left: 5px; -} - -/* Content container styles -----------------------------------------*/ -.rtl .content ul, .rtl .content ol { - margin-right: 3em; - margin-left: 0; -} - -/* Post author */ -.rtl p.author { - margin: 0 0 0.6em 15em; -} - -.rtl .signature { - clear: right; -} - -.rtl .notice { - clear: right; -} - -/* Jump to post link for now */ -.rtl ul.searchresults { - text-align: left; -} - -/* BB Code styles -----------------------------------------*/ -/* Quote block */ -.rtl blockquote { - margin: 0.5em 25px 0 1px; -} - -.rtl blockquote blockquote { - /* Nested quotes */ - margin: 0.5em 15px 0 1px; -} - -.rtl blockquote cite { - /* Username/source of quoter */ - margin-right: 20px; - margin-left: 0; -} - -.rtl blockquote dl.codebox { - margin-right: 0; -} - -.rtl code { - direction: ltr; -} - -/* Attachments -----------------------------------------*/ -.rtl .attachbox { - float: right; - margin: 5px 0 5px 5px; - clear: right; -} - -.rtl .attachbox dd { - clear: right; -} - -.rtl .attachbox p { - clear: right; -} - -.rtl .attachbox p.stats { - clear: right; -} - -/* Post poll styles -----------------------------------------*/ -.rtl fieldset.polls dt { - text-align: right; - float: right; - border-left: none; -} - -.rtl fieldset.polls dd { - float: right; - border-right: none; - margin-right: 0; -} - -.rtl fieldset.polls dd div { - text-align: left; -} - -.rtl .pollbar1, .rtl .pollbar2, .rtl .pollbar3, .rtl .pollbar4, .rtl .pollbar5 { - border-left-width: 1px; - border-left-style: solid; - border-right: none; -} - -/* Poster profile block -----------------------------------------*/ -.rtl .postprofile { - border-left: none; - border-right-width: 1px; - border-right-style: solid; - float: left; -/* text-align: right; */ -} - -.rtl .pm .postprofile { - border-right-width: 1px; - border-right-style: solid; - border-left: none; -} - -.rtl .postprofile dd, .rtl .postprofile dt { - margin-left: 0; - margin-right: 8px; -} - -.rtl .online { - background-position: 0 0; -} - -.rtl dl.pmlist dd { - margin-right: 61% !important; - margin-left: 0 !important; -} - -/** -* buttons.css -*/ -/* Rollover buttons - Based on: http://wellstyled.com/css-nopreload-rollovers.html -----------------------------------------*/ -.rtl .buttons { - float: right; -} - -/* Rollover state */ -.rtl .buttons div { - margin: 0 1px 0 5px; -} - -/* Sub-header (navigation bar) ---------------------------------------------- */ -.rtl a.print, .rtl a.sendemail, .rtl a.fontsize { - text-align: right; -} - -/* Icon images ----------------------------------------- */ -.rtl .sitehome, .rtl .icon-faq, .rtl .icon-members, .rtl .icon-home, .rtl .icon-ucp, .rtl .icon-register, .rtl .icon-logout, -.rtl .icon-bookmark, .rtl .icon-bump, .rtl .icon-subscribe, .rtl .icon-unsubscribe, .rtl .icon-pages, .rtl .icon-search { - background-position: 100% 50%; - padding: 1px 17px 0 0; -} - -/* Poster profile icons -----------------------------------------*/ -/* Rollover state */ -.rtl .postprofile ul.profile-icons li { - float: right; - margin: 0 0 3px 6px; -} - -/* Positioning of moderator icons */ -.rtl .postbody ul.profile-icons { - float: left; -} - -/** -* cp.css -*/ -/* proSilver Control Panel Styles ----------------------------------------- */ - - -/* Main CP box -----------------------------------------*/ -.rtl #cp-menu { - float: right; -} - -.rtl #cp-main { - float: right; -} - -.rtl #cp-main .panel ol { - margin-right: 2em; - margin-left: 0; -} - -.rtl #cp-main .pagination { - float: left; -} - -.rtl #cp-main .buttons { - margin-right: 0; - margin-left: 0; -} - -/* CP tabbed menu -----------------------------------------*/ -.rtl #tabs { - margin: 20px 7px -1px 0; -} - -.rtl #tabs a { - float: right; -} - -/*.rtl #tabs a span { - float: right; -}*/ - -/* Mini tabbed menu used in MCP -----------------------------------------*/ -.rtl #minitabs { - margin: -20px 0 0 7px; -} - -.rtl #minitabs li { - float: left; - margin-right: 2px; - margin-left: 0; -} - -/* UCP navigation menu -----------------------------------------*/ - -/* Preferences pane layout -----------------------------------------*/ -.rtl #cp-main h2 { - margin-left: 0; - margin-right: 10px; -} - -/* Friends list */ -.rtl .cp-mini { - margin: 10px 5px 10px 15px; -} - -/* PM Styles -----------------------------------------*/ - -/* Defined rules list for PM options */ -.rtl ol.def-rules { - padding-right: 0; -} - -/* PM marking colours */ -.rtl .pm-legend { - border-right-width: 10px; - border-right-style: solid; - border-left-width: 0; - padding-left: 0; - padding-right: 3px; -} - -/* Avatar gallery */ -.rtl #gallery label { - float: right; -} - -/** -* forms.css -*/ - -/* General form styles -----------------------------------------*/ - -.rtl option { - padding-right: 0; - padding-left: 1em; -} - -.rtl label { - padding-right: 0; - padding-left: 5px; -} - -/* Definition list layout for forms ----------------------------------------- */ -.rtl fieldset dt { - float: right; - text-align: right; -} - -.rtl fieldset dd { - margin-left: 0; - margin-right: 41%; -} - -/* Specific layout 1 */ -.rtl fieldset.fields1 dt { - border-left-width: 0; - border-right-width: 1px; -} - -.rtl fieldset.fields1 dd { - margin-right: 10em; - margin-left: 0; - border-right-width: 0; - border-left-width: 1px; -} - -/* Specific layout 2 */ -.rtl fieldset.fields2 dt { - border-right-width: 1px; - border-left-width: 0; -} - -.rtl fieldset.fields2 dd { - margin-right: 16em; - margin-left: 0; - border-left-width: 1px; - border-right-width: 0; -} - -/* Form elements */ -.rtl dt label { - text-align: right; -} - -.rtl dd input, .rtl dd textarea { - margin-left: 3px; - margin-right: 0; -} - -/* Quick-login on index page */ -.rtl fieldset.quick-login input.inputbox { - margin-left: 5px; - margin-right: 0; -} - -.rtl fieldset.quick-login label { - padding-left: 2px; - padding-right: 0; -} - -/* Display options on viewtopic/viewforum pages */ -.rtl fieldset.display-options label { - padding-left: 2px; - padding-right: 0; -} - -/* Display actions for ucp and mcp pages */ -.rtl fieldset.display-actions { - text-align: left; - padding-left: 1em; - padding-right: 0; -} - -.rtl fieldset.display-actions label { - padding-left: 2px; - padding-right: 0; -} - -/* MCP forum selection*/ -.rtl fieldset.forum-selection { - float: left; -} - -.rtl fieldset.forum-selection2 { - float: left; -} - -/* Jumpbox */ -.rtl fieldset.jumpbox { - text-align: left; -} - -.rtl fieldset.quickmod { - float: left; - text-align: left; -} - -/* Posting page styles -----------------------------------------*/ - -/* Emoticons panel */ -.rtl #smiley-box { - float: left; -} - -/* Form button styles ----------------------------------------- */ - -/* Topic and forum Search */ -.rtl .search-box { - margin-right: 5px; - margin-left: 0; - float: right; -} - -.rtl input.search { - background-position: right 1px; - padding-right: 17px; - padding-left: 0; -} - -/** -* tweaks.css -*/ - - diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css deleted file mode 100644 index 6cffdc5930..0000000000 --- a/phpBB/styles/prosilver/theme/buttons.css +++ /dev/null @@ -1,169 +0,0 @@ -/* proSilver Button Styles ----------------------------------------- */ - -/* Rollover buttons - Based on: http://wellstyled.com/css-nopreload-rollovers.html -----------------------------------------*/ -.buttons { - float: left; - width: auto; - height: auto; -} - -/* Rollover state */ -.buttons div { - float: left; - margin: 0 5px 0 0; - background-position: 0 100%; -} - -/* Rolloff state */ -.buttons div a { - display: block; - width: 100%; - height: 100%; - background-position: 0 0; - position: relative; - overflow: hidden; -} - -/* Hide text and hide off-state image when rolling over (prevents flicker in IE) */ -/*.buttons div span { display: none; }*/ -/*.buttons div a:hover { background-image: none; }*/ -.buttons div span { position: absolute; width: 100%; height: 100%; cursor: pointer;} -.buttons div a:hover span { background-position: 0 100%; } - -/* Big button images */ -.reply-icon span { background: transparent none 0 0 no-repeat; } -.post-icon span { background: transparent none 0 0 no-repeat; } -.locked-icon span { background: transparent none 0 0 no-repeat; } -.pmreply-icon span { background: none 0 0 no-repeat; } -.newpm-icon span { background: none 0 0 no-repeat; } -.forwardpm-icon span { background: none 0 0 no-repeat; } - -/* Set big button dimensions */ -.buttons div.reply-icon { width: {IMG_BUTTON_TOPIC_REPLY_WIDTH}px; height: {IMG_BUTTON_TOPIC_REPLY_HEIGHT}px; } -.buttons div.post-icon { width: {IMG_BUTTON_TOPIC_NEW_WIDTH}px; height: {IMG_BUTTON_TOPIC_NEW_HEIGHT}px; } -.buttons div.locked-icon { width: {IMG_BUTTON_TOPIC_LOCKED_WIDTH}px; height: {IMG_BUTTON_TOPIC_LOCKED_HEIGHT}px; } -.buttons div.pmreply-icon { width: {IMG_BUTTON_PM_REPLY_WIDTH}px; height: {IMG_BUTTON_PM_REPLY_HEIGHT}px; } -.buttons div.newpm-icon { width: {IMG_BUTTON_PM_NEW_WIDTH}px; height: {IMG_BUTTON_PM_NEW_HEIGHT}px; } -.buttons div.forwardpm-icon { width: {IMG_BUTTON_PM_FORWARD_WIDTH}px; height: {IMG_BUTTON_PM_FORWARD_HEIGHT}px; } - -/* Sub-header (navigation bar) ---------------------------------------------- */ -a.print, a.sendemail, a.fontsize { - display: block; - overflow: hidden; - height: 18px; - text-indent: -5000px; - text-align: left; - background-repeat: no-repeat; -} - -a.print { - background-image: none; - width: 22px; -} - -a.sendemail { - background-image: none; - width: 22px; -} - -a.fontsize { - background-image: none; - background-position: 0 -1px; - width: 29px; -} - -a.fontsize:hover { - background-position: 0 -20px; - text-decoration: none; -} - -/* Icon images ----------------------------------------- */ -.sitehome, .icon-faq, .icon-members, .icon-home, .icon-ucp, .icon-register, .icon-logout, -.icon-bookmark, .icon-bump, .icon-subscribe, .icon-unsubscribe, .icon-pages, .icon-search { - background-position: 0 50%; - background-repeat: no-repeat; - background-image: none; - padding: 1px 0 0 17px; -} - -/* Poster profile icons -----------------------------------------*/ -ul.profile-icons { - padding-top: 10px; - list-style: none; -} - -/* Rollover state */ -ul.profile-icons li { - float: left; - margin: 0 6px 3px 0; - background-position: 0 100%; -} - -/* Rolloff state */ -ul.profile-icons li a { - display: block; - width: 100%; - height: 100%; - background-position: 0 0; -} - -/* Hide text and hide off-state image when rolling over (prevents flicker in IE) */ -ul.profile-icons li span { display:none; } -ul.profile-icons li a:hover { background: none; } - -/* Positioning of moderator icons */ -.postbody ul.profile-icons { - float: right; - width: auto; - padding: 0; -} - -.postbody ul.profile-icons li { - margin: 0 3px; -} - -/* Profile & navigation icons */ -.email-icon, .email-icon a { background: none top left no-repeat; } -.aim-icon, .aim-icon a { background: none top left no-repeat; } -.yahoo-icon, .yahoo-icon a { background: none top left no-repeat; } -.web-icon, .web-icon a { background: none top left no-repeat; } -.msnm-icon, .msnm-icon a { background: none top left no-repeat; } -.icq-icon, .icq-icon a { background: none top left no-repeat; } -.jabber-icon, .jabber-icon a { background: none top left no-repeat; } -.pm-icon, .pm-icon a { background: none top left no-repeat; } -.quote-icon, .quote-icon a { background: none top left no-repeat; } - -/* Moderator icons */ -.report-icon, .report-icon a { background: none top left no-repeat; } -.warn-icon, .warn-icon a { background: none top left no-repeat; } -.edit-icon, .edit-icon a { background: none top left no-repeat; } -.delete-icon, .delete-icon a { background: none top left no-repeat; } -.info-icon, .info-icon a { background: none top left no-repeat; } - -/* Set profile icon dimensions */ -ul.profile-icons li.email-icon { width: {IMG_ICON_CONTACT_EMAIL_WIDTH}px; height: {IMG_ICON_CONTACT_EMAIL_HEIGHT}px; } -ul.profile-icons li.aim-icon { width: {IMG_ICON_CONTACT_AIM_WIDTH}px; height: {IMG_ICON_CONTACT_AIM_HEIGHT}px; } -ul.profile-icons li.yahoo-icon { width: {IMG_ICON_CONTACT_YAHOO_WIDTH}px; height: {IMG_ICON_CONTACT_YAHOO_HEIGHT}px; } -ul.profile-icons li.web-icon { width: {IMG_ICON_CONTACT_WWW_WIDTH}px; height: {IMG_ICON_CONTACT_WWW_HEIGHT}px; } -ul.profile-icons li.msnm-icon { width: {IMG_ICON_CONTACT_MSNM_WIDTH}px; height: {IMG_ICON_CONTACT_MSNM_HEIGHT}px; } -ul.profile-icons li.icq-icon { width: {IMG_ICON_CONTACT_ICQ_WIDTH}px; height: {IMG_ICON_CONTACT_ICQ_HEIGHT}px; } -ul.profile-icons li.jabber-icon { width: {IMG_ICON_CONTACT_JABBER_WIDTH}px; height: {IMG_ICON_CONTACT_JABBER_HEIGHT}px; } -ul.profile-icons li.pm-icon { width: {IMG_ICON_CONTACT_PM_WIDTH}px; height: {IMG_ICON_CONTACT_PM_HEIGHT}px; } -ul.profile-icons li.quote-icon { width: {IMG_ICON_POST_QUOTE_WIDTH}px; height: {IMG_ICON_POST_QUOTE_HEIGHT}px; } -ul.profile-icons li.report-icon { width: {IMG_ICON_POST_REPORT_WIDTH}px; height: {IMG_ICON_POST_REPORT_HEIGHT}px; } -ul.profile-icons li.edit-icon { width: {IMG_ICON_POST_EDIT_WIDTH}px; height: {IMG_ICON_POST_EDIT_HEIGHT}px; } -ul.profile-icons li.delete-icon { width: {IMG_ICON_POST_DELETE_WIDTH}px; height: {IMG_ICON_POST_DELETE_HEIGHT}px; } -ul.profile-icons li.info-icon { width: {IMG_ICON_POST_INFO_WIDTH}px; height: {IMG_ICON_POST_INFO_HEIGHT}px; } -ul.profile-icons li.warn-icon { width: {IMG_ICON_USER_WARN_WIDTH}px; height: {IMG_ICON_USER_WARN_HEIGHT}px; } - -/* Fix profile icon default margins */ -ul.profile-icons li.edit-icon { margin: 0 0 0 3px; } -ul.profile-icons li.quote-icon { margin: 0 0 0 10px; } -ul.profile-icons li.info-icon, ul.profile-icons li.report-icon { margin: 0 3px 0 0; } - diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css deleted file mode 100644 index 06a05b5616..0000000000 --- a/phpBB/styles/prosilver/theme/colours.css +++ /dev/null @@ -1,1002 +0,0 @@ -/* --------------------------------------------------------------- -Colours and backgrounds for common.css --------------------------------------------------------------- */ - -html, body { - color: #536482; - background-color: #FFFFFF; -} - -h1 { - color: #FFFFFF; -} - -h2 { - color: #28313F; -} - -h3 { - border-bottom-color: #CCCCCC; - color: #115098; -} - -hr { - border-color: #FFFFFF; - border-top-color: #CCCCCC; -} - -hr.dashed { - border-top-color: #CCCCCC; -} - -/* Search box ---------------------------------------------- */ - -#search-box { - color: #FFFFFF; -} - -#search-box #keywords { - background-color: #FFF; -} - -#search-box input { - border-color: #0075B0; -} - -/* Round cornered boxes and backgrounds ----------------------------------------- */ -.headerbar { - background-color: #12A3EB; - background-image: url("{T_THEME_PATH}/images/bg_header.gif"); - color: #FFFFFF; -} - -.navbar { - background-color: #cadceb; -} - -.forabg { - background-color: #0076b1; - background-image: url("{T_THEME_PATH}/images/bg_list.gif"); -} - -.forumbg { - background-color: #12A3EB; - background-image: url("{T_THEME_PATH}/images/bg_header.gif"); -} - -.panel { - background-color: #ECF1F3; - color: #28313F; -} - -.post:target .content { - color: #000000; -} - -.post:target h3 a { - color: #000000; -} - -.bg1 { background-color: #ECF3F7; } -.bg2 { background-color: #e1ebf2; } -.bg3 { background-color: #cadceb; } - -.ucprowbg { - background-color: #DCDEE2; -} - -.fieldsbg { - background-color: #E7E8EA; -} - -span.corners-top { - background-image: url("{T_THEME_PATH}/images/corners_left.png"); -} - -span.corners-top span { - background-image: url("{T_THEME_PATH}/images/corners_right.png"); -} - -span.corners-bottom { - background-image: url("{T_THEME_PATH}/images/corners_left.png"); -} - -span.corners-bottom span { - background-image: url("{T_THEME_PATH}/images/corners_right.png"); -} - -/* Horizontal lists -----------------------------------------*/ - -ul.navlinks { - border-bottom-color: #FFFFFF; -} - -/* Table styles -----------------------------------------*/ -table.table1 thead th { - color: #FFFFFF; -} - -table.table1 tbody tr { - border-color: #BFC1CF; -} - -table.table1 tbody tr:hover, table.table1 tbody tr.hover { - background-color: #CFE1F6; - color: #000; -} - -table.table1 td { - color: #536482; -} - -table.table1 tbody td { - border-top-color: #FAFAFA; -} - -table.table1 tbody th { - border-bottom-color: #000000; - color: #333333; - background-color: #FFFFFF; -} - -table.info tbody th { - color: #000000; -} - -/* Misc layout styles ----------------------------------------- */ -dl.details dt { - color: #000000; -} - -dl.details dd { - color: #536482; -} - -.sep { - color: #1198D9; -} - -/* Pagination ----------------------------------------- */ - -.pagination span strong { - color: #FFFFFF; - background-color: #4692BF; - border-color: #4692BF; -} - -.pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active { - color: #5C758C; - background-color: #ECEDEE; - border-color: #B4BAC0; -} - -.pagination span a:hover { - border-color: #368AD2; - background-color: #368AD2; - color: #FFF; -} - -/* Pagination in viewforum for multipage topics */ -.row .pagination { - background-image: url("{T_THEME_PATH}/images/icon_pages.gif"); -} - -.row .pagination span a, li.pagination span a { - background-color: #FFFFFF; -} - -.row .pagination span a:hover, li.pagination span a:hover { - background-color: #368AD2; -} - -/* Miscellaneous styles ----------------------------------------- */ - -.copyright { - color: #555555; -} - -.error { - color: #BC2A4D; -} - -.reported { - background-color: #F7ECEF; -} - -li.reported:hover { - background-color: #ECD5D8 !important; -} -.sticky, .announce { - /* you can add a background for stickies and announcements*/ -} - -div.rules { - background-color: #ECD5D8; - color: #BC2A4D; -} - -p.rules { - background-color: #ECD5D8; - background-image: none; -} - -/* --------------------------------------------------------------- -Colours and backgrounds for links.css --------------------------------------------------------------- */ - -a:link { color: #105289; } -a:visited { color: #105289; } -a:hover { color: #D31141; } -a:active { color: #368AD2; } - -/* Links on gradient backgrounds */ -#search-box a:link, .navbg a:link, .forumbg .header a:link, .forabg .header a:link, th a:link { - color: #FFFFFF; -} - -#search-box a:visited, .navbg a:visited, .forumbg .header a:visited, .forabg .header a:visited, th a:visited { - color: #FFFFFF; -} - -#search-box a:hover, .navbg a:hover, .forumbg .header a:hover, .forabg .header a:hover, th a:hover { - color: #A8D8FF; -} - -#search-box a:active, .navbg a:active, .forumbg .header a:active, .forabg .header a:active, th a:active { - color: #C8E6FF; -} - -/* Links for forum/topic lists */ -a.forumtitle { - color: #105289; -} - -/* a.forumtitle:visited { color: #105289; } */ - -a.forumtitle:hover { - color: #BC2A4D; -} - -a.forumtitle:active { - color: #105289; -} - -a.topictitle { - color: #105289; -} - -/* a.topictitle:visited { color: #368AD2; } */ - -a.topictitle:hover { - color: #BC2A4D; -} - -a.topictitle:active { - color: #105289; -} - -/* Post body links */ -.postlink { - color: #368AD2; - border-bottom-color: #368AD2; -} - -.postlink:visited { - color: #5D8FBD; - border-bottom-color: #666666; -} - -.postlink:active { - color: #368AD2; -} - -.postlink:hover { - background-color: #D0E4F6; - color: #0D4473; -} - -.signature a, .signature a:visited, .signature a:active, .signature a:hover { - background-color: transparent; -} - -/* Profile links */ -.postprofile a:link, .postprofile a:active, .postprofile a:visited, .postprofile dt.author a { - color: #105289; -} - -.postprofile a:hover, .postprofile dt.author a:hover { - color: #D31141; -} - -/* Profile searchresults */ -.search .postprofile a { - color: #105289; -} - -.search .postprofile a:hover { - color: #D31141; -} - -/* Back to top of page */ -a.top { - background-image: url("{IMG_ICON_BACK_TOP_SRC}"); -} - -a.top2 { - background-image: url("{IMG_ICON_BACK_TOP_SRC}"); -} - -/* Arrow links */ -a.up { background-image: url("{T_THEME_PATH}/images/arrow_up.gif") } -a.down { background-image: url("{T_THEME_PATH}/images/arrow_down.gif") } -a.left { background-image: url("{T_THEME_PATH}/images/arrow_left.gif") } -a.right { background-image: url("{T_THEME_PATH}/images/arrow_right.gif") } - -a.up:hover { - background-color: transparent; -} - -a.left:hover { - color: #368AD2; -} - -a.right:hover { - color: #368AD2; -} - - -/* --------------------------------------------------------------- -Colours and backgrounds for content.css --------------------------------------------------------------- */ - -ul.forums { - background-color: #eef5f9; - background-image: url("{T_THEME_PATH}/images/gradient.gif"); -} - -ul.topiclist li { - color: #4C5D77; -} - -ul.topiclist dd { - border-left-color: #FFFFFF; -} - -.rtl ul.topiclist dd { - border-right-color: #fff; - border-left-color: transparent; -} - -ul.topiclist li.row dt a.subforum.read { - background-image: url("{IMG_SUBFORUM_READ_SRC}"); -} - -ul.topiclist li.row dt a.subforum.unread { - background-image: url("{IMG_SUBFORUM_UNREAD_SRC}"); -} - -li.row { - border-top-color: #FFFFFF; - border-bottom-color: #00608F; -} - -li.row strong { - color: #000000; -} - -li.row:hover { - background-color: #F6F4D0; -} - -li.row:hover dd { - border-left-color: #CCCCCC; -} - -.rtl li.row:hover dd { - border-right-color: #CCCCCC; - border-left-color: transparent; -} - -li.header dt, li.header dd { - color: #FFFFFF; -} - -/* Forum list column styles */ -ul.topiclist dd.searchextra { - color: #333333; -} - -/* Post body styles -----------------------------------------*/ -.postbody { - color: #333333; -} - -/* Content container styles -----------------------------------------*/ -.content { - color: #333333; -} - -.content h2, .panel h2 { - color: #115098; - border-bottom-color: #CCCCCC; -} - -dl.faq dt { - color: #333333; -} - -.posthilit { - background-color: #F3BFCC; - color: #BC2A4D; -} - -/* Post signature */ -.signature { - border-top-color: #CCCCCC; -} - -/* Post noticies */ -.notice { - border-top-color: #CCCCCC; -} - -/* BB Code styles -----------------------------------------*/ -/* Quote block */ -blockquote { - background-color: #EBEADD; - background-image: url("{T_THEME_PATH}/images/quote.gif"); - border-color:#DBDBCE; -} - -blockquote blockquote { - /* Nested quotes */ - background-color:#EFEED9; -} - -blockquote blockquote blockquote { - /* Nested quotes */ - background-color: #EBEADD; -} - -/* Code block */ -dl.codebox { - background-color: #FFFFFF; - border-color: #C9D2D8; -} - -dl.codebox dt { - border-bottom-color: #CCCCCC; -} - -dl.codebox code { - color: #2E8B57; -} - -.syntaxbg { color: #FFFFFF; } -.syntaxcomment { color: #FF8000; } -.syntaxdefault { color: #0000BB; } -.syntaxhtml { color: #000000; } -.syntaxkeyword { color: #007700; } -.syntaxstring { color: #DD0000; } - -/* Attachments -----------------------------------------*/ -.attachbox { - background-color: #FFFFFF; - border-color: #C9D2D8; -} - -.pm-message .attachbox { - background-color: #F2F3F3; -} - -.attachbox dd { - border-top-color: #C9D2D8; -} - -.attachbox p { - color: #666666; -} - -.attachbox p.stats { - color: #666666; -} - -.attach-image img { - border-color: #999999; -} - -/* Inline image thumbnails */ - -dl.file dd { - color: #666666; -} - -dl.thumbnail img { - border-color: #666666; - background-color: #FFFFFF; -} - -dl.thumbnail dd { - color: #666666; -} - -dl.thumbnail dt a:hover { - background-color: #EEEEEE; -} - -dl.thumbnail dt a:hover img { - border-color: #368AD2; -} - -/* Post poll styles -----------------------------------------*/ - -fieldset.polls dl { - border-top-color: #DCDEE2; - color: #666666; -} - -fieldset.polls dl.voted { - color: #000000; -} - -fieldset.polls dd div { - color: #FFFFFF; -} - -.rtl .pollbar1, .rtl .pollbar2, .rtl .pollbar3, .rtl .pollbar4, .rtl .pollbar5 { - border-right-color: transparent; -} - -.pollbar1 { - background-color: #AA2346; - border-bottom-color: #74162C; - border-right-color: #74162C; -} - -.rtl .pollbar1 { - border-left-color: #74162C; -} - -.pollbar2 { - background-color: #BE1E4A; - border-bottom-color: #8C1C38; - border-right-color: #8C1C38; -} - -.rtl .pollbar2 { - border-left-color: #8C1C38; -} - -.pollbar3 { - background-color: #D11A4E; - border-bottom-color: #AA2346; - border-right-color: #AA2346; -} - -.rtl .pollbar3 { - border-left-color: #AA2346; -} - -.pollbar4 { - background-color: #E41653; - border-bottom-color: #BE1E4A; - border-right-color: #BE1E4A; -} - -.rtl .pollbar4 { - border-left-color: #BE1E4A; -} - -.pollbar5 { - background-color: #F81157; - border-bottom-color: #D11A4E; - border-right-color: #D11A4E; -} - -.rtl .pollbar5 { - border-left-color: #D11A4E; -} - -/* Poster profile block -----------------------------------------*/ -.postprofile { - color: #666666; - border-left-color: #FFFFFF; -} - -.rtl .postprofile { - border-right-color: #FFFFFF; - border-left-color: transparent; -} - -.pm .postprofile { - border-left-color: #DDDDDD; -} - -.rtl .pm .postprofile { - border-right-color: #DDDDDD; - border-left-color: transparent; -} - -.postprofile strong { - color: #000000; -} - -.online { - background-image: url("{T_IMAGESET_LANG_PATH}/icon_user_online.gif"); -} - -/* --------------------------------------------------------------- -Colours and backgrounds for buttons.css --------------------------------------------------------------- */ - -/* Big button images */ -.reply-icon span { background-image: url("{IMG_BUTTON_TOPIC_REPLY_SRC}"); } -.post-icon span { background-image: url("{IMG_BUTTON_TOPIC_NEW_SRC}"); } -.locked-icon span { background-image: url("{IMG_BUTTON_TOPIC_LOCKED_SRC}"); } -.pmreply-icon span { background-image: url("{IMG_BUTTON_PM_REPLY_SRC}") ;} -.newpm-icon span { background-image: url("{IMG_BUTTON_PM_NEW_SRC}") ;} -.forwardpm-icon span { background-image: url("{IMG_BUTTON_PM_FORWARD_SRC}") ;} - -a.print { - background-image: url("{T_THEME_PATH}/images/icon_print.gif"); -} - -a.sendemail { - background-image: url("{T_THEME_PATH}/images/icon_sendemail.gif"); -} - -a.fontsize { - background-image: url("{T_THEME_PATH}/images/icon_fontsize.gif"); -} - -/* Icon images ----------------------------------------- */ -.sitehome { background-image: url("{T_THEME_PATH}/images/icon_home.gif"); } -.icon-faq { background-image: url("{T_THEME_PATH}/images/icon_faq.gif"); } -.icon-members { background-image: url("{T_THEME_PATH}/images/icon_members.gif"); } -.icon-home { background-image: url("{T_THEME_PATH}/images/icon_home.gif"); } -.icon-ucp { background-image: url("{T_THEME_PATH}/images/icon_ucp.gif"); } -.icon-register { background-image: url("{T_THEME_PATH}/images/icon_register.gif"); } -.icon-logout { background-image: url("{T_THEME_PATH}/images/icon_logout.gif"); } -.icon-bookmark { background-image: url("{T_THEME_PATH}/images/icon_bookmark.gif"); } -.icon-bump { background-image: url("{T_THEME_PATH}/images/icon_bump.gif"); } -.icon-subscribe { background-image: url("{T_THEME_PATH}/images/icon_subscribe.gif"); } -.icon-unsubscribe { background-image: url("{T_THEME_PATH}/images/icon_unsubscribe.gif"); } -.icon-pages { background-image: url("{T_THEME_PATH}/images/icon_pages.gif"); } -.icon-search { background-image: url("{T_THEME_PATH}/images/icon_search.gif"); } - -/* Profile & navigation icons */ -.email-icon, .email-icon a { background-image: url("{IMG_ICON_CONTACT_EMAIL_SRC}"); } -.aim-icon, .aim-icon a { background-image: url("{IMG_ICON_CONTACT_AIM_SRC}"); } -.yahoo-icon, .yahoo-icon a { background-image: url("{IMG_ICON_CONTACT_YAHOO_SRC}"); } -.web-icon, .web-icon a { background-image: url("{IMG_ICON_CONTACT_WWW_SRC}"); } -.msnm-icon, .msnm-icon a { background-image: url("{IMG_ICON_CONTACT_MSNM_SRC}"); } -.icq-icon, .icq-icon a { background-image: url("{IMG_ICON_CONTACT_ICQ_SRC}"); } -.jabber-icon, .jabber-icon a { background-image: url("{IMG_ICON_CONTACT_JABBER_SRC}"); } -.pm-icon, .pm-icon a { background-image: url("{IMG_ICON_CONTACT_PM_SRC}"); } -.quote-icon, .quote-icon a { background-image: url("{IMG_ICON_POST_QUOTE_SRC}"); } - -/* Moderator icons */ -.report-icon, .report-icon a { background-image: url("{IMG_ICON_POST_REPORT_SRC}"); } -.edit-icon, .edit-icon a { background-image: url("{IMG_ICON_POST_EDIT_SRC}"); } -.delete-icon, .delete-icon a { background-image: url("{IMG_ICON_POST_DELETE_SRC}"); } -.info-icon, .info-icon a { background-image: url("{IMG_ICON_POST_INFO_SRC}"); } -.warn-icon, .warn-icon a { background-image: url("{IMG_ICON_USER_WARN_SRC}"); } /* Need updated warn icon */ - -/* --------------------------------------------------------------- -Colours and backgrounds for cp.css --------------------------------------------------------------- */ - -/* Main CP box -----------------------------------------*/ - -#cp-main h3, #cp-main hr, #cp-menu hr { - border-color: #A4B3BF; -} - -#cp-main .panel li.row { - border-bottom-color: #B5C1CB; - border-top-color: #F9F9F9; -} - -ul.cplist { - border-top-color: #B5C1CB; -} - -#cp-main .panel li.header dd, #cp-main .panel li.header dt { - color: #000000; -} - -#cp-main table.table1 thead th { - color: #333333; - border-bottom-color: #333333; -} - -#cp-main .pm-message { - border-color: #DBDEE2; - background-color: #FFFFFF; -} - -/* CP tabbed menu -----------------------------------------*/ -#tabs a { - background-image: url("{T_THEME_PATH}/images/bg_tabs1.gif"); -} - -#tabs a span { - background-image: url("{T_THEME_PATH}/images/bg_tabs2.gif"); - color: #536482; -} - -#tabs a:hover span { - color: #BC2A4D; -} - -#tabs .activetab a { - border-bottom-color: #CADCEB; -} - -#tabs .activetab a span { - color: #333333; -} - -#tabs .activetab a:hover span { - color: #000000; -} - -/* Mini tabbed menu used in MCP -----------------------------------------*/ -#minitabs li { - background-color: #E1EBF2; -} - -#minitabs li.activetab { - background-color: #F9F9F9; -} - -#minitabs li.activetab a, #minitabs li.activetab a:hover { - color: #333333; -} - -/* UCP navigation menu -----------------------------------------*/ - -/* Link styles for the sub-section links */ -#navigation a { - color: #333; - background-color: #B2C2CF; - background-image: url("{T_THEME_PATH}/images/bg_menu.gif"); -} - -#navigation a:hover { - background-color: #aabac6; - color: #BC2A4D; -} - -#navigation #active-subsection a { - color: #D31141; - background-color: #F9F9F9; - background-image: none; -} - -#navigation #active-subsection a:hover { - color: #D31141; -} - -/* Preferences pane layout -----------------------------------------*/ -#cp-main h2 { - color: #333333; -} - -#cp-main .panel { - background-color: #F9F9F9; -} - -#cp-main .pm { - background-color: #FFFFFF; -} - -#cp-main span.corners-top, #cp-menu span.corners-top { - background-image: url("{T_THEME_PATH}/images/corners_left2.gif"); -} - -#cp-main span.corners-top span, #cp-menu span.corners-top span { - background-image: url("{T_THEME_PATH}/images/corners_right2.gif"); -} - -#cp-main span.corners-bottom, #cp-menu span.corners-bottom { - background-image: url("{T_THEME_PATH}/images/corners_left2.gif"); -} - -#cp-main span.corners-bottom span, #cp-menu span.corners-bottom span { - background-image: url("{T_THEME_PATH}/images/corners_right2.gif"); -} - -/* Topicreview */ -#cp-main .panel #topicreview span.corners-top, #cp-menu .panel #topicreview span.corners-top { - background-image: url("{T_THEME_PATH}/images/corners_left.gif"); -} - -#cp-main .panel #topicreview span.corners-top span, #cp-menu .panel #topicreview span.corners-top span { - background-image: url("{T_THEME_PATH}/images/corners_right.gif"); -} - -#cp-main .panel #topicreview span.corners-bottom, #cp-menu .panel #topicreview span.corners-bottom { - background-image: url("{T_THEME_PATH}/images/corners_left.gif"); -} - -#cp-main .panel #topicreview span.corners-bottom span, #cp-menu .panel #topicreview span.corners-bottom span { - background-image: url("{T_THEME_PATH}/images/corners_right.gif"); -} - -/* Friends list */ -.cp-mini { - background-color: #eef5f9; -} - -dl.mini dt { - color: #425067; -} - -/* PM Styles -----------------------------------------*/ -/* PM Message history */ -.current { - color: #999999 !important; -} - -/* PM marking colours */ -.pmlist li.pm_message_reported_colour, .pm_message_reported_colour { - border-left-color: #BC2A4D; - border-right-color: #BC2A4D; -} - -.pmlist li.pm_marked_colour, .pm_marked_colour { - border-color: #FF6600; -} - -.pmlist li.pm_replied_colour, .pm_replied_colour { - border-color: #A9B8C2; -} - -.pmlist li.pm_friend_colour, .pm_friend_colour { - border-color: #5D8FBD; -} - -pmlist li.pm_foe_colour, .pm_foe_colour { - border-color: #000000; -} - -/* Avatar gallery */ -#gallery label { - background-color: #FFFFFF; - border-color: #CCC; -} - -#gallery label:hover { - background-color: #EEE; -} - -/* --------------------------------------------------------------- -Colours and backgrounds for forms.css --------------------------------------------------------------- */ - -/* General form styles -----------------------------------------*/ -select { - border-color: #666666; - background-color: #FAFAFA; -} - -label { - color: #425067; -} - -option.disabled-option { - color: graytext; -} - -/* Definition list layout for forms ----------------------------------------- */ -dd label { - color: #333; -} - -/* Hover effects */ -fieldset dl:hover dt label { - color: #000000; -} - -fieldset.fields2 dl:hover dt label { - color: inherit; -} - -/* Quick-login on index page */ -fieldset.quick-login input.inputbox { - background-color: #F2F3F3; -} - -/* Posting page styles -----------------------------------------*/ - -#message-box textarea { - color: #333333; -} - -/* Input field styles ----------------------------------------- */ -.inputbox { - background-color: #FFFFFF; - border-color: #B4BAC0; - color: #333333; -} - -.inputbox:hover { - border-color: #11A3EA; -} - -.inputbox:focus { - border-color: #11A3EA; - color: #0F4987; -} - -/* Form button styles ----------------------------------------- */ - -a.button1, input.button1, input.button3, a.button2, input.button2 { - color: #000; - background-color: #FAFAFA; - background-image: url("{T_THEME_PATH}/images/bg_button.gif"); -} - -a.button1, input.button1 { - border-color: #666666; -} - -input.button3 { - background-image: none; -} - -/* Alternative button */ -a.button2, input.button2, input.button3 { - border-color: #666666; -} - -/* button in the style of the form buttons */ -a.button1, a.button1:link, a.button1:visited, a.button1:active, a.button2, a.button2:link, a.button2:visited, a.button2:active { - color: #000000; -} - -/* Hover states */ -a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover, input.button3:hover { - border-color: #BC2A4D; - color: #BC2A4D; -} - -input.search { - background-image: url("{T_THEME_PATH}/images/icon_textbox_search.gif"); -} - -input.disabled { - color: #666666; -} diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css deleted file mode 100644 index c3fa42115f..0000000000 --- a/phpBB/styles/prosilver/theme/common.css +++ /dev/null @@ -1,632 +0,0 @@ -/* General proSilver Markup Styles ----------------------------------------- */ - -* { - /* Reset browsers default margin, padding and font sizes */ - margin: 0; - padding: 0; -} - -html { - font-size: 100%; - /* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-IE browsers */ - height: 100%; - margin-bottom: 1px; -} - -body { - /* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */ - font-family: Verdana, Helvetica, Arial, sans-serif; - color: #828282; - background-color: #FFFFFF; - /*font-size: 62.5%; This sets the default font size to be equivalent to 10px */ - font-size: 10px; - margin: 0; - padding: 12px 0; -} - -h1 { - /* Forum name */ - font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - margin-right: 200px; - color: #FFFFFF; - margin-top: 15px; - font-weight: bold; - font-size: 2em; -} - -h2 { - /* Forum header titles */ - font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - font-weight: normal; - color: #3f3f3f; - font-size: 2em; - margin: 0.8em 0 0.2em 0; -} - -h2.solo { - margin-bottom: 1em; -} - -h3 { - /* Sub-headers (also used as post headers, but defined later) */ - font-family: Arial, Helvetica, sans-serif; - font-weight: bold; - text-transform: uppercase; - border-bottom: 1px solid #CCCCCC; - margin-bottom: 3px; - padding-bottom: 2px; - font-size: 1.05em; - color: #989898; - margin-top: 20px; -} - -h4 { - /* Forum and topic list titles */ - font-family: "Trebuchet MS", Verdana, Helvetica, Arial, Sans-serif; - font-size: 1.3em; -} - -p { - line-height: 1.3em; - font-size: 1.1em; - margin-bottom: 1.5em; -} - -img { - border-width: 0; -} - -hr { - /* Also see tweaks.css */ - border: 0 none #FFFFFF; - border-top: 1px solid #CCCCCC; - height: 1px; - margin: 5px 0; - display: block; - clear: both; -} - -hr.dashed { - border-top: 1px dashed #CCCCCC; - margin: 10px 0; -} - -hr.divider { - display: none; -} - -p.right { - text-align: right; -} - -/* Main blocks ----------------------------------------- */ -#wrap { - padding: 0 20px; - min-width: 650px; -} - -#simple-wrap { - padding: 6px 10px; -} - -#page-body { - margin: 4px 0; - clear: both; -} - -#page-footer { - clear: both; -} - -#page-footer h3 { - margin-top: 20px; -} - -#logo { - float: left; - width: auto; - padding: 10px 13px 0 10px; -} - -a#logo:hover { - text-decoration: none; -} - -/* Search box ---------------------------------------------- */ -#search-box { - color: #FFFFFF; - position: relative; - margin-top: 30px; - margin-right: 5px; - display: block; - float: right; - text-align: right; - white-space: nowrap; /* For Opera */ -} - -#search-box #keywords { - width: 95px; - background-color: #FFF; -} - -#search-box input { - border: 1px solid #b0b0b0; -} - -/* .button1 style defined later, just a few tweaks for the search button version */ -#search-box input.button1 { - padding: 1px 5px; -} - -#search-box li { - text-align: right; - margin-top: 4px; -} - -#search-box img { - vertical-align: middle; - margin-right: 3px; -} - -/* Site description and logo */ -#site-description { - float: left; - width: 70%; -} - -#site-description h1 { - margin-right: 0; -} - -/* Round cornered boxes and backgrounds ----------------------------------------- */ -.headerbar { - background: #ebebeb none repeat-x 0 0; - color: #FFFFFF; - margin-bottom: 4px; - padding: 0 5px; -} - -.navbar { - background-color: #ebebeb; - padding: 0 10px; -} - -.forabg { - background: #b1b1b1 none repeat-x 0 0; - margin-bottom: 4px; - padding: 0 5px; - clear: both; -} - -.forumbg { - background: #ebebeb none repeat-x 0 0; - margin-bottom: 4px; - padding: 0 5px; - clear: both; -} - -.panel { - margin-bottom: 4px; - padding: 0 10px; - background-color: #f3f3f3; - color: #3f3f3f; -} - -.post { - padding: 0 10px; - margin-bottom: 4px; - background-repeat: no-repeat; - background-position: 100% 0; -} - -.post:target .content { - color: #000000; -} - -.post:target h3 a { - color: #000000; -} - -.bg1 { background-color: #f7f7f7;} -.bg2 { background-color: #f2f2f2; } -.bg3 { background-color: #ebebeb; } - -.rowbg { - margin: 5px 5px 2px 5px; -} - -.ucprowbg { - background-color: #e2e2e2; -} - -.fieldsbg { - /*border: 1px #DBDEE2 solid;*/ - background-color: #eaeaea; -} - -span.corners-top, span.corners-bottom, span.corners-top span, span.corners-bottom span { - font-size: 1px; - line-height: 1px; - display: block; - height: 5px; - background-repeat: no-repeat; -} - -span.corners-top { - background-image: none; - background-position: 0 0; - margin: 0 -5px; -} - -span.corners-top span { - background-image: none; - background-position: 100% 0; -} - -span.corners-bottom { - background-image: none; - background-position: 0 100%; - margin: 0 -5px; - clear: both; -} - -span.corners-bottom span { - background-image: none; - background-position: 100% 100%; -} - -.headbg span.corners-bottom { - margin-bottom: -1px; -} - -.post span.corners-top, .post span.corners-bottom, .panel span.corners-top, .panel span.corners-bottom, .navbar span.corners-top, .navbar span.corners-bottom { - margin: 0 -10px; -} - -.rules span.corners-top { - margin: 0 -10px 5px -10px; -} - -.rules span.corners-bottom { - margin: 5px -10px 0 -10px; -} - -/* Horizontal lists -----------------------------------------*/ -ul.linklist { - display: block; - margin: 0; -} - -ul.linklist li { - display: block; - list-style-type: none; - float: left; - width: auto; - margin-right: 5px; - font-size: 1.1em; - line-height: 2.2em; -} - -ul.linklist li.rightside, p.rightside { - float: right; - margin-right: 0; - margin-left: 5px; - text-align: right; -} - -ul.navlinks { - padding-bottom: 1px; - margin-bottom: 1px; - border-bottom: 1px solid #FFFFFF; - font-weight: bold; -} - -ul.leftside { - float: left; - margin-left: 0; - margin-right: 5px; - text-align: left; -} - -ul.rightside { - float: right; - margin-left: 5px; - margin-right: -5px; - text-align: right; -} - -/* Table styles -----------------------------------------*/ -table.table1 { - /* See tweaks.css */ -} - -#ucp-main table.table1 { - padding: 2px; -} - -table.table1 thead th { - font-weight: normal; - text-transform: uppercase; - color: #FFFFFF; - line-height: 1.3em; - font-size: 1em; - padding: 0 0 4px 3px; -} - -table.table1 thead th span { - padding-left: 7px; -} - -table.table1 tbody tr { - border: 1px solid #cfcfcf; -} - -table.table1 tbody tr:hover, table.table1 tbody tr.hover { - background-color: #f6f6f6; - color: #000; -} - -table.table1 td { - color: #6a6a6a; - font-size: 1.1em; -} - -table.table1 tbody td { - padding: 5px; - border-top: 1px solid #FAFAFA; -} - -table.table1 tbody th { - padding: 5px; - border-bottom: 1px solid #000000; - text-align: left; - color: #333333; - background-color: #FFFFFF; -} - -/* Specific column styles */ -table.table1 .name { text-align: left; } -table.table1 .posts { text-align: center !important; width: 7%; } -table.table1 .joined { text-align: left; width: 15%; } -table.table1 .active { text-align: left; width: 15%; } -table.table1 .mark { text-align: center; width: 7%; } -table.table1 .info { text-align: left; width: 30%; } -table.table1 .info div { width: 100%; white-space: nowrap; overflow: hidden; } -table.table1 .autocol { line-height: 2em; white-space: nowrap; } -table.table1 thead .autocol { padding-left: 1em; } - -table.table1 span.rank-img { - float: right; - width: auto; -} - -table.info td { - padding: 3px; -} - -table.info tbody th { - padding: 3px; - text-align: right; - vertical-align: top; - color: #000000; - font-weight: normal; -} - -.forumbg table.table1 { - margin: 0 -2px -1px -1px; -} - -/* Misc layout styles ----------------------------------------- */ -/* column[1-2] styles are containers for two column layouts - Also see tweaks.css */ -.column1 { - float: left; - clear: left; - width: 49%; -} - -.column2 { - float: right; - clear: right; - width: 49%; -} - -/* General classes for placing floating blocks */ -.left-box { - float: left; - width: auto; - text-align: left; -} - -.right-box { - float: right; - width: auto; - text-align: right; -} - -dl.details { - /*font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;*/ - font-size: 1.1em; -} - -dl.details dt { - float: left; - clear: left; - width: 30%; - text-align: right; - color: #000000; - display: block; -} - -dl.details dd { - margin-left: 0; - padding-left: 5px; - margin-bottom: 5px; - color: #828282; - float: left; - width: 65%; -} - -/* Pagination ----------------------------------------- */ -.pagination { - height: 1%; /* IE tweak (holly hack) */ - width: auto; - text-align: right; - margin-top: 5px; - float: right; -} - -.pagination span.page-sep { - display: none; -} - -li.pagination { - margin-top: 0; -} - -.pagination strong, .pagination b { - font-weight: normal; -} - -.pagination span strong { - padding: 0 2px; - margin: 0 2px; - font-weight: normal; - color: #FFFFFF; - background-color: #bfbfbf; - border: 1px solid #bfbfbf; - font-size: 0.9em; -} - -.pagination span a, .pagination span a:link, .pagination span a:visited, .pagination span a:active { - font-weight: normal; - text-decoration: none; - color: #747474; - margin: 0 2px; - padding: 0 2px; - background-color: #eeeeee; - border: 1px solid #bababa; - font-size: 0.9em; - line-height: 1.5em; -} - -.pagination span a:hover { - border-color: #d2d2d2; - background-color: #d2d2d2; - color: #FFF; - text-decoration: none; -} - -.pagination img { - vertical-align: middle; -} - -/* Pagination in viewforum for multipage topics */ -.row .pagination { - display: block; - float: right; - width: auto; - margin-top: 0; - padding: 1px 0 1px 15px; - font-size: 0.9em; - background: none 0 50% no-repeat; -} - -.row .pagination span a, li.pagination span a { - background-color: #FFFFFF; -} - -.row .pagination span a:hover, li.pagination span a:hover { - background-color: #d2d2d2; -} - -/* Miscellaneous styles ----------------------------------------- */ -#forum-permissions { - float: right; - width: auto; - padding-left: 5px; - margin-left: 5px; - margin-top: 10px; - text-align: right; -} - -.copyright { - padding: 5px; - text-align: center; - color: #555555; -} - -.small { - font-size: 0.9em !important; -} - -.titlespace { - margin-bottom: 15px; -} - -.headerspace { - margin-top: 20px; -} - -.error { - color: #bcbcbc; - font-weight: bold; - font-size: 1em; -} - -.reported { - background-color: #f7f7f7; -} - -li.reported:hover { - background-color: #ececec; -} - -div.rules { - background-color: #ececec; - color: #bcbcbc; - padding: 0 10px; - margin: 10px 0; - font-size: 1.1em; -} - -div.rules ul { - margin-left: 20px; -} - -p.rules { - background-color: #ececec; - background-image: none; - padding: 5px; -} - -p.rules img { - vertical-align: middle; -} - -p.rules a { - vertical-align: middle; - clear: both; -} - -#top { - position: absolute; - top: -20px; -} - -.clear { - display: block; - clear: both; - font-size: 1px; - line-height: 1px; - background: transparent; -} diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css deleted file mode 100644 index 936b53f78a..0000000000 --- a/phpBB/styles/prosilver/theme/content.css +++ /dev/null @@ -1,744 +0,0 @@ -/* proSilver Content Styles ----------------------------------------- */ - -ul.topiclist { - display: block; - list-style-type: none; - margin: 0; -} - -ul.forums { - background: #f9f9f9 none repeat-x 0 0; -} - -ul.topiclist li { - display: block; - list-style-type: none; - color: #777777; - margin: 0; -} - -ul.topiclist dl { - position: relative; -} - -ul.topiclist li.row dl { - padding: 2px 0; -} - -ul.topiclist dt { - display: block; - float: left; - width: 50%; - font-size: 1.1em; - padding-left: 5px; - padding-right: 5px; -} - -ul.topiclist dd { - display: block; - float: left; - border-left: 1px solid #FFFFFF; - padding: 4px 0; -} - -ul.topiclist dfn { - /* Labels for post/view counts */ - display: none; -} - -ul.topiclist li.row dt a.subforum { - background-image: none; - background-position: 0 50%; - background-repeat: no-repeat; - position: relative; - white-space: nowrap; - padding: 0 0 0 12px; -} - -.forum-image { - float: left; - padding-top: 5px; - margin-right: 5px; -} - -li.row { - border-top: 1px solid #FFFFFF; - border-bottom: 1px solid #8f8f8f; -} - -li.row strong { - font-weight: normal; - color: #000000; -} - -li.row:hover { - background-color: #f6f6f6; -} - -li.row:hover dd { - border-left-color: #CCCCCC; -} - -li.header dt, li.header dd { - line-height: 1em; - border-left-width: 0; - margin: 2px 0 4px 0; - color: #FFFFFF; - padding-top: 2px; - padding-bottom: 2px; - font-size: 1em; - font-family: Arial, Helvetica, sans-serif; - text-transform: uppercase; -} - -li.header dt { - font-weight: bold; -} - -li.header dd { - margin-left: 1px; -} - -li.header dl.icon { - min-height: 0; -} - -li.header dl.icon dt { - /* Tweak for headers alignment when folder icon used */ - padding-left: 0; - padding-right: 50px; -} - -/* Forum list column styles */ -dl.icon { - min-height: 35px; - background-position: 10px 50%; /* Position of folder icon */ - background-repeat: no-repeat; -} - -dl.icon dt { - padding-left: 45px; /* Space for folder icon */ - background-repeat: no-repeat; - background-position: 5px 95%; /* Position of topic icon */ -} - -dd.posts, dd.topics, dd.views { - width: 8%; - text-align: center; - line-height: 2.2em; - font-size: 1.2em; -} - -dd.lastpost { - width: 25%; - font-size: 1.1em; -} - -dd.redirect { - font-size: 1.1em; - line-height: 2.5em; -} - -dd.moderation { - font-size: 1.1em; -} - -dd.lastpost span, ul.topiclist dd.searchby span, ul.topiclist dd.info span, ul.topiclist dd.time span, dd.redirect span, dd.moderation span { - display: block; - padding-left: 5px; -} - -dd.time { - width: auto; - line-height: 200%; - font-size: 1.1em; -} - -dd.extra { - width: 12%; - line-height: 200%; - text-align: center; - font-size: 1.1em; -} - -dd.mark { - float: right !important; - width: 9%; - text-align: center; - line-height: 200%; - font-size: 1.2em; -} - -dd.info { - width: 30%; -} - -dd.option { - width: 15%; - line-height: 200%; - text-align: center; - font-size: 1.1em; -} - -dd.searchby { - width: 47%; - font-size: 1.1em; - line-height: 1em; -} - -ul.topiclist dd.searchextra { - margin-left: 5px; - padding: 0.2em 0; - font-size: 1.1em; - color: #333333; - border-left: none; - clear: both; - width: 98%; - overflow: hidden; -} - -/* Container for post/reply buttons and pagination */ -.topic-actions { - margin-bottom: 3px; - font-size: 1.1em; - height: 28px; - min-height: 28px; -} -div[class].topic-actions { - height: auto; -} - -/* Post body styles -----------------------------------------*/ -.postbody { - padding: 0; - line-height: 1.48em; - color: #333333; - width: 76%; - float: left; - clear: both; -} - -.postbody .ignore { - font-size: 1.1em; -} - -.postbody h3.first { - /* The first post on the page uses this */ - font-size: 1.7em; -} - -.postbody h3 { - /* Postbody requires a different h3 format - so change it here */ - font-size: 1.5em; - padding: 2px 0 0 0; - margin: 0 0 0.3em 0 !important; - text-transform: none; - border: none; - font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; - line-height: 125%; -} - -.postbody h3 img { - /* Also see tweaks.css */ - vertical-align: bottom; -} - -.postbody .content { - font-size: 1.3em; -} - -.search .postbody { - width: 68% -} - -/* Topic review panel -----------------------------------------*/ -#review { - margin-top: 2em; -} - -#topicreview { - padding-right: 5px; - overflow: auto; - height: 300px; -} - -#topicreview .postbody { - width: auto; - float: none; - margin: 0; - height: auto; -} - -#topicreview .post { - height: auto; -} - -#topicreview h2 { - border-bottom-width: 0; -} - -/* Content container styles -----------------------------------------*/ -.content { - min-height: 3em; - overflow: hidden; - line-height: 1.4em; - font-family: "Lucida Grande", "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; - font-size: 1em; - color: #333333; -} - -.content h2, .panel h2 { - font-weight: normal; - color: #989898; - border-bottom: 1px solid #CCCCCC; - font-size: 1.6em; - margin-top: 0.5em; - margin-bottom: 0.5em; - padding-bottom: 0.5em; -} - -.panel h3 { - margin: 0.5em 0; -} - -.panel p { - font-size: 1.2em; - margin-bottom: 1em; - line-height: 1.4em; -} - -.content p { - font-family: "Lucida Grande", "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; - font-size: 1.2em; - margin-bottom: 1em; - line-height: 1.4em; -} - -dl.faq { - font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - font-size: 1.1em; - margin-top: 1em; - margin-bottom: 2em; - line-height: 1.4em; -} - -dl.faq dt { - font-weight: bold; - color: #333333; -} - -.content dl.faq { - font-size: 1.2em; - margin-bottom: 0.5em; -} - -.content li { - list-style-type: inherit; -} - -.content ul, .content ol { - margin-bottom: 1em; - margin-left: 3em; -} - -.posthilit { - background-color: #f3f3f3; - color: #BCBCBC; - padding: 0 2px 1px 2px; -} - -.announce, .unreadpost { - /* Highlight the announcements & unread posts box */ - border-left-color: #BCBCBC; - border-right-color: #BCBCBC; -} - -/* Post author */ -p.author { - margin: 0 15em 0.6em 0; - padding: 0 0 5px 0; - font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 1em; - line-height: 1.2em; -} - -/* Post signature */ -.signature { - margin-top: 1.5em; - padding-top: 0.2em; - font-size: 1.1em; - border-top: 1px solid #CCCCCC; - clear: left; - line-height: 140%; - overflow: hidden; - width: 100%; -} - -dd .signature { - margin: 0; - padding: 0; - clear: none; - border: none; -} - -/* Post noticies */ -.notice { - font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - width: auto; - margin-top: 1.5em; - padding-top: 0.2em; - font-size: 1em; - border-top: 1px dashed #CCCCCC; - clear: left; - line-height: 130%; -} - -/* Jump to post link for now */ -ul.searchresults { - list-style: none; - text-align: right; - clear: both; -} - -/* BB Code styles -----------------------------------------*/ -/* Quote block */ -blockquote { - background: #ebebeb none 6px 8px no-repeat; - border: 1px solid #dbdbdb; - font-size: 0.95em; - margin: 0.5em 1px 0 25px; - overflow: hidden; - padding: 5px; -} - -blockquote blockquote { - /* Nested quotes */ - background-color: #bababa; - font-size: 1em; - margin: 0.5em 1px 0 15px; -} - -blockquote blockquote blockquote { - /* Nested quotes */ - background-color: #e4e4e4; -} - -blockquote cite { - /* Username/source of quoter */ - font-style: normal; - font-weight: bold; - margin-left: 20px; - display: block; - font-size: 0.9em; -} - -blockquote cite cite { - font-size: 1em; -} - -blockquote.uncited { - padding-top: 25px; -} - -/* Code block */ -dl.codebox { - padding: 3px; - background-color: #FFFFFF; - border: 1px solid #d8d8d8; - font-size: 1em; -} - -dl.codebox dt { - text-transform: uppercase; - border-bottom: 1px solid #CCCCCC; - margin-bottom: 3px; - font-size: 0.8em; - font-weight: bold; - display: block; -} - -blockquote dl.codebox { - margin-left: 0; -} - -dl.codebox code { - /* Also see tweaks.css */ - overflow: auto; - display: block; - height: auto; - max-height: 200px; - white-space: normal; - padding-top: 5px; - font: 0.9em Monaco, "Andale Mono","Courier New", Courier, mono; - line-height: 1.3em; - color: #8b8b8b; - margin: 2px 0; -} - -.syntaxbg { color: #FFFFFF; } -.syntaxcomment { color: #000000; } -.syntaxdefault { color: #bcbcbc; } -.syntaxhtml { color: #000000; } -.syntaxkeyword { color: #585858; } -.syntaxstring { color: #a7a7a7; } - -/* Attachments -----------------------------------------*/ -.attachbox { - float: left; - width: auto; - margin: 5px 5px 5px 0; - padding: 6px; - background-color: #FFFFFF; - border: 1px dashed #d8d8d8; - clear: left; -} - -.pm-message .attachbox { - background-color: #f3f3f3; -} - -.attachbox dt { - font-family: Arial, Helvetica, sans-serif; - text-transform: uppercase; -} - -.attachbox dd { - margin-top: 4px; - padding-top: 4px; - clear: left; - border-top: 1px solid #d8d8d8; -} - -.attachbox dd dd { - border: none; -} - -.attachbox p { - line-height: 110%; - color: #666666; - font-weight: normal; - clear: left; -} - -.attachbox p.stats -{ - line-height: 110%; - color: #666666; - font-weight: normal; - clear: left; -} - -.attach-image { - margin: 3px 0; - width: 100%; - max-height: 350px; - overflow: auto; -} - -.attach-image img { - border: 1px solid #999999; -/* cursor: move; */ - cursor: default; -} - -/* Inline image thumbnails */ -div.inline-attachment dl.thumbnail, div.inline-attachment dl.file { - display: block; - margin-bottom: 4px; -} - -div.inline-attachment p { - font-size: 100%; -} - -dl.file { - font-family: Verdana, Arial, Helvetica, sans-serif; - display: block; -} - -dl.file dt { - text-transform: none; - margin: 0; - padding: 0; - font-weight: bold; - font-family: Verdana, Arial, Helvetica, sans-serif; -} - -dl.file dd { - color: #666666; - margin: 0; - padding: 0; -} - -dl.thumbnail img { - padding: 3px; - border: 1px solid #666666; - background-color: #FFF; -} - -dl.thumbnail dd { - color: #666666; - font-style: italic; - font-family: Verdana, Arial, Helvetica, sans-serif; -} - -.attachbox dl.thumbnail dd { - font-size: 100%; -} - -dl.thumbnail dt a:hover { - background-color: #EEEEEE; -} - -dl.thumbnail dt a:hover img { - border: 1px solid #d2d2d2; -} - -/* Post poll styles -----------------------------------------*/ -fieldset.polls { - font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; -} - -fieldset.polls dl { - margin-top: 5px; - border-top: 1px solid #e2e2e2; - padding: 5px 0 0 0; - line-height: 120%; - color: #666666; -} - -fieldset.polls dl.voted { - font-weight: bold; - color: #000000; -} - -fieldset.polls dt { - text-align: left; - float: left; - display: block; - width: 30%; - border-right: none; - padding: 0; - margin: 0; - font-size: 1.1em; -} - -fieldset.polls dd { - float: left; - width: 10%; - border-left: none; - padding: 0 5px; - margin-left: 0; - font-size: 1.1em; -} - -fieldset.polls dd.resultbar { - width: 50%; -} - -fieldset.polls dd input { - margin: 2px 0; -} - -fieldset.polls dd div { - text-align: right; - font-family: Arial, Helvetica, sans-serif; - color: #FFFFFF; - font-weight: bold; - padding: 0 2px; - overflow: visible; - min-width: 2%; -} - -.pollbar1 { - background-color: #aaaaaa; - border-bottom: 1px solid #747474; - border-right: 1px solid #747474; -} - -.pollbar2 { - background-color: #bebebe; - border-bottom: 1px solid #8c8c8c; - border-right: 1px solid #8c8c8c; -} - -.pollbar3 { - background-color: #D1D1D1; - border-bottom: 1px solid #aaaaaa; - border-right: 1px solid #aaaaaa; -} - -.pollbar4 { - background-color: #e4e4e4; - border-bottom: 1px solid #bebebe; - border-right: 1px solid #bebebe; -} - -.pollbar5 { - background-color: #f8f8f8; - border-bottom: 1px solid #D1D1D1; - border-right: 1px solid #D1D1D1; -} - -/* Poster profile block -----------------------------------------*/ -.postprofile { - /* Also see tweaks.css */ - margin: 5px 0 10px 0; - min-height: 80px; - color: #666666; - border-left: 1px solid #FFFFFF; - width: 22%; - float: right; - display: inline; -} -.pm .postprofile { - border-left: 1px solid #DDDDDD; -} - -.postprofile dd, .postprofile dt { - line-height: 1.2em; - margin-left: 8px; -} - -.postprofile strong { - font-weight: normal; - color: #000000; -} - -.avatar { - border: none; - margin-bottom: 3px; -} - -.online { - background-image: none; - background-position: 100% 0; - background-repeat: no-repeat; -} - -/* Poster profile used by search*/ -.search .postprofile { - width: 30%; -} - -/* pm list in compose message if mass pm is enabled */ -dl.pmlist dt { - width: 60% !important; -} - -dl.pmlist dt textarea { - width: 95%; -} - -dl.pmlist dd { - margin-left: 61% !important; - margin-bottom: 2px; -} diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css deleted file mode 100644 index fa8899bae8..0000000000 --- a/phpBB/styles/prosilver/theme/cp.css +++ /dev/null @@ -1,424 +0,0 @@ -/* proSilver Control Panel Styles ----------------------------------------- */ - - -/* Main CP box -----------------------------------------*/ -#cp-menu { - float:left; - width: 19%; - margin-top: 1em; - margin-bottom: 5px; -} - -#cp-main { - float: left; - width: 81%; -} - -#cp-main .content { - padding: 0; -} - -#cp-main h3, #cp-main hr, #cp-menu hr { - border-color: #bfbfbf; -} - -#cp-main .panel p { - font-size: 1.1em; -} - -#cp-main .panel ol { - margin-left: 2em; - font-size: 1.1em; -} - -#cp-main .panel li.row { - border-bottom: 1px solid #cbcbcb; - border-top: 1px solid #F9F9F9; -} - -ul.cplist { - margin-bottom: 5px; - border-top: 1px solid #cbcbcb; -} - -#cp-main .panel li.header dd, #cp-main .panel li.header dt { - color: #000000; - margin-bottom: 2px; -} - -#cp-main table.table1 { - margin-bottom: 1em; -} - -#cp-main table.table1 thead th { - color: #333333; - font-weight: bold; - border-bottom: 1px solid #333333; - padding: 5px; -} - -#cp-main table.table1 tbody th { - font-style: italic; - background-color: transparent !important; - border-bottom: none; -} - -#cp-main .pagination { - float: right; - width: auto; - padding-top: 1px; -} - -#cp-main .postbody p { - font-size: 1.1em; -} - -#cp-main .pm-message { - border: 1px solid #e2e2e2; - margin: 10px 0; - background-color: #FFFFFF; - width: auto; - float: none; -} - -.pm-message h2 { - padding-bottom: 5px; -} - -#cp-main .postbody h3, #cp-main .box2 h3 { - margin-top: 0; -} - -#cp-main .buttons { - margin-left: 0; -} - -#cp-main ul.linklist { - margin: 0; -} - -/* MCP Specific tweaks */ -.mcp-main .postbody { - width: 100%; -} - -/* CP tabbed menu -----------------------------------------*/ -#tabs { - line-height: normal; - margin: 20px 0 -1px 7px; - min-width: 570px; -} - -#tabs ul { - margin:0; - padding: 0; - list-style: none; -} - -#tabs li { - display: inline; - margin: 0; - padding: 0; - font-size: 1em; - font-weight: bold; -} - -#tabs a { - float: left; - background: none no-repeat 0% -35px; - margin: 0 1px 0 0; - padding: 0 0 0 5px; - text-decoration: none; - position: relative; - cursor: pointer; -} - -#tabs a span { - float: left; - display: block; - background: none no-repeat 100% -35px; - padding: 6px 10px 6px 5px; - color: #828282; - white-space: nowrap; -} - -#tabs a:hover span { - color: #bcbcbc; -} - -#tabs .activetab a { - background-position: 0 0; - border-bottom: 1px solid #ebebeb; -} - -#tabs .activetab a span { - background-position: 100% 0; - padding-bottom: 7px; - color: #333333; -} - -#tabs a:hover { - background-position: 0 -70px; -} - -#tabs a:hover span { - background-position:100% -70px; -} - -#tabs .activetab a:hover { - background-position: 0 0; -} - -#tabs .activetab a:hover span { - color: #000000; - background-position: 100% 0; -} - -/* Mini tabbed menu used in MCP -----------------------------------------*/ -#minitabs { - line-height: normal; - margin: -20px 7px 0 0; -} - -#minitabs ul { - margin:0; - padding: 0; - list-style: none; -} - -#minitabs li { - display: block; - float: right; - padding: 0 10px 4px 10px; - font-size: 1em; - font-weight: bold; - background-color: #f2f2f2; - margin-left: 2px; -} - -#minitabs a { -} - -#minitabs a:hover { - text-decoration: none; -} - -#minitabs li.activetab { - background-color: #F9F9F9; -} - -#minitabs li.activetab a, #minitabs li.activetab a:hover { - color: #333333; -} - -/* UCP navigation menu -----------------------------------------*/ -/* Container for sub-navigation list */ -#navigation { - width: 100%; - padding-top: 36px; -} - -#navigation ul { - list-style:none; -} - -/* Default list state */ -#navigation li { - margin: 1px 0; - padding: 0; - font-weight: bold; - display: inline; -} - -/* Link styles for the sub-section links */ -#navigation a { - display: block; - padding: 5px; - margin: 1px 0; - text-decoration: none; - font-weight: bold; - color: #333; - background: #cfcfcf none repeat-y 100% 0; -} - -#navigation a:hover { - text-decoration: none; - background-color: #c6c6c6; - color: #bcbcbc; - background-image: none; -} - -#navigation #active-subsection a { - display: block; - color: #d3d3d3; - background-color: #F9F9F9; - background-image: none; -} - -#navigation #active-subsection a:hover { - color: #d3d3d3; -} - -/* Preferences pane layout -----------------------------------------*/ -#cp-main h2 { - border-bottom: none; - padding: 0; - margin-left: 10px; - color: #333333; -} - -#cp-main .panel { - background-color: #F9F9F9; -} - -#cp-main .pm { - background-color: #FFFFFF; -} - -#cp-main span.corners-top, #cp-menu span.corners-top { - background-image: none; -} - -#cp-main span.corners-top span, #cp-menu span.corners-top span { - background-image: none; -} - -#cp-main span.corners-bottom, #cp-menu span.corners-bottom { - background-image: none; -} - -#cp-main span.corners-bottom span, #cp-menu span.corners-bottom span { - background-image: none; -} - -/* Topicreview */ -#cp-main .panel #topicreview span.corners-top, #cp-menu .panel #topicreview span.corners-top { - background-image: none; -} - -#cp-main .panel #topicreview span.corners-top span, #cp-menu .panel #topicreview span.corners-top span { - background-image: none; -} - -#cp-main .panel #topicreview span.corners-bottom, #cp-menu .panel #topicreview span.corners-bottom { - background-image: none; -} - -#cp-main .panel #topicreview span.corners-bottom span, #cp-menu .panel #topicreview span.corners-bottom span { - background-image: none; -} - -/* Friends list */ -.cp-mini { - background-color: #f9f9f9; - padding: 0 5px; - margin: 10px 15px 10px 5px; -} - -.cp-mini span.corners-top, .cp-mini span.corners-bottom { - margin: 0 -5px; -} - -dl.mini dt { - font-weight: bold; - color: #676767; -} - -dl.mini dd { - padding-top: 4px; -} - -.friend-online { - font-weight: bold; -} - -.friend-offline { - font-style: italic; -} - -/* PM Styles -----------------------------------------*/ -#pm-menu { - line-height: 2.5em; -} - -/* PM Message history */ -.current { - color: #999999; -} - -/* Defined rules list for PM options */ -ol.def-rules { - padding-left: 0; -} - -ol.def-rules li { - line-height: 180%; - padding: 1px; -} - -/* PM marking colours */ -.pmlist li.bg1 { - border: solid 3px transparent; - border-width: 0 3px; -} - -.pmlist li.bg2 { - border: solid 3px transparent; - border-width: 0 3px; -} - -.pmlist li.pm_message_reported_colour, .pm_message_reported_colour { - border-left-color: #bcbcbc; - border-right-color: #bcbcbc; -} - -.pmlist li.pm_marked_colour, .pm_marked_colour { - border: solid 3px #ffffff; - border-width: 0 3px; -} - -.pmlist li.pm_replied_colour, .pm_replied_colour { - border: solid 3px #c2c2c2; - border-width: 0 3px; -} - -.pmlist li.pm_friend_colour, .pm_friend_colour { - border: solid 3px #bdbdbd; - border-width: 0 3px; -} - -.pmlist li.pm_foe_colour, .pm_foe_colour { - border: solid 3px #000000; - border-width: 0 3px; -} - -.pm-legend { - border-left-width: 10px; - border-left-style: solid; - border-right-width: 0; - margin-bottom: 3px; - padding-left: 3px; -} - -/* Avatar gallery */ -#gallery label { - position: relative; - float: left; - margin: 10px; - padding: 5px; - width: auto; - background: #FFFFFF; - border: 1px solid #CCC; - text-align: center; -} - -#gallery label:hover { - background-color: #EEE; -} diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css deleted file mode 100644 index a280218e75..0000000000 --- a/phpBB/styles/prosilver/theme/forms.css +++ /dev/null @@ -1,384 +0,0 @@ -/* proSilver Form Styles ----------------------------------------- */ - -/* General form styles -----------------------------------------*/ -fieldset { - border-width: 0; - font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 1.1em; -} - -input { - font-weight: normal; - cursor: pointer; - vertical-align: middle; - padding: 0 3px; - font-size: 1em; - font-family: Verdana, Helvetica, Arial, sans-serif; -} - -select { - font-family: Verdana, Helvetica, Arial, sans-serif; - font-weight: normal; - cursor: pointer; - vertical-align: middle; - border: 1px solid #666666; - padding: 1px; - background-color: #FAFAFA; -} - -option { - padding-right: 1em; -} - -option.disabled-option { - color: graytext; -} - -textarea { - font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - width: 60%; - padding: 2px; - font-size: 1em; - line-height: 1.4em; -} - -label { - cursor: default; - padding-right: 5px; - color: #676767; -} - -label input { - vertical-align: middle; -} - -label img { - vertical-align: middle; -} - -/* Definition list layout for forms ----------------------------------------- */ -fieldset dl { - padding: 4px 0; -} - -fieldset dt { - float: left; - width: 40%; - text-align: left; - display: block; -} - -fieldset dd { - margin-left: 41%; - vertical-align: top; - margin-bottom: 3px; -} - -/* Specific layout 1 */ -fieldset.fields1 dt { - width: 15em; - border-right-width: 0; -} - -fieldset.fields1 dd { - margin-left: 15em; - border-left-width: 0; -} - -fieldset.fields1 { - background-color: transparent; -} - -fieldset.fields1 div { - margin-bottom: 3px; -} - -/* Specific layout 2 */ -fieldset.fields2 dt { - width: 15em; - border-right-width: 0; -} - -fieldset.fields2 dd { - margin-left: 16em; - border-left-width: 0; -} - -/* Form elements */ -dt label { - font-weight: bold; - text-align: left; -} - -dd label { - white-space: nowrap; - color: #333; -} - -dd input, dd textarea { - margin-right: 3px; -} - -dd select { - width: auto; -} - -dd textarea { - width: 85%; -} - -/* Hover effects */ -fieldset dl:hover dt label { - color: #000000; -} - -fieldset.fields2 dl:hover dt label { - color: inherit; -} - -#timezone { - width: 95%; -} - -* html #timezone { - width: 50%; -} - -/* Quick-login on index page */ -fieldset.quick-login { - margin-top: 5px; -} - -fieldset.quick-login input { - width: auto; -} - -fieldset.quick-login input.inputbox { - width: 15%; - vertical-align: middle; - margin-right: 5px; - background-color: #f3f3f3; -} - -fieldset.quick-login label { - white-space: nowrap; - padding-right: 2px; -} - -/* Display options on viewtopic/viewforum pages */ -fieldset.display-options { - text-align: center; - margin: 3px 0 5px 0; -} - -fieldset.display-options label { - white-space: nowrap; - padding-right: 2px; -} - -fieldset.display-options a { - margin-top: 3px; -} - -/* Display actions for ucp and mcp pages */ -fieldset.display-actions { - text-align: right; - line-height: 2em; - white-space: nowrap; - padding-right: 1em; -} - -fieldset.display-actions label { - white-space: nowrap; - padding-right: 2px; -} - -fieldset.sort-options { - line-height: 2em; -} - -/* MCP forum selection*/ -fieldset.forum-selection { - margin: 5px 0 3px 0; - float: right; -} - -fieldset.forum-selection2 { - margin: 13px 0 3px 0; - float: right; -} - -/* Jumpbox */ -fieldset.jumpbox { - text-align: right; - margin-top: 15px; - height: 2.5em; -} - -fieldset.quickmod { - width: 50%; - float: right; - text-align: right; - height: 2.5em; -} - -/* Submit button fieldset */ -fieldset.submit-buttons { - text-align: center; - vertical-align: middle; - margin: 5px 0; -} - -fieldset.submit-buttons input { - vertical-align: middle; - padding-top: 3px; - padding-bottom: 3px; -} - -/* Posting page styles -----------------------------------------*/ - -/* Buttons used in the editor */ -#format-buttons { - margin: 15px 0 2px 0; -} - -#format-buttons input, #format-buttons select { - vertical-align: middle; -} - -/* Main message box */ -#message-box { - width: 80%; -} - -#message-box textarea { - font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; - width: 100%; - font-size: 1.2em; - color: #333333; -} - -/* Emoticons panel */ -#smiley-box { - width: 18%; - float: right; -} - -#smiley-box img { - margin: 3px; -} - -/* Input field styles ----------------------------------------- */ -.inputbox { - background-color: #FFFFFF; - border: 1px solid #c0c0c0; - color: #333333; - padding: 2px; - cursor: text; -} - -.inputbox:hover { - border: 1px solid #eaeaea; -} - -.inputbox:focus { - border: 1px solid #eaeaea; - color: #4b4b4b; -} - -input.inputbox { width: 85%; } -input.medium { width: 50%; } -input.narrow { width: 25%; } -input.tiny { width: 125px; } - -textarea.inputbox { - width: 85%; -} - -.autowidth { - width: auto !important; -} - -/* Form button styles ----------------------------------------- */ -input.button1, input.button2 { - font-size: 1em; -} - -a.button1, input.button1, input.button3, a.button2, input.button2 { - width: auto !important; - padding-top: 1px; - padding-bottom: 1px; - font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - color: #000; - background: #FAFAFA none repeat-x top; -} - -a.button1, input.button1 { - font-weight: bold; - border: 1px solid #666666; -} - -input.button3 { - padding: 0; - margin: 0; - line-height: 5px; - height: 12px; - background-image: none; - font-variant: small-caps; -} - -/* Alternative button */ -a.button2, input.button2, input.button3 { - border: 1px solid #666666; -} - -/* button in the style of the form buttons */ -a.button1, a.button1:link, a.button1:visited, a.button1:active, a.button2, a.button2:link, a.button2:visited, a.button2:active { - text-decoration: none; - color: #000000; - padding: 2px 8px; - line-height: 250%; - vertical-align: text-bottom; - background-position: 0 1px; -} - -/* Hover states */ -a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover, input.button3:hover { - border: 1px solid #BCBCBC; - background-position: 0 100%; - color: #BCBCBC; -} - -input.disabled { - font-weight: normal; - color: #666666; -} - -/* Topic and forum Search */ -.search-box { - margin-top: 3px; - margin-left: 5px; - float: left; -} - -.search-box input { -} - -input.search { - background-image: none; - background-repeat: no-repeat; - background-position: left 1px; - padding-left: 17px; -} - -.full { width: 95%; } -.medium { width: 50%;} -.narrow { width: 25%;} -.tiny { width: 10%;} - diff --git a/phpBB/styles/prosilver/theme/images/arrow_down.gif b/phpBB/styles/prosilver/theme/images/arrow_down.gif deleted file mode 100644 index e45c365ecc..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/arrow_down.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/arrow_left.gif b/phpBB/styles/prosilver/theme/images/arrow_left.gif deleted file mode 100644 index 076a5596f1..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/arrow_left.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/arrow_right.gif b/phpBB/styles/prosilver/theme/images/arrow_right.gif deleted file mode 100644 index c5827a401f..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/arrow_right.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/arrow_up.gif b/phpBB/styles/prosilver/theme/images/arrow_up.gif deleted file mode 100644 index 38b5a62c17..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/arrow_up.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/bg_button.gif b/phpBB/styles/prosilver/theme/images/bg_button.gif deleted file mode 100644 index 03172ff5c6..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/bg_button.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/bg_header.gif b/phpBB/styles/prosilver/theme/images/bg_header.gif deleted file mode 100644 index 351de9f46a..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/bg_header.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/bg_list.gif b/phpBB/styles/prosilver/theme/images/bg_list.gif deleted file mode 100644 index 89f8963fde..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/bg_list.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/bg_menu.gif b/phpBB/styles/prosilver/theme/images/bg_menu.gif deleted file mode 100644 index 4a9f5a9174..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/bg_menu.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/bg_tabs1.gif b/phpBB/styles/prosilver/theme/images/bg_tabs1.gif deleted file mode 100644 index 335a72c711..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/bg_tabs1.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/bg_tabs2.gif b/phpBB/styles/prosilver/theme/images/bg_tabs2.gif deleted file mode 100644 index a2142d5432..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/bg_tabs2.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/corners_left.gif b/phpBB/styles/prosilver/theme/images/corners_left.gif deleted file mode 100644 index 206e50368d..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/corners_left.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/corners_left.png b/phpBB/styles/prosilver/theme/images/corners_left.png deleted file mode 100644 index 256bde3daa..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/corners_left.png and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/corners_left2.gif b/phpBB/styles/prosilver/theme/images/corners_left2.gif deleted file mode 100644 index fa27ce3ba2..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/corners_left2.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/corners_right.gif b/phpBB/styles/prosilver/theme/images/corners_right.gif deleted file mode 100644 index 0ba66d50b2..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/corners_right.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/corners_right.png b/phpBB/styles/prosilver/theme/images/corners_right.png deleted file mode 100644 index df41823b4c..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/corners_right.png and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/corners_right2.gif b/phpBB/styles/prosilver/theme/images/corners_right2.gif deleted file mode 100644 index 2d689446ee..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/corners_right2.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/created_by.jpg b/phpBB/styles/prosilver/theme/images/created_by.jpg deleted file mode 100644 index 68d56e2013..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/created_by.jpg and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/gradient.gif b/phpBB/styles/prosilver/theme/images/gradient.gif deleted file mode 100644 index 21dc11f13b..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/gradient.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_bookmark.gif b/phpBB/styles/prosilver/theme/images/icon_bookmark.gif deleted file mode 100644 index 2644293f7d..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_bookmark.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_bump.gif b/phpBB/styles/prosilver/theme/images/icon_bump.gif deleted file mode 100644 index 014cd9bd15..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_bump.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_faq.gif b/phpBB/styles/prosilver/theme/images/icon_faq.gif deleted file mode 100644 index 4e26460629..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_faq.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_fontsize.gif b/phpBB/styles/prosilver/theme/images/icon_fontsize.gif deleted file mode 100644 index 1c7d83527c..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_fontsize.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_home.gif b/phpBB/styles/prosilver/theme/images/icon_home.gif deleted file mode 100644 index 8ae9004534..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_home.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_logout.gif b/phpBB/styles/prosilver/theme/images/icon_logout.gif deleted file mode 100644 index b8ad5c4e5c..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_logout.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_members.gif b/phpBB/styles/prosilver/theme/images/icon_members.gif deleted file mode 100644 index 48e3e5f5f3..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_members.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_pages.gif b/phpBB/styles/prosilver/theme/images/icon_pages.gif deleted file mode 100644 index 44cc34500e..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_pages.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_print.gif b/phpBB/styles/prosilver/theme/images/icon_print.gif deleted file mode 100644 index a71dfdde70..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_print.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_register.gif b/phpBB/styles/prosilver/theme/images/icon_register.gif deleted file mode 100644 index 9ecf126c4f..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_register.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_search.gif b/phpBB/styles/prosilver/theme/images/icon_search.gif deleted file mode 100644 index 8492cd308c..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_search.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_sendemail.gif b/phpBB/styles/prosilver/theme/images/icon_sendemail.gif deleted file mode 100644 index f6b8aa10e1..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_sendemail.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_subscribe.gif b/phpBB/styles/prosilver/theme/images/icon_subscribe.gif deleted file mode 100644 index 5ca18af80a..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_subscribe.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_textbox_search.gif b/phpBB/styles/prosilver/theme/images/icon_textbox_search.gif deleted file mode 100644 index b3b51d8425..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_textbox_search.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_ucp.gif b/phpBB/styles/prosilver/theme/images/icon_ucp.gif deleted file mode 100644 index 2a5fcc3f0c..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_ucp.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/icon_unsubscribe.gif b/phpBB/styles/prosilver/theme/images/icon_unsubscribe.gif deleted file mode 100644 index 27013fc1cb..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/icon_unsubscribe.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/index.htm b/phpBB/styles/prosilver/theme/images/index.htm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/phpBB/styles/prosilver/theme/images/no_avatar.gif b/phpBB/styles/prosilver/theme/images/no_avatar.gif deleted file mode 100644 index 80539c8c71..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/no_avatar.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/images/quote.gif b/phpBB/styles/prosilver/theme/images/quote.gif deleted file mode 100644 index d1992273e6..0000000000 Binary files a/phpBB/styles/prosilver/theme/images/quote.gif and /dev/null differ diff --git a/phpBB/styles/prosilver/theme/index.htm b/phpBB/styles/prosilver/theme/index.htm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/phpBB/styles/prosilver/theme/large.css b/phpBB/styles/prosilver/theme/large.css deleted file mode 100644 index dfb1d2c2e6..0000000000 --- a/phpBB/styles/prosilver/theme/large.css +++ /dev/null @@ -1,3 +0,0 @@ -body { - font-size: 12px; -} \ No newline at end of file diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css deleted file mode 100644 index 4c4ccd31a9..0000000000 --- a/phpBB/styles/prosilver/theme/links.css +++ /dev/null @@ -1,199 +0,0 @@ -/* proSilver Link Styles ----------------------------------------- */ - -a:link { color: #898989; text-decoration: none; } -a:visited { color: #898989; text-decoration: none; } -a:hover { color: #d3d3d3; text-decoration: underline; } -a:active { color: #d2d2d2; text-decoration: none; } - -/* Coloured usernames */ -.username-coloured { - font-weight: bold; - display: inline !important; -} - -/* Links on gradient backgrounds */ -#search-box a:link, .navbg a:link, .forumbg .header a:link, .forabg .header a:link, th a:link { - color: #FFFFFF; - text-decoration: none; -} - -#search-box a:visited, .navbg a:visited, .forumbg .header a:visited, .forabg .header a:visited, th a:visited { - color: #FFFFFF; - text-decoration: none; -} - -#search-box a:hover, .navbg a:hover, .forumbg .header a:hover, .forabg .header a:hover, th a:hover { - color: #ffffff; - text-decoration: underline; -} - -#search-box a:active, .navbg a:active, .forumbg .header a:active, .forabg .header a:active, th a:active { - color: #ffffff; - text-decoration: none; -} - -/* Links for forum/topic lists */ -a.forumtitle { - font-family: "Trebuchet MS", Helvetica, Arial, Sans-serif; - font-size: 1.2em; - font-weight: bold; - color: #898989; - text-decoration: none; -} - -/* a.forumtitle:visited { color: #898989; } */ - -a.forumtitle:hover { - color: #bcbcbc; - text-decoration: underline; -} - -a.forumtitle:active { - color: #898989; -} - -a.topictitle { - font-family: "Trebuchet MS", Helvetica, Arial, Sans-serif; - font-size: 1.2em; - font-weight: bold; - color: #898989; - text-decoration: none; -} - -/* a.topictitle:visited { color: #d2d2d2; } */ - -a.topictitle:hover { - color: #bcbcbc; - text-decoration: underline; -} - -a.topictitle:active { - color: #898989; -} - -/* Post body links */ -.postlink { - text-decoration: none; - color: #d2d2d2; - border-bottom: 1px solid #d2d2d2; - padding-bottom: 0; -} - -.postlink:visited { - color: #bdbdbd; - border-bottom-style: dotted; - border-bottom-color: #666666; -} - -.postlink:active { - color: #d2d2d2; -} - -.postlink:hover { - background-color: #f6f6f6; - text-decoration: none; - color: #404040; -} - -.signature a, .signature a:visited, .signature a:active, .signature a:hover { - border: none; - text-decoration: underline; - background-color: transparent; -} - -/* Profile links */ -.postprofile a:link, .postprofile a:active, .postprofile a:visited, .postprofile dt.author a { - font-weight: bold; - color: #898989; - text-decoration: none; -} - -.postprofile a:hover, .postprofile dt.author a:hover { - text-decoration: underline; - color: #d3d3d3; -} - - -/* Profile searchresults */ -.search .postprofile a { - color: #898989; - text-decoration: none; - font-weight: normal; -} - -.search .postprofile a:hover { - color: #d3d3d3; - text-decoration: underline; -} - -/* Back to top of page */ -.back2top { - clear: both; - height: 11px; - text-align: right; -} - -a.top { - background: none no-repeat top left; - text-decoration: none; - width: {IMG_ICON_BACK_TOP_WIDTH}px; - height: {IMG_ICON_BACK_TOP_HEIGHT}px; - display: block; - float: right; - overflow: hidden; - letter-spacing: 1000px; - text-indent: 11px; -} - -a.top2 { - background: none no-repeat 0 50%; - text-decoration: none; - padding-left: 15px; -} - -/* Arrow links */ -a.up { background: none no-repeat left center; } -a.down { background: none no-repeat right center; } -a.left { background: none no-repeat 3px 60%; } -a.right { background: none no-repeat 95% 60%; } - -a.up, a.up:link, a.up:active, a.up:visited { - padding-left: 10px; - text-decoration: none; - border-bottom-width: 0; -} - -a.up:hover { - background-position: left top; - background-color: transparent; -} - -a.down, a.down:link, a.down:active, a.down:visited { - padding-right: 10px; -} - -a.down:hover { - background-position: right bottom; - text-decoration: none; -} - -a.left, a.left:active, a.left:visited { - padding-left: 12px; -} - -a.left:hover { - color: #d2d2d2; - text-decoration: none; - background-position: 0 60%; -} - -a.right, a.right:active, a.right:visited { - padding-right: 12px; -} - -a.right:hover { - color: #d2d2d2; - text-decoration: none; - background-position: 100% 60%; -} diff --git a/phpBB/styles/prosilver/theme/medium.css b/phpBB/styles/prosilver/theme/medium.css deleted file mode 100644 index 4c992f9fd8..0000000000 --- a/phpBB/styles/prosilver/theme/medium.css +++ /dev/null @@ -1,3 +0,0 @@ -body { - font-size: 11px; -} \ No newline at end of file diff --git a/phpBB/styles/prosilver/theme/normal.css b/phpBB/styles/prosilver/theme/normal.css deleted file mode 100644 index d0783d1882..0000000000 --- a/phpBB/styles/prosilver/theme/normal.css +++ /dev/null @@ -1,3 +0,0 @@ -body { - font-size: 10px; -} \ No newline at end of file diff --git a/phpBB/styles/prosilver/theme/print.css b/phpBB/styles/prosilver/theme/print.css deleted file mode 100644 index 3143b3cf9b..0000000000 --- a/phpBB/styles/prosilver/theme/print.css +++ /dev/null @@ -1,129 +0,0 @@ -/* proSilver Print Style Sheet -------------------------------------------------- - Author: subBlue ( http://www.subBlue.com/ ) - Version: 25 August 2004 - - Copyright 2004 phpBB Group --------------------------------------------------*/ - - -/* Lots still TODO here! */ - -/* General markup styles */ -* { - padding: 0; - margin: 0; -} - -body { - font: 11pt Verdana, Arial, Helvetica, sans-serif; - color:#000000; -} - -a:link { color: #000000; text-decoration: none; } -a:visited { color: #000000; text-decoration: none; } -a:active { color: #000000; text-decoration: none; } - -img, .noprint, #sub-header, #sub-footer, .navbar, .box1, .divider, .signature { display: none; } - -/* Container for the main body */ -#wrap { - margin: 0 2em; -} - -p { font-size: 85%; } -.copyright { font-size: 75%; } -.page-number { float:right; width: auto; text-align: right; font-size: 75%; } - -h1, h2, h3, h1 a, h2 a, h3 a { - font-family: "Trebuchet MS",georgia,Verdana,Sans-serif; - color: #000000; - background: none; - text-decoration: none; - font-weight: bold; -} - -h1 { font-size: 20pt; } -h2 { font-size: 16pt; margin-top: 1em; } -h3 { font-size: 14pt; margin-top: 1em; } - -.content { - font-size: 11pt; - line-height: 14pt; - margin-bottom: 1em; - font-family: "Lucida Grande", "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; - overflow: hidden; -} - -/* CSS2 Print tip from: http://www.alistapart.com/articles/goingtoprint/ */ -.postbody a:link, .postbody a:visited, .postbody a:active, .postbody a:hover { - text-decoration: underline; - padding: 0.1em 0.2em; - margin: -0.1em -0.2em; - color: #666; - background: none; - font-size: 100%; -} - -html>body .postbody a:link:after, html>body .postbody a:visited:after { - content: " (" attr(href) ") "; - font-size: 90%; - text-decoration: none; -} - -hr { - height: 1px; - background-color: #999999; - border-width: 0; -} - -.author { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 75%; - margin-bottom: 0.6em; -} - -.date { - font-family: Verdana, Arial, Helvetica, sans-serif; - float: right; - position: relative; - text-align: right; - font-size: 75%; -} - -/* Dont want to print url for names or titles in content area */ -.postbody .author a:link, .postbody .author a:visited, -html>body .postbody .author a:link:after, -html>body .postbody .author a:visited:after, -.postquote .quote-by a:link, .postquote .quote-by a:visited, -html>body .postquote .quote-by a:link:after, -html>body .postquote .quote-by a:visited:after, -html>body .postbody h1 a:link:after, html>body .postbody h2 a:link:after { - text-decoration: none; - content: ""; -} - -/* Poster profile */ -.postprofile { display: none; } -.grip-show { display:none; } - -/* Quote */ -.postquote { - font-size: 85%; - margin: 1em 18% 1em 4%; - padding: 0.5em; - position: relative; - line-height: 1.5em; - border: 1px #999999 solid; -} - -.postquote img { display: none; } -.postquote span { display: block; } -.postquote span .postquote { font-size: 100%; } -.quote-by { font-weight: bold; } - -/* Misc page elements */ -div.spacer { clear: both; } - -/* Accessibility tweaks: Mozilla.org */ -.skip_link { display: none; } diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css deleted file mode 100644 index c7db605bbb..0000000000 --- a/phpBB/styles/prosilver/theme/stylesheet.css +++ /dev/null @@ -1,19 +0,0 @@ -/* phpBB 3.0 Style Sheet - -------------------------------------------------------------- - Style name: proSilver - Based on style: proSilver (this is the default phpBB 3 style) - Original author: subBlue ( http://www.subBlue.com/ ) - Modified by: - - Copyright 2006 phpBB Group ( http://www.phpbb.com/ ) - -------------------------------------------------------------- -*/ - -@import url("common.css"); -@import url("links.css"); -@import url("content.css"); -@import url("buttons.css"); -@import url("cp.css"); -@import url("forms.css"); -@import url("tweaks.css"); -@import url("colours.css"); diff --git a/phpBB/styles/prosilver/theme/theme.cfg b/phpBB/styles/prosilver/theme/theme.cfg deleted file mode 100644 index 19fb8517b2..0000000000 --- a/phpBB/styles/prosilver/theme/theme.cfg +++ /dev/null @@ -1,35 +0,0 @@ -# -# phpBB Theme Configuration File -# -# @package phpBB3 -# @copyright (c) 2006 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License -# -# -# At the left is the name, please do not change this -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# -# Available and used values: -# parse_css_file -# - -# General Information about this theme -name = prosilver -copyright = © phpBB Group, 2007 -version = 3.0.0 - -# Some configuration options - -# -# You have to turn this option on if you want to use the -# path template variables ({T_IMAGESET_PATH} for example) within -# your css file. -# This is mostly the case if you want to use language specific -# images within your css file. -# -parse_css_file = 1 diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css deleted file mode 100644 index 6d169f58e0..0000000000 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ /dev/null @@ -1,84 +0,0 @@ -/* proSilver Style Sheet Tweaks - -These style definitions are mainly IE specific -tweaks required due to its poor CSS support. --------------------------------------------------*/ - -* html table, * html select, * html input { font-size: 100%; } -* html hr { margin: 0; } -* html span.corners-top, * html span.corners-bottom { background-image: url("{T_THEME_PATH}/images/corners_left.gif"); } -* html span.corners-top span, * html span.corners-bottom span { background-image: url("{T_THEME_PATH}/images/corners_right.gif"); } - -table.table1 { - width: 99%; /* IE < 6 browsers */ - /* Tantek hack */ - voice-family: "\"}\""; - voice-family: inherit; - width: 100%; -} -html>body table.table1 { width: 100%; } /* Reset 100% for opera */ - -* html ul.topiclist li { position: relative; } -* html .postbody h3 img { vertical-align: middle; } - -/* Form styles */ -html>body dd label input { vertical-align: text-bottom; } /* Align checkboxes/radio buttons nicely */ - -* html input.button1, * html input.button2 { - padding-bottom: 0; - margin-bottom: 1px; -} - -/* Misc layout styles */ -* html .column1, * html .column2 { width: 45%; } - -/* Nice method for clearing floated blocks without having to insert any extra markup (like spacer above) - From http://www.positioniseverything.net/easyclearing.html -#tabs:after, #minitabs:after, .post:after, .navbar:after, fieldset dl:after, ul.topiclist dl:after, ul.linklist:after, dl.polls:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -}*/ - -.clearfix, #tabs, #minitabs, fieldset dl, ul.topiclist dl, dl.polls { - height: 1%; - overflow: hidden; -} - -/* viewtopic fix */ -* html .post { - height: 25%; - overflow: hidden; -} - -/* navbar fix */ -* html .clearfix, * html .navbar, ul.linklist { - height: 4%; - overflow: hidden; -} - -/* Simple fix so forum and topic lists always have a min-height set, even in IE6 - From http://www.dustindiaz.com/min-height-fast-hack */ -dl.icon { - min-height: 35px; - height: auto !important; - height: 35px; -} - -* html #search-box { - width: 25%; -} - -/* Correctly clear floating for details on profile view */ -*:first-child+html dl.details dd { - margin-left: 30%; - float: none; -} - -* html dl.details dd { - margin-left: 30%; - float: none; -} - diff --git a/phpBB/styles/subsilver2/imageset/announce_read_locked.gif b/phpBB/styles/subsilver2/imageset/announce_read_locked.gif deleted file mode 100644 index a738616e06..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/announce_read_locked.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/announce_read_locked_mine.gif b/phpBB/styles/subsilver2/imageset/announce_read_locked_mine.gif deleted file mode 100644 index f7ffe7f8dd..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/announce_read_locked_mine.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/announce_read_mine.gif b/phpBB/styles/subsilver2/imageset/announce_read_mine.gif deleted file mode 100644 index 636d353867..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/announce_read_mine.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/announce_unread_locked.gif b/phpBB/styles/subsilver2/imageset/announce_unread_locked.gif deleted file mode 100644 index 37033da653..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/announce_unread_locked.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/announce_unread_locked_mine.gif b/phpBB/styles/subsilver2/imageset/announce_unread_locked_mine.gif deleted file mode 100644 index d91f2520ca..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/announce_unread_locked_mine.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/announce_unread_mine.gif b/phpBB/styles/subsilver2/imageset/announce_unread_mine.gif deleted file mode 100644 index e1dd23a0bf..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/announce_unread_mine.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/button_pm_new.gif b/phpBB/styles/subsilver2/imageset/en/button_pm_new.gif deleted file mode 100644 index 07df748d3a..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/button_pm_new.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/button_pm_reply.gif b/phpBB/styles/subsilver2/imageset/en/button_pm_reply.gif deleted file mode 100644 index c476f06a44..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/button_pm_reply.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/button_topic_locked.gif b/phpBB/styles/subsilver2/imageset/en/button_topic_locked.gif deleted file mode 100644 index 124a2d4a7d..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/button_topic_locked.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/button_topic_new.gif b/phpBB/styles/subsilver2/imageset/en/button_topic_new.gif deleted file mode 100644 index 66e1007129..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/button_topic_new.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/button_topic_reply.gif b/phpBB/styles/subsilver2/imageset/en/button_topic_reply.gif deleted file mode 100644 index e8fe5115a0..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/button_topic_reply.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/icon_contact_aim.gif b/phpBB/styles/subsilver2/imageset/en/icon_contact_aim.gif deleted file mode 100644 index c6533e2817..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/icon_contact_aim.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/icon_contact_email.gif b/phpBB/styles/subsilver2/imageset/en/icon_contact_email.gif deleted file mode 100644 index f126a1960d..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/icon_contact_email.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/icon_contact_icq.gif b/phpBB/styles/subsilver2/imageset/en/icon_contact_icq.gif deleted file mode 100644 index ba3fa12436..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/icon_contact_icq.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/icon_contact_jabber.gif b/phpBB/styles/subsilver2/imageset/en/icon_contact_jabber.gif deleted file mode 100644 index be2e53f9c2..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/icon_contact_jabber.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/icon_contact_msnm.gif b/phpBB/styles/subsilver2/imageset/en/icon_contact_msnm.gif deleted file mode 100644 index e3a5901bfc..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/icon_contact_msnm.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/icon_contact_pm.gif b/phpBB/styles/subsilver2/imageset/en/icon_contact_pm.gif deleted file mode 100644 index 26ac558c2f..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/icon_contact_pm.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/icon_contact_www.gif b/phpBB/styles/subsilver2/imageset/en/icon_contact_www.gif deleted file mode 100644 index 14a33b36a5..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/icon_contact_www.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/icon_contact_yahoo.gif b/phpBB/styles/subsilver2/imageset/en/icon_contact_yahoo.gif deleted file mode 100644 index d11711789f..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/icon_contact_yahoo.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/icon_post_delete.gif b/phpBB/styles/subsilver2/imageset/en/icon_post_delete.gif deleted file mode 100644 index e008e5ff9f..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/icon_post_delete.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/icon_post_edit.gif b/phpBB/styles/subsilver2/imageset/en/icon_post_edit.gif deleted file mode 100644 index 1511ee34d3..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/icon_post_edit.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/icon_post_info.gif b/phpBB/styles/subsilver2/imageset/en/icon_post_info.gif deleted file mode 100644 index 166de2724f..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/icon_post_info.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/icon_post_quote.gif b/phpBB/styles/subsilver2/imageset/en/icon_post_quote.gif deleted file mode 100644 index 4cf103280c..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/icon_post_quote.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/icon_post_report.gif b/phpBB/styles/subsilver2/imageset/en/icon_post_report.gif deleted file mode 100644 index 9a3f65b1e3..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/icon_post_report.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/icon_user_offline.gif b/phpBB/styles/subsilver2/imageset/en/icon_user_offline.gif deleted file mode 100644 index 3065f4d7fe..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/icon_user_offline.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/icon_user_online.gif b/phpBB/styles/subsilver2/imageset/en/icon_user_online.gif deleted file mode 100644 index b950612c57..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/icon_user_online.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/icon_user_profile.gif b/phpBB/styles/subsilver2/imageset/en/icon_user_profile.gif deleted file mode 100644 index d9cf7f4c4a..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/icon_user_profile.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/icon_user_search.gif b/phpBB/styles/subsilver2/imageset/en/icon_user_search.gif deleted file mode 100644 index 46475fbf4c..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/icon_user_search.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/icon_user_warn.gif b/phpBB/styles/subsilver2/imageset/en/icon_user_warn.gif deleted file mode 100644 index 44cbcc953a..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/en/icon_user_warn.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/en/imageset.cfg b/phpBB/styles/subsilver2/imageset/en/imageset.cfg deleted file mode 100644 index c0cc699737..0000000000 --- a/phpBB/styles/subsilver2/imageset/en/imageset.cfg +++ /dev/null @@ -1,47 +0,0 @@ -# -# phpBB Imageset Configuration File -# -# @package phpBB3 -# @copyright (c) 2005 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License -# -# -# At the left is the name, please do not change this -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# -# - -# Images -img_icon_contact_aim = icon_contact_aim.gif -img_icon_contact_email = icon_contact_email.gif -img_icon_contact_icq = icon_contact_icq.gif -img_icon_contact_jabber = icon_contact_jabber.gif -img_icon_contact_msnm = icon_contact_msnm.gif -img_icon_contact_pm = icon_contact_pm.gif -img_icon_contact_yahoo = icon_contact_yahoo.gif -img_icon_contact_www = icon_contact_www.gif - -img_icon_post_delete = icon_post_delete.gif -img_icon_post_edit = icon_post_edit.gif -img_icon_post_info = icon_post_info.gif -img_icon_post_quote = icon_post_quote.gif -img_icon_post_report = icon_post_report.gif - -img_icon_user_online = icon_user_online.gif -img_icon_user_offline = icon_user_offline.gif -img_icon_user_profile = icon_user_profile.gif -img_icon_user_search = icon_user_search.gif -img_icon_user_warn = icon_user_warn.gif - -img_button_pm_forward = -img_button_pm_new = button_pm_new.gif -img_button_pm_reply = button_pm_reply.gif -img_button_topic_locked = button_topic_locked.gif -img_button_topic_new = button_topic_new.gif -img_button_topic_reply = button_topic_reply.gif - diff --git a/phpBB/styles/subsilver2/imageset/forum_link.gif b/phpBB/styles/subsilver2/imageset/forum_link.gif deleted file mode 100644 index d5e86d47d7..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/forum_link.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/forum_read_subforum.gif b/phpBB/styles/subsilver2/imageset/forum_read_subforum.gif deleted file mode 100644 index 9179303e7f..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/forum_read_subforum.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/forum_unread_locked.gif b/phpBB/styles/subsilver2/imageset/forum_unread_locked.gif deleted file mode 100644 index 58a79c376c..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/forum_unread_locked.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/forum_unread_subforum.gif b/phpBB/styles/subsilver2/imageset/forum_unread_subforum.gif deleted file mode 100644 index af3c93b1a1..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/forum_unread_subforum.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/icon_topic_attach.gif b/phpBB/styles/subsilver2/imageset/icon_topic_attach.gif deleted file mode 100644 index 1c9c89bc70..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/icon_topic_attach.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/icon_topic_reported.gif b/phpBB/styles/subsilver2/imageset/icon_topic_reported.gif deleted file mode 100644 index 026092854a..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/icon_topic_reported.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/icon_topic_unapproved.gif b/phpBB/styles/subsilver2/imageset/icon_topic_unapproved.gif deleted file mode 100644 index 2ccaf19c23..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/icon_topic_unapproved.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/imageset.cfg b/phpBB/styles/subsilver2/imageset/imageset.cfg deleted file mode 100644 index 44f44007d7..0000000000 --- a/phpBB/styles/subsilver2/imageset/imageset.cfg +++ /dev/null @@ -1,100 +0,0 @@ -# -# phpBB Imageset Configuration File -# -# @package phpBB3 -# @copyright (c) 2005 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License -# -# -# At the left is the name, please do not change this -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# -# - -# General Information about this style -name = subsilver2 -copyright = © phpBB Group, 2003 -version = 3.0.0 - -# Images -img_site_logo = site_logo.gif*94*170 -img_upload_bar = upload_bar.gif*16*280 -img_poll_left = poll_left.gif*12*4 -img_poll_center = poll_center.gif*12* -img_poll_right = poll_right.gif*12*4 -img_icon_friend = -img_icon_foe = - -img_forum_link = forum_link.gif*25*46 -img_forum_read = forum_read.gif*25*46 -img_forum_read_locked = forum_read_locked.gif*25*46 -img_forum_read_subforum = forum_read_subforum.gif*25*46 -img_forum_unread = forum_unread.gif*25*46 -img_forum_unread_locked = forum_unread_locked.gif*25*46 -img_forum_unread_subforum = forum_unread_subforum.gif*25*46 - -img_topic_moved = topic_moved.gif*18*19 - -img_topic_read = topic_read.gif*18*19 -img_topic_read_mine = topic_read_mine.gif*18*19 -img_topic_read_hot = topic_read_hot.gif*18*19 -img_topic_read_hot_mine = topic_read_hot_mine.gif*18*19 -img_topic_read_locked = topic_read_locked.gif*18*19 -img_topic_read_locked_mine = topic_read_locked_mine.gif*18*19 - -img_topic_unread = topic_unread.gif*18*19 -img_topic_unread_mine = topic_unread_mine.gif*18*19 -img_topic_unread_hot = topic_unread_hot.gif*18*19 -img_topic_unread_hot_mine = topic_unread_hot_mine.gif*18*19 -img_topic_unread_locked = topic_unread_locked.gif*18*19 -img_topic_unread_locked_mine = topic_unread_locked_mine.gif*18*19 - -img_sticky_read = sticky_read.gif*18*19 -img_sticky_read_mine = sticky_read_mine.gif*18*19 -img_sticky_read_locked = sticky_read_locked.gif*18*19 -img_sticky_read_locked_mine = sticky_read_locked_mine.gif*18*19 -img_sticky_unread = sticky_unread.gif*18*19 -img_sticky_unread_mine = sticky_unread_mine.gif*18*19 -img_sticky_unread_locked = sticky_unread_locked.gif*18*19 -img_sticky_unread_locked_mine = sticky_unread_locked_mine.gif*18*19 - -img_announce_read = announce_read.gif*18*19 -img_announce_read_mine = announce_read_mine.gif*18*19 -img_announce_read_locked = announce_read_locked.gif*18*19 -img_announce_read_locked_mine = announce_read_locked_mine.gif*18*19 -img_announce_unread = announce_unread.gif*18*19 -img_announce_unread_mine = announce_unread_mine.gif*18*19 -img_announce_unread_locked = announce_unread_locked.gif*18*19 -img_announce_unread_locked_mine = announce_unread_locked_mine.gif*18*19 - -img_global_read = announce_read.gif*18*19 -img_global_read_mine = announce_read_mine.gif*18*19 -img_global_read_locked = announce_read_locked.gif*18*19 -img_global_read_locked_mine = announce_read_locked_mine.gif*18*19 -img_global_unread = announce_unread.gif*18*19 -img_global_unread_mine = announce_unread_mine.gif*18*19 -img_global_unread_locked = announce_unread_locked.gif*18*19 -img_global_unread_locked_mine = announce_unread_locked_mine.gif*18*19 - -img_subforum_read = -img_subforum_unread = - -img_pm_read = topic_read.gif*18*19 -img_pm_unread = topic_unread.gif*18*19 - -img_icon_back_top = - -img_icon_post_target = icon_post_target.gif*9*12 -img_icon_post_target_unread = icon_post_target_unread.gif*9*12 - -img_icon_topic_attach = icon_topic_attach.gif*18*14 -img_icon_topic_latest = icon_topic_latest.gif*9*18 -img_icon_topic_newest = icon_topic_newest.gif*9*18 -img_icon_topic_reported = icon_topic_reported.gif*18*19 -img_icon_topic_unapproved = icon_topic_unapproved.gif*18*19 - diff --git a/phpBB/styles/subsilver2/imageset/site_logo.gif b/phpBB/styles/subsilver2/imageset/site_logo.gif deleted file mode 100644 index 48c3b553da..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/site_logo.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/sticky_read_locked.gif b/phpBB/styles/subsilver2/imageset/sticky_read_locked.gif deleted file mode 100644 index 24bca303d6..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/sticky_read_locked.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/sticky_read_locked_mine.gif b/phpBB/styles/subsilver2/imageset/sticky_read_locked_mine.gif deleted file mode 100644 index 3fd04ec3a9..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/sticky_read_locked_mine.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/sticky_read_mine.gif b/phpBB/styles/subsilver2/imageset/sticky_read_mine.gif deleted file mode 100644 index 381634c364..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/sticky_read_mine.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/sticky_unread_locked.gif b/phpBB/styles/subsilver2/imageset/sticky_unread_locked.gif deleted file mode 100644 index 608f4822e3..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/sticky_unread_locked.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/sticky_unread_locked_mine.gif b/phpBB/styles/subsilver2/imageset/sticky_unread_locked_mine.gif deleted file mode 100644 index fe5e115312..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/sticky_unread_locked_mine.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/sticky_unread_mine.gif b/phpBB/styles/subsilver2/imageset/sticky_unread_mine.gif deleted file mode 100644 index b5fc3b3627..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/sticky_unread_mine.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/topic_moved.gif b/phpBB/styles/subsilver2/imageset/topic_moved.gif deleted file mode 100644 index fe758f02ca..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/topic_moved.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/topic_read_hot_mine.gif b/phpBB/styles/subsilver2/imageset/topic_read_hot_mine.gif deleted file mode 100644 index 335ae77645..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/topic_read_hot_mine.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/topic_read_locked_mine.gif b/phpBB/styles/subsilver2/imageset/topic_read_locked_mine.gif deleted file mode 100644 index 3f24928b48..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/topic_read_locked_mine.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/topic_read_mine.gif b/phpBB/styles/subsilver2/imageset/topic_read_mine.gif deleted file mode 100644 index 560927aa06..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/topic_read_mine.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/topic_unread_hot_mine.gif b/phpBB/styles/subsilver2/imageset/topic_unread_hot_mine.gif deleted file mode 100644 index 4d3937ae28..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/topic_unread_hot_mine.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/topic_unread_locked_mine.gif b/phpBB/styles/subsilver2/imageset/topic_unread_locked_mine.gif deleted file mode 100644 index 90873431ef..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/topic_unread_locked_mine.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/topic_unread_mine.gif b/phpBB/styles/subsilver2/imageset/topic_unread_mine.gif deleted file mode 100644 index 34fd2ec179..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/topic_unread_mine.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/imageset/upload_bar.gif b/phpBB/styles/subsilver2/imageset/upload_bar.gif deleted file mode 100644 index 75cf61c59e..0000000000 Binary files a/phpBB/styles/subsilver2/imageset/upload_bar.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg deleted file mode 100644 index 7465d36673..0000000000 --- a/phpBB/styles/subsilver2/style.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# -# phpBB Style Configuration File -# -# @package phpBB3 -# @copyright (c) 2005 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License -# -# -# At the left is the name, please do not change this -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# -# - -# General Information about this style -name = subsilver2 -copyright = © 2005 phpBB Group -version = 3.0.0 diff --git a/phpBB/styles/subsilver2/template/attachment.html b/phpBB/styles/subsilver2/template/attachment.html deleted file mode 100644 index d54994fe67..0000000000 --- a/phpBB/styles/subsilver2/template/attachment.html +++ /dev/null @@ -1,121 +0,0 @@ - - - - - [{_file.DENIED_MESSAGE}]
    - - - - {L_FILE_COMMENT}: {_file.COMMENT}
    - - - -
    {_file.DOWNLOAD_NAME}
    - {_file.DOWNLOAD_NAME} [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ] - - - - {_file.DOWNLOAD_NAME}
    - {_file.DOWNLOAD_NAME} [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ] - - - - - {_file.UPLOAD_ICON} - {_file.DOWNLOAD_NAME} [{_file.FILESIZE} {_file.SIZE_LANG}] -
    - {_file.L_DOWNLOAD_COUNT} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - -
    - [ {L_PLAY_QUICKTIME_FILE} ] - {_file.DOWNLOAD_NAME} [ {_file.FILESIZE} {_file.SIZE_LANG} | {_file.L_DOWNLOAD_COUNT} ] - - -
    - - - diff --git a/phpBB/styles/subsilver2/template/bbcode.html b/phpBB/styles/subsilver2/template/bbcode.html deleted file mode 100644 index 50162740d0..0000000000 --- a/phpBB/styles/subsilver2/template/bbcode.html +++ /dev/null @@ -1,69 +0,0 @@ -
      -
        -
      - -
        -
      - -
    • -
    • - - -
      {USERNAME} {L_WROTE}:
      - - - -
      {L_QUOTE}:
      - - - -
      - - - -
      {L_CODE}:
      - - - -
      - - - -
      {L_ATTACHMENT}:
      - - - -
      - - - - - - - - - - - - -{TEXT} - -{TEXT} - -{L_IMAGE} - -{DESCRIPTION} - -{DESCRIPTION} - - - - - - - - - - - - diff --git a/phpBB/styles/subsilver2/template/breadcrumbs.html b/phpBB/styles/subsilver2/template/breadcrumbs.html deleted file mode 100644 index ad180250ce..0000000000 --- a/phpBB/styles/subsilver2/template/breadcrumbs.html +++ /dev/null @@ -1,8 +0,0 @@ - - - - -
      - -

      {S_TIMEZONE}

      -
      \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/confirm_body.html b/phpBB/styles/subsilver2/template/confirm_body.html deleted file mode 100644 index 92c2481c2d..0000000000 --- a/phpBB/styles/subsilver2/template/confirm_body.html +++ /dev/null @@ -1,28 +0,0 @@ - - -
      - -
      - - - - - - - - -
      {MESSAGE_TITLE}

      {MESSAGE_TEXT}


      {S_HIDDEN_FIELDS}  
      - -
      - -
      - -
      - - - -
      - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/custom_profile_fields.html b/phpBB/styles/subsilver2/template/custom_profile_fields.html deleted file mode 100644 index c8f287ddb4..0000000000 --- a/phpBB/styles/subsilver2/template/custom_profile_fields.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - {bool.options.VALUE}    - - checked="checked" /> - - - - - - - - - {L_DAY}: - {L_MONTH}: - {L_YEAR}: - diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js deleted file mode 100644 index 53b8b6222f..0000000000 --- a/phpBB/styles/subsilver2/template/editor.js +++ /dev/null @@ -1,402 +0,0 @@ -/** -* bbCode control by subBlue design [ www.subBlue.com ] -* Includes unixsafe colour palette selector by SHS` -*/ - -// Startup variables -var imageTag = false; -var theSelection = false; - -// Check for Browser & Platform for PC & IE specific bits -// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html -var clientPC = navigator.userAgent.toLowerCase(); // Get client info -var clientVer = parseInt(navigator.appVersion); // Get browser version - -var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1)); -var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1)); - -var baseHeight; -window.onload = initInsertions; - -/** -* Shows the help messages in the helpline window -*/ -function helpline(help) -{ - document.forms[form_name].helpbox.value = help_line[help]; -} - -/** -* Fix a bug involving the TextRange object. From -* http://www.frostjedi.com/terra/scripts/demo/caretBug.html -*/ -function initInsertions() -{ - var doc; - - if (document.forms[form_name]) - { - doc = document; - } - else - { - doc = opener.document; - } - - var textarea = doc.forms[form_name].elements[text_name]; - if (is_ie && typeof(baseHeight) != 'number') - { - textarea.focus(); - baseHeight = doc.selection.createRange().duplicate().boundingHeight; - - if (!document.forms[form_name]) - { - document.body.focus(); - } - } -} - -/** -* bbstyle -*/ -function bbstyle(bbnumber) -{ - if (bbnumber != -1) - { - bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]); - } - else - { - insert_text('[*]'); - document.forms[form_name].elements[text_name].focus(); - } -} - -/** -* Apply bbcodes -*/ -function bbfontstyle(bbopen, bbclose) -{ - theSelection = false; - - var textarea = document.forms[form_name].elements[text_name]; - - textarea.focus(); - - if ((clientVer >= 4) && is_ie && is_win) - { - // Get text selection - theSelection = document.selection.createRange().text; - - if (theSelection) - { - // Add tags around selection - document.selection.createRange().text = bbopen + theSelection + bbclose; - document.forms[form_name].elements[text_name].focus(); - theSelection = ''; - return; - } - } - else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0)) - { - mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose); - document.forms[form_name].elements[text_name].focus(); - theSelection = ''; - return; - } - - //The new position for the cursor after adding the bbcode - var caret_pos = getCaretPosition(textarea).start; - var new_pos = caret_pos + bbopen.length; - - // Open tag - insert_text(bbopen + bbclose); - - // Center the cursor when we don't have a selection - // Gecko and proper browsers - if (!isNaN(textarea.selectionStart)) - { - textarea.selectionStart = new_pos; - textarea.selectionEnd = new_pos; - } - // IE - else if (document.selection) - { - var range = textarea.createTextRange(); - range.move("character", new_pos); - range.select(); - storeCaret(textarea); - } - - textarea.focus(); - return; -} - -/** -* Insert text at position -*/ -function insert_text(text, spaces, popup) -{ - var textarea; - - if (!popup) - { - textarea = document.forms[form_name].elements[text_name]; - } - else - { - textarea = opener.document.forms[form_name].elements[text_name]; - } - if (spaces) - { - text = ' ' + text + ' '; - } - - if (!isNaN(textarea.selectionStart)) - { - var sel_start = textarea.selectionStart; - var sel_end = textarea.selectionEnd; - - mozWrap(textarea, text, '') - textarea.selectionStart = sel_start + text.length; - textarea.selectionEnd = sel_end + text.length; - } - - else if (textarea.createTextRange && textarea.caretPos) - { - if (baseHeight != textarea.caretPos.boundingHeight) - { - textarea.focus(); - storeCaret(textarea); - } - var caret_pos = textarea.caretPos; - caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text; - - } - else - { - textarea.value = textarea.value + text; - } - if (!popup) - { - textarea.focus(); - } - -} - -/** -* Add inline attachment at position -*/ -function attach_inline(index, filename) -{ - insert_text('[attachment=' + index + ']' + filename + '[/attachment]'); - document.forms[form_name].elements[text_name].focus(); -} - -/** -* Add quote text to message -*/ -function addquote(post_id, username) -{ - var message_name = 'message_' + post_id; - var theSelection = ''; - var divarea = false; - - if (document.all) - { - divarea = document.all[message_name]; - } - else - { - divarea = document.getElementById(message_name); - } - - // Get text selection - not only the post content :( - if (window.getSelection) - { - theSelection = window.getSelection().toString(); - } - else if (document.getSelection) - { - theSelection = document.getSelection(); - } - else if (document.selection) - { - theSelection = document.selection.createRange().text; - } - - if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null) - { - if (divarea.innerHTML) - { - theSelection = divarea.innerHTML.replace(/
      /ig, '\n'); - theSelection = theSelection.replace(//ig, '\n'); - theSelection = theSelection.replace(/<\;/ig, '<'); - theSelection = theSelection.replace(/>\;/ig, '>'); - theSelection = theSelection.replace(/&\;/ig, '&'); - } - else if (document.all) - { - theSelection = divarea.innerText; - } - else if (divarea.textContent) - { - theSelection = divarea.textContent; - } - else if (divarea.firstChild.nodeValue) - { - theSelection = divarea.firstChild.nodeValue; - } - } - - if (theSelection) - { - insert_text('[quote="' + username + '"]' + theSelection + '[/quote]'); - } - - return; -} - -/** -* From http://www.massless.org/mozedit/ -*/ -function mozWrap(txtarea, open, close) -{ - var selLength = txtarea.textLength; - var selStart = txtarea.selectionStart; - var selEnd = txtarea.selectionEnd; - var scrollTop = txtarea.scrollTop; - - if (selEnd == 1 || selEnd == 2) - { - selEnd = selLength; - } - - var s1 = (txtarea.value).substring(0,selStart); - var s2 = (txtarea.value).substring(selStart, selEnd) - var s3 = (txtarea.value).substring(selEnd, selLength); - - txtarea.value = s1 + open + s2 + close + s3; - txtarea.selectionStart = selEnd + open.length + close.length; - txtarea.selectionEnd = txtarea.selectionStart; - txtarea.focus(); - txtarea.scrollTop = scrollTop; - - return; -} - -/** -* Insert at Caret position. Code from -* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130 -*/ -function storeCaret(textEl) -{ - if (textEl.createTextRange) - { - textEl.caretPos = document.selection.createRange().duplicate(); - } -} - -/** -* Color pallette -*/ -function colorPalette(dir, width, height) -{ - var r = 0, g = 0, b = 0; - var numberList = new Array(6); - var color = ''; - - numberList[0] = '00'; - numberList[1] = '40'; - numberList[2] = '80'; - numberList[3] = 'BF'; - numberList[4] = 'FF'; - - document.writeln(''); - - for (r = 0; r < 5; r++) - { - if (dir == 'h') - { - document.writeln(''); - } - - for (g = 0; g < 5; g++) - { - if (dir == 'v') - { - document.writeln(''); - } - - for (b = 0; b < 5; b++) - { - color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]); - document.write(''); - } - - if (dir == 'v') - { - document.writeln(''); - } - } - - if (dir == 'h') - { - document.writeln(''); - } - } - document.writeln('
      '); - document.write('#' + color + ''); - document.writeln('
      '); -} - - -/** -* Caret Position object -*/ -function caretPosition() -{ - var start = null; - var end = null; -} - - -/** -* Get the caret position in an textarea -*/ -function getCaretPosition(txtarea) -{ - var caretPos = new caretPosition(); - - // simple Gecko/Opera way - if(txtarea.selectionStart || txtarea.selectionStart == 0) - { - caretPos.start = txtarea.selectionStart; - caretPos.end = txtarea.selectionEnd; - } - // dirty and slow IE way - else if(document.selection) - { - // get current selection - var range = document.selection.createRange(); - - // a new selection of the whole textarea - var range_all = document.body.createTextRange(); - range_all.moveToElementText(txtarea); - - // calculate selection start point by moving beginning of range_all to beginning of range - var sel_start; - for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++) - { - range_all.moveStart('character', 1); - } - - txtarea.sel_start = sel_start; - - // we ignore the end value for IE, this is already dirty enough and we don't need it - caretPos.start = txtarea.sel_start; - caretPos.end = txtarea.sel_start; - } - - return caretPos; -} \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/faq_body.html b/phpBB/styles/subsilver2/template/faq_body.html deleted file mode 100644 index 9e324b4fd2..0000000000 --- a/phpBB/styles/subsilver2/template/faq_body.html +++ /dev/null @@ -1,63 +0,0 @@ - - - - -
      - - - - - - - - - - - -
      {L_FAQ_TITLE}
      - - {faq_block.BLOCK_TITLE}
      - - {faq_block.faq_row.FAQ_QUESTION}
      - -
      - -
       
      - -
      - - - - - - - - - - - - - - - -

      {faq_block.BLOCK_TITLE}

      - - - -
      » {faq_block.faq_row.FAQ_QUESTION}
      -
      {faq_block.faq_row.FAQ_ANSWER}
      -

      {L_BACK_TO_TOP}

      -
      - -
      - - -
      - - - -
      - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/forumlist_body.html b/phpBB/styles/subsilver2/template/forumlist_body.html deleted file mode 100644 index 70e4ca813f..0000000000 --- a/phpBB/styles/subsilver2/template/forumlist_body.html +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_MARK_FORUMS_READ} 
       {L_FORUM}  {L_TOPICS}  {L_POSTS}  {L_LAST_POST} 

      {forumrow.FORUM_NAME}

       
      {forumrow.FORUM_FOLDER_IMG} - -
      {forumrow.FORUM_IMAGE}
      - - {forumrow.FORUM_NAME} -

      {forumrow.FORUM_DESC}

      -
      -
      {L_REDIRECTS}: {forumrow.CLICKS} 

      {L_FORUM}

       
      {forumrow.FORUM_FOLDER_IMG} - -
      {forumrow.FORUM_IMAGE}
      - - {forumrow.FORUM_NAME} -

      {forumrow.FORUM_DESC}

      - -

      {forumrow.L_MODERATOR_STR}: {forumrow.MODERATORS}

      - - -

      {forumrow.L_SUBFORUM_STR} {forumrow.SUBFORUMS}

      - -
      -

      {forumrow.TOPICS}

      {forumrow.POSTS}

      - -

      {forumrow.LAST_POST_TIME}

      -

      {forumrow.LAST_POSTER_FULL} - {LAST_POST_IMG} -

      - -

      {L_NO_POSTS}

      - -

      {L_NO_FORUMS}

      \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html deleted file mode 100644 index 3958743229..0000000000 --- a/phpBB/styles/subsilver2/template/index_body.html +++ /dev/null @@ -1,100 +0,0 @@ - - - - - -

      - - - - -{L_DELETE_COOKIES} | {L_THE_TEAM}
      - -
      - - - - -
      - - - - - - - - - - - - - - - - - - -

      {L_WHO_IS_ONLINE}

      {L_WHO_IS_ONLINE}

      {L_WHO_IS_ONLINE}{L_WHO_IS_ONLINE}{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})
      {RECORD_USERS}

      {LOGGED_IN_USER_LIST}
      {L_LEGEND} :: {LEGEND}
      - - - -
      - - - - - - - - - -

      {L_BIRTHDAYS}

      {L_BIRTHDAYS}

      {L_CONGRATULATIONS}: {BIRTHDAY_LIST}{L_NO_BIRTHDAYS}

      - - -
      - - - - - - - - - -

      {L_STATISTICS}

      {L_STATISTICS}

      {TOTAL_POSTS} | {TOTAL_TOPICS} | {TOTAL_USERS} | {NEWEST_USER}

      - - -
      - -
      - - - - - - - - -

      {L_LOGIN_LOGOUT}

      {L_USERNAME}:   {L_PASSWORD}:   {L_LOG_ME_IN}  
      - {S_FORM_TOKEN} -
      - - -
      - - - - - - - - - - - - -
      {FORUM_NEW_IMG}{L_NEW_POSTS}  {FORUM_IMG}{L_NO_NEW_POSTS}  {FORUM_LOCKED_IMG}{L_FORUM_LOCKED}
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/jumpbox.html b/phpBB/styles/subsilver2/template/jumpbox.html deleted file mode 100644 index f46fed9f27..0000000000 --- a/phpBB/styles/subsilver2/template/jumpbox.html +++ /dev/null @@ -1,19 +0,0 @@ - - -
      - - - - - -
      {L_SELECT_TOPICS_FROM}{L_MODERATE_FORUM}{L_JUMP_TO}:  
      - -
      - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/login_body.html b/phpBB/styles/subsilver2/template/login_body.html deleted file mode 100644 index 86eed2dfc6..0000000000 --- a/phpBB/styles/subsilver2/template/login_body.html +++ /dev/null @@ -1,104 +0,0 @@ - - -
      - - - - - - - - - - - - - - - - - - - - - -
      {L_LOGIN}{LOGIN_EXPLAIN}
      {LOGIN_EXPLAIN}
      -

      {L_LOGIN_INFO}

      - -

      - {L_TERMS_USE} | {L_PRIVACY} -

      -
      class="row2"class="row1"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {LOGIN_ERROR}
      style="width: 50%; text-align: {S_CONTENT_FLOW_END};">{L_USERNAME}: - -
      {L_REGISTER} - -
      style="width: 50%; text-align: {S_CONTENT_FLOW_END};">{L_PASSWORD}: - -
      {L_FORGOT_PASS} -
      {L_RESEND_ACTIVATION} -
        {L_LOG_ME_IN}
        {L_HIDE_ME}
      -
      - - - - - - - - - - - - - - - - - - -
      {L_LOGIN_CONFIRMATION}
      {L_LOGIN_CONFIRM_EXPLAIN}
      - - {CONFIRM_IMAGE} -
      {L_CONFIRM_CODE}:
      {L_CONFIRM_CODE_EXPLAIN}
      colspan="2" align="center">{S_HIDDEN_FIELDS}
      -{S_FORM_TOKEN} - -
      - -
      - - - -
      - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/login_forum.html b/phpBB/styles/subsilver2/template/login_forum.html deleted file mode 100644 index c3d57085df..0000000000 --- a/phpBB/styles/subsilver2/template/login_forum.html +++ /dev/null @@ -1,47 +0,0 @@ - - -
      - -
      - - - - - - - - - - - - - - -
      {L_LOGIN}
      {L_LOGIN_FORUM}
      - - - - - - - - - - - -
      {LOGIN_ERROR}
      {L_PASSWORD}:
      -
      {S_HIDDEN_FIELDS}
      - {S_FORM_TOKEN} -
      - -
      - -
      - - - -
      - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/mcp_approve.html b/phpBB/styles/subsilver2/template/mcp_approve.html deleted file mode 100644 index 2d2013f05c..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_approve.html +++ /dev/null @@ -1,49 +0,0 @@ - - -
      - -
      - - - - - - - - -
      {MESSAGE_TITLE}
      - - {ADDITIONAL_MSG}
      - - - {L_NOTIFY_POSTER_APPROVAL}{L_NOTIFY_POSTER_DISAPPROVAL}
      - - -
      - - - - - - - - - -
      {L_DISAPPROVE_REASON}:
      {L_MORE_INFO}:
      {L_CAN_LEAVE_BLANK}
      -
      - -
      {S_HIDDEN_FIELDS}{MESSAGE_TEXT}

      -    -
      - {S_FORM_TOKEN} -
      - -
      - -
      - - - -
      - - diff --git a/phpBB/styles/subsilver2/template/mcp_ban.html b/phpBB/styles/subsilver2/template/mcp_ban.html deleted file mode 100644 index 04f90530c9..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_ban.html +++ /dev/null @@ -1,109 +0,0 @@ - - - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_TITLE}
      {L_EXPLAIN}
      {L_BAN_CELL}: - -
      [ {L_FIND_USERNAME} ] -
      {L_BAN_LENGTH}:
      {L_YEAR_MONTH_DAY}
      {L_BAN_EXCLUDE}:
      {L_BAN_EXCLUDE_EXPLAIN}
      {L_YES}   {L_NO}
      {L_BAN_REASON}:
      {L_BAN_GIVE_REASON}:
         
      - -

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_UNBAN_TITLE}
      {L_UNBAN_EXPLAIN}
      {L_BAN_CELL}:
      {L_BAN_LENGTH}:
      {L_BAN_REASON}:
      {L_BAN_GIVE_REASON}:
         
      {L_NO_BAN_CELL}
      -{S_FORM_TOKEN} -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/mcp_footer.html b/phpBB/styles/subsilver2/template/mcp_footer.html deleted file mode 100644 index 3105c15ae4..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_footer.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - -
       [ {TOTAL_TOPICS}{TOTAL_POSTS}{TOTAL}
      -
      - - -
      - -
      - - - -
      - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/mcp_forum.html b/phpBB/styles/subsilver2/template/mcp_forum.html deleted file mode 100644 index 956d253aa6..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_forum.html +++ /dev/null @@ -1,85 +0,0 @@ - - -
      - -{L_VIEW_FORUM_LOGS} - -
      - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_DISPLAY_TOPICS}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
        {L_TOPICS}  {L_REPLIES}  {L_LAST_POST}  {L_MARK} 
      {topicrow.TOPIC_FOLDER_IMG} - - [ {L_SELECT_MERGE} - -

      {NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TITLE} - - {topicrow.UNAPPROVED_IMG}  - - - {REPORTED_IMG}  - - - [ {L_DELETE_SHADOW_TOPIC} ]  - -

      -

      {topicrow.REPLIES}

      {topicrow.LAST_POST_TIME}

      - checked="checked" />  -

      {L_NO_TOPICS}

      - - -
      -{S_FORM_TOKEN} -
      - - - - - -
      {L_MARK_ALL} :: {L_UNMARK_ALL}
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/mcp_front.html b/phpBB/styles/subsilver2/template/mcp_front.html deleted file mode 100644 index 122f5283ae..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_front.html +++ /dev/null @@ -1,118 +0,0 @@ - - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_LATEST_UNAPPROVED}
       {L_FORUM}  {L_TOPIC}  {L_SUBJECT}  {L_AUTHOR}  {L_POST_TIME}  {L_SELECT} 
      {unapproved.FORUM_NAME}{unapproved.FORUM_NAME}
      [ {L_MODERATE} ]
      {unapproved.TOPIC_TITLE}
      [ {L_MODERATE} ]
      {unapproved.SUBJECT}
      [ {L_VIEW_DETAILS} ]
      {unapproved.AUTHOR}{unapproved.AUTHOR}{unapproved.POST_TIME}
      {L_UNAPPROVED_POSTS_ZERO_TOTAL}
      {L_UNAPPROVED_TOTAL}
        
      - {S_FORM_TOKEN} -
      - - - - - -
      {L_MARK_ALL} :: {L_UNMARK_ALL}
      - -

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_LATEST_REPORTED}
       {L_FORUM}  {L_TOPIC}  {L_SUBJECT}  {L_REPORTER}  {L_REPORT_TIME} 
      {report.FORUM_NAME}{report.FORUM_NAME}
      [ {L_MODERATE} ]
      {report.TOPIC_TITLE}
      [ {L_MODERATE} ]
      {report.SUBJECT}
      [ {L_VIEW_DETAILS} ]
      {report.REPORTER_FULL}{report.REPORT_TIME}
      {L_REPORTS_ZERO_TOTAL}
      {L_REPORTS_TOTAL}
      - -

      - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_LATEST_LOGS}
      {L_USERNAME}{L_IP}{L_ACTION}{L_TIME}
      {log.USERNAME}{log.IP}{log.ACTION}{L_VIEW_TOPIC} | {L_VIEW_TOPIC_LOGS}{log.TIME}
      {L_NO_ENTRIES}
      - -
      - - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/mcp_header.html b/phpBB/styles/subsilver2/template/mcp_header.html deleted file mode 100644 index f107732234..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_header.html +++ /dev/null @@ -1,79 +0,0 @@ - - - - -
      - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html deleted file mode 100644 index d28923319c..0000000000 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ /dev/null @@ -1,427 +0,0 @@ - - - - - - - -
      - -

      {L_FORUM_RULES}


      - {L_FORUM_RULES_LINK} - -

      {L_FORUM_RULES}


      - {FORUM_RULES} - -
      - -
      - - - - - -

      - - - - - - - -
      - - - - - - - - - - - -
      {L_OPTIONS}
      {l_block1.L_TITLE} - - - - {l_block1.L_TITLE} - -
      - -
      - - - - - - - - - -
      {L_MESSAGE}

      {MESSAGE}

      {return_links.MESSAGE_LINK}

      - -
      - - - -
      - - - - - - - - -
      {L_PLEASE_CONFIRM}

      {CONFIRM_MESSAGE}

      {S_HIDDEN_FIELDS}  

      - -
      - -
      - diff --git a/phpBB/styles/subsilver2/template/mcp_jumpbox.html b/phpBB/styles/subsilver2/template/mcp_jumpbox.html deleted file mode 100644 index 14856596f0..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_jumpbox.html +++ /dev/null @@ -1,18 +0,0 @@ - - -
      - - {L_JUMP_TO}:   -
      diff --git a/phpBB/styles/subsilver2/template/mcp_logs.html b/phpBB/styles/subsilver2/template/mcp_logs.html deleted file mode 100644 index f7c4a99fc1..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_logs.html +++ /dev/null @@ -1,43 +0,0 @@ - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_USERNAME}{L_IP}{L_TIME}{L_ACTION}{L_MARK}
      {log.USERNAME}{log.IP}{log.DATE}{log.ACTION}
      {log.DATA}
      {L_DISPLAY_LOG}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
       
      {L_NO_ENTRIES}
      -{S_FORM_TOKEN} -
      - -

      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/mcp_message.html b/phpBB/styles/subsilver2/template/mcp_message.html deleted file mode 100644 index 7645e5dd81..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_message.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - -
      {MESSAGE_TITLE}

      {MESSAGE_TEXT}

      - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/mcp_move.html b/phpBB/styles/subsilver2/template/mcp_move.html deleted file mode 100644 index db7a6e7241..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_move.html +++ /dev/null @@ -1,43 +0,0 @@ - - -
      - -
      - - - - - - - - -
      {MESSAGE_TITLE}
      - - {ADDITIONAL_MSG}
      - - -
      {L_SELECT_DESTINATION_FORUM}  
      -
      - - {L_LEAVE_SHADOW}
      - -
      {S_HIDDEN_FIELDS}{MESSAGE_TEXT}

      -    - - {L_NO_DESTINATION_FORUM}

      - {S_HIDDEN_FIELDS} - - -
      - {S_FORM_TOKEN} -
      - -
      - -
      - - - -
      - - diff --git a/phpBB/styles/subsilver2/template/mcp_notes_front.html b/phpBB/styles/subsilver2/template/mcp_notes_front.html deleted file mode 100644 index 17f389f7f3..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_notes_front.html +++ /dev/null @@ -1,22 +0,0 @@ - - -
      - - - - - - - - - - - - -
      {L_SELECT_USER}
      {L_FIND_USERNAME}:
      [ {L_FIND_USERNAME} ]
      -{S_FORM_TOKEN} -
      - -

      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/mcp_notes_user.html b/phpBB/styles/subsilver2/template/mcp_notes_user.html deleted file mode 100644 index 80ac96edf2..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_notes_user.html +++ /dev/null @@ -1,122 +0,0 @@ - - -
      - - - - - - - - - -
      {USERNAME}
      - - - - - - - - - - - - - - - - - -
      {USERNAME}
      {RANK_TITLE}
      {RANK_IMG}
      {AVATAR_IMG}
      -
      - - - - - - - - - - - - - -
      {L_JOINED}: {JOINED}
      {L_TOTAL_POSTS}: {POSTS}
      {L_WARNINGS}: {WARNINGS}
      -
      - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_FEEDBACK}
      {L_DISPLAY_LOG}: {S_SELECT_SORT_DAYS} {L_SORT_BY}: {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
      {L_REPORT_BY}{L_IP}{L_TIME}{L_ACTION}{L_MARK}
      {usernotes.REPORT_BY}{usernotes.IP}{usernotes.REPORT_AT} - {usernotes.ACTION} -
      » [ {usernotes.DATA} ] -
       
      {L_NO_FEEDBACK}
      - -
      - - - - - - - - - - - - - - -
      {L_ADD_FEEDBACK}
      {L_ADD_FEEDBACK_EXPLAIN}
        
      - - - - - - -
      {PAGE_NUMBER} [ {TOTAL_REPORTS} ]
      -{S_FORM_TOKEN} -
      - -

      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/mcp_post.html b/phpBB/styles/subsilver2/template/mcp_post.html deleted file mode 100644 index 1b16f8e92b..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_post.html +++ /dev/null @@ -1,185 +0,0 @@ - - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_REPORT_DETAILS}
      {L_REPORT_REASON}: {REPORT_REASON_TITLE} » {REPORT_REASON_DESCRIPTION}
      {L_REPORTER}: style="font-weight: bold; color: {REPORTER_COLOUR};">{REPORTER_NAME}   [ {L_READ_PROFILE} | {L_VIEW_NOTES} | {L_WARN_USER} ]
      {L_REPORTED}: {REPORT_DATE}
      {L_MORE_INFO}
      {REPORT_TEXT}
      {L_REPORT_CLOSED}  
      - - - {S_FORM_TOKEN} -
      - -
      - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_POST_DETAILS}
      {RETURN_QUEUE} | {RETURN_TOPIC_SIMPLE} | {RETURN_POST}{RETURN_REPORTS} | {L_VIEW_TOPIC}{RETURN_TOPIC}
      {L_POST_SUBJECT}: {POST_SUBJECT} {UNAPPROVED_IMG} {L_POST_UNAPPROVED} {REPORTED_IMG} {L_POST_REPORTED}
      {L_POSTER}: style="font-weight: bold; color: {POST_AUTHOR_COLOUR}">{POST_AUTHOR}   [ {L_READ_PROFILE} | {L_VIEW_NOTES} | {L_WARN_USER} ]
      {L_THIS_POST_IP}: - - {POST_IPADDR}{POST_IP} ({POST_IP}{L_LOOKUP_IP}) - - {POST_IPADDR} ({POST_IP}){POST_IP} ({L_LOOKUP_IP}) - -
      {L_POSTED}: {POST_DATE}
      {L_PREVIEW}
      - - -
      {POST_PREVIEW}
      - - -

      - - - - - - - - - - -
      {L_ATTACHMENTS}:
      {attachment.DISPLAY_ATTACHMENT}
      - - -
       
      -{S_FORM_TOKEN} -
      - - -
      - - - -
      - - - - -
      - - - - - - - - - - - - - - - - - -
      {L_MOD_OPTIONS}
      {L_CHANGE_POSTER}

      [ {L_FIND_USERNAME} ]
      {S_FORM_TOKEN}
      {L_MOD_OPTIONS}
      {S_FORM_TOKEN}
      - - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_IP_INFO}
      {L_OTHER_USERS}
      {userrow.USERNAME}{userrow.USERNAME} [ {userrow.NUM_POSTS} {userrow.L_POST_S} ]{SEARCH_IMG}
      {L_NO_MATCHES_FOUND}
      {L_IPS_POSTED_FROM}[ {L_LOOKUP_ALL} ]
      {iprow.HOSTNAME} ({iprow.IP}){iprow.IP} [ {iprow.NUM_POSTS} {iprow.L_POST_S} ][ {L_LOOKUP_IP} ]
      {L_NO_MATCHES_FOUND}
      - - - - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/mcp_queue.html b/phpBB/styles/subsilver2/template/mcp_queue.html deleted file mode 100644 index 4def047e51..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_queue.html +++ /dev/null @@ -1,46 +0,0 @@ - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_DISPLAY_OPTIONS}
      {L_DISPLAY_ITEMS}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} {L_FORUM}     {L_ONLY_TOPIC}  
       {L_TOPIC}{L_POST}  {L_AUTHOR}  {L_POST_TIME}  {L_SELECT} 

      {postrow.POST_SUBJECT}

      - {L_FORUM}: {postrow.FORUM_NAME}{postrow.FORUM_NAME}
      {postrow.POST_AUTHOR_FULL}
      - [ {L_VIEW_DETAILS} ]
      {postrow.POST_TIME}
      {L_NO_TOPICS_QUEUE}{L_UNAPPROVED_POSTS_ZERO_TOTAL}
        
      -{S_FORM_TOKEN} -
      - - - - - -
      {L_MARK_ALL} :: {L_UNMARK_ALL}
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/mcp_reports.html b/phpBB/styles/subsilver2/template/mcp_reports.html deleted file mode 100644 index 72b26e8751..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_reports.html +++ /dev/null @@ -1,55 +0,0 @@ - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_DISPLAY_OPTIONS}
      {L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} {L_FORUM}     {L_ONLY_TOPIC}  
       {L_POST}  {L_AUTHOR}  {L_REPORTER}  {L_REPORT_TIME}  {L_SELECT} 

      {postrow.POST_SUBJECT}

      - {L_FORUM}: {postrow.FORUM_NAME}{postrow.FORUM_NAME}
      {postrow.POST_AUTHOR_FULL}
      - {postrow.POST_TIME}
      {postrow.REPORTER_FULL}{postrow.REPORT_TIME}
      - [ {L_VIEW_DETAILS} ]
      {L_NO_POSTS}
      - - - -   - -
      -{S_FORM_TOKEN} -
      - - - - - -
      {L_MARK_ALL} :: {L_UNMARK_ALL}
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html deleted file mode 100644 index 2b66c8702a..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_topic.html +++ /dev/null @@ -1,159 +0,0 @@ - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_SPLIT_TOPIC}
      {L_SPLIT_TOPIC_EXPLAIN}
      {L_SPLIT_SUBJECT}
      {L_SPLIT_FORUM}
      {L_TOPIC_ICON} - - - - -
      checked="checked" />{L_NO_TOPIC_ICON} checked="checked" />
      -
      {L_MERGE_TOPIC}
      {L_MERGE_TOPIC_EXPLAIN}
      {L_MERGE_TOPIC_ID} {L_SELECT_TOPIC}
      {TO_TOPIC_INFO}
      {L_DISPLAY_OPTIONS}
      {L_POSTS_PER_PAGE}
      {L_POSTS_PER_PAGE_EXPLAIN}
      {L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
      {L_AUTHOR}{L_MESSAGE}{L_SELECT}
      {RETURN_TOPIC}
      - - - - - -
       {L_POST_SUBJECT}: {postrow.POST_SUBJECT}
      -
      checked="checked" />
      - - - - -
      [ {L_POST_DETAILS} ]
      -
      - - - - - - - -
      -
      {postrow.MESSAGE}
      - -

      - - - - - - - - - - -
      {L_ATTACHMENTS}:
      {postrow.attachment.DISPLAY_ATTACHMENT}
      - - -
      - - - - - - -
      - {UNAPPROVED_IMG} {L_POST_UNAPPROVED} - {REPORTED_IMG}{L_POST_REPORTED} - {postrow.MINI_POST_IMG}{L_POSTED}: {postrow.POST_DATE}
      -
      -
       
      -{S_HIDDEN_FIELDS} -{S_FORM_TOKEN} -
      - - - - - -
      {L_MARK_ALL} :: {L_UNMARK_ALL}
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/mcp_viewlogs.html b/phpBB/styles/subsilver2/template/mcp_viewlogs.html deleted file mode 100644 index b6431e4d51..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_viewlogs.html +++ /dev/null @@ -1,52 +0,0 @@ - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_DISPLAY_OPTIONS}
      {L_DISPLAY_LOG}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
      {L_USERNAME}{L_IP}{L_TIME}{L_ACTION}
      {L_LOGS_CURRENT_TOPIC} {TOPIC_NAME}
      {log.USERNAME}{log.IP}{log.TIME}{log.ACTION}{L_VIEW_TOPIC} | {L_VIEW_TOPIC_LOGS}
      {L_NO_ENTRIES}
      -{S_FORM_TOKEN} -
      - - - - - - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/mcp_warn_front.html b/phpBB/styles/subsilver2/template/mcp_warn_front.html deleted file mode 100644 index 78673b690e..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_warn_front.html +++ /dev/null @@ -1,74 +0,0 @@ - - -
      - - - - - - - - - - - - -
      {L_SELECT_USER}
      {L_FIND_USERNAME}:
      [ {L_FIND_USERNAME} ]
      -{S_FORM_TOKEN} -
      - -

      - - - - - - - - - - - - - - - - - - - - - - - -
      {L_MOST_WARNINGS}
       {L_USERNAME}  {L_WARNINGS}  {L_LATEST_WARNING_TIME}  
      {highest.USERNAME_FULL}{highest.WARNINGS}{highest.WARNING_TIME}{L_VIEW_NOTES}
      {L_WARNINGS_ZERO_TOTAL}
      - -

      - - - - - - - - - - - - - - - - - - - - - - - -
      {L_LATEST_WARNINGS}
       {L_USERNAME}  {L_TIME}  {L_TOTAL_WARNINGS}  
      {latest.USERNAME_FULL}{latest.WARNING_TIME}{latest.WARNINGS}{L_VIEW_NOTES}
      {L_WARNINGS_ZERO_TOTAL}
      - -

      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/mcp_warn_list.html b/phpBB/styles/subsilver2/template/mcp_warn_list.html deleted file mode 100644 index 078bbc0b34..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_warn_list.html +++ /dev/null @@ -1,43 +0,0 @@ - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_WARNED_USERS}
       {L_USERNAME}  {L_WARNINGS}  {L_LATEST_WARNING_TIME}  
      {user.USERNAME_FULL}{user.WARNINGS}{user.WARNING_TIME}{L_VIEW_NOTES}
      {L_WARNINGS_ZERO_TOTAL}
      {L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
      - - - - - - -
      {PAGE_NUMBER} [ {TOTAL_USERS} ]
      -{S_FORM_TOKEN} -
      - -

      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/mcp_warn_post.html b/phpBB/styles/subsilver2/template/mcp_warn_post.html deleted file mode 100644 index 1ad5757f15..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_warn_post.html +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - -
      {L_POST}
      - - - - - - - - - - - - - - - - - -
      {USERNAME}
      {RANK_TITLE}
      {RANK_IMG}
      {AVATAR_IMG}
      -
      - {POST} -
      - -

      - -
      - - - - - - - - - - - - - - - - - -
      {L_ADD_WARNING}
      {L_ADD_WARNING_EXPLAIN}
      {L_NOTIFY_USER_WARN}
        
      -{S_FORM_TOKEN} -
      - -

      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/mcp_warn_user.html b/phpBB/styles/subsilver2/template/mcp_warn_user.html deleted file mode 100644 index 5e8c350935..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_warn_user.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - -
      {USERNAME}
      - - - - - - - - - - - - - - - - - -
      {USERNAME}
      {RANK_TITLE}
      {RANK_IMG}
      {AVATAR_IMG}
      -
      - - - - - - - - - - - - - -
      {L_JOINED}: {JOINED}
      {L_TOTAL_POSTS}: {POSTS}
      {L_WARNINGS}: {WARNINGS}
      -
      - -

      - -
      - - - - - - - - - - - - - - - - - -
      {L_ADD_WARNING}
      {L_ADD_WARNING_EXPLAIN}
      {L_NOTIFY_USER_WARN}
        
      -{S_FORM_TOKEN} -
      - -

      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/mcp_whois.html b/phpBB/styles/subsilver2/template/mcp_whois.html deleted file mode 100644 index 54b93eec69..0000000000 --- a/phpBB/styles/subsilver2/template/mcp_whois.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - -
      {L_WHOIS}
      {RETURN_POST}
      {WHOIS}
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/memberlist_body.html b/phpBB/styles/subsilver2/template/memberlist_body.html deleted file mode 100644 index cb7a7b20c7..0000000000 --- a/phpBB/styles/subsilver2/template/memberlist_body.html +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - -
      - - - - - - - - - -
      {L_USERNAME_BEGINS_WITH}:  {L_FIND_USERNAME}{L_HIDE_MEMBER_SEARCH}
      - {S_FORM_TOKEN} -
      - - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      #{L_USERNAME}{L_JOINED}{L_POSTS}{L_RANK}{L_SEND_MESSAGE}{L_EMAIL}{L_WEBSITE}{L_MARK}
      {L_GROUP_LEADER}
      {L_GROUP_MEMBERS}
       {memberrow.ROW_NUMBER} {memberrow.USERNAME_FULL}{L_SELECT} ] {memberrow.JOINED} {memberrow.POSTS}{memberrow.RANK_IMG}{memberrow.RANK_TITLE} {PM_IMG}  {EMAIL_IMG}  {WWW_IMG}  {memberrow.PROFILE_FIELD1_VALUE}
      - {L_NO_GROUP_MEMBERS}{L_NO_MEMBERS} -
      {L_SELECT_SORT_METHOD}:   {L_ORDER}  
      -{S_FORM_TOKEN} - -
      - - - - - - -
      {PAGE_NUMBER} [ {TOTAL_USERS} ]{L_MARK_ALL} :: {L_UNMARK_ALL}
      - - - - - - -
      - - - -
      - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/memberlist_email.html b/phpBB/styles/subsilver2/template/memberlist_email.html deleted file mode 100644 index 976ac1ad89..0000000000 --- a/phpBB/styles/subsilver2/template/memberlist_email.html +++ /dev/null @@ -1,73 +0,0 @@ - - -
      - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_SEND_EMAIL_USER} {USERNAME}
      {ERROR_MESSAGE}
      {L_RECIPIENT}{USERNAME}
      {L_SUBJECT}
      {L_EMAIL_ADDRESS}
      {L_REAL_NAME}
      {L_DEST_LANG}
      {L_DEST_LANG_EXPLAIN}
      {L_MESSAGE_BODY}
      {L_EMAIL_BODY_EXPLAIN}
      {L_OPTIONS} - - - - - -
      {L_CC_EMAIL}
      -
      - - {S_FORM_TOKEN} - -
      - -
      - -
      - - - -
      - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/memberlist_group.html b/phpBB/styles/subsilver2/template/memberlist_group.html deleted file mode 100644 index 650868f810..0000000000 --- a/phpBB/styles/subsilver2/template/memberlist_group.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - -
      {L_GROUP_INFORMATION}
      {L_GROUP_NAME}: style="color:#{GROUP_COLOR}">{GROUP_NAME}{AVATAR_IMG}
      {RANK_IMG}{GROUP_RANK}

      {PM_IMG}
      {L_GROUP_DESC}:{GROUP_DESC}

      {GROUP_TYPE}

      diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html deleted file mode 100644 index acbe1fec2f..0000000000 --- a/phpBB/styles/subsilver2/template/memberlist_im.html +++ /dev/null @@ -1,139 +0,0 @@ - - -
      - - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_SEND_IM}
      {L_SEND_IM_EXPLAIN}
      {L_IM_RECIPIENT}: {USERNAME} [ {IM_CONTACT} ] {PRESENCE_IMG}

      {L_IM_ADD_CONTACT}
      {L_IM_SEND_MESSAGE}

      {L_IM_DOWNLOAD_APP} | {L_IM_AIM_EXPRESS}
       
      - - - - {L_IM_ADD_CONTACT}
      {L_IM_SEND_MESSAGE} -
       
      {L_IM_MESSAGE}:
      {L_IM_NO_JABBER}
      {L_IM_SENT_JABBER}
      - {L_CLOSE_WINDOW} -{S_FORM_TOKEN} -
      - - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/memberlist_leaders.html b/phpBB/styles/subsilver2/template/memberlist_leaders.html deleted file mode 100644 index ba6dbde617..0000000000 --- a/phpBB/styles/subsilver2/template/memberlist_leaders.html +++ /dev/null @@ -1,71 +0,0 @@ - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_USERNAME}{L_FORUMS}{L_PRIMARY_GROUP}{L_RANK}{L_SEND_MESSAGE}
      {L_ADMINISTRATORS}
      {admin.USERNAME_FULL}   - - style="font-weight: bold; color:#{admin.GROUP_COLOR}" href="{admin.U_GROUP}">{admin.GROUP_NAME} - - {admin.GROUP_NAME} - -  {admin.RANK_IMG}{admin.RANK_TITLE} {PM_IMG} 
      {L_NO_ADMINISTRATORS}
      {L_MODERATORS}
      {mod.USERNAME_FULL}{L_ALL_FORUMS}   - - style="font-weight: bold; color:#{mod.GROUP_COLOR}" href="{mod.U_GROUP}">{mod.GROUP_NAME} - - {mod.GROUP_NAME} - -  {mod.RANK_IMG}{mod.RANK_TITLE} {PM_IMG} 
      {L_NO_MODERATORS}
      - -
      - -
      - - - -
      - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html deleted file mode 100644 index fff71a90d6..0000000000 --- a/phpBB/styles/subsilver2/template/memberlist_search.html +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_FIND_USERNAME}
      {L_FIND_USERNAME_EXPLAIN}
      {L_USERNAME}:{L_ICQ}:
      {L_EMAIL}:{L_AIM}:
      {L_JOINED}: {L_YIM}:
      {L_LAST_ACTIVE}:  {L_MSNM}:
      {L_POSTS}: {L_JABBER}:
      {L_SORT_BY}:  {L_POST_IP}:
      {L_GROUP}:  
      {L_GROUP}:
        
      -{S_FORM_TOKEN} -
      - -
      diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html deleted file mode 100644 index cb7346dacf..0000000000 --- a/phpBB/styles/subsilver2/template/memberlist_view.html +++ /dev/null @@ -1,197 +0,0 @@ - - -
      - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_VIEWING_PROFILE}

      {L_USER_PRESENCE}

      {L_USER_FORUM}

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_USER_IS_INACTIVE}
      {L_INACTIVE_REASON}: {USER_INACTIVE_REASON}

      {USERNAME} [ {L_USER_ADMIN} ]
      {RANK_TITLE}
      {RANK_IMG}
      {AVATAR_IMG}
      {ONLINE_IMG}
      [ {L_USE_PERMISSIONS} ]
      [ {L_ADD_FRIEND} | {L_ADD_FOE}{L_REMOVE_FRIEND}{L_REMOVE_FOE} ]
      -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_JOINED}: {JOINED}
      {L_VISITED}: {VISITED}
      {L_WARNINGS}: {WARNINGS}
      [ {L_VIEW_NOTES} | {L_WARN_USER} ]
      {L_TOTAL_POSTS}: {POSTS}
      [{POSTS_PCT} / {POSTS_DAY}]
      {L_SEARCH_USER_POSTS}
      {L_ACTIVE_IN_FORUM}: {ACTIVE_FORUM}
      [ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]-
      {L_ACTIVE_IN_TOPIC}: {ACTIVE_TOPIC}
      [ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]-
      -

      {L_CONTACT_USER}

      {L_ABOUT_USER}

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_EMAIL_ADDRESS}: {EMAIL_IMG}
      {L_PM}: {PM_IMG}
      {L_MSNM}: {MSN_IMG}{USER_MSN}
      {L_YIM}: {YIM_IMG}{USER_YIM}
      {L_AIM}: {AIM_IMG}{USER_AIM}
      {L_ICQ}: {ICQ_IMG}{USER_ICQ}
      {L_JABBER}: {JABBER_IMG}{USER_JABBER_IMG}
      -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_USERGROUPS}:
      {L_LOCATION}: {LOCATION}
      {L_AGE}: {AGE} -
      {L_OCCUPATION}: {OCCUPATION}
      {L_INTERESTS}: {INTERESTS}
      {L_WEBSITE}: {U_WWW}
      {PROFILE_FIELD1_NAME}: {PROFILE_FIELD1_VALUE}
      {custom_fields.PROFILE_FIELD_NAME}: {custom_fields.PROFILE_FIELD_VALUE}
      -

      {L_SIGNATURE}

      {SIGNATURE}
      - -
      - -
      - -
      - - - -
      - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/message_body.html b/phpBB/styles/subsilver2/template/message_body.html deleted file mode 100644 index f61a3e6365..0000000000 --- a/phpBB/styles/subsilver2/template/message_body.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - -
      {MESSAGE_TITLE}

      {MESSAGE_TEXT}


      - -
      - - - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html deleted file mode 100644 index 64201ff2b9..0000000000 --- a/phpBB/styles/subsilver2/template/overall_footer.html +++ /dev/null @@ -1,23 +0,0 @@ - {RUN_CRON_TASK} - - - - -
      - [ {L_ACP} ]

      - Powered by phpBB © 2000, 2002, 2005, 2007 phpBB Group -
      {TRANSLATION_INFO} -
      [ {DEBUG_OUTPUT} ]
      -
      - - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html deleted file mode 100644 index 6db4f85690..0000000000 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - - - - - -{META} -{SITENAME} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_TITLE} - - - - - - - - - -
      - -
      - - - - - -
      {SITE_LOGO_IMG}

      {SITENAME}

      {SITE_DESCRIPTION}
      -
      - - - -
      - - - - - -
      {LAST_VISIT_DATE}{CURRENT_TIME}
      -
      - -
      - -
      - - - - - -
      - - - -
      diff --git a/phpBB/styles/subsilver2/template/pagination.html b/phpBB/styles/subsilver2/template/pagination.html deleted file mode 100644 index bf9c854d9a..0000000000 --- a/phpBB/styles/subsilver2/template/pagination.html +++ /dev/null @@ -1 +0,0 @@ -{L_GOTO_PAGE} {L_PREVIOUS}  {PAGINATION}  {L_NEXT} \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/posting_attach_body.html b/phpBB/styles/subsilver2/template/posting_attach_body.html deleted file mode 100644 index 8c70e4c831..0000000000 --- a/phpBB/styles/subsilver2/template/posting_attach_body.html +++ /dev/null @@ -1,83 +0,0 @@ -
      - - - - - - - {L_ADD_ATTACHMENT} -
      {L_ADD_ATTACHMENT_EXPLAIN}
      {L_FILENAME}
      {L_FILE_COMMENT} - - - - - -
        - - - - -
      -
      -
      {L_POSTED_ATTACHMENTS}
      {L_FILENAME}{attach_row.FILENAME}
      {L_FILE_COMMENT}{attach_row.S_HIDDEN} - - - - - -
        - - - - -
      -
      -
      - - - - - - -
      {L_INFORMATION}
      {L_DRAFT_LOADED_PM}{L_DRAFT_LOADED}
      - -
      - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_LOAD_DRAFT}
      {L_LOAD_DRAFT_EXPLAIN}
      {L_SAVE_DATE}{L_DRAFT_TITLE}{L_OPTIONS}
      {draftrow.DATE}{draftrow.DRAFT_SUBJECT} -
      {L_TOPIC}: {draftrow.TITLE} -
      {L_FORUM}: {draftrow.TITLE} -
      {L_PRIVATE_MESSAGE} -
      {L_NO_TOPIC_FORUM} -
      {L_LOAD_DRAFT}
      - -
      - - - - - - - - - - - - - - - - - - -
      {L_MOVE}
      {L_UNGLOBALISE_EXPLAIN}

      {L_SELECT_DESTINATION_FORUM}  


        
      - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_POST_A}
      {ERROR}
      {L_DELETE_POST}: [ {L_DELETE_POST_WARN} ]
      {L_ICON}: - - - - -
      {L_NO_TOPIC_ICON}{L_NO_PM_ICON}
      -
      {L_USERNAME}:
      {L_TO}: - {S_HIDDEN_ADDRESS_FIELD} - - - {to_recipient.NAME}{to_recipient.NAME_FULL}   - - - {L_NO_TO_RECIPIENT} - -
      {L_BCC}: - - - {bcc_recipient.NAME}{bcc_recipient.NAME_FULL}   - - - {L_NO_BCC_RECIPIENT} - -
      {L_SUBJECT}:
      {L_MESSAGE_BODY}:
      {L_MESSAGE_BODY_EXPLAIN} 

      - - - - - - - - - - - - - - - -
      {L_SMILIES}
      - - {smiley.SMILEY_CODE} - -
      {L_MORE_SMILIES}
      - -
      - - - - - - - - - - -
      - -
      -
      {L_ATTACHMENTS}:  -
      {L_OPTIONS}:
      - - - - - - - - - - - - - - - - - - -
      {BBCODE_STATUS}
      {IMG_STATUS}
      {FLASH_STATUS}
      {URL_STATUS}
      {SMILIES_STATUS}
      -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_DISABLE_BBCODE}
      {L_DISABLE_SMILIES}
      {L_DISABLE_MAGIC_URL}
      {L_ATTACH_SIG}
      {L_NOTIFY_REPLY}
      {L_LOCK_TOPIC}
      {L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]
       {L_CHANGE_TOPIC_TO}{L_POST_TOPIC_AS}: {topic_type.L_TOPIC_TYPE}  
      -
      {L_STICK_TOPIC_FOR}:
      {L_STICKY_ANNOUNCE_TIME_LIMIT}
       {L_DAYS} {L_STICK_TOPIC_FOR_EXPLAIN}
      {L_EDIT_REASON}:
      {L_POST_CONFIRMATION}
      {L_POST_CONFIRM_EXPLAIN}
      - - {CONFIRM_IMAGE} -
      {L_CONFIRM_CODE}:
      {L_CONFIRM_CODE_EXPLAIN}
      - -   -   -   -   -
      {L_POLL_DELETE}:
      {S_HIDDEN_FIELDS} - -   - -   -   - -   -
      - - {S_FORM_TOKEN} - - -
      - - - - - - - - - - - - -
      - - - - - - - - -

      {L_WHO_IS_ONLINE}

      {LOGGED_IN_USER_LIST}
      - - -
      - - - - - -
      - - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html deleted file mode 100644 index 5adfeab6cd..0000000000 --- a/phpBB/styles/subsilver2/template/posting_buttons.html +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - {L_FONT_SIZE}: - - - - - - - - onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')" /> - - - - - - - colspan="2"> - - {L_FONT_COLOR} - - - diff --git a/phpBB/styles/subsilver2/template/posting_poll_body.html b/phpBB/styles/subsilver2/template/posting_poll_body.html deleted file mode 100644 index 3a523182f7..0000000000 --- a/phpBB/styles/subsilver2/template/posting_poll_body.html +++ /dev/null @@ -1,36 +0,0 @@ - - - {L_ADD_POLL} - - - {L_ADD_POLL_EXPLAIN} - - - {L_POLL_QUESTION}: - - - - {L_POLL_OPTIONS}:
      {L_POLL_OPTIONS_EXPLAIN} - - - - {L_POLL_MAX_OPTIONS}:
      {L_POLL_MAX_OPTIONS_EXPLAIN} - - - - {L_POLL_FOR}: -  {L_DAYS} {L_POLL_FOR_EXPLAIN} - - - - {L_POLL_VOTE_CHANGE}:
      {L_POLL_VOTE_CHANGE_EXPLAIN} - - - - - - - {L_POLL_DELETE}: - checked="checked" /> - - diff --git a/phpBB/styles/subsilver2/template/posting_preview.html b/phpBB/styles/subsilver2/template/posting_preview.html deleted file mode 100644 index b990428f36..0000000000 --- a/phpBB/styles/subsilver2/template/posting_preview.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - -
      {L_PREVIEW}
      {MINI_POST_IMG}{L_POSTED}: {POST_DATE}     {L_POST_SUBJECT}: {PREVIEW_SUBJECT}

      - - - - - - - - - - -
      {POLL_QUESTION}
      {L_POLL_LENGTH}
      - - - - - - - -
      - - - - - - {poll_option.POLL_OPTION_CAPTION}
      -
      {L_MAX_VOTES}
      -
      - - - - -
      {PREVIEW_MESSAGE}
      - -

      - - - - - - - - - - -
      {L_ATTACHMENTS}:
      {attachment.DISPLAY_ATTACHMENT}
      - -
      _________________
      {PREVIEW_SIGNATURE}
      -
      - -
      diff --git a/phpBB/styles/subsilver2/template/posting_progress_bar.html b/phpBB/styles/subsilver2/template/posting_progress_bar.html deleted file mode 100644 index f9decc506b..0000000000 --- a/phpBB/styles/subsilver2/template/posting_progress_bar.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - -
      - - - - -

      {L_UPLOAD_IN_PROGRESS}

      {PROGRESS_BAR}


      {L_CLOSE_WINDOW}

      -
      - - - diff --git a/phpBB/styles/subsilver2/template/posting_review.html b/phpBB/styles/subsilver2/template/posting_review.html deleted file mode 100644 index c3a7f7aead..0000000000 --- a/phpBB/styles/subsilver2/template/posting_review.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - -
      {L_POST_REVIEW}
      {L_POST_REVIEW_EXPLAIN}
      - - - - - - - - - - - - - - - - - - - - - -
      {L_AUTHOR}{L_MESSAGE}
      - - - - -
      -
      - - - - - - - -
       {L_POST_SUBJECT}: {post_review_row.POST_SUBJECT} 
      -
      - - - - - - - -
      - - - - -
      {post_review_row.MESSAGE}
      - - -

      - - - - - - - - - - -
      {L_ATTACHMENTS}:
      {post_review_row.attachment.DISPLAY_ATTACHMENT}
      - - -
      -
      - - - - - - -
       {post_review_row.MINI_POST_IMG}{post_review_row.MINI_POST_IMG}{L_POSTED}: {post_review_row.POST_DATE}
      -
      -
      -
      - -
      \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/posting_smilies.html b/phpBB/styles/subsilver2/template/posting_smilies.html deleted file mode 100644 index a6f35bf2b7..0000000000 --- a/phpBB/styles/subsilver2/template/posting_smilies.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - -
      - - - - - - - -
      {L_SMILIES}
      {smiley.SMILEY_CODE}
      {L_CLOSE_WINDOW}
      -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/posting_topic_review.html b/phpBB/styles/subsilver2/template/posting_topic_review.html deleted file mode 100644 index 9ac6f90d9e..0000000000 --- a/phpBB/styles/subsilver2/template/posting_topic_review.html +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - -
      {L_TOPIC_REVIEW} - {TOPIC_TITLE}
      - - - - - - - - - - - - - - - - - - - - - - -
      {L_AUTHOR}{L_MESSAGE}
      - - - - -
      -
      - - - - - - - -
       {L_POST_SUBJECT}: {topic_review_row.POST_SUBJECT} {QUOTE_IMG}
      -
      - - - - - - - -
      - - - - -
      -
      {topic_review_row.MESSAGE}
      - - -

      - - - - - - - - - - -
      {L_ATTACHMENTS}:
      {topic_review_row.attachment.DISPLAY_ATTACHMENT}
      - - - - - -
      -
      - - - - - - -
      [ {L_POST_DETAILS} ]{topic_review_row.MINI_POST_IMG}{topic_review_row.MINI_POST_IMG}{L_POSTED}: {topic_review_row.POST_DATE}
      -
      -
      -
      - -
      diff --git a/phpBB/styles/subsilver2/template/report_body.html b/phpBB/styles/subsilver2/template/report_body.html deleted file mode 100644 index 6861d28ce1..0000000000 --- a/phpBB/styles/subsilver2/template/report_body.html +++ /dev/null @@ -1,41 +0,0 @@ - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_REPORT_POST}
      {L_REPORT_POST_EXPLAIN}
      {L_REASON}:
      {L_REPORT_NOTIFY}:
      {L_REPORT_NOTIFY_EXPLAIN}
      checked="checked" />  {L_YES}   checked="checked" />  {L_NO}
      {L_MORE_INFO}:
      {L_CAN_LEAVE_BLANK}
       
      -{S_FORM_TOKEN} -
      - -
      - - - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/search_body.html b/phpBB/styles/subsilver2/template/search_body.html deleted file mode 100644 index a0ec30e9ba..0000000000 --- a/phpBB/styles/subsilver2/template/search_body.html +++ /dev/null @@ -1,78 +0,0 @@ - - -
      - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_SEARCH_QUERY}
      {L_SEARCH_KEYWORDS}:
      {L_SEARCH_KEYWORDS_EXPLAIN}

      {L_SEARCH_ALL_TERMS}
      {L_SEARCH_ANY_TERMS}
      {L_SEARCH_AUTHOR}:
      {L_SEARCH_AUTHOR_EXPLAIN}
      {L_SEARCH_FORUMS}:
      {L_SEARCH_FORUMS_EXPLAIN}
      {L_SEARCH_OPTIONS}
      {L_SEARCH_SUBFORUMS}: {L_YES}   {L_NO}{L_SEARCH_WITHIN}: {L_SEARCH_TITLE_MSG}
      {L_SEARCH_MSG_ONLY}
      {L_SEARCH_TITLE_ONLY}
      {L_SEARCH_FIRST_POST}
      {L_RESULT_SORT}: {S_SELECT_SORT_KEY}
      {L_SORT_ASCENDING}
      {L_SORT_DESCENDING}
      {L_DISPLAY_RESULTS}: {L_POSTS}   {L_TOPICS}
      {L_RESULT_DAYS}: {S_SELECT_SORT_DAYS}{L_RETURN_FIRST}: {L_POST_CHARACTERS}
      {S_HIDDEN_FIELDS}  
      - -
      - -
      - - - - - - - - - - - - - -
      {L_RECENT_SEARCHES}
      {recentsearch.KEYWORDS}{recentsearch.TIME}
      - -
      - - -
      - - - -
      - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/search_results.html b/phpBB/styles/subsilver2/template/search_results.html deleted file mode 100644 index 7977665893..0000000000 --- a/phpBB/styles/subsilver2/template/search_results.html +++ /dev/null @@ -1,146 +0,0 @@ - - -
      - - - - - - - - - -
      {SEARCH_TITLE}{SEARCH_MATCHES}
      {L_SEARCHED_TOPIC}: {SEARCH_TOPIC}
      {L_SEARCHED_FOR}: {SEARCH_WORDS} {L_IGNORED_TERMS}: {IGNORED_WORDS}
      {L_SEARCH_IN_RESULTS}:
      - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        {L_TOPICS}  {L_AUTHOR}  {L_REPLIES}  {L_VIEWS}  {L_LAST_POST} 
      {searchresults.TOPIC_FOLDER_IMG} - - - - - {NEWEST_POST_IMG} - {topicrow.ATTACH_ICON_IMG} {searchresults.TOPIC_TITLE} - - {searchresults.UNAPPROVED_IMG}  - - - {REPORTED_IMG}  - - -

      [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {searchresults.PAGINATION} ]

      - - -

      {L_GLOBAL}

      - -

      {L_IN} {searchresults.FORUM_TITLE}

      - -

      {searchresults.TOPIC_AUTHOR_FULL}

      {searchresults.TOPIC_REPLIES}

      {searchresults.TOPIC_VIEWS}

      -

      {searchresults.LAST_POST_TIME}

      -

      {searchresults.LAST_POST_AUTHOR_FULL} - {LAST_POST_IMG} -

      -
      {L_NO_SEARCH_RESULTS}
      {L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS} {L_SORT_BY}: {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_AUTHOR}{L_MESSAGE}
      {searchresults.L_IGNORE_POST}

       {L_FORUM}: {searchresults.FORUM_TITLE}{L_GLOBAL}   {L_TOPIC}: {searchresults.TOPIC_TITLE}

      - - - - -
      -
      - -  {L_POST_SUBJECT}: {searchresults.POST_SUBJECT} - - [ {L_JUMP_TO_POST} ] - -
      -
      {L_POSTED}: {searchresults.POST_DATE} 
      -
      -

      {L_REPLIES}: {searchresults.TOPIC_REPLIES}
      {L_VIEWS}: {searchresults.TOPIC_VIEWS}


      - - - - -
      {searchresults.MESSAGE}
      -
      {L_NO_SEARCH_RESULTS}
      {L_SORT_BY}: {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
      - - -
      - -
      {PAGE_NUMBER} [ {SEARCH_MATCHES} ]
      - - -

      - - - -
      - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/searchbox.html b/phpBB/styles/subsilver2/template/searchbox.html deleted file mode 100644 index cb0bb5ba73..0000000000 --- a/phpBB/styles/subsilver2/template/searchbox.html +++ /dev/null @@ -1 +0,0 @@ -
      {L_SEARCH_FOR}:
      diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html deleted file mode 100644 index c8b69dd5ad..0000000000 --- a/phpBB/styles/subsilver2/template/simple_footer.html +++ /dev/null @@ -1,20 +0,0 @@ - -
      - - - -
      - Powered by phpBB © 2000, 2002, 2005, 2007 phpBB Group -
      - - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html deleted file mode 100644 index bcef9a7059..0000000000 --- a/phpBB/styles/subsilver2/template/simple_header.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - -{META} -{SITENAME} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_TITLE} - - - - - - -
      \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/template.cfg b/phpBB/styles/subsilver2/template/template.cfg deleted file mode 100644 index c83a1d94ad..0000000000 --- a/phpBB/styles/subsilver2/template/template.cfg +++ /dev/null @@ -1,23 +0,0 @@ -# -# phpBB Template Configuration File -# -# @package phpBB3 -# @copyright (c) 2005 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License -# -# -# At the left is the name, please do not change this -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# -# - -# General Information about this template -name = subsilver2 -copyright = © phpBB Group, 2003 -version = 3.0.0 - diff --git a/phpBB/styles/subsilver2/template/ucp_agreement.html b/phpBB/styles/subsilver2/template/ucp_agreement.html deleted file mode 100644 index c02ebe18e6..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_agreement.html +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - -
      - - - - - - - - -
      {SITENAME} - {L_REGISTRATION}
      - - - - - - - - -

      {L_COPPA_BIRTHDAY}

      {L_COPPA_NO} :: {L_COPPA_YES}

      -
      {L_TERMS_OF_USE}

      -
      -

      - -
      -
      -
      - {S_HIDDEN_FIELDS} - {S_FORM_TOKEN} -
      - - - - - - - - - - -
      {SITENAME} - {AGREEMENT_TITLE}
      - - - - -
      -
      {AGREEMENT_TEXT}

      -
      - {L_BACK} -
      -
      -
      - - - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_attachments.html b/phpBB/styles/subsilver2/template/ucp_attachments.html deleted file mode 100644 index 35dcd33ac4..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_attachments.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      #{L_FILENAME}{L_POST_TIME}{L_FILESIZE}{L_DOWNLOADS}{L_DELETE}
      - - - - - - -
       [ {TOTAL_ATTACHMENTS} ] 
      -
       {attachrow.ROW_NUMBER} {attachrow.FILENAME}
      {L_PM}: {L_TOPIC}: {attachrow.TOPIC_TITLE}
       {attachrow.POST_TIME} {attachrow.SIZE}{attachrow.DOWNLOAD_COUNT}
      {L_SORT_BY}:  
       
      - - - - - - - - - - - - -
      {L_TITLE}
      {L_UCP_NO_ATTACHMENTS}
      - - - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_footer.html b/phpBB/styles/subsilver2/template/ucp_footer.html deleted file mode 100644 index 1681fe3849..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_footer.html +++ /dev/null @@ -1,13 +0,0 @@ - - {S_FORM_TOKEN} - - -{S_FORM_TOKEN} - -
      - - - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_groups_manage.html b/phpBB/styles/subsilver2/template/ucp_groups_manage.html deleted file mode 100644 index 4a3296d153..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_groups_manage.html +++ /dev/null @@ -1,251 +0,0 @@ - - - - - -
      -

      {L_WARNING}

      -

      {ERROR_MSG}

      -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_USERGROUPS}
      {L_GROUPS_EXPLAIN}
      {L_GROUP_DETAILS}
      for="group_name">{L_GROUP_NAME}: style="color: #{GROUP_COLOUR};">{GROUP_NAME}
      -
      checked="checked" /> {L_PARSE_BBCODE}   checked="checked" /> {L_PARSE_SMILIES}   checked="checked" /> {L_PARSE_URLS} -

      {L_GROUP_TYPE_EXPLAIN}
      - {L_GROUP_OPEN}   - {L_GROUP_REQUEST}   - {L_GROUP_CLOSED}   - {L_GROUP_HIDDEN} -
      {L_GROUP_SETTINGS_SAVE}

      {L_GROUP_COLOR_EXPLAIN}
        [ {L_COLOUR_SWATCH} ]
      {L_GROUP_AVATAR}

      {L_AVATAR_EXPLAIN}
      {AVATAR_IMAGE}

       {L_DELETE_AVATAR}

      {L_UPLOAD_AVATAR_URL_EXPLAIN}

      {L_LINK_REMOTE_AVATAR_EXPLAIN}

      {L_LINK_REMOTE_SIZE_EXPLAIN}
      px X px
      {L_AVATAR_GALLERY}
       
      - - - - - - - - - - - - - -
      {avatar_row.avatar_column.AVATAR_NAME}
      -
        -
      - - - -

      {L_GROUP_MEMBERS}

      - -

      {L_GROUP_MEMBERS_EXPLAIN}

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_USERNAME}{L_GROUP_DEFAULT}{L_JOINED}{L_POSTS}{L_MARK}
      {L_GROUP_LEAD}
      {leader.USERNAME_FULL}{L_YES}{L_NO}{leader.JOINED}{leader.USER_POSTS}
      {L_GROUP_APPROVED}
      {L_GROUP_PENDING}
      {member.USERNAME_FULL}{L_YES}{L_NO}{member.JOINED}{member.USER_POSTS}
      {L_GROUPS_NO_MEMBERS}
      - - - -
      -
      - -

      {L_ADD_USERS}

      - -

      {L_ADD_USERS_EXPLAIN}

      - - - - - - - - - - - - - - - - -
      {L_ADD_USERS}

      {L_USER_GROUP_DEFAULT_EXPLAIN}
      {L_YES}   {L_NO}

      {L_USERNAMES_EXPLAIN}

      [ {L_FIND_USERNAME} ]
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_USERGROUPS}
      {L_GROUPS_EXPLAIN}
      {L_GROUP_DETAILS}{L_OPTIONS}
      {L_GROUP_LEADER}
      style="color: #{leader.GROUP_COLOUR};">{leader.GROUP_NAME}

      {leader.GROUP_DESC}

      {L_EDIT}{L_GROUP_LIST}
      {L_NO_LEADERS}
       
      - - - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_groups_membership.html b/phpBB/styles/subsilver2/template/ucp_groups_membership.html deleted file mode 100644 index b92dabc967..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_groups_membership.html +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_USERGROUPS}
      {L_GROUPS_EXPLAIN}
      {L_GROUP_DETAILS}{L_SELECT}
      {L_GROUP_LEADER}
      checked="checked" value="{leader.GROUP_ID}" /> - style="color: #{leader.GROUP_COLOUR};">{leader.GROUP_NAME} -
      {leader.GROUP_DESC} -
      {leader.GROUP_STATUS} -
      {L_GROUP_MEMBER}
      checked="checked" value="{member.GROUP_ID}" /> - style="color: #{member.GROUP_COLOUR};">{member.GROUP_NAME} -
      {member.GROUP_DESC} -
      {member.GROUP_STATUS} -
      {L_GROUP_PENDING}
        - style="color: #{pending.GROUP_COLOUR};">{pending.GROUP_NAME} -
      {pending.GROUP_DESC} -
      {pending.GROUP_STATUS} -
      {L_GROUP_NONMEMBER}
        - style="color: #{nonmember.GROUP_COLOUR};">{nonmember.GROUP_NAME} -
      {nonmember.GROUP_DESC} -
      {nonmember.GROUP_STATUS} -
      {L_SELECT}:   
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_header.html b/phpBB/styles/subsilver2/template/ucp_header.html deleted file mode 100644 index d330918270..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_header.html +++ /dev/null @@ -1,163 +0,0 @@ - - - - -
      - - - - - - + +
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_PM_TO}
      {L_USERNAME}:
      [ {L_FIND_USERNAME} ]
       
      {L_USERNAMES}:

      - [ {L_FIND_USERNAME} ] -
      {L_USERGROUPS}:
        
        
      -
      - - - - - - - - - - - - - -
      {L_OPTIONS}
      {l_block1.L_TITLE} - - - - - - - -
      - - - - - - - -
      {l_block1.L_TITLE} - -
      - -
      - - - - - - - - - - - - - - - - -
      {L_MESSAGE_COLOURS}
      {pm_colour_info.LANG}{pm_colour_info.IMG}{pm_colour_info.LANG}
      - -
      - - - - - - - - - - -
      {L_FRIENDS}
      - - {L_FRIENDS_ONLINE} - - - -
      - - {L_FRIENDS_OFFLINE} - - - -
      - - -
      diff --git a/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html b/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html deleted file mode 100644 index 191e25c297..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_main_bookmarks.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_UCP}
      {L_BOOKMARKS_EXPLAIN}
      {L_BOOKMARKS}
      {L_BOOKMARKS_DISABLED}
      - - - - - - -
       [ {TOTAL_TOPICS} ] 
      -
      {topicrow.TOPIC_FOLDER_IMG}{L_DELETED_TOPIC} -

      {NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TITLE}

      - {L_GLOBAL_ANNOUNCEMENT}{L_FORUM}: {topicrow.FORUM_NAME} - -

      [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ]

      - -
      -

      {topicrow.LAST_POST_TIME}

      -

      {topicrow.LAST_POST_AUTHOR_FULL} - {LAST_POST_IMG} -

      -
      {L_NO_BOOKMARKS}
       
      - - - - - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_main_drafts.html b/phpBB/styles/subsilver2/template/ucp_main_drafts.html deleted file mode 100644 index 14ae52be53..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_main_drafts.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_UCP}
      {L_DRAFTS_EXPLAIN}
      {ERROR}
      {L_SAVE_DATE}{L_DRAFT_TITLE}{L_OPTIONS}{L_DELETE}
      {draftrow.DATE} -

      {draftrow.DRAFT_SUBJECT}

      - {L_TOPIC}: {draftrow.TITLE} - {L_FORUM}: {draftrow.TITLE} - {L_PRIVATE_MESSAGE} - {L_NO_TOPIC_FORUM} -
      {L_LOAD_DRAFT}
      {L_VIEW_EDIT}
      {L_NO_SAVED_DRAFTS}
       
      {L_SUBJECT}:
      {L_MESSAGE}:
      {L_EDIT_DRAFT_EXPLAIN}
      - - - - - - - - - -
      - - - - -
      - -
      -
      -

      {L_BACK_TO_DRAFTS}

      {S_HIDDEN_FIELDS}  
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_main_front.html b/phpBB/styles/subsilver2/template/ucp_main_front.html deleted file mode 100644 index 4dbe2353ae..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_main_front.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_UCP}

      {L_UCP_WELCOME}

      {L_IMPORTANT_NEWS}
      {topicrow.TOPIC_FOLDER_IMG} -

      {NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TITLE}

      {topicrow.GOTO_PAGE}

      -
      -

      {topicrow.LAST_POST_TIME}

      -

      {topicrow.LAST_POST_AUTHOR_FULL} - {LAST_POST_IMG} -

      -
      {L_NO_IMPORTANT_NEWS}
      {L_YOUR_DETAILS}
      - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_JOINED}: {JOINED}
      {L_TOTAL_POSTS}: {POSTS}
      [{POSTS_PCT} / {POSTS_DAY}]
      {L_SEARCH_YOUR_POSTS}
      {POSTS}
      {L_ACTIVE_IN_FORUM}: {ACTIVE_FORUM}
      [ {ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT} ]-
      {L_ACTIVE_IN_TOPIC}: {ACTIVE_TOPIC}
      [ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]-
      {L_YOUR_WARNINGS}: {WARNING_IMG} [ {WARNINGS} ]
      -
       
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_main_subscribed.html b/phpBB/styles/subsilver2/template/ucp_main_subscribed.html deleted file mode 100644 index 844a90f3e6..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_main_subscribed.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_UCP}
      {L_WATCHED_EXPLAIN}
      {L_WATCHED_FORUMS}
      {forumrow.FORUM_FOLDER_IMG}

      {forumrow.FORUM_NAME}

      {forumrow.LAST_POST_TIME}
      {forumrow.LAST_POST_AUTHOR_FULL} {LAST_POST_IMG}{L_NO_POSTS}
      {L_NO_WATCHED_FORUMS}
      {L_WATCHED_TOPICS}
      - - - - - - -
       [ {TOTAL_TOPICS} ] 
      -
      {topicrow.TOPIC_FOLDER_IMG} -

      {NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TITLE}

      - {L_GLOBAL_ANNOUNCEMENT}{L_FORUM}: {topicrow.FORUM_NAME} - -

      [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ]

      - -
      -

      {topicrow.LAST_POST_TIME}

      -

      {topicrow.LAST_POST_AUTHOR_FULL} - {LAST_POST_IMG} -

      -
      {L_NO_WATCHED_TOPICS}
       
      - - - - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_pm_history.html b/phpBB/styles/subsilver2/template/ucp_pm_history.html deleted file mode 100644 index 9e05368340..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_pm_history.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - -
      {L_MESSAGE_HISTORY} - {HISTORY_TITLE}
      - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_AUTHOR}{L_MESSAGE}
      - - - - -
      -
      style="background-color:lightblue"> -
      {L_PM_SUBJECT}: {history_row.SUBJECT}
      {L_FOLDER}: {history_row.FOLDER}
      -
      - - - - - - - -
      - - - - -
      {history_row.MESSAGE}
      -
      - - - - - - -
       {history_row.MINI_POST_IMG}{L_SENT_AT}: {history_row.SENT_DATE}
      -
      -
      {L_VIEW_PM}
      -
      - -
      diff --git a/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html b/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html deleted file mode 100644 index 314d03caf3..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html +++ /dev/null @@ -1,46 +0,0 @@ - - - {S_FORM_TOKEN} - - - - - - - -
      - - - - - -
      - - - {L_PRINT_PM} | - {L_FORWARD_PM} - - - - - -
      - - - -   - {S_FORM_TOKEN} -
      - - -
      - {L_DISPLAY_MESSAGES}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} - {S_FORM_TOKEN} -
      - -
      -
      - - - - diff --git a/phpBB/styles/subsilver2/template/ucp_pm_message_header.html b/phpBB/styles/subsilver2/template/ucp_pm_message_header.html deleted file mode 100644 index 370fa673dd..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_pm_message_header.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - -
      - - - - - -
      - - - - - - - - - - -
       [ {FOLDER_CUR_MESSAGES}/{FOLDER_MAX_MESSAGES} {L_MESSAGES} ({FOLDER_PERCENT}%) ]  [ {FOLDER_CUR_MESSAGES} {L_MESSAGES} ] 
      - - - - - - {L_VIEW_PREVIOUS_HISTORY} | {L_VIEW_NEXT_HISTORY} | - {L_VIEW_PREVIOUS_PM} | {L_VIEW_NEXT_PM}  - - -
      -
      diff --git a/phpBB/styles/subsilver2/template/ucp_pm_options.html b/phpBB/styles/subsilver2/template/ucp_pm_options.html deleted file mode 100644 index 3ff18d8c15..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_pm_options.html +++ /dev/null @@ -1,192 +0,0 @@ - - - - - - - -
      - {ERROR_MESSAGE} - {NOTIFICATION_MESSAGE} -
      -
      - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_ADD_NEW_RULE}
      {L_IF}:{CHECK_CURRENT} 
       {RULE_CURRENT} 
        - - - - -  [ {L_FIND_USERNAME} ] - - {L_NO_GROUPS} - - - {COND_CURRENT} - - -  
       {ACTION_CURRENT} 
      - -
      - - - - - - - - - - - - - - - - - - - -
      {L_DEFINED_RULES}
      #{rule.COUNT}{L_IF} {rule.CHECK}{rule.RULE}{rule.STRING}{rule.ACTION} -> {rule.FOLDER}
      {L_NO_RULES_DEFINED}
      - -
      - - - - - - - - - - - - - - - - - -
      {L_RENAME_FOLDER}
      {L_RENAME_FOLDER}:
      {L_NEW_FOLDER_NAME}:
      - -
      - - - - - - - - - - - - - - - - - - - - -
      {L_ADD_FOLDER}
      {L_MAX_FOLDER_REACHED}
      {L_ADD_FOLDER}:
      - - -
      - - - - - - - - - - - - - - - - - - - - - - - -
      {L_REMOVE_FOLDER}
      {L_REMOVE_FOLDER}: {L_AND}
        {L_MOVE_DELETED_MESSAGES_TO}  
        {L_DELETE_MESSAGES_IN_FOLDER}
       
      - -
      - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_FOLDER_OPTIONS}
      {L_IF_FOLDER_FULL}:  {L_DELETE_OLDEST_MESSAGES}
        {L_MOVE_TO_FOLDER}:
        {L_HOLD_NEW_MESSAGES}
      {L_DEFAULT_ACTION}:
      {L_DEFAULT_ACTION_EXPLAIN}
      {DEFAULT_ACTION}
      -{S_FORM_TOKEN} -
      - diff --git a/phpBB/styles/subsilver2/template/ucp_pm_popup.html b/phpBB/styles/subsilver2/template/ucp_pm_popup.html deleted file mode 100644 index 68816b88a8..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_pm_popup.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - -
      - - - - -
      -
      - - {L_LOGIN_CHECK_PM} - - {MESSAGE}

      {CLICK_TO_VIEW} - -
      -

      {L_CLOSE_WINDOW}

      -
      -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html b/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html deleted file mode 100644 index 36998f18c1..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html +++ /dev/null @@ -1,122 +0,0 @@ - - -
      - - - - - -
      - - - - - - - -
      - - - - - - - - - - - - - - - - - -
      {L_OPTIONS}
      {L_DELIMITER}:
      {L_ENCLOSURE}:
        
      - {S_FORM_TOKEN} - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      - - {RULE_REMOVED_MESSAGES} -
      - - - {NOT_MOVED_MESSAGES}
      {RELEASE_MESSAGE_INFO} - -
       {L_SUBJECT}  {L_RECIPIENTS}{L_AUTHOR}  {L_SENT_AT}  {L_MARK} 
      {messagerow.FOLDER_IMG}{messagerow.PM_ICON_IMG} - -   - - {messagerow.PM_IMG}  - - - - {messagerow.ATTACH_ICON_IMG} - - {L_MESSAGE_REMOVED_FROM_OUTBOX}
      - {L_DELETE_MESSAGE} - - {messagerow.SUBJECT} - - -
      {L_PM_FROM_REMOVED_AUTHOR} - -

      {messagerow.RECIPIENTS}{messagerow.MESSAGE_AUTHOR_FULL}

      {messagerow.SENT_TIME}

      {L_NO_MESSAGES}
      - - - - - - - -
      - -
       
      -
        
      - -
      - -
      - - - - -
      - -
      - - diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html deleted file mode 100644 index b3387681bc..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html +++ /dev/null @@ -1,124 +0,0 @@ - - -
      - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_PM_SUBJECT}:{SUBJECT}
      {L_PM_FROM}:{MESSAGE_AUTHOR_FULL}
      {L_SENT_AT}:{SENT_DATE}
      {L_TO}: - - {to_recipient.NAME}{to_recipient.NAME_FULL}  - -
      {L_BCC}: - - {bcc_recipient.NAME}{bcc_recipient.NAME_FULL}  - -
      - -
      - - - - - - - - - - - - - - - - - - - - - - -
      {L_MESSAGE}
      - - - - -
      -
      {MESSAGE}
      - - -

      - - - - - - - - - - -
      {L_ATTACHMENTS}:
      {attachment.DISPLAY_ATTACHMENT}
      - - - -

      {L_DOWNLOAD_NOTICE}
      - - -
      _________________
      {SIGNATURE}
      - - - {EDITED_MESSAGE} - - -

      - - - - - -
      {DELETE_IMG}
      - -
      -
      - -
      - - -
      - -
      - - - - diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html deleted file mode 100644 index 7963d76765..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - -{SITENAME} :: {PAGE_TITLE} - - - - - - - - - - - - - - - - - -
      {SITENAME}
      {L_PRIVATE_MESSAGING}

      {SUBJECT}
      {PAGE_NUMBER}
      - -
      - - - - - - - - - - - - - - - - - - - - - - - -
      {L_PM_FROM}: {MESSAGE_AUTHOR} [ {SENT_DATE} ]
      {L_TO}: - - class="sep">{to_recipient.NAME}  - -
      {L_BCC}: - - class="sep">{bcc_recipient.NAME}  - -

      {MESSAGE}
      - -
      - - - - - - - - - - -
      {PAGE_NUMBER}{S_TIMEZONE}
      Powered by phpBB © 2000, 2002, 2005, 2007 phpBB Group
      http://www.phpbb.com/
      - - - diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html deleted file mode 100644 index e2266b7d38..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_TITLE}
      {ERROR}
      {L_SHOW_EMAIL}: checked="checked" />{L_YES}   checked="checked" />{L_NO}
      {L_ADMIN_EMAIL}: checked="checked" />{L_YES}   checked="checked" />{L_NO}
      {L_ALLOW_PM}:
      {L_ALLOW_PM_EXPLAIN}
      checked="checked" />{L_YES}   checked="checked" />{L_NO}
      {L_HIDE_ONLINE}:
      {L_HIDE_ONLINE_EXPLAIN}
      checked="checked" />{L_YES}   checked="checked" />{L_NO}
      {L_NOTIFY_METHOD}:
      {L_NOTIFY_METHOD_EXPLAIN}
      checked="checked" />{L_NOTIFY_METHOD_EMAIL}   checked="checked" />{L_NOTIFY_METHOD_IM}   checked="checked" />{L_NOTIFY_METHOD_BOTH}
      {L_NOTIFY_ON_PM}: checked="checked" />{L_YES}   checked="checked" />{L_NO}
      {L_POPUP_ON_PM}: checked="checked" />{L_YES}   checked="checked" />{L_NO}
      {L_BOARD_LANGUAGE}:
      {L_BOARD_STYLE}:
      {L_BOARD_TIMEZONE}: - -
      {L_BOARD_DST}: checked="checked" /> {L_YES}   checked="checked" /> {L_NO}
      {L_BOARD_DATE_FORMAT}:
      {L_BOARD_DATE_FORMAT_EXPLAIN}
      - -
      style="display:none;">
      -
      {S_HIDDEN_FIELDS}  
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_post.html b/phpBB/styles/subsilver2/template/ucp_prefs_post.html deleted file mode 100644 index edf0070baa..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_prefs_post.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_TITLE}
      {ERROR}
      {L_DEFAULT_BBCODE}: checked="checked" />{L_YES}    checked="checked" />{L_NO}
      {L_DEFAULT_SMILIES}: checked="checked" />{L_YES}    checked="checked" />{L_NO}
      {L_DEFAULT_ADD_SIG}: checked="checked" />{L_YES}    checked="checked" />{L_NO}
      {L_DEFAULT_NOTIFY}: checked="checked" />{L_YES}    checked="checked" />{L_NO}
      {S_HIDDEN_FIELDS}  
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_view.html b/phpBB/styles/subsilver2/template/ucp_prefs_view.html deleted file mode 100644 index b97bcfde00..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_prefs_view.html +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_TITLE}
      {ERROR}
      {L_VIEW_IMAGES}: checked="checked" />{L_YES}    checked="checked" />{L_NO}
      {L_VIEW_FLASH}: checked="checked" />{L_YES}    checked="checked" />{L_NO}
      {L_VIEW_SMILIES}: checked="checked" />{L_YES}    checked="checked" />{L_NO}
      {L_VIEW_SIGS}: checked="checked" />{L_YES}    checked="checked" />{L_NO}
      {L_VIEW_AVATARS}: checked="checked" />{L_YES}    checked="checked" />{L_NO}
      {L_DISABLE_CENSORS}: checked="checked" />{L_YES}    checked="checked" />{L_NO}
      {L_VIEW_TOPICS_DAYS}:{S_TOPIC_SORT_DAYS}
      {L_VIEW_TOPICS_KEY}:{S_TOPIC_SORT_KEY}
      {L_VIEW_TOPICS_DIR}:{S_TOPIC_SORT_DIR}
      {L_VIEW_POSTS_DAYS}:{S_POST_SORT_DAYS}
      {L_VIEW_POSTS_KEY}:{S_POST_SORT_KEY}
      {L_VIEW_POSTS_DIR}:{S_POST_SORT_DIR}
      {S_HIDDEN_FIELDS}  
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html b/phpBB/styles/subsilver2/template/ucp_profile_avatar.html deleted file mode 100644 index c981b8df75..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_profile_avatar.html +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_TITLE}
      {ERROR}
      {L_CURRENT_IMAGE}:
      {L_AVATAR_EXPLAIN}

      - {AVATAR}

       {L_DELETE_AVATAR} - -
      {L_AVATAR_FEATURES_DISABLED}
      {L_UPLOAD_AVATAR_FILE}:
      {L_UPLOAD_AVATAR_URL}:
      {L_UPLOAD_AVATAR_URL_EXPLAIN}
      {L_LINK_REMOTE_AVATAR}:
      {L_LINK_REMOTE_AVATAR_EXPLAIN}
      {L_LINK_REMOTE_SIZE}:
      {L_LINK_REMOTE_SIZE_EXPLAIN}
      px X px
      {L_AVATAR_GALLERY}: {L_DISPLAY_GALLERY}
      {L_AVATAR_GALLERY}
      {L_AVATAR_CATEGORY}:  
      - - - - - - - - - - - - - -
      {avatar_row.avatar_column.AVATAR_NAME}
      -
      {S_HIDDEN_FIELDS}  
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html b/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html deleted file mode 100644 index c08b873834..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_profile_profile_info.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_TITLE}
      {ERROR}
      {L_PROFILE_INFO_NOTICE}
      {L_UCP_ICQ}:
      {L_UCP_AIM}:
      {L_UCP_MSNM}:
      {L_UCP_YIM}:
      {L_UCP_JABBER}:
      {L_WEBSITE}:
      {L_LOCATION}:
      {L_OCCUPATION}:
      {L_INTERESTS}:
      {L_BIRTHDAY}:
      {L_BIRTHDAY_EXPLAIN}
      {L_DAY}: {L_MONTH}: {L_YEAR}:
      - {profile_fields.LANG_NAME}: - * -
      {profile_fields.LANG_EXPLAIN} -
      {profile_fields.FIELD}
      {profile_fields.ERROR}
      {S_HIDDEN_FIELDS}  
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html deleted file mode 100644 index 78fb5a9628..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_TITLE}
      {L_FORCE_PASSWORD_EXPLAIN}
      {ERROR}
      {L_USERNAME}:
      {L_USERNAME_EXPLAIN}
      {USERNAME}
      {L_EMAIL_ADDRESS}: {EMAIL}
      {L_CONFIRM_EMAIL}:
      {L_CONFIRM_EMAIL_EXPLAIN}
      {L_NEW_PASSWORD}:
      {L_CHANGE_PASSWORD_EXPLAIN}
      {L_CONFIRM_PASSWORD}:
      {L_CONFIRM_PASSWORD_EXPLAIN}
      {L_CONFIRM_CHANGES}
      {L_CURRENT_PASSWORD}:
      {L_CURRENT_PASSWORD_EXPLAIN}
      {S_HIDDEN_FIELDS}  
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_profile_signature.html b/phpBB/styles/subsilver2/template/ucp_profile_signature.html deleted file mode 100644 index 26b0804df1..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_profile_signature.html +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_TITLE}
      {L_SIGNATURE_EXPLAIN}
      {ERROR}
      - - - - - - - - - - - - -
      - - - - -
      - -
      -
      -
      {L_OPTIONS}
      - - - - - - - - - - - - - - - - -
      {BBCODE_STATUS}
      {IMG_STATUS}
      {FLASH_STATUS}
      {URL_STATUS}
      {SMILIES_STATUS}
      -
      - - - - - - - - - - - - - - - - - - - -
      {L_DISABLE_BBCODE}
      {L_DISABLE_SMILIES}
      {L_DISABLE_MAGIC_URL}
      -
      {L_SIGNATURE_PREVIEW}
      {SIGNATURE_PREVIEW}
      {S_HIDDEN_FIELDS}    
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html deleted file mode 100644 index 6a5adb8be8..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_register.html +++ /dev/null @@ -1,132 +0,0 @@ - - - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_REGISTRATION}
      {ERROR}
      {L_REG_COND}
      {L_ITEMS_REQUIRED}
      {L_USERNAME}:
      {L_USERNAME_EXPLAIN}
      {L_EMAIL_ADDRESS}:
      {L_CONFIRM_EMAIL}:
      {L_PASSWORD}:
      {L_PASSWORD_EXPLAIN}
      {L_CONFIRM_PASSWORD}:
      {L_LANGUAGE}:
      {L_TIMEZONE}:
      - {profile_fields.LANG_NAME}: - * -
      {profile_fields.LANG_EXPLAIN} -
      {profile_fields.FIELD}
      {profile_fields.ERROR}
      {L_CONFIRMATION}
      {L_CONFIRM_EXPLAIN}
      {CONFIRM_IMG}
      {L_CONFIRM_CODE}:
      {L_CONFIRM_CODE_EXPLAIN}
      {L_COPPA_COMPLIANCE}
      {L_COPPA_EXPLAIN}
      {S_HIDDEN_FIELDS}  
      -{S_FORM_TOKEN} -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_remind.html b/phpBB/styles/subsilver2/template/ucp_remind.html deleted file mode 100644 index b14fbe8305..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_remind.html +++ /dev/null @@ -1,28 +0,0 @@ - - -
      - -
      - - - - - - - - - - - - - - - - -
      {L_SEND_PASSWORD}
      {L_USERNAME}:
      {L_EMAIL_ADDRESS}:
      {L_EMAIL_REMIND}
      {S_HIDDEN_FIELDS}  
      -{S_FORM_TOKEN} -
      - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_resend.html b/phpBB/styles/subsilver2/template/ucp_resend.html deleted file mode 100644 index 3a39f904aa..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_resend.html +++ /dev/null @@ -1,29 +0,0 @@ - - -
      - -
      - - - - - - - - - - - - - - - - -
      {L_UCP_RESEND}
      {L_USERNAME}:
      {L_EMAIL_ADDRESS}:
      {L_EMAIL_REMIND}
      {S_HIDDEN_FIELDS}  
      -{S_FORM_TOKEN} - -
      - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_zebra_foes.html b/phpBB/styles/subsilver2/template/ucp_zebra_foes.html deleted file mode 100644 index 3de5737b53..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_zebra_foes.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_TITLE}
      {L_FOES_EXPLAIN}
      {ERROR}
      {L_YOUR_FOES}:
      {L_YOUR_FOES_EXPLAIN}
      {L_NO_FOES}
      {L_ADD_FOES}:
      {L_ADD_FOES_EXPLAIN} [ {L_FIND_USERNAME} ]

      {S_HIDDEN_FIELDS}  
      - - - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/ucp_zebra_friends.html b/phpBB/styles/subsilver2/template/ucp_zebra_friends.html deleted file mode 100644 index 2abea04b8f..0000000000 --- a/phpBB/styles/subsilver2/template/ucp_zebra_friends.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_TITLE}
      {L_FRIENDS_EXPLAIN}
      {ERROR}
      {L_YOUR_FRIENDS}:
      {L_YOUR_FRIENDS_EXPLAIN}
      {L_NO_FRIENDS}
      {L_ADD_FRIENDS}:
      {L_ADD_FRIENDS_EXPLAIN} [ {L_FIND_USERNAME} ]

      {S_HIDDEN_FIELDS}  
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/viewforum_body.html b/phpBB/styles/subsilver2/template/viewforum_body.html deleted file mode 100644 index c196bc60a0..0000000000 --- a/phpBB/styles/subsilver2/template/viewforum_body.html +++ /dev/null @@ -1,327 +0,0 @@ - - - -
      - -

      {L_FORUM_RULES}


      - {L_FORUM_RULES_LINK} - -

      {L_FORUM_RULES}


      - {FORUM_RULES} - -
      - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_ACTIVE_TOPICS}
       {L_TOPICS}  {L_TOPICS}  {L_AUTHOR}  {L_REPLIES}  {L_VIEWS}  {L_LAST_POST} 
      {topicrow.TOPIC_FOLDER_IMG} - {NEWEST_POST_IMG} - {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TYPE} {topicrow.TOPIC_TITLE} - - {UNAPPROVED_IMG}  - - - {REPORTED_IMG}  - - -

      [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ]

      - -

      {topicrow.TOPIC_AUTHOR_FULL}

      {topicrow.REPLIES}

      {topicrow.VIEWS}

      -

      {topicrow.LAST_POST_TIME}

      -

      {topicrow.LAST_POST_AUTHOR_FULL} - {LAST_POST_IMG} -

      -
      {L_NO_TOPICS}{L_NO_TOPICS_TIME_FRAME}{L_NO_TOPICS}{L_NO_TOPICS_TIME_FRAME}
       
      - -
      - - - - -
      - - - - - -

      - - -
      - - - - - - -
      {L_NO_READ_ACCESS}
      - - - -

      - -
      - - - - - - - - -

      {L_LOGIN_LOGOUT}

      {L_USERNAME}:   {L_PASSWORD}:   {L_LOG_ME_IN}  
      - -
      - - - -
      - - - - - - - - - - - - - - -
      {POST_IMG} [ {TOTAL_TOPICS} ] 
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      - - - - - -
      -
       {L_TOPICS}  {L_TOPICS}  {L_AUTHOR}  {L_REPLIES}  {L_VIEWS}  {L_LAST_POST} 
      {L_ANNOUNCEMENTS}
      {L_TOPICS}
      {topicrow.TOPIC_FOLDER_IMG} - {NEWEST_POST_IMG} - {topicrow.ATTACH_ICON_IMG} {topicrow.TOPIC_TYPE} {topicrow.TOPIC_TITLE} - - {topicrow.UNAPPROVED_IMG}  - - - {REPORTED_IMG}  - - -

      [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ]

      - -

      {topicrow.TOPIC_AUTHOR_FULL}

      {topicrow.REPLIES}

      {topicrow.VIEWS}

      -

      {topicrow.LAST_POST_TIME}

      -

      {topicrow.LAST_POST_AUTHOR_FULL} - {LAST_POST_IMG} -

      -
      {L_NO_TOPICS}{L_NO_TOPICS_TIME_FRAME}{L_NO_TOPICS}{L_NO_TOPICS_TIME_FRAME}
      - - - -
      {L_DISPLAY_TOPICS}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
      -
      - - - - - - - - - - - - - - -
      {POST_IMG} [ {TOTAL_TOPICS} ] 
      - - -
      -
      - - - - -
      - - - - - - - - -

      {L_WHO_IS_ONLINE}

      {LOGGED_IN_USER_LIST}

      - - - -
      - - - - - - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {FOLDER_NEW_IMG}{L_NEW_POSTS}  {FOLDER_IMG}{L_NO_NEW_POSTS}  {FOLDER_ANNOUNCE_IMG}{L_ICON_ANNOUNCEMENT}
      {FOLDER_HOT_NEW_IMG}{L_NEW_POSTS_HOT}  {FOLDER_HOT_IMG}{L_NO_NEW_POSTS_HOT}  {FOLDER_STICKY_IMG}{L_ICON_STICKY}
      {FOLDER_LOCKED_NEW_IMG}{L_NEW_POSTS_LOCKED}  {FOLDER_LOCKED_IMG}{L_NO_NEW_POSTS_LOCKED}  {FOLDER_MOVED_IMG}{L_TOPIC_MOVED}
      -
      {rules.RULE}
      - - -
      - - - - - - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/viewonline_body.html b/phpBB/styles/subsilver2/template/viewonline_body.html deleted file mode 100644 index 1fcab016b6..0000000000 --- a/phpBB/styles/subsilver2/template/viewonline_body.html +++ /dev/null @@ -1,57 +0,0 @@ - - -

      {TOTAL_REGISTERED_USERS_ONLINE}

      -

      {TOTAL_GUEST_USERS_ONLINE} [ {L_SWITCH_GUEST_DISPLAY} ]

      -
      - - - - - - - -
      {L_GOTO_PAGE} {L_PREVIOUS}  {PAGINATION}  {L_NEXT}
      - - - - - - - - - - - - - - - - - - - - - -
      {L_USERNAME}{L_LAST_UPDATED}{L_FORUM_LOCATION}

      {user_row.USERNAME_FULL}

      {L_IP}: {user_row.USER_IP} » {L_WHOIS}

      - {user_row.USER_BROWSER}

       {user_row.LASTUPDATE}

      {user_row.FORUM_LOCATION}

      {L_LEGEND} :: {LEGEND}
      - - - - - - - -
      {L_GOTO_PAGE} {L_PREVIOUS}  {PAGINATION}  {L_NEXT}
      - - -
      {L_ONLINE_EXPLAIN}
      - -
      - - - -
      - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/viewonline_whois.html b/phpBB/styles/subsilver2/template/viewonline_whois.html deleted file mode 100644 index 033d848ac4..0000000000 --- a/phpBB/styles/subsilver2/template/viewonline_whois.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - -
      {L_WHOIS}
      {WHOIS}

      {L_CLOSE_WINDOW}
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/viewtopic_body.html b/phpBB/styles/subsilver2/template/viewtopic_body.html deleted file mode 100644 index cf264ca4f8..0000000000 --- a/phpBB/styles/subsilver2/template/viewtopic_body.html +++ /dev/null @@ -1,354 +0,0 @@ - - - -
      - -

      {L_FORUM_RULES}


      - {L_FORUM_RULES_LINK} - -

      {L_FORUM_RULES}


      - {FORUM_RULES} - -
      - -
      - - - - -

      - -
      - - - - - - - - - - -
      - - {POST_IMG}  - {REPLY_IMG} - -  [ {TOTAL_POSTS} ] 
      - - - - - - - - - - -
      - - - - - -
      -

      - -
      - - - - - - - - - - - - - - - - - - - - - - -
      {POLL_QUESTION}
      {L_POLL_LENGTH}
      - - - - - - - - - - - - - - - - - -
      - - checked="checked" /> - - checked="checked" /> - - {poll_option.POLL_OPTION_CAPTION}{POLL_LEFT_CAP_IMG}{poll_option.POLL_OPTION_IMG}{POLL_RIGHT_CAP_IMG} {poll_option.POLL_OPTION_PERCENT} [ {poll_option.POLL_OPTION_RESULT} ]x
      -
      {L_MAX_VOTES}

      {L_TOTAL_VOTES} : {TOTAL_VOTES}
      {L_VIEW_RESULTS}
      - {S_HIDDEN_FIELDS} - -
      - -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      {L_AUTHOR}{L_MESSAGE}
      {postrow.L_IGNORE_POST} - - - - - - - - - - -
       {L_POST_SUBJECT}: {postrow.POST_SUBJECT}
      {postrow.MINI_POST_IMG}{postrow.MINI_POST_IMG}{L_POSTED}: {postrow.POST_DATE} 
      -
      - - - - - - - - - - - - - - - - - - - - - -
      {postrow.ONLINE_IMG}
      {postrow.RANK_TITLE}
      {postrow.RANK_IMG}
      {postrow.POSTER_AVATAR}
      - - -
      {L_JOINED}: {postrow.POSTER_JOINED} -
      {L_POSTS}: {postrow.POSTER_POSTS} -
      {L_LOCATION}: {postrow.POSTER_FROM} - - - -
      {postrow.PROFILE_FIELD1_NAME}: {postrow.PROFILE_FIELD1_VALUE} - - - -
      {postrow.custom_fields.PROFILE_FIELD_NAME}: {postrow.custom_fields.PROFILE_FIELD_VALUE} - -
      - -
      - - - - -
      - - - - - -
      {UNAPPROVED_IMG} {L_POST_UNAPPROVED} {REPORTED_IMG} {L_POST_REPORTED}
      - -
      - - -
      {postrow.MESSAGE}
      - - -

      - - - - - - - - - - -
      {L_ATTACHMENTS}:
      {postrow.attachment.DISPLAY_ATTACHMENT}
      - - - -

      {L_DOWNLOAD_NOTICE}
      - - -
      _________________
      {postrow.SIGNATURE}
      - - - - -

      - - - - - - - -
      {postrow.EDITED_MESSAGE}
      {postrow.EDIT_REASON}
      - -

      - {postrow.EDITED_MESSAGE} - - - - - {postrow.BUMPED_MESSAGE} - - -

      - - - - - -
      - - {REPORT_IMG} - {INFO_IMG} - {WARN_IMG} - {DELETE_IMG} - -
      -
      -
      {L_BACK_TO_TOP}
      - - - - - - -
      {L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} 
      - - - - - - - - - - -
      - - {POST_IMG}  - {REPLY_IMG} - -  [ {TOTAL_POSTS} ] 
      - -
      - - - -
      - - - - -
      - - - - - - - - -

      {L_WHO_IS_ONLINE}

      {LOGGED_IN_USER_LIST}

      - - -
      - - - - - - -
      {L_QUICK_MOD}: {S_TOPIC_MOD}
      {rules.RULE}
      - -
      - - - - - - -
      - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html deleted file mode 100644 index 33d33f9c74..0000000000 --- a/phpBB/styles/subsilver2/template/viewtopic_print.html +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - -{SITENAME} :: {PAGE_TITLE} - - - - - - - - - - - - - - - - - -
      {SITENAME}
      {U_FORUM}

      {TOPIC_TITLE}
      {U_TOPIC}
      {PAGE_NUMBER}
      - - - -
      - - - - - - - - - - - - - -
      {L_AUTHOR}:  style="color: {postrow.POST_AUTHOR_COLOUR}">{postrow.POST_AUTHOR} [ {postrow.POST_DATE} ]
      {L_POST_SUBJECT}: {postrow.POST_SUBJECT}

      {postrow.MESSAGE} - - -

      - - - - - - - - - - -
      {L_ATTACHMENTS}:
      {postrow.attachment.DISPLAY_ATTACHMENT}
      - - -
      - - -
      - - - - - - - - - - -
      {PAGE_NUMBER}{S_TIMEZONE}
      Powered by phpBB © 2000, 2002, 2005, 2007 phpBB Group
      http://www.phpbb.com/
      - - - \ No newline at end of file diff --git a/phpBB/styles/subsilver2/theme/images/background.gif b/phpBB/styles/subsilver2/theme/images/background.gif deleted file mode 100644 index 158a625620..0000000000 Binary files a/phpBB/styles/subsilver2/theme/images/background.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/theme/images/cellpic2_rtl.jpg b/phpBB/styles/subsilver2/theme/images/cellpic2_rtl.jpg deleted file mode 100644 index 201e063725..0000000000 Binary files a/phpBB/styles/subsilver2/theme/images/cellpic2_rtl.jpg and /dev/null differ diff --git a/phpBB/styles/subsilver2/theme/images/icon_mini_faq.gif b/phpBB/styles/subsilver2/theme/images/icon_mini_faq.gif deleted file mode 100644 index fc50e7ca30..0000000000 Binary files a/phpBB/styles/subsilver2/theme/images/icon_mini_faq.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/theme/images/icon_mini_groups.gif b/phpBB/styles/subsilver2/theme/images/icon_mini_groups.gif deleted file mode 100644 index a4d1c7bb70..0000000000 Binary files a/phpBB/styles/subsilver2/theme/images/icon_mini_groups.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/theme/images/icon_mini_login.gif b/phpBB/styles/subsilver2/theme/images/icon_mini_login.gif deleted file mode 100644 index c7590a423f..0000000000 Binary files a/phpBB/styles/subsilver2/theme/images/icon_mini_login.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/theme/images/icon_mini_members.gif b/phpBB/styles/subsilver2/theme/images/icon_mini_members.gif deleted file mode 100644 index d636089b38..0000000000 Binary files a/phpBB/styles/subsilver2/theme/images/icon_mini_members.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/theme/images/icon_mini_message.gif b/phpBB/styles/subsilver2/theme/images/icon_mini_message.gif deleted file mode 100644 index b8aea1eafb..0000000000 Binary files a/phpBB/styles/subsilver2/theme/images/icon_mini_message.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/theme/images/icon_mini_profile.gif b/phpBB/styles/subsilver2/theme/images/icon_mini_profile.gif deleted file mode 100644 index 1ec7c649e9..0000000000 Binary files a/phpBB/styles/subsilver2/theme/images/icon_mini_profile.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/theme/images/icon_mini_register.gif b/phpBB/styles/subsilver2/theme/images/icon_mini_register.gif deleted file mode 100644 index b49ac31ec9..0000000000 Binary files a/phpBB/styles/subsilver2/theme/images/icon_mini_register.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/theme/images/icon_mini_search.gif b/phpBB/styles/subsilver2/theme/images/icon_mini_search.gif deleted file mode 100644 index 2bd1a648c0..0000000000 Binary files a/phpBB/styles/subsilver2/theme/images/icon_mini_search.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/theme/images/no_avatar.gif b/phpBB/styles/subsilver2/theme/images/no_avatar.gif deleted file mode 100644 index 80539c8c71..0000000000 Binary files a/phpBB/styles/subsilver2/theme/images/no_avatar.gif and /dev/null differ diff --git a/phpBB/styles/subsilver2/theme/stylesheet.css b/phpBB/styles/subsilver2/theme/stylesheet.css deleted file mode 100644 index 62baa33566..0000000000 --- a/phpBB/styles/subsilver2/theme/stylesheet.css +++ /dev/null @@ -1,666 +0,0 @@ -/* phpBB 3.0 Style Sheet - -------------------------------------------------------------- - Style name: subsilver2 - Based on style: subSilver (the default phpBB 2 style) - Original author: subBlue ( http://www.subBlue.com/ ) - Modified by: psoTFX and the phpBB team ( http://www.phpbb.com ) - - This is an alternative style for phpBB3 for those wishing to stay with - the familiar subSilver style of phpBB version 2.x - - Copyright 2006 phpBB Group ( http://www.phpbb.com/ ) - -------------------------------------------------------------- -*/ - -/* Layout - ------------ */ -* { - /* Reset browsers default margin, padding and font sizes */ - margin: 0; - padding: 0; -} - -html { - font-size: 100%; -} - -body { - /* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */ - font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - color: #323D4F; - background-color: #FFFFFF; - font-size: 62.5%; /* This sets the default font size to be equivalent to 10px */ - margin: 0; -} - -#wrapheader { - min-height: 120px; - height: auto !important; - height: 120px; -/* background-image: url('./images/background.gif'); - background-repeat: repeat-x;*/ -/* padding: 0 25px 15px 25px;*/ - padding: 0; -} - -#wrapcentre { - margin: 15px 25px 0 25px; -} - -#wrapfooter { - text-align: center; - clear: both; -} - -#wrapnav { - width: 100%; - margin: 0; - background-color: #ECECEC; - border-width: 1px; - border-style: solid; - border-color: #A9B8C2; -} - -#logodesc { - margin-bottom: 5px; - padding: 5px 25px; - background: #D9DFE4; - border-bottom: 1px solid #4787A7; -} - -#menubar { - margin: 0 25px; -} - -#datebar { - margin: 10px 25px 0 25px; -} - -#findbar { - width: 100%; - margin: 0; - padding: 0; - border: 0; -} - -.forumrules { - background-color: #F9CC79; - border-width: 1px; - border-style: solid; - border-color: #BB9860; - padding: 4px; - font-weight: normal; - font-size: 1.1em; - font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif; -} - -.forumrules h3 { - color: red; -} - -#pageheader { } -#pagecontent { } -#pagefooter { } - -#poll { } -#postrow { } -#postdata { } - - -/* Text - --------------------- */ -h1 { - color: black; - font-family: "Lucida Grande", "Trebuchet MS", Verdana, sans-serif; - font-weight: bold; - font-size: 1.8em; - text-decoration: none; -} - -h2 { - font-family: Arial, Helvetica, sans-serif; - font-weight: bold; - font-size: 1.5em; - text-decoration: none; - line-height: 120%; -} - -h3 { - font-size: 1.3em; - font-weight: bold; - font-family: Arial, Helvetica, sans-serif; - line-height: 120%; -} - -h4 { - margin: 0; - font-size: 1.1em; - font-weight: bold; -} - -p { - font-size: 1.1em; -} - -p.moderators { - margin: 0; - float: left; - color: black; - font-weight: bold; -} - -.rtl p.moderators { - float: right; -} - -p.linkmcp { - margin: 0; - float: right; - white-space: nowrap; -} - -.rtl p.linkmcp { - float: left; -} - -p.breadcrumbs { - margin: 0; - float: left; - color: black; - font-weight: bold; - white-space: normal; - font-size: 1em; -} - -.rtl p.breadcrumbs { - float: right; -} - -p.datetime { - margin: 0; - float: right; - white-space: nowrap; - font-size: 1em; -} - -.rtl p.datetime { - float: left; -} - -p.searchbar { - padding: 2px 0; - white-space: nowrap; -} - -p.searchbarreg { - margin: 0; - float: right; - white-space: nowrap; -} - -.rtl p.searchbarreg { - float: left; -} - -p.forumdesc { - padding-bottom: 4px; -} - -p.topicauthor { - margin: 1px 0; -} - -p.topicdetails { - margin: 1px 0; -} - -.postreported, .postreported a:visited, .postreported a:hover, .postreported a:link, .postreported a:active { - margin: 1px 0; - color: red; - font-weight:bold; -} - -.postapprove, .postapprove a:visited, .postapprove a:hover, .postapprove a:link, .postapprove a:active { - color: green; - font-weight:bold; -} - -.postapprove img, .postreported img { - vertical-align: bottom; -} - -.postauthor { - color: #000000; -} - -.postdetails { - color: #000000; -} - -.postbody { - font-size: 1.3em; - line-height: 1.4em; - font-family: "Lucida Grande", "Trebuchet MS", Helvetica, Arial, sans-serif; -} - -.postbody li, ol, ul { - margin: 0 0 0 1.5em; -} - -.rtl .postbody li, .rtl ol, .rtl ul { - margin: 0 1.5em 0 0; -} - -.posthilit { - background-color: yellow; -} - -.nav { - margin: 0; - color: black; - font-weight: bold; -} - -.pagination { - padding: 4px; - color: black; - font-size: 1em; - font-weight: bold; -} - -.cattitle { - -} - -.gen { - margin: 1px 1px; - font-size: 1.2em; -} - -.genmed { - margin: 1px 1px; - font-size: 1.1em; -} - -.gensmall { - margin: 1px 1px; - font-size: 1em; -} - -.copyright { - color: #444; - font-weight: normal; - font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif; -} - -.titles { - font-family: "Lucida Grande", Helvetica, Arial, sans-serif; - font-weight: bold; - font-size: 1.3em; - text-decoration: none; -} - -.error { - color: red; -} - - -/* Tables - ------------ */ -th { - color: #FFA34F; - font-size: 1.1em; - font-weight: bold; - background-color: #006699; - background-image: url('./images/cellpic3.gif'); - white-space: nowrap; - padding: 7px 5px; -} - -td { - padding: 2px; -} -td.profile { - padding: 4px; -} - -.tablebg { - background-color: #A9B8C2; -} - -.catdiv { - height: 28px; - margin: 0; - padding: 0; - border: 0; - background: white url('./images/cellpic2.jpg') repeat-y scroll top left; -} -.rtl .catdiv { - background: white url('./images/cellpic2_rtl.jpg') repeat-y scroll top right; -} - -.cat { - height: 28px; - margin: 0; - padding: 0; - border: 0; - background-color: #C7D0D7; - background-image: url('./images/cellpic1.gif'); - text-indent: 4px; -} - -.row1 { - background-color: #ECECEC; - padding: 4px; -} - -.row2 { - background-color: #DCE1E5; - padding: 4px; -} - -.row3 { - background-color: #C0C8D0; - padding: 4px; -} - -.spacer { - background-color: #D1D7DC; -} - -hr { - height: 1px; - border-width: 0; - background-color: #D1D7DC; - color: #D1D7DC; -} - -.legend { - text-align:center; - margin: 0 auto; -} - -/* Links - ------------ */ -a:link { - color: #006597; - text-decoration: none; -} - -a:active, -a:visited { - color: #005784; - text-decoration: none; -} - -a:hover { - color: #D46400; - text-decoration: underline; -} - -a.forumlink { - color: #069; - font-weight: bold; - font-family: "Lucida Grande", Helvetica, Arial, sans-serif; - font-size: 1.2em; -} - -a.topictitle { - margin: 1px 0; - font-family: "Lucida Grande", Helvetica, Arial, sans-serif; - font-weight: bold; - font-size: 1.2em; -} - -a.topictitle:visited { - color: #5493B4; - text-decoration: none; -} - -th a, -th a:visited { - color: #FFA34F !important; - text-decoration: none; -} - -th a:hover { - text-decoration: underline; -} - - -/* Form Elements - ------------ */ -form { - margin: 0; - padding: 0; - border: 0; -} - -input { - color: #333333; - font-family: "Lucida Grande", Verdana, Helvetica, sans-serif; - font-size: 1.1em; - font-weight: normal; - padding: 1px; - border: 1px solid #A9B8C2; - background-color: #FAFAFA; -} - -textarea { - background-color: #FAFAFA; - color: #333333; - font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - font-size: 1.3em; - line-height: 1.4em; - font-weight: normal; - border: 1px solid #A9B8C2; - padding: 2px; -} - -select { - color: #333333; - background-color: #FAFAFA; - font-family: "Lucida Grande", Verdana, Helvetica, sans-serif; - font-size: 1.1em; - font-weight: normal; - border: 1px solid #A9B8C2; - padding: 1px; -} - -option { - padding: 0 1em 0 0; -} - -option.disabled-option { - color: graytext; -} - -.rtl option { - padding: 0 0 0 1em; -} - -input.radio { - border: none; - background-color: transparent; -} - -.post { - background-color: white; - border-style: solid; - border-width: 1px; -} - -.btnbbcode { - color: #000000; - font-weight: normal; - font-size: 1.1em; - font-family: "Lucida Grande", Verdana, Helvetica, sans-serif; - background-color: #EFEFEF; - border: 1px solid #666666; -} - -.btnmain { - font-weight: bold; - background-color: #ECECEC; - border: 1px solid #A9B8C2; - cursor: pointer; - padding: 1px 5px; - font-size: 1.1em; -} - -.btnlite { - font-weight: normal; - background-color: #ECECEC; - border: 1px solid #A9B8C2; - cursor: pointer; - padding: 1px 5px; - font-size: 1.1em; -} - -.btnfile { - font-weight: normal; - background-color: #ECECEC; - border: 1px solid #A9B8C2; - padding: 1px 5px; - font-size: 1.1em; -} - -.helpline { - background-color: #DEE3E7; - border-style: none; -} - - -/* BBCode - ------------ */ -.quotetitle, .attachtitle { - margin: 10px 5px 0 5px; - padding: 4px; - border-width: 1px 1px 0 1px; - border-style: solid; - border-color: #A9B8C2; - color: #333333; - background-color: #A9B8C2; - font-size: 0.85em; - font-weight: bold; -} - -.quotetitle .quotetitle { - font-size: 1em; -} - -.quotecontent, .attachcontent { - margin: 0 5px 10px 5px; - padding: 5px; - border-color: #A9B8C2; - border-width: 0 1px 1px 1px; - border-style: solid; - font-weight: normal; - font-size: 1em; - line-height: 1.4em; - font-family: "Lucida Grande", "Trebuchet MS", Helvetica, Arial, sans-serif; - background-color: #FAFAFA; - color: #4B5C77; -} - -.attachcontent { - font-size: 0.85em; -} - -.codetitle { - margin: 10px 5px 0 5px; - padding: 2px 4px; - border-width: 1px 1px 0 1px; - border-style: solid; - border-color: #A9B8C2; - color: #333333; - background-color: #A9B8C2; - font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - font-size: 0.8em; -} - -.codecontent { - direction: ltr; - margin: 0 5px 10px 5px; - padding: 5px; - border-color: #A9B8C2; - border-width: 0 1px 1px 1px; - border-style: solid; - font-weight: normal; - color: #006600; - font-size: 0.85em; - font-family: Monaco, 'Courier New', monospace; - background-color: #FAFAFA; -} - -.syntaxbg { - color: #FFFFFF; -} - -.syntaxcomment { - color: #FF8000; -} - -.syntaxdefault { - color: #0000BB; -} - -.syntaxhtml { - color: #000000; -} - -.syntaxkeyword { - color: #007700; -} - -.syntaxstring { - color: #DD0000; -} - - -/* Private messages - ------------------ */ -.pm_marked_colour { - background-color: #000000; -} - -.pm_replied_colour { - background-color: #A9B8C2; -} - -.pm_friend_colour { - background-color: #007700; -} - -.pm_foe_colour { - background-color: #DD0000; -} - - -/* Misc - ------------ */ -img { - border: none; -} - -.sep { - color: black; - background-color: #FFA34F; -} - -table.colortable td { - padding: 0; -} - -pre { - font-size: 1.1em; - font-family: Monaco, 'Courier New', monospace; -} - -.nowrap { - white-space: nowrap; -} - -.username-coloured { - font-weight: bold; -} \ No newline at end of file diff --git a/phpBB/styles/subsilver2/theme/theme.cfg b/phpBB/styles/subsilver2/theme/theme.cfg deleted file mode 100644 index 648c5732a8..0000000000 --- a/phpBB/styles/subsilver2/theme/theme.cfg +++ /dev/null @@ -1,35 +0,0 @@ -# -# phpBB Theme Configuration File -# -# @package phpBB3 -# @copyright (c) 2005 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License -# -# -# At the left is the name, please do not change this -# At the right the value is entered -# For on/off options the valid values are on, off, 1, 0, true and false -# -# Values get trimmed, if you want to add a space in front or at the end of -# the value, then enclose the value with single or double quotes. -# Single and double quotes do not need to be escaped. -# -# Available and used values: -# parse_css_file -# - -# General Information about this theme -name = subsilver2 -copyright = © phpBB Group, 2003 -version = 3.0.0 - -# Some configuration options - -# -# You have to turn this option on if you want to use the -# path template variables ({T_IMAGESET_PATH} for example) within -# your css file. -# This is mostly the case if you want to use language specific -# images within your css file. -# -parse_css_file = off diff --git a/phpBB/images/icons/index.htm b/phpBB/templates/index.htm similarity index 100% rename from phpBB/images/icons/index.htm rename to phpBB/templates/index.htm diff --git a/phpBB/templates/subSilver/admin/admin_message_body.tpl b/phpBB/templates/subSilver/admin/admin_message_body.tpl new file mode 100644 index 0000000000..68e69caf5e --- /dev/null +++ b/phpBB/templates/subSilver/admin/admin_message_body.tpl @@ -0,0 +1,13 @@ + +

      + + + + + + + + +
      {MESSAGE_TITLE}
      {MESSAGE_TEXT}
      + +
      diff --git a/phpBB/templates/subSilver/admin/auth_forum_body.tpl b/phpBB/templates/subSilver/admin/auth_forum_body.tpl new file mode 100644 index 0000000000..7e5899292b --- /dev/null +++ b/phpBB/templates/subSilver/admin/auth_forum_body.tpl @@ -0,0 +1,31 @@ + +

      {L_AUTH_TITLE}

      + +

      {L_AUTH_EXPLAIN}

      + +

      {L_FORUM}: {FORUM_NAME}

      + +
      + + + + + + + + + + + + + + + + + +
      {forum_auth_titles.CELL_TITLE}
      {forum_auth_data.S_AUTH_LEVELS_SELECT}
      {U_SWITCH_MODE}
      {S_HIDDEN_FIELDS} + +    + +
      +
      diff --git a/phpBB/templates/subSilver/admin/auth_select_body.tpl b/phpBB/templates/subSilver/admin/auth_select_body.tpl new file mode 100644 index 0000000000..b1fdd98225 --- /dev/null +++ b/phpBB/templates/subSilver/admin/auth_select_body.tpl @@ -0,0 +1,13 @@ + +

      {L_AUTH_TITLE}

      + +

      {L_AUTH_EXPLAIN}

      + +
      + + + + + + +
      {L_AUTH_SELECT}
      {S_HIDDEN_FIELDS}{S_AUTH_SELECT}   
      diff --git a/phpBB/templates/subSilver/admin/auth_ug_body.tpl b/phpBB/templates/subSilver/admin/auth_ug_body.tpl new file mode 100644 index 0000000000..78c8e60adc --- /dev/null +++ b/phpBB/templates/subSilver/admin/auth_ug_body.tpl @@ -0,0 +1,49 @@ + +

      {L_AUTH_TITLE}

      + +

      {L_USER_OR_GROUPNAME}: {USERNAME}

      + +
      + + +

      {USER_LEVEL}

      +

      {USER_GROUP_MEMBERSHIPS}

      + + + +

      {GROUP_MEMBERSHIP}

      + + +

      {L_PERMISSIONS}

      + +

      {L_AUTH_EXPLAIN}

      + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_FORUM}{acltype.L_UG_ACL_TYPE}{L_MODERATOR_STATUS}
      {forums.FORUM_NAME}{forums.aclvalues.S_ACL_SELECT}{forums.S_MOD_SELECT}
      {U_SWITCH_MODE}
      {S_HIDDEN_FIELDS} + +    + +
      +
      diff --git a/phpBB/templates/subSilver/admin/board_config_body.tpl b/phpBB/templates/subSilver/admin/board_config_body.tpl new file mode 100644 index 0000000000..2b474f2184 --- /dev/null +++ b/phpBB/templates/subSilver/admin/board_config_body.tpl @@ -0,0 +1,272 @@ + +

      {L_CONFIGURATION_TITLE}

      + +

      {L_CONFIGURATION_EXPLAIN}

      + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_GENERAL_SETTINGS}
      {L_SERVER_NAME}
      {L_SERVER_PORT}
      {L_SERVER_PORT_EXPLAIN}
      {L_SCRIPT_PATH}
      {L_SCRIPT_PATH_EXPLAIN}
      {L_SITE_NAME}
      {L_SITE_NAME_EXPLAIN}
      {L_SITE_DESCRIPTION}
      {L_DISABLE_BOARD}
      {L_DISABLE_BOARD_EXPLAIN}
      {L_YES}   {L_NO}
      {L_ACCT_ACTIVATION}{L_NONE}   {L_USER}   {L_ADMIN}
      {L_VISUAL_CONFIRM}
      {L_VISUAL_CONFIRM_EXPLAIN}
      {L_YES}   {L_NO}
      {L_ALLOW_AUTOLOGIN}
      {L_ALLOW_AUTOLOGIN_EXPLAIN}
      {L_YES}   {L_NO}
      {L_AUTOLOGIN_TIME}
      {L_AUTOLOGIN_TIME_EXPLAIN}
      {L_BOARD_EMAIL_FORM}
      {L_BOARD_EMAIL_FORM_EXPLAIN}
      {L_ENABLED}   {L_DISABLED}
      {L_FLOOD_INTERVAL}
      {L_FLOOD_INTERVAL_EXPLAIN}
      {L_SEARCH_FLOOD_INTERVAL}
      {L_SEARCH_FLOOD_INTERVAL_EXPLAIN}
      {L_MAX_LOGIN_ATTEMPTS}
      {L_MAX_LOGIN_ATTEMPTS_EXPLAIN}
      {L_LOGIN_RESET_TIME}
      {L_LOGIN_RESET_TIME_EXPLAIN}
      {L_TOPICS_PER_PAGE}
      {L_POSTS_PER_PAGE}
      {L_HOT_THRESHOLD}
      {L_DEFAULT_STYLE}{STYLE_SELECT}
      {L_OVERRIDE_STYLE}
      {L_OVERRIDE_STYLE_EXPLAIN}
      {L_YES}   {L_NO}
      {L_DEFAULT_LANGUAGE}{LANG_SELECT}
      {L_DATE_FORMAT}
      {L_DATE_FORMAT_EXPLAIN}
      {L_SYSTEM_TIMEZONE}{TIMEZONE_SELECT}
      {L_ENABLE_GZIP} {L_YES}   {L_NO}
      {L_ENABLE_PRUNE} {L_YES}   {L_NO}
      {L_COOKIE_SETTINGS}
      {L_COOKIE_SETTINGS_EXPLAIN}
      {L_COOKIE_DOMAIN}
      {L_COOKIE_NAME}
      {L_COOKIE_PATH}
      {L_COOKIE_SECURE}
      {L_COOKIE_SECURE_EXPLAIN}
      {L_DISABLED}   {L_ENABLED}
      {L_SESSION_LENGTH}
      {L_PRIVATE_MESSAGING}
      {L_DISABLE_PRIVATE_MESSAGING}{L_ENABLED}   {L_DISABLED}
      {L_INBOX_LIMIT}
      {L_SENTBOX_LIMIT}
      {L_SAVEBOX_LIMIT}
      {L_ABILITIES_SETTINGS}
      {L_MAX_POLL_OPTIONS}
      {L_ALLOW_HTML} {L_YES}   {L_NO}
      {L_ALLOWED_TAGS}
      {L_ALLOWED_TAGS_EXPLAIN}
      {L_ALLOW_BBCODE} {L_YES}   {L_NO}
      {L_ALLOW_SMILIES} {L_YES}   {L_NO}
      {L_SMILIES_PATH}
      {L_SMILIES_PATH_EXPLAIN}
      {L_ALLOW_SIG} {L_YES}   {L_NO}
      {L_MAX_SIG_LENGTH}
      {L_MAX_SIG_LENGTH_EXPLAIN}
      {L_ALLOW_NAME_CHANGE} {L_YES}   {L_NO}
      {L_AVATAR_SETTINGS}
      {L_ALLOW_LOCAL} {L_YES}   {L_NO}
      {L_ALLOW_REMOTE}
      {L_ALLOW_REMOTE_EXPLAIN}
      {L_YES}   {L_NO}
      {L_ALLOW_UPLOAD} {L_YES}   {L_NO}
      {L_MAX_FILESIZE}
      {L_MAX_FILESIZE_EXPLAIN}
      Bytes
      {L_MAX_AVATAR_SIZE}
      + {L_MAX_AVATAR_SIZE_EXPLAIN} +
      x
      {L_AVATAR_STORAGE_PATH}
      {L_AVATAR_STORAGE_PATH_EXPLAIN}
      {L_AVATAR_GALLERY_PATH}
      {L_AVATAR_GALLERY_PATH_EXPLAIN}
      {L_COPPA_SETTINGS}
      {L_COPPA_FAX}
      {L_COPPA_MAIL}
      {L_COPPA_MAIL_EXPLAIN}
      {L_EMAIL_SETTINGS}
      {L_ADMIN_EMAIL}
      {L_EMAIL_SIG}
      {L_EMAIL_SIG_EXPLAIN}
      {L_USE_SMTP}
      {L_USE_SMTP_EXPLAIN}
      {L_YES}   {L_NO}
      {L_SMTP_SERVER}
      {L_SMTP_USERNAME}
      {L_SMTP_USERNAME_EXPLAIN}
      {L_SMTP_PASSWORD}
      {L_SMTP_PASSWORD_EXPLAIN}
      {S_HIDDEN_FIELDS}   +
      + +
      diff --git a/phpBB/templates/subSilver/admin/category_edit_body.tpl b/phpBB/templates/subSilver/admin/category_edit_body.tpl new file mode 100644 index 0000000000..8fed1c90d3 --- /dev/null +++ b/phpBB/templates/subSilver/admin/category_edit_body.tpl @@ -0,0 +1,21 @@ + +

      {L_EDIT_CATEGORY}

      + +

      {L_EDIT_CATEGORY_EXPLAIN}

      + +
      + + + + + + + + + + + +
      {L_EDIT_CATEGORY}
      {L_CATEGORY}
      {S_HIDDEN_FIELDS}
      +
      + +
      diff --git a/phpBB/templates/subSilver/admin/confirm_body.tpl b/phpBB/templates/subSilver/admin/confirm_body.tpl new file mode 100755 index 0000000000..376480c483 --- /dev/null +++ b/phpBB/templates/subSilver/admin/confirm_body.tpl @@ -0,0 +1,11 @@ + + + + + + + + +
      {MESSAGE_TITLE}

      {MESSAGE_TEXT}

      {S_HIDDEN_FIELDS}  
      + +
      diff --git a/phpBB/templates/subSilver/admin/db_utils_backup_body.tpl b/phpBB/templates/subSilver/admin/db_utils_backup_body.tpl new file mode 100644 index 0000000000..8ee6ab9a11 --- /dev/null +++ b/phpBB/templates/subSilver/admin/db_utils_backup_body.tpl @@ -0,0 +1,33 @@ + +

      {L_DATABASE_BACKUP}

      + +

      {L_BACKUP_EXPLAIN}

      + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_BACKUP_OPTIONS}
      {L_FULL_BACKUP}
      {L_STRUCTURE_BACKUP}
      {L_DATA_BACKUP}
      {L_ADDITIONAL_TABLES}
      {L_GZIP_COMPRESS}{L_NO}  {L_YES}
      {S_HIDDEN_FIELDS}
      diff --git a/phpBB/templates/subSilver/admin/db_utils_restore_body.tpl b/phpBB/templates/subSilver/admin/db_utils_restore_body.tpl new file mode 100644 index 0000000000..13a74dd99c --- /dev/null +++ b/phpBB/templates/subSilver/admin/db_utils_restore_body.tpl @@ -0,0 +1,13 @@ + +

      {L_DATABASE_RESTORE}

      + +

      {L_RESTORE_EXPLAIN}

      + +
      + + + + + + +
      {L_SELECT_FILE}
         {S_HIDDEN_FIELDS} 
      diff --git a/phpBB/templates/subSilver/admin/disallow_body.tpl b/phpBB/templates/subSilver/admin/disallow_body.tpl new file mode 100644 index 0000000000..ea269f6c48 --- /dev/null +++ b/phpBB/templates/subSilver/admin/disallow_body.tpl @@ -0,0 +1,24 @@ + +

      {L_DISALLOW_TITLE}

      + +

      {L_DISALLOW_EXPLAIN}

      + +
      + + + + + + + + + + + + + + + + + +
      {L_ADD_DISALLOW}
      {L_USERNAME}
      {L_ADD_EXPLAIN}
       
      {L_DELETE_DISALLOW}
      {L_USERNAME}
      {L_DELETE_EXPLAIN}
      {S_DISALLOW_SELECT} 
       
      diff --git a/phpBB/templates/subSilver/admin/forum_admin_body.tpl b/phpBB/templates/subSilver/admin/forum_admin_body.tpl new file mode 100644 index 0000000000..8c631f9b26 --- /dev/null +++ b/phpBB/templates/subSilver/admin/forum_admin_body.tpl @@ -0,0 +1,39 @@ + +

      {L_FORUM_TITLE}

      + +

      {L_FORUM_EXPLAIN}

      + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_FORUM_TITLE}
      {catrow.CAT_DESC}{L_EDIT}{L_DELETE}{L_MOVE_UP} {L_MOVE_DOWN} 
      {catrow.forumrow.FORUM_NAME}
      {catrow.forumrow.FORUM_DESC}
      {catrow.forumrow.NUM_TOPICS}{catrow.forumrow.NUM_POSTS}{L_EDIT}{L_DELETE}{L_MOVE_UP}
      {L_MOVE_DOWN}
      {L_RESYNC}
      diff --git a/phpBB/templates/subSilver/admin/forum_delete_body.tpl b/phpBB/templates/subSilver/admin/forum_delete_body.tpl new file mode 100644 index 0000000000..4a267107fa --- /dev/null +++ b/phpBB/templates/subSilver/admin/forum_delete_body.tpl @@ -0,0 +1,23 @@ + +

      {L_FORUM_DELETE}

      + +

      {L_FORUM_DELETE_EXPLAIN}

      + +
      + + + + + + + + + + + + + + + +
      {L_FORUM_DELETE}
      {L_FORUM_NAME}{NAME}
      {L_MOVE_CONTENTS}{S_SELECT_TO}
      {S_HIDDEN_FIELDS}
      +
      diff --git a/phpBB/templates/subSilver/admin/forum_edit_body.tpl b/phpBB/templates/subSilver/admin/forum_edit_body.tpl new file mode 100644 index 0000000000..7f56bbe9d8 --- /dev/null +++ b/phpBB/templates/subSilver/admin/forum_edit_body.tpl @@ -0,0 +1,50 @@ + +

      {L_FORUM_TITLE}

      + +

      {L_FORUM_EXPLAIN}

      + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_FORUM_SETTINGS}
      {L_FORUM_NAME}
      {L_FORUM_DESCRIPTION}
      {L_CATEGORY}
      {L_FORUM_STATUS}
      {L_AUTO_PRUNE} + + + + + + + + + + + + +
      {L_ENABLED}
      {L_PRUNE_DAYS}  {L_DAYS}
      {L_PRUNE_FREQ}  {L_DAYS}
      {S_HIDDEN_FIELDS}
      +
      + +
      diff --git a/phpBB/templates/subSilver/admin/forum_prune_body.tpl b/phpBB/templates/subSilver/admin/forum_prune_body.tpl new file mode 100644 index 0000000000..56a2e024a5 --- /dev/null +++ b/phpBB/templates/subSilver/admin/forum_prune_body.tpl @@ -0,0 +1,22 @@ + +

      {L_FORUM_PRUNE}

      + +

      {L_FORUM_PRUNE_EXPLAIN}

      + +

      {L_FORUM}: {FORUM_NAME}

      + +
      + + + + + + + + + + +
      {L_FORUM_PRUNE}
      {S_PRUNE_DATA}
      {S_HIDDEN_VARS} + +
      +
      diff --git a/phpBB/templates/subSilver/admin/forum_prune_result_body.tpl b/phpBB/templates/subSilver/admin/forum_prune_result_body.tpl new file mode 100644 index 0000000000..10e6d06373 --- /dev/null +++ b/phpBB/templates/subSilver/admin/forum_prune_result_body.tpl @@ -0,0 +1,21 @@ + +

      {L_FORUM_PRUNE}

      + +

      {L_PRUNE_RESULT}

      + + + + + + + + + + + + + + +
      {L_FORUM}{L_TOPICS_PRUNED}{L_POSTS_PRUNED}
      {prune_results.FORUM_NAME}{prune_results.FORUM_TOPICS}{prune_results.FORUM_POSTS}
      + +
      diff --git a/phpBB/templates/subSilver/admin/forum_prune_select_body.tpl b/phpBB/templates/subSilver/admin/forum_prune_select_body.tpl new file mode 100644 index 0000000000..d59e7f732f --- /dev/null +++ b/phpBB/templates/subSilver/admin/forum_prune_select_body.tpl @@ -0,0 +1,12 @@ + +

      {L_FORUM_PRUNE}

      + +
      + + + + + + + +
      {L_SELECT_FORUM}
      {S_FORUMS_SELECT}   
      diff --git a/phpBB/templates/subSilver/admin/group_edit_body.tpl b/phpBB/templates/subSilver/admin/group_edit_body.tpl new file mode 100644 index 0000000000..ed96b17c30 --- /dev/null +++ b/phpBB/templates/subSilver/admin/group_edit_body.tpl @@ -0,0 +1,56 @@ + +

      {L_GROUP_TITLE}

      + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_GROUP_EDIT_DELETE}
      {L_ITEMS_REQUIRED}
      {L_GROUP_NAME}: + +
      {L_GROUP_DESCRIPTION}: + +
      {L_GROUP_MODERATOR}:  
      {L_GROUP_STATUS}: + {L_GROUP_OPEN}    {L_GROUP_CLOSED}    {L_GROUP_HIDDEN}
      {L_DELETE_MODERATOR} +
      + {L_DELETE_MODERATOR_EXPLAIN}
      + + {L_YES}
      {L_GROUP_DELETE}: + + {L_GROUP_DELETE_CHECK}
      + +    + +
      {S_HIDDEN_FIELDS}
      diff --git a/phpBB/templates/subSilver/admin/group_select_body.tpl b/phpBB/templates/subSilver/admin/group_select_body.tpl new file mode 100644 index 0000000000..7428918896 --- /dev/null +++ b/phpBB/templates/subSilver/admin/group_select_body.tpl @@ -0,0 +1,19 @@ + +

      {L_GROUP_TITLE}

      + +

      {L_GROUP_EXPLAIN}

      + +
      + + + + + + + + + + + + +
      {L_GROUP_SELECT}
      {S_GROUP_SELECT}   
      {S_HIDDEN_FIELDS}
      diff --git a/phpBB/images/icons/misc/index.htm b/phpBB/templates/subSilver/admin/index.htm similarity index 100% rename from phpBB/images/icons/misc/index.htm rename to phpBB/templates/subSilver/admin/index.htm diff --git a/phpBB/templates/subSilver/admin/index_body.tpl b/phpBB/templates/subSilver/admin/index_body.tpl new file mode 100644 index 0000000000..6e9f8d3862 --- /dev/null +++ b/phpBB/templates/subSilver/admin/index_body.tpl @@ -0,0 +1,86 @@ + +

      {L_WELCOME}

      + +

      {L_ADMIN_INTRO}

      + +

      {L_FORUM_STATS}

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_STATISTIC}{L_VALUE}{L_STATISTIC}{L_VALUE}
      {L_NUMBER_POSTS}:{NUMBER_OF_POSTS}{L_POSTS_PER_DAY}:{POSTS_PER_DAY}
      {L_NUMBER_TOPICS}:{NUMBER_OF_TOPICS}{L_TOPICS_PER_DAY}:{TOPICS_PER_DAY}
      {L_NUMBER_USERS}:{NUMBER_OF_USERS}{L_USERS_PER_DAY}:{USERS_PER_DAY}
      {L_BOARD_STARTED}:{START_DATE}{L_AVATAR_DIR_SIZE}:{AVATAR_DIR_SIZE}
      {L_DB_SIZE}:{DB_SIZE}{L_GZIP_COMPRESSION}:{GZIP_COMPRESSION}
      + +

      {L_VERSION_INFORMATION}

      + +{VERSION_INFO} + +
      + +

      {L_WHO_IS_ONLINE}

      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
       {L_USERNAME}  {L_STARTED}  {L_LAST_UPDATE}  {L_FORUM_LOCATION}  {L_IP_ADDRESS} 
       {reg_user_row.USERNAME}  {reg_user_row.STARTED}  {reg_user_row.LASTUPDATE}  {reg_user_row.FORUM_LOCATION}  {reg_user_row.IP_ADDRESS} 
      .
       {guest_user_row.USERNAME}  {guest_user_row.STARTED}  {guest_user_row.LASTUPDATE}  {guest_user_row.FORUM_LOCATION}  {guest_user_row.IP_ADDRESS} 
      + +
      diff --git a/phpBB/templates/subSilver/admin/index_frameset.tpl b/phpBB/templates/subSilver/admin/index_frameset.tpl new file mode 100644 index 0000000000..5cf48df55b --- /dev/null +++ b/phpBB/templates/subSilver/admin/index_frameset.tpl @@ -0,0 +1,17 @@ + + +phpBB Administration + + + + + + + + + + <body bgcolor="#FFFFFF" text="#000000"> + <p>Sorry, your browser doesn't seem to support frames</p> + </body> + + \ No newline at end of file diff --git a/phpBB/templates/subSilver/admin/index_navigate.tpl b/phpBB/templates/subSilver/admin/index_navigate.tpl new file mode 100644 index 0000000000..5977bdfcd7 --- /dev/null +++ b/phpBB/templates/subSilver/admin/index_navigate.tpl @@ -0,0 +1,37 @@ + + + + + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + +
      {L_ADMIN}
      {L_ADMIN_INDEX}
      {L_FORUM_INDEX}
      {L_PREVIEW_FORUM}
      {catrow.ADMIN_CATEGORY}
      {catrow.modulerow.ADMIN_MODULE} +
      +
      + +
      diff --git a/phpBB/templates/subSilver/admin/page_footer.tpl b/phpBB/templates/subSilver/admin/page_footer.tpl new file mode 100644 index 0000000000..278b3607cd --- /dev/null +++ b/phpBB/templates/subSilver/admin/page_footer.tpl @@ -0,0 +1,22 @@ + + + +
      Powered by phpBB {PHPBB_VERSION} © 2001 phpBB Group
      {TRANSLATION_INFO}
      + + + \ No newline at end of file diff --git a/phpBB/templates/subSilver/admin/page_header.tpl b/phpBB/templates/subSilver/admin/page_header.tpl new file mode 100644 index 0000000000..507a296495 --- /dev/null +++ b/phpBB/templates/subSilver/admin/page_header.tpl @@ -0,0 +1,226 @@ + + + +{META} + + + +{SITENAME} - {L_PHPBB_ADMIN} + + + + diff --git a/phpBB/templates/subSilver/admin/ranks_edit_body.tpl b/phpBB/templates/subSilver/admin/ranks_edit_body.tpl new file mode 100644 index 0000000000..b3974ea795 --- /dev/null +++ b/phpBB/templates/subSilver/admin/ranks_edit_body.tpl @@ -0,0 +1,31 @@ + +

      {L_RANKS_TITLE}

      + +

      {L_RANKS_TEXT}

      + +
      + + + + + + + + + + + + + + + + + + + + + + +
      {L_RANKS_TITLE}
      {L_RANK_TITLE}:
      {L_RANK_SPECIAL}{L_YES}    {L_NO}
      {L_RANK_MINIMUM}:
      {L_RANK_IMAGE}:
      + {L_RANK_IMAGE_EXPLAIN}

      {IMAGE_DISPLAY}
        
      +{S_HIDDEN_FIELDS}
      diff --git a/phpBB/templates/subSilver/admin/ranks_list_body.tpl b/phpBB/templates/subSilver/admin/ranks_list_body.tpl new file mode 100644 index 0000000000..368326fa17 --- /dev/null +++ b/phpBB/templates/subSilver/admin/ranks_list_body.tpl @@ -0,0 +1,26 @@ + +

      {L_RANKS_TITLE}

      + +

      {L_RANKS_TEXT}

      + +
      + + + + + + + + + + + + + + + + + + + +
      {L_RANK}{L_RANK_MINIMUM}{L_SPECIAL_RANK}{L_EDIT}{L_DELETE}
      {ranks.RANK}{ranks.RANK_MIN}{ranks.SPECIAL_RANK}{L_EDIT}{L_DELETE}
      diff --git a/phpBB/templates/subSilver/admin/smile_edit_body.tpl b/phpBB/templates/subSilver/admin/smile_edit_body.tpl new file mode 100644 index 0000000000..b453afc60d --- /dev/null +++ b/phpBB/templates/subSilver/admin/smile_edit_body.tpl @@ -0,0 +1,34 @@ + +

      {L_SMILEY_TITLE}

      + +

      {L_SMILEY_EXPLAIN}

      + + + +
      + + + + + + + + + + + + + + + + + + +
      {L_SMILEY_CONFIG}
      {L_SMILEY_CODE}
      {L_SMILEY_URL}    
      {L_SMILEY_EMOTION}
      {S_HIDDEN_FIELDS}
      diff --git a/phpBB/templates/subSilver/admin/smile_import_body.tpl b/phpBB/templates/subSilver/admin/smile_import_body.tpl new file mode 100644 index 0000000000..9881cb1ca7 --- /dev/null +++ b/phpBB/templates/subSilver/admin/smile_import_body.tpl @@ -0,0 +1,24 @@ + +

      {L_SMILEY_TITLE}

      + +

      {L_SMILEY_EXPLAIN}

      + +
      + + + + + + + + + + + + + + + + + +
      {L_SMILEY_IMPORT}
      {L_SELECT_LBL}{S_SMILE_SELECT}
      {L_DEL_EXISTING}
      {L_CONFLICTS}
      {L_REPLACE_EXISTING}   {L_KEEP_EXISTING}
      {S_HIDDEN_FIELDS}
      diff --git a/phpBB/templates/subSilver/admin/smile_list_body.tpl b/phpBB/templates/subSilver/admin/smile_list_body.tpl new file mode 100644 index 0000000000..ae85ad95eb --- /dev/null +++ b/phpBB/templates/subSilver/admin/smile_list_body.tpl @@ -0,0 +1,25 @@ + +

      {L_SMILEY_TITLE}

      + +

      {L_SMILEY_TEXT}

      + +
      + + + + + + + + + + + + + + + + + + +
      {L_CODE}{L_SMILE}{L_EMOT}{L_ACTION}
      {smiles.CODE}{smiles.CODE}{smiles.EMOT}{L_EDIT}{L_DELETE}
      {S_HIDDEN_FIELDS}    
      diff --git a/phpBB/templates/subSilver/admin/styles_addnew_body.tpl b/phpBB/templates/subSilver/admin/styles_addnew_body.tpl new file mode 100755 index 0000000000..1cb9df53ca --- /dev/null +++ b/phpBB/templates/subSilver/admin/styles_addnew_body.tpl @@ -0,0 +1,19 @@ + +

      {L_STYLES_TITLE}

      + +

      {L_STYLES_ADD_TEXT}

      + + + + + + + + + + + + + + +
      {L_STYLE}{L_TEMPLATE}{L_ACTION}
      {styles.STYLE_NAME}{styles.TEMPLATE_NAME}{L_INSTALL}
      diff --git a/phpBB/templates/subSilver/admin/styles_edit_body.tpl b/phpBB/templates/subSilver/admin/styles_edit_body.tpl new file mode 100755 index 0000000000..71e9e442c5 --- /dev/null +++ b/phpBB/templates/subSilver/admin/styles_edit_body.tpl @@ -0,0 +1,246 @@ + +

      {L_THEMES_TITLE}

      + +

      {L_THEMES_EXPLAIN}

      + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_THEME_SETTINGS}
      {L_THEME_NAME}:
      {L_TEMPLATE}:{S_TEMPLATE_SELECT}
      {L_THEME_ELEMENT}{L_VALUE}{L_SIMPLE_NAME}
      {L_STYLESHEET}:
      {L_STYLESHEET_EXPLAIN}
       
      {L_BACKGROUND_IMAGE}: 
      {L_BACKGROUND_COLOR}: 
      {L_BODY_TEXT_COLOR}: 
      {L_BODY_LINK_COLOR}: 
      {L_BODY_VLINK_COLOR}: 
      {L_BODY_ALINK_COLOR}: 
      {L_BODY_HLINK_COLOR}: 
      {L_TR_COLOR1}: +
      {L_TR_COLOR2}: +
      {L_TR_COLOR3}: +
      {L_TR_CLASS1}: +
      {L_TR_CLASS2}: +
      {L_TR_CLASS3}: +
      {L_TH_COLOR1}: +
      {L_TH_COLOR2}: +
      {L_TH_COLOR3}: +
      {L_TH_CLASS1}: +
      {L_TH_CLASS2}: +
      {L_TH_CLASS3}: +
      {L_TD_COLOR1}: +
      {L_TD_COLOR2}: +
      {L_TD_COLOR3}: +
      {L_TD_CLASS1}: +
      {L_TD_CLASS2}: +
      {L_TD_CLASS3}: +
      {L_FONTFACE_1}: +
      {L_FONTFACE_2}: +
      {L_FONTFACE_3}: +
      {L_FONTSIZE_1}: +
      {L_FONTSIZE_2}: +
      {L_FONTSIZE_3}: +
      {L_FONTCOLOR_1}: +
      {L_FONTCOLOR_2}: +
      {L_FONTCOLOR_3}: +
      {L_SPAN_CLASS_1}: +
      {L_SPAN_CLASS_2}: +
      {L_SPAN_CLASS_3}: +
      {S_HIDDEN_FIELDS} +
      + +
      diff --git a/phpBB/templates/subSilver/admin/styles_exporter.tpl b/phpBB/templates/subSilver/admin/styles_exporter.tpl new file mode 100755 index 0000000000..2056260b7e --- /dev/null +++ b/phpBB/templates/subSilver/admin/styles_exporter.tpl @@ -0,0 +1,14 @@ + +

      {L_STYLE_EXPORTER}

      + +

      {L_EXPORTER_EXPLAIN}

      + +
      + + + + + + + +
      {L_TEMPLATE_SELECT}
      {S_TEMPLATE_SELECT}   
      diff --git a/phpBB/templates/subSilver/admin/styles_list_body.tpl b/phpBB/templates/subSilver/admin/styles_list_body.tpl new file mode 100755 index 0000000000..eb59c64bc5 --- /dev/null +++ b/phpBB/templates/subSilver/admin/styles_list_body.tpl @@ -0,0 +1,21 @@ + +

      {L_STYLES_TITLE}

      + +

      {L_STYLES_TEXT}

      + + + + + + + + + + + + + + + + +
      {L_STYLE}{L_TEMPLATE}{L_EDIT}{L_DELETE}
      {styles.STYLE_NAME}{styles.TEMPLATE_NAME}{L_EDIT}{L_DELETE}
      diff --git a/phpBB/templates/subSilver/admin/user_avatar_gallery.tpl b/phpBB/templates/subSilver/admin/user_avatar_gallery.tpl new file mode 100644 index 0000000000..db861ee403 --- /dev/null +++ b/phpBB/templates/subSilver/admin/user_avatar_gallery.tpl @@ -0,0 +1,36 @@ + +

      {L_USER_TITLE}

      + +

      {L_USER_EXPLAIN}

      + +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_AVATAR_GALLERY}
      {L_CATEGORY}:  
      {S_HIDDEN_FIELDS} + +    + +
      +
      diff --git a/phpBB/templates/subSilver/admin/user_ban_body.tpl b/phpBB/templates/subSilver/admin/user_ban_body.tpl new file mode 100644 index 0000000000..c805f7be69 --- /dev/null +++ b/phpBB/templates/subSilver/admin/user_ban_body.tpl @@ -0,0 +1,54 @@ + +

      {L_BAN_TITLE}

      + +

      {L_BAN_EXPLAIN}

      + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_BAN_USER}
      {L_USERNAME}: {S_HIDDEN_FIELDS}
      {L_UNBAN_USER}
      {L_USERNAME}:
      {L_UNBAN_USER_EXPLAIN}
      {S_UNBAN_USERLIST_SELECT}
      {L_BAN_IP}
      {L_IP_OR_HOSTNAME}:
      {L_BAN_IP_EXPLAIN}
      {L_UNBAN_IP}
      {L_IP_OR_HOSTNAME}:
      {L_UNBAN_IP_EXPLAIN}
      {S_UNBAN_IPLIST_SELECT}
      {L_BAN_EMAIL}
      {L_EMAIL_ADDRESS}:
      {L_BAN_EMAIL_EXPLAIN}
      {L_UNBAN_EMAIL}
      {L_EMAIL_ADDRESS}:
      {L_UNBAN_EMAIL_EXPLAIN}
      {S_UNBAN_EMAILLIST_SELECT}
        
      + +

      {L_BAN_EXPLAIN_WARN}

      diff --git a/phpBB/templates/subSilver/admin/user_edit_body.tpl b/phpBB/templates/subSilver/admin/user_edit_body.tpl new file mode 100644 index 0000000000..0f4bc26172 --- /dev/null +++ b/phpBB/templates/subSilver/admin/user_edit_body.tpl @@ -0,0 +1,310 @@ + +

      {L_USER_TITLE}

      + +

      {L_USER_EXPLAIN}

      + +{ERROR_BOX} + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_REGISTRATION_INFO}
      {L_ITEMS_REQUIRED}
      {L_USERNAME}: * + +
      {L_EMAIL_ADDRESS}: * + +
      {L_NEW_PASSWORD}: *
      + {L_PASSWORD_IF_CHANGED}
      + +
      {L_CONFIRM_PASSWORD}: *
      + {L_PASSWORD_CONFIRM_IF_CHANGED}
      + +
       
      {L_PROFILE_INFO}
      {L_PROFILE_INFO_NOTICE}
      {L_ICQ_NUMBER} + +
      {L_AIM} + +
      {L_MESSENGER} + +
      {L_YAHOO} + +
      {L_WEBSITE} + +
      {L_LOCATION} + +
      {L_OCCUPATION} + +
      {L_INTERESTS} + +
      {L_SIGNATURE}
      + {L_SIGNATURE_EXPLAIN}
      +
      + {HTML_STATUS}
      + {BBCODE_STATUS}
      + {SMILIES_STATUS}
      + +
       
      {L_PREFERENCES}
      {L_PUBLIC_VIEW_EMAIL} + + {L_YES}   + + {L_NO}
      {L_HIDE_USER} + + {L_YES}   + + {L_NO}
      {L_NOTIFY_ON_REPLY} + + {L_YES}   + + {L_NO}
      {L_NOTIFY_ON_PRIVMSG} + + {L_YES}   + + {L_NO}
      {L_POPUP_ON_PRIVMSG} + + {L_YES}   + + {L_NO}
      {L_ALWAYS_ADD_SIGNATURE} + + {L_YES}   + + {L_NO}
      {L_ALWAYS_ALLOW_BBCODE} + + {L_YES}   + + {L_NO}
      {L_ALWAYS_ALLOW_HTML} + + {L_YES}   + + {L_NO}
      {L_ALWAYS_ALLOW_SMILIES} + + {L_YES}   + + {L_NO}
      {L_BOARD_LANGUAGE}{LANGUAGE_SELECT}
      {L_BOARD_STYLE}{STYLE_SELECT}
      {L_TIMEZONE}{TIMEZONE_SELECT}
      {L_DATE_FORMAT}
      + {L_DATE_FORMAT_EXPLAIN}
      + +
       
      {L_AVATAR_PANEL}
      + + + + + +
      {L_AVATAR_EXPLAIN}{L_CURRENT_IMAGE}
      + {AVATAR}
      + +  {L_DELETE_AVATAR}
      +
      {L_UPLOAD_AVATAR_FILE} + + +
      {L_UPLOAD_AVATAR_URL} + +
      {L_LINK_REMOTE_AVATAR} + +
      {L_AVATAR_GALLERY} + +
       
      {L_SPECIAL}
      {L_SPECIAL_EXPLAIN}
      {L_USER_ACTIVE} + + {L_YES}   + + {L_NO}
      {L_ALLOW_PM} + + {L_YES}   + + {L_NO}
      {L_ALLOW_AVATAR} + + {L_YES}   + + {L_NO}
      {L_SELECT_RANK}
      {L_DELETE_USER}? + + {L_DELETE_USER_EXPLAIN}
      {S_HIDDEN_FIELDS} + +    + +
      diff --git a/phpBB/templates/subSilver/admin/user_email_body.tpl b/phpBB/templates/subSilver/admin/user_email_body.tpl new file mode 100644 index 0000000000..5f526584f8 --- /dev/null +++ b/phpBB/templates/subSilver/admin/user_email_body.tpl @@ -0,0 +1,31 @@ + +

      {L_EMAIL_TITLE}

      + +

      {L_EMAIL_EXPLAIN}

      + +
      + +{ERROR_BOX} + + + + + + + + + + + + + + + + + + +
      {L_COMPOSE}
      {L_RECIPIENTS}{S_GROUP_SELECT}
      {L_EMAIL_SUBJECT}
      {L_EMAIL_MSG} + +
      + +
      diff --git a/phpBB/templates/subSilver/admin/user_select_body.tpl b/phpBB/templates/subSilver/admin/user_select_body.tpl new file mode 100644 index 0000000000..5d7a31b83c --- /dev/null +++ b/phpBB/templates/subSilver/admin/user_select_body.tpl @@ -0,0 +1,13 @@ + +

      {L_USER_TITLE}

      + +

      {L_USER_EXPLAIN}

      + +
      + + + + + + +
      {L_USER_SELECT}
      {S_HIDDEN_FIELDS}
      diff --git a/phpBB/templates/subSilver/admin/words_edit_body.tpl b/phpBB/templates/subSilver/admin/words_edit_body.tpl new file mode 100644 index 0000000000..569a94f33f --- /dev/null +++ b/phpBB/templates/subSilver/admin/words_edit_body.tpl @@ -0,0 +1,21 @@ + +

      {L_WORDS_TITLE}

      + +

      {L_WORDS_TEXT}

      + +
      + + + + + + + + + + + + + + +
      {L_WORD_CENSOR}
      {L_WORD}
      {L_REPLACEMENT}
      {S_HIDDEN_FIELDS}
      diff --git a/phpBB/templates/subSilver/admin/words_list_body.tpl b/phpBB/templates/subSilver/admin/words_list_body.tpl new file mode 100644 index 0000000000..40acf81056 --- /dev/null +++ b/phpBB/templates/subSilver/admin/words_list_body.tpl @@ -0,0 +1,23 @@ + +

      {L_WORDS_TITLE}

      + +

      {L_WORDS_TEXT}

      + +
      + + + + + + + + + + + + + + + + +
      {L_WORD}{L_REPLACEMENT}{L_ACTION}
      {words.WORD}{words.REPLACEMENT}{L_EDIT}{L_DELETE}
      {S_HIDDEN_FIELDS}
      diff --git a/phpBB/templates/subSilver/agreement.tpl b/phpBB/templates/subSilver/agreement.tpl new file mode 100644 index 0000000000..5635a355cc --- /dev/null +++ b/phpBB/templates/subSilver/agreement.tpl @@ -0,0 +1,19 @@ + + + + + +
      {L_INDEX}
      + + + + + + + + +
      {SITENAME} - {REGISTRATION}
      + + + +

      {AGREEMENT}



      diff --git a/phpBB/templates/subSilver/bbcode.tpl b/phpBB/templates/subSilver/bbcode.tpl new file mode 100755 index 0000000000..6f86f55353 --- /dev/null +++ b/phpBB/templates/subSilver/bbcode.tpl @@ -0,0 +1,60 @@ +
        +
      + +
        +
      + +
    • + + + + + + + + + +
      {USERNAME} {L_WROTE}:
      + + + + + + + + +
      {L_QUOTE}:
      +
      + + + + + + + + + + +
      {L_CODE}:
      +
      + + + + + + + + + + + + + + + + + + + + +{DESCRIPTION} + +{EMAIL} diff --git a/phpBB/templates/subSilver/confirm_body.tpl b/phpBB/templates/subSilver/confirm_body.tpl new file mode 100644 index 0000000000..d17fa823dd --- /dev/null +++ b/phpBB/templates/subSilver/confirm_body.tpl @@ -0,0 +1,17 @@ + + + + + +
      + + + + + + + + +
      {MESSAGE_TITLE}

      {MESSAGE_TEXT}

      {S_HIDDEN_FIELDS}  
      + +
      diff --git a/phpBB/templates/subSilver/error_body.tpl b/phpBB/templates/subSilver/error_body.tpl new file mode 100644 index 0000000000..f211ad0f0c --- /dev/null +++ b/phpBB/templates/subSilver/error_body.tpl @@ -0,0 +1,18 @@ + + + + + +
      + + + + + + + + + +
       
      {ERROR_MESSAGE}
       
      + +
      diff --git a/phpBB/templates/subSilver/faq_body.tpl b/phpBB/templates/subSilver/faq_body.tpl new file mode 100755 index 0000000000..9933a2ced5 --- /dev/null +++ b/phpBB/templates/subSilver/faq_body.tpl @@ -0,0 +1,52 @@ + + + + + +
      + + + + + + + + + + + +
      {L_FAQ_TITLE}
      + + {faq_block_link.BLOCK_TITLE}
      + + {faq_block_link.faq_row_link.FAQ_LINK}
      + +
      + +
       
      + +
      + + + + + + + + + + + + + + +
      {faq_block.BLOCK_TITLE}
      {faq_block.faq_row.FAQ_QUESTION}
      {faq_block.faq_row.FAQ_ANSWER}
      {L_BACK_TO_TOP}
      + +
      + + + + + + +
      {S_TIMEZONE}

      {JUMPBOX}
      diff --git a/phpBB/templates/subSilver/formIE.css b/phpBB/templates/subSilver/formIE.css new file mode 100644 index 0000000000..fde54cb138 --- /dev/null +++ b/phpBB/templates/subSilver/formIE.css @@ -0,0 +1,19 @@ +/* Fancy form styles for IE */ + +input, textarea, select { +border-top-width : 1px; +border-right-width : 1px; +border-bottom-width : 1px; +border-left-width : 1px; +} + +input { text-indent : 2px; } + +input.button { +border-top-width : 1px; +border-right-width : 1px; +border-bottom-width : 1px; +border-left-width : 1px; +} + +.postbody { line-height: 18px} diff --git a/phpBB/templates/subSilver/groupcp_info_body.tpl b/phpBB/templates/subSilver/groupcp_info_body.tpl new file mode 100644 index 0000000000..6c3acf9837 --- /dev/null +++ b/phpBB/templates/subSilver/groupcp_info_body.tpl @@ -0,0 +1,128 @@ + +
      + + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + +
      {L_GROUP_INFORMATION}
      {L_GROUP_NAME}:{GROUP_NAME}
      {L_GROUP_DESC}:{GROUP_DESC}
      {L_GROUP_MEMBERSHIP}:{GROUP_DETAILS}    + + + + + + +
      {L_GROUP_TYPE}: {L_GROUP_OPEN}    {L_GROUP_CLOSED}    {L_GROUP_HIDDEN}   
      + +{S_HIDDEN_FIELDS} + +
      + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_PM}{L_USERNAME}{L_POSTS}{L_FROM}{L_EMAIL}{L_WEBSITE}{L_SELECT}
      {L_GROUP_MODERATOR}
      {MOD_PM_IMG} {MOD_USERNAME}{MOD_POSTS}{MOD_FROM}{MOD_EMAIL_IMG}{MOD_WWW_IMG}  
      {L_GROUP_MEMBERS}
      {member_row.PM_IMG} {member_row.USERNAME}{member_row.POSTS} {member_row.FROM} + {member_row.EMAIL_IMG} {member_row.WWW_IMG} + + + +
      {L_NO_MEMBERS}
      {L_HIDDEN_MEMBERS}
      + +
      + + + + + + +
      + +

      + + {PAGE_NUMBER}
      {S_TIMEZONE}
      {PAGINATION}
      + +{PENDING_USER_BOX} + +{S_HIDDEN_FIELDS}
      + + + + + +
      {JUMPBOX}
      diff --git a/phpBB/templates/subSilver/groupcp_pending_info.tpl b/phpBB/templates/subSilver/groupcp_pending_info.tpl new file mode 100644 index 0000000000..68f618cb9d --- /dev/null +++ b/phpBB/templates/subSilver/groupcp_pending_info.tpl @@ -0,0 +1,36 @@ + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_PM}{L_USERNAME}{L_POSTS}{L_FROM}{L_EMAIL}{L_WEBSITE}{L_SELECT}
      {L_PENDING_MEMBERS}
      {pending_members_row.PM_IMG} + {pending_members_row.USERNAME}{pending_members_row.POSTS}{pending_members_row.FROM}{pending_members_row.EMAIL_IMG}{pending_members_row.WWW_IMG}
      + +   + +
      diff --git a/phpBB/templates/subSilver/groupcp_user_body.tpl b/phpBB/templates/subSilver/groupcp_user_body.tpl new file mode 100644 index 0000000000..8be36f69d3 --- /dev/null +++ b/phpBB/templates/subSilver/groupcp_user_body.tpl @@ -0,0 +1,76 @@ + + + + + +
      {L_INDEX}
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_GROUP_MEMBERSHIP_DETAILS}
      {L_YOU_BELONG_GROUPS} + + + + + +
      {GROUP_MEMBER_SELECT} + {S_HIDDEN_FIELDS} +
      +
      {L_PENDING_GROUPS} + + + + + +
      {GROUP_PENDING_SELECT} + {S_HIDDEN_FIELDS} +
      +
      {L_JOIN_A_GROUP}
      {L_SELECT_A_GROUP} + + + + + +
      {GROUP_LIST_SELECT} + {S_HIDDEN_FIELDS} +
      +
      + + + + + +
      {S_TIMEZONE}
      + +
      + + + + + +
      {JUMPBOX}
      diff --git a/phpBB/styles/subsilver2/theme/images/cellpic.gif b/phpBB/templates/subSilver/images/cellpic.gif similarity index 100% rename from phpBB/styles/subsilver2/theme/images/cellpic.gif rename to phpBB/templates/subSilver/images/cellpic.gif diff --git a/phpBB/styles/subsilver2/theme/images/cellpic1.gif b/phpBB/templates/subSilver/images/cellpic1.gif similarity index 100% rename from phpBB/styles/subsilver2/theme/images/cellpic1.gif rename to phpBB/templates/subSilver/images/cellpic1.gif diff --git a/phpBB/styles/subsilver2/theme/images/cellpic2.jpg b/phpBB/templates/subSilver/images/cellpic2.jpg similarity index 100% rename from phpBB/styles/subsilver2/theme/images/cellpic2.jpg rename to phpBB/templates/subSilver/images/cellpic2.jpg diff --git a/phpBB/styles/subsilver2/theme/images/cellpic3.gif b/phpBB/templates/subSilver/images/cellpic3.gif similarity index 100% rename from phpBB/styles/subsilver2/theme/images/cellpic3.gif rename to phpBB/templates/subSilver/images/cellpic3.gif diff --git a/phpBB/styles/subsilver2/theme/images/created_by.jpg b/phpBB/templates/subSilver/images/created_by.jpg similarity index 100% rename from phpBB/styles/subsilver2/theme/images/created_by.jpg rename to phpBB/templates/subSilver/images/created_by.jpg diff --git a/phpBB/styles/subsilver2/imageset/topic_read.gif b/phpBB/templates/subSilver/images/folder.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/topic_read.gif rename to phpBB/templates/subSilver/images/folder.gif diff --git a/phpBB/styles/subsilver2/imageset/announce_read.gif b/phpBB/templates/subSilver/images/folder_announce.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/announce_read.gif rename to phpBB/templates/subSilver/images/folder_announce.gif diff --git a/phpBB/styles/subsilver2/imageset/announce_unread.gif b/phpBB/templates/subSilver/images/folder_announce_new.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/announce_unread.gif rename to phpBB/templates/subSilver/images/folder_announce_new.gif diff --git a/phpBB/styles/subsilver2/imageset/forum_read.gif b/phpBB/templates/subSilver/images/folder_big.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/forum_read.gif rename to phpBB/templates/subSilver/images/folder_big.gif diff --git a/phpBB/styles/subsilver2/imageset/topic_read_hot.gif b/phpBB/templates/subSilver/images/folder_hot.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/topic_read_hot.gif rename to phpBB/templates/subSilver/images/folder_hot.gif diff --git a/phpBB/styles/subsilver2/imageset/topic_read_locked.gif b/phpBB/templates/subSilver/images/folder_lock.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/topic_read_locked.gif rename to phpBB/templates/subSilver/images/folder_lock.gif diff --git a/phpBB/styles/subsilver2/imageset/topic_unread_locked.gif b/phpBB/templates/subSilver/images/folder_lock_new.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/topic_unread_locked.gif rename to phpBB/templates/subSilver/images/folder_lock_new.gif diff --git a/phpBB/styles/subsilver2/imageset/forum_read_locked.gif b/phpBB/templates/subSilver/images/folder_locked_big.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/forum_read_locked.gif rename to phpBB/templates/subSilver/images/folder_locked_big.gif diff --git a/phpBB/styles/subsilver2/imageset/topic_unread.gif b/phpBB/templates/subSilver/images/folder_new.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/topic_unread.gif rename to phpBB/templates/subSilver/images/folder_new.gif diff --git a/phpBB/styles/subsilver2/imageset/forum_unread.gif b/phpBB/templates/subSilver/images/folder_new_big.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/forum_unread.gif rename to phpBB/templates/subSilver/images/folder_new_big.gif diff --git a/phpBB/styles/subsilver2/imageset/topic_unread_hot.gif b/phpBB/templates/subSilver/images/folder_new_hot.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/topic_unread_hot.gif rename to phpBB/templates/subSilver/images/folder_new_hot.gif diff --git a/phpBB/styles/subsilver2/imageset/sticky_read.gif b/phpBB/templates/subSilver/images/folder_sticky.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/sticky_read.gif rename to phpBB/templates/subSilver/images/folder_sticky.gif diff --git a/phpBB/styles/subsilver2/imageset/sticky_unread.gif b/phpBB/templates/subSilver/images/folder_sticky_new.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/sticky_unread.gif rename to phpBB/templates/subSilver/images/folder_sticky_new.gif diff --git a/phpBB/templates/subSilver/images/icon_delete.gif b/phpBB/templates/subSilver/images/icon_delete.gif new file mode 100644 index 0000000000..1153ba5b25 Binary files /dev/null and b/phpBB/templates/subSilver/images/icon_delete.gif differ diff --git a/phpBB/styles/subsilver2/imageset/icon_topic_latest.gif b/phpBB/templates/subSilver/images/icon_latest_reply.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/icon_topic_latest.gif rename to phpBB/templates/subSilver/images/icon_latest_reply.gif diff --git a/phpBB/templates/subSilver/images/icon_mini_faq.gif b/phpBB/templates/subSilver/images/icon_mini_faq.gif new file mode 100644 index 0000000000..b8b873d159 Binary files /dev/null and b/phpBB/templates/subSilver/images/icon_mini_faq.gif differ diff --git a/phpBB/templates/subSilver/images/icon_mini_groups.gif b/phpBB/templates/subSilver/images/icon_mini_groups.gif new file mode 100644 index 0000000000..be5c2018ce Binary files /dev/null and b/phpBB/templates/subSilver/images/icon_mini_groups.gif differ diff --git a/phpBB/templates/subSilver/images/icon_mini_login.gif b/phpBB/templates/subSilver/images/icon_mini_login.gif new file mode 100644 index 0000000000..30b309b26c Binary files /dev/null and b/phpBB/templates/subSilver/images/icon_mini_login.gif differ diff --git a/phpBB/templates/subSilver/images/icon_mini_members.gif b/phpBB/templates/subSilver/images/icon_mini_members.gif new file mode 100644 index 0000000000..a79a5a74b2 Binary files /dev/null and b/phpBB/templates/subSilver/images/icon_mini_members.gif differ diff --git a/phpBB/templates/subSilver/images/icon_mini_message.gif b/phpBB/templates/subSilver/images/icon_mini_message.gif new file mode 100644 index 0000000000..57071d6e8f Binary files /dev/null and b/phpBB/templates/subSilver/images/icon_mini_message.gif differ diff --git a/phpBB/templates/subSilver/images/icon_mini_profile.gif b/phpBB/templates/subSilver/images/icon_mini_profile.gif new file mode 100644 index 0000000000..3dc0871896 Binary files /dev/null and b/phpBB/templates/subSilver/images/icon_mini_profile.gif differ diff --git a/phpBB/templates/subSilver/images/icon_mini_register.gif b/phpBB/templates/subSilver/images/icon_mini_register.gif new file mode 100644 index 0000000000..11b8f31718 Binary files /dev/null and b/phpBB/templates/subSilver/images/icon_mini_register.gif differ diff --git a/phpBB/templates/subSilver/images/icon_mini_search.gif b/phpBB/templates/subSilver/images/icon_mini_search.gif new file mode 100644 index 0000000000..1295e9f1db Binary files /dev/null and b/phpBB/templates/subSilver/images/icon_mini_search.gif differ diff --git a/phpBB/styles/subsilver2/imageset/icon_post_target.gif b/phpBB/templates/subSilver/images/icon_minipost.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/icon_post_target.gif rename to phpBB/templates/subSilver/images/icon_minipost.gif diff --git a/phpBB/styles/subsilver2/imageset/icon_post_target_unread.gif b/phpBB/templates/subSilver/images/icon_minipost_new.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/icon_post_target_unread.gif rename to phpBB/templates/subSilver/images/icon_minipost_new.gif diff --git a/phpBB/styles/subsilver2/imageset/icon_topic_newest.gif b/phpBB/templates/subSilver/images/icon_newest_reply.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/icon_topic_newest.gif rename to phpBB/templates/subSilver/images/icon_newest_reply.gif diff --git a/phpBB/styles/subsilver2/theme/images/index.htm b/phpBB/templates/subSilver/images/index.htm similarity index 85% rename from phpBB/styles/subsilver2/theme/images/index.htm rename to phpBB/templates/subSilver/images/index.htm index 29531416fe..491b26dd23 100644 --- a/phpBB/styles/subsilver2/theme/images/index.htm +++ b/phpBB/templates/subSilver/images/index.htm @@ -8,7 +8,7 @@ - +
      Created by subBlue DesignCreated by subBlue Design
      diff --git a/phpBB/templates/subSilver/images/lang_english/icon_aim.gif b/phpBB/templates/subSilver/images/lang_english/icon_aim.gif new file mode 100644 index 0000000000..4b6a858c34 Binary files /dev/null and b/phpBB/templates/subSilver/images/lang_english/icon_aim.gif differ diff --git a/phpBB/templates/subSilver/images/lang_english/icon_edit.gif b/phpBB/templates/subSilver/images/lang_english/icon_edit.gif new file mode 100644 index 0000000000..bb70004b93 Binary files /dev/null and b/phpBB/templates/subSilver/images/lang_english/icon_edit.gif differ diff --git a/phpBB/templates/subSilver/images/lang_english/icon_email.gif b/phpBB/templates/subSilver/images/lang_english/icon_email.gif new file mode 100644 index 0000000000..3d359c2a24 Binary files /dev/null and b/phpBB/templates/subSilver/images/lang_english/icon_email.gif differ diff --git a/phpBB/templates/subSilver/images/lang_english/icon_icq_add.gif b/phpBB/templates/subSilver/images/lang_english/icon_icq_add.gif new file mode 100644 index 0000000000..4bf276df58 Binary files /dev/null and b/phpBB/templates/subSilver/images/lang_english/icon_icq_add.gif differ diff --git a/phpBB/templates/subSilver/images/lang_english/icon_ip.gif b/phpBB/templates/subSilver/images/lang_english/icon_ip.gif new file mode 100644 index 0000000000..bf17a5141f Binary files /dev/null and b/phpBB/templates/subSilver/images/lang_english/icon_ip.gif differ diff --git a/phpBB/templates/subSilver/images/lang_english/icon_msnm.gif b/phpBB/templates/subSilver/images/lang_english/icon_msnm.gif new file mode 100644 index 0000000000..651841555b Binary files /dev/null and b/phpBB/templates/subSilver/images/lang_english/icon_msnm.gif differ diff --git a/phpBB/templates/subSilver/images/lang_english/icon_pm.gif b/phpBB/templates/subSilver/images/lang_english/icon_pm.gif new file mode 100644 index 0000000000..f87b4f57fd Binary files /dev/null and b/phpBB/templates/subSilver/images/lang_english/icon_pm.gif differ diff --git a/phpBB/templates/subSilver/images/lang_english/icon_profile.gif b/phpBB/templates/subSilver/images/lang_english/icon_profile.gif new file mode 100644 index 0000000000..2bd32d2d73 Binary files /dev/null and b/phpBB/templates/subSilver/images/lang_english/icon_profile.gif differ diff --git a/phpBB/templates/subSilver/images/lang_english/icon_quote.gif b/phpBB/templates/subSilver/images/lang_english/icon_quote.gif new file mode 100644 index 0000000000..3dec6756b3 Binary files /dev/null and b/phpBB/templates/subSilver/images/lang_english/icon_quote.gif differ diff --git a/phpBB/templates/subSilver/images/lang_english/icon_search.gif b/phpBB/templates/subSilver/images/lang_english/icon_search.gif new file mode 100644 index 0000000000..8dd38a3666 Binary files /dev/null and b/phpBB/templates/subSilver/images/lang_english/icon_search.gif differ diff --git a/phpBB/templates/subSilver/images/lang_english/icon_www.gif b/phpBB/templates/subSilver/images/lang_english/icon_www.gif new file mode 100644 index 0000000000..8c1731f3a7 Binary files /dev/null and b/phpBB/templates/subSilver/images/lang_english/icon_www.gif differ diff --git a/phpBB/templates/subSilver/images/lang_english/icon_yim.gif b/phpBB/templates/subSilver/images/lang_english/icon_yim.gif new file mode 100644 index 0000000000..57e75b3b5a Binary files /dev/null and b/phpBB/templates/subSilver/images/lang_english/icon_yim.gif differ diff --git a/phpBB/templates/subSilver/images/lang_english/msg_newpost.gif b/phpBB/templates/subSilver/images/lang_english/msg_newpost.gif new file mode 100644 index 0000000000..ce2c1a87fd Binary files /dev/null and b/phpBB/templates/subSilver/images/lang_english/msg_newpost.gif differ diff --git a/phpBB/templates/subSilver/images/lang_english/post.gif b/phpBB/templates/subSilver/images/lang_english/post.gif new file mode 100644 index 0000000000..4b7cb20642 Binary files /dev/null and b/phpBB/templates/subSilver/images/lang_english/post.gif differ diff --git a/phpBB/templates/subSilver/images/lang_english/reply-locked.gif b/phpBB/templates/subSilver/images/lang_english/reply-locked.gif new file mode 100644 index 0000000000..5ab1d7a1b1 Binary files /dev/null and b/phpBB/templates/subSilver/images/lang_english/reply-locked.gif differ diff --git a/phpBB/templates/subSilver/images/lang_english/reply.gif b/phpBB/templates/subSilver/images/lang_english/reply.gif new file mode 100644 index 0000000000..cb385af629 Binary files /dev/null and b/phpBB/templates/subSilver/images/lang_english/reply.gif differ diff --git a/phpBB/templates/subSilver/images/logo_phpBB.gif b/phpBB/templates/subSilver/images/logo_phpBB.gif new file mode 100644 index 0000000000..37aa0fd4d9 Binary files /dev/null and b/phpBB/templates/subSilver/images/logo_phpBB.gif differ diff --git a/phpBB/templates/subSilver/images/logo_phpBB_med.gif b/phpBB/templates/subSilver/images/logo_phpBB_med.gif new file mode 100644 index 0000000000..3d84f940ff Binary files /dev/null and b/phpBB/templates/subSilver/images/logo_phpBB_med.gif differ diff --git a/phpBB/templates/subSilver/images/msg_inbox.gif b/phpBB/templates/subSilver/images/msg_inbox.gif new file mode 100644 index 0000000000..011d0bd360 Binary files /dev/null and b/phpBB/templates/subSilver/images/msg_inbox.gif differ diff --git a/phpBB/templates/subSilver/images/msg_outbox.gif b/phpBB/templates/subSilver/images/msg_outbox.gif new file mode 100644 index 0000000000..84fdce33e9 Binary files /dev/null and b/phpBB/templates/subSilver/images/msg_outbox.gif differ diff --git a/phpBB/templates/subSilver/images/msg_savebox.gif b/phpBB/templates/subSilver/images/msg_savebox.gif new file mode 100644 index 0000000000..86d1f2cb83 Binary files /dev/null and b/phpBB/templates/subSilver/images/msg_savebox.gif differ diff --git a/phpBB/templates/subSilver/images/msg_sentbox.gif b/phpBB/templates/subSilver/images/msg_sentbox.gif new file mode 100644 index 0000000000..b95db7540b Binary files /dev/null and b/phpBB/templates/subSilver/images/msg_sentbox.gif differ diff --git a/phpBB/styles/subsilver2/theme/images/spacer.gif b/phpBB/templates/subSilver/images/spacer.gif similarity index 100% rename from phpBB/styles/subsilver2/theme/images/spacer.gif rename to phpBB/templates/subSilver/images/spacer.gif diff --git a/phpBB/templates/subSilver/images/topic_delete.gif b/phpBB/templates/subSilver/images/topic_delete.gif new file mode 100644 index 0000000000..3b21b11085 Binary files /dev/null and b/phpBB/templates/subSilver/images/topic_delete.gif differ diff --git a/phpBB/templates/subSilver/images/topic_lock.gif b/phpBB/templates/subSilver/images/topic_lock.gif new file mode 100644 index 0000000000..fe32fea5e9 Binary files /dev/null and b/phpBB/templates/subSilver/images/topic_lock.gif differ diff --git a/phpBB/templates/subSilver/images/topic_move.gif b/phpBB/templates/subSilver/images/topic_move.gif new file mode 100644 index 0000000000..ab2fd23536 Binary files /dev/null and b/phpBB/templates/subSilver/images/topic_move.gif differ diff --git a/phpBB/templates/subSilver/images/topic_split.gif b/phpBB/templates/subSilver/images/topic_split.gif new file mode 100644 index 0000000000..bdbc88428f Binary files /dev/null and b/phpBB/templates/subSilver/images/topic_split.gif differ diff --git a/phpBB/templates/subSilver/images/topic_unlock.gif b/phpBB/templates/subSilver/images/topic_unlock.gif new file mode 100644 index 0000000000..dae3e4de6a Binary files /dev/null and b/phpBB/templates/subSilver/images/topic_unlock.gif differ diff --git a/phpBB/styles/subsilver2/imageset/poll_left.gif b/phpBB/templates/subSilver/images/vote_lcap.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/poll_left.gif rename to phpBB/templates/subSilver/images/vote_lcap.gif diff --git a/phpBB/styles/subsilver2/imageset/poll_right.gif b/phpBB/templates/subSilver/images/vote_rcap.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/poll_right.gif rename to phpBB/templates/subSilver/images/vote_rcap.gif diff --git a/phpBB/styles/subsilver2/imageset/poll_center.gif b/phpBB/templates/subSilver/images/voting_bar.gif similarity index 100% rename from phpBB/styles/subsilver2/imageset/poll_center.gif rename to phpBB/templates/subSilver/images/voting_bar.gif diff --git a/phpBB/styles/subsilver2/theme/images/whosonline.gif b/phpBB/templates/subSilver/images/whosonline.gif similarity index 100% rename from phpBB/styles/subsilver2/theme/images/whosonline.gif rename to phpBB/templates/subSilver/images/whosonline.gif diff --git a/phpBB/styles/subsilver2/template/index.htm b/phpBB/templates/subSilver/index.htm similarity index 84% rename from phpBB/styles/subsilver2/template/index.htm rename to phpBB/templates/subSilver/index.htm index 4763c05f0e..79908c5993 100644 --- a/phpBB/styles/subsilver2/template/index.htm +++ b/phpBB/templates/subSilver/index.htm @@ -8,7 +8,7 @@ - +
      Created by subBlue DesignCreated by subBlue Design
      diff --git a/phpBB/templates/subSilver/index_body.tpl b/phpBB/templates/subSilver/index_body.tpl new file mode 100644 index 0000000000..a6624b760c --- /dev/null +++ b/phpBB/templates/subSilver/index_body.tpl @@ -0,0 +1,109 @@ + + + + + +
      + + {LAST_VISIT_DATE}
      + + {CURRENT_TIME}
      {L_INDEX}
      + + {L_SEARCH_NEW}
      {L_SEARCH_SELF}
      + + {L_SEARCH_UNANSWERED}
      + + + + + + + + + + + + + + + + + + + + + + + +
       {L_FORUM}  {L_TOPICS}  {L_POSTS}  {L_LASTPOST} 
      {catrow.CAT_DESC} 
      {catrow.forumrow.L_FORUM_FOLDER_ALT} {catrow.forumrow.FORUM_NAME}
      +
      {catrow.forumrow.FORUM_DESC}
      +
      {catrow.forumrow.L_MODERATOR} {catrow.forumrow.MODERATORS}
      {catrow.forumrow.TOPICS}{catrow.forumrow.POSTS} {catrow.forumrow.LAST_POST}
      + + + + + + +
      + + {L_MARK_FORUMS_READ} + + {S_TIMEZONE}
      + + + + + + + + + + + + +
      {L_WHO_IS_ONLINE}
      {L_WHO_IS_ONLINE}{TOTAL_POSTS}
      {TOTAL_USERS}
      {NEWEST_USER}
      +
      {TOTAL_USERS_ONLINE}   [ {L_WHOSONLINE_ADMIN} ]   [ {L_WHOSONLINE_MOD} ]
      {RECORD_USERS}
      {LOGGED_IN_USER_LIST}
      + + + + + +
      {L_ONLINE_EXPLAIN}
      + + +
      + + + + + + + +
      {L_LOGIN_LOGOUT}
      {L_USERNAME}: + +    {L_PASSWORD}: + + +      {L_AUTO_LOGIN} + + +     + +
      +
      + + +
      + + + + + + + + + + + + +
      {L_NEW_POSTS}{L_NEW_POSTS}  {L_NO_NEW_POSTS}{L_NO_NEW_POSTS}  {L_FORUM_LOCKED}{L_FORUM_LOCKED}
      diff --git a/phpBB/templates/subSilver/jumpbox.tpl b/phpBB/templates/subSilver/jumpbox.tpl new file mode 100644 index 0000000000..2000e92056 --- /dev/null +++ b/phpBB/templates/subSilver/jumpbox.tpl @@ -0,0 +1,6 @@ + +
      + + + +
      {L_JUMP_TO}: {S_JUMPBOX_SELECT} 
      diff --git a/phpBB/templates/subSilver/login_body.tpl b/phpBB/templates/subSilver/login_body.tpl new file mode 100644 index 0000000000..6806cd6d6a --- /dev/null +++ b/phpBB/templates/subSilver/login_body.tpl @@ -0,0 +1,46 @@ + +
      + + + + + +
      + + + + + + + + +
      {L_ENTER_PASSWORD}
      + + + + + + + + + + + + + + + + + + + + + + +
       
      {L_USERNAME}: + +
      {L_PASSWORD}: + +
      {L_AUTO_LOGIN}:
      {S_HIDDEN_FIELDS}
      {L_SEND_PASSWORD}
      + +
      diff --git a/phpBB/templates/subSilver/memberlist_body.tpl b/phpBB/templates/subSilver/memberlist_body.tpl new file mode 100644 index 0000000000..af1340d8cd --- /dev/null +++ b/phpBB/templates/subSilver/memberlist_body.tpl @@ -0,0 +1,55 @@ + +
      + + + + + +
      {L_INDEX}{L_SELECT_SORT_METHOD}: {S_MODE_SELECT}  {L_ORDER} {S_ORDER_SELECT}   + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + +
      # {L_USERNAME}{L_EMAIL}{L_FROM}{L_JOINED}{L_POSTS}{L_WEBSITE}
       {memberrow.ROW_NUMBER}  {memberrow.PM_IMG} {memberrow.USERNAME} {memberrow.EMAIL_IMG} {memberrow.FROM}{memberrow.JOINED}{memberrow.POSTS} {memberrow.WWW_IMG} 
       
      + + + + +
      + + + + + + +
      {PAGE_NUMBER}{S_TIMEZONE}
      {PAGINATION}
      + + + + + +
      {JUMPBOX}
      diff --git a/phpBB/templates/subSilver/message_body.tpl b/phpBB/templates/subSilver/message_body.tpl new file mode 100644 index 0000000000..6be7f51331 --- /dev/null +++ b/phpBB/templates/subSilver/message_body.tpl @@ -0,0 +1,27 @@ + + + + + +
      + + + + + + + + +
      {MESSAGE_TITLE}
      + + + + + + + + + +
       
      {MESSAGE_TEXT}
       
      + +
      diff --git a/phpBB/templates/subSilver/modcp_body.tpl b/phpBB/templates/subSilver/modcp_body.tpl new file mode 100644 index 0000000000..fd0fe1b5b6 --- /dev/null +++ b/phpBB/templates/subSilver/modcp_body.tpl @@ -0,0 +1,58 @@ + +
      + + + + +
      {L_INDEX} -> {FORUM_NAME}
      + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_MOD_CP} +
      {L_MOD_CP_EXPLAIN}
        {L_TOPICS}  {L_REPLIES}  {L_LASTPOST}  {L_SELECT} 
      {topicrow.L_TOPIC_FOLDER_ALT} {topicrow.TOPIC_TYPE}{topicrow.TOPIC_TITLE}{topicrow.REPLIES}{topicrow.LAST_POST_TIME} + +
      {S_HIDDEN_FIELDS} + +   + +   + +   + +
      + + + + + +
      {PAGE_NUMBER}{S_TIMEZONE}
      {PAGINATION}
      +
      + + + + +
      {JUMPBOX}
      diff --git a/phpBB/templates/subSilver/modcp_move.tpl b/phpBB/templates/subSilver/modcp_move.tpl new file mode 100644 index 0000000000..730952cd62 --- /dev/null +++ b/phpBB/templates/subSilver/modcp_move.tpl @@ -0,0 +1,37 @@ + +
      + + + + +
      + + + + + + + +
      {MESSAGE_TITLE}
      + + + + + + + + + + +
       
      {L_MOVE_TO_FORUM}   {S_FORUM_SELECT}

      + {L_LEAVESHADOW}
      +
      + {MESSAGE_TEXT}

      +
      + {S_HIDDEN_FIELDS} + +    + +
       
      +
      +
      diff --git a/phpBB/templates/subSilver/modcp_split.tpl b/phpBB/templates/subSilver/modcp_split.tpl new file mode 100644 index 0000000000..c8be76af56 --- /dev/null +++ b/phpBB/templates/subSilver/modcp_split.tpl @@ -0,0 +1,85 @@ + +
      + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_SPLIT_TOPIC}
      {L_SPLIT_TOPIC_EXPLAIN}
      {L_SPLIT_SUBJECT}
      {L_SPLIT_FORUM}{S_FORUM_SELECT}
      + + + + + +
      + + + +
      +
      {L_AUTHOR}{L_MESSAGE}{L_SELECT}
      {postrow.POSTER_NAME} + + + + + + + +
      {L_POST}{L_POSTED}: + {postrow.POST_DATE}    {L_POST_SUBJECT}: {postrow.POST_SUBJECT}
      +
      + {postrow.MESSAGE}
      +
      {postrow.S_SPLIT_CHECKBOX}
      .
      + + + + + +
      + + + + {S_HIDDEN_FIELDS}
      +
      + + + + +
      {S_TIMEZONE}
      +
      diff --git a/phpBB/templates/subSilver/modcp_viewip.tpl b/phpBB/templates/subSilver/modcp_viewip.tpl new file mode 100644 index 0000000000..d497d88f5d --- /dev/null +++ b/phpBB/templates/subSilver/modcp_viewip.tpl @@ -0,0 +1,58 @@ + + + + + +
      {L_INDEX}
      + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_IP_INFO}
      {L_THIS_POST_IP}
      + + + + + +
       {IP} [ {POSTS} ][ {L_LOOKUP_IP} + ] 
      +
      {L_OTHER_USERS}
      + + + + + +
       {userrow.USERNAME} [ {userrow.POSTS} ]{L_SEARCH} +  
      +
      {L_OTHER_IPS}
      + + + + +
       {iprow.IP} [ {iprow.POSTS} ][ {L_LOOKUP_IP} + ] 
      + +
      diff --git a/phpBB/templates/subSilver/overall_footer.tpl b/phpBB/templates/subSilver/overall_footer.tpl new file mode 100644 index 0000000000..0e2a66bbf5 --- /dev/null +++ b/phpBB/templates/subSilver/overall_footer.tpl @@ -0,0 +1,19 @@ + +

      {ADMIN_LINK}
      + +Powered by phpBB © 2001, 2005 phpBB Group
      {TRANSLATION_INFO}
      +
      + + + diff --git a/phpBB/templates/subSilver/overall_header.tpl b/phpBB/templates/subSilver/overall_header.tpl new file mode 100644 index 0000000000..e5042313b7 --- /dev/null +++ b/phpBB/templates/subSilver/overall_header.tpl @@ -0,0 +1,248 @@ + + + + + +{META} +{NAV_LINKS} +{SITENAME} :: {PAGE_TITLE} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/phpBB/templates/subSilver/posting_preview.tpl b/phpBB/templates/subSilver/posting_preview.tpl new file mode 100644 index 0000000000..8da3409dcd --- /dev/null +++ b/phpBB/templates/subSilver/posting_preview.tpl @@ -0,0 +1,23 @@ + +
      + + + + +
      {L_INDEX}{SITENAME}
      {SITE_DESCRIPTION}
       
      + + + + + + + +
       {L_FAQ}{L_FAQ}   {L_SEARCH}{L_SEARCH}   {L_MEMBERLIST}{L_MEMBERLIST}   {L_USERGROUPS}{L_USERGROUPS}  + +  {L_REGISTER}{L_REGISTER}  + +
       {L_PROFILE}{L_PROFILE}   {PRIVATE_MESSAGE_INFO}{PRIVATE_MESSAGE_INFO}   {L_LOGIN_LOGOUT}{L_LOGIN_LOGOUT} 
      + +
      diff --git a/phpBB/templates/subSilver/posting_body.tpl b/phpBB/templates/subSilver/posting_body.tpl new file mode 100644 index 0000000000..a85da8f3e9 --- /dev/null +++ b/phpBB/templates/subSilver/posting_body.tpl @@ -0,0 +1,482 @@ + + + + + + + +
      + + + + + + + + + + + +
      {INBOX_IMG}{INBOX_LINK}  {SENTBOX_IMG}{SENTBOX_LINK}  {OUTBOX_IMG}{OUTBOX_LINK}  {SAVEBOX_IMG}{SAVEBOX_LINK}  
      +
      + +
      + + +
      + +{POST_PREVIEW_BOX} +{ERROR_BOX} + + + + + + +
      {L_INDEX} + + -> {FORUM_NAME}
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {POLLBOX} + + + +
      {L_POST_A}
      {L_USERNAME}
      {L_USERNAME} 
      {L_SUBJECT} + +
      + + + + + + + +
      {L_MESSAGE_BODY}

      + + + + + + + + + + + + + + + + +
      {L_EMOTICONS}
      {smilies_row.smilies_col.SMILEY_DESC}
      {L_MORE_SMILIES}
      +
      +
      + + + + + + + + + + + + + + + + + + + + + +
      + + + + + + + + + + + + + + + + + +
      + + + + + +
       {L_FONT_COLOR}: +  {L_FONT_SIZE}: + {L_BBCODE_CLOSE_TAGS}
      +
      + +
      + +
      +
      {L_OPTIONS}
      {HTML_STATUS}
      {BBCODE_STATUS}
      {SMILIES_STATUS}
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      + + {L_DISABLE_HTML}
      + + {L_DISABLE_BBCODE}
      + + {L_DISABLE_SMILIES}
      + + {L_ATTACH_SIGNATURE}
      + + {L_NOTIFY_ON_REPLY}
      + + {L_DELETE_POST}
      {S_TYPE_TOGGLE}
      +
      {S_HIDDEN_FORM_FIELDS} 
      + + + + + +
      {S_TIMEZONE}
      +
      + + + + + +
      {JUMPBOX}
      + +{TOPIC_REVIEW_BOX} diff --git a/phpBB/templates/subSilver/posting_poll_body.tpl b/phpBB/templates/subSilver/posting_poll_body.tpl new file mode 100644 index 0000000000..4391393208 --- /dev/null +++ b/phpBB/templates/subSilver/posting_poll_body.tpl @@ -0,0 +1,31 @@ + +
      {L_ADD_A_POLL}
      {L_ADD_POLL_EXPLAIN}
      {L_POLL_QUESTION}
      {L_POLL_OPTION}  
      {L_POLL_OPTION}  
      {L_POLL_LENGTH} {L_DAYS}   {L_POLL_LENGTH_EXPLAIN}
      {L_POLL_DELETE}
      + + + + + + + + + + + + +
      {L_PREVIEW}
      {L_POST}{L_POSTED}: {POST_DATE}     {L_POST_SUBJECT}: {POST_SUBJECT}
      + + + +
      + {MESSAGE} +
      + +
      diff --git a/phpBB/templates/subSilver/posting_smilies.tpl b/phpBB/templates/subSilver/posting_smilies.tpl new file mode 100644 index 0000000000..7028535c49 --- /dev/null +++ b/phpBB/templates/subSilver/posting_smilies.tpl @@ -0,0 +1,45 @@ + + + + + + + +
      + + + + + + + + + +
      {L_EMOTICONS}
      + + + + + + + + + + + + +
      {smilies_row.smilies_col.SMILEY_DESC}
      {L_MORE_SMILIES}

      {L_CLOSE_WINDOW}
      diff --git a/phpBB/templates/subSilver/posting_topic_review.tpl b/phpBB/templates/subSilver/posting_topic_review.tpl new file mode 100644 index 0000000000..7b8960c0fa --- /dev/null +++ b/phpBB/templates/subSilver/posting_topic_review.tpl @@ -0,0 +1,39 @@ + + + + + + + + + +
      {L_TOPIC_REVIEW}
      + diff --git a/phpBB/templates/subSilver/privmsgs_body.tpl b/phpBB/templates/subSilver/privmsgs_body.tpl new file mode 100644 index 0000000000..3c221c5e74 --- /dev/null +++ b/phpBB/templates/subSilver/privmsgs_body.tpl @@ -0,0 +1,120 @@ + + + + + + + + +
      + + + + + + + + + + + +
      {INBOX_IMG}{INBOX}  {SENTBOX_IMG}{SENTBOX}  {OUTBOX_IMG}{OUTBOX}  {SAVEBOX_IMG}{SAVEBOX}  
      +
      + + + + + + + + + + + + + +
      {BOX_SIZE_STATUS}
      + + + + +
      {INBOX_LIMIT_PERCENT}
      +
      0%50%100%
      + +
      + +
      + +
      + + + + + + +
      {POST_PM_IMG} {L_INDEX}{L_DISPLAY_MESSAGES}: + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + +
       {L_FLAG}  {L_SUBJECT}  {L_FROM_OR_TO}  {L_DATE}  {L_MARK} 
      {listrow.L_PRIVMSG_FOLDER_ALT} {listrow.SUBJECT} {listrow.FROM}{listrow.DATE} + +
      {L_NO_MESSAGES}
      {S_HIDDEN_FIELDS} + +   + +   + +
      + + + + + + + +
      {POST_PM_IMG}{PAGE_NUMBER}{L_MARK_ALL} :: {L_UNMARK_ALL}
      {PAGINATION}
      {S_TIMEZONE}
      +
      + + + + + +
      {JUMPBOX}
      diff --git a/phpBB/templates/subSilver/privmsgs_popup.tpl b/phpBB/templates/subSilver/privmsgs_popup.tpl new file mode 100644 index 0000000000..e48205b338 --- /dev/null +++ b/phpBB/templates/subSilver/privmsgs_popup.tpl @@ -0,0 +1,22 @@ + + + + + + + +
      + + + + +

      {L_MESSAGE}

      {L_CLOSE_WINDOW}

      +
      diff --git a/phpBB/templates/subSilver/privmsgs_preview.tpl b/phpBB/templates/subSilver/privmsgs_preview.tpl new file mode 100644 index 0000000000..ba2ed932fd --- /dev/null +++ b/phpBB/templates/subSilver/privmsgs_preview.tpl @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_PREVIEW}
      {L_FROM}:{MESSAGE_FROM}
      {L_TO}:{MESSAGE_TO}
      {L_POSTED}:{POST_DATE}
      {L_SUBJECT}:{POST_SUBJECT}
      {MESSAGE}
      + +
      diff --git a/phpBB/templates/subSilver/privmsgs_read_body.tpl b/phpBB/templates/subSilver/privmsgs_read_body.tpl new file mode 100644 index 0000000000..3c85e6a125 --- /dev/null +++ b/phpBB/templates/subSilver/privmsgs_read_body.tpl @@ -0,0 +1,86 @@ + + + + + + + + + + + + +
      {INBOX_IMG}{INBOX}  {SENTBOX_IMG}{SENTBOX}  {OUTBOX_IMG}{OUTBOX}  {SAVEBOX_IMG}{SAVEBOX}
      + +
      + +
      + + + + + +
      {REPLY_PM_IMG} {L_INDEX}
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {BOX_NAME} :: {L_MESSAGE}
      {L_FROM}:{MESSAGE_FROM}
      {L_TO}:{MESSAGE_TO}
      {L_POSTED}:{POST_DATE}
      {L_SUBJECT}:{POST_SUBJECT} {QUOTE_PM_IMG} {EDIT_PM_IMG}
      {MESSAGE}
      + + + + +
      {PROFILE_IMG} {PM_IMG} {EMAIL_IMG} + {WWW_IMG} {AIM_IMG} {YIM_IMG} {MSN_IMG} 
      +
      {S_HIDDEN_FIELDS} + +   + +
      + + + + + +
      {REPLY_PM_IMG}{S_TIMEZONE}
      +
      + + + + + +
      {JUMPBOX}
      diff --git a/phpBB/templates/subSilver/profile_add_body.tpl b/phpBB/templates/subSilver/profile_add_body.tpl new file mode 100644 index 0000000000..a9d1f62a7d --- /dev/null +++ b/phpBB/templates/subSilver/profile_add_body.tpl @@ -0,0 +1,274 @@ + +
      + +{ERROR_BOX} + + + + + +
      {L_INDEX}
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_REGISTRATION_INFO}
      {L_ITEMS_REQUIRED}
      {L_USERNAME}: *{USERNAME}
      {L_USERNAME}: *
      {L_EMAIL_ADDRESS}: *
      {L_CURRENT_PASSWORD}: *
      + {L_CONFIRM_PASSWORD_EXPLAIN}
      + +
      {L_NEW_PASSWORD}: *
      + {L_PASSWORD_IF_CHANGED}
      + +
      {L_CONFIRM_PASSWORD}: *
      + {L_PASSWORD_CONFIRM_IF_CHANGED}
      + +
      {L_CONFIRM_CODE_IMPAIRED}

      {CONFIRM_IMG}

      {L_CONFIRM_CODE}: *
      {L_CONFIRM_CODE_EXPLAIN}
       
      {L_PROFILE_INFO}
      {L_PROFILE_INFO_NOTICE}
      {L_ICQ_NUMBER}: + +
      {L_AIM}: + +
      {L_MESSENGER}: + +
      {L_YAHOO}: + +
      {L_WEBSITE}: + +
      {L_LOCATION}: + +
      {L_OCCUPATION}: + +
      {L_INTERESTS}: + +
      {L_SIGNATURE}:
      {L_SIGNATURE_EXPLAIN}

      {HTML_STATUS}
      {BBCODE_STATUS}
      {SMILIES_STATUS}
      + +
       
      {L_PREFERENCES}
      {L_PUBLIC_VIEW_EMAIL}: + + {L_YES}   + + {L_NO}
      {L_HIDE_USER}: + + {L_YES}   + + {L_NO}
      {L_NOTIFY_ON_REPLY}:
      + {L_NOTIFY_ON_REPLY_EXPLAIN}
      + + {L_YES}   + + {L_NO}
      {L_NOTIFY_ON_PRIVMSG}: + + {L_YES}   + + {L_NO}
      {L_POPUP_ON_PRIVMSG}:
      {L_POPUP_ON_PRIVMSG_EXPLAIN}
      + + {L_YES}   + + {L_NO}
      {L_ALWAYS_ADD_SIGNATURE}: + + {L_YES}   + + {L_NO}
      {L_ALWAYS_ALLOW_BBCODE}: + + {L_YES}   + + {L_NO}
      {L_ALWAYS_ALLOW_HTML}: + + {L_YES}   + + {L_NO}
      {L_ALWAYS_ALLOW_SMILIES}: + + {L_YES}   + + {L_NO}
      {L_BOARD_LANGUAGE}:{LANGUAGE_SELECT}
      {L_BOARD_STYLE}:{STYLE_SELECT}
      {L_TIMEZONE}:{TIMEZONE_SELECT}
      {L_DATE_FORMAT}:
      + {L_DATE_FORMAT_EXPLAIN}
      + +
       
      {L_AVATAR_PANEL}
      + + + + +
      {L_AVATAR_EXPLAIN}{L_CURRENT_IMAGE}
      {AVATAR}
       {L_DELETE_AVATAR}
      {L_UPLOAD_AVATAR_FILE}:
      {L_UPLOAD_AVATAR_URL}:
      {L_UPLOAD_AVATAR_URL_EXPLAIN}
      {L_LINK_REMOTE_AVATAR}:
      {L_LINK_REMOTE_AVATAR_EXPLAIN}
      {L_AVATAR_GALLERY}:
      {S_HIDDEN_FIELDS}  
      + +
      diff --git a/phpBB/templates/subSilver/profile_avatar_gallery.tpl b/phpBB/templates/subSilver/profile_avatar_gallery.tpl new file mode 100644 index 0000000000..9be5375671 --- /dev/null +++ b/phpBB/templates/subSilver/profile_avatar_gallery.tpl @@ -0,0 +1,37 @@ + +
      + + + + +
      {L_INDEX}
      + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_AVATAR_GALLERY}
      {L_CATEGORY}: {S_CATEGORY_SELECT} 
      {avatar_row.avatar_column.AVATAR_NAME}
      {S_HIDDEN_FIELDS} + +    + +
      +
      diff --git a/phpBB/templates/subSilver/profile_send_email.tpl b/phpBB/templates/subSilver/profile_send_email.tpl new file mode 100644 index 0000000000..86c28cb4dd --- /dev/null +++ b/phpBB/templates/subSilver/profile_send_email.tpl @@ -0,0 +1,74 @@ + + + +
      + +{ERROR_BOX} + + + + + +
      {L_INDEX}
      + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_SEND_EMAIL_MSG}
      {L_RECIPIENT}{USERNAME}
      {L_SUBJECT}
      {L_MESSAGE_BODY}
      {L_MESSAGE_BODY_DESC}
      {L_OPTIONS} + + + + +
      {L_CC_EMAIL}
      {S_HIDDEN_FIELDS}
      + + + + + +
      {S_TIMEZONE}
      + + + + + +
      {JUMPBOX}
      diff --git a/phpBB/templates/subSilver/profile_send_pass.tpl b/phpBB/templates/subSilver/profile_send_pass.tpl new file mode 100644 index 0000000000..8d31aa4ebb --- /dev/null +++ b/phpBB/templates/subSilver/profile_send_pass.tpl @@ -0,0 +1,35 @@ + +
      + + + + +
      {L_INDEX}
      + + + + + + + + + + + + + + + + + + +
      {L_SEND_PASSWORD}
      {L_ITEMS_REQUIRED}
      {L_USERNAME}: * + +
      {L_EMAIL_ADDRESS}: * + +
      {S_HIDDEN_FIELDS} + +    + +
      +
      diff --git a/phpBB/templates/subSilver/profile_view_body.tpl b/phpBB/templates/subSilver/profile_view_body.tpl new file mode 100644 index 0000000000..a9c3c6fe8a --- /dev/null +++ b/phpBB/templates/subSilver/profile_view_body.tpl @@ -0,0 +1,91 @@ + + + + + +
      {L_INDEX}
      + + + + + + + + + + + + + + + + + + + +
      {L_VIEWING_PROFILE}
      {L_AVATAR}{L_ABOUT_USER}
      {AVATAR_IMG}
      {POSTER_RANK}
      + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_JOINED}: {JOINED}
      {L_TOTAL_POSTS}: {POSTS}
      [{POST_PERCENT_STATS} / {POST_DAY_STATS}]
      {L_SEARCH_USER_POSTS}
      {L_LOCATION}: {LOCATION}
      {L_WEBSITE}: {WWW}
      {L_OCCUPATION}: {OCCUPATION}
      {L_INTERESTS}: {INTERESTS}
      +
      {L_CONTACT} {USERNAME}
      + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_EMAIL_ADDRESS}:{EMAIL_IMG}
      {L_PM}:{PM_IMG}
      {L_MESSENGER}:{MSN}
      {L_YAHOO}:{YIM_IMG}
      {L_AIM}:{AIM_IMG}
      {L_ICQ_NUMBER}:
      +
      + + + + + +

      {JUMPBOX}
      diff --git a/phpBB/templates/subSilver/search_body.tpl b/phpBB/templates/subSilver/search_body.tpl new file mode 100644 index 0000000000..23887b933d --- /dev/null +++ b/phpBB/templates/subSilver/search_body.tpl @@ -0,0 +1,57 @@ + +
      + + + +
      {L_INDEX}
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_SEARCH_QUERY}
      {L_SEARCH_KEYWORDS}:
      {L_SEARCH_KEYWORDS_EXPLAIN}

      {L_SEARCH_ANY_TERMS}
      {L_SEARCH_ALL_TERMS}
      {L_SEARCH_AUTHOR}:
      {L_SEARCH_AUTHOR_EXPLAIN}
      {L_SEARCH_OPTIONS}
      {L_FORUM}: {L_SEARCH_PREVIOUS}: 
      {L_SEARCH_MESSAGE_TITLE}
      {L_SEARCH_MESSAGE_ONLY}
      {L_CATEGORY}: {L_SORT_BY}: 
      {L_SORT_ASCENDING}
      {L_SORT_DESCENDING}
       
      {L_DISPLAY_RESULTS}: {L_POSTS}{L_TOPICS}{L_RETURN_FIRST} {L_CHARACTERS}
      {S_HIDDEN_FIELDS}
      + + + + + +
      {S_TIMEZONE}
      + + + + + +
      {JUMPBOX}
      diff --git a/phpBB/templates/subSilver/search_results_posts.tpl b/phpBB/templates/subSilver/search_results_posts.tpl new file mode 100644 index 0000000000..15187c38b1 --- /dev/null +++ b/phpBB/templates/subSilver/search_results_posts.tpl @@ -0,0 +1,51 @@ + + + + + +
      {L_SEARCH_MATCHES}
      + + + + + +
      {L_INDEX}
      + + + + + + + + + + + + + + + + + + + + + +
      {L_AUTHOR}{L_MESSAGE}
        {L_TOPIC}: {searchresults.TOPIC_TITLE}
      {searchresults.POSTER_NAME}
      +
      + {L_REPLIES}: {searchresults.TOPIC_REPLIES}
      + {L_VIEWS}: {searchresults.TOPIC_VIEWS}

      +
      {searchresults.L_MINI_POST_ALT}{L_FORUM}: {searchresults.FORUM_NAME}   {L_POSTED}: {searchresults.POST_DATE}   {L_SUBJECT}: {searchresults.POST_SUBJECT}
      {searchresults.MESSAGE}
       
      + + + + + + +
      {PAGE_NUMBER}{PAGINATION}
      {S_TIMEZONE}
      + + + + + +
      {JUMPBOX}
      diff --git a/phpBB/templates/subSilver/search_results_topics.tpl b/phpBB/templates/subSilver/search_results_topics.tpl new file mode 100644 index 0000000000..d628e01f53 --- /dev/null +++ b/phpBB/templates/subSilver/search_results_topics.tpl @@ -0,0 +1,51 @@ + + + + + +
      {L_SEARCH_MATCHES}
      + + + + + +
      {L_INDEX}
      + + + + + + + + + + + + + + + + + + + + + + + + + +
        {L_FORUM}  {L_TOPICS}  {L_AUTHOR}  {L_REPLIES}  {L_VIEWS}  {L_LASTPOST} 
      {searchresults.L_TOPIC_FOLDER_ALT}{searchresults.FORUM_NAME}{searchresults.NEWEST_POST_IMG}{searchresults.TOPIC_TYPE}{searchresults.TOPIC_TITLE}
      {searchresults.GOTO_PAGE}
      {searchresults.TOPIC_AUTHOR}{searchresults.REPLIES}{searchresults.VIEWS}{searchresults.LAST_POST_TIME}
      {searchresults.LAST_POST_AUTHOR} {searchresults.LAST_POST_IMG}
       
      + + + + + + +
      {PAGE_NUMBER}{PAGINATION}
      {S_TIMEZONE}
      + + + + + +
      {JUMPBOX}
      diff --git a/phpBB/templates/subSilver/search_username.tpl b/phpBB/templates/subSilver/search_username.tpl new file mode 100644 index 0000000000..611ec3fc12 --- /dev/null +++ b/phpBB/templates/subSilver/search_username.tpl @@ -0,0 +1,30 @@ + + + +
      + + + + +
      + + + + + + +
      {L_SEARCH_USERNAME}

       

      {L_SEARCH_EXPLAIN}
      + + {L_UPDATE_USERNAME}
       

      + +
      {L_CLOSE_WINDOW}
      +
      diff --git a/phpBB/templates/subSilver/simple_footer.tpl b/phpBB/templates/subSilver/simple_footer.tpl new file mode 100644 index 0000000000..92d54d45bf --- /dev/null +++ b/phpBB/templates/subSilver/simple_footer.tpl @@ -0,0 +1,19 @@ + +

      + +Powered by phpBB © 2001, 2005 phpBB Group
      +
    • + + + diff --git a/phpBB/templates/subSilver/simple_header.tpl b/phpBB/templates/subSilver/simple_header.tpl new file mode 100644 index 0000000000..705cb67f4d --- /dev/null +++ b/phpBB/templates/subSilver/simple_header.tpl @@ -0,0 +1,237 @@ + + + + + + + + +{META} +{SITENAME} :: {PAGE_TITLE} + + + + + + diff --git a/phpBB/templates/subSilver/subSilver.cfg b/phpBB/templates/subSilver/subSilver.cfg new file mode 100644 index 0000000000..43ed68a7f7 --- /dev/null +++ b/phpBB/templates/subSilver/subSilver.cfg @@ -0,0 +1,101 @@ + \ No newline at end of file diff --git a/phpBB/templates/subSilver/subSilver.css b/phpBB/templates/subSilver/subSilver.css new file mode 100644 index 0000000000..ba58268159 --- /dev/null +++ b/phpBB/templates/subSilver/subSilver.css @@ -0,0 +1,210 @@ +/* + The original subSilver Theme for phpBB version 2+ + Created by subBlue design + http://www.subBlue.com +*/ + + + /* General page style. The scroll bar colours only visible in IE5.5+ */ +body { + background-color: #E5E5E5; + scrollbar-face-color: #DEE3E7; + scrollbar-highlight-color: #FFFFFF; + scrollbar-shadow-color: #DEE3E7; + scrollbar-3dlight-color: #D1D7DC; + scrollbar-arrow-color: #006699; + scrollbar-track-color: #EFEFEF; + scrollbar-darkshadow-color: #98AAB1; +} + +/* General font families for common tags */ +font,th,td,p { font-family: Verdana, Arial, Helvetica, sans-serif } +a:link,a:active,a:visited { color : #006699; } +a:hover { text-decoration: underline; color : #DD6900; } +hr { height: 0px; border: solid #D1D7DC 0px; border-top-width: 1px;} + + +/* This is the border line & background colour round the entire page */ +.bodyline { background-color: #FFFFFF; border: 1px #98AAB1 solid; } + +/* This is the outline round the main forum tables */ +.forumline { background-color: #FFFFFF; border: 2px #006699 solid; } + + +/* Main table cell colours and backgrounds */ +td.row1 { background-color: #EFEFEF; } +td.row2 { background-color: #DEE3E7; } +td.row3 { background-color: #D1D7DC; } + + +/* + This is for the table cell above the Topics, Post & Last posts on the index.php page + By default this is the fading out gradiated silver background. + However, you could replace this with a bitmap specific for each forum +*/ +td.rowpic { + background-color: #FFFFFF; + background-image: url(images/cellpic2.jpg); + background-repeat: repeat-y; +} + +/* Header cells - the blue and silver gradient backgrounds */ +th { + color: #FFA34F; font-size: 11px; font-weight : bold; + background-color: #006699; height: 25px; + background-image: url(images/cellpic3.gif); +} + +td.cat,td.catHead,td.catSides,td.catLeft,td.catRight,td.catBottom { + background-image: url(images/cellpic1.gif); + background-color:#D1D7DC; border: #FFFFFF; border-style: solid; height: 28px; +} + + +/* + Setting additional nice inner borders for the main table cells. + The names indicate which sides the border will be on. + Don't worry if you don't understand this, just ignore it :-) +*/ +td.cat,td.catHead,td.catBottom { + height: 29px; + border-width: 0px 0px 0px 0px; +} +th.thHead,th.thSides,th.thTop,th.thLeft,th.thRight,th.thBottom,th.thCornerL,th.thCornerR { + font-weight: bold; border: #FFFFFF; border-style: solid; height: 28px; } +td.row3Right,td.spaceRow { + background-color: #D1D7DC; border: #FFFFFF; border-style: solid; } + +th.thHead,td.catHead { font-size: 12px; border-width: 1px 1px 0px 1px; } +th.thSides,td.catSides,td.spaceRow { border-width: 0px 1px 0px 1px; } +th.thRight,td.catRight,td.row3Right { border-width: 0px 1px 0px 0px; } +th.thLeft,td.catLeft { border-width: 0px 0px 0px 1px; } +th.thBottom,td.catBottom { border-width: 0px 1px 1px 1px; } +th.thTop { border-width: 1px 0px 0px 0px; } +th.thCornerL { border-width: 1px 0px 0px 1px; } +th.thCornerR { border-width: 1px 1px 0px 0px; } + + +/* The largest text used in the index page title and toptic title etc. */ +.maintitle,h1,h2 { + font-weight: bold; font-size: 22px; font-family: "Trebuchet MS",Verdana, Arial, Helvetica, sans-serif; + text-decoration: none; line-height : 120%; color : #000000; +} + + +/* General text */ +.gen { font-size : 12px; } +.genmed { font-size : 11px; } +.gensmall { font-size : 10px; } +.gen,.genmed,.gensmall { color : #000000; } +a.gen,a.genmed,a.gensmall { color: #006699; text-decoration: none; } +a.gen:hover,a.genmed:hover,a.gensmall:hover { color: #DD6900; text-decoration: underline; } + + +/* The register, login, search etc links at the top of the page */ +.mainmenu { font-size : 11px; color : #000000 } +a.mainmenu { text-decoration: none; color : #006699; } +a.mainmenu:hover{ text-decoration: underline; color : #DD6900; } + + +/* Forum category titles */ +.cattitle { font-weight: bold; font-size: 12px ; letter-spacing: 1px; color : #006699} +a.cattitle { text-decoration: none; color : #006699; } +a.cattitle:hover{ text-decoration: underline; } + + +/* Forum title: Text and link to the forums used in: index.php */ +.forumlink { font-weight: bold; font-size: 12px; color : #006699; } +a.forumlink { text-decoration: none; color : #006699; } +a.forumlink:hover{ text-decoration: underline; color : #DD6900; } + + +/* Used for the navigation text, (Page 1,2,3 etc) and the navigation bar when in a forum */ +.nav { font-weight: bold; font-size: 11px; color : #000000;} +a.nav { text-decoration: none; color : #006699; } +a.nav:hover { text-decoration: underline; } + + +/* titles for the topics: could specify viewed link colour too */ +.topictitle { font-weight: bold; font-size: 11px; color : #000000; } +a.topictitle:link { text-decoration: none; color : #006699; } +a.topictitle:visited { text-decoration: none; color : #5493B4; } +a.topictitle:hover { text-decoration: underline; color : #DD6900; } + + +/* Name of poster in viewmsg.php and viewtopic.php and other places */ +.name { font-size : 11px; color : #000000;} + +/* Location, number of posts, post date etc */ +.postdetails { font-size : 10px; color : #000000; } + + +/* The content of the posts (body of text) */ +.postbody { font-size : 12px;} +a.postlink:link { text-decoration: none; color : #006699 } +a.postlink:visited { text-decoration: none; color : #5493B4; } +a.postlink:hover { text-decoration: underline; color : #DD6900} + + +/* Quote & Code blocks */ +.code { + font-family: Courier, 'Courier New', sans-serif; font-size: 11px; color: #006600; + background-color: #FAFAFA; border: #D1D7DC; border-style: solid; + border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px +} + +.quote { + font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 11px; color: #444444; line-height: 125%; + background-color: #FAFAFA; border: #D1D7DC; border-style: solid; + border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px +} + + +/* Copyright and bottom info */ +.copyright { font-size: 10px; font-family: Verdana, Arial, Helvetica, sans-serif; color: #444444; letter-spacing: -1px;} +a.copyright { color: #444444; text-decoration: none;} +a.copyright:hover { color: #000000; text-decoration: underline;} + + +/* Form elements */ +input,textarea, select { + color : #000000; + font: normal 11px Verdana, Arial, Helvetica, sans-serif; + border-color : #000000; +} + +/* The text input fields background colour */ +input.post, textarea.post, select { + background-color : #FFFFFF; +} + +input { text-indent : 2px; } + +/* The buttons used for bbCode styling in message post */ +input.button { + background-color : #EFEFEF; + color : #000000; + font-size: 11px; font-family: Verdana, Arial, Helvetica, sans-serif; +} + +/* The main submit button option */ +input.mainoption { + background-color : #FAFAFA; + font-weight : bold; +} + +/* None-bold submit button */ +input.liteoption { + background-color : #FAFAFA; + font-weight : normal; +} + +/* This is the line in the posting page which shows the rollover + help line. This is actually a text box, but if set to be the same + colour as the background no one will know ;) +*/ +.helpline { background-color: #DEE3E7; border-style: none; } + + +/* Import the fancy styles for IE only (NS4.x doesn't use the @import function) */ +@import url("formIE.css"); diff --git a/phpBB/templates/subSilver/theme_info.cfg b/phpBB/templates/subSilver/theme_info.cfg new file mode 100644 index 0000000000..bd61eefa89 --- /dev/null +++ b/phpBB/templates/subSilver/theme_info.cfg @@ -0,0 +1,51 @@ + \ No newline at end of file diff --git a/phpBB/templates/subSilver/viewforum_body.tpl b/phpBB/templates/subSilver/viewforum_body.tpl new file mode 100644 index 0000000000..3c2a067d4c --- /dev/null +++ b/phpBB/templates/subSilver/viewforum_body.tpl @@ -0,0 +1,98 @@ + +
      + + + + + + + + + + +
      {FORUM_NAME}
      {L_MODERATOR}: {MODERATORS}

      {LOGGED_IN_USER_LIST}
      {PAGINATION}
      {L_POST_NEW_TOPIC}
      + + + + + + + + + + + + + + + + + + + + + + + + + + + +
       {L_TOPICS}  {L_REPLIES}  {L_AUTHOR}  {L_VIEWS}  {L_LASTPOST} 
      {topicrow.L_TOPIC_FOLDER_ALT}{topicrow.NEWEST_POST_IMG}{topicrow.TOPIC_TYPE}{topicrow.TOPIC_TITLE}
      + {topicrow.GOTO_PAGE}
      {topicrow.REPLIES}{topicrow.TOPIC_AUTHOR}{topicrow.VIEWS}{topicrow.LAST_POST_TIME}
      {topicrow.LAST_POST_AUTHOR} {topicrow.LAST_POST_IMG}
      {L_NO_TOPICS}
      {L_DISPLAY_TOPICS}: {S_SELECT_TOPIC_DAYS}  + +
      + + + + + + + + + + +
      {L_POST_NEW_TOPIC}   {L_INDEX} -> {FORUM_NAME}{S_TIMEZONE}
      {PAGINATION} +
      {PAGE_NUMBER}
      +
      + + + + + +
      {JUMPBOX}
      + + + + + + +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      {L_NEW_POSTS}{L_NEW_POSTS}  {L_NO_NEW_POSTS}{L_NO_NEW_POSTS}  {L_ANNOUNCEMENT}{L_ANNOUNCEMENT}
      {L_NEW_POSTS_HOT}{L_NEW_POSTS_HOT}  {L_NO_NEW_POSTS_HOT}{L_NO_NEW_POSTS_HOT}  {L_STICKY}{L_STICKY}
      {L_NEW_POSTS_LOCKED}{L_NEW_POSTS_LOCKED}  {L_NO_NEW_POSTS_LOCKED}{L_NO_NEW_POSTS_LOCKED}
      {S_AUTH_LIST}
      diff --git a/phpBB/templates/subSilver/viewonline_body.tpl b/phpBB/templates/subSilver/viewonline_body.tpl new file mode 100644 index 0000000000..e0813c0cbf --- /dev/null +++ b/phpBB/templates/subSilver/viewonline_body.tpl @@ -0,0 +1,53 @@ + + + + + +
      {L_INDEX}
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
       {L_USERNAME}  {L_LAST_UPDATE}  {L_FORUM_LOCATION} 
      {TOTAL_REGISTERED_USERS_ONLINE}
       {reg_user_row.USERNAME}  {reg_user_row.LASTUPDATE}  {reg_user_row.FORUM_LOCATION} 
      .
      {TOTAL_GUEST_USERS_ONLINE}
       {guest_user_row.USERNAME}  {guest_user_row.LASTUPDATE}  {guest_user_row.FORUM_LOCATION} 
      + + + + + + +
      {L_ONLINE_EXPLAIN}{S_TIMEZONE}
      + +
      + + + + + +
      {JUMPBOX}
      + diff --git a/phpBB/templates/subSilver/viewtopic_body.tpl b/phpBB/templates/subSilver/viewtopic_body.tpl new file mode 100644 index 0000000000..9fea16eace --- /dev/null +++ b/phpBB/templates/subSilver/viewtopic_body.tpl @@ -0,0 +1,91 @@ + + + + + +
      {TOPIC_TITLE}
      + {PAGINATION}
      +  
      + + + + + + +
      {L_POST_NEW_TOPIC}   {L_POST_REPLY_TOPIC}   {L_INDEX} + -> {FORUM_NAME}
      + + + + + + {POLL_DISPLAY} + + + + + + + + + + + + + + + + + + + + +
      {L_VIEW_PREVIOUS_TOPIC} :: {L_VIEW_NEXT_TOPIC}  
      {L_AUTHOR}{L_MESSAGE}
      {postrow.POSTER_NAME}
      {postrow.POSTER_RANK}
      {postrow.RANK_IMAGE}{postrow.POSTER_AVATAR}

      {postrow.POSTER_JOINED}
      {postrow.POSTER_POSTS}
      {postrow.POSTER_FROM}

      + + + + + + + + + + +
      {postrow.L_MINI_POST_ALT}{L_POSTED}: {postrow.POST_DATE}    {L_POST_SUBJECT}: {postrow.POST_SUBJECT}{postrow.QUOTE_IMG} {postrow.EDIT_IMG} {postrow.DELETE_IMG} {postrow.IP_IMG}

      {postrow.MESSAGE}{postrow.SIGNATURE}{postrow.EDITED_MESSAGE}
      {L_BACK_TO_TOP} + + + +
      {postrow.PROFILE_IMG} {postrow.PM_IMG} {postrow.EMAIL_IMG} {postrow.WWW_IMG} {postrow.AIM_IMG} {postrow.YIM_IMG} {postrow.MSN_IMG}
      + + + +
      {L_DISPLAY_POSTS}: {S_SELECT_POST_DAYS} {S_SELECT_POST_ORDER} 
      + + + + + + + + + + +
      {L_POST_NEW_TOPIC}   {L_POST_REPLY_TOPIC}   {L_INDEX} + -> {FORUM_NAME}{S_TIMEZONE}
      {PAGINATION} +
      {PAGE_NUMBER}
      + + + + + + +
      {S_WATCH_TOPIC}
      +  
      + {S_TOPIC_ADMIN}
      {JUMPBOX}{S_AUTH_LIST}
      diff --git a/phpBB/templates/subSilver/viewtopic_poll_ballot.tpl b/phpBB/templates/subSilver/viewtopic_poll_ballot.tpl new file mode 100644 index 0000000000..1e0cb21053 --- /dev/null +++ b/phpBB/templates/subSilver/viewtopic_poll_ballot.tpl @@ -0,0 +1,26 @@ + +
      + + + + + + + + + + + + + +
      {POLL_QUESTION}
      + + + + + + +
       {poll_option.POLL_OPTION_CAPTION}
      + +
      {L_VIEW_RESULTS}
      {S_HIDDEN_FIELDS}
      + \ No newline at end of file diff --git a/phpBB/templates/subSilver/viewtopic_poll_result.tpl b/phpBB/templates/subSilver/viewtopic_poll_result.tpl new file mode 100644 index 0000000000..45d11eaade --- /dev/null +++ b/phpBB/templates/subSilver/viewtopic_poll_result.tpl @@ -0,0 +1,36 @@ + + +
      + + + + + + + + + + +
      {POLL_QUESTION}
      + + + + + + + + + +
      {poll_option.POLL_OPTION_CAPTION} + + + + + + +
      {poll_option.POLL_OPTION_PERCENT}
      +
       {poll_option.POLL_OPTION_PERCENT} [ {poll_option.POLL_OPTION_RESULT} ]
      +
      {L_TOTAL_VOTES} : {TOTAL_VOTES}
      +
      + + diff --git a/phpBB/ucp.php b/phpBB/ucp.php deleted file mode 100755 index 1d182a713a..0000000000 --- a/phpBB/ucp.php +++ /dev/null @@ -1,338 +0,0 @@ -session_begin(); -$auth->acl($user->data); -$user->setup('ucp'); - -// Setting a variable to let the style designer know where he is... -$template->assign_var('S_IN_UCP', true); - -$module = new p_master(); - -// Basic "global" modes -switch ($mode) -{ - case 'activate': - $module->load('ucp', 'activate'); - $module->display($user->lang['UCP_ACTIVATE']); - - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); - break; - - case 'resend_act': - $module->load('ucp', 'resend'); - $module->display($user->lang['UCP_RESEND']); - break; - - case 'sendpassword': - $module->load('ucp', 'remind'); - $module->display($user->lang['UCP_REMIND']); - break; - - case 'register': - if ($user->data['is_registered'] || isset($_REQUEST['not_agreed'])) - { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); - } - - $module->load('ucp', 'register'); - $module->display($user->lang['REGISTER']); - break; - - case 'confirm': - $module->load('ucp', 'confirm'); - exit_handler(); - break; - - case 'login': - if ($user->data['is_registered']) - { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); - } - - login_box(request_var('redirect', "index.$phpEx")); - break; - - case 'logout': - if ($user->data['user_id'] != ANONYMOUS && isset($_GET['sid']) && !is_array($_GET['sid']) && $_GET['sid'] === $user->session_id) - { - $user->session_kill(); - $user->session_begin(); - $message = $user->lang['LOGOUT_REDIRECT']; - } - else - { - $message = ($user->data['user_id'] == ANONYMOUS) ? $user->lang['LOGOUT_REDIRECT'] : $user->lang['LOGOUT_FAILED']; - } - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); - - $message = $message . '

      ' . sprintf($user->lang['RETURN_INDEX'], '', ' '); - trigger_error($message); - - break; - - case 'terms': - case 'privacy': - - $message = ($mode == 'terms') ? 'TERMS_OF_USE_CONTENT' : 'PRIVACY_POLICY'; - $title = ($mode == 'terms') ? 'TERMS_USE' : 'PRIVACY'; - - if (empty($user->lang[$message])) - { - if ($user->data['is_registered']) - { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); - } - - login_box(); - } - - $template->set_filenames(array( - 'body' => 'ucp_agreement.html') - ); - - // Disable online list - page_header($user->lang[$title], false); - - $template->assign_vars(array( - 'S_AGREEMENT' => true, - 'AGREEMENT_TITLE' => $user->lang[$title], - 'AGREEMENT_TEXT' => sprintf($user->lang[$message], $config['sitename'], generate_board_url()), - 'U_BACK' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'), - 'L_BACK' => $user->lang['BACK_TO_LOGIN']) - ); - - page_footer(); - - break; - - case 'delete_cookies': - - // Delete Cookies with dynamic names (do NOT delete poll cookies) - if (confirm_box(true)) - { - $set_time = time() - 31536000; - - foreach ($_COOKIE as $cookie_name => $cookie_data) - { - $cookie_name = str_replace($config['cookie_name'] . '_', '', $cookie_name); - - // Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed, therefore checking for poll_ - if (strpos($cookie_name, 'poll_') !== 0) - { - $user->set_cookie($cookie_name, '', $set_time); - } - } - - $user->set_cookie('track', '', $set_time); - $user->set_cookie('u', '', $set_time); - $user->set_cookie('k', '', $set_time); - $user->set_cookie('sid', '', $set_time); - - // We destroy the session here, the user will be logged out nevertheless - $user->session_kill(); - $user->session_begin(); - - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); - - $message = $user->lang['COOKIES_DELETED'] . '

      ' . sprintf($user->lang['RETURN_INDEX'], '', ''); - trigger_error($message); - } - else - { - confirm_box(false, 'DELETE_COOKIES', ''); - } - - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); - - break; - - case 'switch_perm': - - $user_id = request_var('u', 0); - - $sql = 'SELECT * - FROM ' . USERS_TABLE . ' - WHERE user_id = ' . (int) $user_id; - $result = $db->sql_query($sql); - $user_row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$auth->acl_get('a_switchperm') || !$user_row || $user_id == $user->data['user_id']) - { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); - } - - include($phpbb_root_path . 'includes/acp/auth.' . $phpEx); - - $auth_admin = new auth_admin(); - if (!$auth_admin->ghost_permissions($user_id, $user->data['user_id'])) - { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); - } - - add_log('admin', 'LOG_ACL_TRANSFER_PERMISSIONS', $user_row['username']); - - $message = sprintf($user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '

      ' . sprintf($user->lang['RETURN_INDEX'], '', ''); - trigger_error($message); - - break; - - case 'restore_perm': - - if (!$user->data['user_perm_from'] || !$auth->acl_get('a_switchperm')) - { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); - } - - $auth->acl_cache($user->data); - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_perm_from = 0 - WHERE user_id = " . $user->data['user_id']; - $db->sql_query($sql); - - $sql = 'SELECT username - FROM ' . USERS_TABLE . ' - WHERE user_id = ' . $user->data['user_perm_from']; - $result = $db->sql_query($sql); - $username = $db->sql_fetchfield('username'); - $db->sql_freeresult($result); - - add_log('admin', 'LOG_ACL_RESTORE_PERMISSIONS', $username); - - $message = $user->lang['PERMISSIONS_RESTORED'] . '

      ' . sprintf($user->lang['RETURN_INDEX'], '', ''); - trigger_error($message); - - break; -} - -// Only registered users can go beyond this point -if (!$user->data['is_registered']) -{ - if ($user->data['is_bot']) - { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); - } - - login_box('', $user->lang['LOGIN_EXPLAIN_UCP']); -} - -// Instantiate module system and generate list of available modules -$module->list_modules('ucp'); - -// Check if the zebra module is set -if ($module->is_active('zebra', 'friends')) -{ - // Output listing of friends online - $update_time = $config['load_online_time'] * 60; - - $sql = $db->sql_build_query('SELECT_DISTINCT', array( - 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_colour, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline', - - 'FROM' => array( - USERS_TABLE => 'u', - ZEBRA_TABLE => 'z' - ), - - 'LEFT_JOIN' => array( - array( - 'FROM' => array(SESSIONS_TABLE => 's'), - 'ON' => 's.session_user_id = z.zebra_id' - ) - ), - - 'WHERE' => 'z.user_id = ' . $user->data['user_id'] . ' - AND z.friend = 1 - AND u.user_id = z.zebra_id', - - 'GROUP_BY' => 'z.zebra_id, u.user_id, u.username_clean, u.user_colour, u.username', - - 'ORDER_BY' => 'u.username_clean ASC', - )); - - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $which = (time() - $update_time < $row['online_time'] && ($row['viewonline'] || $auth->acl_get('u_viewonline'))) ? 'online' : 'offline'; - - $template->assign_block_vars("friends_{$which}", array( - 'USER_ID' => $row['user_id'], - - 'U_PROFILE' => get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']), - 'USER_COLOUR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']), - 'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']), - 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'])) - ); - } - $db->sql_freeresult($result); -} - -// Do not display subscribed topics/forums if not allowed -if (!$config['allow_topic_notify'] && !$config['allow_forum_notify']) -{ - $module->set_display('main', 'subscribed', false); -} - -// Select the active module -$module->set_active($id, $mode); - -// Load and execute the relevant module -$module->load_active(); - -// Assign data to the template engine for the list of modules -$module->assign_tpl_vars(append_sid("{$phpbb_root_path}ucp.$phpEx")); - -// Generate the page, do not display/query online list -$module->display($module->get_page_title(), false); - -/** -* Function for assigning a template var if the zebra module got included -*/ -function _module_zebra($mode, &$module_row) -{ - global $template; - - $template->assign_var('S_ZEBRA_ENABLED', true); - - if ($mode == 'friends') - { - $template->assign_var('S_ZEBRA_FRIENDS_ENABLED', true); - } - - if ($mode == 'foes') - { - $template->assign_var('S_ZEBRA_FOES_ENABLED', true); - } -} - -?> \ No newline at end of file diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index f41879da78..92d4f7f545 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -1,685 +1,696 @@ session_begin(); -$auth->acl($user->data); +$phpbb_root_path = './'; +include($phpbb_root_path . 'extension.inc'); +include($phpbb_root_path . 'common.'.$phpEx); +// // Start initial var setup -$forum_id = request_var('f', 0); -$mark_read = request_var('mark', ''); -$start = request_var('start', 0); - -$sort_days = request_var('st', ((!empty($user->data['user_topic_show_days'])) ? $user->data['user_topic_show_days'] : 0)); -$sort_key = request_var('sk', ((!empty($user->data['user_topic_sortby_type'])) ? $user->data['user_topic_sortby_type'] : 't')); -$sort_dir = request_var('sd', ((!empty($user->data['user_topic_sortby_dir'])) ? $user->data['user_topic_sortby_dir'] : 'd')); - -// Check if the user has actually sent a forum ID with his/her request -// If not give them a nice error page. -if (!$forum_id) +// +if ( isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL]) ) { - trigger_error('NO_FORUM'); + $forum_id = ( isset($HTTP_GET_VARS[POST_FORUM_URL]) ) ? intval($HTTP_GET_VARS[POST_FORUM_URL]) : intval($HTTP_POST_VARS[POST_FORUM_URL]); } - -$sql_from = FORUMS_TABLE . ' f'; -$lastread_select = ''; - -// Grab appropriate forum data -if ($config['load_db_lastread'] && $user->data['is_registered']) +else if ( isset($HTTP_GET_VARS['forum'])) { - $sql_from .= ' LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.user_id = ' . $user->data['user_id'] . ' - AND ft.forum_id = f.forum_id)'; - $lastread_select .= ', ft.mark_time'; -} - -if ($user->data['is_registered']) -{ - $sql_from .= ' LEFT JOIN ' . FORUMS_WATCH_TABLE . ' fw ON (fw.forum_id = f.forum_id AND fw.user_id = ' . $user->data['user_id'] . ')'; - $lastread_select .= ', fw.notify_status'; -} - -$sql = "SELECT f.* $lastread_select - FROM $sql_from - WHERE f.forum_id = $forum_id"; -$result = $db->sql_query($sql); -$forum_data = $db->sql_fetchrow($result); -$db->sql_freeresult($result); - -if (!$forum_data) -{ - trigger_error('NO_FORUM'); -} - - -// Configure style, language, etc. -$user->setup('viewforum', $forum_data['forum_style']); - -// Redirect to login upon emailed notification links -if (isset($_GET['e']) && !$user->data['is_registered']) -{ - login_box('', $user->lang['LOGIN_NOTIFY_FORUM']); -} - -// Permissions check -if (!$auth->acl_gets('f_list', 'f_read', $forum_id) || ($forum_data['forum_type'] == FORUM_LINK && $forum_data['forum_link'] && !$auth->acl_get('f_read', $forum_id))) -{ - if ($user->data['user_id'] != ANONYMOUS) - { - trigger_error('SORRY_AUTH_READ'); - } - - login_box('', $user->lang['LOGIN_VIEWFORUM']); -} - -// Forum is passworded ... check whether access has been granted to this -// user this session, if not show login box -if ($forum_data['forum_password']) -{ - login_forum_box($forum_data); -} - -// Is this forum a link? ... User got here either because the -// number of clicks is being tracked or they guessed the id -if ($forum_data['forum_type'] == FORUM_LINK && $forum_data['forum_link']) -{ - // Does it have click tracking enabled? - if ($forum_data['forum_flags'] & FORUM_FLAG_LINK_TRACK) - { - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET forum_posts = forum_posts + 1 - WHERE forum_id = ' . $forum_id; - $db->sql_query($sql); - } - - redirect($forum_data['forum_link']); -} - -// Build navigation links -generate_forum_nav($forum_data); - -// Forum Rules -if ($auth->acl_get('f_read', $forum_id)) -{ - generate_forum_rules($forum_data); -} - -// Do we have subforums? -$active_forum_ary = $moderators = array(); - -if ($forum_data['left_id'] != $forum_data['right_id'] - 1) -{ - list($active_forum_ary, $moderators) = display_forums($forum_data, $config['load_moderators'], $config['load_moderators']); + $forum_id = intval($HTTP_GET_VARS['forum']); } else { - $template->assign_var('S_HAS_SUBFORUM', false); - get_moderators($moderators, $forum_id); + $forum_id = ''; } -// Dump out the page header and load viewforum template -page_header($user->lang['VIEW_FORUM'] . ' - ' . $forum_data['forum_name']); +$start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0; +$start = ($start < 0) ? 0 : $start; -$template->set_filenames(array( - 'body' => 'viewforum_body.html') -); - -make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx"), $forum_id); - -$template->assign_vars(array( - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id&start=$start"), -)); - -// Not postable forum or showing active topics? -if (!($forum_data['forum_type'] == FORUM_POST || (($forum_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS) && $forum_data['forum_type'] == FORUM_CAT))) +if ( isset($HTTP_GET_VARS['mark']) || isset($HTTP_POST_VARS['mark']) ) { - page_footer(); + $mark_read = (isset($HTTP_POST_VARS['mark'])) ? $HTTP_POST_VARS['mark'] : $HTTP_GET_VARS['mark']; } - -// Ok, if someone has only list-access, we only display the forum list. -// We also make this circumstance available to the template in case we want to display a notice. ;) -if (!$auth->acl_get('f_read', $forum_id)) +else { - $template->assign_vars(array( - 'S_NO_READ_ACCESS' => true, - 'S_AUTOLOGIN_ENABLED' => ($config['allow_autologin']) ? true : false, - 'S_LOGIN_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') . '&redirect=' . urlencode(str_replace('&', '&', build_url(array('_f_')))), - )); + $mark_read = ''; +} +// +// End initial var setup +// - page_footer(); +// +// Check if the user has actually sent a forum ID with his/her request +// If not give them a nice error page. +// +if ( !empty($forum_id) ) +{ + $sql = "SELECT * + FROM " . FORUMS_TABLE . " + WHERE forum_id = $forum_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain forums information', '', __LINE__, __FILE__, $sql); + } +} +else +{ + message_die(GENERAL_MESSAGE, 'Forum_not_exist'); } +// +// If the query doesn't return any rows this isn't a valid forum. Inform +// the user. +// +if ( !($forum_row = $db->sql_fetchrow($result)) ) +{ + message_die(GENERAL_MESSAGE, 'Forum_not_exist'); +} + +// +// Start session management +// +$userdata = session_pagestart($user_ip, $forum_id); +init_userprefs($userdata); +// +// End session management +// + +// +// Start auth check +// +$is_auth = array(); +$is_auth = auth(AUTH_ALL, $forum_id, $userdata, $forum_row); + +if ( !$is_auth['auth_read'] || !$is_auth['auth_view'] ) +{ + if ( !$userdata['session_logged_in'] ) + { + $redirect = POST_FORUM_URL . "=$forum_id" . ( ( isset($start) ) ? "&start=$start" : '' ); + redirect(append_sid("login.$phpEx?redirect=viewforum.$phpEx&$redirect", true)); + } + // + // The user is not authed to read this forum ... + // + $message = ( !$is_auth['auth_view'] ) ? $lang['Forum_not_exist'] : sprintf($lang['Sorry_auth_read'], $is_auth['auth_read_type']); + + message_die(GENERAL_MESSAGE, $message); +} +// +// End of auth check +// + +// // Handle marking posts -if ($mark_read == 'topics') +// +if ( $mark_read == 'topics' ) { - markread('topics', $forum_id); + if ( $userdata['session_logged_in'] ) + { + $sql = "SELECT MAX(post_time) AS last_post + FROM " . POSTS_TABLE . " + WHERE forum_id = $forum_id"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain forums information', '', __LINE__, __FILE__, $sql); + } - $redirect_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id); - meta_refresh(3, $redirect_url); + if ( $row = $db->sql_fetchrow($result) ) + { + $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) : array(); + $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) : array(); - trigger_error($user->lang['TOPICS_MARKED'] . '

      ' . sprintf($user->lang['RETURN_FORUM'], '', '')); + if ( ( count($tracking_forums) + count($tracking_topics) ) >= 150 && empty($tracking_forums[$forum_id]) ) + { + asort($tracking_forums); + unset($tracking_forums[key($tracking_forums)]); + } + + if ( $row['last_post'] > $userdata['user_lastvisit'] ) + { + $tracking_forums[$forum_id] = time(); + + setcookie($board_config['cookie_name'] . '_f', serialize($tracking_forums), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); + } + } + + $template->assign_vars(array( + 'META' => '') + ); + } + + $message = $lang['Topics_marked_read'] . '

      ' . sprintf($lang['Click_return_forum'], '', ' '); + message_die(GENERAL_MESSAGE, $message); +} +// +// End handle marking posts +// + +$tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) : ''; +$tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) : ''; + +// +// Do the forum Prune +// +if ( $is_auth['auth_mod'] && $board_config['prune_enable'] ) +{ + if ( $forum_row['prune_next'] < time() && $forum_row['prune_enable'] ) + { + include($phpbb_root_path . 'includes/prune.'.$phpEx); + require($phpbb_root_path . 'includes/functions_admin.'.$phpEx); + auto_prune($forum_id); + } +} +// +// End of forum prune +// + +// +// Obtain list of moderators of each forum +// First users, then groups ... broken into two queries +// +$sql = "SELECT u.user_id, u.username + FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u + WHERE aa.forum_id = $forum_id + AND aa.auth_mod = " . TRUE . " + AND g.group_single_user = 1 + AND ug.group_id = aa.group_id + AND g.group_id = aa.group_id + AND u.user_id = ug.user_id + GROUP BY u.user_id, u.username + ORDER BY u.user_id"; +if ( !($result = $db->sql_query($sql)) ) +{ + message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql); } -// Is a forum specific topic count required? -if ($forum_data['forum_topics_per_page']) +$moderators = array(); +while( $row = $db->sql_fetchrow($result) ) { - $config['topics_per_page'] = $forum_data['forum_topics_per_page']; + $moderators[] = '' . $row['username'] . ''; } -// Do the forum Prune thang - cron type job ... -if ($forum_data['prune_next'] < time() && $forum_data['enable_prune']) +$sql = "SELECT g.group_id, g.group_name + FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g + WHERE aa.forum_id = $forum_id + AND aa.auth_mod = " . TRUE . " + AND g.group_single_user = 0 + AND g.group_type <> ". GROUP_HIDDEN ." + AND ug.group_id = aa.group_id + AND g.group_id = aa.group_id + GROUP BY g.group_id, g.group_name + ORDER BY g.group_id"; +if ( !($result = $db->sql_query($sql)) ) { - $template->assign_var('RUN_CRON_TASK', 'cron'); + message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql); } -// Forum rules and subscription info -$s_watching_forum = array( - 'link' => '', - 'title' => '', - 'is_watching' => false, -); - -if (($config['email_enable'] || $config['jab_enable']) && $config['allow_forum_notify'] && $auth->acl_get('f_subscribe', $forum_id)) +while( $row = $db->sql_fetchrow($result) ) { - $notify_status = (isset($forum_data['notify_status'])) ? $forum_data['notify_status'] : NULL; - watch_topic_forum('forum', $s_watching_forum, $user->data['user_id'], $forum_id, 0, $notify_status); + $moderators[] = '' . $row['group_name'] . ''; } + +$l_moderators = ( count($moderators) == 1 ) ? $lang['Moderator'] : $lang['Moderators']; +$forum_moderators = ( count($moderators) ) ? implode(', ', $moderators) : $lang['None']; +unset($moderators); -$s_forum_rules = ''; -gen_forum_auth_level('forum', $forum_id, $forum_data['forum_status']); +// +// Generate a 'Show topics in previous x days' select box. If the topicsdays var is sent +// then get it's value, find the number of topics with dates newer than it (to properly +// handle pagination) and alter the main query +// +$previous_days = array(0, 1, 7, 14, 30, 90, 180, 364); +$previous_days_text = array($lang['All_Topics'], $lang['1_Day'], $lang['7_Days'], $lang['2_Weeks'], $lang['1_Month'], $lang['3_Months'], $lang['6_Months'], $lang['1_Year']); -// Topic ordering options -$limit_days = array(0 => $user->lang['ALL_TOPICS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); - -$sort_by_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 'r' => $user->lang['REPLIES'], 's' => $user->lang['SUBJECT'], 'v' => $user->lang['VIEWS']); -$sort_by_sql = array('a' => 't.topic_first_poster_name', 't' => 't.topic_last_post_time', 'r' => 't.topic_replies', 's' => 't.topic_title', 'v' => 't.topic_views'); - -$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = ''; -gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); - -// Limit topics to certain time frame, obtain correct topic count -// global announcements must not be counted, normal announcements have to -// be counted, as forum_topics(_real) includes them -if ($sort_days) +if ( !empty($HTTP_POST_VARS['topicdays']) || !empty($HTTP_GET_VARS['topicdays']) ) { - $min_post_time = time() - ($sort_days * 86400); + $topic_days = ( !empty($HTTP_POST_VARS['topicdays']) ) ? intval($HTTP_POST_VARS['topicdays']) : intval($HTTP_GET_VARS['topicdays']); + $min_topic_time = time() - ($topic_days * 86400); - $sql = 'SELECT COUNT(topic_id) AS num_topics - FROM ' . TOPICS_TABLE . " - WHERE forum_id = $forum_id - AND ((topic_type <> " . POST_GLOBAL . " AND topic_last_post_time >= $min_post_time) - OR topic_type = " . POST_ANNOUNCE . ") - " . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND topic_approved = 1'); - $result = $db->sql_query($sql); - $topics_count = (int) $db->sql_fetchfield('num_topics'); - $db->sql_freeresult($result); + $sql = "SELECT COUNT(t.topic_id) AS forum_topics + FROM " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p + WHERE t.forum_id = $forum_id + AND p.post_id = t.topic_last_post_id + AND p.post_time >= $min_topic_time"; - if (isset($_POST['sort'])) + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain limited topics count information', '', __LINE__, __FILE__, $sql); + } + $row = $db->sql_fetchrow($result); + + $topics_count = ( $row['forum_topics'] ) ? $row['forum_topics'] : 1; + $limit_topics_time = "AND p.post_time >= $min_topic_time"; + + if ( !empty($HTTP_POST_VARS['topicdays']) ) { $start = 0; } - $sql_limit_time = "AND t.topic_last_post_time >= $min_post_time"; - - // Make sure we have information about day selection ready - $template->assign_var('S_SORT_DAYS', true); } else { - $topics_count = ($auth->acl_get('m_approve', $forum_id)) ? $forum_data['forum_topics_real'] : $forum_data['forum_topics']; - $sql_limit_time = ''; + $topics_count = ( $forum_row['forum_topics'] ) ? $forum_row['forum_topics'] : 1; + + $limit_topics_time = ''; + $topic_days = 0; } -// Make sure $start is set to the last page if it exceeds the amount -if ($start < 0 || $start > $topics_count) +$select_topic_days = ''; -// Basic pagewide vars -$post_alt = ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->lang['FORUM_LOCKED'] : $user->lang['POST_NEW_TOPIC']; -// Display active topics? -$s_display_active = ($forum_data['forum_type'] == FORUM_CAT && ($forum_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS)) ? true : false; - -$template->assign_vars(array( - 'MODERATORS' => (!empty($moderators[$forum_id])) ? implode(', ', $moderators[$forum_id]) : '', - - 'POST_IMG' => ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->img('button_topic_locked', $post_alt) : $user->img('button_topic_new', $post_alt), - 'NEWEST_POST_IMG' => $user->img('icon_topic_newest', 'VIEW_NEWEST_POST'), - 'LAST_POST_IMG' => $user->img('icon_topic_latest', 'VIEW_LATEST_POST'), - 'FOLDER_IMG' => $user->img('topic_read', 'NO_NEW_POSTS'), - 'FOLDER_NEW_IMG' => $user->img('topic_unread', 'NEW_POSTS'), - 'FOLDER_HOT_IMG' => $user->img('topic_read_hot', 'NO_NEW_POSTS_HOT'), - 'FOLDER_HOT_NEW_IMG' => $user->img('topic_unread_hot', 'NEW_POSTS_HOT'), - 'FOLDER_LOCKED_IMG' => $user->img('topic_read_locked', 'NO_NEW_POSTS_LOCKED'), - 'FOLDER_LOCKED_NEW_IMG' => $user->img('topic_unread_locked', 'NEW_POSTS_LOCKED'), - 'FOLDER_STICKY_IMG' => $user->img('sticky_read', 'POST_STICKY'), - 'FOLDER_STICKY_NEW_IMG' => $user->img('sticky_unread', 'POST_STICKY'), - 'FOLDER_ANNOUNCE_IMG' => $user->img('announce_read', 'POST_ANNOUNCEMENT'), - 'FOLDER_ANNOUNCE_NEW_IMG' => $user->img('announce_unread', 'POST_ANNOUNCEMENT'), - 'FOLDER_MOVED_IMG' => $user->img('topic_moved', 'TOPIC_MOVED'), - 'REPORTED_IMG' => $user->img('icon_topic_reported', 'TOPIC_REPORTED'), - 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'TOPIC_UNAPPROVED'), - 'GOTO_PAGE_IMG' => $user->img('icon_post_target', 'GOTO_PAGE'), - - 'L_NO_TOPICS' => ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->lang['POST_FORUM_LOCKED'] : $user->lang['NO_TOPICS'], - - 'S_DISPLAY_POST_INFO' => ($forum_data['forum_type'] == FORUM_POST && ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS)) ? true : false, - - 'S_IS_POSTABLE' => ($forum_data['forum_type'] == FORUM_POST) ? true : false, - 'S_USER_CAN_POST' => ($auth->acl_get('f_post', $forum_id)) ? true : false, - 'S_DISPLAY_ACTIVE' => $s_display_active, - 'S_SELECT_SORT_DIR' => $s_sort_dir, - 'S_SELECT_SORT_KEY' => $s_sort_key, - 'S_SELECT_SORT_DAYS' => $s_limit_days, - 'S_TOPIC_ICONS' => ($s_display_active && sizeof($active_forum_ary)) ? max($active_forum_ary['enable_icons']) : (($forum_data['enable_icons']) ? true : false), - 'S_WATCH_FORUM_LINK' => $s_watching_forum['link'], - 'S_WATCH_FORUM_TITLE' => $s_watching_forum['title'], - 'S_WATCHING_FORUM' => $s_watching_forum['is_watching'], - 'S_FORUM_ACTION' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id&start=$start"), - 'S_DISPLAY_SEARCHBOX' => ($auth->acl_get('u_search') && $auth->acl_get('f_search', $forum_id) && $config['load_search']) ? true : false, - 'S_SEARCHBOX_ACTION' => append_sid("{$phpbb_root_path}search.$phpEx", 'fid[]=' . $forum_id), - 'S_SINGLE_MODERATOR' => (!empty($moderators[$forum_id]) && sizeof($moderators[$forum_id]) > 1) ? false : true, - 'S_IS_LOCKED' => ($forum_data['forum_status'] == ITEM_LOCKED) ? true : false, - 'S_VIEWFORUM' => true, - - 'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&i=main&mode=forum_view", true, $user->session_id) : '', - 'U_POST_NEW_TOPIC' => ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS) ? append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=post&f=' . $forum_id) : '', - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id&$u_sort_param&start=$start"), - 'U_MARK_TOPICS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id&mark=topics") : '', -)); - -// Grab icons -$icons = cache::obtain_icons(); - -// Grab all topic data -$rowset = $announcement_list = $topic_list = $global_announce_list = array(); - -$sql_array = array( - 'SELECT' => 't.*', - 'FROM' => array( - TOPICS_TABLE => 't' - ), - 'LEFT_JOIN' => array(), -); - -$sql_approved = ($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1'; - -if ($user->data['is_registered']) +// +// All announcement data, this keeps announcements +// on each viewforum page ... +// +$sql = "SELECT t.*, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_time, p.post_username + FROM " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . USERS_TABLE . " u2 + WHERE t.forum_id = $forum_id + AND t.topic_poster = u.user_id + AND p.post_id = t.topic_last_post_id + AND p.poster_id = u2.user_id + AND t.topic_type = " . POST_ANNOUNCE . " + ORDER BY t.topic_last_post_id DESC "; +if ( !($result = $db->sql_query($sql)) ) { - if ($config['load_db_track']) - { - $sql_array['LEFT_JOIN'][] = array('FROM' => array(TOPICS_POSTED_TABLE => 'tp'), 'ON' => 'tp.topic_id = t.topic_id AND tp.user_id = ' . $user->data['user_id']); - $sql_array['SELECT'] .= ', tp.topic_posted'; - } - - if ($config['load_db_lastread']) - { - $sql_array['LEFT_JOIN'][] = array('FROM' => array(TOPICS_TRACK_TABLE => 'tt'), 'ON' => 'tt.topic_id = t.topic_id AND tt.user_id = ' . $user->data['user_id']); - $sql_array['SELECT'] .= ', tt.mark_time'; - - if ($s_display_active && sizeof($active_forum_ary)) - { - $sql_array['LEFT_JOIN'][] = array('FROM' => array(FORUMS_TRACK_TABLE => 'ft'), 'ON' => 'ft.forum_id = t.forum_id AND ft.user_id = ' . $user->data['user_id']); - $sql_array['SELECT'] .= ', ft.mark_time AS forum_mark_time'; - } - } + message_die(GENERAL_ERROR, 'Could not obtain topic information', '', __LINE__, __FILE__, $sql); } -if ($forum_data['forum_type'] == FORUM_POST) +$topic_rowset = array(); +$total_announcements = 0; +while( $row = $db->sql_fetchrow($result) ) { - // Obtain announcements ... removed sort ordering, sort by time in all cases - $sql = $db->sql_build_query('SELECT', array( - 'SELECT' => $sql_array['SELECT'], - 'FROM' => $sql_array['FROM'], - 'LEFT_JOIN' => $sql_array['LEFT_JOIN'], - - 'WHERE' => 't.forum_id IN (' . $forum_id . ', 0) - AND t.topic_type IN (' . POST_ANNOUNCE . ', ' . POST_GLOBAL . ')', - - 'ORDER_BY' => 't.topic_time DESC', - )); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $rowset[$row['topic_id']] = $row; - $announcement_list[] = $row['topic_id']; - - if ($row['topic_type'] == POST_GLOBAL) - { - $global_announce_list[$row['topic_id']] = true; - } - else - { - $topics_count--; - } - } - $db->sql_freeresult($result); + $topic_rowset[] = $row; + $total_announcements++; } -// If the user is trying to reach late pages, start searching from the end -$store_reverse = false; -$sql_limit = $config['topics_per_page']; -if ($start > $topics_count / 2) -{ - $store_reverse = true; - - if ($start + $config['topics_per_page'] > $topics_count) - { - $sql_limit = min($config['topics_per_page'], max(1, $topics_count - $start)); - } - - // Select the sort order - $sql_sort_order = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'ASC' : 'DESC'); - $sql_start = max(0, $topics_count - $sql_limit - $start); -} -else -{ - // Select the sort order - $sql_sort_order = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC'); - $sql_start = $start; -} - -if ($forum_data['forum_type'] == FORUM_POST || !sizeof($active_forum_ary)) -{ - $sql_where = 't.forum_id = ' . $forum_id; -} -else if (empty($active_forum_ary['exclude_forum_id'])) -{ - $sql_where = $db->sql_in_set('t.forum_id', $active_forum_ary['forum_id']); -} -else -{ - $get_forum_ids = array_diff($active_forum_ary['forum_id'], $active_forum_ary['exclude_forum_id']); - $sql_where = (sizeof($get_forum_ids)) ? $db->sql_in_set('t.forum_id', $get_forum_ids) : 't.forum_id = ' . $forum_id; -} - -// Grab just the sorted topic ids -$sql = 'SELECT t.topic_id - FROM ' . TOPICS_TABLE . " t - WHERE $sql_where - AND t.topic_type IN (" . POST_NORMAL . ', ' . POST_STICKY . ") - $sql_approved - $sql_limit_time - ORDER BY t.topic_type " . ((!$store_reverse) ? 'DESC' : 'ASC') . ', ' . $sql_sort_order; -$result = $db->sql_query_limit($sql, $sql_limit, $sql_start); - -while ($row = $db->sql_fetchrow($result)) -{ - $topic_list[] = (int) $row['topic_id']; -} $db->sql_freeresult($result); -// For storing shadow topics -$shadow_topic_list = array(); - -if (sizeof($topic_list)) +// +// Grab all the basic data (all topics except announcements) +// for this forum +// +$sql = "SELECT t.*, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_username, p2.post_username AS post_username2, p2.post_time + FROM " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2, " . USERS_TABLE . " u2 + WHERE t.forum_id = $forum_id + AND t.topic_poster = u.user_id + AND p.post_id = t.topic_first_post_id + AND p2.post_id = t.topic_last_post_id + AND u2.user_id = p2.poster_id + AND t.topic_type <> " . POST_ANNOUNCE . " + $limit_topics_time + ORDER BY t.topic_type DESC, t.topic_last_post_id DESC + LIMIT $start, ".$board_config['topics_per_page']; +if ( !($result = $db->sql_query($sql)) ) { - // SQL array for obtaining topics/stickies - $sql_array = array( - 'SELECT' => $sql_array['SELECT'], - 'FROM' => $sql_array['FROM'], - 'LEFT_JOIN' => $sql_array['LEFT_JOIN'], - - 'WHERE' => $db->sql_in_set('t.topic_id', $topic_list), - ); - - // If store_reverse, then first obtain topics, then stickies, else the other way around... - // Funnily enough you typically save one query if going from the last page to the middle (store_reverse) because - // the number of stickies are not known - $sql = $db->sql_build_query('SELECT', $sql_array); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - if ($row['topic_status'] == ITEM_MOVED) - { - $shadow_topic_list[$row['topic_moved_id']] = $row['topic_id']; - } - - $rowset[$row['topic_id']] = $row; - } - $db->sql_freeresult($result); + message_die(GENERAL_ERROR, 'Could not obtain topic information', '', __LINE__, __FILE__, $sql); } -// If we have some shadow topics, update the rowset to reflect their topic information -if (sizeof($shadow_topic_list)) +$total_topics = 0; +while( $row = $db->sql_fetchrow($result) ) { - $sql = 'SELECT * - FROM ' . TOPICS_TABLE . ' - WHERE ' . $db->sql_in_set('topic_id', array_keys($shadow_topic_list)); - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $orig_topic_id = $shadow_topic_list[$row['topic_id']]; - - // If the shadow topic is already listed within the rowset (happens for active topics for example), then do not include it... - if (isset($rowset[$row['topic_id']])) - { - // We need to remove any trace regarding this topic. :) - unset($rowset[$orig_topic_id]); - unset($topic_list[array_search($orig_topic_id, $topic_list)]); - $topics_count--; - - continue; - } - - // Do not include those topics the user has no permission to access - if (!$auth->acl_get('f_read', $row['forum_id'])) - { - // We need to remove any trace regarding this topic. :) - unset($rowset[$orig_topic_id]); - unset($topic_list[array_search($orig_topic_id, $topic_list)]); - $topics_count--; - - continue; - } - - // We want to retain some values - $row = array_merge($row, array( - 'topic_moved_id' => $rowset[$orig_topic_id]['topic_moved_id'], - 'topic_status' => $rowset[$orig_topic_id]['topic_status'], - 'topic_type' => $rowset[$orig_topic_id]['topic_type'], - )); - - $rowset[$orig_topic_id] = $row; - } - $db->sql_freeresult($result); -} -unset($shadow_topic_list); - -// Ok, adjust topics count for active topics list -if ($s_display_active) -{ - $topics_count = 1; + $topic_rowset[] = $row; + $total_topics++; } +$db->sql_freeresult($result); + +// +// Total topics ... +// +$total_topics += $total_announcements; + +// +// Define censored word matches +// +$orig_word = array(); +$replacement_word = array(); +obtain_word_list($orig_word, $replacement_word); + +// +// Post URL generation for templating vars +// $template->assign_vars(array( - 'PAGINATION' => generate_pagination(append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id&$u_sort_param"), $topics_count, $config['topics_per_page'], $start), - 'PAGE_NUMBER' => on_page($topics_count, $config['topics_per_page'], $start), - 'TOTAL_TOPICS' => ($s_display_active) ? false : (($topics_count == 1) ? $user->lang['VIEW_FORUM_TOPIC'] : sprintf($user->lang['VIEW_FORUM_TOPICS'], $topics_count))) + 'L_DISPLAY_TOPICS' => $lang['Display_topics'], + + 'U_POST_NEW_TOPIC' => append_sid("posting.$phpEx?mode=newtopic&" . POST_FORUM_URL . "=$forum_id"), + + 'S_SELECT_TOPIC_DAYS' => $select_topic_days, + 'S_POST_DAYS_ACTION' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $forum_id . "&start=$start")) ); -$topic_list = ($store_reverse) ? array_merge($announcement_list, array_reverse($topic_list)) : array_merge($announcement_list, $topic_list); -$topic_tracking_info = $tracking_topics = array(); +// +// User authorisation levels output +// +$s_auth_can = ( ( $is_auth['auth_post'] ) ? $lang['Rules_post_can'] : $lang['Rules_post_cannot'] ) . '
      '; +$s_auth_can .= ( ( $is_auth['auth_reply'] ) ? $lang['Rules_reply_can'] : $lang['Rules_reply_cannot'] ) . '
      '; +$s_auth_can .= ( ( $is_auth['auth_edit'] ) ? $lang['Rules_edit_can'] : $lang['Rules_edit_cannot'] ) . '
      '; +$s_auth_can .= ( ( $is_auth['auth_delete'] ) ? $lang['Rules_delete_can'] : $lang['Rules_delete_cannot'] ) . '
      '; +$s_auth_can .= ( ( $is_auth['auth_vote'] ) ? $lang['Rules_vote_can'] : $lang['Rules_vote_cannot'] ) . '
      '; -// Okay, lets dump out the page ... -if (sizeof($topic_list)) +if ( $is_auth['auth_mod'] ) { - $mark_forum_read = true; - $mark_time_forum = 0; + $s_auth_can .= sprintf($lang['Rules_moderate'], "', ''); +} - // Active topics? - if ($s_display_active && sizeof($active_forum_ary)) +// +// Mozilla navigation bar +// +$nav_links['up'] = array( + 'url' => append_sid('index.'.$phpEx), + 'title' => sprintf($lang['Forum_Index'], $board_config['sitename']) +); + +// +// Dump out the page header and load viewforum template +// +define('SHOW_ONLINE', true); +$page_title = $lang['View_forum'] . ' - ' . $forum_row['forum_name']; +include($phpbb_root_path . 'includes/page_header.'.$phpEx); + +$template->set_filenames(array( + 'body' => 'viewforum_body.tpl') +); +make_jumpbox('viewforum.'.$phpEx); + +$template->assign_vars(array( + 'FORUM_ID' => $forum_id, + 'FORUM_NAME' => $forum_row['forum_name'], + 'MODERATORS' => $forum_moderators, + 'POST_IMG' => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $images['post_locked'] : $images['post_new'], + + 'FOLDER_IMG' => $images['folder'], + 'FOLDER_NEW_IMG' => $images['folder_new'], + 'FOLDER_HOT_IMG' => $images['folder_hot'], + 'FOLDER_HOT_NEW_IMG' => $images['folder_hot_new'], + 'FOLDER_LOCKED_IMG' => $images['folder_locked'], + 'FOLDER_LOCKED_NEW_IMG' => $images['folder_locked_new'], + 'FOLDER_STICKY_IMG' => $images['folder_sticky'], + 'FOLDER_STICKY_NEW_IMG' => $images['folder_sticky_new'], + 'FOLDER_ANNOUNCE_IMG' => $images['folder_announce'], + 'FOLDER_ANNOUNCE_NEW_IMG' => $images['folder_announce_new'], + + 'L_TOPICS' => $lang['Topics'], + 'L_REPLIES' => $lang['Replies'], + 'L_VIEWS' => $lang['Views'], + 'L_POSTS' => $lang['Posts'], + 'L_LASTPOST' => $lang['Last_Post'], + 'L_MODERATOR' => $l_moderators, + 'L_MARK_TOPICS_READ' => $lang['Mark_all_topics'], + 'L_POST_NEW_TOPIC' => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'], + 'L_NO_NEW_POSTS' => $lang['No_new_posts'], + 'L_NEW_POSTS' => $lang['New_posts'], + 'L_NO_NEW_POSTS_LOCKED' => $lang['No_new_posts_locked'], + 'L_NEW_POSTS_LOCKED' => $lang['New_posts_locked'], + 'L_NO_NEW_POSTS_HOT' => $lang['No_new_posts_hot'], + 'L_NEW_POSTS_HOT' => $lang['New_posts_hot'], + 'L_ANNOUNCEMENT' => $lang['Post_Announcement'], + 'L_STICKY' => $lang['Post_Sticky'], + 'L_POSTED' => $lang['Posted'], + 'L_JOINED' => $lang['Joined'], + 'L_AUTHOR' => $lang['Author'], + + 'S_AUTH_LIST' => $s_auth_can, + + 'U_VIEW_FORUM' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL ."=$forum_id"), + + 'U_MARK_READ' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&mark=topics")) +); +// +// End header +// + +// +// Okay, lets dump out the page ... +// +if( $total_topics ) +{ + for($i = 0; $i < $total_topics; $i++) { - // Generate topic forum list... - $topic_forum_list = array(); - foreach ($rowset as $t_id => $row) + $topic_id = $topic_rowset[$i]['topic_id']; + + $topic_title = ( count($orig_word) ) ? preg_replace($orig_word, $replacement_word, $topic_rowset[$i]['topic_title']) : $topic_rowset[$i]['topic_title']; + + $replies = $topic_rowset[$i]['topic_replies']; + + $topic_type = $topic_rowset[$i]['topic_type']; + + if( $topic_type == POST_ANNOUNCE ) { - $topic_forum_list[$row['forum_id']]['forum_mark_time'] = ($config['load_db_lastread'] && $user->data['is_registered'] && isset($row['forum_mark_time'])) ? $row['forum_mark_time'] : 0; - $topic_forum_list[$row['forum_id']]['topics'][] = $t_id; + $topic_type = $lang['Topic_Announcement'] . ' '; } - - if ($config['load_db_lastread'] && $user->data['is_registered']) + else if( $topic_type == POST_STICKY ) { - foreach ($topic_forum_list as $f_id => $topic_row) - { - $topic_tracking_info += get_topic_tracking($f_id, $topic_row['topics'], $rowset, array($f_id => $topic_row['forum_mark_time']), false); - } - } - else if ($config['load_anon_lastread'] || $user->data['is_registered']) - { - foreach ($topic_forum_list as $f_id => $topic_row) - { - $topic_tracking_info += get_complete_topic_tracking($f_id, $topic_row['topics'], false); - } - } - - unset($topic_forum_list); - } - else - { - if ($config['load_db_lastread'] && $user->data['is_registered']) - { - $topic_tracking_info = get_topic_tracking($forum_id, $topic_list, $rowset, array($forum_id => $forum_data['mark_time']), $global_announce_list); - $mark_time_forum = (!empty($forum_data['mark_time'])) ? $forum_data['mark_time'] : $user->data['user_lastmark']; - } - else if ($config['load_anon_lastread'] || $user->data['is_registered']) - { - $topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_list, $global_announce_list); - - if (!$user->data['is_registered']) - { - $user->data['user_lastmark'] = (isset($tracking_topics['l'])) ? (int) (base_convert($tracking_topics['l'], 36, 10) + $config['board_startdate']) : 0; - } - $mark_time_forum = (isset($tracking_topics['f'][$forum_id])) ? (int) (base_convert($tracking_topics['f'][$forum_id], 36, 10) + $config['board_startdate']) : $user->data['user_lastmark']; - } - } - - $s_type_switch = 0; - foreach ($topic_list as $topic_id) - { - $row = &$rowset[$topic_id]; - - // This will allow the style designer to output a different header - // or even separate the list of announcements from sticky and normal topics - $s_type_switch_test = ($row['topic_type'] == POST_ANNOUNCE || $row['topic_type'] == POST_GLOBAL) ? 1 : 0; - - // Replies - $replies = ($auth->acl_get('m_approve', $forum_id)) ? $row['topic_replies_real'] : $row['topic_replies']; - - if ($row['topic_status'] == ITEM_MOVED) - { - $topic_id = $row['topic_moved_id']; - $unread_topic = false; + $topic_type = $lang['Topic_Sticky'] . ' '; } else { - $unread_topic = (isset($topic_tracking_info[$topic_id]) && $row['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false; + $topic_type = ''; } - // Get folder img, topic status/type related information - $folder_img = $folder_alt = $topic_type = ''; - topic_status($row, $replies, $unread_topic, $folder_img, $folder_alt, $topic_type); - - // Generate all the URIs ... - $view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . (($row['forum_id']) ? $row['forum_id'] : $forum_id) . '&t=' . $topic_id); - - $topic_unapproved = (!$row['topic_approved'] && $auth->acl_get('m_approve', $forum_id)) ? true : false; - $posts_unapproved = ($row['topic_approved'] && $row['topic_replies'] < $row['topic_replies_real'] && $auth->acl_get('m_approve', $forum_id)) ? true : false; - $u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&t=$topic_id", true, $user->session_id) : ''; - - // Send vars to template - $template->assign_block_vars('topicrow', array( - 'FORUM_ID' => $forum_id, - 'TOPIC_ID' => $topic_id, - 'TOPIC_AUTHOR' => get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - 'TOPIC_AUTHOR_COLOUR' => get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - 'TOPIC_AUTHOR_FULL' => get_username_string('full', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - 'FIRST_POST_TIME' => $user->format_date($row['topic_time']), - 'LAST_POST_SUBJECT' => censor_text($row['topic_last_post_subject']), - 'LAST_POST_TIME' => $user->format_date($row['topic_last_post_time']), - 'LAST_VIEW_TIME' => $user->format_date($row['topic_last_view_time']), - 'LAST_POST_AUTHOR' => get_username_string('username', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - 'LAST_POST_AUTHOR_COLOUR' => get_username_string('colour', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - 'LAST_POST_AUTHOR_FULL' => get_username_string('full', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - - 'PAGINATION' => topic_generate_pagination($replies, $view_topic_url), - 'REPLIES' => $replies, - 'VIEWS' => $row['topic_views'], - 'TOPIC_TITLE' => censor_text($row['topic_title']), - 'TOPIC_TYPE' => $topic_type, - - 'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt), - 'TOPIC_FOLDER_IMG_SRC' => $user->img($folder_img, $folder_alt, false, '', 'src'), - 'TOPIC_FOLDER_IMG_ALT' => $user->lang[$folder_alt], - 'TOPIC_ICON_IMG' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '', - 'TOPIC_ICON_IMG_WIDTH' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '', - 'TOPIC_ICON_IMG_HEIGHT' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '', - 'ATTACH_ICON_IMG' => ($auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_topic_attach', $user->lang['TOTAL_ATTACHMENTS']) : '', - 'UNAPPROVED_IMG' => ($topic_unapproved || $posts_unapproved) ? $user->img('icon_topic_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '', - - 'S_TOPIC_TYPE' => $row['topic_type'], - 'S_USER_POSTED' => (isset($row['topic_posted']) && $row['topic_posted']) ? true : false, - 'S_UNREAD_TOPIC' => $unread_topic, - 'S_TOPIC_REPORTED' => (!empty($row['topic_reported']) && $auth->acl_get('m_report', $forum_id)) ? true : false, - 'S_TOPIC_UNAPPROVED' => $topic_unapproved, - 'S_POSTS_UNAPPROVED' => $posts_unapproved, - 'S_HAS_POLL' => ($row['poll_start']) ? true : false, - 'S_POST_ANNOUNCE' => ($row['topic_type'] == POST_ANNOUNCE) ? true : false, - 'S_POST_GLOBAL' => ($row['topic_type'] == POST_GLOBAL) ? true : false, - 'S_POST_STICKY' => ($row['topic_type'] == POST_STICKY) ? true : false, - 'S_TOPIC_LOCKED' => ($row['topic_status'] == ITEM_LOCKED) ? true : false, - 'S_TOPIC_MOVED' => ($row['topic_status'] == ITEM_MOVED) ? true : false, - - 'U_NEWEST_POST' => $view_topic_url . '&view=unread#unread', - 'U_LAST_POST' => $view_topic_url . '&p=' . $row['topic_last_post_id'] . '#p' . $row['topic_last_post_id'], - 'U_LAST_POST_AUTHOR' => get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), - 'U_TOPIC_AUTHOR' => get_username_string('profile', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), - 'U_VIEW_TOPIC' => $view_topic_url, - 'U_MCP_REPORT' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=reports&f=' . $forum_id . '&t=' . $topic_id, true, $user->session_id), - 'U_MCP_QUEUE' => $u_mcp_queue, - - 'S_TOPIC_TYPE_SWITCH' => ($s_type_switch == $s_type_switch_test) ? -1 : $s_type_switch_test) - ); - - $s_type_switch = ($row['topic_type'] == POST_ANNOUNCE || $row['topic_type'] == POST_GLOBAL) ? 1 : 0; - - if ($unread_topic) + if( $topic_rowset[$i]['topic_vote'] ) { - $mark_forum_read = false; + $topic_type .= $lang['Topic_Poll'] . ' '; + } + + if( $topic_rowset[$i]['topic_status'] == TOPIC_MOVED ) + { + $topic_type = $lang['Topic_Moved'] . ' '; + $topic_id = $topic_rowset[$i]['topic_moved_id']; + + $folder_image = $images['folder']; + $folder_alt = $lang['Topics_Moved']; + $newest_post_img = ''; + } + else + { + if( $topic_rowset[$i]['topic_type'] == POST_ANNOUNCE ) + { + $folder = $images['folder_announce']; + $folder_new = $images['folder_announce_new']; + } + else if( $topic_rowset[$i]['topic_type'] == POST_STICKY ) + { + $folder = $images['folder_sticky']; + $folder_new = $images['folder_sticky_new']; + } + else if( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) + { + $folder = $images['folder_locked']; + $folder_new = $images['folder_locked_new']; + } + else + { + if($replies >= $board_config['hot_threshold']) + { + $folder = $images['folder_hot']; + $folder_new = $images['folder_hot_new']; + } + else + { + $folder = $images['folder']; + $folder_new = $images['folder_new']; + } + } + + $newest_post_img = ''; + if( $userdata['session_logged_in'] ) + { + if( $topic_rowset[$i]['post_time'] > $userdata['user_lastvisit'] ) + { + if( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) + { + $unread_topics = true; + + if( !empty($tracking_topics[$topic_id]) ) + { + if( $tracking_topics[$topic_id] >= $topic_rowset[$i]['post_time'] ) + { + $unread_topics = false; + } + } + + if( !empty($tracking_forums[$forum_id]) ) + { + if( $tracking_forums[$forum_id] >= $topic_rowset[$i]['post_time'] ) + { + $unread_topics = false; + } + } + + if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) + { + if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] >= $topic_rowset[$i]['post_time'] ) + { + $unread_topics = false; + } + } + + if( $unread_topics ) + { + $folder_image = $folder_new; + $folder_alt = $lang['New_posts']; + + $newest_post_img = '' . $lang['View_newest_post'] . ' '; + } + else + { + $folder_image = $folder; + $folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts']; + + $newest_post_img = ''; + } + } + else + { + $folder_image = $folder_new; + $folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['New_posts']; + + $newest_post_img = '' . $lang['View_newest_post'] . ' '; + } + } + else + { + $folder_image = $folder; + $folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts']; + + $newest_post_img = ''; + } + } + else + { + $folder_image = $folder; + $folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts']; + + $newest_post_img = ''; + } } - unset($rowset[$topic_id]); + if( ( $replies + 1 ) > $board_config['posts_per_page'] ) + { + $total_pages = ceil( ( $replies + 1 ) / $board_config['posts_per_page'] ); + $goto_page = ' [ ' . $lang['Goto_page'] . '' . $lang['Goto_page'] . ': '; + + $times = 1; + for($j = 0; $j < $replies + 1; $j += $board_config['posts_per_page']) + { + $goto_page .= '' . $times . ''; + if( $times == 1 && $total_pages > 4 ) + { + $goto_page .= ' ... '; + $times = $total_pages - 3; + $j += ( $total_pages - 4 ) * $board_config['posts_per_page']; + } + else if ( $times < $total_pages ) + { + $goto_page .= ', '; + } + $times++; + } + $goto_page .= ' ] '; + } + else + { + $goto_page = ''; + } + + $view_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id"); + + $topic_author = ( $topic_rowset[$i]['user_id'] != ANONYMOUS ) ? '' : ''; + $topic_author .= ( $topic_rowset[$i]['user_id'] != ANONYMOUS ) ? $topic_rowset[$i]['username'] : ( ( $topic_rowset[$i]['post_username'] != '' ) ? $topic_rowset[$i]['post_username'] : $lang['Guest'] ); + + $topic_author .= ( $topic_rowset[$i]['user_id'] != ANONYMOUS ) ? '' : ''; + + $first_post_time = create_date($board_config['default_dateformat'], $topic_rowset[$i]['topic_time'], $board_config['board_timezone']); + + $last_post_time = create_date($board_config['default_dateformat'], $topic_rowset[$i]['post_time'], $board_config['board_timezone']); + + $last_post_author = ( $topic_rowset[$i]['id2'] == ANONYMOUS ) ? ( ($topic_rowset[$i]['post_username2'] != '' ) ? $topic_rowset[$i]['post_username2'] . ' ' : $lang['Guest'] . ' ' ) : '' . $topic_rowset[$i]['user2'] . ''; + + $last_post_url = '' . $lang['View_latest_post'] . ''; + + $views = $topic_rowset[$i]['topic_views']; + + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $template->assign_block_vars('topicrow', array( + 'ROW_COLOR' => $row_color, + 'ROW_CLASS' => $row_class, + 'FORUM_ID' => $forum_id, + 'TOPIC_ID' => $topic_id, + 'TOPIC_FOLDER_IMG' => $folder_image, + 'TOPIC_AUTHOR' => $topic_author, + 'GOTO_PAGE' => $goto_page, + 'REPLIES' => $replies, + 'NEWEST_POST_IMG' => $newest_post_img, + 'TOPIC_TITLE' => $topic_title, + 'TOPIC_TYPE' => $topic_type, + 'VIEWS' => $views, + 'FIRST_POST_TIME' => $first_post_time, + 'LAST_POST_TIME' => $last_post_time, + 'LAST_POST_AUTHOR' => $last_post_author, + 'LAST_POST_IMG' => $last_post_url, + + 'L_TOPIC_FOLDER_ALT' => $folder_alt, + + 'U_VIEW_TOPIC' => $view_topic_url) + ); } -} -// This is rather a fudge but it's the best I can think of without requiring information -// on all topics (as we do in 2.0.x). It looks for unread or new topics, if it doesn't find -// any it updates the forum last read cookie. This requires that the user visit the forum -// after reading a topic -if ($forum_data['forum_type'] == FORUM_POST && sizeof($topic_list) && $mark_forum_read) + $topics_count -= $total_announcements; + + $template->assign_vars(array( + 'PAGINATION' => generate_pagination("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&topicdays=$topic_days", $topics_count, $board_config['topics_per_page'], $start), + 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $topics_count / $board_config['topics_per_page'] )), + + 'L_GOTO_PAGE' => $lang['Goto_page']) + ); +} +else { - update_forum_tracking_info($forum_id, $forum_data['forum_last_post_time'], false, $mark_time_forum); + // + // No topics + // + $no_topics_msg = ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['No_topics_post_one']; + $template->assign_vars(array( + 'L_NO_TOPICS' => $no_topics_msg) + ); + + $template->assign_block_vars('switch_no_topics', array() ); + } -page_footer(); +// +// Parse the page and print +// +$template->pparse('body'); + +// +// Page footer +// +include($phpbb_root_path . 'includes/page_tail.'.$phpEx); ?> \ No newline at end of file diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index c7cfe64f4c..636a895834 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -1,444 +1,289 @@ session_begin(); -$auth->acl($user->data); -$user->setup('memberlist'); +// +$userdata = session_pagestart($user_ip, PAGE_VIEWONLINE); +init_userprefs($userdata); +// +// End session management +// -// Get and set some variables -$mode = request_var('mode', ''); -$session_id = request_var('s', ''); -$start = request_var('start', 0); -$sort_key = request_var('sk', 'b'); -$sort_dir = request_var('sd', 'd'); -$show_guests= ($config['load_online_guests']) ? request_var('sg', 0) : 0; +// +// Output page header and load viewonline template +// +$page_title = $lang['Who_is_Online']; +include($phpbb_root_path . 'includes/page_header.'.$phpEx); -// Can this user view profiles/memberlist? -if (!$auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) -{ - if ($user->data['user_id'] != ANONYMOUS) - { - trigger_error('NO_VIEW_USERS'); - } +$template->set_filenames(array( + 'body' => 'viewonline_body.tpl') +); +make_jumpbox('viewforum.'.$phpEx); - login_box('', $user->lang['LOGIN_EXPLAIN_VIEWONLINE']); -} - -$sort_key_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_JOINED'], 'c' => $user->lang['SORT_LOCATION']); -$sort_key_sql = array('a' => 'u.username_clean', 'b' => 's.session_time', 'c' => 's.session_page'); - -// Sorting and order -if (!isset($sort_key_text[$sort_key])) -{ - $sort_key = 'b'; -} - -$order_by = $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC'); - -// Whois requested -if ($mode == 'whois' && $auth->acl_get('a_') && $session_id) -{ - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - - $sql = 'SELECT u.user_id, u.username, u.user_type, s.session_ip - FROM ' . USERS_TABLE . ' u, ' . SESSIONS_TABLE . " s - WHERE s.session_id = '" . $db->sql_escape($session_id) . "' - AND u.user_id = s.session_user_id"; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - $template->assign_var('WHOIS', user_ipwhois($row['session_ip'])); - } - $db->sql_freeresult($result); - - // Output the page - page_header($user->lang['WHO_IS_ONLINE']); - - $template->set_filenames(array( - 'body' => 'viewonline_whois.html') - ); - make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); - - page_footer(); -} - -// Forum info -$sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id - FROM ' . FORUMS_TABLE . ' - ORDER BY left_id ASC'; -$result = $db->sql_query($sql, 600); - -$forum_data = array(); -while ($row = $db->sql_fetchrow($result)) -{ - $forum_data[$row['forum_id']] = $row; -} -$db->sql_freeresult($result); - -$guest_counter = 0; - -// Get number of online guests (if we do not display them) -if (!$show_guests) -{ - if ($db->count_distinct) - { - $sql = 'SELECT COUNT(DISTINCT session_ip) as num_guests - FROM ' . SESSIONS_TABLE . ' - WHERE session_user_id = ' . ANONYMOUS . ' - AND session_time >= ' . (time() - ($config['load_online_time'] * 60)); - } - else - { - $sql = 'SELECT COUNT(session_ip) as num_guests - FROM ( - SELECT DISTINCT session_ip - FROM ' . SESSIONS_TABLE . ' - WHERE session_user_id = ' . ANONYMOUS . ' - AND session_time >= ' . (time() - ($config['load_online_time'] * 60)) . - ')'; - break; - } - $result = $db->sql_query($sql); - $guest_counter = (int) $db->sql_fetchfield('num_guests'); - $db->sql_freeresult($result); -} - -// Get user list -$sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_type, u.user_colour, s.session_id, s.session_time, s.session_page, s.session_ip, s.session_browser, s.session_viewonline - FROM ' . USERS_TABLE . ' u, ' . SESSIONS_TABLE . ' s - WHERE u.user_id = s.session_user_id - AND s.session_time >= ' . (time() - ($config['load_online_time'] * 60)) . - ((!$show_guests) ? ' AND s.session_user_id <> ' . ANONYMOUS : '') . ' - ORDER BY ' . $order_by; -$result = $db->sql_query($sql); - -$prev_id = $prev_ip = $user_list = array(); -$logged_visible_online = $logged_hidden_online = $counter = 0; - -while ($row = $db->sql_fetchrow($result)) -{ - if ($row['user_id'] != ANONYMOUS && !isset($prev_id[$row['user_id']])) - { - $view_online = $s_user_hidden = false; - $user_colour = ($row['user_colour']) ? ' style="color:#' . $row['user_colour'] . '" class="username-coloured"' : ''; - - $username_full = ($row['user_type'] != USER_IGNORE) ? get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']) : '' . $row['username'] . ''; - - if (!$row['session_viewonline']) - { - $view_online = ($auth->acl_get('u_viewonline')) ? true : false; - $logged_hidden_online++; - - $username_full = '' . $username_full . ''; - $s_user_hidden = true; - } - else - { - $view_online = true; - $logged_visible_online++; - } - - $prev_id[$row['user_id']] = 1; - - if ($view_online) - { - $counter++; - } - - if (!$view_online || $counter > $start + $config['topics_per_page'] || $counter <= $start) - { - continue; - } - } - else if ($show_guests && $row['user_id'] == ANONYMOUS && !isset($prev_ip[$row['session_ip']])) - { - $prev_ip[$row['session_ip']] = 1; - $guest_counter++; - $counter++; - - if ($counter > $start + $config['topics_per_page'] || $counter <= $start) - { - continue; - } - - $s_user_hidden = false; - $username_full = get_username_string('full', $row['user_id'], $user->lang['GUEST']); - } - else - { - continue; - } - - preg_match('#^([a-z/]+)#i', $row['session_page'], $on_page); - if (!sizeof($on_page)) - { - $on_page[1] = ''; - } - - switch ($on_page[1]) - { - case 'index': - $location = $user->lang['INDEX']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - - case 'adm/index': - $location = $user->lang['ACP']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - - case 'posting': - case 'viewforum': - case 'viewtopic': - preg_match('#_f_=([0-9]+)x#i', $row['session_page'], $forum_id); - $forum_id = (sizeof($forum_id)) ? (int) $forum_id[1] : 0; - - if ($forum_id && $auth->acl_get('f_list', $forum_id)) - { - $location = ''; - $location_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id); - - if ($forum_data[$forum_id]['forum_type'] == FORUM_LINK) - { - $location = sprintf($user->lang['READING_LINK'], $forum_data[$forum_id]['forum_name']); - break; - } - - switch ($on_page[1]) - { - case 'posting': - preg_match('#mode=([a-z]+)#', $row['session_page'], $on_page); - - switch ($on_page[1]) - { - case 'reply': - case 'quote': - $location = sprintf($user->lang['REPLYING_MESSAGE'], $forum_data[$forum_id]['forum_name']); - break; - - default: - $location = sprintf($user->lang['POSTING_MESSAGE'], $forum_data[$forum_id]['forum_name']); - break; - } - break; - - case 'viewtopic': - $location = sprintf($user->lang['READING_TOPIC'], $forum_data[$forum_id]['forum_name']); - break; - - case 'viewforum': - $location = sprintf($user->lang['READING_FORUM'], $forum_data[$forum_id]['forum_name']); - break; - } - } - else - { - $location = $user->lang['INDEX']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - } - break; - - case 'search': - $location = $user->lang['SEARCHING_FORUMS']; - $location_url = append_sid("{$phpbb_root_path}search.$phpEx"); - break; - - case 'faq': - $location = $user->lang['VIEWING_FAQ']; - $location_url = append_sid("{$phpbb_root_path}faq.$phpEx"); - break; - - case 'viewonline': - $location = $user->lang['VIEWING_ONLINE']; - $location_url = append_sid("{$phpbb_root_path}viewonline.$phpEx"); - break; - - case 'memberlist': - $location = (strpos($row['session_page'], 'mode=viewprofile') !== false) ? $user->lang['VIEWING_MEMBER_PROFILE'] : $user->lang['VIEWING_MEMBERS']; - $location_url = append_sid("{$phpbb_root_path}memberlist.$phpEx"); - break; - - case 'mcp': - $location = $user->lang['VIEWING_MCP']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - - case 'ucp': - $location = $user->lang['VIEWING_UCP']; - - // Grab some common modules - $url_params = array( - 'mode=register' => 'VIEWING_REGISTER', - 'i=pm&mode=compose' => 'POSTING_PRIVATE_MESSAGE', - 'i=pm&' => 'VIEWING_PRIVATE_MESSAGES', - 'i=profile&' => 'CHANGING_PROFILE', - 'i=prefs&' => 'CHANGING_PREFERENCES', - ); - - foreach ($url_params as $param => $lang) - { - if (strpos($row['session_page'], $param) !== false) - { - $location = $user->lang[$lang]; - break; - } - } - - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - - case 'download': - $location = $user->lang['DOWNLOADING_FILE']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - - case 'report': - $location = $user->lang['REPORTING_POST']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - - default: - $location = $user->lang['INDEX']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - } - - $template->assign_block_vars('user_row', array( - 'USERNAME' => $row['username'], - 'USERNAME_COLOUR' => $row['user_colour'], - 'USERNAME_FULL' => $username_full, - 'LASTUPDATE' => $user->format_date($row['session_time']), - 'FORUM_LOCATION' => $location, - 'USER_IP' => ($auth->acl_get('a_')) ? (($mode == 'lookup' && $session_id == $row['session_id']) ? gethostbyaddr($row['session_ip']) : $row['session_ip']) : '', - 'USER_BROWSER' => ($auth->acl_get('a_user')) ? $row['session_browser'] : '', - - 'U_USER_PROFILE' => ($row['user_type'] != USER_IGNORE) ? get_username_string('profile', $row['user_id'], '') : '', - 'U_USER_IP' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'mode=lookup' . (($mode != 'lookup' || $row['session_id'] != $session_id) ? '&s=' . $row['session_id'] : '') . "&sg=$show_guests&start=$start&sk=$sort_key&sd=$sort_dir"), - 'U_WHOIS' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'mode=whois&s=' . $row['session_id']), - 'U_FORUM_LOCATION' => $location_url, - - 'S_USER_HIDDEN' => $s_user_hidden, - 'S_GUEST' => ($row['user_id'] == ANONYMOUS) ? true : false, - 'S_USER_TYPE' => $row['user_type'], - )); -} -$db->sql_freeresult($result); -unset($prev_id, $prev_ip); - -// Generate reg/hidden/guest online text -$vars_online = array( - 'REG' => array('logged_visible_online', 'l_r_user_s'), - 'HIDDEN'=> array('logged_hidden_online', 'l_h_user_s'), - 'GUEST' => array('guest_counter', 'l_g_user_s') +$template->assign_vars(array( + 'L_WHOSONLINE' => $lang['Who_is_Online'], + 'L_ONLINE_EXPLAIN' => $lang['Online_explain'], + 'L_USERNAME' => $lang['Username'], + 'L_FORUM_LOCATION' => $lang['Forum_Location'], + 'L_LAST_UPDATE' => $lang['Last_updated']) ); -foreach ($vars_online as $l_prefix => $var_ary) +// +// Forum info +// +$sql = "SELECT forum_name, forum_id + FROM " . FORUMS_TABLE; +if ( $result = $db->sql_query($sql) ) { - switch ($$var_ary[0]) + while( $row = $db->sql_fetchrow($result) ) { - case 0: - $$var_ary[1] = $user->lang[$l_prefix . '_USERS_ZERO_ONLINE']; - break; - - case 1: - $$var_ary[1] = $user->lang[$l_prefix . '_USER_ONLINE']; - break; - - default: - $$var_ary[1] = $user->lang[$l_prefix . '_USERS_ONLINE']; - break; + $forum_data[$row['forum_id']] = $row['forum_name']; } } -unset($vars_online); - -$pagination = generate_pagination(append_sid("{$phpbb_root_path}viewonline.$phpEx", "sg=$show_guests&sk=$sort_key&sd=$sort_dir"), $counter, $config['topics_per_page'], $start); - -// Grab group details for legend display -if ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) -{ - $sql = 'SELECT group_id, group_name, group_colour, group_type - FROM ' . GROUPS_TABLE . ' - WHERE group_legend = 1 - ORDER BY group_name ASC'; -} else { - $sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type - FROM ' . GROUPS_TABLE . ' g - LEFT JOIN ' . USER_GROUP_TABLE . ' ug - ON ( - g.group_id = ug.group_id - AND ug.user_id = ' . $user->data['user_id'] . ' - AND ug.user_pending = 0 - ) - WHERE g.group_legend = 1 - AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $user->data['user_id'] . ') - ORDER BY g.group_name ASC'; + message_die(GENERAL_ERROR, 'Could not obtain user/online forums information', '', __LINE__, __FILE__, $sql); } -$result = $db->sql_query($sql); -$legend = ''; -while ($row = $db->sql_fetchrow($result)) +// +// Get auth data +// +$is_auth_ary = array(); +$is_auth_ary = auth(AUTH_VIEW, AUTH_LIST_ALL, $userdata); + +// +// Get user list +// +$sql = "SELECT u.user_id, u.username, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_time, s.session_page, s.session_ip + FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s + WHERE u.user_id = s.session_user_id + AND s.session_time >= ".( time() - 300 ) . " + ORDER BY u.username ASC, s.session_ip ASC"; +if ( !($result = $db->sql_query($sql)) ) { - if ($row['group_name'] == 'BOTS') + message_die(GENERAL_ERROR, 'Could not obtain regd user/online information', '', __LINE__, __FILE__, $sql); +} + +$guest_users = 0; +$registered_users = 0; +$hidden_users = 0; + +$reg_counter = 0; +$guest_counter = 0; +$prev_user = 0; +$prev_ip = ''; + +while ( $row = $db->sql_fetchrow($result) ) +{ + $view_online = false; + + if ( $row['session_logged_in'] ) { - $legend .= (($legend != '') ? ', ' : '') . '' . $user->lang['G_BOTS'] . ''; + $user_id = $row['user_id']; + + if ( $user_id != $prev_user ) + { + $username = $row['username']; + + $style_color = ''; + if ( $row['user_level'] == ADMIN ) + { + $username = '' . $username . ''; + } + else if ( $row['user_level'] == MOD ) + { + $username = '' . $username . ''; + } + + if ( !$row['user_allow_viewonline'] ) + { + $view_online = ( $userdata['user_level'] == ADMIN ) ? true : false; + $hidden_users++; + + $username = '' . $username . ''; + } + else + { + $view_online = true; + $registered_users++; + } + + $which_counter = 'reg_counter'; + $which_row = 'reg_user_row'; + $prev_user = $user_id; + } } else { - $legend .= (($legend != '') ? ', ' : '') . '' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . ''; + if ( $row['session_ip'] != $prev_ip ) + { + $username = $lang['Guest']; + $view_online = true; + $guest_users++; + + $which_counter = 'guest_counter'; + $which_row = 'guest_user_row'; + } + } + + $prev_ip = $row['session_ip']; + + if ( $view_online ) + { + if ( $row['session_page'] < 1 || !$is_auth_ary[$row['session_page']]['auth_view'] ) + { + switch( $row['session_page'] ) + { + case PAGE_INDEX: + $location = $lang['Forum_index']; + $location_url = "index.$phpEx"; + break; + case PAGE_POSTING: + $location = $lang['Posting_message']; + $location_url = "index.$phpEx"; + break; + case PAGE_LOGIN: + $location = $lang['Logging_on']; + $location_url = "index.$phpEx"; + break; + case PAGE_SEARCH: + $location = $lang['Searching_forums']; + $location_url = "search.$phpEx"; + break; + case PAGE_PROFILE: + $location = $lang['Viewing_profile']; + $location_url = "index.$phpEx"; + break; + case PAGE_VIEWONLINE: + $location = $lang['Viewing_online']; + $location_url = "viewonline.$phpEx"; + break; + case PAGE_VIEWMEMBERS: + $location = $lang['Viewing_member_list']; + $location_url = "memberlist.$phpEx"; + break; + case PAGE_PRIVMSGS: + $location = $lang['Viewing_priv_msgs']; + $location_url = "privmsg.$phpEx"; + break; + case PAGE_FAQ: + $location = $lang['Viewing_FAQ']; + $location_url = "faq.$phpEx"; + break; + default: + $location = $lang['Forum_index']; + $location_url = "index.$phpEx"; + } + } + else + { + $location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $row['session_page']); + $location = $forum_data[$row['session_page']]; + } + + $row_color = ( $$which_counter % 2 ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( $$which_counter % 2 ) ? $theme['td_class1'] : $theme['td_class2']; + + $template->assign_block_vars("$which_row", array( + 'ROW_COLOR' => '#' . $row_color, + 'ROW_CLASS' => $row_class, + 'USERNAME' => $username, + 'LASTUPDATE' => create_date($board_config['default_dateformat'], $row['session_time'], $board_config['board_timezone']), + 'FORUM_LOCATION' => $location, + + 'U_USER_PROFILE' => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $user_id), + 'U_FORUM_LOCATION' => append_sid($location_url)) + ); + + $$which_counter++; } } -$db->sql_freeresult($result); -// Refreshing the page every 60 seconds... -meta_refresh(60, append_sid("{$phpbb_root_path}viewonline.$phpEx", "sg=$show_guests&sk=$sort_key&sd=$sort_dir&start=$start")); +if( $registered_users == 0 ) +{ + $l_r_user_s = $lang['Reg_users_zero_online']; +} +else if( $registered_users == 1 ) +{ + $l_r_user_s = $lang['Reg_user_online']; +} +else +{ + $l_r_user_s = $lang['Reg_users_online']; +} + +if( $hidden_users == 0 ) +{ + $l_h_user_s = $lang['Hidden_users_zero_online']; +} +else if( $hidden_users == 1 ) +{ + $l_h_user_s = $lang['Hidden_user_online']; +} +else +{ + $l_h_user_s = $lang['Hidden_users_online']; +} + +if( $guest_users == 0 ) +{ + $l_g_user_s = $lang['Guest_users_zero_online']; +} +else if( $guest_users == 1 ) +{ + $l_g_user_s = $lang['Guest_user_online']; +} +else +{ + $l_g_user_s = $lang['Guest_users_online']; +} -// Send data to template $template->assign_vars(array( - 'TOTAL_REGISTERED_USERS_ONLINE' => sprintf($l_r_user_s, $logged_visible_online) . sprintf($l_h_user_s, $logged_hidden_online), - 'TOTAL_GUEST_USERS_ONLINE' => sprintf($l_g_user_s, $guest_counter), - 'LEGEND' => $legend, - 'PAGINATION' => $pagination, - 'PAGE_NUMBER' => on_page($counter, $config['topics_per_page'], $start), - - 'U_SORT_USERNAME' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=a&sd=' . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a') . '&sg=' . ((int) $show_guests)), - 'U_SORT_UPDATED' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=b&sd=' . (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a') . '&sg=' . ((int) $show_guests)), - 'U_SORT_LOCATION' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=c&sd=' . (($sort_key == 'c' && $sort_dir == 'a') ? 'd' : 'a') . '&sg=' . ((int) $show_guests)), - - 'U_SWITCH_GUEST_DISPLAY' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sg=' . ((int) !$show_guests)), - 'L_SWITCH_GUEST_DISPLAY' => ($show_guests) ? $user->lang['HIDE_GUESTS'] : $user->lang['DISPLAY_GUESTS'], - 'S_SWITCH_GUEST_DISPLAY' => ($config['load_online_guests']) ? true : false) + 'TOTAL_REGISTERED_USERS_ONLINE' => sprintf($l_r_user_s, $registered_users) . sprintf($l_h_user_s, $hidden_users), + 'TOTAL_GUEST_USERS_ONLINE' => sprintf($l_g_user_s, $guest_users)) ); -// We do not need to load the who is online box here. ;) -$config['load_online'] = false; +if ( $registered_users + $hidden_users == 0 ) +{ + $template->assign_vars(array( + 'L_NO_REGISTERED_USERS_BROWSING' => $lang['No_users_browsing']) + ); +} -// Output the page -page_header($user->lang['WHO_IS_ONLINE']); +if ( $guest_users == 0 ) +{ + $template->assign_vars(array( + 'L_NO_GUESTS_BROWSING' => $lang['No_users_browsing']) + ); +} -$template->set_filenames(array( - 'body' => 'viewonline_body.html') -); -make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); +$template->pparse('body'); -page_footer(); +include($phpbb_root_path . 'includes/page_tail.'.$phpEx); ?> \ No newline at end of file diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index be94b1af31..8a0c73521d 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1,1575 +1,1214 @@ session_begin(); -$auth->acl($user->data); - -// Initial var setup -$forum_id = request_var('f', 0); -$topic_id = request_var('t', 0); -$post_id = request_var('p', 0); -$voted_id = request_var('vote_id', array('' => 0)); - -$start = request_var('start', 0); -$view = request_var('view', ''); - -$sort_days = request_var('st', ((!empty($user->data['user_post_show_days'])) ? $user->data['user_post_show_days'] : 0)); -$sort_key = request_var('sk', ((!empty($user->data['user_post_sortby_type'])) ? $user->data['user_post_sortby_type'] : 't')); -$sort_dir = request_var('sd', ((!empty($user->data['user_post_sortby_dir'])) ? $user->data['user_post_sortby_dir'] : 'a')); - -$update = request_var('update', false); - -/** -* @todo normalize? -*/ -$hilit_words = request_var('hilit', '', true); - -// Do we have a topic or post id? -if (!$topic_id && !$post_id) +// +// Start initial var setup +// +$topic_id = $post_id = 0; +if ( isset($HTTP_GET_VARS[POST_TOPIC_URL]) ) { - trigger_error('NO_TOPIC'); + $topic_id = intval($HTTP_GET_VARS[POST_TOPIC_URL]); +} +else if ( isset($HTTP_GET_VARS['topic']) ) +{ + $topic_id = intval($HTTP_GET_VARS['topic']); } -// Find topic id if user requested a newer or older topic -if ($view && !$post_id) +if ( isset($HTTP_GET_VARS[POST_POST_URL])) { - if (!$forum_id) - { - $sql = 'SELECT forum_id - FROM ' . TOPICS_TABLE . " - WHERE topic_id = $topic_id"; - $result = $db->sql_query($sql); - $forum_id = (int) $db->sql_fetchfield('forum_id'); - $db->sql_freeresult($result); + $post_id = intval($HTTP_GET_VARS[POST_POST_URL]); +} - if (!$forum_id) + +$start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0; +$start = ($start < 0) ? 0 : $start; + +if (!$topic_id && !$post_id) +{ + message_die(GENERAL_MESSAGE, 'Topic_post_not_exist'); +} + +// +// Find topic id if user requested a newer +// or older topic +// +if ( isset($HTTP_GET_VARS['view']) && empty($HTTP_GET_VARS[POST_POST_URL]) ) +{ + if ( $HTTP_GET_VARS['view'] == 'newest' ) + { + if ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_sid']) || isset($HTTP_GET_VARS['sid']) ) { - trigger_error('NO_TOPIC'); + $session_id = isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_sid']) ? $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_sid'] : $HTTP_GET_VARS['sid']; + + if (!preg_match('/^[A-Za-z0-9]*$/', $session_id)) + { + $session_id = ''; + } + + if ( $session_id ) + { + $sql = "SELECT p.post_id + FROM " . POSTS_TABLE . " p, " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u + WHERE s.session_id = '$session_id' + AND u.user_id = s.session_user_id + AND p.topic_id = $topic_id + AND p.post_time >= u.user_lastvisit + ORDER BY p.post_time ASC + LIMIT 1"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, 'Could not obtain newer/older topic information', '', __LINE__, __FILE__, $sql); + } + + if ( !($row = $db->sql_fetchrow($result)) ) + { + message_die(GENERAL_MESSAGE, 'No_new_posts_last_visit'); + } + + $post_id = $row['post_id']; + + if (isset($HTTP_GET_VARS['sid'])) + { + redirect("viewtopic.$phpEx?sid=$session_id&" . POST_POST_URL . "=$post_id#$post_id"); + } + else + { + redirect("viewtopic.$phpEx?" . POST_POST_URL . "=$post_id#$post_id"); + } + } } + + redirect(append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id", true)); } - - if ($view == 'unread') + else if ( $HTTP_GET_VARS['view'] == 'next' || $HTTP_GET_VARS['view'] == 'previous' ) { - // Get topic tracking info - $topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_id); + $sql_condition = ( $HTTP_GET_VARS['view'] == 'next' ) ? '>' : '<'; + $sql_ordering = ( $HTTP_GET_VARS['view'] == 'next' ) ? 'ASC' : 'DESC'; - $topic_last_read = (isset($topic_tracking_info[$topic_id])) ? $topic_tracking_info[$topic_id] : 0; - - $sql = 'SELECT post_id, topic_id, forum_id - FROM ' . POSTS_TABLE . " - WHERE topic_id = $topic_id - " . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND post_approved = 1') . " - AND post_time > $topic_last_read - ORDER BY post_time ASC"; - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) + $sql = "SELECT t.topic_id + FROM " . TOPICS_TABLE . " t, " . TOPICS_TABLE . " t2 + WHERE + t2.topic_id = $topic_id + AND t.forum_id = t2.forum_id + AND t.topic_moved_id = 0 + AND t.topic_last_post_id $sql_condition t2.topic_last_post_id + ORDER BY t.topic_last_post_id $sql_ordering + LIMIT 1"; + if ( !($result = $db->sql_query($sql)) ) { - $sql = 'SELECT topic_last_post_id as post_id, topic_id, forum_id - FROM ' . TOPICS_TABLE . ' - WHERE topic_id = ' . $topic_id; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); + message_die(GENERAL_ERROR, "Could not obtain newer/older topic information", '', __LINE__, __FILE__, $sql); } - if (!$row) + if ( $row = $db->sql_fetchrow($result) ) { - // Setup user environment so we can process lang string - $user->setup('viewtopic'); - - trigger_error('NO_TOPIC'); - } - - $post_id = $row['post_id']; - $topic_id = $row['topic_id']; - } - else if ($view == 'next' || $view == 'previous') - { - $sql_condition = ($view == 'next') ? '>' : '<'; - $sql_ordering = ($view == 'next') ? 'ASC' : 'DESC'; - - $sql = 'SELECT forum_id, topic_last_post_time - FROM ' . TOPICS_TABLE . ' - WHERE topic_id = ' . $topic_id; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - $user->setup('viewtopic'); - // OK, the topic doesn't exist. This error message is not helpful, but technically correct. - trigger_error(($view == 'next') ? 'NO_NEWER_TOPICS' : 'NO_OLDER_TOPICS'); + $topic_id = intval($row['topic_id']); } else { - $sql = 'SELECT topic_id, forum_id - FROM ' . TOPICS_TABLE . ' - WHERE forum_id = ' . $row['forum_id'] . " - AND topic_moved_id = 0 - AND topic_last_post_time $sql_condition {$row['topic_last_post_time']} - " . (($auth->acl_get('m_approve', $row['forum_id'])) ? '' : 'AND topic_approved = 1') . " - ORDER BY topic_last_post_time $sql_ordering"; - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - $user->setup('viewtopic'); - trigger_error(($view == 'next') ? 'NO_NEWER_TOPICS' : 'NO_OLDER_TOPICS'); - } - else - { - $topic_id = $row['topic_id']; - - // Check for global announcement correctness? - if (!$row['forum_id'] && !$forum_id) - { - trigger_error('NO_TOPIC'); - } - else if ($row['forum_id']) - { - $forum_id = $row['forum_id']; - } - } + $message = ( $HTTP_GET_VARS['view'] == 'next' ) ? 'No_newer_topics' : 'No_older_topics'; + message_die(GENERAL_MESSAGE, $message); } } - - // Check for global announcement correctness? - if ((!isset($row) || !$row['forum_id']) && !$forum_id) - { - trigger_error('NO_TOPIC'); - } - else if (isset($row) && $row['forum_id']) - { - $forum_id = $row['forum_id']; - } } +// // This rather complex gaggle of code handles querying for topics but // also allows for direct linking to a post (and the calculation of which // page the post is on and the correct display of viewtopic) -$sql_array = array( - 'SELECT' => 't.*, f.*', +// +$join_sql_table = (!$post_id) ? '' : ", " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2 "; +$join_sql = (!$post_id) ? "t.topic_id = $topic_id" : "p.post_id = $post_id AND t.topic_id = p.topic_id AND p2.topic_id = p.topic_id AND p2.post_id <= $post_id"; +$count_sql = (!$post_id) ? '' : ", COUNT(p2.post_id) AS prev_posts"; - 'FROM' => array( - FORUMS_TABLE => 'f', - ) -); +$order_sql = (!$post_id) ? '' : "GROUP BY p.post_id, t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, t.topic_last_post_id, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments ORDER BY p.post_id ASC"; -if ($user->data['is_registered']) +$sql = "SELECT t.topic_id, t.topic_title, t.topic_status, t.topic_replies, t.topic_time, t.topic_type, t.topic_vote, t.topic_last_post_id, f.forum_name, f.forum_status, f.forum_id, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_pollcreate, f.auth_vote, f.auth_attachments" . $count_sql . " + FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f" . $join_sql_table . " + WHERE $join_sql + AND f.forum_id = t.forum_id + $order_sql"; +if ( !($result = $db->sql_query($sql)) ) { - $sql_array['SELECT'] .= ', tw.notify_status'; - $sql_array['LEFT_JOIN'] = array(); + message_die(GENERAL_ERROR, "Could not obtain topic information", '', __LINE__, __FILE__, $sql); +} - $sql_array['LEFT_JOIN'][] = array( - 'FROM' => array(TOPICS_WATCH_TABLE => 'tw'), - 'ON' => 'tw.user_id = ' . $user->data['user_id'] . ' AND t.topic_id = tw.topic_id' - ); +if ( !($forum_topic_data = $db->sql_fetchrow($result)) ) +{ + message_die(GENERAL_MESSAGE, 'Topic_post_not_exist'); +} - if ($config['allow_bookmarks']) +$forum_id = intval($forum_topic_data['forum_id']); + +// +// Start session management +// +$userdata = session_pagestart($user_ip, $forum_id); +init_userprefs($userdata); +// +// End session management +// + +// +// Start auth check +// +$is_auth = array(); +$is_auth = auth(AUTH_ALL, $forum_id, $userdata, $forum_topic_data); + +if( !$is_auth['auth_view'] || !$is_auth['auth_read'] ) +{ + if ( !$userdata['session_logged_in'] ) { - $sql_array['SELECT'] .= ', bm.topic_id as bookmarked'; - $sql_array['LEFT_JOIN'][] = array( - 'FROM' => array(BOOKMARKS_TABLE => 'bm'), - 'ON' => 'bm.user_id = ' . $user->data['user_id'] . ' AND t.topic_id = bm.topic_id' - ); + $redirect = ($post_id) ? POST_POST_URL . "=$post_id" : POST_TOPIC_URL . "=$topic_id"; + $redirect .= ($start) ? "&start=$start" : ''; + redirect(append_sid("login.$phpEx?redirect=viewtopic.$phpEx&$redirect", true)); } - if ($config['load_db_lastread']) - { - $sql_array['SELECT'] .= ', tt.mark_time, ft.mark_time as forum_mark_time'; + $message = ( !$is_auth['auth_view'] ) ? $lang['Topic_post_not_exist'] : sprintf($lang['Sorry_auth_read'], $is_auth['auth_read_type']); - $sql_array['LEFT_JOIN'][] = array( - 'FROM' => array(TOPICS_TRACK_TABLE => 'tt'), - 'ON' => 'tt.user_id = ' . $user->data['user_id'] . ' AND t.topic_id = tt.topic_id' - ); - - $sql_array['LEFT_JOIN'][] = array( - 'FROM' => array(FORUMS_TRACK_TABLE => 'ft'), - 'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND t.forum_id = ft.forum_id' - ); - } + message_die(GENERAL_MESSAGE, $message); } +// +// End auth check +// -if (!$post_id) -{ - $sql_array['WHERE'] = "t.topic_id = $topic_id"; -} -else -{ - $sql_array['WHERE'] = "p.post_id = $post_id AND t.topic_id = p.topic_id" . ((!$auth->acl_get('m_approve', $forum_id)) ? ' AND p.post_approved = 1' : ''); - $sql_array['FROM'][POSTS_TABLE] = 'p'; -} +$forum_name = $forum_topic_data['forum_name']; +$topic_title = $forum_topic_data['topic_title']; +$topic_id = intval($forum_topic_data['topic_id']); +$topic_time = $forum_topic_data['topic_time']; -$sql_array['WHERE'] .= ' AND (f.forum_id = t.forum_id'; - -if (!$forum_id) -{ - // If it is a global announcement make sure to set the forum id to a postable forum - $sql_array['WHERE'] .= ' OR (t.topic_type = ' . POST_GLOBAL . ' - AND f.forum_type = ' . FORUM_POST . ')'; -} -else -{ - $sql_array['WHERE'] .= ' OR (t.topic_type = ' . POST_GLOBAL . " - AND f.forum_id = $forum_id)"; -} - -$sql_array['WHERE'] .= ')'; -$sql_array['FROM'][TOPICS_TABLE] = 't'; - -// Join to forum table on topic forum_id unless topic forum_id is zero -// whereupon we join on the forum_id passed as a parameter ... this -// is done so navigation, forum name, etc. remain consistent with where -// user clicked to view a global topic -$sql = $db->sql_build_query('SELECT', $sql_array); -$result = $db->sql_query($sql); -$topic_data = $db->sql_fetchrow($result); -$db->sql_freeresult($result); - -if (!$topic_data) -{ - // If post_id was submitted, we try at least to display the topic as a last resort... - if ($post_id && $forum_id && $topic_id) - { - redirect(append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id")); - } - - trigger_error('NO_TOPIC'); -} - -// This is for determining where we are (page) if ($post_id) { - if ($post_id == $topic_data['topic_first_post_id'] || $post_id == $topic_data['topic_last_post_id']) - { - $check_sort = ($post_id == $topic_data['topic_first_post_id']) ? 'd' : 'a'; + $start = floor(($forum_topic_data['prev_posts'] - 1) / intval($board_config['posts_per_page'])) * intval($board_config['posts_per_page']); +} - if ($sort_dir == $check_sort) +// +// Is user watching this thread? +// +if( $userdata['session_logged_in'] ) +{ + $can_watch_topic = TRUE; + + $sql = "SELECT notify_status + FROM " . TOPICS_WATCH_TABLE . " + WHERE topic_id = $topic_id + AND user_id = " . $userdata['user_id']; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Could not obtain topic watch information", '', __LINE__, __FILE__, $sql); + } + + if ( $row = $db->sql_fetchrow($result) ) + { + if ( isset($HTTP_GET_VARS['unwatch']) ) { - $topic_data['prev_posts'] = ($auth->acl_get('m_approve', $forum_id)) ? $topic_data['topic_replies_real'] : $topic_data['topic_replies']; + if ( $HTTP_GET_VARS['unwatch'] == 'topic' ) + { + $is_watching_topic = 0; + + $sql_priority = (SQL_LAYER == "mysql") ? "LOW_PRIORITY" : ''; + $sql = "DELETE $sql_priority FROM " . TOPICS_WATCH_TABLE . " + WHERE topic_id = $topic_id + AND user_id = " . $userdata['user_id']; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Could not delete topic watch information", '', __LINE__, __FILE__, $sql); + } + } + + $template->assign_vars(array( + 'META' => '') + ); + + $message = $lang['No_longer_watching'] . '

      ' . sprintf($lang['Click_return_topic'], '', ''); + message_die(GENERAL_MESSAGE, $message); } else { - $topic_data['prev_posts'] = 0; + $is_watching_topic = TRUE; + + if ( $row['notify_status'] ) + { + $sql_priority = (SQL_LAYER == "mysql") ? "LOW_PRIORITY" : ''; + $sql = "UPDATE $sql_priority " . TOPICS_WATCH_TABLE . " + SET notify_status = 0 + WHERE topic_id = $topic_id + AND user_id = " . $userdata['user_id']; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Could not update topic watch information", '', __LINE__, __FILE__, $sql); + } + } } } else { - $sql = 'SELECT COUNT(p1.post_id) AS prev_posts - FROM ' . POSTS_TABLE . ' p1, ' . POSTS_TABLE . " p2 - WHERE p1.topic_id = {$topic_data['topic_id']} - AND p2.post_id = {$post_id} - " . ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND p1.post_approved = 1' : '') . ' - AND ' . (($sort_dir == 'd') ? 'p1.post_time >= p2.post_time' : 'p1.post_time <= p2.post_time'); + if ( isset($HTTP_GET_VARS['watch']) ) + { + if ( $HTTP_GET_VARS['watch'] == 'topic' ) + { + $is_watching_topic = TRUE; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); + $sql_priority = (SQL_LAYER == "mysql") ? "LOW_PRIORITY" : ''; + $sql = "INSERT $sql_priority INTO " . TOPICS_WATCH_TABLE . " (user_id, topic_id, notify_status) + VALUES (" . $userdata['user_id'] . ", $topic_id, 0)"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Could not insert topic watch information", '', __LINE__, __FILE__, $sql); + } + } - $topic_data['prev_posts'] = $row['prev_posts'] - 1; + $template->assign_vars(array( + 'META' => '') + ); + + $message = $lang['You_are_watching'] . '

      ' . sprintf($lang['Click_return_topic'], '', ''); + message_die(GENERAL_MESSAGE, $message); + } + else + { + $is_watching_topic = 0; + } + } +} +else +{ + if ( isset($HTTP_GET_VARS['unwatch']) ) + { + if ( $HTTP_GET_VARS['unwatch'] == 'topic' ) + { + redirect(append_sid("login.$phpEx?redirect=viewtopic.$phpEx&" . POST_TOPIC_URL . "=$topic_id&unwatch=topic", true)); + } + } + else + { + $can_watch_topic = 0; + $is_watching_topic = 0; } } - -$forum_id = (int) $topic_data['forum_id']; -$topic_id = (int) $topic_data['topic_id']; // -$topic_replies = ($auth->acl_get('m_approve', $forum_id)) ? $topic_data['topic_replies_real'] : $topic_data['topic_replies']; +// Generate a 'Show posts in previous x days' select box. If the postdays var is POSTed +// then get it's value, find the number of topics with dates newer than it (to properly +// handle pagination) and alter the main query +// +$previous_days = array(0, 1, 7, 14, 30, 90, 180, 364); +$previous_days_text = array($lang['All_Posts'], $lang['1_Day'], $lang['7_Days'], $lang['2_Weeks'], $lang['1_Month'], $lang['3_Months'], $lang['6_Months'], $lang['1_Year']); -// Check sticky/announcement time limit -if (($topic_data['topic_type'] == POST_STICKY || $topic_data['topic_type'] == POST_ANNOUNCE) && $topic_data['topic_time_limit'] && ($topic_data['topic_time'] + $topic_data['topic_time_limit']) < time()) +if( !empty($HTTP_POST_VARS['postdays']) || !empty($HTTP_GET_VARS['postdays']) ) { - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET topic_type = ' . POST_NORMAL . ', topic_time_limit = 0 - WHERE topic_id = ' . $topic_id; - $db->sql_query($sql); + $post_days = ( !empty($HTTP_POST_VARS['postdays']) ) ? intval($HTTP_POST_VARS['postdays']) : intval($HTTP_GET_VARS['postdays']); + $min_post_time = time() - (intval($post_days) * 86400); - $topic_data['topic_type'] = POST_NORMAL; - $topic_data['topic_time_limit'] = 0; -} - -// Setup look and feel -$user->setup('viewtopic', $topic_data['forum_style']); - -if (!$topic_data['topic_approved'] && !$auth->acl_get('m_approve', $forum_id)) -{ - trigger_error('NO_TOPIC'); -} - -// Start auth check -if (!$auth->acl_get('f_read', $forum_id)) -{ - if ($user->data['user_id'] != ANONYMOUS) + $sql = "SELECT COUNT(p.post_id) AS num_posts + FROM " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p + WHERE t.topic_id = $topic_id + AND p.topic_id = t.topic_id + AND p.post_time >= $min_post_time"; + if ( !($result = $db->sql_query($sql)) ) { - trigger_error('SORRY_AUTH_READ'); + message_die(GENERAL_ERROR, "Could not obtain limited topics count information", '', __LINE__, __FILE__, $sql); } - login_box('', $user->lang['LOGIN_VIEWFORUM']); -} - -// Forum is passworded ... check whether access has been granted to this -// user this session, if not show login box -if ($topic_data['forum_password']) -{ - login_forum_box($topic_data); -} - -// Redirect to login or to the correct post upon emailed notification links -if (isset($_GET['e'])) -{ - $jump_to = request_var('e', 0); - - $redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id"); - - if ($user->data['user_id'] == ANONYMOUS) - { - login_box($redirect_url . "&p=$post_id&e=$jump_to", $user->lang['LOGIN_NOTIFY_TOPIC']); - } - - if ($jump_to > 0) - { - // We direct the already logged in user to the correct post... - redirect($redirect_url . ((!$post_id) ? "&p=$jump_to" : "&p=$post_id") . "#p$jump_to"); - } -} - -// What is start equal to? -if ($post_id) -{ - $start = floor(($topic_data['prev_posts']) / $config['posts_per_page']) * $config['posts_per_page']; -} - -// Get topic tracking info -if (!isset($topic_tracking_info)) -{ - $topic_tracking_info = array(); - - // Get topic tracking info - if ($config['load_db_lastread'] && $user->data['is_registered']) - { - $tmp_topic_data = array($topic_id => $topic_data); - $topic_tracking_info = get_topic_tracking($forum_id, $topic_id, $tmp_topic_data, array($forum_id => $topic_data['forum_mark_time'])); - unset($tmp_topic_data); - } - else if ($config['load_anon_lastread'] || $user->data['is_registered']) - { - $topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_id); - } -} - -// Post ordering options -$limit_days = array(0 => $user->lang['ALL_POSTS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 365 => $user->lang['1_YEAR']); - -$sort_by_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']); -$sort_by_sql = array('a' => 'u.username_clean', 't' => 'p.post_time', 's' => 'p.post_subject'); - -$s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = ''; -gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); - -// Obtain correct post count and ordering SQL if user has -// requested anything different -if ($sort_days) -{ - $min_post_time = time() - ($sort_days * 86400); - - $sql = 'SELECT COUNT(post_id) AS num_posts - FROM ' . POSTS_TABLE . " - WHERE topic_id = $topic_id - AND post_time >= $min_post_time - " . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND post_approved = 1'); - $result = $db->sql_query($sql); - $total_posts = (int) $db->sql_fetchfield('num_posts'); - $db->sql_freeresult($result); + $total_replies = ( $row = $db->sql_fetchrow($result) ) ? intval($row['num_posts']) : 0; $limit_posts_time = "AND p.post_time >= $min_post_time "; - if (isset($_POST['sort'])) + if ( !empty($HTTP_POST_VARS['postdays'])) { $start = 0; } } else { - $total_posts = $topic_replies + 1; + $total_replies = intval($forum_topic_data['topic_replies']) + 1; + $limit_posts_time = ''; + $post_days = 0; } -// Was a highlight request part of the URI? -$highlight_match = $highlight = ''; -if ($hilit_words) +$select_post_days = ''; -// Make sure $start is set to the last page if it exceeds the amount -if ($start < 0 || $start > $total_posts) +// +// Decide how to order the post display +// +if ( !empty($HTTP_POST_VARS['postorder']) || !empty($HTTP_GET_VARS['postorder']) ) { - $start = ($start < 0) ? 0 : floor(($total_posts - 1) / $config['posts_per_page']) * $config['posts_per_page']; -} - -// General Viewtopic URL for return links -$viewtopic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&start=$start&$u_sort_param" . (($highlight_match) ? "&hilit=$highlight" : '')); - -// Are we watching this topic? -$s_watching_topic = array( - 'link' => '', - 'title' => '', - 'is_watching' => false, -); - -if ($config['email_enable'] && $config['allow_topic_notify'] && $user->data['is_registered']) -{ - watch_topic_forum('topic', $s_watching_topic, $user->data['user_id'], $forum_id, $topic_id, $topic_data['notify_status'], $start); -} - -// Bookmarks -if ($config['allow_bookmarks'] && $user->data['is_registered'] && request_var('bookmark', 0)) -{ - if (!$topic_data['bookmarked']) - { - $sql = 'INSERT INTO ' . BOOKMARKS_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'user_id' => $user->data['user_id'], - 'topic_id' => $topic_id, - )); - $db->sql_query($sql); - } - else - { - $sql = 'DELETE FROM ' . BOOKMARKS_TABLE . " - WHERE user_id = {$user->data['user_id']} - AND topic_id = $topic_id"; - $db->sql_query($sql); - } - - meta_refresh(3, $viewtopic_url); - - $message = (($topic_data['bookmarked']) ? $user->lang['BOOKMARK_REMOVED'] : $user->lang['BOOKMARK_ADDED']) . '

      ' . sprintf($user->lang['RETURN_TOPIC'], '', ''); - trigger_error($message); -} - -// Grab ranks -$ranks = cache::obtain_ranks(); - -// Grab icons -$icons = cache::obtain_icons(); - -// Grab extensions -$extensions = array(); -if ($topic_data['topic_attachment']) -{ - $extensions = cache::obtain_attach_extensions($forum_id); -} - -// Forum rules listing -$s_forum_rules = ''; -gen_forum_auth_level('topic', $forum_id, $topic_data['forum_status']); - -// Quick mod tools -$allow_change_type = ($auth->acl_get('m_', $forum_id) || ($user->data['is_registered'] && $user->data['user_id'] == $topic_data['topic_poster'])) ? true : false; - -$topic_mod = ''; -$topic_mod .= ($auth->acl_get('m_lock', $forum_id) || ($auth->acl_get('f_user_lock', $forum_id) && $user->data['is_registered'] && $user->data['user_id'] == $topic_data['topic_poster'] && $topic_data['topic_status'] == ITEM_UNLOCKED)) ? (($topic_data['topic_status'] == ITEM_UNLOCKED) ? '' : '') : ''; -$topic_mod .= ($auth->acl_get('m_delete', $forum_id)) ? '' : ''; -$topic_mod .= ($auth->acl_get('m_move', $forum_id) && $topic_data['topic_status'] != ITEM_MOVED) ? '' : ''; -$topic_mod .= ($auth->acl_get('m_split', $forum_id)) ? '' : ''; -$topic_mod .= ($auth->acl_get('m_merge', $forum_id)) ? '' : ''; -$topic_mod .= ($auth->acl_get('m_merge', $forum_id)) ? '' : ''; -$topic_mod .= ($auth->acl_get('m_move', $forum_id)) ? '' : ''; -$topic_mod .= ($allow_change_type && $auth->acl_gets('f_sticky', 'f_announce', $forum_id) && $topic_data['topic_type'] != POST_NORMAL) ? '' : ''; -$topic_mod .= ($allow_change_type && $auth->acl_get('f_sticky', $forum_id) && $topic_data['topic_type'] != POST_STICKY) ? '' : ''; -$topic_mod .= ($allow_change_type && $auth->acl_get('f_announce', $forum_id) && $topic_data['topic_type'] != POST_ANNOUNCE) ? '' : ''; -$topic_mod .= ($allow_change_type && $auth->acl_get('f_announce', $forum_id) && $topic_data['topic_type'] != POST_GLOBAL) ? '' : ''; -$topic_mod .= ($auth->acl_get('m_', $forum_id)) ? '' : ''; - -// If we've got a hightlight set pass it on to pagination. -$pagination = generate_pagination(append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&$u_sort_param" . (($highlight_match) ? "&hilit=$highlight" : '')), $total_posts, $config['posts_per_page'], $start); - -// Navigation links -generate_forum_nav($topic_data); - -// Forum Rules -generate_forum_rules($topic_data); - -// Moderators -$forum_moderators = array(); -get_moderators($forum_moderators, $forum_id); - -// This is only used for print view so ... -$server_path = (!$view) ? $phpbb_root_path : generate_board_url() . '/'; - -// Replace naughty words in title -$topic_data['topic_title'] = censor_text($topic_data['topic_title']); - -// Send vars to template -$template->assign_vars(array( - 'FORUM_ID' => $forum_id, - 'FORUM_NAME' => $topic_data['forum_name'], - 'FORUM_DESC' => generate_text_for_display($topic_data['forum_desc'], $topic_data['forum_desc_uid'], $topic_data['forum_desc_bitfield'], $topic_data['forum_desc_options']), - 'TOPIC_ID' => $topic_id, - 'TOPIC_TITLE' => $topic_data['topic_title'], - 'TOPIC_POSTER' => $topic_data['topic_poster'], - - 'TOPIC_AUTHOR_FULL' => get_username_string('full', $topic_data['topic_poster'], $topic_data['topic_first_poster_name'], $topic_data['topic_first_poster_colour']), - 'TOPIC_AUTHOR_COLOUR' => get_username_string('colour', $topic_data['topic_poster'], $topic_data['topic_first_poster_name'], $topic_data['topic_first_poster_colour']), - 'TOPIC_AUTHOR' => get_username_string('username', $topic_data['topic_poster'], $topic_data['topic_first_poster_name'], $topic_data['topic_first_poster_colour']), - - 'PAGINATION' => $pagination, - 'PAGE_NUMBER' => on_page($total_posts, $config['posts_per_page'], $start), - 'TOTAL_POSTS' => ($total_posts == 1) ? $user->lang['VIEW_TOPIC_POST'] : sprintf($user->lang['VIEW_TOPIC_POSTS'], $total_posts), - 'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=topic_view&f=$forum_id&t=$topic_id&start=$start&$u_sort_param", true, $user->session_id) : '', - 'MODERATORS' => (isset($forum_moderators[$forum_id]) && sizeof($forum_moderators[$forum_id])) ? implode(', ', $forum_moderators[$forum_id]) : '', - - 'POST_IMG' => ($topic_data['forum_status'] == ITEM_LOCKED) ? $user->img('button_topic_locked', 'FORUM_LOCKED') : $user->img('button_topic_new', 'POST_NEW_TOPIC'), - 'QUOTE_IMG' => $user->img('icon_post_quote', 'REPLY_WITH_QUOTE'), - 'REPLY_IMG' => ($topic_data['forum_status'] == ITEM_LOCKED || $topic_data['topic_status'] == ITEM_LOCKED) ? $user->img('button_topic_locked', 'TOPIC_LOCKED') : $user->img('button_topic_reply', 'REPLY_TO_TOPIC'), - 'EDIT_IMG' => $user->img('icon_post_edit', 'EDIT_POST'), - 'DELETE_IMG' => $user->img('icon_post_delete', 'DELETE_POST'), - 'INFO_IMG' => $user->img('icon_post_info', 'VIEW_INFO'), - 'PROFILE_IMG' => $user->img('icon_user_profile', 'READ_PROFILE'), - 'SEARCH_IMG' => $user->img('icon_user_search', 'SEARCH_USER_POSTS'), - 'PM_IMG' => $user->img('icon_contact_pm', 'SEND_PRIVATE_MESSAGE'), - 'EMAIL_IMG' => $user->img('icon_contact_email', 'SEND_EMAIL'), - 'WWW_IMG' => $user->img('icon_contact_www', 'VISIT_WEBSITE'), - 'ICQ_IMG' => $user->img('icon_contact_icq', 'ICQ'), - 'AIM_IMG' => $user->img('icon_contact_aim', 'AIM'), - 'MSN_IMG' => $user->img('icon_contact_msnm', 'MSNM'), - 'YIM_IMG' => $user->img('icon_contact_yahoo', 'YIM'), - 'JABBER_IMG' => $user->img('icon_contact_jabber', 'JABBER') , - 'REPORT_IMG' => $user->img('icon_post_report', 'REPORT_POST'), - 'REPORTED_IMG' => $user->img('icon_topic_reported', 'POST_REPORTED'), - 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'POST_UNAPPROVED'), - 'WARN_IMG' => $user->img('icon_user_warn', 'WARN_USER'), - - 'S_IS_LOCKED' =>($topic_data['topic_status'] == ITEM_UNLOCKED) ? false : true, - 'S_SELECT_SORT_DIR' => $s_sort_dir, - 'S_SELECT_SORT_KEY' => $s_sort_key, - 'S_SELECT_SORT_DAYS' => $s_limit_days, - 'S_SINGLE_MODERATOR' => (!empty($forum_moderators[$forum_id]) && sizeof($forum_moderators[$forum_id]) > 1) ? false : true, - 'S_TOPIC_ACTION' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&start=$start"), - 'S_TOPIC_MOD' => ($topic_mod != '') ? '' : '', - 'S_MOD_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&t=$topic_id&quickmod=1&redirect=" . urlencode(str_replace('&', '&', $viewtopic_url)), true, $user->session_id), - - 'S_VIEWTOPIC' => true, - 'S_DISPLAY_SEARCHBOX' => ($auth->acl_get('u_search') && $auth->acl_get('f_search', $forum_id) && $config['load_search']) ? true : false, - 'S_SEARCHBOX_ACTION' => append_sid("{$phpbb_root_path}search.$phpEx", 't=' . $topic_id), - - 'S_DISPLAY_POST_INFO' => ($topic_data['forum_type'] == FORUM_POST && ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS)) ? true : false, - 'S_DISPLAY_REPLY_INFO' => ($topic_data['forum_type'] == FORUM_POST && ($auth->acl_get('f_reply', $forum_id) || $user->data['user_id'] == ANONYMOUS)) ? true : false, - - 'U_TOPIC' => "{$server_path}viewtopic.$phpEx?f=$forum_id&t=$topic_id", - 'U_FORUM' => $server_path, - 'U_VIEW_TOPIC' => $viewtopic_url, - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id), - 'U_VIEW_OLDER_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&view=previous"), - 'U_VIEW_NEWER_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&view=next"), - 'U_PRINT_TOPIC' => ($auth->acl_get('f_print', $forum_id)) ? $viewtopic_url . '&view=print' : '', - 'U_EMAIL_TOPIC' => ($auth->acl_get('f_email', $forum_id) && $config['email_enable']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=email&t=$topic_id") : '', - - 'U_WATCH_TOPIC' => $s_watching_topic['link'], - 'L_WATCH_TOPIC' => $s_watching_topic['title'], - 'S_WATCHING_TOPIC' => $s_watching_topic['is_watching'], - - 'U_BOOKMARK_TOPIC' => ($user->data['is_registered'] && $config['allow_bookmarks']) ? $viewtopic_url . '&bookmark=1' : '', - 'L_BOOKMARK_TOPIC' => ($user->data['is_registered'] && $config['allow_bookmarks'] && $topic_data['bookmarked']) ? $user->lang['BOOKMARK_TOPIC_REMOVE'] : $user->lang['BOOKMARK_TOPIC'], - - 'U_POST_NEW_TOPIC' => ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=post&f=$forum_id") : '', - 'U_POST_REPLY_TOPIC' => ($auth->acl_get('f_reply', $forum_id) || $user->data['user_id'] == ANONYMOUS) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=reply&f=$forum_id&t=$topic_id") : '', - 'U_BUMP_TOPIC' => (bump_topic_allowed($forum_id, $topic_data['topic_bumped'], $topic_data['topic_last_post_time'], $topic_data['topic_poster'], $topic_data['topic_last_poster_id'])) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=bump&f=$forum_id&t=$topic_id") : '') -); - -// Does this topic contain a poll? -if (!empty($topic_data['poll_start'])) -{ - $sql = 'SELECT o.*, p.bbcode_bitfield, p.bbcode_uid - FROM ' . POLL_OPTIONS_TABLE . ' o, ' . POSTS_TABLE . " p - WHERE o.topic_id = $topic_id - AND p.post_id = {$topic_data['topic_first_post_id']} - AND p.topic_id = o.topic_id - ORDER BY o.poll_option_id"; - $result = $db->sql_query($sql); - - $poll_info = array(); - while ($row = $db->sql_fetchrow($result)) - { - $poll_info[] = $row; - } - $db->sql_freeresult($result); - - $cur_voted_id = array(); - if ($user->data['is_registered']) - { - $sql = 'SELECT poll_option_id - FROM ' . POLL_VOTES_TABLE . ' - WHERE topic_id = ' . $topic_id . ' - AND vote_user_id = ' . $user->data['user_id']; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $cur_voted_id[] = $row['poll_option_id']; - } - $db->sql_freeresult($result); - } - else - { - // Cookie based guest tracking ... I don't like this but hum ho - // it's oft requested. This relies on "nice" users who don't feel - // the need to delete cookies to mess with results. - if (isset($_COOKIE[$config['cookie_name'] . '_poll_' . $topic_id])) - { - $cur_voted_id = explode(',', $_COOKIE[$config['cookie_name'] . '_poll_' . $topic_id]); - $cur_voted_id = array_map('intval', $cur_voted_id); - } - } - - $s_can_vote = (((!sizeof($cur_voted_id) && $auth->acl_get('f_vote', $forum_id)) || - ($auth->acl_get('f_votechg', $forum_id) && $topic_data['poll_vote_change'])) && - (($topic_data['poll_length'] != 0 && $topic_data['poll_start'] + $topic_data['poll_length'] > time()) || $topic_data['poll_length'] == 0) && - $topic_data['topic_status'] != ITEM_LOCKED && - $topic_data['forum_status'] != ITEM_LOCKED) ? true : false; - $s_display_results = (!$s_can_vote || ($s_can_vote && sizeof($cur_voted_id)) || $view == 'viewpoll') ? true : false; - - if ($update && $s_can_vote) - { - - if (!sizeof($voted_id) || sizeof($voted_id) > $topic_data['poll_max_options'] || in_array(VOTE_CONVERTED, $cur_voted_id)) - { - $redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&start=$start"); - - meta_refresh(5, $redirect_url); - if (!sizeof($voted_id)) - { - $message = 'NO_VOTE_OPTION'; - } - else if (sizeof($voted_id) > $topic_data['poll_max_options']) - { - $message = 'TOO_MANY_VOTE_OPTIONS'; - } - else - { - $message = 'VOTE_CONVERTED'; - } - - $message = $user->lang[$message] . '

      ' . sprintf($user->lang['RETURN_TOPIC'], '', ''); - trigger_error($message); - } - - foreach ($voted_id as $option) - { - if (in_array($option, $cur_voted_id)) - { - continue; - } - - $sql = 'UPDATE ' . POLL_OPTIONS_TABLE . ' - SET poll_option_total = poll_option_total + 1 - WHERE poll_option_id = ' . (int) $option . ' - AND topic_id = ' . (int) $topic_id; - $db->sql_query($sql); - - if ($user->data['is_registered']) - { - $sql_ary = array( - 'topic_id' => (int) $topic_id, - 'poll_option_id' => (int) $option, - 'vote_user_id' => (int) $user->data['user_id'], - 'vote_user_ip' => (string) $user->ip, - ); - - $sql = 'INSERT INTO ' . POLL_VOTES_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - $db->sql_query($sql); - } - } - - foreach ($cur_voted_id as $option) - { - if (!in_array($option, $voted_id)) - { - $sql = 'UPDATE ' . POLL_OPTIONS_TABLE . ' - SET poll_option_total = poll_option_total - 1 - WHERE poll_option_id = ' . (int) $option . ' - AND topic_id = ' . (int) $topic_id; - $db->sql_query($sql); - - if ($user->data['is_registered']) - { - $sql = 'DELETE FROM ' . POLL_VOTES_TABLE . ' - WHERE topic_id = ' . (int) $topic_id . ' - AND poll_option_id = ' . (int) $option . ' - AND vote_user_id = ' . (int) $user->data['user_id']; - $db->sql_query($sql); - } - } - } - - if ($user->data['user_id'] == ANONYMOUS && !$user->data['is_bot']) - { - $user->set_cookie('poll_' . $topic_id, implode(',', $voted_id), time() + 31536000); - } - - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET poll_last_vote = ' . time() . " - WHERE topic_id = $topic_id"; - //, topic_last_post_time = ' . time() . " -- for bumping topics with new votes, ignore for now - $db->sql_query($sql); - - $redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&start=$start"); - - meta_refresh(5, $redirect_url); - trigger_error($user->lang['VOTE_SUBMITTED'] . '

      ' . sprintf($user->lang['RETURN_TOPIC'], '', '')); - } - - $poll_total = 0; - foreach ($poll_info as $poll_option) - { - $poll_total += $poll_option['poll_option_total']; - } - - if ($poll_info[0]['bbcode_bitfield']) - { - $poll_bbcode = new bbcode(); - } - else - { - $poll_bbcode = false; - } - - for ($i = 0, $size = sizeof($poll_info); $i < $size; $i++) - { - $poll_info[$i]['poll_option_text'] = censor_text($poll_info[$i]['poll_option_text']); - - if ($poll_bbcode !== false) - { - $poll_bbcode->bbcode_second_pass($poll_info[$i]['poll_option_text'], $poll_info[$i]['bbcode_uid'], $poll_option['bbcode_bitfield']); - } - - $poll_info[$i]['poll_option_text'] = bbcode_nl2br($poll_info[$i]['poll_option_text']); - $poll_info[$i]['poll_option_text'] = smiley_text($poll_info[$i]['poll_option_text']); - } - - $topic_data['poll_title'] = censor_text($topic_data['poll_title']); - - if ($poll_bbcode !== false) - { - $poll_bbcode->bbcode_second_pass($topic_data['poll_title'], $poll_info[0]['bbcode_uid'], $poll_info[0]['bbcode_bitfield']); - } - - $topic_data['poll_title'] = bbcode_nl2br($topic_data['poll_title']); - $topic_data['poll_title'] = smiley_text($topic_data['poll_title']); - - unset($poll_bbcode); - - foreach ($poll_info as $poll_option) - { - $option_pct = ($poll_total > 0) ? $poll_option['poll_option_total'] / $poll_total : 0; - $option_pct_txt = sprintf("%.1d%%", ($option_pct * 100)); - - $template->assign_block_vars('poll_option', array( - 'POLL_OPTION_ID' => $poll_option['poll_option_id'], - 'POLL_OPTION_CAPTION' => $poll_option['poll_option_text'], - 'POLL_OPTION_RESULT' => $poll_option['poll_option_total'], - 'POLL_OPTION_PERCENT' => $option_pct_txt, - 'POLL_OPTION_PCT' => round($option_pct * 100), - 'POLL_OPTION_IMG' => $user->img('poll_center', $option_pct_txt, round($option_pct * 250)), - 'POLL_OPTION_VOTED' => (in_array($poll_option['poll_option_id'], $cur_voted_id)) ? true : false) - ); - } - - $poll_end = $topic_data['poll_length'] + $topic_data['poll_start']; - - $template->assign_vars(array( - 'POLL_QUESTION' => $topic_data['poll_title'], - 'TOTAL_VOTES' => $poll_total, - 'POLL_LEFT_CAP_IMG' => $user->img('poll_left'), - 'POLL_RIGHT_CAP_IMG'=> $user->img('poll_right'), - - 'L_MAX_VOTES' => ($topic_data['poll_max_options'] == 1) ? $user->lang['MAX_OPTION_SELECT'] : sprintf($user->lang['MAX_OPTIONS_SELECT'], $topic_data['poll_max_options']), - 'L_POLL_LENGTH' => ($topic_data['poll_length']) ? sprintf($user->lang[($poll_end > time()) ? 'POLL_RUN_TILL' : 'POLL_ENDED_AT'], $user->format_date($poll_end)) : '', - - 'S_HAS_POLL' => true, - 'S_CAN_VOTE' => $s_can_vote, - 'S_DISPLAY_RESULTS' => $s_display_results, - 'S_IS_MULTI_CHOICE' => ($topic_data['poll_max_options'] > 1) ? true : false, - 'S_POLL_ACTION' => $viewtopic_url, - - 'U_VIEW_RESULTS' => $viewtopic_url . '&view=viewpoll') - ); - - unset($poll_end, $poll_info, $voted_id); -} - -// If the user is trying to reach the second half of the topic, fetch it starting from the end -$store_reverse = false; -$sql_limit = $config['posts_per_page']; - -if ($start > $total_posts / 2) -{ - $store_reverse = true; - - if ($start + $config['posts_per_page'] > $total_posts) - { - $sql_limit = min($config['posts_per_page'], max(1, $total_posts - $start)); - } - - // Select the sort order - $sql_sort_order = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'ASC' : 'DESC'); - $sql_start = max(0, $total_posts - $sql_limit - $start); + $post_order = (!empty($HTTP_POST_VARS['postorder'])) ? htmlspecialchars($HTTP_POST_VARS['postorder']) : htmlspecialchars($HTTP_GET_VARS['postorder']); + $post_time_order = ($post_order == "asc") ? "ASC" : "DESC"; } else { - // Select the sort order - $sql_sort_order = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC'); - $sql_start = $start; + $post_order = 'asc'; + $post_time_order = 'ASC'; } -// Container for user details, only process once -$post_list = $user_cache = $id_cache = $attachments = $attach_list = $rowset = $update_count = $post_edit_list = array(); -$has_attachments = $display_notice = false; -$bbcode_bitfield = ''; -$i = $i_total = 0; +$select_post_order = ''; +// // Go ahead and pull all data for this topic -$sql = 'SELECT p.post_id - FROM ' . POSTS_TABLE . ' p' . (($sort_by_sql[$sort_key][0] == 'u') ? ', ' . USERS_TABLE . ' u': '') . " +// +$sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, u.user_avatar_type, u.user_allowavatar, u.user_allowsmile, p.*, pt.post_text, pt.post_subject, pt.bbcode_uid + FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt WHERE p.topic_id = $topic_id - " . ((!$auth->acl_get('m_approve', $forum_id)) ? 'AND p.post_approved = 1' : '') . " - " . (($sort_by_sql[$sort_key][0] == 'u') ? 'AND u.user_id = p.poster_id': '') . " $limit_posts_time - ORDER BY $sql_sort_order"; -$result = $db->sql_query_limit($sql, $sql_limit, $sql_start); - -$i = ($store_reverse) ? $sql_limit - 1 : 0; -while ($row = $db->sql_fetchrow($result)) + AND pt.post_id = p.post_id + AND u.user_id = p.poster_id + ORDER BY p.post_time $post_time_order + LIMIT $start, ".$board_config['posts_per_page']; +if ( !($result = $db->sql_query($sql)) ) { - $post_list[$i] = $row['post_id']; - ($store_reverse) ? $i-- : $i++; -} -$db->sql_freeresult($result); - -if (!sizeof($post_list)) -{ - if ($sort_days) - { - trigger_error('NO_POSTS_TIME_FRAME'); - } - else - { - trigger_error('NO_TOPIC'); - } + message_die(GENERAL_ERROR, "Could not obtain post/user information.", '', __LINE__, __FILE__, $sql); } -// Holding maximum post time for marking topic read -// We need to grab it because we do reverse ordering sometimes -$max_post_time = 0; - -$sql = $db->sql_build_query('SELECT', array( - 'SELECT' => 'u.*, z.friend, z.foe, p.*', - - 'FROM' => array( - USERS_TABLE => 'u', - POSTS_TABLE => 'p', - ), - - 'LEFT_JOIN' => array( - array( - 'FROM' => array(ZEBRA_TABLE => 'z'), - 'ON' => 'z.user_id = ' . $user->data['user_id'] . ' AND z.zebra_id = p.poster_id' - ) - ), - - 'WHERE' => $db->sql_in_set('p.post_id', $post_list) . ' - AND u.user_id = p.poster_id' -)); - -$result = $db->sql_query($sql); - -$now = getdate(time() + $user->timezone + $user->dst - date('Z')); - -// Posts are stored in the $rowset array while $attach_list, $user_cache -// and the global bbcode_bitfield are built -while ($row = $db->sql_fetchrow($result)) +$postrow = array(); +if ($row = $db->sql_fetchrow($result)) { - // Set max_post_time - if ($row['post_time'] > $max_post_time) + do { - $max_post_time = $row['post_time']; - } - - $poster_id = $row['poster_id']; - - // Does post have an attachment? If so, add it to the list - if ($row['post_attachment'] && $config['allow_attachments']) - { - $attach_list[] = $row['post_id']; - - if ($row['post_approved']) - { - $has_attachments = true; - } - } - - $rowset[$row['post_id']] = array( - 'hide_post' => ($row['foe'] && ($view != 'show' || $post_id != $row['post_id'])) ? true : false, - - 'post_id' => $row['post_id'], - 'post_time' => $row['post_time'], - 'user_id' => $row['user_id'], - 'username' => $row['username'], - 'user_colour' => $row['user_colour'], - 'topic_id' => $row['topic_id'], - 'forum_id' => $row['forum_id'], - 'post_subject' => $row['post_subject'], - 'post_edit_count' => $row['post_edit_count'], - 'post_edit_time' => $row['post_edit_time'], - 'post_edit_reason' => $row['post_edit_reason'], - 'post_edit_user' => $row['post_edit_user'], - - // Make sure the icon actually exists - 'icon_id' => (isset($icons[$row['icon_id']]['img'], $icons[$row['icon_id']]['height'], $icons[$row['icon_id']]['width'])) ? $row['icon_id'] : 0, - 'post_attachment' => $row['post_attachment'], - 'post_approved' => $row['post_approved'], - 'post_reported' => $row['post_reported'], - 'post_username' => $row['post_username'], - 'post_text' => $row['post_text'], - 'bbcode_uid' => $row['bbcode_uid'], - 'bbcode_bitfield' => $row['bbcode_bitfield'], - 'enable_smilies' => $row['enable_smilies'], - 'enable_sig' => $row['enable_sig'], - 'friend' => $row['friend'], - 'foe' => $row['foe'], - ); - - // Define the global bbcode bitfield, will be used to load bbcodes - $bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']); - - // Is a signature attached? Are we going to display it? - if ($row['enable_sig'] && $config['allow_sig'] && $user->optionget('viewsigs')) - { - $bbcode_bitfield = $bbcode_bitfield | base64_decode($row['user_sig_bbcode_bitfield']); - } - - // Cache various user specific data ... so we don't have to recompute - // this each time the same user appears on this page - if (!isset($user_cache[$poster_id])) - { - if ($poster_id == ANONYMOUS) - { - $user_cache[$poster_id] = array( - 'joined' => '', - 'posts' => '', - 'from' => '', - - 'sig' => '', - 'sig_bbcode_uid' => '', - 'sig_bbcode_bitfield' => '', - - 'online' => false, - 'avatar' => '', - 'rank_title' => '', - 'rank_image' => '', - 'rank_image_src' => '', - 'sig' => '', - 'posts' => '', - 'profile' => '', - 'pm' => '', - 'email' => '', - 'www' => '', - 'icq_status_img' => '', - 'icq' => '', - 'aim' => '', - 'msn' => '', - 'yim' => '', - 'jabber' => '', - 'search' => '', - 'age' => '', - - 'username' => $row['username'], - 'user_colour' => $row['user_colour'], - - 'warnings' => 0, - 'allow_pm' => 0, - ); - } - else - { - $user_sig = ''; - - // We add the signature to every posters entry because enable_sig is post dependant - if ($row['user_sig'] && $config['allow_sig'] && $user->optionget('viewsigs')) - { - $user_sig = $row['user_sig']; - } - - $id_cache[] = $poster_id; - - $user_cache[$poster_id] = array( - 'joined' => $user->format_date($row['user_regdate']), - 'posts' => $row['user_posts'], - 'warnings' => (isset($row['user_warnings'])) ? $row['user_warnings'] : 0, - 'from' => (!empty($row['user_from'])) ? $row['user_from'] : '', - - 'sig' => $user_sig, - 'sig_bbcode_uid' => (!empty($row['user_sig_bbcode_uid'])) ? $row['user_sig_bbcode_uid'] : '', - 'sig_bbcode_bitfield' => (!empty($row['user_sig_bbcode_bitfield'])) ? $row['user_sig_bbcode_bitfield'] : '', - - 'viewonline' => $row['user_allow_viewonline'], - 'allow_pm' => $row['user_allow_pm'], - - 'avatar' => ($user->optionget('viewavatars')) ? get_user_avatar($row['user_avatar'], $row['user_avatar_type'], $row['user_avatar_width'], $row['user_avatar_height']) : '', - 'age' => '', - - 'rank_title' => '', - 'rank_image' => '', - 'rank_image_src' => '', - - 'username' => $row['username'], - 'user_colour' => $row['user_colour'], - - 'online' => false, - 'profile' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=viewprofile&u=$poster_id"), - 'www' => $row['user_website'], - 'aim' => ($row['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=aim&u=$poster_id") : '', - 'msn' => ($row['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=msnm&u=$poster_id") : '', - 'yim' => ($row['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($row['user_yim']) . '&.src=pg' : '', - 'jabber' => ($row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=jabber&u=$poster_id") : '', - 'search' => ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", 'search_author=' . urlencode($row['username']) .'&showresults=posts') : '', - ); - - get_user_rank($row['user_rank'], $row['user_posts'], $user_cache[$poster_id]['rank_title'], $user_cache[$poster_id]['rank_image'], $user_cache[$poster_id]['rank_image_src']); - - if (!empty($row['user_allow_viewemail']) || $auth->acl_get('a_email')) - { - $user_cache[$poster_id]['email'] = ($config['board_email_form'] && $config['email_enable']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=email&u=$poster_id") : (($config['board_hide_emails'] && !$auth->acl_get('a_email')) ? '' : 'mailto:' . $row['user_email']); - } - else - { - $user_cache[$poster_id]['email'] = ''; - } - - if (!empty($row['user_icq'])) - { - $user_cache[$poster_id]['icq'] = 'http://www.icq.com/people/webmsg.php?to=' . $row['user_icq']; - $user_cache[$poster_id]['icq_status_img'] = ''; - } - else - { - $user_cache[$poster_id]['icq_status_img'] = ''; - $user_cache[$poster_id]['icq'] = ''; - } - - if ($config['allow_birthdays'] && !empty($row['user_birthday'])) - { - list($bday_day, $bday_month, $bday_year) = array_map('intval', explode('-', $row['user_birthday'])); - - if ($bday_year) - { - $diff = $now['mon'] - $bday_month; - if ($diff == 0) - { - $diff = ($now['mday'] - $bday_day < 0) ? 1 : 0; - } - else - { - $diff = ($diff < 0) ? 1 : 0; - } - - $user_cache[$poster_id]['age'] = (int) ($now['year'] - $bday_year - $diff); - } - } - } - } -} -$db->sql_freeresult($result); - -// Load custom profile fields -if ($config['load_cpf_viewtopic']) -{ - include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx); - $cp = new custom_profile(); - - // Grab all profile fields from users in id cache for later use - similar to the poster cache - $profile_fields_cache = $cp->generate_profile_fields_template('grab', $id_cache); -} - -// Generate online information for user -if ($config['load_onlinetrack'] && sizeof($id_cache)) -{ - $sql = 'SELECT session_user_id, MAX(session_time) as online_time, MIN(session_viewonline) AS viewonline - FROM ' . SESSIONS_TABLE . ' - WHERE ' . $db->sql_in_set('session_user_id', $id_cache) . ' - GROUP BY session_user_id'; - $result = $db->sql_query($sql); - - $update_time = $config['load_online_time'] * 60; - while ($row = $db->sql_fetchrow($result)) - { - $user_cache[$row['session_user_id']]['online'] = (time() - $update_time < $row['online_time'] && (($row['viewonline']) || $auth->acl_get('u_viewonline'))) ? true : false; + $postrow[] = $row; } + while ($row = $db->sql_fetchrow($result)); $db->sql_freeresult($result); + + $total_posts = count($postrow); } -unset($id_cache); +else +{ + include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); + sync('topic', $topic_id); -// Pull attachment data -if (sizeof($attach_list)) + message_die(GENERAL_MESSAGE, $lang['No_posts_topic']); +} + +$resync = FALSE; +if ($forum_topic_data['topic_replies'] + 1 < $start + count($postrow)) +{ + $resync = TRUE; +} +elseif ($start + $board_config['posts_per_page'] > $forum_topic_data['topic_replies']) +{ + $row_id = intval($forum_topic_data['topic_replies']) % intval($board_config['posts_per_page']); + if ($postrow[$row_id]['post_id'] != $forum_topic_data['topic_last_post_id'] || $start + count($postrow) < $forum_topic_data['topic_replies']) + { + $resync = TRUE; + } +} +elseif (count($postrow) < $board_config['posts_per_page']) +{ + $resync = TRUE; +} + +if ($resync) +{ + include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); + sync('topic', $topic_id); + + $result = $db->sql_query('SELECT COUNT(post_id) AS total FROM ' . POSTS_TABLE . ' WHERE topic_id = ' . $topic_id); + $row = $db->sql_fetchrow($result); + $total_replies = $row['total']; +} + +$sql = "SELECT * + FROM " . RANKS_TABLE . " + ORDER BY rank_special, rank_min"; +if ( !($result = $db->sql_query($sql)) ) { - if ($auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id)) + message_die(GENERAL_ERROR, "Could not obtain ranks information.", '', __LINE__, __FILE__, $sql); +} + +$ranksrow = array(); +while ( $row = $db->sql_fetchrow($result) ) +{ + $ranksrow[] = $row; +} +$db->sql_freeresult($result); + +// +// Define censored word matches +// +$orig_word = array(); +$replacement_word = array(); +obtain_word_list($orig_word, $replacement_word); + +// +// Censor topic title +// +if ( count($orig_word) ) +{ + $topic_title = preg_replace($orig_word, $replacement_word, $topic_title); +} + +// +// Was a highlight request part of the URI? +// +$highlight_match = $highlight = ''; +if (isset($HTTP_GET_VARS['highlight'])) +{ + // Split words and phrases + $words = explode(' ', trim(htmlspecialchars($HTTP_GET_VARS['highlight']))); + + for($i = 0; $i < sizeof($words); $i++) { - $sql = 'SELECT * - FROM ' . ATTACHMENTS_TABLE . ' - WHERE ' . $db->sql_in_set('post_msg_id', $attach_list) . ' - AND in_message = 0 - ORDER BY filetime DESC, post_msg_id ASC'; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) + if (trim($words[$i]) != '') { - $attachments[$row['post_msg_id']][] = $row; - } - $db->sql_freeresult($result); - - // No attachments exist, but post table thinks they do so go ahead and reset post_attach flags - if (!sizeof($attachments)) - { - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET post_attachment = 0 - WHERE ' . $db->sql_in_set('post_id', $attach_list); - $db->sql_query($sql); - - // We need to update the topic indicator too if the complete topic is now without an attachment - if (sizeof($rowset) != $total_posts) - { - // Not all posts are displayed so we query the db to find if there's any attachment for this topic - $sql = 'SELECT a.post_msg_id as post_id - FROM ' . ATTACHMENTS_TABLE . ' a, ' . POSTS_TABLE . " p - WHERE p.topic_id = $topic_id - AND p.post_approved = 1 - AND p.topic_id = a.topic_id"; - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - $sql = 'UPDATE ' . TOPICS_TABLE . " - SET topic_attachment = 0 - WHERE topic_id = $topic_id"; - $db->sql_query($sql); - } - } - else - { - $sql = 'UPDATE ' . TOPICS_TABLE . " - SET topic_attachment = 0 - WHERE topic_id = $topic_id"; - $db->sql_query($sql); - } - } - else if ($has_attachments && !$topic_data['topic_attachment']) - { - // Topic has approved attachments but its flag is wrong - $sql = 'UPDATE ' . TOPICS_TABLE . " - SET topic_attachment = 1 - WHERE topic_id = $topic_id"; - $db->sql_query($sql); - - $topic_data['topic_attachment'] = 1; + $highlight_match .= (($highlight_match != '') ? '|' : '') . str_replace('*', '\w*', preg_quote($words[$i], '#')); } } - else - { - $display_notice = true; - } + unset($words); + + $highlight = urlencode($HTTP_GET_VARS['highlight']); + $highlight_match = phpbb_rtrim($highlight_match, "\\"); } -// Instantiate BBCode if need be -if ($bbcode_bitfield !== '') -{ - $bbcode = new bbcode(base64_encode($bbcode_bitfield)); -} +// +// Post, reply and other URL generation for +// templating vars +// +$new_topic_url = append_sid("posting.$phpEx?mode=newtopic&" . POST_FORUM_URL . "=$forum_id"); +$reply_topic_url = append_sid("posting.$phpEx?mode=reply&" . POST_TOPIC_URL . "=$topic_id"); +$view_forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"); +$view_prev_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=previous"); +$view_next_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=next"); -$i_total = sizeof($rowset) - 1; -$prev_post_id = ''; - -$template->assign_vars(array( - 'S_NUM_POSTS' => sizeof($post_list)) +// +// Mozilla navigation bar +// +$nav_links['prev'] = array( + 'url' => $view_prev_topic_url, + 'title' => $lang['View_previous_topic'] +); +$nav_links['next'] = array( + 'url' => $view_next_topic_url, + 'title' => $lang['View_next_topic'] +); +$nav_links['up'] = array( + 'url' => $view_forum_url, + 'title' => $forum_name ); -// Output the posts -$first_unread = $post_unread = false; -for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) +$reply_img = ( $forum_topic_data['forum_status'] == FORUM_LOCKED || $forum_topic_data['topic_status'] == TOPIC_LOCKED ) ? $images['reply_locked'] : $images['reply_new']; +$reply_alt = ( $forum_topic_data['forum_status'] == FORUM_LOCKED || $forum_topic_data['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['Reply_to_topic']; +$post_img = ( $forum_topic_data['forum_status'] == FORUM_LOCKED ) ? $images['post_locked'] : $images['post_new']; +$post_alt = ( $forum_topic_data['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic']; + +// +// Set a cookie for this topic +// +if ( $userdata['session_logged_in'] ) { - // A non-existing rowset only happens if there was no user present for the entered poster_id - // This could be a broken posts table. - if (!isset($rowset[$post_list[$i]])) + $tracking_topics = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_t']) : array(); + $tracking_forums = ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) ) ? unserialize($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f']) : array(); + + if ( !empty($tracking_topics[$topic_id]) && !empty($tracking_forums[$forum_id]) ) { - continue; + $topic_last_read = ( $tracking_topics[$topic_id] > $tracking_forums[$forum_id] ) ? $tracking_topics[$topic_id] : $tracking_forums[$forum_id]; + } + else if ( !empty($tracking_topics[$topic_id]) || !empty($tracking_forums[$forum_id]) ) + { + $topic_last_read = ( !empty($tracking_topics[$topic_id]) ) ? $tracking_topics[$topic_id] : $tracking_forums[$forum_id]; + } + else + { + $topic_last_read = $userdata['user_lastvisit']; } - $row =& $rowset[$post_list[$i]]; - $poster_id = $row['user_id']; - - // End signature parsing, only if needed - if ($user_cache[$poster_id]['sig'] && $row['enable_sig'] && empty($user_cache[$poster_id]['sig_parsed'])) + if ( count($tracking_topics) >= 150 && empty($tracking_topics[$topic_id]) ) { - $user_cache[$poster_id]['sig'] = censor_text($user_cache[$poster_id]['sig']); + asort($tracking_topics); + unset($tracking_topics[key($tracking_topics)]); + } - if ($user_cache[$poster_id]['sig_bbcode_bitfield']) + $tracking_topics[$topic_id] = time(); + + setcookie($board_config['cookie_name'] . '_t', serialize($tracking_topics), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); +} + +// +// Load templates +// +$template->set_filenames(array( + 'body' => 'viewtopic_body.tpl') +); +make_jumpbox('viewforum.'.$phpEx, $forum_id); + +// +// Output page header +// +$page_title = $lang['View_topic'] .' - ' . $topic_title; +include($phpbb_root_path . 'includes/page_header.'.$phpEx); + +// +// User authorisation levels output +// +$s_auth_can = ( ( $is_auth['auth_post'] ) ? $lang['Rules_post_can'] : $lang['Rules_post_cannot'] ) . '
      '; +$s_auth_can .= ( ( $is_auth['auth_reply'] ) ? $lang['Rules_reply_can'] : $lang['Rules_reply_cannot'] ) . '
      '; +$s_auth_can .= ( ( $is_auth['auth_edit'] ) ? $lang['Rules_edit_can'] : $lang['Rules_edit_cannot'] ) . '
      '; +$s_auth_can .= ( ( $is_auth['auth_delete'] ) ? $lang['Rules_delete_can'] : $lang['Rules_delete_cannot'] ) . '
      '; +$s_auth_can .= ( ( $is_auth['auth_vote'] ) ? $lang['Rules_vote_can'] : $lang['Rules_vote_cannot'] ) . '
      '; + +$topic_mod = ''; + +if ( $is_auth['auth_mod'] ) +{ + $s_auth_can .= sprintf($lang['Rules_moderate'], "', ''); + + $topic_mod .= "' . $lang['Delete_topic'] . ' '; + + $topic_mod .= "' . $lang['Move_topic'] . ' '; + + $topic_mod .= ( $forum_topic_data['topic_status'] == TOPIC_UNLOCKED ) ? "' . $lang['Lock_topic'] . ' ' : "' . $lang['Unlock_topic'] . ' '; + + $topic_mod .= "' . $lang['Split_topic'] . ' '; +} + +// +// Topic watch information +// +$s_watching_topic = ''; +if ( $can_watch_topic ) +{ + if ( $is_watching_topic ) + { + $s_watching_topic = "' . $lang['Stop_watching_topic'] . ''; + $s_watching_topic_img = ( isset($images['topic_un_watch']) ) ? "' . $lang['Stop_watching_topic'] . '' : ''; + } + else + { + $s_watching_topic = "' . $lang['Start_watching_topic'] . ''; + $s_watching_topic_img = ( isset($images['Topic_watch']) ) ? "' . $lang['Start_watching_topic'] . '' : ''; + } +} + +// +// If we've got a hightlight set pass it on to pagination, +// I get annoyed when I lose my highlight after the first page. +// +$pagination = ( $highlight != '' ) ? generate_pagination("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&postdays=$post_days&postorder=$post_order&highlight=$highlight", $total_replies, $board_config['posts_per_page'], $start) : generate_pagination("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&postdays=$post_days&postorder=$post_order", $total_replies, $board_config['posts_per_page'], $start); + +// +// Send vars to template +// +$template->assign_vars(array( + 'FORUM_ID' => $forum_id, + 'FORUM_NAME' => $forum_name, + 'TOPIC_ID' => $topic_id, + 'TOPIC_TITLE' => $topic_title, + 'PAGINATION' => $pagination, + 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / intval($board_config['posts_per_page']) ) + 1 ), ceil( $total_replies / intval($board_config['posts_per_page']) )), + + 'POST_IMG' => $post_img, + 'REPLY_IMG' => $reply_img, + + 'L_AUTHOR' => $lang['Author'], + 'L_MESSAGE' => $lang['Message'], + 'L_POSTED' => $lang['Posted'], + 'L_POST_SUBJECT' => $lang['Post_subject'], + 'L_VIEW_NEXT_TOPIC' => $lang['View_next_topic'], + 'L_VIEW_PREVIOUS_TOPIC' => $lang['View_previous_topic'], + 'L_POST_NEW_TOPIC' => $post_alt, + 'L_POST_REPLY_TOPIC' => $reply_alt, + 'L_BACK_TO_TOP' => $lang['Back_to_top'], + 'L_DISPLAY_POSTS' => $lang['Display_posts'], + 'L_LOCK_TOPIC' => $lang['Lock_topic'], + 'L_UNLOCK_TOPIC' => $lang['Unlock_topic'], + 'L_MOVE_TOPIC' => $lang['Move_topic'], + 'L_SPLIT_TOPIC' => $lang['Split_topic'], + 'L_DELETE_TOPIC' => $lang['Delete_topic'], + 'L_GOTO_PAGE' => $lang['Goto_page'], + + 'S_TOPIC_LINK' => POST_TOPIC_URL, + 'S_SELECT_POST_DAYS' => $select_post_days, + 'S_SELECT_POST_ORDER' => $select_post_order, + 'S_POST_DAYS_ACTION' => append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . '=' . $topic_id . "&start=$start"), + 'S_AUTH_LIST' => $s_auth_can, + 'S_TOPIC_ADMIN' => $topic_mod, + 'S_WATCH_TOPIC' => $s_watching_topic, + 'S_WATCH_TOPIC_IMG' => $s_watching_topic_img, + + 'U_VIEW_TOPIC' => append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&start=$start&postdays=$post_days&postorder=$post_order&highlight=$highlight"), + 'U_VIEW_FORUM' => $view_forum_url, + 'U_VIEW_OLDER_TOPIC' => $view_prev_topic_url, + 'U_VIEW_NEWER_TOPIC' => $view_next_topic_url, + 'U_POST_NEW_TOPIC' => $new_topic_url, + 'U_POST_REPLY_TOPIC' => $reply_topic_url) +); + +// +// Does this topic contain a poll? +// +if ( !empty($forum_topic_data['topic_vote']) ) +{ + $s_hidden_fields = ''; + + $sql = "SELECT vd.vote_id, vd.vote_text, vd.vote_start, vd.vote_length, vr.vote_option_id, vr.vote_option_text, vr.vote_result + FROM " . VOTE_DESC_TABLE . " vd, " . VOTE_RESULTS_TABLE . " vr + WHERE vd.topic_id = $topic_id + AND vr.vote_id = vd.vote_id + ORDER BY vr.vote_option_id ASC"; + if ( !($result = $db->sql_query($sql)) ) + { + message_die(GENERAL_ERROR, "Could not obtain vote data for this topic", '', __LINE__, __FILE__, $sql); + } + + if ( $vote_info = $db->sql_fetchrowset($result) ) + { + $db->sql_freeresult($result); + $vote_options = count($vote_info); + + $vote_id = $vote_info[0]['vote_id']; + $vote_title = $vote_info[0]['vote_text']; + + $sql = "SELECT vote_id + FROM " . VOTE_USERS_TABLE . " + WHERE vote_id = $vote_id + AND vote_user_id = " . intval($userdata['user_id']); + if ( !($result = $db->sql_query($sql)) ) { - $bbcode->bbcode_second_pass($user_cache[$poster_id]['sig'], $user_cache[$poster_id]['sig_bbcode_uid'], $user_cache[$poster_id]['sig_bbcode_bitfield']); + message_die(GENERAL_ERROR, "Could not obtain user vote data for this topic", '', __LINE__, __FILE__, $sql); } - $user_cache[$poster_id]['sig'] = bbcode_nl2br($user_cache[$poster_id]['sig']); - $user_cache[$poster_id]['sig'] = smiley_text($user_cache[$poster_id]['sig']); - $user_cache[$poster_id]['sig_parsed'] = true; - } + $user_voted = ( $row = $db->sql_fetchrow($result) ) ? TRUE : 0; + $db->sql_freeresult($result); - // Parse the message and subject - $message = censor_text($row['post_text']); - - // Second parse bbcode here - if ($row['bbcode_bitfield']) - { - $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); - } - - $message = bbcode_nl2br($message); - $message = smiley_text($message); - - if (!empty($attachments[$row['post_id']])) - { - parse_attachments($forum_id, $message, $attachments[$row['post_id']], $update_count); - } - - // Replace naughty words such as farty pants - $row['post_subject'] = censor_text($row['post_subject']); - - // Highlight active words (primarily for search) - if ($highlight_match) - { - $message = preg_replace('#(?!<.*)(?]*(?:)#is', '\1', $message); - $row['post_subject'] = preg_replace('#(?!<.*)(?]*(?:)#is', '\1', $row['post_subject']); - } - - // Editing information - if (($row['post_edit_count'] && $config['display_last_edited']) || $row['post_edit_reason']) - { - // Get usernames for all following posts if not already stored - if (!sizeof($post_edit_list) && ($row['post_edit_reason'] || ($row['post_edit_user'] && !isset($user_cache[$row['post_edit_user']])))) + if ( isset($HTTP_GET_VARS['vote']) || isset($HTTP_POST_VARS['vote']) ) { - // Remove all post_ids already parsed (we do not have to check them) - $post_storage_list = (!$store_reverse) ? array_slice($post_list, $i) : array_slice(array_reverse($post_list), $i); - - $sql = 'SELECT DISTINCT u.user_id, u.username, u.user_colour - FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u - WHERE ' . $db->sql_in_set('p.post_id', $post_storage_list) . ' - AND p.post_edit_count <> 0 - AND p.post_edit_user <> 0 - AND p.post_edit_user = u.user_id'; - $result2 = $db->sql_query($sql); - while ($user_edit_row = $db->sql_fetchrow($result2)) - { - $post_edit_list[$user_edit_row['user_id']] = $user_edit_row; - } - $db->sql_freeresult($result2); - - unset($post_storage_list); - } - - $l_edit_time_total = ($row['post_edit_count'] == 1) ? $user->lang['EDITED_TIME_TOTAL'] : $user->lang['EDITED_TIMES_TOTAL']; - - if ($row['post_edit_reason']) - { - // User having edited the post also being the post author? - if (!$row['post_edit_user'] || $row['post_edit_user'] == $poster_id) - { - $display_username = get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']); - } - else - { - $display_username = get_username_string('full', $row['post_edit_user'], $post_edit_list[$row['post_edit_user']]['username'], $post_edit_list[$row['post_edit_user']]['user_colour']); - } - - $l_edited_by = sprintf($l_edit_time_total, $display_username, $user->format_date($row['post_edit_time']), $row['post_edit_count']); + $view_result = ( ( ( isset($HTTP_GET_VARS['vote']) ) ? $HTTP_GET_VARS['vote'] : $HTTP_POST_VARS['vote'] ) == 'viewresult' ) ? TRUE : 0; } else { - if ($row['post_edit_user'] && !isset($user_cache[$row['post_edit_user']])) - { - $user_cache[$row['post_edit_user']] = $post_edit_list[$row['post_edit_user']]; - } - - // User having edited the post also being the post author? - if (!$row['post_edit_user'] || $row['post_edit_user'] == $poster_id) - { - $display_username = get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']); - } - else - { - $display_username = get_username_string('full', $row['post_edit_user'], $user_cache[$row['post_edit_user']]['username'], $user_cache[$row['post_edit_user']]['user_colour']); - } - - $l_edited_by = sprintf($l_edit_time_total, $display_username, $user->format_date($row['post_edit_time']), $row['post_edit_count']); + $view_result = 0; } + + $poll_expired = ( $vote_info[0]['vote_length'] ) ? ( ( $vote_info[0]['vote_start'] + $vote_info[0]['vote_length'] < time() ) ? TRUE : 0 ) : 0; + + if ( $user_voted || $view_result || $poll_expired || !$is_auth['auth_vote'] || $forum_topic_data['topic_status'] == TOPIC_LOCKED ) + { + $template->set_filenames(array( + 'pollbox' => 'viewtopic_poll_result.tpl') + ); + + $vote_results_sum = 0; + + for($i = 0; $i < $vote_options; $i++) + { + $vote_results_sum += $vote_info[$i]['vote_result']; + } + + $vote_graphic = 0; + $vote_graphic_max = count($images['voting_graphic']); + + for($i = 0; $i < $vote_options; $i++) + { + $vote_percent = ( $vote_results_sum > 0 ) ? $vote_info[$i]['vote_result'] / $vote_results_sum : 0; + $vote_graphic_length = round($vote_percent * $board_config['vote_graphic_length']); + + $vote_graphic_img = $images['voting_graphic'][$vote_graphic]; + $vote_graphic = ($vote_graphic < $vote_graphic_max - 1) ? $vote_graphic + 1 : 0; + + if ( count($orig_word) ) + { + $vote_info[$i]['vote_option_text'] = preg_replace($orig_word, $replacement_word, $vote_info[$i]['vote_option_text']); + } + + $template->assign_block_vars("poll_option", array( + 'POLL_OPTION_CAPTION' => $vote_info[$i]['vote_option_text'], + 'POLL_OPTION_RESULT' => $vote_info[$i]['vote_result'], + 'POLL_OPTION_PERCENT' => sprintf("%.1d%%", ($vote_percent * 100)), + + 'POLL_OPTION_IMG' => $vote_graphic_img, + 'POLL_OPTION_IMG_WIDTH' => $vote_graphic_length) + ); + } + + $template->assign_vars(array( + 'L_TOTAL_VOTES' => $lang['Total_votes'], + 'TOTAL_VOTES' => $vote_results_sum) + ); + + } + else + { + $template->set_filenames(array( + 'pollbox' => 'viewtopic_poll_ballot.tpl') + ); + + for($i = 0; $i < $vote_options; $i++) + { + if ( count($orig_word) ) + { + $vote_info[$i]['vote_option_text'] = preg_replace($orig_word, $replacement_word, $vote_info[$i]['vote_option_text']); + } + + $template->assign_block_vars("poll_option", array( + 'POLL_OPTION_ID' => $vote_info[$i]['vote_option_id'], + 'POLL_OPTION_CAPTION' => $vote_info[$i]['vote_option_text']) + ); + } + + $template->assign_vars(array( + 'L_SUBMIT_VOTE' => $lang['Submit_vote'], + 'L_VIEW_RESULTS' => $lang['View_results'], + + 'U_VIEW_RESULTS' => append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&postdays=$post_days&postorder=$post_order&vote=viewresult")) + ); + + $s_hidden_fields = ''; + } + + if ( count($orig_word) ) + { + $vote_title = preg_replace($orig_word, $replacement_word, $vote_title); + } + + $s_hidden_fields .= ''; + + $template->assign_vars(array( + 'POLL_QUESTION' => $vote_title, + + 'S_HIDDEN_FIELDS' => $s_hidden_fields, + 'S_POLL_ACTION' => append_sid("posting.$phpEx?mode=vote&" . POST_TOPIC_URL . "=$topic_id")) + ); + + $template->assign_var_from_handle('POLL_DISPLAY', 'pollbox'); + } +} + +// +// Update the topic view counter +// +$sql = "UPDATE " . TOPICS_TABLE . " + SET topic_views = topic_views + 1 + WHERE topic_id = $topic_id"; +if ( !$db->sql_query($sql) ) +{ + message_die(GENERAL_ERROR, "Could not update topic views.", '', __LINE__, __FILE__, $sql); +} + +// +// Okay, let's do the loop, yeah come on baby let's do the loop +// and it goes like this ... +// +for($i = 0; $i < $total_posts; $i++) +{ + $poster_id = $postrow[$i]['user_id']; + $poster = ( $poster_id == ANONYMOUS ) ? $lang['Guest'] : $postrow[$i]['username']; + + $post_date = create_date($board_config['default_dateformat'], $postrow[$i]['post_time'], $board_config['board_timezone']); + + $poster_posts = ( $postrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Posts'] . ': ' . $postrow[$i]['user_posts'] : ''; + + $poster_from = ( $postrow[$i]['user_from'] && $postrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Location'] . ': ' . $postrow[$i]['user_from'] : ''; + + $poster_joined = ( $postrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Joined'] . ': ' . create_date($lang['DATE_FORMAT'], $postrow[$i]['user_regdate'], $board_config['board_timezone']) : ''; + + $poster_avatar = ''; + if ( $postrow[$i]['user_avatar_type'] && $poster_id != ANONYMOUS && $postrow[$i]['user_allowavatar'] ) + { + switch( $postrow[$i]['user_avatar_type'] ) + { + case USER_AVATAR_UPLOAD: + $poster_avatar = ( $board_config['allow_avatar_upload'] ) ? '' : ''; + break; + case USER_AVATAR_REMOTE: + $poster_avatar = ( $board_config['allow_avatar_remote'] ) ? '' : ''; + break; + case USER_AVATAR_GALLERY: + $poster_avatar = ( $board_config['allow_avatar_local'] ) ? '' : ''; + break; + } + } + + // + // Define the little post icon + // + if ( $userdata['session_logged_in'] && $postrow[$i]['post_time'] > $userdata['user_lastvisit'] && $postrow[$i]['post_time'] > $topic_last_read ) + { + $mini_post_img = $images['icon_minipost_new']; + $mini_post_alt = $lang['New_post']; + } + else + { + $mini_post_img = $images['icon_minipost']; + $mini_post_alt = $lang['Post']; + } + + $mini_post_url = append_sid("viewtopic.$phpEx?" . POST_POST_URL . '=' . $postrow[$i]['post_id']) . '#' . $postrow[$i]['post_id']; + + // + // Generate ranks, set them to empty string initially. + // + $poster_rank = ''; + $rank_image = ''; + if ( $postrow[$i]['user_id'] == ANONYMOUS ) + { + } + else if ( $postrow[$i]['user_rank'] ) + { + for($j = 0; $j < count($ranksrow); $j++) + { + if ( $postrow[$i]['user_rank'] == $ranksrow[$j]['rank_id'] && $ranksrow[$j]['rank_special'] ) + { + $poster_rank = $ranksrow[$j]['rank_title']; + $rank_image = ( $ranksrow[$j]['rank_image'] ) ? '' . $poster_rank . '
      ' : ''; + } + } + } + else + { + for($j = 0; $j < count($ranksrow); $j++) + { + if ( $postrow[$i]['user_posts'] >= $ranksrow[$j]['rank_min'] && !$ranksrow[$j]['rank_special'] ) + { + $poster_rank = $ranksrow[$j]['rank_title']; + $rank_image = ( $ranksrow[$j]['rank_image'] ) ? '' . $poster_rank . '
      ' : ''; + } + } + } + + // + // Handle anon users posting with usernames + // + if ( $poster_id == ANONYMOUS && $postrow[$i]['post_username'] != '' ) + { + $poster = $postrow[$i]['post_username']; + $poster_rank = $lang['Guest']; + } + + $temp_url = ''; + + if ( $poster_id != ANONYMOUS ) + { + $temp_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id"); + $profile_img = '' . $lang['Read_profile'] . ''; + $profile = '' . $lang['Read_profile'] . ''; + + $temp_url = append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=$poster_id"); + $pm_img = '' . $lang['Send_private_message'] . ''; + $pm = '' . $lang['Send_private_message'] . ''; + + if ( !empty($postrow[$i]['user_viewemail']) || $is_auth['auth_mod'] ) + { + $email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $poster_id) : 'mailto:' . $postrow[$i]['user_email']; + + $email_img = '' . $lang['Send_email'] . ''; + $email = '' . $lang['Send_email'] . ''; + } + else + { + $email_img = ''; + $email = ''; + } + + $www_img = ( $postrow[$i]['user_website'] ) ? '' . $lang['Visit_website'] . '' : ''; + $www = ( $postrow[$i]['user_website'] ) ? '' . $lang['Visit_website'] . '' : ''; + + if ( !empty($postrow[$i]['user_icq']) ) + { + $icq_status_img = ''; + $icq_img = '' . $lang['ICQ'] . ''; + $icq = '' . $lang['ICQ'] . ''; + } + else + { + $icq_status_img = ''; + $icq_img = ''; + $icq = ''; + } + + $aim_img = ( $postrow[$i]['user_aim'] ) ? '' . $lang['AIM'] . '' : ''; + $aim = ( $postrow[$i]['user_aim'] ) ? '' . $lang['AIM'] . '' : ''; + + $temp_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id"); + $msn_img = ( $postrow[$i]['user_msnm'] ) ? '' . $lang['MSNM'] . '' : ''; + $msn = ( $postrow[$i]['user_msnm'] ) ? '' . $lang['MSNM'] . '' : ''; + + $yim_img = ( $postrow[$i]['user_yim'] ) ? '' . $lang['YIM'] . '' : ''; + $yim = ( $postrow[$i]['user_yim'] ) ? '' . $lang['YIM'] . '' : ''; + } + else + { + $profile_img = ''; + $profile = ''; + $pm_img = ''; + $pm = ''; + $email_img = ''; + $email = ''; + $www_img = ''; + $www = ''; + $icq_status_img = ''; + $icq_img = ''; + $icq = ''; + $aim_img = ''; + $aim = ''; + $msn_img = ''; + $msn = ''; + $yim_img = ''; + $yim = ''; + } + + $temp_url = append_sid("posting.$phpEx?mode=quote&" . POST_POST_URL . "=" . $postrow[$i]['post_id']); + $quote_img = '' . $lang['Reply_with_quote'] . ''; + $quote = '' . $lang['Reply_with_quote'] . ''; + + $temp_url = append_sid("search.$phpEx?search_author=" . urlencode($postrow[$i]['username']) . "&showresults=posts"); + $search_img = '' . sprintf($lang['Search_user_posts'], $postrow[$i]['username']) . ''; + $search = '' . sprintf($lang['Search_user_posts'], $postrow[$i]['username']) . ''; + + if ( ( $userdata['user_id'] == $poster_id && $is_auth['auth_edit'] ) || $is_auth['auth_mod'] ) + { + $temp_url = append_sid("posting.$phpEx?mode=editpost&" . POST_POST_URL . "=" . $postrow[$i]['post_id']); + $edit_img = '' . $lang['Edit_delete_post'] . ''; + $edit = '' . $lang['Edit_delete_post'] . ''; + } + else + { + $edit_img = ''; + $edit = ''; + } + + if ( $is_auth['auth_mod'] ) + { + $temp_url = "modcp.$phpEx?mode=ip&" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&" . POST_TOPIC_URL . "=" . $topic_id . "&sid=" . $userdata['session_id']; + $ip_img = '' . $lang['View_IP'] . ''; + $ip = '' . $lang['View_IP'] . ''; + + $temp_url = "posting.$phpEx?mode=delete&" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&sid=" . $userdata['session_id']; + $delpost_img = '' . $lang['Delete_post'] . ''; + $delpost = '' . $lang['Delete_post'] . ''; + } + else + { + $ip_img = ''; + $ip = ''; + + if ( $userdata['user_id'] == $poster_id && $is_auth['auth_delete'] && $forum_topic_data['topic_last_post_id'] == $postrow[$i]['post_id'] ) + { + $temp_url = "posting.$phpEx?mode=delete&" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&sid=" . $userdata['session_id']; + $delpost_img = '' . $lang['Delete_post'] . ''; + $delpost = '' . $lang['Delete_post'] . ''; + } + else + { + $delpost_img = ''; + $delpost = ''; + } + } + + $post_subject = ( $postrow[$i]['post_subject'] != '' ) ? $postrow[$i]['post_subject'] : ''; + + $message = $postrow[$i]['post_text']; + $bbcode_uid = $postrow[$i]['bbcode_uid']; + + $user_sig = ( $postrow[$i]['enable_sig'] && $postrow[$i]['user_sig'] != '' && $board_config['allow_sig'] ) ? $postrow[$i]['user_sig'] : ''; + $user_sig_bbcode_uid = $postrow[$i]['user_sig_bbcode_uid']; + + // + // Note! The order used for parsing the message _is_ important, moving things around could break any + // output + // + + // + // If the board has HTML off but the post has HTML + // on then we process it, else leave it alone + // + if ( !$board_config['allow_html'] || !$userdata['user_allowhtml']) + { + if ( $user_sig != '' ) + { + $user_sig = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $user_sig); + } + + if ( $postrow[$i]['enable_html'] ) + { + $message = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $message); + } + } + + // + // Parse message and/or sig for BBCode if reqd + // + if ($user_sig != '' && $user_sig_bbcode_uid != '') + { + $user_sig = ($board_config['allow_bbcode']) ? bbencode_second_pass($user_sig, $user_sig_bbcode_uid) : preg_replace("/\:$user_sig_bbcode_uid/si", '', $user_sig); + } + + if ($bbcode_uid != '') + { + $message = ($board_config['allow_bbcode']) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace("/\:$bbcode_uid/si", '', $message); + } + + if ( $user_sig != '' ) + { + $user_sig = make_clickable($user_sig); + } + $message = make_clickable($message); + + // + // Parse smilies + // + if ( $board_config['allow_smilies'] ) + { + if ( $postrow[$i]['user_allowsmile'] && $user_sig != '' ) + { + $user_sig = smilies_pass($user_sig); + } + + if ( $postrow[$i]['enable_smilies'] ) + { + $message = smilies_pass($message); + } + } + + // + // Highlight active words (primarily for search) + // + if ($highlight_match) + { + // This has been back-ported from 3.0 CVS + $message = preg_replace('#(?!<.*)(?]*>)#i', '\1', $message); + } + + // + // Replace naughty words + // + if (count($orig_word)) + { + $post_subject = preg_replace($orig_word, $replacement_word, $post_subject); + + if ($user_sig != '') + { + $user_sig = str_replace('\"', '"', substr(@preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "@preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $user_sig . '<'), 1, -1)); + } + + $message = str_replace('\"', '"', substr(@preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "@preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $message . '<'), 1, -1)); + } + + // + // Replace newlines (we use this rather than nl2br because + // till recently it wasn't XHTML compliant) + // + if ( $user_sig != '' ) + { + $user_sig = '
      _________________
      ' . str_replace("\n", "\n
      \n", $user_sig); + } + + $message = str_replace("\n", "\n
      \n", $message); + + // + // Editing information + // + if ( $postrow[$i]['post_edit_count'] ) + { + $l_edit_time_total = ( $postrow[$i]['post_edit_count'] == 1 ) ? $lang['Edited_time_total'] : $lang['Edited_times_total']; + + $l_edited_by = '

      ' . sprintf($l_edit_time_total, $poster, create_date($board_config['default_dateformat'], $postrow[$i]['post_edit_time'], $board_config['board_timezone']), $postrow[$i]['post_edit_count']); } else { $l_edited_by = ''; } - // Bump information - if ($topic_data['topic_bumped'] && $row['post_id'] == $topic_data['topic_last_post_id'] && isset($user_cache[$topic_data['topic_bumper']]) ) - { - // It is safe to grab the username from the user cache array, we are at the last - // post and only the topic poster and last poster are allowed to bump. - // Admins and mods are bound to the above rules too... - $l_bumped_by = '

      ' . sprintf($user->lang['BUMPED_BY'], $user_cache[$topic_data['topic_bumper']]['username'], $user->format_date($topic_data['topic_last_post_time'])); - } - else - { - $l_bumped_by = ''; - } - - $cp_row = array(); - // - if ($config['load_cpf_viewtopic']) - { - $cp_row = (isset($profile_fields_cache[$poster_id])) ? $cp->generate_profile_fields_template('show', false, $profile_fields_cache[$poster_id]) : array(); - } - - $post_unread = (isset($topic_tracking_info[$topic_id]) && $row['post_time'] > $topic_tracking_info[$topic_id]) ? true : false; - - $s_first_unread = false; - if (!$first_unread && $post_unread) - { - $s_first_unread = $first_unread = true; - } - + // Again this will be handled by the templating + // code at some point // - $postrow = array( - 'POST_AUTHOR_FULL' => get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), - 'POST_AUTHOR_COLOUR' => get_username_string('colour', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), - 'POST_AUTHOR' => get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), - 'U_POST_AUTHOR' => get_username_string('profile', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; - 'RANK_TITLE' => $user_cache[$poster_id]['rank_title'], - 'RANK_IMG' => $user_cache[$poster_id]['rank_image'], - 'RANK_IMG_SRC' => $user_cache[$poster_id]['rank_image_src'], - 'POSTER_JOINED' => $user_cache[$poster_id]['joined'], - 'POSTER_POSTS' => $user_cache[$poster_id]['posts'], - 'POSTER_FROM' => $user_cache[$poster_id]['from'], - 'POSTER_AVATAR' => $user_cache[$poster_id]['avatar'], - 'POSTER_WARNINGS' => $user_cache[$poster_id]['warnings'], - 'POSTER_AGE' => $user_cache[$poster_id]['age'], + $template->assign_block_vars('postrow', array( + 'ROW_COLOR' => '#' . $row_color, + 'ROW_CLASS' => $row_class, + 'POSTER_NAME' => $poster, + 'POSTER_RANK' => $poster_rank, + 'RANK_IMAGE' => $rank_image, + 'POSTER_JOINED' => $poster_joined, + 'POSTER_POSTS' => $poster_posts, + 'POSTER_FROM' => $poster_from, + 'POSTER_AVATAR' => $poster_avatar, + 'POST_DATE' => $post_date, + 'POST_SUBJECT' => $post_subject, + 'MESSAGE' => $message, + 'SIGNATURE' => $user_sig, + 'EDITED_MESSAGE' => $l_edited_by, - 'POST_DATE' => $user->format_date($row['post_time']), - 'POST_SUBJECT' => $row['post_subject'], - 'MESSAGE' => $message, - 'SIGNATURE' => ($row['enable_sig']) ? $user_cache[$poster_id]['sig'] : '', - 'EDITED_MESSAGE' => $l_edited_by, - 'EDIT_REASON' => $row['post_edit_reason'], - 'BUMPED_MESSAGE' => $l_bumped_by, + 'MINI_POST_IMG' => $mini_post_img, + 'PROFILE_IMG' => $profile_img, + 'PROFILE' => $profile, + 'SEARCH_IMG' => $search_img, + 'SEARCH' => $search, + 'PM_IMG' => $pm_img, + 'PM' => $pm, + 'EMAIL_IMG' => $email_img, + 'EMAIL' => $email, + 'WWW_IMG' => $www_img, + 'WWW' => $www, + 'ICQ_STATUS_IMG' => $icq_status_img, + 'ICQ_IMG' => $icq_img, + 'ICQ' => $icq, + 'AIM_IMG' => $aim_img, + 'AIM' => $aim, + 'MSN_IMG' => $msn_img, + 'MSN' => $msn, + 'YIM_IMG' => $yim_img, + 'YIM' => $yim, + 'EDIT_IMG' => $edit_img, + 'EDIT' => $edit, + 'QUOTE_IMG' => $quote_img, + 'QUOTE' => $quote, + 'IP_IMG' => $ip_img, + 'IP' => $ip, + 'DELETE_IMG' => $delpost_img, + 'DELETE' => $delpost, - 'MINI_POST_IMG' => ($post_unread) ? $user->img('icon_post_target_unread', 'NEW_POST') : $user->img('icon_post_target', 'POST'), - 'POST_ICON_IMG' => ($topic_data['enable_icons'] && !empty($row['icon_id'])) ? $icons[$row['icon_id']]['img'] : '', - 'POST_ICON_IMG_WIDTH' => ($topic_data['enable_icons'] && !empty($row['icon_id'])) ? $icons[$row['icon_id']]['width'] : '', - 'POST_ICON_IMG_HEIGHT' => ($topic_data['enable_icons'] && !empty($row['icon_id'])) ? $icons[$row['icon_id']]['height'] : '', - 'ICQ_STATUS_IMG' => $user_cache[$poster_id]['icq_status_img'], - 'ONLINE_IMG' => ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? '' : (($user_cache[$poster_id]['online']) ? $user->img('icon_user_online', 'ONLINE') : $user->img('icon_user_offline', 'OFFLINE')), - 'S_ONLINE' => ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? false : (($user_cache[$poster_id]['online']) ? true : false), + 'L_MINI_POST_ALT' => $mini_post_alt, - 'U_EDIT' => (!$user->data['is_registered']) ? '' : ((($user->data['user_id'] == $poster_id && $auth->acl_get('f_edit', $forum_id) && ($row['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])) || $auth->acl_get('m_edit', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=edit&f=$forum_id&p={$row['post_id']}") : ''), - 'U_QUOTE' => ($auth->acl_get('f_reply', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=quote&f=$forum_id&p={$row['post_id']}") : '', - 'U_INFO' => ($auth->acl_get('m_info', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=post_details&f=$forum_id&p=" . $row['post_id'], true, $user->session_id) : '', - 'U_DELETE' => (!$user->data['is_registered']) ? '' : ((($user->data['user_id'] == $poster_id && $auth->acl_get('f_delete', $forum_id) && $topic_data['topic_last_post_id'] == $row['post_id'] && ($row['post_time'] > time() - ($config['edit_time'] * 60) || !$config['edit_time'])) || $auth->acl_get('m_delete', $forum_id)) ? append_sid("{$phpbb_root_path}posting.$phpEx", "mode=delete&f=$forum_id&p={$row['post_id']}") : ''), - - 'U_PROFILE' => $user_cache[$poster_id]['profile'], - 'U_SEARCH' => $user_cache[$poster_id]['search'], - 'U_PM' => ($poster_id != ANONYMOUS && $config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_cache[$poster_id]['allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&action=quotepost&p=' . $row['post_id']) : '', - 'U_EMAIL' => $user_cache[$poster_id]['email'], - 'U_WWW' => $user_cache[$poster_id]['www'], - 'U_ICQ' => $user_cache[$poster_id]['icq'], - 'U_AIM' => $user_cache[$poster_id]['aim'], - 'U_MSN' => $user_cache[$poster_id]['msn'], - 'U_YIM' => $user_cache[$poster_id]['yim'], - 'U_JABBER' => $user_cache[$poster_id]['jabber'], - - 'U_REPORT' => ($auth->acl_get('f_report', $forum_id)) ? append_sid("{$phpbb_root_path}report.$phpEx", 'f=' . $forum_id . '&p=' . $row['post_id']) : '', - 'U_MCP_REPORT' => ($auth->acl_get('m_report', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=report_details&f=' . $forum_id . '&p=' . $row['post_id'], true, $user->session_id) : '', - 'U_MCP_APPROVE' => ($auth->acl_get('m_approve', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&f=' . $forum_id . '&p=' . $row['post_id'], true, $user->session_id) : '', - 'U_MINI_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . (($topic_data['topic_type'] == POST_GLOBAL) ? '&f=' . $forum_id : '') . '#p' . $row['post_id'], - 'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$post_list[$i + 1]])) ? $rowset[$post_list[$i + 1]]['post_id'] : '', - 'U_PREV_POST_ID' => $prev_post_id, - 'U_NOTES' => ($auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $poster_id, true, $user->session_id) : '', - 'U_WARN' => ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&f=' . $forum_id . '&p=' . $row['post_id'], true, $user->session_id) : '', - - 'POST_ID' => $row['post_id'], - 'POSTER_ID' => $poster_id, - - 'S_HAS_ATTACHMENTS' => (!empty($attachments[$row['post_id']])) ? true : false, - 'S_POST_UNAPPROVED' => ($row['post_approved']) ? false : true, - 'S_POST_REPORTED' => ($row['post_reported'] && $auth->acl_get('m_report', $forum_id)) ? true : false, - 'S_DISPLAY_NOTICE' => $display_notice && $row['post_attachment'], - 'S_FRIEND' => ($row['friend']) ? true : false, - 'S_UNREAD_POST' => $post_unread, - 'S_FIRST_UNREAD' => $s_first_unread, - 'S_CUSTOM_FIELDS' => (isset($cp_row['row']) && sizeof($cp_row['row'])) ? true : false, - 'S_TOPIC_POSTER' => ($topic_data['topic_poster'] == $poster_id) ? true : false, - - 'S_IGNORE_POST' => ($row['hide_post']) ? true : false, - 'L_IGNORE_POST' => ($row['hide_post']) ? sprintf($user->lang['POST_BY_FOE'], get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), '', '') : '', + 'U_MINI_POST' => $mini_post_url, + 'U_POST_ID' => $postrow[$i]['post_id']) ); - - if (isset($cp_row['row']) && sizeof($cp_row['row'])) - { - $postrow = array_merge($postrow, $cp_row['row']); - } - - // Dump vars into template - $template->assign_block_vars('postrow', $postrow); - - if (!empty($cp_row['blockrow'])) - { - foreach ($cp_row['blockrow'] as $field_data) - { - $template->assign_block_vars('postrow.custom_fields', $field_data); - } - } - - // Display not already displayed Attachments for this post, we already parsed them. ;) - if (!empty($attachments[$row['post_id']])) - { - foreach ($attachments[$row['post_id']] as $attachment) - { - $template->assign_block_vars('postrow.attachment', array( - 'DISPLAY_ATTACHMENT' => $attachment) - ); - } - } - - $prev_post_id = $row['post_id']; - - unset($rowset[$post_list[$i]]); - unset($attachments[$row['post_id']]); -} -unset($rowset, $user_cache); - -// Update topic view and if necessary attachment view counters ... but only if this is the first 'page view' -if (isset($user->data['session_page']) && strpos($user->data['session_page'], '&t=' . $topic_id) === false) -{ - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET topic_views = topic_views + 1, topic_last_view_time = ' . time() . " - WHERE topic_id = $topic_id"; - $db->sql_query($sql); - - // Update the attachment download counts - if (sizeof($update_count)) - { - $sql = 'UPDATE ' . ATTACHMENTS_TABLE . ' - SET download_count = download_count + 1 - WHERE ' . $db->sql_in_set('attach_id', array_unique($update_count)); - $db->sql_query($sql); - } } -// Only mark topic if it's currently unread. Also make sure we do not set topic tracking back if earlier pages are viewed. -if (isset($topic_tracking_info[$topic_id]) && $topic_data['topic_last_post_time'] > $topic_tracking_info[$topic_id] && $max_post_time > $topic_tracking_info[$topic_id]) -{ - markread('topic', $forum_id, $topic_id, $max_post_time); +$template->pparse('body'); - // Update forum info - $all_marked_read = update_forum_tracking_info($forum_id, $topic_data['forum_last_post_time'], (isset($topic_data['forum_mark_time'])) ? $topic_data['forum_mark_time'] : false, false); -} -else -{ - $all_marked_read = true; -} - -// If there are absolutely no more unread posts in this forum and unread posts shown, we can savely show the #unread link -if ($all_marked_read) -{ - if ($post_unread) - { - $template->assign_vars(array( - 'U_VIEW_UNREAD_POST' => '#unread', - )); - } - else if (isset($topic_tracking_info[$topic_id]) && $topic_data['topic_last_post_time'] > $topic_tracking_info[$topic_id]) - { - $template->assign_vars(array( - 'U_VIEW_UNREAD_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&view=unread") . '#unread', - )); - } -} -else if (!$all_marked_read) -{ - $last_page = ((floor($start / $config['posts_per_page']) + 1) == max(ceil($total_posts / $config['posts_per_page']), 1)) ? true : false; - - // What can happen is that we are at the last displayed page. If so, we also display the #unread link based in $post_unread - if ($last_page && $post_unread) - { - $template->assign_vars(array( - 'U_VIEW_UNREAD_POST' => '#unread', - )); - } - else if (!$last_page) - { - $template->assign_vars(array( - 'U_VIEW_UNREAD_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&view=unread") . '#unread', - )); - } -} - -// We overwrite $_REQUEST['f'] if there is no forum specified -// to be able to display the correct online list. -// One downside is that the user currently viewing this topic/post is not taken into account. -if (empty($_REQUEST['f'])) -{ - $_REQUEST['f'] = $forum_id; -} - -// Output the page -page_header($user->lang['VIEW_TOPIC'] .' - ' . $topic_data['topic_title']); - -$template->set_filenames(array( - 'body' => ($view == 'print') ? 'viewtopic_print.html' : 'viewtopic_body.html') -); -make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx"), $forum_id); - -page_footer(); +include($phpbb_root_path . 'includes/page_tail.'.$phpEx); ?> \ No newline at end of file