Inspection of "Bring everything back up one level" - mambax7/smartobject - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — master (2d4977)

by Michael

created 2016-04-01 10:56 UTC

Switch Indentation +298 added lines, -298 removed lines patch added patch discarded remove patch

@@ -648,93 +648,93 @@  discard block
 block discarded – undo
             } else {
                 $cleanv = is_string($cleanv) ? trim($cleanv) : $cleanv;
                 switch ($v['data_type']) {
-                case XOBJ_DTYPE_TXTBOX:
-                    if ($v['required'] && $cleanv != '0' && $cleanv == '') {
-                        $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
-                        continue;
-                    }
-                    if (isset($v['maxlength']) && strlen($cleanv) > intval($v['maxlength'])) {
-                        $this->setErrors( sprintf( _XOBJ_ERR_SHORTERTHAN, $k, intval( $v['maxlength'] ) ) );
-                        continue;
-                    }
-                    if (!$v['not_gpc']) {
-                        $cleanv = $ts->stripSlashesGPC($ts->censorString($cleanv));
-                    } else {
-                        $cleanv = $ts->censorString($cleanv);
-                    }
-                    break;
-                case XOBJ_DTYPE_TXTAREA:
-                    if ($v['required'] && $cleanv != '0' && $cleanv == '') {
-                        $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
-                        continue;
-                    }
-                    if (!$v['not_gpc']) {
-                        $cleanv = $ts->stripSlashesGPC($ts->censorString($cleanv));
-                    } else {
-                        $cleanv = $ts->censorString($cleanv);
-                    }
-                    break;
-                case XOBJ_DTYPE_SOURCE:
-                    if (!$v['not_gpc']) {
-                        $cleanv = $ts->stripSlashesGPC($cleanv);
-                    } else {
-                        $cleanv = $cleanv;
-                    }
-                    break;
-                case XOBJ_DTYPE_INT:
-                case XOBJ_DTYPE_TIME_ONLY:
-                    $cleanv = intval($cleanv);
-                    break;
-
-                case XOBJ_DTYPE_CURRENCY:
-                    $cleanv = smart_currency($cleanv);
-                    break;
-
-                case XOBJ_DTYPE_FLOAT:
-                    $cleanv = smart_float($cleanv);
-                    break;
-
-                case XOBJ_DTYPE_EMAIL:
-                    if ($v['required'] && $cleanv == '') {
-                        $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
-                        continue;
-                    }
-                    if ($cleanv != '' && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$cleanv)) {
-                        $this->setErrors("Invalid Email");
-                        continue;
-                    }
-                    if (!$v['not_gpc']) {
-                        $cleanv = $ts->stripSlashesGPC($cleanv);
-                    }
-                    break;
-                case XOBJ_DTYPE_URL:
-                    if ($v['required'] && $cleanv == '') {
-                        $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
-                        continue;
-                    }
-                    if ($cleanv != '' && !preg_match("/^http[s]*:\/\//i", $cleanv)) {
-                        $cleanv = 'http://' . $cleanv;
-                    }
-                    if (!$v['not_gpc']) {
-                        $cleanv =& $ts->stripSlashesGPC($cleanv);
-                    }
-                    break;
-                case XOBJ_DTYPE_SIMPLE_ARRAY:
-                    $cleanv = implode('|', $cleanv);
-                    break;
-                case XOBJ_DTYPE_ARRAY:
-                    $cleanv = serialize($cleanv);
-                    break;
-                case XOBJ_DTYPE_STIME:
-                case XOBJ_DTYPE_MTIME:
-                case XOBJ_DTYPE_LTIME:
-                    $cleanv = !is_string($cleanv) ? intval($cleanv) : strtotime($cleanv);
-                    if (!($cleanv > 0)) {
-                    	$cleanv = strtotime($cleanv);
-                    }
-                    break;
-                default:
-                    break;
+                	case XOBJ_DTYPE_TXTBOX:
+                    	if ($v['required'] && $cleanv != '0' && $cleanv == '') {
+                        	$this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
+                        	continue;
+                    	}
+                    	if (isset($v['maxlength']) && strlen($cleanv) > intval($v['maxlength'])) {
+                        	$this->setErrors( sprintf( _XOBJ_ERR_SHORTERTHAN, $k, intval( $v['maxlength'] ) ) );
+                        	continue;
+                    	}
+                    	if (!$v['not_gpc']) {
+                        	$cleanv = $ts->stripSlashesGPC($ts->censorString($cleanv));
+                    	} else {
+                        	$cleanv = $ts->censorString($cleanv);
+                    	}
+                    	break;
+                	case XOBJ_DTYPE_TXTAREA:
+                    	if ($v['required'] && $cleanv != '0' && $cleanv == '') {
+                        	$this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
+                        	continue;
+                    	}
+                    	if (!$v['not_gpc']) {
+                        	$cleanv = $ts->stripSlashesGPC($ts->censorString($cleanv));
+                    	} else {
+                        	$cleanv = $ts->censorString($cleanv);
+                    	}
+                    	break;
+                	case XOBJ_DTYPE_SOURCE:
+                    	if (!$v['not_gpc']) {
+                        	$cleanv = $ts->stripSlashesGPC($cleanv);
+                    	} else {
+                        	$cleanv = $cleanv;
+                    	}
+                    	break;
+                	case XOBJ_DTYPE_INT:
+                	case XOBJ_DTYPE_TIME_ONLY:
+                    	$cleanv = intval($cleanv);
+                    	break;
+
+                	case XOBJ_DTYPE_CURRENCY:
+                    	$cleanv = smart_currency($cleanv);
+                    	break;
+
+                	case XOBJ_DTYPE_FLOAT:
+                    	$cleanv = smart_float($cleanv);
+                    	break;
+
+                	case XOBJ_DTYPE_EMAIL:
+                    	if ($v['required'] && $cleanv == '') {
+                        	$this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
+                        	continue;
+                    	}
+                    	if ($cleanv != '' && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$cleanv)) {
+                        	$this->setErrors("Invalid Email");
+                        	continue;
+                    	}
+                    	if (!$v['not_gpc']) {
+                        	$cleanv = $ts->stripSlashesGPC($cleanv);
+                    	}
+                    	break;
+                	case XOBJ_DTYPE_URL:
+                    	if ($v['required'] && $cleanv == '') {
+                        	$this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
+                        	continue;
+                    	}
+                    	if ($cleanv != '' && !preg_match("/^http[s]*:\/\//i", $cleanv)) {
+                        	$cleanv = 'http://' . $cleanv;
+                    	}
+                    	if (!$v['not_gpc']) {
+                        	$cleanv =& $ts->stripSlashesGPC($cleanv);
+                    	}
+                    	break;
+                	case XOBJ_DTYPE_SIMPLE_ARRAY:
+                    	$cleanv = implode('|', $cleanv);
+                    	break;
+                	case XOBJ_DTYPE_ARRAY:
+                    	$cleanv = serialize($cleanv);
+                    	break;
+                	case XOBJ_DTYPE_STIME:
+                	case XOBJ_DTYPE_MTIME:
+                	case XOBJ_DTYPE_LTIME:
+                    	$cleanv = !is_string($cleanv) ? intval($cleanv) : strtotime($cleanv);
+                    	if (!($cleanv > 0)) {
+                    		$cleanv = strtotime($cleanv);
+                    	}
+                    	break;
+                	default:
+                    	break;
                 }
             }
             $this->cleanVars[$k] =& $cleanv;
