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 +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -147,12 +147,12 @@
 block discarded – undo
 		}
 		switch ($mode)
 		{
-		case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
+			case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
+			case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
 		
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default: $this->fetchMode = PGSQL_BOTH; break;
+			case ADODB_FETCH_DEFAULT:
+			case ADODB_FETCH_BOTH:
+			default: $this->fetchMode = PGSQL_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
 		$this->ADORecordSet($queryID);

Please login to merge, or discard this patch.

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

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

@@ -219,50 +219,50 @@  discard block
 block discarded – undo
 			if ($s) $s .= '+';
 			$ch = $fmt[$i];
 			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= "datename(yyyy,$col)";
-				break;
-			case 'M':
-				$s .= "convert(char(3),$col,0)";
-				break;
-			case 'm':
-				$s .= "replace(str(month($col),2),' ','0')";
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "datename(quarter,$col)";
-				break;
-			case 'D':
-			case 'd':
-				$s .= "replace(str(day($col),2),' ','0')";
-				break;
-			case 'h':
-				$s .= "substring(convert(char(14),$col,0),13,2)";
-				break;
+				case 'Y':
+				case 'y':
+					$s .= "datename(yyyy,$col)";
+					break;
+				case 'M':
+					$s .= "convert(char(3),$col,0)";
+					break;
+				case 'm':
+					$s .= "replace(str(month($col),2),' ','0')";
+					break;
+				case 'Q':
+				case 'q':
+					$s .= "datename(quarter,$col)";
+					break;
+				case 'D':
+				case 'd':
+					$s .= "replace(str(day($col),2),' ','0')";
+					break;
+				case 'h':
+					$s .= "substring(convert(char(14),$col,0),13,2)";
+					break;
 			
-			case 'H':
-				$s .= "replace(str(datepart(hh,$col),2),' ','0')";
-				break;
+				case 'H':
+					$s .= "replace(str(datepart(hh,$col),2),' ','0')";
+					break;
 				
-			case 'i':
-				$s .= "replace(str(datepart(mi,$col),2),' ','0')";
-				break;
-			case 's':
-				$s .= "replace(str(datepart(ss,$col),2),' ','0')";
-				break;
-			case 'a':
-			case 'A':
-				$s .= "substring(convert(char(19),$col,0),18,2)";
-				break;
+				case 'i':
+					$s .= "replace(str(datepart(mi,$col),2),' ','0')";
+					break;
+				case 's':
+					$s .= "replace(str(datepart(ss,$col),2),' ','0')";
+					break;
+				case 'a':
+				case 'A':
+					$s .= "substring(convert(char(19),$col,0),18,2)";
+					break;
 				
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-				break;
+				default:
+					if ($ch == '\\') {
+						$i++;
+						$ch = substr($fmt,$i,1);
+					}
+					$s .= $this->qstr($ch);
+					break;
 			}
 		}
 		return $s;
@@ -588,11 +588,11 @@  discard block
 block discarded – undo
 			
 		if ($type === false) 
 			switch(gettype($var)) {
-			default:
-			case 'string': $type = SQLCHAR; break;
-			case 'double': $type = SQLFLT8; break;
-			case 'integer': $type = SQLINT4; break;
-			case 'boolean': $type = SQLINT1; break; # SQLBIT not supported in 4.1.0
+				default:
+				case 'string': $type = SQLCHAR; break;
+				case 'double': $type = SQLFLT8; break;
+				case 'integer': $type = SQLINT4; break;
+				case 'boolean': $type = SQLINT1; break; # SQLBIT not supported in 4.1.0
 			}
 		
 		if  ($this->debug) {
@@ -978,14 +978,14 @@  discard block
 block discarded – undo
 		if ($themth <= 0) return false;
 		
 		switch (strtoupper($rr[6])) {
-		case 'P':
-			if ($rr[4]<12) $rr[4] += 12;
-			break;
-		case 'A':
-			if ($rr[4]==12) $rr[4] = 0;
-			break;
-		default:
-			break;
+			case 'P':
+				if ($rr[4]<12) $rr[4] += 12;
+				break;
+			case 'A':
+				if ($rr[4]==12) $rr[4] = 0;
+				break;
+			default:
+				break;
 		}
 		// h-m-s-MM-DD-YY
 		return  mktime($rr[4],$rr[5],0,$themth,$theday,$rr[3]);

Please login to merge, or discard this patch.

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

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

		@@ -198,50 +198,50 @@ discard block
		block discarded – undo
198	198	if ($s) $s .= '+';
199	199	$ch = $fmt[$i];
200	200	switch($ch) {
201		- case 'Y':
202		- case 'y':
203		- $s .= "datename(yy,$col)";
204		- break;
205		- case 'M':
206		- $s .= "convert(char(3),$col,0)";
207		- break;
208		- case 'm':
209		- $s .= "replace(str(month($col),2),' ','0')";
210		- break;
211		- case 'Q':
212		- case 'q':
213		- $s .= "datename(qq,$col)";
214		- break;
215		- case 'D':
216		- case 'd':
217		- $s .= "replace(str(datepart(dd,$col),2),' ','0')";
218		- break;
219		- case 'h':
220		- $s .= "substring(convert(char(14),$col,0),13,2)";
221		- break;
	201	+ case 'Y':
	202	+ case 'y':
	203	+ $s .= "datename(yy,$col)";
	204	+ break;
	205	+ case 'M':
	206	+ $s .= "convert(char(3),$col,0)";
	207	+ break;
	208	+ case 'm':
	209	+ $s .= "replace(str(month($col),2),' ','0')";
	210	+ break;
	211	+ case 'Q':
	212	+ case 'q':
	213	+ $s .= "datename(qq,$col)";
	214	+ break;
	215	+ case 'D':
	216	+ case 'd':
	217	+ $s .= "replace(str(datepart(dd,$col),2),' ','0')";
	218	+ break;
	219	+ case 'h':
	220	+ $s .= "substring(convert(char(14),$col,0),13,2)";
	221	+ break;
222	222
223		- case 'H':
224		- $s .= "replace(str(datepart(hh,$col),2),' ','0')";
225		- break;
	223	+ case 'H':
	224	+ $s .= "replace(str(datepart(hh,$col),2),' ','0')";
	225	+ break;
226	226
227		- case 'i':
228		- $s .= "replace(str(datepart(mi,$col),2),' ','0')";
229		- break;
230		- case 's':
231		- $s .= "replace(str(datepart(ss,$col),2),' ','0')";
232		- break;
233		- case 'a':
234		- case 'A':
235		- $s .= "substring(convert(char(19),$col,0),18,2)";
236		- break;
	227	+ case 'i':
	228	+ $s .= "replace(str(datepart(mi,$col),2),' ','0')";
	229	+ break;
	230	+ case 's':
	231	+ $s .= "replace(str(datepart(ss,$col),2),' ','0')";
	232	+ break;
	233	+ case 'a':
	234	+ case 'A':
	235	+ $s .= "substring(convert(char(19),$col,0),18,2)";
	236	+ break;
237	237
238		- default:
239		- if ($ch == '\\') {
240		- $i++;
241		- $ch = substr($fmt,$i,1);
242		- }
243		- $s .= $this->qstr($ch);
244		- break;
	238	+ default:
	239	+ if ($ch == '\\') {
	240	+ $i++;
	241	+ $ch = substr($fmt,$i,1);
	242	+ }
	243	+ $s .= $this->qstr($ch);
	244	+ break;
245	245	}
246	246	}
247	247	return $s;
		@@ -397,14 +397,14 @@ discard block
		block discarded – undo
397	397	if ($themth <= 0) return false;
398	398
399	399	switch (strtoupper($rr[6])) {
400		- case 'P':
401		- if ($rr[4]<12) $rr[4] += 12;
402		- break;
403		- case 'A':
404		- if ($rr[4]==12) $rr[4] = 0;
405		- break;
406		- default:
407		- break;
	400	+ case 'P':
	401	+ if ($rr[4]<12) $rr[4] += 12;
	402	+ break;
	403	+ case 'A':
	404	+ if ($rr[4]==12) $rr[4] = 0;
	405	+ break;
	406	+ default:
	407	+ break;
408	408	}
409	409	// h-m-s-MM-DD-YY
410	410	return mktime($rr[4],$rr[5],0,$themth,$rr[2],$rr[3]);

Please login to merge, or discard this patch.

phpgwapi/inc/adodb/drivers/adodb-ado.inc.php 1 patch

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

