Inspection of "missed the branch in git clone (added depth too, l..." - EGroupware/egroupware - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — 14.2 ( e07840...cec2da )

by Ralf

created 2016-06-15 09:27 UTC

Status

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

@@ -33,76 +33,76 @@
 block discarded – undo
 
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
-		case 'STRING':
-		case 'CHAR':
-		case 'VARCHAR':
-		case 'TINYBLOB':
-		case 'TINYTEXT':
-		case 'ENUM':
-		case 'SET':
-			if ($len <= $this->blobSize) return 'C';
-
-		case 'TEXT':
-		case 'LONGTEXT':
-		case 'MEDIUMTEXT':
-			return 'X';
-
-		// php_mysql extension always returns 'blob' even if 'text'
-		// so we have to check whether binary...
-		case 'IMAGE':
-		case 'LONGBLOB':
-		case 'BLOB':
-		case 'MEDIUMBLOB':
-			return !empty($fieldobj->binary) ? 'B' : 'X';
-
-		case 'YEAR':
-		case 'DATE': return 'D';
-
-		case 'TIME':
-		case 'DATETIME':
-		case 'TIMESTAMP': return 'T';
-
-		case 'FLOAT':
-		case 'DOUBLE':
-			return 'F';
-
-		case 'INT':
-		case 'INTEGER': return $is_serial ? 'R' : 'I';
-		case 'TINYINT': return $is_serial ? 'R' : 'I1';
-		case 'SMALLINT': return $is_serial ? 'R' : 'I2';
-		case 'MEDIUMINT': return $is_serial ? 'R' : 'I4';
-		case 'BIGINT':  return $is_serial ? 'R' : 'I8';
-		default: return 'N';
+			case 'STRING':
+			case 'CHAR':
+			case 'VARCHAR':
+			case 'TINYBLOB':
+			case 'TINYTEXT':
+			case 'ENUM':
+			case 'SET':
+				if ($len <= $this->blobSize) return 'C';
+
+			case 'TEXT':
+			case 'LONGTEXT':
+			case 'MEDIUMTEXT':
+				return 'X';
+
+			// php_mysql extension always returns 'blob' even if 'text'
+			// so we have to check whether binary...
+			case 'IMAGE':
+			case 'LONGBLOB':
+			case 'BLOB':
+			case 'MEDIUMBLOB':
+				return !empty($fieldobj->binary) ? 'B' : 'X';
+
+			case 'YEAR':
+			case 'DATE': return 'D';
+
+			case 'TIME':
+			case 'DATETIME':
+			case 'TIMESTAMP': return 'T';
+
+			case 'FLOAT':
+			case 'DOUBLE':
+				return 'F';
+
+			case 'INT':
+			case 'INTEGER': return $is_serial ? 'R' : 'I';
+			case 'TINYINT': return $is_serial ? 'R' : 'I1';
+			case 'SMALLINT': return $is_serial ? 'R' : 'I2';
+			case 'MEDIUMINT': return $is_serial ? 'R' : 'I4';
+			case 'BIGINT':  return $is_serial ? 'R' : 'I8';
+			default: return 'N';
 		}
 	}
 
 	function ActualType($meta)
 	{
 		switch(strtoupper($meta)) {
-		case 'C': return 'VARCHAR';
-		case 'XL':return 'LONGTEXT';
-		case 'X': return 'TEXT';
-
-		case 'C2': return 'VARCHAR';
-		case 'X2': return 'LONGTEXT';
-
-		case 'B': return 'LONGBLOB';
-
-		case 'D': return 'DATE';
-		case 'T': return 'DATETIME';
-		case 'L': return 'TINYINT';
-
-		case 'R':
-		case 'I4':
-		case 'I': return 'INTEGER';
-		case 'I1': return 'TINYINT';
-		case 'I2': return 'SMALLINT';
-		case 'I8': return 'BIGINT';
-
-		case 'F': return 'DOUBLE';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
+			case 'C': return 'VARCHAR';
+			case 'XL':return 'LONGTEXT';
+			case 'X': return 'TEXT';
+
+			case 'C2': return 'VARCHAR';
+			case 'X2': return 'LONGTEXT';
+
+			case 'B': return 'LONGBLOB';
+
+			case 'D': return 'DATE';
+			case 'T': return 'DATETIME';
+			case 'L': return 'TINYINT';
+
+			case 'R':
+			case 'I4':
+			case 'I': return 'INTEGER';
+			case 'I1': return 'TINYINT';
+			case 'I2': return 'SMALLINT';
+			case 'I8': return 'BIGINT';
+
+			case 'F': return 'DOUBLE';
+			case 'N': return 'NUMERIC';
+			default:
+				return $meta;
 		}
 	}
 

Please login to merge, or discard this patch.

phpgwapi/inc/adodb/datadict/datadict-postgres.inc.php 1 patch

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

