evolution-cms / evolution

manager/includes/mutate_settings.ajax.php

Spacing +7 added lines, -7 removed lines

@@ -3,9 +3,9 @@ 
  * mutate_settings.ajax.php
  * 
  */
-if(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 (IN_MANAGER_MODE != "true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
  
-require_once(dirname(__FILE__) . '/protect.inc.php');
+require_once(dirname(__FILE__).'/protect.inc.php');
 
 $action = preg_replace('/[^A-Za-z0-9_\-\.\/]/', '', $_POST['action']);
 $lang = preg_replace('/[^A-Za-z0-9_\s\+\-\.\/]/', '', $_POST['lang']);
@@ -20,10 +20,10 @@ 
 $str = '';
 $emptyCache = false;
 
-switch(true){
-    case ($action == 'get' && preg_match('/^[A-z0-9_-]+$/',$lang) && file_exists(dirname(__FILE__) . '/lang/'.$lang.'.inc.php')):{
-        include(dirname(__FILE__) . '/lang/'.$lang.'.inc.php');
-        $str = isset($key,$_lang,$_lang[$key]) ? $_lang[$key] : "" ;
+switch (true) {
+    case ($action == 'get' && preg_match('/^[A-z0-9_-]+$/', $lang) && file_exists(dirname(__FILE__).'/lang/'.$lang.'.inc.php')):{
+        include(dirname(__FILE__).'/lang/'.$lang.'.inc.php');
+        $str = isset($key, $_lang, $_lang[$key]) ? $_lang[$key] : "";
         break;
     }
     case ($action == 'setsetting' && !empty($key) && !empty($value)):{
@@ -50,7 +50,7 @@ 
     }
 }
 
-if($emptyCache) {
+if ($emptyCache) {
 	$modx->clearCache('full');
 }
 

manager/includes/preload.functions.inc.php

Spacing +7 added lines, -7 removed lines

@@ -3,10 +3,10 @@ 
 global $site_sessionname;

 $site_sessionname = genEvoSessionName(); // For legacy extras not using startCMSSession

 

-function genEvoSessionName() {

+function genEvoSessionName(){

     $_ = crc32(__FILE__);

     $_ = sprintf('%u', $_);

-    return 'evo' . base_convert($_,10,36);

+    return 'evo'.base_convert($_, 10, 36);

 }

 

 function startCMSSession(){

@@ -15,7 +15,7 @@ 
     

     session_name($site_sessionname);

     removeInvalidCmsSessionIds($site_sessionname);

-    $cookieExpiration= 0;

+    $cookieExpiration = 0;

     $secure = ((isset ($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') || $_SERVER['SERVER_PORT'] == $https_port);

     $cookiePath = !empty($session_cookie_path) ? $session_cookie_path : MODX_BASE_URL;

     $cookieDomain = !empty($session_cookie_domain) ? $session_cookie_domain : '';

@@ -24,8 +24,8 @@ 
 

     $key = "modx.{$context}.session.cookie.lifetime";

     if (isset($_SESSION[$key]) && is_numeric($_SESSION[$key])) {

-        $cookieLifetime= intval($_SESSION[$key]);

-        if($cookieLifetime) $cookieExpiration = $_SERVER['REQUEST_TIME']+$cookieLifetime;

+        $cookieLifetime = intval($_SESSION[$key]);

+        if ($cookieLifetime) $cookieExpiration = $_SERVER['REQUEST_TIME'] + $cookieLifetime;

         setcookie(session_name(), session_id(), $cookieExpiration, $cookiePath, $cookieDomain, $secure, true);

     }

     if (!isset($_SESSION['modx.session.created.time'])) {

@@ -33,14 +33,14 @@ 
     }

 }

 

-function removeInvalidCmsSessionFromStorage(&$storage, $session_name) {

+function removeInvalidCmsSessionFromStorage(&$storage, $session_name){

     if (isset($storage[$session_name]) && ($storage[$session_name] === '' || $storage[$session_name] === 'deleted'))

     {

     unset($storage[$session_name]);

     }

 }

 

-function removeInvalidCmsSessionIds($session_name) {

+function removeInvalidCmsSessionIds($session_name){

     // session ids is invalid iff it is empty string

     // storage priorioty can see in PHP source ext/session/session.c

     removeInvalidCmsSessionFromStorage($_COOKIE, $session_name);

manager/includes/categories.inc.php

Spacing +8 added lines, -8 removed lines

@@ -3,7 +3,7 @@ 
 //Kyle Jaebker - 08/07/06
 
 //Create a new category
-function newCategory($newCat) {
+function newCategory($newCat){
     global $modx;
     $useTable = $modx->getFullTableName('categories');
     $categoryId = $modx->db->insert(
@@ -14,36 +14,36 @@ 
     return $categoryId;
 }
 //check if new category already exists
-function checkCategory($newCat = '') {
+function checkCategory($newCat = ''){
     global $modx;
     $useTable = $modx->getFullTableName('categories');
     $newCat = $modx->db->escape($newCat);
     $cats = $modx->db->select('id', $modx->getFullTableName('categories'), "category='{$newCat}'");
-	if($cat = $modx->db->getValue($cats)) {
+	if ($cat = $modx->db->getValue($cats)) {
 		return $cat;
 	}
     return 0;
 }
 //Check for category, create new if not exists
-function getCategory($category='') {
+function getCategory($category = ''){
     $categoryId = checkCategory($category);
-    if(!$categoryId) $categoryId = newCategory($category);
+    if (!$categoryId) $categoryId = newCategory($category);
     return $categoryId;
 }
 //Get all categories
-function getCategories() {
+function getCategories(){
     global $modx;
     $useTable = $modx->getFullTableName('categories');
     $cats = $modx->db->select('id, category', $modx->getFullTableName('categories'), '', 'category');
 	$resourceArray = array();
-    while($row = $modx->db->getRow($cats)) {
+    while ($row = $modx->db->getRow($cats)) {
         $row['category'] = stripslashes($row['category']);
         $resourceArray[] = $row;
     }
     return $resourceArray;
 }
 //Delete category & associations
-function deleteCategory($catId=0) {
+function deleteCategory($catId = 0){
     global $modx;
     if ($catId) {
         $resetTables = array('site_plugins', 'site_snippets', 'site_htmlsnippets', 'site_templates', 'site_tmplvars', 'site_modules');

manager/includes/protect.inc.php

Spacing +11 added lines, -11 removed lines

@@ -10,13 +10,13 @@ 
     die();
 
 global $sanitize_seed;
-$sanitize_seed = 'sanitize_seed_' . base_convert(md5(__FILE__),16,36);
+$sanitize_seed = 'sanitize_seed_'.base_convert(md5(__FILE__), 16, 36);
 
 // sanitize array
 if (!function_exists('modx_sanitize_gpc')) {
-    function modx_sanitize_gpc(& $values, $depth=0) {
-        if(200 < $depth) exit('GPC Array nested too deep!');
-        if(is_array($values)) {
+    function modx_sanitize_gpc(& $values, $depth = 0){
+        if (200 < $depth) exit('GPC Array nested too deep!');
+        if (is_array($values)) {
             $depth++;
             foreach ($values as $key => $value) {
                 if (is_array($value)) modx_sanitize_gpc($value, $depth);
@@ -29,16 +29,16 @@ 
     }
 }
 
-function getSanitizedValue($value='') {
+function getSanitizedValue($value = ''){
     global $sanitize_seed;
     
-    if(!$value) return $value;
+    if (!$value) return $value;
     
     $brackets = explode(' ', '[[ ]] [! !] [* *] [( )] {{ }} [+ +] [~ ~] [^ ^]');
-    foreach($brackets as $bracket) {
-        if(strpos($value,$bracket)===false) continue;
-        $sanitizedBracket = str_replace('#', $sanitize_seed, sprintf('#%s#%s#', substr($bracket,0,1), substr($bracket,1,1)));
-        $value = str_replace($bracket,$sanitizedBracket,$value);
+    foreach ($brackets as $bracket) {
+        if (strpos($value, $bracket) === false) continue;
+        $sanitizedBracket = str_replace('#', $sanitize_seed, sprintf('#%s#%s#', substr($bracket, 0, 1), substr($bracket, 1, 1)));
+        $value = str_replace($bracket, $sanitizedBracket, $value);
     }
     $value = str_ireplace('<script', 'sanitized_by_modx<s cript', $value);
     $value = preg_replace('/&#(\d+);/', 'sanitized_by_modx& #$1', $value);
@@ -52,7 +52,7 @@ 
 modx_sanitize_gpc($_COOKIE);
 modx_sanitize_gpc($_REQUEST);
 
-foreach (array ('PHP_SELF', 'HTTP_USER_AGENT', 'HTTP_REFERER', 'QUERY_STRING') as $key) {
+foreach (array('PHP_SELF', 'HTTP_USER_AGENT', 'HTTP_REFERER', 'QUERY_STRING') as $key) {
     $_SERVER[$key] = isset ($_SERVER[$key]) ? htmlspecialchars($_SERVER[$key], ENT_QUOTES) : null;
 }
 

manager/includes/messageCount.inc.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-if(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 (IN_MANAGER_MODE != "true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 
 $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID()." AND messageread=0");
 $nrnewmessages = $modx->db->getValue($rs);

manager/includes/error.class.inc.php

Spacing +15 added lines, -15 removed lines

@@ -5,7 +5,7 @@ 
 var $errorcode;
 var $errors = array();
 
-	function __construct() {
+	function __construct(){
 		
 		$_lang = $this->include_lang('errormsg');
 		
@@ -40,33 +40,33 @@ 
 	);
 	}
 
-	function include_lang($context='common') {
+	function include_lang($context = 'common'){
 		global $modx;
 		$_lang = array();
 		
-		$context = trim($context,'/');
-		if(strpos($context,'..')!==false) return;
+		$context = trim($context, '/');
+		if (strpos($context, '..') !== false) return;
 		
-		if($context === 'common')
-			$lang_path = MODX_MANAGER_PATH . 'includes/lang/';
+		if ($context === 'common')
+			$lang_path = MODX_MANAGER_PATH.'includes/lang/';
 		else
-			$lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
-		include_once($lang_path . 'english.inc.php');
+			$lang_path = MODX_MANAGER_PATH."includes/lang/{$context}/";
+		include_once($lang_path.'english.inc.php');
 		$manager_language = $modx->config['manager_language'];
-		if(is_file("{$lang_path}{$manager_language}.inc.php"))
+		if (is_file("{$lang_path}{$manager_language}.inc.php"))
 			include_once("{$lang_path}{$manager_language}.inc.php");
 		return $_lang;
 	}
 	
-	function setError($errorcode, $custommessage=""){
-		$this->errorcode=$errorcode;
-		$this->errormessage=$this->errors[$errorcode];
-		if($custommessage!="") {
-			$this->errormessage=$custommessage;
+	function setError($errorcode, $custommessage = ""){
+		$this->errorcode = $errorcode;
+		$this->errormessage = $this->errors[$errorcode];
+		if ($custommessage != "") {
+			$this->errormessage = $custommessage;
 		}
 	}	
 	
-	function getError() {
+	function getError(){
 		return $this->errorcode;
 	}
 	

manager/includes/veriword.php

Spacing +33 added lines, -33 removed lines

@@ -7,7 +7,7 @@ 
 $modx->db->connect();
 $modx->getSettings();
 
-$vword = new VeriWord(148,60);
+$vword = new VeriWord(148, 60);
 $vword->output_image();
 $vword->destroy_image();
 
@@ -43,7 +43,7 @@ 
 ## see sample.php for test and usage
 ## sample URL: http://www.program-ruti.org/veriword/
 ####
-class VeriWord {
+class VeriWord{
 
     /* path to font directory*/
     var $dir_font   = "ttf/";
@@ -53,45 +53,45 @@ 
     var $im_width   = 0;
     var $im_height  = 0;
 
-    function __construct($w=200, $h=80) {
+    function __construct($w = 200, $h = 80){
         /* create session to set word for verification */
         startCMSSession();
         $this->set_veriword();
-        $this->dir_font = dirname(__FILE__) . '/' . $this->dir_font;
+        $this->dir_font = dirname(__FILE__).'/'.$this->dir_font;
         $this->im_width         = $w;
         $this->im_height        = $h;
     }
 
-    function set_veriword() {   
+    function set_veriword(){   
         /* create session variable for verification, 
            you may change the session variable name */
         $this->word             = $this->pick_word();   
         $_SESSION['veriword']   = $this->word;
     }
 
-    function output_image() {
+    function output_image(){
         /* output the image as jpeg */  
         $this->draw_image();
         header("Content-type: image/jpeg");
         imagejpeg($this->im);
     }
 
-    function pick_word() {
+    function pick_word(){
         global $modx;
         // 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);
     }   
 
-    function draw_text() {        
+    function draw_text(){        
         $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;
             }
         }
@@ -99,35 +99,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,
@@ -143,19 +143,19 @@ 
     }
 
 
-    function draw_image() {
+    function draw_image(){
         
         /* pick one background image randomly from image directory */
-        $img_file       = $this->dir_noise."noise".rand(1,4).".jpg";
+        $img_file       = $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, 
@@ -164,17 +164,17 @@ 
                             $noise_height);
 
         /* put text image into background image */
-        imagecopymerge (    $this->im, 
+        imagecopymerge($this->im, 
                             $this->draw_text(), 
                             0, 0, 0, 0, 
                             $this->im_width, 
                             $this->im_height, 
-                            70 );
+                            70);
 
         return $this->im;
     }
 
-    function destroy_image() {
+    function destroy_image(){
 
         imagedestroy($this->im);
 

manager/includes/user_settings.inc.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if(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 (IN_MANAGER_MODE != "true") die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 
 // START HACK
 if (isset ($modx)) {
@@ -15,7 +15,7 @@ 
 
 	$which_browser_default = $which_browser;
 	while ($row = $modx->db->getRow($rs)) {
-		if($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') $row['setting_value'] = $which_browser_default;
+		if ($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') $row['setting_value'] = $which_browser_default;
 		$settings[$row['setting_name']] = $row['setting_value'];
 		if (isset($modx->config)) {
 			$modx->config[$row['setting_name']] = $row['setting_value'];

manager/includes/active_user_locks.inc.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         var stay = document.getElementById('stay');
         // Trigger unlock
         if ((stay && stay.value !== '2') || !form_save) {
-          var url = '<?php echo MODX_MANAGER_URL; ?>?a=67&type=<?php echo $lockElementType;?>&id=<?php echo $lockElementId;?>&o=' + Math.random();
+          var url = '<?php echo MODX_MANAGER_URL; ?>?a=67&type=<?php echo $lockElementType; ?>&id=<?php echo $lockElementId; ?>&o=' + Math.random();
           if (navigator.sendBeacon) {
             navigator.sendBeacon(url)
           } else {