[Customisation Database Commits] r363 - in /trunk/titania: ./ contributions/ includes/ includes/core/ includes/objects/ includes/tools/
Nathan Guse
exreaction at phpbb.com
Mon Sep 28 03:28:31 BST 2009
Author: exreaction
Date: Mon Sep 28 03:28:31 2009
New Revision: 363
Log:
append_sid -> phpbb::append_sid
Remember to not use titania::$config->titania_script_path for generating urls! (mtotheikle)
More work on the topic display
New function for handling display of user data (not finished yet)
Modified:
trunk/titania/common.php
trunk/titania/contributions/details.php
trunk/titania/contributions/support.php
trunk/titania/includes/core/phpbb.php
trunk/titania/includes/core/titania.php
trunk/titania/includes/functions_display.php
trunk/titania/includes/objects/author.php
trunk/titania/includes/objects/post.php
trunk/titania/includes/tools/email.php
trunk/titania/includes/tools/message.php
trunk/titania/includes/tools/pagination.php
Modified: trunk/titania/common.php
==============================================================================
*** trunk/titania/common.php (original)
--- trunk/titania/common.php Mon Sep 28 03:28:31 2009
***************
*** 59,65 ****
// If the database is not installed or outdated redirect to the installer
if (!defined('IN_TITANIA_INSTALL') && (!isset(phpbb::$config['titania_version']) || version_compare(phpbb::$config['titania_version'], TITANIA_VERSION, '<')))
{
! redirect(append_sid(TITANIA_ROOT . 'install.' . PHP_EXT));
}
// admin requested the cache to be purged, ensure they have permission and purge the cache.
--- 59,65 ----
// If the database is not installed or outdated redirect to the installer
if (!defined('IN_TITANIA_INSTALL') && (!isset(phpbb::$config['titania_version']) || version_compare(phpbb::$config['titania_version'], TITANIA_VERSION, '<')))
{
! redirect(phpbb::append_sid(TITANIA_ROOT . 'install.' . PHP_EXT));
}
// admin requested the cache to be purged, ensure they have permission and purge the cache.
Modified: trunk/titania/contributions/details.php
==============================================================================
*** trunk/titania/contributions/details.php (original)
--- trunk/titania/contributions/details.php Mon Sep 28 03:28:31 2009
***************
*** 179,184 ****
'ERROR_MESSAGE' => (sizeof($error)) ? implode('<br />', $error) : '',
'S_LANG_OPTIONS' => language_select($email_lang),
! 'S_POST_ACTION' => append_sid($this->page, 'id=details&mode=email&mod=' . $mod_id),
));
}*/
\ No newline at end of file
--- 179,184 ----
'ERROR_MESSAGE' => (sizeof($error)) ? implode('<br />', $error) : '',
'S_LANG_OPTIONS' => language_select($email_lang),
! 'S_POST_ACTION' => phpbb::append_sid($this->page, 'id=details&mode=email&mod=' . $mod_id),
));
}*/
\ No newline at end of file
Modified: trunk/titania/contributions/support.php
==============================================================================
*** trunk/titania/contributions/support.php (original)
--- trunk/titania/contributions/support.php Mon Sep 28 03:28:31 2009
***************
*** 167,172 ****
--- 167,177 ----
if ($topic_id)
{
+ $start = request_var('start', 0);
+ $limit = request_var('limit', (int) phpbb::$config['topics_per_page']);
+
+ titania_display_topic($topic, false, array('start' => $start, 'limit' => $limit));
+
phpbb::$template->assign_vars(array(
'U_POST_REPLY' => (phpbb::$auth->acl_get('titania_post')) ? titania::$url->append_url($topic->get_url(), array('action' => 'reply')) : '',
));
Modified: trunk/titania/includes/core/phpbb.php
==============================================================================
*** trunk/titania/includes/core/phpbb.php (original)
--- trunk/titania/includes/core/phpbb.php Mon Sep 28 03:28:31 2009
***************
*** 42,45 ****
--- 42,64 ----
self::$user = &$user;
self::$cache = &$cache;
}
+
+ /**
+ * Shortcut for phpbb's append_sid function (do not send the root path/phpext in the url part)
+ *
+ * @param mixed $url
+ * @param mixed $params
+ * @param mixed $is_amp
+ * @param mixed $session_id
+ * @return string
+ */
+ public static function append_sid($url, $params = false, $is_amp = true, $session_id = false)
+ {
+ if (!strpos($url, '.' . PHP_EXT))
+ {
+ $url = titania::$absolute_board . $url . '.' . PHP_EXT;
+ }
+
+ return append_sid($url, $params, $is_amp, $session_id);
+ }
}
Modified: trunk/titania/includes/core/titania.php
==============================================================================
*** trunk/titania/includes/core/titania.php (original)
--- trunk/titania/includes/core/titania.php Mon Sep 28 03:28:31 2009
***************
*** 296,307 ****
// Generate logged in/logged out status
if (phpbb::$user->data['user_id'] != ANONYMOUS)
{
! $u_login_logout = append_sid(self::$absolute_path . 'index.' . PHP_EXT, 'mode=logout', true, phpbb::$user->session_id);
$l_login_logout = sprintf(phpbb::$user->lang['LOGOUT_USER'], phpbb::$user->data['username']);
}
else
{
! $u_login_logout = append_sid(self::$absolute_board . 'ucp.' . PHP_EXT, 'mode=login&redirect=' . self::$page);
$l_login_logout = phpbb::$user->lang['LOGIN'];
}
--- 296,307 ----
// Generate logged in/logged out status
if (phpbb::$user->data['user_id'] != ANONYMOUS)
{
! $u_login_logout = phpbb::append_sid(self::$absolute_path . 'index.' . PHP_EXT, 'mode=logout', true, phpbb::$user->session_id);
$l_login_logout = sprintf(phpbb::$user->lang['LOGOUT_USER'], phpbb::$user->data['username']);
}
else
{
! $u_login_logout = phpbb::append_sid('ucp', 'mode=login&redirect=' . self::$page);
$l_login_logout = phpbb::$user->lang['LOGIN'];
}
***************
*** 323,329 ****
'U_LOGIN_LOGOUT' => $u_login_logout,
'L_LOGIN_LOGOUT' => $l_login_logout,
'LOGIN_REDIRECT' => self::$page,
! 'S_LOGIN_ACTION' => append_sid(self::$absolute_board . 'ucp.' . PHP_EXT, 'mode=login'),
'SESSION_ID' => phpbb::$user->session_id,
--- 323,329 ----
'U_LOGIN_LOGOUT' => $u_login_logout,
'L_LOGIN_LOGOUT' => $l_login_logout,
'LOGIN_REDIRECT' => self::$page,
! 'S_LOGIN_ACTION' => phpbb::append_sid('ucp', 'mode=login'),
'SESSION_ID' => phpbb::$user->session_id,
***************
*** 338,344 ****
'T_TITANIA_THEME_PATH' => self::$theme_path,
'T_TITANIA_STYLESHEET' => self::$absolute_path . '/style.php?style=' . self::$config->style,
! 'U_DELETE_COOKIES' => append_sid(self::$absolute_board . 'ucp.' . PHP_EXT, 'mode=delete_cookies'),
'S_USER_LOGGED_IN' => (phpbb::$user->data['user_id'] != ANONYMOUS) ? true : false,
'S_AUTOLOGIN_ENABLED' => (phpbb::$config['allow_autologin']) ? true : false,
'S_BOARD_DISABLED' => (phpbb::$config['board_disable']) ? true : false,
--- 338,344 ----
'T_TITANIA_THEME_PATH' => self::$theme_path,
'T_TITANIA_STYLESHEET' => self::$absolute_path . '/style.php?style=' . self::$config->style,
! 'U_DELETE_COOKIES' => phpbb::append_sid('ucp', 'mode=delete_cookies'),
'S_USER_LOGGED_IN' => (phpbb::$user->data['user_id'] != ANONYMOUS) ? true : false,
'S_AUTOLOGIN_ENABLED' => (phpbb::$config['allow_autologin']) ? true : false,
'S_BOARD_DISABLED' => (phpbb::$config['board_disable']) ? true : false,
***************
*** 469,475 ****
'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : '',
'TRANSLATION_INFO' => (!empty(phpbb::$user->lang['TRANSLATION_INFO'])) ? phpbb::$user->lang['TRANSLATION_INFO'] : '',
! 'U_ACP' => (phpbb::$auth->acl_get('a_') && !empty(phpbb::$user->data['is_registered'])) ? append_sid(self::$absolute_board . 'adm/index.' . PHP_EXT, false, true, phpbb::$user->session_id) : '',
'U_PURGE_CACHE' => (phpbb::$auth->acl_get('a_')) ? self::$url->append_url(self::$url->current_page, array_merge(self::$url->params, array('cache' => 'purge'))) : '',
));
--- 469,475 ----
'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : '',
'TRANSLATION_INFO' => (!empty(phpbb::$user->lang['TRANSLATION_INFO'])) ? phpbb::$user->lang['TRANSLATION_INFO'] : '',
! 'U_ACP' => (phpbb::$auth->acl_get('a_') && !empty(phpbb::$user->data['is_registered'])) ? phpbb::append_sid('adm/index', false, true, phpbb::$user->session_id) : '',
'U_PURGE_CACHE' => (phpbb::$auth->acl_get('a_')) ? self::$url->append_url(self::$url->current_page, array_merge(self::$url->params, array('cache' => 'purge'))) : '',
));
***************
*** 509,515 ****
if ($cron_type)
{
! phpbb::$template->assign_var('RUN_CRON_TASK', '<img src="' . append_sid(self::$absolute_board . 'cron.' . PHP_EXT, 'cron_type=' . $cron_type) . '" width="1" height="1" alt="cron" />');
}
}
--- 509,515 ----
if ($cron_type)
{
! phpbb::$template->assign_var('RUN_CRON_TASK', '<img src="' . phpbb::append_sid('cron', 'cron_type=' . $cron_type) . '" width="1" height="1" alt="cron" />');
}
}
Modified: trunk/titania/includes/functions_display.php
==============================================================================
*** trunk/titania/includes/functions_display.php (original)
--- trunk/titania/includes/functions_display.php Mon Sep 28 03:28:31 2009
***************
*** 33,38 ****
--- 33,91 ----
}
/**
+ * Assign user details (prepared for output to template)
+ *
+ * @param mixed $row
+ */
+ function assign_user_details($row)
+ {
+ $poster_id = $row['user_id'];
+
+ if (!function_exists('get_user_rank'))
+ {
+ include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
+ }
+
+ get_user_rank($row['user_rank'], $row['user_posts'], $row['rank_title'], $row['rank_image'], $row['rank_image_src']);
+
+ return array(
+ 'USER_FULL' => get_username_string('full', $poster_id, $row['username'], $row['user_colour']),
+ 'USER_COLOUR' => get_username_string('colour', $poster_id, $row['username'], $row['user_colour']),
+ 'USERNAME' => get_username_string('username', $poster_id, $row['username'], $row['user_colour']),
+
+ 'RANK_TITLE' => $row['rank_title'],
+ 'RANK_IMG' => $row['rank_image'],
+ 'RANK_IMG_SRC' => $row['rank_image_src'],
+ 'USER_JOINED' => phpbb::$user->format_date($row['user_regdate']),
+ 'USER_POSTS' => $row['user_posts'],
+ 'USER_FROM' => $row['user_from'],
+ 'USER_AVATAR' => (phpbb::$user->optionget('viewavatars')) ? get_user_avatar($row['user_avatar'], $row['user_avatar_type'], $row['user_avatar_width'], $row['user_avatar_height']) : '',
+ 'USER_WARNINGS' => $row['user_warnings'],
+ // 'USER_AGE' => $row['age'],
+
+ 'ICQ_STATUS_IMG' => (!empty($row['user_icq'])) ? '<img src="http://web.icq.com/whitepages/online?icq=' . $row['user_icq'] . '&img=5" width="18" height="18" alt="" />' : '',
+ // 'ONLINE_IMG' => ($poster_id == ANONYMOUS || !phpbb::$config['load_onlinetrack']) ? '' : (($row['online']) ? phpbb::$user->img('icon_user_online', 'ONLINE') : phpbb::$user->img('icon_user_offline', 'OFFLINE')),
+ // 'S_ONLINE' => ($poster_id == ANONYMOUS || !phpbb::$config['load_onlinetrack']) ? false : (($row['online']) ? true : false),
+ // 'S_FRIEND' => ($row['friend']) ? true : false,
+
+ // @todo: info link...need to build the mcp stuff first.
+ // 'U_INFO' => ($auth->acl_get('m_info', $forum_id)) ? phpbb::append_sid('mcp', "i=main&mode=post_details&f=$forum_id&p=" . $row['post_id'], true, phpbb::$user->session_id) : '',
+ 'U_USER_PROFILE' => get_username_string('profile', $poster_id, $row['username'], $row['user_colour']),
+ 'U_SEARCH' => (phpbb::$auth->acl_get('u_search')) ? phpbb::append_sid('search', "author_id=$poster_id&sr=posts") : '',
+ 'U_PM' => ($poster_id != ANONYMOUS && phpbb::$config['allow_privmsg'] && phpbb::$auth->acl_get('u_sendpm') && ($row['user_allow_pm'] || phpbb::$auth->acl_gets('a_', 'm_') || phpbb::$auth->acl_getf_global('m_'))) ? phpbb::append_sid('ucp', 'i=pm&mode=compose') : '',
+ 'U_EMAIL' => (!empty($row['user_allow_viewemail']) || phpbb::$auth->acl_get('a_email')) ? ((phpbb::$config['board_email_form'] && phpbb::$config['email_enable']) ? phpbb::append_sid('memberlist', "mode=email&u=$poster_id") : ((phpbb::$config['board_hide_emails'] && !phpbb::$auth->acl_get('a_email')) ? '' : 'mailto:' . $row['user_email'])) : '',
+ 'U_WWW' => $row['user_website'],
+ 'U_ICQ' => (!empty($row['user_icq'])) ? 'http://www.icq.com/people/webmsg.php?to=' . $row['user_icq'] : '',
+ 'U_AIM' =>($row['user_aim'] && phpbb::$auth->acl_get('u_sendim')) ? phpbb::append_sid('memberlist', "mode=contact&action=aim&u=$poster_id") : '',
+ 'U_MSN' => ($row['user_msnm'] && phpbb::$auth->acl_get('u_sendim')) ? phpbb::append_sid('memberlist', "mode=contact&action=msnm&u=$poster_id") : '',
+ 'U_YIM' => ($row['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($row['user_yim']) . '&.src=pg' : '',
+ 'U_JABBER' => ($row['user_jabber'] && phpbb::$auth->acl_get('u_sendim')) ? phpbb::append_sid('memberlist', "mode=contact&action=jabber&u=$poster_id") : '',
+
+
+ );
+ }
+
+ /**
* Display categories
*
* @param int $parent_id The parent id/name (only show categories under this category)
***************
*** 274,289 ****
/**
* Display topic section for support/tracker/etc
*
! @param int $topic_id The topic_id
@param object|boolean $sort The sort object (includes/tools/sort.php)
* @param array $options Extra options (limit, category (for tracker))
*/
! function titania_display_topic($topic_id, $sort = false, $options = array('start' => 0, 'limit' => 10))
{
! // array of posts
! $topic = array();
! $sql = 'SELECT * FROM ' . TITANIA_POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
! WHERE p.topic_id = ' . (int) $topic_id . '
! AND u.user_id = p.user_id';
}
\ No newline at end of file
--- 327,410 ----
/**
* Display topic section for support/tracker/etc
*
! @param object $topic The topic object
@param object|boolean $sort The sort object (includes/tools/sort.php)
* @param array $options Extra options (limit, category (for tracker))
*/
! function titania_display_topic($topic, $sort = false, $options = array('start' => 0, 'limit' => 10))
{
! titania::load_object('post');
! $sql_ary = array(
! 'SELECT' => 'p.*, u.*',
! 'FROM' => array(
! TITANIA_POSTS_TABLE => 'p',
! USERS_TABLE => 'u',
! ),
! 'WHERE' => 'p.post_access >= ' . titania::$access_level . '
! AND p.topic_id = ' . (int) $topic->topic_id . '
! AND u.user_id = p.post_user_id',
! 'ORDER_BY' => 'p.post_time DESC',
! );
!
! // Sort options
! if ($sort !== false)
! {
! $sql_ary['ORDER_BY'] = $sort->get_order_by();
! }
!
! // Main SQL Query
! $sql = phpbb::$db->sql_build_query('SELECT', $sql_ary);
!
! // Count SQL Query
! $sql_ary['SELECT'] = 'COUNT(post_id) AS cnt';
! $count_sql = phpbb::$db->sql_build_query('SELECT', $sql_ary);
! phpbb::$db->sql_query($count_sql);
! $count = phpbb::$db->sql_fetchfield('cnt');
! phpbb::$db->sql_freeresult();
!
! // Get the data
! $posts = $post_ids = array();
! $result = phpbb::$db->sql_query_limit($sql, $options['limit'], $options['start']);
! while ($row = phpbb::$db->sql_fetchrow($result))
! {
! $posts[$row['post_id']] = $row;
! $post_ids[] = $row['post_id'];
! }
! phpbb::$db->sql_freeresult($result);
!
! // Get the read info
!
! // Loop de loop
! foreach ($posts as $row)
! {
! $post = new titania_post($topic->topic_type);
! $post->__set_array($row);
!
! phpbb::$template->assign_block_vars('posts', array_merge($post->assign_details(), assign_user_details($row)));
!
! unset($post);
! }
! phpbb::$db->sql_freeresult($result);
!
! phpbb::$template->assign_vars(array(
! 'REPORT_IMG' => phpbb::$user->img('icon_post_report', 'REPORT_POST'),
! 'REPORTED_IMG' => phpbb::$user->img('icon_topic_reported', 'TOPIC_REPORTED'),
! 'UNAPPROVED_IMG' => phpbb::$user->img('icon_topic_unapproved', 'TOPIC_UNAPPROVED'),
! 'WARN_IMG' => phpbb::$user->img('icon_user_warn', 'WARN_USER'),
!
! 'EDIT_IMG' => phpbb::$user->img('icon_post_edit', 'EDIT_POST'),
! 'DELETE_IMG' => phpbb::$user->img('icon_post_delete', 'DELETE_POST'),
! 'INFO_IMG' => phpbb::$user->img('icon_post_info', 'VIEW_INFO'),
! 'PROFILE_IMG' => phpbb::$user->img('icon_user_profile', 'READ_PROFILE'),
! 'SEARCH_IMG' => phpbb::$user->img('icon_user_search', 'SEARCH_USER_POSTS'),
! 'PM_IMG' => phpbb::$user->img('icon_contact_pm', 'SEND_PRIVATE_MESSAGE'),
! 'EMAIL_IMG' => phpbb::$user->img('icon_contact_email', 'SEND_EMAIL'),
! 'WWW_IMG' => phpbb::$user->img('icon_contact_www', 'VISIT_WEBSITE'),
! 'ICQ_IMG' => phpbb::$user->img('icon_contact_icq', 'ICQ'),
! 'AIM_IMG' => phpbb::$user->img('icon_contact_aim', 'AIM'),
! 'MSN_IMG' => phpbb::$user->img('icon_contact_msnm', 'MSNM'),
! 'YIM_IMG' => phpbb::$user->img('icon_contact_yahoo', 'YIM'),
! 'JABBER_IMG' => phpbb::$user->img('icon_contact_jabber', 'JABBER') ,
! ));
}
\ No newline at end of file
Modified: trunk/titania/includes/objects/author.php
==============================================================================
*** trunk/titania/includes/objects/author.php (original)
--- trunk/titania/includes/objects/author.php Mon Sep 28 03:28:31 2009
***************
*** 259,265 ****
{
if ($this->user_id)
{
! return append_sid(titania::$absolute_board . 'memberlist.' . PHP_EXT, 'u=' . $this->user_id);
}
return '';
--- 259,265 ----
{
if ($this->user_id)
{
! return phpbb::append_sid('memberlist', 'u=' . $this->user_id);
}
return '';
***************
*** 281,287 ****
}
/**
! * Get correct webiste url
*
* @return string
*/
--- 281,287 ----
}
/**
! * Get correct website url
*
* @return string
*/
***************
*** 326,331 ****
--- 326,337 ----
'U_AUTHOR_CONTRIBUTIONS' => $this->get_url('contributions'),
);
+ /* @todo: automatically display the common author data too...
+ if (isset($this->sql_data))
+ {
+ $vars = array_merge($vars, assign_user_details($this->sql_data));
+ }*/
+
if ($return)
{
return $vars;
Modified: trunk/titania/includes/objects/post.php
==============================================================================
*** trunk/titania/includes/objects/post.php (original)
--- trunk/titania/includes/objects/post.php Mon Sep 28 03:28:31 2009
***************
*** 56,61 ****
--- 56,68 ----
public $topic = NULL;
/**
+ * Unread post id
+ *
+ * @var int|bool
+ */
+ public $unread = false;
+
+ /**
* Constructor class for titania posts
*
* @param int|string $type The type of post ('tracker', 'queue', 'normal'). Normal/default meaning support/discussion. Constants for the type can be sent instead of a string
***************
*** 509,512 ****
--- 516,553 ----
parent::delete();
}
+
+ /**
+ * Assign details
+ *
+ * A little different from those in other classes, this one only returns the info ready for output
+ */
+ public function assign_details()
+ {
+ $details = array(
+ 'POST_ID' => $this->post_id,
+ 'TOPIC_ID' => $this->topic_id,
+ 'POST_TYPE' => $this->post_type,
+ 'POST_ACCESS' => $this->post_access,
+ 'POST_LOCKED' => $this->post_locked,
+ 'POST_APPROVED' => $this->post_approved,
+ 'POST_REPORTED' => $this->post_reported,
+ 'POST_ATTACHMENT' => $this->post_attachment,
+ 'POST_USER_ID' => $this->post_user_id,
+ 'POST_IP' => $this->post_ip,
+ 'POST_TIME' => phpbb::$user->format_date($this->post_time),
+ 'POST_EDITED' => $this->post_edited,
+ 'POST_DELETED' => $this->post_deleted, // @todo output this to be something useful
+ 'POST_EDIT_USER' => $this->post_edit_user,
+ 'POST_EDIT_REASON' => censor_text($this->post_edit_reason),
+ 'POST_SUBJECT' => censor_text($this->post_subject),
+ 'POST_TEXT' => $this->generate_text_for_display(),
+
+ 'U_VIEW_POST' => $this->get_url(),
+
+ 'S_UNREAD_POST' => ($this->unread) ? true : false, // remember that you must set this up extra...
+ );
+
+ return $details;
+ }
}
Modified: trunk/titania/includes/tools/email.php
==============================================================================
*** trunk/titania/includes/tools/email.php (original)
--- trunk/titania/includes/tools/email.php Mon Sep 28 03:28:31 2009
***************
*** 62,68 ****
phpbb::$template->assign_vars(array(
'S_LANG_OPTIONS' => language_select($email_lang),
! 'S_POST_ACTION' => append_sid(titania::$page, array('id' => 'email', 'contrib_id' => $this->contrib_id)),
));
$error = array();
--- 62,68 ----
phpbb::$template->assign_vars(array(
'S_LANG_OPTIONS' => language_select($email_lang),
! 'S_POST_ACTION' => phpbb::append_sid(titania::$page, array('id' => 'email', 'contrib_id' => $this->contrib_id)),
));
$error = array();
***************
*** 141,147 ****
'MESSAGE' => htmlspecialchars_decode($message),
'CONTRIB_NAME' => htmlspecialchars_decode($this->contrib_name),
! 'U_CONTRIB' => append_sid(titania::$page, array('contrib_id' => $this->contrib_id, 'id' => 'details'), true, ''),
));
$messenger->send(NOTIFY_EMAIL);
--- 141,147 ----
'MESSAGE' => htmlspecialchars_decode($message),
'CONTRIB_NAME' => htmlspecialchars_decode($this->contrib_name),
! 'U_CONTRIB' => phpbb::append_sid(titania::$page, array('contrib_id' => $this->contrib_id, 'id' => 'details'), true, ''),
));
$messenger->send(NOTIFY_EMAIL);
Modified: trunk/titania/includes/tools/message.php
==============================================================================
*** trunk/titania/includes/tools/message.php (original)
--- trunk/titania/includes/tools/message.php Mon Sep 28 03:28:31 2009
***************
*** 165,171 ****
{
phpbb::$template->assign_vars(array(
'CAPTCHA_TEMPLATE' => $captcha->get_template(),
! 'CONFIRM_IMAGE_LINK' => append_sid(titania::$absolute_board . 'ucp.' . PHP_EXT, 'mode=confirm&confirm_id=' . $captcha->confirm_id . '&type=' . $captcha->type),// Use proper captcha link
));
}
--- 165,171 ----
{
phpbb::$template->assign_vars(array(
'CAPTCHA_TEMPLATE' => $captcha->get_template(),
! 'CONFIRM_IMAGE_LINK' => phpbb::append_sid('ucp', 'mode=confirm&confirm_id=' . $captcha->confirm_id . '&type=' . $captcha->type),// Use proper captcha link
));
}
***************
*** 358,364 ****
'S_MAGIC_URL_CHECKED' => ($this->enable_magic_url) ? '' : ' checked="checked"',
// To show the Options: section on the bottom left
! 'BBCODE_STATUS' => sprintf(phpbb::$user->lang[(($this->bbcode_status) ? 'BBCODE_IS_ON' : 'BBCODE_IS_OFF')], '<a href="' . append_sid(titania::$absolute_board . 'faq.' . PHP_EXT, 'mode=bbcode') . '">', '</a>'),
'IMG_STATUS' => ($this->img_status) ? phpbb::$user->lang['IMAGES_ARE_ON'] : phpbb::$user->lang['IMAGES_ARE_OFF'],
'FLASH_STATUS' => ($this->flash_status) ? phpbb::$user->lang['FLASH_IS_ON'] : phpbb::$user->lang['FLASH_IS_OFF'],
'SMILIES_STATUS' => ($this->smilies_status) ? phpbb::$user->lang['SMILIES_ARE_ON'] : phpbb::$user->lang['SMILIES_ARE_OFF'],
--- 358,364 ----
'S_MAGIC_URL_CHECKED' => ($this->enable_magic_url) ? '' : ' checked="checked"',
// To show the Options: section on the bottom left
! 'BBCODE_STATUS' => sprintf(phpbb::$user->lang[(($this->bbcode_status) ? 'BBCODE_IS_ON' : 'BBCODE_IS_OFF')], '<a href="' . phpbb::append_sid('faq', 'mode=bbcode') . '">', '</a>'),
'IMG_STATUS' => ($this->img_status) ? phpbb::$user->lang['IMAGES_ARE_ON'] : phpbb::$user->lang['IMAGES_ARE_OFF'],
'FLASH_STATUS' => ($this->flash_status) ? phpbb::$user->lang['FLASH_IS_ON'] : phpbb::$user->lang['FLASH_IS_OFF'],
'SMILIES_STATUS' => ($this->smilies_status) ? phpbb::$user->lang['SMILIES_ARE_ON'] : phpbb::$user->lang['SMILIES_ARE_OFF'],
Modified: trunk/titania/includes/tools/pagination.php
==============================================================================
*** trunk/titania/includes/tools/pagination.php (original)
--- trunk/titania/includes/tools/pagination.php Mon Sep 28 03:28:31 2009
***************
*** 176,182 ****
unset($params['sid']);
! return (!empty($params)) ? append_sid($page, $params) : append_sid($page);
}
/**
--- 176,182 ----
unset($params['sid']);
! return (!empty($params)) ? phpbb::append_sid($page, $params) : phpbb::append_sid($page);
}
/**
More information about the customisationdb-commits
mailing list