@@ -89,29 +89,29 @@
 block discarded – undo
  	function ActualType($meta)
 	{
 		switch($meta) {
-		case 'C': return 'VARCHAR';
-		case 'XL':
-		case 'X': return 'TEXT';
+			case 'C': return 'VARCHAR';
+			case 'XL':
+			case 'X': return 'TEXT';
 
-		case 'C2': return 'VARCHAR';
-		case 'X2': return 'TEXT';
+			case 'C2': return 'VARCHAR';
+			case 'X2': return 'TEXT';
 
-		case 'B': return 'BYTEA';
+			case 'B': return 'BYTEA';
 
-		case 'D': return 'DATE';
-		case 'T': return 'TIMESTAMP';
+			case 'D': return 'DATE';
+			case 'T': return 'TIMESTAMP';
 
-		case 'L': return 'BOOLEAN';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'SMALLINT';
-		case 'I2': return 'INT2';
-		case 'I4': return 'INT4';
-		case 'I8': return 'INT8';
+			case 'L': return 'BOOLEAN';
+			case 'I': return 'INTEGER';
+			case 'I1': return 'SMALLINT';
+			case 'I2': return 'INT2';
+			case 'I4': return 'INT4';
+			case 'I8': return 'INT8';
 
-		case 'F': return 'FLOAT8';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
+			case 'F': return 'FLOAT8';
+			case 'N': return 'NUMERIC';
+			default:
+				return $meta;
 		}
 	}
 

Please login to merge, or discard this patch.

phpgwapi/inc/adodb/datadict/datadict-db2.inc.php 1 patch

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

@@ -20,29 +20,29 @@
 block discarded – undo
  	function ActualType($meta)
 	{
 		switch($meta) {
-		case 'C': return 'VARCHAR';
-		case 'XL': return 'CLOB';
-		case 'X': return 'VARCHAR(3600)'; 
+			case 'C': return 'VARCHAR';
+			case 'XL': return 'CLOB';
+			case 'X': return 'VARCHAR(3600)'; 
 
-		case 'C2': return 'VARCHAR'; // up to 32K
-		case 'X2': return 'VARCHAR(3600)'; // up to 32000, but default page size too small
+			case 'C2': return 'VARCHAR'; // up to 32K
+			case 'X2': return 'VARCHAR(3600)'; // up to 32000, but default page size too small
 
-		case 'B': return 'BLOB';
+			case 'B': return 'BLOB';
 
-		case 'D': return 'DATE';
-		case 'T': return 'TIMESTAMP';
+			case 'D': return 'DATE';
+			case 'T': return 'TIMESTAMP';
 
-		case 'L': return 'SMALLINT';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'SMALLINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INTEGER';
-		case 'I8': return 'BIGINT';
+			case 'L': return 'SMALLINT';
+			case 'I': return 'INTEGER';
+			case 'I1': return 'SMALLINT';
+			case 'I2': return 'SMALLINT';
+			case 'I4': return 'INTEGER';
+			case 'I8': return 'BIGINT';
 
-		case 'F': return 'DOUBLE';
-		case 'N': return 'DECIMAL';
-		default:
-			return $meta;
+			case 'F': return 'DOUBLE';
+			case 'N': return 'DECIMAL';
+			default:
+				return $meta;
 		}
 	}
 	

Please login to merge, or discard this patch.

phpgwapi/inc/adodb/datadict/datadict-sybase.inc.php 1 patch

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

@@ -29,45 +29,45 @@
 block discarded – undo
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
 
-		case 'INT': 
-		case 'INTEGER': return  'I';
-		case 'BIT':
-		case 'TINYINT': return  'I1';
-		case 'SMALLINT': return 'I2';
-		case 'BIGINT':  return  'I8';
+			case 'INT': 
+			case 'INTEGER': return  'I';
+			case 'BIT':
+			case 'TINYINT': return  'I1';
+			case 'SMALLINT': return 'I2';
+			case 'BIGINT':  return  'I8';
 		
-		case 'REAL':
-		case 'FLOAT': return 'F';
-		default: return parent::MetaType($t,$len,$fieldobj);
+			case 'REAL':
+			case 'FLOAT': return 'F';
+			default: return parent::MetaType($t,$len,$fieldobj);
 		}
 	}
 	
 	function ActualType($meta)
 	{
 		switch(strtoupper($meta)) {
-		case 'C': return 'VARCHAR';
-		case 'XL':
-		case 'X': return 'TEXT';
+			case 'C': return 'VARCHAR';
+			case 'XL':
+			case 'X': return 'TEXT';
 		
-		case 'C2': return 'NVARCHAR';
-		case 'X2': return 'NTEXT';
+			case 'C2': return 'NVARCHAR';
+			case 'X2': return 'NTEXT';
 		
-		case 'B': return 'IMAGE';
+			case 'B': return 'IMAGE';
 			
-		case 'D': return 'DATETIME';
-		case 'T': return 'DATETIME';
-		case 'L': return 'BIT';
+			case 'D': return 'DATETIME';
+			case 'T': return 'DATETIME';
+			case 'L': return 'BIT';
 		
-		case 'I': return 'INT'; 
-		case 'I1': return 'TINYINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INT';
-		case 'I8': return 'BIGINT';
+			case 'I': return 'INT'; 
+			case 'I1': return 'TINYINT';
+			case 'I2': return 'SMALLINT';
+			case 'I4': return 'INT';
+			case 'I8': return 'BIGINT';
 		
-		case 'F': return 'REAL';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
+			case 'F': return 'REAL';
+			case 'N': return 'NUMERIC';
+			default:
+				return $meta;
 		}
 	}
 	

