Added more custom field tests.

e107_handlers/e_customfields_class.php

@@ -29,10 +29,10 @@
 		private $_tab_default = 'additional';
 
 
-		function __construct()
+		public function __construct()
 		{
 			asort($this->_fieldTypes);
-			$this->_tab = array($this->_tab_default => "Additional");
+			$this->_tab = array($this->_tab_default => 'Additional');
 
 		}
 
@@ -145,112 +145,125 @@
 
 			switch($fieldType)
 			{
-				case "dropdown":
+				case 'dropdown':
-				case "checkboxes":
+				case 'checkboxes':
-				case "radio":
+				case 'radio':
-					return ($raw) ? $value : e107::getForm()->renderValue($key,$value,$this->_config[$key]);
+					$ret = ($raw) ? $value : e107::getForm()->renderValue($key,$value,$this->_config[$key]);
 				break;
 
-				case "video":
+				case 'video':
 
 					if(empty($value))
 					{
-						return null;
+						$ret = null;
+					}
+					else
+					{
+						$ret = ($raw) ? 'https://www.youtube.com/watch?v='.str_replace('.youtube', '', $value) : $tp->toVideo($value);
 					}
-
-					return ($raw) ? 'https://www.youtube.com/watch?v='.str_replace(".youtube", '', $value) : $tp->toVideo($value);
 				break;
 
 
 
-				case "image":
+				case 'image':
-					return ($raw) ? $tp->thumbUrl($value,$parm) : $tp->toImage($value,$parm);
+					$ret = ($raw) ? $tp->thumbUrl($value,$parm) : $tp->toImage($value,$parm);
 					break;
 
-				case "icon":
+				case 'icon':
-					return ($raw) ? str_replace(".glyph", '', $value) : $tp->toIcon($value);
+					$ret = ($raw) ? str_replace('.glyph', '', $value) : $tp->toIcon($value);
 					break;
 
-				case "country":
+				case 'country':
-					return ($raw) ? $value : e107::getForm()->getCountry($value);
+					$ret = ($raw) ? $value : e107::getForm()->getCountry($value);
 					break;
 
-				case "tags":
+				case 'tags':
-					return ($raw) ? $value : $tp->toLabel($value,$type);
+					$ret = ($raw) ? $value : $tp->toLabel($value,$type);
 					break;
 
-				case "lanlist":
+				case 'lanlist':
-				case "language":
+				case 'language':
-					return ($raw) ? $value : e107::getLanguage()->convert($value);
+					$ret = ($raw) ? $value : e107::getLanguage()->convert($value);
 					break;
 
-				case "datestamp":
+				case 'datestamp':
-					return ($raw) ? $value : $tp->toDate($value);
+					$ret = ($raw) ? $value : $tp->toDate($value);
 					break;
 
-				case "file":
+				case 'file':
 					if(empty($value))
 					{
-						return null; 
+						$ret = null;
+					}
+					else
+					{
+						$ret = ($raw) ? $tp->toFile($value, array('raw'=>1)) : $tp->toFile($value);
 					}
-					return ($raw) ? $tp->toFile($value, array('raw'=>1)) : $tp->toFile($value);
 					break;
 
-				case "url":
+				case 'url':
-				case "email":
+				case 'email':
-					return ($raw) ? $value : $tp->toHTML($value);
+					$ret = ($raw) ? $value : $tp->toHTML($value);
 					break;
 
-				case "user":
+				case 'user':
-					return ($raw) ? $value : e107::getSystemUser($value,true)->getName();
+					$ret = ($raw) ? $value : e107::getSystemUser($value,true)->getName();
 					break;
 
-				case "userclass":
+				case 'userclass':
-					return ($raw) ? $value : e107::getUserClass()->getName($value);
+					$ret = ($raw) ? $value : e107::getUserClass()->getName($value);
 					break;
 
-				case "progressbar":
+				case 'progressbar':
 					if($raw)
 					{
-						return (strpos($value, '/') === false) ? $value.'%' : $value;
+						$ret = (strpos($value, '/') === false) ? $value.'%' : $value;
+					}
+					else
+					{
+						$ret = e107::getForm()->progressBar($key,$value,$this->_config[$key]);
 					}
 
-					return e107::getForm()->progressBar($key,$value,$this->_config[$key]);
 					break;
 
-				case "textarea":
+				case 'textarea':
-				case "bbarea":
+				case 'bbarea':
-					return $tp->toHTML($value, true, "BODY");
+					$ret = $tp->toHTML($value, true, 'BODY');
 					break;
 
 
-				case "boolean":
+				case 'boolean':
 					if($raw)
 					{
 						return $value;
 					}
-
+					else
-					return empty($value) ? $tp->toGlyph('fa-times') : $tp->toGlyph('fa-check');
+					{
+						$ret = empty($value) ? $tp->toGlyph('fa-times') : $tp->toGlyph('fa-check');
+					}
 					break;
 
-				case "checkbox":
+				case 'checkbox':
 					if($raw)
 					{
-						return $value;
+						$ret = $value;
 					}
-
+					elseif(is_numeric($value))
-					if(is_numeric($value))
 					{
-						return empty($value) ? $tp->toGlyph('fa-times') : $tp->toGlyph('fa-check');
+						$ret = empty($value) ? $tp->toGlyph('fa-times') : $tp->toGlyph('fa-check');
+					}
+					else
+					{
+						$ret = $value;
 					}
-
-					return $value;
 					break;
 
 				default:
-					return $tp->toHTML($value);
+					$ret = $tp->toHTML($value);
 			}
 