@@ -481,43 +481,43 @@  discard block
 block discarded – undo
 		if (!is_numeric($t)) return $t;
 		
 		switch ($t) {
-		case 0:
-		case 12: // variant
-		case 8: // bstr
-		case 129: //char
-		case 130: //wc
-		case 200: // varc
-		case 202:// varWC
-		case 128: // bin
-		case 204: // varBin
-		case 72: // guid
-			if ($len <= $this->blobSize) return 'C';
+			case 0:
+			case 12: // variant
+			case 8: // bstr
+			case 129: //char
+			case 130: //wc
+			case 200: // varc
+			case 202:// varWC
+			case 128: // bin
+			case 204: // varBin
+			case 72: // guid
+				if ($len <= $this->blobSize) return 'C';
 		
-		case 201:
-		case 203:
-			return 'X';
-		case 128:
-		case 204:
-		case 205:
-			 return 'B';
-		case 7:
-		case 133: return 'D';
+			case 201:
+			case 203:
+				return 'X';
+			case 128:
+			case 204:
+			case 205:
+			 	return 'B';
+			case 7:
+			case 133: return 'D';
 		
-		case 134:
-		case 135: return 'T';
+			case 134:
+			case 135: return 'T';
 		
-		case 11: return 'L';
+			case 11: return 'L';
 		
-		case 16://	adTinyInt	= 16,
-		case 2://adSmallInt	= 2,
-		case 3://adInteger	= 3,
-		case 4://adBigInt	= 20,
-		case 17://adUnsignedTinyInt	= 17,
-		case 18://adUnsignedSmallInt	= 18,
-		case 19://adUnsignedInt	= 19,
-		case 20://adUnsignedBigInt	= 21,
-			return 'I';
-		default: return 'N';
+			case 16://	adTinyInt	= 16,
+			case 2://adSmallInt	= 2,
+			case 3://adInteger	= 3,
+			case 4://adBigInt	= 20,
+			case 17://adUnsignedTinyInt	= 17,
+			case 18://adUnsignedSmallInt	= 18,
+			case 19://adUnsignedInt	= 19,
+			case 20://adUnsignedBigInt	= 21,
+				return 'I';
+			default: return 'N';
 		}
 	}
 	
@@ -550,40 +550,40 @@  discard block
 block discarded – undo
 		for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
 			//echo "<p>",$t,' ';var_dump($f->value); echo '</p>';
 			switch($t) {
-			case 135: // timestamp
-				if (!strlen((string)$f->value)) $this->fields[] = false;
-				else {
-					if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
-					else $val = $f->value;
-					$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
-				}
-				break;			
-			case 133:// A date value (yyyymmdd) 
-				if ($val = $f->value) {
-					$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
-				} else
-					$this->fields[] = false;
-				break;
-			case 7: // adDate
-				if (!strlen((string)$f->value)) $this->fields[] = false;
-				else {
-					if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
-					else $val = $f->value;
+				case 135: // timestamp
+					if (!strlen((string)$f->value)) $this->fields[] = false;
+					else {
+						if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
+						else $val = $f->value;
+						$this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+					}
+					break;			
+				case 133:// A date value (yyyymmdd) 
+					if ($val = $f->value) {
+						$this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
+					} else
+						$this->fields[] = false;
+					break;
+				case 7: // adDate
+					if (!strlen((string)$f->value)) $this->fields[] = false;
+					else {
+						if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
+						else $val = $f->value;
 					
-					if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
-					else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
-				}
-				break;
-			case 1: // null
-				$this->fields[] = false;
-				break;
-			case 6: // currency is not supported properly;
-				ADOConnection::outp( '<b>'.$f->Name.': currency type not supported by PHP</b>');
-				$this->fields[] = (float) $f->value;
-				break;
-			default:
-				$this->fields[] = $f->value; 
-				break;
+						if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
+						else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
+					}
+					break;
+				case 1: // null
+					$this->fields[] = false;
+					break;
+				case 6: // currency is not supported properly;
+					ADOConnection::outp( '<b>'.$f->Name.': currency type not supported by PHP</b>');
+					$this->fields[] = (float) $f->value;
+					break;
+				default:
+					$this->fields[] = $f->value; 
+					break;
 			}
 			//print " $f->value $t, ";
 			$f = next($this->_flds);

Please login to merge, or discard this patch.

phpgwapi/inc/adodb/drivers/adodb-mysql.inc.php 1 patch

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

@@ -248,70 +248,70 @@  discard block
 block discarded – undo
 			$ch = $fmt[$i];
 			switch($ch) {
 
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				/** FALL THROUGH */
-			case '-':
-			case '/':
-				$s .= $ch;
-				break;
-
-			case 'Y':
-			case 'y':
-				$s .= '%Y';
-				break;
-			case 'M':
-				$s .= '%b';
-				break;
-
-			case 'm':
-				$s .= '%m';
-				break;
-			case 'D':
-			case 'd':
-				$s .= '%d';
-				break;
-
-			case 'Q':
-			case 'q':
-				$s .= "'),Quarter($col)";
-
-				if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
-				else $s .= ",('";
-				$concat = true;
-				break;
-
-			case 'H':
-				$s .= '%H';
-				break;
-
-			case 'h':
-				$s .= '%I';
-				break;
-
-			case 'i':
-				$s .= '%i';
-				break;
-
-			case 's':
-				$s .= '%s';
-				break;
-
-			case 'a':
-			case 'A':
-				$s .= '%p';
-				break;
-
-			case 'w':
-				$s .= '%w';
-				break;
-
-			case 'l':
-				$s .= '%W';
-				break;
+				default:
+					if ($ch == '\\') {
+						$i++;
+						$ch = substr($fmt,$i,1);
+					}
+					/** FALL THROUGH */
+				case '-':
+				case '/':
+					$s .= $ch;
+					break;
+
+				case 'Y':
+				case 'y':
+					$s .= '%Y';
+					break;
+				case 'M':
+					$s .= '%b';
+					break;
+
+				case 'm':
+					$s .= '%m';
+					break;
+				case 'D':
+				case 'd':
+					$s .= '%d';
+					break;
+
+				case 'Q':
+				case 'q':
+					$s .= "'),Quarter($col)";
+
+					if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
+					else $s .= ",('";
+					$concat = true;
+					break;
+
+				case 'H':
+					$s .= '%H';
+					break;
+
+				case 'h':
+					$s .= '%I';
+					break;
+
+				case 'i':
+					$s .= '%i';
+					break;
+
+				case 's':
+					$s .= '%s';
+					break;
+
+				case 'a':
+				case 'A':
+					$s .= '%p';
+					break;
+
+				case 'w':
+					$s .= '%w';
+					break;
+
+				case 'l':
+					$s .= '%W';
+					break;
 			}
 		}
 		$s.="')";
@@ -649,12 +649,12 @@  discard block
 block discarded – undo
 		}
 		switch ($mode)
 		{
-		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default:
-			$this->fetchMode = MYSQL_BOTH; break;
+			case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
+			case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
+			case ADODB_FETCH_DEFAULT:
+			case ADODB_FETCH_BOTH:
+			default:
+				$this->fetchMode = MYSQL_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
 		$this->ADORecordSet($queryID);
@@ -751,46 +751,46 @@  discard block
 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 'INT':
-		case 'INTEGER':
-		case 'BIGINT':
-		case 'TINYINT':
-		case 'MEDIUMINT':
-		case 'SMALLINT':
-
-			if (!empty($fieldobj->primary_key)) return 'R';
-			else return 'I';
-
-		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 'INT':
+			case 'INTEGER':
+			case 'BIGINT':
+			case 'TINYINT':
+			case 'MEDIUMINT':
+			case 'SMALLINT':
+
+				if (!empty($fieldobj->primary_key)) return 'R';
+				else return 'I';
+
+			default: return 'N';
 		}
 	}
 
@@ -805,12 +805,12 @@  discard block
 block discarded – undo
 		}
 		switch ($mode)
 		{
-		case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
-		case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:
-		default:
-		$this->fetchMode = MYSQL_BOTH; break;
+			case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
+			case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
+			case ADODB_FETCH_DEFAULT:
+			case ADODB_FETCH_BOTH:
+			default:
+			$this->fetchMode = MYSQL_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
 		$this->ADORecordSet($queryID);

Please login to merge, or discard this patch.

phpgwapi/inc/adodb/drivers/adodb-oci8.inc.php 1 patch

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

@@ -454,64 +454,64 @@  discard block
 block discarded – undo
 		for ($i=0; $i < $len; $i++) {
 			$ch = $fmt[$i];
 			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= 'YYYY';
-				break;
-			case 'Q':
-			case 'q':
-				$s .= 'Q';
-				break;
+				case 'Y':
+				case 'y':
+					$s .= 'YYYY';
+					break;
+				case 'Q':
+				case 'q':
+					$s .= 'Q';
+					break;
 				
-			case 'M':
-				$s .= 'Mon';
-				break;
+				case 'M':
+					$s .= 'Mon';
+					break;
 				
-			case 'm':
-				$s .= 'MM';
-				break;
-			case 'D':
-			case 'd':
-				$s .= 'DD';
-				break;
+				case 'm':
+					$s .= 'MM';
+					break;
+				case 'D':
+				case 'd':
+					$s .= 'DD';
+					break;
 			
-			case 'H':
-				$s.= 'HH24';
-				break;
+				case 'H':
+					$s.= 'HH24';
+					break;
 				
-			case 'h':
-				$s .= 'HH';
-				break;
+				case 'h':
+					$s .= 'HH';
+					break;
 				
-			case 'i':
-				$s .= 'MI';
-				break;
+				case 'i':
+					$s .= 'MI';
+					break;
 			
-			case 's':
-				$s .= 'SS';
-				break;
+				case 's':
+					$s .= 'SS';
+					break;
 			
-			case 'a':
-			case 'A':
-				$s .= 'AM';
-				break;
+				case 'a':
+				case 'A':
+					$s .= 'AM';
+					break;
 				
-			case 'w':
-				$s .= 'D';
-				break;
+				case 'w':
+					$s .= 'D';
+					break;
 				
-			case 'l':
-				$s .= 'DAY';
-				break;
+				case 'l':
+					$s .= 'DAY';
+					break;
 				
-			default:
-			// handle escape characters...
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
-				else $s .= '"'.$ch.'"';
+				default:
+				// handle escape characters...
+					if ($ch == '\\') {
+						$i++;
+						$ch = substr($fmt,$i,1);
+					}
+					if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
+					else $s .= '"'.$ch.'"';
 				
 			}
 		}