Please login to merge, or discard this patch.

phpgwapi/inc/adodb/datadict/datadict-mssql.inc.php 1 patch

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

@@ -34,17 +34,17 @@  discard block
 block discarded – undo
 		
 		$len = -1; // mysql max_length is not accurate
 		switch (strtoupper($t)) {
-		case 'R':
-		case 'INT': 
-		case 'INTEGER': return  'I';
-		case 'BIT':
-		case 'TINYINT': return  'I1';
-		case 'SMALLINT': return 'I2';
-		case 'BIGINT':  return  'I8';
+			case 'R':
+			case 'INT': 
+			case 'INTEGER': return  'I';
+			case 'BIT':
+			case 'TINYINT': return  'I1';
+			case 'SMALLINT': return 'I2';
+			case 'BIGINT':  return  'I8';
 		
-		case 'REAL':
-		case 'FLOAT': return 'F';
-		default: return parent::MetaType($t,$len,$fieldobj);
+			case 'REAL':
+			case 'FLOAT': return 'F';
+			default: return parent::MetaType($t,$len,$fieldobj);
 		}
 	}
 	
@@ -52,29 +52,29 @@  discard block
 block discarded – undo
 	{
 		switch(strtoupper($meta)) {
 
-		case 'C': return 'VARCHAR';
-		case 'XL': return (isset($this)) ? $this->typeXL : 'TEXT';
-		case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
-		case 'C2': return 'NVARCHAR';
-		case 'X2': return 'NTEXT';
+			case 'C': return 'VARCHAR';
+			case 'XL': return (isset($this)) ? $this->typeXL : 'TEXT';
+			case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
+			case 'C2': return 'NVARCHAR';
+			case 'X2': return 'NTEXT';
 		
-		case 'B': return 'IMAGE';
+			case 'B': return 'IMAGE';
 			
-		case 'D': return 'DATETIME';
-		case 'T': return 'DATETIME';
-		case 'L': return 'BIT';
+			case 'D': return 'DATETIME';
+			case 'T': return 'DATETIME';
+			case 'L': return 'BIT';
 		
-		case 'R':		
-		case 'I': return 'INT'; 
-		case 'I1': return 'TINYINT';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INT';
-		case 'I8': return 'BIGINT';
+			case 'R':		
+			case 'I': return 'INT'; 
+			case 'I1': return 'TINYINT';
+			case 'I2': return 'SMALLINT';
+			case 'I4': return 'INT';
+			case 'I8': return 'BIGINT';
 		
-		case 'F': return 'REAL';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
+			case 'F': return 'REAL';
+			case 'N': return 'NUMERIC';
+			default:
+				return $meta;
 		}
 	}
 	
