Completed
Push — develop ( e6bcf2...351294 )
by Dmytro
06:18
created
manager/includes/user_settings.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 if (!empty($user_id)) {
15 15
     // Raymond: grab the user settings from the database.
16 16
     $rs = $modx->db->select('setting_name, setting_value', $modx->getFullTableName('user_settings'),
17
-        "user=" . $modx->getLoginUserID());
17
+        "user=".$modx->getLoginUserID());
18 18
 
19 19
     $which_browser_default = $which_browser;
20 20
     while ($row = $modx->db->getRow($rs)) {
Please login to merge, or discard this patch.
manager/includes/paginate.inc.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -101,14 +101,14 @@  discard block
 block discarded – undo
101 101
         $array_paging['total'] = $this->int_nbr_row;
102 102
 
103 103
         if ($this->int_cur_position != 0) {
104
-            $array_paging['first_link'] = "<a href=\"$PHP_SELF?int_cur_position=0" . $this->str_ext_argv . "\">";
105
-            $array_paging['previous_link'] = "<a href=\"$PHP_SELF?int_cur_position=" . ($this->int_cur_position - $this->int_num_result) . $this->str_ext_argv . "\">";
104
+            $array_paging['first_link'] = "<a href=\"$PHP_SELF?int_cur_position=0".$this->str_ext_argv."\">";
105
+            $array_paging['previous_link'] = "<a href=\"$PHP_SELF?int_cur_position=".($this->int_cur_position - $this->int_num_result).$this->str_ext_argv."\">";
106 106
         }
107 107
 
108 108
         if (($this->int_nbr_row - $this->int_cur_position) > $this->int_num_result) {
109 109
             $int_new_position = $this->int_cur_position + $this->int_num_result;
110
-            $array_paging['last_link'] = "<a href=\"$PHP_SELF?int_cur_position=" . $this->int_nbr_row . $this->str_ext_argv . "\">";
111
-            $array_paging['next_link'] = "<a href=\"$PHP_SELF?int_cur_position=$int_new_position" . $this->str_ext_argv . "\">";
110
+            $array_paging['last_link'] = "<a href=\"$PHP_SELF?int_cur_position=".$this->int_nbr_row.$this->str_ext_argv."\">";
111
+            $array_paging['next_link'] = "<a href=\"$PHP_SELF?int_cur_position=$int_new_position".$this->str_ext_argv."\">";
112 112
         }
113 113
 
114 114
         return $array_paging;
@@ -126,10 +126,10 @@  discard block
 block discarded – undo
126 126
         for ($i = 0; $i < $this->getNumberOfPage(); $i++) {
127 127
             // if current page, do not make a link
128 128
             if ($i == $this->getCurrentPage()) {
129
-                $array_all_page[$i] = "<b>" . ($i + 1) . "</b>&nbsp;";
129
+                $array_all_page[$i] = "<b>".($i + 1)."</b>&nbsp;";
130 130
             } else {
131 131
                 $int_new_position = ($i * $this->int_num_result);
132
-                $array_all_page[$i] = "<a href=\"" . $PHP_SELF . "?int_cur_position=$int_new_position$this->str_ext_argv\">" . ($i + 1) . "</a>&nbsp;";
132
+                $array_all_page[$i] = "<a href=\"".$PHP_SELF."?int_cur_position=$int_new_position$this->str_ext_argv\">".($i + 1)."</a>&nbsp;";
133 133
             }
134 134
         }
135 135
 
Please login to merge, or discard this patch.
manager/includes/secure_web_documents.inc.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -20,14 +20,14 @@
 block discarded – undo
20 20
         ($docid > 0 ? "id='$docid'" : "privateweb = 1"));
21 21
     $rs = $modx->db->select(
22 22
         'DISTINCT sc.id',
23
-        $modx->getFullTableName("site_content") . " sc
24
-			LEFT JOIN " . $modx->getFullTableName("document_groups") . " dg ON dg.document = sc.id
25
-			LEFT JOIN " . $modx->getFullTableName("webgroup_access") . " wga ON wga.documentgroup = dg.document_group",
26
-        ($docid > 0 ? " sc.id='{$docid}' AND " : "") . "wga.id>0"
23
+        $modx->getFullTableName("site_content")." sc
24
+			LEFT JOIN " . $modx->getFullTableName("document_groups")." dg ON dg.document = sc.id
25
+			LEFT JOIN " . $modx->getFullTableName("webgroup_access")." wga ON wga.documentgroup = dg.document_group",
26
+        ($docid > 0 ? " sc.id='{$docid}' AND " : "")."wga.id>0"
27 27
     );
