mostly formating updates

webdevlabs · webdevlabs · commit f7f69a2c6ed2 · 2017-04-07T01:54:18.000+03:00
diff --git a/app/HomeController.php b/app/HomeController.php
@@ -1,7 +1,6 @@
 <?php
 namespace App;
 use System\Template;
-use System\Config;
 
 class HomeController {
     private $template;
@@ -18,7 +17,7 @@ public function showIndex()
             'page_title'=>$title,
             'page_content'=>$msg
         ]);
-        return $this->template->display('layout.tpl');
+        $this->template->display('layout.tpl');
     }    
 
 }
diff --git a/composer.lock b/composer.lock
diff --git a/config/modules.php.sample b/config/modules.php.sample
@@ -2,4 +2,4 @@
 return [
     'admin',
     'test'
-];
+];
diff --git a/config/session.php.sample b/config/session.php.sample
@@ -11,4 +11,4 @@ return [
     'cookie_lifetime'=>'1800',
     'gc_maxlifetime'=>'1800',
     'save_path'=>sys_get_temp_dir()
-];
+];
diff --git a/modules/admin/controllers/Dashboard.php b/modules/admin/controllers/Dashboard.php
@@ -1,7 +1,7 @@
 <?php
 namespace Modules\Admin\Controllers;
+
 use System\Template;
-use System\Config;
 
 class Dashboard {
     private $template;
@@ -22,4 +22,4 @@ public function getDashboard() {
         $this->template->display('layout.tpl');
     }    
 
-}
+}
diff --git a/modules/admin/models/Auth.php b/modules/admin/models/Auth.php
@@ -1,5 +1,6 @@
 <?php
 namespace Modules\Admin\Models;
+
 use System\Config;
 
 class Auth {
@@ -14,4 +15,4 @@ public function checkSession () {
             return false;
         }        
     }
-}
+}
diff --git a/modules/test/front/controllers/Main.php b/modules/test/front/controllers/Main.php
@@ -1,5 +1,6 @@
 <?php
 namespace Modules\Test\Front\Controllers;
+
 use System\Template;
 use Modules\Test\Front\Models\Message as Model;
 
@@ -24,4 +25,4 @@ public function showIndex()
         $this->template->display('layout.tpl');
     }    
 
-}
+}
diff --git a/modules/test/front/models/Message.php b/modules/test/front/models/Message.php
@@ -14,4 +14,4 @@ public function getMsg()
         return $msg;
     }    
 
-}
+}
diff --git a/plugins/smarty/compiler.compile_time.php b/plugins/smarty/compiler.compile_time.php
@@ -13,11 +13,9 @@
 */
 function smarty_compiler_compile_time($tag_arg, &$smarty)
 {
-  global $_SESSION;
   $compile_time=round(microtime(true)-$_SESSION['master_load_start_time'],3);
 		$sqldebug="\n- SQL Debug: Query Map -\n";
 		foreach($_SESSION['db_query_map'] as $qry){$sqldebug.=$qry."\n";}
     return "Compiled for ".$compile_time."s at ".date('d-m-Y H:i')." (DB queries: ".$_SESSION['db_query_count'].")".$sqldebug;
 //    return "\n echo '" . $smarty->_current_file . " compiled at " . date('Y-m-d H:M'). "';";
 }
-?>
diff --git a/plugins/smarty/resource.email.php b/plugins/smarty/resource.email.php
@@ -42,4 +42,3 @@ protected function fetch($name, &$source, &$mtime) {
 }
 
 }
-?>
diff --git a/plugins/websocket/socket.class.php b/plugins/websocket/socket.class.php
@@ -84,5 +84,3 @@ protected function send($client,$msg)
 		socket_write($client,$msg,strlen($msg));
 	}
 }
-
-?>
diff --git a/plugins/websocket/socketWebSocket.class.php b/plugins/websocket/socketWebSocket.class.php
@@ -309,5 +309,3 @@ protected function console($msg,$type='WebSocket')
 		parent::console($msg,$type);
 	}
 }
-
-?>
diff --git a/system/Database.php b/system/Database.php
@@ -33,4 +33,4 @@ public function connect () {
         return $pdo;    
     }
     }