@@ -271,11 +271,11 @@  discard block
 block discarded – undo
 	function _GetSize($ftype, $ty, $fsize, $fprec)
 	{
 		switch ($ftype) {
-		case 'INT':
-		case 'SMALLINT':
-		case 'TINYINT':
-		case 'BIGINT':
-			return $ftype;
+			case 'INT':
+			case 'SMALLINT':
+			case 'TINYINT':
+			case 'BIGINT':
+				return $ftype;
 		}
     	if ($ty == 'T') return $ftype;
     	return parent::_GetSize($ftype, $ty, $fsize, $fprec);    

Please login to merge, or discard this patch.

phpgwapi/inc/adodb/datadict/datadict-access.inc.php 1 patch

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

@@ -22,29 +22,29 @@
 block discarded – undo
  	function ActualType($meta)
 	{
 		switch($meta) {
-		case 'C': return 'TEXT';
-		case 'XL':
-		case 'X': return 'MEMO'; 
+			case 'C': return 'TEXT';
+			case 'XL':
+			case 'X': return 'MEMO'; 
 		
-		case 'C2': return 'TEXT'; // up to 32K
-		case 'X2': return 'MEMO';
+			case 'C2': return 'TEXT'; // up to 32K
+			case 'X2': return 'MEMO';
 		
-		case 'B': return 'BINARY';
+			case 'B': return 'BINARY';
 			
-		case 'D': return 'DATETIME';
-		case 'T': return 'DATETIME';
+			case 'D': return 'DATETIME';
+			case 'T': return 'DATETIME';
 		
-		case 'L': return 'BYTE';
-		case 'I': return 'INTEGER';
-		case 'I1': return 'BYTE';
-		case 'I2': return 'SMALLINT';
-		case 'I4': return 'INTEGER';
-		case 'I8': return 'INTEGER';
+			case 'L': return 'BYTE';
+			case 'I': return 'INTEGER';
+			case 'I1': return 'BYTE';
+			case 'I2': return 'SMALLINT';
+			case 'I4': return 'INTEGER';
+			case 'I8': return 'INTEGER';
 		
-		case 'F': return 'DOUBLE';
-		case 'N': return 'NUMERIC';
-		default:
-			return $meta;
+			case 'F': return 'DOUBLE';
+			case 'N': return 'NUMERIC';
+			default:
+				return $meta;
 		}
 	}
 	

Please login to merge, or discard this patch.

phpgwapi/inc/adodb/adodb-csvlib.inc.php 1 patch

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

@@ -152,32 +152,32 @@
 block discarded – undo
 						$tdiff = (integer)( $meta[1]+$timeout - time());
 						if ($tdiff <= 2) {
 							switch($tdiff) {
-							case 4:
-							case 3:
-								if ((rand() & 31) == 0) {
+								case 4:
+								case 3:
+									if ((rand() & 31) == 0) {
+										fclose($fp);
+										$err = "Timeout 3";
+										return $false;
+									}
+									break;
+								case 2: 
+									if ((rand() & 15) == 0) {
+										fclose($fp);
+										$err = "Timeout 2";
+										return $false;
+									}
+									break;
+								case 1:
+									if ((rand() & 3) == 0) {
+										fclose($fp);
+										$err = "Timeout 1";
+										return $false;
+									}
+									break;
+								default: 
 									fclose($fp);
-									$err = "Timeout 3";
+									$err = "Timeout 0";
 									return $false;
-								}
-								break;
-							case 2: 
-								if ((rand() & 15) == 0) {
-									fclose($fp);
-									$err = "Timeout 2";
-									return $false;
-								}
-								break;
-							case 1:
-								if ((rand() & 3) == 0) {
-									fclose($fp);
-									$err = "Timeout 1";
-									return $false;
-								}
-								break;
-							default: 
-								fclose($fp);
-								$err = "Timeout 0";
-								return $false;
 							} // switch
 							
 						} // if check flush cache

Please login to merge, or discard this patch.

phpgwapi/inc/class.vfs_webdav_server.inc.php 1 patch

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

@@ -171,16 +171,16 @@
 block discarded – undo
 
         if (is_dir($source)) { // resource is a collection
             switch ($options["depth"]) {
-            case "infinity": // valid
-                break;
-            case "0": // valid for COPY only
-                if ($del) { // MOVE?
-                    return "400 Bad request";
-                }
-                break;
-            case "1": // invalid for both COPY and MOVE
-            default:
-                return "400 Bad request";
+            	case "infinity": // valid
+                	break;
+            	case "0": // valid for COPY only
+                	if ($del) { // MOVE?
+                    	return "400 Bad request";
+                	}
+                	break;
+            	case "1": // invalid for both COPY and MOVE
+            	default:
+                	return "400 Bad request";
             }
         }
 

Please login to merge, or discard this patch.

phpgwapi/inc/min/lib/Minify/Source.php 1 patch

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

@@ -62,13 +62,13 @@
 block discarded – undo
             $segments = explode('.', $spec['filepath']);
             $ext = strtolower(array_pop($segments));
             switch ($ext) {
-            case 'js'   : $this->contentType = 'application/x-javascript';
-                          break;
-            case 'css'  : $this->contentType = 'text/css';
-                          break;
-            case 'htm'  : // fallthrough
-            case 'html' : $this->contentType = 'text/html';
-                          break;
+            	case 'js'   : $this->contentType = 'application/x-javascript';
+                          	break;
+            	case 'css'  : $this->contentType = 'text/css';
+                          	break;
+            	case 'htm'  : // fallthrough
+            	case 'html' : $this->contentType = 'text/html';
+                          	break;
             }
             $this->filepath = $spec['filepath'];
             $this->_id = $spec['filepath'];

Please login to merge, or discard this patch.

		@@ -89,29 +89,29 @@
		block discarded – undo
89	89	function ActualType($meta)
90	90	{
91	91	switch($meta) {
92		- case 'C': return 'VARCHAR';
93		- case 'XL':
94		- case 'X': return 'TEXT';
	92	+ case 'C': return 'VARCHAR';
	93	+ case 'XL':
	94	+ case 'X': return 'TEXT';
95	95
96		- case 'C2': return 'VARCHAR';
97		- case 'X2': return 'TEXT';
	96	+ case 'C2': return 'VARCHAR';
	97	+ case 'X2': return 'TEXT';
98	98
99		- case 'B': return 'BYTEA';
	99	+ case 'B': return 'BYTEA';
100	100
101		- case 'D': return 'DATE';
102		- case 'T': return 'TIMESTAMP';
	101	+ case 'D': return 'DATE';
	102	+ case 'T': return 'TIMESTAMP';
103	103
104		- case 'L': return 'BOOLEAN';
105		- case 'I': return 'INTEGER';
106		- case 'I1': return 'SMALLINT';
107		- case 'I2': return 'INT2';
108		- case 'I4': return 'INT4';
109		- case 'I8': return 'INT8';
	104	+ case 'L': return 'BOOLEAN';
	105	+ case 'I': return 'INTEGER';
	106	+ case 'I1': return 'SMALLINT';
	107	+ case 'I2': return 'INT2';
	108	+ case 'I4': return 'INT4';
	109	+ case 'I8': return 'INT8';
110	110
111		- case 'F': return 'FLOAT8';
112		- case 'N': return 'NUMERIC';
113		- default:
114		- return $meta;
	111	+ case 'F': return 'FLOAT8';
	112	+ case 'N': return 'NUMERIC';
	113	+ default:
	114	+ return $meta;
115	115	}
116	116	}
117	117

		@@ -171,16 +171,16 @@
		block discarded – undo
171	171
172	172	if (is_dir($source)) { // resource is a collection
173	173	switch ($options["depth"]) {
174		- case "infinity": // valid
175		- break;
176		- case "0": // valid for COPY only
177		- if ($del) { // MOVE?
178		- return "400 Bad request";
179		- }
180		- break;
181		- case "1": // invalid for both COPY and MOVE
182		- default:
183		- return "400 Bad request";
	174	+ case "infinity": // valid
	175	+ break;
	176	+ case "0": // valid for COPY only
	177	+ if ($del) { // MOVE?
	178	+ return "400 Bad request";
	179	+ }
	180	+ break;
	181	+ case "1": // invalid for both COPY and MOVE
	182	+ default:
	183	+ return "400 Bad request";
184	184	}
185	185	}
186	186

		@@ -33,76 +33,76 @@
		block discarded – undo
33	33
34	34	$len = -1; // mysql max_length is not accurate
35	35	switch (strtoupper($t)) {
36		- case 'STRING':
37		- case 'CHAR':
38		- case 'VARCHAR':
39		- case 'TINYBLOB':
40		- case 'TINYTEXT':
41		- case 'ENUM':
42		- case 'SET':
43		- if ($len <= $this->blobSize) return 'C';
44		-
45		- case 'TEXT':
46		- case 'LONGTEXT':
47		- case 'MEDIUMTEXT':
48		- return 'X';
49		-
50		- // php_mysql extension always returns 'blob' even if 'text'
51		- // so we have to check whether binary...
52		- case 'IMAGE':
53		- case 'LONGBLOB':
54		- case 'BLOB':
55		- case 'MEDIUMBLOB':
56		- return !empty($fieldobj->binary) ? 'B' : 'X';
57		-
58		- case 'YEAR':
59		- case 'DATE': return 'D';
60		-
61		- case 'TIME':
62		- case 'DATETIME':
63		- case 'TIMESTAMP': return 'T';
64		-
65		- case 'FLOAT':
66		- case 'DOUBLE':
67		- return 'F';
68		-
69		- case 'INT':
70		- case 'INTEGER': return $is_serial ? 'R' : 'I';
71		- case 'TINYINT': return $is_serial ? 'R' : 'I1';
72		- case 'SMALLINT': return $is_serial ? 'R' : 'I2';
73		- case 'MEDIUMINT': return $is_serial ? 'R' : 'I4';
74		- case 'BIGINT': return $is_serial ? 'R' : 'I8';
75		- default: return 'N';
	36	+ case 'STRING':
	37	+ case 'CHAR':
	38	+ case 'VARCHAR':
	39	+ case 'TINYBLOB':
	40	+ case 'TINYTEXT':
	41	+ case 'ENUM':
	42	+ case 'SET':
	43	+ if ($len <= $this->blobSize) return 'C';
	44	+
	45	+ case 'TEXT':
	46	+ case 'LONGTEXT':
	47	+ case 'MEDIUMTEXT':
	48	+ return 'X';
	49	+
	50	+ // php_mysql extension always returns 'blob' even if 'text'
	51	+ // so we have to check whether binary...
	52	+ case 'IMAGE':
	53	+ case 'LONGBLOB':
	54	+ case 'BLOB':
	55	+ case 'MEDIUMBLOB':
	56	+ return !empty($fieldobj->binary) ? 'B' : 'X';
	57	+
	58	+ case 'YEAR':
	59	+ case 'DATE': return 'D';
	60	+
	61	+ case 'TIME':
	62	+ case 'DATETIME':
	63	+ case 'TIMESTAMP': return 'T';
	64	+
	65	+ case 'FLOAT':
	66	+ case 'DOUBLE':
	67	+ return 'F';
	68	+
	69	+ case 'INT':
	70	+ case 'INTEGER': return $is_serial ? 'R' : 'I';
	71	+ case 'TINYINT': return $is_serial ? 'R' : 'I1';
	72	+ case 'SMALLINT': return $is_serial ? 'R' : 'I2';
	73	+ case 'MEDIUMINT': return $is_serial ? 'R' : 'I4';
	74	+ case 'BIGINT': return $is_serial ? 'R' : 'I8';
	75	+ default: return 'N';
76	76	}
77	77	}
78	78
79	79	function ActualType($meta)
80	80	{
81	81	switch(strtoupper($meta)) {
82		- case 'C': return 'VARCHAR';
83		- case 'XL':return 'LONGTEXT';
84		- case 'X': return 'TEXT';
85		-
86		- case 'C2': return 'VARCHAR';
87		- case 'X2': return 'LONGTEXT';
88		-
89		- case 'B': return 'LONGBLOB';
90		-
91		- case 'D': return 'DATE';
92		- case 'T': return 'DATETIME';
93		- case 'L': return 'TINYINT';
94		-
95		- case 'R':
96		- case 'I4':
97		- case 'I': return 'INTEGER';
98		- case 'I1': return 'TINYINT';
99		- case 'I2': return 'SMALLINT';
100		- case 'I8': return 'BIGINT';
101		-
102		- case 'F': return 'DOUBLE';
103		- case 'N': return 'NUMERIC';
104		- default:
105		- return $meta;
	82	+ case 'C': return 'VARCHAR';
	83	+ case 'XL':return 'LONGTEXT';
	84	+ case 'X': return 'TEXT';
	85	+
	86	+ case 'C2': return 'VARCHAR';
	87	+ case 'X2': return 'LONGTEXT';
	88	+
	89	+ case 'B': return 'LONGBLOB';
	90	+
	91	+ case 'D': return 'DATE';
	92	+ case 'T': return 'DATETIME';
	93	+ case 'L': return 'TINYINT';
	94	+
	95	+ case 'R':
	96	+ case 'I4':
	97	+ case 'I': return 'INTEGER';
	98	+ case 'I1': return 'TINYINT';
	99	+ case 'I2': return 'SMALLINT';
	100	+ case 'I8': return 'BIGINT';
	101	+
	102	+ case 'F': return 'DOUBLE';
	103	+ case 'N': return 'NUMERIC';
	104	+ default:
	105	+ return $meta;
106	106	}
107	107	}
108	108

		@@ -20,29 +20,29 @@
		block discarded – undo
