Completed
Branch master (0b66f1)
by Michael
33:21
created
htdocs/modules/banners/admin/clients.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
  * @author          Mage Grégory (AKA Mage)
22 22
  * @version         $Id$
23 23
  */
24
-include __DIR__ . '/header.php';
24
+include __DIR__.'/header.php';
25 25
 
26 26
 // Get main instance
27 27
 $xoops = Xoops::getInstance();
@@ -176,9 +176,9 @@  discard block
 block discarded – undo
176 176
                             $banner_arr[$i]->getVar('banner_imageurl'),
177 177
                             '',
178 178
                             0,
179
-                            strlen($xoops_url . '/uploads/banners/')
179
+                            strlen($xoops_url.'/uploads/banners/')
180 180
                         );
181
-                        $urlfile =  $xoops_root_path . '/uploads/banners/' . $namefile;
181
+                        $urlfile = $xoops_root_path.'/uploads/banners/'.$namefile;
182 182
                         if ($banner_Handler->delete($obj)) {
183 183
                             // delete banner
184 184
                             if (is_file($urlfile)) {
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
                 echo $xoops->confirm(
198 198
                     array("ok" => 1, "cid" => $cid, "op" => "delete"),
199 199
                     'clients.php',
200
-                    sprintf(_AM_BANNERS_CLIENTS_SUREDEL, $obj->getVar("bannerclient_name")) . '<br />'
200
+                    sprintf(_AM_BANNERS_CLIENTS_SUREDEL, $obj->getVar("bannerclient_name")).'<br />'
201 201
                 );
202 202
             }
203 203
         } else {
Please login to merge, or discard this patch.
htdocs/modules/banners/admin/banners.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
  * @author          Mage Grégory (AKA Mage)
22 22
  * @version         $Id: $
23 23
  */
24
-include __DIR__ . '/header.php';
24
+include __DIR__.'/header.php';
25 25
 // Get main instance
26 26
 $xoops = Xoops::getInstance();
27 27
 $helper = Banners::getInstance();
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
                     $percent = substr(100 * $clicks / $impmade, 0, 5);
102 102
                 }
103 103
                 if ($imptotal == 0) {
104
-                    $left = "" . _AM_BANNERS_BANNERS_UNLIMIT . "";
104
+                    $left = ""._AM_BANNERS_BANNERS_UNLIMIT."";
105 105
                 } else {
106 106
                     $left = $imptotal - $impmade;
107 107
                 }
@@ -110,9 +110,9 @@  discard block
 block discarded – undo
110 110
                     $img .= html_entity_decode($htmlcode);
111 111
                 } else {
112 112
                     if (stristr($imageurl, '.swf')) {
113
-                        $img .= '<object type="application/x-shockwave-flash" width="468" height="60" data="' . $imageurl . '" style="z-index:100;">' . '<param name="movie" value="' . $imageurl . '" />' . '<param name="wmode" value="opaque" />' . '</object>';
113
+                        $img .= '<object type="application/x-shockwave-flash" width="468" height="60" data="'.$imageurl.'" style="z-index:100;">'.'<param name="movie" value="'.$imageurl.'" />'.'<param name="wmode" value="opaque" />'.'</object>';
114 114
                     } else {
115
-                        $img .= '<img src="' . $imageurl . '" alt="" />';
115
+                        $img .= '<img src="'.$imageurl.'" alt="" />';
116 116
                     }
117 117
                 }
118 118
 
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
         }
131 131
         // Display Page Navigation
132 132
         if ($banner_count > $nb_banners) {
133
-            $nav = new XoopsPageNav($banner_count, $nb_banners, $start, 'start', 'startF=' . $startF);
133
+            $nav = new XoopsPageNav($banner_count, $nb_banners, $start, 'start', 'startF='.$startF);
134 134
             $xoops->tpl()->assign('nav_menu_banner', $nav->renderNav(4));
135 135
         }
136 136
         // Display Finished Banners
@@ -166,9 +166,9 @@  discard block
 block discarded – undo