@@ -655,9 +655,9 @@  discard block
 block discarded – undo
 		//if (strlen($val) < 4000) return $this->Execute("UPDATE $table SET $column=:blob WHERE $where",array('blob'=>$val)) != false;
 		
 		switch(strtoupper($blobtype)) {
-		default: ADOConnection::outp("<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
-		case 'BLOB': $type = OCI_B_BLOB; break;
-		case 'CLOB': $type = OCI_B_CLOB; break;
+			default: ADOConnection::outp("<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
+			case 'BLOB': $type = OCI_B_BLOB; break;
+			case 'CLOB': $type = OCI_B_CLOB; break;
 		}
 		
 		if ($this->databaseType == 'oci8po') 
@@ -686,9 +686,9 @@  discard block
 block discarded – undo
 	function UpdateBlobFile($table,$column,$val,$where,$blobtype='BLOB')
 	{
 		switch(strtoupper($blobtype)) {
-		default: ADOConnection::outp( "<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
-		case 'BLOB': $type = OCI_B_BLOB; break;
-		case 'CLOB': $type = OCI_B_CLOB; break;
+			default: ADOConnection::outp( "<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
+			case 'BLOB': $type = OCI_B_BLOB; break;
+			case 'CLOB': $type = OCI_B_CLOB; break;
 		}
 		
 		if ($this->databaseType == 'oci8po') 
@@ -1196,12 +1196,12 @@  discard block
 block discarded – undo
 		}
 		switch ($mode)
 		{
-		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_NUM: 
-		default:
-		$this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+			case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+			case ADODB_FETCH_DEFAULT:
+			case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+			case ADODB_FETCH_NUM: 
+			default:
+			$this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
 		}
 		
 		$this->adodbFetchMode = $mode;
@@ -1415,37 +1415,37 @@  discard block
 block discarded – undo
 		switch (strtoupper($t)) {
 	 	case 'VARCHAR':
 	 	case 'VARCHAR2':
-		case 'CHAR':
-		case 'VARBINARY':
-		case 'BINARY':
-		case 'NCHAR':
-		case 'NVARCHAR':
-		case 'NVARCHAR2':
-				 if (isset($this) && $len <= $this->blobSize) return 'C';
+			case 'CHAR':
+			case 'VARBINARY':
+			case 'BINARY':
+			case 'NCHAR':
+			case 'NVARCHAR':
+			case 'NVARCHAR2':
+				 	if (isset($this) && $len <= $this->blobSize) return 'C';
 		
-		case 'NCLOB':
-		case 'LONG':
-		case 'LONG VARCHAR':
-		case 'CLOB':
-		return 'X';
+			case 'NCLOB':
+			case 'LONG':
+			case 'LONG VARCHAR':
+			case 'CLOB':
+			return 'X';
 		
-		case 'LONG RAW':
-		case 'LONG VARBINARY':
-		case 'BLOB':
-			return 'B';
+			case 'LONG RAW':
+			case 'LONG VARBINARY':
+			case 'BLOB':
+				return 'B';
 		
-		case 'DATE': 
-			return  ($this->connection->datetime) ? 'T' : 'D';
+			case 'DATE': 
+				return  ($this->connection->datetime) ? 'T' : 'D';
 		
 		
-		case 'TIMESTAMP': return 'T';
+			case 'TIMESTAMP': return 'T';
 		
-		case 'INT': 
-		case 'SMALLINT':
-		case 'INTEGER': 
-			return 'I';
+			case 'INT': 
+			case 'SMALLINT':
+			case 'INTEGER': 
+				return 'I';
 			
-		default: return 'N';
+			default: return 'N';
 		}
 	}
 }
@@ -1459,11 +1459,11 @@  discard block
 block discarded – undo
 		}
 		switch ($mode)
 		{
-		case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_DEFAULT:
-		case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
-		case ADODB_FETCH_NUM: 
-		default: $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+			case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+			case ADODB_FETCH_DEFAULT:
+			case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
+			case ADODB_FETCH_NUM: 
+			default: $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
 		}
 		$this->adodbFetchMode = $mode;
 		$this->_queryID = $queryID;

Please login to merge, or discard this patch.

phpgwapi/inc/adodb/drivers/adodb-firebird.inc.php 1 patch

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

@@ -30,11 +30,11 @@
 block discarded – undo
 	{
 		$arr['dialect'] = $this->dialect;
 		switch($arr['dialect']) {
-		case '': 
-		case '1': $s = 'Firebird Dialect 1'; break;
-		case '2': $s = 'Firebird Dialect 2'; break;
-		default:
-		case '3': $s = 'Firebird Dialect 3'; break;
+			case '': 
+			case '1': $s = 'Firebird Dialect 1'; break;
+			case '2': $s = 'Firebird Dialect 2'; break;
+			default:
+			case '3': $s = 'Firebird Dialect 3'; break;
 		}
 		$arr['version'] = ADOConnection::_findvers($s);
 		$arr['description'] = $s;

Please login to merge, or discard this patch.

phpgwapi/inc/adodb/drivers/adodb-sqlite.inc.php 1 patch

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

@@ -301,9 +301,9 @@
 block discarded – undo
 			$mode = $ADODB_FETCH_MODE;
 		}
 		switch($mode) {
-		case ADODB_FETCH_NUM: $this->fetchMode = SQLITE_NUM; break;
-		case ADODB_FETCH_ASSOC: $this->fetchMode = SQLITE_ASSOC; break;
-		default: $this->fetchMode = SQLITE_BOTH; break;
+			case ADODB_FETCH_NUM: $this->fetchMode = SQLITE_NUM; break;
+			case ADODB_FETCH_ASSOC: $this->fetchMode = SQLITE_ASSOC; break;
+			default: $this->fetchMode = SQLITE_BOTH; break;
 		}
 		$this->adodbFetchMode = $mode;
 		

Please login to merge, or discard this patch.

phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php 1 patch

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

@@ -122,11 +122,11 @@  discard block
 block discarded – undo
 	{
 		$arr['dialect'] = $this->dialect;
 		switch($arr['dialect']) {
-		case '': 
-		case '1': $s = 'Interbase 5.5 or earlier'; break;
-		case '2': $s = 'Interbase 5.6'; break;
-		default:
-		case '3': $s = 'Interbase 6.0'; break;
+			case '': 
+			case '1': $s = 'Interbase 5.5 or earlier'; break;
+			case '2': $s = 'Interbase 5.6'; break;
+			default:
+			case '3': $s = 'Interbase 6.0'; break;
 		}
 		$arr['version'] = ADOConnection::_findvers($s);
 		$arr['description'] = $s;
@@ -330,15 +330,15 @@  discard block
 block discarded – undo
 					$ret = call_user_func_array($fn,$fnarr);
 				} else {
 					switch(sizeof($iarr)) {
-					case 1: $ret = $fn($sql,$iarr[0]); break;
-					case 2: $ret = $fn($sql,$iarr[0],$iarr[1]); break;
-					case 3: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2]); break;
-					case 4: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
-					case 5: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
-					case 6: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
-					case 7: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
-					default: ADOConnection::outp( "Too many parameters to ibase query $sql");
-					case 8: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
+						case 1: $ret = $fn($sql,$iarr[0]); break;
+						case 2: $ret = $fn($sql,$iarr[0],$iarr[1]); break;
+						case 3: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2]); break;
+						case 4: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
+						case 5: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
+						case 6: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
+						case 7: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
+						default: ADOConnection::outp( "Too many parameters to ibase query $sql");
+						case 8: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
 					}
 				}
 			} else $ret = $fn($sql); 
