Passed
Branch 1.0.0-dev (4efac2)
by nguereza
04:41
created
classes/views/home.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -8,13 +8,13 @@  discard block
 block discarded – undo
8 8
     <meta name="description" content="A simple PHP framework using HMVC architecture">
9 9
     <meta name="author" content="Tony NGUEREZA">
10 10
     <title>TNH Framework</title>
11
-    <link href="<?php echo Assets::css('bootstrap.min');?>" rel="stylesheet" type = "text/css" >
12
-	<link href="<?php echo Assets::css('font-awesome.min');?>" rel="stylesheet" type = "text/css" >
13
-    <link href="<?php echo Assets::css('responsive');?>" rel="stylesheet" type = "text/css" >
14
-	<link rel="icon" href="<?php echo Assets::img('favicon.ico');?>">
11
+    <link href="<?php echo Assets::css('bootstrap.min'); ?>" rel="stylesheet" type = "text/css" >
12
+	<link href="<?php echo Assets::css('font-awesome.min'); ?>" rel="stylesheet" type = "text/css" >
13
+    <link href="<?php echo Assets::css('responsive'); ?>" rel="stylesheet" type = "text/css" >
14
+	<link rel="icon" href="<?php echo Assets::img('favicon.ico'); ?>">
15 15
 	<!--[if lt IE 9]>
16
-	<script src="<?php echo Assets::js('html5shiv');?>"></script>
17
-	<script src="<?php echo Assets::js('respond.min');?>"></script>
16
+	<script src="<?php echo Assets::js('html5shiv'); ?>"></script>
17
+	<script src="<?php echo Assets::js('respond.min'); ?>"></script>
18 18
     <![endif]-->
19 19
 	<style type = "text/css">
20 20
 		
@@ -28,15 +28,15 @@  discard block
 block discarded – undo
28 28
 			<div class = "col-md-offset-2 col-md-8 col-md-offset-2">
29 29
 				<div class = "panel panel-primary">
30 30
 					<div class = "panel-heading">
31
-						<h2>Welcome on <?php echo TNH_NAME;?> v<?php echo TNH_VERSION;?></h2>
31
+						<h2>Welcome on <?php echo TNH_NAME; ?> v<?php echo TNH_VERSION; ?></h2>
32 32
 					</div>
33 33
 					<div class = "panel-body">
34
-						<img src = "<?php echo Assets::img('logo.png');?>" class = "img-responsive" style = "float:left;" />
34
+						<img src = "<?php echo Assets::img('logo.png'); ?>" class = "img-responsive" style = "float:left;" />
35 35
 						<h3>
36 36
 							A simple PHP framework using HMVC architecture
37 37
 						</h3>
38 38
 						<br />
39
-						<p><?php echo Html::a('https://github.com/tnhfw/tnh-fw', 'Framework on Github', array('class' => 'btn btn-default', 'target' => '_blank'));?></p>
39
+						<p><?php echo Html::a('https://github.com/tnhfw/tnh-fw', 'Framework on Github', array('class' => 'btn btn-default', 'target' => '_blank')); ?></p>
40 40
 					</div>
41 41
 				</div>
42 42
 				<div class = "panel panel-primary">
@@ -44,10 +44,10 @@  discard block
 block discarded – undo
44 44
 						<h2>Server information</h2>
45 45
 					</div>
46 46
 					<div class = "panel-body">
47
-						<h4>Running on : <b><?php echo php_uname();?></b></h4>
48
-						<h4>PHP server SAPI : <b><?php echo php_sapi_name();?></b></h4>
49
-						<h4>PHP Version : <b><?php echo phpversion();?></b></h4>
50
-						<h4>PHP Loaded extensions : (<?php echo count(get_loaded_extensions());?> extensions)</h4>
47
+						<h4>Running on : <b><?php echo php_uname(); ?></b></h4>
48
+						<h4>PHP server SAPI : <b><?php echo php_sapi_name(); ?></b></h4>
49
+						<h4>PHP Version : <b><?php echo phpversion(); ?></b></h4>
50
+						<h4>PHP Loaded extensions : (<?php echo count(get_loaded_extensions()); ?> extensions)</h4>
51 51
 							<table class = "table table-striped table-condensed table-bordered table-responsive">
52 52
 								<tr>
53 53
 									<th>Name</th>
@@ -55,10 +55,10 @@  discard block
 block discarded – undo
55 55
 								</tr>
56 56
 								<?php foreach (get_loaded_extensions() as $e):?>
57 57
 									<tr>
58
-										<td><?php echo $e;?></td>
59
-										<td><?php echo phpversion($e);?></td>
58
+										<td><?php echo $e; ?></td>
59
+										<td><?php echo phpversion($e); ?></td>
60 60
 									</tr>
