| @@ -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>'; | 
| @@ -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 | |
| @@ -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'); | 
| @@ -175,145 +175,145 @@ discard block | ||
| 175 | 175 |              throw new BadRequestException('Request character encoding does not match expected UTF-8'); | 
| 176 | 176 | } | 
| 177 | 177 | |
| 178 | -        $this->addRoute('/', function ($request) { | |
| 178 | +        $this->addRoute('/', function($request) { | |
| 179 | 179 | $controller = new IndexController(); | 
| 180 | 180 | |
| 181 | 181 | return $controller->process($request); | 
| 182 | 182 | }); | 
| 183 | 183 | |
| 184 | -        $this->addRoute('/a/{title}/{view}', function ($request) { | |
| 184 | +        $this->addRoute('/a/{title}/{view}', function($request) { | |
| 185 | 185 | $controller = new ArticleController(); | 
| 186 | 186 | |
| 187 | 187 | return $controller->process($request); | 
| 188 | 188 |          })->value('title', null)->value('view', 'detailed'); | 
| 189 | 189 | |
| 190 | -        $this->addRoute('/articles/{start}/{limit}', function ($request) { | |
| 190 | +        $this->addRoute('/articles/{start}/{limit}', function($request) { | |
| 191 | 191 | $controller = new ArticleController(); | 
| 192 | 192 | |
| 193 | 193 | return $controller->process($request); | 
| 194 | 194 |          })->value('start', 0)->value('limit', $config->get('app.list.page.amount')); | 
| 195 | 195 | |
| 196 | -        $this->addRoute('/attach/{articleOID}/{filename}', function ($request) { | |
| 196 | +        $this->addRoute('/attach/{articleOID}/{filename}', function($request) { | |
| 197 | 197 | $controller = new AttachmentController(); | 
| 198 | 198 | |
| 199 | 199 | return $controller->process($request); | 
| 200 | 200 | }); | 
| 201 | 201 | |
| 202 | -        $this->addRoute('/cache', function ($request) { | |
| 202 | +        $this->addRoute('/cache', function($request) { | |
| 203 | 203 | $controller = new CacheController(); | 
| 204 | 204 | |
| 205 | 205 | return $controller->process($request); | 
| 206 | 206 | }); | 
| 207 | 207 | |
| 208 | -        $this->addRoute('/denum/{denumOID}', function ($request) { | |
| 208 | +        $this->addRoute('/denum/{denumOID}', function($request) { | |
| 209 | 209 | $controller = new DEnumController(); | 
| 210 | 210 | |
| 211 | 211 | return $controller->process($request); | 
| 212 | 212 |          })->value('denumOID', null); | 
| 213 | 213 | |
| 214 | -        $this->addRoute('/excel/{ActiveRecordType}/{ActiveRecordOID}', function ($request) { | |
| 214 | +        $this->addRoute('/excel/{ActiveRecordType}/{ActiveRecordOID}', function($request) { | |
| 215 | 215 | $controller = new ExcelController(); | 
| 216 | 216 | |
| 217 | 217 | return $controller->process($request); | 
| 218 | 218 |          })->value('ActiveRecordOID', null); | 
| 219 | 219 | |
| 220 | -        $this->addRoute('/feed/{ActiveRecordType}/{type}', function ($request) { | |
| 220 | +        $this->addRoute('/feed/{ActiveRecordType}/{type}', function($request) { | |
| 221 | 221 | $controller = new FeedController(); | 
| 222 | 222 | |
| 223 | 223 | return $controller->process($request); | 
| 224 | 224 |          })->value('type', 'Atom'); | 
| 225 | 225 | |
| 226 | -        $this->addRoute('/gensecure', function ($request) { | |
| 226 | +        $this->addRoute('/gensecure', function($request) { | |
| 227 | 227 | $controller = new GenSecureQueryStringController(); | 
| 228 | 228 | |
| 229 | 229 | return $controller->process($request); | 
| 230 | 230 | }); | 
| 231 | 231 | |
| 232 | -        $this->addRoute('/image/{source}/{width}/{height}/{type}/{quality}/{scale}/{secure}/{var1}/{var2}', function ($request) { | |
| 232 | +        $this->addRoute('/image/{source}/{width}/{height}/{type}/{quality}/{scale}/{secure}/{var1}/{var2}', function($request) { | |
| 233 | 233 | $controller = new ImageController(); | 
| 234 | 234 | |
| 235 | 235 | return $controller->process($request); | 
| 236 | 236 |          })->value('var1', null)->value('var2', null); | 
| 237 | 237 | |
| 238 | -        $this->addRoute('/listactiverecords', function ($request) { | |
| 238 | +        $this->addRoute('/listactiverecords', function($request) { | |
| 239 | 239 | $controller = new ListActiveRecordsController(); | 
| 240 | 240 | |
| 241 | 241 | return $controller->process($request); | 
| 242 | 242 | }); | 
| 243 | 243 | |
| 244 | -        $this->addRoute('/log/{logPath}', function ($request) { | |
| 244 | +        $this->addRoute('/log/{logPath}', function($request) { | |
| 245 | 245 | $controller = new LogController(); | 
| 246 | 246 | |
| 247 | 247 | return $controller->process($request); | 
| 248 | 248 | }); | 
| 249 | 249 | |
| 250 | -        $this->addRoute('/login', function ($request) { | |
| 250 | +        $this->addRoute('/login', function($request) { | |
| 251 | 251 | $controller = new LoginController(); | 
| 252 | 252 | |
| 253 | 253 | return $controller->process($request); | 
| 254 | 254 | }); | 
| 255 | 255 | |
| 256 | -        $this->addRoute('/logout', function ($request) { | |
| 256 | +        $this->addRoute('/logout', function($request) { | |
| 257 | 257 | $controller = new LogoutController(); | 
| 258 | 258 | |
| 259 | 259 | return $controller->process($request); | 
| 260 | 260 | }); | 
| 261 | 261 | |
| 262 | -        $this->addRoute('/metric', function ($request) { | |
| 262 | +        $this->addRoute('/metric', function($request) { | |
| 263 | 263 | $controller = new MetricController(); | 
| 264 | 264 | |
| 265 | 265 | return $controller->process($request); | 
| 266 | 266 | }); | 
| 267 | 267 | |
| 268 | -        $this->addRoute('/recordselector/12m/{ActiveRecordOID}/{field}/{relatedClass}/{relatedClassField}/{relatedClassDisplayField}/{relationType}', function ($request) { | |
| 268 | +        $this->addRoute('/recordselector/12m/{ActiveRecordOID}/{field}/{relatedClass}/{relatedClassField}/{relatedClassDisplayField}/{relationType}', function($request) { | |
| 269 | 269 | $controller = new RecordSelectorController(); | 
| 270 | 270 | |
| 271 | 271 | return $controller->process($request); | 
| 272 | 272 |          })->value('relationType', 'ONE-TO-MANY'); | 
| 273 | 273 | |
| 274 | -        $this->addRoute('/recordselector/m2m/{ActiveRecordOID}/{field}/{relatedClassLeft}/{relatedClassLeftDisplayField}/{relatedClassRight}/{relatedClassRightDisplayField}/{accessingClassName}/{lookupOIDs}/{relationType}', function ($request) { | |
| 274 | +        $this->addRoute('/recordselector/m2m/{ActiveRecordOID}/{field}/{relatedClassLeft}/{relatedClassLeftDisplayField}/{relatedClassRight}/{relatedClassRightDisplayField}/{accessingClassName}/{lookupOIDs}/{relationType}', function($request) { | |
| 275 | 275 | $controller = new RecordSelectorController(); | 
| 276 | 276 | |
| 277 | 277 | return $controller->process($request); | 
| 278 | 278 |          })->value('relationType', 'MANY-TO-MANY'); | 
| 279 | 279 | |
| 280 | -        $this->addRoute('/search/{query}/{start}/{limit}', function ($request) { | |
| 280 | +        $this->addRoute('/search/{query}/{start}/{limit}', function($request) { | |
| 281 | 281 | $controller = new SearchController(); | 
| 282 | 282 | |
| 283 | 283 | return $controller->process($request); | 
| 284 | 284 |          })->value('start', 0)->value('limit', $config->get('app.list.page.amount')); | 
| 285 | 285 | |
| 286 | -        $this->addRoute('/sequence/{start}/{limit}', function ($request) { | |
| 286 | +        $this->addRoute('/sequence/{start}/{limit}', function($request) { | |
| 287 | 287 | $controller = new SequenceController(); | 
| 288 | 288 | |
| 289 | 289 | return $controller->process($request); | 
| 290 | 290 |          })->value('start', 0)->value('limit', $config->get('app.list.page.amount')); | 
| 291 | 291 | |
| 292 | -        $this->addRoute('/tag/{ActiveRecordType}/{ActiveRecordOID}', function ($request) { | |
| 292 | +        $this->addRoute('/tag/{ActiveRecordType}/{ActiveRecordOID}', function($request) { | |
| 293 | 293 | $controller = new TagController(); | 
| 294 | 294 | |
| 295 | 295 | return $controller->process($request); | 
| 296 | 296 | }); | 
| 297 | 297 | |
| 298 | -        $this->addRoute('/install', function ($request) { | |
| 298 | +        $this->addRoute('/install', function($request) { | |
| 299 | 299 | $controller = new InstallController(); | 
| 300 | 300 | |
| 301 | 301 | return $controller->process($request); | 
| 302 | 302 | }); | 
| 303 | 303 | |
| 304 | -        $this->addRoute('/record/{ActiveRecordType}/{ActiveRecordOID}/{view}', function ($request) { | |
| 304 | +        $this->addRoute('/record/{ActiveRecordType}/{ActiveRecordOID}/{view}', function($request) { | |
| 305 | 305 | $controller = new ActiveRecordController(); | 
| 306 | 306 | |
| 307 | 307 | return $controller->process($request); | 
| 308 | 308 |          })->value('ActiveRecordOID', null)->value('view', 'detailed'); | 
| 309 | 309 | |
| 310 | -        $this->addRoute('/records/{ActiveRecordType}/{start}/{limit}', function ($request) { | |
| 310 | +        $this->addRoute('/records/{ActiveRecordType}/{start}/{limit}', function($request) { | |
| 311 | 311 | $controller = new ActiveRecordController(); | 
| 312 | 312 | |
| 313 | 313 | return $controller->process($request); | 
| 314 | 314 |          })->value('start', 0)->value('limit', $config->get('app.list.page.amount')); | 
| 315 | 315 | |
| 316 | -        $this->addRoute('/tk/{token}', function ($request) { | |
| 316 | +        $this->addRoute('/tk/{token}', function($request) { | |
| 317 | 317 |              $params = self::getDecodeQueryParams($request->getParam('token')); | 
| 318 | 318 | |
| 319 | 319 |              if (isset($params['act'])) { | 
| @@ -340,7 +340,7 @@ discard block | ||
| 340 | 340 | return new Response(404, 'Resource not found'); | 
| 341 | 341 | }); | 
| 342 | 342 | |
| 343 | -        $this->addRoute('/alpha/service', function ($request) { | |
| 343 | +        $this->addRoute('/alpha/service', function($request) { | |
| 344 | 344 | $controller = new LoginController(); | 
| 345 | 345 |              $controller->setUnitOfWork(array('Alpha\Controller\LoginController', 'Alpha\Controller\ListActiveRecordsController')); | 
| 346 | 346 | |
| @@ -487,7 +487,7 @@ discard block | ||
| 487 | 487 | */ | 
| 488 | 488 | private static function multipleExplode($string, $delimiters = array()) | 
| 489 | 489 |      { | 
| 490 | - $mainDelim = $delimiters[count($delimiters) - 1]; | |
| 490 | + $mainDelim = $delimiters[count($delimiters)-1]; | |
| 491 | 491 | |
| 492 | 492 | array_pop($delimiters); | 
| 493 | 493 | |
| @@ -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) { | 
| @@ -690,7 +690,7 @@ discard block | ||
| 690 | 690 | $body = ''; | 
| 691 | 691 | |
| 692 | 692 | // the index of the last record displayed on this page | 
| 693 | -        $last = $this->start + $config->get('app.list.page.amount'); | |
| 693 | +        $last = $this->start+$config->get('app.list.page.amount'); | |
| 694 | 694 | |
| 695 | 695 | // ensure that the last index never overruns the total record count | 
| 696 | 696 |          if ($last > $this->recordCount) { | 
| @@ -710,9 +710,9 @@ discard block | ||
| 710 | 710 |          if ($this->start > 0) { | 
| 711 | 711 | // handle secure URLs | 
| 712 | 712 |              if ($this->request->getParam('token', null) != null) { | 
| 713 | -                $body .= '<li><a href="'.FrontController::generateSecureURL('act=Alpha\Controller\ActiveRecordController&ActiveRecordType='.$this->request->getParam('ActiveRecordType').'&start='.($this->start - $this->limit).'&limit='.$this->limit).'"><<-Previous</a></li>'; | |
| 713 | +                $body .= '<li><a href="'.FrontController::generateSecureURL('act=Alpha\Controller\ActiveRecordController&ActiveRecordType='.$this->request->getParam('ActiveRecordType').'&start='.($this->start-$this->limit).'&limit='.$this->limit).'"><<-Previous</a></li>'; | |
| 714 | 714 |              } else { | 
| 715 | -                $body .= '<li><a href="/records/'.urlencode($this->request->getParam('ActiveRecordType')).'/'.($this->start - $this->limit).'/'.$this->limit.'"><<-Previous</a></li>'; | |
| 715 | +                $body .= '<li><a href="/records/'.urlencode($this->request->getParam('ActiveRecordType')).'/'.($this->start-$this->limit).'/'.$this->limit.'"><<-Previous</a></li>'; | |
| 716 | 716 | } | 
| 717 | 717 |          } elseif ($this->recordCount > $this->limit) { | 
| 718 | 718 | $body .= '<li class="disabled"><a href="#"><<-Previous</a></li>'; | 
| @@ -742,9 +742,9 @@ discard block | ||
| 742 | 742 |          if ($this->recordCount > $last) { | 
| 743 | 743 | // handle secure URLs | 
| 744 | 744 |              if ($this->request->getParam('token', null) != null) { | 
| 745 | -                $body .= '<li><a href="'.FrontController::generateSecureURL('act=Alpha\Controller\ActiveRecordController&ActiveRecordType='.$this->request->getParam('ActiveRecordType').'&start='.($this->start + $this->limit).'&limit='.$this->limit).'">Next->></a></li>'; | |
| 745 | +                $body .= '<li><a href="'.FrontController::generateSecureURL('act=Alpha\Controller\ActiveRecordController&ActiveRecordType='.$this->request->getParam('ActiveRecordType').'&start='.($this->start+$this->limit).'&limit='.$this->limit).'">Next->></a></li>'; | |
| 746 | 746 |              } else { | 
| 747 | -                $body .= '<li><a href="/records/'.urlencode($this->request->getParam('ActiveRecordType')).'/'.($this->start + $this->limit.'/'.$this->limit). | |
| 747 | +                $body .= '<li><a href="/records/'.urlencode($this->request->getParam('ActiveRecordType')).'/'.($this->start+$this->limit.'/'.$this->limit). | |
| 748 | 748 | '">Next->></a></li>'; | 
| 749 | 749 | } | 
| 750 | 750 |          } elseif ($this->recordCount > $this->limit) { |