Completed
Pull Request — develop (#725)
by Agel_Nash
08:07
created
manager/includes/src/Exceptions/ContainerException.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,4 +2,6 @@
 block discarded – undo
2 2
 
3 3
 use Exception;
4 4
 
5
-class ContainerException extends Exception{}
5
+class ContainerException extends Exception
6
+{
7
+}
Please login to merge, or discard this patch.
manager/includes/src/Interfaces/ManagerApiInterface.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,3 +1,5 @@
 block discarded – undo
1 1
 <?php namespace EvolutionCMS\Interfaces;
2 2
 
3
-interface ManagerApiInterface{}
3
+interface ManagerApiInterface
4
+{
5
+}
Please login to merge, or discard this patch.
manager/includes/src/Interfaces/ServiceProviderInterface.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,3 +1,5 @@
 block discarded – undo
1 1
 <?php namespace EvolutionCMS\Interfaces;
2 2
 
3
-interface ServiceProviderInterface{}
3
+interface ServiceProviderInterface
4
+{
5
+}
Please login to merge, or discard this patch.
manager/includes/src/Interfaces/PasswordHashInterface.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,3 +1,5 @@
 block discarded – undo
1 1
 <?php namespace EvolutionCMS\Interfaces;
2 2
 
3
-interface PasswordHashInterface{}
3
+interface PasswordHashInterface
4
+{
5
+}
Please login to merge, or discard this patch.
manager/includes/src/Support/MysqlDumper.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
         // Set line feed
75 75
         $lf = "\n";
76
-        $tempfile_path = $modx->config['base_path'] . 'assets/backup/temp.php';
76
+        $tempfile_path = $modx->config['base_path'].'assets/backup/temp.php';
77 77
 
78 78
         $result = $modx->getDatabase()->query('SHOW TABLES');
79 79
         $tables = $this->result2Array(0, $result);
@@ -86,15 +86,15 @@  discard block
 block discarded – undo
86 86
 
87 87
         // Set header
88 88
         $output = "#{$lf}";
89
-        $output .= "# " . addslashes($modx->config['site_name']) . " Database Dump{$lf}";
89
+        $output .= "# ".addslashes($modx->config['site_name'])." Database Dump{$lf}";
90 90
         $output .= "# MODX Version:{$version['version']}{$lf}";
91 91
         $output .= "# {$lf}";
92 92
         $output .= "# Host: {$this->database_server}{$lf}";
93
-        $output .= "# Generation Time: " . $modx->toDateFormat(time()) . $lf;
94
-        $output .= "# Server version: " . $modx->getDatabase()->getVersion() . $lf;
95
-        $output .= "# PHP Version: " . phpversion() . $lf;
93
+        $output .= "# Generation Time: ".$modx->toDateFormat(time()).$lf;
94
+        $output .= "# Server version: ".$modx->getDatabase()->getVersion().$lf;
95
+        $output .= "# PHP Version: ".phpversion().$lf;
96 96
         $output .= "# Database: `{$this->dbname}`{$lf}";
97
-        $output .= "# Description: " . trim($_REQUEST['backup_title']) . "{$lf}";
97
+        $output .= "# Description: ".trim($_REQUEST['backup_title'])."{$lf}";
98 98
         $output .= "#";
99 99
         file_put_contents($tempfile_path, $output, FILE_APPEND | LOCK_EX);
100 100
         $output = '';
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
                 }
114 114
             }
115 115
             if ($callBack === 'snapshot') {
116
-                if (!preg_match('@^' . $modx->getDatabase()->config['table_prefix'] . '@', $tblval)) {
116
+                if (!preg_match('@^'.$modx->getDatabase()->config['table_prefix'].'@', $tblval)) {
117 117
                     continue;
118 118
                 }
119 119
             }
@@ -150,9 +150,9 @@  discard block
 block discarded – undo
150 150
                         ), '\\n', $value);
151 151
                         $value = "'{$value}'";
152 152
                     }
153
-                    $insertdump .= $value . ',';
153
+                    $insertdump .= $value.',';
154 154
                 }