@@ -352,15 +352,15 @@  discard block
 block discarded – undo
 					$ret = call_user_func_array($fn,$fnarr);
 				} else {
 					switch(sizeof($iarr)) {
-					case 1: $ret = $fn($conn,$sql,$iarr[0]); break;
-					case 2: $ret = $fn($conn,$sql,$iarr[0],$iarr[1]); break;
-					case 3: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2]); break;
-					case 4: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
-					case 5: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
-					case 6: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
-					case 7: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
-					default: ADOConnection::outp( "Too many parameters to ibase query $sql");
-					case 8: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
+						case 1: $ret = $fn($conn,$sql,$iarr[0]); break;
+						case 2: $ret = $fn($conn,$sql,$iarr[0],$iarr[1]); break;
+						case 3: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2]); break;
+						case 4: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
+						case 5: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
+						case 6: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
+						case 7: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
+						default: ADOConnection::outp( "Too many parameters to ibase query $sql");
+						case 8: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
 					}
 				}
 			} else $ret = $fn($conn,$sql); 
@@ -509,15 +509,15 @@  discard block
 block discarded – undo
 				$d = substr($rs->fields[2],strlen('default '));
 				switch ($fld->type)
 				{
-				case 'smallint':
-				case 'integer': $fld->default_value = (int) $d; break;
-				case 'char': 
-				case 'blob':
-				case 'text':
-				case 'varchar': $fld->default_value = (string) substr($d,1,strlen($d)-2); break;
-				case 'double':
-				case 'float': $fld->default_value = (float) $d; break;
-				default: $fld->default_value = $d; break;
+					case 'smallint':
+					case 'integer': $fld->default_value = (int) $d; break;
+					case 'char': 
+					case 'blob':
+					case 'text':
+					case 'varchar': $fld->default_value = (string) substr($d,1,strlen($d)-2); break;
+					case 'double':
+					case 'float': $fld->default_value = (float) $d; break;
+					default: $fld->default_value = $d; break;
 				}
 		//	case 35:$tt = 'TIMESTAMP'; break;
 			}
@@ -651,42 +651,42 @@  discard block
 block discarded – undo
 			if ($s) $s .= '||';
 			$ch = $fmt[$i];
 			switch($ch) {
-			case 'Y':
-			case 'y':
-				$s .= "extract(year from $col)";
-				break;
-			case 'M':
-			case 'm':
-				$s .= "extract(month from $col)";
-				break;
-			case 'Q':
-			case 'q':
-				$s .= "cast(((extract(month from $col)+2) / 3) as integer)";
-				break;
-			case 'D':
-			case 'd':
-				$s .= "(extract(day from $col))";
-				break;
-			case 'H':
-			case 'h':
-			  $s .= "(extract(hour from $col))";
-			  break;                        
-			case 'I':
-			case 'i':
-			  $s .= "(extract(minute from $col))";
-			  break;                
-			case 'S':
-			case 's':
-			  $s .= "CAST((extract(second from $col)) AS INTEGER)";
-			  break;        
+				case 'Y':
+				case 'y':
+					$s .= "extract(year from $col)";
+					break;
+				case 'M':
+				case 'm':
+					$s .= "extract(month from $col)";
+					break;
+				case 'Q':
+				case 'q':
+					$s .= "cast(((extract(month from $col)+2) / 3) as integer)";
+					break;
+				case 'D':
+				case 'd':
+					$s .= "(extract(day from $col))";
+					break;
+				case 'H':
+				case 'h':
+			  	$s .= "(extract(hour from $col))";
+			  	break;                        
+				case 'I':
+				case 'i':
+			  	$s .= "(extract(minute from $col))";
+			  	break;                
+				case 'S':
+				case 's':
+			  	$s .= "CAST((extract(second from $col)) AS INTEGER)";
+			  	break;        
 
-			default:
-				if ($ch == '\\') {
-					$i++;
-					$ch = substr($fmt,$i,1);
-				}
-				$s .= $this->qstr($ch);
-				break;
+				default:
+					if ($ch == '\\') {
+						$i++;
+						$ch = substr($fmt,$i,1);
+					}
+					$s .= $this->qstr($ch);
+					break;
 			}
 		}
 		return $s;
@@ -722,18 +722,18 @@  discard block
 block discarded – undo
 			 $fld = new ADOFieldObject;
 			 $ibf = ibase_field_info($this->_queryID,$fieldOffset);
 			 switch (ADODB_ASSOC_CASE) {
-			 case 2: // the default
-			 	$fld->name = ($ibf['alias']);
-				 if (empty($fld->name)) $fld->name = ($ibf['name']);
-				 break;
-			 case 0: 
-				 $fld->name = strtoupper($ibf['alias']);
-				 if (empty($fld->name)) $fld->name = strtoupper($ibf['name']);
-				 break;
-			 case 1: 
-			 	$fld->name = strtolower($ibf['alias']);
-				 if (empty($fld->name)) $fld->name = strtolower($ibf['name']);
-				 break;
+			 	case 2: // the default
+			 		$fld->name = ($ibf['alias']);
+				 	if (empty($fld->name)) $fld->name = ($ibf['name']);
+				 	break;
+			 	case 0: 
+				 	$fld->name = strtoupper($ibf['alias']);
+				 	if (empty($fld->name)) $fld->name = strtoupper($ibf['name']);
+				 	break;
+			 	case 1: 
+			 		$fld->name = strtolower($ibf['alias']);
+				 	if (empty($fld->name)) $fld->name = strtolower($ibf['name']);
+				 	break;
 			 }
 			 
 			 $fld->type = $ibf['type'];
@@ -833,27 +833,27 @@  discard block
 block discarded – undo
 			$len = $fieldobj->max_length;
 		}
 		switch (strtoupper($t)) {
-		case 'CHAR':
-			return 'C';
+			case 'CHAR':
+				return 'C';
 			
-		case 'TEXT':
-		case 'VARCHAR':
-		case 'VARYING':
-		if ($len <= $this->blobSize) return 'C';
-			return 'X';
-		case 'BLOB':
-			return 'B';
+			case 'TEXT':
+			case 'VARCHAR':
+			case 'VARYING':
+			if ($len <= $this->blobSize) return 'C';
+				return 'X';
+			case 'BLOB':
+				return 'B';
 			   
-		case 'TIMESTAMP':
-		case 'DATE': return 'D';
-		case 'TIME': return 'T';
-				//case 'T': return 'T';
+			case 'TIMESTAMP':
+			case 'DATE': return 'D';
+			case 'TIME': return 'T';
+					//case 'T': return 'T';
 
-				//case 'L': return 'L';
-		case 'INT': 
-		case 'SHORT':
-		case 'INTEGER': return 'I';
-		default: return 'N';
+					//case 'L': return 'L';
+			case 'INT': 
+			case 'SHORT':
+			case 'INTEGER': return 'I';
+			default: return 'N';
 		}
 	}
 

Please login to merge, or discard this patch.

		@@ -147,12 +147,12 @@
		block discarded – undo
147	147	}
148	148	switch ($mode)
149	149	{
150		- case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
151		- case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
	150	+ case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
	151	+ case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
152	152
153		- case ADODB_FETCH_DEFAULT:
154		- case ADODB_FETCH_BOTH:
155		- default: $this->fetchMode = PGSQL_BOTH; break;
	153	+ case ADODB_FETCH_DEFAULT:
	154	+ case ADODB_FETCH_BOTH:
	155	+ default: $this->fetchMode = PGSQL_BOTH; break;
156	156	}
157	157	$this->adodbFetchMode = $mode;
158	158	$this->ADORecordSet($queryID);

		@@ -481,43 +481,43 @@ discard block
		block discarded – undo
481	481	if (!is_numeric($t)) return $t;
482	482
483	483	switch ($t) {
484		- case 0:
485		- case 12: // variant
486		- case 8: // bstr
487		- case 129: //char
488		- case 130: //wc
489		- case 200: // varc
490		- case 202:// varWC
491		- case 128: // bin
492		- case 204: // varBin
493		- case 72: // guid
494		- if ($len <= $this->blobSize) return 'C';
	484	+ case 0:
	485	+ case 12: // variant
	486	+ case 8: // bstr
	487	+ case 129: //char
	488	+ case 130: //wc
	489	+ case 200: // varc
	490	+ case 202:// varWC
	491	+ case 128: // bin
	492	+ case 204: // varBin
	493	+ case 72: // guid
	494	+ if ($len <= $this->blobSize) return 'C';
495	495
496		- case 201:
497		- case 203:
498		- return 'X';
499		- case 128:
500		- case 204:
501		- case 205:
502		- return 'B';
503		- case 7:
504		- case 133: return 'D';
	496	+ case 201:
	497	+ case 203:
	498	+ return 'X';
	499	+ case 128:
	500	+ case 204:
	501	+ case 205:
	502	+ return 'B';
	503	+ case 7:
	504	+ case 133: return 'D';
505	505
506		- case 134:
507		- case 135: return 'T';
	506	+ case 134:
	507	+ case 135: return 'T';
508	508
509		- case 11: return 'L';
	509	+ case 11: return 'L';
510	510
511		- case 16:// adTinyInt = 16,
512		- case 2://adSmallInt = 2,
513		- case 3://adInteger = 3,
514		- case 4://adBigInt = 20,
515		- case 17://adUnsignedTinyInt = 17,
516		- case 18://adUnsignedSmallInt = 18,
517		- case 19://adUnsignedInt = 19,
518		- case 20://adUnsignedBigInt = 21,
519		- return 'I';
520		- default: return 'N';
	511	+ case 16:// adTinyInt = 16,
	512	+ case 2://adSmallInt = 2,
	513	+ case 3://adInteger = 3,
	514	+ case 4://adBigInt = 20,
	515	+ case 17://adUnsignedTinyInt = 17,
	516	+ case 18://adUnsignedSmallInt = 18,
	517	+ case 19://adUnsignedInt = 19,
	518	+ case 20://adUnsignedBigInt = 21,
	519	+ return 'I';
	520	+ default: return 'N';
521	521	}
522	522	}
523	523
		@@ -550,40 +550,40 @@ discard block
		block discarded – undo