20	20	function ActualType($meta)
21	21	{
22	22	switch($meta) {
23		- case 'C': return 'VARCHAR';
24		- case 'XL': return 'CLOB';
25		- case 'X': return 'VARCHAR(3600)';
	23	+ case 'C': return 'VARCHAR';
	24	+ case 'XL': return 'CLOB';
	25	+ case 'X': return 'VARCHAR(3600)';
26	26
27		- case 'C2': return 'VARCHAR'; // up to 32K
28		- case 'X2': return 'VARCHAR(3600)'; // up to 32000, but default page size too small
	27	+ case 'C2': return 'VARCHAR'; // up to 32K
	28	+ case 'X2': return 'VARCHAR(3600)'; // up to 32000, but default page size too small
29	29
30		- case 'B': return 'BLOB';
	30	+ case 'B': return 'BLOB';
31	31
32		- case 'D': return 'DATE';
33		- case 'T': return 'TIMESTAMP';
	32	+ case 'D': return 'DATE';
	33	+ case 'T': return 'TIMESTAMP';
34	34
35		- case 'L': return 'SMALLINT';
36		- case 'I': return 'INTEGER';
37		- case 'I1': return 'SMALLINT';
38		- case 'I2': return 'SMALLINT';
39		- case 'I4': return 'INTEGER';
40		- case 'I8': return 'BIGINT';
	35	+ case 'L': return 'SMALLINT';
	36	+ case 'I': return 'INTEGER';
	37	+ case 'I1': return 'SMALLINT';
	38	+ case 'I2': return 'SMALLINT';
	39	+ case 'I4': return 'INTEGER';
	40	+ case 'I8': return 'BIGINT';
41	41
42		- case 'F': return 'DOUBLE';
43		- case 'N': return 'DECIMAL';
44		- default:
45		- return $meta;
	42	+ case 'F': return 'DOUBLE';
	43	+ case 'N': return 'DECIMAL';
	44	+ default:
	45	+ return $meta;
46	46	}
47	47	}
48	48

		@@ -29,45 +29,45 @@
		block discarded – undo
