x-systems / epesi-core

src/Layout/Seeds/ActionBar.php

Indentation +7 added lines, -7 removed lines

@@ -7,7 +7,7 @@ 
 
 class ActionBar extends Menu
 {
-    public $ui = 'actionbar menu';
+	public $ui = 'actionbar menu';
     
 	protected static $buttons = [];
 	
@@ -46,12 +46,12 @@ 
 	}
 	
 	public function renderView()
-    {
-        $this->elements = collect($this->elements)->sortByDesc(function ($element) {
-            return $element->weight ?? 10;
-        })->toArray();
+	{
+		$this->elements = collect($this->elements)->sortByDesc(function ($element) {
+			return $element->weight ?? 10;
+		})->toArray();
 
-        return parent::renderView();
+		return parent::renderView();
 	}
 	
 	/**
@@ -81,7 +81,7 @@ 
 	
 	public static function addMenuButton($menu)
 	{
-	    return self::instance()->addMenu($menu);
+		return self::instance()->addMenu($menu);
 	}
 
 	public static function clear()

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
 	
 	public function renderView()
     {
-        $this->elements = collect($this->elements)->sortByDesc(function ($element) {
+        $this->elements = collect($this->elements)->sortByDesc(function($element) {
             return $element->weight ?? 10;
         })->toArray();
 
@@ -63,9 +63,9 @@ 
 	 */
 	public static function addItemButton($button, $defaults = [])
 	{
-		$button = is_string($button)? self::getPredefined($button): $button;
+		$button = is_string($button) ? self::getPredefined($button) : $button;
 		
-		$button = is_array($button)? new ActionBarItem($button): $button;
+		$button = is_array($button) ? new ActionBarItem($button) : $button;
 		
 		$actionBar = self::instance();
 		

src/Layout/Seeds/ActionBarItem.php

Indentation +26 added lines, -26 removed lines

@@ -7,40 +7,40 @@
 
 class ActionBarItem extends Item
 {
-    public $weight = 10;
+	public $weight = 10;
     
-    public $callback;
+	public $callback;
     
-    public $hint;
+	public $hint;
     
-    public function renderView()
-    {
-        $this->addCallback();
+	public function renderView()
+	{
+		$this->addCallback();
         
-        if ($this->hint) {
-            $this->attr['title'] = $this->hint;
-        }
+		if ($this->hint) {
+			$this->attr['title'] = $this->hint;
+		}
         
-        parent::renderView();
-    }
+		parent::renderView();
+	}
     
-    public function callback($callable)
-    {
-        $this->callback = $callable;
+	public function callback($callable)
+	{
+		$this->callback = $callable;
         
-        return $this;
-    }
+		return $this;
+	}
     
-    public function addCallback()
-    {
-        if (is_callable($callable = $this->callback)) {
-            $callable = $this->add('jsCallback')->set($callable);
-        }
+	public function addCallback()
+	{
+		if (is_callable($callable = $this->callback)) {
+			$callable = $this->add('jsCallback')->set($callable);
+		}
         
-        if ($callable instanceof jsCallback) {
-            $this->on('click', $callable);
-        }
+		if ($callable instanceof jsCallback) {
+			$this->on('click', $callable);
+		}
         
-        return $this;
-    }
+		return $this;
+	}
 }

src/Layout/LayoutView.php

Indentation +68 added lines, -68 removed lines

@@ -30,36 +30,36 @@ 
  */
 class LayoutView extends ModuleView
 {
-    public $menuLeft;    // vertical menu
-    public $menu;        // horizontal menu
-    public $menuRight;   // vertical pull-down
-    public $actionBar;   
-    public $locationBar;
+	public $menuLeft;    // vertical menu
+	public $menu;        // horizontal menu
+	public $menuRight;   // vertical pull-down
+	public $actionBar;   
+	public $locationBar;
     
-    public $burger = true;      // burger menu item
+	public $burger = true;      // burger menu item
 
-    /*
+	/*
      * Whether or not left Menu is visible on Page load.
      */
-    public $isMenuLeftVisible = true;
+	public $isMenuLeftVisible = true;
 
-    public $defaultTemplate = 'layout/admin.html';
+	public $defaultTemplate = 'layout/admin.html';
     
-    protected $location;
+	protected $location;
 
-    public function init()
-    {
-        parent::init();
+	public function init()
+	{
+		parent::init();
 
-        $this->setMenu();
-        $this->setActionBar();
+		$this->setMenu();
+		$this->setActionBar();
         
 //         if (request()->pjax()) return;
         
-        $this->setMenuLeft();        
-        $this->setMenuRight();
+		$this->setMenuLeft();        
+		$this->setMenuRight();
         
-        $this->setVersion();
+		$this->setVersion();
         
 //         $this->js(true, null, 'body')->niceScroll();
         
@@ -68,26 +68,26 @@ 
 // 		if (event.originalEvent.persisted) {
 //         	window.location.reload(); 
 //     	}')]));
-    }
+	}
     
-    public function setMenu()
-    {
-        if ($this->menu) return;
+	public function setMenu()
+	{
+		if ($this->menu) return;
  
-        $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
+		$this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
 
-        // company logo
-        // see Epesi\Core\Controllers\SystemController::logo
-        $this->menu->add(['class' => ['epesi-logo'], 'style' => ['width' =>  '167px']])->add(['Image', url('logo')])->setStyle(['max-height' => '32px']);
+		// company logo
+		// see Epesi\Core\Controllers\SystemController::logo
+		$this->menu->add(['class' => ['epesi-logo'], 'style' => ['width' =>  '167px']])->add(['Image', url('logo')])->setStyle(['max-height' => '32px']);
         
-        if ($this->burger) {
-        	/** @scrutinizer ignore-call */
-        	$this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]);
-        }
+		if ($this->burger) {
+			/** @scrutinizer ignore-call */
+			$this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]);
+		}
        	
 		// home icon redirects to /home path 
 		// see Epesi\Core\Controllers\SystemController::home
-        $this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->add(['Icon', 'home']);
+		$this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->add(['Icon', 'home']);
 
 		// location bar
 		$this->locationBar = $this->menu->add(['View',	['ui' => 'epesi-location']]);
@@ -130,50 +130,50 @@ 
 		]), 'RightMenu')->addClass('right menu')->removeClass('item');
 	}
 	
