Completed
Push — 14.2 ( e07840...cec2da )
by Ralf
83:18 queued 52:04
created
phpgwapi/inc/adodb/perf/perf-mysql.inc.php 1 patch
Switch Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -143,10 +143,10 @@  discard block
 block discarded – undo
143 143
 		$val = 0;
144 144
 		while (!$rs->EOF) {
145 145
 			switch($rs->fields[0]) {
146
-			case 'Com_select': 
147
-				$val = $rs->fields[1];
148
-				$rs->Close();
149
-				return $val;
146
+				case 'Com_select': 
147
+					$val = $rs->fields[1];
148
+					$rs->Close();
149
+					return $val;
150 150
 			}
151 151
 			$rs->MoveNext();
152 152
 		} 
@@ -172,14 +172,14 @@  discard block
 block discarded – undo
172 172
 		$val = 0.0;
173 173
 		while (!$rs->EOF) {
174 174
 			switch($rs->fields[0]) {
175
-			case 'Com_insert': 
176
-				$val += $rs->fields[1]; break;
177
-			case 'Com_delete': 
178
-				$val += $rs->fields[1]; break;
179
-			case 'Com_update': 
180
-				$val += $rs->fields[1]/2;
181
-				$rs->Close();
182
-				return $val;
175
+				case 'Com_insert': 
176
+					$val += $rs->fields[1]; break;
177
+				case 'Com_delete': 
178
+					$val += $rs->fields[1]; break;
179
+				case 'Com_update': 
180
+					$val += $rs->fields[1]/2;
181
+					$rs->Close();
182
+					return $val;
183 183
 			}
184 184
 			$rs->MoveNext();
185 185
 		} 
@@ -208,13 +208,13 @@  discard block
 block discarded – undo
208 208
 		$type = strtoupper($rs->fields[1]);
209 209
 		$rs->Close();
210 210
 		switch($type){
211
-		case 'MYISAM':
212
-		case 'ISAM':
213
-			return $this->DBParameter('MyISAM cache hit ratio').' (MyISAM)';
214
-		case 'INNODB':
215
-			return $this->DBParameter('InnoDB cache hit ratio').' (InnoDB)';
216
-		default:
217
-			return $type.' not supported';
211
+			case 'MYISAM':
212
+			case 'ISAM':
213
+				return $this->DBParameter('MyISAM cache hit ratio').' (MyISAM)';
214
+			case 'INNODB':
215
+				return $this->DBParameter('InnoDB cache hit ratio').' (InnoDB)';
216
+			default:
217
+				return $type.' not supported';
218 218
 		}
219 219
 		
220 220
 	}
Please login to merge, or discard this patch.
phpgwapi/inc/adodb/adodb-errorhandler.inc.php 1 patch
Switch Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -32,23 +32,23 @@
 block discarded – undo
