Schlaefer / Saito

app/Controller/EntriesController.php

Braces +9 added lines, -3 removed lines

@@ -242,7 +242,8 @@ 
 							$this->_stop();
 						}
 					// answering through POST request
-					else :
+					else {
+						:
 						if ($this->localReferer('action') === 'mix') {
 							// answer request came from mix ansicht
 							$this->redirect(
@@ -253,6 +254,7 @@ 
 									'#' => $this->Entry->id
 								]
 							);
+					}
 
 						} else {
 							// normal posting from entries/add or entries/view
@@ -267,7 +269,8 @@ 
 						}
 						return;
 					endif;
-				else :
+				else {
+					:
 					// Error while trying to save a post
 					if (count($this->Entry->validationErrors) === 0) {
 						$this->Session->setFlash(
@@ -276,6 +279,7 @@ 
 							),
 							'flash/error'
 						);
+				}
 					}
 				endif;
 
@@ -584,10 +588,12 @@ 
 				);
 				$entry = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $newEntry]);
 				$this->set('entry', $entry);
-			else :
+			else {
+				:
 				// validation errors
 				foreach ($errors as $field => $error) {
 					$message = __d('nondynamic', $field) . ": " . __d( 'nondynamic', $error[0]);
+			}
 					$this->JsData->addAppJsMessage(
 						$message,
 						[

app/Controller/CategoriesController.php

Braces +6 added lines, -2 removed lines

@@ -89,8 +89,10 @@ 
 						$this->Session->setFlash(__('Error moving category.'),
 								'flash/error');
 						$failure = $failure || true;
-					else:
+					else {
+						:
 						$this->Session->setFlash(__('Category moved.'), 'flash/notice');
+					}
 					endif;
 				endif;
 
@@ -99,8 +101,10 @@ 
 					$this->Session->setFlash(__("Error deleting category."),
 							'flash/error');
 					$failure = $failure || true;
-				else:
+				else {
+					:
 					$this->Session->setFlash(__('Category deleted.'), 'flash/notice');
+				}
 				endif;
 
 				if ($failure == false) :

app/Controller/AppController.php

Indentation +4 added lines, -4 removed lines

@@ -20,10 +20,10 @@
 			// Leave in front to have it available in all Components
 			'Detectors.Detectors',
 /**
- * You have to have Cookie before CurrentUser to have the salt initialized.
- * Check by deleting Session cookie when persistent cookie is present.
- * @td maybe bug in Cake, because Cookies should be initialized in CurrentUser's $components
- */
+			 * You have to have Cookie before CurrentUser to have the salt initialized.
+			 * Check by deleting Session cookie when persistent cookie is present.
+			 * @td maybe bug in Cake, because Cookies should be initialized in CurrentUser's $components
+			 */
 			'Cookie',
 			'CurrentUser',
 			'CacheSupport',

app/Controller/Component/CurrentUserComponent.php

Braces +3 added lines, -1 removed lines

@@ -305,8 +305,10 @@
 
 			if ($this->isLoggedIn()):
 				$this->_Controller->Auth->allow();
-			else:
+			else {
+				:
 				$this->_Controller->Auth->deny();
+			}
 			endif;
 
 			$this->_Controller->Auth->autoRedirect = false; // don't redirect after Auth->login()

app/Plugin/SimpleCaptcha/View/Helper/SimpleCaptchaHelper.php

Indentation +11 added lines, -11 removed lines

@@ -56,12 +56,12 @@ 
 		$this->captcha_result = $numberOne - $numberTwo;
 
 		# Session-Way (only one form at a time) - must be a component then
-    //$this->Session->write('Captcha.result', $result);
+	//$this->Session->write('Captcha.result', $result);
 
-    # DB-Way (several forms possible, high security via IP-Based max limits)
-    // the following should be done in a component and passed to the view/helper
-    // $Captcha = ClassRegistry::init('Captcha');
-    // $Captcha->new(); $Captcha->update(); etc
+	# DB-Way (several forms possible, high security via IP-Based max limits)
+	// the following should be done in a component and passed to the view/helper
+	// $Captcha = ClassRegistry::init('Captcha');
+	// $Captcha->new(); $Captcha->update(); etc
 
   	# Timestamp-SessionID-Hash-Way (several forms possible, not as secure)
   	$this->captcha_hash = SimpleCaptcha::buildHash(array('timestamp' => time(), 'result' => $this->captcha_result), $this->options);
@@ -93,10 +93,10 @@ 
 
 		# add passive part on active forms as well
 		$out = '<div style="display:none">'.
-            $this->Form->input($field.'_hash', array('value'=>$this->captcha_hash)).
-            $this->Form->input($field.'_time', array('value'=>time())).
-            $this->Form->input((!empty($model)?$model.'.':'').$this->options['dummyField'], array('value'=>'')).
-        '</div>';
+			$this->Form->input($field.'_hash', array('value'=>$this->captcha_hash)).
+			$this->Form->input($field.'_time', array('value'=>time())).
+			$this->Form->input((!empty($model)?$model.'.':'').$this->options['dummyField'], array('value'=>'')).
+		'</div>';
 
 		return $out;
 	}
@@ -133,8 +133,8 @@ 
 
 
 		if ($options['combined'] === true) {
-            $options['between'] = $out.' = ';
-        }
+			$options['between'] = $out.' = ';
+		}
 		unset($options['combined']);
 
 		return $this->Form->input($this->__fieldName($model), $options); 

Braces +3 added lines, -1 removed lines

@@ -41,7 +41,9 @@
 	 * @return array 
 	 */
   protected function _generate() {
-		if ($this->captcha_generated === TRUE) return;
+		if ($this->captcha_generated === TRUE) {
+			return;
+		}
   	# Choose the first number randomly between 6 and 10. This is to stop the answer being negative.
 		$numberOne = mt_rand(6, 9);
   	# Choose the second number randomly between 0 and 5.

app/Config/bootstrap.php

Indentation +2 added lines, -2 removed lines

@@ -208,8 +208,8 @@
 Configure::write('Saito.Globals.postingsPerThread', 10);
 
 	/**
- * Check if the forum is installed
- */
+	 * Check if the forum is installed
+	 */
 if ( file_exists(APP . 'Config' . DS . 'installed.txt') ) :
 	Configure::write('Saito.installed', TRUE);
 else :

Braces +3 added lines, -1 removed lines

@@ -212,8 +212,10 @@
  */
 if ( file_exists(APP . 'Config' . DS . 'installed.txt') ) :
 	Configure::write('Saito.installed', TRUE);
-else :
+else {
+	:
 	Configure::write('Saito.installed', FALSE);
+}
 endif;
 
 /**

app/Config/core.php

Indentation +3 added lines, -3 removed lines

@@ -135,9 +135,9 @@
  */
 	Configure::write('Routing.prefixes', array('admin'));
 /**
- * Turn off all caching application-wide.
- *
- */
+	 * Turn off all caching application-wide.
+	 *
+	 */
 	//Configure::write('Cache.disable', true);
 
 /**

app/Config/saito_config.php

Indentation +19 added lines, -19 removed lines

@@ -46,14 +46,14 @@ 
 
   /**
    * Add additional buttons to editor
-	 *
-	 * You can theme them with
-	 *
-	 * <code>
-	 * 	.markItUp .markItUpButton<Id> a {
-	 * 		…
-	 *	}
-	 * </code>
+   *
+   * You can theme them with
+   *
+   * <code>
+   * 	.markItUp .markItUpButton<Id> a {
+   * 		…
+   *	}
+   * </code>
    *
   /*
   Configure::write(
@@ -75,22 +75,22 @@ 
             // image in img/markitup/<replacement>
             'replacement' => 'resultofbutton1.png'
           ),
-  * 			// …
+   * 			// …
         )
       );
-  *
-  */
+   *
+   */
 
   /**
    * Users to notify via email if a new users registers successfully
-	 *
-	 * Provide an array with user IDs. To notify the admin (usually user-id 1):
-	 *
-	 *     [1]
-	 *
-	 * To notify the admin with id 1 and the user with the id 5:
-	 *
-	 *     [1, 5]
+   *
+   * Provide an array with user IDs. To notify the admin (usually user-id 1):
+   *
+   *     [1]
+   *
+   * To notify the admin with id 1 and the user with the id 5:
+   *
+   *     [1, 5]
    */
   /*
   Configure::write('Saito.Notification.userActivatedAdminNoticeToUserWithID', [1]);

app/View/Helper/FarbtasticHelper.php

Indentation +54 added lines, -54 removed lines

@@ -2,54 +2,54 @@ 
 	// @codingStandardsIgnoreFile
 	App::uses('AppHelper', 'View/Helper');
 /**
- *    Farbtastic helper
- *    @author      	Curtis Gibby
- *    @author     	Sebastian Siedentopf
- *    @desc        This helper does everything you need related to Farbtastic within CakePHP
- *
- *                Like Farbtastic, requires jQuery to function properly.
- *                jQuery: http://jquery.com
- *
- *                Also requires a Color Wheel icon (color.png in this example)
- *                like the one from Mark James' Silk set
- *                http://www.iconfinder.net/icondetails/5185/16/
- *
- *    @version    2010-07-18
- * 		@td make plugin, fork from http://bakery.cakephp.org/articles/view/helper-for-farbtastic-jquery-color-picker to githup
- */
+	 *    Farbtastic helper
+	 *    @author      	Curtis Gibby
+	 *    @author     	Sebastian Siedentopf
+	 *    @desc        This helper does everything you need related to Farbtastic within CakePHP
+	 *
+	 *                Like Farbtastic, requires jQuery to function properly.
+	 *                jQuery: http://jquery.com
+	 *
+	 *                Also requires a Color Wheel icon (color.png in this example)
+	 *                like the one from Mark James' Silk set
+	 *                http://www.iconfinder.net/icondetails/5185/16/
+	 *
+	 *    @version    2010-07-18
+	 * 		@td make plugin, fork from http://bakery.cakephp.org/articles/view/helper-for-farbtastic-jquery-color-picker to githup
+	 */
 class FarbtasticHelper extends Helper  {
 
-    public $helpers = ['Form', 'Html'];
+	public $helpers = ['Form', 'Html'];
 
 		protected $output_files =	true;
 
 
-    /**
-    *    Generate a form input and related div and icon
-    *
-    *    may need to customize $icon_file (relative to webroot)
-    *
-    *    Adapted from April Hodge Silver's "Simple Colorpicker" input function
-    *    http://bakery.cakephp.org/articles/view/simple-colorpicker
-    */
-    function input($name, $label='') {
+	/**
+	 *    Generate a form input and related div and icon
+	 *
+	 *    may need to customize $icon_file (relative to webroot)
+	 *
+	 *    Adapted from April Hodge Silver's "Simple Colorpicker" input function
+	 *    http://bakery.cakephp.org/articles/view/simple-colorpicker
+	 */
+	function input($name, $label='') {
 
-        $icon_file = '../../js/farbtastic/color.png'; // update to wherever your icon is.
+		$icon_file = '../../js/farbtastic/color.png'; // update to wherever your icon is.
 
-        list($model, $fieldname) = explode('.', $name);
-        if (empty($label)) {
-            $label = Inflector::Humanize($fieldname);
-        }
+		list($model, $fieldname) = explode('.', $name);
+		if (empty($label)) {
+			$label = Inflector::Humanize($fieldname);
+		}
 
-        if(isset($this->request->data[$model][$fieldname])) {
-            $color_value = str_replace("#", "", $this->request->data[$model][$fieldname]); // expects an RGB string, strips any incoming '#' character
-        }
-        else {
-            $color_value = "000000"; // black
-        }
+		if(isset($this->request->data[$model][$fieldname])) {
+			$color_value = str_replace("#", "", $this->request->data[$model][$fieldname]); // expects an RGB string, strips any incoming '#' character
+		}
+		else {
+			$color_value = "000000"; // black
+		}
 
-        $str = '';
-        $str .= '<div class="input text colorpicker">';
+		$str = '';
+		$str .= '<div class="input text colorpicker">';
 				$str .= $this->Form->input($fieldname, [
 					'id' => $model . Inflector::Camelize($fieldname),
 					'class' => 'farbtastic-input',
@@ -57,9 +57,9 @@ 
 					'label' => $label,
 					'value' => "#$color_value"
 				]);
-        $str .= '<img id="farbtastic-picker-icon-'.Inflector::Camelize($fieldname).'" src="'.$icon_file.'" alt="Color Picker" title="Color Picker" class="farbtastic-picker-icon">';
-        $str .= '<div style="display:none;" class="farbtastic-picker" id="farbtastic-picker-'.Inflector::Camelize($fieldname).'"></div>';
-        $str .= '</div>';
+		$str .= '<img id="farbtastic-picker-icon-'.Inflector::Camelize($fieldname).'" src="'.$icon_file.'" alt="Color Picker" title="Color Picker" class="farbtastic-picker-icon">';
+		$str .= '<div style="display:none;" class="farbtastic-picker" id="farbtastic-picker-'.Inflector::Camelize($fieldname).'"></div>';
+		$str .= '</div>';
 
 				$this->readyJS($name);
 
@@ -70,21 +70,21 @@ 
 				}
 				$this->output_files = false;
 
-        return $str;
-    }
+		return $str;
+	}
 
 
 
-    /**
-    *    Add the jQuery magic to the $(document).ready function
-    *    Farbtastic-ize the input, make the button show/hide the color picker div
-    */
-    function readyJS($name) {
-        list($model,$fieldname) = explode('.',$name);
-        $str = '$(document).ready(function() { ';
-        $str .= ' $("#farbtastic-picker-'.Inflector::Camelize($fieldname).'").farbtastic("#'.$model.Inflector::Camelize($fieldname).'"); ';
-        $str .= ' $("#farbtastic-picker-icon-'.Inflector::Camelize($fieldname).'").click( function() { $("#farbtastic-picker-'.Inflector::Camelize($fieldname).'").toggle("slow"); }); ';
-        $str .= '})';
+	/**
+	 *    Add the jQuery magic to the $(document).ready function
+	 *    Farbtastic-ize the input, make the button show/hide the color picker div
+	 */
+	function readyJS($name) {
+		list($model,$fieldname) = explode('.',$name);
+		$str = '$(document).ready(function() { ';
+		$str .= ' $("#farbtastic-picker-'.Inflector::Camelize($fieldname).'").farbtastic("#'.$model.Inflector::Camelize($fieldname).'"); ';
+		$str .= ' $("#farbtastic-picker-icon-'.Inflector::Camelize($fieldname).'").click( function() { $("#farbtastic-picker-'.Inflector::Camelize($fieldname).'").toggle("slow"); }); ';
+		$str .= '})';
 				$this->Html->scriptBlock($str, array('inline'=>false));
-    }
+	}
 }?>
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -43,8 +43,7 @@
 
         if(isset($this->request->data[$model][$fieldname])) {
             $color_value = str_replace("#", "", $this->request->data[$model][$fieldname]); // expects an RGB string, strips any incoming '#' character
-        }
-        else {
+        } else {
             $color_value = "000000"; // black
         }