550	550	for ($i=0,$max = $this->_numOfFields; $i < $max; $i++) {
551	551	//echo "<p>",$t,' ';var_dump($f->value); echo '</p>';
552	552	switch($t) {
553		- case 135: // timestamp
554		- if (!strlen((string)$f->value)) $this->fields[] = false;
555		- else {
556		- if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
557		- else $val = $f->value;
558		- $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
559		- }
560		- break;
561		- case 133:// A date value (yyyymmdd)
562		- if ($val = $f->value) {
563		- $this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
564		- } else
565		- $this->fields[] = false;
566		- break;
567		- case 7: // adDate
568		- if (!strlen((string)$f->value)) $this->fields[] = false;
569		- else {
570		- if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
571		- else $val = $f->value;
	553	+ case 135: // timestamp
	554	+ if (!strlen((string)$f->value)) $this->fields[] = false;
	555	+ else {
	556	+ if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
	557	+ else $val = $f->value;
	558	+ $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
	559	+ }
	560	+ break;
	561	+ case 133:// A date value (yyyymmdd)
	562	+ if ($val = $f->value) {
	563	+ $this->fields[] = substr($val,0,4).'-'.substr($val,4,2).'-'.substr($val,6,2);
	564	+ } else
	565	+ $this->fields[] = false;
	566	+ break;
	567	+ case 7: // adDate
	568	+ if (!strlen((string)$f->value)) $this->fields[] = false;
	569	+ else {
	570	+ if (!is_numeric($f->value)) $val = variant_date_to_timestamp($f->value);
	571	+ else $val = $f->value;
572	572
573		- if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
574		- else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
575		- }
576		- break;
577		- case 1: // null
578		- $this->fields[] = false;
579		- break;
580		- case 6: // currency is not supported properly;
581		- ADOConnection::outp( '<b>'.$f->Name.': currency type not supported by PHP</b>');
582		- $this->fields[] = (float) $f->value;
583		- break;
584		- default:
585		- $this->fields[] = $f->value;
586		- break;
	573	+ if (($val % 86400) == 0) $this->fields[] = adodb_date('Y-m-d',$val);
	574	+ else $this->fields[] = adodb_date('Y-m-d H:i:s',$val);
	575	+ }
	576	+ break;
	577	+ case 1: // null
	578	+ $this->fields[] = false;
	579	+ break;
	580	+ case 6: // currency is not supported properly;
	581	+ ADOConnection::outp( '<b>'.$f->Name.': currency type not supported by PHP</b>');
	582	+ $this->fields[] = (float) $f->value;
	583	+ break;
	584	+ default:
	585	+ $this->fields[] = $f->value;
	586	+ break;
587	587	}
588	588	//print " $f->value $t, ";
589	589	$f = next($this->_flds);

		@@ -301,9 +301,9 @@
		block discarded – undo
301	301	$mode = $ADODB_FETCH_MODE;
302	302	}
303	303	switch($mode) {
304		- case ADODB_FETCH_NUM: $this->fetchMode = SQLITE_NUM; break;
305		- case ADODB_FETCH_ASSOC: $this->fetchMode = SQLITE_ASSOC; break;
306		- default: $this->fetchMode = SQLITE_BOTH; break;
	304	+ case ADODB_FETCH_NUM: $this->fetchMode = SQLITE_NUM; break;
	305	+ case ADODB_FETCH_ASSOC: $this->fetchMode = SQLITE_ASSOC; break;
	306	+ default: $this->fetchMode = SQLITE_BOTH; break;
307	307	}
308	308	$this->adodbFetchMode = $mode;
309	309

		@@ -219,50 +219,50 @@ discard block
		block discarded – undo
219	219	if ($s) $s .= '+';
220	220	$ch = $fmt[$i];
221	221	switch($ch) {
222		- case 'Y':
223		- case 'y':
224		- $s .= "datename(yyyy,$col)";
225		- break;
226		- case 'M':
227		- $s .= "convert(char(3),$col,0)";
228		- break;
229		- case 'm':
230		- $s .= "replace(str(month($col),2),' ','0')";
231		- break;
232		- case 'Q':
233		- case 'q':
234		- $s .= "datename(quarter,$col)";
235		- break;
236		- case 'D':
237		- case 'd':
238		- $s .= "replace(str(day($col),2),' ','0')";
239		- break;
240		- case 'h':
241		- $s .= "substring(convert(char(14),$col,0),13,2)";
242		- break;
	222	+ case 'Y':
	223	+ case 'y':
	224	+ $s .= "datename(yyyy,$col)";
	225	+ break;
	226	+ case 'M':
	227	+ $s .= "convert(char(3),$col,0)";
	228	+ break;
	229	+ case 'm':
	230	+ $s .= "replace(str(month($col),2),' ','0')";
	231	+ break;
	232	+ case 'Q':
	233	+ case 'q':
	234	+ $s .= "datename(quarter,$col)";
	235	+ break;
	236	+ case 'D':
	237	+ case 'd':
	238	+ $s .= "replace(str(day($col),2),' ','0')";
	239	+ break;
	240	+ case 'h':
	241	+ $s .= "substring(convert(char(14),$col,0),13,2)";
	242	+ break;
243	243
244		- case 'H':
245		- $s .= "replace(str(datepart(hh,$col),2),' ','0')";
246		- break;
	244	+ case 'H':
	245	+ $s .= "replace(str(datepart(hh,$col),2),' ','0')";
	246	+ break;
247	247
248		- case 'i':
249		- $s .= "replace(str(datepart(mi,$col),2),' ','0')";
250		- break;
251		- case 's':
252		- $s .= "replace(str(datepart(ss,$col),2),' ','0')";
253		- break;
254		- case 'a':
255		- case 'A':
256		- $s .= "substring(convert(char(19),$col,0),18,2)";
257		- break;
	248	+ case 'i':
	249	+ $s .= "replace(str(datepart(mi,$col),2),' ','0')";
	250	+ break;
	251	+ case 's':
	252	+ $s .= "replace(str(datepart(ss,$col),2),' ','0')";
	253	+ break;
	254	+ case 'a':
	255	+ case 'A':
	256	+ $s .= "substring(convert(char(19),$col,0),18,2)";
	257	+ break;
258	258
259		- default:
260		- if ($ch == '\\') {
261		- $i++;
262		- $ch = substr($fmt,$i,1);
263		- }
264		- $s .= $this->qstr($ch);
265		- break;
	259	+ default:
	260	+ if ($ch == '\\') {
	261	+ $i++;
	262	+ $ch = substr($fmt,$i,1);
	263	+ }
	264	+ $s .= $this->qstr($ch);
	265	+ break;
266	266	}
267	267	}
268	268	return $s;
		@@ -588,11 +588,11 @@ discard block
		block discarded – undo