32 32
 {
33 33
 	if (error_reporting() == 0) return; // obey @ protocol
34 34
 	switch($fn) {
35
-	case 'EXECUTE':
36
-		$sql = $p1;
37
-		$inputparams = $p2;
35
+		case 'EXECUTE':
36
+			$sql = $p1;
37
+			$inputparams = $p2;
38 38
 
39
-		$s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")\n";
40
-		break;
39
+			$s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")\n";
40
+			break;
41 41
 
42
-	case 'PCONNECT':
43
-	case 'CONNECT':
44
-		$host = $p1;
45
-		$database = $p2;
42
+		case 'PCONNECT':
43
+		case 'CONNECT':
44
+			$host = $p1;
45
+			$database = $p2;
46 46
 
47
-		$s = "$dbms error: [$errno: $errmsg] in $fn($host, '****', '****', $database)\n";
48
-		break;
49
-	default:
50
-		$s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n";
51
-		break;
47
+			$s = "$dbms error: [$errno: $errmsg] in $fn($host, '****', '****', $database)\n";
48
+			break;
49
+		default:
50
+			$s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n";
51
+			break;
52 52
 	}
53 53
 	/*
54 54
 	* Log connection error somewhere
Please login to merge, or discard this patch.
phpgwapi/inc/adodb/adodb-error.inc.php 1 patch
Switch Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -60,25 +60,25 @@
 block discarded – undo
60 60
 	//var_dump($errno);
61 61
 	if (is_numeric($errno) && $errno == 0) return 0;
62 62
 	switch($provider) { 
63
-	case 'mysql': $map = adodb_error_mysql(); break;
63
+		case 'mysql': $map = adodb_error_mysql(); break;
64 64
 	
65
-	case 'oracle':
66
-	case 'oci8': $map = adodb_error_oci8(); break;
65
+		case 'oracle':
66
+		case 'oci8': $map = adodb_error_oci8(); break;
67 67
 	
68
-	case 'ibase': $map = adodb_error_ibase(); break;
68
+		case 'ibase': $map = adodb_error_ibase(); break;
69 69
 	
70
-	case 'odbc': $map = adodb_error_odbc(); break;
70
+		case 'odbc': $map = adodb_error_odbc(); break;
71 71
 	
72
-	case 'mssql':
73
-	case 'sybase': $map = adodb_error_mssql(); break;
72
+		case 'mssql':
73
+		case 'sybase': $map = adodb_error_mssql(); break;
74 74
 	
75
-	case 'informix': $map = adodb_error_ifx(); break;
75
+		case 'informix': $map = adodb_error_ifx(); break;
76 76
 	
77
-	case 'postgres': return adodb_error_pg($errno); break;
77
+		case 'postgres': return adodb_error_pg($errno); break;
78 78
 	
79
-	case 'sqlite': return $map = adodb_error_sqlite(); break;
80
-	default:
81
-		return DB_ERROR;
79
+		case 'sqlite': return $map = adodb_error_sqlite(); break;
80
+		default:
81
+			return DB_ERROR;
82 82
 	}	
83 83
 	//print_r($map);
84 84
 	//var_dump($errno);
Please login to merge, or discard this patch.
phpgwapi/inc/adodb/tohtml.inc.php 1 patch
Switch Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -83,27 +83,27 @@  discard block
 block discarded – undo
83 83
 			
84 84
 			$type = $typearr[$i];
85 85
 			switch($type) {
86
-			case 'D':
87
-				if (empty($v)) $s .= "<TD> &nbsp; </TD>\n";
88
-				else if (!strpos($v,':')) {
89
-					$s .= "	<TD>".$rs->UserDate($v,"D d, M Y") ."&nbsp;</TD>\n";
90
-				}
86
+				case 'D':
87
+					if (empty($v)) $s .= "<TD> &nbsp; </TD>\n";
88
+					else if (!strpos($v,':')) {
89
+						$s .= "	<TD>".$rs->UserDate($v,"D d, M Y") ."&nbsp;</TD>\n";
90
+					}
91
+					break;
92
+				case 'T':
93
+					if (empty($v)) $s .= "<TD> &nbsp; </TD>\n";
94
+					else $s .= "	<TD>".$rs->UserTimeStamp($v,"D d, M Y, h:i:s") ."&nbsp;</TD>\n";
91 95
 				break;
92
-			case 'T':
93
-				if (empty($v)) $s .= "<TD> &nbsp; </TD>\n";
94
-				else $s .= "	<TD>".$rs->UserTimeStamp($v,"D d, M Y, h:i:s") ."&nbsp;</TD>\n";
95
-			break;
96 96
 			
97
-			case 'N':
98
-				if (abs($v) - round($v,0) < 0.00000001)
99
-					$v = round($v);
100
-				else
101
-					$v = round($v,$ADODB_ROUND);
102
-			case 'I':
103
-				$s .= "	<TD align=right>".stripslashes((trim($v))) ."&nbsp;</TD>\n";
97
+				case 'N':
98
+					if (abs($v) - round($v,0) < 0.00000001)
99
+						$v = round($v);
100
+					else
101
+						$v = round($v,$ADODB_ROUND);
102
+				case 'I':
103
+					$s .= "	<TD align=right>".stripslashes((trim($v))) ."&nbsp;</TD>\n";
104 104
 			   	
105
-			break;
106
-			/*
105
+				break;
106
+				/*
107 107
 			case 'B':
108 108
 				if (substr($v,8,2)=="BM" ) $v = substr($v,8);
109 109
 				$mtime = substr(str_replace(' ','_',microtime()),2);
@@ -123,11 +123,11 @@  discard block
 block discarded – undo
123 123
 				break;
124 124
 			*/
125 125
 
126
-			default:
127
-				if ($htmlspecialchars) $v = htmlspecialchars(trim($v));
128
-				$v = trim($v);
129
-				if (strlen($v) == 0) $v = '&nbsp;';
130
-				$s .= "	<TD>". str_replace("\n",'<br>',stripslashes($v)) ."</TD>\n";
126
+				default:
127
+					if ($htmlspecialchars) $v = htmlspecialchars(trim($v));
128
+					$v = trim($v);
129
+					if (strlen($v) == 0) $v = '&nbsp;';
130
+					$s .= "	<TD>". str_replace("\n",'<br>',stripslashes($v)) ."</TD>\n";
131 131
 			  
132 132
 			}
