Schlaefer / Saito

app/Controller/EntriesController.php

Spacing +23 added lines, -23 removed lines

@@ -43,8 +43,8 @@ 
 
 			$currentPage = 1;
 			if (isset($this->request->named['page']) && $this->request->named['page'] != 1) {
-				$currentPage = (int)$this->request->named['page'];
-				$this->set('title_for_layout', __('page') . ' ' . $currentPage);
+				$currentPage = (int) $this->request->named['page'];
+				$this->set('title_for_layout', __('page').' '.$currentPage);
 			}
 			if ($currentPage === 1 && $this->CurrentUser->isLoggedIn()
 				&& $this->CurrentUser['user_automaticaly_mark_as_read']
@@ -146,11 +146,11 @@ 
 		public function source($id = null) {
 			$this->autoRender = false;
 
-			$data = $this->requestAction('/entries/view/' . $id);
+			$data = $this->requestAction('/entries/view/'.$id);
 
 			$out = array();
 			$out[] = '<pre style="white-space: pre-wrap;">';
-			$out[] = $data['Entry']['subject'] . "\n";
+			$out[] = $data['Entry']['subject']."\n";
 			$out[] = $data['Entry']['text'];
 			$out[] = '</pre>';
 			return implode("\n", $out);
@@ -233,9 +233,9 @@ 
 
 							return json_encode(
 								[
-									'id' => (int)$newPosting['Entry']['id'],
-									'pid' => (int)$newPosting['Entry']['pid'],
-									'tid' => (int)$newPosting['Entry']['tid']
+									'id' => (int) $newPosting['Entry']['id'],
+									'pid' => (int) $newPosting['Entry']['pid'],
+									'tid' => (int) $newPosting['Entry']['tid']
 								]
 							);
 						} else {
@@ -336,8 +336,8 @@ 
 				}
 			}
 
-			$this->set('is_answer', (int)$this->request->data['Entry']['pid'] !== 0);
-			$this->set('is_inline', (int)$this->request->data['Entry']['pid'] !== 0);
+			$this->set('is_answer', (int) $this->request->data['Entry']['pid'] !== 0);
+			$this->set('is_inline', (int) $this->request->data['Entry']['pid'] !== 0);
 			$this->set('form_id', $this->request->data['Entry']['pid']);
 			$this->_setAddViewVars();
 		}
@@ -439,7 +439,7 @@ 
 			);
 			$this->set('notis', $notis);
 
-			$this->set('is_answer', (int)$this->request->data['Entry']['pid'] !== 0);
+			$this->set('is_answer', (int) $this->request->data['Entry']['pid'] !== 0);
 			$this->set('is_inline', false);
 			$this->set('form_id', $this->request->data['Entry']['pid']);
 
