Completed
Push — develop ( 923a1c...1e9876 )
by Maxim
47s queued 29s
created
install/actions/action_connection.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@  discard block
 block discarded – undo
1 1
 <?php
2
-$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
2
+$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0;
3 3
 
4 4
 // Determine upgradeability
5
-$upgradeable= 0;
5
+$upgradeable = 0;
6 6
 if ($installMode === 0) {
7
-    $database_name= '';
8
-    $database_server= 'localhost';
9
-    $table_prefix= substr(md5(time()), rand(0, 27), rand(3, 5))."_";
7
+    $database_name = '';
8
+    $database_server = 'localhost';
9
+    $table_prefix = substr(md5(time()), rand(0, 27), rand(3, 5))."_";
10 10
 } else {
11 11
     $database_name = '';
12 12
     if (!is_file($base_path.MGR_DIR.'/includes/config.inc.php')) $upgradeable = 0;
@@ -17,13 +17,13 @@  discard block
 block discarded – undo
17 17
         if ($dbase) {
18 18
           $database_name = trim($dbase, '`');
19 19
           if (!$conn = mysqli_connect($database_server, $database_user, $database_password))
20
-              $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
21
-          elseif (! mysqli_select_db($conn, trim($dbase, '`')))
22
-              $upgradeable = (isset($_POST['installmode']) && $_POST['installmode']=='new') ? 0 : 2;
20
+              $upgradeable = (isset($_POST['installmode']) && $_POST['installmode'] == 'new') ? 0 : 2;
21
+          elseif (!mysqli_select_db($conn, trim($dbase, '`')))
22
+              $upgradeable = (isset($_POST['installmode']) && $_POST['installmode'] == 'new') ? 0 : 2;
23 23
           else
24 24
               $upgradeable = 1;
25 25
         }
26
-        else $upgradable= 2;
26
+        else $upgradable = 2;
27 27
     }
28 28
 }
29 29
 
@@ -49,33 +49,33 @@  discard block
 block discarded – undo
49 49
     $database_connection_method = 'SET CHARACTER SET';
50 50
 }
51 51
 
52
-$ph['database_name'] = isset($_POST['database_name']) ? $_POST['database_name']: $database_name;
53
-$ph['tableprefix'] = isset($_POST['tableprefix']) ? $_POST['tableprefix']: $table_prefix;
52
+$ph['database_name'] = isset($_POST['database_name']) ? $_POST['database_name'] : $database_name;
53
+$ph['tableprefix'] = isset($_POST['tableprefix']) ? $_POST['tableprefix'] : $table_prefix;
54 54
 $ph['selected_set_character_set'] = isset($database_connection_method) && $database_connection_method == 'SET CHARACTER SET' ? 'selected' : '';
55 55
 $ph['selected_set_names'] = isset($database_connection_method) && $database_connection_method == 'SET NAMES' ? 'selected' : '';
56 56
 $ph['show#connection_method'] = (($installMode == 0) || ($installMode == 2)) ? 'block' : 'none';
57
-$ph['database_collation'] = isset($_POST['database_collation']) ? $_POST['database_collation']: $database_collation;
58
-$ph['show#AUH'] = ($installMode == 0) ? 'block':'none';
59
-$ph['cmsadmin'] = isset($_POST['cmsadmin']) ? $_POST['cmsadmin']:'admin';
60
-$ph['cmsadminemail'] = isset($_POST['cmsadminemail']) ? $_POST['cmsadminemail']:"";
61
-$ph['cmspassword'] = isset($_POST['cmspassword']) ? $_POST['cmspassword']:"";
62
-$ph['cmspasswordconfirm'] = isset($_POST['cmspasswordconfirm']) ? $_POST['cmspasswordconfirm']:"";
57
+$ph['database_collation'] = isset($_POST['database_collation']) ? $_POST['database_collation'] : $database_collation;
58
+$ph['show#AUH'] = ($installMode == 0) ? 'block' : 'none';
59
+$ph['cmsadmin'] = isset($_POST['cmsadmin']) ? $_POST['cmsadmin'] : 'admin';
60
+$ph['cmsadminemail'] = isset($_POST['cmsadminemail']) ? $_POST['cmsadminemail'] : "";
61
+$ph['cmspassword'] = isset($_POST['cmspassword']) ? $_POST['cmspassword'] : "";
62
+$ph['cmspasswordconfirm'] = isset($_POST['cmspasswordconfirm']) ? $_POST['cmspasswordconfirm'] : "";
63 63
 $ph['managerLangs'] = getLangs($install_language);
64 64
 $ph['install_language'] = $install_language;
65 65
 $ph['installMode'] = $installMode;
66
-$ph['checkedChkagree']  = isset($_POST['chkagree']) ? 'checked':"";
66
+$ph['checkedChkagree']  = isset($_POST['chkagree']) ? 'checked' : "";
67 67
 $ph['database_connection_method'] = isset($database_connection_method) ? $database_connection_method : '';
68
-$ph['databasehost'] = isset($_POST['databasehost']) ? $_POST['databasehost']: $database_server;
69
-$ph['databaseloginname'] = isset($_SESSION['databaseloginname']) ? $_SESSION['databaseloginname']: '';
70
-$ph['databaseloginpassword'] = isset($_SESSION['databaseloginpassword']) ? $_SESSION['databaseloginpassword']: "";
68
+$ph['databasehost'] = isset($_POST['databasehost']) ? $_POST['databasehost'] : $database_server;
69
+$ph['databaseloginname'] = isset($_SESSION['databaseloginname']) ? $_SESSION['databaseloginname'] : '';
70
+$ph['databaseloginpassword'] = isset($_SESSION['databaseloginpassword']) ? $_SESSION['databaseloginpassword'] : "";
71 71
 $ph['MGR_DIR'] = MGR_DIR;