133 133
 		} // for
Please login to merge, or discard this patch.
phpgwapi/inc/adodb/datadict/datadict-sapdb.inc.php 1 patch
Switch Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -23,29 +23,29 @@
 block discarded – undo
23 23
  	function ActualType($meta)
24 24
 	{
25 25
 		switch($meta) {
26
-		case 'C': return 'VARCHAR';
27
-		case 'XL':
28
-		case 'X': return 'LONG';
26
+			case 'C': return 'VARCHAR';
27
+			case 'XL':
28
+			case 'X': return 'LONG';
29 29
 		
30
-		case 'C2': return 'VARCHAR UNICODE';
31
-		case 'X2': return 'LONG UNICODE';
30
+			case 'C2': return 'VARCHAR UNICODE';
31
+			case 'X2': return 'LONG UNICODE';
32 32
 		
33
-		case 'B': return 'LONG';
33
+			case 'B': return 'LONG';
34 34
 			
35
-		case 'D': return 'DATE';
36
-		case 'T': return 'TIMESTAMP';
35
+			case 'D': return 'DATE';
36
+			case 'T': return 'TIMESTAMP';
37 37
 		
38
-		case 'L': return 'BOOLEAN';
39
-		case 'I': return 'INTEGER';
40
-		case 'I1': return 'FIXED(3)';
41
-		case 'I2': return 'SMALLINT';
42
-		case 'I4': return 'INTEGER';
43
-		case 'I8': return 'FIXED(20)';
38
+			case 'L': return 'BOOLEAN';
39
+			case 'I': return 'INTEGER';
40
+			case 'I1': return 'FIXED(3)';
41
+			case 'I2': return 'SMALLINT';
42
+			case 'I4': return 'INTEGER';
43
+			case 'I8': return 'FIXED(20)';
44 44
 		
45
-		case 'F': return 'FLOAT(38)';
46
-		case 'N': return 'FIXED';
47
-		default:
48
-			return $meta;
45
+			case 'F': return 'FLOAT(38)';
46
+			case 'N': return 'FIXED';
47
+			default:
48
+				return $meta;
49 49
 		}
50 50
 	}
51 51
 	
Please login to merge, or discard this patch.
phpgwapi/inc/adodb/datadict/datadict-ibase.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
22 22
  	function ActualType($meta)
23 23
 	{
24 24
 		switch($meta) {
25
-		case 'C': return 'VARCHAR';
26
-		case 'XL':
27
-		case 'X': return 'VARCHAR(4000)'; 
25
+			case 'C': return 'VARCHAR';
26
+			case 'XL':
27
+			case 'X': return 'VARCHAR(4000)'; 
28 28
 		
29
-		case 'C2': return 'VARCHAR'; // up to 32K
30
-		case 'X2': return 'VARCHAR(4000)';
29
+			case 'C2': return 'VARCHAR'; // up to 32K
30
+			case 'X2': return 'VARCHAR(4000)';
31 31
 		
32
-		case 'B': return 'BLOB';
32
+			case 'B': return 'BLOB';
33 33
 			
34
-		case 'D': return 'DATE';
35
-		case 'T': return 'TIMESTAMP';
34
+			case 'D': return 'DATE';
35
+			case 'T': return 'TIMESTAMP';
36 36
 		
37
-		case 'L': return 'SMALLINT';
38
-		case 'I': return 'INTEGER';
39
-		case 'I1': return 'SMALLINT';
40
-		case 'I2': return 'SMALLINT';
41
-		case 'I4': return 'INTEGER';
42
-		case 'I8': return 'INTEGER';
37
+			case 'L': return 'SMALLINT';
38
+			case 'I': return 'INTEGER';
39
+			case 'I1': return 'SMALLINT';
40
+			case 'I2': return 'SMALLINT';
41
+			case 'I4': return 'INTEGER';
42
+			case 'I8': return 'INTEGER';
43 43
 		
44
-		case 'F': return 'DOUBLE PRECISION';
45
-		case 'N': return 'DECIMAL';
46
-		default:
47
-			return $meta;
44
+			case 'F': return 'DOUBLE PRECISION';
45
+			case 'N': return 'DECIMAL';
46
+			default:
47
+				return $meta;
48 48
 		}
49 49
 	}