@@ -487,7 +487,7 @@ 
 				$this->redirect('/');
 			} else {
 				$this->Session->setFlash(__('delete_subtree_success'), 'flash/success');
-				$this->redirect('/entries/view/' . $entry['Entry']['pid']);
+				$this->redirect('/entries/view/'.$entry['Entry']['pid']);
 			}
 		} else {
 			$this->Session->setFlash(__('delete_tree_error'), 'flash/error');
@@ -587,16 +587,16 @@ 
 			else :
 				// validation errors
 				foreach ($errors as $field => $error) {
-					$message = __d('nondynamic', $field) . ": " . __d( 'nondynamic', $error[0]);
+					$message = __d('nondynamic', $field).": ".__d('nondynamic', $error[0]);
 					$this->JsData->addAppJsMessage(
 						$message,
 						[
 							'type' => 'error',
 							'channel' => 'form',
-							'element' => '#Entry' . array_reduce(
+							'element' => '#Entry'.array_reduce(
 									explode('_', $field),
-									function ($carry, $item) {
-										return $carry . ucfirst($item);
+									function($carry, $item) {
+										return $carry.ucfirst($item);
 									},
 									''
 								)
@@ -626,7 +626,7 @@ 
 			$this->Entry->contain();
 			$data = $this->Entry->findById($id);
 
-			if (!$data || (int)$data['Entry']['pid'] !== 0) {
+			if (!$data || (int) $data['Entry']['pid'] !== 0) {
 				throw new NotFoundException();
 			}
 
@@ -635,7 +635,7 @@ 
 				$targetId = $this->request->data['Entry']['targetId'];
 				$this->Entry->id = $id;
 				if ($this->Entry->threadMerge($targetId)) {
-					$this->redirect('/entries/view/' . $id);
+					$this->redirect('/entries/view/'.$id);
 					return;
 				} else {
 					$this->Session->setFlash(__("Error"), 'flash/error');
@@ -676,10 +676,10 @@ 
 				//* let's toggle
 				$this->Entry->id = $id;
 				$this->request->data = $this->Entry->toggle($toggle);
-				return ($this->request->data == 0) ? __d('nondynamic', $toggle . '_set_entry_link') : __d('nondynamic', $toggle . '_unset_entry_link');
+				return ($this->request->data == 0) ? __d('nondynamic', $toggle.'_set_entry_link') : __d('nondynamic', $toggle.'_unset_entry_link');
 			}
 
-			$this->set('json_data', (string)$this->request->data);
+			$this->set('json_data', (string) $this->request->data);
 			$this->render('/Elements/json/json_data');
 		}
 
@@ -925,7 +925,7 @@ 
 						// … directly in entries/mix
 						|| $this->request->action === 'mix'
 						// … inline viewing … on entries/index.
-						|| ( $this->localReferer('controller') === 'entries' && $this->localReferer('action') === 'index')
+						|| ($this->localReferer('controller') === 'entries' && $this->localReferer('action') === 'index')
 				):
 					$showAnsweringPanel = true;
 				endif;
@@ -934,7 +934,7 @@ 
 		}
 
 		protected function _setRootEntry($entry) {
-			if ((int)$entry['Entry']['pid'] !== 0) {
+			if ((int) $entry['Entry']['pid'] !== 0) {
 				$_rootEntry = $this->Entry->find('first',
 					[
 						'contain' => false,
@@ -949,9 +949,9 @@ 
 
 		protected function _setTitleFromEntry($entry, $type = null) {
 			if ($type === null) {
-				$template =	__(':subject | :category');
+				$template = __(':subject | :category');
 			} else {
-				$template =	__(':subject (:type) | :category');
+				$template = __(':subject (:type) | :category');
 			}
 			$this->set('title_for_layout',
 					CakeText::insert($template,

app/Controller/ContactsController.php

Spacing +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 				$Logger->write('Contact email failed', ['e' => $e]);
 
 				$this->Session->setFlash(
-					__('Message couldn\'t be send! ' . $e->getMessage()),
+					__('Message couldn\'t be send! '.$e->getMessage()),
 					'flash/error'
 				);
 			}

app/Controller/UsersController.php

Spacing +5 added lines, -5 removed lines

@@ -157,7 +157,7 @@ 
 			$code = $this->request->query('c');
 
 			try {
-				$activated = $this->User->activate((int)$id, $code);
+				$activated = $this->User->activate((int) $id, $code);
 			} catch (Exception $e) {
 				$activated = false;
 			}
@@ -421,7 +421,7 @@ 
 				return;
 			}
 
-			$id = (int)$this->request->data('User.lockUserId');
+			$id = (int) $this->request->data('User.lockUserId');
 			if (!$id) {
 				throw new BadRequestException;
 			}
@@ -445,7 +445,7 @@ 
 				);
 			} else {
 				try {
-					$duration = (int)$this->request->data('User.lockPeriod');
+					$duration = (int) $this->request->data('User.lockPeriod');
 					$status = $this->User->UserBlock->block(
 						new \Saito\User\Blocker\ManualBlocker,
 						$id,
@@ -608,7 +608,7 @@ 
 			}
 
 			$allowed = $this->viewVars['slidetabs'];
-			$order = array_filter( $order, function ($item) use ($allowed) {
+			$order = array_filter($order, function($item) use ($allowed) {
 				return in_array($item, $allowed);
 			});
 			$order = serialize($order);
@@ -667,7 +667,7 @@ 
 			if ($CurrentUser->isAdmin()) {
 				return true;
 			}
-			return $CurrentUser->getId() === (int)$userId;
+			return $CurrentUser->getId() === (int) $userId;
 		}
 
 		protected function _passwordAuthSwitch($data) {

app/Controller/EsnotificationsController.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
 			$deactivate = $this->Esnotification->read('deactivate');
 			if (!isset($this->request->params['named']['token'])
-					|| (int)$this->request->params['named']['token'] !== (int)$deactivate['Esnotification']['deactivate']
+					|| (int) $this->request->params['named']['token'] !== (int) $deactivate['Esnotification']['deactivate']
 			) {
 				throw new MethodNotAllowedException();
 			}

app/Controller/BookmarksController.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 			'entry_id' => $this->request->data['id'],
 		];
 		$this->Bookmark->create();
-		return (bool)$this->Bookmark->save($data);
+		return (bool) $this->Bookmark->save($data);
 	}
 
 	/**
@@ -98,7 +98,7 @@ 
 		$this->_getBookmark($id, $this->CurrentUser->getId());
 		$this->autoRender = false;
 		$this->Bookmark->id = $id;
-		return (bool)$this->Bookmark->delete();
+		return (bool) $this->Bookmark->delete();
 	}
 
 	public function beforeFilter() {

app/Controller/CategoriesController.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 				if (isset($this->request->data['Category']['modeMove']) && isset($this->request->data['Category']['targetCategory'])):
 					/* move category items before deleting the cateogry */
 
-					$targetId = (int)$this->request->data['Category']['targetCategory'];
+					$targetId = (int) $this->request->data['Category']['targetCategory'];
 
 					/* make sure that target category exists */
 					$this->Category->contain();

app/Controller/SettingsController.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 
 		public function admin_edit($id = null) {
 			if (!$id) {
-				$this->redirect(array( 'action ' => 'index' ));
+				$this->redirect(array('action ' => 'index'));
 			}
 
 			$this->Setting->id = $id;

app/Controller/SearchesController.php

Spacing +4 added lines, -4 removed lines

@@ -79,8 +79,8 @@ 
 			$order = '`Entry`.`time` DESC';
 			$fields = '*';
 			if ($query['order'] === 'rank') {
-				$order = 'rating DESC, ' . $order;
-				$fields = $fields . ", (MATCH (Entry.subject) AGAINST ('$q' IN BOOLEAN MODE)*2) + (MATCH (Entry.text) AGAINST ('$q' IN BOOLEAN MODE)) + (MATCH (Entry.name) AGAINST ('$q' IN BOOLEAN MODE)*4) AS rating";
+				$order = 'rating DESC, '.$order;
+				$fields = $fields.", (MATCH (Entry.subject) AGAINST ('$q' IN BOOLEAN MODE)*2) + (MATCH (Entry.text) AGAINST ('$q' IN BOOLEAN MODE)) + (MATCH (Entry.name) AGAINST ('$q' IN BOOLEAN MODE)*4) AS rating";
 			}
 
 			// query
@@ -152,8 +152,8 @@ 
 						'Y-m-d H:i:s',
 						mktime(0, 0, 0, $month, 1, $year));
 
-				if (isset($query['category_id']) && (int)$query['category_id'] !== 0) {
-					if (!isset($categories[(int)$query['category_id']])) {
+				if (isset($query['category_id']) && (int) $query['category_id'] !== 0) {
+					if (!isset($categories[(int) $query['category_id']])) {
 						throw new NotFoundException;
 					}
 				} else {

app/Controller/StatusController.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 			$this->response->disableCache();
 			$_out = '';
 			$_out .= "retry: $_retry\n";
-			$_out .= 'data: ' . $data . "\n\n";
+			$_out .= 'data: '.$data."\n\n";
 			return $_out;
 		}