588	588
589	589	if ($type === false)
590	590	switch(gettype($var)) {
591		- default:
592		- case 'string': $type = SQLCHAR; break;
593		- case 'double': $type = SQLFLT8; break;
594		- case 'integer': $type = SQLINT4; break;
595		- case 'boolean': $type = SQLINT1; break; # SQLBIT not supported in 4.1.0
	591	+ default:
	592	+ case 'string': $type = SQLCHAR; break;
	593	+ case 'double': $type = SQLFLT8; break;
	594	+ case 'integer': $type = SQLINT4; break;
	595	+ case 'boolean': $type = SQLINT1; break; # SQLBIT not supported in 4.1.0
596	596	}
597	597
598	598	if ($this->debug) {
		@@ -978,14 +978,14 @@ discard block
		block discarded – undo
978	978	if ($themth <= 0) return false;
979	979
980	980	switch (strtoupper($rr[6])) {
981		- case 'P':
982		- if ($rr[4]<12) $rr[4] += 12;
983		- break;
984		- case 'A':
985		- if ($rr[4]==12) $rr[4] = 0;
986		- break;
987		- default:
988		- break;
	981	+ case 'P':
	982	+ if ($rr[4]<12) $rr[4] += 12;
	983	+ break;
	984	+ case 'A':
	985	+ if ($rr[4]==12) $rr[4] = 0;
	986	+ break;
	987	+ default:
	988	+ break;
989	989	}
990	990	// h-m-s-MM-DD-YY
991	991	return mktime($rr[4],$rr[5],0,$themth,$theday,$rr[3]);

		@@ -248,70 +248,70 @@ discard block
		block discarded – undo
248	248	$ch = $fmt[$i];
249	249	switch($ch) {
250	250
251		- default:
252		- if ($ch == '\\') {
253		- $i++;
254		- $ch = substr($fmt,$i,1);
255		- }
256		- /** FALL THROUGH */
257		- case '-':
258		- case '/':
259		- $s .= $ch;
260		- break;
261		-
262		- case 'Y':
263		- case 'y':
264		- $s .= '%Y';
265		- break;
266		- case 'M':
267		- $s .= '%b';
268		- break;
269		-
270		- case 'm':
271		- $s .= '%m';
272		- break;
273		- case 'D':
274		- case 'd':
275		- $s .= '%d';
276		- break;
277		-
278		- case 'Q':
279		- case 'q':
280		- $s .= "'),Quarter($col)";
281		-
282		- if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
283		- else $s .= ",('";
284		- $concat = true;
285		- break;
286		-
287		- case 'H':
288		- $s .= '%H';
289		- break;
290		-
291		- case 'h':
292		- $s .= '%I';
293		- break;
294		-
295		- case 'i':
296		- $s .= '%i';
297		- break;
298		-
299		- case 's':
300		- $s .= '%s';
301		- break;
302		-
303		- case 'a':
304		- case 'A':
305		- $s .= '%p';
306		- break;
307		-
308		- case 'w':
309		- $s .= '%w';
310		- break;
311		-
312		- case 'l':
313		- $s .= '%W';
314		- break;
	251	+ default:
	252	+ if ($ch == '\\') {
	253	+ $i++;
	254	+ $ch = substr($fmt,$i,1);
	255	+ }
	256	+ /** FALL THROUGH */
	257	+ case '-':
	258	+ case '/':
	259	+ $s .= $ch;
	260	+ break;
	261	+
	262	+ case 'Y':
	263	+ case 'y':
	264	+ $s .= '%Y';
	265	+ break;
	266	+ case 'M':
	267	+ $s .= '%b';
	268	+ break;
	269	+
	270	+ case 'm':
	271	+ $s .= '%m';
	272	+ break;
	273	+ case 'D':
	274	+ case 'd':
	275	+ $s .= '%d';
	276	+ break;
	277	+
	278	+ case 'Q':
	279	+ case 'q':
	280	+ $s .= "'),Quarter($col)";
	281	+
	282	+ if ($len > $i+1) $s .= ",DATE_FORMAT($col,'";
	283	+ else $s .= ",('";
	284	+ $concat = true;
	285	+ break;
	286	+
	287	+ case 'H':
	288	+ $s .= '%H';
	289	+ break;
	290	+
	291	+ case 'h':
	292	+ $s .= '%I';
	293	+ break;
	294	+
	295	+ case 'i':
	296	+ $s .= '%i';
	297	+ break;
	298	+
	299	+ case 's':
	300	+ $s .= '%s';
	301	+ break;
	302	+
	303	+ case 'a':
	304	+ case 'A':
	305	+ $s .= '%p';
	306	+ break;
	307	+
	308	+ case 'w':
	309	+ $s .= '%w';
	310	+ break;
	311	+
	312	+ case 'l':
	313	+ $s .= '%W';
	314	+ break;
315	315	}
316	316	}
317	317	$s.="')";
		@@ -649,12 +649,12 @@ discard block
		block discarded – undo
649	649	}
650	650	switch ($mode)
651	651	{
652		- case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
653		- case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
654		- case ADODB_FETCH_DEFAULT:
655		- case ADODB_FETCH_BOTH:
656		- default:
657		- $this->fetchMode = MYSQL_BOTH; break;
	652	+ case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
	653	+ case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
	654	+ case ADODB_FETCH_DEFAULT:
	655	+ case ADODB_FETCH_BOTH:
	656	+ default:
	657	+ $this->fetchMode = MYSQL_BOTH; break;
658	658	}
659	659	$this->adodbFetchMode = $mode;
660	660	$this->ADORecordSet($queryID);
		@@ -751,46 +751,46 @@ discard block
		block discarded – undo
751	751
752	752	$len = -1; // mysql max_length is not accurate
753	753	switch (strtoupper($t)) {
754		- case 'STRING':
755		- case 'CHAR':
756		- case 'VARCHAR':
757		- case 'TINYBLOB':
758		- case 'TINYTEXT':
759		- case 'ENUM':
760		- case 'SET':
761		- if ($len <= $this->blobSize) return 'C';
762		-
763		- case 'TEXT':
764		- case 'LONGTEXT':
765		- case 'MEDIUMTEXT':
766		- return 'X';
767		-
768		- // php_mysql extension always returns 'blob' even if 'text'
769		- // so we have to check whether binary...
770		- case 'IMAGE':
771		- case 'LONGBLOB':
772		- case 'BLOB':
773		- case 'MEDIUMBLOB':
774		- return !empty($fieldobj->binary) ? 'B' : 'X';
775		-
776		- case 'YEAR':
777		- case 'DATE': return 'D';
778		-
779		- case 'TIME':
780		- case 'DATETIME':
781		- case 'TIMESTAMP': return 'T';
782		-
783		- case 'INT':
784		- case 'INTEGER':
785		- case 'BIGINT':
786		- case 'TINYINT':
787		- case 'MEDIUMINT':
788		- case 'SMALLINT':
789		-
790		- if (!empty($fieldobj->primary_key)) return 'R';
791		- else return 'I';
792		-
793		- default: return 'N';
	754	+ case 'STRING':
	755	+ case 'CHAR':
	756	+ case 'VARCHAR':
	757	+ case 'TINYBLOB':
	758	+ case 'TINYTEXT':
	759	+ case 'ENUM':
	760	+ case 'SET':
	761	+ if ($len <= $this->blobSize) return 'C';
	762	+
	763	+ case 'TEXT':
	764	+ case 'LONGTEXT':
	765	+ case 'MEDIUMTEXT':
	766	+ return 'X';
	767	+
	768	+ // php_mysql extension always returns 'blob' even if 'text'
	769	+ // so we have to check whether binary...
	770	+ case 'IMAGE':
	771	+ case 'LONGBLOB':
	772	+ case 'BLOB':
	773	+ case 'MEDIUMBLOB':
	774	+ return !empty($fieldobj->binary) ? 'B' : 'X';
	775	+
	776	+ case 'YEAR':
	777	+ case 'DATE': return 'D';
	778	+
	779	+ case 'TIME':
	780	+ case 'DATETIME':
	781	+ case 'TIMESTAMP': return 'T';
	782	+
	783	+ case 'INT':
	784	+ case 'INTEGER':
	785	+ case 'BIGINT':
	786	+ case 'TINYINT':
	787	+ case 'MEDIUMINT':
	788	+ case 'SMALLINT':
	789	+
	790	+ if (!empty($fieldobj->primary_key)) return 'R';
	791	+ else return 'I';
	792	+
	793	+ default: return 'N';
794	794	}
795	795	}
796	796
		@@ -805,12 +805,12 @@ discard block
		block discarded – undo
805	805	}
806	806	switch ($mode)
807	807	{
808		- case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
809		- case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
810		- case ADODB_FETCH_DEFAULT:
811		- case ADODB_FETCH_BOTH:
812		- default:
813		- $this->fetchMode = MYSQL_BOTH; break;
	808	+ case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break;
	809	+ case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break;
	810	+ case ADODB_FETCH_DEFAULT:
	811	+ case ADODB_FETCH_BOTH:
	812	+ default:
	813	+ $this->fetchMode = MYSQL_BOTH; break;
814	814	}
815	815	$this->adodbFetchMode = $mode;
816	816	$this->ADORecordSet($queryID);

		@@ -454,64 +454,64 @@ discard block
		block discarded – undo
