evolution-cms / evolution

install/src/processor/result.php

Spacing +13 added lines, -14 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 //:: EVO Installer Setup file
 //:::::::::::::::::::::::::::::::::::::::::
-if (is_file($base_path . 'assets/cache/siteManager.php')) {
-    include_once($base_path . 'assets/cache/siteManager.php');
+if (is_file($base_path.'assets/cache/siteManager.php')) {
+    include_once($base_path.'assets/cache/siteManager.php');
 }
 if (!defined('MGR_DIR')) {
     define('MGR_DIR', 'manager');
 }
 
-require_once(dirname(dirname(dirname(__DIR__))) . '/' . MGR_DIR . '/includes/version.inc.php');
+require_once(dirname(dirname(dirname(__DIR__))).'/'.MGR_DIR.'/includes/version.inc.php');
 
-$chunkPath = $base_path . 'install/assets/chunks';
-$snippetPath = $base_path . 'install/assets/snippets';
-$pluginPath = $base_path . 'install/assets/plugins';
-$modulePath = $base_path . 'install/assets/modules';
-$templatePath = $base_path . 'install/assets/templates';
-$tvPath = $base_path . 'install/assets/tvs';
+$chunkPath = $base_path.'install/assets/chunks';
+$snippetPath = $base_path.'install/assets/snippets';
+$pluginPath = $base_path.'install/assets/plugins';
+$modulePath = $base_path.'install/assets/modules';
+$templatePath = $base_path.'install/assets/templates';
+$tvPath = $base_path.'install/assets/tvs';
 
 // setup Template template files - array : name, description, type - 0:file or 1:content, parameters, category
 $mt = &$moduleTemplates;
@@ -28,8 +28,7 @@ 
         $params = parse_docblock($templatePath, $tplfile);
         if (is_array($params) && (count($params) > 0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
-            $mt[] = array
-            (
+            $mt[] = array(
                 $params['name'],
                 $description,
                 // Don't think this is gonna be used ... but adding it just in case 'type'
@@ -149,7 +148,7 @@ 
                 $params['modx_category'],
                 $params['legacy_names'],
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false,
-                (int)$params['disabled']
+                (int) $params['disabled']
             );
         }
     }
@@ -174,12 +173,12 @@ 
                 "$modulePath/{$params['filename']}",
                 $params['properties'],
                 $params['guid'],
-                (int)$params['shareparams'],
+                (int) $params['shareparams'],
                 $params['modx_category'],
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false
             );
         }
