Bugfix in admin area: Requesting a non-existant panel will not result in error message any more. Instead: Redirection to main panel.

admin/main.php

@@ -1,9 +1,6 @@
 <?php
 
-
 // aggiungere nuovo protocollo per template
-
-
 include (ADMIN_DIR . 'panels/admin.defaultpanels.php');
 include (ADMIN_DIR . 'includes/panels.prototypes.php');
 require (SMARTY_DIR . 'SmartyValidate.class.php');
@@ -17,16 +14,13 @@
 }
 
 /*
-	function admin_is_user_loggedin() {
+ * function admin_is_user_loggedin() {
-		return ($u=user_loggedin()) && utils_checkreferer() ;
+ * return ($u=user_loggedin()) && utils_checkreferer() ;
-	}
+ * }
  */
-	
-	
 function main() {
 
 	// general setup
-		
 	global $panel, $action, $lang, $smarty, $fp_admin, $fp_admin_action;
 
 	$panels = admin_getpanels();
@@ -35,14 +29,16 @@
 	define('ADMIN_PANEL', $panel);
 	$smarty->assign('panel', $panel);
 
-		if (!admin_panelexists($panel)) 
+	// redirect to admin main page if requested panel does not exist
-			trigger_error('Requested panel does not exists!', E_USER_ERROR);
+	if (!admin_panelexists($panel)) {
-			
+		// will lead to login if not logged in already
+		utils_redirect("admin.php");
+		die();
+	}
 
 	$panelprefix = "admin.$panel";
 	$panelpath = ADMIN_DIR . "panels/$panel/$panelprefix.php";
 
-		
 	$fp_admin = null;
 
 	if (file_exists($panelpath)) {
@@ -54,7 +50,6 @@
 			trigger_error("No class defined for requested panel", E_USER_ERROR);
 
 		$fp_admin = new $panelclass($smarty);
-		
 	}
 
 	/* check if user is loggedin */
@@ -64,14 +59,12 @@
 		die();
 	}
 
-		
 	$action = isset($_GET ['action']) ? $_GET ['action'] : 'default';
 	if (!$fp_admin)
 		return;
 
 	$fp_admin_action = $fp_admin->get_action($action);
 
-		
 	define('ADMIN_PANEL_ACTION', $action);
 	$smarty->assign('action', $action);
 	$panel_url = BLOG_BASEURL . "admin.php?p={$panel}";
@@ -79,13 +72,9 @@
 	$smarty->assign('panel_url', $panel_url);
 	$smarty->assign('action_url', $action_url);
 
-	
 	if (!empty($_POST))
 		check_admin_referer("admin_{$panel}_{$action}");
 
-			
-			
-		
 	$smarty->assign('success', sess_remove("success_{$panel}"));
 	$retval = $fp_admin_action->exec();
 
@@ -101,19 +90,16 @@
 
 		if ($retval == PANEL_REDIRECT_CURRENT) {
 			foreach ($fp_admin_action->args as $mandatory_argument) {
-					$with_arguments .= '&' . $mandatory_argument .
+				$with_arguments .= '&' . $mandatory_argument . '=' . $_REQUEST [$mandatory_argument];
-								'=' . $_REQUEST[$mandatory_argument];
 			}
 		}
 
 		$url = "admin.php?p={$panel}{$to_action}{$with_mod}{$with_arguments}";
 		utils_redirect($url);
-			
 	}
 
 	$smarty->register_modifier('action_link', 'admin_filter_action');
 	$smarty->register_modifier('cmd_link', 'admin_filter_command');
-
 }
 
 // smarty tag
@@ -126,18 +112,14 @@
 
 // smarty tag
 function admin_filter_command($string, $cmd, $val) {
-	
 	global $panel, $action;
 
 	$arg = $cmd ? "&{$cmd}" : $cmd;
 
 	return wp_nonce_url("{$string}{$arg}={$val}", "admin_{$panel}_{$action}_{$cmd}_{$val}");
-		
 }
 
-	
 function admin_panelstrings($panelprefix) {
-	
 	global $lang, $smarty;
 
 	lang_load('admin');
@@ -150,7 +132,6 @@
 }
 
 function admin_panel_title($title, $sep) {
-	
 	global $lang, $panel;
 
 	$t = @$lang ['admin'] ['panels'] [$panel];
@@ -158,14 +139,11 @@
 	return $title;
 }
 
-	
-
 function showcontrolpanel($params, &$smarty) {
 	$smarty->display(ABS_PATH . ADMIN_DIR . 'main.tpl');
 }
 
 // html header
-	
 function admin_title($title, $sep) {
 	global $lang;
 	return $title = "$title $sep {$lang['admin']['head']}";
@@ -173,7 +151,6 @@
 
 add_filter('wp_title', 'admin_title', 10, 2);
 
-
 // setup admin_header
 function admin_header_default_action() {
 	global $panel, $action;
@@ -181,7 +158,6 @@
 }
 add_filter('admin_head', 'admin_header_default_action');
 
-	
 $fp_config = config_load();
 system_init();
 main();
@@ -191,11 +167,9 @@
 
 $v = $lang ['admin'] [$panel] [$action];
 
-	
 $smarty->assign_by_ref('panelstrings', $v);
 $smarty->assign_by_ref('plang', $v);
 
-	
 if (isset($_GET ['mod'])) {
 
 	switch ($_GET ['mod']) {
@@ -205,10 +179,8 @@
 		case 'ajax':
 			echo $smarty->get_template_vars('success');
 	}
-		
 } else {
 	$smarty->display('admin.tpl');
 }
 
-	
 ?>