fix

afshinakhgar · Dec 31, 2017 · b271b96 · b271b96
1 parent 5a73870
commit b271b96
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/app/View/blade/auth/login.blade.php b/app/View/blade/auth/login.blade.php
@@ -10,7 +10,7 @@
                 <input name="login"  type="text" class="form-control" id="login" placeholder="{{$translator->trans('auth.fields.login_mobile')}}">
             </div>
 
-            @if(!$settings['auth']['2step'])
+            @if(!$settings['app']['auth']['2step'])
                 <div class="form-group">
                     <label for="login">password</label>
                     <input  name="password"  type="password" class="form-control" id="mobile" placeholder="password">

diff --git a/app/View/blade/auth/register.blade.php b/app/View/blade/auth/register.blade.php
@@ -19,7 +19,7 @@
                 <label for="login">mobile</label>
                 <input  name="login"  type="login" class="form-control" id="mobile" placeholder="mobile">
             </div>
-            @if(!$settings['auth']['2step'])
+            @if(!$settings['app']['auth']['2step'])
             <div class="form-group">
                 <label for="login">password</label>
                 <input  name="password"  type="password" class="form-control" id="mobile" placeholder="password">

diff --git a/bootstrap/app.php b/bootstrap/app.php
@@ -17,12 +17,12 @@
 }
 $i=0;
 foreach($filesInConfig as $config_file){
-	if($config_file === 'phpmig.php'){continue;}
-	$file[$i] = include_once  __APP_ROOT__.'config/'.$config_file;
-	if(is_array($file[$i])){
-		$configs = array_merge($configs, $file[$i]);
-		$i++;
-	}
+    if($config_file === 'phpmig.php'){continue;}
+    $file[$i] = include_once  __APP_ROOT__.'config/'.$config_file;
+    if(is_array($file[$i])){
+        $configs = array_merge($configs, $file[$i]);
+        $i++;
+    }
 
 }
 
@@ -32,7 +32,7 @@
 
 $app = new \Core\App($config);
 
-if($config['settings']['debug'] && !$config['settings']['tracy']['active']){
+if($config['settings']['app']['debug'] && !$config['settings']['tracy']['active']){
     ini_set('display_errors', 1);
     ini_set('display_startup_errors', 1);
     error_reporting(E_ALL);
@@ -47,7 +47,7 @@
 require  __APP_ROOT__.'core/Functions/helpers.php';
 
 if(php_sapi_name() != 'cli') {
-    if($config['settings']['debug'] && $config['settings']['tracy']['active']){
+    if($config['settings']['app']['debug'] && $config['settings']['tracy']['active']){
         Tracy\Debugger::enable(Tracy\Debugger::DEVELOPMENT, $config['settings']['tracy']['path']);
     }
     Facade::setFacadeApplication($app);

diff --git a/bootstrap/dependencies.php b/bootstrap/dependencies.php
@@ -83,14 +83,15 @@
 
 
 // monolog
-$container['logger'] = function ($c) {
-    $settings = $c->get('settings')['app']['logger'];
+$container['logger'] = function ($container) {
+    $settings = $container->get('settings')['app']['logger'];
     $logger = new Monolog\Logger($settings['name']);
     $logger->pushProcessor(new Monolog\Processor\UidProcessor());
     $logger->pushHandler(new Monolog\Handler\StreamHandler($settings['path'], $settings['level']));
     return $logger;
 };
 
+
 // not found handler
 $container['notFoundHandler'] = function ($container) {
     return function (\Slim\Http\Request $request, \Slim\Http\Response $response) use ($container) {

diff --git a/bootstrap/middlewares.php b/bootstrap/middlewares.php
@@ -1,5 +1,5 @@
 <?php
-if($config['settings']['debug'] && $config['settings']['tracy']['active']) {
+if($config['settings']['app']['debug'] && $config['settings']['tracy']['active']) {
     $app->add(new RunTracy\Middlewares\TracyMiddleware($app));
 }
 

diff --git a/config/phpmig.php b/config/phpmig.php
@@ -6,7 +6,7 @@
 use Illuminate\Database\Capsule\Manager as Capsule;
 include 'settings.php';
 $capsule   = new Capsule;
-$capsule->addConnection($config['settings']['db']);
+$capsule->addConnection($config['databases']['db']);
 $capsule->setAsGlobal();
 $capsule->bootEloquent();
 $container = new ArrayObject();

diff --git a/config/session.php b/config/session.php
@@ -2,7 +2,7 @@
 return [
     //session
     'session' => [
-        'driver' => 'file',
+        'driver' => 'session',
         'name' => 'afshlim',
         'lifetime' => 7200,
         'path' => null,