Completed
Branch master (0b66f1)
by Michael
33:21
created
htdocs/modules/banners/blocks/banners_blocks.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 function banners_blocks_show($options) {
23 23
     $block = array();
24 24
     $xoops = Xoops::getInstance();
25
-    require_once dirname(__DIR__) . '/class/bannerrender.php';
25
+    require_once dirname(__DIR__).'/class/bannerrender.php';
26 26
     $render = new BannerRender();
27 27
     switch ($options[0]) {
28 28
         case 'random':
@@ -49,10 +49,10 @@  discard block
 block discarded – undo
49 49
     switch ($options[0]) {
50 50
 
51 51
         case 'random':
52
-            $form .= _MB_BANNERS_DISP . " \n";
53
-            $form .= "<input type=\"hidden\" name=\"options[0]\" value=\"" . $options[0] . "\" />\n";
54
-            $form .= "<input name=\"options[1]\" size=\"5\" maxlength=\"255\" value=\"" . $options[1] . "\" type=\"text\" />&nbsp;" . _MB_BANNERS . "<br />\n";
55
-            switch ($options[2]){
52
+            $form .= _MB_BANNERS_DISP."&nbsp;\n";
53
+            $form .= "<input type=\"hidden\" name=\"options[0]\" value=\"".$options[0]."\" />\n";
54
+            $form .= "<input name=\"options[1]\" size=\"5\" maxlength=\"255\" value=\"".$options[1]."\" type=\"text\" />&nbsp;"._MB_BANNERS."<br />\n";
55
+            switch ($options[2]) {
56 56
                 case 'H':
57 57
                     $checked_H = 'checked="checked"';
58 58
                     $checked_V = '';
@@ -63,30 +63,30 @@  discard block
 block discarded – undo
63 63
                     $checked_V = 'checked="checked"';
64 64
                     break;
65 65
             }
66
-            $form .= _MB_BANNERS_ALIGNEMENT . " : <input name=\"options[2]\" value=\"H\" type=\"radio\" " . $checked_H . "/>" . _MB_BANNERS_ALIGNEMENT_H . "&nbsp;\n";
67
-            $form .= "<input name=\"options[2]\" value=\"V\" type=\"radio\" " . $checked_V . "/>" . _MB_BANNERS_ALIGNEMENT_V . "<br />\n";
66
+            $form .= _MB_BANNERS_ALIGNEMENT." : <input name=\"options[2]\" value=\"H\" type=\"radio\" ".$checked_H."/>"._MB_BANNERS_ALIGNEMENT_H."&nbsp;\n";
67
+            $form .= "<input name=\"options[2]\" value=\"V\" type=\"radio\" ".$checked_V."/>"._MB_BANNERS_ALIGNEMENT_V."<br />\n";
68 68
             array_shift($options);
69 69
             array_shift($options);
70 70
             array_shift($options);
71
-            $form .= _MB_BANNERS_CLIENTSTODISPLAY . "<br /><select name=\"options[]\" multiple=\"multiple\" size=\"5\">\n";
71
+            $form .= _MB_BANNERS_CLIENTSTODISPLAY."<br /><select name=\"options[]\" multiple=\"multiple\" size=\"5\">\n";
72 72
             $xoops = Xoops::getInstance();
73
-            $client_Handler = $xoops->getModuleHandler('bannerclient','banners');
73
+            $client_Handler = $xoops->getModuleHandler('bannerclient', 'banners');
74 74
             $criteria = new CriteriaCompo();
75 75
             $criteria->setSort('bannerclient_name');
76 76
             $criteria->setOrder('ASC');
77 77
             $client_arr = $client_Handler->getAll($criteria);
78
-            $form .= "<option value=\"0\" " . (array_search(0, $options) === false ? '' : 'selected="selected"') . ">" . _MB_BANNERS_ALLCLIENTS . "</option>\n";
78
+            $form .= "<option value=\"0\" ".(array_search(0, $options) === false ? '' : 'selected="selected"').">"._MB_BANNERS_ALLCLIENTS."</option>\n";
79 79
             foreach (array_keys($client_arr) as $i) {
80
-                $form .= "<option value=\"" . $client_arr[$i]->getVar('cid') . "\" " . (array_search($client_arr[$i]->getVar('cid'), $options) === false ? '' : 'selected="selected"') . ">" . $client_arr[$i]->getVar('name')."</option>\n";
80
+                $form .= "<option value=\"".$client_arr[$i]->getVar('cid')."\" ".(array_search($client_arr[$i]->getVar('cid'), $options) === false ? '' : 'selected="selected"').">".$client_arr[$i]->getVar('name')."</option>\n";
81 81
             }
82 82
             $form .= "</select>\n";
83 83
             break;
84 84
 
85 85
         case 'id':
86
-            $form .= _MB_BANNERS_IDDISPLAY . "&nbsp;\n";
87
-            $form .= "<input type=\"hidden\" name=\"options[0]\" value=\"" . $options[0] . "\" />\n";
88
-            $form .= "<input name=\"options[1]\" size=\"20\" maxlength=\"255\" value=\"" . $options[1] . "\" type=\"text\" />&nbsp;" . _MB_BANNERS_SEP . "<br />\n";
89
-            switch ($options[2]){
86
+            $form .= _MB_BANNERS_IDDISPLAY."&nbsp;\n";
87
+            $form .= "<input type=\"hidden\" name=\"options[0]\" value=\"".$options[0]."\" />\n";
88
+            $form .= "<input name=\"options[1]\" size=\"20\" maxlength=\"255\" value=\"".$options[1]."\" type=\"text\" />&nbsp;"._MB_BANNERS_SEP."<br />\n";
89
+            switch ($options[2]) {
90 90
                 case 'H':
91 91
                     $checked_H = 'checked="checked"';
92 92
                     $checked_V = '';
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
97 97
                     $checked_V = 'checked="checked"';
98 98
                     break;
99 99
             }
100
-            $form .= _MB_BANNERS_ALIGNEMENT . " : <input name=\"options[2]\" value=\"H\" type=\"radio\" " . $checked_H . "/>" . _MB_BANNERS_ALIGNEMENT_H . "&nbsp;\n";
101
-            $form .= "<input name=\"options[2]\" value=\"V\" type=\"radio\" " . $checked_V . "/>" . _MB_BANNERS_ALIGNEMENT_V . "<br />\n";
100
+            $form .= _MB_BANNERS_ALIGNEMENT." : <input name=\"options[2]\" value=\"H\" type=\"radio\" ".$checked_H."/>"._MB_BANNERS_ALIGNEMENT_H."&nbsp;\n";
101
+            $form .= "<input name=\"options[2]\" value=\"V\" type=\"radio\" ".$checked_V."/>"._MB_BANNERS_ALIGNEMENT_V."<br />\n";
102 102
             break;
103 103
     }
104 104
     return $form;
Please login to merge, or discard this patch.
htdocs/modules/banners/class/bannerrender.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     public function displayBanner($nb_banner = 1, $align = 'H', $client = array(), $ids = '')
42 42
     {
43 43
         $xoops = Xoops::getInstance();
44
-        XoopsLoad::addMap(array('banners' => __DIR__ . '/helper.php'));
44
+        XoopsLoad::addMap(array('banners' => __DIR__.'/helper.php'));
45 45
         $helper = Banners::getInstance();
46 46
         if ($xoops->isActiveModule('banners')) {
47 47
             // Get banners handler
@@ -53,14 +53,14 @@  discard block
 block discarded – undo
53 53
             $criteria->setSort($sort);
54 54
             if (!empty($client)) {
55 55
                 if (!in_array(0, $client)) {
56
-                    $criteria->add(new Criteria('banner_cid', '(' . implode(',', $client) . ')', 'IN'));
56
+                    $criteria->add(new Criteria('banner_cid', '('.implode(',', $client).')', 'IN'));
57 57
                 }
58 58
             }
59 59
             if ($ids == '') {
60 60
                 $criteria->setLimit($nb_banner);
61 61
                 $criteria->setStart(0);
62 62
             } else {
63
-                $criteria->add(new Criteria('banner_bid', '(' . $ids . ')', 'IN'));
63
+                $criteria->add(new Criteria('banner_bid', '('.$ids.')', 'IN'));
64 64
             }
65 65
             $banner_arr = $banner_Handler->getAll($criteria);
66 66
             $numrows = count($banner_arr);
@@ -81,9 +81,9 @@  discard block
 block discarded – undo
81 81
                         $bannerobject .= $htmlcode;
82 82
                     } else {
83 83
                         if (stristr($imageurl, '.swf')) {
84
-                            $bannerobject .= '<a href="' . \XoopsBaseConfig::get('url') . '/modules/banners/index.php?op=click&amp;bid=' . $bid . '" rel="external" title="' . $clickurl . '"></a>' . '<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>';
84
+                            $bannerobject .= '<a href="'.\XoopsBaseConfig::get('url').'/modules/banners/index.php?op=click&amp;bid='.$bid.'" rel="external" title="'.$clickurl.'"></a>'.'<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>';
85 85
                         } else {
86
-                            $bannerobject .= '<a href="' . \XoopsBaseConfig::get('url') . '/modules/banners/index.php?op=click&amp;bid=' . $bid . '" rel="external" title="' . $clickurl . '"><img src="' . $imageurl . '" alt="' . $clickurl . '" /></a>';
86
+                            $bannerobject .= '<a href="'.\XoopsBaseConfig::get('url').'/modules/banners/index.php?op=click&amp;bid='.$bid.'" rel="external" title="'.$clickurl.'"><img src="'.$imageurl.'" alt="'.$clickurl.'" /></a>';
87 87
                         }
88 88
                     }
89 89
                     if ($align === 'V') {
Please login to merge, or discard this patch.
htdocs/modules/banners/class/form/banner.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -34,14 +34,14 @@  discard block
 block discarded – undo
34 34
             $blank_img = 'blank.gif';
35 35
             $html_banner = 0;
36 36
         } else {
37
-            if (substr_count($obj->getVar('banner_imageurl'), $xoops_upload_url . '/banners/') == 0) {
37
+            if (substr_count($obj->getVar('banner_imageurl'), $xoops_upload_url.'/banners/') == 0) {
38 38
                 $blank_img = 'blank.gif';
39 39
             } else {
40 40
                 $namefile =
41
-                    substr_replace($obj->getVar('banner_imageurl'), '', 0, strlen($xoops_upload_url . '/banners/'));
42
-                $pathfile =  $xoops->path('uploads/banners/') . $namefile;
41
+                    substr_replace($obj->getVar('banner_imageurl'), '', 0, strlen($xoops_upload_url.'/banners/'));
42
+                $pathfile = $xoops->path('uploads/banners/').$namefile;
43 43
                 if (is_file($pathfile)) {
44
-                    $blank_img = str_replace($xoops_upload_url . '/banners/', '', $obj->getVar('banner_imageurl', 'e'));
44
+                    $blank_img = str_replace($xoops_upload_url.'/banners/', '', $obj->getVar('banner_imageurl', 'e'));
45 45
                 } else {
46 46
                     $blank_img = 'blank.gif';
47 47
                 }
@@ -73,13 +73,13 @@  discard block
 block discarded – undo
73 73
         \Xoops\Core\Lists\ImageFile::setOptionsArray($imageselect_img, $xoops->path('uploads/banners'));
74 74
         $imageselect_img->setExtra(
75 75
             'onchange="showImgSelected(\'xo-banners-img\', \'banners_imageurl\', \'banners\', \'\', \''
76
-            . $xoops_upload_url . '\' )"'
76
+            . $xoops_upload_url.'\' )"'
77 77
         );
78 78
         $imgtray_img->addElement($imageselect_img, false);
79 79
         $imgtray_img->addElement(
80 80
             new Xoops\Form\Label(
81 81
                 '',
82
-                "<br /><img src='" . $xoops_upload_url . "/banners/" . $blank_img
82
+                "<br /><img src='".$xoops_upload_url."/banners/".$blank_img
83 83
                 . "' name='image_img' id='xo-banners-img' alt='' />"
84 84
             )
85 85
         );
Please login to merge, or discard this patch.
htdocs/modules/banners/index.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
  * @version         $Id: $
23 23
  */
24 24
 
25
-include dirname(dirname(__DIR__)) . '/mainfile.php';
25
+include dirname(dirname(__DIR__)).'/mainfile.php';
26 26
 
27 27
 $xoops = Xoops::getInstance();
28 28
 $helper = Banners::getInstance();
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
         $criteria = new CriteriaCompo();
88 88
         $criteria->add(new Criteria('banner_status', 0, '!='));
89 89
         if ($admin == false) {
90
-            $criteria->add(new Criteria('banner_cid', '(' . implode(',', $cid) . ')', 'IN'));
90
+            $criteria->add(new Criteria('banner_cid', '('.implode(',', $cid).')', 'IN'));
91 91
         }
92 92
         $criteria->setSort("banner_cid");
93 93
         $criteria->setOrder("ASC");
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
                     $percent = substr(100 * $clicks / $impmade, 0, 5);
122 122
                 }
123 123
                 if ($imptotal == 0) {
124
-                    $left = "" . _AM_BANNERS_BANNERS_UNLIMIT . "";
124
+                    $left = ""._AM_BANNERS_BANNERS_UNLIMIT."";
125 125
                 } else {
126 126
                     $left = $imptotal - $impmade;
127 127
                 }
@@ -131,9 +131,9 @@  discard block
 block discarded – undo
131 131
                 } else {
132 132
                     $img = '';
133 133
                     if (stristr($imageurl, '.swf')) {
134
-                        $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>';
134
+                        $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>';
135 135
                     } else {
136
-                        $img .= '<img src="' . $imageurl . '" alt="" />';
136
+                        $img .= '<img src="'.$imageurl.'" alt="" />';
137 137
                     }
138 138
                 }
139 139
 
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
         }
160 160
         // Display Page Navigation
161 161
         if ($banner_count > $nb_banners) {
162
-            $nav = new XoopsPageNav($banner_count, $nb_banners, $start, 'start', 'startF=' . $startF);
162
+            $nav = new XoopsPageNav($banner_count, $nb_banners, $start, 'start', 'startF='.$startF);
163 163
             $xoops->tpl()->assign('nav_menu_banner', $nav->renderNav(4));
164 164
         }
165 165
         // Display Finished Banners
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
         $criteria = new CriteriaCompo();
168 168
         $criteria->add(new Criteria('banner_status', 0));
169 169
         if ($admin == false) {
170
-            $criteria->add(new Criteria('banner_cid', '(' . implode(',', $cid) . ')', 'IN'));
170
+            $criteria->add(new Criteria('banner_cid', '('.implode(',', $cid).')', 'IN'));
171 171
         }
172 172
         $criteria->setSort("banner_datestart");
173 173
         $criteria->setOrder("DESC");
@@ -206,9 +206,9 @@  discard block
 block discarded – undo
206 206
                 } else {
207 207
                     $img = '<div id="xo-bannerfix">';
208 208
                     if (stristr($imageurl, '.swf')) {
209
-                        $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>';
209
+                        $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>';
210 210
                     } else {
211
-                        $img .= '<img src="' . $imageurl . '" alt="" />';
211
+                        $img .= '<img src="'.$imageurl.'" alt="" />';
212 212
                     }
213 213
 
214 214
                     $img .= '</div>';
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
         }
231 231
         // Display Page Navigation
232 232
         if ($banner_finish_count > $nb_banners) {
233
-            $nav = new XoopsPageNav($banner_finish_count, $nb_banners, $startF, 'startF', 'start=' . $start);
233
+            $nav = new XoopsPageNav($banner_finish_count, $nb_banners, $startF, 'startF', 'start='.$start);
234 234
             $xoops->tpl()->assign('nav_menu_bannerF', $nav->renderNav(4));
235 235
         }
236 236
         $xoops->footer();
@@ -398,7 +398,7 @@  discard block
 block discarded – undo
398 398
                 if ($xoops->security()->checkReferer()) {
399 399
                     $banner->setVar('banner_clicks', $banner->getVar('banner_clicks') + 1);
400 400
                     $banner_Handler->insert($banner);
401
-                    header('Location: ' . $banner->getVar('banner_clickurl'));
401
+                    header('Location: '.$banner->getVar('banner_clickurl'));
402 402
                     exit();
403 403
                 } else {
404 404
                     //No valid referer found so some javascript error or direct access found
Please login to merge, or discard this patch.
htdocs/modules/mainmenu/blocks/mainmenu_mainmenu.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
                     if ($helper->isCurrentModule() && isset($res['subMenu']) && is_array($res['subMenu'])) {
56 56
                         foreach ($res['subMenu'] as  $key => $subMenu) {
57 57
                             if (isset($subMenu['name']) && isset($subMenu['link'])) {
58
-                                $subMenu['icon'] = isset($subMenu['icon']) ? $subMenu['icon'] :'glyphicon-menu-right';
58
+                                $subMenu['icon'] = isset($subMenu['icon']) ? $subMenu['icon'] : 'glyphicon-menu-right';
59 59
                                 $res['subMenu'][$key] = $subMenu;
60 60
                             }
61 61
                         }
Please login to merge, or discard this patch.
htdocs/modules/thumbs/admin/about.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
  * @package   thumbs
18 18
  * @author    Mage Grégory (AKA Mage)
19 19
  */
20
-include __DIR__ . '/header.php';
20
+include __DIR__.'/header.php';
21 21
 $xoops = Xoops::getInstance();
22 22
 $xoops->header();
23 23
 $aboutAdmin = new \Xoops\Module\Admin();
Please login to merge, or discard this patch.
htdocs/modules/thumbs/admin/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
  * @package   thumbs
18 18
  * @author    Mage Grégory (AKA Mage)
19 19
  */
20
-include __DIR__ . '/header.php';
20
+include __DIR__.'/header.php';
21 21
 
22 22
 $xoops = Xoops::getInstance();
23 23
 
Please login to merge, or discard this patch.
htdocs/modules/thumbs/admin/header.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,4 +17,4 @@
 block discarded – undo
17 17
  * @package   thumbs
18 18
  * @author    Mage Grégory (AKA Mage)
19 19
  */
20
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
20
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
Please login to merge, or discard this patch.
htdocs/modules/thumbs/preloads/preload.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
     public static function eventCoreServiceLocateThumbnail(Provider $provider)
34 34
     {
35 35
         if (is_a($provider, '\Xoops\Core\Service\Provider')) {
36
-            $path = dirname(__DIR__) . '/class/ThumbsProvider.php';
36
+            $path = dirname(__DIR__).'/class/ThumbsProvider.php';
37 37
             require $path;
38 38
             $object = new ThumbsProvider();
39 39
             $provider->register($object);
Please login to merge, or discard this patch.