x-systems / epesi-core

src/Layout/View/NavMenu.php

Indentation +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 
 class NavMenu extends BaseMenu
 {
-    public $ui = 'inverted nav menu';
+	public $ui = 'inverted nav menu';
     
 	public function init()
 	public function init(): void
@@ -62,12 +62,12 @@ 
 				self::addItems($submenu, collect($subitems));
 			}
 			elseif ($subitems = $entry['group'] ?? []) {
-			    $subgroup = $menu->addGroup($entry['item']);
+				$subgroup = $menu->addGroup($entry['item']);
 
 				self::addItems($subgroup, collect($subitems));
 			}
 			else {
-			    $menu->addItem($entry['item'], $entry['action'] ?? '');
+				$menu->addItem($entry['item'], $entry['action'] ?? '');
 			}
 		});
 	}

Spacing +5 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
 		$this->addHeader($this->app->title);
 		
 		$items = collect();
-		foreach(NavMenuJoint::collect() as $joint) {
+		foreach (NavMenuJoint::collect() as $joint) {
 			$items = $items->merge($joint->items());
 		}
 
@@ -35,13 +35,13 @@ 
 
 	public static function addItems($menu, Collection $items)
 	{
-		$items->sort(function ($entry1, $entry2) {
-			$weight1 = $entry1['weight']?? 10;
-			$weight2 = $entry2['weight']?? 10;
+		$items->sort(function($entry1, $entry2) {
+			$weight1 = $entry1['weight'] ?? 10;
+			$weight2 = $entry2['weight'] ?? 10;
 			
 			return $weight1 <=> $weight2;
 		})->map(function($entry, $caption) use ($menu) {
-			if (! ($entry['access'] ?? true)) return;
+			if (!($entry['access'] ?? true)) return;
 
 			if (!is_array($entry)) {
 				$entry = ['action' => $entry];

src/Layout/LayoutView.php

Indentation +78 added lines, -78 removed lines

@@ -32,53 +32,53 @@ 
  */
 class LayoutView extends ModuleView
 {
-    use SessionTrait;
+	use SessionTrait;
     
-    /**
-     * @var View\NavMenu
-     */
-    public $menuLeft;    // vertical menu
+	/**
+	 * @var View\NavMenu
+	 */
+	public $menuLeft;    // vertical menu
        
-    /**
-     * @var \atk4\ui\Menu
-     */
-    public $menu;        // horizontal menu
+	/**
+	 * @var \atk4\ui\Menu
+	 */
+	public $menu;        // horizontal menu
     
-    /**
-     * @var \atk4\ui\Menu
-     */
-    public $menuRight;   // vertical pull-down
+	/**
+	 * @var \atk4\ui\Menu
+	 */
+	public $menuRight;   // vertical pull-down
        
-    /**
-     * @var View\ActionBar
-     */
-    public $actionBar;   
-    public $locationBar;
+	/**
+	 * @var View\ActionBar
+	 */
+	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(): void
-    {
-        parent::init();
+	public function init(): void
+	{
+		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();
         
@@ -87,25 +87,25 @@ 
 // 		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\Controller::logo
-        $this->menu->add(['class' => ['epesi-logo'], 'style' => ['width' =>  '167px']])->add(['Image', url('logo')])->setStyle(['max-height' => '32px']);
+		// company logo
+		// see \Epesi\Core\Controller::logo
+		$this->menu->add(['class' => ['epesi-logo'], 'style' => ['width' =>  '167px']])->add(['Image', url('logo')])->setStyle(['max-height' => '32px']);
         
-        if ($this->burger) {
-        	$this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]);
-        }
+		if ($this->burger) {
+			$this->burger = $this->menu->addItem(['class' => ['icon atk-leftMenuTrigger']]);
+		}
        	
 		// home icon redirects to /home path 
 		// see \Epesi\Core\Controller::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']]);
@@ -148,49 +148,49 @@ 
 		]), 'RightMenu')->addClass('right menu')->removeClass('item');
 	}
 	
-    public function setMenuLeft()
-    {
-        if ($this->menuLeft) return;
+	public function setMenuLeft()
+	{
+		if ($this->menuLeft) return;
         
-        $this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']);
+		$this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']);
 
-        if (! $this->burger) return;
+		if (! $this->burger) return;
 
-        $this->isMenuLeftVisible = $this->learn('menu', $this->isMenuLeftVisible);
+		$this->isMenuLeftVisible = $this->learn('menu', $this->isMenuLeftVisible);
         
-        $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) {
-        		    $this->memorize('menu', filter_var($visible, FILTER_VALIDATE_BOOLEAN));
-        		}, [$this->menuLeft->js(true)->hasClass('visible')])
-        ]);
-    }
+		$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) {
+					$this->memorize('menu', filter_var($visible, FILTER_VALIDATE_BOOLEAN));
+				}, [$this->menuLeft->js(true)->hasClass('visible')])
+		]);
+	}
     
