|
From: OryNider <ory...@us...> - 2008-02-01 14:12:42
|
Update of /cvsroot/mxbb/mx_smartor/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32052/admin Modified Files: Tag: core28x admin_album_auth.php admin_album_cat.php admin_album_cfg.php admin_album_clearcache.php admin_album_clown_SP.php admin_album_config_personal.php admin_album_ext.php admin_album_otf.php admin_album_personal.php Log Message: some admin files fixed Index: admin_album_config_personal.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_config_personal.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** admin_album_config_personal.php 9 Aug 2007 13:16:50 -0000 1.2 --- admin_album_config_personal.php 1 Feb 2008 14:12:26 -0000 1.2.2.1 *************** *** 94,98 **** if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Album_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_album_config'], "<a href=\"" . append_sid("admin_album_config_personal.$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); --- 94,98 ---- if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Album_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_album_config'], "<a href=\"" . mx_append_sid("admin_album_config_personal.$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); *************** *** 108,112 **** 'L_ALBUM_PERSONAL_CONFIG' => $lang['Album_Personal_Settings'], 'L_ALBUM_PERSONAL_CONFIG_EXPLAIN' => $lang['Album_Personal_Settings_Explain'], ! 'S_ALBUM_PERSONAL_CONFIG_ACTION' => append_sid('admin_album_config_personal.'.$phpEx), 'PERSONAL_GALLERY_LIMIT' => $new['personal_gallery_limit'], --- 108,112 ---- 'L_ALBUM_PERSONAL_CONFIG' => $lang['Album_Personal_Settings'], 'L_ALBUM_PERSONAL_CONFIG_EXPLAIN' => $lang['Album_Personal_Settings_Explain'], ! 'S_ALBUM_PERSONAL_CONFIG_ACTION' => mx_append_sid('admin_album_config_personal.'.$phpEx), 'PERSONAL_GALLERY_LIMIT' => $new['personal_gallery_limit'], Index: admin_album_cfg.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_cfg.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** admin_album_cfg.php 9 Aug 2007 13:16:49 -0000 1.4 --- admin_album_cfg.php 1 Feb 2008 14:12:26 -0000 1.4.2.1 *************** *** 79,83 **** if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Album_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_album_config'], "<a href=\"" . append_sid("admin_album_cfg.$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); --- 79,83 ---- if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Album_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_album_config'], "<a href=\"" . mx_append_sid("admin_album_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); *************** *** 92,96 **** 'L_ALBUM_CONFIG' => $lang['Album_config'], 'L_ALBUM_CONFIG_EXPLAIN' => $lang['Album_config_explain'], ! 'S_ALBUM_CONFIG_ACTION' => append_sid('admin_album_cfg.'.$phpEx), // Index --- 92,96 ---- 'L_ALBUM_CONFIG' => $lang['Album_config'], 'L_ALBUM_CONFIG_EXPLAIN' => $lang['Album_config_explain'], ! 'S_ALBUM_CONFIG_ACTION' => mx_append_sid('admin_album_cfg.'.$phpEx), // Index Index: admin_album_auth.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_auth.php,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -C2 -d -r1.11.2.1 -r1.11.2.2 *** admin_album_auth.php 5 Oct 2007 02:18:25 -0000 1.11.2.1 --- admin_album_auth.php 1 Feb 2008 14:12:26 -0000 1.11.2.2 *************** *** 76,80 **** 'L_ALBUM_AUTH_EXPLAIN' => $lang['Album_Auth_Explain'], 'L_SELECT_CAT' => $lang['Select_a_Category'], ! 'S_ALBUM_ACTION' => append_sid( "admin_album_auth.$phpEx" ), 'L_LOOK_UP_CAT' => $lang['Look_up_Category'], // --- Album Category Hierarchy : begin --- 76,80 ---- 'L_ALBUM_AUTH_EXPLAIN' => $lang['Album_Auth_Explain'], 'L_SELECT_CAT' => $lang['Select_a_Category'], ! 'S_ALBUM_ACTION' => mx_append_sid( "admin_album_auth.$phpEx" ), 'L_LOOK_UP_CAT' => $lang['Look_up_Category'], // --- Album Category Hierarchy : begin *************** *** 112,116 **** 'L_IS_MODERATOR' => $lang['Is_Moderator'], ! 'S_ALBUM_ACTION' => append_sid( "admin_album_auth.$phpEx?cat_id=$cat_id" ), )); --- 112,116 ---- 'L_IS_MODERATOR' => $lang['Is_Moderator'], ! 'S_ALBUM_ACTION' => mx_append_sid( "admin_album_auth.$phpEx?cat_id=$cat_id" ), )); *************** *** 194,198 **** } // okay, return a message... ! $message = $lang['Album_Auth_successfully'] . '<br /><br />' . sprintf( $lang['Click_return_album_auth'], '<a href="' . append_sid( "admin_album_auth.$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 ); --- 194,198 ---- } // okay, return a message... ! $message = $lang['Album_Auth_successfully'] . '<br /><br />' . sprintf( $lang['Click_return_album_auth'], '<a href="' . mx_append_sid( "admin_album_auth.$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 ); Index: admin_album_clearcache.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_clearcache.php,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** admin_album_clearcache.php 9 Aug 2007 13:16:50 -0000 1.11 --- admin_album_clearcache.php 1 Feb 2008 14:12:26 -0000 1.11.2.1 *************** *** 57,61 **** 'L_YES' => $lang['Yes'], ! 'S_CONFIRM_ACTION' => append_sid("admin_album_clearcache.$phpEx"), ) ); --- 57,61 ---- 'L_YES' => $lang['Yes'], ! 'S_CONFIRM_ACTION' => mx_append_sid("admin_album_clearcache.$phpEx"), ) ); Index: admin_album_ext.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_ext.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** admin_album_ext.php 7 Jun 2007 20:13:08 -0000 1.1 --- admin_album_ext.php 1 Feb 2008 14:12:26 -0000 1.1.2.1 *************** *** 87,91 **** if ( isset( $HTTP_POST_VARS['submit'] ) ) { ! $message = $lang['album_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_album_config'], "<a href=\"" . append_sid( "admin_album_ext.$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 ); } --- 87,91 ---- if ( isset( $HTTP_POST_VARS['submit'] ) ) { ! $message = $lang['album_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_album_config'], "<a href=\"" . mx_append_sid( "admin_album_ext.$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 ); } *************** *** 116,120 **** $template->assign_vars( array( ! 'S_ALBUM_ACTION' => append_sid( "admin_album_ext.$phpEx" ), 'L_ALBUM_TITLE' => $lang['mx_album_admin'], --- 116,120 ---- $template->assign_vars( array( ! 'S_ALBUM_ACTION' => mx_append_sid( "admin_album_ext.$phpEx" ), 'L_ALBUM_TITLE' => $lang['mx_album_admin'], Index: admin_album_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_cat.php,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** admin_album_cat.php 9 Aug 2007 13:16:49 -0000 1.11 --- admin_album_cat.php 1 Feb 2008 14:12:26 -0000 1.11.2.1 *************** *** 82,86 **** global $lang, $album_user_id, $phpEx; ! $message = $in_message . "<br /><br />" . sprintf($lang['Click_return_album_category'], "<a href=\"" . append_sid("admin_album_cat.$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); --- 82,86 ---- global $lang, $album_user_id, $phpEx; ! $message = $in_message . "<br /><br />" . sprintf($lang['Click_return_album_category'], "<a href=\"" . mx_append_sid("admin_album_cat.$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); *************** *** 101,105 **** $template->assign_vars(array( ! 'S_ALBUM_ACTION' => append_sid("admin_album_cat.$phpEx"), 'L_CREATE_CATEGORY' => $lang['Create_category'], 'L_ALBUM_INDEX' => $lang['Album_Categories_Title'] --- 101,105 ---- $template->assign_vars(array( ! 'S_ALBUM_ACTION' => mx_append_sid("admin_album_cat.$phpEx"), 'L_CREATE_CATEGORY' => $lang['Create_category'], 'L_ALBUM_INDEX' => $lang['Album_Categories_Title'] *************** *** 157,161 **** $template->assign_vars(array( ! 'S_ALBUM_ACTION' => append_sid("admin_album_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_TITLE' => $lang['Category_Title'], 'L_CAT_DESC' => $lang['Category_Desc'], --- 157,161 ---- $template->assign_vars(array( ! 'S_ALBUM_ACTION' => mx_append_sid("admin_album_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_TITLE' => $lang['Category_Title'], 'L_CAT_DESC' => $lang['Category_Desc'], *************** *** 274,278 **** $template->assign_vars(array( ! 'S_ALBUM_ACTION' => append_sid("admin_album_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_DELETE' => $lang['Delete_Category'], 'L_CAT_DELETE_EXPLAIN' => $lang['Delete_Category_Explain'], --- 274,278 ---- $template->assign_vars(array( ! 'S_ALBUM_ACTION' => mx_append_sid("admin_album_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_DELETE' => $lang['Delete_Category'], 'L_CAT_DELETE_EXPLAIN' => $lang['Delete_Category_Explain'], *************** *** 323,327 **** 'L_ALBUM_CAT_TITLE' => $lang['Album_Categories_Title'], 'L_ALBUM_CAT_EXPLAIN' => $lang['Album_Categories_Explain'], ! 'S_ALBUM_ACTION' => append_sid("admin_album_cat.$phpEx"), 'L_CAT_TITLE' => $lang['Category_Title'], --- 323,327 ---- 'L_ALBUM_CAT_TITLE' => $lang['Album_Categories_Title'], 'L_ALBUM_CAT_EXPLAIN' => $lang['Album_Categories_Explain'], ! 'S_ALBUM_ACTION' => mx_append_sid("admin_album_cat.$phpEx"), 'L_CAT_TITLE' => $lang['Category_Title'], Index: admin_album_otf.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_otf.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** admin_album_otf.php 7 Jun 2007 20:13:10 -0000 1.1 --- admin_album_otf.php 1 Feb 2008 14:12:26 -0000 1.1.2.1 *************** *** 271,275 **** { $otf_pic_time = $otf_pic_time + 1; ! $pic_img_url = append_sid(ALBUM_OTF_PATH . $pic_images[$pic_cat][$i][$j]); $pic_thumbnail = $pic_images[$pic_cat][$i][$j]; --- 271,275 ---- { $otf_pic_time = $otf_pic_time + 1; ! $pic_img_url = mx_append_sid(ALBUM_OTF_PATH . $pic_images[$pic_cat][$i][$j]); $pic_thumbnail = $pic_images[$pic_cat][$i][$j]; *************** *** 284,292 **** else { ! $pic_img_thumb = append_sid(this_smartor_mxurl("smartor_mode=album_otf_thumbnail" . '&pic_cat=' . $pic_cat_names[$pic_cat][$i][$j] . '&pic_id=' . $pic_file_names[$pic_cat][$i][$j])); } */ ! $pic_img_thumb = append_sid(this_smartor_mxurl("smartor_mode=album_otf_thumbnail" . '&pic_cat=' . $pic_cat_names[$pic_cat][$i][$j] . '&pic_id=' . $pic_file_names[$pic_cat][$i][$j])); if ( ($upload_pics == true) && ($cat_to_upload > 0) ) --- 284,292 ---- else { ! $pic_img_thumb = mx_append_sid(this_smartor_mxurl("smartor_mode=album_otf_thumbnail" . '&pic_cat=' . $pic_cat_names[$pic_cat][$i][$j] . '&pic_id=' . $pic_file_names[$pic_cat][$i][$j])); } */ ! $pic_img_thumb = mx_append_sid(this_smartor_mxurl("smartor_mode=album_otf_thumbnail" . '&pic_cat=' . $pic_cat_names[$pic_cat][$i][$j] . '&pic_id=' . $pic_file_names[$pic_cat][$i][$j])); if ( ($upload_pics == true) && ($cat_to_upload > 0) ) *************** *** 328,341 **** if ($upload_counter > 0) { ! $message = $lang['Album_upload_successful'] . "(" . $upload_counter . ")" . "<br /><br />" . sprintf( $lang['Click_return_album_config'], "<a href=\"" . append_sid( "admin_album_otf.$phpEx" ) . "\">", "</a>" ); } elseif ($upload_counter < count($pic_images[$pic_cat])) { ! $message = $lang['Album_upload_partially_successful'] . "(" . $upload_counter . ")" . "<br /><br />" . sprintf( $lang['Click_return_album_config'], "<a href=\"" . append_sid( "admin_album_otf.$phpEx" ) . "\">", "</a>" ); } else { ! $message = $lang['Album_upload_not_successful'] . "<br /><br />" . sprintf( $lang['Click_return_album_config'], "<a href=\"" . append_sid( "admin_album_otf.$phpEx" ) . "\">", "</a>" ); } mx_message_die(GENERAL_MESSAGE, $message); --- 328,341 ---- if ($upload_counter > 0) { ! $message = $lang['Album_upload_successful'] . "(" . $upload_counter . ")" . "<br /><br />" . sprintf( $lang['Click_return_album_config'], "<a href=\"" . mx_append_sid( "admin_album_otf.$phpEx" ) . "\">", "</a>" ); } elseif ($upload_counter < count($pic_images[$pic_cat])) { ! $message = $lang['Album_upload_partially_successful'] . "(" . $upload_counter . ")" . "<br /><br />" . sprintf( $lang['Click_return_album_config'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/admin_album_otf.$phpEx") . "\">", "</a>" ); } else { ! $message = $lang['Album_upload_not_successful'] . "<br /><br />" . sprintf( $lang['Click_return_album_config'], "<a href=\"" . mx_append_sid( "admin_album_otf.$phpEx" ) . "\">", "</a>" ); } mx_message_die(GENERAL_MESSAGE, $message); *************** *** 363,368 **** 'S_COLWIDTH' => $s_colwidth, 'PORTAL_URL' => PORTAL_URL, ! 'S_ACTION' => append_sid( "admin_album_otf." . $phpEx ), ! // 'S_ACTION' => append_sid($module_root_path . 'includes/album_otf.' . $phpEx), ) ); --- 363,368 ---- 'S_COLWIDTH' => $s_colwidth, 'PORTAL_URL' => PORTAL_URL, ! 'S_ACTION' => mx_append_sid( "admin_album_otf." . $phpEx ), ! // 'S_ACTION' => mx_append_sid($module_root_path . 'includes/album_otf.' . $phpEx), ) ); Index: admin_album_personal.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_personal.php,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** admin_album_personal.php 9 Aug 2007 13:16:51 -0000 1.11 --- admin_album_personal.php 1 Feb 2008 14:12:26 -0000 1.11.2.1 *************** *** 157,161 **** 'L_IS_MODERATOR' => $lang['Is_Moderator'], 'L_PRIVATE_ACCESS' => $lang['Private_access'], ! 'S_ALBUM_ACTION' => append_sid('admin_album_personal.'.$phpEx) ) ); --- 157,161 ---- 'L_IS_MODERATOR' => $lang['Is_Moderator'], 'L_PRIVATE_ACCESS' => $lang['Private_access'], ! 'S_ALBUM_ACTION' => mx_append_sid('admin_album_personal.'.$phpEx) ) ); *************** *** 196,200 **** // okay, return a message... ! $message = $lang['Album_personal_successfully'] . '<br /><br />' . sprintf($lang['Click_return_album_personal'], '<a href="' . append_sid("admin_album_personal.$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); --- 196,200 ---- // okay, return a message... ! $message = $lang['Album_personal_successfully'] . '<br /><br />' . sprintf($lang['Click_return_album_personal'], '<a href="' . mx_append_sid("admin_album_personal.$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); Index: admin_album_clown_SP.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_clown_SP.php,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -C2 -d -r1.13 -r1.13.2.1 *** admin_album_clown_SP.php 9 Aug 2007 13:16:50 -0000 1.13 --- admin_album_clown_SP.php 1 Feb 2008 14:12:26 -0000 1.13.2.1 *************** *** 77,81 **** if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Album_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_album_config'], "<a href=\"" . append_sid("admin_album_clown_SP.$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); --- 77,81 ---- if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Album_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_album_config'], "<a href=\"" . mx_append_sid("admin_album_clown_SP.$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); *************** *** 91,95 **** 'L_ALBUM_CONFIG' => $lang['SP_Album_config'], 'L_ALBUM_CONFIG_EXPLAIN' => $lang['SP_Album_config_explain'], ! 'S_ALBUM_CONFIG_ACTION' => append_sid('admin_album_clown_SP.'.$phpEx),//to submit form //cat names --- 91,95 ---- 'L_ALBUM_CONFIG' => $lang['SP_Album_config'], 'L_ALBUM_CONFIG_EXPLAIN' => $lang['SP_Album_config_explain'], ! 'S_ALBUM_CONFIG_ACTION' => mx_append_sid('admin_album_clown_SP.'.$phpEx),//to submit form //cat names |