29	29	$len = -1; // mysql max_length is not accurate
30	30	switch (strtoupper($t)) {
31	31
32		- case 'INT':
33		- case 'INTEGER': return 'I';
34		- case 'BIT':
35		- case 'TINYINT': return 'I1';
36		- case 'SMALLINT': return 'I2';
37		- case 'BIGINT': return 'I8';
	32	+ case 'INT':
	33	+ case 'INTEGER': return 'I';
	34	+ case 'BIT':
	35	+ case 'TINYINT': return 'I1';
	36	+ case 'SMALLINT': return 'I2';
	37	+ case 'BIGINT': return 'I8';
38	38
39		- case 'REAL':
40		- case 'FLOAT': return 'F';
41		- default: return parent::MetaType($t,$len,$fieldobj);
	39	+ case 'REAL':
	40	+ case 'FLOAT': return 'F';
	41	+ default: return parent::MetaType($t,$len,$fieldobj);
42	42	}
43	43	}
44	44
45	45	function ActualType($meta)
46	46	{
47	47	switch(strtoupper($meta)) {
48		- case 'C': return 'VARCHAR';
49		- case 'XL':
50		- case 'X': return 'TEXT';
	48	+ case 'C': return 'VARCHAR';
	49	+ case 'XL':
	50	+ case 'X': return 'TEXT';
51	51
52		- case 'C2': return 'NVARCHAR';
53		- case 'X2': return 'NTEXT';
	52	+ case 'C2': return 'NVARCHAR';
	53	+ case 'X2': return 'NTEXT';
54	54
55		- case 'B': return 'IMAGE';
	55	+ case 'B': return 'IMAGE';
56	56
57		- case 'D': return 'DATETIME';
58		- case 'T': return 'DATETIME';
59		- case 'L': return 'BIT';
	57	+ case 'D': return 'DATETIME';
	58	+ case 'T': return 'DATETIME';
	59	+ case 'L': return 'BIT';
60	60
61		- case 'I': return 'INT';
62		- case 'I1': return 'TINYINT';
63		- case 'I2': return 'SMALLINT';
64		- case 'I4': return 'INT';
65		- case 'I8': return 'BIGINT';
	61	+ case 'I': return 'INT';
	62	+ case 'I1': return 'TINYINT';
	63	+ case 'I2': return 'SMALLINT';
	64	+ case 'I4': return 'INT';
	65	+ case 'I8': return 'BIGINT';
66	66
67		- case 'F': return 'REAL';
68		- case 'N': return 'NUMERIC';
69		- default:
70		- return $meta;
	67	+ case 'F': return 'REAL';
	68	+ case 'N': return 'NUMERIC';
	69	+ default:
	70	+ return $meta;
71	71	}
72	72	}
73	73

		@@ -34,17 +34,17 @@ discard block
		block discarded – undo
