@@ -82,59 +82,59 @@ |
||
| 82 | 82 | for ($i = 0; $i < $len; $i++) { |
| 83 | 83 | $ch = $fmt[$i]; |
| 84 | 84 | switch ($ch) { |
| 85 | - case 'Y': |
|
| 86 | - case 'y': |
|
| 87 | - $s .= '%Y'; |
|
| 88 | - break; |
|
| 89 | - case 'Q': |
|
| 90 | - case 'q': |
|
| 91 | - $s .= "'),Quarter($col)"; |
|
| 92 | - |
|
| 93 | - if ($len > $i + 1) $s .= ",DATE_FORMAT($col,'"; |
|
| 94 | - else $s .= ",('"; |
|
| 95 | - $concat = true; |
|
| 96 | - break; |
|
| 97 | - case 'M': |
|
| 98 | - $s .= '%b'; |
|
| 99 | - break; |
|
| 100 | - |
|
| 101 | - case 'm': |
|
| 102 | - $s .= '%m'; |
|
| 103 | - break; |
|
| 104 | - case 'D': |
|
| 105 | - case 'd': |
|
| 106 | - $s .= '%d'; |
|
| 107 | - break; |
|
| 108 | - |
|
| 109 | - case 'H': |
|
| 110 | - $s .= '%H'; |
|
| 111 | - break; |
|
| 112 | - |
|
| 113 | - case 'h': |
|
| 114 | - $s .= '%I'; |
|
| 115 | - break; |
|
| 116 | - |
|
| 117 | - case 'i': |
|
| 118 | - $s .= '%i'; |
|
| 119 | - break; |
|
| 120 | - |
|
| 121 | - case 's': |
|
| 122 | - $s .= '%s'; |
|
| 123 | - break; |
|
| 124 | - |
|
| 125 | - case 'a': |
|
| 126 | - case 'A': |
|
| 127 | - $s .= '%p'; |
|
| 128 | - break; |
|
| 129 | - |
|
| 130 | - default: |
|
| 131 | - |
|
| 132 | - if ($ch == '\\') { |
|
| 133 | - $i++; |
|
| 134 | - $ch = substr($fmt, $i, 1); |
|
| 135 | - } |
|
| 136 | - $s .= $ch; |
|
| 137 | - break; |
|
| 85 | + case 'Y': |
|
| 86 | + case 'y': |
|
| 87 | + $s .= '%Y'; |
|
| 88 | + break; |
|
| 89 | + case 'Q': |
|
| 90 | + case 'q': |
|
| 91 | + $s .= "'),Quarter($col)"; |
|
| 92 | + |
|
| 93 | + if ($len > $i + 1) $s .= ",DATE_FORMAT($col,'"; |
|
| 94 | + else $s .= ",('"; |
|
| 95 | + $concat = true; |
|
| 96 | + break; |
|
| 97 | + case 'M': |
|
| 98 | + $s .= '%b'; |
|
| 99 | + break; |
|
| 100 | + |
|
| 101 | + case 'm': |
|
| 102 | + $s .= '%m'; |
|
| 103 | + break; |
|
| 104 | + case 'D': |
|
| 105 | + case 'd': |
|
| 106 | + $s .= '%d'; |
|
| 107 | + break; |
|
| 108 | + |
|
| 109 | + case 'H': |
|
| 110 | + $s .= '%H'; |
|
| 111 | + break; |
|
| 112 | + |
|
| 113 | + case 'h': |
|
| 114 | + $s .= '%I'; |
|
| 115 | + break; |
|
| 116 | + |
|
| 117 | + case 'i': |
|
| 118 | + $s .= '%i'; |
|
| 119 | + break; |
|
| 120 | + |
|
| 121 | + case 's': |
|
| 122 | + $s .= '%s'; |
|
| 123 | + break; |
|
| 124 | + |
|
| 125 | + case 'a': |
|
| 126 | + case 'A': |
|
| 127 | + $s .= '%p'; |
|
| 128 | + break; |
|
| 129 | + |
|
| 130 | + default: |
|
| 131 | + |
|
| 132 | + if ($ch == '\\') { |
|
| 133 | + $i++; |
|
| 134 | + $ch = substr($fmt, $i, 1); |
|
| 135 | + } |
|
| 136 | + $s .= $ch; |
|
| 137 | + break; |
|
| 138 | 138 | } |
| 139 | 139 | } |
| 140 | 140 | $s.="')"; |
@@ -137,7 +137,7 @@ |
||
| 137 | 137 | break; |
| 138 | 138 | } |
| 139 | 139 | } |
| 140 | - $s.="')"; |
|
| 140 | + $s .= "')"; |
|
| 141 | 141 | if ($concat) $s = "CONCAT($s)"; |
| 142 | 142 | return $s; |
| 143 | 143 | } |
@@ -75,7 +75,9 @@ discard block |
||
| 75 | 75 | */ |
| 76 | 76 | function sqlDate($fmt, $col = false) |
| 77 | 77 | { |
| 78 | - if (!$col) $col = $this->sysTimeStamp; |
|
| 78 | + if (!$col) { |
|
| 79 | + $col = $this->sysTimeStamp; |
|
| 80 | + } |
|
| 79 | 81 | $s = 'DATE_FORMAT(' . $col . ",'"; |
| 80 | 82 | $concat = false; |
| 81 | 83 | $len = strlen($fmt); |
@@ -90,8 +92,11 @@ discard block |
||
| 90 | 92 | case 'q': |
| 91 | 93 | $s .= "'),Quarter($col)"; |
| 92 | 94 | |
| 93 | - if ($len > $i + 1) $s .= ",DATE_FORMAT($col,'"; |
|
| 94 | - else $s .= ",('"; |
|
| 95 | + if ($len > $i + 1) { |
|
| 96 | + $s .= ",DATE_FORMAT($col,'"; |
|
| 97 | + } else { |
|
| 98 | + $s .= ",('"; |
|
| 99 | + } |
|
| 95 | 100 | $concat = true; |
| 96 | 101 | break; |
| 97 | 102 | case 'M': |
@@ -138,7 +143,9 @@ discard block |
||
| 138 | 143 | } |
| 139 | 144 | } |
| 140 | 145 | $s.="')"; |
| 141 | - if ($concat) $s = "CONCAT($s)"; |
|
| 146 | + if ($concat) { |
|
| 147 | + $s = "CONCAT($s)"; |
|
| 148 | + } |
|
| 142 | 149 | return $s; |
| 143 | 150 | } |
| 144 | 151 | |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | 46 | * Return if the database provider have a top or similar function |
| 47 | - * @return unknown_type |
|
| 47 | + * @return boolean |
|
| 48 | 48 | */ |
| 49 | 49 | function hasTop() |
| 50 | 50 | { |
@@ -27,7 +27,9 @@ discard block |
||
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | if ($path != "") { |
| 30 | - if ($path[0] == "/") $path = substr($path, 1); |
|
| 30 | + if ($path[0] == "/") { |
|
| 31 | + $path = substr($path, 1); |
|
| 32 | + } |
|
| 31 | 33 | |
| 32 | 34 | $pathAr = explode("/", $path); |
| 33 | 35 | |
@@ -44,7 +46,9 @@ discard block |
||
| 44 | 46 | } |
| 45 | 47 | } |
| 46 | 48 | $this->_jsonObject = $newjsonObject; |
| 47 | - } else $this->_jsonObject = $jsonObject; |
|
| 49 | + } else { |
|
| 50 | + $this->_jsonObject = $jsonObject; |
|
| 51 | + } |
|
| 48 | 52 | |
| 49 | 53 | $this->_current = 0; |
| 50 | 54 | } |
@@ -26,7 +26,9 @@ |
||
| 26 | 26 | |
| 27 | 27 | $this->_array = array(); |
| 28 | 28 | |
| 29 | - if (!$array) return; |
|
| 29 | + if (!$array) { |
|
| 30 | + return; |
|
| 31 | + } |
|
| 30 | 32 | |
| 31 | 33 | if (is_array($array)) { |
| 32 | 34 | foreach ($array as $key => $value) { |
@@ -33,7 +33,9 @@ |
||
| 33 | 33 | if (($buffer !== false) && (trim($buffer) != "")) { |
| 34 | 34 | $this->_current++; |
| 35 | 35 | $this->_currentBuffer = $buffer; |
| 36 | - } else $this->readNextLine(); |
|
| 36 | + } else { |
|
| 37 | + $this->readNextLine(); |
|
| 38 | + } |
|
| 37 | 39 | } |
| 38 | 40 | } |
| 39 | 41 | |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | 46 | * Return if the database provider have a top or similar function |
| 47 | - * @return unknown_type |
|
| 47 | + * @return boolean |
|
| 48 | 48 | */ |
| 49 | 49 | function hasTop() |
| 50 | 50 | { |