@@ -111,7 +111,7 @@ |
||
| 111 | 111 | |
| 112 | 112 | $html .= '</tr>'; |
| 113 | 113 | |
| 114 | - $html .= '<tr><td colspan="'.($colCount + 1).'" style="text-align:center;">'; |
|
| 114 | + $html .= '<tr><td colspan="'.($colCount+1).'" style="text-align:center;">'; |
|
| 115 | 115 | // render edit buttons for admins only |
| 116 | 116 | if ($session->get('currentUser') != null && $session->get('currentUser')->inGroup('Admin')) { |
| 117 | 117 | $html .= ' '; |
@@ -218,7 +218,7 @@ |
||
| 218 | 218 | |
| 219 | 219 | $html .= '<tr>'; |
| 220 | 220 | |
| 221 | - $html .= '<td>'.$file.' <em>('.number_format(filesize($this->BO->getAttachmentsLocation().'/'.$file) / 1024).' KB)</em></td>'; |
|
| 221 | + $html .= '<td>'.$file.' <em>('.number_format(filesize($this->BO->getAttachmentsLocation().'/'.$file)/1024).' KB)</em></td>'; |
|
| 222 | 222 | |
| 223 | 223 | $js = "if(window.jQuery) { |
| 224 | 224 | BootstrapDialog.show({ |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | $task = new $taskClass(); |
| 86 | 86 | |
| 87 | 87 | $startTime = microtime(true); |
| 88 | - $maxAllowedTime = $startTime + $task->getMaxRunTime(); |
|
| 88 | + $maxAllowedTime = $startTime+$task->getMaxRunTime(); |
|
| 89 | 89 | |
| 90 | 90 | self::$logger->info('Start time is ['.$startTime.'], maximum task run time is ['.$task->getMaxRunTime().']'); |
| 91 | 91 | |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | set_time_limit($task->getMaxRunTime()); |
| 94 | 94 | $task->doTask(); |
| 95 | 95 | |
| 96 | - self::$logger->info('Done in ['.round(microtime(true) - $startTime, 5).'] seconds'); |
|
| 96 | + self::$logger->info('Done in ['.round(microtime(true)-$startTime, 5).'] seconds'); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | self::$logger->info('Finished processing all cron tasks'); |
@@ -107,7 +107,7 @@ |
||
| 107 | 107 | $imgWidth = $params['width']; |
| 108 | 108 | $imgHeight = $params['height']; |
| 109 | 109 | $imgType = $params['type']; |
| 110 | - $imgQuality = (double) $params['quality']; |
|
| 110 | + $imgQuality = (double)$params['quality']; |
|
| 111 | 111 | $imgScale = new Boolean($params['scale']); |
| 112 | 112 | $imgSecure = new Boolean($params['secure']); |
| 113 | 113 | } catch (\Exception $e) { |
@@ -88,7 +88,7 @@ |
||
| 88 | 88 | * |
| 89 | 89 | * @param Alpha\Util\Http\Request $request |
| 90 | 90 | * |
| 91 | - * @return Alpha\Util\Http\Response |
|
| 91 | + * @return Response |
|
| 92 | 92 | * |
| 93 | 93 | * @since 1.0 |
| 94 | 94 | */ |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | |
| 122 | 122 | if (isset($matches[$key])) { |
| 123 | 123 | // increment the weight if the same BO is tagged more than once |
| 124 | - $weight = intval($matches[$key]) + 1; |
|
| 124 | + $weight = intval($matches[$key])+1; |
|
| 125 | 125 | $matches[$key] = $weight; |
| 126 | 126 | } else { |
| 127 | 127 | $matches[$key] = 1; |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | $this->numberFound = count($matches); |
| 142 | 142 | |
| 143 | 143 | // now paginate |
| 144 | - $matches = array_slice($matches, $start, $limit + 5); // the +5 is just some padding in case of orphans |
|
| 144 | + $matches = array_slice($matches, $start, $limit+5); // the +5 is just some padding in case of orphans |
|
| 145 | 145 | |
| 146 | 146 | // now load each object |
| 147 | 147 | foreach ($matches as $key => $weight) { |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | |
| 228 | 228 | if (isset($matches[$key])) { |
| 229 | 229 | // increment the weight if the same BO is tagged more than once |
| 230 | - $weight = intval($matches[$key]) + 1; |
|
| 230 | + $weight = intval($matches[$key])+1; |
|
| 231 | 231 | $matches[$key] = $weight; |
| 232 | 232 | } else { |
| 233 | 233 | $matches[$key] = 1; |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | if ($this->level == 'DEBUG' || in_array($this->classname, $this->debugClasses)) { |
| 130 | 130 | $dateTime = date('Y-m-d H:i:s'); |
| 131 | 131 | $this->logProvider->writeLine(array($dateTime, 'DEBUG', $this->classname, $message, |
| 132 | - $this->request->getUserAgent(), $this->request->getIP(), gethostname(), )); |
|
| 132 | + $this->request->getUserAgent(), $this->request->getIP(), gethostname(),)); |
|
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | 135 | |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | if ($this->level == 'DEBUG' || $this->level == 'INFO' || in_array($this->classname, $this->debugClasses)) { |
| 146 | 146 | $dateTime = date('Y-m-d H:i:s'); |
| 147 | 147 | $this->logProvider->writeLine(array($dateTime, 'INFO', $this->classname, $message, |
| 148 | - $this->request->getUserAgent(), $this->request->getIP(), gethostname(), )); |
|
| 148 | + $this->request->getUserAgent(), $this->request->getIP(), gethostname(),)); |
|
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | if ($this->level == 'DEBUG' || $this->level == 'INFO' || $this->level == 'WARN' || in_array($this->classname, $this->debugClasses)) { |
| 162 | 162 | $dateTime = date('Y-m-d H:i:s'); |
| 163 | 163 | $this->logProvider->writeLine(array($dateTime, 'WARN', $this->classname, $message, |
| 164 | - $this->request->getUserAgent(), $this->request->getIP(), gethostname(), )); |
|
| 164 | + $this->request->getUserAgent(), $this->request->getIP(), gethostname(),)); |
|
| 165 | 165 | } |
| 166 | 166 | } |
| 167 | 167 | |
@@ -238,14 +238,14 @@ discard block |
||
| 238 | 238 | self::$logger->debug('<<__construct()'); |
| 239 | 239 | } |
| 240 | 240 | |
| 241 | - /** |
|
| 242 | - * Facade method which will invoke our custom markdown class rather than the standard one. |
|
| 243 | - * |
|
| 244 | - * @since 1.0 |
|
| 245 | - */ |
|
| 246 | - private function markdown($text, $attachURL = '') |
|
| 247 | - { |
|
| 248 | - $config = ConfigProvider::getInstance(); |
|
| 241 | + /** |
|
| 242 | + * Facade method which will invoke our custom markdown class rather than the standard one. |
|
| 243 | + * |
|
| 244 | + * @since 1.0 |
|
| 245 | + */ |
|
| 246 | + private function markdown($text, $attachURL = '') |
|
| 247 | + { |
|
| 248 | + $config = ConfigProvider::getInstance(); |
|
| 249 | 249 | |
| 250 | 250 | /* |
| 251 | 251 | * Initialize the parser and return the result of its transform method. |
@@ -253,9 +253,9 @@ discard block |
||
| 253 | 253 | */ |
| 254 | 254 | static $parser; |
| 255 | 255 | |
| 256 | - if (!isset($parser)) { |
|
| 257 | - $parser = new \Alpha\Util\Extension\Markdown(); |
|
| 258 | - } |
|
| 256 | + if (!isset($parser)) { |
|
| 257 | + $parser = new \Alpha\Util\Extension\Markdown(); |
|
| 258 | + } |
|
| 259 | 259 | |
| 260 | 260 | /* |
| 261 | 261 | * Replace all instances of $sysURL in the text with the app.url setting from config |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | |
| 266 | 266 | // transform text using parser. |
| 267 | 267 | return $parser->transform($text); |
| 268 | - } |
|
| 268 | + } |
|
| 269 | 269 | |
| 270 | 270 | /** |
| 271 | 271 | * Fetter for the content. |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | foreach ($attachments[0] as $attachmentURL) { |
| 157 | 157 | $start = mb_strpos($attachmentURL, '/'); |
| 158 | 158 | $end = mb_strrpos($attachmentURL, '"'); |
| 159 | - $fileName = mb_substr($attachmentURL, $start + 1, $end - ($start + 1)); |
|
| 159 | + $fileName = mb_substr($attachmentURL, $start+1, $end-($start+1)); |
|
| 160 | 160 | |
| 161 | 161 | if (method_exists($this->BO, 'getAttachmentSecureURL')) { |
| 162 | 162 | $this->content = str_replace($attachmentURL, 'href='.$this->BO->getAttachmentSecureURL($fileName), $this->content); |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | foreach ($attachments[0] as $attachmentURL) { |
| 171 | 171 | $start = mb_strpos($attachmentURL, '/'); |
| 172 | 172 | $end = mb_strrpos($attachmentURL, '" alt'); |
| 173 | - $fileName = mb_substr($attachmentURL, $start + 1, $end - ($start + 1)); |
|
| 173 | + $fileName = mb_substr($attachmentURL, $start+1, $end-($start+1)); |
|
| 174 | 174 | |
| 175 | 175 | if ($config->get('cms.images.widget')) { |
| 176 | 176 | // get the details of the source image |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | $type = 'png'; |
| 186 | 186 | } |
| 187 | 187 | |
| 188 | - $img = new Image($path, $image_details[0], $image_details[1], $type, 0.95, false, (boolean) $config->get('cms.images.widget.secure')); |
|
| 188 | + $img = new Image($path, $image_details[0], $image_details[1], $type, 0.95, false, (boolean)$config->get('cms.images.widget.secure')); |
|
| 189 | 189 | $this->content = str_replace($attachmentURL, $img->renderHTMLLink(), $this->content); |
| 190 | 190 | } else { |
| 191 | 191 | // render a normal image link to the ViewAttachment controller |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | $leftSibling = $node->getLeftSibling(); |
| 213 | 213 | |
| 214 | 214 | if (isset($leftSibling)) { |
| 215 | - $node->setOffset($leftSibling->getOffset() + $leftSibling->getWidth() + $this->colSpace); |
|
| 215 | + $node->setOffset($leftSibling->getOffset()+$leftSibling->getWidth()+$this->colSpace); |
|
| 216 | 216 | } else { |
| 217 | 217 | $node->setOffset(0); |
| 218 | 218 | } |
@@ -220,16 +220,16 @@ discard block |
||
| 220 | 220 | $childCount = $node->childCount(); |
| 221 | 221 | |
| 222 | 222 | for ($i = 0; $i < $childCount; ++$i) { |
| 223 | - $this->firstPass($node->getChildAt($i), $level + 1); |
|
| 223 | + $this->firstPass($node->getChildAt($i), $level+1); |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | $midPoint = $node->getChildrenCenter(); |
| 227 | - $midPoint -= $node->getWidth() / 2; |
|
| 227 | + $midPoint -= $node->getWidth()/2; |
|
| 228 | 228 | $leftSibling = $node->getLeftSibling(); |
| 229 | 229 | |
| 230 | 230 | if (isset($leftSibling)) { |
| 231 | - $node->setOffset($leftSibling->getOffset() + $leftSibling->getWidth() + $this->colSpace); |
|
| 232 | - $node->setModifier($node->getOffset() - $midPoint); |
|
| 231 | + $node->setOffset($leftSibling->getOffset()+$leftSibling->getWidth()+$this->colSpace); |
|
| 232 | + $node->setModifier($node->getOffset()-$midPoint); |
|
| 233 | 233 | |
| 234 | 234 | $this->layout($node, $level); |
| 235 | 235 | } else { |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | } |
| 238 | 238 | } |
| 239 | 239 | |
| 240 | - self::$logger->debug('Memory usage at first scan ['.((memory_get_usage(true) / 1024) / 1024).' MB]'); |
|
| 240 | + self::$logger->debug('Memory usage at first scan ['.((memory_get_usage(true)/1024)/1024).' MB]'); |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | /** |
@@ -252,17 +252,17 @@ discard block |
||
| 252 | 252 | */ |
| 253 | 253 | private function secondPass($node, $level, $x = 0, $y = 0) |
| 254 | 254 | { |
| 255 | - $nodeX = $node->getOffset() + $x; |
|
| 255 | + $nodeX = $node->getOffset()+$x; |
|
| 256 | 256 | $nodeY = $y; |
| 257 | 257 | |
| 258 | 258 | $node->setX($nodeX); |
| 259 | 259 | $node->setY($nodeY); |
| 260 | 260 | |
| 261 | - $this->height = ($this->height > $node->getY() + $node->getWidth()) ? $this->height : $node->getY() + $node->getWidth(); |
|
| 262 | - $this->width = ($this->width > $nodeX + $node->getWidth()) ? $this->width : $nodeX + $node->getWidth() + 10; |
|
| 261 | + $this->height = ($this->height > $node->getY()+$node->getWidth()) ? $this->height : $node->getY()+$node->getWidth(); |
|
| 262 | + $this->width = ($this->width > $nodeX+$node->getWidth()) ? $this->width : $nodeX+$node->getWidth()+10; |
|
| 263 | 263 | |
| 264 | 264 | if ($node->childCount() > 0) { |
| 265 | - $this->secondPass($node->getChildAt(0), $level + 1, $x + $node->getModifier(), $y + $node->getHeight() + $this->rowSpace); |
|
| 265 | + $this->secondPass($node->getChildAt(0), $level+1, $x+$node->getModifier(), $y+$node->getHeight()+$this->rowSpace); |
|
| 266 | 266 | } |
| 267 | 267 | |
| 268 | 268 | $rightSibling = $node->getRightSibling(); |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | $this->secondPass($rightSibling, $level, $x, $y); |
| 272 | 272 | } |
| 273 | 273 | |
| 274 | - self::$logger->debug('Memory usage at second scan ['.((memory_get_usage(true) / 1024) / 1024).' MB]'); |
|
| 274 | + self::$logger->debug('Memory usage at second scan ['.((memory_get_usage(true)/1024)/1024).' MB]'); |
|
| 275 | 275 | } |
| 276 | 276 | |
| 277 | 277 | /** |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | $modifierSumLeft += $leftAncestor->getModifier(); |
| 301 | 301 | } |
| 302 | 302 | |
| 303 | - $totalGap = ($firstChildLeftNeighbour->getOffset() + $modifierSumLeft + $firstChildLeftNeighbour->getWidth() + $this->branchSpace) - ($firstChild->getOffset() + $modifierSumRight); |
|
| 303 | + $totalGap = ($firstChildLeftNeighbour->getOffset()+$modifierSumLeft+$firstChildLeftNeighbour->getWidth()+$this->branchSpace)-($firstChild->getOffset()+$modifierSumRight); |
|
| 304 | 304 | |
| 305 | 305 | if ($totalGap > 0) { |
| 306 | 306 | $subTree = $node; |
@@ -312,14 +312,14 @@ discard block |
||
| 312 | 312 | } |
| 313 | 313 | |
| 314 | 314 | $subTreeMove = $node; |
| 315 | - $singleGap = $totalGap / $subTreesCount; |
|
| 315 | + $singleGap = $totalGap/$subTreesCount; |
|
| 316 | 316 | |
| 317 | 317 | while (isset($subTreeMove) && $subTreeMove !== $leftAncestor) { |
| 318 | 318 | $subTreeMove = $subTreeMove->getLeftSibling(); |
| 319 | 319 | |
| 320 | 320 | if (isset($subTreeMove)) { |
| 321 | - $subTreeMove->setOffset($subTreeMove->getOffset() + $totalGap); |
|
| 322 | - $subTreeMove->setModifier($subTreeMove->getModifier() + $totalGap); |
|
| 321 | + $subTreeMove->setOffset($subTreeMove->getOffset()+$totalGap); |
|
| 322 | + $subTreeMove->setModifier($subTreeMove->getModifier()+$totalGap); |
|
| 323 | 323 | $totalGap -= $singleGap; |
| 324 | 324 | } |
| 325 | 325 | } |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | for ($i = 0; $i < $childCount; ++$i) { |
| 384 | 384 | $child = $node->getChildAt($i); |
| 385 | 385 | |
| 386 | - $leftmostDescendant = $this->getLeftmost($child, $level + 1, $maxlevel); |
|
| 386 | + $leftmostDescendant = $this->getLeftmost($child, $level+1, $maxlevel); |
|
| 387 | 387 | |
| 388 | 388 | if (isset($leftmostDescendant)) { |
| 389 | 389 | return $leftmostDescendant; |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | $this->render(); |
| 452 | 452 | } |
| 453 | 453 | |
| 454 | - if (isset($this->nodes[$this->position + 1])) { |
|
| 454 | + if (isset($this->nodes[$this->position+1])) { |
|
| 455 | 455 | ++$this->position; |
| 456 | 456 | |
| 457 | 457 | return $this->nodes[$this->position]; |
@@ -469,7 +469,7 @@ discard block |
||
| 469 | 469 | */ |
| 470 | 470 | public function hasNext() |
| 471 | 471 | { |
| 472 | - if (isset($this->nodes[$this->position + 1])) { |
|
| 472 | + if (isset($this->nodes[$this->position+1])) { |
|
| 473 | 473 | return true; |
| 474 | 474 | } else { |
| 475 | 475 | return false; |
@@ -379,6 +379,6 @@ |
||
| 379 | 379 | */ |
| 380 | 380 | public static function isBase64($value) |
| 381 | 381 | { |
| 382 | - return (bool) preg_match('/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/', $value); |
|
| 382 | + return (bool)preg_match('/^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/', $value); |
|
| 383 | 383 | } |
| 384 | 384 | } |