61
-								<?php endforeach;?>
61
+								<?php endforeach; ?>
62 62
 							</table>
63 63
 					</div>
64 64
 				</div>
@@ -67,30 +67,30 @@  discard block
 block discarded – undo
67 67
 						<h2>Framework information</h2>
68 68
 					</div>
69 69
 					<div class = "panel-body">
70
-						<h4>Version : <b><?php echo TNH_VERSION;?></b></h4>
71
-						<h4>Required PHP version : <b>PHP >= <?php echo TNH_REQUIRED_PHP_MIN_VERSION;?>, PHP <= <?php echo TNH_REQUIRED_PHP_MAX_VERSION;?></b></h4>
72
-						<h4>Build date : <b><?php echo TNH_RELEASE_DATE;?></b></h4>
73
-						<h4>Author : <b><?php echo TNH_AUTHOR;?></b></h4>
74
-						<h4>Author E-mail : <b><?php echo TNH_AUTHOR_EMAIL;?></b></h4>
75
-						<h4>Loaded files : (<?php echo count(get_included_files());?> files)</h4>
70
+						<h4>Version : <b><?php echo TNH_VERSION; ?></b></h4>
71
+						<h4>Required PHP version : <b>PHP >= <?php echo TNH_REQUIRED_PHP_MIN_VERSION; ?>, PHP <= <?php echo TNH_REQUIRED_PHP_MAX_VERSION; ?></b></h4>
72
+						<h4>Build date : <b><?php echo TNH_RELEASE_DATE; ?></b></h4>
73
+						<h4>Author : <b><?php echo TNH_AUTHOR; ?></b></h4>
74
+						<h4>Author E-mail : <b><?php echo TNH_AUTHOR_EMAIL; ?></b></h4>
75
+						<h4>Loaded files : (<?php echo count(get_included_files()); ?> files)</h4>
76 76
 							<table class = "table table-striped table-condensed table-bordered table-responsive">
77 77
 								<tr>
78 78
 									<th>Path</th>
79 79
 									<th>File</th>
80 80
 								</tr>
81
-								<?php foreach(get_included_files() as $file):?>
81
+								<?php foreach (get_included_files() as $file):?>
82 82
 									<tr>
83
-										<td><?php echo $file;?></td>
84
-										<td><?php echo basename($file);?></td>
83
+										<td><?php echo $file; ?></td>
84
+										<td><?php echo basename($file); ?></td>
85 85
 									</tr>
86
-								<?php endforeach;?>
86
+								<?php endforeach; ?>
87 87
 							</table>
88 88
 					</div>
89 89
 				</div>
90 90
 			</div>
91 91
 		</div>
92 92
 	</div>
93
-	<script src="<?php echo Assets::js('jquery');?>"></script>
94
-	<script src="<?php echo Assets::js('bootstrap.min');?>"></script>
93
+	<script src="<?php echo Assets::js('jquery'); ?>"></script>
94
+	<script src="<?php echo Assets::js('bootstrap.min'); ?>"></script>
95 95
 	</body>
96 96
 </html>
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -243,7 +243,7 @@
 block discarded – undo
243 243
 			if (version_compare(PHP_VERSION, '5.3', '>=')) {
244 244
 				error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
245 245
 			}
