浏览代码

indentation correction

euromark 12 年之前
父节点
当前提交
a18c01485f

+ 1 - 1
Console/Command/PwdShell.php

@@ -25,7 +25,7 @@ class PwdShell extends AppShell {
 		$class = null;
 		foreach ($components as $component) {
 			if (App::import('Component', $component)) {
-				$component .='Component';
+				$component .= 'Component';
 				list($plugin, $class) = pluginSplit($component);
 				break;
 			}

+ 2 - 2
Console/Command/ResetShell.php

@@ -56,10 +56,10 @@ class ResetShell extends AppShell {
 	 * 2011-08-01 ms
 	 */
 	public function pwd() {
-		$components = array('AuthExt', 'Auth');
+		$components = array('Tools.AuthExt', 'Auth');
 		foreach ($components as $component) {
 			if (App::import('Component', $component)) {
-				$component .='Component';
+				$component .= 'Component';
 				$this->Auth = new $component(new ComponentCollection());
 				break;
 			}

+ 1 - 1
Model/Behavior/PasswordableBehavior.php

@@ -117,7 +117,7 @@ class PasswordableBehavior extends ModelBehavior {
 	 * 'authType' => 'Blowfish', 'passwordHasher' => array(
 	 *     'className' => 'Simple',
 	 *     'hashType' => 'sha256'
- 	 * )
+	 * )
 	 *
 	 * @throws CakeException
 	 * @param Model $Model

+ 3 - 3
Test/Case/Lib/DiffLibTest.php

@@ -41,10 +41,10 @@ CSS;
 --- 1 ----
 ! 9999944449977
 TEXT;
- 		$res = $this->Diff->reverse($text);
- 		$this->out($res);
+		$res = $this->Diff->reverse($text);
+		$this->out($res);
 
- 		$this->out('String - Context - render as Unified', true);
+		$this->out('String - Context - render as Unified', true);
 	}
 
 	public function testParseDiff() {

+ 1 - 1
Test/Case/Lib/EmailLibTest.php

@@ -188,7 +188,7 @@ class EmailLibTest extends MyCakeTestCase {
 			'mimetype' => 'image/jpeg',
 		);
 		$this->assertEquals($expected, $res['my_image.jpg']);
- 	}
+	}
 
 	/**
 	 * EmailLibTest::testAddAttachment()

+ 4 - 4
Test/Case/View/Helper/DiffHelperTest.php

@@ -57,10 +57,10 @@ CSS;
 --- 1 ----
 ! 9999944449977
 TEXT;
- 		$res = $this->Diff->reverse($text);
- 		$this->out($res);
+		$res = $this->Diff->reverse($text);
+		$this->out($res);
 
- 		$this->out('String - Context - render as Unified', false);
+		$this->out('String - Context - render as Unified', false);
 		$text = <<<TEXT
 ***************
 *** 1 ****
@@ -70,7 +70,7 @@ TEXT;
 TEXT;
 		$this->Diff->renderType('unified');
 		$res = $this->Diff->reverse($text, array('mode' => 'context'));
- 		$this->out($res);
+		$this->out($res);
 	}
 
 	/**

+ 3 - 3
Test/Case/View/Helper/QrCodeHelperTest.php

@@ -132,9 +132,9 @@ class QrCodeHelperTest extends MyCakeTestCase {
 		$this->assertTrue(!empty($is));
 	}
 
- 	/**
- 	 * 2011-07-19 ms
- 	 */
+	/**
+	 * 2011-07-19 ms
+	 */
 	public function testBitcoin() {
 		$this->QrCode->reset();
 		$this->QrCode->setSize(100);

+ 4 - 4
View/Helper/BootstrapHelper.php

@@ -111,9 +111,9 @@ class BootstrapHelper extends AppHelper {
 			}
 			$tmp = '<div class="item'.$active.'">'.$tmp.'</div>';
 			$res[] = $tmp;
- 		}
- 		$res = implode(PHP_EOL, $res);
- 		return $res;
+		}
+		$res = implode(PHP_EOL, $res);
+		return $res;
 	}
 
 	/**
@@ -165,7 +165,7 @@ class BootstrapHelper extends AppHelper {
 		$res .= '	<div class="accordion-inner">';
 		$res .= $content;
 		$res .= '	</div>';
- 		$res .= '	</div>';
+		$res .= '	</div>';
 		$res .= '</div>';
 		return $res;
 	}

+ 4 - 4
View/Helper/CommonHelper.php

@@ -130,10 +130,10 @@ class CommonHelper extends AppHelper {
 		foreach ($lang as $language => $countries) {
 			if (is_numeric($language)) {
 				$language = '';
- 			} else {
- 				$language .= '-';
- 			}
- 			$countries = (array)$countries;
+			} else {
+				$language .= '-';
+			}
+			$countries = (array)$countries;
 			foreach ($countries as $country) {
 				$l = $language . $country;
 				$options = array('rel' => 'alternate', 'hreflang' => $l, 'type' => null, 'title' => null);

+ 1 - 1
View/Helper/FormatHelper.php

@@ -510,7 +510,7 @@ class FormatHelper extends TextHelper {
 	/**
 	 * It is still believed that encoding will stop spam-bots being able to find your email address.
 	 * Nevertheless, encoded email address harvester are on the way (http://www.dreamweaverfever.com/experiments/spam/).
- 	 *
+	 *
 	 * //TODO: move to TextExt?
 	 * Helper Function to Obfuscate Email by inserting a span tag (not more! not very secure on its own...)
 	 * each part of this mail now does not make sense anymore on its own

+ 3 - 3
View/Helper/PhpThumbHelper.php

@@ -158,9 +158,9 @@ class PhpThumbHelper extends AppHelper {
 	 * @return string $error
 	 * 2010-05-15 ms
 	 */
- 	public function error() {
- 		return (String)$this->error_detail;
- 	}
+	public function error() {
+		return (String)$this->error_detail;
+	}
 
 
 /** NOT IN USE YET **/

+ 1 - 1
View/Qlogin/admin_index.ctp

@@ -11,7 +11,7 @@
 <h3><?php echo __('Add %s', __('Qlogin')); ?></h3>
 <?php echo $this->Form->create('Qlogin');?>
 	<fieldset>
- 		<legend><?php echo __('Add %s', __('Qlogin')); ?></legend>
+		<legend><?php echo __('Add %s', __('Qlogin')); ?></legend>
 	<?php
 		echo $this->Form->input('url', array('placeholder'=>'/controller/action/...'));
 		echo $this->Form->input('user_id', array('empty'=>'---'));