166 166
                 } else {
167 167
                     $img = '<div id="xo-bannerfix">';
168 168
                     if (stristr($imageurl, '.swf')) {
169
-                        $img .= '<object type="application/x-shockwave-flash" width="468" height="60" data="' . $imageurl . '" style="z-index:100;">' . '<param name="movie" value="' . $imageurl . '" />' . '<param name="wmode" value="opaque" />' . '</object>';
169
+                        $img .= '<object type="application/x-shockwave-flash" width="468" height="60" data="'.$imageurl.'" style="z-index:100;">'.'<param name="movie" value="'.$imageurl.'" />'.'<param name="wmode" value="opaque" />'.'</object>';
170 170
                     } else {
171
-                        $img .= '<img src="' . $imageurl . '" alt="" />';
171
+                        $img .= '<img src="'.$imageurl.'" alt="" />';
172 172
                     }
173 173
 
174 174
                     $img .= '</div>';
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
         }
194 194
         // Display Page Navigation
195 195
         if ($banner_finish_count > $nb_banners) {
196
-            $nav = new XoopsPageNav($banner_finish_count, $nb_banners, $startF, 'startF', 'start=' . $start);
196
+            $nav = new XoopsPageNav($banner_finish_count, $nb_banners, $startF, 'startF', 'start='.$start);
197 197
             $xoops->tpl()->assign('nav_menu_bannerF', $nav->renderNav(4));
198 198
         }
199 199
         break;
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
         $error_msg = '';
238 238
         $obj->setVar("banner_cid", Request::getInt('cid', 0));
239 239
         if (preg_match('/^[0-9]*[0-9]+$|^[0-9]+[0-9]*$/', $_POST["imptotal"]) == false) {
240
-            $error_msg .= XoopsLocale::E_YOU_NEED_A_POSITIVE_INTEGER . '<br />';
240
+            $error_msg .= XoopsLocale::E_YOU_NEED_A_POSITIVE_INTEGER.'<br />';
241 241
             $obj->setVar("banner_imptotal", 0);
242 242
         } else {
243 243
             $obj->setVar("banner_imptotal", Request::getInt('imptotal', 0));
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
         $obj->setVar("banner_htmlbanner", Request::getInt('htmlbanner', 0));
247 247
         $obj->setVar("banner_htmlcode", Request::getString('htmlcode', ''));
248 248
 		
249
-        $uploader_banners_img = new XoopsMediaUploader($xoops_upload_path . '/banners', $mimetypes, $upload_size, null, null);
249
+        $uploader_banners_img = new XoopsMediaUploader($xoops_upload_path.'/banners', $mimetypes, $upload_size, null, null);
250 250
 		
251 251
         if ($uploader_banners_img->fetchMedia("banners_imageurl")) {
252 252
             $uploader_banners_img->setPrefix("banner");
@@ -254,13 +254,13 @@  discard block
 block discarded – undo
254 254
             if (!$uploader_banners_img->upload()) {
255 255
                 $error_msg .= $uploader_banners_img->getErrors();
256 256
             } else {
257
-                $obj->setVar("banner_imageurl", $xoops_upload_url . '/banners/' . $uploader_banners_img->getSavedFileName());
257
+                $obj->setVar("banner_imageurl", $xoops_upload_url.'/banners/'.$uploader_banners_img->getSavedFileName());
258 258
             }
259 259
         } else {
260 260
             if ($_POST["banners_imageurl"] === 'blank.gif') {
261 261
                 $obj->setVar("banner_imageurl", Request::getString('imageurl', ''));
262 262
             } else {
263
-                $obj->setVar("banner_imageurl", $xoops_upload_url . '/banners/' . Request::getString('banners_imageurl', ''));
263
+                $obj->setVar("banner_imageurl", $xoops_upload_url.'/banners/'.Request::getString('banners_imageurl', ''));
264 264
             }
265 265
         }
266 266
 
@@ -286,8 +286,8 @@  discard block
 block discarded – undo
286 286
                 if (!$xoops->security()->check()) {
287 287
                     $xoops->redirect("banners.php", 3, implode(",", $xoops->security()->getErrors()));
288 288
                 }
289
-                $namefile = substr_replace($obj->getVar('imageurl'), '', 0, strlen($xoops_url . '/uploads/banners/'));
290
-                $urlfile =  $xoops_root_path . '/uploads/banners/' . $namefile;
289
+                $namefile = substr_replace($obj->getVar('imageurl'), '', 0, strlen($xoops_url.'/uploads/banners/'));
290
+                $urlfile = $xoops_root_path.'/uploads/banners/'.$namefile;
291 291
                 if ($banner_Handler->delete($obj)) {
292 292
                     // delete banner
293 293
                     if (is_file($urlfile)) {
@@ -311,10 +311,10 @@  discard block
 block discarded – undo
311 311
                         $img .= "</embed>";
312 312
                         $img .= "</object>";
313 313
                     } else {
314
-                        $img .= "<img src='" . $imageurl . "' alt='' />";
314
+                        $img .= "<img src='".$imageurl."' alt='' />";
315 315
                     }
316 316
                 }
317
-                echo $xoops->confirm(array("ok" => 1, "bid" => $bid, "op" => "delete"), 'banners.php', XoopsLocale::Q_ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_ITEM . '<br \>' . $img . '<br \>');
317
+                echo $xoops->confirm(array("ok" => 1, "bid" => $bid, "op" => "delete"), 'banners.php', XoopsLocale::Q_ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_ITEM.'<br \>'.$img.'<br \>');
318 318
             }
