Error fixes

e107_admin/image.php

@@ -596,6 +596,13 @@ class media_admin_ui extends e_admin_ui
 		$mes = e107::getMessage();
 		$sql = e107::getDb();
 		$tp = e107::getParser();
+		
+		if(!count($_POST['batch_selected']))
+		{
+			$mes->addError("Please check at least one image.");
+			return;
+		}
+		
 
 		foreach($_POST['batch_selected'] as $file)
 		{

e107_admin/prefs.php

@@ -805,13 +805,7 @@ $text .= "
 							<div class='smalltext field-help'>".PRFLAN_125."</div>
 						</td>
 					</tr>
-					<tr>
+					
-						<td class='label'>".PRFLAN_131.":</td>
-						<td class='control'>
-							".$e_userclass->uc_dropdown('php_bbcode', $pref['php_bbcode'], 'nobody,admin,main,classes', "tabindex='".$frm->getNext()."'")."
-							<div class='smalltext field-help'>".PRFLAN_132."</div>
-						</td>
-					</tr>
 ";
 
 if(file_exists(e_PLUGIN."geshi/geshi.php"))

e107_core/shortcodes/single/imageselector.php

@@ -94,15 +94,17 @@ function imageselector_shortcode($parm = '', $mod = '')
 			else
 			{
 				$icons = multiarray_sort($icons, 'fname');
-
+				
 				foreach ($icons as $icon)
 				{
-					$dir = str_replace($paths, "", $icon['path']);
+					$dir = str_replace($paths, "", $icon['path']); 
+					// echo "dir=".$icon['path'];
 
 					if (!$filter || ($filter && preg_match('~'.$filter.'~', $dir.$icon['fname'])))
 					{
 						$pth = $dir;
-						if($fullpath)
+						
+					//	if($fullpath) // returns nothing if fullpath is FALSE;
 						{
 							if(!vartrue($parms['media']))
 							{
@@ -110,6 +112,7 @@ function imageselector_shortcode($parm = '', $mod = '')
 								$_value = $pth.$icon['fname'];
 								$_label = $dir.$icon['fname'];
 								$selected = ($default == $_value || $pth.$default == $_value) ? " selected='selected'" : "";
+								
 							}
 							else
 							{

e107_handlers/db_verify_class.php

@@ -74,7 +74,7 @@ class db_verify
 			else
 			{
 				$message = str_replace("[x]",$filename,DBVLAN_22);
-		      	$emessage->add($message, E_MESSAGE_WARNING);
+		      	$mes->add($message, E_MESSAGE_WARNING);
 			}
 		}
 		

e107_handlers/form_handler.php

@@ -196,7 +196,7 @@ class e_form
 			parse_str($sc_parameters, $sc_parameters);
 		}
 
-/*		$qry = "SELECT * FROM `#core_media` WHERE media_userclass IN (".USERCLASS_LIST.") ";
+		$qry = "SELECT * FROM `#core_media` WHERE media_userclass IN (".USERCLASS_LIST.") ";
 		$qry .= vartrue($sc_parameters['media']) ? " AND media_category = '".$tp->toDB($sc_parameters['media'])."' " : " AND `media_category` NOT REGEXP '_icon_16|_icon_32|_icon_48|_icon_64' ";
 		$qry .= "ORDER BY media_name";
 
@@ -241,30 +241,9 @@ class e_form
 			$ret .= "<img src='{$thpath}' alt='{$default_url}' class='image-selector' /></a>";
 			$ret .= "</div>\n";
 			return $ret;
-		}*/
+		}
 		// ----------------
 
-
-		if(!$label) $label = LAN_SELECT;
-		$parms = "name={$name}";
-		$parms .= '&media='.varset($sc_parameters['media']);
-		$parms .= "&path=".rawurlencode(e107::getParser()->replaceConstants(vartrue($sc_parameters['path'], '{e_MEDIA}images/|{e_MEDIA}temp/')));
-		$parms .= "&filter=0";
-		$parms .= "&fullpath=1";
-		$parms .= "&default=".rawurlencode($default);
-		$parms .= "&multiple=FALSE";
-		$parms .= "&label=-- ".$label." --";
-		$parms .= "&subdirs=".varset($sc_parameters['subdirs'], 10);
-		$parms .= '&width='.vartrue($sc_parameters['width'], 150);
-		if(vartrue($sc_parameters['height'])) $parms .= '&height='.$sc_parameters['height'].'px';
-		//$parms .= "&tabindex=".$this->getNext();
-		//$parms .= "&click_target=data";
-		//$parms .= "&click_prefix=[img][[e_IMAGE]]newspost_images/";
-		//$parms .= "&click_postfix=[/img]";
-
-		$ret = "<div class='field-section'>".$tp->parseTemplate("{IMAGESELECTOR={$parms}&scaction=select}")."</div>";
-		$ret .= "<div class='field-spacer'>".$tp->parseTemplate("{IMAGESELECTOR={$parms}&scaction=preview}")."</div>";
-		return $ret;
 	}
 
 	/**
@@ -1337,6 +1316,7 @@ class e_form
 
 			case 'dropdown':
 				// XXX - should we use readParams at all here? see writeParms check below
+			
 				if($parms && is_array($parms)) // FIXME - add support for multi-level arrays (option groups)
 				{
 					$value = vartrue($parms['pre']).vartrue($parms[$value]).vartrue($parms['post']);

e107_handlers/secure_img_handler.php

@@ -75,7 +75,7 @@ class secure_image
 			$row = $sql->db_Fetch();
 			$sql->db_Delete("tmp", "tmp_ip = '".$tp -> toDB($rec_num)."'");
 			//list($code, $path) = explode(",", $row['tmp_info']);
-			$code = intval($row['tmp_ip']);
+			$code = intval($row['tmp_info']);
 			return ($checkstr == $code);
 		}
 		return FALSE;
@@ -144,13 +144,13 @@ class secure_image
 			*/
 			$bg_file = $secureimg['image'];
 
-			if(!is_readable(e_IMAGE.$secureimg['font']))
+			if(!is_readable($path.$secureimg['font']))
 			{
 				echo "Font missing"; // for debug only. translation not necessary.
 				exit;
 			}
 
-			if(!is_readable(e_IMAGE.$secureimg['image'].$ext))
+			if(!is_readable($path.$secureimg['image'].$ext))
 			{
 				echo "Missing Background-Image: ".$secureimg['image'].$ext; // for debug only. translation not necessary.
 				exit;

e107_plugins/user_menu/usertheme_menu_config.php

@@ -118,7 +118,9 @@ $text .= "
 	</fieldset>
 	</form>
 	";
-$ns->tablerender(LAN_UMENU_THEME_6, $text);
+	$mes = e107::getMessage();
+	
+$ns->tablerender(LAN_UMENU_THEME_6,$mes->render().$text);
 	
 require_once(e_ADMIN."footer.php");