diff --git a/phpBB/ucp/ucp_activate.php b/phpBB/ucp/ucp_activate.php
deleted file mode 100644
index 303a0e225c..0000000000
--- a/phpBB/ucp/ucp_activate.php
+++ /dev/null
@@ -1,95 +0,0 @@
-sql_query($sql);
-
- if ($row = $db->sql_fetchrow($result))
- {
- if ($row['user_active'] && $row['user_actkey'] == '')
- {
- meta_refresh(3, "index.$phpEx$SID");
- trigger_error($user->lang['Already_activated']);
- }
- else if ($row['user_actkey'] == $_GET['key'])
- {
- $sql_update_pass = ($row['user_newpasswd'] != '') ? ", user_password = '" . $db->sql_escape($row['user_newpasswd']) . "', user_newpasswd = ''" : '';
-
- $sql = "UPDATE " . USERS_TABLE . "
- SET user_active = 1, user_actkey = ''" . $sql_update_pass . "
- WHERE user_id = " . $row['user_id'];
- $result = $db->sql_query($sql);
-
- if ($config['require_activation'] == USER_ACTIVATION_ADMIN && $sql_update_pass == '')
- {
- ucp::load('includes/emailer');
- $emailer = new emailer($config['smtp_delivery']);
-
- $emailer->use_template('admin_welcome_activated', $row['user_lang']);
- $emailer->to($row['user_email']);
-
- $emailer->assign_vars(array(
- 'SITENAME' => $config['sitename'],
- 'USERNAME' => $row['username'],
- 'PASSWORD' => $password_confirm,
- 'EMAIL_SIG' => str_replace('
', "\n", "-- \n" . $config['board_email_sig']))
- );
- $emailer->send();
- $emailer->reset();
-
- meta_refresh(3, "index.$phpEx$SID");
- trigger_error($user->lang['Account_active_admin']);
- }
- else
- {
- meta_refresh(3, "index.$phpEx$SID");
- $message = ($sql_update_pass == '') ? $user->lang['Account_active'] : $user->lang['Password_activated'];
- trigger_error($message);
- }
-
- set_config('newest_user_id', $row['user_id']);
- set_config('newest_username', $row['username']);
- set_config('num_users', $config['num_users'] + 1, TRUE);
- }
- else
- {
- trigger_error($user->lang['Wrong_activation']);
- }
- }
- else
- {
- trigger_error($user->lang['No_such_user']);
- }
- $db->sql_freeresult($result);
- }
-}
-
-?>
\ No newline at end of file
diff --git a/phpBB/ucp/ucp_main.php b/phpBB/ucp/ucp_main.php
deleted file mode 100644
index b4d86758be..0000000000
--- a/phpBB/ucp/ucp_main.php
+++ /dev/null
@@ -1,360 +0,0 @@
-subsection($submodules, $submode);
- unset($submodules);
-
- switch ($submode)
- {
- case 'front':
-
- if ($config['load_db_lastread'])
- {
- $sql = 'SELECT mark_time
- FROM ' . FORUMS_TRACK_TABLE . '
- WHERE forum_id = 0
- AND user_id = ' . $user->data['user_id'];
- $result = $db->sql_query($sql);
-
- $track_data = $db->sql_fetchrow($result);
- $db->sql_freeresult($result);
- }
- else
- {
- $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : array();
- $tracking_forums = (isset($_COOKIE[$config['cookie_name'] . '_f'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_f']) : array();
- }
-
- $i = 0;
- $topic_type = $user->lang['VIEW_TOPIC_ANNOUNCEMENT'];
- $folder = 'folder_announce';
- $folder_new = $folder . '_new';
-
- $sql_tracking = (($config['load_db_lastread'] || $config['load_db_track']) && $user->data['user_id'] != ANONYMOUS) ? 'LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id AND tt.user_id = ' . $user->data['user_id'] . ')' : '';
- $sql_select = (($config['load_db_lastread'] || $config['load_db_track']) && $user->data['user_id'] != ANONYMOUS) ? ', tt.mark_type, tt.mark_time' : '';
- $sql = "SELECT t.* $sql_select
- FROM (" . TOPICS_TABLE . " t
- $sql_tracking)
- WHERE t.forum_id = 0
- AND t.topic_type = " . POST_ANNOUNCE . '
- ORDER BY t.topic_last_post_time DESC';
- $result = $db->sql_query_limit($sql, $config['topics_per_page']);
-
- while ($row = $db->sql_fetchrow($result))
- {
- $forum_id = $row['forum_id'];
- $topic_id = $row['topic_id'];
-
- if ($row['topic_status'] == ITEM_LOCKED)
- {
- $topic_type = $user->lang['VIEW_TOPIC_LOCKED'];
- $folder = 'folder_locked';
- $folder_new = 'folder_locked_new';
- }
-
- $unread_topic = ($user->data['user_id'] != ANONYMOUS) ? true : false;
- if ($user->data['user_id'] != ANONYMOUS)
- {
- $topic_check = (!$config['load_db_lastread']) ? $tracking_topics[$topic_id] : $row['mark_time'];
- $forum_check = (!$config['load_db_lastread']) ? $tracking_forums[$forum_id] : $track_data['mark_time'];
-
- if ($topic_check > $row['topic_last_post_time'] || $forum_check > $row['topic_last_post_time'])
- {
- $unread_topic = false;
- }
- }
-
- $newest_post_img = ($unread_topic) ? "" . $user->img('icon_post_newest', 'VIEW_NEWEST_POST') . ' ' : '';
- $folder_img = ($unread_topic) ? $folder_new : $folder;
- $folder_alt = ($unread_topic) ? 'NEW_POSTS' : (($row['topic_status'] == ITEM_LOCKED) ? 'TOPIC_LOCKED' : 'NO_NEW_POSTS');
-
- // Posted image?
- if (!empty($row['mark_type']))
- {
- $folder_img .= '_posted';
- }
-
- // Goto message generation
- $replies = ($auth->acl_get('m_approve')) ? $row['topic_replies_real'] : $row['topic_replies'];
-
- if (($replies + 1) > intval($config['posts_per_page']))
- {
- $total_pages = ceil(($replies + 1) / intval($config['posts_per_page']));
- $goto_page = ' [ ' . $user->img('icon_post', 'GOTO_PAGE') . $user->lang['GOTO_PAGE'] . ': ';
-
- $times = 1;
- for($j = 0; $j < $replies + 1; $j += intval($config['posts_per_page']))
- {
- $goto_page .= "$times";
- if ($times == 1 && $total_pages > 4)
- {
- $goto_page .= ' ... ';
- $times = $total_pages - 3;
- $j += ($total_pages - 4) * intval($config['posts_per_page']);
- }
- else if ($times < $total_pages)
- {
- $goto_page .= ', ';
- }
- $times++;
- }
- $goto_page .= ' ] ';
- }
- else
- {
- $goto_page = '';
- }
-
- $view_topic_url = "viewtopic.$phpEx$SID&f=$forum_id&t=$topic_id";
-
- $last_post_img = "' . $user->img('icon_post_latest', 'VIEW_LATEST_POST') . '';
-
- $last_post_author = ($row['topic_last_poster_id'] == ANONYMOUS) ? (($row['topic_last_poster_name'] != '') ? $row['topic_last_poster_name'] . ' ' : $user->lang['GUEST'] . ' ') : "' . $row['topic_last_poster_name'] . '';
-
- $template->assign_block_vars('topicrow', array(
- 'FORUM_ID' => $forum_id,
- 'TOPIC_ID' => $topic_id,
- 'LAST_POST_TIME' => $user->format_date($row['topic_last_post_time']),
- 'LAST_POST_AUTHOR' => $last_post_author,
- 'GOTO_PAGE' => $goto_page,
- 'TOPIC_TITLE' => (!empty($censors)) ? preg_replace($censors['match'], $censors['replace'], $row['topic_title']) : $row['topic_title'],
- 'TOPIC_TYPE' => $topic_type,
-
- 'LAST_POST_IMG' => $last_post_img,
- 'NEWEST_POST_IMG' => $newest_post_img,
- 'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt),
- 'ATTACH_ICON_IMG' => ($auth->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_attach', '') : '',
-
- 'S_ROW_COUNT' => $i,
- 'S_USER_POSTED' => (!empty($row['mark_type'])) ? true : false,
-
- 'U_VIEW_TOPIC' => $view_topic_url)
- );
-
- $i++;
- }
- $db->sql_freeresult($result);
-
-
-
- break;
-
- case 'watched':
-
- // Subscribed Topics
- if ($config['load_db_lastread'])
- {
- $sql = 'SELECT mark_time
- FROM ' . FORUMS_TRACK_TABLE . '
- WHERE forum_id = 0
- AND user_id = ' . $user->data['user_id'];
- $result = $db->sql_query($sql);
-
- $track_data = $db->sql_fetchrow($result);
- $db->sql_freeresult($result);
- }
- else
- {
- $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : array();
- $tracking_forums = (isset($_COOKIE[$config['cookie_name'] . '_f'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_f']) : array();
- }
-
-
- $sql_tracking = (($config['load_db_lastread'] || $config['load_db_track']) && $user->data['user_id'] != ANONYMOUS) ? 'LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id AND tt.user_id = ' . $user->data['user_id'] . ')' : '';
- $sql_select = (($config['load_db_lastread'] || $config['load_db_track']) && $user->data['user_id'] != ANONYMOUS) ? ', tt.mark_type, tt.mark_time' : '';
- $sql = "SELECT t.* $sql_select
- FROM (" . TOPICS_TABLE . " t
- $sql_tracking), " . TOPICS_WATCH_TABLE . ' tw
- WHERE tw.user_id = ' . $user->data['user_id'] . '
- AND t.topic_id = tw.topic_id
- ORDER BY t.topic_last_post_time DESC';
- $result = $db->sql_query_limit($sql, $config['topics_per_page']);
-
- $i = 0;
- while ($row = $db->sql_fetchrow($result))
- {
- $forum_id = $row['forum_id'];
- $topic_id = $row['topic_id'];
-
- // Goto message generation
- $replies = ($auth->acl_get('m_approve')) ? $row['topic_replies_real'] : $row['topic_replies'];
-
-
- $topic_type = '';
- switch ($row['topic_type'])
- {
- case POST_ANNOUNCE:
- $topic_type = $user->lang['VIEW_TOPIC_ANNOUNCEMENT'];
- $folder = 'folder_announce';
- $folder_new = 'folder_announce_new';
- break;
-
- case POST_STICKY:
- $topic_type = $user->lang['VIEW_TOPIC_STICKY'];
- $folder = 'folder_sticky';
- $folder_new = 'folder_sticky_new';
- break;
-
- default:
- if ($replies >= intval($config['hot_threshold']))
- {
- $folder = 'folder_hot';
- $folder_new = 'folder_hot_new';
- }
- else
- {
- $folder = 'folder';
- $folder_new = 'folder_new';
- }
- break;
- }
-
- if ($row['topic_status'] == ITEM_LOCKED)
- {
- $topic_type = $user->lang['VIEW_TOPIC_LOCKED'];
- $folder = 'folder_locked';
- $folder_new = 'folder_locked_new';
- }
-
- $unread_topic = ($user->data['user_id'] != ANONYMOUS) ? true : false;
- if ($user->data['user_id'] != ANONYMOUS)
- {
- $topic_check = (!$config['load_db_lastread']) ? $tracking_topics[$topic_id] : $row['mark_time'];
- $forum_check = (!$config['load_db_lastread']) ? $tracking_forums[$forum_id] : $track_data['mark_time'];
-
- if ($topic_check > $row['topic_last_post_time'] || $forum_check > $row['topic_last_post_time'])
- {
- $unread_topic = false;
- }
- }
-
- $newest_post_img = ($unread_topic) ? "" . $user->img('icon_post_newest', 'VIEW_NEWEST_POST') . ' ' : '';
- $folder_img = ($unread_topic) ? $folder_new : $folder;
- $folder_alt = ($unread_topic) ? 'NEW_POSTS' : (($row['topic_status'] == ITEM_LOCKED) ? 'TOPIC_LOCKED' : 'NO_NEW_POSTS');
-
- // Posted image?
- if (!empty($row['mark_type']))
- {
- $folder_img .= '_posted';
- }
-
- if (($replies + 1) > intval($config['posts_per_page']))
- {
- $total_pages = ceil(($replies + 1) / intval($config['posts_per_page']));
- $goto_page = ' [ ' . $user->img('icon_post', 'GOTO_PAGE') . $user->lang['GOTO_PAGE'] . ': ';
-
- $times = 1;
- for($j = 0; $j < $replies + 1; $j += intval($config['posts_per_page']))
- {
- $goto_page .= "$times";
- if ($times == 1 && $total_pages > 4)
- {
- $goto_page .= ' ... ';
- $times = $total_pages - 3;
- $j += ($total_pages - 4) * intval($config['posts_per_page']);
- }
- else if ($times < $total_pages)
- {
- $goto_page .= ', ';
- }
- $times++;
- }
- $goto_page .= ' ] ';
- }
- else
- {
- $goto_page = '';
- }
-
- $view_topic_url = "viewtopic.$phpEx$SID&f=$forum_id&t=$topic_id";
-
- $last_post_img = "' . $user->img('icon_post_latest', 'VIEW_LATEST_POST') . '';
-
- $last_post_author = ($row['topic_last_poster_id'] == ANONYMOUS) ? (($row['topic_last_poster_name'] != '') ? $row['topic_last_poster_name'] . ' ' : $user->lang['GUEST'] . ' ') : "' . $row['topic_last_poster_name'] . '';
-
- $template->assign_block_vars('topicrow', array(
- 'FORUM_ID' => $forum_id,
- 'TOPIC_ID' => $topic_id,
- 'LAST_POST_TIME' => $user->format_date($row['topic_last_post_time']),
- 'LAST_POST_AUTHOR' => $last_post_author,
- 'GOTO_PAGE' => $goto_page,
- 'TOPIC_TITLE' => (!empty($censors)) ? preg_replace($censors['match'], $censors['replace'], $row['topic_title']) : $row['topic_title'],
- 'TOPIC_TYPE' => $topic_type,
-
- 'LAST_POST_IMG' => $last_post_img,
- 'NEWEST_POST_IMG' => $newest_post_img,
- 'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt),
- 'ATTACH_ICON_IMG' => ($auth->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_attach', '') : '',
-
- 'S_ROW_COUNT' => $i,
- 'S_USER_POSTED' => (!empty($row['mark_type'])) ? true : false,
-
- 'U_VIEW_TOPIC' => $view_topic_url)
- );
-
- $i++;
- }
- $db->sql_freeresult($result);
-
-
- // Subscribed Forums
- $sql = "SELECT f.forum_id, f.forum_last_post_time, f.forum_last_post_id, f.left_id, f.right_id, f.forum_status, f.forum_name, f.forum_desc
- FROM " . FORUMS_TABLE . " f, " . FORUMS_WATCH_TABLE . " fw
- WHERE f.forum_id = fw.forum_id
- AND fw.user_id = " . $user->data['user_id'] . "
- ORDER BY f.forum_last_post_time DESC";
- $result = $db->sql_query($sql);
-
- while ($row = $db->sql_fetchrow($result))
- {
-
- }
- $db->sql_freeresult($result);
-
- break;
- }
-
-
- $template->assign_vars(array(
- 'L_TITLE' => $user->lang['UCP_' . strtoupper($submode)],
-
- 'S_DISPLAY_' . strtoupper($submode) => true,
- 'S_HIDDEN_FIELDS' => $s_hidden_fields,
- 'S_UCP_ACTION' => "ucp.$phpEx$SID&i=$id&mode=$submode")
- );
-
- $this->output($user->lang['UCP_MAIN'], 'ucp_main.html');
- }
-}
-
-?>
\ No newline at end of file
diff --git a/phpBB/ucp/ucp_pm.php b/phpBB/ucp/ucp_pm.php
deleted file mode 100644
index 142cff9f58..0000000000
--- a/phpBB/ucp/ucp_pm.php
+++ /dev/null
@@ -1,33 +0,0 @@
-
\ No newline at end of file
diff --git a/phpBB/ucp/ucp_prefs.php b/phpBB/ucp/ucp_prefs.php
deleted file mode 100644
index 7ad954e6d6..0000000000
--- a/phpBB/ucp/ucp_prefs.php
+++ /dev/null
@@ -1,74 +0,0 @@
-subsection($submodules, $submode);
- unset($submodules);
-
- switch($submode)
- {
- case 'personal':
- $template->assign_vars(array(
- 'VIEW_EMAIL_YES' => ($user->data['user_viewemail ']) ? ' checked="checked"' : '',
- 'VIEW_EMAIL_NO' => (!$user->data['user_viewemail ']) ? ' checked="checked"' : '',
- 'DATE_FORMAT' => $user->data['user_dateformat'],
-
- 'S_LANG_OPTIONS' => language_select($user->data['user_lang']),
- 'S_STYLE_OPTIONS' => style_select($user->data['user_style']),
- 'S_TZ_OPTIONS' => tz_select($user->data['user_timezone']),)
- );
- break;
-
- case 'view':
- break;
-
- case 'post':
- break;
-
- default:
- break;
- }
-
- $template->assign_vars(array(
- 'L_TITLE' => $user->lang['UCP_' . strtoupper($submode)],
-
- 'S_DISPLAY_' . strtoupper($submode) => true,
- 'S_HIDDEN_FIELDS' => $s_hidden_fields,
- 'S_UCP_ACTION' => "ucp.$phpEx$SID&i=$id&mode=$submode")
- );
-
- $this->output($user->lang['UCP_PROFILE'], 'ucp_prefs.html');
- }
-}
-
-?>
\ No newline at end of file
diff --git a/phpBB/ucp/ucp_profile.php b/phpBB/ucp/ucp_profile.php
deleted file mode 100644
index b1513e0e7f..0000000000
--- a/phpBB/ucp/ucp_profile.php
+++ /dev/null
@@ -1,241 +0,0 @@
-subsection($submodules, $submode);
- unset($submodules);
-
- switch ($submode)
- {
- case 'reg_details':
-
- $template->assign_vars(array(
- 'USERNAME' => $user->data['username'],
- 'EMAIL' => $user->data['user_email'],
-
- 'S_CHANGE_USERNAME' => $config['allow_namechange'] & $auth->acl_get('u_chgname'),
- 'S_CHANGE_EMAIL' => $auth->acl_get('u_chgemail'),
- 'S_CHANGE_PASSWORD' => $auth->acl_get('u_chgpass'), )
- );
- break;
-
- case 'profile_info':
-
- list($day, $month, $year) = explode('-', $user->data['user_birthday']);
-
- $s_birthday_day_options = '';
- for ($i = 1; $i < 32; $i++)
- {
- $selected = ($i == $day) ? ' selected="selected"' : '';
- $s_birthday_day_options .= "";
- }
-
- $s_birthday_month_options = '';
- for ($i = 1; $i < 13; $i++)
- {
- $selected = ($i == $month) ? ' selected="selected"' : '';
- $s_birthday_month_options .= "";
- }
- $s_birthday_year_options = '';
-
- $now = getdate();
- for ($i = $now['year'] - 100; $i < $now['year']; $i++)
- {
- $selected = ($i == $year) ? ' selected="selected"' : '';
- $s_birthday_year_options .= "";
- }
- unset($now);
-
- $template->assign_vars(array(
- 'ICQ' => $user->data['user_icq'],
- 'YIM' => $user->data['user_yim'],
- 'AIM' => $user->data['user_aim'],
- 'MSNM' => $user->data['user_msnm'],
- 'JABBER' => $user->data['user_jabber'],
- 'WEBSITE' => $user->data['user_website'],
- 'LOCATION' => $user->data['user_from'],
- 'OCCUPATION'=> $user->data['user_occ'],
- 'INTERESTS' => $user->data['user_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,)
- );
- break;
-
- case 'signature':
-
- $this->loadfile('includes/functions_posting');
-
- $html_status = ($config['allow_html']) ? true : false;
- $bbcode_status = ($config['allow_bbcode']) ? true : false;
- $smilies_status = ($config['allow_smilies']) ? true : false;
- $img_status = ($config['allow_img']) ? true : false;
- $flash_status = ($config['allow_flash']) ? true : false;
-
- $enable_html = (isset($_POST['disable_html'])) ? !$_POST['disable_html'] : $config['allow_html'];
- $enable_bbcode = (isset($_POST['disable_bbcode'])) ? !$_POST['disable_bbcode'] : $config['allow_bbcode'];
- $enable_smilies = (isset($_POST['disable_smilies'])) ? !$_POST['disable_smilies'] : $config['allow_smilies'];
- $enable_urls = (isset($_POST['disable_magic_url'])) ? !$_POST['disable_magic_url'] : 1;
-
- decode_text($user->data['user_sig'], $user->data['user_sig_bbcode_uid']);
- $signature = (!empty($_POST['signature'])) ? htmlspecialchars($_POST['signature']) : $user->data['user_sig'];
-
- $error = array();
- if ($_POST['submit'])
- {
- if (strlen($signature) > $config['max_sig_chars'])
- {
- $error[] = $user->lang['SIGNATURE_TOO_LONG'];
- }
-
- if (!sizeof($error))
- {
- $this->loadfile('includes/message_parser');
-
- $message_parser = new parse_message();
- $message_parser->message = trim(stripslashes($signature));
- $message_parser->parse($enable_html, $enable_bbcode, $enable_urls, $enable_smilies);
- $signature = $message_parser->message;
-
- $sql_ary = array(
- 'user_sig' => $signature,
- 'user_sig_bbcode_uid' => $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);
-
- meta_refresh(3, "ucp.$phpEx$SID&i=$id&mode=$submode");
- trigger_error('');
- }
- }
-
- $signature_preview = '';
- if ($_POST['preview'])
- {
- // Fudge-o-rama ...
-
- global $phpbb_root_path;
-
- $this->loadfile('includes/message_parser');
-
- $signature_preview = $signature;
-
- $message_parser = new parse_message();
- $message_parser->message = trim(stripslashes($signature_preview));
- $message_parser->parse($enable_html, $enable_bbcode, $enable_urls, $enable_smilies);
- $signature_preview = $message_parser->message;
-
- if ($enable_bbcode)
- {
- $this->loadfile('includes/bbcode');
- $bbcode = new bbcode($message_parser->bbcode_bitfield);
-
- // Second parse bbcode here
- $signature_preview = $bbcode->bbcode_second_pass($signature_preview, $message_parser->bbcode_uid);
- }
-
- // If we allow users to disable display of emoticons
- // we'll need an appropriate check and preg_replace here
- $signature_preview = (empty($enable_smilies) || empty($config['allow_smilies'])) ? preg_replace('#
(((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$censors['match'], \$censors['replace'], '\\0')", '>' . $signature_preview . '<'), 1, -1));
- }
-
- $signature_preview = str_replace("\n", '
', $signature_preview);
- }
-
- $template->assign_vars(array(
- 'ERROR' => (sizeof($error)) ? implode('
', $error) : '',
- 'SIGNATURE' => $signature,
- 'SIGNATURE_PREVIEW' => $signature_preview,
-
- 'S_SIGNATURE_PREVIEW' => ($signature_preview) ? true : false,
-
- 'S_HTML_CHECKED' => (!$enable_html) ? 'checked="checked"' : '',
- 'S_BBCODE_CHECKED' => (!$enable_bbcode) ? 'checked="checked"' : '',
- 'S_SMILIES_CHECKED' => (!$enable_smilies) ? 'checked="checked"' : '',
- 'S_MAGIC_URL_CHECKED' => (!$enable_urls) ? 'checked="checked"' : '',
-
- 'HTML_STATUS' => ($html_status) ? $user->lang['HTML_IS_ON'] : $user->lang['HTML_IS_OFF'],
- 'BBCODE_STATUS' => ($bbcode_status) ? sprintf($user->lang['BBCODE_IS_ON'], '', '') : sprintf($user->lang['BBCODE_IS_OFF'], '', ''),
- 'SMILIES_STATUS'=> ($smilies_status) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_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'],
-
- 'L_SIGNATURE_EXPLAIN' => sprintf($user->lang['SIGNATURE_EXPLAIN'], $config['max_sig_chars']),
-
- 'S_HTML_ALLOWED' => $config['allow_html'],
- 'S_BBCODE_ALLOWED' => $config['allow_bbcode'],
- 'S_SMILIES_ALLOWED' => $config['allow_smilies'],)
- );
- break;
-
- case 'avatar':
-
- $template->assign_vars(array(
- 'AVATAR' => '
',
-
- 'S_UPLOAD_AVATAR_FILE' => true,
- 'S_UPLOAD_AVATAR_URL' => true,
- 'S_LINK_AVATAR' => true,
- 'S_GALLERY_AVATAR' => true,)
- );
-
- break;
-
- default:
- break;
- }
-
- $template->assign_vars(array(
- 'L_TITLE' => $user->lang['UCP_' . strtoupper($submode)],
-
- 'S_DISPLAY_' . strtoupper($submode) => true,
- 'S_HIDDEN_FIELDS' => $s_hidden_fields,
- 'S_UCP_ACTION' => "ucp.$phpEx$SID&i=$id&mode=$submode")
- );
-
- $this->output($user->lang['UCP_PROFILE'], 'ucp_profile.html');
- }
-}
-
-?>
\ No newline at end of file
diff --git a/phpBB/ucp/ucp_register.php b/phpBB/ucp/ucp_register.php
deleted file mode 100644
index e5bad26eae..0000000000
--- a/phpBB/ucp/ucp_register.php
+++ /dev/null
@@ -1,183 +0,0 @@
-lang['UCP_REGISTER_DISABLE']);
- }
-
- $coppa = (isset($_REQUEST['coppa'])) ? ((!empty($_REQUEST['coppa'])) ? 1 : 0) : false;
- $agreed = (!empty($_POST['agreed'])) ? 1 : 0;
-
- //
- if (!$agreed)
- {
- 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' => "ucp.$phpEx$SID&mode=register&coppa=0",
- 'U_COPPA_YES' => "ucp.$phpEx$SID&mode=register&coppa=1",
-
- 'S_SHOW_COPPA' => true,
- 'S_REGISTER_ACTION' => "ucp.$phpEx$SID&mode=register")
- );
- }
- else
- {
- $template->assign_vars(array(
- 'L_AGREEMENT' => $user->lang['UCP_AGREEMENT'],
-
- 'S_SHOW_COPPA' => false,
- 'S_REGISTER_ACTION' => "ucp.$phpEx$SID&mode=register")
- );
- }
-
- $this->output($user->lang['REGISTER'], 'ucp_agreement.html');
- }
-
- // Check and initialize some variables if needed
- $error = array();
- if (isset($_POST['submit']))
- {
- // Load the userdata manipulation methods
- $this->loadfile('includes/functions_user');
- $userdata = new userdata();
-
- if ($message = $userdata->add_user($coppa))
- {
- $message = $message . '
' . sprintf($user->lang['RETURN_INDEX'], "", '');
- trigger_error($message);
- }
- }
-
- // If an error occured we need to stripslashes on returned data
- $username = (isset($_POST['username'])) ? stripslashes(htmlspecialchars($_POST['username'])) : '';
- $password = (isset($_POST['new_password'])) ? stripslashes(htmlspecialchars($_POST['new_password'])) : '';
- $password_confirm = (isset($_POST['password_confirm'])) ? stripslashes(htmlspecialchars($_POST['password_confirm'])) : '';
- $email = (isset($_POST['email'])) ? stripslashes(htmlspecialchars($_POST['email'])) : '';
- $email_confirm = (isset($_POST['email_confirm'])) ? stripslashes(htmlspecialchars($_POST['email_confirm'])) : '';
- $lang = (isset($_POST['lang'])) ? htmlspecialchars($_POST['lang']) : '';
- $tz = (isset($_POST['tz'])) ? intval($_POST['tz']) : $config['board_timezone'];
-
- $s_hidden_fields = '';
-
- // Visual Confirmation - Show images
- $confirm_image = '';
- if (!empty($config['enable_confirm']))
- {
- $sql = "SELECT session_id
- FROM " . SESSIONS_TABLE;
- $result = $db->sql_query($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)";
- $db->sql_query($sql);
- }
- $db->sql_freeresult($result);
-
- $sql = "SELECT COUNT(session_id) AS attempts
- FROM " . CONFIRM_TABLE . "
- WHERE session_id = '" . $userdata['session_id'] . "'";
- $result = $db->sql_query($sql);
-
- if ($row = $db->sql_fetchrow($result))
- {
- if ($row['attempts'] > 5)
- {
- trigger_error($user->lang['Too_many_registers']);
- }
- }
- $db->sql_freeresult($result);
-
- $code = $this->gen_rand_string(6);
- $confirm_id = md5(uniqid($user_ip));
-
- $sql = "INSERT INTO " . CONFIRM_TABLE . " (confirm_id, session_id, code)
- VALUES ('$confirm_id', '" . $user->data['session_id'] . "', '$code')";
- $db->sql_query($sql);
-
- $confirm_image = (@extension_loaded('zlib')) ? "
" : '




';
- $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(
- 'USERNAME' => $username,
- 'PASSWORD' => $password,
- 'PASSWORD_CONFIRM' => $password_confirm,
- 'EMAIL' => $email,
- 'EMAIL_CONFIRM' => $email,
- 'CONFIRM_IMG' => $confirm_image,
- 'ERROR' => (sizeof($userdata->error)) ? implode('
', $userdata->error) : '',
-
- 'L_CONFIRM_EXPLAIN' => sprintf($user->lang['CONFIRM_EXPLAIN'], '', ''),
- 'L_ITEMS_REQUIRED' => $l_reg_cond,
-
- 'S_LANG_OPTIONS' => language_select($lang),
- 'S_TZ_OPTIONS' => tz_select($tz),
- 'S_CONFIRM_CODE' => ($config['enable_confirm']) ? true : false,
- 'S_COPPA' => $coppa,
- 'S_HIDDEN_FIELDS' => $s_hidden_fields,
- 'S_UCP_ACTION' => "ucp.$phpEx$SID&mode=register")
- );
-
- //
- $this->output($user->lang['REGISTER'], 'ucp_register.html');
- }
-}
-
-?>
\ No newline at end of file
diff --git a/phpBB/ucp/ucp_zebra.php b/phpBB/ucp/ucp_zebra.php
deleted file mode 100644
index b5a4051390..0000000000
--- a/phpBB/ucp/ucp_zebra.php
+++ /dev/null
@@ -1,33 +0,0 @@
-
\ No newline at end of file
diff --git a/phpBB/ucp/usercp_activate.php b/phpBB/ucp/usercp_activate.php
deleted file mode 100755
index f62caee3ed..0000000000
--- a/phpBB/ucp/usercp_activate.php
+++ /dev/null
@@ -1,117 +0,0 @@
-sql_query($sql);
-
-if ( $row = $db->sql_fetchrow($result) )
-{
- if ( $row['user_active'] && $row['user_actkey'] == '' )
- {
- $template->assign_vars(array(
- 'META' => '')
- );
-
- trigger_error($user->lang['Already_activated']);
- }
- else if ( $row['user_actkey'] == $_GET['act_key'] )
- {
- $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'];
-
- $result = $db->sql_query($sql);
-
- if ( $config['require_activation'] == USER_ACTIVATION_ADMIN && $sql_update_pass == '' )
- {
- include($phpbb_root_path . 'includes/emailer.'.$phpEx);
- $emailer = new emailer($config['smtp_delivery']);
-
- $email_headers = 'From: ' . $config['board_email'] . "\nReturn-Path: " . $config['board_email'] . "\n";
-
- $emailer->use_template('admin_welcome_activated', $row['user_lang']);
- $emailer->email_address($row['user_email']);
- $emailer->set_subject();//$lang['Account_activated_subject']
- $emailer->extra_headers($email_headers);
-
- $emailer->assign_vars(array(
- 'SITENAME' => $config['sitename'],
- 'USERNAME' => $username,
- 'PASSWORD' => $password_confirm,
- 'EMAIL_SIG' => str_replace('
', "\n", "-- \n" . $config['board_email_sig']))
- );
- $emailer->send();
- $emailer->reset();
-
- $template->assign_vars(array(
- 'META' => '')
- );
-
- trigger_error($user->lang['Account_active_admin']);
- }
- else
- {
- $template->assign_vars(array(
- 'META' => '')
- );
-
- $message = ( $sql_update_pass == '' ) ? $user->lang['Account_active'] : $user->lang['Password_activated'];
- trigger_error($message);
- }
-
- // Sync config
- $sql = "UPDATE " . CONFIG_TABLE . "
- SET config_value = " . $row['user_id'] . "
- WHERE config_name = 'newest_user_id'";
- $db->sql_query($sql);
- $sql = "UPDATE " . CONFIG_TABLE . "
- SET config_value = '" . $row['username'] . "'
- WHERE config_name = 'newest_username'";
- $db->sql_query($sql);
- $sql = "UPDATE " . CONFIG_TABLE . "
- SET config_value = " . ($config['num_users'] + 1) . "
- WHERE config_name = 'num_users'";
- $db->sql_query($sql);
-
- }
- else
- {
- trigger_error($user->lang['Wrong_activation']);
- }
-}
-else
-{
- trigger_error($user->lang['No_such_user']);
-}
-
-?>
\ No newline at end of file
diff --git a/phpBB/ucp/usercp_avatar.php b/phpBB/ucp/usercp_avatar.php
deleted file mode 100755
index 2a9ef1a304..0000000000
--- a/phpBB/ucp/usercp_avatar.php
+++ /dev/null
@@ -1,348 +0,0 @@
-' . $lang['Avatar_filetype'] : $lang['Avatar_filetype'];
- break;
- }
-
- return false;
-}
-
-function user_avatar_delete($avatar_type, $avatar_file)
-{
- global $config, $userdata;
-
- if ( $avatar_type == USER_AVATAR_UPLOAD && $avatar_file != '' )
- {
- if ( @file_exists('./' . $config['avatar_path'] . '/' . $avatar_file) )
- {
- @unlink('./' . $config['avatar_path'] . '/' . $avatar_file);
- }
- }
-
- return ", user_avatar = '', user_avatar_type = " . USER_AVATAR_NONE;
-}
-
-function user_avatar_gallery($mode, &$error, &$error_msg, $avatar_filename)
-{
- return ( $mode == 'editprofile' ) ? ", user_avatar = '" . str_replace("\'", "''", $avatar_filename) . "', user_avatar_type = " . USER_AVATAR_GALLERY : '';
-}
-
-function user_avatar_url($mode, &$error, &$error_msg, $avatar_filename)
-{
- if ( !preg_match('#^http:\/\/#i', $avatar_filename) )
- {
- $avatar_filename = 'http://' . $avatar_filename;
- }
-
- if ( !preg_match('#^(http:\/\/[a-z0-9\-]+?\.([a-z0-9\-]+\.)*[a-z]+(:[0-9]+)*\/[^\"]*?\.(gif|jpg|jpeg|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 $config, $user_ip, $db, $lang;
-
- $ini_val = ( @phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var';
-
- if ( $avatar_mode == 'remote' && preg_match('/^(http:\/\/)?([\w\-\.]+)\:?([0-9]*)\/(.*)$/', $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, $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 < $config['avatar_filesize'] )
- {
- $avatar_data = substr($avatar_data, strlen($avatar_data) - $avatar_filesize, $avatar_filesize);
-
- $tmp_path = ( !@$ini_val('safe_mode') ) ? '/tmp' : './' . $config['avatar_path'] . '/tmp';
- $tmp_filename = tempnam($tmp_path, uniqid($user_ip) . '-');
-
- $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) = @getimagesize($tmp_filename);
- }
- else
- {
- $l_avatar_size = sprintf($lang['Avatar_filesize'], round($config['avatar_filesize'] / 1024));
-
- $error = true;
- $error_msg = ( !empty($error_msg) ) ? $error_msg . '
' . $l_avatar_size : $l_avatar_size;
- }
- }
- else if ( $avatar_mode == 'local' && file_exists($avatar_filename) && preg_match('/\.(jpg|jpeg|gif|png)$/i', $avatar_realname) )
- {
- if ( $avatar_filesize <= $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($config['avatar_filesize'] / 1024));
-
- $error = true;
- $error_msg = ( !empty($error_msg) ) ? $error_msg . '
' . $l_avatar_size : $l_avatar_size;
- return;
- }
-
- list($width, $height) = @getimagesize($avatar_filename);
- }
-
- if ( !($imgtype = check_image_type($avatar_filetype, $error, $error_msg)) )
- {
- return;
- }
-
- if ( $width <= $config['avatar_max_width'] && $height <= $config['avatar_max_height'] )
- {
- $new_filename = uniqid() . $imgtype;
-
- if ( $mode == 'editprofile' && $current_type == USER_AVATAR_UPLOAD && $current_avatar != '' )
- {
- if ( file_exists('./' . $config['avatar_path'] . '/' . $current_avatar) )
- {
- @unlink('./' . $config['avatar_path'] . '/' . $current_avatar);
- }
- }
-
- if( $avatar_mode == 'remote' )
- {
- @copy($tmp_filename, './' . $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';
- }
-
- $move_file($avatar_filename, './' . $config['avatar_path'] . "/$new_filename");
- }
-
- @chmod('./' . $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'], $config['avatar_max_width'], $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, &$popuppm, &$notifyreply, &$attachsig, &$allowhtml, &$allowbbcode, &$allowsmilies, &$hideonline, &$style, &$language, &$timezone, &$dateformat)
-{
- global $config, $db, $template, $lang, $images, $theme;
- global $phpbb_root_path, $phpEx;
-
- $dir = @opendir($config['avatar_gallery_path']);
-
- $avatar_images = array();
- while( $file = @readdir($dir) )
- {
- if( $file != '.' && $file != '..' && !is_file($config['avatar_gallery_path'] . '/' . $file) && !is_link($config['avatar_gallery_path'] . '/' . $file) )
- {
- $sub_dir = @opendir($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] = $file . '/' . $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" => $config['avatar_gallery_path'] . '/' . $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', 'popuppm', '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("ucp.$phpEx?mode=$mode"),
- 'S_HIDDEN_FIELDS' => $s_hidden_vars)
- );
-
- return;
-}
-
-?>
diff --git a/phpBB/ucp/usercp_confirm.php b/phpBB/ucp/usercp_confirm.php
deleted file mode 100644
index 5c8e67a7e1..0000000000
--- a/phpBB/ucp/usercp_confirm.php
+++ /dev/null
@@ -1,437 +0,0 @@
-start();
-$user->setup();
-$auth->acl($user->data);
-// End session management
-
-// Do we have an id? No, then just exit
-if (empty($_GET['id']))
-{
- exit;
-}
-
-$confirm_id = $_GET['id'];
-
-// Define available charset
-$chars = array('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', '1', '2', '3', '4', '5', '6', '7', '8', '9');
-
-// Try and grab code for this id and session
-$sql = "SELECT code
- FROM " . CONFIRM_TABLE . "
- WHERE session_id = '" . $user->data['session_id'] . "'
- AND confirm_id = '$confirm_id'";
-$result = $db->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;
-}
-
-// If we can we will generate a single filtered png else we will have to simply
-// output six seperate original pngs ... first way is preferable!
-if (@extension_loaded('zlib'))
-{
- $_png = define_filtered_pngs();
-
- $total_width = 250;
- $total_height = 40;
- $img_height = 25;
- $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(180, 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(180, 255));
- }
-
- $l++;
- }
- else
- {
- for ($k = 0; $k < $total_width; $k++)
- {
- $image .= chr(mt_rand(180, 255));
- }
- }
-
- }
- unset($hold);
-
- $image = create_png(gzcompress($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;
-
-}
-else
-{
- if (!empty($_GET['c']))
- {
- $_png = define_raw_pngs();
-
- $char = substr($code, intval($HTTP_GET_VARS['c']) - 1, 1);
- header('Content-Type: image/png');
- header('Cache-control: no-cache, no-store');
- echo base64_decode($_png[$char]);
-
- unset($_png);
- exit;
- }
-}
-
-exit;
-
-// ---------
-// FUNCTIONS
-//
-
-// 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, 170));
- }
- else if ($pixel > 190)
- {
- $new_line .= chr(mt_rand(180, 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($gzimage, $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);
- // IDAT
- $image .= png_chunk(strlen($gzimage), 'IDAT', $gzimage);
- // 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(
- '1' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A////////////////UAAA/////////////wD//////////////6QAAAD/////////////AP////////////+YBAAAAP////////////8A///////////MSAAAAAAA/////////////wD//////////wAAACgAAAD/////////////AP//////////AABE6AAAAP////////////8A//////////80rP//AAAA/////////////wD///////////////8AAAD/////////////AP///////////////wAAAP////////////8A////////////////AAAA/////////////wD///////////////8AAAD/////////////AP///////////////wAAAP////////////8A////////////////AAAA/////////////wD///////////////8AAAD/////////////AP///////////////wAAAP////////////8A////////////////AAAA/////////////wD///////////////8AAAD/////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- '2' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A////////////0FwUAAw8oP///////////wD//////////5wEAAAAAAAAVPz/////////AP/////////cBAAAAAAAAAAAkP////////8A/////////3AAACTI/+BIAAAo/////////wD/////////LAAAsP///+QAAAD/////////AP////////9QAOQo////+AAADP////////8A//////////////////+wAABA/////////wD/////////////////6CAAAKT/////////AP///////////////+goAAA4/P////////8A///////////////oKAAAGOD//////////wD/////////////3CgAACTY////////////AP///////////+QYAAA46P////////////8A///////////wKAAAVPT//////////////wD//////////0wAADD4////////////////AP/////////AAAAAAAAAAAAAAP////////8A/////////1QAAAAAAAAAAAAA/////////wD/////////EAAAAAAAAAAAAAD/////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- '3' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD///////////+gOAgALID0////////////AP//////////VAAAAAAAACzw//////////8A/////////6QAAAAAAAAAAGT//////////wD/////////RAAATOT4jAAADP//////////AP////////9oOBTk///4AAAI//////////8A////////////////6GgAAFD//////////wD//////////////0gAAAAc4P//////////AP//////////////MAAACKD///////////8A//////////////8UAAAAAEj8/////////wD//////////////9z/1DQAAID/////////AP//////////////////2AAAIP////////8A/////////2g4FPD/////AAAA/////////wD/////////LAAAnP///8wAABT/////////AP////////94AAAUuP/MKAAAXP////////8A/////////+gQAAAAAAAAAAjU/////////wD//////////8AMAAAAAAAIrP//////////AP///////////9hcFAAUXNj///////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- '4' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD////////////////wHAAA////////////AP///////////////2AAAAD///////////8A//////////////+0AAAAAP///////////wD/////////////8BwAAAAA////////////AP////////////9gAAAAAAD///////////8A////////////tAAAQAAAAP///////////wD///////////AcAAzgAAAA////////////AP//////////YAAAmP8AAAD///////////8A/////////7AAAEz//wAAAP///////////wD////////sFAAQ5P//AAAA////////////AP///////1QAAKD///8AAAD///////////8A////////AAAAAAAAAAAAAAAA/////////wD///////8AAAAAAAAAAAAAAAD/////////AP///////wAAAAAAAAAAAAAAAP////////8A/////////////////wAAAP///////////wD/////////////////AAAA////////////AP////////////////8AAAD///////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- '5' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP/////////kAAAAAAAAAAD///////////8A/////////6gAAAAAAAAAAP///////////wD/////////cAAAAAAAAAAA////////////AP////////8wAAC0//////////////////8A////////9AQAAOz//////////////////wD///////+8AAAMSAgIPLz/////////////AP///////4AAAAAAAAAAAJT///////////8A////////SAAAAAAAAAAABND//////////wD///////9MJAx85P/EKAAAXP//////////AP////////////////+8AAAc//////////8A//////////////////wAAAD//////////wD///////9cNBDw////+AAACP//////////AP///////zAAAJj///+4AAA0//////////8A////////fAAADLT/xBgAAIj//////////wD////////oEAAAAAAAAAAc8P//////////AP////////+0CAAAAAAAEMj///////////8A///////////UVBAAHGTg/////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- '6' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD////////////8oDgIACyU/P//////////AP//////////9EQAAAAAAABU//////////8A//////////9gAAAAAAAAAACo/////////wD/////////1AAADKz46EwAAED/////////AP////////98AACc////5BAsVP////////8A/////////0AAAPT//////////////////wD/////////IAAgwDwECES4////////////AP////////8AABQEAAAAAACQ//////////8A/////////wAAAAAAAAAAAAC8/////////wD/////////AAAAPNT/1DgAAEz/////////AP////////8YAADc////1AAAEP////////8A/////////zQAAP//////AAAA/////////wD/////////aAAAwP///+AAABT/////////AP////////+8AAAcvP/gRAAAUP////////8A//////////88AAAAAAAAAADE/////////wD//////////+goAAAAAAAAkP//////////AP////////////B4JAAMRLj///////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- '7' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////wAAAAAAAAAAAAAA/////////wD/////////AAAAAAAAAAAAAAD/////////AP////////8AAAAAAAAAAAAAAP////////8A/////////////////7QAAACI/////////wD////////////////sFAAAYP//////////AP///////////////2QAACj0//////////8A///////////////QBAAAxP///////////wD//////////////1QAAFz/////////////AP/////////////kBAAE3P////////////8A/////////////4AAAFT//////////////wD/////////////JAAAuP//////////////AP///////////9gAABT8//////////////8A////////////mAAAWP///////////////wD///////////9gAACU////////////////AP///////////zQAAMj///////////////8A////////////GAAA6P///////////////wD///////////8AAAD/////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- '8' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A///////////8oDwMAAxAoPz//////////wD//////////EwAAAAAAAAAVPz/////////AP////////+EAAAAAAAAAAAAhP////////8A/////////yQAAEjc/+BMAAAk/////////wD/////////AAAA7P///+wAAAD/////////AP////////8YAADs////7AAAGP////////8A/////////3AAAFDg/9xMAAB0/////////wD/////////9EAAAAAAAAAARPT/////////AP//////////7CgAAAAAACjw//////////8A/////////+ggAAAAAAAAACDo/////////wD/////////ZAAASOD/3EwAAFz/////////AP////////8QAADs////7AAADP////////8A/////////wAAAOj////sAAAA/////////wD/////////KAAAPNT/3EwAACz/////////AP////////+QAAAAAAAAAAAAlP////////8A//////////xcAAAAAAAAAFT8/////////wD///////////+wSBAADECg////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- '9' => array(
- 'data' => 'AP////////////////////////////////8A////////////vEQMACR48P///////////wD//////////5AAAAAAAAAo6P//////////AP/////////EAAAAAAAAAAA8//////////8A/////////1AAAEjg/7wcAAC8/////////wD/////////FAAA4P///8AAAGz/////////AP////////8AAAD//////wAANP////////8A/////////xAAANT////cAAAY/////////wD/////////TAAAOND/1DwAAAD/////////AP////////+8AAAAAAAAAAAAAP////////8A//////////+QAAAAAAAEFAAA/////////wD///////////+4PAgEPMgcACD/////////AP//////////////////8AAARP////////8A/////////1gwEOT///+cAAB8/////////wD/////////QAAATOj4rAwAANT/////////AP////////+gAAAAAAAAAABk//////////8A//////////xEAAAAAAAASPT//////////wD///////////yAJAAIPKD8////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'A' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////1gAAABY/////////////wD////////////sCAAAAAjs////////////AP///////////5QAAAAAAJT///////////8A////////////MAAAZAAAMP///////////wD//////////8wAABj4GAAAzP//////////AP//////////bAAAdP94AABs//////////8A//////////gQAADY/9wAABD4/////////wD/////////qAAAOP///0AAAKj/////////AP////////9EAACc////pAAARP////////8A////////4AAADPT////4EAAA4P///////wD///////+AAAAAAAAAAAAAAACA////////AP///////xwAAAAAAAAAAAAAABz///////8A//////+4AAAAAAAAAAAAAAAAALj//////wD//////1gAAIj/////////gAAAWP//////AP/////sCAAE5P/////////gAAAI7P////8A/////5QAAET///////////9EAACU/////wD/////MAAApP///////////6QAADD/////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'B' => array(
- 'data' => 'AP////////////////////////////////8A////////AAAAAAAAAAAMLID8/////////wD///////8AAAAAAAAAAAAAAFT/////////AP///////wAAAAAAAAAAAAAAAJT///////8A////////AAAA///////cUAAAIP///////wD///////8AAAD////////wAAAA////////AP///////wAAAP///////+wAABj///////8A////////AAAA///////QTAAAZP///////wD///////8AAAAAAAAAAAAAABjg////////AP///////wAAAAAAAAAAAAAASOD///////8A////////AAAAAAAAAAAAAAAAGOD//////wD///////8AAAD//////+zEOAAAVP//////AP///////wAAAP/////////oAAAQ//////8A////////AAAA/////////+wAAAD//////wD///////8AAAD///////zMTAAANP//////AP///////wAAAAAAAAAAAAAAAACU//////8A////////AAAAAAAAAAAAAAAAVPz//////wD///////8AAAAAAAAAAAAcQJj8////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'C' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A////////////tFggAAAURJDw/////////wD/////////6EAAAAAAAAAAABS0////////AP///////+gkAAAAAAAAAAAAAATI//////8A////////RAAADIDU//zUfAgAADT//////wD//////8QAAAzI////////uCR80P//////AP//////aAAAfP////////////////////8A//////8sAADQ/////////////////////wD//////wwAAPj/////////////////////AP//////AAAA//////////////////////8A//////8EAAD0/////////////////////wD//////ygAAND/////////////////////AP//////XAAAfP////////////////////8A//////+0AAAM2P///////6wkfND//////wD///////84AAAMiNz/+NB0BAAAQP//////AP///////+AYAAAAAAAAAAAAAAzQ//////8A/////////9w0AAAAAAAAAAAkzP///////wD///////////yoUBgAACRYqPz/////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'D' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP///////wAAAAAAAAAIKGTQ//////////8A////////AAAAAAAAAAAAAASQ/////////wD///////8AAAAAAAAAAAAAAACk////////AP///////wAAAP/////gpCQAABT0//////8A////////AAAA////////6CAAAJz//////wD///////8AAAD/////////mAAAUP//////AP///////wAAAP/////////YAAAk//////8A////////AAAA//////////wAAAT//////wD///////8AAAD//////////wAAAP//////AP///////wAAAP/////////8AAAA//////8A////////AAAA/////////9gAACD//////wD///////8AAAD/////////pAAATP//////AP///////wAAAP////////wsAACc//////8A////////AAAA//////C8QAAAFPT//////wD///////8AAAAAAAAAAAAAAACk////////AP///////wAAAAAAAAAAAAAEkP////////8A////////AAAAAAAAAAgscNz//////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'E' => array(
- 'data' => 'AP////////////////////////////////8A////////AAAAAAAAAAAAAAAAAP///////wD///////8AAAAAAAAAAAAAAAAA////////AP///////wAAAAAAAAAAAAAAAAD///////8A////////AAAA/////////////////////wD///////8AAAD/////////////////////AP///////wAAAP////////////////////8A////////AAAA/////////////////////wD///////8AAAAAAAAAAAAAAAD/////////AP///////wAAAAAAAAAAAAAAAP////////8A////////AAAAAAAAAAAAAAAA/////////wD///////8AAAD/////////////////////AP///////wAAAP////////////////////8A////////AAAA/////////////////////wD///////8AAAD/////////////////////AP///////wAAAAAAAAAAAAAAAAD///////8A////////AAAAAAAAAAAAAAAAAP///////wD///////8AAAAAAAAAAAAAAAAA////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'F' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////wAAAAAAAAAAAAAAAP///////wD/////////AAAAAAAAAAAAAAAA////////AP////////8AAAAAAAAAAAAAAAD///////8A/////////wAAAP///////////////////wD/////////AAAA////////////////////AP////////8AAAD///////////////////8A/////////wAAAP///////////////////wD/////////AAAAAAAAAAAAAAD/////////AP////////8AAAAAAAAAAAAAAP////////8A/////////wAAAAAAAAAAAAAA/////////wD/////////AAAA////////////////////AP////////8AAAD///////////////////8A/////////wAAAP///////////////////wD/////////AAAA////////////////////AP////////8AAAD///////////////////8A/////////wAAAP///////////////////wD/////////AAAA////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'G' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A///////////QaCwIAAAcRIzs/////////wD////////0YAAAAAAAAAAAABCw////////AP//////9DwAAAAAAAAAAAAAAAS4//////8A//////9gAAAAULjw//jIcAQAACz//////wD/////0AAAAKT/////////qCR80P//////AP////9wAABg//////////////////////8A/////zAAAMT//////////////////////wD/////CAAA+P//////////////////////AP////8AAAD///////8AAAAAAAAA//////8A/////wwAAOz//////wAAAAAAAAD//////wD/////NAAAuP//////AAAAAAAAAP//////AP////98AABM////////////AAAA//////8A/////9gAAACM//////////gAAAD//////wD//////2QAAABMuPD/8MB4GAAAAP//////AP//////9DwAAAAAAAAAAAAAAABE//////8A////////9GQAAAAAAAAAAAAYmPz//////wD//////////9R0NBAABChgsPz/////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'H' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP///////wAAAP////////8AAAD///////8A////////AAAA/////////wAAAP///////wD///////8AAAD/////////AAAA////////AP///////wAAAP////////8AAAD///////8A////////AAAA/////////wAAAP///////wD///////8AAAD/////////AAAA////////AP///////wAAAP////////8AAAD///////8A////////AAAAAAAAAAAAAAAAAP///////wD///////8AAAAAAAAAAAAAAAAA////////AP///////wAAAAAAAAAAAAAAAAD///////8A////////AAAA/////////wAAAP///////wD///////8AAAD/////////AAAA////////AP///////wAAAP////////8AAAD///////8A////////AAAA/////////wAAAP///////wD///////8AAAD/////////AAAA////////AP///////wAAAP////////8AAAD///////8A////////AAAA/////////wAAAP///////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'I' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A//////////8AAAAAAAAAAAD//////////wD//////////wAAAAAAAAAAAP//////////AP//////////AAAAAAAAAAAA//////////8A//////////////8AAAD//////////////wD//////////////wAAAP//////////////AP//////////////AAAA//////////////8A//////////////8AAAD//////////////wD//////////////wAAAP//////////////AP//////////////AAAA//////////////8A//////////////8AAAD//////////////wD//////////////wAAAP//////////////AP//////////////AAAA//////////////8A//////////////8AAAD//////////////wD//////////////wAAAP//////////////AP//////////AAAAAAAAAAAA//////////8A//////////8AAAAAAAAAAAD//////////wD//////////wAAAAAAAAAAAP//////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'J' => array(
- 'data' => 'AP////////////////////////////////8A////////////////////AAAA/////////wD///////////////////8AAAD/////////AP///////////////////wAAAP////////8A////////////////////AAAA/////////wD///////////////////8AAAD/////////AP///////////////////wAAAP////////8A////////////////////AAAA/////////wD///////////////////8AAAD/////////AP///////////////////wAAAP////////8A////////////////////AAAA/////////wD///////////////////8AAAD/////////AP////////8AAAD4/////AAAAP////////8A/////////xwAAMT////UAAAc/////////wD/////////VAAAKND/4EwAAEz/////////AP////////+8AAAAAAAAAAAAtP////////8A//////////9wAAAAAAAAAHT//////////wD///////////+kPAwAFEy0////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'K' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A////////AAAA////////9DwAABjY/////wD///////8AAAD///////Q8AAAY2P//////AP///////wAAAP/////4PAAAGNj///////8A////////AAAA/////FQAABjY/////////wD///////8AAAD///xUAAAY2P//////////AP///////wAAAP/8VAAADMT///////////8A////////AAAA/FQAAABw/////////////wD///////8AAABkAAAAAAzo////////////AP///////wAAAAAADDQAAGD///////////8A////////AAAAAAzE2AQAAMz//////////wD///////8AAAAEsP//bAAAPP//////////AP///////wAAAKz////wEAAAqP////////8A////////AAAA//////+YAAAg+P///////wD///////8AAAD///////wsAACA////////AP///////wAAAP///////7wAAAjk//////8A////////AAAA/////////0wAAFz//////wD///////8AAAD/////////3AgAAMj/////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'L' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////AAAA////////////////////AP////////8AAAD///////////////////8A/////////wAAAP///////////////////wD/////////AAAA////////////////////AP////////8AAAD///////////////////8A/////////wAAAP///////////////////wD/////////AAAA////////////////////AP////////8AAAD///////////////////8A/////////wAAAP///////////////////wD/////////AAAA////////////////////AP////////8AAAD///////////////////8A/////////wAAAP///////////////////wD/////////AAAA////////////////////AP////////8AAAD///////////////////8A/////////wAAAAAAAAAAAAAAAP///////wD/////////AAAAAAAAAAAAAAAA////////AP////////8AAAAAAAAAAAAAAAD///////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'M' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////AAAAAADU///////UAAAAAAD/////AP////8AAAAAAIT//////4QAAAAAAP////8A/////wAAAAAAPP//////PAAAAAAA/////wD/////AAAABAAA7P///+wAAAQAAAD/////AP////8AAAA4AACg////oAAAOAAAAP////8A/////wAAAJAIAFT///9UAAiQAAAA/////wD/////AAAAoEAADPj/+AwAQKAAAAD/////AP////8AAACghAAAvP+8AACEoAAAAP////8A/////wAAAKzIAABs/2wAAMisAAAA/////wD/////AAAAwPwMACD/IAAM/MAAAAD/////AP////8AAADA/1AAAKgAAFD/wAAAAP////8A/////wAAAMD/kAAAGAAAkP/AAAAA/////wD/////AAAA4P/YAAAAAADY/+AAAAD/////AP////8AAADg//8YAAAAGP//4AAAAP////8A/////wAAAOD//1wAAABc///gAAAA/////wD/////AAAA9P//oAAAAKD///QAAAD/////AP////8AAAD////gAAAA4P///wAAAP////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'N' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A////////AAAAjP///////wAAAP///////wD///////8AAAAQ7P//////AAAA////////AP///////wAAAABo//////8AAAD///////8A////////AAAAAATU/////wAAAP///////wD///////8AAAAAAED/////AAAA////////AP///////wAAACgAAKz///8AAAD///////8A////////AAAAuAAAJPj//wAAAP///////wD///////8AAAD/SAAAiP//AAAA////////AP///////wAAAP/YBAAQ6P8AAAD///////8A////////AAAA//90AABk/wAAAP///////wD///////8AAAD///AUAADMAAAA////////AP///////wAAAP///5gAADwAAAD///////8A////////AAAA/////CwAAAAAAP///////wD///////8AAAD/////vAAAAAAA////////AP///////wAAAP//////UAAAAAD///////8A////////AAAA///////cCAAAAP///////wD///////8AAAD///////94AAAA////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'O' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP///////////KRMGAAAHFSs/P////////8A/////////9gsAAAAAAAAAAA03P///////wD////////gGAAAAAAAAAAAAAAY4P//////AP///////zgAAARw0Pz/1HAEAAA8//////8A//////+0AAAErP///////8QEAAC4/////wD//////2AAAGj//////////3AAAGD/////AP//////KAAAyP//////////yAAALP////8A//////8IAAD0///////////0AAAI/////wD//////wAAAP////////////8AAAD/////AP//////BAAA9P//////////8AAABP////8A//////8oAADA///////////AAAAo/////wD//////1wAAGD//////////2AAAGD/////AP//////tAAAAKz///////+sAAAAtP////8A////////OAAAAGTM/PzMbAQAADj//////wD////////cGAAAAAAAAAAAAAAY3P//////AP/////////YMAAAAAAAAAAAMNj///////8A///////////8qFAcAAAYUKj8/////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'P' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////8AAAAAAAAAACBApP////////8A/////////wAAAAAAAAAAAAAAcP///////wD/////////AAAAAAAAAAAAAAAAsP//////AP////////8AAAD/////6KwYAABA//////8A/////////wAAAP///////8gAAAz//////wD/////////AAAA/////////wAAAP//////AP////////8AAAD///////+8AAAQ//////8A/////////wAAAP/////goBgAAFD//////wD/////////AAAAAAAAAAAAAAAEyP//////AP////////8AAAAAAAAAAAAABJT///////8A/////////wAAAAAAAAAQLGTU/////////wD/////////AAAA////////////////////AP////////8AAAD///////////////////8A/////////wAAAP///////////////////wD/////////AAAA////////////////////AP////////8AAAD///////////////////8A/////////wAAAP///////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'Q' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP/////////8qFAcAAAYSJj4//////////8A////////2DAAAAAAAAAAABzE/////////wD//////9wYAAAAAAAAAAAAAATA////////AP//////NAAABGzM/PzQcAQAABz4//////8A/////7QAAASs////////tAQAAJT//////wD/////YAAAaP//////////aAAASP//////AP////8oAADI///////////IAAAY//////8A/////wQAAPT///////////QAAAD//////wD/////AAAA/////////////wAAAP//////AP////8EAAD0///////////wAAAY//////8A/////ygAAMj//////////7QAAET//////wD/////YAAAaP///8AwkPj/PAAAkP//////AP////+0AAAEwP//QAAAIFgAABDw//////8A//////84AAAEeNjcdAQAAAAAkP///////wD//////9wYAAAAAAAAAAAAAAAIbNT/////AP///////9gwAAAAAAAAAAAAAAAAOP////8A//////////yoVCQAABhInFgAAACo/////wD//////////////////////8hQJPz/////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'R' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD///////8AAAAAAAAAABQ0hPT/////////AP///////wAAAAAAAAAAAAAALPT///////8A////////AAAAAAAAAAAAAAAAgP///////wD///////8AAAD//////+RQAAAo////////AP///////wAAAP////////AAAAD///////8A////////AAAA////////7AAACP///////wD///////8AAAD/////+NRQAAA8////////AP///////wAAAAAAAAAAAAAAALT///////8A////////AAAAAAAAAAAAAASU/////////wD///////8AAAAAAAAAAABw5P//////////AP///////wAAAP/8zDgAABjY//////////8A////////AAAA////9DgAADD8/////////wD///////8AAAD/////6BgAAJT/////////AP///////wAAAP//////rAAAFPD///////8A////////AAAA////////QAAAeP///////wD///////8AAAD////////QBAAE3P//////AP///////wAAAP////////9kAABI//////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'S' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD//////////7BIGAAAIFzA////////////AP////////xUAAAAAAAAAAB0//////////8A////////iAAAAAAAAAAAAAC0/////////wD///////8kAABg1P/8xDAAADz/////////AP///////wAAAPT/////2AAACP////////8A////////IAAARLz8/////////////////wD///////+AAAAAABBQiND/////////////AP////////xEAAAAAAAAACSU/P////////8A//////////ycKAAAAAAAAABU/P///////wD/////////////1JBQEAAAAACI////////AP//////////////////xEQAACz///////8A//////8QAADc////////8AAAAP///////wD//////0gAAFz////////MAAAM////////AP//////qAAAAFTE+P/onBgAAEz///////8A////////QAAAAAAAAAAAAAAEyP///////wD////////oPAAAAAAAAAAADKz/////////AP/////////8qFAcAAAQOHzo//////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'T' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A////////AAAAAAAAAAAAAAAAAP///////wD///////8AAAAAAAAAAAAAAAAA////////AP///////wAAAAAAAAAAAAAAAAD///////8A//////////////8AAAD//////////////wD//////////////wAAAP//////////////AP//////////////AAAA//////////////8A//////////////8AAAD//////////////wD//////////////wAAAP//////////////AP//////////////AAAA//////////////8A//////////////8AAAD//////////////wD//////////////wAAAP//////////////AP//////////////AAAA//////////////8A//////////////8AAAD//////////////wD//////////////wAAAP//////////////AP//////////////AAAA//////////////8A//////////////8AAAD//////////////wD//////////////wAAAP//////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'U' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD///////8AAAD/////////AAAA////////AP///////wAAAP////////8AAAD///////8A////////AAAA/////////wAAAP///////wD///////8AAAD/////////AAAA////////AP///////wAAAP////////8AAAD///////8A////////AAAA/////////wAAAP///////wD///////8AAAD/////////AAAA////////AP///////wAAAP////////8AAAD///////8A////////AAAA/////////wAAAP///////wD///////8AAAD/////////AAAA////////AP///////wAAAP////////8AAAD///////8A////////HAAA5P//////6AAAGP///////wD///////80AACU//////+oAAAs////////AP///////3AAAAyc7P/woAwAAGT///////8A////////3AwAAAAAAAAAAAAE0P///////wD/////////rAwAAAAAAAAABJz/////////AP//////////4HAsCAAAKGTU//////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'V' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////NAAApP///////////5gAADT/////AP////+cAAA4////////////NAAAnP////8A//////gQAADU/////////8wAABD4/////wD//////3AAAGj/////////YAAAbP//////AP//////2AAADPT///////AIAADY//////8A////////RAAAlP//////kAAAQP///////wD///////+sAAAs//////8oAACo////////AP////////wYAADE////wAAAGPz///////8A/////////3wAAFj///9YAAB4/////////wD/////////5AQACOj/6AQABOD/////////AP//////////UAAAiP+IAABM//////////8A//////////+4AAAg+CAAALT//////////wD///////////8kAABoAAAg/P//////////AP///////////4wAAAAAAIj///////////8A////////////7AgAAAAE6P///////////wD/////////////YAAAAFj/////////////AP/////////////IAAAAwP////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'W' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/JAAAwP//////4AAAAOT//////8QAACT/AP9wAAB0//////+UAAAAnP//////fAAAcP8A/7wAACj//////0QAAABM//////80AAC8/wD/+AwAAOD////0CAAAAAj4////6AAADPj/AP//UAAAmP///6wAACAAALT///+cAABU//8A//+cAABI////XAAArAAAZP///1QAAJz//wD//+QAAAj4//wUABj/HAAc///8DAAA6P//AP///zAAALj/xAAAYP9kAADM/8AAADT///8A////fAAAbP94AACk/6gAAIT/eAAAgP///wD////EAAAg/ygAAOj/8AAAOP8sAADI////AP////wQAAC0AAAs////OAAAzAAAGP////8A/////1wAACAAAHT///+AAAA4AABg/////wD/////pAAAAAAAuP///8QAAAAAAKz/////AP/////sAAAAAAj4/////BAAAAAE9P////8A//////88AAAAQP//////VAAAAET//////wD//////4QAAACI//////+YAAAAjP//////AP//////zAAAAMz//////+AAAADc//////8=',
- 'width' => 25
- ),
- 'X' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD////////MBAAAyP/////IAAAEzP//////AP////////9wAAAs/P///CwAAHD///////8A//////////QcAACI//+IAAAc9P///////wD//////////7AAAAjg4AgAALD/////////AP///////////0wAAExMAABM//////////8A////////////4AwAAAAADOD//////////wD/////////////jAAAAACM////////////AP/////////////8IAAAIPz///////////8A/////////////8gEAAAEyP///////////wD////////////8MAAAAAAw/P//////////AP///////////4wAABgYAACM//////////8A///////////gDAAAqKgAAAzg/////////wD//////////1AAAEj//0gAAFD/////////AP////////+wAAAI4P//4AgAALD///////8A////////9BwAAIj/////iAAAHPT//////wD///////9wAAAs/P/////8LAAAcP//////AP//////zAQAAMj////////IAAAEzP////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'Y' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP/////QBAAAxP/////////EAAAE0P////8A//////+AAAAs/P///////CwAAID//////wD///////wwAACI//////+IAAAo/P//////AP///////8gEAAzg////4AgABMj///////8A/////////3QAAFD///9MAAB0/////////wD/////////+CgAALD/rAAAKPj/////////AP//////////yAQAIOwcAATI//////////8A////////////dAAAHAAAcP///////////wD////////////4KAAAACD0////////////AP/////////////IAAAAwP////////////8A//////////////8AAAD//////////////wD//////////////wAAAP//////////////AP//////////////AAAA//////////////8A//////////////8AAAD//////////////wD//////////////wAAAP//////////////AP//////////////AAAA//////////////8A//////////////8AAAD//////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8=',
- 'width' => 25
- ),
- 'Z' => array(
- 'data' => 'AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////////////////////////////wD/////////////////////////////////AP////////////////////////////////8A/////////wAAAAAAAAAAAAAAAAD//////wD/////////AAAAAAAAAAAAAAAAAP//////AP////////8AAAAAAAAAAAAAAAAA//////8A////////////////////2BgAAHD//////wD//////////////////9gYAABw////////AP/////////////////oIAAAVP////////8A////////////////6CgAAFT8/////////wD///////////////QwAAA8/P//////////AP/////////////0PAAAPPT///////////8A/////////////EAAACz0/////////////wD///////////xUAAAo6P//////////////AP//////////WAAAHOj///////////////8A/////////3AAABjY/////////////////wD///////9wAAAQ2P//////////////////AP///////wAAAAAAAAAAAAAAAAAA//////8A////////AAAAAAAAAAAAAAAAAAD//////wD///////8AAAAAAAAAAAAAAAAAAP//////AP////////////////////////////////8=',
- 'width' => 25
- ),
- );
-
- 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(
- '1' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARARLTT8fD5jAAAAB3RJTUUH0wEQES4Duu0r3wAAAAlwSFlzAAALEgAACxIB0t1+/AAAAEpJREFUeNpj/M+AAzAxDBGZQEZGJN5/BFiCwkVizmDBLnPGA80IOBMoqoFLxuUFdhmTNWB9CBlG5LAGuvk/dv8MfIjSUIYRZ3oDAFCne4mhLZbsAAAAAElFTkSuQmCC',
- '2' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARARLgTxiF0MAAAAB3RJTUUH0wEQES4NXVUG2AAAAAlwSFlzAAALEgAACxIB0t1+/AAAAKRJREFUeNpj/M+AAzAx0EbmYqwoI6/tQoTUfyiYwwLhh/yBCsBk7rDAlE5AkylgYFA58f+BBwODBpqMDgPDBiD1BGE+zBAVhicuQEqEgYEH3QUQsIGBwQHNNAh4ocDAsASbzAsNBgaLP1hkQBISD/5jytwBSqjc+I8p80QCaNSL/5gyH4A6Qr78xyLjw8Bg8OM/FpkDGGEMo0NwyghgyDDSKYUAAIikH4Lr7MUuAAAAAElFTkSuQmCC',
- '3' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARARLg4RXbQSAAAAB3RJTUUH0wEQES4a3oaDHwAAAAlwSFlzAAALEgAACxIB0t1+/AAAALJJREFUeNpj/M+AAzAx0FtmoSUno27jV4TUfygIgXB1PsAEYDJLYCpT0GVcGBh8nvzoYWDgQZfJsBB58v//DwYGDnQZMHiRwcAQgE3GA2iNzANsMgZAsxb8xyYjAnKbxx8sMnf+XzFhYGjA5oL//28wMChguhrse0SowGgdBoY5QOoMA4MImkwFUGjH/zMaDAwxaDIvBKDhxnEF3QUHeCASazD9cyNGhEEk5gacz0jVtAMA3vM11y3nNGMAAAAASUVORK5CYII=',
- '4' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARARLht8gFD5AAAAB3RJTUUH0wEQES4q+F+zswAAAAlwSFlzAAALEgAACxIB0t1+/AAAAG5JREFUeNpj/M+AAzAxECXzUZaREcH7jwQSkPnIMlsYcMh8kMElk8CAQwZolgNWGaBZPA+wygDNmvEfm8wGBgaf/9hk3ogwCDzBKhPCwLDgP6oMIyREkQKF4T9JIYoCGFHihxFuFjVMIyO2aSgDANQ6ybaxis6hAAAAAElFTkSuQmCC',
- '5' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARARLitaWWBVAAAAB3RJTUUH0wEQES8bsJqCyAAAAAlwSFlzAAALEgAACxIB0t1+/AAAALFJREFUeNpj/M+AAzAxDBaZp4xQgCFzBKeeE5jG/YcAAwaGLf9RAFTmCwsDwxtUGahpJ/4w8MRwctruxTCtAcadgm6aB0yG5QKaaSwqPDVP/h/RYPjTg+42CNjDwCADYzOixM9foBNhAlDTYk0FPwKpPwwMHGimAT06A0jtYGAwQXNbDQMDz5b/RyQYGDrQZF4IQI2Q+YAm838LxHyBE+g+/f//SogAg0zKA4QPGMlIVQC8RM0SoAcH5wAAAABJRU5ErkJggg==',
- '6' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARARLx2M+MSNAAAAB3RJTUUH0wEQES8nn/X+TwAAAAlwSFlzAAALEgAACxIB0t1+/AAAALpJREFUeNpj/M+AAzAxEJb5u9CSk1F36l+4wH8o+OIC4YfABOAyCTClK9BkrjAw8Kz58cKHgcEBTaaGgWEOkHoioBOCJuPAwPDlPwqAue0Bg8IZW1ZO150M6G5jYBBhAfMnoLsNoXQPpozNlf9XLBgYfNBkJBgY7kAcL4AmYwK1EWEzzG1AmYNA6iHQJWhu28PAILPn/wNg4AWgh5sNTOkRdJkXGgzY/fP//4cKFQYelx1wPiNFsU1bGQDEywU+yR12dwAAAABJRU5ErkJggg==',
- '7' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARARLyjaSwCuAAAAB3RJTUUH0wEQES8zhS8qMgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAI1JREFUeNpj/M+AAzAxDF4ZFijNiBD6T7k9/8FgC5DVwYAiBAFvRBgYEmAcFJkUBgaNL9hkLgAdeuQ/NpkQBoaY/9hknrAwsNxBcJFcPecPQ4AykrMRilQYGHb8x2baDQYGkT//sZl2gIHBhRlr6JxgYLDBHm5XGBhMsMs8YWBQQJZhhKcqRnjMoMugAwCrgqmfFNotugAAAABJRU5ErkJggg==',
- '8' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARARLzTOSlzhAAAAB3RJTUUH0wEQETADbqwUAAAAAAlwSFlzAAALEgAACxIB0t1+/AAAALZJREFUeNpj/M+AAzAx0ETm70JbXkZex4V/4VL/IeCPD5Qf8gcqApNpgSttQZNRYWDwuPP/AVCnCpoMUPEbIPUGYT7MBRJw0yTQ3BbBwJDykOFuAgNDDJrbvjhA+S5f0Oz5/0YDLKHx4T+azAsFqB6FF2gyKUBXP/h/B+jqGDQZAbiredBc/YGB4Q+E9QXNbUD7ba6ATdNBM20C3KdT0GT+wDyIEdb//2/wEGDgcVgA5zPSKYUAAFSL7HPrRuxSAAAAAElFTkSuQmCC',
- '9' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARARMAQlyWLTAAAAB3RJTUUH0wEQETARnRVlSAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAL1JREFUeNpj/M+AAzDBWXtdeRlVKz8ipP5DwQQIV+MFTAAmcwSm0gZdJoCBwePB/z0yDAx70GREGBgeAKkDDAw5aDIwGxkYTKAiMLcJMDBcBVJ3GRieoLnNh4HB4sL/KzYIERi9B8MfaP5hEcGU+b/DhoPF5oQMgwKGDBh8YGBwQXNbpKHgUyC1BugQNPscGBh8XvxYw8PAcAXNtAUwlSno4fbHBSLh8QVd5v+fBhUGDpsFf+COYSQiTgefDACF9AMfUn6JTgAAAABJRU5ErkJggg==',
- 'A' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARALJAlkZ++dAAAAB3RJTUUH0wEQDQYRATWuKQAAAAlwSFlzAAALEgAACxIB0t1+/AAAAMRJREFUeNpj/M+AAzAxDAmZSEZGxkgkqf8w8IYDyON4A+cj9Kz4ASR+rMCix4CBIYWBwQDOh8ucYWCQ+CHBwHAGw7QFDAwx7AlgGtW0HwIMDDf+32FgEPiBZhrQZgsg5QB0CZqMCwPDHCC1hIHBBVXmAQMDzxeooQ9QXAC09wsPMAw4PiDcAFEggxQqMsim7UAJyx1IMhEMDB1QixsYGCIQMsDAZHnyH+4WSLCCZaYg3Ap2/xS4DDAwl8BllkCDlRFnegMAwY7xbBxxcUwAAAAASUVORK5CYII=',
- 'B' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARALKQc2cbzXAAAAB3RJTUUH0wEQCyoJL+UhYwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAI5JREFUeNpj/M+AAzBBKEYo4NVt/AuT+g8GSGpD/kOFMGQYpqDLgOk7AQwMClhl/n+As5jQXPSHgUECxW0wcDGBgcEHl9skHmA3jYHBAKd/YJrQ3PbmiAXMr+iu/v+CgUEAuz0sDAwf0OwB03/OAN1sAmaywBUzwlkJuNwW8gdrWMs4zIBI/GckFKeDUgYAoqOxJeAC4XsAAAAASUVORK5CYII=',
- 'C' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAPDC0CMA06AAAAB3RJTUUH0wEQDw0LHCda9gAAAAlwSFlzAAALEgAACxIB0t1+/AAAAL1JREFUeNpj/M+AAzAx0EZma6QiI6Oo68SPMIH/EPDCASYgsgUiApV5oYIwhuUEsowLAwNPw5X/f67UcDAwmCDJHAFKQFT+36FScwFJJoOBoeY/GoDI6DAwXMAuw8PA8ANdhhEcboxA12P3KQsDw1fsMkDf3MEuY8LAsAYj4MC2bQH65wbE4jWo/vlvAZTquPP/x4USoJUOyDIPJBCm8KDo+X/HBCahcgYlrP///7MiAKhPJWLFHxSf0j6FAAChr925OULRHAAAAABJRU5ErkJggg==',
- 'D' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAPEwCKtV/RAAAAB3RJTUUH0wEQDxMWq2AJ8AAAAAlwSFlzAAALEgAACxIB0t1+/AAAAI9JREFUeNpj/M+AAzAxDBIZRgjg1Ey9CJf6DwYIpSwT/kOF0GUYGJagy4CoB0tUGBhEvmCR+f//hQIDwxysMv9nMDAEYJe5wcCgAmYwQixnBMpA7P/LwsDyGyyELgNnYoTBX5yhc4eBQQG7zBkGBh200IEw/uhg98+HPQ5YwgB3uOEPaw6dgjtQCVgYkBTbAM6Zv7Fcumw9AAAAAElFTkSuQmCC',
- 'E' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAPKwnk9luOAAAAB3RJTUUH0wEQDysinUtBvgAAAAlwSFlzAAALEgAACxIB0t1+/AAAADRJREFUeNpj/M+AA7BAKEZkMYhiJlxa8MiwoJlBjB7K7IE7/D81TKO7qykIa8b/pOsZeBkA99MHN4IuLhUAAAAASUVORK5CYII=',
- 'F' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAPLRo2Er3WAAAAB3RJTUUH0wEQDy0qxcpuCgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAC5JREFUeNpj/M+AAzAxUFOGBUozIon9p9g0uCE0djWSw/9TxTSaupq6Mox0SiEAfGsGNUcKjuQAAAAASUVORK5CYII=',
- 'G' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAPLSz5qChPAAAAB3RJTUUH0wEQDy4C21KVMwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAMZJREFUeNpj/M+AAzAxDAGZi5m6nIyMsq69b2Ei/8HgSwJcrcAGiBBE5osNkjEsO5BkQDoCdnz4/+NEAQsDgw5C5gJQYgnEjP8rVGouIGQKGBgS/qMDsIwBA8MRDBlGUFhz/mD4wY7uH7AMI9DxEB7UJ3Cf8jAwvEXXApHRYGA4g13Gg4FhCjxA4FIgzg0g3QN10g9YiEHIFCDXBxgGHw5USKDKoIQbgwuSzP8vKXBxiRl/kGX+/79SYiLAwKKRsOEPchhgBQB9F8jGMXh9NAAAAABJRU5ErkJggg==',
- 'H' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQBRyVVlIEAAAAB3RJTUUH0wEQEAUtEYmxTgAAAAlwSFlzAAALEgAACxIB0t1+/AAAADJJREFUeNpj/M+AAzAxkC7DAqEYGRj+o7HIMY1eMixwFiNVTUOEwWDxKW4ZRqqmA3JkANxfBTYyJCNIAAAAAElFTkSuQmCC',
- 'I' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQBS5dgQOEAAAAB3RJTUUH0wEQEAgLdipK/gAAAAlwSFlzAAALEgAACxIB0t1+/AAAAC5JREFUeNpj/M+AAzAxUFOGBcZghDH+U2AaI5KrGRFGUd3VQ1MGHjpUD2tauhoAL4kHLSByJyAAAAAASUVORK5CYII=',
- 'J' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQBiJ/GhxsAAAAB3RJTUUH0wEQEAYv1KqDoQAAAAlwSFlzAAALEgAACxIB0t1+/AAAAF9JREFUeNpj/M+AA7Cg8RkZGKBqmXBpGYEyjIyMP4HUX0wZGQaGM0DqBpgFAf8hIISBQePC/wc+DAw+UBGYzB64KVvQZP4XQCVK/qPL/F9iw8Mg4rMFzmf8T8jVg1EGAPXwTNe70jweAAAAAElFTkSuQmCC',
- 'K' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQBjH7pF2yAAAAB3RJTUUH0wEQEAcD/2neAwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAKJJREFUeNpj/M+AAzAxDHoZRkZGCOOrLSOj5E0w8z8YwBhfbBgYJG5AhFBkfiAkUGX+hCAkUGRQJJBlQBI8R/5jyoAkGAr+Y5FJAbmU5wUWGaCwCQNDAjYZniM3WBgYzmDKsGz4/z+HgcEGU2YNkPogwMCwAot/gGAGA4PCD6wyf3QYGBqwyvzfw8DA8QSrzH8fBoYY7DJ3OBgYToAYjDjTGwAi9CFdklYLWAAAAABJRU5ErkJggg==',
- 'L' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQDRPNMMWdAAAAB3RJTUUH0wEQEA0h0OZ3bQAAAAlwSFlzAAALEgAACxIB0t1+/AAAACtJREFUeNpj/M+AAzAx0EeGBUozMjD8p9y0URliwpoBHNwQ8J9s0xipmnYAn38EM7Wx8TEAAAAASUVORK5CYII=',
- 'M' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQDSKc7sWnAAAAB3RJTUUH0wEQEA0yVFg2swAAAAlwSFlzAAALEgAACxIB0t1+/AAAAMBJREFUeNq9USESgzAQXEoFIgKBQPIIBAJRkUfwjH6rrqICieALzCDzACSGGWaO5Jqm9DqtqOjOJLd3O7lschHhAw74qkQOA+cD89cz193OIAsmtWNUP4teOQKTZRMzLj66lcANvErhrUm8kjRCSSu0C5YWVSrfozH36GcbhaK0c2w9ayVcd6tCQQXU2glviDXMxUDH7/92As68i26GRk5HMuIPDFFuQ05B2U1B+yXuyYKSiXvo3saEjKJfp/0HZQMM+Go7G71AGgAAAABJRU5ErkJggg==',
- 'N' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQDTRoOnD2AAAAB3RJTUUH0wEQEA4GXsGRxQAAAAlwSFlzAAALEgAACxIB0t1+/AAAAH9JREFUeNpj/M+AAzAx0ECGkZGxF86CSv0HAyBD4A2MBRWCyzBk4JRhuYJLhsEBh4wGA8Ma7DI7GBhUfmCV+e/BwNCBXeYGC4PAC6wy/0sYGFKwy3wQYWA4g1Xm/wwGBhvsMn90kAMMWeb/Hpwy/wNwytzhwCXzvwLOYqRTCgEAzeMLiiDoTYkAAAAASUVORK5CYII=',
- 'O' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQKhH5+xbUAAAAB3RJTUUH0wEQECogfST1ngAAAAlwSFlzAAALEgAACxIB0t1+/AAAAN5JREFUeNpj/M+AAzAxUCDzd6mvJCOjbOjavzCR/xBwQwcmYHIHIgKVeSCBMEbiAbKMBQMDS8GFP/+vFLAwMNggyWwBSqyBqDkClNqBkElgYMiAWvi/gIEhASGjwcBwAiZzgoFBByHDwcDwBSbzhYGBA0QzgkOHEeh6uNugHIhPgbZ+hUl8BHNhMioMDGdgMhfAXJiMCQPDApgMkGGBCB2gfxig/lkDZG5BDQOGlDN//pzJAdphgRw6d5DD7Q6yzP8bBjAJgxsoYf3//58VATJA9QEr/kAFGGmTDkiQAQAL0dUS43e+3gAAAABJRU5ErkJggg==',
- 'P' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQKiJGK3fCAAAAB3RJTUUH0wEQECo0Z/4h4wAAAAlwSFlzAAALEgAACxIB0t1+/AAAAHJJREFUeNpj/M+AAzAxkC/DCAWKjkthUv8hAElxAVQEU4ZhA7oMiHqxRoKBwQGbzP//JxgYeMAMRqg5jEAZVBaGq/cyMAiguw1EPVgAtCcAl9tYTuCQYZmC1T8COilXoCIsCMVooU5JWFNHhpEm6YAUGQDGfYIo3V/ScAAAAABJRU5ErkJggg==',
- 'Q' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQKjXF+PIFAAAAB3RJTUUH0wEQECsMVueoPAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAOlJREFUeNpj/M+AAzAxDBaZvysDZRkZJT1n/oRL/QeDGwYwvswRiMh/iMwdCYQpLAeQZUyAAjln/vy5UMAC1PUDIbMFKLEGonILUGoKQiaBgSEDavr/DAYGD4SMBgPDCZjMCQYGCYQM0IQvMJkvMPcygsKaEciBuw3GAfsUqOcrTOIj0DREGKgwMFyByRxhYNBByFgwMCwAUgcNJ/5k6GBg8EGEzhaIzx0YGBQiGBgEPiCFAVATS8WNOyUsILUTcIUbA0fOFYQMUliD7UWS+f9nRQjQhRIec4AWMaxAlkGAEwEqf+BhgBUAALev3zKS4lWgAAAAAElFTkSuQmCC',
- 'R' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQKw304XvaAAAAB3RJTUUH0wEQECsZOzpM1wAAAAlwSFlzAAALEgAACxIB0t1+/AAAAJVJREFUeNpj/M+AAzAxEJBhhAJR09avMKn/YICkVucLVAhDhqEBXQZMPwlgYNDAKvP/A5yF7rY/DAwc2Fz982oKA4MJLrcxbMHhNpYp/7HLFDz5jyHz/88ZCwYGiRtYZP7//wKUMviDTeb/CwkGhilYZf6vYWAQ+YA9DBwYGCqwy1xgYWC5g1XmPzAQPMAMRvJjm+YyAEO38KG0H/A5AAAAAElFTkSuQmCC',
- 'S' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQLAjLyhmSAAAAB3RJTUUH0wEQECwTlK4zDgAAAAlwSFlzAAALEgAACxIB0t1+/AAAAMhJREFUeNpj/M+AAzAxEJTZ6CnJyKgYexAh9R8M/oTA+CX/oQAq04FQugVVRoWBIeHK/z9HDBgYbFBlgGq/gOgbDAwcqDIKDAwue/78RwZQmQaQDQIBHRcwZP64QO1XmfIHVeb/nzkaULmQP6gyQHBlQoAASKoDQwYEjgBN1UGWAaq9A+F/gAcLJNwsGBgaILbcYWDgQQ63FSCbj/z4/2KOBAODD4o9DohwYzmBIvPCBibBswbdPysCZIChYFHzAuZMRkpim8YyAOsdCISZ+ev1AAAAAElFTkSuQmCC',
- 'T' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQLBTfy0XdAAAAB3RJTUUH0wEQECwfnRh/JQAAAAlwSFlzAAALEgAACxIB0t1+/AAAACpJREFUeNpj/M+AAzAxDF4ZFgjFiCz2n2zTGJHCgBFm0CDx6XCTYcSZ3gCeXgUv6KfdPQAAAABJRU5ErkJggg==',
- 'U' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQLCD+f7FoAAAAB3RJTUUH0wEQECwrvKyLkAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAG1JREFUeNpj/M+AAzDhkmBggVCMDAz/0Vi49Yw4GRkGhqdgxksGBgkUGSBvA5hxgIFBBKrpPxgUMDDwzHnz/8MCHgaGFIgQVOYOD9x8lgsoMv/XwKRY5vxHlfn/oECHg4FBI+UKTICRjNimlwwARYdIjOH9U8UAAAAASUVORK5CYII=',
- 'V' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQLCz3yf1DAAAAB3RJTUUH0wEQEC0RY7tjYwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAO9JREFUeNpj/M+AAzAx4JUxZWRcCheZychoCmb8B4I5DAwW/2HAhIFhDogGy/wQYGC4ApU4w8Ag8APEAJvGnsDAMAVqGJCOYYeb9v8GAwPPFzDrAwcDw43/cNP+/3cBKgYzJjAwOPxHllnDwKADZmgwMKxAkfkjwcBwBEgfYGCQ+AMRgvqUOQXihhkMDAnMULdAHfuEhYHjxf8XLAwsD/6j6GGQ9mH4sYBhwR8GD3kGVD3/dzAwKPxQYGDYAhOAy/xXYWDIAMr+wZTpARvR8R9T5g3Q9wwsL7DI/AcGHkPEf2wyJ4AyBxBcRnJjmw4yABm3A/7Dos83AAAAAElFTkSuQmCC',
- 'W' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQLRNYtOE/AAAAB3RJTUUH0wEQEDkxdnuU/gAAAAlwSFlzAAALEgAACxIB0t1+/AAAARRJREFUeNrVkaFOA0EQhv8tJNeEiiYgEBU1TSoqEBUnKipOnOhDIJA8Co+BrKioqDgBCSQIHgHRJm1SgUBUrLjk55/ZO1A8AJPc3L87e9/8sxeIP6KD/1kZhfDschdCOLh6DWGkygJY+9ryxpWydlkBY1oU2lu4mgIVwdgDtlqeuqp0o9QR6EV2kBUJsokYIlYJW2bmTcgV/HlISudKvci9Q+orXHOAAVkLf6T6kDc6xhfglnfAO5+AqXZtUvcteAFvmTwbzY4POTbEF5BzArwx0eq++5lI5sJBDRvamT6+T37KH+U0PqY7SWDFkg2Nn2jHNzDOTy0NlzOlPDOwXd784vf/NC1gzlvlNMqPRrTYSn24+gaIIJkw9zhm8QAAAABJRU5ErkJggg==',
- 'X' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQOTNNdBaiAAAAB3RJTUUH0wEQEDoJdVR/owAAAAlwSFlzAAALEgAACxIB0t1+/AAAALlJREFUeNq90r0NgzAQBeDnCCQKBqCgYAAKxqCgYBTGoGAQSsYACXbwEJSWXnw4IeYnXRRLlix/ss/3ZEV8GQ/8VZZQqUkWk1Lh4vboRgPkhjQ50Lidt6wp0JItkK5H4QBEWkfAwJOwAiqZvIiOpWysr8JOpOONmAzIzJ2MARCMN2IKua0wV7FlksQrtIs8re+9x+1SAyVZAvVJtgjsyU8IOMTmB4dD1H7YTmbbyquT0TY1y0L99O88AROVMIqClFRpAAAAAElFTkSuQmCC',
- 'Y' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQOgo5XM1pAAAAB3RJTUUH0wEQEDoXj1tCwAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAJ1JREFUeNpj/M+AAzAxkClzkZWR8ShU4CgjI+tFMOs/CDQwMOj8AbP+6DAwNIBZEJk/BgwMHWBWBwODxh8kmf8nWBh4HgDpBxwMLCf+I8v8L2FgCABSPgwMJf9RZX5oMDBs+L8GaNYPNBmQeQpvZOBmIcmAzJNhYCj4jykDMo9B4QsWmf8ngDIHEFxGpBBlBPqbCiFKBxlG6qcDEmUAcCSyeDODHbsAAAAASUVORK5CYII=',
- 'Z' => 'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAAAAADhgtq/AAAAFXRFWHRDcmVhdGlvbiBUaW1lAAfTARAQOhjK5bwhAAAAB3RJTUUH0wEQEDonqYJybAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAH5JREFUeNpj/M+AAzAxDF4ZFijNiCz4n1J7/kPBDQkGhgJUISQJCBNV5oUCA0PIfywyLzSAEn+wyHwxYGCwgUkgy3yxAUp8+Y8p88eBgUEHIYGQ+RPCwKDx4j8WmQgGBhlkCbgM0HcSN/5jkQFKCKBK/Gf8jxnU5Ic1I870BgC8VeNYE4D9rwAAAABJRU5ErkJggg==',
- );
-
- return $_png;
-}
-//
-// FUNCTIONS
-// ---------
-
-?>
\ No newline at end of file
diff --git a/phpBB/ucp/usercp_main.php b/phpBB/ucp/usercp_main.php
deleted file mode 100755
index 6a9c1b9751..0000000000
--- a/phpBB/ucp/usercp_main.php
+++ /dev/null
@@ -1,26 +0,0 @@
-
\ No newline at end of file
diff --git a/phpBB/ucp/usercp_messaging.php b/phpBB/ucp/usercp_messaging.php
deleted file mode 100755
index 2b85014f8f..0000000000
--- a/phpBB/ucp/usercp_messaging.php
+++ /dev/null
@@ -1,1907 +0,0 @@
-#');
-$html_entities_replace = array('&', '<', '>');
-
-//
-// Parameters
-//
-$submit = ( isset($_POST['post']) ) ? TRUE : 0;
-$submit_search = ( isset($_POST['usersubmit']) ) ? TRUE : 0;
-$submit_msgdays = ( isset($_POST['submit_msgdays']) ) ? TRUE : 0;
-$cancel = ( isset($_POST['cancel']) ) ? TRUE : 0;
-$preview = ( isset($_POST['preview']) ) ? TRUE : 0;
-$confirm = ( isset($_POST['confirm']) ) ? TRUE : 0;
-$delete = ( isset($_POST['delete']) ) ? TRUE : 0;
-$delete_all = ( isset($_POST['deleteall']) ) ? TRUE : 0;
-
-$refresh = $preview || $submit_search;
-
-$mark_list = ( !empty($_POST['mark']) ) ? $_POST['mark'] : 0;
-
-if ( isset($_POST['folder']) || isset($_GET['folder']) )
-{
- $folder = ( isset($_POST['folder']) ) ? $_POST['folder'] : $_GET['folder'];
-
- if ( $folder != 'inbox' && $folder != 'outbox' && $folder != 'sentbox' && $folder != 'savebox' )
- {
- $folder = 'inbox';
- }
-}
-else
-{
- $folder = 'inbox';
-}
-
-//
-// Cancel
-//
-if ( $cancel )
-{
- redirect("privmsg.$phpEx$SIDfolder=$folder");
-}
-
-// Start session management
-$user->start();
-$user->setup();
-$auth->acl($user->data);
-// End session management
-
-//
-// Var definitions
-//
-if ( !empty($_POST['mode']) || !empty($_GET['mode']) )
-{
- $mode = ( !empty($_POST['mode']) ) ? $_POST['mode'] : $_GET['mode'];
-}
-else
-{
- $mode = '';
-}
-
-$start = ( !empty($_GET['start']) ) ? intval($_GET['start']) : 0;
-
-if ( isset($_POST['p']) || isset($_GET['p']) )
-{
- $privmsg_id = ( isset($_POST['p']) ) ? intval($_POST['p']) : intval($_GET['p']);
-}
-else
-{
- $privmsg_id = '';
-}
-
-$error = FALSE;
-
-//
-// Define the box image links
-//
-$inbox_img = ( $folder != 'inbox' || $mode != '' ) ? '
' : '
';
-$inbox_url = ( $folder != 'inbox' || $mode != '' ) ? '' . $lang['Inbox'] . '' : $lang['Inbox'];
-
-$outbox_img = ( $folder != 'outbox' || $mode != '' ) ? '
' : '
';
-$outbox_url = ( $folder != 'outbox' || $mode != '' ) ? '' . $lang['Outbox'] . '' : $lang['Outbox'];
-
-$sentbox_img = ( $folder != 'sentbox' || $mode != '' ) ? '
' : '
';
-$sentbox_url = ( $folder != 'sentbox' || $mode != '' ) ? '' . $lang['Sentbox'] . '' : $lang['Sentbox'];
-
-$savebox_img = ( $folder != 'savebox' || $mode != '' ) ? '
' : '
';
-$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['user_id'] )
- {
- 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($_GET['p']) )
- {
- $privmsgs_id = intval($_GET['p']);
- }
- else
- {
- message_die(MESSAGE, $lang['No_post_id']);
- }
-
- if ( !$userdata['user_id'] )
- {
- $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
- header($header_location . 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(MESSAGE, $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";
- $result = $db->sql_query($sql);
-
- //
- // Did the query return any data?
- //
- if ( !($privmsg = $db->sql_fetchrow($result)) )
- {
- $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
- header($header_location . 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' )
- {
- $sql = "UPDATE " . PRIVMSGS_TABLE . "
- SET privmsgs_type = " . PRIVMSGS_READ_MAIL . "
- WHERE privmsgs_id = " . $privmsg['privmsgs_id'];
- $db->sql_query($sql);
-
- $sql = "UPDATE " . USERS_TABLE . "
- SET user_unread_privmsg = user_unread_privmsg - 1
- WHERE user_id = " . $userdata['user_id'];
- $db->sql_query($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'];
- $result = $db->sql_query($sql);
-
- $sql_priority = ( SQL_LAYER == 'mysql' ) ? 'LOW_PRIORITY' : '';
-
- if ( $sent_info = $db->sql_fetchrow($result) )
- {
- if ( $sent_info['sent_items'] >= $config['max_sentbox_privmsgs'] )
- {
- $sql = "DELETE $sql_priority 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'];
- $db->sql_query($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'] . ")";
- $db->sql_query($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'])) . "')";
- $db->sql_query($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' => '
',
- 'post' => '' . $lang['Post_new_pm'] . '',
- 'reply_img' => '
',
- 'reply' => '' . $lang['Post_reply_pm'] . '',
- 'quote_img' => '
',
- 'quote' => '' . $lang['Post_quote_pm'] . '',
- 'edit_img' => '
',
- '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_private_message'];
- 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_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 = $user->format_date($privmsg['privmsgs_date']);
-
- $temp_url = append_sid("ucp.$phpEx?mode=viewprofile&u=$user_id_from");
- $profile_img = '
';
- $profile = '' . $lang['Read_profile'] . '';
-
- $temp_url = append_sid("privmsg.$phpEx?mode=post&u=$poster_id");
- $pm_img = '
';
- $pm = '' . $lang['Send_private_message'] . '';
-
- if ( !empty($privmsg['user_viewemail']) || $auth->acl_get('a_') )
- {
- $email_uri = ( $config['board_email_form'] ) ? append_sid("ucp.$phpEx?mode=email&u$user_id_from") : 'mailto:' . $privmsg['user_email'];
-
- $email_img = '
';
- $email = '' . $lang['Send_email'] . '';
- }
- else
- {
- $email_img = '';
- $email = '';
- }
-
- $www_img = ( $privmsg['user_website'] ) ? '
' : '';
- $www = ( $privmsg['user_website'] ) ? '' . $lang['Visit_website'] . '' : '';
-
- if ( !empty($privmsg['user_icq']) )
- {
- $icq_status_img = '
';
- $icq_img = '
';
- $icq = '' . $lang['ICQ'] . '';
- }
- else
- {
- $icq_status_img = '';
- $icq_img = '';
- $icq = '';
- }
-
- $aim_img = ( $privmsg['user_aim'] ) ? '
' : '';
- $aim = ( $privmsg['user_aim'] ) ? '' . $lang['AIM'] . '' : '';
-
- $temp_url = append_sid("ucp.$phpEx?mode=viewprofile&u=$poster_id");
- $msn_img = ( $privmsg['user_msnm'] ) ? '
' : '';
- $msn = ( $privmsg['user_msnm'] ) ? '' . $lang['MSNM'] . '' : '';
-
- $yim_img = ( $privmsg['user_yim'] ) ? '
' : '';
- $yim = ( $privmsg['user_yim'] ) ? '' . $lang['YIM'] . '' : '';
-
- $temp_url = append_sid("search.$phpEx?search_author=" . urlencode($username_from) . "&showresults=posts");
- $search_img = '
';
- $search = '' . $lang['Search_user_posts'] . '';
-
- //
- // Processing of post
- //
- $post_subject = $privmsg['privmsgs_subject'];
-
- $private_message = $privmsg['privmsgs_text'];
- $bbcode_uid = $privmsg['privmsgs_bbcode_uid'];
-
- if ( $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 ( !$config['allow_html'] )
- {
- if ( $user_sig != '' && $privmsg['privmsgs_enable_sig'] && $userdata['user_allowhtml'] )
- {
- $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 = ( $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 = ( $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);
- }
-
- if ( count($censors['match']) )
- {
- $post_subject = preg_replace($censors['match'], $censors['replace'], $post_subject);
- $private_message = preg_replace($censors['match'], $censors['replace'], $private_message);
- }
-
- if ( $config['allow_smilies'] && $privmsg['privmsgs_enable_smilies'] )
- {
- $private_message = smilies_pass($private_message);
- }
-
- $private_message = nl2br($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['user_id'] )
- {
- $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
- header($header_location . 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($_POST['delete']) ) ? '' : '';
-
- 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 )
- {
- if ( $delete_all )
- {
- 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";
- $result = $db->sql_query($sql);
-
- while ( $row = $db->sql_fetchrow($result) )
- {
- $mark_list[] = $row['privmsgs_id'];
- }
-
- unset($delete_type);
- }
-
- if ( count($mark_list) )
- {
- $delete_sql_id = implode(', ', $mark_list);
-
- // Need to decrement the new message counter of recipient
- // problem is this doesn't affect the unread counter even
- // though it may be the one that needs changing ... hhmmm
- if ( $folder == 'outbox' )
- {
- $sql = "SELECT privmsgs_to_userid
- FROM " . PRIVMSGS_TABLE . "
- WHERE privmsgs_id IN ($delete_sql_id)
- AND privmsgs_from_userid = " . $userdata['user_id'] . "
- AND privmsgs_type = " . PRIVMSGS_NEW_MAIL;
- $result = $db->sql_query($sql);
-
- $update_pm_sql = '';
- while( $row = $db->sql_fetchrow($result) )
- {
- $update_pm_sql .= ( ( $update_pm_sql != '' ) ? ', ' : '' ) . $row['privmsgs_to_userid'];
- }
-
- if ( $update_pm_sql != '' )
- {
- $sql = "UPDATE " . USERS_TABLE . "
- SET user_new_privmsg = user_new_privmsg - 1
- WHERE user_id IN ($update_pm_sql)";
- $db->sql_query($sql);
- }
-
- $sql = "SELECT privmsgs_to_userid
- FROM " . PRIVMSGS_TABLE . "
- WHERE privmsgs_id IN ($delete_sql_id)
- AND privmsgs_from_userid = " . $userdata['user_id'] . "
- AND privmsgs_type = " . PRIVMSGS_UNREAD_MAIL;
- $result = $db->sql_query($sql);
-
- $update_pm_sql = '';
- while( $row = $db->sql_fetchrow($result) )
- {
- $update_pm_sql .= ( ( $update_pm_sql != '' ) ? ', ' : '' ) . $row['privmsgs_to_userid'];
- }
-
- if ( $update_pm_sql != '' )
- {
- $sql = "UPDATE " . USERS_TABLE . "
- SET user_unread_privmsg = user_unread_privmsg - 1
- WHERE user_id IN ($update_pm_sql)";
- $db->sql_query($sql);
- }
- }
-
- $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;
- }
-
- $db->sql_query($delete_sql);
- $db->sql_query($delete_text_sql);
- }
- }
-}
-else if ( $save && $mark_list && $folder != 'savebox' && $folder != 'outbox' )
-{
- if ( !$userdata['user_id'] )
- {
- $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
- header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=inbox", true));
- }
-
- //
- // 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 . ") )";
- $result = $db->sql_query($sql);
-
- $sql_priority = ( SQL_LAYER == 'mysql' ) ? 'LOW_PRIORITY' : '';
-
- if ( $saved_info = $db->sql_fetchrow($result) )
- {
- if ( $saved_info['savebox_items'] >= $config['max_savebox_privmsgs'] )
- {
- $sql = "DELETE $sql_priority 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'];
- $db->sql_query($sql);
- }
- }
-
- //
- // Process request
- //
- $saved_sql = "UPDATE " . PRIVMSGS_TABLE;
-
- 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_UNERAD_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;
- }
-
- if ( count($mark_list) )
- {
- $saved_sql_id = '';
- for($i = 0; $i < count($mark_list); $i++)
- {
- $saved_sql_id .= ( ( $saved_sql_id != '' ) ? ', ' : '' ) . $mark_list[$i];
- }
-
- $saved_sql .= " AND privmsgs_id IN ($saved_sql_id)";
-
- $db->sql_query($saved_sql);
- }
-
-}
-else if ( $submit || $refresh || $mode != '' )
-{
-
- if ( !$userdata['user_id'] )
- {
- $user_id = ( isset($_GET['u']) ) ? '&u=' . intval($_GET['u']) : '';
- $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
- header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode" . $user_id, true));
- }
-
- //
- // Toggles
- //
- if ( !$config['allow_html'] )
- {
- $html_on = 0;
- }
- else
- {
- $html_on = ( $submit || $refresh ) ? ( ( !empty($_POST['disable_html']) ) ? 0 : TRUE ) : $userdata['user_allowhtml'];
- }
-
- if ( !$config['allow_bbcode'] )
- {
- $bbcode_on = 0;
- }
- else
- {
- $bbcode_on = ( $submit || $refresh ) ? ( ( !empty($_POST['disable_bbcode']) ) ? 0 : TRUE ) : $userdata['user_allowbbcode'];
- }
-
- if ( !$config['allow_smilies'] )
- {
- $smilies_on = 0;
- }
- else
- {
- $smilies_on = ( $submit || $refresh ) ? ( ( !empty($_POST['disable_smilies']) ) ? 0 : TRUE ) : $userdata['user_allowsmile'];
- }
-
- $attach_sig = ( $submit || $refresh ) ? ( ( !empty($_POST['attach_sig']) ) ? TRUE : 0 ) : $userdata['user_attachsig'];
- $user_sig = ( $userdata['user_sig'] != '' && $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'];
- $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 ) < $config['flood_interval'])
- {
- message_die(MESSAGE, $lang['Flood_Error']);
- }
- // End Flood control
- }
-
- if ( $submit )
- {
- if ( !empty($_POST['username']) )
- {
- $to_username = $_POST['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'];
- }
-
- $to_userdata = $db->sql_fetchrow($result);
- }
- else
- {
- $error = TRUE;
- $error_msg .= ( ( !empty($error_msg) ) ? '
' : '' ) . $lang['No_to_user'];
- }
-
- $privmsg_subject = trim(strip_tags($_POST['subject']));
- if ( empty($privmsg_subject) )
- {
- $error = TRUE;
- $error_msg .= ( ( !empty($error_msg) ) ? '
' : '' ) . $lang['Empty_subject'];
- }
-
- if ( !empty($_POST['message']) )
- {
- if ( !$error )
- {
- if ( $bbcode_on )
- {
- $bbcode_uid = make_bbcode_uid();
- }
-
- $privmsg_message = prepare_message($_POST['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(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'];
- $result = $db->sql_query($sql);
-
- $sql_priority = ( SQL_LAYER == 'mysql' ) ? 'LOW_PRIORITY' : '';
-
- if ( $inbox_info = $db->sql_fetchrow($result) )
- {
- if ( $inbox_info['inbox_items'] >= $config['max_inbox_privmsgs'] )
- {
- $sql = "DELETE $sql_priority 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'];
- $db->sql_query($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";
- }
-
- $db->sql_query($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";
- }
-
- $db->sql_query($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'] )
- {
- $email_headers = 'From: ' . $config['board_email'] . "\nReturn-Path: " . $config['board_email'] . "\r\n";
-
- $script_name = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($config['script_path']));
- $script_name = ( $script_name != '' ) ? $script_name . '/privmsg.'.$phpEx : 'privmsg.'.$phpEx;
- $server_name = trim($config['server_name']);
- $server_protocol = ( $config['cookie_secure'] ) ? 'https://' : 'http://';
- $server_port = ( $config['server_port'] <> 80 ) ? ':' . trim($config['server_port']) . '/' : '/';
-
- include($phpbb_root_path . 'includes/emailer.'.$phpEx);
- $emailer = new emailer($config['smtp_delivery']);
-
- $emailer->use_template('privmsg_notify', $to_userdata['user_lang']);
- $emailer->extra_headers($email_headers);
- $emailer->email_address($to_userdata['user_email']);
- $emailer->set_subject(); //$lang['Notification_subject']
-
- $emailer->assign_vars(array(
- 'USERNAME' => $to_username,
- 'SITENAME' => $config['sitename'],
- 'EMAIL_SIG' => str_replace('
', "\n", "-- \n" . $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(GMESSAGE, $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($_POST['username']) ) ? trim(strip_tags(stripslashes($_POST['username']))) : '';
- $privmsg_subject = ( isset($_POST['subject']) ) ? trim(strip_tags(stripslashes($_POST['subject']))) : '';
- $privmsg_message = ( isset($_POST['message']) ) ? trim($_POST['message']) : '';
- $privmsg_message = preg_replace('##si', '</textarea>', $privmsg_message);
-
- $user_sig = ( $config['allow_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";
- $result = $db->sql_query($sql);
-
- if ( !($privmsg = $db->sql_fetchrow($result)) )
- {
- $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
- header($header_location . append_sid("privmsg.$phpEx?folder=$folder", true));
- }
-
- $privmsg_subject = ( ( !preg_match('/^Re:/', $privmsg['privmsgs_subject']) ) ? 'Re: ' : '' ) . $privmsg['privmsgs_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);
-
- $msg_date = $user->format_date($privmsg['privmsgs_date']);
-
- $privmsg_message = '[quote="' . $to_username . '"]' . $privmsg_message . '[/quote]';
-
- $mode = 'reply';
- }
- }
- }
-
- //
- // Has admin prevented user from sending PM's?
- //
- if ( !$userdata['user_allow_pm'] && $mode != 'edit' )
- {
- $message = $lang['Cannot_send_privmsg'];
- message_die(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 )
- {
- $censors = array();
- obtain_word_list($censors);
-
- 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 )
- {
- 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 ( $attach_sig && $user_sig != '' )
- {
- $preview_message = $preview_message . '
_________________
' . $user_sig;
- }
-
- if ( count($censors['match']) )
- {
- $preview_subject = preg_replace($censors['match'], $censors['replace'], $privmsg_subject);
- $preview_message = preg_replace($censors['match'], $censors['replace'], $preview_message);
- }
- else
- {
- $preview_subject = $privmsg_subject;
- }
-
- if ( $smilies_on )
- {
- $preview_message = smilies_pass($preview_message);
- }
-
- $preview_message = make_clickable($preview_message);
- $preview_message = nl2br($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' => $user->date_format(time()),
- '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)
- {
- $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 ( $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 ( $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 ( $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 .= '';
- if ( $mode == 'edit' )
- {
- $s_hidden_fields .= '';
- }
-
- //
- // Send smilies to template
- //
- generate_smilies('inline', PAGE_PRIVMSGS);
-
- $template->assign_vars(array(
- 'SUBJECT' => preg_replace($html_entities_match, $html_entities_replace, $privmsg_subject),
- 'USERNAME' => preg_replace($html_entities_match, $html_entities_replace, $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_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_NAMES_SELECT' => $user_names_select,
- '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->display('body');
-
- include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
-}
-
-//
-// Default page
-//
-if ( !$userdata['user_id'] )
-{
- $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
- header($header_location . 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'];
-$db->sql_query($sql);
-
-$sql = "UPDATE " . PRIVMSGS_TABLE . "
- SET privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . "
- WHERE privmsgs_type = " . PRIVMSGS_NEW_MAIL . "
- AND privmsgs_to_userid = " . $userdata['user_id'];
-$db->sql_query($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);
-
-//
-// New message
-//
-$post_new_mesg_url = '
';
-
-//
-// 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 ( ( pm.privmsgs_to_userid = " . $userdata['user_id'] . "
- AND pm.privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . "
- AND u.user_id = pm.privmsgs_from_userid )
- OR ( pm.privmsgs_from_userid = " . $userdata['user_id'] . "
- AND pm.privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . "
- AND u.user_id = pm.privmsgs_from_userid ) )";
- break;
-
- default:
- message_die(MESSAGE, $lang['No_such_folder']);
- break;
-}
-
-//
-// Show messages over previous x days/months
-//
-if ( $submit_msgdays && ( !empty($_POST['msgdays']) || !empty($_GET['msgdays']) ) )
-{
- $msg_days = ( !empty($_POST['msgdays']) ) ? intval($_POST['msgdays']) : intval($_GET['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($_POST['msgdays']) )
- {
- $start = 0;
- }
-}
-else
-{
- $limit_msg_time = '';
- $post_days = 0;
-}
-
-$sql .= $limit_msg_time . " ORDER BY pm.privmsgs_date DESC LIMIT $start, " . $config['topics_per_page'];
-$sql_all_tot = $sql_tot;
-$sql_tot .= $limit_msg_time_total;
-
-//
-// Get messages
-//
-$result = $db->sql_query($sql_tot);
-$pm_total = ( $row = $db->sql_fetchrow($result) ) ? $row['total'] : 0;
-
-$result = $db->sql_query($sql_all_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
-//
-if ( $folder == 'inbox' )
-{
- $post_pm_img = '
';
- $reply_pm_img = '
';
- $quote_pm_img = '
';
- $edit_pm_img = '';
-
- $l_box_name = $lang['Inbox'];
-}
-else if ( $folder == 'outbox' )
-{
- $post_pm_img = '
';
- $reply_pm_img = '';
- $quote_pm_img = '';
- $edit_pm_img = '
';
-
- $l_box_name = $lang['Outbox'];
-}
-else if ( $folder == 'savebox' )
-{
- $post_pm_img = '
';
- $reply_pm_img = '
';
- $quote_pm_img = '
';
- $edit_pm_img = '';
-
- $l_box_name = $lang['Savedbox'];
-}
-else if ( $folder == 'sentbox' )
-{
- $post_pm_img = '
';
- $reply_pm_img = '';
- $quote_pm_img = '
';
- $edit_pm_img = '';
-
- $l_box_name = $lang['Sentbox'];
-}
-
-//
-// Output data for inbox status
-//
-if ( $folder != 'outbox' )
-{
- if ( $config['max_' . $folder . '_privmsgs'] > 0 )
- {
- $inbox_limit_pct = round(( $pm_all_total / $config['max_' . $folder . '_privmsgs'] ) * 100);
- }
- else
- {
- $inbox_limit_pct = 100;
- }
- if ( $config['max_' . $folder . '_privmsgs'] > 0 )
- {
- $inbox_limit_img_length = round(( $pm_all_total / $config['max_' . $folder . '_privmsgs'] ) * $config['privmsg_graphic_length']);
- }
- else
- {
- $inbox_limit_img_length = $config['privmsg_graphic_length'];
- }
- if ( $config['max_' . $folder . '_privmsgs'] > 0 )
- {
- $inbox_limit_remain = $config['max_' . $folder . '_privmsgs'] - $pm_all_total;
- }
- else
- {
- $inbox_limit_remain = 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;
- }
-}
-
-//
-// 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,
-
- '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' => $post_new_topic_url)
-);
-
-// Okay, let's build the correct folder
-$result = $db->sql_query($sql);
-
-if ( $row = $db->sql_fetchrow($result) )
-{
- 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("ucp.$phpEx?mode=viewprofile&u=$msg_userid");
-
- $msg_subject = $row['privmsgs_subject'];
-
- if ( count($censors['match']) )
- {
- $msg_subject = preg_replace($censors['match'], $censors['replace'], $msg_subject);
- }
-
- $u_subject = append_sid("privmsg.$phpEx?folder=$folder&mode=read&p=$privmsg_id");
-
- $msg_date = $user_format_date($row['privmsgs_date']);
-
- 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'];
-
- $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, $config['topics_per_page'], $start),
- 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $config['topics_per_page'] ) + 1 ), ceil( $pm_total / $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/ucp/usercp_profile.php b/phpBB/ucp/usercp_profile.php
deleted file mode 100755
index 90e0be2dc1..0000000000
--- a/phpBB/ucp/usercp_profile.php
+++ /dev/null
@@ -1,118 +0,0 @@
-data['user_id'];
-$modules['Preferances'] = "module_id=$selected_module&mode=preferancese&u=" . $user->data['user_id'];
-$modules['Avatar_settings'] = "module_id=$selected_module&u=" . $user->data['user_id'];
-$modules['Signature_settings'] = "module_id=$selected_module&mode=signaturee&u=" . $user->data['user_id'];
-
-foreach($modules as $section_title => $module_link)
-{
- $template->assign_block_vars('ucp_subsections', array('U_SUBSECTION' => "ucp.$phpEx$SID&" . $module_link ,
- 'SUBSECTION' => $user->lang[$section_title],
- 'IS_MULTI_SECTIONS' => (count($modules) > 1) ? TRUE : FALSE));
-}
-
-$mode = ($_GET['mode']) ? $_GET['mode'] : $_POST['mode'];
-$submit = ($_GET['submit']) ? $_GET['submit'] : $_POST['submit'];
-
-switch($mode)
-{
- case 'editprofile':
- default:
-
- if($submit)
- {
- //
- // Save basic profile information
- //
-
-
- }
- else
- {
- //
- // Get userdata
- //
- $username = $user->data['username'];
- $email = $user->data['user_email'];
-
- $s_hidden_fields = '';
- //
- // Show edit profile info form
- //
- $template->assign_vars(array(
- 'IS_PROFILE' => TRUE,
- 'USERNAME' => $username,
- 'EMAIL' => $email,
-
- 'L_CURRENT_PASSWORD' => $user->lang['Current_password'],
- 'L_NEW_PASSWORD' => ($mode == 'register') ? $user->lang['Password'] : $user->lang['New_password'],
- 'L_CONFIRM_PASSWORD' => $user->lang['Confirm_password'],
- 'L_CONFIRM_PASSWORD_EXPLAIN' => ($mode == 'editprofile') ? $user->lang['Confirm_password_explain'] : '',
- 'L_PASSWORD_IF_CHANGED' => ($mode == 'editprofile') ? $user->lang['password_if_changed'] : '',
- 'L_PASSWORD_CONFIRM_IF_CHANGED' => ($mode == 'editprofile') ? $user->lang['password_confirm_if_changed'] : '',
- 'L_SUBMIT' => $user->lang['Submit'],
- 'L_RESET' => $user->lang['Reset'],
- 'L_ITEMS_REQUIRED' => $user->lang['Items_required'],
-
- 'S_CONFIRM_CODE' => ($config['enable_confirm']) ? 1 : 0,
- 'S_HIDDEN_FIELDS' => $s_hidden_fields,
- 'S_PROFILE_ACTION' => "ucp.$phpEx$SID")
- );
-
-
- }
-
-
- break;
- case 'preferancese':
-
-
- break;
- case 'signaturee':
-
-
- break;
-}
-
-
-include($phpbb_root_path . 'includes/page_header.'.$phpEx);
-
-$template->set_filenames(array(
- 'body' => 'usercp_profile.html')
-);
-
-include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
-
-
-?>
diff --git a/phpBB/ucp/usercp_register.php b/phpBB/ucp/usercp_register.php
deleted file mode 100755
index de68bc5d96..0000000000
--- a/phpBB/ucp/usercp_register.php
+++ /dev/null
@@ -1,336 +0,0 @@
-lang['Cannot_register']);
-}
-
-
-// Load the userdata manipulation methods
-require($phpbb_root_path . 'includes/functions_user.'.$phpEx);
-
-// Class for handling the manipulation of user data
-$userdata = new userdata();
-
-$error = FALSE;
-
-$page_title = $user->lang['Register'];
-
-if ($mode == 'register')
-{
- if(!isset($_POST['agree']) && !isset($_GET['agree']) && !isset($_POST['coppa_over_13']) && !isset($_GET['coppa_over_13']) && !isset($_POST['coppa_under_13']) && !isset($_GET['coppa_under_13']) && !$_POST['agreed'])
- {
- $agreed = FALSE;
- include($phpbb_root_path . 'includes/page_header.'.$phpEx);
-
- // Does this need to be function anymore?
- // Need to remember that COPPA can be disabled
- show_coppa();
-
- include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
- }
- else
- {
- $agreed = TRUE;
- }
-}
-
-$coppa = (empty($_POST['coppa_under_13']) && empty($_GET['coppa_under_13'])) ? 0 : TRUE;
-
-
-// Need to look at better handling of these vars ... although in practice
-// they will be defined on appropriate usercp pages in time I guess 2.0.x
-// was incredibly messy in this respect
-
-
-// Check and initialize some variables if needed
-if (isset($_POST['submit']))
-{
-
- // User registration is now handled by the userdata class which is in sessions.php.
- $new_user_data = $userdata->add_new_user($_POST, $coppa);
- if($new_user_data['user_id'])
- {
- if ($config['require_activation'] == USER_ACTIVATION_NONE)
- {
- set_config('newest_user_id', $new_user_data['user_id'], TRUE);
- set_config('newest_username', $new_user_data['username'], TRUE);
- set_config('num_users', $config['num_users'] + 1, TRUE);
- }
-
- trigger_error($new_user_data['message']);
- }
- else
- {
- trigger_error($new_user_data['message']);
- }
-
-} // End of submit
-
-
-
-
-if ($userdata->error)
-{
- //
- // If an error occured we need to stripslashes on returned data
- //
- $username = stripslashes($username);
- $email = stripslashes($email);
- $password = '';
- $password_confirm = '';
-
- $user_lang = stripslashes($user_lang);
- $user_dateformat = stripslashes($user_dateformat);
-}
-
-//
-// Default pages
-//
-
-
-
- if (!isset($coppa))
- {
- $coppa = FALSE;
- }
-
- if (!isset($user_template))
- {
- $selected_template = $config['system_template'];
- }
-
- $s_hidden_fields = '';
-
-
- if (!empty($user_avatar_local))
- {
- $s_hidden_fields .= '';
- }
-
- $html_status = ($user->data['user_allowhtml'] && $config['allow_html']) ? $user->lang['HTML_is_ON'] : $user->lang['HTML_is_OFF'];
- $bbcode_status = ($user->data['user_allowbbcode'] && $config['allow_bbcode']) ? $user->lang['BBCode_is_ON'] : $user->lang['BBCode_is_OFF'];
- $smilies_status = ($user->data['user_allowsmile'] && $config['allow_smilies']) ? $user->lang['Smilies_are_ON'] : $user->lang['Smilies_are_OFF'];
-
- // Let's do an overall check for settings/versions which would prevent
- // us from doing file uploads....
- $form_enctype = (@ini_get('file_uploads') == '0' || strtolower(@ini_get('file_uploads')) == 'off'|| !$config['allow_avatar_upload']) ? '' : 'enctype="multipart/form-data"';
-
- // Visual Confirmation - Show images
- $confirm_image = '';
- if ($mode == 'editprofile')
- {
- // Use IF conditional within template S_EDIT_PROFILE or some such
- $template->assign_block_vars('switch_edit_profile', array());
- }
- else if ($mode == 'register' && !empty($config['enable_confirm']))
- {
- // Use IF conditional within template, send a S_ENABLE_CONFIRM
- $template->assign_block_vars('switch_confirm', array());
-
- $sql = "SELECT session_id
- FROM " . SESSIONS_TABLE;
- $result = $db->sql_query($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)";
- $db->sql_query($sql);
- }
- $db->sql_freeresult($result);
-
- $sql = "SELECT COUNT(session_id) AS attempts
- FROM " . CONFIRM_TABLE . "
- WHERE session_id = '" . $userdata['session_id'] . "'";
- $result = $db->sql_query($sql);
-
- if ($row = $db->sql_fetchrow($result))
- {
- if ($row['attempts'] > 5)
- {
- trigger_error($user->lang['Too_many_registers']);
- }
- }
- $db->sql_freeresult($result);
-
- $code = $userdata->gen_png_string(6);
- $confirm_id = md5(uniqid($user_ip));
-
- $sql = "INSERT INTO " . CONFIRM_TABLE . " (confirm_id, session_id, code)
- VALUES ('$confirm_id', '" . $user->data['session_id'] . "', '$code')";
- $db->sql_query($sql);
-
- $confirm_image = (@extension_loaded('zlib')) ? '
' : '




';
- $s_hidden_fields .= '';
-
- }
- //
- // End visual confirmation
- //
-
-
- // No need to send simple language vars to template ... they are
- // picked up automatically (must be named in lang file as they
- // are in template minus the L_ of course!). Only send lang
- // strings created or modified within source
- $template->assign_vars(array(
- 'USERNAME' => $username,
- 'EMAIL' => $email,
- '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"' : '',
- '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,
-
- 'CONFIRM_CODE' => $confirm_image,
-
- 'L_CURRENT_PASSWORD' => $user->lang['Current_password'],
- 'L_NEW_PASSWORD' => ($mode == 'register') ? $user->lang['Password'] : $user->lang['New_password'],
- 'L_CONFIRM_PASSWORD' => $user->lang['Confirm_password'],
- 'L_CONFIRM_PASSWORD_EXPLAIN' => ($mode == 'editprofile') ? $user->lang['Confirm_password_explain'] : '',
- 'L_PASSWORD_IF_CHANGED' => ($mode == 'editprofile') ? $user->lang['password_if_changed'] : '',
- 'L_PASSWORD_CONFIRM_IF_CHANGED' => ($mode == 'editprofile') ? $user->lang['password_confirm_if_changed'] : '',
- 'L_SUBMIT' => $user->lang['Submit'],
- 'L_RESET' => $user->lang['Reset'],
- 'L_BOARD_LANGUAGE' => $user->lang['Board_lang'],
- 'L_BOARD_STYLE' => $user->lang['Board_style'],
- 'L_TIMEZONE' => $user->lang['Timezone'],
- 'L_DATE_FORMAT' => $user->lang['Date_format'],
- 'L_DATE_FORMAT_EXPLAIN' => $user->lang['Date_format_explain'],
- 'L_YES' => $user->lang['Yes'],
- 'L_NO' => $user->lang['No'],
- 'L_INTERESTS' => $user->lang['Interests'],
- 'L_ALWAYS_ALLOW_SMILIES' => $user->lang['Always_smile'],
- 'L_ALWAYS_ALLOW_BBCODE' => $user->lang['Always_bbcode'],
- 'L_ALWAYS_ALLOW_HTML' => $user->lang['Always_html'],
- 'L_HIDE_USER' => $user->lang['Hide_user'],
- 'L_ALWAYS_ADD_SIGNATURE' => $user->lang['Always_add_sig'],
-
- 'L_NOTIFY_ON_REPLY' => $user->lang['Always_notify'],
- 'L_NOTIFY_ON_REPLY_EXPLAIN' => $user->lang['Always_notify_explain'],
- 'L_NOTIFY_ON_PRIVMSG' => $user->lang['Notify_on_privmsg'],
- 'L_POPUP_ON_PRIVMSG' => $user->lang['Popup_on_privmsg'],
- 'L_POPUP_ON_PRIVMSG_EXPLAIN' => $user->lang['Popup_on_privmsg_explain'],
- 'L_PREFERENCES' => $user->lang['Preferences'],
- 'L_PUBLIC_VIEW_EMAIL' => $user->lang['Public_view_email'],
- 'L_ITEMS_REQUIRED' => $user->lang['Items_required'],
- 'L_REGISTRATION_INFO' => $user->lang['Registration_info'],
- 'L_PROFILE_INFO' => $user->lang['Profile_info'],
- 'L_PROFILE_INFO_NOTICE' => $user->lang['Profile_info_warn'],
- 'L_EMAIL_ADDRESS' => $user->lang['Email_address'],
-
- 'S_PROFILE_EDIT' => ($mode == 'editprofile') ? true : false,
- 'S_CONFIRM_CODE' => ($config['enable_confirm']) ? 1 : 0,
- 'S_HIDDEN_FIELDS' => $s_hidden_fields,
- 'S_FORM_ENCTYPE' => $form_enctype,
- 'S_PROFILE_ACTION' => "ucp.$phpEx$SID")
- );
-
-//
-include($phpbb_root_path . 'includes/page_header.'.$phpEx);
-
-$template->set_filenames(array(
- 'body' => 'profile_add_body.html')
-);
-make_jumpbox('viewforum.'.$phpEx);
-
-include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
-
-// ---------
-// FUNCTIONS
-//
-function show_coppa()
-{
- global $template, $user, $phpbb_root_path, $phpEx, $config;
-
- $template->set_filenames(array(
- 'body' => 'agreement.html')
- );
-
- $l_reg_cond = '';
- switch ($config['require_activation'])
- {
- case USER_ACTIVATION_SELF:
- $l_reg_cond = $user->lang['Reg_email_activation'];
- break;
- case USER_ACTIVATION_ADMIN:
- $l_reg_conf = $user->lang['Reg_admin_activation'];
- break;
- }
-
- $template->assign_vars(array(
- 'REGISTRATION' => $user->lang['REGISTRATION'],
- 'AGREEMENT' => $user->lang['REG_AGREEMENT'],
- 'REGISTRATION_CONDITIONS' => $l_reg_cond,
- "AGREE_OVER_13" => $user->lang['AGREE_OVER_13'],
- "AGREE_UNDER_13" => $user->lang['AGREE_UNDER_13'],
- 'DO_NOT_AGREE' => $user->lang['AGREE_NOT'],
- 'AGREE' => $user->lang['AGREE'],
-
- 'U_UCP_AGREE' => 'ucp.' . $phpEx,
- "U_AGREE_OVER13" => "ucp.$phpEx?$SID&mode=register&agreed=true",
- "U_AGREE_UNDER13" => "ucp.$phpEx?$SID&mode=register&agreed=true&coppa=true")
- );
-}
-
-//
-// FUNCTIONS
-// ---------
-
-?>
\ No newline at end of file
diff --git a/phpBB/ucp/usercp_sendpasswd.php b/phpBB/ucp/usercp_sendpasswd.php
deleted file mode 100755
index 6103aeaf67..0000000000
--- a/phpBB/ucp/usercp_sendpasswd.php
+++ /dev/null
@@ -1,149 +0,0 @@
-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_actkey = gen_rand_string(true);
- $key_len = 54 - strlen($server_url);
- $key_len = ( $str_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($config['smtp_delivery']);
-
- $email_headers = 'From: ' . $config['board_email'] . "\nReturn-Path: " . $config['board_email'] . "\r\n";
-
- $emailer->use_template('user_activate_passwd', $row['user_lang']);
- $emailer->email_address($row['user_email']);
- $emailer->set_subject();//$lang['New_password_activation']
- $emailer->extra_headers($email_headers);
-
- $emailer->assign_vars(array(
- 'SITENAME' => $config['sitename'],
- 'USERNAME' => $username,
- 'PASSWORD' => $user_password,
- 'EMAIL_SIG' => str_replace('
', "\n", "-- \n" . $config['board_email_sig']),
-
- 'U_ACTIVATE' => $server_url . "?mode=activate&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'])
-);
-
-$template->pparse('body');
-
-include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
-
-?>