+
+			return $ret;
 		}
 
 
@@ -263,10 +276,10 @@
 			foreach($this->_data as $ok=>$v)
 			{
 
-				$text .= "<tr><td>".$ok."</td><td>".$this->getFieldTitle($ok)."</td><td>".$this->getFieldValue($ok)."</td><td>".$this->getFieldValue($ok, array('mode'=>'raw'))."</td></tr>";
+				$text .= '<tr><td>' .$ok. '</td><td>' .$this->getFieldTitle($ok). '</td><td>' .$this->getFieldValue($ok). '</td><td>' .$this->getFieldValue($ok, array('mode' =>'raw')). '</td></tr>';
 			}
 
-			$text .= "</table>";
+			$text .= '</table>';
 
 			return $text;
 
@@ -310,7 +323,7 @@
 
 			$text = "
 			<div class='form-group'>
-				".$frm->text('__e_customfields_tabs__', $this->_tab[$this->_tab_default], 30, array('placeholder'=>"Tab label",'size'=>'medium', 'required'=>1))."
+				".$frm->text('__e_customfields_tabs__', $this->_tab[$this->_tab_default], 30, array('placeholder' => 'Tab label', 'size' =>'medium', 'required' =>1))."
 			</div>
 			<table class='table table-striped table-bordered'>
 			<colgroup>
@@ -320,8 +333,8 @@
 				<col style='width:40%' />
 			</colgroup>
 			<tbody>
-				<tr><th>".LAN_NAME."</th><th>".LAN_TITLE."</th><th>".LAN_TYPE."</th><th>Params</th><th>".LAN_TOOLTIP."</th></tr>
+				<tr><th>".LAN_NAME. '</th><th>' .LAN_TITLE. '</th><th>' .LAN_TYPE. '</th><th>Params</th><th>' .LAN_TOOLTIP. '</th></tr>
-				";
+				';
 
 			for($i = 0; $i <= $this->_field_limit; $i++)
 			{
@@ -343,10 +356,10 @@
 				$fieldType = $frm->select($name . '[' . $i . '][type]', $this->getFieldTypes(), varset($value[$i]['type']), $writeParms);
 				$fieldParms = $frm->text($name . '[' . $i . '][writeParms]', varset($value[$i]['writeParms']), 255, $parmsWriteParms);
 				$fieldHelp = $frm->text($name . '[' . $i . '][help]', varset($value[$i]['help']), 255, array('size' => 'block-level'));
-				$text .= "<tr><td>" . $fieldName . "</td><td>" . $fieldTitle . "</td><td>" . $fieldType . "</td><td>" . $fieldParms . "</td><td>" . $fieldHelp . "</td></tr>";
+				$text .= '<tr><td>' . $fieldName . '</td><td>' . $fieldTitle . '</td><td>' . $fieldType . '</td><td>' . $fieldParms . '</td><td>' . $fieldHelp . '</td></tr>';
 			}
 
-			$text .= "</tbody></table>";
+			$text .= '</tbody></table>';
 
 
 			return $text;