-    public function setMenuLeft()
-    {
-        if ($this->menuLeft) return;
+	public function setMenuLeft()
+	{
+		if ($this->menuLeft) return;
         
-        $this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu');
+		$this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu');
 
-        if (! $this->burger) return;
+		if (! $this->burger) return;
 
-        if (! session()->get('menu', 1)) {
-        	$this->isMenuLeftVisible = false;
-        }
+		if (! session()->get('menu', 1)) {
+			$this->isMenuLeftVisible = false;
+		}
         
-        $this->burger->add(['Icon',	'content'])->on('click', [
-        		(new jQuery('.ui.left.sidebar'))->toggleClass('visible'),
-        		(new jQuery('.epesi-logo'))->toggleClass('expanded'),
-        		(new jQuery('body'))->toggleClass('atk-leftMenu-visible'),
-        		$this->burger->add('jsCallback')->set(function($j, $visible) {
-        			session()->put('menu', $visible? 1: 0);
-        			session()->save();
-        		}, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )])
-        ]);
-    }
+		$this->burger->add(['Icon',	'content'])->on('click', [
+				(new jQuery('.ui.left.sidebar'))->toggleClass('visible'),
+				(new jQuery('.epesi-logo'))->toggleClass('expanded'),
+				(new jQuery('body'))->toggleClass('atk-leftMenu-visible'),
+				$this->burger->add('jsCallback')->set(function($j, $visible) {
+					session()->put('menu', $visible? 1: 0);
+					session()->save();
+				}, [new \atk4\ui\jsExpression( '$("#' . $this->menuLeft->id . '").hasClass("visible")? 1: 0' )])
+		]);
+	}
     
-    public function setActionBar()
-    {
-    	if ($this->actionBar) return;
+	public function setActionBar()
+	{
+		if ($this->actionBar) return;
 
-    	$this->actionBar = $this->add(Seeds\ActionBar::class, 'ActionBar');
-    }
+		$this->actionBar = $this->add(Seeds\ActionBar::class, 'ActionBar');
+	}
     
