Completed
Push — develop ( e96e2d...4e806c )
by Agel_Nash
06:19
created
manager/includes/src/Support/Captcha.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -43,44 +43,44 @@  discard block
 block discarded – undo
43 43
     public $im_height  = 0;
44 44
     public $im;
45 45
 
46
-    public function __construct($w=200, $h=80) {
46
+    public function __construct($w = 200, $h = 80){
47 47
         /* create session to set word for verification */
48 48
         $this->setVeriword();
49
-        $this->dir_font = MODX_BASE_PATH . 'assets/' . $this->dir_font;
49
+        $this->dir_font = MODX_BASE_PATH.'assets/'.$this->dir_font;
50 50
         $this->im_width         = $w;
51 51
         $this->im_height        = $h;
52 52
     }
53 53
 
54
-    public function setVeriword() {
54
+    public function setVeriword(){
55 55
         /* create session variable for verification,
56 56
            you may change the session variable name */
57 57
         $this->word             = $this->makeText();
58 58
         $_SESSION['veriword']   = $this->word;
59 59
     }
60 60
 
61
-    public function output() {
61
+    public function output(){
62 62
         /* output the image as jpeg */
63 63
         $this->drawImage();
64 64
         header("Content-type: image/jpeg");
65 65
         imagejpeg($this->im);
66 66
     }
67 67
 
68
-    public function makeText() {
68
+    public function makeText(){
69 69
         $modx = evolutionCMS();
70 70
         // set default words
71
-        $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";
71
+        $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";
72 72
         $words = $modx->config['captcha_words'] ? $modx->config['captcha_words'] : $words;
73 73
         $arr_words = array_filter(array_map('trim', explode(',', $words)));
74 74
 
75 75
         /* pick one randomly for text verification */
76
-        return (string) $arr_words[array_rand($arr_words)].rand(10,999);
76
+        return (string) $arr_words[array_rand($arr_words)].rand(10, 999);
77 77
     }
78 78
 
79
-    public function drawText() {
79
+    public function drawText(){
80 80
         $dir = dir($this->dir_font);
81 81
         $fontstmp = array();
82 82
         while (false !== ($file = $dir->read())) {
83
-            if(substr($file, -4) == '.ttf') {
83
+            if (substr($file, -4) == '.ttf') {
84 84
                 $fontstmp[] = $this->dir_font.$file;
85 85
             }
86 86
         }
@@ -88,35 +88,35 @@  discard block
 block discarded – undo
88 88
         $text_font = (string) $fontstmp[array_rand($fontstmp)];
89 89
 
90 90
         /* angle for text inclination */
91
-        $text_angle = rand(-9,9);
91
+        $text_angle = rand(-9, 9);
92 92
         /* initial text size */
93 93
         $text_size  = 30;
94 94
         /* calculate text width and height */
95
-        $box        = imagettfbbox ( $text_size, $text_angle, $text_font, $this->word);
96
-        $text_width = $box[2]-$box[0]; //text width
97
-        $text_height= $box[5]-$box[3]; //text height
95
+        $box        = imagettfbbox($text_size, $text_angle, $text_font, $this->word);
96
+        $text_width = $box[2] - $box[0]; //text width
97
+        $text_height = $box[5] - $box[3]; //text height
98 98
 
99 99
         /* adjust text size */
100
-        $text_size  = round((20 * $this->im_width)/$text_width);
100
+        $text_size  = round((20 * $this->im_width) / $text_width);
101 101
 
102 102
         /* recalculate text width and height */
103
-        $box        = imagettfbbox ( $text_size, $text_angle, $text_font, $this->word);
104
-        $text_width = $box[2]-$box[0]; //text width
105
-        $text_height= $box[5]-$box[3]; //text height
103
+        $box        = imagettfbbox($text_size, $text_angle, $text_font, $this->word);
104
+        $text_width = $box[2] - $box[0]; //text width
105
+        $text_height = $box[5] - $box[3]; //text height
106 106
 
107 107
         /* calculate center position of text */
108
-        $text_x         = ($this->im_width - $text_width)/2;
109
-        $text_y         = ($this->im_height - $text_height)/2;
108
+        $text_x         = ($this->im_width - $text_width) / 2;
109
+        $text_y         = ($this->im_height - $text_height) / 2;
110 110
 
111 111
         /* create canvas for text drawing */
112
-        $im_text        = imagecreate ($this->im_width, $this->im_height);
113
-        $bg_color       = imagecolorallocate ($im_text, 255, 255, 255);
112
+        $im_text        = imagecreate($this->im_width, $this->im_height);
113
+        $bg_color       = imagecolorallocate($im_text, 255, 255, 255);
114 114
 
115 115
         /* pick color for text */
116
-        $text_color     = imagecolorallocate ($im_text, 0, 51, 153);
116
+        $text_color     = imagecolorallocate($im_text, 0, 51, 153);
117 117
 
118 118
         /* draw text into canvas */
119
-        imagettftext    (   $im_text,
119
+        imagettftext($im_text,
120 120
             $text_size,
121 121
             $text_angle,
122 122
             $text_x,
@@ -131,19 +131,19 @@  discard block
 block discarded – undo
131 131
     }
132 132
 
133 133
 
134
-    public function drawImage() {
134
+    public function drawImage(){
135 135
 
136 136
         /* pick one background image randomly from image directory */
137
-        $img_file       = MODX_BASE_PATH . 'assets/' . $this->dir_noise."noise".rand(1,4).".jpg";
137
+        $img_file       = MODX_BASE_PATH.'assets/'.$this->dir_noise."noise".rand(1, 4).".jpg";
138 138
 
139 139
         /* create "noise" background image from your image stock*/
140
-        $noise_img      = @imagecreatefromjpeg ($img_file);
140
+        $noise_img      = @imagecreatefromjpeg($img_file);
141 141
         $noise_width    = imagesx($noise_img);
142 142
         $noise_height   = imagesy($noise_img);
143 143
 
144 144
         /* resize the background image to fit the size of image output */
145
-        $this->im       = imagecreatetruecolor($this->im_width,$this->im_height);
146
-        imagecopyresampled ($this->im,
145
+        $this->im       = imagecreatetruecolor($this->im_width, $this->im_height);
146
+        imagecopyresampled($this->im,
147 147
             $noise_img,
148 148
             0, 0, 0, 0,
149 149
             $this->im_width,
@@ -152,17 +152,17 @@  discard block
 block discarded – undo
152 152
             $noise_height);
153 153
 
154 154
         /* put text image into background image */
155
-        imagecopymerge (    $this->im,
155
+        imagecopymerge($this->im,
156 156
             $this->drawText(),
157 157
             0, 0, 0, 0,
158 158
             $this->im_width,
159 159
             $this->im_height,
160
-            70 );
160
+            70);
161 161
 
162 162
         return $this->im;
163 163
     }
164 164
 
165
-    public function destroy() {
165
+    public function destroy(){
166 166
         imagedestroy($this->im);
167 167
     }
168 168
 }
Please login to merge, or discard this patch.
manager/includes/src/Event.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
         if (is_array($SystemAlertMsgQueque)) {
36 36
             $title = '';
37 37
             if ($this->name && $this->activePlugin) {
38
-                $title = "<div><b>" . $this->activePlugin . "</b> - <span style='color:maroon;'>" . $this->name . "</span></div>";
38
+                $title = "<div><b>".$this->activePlugin."</b> - <span style='color:maroon;'>".$this->name."</span></div>";
39 39
             }
40 40
             $SystemAlertMsgQueque[] = "$title<div style='margin-left:10px;margin-top:3px;'>$msg</div>";
41 41
         }
Please login to merge, or discard this patch.
manager/includes/functions/preload.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
         $_ = crc32(__FILE__);
33 33
         $_ = sprintf('%u', $_);
34 34
 
35
-        return 'evo' . base_convert($_, 10, 36);
35
+        return 'evo'.base_convert($_, 10, 36);
36 36
     }
37 37
 }
38 38
 
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
         session_start();
58 58
         $key = "modx.mgr.session.cookie.lifetime";
59 59
         if (isset($_SESSION[$key]) && is_numeric($_SESSION[$key])) {
60
-            $cookieLifetime = (int)$_SESSION[$key];
60
+            $cookieLifetime = (int) $_SESSION[$key];
61 61
             if ($cookieLifetime) {
62 62
                 $cookieExpiration = $_SERVER['REQUEST_TIME'] + $cookieLifetime;
63 63
             }
Please login to merge, or discard this patch.
manager/actions/mutate_categories.dynamic.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5 5
 
6
-if(!$modx->hasPermission('category_manager')) {
6
+if (!$modx->hasPermission('category_manager')) {
7 7
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
8 8
 }
9 9
 
@@ -15,11 +15,11 @@  discard block
 block discarded – undo
15 15
 	'native_language'  => 'de',
16 16
 	'name'             => 'Categories Manager',
17 17
 	'dirname'          => $site_manager_url,
18
-	'url'              => 'index.php?a=120&amp;id=' . $_GET['id'],
19
-	'path'             => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR,
20
-	'inc_dir'          => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR,
21
-	'languages_dir'    => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'lang' . DIRECTORY_SEPARATOR,
22
-	'views_dir'        => realpath( dirname(__FILE__) ) . DIRECTORY_SEPARATOR . 'category_mgr' . DIRECTORY_SEPARATOR . 'skin' . DIRECTORY_SEPARATOR,
18
+	'url'              => 'index.php?a=120&amp;id='.$_GET['id'],
19
+	'path'             => realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR.'category_mgr'.DIRECTORY_SEPARATOR,
20
+	'inc_dir'          => realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR.'category_mgr'.DIRECTORY_SEPARATOR.'inc'.DIRECTORY_SEPARATOR,
21
+	'languages_dir'    => realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR.'category_mgr'.DIRECTORY_SEPARATOR.'lang'.DIRECTORY_SEPARATOR,
22
+	'views_dir'        => realpath(dirname(__FILE__)).DIRECTORY_SEPARATOR.'category_mgr'.DIRECTORY_SEPARATOR.'skin'.DIRECTORY_SEPARATOR,
23 23
 	'request_key'      => 'module_categories_manager',
24 24
 	'messages'         => array()
25 25
 );
@@ -27,19 +27,19 @@  discard block
 block discarded – undo
27 27
 $cm = new EvolutionCMS\Legacy\ModuleCategoriesManager();
28 28
 
29 29
 // assign module_params to internal params
30
-foreach( $_module_params as $param => $value )
30
+foreach ($_module_params as $param => $value)
31 31
 {
32
-	$cm->set( $param, $value );
32
+	$cm->set($param, $value);
33 33
 }
34 34
 
35 35
 // catch the request actions
36
-include_once $cm->get('inc_dir') . 'request_trigger.inc.php';
36
+include_once $cm->get('inc_dir').'request_trigger.inc.php';
37 37
 
38
-if( !$categories = $cm->getCategories() )
38
+if (!$categories = $cm->getCategories())
39 39
 {
40
-	setcookie('webfxtab_manage-categories-pane', 0 );
41
-	$cm->addMessage( $cm->txt('Currently no categories available... JUST ADD A NEW ONE!'), 'global' );
40
+	setcookie('webfxtab_manage-categories-pane', 0);
41
+	$cm->addMessage($cm->txt('Currently no categories available... JUST ADD A NEW ONE!'), 'global');
42 42
 }
43 43
 
44
-$cm->renderView('main', $categories );
44
+$cm->renderView('main', $categories);
45 45
 return;
Please login to merge, or discard this patch.
manager/actions/resources/mgrResources.class.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( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5 5
 
Please login to merge, or discard this patch.
manager/captcha.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
 $modx->getSettings();
8 8
 
9 9
 $modx->documentMethod = 'id';
10
-$modx->documentIdentifier = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 1;
10
+$modx->documentIdentifier = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 1;
11 11
 $modx->documentObject = $modx->getDocumentObject('id', $modx->documentIdentifier);
12 12
 
13 13
 $modx->invokeEvent('OnWebPageInit');
Please login to merge, or discard this patch.
manager/processors/duplicate_content.processor.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5
-if(!$modx->hasPermission('new_document') || !$modx->hasPermission('save_document')) {
5
+if (!$modx->hasPermission('new_document') || !$modx->hasPermission('save_document')) {
6 6
 	$modx->webAlertAndQuit($_lang["error_no_privileges"]);
7 7
 }
8 8
 
9
-$id = isset($_GET['id'])? (int)$_GET['id'] : 0;
10
-if($id==0) {
9
+$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
10
+if ($id == 0) {
11 11
 	$modx->webAlertAndQuit($_lang["error_no_id"]);
12 12
 }
13 13
 
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 $udperms->role = $_SESSION['mgrRole'];
21 21
 $udperms->duplicateDoc = true;
22 22
 
23
-if(!$udperms->checkPermissions()) {
23
+if (!$udperms->checkPermissions()) {
24 24
 	$modx->webAlertAndQuit($_lang["access_permission_denied"]);
25 25
 }
26 26
 
@@ -32,5 +32,5 @@  discard block
 block discarded – undo
32 32
 $_SESSION['itemname'] = $name;
33 33
 
34 34
 // finish cloning - redirect
35
-$header="Location: index.php?r=1&a=3&id=$id";
35
+$header = "Location: index.php?r=1&a=3&id=$id";
36 36
 header($header);
Please login to merge, or discard this patch.
manager/actions/help/01About_EVO.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,21 +1,21 @@
 block discarded – undo
1 1
 <?php
2
-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
2
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
3 3
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
4 4
 }
5
-$logo= '<img src="media/style/default/images/misc/login-logo.png" height="54" width="358" border="0">';
5
+$logo = '<img src="media/style/default/images/misc/login-logo.png" height="54" width="358" border="0">';
6 6
 $downloadLinks = array(
7
-	0=>array('title'=>$_lang["information"],'link'=>'https://evo.im/'),
8
-	1=>array('title'=>$_lang["download"],'link'=>'https://github.com/evolution-cms/evolution/releases'),
9
-	2=>array('title'=>$_lang["previous_releases"],'link'=>'https://modx.com/download/evolution/previous-releases.html'),
10
-	3=>array('title'=>$_lang["extras"],'link'=>array(
7
+	0=>array('title'=>$_lang["information"], 'link'=>'https://evo.im/'),
8
+	1=>array('title'=>$_lang["download"], 'link'=>'https://github.com/evolution-cms/evolution/releases'),
9
+	2=>array('title'=>$_lang["previous_releases"], 'link'=>'https://modx.com/download/evolution/previous-releases.html'),
10
+	3=>array('title'=>$_lang["extras"], 'link'=>array(
11 11
 		'http://extras.evolution-cms.com/',
12 12
 		'https://github.com/extras-evolution'
13 13
 	)),
14 14
 );
15 15
 
16 16
 $translationLinks = array(
17
-	0=>array('title'=>'Evolution CMS','link'=>'https://www.transifex.com/evolutioncms/evolution/'),
18
-	1=>array('title'=>$_lang["extras"],'link'=>'https://www.transifex.com/evolutioncms/extras/'),
17
+	0=>array('title'=>'Evolution CMS', 'link'=>'https://www.transifex.com/evolutioncms/evolution/'),
18
+	1=>array('title'=>$_lang["extras"], 'link'=>'https://www.transifex.com/evolutioncms/extras/'),
19 19
 );
20 20
 
21 21
 
Please login to merge, or discard this patch.
manager/actions/import_site.static.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
     <div class="container container-body">
45 45
         <?php
46 46
         if (!isset($_POST['import'])) {
47
-            echo "<div class=\"element-edit-message\">" . $_lang['import_site_message'] . "</div>";
47
+            echo "<div class=\"element-edit-message\">".$_lang['import_site_message']."</div>";
48 48
             ?>
49 49
             <form action="index.php" method="post" name="importFrm">
50 50
                 <input type="hidden" name="import" value="import"/>
Please login to merge, or discard this patch.