|
From: Jon O. <jon...@us...> - 2006-06-30 19:54:27
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9382/modules/mx_linkdb/linkdb/admin Modified Files: admin_cat_manage.php admin_link_manage.php admin_setting.php Log Message: Ok, i'm starting with some code cleanup, before digging deep... Index: admin_cat_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/admin/admin_cat_manage.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_cat_manage.php 5 Apr 2006 22:35:24 -0000 1.4 --- admin_cat_manage.php 30 Jun 2006 19:54:14 -0000 1.5 *************** *** 34,38 **** mx_message_die( GENERAL_MESSAGE, $message ); } ! }elseif ( $mode == 'do_add' && $cat_id ) { $cat_id = $this->update_add_cat( $cat_id ); --- 34,39 ---- mx_message_die( GENERAL_MESSAGE, $message ); } ! } ! elseif ( $mode == 'do_add' && $cat_id ) { $cat_id = $this->update_add_cat( $cat_id ); *************** *** 43,47 **** mx_message_die( GENERAL_MESSAGE, $message ); } ! }elseif ( $mode == 'do_delete' ) { $this->delete_cat( $cat_id ); --- 44,49 ---- mx_message_die( GENERAL_MESSAGE, $message ); } ! } ! elseif ( $mode == 'do_delete' ) { $this->delete_cat( $cat_id ); *************** *** 52,62 **** mx_message_die( GENERAL_MESSAGE, $message ); } ! }elseif ( $mode == 'cat_order' ) { $this->order_cat( $cat_id_other ); ! }elseif ( $mode == 'sync' ) { $this->sync( $cat_id_other ); ! }elseif ( $mode == 'sync_all' ) { $this->sync_all(); --- 54,67 ---- mx_message_die( GENERAL_MESSAGE, $message ); } ! } ! elseif ( $mode == 'cat_order' ) { $this->order_cat( $cat_id_other ); ! } ! elseif ( $mode == 'sync' ) { $this->sync( $cat_id_other ); ! } ! elseif ( $mode == 'sync_all' ) { $this->sync_all(); *************** *** 95,123 **** } ! $template->set_filenames( array( 'body' => $template_file ) ! ); if ( sizeof( $this->error ) ) $template->assign_block_vars( 'linkdb_error', array() ); ! $template->assign_vars( array( 'L_CAT_TITLE' => $l_title, ! 'L_CAT_EXPLAIN' => $l_explain, ! 'ERROR' => ( sizeof( $this->error ) ) ? implode( '<br />', $this->error ) : '', ! 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_CAT_ACTION' => append_sid( "admin_linkdb.$phpEx?action=cat_manage" ) ) ! ); if ( $mode == '' || $mode == 'cat_order' || $mode == 'sync' || $mode == 'sync_all' ) { ! $template->assign_vars( array( 'L_CREATE_CATEGORY' => $lang['Create_category'], ! 'L_EDIT' => $lang['Edit'], ! 'L_DELETE' => $lang['Delete'], ! 'L_MOVE_UP' => $lang['Move_up'], ! 'L_MOVE_DOWN' => $lang['Move_down'], ! 'L_SUB_CAT' => $lang['Sub_category'], ! 'L_RESYNC' => $lang['Resync'] ) ! ); $this->admin_cat_main( $cat_id ); ! }elseif ( $mode == 'add' || $mode == 'edit' ) { if ( $mode == 'add' ) --- 100,130 ---- } ! $template->set_filenames( array( 'body' => $template_file ) ); if ( sizeof( $this->error ) ) $template->assign_block_vars( 'linkdb_error', array() ); ! $template->assign_vars( array( ! 'L_CAT_TITLE' => $l_title, ! 'L_CAT_EXPLAIN' => $l_explain, ! 'ERROR' => ( sizeof( $this->error ) ) ? implode( '<br />', $this->error ) : '', ! 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_CAT_ACTION' => append_sid( "admin_linkdb.$phpEx?action=cat_manage" ) ) ! ); if ( $mode == '' || $mode == 'cat_order' || $mode == 'sync' || $mode == 'sync_all' ) { ! $template->assign_vars( array( ! 'L_CREATE_CATEGORY' => $lang['Create_category'], ! 'L_EDIT' => $lang['Edit'], ! 'L_DELETE' => $lang['Delete'], ! 'L_MOVE_UP' => $lang['Move_up'], ! 'L_MOVE_DOWN' => $lang['Move_down'], ! 'L_SUB_CAT' => $lang['Sub_category'], ! 'L_RESYNC' => $lang['Resync'] ) ! ); $this->admin_cat_main( $cat_id ); ! } ! elseif ( $mode == 'add' || $mode == 'edit' ) { if ( $mode == 'add' ) *************** *** 149,180 **** } ! $template->assign_vars( array( 'CAT_NAME' => $cat_name, ! 'L_CAT_NAME' => $lang['Catname'], ! 'L_CAT_NAME_INFO' => $lang['Catnameinfo'], ! 'L_CAT_PARENT' => $lang['Catparent'], ! 'L_CAT_PARENT_INFO' => $lang['Catparentinfo'], ! 'L_NONE' => $lang['None'], ! 'L_CAT_NAME_FIELD_EMPTY' => $lang['Cat_name_missing'], ! 'S_CAT_LIST' => $cat_list ) ! ); ! }elseif ( $mode == 'delete' ) { $select_cat = $this->jumpmenu_option( 0, 0, array( $cat_id => 1 ) ); $file_to_select_cat = $this->jumpmenu_option( 0, 0, '', true ); ! $template->assign_vars( array( 'S_SELECT_CAT' => $select_cat, ! 'S_FILE_SELECT_CAT' => $file_to_select_cat, ! 'LINK_SAME_CAT' => $lang['Link_same_cat'], ! 'LINK_MOVE_CAT' => $lang['Link_move_cat'], ! 'L_DELETE' => $lang['Delete'], ! 'L_DO_FILE' => $lang['Dellinks'], ! 'L_DO_CAT' => $lang['Do_cat'], ! 'L_MOVE_TO' => $lang['Move_to'], ! 'L_SELECT_CAT' => $lang['Select_a_Category'], ! 'L_DELETE' => $lang['Delete'], ! 'L_MOVE' => $lang['Move'] ) ! ); } --- 156,190 ---- } ! $template->assign_vars( array( ! 'CAT_NAME' => $cat_name, ! 'L_CAT_NAME' => $lang['Catname'], ! 'L_CAT_NAME_INFO' => $lang['Catnameinfo'], ! 'L_CAT_PARENT' => $lang['Catparent'], ! 'L_CAT_PARENT_INFO' => $lang['Catparentinfo'], ! 'L_NONE' => $lang['None'], ! 'L_CAT_NAME_FIELD_EMPTY' => $lang['Cat_name_missing'], ! 'S_CAT_LIST' => $cat_list ) ! ); ! } ! elseif ( $mode == 'delete' ) { $select_cat = $this->jumpmenu_option( 0, 0, array( $cat_id => 1 ) ); $file_to_select_cat = $this->jumpmenu_option( 0, 0, '', true ); ! $template->assign_vars( array( ! 'S_SELECT_CAT' => $select_cat, ! 'S_FILE_SELECT_CAT' => $file_to_select_cat, ! 'LINK_SAME_CAT' => $lang['Link_same_cat'], ! 'LINK_MOVE_CAT' => $lang['Link_move_cat'], ! 'L_DELETE' => $lang['Delete'], ! 'L_DO_FILE' => $lang['Dellinks'], ! 'L_DO_CAT' => $lang['Do_cat'], ! 'L_MOVE_TO' => $lang['Move_to'], ! 'L_SELECT_CAT' => $lang['Select_a_Category'], ! 'L_DELETE' => $lang['Delete'], ! 'L_MOVE' => $lang['Move'] ) ! ); } *************** *** 202,215 **** $str = ( $i % 2 ) ? "row1" : "row2"; } ! $template->assign_block_vars( 'cat_row', array( 'COLOR' => $str, ! 'U_CAT' => append_sid( "admin_linkdb.$phpEx?action=cat_manage&cat_id" . $subcat_id ), ! 'U_CAT_EDIT' => append_sid( "admin_linkdb.$phpEx?action=cat_manage&mode=edit&cat_id=$subcat_id" ), ! 'U_CAT_DELETE' => append_sid( "admin_linkdb.$phpEx?action=cat_manage&mode=delete&cat_id=$subcat_id" ), ! 'U_CAT_MOVE_UP' => append_sid( "admin_linkdb.$phpEx?action=cat_manage&mode=cat_order&move=-15&cat_id_other=$subcat_id" ), ! 'U_CAT_MOVE_DOWN' => append_sid( "admin_linkdb.$phpEx?action=cat_manage&mode=cat_order&move=15&cat_id_other=$subcat_id" ), ! 'U_CAT_RESYNC' => append_sid( "admin_linkdb.$phpEx?action=cat_manage&mode=sync&cat_id_other=$subcat_id" ), ! 'CAT_NAME' => $cat_data['cat_name'], ! 'PRE' => $pre ) ! ); $this->admin_cat_main( $subcat_id, $depth + 1 ); } --- 212,226 ---- $str = ( $i % 2 ) ? "row1" : "row2"; } ! $template->assign_block_vars( 'cat_row', array( ! 'COLOR' => $str, ! 'U_CAT' => append_sid( "admin_linkdb.$phpEx?action=cat_manage&cat_id" . $subcat_id ), ! 'U_CAT_EDIT' => append_sid( "admin_linkdb.$phpEx?action=cat_manage&mode=edit&cat_id=$subcat_id" ), ! 'U_CAT_DELETE' => append_sid( "admin_linkdb.$phpEx?action=cat_manage&mode=delete&cat_id=$subcat_id" ), ! 'U_CAT_MOVE_UP' => append_sid( "admin_linkdb.$phpEx?action=cat_manage&mode=cat_order&move=-15&cat_id_other=$subcat_id" ), ! 'U_CAT_MOVE_DOWN' => append_sid( "admin_linkdb.$phpEx?action=cat_manage&mode=cat_order&move=15&cat_id_other=$subcat_id" ), ! 'U_CAT_RESYNC' => append_sid( "admin_linkdb.$phpEx?action=cat_manage&mode=sync&cat_id_other=$subcat_id" ), ! 'CAT_NAME' => $cat_data['cat_name'], ! 'PRE' => $pre ) ! ); $this->admin_cat_main( $subcat_id, $depth + 1 ); } *************** *** 219,222 **** } } - ?> \ No newline at end of file --- 230,232 ---- Index: admin_link_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/admin/admin_link_manage.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_link_manage.php 5 Apr 2006 22:35:24 -0000 1.4 --- admin_link_manage.php 30 Jun 2006 19:54:14 -0000 1.5 *************** *** 82,90 **** } ! $s_file_actions = array( 'unapproved' => $lang['Unapproved_links'], 'approved' => $lang['Approved_links'], 'file_cat' => $lang['Link_cat'], ! '' => $lang['All_links'] ! ); switch ( $mode ) --- 82,91 ---- } ! $s_file_actions = array( ! 'unapproved' => $lang['Unapproved_links'], 'approved' => $lang['Approved_links'], 'file_cat' => $lang['Link_cat'], ! '' => $lang['All_links'] ! ); switch ( $mode ) *************** *** 101,105 **** $template_file = 'admin/linkdb_admin_link.tpl'; $l_title = $lang['Link_manage']; ! $l_explain = $lang['Linkexplain']; // $s_hidden_fields = '<input type="hidden" name="mode" value="add">'; break; --- 102,106 ---- $template_file = 'admin/linkdb_admin_link.tpl'; $l_title = $lang['Link_manage']; ! $l_explain = $lang['Linkexplain']; // $s_hidden_fields = '<input type="hidden" name="mode" value="add">'; break; *************** *** 129,133 **** $message = $lang['Linkadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_linkdb.$phpEx?action=link_manage" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); ! }elseif ( $mode == 'do_add' && $link_id ) { $link_id = $this->update_add_link( $link_id ); --- 130,135 ---- $message = $lang['Linkadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_linkdb.$phpEx?action=link_manage" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); ! } ! elseif ( $mode == 'do_add' && $link_id ) { $link_id = $this->update_add_link( $link_id ); *************** *** 137,141 **** $message = $lang['Linkeedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_linkdb.$phpEx?action=link_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( "index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); ! }elseif ( $mode == 'delete' ) { if ( is_array( $file_ids ) && !empty( $file_ids ) ) --- 139,144 ---- $message = $lang['Linkeedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_linkdb.$phpEx?action=link_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( "index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); ! } ! elseif ( $mode == 'delete' ) { if ( is_array( $file_ids ) && !empty( $file_ids ) ) *************** *** 151,155 **** } $this->_linkdb(); ! }elseif ( $mode == 'do_approve' || $mode == 'do_unapprove' ) { if ( is_array( $file_ids ) && !empty( $file_ids ) ) --- 154,159 ---- } $this->_linkdb(); ! } ! elseif ( $mode == 'do_approve' || $mode == 'do_unapprove' ) { if ( is_array( $file_ids ) && !empty( $file_ids ) ) *************** *** 167,180 **** } ! $template->set_filenames( array( 'body' => $template_file ) ! ); ! $template->assign_vars( array( 'L_FILE_TITLE' => $l_title, ! 'L_FILE_EXPLAIN' => $l_explain, ! 'L_ADD_FILE' => $lang['AddLink'], ! 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_FILE_ACTION' => append_sid( "admin_linkdb.$phpEx?action=link_manage" ) ) ! ); if ( in_array( $mode, array( '', 'unapproved', 'approved', 'broken', 'do_approve', 'do_unapprove', 'delete', 'file_cat' ) ) ) --- 171,184 ---- } ! $template->set_filenames( array( 'body' => $template_file ) ); ! $template->assign_vars( array( ! 'L_FILE_TITLE' => $l_title, ! 'L_FILE_EXPLAIN' => $l_explain, ! 'L_ADD_FILE' => $lang['AddLink'], ! 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_FILE_ACTION' => append_sid( "admin_linkdb.$phpEx?action=link_manage" ) ) ! ); if ( in_array( $mode, array( '', 'unapproved', 'approved', 'broken', 'do_approve', 'do_unapprove', 'delete', 'file_cat' ) ) ) *************** *** 284,288 **** if ( $mode == '' ) { ! $global_array = array( 0 => array( 'lang_var' => $lang['Unapproved_links'], 'row_set' => $unapproved_file_rowset, 'approval' => 'approve' ), --- 288,293 ---- if ( $mode == '' ) { ! $global_array = array( ! 0 => array( 'lang_var' => $lang['Unapproved_links'], 'row_set' => $unapproved_file_rowset, 'approval' => 'approve' ), *************** *** 293,307 **** 'row_set' => $broken_file_rowset, 'approval' => 'both')*/ ); ! }elseif ( $mode == 'approved' || $mode == 'file_cat' ) { $global_array = array( 0 => array( 'lang_var' => $lang['Approved_links'], 'row_set' => $approved_rowset, 'approval' => 'unapprove' ) ); ! }elseif ( $mode == 'unapproved' ) { $global_array = array( 0 => array( 'lang_var' => $lang['Unapproved_links'], 'row_set' => $unapproved_file_rowset, 'approval' => 'approve' ) ); ! }elseif ( $mode == 'broken' ) { $global_array = array( 0 => array( 'lang_var' => $lang['Broken_files'], --- 298,315 ---- 'row_set' => $broken_file_rowset, 'approval' => 'both')*/ ); ! } ! elseif ( $mode == 'approved' || $mode == 'file_cat' ) { $global_array = array( 0 => array( 'lang_var' => $lang['Approved_links'], 'row_set' => $approved_rowset, 'approval' => 'unapprove' ) ); ! } ! elseif ( $mode == 'unapproved' ) { $global_array = array( 0 => array( 'lang_var' => $lang['Unapproved_links'], 'row_set' => $unapproved_file_rowset, 'approval' => 'approve' ) ); ! } ! elseif ( $mode == 'broken' ) { $global_array = array( 0 => array( 'lang_var' => $lang['Broken_files'], *************** *** 334,355 **** $cat_list .= '</select>'; ! $template->assign_vars( array( 'L_EDIT' => $lang['Edit'], ! 'L_DELETE' => $lang['Delete'], ! 'L_CATEGORY' => $lang['Category'], ! 'L_MODE' => $lang['View'], ! 'L_GO' => $lang['Go'], ! 'L_DELETE_FILE' => $lang['Delete_selected'], ! 'L_APPROVE' => $lang['Approve'], ! 'L_UNAPPROVE' => $lang['Unapprove'], ! 'L_APPROVE_FILE' => $lang['Approve_selected'], ! 'L_UNAPPROVE_FILE' => $lang['Unapprove_selected'], ! 'L_NO_FILES' => $lang['No_link'], ! 'PAGINATION' => generate_pagination( append_sid( "admin_linkdb.$phpEx?action=link_manage&mode=$mode&sort_method=$sort_method&sort_order=$sort_order&cat_id=$cat_id" ), $total_files, $linkdb_config['settings_link_page'], $start ), ! 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $linkdb_config['settings_link_page'] ) + 1 ), ceil( $total_files / $linkdb_config['settings_link_page'] ) ), ! 'S_CAT_LIST' => $cat_list, ! 'S_MODE_SELECT' => $s_file_list ) ! ); foreach( $global_array as $files_data ) --- 342,364 ---- $cat_list .= '</select>'; ! $template->assign_vars( array( ! 'L_EDIT' => $lang['Edit'], ! 'L_DELETE' => $lang['Delete'], ! 'L_CATEGORY' => $lang['Category'], ! 'L_MODE' => $lang['View'], ! 'L_GO' => $lang['Go'], ! 'L_DELETE_FILE' => $lang['Delete_selected'], ! 'L_APPROVE' => $lang['Approve'], ! 'L_UNAPPROVE' => $lang['Unapprove'], ! 'L_APPROVE_FILE' => $lang['Approve_selected'], ! 'L_UNAPPROVE_FILE' => $lang['Unapprove_selected'], ! 'L_NO_FILES' => $lang['No_link'], ! 'PAGINATION' => generate_pagination( append_sid( "admin_linkdb.$phpEx?action=link_manage&mode=$mode&sort_method=$sort_method&sort_order=$sort_order&cat_id=$cat_id" ), $total_files, $linkdb_config['settings_link_page'], $start ), ! 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $linkdb_config['settings_link_page'] ) + 1 ), ceil( $total_files / $linkdb_config['settings_link_page'] ) ), ! 'S_CAT_LIST' => $cat_list, ! 'S_MODE_SELECT' => $s_file_list ) ! ); foreach( $global_array as $files_data ) *************** *** 368,376 **** } ! $template->assign_block_vars( 'file_mode', array( 'L_FILE_MODE' => $files_data['lang_var'], ! 'DATA' => ( isset( $files_data['row_set'] ) ) ? true : false, ! 'APPROVE' => $approve, ! 'UNAPPROVE' => $unapprove ) ! ); if ( isset( $files_data['row_set'] ) ) --- 377,386 ---- } ! $template->assign_block_vars( 'file_mode', array( ! 'L_FILE_MODE' => $files_data['lang_var'], ! 'DATA' => ( isset( $files_data['row_set'] ) ) ? true : false, ! 'APPROVE' => $approve, ! 'UNAPPROVE' => $unapprove ) ! ); if ( isset( $files_data['row_set'] ) ) *************** *** 386,399 **** $file_poster .= ( $file_data['user_id'] != ANONYMOUS ) ? '</a>' : ''; ! $template->assign_block_vars( 'file_mode.file_row', array( 'COLOR' => ( ++$j % 2 ) ? "row1" : "row2", ! 'FILE_NAME' => "<a href=" . $file_data['link_url'] . " target=_blank>" . $file_data['link_name'] . "</a>", ! 'FILE_SUBMITED_BY' => $file_poster, ! 'FILE_NUMBER' => $i++, ! 'FILE_ID' => $file_data['link_id'], ! 'U_FILE_EDIT' => append_sid( "admin_linkdb.$phpEx?action=link_manage&mode=edit&link_id={$file_data['link_id']}" ), ! 'U_FILE_DELETE' => append_sid( "admin_linkdb.$phpEx?action=link_manage&mode=delete&link_id={$file_data['link_id']}" ), ! 'U_FILE_APPROVE' => append_sid( "admin_linkdb.$phpEx?action=link_manage&mode=$approve_mode&link_id={$file_data['link_id']}" ), ! 'L_APPROVE' => ( $file_data['link_approved'] ) ? $lang['Unapprove'] : $lang['Approve'] ) ! ); } } --- 396,410 ---- $file_poster .= ( $file_data['user_id'] != ANONYMOUS ) ? '</a>' : ''; ! $template->assign_block_vars( 'file_mode.file_row', array( ! 'COLOR' => ( ++$j % 2 ) ? "row1" : "row2", ! 'FILE_NAME' => "<a href=" . $file_data['link_url'] . " target=_blank>" . $file_data['link_name'] . "</a>", ! 'FILE_SUBMITED_BY' => $file_poster, ! 'FILE_NUMBER' => $i++, ! 'FILE_ID' => $file_data['link_id'], ! 'U_FILE_EDIT' => append_sid( "admin_linkdb.$phpEx?action=link_manage&mode=edit&link_id={$file_data['link_id']}" ), ! 'U_FILE_DELETE' => append_sid( "admin_linkdb.$phpEx?action=link_manage&mode=delete&link_id={$file_data['link_id']}" ), ! 'U_FILE_APPROVE' => append_sid( "admin_linkdb.$phpEx?action=link_manage&mode=$approve_mode&link_id={$file_data['link_id']}" ), ! 'L_APPROVE' => ( $file_data['link_approved'] ) ? $lang['Unapprove'] : $lang['Approve'] ) ! ); } } *************** *** 439,492 **** } ! $template->assign_vars( array( 'LINK_CAT_NOT_ALLOW' => $lang['Cat_not_allow'], ! 'FILE_NAME' => $link_name, ! 'FILE_LONG_DESC' => $link_longdesc, ! 'LINK_LOGO_SRC' => $link_logo_src, ! 'FILE_DLURL' => $file_url, ! 'FILE_DOWNLOAD' => $file_download, ! 'APPROVED_CHECKED_YES' => $approved_checked_yes, ! 'APPROVED_CHECKED_NO' => $approved_checked_no, ! 'L_FILE_APPROVED' => $lang['Approved'], ! 'L_FILE_APPROVED_INFO' => $lang['Approved_info'], ! 'L_FILE_NAME' => $lang['Sitename'], ! 'L_FILE_NAME_INFO' => $lang['Sitenameinfo'], ! 'L_FILE_LONG_DESC' => $lang['Siteld'], ! 'L_FILE_LONG_DESC_INFO' => $lang['Siteldinfo'], ! 'L_LINK_LOGO' => $lang['Link_logo'], ! 'L_LINK_LOGO_SRC' => sprintf( $lang['Link_logo_src1'], $linkdb_config['width'], $linkdb_config['height'] ), ! 'L_PREVIEW' => $lang['Preview'], ! 'L_FILE_URL' => $lang['Siteurl'], ! 'L_FILE_UPLOAD' => $lang['File_upload'], ! 'L_FILEINFO_UPLOAD' => $lang['Fileinfo_upload'], ! 'L_FILE_CAT' => $lang['Sitecat'], ! 'L_FILE_CAT_INFO' => $lang['Sitecatinfo'], ! 'L_FILE_DOWNLOAD' => $lang['Link_hits'], ! 'L_UPLOADED_FILE' => $lang['Uploaded_file'], ! 'L_NO' => $lang['No'], ! 'L_YES' => $lang['Yes'], ! 'LINK_NAME_FIELD' => $lang['Link_name_field'], ! 'LINK_URL_FIELD' => $lang['Link_url_field'], ! 'LINK_LONG_DES_FIELD' => $lang['Link_long_des_field'], ! 'S_POSTICONS' => $file_posticons, ! 'S_LICENSE_LIST' => $file_license, ! 'S_CAT_LIST' => $file_cat_list ) ! ); } if ( sizeof( $this->error ) ) $template->assign_block_vars( 'linkdb_error', array() ); ! $template->assign_vars( array( 'ERROR' => ( sizeof( $this->error ) ) ? implode( '<br />', $this->error ) : '' ) ! ); $template->pparse( 'body' ); } } - ?> \ No newline at end of file --- 450,502 ---- } ! $template->assign_vars( array( ! 'LINK_CAT_NOT_ALLOW' => $lang['Cat_not_allow'], ! 'FILE_NAME' => $link_name, ! 'FILE_LONG_DESC' => $link_longdesc, ! 'LINK_LOGO_SRC' => $link_logo_src, ! 'FILE_DLURL' => $file_url, ! 'FILE_DOWNLOAD' => $file_download, ! 'APPROVED_CHECKED_YES' => $approved_checked_yes, ! 'APPROVED_CHECKED_NO' => $approved_checked_no, ! 'L_FILE_APPROVED' => $lang['Approved'], ! 'L_FILE_APPROVED_INFO' => $lang['Approved_info'], ! 'L_FILE_NAME' => $lang['Sitename'], ! 'L_FILE_NAME_INFO' => $lang['Sitenameinfo'], ! 'L_FILE_LONG_DESC' => $lang['Siteld'], ! 'L_FILE_LONG_DESC_INFO' => $lang['Siteldinfo'], ! 'L_LINK_LOGO' => $lang['Link_logo'], ! 'L_LINK_LOGO_SRC' => sprintf( $lang['Link_logo_src1'], $linkdb_config['width'], $linkdb_config['height'] ), ! 'L_PREVIEW' => $lang['Preview'], ! 'L_FILE_URL' => $lang['Siteurl'], ! 'L_FILE_UPLOAD' => $lang['File_upload'], ! 'L_FILEINFO_UPLOAD' => $lang['Fileinfo_upload'], ! 'L_FILE_CAT' => $lang['Sitecat'], ! 'L_FILE_CAT_INFO' => $lang['Sitecatinfo'], ! 'L_FILE_DOWNLOAD' => $lang['Link_hits'], ! 'L_UPLOADED_FILE' => $lang['Uploaded_file'], ! 'L_NO' => $lang['No'], ! 'L_YES' => $lang['Yes'], ! 'LINK_NAME_FIELD' => $lang['Link_name_field'], ! 'LINK_URL_FIELD' => $lang['Link_url_field'], ! 'LINK_LONG_DES_FIELD' => $lang['Link_long_des_field'], ! 'S_POSTICONS' => $file_posticons, ! 'S_LICENSE_LIST' => $file_license, ! 'S_CAT_LIST' => $file_cat_list ) ! ); } if ( sizeof( $this->error ) ) $template->assign_block_vars( 'linkdb_error', array() ); ! $template->assign_vars( array( 'ERROR' => ( sizeof( $this->error ) ) ? implode( '<br />', $this->error ) : '' ) ); $template->pparse( 'body' ); } } ?> \ No newline at end of file Index: admin_setting.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/admin/admin_setting.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_setting.php 5 Apr 2006 22:35:24 -0000 1.4 --- admin_setting.php 30 Jun 2006 19:54:14 -0000 1.5 *************** *** 52,134 **** } ! $template->set_filenames( array( 'body' => 'admin/linkdb_admin_settings.tpl' ) ! ); ! $template->assign_vars( array( 'S_SETTINGS_ACTION' => append_sid( "admin_linkdb.$phpEx" ), ! 'L_SETTINGS' => $lang['Configuration'], ! 'L_SETTINGSTITLE' => $lang['Settingstitle'], ! 'L_SETTINGSEXPLAIN' => $lang['Settingsexplain'], ! 'LOCK_SUBMIT_SITE_YES' => ( $new['lock_submit_site'] ) ? "checked=\"checked\"" : "", ! 'LOCK_SUBMIT_SITE_NO' => ( !$new['lock_submit_site'] ) ? "checked=\"checked\"" : "", ! 'L_LOCK_SUBMIT_SITE' => $lang['lock_submit_site'], ! 'CAT_COL' => $new['cat_col'], ! 'L_CAT_COL' => $lang['cat_col'], ! 'SPLIT_LINKS_YES' => ( $new['split_links'] ) ? "checked=\"checked\"" : "", ! 'SPLIT_LINKS_NO' => ( !$new['split_links'] ) ? "checked=\"checked\"" : "", ! 'L_SPLIT_LINKS' => $lang['split_links'], ! 'L_SITE_LOGO' => $lang['site_logo'], ! 'L_SITE_URL' => $lang['site_url'], ! 'L_WIDTH' => $lang['width'], ! 'L_HEIGHT' => $lang['height'], ! 'L_SETTINGS_LINK_PAGE' => $lang['settings_link_page'], ! 'L_DISPLAY_INTERVAL' => $lang['interval'], ! 'L_DISPLAY_LOGO_NUM' => $lang['display_logo'], ! 'INTERVAL' => $new['display_interval'], ! 'LOGO_NUM' => $new['display_logo_num'], ! 'SITE_LOGO' => $new['site_logo'], ! 'SITE_URL' => $new['site_url'], ! 'WIDTH' => $new['width'], ! 'HEIGHT' => $new['height'], ! 'SETTINGS_LINK_PAGE' => $new['settings_link_page'], ! 'ALLOW_GUEST_SUBMIT_SITE_YES' => ( $new['allow_guest_submit_site'] ) ? "checked=\"checked\"" : "", ! 'ALLOW_GUEST_SUBMIT_SITE_NO' => ( !$new['allow_guest_submit_site'] ) ? "checked=\"checked\"" : "", ! 'L_ALLOW_GUEST_SUBMIT_SITE' => $lang['allow_guest_submit_site'], ! 'ALLOW_NO_LOGO_YES' => ( $new['allow_no_logo'] ) ? "checked=\"checked\"" : "", ! 'ALLOW_NO_LOGO_NO' => ( !$new['allow_no_logo'] ) ? "checked=\"checked\"" : "", ! 'L_ALLOW_NO_LOGO' => $lang['allow_no_logo'], ! 'DISLAY_LINKS_LOGO_YES' => ( $new['display_links_logo'] ) ? "checked=\"checked\"" : "", ! 'DISLAY_LINKS_LOGO_NO' => ( !$new['display_links_logo'] ) ? "checked=\"checked\"" : "", ! 'L_DISPLAY_LINKS_LOGO' => $lang['Link_display_links_logo'], ! 'EMAIL_YES' => ( $new['email_notify'] ) ? "checked=\"checked\"" : "", ! 'EMAIL_NO' => ( !$new['email_notify'] ) ? "checked=\"checked\"" : "", ! 'L_LINK_EMAIL_NOTIFY' => $lang['Link_email_notify'], ! 'PM_YES' => ( $new['pm_notify'] ) ? "checked=\"checked\"" : "", ! 'PM_NO' => ( !$new['pm_notify'] ) ? "checked=\"checked\"" : "", ! 'L_LINK_PM_NOTIFY' => $lang['Link_pm_notify'], ! 'RATE_YES' => ( $new['allow_vote'] ) ? "checked=\"checked\"" : "", ! 'RATE_NO' => ( !$new['allow_vote'] ) ? "checked=\"checked\"" : "", ! 'L_LINK_ALLOW_RATE' => $lang['Link_allow_rate'], ! 'L_YES' => $lang['Yes'], ! 'L_NO' => $lang['No'], ! 'NEED_VALIDATION_YES' => ( $new['link_validation'] ) ? "checked=\"checked\"" : "", ! 'NEED_VALIDATION_NO' => ( !$new['link_validation'] ) ? "checked=\"checked\"" : "", ! 'L_NEED_VALIDATION' => $lang['Need_validation'], ! 'L_DEFAULT_SORT_METHOD' => $lang['Default_sort_method'], ! 'L_DEFAULT_SORT_ORDER' => $lang['Default_sort_order'], ! 'L_DOWNLOADS' => $lang['Hits'], ! 'L_DATE' => $lang['Date'], ! 'L_NAME' => $lang['Sitename'], ! 'L_LINK_SITE_DESC' => $lang['Siteld'], ! 'L_ASC' => $lang['Sort_Ascending'], ! 'L_DESC' => $lang['Sort_Descending'], ! 'SORT_NAME' => ( $new['sort_method'] == 'link_name' ) ? 'selected="selected"' : '', ! 'SORT_TIME' => ( $new['sort_method'] == 'link_time' ) ? 'selected="selected"' : '', ! 'SORT_RATING' => ( $new['sort_method'] == 'link_longdesc' ) ? 'selected="selected"' : '', ! 'SORT_DOWNLOADS' => ( $new['sort_method'] == 'link_hits' ) ? 'selected="selected"' : '', ! 'SORT_ASC' => ( $new['sort_order'] == 'ASC' ) ? 'selected="selected"' : '', ! 'SORT_DESC' => ( $new['sort_order'] == 'DESC' ) ? 'selected="selected"' : '', ! 'L_SUBMIT' => $lang['Submit'], ! 'L_RESET' => $lang['Reset'] ) ! ); $template->pparse( 'body' ); } } - ?> \ No newline at end of file --- 52,133 ---- } ! $template->set_filenames( array( 'body' => 'admin/linkdb_admin_settings.tpl' ) ); ! $template->assign_vars( array( ! 'S_SETTINGS_ACTION' => append_sid( "admin_linkdb.$phpEx" ), ! 'L_SETTINGS' => $lang['Configuration'], ! 'L_SETTINGSTITLE' => $lang['Settingstitle'], ! 'L_SETTINGSEXPLAIN' => $lang['Settingsexplain'], ! 'LOCK_SUBMIT_SITE_YES' => ( $new['lock_submit_site'] ) ? "checked=\"checked\"" : "", ! 'LOCK_SUBMIT_SITE_NO' => ( !$new['lock_submit_site'] ) ? "checked=\"checked\"" : "", ! 'L_LOCK_SUBMIT_SITE' => $lang['lock_submit_site'], ! 'CAT_COL' => $new['cat_col'], ! 'L_CAT_COL' => $lang['cat_col'], ! 'SPLIT_LINKS_YES' => ( $new['split_links'] ) ? "checked=\"checked\"" : "", ! 'SPLIT_LINKS_NO' => ( !$new['split_links'] ) ? "checked=\"checked\"" : "", ! 'L_SPLIT_LINKS' => $lang['split_links'], ! 'L_SITE_LOGO' => $lang['site_logo'], ! 'L_SITE_URL' => $lang['site_url'], ! 'L_WIDTH' => $lang['width'], ! 'L_HEIGHT' => $lang['height'], ! 'L_SETTINGS_LINK_PAGE' => $lang['settings_link_page'], ! 'L_DISPLAY_INTERVAL' => $lang['interval'], ! 'L_DISPLAY_LOGO_NUM' => $lang['display_logo'], ! 'INTERVAL' => $new['display_interval'], ! 'LOGO_NUM' => $new['display_logo_num'], ! 'SITE_LOGO' => $new['site_logo'], ! 'SITE_URL' => $new['site_url'], ! 'WIDTH' => $new['width'], ! 'HEIGHT' => $new['height'], ! 'SETTINGS_LINK_PAGE' => $new['settings_link_page'], ! 'ALLOW_GUEST_SUBMIT_SITE_YES' => ( $new['allow_guest_submit_site'] ) ? "checked=\"checked\"" : "", ! 'ALLOW_GUEST_SUBMIT_SITE_NO' => ( !$new['allow_guest_submit_site'] ) ? "checked=\"checked\"" : "", ! 'L_ALLOW_GUEST_SUBMIT_SITE' => $lang['allow_guest_submit_site'], ! 'ALLOW_NO_LOGO_YES' => ( $new['allow_no_logo'] ) ? "checked=\"checked\"" : "", ! 'ALLOW_NO_LOGO_NO' => ( !$new['allow_no_logo'] ) ? "checked=\"checked\"" : "", ! 'L_ALLOW_NO_LOGO' => $lang['allow_no_logo'], ! 'DISLAY_LINKS_LOGO_YES' => ( $new['display_links_logo'] ) ? "checked=\"checked\"" : "", ! 'DISLAY_LINKS_LOGO_NO' => ( !$new['display_links_logo'] ) ? "checked=\"checked\"" : "", ! 'L_DISPLAY_LINKS_LOGO' => $lang['Link_display_links_logo'], ! 'EMAIL_YES' => ( $new['email_notify'] ) ? "checked=\"checked\"" : "", ! 'EMAIL_NO' => ( !$new['email_notify'] ) ? "checked=\"checked\"" : "", ! 'L_LINK_EMAIL_NOTIFY' => $lang['Link_email_notify'], ! 'PM_YES' => ( $new['pm_notify'] ) ? "checked=\"checked\"" : "", ! 'PM_NO' => ( !$new['pm_notify'] ) ? "checked=\"checked\"" : "", ! 'L_LINK_PM_NOTIFY' => $lang['Link_pm_notify'], ! 'RATE_YES' => ( $new['allow_vote'] ) ? "checked=\"checked\"" : "", ! 'RATE_NO' => ( !$new['allow_vote'] ) ? "checked=\"checked\"" : "", ! 'L_LINK_ALLOW_RATE' => $lang['Link_allow_rate'], ! 'L_YES' => $lang['Yes'], ! 'L_NO' => $lang['No'], ! 'NEED_VALIDATION_YES' => ( $new['link_validation'] ) ? "checked=\"checked\"" : "", ! 'NEED_VALIDATION_NO' => ( !$new['link_validation'] ) ? "checked=\"checked\"" : "", ! 'L_NEED_VALIDATION' => $lang['Need_validation'], ! 'L_DEFAULT_SORT_METHOD' => $lang['Default_sort_method'], ! 'L_DEFAULT_SORT_ORDER' => $lang['Default_sort_order'], ! 'L_DOWNLOADS' => $lang['Hits'], ! 'L_DATE' => $lang['Date'], ! 'L_NAME' => $lang['Sitename'], ! 'L_LINK_SITE_DESC' => $lang['Siteld'], ! 'L_ASC' => $lang['Sort_Ascending'], ! 'L_DESC' => $lang['Sort_Descending'], ! 'SORT_NAME' => ( $new['sort_method'] == 'link_name' ) ? 'selected="selected"' : '', ! 'SORT_TIME' => ( $new['sort_method'] == 'link_time' ) ? 'selected="selected"' : '', ! 'SORT_RATING' => ( $new['sort_method'] == 'link_longdesc' ) ? 'selected="selected"' : '', ! 'SORT_DOWNLOADS' => ( $new['sort_method'] == 'link_hits' ) ? 'selected="selected"' : '', ! 'SORT_ASC' => ( $new['sort_order'] == 'ASC' ) ? 'selected="selected"' : '', ! 'SORT_DESC' => ( $new['sort_order'] == 'DESC' ) ? 'selected="selected"' : '', ! 'L_SUBMIT' => $lang['Submit'], ! 'L_RESET' => $lang['Reset'] ) ! ); $template->pparse( 'body' ); } } ?> \ No newline at end of file |