246
-			else{
246
+			else {
247 247
 				error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
248 248
 			}
249 249
 		break;
Please login to merge, or discard this patch.
core/classes/cache/CacheInterface.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
25 25
 	*/
26 26
 	
27
-	interface CacheInterface{
27
+	interface CacheInterface {
28 28
 
29 29
 		/**
30 30
 		 * This is used to get the cache data using the key
Please login to merge, or discard this patch.
core/classes/Url.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -25,15 +25,15 @@  discard block
 block discarded – undo
25 25
 	*/
26 26
 
27 27
 
28
-	class Url{
28
+	class Url {
29 29
 
30 30
 		/**
31 31
 		 * Return the link using base_url config without front controller "index.php"
32 32
 		 * @param  string $path the link path or full URL
33 33
 		 * @return string the full link URL
34 34
 		 */
35
-		public static function base_url($path = ''){
36
-			if(is_url($path)){
35
+		public static function base_url($path = '') {
36
+			if (is_url($path)) {
37 37
 				return $path;
38 38
 			}
39 39
 			return get_config('base_url') . $path;
@@ -44,26 +44,26 @@  discard block
 block discarded – undo
44 44
 		 * @param  string $path the link path or full URL
45 45
 		 * @return string the full link URL
46 46
 		 */
47
-		public static function site_url($path = ''){
48
-			if(is_url($path)){
47
+		public static function site_url($path = '') {
48
+			if (is_url($path)) {
49 49
 				return $path;
50 50
 			}
51 51
 			$path = rtrim($path, '/');
52 52
 			$baseUrl = get_config('base_url');
53 53
 			$frontController = get_config('front_controller');
54 54
 			$url = $baseUrl;
55
-			if($frontController){
55
+			if ($frontController) {
56 56
 				$url .= $frontController . '/';
57 57
 			}
58
-			if(($suffix = get_config('url_suffix')) && $path){
59
-				if(strpos($path, '?') !== false){
58
+			if (($suffix = get_config('url_suffix')) && $path) {
59
+				if (strpos($path, '?') !== false) {
60 60
 					$query = explode('?', $path);
61 61
 					$query[0] = str_ireplace($suffix, '', $query[0]);
62 62
 					$query[0] = rtrim($query[0], '/');
63 63
 					$query[0] .= $suffix;
64 64
 					$path = implode('?', $query);
65 65
 				}
66
-				else{
66
+				else {
67 67
 					$path .= $suffix;
68 68
 				}
69 69
 			}
@@ -74,10 +74,10 @@  discard block
 block discarded – undo
74 74
 		 * Return the current site URL
75 75
 		 * @return string
76 76
 		 */
77
-		public static function current(){
77
+		public static function current() {
78 78
 			$current = '/';
79 79
 			$requestUri = get_instance()->request->requestUri();
80
-			if($requestUri){
80
+			if ($requestUri) {
81 81
 				$current = $requestUri;
82 82
 			}
83 83
 			return static::domain() . $current;
@@ -90,18 +90,18 @@  discard block
 block discarded – undo
90 90
 		 * @param  boolean $lowercase whether to set the final text to lowe case or not
91 91
 		 * @return string the friendly generated text
92 92
 		 */
93
-		public static function title($str = null, $separator = '-', $lowercase = true){
93
+		public static function title($str = null, $separator = '-', $lowercase = true) {
94 94
 			$str = trim($str);
95
-			$from = array('ç','À','Á','Â','Ã','Ä','Å','à','á','â','ã','ä','å','Ò','Ó','Ô','Õ','Ö','Ø','ò','ó','ô','õ','ö','ø','È','É','Ê','Ë','è','é','ê','ë','Ç','ç','Ì','Í','Î','Ï','ì','í','î','ï','Ù','Ú','Û','Ü','ù','ú','û','ü','ÿ','Ñ','ñ');
96
-			$to = array('c','a','a','a','a','a','a','a','a','a','a','a','a','o','o','o','o','o','o','o','o','o','o','o','o','e','e','e','e','e','e','e','e','e','e','i','i','i','i','i','i','i','i','u','u','u','u','u','u','u','u','y','n','n');
95
+			$from = array('ç', 'À', 'Á', 'Â', 'Ã', 'Ä', 'Å', 'à', 'á', 'â', 'ã', 'ä', 'å', 'Ò', 'Ó', 'Ô', 'Õ', 'Ö', 'Ø', 'ò', 'ó', 'ô', 'õ', 'ö', 'ø', 'È', 'É', 'Ê', 'Ë', 'è', 'é', 'ê', 'ë', 'Ç', 'ç', 'Ì', 'Í', 'Î', 'Ï', 'ì', 'í', 'î', 'ï', 'Ù', 'Ú', 'Û', 'Ü', 'ù', 'ú', 'û', 'ü', 'ÿ', 'Ñ', 'ñ');
96
+			$to = array('c', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i', 'i', 'i', 'i', 'i', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'y', 'n', 'n');
97 97
 			$str = str_replace($from, $to, $str);
98 98
 			$str = preg_replace('#([^a-z0-9]+)#i', $separator, $str);
99 99
 			$str = str_replace('--', $separator, $str);
100 100
 			//if after process we get something like one-two-three-, need truncate the last separator "-"
101
-			if(substr($str, -1) == $separator){
101
+			if (substr($str, -1) == $separator) {
102 102
 				$str = substr($str, 0, -1);
103 103
 			}
104
-			if($lowercase){
104
+			if ($lowercase) {
105 105
 				$str = strtolower($str);
106 106
 			}
107 107
 			return $str;
@@ -111,36 +111,36 @@  discard block
 block discarded – undo
111 111
 		 * Get the current application domain with protocol
112 112
 		 * @return string the domain name
113 113
 		 */
114
-		public static function domain(){
114
+		public static function domain() {
115 115
 			$obj = & get_instance();
116 116
 			$domain = 'localhost';
117 117
 			$port = $obj->request->server('SERVER_PORT');
118 118
 			$protocol = is_https() ? 'https' : 'http';
119 119
 			
120
-			if($obj->request->server('HTTP_HOST')){
120
+			if ($obj->request->server('HTTP_HOST')) {
121 121
 				$domain = $obj->request->server('HTTP_HOST');
122 122
 			}
123
-			else if($obj->request->server('SERVER_NAME')){
123
+			else if ($obj->request->server('SERVER_NAME')) {
124 124
 				$domain = $obj->request->server('SERVER_NAME');
125 125
 			}
126
-			else if($obj->request->server('SERVER_ADDR')){
126
+			else if ($obj->request->server('SERVER_ADDR')) {
127 127
 				$domain = $obj->request->server('SERVER_ADDR');
128 128
 			}
129
-			if($port && (is_https() && $port != 443 || !is_https() && $port != 80)){
129
+			if ($port && (is_https() && $port != 443 || !is_https() && $port != 80)) {
130 130
 				//some server use SSL but the port doesn't equal 443 sometime is 80 if is the case put the port at this end
131 131
 				//of the domain like https://my.domain.com:787
132
-				if(is_https() && $port != 80){
133
-					$domain .= ':'.$port;
132
+				if (is_https() && $port != 80) {
133
+					$domain .= ':' . $port;
134 134
 				}
135 135
 			}
136
-			return $protocol.'://'.$domain;
136
+			return $protocol . '://' . $domain;
137 137
 		}
138 138
 
139 139
 		/**
140 140
 		 * Get the current request query string
141 141
 		 * @return string
142 142
 		 */
143
-		public static function queryString(){
143
+		public static function queryString() {
144 144
 			return get_instance()->request->server('QUERY_STRING');
145 145
 		}
146 146
 	}
147 147
\ No newline at end of file
Please login to merge, or discard this patch.
core/libraries/PDF.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	/**
28 28
 	 * PDF library to generate PDF document using the library DOMPDF
29 29
 	 */
30
-	class PDF{
30
+	class PDF {
31 31
 		
32 32
 		/**
33 33
 		 * The dompdf instance
@@ -44,11 +44,11 @@  discard block
 block discarded – undo
44 44
 		/**
45 45
 		 * Create PDF library instance
46 46
 		 */
47
-		public function __construct(){
48
-	        $this->logger =& class_loader('Log', 'classes');
47
+		public function __construct() {
48
+	        $this->logger = & class_loader('Log', 'classes');
49 49
 	        $this->logger->setLogger('Library::PDF');
50 50
 
51
-			require_once VENDOR_PATH.'dompdf/dompdf_config.inc.php';
51
+			require_once VENDOR_PATH . 'dompdf/dompdf_config.inc.php';
52 52
 			$this->dompdf = new Dompdf();
53 53
 		}
54 54
 
@@ -62,15 +62,15 @@  discard block
 block discarded – undo
62 62
 		 * @return string|void               if $stream is true send PDF document to browser for download, else return the generated PDF
63 63
 		 * content like to join in Email attachment of for other purpose use.
64 64
 		 */
65
-		public function generate($html, $filename = 'output.pdf', $stream = true, $paper = 'A4', $orientation = 'portrait'){
66
-			$this->logger->info('Generating of PDF document: filename [' .$filename. '], stream [' .($stream ? 'TRUE':'FALSE'). '], paper [' .$paper. '], orientation [' .$orientation. ']');
65
+		public function generate($html, $filename = 'output.pdf', $stream = true, $paper = 'A4', $orientation = 'portrait') {
66
+			$this->logger->info('Generating of PDF document: filename [' . $filename . '], stream [' . ($stream ? 'TRUE' : 'FALSE') . '], paper [' . $paper . '], orientation [' . $orientation . ']');
67 67
 			$this->dompdf->load_html($html);
68 68
 			$this->dompdf->set_paper($paper, $orientation);
69 69
 			$this->dompdf->render();
70
-			if($stream){
70
+			if ($stream) {
71 71
 				$this->dompdf->stream($filename);
72 72
 			}
73
-			else{
73
+			else {
74 74
 				return $this->dompdf->output();
75 75
 			}
76 76
 		}
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 		*
81 81
 		* @return object the dompdf instance
82 82
 		*/
83
-		public function getDompdf(){
83
+		public function getDompdf() {
84 84
 			return $this->dompdf;
85 85
 		}
86 86
 		
Please login to merge, or discard this patch.
core/libraries/StringHash.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
25 25
 	*/
26 26
 
27
-	class StringHash{
27
+	class StringHash {
28 28
 		 
29 29
 		 //blowfish
30 30
 		private static $algo = '$2a';
Please login to merge, or discard this patch.
core/libraries/Form.php 1 patch
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 	*/
26 26
 
27 27
 
28
-	class Form{
28
+	class Form {
29 29
 
30 30
 		/**
31 31
 		 * Generate the form opened tag
@@ -35,33 +35,33 @@  discard block
 block discarded – undo
35 35
 		 * @param  string $enctype    the form enctype like "multipart/form-data"
36 36
 		 * @return string             the generated form html
37 37
 		 */
38
-		public static function open($path = null, array $attributes = array(), $method = 'POST', $enctype = null){
39
-			if($path){
38
+		public static function open($path = null, array $attributes = array(), $method = 'POST', $enctype = null) {
39
+			if ($path) {
40 40
 				$path = Url::site_url($path);
41 41
 			}
42 42
 			$method = strtoupper($method);
43 43
 			$str = null;
44
-			$str .= '<form action = "'.$path.'" method = "'.$method.'"';
45
-			if(! empty($enctype)){
46
-				$str .= ' enctype = "'.$enctype.'" ';
44
+			$str .= '<form action = "' . $path . '" method = "' . $method . '"';
45
+			if (!empty($enctype)) {
46
+				$str .= ' enctype = "' . $enctype . '" ';
47 47
 			}
48
-			if(! isset($attributes['accept-charset'])){
48
+			if (!isset($attributes['accept-charset'])) {
49 49
 				$attributes['accept-charset'] = get_config('charset', 'utf-8');
50 50
 			}
51 51
 			$str .= attributes_to_string($attributes);
52 52
 			$str .= '>';
53 53
 			$checkCsrf = false;
54 54
 			//check if the user set the checking of CSRF manually
55
-			if($method != 'POST' && isset($attributes['csrf'])){
55
+			if ($method != 'POST' && isset($attributes['csrf'])) {
56 56
 				$obj = & get_instance();
57
-				if(! isset($obj->formvalidation)){
57
+				if (!isset($obj->formvalidation)) {
58 58
 					Loader::library('FormValidation');
59 59
 				}
60 60
 				$obj->formvalidation->enableCsrfCheck = true;
61 61
 				$checkCsrf = true;
62 62
 			}
63 63
 			//if CSRF enable or is set manually
64
-			if((get_config('csrf_enable', false) && $method == 'POST') || ($method != 'POST' && $checkCsrf)){
64
+			if ((get_config('csrf_enable', false) && $method == 'POST') || ($method != 'POST' && $checkCsrf)) {
65 65
 				$csrfValue = Security::generateCSRF();
66 66
 				$csrfName = get_config('csrf_key', 'csrf_key');
67 67
 				$str .= static::hidden($csrfName, $csrfValue);
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 		 * @see Form::open() for more details
75 75
 		 * @return string the generated multipart form html
76 76
 		 */
77
-		public static function openMultipart($path = null, array $attributes = array(), $method = 'POST'){
77
+		public static function openMultipart($path = null, array $attributes = array(), $method = 'POST') {
78 78
 			return self::open($path, $attributes, $method, 'multipart/form-data');
79 79
 		}
80 80
 
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 		 * Generate the form close
83 83
 		 * @return string the form close html
84 84
 		 */
85
-		public static function close(){
85
+		public static function close() {
86 86
 			return '</form>';
87 87
 		}
88 88
 
@@ -93,10 +93,10 @@  discard block
 block discarded – undo
93 93
 		 * @param  array  $legendAttributes the legend additional HTML attributes. Is used only is $legend is not empty
94 94
 		 * @return string         the generated fieldset value
95 95
 		 */
96
-		public static function fieldset($legend = '', array $fieldsetAttributes = array(), array $legendAttributes = array()){
96
+		public static function fieldset($legend = '', array $fieldsetAttributes = array(), array $legendAttributes = array()) {
97 97
 			$str = '<fieldset' . attributes_to_string($fieldsetAttributes) . '>';
98
-			if($legend){
99
-				$str .= '<legend' . attributes_to_string($legendAttributes) . '>'.$legend.'</legend>';
98
+			if ($legend) {
99
+				$str .= '<legend' . attributes_to_string($legendAttributes) . '>' . $legend . '</legend>';
100 100
 			}
101 101
 			return $str;
102 102
 		}
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 		 * Generate the fieldset close tag
106 106
 		 * @return string the generated html for fieldset close
107 107
 		 */
108
-		public static function fieldsetClose(){
108
+		public static function fieldsetClose() {
109 109
 			return '</fieldset>';
110 110
 		}
111 111
 
@@ -115,13 +115,13 @@  discard block
 block discarded – undo
115 115
 		 * @param  string $name the form field name
116 116
 		 * @return string       the error message if exists and null if not
117 117
 		 */
118
-		public static function error($name){
118
+		public static function error($name) {
119 119
 			$return = null;
120 120
 			$obj = & get_instance();
121
-			if(isset($obj->formvalidation)){
121
+			if (isset($obj->formvalidation)) {
122 122
 				$errors = $obj->formvalidation->returnErrors();
123
-				$error =  isset($errors[$name]) ? $errors[$name] : null;
124
-				if($error){
123
+				$error = isset($errors[$name]) ? $errors[$name] : null;
124
+				if ($error) {
125 125
 					list($errorStart, $errorEnd) = $obj->formvalidation->getErrorDelimiter();
126 126
 					$return = $errorStart . $error . $errorEnd;
127 127
 				}
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 		 * @param  mixed $default the default value if can not found the given form field name
136 136
 		 * @return mixed the form field value if is set, otherwise return the default value.
137 137
 		 */
138
-		public static function value($name, $default = null){
138
+		public static function value($name, $default = null) {
139 139
 			$value = get_instance()->request->query($name);
140 140
 			return $value ? $value : $default;
141 141
 		}
@@ -147,14 +147,14 @@  discard block
 block discarded – undo
147 147
 		 * @param  array  $attributes the additional attributes to be added
148 148
 		 * @return string the generated label html content
149 149
 		 */
150
-		public static function label($label, $for = '', array $attributes = array()){
150
+		public static function label($label, $for = '', array $attributes = array()) {
151 151
 			$str = '<label';
152
-			if($for){
153
-				$str .= ' for = "'.$for.'"';
152
+			if ($for) {
153
+				$str .= ' for = "' . $for . '"';
154 154
 			}
155 155
 			$str .= attributes_to_string($attributes);
156 156
 			$str .= '>';
157
-			$str .= $label.'</label>';
157
+			$str .= $label . '</label>';
158 158
 			return $str;
159 159
 		}
160 160
 
@@ -166,9 +166,9 @@  discard block
 block discarded – undo
166 166
 		 * @param  string $type       the type of the form field (password, text, submit, button, etc.)
167 167
 		 * @return string             the generated form field html content for the input
168 168
 		 */
169
-		public static function input($name, $value = null, array $attributes = array(), $type = 'text'){
169
+		public static function input($name, $value = null, array $attributes = array(), $type = 'text') {
170 170
 			$str = null;
171
-			$str .= '<input name = "'.$name.'" value = "'.$value.'" type = "'.$type.'"';
171
+			$str .= '<input name = "' . $name . '" value = "' . $value . '" type = "' . $type . '"';
172 172
 			$str .= attributes_to_string($attributes);
173 173
 			$str .= '/>';
174 174
 			return $str;
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 		 * Generate the form field for "text"
179 179
 		 * @see Form::input() for more details
180 180
 		 */
181
-		public static function text($name, $value = null, array $attributes = array()){
181
+		public static function text($name, $value = null, array $attributes = array()) {
182 182
 			return self::input($name, $value, $attributes, 'text');
183 183
 		}
184 184
 
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 		 * Generate the form field for "password"
187 187
 		 * @see Form::input() for more details
188 188
 		 */
189
-		public static function password($name, $value = null, array $attributes = array()){
189
+		public static function password($name, $value = null, array $attributes = array()) {
190 190
 			return self::input($name, $value, $attributes, 'password');
191 191
 		}
192 192
 
@@ -194,8 +194,8 @@  discard block
 block discarded – undo
194 194
 		 * Generate the form field for "radio"
195 195
 		 * @see Form::input() for more details
196 196
 		 */
197
-		public static function radio($name, $value = null,  $checked = false, array $attributes = array()){
198
-			if($checked){
197
+		public static function radio($name, $value = null, $checked = false, array $attributes = array()) {
198
+			if ($checked) {
199 199
 				$attributes['checked'] = true;
200 200
 			}
201 201
 			return self::input($name, $value, $attributes, 'radio');
@@ -205,8 +205,8 @@  discard block
 block discarded – undo
205 205
 		 * Generate the form field for "checkbox"
206 206
 		 * @see Form::input() for more details
207 207
 		 */
208
-		public static function checkbox($name, $value = null, $checked = false, array $attributes = array()){
209
-			if($checked){
208
+		public static function checkbox($name, $value = null, $checked = false, array $attributes = array()) {
209
+			if ($checked) {
210 210
 				$attributes['checked'] = true;
211 211
 			}
212 212
 			return self::input($name, $value, $attributes, 'checkbox');
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 		 * Generate the form field for "number"
217 217
 		 * @see Form::input() for more details
218 218
 		 */
219
-		public static function number($name, $value = null, array $attributes = array()){
219
+		public static function number($name, $value = null, array $attributes = array()) {
220 220
 			return self::input($name, $value, $attributes, 'number');
221 221
 		}
222 222
 
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
 		 * Generate the form field for "phone"
225 225
 		 * @see Form::input() for more details
226 226
 		 */
227
-		public static function phone($name, $value = null, array $attributes = array()){
227
+		public static function phone($name, $value = null, array $attributes = array()) {
228 228
 			return self::input($name, $value, $attributes, 'phone');
229 229
 		}
230 230
 
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 		 * Generate the form field for "email"
233 233
 		 * @see Form::input() for more details
234 234
 		 */
235
-		public static function email($name, $value = null, array $attributes = array()){
235
+		public static function email($name, $value = null, array $attributes = array()) {
236 236
 			return self::input($name, $value, $attributes, 'email');
237 237
 		}
238 238
 		
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 		 * Generate the form field for "search"
241 241
 		 * @see Form::input() for more details
242 242
 		 */
243
-		public static function search($name, $value = null, array $attributes = array()){
243
+		public static function search($name, $value = null, array $attributes = array()) {
244 244
 			return self::input($name, $value, $attributes, 'search');
245 245
 		}
246 246
 		
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 		 * Generate the form field for "hidden"
249 249
 		 * @see Form::input() for more details
250 250
 		 */
251
-		public static function hidden($name, $value = null, array $attributes = array()){
251
+		public static function hidden($name, $value = null, array $attributes = array()) {
252 252
 			return self::input($name, $value, $attributes, 'hidden');
253 253
 		}
254 254
 		
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
 		 * Generate the form field for "file"
257 257
 		 * @see Form::input() for more details
258 258
 		 */
259
-		public static function file($name, array $attributes = array()){
259
+		public static function file($name, array $attributes = array()) {
260 260
 			return self::input($name, null, $attributes, 'file');
261 261
 		}
262 262
 		
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
 		 * Generate the form field for "button"
265 265
 		 * @see Form::input() for more details
266 266
 		 */
267
-		public static function button($name, $value = null, array $attributes = array()){
267
+		public static function button($name, $value = null, array $attributes = array()) {
268 268
 			return self::input($name, $value, $attributes, 'button');
269 269
 		}
270 270
 		
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
 		 * Generate the form field for "reset"
273 273
 		 * @see Form::input() for more details
274 274
 		 */
275
-		public static function reset($name, $value = null, array $attributes = array()){
275
+		public static function reset($name, $value = null, array $attributes = array()) {
276 276
 			return self::input($name, $value, $attributes, 'reset');
277 277
 		}
278 278
 		
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
 		 * Generate the form field for "submit"
281 281
 		 * @see Form::input() for more details
282 282
 		 */
283
-		public static function submit($name, $value = null, array $attributes = array()){
283
+		public static function submit($name, $value = null, array $attributes = array()) {
284 284
 			return self::input($name, $value, $attributes, 'submit');
285 285
 		}
286 286
 
@@ -291,12 +291,12 @@  discard block
 block discarded – undo
291 291
 		 * @param  array  $attributes the additional attributes to be added
292 292
 		 * @return string             the generated textarea form html content
293 293
 		 */
294
-		public static function textarea($name, $value = '', array $attributes = array()){
294
+		public static function textarea($name, $value = '', array $attributes = array()) {
295 295
 			$str = null;
296
-			$str .= '<textarea name = "'.$name.'"';
296
+			$str .= '<textarea name = "' . $name . '"';
297 297
 			$str .= attributes_to_string($attributes);
298 298
 			$str .= '>';
299
-			$str .= $value.'</textarea>';
299
+			$str .= $value . '</textarea>';
300 300
 			return $str;
301 301
 		}
302 302
 		
@@ -308,20 +308,20 @@  discard block
 block discarded – undo
308 308
 		 * @param  array  $attributes the additional attribute to be added
309 309
 		 * @return string             the generated form field html content for select
310 310
 		 */
311
-		public static function select($name, $values = null, $selected = null, array $attributes = array()){
312
-			if(! is_array($values)){
311
+		public static function select($name, $values = null, $selected = null, array $attributes = array()) {
312
+			if (!is_array($values)) {
313 313
 				$values = array('' => $values);
314 314
 			}
315 315
 			$str = null;
316
-			$str .= '<select name = "'.$name.'"';
316
+			$str .= '<select name = "' . $name . '"';
317 317
 			$str .= attributes_to_string($attributes);
318 318
 			$str .= '>';
319
-			foreach($values as $key => $val){
319
+			foreach ($values as $key => $val) {
320 320
 				$select = '';
321
-				if($key == $selected){
321
+				if ($key == $selected) {
322 322
 					$select = 'selected';
323 323
 				}
324
-				$str .= '<option value = "'.$key.'" '.$select.'>'.$val.'</option>';
324
+				$str .= '<option value = "' . $key . '" ' . $select . '>' . $val . '</option>';
325 325
 			}
326 326
 			$str .= '</select>';
327 327
 			return $str;
Please login to merge, or discard this patch.
core/libraries/Browser.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -918,27 +918,27 @@  discard block
 block discarded – undo
918 918
                 if (isset($aresult[1])) {
919 919
                     $this->setBrowser(self::BROWSER_IE);
920 920
                     $this->setVersion(str_replace(array('(', ')', ';'), '', $aresult[1]));
921
-                    if(preg_match('#trident/([0-9\.]+);#i', $this->_agent, $aresult)){
922
-                        if($aresult[1] == '3.1'){
921
+                    if (preg_match('#trident/([0-9\.]+);#i', $this->_agent, $aresult)) {
922
+                        if ($aresult[1] == '3.1') {
923 923
                             $this->setVersion('7.0');
924 924
                         }
925
-                        else if($aresult[1] == '4.0'){
925
+                        else if ($aresult[1] == '4.0') {
926 926
                             $this->setVersion('8.0');
927 927
                         }
928
-                        else if($aresult[1] == '5.0'){
928
+                        else if ($aresult[1] == '5.0') {
929 929
                             $this->setVersion('9.0');
930 930
                         }
931
-                        else if($aresult[1] == '6.0'){
931
+                        else if ($aresult[1] == '6.0') {
932 932
                             $this->setVersion('10.0');
933 933
                         }
934
-                        else if($aresult[1] == '7.0'){
934
+                        else if ($aresult[1] == '7.0') {
935 935
                             $this->setVersion('11.0');
936 936
                         }
937
-                        else if($aresult[1] == '8.0'){
937
+                        else if ($aresult[1] == '8.0') {
938 938
                             $this->setVersion('11.0');
939 939
                         }
940 940
                     }
941
-                    if(stripos($this->_agent, 'IEMobile') !== false) {
941
+                    if (stripos($this->_agent, 'IEMobile') !== false) {
942 942
                         $this->setBrowser(self::BROWSER_POCKET_IE);
943 943
                         $this->setMobile(true);
944 944
                     }
@@ -1684,8 +1684,8 @@  discard block
 block discarded – undo
1684 1684
                 $this->_platform = self::PLATFORM_ANDROID;
1685 1685
             } elseif (stripos($this->_agent, 'Silk') !== false) {
1686 1686
                 $this->_platform = self::PLATFORM_FIRE_OS;
1687
-            } elseif (stripos($this->_agent, 'linux') !== false && stripos($this->_agent, 'SMART-TV') !== false ) {
1688
-                $this->_platform = self::PLATFORM_LINUX .'/'.self::PLATFORM_SMART_TV;
1687
+            } elseif (stripos($this->_agent, 'linux') !== false && stripos($this->_agent, 'SMART-TV') !== false) {
1688
+                $this->_platform = self::PLATFORM_LINUX . '/' . self::PLATFORM_SMART_TV;
1689 1689
             } elseif (stripos($this->_agent, 'linux') !== false) {
1690 1690
                 $this->_platform = self::PLATFORM_LINUX;
1691 1691
             } else if (stripos($this->_agent, 'Nokia') !== false) {
Please login to merge, or discard this patch.
core/functions/function_lang.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 	 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
25 25
 	*/
26 26
 
27
-	if(! function_exists('__')){
27
+	if (!function_exists('__')) {
28 28
 		/**
29 29
 		 * function for the shortcut to Lang::get()
30 30
 		 * @param  string $key the language key to retrieve
@@ -32,20 +32,20 @@  discard block
 block discarded – undo
32 32
 		 * for the given key
33 33
 		 * @return string  the language value
34 34
 		 */
35
-		function __($key, $default = 'LANGUAGE_ERROR'){
35
+		function __($key, $default = 'LANGUAGE_ERROR') {
36 36
 			return get_instance()->lang->get($key, $default);
37 37
 		}
38 38
 
39 39
 	}
40 40
 
41 41
 
42
-	if(! function_exists('get_languages')){
42
+	if (!function_exists('get_languages')) {
43 43
 		/**
44 44
 		 * function for the shortcut to Lang::getSupported()
45 45
 		 * 
46 46
 		 * @return array all the supported languages
47 47
 		 */
48
-		function get_languages(){
48
+		function get_languages() {
49 49
 			return get_instance()->lang->getSupported();
50 50
 		}
51 51
 
Please login to merge, or discard this patch.