PHP 7.1 fixes. Fix for broken category icons after upgrade. Fix for news thumbnail preview.

e107_admin/meta.php

@@ -66,6 +66,7 @@ $meta_keywords 	= vartrue($pref['meta_keywords']);
 $meta_copyright = vartrue($pref['meta_copyright']);
 $meta_author 	= vartrue($pref['meta_author']);
 
+
 $text = "
 	<form method='post' action='".e_SELF."' id='dataform'>
 		<fieldset id='core-meta-settings'>
@@ -79,14 +80,14 @@ $text = "
 					<tr>
 						<td>".LAN_DESCRIPTION."</td>
 						<td>";
-						$text .= $frm->textarea('meta_description',$tp->toForm(varset($meta_diz[e_LANGUAGE])),3,80, array('size'=>'xxlarge'));
+						$text .= $frm->textarea('meta_description',$tp->toForm($meta_diz[e_LANGUAGE]),3,80, array('size'=>'xxlarge'));
 					//	$text .= "<textarea class='tbox textarea e-autoheight' id='meta_description' name='meta_description' cols='70' rows='4'>".$tp->toForm(varset($meta_diz[e_LANGUAGE]))."</textarea>";
 						$text .= "</td>
 					</tr>
 					<tr>
 						<td>".LAN_KEYWORDS."</td>
 						<td>";
-						$text .= $frm->tags('meta_keywords',$tp->toForm(varset($meta_keywords[e_LANGUAGE])));
+						$text .= $frm->tags('meta_keywords',$tp->toForm($meta_keywords[e_LANGUAGE]));
 					//	$text .= "<textarea class='tbox textarea e-autoheight' id='meta_keywords' name='meta_keywords' cols='70' rows='4'>".$tp->toForm(varset($meta_keywords[e_LANGUAGE]))."</textarea>";
 						
 						$text .= "</td>
@@ -104,7 +105,7 @@ $text = "
 					<tr>
 						<td>".METLAN_1."</td>
 						<td>";
-						$text .= $frm->textarea('meta',str_replace("<","&lt;",$tp->toForm(varset($meta[e_LANGUAGE]))),5,100,'size=block-level');
+						$text .= $frm->textarea('meta',str_replace("<","&lt;",$tp->toForm($meta[e_LANGUAGE])),5,100,'size=block-level');
 						
 						$text .= "<span class='field-help'>".METLAN_2."</span>";
 						

e107_admin/newspost.php

@@ -1598,7 +1598,7 @@ class news_form_ui extends e_admin_form_ui
 			$url = e107::getParser()->thumbUrl($curval,'aw=80');
 			$link = e107::getParser()->replaceConstants($curval);
 
-			return "<a class='e-dialog' href='{$link}'><img src='{$url}' alt='{$curval}' /></a>";
+			return "<a class='e-modal' href='{$link}'><img src='{$url}' alt='".basename($curval)."' /></a>";
 		}
 
 

e107_handlers/admin_ui.php

@@ -1892,8 +1892,13 @@ class e_admin_controller
 	 * @param string $title
 	 * @return e_admin_controller
 	 */
-	public function addMetaTitle($title)
+	public function addMetaTitle($title=null)
 	{
+		if($title === null)
+		{
+			return $this;
+		}
+
 		$this->getResponse()->addMetaTitle($title);
 		return $this;
 	}
@@ -1905,8 +1910,13 @@ class e_admin_controller
 	 * @param string $content
 	 * @return e_admin_controller
 	 */
-	public function addHeader($content)
+	public function addHeader($content=null)
 	{
+		if($content === null)
+		{
+			return $this;
+		}
+
 		$this->getResponse()->addHeaderContent(vartrue($content));
 		return $this;
 	}