@@ -769,236 +769,236 @@  discard block
 block discarded – undo
 
         switch ($this->vars[$key]['data_type']) {
 
-        case XOBJ_DTYPE_TXTBOX:
-            switch (strtolower($format)) {
-            case 's':
-            case 'show':
-            	// ML Hack by marcan
-                $ts =& MyTextSanitizer::getInstance();
-                $ret = $ts->htmlSpecialChars($ret);
-
-                if (method_exists($myts, 'formatForML')) {
-                	return $ts->formatForML($ret);
-                } else {
-                	return $ret;
-                }
-            	break 1;
-            	// End of ML Hack by marcan
-
-            case 'clean':
-				$ts =& MyTextSanitizer::getInstance();
-
-				$ret = smart_html2text($ret);
-				$ret = smart_purifyText($ret);
-
-                if (method_exists($myts, 'formatForML')) {
-                	return $ts->formatForML($ret);
-                } else {
-                	return $ret;
-                }
-            	break 1;
-            	// End of ML Hack by marcan
-
-            case 'e':
-            case 'edit':
-                $ts =& MyTextSanitizer::getInstance();
-                return $ts->htmlSpecialChars($ret);
-                break 1;
-            case 'p':
-            case 'preview':
-            case 'f':
-            case 'formpreview':
-                $ts =& MyTextSanitizer::getInstance();
-                return $ts->htmlSpecialChars($ts->stripSlashesGPC($ret));
-                break 1;
-            case 'n':
-            case 'none':
-            default:
-                break 1;
-            }
+        	case XOBJ_DTYPE_TXTBOX:
+            	switch (strtolower($format)) {
+            		case 's':
+            		case 'show':
+            			// ML Hack by marcan
+                		$ts =& MyTextSanitizer::getInstance();
+                		$ret = $ts->htmlSpecialChars($ret);
+
+                		if (method_exists($myts, 'formatForML')) {
+                			return $ts->formatForML($ret);
+                		} else {
+                			return $ret;
+                		}
+            			break 1;
+            			// End of ML Hack by marcan
+
+            		case 'clean':
+						$ts =& MyTextSanitizer::getInstance();
+
+						$ret = smart_html2text($ret);
+						$ret = smart_purifyText($ret);
+
+                		if (method_exists($myts, 'formatForML')) {
+                			return $ts->formatForML($ret);
+                		} else {
+                			return $ret;
+                		}
+            			break 1;
+            			// End of ML Hack by marcan
+
+            		case 'e':
+            		case 'edit':
+                		$ts =& MyTextSanitizer::getInstance();
+                		return $ts->htmlSpecialChars($ret);
+                		break 1;
+            		case 'p':
+            		case 'preview':
+            		case 'f':
+            		case 'formpreview':
+                		$ts =& MyTextSanitizer::getInstance();
+                		return $ts->htmlSpecialChars($ts->stripSlashesGPC($ret));
+                		break 1;
+            		case 'n':
+            		case 'none':
+            		default:
+                		break 1;
+            	}
             break;
-        case XOBJ_DTYPE_LTIME:
-            switch (strtolower($format)) {
-            case 's':
-            case 'show':
-            case 'p':
-            case 'preview':
-            case 'f':
-            case 'formpreview':
-                $ret = formatTimestamp($ret, _DATESTRING);
-                return $ret;
-            	break 1;
-            case 'n':
-            case 'none':
-            case 'e':
-            case 'edit':
-                break 1;
-            default:
-                break 1;
-            }
+        	case XOBJ_DTYPE_LTIME:
+            	switch (strtolower($format)) {
+            		case 's':
+            		case 'show':
+            		case 'p':
+            		case 'preview':
+            		case 'f':
+            		case 'formpreview':
+                		$ret = formatTimestamp($ret, _DATESTRING);
+                		return $ret;
+            			break 1;
+            		case 'n':
+            		case 'none':
+            		case 'e':
+            		case 'edit':
+                		break 1;
+            		default:
+                		break 1;
+            	}
             break;
-        case XOBJ_DTYPE_STIME:
-            switch (strtolower($format)) {
-            case 's':
-            case 'show':
-            case 'p':
-            case 'preview':
-            case 'f':
-            case 'formpreview':
-                $ret = formatTimestamp($ret, _SHORTDATESTRING);
-                return $ret;
-            	break 1;
-            case 'n':
-            case 'none':
-            case 'e':
-            case 'edit':
-                break 1;
-            default:
-                break 1;
-            }
+        	case XOBJ_DTYPE_STIME:
+            	switch (strtolower($format)) {
+            		case 's':
+            		case 'show':
+            		case 'p':
+            		case 'preview':
+            		case 'f':
+            		case 'formpreview':
+                		$ret = formatTimestamp($ret, _SHORTDATESTRING);
+                		return $ret;
+            			break 1;
+            		case 'n':
+            		case 'none':
+            		case 'e':
+            		case 'edit':
+                		break 1;
+            		default:
+                		break 1;
+            	}
             break;
-        case XOBJ_DTYPE_TIME_ONLY:
-            switch (strtolower($format)) {
-            case 's':
-            case 'show':
-            case 'p':
-            case 'preview':
-            case 'f':
-            case 'formpreview':
-                $ret = formatTimestamp($ret, 'G:i');
-                return $ret;
-            	break 1;
-            case 'n':
-            case 'none':
-            case 'e':
-            case 'edit':
-                break 1;
-            default:
-                break 1;
-            }
+        	case XOBJ_DTYPE_TIME_ONLY:
+            	switch (strtolower($format)) {
+            		case 's':
+            		case 'show':
+            		case 'p':
+            		case 'preview':
+            		case 'f':
+            		case 'formpreview':
+                		$ret = formatTimestamp($ret, 'G:i');
+                		return $ret;
+            			break 1;
+            		case 'n':
+            		case 'none':
+            		case 'e':
+            		case 'edit':
+                		break 1;
+            		default:
+                		break 1;
+            	}
             break;
 
-        case XOBJ_DTYPE_CURRENCY:
-	        $decimal_section_original = strstr($ret, '.');
-			$decimal_section = $decimal_section_original;
-			if ($decimal_section) {
-				if (strlen($decimal_section) == 1) {
-					$decimal_section = '.00';
-				} elseif(strlen($decimal_section) == 2) {
-					$decimal_section = $decimal_section . '0';
+        	case XOBJ_DTYPE_CURRENCY:
+	        	$decimal_section_original = strstr($ret, '.');
+				$decimal_section = $decimal_section_original;
+				if ($decimal_section) {
+					if (strlen($decimal_section) == 1) {
+						$decimal_section = '.00';
+					} elseif(strlen($decimal_section) == 2) {
+						$decimal_section = $decimal_section . '0';
+					}
+					$ret = str_replace($decimal_section_original, $decimal_section, $ret);
+				} else {
+					$ret = $ret . '.00';
 				}
-				$ret = str_replace($decimal_section_original, $decimal_section, $ret);
-			} else {
-				$ret = $ret . '.00';
-			}
-		break;
+			break;
 
-        case XOBJ_DTYPE_TXTAREA:
-            switch (strtolower($format)) {
-            case 's':
-            case 'show':
-                $ts =& MyTextSanitizer::getInstance();
-                $html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
+        	case XOBJ_DTYPE_TXTAREA:
+            	switch (strtolower($format)) {
+            		case 's':
+            		case 'show':
+                		$ts =& MyTextSanitizer::getInstance();
+                		$html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
 
-                $xcode = (!isset($this->vars['doxcode']['value']) || $this->vars['doxcode']['value'] == 1) ? 1 : 0;
+                		$xcode = (!isset($this->vars['doxcode']['value']) || $this->vars['doxcode']['value'] == 1) ? 1 : 0;
 
-                $smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
-                $image = (!isset($this->vars['doimage']['value']) || $this->vars['doimage']['value'] == 1) ? 1 : 0;
-                $br = (!isset($this->vars['dobr']['value']) || $this->vars['dobr']['value'] == 1) ? 1 : 0;
+                		$smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
+                		$image = (!isset($this->vars['doimage']['value']) || $this->vars['doimage']['value'] == 1) ? 1 : 0;
+                		$br = (!isset($this->vars['dobr']['value']) || $this->vars['dobr']['value'] == 1) ? 1 : 0;
 
-				/**
+						/**
 		 		 * Hack by marcan <INBOX> for SCSPRO
 				 * Setting mastop as the main editor
 		 		 */
-                if (defined('XOOPS_EDITOR_IS_HTML')) {
-                	$br = false;
-                }
-				/**
+                		if (defined('XOOPS_EDITOR_IS_HTML')) {
+                			$br = false;
+                		}
+						/**
 		 		 * Hack by marcan <INBOX> for SCSPRO
 				 * Setting mastop as the main editor
 		 		 */
 
-                return $ts->displayTarea($ret, $html, $smiley, $xcode, $image, $br);
-                break 1;
-            case 'e':
-            case 'edit':
-                return htmlspecialchars($ret, ENT_QUOTES);
-                break 1;
-            case 'p':
-            case 'preview':
-                $ts =& MyTextSanitizer::getInstance();
-                $html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
-                $xcode = (!isset($this->vars['doxcode']['value']) || $this->vars['doxcode']['value'] == 1) ? 1 : 0;
-                $smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
-                $image = (!isset($this->vars['doimage']['value']) || $this->vars['doimage']['value'] == 1) ? 1 : 0;
-                $br = (!isset($this->vars['dobr']['value']) || $this->vars['dobr']['value'] == 1) ? 1 : 0;
-                return $ts->previewTarea($ret, $html, $smiley, $xcode, $image, $br);
-                break 1;
-            case 'f':
-            case 'formpreview':
-                $ts =& MyTextSanitizer::getInstance();
-                return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
-                break 1;
-            case 'n':
-            case 'none':
-            default:
-                break 1;
-            }
+                		return $ts->displayTarea($ret, $html, $smiley, $xcode, $image, $br);
+                		break 1;
+            		case 'e':
+            		case 'edit':
+                		return htmlspecialchars($ret, ENT_QUOTES);
+                		break 1;
+            		case 'p':
+            		case 'preview':
+                		$ts =& MyTextSanitizer::getInstance();
+                		$html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
+                		$xcode = (!isset($this->vars['doxcode']['value']) || $this->vars['doxcode']['value'] == 1) ? 1 : 0;
+                		$smiley = (!isset($this->vars['dosmiley']['value']) || $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
+                		$image = (!isset($this->vars['doimage']['value']) || $this->vars['doimage']['value'] == 1) ? 1 : 0;
+                		$br = (!isset($this->vars['dobr']['value']) || $this->vars['dobr']['value'] == 1) ? 1 : 0;
+                		return $ts->previewTarea($ret, $html, $smiley, $xcode, $image, $br);
+                		break 1;
+            		case 'f':
+            		case 'formpreview':
+                		$ts =& MyTextSanitizer::getInstance();
+                		return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
+                		break 1;
+            		case 'n':
+            		case 'none':
+            		default:
+                		break 1;
+            	}
             break;
-        case XOBJ_DTYPE_SIMPLE_ARRAY:
-            $ret =& explode('|', $ret);
+        	case XOBJ_DTYPE_SIMPLE_ARRAY:
+            	$ret =& explode('|', $ret);
+            	break;
+        	case XOBJ_DTYPE_ARRAY:
+            	$ret =& unserialize($ret);
+            	break;
+        	case XOBJ_DTYPE_SOURCE:
+            	switch (strtolower($format)) {
+            		case 's':
+            		case 'show':
+                		break 1;
+            		case 'e':
+            		case 'edit':
+                		return htmlspecialchars($ret, ENT_QUOTES);
+                		break 1;
+            		case 'p':
+            		case 'preview':
+                		$ts =& MyTextSanitizer::getInstance();
+                		return $ts->stripSlashesGPC($ret);
+                		break 1;
+            		case 'f':
+            		case 'formpreview':
+                		$ts =& MyTextSanitizer::getInstance();
+                		return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
+                		break 1;
+            		case 'n':
+            		case 'none':
+            		default:
+                		break 1;
+            	}
             break;
-        case XOBJ_DTYPE_ARRAY:
-            $ret =& unserialize($ret);
-            break;
-        case XOBJ_DTYPE_SOURCE:
-            switch (strtolower($format)) {
-            case 's':
-            case 'show':
-                break 1;
-            case 'e':
-            case 'edit':
-                return htmlspecialchars($ret, ENT_QUOTES);
-                break 1;
-            case 'p':
-            case 'preview':
-                $ts =& MyTextSanitizer::getInstance();
-                return $ts->stripSlashesGPC($ret);
-                break 1;
-            case 'f':
-            case 'formpreview':
-                $ts =& MyTextSanitizer::getInstance();
-                return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
-                break 1;
-            case 'n':
-            case 'none':
-            default:
-                break 1;
-            }
-            break;
-        default:
-            if ($this->vars[$key]['options'] != '' && $ret != '') {
-                switch (strtolower($format)) {
-                case 's':
-                case 'show':
-					$selected = explode('|', $ret);
-                    $options = explode('|', $this->vars[$key]['options']);
-                    $i = 1;
-                    $ret = array();
-                    foreach ($options as $op) {
-                        if (in_array($i, $selected)) {
-                            $ret[] = $op;
-                        }
-                        $i++;
-                    }
-                    return implode(', ', $ret);
-                case 'e':
-                case 'edit':
-                    $ret = explode('|', $ret);
-                    break 1;
-                default:
-                    break 1;
-                }
+        	default:
+            	if ($this->vars[$key]['options'] != '' && $ret != '') {
+                	switch (strtolower($format)) {
+                		case 's':
+                		case 'show':
+							$selected = explode('|', $ret);
+                    		$options = explode('|', $this->vars[$key]['options']);
+                    		$i = 1;
+                    		$ret = array();
+                    		foreach ($options as $op) {
+                        		if (in_array($i, $selected)) {
+                            		$ret[] = $op;
+                        		}
+                        		$i++;
+                    		}
+                    		return implode(', ', $ret);
+                		case 'e':
+                		case 'edit':
+                    		$ret = explode('|', $ret);
+                    		break 1;
+                		default:
+                    		break 1;
+                	}
 
             }
             break;

Please login to merge, or discard this patch.

		@@ -648,93 +648,93 @@ discard block
		block discarded – undo
648	648	} else {
649	649	$cleanv = is_string($cleanv) ? trim($cleanv) : $cleanv;
650	650	switch ($v['data_type']) {
651		- case XOBJ_DTYPE_TXTBOX:
652		- if ($v['required'] && $cleanv != '0' && $cleanv == '') {
653		- $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
654		- continue;
655		- }
656		- if (isset($v['maxlength']) && strlen($cleanv) > intval($v['maxlength'])) {
657		- $this->setErrors( sprintf( _XOBJ_ERR_SHORTERTHAN, $k, intval( $v['maxlength'] ) ) );
658		- continue;
659		- }
660		- if (!$v['not_gpc']) {
661		- $cleanv = $ts->stripSlashesGPC($ts->censorString($cleanv));
662		- } else {
663		- $cleanv = $ts->censorString($cleanv);
664		- }
665		- break;
666		- case XOBJ_DTYPE_TXTAREA:
667		- if ($v['required'] && $cleanv != '0' && $cleanv == '') {
668		- $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
669		- continue;
670		- }
671		- if (!$v['not_gpc']) {
672		- $cleanv = $ts->stripSlashesGPC($ts->censorString($cleanv));
673		- } else {
674		- $cleanv = $ts->censorString($cleanv);
675		- }
676		- break;
677		- case XOBJ_DTYPE_SOURCE:
678		- if (!$v['not_gpc']) {
679		- $cleanv = $ts->stripSlashesGPC($cleanv);
680		- } else {
681		- $cleanv = $cleanv;
682		- }
683		- break;
684		- case XOBJ_DTYPE_INT:
685		- case XOBJ_DTYPE_TIME_ONLY:
686		- $cleanv = intval($cleanv);
687		- break;
688		-
689		- case XOBJ_DTYPE_CURRENCY:
690		- $cleanv = smart_currency($cleanv);
691		- break;
692		-
693		- case XOBJ_DTYPE_FLOAT:
694		- $cleanv = smart_float($cleanv);
695		- break;
696		-
697		- case XOBJ_DTYPE_EMAIL:
698		- if ($v['required'] && $cleanv == '') {
699		- $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
700		- continue;
701		- }
702		- if ($cleanv != '' && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$cleanv)) {
703		- $this->setErrors("Invalid Email");
704		- continue;
705		- }
706		- if (!$v['not_gpc']) {
707		- $cleanv = $ts->stripSlashesGPC($cleanv);
708		- }
709		- break;
710		- case XOBJ_DTYPE_URL:
711		- if ($v['required'] && $cleanv == '') {
712		- $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
713		- continue;
714		- }
715		- if ($cleanv != '' && !preg_match("/^http[s]*:\/\//i", $cleanv)) {
716		- $cleanv = 'http://' . $cleanv;
717		- }
718		- if (!$v['not_gpc']) {
719		- $cleanv =& $ts->stripSlashesGPC($cleanv);
720		- }
721		- break;
722		- case XOBJ_DTYPE_SIMPLE_ARRAY:
723		- $cleanv = implode('\|', $cleanv);
724		- break;
725		- case XOBJ_DTYPE_ARRAY:
726		- $cleanv = serialize($cleanv);
727		- break;
728		- case XOBJ_DTYPE_STIME:
729		- case XOBJ_DTYPE_MTIME:
730		- case XOBJ_DTYPE_LTIME:
731		- $cleanv = !is_string($cleanv) ? intval($cleanv) : strtotime($cleanv);
732		- if (!($cleanv > 0)) {
733		- $cleanv = strtotime($cleanv);
734		- }
735		- break;
736		- default:
737		- break;
	651	+ case XOBJ_DTYPE_TXTBOX:
	652	+ if ($v['required'] && $cleanv != '0' && $cleanv == '') {
	653	+ $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
	654	+ continue;
	655	+ }
	656	+ if (isset($v['maxlength']) && strlen($cleanv) > intval($v['maxlength'])) {
	657	+ $this->setErrors( sprintf( _XOBJ_ERR_SHORTERTHAN, $k, intval( $v['maxlength'] ) ) );
	658	+ continue;
	659	+ }
	660	+ if (!$v['not_gpc']) {
	661	+ $cleanv = $ts->stripSlashesGPC($ts->censorString($cleanv));
	662	+ } else {
	663	+ $cleanv = $ts->censorString($cleanv);
	664	+ }
	665	+ break;
	666	+ case XOBJ_DTYPE_TXTAREA:
	667	+ if ($v['required'] && $cleanv != '0' && $cleanv == '') {
	668	+ $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
	669	+ continue;
	670	+ }
	671	+ if (!$v['not_gpc']) {
	672	+ $cleanv = $ts->stripSlashesGPC($ts->censorString($cleanv));
	673	+ } else {
	674	+ $cleanv = $ts->censorString($cleanv);
	675	+ }
	676	+ break;
	677	+ case XOBJ_DTYPE_SOURCE:
	678	+ if (!$v['not_gpc']) {
	679	+ $cleanv = $ts->stripSlashesGPC($cleanv);
	680	+ } else {
	681	+ $cleanv = $cleanv;
	682	+ }
	683	+ break;
	684	+ case XOBJ_DTYPE_INT:
	685	+ case XOBJ_DTYPE_TIME_ONLY:
	686	+ $cleanv = intval($cleanv);
	687	+ break;
	688	+
	689	+ case XOBJ_DTYPE_CURRENCY:
	690	+ $cleanv = smart_currency($cleanv);
	691	+ break;
	692	+
	693	+ case XOBJ_DTYPE_FLOAT:
	694	+ $cleanv = smart_float($cleanv);
	695	+ break;
	696	+
	697	+ case XOBJ_DTYPE_EMAIL:
	698	+ if ($v['required'] && $cleanv == '') {
	699	+ $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
	700	+ continue;
	701	+ }
	702	+ if ($cleanv != '' && !preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+([\.][a-z0-9-]+)+$/i",$cleanv)) {
	703	+ $this->setErrors("Invalid Email");
	704	+ continue;
	705	+ }
	706	+ if (!$v['not_gpc']) {
	707	+ $cleanv = $ts->stripSlashesGPC($cleanv);
	708	+ }
	709	+ break;
	710	+ case XOBJ_DTYPE_URL:
	711	+ if ($v['required'] && $cleanv == '') {
	712	+ $this->setErrors( sprintf( _XOBJ_ERR_REQUIRED, $k ) );
	713	+ continue;
	714	+ }
	715	+ if ($cleanv != '' && !preg_match("/^http[s]*:\/\//i", $cleanv)) {
	716	+ $cleanv = 'http://' . $cleanv;
	717	+ }
	718	+ if (!$v['not_gpc']) {
	719	+ $cleanv =& $ts->stripSlashesGPC($cleanv);
	720	+ }
	721	+ break;
	722	+ case XOBJ_DTYPE_SIMPLE_ARRAY:
	723	+ $cleanv = implode('\|', $cleanv);
	724	+ break;
	725	+ case XOBJ_DTYPE_ARRAY:
	726	+ $cleanv = serialize($cleanv);
	727	+ break;
	728	+ case XOBJ_DTYPE_STIME:
	729	+ case XOBJ_DTYPE_MTIME:
	730	+ case XOBJ_DTYPE_LTIME:
	731	+ $cleanv = !is_string($cleanv) ? intval($cleanv) : strtotime($cleanv);
	732	+ if (!($cleanv > 0)) {
	733	+ $cleanv = strtotime($cleanv);
	734	+ }
	735	+ break;
	736	+ default:
	737	+ break;
738	738	}
739	739	}
740	740	$this->cleanVars[$k] =& $cleanv;
		@@ -769,236 +769,236 @@ discard block
		block discarded – undo
769	769
770	770	switch ($this->vars[$key]['data_type']) {
771	771
772		- case XOBJ_DTYPE_TXTBOX:
773		- switch (strtolower($format)) {
774		- case 's':
775		- case 'show':
776		- // ML Hack by marcan
777		- $ts =& MyTextSanitizer::getInstance();
778		- $ret = $ts->htmlSpecialChars($ret);
779		-
780		- if (method_exists($myts, 'formatForML')) {
781		- return $ts->formatForML($ret);
782		- } else {
783		- return $ret;
784		- }
785		- break 1;
786		- // End of ML Hack by marcan
787		-
788		- case 'clean':
789		- $ts =& MyTextSanitizer::getInstance();
790		-
791		- $ret = smart_html2text($ret);
792		- $ret = smart_purifyText($ret);
793		-
794		- if (method_exists($myts, 'formatForML')) {
795		- return $ts->formatForML($ret);
796		- } else {
797		- return $ret;
798		- }
799		- break 1;
800		- // End of ML Hack by marcan
801		-
802		- case 'e':
803		- case 'edit':
804		- $ts =& MyTextSanitizer::getInstance();
805		- return $ts->htmlSpecialChars($ret);
806		- break 1;
807		- case 'p':
808		- case 'preview':
809		- case 'f':
810		- case 'formpreview':
811		- $ts =& MyTextSanitizer::getInstance();
812		- return $ts->htmlSpecialChars($ts->stripSlashesGPC($ret));
813		- break 1;
814		- case 'n':
815		- case 'none':
816		- default:
817		- break 1;
818		- }
	772	+ case XOBJ_DTYPE_TXTBOX:
	773	+ switch (strtolower($format)) {
	774	+ case 's':
	775	+ case 'show':
	776	+ // ML Hack by marcan
	777	+ $ts =& MyTextSanitizer::getInstance();
	778	+ $ret = $ts->htmlSpecialChars($ret);
	779	+
	780	+ if (method_exists($myts, 'formatForML')) {
	781	+ return $ts->formatForML($ret);
	782	+ } else {
	783	+ return $ret;
	784	+ }
	785	+ break 1;
	786	+ // End of ML Hack by marcan
	787	+
	788	+ case 'clean':
	789	+ $ts =& MyTextSanitizer::getInstance();
	790	+
	791	+ $ret = smart_html2text($ret);
	792	+ $ret = smart_purifyText($ret);
	793	+
	794	+ if (method_exists($myts, 'formatForML')) {
	795	+ return $ts->formatForML($ret);
	796	+ } else {
	797	+ return $ret;
	798	+ }
	799	+ break 1;
	800	+ // End of ML Hack by marcan
	801	+
	802	+ case 'e':
	803	+ case 'edit':
	804	+ $ts =& MyTextSanitizer::getInstance();
	805	+ return $ts->htmlSpecialChars($ret);
	806	+ break 1;
	807	+ case 'p':
	808	+ case 'preview':
	809	+ case 'f':
	810	+ case 'formpreview':
	811	+ $ts =& MyTextSanitizer::getInstance();
	812	+ return $ts->htmlSpecialChars($ts->stripSlashesGPC($ret));
	813	+ break 1;
	814	+ case 'n':
	815	+ case 'none':
	816	+ default:
	817	+ break 1;
	818	+ }
819	819	break;
820		- case XOBJ_DTYPE_LTIME:
821		- switch (strtolower($format)) {
822		- case 's':
823		- case 'show':
824		- case 'p':
825		- case 'preview':
826		- case 'f':
827		- case 'formpreview':
828		- $ret = formatTimestamp($ret, _DATESTRING);
829		- return $ret;
830		- break 1;
831		- case 'n':
832		- case 'none':
833		- case 'e':
834		- case 'edit':
835		- break 1;
836		- default:
837		- break 1;
838		- }
	820	+ case XOBJ_DTYPE_LTIME:
	821	+ switch (strtolower($format)) {
	822	+ case 's':
	823	+ case 'show':
	824	+ case 'p':
	825	+ case 'preview':
	826	+ case 'f':
	827	+ case 'formpreview':
	828	+ $ret = formatTimestamp($ret, _DATESTRING);
	829	+ return $ret;
	830	+ break 1;
	831	+ case 'n':
	832	+ case 'none':
	833	+ case 'e':
	834	+ case 'edit':
	835	+ break 1;
	836	+ default:
	837	+ break 1;
	838	+ }
839	839	break;
840		- case XOBJ_DTYPE_STIME:
841		- switch (strtolower($format)) {
842		- case 's':
843		- case 'show':
844		- case 'p':
845		- case 'preview':
846		- case 'f':
847		- case 'formpreview':
848		- $ret = formatTimestamp($ret, _SHORTDATESTRING);
849		- return $ret;
850		- break 1;
851		- case 'n':
852		- case 'none':
853		- case 'e':
854		- case 'edit':
855		- break 1;
856		- default:
857		- break 1;
858		- }
	840	+ case XOBJ_DTYPE_STIME:
	841	+ switch (strtolower($format)) {
	842	+ case 's':
	843	+ case 'show':
	844	+ case 'p':
	845	+ case 'preview':
	846	+ case 'f':
	847	+ case 'formpreview':
	848	+ $ret = formatTimestamp($ret, _SHORTDATESTRING);
	849	+ return $ret;
	850	+ break 1;
	851	+ case 'n':
	852	+ case 'none':
	853	+ case 'e':
	854	+ case 'edit':
	855	+ break 1;
	856	+ default:
	857	+ break 1;
	858	+ }
859	859	break;
860		- case XOBJ_DTYPE_TIME_ONLY:
861		- switch (strtolower($format)) {
862		- case 's':
863		- case 'show':
864		- case 'p':
865		- case 'preview':
866		- case 'f':
867		- case 'formpreview':
868		- $ret = formatTimestamp($ret, 'G:i');
869		- return $ret;
870		- break 1;
871		- case 'n':
872		- case 'none':
873		- case 'e':
874		- case 'edit':
875		- break 1;
876		- default:
877		- break 1;
878		- }
	860	+ case XOBJ_DTYPE_TIME_ONLY:
	861	+ switch (strtolower($format)) {
	862	+ case 's':
	863	+ case 'show':
	864	+ case 'p':
	865	+ case 'preview':
	866	+ case 'f':
	867	+ case 'formpreview':
	868	+ $ret = formatTimestamp($ret, 'G:i');
	869	+ return $ret;
	870	+ break 1;
	871	+ case 'n':
	872	+ case 'none':
	873	+ case 'e':
	874	+ case 'edit':
	875	+ break 1;
	876	+ default:
	877	+ break 1;
	878	+ }
879	879	break;
880	880
881		- case XOBJ_DTYPE_CURRENCY:
882		- $decimal_section_original = strstr($ret, '.');
883		- $decimal_section = $decimal_section_original;
884		- if ($decimal_section) {
885		- if (strlen($decimal_section) == 1) {
886		- $decimal_section = '.00';
887		- } elseif(strlen($decimal_section) == 2) {
888		- $decimal_section = $decimal_section . '0';
	881	+ case XOBJ_DTYPE_CURRENCY:
	882	+ $decimal_section_original = strstr($ret, '.');
	883	+ $decimal_section = $decimal_section_original;
	884	+ if ($decimal_section) {
	885	+ if (strlen($decimal_section) == 1) {
	886	+ $decimal_section = '.00';
	887	+ } elseif(strlen($decimal_section) == 2) {
	888	+ $decimal_section = $decimal_section . '0';
	889	+ }
	890	+ $ret = str_replace($decimal_section_original, $decimal_section, $ret);
	891	+ } else {
	892	+ $ret = $ret . '.00';
889	893	}
890		- $ret = str_replace($decimal_section_original, $decimal_section, $ret);
891		- } else {
892		- $ret = $ret . '.00';
893		- }
894		- break;
	894	+ break;
895	895
896		- case XOBJ_DTYPE_TXTAREA:
897		- switch (strtolower($format)) {
898		- case 's':
899		- case 'show':
900		- $ts =& MyTextSanitizer::getInstance();
901		- $html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
	896	+ case XOBJ_DTYPE_TXTAREA:
	897	+ switch (strtolower($format)) {
	898	+ case 's':
	899	+ case 'show':
	900	+ $ts =& MyTextSanitizer::getInstance();
	901	+ $html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
902	902
903		- $xcode = (!isset($this->vars['doxcode']['value']) \|\| $this->vars['doxcode']['value'] == 1) ? 1 : 0;
	903	+ $xcode = (!isset($this->vars['doxcode']['value']) \|\| $this->vars['doxcode']['value'] == 1) ? 1 : 0;
904	904
905		- $smiley = (!isset($this->vars['dosmiley']['value']) \|\| $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
906		- $image = (!isset($this->vars['doimage']['value']) \|\| $this->vars['doimage']['value'] == 1) ? 1 : 0;
907		- $br = (!isset($this->vars['dobr']['value']) \|\| $this->vars['dobr']['value'] == 1) ? 1 : 0;
	905	+ $smiley = (!isset($this->vars['dosmiley']['value']) \|\| $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
	906	+ $image = (!isset($this->vars['doimage']['value']) \|\| $this->vars['doimage']['value'] == 1) ? 1 : 0;
	907	+ $br = (!isset($this->vars['dobr']['value']) \|\| $this->vars['dobr']['value'] == 1) ? 1 : 0;
908	908
909		- /**
	909	+ /**
910	910	* Hack by marcan <INBOX> for SCSPRO
911	911	* Setting mastop as the main editor
912	912	*/
913		- if (defined('XOOPS_EDITOR_IS_HTML')) {
914		- $br = false;
915		- }
916		- /**
	913	+ if (defined('XOOPS_EDITOR_IS_HTML')) {
	914	+ $br = false;
	915	+ }
	916	+ /**
917	917	* Hack by marcan <INBOX> for SCSPRO
918	918	* Setting mastop as the main editor
919	919	*/
920	920
921		- return $ts->displayTarea($ret, $html, $smiley, $xcode, $image, $br);
922		- break 1;
923		- case 'e':
924		- case 'edit':
925		- return htmlspecialchars($ret, ENT_QUOTES);
926		- break 1;
927		- case 'p':
928		- case 'preview':
929		- $ts =& MyTextSanitizer::getInstance();
930		- $html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
931		- $xcode = (!isset($this->vars['doxcode']['value']) \|\| $this->vars['doxcode']['value'] == 1) ? 1 : 0;
932		- $smiley = (!isset($this->vars['dosmiley']['value']) \|\| $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
933		- $image = (!isset($this->vars['doimage']['value']) \|\| $this->vars['doimage']['value'] == 1) ? 1 : 0;
934		- $br = (!isset($this->vars['dobr']['value']) \|\| $this->vars['dobr']['value'] == 1) ? 1 : 0;
935		- return $ts->previewTarea($ret, $html, $smiley, $xcode, $image, $br);
936		- break 1;
937		- case 'f':
938		- case 'formpreview':
939		- $ts =& MyTextSanitizer::getInstance();
940		- return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
941		- break 1;
942		- case 'n':
943		- case 'none':
944		- default:
945		- break 1;
946		- }
	921	+ return $ts->displayTarea($ret, $html, $smiley, $xcode, $image, $br);
	922	+ break 1;
	923	+ case 'e':
	924	+ case 'edit':
	925	+ return htmlspecialchars($ret, ENT_QUOTES);
	926	+ break 1;
	927	+ case 'p':
	928	+ case 'preview':
	929	+ $ts =& MyTextSanitizer::getInstance();
	930	+ $html = !empty($this->vars['dohtml']['value']) ? 1 : 0;
	931	+ $xcode = (!isset($this->vars['doxcode']['value']) \|\| $this->vars['doxcode']['value'] == 1) ? 1 : 0;
	932	+ $smiley = (!isset($this->vars['dosmiley']['value']) \|\| $this->vars['dosmiley']['value'] == 1) ? 1 : 0;
	933	+ $image = (!isset($this->vars['doimage']['value']) \|\| $this->vars['doimage']['value'] == 1) ? 1 : 0;
	934	+ $br = (!isset($this->vars['dobr']['value']) \|\| $this->vars['dobr']['value'] == 1) ? 1 : 0;
	935	+ return $ts->previewTarea($ret, $html, $smiley, $xcode, $image, $br);
	936	+ break 1;
	937	+ case 'f':
	938	+ case 'formpreview':
	939	+ $ts =& MyTextSanitizer::getInstance();
	940	+ return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
	941	+ break 1;
	942	+ case 'n':
	943	+ case 'none':
	944	+ default:
	945	+ break 1;
	946	+ }
947	947	break;
948		- case XOBJ_DTYPE_SIMPLE_ARRAY:
949		- $ret =& explode('\|', $ret);
	948	+ case XOBJ_DTYPE_SIMPLE_ARRAY:
	949	+ $ret =& explode('\|', $ret);
	950	+ break;
	951	+ case XOBJ_DTYPE_ARRAY:
	952	+ $ret =& unserialize($ret);
	953	+ break;
	954	+ case XOBJ_DTYPE_SOURCE:
	955	+ switch (strtolower($format)) {
	956	+ case 's':
	957	+ case 'show':
	958	+ break 1;
	959	+ case 'e':
	960	+ case 'edit':
	961	+ return htmlspecialchars($ret, ENT_QUOTES);
	962	+ break 1;
	963	+ case 'p':
	964	+ case 'preview':
	965	+ $ts =& MyTextSanitizer::getInstance();
	966	+ return $ts->stripSlashesGPC($ret);
	967	+ break 1;
	968	+ case 'f':
	969	+ case 'formpreview':
	970	+ $ts =& MyTextSanitizer::getInstance();
	971	+ return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
	972	+ break 1;
	973	+ case 'n':
	974	+ case 'none':
	975	+ default:
	976	+ break 1;
	977	+ }
950	978	break;
951		- case XOBJ_DTYPE_ARRAY:
952		- $ret =& unserialize($ret);
953		- break;
954		- case XOBJ_DTYPE_SOURCE:
955		- switch (strtolower($format)) {
956		- case 's':
957		- case 'show':
958		- break 1;
959		- case 'e':
960		- case 'edit':
961		- return htmlspecialchars($ret, ENT_QUOTES);
962		- break 1;
963		- case 'p':
964		- case 'preview':
965		- $ts =& MyTextSanitizer::getInstance();
966		- return $ts->stripSlashesGPC($ret);
967		- break 1;
968		- case 'f':
969		- case 'formpreview':
970		- $ts =& MyTextSanitizer::getInstance();
971		- return htmlspecialchars($ts->stripSlashesGPC($ret), ENT_QUOTES);
972		- break 1;
973		- case 'n':
974		- case 'none':
975		- default:
976		- break 1;
977		- }
978		- break;
979		- default:
980		- if ($this->vars[$key]['options'] != '' && $ret != '') {
981		- switch (strtolower($format)) {
982		- case 's':
983		- case 'show':
984		- $selected = explode('\|', $ret);
985		- $options = explode('\|', $this->vars[$key]['options']);
986		- $i = 1;
987		- $ret = array();
988		- foreach ($options as $op) {
989		- if (in_array($i, $selected)) {
990		- $ret[] = $op;
991		- }
992		- $i++;
993		- }
994		- return implode(', ', $ret);
995		- case 'e':
996		- case 'edit':
997		- $ret = explode('\|', $ret);
998		- break 1;
999		- default:
1000		- break 1;
1001		- }
	979	+ default:
	980	+ if ($this->vars[$key]['options'] != '' && $ret != '') {
	981	+ switch (strtolower($format)) {
	982	+ case 's':
	983	+ case 'show':
	984	+ $selected = explode('\|', $ret);
	985	+ $options = explode('\|', $this->vars[$key]['options']);
	986	+ $i = 1;
	987	+ $ret = array();
	988	+ foreach ($options as $op) {
	989	+ if (in_array($i, $selected)) {
	990	+ $ret[] = $op;
	991	+ }
	992	+ $i++;
	993	+ }
	994	+ return implode(', ', $ret);
	995	+ case 'e':
	996	+ case 'edit':
	997	+ $ret = explode('\|', $ret);
	998	+ break 1;
	999	+ default:
	1000	+ break 1;
	1001	+ }
1002	1002
1003	1003	}
1004	1004	break;

mambax7 / smartobject

Branch — master (2d4977)

Category

Switch Indentation +298 added lines, -298 removed lines patch added patch discarded remove patch