72 72
 
73 73
 $content = file_get_contents('./actions/tpl_connection.html');
74
-$content = parse($content, $_lang, '[%','%]');
74
+$content = parse($content, $_lang, '[%', '%]');
75 75
 $content = parse($content, $ph);
76 76
 echo $content;
77 77
 
78
-if( ! function_exists('getLangs')) {
78
+if (!function_exists('getLangs')) {
79 79
     /**
80 80
      * @param $install_language
81 81
      * @return string
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
         }
90 90
 
91 91
         $langs = array();
92
-        if ($handle = opendir("../" . MGR_DIR . "/includes/lang")) {
92
+        if ($handle = opendir("../".MGR_DIR."/includes/lang")) {
93 93
             while (false !== ($file = readdir($handle))) {
94 94
                 if (strpos($file, '.inc.') !== false) {
95 95
                     $langs[] = $file;
Please login to merge, or discard this patch.
manager/processors/delete_htmlsnippet.processor.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2
-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.");
3
-if(!$modx->hasPermission('delete_snippet')) {
2
+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.");
3
+if (!$modx->hasPermission('delete_snippet')) {
4 4
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
5 5
 }
6 6
 
7
-$id = isset($_GET['id'])? intval($_GET['id']) : 0;
8
-if($id==0) {
7
+$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
8
+if ($id == 0) {
9 9
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
10 10
 }
11 11
 
@@ -32,5 +32,5 @@  discard block
 block discarded – undo
32 32
 $modx->clearCache('full');
33 33
 
34 34
 // finished emptying cache - redirect
35
-$header="Location: index.php?a=76&r=2";
35
+$header = "Location: index.php?a=76&r=2";
36 36
 header($header);
Please login to merge, or discard this patch.
manager/actions/help/version_notices/1.1.1.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-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.");
2
+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.");
3 3
 ?>
4 4
 <p></p>
5 5
 <h1>Resource-Tree</h1>
Please login to merge, or discard this patch.
manager/actions/help/version_notices/1.3.1.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-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.");
2
+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.");
3 3
 ?>
4 4
 <p></p>
5 5
 <ul>
Please login to merge, or discard this patch.
manager/actions/help/version_notices/1.3.2.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-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.");
2
+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.");
3 3
 ?>
4 4
 <p></p>
5 5
 <ul>
Please login to merge, or discard this patch.
manager/actions/help/version_notices/1.3.5.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-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.");
2
+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.");
3 3
 ?>
4 4
 <p></p>
5 5
 <ul>
Please login to merge, or discard this patch.
manager/actions/help/version_notices/1.3.3.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-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.");
2
+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.");
3 3
 ?>
4 4
 <p></p>
5 5
 <ul>
Please login to merge, or discard this patch.
manager/includes/veriword.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 $modx->db->connect();
8 8
 $modx->getSettings();
9 9
 
10
-$vword = new VeriWord(148,60);
10
+$vword = new VeriWord(148, 60);
11 11
 $vword->output_image();
12 12
 $vword->destroy_image();
13 13
 
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 ## see sample.php for test and usage
44 44
 ## sample URL: http://www.program-ruti.org/veriword/
45 45
 ####
46
-class VeriWord {
46
+class VeriWord{
47 47
 
48 48
     /* path to font directory*/
49 49
     var $dir_font   = "ttf/";
@@ -53,45 +53,45 @@  discard block
 block discarded – undo
53 53
     var $im_width   = 0;
54 54
     var $im_height  = 0;
55 55
 
56
-    function __construct($w=200, $h=80) {
56
+    function __construct($w = 200, $h = 80){
57 57
         /* create session to set word for verification */
58 58
         startCMSSession();
59 59
         $this->set_veriword();
60
-        $this->dir_font = dirname(__FILE__) . '/' . $this->dir_font;
60
+        $this->dir_font = dirname(__FILE__).'/'.$this->dir_font;
61 61
         $this->im_width         = $w;
62 62
         $this->im_height        = $h;
63 63
     }
64 64
 
65
-    function set_veriword() {
65
+    function set_veriword(){
66 66
         /* create session variable for verification,
67 67
            you may change the session variable name */
68 68
         $this->word             = $this->pick_word();
69 69
         $_SESSION['veriword']   = $this->word;
70 70
     }
71 71
 
72
-    function output_image() {
72
+    function output_image(){
73 73
         /* output the image as jpeg */
74 74
         $this->draw_image();
75 75
         header("Content-type: image/jpeg");
76 76
         imagejpeg($this->im);
77 77
     }
78 78
 
79
-    function pick_word() {
79
+    function pick_word(){
80 80
         global $modx;
81 81
         // set default words
82
-        $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";
82
+        $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";
83 83
         $words = $modx->config['captcha_words'] ? $modx->config['captcha_words'] : $words;
84 84
         $arr_words = array_filter(array_map('trim', explode(',', $words)));
85 85
 
86 86
         /* pick one randomly for text verification */
87
-        return (string) $arr_words[array_rand($arr_words)].rand(10,999);
87
+        return (string) $arr_words[array_rand($arr_words)].rand(10, 999);
88 88
     }
89 89
 
90
-    function draw_text() {
90
+    function draw_text(){
91 91
         $dir = dir($this->dir_font);
92 92
         $fontstmp = array();
93 93
         while (false !== ($file = $dir->read())) {
94
-            if(substr($file, -4) == '.ttf') {
94
+            if (substr($file, -4) == '.ttf') {
95 95
                 $fontstmp[] = $this->dir_font.$file;
96 96
             }
97 97
         }
@@ -99,35 +99,35 @@  discard block
 block discarded – undo
99 99
         $text_font = (string) $fontstmp[array_rand($fontstmp)];
100 100
 
101 101
         /* angle for text inclination */
102
-        $text_angle = rand(-9,9);
102
+        $text_angle = rand(-9, 9);
103 103
         /* initial text size */
104 104
         $text_size  = 30;
105 105
         /* calculate text width and height */
106
-        $box        = imagettfbbox ( $text_size, $text_angle, $text_font, $this->word);
107
-        $text_width = $box[2]-$box[0]; //text width
108
-        $text_height= $box[5]-$box[3]; //text height
106
+        $box        = imagettfbbox($text_size, $text_angle, $text_font, $this->word);
107
+        $text_width = $box[2] - $box[0]; //text width
108
+        $text_height = $box[5] - $box[3]; //text height
109 109
 
110 110
         /* adjust text size */
111
-        $text_size  = round((20 * $this->im_width)/$text_width);
111
+        $text_size  = round((20 * $this->im_width) / $text_width);
112 112
 
113 113
         /* recalculate text width and height */
114
-        $box        = imagettfbbox ( $text_size, $text_angle, $text_font, $this->word);
115
-        $text_width = $box[2]-$box[0]; //text width
116
-        $text_height= $box[5]-$box[3]; //text height
114
+        $box        = imagettfbbox($text_size, $text_angle, $text_font, $this->word);
115
+        $text_width = $box[2] - $box[0]; //text width
116
+        $text_height = $box[5] - $box[3]; //text height
117 117
 
118 118
         /* calculate center position of text */
119
-        $text_x         = ($this->im_width - $text_width)/2;
120
-        $text_y         = ($this->im_height - $text_height)/2;
119
+        $text_x         = ($this->im_width - $text_width) / 2;
120
+        $text_y         = ($this->im_height - $text_height) / 2;
121 121
 
122 122
         /* create canvas for text drawing */
123
-        $im_text        = imagecreate ($this->im_width, $this->im_height);
124
-        $bg_color       = imagecolorallocate ($im_text, 255, 255, 255);
123
+        $im_text        = imagecreate($this->im_width, $this->im_height);
124
+        $bg_color       = imagecolorallocate($im_text, 255, 255, 255);
125 125
 
126 126
         /* pick color for text */
127
-        $text_color     = imagecolorallocate ($im_text, 0, 51, 153);
127
+        $text_color     = imagecolorallocate($im_text, 0, 51, 153);
128 128
 
129 129
         /* draw text into canvas */
130
-        imagettftext    (   $im_text,
130
+        imagettftext($im_text,
131 131
                             $text_size,
132 132
                             $text_angle,
133 133
                             $text_x,
@@ -143,19 +143,19 @@  discard block
 block discarded – undo
143 143
     }
144 144
 
145 145
 
146
-    function draw_image() {
146
+    function draw_image(){
147 147
 
148 148
         /* pick one background image randomly from image directory */
149
-        $img_file       = $this->dir_noise."noise".rand(1,4).".jpg";
149
+        $img_file       = $this->dir_noise."noise".rand(1, 4).".jpg";
150 150
 
151 151
         /* create "noise" background image from your image stock*/
152
-        $noise_img      = @imagecreatefromjpeg ($img_file);
152
+        $noise_img      = @imagecreatefromjpeg($img_file);
153 153
         $noise_width    = imagesx($noise_img);
154 154
         $noise_height   = imagesy($noise_img);
155 155
 
156 156
         /* resize the background image to fit the size of image output */
157
-        $this->im       = imagecreatetruecolor($this->im_width,$this->im_height);
158
-        imagecopyresampled ($this->im,
157
+        $this->im       = imagecreatetruecolor($this->im_width, $this->im_height);
158
+        imagecopyresampled($this->im,
159 159
                             $noise_img,
160 160
                             0, 0, 0, 0,
161 161
                             $this->im_width,
@@ -164,17 +164,17 @@  discard block
 block discarded – undo
164 164
                             $noise_height);
165 165
 
166 166
         /* put text image into background image */
167
-        imagecopymerge (    $this->im,
167
+        imagecopymerge($this->im,
168 168
                             $this->draw_text(),
169 169
                             0, 0, 0, 0,
170 170
                             $this->im_width,
171 171
                             $this->im_height,
172
-                            70 );
172
+                            70);
173 173
 
174 174
         return $this->im;
175 175
     }
176 176
 
177
-    function destroy_image() {
177
+    function destroy_image(){
178 178
 
179 179
         imagedestroy($this->im);
180 180
 
Please login to merge, or discard this patch.
manager/includes/extenders/maketable.class.php 1 patch
Spacing   +124 added lines, -124 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
  *
9 9
  * @author Jason Coward <[email protected]> (MODX)
10 10
  */
11
-class MakeTable {
11
+class MakeTable{
12 12
 	var $actionField;
13 13
 	var $cellAction;
14 14
 	var $linkAction;
@@ -31,26 +31,26 @@  discard block
 block discarded – undo
31 31
 	var $columnWidths;
32 32
 	var $selectedValues;
33 33
 
34
-	function __construct() {
35
-		$this->fieldHeaders= array();
36
-		$this->excludeFields= array();
37
-		$this->actionField= '';
38
-		$this->cellAction= '';
39
-		$this->linkAction= '';
40
-		$this->tableWidth= '';
41
-		$this->tableClass= '';
42
-		$this->rowHeaderClass= '';
43
-		$this->columnHeaderClass= '';
44
-		$this->rowRegularClass= '';
45
-		$this->rowAlternateClass= 'alt';
46
-		$this->formName= 'tableForm';
47
-		$this->formAction= '[~[*id*]~]';
48
-		$this->formElementName= '';
49
-		$this->formElementType= '';
50
-		$this->rowAlternatingScheme= 'EVEN';
51
-		$this->allOption= 0;
52
-		$this->selectedValues= array();
53
-		$this->extra= '';
34
+	function __construct(){
35
+		$this->fieldHeaders = array();
36
+		$this->excludeFields = array();
37
+		$this->actionField = '';
38
+		$this->cellAction = '';
39
+		$this->linkAction = '';
40
+		$this->tableWidth = '';
41
+		$this->tableClass = '';
42
+		$this->rowHeaderClass = '';
43
+		$this->columnHeaderClass = '';
44
+		$this->rowRegularClass = '';
45
+		$this->rowAlternateClass = 'alt';
46
+		$this->formName = 'tableForm';
47
+		$this->formAction = '[~[*id*]~]';
48
+		$this->formElementName = '';
49
+		$this->formElementType = '';
50
+		$this->rowAlternatingScheme = 'EVEN';
51
+		$this->allOption = 0;
52
+		$this->selectedValues = array();
53
+		$this->extra = '';
54 54
 	}
55 55
 
56 56
 	/**
@@ -58,8 +58,8 @@  discard block
 block discarded – undo
58 58
 	 *
59 59
 	 * @param $value A URL to execute when table cells are clicked.
60 60
 	 */
61
-	function setCellAction($value) {
62
-		$this->cellAction= $this->prepareLink($value);
61
+	function setCellAction($value){
62
+		$this->cellAction = $this->prepareLink($value);
63 63
 	}
64 64
 
65 65
 	/**
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
67 67
 	 *
68 68
 	 * @param $value A URL to execute when text within table cells are clicked.
69 69
 	 */
70
-	function setLinkAction($value) {
71
-		$this->linkAction= $this->prepareLink($value);
70
+	function setLinkAction($value){
71
+		$this->linkAction = $this->prepareLink($value);
72 72
 	}
73 73
 
74 74
 	/**
@@ -76,8 +76,8 @@  discard block
 block discarded – undo
76 76
 	 *
77 77
 	 * @param $value A valid width attribute for the HTML TABLE tag
78 78
 	 */
79
-	function setTableWidth($value) {
80
-		$this->tableWidth= $value;
79
+	function setTableWidth($value){
80
+		$this->tableWidth = $value;
81 81
 	}
82 82
 
83 83
 	/**
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
 	 *
86 86
 	 * @param $value A class for the main HTML TABLE.
87 87
 	 */
88
-	function setTableClass($value) {
89
-		$this->tableClass= $value;
88
+	function setTableClass($value){
89
+		$this->tableClass = $value;
90 90
 	}
91 91
 
92 92
 	/**
@@ -94,8 +94,8 @@  discard block
 block discarded – undo
94 94
 	 *
95 95
 	 * @param $value A class for the main HTML TABLE.
96 96
 	 */
97
-	function setTableID($value) {
98
-		$this->tableID= $value;
97
+	function setTableID($value){
98
+		$this->tableID = $value;
99 99
 	}
100 100
 
101 101
 	/**
@@ -103,8 +103,8 @@  discard block
 block discarded – undo
103 103
 	 *
104 104
 	 * @param $value A class for the table header row.
105 105
 	 */
106
-	function setRowHeaderClass($value) {
107
-		$this->rowHeaderClass= $value;
106
+	function setRowHeaderClass($value){
107
+		$this->rowHeaderClass = $value;
108 108
 	}
109 109
 
110 110
 		/**
@@ -112,8 +112,8 @@  discard block
 block discarded – undo
112 112
 	 *
113 113
 	 * @param $value A class for the table header row.
114 114
 	 */
115
-	function setThHeaderClass($value) {
116
-		$this->thClass= $value;
115
+	function setThHeaderClass($value){
116
+		$this->thClass = $value;
117 117
 	}
118 118
 
119 119
 	/**
@@ -121,8 +121,8 @@  discard block
 block discarded – undo
121 121
 	 *
122 122
 	 * @param $value A class for the column header row.
123 123
 	 */
124
-	function setColumnHeaderClass($value) {
125
-		$this->columnHeaderClass= $value;
124
+	function setColumnHeaderClass($value){
125
+		$this->columnHeaderClass = $value;
126 126
 	}
127 127
 
128 128
 	/**
@@ -130,8 +130,8 @@  discard block
 block discarded – undo
130 130
 	 *
131 131
 	 * @param $value A class for regular table rows.
132 132
 	 */
133
-	function setRowRegularClass($value) {
134
-		$this->rowRegularClass= $value;
133
+	function setRowRegularClass($value){
134
+		$this->rowRegularClass = $value;
135 135
 	}
136 136
 
137 137
 	/**
@@ -139,8 +139,8 @@  discard block
 block discarded – undo
139 139
 	 *
140 140
 	 * @param $value A class for alternate table rows.
141 141
 	 */
142
-	function setRowAlternateClass($value) {
143
-		$this->rowAlternateClass= $value;
142
+	function setRowAlternateClass($value){
143
+		$this->rowAlternateClass = $value;
144 144
 	}
145 145
 
146 146
 	/**
@@ -148,8 +148,8 @@  discard block
 block discarded – undo
148 148
 	 *
149 149
 	 * @param $value Indicates the INPUT form element type attribute.
150 150
 	 */
151
-	function setFormElementType($value) {
152
-		$this->formElementType= $value;
151
+	function setFormElementType($value){
152
+		$this->formElementType = $value;
153 153
 	}
154 154
 
155 155
 	/**
@@ -157,8 +157,8 @@  discard block
 block discarded – undo
157 157
 	 *
158 158
 	 * @param $value Indicates the INPUT form element name attribute.
159 159
 	 */
160
-	function setFormElementName($value) {
161
-		$this->formElementName= $value;
160
+	function setFormElementName($value){
161
+		$this->formElementName = $value;
162 162
 	}
163 163
 
164 164
 	/**
@@ -167,8 +167,8 @@  discard block
 block discarded – undo
167 167
 	 *
168 168
 	 * @param $value Indicates the FORM name attribute.
169 169
 	 */
170
-	function setFormName($value) {
171
-		$this->formName= $value;
170
+	function setFormName($value){
171
+		$this->formName = $value;
172 172
 	}
173 173
 
174 174
 	/**
@@ -176,8 +176,8 @@  discard block
 block discarded – undo
176 176
 	 *
177 177
 	 * @param $value Indicates the FORM action attribute.
178 178
 	 */
179
-	function setFormAction($value) {
180
-		$this->formAction= $value;
179
+	function setFormAction($value){
180
+		$this->formAction = $value;
181 181
 	}
182 182
 
183 183
 	/**
@@ -185,8 +185,8 @@  discard block
 block discarded – undo
185 185
 	 *
186 186
 	 * @param $value An Array of field keys to exclude from the table.
187 187
 	 */
188
-	function setExcludeFields($value) {
189
-		$this->excludeFields= $value;
188
+	function setExcludeFields($value){
189
+		$this->excludeFields = $value;
190 190
 	}
191 191
 
192 192
 	/**
@@ -194,8 +194,8 @@  discard block
 block discarded – undo
194 194
 	 *
195 195
 	 * @param $value 'ODD' or 'EVEN' to indicate the alternate row scheme.
196 196
 	 */
197
-	function setRowAlternatingScheme($value) {
198
-		$this->rowAlternatingScheme= $value;
197
+	function setRowAlternatingScheme($value){
198
+		$this->rowAlternatingScheme = $value;
199 199
 	}
200 200
 
201 201
 	/**
@@ -204,8 +204,8 @@  discard block
 block discarded – undo
204 204
 	 *
205 205
 	 * @param $value The key of the field to add as a query string parameter.
206 206
 	 */
207
-	function setActionFieldName($value) {
208
-		$this->actionField= $value;
207
+	function setActionFieldName($value){
208
+		$this->actionField = $value;
209 209
 	}
210 210
 
211 211
 	/**
@@ -214,8 +214,8 @@  discard block
 block discarded – undo
214 214
 	 * @param $value An Array of column widths in the order of the keys in the
215 215
 	 * 			source table array.
216 216
 	 */
217
-	function setColumnWidths($widthArray) {
218
-		$this->columnWidths= $widthArray;
217
+	function setColumnWidths($widthArray){
218
+		$this->columnWidths = $widthArray;
219 219
 	}
220 220
 
221 221
 	/**
@@ -223,8 +223,8 @@  discard block
 block discarded – undo
223 223
 	 *
224 224
 	 * @param $value Indicates the INPUT form element type attribute.
225 225
 	 */
226
-	function setSelectedValues($valueArray) {
227
-		$this->selectedValues= $valueArray;
226
+	function setSelectedValues($valueArray){
227
+		$this->selectedValues = $valueArray;
228 228
 	}
229 229
 
230 230
 	/**
@@ -233,8 +233,8 @@  discard block
 block discarded – undo
233 233
 	 *
234 234
 	 * @param $value A string of additional content.
235 235
 	 */
236
-	function setExtra($value) {
237
-		$this->extra= $value;
236
+	function setExtra($value){
237
+		$this->extra = $value;
238 238
 	}
239 239
 
240 240
 	/**
@@ -242,10 +242,10 @@  discard block
 block discarded – undo
242 242
 	 *
243 243
 	 * @param $columnPosition The index of the column to get the width for.
244 244
 	 */
245
-	function getColumnWidth($columnPosition) {
246
-		$currentWidth= '';
245
+	function getColumnWidth($columnPosition){
246
+		$currentWidth = '';
247 247
 		if (is_array($this->columnWidths)) {
248
-			$currentWidth= $this->columnWidths[$columnPosition] ? ' width="'.$this->columnWidths[$columnPosition].'" ' : '';
248
+			$currentWidth = $this->columnWidths[$columnPosition] ? ' width="'.$this->columnWidths[$columnPosition].'" ' : '';
249 249
 		}
250 250
 		return $currentWidth;
251 251
 	}
@@ -255,19 +255,19 @@  discard block
 block discarded – undo
255 255
 	 *
256 256
 	 * @param $value The position of the current row being rendered.
257 257
 	 */
258
-	function determineRowClass($position) {
258
+	function determineRowClass($position){
259 259
 		switch ($this->rowAlternatingScheme) {
260 260
 			case 'ODD' :
261
-				$modRemainder= 1;
261
+				$modRemainder = 1;
262 262
 				break;
263 263
 			case 'EVEN' :
264
-				$modRemainder= 0;
264
+				$modRemainder = 0;
265 265
 				break;
266 266
 		}
267 267
 		if ($position % 2 == $modRemainder) {
268
-			$currentClass= $this->rowRegularClass;
268
+			$currentClass = $this->rowRegularClass;
269 269
 		} else {
270
-			$currentClass= $this->rowAlternateClass;
270
+			$currentClass = $this->rowAlternateClass;
271 271
 		}
272 272
 		return ' class="'.$currentClass.'"';
273 273
 	}
@@ -278,9 +278,9 @@  discard block
 block discarded – undo
278 278
 	 *
279 279
 	 * @param $value Indicates the INPUT form element type attribute.
280 280
 	 */
281
-	function getCellAction($currentActionFieldValue) {
281
+	function getCellAction($currentActionFieldValue){
282 282
 		if ($this->cellAction) {
283
-			$cellAction= ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
283
+			$cellAction = ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
284 284
 		}
285 285
 		return $cellAction;
286 286
 	}
@@ -291,10 +291,10 @@  discard block
 block discarded – undo
291 291
 	 * @param $currentActionFieldValue The value to be applied to the link action.
292 292
 	 * @param $value The value of the cell.
293 293
 	 */
294
-	function createCellText($currentActionFieldValue, $value) {
294
+	function createCellText($currentActionFieldValue, $value){
295 295
 		$cell .= $value;
296 296
 		if ($this->linkAction) {
297
-			$cell= '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
297
+			$cell = '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
298 298
 		}
299 299
 		return $cell;
300 300
 	}
@@ -303,8 +303,8 @@  discard block
 block discarded – undo
303 303
 	 * Sets an option to generate a check all link when checkbox is indicated
304 304
 	 * as the table formElementType.
305 305
 	 */
306
-	function setAllOption() {
307
-		$this->allOption= 1;
306
+	function setAllOption(){
307
+		$this->allOption = 1;
308 308
 	}
309 309
 
310 310
 	/**
@@ -312,11 +312,11 @@  discard block
 block discarded – undo
312 312
 	 *
313 313
 	 * @param $value Indicates the INPUT form element type attribute.
314 314
 	 */
315
-	function prepareLink($link) {
315
+	function prepareLink($link){
316 316
 		if (strstr($link, '?')) {
317
-			$end= '&';
317
+			$end = '&';
318 318
 		} else {
319
-			$end= '?';
319
+			$end = '?';
320 320
 		}
321 321
 		return $link.$end;
322 322
 	}
@@ -331,20 +331,20 @@  discard block
 block discarded – undo
331 331
 	 * the $fieldsArray where the values represent the alt heading content
332 332
 	 * for each column.
333 333
 	 */
334
-	function create($fieldsArray, $fieldHeadersArray=array(),$linkpage="") {
334
+	function create($fieldsArray, $fieldHeadersArray = array(), $linkpage = ""){
335 335
 	global $_lang;
336 336
 		if (is_array($fieldsArray)) {
337
-			$i= 0;
337
+			$i = 0;
338 338
 			foreach ($fieldsArray as $fieldName => $fieldValue) {
339 339
 				$table .= "\t<tr".$this->determineRowClass($i).">\n";
340
-				$currentActionFieldValue= $fieldValue[$this->actionField];
340
+				$currentActionFieldValue = $fieldValue[$this->actionField];
341 341
 				if (is_array($this->selectedValues)) {
342
-					$isChecked= array_search($currentActionFieldValue, $this->selectedValues)===false? 0 : 1;
342
+					$isChecked = array_search($currentActionFieldValue, $this->selectedValues) === false ? 0 : 1;
343 343
 				} else {
344
-					$isChecked= false;
344
+					$isChecked = false;
345 345
 				}
346 346
 				$table .= $this->addFormField($currentActionFieldValue, $isChecked);
347
-				$colPosition= 0;
347
+				$colPosition = 0;
348 348
 				foreach ($fieldValue as $key => $value) {
349 349
 					if (!in_array($key, $this->excludeFields)) {
350 350
 						$table .= "\t\t<td".$this->getCellAction($currentActionFieldValue).">";
@@ -352,20 +352,20 @@  discard block
 block discarded – undo
352 352
 						$table .= "</td>\n";
353 353
 						if ($i == 0) {
354 354
 							if (empty ($header) && $this->formElementType) {
355
-								$header .= "\t\t<th style=\"width:32px\" ".($this->thClass ? 'class="'.$this->thClass.'"' : '').">". ($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '')."</th>\n";
355
+								$header .= "\t\t<th style=\"width:32px\" ".($this->thClass ? 'class="'.$this->thClass.'"' : '').">".($this->allOption ? '<a href="javascript:clickAll()">all</a>' : '')."</th>\n";
356 356
 							}
357
-							$headerText= array_key_exists($key, $fieldHeadersArray)? $fieldHeadersArray[$key]: $key;
357
+							$headerText = array_key_exists($key, $fieldHeadersArray) ? $fieldHeadersArray[$key] : $key;
358 358
 							$header .= "\t\t<th".$this->getColumnWidth($colPosition).($this->thClass ? ' class="'.$this->thClass.'" ' : '').">".$headerText."</th>\n";
359 359
 						}
360
-						$colPosition ++;
360
+						$colPosition++;
361 361
 					}
362 362
 				}
363
-				$i ++;
363
+				$i++;
364 364
 				$table .= "\t</tr>\n";
365 365
 			}
366
-			$table= "\n".'<table'. ($this->tableWidth ? ' width="'.$this->tableWidth.'"' : ''). ($this->tableClass ? ' class="'.$this->tableClass.'"' : ''). ($this->tableID ? ' id="'.$this->tableID.'"' : '').">\n". ($header ? "\t<thead>\n\t<tr class=\"".$this->rowHeaderClass."\">\n".$header."\t</tr>\n\t</thead>\n" : '').$table."</table>\n";
366
+			$table = "\n".'<table'.($this->tableWidth ? ' width="'.$this->tableWidth.'"' : '').($this->tableClass ? ' class="'.$this->tableClass.'"' : '').($this->tableID ? ' id="'.$this->tableID.'"' : '').">\n".($header ? "\t<thead>\n\t<tr class=\"".$this->rowHeaderClass."\">\n".$header."\t</tr>\n\t</thead>\n" : '').$table."</table>\n";
367 367
 			if ($this->formElementType) {
368
-				$table= "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table;
368
+				$table = "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table;
369 369
 			}
370 370
 			if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
371 371
 				/* commented this part because of cookie
@@ -400,9 +400,9 @@  discard block
 block discarded – undo
400 400
 			}
401 401
 			if ($this->formElementType) {
402 402
 				if ($this->extra) {
403
-					$table.= "\n".$this->extra."\n";
403
+					$table .= "\n".$this->extra."\n";
404 404
 				}
405
-				$table.= "\n".'</form>'."\n";
405
+				$table .= "\n".'</form>'."\n";
406 406
 			}
407 407
 			return $table;
408 408
 		}
@@ -414,36 +414,36 @@  discard block
 block discarded – undo
414 414
 	 * @param $numRecords The number of records to show per page.
415 415
 	 * @param $qs An optional query string to be appended to the paging links
416 416
 	 */
417
-	function createPagingNavigation($numRecords, $qs='') {
417
+	function createPagingNavigation($numRecords, $qs = ''){
418 418
 		global $_lang;
419
-		$currentPage= (is_numeric($_GET['page']) ? $_GET['page'] : 1);
420
-		$numPages= ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
419
+		$currentPage = (is_numeric($_GET['page']) ? $_GET['page'] : 1);
420
+		$numPages = ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
421 421
 		if ($numPages > 1) {
422
-			$currentURL= empty($qs)? '': '?'.$qs;
422
+			$currentURL = empty($qs) ? '' : '?'.$qs;
423 423
 			if ($currentPage > 6) {
424 424
 				$nav .= $this->createPageLink($currentURL, 1, $_lang["pagination_table_first"]);
425 425
 			}
426 426
 			if ($currentPage != 1) {
427
-				$nav .= $this->createPageLink($currentURL, $currentPage -1, '&lt;&lt;');
427
+				$nav .= $this->createPageLink($currentURL, $currentPage - 1, '&lt;&lt;');
428 428
 			}
429
-			$offset= -4 + ($currentPage < 5 ? (5 - $currentPage) : 0);
430
-			$i= 1;
429
+			$offset = -4 + ($currentPage < 5 ? (5 - $currentPage) : 0);
430
+			$i = 1;
431 431
 			while ($i < 10 && ($currentPage + $offset <= $numPages)) {
432 432
 				if ($currentPage == $currentPage + $offset)
433 433
 					$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset, true);
434 434
 				else
435 435
 					$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset);
436
-				$i ++;
437
-				$offset ++;
436
+				$i++;
437
+				$offset++;
438 438
 			}
439 439
 			if ($currentPage < $numPages) {
440
-				$nav .= $this->createPageLink($currentURL, $currentPage +1, '&gt;&gt;');
440
+				$nav .= $this->createPageLink($currentURL, $currentPage + 1, '&gt;&gt;');
441 441
 			}
442 442
 			if ($currentPage != $numPages) {
443 443
 				$nav .= $this->createPageLink($currentURL, $numPages, $_lang["pagination_table_last"]);
444 444
 			}
445 445
 		}
446
-		$this->pageNav= ' '.$nav;
446
+		$this->pageNav = ' '.$nav;
447 447
 	}
448 448
 
449 449
 	/**
@@ -455,13 +455,13 @@  discard block
 block discarded – undo
455 455
 	 * @param $currentPage Indicates if the link is to the current page.
456 456
 	 * @param $qs And optional query string to be appended to the link.
457 457
 	 */
458
-	function createPageLink($link='', $pageNum, $displayText, $currentPage=false, $qs='') {
458
+	function createPageLink($link = '', $pageNum, $displayText, $currentPage = false, $qs = ''){
459 459
 		global $modx;
460
-		$orderBy= !empty($_GET['orderby'])? '&orderby=' . $_GET['orderby']: '';
461
-		$orderDir= !empty($_GET['orderdir'])? '&orderdir=' . $_GET['orderdir']: '';
462
-		if (!empty($qs)) $qs= "?$qs";
463
-		$link= empty($link)? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'], $qs . "page=$pageNum$orderBy$orderDir"): $this->prepareLink($link) . "page=$pageNum";
464
-		$nav .= '<li'.($currentPage? ' class="currentPage"': '').'><a'.($currentPage? ' class="currentPage"': '').' href="'.$link.'">'.$displayText.'</a></li>'."\n";
460
+		$orderBy = !empty($_GET['orderby']) ? '&orderby='.$_GET['orderby'] : '';
461
+		$orderDir = !empty($_GET['orderdir']) ? '&orderdir='.$_GET['orderdir'] : '';
462
+		if (!empty($qs)) $qs = "?$qs";
463
+		$link = empty($link) ? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'], $qs."page=$pageNum$orderBy$orderDir") : $this->prepareLink($link)."page=$pageNum";
464
+		$nav .= '<li'.($currentPage ? ' class="currentPage"' : '').'><a'.($currentPage ? ' class="currentPage"' : '').' href="'.$link.'">'.$displayText.'</a></li>'."\n";
465 465
 		return $nav;
466 466
 	}
467 467
 
@@ -472,10 +472,10 @@  discard block
 block discarded – undo
472 472
 	 * @param $isChecked Indicates if the checked attribute should apply to the
473 473
 	 * element.
474 474
 	 */
475
-	function addFormField($value, $isChecked) {
475
+	function addFormField($value, $isChecked){
476 476
 		if ($this->formElementType) {
477
-			$checked= $isChecked? "checked ": "";
478
-			$field= "\t\t".'<td><input type="'.$this->formElementType.'" name="'. ($this->formElementName ? $this->formElementName : $value).'"  value="'.$value.'" '.$checked.'/></td>'."\n";
477
+			$checked = $isChecked ? "checked " : "";
478
+			$field = "\t\t".'<td><input type="'.$this->formElementType.'" name="'.($this->formElementName ? $this->formElementName : $value).'"  value="'.$value.'" '.$checked.'/></td>'."\n";
479 479
 		}
480 480
 		return $field;
481 481
 	}
@@ -484,9 +484,9 @@  discard block
 block discarded – undo
484 484
 	 * Generates the proper LIMIT clause for queries to retrieve paged results in
485 485
 	 * a MakeTable $fieldsArray.
486 486
 	 */
487
-	function handlePaging() {
488
-		$offset= (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0;
489
-		$limitClause= ' LIMIT '. ($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM;
487
+	function handlePaging(){
488
+		$offset = (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0;
489
+		$limitClause = ' LIMIT '.($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM;
490 490
 		return $limitClause;
491 491
 	}
492 492
 
@@ -496,12 +496,12 @@  discard block
 block discarded – undo
496 496
 	 *
497 497
 	 * @param $natural_order If true, the results are returned in natural order.
498 498
 	 */
499
-	function handleSorting($natural_order=false) {
500
-		$orderByClause= '';
499
+	function handleSorting($natural_order = false){
500
+		$orderByClause = '';
501 501
 		if (!$natural_order) {
502
-			$orderby= !empty($_GET['orderby'])? $_GET['orderby']: "id";
503
-			$orderdir= !empty($_GET['orderdir'])? $_GET['orderdir']: "DESC";
504
-			$orderbyClause= !empty($orderby)? ' ORDER BY ' . $orderby . ' ' . $orderdir . ' ': "";
502
+			$orderby = !empty($_GET['orderby']) ? $_GET['orderby'] : "id";
503
+			$orderdir = !empty($_GET['orderdir']) ? $_GET['orderdir'] : "DESC";
504
+			$orderbyClause = !empty($orderby) ? ' ORDER BY '.$orderby.' '.$orderdir.' ' : "";
505 505
 		}
506 506
 		return $orderbyClause;
507 507
 	}
@@ -514,15 +514,15 @@  discard block
 block discarded – undo
514 514
 	 * @param $text The text for the link (e.g. table column header).
515 515
 	 * @param $qs An optional query string to append to the order by link.
516 516
 	 */
517
-	function prepareOrderByLink($key, $text, $qs='') {
517
+	function prepareOrderByLink($key, $text, $qs = ''){
518 518
 		global $modx;
519 519
 		if (!empty($_GET['orderdir'])) {
520
-			$orderDir= strtolower($_GET['orderdir'])=='desc'? '&orderdir=asc': '&orderdir=desc';
520
+			$orderDir = strtolower($_GET['orderdir']) == 'desc' ? '&orderdir=asc' : '&orderdir=desc';
521 521
 		} else {
522
-			$orderDir= '&orderdir=asc';
522
+			$orderDir = '&orderdir=asc';
523 523
 		}
524 524
 		if (!empty($qs)) {
525
-			if (!strrpos($qs, '&')==strlen($qs)-1) $qs.= '&';
525
+			if (!strrpos($qs, '&') == strlen($qs) - 1) $qs .= '&';
526 526
 		}
527 527
 		return '<a href="[~'.$modx->documentIdentifier.'~]?'.$qs.'orderby='.$key.$orderDir.'">'.$text.'</a>';
528 528
 	}
Please login to merge, or discard this patch.