Radio button fix and support for VIEWPORT in the admin area. More admin-menu fixes.

e107_admin/header.php

@@ -152,7 +152,7 @@ else // XHTML
 	echo(defined("CORE_LC")) ? "<meta http-equiv='content-language' content='".CORE_LC."' />\n" : "";
 	echo "<meta http-equiv='content-type' content='text/html; charset=utf-8' />\n";
 }
-
+echo (defined("VIEWPORT")) ? "<meta name=\"viewport\" content=\"".VIEWPORT."\" />\n" : "";
 
 echo "<title>".(defined("e_PAGETITLE") ? e_PAGETITLE." - " : (defined("PAGE_NAME") ? PAGE_NAME." - " : "")).LAN_head_4." :: ".SITENAME."</title>\n";
 
@@ -663,6 +663,7 @@ if ($e107_popup != 1)
 			
 			return e_admin_menu($title, $active_page, $e107_vars, false, false, $sortlist);
 
+			/*
 			global $ns,$BUTTON,$BUTTON_OVER,$BUTTONS_START,$BUTTONS_END,$SUB_BUTTON,$SUB_BUTTON_OVER,$SUB_BUTTONS_START,$SUB_BUTTONS_END;
 
 			$id_title = "yop_".str_replace(" ", "", $title);
@@ -782,9 +783,15 @@ if ($e107_popup != 1)
 			{
 				$ns->tablerender($title, $text, array('id'=>$id_title, 'style'=>'button_menu'));
 			}
+		*/
 		}
 	}
 
+
+
+
+
+
 	if (file_exists(THEME.'admin_template.php'))
 	{
 		require_once (THEME.'admin_template.php');

e107_admin/wmessage.php

@@ -254,11 +254,12 @@ if ($action == "opt") {
 
 }
 
-function wmessage_adminmenu() {
+function wmessage_adminmenu() 
-	global $action;
+{
-	if ($action == "") {
+
-		$action = "main";
+	$act = e_QUERY;
-	}
+	$action = vartrue($act,'main');
+	
 	$var['main']['text'] = WMLAN_00;
 	$var['main']['link'] = e_SELF;
 	$var['create']['text'] = WMLAN_01;

e107_core/shortcodes/batch/admin_shortcodes.php

@@ -315,7 +315,7 @@ class admin_shortcodes
 					$active_uploads = $sql -> db_Count('upload', '(*)', 'WHERE upload_active = 0');
 					$submitted_news = $sql -> db_Count('submitnews', '(*)', 'WHERE submitnews_auth = 0');
 
-					$text = "<div class='left'><div style='padding-bottom: 2px;'>".E_16_NEWS.($submitted_news ? " <a href='".e_ADMIN."newspost.php?sn'>".ADLAN_LAT_2.": $submitted_news</a>" : ' '.ADLAN_LAT_2.': 0').'</div>';
+					$text = "<div class='left'><div style='padding-bottom: 2px;'>".E_16_NEWS.($submitted_news ? " <a href='".e_ADMIN."newspost.php?mode=sub&amp;action=list'>".ADLAN_LAT_2.": $submitted_news</a>" : ' '.ADLAN_LAT_2.': 0').'</div>';
 					$text .= "<div style='padding-bottom: 2px;'>".E_16_UPLOADS.($active_uploads ? " <a href='".e_ADMIN."upload.php'>".ADLAN_LAT_7.": $active_uploads</a>" : ' '.ADLAN_LAT_7.': '.$active_uploads).'</div>';
 
 					if(vartrue($pref['e_latest_list']))
@@ -815,6 +815,17 @@ class admin_shortcodes
 			$obj = e107::getDateConvert();
 			$install_date = $obj->convert_date($pref['install_date'], 'long');
 			
+			if(is_readable(THEME."theme.xml"))
+			{
+				$xml = e107::getXml();
+				$data = $xml->loadXMLfile(THEME."theme.xml",true);
+			
+				$themename = $data['@attributes']['name'];
+				$themeversion = $data['@attributes']['version'];
+				$themedate = $data['@attributes']['date'];
+				$themeauthor = $data['author']['@attributes']['name'];			
+			}
+			
 			$text = "<b>".FOOTLAN_1."</b>
 			<br />".
 			SITENAME."
@@ -886,7 +897,7 @@ class admin_shortcodes
 					$comments = $sql -> db_Count('comments');
 
 
-					$unver = ($unverified ? " <a href='".e_ADMIN."users.php?filter=unverified'>".ADLAN_111."</a>" : ADLAN_111);
+					$unver = ($unverified ? " <a href='".e_ADMIN."users.php?searchquery=&amp;filter_options=user_ban__2&amp;filter=unverified'>".ADLAN_111."</a>" : ADLAN_111);
 
 					$text = "
 					<div class='left'>
@@ -1223,12 +1234,15 @@ class admin_shortcodes
 		}
 
 		// MAIN LINK
-		$menu_vars = array();
+		if($parm != 'no-main')
-		$menu_vars['adminhome']['text'] = ADLAN_151;
+		{
-		$menu_vars['adminhome']['link'] = e_ADMIN_ABS.'admin.php';
+			$menu_vars = array();
-		$menu_vars['adminhome']['image'] = "<img src='".E_16_NAV_MAIN."' alt='".ADLAN_151."' class='icon S16' />";
+			$menu_vars['adminhome']['text'] = ADLAN_151;
-		$menu_vars['adminhome']['image_src'] = ADLAN_151;
+			$menu_vars['adminhome']['link'] = e_ADMIN_ABS.'admin.php';
-		$menu_vars['adminhome']['perm'] = '';
+			$menu_vars['adminhome']['image'] = "<img src='".E_16_NAV_MAIN."' alt='".ADLAN_151."' class='icon S16' />";
+			$menu_vars['adminhome']['image_src'] = ADLAN_151;
+			$menu_vars['adminhome']['perm'] = '';
+		}
 
 		//ALL OTHER ROOT LINKS - temporary data transformation - data structure will be changed in the future and this block will be removed
 

e107_handlers/form_handler.php

@@ -851,7 +851,7 @@ class e_form
 	{
 		$options = $this->format_options('radio', $name, $options);
 		$options['checked'] = $checked; //comes as separate argument just for convenience
-		$options['class'] = 'inline';
+		// $options['class'] = 'inline';	
 		return "<input type='radio' name='{$name}' value='".$value."'".$this->get_attributes($options, $name, $value)." />";
 
 	}
@@ -899,7 +899,7 @@ class e_form
 	function label($text, $name = '', $value = '')
 	{
 		$for_id = $this->_format_id('', $name, $value, 'for');
-		return "<label$for_id class='e-tip inline'>{$text}</label>";
+		return "<label$for_id class='e-tip '>{$text}</label>";
 	}
 	
 	function help($text)
@@ -1354,7 +1354,7 @@ class e_form
 				break;
 
 			case 'radio':
-				$def_options['class'] = 'radio';
+				$def_options['class'] = 'radio inline';
 				unset($def_options['size'], $def_options['selected']);
 				break;