Menu
▾
▴
[mxbb-commits] mx_blogs/admin admin_weblog_action.php, 1.2, 1.3 admin_weblog_cfg.php, 1.1, 1.2 admin_weblog_mood.php, 1.2, 1.3 admin_weblog_templates.php, 1.1, 1.2 admin_weblog_tools.php, 1.1, 1.2
|
From: OryNider <ory...@us...> - 2008-01-31 03:36:45
|
Update of /cvsroot/mxbb/mx_blogs/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23056/admin Modified Files: admin_weblog_action.php admin_weblog_cfg.php admin_weblog_mood.php admin_weblog_templates.php admin_weblog_tools.php Log Message: finished porting this to 2.8.1 here porting should continue :D Index: admin_weblog_action.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/admin/admin_weblog_action.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_weblog_action.php 28 Jan 2008 21:42:53 -0000 1.2 --- admin_weblog_action.php 31 Jan 2008 03:36:34 -0000 1.3 *************** *** 20,24 **** ***************************************************************************/ ! define('IN_PORTAL', 1); // --- 20,29 ---- ***************************************************************************/ ! // ! // ERROR HANDLING ! // ! //error_reporting( E_ALL ); ! ! @define('IN_PORTAL', 1); // *************** *** 33,44 **** } ! $mx_root_path = "./../../../"; ! $module_root_path ="./../"; ! //include($mx_root_path . 'extension.inc'); ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include($mx_root_path . 'admin/pagestart.' . $phpEx); ! include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'language/lang_' . $use_lang . '/lang_weblog_admin.' . $phpEx); // --- 38,62 ---- } ! // ! // Load default header ! // ! $module_root_path = '../'; ! $mx_root_path = '../../../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! ! require($mx_root_path . 'admin/pagestart.' . $phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! ! // ********************************************************************** ! // Read language definition ! // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ); ! } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ); ! } // *************** *** 50,54 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't obtain action data from database", "", __LINE__, __FILE__, $sql); } $action_data = $db->sql_fetchrowset($result); --- 68,72 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain action data from database", "", __LINE__, __FILE__, $sql); } $action_data = $db->sql_fetchrowset($result); *************** *** 64,68 **** else { ! $mode = ""; } --- 82,86 ---- else { ! $mode = false; } *************** *** 74,78 **** while($file = @readdir($dir)) { ! if( !@is_dir(phpBB2::phpbb_realpath($module_root_path . 'images/weblogs/' . $file)) ) { $img_size = @getimagesize($module_root_path . 'images/weblogs/' . $file); --- 92,96 ---- while($file = @readdir($dir)) { ! if( !@is_dir($module_root_path . 'images/weblogs/' . $file) ) { $img_size = @getimagesize($module_root_path . 'images/weblogs/' . $file); *************** *** 84,90 **** } } - @closedir($dir); // // Select main mode --- 102,108 ---- } } @closedir($dir); + // // Select main mode *************** *** 119,123 **** "CURRENTLY_IMG" => $module_root_path . 'images/weblogs/' . $currently_images[0], ! "S_CURRENTLY_ACTION" => append_sid("admin_weblog_action.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) --- 137,141 ---- "CURRENTLY_IMG" => $module_root_path . 'images/weblogs/' . $currently_images[0], ! "S_CURRENTLY_ACTION" => mx_append_sid("admin_weblog_action.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) *************** *** 126,130 **** $template->pparse("body"); } ! else if ( $mode != "" ) { switch( $mode ) --- 144,148 ---- $template->pparse("body"); } ! else if (!empty($mode)) { switch( $mode ) *************** *** 142,151 **** if( !$result ) { ! message_die(GENERAL_ERROR, "Couldn't delete action", "", __LINE__, __FILE__, $sql); } ! $message = $lang['Weblog_currently_del_success'] . "<br /><br />" . sprintf($lang['Click_return_currentlyadmin'], "<a href=\"" . append_sid("admin_weblog_action.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); break; --- 160,169 ---- if( !$result ) { ! mx_message_die(GENERAL_ERROR, "Couldn't delete action", "", __LINE__, __FILE__, $sql); } ! $message = $lang['Weblog_currently_del_success'] . "<br /><br />" . sprintf($lang['Click_return_currentlyadmin'], "<a href=\"" . mx_append_sid("admin_weblog_action.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); break; *************** *** 163,167 **** if( !$result ) { ! message_die(GENERAL_ERROR, 'Could not obtain emoticon information', "", __LINE__, __FILE__, $sql); } $currently_data = $db->sql_fetchrow($result); --- 181,185 ---- if( !$result ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain emoticon information', "", __LINE__, __FILE__, $sql); } $currently_data = $db->sql_fetchrow($result); *************** *** 201,205 **** "CURRENTLY_CURRENTLY" => $currently_data['action_text'], ! "S_CURRENTLY_ACTION" => append_sid("admin_weblog_action.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) --- 219,223 ---- "CURRENTLY_CURRENTLY" => $currently_data['action_text'], ! "S_CURRENTLY_ACTION" => mx_append_sid("admin_weblog_action.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) *************** *** 225,229 **** if ( $currently_url == '') { ! message_die(MESSAGE, $lang['Fields_empty']); } --- 243,247 ---- if ( $currently_url == '') { ! mx_message_die(MESSAGE, $lang['Fields_empty']); } *************** *** 236,245 **** if( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, "Couldn't update action info", "", __LINE__, __FILE__, $sql); } ! $message = $lang['Weblog_currently_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_currentlyadmin'], "<a href=\"" . append_sid("admin_weblog_action.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); break; --- 254,263 ---- if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't update action info", "", __LINE__, __FILE__, $sql); } ! $message = $lang['Weblog_currently_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_currentlyadmin'], "<a href=\"" . mx_append_sid("admin_weblog_action.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); break; *************** *** 259,263 **** if ($currently_url == '') { ! message_die(MESSAGE, $lang['Fields_empty']); } --- 277,281 ---- if ($currently_url == '') { ! mx_message_die(MESSAGE, $lang['Fields_empty']); } *************** *** 269,278 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't insert new action", "", __LINE__, __FILE__, $sql); } ! $message = $lang['Weblog_currently_add_success'] . "<br /><br />" . sprintf($lang['Click_return_currentlyadmin'], "<a href=\"" . append_sid("admin_weblog_action.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); break; } --- 287,296 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't insert new action", "", __LINE__, __FILE__, $sql); } ! $message = $lang['Weblog_currently_add_success'] . "<br /><br />" . sprintf($lang['Click_return_currentlyadmin'], "<a href=\"" . mx_append_sid("admin_weblog_action.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); break; } *************** *** 280,284 **** else { - // // This is the main display of the page before the admin has selected --- 298,301 ---- *************** *** 301,305 **** "S_HIDDEN_FIELDS" => $s_hidden_fields, ! "S_CURRENTLY_ACTION" => append_sid("admin_weblog_action.$phpEx")) ); --- 318,322 ---- "S_HIDDEN_FIELDS" => $s_hidden_fields, ! "S_CURRENTLY_ACTION" => mx_append_sid("admin_weblog_action.$phpEx")) ); *************** *** 319,324 **** "CURRENTLY" => $action_data[$i]['action_text'], ! "U_CURRENTLY_EDIT" => append_sid("admin_weblog_action.$phpEx?mode=edit&id=" . $action_data[$i]['action_id']), ! "U_CURRENTLY_DELETE" => append_sid("admin_weblog_action.$phpEx?mode=delete&id=" . $action_data[$i]['action_id'])) ); } --- 336,341 ---- "CURRENTLY" => $action_data[$i]['action_text'], ! "U_CURRENTLY_EDIT" => mx_append_sid("admin_weblog_action.$phpEx?mode=edit&id=" . $action_data[$i]['action_id']), ! "U_CURRENTLY_DELETE" => mx_append_sid("admin_weblog_action.$phpEx?mode=delete&id=" . $action_data[$i]['action_id'])) ); } Index: admin_weblog_templates.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/admin/admin_weblog_templates.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_weblog_templates.php 7 Jun 2007 22:01:32 -0000 1.1 --- admin_weblog_templates.php 31 Jan 2008 03:36:34 -0000 1.2 *************** *** 20,24 **** ***************************************************************************/ ! define('IN_PORTAL', 1); // --- 20,24 ---- ***************************************************************************/ ! @define('IN_PORTAL', 1); // *************** *** 40,44 **** include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'language/lang_' . $use_lang . '/lang_weblog_admin.' . $phpEx); // --- 40,55 ---- include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! ! // ********************************************************************** ! // Read language definition ! // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ); ! } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ); ! } // *************** *** 109,113 **** "L_RESET" => $lang['Reset'], ! "S_TEMPLATE_ACTION" => append_sid("admin_weblog_templates.$phpEx?mode=savenew"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) --- 120,124 ---- "L_RESET" => $lang['Reset'], ! "S_TEMPLATE_ACTION" => mx_append_sid("admin_weblog_templates.$phpEx?mode=savenew"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) *************** *** 155,159 **** } ! $message = $lang['Weblog_template_del_success'] . "<br /><br />" . sprintf($lang['Click_return_templateadmin'], "<a href=\"" . append_sid("admin_weblog_templates.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 166,170 ---- } ! $message = $lang['Weblog_template_del_success'] . "<br /><br />" . sprintf($lang['Click_return_templateadmin'], "<a href=\"" . mx_append_sid("admin_weblog_templates.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 208,212 **** "TEMPLATE_NOT_PRIVATE_CHECKED" => ( !$templates_data['template_private'] ) ? ' checked="checked"' : '', ! "S_TEMPLATE_ACTION" => append_sid("admin_weblog_templates.$phpEx?mode=edit&id=$template_id"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) --- 219,223 ---- "TEMPLATE_NOT_PRIVATE_CHECKED" => ( !$templates_data['template_private'] ) ? ' checked="checked"' : '', ! "S_TEMPLATE_ACTION" => mx_append_sid("admin_weblog_templates.$phpEx?mode=edit&id=$template_id"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) *************** *** 250,254 **** } ! $message = $lang['Weblog_template_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_templateadmin'], "<a href=\"" . append_sid("admin_weblog_templates.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 261,265 ---- } ! $message = $lang['Weblog_template_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_templateadmin'], "<a href=\"" . mx_append_sid("admin_weblog_templates.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 312,316 **** } ! $message = $lang['Weblog_template_add_success'] . "<br /><br />" . sprintf($lang['Click_return_templateadmin'], "<a href=\"" . append_sid("admin_weblog_templates.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 323,327 ---- } ! $message = $lang['Weblog_template_add_success'] . "<br /><br />" . sprintf($lang['Click_return_templateadmin'], "<a href=\"" . mx_append_sid("admin_weblog_templates.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 342,346 **** "S_HIDDEN_FIELDS" => $s_hidden_fields, ! "S_TEMPLATE_ACTION" => append_sid("admin_weblog_templates.$phpEx")) ); --- 353,357 ---- "S_HIDDEN_FIELDS" => $s_hidden_fields, ! "S_TEMPLATE_ACTION" => mx_append_sid("admin_weblog_templates.$phpEx")) ); *************** *** 360,365 **** "TEMPLATE_IMAGE" => '<img src="' . $module_root_path . 'weblogs/templates/' . $template_data[$i]['template_dir'] . '/preview_img.gif" border="0">', "TEMPLATE_PRIVATE" => ( $template_data[$i]['template_private'] ) ? $lang['Yes'] : $lang['No'], ! "U_TEMPLATE_EDIT" => append_sid("admin_weblog_templates.$phpEx?mode=edit&id=" . $template_data[$i]['template_id']), ! "U_TEMPLATE_DELETE" => append_sid("admin_weblog_templates.$phpEx?mode=delete&id=" . $template_data[$i]['template_id'])) ); } --- 371,376 ---- "TEMPLATE_IMAGE" => '<img src="' . $module_root_path . 'weblogs/templates/' . $template_data[$i]['template_dir'] . '/preview_img.gif" border="0">', "TEMPLATE_PRIVATE" => ( $template_data[$i]['template_private'] ) ? $lang['Yes'] : $lang['No'], ! "U_TEMPLATE_EDIT" => mx_append_sid("admin_weblog_templates.$phpEx?mode=edit&id=" . $template_data[$i]['template_id']), ! "U_TEMPLATE_DELETE" => mx_append_sid("admin_weblog_templates.$phpEx?mode=delete&id=" . $template_data[$i]['template_id'])) ); } Index: admin_weblog_tools.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/admin/admin_weblog_tools.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_weblog_tools.php 7 Jun 2007 22:01:32 -0000 1.1 --- admin_weblog_tools.php 31 Jan 2008 03:36:34 -0000 1.2 *************** *** 19,24 **** * ***************************************************************************/ ! define('IN_PORTAL',1); ! define('IN_PHPBB', 1); if( !empty($setmodules) ) --- 19,23 ---- * ***************************************************************************/ ! @define('IN_PORTAL',1); if( !empty($setmodules) ) *************** *** 39,43 **** include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'language/lang_' . $use_lang . '/lang_weblog_admin.' . $phpEx); $html_entities_match = array('#<#', '#>#'); --- 38,53 ---- include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! ! // ********************************************************************** ! // Read language definition ! // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ); ! } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ); ! } $html_entities_match = array('#<#', '#>#'); *************** *** 73,79 **** 'L_FIND_USERNAME' => $lang['Find_username'], ! 'U_SEARCH_USER' => append_sid($phpbb_root_path . "search.$phpEx?mode=searchuser"), ! 'S_USER_ACTION' => append_sid("admin_weblog_tools.$phpEx?mode=user_admin"), 'S_USER_SELECT' => $select_list) ); --- 83,89 ---- 'L_FIND_USERNAME' => $lang['Find_username'], ! 'U_SEARCH_USER' => mx_append_sid($phpbb_root_path . "search.$phpEx?mode=searchuser"), ! 'S_USER_ACTION' => mx_append_sid("admin_weblog_tools.$phpEx?mode=user_admin"), 'S_USER_SELECT' => $select_list) ); *************** *** 94,98 **** 'L_LOOK_UP' => $lang['Look_up_weblog'], ! 'S_USER_ACTION' => append_sid("admin_weblog_tools.$phpEx?mode=weblog_admin"), 'S_USER_SELECT' => $select_list) ); --- 104,108 ---- 'L_LOOK_UP' => $lang['Look_up_weblog'], ! 'S_USER_ACTION' => mx_append_sid("admin_weblog_tools.$phpEx?mode=weblog_admin"), 'S_USER_SELECT' => $select_list) ); *************** *** 151,155 **** // That's all, Folks! ! $message = $lang['Weblogs_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 161,165 ---- // That's all, Folks! ! $message = $lang['Weblogs_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . mx_append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 167,171 **** // That's all, Folks! ! $message = $lang['Entries_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 177,181 ---- // That's all, Folks! ! $message = $lang['Entries_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . mx_append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 188,192 **** } ! $message = $lang['Weblogs_restored'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 198,202 ---- } ! $message = $lang['Weblogs_restored'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . mx_append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 209,213 **** } ! $message = $lang['Entries_restored'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 219,223 ---- } ! $message = $lang['Entries_restored'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . mx_append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 230,234 **** } ! $message = $lang['Weblogs_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 240,244 ---- } ! $message = $lang['Weblogs_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . mx_append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 251,255 **** } ! $message = $lang['Entries_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 261,265 ---- } ! $message = $lang['Entries_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . mx_append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 263,267 **** 'ROW_CLASS' => $row_class, 'WEBLOG' => $del_weblogs[$i]['weblog_name'], ! 'U_PROFILE' => append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $del_weblogs[$i]['user_id']), 'OWNER' => $del_weblogs[$i]['username'], 'WEBLOG_DESC' => $del_weblogs[$i]['weblog_desc'], --- 273,277 ---- 'ROW_CLASS' => $row_class, 'WEBLOG' => $del_weblogs[$i]['weblog_name'], ! 'U_PROFILE' => mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $del_weblogs[$i]['user_id']), 'OWNER' => $del_weblogs[$i]['username'], 'WEBLOG_DESC' => $del_weblogs[$i]['weblog_desc'], *************** *** 279,284 **** 'ENTRY' => $del_entries[$i]['entry_subject'], 'WEBLOG' => $del_entries[$i]['weblog_name'], ! 'U_PROFILE' => append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $del_entries[$i]['user_id']), ! 'U_WEBLOG' => append_sid($module_root_path . "weblog.$phpEx?" . POST_WEBLOG_URL . "=" . $del_entries[$i]['weblog_id']), 'OWNER' => $del_entries[$i]['username'], 'WEBLOG_DESC' => $del_entries[$i]['weblog_desc'], --- 289,294 ---- 'ENTRY' => $del_entries[$i]['entry_subject'], 'WEBLOG' => $del_entries[$i]['weblog_name'], ! 'U_PROFILE' => mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $del_entries[$i]['user_id']), ! 'U_WEBLOG' => mx_append_sid($module_root_path . "weblog.$phpEx?" . POST_WEBLOG_URL . "=" . $del_entries[$i]['weblog_id']), 'OWNER' => $del_entries[$i]['username'], 'WEBLOG_DESC' => $del_entries[$i]['weblog_desc'], *************** *** 301,307 **** 'L_FIND_USERNAME' => $lang['Find_username'], ! 'U_SEARCH_USER' => append_sid($phpbb_root_path . "search.$phpEx?mode=searchuser"), ! 'S_PURGE_ACTION' => append_sid("admin_weblog_tools.$phpEx?mode=purge"), 'S_USER_SELECT' => $select_list) --- 311,317 ---- 'L_FIND_USERNAME' => $lang['Find_username'], ! 'U_SEARCH_USER' => mx_append_sid($phpbb_root_path . "search.$phpEx?mode=searchuser"), ! 'S_PURGE_ACTION' => mx_append_sid("admin_weblog_tools.$phpEx?mode=purge"), 'S_USER_SELECT' => $select_list) *************** *** 369,373 **** 'S_HIDDEN_FIELDS' => '<input type="hidden" name="user_id" value="' . $weblog_user_data['user_id'] . '" />', ! 'S_CONFIG_ACTION' => append_sid("admin_weblog_tools.$phpEx?mode=edit")) ); } --- 379,383 ---- 'S_HIDDEN_FIELDS' => '<input type="hidden" name="user_id" value="' . $weblog_user_data['user_id'] . '" />', ! 'S_CONFIG_ACTION' => mx_append_sid("admin_weblog_tools.$phpEx?mode=edit")) ); } *************** *** 395,399 **** $template->assign_vars(array( ! 'S_SELECT_ACTION' => append_sid("admin_weblog_tools.$phpEx")) ); } --- 405,409 ---- $template->assign_vars(array( ! 'S_SELECT_ACTION' => mx_append_sid("admin_weblog_tools.$phpEx")) ); } Index: admin_weblog_cfg.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/admin/admin_weblog_cfg.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_weblog_cfg.php 7 Jun 2007 22:01:32 -0000 1.1 --- admin_weblog_cfg.php 31 Jan 2008 03:36:34 -0000 1.2 *************** *** 1,5 **** <?php /*************************************************************************** ! * admin_weblog_config.php * ----------------------------- * begin : Monday, September 5, 2004 --- 1,5 ---- <?php /*************************************************************************** ! * admin_weblog_cfg.php * ----------------------------- * begin : Monday, September 5, 2004 *************** *** 20,24 **** ***************************************************************************/ ! define('IN_PORTAL', 1); if( !empty($setmodules) ) --- 20,24 ---- ***************************************************************************/ ! @define('IN_PORTAL', 1); if( !empty($setmodules) ) *************** *** 41,45 **** include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'language/lang_' . $use_lang . '/lang_weblog_admin.' . $phpEx); // --- 41,56 ---- include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! ! // ********************************************************************** ! // Read language definition ! // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ); ! } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ); ! } // *************** *** 50,54 **** if(!$result = $db->sql_query($sql)) { ! mx_message_die(CRITICAL_ERROR, "Could not query config information in admin_weblog_config", "", __LINE__, __FILE__, $sql); } else --- 61,65 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(CRITICAL_ERROR, "Could not query config information in admin_weblog_cfg", "", __LINE__, __FILE__, $sql); } else *************** *** 81,85 **** if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Weblog_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_weblog_config'], "<a href=\"" . append_sid("admin_weblog_config.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 92,96 ---- if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Weblog_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_weblog_config'], "<a href=\"" . mx_append_sid("admin_weblog_cfg.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 151,155 **** // $template->assign_vars(array( ! 'S_CONFIG_ACTION' => append_sid("admin_weblog_cfg.$phpEx"), 'L_YES' => $lang['Yes'], --- 162,166 ---- // $template->assign_vars(array( ! 'S_CONFIG_ACTION' => mx_append_sid("admin_weblog_cfg.$phpEx"), 'L_YES' => $lang['Yes'], Index: admin_weblog_mood.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/admin/admin_weblog_mood.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_weblog_mood.php 28 Jan 2008 21:42:53 -0000 1.2 --- admin_weblog_mood.php 31 Jan 2008 03:36:34 -0000 1.3 *************** *** 20,25 **** ***************************************************************************/ ! define('IN_PORTAL', 1); ! // --- 20,24 ---- ***************************************************************************/ ! @define('IN_PORTAL', 1); // *************** *** 41,45 **** include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'language/lang_' . $use_lang . '/lang_weblog_admin.' . $phpEx); // --- 40,55 ---- include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! ! // ********************************************************************** ! // Read language definition ! // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ); ! } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ); ! } // *************** *** 83,87 **** while($file = @readdir($dir)) { ! if( !@is_dir(phpBB2::phpbb_realpath($module_root_path . 'images/weblogs/' . $file)) ) { $img_size = @getimagesize($module_root_path . 'images/weblogs/' . $file); --- 93,97 ---- while($file = @readdir($dir)) { ! if( !@is_dir($module_root_path . 'images/weblogs/' . $file) ) { $img_size = @getimagesize($module_root_path . 'images/weblogs/' . $file); *************** *** 93,97 **** } } - @closedir($dir); --- 103,106 ---- *************** *** 138,142 **** "MOOD_IMG" => $module_root_path . 'images/weblogs/' . $mood_images[0], ! "S_MOOD_ACTION" => append_sid("admin_weblog_mood.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) --- 147,151 ---- "MOOD_IMG" => $module_root_path . 'images/weblogs/' . $mood_images[0], ! "S_MOOD_ACTION" => mx_append_sid("admin_weblog_mood.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) *************** *** 168,172 **** "MOOD_SET" => '', ! "S_MOOD_SET_ACTION" => append_sid("admin_weblog_mood.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields) ); --- 177,181 ---- "MOOD_SET" => '', ! "S_MOOD_SET_ACTION" => mx_append_sid("admin_weblog_mood.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields) ); *************** *** 189,193 **** } ! $message = $lang['Weblog_mood_del_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 198,202 ---- } ! $message = $lang['Weblog_mood_del_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . mx_append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 215,219 **** } ! $message = $lang['Weblog_mood_set_del_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 224,228 ---- } ! $message = $lang['Weblog_mood_set_del_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . mx_append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 271,275 **** "MOOD_MOOD" => $mood_data['mood_text'], ! "S_MOOD_ACTION" => append_sid("admin_weblog_mood.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) --- 280,284 ---- "MOOD_MOOD" => $mood_data['mood_text'], ! "S_MOOD_ACTION" => mx_append_sid("admin_weblog_mood.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) *************** *** 311,315 **** "MOOD_SET" => $mood_set_data['set_name'], ! "S_MOOD_SET_ACTION" => append_sid("admin_weblog_mood.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) --- 320,324 ---- "MOOD_SET" => $mood_set_data['set_name'], ! "S_MOOD_SET_ACTION" => mx_append_sid("admin_weblog_mood.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) *************** *** 350,354 **** } ! $message = $lang['Weblog_mood_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 359,363 ---- } ! $message = $lang['Weblog_mood_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . mx_append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 385,389 **** } ! $message = $lang['Weblog_mood_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 394,398 ---- } ! $message = $lang['Weblog_mood_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . mx_append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 433,437 **** } ! $message = $lang['Weblog_mood_add_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 442,446 ---- } ! $message = $lang['Weblog_mood_add_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . mx_append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 481,485 **** } ! $message = $lang['Weblog_mood_set_add_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 490,494 ---- } ! $message = $lang['Weblog_mood_set_add_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . mx_append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 513,517 **** "S_HIDDEN_FIELDS" => $s_hidden_fields, ! "S_MOOD_ACTION" => append_sid("admin_weblog_mood.$phpEx?mode=addset")) ); --- 522,526 ---- "S_HIDDEN_FIELDS" => $s_hidden_fields, ! "S_MOOD_ACTION" => mx_append_sid("admin_weblog_mood.$phpEx?mode=addset")) ); *************** *** 528,534 **** "SET_NAME" => $mood_set_data[$i]['set_name'], ! "U_SET_ADD" => append_sid("admin_weblog_mood.$phpEx?mode=addmood&id=" . $mood_set_data[$i]['set_id']), ! "U_SET_EDIT" => append_sid("admin_weblog_mood.$phpEx?mode=editset&id=" . $mood_set_data[$i]['set_id']), ! "U_SET_DELETE" => append_sid("admin_weblog_mood.$phpEx?mode=deleteset&id=" . $mood_set_data[$i]['set_id'])) ); --- 537,543 ---- "SET_NAME" => $mood_set_data[$i]['set_name'], ! "U_SET_ADD" => mx_append_sid("admin_weblog_mood.$phpEx?mode=addmood&id=" . $mood_set_data[$i]['set_id']), ! "U_SET_EDIT" => mx_append_sid("admin_weblog_mood.$phpEx?mode=editset&id=" . $mood_set_data[$i]['set_id']), ! "U_SET_DELETE" => mx_append_sid("admin_weblog_mood.$phpEx?mode=deleteset&id=" . $mood_set_data[$i]['set_id'])) ); *************** *** 547,552 **** "MOOD" => $mood_data[$j]['mood_text'], ! "U_MOOD_EDIT" => append_sid("admin_weblog_mood.$phpEx?mode=editmood&id=" . $mood_data[$j]['mood_id']), ! "U_MOOD_DELETE" => append_sid("admin_weblog_mood.$phpEx?mode=deletemood&id=" . $mood_data[$j]['mood_id'])) ); } --- 556,561 ---- "MOOD" => $mood_data[$j]['mood_text'], ! "U_MOOD_EDIT" => mx_append_sid("admin_weblog_mood.$phpEx?mode=editmood&id=" . $mood_data[$j]['mood_id']), ! "U_MOOD_DELETE" => mx_append_sid("admin_weblog_mood.$phpEx?mode=deletemood&id=" . $mood_data[$j]['mood_id'])) ); } |