34	34
35	35	$len = -1; // mysql max_length is not accurate
36	36	switch (strtoupper($t)) {
37		- case 'R':
38		- case 'INT':
39		- case 'INTEGER': return 'I';
40		- case 'BIT':
41		- case 'TINYINT': return 'I1';
42		- case 'SMALLINT': return 'I2';
43		- case 'BIGINT': return 'I8';
	37	+ case 'R':
	38	+ case 'INT':
	39	+ case 'INTEGER': return 'I';
	40	+ case 'BIT':
	41	+ case 'TINYINT': return 'I1';
	42	+ case 'SMALLINT': return 'I2';
	43	+ case 'BIGINT': return 'I8';
44	44
45		- case 'REAL':
46		- case 'FLOAT': return 'F';
47		- default: return parent::MetaType($t,$len,$fieldobj);
	45	+ case 'REAL':
	46	+ case 'FLOAT': return 'F';
	47	+ default: return parent::MetaType($t,$len,$fieldobj);
48	48	}
49	49	}
50	50
		@@ -52,29 +52,29 @@ discard block
		block discarded – undo
52	52	{
53	53	switch(strtoupper($meta)) {
54	54
55		- case 'C': return 'VARCHAR';
56		- case 'XL': return (isset($this)) ? $this->typeXL : 'TEXT';
57		- case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
58		- case 'C2': return 'NVARCHAR';
59		- case 'X2': return 'NTEXT';
	55	+ case 'C': return 'VARCHAR';
	56	+ case 'XL': return (isset($this)) ? $this->typeXL : 'TEXT';
	57	+ case 'X': return (isset($this)) ? $this->typeX : 'TEXT'; ## could be varchar(8000), but we want compat with oracle
	58	+ case 'C2': return 'NVARCHAR';
	59	+ case 'X2': return 'NTEXT';
60	60
61		- case 'B': return 'IMAGE';
	61	+ case 'B': return 'IMAGE';
62	62
63		- case 'D': return 'DATETIME';
64		- case 'T': return 'DATETIME';
65		- case 'L': return 'BIT';
	63	+ case 'D': return 'DATETIME';
	64	+ case 'T': return 'DATETIME';
	65	+ case 'L': return 'BIT';
66	66
67		- case 'R':
68		- case 'I': return 'INT';
69		- case 'I1': return 'TINYINT';
70		- case 'I2': return 'SMALLINT';
71		- case 'I4': return 'INT';
72		- case 'I8': return 'BIGINT';
	67	+ case 'R':
	68	+ case 'I': return 'INT';
	69	+ case 'I1': return 'TINYINT';
	70	+ case 'I2': return 'SMALLINT';
	71	+ case 'I4': return 'INT';
	72	+ case 'I8': return 'BIGINT';
73	73
74		- case 'F': return 'REAL';
75		- case 'N': return 'NUMERIC';
76		- default:
77		- return $meta;
	74	+ case 'F': return 'REAL';
	75	+ case 'N': return 'NUMERIC';
	76	+ default:
	77	+ return $meta;
78	78	}
79	79	}
80	80
		@@ -271,11 +271,11 @@ discard block
		block discarded – undo