319 319
         } else {
320 320
             $xoops->redirect('banners.php', 1, XoopsLocale::E_DATABASE_NOT_UPDATED);
Please login to merge, or discard this patch.
htdocs/modules/banners/admin/index.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
  * @author          Mage Gregory (AKA Mage)
20 20
  * @version         $Id: $
21 21
  */
22
-include __DIR__ . '/header.php';
22
+include __DIR__.'/header.php';
23 23
 $xoops = Xoops::getInstance();
24 24
 $helper = Banners::getInstance();
25 25
 
@@ -45,13 +45,13 @@  discard block
 block discarded – undo
45 45
 $criteria->add(new Criteria('banner_status', 0));
46 46
 $banners_finish = $banner_Handler->getCount($criteria);
47 47
 // folder path
48
-$folder_path = $xoops_root_path . '/uploads/banners';
48
+$folder_path = $xoops_root_path.'/uploads/banners';
49 49
 
50 50
 $admin_page = new \Xoops\Module\Admin();
51 51
 $admin_page->addInfoBox(_MI_BANNERS_BANNERS);
52 52
 $admin_page->addInfoBoxLine(sprintf(_AM_BANNERS_INDEX_NBTOTAL, $banners_banner));
53
-$admin_page->addInfoBoxLine(sprintf(_AM_BANNERS_INDEX_NBCLIENT, '<span class="green">' . $banners_client . '</span>'));
54
-$admin_page->addInfoBoxLine(sprintf(_AM_BANNERS_INDEX_NBFINISH, '<span class="red">' . $banners_finish . '</span>'));
53
+$admin_page->addInfoBoxLine(sprintf(_AM_BANNERS_INDEX_NBCLIENT, '<span class="green">'.$banners_client.'</span>'));
54
+$admin_page->addInfoBoxLine(sprintf(_AM_BANNERS_INDEX_NBFINISH, '<span class="red">'.$banners_finish.'</span>'));
55 55
 $admin_page->addConfigBoxLine($folder_path, 'folder');
56 56
 $admin_page->addConfigBoxLine(array($folder_path, '777'), 'chmod');
57 57
 $admin_page->displayNavigation('index.php');
Please login to merge, or discard this patch.
htdocs/modules/banners/admin/header.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,4 +19,4 @@
 block discarded – undo
19 19
  * @author          Mage Grégory (AKA Mage)
20 20
  * @version         $Id: $
21 21
  */
22
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
22
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
Please login to merge, or discard this patch.
htdocs/modules/banners/xoops_version.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
 // paypal
45 45
 $modversion['paypal']                  = array();
46 46
 $modversion['paypal']['business']      = '[email protected]';
47
-$modversion['paypal']['item_name']     = 'Donation : ' . _MI_BANNERS_DESC;
47
+$modversion['paypal']['item_name']     = 'Donation : '._MI_BANNERS_DESC;
48 48
 $modversion['paypal']['amount']        = 0;
49 49
 $modversion['paypal']['currency_code'] = 'USD';
50 50
 
Please login to merge, or discard this patch.
htdocs/modules/banners/preloads/preload.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,13 +34,13 @@
 block discarded – undo
34 34
     {
35 35
         $path = dirname(__DIR__);
36 36
         XoopsLoad::addMap(array(
37
-            'banners' => $path . '/class/helper.php',
37
+            'banners' => $path.'/class/helper.php',
38 38
         ));
39 39
     }
40 40
 
41 41
     public static function eventCoreBannerDisplay($args)
42 42
     {
43
-        require_once dirname(__DIR__) . '/class/bannerrender.php';
43
+        require_once dirname(__DIR__).'/class/bannerrender.php';
44 44
         $render = new BannerRender();
45 45
         $args[0] = $render->displayBanner();
46 46
     }
Please login to merge, or discard this patch.
htdocs/modules/banners/include/install.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -84,8 +84,8 @@
 block discarded – undo
84 84
     $sql = "DELETE FROM " . $xoopsDB->prefix("config") . " WHERE `conf_name` = 'my_ip'";
85 85
     $xoopsDB->queryF($sql);
86 86
 */
87
-	$xoops_root_path = \XoopsBaseConfig::get('root-path');
88
-	$xoops_upload_url = \XoopsBaseConfig::get('uploads-url');
87
+    $xoops_root_path = \XoopsBaseConfig::get('root-path');
88
+    $xoops_upload_url = \XoopsBaseConfig::get('uploads-url');
89 89
 	
90 90
     // create folder "banners"
91 91
     $dir = $xoops_root_path . "/uploads/banners";
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
     $xoops = Xoops::getInstance();
33 33
     //$xoops->db();
34 34
     //global $xoopsDB;
35
-    XoopsLoad::addMap(array('banners' => dirname(__DIR__) . '/class/helper.php'));
35
+    XoopsLoad::addMap(array('banners' => dirname(__DIR__).'/class/helper.php'));
36 36
     $helper = Banners::getInstance();
37 37
     // Get handler
38 38
     $banner_Handler = $helper->getHandlerBanner();
@@ -88,25 +88,25 @@  discard block
 block discarded – undo
88 88
 	$xoops_upload_url = \XoopsBaseConfig::get('uploads-url');
89 89
 	
90 90
     // create folder "banners"
91
-    $dir = $xoops_root_path . "/uploads/banners";
91
+    $dir = $xoops_root_path."/uploads/banners";
92 92
     if (!is_dir($dir)) {
93 93
         mkdir($dir, 0777);
94 94
         chmod($dir, 0777);
95 95
     }
96 96
     //Copy index.html
97
-    $file = $xoops_root_path . "/uploads/banners/index.html";
97
+    $file = $xoops_root_path."/uploads/banners/index.html";
98 98
     if (!is_file($file)) {
99
-        copy($xoops_root_path . "/modules/banners/images/index.html", $file);
99
+        copy($xoops_root_path."/modules/banners/images/index.html", $file);
100 100
     }
101 101
     //Copy blank.gif
102
-    $file = $xoops_root_path . "/uploads/banners/blank.gif";
102
+    $file = $xoops_root_path."/uploads/banners/blank.gif";
103 103
     if (!is_file($file)) {
104
-        copy($xoops_root_path . "/uploads/blank.gif", $file);
104
+        copy($xoops_root_path."/uploads/blank.gif", $file);
105 105
     }
106 106
     //Copy .htaccess
107
-    $file = $xoops_root_path . "/uploads/banners/.htaccess";
107
+    $file = $xoops_root_path."/uploads/banners/.htaccess";
108 108
     if (!is_file($file)) {
109
-        copy($xoops_root_path . "/uploads/.htaccess", $file);
109
+        copy($xoops_root_path."/uploads/.htaccess", $file);
110 110
     }
111 111
 
112 112
 /* this should be in system upgrade, not module install
@@ -179,15 +179,15 @@  discard block
 block discarded – undo
179 179
     );
180 180
     foreach ($banners as $k => $v) {
181 181
         //Copy banner
182
-        $file = $xoops_root_path . "/uploads/banners/" . $k;
183
-        $copy_file = $xoops_root_path . "/modules/banners/images/" . $k;
182
+        $file = $xoops_root_path."/uploads/banners/".$k;
183
+        $copy_file = $xoops_root_path."/modules/banners/images/".$k;
184 184
         if (!is_file($file) && is_file($copy_file)) {
185 185
             copy($copy_file, $file);
186 186
         }
187 187
         $obj = $banner_Handler->create();
188 188
         $obj->setVar("banner_cid", $newclient_id);
189 189
         $obj->setVar("banner_clickurl", $v);
190
-        $obj->setVar("banner_imageurl", $xoops_upload_url . '/banners/' . $k);
190
+        $obj->setVar("banner_imageurl", $xoops_upload_url.'/banners/'.$k);
191 191
         $obj->setVar("banner_datestart", time());
192 192
         $obj->setVar("banner_dateend", 0);
193 193
         $obj->setVar("banner_status", 1);
Please login to merge, or discard this patch.
htdocs/modules/banners/language/english/blocks.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -19,12 +19,12 @@
 block discarded – undo
19 19
  * @author          Mage Grégory (AKA Mage)
20 20
  * @version         $Id$
21 21
  */
22
-define("_MB_BANNERS_DISP","Display");
23
-define("_MB_BANNERS","Banners");
24
-define("_MB_BANNERS_ALIGNEMENT","Alignement");
25
-define("_MB_BANNERS_ALIGNEMENT_H","horizontal");
26
-define("_MB_BANNERS_ALIGNEMENT_V","vertical");
27
-define("_MB_BANNERS_ALLCLIENTS","All clients");
28
-define("_MB_BANNERS_CLIENTSTODISPLAY","Select displayed clients");
29
-define("_MB_BANNERS_IDDISPLAY","Indicate the ID of the banner to be displayed");
30
-define("_MB_BANNERS_SEP","separated with ','.");
22
+define("_MB_BANNERS_DISP", "Display");
23
+define("_MB_BANNERS", "Banners");
24
+define("_MB_BANNERS_ALIGNEMENT", "Alignement");
25
+define("_MB_BANNERS_ALIGNEMENT_H", "horizontal");
26
+define("_MB_BANNERS_ALIGNEMENT_V", "vertical");
27
+define("_MB_BANNERS_ALLCLIENTS", "All clients");
28
+define("_MB_BANNERS_CLIENTSTODISPLAY", "Select displayed clients");
29
+define("_MB_BANNERS_IDDISPLAY", "Indicate the ID of the banner to be displayed");
30
+define("_MB_BANNERS_SEP", "separated with ','.");
Please login to merge, or discard this patch.
htdocs/modules/banners/language/english/main.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
 //define("_MD_BANNERS_INDEX_CLIENTNAME", "Displaying active banners for client: %s");
24 24
 define("_MD_BANNERS_INDEX_DBERROR", "Database was not updated due to some error!");
25 25
 define("_MD_BANNERS_INDEX_EMAIL", "Send E-mail stats");
26
-define("_MD_BANNERS_INDEX_NO_ID","No valid ID detected");
26
+define("_MD_BANNERS_INDEX_NO_ID", "No valid ID detected");
27 27
 define("_MD_BANNERS_INDEX_NO_REFERER", "No referer detected");
28 28
 define("_MD_BANNERS_INDEX_ID", "ID");
29 29
 define("_MD_BANNERS_INDEX_MAIL_MESSAGE", "Available Banner Statistics for the selected Banner at %s :\n\n\n
Please login to merge, or discard this patch.