evolution-cms / evolution

manager/includes/error.class.inc.php

Braces +2 added lines, -1 removed lines

@@ -5,7 +5,8 @@
  * @deprecated EvolutionCMS\Legacy\ErrorHandler
  * @todo could be unnecessary
  */
-class errorHandler extends EvolutionCMS\Legacy\ErrorHandler {
+class errorHandler extends EvolutionCMS\Legacy\ErrorHandler
+{
     public function include_lang($context = 'common')
     {
         parent::includeLang($context);

manager/includes/log.class.inc.php

Braces +3 added lines, -1 removed lines

@@ -3,4 +3,6 @@
 /**
  * @deprecated use EvolutionCMS\Legacy\LogHandler
  */
-class logHandler extends EvolutionCMS\Legacy\LogHandler{}
+class logHandler extends EvolutionCMS\Legacy\LogHandler
+{
+}

manager/includes/src/Legacy/mgrResources.php

Braces +23 added lines, -12 removed lines

@@ -1,6 +1,7 @@ 
 <?php namespace EvolutionCMS\Legacy;
 
-class mgrResources {
+class mgrResources
+{
     /**
      * @var array
      */
@@ -21,7 +22,8 @@ 
     /**
      * mgrResources constructor.
      */
-    public function __construct() {
+    public function __construct()
+    {
         $this->setTypes();
         $this->queryItemsFromDB();
         $this->prepareCategoryArrays();
@@ -30,7 +32,8 @@ 
     /**
      * @return void
      */
-    public function setTypes() {
+    public function setTypes()
+    {
         global $_lang;
         $this->types['site_templates']    = array(
             'title'=>$_lang["manage_templates"],
@@ -68,7 +71,8 @@ 
     /**
      * @return void
      */
-    public function queryItemsFromDB() {
+    public function queryItemsFromDB()
+    {
         foreach($this->types as $resourceTable=>$type) {
             if($this->hasAnyPermissions($type['permissions'])) {
                 $nameField = isset($type['name']) ? $type['name'] : 'name';
@@ -81,11 +85,13 @@ 
      * @param array $permissions
      * @return bool
      */
-    public function hasAnyPermissions($permissions) {
+    public function hasAnyPermissions($permissions)
+    {
         $modx = evolutionCMS();
 
-        foreach($permissions as $p)
-            if($modx->hasPermission($p)) return true;
+        foreach($permissions as $p) {
+                    if($modx->hasPermission($p)) return true;
+        }
 
         return false;
     }
@@ -95,7 +101,8 @@ 
      * @param string $nameField
      * @return array|bool
      */
-    public function queryResources($resourceTable, $nameField = 'name') {
+    public function queryResources($resourceTable, $nameField = 'name')
+    {
         $modx = evolutionCMS(); global $_lang;
 
         $allowed = array(
@@ -112,8 +119,9 @@ 
             $tvsql    = 'site_tmplvars.caption, ';
             $tvjoin   = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getFullTableName('site_tmplvar_templates'));
             $sttfield = 'IF(stt.templateid,1,0) AS reltpl,';
+        } else {
+            $sttfield = '';
         }
-        else $sttfield = '';
 
         $selectableTemplates = $resourceTable === 'site_templates' ? "{$resourceTable}.selectable, " : "";
 
@@ -126,7 +134,9 @@ 
         );
         $limit = $modx->db->getRecordCount($rs);
 
-        if($limit < 1) return false;
+        if($limit < 1) {
+            return false;
+        }
 
         $result = array();
         while ($row = $modx->db->getRow($rs)) {
@@ -138,7 +148,8 @@ 
     /**
      * @return void
      */
-    public function prepareCategoryArrays() {
+    public function prepareCategoryArrays()
+    {
         foreach($this->items as $type=>$items) {
             foreach((array)$items as $item) {
                 $catid = $item['catid'] ? $item['catid'] : 0;
@@ -154,7 +165,7 @@ 
 
         // Now sort by name
         foreach($this->itemsPerCategory as $catid=>$items) {
-            usort($this->itemsPerCategory[$catid], function ($a, $b) {
+            usort($this->itemsPerCategory[$catid], function ($a, $b){
                 return strcasecmp($a['name'], $b['name']);
             });
         }

manager/includes/src/Legacy/TemplateParser.php

Braces +4 added lines, -2 removed lines

@@ -8,7 +8,8 @@ 
      * @param array $data
      * @return string
      */
-    public function output($config = array(), $data = array()) {
+    public function output($config = array(), $data = array())
+    {
         $modx = evolutionCMS();
 
         $output = '';
@@ -64,7 +65,8 @@ 
      * @param array $data
      * @return string
      */
-    private function render($data) {
+    private function render($data)
+    {
         $modx = evolutionCMS(); global $_lang, $_country_lang;
 
         $data['lang.name'] = (isset($_lang[$data['alias']]) ? $_lang[$data['alias']] : $data['alias']);

manager/includes/src/Support/Captcha.php

Braces +14 added lines, -7 removed lines

@@ -43,7 +43,8 @@ 
     public $im_height  = 0;
     public $im;
 
-    public function __construct($w=200, $h=80) {
+    public function __construct($w=200, $h=80)
+    {
         /* create session to set word for verification */
         $this->setVeriword();
         $this->dir_font = MODX_BASE_PATH . 'assets/' . $this->dir_font;
@@ -51,21 +52,24 @@ 
         $this->im_height        = $h;
     }
 
-    public function setVeriword() {
+    public function setVeriword()
+    {
         /* create session variable for verification,
            you may change the session variable name */
         $this->word             = $this->makeText();
         $_SESSION['veriword']   = $this->word;
     }
 
-    public function output() {
+    public function output()
+    {
         /* output the image as jpeg */
         $this->drawImage();
         header("Content-type: image/jpeg");
         imagejpeg($this->im);
     }
 
-    public function makeText() {
+    public function makeText()
+    {
         $modx = evolutionCMS();
         // set default words
         $words="MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote";
@@ -76,7 +80,8 @@ 
         return (string) $arr_words[array_rand($arr_words)].rand(10,999);
     }
 
-    public function drawText() {
+    public function drawText()
+    {
         $dir = dir($this->dir_font);
         $fontstmp = array();
         while (false !== ($file = $dir->read())) {
@@ -131,7 +136,8 @@ 
     }
 
 
-    public function drawImage() {
+    public function drawImage()
+    {
 
         /* pick one background image randomly from image directory */
         $img_file       = MODX_BASE_PATH . 'assets/' . $this->dir_noise."noise".rand(1,4).".jpg";
@@ -162,7 +168,8 @@ 
         return $this->im;
     }
 
-    public function destroy() {
+    public function destroy()
+    {
         imagedestroy($this->im);
     }
 }

manager/includes/template.parser.class.inc.php

Braces +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
  * @todo could be unnecessary

  *

  */

-Class TemplateParser extends EvolutionCMS\Legacy\TemplateParser

-{

+Class TemplateParser extends EvolutionCMS\Legacy\TemplateParser
+{
 }

 

 ?>

manager/includes/functions/tv.php

Braces +2 added lines, -1 removed lines

@@ -573,7 +573,8 @@
      * @return array|string
      */
     function parseInput($src, $delim = "||", $type = "string", $columns = true)
-    { // type can be: string, array
+    {
+// type can be: string, array
         $modx = evolutionCMS();
         if ($modx->db->isResult($src)) {
             // must be a recordset

manager/includes/bootstrap.php

Braces +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
  * @see https://github.com/theseer/Autoload
  */
 spl_autoload_register(
-    function ($class) {
+    function ($class){
         static $classes = null;
         if ($classes === null) {
             $classes = array(

manager/frames/1.php

Braces +32 added lines, -29 removed lines

@@ -1,5 +1,5 @@ 
 <?php

-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

 header("X-XSS-Protection: 0");

@@ -11,22 +11,22 @@ 
 

 $mxla = $modx_lang_attribute ? $modx_lang_attribute : 'en';

 

-if (!isset($modx->config['manager_menu_height'])) {

+if (!isset($modx->config['manager_menu_height'])) {
     $modx->config['manager_menu_height'] = 2.2; // rem

 }

 

-if (!isset($modx->config['manager_tree_width'])) {

+if (!isset($modx->config['manager_tree_width'])) {
     $modx->config['manager_tree_width'] = 20; // rem

 }

 

-if (isset($_SESSION['onLoginForwardToAction']) && is_int($_SESSION['onLoginForwardToAction'])) {

+if (isset($_SESSION['onLoginForwardToAction']) && is_int($_SESSION['onLoginForwardToAction'])) {
     $initMainframeAction = $_SESSION['onLoginForwardToAction'];

     unset($_SESSION['onLoginForwardToAction']);

-} else {

+} else {
     $initMainframeAction = 2; // welcome.static

 }

 

-if (!isset($_SESSION['tree_show_only_folders'])) {

+if (!isset($_SESSION['tree_show_only_folders'])) {
     $_SESSION['tree_show_only_folders'] = 0;

 }

 

@@ -35,29 +35,29 @@ 
 $tree_width = $modx->config['manager_tree_width'];

 $tree_min_width = 0;

 

-if (isset($_COOKIE['MODX_widthSideBar'])) {

+if (isset($_COOKIE['MODX_widthSideBar'])) {
     $MODX_widthSideBar = $_COOKIE['MODX_widthSideBar'];

-} else {

+} else {
     $MODX_widthSideBar = $tree_width;

 }

 

-if (!$MODX_widthSideBar) {

+if (!$MODX_widthSideBar) {
     $body_class .= 'sidebar-closed';

 }

 

 $theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');

-if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {

+if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {
     $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']];

-} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {

+} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {
     $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']];

 }

 

 $navbar_position = $modx->config['manager_menu_position'];

-if ($navbar_position == 'left') {

+if ($navbar_position == 'left') {
     $body_class .= ' navbar-left navbar-left-icon-and-text';

 }

 

-if (isset($modx->pluginCache['ElementsInTree'])) {

+if (isset($modx->pluginCache['ElementsInTree'])) {
     $body_class .= ' ElementsInTree';

 }

 

@@ -73,19 +73,19 @@ 
     'type8' => $_lang["lock_element_type_8"]

 );

 

-foreach ($unlockTranslations as $key => $value) {

+foreach ($unlockTranslations as $key => $value) {
     $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);

 }

 

 $user = $modx->getUserInfo($modx->getLoginUserID());

-if ($user['which_browser'] == 'default') {

+if ($user['which_browser'] == 'default') {
     $user['which_browser'] = $modx->config['which_browser'];

 }

 

 $css = 'media/style/' . $modx->config['manager_theme'] . '/css/page.css?v=' . $lastInstallTime;

 

-if ($modx->config['manager_theme'] == 'default') {

-    if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {

+if ($modx->config['manager_theme'] == 'default') {
+    if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css') && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
         require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';

         $minifier = new Formatter\CSSMinify();

         $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css');

@@ -102,7 +102,7 @@ 
         $css = $minifier->minify();

         file_put_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css', $css);

     }

-    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {

+    if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
         $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;

     }

 }

@@ -257,7 +257,7 @@ 
     <?php

     // invoke OnManagerTopPrerender event

     $evtOut = $modx->invokeEvent('OnManagerTopPrerender', $_REQUEST);

-    if (is_array($evtOut)) {

+    if (is_array($evtOut)) {
         echo implode("\n", $evtOut);

     }

     ?>

@@ -428,11 +428,14 @@ 
             <div id="evo-tab-page-home" class="evo-tab-page show iframe-scroller">

                 <iframe id="mainframe" src="index.php?a=<?= $initMainframeAction ?>" scrolling="auto" frameborder="0" onload="modx.main.onload(event);"></iframe>

             </div>

-        <?php else: ?>

+        <?php else {
+    : ?>

             <div class="iframe-scroller">

                 <iframe id="mainframe" name="main" src="index.php?a=<?= $initMainframeAction ?>" scrolling="auto" frameborder="0" onload="modx.main.onload(event);"></iframe>

             </div>

-        <?php endif; ?>

+        <?php endif;
+}
+?>

         <script>

             if (/iPhone|iPad|iPod/i.test(navigator.userAgent)) {

                 document.getElementById('mainframe').setAttribute('scrolling', 'no');

@@ -451,11 +454,11 @@ 
             'tree_sortdir',

             'tree_nodename'

         );

-        foreach ($sortParams as $param) {

-            if (isset($_REQUEST[$param])) {

+        foreach ($sortParams as $param) {
+            if (isset($_REQUEST[$param])) {
                 $modx->manager->saveLastUserSetting($param, $_REQUEST[$param]);

                 $_SESSION[$param] = $_REQUEST[$param];

-            } else if (!isset($_SESSION[$param])) {

+            } else if (!isset($_SESSION[$param])) {
                 $_SESSION[$param] = $modx->manager->getLastUserSetting($param);

             }

         }

@@ -535,16 +538,16 @@ 
     </div>

 

     <?php

-    if(!function_exists('constructLink')) {

+    if(!function_exists('constructLink')) {
         /**

          * @param string $action

          * @param string $img

          * @param string $text

          * @param bool $allowed

          */

-        function constructLink($action, $img, $text, $allowed)

-        {

-            if ((bool)$allowed) {

+        function constructLink($action, $img, $text, $allowed)
+        {
+            if ((bool)$allowed) {
                 echo sprintf('<div class="menuLink" id="item%s" onclick="modx.tree.menuHandler(%s);">', $action,

                     $action);

                 echo sprintf('<i class="%s"></i> %s</div>', $img, $text);

@@ -651,7 +654,7 @@ 
     ?>

 

 </div>

-<?php if ($modx->config['show_picker'] != "0") {

+<?php if ($modx->config['show_picker'] != "0") {
     include('media/style/' . $modx->config['manager_theme'] . '/color.switcher.php');

 } ?>

 </body>