-    public function setActionBar()
-    {
-    	if ($this->actionBar) return;
+	public function setActionBar()
+	{
+		if ($this->actionBar) return;
 
-    	$this->actionBar = View\ActionBar::addTo($this, [], ['ActionBar']);
+		$this->actionBar = View\ActionBar::addTo($this, [], ['ActionBar']);
     	
-    	return $this;
-    }
+		return $this;
+	}
     
-    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();
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -37,17 +37,17 @@ 
     /**
      * @var View\NavMenu
      */
-    public $menuLeft;    // vertical menu
+    public $menuLeft; // vertical menu
        
     /**
      * @var \atk4\ui\Menu
      */
-    public $menu;        // horizontal menu
+    public $menu; // horizontal menu
     
     /**
      * @var \atk4\ui\Menu
      */
-    public $menuRight;   // vertical pull-down
+    public $menuRight; // vertical pull-down
        
     /**
      * @var View\ActionBar
@@ -55,7 +55,7 @@ 
     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.
@@ -108,7 +108,7 @@ 
         $this->menu->addItem(['class' => ['icon epesi-home']], url('home'))->add(['Icon', 'home']);
 
 		// location bar
-		$this->locationBar = $this->menu->add(['View',	['ui' => 'epesi-location']]);
+		$this->locationBar = $this->menu->add(['View', ['ui' => 'epesi-location']]);
 	}
 
 	public function setLocation($crumbs)
@@ -119,8 +119,8 @@ 
 		
 		$title = [];
 		foreach ($crumbs as $level) {
-			$label = $level['label']?? $level;
-			$link = $level['link']?? null;
+			$label = $level['label'] ?? $level;
+			$link = $level['link'] ?? null;
 			
 			$crumb->addCrumb($label, $link);
 			
@@ -154,11 +154,11 @@ 
         
         $this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']);
 
-        if (! $this->burger) return;
+        if (!$this->burger) return;
 
         $this->isMenuLeftVisible = $this->learn('menu', $this->isMenuLeftVisible);
         
-        $this->burger->add(['Icon',	'content'])->on('click', [
+        $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'),

Braces +15 added lines, -5 removed lines

@@ -91,7 +91,9 @@ 
     
     public function setMenu()
     {
-        if ($this->menu) return;
+        if ($this->menu) {
+        	return;
+        }
  
         $this->menu = $this->add(['Menu', 'atk-topMenu fixed horizontal', 'element' => 'header'], 'TopMenu');
 
@@ -141,7 +143,9 @@ 
 	
 	public function setMenuRight()
 	{
-		if ($this->menuRight) return;
+		if ($this->menuRight) {
+			return;
+		}
 
 		$this->menuRight = $this->menu->add(new View\RightMenu([
 				'ui' => false
@@ -150,11 +154,15 @@ 
 	
     public function setMenuLeft()
     {
-        if ($this->menuLeft) return;
+        if ($this->menuLeft) {
+        	return;
+        }
         
         $this->menuLeft = View\NavMenu::addTo($this, 'left vertical labeled sidebar', ['LeftMenu']);
 
-        if (! $this->burger) return;
+        if (! $this->burger) {
+        	return;
+        }
 
         $this->isMenuLeftVisible = $this->learn('menu', $this->isMenuLeftVisible);
         
@@ -170,7 +178,9 @@ 
     
     public function setActionBar()
     {
-    	if ($this->actionBar) return;
+    	if ($this->actionBar) {
+    		return;
+    	}
 
     	$this->actionBar = View\ActionBar::addTo($this, [], ['ActionBar']);
     	

src/System/SystemInstallWizard.php

Spacing +5 added lines, -5 removed lines

@@ -79,7 +79,7 @@ 
 		
 		$form->addField('language', ['DropDown', 'values' => $values, 'caption' => __('Select Language'), 'iconLeft' => 'globe'], ['required'=>true])->set($wizard->recall('language', 'en'));
 		
-		$form->onSubmit(function ($form) use ($wizard) {
+		$form->onSubmit(function($form) use ($wizard) {
 			$wizard->memorize('language', $form->model['language']);
 			
 			App::setLocale($form->model['language']);
@@ -111,7 +111,7 @@ 
 		$form->addField('support', ['CheckBox', 'caption' => __('I will not remove "Support -> About" credit page from the application menu.')], ['required'=>true]);
 		$form->addField('store', ['CheckBox', 'caption' => __('I will not remove or rename ":epesi Store" links from the application.', ['epesi' => config('epesi.ui.title')])], ['required'=>true]);
 		
-		$form->onSubmit(function ($form) use ($wizard) {
+		$form->onSubmit(function($form) use ($wizard) {
 			return $wizard->jsNext();
 		});
 			
@@ -139,12 +139,12 @@ 
 		$form->addField('create', ['CheckBox', 'caption' => __('Create New Database')])->on('change', new jsExpression('if ($(event.target).is(":checked")) alert([])', [__('WARNING: Make sure you have CREATE access level to do this!')]));
 
 		foreach ($wizard->recall('connection', []) as $name => $value) {
-			if (! $field = $form->fields[$name]?? null) continue;
+			if (!$field = $form->fields[$name] ?? null) continue;
 			
 			$field->set($value);
 		}
 
-		$form->onSubmit(function ($form) use ($wizard) {
+		$form->onSubmit(function($form) use ($wizard) {
 			$connection = $form->model->get();
 
 			$wizard->memorize('connection', $connection);
@@ -192,7 +192,7 @@ 
 		
 		$form->model->set($wizard->recall('user'));
 		
-		$form->validate(function ($form) use ($wizard) {
+		$form->validate(function($form) use ($wizard) {
 			$wizard->memorize('user', $form->model->get());
 			
 			return $wizard->jsNext();

src/System/Models/Module.php

Indentation +12 added lines, -12 removed lines

@@ -7,19 +7,19 @@
 
 class Module extends Model
 {
-    use HasEpesiConnection;
+	use HasEpesiConnection;
     
-    public $table = 'modules';
+	public $table = 'modules';
     
-    function init(): void
-    {
-        parent::init();
+	function init(): void
+	{
+		parent::init();
         
-        $this->addFields([
-                'class',
-                'alias',
-                'priority' => ['default' => 0],
-                'state' => ['default' => 1]
-        ]);
-    }
+		$this->addFields([
+				'class',
+				'alias',
+				'priority' => ['default' => 0],
+				'state' => ['default' => 1]
+		]);
+	}
 }

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
@@ -27,12 +27,12 @@ 
 	
 	public function init(): void
 	{
-	    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) {
@@ -57,10 +57,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 +5 added lines, -5 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');
 	}
@@ -38,9 +38,9 @@ 
 	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;
+		return self::$variables->get($name, $default) ?? $default;
 	}
 	
 	public static function memorize($name, $value) {
@@ -64,10 +64,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);
 		}