-}
+}
diff --git a/system/Language.php b/system/Language.php
@@ -12,4 +12,4 @@ public function __construct (Config $conf) {
 //        print_r(DB::fetch('SELECT * from `languages`'));
     }
     
-}
+}
diff --git a/system/Logger.php b/system/Logger.php
@@ -47,4 +47,3 @@ function write($file, $type, $content) {
     }
 
 }
-?>
diff --git a/system/Modules.php b/system/Modules.php
@@ -15,4 +15,4 @@ public function loadRoutes ($router) {
         }
     }
     
-}
+}
diff --git a/system/RouterResolver.php b/system/RouterResolver.php
@@ -23,11 +23,11 @@ public function resolve($handler)
          *
          *      $handler = ['App\Controllers\Home', 'method'];
          */
-        if(is_array($handler) and is_string($handler[0]))
+        if(is_array($handler) && is_string($handler[0]))
         {
             $handler[0] = $this->container->get($handler[0]);
         }
 
         return $handler;
     }
-}
+}
diff --git a/system/autoload.php b/system/autoload.php
@@ -11,4 +11,4 @@ function AutoLoader($className) {
 			require_once ROOT_DIR.DIRECTORY_SEPARATOR.$file.'.php';
     }
 }
-spl_autoload_register('AutoLoader');
+spl_autoload_register('AutoLoader');
diff --git a/system/functions.php b/system/functions.php
@@ -55,7 +55,7 @@ function convert_to_bytes( $size, $from ) {
 function ByteSize($bytes, $type_only=false)  {
   $size = $bytes / 1024;
   if($size < 1024) {
-    if ($type_only == false) {
+    if ($type_only === false) {
       $size = number_format($size, 2);
 //			$size .= ' KB';
     }else{
@@ -64,7 +64,7 @@ function ByteSize($bytes, $type_only=false)  {
   }
   else {
     if($size / 1024 < 1024) {
-      if ($type_only == false) {
+      if ($type_only === false) {
         $size = number_format($size / 1024, 2);
 //				$size .= ' MB';
       }else{
@@ -347,4 +347,4 @@ function ratelimiter($rate = 5, $per = 8) {
 
     return;
   };
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`	`namespace App;`
`3`	`3`	`use System\Template;`
`4`		`-use System\Config;`
`5`	`4`
`6`	`5`	`class HomeController {`
`7`	`6`	`private $template;`
`@@ -18,7 +17,7 @@ public function showIndex()`
`18`	`17`	`'page_title'=>$title,`
`19`	`18`	`'page_content'=>$msg`
`20`	`19`	`]);`
`21`		`- return $this->template->display('layout.tpl');`
	`20`	`+ $this->template->display('layout.tpl');`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`	`namespace Modules\Admin\Models;`
	`3`	`+`
`3`	`4`	`use System\Config;`
`4`	`5`
`5`	`6`	`class Auth {`
`@@ -14,4 +15,4 @@ public function checkSession () {`
`14`	`15`	`return false;`
`15`	`16`	`}`
`16`	`17`	`}`
`17`		`-}`
	`18`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@ public function getMsg()`
`14`	`14`	`return $msg;`
`15`	`15`	`}`
`16`	`16`
`17`		`-}`
	`17`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,9 @@`
`13`	`13`	`*/`
`14`	`14`	`function smarty_compiler_compile_time($tag_arg, &$smarty)`
`15`	`15`	`{`
`16`		`- global $_SESSION;`
`17`	`16`	`$compile_time=round(microtime(true)-$_SESSION['master_load_start_time'],3);`
`18`	`17`	`$sqldebug="\n- SQL Debug: Query Map -\n";`
`19`	`18`	`foreach($_SESSION['db_query_map'] as $qry){$sqldebug.=$qry."\n";}`
`20`	`19`	`return "Compiled for ".$compile_time."s at ".date('d-m-Y H:i')." (DB queries: ".$_SESSION['db_query_count'].")".$sqldebug;`
`21`	`20`	`// return "\n echo '" . $smarty->_current_file . " compiled at " . date('Y-m-d H:M'). "';";`
`22`	`21`	`}`
`23`		`-?>`
Original file line number	Diff line number	Diff line change
`@@ -42,4 +42,3 @@ protected function fetch($name, &$source, &$mtime) {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`}`
`45`		`-?>`