454	454	for ($i=0; $i < $len; $i++) {
455	455	$ch = $fmt[$i];
456	456	switch($ch) {
457		- case 'Y':
458		- case 'y':
459		- $s .= 'YYYY';
460		- break;
461		- case 'Q':
462		- case 'q':
463		- $s .= 'Q';
464		- break;
	457	+ case 'Y':
	458	+ case 'y':
	459	+ $s .= 'YYYY';
	460	+ break;
	461	+ case 'Q':
	462	+ case 'q':
	463	+ $s .= 'Q';
	464	+ break;
465	465
466		- case 'M':
467		- $s .= 'Mon';
468		- break;
	466	+ case 'M':
	467	+ $s .= 'Mon';
	468	+ break;
469	469
470		- case 'm':
471		- $s .= 'MM';
472		- break;
473		- case 'D':
474		- case 'd':
475		- $s .= 'DD';
476		- break;
	470	+ case 'm':
	471	+ $s .= 'MM';
	472	+ break;
	473	+ case 'D':
	474	+ case 'd':
	475	+ $s .= 'DD';
	476	+ break;
477	477
478		- case 'H':
479		- $s.= 'HH24';
480		- break;
	478	+ case 'H':
	479	+ $s.= 'HH24';
	480	+ break;
481	481
482		- case 'h':
483		- $s .= 'HH';
484		- break;
	482	+ case 'h':
	483	+ $s .= 'HH';
	484	+ break;
485	485
486		- case 'i':
487		- $s .= 'MI';
488		- break;
	486	+ case 'i':
	487	+ $s .= 'MI';
	488	+ break;
489	489
490		- case 's':
491		- $s .= 'SS';
492		- break;
	490	+ case 's':
	491	+ $s .= 'SS';
	492	+ break;
493	493
494		- case 'a':
495		- case 'A':
496		- $s .= 'AM';
497		- break;
	494	+ case 'a':
	495	+ case 'A':
	496	+ $s .= 'AM';
	497	+ break;
498	498
499		- case 'w':
500		- $s .= 'D';
501		- break;
	499	+ case 'w':
	500	+ $s .= 'D';
	501	+ break;
502	502
503		- case 'l':
504		- $s .= 'DAY';
505		- break;
	503	+ case 'l':
	504	+ $s .= 'DAY';
	505	+ break;
506	506
507		- default:
508		- // handle escape characters...
509		- if ($ch == '\\') {
510		- $i++;
511		- $ch = substr($fmt,$i,1);
512		- }
513		- if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
514		- else $s .= '"'.$ch.'"';
	507	+ default:
	508	+ // handle escape characters...
	509	+ if ($ch == '\\') {
	510	+ $i++;
	511	+ $ch = substr($fmt,$i,1);
	512	+ }
	513	+ if (strpos('-/.:;, ',$ch) !== false) $s .= $ch;
	514	+ else $s .= '"'.$ch.'"';
515	515
516	516	}
517	517	}
		@@ -655,9 +655,9 @@ discard block
		block discarded – undo
655	655	//if (strlen($val) < 4000) return $this->Execute("UPDATE $table SET $column=:blob WHERE $where",array('blob'=>$val)) != false;
656	656
657	657	switch(strtoupper($blobtype)) {
658		- default: ADOConnection::outp("<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
659		- case 'BLOB': $type = OCI_B_BLOB; break;
660		- case 'CLOB': $type = OCI_B_CLOB; break;
	658	+ default: ADOConnection::outp("<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
	659	+ case 'BLOB': $type = OCI_B_BLOB; break;
	660	+ case 'CLOB': $type = OCI_B_CLOB; break;
661	661	}
662	662
663	663	if ($this->databaseType == 'oci8po')
		@@ -686,9 +686,9 @@ discard block
		block discarded – undo
686	686	function UpdateBlobFile($table,$column,$val,$where,$blobtype='BLOB')
687	687	{
688	688	switch(strtoupper($blobtype)) {
689		- default: ADOConnection::outp( "<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
690		- case 'BLOB': $type = OCI_B_BLOB; break;
691		- case 'CLOB': $type = OCI_B_CLOB; break;
	689	+ default: ADOConnection::outp( "<b>UpdateBlob</b>: Unknown blobtype=$blobtype"); return false;
	690	+ case 'BLOB': $type = OCI_B_BLOB; break;
	691	+ case 'CLOB': $type = OCI_B_CLOB; break;
692	692	}
693	693
694	694	if ($this->databaseType == 'oci8po')
		@@ -1196,12 +1196,12 @@ discard block
		block discarded – undo
1196	1196	}
1197	1197	switch ($mode)
1198	1198	{
1199		- case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
1200		- case ADODB_FETCH_DEFAULT:
1201		- case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
1202		- case ADODB_FETCH_NUM:
1203		- default:
1204		- $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
	1199	+ case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
	1200	+ case ADODB_FETCH_DEFAULT:
	1201	+ case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
	1202	+ case ADODB_FETCH_NUM:
	1203	+ default:
	1204	+ $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
1205	1205	}
1206	1206
1207	1207	$this->adodbFetchMode = $mode;
		@@ -1415,37 +1415,37 @@ discard block
		block discarded – undo
1415	1415	switch (strtoupper($t)) {
1416	1416	case 'VARCHAR':
1417	1417	case 'VARCHAR2':
1418		- case 'CHAR':
1419		- case 'VARBINARY':
1420		- case 'BINARY':
1421		- case 'NCHAR':
1422		- case 'NVARCHAR':
1423		- case 'NVARCHAR2':
1424		- if (isset($this) && $len <= $this->blobSize) return 'C';
	1418	+ case 'CHAR':
	1419	+ case 'VARBINARY':
	1420	+ case 'BINARY':
	1421	+ case 'NCHAR':
	1422	+ case 'NVARCHAR':
	1423	+ case 'NVARCHAR2':
	1424	+ if (isset($this) && $len <= $this->blobSize) return 'C';
1425	1425
1426		- case 'NCLOB':
1427		- case 'LONG':
1428		- case 'LONG VARCHAR':
1429		- case 'CLOB':
1430		- return 'X';
	1426	+ case 'NCLOB':
	1427	+ case 'LONG':
	1428	+ case 'LONG VARCHAR':
	1429	+ case 'CLOB':
	1430	+ return 'X';
1431	1431
1432		- case 'LONG RAW':
1433		- case 'LONG VARBINARY':
1434		- case 'BLOB':
1435		- return 'B';
	1432	+ case 'LONG RAW':
	1433	+ case 'LONG VARBINARY':
	1434	+ case 'BLOB':
	1435	+ return 'B';
1436	1436
1437		- case 'DATE':
1438		- return ($this->connection->datetime) ? 'T' : 'D';
	1437	+ case 'DATE':
	1438	+ return ($this->connection->datetime) ? 'T' : 'D';
1439	1439
1440	1440
1441		- case 'TIMESTAMP': return 'T';
	1441	+ case 'TIMESTAMP': return 'T';
1442	1442
1443		- case 'INT':
1444		- case 'SMALLINT':
1445		- case 'INTEGER':
1446		- return 'I';
	1443	+ case 'INT':
	1444	+ case 'SMALLINT':
	1445	+ case 'INTEGER':
	1446	+ return 'I';
1447	1447
1448		- default: return 'N';
	1448	+ default: return 'N';
1449	1449	}
1450	1450	}
1451	1451	}
		@@ -1459,11 +1459,11 @@ discard block
		block discarded – undo
1459	1459	}
1460	1460	switch ($mode)
1461	1461	{
1462		- case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
1463		- case ADODB_FETCH_DEFAULT:
1464		- case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
1465		- case ADODB_FETCH_NUM:
1466		- default: $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
	1462	+ case ADODB_FETCH_ASSOC:$this->fetchMode = OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
	1463	+ case ADODB_FETCH_DEFAULT:
	1464	+ case ADODB_FETCH_BOTH:$this->fetchMode = OCI_NUM+OCI_ASSOC+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
	1465	+ case ADODB_FETCH_NUM:
	1466	+ default: $this->fetchMode = OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS; break;
1467	1467	}
1468	1468	$this->adodbFetchMode = $mode;
1469	1469	$this->_queryID = $queryID;

		@@ -30,11 +30,11 @@
		block discarded – undo
30	30	{
31	31	$arr['dialect'] = $this->dialect;
32	32	switch($arr['dialect']) {
33		- case '':
34		- case '1': $s = 'Firebird Dialect 1'; break;
35		- case '2': $s = 'Firebird Dialect 2'; break;
36		- default:
37		- case '3': $s = 'Firebird Dialect 3'; break;
	33	+ case '':
	34	+ case '1': $s = 'Firebird Dialect 1'; break;
	35	+ case '2': $s = 'Firebird Dialect 2'; break;
	36	+ default:
	37	+ case '3': $s = 'Firebird Dialect 3'; break;
38	38	}
39	39	$arr['version'] = ADOConnection::_findvers($s);
40	40	$arr['description'] = $s;

		@@ -122,11 +122,11 @@ discard block
		block discarded – undo
122	122	{
123	123	$arr['dialect'] = $this->dialect;
124	124	switch($arr['dialect']) {
125		- case '':
126		- case '1': $s = 'Interbase 5.5 or earlier'; break;
127		- case '2': $s = 'Interbase 5.6'; break;
128		- default:
129		- case '3': $s = 'Interbase 6.0'; break;
	125	+ case '':
	126	+ case '1': $s = 'Interbase 5.5 or earlier'; break;
	127	+ case '2': $s = 'Interbase 5.6'; break;
	128	+ default:
	129	+ case '3': $s = 'Interbase 6.0'; break;
130	130	}
131	131	$arr['version'] = ADOConnection::_findvers($s);
132	132	$arr['description'] = $s;
		@@ -330,15 +330,15 @@ discard block
		block discarded – undo
330	330	$ret = call_user_func_array($fn,$fnarr);
331	331	} else {
332	332	switch(sizeof($iarr)) {
333		- case 1: $ret = $fn($sql,$iarr[0]); break;
334		- case 2: $ret = $fn($sql,$iarr[0],$iarr[1]); break;
335		- case 3: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2]); break;
336		- case 4: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
337		- case 5: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
338		- case 6: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
339		- case 7: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
340		- default: ADOConnection::outp( "Too many parameters to ibase query $sql");
341		- case 8: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
	333	+ case 1: $ret = $fn($sql,$iarr[0]); break;
	334	+ case 2: $ret = $fn($sql,$iarr[0],$iarr[1]); break;
	335	+ case 3: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2]); break;
	336	+ case 4: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
	337	+ case 5: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
	338	+ case 6: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
	339	+ case 7: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
	340	+ default: ADOConnection::outp( "Too many parameters to ibase query $sql");
	341	+ case 8: $ret = $fn($sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
342	342	}
343	343	}
344	344	} else $ret = $fn($sql);
		@@ -352,15 +352,15 @@ discard block
		block discarded – undo
