diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/cat_list.php | 8 | ||||
| -rw-r--r-- | admin/configuration.php | 13 | ||||
| -rw-r--r-- | admin/remote_site.php | 2 | ||||
| -rw-r--r-- | admin/update.php | 3 |
4 files changed, 6 insertions, 20 deletions
diff --git a/admin/cat_list.php b/admin/cat_list.php index ca3953f78..c57840481 100644 --- a/admin/cat_list.php +++ b/admin/cat_list.php @@ -40,7 +40,7 @@ $navigation = $lang['gallery_index']; // +-----------------------------------------------------------------------+ // | virtual categories management | // +-----------------------------------------------------------------------+ -// request to add a virtual category +// request to delete a virtual category if (isset($_GET['delete']) and is_numeric($_GET['delete'])) { $to_delete_categories = array(); @@ -48,7 +48,7 @@ if (isset($_GET['delete']) and is_numeric($_GET['delete'])) delete_categories($to_delete_categories); array_push($infos, $lang['cat_list_virtual_category_deleted']); } -// request to delete a virtual category +// request to add a virtual category else if (isset($_POST['submit'])) { // is the given category name only containing blank spaces ? @@ -75,9 +75,9 @@ SELECT uppercats // we have then to add the virtual category $query = ' INSERT INTO '.CATEGORIES_TABLE.' - (name,id_uppercat,rank) + (name,id_uppercat,rank,site_id) VALUES - (\''.$_POST['virtual_name'].'\','.$parent_id.','.$_POST['rank'].') + (\''.$_POST['virtual_name'].'\','.$parent_id.','.$_POST['rank'].',NULL) ;'; pwg_query($query); diff --git a/admin/configuration.php b/admin/configuration.php index bec557c5b..417d6416f 100644 --- a/admin/configuration.php +++ b/admin/configuration.php @@ -199,8 +199,6 @@ switch ($page['section']) } case 'comments' : { - $show_yes = ($conf['show_comments']=='true')?'checked="checked"':''; - $show_no = ($conf['show_comments']=='false')?'checked="checked"':''; $all_yes = ($conf['comments_forall']=='true')?'checked="checked"':''; $all_no = ($conf['comments_forall']=='false')?'checked="checked"':''; $validate_yes = ($conf['comments_validation']=='true')?'checked="checked"':''; @@ -210,8 +208,6 @@ switch ($page['section']) 'comments', array( 'L_CONF_TITLE'=>$lang['conf_comments_title'], - 'L_CONF_SHOW_COMMENTS'=>$lang['conf_show_comments'], - 'L_CONF_SHOW_COMMENTS_INFO'=>$lang['conf_show_comments_info'], 'L_CONF_COMMENTS_ALL'=>$lang['conf_comments_forall'], 'L_CONF_COMMENTS_ALL_INFO'=>$lang['conf_comments_forall_info'], 'L_CONF_NB_COMMENTS_PAGE'=>$lang['conf_nb_comment_page'], @@ -220,8 +216,6 @@ switch ($page['section']) 'L_CONF_VALIDATE_INFO'=>$lang['conf_comments_validation_info'], 'NB_COMMENTS_PAGE'=>$conf['nb_comment_page'], - 'SHOW_COMMENTS_YES'=>$show_yes, - 'SHOW_COMMENTS_NO'=>$show_no, 'COMMENTS_ALL_YES'=>$all_yes, 'COMMENTS_ALL_NO'=>$all_no, 'VALIDATE_YES'=>$validate_yes, @@ -270,15 +264,10 @@ switch ($page['section']) } case 'upload' : { - $upload_yes = ($conf['upload_available']=='true')?'checked="checked"':''; - $upload_no = ($conf['upload_available']=='false')?'checked="checked"':''; - $template->assign_block_vars( 'upload', array( 'L_CONF_TITLE'=>$lang['conf_upload_title'], - 'L_CONF_UPLOAD'=>$lang['conf_authorize_upload'], - 'L_CONF_UPLOAD_INFO'=>$lang['conf_authorize_upload_info'], 'L_CONF_MAXSIZE'=>$lang['conf_upload_maxfilesize'], 'L_CONF_MAXSIZE_INFO'=>$lang['conf_upload_maxfilesize_info'], 'L_CONF_MAXWIDTH'=>$lang['conf_upload_maxwidth'], @@ -295,8 +284,6 @@ switch ($page['section']) 'UPLOAD_MAXHEIGHT'=>$conf['upload_maxheight'], 'TN_UPLOAD_MAXWIDTH'=>$conf['upload_maxwidth_thumbnail'], 'TN_UPLOAD_MAXHEIGHT'=>$conf['upload_maxheight_thumbnail'], - 'UPLOAD_YES'=>$upload_yes, - 'UPLOAD_NO'=>$upload_no )); break; } diff --git a/admin/remote_site.php b/admin/remote_site.php index b1c913914..5aaf1a08f 100644 --- a/admin/remote_site.php +++ b/admin/remote_site.php @@ -485,8 +485,6 @@ INSERT INTO '.IMAGE_CATEGORY_TABLE.' // +-----------------------------------------------------------------------+ $template->set_filenames(array('remote_site'=>'admin/remote_site.tpl')); -$action = PHPWG_ROOT_PATH.'admin.php?page=remote_site'; - $template->assign_vars( array( 'L_SUBMIT'=>$lang['submit'], diff --git a/admin/update.php b/admin/update.php index a01926c18..fc920ebb6 100644 --- a/admin/update.php +++ b/admin/update.php @@ -603,7 +603,8 @@ SELECT id display_select_categories($structure, ' ', array(), - 'introduction.category_option'); + 'introduction.category_option', + array()); } // +-----------------------------------------------------------------------+ // | synchronize files | |