28 28
     $ids = $modx->db->getColumn("id", $rs);
29 29
     if (count($ids) > 0) {
30 30
         $modx->db->update('privateweb = 1', $modx->getFullTableName("site_content"),
31
-            "id IN (" . implode(", ", $ids) . ")");
31
+            "id IN (".implode(", ", $ids).")");
32 32
     }
33 33
 }
Please login to merge, or discard this patch.
manager/includes/messageCount.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -4,15 +4,15 @@
 block discarded – undo
4 4
 }
5 5
 
6 6
 $rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'),
7
-    "recipient=" . $modx->getLoginUserID() . " AND messageread=0");
7
+    "recipient=".$modx->getLoginUserID()." AND messageread=0");
8 8
 $nrnewmessages = $modx->db->getValue($rs);
9
-$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=" . $modx->getLoginUserID());
9
+$rs = $modx->db->select('COUNT(*)', $modx->getFullTableName('user_messages'), "recipient=".$modx->getLoginUserID());
10 10
 $nrtotalmessages = $modx->db->getValue($rs);
11 11
 $messagesallowed = $modx->hasPermission('messages');
12 12
 
13 13
 // ajax response
14 14
 if (isset($_POST['updateMsgCount'])) {
15 15
     header("Content-Type: application/json; charset=utf-8");
16
-    print $nrnewmessages . ',' . $nrtotalmessages;
16
+    print $nrnewmessages.','.$nrtotalmessages;
17 17
     exit;
18 18
 }
Please login to merge, or discard this patch.
manager/includes/error.class.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -71,11 +71,11 @@
 block discarded – undo
71 71
         }
72 72
 
73 73
         if ($context === 'common') {
74
-            $lang_path = MODX_MANAGER_PATH . 'includes/lang/';
74
+            $lang_path = MODX_MANAGER_PATH.'includes/lang/';
75 75
         } else {
76
-            $lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
76
+            $lang_path = MODX_MANAGER_PATH."includes/lang/{$context}/";
77 77
         }
78
-        include_once($lang_path . 'english.inc.php');
78
+        include_once($lang_path.'english.inc.php');
79 79
         $manager_language = $modx->config['manager_language'];
80 80
         if (is_file("{$lang_path}{$manager_language}.inc.php")) {
81 81
             include_once("{$lang_path}{$manager_language}.inc.php");
Please login to merge, or discard this patch.
manager/includes/protect.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 }
12 12
 
13 13
 global $sanitize_seed;
14
-$sanitize_seed = 'sanitize_seed_' . base_convert(md5(__FILE__), 16, 36);
14
+$sanitize_seed = 'sanitize_seed_'.base_convert(md5(__FILE__), 16, 36);
15 15
 
16 16
 // sanitize array
17 17
 if (!function_exists('modx_sanitize_gpc')) {
Please login to merge, or discard this patch.
manager/includes/extenders/ex_phpcompat.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
     return true;
10 10
 }
11 11
 
12
-if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/phpcompat.class.inc.php')) {
12
+if (!include_once(MODX_MANAGER_PATH.'includes/extenders/phpcompat.class.inc.php')) {
13 13
     return false;
14 14
 } else {
15 15
     $this->phpcompat = new PHPCOMPAT;
Please login to merge, or discard this patch.
manager/includes/extenders/ex_export_site.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
  * Time: 14:24
6 6
  */
7 7
 
8
-if (include_once(MODX_MANAGER_PATH . 'includes/extenders/export.class.inc.php')) {
8
+if (include_once(MODX_MANAGER_PATH.'includes/extenders/export.class.inc.php')) {
9 9
     $this->export = new EXPORT_SITE;
10 10
 
11 11
     return true;
Please login to merge, or discard this patch.
manager/includes/extenders/ex_phpass.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
     return true;
10 10
 }
11 11
 
12
-if (!include_once(MODX_MANAGER_PATH . 'includes/extenders/phpass.class.inc.php')) {
12
+if (!include_once(MODX_MANAGER_PATH.'includes/extenders/phpass.class.inc.php')) {
13 13
     return false;
14 14
 } else {
15 15
     $this->phpass = new PasswordHash;
Please login to merge, or discard this patch.