271	271	function _GetSize($ftype, $ty, $fsize, $fprec)
272	272	{
273	273	switch ($ftype) {
274		- case 'INT':
275		- case 'SMALLINT':
276		- case 'TINYINT':
277		- case 'BIGINT':
278		- return $ftype;
	274	+ case 'INT':
	275	+ case 'SMALLINT':
	276	+ case 'TINYINT':
	277	+ case 'BIGINT':
	278	+ return $ftype;
279	279	}
280	280	if ($ty == 'T') return $ftype;
281	281	return parent::_GetSize($ftype, $ty, $fsize, $fprec);

		@@ -22,29 +22,29 @@
		block discarded – undo
22	22	function ActualType($meta)
23	23	{
24	24	switch($meta) {
25		- case 'C': return 'TEXT';
26		- case 'XL':
27		- case 'X': return 'MEMO';
	25	+ case 'C': return 'TEXT';
	26	+ case 'XL':
	27	+ case 'X': return 'MEMO';
28	28
29		- case 'C2': return 'TEXT'; // up to 32K
30		- case 'X2': return 'MEMO';
	29	+ case 'C2': return 'TEXT'; // up to 32K
	30	+ case 'X2': return 'MEMO';
31	31
32		- case 'B': return 'BINARY';
	32	+ case 'B': return 'BINARY';
33	33
34		- case 'D': return 'DATETIME';
35		- case 'T': return 'DATETIME';
	34	+ case 'D': return 'DATETIME';
	35	+ case 'T': return 'DATETIME';
36	36
37		- case 'L': return 'BYTE';
38		- case 'I': return 'INTEGER';
39		- case 'I1': return 'BYTE';
40		- case 'I2': return 'SMALLINT';
41		- case 'I4': return 'INTEGER';
42		- case 'I8': return 'INTEGER';
	37	+ case 'L': return 'BYTE';
	38	+ case 'I': return 'INTEGER';
	39	+ case 'I1': return 'BYTE';
	40	+ case 'I2': return 'SMALLINT';
	41	+ case 'I4': return 'INTEGER';
	42	+ case 'I8': return 'INTEGER';
43	43
44		- case 'F': return 'DOUBLE';
45		- case 'N': return 'NUMERIC';
46		- default:
47		- return $meta;
	44	+ case 'F': return 'DOUBLE';
	45	+ case 'N': return 'NUMERIC';
	46	+ default:
	47	+ return $meta;
48	48	}
49	49	}
50	50

		@@ -152,32 +152,32 @@
		block discarded – undo
152	152	$tdiff = (integer)( $meta[1]+$timeout - time());
153	153	if ($tdiff <= 2) {
154	154	switch($tdiff) {
155		- case 4:
156		- case 3:
157		- if ((rand() & 31) == 0) {
	155	+ case 4:
	156	+ case 3:
	157	+ if ((rand() & 31) == 0) {
	158	+ fclose($fp);
	159	+ $err = "Timeout 3";
	160	+ return $false;
	161	+ }
	162	+ break;
	163	+ case 2:
	164	+ if ((rand() & 15) == 0) {
	165	+ fclose($fp);
	166	+ $err = "Timeout 2";
	167	+ return $false;
	168	+ }
	169	+ break;
	170	+ case 1:
	171	+ if ((rand() & 3) == 0) {
	172	+ fclose($fp);
	173	+ $err = "Timeout 1";
	174	+ return $false;
	175	+ }
	176	+ break;
	177	+ default:
158	178	fclose($fp);
159		- $err = "Timeout 3";
	179	+ $err = "Timeout 0";
160	180	return $false;
161		- }
162		- break;
163		- case 2:
164		- if ((rand() & 15) == 0) {
165		- fclose($fp);
166		- $err = "Timeout 2";
167		- return $false;
168		- }
169		- break;
170		- case 1:
171		- if ((rand() & 3) == 0) {
172		- fclose($fp);
173		- $err = "Timeout 1";
174		- return $false;
175		- }
176		- break;
177		- default:
178		- fclose($fp);
179		- $err = "Timeout 0";
180		- return $false;
181	181	} // switch
182	182
183	183	} // if check flush cache

		@@ -62,13 +62,13 @@
		block discarded – undo
62	62	$segments = explode('.', $spec['filepath']);
63	63	$ext = strtolower(array_pop($segments));
64	64	switch ($ext) {
65		- case 'js' : $this->contentType = 'application/x-javascript';
66		- break;
67		- case 'css' : $this->contentType = 'text/css';
68		- break;
69		- case 'htm' : // fallthrough
70		- case 'html' : $this->contentType = 'text/html';
71		- break;
	65	+ case 'js' : $this->contentType = 'application/x-javascript';
	66	+ break;
	67	+ case 'css' : $this->contentType = 'text/css';
	68	+ break;
	69	+ case 'htm' : // fallthrough
	70	+ case 'html' : $this->contentType = 'text/html';
	71	+ break;
72	72	}
73	73	$this->filepath = $spec['filepath'];
74	74	$this->_id = $spec['filepath'];

EGroupware / egroupware

Push — 14.2 ( e07840...cec2da )

Status

Category

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

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

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

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

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

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

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

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

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