50 50
 
Please login to merge, or discard this patch.
phpgwapi/inc/adodb/datadict/datadict-firebird.inc.php 1 patch
Switch Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -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 'VARCHAR(32000)'; 
25
-		case 'X': return 'VARCHAR(4000)'; 
23
+			case 'C': return 'VARCHAR';
24
+			case 'XL': return 'VARCHAR(32000)'; 
25
+			case 'X': return 'VARCHAR(4000)'; 
26 26
 		
27
-		case 'C2': return 'VARCHAR'; // up to 32K
28
-		case 'X2': return 'VARCHAR(4000)';
27
+			case 'C2': return 'VARCHAR'; // up to 32K
28
+			case 'X2': return 'VARCHAR(4000)';
29 29
 		
30
-		case 'B': return 'BLOB';
30
+			case 'B': return 'BLOB';
31 31
 			
32
-		case 'D': return 'DATE';
33
-		case 'T': return 'TIMESTAMP';
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 'INTEGER';
41
-		
42
-		case 'F': return 'DOUBLE PRECISION';
43
-		case 'N': return 'DECIMAL';
44
-		default:
45
-			return $meta;
32
+			case 'D': return 'DATE';
33
+			case 'T': return 'TIMESTAMP';
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 'INTEGER';
41
+		
42
+			case 'F': return 'DOUBLE PRECISION';
43
+			case 'N': return 'DECIMAL';
44
+			default:
45
+				return $meta;
46 46
 		}
47 47
 	}
48 48
 	
Please login to merge, or discard this patch.
phpgwapi/inc/adodb/datadict/datadict-informix.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
22 22
 	function ActualType($meta)
23 23
 	{
24 24
 		switch($meta) {
25
-		case 'C': return 'VARCHAR';// 255
26
-		case 'XL':
27
-		case 'X': return 'TEXT'; 
25
+			case 'C': return 'VARCHAR';// 255
26
+			case 'XL':
27
+			case 'X': return 'TEXT'; 
28 28
 		
29
-		case 'C2': return 'NVARCHAR';
30
-		case 'X2': return 'TEXT';
29
+			case 'C2': return 'NVARCHAR';
30
+			case 'X2': return 'TEXT';
31 31
 		
32
-		case 'B': return 'BLOB';
32
+			case 'B': return 'BLOB';
33 33
 			
34
-		case 'D': return 'DATE';
35
-		case 'T': return 'DATETIME';
34
+			case 'D': return 'DATE';
35
+			case 'T': return 'DATETIME';
36 36
 		
37
-		case 'L': return 'SMALLINT';
38
-		case 'I': return 'INTEGER';
39
-		case 'I1': return 'SMALLINT';
40
-		case 'I2': return 'SMALLINT';
41
-		case 'I4': return 'INTEGER';
42
-		case 'I8': return 'DECIMAL(20)';
37
+			case 'L': return 'SMALLINT';
38
+			case 'I': return 'INTEGER';
39
+			case 'I1': return 'SMALLINT';
40
+			case 'I2': return 'SMALLINT';
41
+			case 'I4': return 'INTEGER';
42
+			case 'I8': return 'DECIMAL(20)';
43 43
 		
44
-		case 'F': return 'FLOAT';
45
-		case 'N': return 'DECIMAL';
46
-		default:
47
-			return $meta;
44
+			case 'F': return 'FLOAT';
45
+			case 'N': return 'DECIMAL';
46
+			default:
47
+				return $meta;
48 48
 		}
49 49
 	}
50 50
 