352	352	$ret = call_user_func_array($fn,$fnarr);
353	353	} else {
354	354	switch(sizeof($iarr)) {
355		- case 1: $ret = $fn($conn,$sql,$iarr[0]); break;
356		- case 2: $ret = $fn($conn,$sql,$iarr[0],$iarr[1]); break;
357		- case 3: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2]); break;
358		- case 4: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
359		- case 5: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
360		- case 6: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
361		- case 7: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
362		- default: ADOConnection::outp( "Too many parameters to ibase query $sql");
363		- case 8: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
	355	+ case 1: $ret = $fn($conn,$sql,$iarr[0]); break;
	356	+ case 2: $ret = $fn($conn,$sql,$iarr[0],$iarr[1]); break;
	357	+ case 3: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2]); break;
	358	+ case 4: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3]); break;
	359	+ case 5: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4]); break;
	360	+ case 6: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5]); break;
	361	+ case 7: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6]); break;
	362	+ default: ADOConnection::outp( "Too many parameters to ibase query $sql");
	363	+ case 8: $ret = $fn($conn,$sql,$iarr[0],$iarr[1],$iarr[2],$iarr[3],$iarr[4],$iarr[5],$iarr[6],$iarr[7]); break;
364	364	}
365	365	}
366	366	} else $ret = $fn($conn,$sql);
		@@ -509,15 +509,15 @@ discard block
		block discarded – undo
509	509	$d = substr($rs->fields[2],strlen('default '));
510	510	switch ($fld->type)
511	511	{
512		- case 'smallint':
513		- case 'integer': $fld->default_value = (int) $d; break;
514		- case 'char':
515		- case 'blob':
516		- case 'text':
517		- case 'varchar': $fld->default_value = (string) substr($d,1,strlen($d)-2); break;
518		- case 'double':
519		- case 'float': $fld->default_value = (float) $d; break;
520		- default: $fld->default_value = $d; break;
	512	+ case 'smallint':
	513	+ case 'integer': $fld->default_value = (int) $d; break;
	514	+ case 'char':
	515	+ case 'blob':
	516	+ case 'text':
	517	+ case 'varchar': $fld->default_value = (string) substr($d,1,strlen($d)-2); break;
	518	+ case 'double':
	519	+ case 'float': $fld->default_value = (float) $d; break;
	520	+ default: $fld->default_value = $d; break;
521	521	}
522	522	// case 35:$tt = 'TIMESTAMP'; break;
523	523	}
		@@ -651,42 +651,42 @@ discard block
		block discarded – undo
651	651	if ($s) $s .= '\|\|';
652	652	$ch = $fmt[$i];
653	653	switch($ch) {
654		- case 'Y':
655		- case 'y':
656		- $s .= "extract(year from $col)";
657		- break;
658		- case 'M':
659		- case 'm':
660		- $s .= "extract(month from $col)";
661		- break;
662		- case 'Q':
663		- case 'q':
664		- $s .= "cast(((extract(month from $col)+2) / 3) as integer)";
665		- break;
666		- case 'D':
667		- case 'd':
668		- $s .= "(extract(day from $col))";
669		- break;
670		- case 'H':
671		- case 'h':
672		- $s .= "(extract(hour from $col))";
673		- break;
674		- case 'I':
675		- case 'i':
676		- $s .= "(extract(minute from $col))";
677		- break;
678		- case 'S':
679		- case 's':
680		- $s .= "CAST((extract(second from $col)) AS INTEGER)";
681		- break;
	654	+ case 'Y':
	655	+ case 'y':
	656	+ $s .= "extract(year from $col)";
	657	+ break;
	658	+ case 'M':
	659	+ case 'm':
	660	+ $s .= "extract(month from $col)";
	661	+ break;
	662	+ case 'Q':
	663	+ case 'q':
	664	+ $s .= "cast(((extract(month from $col)+2) / 3) as integer)";
	665	+ break;
	666	+ case 'D':
	667	+ case 'd':
	668	+ $s .= "(extract(day from $col))";
	669	+ break;
	670	+ case 'H':
	671	+ case 'h':
	672	+ $s .= "(extract(hour from $col))";
	673	+ break;
	674	+ case 'I':
	675	+ case 'i':
	676	+ $s .= "(extract(minute from $col))";
	677	+ break;
	678	+ case 'S':
	679	+ case 's':
	680	+ $s .= "CAST((extract(second from $col)) AS INTEGER)";
	681	+ break;
682	682
683		- default:
684		- if ($ch == '\\') {
685		- $i++;
686		- $ch = substr($fmt,$i,1);
687		- }
688		- $s .= $this->qstr($ch);
689		- break;
	683	+ default:
	684	+ if ($ch == '\\') {
	685	+ $i++;
	686	+ $ch = substr($fmt,$i,1);
	687	+ }
	688	+ $s .= $this->qstr($ch);
	689	+ break;
690	690	}
691	691	}
692	692	return $s;
		@@ -722,18 +722,18 @@ discard block
		block discarded – undo
722	722	$fld = new ADOFieldObject;
723	723	$ibf = ibase_field_info($this->_queryID,$fieldOffset);
724	724	switch (ADODB_ASSOC_CASE) {
725		- case 2: // the default
726		- $fld->name = ($ibf['alias']);
727		- if (empty($fld->name)) $fld->name = ($ibf['name']);
728		- break;
729		- case 0:
730		- $fld->name = strtoupper($ibf['alias']);
731		- if (empty($fld->name)) $fld->name = strtoupper($ibf['name']);
732		- break;
733		- case 1:
734		- $fld->name = strtolower($ibf['alias']);
735		- if (empty($fld->name)) $fld->name = strtolower($ibf['name']);
736		- break;
	725	+ case 2: // the default
	726	+ $fld->name = ($ibf['alias']);
	727	+ if (empty($fld->name)) $fld->name = ($ibf['name']);
	728	+ break;
	729	+ case 0:
	730	+ $fld->name = strtoupper($ibf['alias']);
	731	+ if (empty($fld->name)) $fld->name = strtoupper($ibf['name']);
	732	+ break;
	733	+ case 1:
	734	+ $fld->name = strtolower($ibf['alias']);
	735	+ if (empty($fld->name)) $fld->name = strtolower($ibf['name']);
	736	+ break;
737	737	}
738	738
739	739	$fld->type = $ibf['type'];
		@@ -833,27 +833,27 @@ discard block
		block discarded – undo
833	833	$len = $fieldobj->max_length;
834	834	}
835	835	switch (strtoupper($t)) {
836		- case 'CHAR':
837		- return 'C';
	836	+ case 'CHAR':
	837	+ return 'C';
838	838
839		- case 'TEXT':
840		- case 'VARCHAR':
841		- case 'VARYING':
842		- if ($len <= $this->blobSize) return 'C';
843		- return 'X';
844		- case 'BLOB':
845		- return 'B';
	839	+ case 'TEXT':
	840	+ case 'VARCHAR':
	841	+ case 'VARYING':
	842	+ if ($len <= $this->blobSize) return 'C';
	843	+ return 'X';
	844	+ case 'BLOB':
	845	+ return 'B';
846	846
847		- case 'TIMESTAMP':
848		- case 'DATE': return 'D';
849		- case 'TIME': return 'T';
850		- //case 'T': return 'T';
	847	+ case 'TIMESTAMP':
	848	+ case 'DATE': return 'D';
	849	+ case 'TIME': return 'T';
	850	+ //case 'T': return 'T';
851	851
852		- //case 'L': return 'L';
853		- case 'INT':
854		- case 'SHORT':
855		- case 'INTEGER': return 'I';
856		- default: return 'N';
	852	+ //case 'L': return 'L';
	853	+ case 'INT':
	854	+ case 'SHORT':
	855	+ case 'INTEGER': return 'I';
	856	+ default: return 'N';
857	857	}
858	858	}
859	859

EGroupware / egroupware

Push — 14.2 ( e07840...cec2da )

Status

Category

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

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

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

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

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

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

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

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

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