@@ -362,13 +375,13 @@
 		{
 			switch($type)
 			{
-				case "radio":
+				case 'radio':
-				case "dropdown":
+				case 'dropdown':
-				case "checkboxes":
+				case 'checkboxes':
 					return 'eg. { "optArray": { "blue": "Blue", "green": "Green", "red": "Red" }, "default": "blank" }';
 					break;
 
-				case "datestamp":
+				case 'datestamp':
 					return 'eg. (Optional) { "format": "yyyy-mm-dd" }';
 				break;
 
@@ -405,7 +418,7 @@
 
 				if($fld['type'] === 'icon')
 				{
-					$fld['writeParms'] .= "&glyphs=1";
+					$fld['writeParms'] .= '&glyphs=1';
 				}
 
 				if($fld['type'] === 'checkboxes')
@@ -525,7 +538,7 @@
 			{
 				if(substr($k,0,$len) === $fieldname)
 				{
-					list($tmp,$newkey) = explode("__",$k);
+					list($tmp,$newkey) = explode('__',$k);
 					$new_data[$fieldname][$newkey] = $v;
 					unset($new_data[$k]);
 

e107_handlers/resize_handler.php

@@ -32,7 +32,14 @@ function mimeFromFilename($fileName)
 	return "Content-type: image/".$mimeTypes[$fileExt];
 }
 
-
+/**
+ * @deprecated To be replaced with e107::getMedia()->resizeImage();
+ * @param string $source_file
+ * @param string $destination_file
+ * @param string $type
+ * @param string $model
+ * @return bool
+ */
 function resize_image($source_file, $destination_file, $type = "upload", $model = "") 
 {
 // $destination_file - 'stdout' sends direct to browser. Otherwise treated as file name	

e107_tests/tests/unit/e_customfieldsTest.php

@@ -225,6 +225,58 @@
 			  20 => 'Progress Bar',
 			);
 			
+		$expectedValues = array (
+		  'image'       => '<img class="img-responsive img-fluid"',
+		  'video'       => '<div class="embed-responsive embed-responsive-16by9',
+		  'bbarea'      => '<!-- bbcode-html-start --><p><b>Rich text.</b></p><!-- bbcode-html-end -->',
+		  'boolean'     => '<i class',
+		  'checkboxes'  => 'Boat, Plane',
+		  'country'     => 'Andorra',
+		  'datestamp'   => '<span>13 Jan 2017 : 00:35</span>',
+		  'dropdown'    => 'Red',
+		  'email'       => 'my@email.com',
+		  'file'        => '<a href=',
+		  'icon'        => '<i class=',
+		  'language'    => 'French',
+		  'lanlist'     => 'English',
+		  'number'      => '0',
+		  'password'    => 'a8f5f167f44f4964e6c998dee827110c',
+		  'tags'        => "<span class='label label-default'",
+		  'textarea'    => 'Plain text',
+		  'url'         => 'http://something.com',
+		  'user'        => 'e107',
+		  'userclass'   => 'Everyone (public)',
+		  'progressbar' => "<div  class='progress",
+
+		);	
+
+		$expectedRawValues = array (
+		  'image'       => 'thumb.php?src=',
+		  'video'       => 'https://www.youtube.com/watch?v=WcuRPzB4RNc',
+		  'bbarea'      => '<!-- bbcode-html-start --><p><b>Rich text.</b></p><!-- bbcode-html-end -->',
+		  'boolean'     => '1',
+		  'checkboxes'  => 'boat,plane',
+		  'country'     => 'ad',
+		  'datestamp'   => '1484267751',
+		  'dropdown'    => 'red',
+		  'email'       => 'my@email.com',
+		  'file'        => 'e107_banners.zip',
+		  'icon'        => 'fa-check',
+		  'language'    => 'fr',
+		  'lanlist'     => 'en',
+		  'number'      => '0',
+		  'password'    => 'a8f5f167f44f4964e6c998dee827110c',
+		  'tags'        => 'tag1,tag2,tag3',
+		  'textarea'    => 'Plain text',
+		  'url'         => 'http://something.com',
+		  'user'        => '1',
+		  'userclass'   => '0',
+		  'progressbar' => '75%',
+
+		);
+
+
+		$export = array();
 			foreach($data as $ok=>$v)
 			{
 
@@ -232,17 +284,14 @@
 			//	echo ($title)."\n";
 				$value = $this->cf->getFieldValue($ok);
 				$valueRaw = $this->cf->getFieldValue($ok, array('mode'=>'raw'));
+
+				$this->assertStringStartsWith($expectedValues[$ok], $value);
+				$this->assertStringContainsString($expectedRawValues[$ok], $valueRaw);
 			}
 
 			// check titles.
 			$this->assertEquals($titlesExpected,$titles);
 
-			//@todo more tests for value and valueRaw. 
-
-
-
-
-
 		}