-        if ((int)$params['shareparams'] || !empty($params['dependencies'])) {
+        if ((int) $params['shareparams'] || !empty($params['dependencies'])) {
             $dependencies = explode(',', $params['dependencies']);
             foreach ($dependencies as $dependency) {
                 $dependency = explode(':', $dependency);

manager/includes/error.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  * @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/src/Legacy/ErrorHandler.php

Spacing +3 added lines, -3 removed lines

@@ -71,11 +71,11 @@
         }
 
         if ($context === 'common') {
-            $lang_path = MODX_MANAGER_PATH . 'includes/lang/';
+            $lang_path = MODX_MANAGER_PATH.'includes/lang/';
         } else {
-            $lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
+            $lang_path = MODX_MANAGER_PATH."includes/lang/{$context}/";
         }
-        include_once($lang_path . 'english.inc.php');
+        include_once($lang_path.'english.inc.php');
         $manager_language = $modx->config['manager_language'];
         if (is_file("{$lang_path}{$manager_language}.inc.php")) {
             include_once("{$lang_path}{$manager_language}.inc.php");

manager/includes/src/Support/Menu.php

Spacing +4 added lines, -4 removed lines

@@ -90,14 +90,14 @@ 
                 $countChild++;
                 $id = $value[0];
                 $ph['id'] = $id;
-                $ph['li_class'] = $this->getItemClass($id) . $value[10];
+                $ph['li_class'] = $this->getItemClass($id).$value[10];
                 $ph['href'] = $value[3];
                 $ph['alt'] = $value[4];
                 $ph['target'] = $value[7];
                 $ph['onclick'] = $value[5];
                 $ph['a_class'] = $this->getLinkClass($id);
                 $ph['LinkAttr'] = $this->getLinkAttr($id);
-                $ph['itemName'] = $value[2] . $this->getItemName($id);
+                $ph['itemName'] = $value[2].$this->getItemName($id);
 
                 $ph['DrawSub'] = '';
 
@@ -145,7 +145,7 @@ 
     public function getLinkClass($id)
     {
         if (isset($this->menu[$id])) {
-            return ' class="' . $this->defaults['parentLinkClass'] . '"';
+            return ' class="'.$this->defaults['parentLinkClass'].'"';
         } else {
             return '';
         }
@@ -171,7 +171,7 @@ 
     public function getItemClass($id)
     {
         if (isset($this->menu[$id])) {
-            return $this->defaults['parentClass'] . ' ';
+            return $this->defaults['parentClass'].' ';
         } else {
             return '';
         }

manager/includes/src/Support/Paginate.php

Spacing +6 added lines, -6 removed lines

@@ -101,14 +101,14 @@ 
         $array_paging['total'] = $this->int_nbr_row;
 
         if ($this->int_cur_position != 0) {
-            $array_paging['first_link'] = "<a href=\"$PHP_SELF?int_cur_position=0" . $this->str_ext_argv . "\">";
-            $array_paging['previous_link'] = "<a href=\"$PHP_SELF?int_cur_position=" . ($this->int_cur_position - $this->int_num_result) . $this->str_ext_argv . "\">";
+            $array_paging['first_link'] = "<a href=\"$PHP_SELF?int_cur_position=0".$this->str_ext_argv."\">";
+            $array_paging['previous_link'] = "<a href=\"$PHP_SELF?int_cur_position=".($this->int_cur_position - $this->int_num_result).$this->str_ext_argv."\">";
         }
 
         if (($this->int_nbr_row - $this->int_cur_position) > $this->int_num_result) {
             $int_new_position = $this->int_cur_position + $this->int_num_result;
-            $array_paging['last_link'] = "<a href=\"$PHP_SELF?int_cur_position=" . $this->int_nbr_row . $this->str_ext_argv . "\">";
-            $array_paging['next_link'] = "<a href=\"$PHP_SELF?int_cur_position=$int_new_position" . $this->str_ext_argv . "\">";
+            $array_paging['last_link'] = "<a href=\"$PHP_SELF?int_cur_position=".$this->int_nbr_row.$this->str_ext_argv."\">";
+            $array_paging['next_link'] = "<a href=\"$PHP_SELF?int_cur_position=$int_new_position".$this->str_ext_argv."\">";
         }
 
         return $array_paging;
@@ -126,10 +126,10 @@ 
         for ($i = 0; $i < $this->getNumberOfPage(); $i++) {
             // if current page, do not make a link
             if ($i == $this->getCurrentPage()) {
-                $array_all_page[$i] = "<b>" . ($i + 1) . "</b>&nbsp;";
+                $array_all_page[$i] = "<b>".($i + 1)."</b>&nbsp;";
             } else {
                 $int_new_position = ($i * $this->int_num_result);
-                $array_all_page[$i] = "<a href=\"" . $PHP_SELF . "?int_cur_position=$int_new_position$this->str_ext_argv\">" . ($i + 1) . "</a>&nbsp;";
+                $array_all_page[$i] = "<a href=\"".$PHP_SELF."?int_cur_position=$int_new_position$this->str_ext_argv\">".($i + 1)."</a>&nbsp;";
             }
         }
 

manager/includes/src/Support/Captcha.php

Spacing +31 added lines, -31 removed lines

@@ -43,44 +43,44 @@ 
     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;
+        $this->dir_font = MODX_BASE_PATH.'assets/'.$this->dir_font;
         $this->im_width         = $w;
         $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";
+        $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";
         $words = $modx->config['captcha_words'] ? $modx->config['captcha_words'] : $words;
         $arr_words = array_filter(array_map('trim', explode(',', $words)));
 
         /* pick one randomly for text verification */
-        return (string) $arr_words[array_rand($arr_words)].rand(10,999);
+        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())) {
-            if(substr($file, -4) == '.ttf') {
+            if (substr($file, -4) == '.ttf') {
                 $fontstmp[] = $this->dir_font.$file;
             }
         }
@@ -88,35 +88,35 @@ 
         $text_font = (string) $fontstmp[array_rand($fontstmp)];
 
         /* angle for text inclination */
-        $text_angle = rand(-9,9);
+        $text_angle = rand(-9, 9);
         /* initial text size */
         $text_size  = 30;
         /* calculate text width and height */
-        $box        = imagettfbbox ( $text_size, $text_angle, $text_font, $this->word);
-        $text_width = $box[2]-$box[0]; //text width
-        $text_height= $box[5]-$box[3]; //text height
+        $box        = imagettfbbox($text_size, $text_angle, $text_font, $this->word);
+        $text_width = $box[2] - $box[0]; //text width
+        $text_height = $box[5] - $box[3]; //text height
 
         /* adjust text size */
-        $text_size  = round((20 * $this->im_width)/$text_width);
+        $text_size  = round((20 * $this->im_width) / $text_width);
 
         /* recalculate text width and height */
-        $box        = imagettfbbox ( $text_size, $text_angle, $text_font, $this->word);
-        $text_width = $box[2]-$box[0]; //text width
-        $text_height= $box[5]-$box[3]; //text height
+        $box        = imagettfbbox($text_size, $text_angle, $text_font, $this->word);
+        $text_width = $box[2] - $box[0]; //text width
+        $text_height = $box[5] - $box[3]; //text height
 
         /* calculate center position of text */
-        $text_x         = ($this->im_width - $text_width)/2;
-        $text_y         = ($this->im_height - $text_height)/2;
+        $text_x         = ($this->im_width - $text_width) / 2;
+        $text_y         = ($this->im_height - $text_height) / 2;
 
         /* create canvas for text drawing */
-        $im_text        = imagecreate ($this->im_width, $this->im_height);
-        $bg_color       = imagecolorallocate ($im_text, 255, 255, 255);
+        $im_text        = imagecreate($this->im_width, $this->im_height);
+        $bg_color       = imagecolorallocate($im_text, 255, 255, 255);
 
         /* pick color for text */
-        $text_color     = imagecolorallocate ($im_text, 0, 51, 153);
+        $text_color     = imagecolorallocate($im_text, 0, 51, 153);
 
         /* draw text into canvas */
-        imagettftext    (   $im_text,
+        imagettftext($im_text,
             $text_size,
             $text_angle,
             $text_x,
@@ -131,19 +131,19 @@ 
     }
 
 
-    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";
+        $img_file       = MODX_BASE_PATH.'assets/'.$this->dir_noise."noise".rand(1, 4).".jpg";
 
         /* create "noise" background image from your image stock*/
-        $noise_img      = @imagecreatefromjpeg ($img_file);
+        $noise_img      = @imagecreatefromjpeg($img_file);
         $noise_width    = imagesx($noise_img);
         $noise_height   = imagesy($noise_img);
 
         /* resize the background image to fit the size of image output */
-        $this->im       = imagecreatetruecolor($this->im_width,$this->im_height);
-        imagecopyresampled ($this->im,
+        $this->im       = imagecreatetruecolor($this->im_width, $this->im_height);
+        imagecopyresampled($this->im,
             $noise_img,
             0, 0, 0, 0,
             $this->im_width,
@@ -152,17 +152,17 @@ 
             $noise_height);
 
         /* put text image into background image */
-        imagecopymerge (    $this->im,
+        imagecopymerge($this->im,
             $this->drawText(),
             0, 0, 0, 0,
             $this->im_width,
             $this->im_height,
-            70 );
+            70);
 
         return $this->im;
     }
 
-    public function destroy() {
+    public function destroy(){
         imagedestroy($this->im);
     }
 }

manager/includes/src/Event.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
         if (is_array($SystemAlertMsgQueque)) {
             $title = '';
             if ($this->name && $this->activePlugin) {
-                $title = "<div><b>" . $this->activePlugin . "</b> - <span style='color:maroon;'>" . $this->name . "</span></div>";
+                $title = "<div><b>".$this->activePlugin."</b> - <span style='color:maroon;'>".$this->name."</span></div>";
             }
             $SystemAlertMsgQueque[] = "$title<div style='margin-left:10px;margin-top:3px;'>$msg</div>";
         }

manager/includes/functions/preload.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
         $_ = crc32(__FILE__);
         $_ = sprintf('%u', $_);
 
-        return 'evo' . base_convert($_, 10, 36);
+        return 'evo'.base_convert($_, 10, 36);
     }
 }
 
@@ -57,7 +57,7 @@ 
         session_start();
         $key = "modx.mgr.session.cookie.lifetime";
         if (isset($_SESSION[$key]) && is_numeric($_SESSION[$key])) {
-            $cookieLifetime = (int)$_SESSION[$key];
+            $cookieLifetime = (int) $_SESSION[$key];
             if ($cookieLifetime) {
                 $cookieExpiration = $_SERVER['REQUEST_TIME'] + $cookieLifetime;
             }

manager/actions/mutate_categories.dynamic.php

Spacing +14 added lines, -14 removed lines

@@ -1,9 +1,9 @@ 
 <?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.");
 }
 
-if(!$modx->hasPermission('category_manager')) {
+if (!$modx->hasPermission('category_manager')) {
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
@@ -15,11 +15,11 @@ 
 	'native_language'  => 'de',
 	'name'             => 'Categories Manager',
 	'dirname'          => $site_manager_url,
-	'url'              => 'index.php?a=120&amp;id=' . $_GET['id'],
-	'path'             => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR,
-	'inc_dir'          => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR,
-	'languages_dir'    => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'lang' . DIRECTORY_SEPARATOR,
-	'views_dir'        => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'skin' . DIRECTORY_SEPARATOR,
+	'url'              => 'index.php?a=120&amp;id='.$_GET['id'],
+	'path'             => realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR.'category_mgr'.DIRECTORY_SEPARATOR,
+	'inc_dir'          => realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR.'category_mgr'.DIRECTORY_SEPARATOR.'inc'.DIRECTORY_SEPARATOR,
+	'languages_dir'    => realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR.'category_mgr'.DIRECTORY_SEPARATOR.'lang'.DIRECTORY_SEPARATOR,
+	'views_dir'        => realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR.'category_mgr'.DIRECTORY_SEPARATOR.'skin'.DIRECTORY_SEPARATOR,
 	'request_key'      => 'module_categories_manager',
 	'messages'         => array()
 );
@@ -27,19 +27,19 @@ 
 $cm = new EvolutionCMS\Legacy\ModuleCategoriesManager();
 
 // assign module_params to internal params
-foreach( $_module_params as $param => $value )
+foreach ($_module_params as $param => $value)
 {
-	$cm->set( $param, $value );
+	$cm->set($param, $value);
 }
 
 // catch the request actions
-include_once $cm->get('inc_dir') . 'request_trigger.inc.php';
+include_once $cm->get('inc_dir').'request_trigger.inc.php';
 
-if( !$categories = $cm->getCategories() )
+if (!$categories = $cm->getCategories())
 {
-	setcookie('webfxtab_manage-categories-pane', 0 );
-	$cm->addMessage( $cm->txt('Currently no categories available... JUST ADD A NEW ONE!'), 'global' );
+	setcookie('webfxtab_manage-categories-pane', 0);
+	$cm->addMessage($cm->txt('Currently no categories available... JUST ADD A NEW ONE!'), 'global');
 }
 
-$cm->renderView('main', $categories );
+$cm->renderView('main', $categories);
 return;