Completed
Push — master ( c35c76...d79f0a )
by Michael
05:53
created
versions/extcal_2_04.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
     {
30 30
         global $xoopsDB;
31 31
 
32
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('extcal_event') . "` ADD `event_nbmember` tinyint(4) NOT NULL default '0' AFTER `event_submitdate` ;";
32
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('extcal_event')."` ADD `event_nbmember` tinyint(4) NOT NULL default '0' AFTER `event_submitdate` ;";
33 33
         $xoopsDB->query($sql);
34 34
     }
35 35
 
Please login to merge, or discard this patch.
class/tableForm.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -56,13 +56,13 @@  discard block
 block discarded – undo
56 56
      */
57 57
     public function insertBreak($extra = '', $class = '')
58 58
     {
59
-        $class = ($class != '') ? " class='" . preg_replace('/[^A-Za-z0-9\s\s_-]/i', '', $class) . "'" : '';
59
+        $class = ($class != '') ? " class='".preg_replace('/[^A-Za-z0-9\s\s_-]/i', '', $class)."'" : '';
60 60
         // Fix for $extra tag not showing
61 61
         if ($extra) {
62
-            $extra = '<tr><td colspan="2" ' . $class . '>' . $extra . '</td></tr>';
62
+            $extra = '<tr><td colspan="2" '.$class.'>'.$extra.'</td></tr>';
63 63
             $this->addElement($extra);
64 64
         } else {
65
-            $extra = '<tr><td colspan="2" ' . $class . '>&nbsp;</td></tr>';
65
+            $extra = '<tr><td colspan="2" '.$class.'>&nbsp;</td></tr>';
66 66
             $this->addElement($extra);
67 67
         }
68 68
     }
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
         }
93 93
 
94 94
         if ($title <> '') {
95
-            $ret .= '<tr><th colspan="2">' . $title . '</th></tr>';
95
+            $ret .= '<tr><th colspan="2">'.$title.'</th></tr>';
96 96
         }
97 97
 
98 98
         $hidden = '';
@@ -104,24 +104,24 @@  discard block
 block discarded – undo
104 104
                 if (!$ele->getNocolspan()) {
105 105
                     $ret .= '<tr valign="top" align="left"><td class="head">';
106 106
                     if (($caption = $ele->getCaption()) != '') {
107
-                        $ret .= '<div class="xoops-form-element-caption' . ($ele->isRequired() ? '-required' : '') . '">';
108
-                        $ret .= '<span class="caption-text">' . $caption . '</span>';
107
+                        $ret .= '<div class="xoops-form-element-caption'.($ele->isRequired() ? '-required' : '').'">';
108
+                        $ret .= '<span class="caption-text">'.$caption.'</span>';
109 109
                         $ret .= '<span class="caption-marker">*</span>';
110 110
                         $ret .= '</div>';
111 111
                     }
112 112
                     if (($desc = $ele->getDescription()) != '') {
113
-                        $ret .= '<div class="xoops-form-element-help">' . $desc . '</div>';
113
+                        $ret .= '<div class="xoops-form-element-help">'.$desc.'</div>';
114 114
                     }
115
-                    $ret .= '</td><td class="' . $class . '">' . $ele->render() . '</td></tr>' . NWLINE;
115
+                    $ret .= '</td><td class="'.$class.'">'.$ele->render().'</td></tr>'.NWLINE;
116 116
                 } else {
117 117
                     $ret .= '<tr valign="top" align="left"><td class="head" colspan="2">';
118 118
                     if (($caption = $ele->getCaption()) != '') {
119
-                        $ret .= '<div class="xoops-form-element-caption' . ($ele->isRequired() ? '-required' : '') . '">';
120
-                        $ret .= '<span class="caption-text">' . $caption . '</span>';
119
+                        $ret .= '<div class="xoops-form-element-caption'.($ele->isRequired() ? '-required' : '').'">';
120
+                        $ret .= '<span class="caption-text">'.$caption.'</span>';
121 121
                         $ret .= '<span class="caption-marker">*</span>';
122 122
                         $ret .= '</div>';
123 123
                     }
124
-                    $ret .= '</td></tr><tr valign="top" align="left"><td class="' . $class . '" colspan="2">' . $ele->render() . '</td></tr>';
124
+                    $ret .= '</td></tr><tr valign="top" align="left"><td class="'.$class.'" colspan="2">'.$ele->render().'</td></tr>';
125 125
                 }
