@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | * |
| 97 | 97 | * @param alpha\Util\Http\Request $request |
| 98 | 98 | * |
| 99 | - * @return alpha\Util\Http\Response |
|
| 99 | + * @return Response |
|
| 100 | 100 | * |
| 101 | 101 | * @since 1.0 |
| 102 | 102 | */ |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | * |
| 121 | 121 | * @param alpha\Util\Http\Request $request |
| 122 | 122 | * |
| 123 | - * @return alpha\Util\Http\Response |
|
| 123 | + * @return Response |
|
| 124 | 124 | * |
| 125 | 125 | * @since 1.0 |
| 126 | 126 | */ |
@@ -115,7 +115,7 @@ |
||
| 115 | 115 | /** |
| 116 | 116 | * Get config value. |
| 117 | 117 | * |
| 118 | - * @param $key string |
|
| 118 | + * @param string $key string |
|
| 119 | 119 | * |
| 120 | 120 | * @return string |
| 121 | 121 | * |
@@ -50,6 +50,7 @@ discard block |
||
| 50 | 50 | * Starts a new session, or resumes an existing session if there is already a session ID available. |
| 51 | 51 | * |
| 52 | 52 | * @since 2.0 |
| 53 | + * @return void |
|
| 53 | 54 | */ |
| 54 | 55 | public function init(); |
| 55 | 56 | |
@@ -57,13 +58,14 @@ discard block |
||
| 57 | 58 | * Destroys the current session. |
| 58 | 59 | * |
| 59 | 60 | * @since 2.0 |
| 61 | + * @return void |
|
| 60 | 62 | */ |
| 61 | 63 | public function destroy(); |
| 62 | 64 | |
| 63 | 65 | /** |
| 64 | 66 | * Get the key value from the session. Returns false if nothing is found. |
| 65 | 67 | * |
| 66 | - * @param $key |
|
| 68 | + * @param string $key |
|
| 67 | 69 | * |
| 68 | 70 | * @since 2.0 |
| 69 | 71 | * |
@@ -78,6 +80,7 @@ discard block |
||
| 78 | 80 | * @param mixed $value |
| 79 | 81 | * |
| 80 | 82 | * @since 2.0 |
| 83 | + * @return void |
|
| 81 | 84 | */ |
| 82 | 85 | public function set($key, $value); |
| 83 | 86 | |
@@ -85,9 +88,9 @@ discard block |
||
| 85 | 88 | * Deletes the value provided at that key in the session. |
| 86 | 89 | * |
| 87 | 90 | * @param string $key |
| 88 | - * @param mixed $value |
|
| 89 | 91 | * |
| 90 | 92 | * @since 2.0 |
| 93 | + * @return void |
|
| 91 | 94 | */ |
| 92 | 95 | public function delete($key); |
| 93 | 96 | |
@@ -109,7 +109,7 @@ |
||
| 109 | 109 | /** |
| 110 | 110 | * Saves the GD image resource to the file path indicated. |
| 111 | 111 | * |
| 112 | - * @param image $imageResource The GD image resource to save |
|
| 112 | + * @param resource $imageResource The GD image resource to save |
|
| 113 | 113 | * @param string $type The image type (jpg, png, or gif) |
| 114 | 114 | * @param string $destination The desination file path of the image file to create |
| 115 | 115 | * |
@@ -95,7 +95,7 @@ |
||
| 95 | 95 | list($originalWidth, $originalHeight) = $imageInfo; |
| 96 | 96 | |
| 97 | 97 | if ($originalWidth > $originalHeight) { |
| 98 | - $originalX = floor(($originalWidth - $originalHeight) / 2); |
|
| 98 | + $originalX = floor(($originalWidth-$originalHeight)/2); |
|
| 99 | 99 | $sourceWidth = $sourceHeight = $originalHeight; |
| 100 | 100 | } else { |
| 101 | 101 | $sourceWidth = $sourceHeight = $originalWidth; |
@@ -132,7 +132,7 @@ |
||
| 132 | 132 | /** |
| 133 | 133 | * Returns the size in megabytes of the log file on disc. |
| 134 | 134 | * |
| 135 | - * @return float |
|
| 135 | + * @return integer |
|
| 136 | 136 | * |
| 137 | 137 | * @since 1.0 |
| 138 | 138 | */ |
@@ -146,7 +146,7 @@ |
||
| 146 | 146 | clearstatcache(); |
| 147 | 147 | $size = filesize($this->path); |
| 148 | 148 | |
| 149 | - return ($size / 1024) /1024; |
|
| 149 | + return ($size/1024)/1024; |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | /** |
@@ -153,7 +153,7 @@ |
||
| 153 | 153 | /** |
| 154 | 154 | * The constructor. |
| 155 | 155 | * |
| 156 | - * @param $source |
|
| 156 | + * @param string $source |
|
| 157 | 157 | * @param $width |
| 158 | 158 | * @param $height |
| 159 | 159 | * @param $sourceType |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | } |
| 243 | 243 | } else { |
| 244 | 244 | // make a cache dir for the article |
| 245 | - $cacheDir = $config->get('app.file.store.dir').'cache/images/article_'.mb_substr($this->source, mb_strpos($this->source, 'attachments/article_') + 20, 11); |
|
| 245 | + $cacheDir = $config->get('app.file.store.dir').'cache/images/article_'.mb_substr($this->source, mb_strpos($this->source, 'attachments/article_')+20, 11); |
|
| 246 | 246 | if (!file_exists($cacheDir)) { |
| 247 | 247 | $success = mkdir($cacheDir); |
| 248 | 248 | |
@@ -300,11 +300,11 @@ discard block |
||
| 300 | 300 | $targetScreenY = $targetScreenResolution[1]; |
| 301 | 301 | |
| 302 | 302 | // calculate the new units we will scale by |
| 303 | - $xu = $targetScreenX / $originalScreenX; |
|
| 304 | - $yu = $targetScreenY / $originalScreenY; |
|
| 303 | + $xu = $targetScreenX/$originalScreenX; |
|
| 304 | + $yu = $targetScreenY/$originalScreenY; |
|
| 305 | 305 | |
| 306 | - $this->width = new Integer(intval($this->width->getValue() * $xu)); |
|
| 307 | - $this->height = new Integer(intval($this->height->getValue() * $yu)); |
|
| 306 | + $this->width = new Integer(intval($this->width->getValue()*$xu)); |
|
| 307 | + $this->height = new Integer(intval($this->height->getValue()*$yu)); |
|
| 308 | 308 | |
| 309 | 309 | // need to update the cache filename as the dimensions have changed |
| 310 | 310 | $this->setFilename(); |
@@ -368,7 +368,7 @@ discard block |
||
| 368 | 368 | if ($this->sourceType->getValue() == 'png' && $config->get('cms.images.perserve.png')) { |
| 369 | 369 | imagepng($new_image); |
| 370 | 370 | } else { |
| 371 | - imagejpeg($new_image, null, 100 * $this->quality->getValue()); |
|
| 371 | + imagejpeg($new_image, null, 100*$this->quality->getValue()); |
|
| 372 | 372 | } |
| 373 | 373 | |
| 374 | 374 | $this->cache($new_image); |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | if ($this->sourceType->getValue() == 'png' && $config->get('cms.images.perserve.png')) { |
| 393 | 393 | imagepng($image, $this->filename); |
| 394 | 394 | } else { |
| 395 | - imagejpeg($image, $this->filename, 100 * $this->quality->getValue()); |
|
| 395 | + imagejpeg($image, $this->filename, 100*$this->quality->getValue()); |
|
| 396 | 396 | } |
| 397 | 397 | } |
| 398 | 398 | |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | // work out how many columns will be in the table |
| 219 | 219 | $reflection = new ReflectionClass(get_class($this->BO)); |
| 220 | 220 | $properties = array_keys($reflection->getDefaultProperties()); |
| 221 | - $fields['colCount'] = 1 + count(array_diff($properties, $this->BO->getDefaultAttributes(), $this->BO->getTransientAttributes())); |
|
| 221 | + $fields['colCount'] = 1+count(array_diff($properties, $this->BO->getDefaultAttributes(), $this->BO->getTransientAttributes())); |
|
| 222 | 222 | |
| 223 | 223 | // get the class attributes |
| 224 | 224 | $properties = $reflection->getProperties(); |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | $html .= ' <th>'.$this->BO->getDataLabel($propName).'</th>'; |
| 240 | 240 | } |
| 241 | 241 | } else { |
| 242 | - $fields['colCount'] = $fields['colCount'] - 1; |
|
| 242 | + $fields['colCount'] = $fields['colCount']-1; |
|
| 243 | 243 | } |
| 244 | 244 | } |
| 245 | 245 | $html .= '</tr><tr>'; |
@@ -1009,7 +1009,7 @@ discard block |
||
| 1009 | 1009 | if ($viewState->get('markdownTextBoxRows') == '') { |
| 1010 | 1010 | $text = new TextBox($this->BO->getPropObject($name), $label, $name, 10); |
| 1011 | 1011 | } else { |
| 1012 | - $text = new TextBox($this->BO->getPropObject($name), $label, $name, (integer) $viewState->get('markdownTextBoxRows')); |
|
| 1012 | + $text = new TextBox($this->BO->getPropObject($name), $label, $name, (integer)$viewState->get('markdownTextBoxRows')); |
|
| 1013 | 1013 | } |
| 1014 | 1014 | |
| 1015 | 1015 | $html .= $text->render(); |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | // work out how many columns will be in the table |
| 104 | 104 | $reflection = new \ReflectionClass(get_class($this->BO)); |
| 105 | 105 | $properties = array_keys($reflection->getDefaultProperties()); |
| 106 | - $fields['colCount'] = 1 + count(array_diff($properties, $this->BO->getDefaultAttributes(), $this->BO->getTransientAttributes())); |
|
| 106 | + $fields['colCount'] = 1+count(array_diff($properties, $this->BO->getDefaultAttributes(), $this->BO->getTransientAttributes())); |
|
| 107 | 107 | |
| 108 | 108 | // get the class attributes |
| 109 | 109 | $properties = $reflection->getProperties(); |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | $html .= ' <th>'.$this->BO->getDataLabel($propName).'</th>'; |
| 125 | 125 | } |
| 126 | 126 | } else { |
| 127 | - $fields['colCount'] = $fields['colCount'] - 1; |
|
| 127 | + $fields['colCount'] = $fields['colCount']-1; |
|
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | 130 | $html .= '</tr><tr>'; |
@@ -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 .= ' '; |