@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | |
| 196 | 196 | $aSeparatePut = explode('&', $sData); |
| 197 | 197 | |
| 198 | - foreach($aSeparatePut as $sOne) { |
|
| 198 | + foreach ($aSeparatePut as $sOne) { |
|
| 199 | 199 | |
| 200 | 200 | $aOnePut = explode('=', $sOne); |
| 201 | 201 | $aPut[$aOnePut[0]] = $aOnePut[1]; |
@@ -214,9 +214,9 @@ discard block |
||
| 214 | 214 | */ |
| 215 | 215 | public static function setStatus($iCode) |
| 216 | 216 | { |
| 217 | - if ($iCode === 200) { header('HTTP/1.1 200 Ok'); } |
|
| 218 | - else if ($iCode === 201) { header('HTTP/1.1 201 Created'); } |
|
| 219 | - else if ($iCode === 204) { header("HTTP/1.0 204 No Content"); } |
|
| 217 | + if ($iCode === 200) { header('HTTP/1.1 200 Ok'); } |
|
| 218 | + else if ($iCode === 201) { header('HTTP/1.1 201 Created'); } |
|
| 219 | + else if ($iCode === 204) { header("HTTP/1.0 204 No Content"); } |
|
| 220 | 220 | else if ($iCode === 403) { header('HTTP/1.1 403 Forbidden'); } |
| 221 | 221 | else if ($iCode === 404) { header('HTTP/1.1 404 Not Found'); } |
| 222 | 222 | } |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | * @param int $iFlags flags |
| 50 | 50 | * @param int $iTimeout expiration of cache |
| 51 | 51 | */ |
| 52 | - public function get(string $sName, int &$iFlags = null, int $iTimeout = 0); |
|
| 52 | + public function get(string $sName, int&$iFlags = null, int $iTimeout = 0); |
|
| 53 | 53 | |
| 54 | 54 | /** |
| 55 | 55 | * delete a value |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | * @param int $iTimeout expiration of cache |
| 62 | 62 | * @return mixed |
| 63 | 63 | */ |
| 64 | - public function get(string $sName, int &$iFlags = null, int $iTimeout = 0) |
|
| 64 | + public function get(string $sName, int&$iFlags = null, int $iTimeout = 0) |
|
| 65 | 65 | { |
| 66 | 66 | return parent::get($sName); |
| 67 | 67 | } |
@@ -41,12 +41,12 @@ discard block |
||
| 41 | 41 | */ |
| 42 | 42 | public static function getWeek(int $iWeek, int $iYear, string $sFormat = "Y-m-d") : Date |
| 43 | 43 | { |
| 44 | - $iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear)); |
|
| 44 | + $iFirstDayInYear = date("N", mktime(0, 0, 0, 1, 1, $iYear)); |
|
| 45 | 45 | |
| 46 | 46 | if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; } |
| 47 | 47 | else { $iShift = (8 - $iFirstDayInYear) * 86400; } |
| 48 | 48 | |
| 49 | - if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; } |
|
| 49 | + if ($iWeek > 1) { $iWeekInSeconds = ($iWeek - 1) * 604800; } |
|
| 50 | 50 | else { $iWeekInSeconds = 0; } |
| 51 | 51 | |
| 52 | 52 | $iTimestamp = mktime(0, 0, 0, 1, 1, $iYear) + $iWeekInSeconds + $iShift; |
@@ -158,12 +158,12 @@ discard block |
||
| 158 | 158 | */ |
| 159 | 159 | public static function getMiddleWeek(int $iWeek, int $iYear, string $sFormat = "Y-m-d") : array |
| 160 | 160 | { |
| 161 | - $iFirstDayInYear = date("N",mktime(0, 0, 0, 1, 1, $iYear)); |
|
| 161 | + $iFirstDayInYear = date("N", mktime(0, 0, 0, 1, 1, $iYear)); |
|
| 162 | 162 | |
| 163 | 163 | if ($iFirstDayInYear < 5) { $iShift = -($iFirstDayInYear - 1) * 86400; } |
| 164 | 164 | else { $iShift = (8 - $iFirstDayInYear) * 86400; } |
| 165 | 165 | |
| 166 | - if ($iWeek > 1) { $iWeekInSeconds = ($iWeek-1) * 604800; } |
|
| 166 | + if ($iWeek > 1) { $iWeekInSeconds = ($iWeek - 1) * 604800; } |
|
| 167 | 167 | else { $iWeekInSeconds = 0; } |
| 168 | 168 | |
| 169 | 169 | if (date('N') > 2) { |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | if (preg_replace('/^([0-9]+)-[0-9]+-[0-9]+$/', '$1', $aDates[0]) != date('Y')) { |
| 183 | 183 | |
| 184 | 184 | $aDates[0] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', date('Y').'$1', $aDates[0]); |
| 185 | - $aDates[1] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', (date('Y')+1).'$1', $aDates[1]); |
|
| 185 | + $aDates[1] = preg_replace('/^[0-9]+(-[0-9]+-[0-9]+)$/', (date('Y') + 1).'$1', $aDates[1]); |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | return $aDates; |
@@ -225,10 +225,10 @@ discard block |
||
| 225 | 225 | $oDateTime = DateTime::createFromFormat('Y-m-d H:i:s', $sDateTime); |
| 226 | 226 | $iTimeStamp = time() - $oDateTime->getTimestamp(); |
| 227 | 227 | |
| 228 | - if ($iTimeStamp < 3600) { return $sStartReturn.' '.(int)($iTimeStamp/60).' '.$sMinutes.$sEndReturn; } |
|
| 229 | - if ($iTimeStamp < 86400) { return $sStartReturn.' '.(int)($iTimeStamp/3600).' '.$sHours.$sEndReturn; } |
|
| 230 | - if ($iTimeStamp < 2592000) { return $sStartReturn.' '.(int)($iTimeStamp/86400).' '.$sDays.$sEndReturn; } |
|
| 231 | - if ($iTimeStamp < 31536000) { return $sStartReturn.' '.(int)($iTimeStamp/2592000).' '.$sMonths.$sEndReturn; } |
|
| 232 | - else { return $sStartReturn.' '.(int)($iTimeStamp/31536000).' '.$sYears.$sEndReturn; } |
|
| 228 | + if ($iTimeStamp < 3600) { return $sStartReturn.' '.(int)($iTimeStamp / 60).' '.$sMinutes.$sEndReturn; } |
|
| 229 | + if ($iTimeStamp < 86400) { return $sStartReturn.' '.(int)($iTimeStamp / 3600).' '.$sHours.$sEndReturn; } |
|
| 230 | + if ($iTimeStamp < 2592000) { return $sStartReturn.' '.(int)($iTimeStamp / 86400).' '.$sDays.$sEndReturn; } |
|
| 231 | + if ($iTimeStamp < 31536000) { return $sStartReturn.' '.(int)($iTimeStamp / 2592000).' '.$sMonths.$sEndReturn; } |
|
| 232 | + else { return $sStartReturn.' '.(int)($iTimeStamp / 31536000).' '.$sYears.$sEndReturn; } |
|
| 233 | 233 | } |
| 234 | 234 | } |
@@ -174,34 +174,34 @@ |
||
| 174 | 174 | */ |
| 175 | 175 | public function send() : bool |
| 176 | 176 | { |
| 177 | - $sHeaders = 'From: ' . $this->_sFrom . "\r\n"; |
|
| 177 | + $sHeaders = 'From: '.$this->_sFrom."\r\n"; |
|
| 178 | 178 | |
| 179 | 179 | if (empty($this->_aAttachments)) { |
| 180 | 180 | |
| 181 | 181 | if ($this->_sFormat == "HTML") { |
| 182 | 182 | |
| 183 | - $sHeaders .= 'MIME-Version: 1.0' . "\r\n"; |
|
| 184 | - $sHeaders .= 'Content-type: text/html; charset=UTF-8' . "\r\n"; |
|
| 183 | + $sHeaders .= 'MIME-Version: 1.0'."\r\n"; |
|
| 184 | + $sHeaders .= 'Content-type: text/html; charset=UTF-8'."\r\n"; |
|
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | return mail(implode(',', $this->_aRecipient), $this->_sSubject, $this->_sMessage, $sHeaders); |
| 188 | 188 | } |
| 189 | 189 | else { |
| 190 | 190 | |
| 191 | - $sBoundary = "_" . md5(uniqid(rand())); |
|
| 191 | + $sBoundary = "_".md5(uniqid(rand())); |
|
| 192 | 192 | |
| 193 | 193 | $sAttached = ""; |
| 194 | 194 | |
| 195 | 195 | foreach ($this->_aAttachments as $aAttachment) { |
| 196 | 196 | |
| 197 | 197 | $sAttached_file = chunk_split(base64_encode($aAttachment["content"])); |
| 198 | - $sAttached = "\n\n" . "--" . $sBoundary . "\nContent-Type: application; name=\"" . $aAttachment["name"] . "\"\r\nContent-Transfer-Encoding: base64\r\nContent-Disposition: attachment; filename=\"" . $aAttachment["name"] . "\"\r\n\n" . $sAttached_file . "--" . $sBoundary . "--"; |
|
| 198 | + $sAttached = "\n\n"."--".$sBoundary."\nContent-Type: application; name=\"".$aAttachment["name"]."\"\r\nContent-Transfer-Encoding: base64\r\nContent-Disposition: attachment; filename=\"".$aAttachment["name"]."\"\r\n\n".$sAttached_file."--".$sBoundary."--"; |
|
| 199 | 199 | } |
| 200 | 200 | |
| 201 | - $sHeaders = 'From: ' . $this->_sFrom . "\r\n"; |
|
| 201 | + $sHeaders = 'From: '.$this->_sFrom."\r\n"; |
|
| 202 | 202 | $sHeaders .= "MIME-Version: 1.0\r\nContent-Type: multipart/mixed; boundary=\"$sBoundary\"\r\n"; |
| 203 | 203 | |
| 204 | - $sBody = "--" . $sBoundary . "\nContent-Type: " . ($this->_sFormat == "HTML" ? "text/html" : "text/plain") . "; charset=UTF-8\r\n\n" . $this->_sMessage . $sAttached; |
|
| 204 | + $sBody = "--".$sBoundary."\nContent-Type: ".($this->_sFormat == "HTML" ? "text/html" : "text/plain")."; charset=UTF-8\r\n\n".$this->_sMessage.$sAttached; |
|
| 205 | 205 | |
| 206 | 206 | return mail(implode(',', $this->_aRecipient), $this->_sSubject, $sBody, $sHeaders); |
| 207 | 207 | } |
@@ -181,13 +181,13 @@ discard block |
||
| 181 | 181 | } |
| 182 | 182 | else if ($mType === 'radio') { |
| 183 | 183 | |
| 184 | - $this->_aElement[$sName.rand(100000,999999)] = new Radio($sName, $sLabel, $mValue, $mOptions); |
|
| 184 | + $this->_aElement[$sName.rand(100000, 999999)] = new Radio($sName, $sLabel, $mValue, $mOptions); |
|
| 185 | 185 | } |
| 186 | 186 | else if ($mType === 'date') { |
| 187 | 187 | |
| 188 | 188 | $aDay = array(); |
| 189 | 189 | |
| 190 | - for ($i = 1 ; $i <= 31 ; $i++) { |
|
| 190 | + for ($i = 1; $i <= 31; $i++) { |
|
| 191 | 191 | |
| 192 | 192 | if ($i < 10) { $aDay['0'.$i] = '0'.$i; } |
| 193 | 193 | else { $aDay[$i] = $i; } |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | |
| 215 | 215 | $aYear = array(); |
| 216 | 216 | |
| 217 | - for ($i = 1900 ; $i <= 2013 ; $i++) { |
|
| 217 | + for ($i = 1900; $i <= 2013; $i++) { |
|
| 218 | 218 | |
| 219 | 219 | $aYear[$i] = $i; |
| 220 | 220 | } |
@@ -35,9 +35,9 @@ discard block |
||
| 35 | 35 | */ |
| 36 | 36 | public static function object_to_array($mObject) : array |
| 37 | 37 | { |
| 38 | - if ( is_object($mObject)) { |
|
| 38 | + if (is_object($mObject)) { |
|
| 39 | 39 | |
| 40 | - $mObject = (array) $mObject; |
|
| 40 | + $mObject = (array)$mObject; |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | $aNew = array(); |
| 47 | 47 | |
| 48 | - foreach($mObject as $sKey => $mValues) { |
|
| 48 | + foreach ($mObject as $sKey => $mValues) { |
|
| 49 | 49 | |
| 50 | 50 | $sKey = preg_replace("/^\\0(.*)\\0/", "", $sKey); |
| 51 | 51 | $aNew[$sKey] = self::object_to_array($mValues); |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | namespace Venus\lib\Log; |
| 17 | 17 | |
| 18 | 18 | use \Venus\lib\Debug as Debug; |
| 19 | -use \Venus\lib\Log\LoggerInterface as LoggerInterface ; |
|
| 19 | +use \Venus\lib\Log\LoggerInterface as LoggerInterface; |
|
| 20 | 20 | use \Venus\lib\Log\LogLevel as LogLevel; |
| 21 | 21 | |
| 22 | 22 | /** |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | $sExtension = strtolower(substr(strrchr($_FILES[$sFile]['name'], '.'), 1)); |
| 101 | 101 | |
| 102 | - if (count($this->_aAllowExtension) > 0 && !in_array($sExtension ,$this->_aAllowExtension)) { |
|
| 102 | + if (count($this->_aAllowExtension) > 0 && !in_array($sExtension, $this->_aAllowExtension)) { |
|
| 103 | 103 | |
| 104 | 104 | $this->_sError = "The extension is not good"; |
| 105 | 105 | return false; |
@@ -111,24 +111,24 @@ discard block |
||
| 111 | 111 | if ($this->_sExtension === null) { $this->setExtension($sExtension); } |
| 112 | 112 | |
| 113 | 113 | if ($this->_sName) { $sName = $sPath.$this->_sName.'.'.$this->_sExtension; } |
| 114 | - else { $sName = $sPath.md5(uniqid(rand(), true)).'.'.$this->_sExtension;} |
|
| 114 | + else { $sName = $sPath.md5(uniqid(rand(), true)).'.'.$this->_sExtension; } |
|
| 115 | 115 | |
| 116 | 116 | if ($this->_bProportion == true && ($this->_iWidth || $this->_iHeight)) { |
| 117 | 117 | |
| 118 | 118 | $aImageSizes = getimagesize($_FILES[$sFile]['tmp_name']); |
| 119 | 119 | |
| 120 | 120 | $fRatio = min($aImageSizes[0] / $this->_iWidth, $aImageSizes[1] / $this->_iHeight); |
| 121 | - $iHeight = $aImageSizes[1] / $fRatio; |
|
| 122 | - $iWidth = $aImageSizes[0] / $fRatio; |
|
| 121 | + $iHeight = $aImageSizes[1] / $fRatio; |
|
| 122 | + $iWidth = $aImageSizes[0] / $fRatio; |
|
| 123 | 123 | $fY = ($iHeight - $this->_iHeight) / 2 * $fRatio; |
| 124 | 124 | $fX = ($iWidth - $this->_iWidth) / 2 * $fRatio; |
| 125 | 125 | |
| 126 | 126 | $rNewImage = imagecreatefromjpeg($_FILES[$sFile]['tmp_name']); |
| 127 | 127 | |
| 128 | - $rNewImgTrueColor = imagecreatetruecolor($this->_iWidth , $this->_iHeight); |
|
| 129 | - imagecopyresampled($rNewImgTrueColor , $rNewImage, 0, 0, $fX, $fY, $this->_iWidth, $this->_iHeight, $iWidth * $fRatio - $fX * 2, $iHeight * $fRatio - $fY * 2); |
|
| 128 | + $rNewImgTrueColor = imagecreatetruecolor($this->_iWidth, $this->_iHeight); |
|
| 129 | + imagecopyresampled($rNewImgTrueColor, $rNewImage, 0, 0, $fX, $fY, $this->_iWidth, $this->_iHeight, $iWidth * $fRatio - $fX * 2, $iHeight * $fRatio - $fY * 2); |
|
| 130 | 130 | |
| 131 | - imagejpeg($rNewImgTrueColor , $sName, 100); |
|
| 131 | + imagejpeg($rNewImgTrueColor, $sName, 100); |
|
| 132 | 132 | } |
| 133 | 133 | else { |
| 134 | 134 | |