126 126
             } else {
127 127
                 $hidden .= $ele->render();
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
             $ret .= '</table>';
133 133
         }
134 134
 
135
-        $ret .= NWLINE . ' ' . $hidden . NWLINE;
135
+        $ret .= NWLINE.' '.$hidden.NWLINE;
136 136
 
137 137
         return $ret;
138 138
     }
Please login to merge, or discard this patch.
class/colorTools.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -159,9 +159,9 @@
 block discarded – undo
159 159
         $tHex = array('', '', '', '');
160 160
 
161 161
         $tHex[0] = $aColors[0];
162
-        $tHex[1] = substr('00' . dechex($aColors[1]), -2);
163
-        $tHex[2] = substr('00' . dechex($aColors[2]), -2);
164
-        $tHex[3] = substr('00' . dechex($aColors[3]), -2);
162
+        $tHex[1] = substr('00'.dechex($aColors[1]), -2);
163
+        $tHex[2] = substr('00'.dechex($aColors[2]), -2);
164
+        $tHex[3] = substr('00'.dechex($aColors[3]), -2);
165 165
 
166 166
         $colorHexa = implode('', $tHex);
167 167
 
Please login to merge, or discard this patch.
class/form/spin/formspin.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
      */
204 204
     public function setMin($min)
205 205
     {
206
-        $this->_min = (int)$min;
206
+        $this->_min = (int) $min;
207 207
     }
208 208
     /*-----------------------------------------------------------------*/
209 209
     /**
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
      */
222 222
     public function setMax($max)
223 223
     {
224
-        $this->_max = (int)$max;
224
+        $this->_max = (int) $max;
225 225
     }
226 226
 
227 227
     /*-----------------------------------------------------------------*/
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
      */
243 243
     public function setSmallIncrement($smallIncrement)