155
-                $output .= rtrim($insertdump, ',') . ");\n";
155
+                $output .= rtrim($insertdump, ',').");\n";
156 156
                 if (1048576 < strlen($output)) {
157 157
                     file_put_contents($tempfile_path, $output, FILE_APPEND | LOCK_EX);
158 158
                     $output = '';
Please login to merge, or discard this patch.
manager/includes/src/Support/ContextMenu.php 3 patches
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -19,46 +19,46 @@  discard block
 block discarded – undo
19 19
 
20 20
     public static $cnt;
21 21
 
22
-    public function __construct($id = '', $width = 120, $visible = false) {
22
+    public function __construct($id = '', $width = 120, $visible = false){
23 23
         self::$cnt++;
24 24
         $this->html = "";
25 25
         $this->visible = $visible ? $visible : false;
26
-        $this->width = is_numeric($width) ? (int)$width : 120;
27
-        $this->id = $id ? $id : "cntxMnu" . self::$cnt;    // set id
26
+        $this->width = is_numeric($width) ? (int) $width : 120;
27
+        $this->id = $id ? $id : "cntxMnu".self::$cnt; // set id
28 28
     }
29 29
 
30
-    public function addItem($text, $action = "", $img = "", $disabled = 0) {
30
+    public function addItem($text, $action = "", $img = "", $disabled = 0){
31 31
         global $base_url, $_style;
32
-        if($disabled) {
32
+        if ($disabled) {
33 33
             return;
34 34
         }
35
-        if(!$img) {
36
-            $img = $base_url . $_style['tx'];
35
+        if (!$img) {
36
+            $img = $base_url.$_style['tx'];
37 37
         }
38
-        if(substr($action, 0, 3) == "js:") {
38
+        if (substr($action, 0, 3) == "js:") {
39 39
             $action = substr($action, 3);
40
-        } else if(substr($action, 0, 3) == "hl:") {
41
-            $action = "window.location.href='" . substr($action, 3) . "'";
40
+        } else if (substr($action, 0, 3) == "hl:") {
41
+            $action = "window.location.href='".substr($action, 3)."'";
42 42
         } else {
43
-            $action = "window.location.href='" . $action . "'";
43
+            $action = "window.location.href='".$action."'";
44 44
         }
45
-        $action = " onmouseover=\"this.className='cntxMnuItemOver';\" onmouseout=\"this.className='cntxMnuItem';\" onclick=\"$action; hideCntxMenu('" . $this->id . "');\"";
46
-        $this->html .= "<div class='" . ($disabled ? "cntxMnuItemDisabled" : "cntxMnuItem") . "' $action>";
47
-        if(substr($img, 0, 5) == 'fa fa') {
48
-            $img = '<i class="' . $img . '"></i>';
49
-        } else if(substr($img, 0, 1) != '<') {
50
-            $img = '<img src="' . $img . '" />';
45
+        $action = " onmouseover=\"this.className='cntxMnuItemOver';\" onmouseout=\"this.className='cntxMnuItem';\" onclick=\"$action; hideCntxMenu('".$this->id."');\"";
46
+        $this->html .= "<div class='".($disabled ? "cntxMnuItemDisabled" : "cntxMnuItem")."' $action>";
47
+        if (substr($img, 0, 5) == 'fa fa') {
48
+            $img = '<i class="'.$img.'"></i>';
49
+        } else if (substr($img, 0, 1) != '<') {
50
+            $img = '<img src="'.$img.'" />';
51 51
         }
52
-        $this->html .= $img . '&nbsp;' . $text . '</div>';
52
+        $this->html .= $img.'&nbsp;'.$text.'</div>';
53 53
     }
54 54
 
55
-    public function addSeparator() {
55
+    public function addSeparator(){
56 56
         $this->html .= "
57 57
 			<div class='cntxMnuSeparator'></div>
58 58
 		";
59 59
     }
60 60
 
61
-    public function render() {
61
+    public function render(){
62 62
         $ContextMenuScript = <<<BLOCK
63 63
 <script>
64 64
 	function getCntxMenu(id) {
@@ -71,12 +71,12 @@  discard block
 block discarded – undo
71 71
 </script>
72 72
 BLOCK;
73 73
 
74
-        $html = $ContextMenuScript . "<div id='" . $this->id . "' class='contextMenu' style='width:" . $this->width . "px; visibility:" . ($this->visible ? 'visible' : 'hidden') . "'>" . $this->html . "</div>";
74
+        $html = $ContextMenuScript."<div id='".$this->id."' class='contextMenu' style='width:".$this->width."px; visibility:".($this->visible ? 'visible' : 'hidden')."'>".$this->html."</div>";
75 75
         $ContextMenuScript = ""; // reset css
76 76
         return $html;
77 77
     }
78 78
 
79
-    public function getClientScriptObject() {
80
-        return "getCntxMenu('" . $this->id . "')";
79
+    public function getClientScriptObject(){
80
+        return "getCntxMenu('".$this->id."')";
81 81
     }
82 82
 }
Please login to merge, or discard this patch.
Braces   +12 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,7 +2,8 @@  discard block
 block discarded – undo
2 2
 
3 3
 use EvolutionCMS\Interfaces\ContextMenuInterface;
4 4
 
5
-class ContextMenu implements ContextMenuInterface{
5
+class ContextMenu implements ContextMenuInterface
6
+{
6 7
     public $id;
7 8
     /**
8 9
      * @var string
@@ -19,7 +20,8 @@  discard block
 block discarded – undo
19 20
 
20 21
     public static $cnt;
21 22
 
22
-    public function __construct($id = '', $width = 120, $visible = false) {
23
+    public function __construct($id = '', $width = 120, $visible = false)
24
+    {
23 25
         self::$cnt++;
24 26
         $this->html = "";
25 27
         $this->visible = $visible ? $visible : false;
@@ -27,7 +29,8 @@  discard block
 block discarded – undo
27 29
         $this->id = $id ? $id : "cntxMnu" . self::$cnt;    // set id
28 30
     }
29 31
 
30
-    public function addItem($text, $action = "", $img = "", $disabled = 0) {
32
+    public function addItem($text, $action = "", $img = "", $disabled = 0)
33
+    {
31 34
         global $base_url, $_style;
32 35
         if($disabled) {
33 36
             return;
@@ -52,13 +55,15 @@  discard block
 block discarded – undo
52 55
         $this->html .= $img . '&nbsp;' . $text . '</div>';
53 56
     }
54 57
 
55
-    public function addSeparator() {
58
+    public function addSeparator()
59
+    {
56 60
         $this->html .= "
57 61
 			<div class='cntxMnuSeparator'></div>
58 62
 		";
59 63
     }
60 64
 
61
-    public function render() {
65
+    public function render()
66
+    {
62 67
         $ContextMenuScript = <<<BLOCK
63 68
 <script>
64 69
 	function getCntxMenu(id) {
@@ -76,7 +81,8 @@  discard block
 block discarded – undo
76 81
         return $html;
77 82
     }
78 83
 
79
-    public function getClientScriptObject() {
84
+    public function getClientScriptObject()
85
+    {
80 86
         return "getCntxMenu('" . $this->id . "')";
81 87
     }
82 88
 }
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
 		cm.style.visibility = 'hidden';
70 70
 	}
71 71
 </script>
72
-BLOCK;
72
+block;
73 73
 
74 74
         $html = $ContextMenuScript . "<div id='" . $this->id . "' class='contextMenu' style='width:" . $this->width . "px; visibility:" . ($this->visible ? 'visible' : 'hidden') . "'>" . $this->html . "</div>";
75 75
         $ContextMenuScript = ""; // reset css
Please login to merge, or discard this patch.
manager/includes/mutate_settings.ajax.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
7 7
 }
8 8
 
9
-require_once(dirname(__FILE__) . '/protect.inc.php');
9
+require_once(dirname(__FILE__).'/protect.inc.php');
10 10
 
11 11
 $action = preg_replace('/[^A-Za-z0-9_\-\.\/]/', '', $_POST['action']);
12 12
 $lang = preg_replace('/[^A-Za-z0-9_\s\+\-\.\/]/', '', $_POST['lang']);
@@ -23,13 +23,13 @@  discard block
 block discarded – undo
23 23
 
24 24
 switch (true) {
25 25
     case ($action == 'get' && preg_match('/^[A-z0-9_-]+$/',
26
-            $lang) && file_exists(dirname(__FILE__) . '/lang/' . $lang . '.inc.php')): {
27
-        include(dirname(__FILE__) . '/lang/' . $lang . '.inc.php');
26
+            $lang) && file_exists(dirname(__FILE__).'/lang/'.$lang.'.inc.php')): {
27
+        include(dirname(__FILE__).'/lang/'.$lang.'.inc.php');
28 28
         $str = isset($key, $_lang, $_lang[$key]) ? $_lang[$key] : "";
29 29
         break;
30 30
     }
31 31
     case ($action == 'setsetting' && !empty($key) && !empty($value)): {
32
-        $sql = "REPLACE INTO " . $modx->getFullTableName("system_settings") . " (setting_name, setting_value) VALUES('{$key}', '{$value}');";
32
+        $sql = "REPLACE INTO ".$modx->getFullTableName("system_settings")." (setting_name, setting_value) VALUES('{$key}', '{$value}');";
33 33
         $str = "true";
34 34
         $modx->getDatabase()->query($sql);
35 35
         $emptyCache = true;
Please login to merge, or discard this patch.
manager/includes/categories.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
     $newCat = $modx->getDatabase()->escape($newCat);
35 35
     $cats = $modx->getDatabase()->select('id', $modx->getFullTableName('categories'), "category='{$newCat}'");
36 36
     if ($cat = $modx->getDatabase()->getValue($cats)) {
37
-        return (int)$cat;
37
+        return (int) $cat;
38 38
     }
39 39
 
40 40
     return 0;
Please login to merge, or discard this patch.
manager/includes/extenders/modifiers/mdf_moduser.inc.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-$userid = (int)$value;
2
+$userid = (int) $value;
3 3
 if (!isset($modx->getModifiers()->cache['ui'][$userid])) {
4 4
     if ($userid < 0) $user = $modx->getWebUserInfo(abs($userid));
5 5
     else             $user = $modx->getUserInfo($userid);
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,8 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 $userid = (int)$value;
3 3
 if (!isset($modx->getModifiers()->cache['ui'][$userid])) {
4
-    if ($userid < 0) $user = $modx->getWebUserInfo(abs($userid));
5
-    else             $user = $modx->getUserInfo($userid);
4
+    if ($userid < 0) {
5
+        $user = $modx->getWebUserInfo(abs($userid));
6
+    } else {
7
+        $user = $modx->getUserInfo($userid);
8
+    }
6 9
     $modx->getModifiers()->cache['ui'][$userid] = $user;
7 10
 } else {
8 11
     $user = $modx->getModifiers()->cache['ui'][$userid];
Please login to merge, or discard this patch.