@@ -3537,7 +3547,7 @@ class e_admin_controller_ui extends e_admin_controller
 
 	function getJoinField($field)
 	{
-		return vartrue($this->joinField[$field],false);	
+		return isset($this->joinField[$field]) ? $this->joinField[$field] : false; // vartrue($this->joinField[$field],false);
 	}
 
 	/**
@@ -3831,13 +3841,13 @@ class e_admin_controller_ui extends e_admin_controller
 		foreach($this->getFields() as $key => $var)
 		{
 			// disabled or system
-			if((vartrue($var['nolist']) && !vartrue($var['filter'])) || !vartrue($var['type']))
+			if((!empty($var['nolist']) && empty($var['filter'])) || empty($var['type']))
 			{
 				continue;
 			}
 
 			// select FROM... for main table
-			if(vartrue($var['alias']) && vartrue($var['__tableField']))
+			if(!empty($var['alias']) && !empty($var['__tableField']))
 			{
 				$tableSFieldsArr[] = $var['__tableField'];
 			}

e107_handlers/e_parse_class.php

@@ -3841,6 +3841,9 @@ class e_parser
 			return null;
 		}
 
+			e107::getDebug()->log($file);
+		e107::getDebug()->log($parm);
+
 
 		if(strpos($file,'e_MEDIA')!==false || strpos($file,'e_THEME')!==false || strpos($file,'e_PLUGIN')!==false) //v2.x path.
 		{

e107_handlers/form_handler.php

@@ -854,6 +854,7 @@ class e_form
 
 
 		$options['media'] = '_icon';
+		$options['legacyPath'] = "{e_IMAGE}icons";
 		
 		return $this->imagepicker($name, $default, $label, $options);
 		
@@ -3859,9 +3860,11 @@ e107::getDebug()->log($sc_parameters);
 			if(!is_array($attributes['readParms'])) parse_str($attributes['readParms'], $attributes['readParms']);
 			$parms = $attributes['readParms'];
 		}
+
+
 	
-		if(vartrue($attributes['inline'])) $parms['editable'] = true; // attribute alias
+		if(!empty($attributes['inline'])) $parms['editable'] = true; // attribute alias
-		if(vartrue($attributes['sort'])) $parms['sort'] = true; // attribute alias
+		if(!empty($attributes['sort'])) $parms['sort'] = true; // attribute alias
 		
 		if(!empty($parms['type'])) // Allow the use of a different type in readMode. eg. type=method.
 		{
@@ -3875,7 +3878,7 @@ e107::getDebug()->log($sc_parameters);
 		{
 			case 'options':
 				
-				if(varset($attributes['type']) == "method") // Allow override with 'options' function.
+				if(!empty($attributes['type']) && ($attributes['type'] == "method")) // Allow override with 'options' function.
 				{
 					$attributes['mode'] = "read";
 					if(isset($attributes['method']) && $attributes['method'] && method_exists($this, $attributes['method']))
@@ -3899,7 +3902,7 @@ e107::getDebug()->log($sc_parameters);
 					
 					$value = "<div class='btn-group'>";
 					
-					if(vartrue($parms['sort']))//FIXME use a global variable such as $fieldpref
+					if(!empty($parms['sort']))//FIXME use a global variable such as $fieldpref
 					{
 						$mode = preg_replace('/[^\w]/', '', vartrue($_GET['mode'], ''));
 						$from = intval(vartrue($_GET['from'],0));
@@ -3940,7 +3943,7 @@ e107::getDebug()->log($sc_parameters);
 						".deftrue('ADMIN_EDIT_ICON', $tp->toGlyph('fa-edit'))."</a>";
 					}
 
-					$delcls = vartrue($attributes['noConfirm']) ? ' no-confirm' : '';
+					$delcls = !empty($attributes['noConfirm']) ? ' no-confirm' : '';
 					if(varset($parms['deleteClass']) && varset($parms['delete'],1) == 1)
 					{
 						$cls = (deftrue($parms['deleteClass'])) ? constant($parms['deleteClass']) : $parms['deleteClass'];
@@ -4374,6 +4377,8 @@ e107::getDebug()->log($sc_parameters);
 						return e107::getParser()->toGlyph('fa-file','size=2x');
 				//		return '<img src="'.$src.'" alt="'.$value.'" class="e-thumb" title="'.$value.'" />';
 					}
+
+
 					
 					if(vartrue($parms['thumb']))
 					{
@@ -4417,10 +4422,9 @@ e107::getDebug()->log($sc_parameters);
 						$thparms['alt'] = $alt;
 						$thparms['class'] = "thumbnail e-thumb";
 
-						$ttl = $tp->toImage(vartrue($parms['pre']).$value, $thparms);
+						$ttl = $tp->toImage($value, $thparms);
+
 
-						e107::getDebug()->log($value);
-						e107::getDebug()->log($thparms);
 
 						$value = '<a href="'.$src.'" data-modal-caption="'.$alt.'" data-target="#uiModal" class="e-modal e-image-preview" title="'.$alt.'" rel="external">'.$ttl.'</a>';
 					}
@@ -5695,7 +5699,7 @@ e107::getDebug()->log($sc_parameters);
 			if('hidden' === $att['type'])
 			{
 				
-				if(!vartrue($writeParms['show']))
+				if(empty($writeParms['show']))
 				{
 					$hidden_fields[] = $this->renderElement($keyName, $model->getIfPosted($valPath), $att, varset($model_required[$key], array()));
 
@@ -5742,8 +5746,8 @@ e107::getDebug()->log($sc_parameters);
 				 
 				$leftCell = $required."<span{$required_class}>".defset(vartrue($att['title']), vartrue($att['title']))."</span>".$label;
 				$rightCell = $this->renderElement($keyName, $model->getIfPosted($valPath), $att, varset($model_required[$key], array()), $model->getId())." {$help}";
-				 
+
-				if(vartrue($att['type']) == 'bbarea' || varset($writeParms['nolabel']) == true)
+				if(vartrue($att['type']) == 'bbarea' || !empty($writeParms['nolabel']))
 				{
 					$text .= "
 					<tr><td colspan='2'>";