244 244
     {
245
-        $this->_smallIncrement = (int)$smallIncrement;
245
+        $this->_smallIncrement = (int) $smallIncrement;
246 246
         if ($this->_smallIncrement == 0) {
247 247
             $this->_smallIncrement = 1;
248 248
         }
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
      */
265 265
     public function setLargeIncrement($largeIncrement)
266 266
     {
267
-        $this->_largeIncrement = (int)$largeIncrement;
267
+        $this->_largeIncrement = (int) $largeIncrement;
268 268
         if ($this->_largeIncrement == 0) {
269 269
             $this->_largeIncrement = 10;
270 270
         }
@@ -405,7 +405,7 @@  discard block
 block discarded – undo
405 405
         $sFolderImg  = "{$sSpinFolder}/images/{$this->getImgFolder()}/";
406 406
 
407 407
         $prefixe  = $this->getName();
408
-        $prefixe2 = 'spin' . $prefixe;
408
+        $prefixe2 = 'spin'.$prefixe;
409 409
 
410 410
         $smallIncrement = $this->getSmallIncrement();
411 411
         $largeIncrement = $this->getLargeIncrement();
@@ -424,7 +424,7 @@  discard block
 block discarded – undo
424 424
         $t = array();
425 425
 
426 426
         if ($this->_loadJS) {
427
-            $js  = $sSpinFolder . '/js/spin.js';
427
+            $js  = $sSpinFolder.'/js/spin.js';
428 428
             $t[] = "<script src='{$js}' type='text/javascript'></script>";
429 429
         }
430 430
 
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
         //-------------------------------------------------------
470 470
 
471 471
         $t[] = '  </tr>';
472
-        $t[] = '</table>' . "\n";
472
+        $t[] = '</table>'."\n";
473 473
         $t[] = '</div>';
474 474
         //-------------------------------------------
475 475
         $html = implode("\n", $t);
Please login to merge, or discard this patch.
include/notification.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
         $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
22 22
         $event        = $eventHandler->getEvent($itemId, 0, true);
23 23
         $item['name'] = $event->getVar('event_title');
24
-        $item['url']  = XOOPS_URL . '/modules/extcal/event.php?event=' . $event->getVar('event_id');
24
+        $item['url']  = XOOPS_URL.'/modules/extcal/event.php?event='.$event->getVar('event_id');
25 25
 
26 26
         return $item;
27 27
     }
Please login to merge, or discard this patch.
admin/menu.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -5,14 +5,14 @@  discard block
 block discarded – undo
5 5
 $moduleDirName = basename(dirname(__DIR__));
6 6
 $moduleHandler = xoops_getHandler('module');
7 7
 $module        = $moduleHandler->getByDirname($moduleDirName);
8
-$pathIcon32    = '../../' . $module->getInfo('sysicons32');
9
-$pathModIcon32 = './' . $module->getInfo('modicons32');
8
+$pathIcon32    = '../../'.$module->getInfo('sysicons32');
9
+$pathModIcon32 = './'.$module->getInfo('modicons32');
10 10
 xoops_loadLanguage('modinfo', $moduleDirName);
11 11
 
12
-$xoopsModuleAdminPath = XOOPS_ROOT_PATH . '/' . $module->getInfo('dirmoduleadmin');
12
+$xoopsModuleAdminPath = XOOPS_ROOT_PATH.'/'.$module->getInfo('dirmoduleadmin');
13 13
 
14
-if (!file_exists($fileinc = $xoopsModuleAdminPath . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
15
-    $fileinc = $xoopsModuleAdminPath . '/language/english/main.php';
14
+if (!file_exists($fileinc = $xoopsModuleAdminPath.'/language/'.$GLOBALS['xoopsConfig']['language'].'/'.'main.php')) {
15
+    $fileinc = $xoopsModuleAdminPath.'/language/english/main.php';
16 16
 }
17 17
 
18 18
 include_once $fileinc;
@@ -20,33 +20,33 @@  discard block
 block discarded – undo
20 20
 $adminmenu[] = array(
21 21
     'title' => _AM_MODULEADMIN_HOME,
22 22
     'link'  => 'admin/index.php',
23
-    'icon'  => $pathIcon32 . '/home.png'
23
+    'icon'  => $pathIcon32.'/home.png'
24 24
 );
25 25
 
26 26
 $adminmenu[] = array(
27 27
     'title' => _MI_EXTCAL_CATEGORY,
28 28
     'link'  => 'admin/cat.php',
29
-    'icon'  => $pathIcon32 . '/category.png'
29
+    'icon'  => $pathIcon32.'/category.png'
30 30
 );
31 31
 
32 32
 $adminmenu[] = array(
33 33
     'title' => _MI_EXTCAL_EVENT,
34 34
     'link'  => 'admin/event.php',
35
-    'icon'  => $pathIcon32 . '/event.png'
35
+    'icon'  => $pathIcon32.'/event.png'
36 36
 );
37 37
 $adminmenu[] = array(
38 38
     'title' => _MI_EXTCAL_ETABLISSEMENTS,
39 39
     'link'  => 'admin/etablissement.php',
40
-    'icon'  => $pathModIcon32 . '/etablissement.png'
40
+    'icon'  => $pathModIcon32.'/etablissement.png'
41 41
 );
42 42
 $adminmenu[] = array(
43 43
     'title' => _MI_EXTCAL_PERMISSIONS,
44 44
     'link'  => 'admin/permissions.php',
45
-    'icon'  => $pathIcon32 . '/permissions.png'
45
+    'icon'  => $pathIcon32.'/permissions.png'
46 46
 );
47 47
 
48 48
 $adminmenu[] = array(
49 49
     'title' => _AM_MODULEADMIN_ABOUT,
50 50
     'link'  => 'admin/about.php',
51
-    'icon'  => $pathIcon32 . '/about.png'
51
+    'icon'  => $pathIcon32.'/about.png'
52 52
 );
Please login to merge, or discard this patch.
language/english/modinfo.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-include_once __DIR__ . '/../../include/constantes.php';
3
+include_once __DIR__.'/../../include/constantes.php';
4 4
 define('_MI_EXTCAL_NAME', 'eXtCal');
5 5
 define('_MI_EXTCAL_ABOUT', 'About');
6 6
 define('_MI_EXTCAL_AFTER', 'After');
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 define('_MI_EXTCAL_START_PAGE', 'Module home page');
136 136
 define('_MI_EXTCAL_SUBMIT_EVENT', 'Submit Event');
137 137
 define('_MI_EXTCAL_TABS_WEIGHT', 'Order of the Tabs');
138
-define('_MI_EXTCAL_TABS_WEIGHT_DESC', 'Set the tab order <br>Be careful to respect tab names:<br>' . "<span style='color:#0000FF;'>" . _EXTCAL_NAV_LIST . '</span>' . ' <br>Separator: new line');
138
+define('_MI_EXTCAL_TABS_WEIGHT_DESC', 'Set the tab order <br>Be careful to respect tab names:<br>'."<span style='color:#0000FF;'>"._EXTCAL_NAV_LIST.'</span>'.' <br>Separator: new line');
139 139
 define('_MI_EXTCAL_VISIBLE_TAB_DESC', 'Define the visible view.');
140 140
 define('_MI_EXTCAL_VISIBLE_TABS', 'Visible tab');
141 141
 define('_MI_EXTCAL_WEEK_START_DAY', 'Week start Day');
Please login to merge, or discard this patch.
header.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,23 +1,23 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-include XOOPS_ROOT_PATH . '/header.php';
3
+include XOOPS_ROOT_PATH.'/header.php';
4 4
 
5
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
5
+include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
6 6
 
7
-include_once __DIR__ . '/include/agenda_fnc.php';
8
-include_once __DIR__ . '/class/utilities.php';
7
+include_once __DIR__.'/include/agenda_fnc.php';
8
+include_once __DIR__.'/class/utilities.php';
9 9
 
10
-include_once __DIR__ . '/class/perm.php';
11
-include_once __DIR__ . '/class/form/extcalform.php';
10
+include_once __DIR__.'/class/perm.php';
11
+include_once __DIR__.'/class/form/extcalform.php';
12 12
 
13 13
 xoops_loadLanguage('modinfo', _EXTCAL_MODULE);
14 14
 
15 15
 //------------------------------------------------------
16
-require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Util/Textual.php';
17
-require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Month/Weeks.php';
18
-require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Month/Weekdays.php';
19
-require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Week.php';
20
-require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Day.php';
16
+require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Util/Textual.php';
17
+require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Month/Weeks.php';
18
+require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Month/Weekdays.php';
19
+require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Week.php';
20
+require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Day.php';
21 21
 
22 22
 //------------------------------------------------------
23 23
 // Getting eXtCal object's handler
Please login to merge, or discard this patch.
include/onupdate.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 if ((!defined('XOOPS_ROOT_PATH')) || !($GLOBALS['xoopsUser'] instanceof XoopsUser)
20 20
     || !$GLOBALS['xoopsUser']->IsAdmin()
21 21
 ) {
22
-    exit('Restricted access' . PHP_EOL);
22
+    exit('Restricted access'.PHP_EOL);
23 23
 }
24 24
 
25 25
 /**
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 function xoops_module_pre_update_extcal(XoopsModule $module)
45 45
 {
46 46
     $moduleDirName  = basename(dirname(__DIR__));
47
-    $classUtilities = ucfirst($moduleDirName) . 'Utilities';
47
+    $classUtilities = ucfirst($moduleDirName).'Utilities';
48 48
     if (!class_exists($classUtilities)) {
49 49
         xoops_load('utilities', $moduleDirName);
50 50
     }
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
     }
83 83
 
84 84
 
85
-    $fld = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/versions/';
85
+    $fld = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/versions/';
86 86
     $cls = 'extcal_%1$s';
87 87
 
88 88
     $version = array(
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
     while (list($key, $val) = each($version)) {
101 101
         if ($previousVersion < $val) {
102 102
             $name = sprintf($cls, $key);
103
-            $f    = $fld . $name . '.php';
103
+            $f    = $fld.$name.'.php';
104 104
             //ext_echo ("<hr>{$f}<hr>");
105 105
             if (is_readable($f)) {
106 106
                 echo "mise à jour version : {$key} = {$val}<br>";
@@ -115,8 +115,8 @@  discard block
 block discarded – undo
115 115
     if ($previousVersion < 240) {
116 116
 
117 117
 
118
-        $configurator = include __DIR__ . '/config.php';
119
-        $classUtilities = ucfirst($moduleDirName) . 'Utilities';
118
+        $configurator = include __DIR__.'/config.php';
119
+        $classUtilities = ucfirst($moduleDirName).'Utilities';
120 120
         if (!class_exists($classUtilities)) {
121 121
             xoops_load('utilities', $moduleDirName);
122 122
         }
@@ -125,14 +125,14 @@  discard block
 block discarded – undo
125 125
         //delete old HTML templates
126 126
         if (count($configurator['templateFolders']) > 0) {
127 127
             foreach ($configurator['templateFolders'] as $folder) {
128
-                $templateFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $folder);
128
+                $templateFolder = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$folder);
129 129
                 if (is_dir($templateFolder)) {
130 130
                     $templateList = array_diff(scandir($templateFolder), array('..', '.'));
131 131
                     foreach ($templateList as $k => $v) {
132
-                        $fileInfo = new SplFileInfo($templateFolder . $v);
132
+                        $fileInfo = new SplFileInfo($templateFolder.$v);
133 133
                         if ($fileInfo->getExtension() === 'html' && $fileInfo->getFilename() !== 'index.html') {
134
-                            if (file_exists($templateFolder . $v)) {
135
-                                unlink($templateFolder . $v);
134
+                            if (file_exists($templateFolder.$v)) {
135
+                                unlink($templateFolder.$v);
136 136
                             }
137 137
                         }
138 138
                     }
@@ -144,9 +144,9 @@  discard block
 block discarded – undo
144 144
 
145 145
         //  ---  COPY blank.png FILES ---------------
146 146
         if (count($configurator['copyFiles']) > 0) {
147
-            $file = __DIR__ . '/../assets/images/blank.png';
147
+            $file = __DIR__.'/../assets/images/blank.png';
148 148
             foreach (array_keys($configurator['copyFiles']) as $i) {
149
-                $dest = $configurator['copyFiles'][$i] . '/blank.png';
149
+                $dest = $configurator['copyFiles'][$i].'/blank.png';
150 150
                 $classUtilities::copyFile($file, $dest);
151 151
             }
152 152
         }
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
         if (count($configurator['oldFiles']) > 0) {
156 156
             //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
157 157
             foreach (array_keys($configurator['oldFiles']) as $i) {
158
-                $tempFile = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator['oldFiles'][$i]);
158
+                $tempFile = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$configurator['oldFiles'][$i]);
159 159
                 if (is_file($tempFile)) {
160 160
                     unlink($tempFile);
161 161
                 }
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
         //---------------------
166 166
 
167 167
         //delete .html entries from the tpl table
168
-        $sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $module->getVar('dirname',
168
+        $sql = 'DELETE FROM '.$xoopsDB->prefix('tplfile')." WHERE `tpl_module` = '".$module->getVar('dirname',
169 169
                                                                                                           'n')
170 170
                . "' AND `tpl_file` LIKE '%.html%'";
171 171
         $xoopsDB->queryF($sql);
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
         xoops_load('XoopsFile');
175 175
 
176 176
         //delete /images directory ============
177
-        $imagesDirectory = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/images/');
177
+        $imagesDirectory = $GLOBALS['xoops']->path('modules/'.$module->getVar('dirname', 'n').'/images/');
178 178
         $folderHandler   = XoopsFile::getHandler('folder', $imagesDirectory);
179 179
         $folderHandler->delete($imagesDirectory);
180 180
     }
Please login to merge, or discard this patch.