-    public function setVersion()
-    {
-    	$this->template->trySet('version', $this->app->version);
-    }
+	public function setVersion()
+	{
+		$this->template->trySet('version', $this->app->version);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
+	/**
+	 * {@inheritdoc}
+	 */
     
-    public function renderView()
-    {
-    	if ($this->menuLeft && $this->isMenuLeftVisible) {
-               $this->menuLeft->addClass('visible');
-        }
-        parent::renderView();
-    }
+	public function renderView()
+	{
+		if ($this->menuLeft && $this->isMenuLeftVisible) {
+			   $this->menuLeft->addClass('visible');
+		}
+		parent::renderView();
+	}
 }

Braces +15 added lines, -5 removed lines

@@ -72,7 +72,9 @@ 
     
     public function setMenu()
     {
-        if ($this->menu) return;
+        if ($this->menu) {
+        	return;
+        }
  
         $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
 
@@ -123,7 +125,9 @@ 
 	
 	public function setMenuRight()
 	{
-		if ($this->menuRight) return;
+		if ($this->menuRight) {
+			return;
+		}
 
 		$this->menuRight = $this->menu->add(new Seeds\RightMenu([
 				'ui' => false
@@ -132,11 +136,15 @@ 
 	
     public function setMenuLeft()
     {
-        if ($this->menuLeft) return;
+        if ($this->menuLeft) {
+        	return;
+        }
         
         $this->menuLeft = $this->add(new Seeds\NavMenu('left vertical labeled sidebar'), 'LeftMenu');
 
-        if (! $this->burger) return;
+        if (! $this->burger) {
+        	return;
+        }
 
         if (! session()->get('menu', 1)) {
         	$this->isMenuLeftVisible = false;
@@ -155,7 +163,9 @@ 
     
     public function setActionBar()
     {
-    	if ($this->actionBar) return;
+    	if ($this->actionBar) {
+    		return;
+    	}
 
     	$this->actionBar = $this->add(Seeds\ActionBar::class, 'ActionBar');
     }

src/System/Logo/LogoSettings.php

Indentation +3 added lines, -3 removed lines

@@ -34,8 +34,8 @@ 
 		$form->addField('custom_logo', ['CheckBox', 'caption' => __('Use custom logo')]);
 		
 		$form->model->set([
-		        'title' => Variable::recall('system.title'),
-		        'custom_logo' => (bool) Variable::recall('system.logo')
+				'title' => Variable::recall('system.title'),
+				'custom_logo' => (bool) Variable::recall('system.logo')
 		]);
 		
 		$logo = $form->addField('logo', [
@@ -76,7 +76,7 @@ 
 				$storage->move($from, $to);
 			}
 
-	        Variable::memorize('system.logo', $logo);
+			Variable::memorize('system.logo', $logo);
 			
 			Variable::memorize('system.title', $form->model['title']);
 			

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
 			$logo->setThumbnailSrc(asset('storage/' . self::alias() . '/' . self::$defaultLogo));
 		});
 
-		$logo->onUpload(function ($files) use ($form, $logo) {
+		$logo->onUpload(function($files) use ($form, $logo) {
 			if ($files === 'error')	return $form->error('logo', __('Error uploading image'));
 			
 			$tmpPath = self::alias() . '/tmp/' . $files['name'];
@@ -64,7 +64,7 @@ 
 		});
 					
 		$form->onSubmit(function($form) {
-			if ($logo = $form->model['custom_logo']? $form->model['logo']: null) {
+			if ($logo = $form->model['custom_logo'] ? $form->model['logo'] : null) {
 				$storage = $this->storage();
 				$from = self::alias() . '/tmp/' . $logo;
 				$to = self::alias() . '/' . $logo;				

src/System/ModuleAdministration.php

Indentation +13 added lines, -13 removed lines

@@ -43,7 +43,7 @@ 
 		$accordion = $container->add(['Accordion', 'type' => ['styled', 'fluid'], 'settings' => ['animateChildren' => false]])->setStyle(['max-width' => '800px', 'margin-left' => 'auto', 'margin-right' => 'auto']);
 		
 		if ($container == $this) {
-		    $this->accordion = $accordion;
+			$this->accordion = $accordion;
 		}
 		
 		foreach ($modules as $moduleClass) {
@@ -92,17 +92,17 @@ 
 	
 	public function addInstallButton($container, $moduleClass)
 	{
-	    $button = $container->add(['Button', __('Install'), 'class' => ['green']]);
+		$button = $container->add(['Button', __('Install'), 'class' => ['green']]);
 	    
-	    $callback = $installCallback = $this->add('jsCallback')->set(function() use ($moduleClass, $container) {
+		$callback = $installCallback = $this->add('jsCallback')->set(function() use ($moduleClass, $container) {
 			ob_start();
 			ModuleManager::install($moduleClass);
 			
 			$message = ob_get_clean();
 			
 			return [
-			        $this->notifySuccess($message),
-			        new jsReload($this->accordion),
+					$this->notifySuccess($message),
+					new jsReload($this->accordion),
 			];
 		});
 		
@@ -150,17 +150,17 @@ 
 	
 	public function addUninstallButton($container, $moduleClass)
 	{
-	    $button = $container->add(['Button', __('Uninstall'), 'class' => ['red']]);
+		$button = $container->add(['Button', __('Uninstall'), 'class' => ['red']]);
 	    
-	    $callback = $uninstallCallback = $button->add(['jsCallback', 'confirm' => __('Are you sure you want to uninstall :module', ['module' => $moduleClass::label()])])->set(function() use ($moduleClass) {
-		    ob_start();
+		$callback = $uninstallCallback = $button->add(['jsCallback', 'confirm' => __('Are you sure you want to uninstall :module', ['module' => $moduleClass::label()])])->set(function() use ($moduleClass) {
+			ob_start();
 			ModuleManager::uninstall($moduleClass);
 			
 			$message = ob_get_clean();
 			
 			return [
-			        $this->notifySuccess($message),
-			        new jsReload($this->accordion),
+					$this->notifySuccess($message),
+					new jsReload($this->accordion),
 			];
 		});
 		
@@ -195,12 +195,12 @@ 
 	
 	public function addClearCacheButton()
 	{
-	    ActionBar::addItemButton([__('Clear Cache'), 'icon' => 'refresh', 'hint' => __('Clears module cache and re-discovers all available modules')])->callback(function($callback) {
+		ActionBar::addItemButton([__('Clear Cache'), 'icon' => 'refresh', 'hint' => __('Clears module cache and re-discovers all available modules')])->callback(function($callback) {
 			ModuleManager::clearCache();
 			
 			return [
-			        new jsReload($this->accordion),
-			        $this->notifySuccess(__('Cache cleared!'))
+					new jsReload($this->accordion),
+					$this->notifySuccess(__('Cache cleared!'))
 			];
 		});
 	}

src/System/Models/Variable.php

Indentation +8 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
 
 class Variable extends Model
 {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
 	/**
 	 * @var Collection
@@ -26,12 +26,12 @@ 
 	}
 	
 	public function init() {
-	    parent::init();
+		parent::init();
 	    
-	    $this->addFields([
-	            'name',
-	            'value' => ['type' => 'text', 'serialize' => 'base64']
-	    ]);
+		$this->addFields([
+				'name',
+				'value' => ['type' => 'text', 'serialize' => 'base64']
+		]);
 	}
 	
 	public static function recall($name, $default = null) {
@@ -56,10 +56,10 @@ 
 		$variable = self::create()->addCondition('name', $name)->tryLoadAny();
 
 		if ($variable->loaded()) {
-		    $variable->save(compact('value'));
+			$variable->save(compact('value'));
 		}
 		else {
-		    $variable->insert(compact('name', 'value'));
+			$variable->insert(compact('name', 'value'));
 		}
 	}
 	

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
 	public $strict_types = false;
 	
 	private static function cache() {
-		if(isset(self::$variables)) return;
+		if (isset(self::$variables)) return;
 		
 		self::$variables = self::pluck('value', 'name');
 	}
@@ -37,7 +37,7 @@ 
 	public static function recall($name, $default = null) {
 		self::cache();
 		
-		if (! self::$variables->has($name)) return $default;
+		if (!self::$variables->has($name)) return $default;
 		
 		return self::$variables->get($name, $default)?? $default;
 	}
@@ -63,10 +63,10 @@ 
 		}
 	}
 	
-	public static function forget($name, $throwError=true) {
+	public static function forget($name, $throwError = true) {
 		self::cache();
 		
-		if (! self::$variables->has($name) && $throwError) {
+		if (!self::$variables->has($name) && $throwError) {
 			throw new \Exception('No such variable in database: ' . $name);
 		}