Please login to merge, or discard this patch.
phpgwapi/inc/adodb/datadict/datadict-oci8.inc.php 1 patch
Switch Indentation   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -34,65 +34,65 @@
 block discarded – undo
34 34
 		switch (strtoupper($t)) {
35 35
 	 	case 'VARCHAR':
36 36
 	 	case 'VARCHAR2':
37
-		case 'CHAR':
38
-		case 'VARBINARY':
39
-		case 'BINARY':
40
-			if (isset($this) && $len <= $this->blobSize) return 'C';
41
-			return 'X';
37
+			case 'CHAR':
38
+			case 'VARBINARY':
39
+			case 'BINARY':
40
+				if (isset($this) && $len <= $this->blobSize) return 'C';
41
+				return 'X';
42 42
 		
43
-		case 'NCHAR':
44
-		case 'NVARCHAR2':
45
-		case 'NVARCHAR':
46
-			if (isset($this) && $len <= $this->blobSize) return 'C2';
47
-			return 'X2';
43
+			case 'NCHAR':
44
+			case 'NVARCHAR2':
45
+			case 'NVARCHAR':
46
+				if (isset($this) && $len <= $this->blobSize) return 'C2';
47
+				return 'X2';
48 48
 			
49
-		case 'NCLOB':
50
-		case 'CLOB':
51
-			return 'XL';
49
+			case 'NCLOB':
50
+			case 'CLOB':
51
+				return 'XL';
52 52
 		
53
-		case 'LONG RAW':
54
-		case 'LONG VARBINARY':
55
-		case 'BLOB':
56
-			return 'B';
53
+			case 'LONG RAW':
54
+			case 'LONG VARBINARY':
55
+			case 'BLOB':
56
+				return 'B';
57 57
 		
58
-		case 'DATE': 
59
-			return 'T';
58
+			case 'DATE': 
59
+				return 'T';
60 60
 		
61
-		case 'INT': 
62
-		case 'SMALLINT':
63
-		case 'INTEGER': 
64
-			return 'I';
61
+			case 'INT': 
62
+			case 'SMALLINT':
63
+			case 'INTEGER': 
64
+				return 'I';
65 65
 			
66
-		default:
67
-			return 'N';
66
+			default:
67
+				return 'N';
68 68
 		}
69 69
 	}
70 70
 	
71 71
  	function ActualType($meta)
72 72
 	{
73 73
 		switch($meta) {
74
-		case 'C': return 'VARCHAR';
75
-		case 'X': return $this->typeX;
76
-		case 'XL': return $this->typeXL;
74
+			case 'C': return 'VARCHAR';
75
+			case 'X': return $this->typeX;
76
+			case 'XL': return $this->typeXL;
77 77
 		
78
-		case 'C2': return 'NVARCHAR';
79
-		case 'X2': return 'NVARCHAR(2000)';
78
+			case 'C2': return 'NVARCHAR';
79
+			case 'X2': return 'NVARCHAR(2000)';
80 80
 		
81
-		case 'B': return 'BLOB';
81
+			case 'B': return 'BLOB';
82 82
 			
83
-		case 'D': 
84
-		case 'T': return 'DATE';
85
-		case 'L': return 'DECIMAL(1)';
86
-		case 'I1': return 'DECIMAL(3)';
87
-		case 'I2': return 'DECIMAL(5)';
88
-		case 'I':
89
-		case 'I4': return 'DECIMAL(10)';
83
+			case 'D': 
84
+			case 'T': return 'DATE';
85
+			case 'L': return 'DECIMAL(1)';
86
+			case 'I1': return 'DECIMAL(3)';
87
+			case 'I2': return 'DECIMAL(5)';
88
+			case 'I':
89
+			case 'I4': return 'DECIMAL(10)';
90 90
 		
91
-		case 'I8': return 'DECIMAL(20)';
92
-		case 'F': return 'DECIMAL';
93
-		case 'N': return 'DECIMAL';
94
-		default:
95
-			return $meta;
91
+			case 'I8': return 'DECIMAL(20)';
92
+			case 'F': return 'DECIMAL';
93
+			case 'N': return 'DECIMAL';
94
+			default:
95
+				return $meta;
96 96
 		}	
97 97
 	}
98 98
 	
Please login to merge, or discard this patch.