evolution-cms / evolution

core/src/ManagerTheme.php

Doc Comments +16 added lines

@@ -270,6 +270,9 @@ 
         return $this->langName;
     }
 
+    /**
+     * @return string
+     */
     public function getTextDir($notEmpty = null)
     {
         return ($notEmpty === null) ? $this->textDir : (empty($this->textDir) ? '' : $notEmpty);
@@ -280,6 +283,9 @@ 
         $this->textDir = $textDir === 'rtl' ? 'rtl' : 'ltr';
     }
 
+    /**
+     * @param string $key
+     */
     public function getLexicon($key = null, $default = '')
     {
         return $key === null ? $this->lexicon : get_by_key($this->lexicon, $key, $default);
@@ -290,6 +296,9 @@ 
         return $this->charset;
     }
 
+    /**
+     * @param string $charset
+     */
     public function setCharset($charset)
     {
         $this->charset = $charset;
@@ -334,6 +343,9 @@ 
         return $key === null ? $this->style : get_by_key($this->style, $key, '');
     }
 
+    /**
+     * @param string $name
+     */
     public function view($name, array $params = [])
     {
         return View::make(
@@ -570,6 +582,10 @@ 
         return $content;
     }
 
+    /**
+     * @param string $name
+     * @param string $config
+     */
     public function makeTemplate($name, $config = null, array $placeholders = [], $clean = true) : string
     {
         $content = $this->getTemplate($name, $config);

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS;
 
-use EvolutionCMS\Interfaces\ManagerThemeInterface;
 use EvolutionCMS\Interfaces\CoreInterface;
+use EvolutionCMS\Interfaces\ManagerThemeInterface;
 use View;
 
 class ManagerTheme implements ManagerThemeInterface

Indentation +1 added lines, -1 removed lines

@@ -425,7 +425,7 @@
     {
         $out = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
         if ($out <= 0) {
-           $out = null;
+            $out = null;
         }
 
         return $out;

Spacing +73 added lines, -73 removed lines

@@ -215,23 +215,23 @@ 
         $modx_manager_charset = $this->getCharset();
         $modx_textdir = $this->getTextDir();
 
-        include_once MODX_MANAGER_PATH . "includes/lang/english.inc.php";
+        include_once MODX_MANAGER_PATH."includes/lang/english.inc.php";
 
         // now include_once different language file as english
-        if (!isset($lang) || !file_exists(MODX_MANAGER_PATH . "includes/lang/" . $lang . ".inc.php")) {
+        if (!isset($lang) || !file_exists(MODX_MANAGER_PATH."includes/lang/".$lang.".inc.php")) {
             $lang = 'english'; // if not set, get the english language file.
         }
 
         // $length_eng_lang = count($_lang);
         //// Not used for now, required for difference-check with other languages than english (i.e. inside installer)
 
-        if ($lang !== "english" && file_exists(MODX_MANAGER_PATH . "includes/lang/" . $lang . ".inc.php")) {
-            include_once MODX_MANAGER_PATH . "includes/lang/" . $lang . ".inc.php";
+        if ($lang !== "english" && file_exists(MODX_MANAGER_PATH."includes/lang/".$lang.".inc.php")) {
+            include_once MODX_MANAGER_PATH."includes/lang/".$lang.".inc.php";
         }
 
         // allow custom language overrides not altered by future EVO-updates
-        if (file_exists(MODX_MANAGER_PATH . "includes/lang/override/" . $lang . ".inc.php")) {
-            include_once MODX_MANAGER_PATH . "includes/lang/override/" . $lang . ".inc.php";
+        if (file_exists(MODX_MANAGER_PATH."includes/lang/override/".$lang.".inc.php")) {
+            include_once MODX_MANAGER_PATH."includes/lang/override/".$lang.".inc.php";
         }
 
         foreach ($_lang as $k => $v) {
@@ -297,7 +297,7 @@ 
 
     public function getViewName($name)
     {
-        return $this->namespace . '::' . $name;
+        return $this->namespace.'::'.$name;
     }
 
     /**
@@ -308,7 +308,7 @@ 
         $_style = [];
         $modx = $this->core;
         $_lang = $this->getLexicon();
-        include_once $this->getThemeDir(true) . 'style.php';
+        include_once $this->getThemeDir(true).'style.php';
         $this->style = $_style;
     }
 
@@ -318,12 +318,12 @@ 
      */
     public function getThemeDir($full = true) : string
     {
-        return ($full ? MODX_MANAGER_PATH : '') . 'media/style/' . $this->getTheme() . '/';
+        return ($full ? MODX_MANAGER_PATH : '').'media/style/'.$this->getTheme().'/';
     }
 
     public function getThemeUrl() : string
     {
-        return MODX_MANAGER_URL . $this->getThemeDir(false);
+        return MODX_MANAGER_URL.$this->getThemeDir(false);
     }
 
     /**
@@ -364,10 +364,10 @@ 
             $theme = $this->getTheme();
         }
 
-        if (is_file(MODX_MANAGER_PATH . "/media/style/" . $theme . "/" . $filepath)) {
-            $element = MODX_MANAGER_PATH . "/media/style/" . $theme . "/" . $filepath;
+        if (is_file(MODX_MANAGER_PATH."/media/style/".$theme."/".$filepath)) {
+            $element = MODX_MANAGER_PATH."/media/style/".$theme."/".$filepath;
         } else {
-            $element = MODX_MANAGER_PATH . ltrim($filepath, '/');
+            $element = MODX_MANAGER_PATH.ltrim($filepath, '/');
         }
 
         return $element;
@@ -387,14 +387,14 @@ 
         $controllerName = $this->findController($action);
 
         if (\is_int($controllerName)) {
-            $out = $this->view('page.' . $action)->render();
+            $out = $this->view('page.'.$action)->render();
         } elseif (class_exists($controllerName) &&
             \in_array(Interfaces\ManagerTheme\PageControllerInterface::class, class_implements($controllerName), true)
         ) {
             /** @var Interfaces\ManagerTheme\PageControllerInterface $controller */
             $controller = new $controllerName($this, $data);
             $controller->setIndex($action);
-            if (! $controller->canView()) {
+            if (!$controller->canView()) {
                 $this->alertAndQuit('error_no_privileges');
             } elseif (($out = $controller->checkLocked()) !== null) {
                 $this->alertAndQuit($out, false);
@@ -405,7 +405,7 @@ 
             }
         } else {
             $action = 0;
-            $out = $this->view('page.' . $action)->render();
+            $out = $this->view('page.'.$action)->render();
         }
 
         /********************************************************************/
@@ -423,7 +423,7 @@ 
 
     public function getItemId()
     {
-        $out = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+        $out = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
         if ($out <= 0) {
            $out = null;
         }
@@ -438,9 +438,9 @@ 
         if (isset($_GET['a']) && isset($_POST['a'])) {
             $this->alertAndQuit('error_double_action');
         } elseif (isset($_GET['a'])) {
-            $action = (int)filter_input(INPUT_GET, 'a', FILTER_VALIDATE_INT, $option);
+            $action = (int) filter_input(INPUT_GET, 'a', FILTER_VALIDATE_INT, $option);
         } elseif (isset($_POST['a'])) {
-            $action = (int)filter_input(INPUT_POST, 'a', FILTER_VALIDATE_INT, $option);
+            $action = (int) filter_input(INPUT_POST, 'a', FILTER_VALIDATE_INT, $option);
         } else {
             $action = null;
         }
@@ -463,13 +463,13 @@ 
         }
 
         // andrazk 20070416 - if installer is running, destroy active sessions
-        if (file_exists(MODX_BASE_PATH . 'assets/cache/installProc.inc.php')) {
-            include_once(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
+        if (file_exists(MODX_BASE_PATH.'assets/cache/installProc.inc.php')) {
+            include_once(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
             if (isset($installStartTime)) {
                 if ((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
                     unset($installStartTime);
-                    @ chmod(MODX_BASE_PATH . 'assets/cache/installProc.inc.php', 0755);
-                    unlink(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
+                    @ chmod(MODX_BASE_PATH.'assets/cache/installProc.inc.php', 0755);
+                    unlink(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
                 } else {
                     if ($_SERVER['REQUEST_METHOD'] != 'POST') {
                         if (isset($_COOKIE[session_name()])) {
@@ -494,7 +494,7 @@ 
                                 //						setcookie(session_name(), '', 0, MODX_BASE_URL);
                             }
                             header('HTTP/1.0 307 Redirect');
-                            header('Location: ' . MODX_MANAGER_URL . 'index.php?installGoingOn=2');
+                            header('Location: '.MODX_MANAGER_URL.'index.php?installGoingOn=2');
                         }
                     }
                 }
@@ -512,7 +512,7 @@ 
 
     public function getManagerStartupPageId()
     {
-        $homeId = (int)$this->getCore()->getConfig('manager_login_startup');
+        $homeId = (int) $this->getCore()->getConfig('manager_login_startup');
         if ($homeId <= 0) {
             $homeId = $this->getCore()->getConfig('site_start');
         }
@@ -527,8 +527,8 @@ 
 
     public function getTemplate($name, $config = null)
     {
-        if(!empty($config) && empty($this->getCore()->getConfig($config))) {
-            $this->getCore()->setConfig($config, MODX_MANAGER_PATH . 'media/style/common/' . $name . '.tpl');
+        if (!empty($config) && empty($this->getCore()->getConfig($config))) {
+            $this->getCore()->setConfig($config, MODX_MANAGER_PATH.'media/style/common/'.$name.'.tpl');
         }
 
         $target = $this->getCore()->getConfig($config);
@@ -547,22 +547,22 @@ 
             }
         } else {
             $chunk = $this->getCore()->getChunk($target);
-            if ($chunk!==false && !empty($chunk)) {
+            if ($chunk !== false && !empty($chunk)) {
                 $content = $chunk;
-            } elseif (is_file(MODX_BASE_PATH . $target)) {
-                $target = MODX_BASE_PATH . $target;
+            } elseif (is_file(MODX_BASE_PATH.$target)) {
+                $target = MODX_BASE_PATH.$target;
                 $content = file_get_contents($target);
-            } elseif (is_file($this->getThemeDir() . $name . '.tpl')) {
-                $target = $this->getThemeDir() . $name . '.tpl';
+            } elseif (is_file($this->getThemeDir().$name.'.tpl')) {
+                $target = $this->getThemeDir().$name.'.tpl';
                 $content = file_get_contents($target);
-            } elseif (is_file($this->getThemeDir() . 'templates/actions/' . $name . '.tpl')) {
-                $target = $this->getThemeDir() . 'templates/actions/' . $name . '.tpl';
+            } elseif (is_file($this->getThemeDir().'templates/actions/'.$name.'.tpl')) {
+                $target = $this->getThemeDir().'templates/actions/'.$name.'.tpl';
                 $content = file_get_contents($target);
-            } elseif (is_file($this->getThemeDir() . 'html/' . $name . '.html')) { // ClipperCMS compatible
-                $target = $this->getThemeDir() . 'html/' . $name . '.html';
+            } elseif (is_file($this->getThemeDir().'html/'.$name.'.html')) { // ClipperCMS compatible
+                $target = $this->getThemeDir().'html/'.$name.'.html';
                 $content = file_get_contents($target);
             } else {
-                $target = MODX_MANAGER_PATH . 'media/style/common/' . $name . '.tpl';
+                $target = MODX_MANAGER_PATH.'media/style/common/'.$name.'.tpl';
                 $content = file_get_contents($target);
             }
         }
@@ -594,7 +594,7 @@ 
     public function getTemplatePlaceholders() : array
     {
         $plh = [
-            'favicon' => (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL : $this->getThemeUrl() . '/images/') . 'favicon.ico',
+            'favicon' => (file_exists(MODX_BASE_PATH.'favicon.ico') ? MODX_SITE_URL : $this->getThemeUrl().'/images/').'favicon.ico',
             'homeurl' => $this->getCore()->makeUrl($this->getManagerStartupPageId()),
             'logouturl' => MODX_MANAGER_URL.'index.php?a=8',
             'year' => date('Y'),
@@ -607,17 +607,17 @@ 
         // set login logo image
         $logo = $this->getCore()->getConfig('login_logo', '');
         if ($logo !== '') {
-            $plh['login_logo'] = MODX_SITE_URL . $logo;
+            $plh['login_logo'] = MODX_SITE_URL.$logo;
         } else {
-            $plh['login_logo'] = $this->getThemeUrl() . '/images/login/default/login-logo.png';
+            $plh['login_logo'] = $this->getThemeUrl().'/images/login/default/login-logo.png';
         }
 
         // set login background image
         $background = $this->getCore()->getConfig('login_bg', '');
         if ($background !== '') {
-            $plh['login_bg'] = MODX_SITE_URL . $background;
+            $plh['login_bg'] = MODX_SITE_URL.$background;
         } else {
-            $plh['login_bg'] = $this->getThemeUrl() . 'images/login/default/login-background.jpg';
+            $plh['login_bg'] = $this->getThemeUrl().'images/login/default/login-background.jpg';
         }
         unset($background);
 
@@ -637,19 +637,19 @@ 
 
         // andrazk 20070416 - notify user of install/update
         if (isset($_GET['installGoingOn'])) {
-            switch ((int)$_GET['installGoingOn']) {
+            switch ((int) $_GET['installGoingOn']) {
                 case 1:
                     $this->getCore()->setPlaceholder(
                         'login_message',
-                        '<p><span class="fail">' . $this->getLexicon('login_cancelled_install_in_progress') . '</p>' .
-                        '<p>' . $this->getLexicon('login_message') . '</p>'
+                        '<p><span class="fail">'.$this->getLexicon('login_cancelled_install_in_progress').'</p>'.
+                        '<p>'.$this->getLexicon('login_message').'</p>'
                     );
                     break;
                 case 2:
                     $this->getCore()->setPlaceholder(
                         'login_message',
-                        '<p><span class="fail">' . $this->getLexicon('login_cancelled_site_was_updated') . '</p>'.
-                        '<p>' . $this->getLexicon('login_message') . '</p>'
+                        '<p><span class="fail">'.$this->getLexicon('login_cancelled_site_was_updated').'</p>'.
+                        '<p>'.$this->getLexicon('login_message').'</p>'
                     );
                     break;
             }
@@ -657,10 +657,10 @@ 
 
         if ($this->getCore()->getConfig('use_captcha')) {
             $plh['login_captcha_message'] = $this->getLexicon("login_captcha_message");
-            $plh['captcha_image'] = '<a href="' . MODX_MANAGER_URL . '" class="loginCaptcha">' .
-                '<img id="captcha_image" src="' . MODX_MANAGER_URL . 'captcha.php?rand=' . rand() . '" alt="' . $this->getLexicon("login_captcha_message") . '" />' .
+            $plh['captcha_image'] = '<a href="'.MODX_MANAGER_URL.'" class="loginCaptcha">'.
+                '<img id="captcha_image" src="'.MODX_MANAGER_URL.'captcha.php?rand='.rand().'" alt="'.$this->getLexicon("login_captcha_message").'" />'.
                 '</a>';
-            $plh['captcha_input'] = '<label>' . $this->getLexicon("captcha_code") . '</label>' .
+            $plh['captcha_input'] = '<label>'.$this->getLexicon("captcha_code").'</label>'.
                 '<input type="text" name="captcha_code" tabindex="3" value="" />';
         }
 
@@ -674,7 +674,7 @@ 
 
         // invoke OnManagerLoginFormRender event
         $evtOut = $this->getCore()->invokeEvent('OnManagerLoginFormRender');
-        $html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">' . implode('', $evtOut) . '</div>' : '';
+        $html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">'.implode('', $evtOut).'</div>' : '';
         $plh['OnManagerLoginFormRender'] = $html;
 
         return $this->makeTemplate('login', 'manager_login_tpl', $plh);
@@ -687,7 +687,7 @@ 
         // save page to manager object
         $this->getCore()->getManagerApi()->action = $action;
 
-        if ((int)$action > 1) {
+        if ((int) $action > 1) {
             $sql = sprintf(
                 "REPLACE INTO %s (sid, internalKey, username, lasthit, action, id) VALUES ('%s', %d, '%s', %d, '%s', %s)",
                 $this->getCore()->getDatabase()->getFullTableName('active_users'),
@@ -695,7 +695,7 @@ 
                 $this->getCore()->getLoginUserID(),
                 $_SESSION['mgrShortname'],
                 $this->getCore()->tstart,
-                (string)$action,
+                (string) $action,
                 $this->getItemId() ?? var_export(null, true)
             );
             $this->getCore()->getDatabase()->query($sql);
@@ -742,26 +742,26 @@ 
     public function getCssFiles()
     {
         return [
-            'bootstrap' => MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css',
-            'font-awesome' => MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css',
-            'fonts' => $this->getThemeDir() . 'css/fonts.css',
-            'forms' => $this->getThemeDir() . 'css/forms.css',
-            'mainmenu' => $this->getThemeDir() . 'css/mainmenu.css',
-            'tree' => $this->getThemeDir() . 'css/tree.css',
-            'custom' => $this->getThemeDir() . 'css/custom.css',
-            'tabpane' => $this->getThemeDir() . 'css/tabpane.css',
-            'contextmenu' => $this->getThemeDir() . 'css/contextmenu.css',
-            'index' => $this->getThemeDir() . 'css/index.css',
-            'main' => $this->getThemeDir() . 'css/main.css'
+            'bootstrap' => MODX_MANAGER_PATH.'media/style/common/bootstrap/css/bootstrap.min.css',
+            'font-awesome' => MODX_MANAGER_PATH.'media/style/common/font-awesome/css/font-awesome.min.css',
+            'fonts' => $this->getThemeDir().'css/fonts.css',
+            'forms' => $this->getThemeDir().'css/forms.css',
+            'mainmenu' => $this->getThemeDir().'css/mainmenu.css',
+            'tree' => $this->getThemeDir().'css/tree.css',
+            'custom' => $this->getThemeDir().'css/custom.css',
+            'tabpane' => $this->getThemeDir().'css/tabpane.css',
+            'contextmenu' => $this->getThemeDir().'css/contextmenu.css',
+            'index' => $this->getThemeDir().'css/index.css',
+            'main' => $this->getThemeDir().'css/main.css'
         ];
     }
 
     public function css()
     {
-        $css = $this->getThemeUrl() . 'style.css';
+        $css = $this->getThemeUrl().'style.css';
         $minCssName = 'css/styles.min.css';
 
-        if (!file_exists($this->getThemeDir(). $minCssName) && is_writable($this->getThemeDir() . 'css')) {
+        if (!file_exists($this->getThemeDir().$minCssName) && is_writable($this->getThemeDir().'css')) {
             $files = $this->getCssFiles();
             $evtOut = $this->getCore()->invokeEvent('OnBeforeMinifyCss', array(
                 'files' => $files,
@@ -780,19 +780,19 @@ 
                         sprintf($this->getLexicon('invalid_event_response'), 'OnBeforeMinifyManagerCss')
                     );
             }
-            require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';
+            require_once MODX_BASE_PATH.'assets/lib/Formatter/CSSMinify.php';
             $minifier = new \Formatter\CSSMinify($files);
             $css = $minifier->minify();
             file_put_contents(
-                $this->getThemeDir(). $minCssName,
+                $this->getThemeDir().$minCssName,
                 $css
             );
         }
-        if (file_exists($this->getThemeDir(). $minCssName)) {
-            $css = $this->getThemeUrl() . $minCssName;
+        if (file_exists($this->getThemeDir().$minCssName)) {
+            $css = $this->getThemeUrl().$minCssName;
         }
 
-        return $css . '?v=' . EVO_INSTALL_TIME;
+        return $css.'?v='.EVO_INSTALL_TIME;
     }
 
     public function getMainFrameHeaderHTMLBlock() : string
@@ -806,8 +806,8 @@ 
         $default = 'dark';
         $modes = array('', 'lightness', 'light', 'dark', 'darkness');
 
-        $cookie = (int)get_by_key($_COOKIE, 'MODX_themeMode', 0, function ($val) use ($modes) {
-            return (int)$val > 0 && (int)$val <= \count($modes);
+        $cookie = (int) get_by_key($_COOKIE, 'MODX_themeMode', 0, function($val) use ($modes) {
+            return (int) $val > 0 && (int) $val <= \count($modes);
         });
         $system = $this->getCore()->getConfig('manager_theme_mode');
 

Braces +5 added lines, -3 removed lines

@@ -466,7 +466,8 @@ 
         if (file_exists(MODX_BASE_PATH . 'assets/cache/installProc.inc.php')) {
             include_once(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
             if (isset($installStartTime)) {
-                if ((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
+                if ((time() - $installStartTime) > 5 * 60) {
+// if install flag older than 5 minutes, discard
                     unset($installStartTime);
                     @ chmod(MODX_BASE_PATH . 'assets/cache/installProc.inc.php', 0755);
                     unlink(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
@@ -558,7 +559,8 @@ 
             } elseif (is_file($this->getThemeDir() . 'templates/actions/' . $name . '.tpl')) {
                 $target = $this->getThemeDir() . 'templates/actions/' . $name . '.tpl';
                 $content = file_get_contents($target);
-            } elseif (is_file($this->getThemeDir() . 'html/' . $name . '.html')) { // ClipperCMS compatible
+            } elseif (is_file($this->getThemeDir() . 'html/' . $name . '.html')) {
+// ClipperCMS compatible
                 $target = $this->getThemeDir() . 'html/' . $name . '.html';
                 $content = file_get_contents($target);
             } else {
@@ -806,7 +808,7 @@ 
         $default = 'dark';
         $modes = array('', 'lightness', 'light', 'dark', 'darkness');
 
-        $cookie = (int)get_by_key($_COOKIE, 'MODX_themeMode', 0, function ($val) use ($modes) {
+        $cookie = (int)get_by_key($_COOKIE, 'MODX_themeMode', 0, function ($val) use ($modes){
             return (int)$val > 0 && (int)$val <= \count($modes);
         });
         $system = $this->getCore()->getConfig('manager_theme_mode');

core/src/Models/EventLog.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Models;
 
-use Illuminate\Database\Eloquent;
 use EvolutionCMS\Traits;
+use Illuminate\Database\Eloquent;
 
 /**
  * EvolutionCMS\Models\EventLog

Indentation +16 added lines, -16 removed lines

@@ -29,28 +29,28 @@
     use Traits\Models\ManagerActions,
         Traits\Models\TimeMutator;
 
-	protected $table = 'event_log';
+    protected $table = 'event_log';
 
     const CREATED_AT = 'createdon';
     const UPDATED_AT = null;
     protected $dateFormat = 'U';
 
-	protected $casts = [
-		'eventid' => 'int',
-		'createdon' => 'int',
-		'type' => 'int',
-		'user' => 'int',
-		'usertype' => 'int'
-	];
+    protected $casts = [
+        'eventid' => 'int',
+        'createdon' => 'int',
+        'type' => 'int',
+        'user' => 'int',
+        'usertype' => 'int'
+    ];
 
-	protected $fillable = [
-		'eventid',
-		'type',
-		'user',
-		'usertype',
-		'source',
-		'description'
-	];
+    protected $fillable = [
+        'eventid',
+        'type',
+        'user',
+        'usertype',
+        'source',
+        'description'
+    ];
 
     public const TYPE_INFORMATION = 1;
     public const TYPE_WARNING = 2;

core/src/Models/ManagerUser.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Models;
 
-use Illuminate\Database\Eloquent;
 use EvolutionCMS\Traits;
+use Illuminate\Database\Eloquent;
 
 /**
  * EvolutionCMS\Models\ManagerUser

Indentation +8 added lines, -8 removed lines

@@ -16,16 +16,16 @@
 {
     use Traits\Models\ManagerActions;
 
-	public $timestamps = false;
+    public $timestamps = false;
 
-	protected $hidden = [
-		'password'
-	];
+    protected $hidden = [
+        'password'
+    ];
 
-	protected $fillable = [
-		'username',
-		'password'
-	];
+    protected $fillable = [
+        'username',
+        'password'
+    ];
 
     public function attributes()
     {

Spacing +3 added lines, -3 removed lines

@@ -29,12 +29,12 @@ 
 
     public function attributes()
     {
-        return $this->hasOne(UserAttribute::class,'internalKey','id');
+        return $this->hasOne(UserAttribute::class, 'internalKey', 'id');
     }
 
     public function memberGroups()
     {
-        return $this->hasMany(MemberGroup::class,'member','id');
+        return $this->hasMany(MemberGroup::class, 'member', 'id');
     }
 
     public function groups() : Eloquent\Relations\BelongsToMany
@@ -44,7 +44,7 @@ 
 
     public function settings()
     {
-        return $this->hasMany(UserSetting::class,'user','id');
+        return $this->hasMany(UserSetting::class, 'user', 'id');
     }
 
     public function delete()

core/src/Models/SiteContent.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Models;
 
-use Illuminate\Database\Eloquent;
 use EvolutionCMS\Traits;
+use Illuminate\Database\Eloquent;
 
 /**
  * EvolutionCMS\Models\SiteContent

Indentation +63 added lines, -63 removed lines

@@ -79,69 +79,69 @@
     const CREATED_AT = 'createdon';
     const UPDATED_AT = 'editedon';
     const DELETED_AT = 'deletedon';
-	protected $dateFormat = 'U';
-
-	protected $casts = [
-		'published' => 'int',
-		'pub_date' => 'int',
-		'unpub_date' => 'int',
-		'parent' => 'int',
-		'isfolder' => 'int',
-		'richtext' => 'bool',
-		'template' => 'int',
-		'menuindex' => 'int',
-		'searchable' => 'int',
-		'cacheable' => 'int',
-		'createdby' => 'int',
-		'createdon' => 'int',
-		'editedby' => 'int',
-		'editedon' => 'int',
-		'deleted' => 'int',
-		'deletedby' => 'int',
-		'publishedon' => 'int',
-		'publishedby' => 'int',
-		'donthit' => 'bool',
-		'privateweb' => 'bool',
-		'privatemgr' => 'bool',
-		'content_dispo' => 'bool',
-		'hidemenu' => 'bool',
-		'alias_visible' => 'int'
-	];
-
-	protected $fillable = [
-		'type',
-		'contentType',
-		'pagetitle',
-		'longtitle',
-		'description',
-		'alias',
-		'link_attributes',
-		'published',
-		'pub_date',
-		'unpub_date',
-		'parent',
-		'isfolder',
-		'introtext',
-		'content',
-		'richtext',
-		'template',
-		'menuindex',
-		'searchable',
-		'cacheable',
-		'createdby',
-		'editedby',
-		'deleted',
-		'deletedby',
-		'publishedon',
-		'publishedby',
-		'menutitle',
-		'donthit',
-		'privateweb',
-		'privatemgr',
-		'content_dispo',
-		'hidemenu',
-		'alias_visible'
-	];
+    protected $dateFormat = 'U';
+
+    protected $casts = [
+        'published' => 'int',
+        'pub_date' => 'int',
+        'unpub_date' => 'int',
+        'parent' => 'int',
+        'isfolder' => 'int',
+        'richtext' => 'bool',
+        'template' => 'int',
+        'menuindex' => 'int',
+        'searchable' => 'int',
+        'cacheable' => 'int',
+        'createdby' => 'int',
+        'createdon' => 'int',
+        'editedby' => 'int',
+        'editedon' => 'int',
+        'deleted' => 'int',
+        'deletedby' => 'int',
+        'publishedon' => 'int',
+        'publishedby' => 'int',
+        'donthit' => 'bool',
+        'privateweb' => 'bool',
+        'privatemgr' => 'bool',
+        'content_dispo' => 'bool',
+        'hidemenu' => 'bool',
+        'alias_visible' => 'int'
+    ];
+
+    protected $fillable = [
+        'type',
+        'contentType',
+        'pagetitle',
+        'longtitle',
+        'description',
+        'alias',
+        'link_attributes',
+        'published',
+        'pub_date',
+        'unpub_date',
+        'parent',
+        'isfolder',
+        'introtext',
+        'content',
+        'richtext',
+        'template',
+        'menuindex',
+        'searchable',
+        'cacheable',
+        'createdby',
+        'editedby',
+        'deleted',
+        'deletedby',
+        'publishedon',
+        'publishedby',
+        'menutitle',
+        'donthit',
+        'privateweb',
+        'privatemgr',
+        'content_dispo',
+        'hidemenu',
+        'alias_visible'
+    ];
 
     protected $managerActionsMap = [
         'id' => [

Spacing +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
         return array_key_exists($this->getKey(), self::getLockedElements());
     }
 
-    public function getAlreadyEditInfoAttribute() :? array
+    public function getAlreadyEditInfoAttribute() : ? array
     {
         return $this->isAlreadyEdit ? self::getLockedElements()[$this->getKey()] : null;
     }

Braces +1 added lines, -1 removed lines

@@ -209,7 +209,7 @@
     {
         return $builder->where('pub_date', '<=', $time)
             ->where('pub_date', '>', 0)
-            ->where(function(Eloquent\Builder $query) use($time) {
+            ->where(function(Eloquent\Builder $query) use($time){
                 $query->where('unpub_date', '>', $time)
                     ->orWhere('unpub_date', '=', 0);
             })->where('published', '=', 0);

core/src/Models/SiteHtmlsnippet.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Models;
 
-use Illuminate\Database\Eloquent;
 use EvolutionCMS\Traits;
+use Illuminate\Database\Eloquent;
 
 /**
  * EvolutionCMS\Models\SiteHtmlsnippet

Indentation +22 added lines, -22 removed lines

@@ -39,31 +39,31 @@
     use Traits\Models\ManagerActions,
         Traits\Models\TimeMutator;
 
-	const CREATED_AT = 'createdon';
-	const UPDATED_AT = 'editedon';
+    const CREATED_AT = 'createdon';
+    const UPDATED_AT = 'editedon';
     protected $dateFormat = 'U';
 
-	protected $casts = [
-		'editor_type' => 'int',
-		'category' => 'int',
-		'cache_type' => 'bool',
-		'locked' => 'int',
-		'createdon' => 'int',
-		'editedon' => 'int',
-		'disabled' => 'int'
-	];
+    protected $casts = [
+        'editor_type' => 'int',
+        'category' => 'int',
+        'cache_type' => 'bool',
+        'locked' => 'int',
+        'createdon' => 'int',
+        'editedon' => 'int',
+        'disabled' => 'int'
+    ];
 
-	protected $fillable = [
-		'name',
-		'description',
-		'editor_type',
-		'editor_name',
-		'category',
-		'cache_type',
-		'snippet',
-		'locked',
-		'disabled'
-	];
+    protected $fillable = [
+        'name',
+        'description',
+        'editor_type',
+        'editor_name',
+        'category',
+        'cache_type',
+        'snippet',
+        'locked',
+        'disabled'
+    ];
 
     protected $managerActionsMap = [
         'actions.cancel' => 76,

Spacing +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
         return array_key_exists($this->getKey(), self::getLockedElements());
     }
 
-    public function getAlreadyEditInfoAttribute() :? array
+    public function getAlreadyEditInfoAttribute() : ? array
     {
         return $this->isAlreadyEdit ? self::getLockedElements()[$this->getKey()] : null;
     }

core/src/Models/SiteModule.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Models;
 
-use Illuminate\Database\Eloquent;
 use EvolutionCMS\Traits;
+use Illuminate\Database\Eloquent;
 
 /**
  * EvolutionCMS\Models\SiteModule

Indentation +30 added lines, -30 removed lines

@@ -44,40 +44,40 @@
     use Traits\Models\ManagerActions,
         Traits\Models\TimeMutator;
 
-	const CREATED_AT = 'createdon';
-	const UPDATED_AT = 'editedon';
+    const CREATED_AT = 'createdon';
+    const UPDATED_AT = 'editedon';
     protected $dateFormat = 'U';
 
-	protected $casts = [
-		'editor_type' => 'int',
-		'disabled' => 'int',
-		'category' => 'int',
-		'wrap' => 'int',
-		'locked' => 'int',
-		'enable_resource' => 'int',
-		'createdon' => 'int',
-		'editedon' => 'int',
-		'enable_sharedparams' => 'int'
-	];
+    protected $casts = [
+        'editor_type' => 'int',
+        'disabled' => 'int',
+        'category' => 'int',
+        'wrap' => 'int',
+        'locked' => 'int',
+        'enable_resource' => 'int',
+        'createdon' => 'int',
+        'editedon' => 'int',
+        'enable_sharedparams' => 'int'
+    ];
 
-	protected $fillable = [
-		'name',
-		'description',
-		'editor_type',
-		'disabled',
-		'category',
-		'wrap',
-		'locked',
-		'icon',
-		'enable_resource',
-		'resourcefile',
-		'guid',
-		'enable_sharedparams',
-		'properties',
-		'modulecode'
-	];
+    protected $fillable = [
+        'name',
+        'description',
+        'editor_type',
+        'disabled',
+        'category',
+        'wrap',
+        'locked',
+        'icon',
+        'enable_resource',
+        'resourcefile',
+        'guid',
+        'enable_sharedparams',
+        'properties',
+        'modulecode'
+    ];
 
-	protected $managerActionsMap = [
+    protected $managerActionsMap = [
         'actions.cancel' => 76,
         'actions.new' => 107,
         'id' => [

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
         return array_key_exists($this->getKey(), self::getLockedElements());
     }
 
-    public function getAlreadyEditInfoAttribute() :? array
+    public function getAlreadyEditInfoAttribute() : ? array
     {
         return $this->isAlreadyEdit ? self::getLockedElements()[$this->getKey()] : null;
     }

core/src/Models/SitePlugin.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Models;
 
-use Illuminate\Database\Eloquent;
 use EvolutionCMS\Traits;
+use Illuminate\Database\Eloquent;
 
 /**
  * EvolutionCMS\Models\SitePlugin

Indentation +25 added lines, -25 removed lines

@@ -45,32 +45,32 @@ 
     use Traits\Models\ManagerActions,
         Traits\Models\TimeMutator;
 
-	const CREATED_AT = 'createdon';
-	const UPDATED_AT = 'editedon';
+    const CREATED_AT = 'createdon';
+    const UPDATED_AT = 'editedon';
     protected $dateFormat = 'U';
 
-	protected $casts = [
-		'editor_type' => 'int',
-		'category' => 'int',
-		'cache_type' => 'bool',
-		'locked' => 'int',
-		'disabled' => 'int',
-		'createdon' => 'int',
-		'editedon' => 'int'
-	];
-
-	protected $fillable = [
-		'name',
-		'description',
-		'editor_type',
-		'category',
-		'cache_type',
-		'plugincode',
-		'locked',
-		'properties',
-		'disabled',
-		'moduleguid'
-	];
+    protected $casts = [
+        'editor_type' => 'int',
+        'category' => 'int',
+        'cache_type' => 'bool',
+        'locked' => 'int',
+        'disabled' => 'int',
+        'createdon' => 'int',
+        'editedon' => 'int'
+    ];
+
+    protected $fillable = [
+        'name',
+        'description',
+        'editor_type',
+        'category',
+        'cache_type',
+        'plugincode',
+        'locked',
+        'properties',
+        'disabled',
+        'moduleguid'
+    ];
 
     protected $managerActionsMap = [
         'actions.cancel' => 76,
@@ -85,7 +85,7 @@ 
         ]
     ];
 
-	public function scopeActivePhx(Eloquent\Builder $builder)
+    public function scopeActivePhx(Eloquent\Builder $builder)
     {
         return $builder->where('disabled', '!=', 1)
             ->whereRaw('plugincode LIKE "%phx.parser.class.inc.php%OnParseDocument();%"');

Spacing +2 added lines, -2 removed lines

@@ -131,7 +131,7 @@ 
     public function scopeDisabledAlternative(Eloquent\Builder $builder)
     {
         return $builder->lockedView()->where('disabled', '=', '0')
-            ->whereHas('alternative', function (Eloquent\Builder $builder) {
+            ->whereHas('alternative', function(Eloquent\Builder $builder){
                 return $builder->lockedView()->where('disabled', '=', '1');
             });
     }
@@ -146,7 +146,7 @@ 
         return array_key_exists($this->getKey(), self::getLockedElements());
     }
 
-    public function getAlreadyEditInfoAttribute() :? array
+    public function getAlreadyEditInfoAttribute() : ? array
     {
         return $this->isAlreadyEdit ? self::getLockedElements()[$this->getKey()] : null;
     }

Braces +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
     ];
 
 	public function scopeActivePhx(Eloquent\Builder $builder)
-    {
+	{
         return $builder->where('disabled', '!=', 1)
             ->whereRaw('plugincode LIKE "%phx.parser.class.inc.php%OnParseDocument();%"');
     }
@@ -131,7 +131,7 @@ 
     public function scopeDisabledAlternative(Eloquent\Builder $builder)
     {
         return $builder->lockedView()->where('disabled', '=', '0')
-            ->whereHas('alternative', function (Eloquent\Builder $builder) {
+            ->whereHas('alternative', function (Eloquent\Builder $builder){
                 return $builder->lockedView()->where('disabled', '=', '1');
             });
     }

core/src/Models/SiteSnippet.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Models;
 
-use Illuminate\Database\Eloquent;
 use EvolutionCMS\Traits;
+use Illuminate\Database\Eloquent;
 
 /**
  * EvolutionCMS\Models\SiteSnippet

Indentation +24 added lines, -24 removed lines

@@ -45,32 +45,32 @@
     use Traits\Models\ManagerActions,
         Traits\Models\TimeMutator;
 
-	const CREATED_AT = 'createdon';
-	const UPDATED_AT = 'editedon';
+    const CREATED_AT = 'createdon';
+    const UPDATED_AT = 'editedon';
     protected $dateFormat = 'U';
 
-	protected $casts = [
-		'editor_type' => 'int',
-		'category' => 'int',
-		'cache_type' => 'bool',
-		'locked' => 'int',
-		'createdon' => 'int',
-		'editedon' => 'int',
-		'disabled' => 'int'
-	];
-
-	protected $fillable = [
-		'name',
-		'description',
-		'editor_type',
-		'category',
-		'cache_type',
-		'snippet',
-		'locked',
-		'properties',
-		'moduleguid',
-		'disabled'
-	];
+    protected $casts = [
+        'editor_type' => 'int',
+        'category' => 'int',
+        'cache_type' => 'bool',
+        'locked' => 'int',
+        'createdon' => 'int',
+        'editedon' => 'int',
+        'disabled' => 'int'
+    ];
+
+    protected $fillable = [
+        'name',
+        'description',
+        'editor_type',
+        'category',
+        'cache_type',
+        'snippet',
+        'locked',
+        'properties',
+        'moduleguid',
+        'disabled'
+    ];
 
     protected $managerActionsMap = [
         'actions.cancel' => 76,

Spacing +3 added lines, -3 removed lines

@@ -124,7 +124,7 @@ 
         return array_key_exists($this->getKey(), self::getLockedElements());
     }
 
-    public function getAlreadyEditInfoAttribute() :? array
+    public function getAlreadyEditInfoAttribute() : ? array
     {
         return $this->isAlreadyEdit ? self::getLockedElements()[$this->getKey()] : null;
     }
@@ -136,7 +136,7 @@ 
 
     public function setGuidAttribute($value)
     {
-        $this->moduleguid = (string)$value;
+        $this->moduleguid = (string) $value;
     }
 
     public function getHasModuleAttribute() : bool
@@ -156,6 +156,6 @@ 
     }
 
     public function getSourceCodeAttribute(){
-        return '<?php' . "\n" . trim($this->snippet) . "\n";
+        return '<?php'."\n".trim($this->snippet)."\n";
     }
 }

Braces +2 added lines, -1 removed lines

@@ -155,7 +155,8 @@
             ->where('disabled', '=', 0);
     }
 
-    public function getSourceCodeAttribute(){
+    public function getSourceCodeAttribute()
+    {
         return '<?php' . "\n" . trim($this->snippet) . "\n";
     }
 }

core/src/Models/SiteTemplate.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php namespace EvolutionCMS\Models;
 
-use Illuminate\Database\Eloquent;
 use EvolutionCMS\Traits;
+use Illuminate\Database\Eloquent;
 
 /**
  * EvolutionCMS\Models\SiteTemplate

Indentation +24 added lines, -24 removed lines

@@ -43,31 +43,31 @@ 
     use Traits\Models\ManagerActions,
         Traits\Models\TimeMutator;
 
-	const CREATED_AT = 'createdon';
-	const UPDATED_AT = 'editedon';
+    const CREATED_AT = 'createdon';
+    const UPDATED_AT = 'editedon';
     protected $dateFormat = 'U';
 
-	protected $casts = [
-		'editor_type' => 'int',
-		'category' => 'int',
-		'template_type' => 'int',
-		'locked' => 'int',
-		'selectable' => 'int',
-		'createdon' => 'int',
-		'editedon' => 'int'
-	];
-
-	protected $fillable = [
-		'templatename',
-		'description',
-		'editor_type',
-		'category',
-		'icon',
-		'template_type',
-		'content',
-		'locked',
-		'selectable'
-	];
+    protected $casts = [
+        'editor_type' => 'int',
+        'category' => 'int',
+        'template_type' => 'int',
+        'locked' => 'int',
+        'selectable' => 'int',
+        'createdon' => 'int',
+        'editedon' => 'int'
+    ];
+
+    protected $fillable = [
+        'templatename',
+        'description',
+        'editor_type',
+        'category',
+        'icon',
+        'template_type',
+        'content',
+        'locked',
+        'selectable'
+    ];
 
     protected $managerActionsMap = [
         'actions.cancel' => 76,
@@ -80,7 +80,7 @@ 
         ]
     ];
 
-	public function getNameAttribute()
+    public function getNameAttribute()
     {
         return $this->templatename;
     }

Spacing +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
         return array_key_exists($this->getKey(), self::getLockedElements());
     }
 
-    public function getAlreadyEditInfoAttribute() :? array
+    public function getAlreadyEditInfoAttribute() : ? array
     {
         return $this->isAlreadyEdit ? self::getLockedElements()[$this->getKey()] : null;
     }

Braces +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
     ];
 
 	public function getNameAttribute()
-    {
+	{
         return $this->templatename;
     }