@@ -29,7 +29,7 @@ |
||
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 |
@@ -56,13 +56,13 @@ discard block |
||
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 . '> </td></tr>'; |
|
65 | + $extra = '<tr><td colspan="2" '.$class.'> </td></tr>'; |
|
66 | 66 | $this->addElement($extra); |
67 | 67 | } |
68 | 68 | } |
@@ -92,7 +92,7 @@ discard block |
||
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 |
||
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 |
||
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 | } |
@@ -40,7 +40,7 @@ |
||
40 | 40 | * |
41 | 41 | * @internal param bool $encode To sanitizer the text? |
42 | 42 | * |
43 | - * @return array array of name/value pairs assigned to form elements |
|
43 | + * @return boolean|string array of name/value pairs assigned to form elements |
|
44 | 44 | */ |
45 | 45 | public function getAddBaliseTable() |
46 | 46 | { |
@@ -21,7 +21,7 @@ |
||
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 | } |
@@ -1,6 +1,6 @@ discard block |
||
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 |
||
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'); |
@@ -1,13 +1,13 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include dirname(dirname(__DIR__)) . '/mainfile.php'; |
|
4 | -include_once __DIR__ . '/include/constantes.php'; |
|
5 | -$params = array( |
|
3 | +include dirname(dirname(__DIR__)).'/mainfile.php'; |
|
4 | +include_once __DIR__.'/include/constantes.php'; |
|
5 | +$params = array( |
|
6 | 6 | 'view' => _EXTCAL_NAV_SEARCH, |
7 | 7 | 'file' => _EXTCAL_FILE_SEARCH, |
8 | 8 | ); |
9 | 9 | $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl"; |
10 | -include_once __DIR__ . '/header.php'; |
|
10 | +include_once __DIR__.'/header.php'; |
|
11 | 11 | |
12 | 12 | $recurEventsArray = array(); |
13 | 13 | //needed to save the state of the form, so we don't show on the first time the list of available events |
@@ -19,10 +19,10 @@ discard block |
||
19 | 19 | /***************************************************************/ |
20 | 20 | $searchExp = isset($_POST['searchExp']) ? $_POST['searchExp'] : ''; |
21 | 21 | $andor = isset($_POST['andor']) ? $_POST['andor'] : ''; |
22 | -$year = isset($_POST['year']) ? (int)$_POST['year'] : date('Y'); |
|
23 | -$month = isset($_POST['month']) ? (int)$_POST['month'] : date('n'); |
|
24 | -$day = isset($_POST['day']) ? (int)$_POST['day'] : 0; |
|
25 | -$cat = isset($_POST['cat']) ? (int)$_POST['cat'] : 0; |
|
22 | +$year = isset($_POST['year']) ? (int) $_POST['year'] : date('Y'); |
|
23 | +$month = isset($_POST['month']) ? (int) $_POST['month'] : date('n'); |
|
24 | +$day = isset($_POST['day']) ? (int) $_POST['day'] : 0; |
|
25 | +$cat = isset($_POST['cat']) ? (int) $_POST['cat'] : 0; |
|
26 | 26 | $orderby1 = isset($_POST['orderby1']) ? $_POST['orderby1'] : 'cat_name ASC'; |
27 | 27 | $orderby2 = isset($_POST['orderby2']) ? $_POST['orderby2'] : 'event_title ASC'; |
28 | 28 | $orderby3 = isset($_POST['orderby3']) ? $_POST['orderby3'] : ''; |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | } |
144 | 144 | } |
145 | 145 | |
146 | -$eventsArray = array_merge((array)$eventsArray, (array)$recurEventsArray); |
|
146 | +$eventsArray = array_merge((array) $eventsArray, (array) $recurEventsArray); |
|
147 | 147 | |
148 | 148 | // Sort event array by event start |
149 | 149 | //usort($eventsArray, "orderEvents"); |
@@ -234,4 +234,4 @@ discard block |
||
234 | 234 | $xoopsTpl->assign('lang', $lang); |
235 | 235 | $xoopsTpl->assign('view', 'search'); |
236 | 236 | |
237 | -include XOOPS_ROOT_PATH . '/footer.php'; |
|
237 | +include XOOPS_ROOT_PATH.'/footer.php'; |
@@ -1,23 +1,23 @@ |
||
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 |
@@ -17,18 +17,18 @@ discard block |
||
17 | 17 | * @author XOOPS Development Team |
18 | 18 | */ |
19 | 19 | |
20 | -require_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; |
|
20 | +require_once dirname(dirname(dirname(__DIR__))).'/mainfile.php'; |
|
21 | 21 | $moduleDirName = basename(dirname(__DIR__)); |
22 | 22 | |
23 | 23 | if (!defined('EXTCAL_DIRNAME')) { |
24 | 24 | define('EXTCAL_DIRNAME', $moduleDirName); |
25 | - define('EXTCAL_PATH', XOOPS_ROOT_PATH . '/modules/' . EXTCAL_DIRNAME); |
|
26 | - define('EXTCAL_URL', XOOPS_URL . '/modules/' . EXTCAL_DIRNAME); |
|
27 | - define('EXTCAL_ADMIN', EXTCAL_URL . '/admin/index.php'); |
|
28 | - define('EXTCAL_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . EXTCAL_DIRNAME); |
|
29 | - define('EXTCAL_AUTHOR_LOGOIMG', EXTCAL_URL . '/assets/images/logoModule.png'); |
|
30 | - define('EXTCAL_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . EXTCAL_DIRNAME); // WITHOUT Trailing slash |
|
31 | - define('EXTCAL_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . EXTCAL_DIRNAME); // WITHOUT Trailing slash |
|
25 | + define('EXTCAL_PATH', XOOPS_ROOT_PATH.'/modules/'.EXTCAL_DIRNAME); |
|
26 | + define('EXTCAL_URL', XOOPS_URL.'/modules/'.EXTCAL_DIRNAME); |
|
27 | + define('EXTCAL_ADMIN', EXTCAL_URL.'/admin/index.php'); |
|
28 | + define('EXTCAL_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.EXTCAL_DIRNAME); |
|
29 | + define('EXTCAL_AUTHOR_LOGOIMG', EXTCAL_URL.'/assets/images/logoModule.png'); |
|
30 | + define('EXTCAL_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.EXTCAL_DIRNAME); // WITHOUT Trailing slash |
|
31 | + define('EXTCAL_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.EXTCAL_DIRNAME); // WITHOUT Trailing slash |
|
32 | 32 | |
33 | 33 | } |
34 | 34 | |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | 'name' => 'Module Configurator', |
38 | 38 | 'uploadFolders' => array( |
39 | 39 | EXTCAL_UPLOAD_PATH, |
40 | - EXTCAL_UPLOAD_PATH . '/etablissement' |
|
40 | + EXTCAL_UPLOAD_PATH.'/etablissement' |
|
41 | 41 | ), |
42 | 42 | // 'copyFiles' => array( |
43 | 43 | // EXTCAL_UPLOAD_PATH, |
@@ -58,4 +58,4 @@ discard block |
||
58 | 58 | |
59 | 59 | // module information |
60 | 60 | $mod_copyright = "<a href='http://xoops.org' title='XOOPS Project' target='_blank'> |
61 | - <img src='" . EXTCAL_AUTHOR_LOGOIMG . "' alt='XOOPS Project' /></a>"; |
|
61 | + <img src='" . EXTCAL_AUTHOR_LOGOIMG."' alt='XOOPS Project' /></a>"; |
@@ -102,8 +102,8 @@ |
||
102 | 102 | define('_EXTCAL_NAV_NEW_EVENT', 'new-event'); |
103 | 103 | |
104 | 104 | define('_EXTCAL_NAV_LIST', |
105 | - _EXTCAL_NAV_CALMONTH . "\n" . _EXTCAL_NAV_CALWEEK . "\n" . _EXTCAL_NAV_YEAR . "\n" . _EXTCAL_NAV_MONTH . "\n" . _EXTCAL_NAV_WEEK . "\n" . _EXTCAL_NAV_DAY . "\n" . _EXTCAL_NAV_AGENDA_WEEK . "\n" . _EXTCAL_NAV_AGENDA_DAY . "\n" |
|
106 | - . _EXTCAL_NAV_SEARCH . "\n" . _EXTCAL_NAV_NEW_EVENT); |
|
105 | + _EXTCAL_NAV_CALMONTH . "\n" . _EXTCAL_NAV_CALWEEK . "\n" . _EXTCAL_NAV_YEAR . "\n" . _EXTCAL_NAV_MONTH . "\n" . _EXTCAL_NAV_WEEK . "\n" . _EXTCAL_NAV_DAY . "\n" . _EXTCAL_NAV_AGENDA_WEEK . "\n" . _EXTCAL_NAV_AGENDA_DAY . "\n" |
|
106 | + . _EXTCAL_NAV_SEARCH . "\n" . _EXTCAL_NAV_NEW_EVENT); |
|
107 | 107 | |
108 | 108 | define('_EXTCAL_PREFIX_VIEW', 'view_'); |
109 | 109 | define('_EXTCAL_SUFFIX_VIEW', '.php'); |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | define('_EXTCAL_CLN_EVENT', 'ExtcalEvent'); |
38 | 38 | |
39 | 39 | //------------------------------------------------------------------- |
40 | -define('_EXTCAL_PEAR_ROOT_DEFAULT', dirname(__DIR__) . '/class/pear'); |
|
40 | +define('_EXTCAL_PEAR_ROOT_DEFAULT', dirname(__DIR__).'/class/pear'); |
|
41 | 41 | //define('_EXTCAL_PEAR_ROOT', 'F:/wamp/www/xfr254b/xoops_lib/Frameworks/pear' ); |
42 | 42 | |
43 | 43 | $pear_path = _EXTCAL_PEAR_ROOT_DEFAULT; |
@@ -71,22 +71,22 @@ discard block |
||
71 | 71 | //} |
72 | 72 | define('_EXTCAL_PEAR_ROOT', $pear_path); |
73 | 73 | |
74 | -define('_EXTCAL_PEAR_CALENDAR_ROOT', _EXTCAL_PEAR_ROOT . '/Calendar'); |
|
75 | -define('CALENDAR_ROOT', _EXTCAL_PEAR_CALENDAR_ROOT . '/'); |
|
74 | +define('_EXTCAL_PEAR_CALENDAR_ROOT', _EXTCAL_PEAR_ROOT.'/Calendar'); |
|
75 | +define('CALENDAR_ROOT', _EXTCAL_PEAR_CALENDAR_ROOT.'/'); |
|
76 | 76 | |
77 | 77 | //------------------------------------------------------------------- |
78 | 78 | define('_EXTCAL_SHOW_NO_PICTURE', false); |
79 | 79 | |
80 | 80 | define('_EXTCAL_PATH_HORLOGES', '/modules/extcal/assets/images/horloges/'); |
81 | -define('_EXTCAL_PATH_ICONS16', XOOPS_URL . '/Frameworks/moduleclasses/icons/16/'); |
|
82 | -define('_EXTCAL_PATH_ICONS32', XOOPS_URL . '/Frameworks/moduleclasses/icons/32/'); |
|
83 | -define('_EXTCAL_PATH_FO', XOOPS_URL . '/modules/extcal/'); |
|
84 | -define('_EXTCAL_PATH_BO', _EXTCAL_PATH_FO . 'admin/'); |
|
85 | -define('_EXTCAL_PATH_LG', XOOPS_URL . '/modules/extcal/languages/'); |
|
81 | +define('_EXTCAL_PATH_ICONS16', XOOPS_URL.'/Frameworks/moduleclasses/icons/16/'); |
|
82 | +define('_EXTCAL_PATH_ICONS32', XOOPS_URL.'/Frameworks/moduleclasses/icons/32/'); |
|
83 | +define('_EXTCAL_PATH_FO', XOOPS_URL.'/modules/extcal/'); |
|
84 | +define('_EXTCAL_PATH_BO', _EXTCAL_PATH_FO.'admin/'); |
|
85 | +define('_EXTCAL_PATH_LG', XOOPS_URL.'/modules/extcal/languages/'); |
|
86 | 86 | |
87 | 87 | define('_EXTCAL_IMG_INTERVAL', 'interval04.png'); |
88 | -define('_EXTCAL_IMG_INTERVAL16', _EXTCAL_PATH_ICONS16 . _EXTCAL_IMG_INTERVAL); |
|
89 | -define('_EXTCAL_IMG_INTERVAL32', _EXTCAL_PATH_ICONS32 . _EXTCAL_IMG_INTERVAL); |
|
88 | +define('_EXTCAL_IMG_INTERVAL16', _EXTCAL_PATH_ICONS16._EXTCAL_IMG_INTERVAL); |
|
89 | +define('_EXTCAL_IMG_INTERVAL32', _EXTCAL_PATH_ICONS32._EXTCAL_IMG_INTERVAL); |
|
90 | 90 | |
91 | 91 | //define('_EXTCAL_DIRNAME', $xoopsModule->getVar('dirname')); |
92 | 92 | |
@@ -102,22 +102,22 @@ discard block |
||
102 | 102 | define('_EXTCAL_NAV_NEW_EVENT', 'new-event'); |
103 | 103 | |
104 | 104 | define('_EXTCAL_NAV_LIST', |
105 | - _EXTCAL_NAV_CALMONTH . "\n" . _EXTCAL_NAV_CALWEEK . "\n" . _EXTCAL_NAV_YEAR . "\n" . _EXTCAL_NAV_MONTH . "\n" . _EXTCAL_NAV_WEEK . "\n" . _EXTCAL_NAV_DAY . "\n" . _EXTCAL_NAV_AGENDA_WEEK . "\n" . _EXTCAL_NAV_AGENDA_DAY . "\n" |
|
106 | - . _EXTCAL_NAV_SEARCH . "\n" . _EXTCAL_NAV_NEW_EVENT); |
|
105 | + _EXTCAL_NAV_CALMONTH."\n"._EXTCAL_NAV_CALWEEK."\n"._EXTCAL_NAV_YEAR."\n"._EXTCAL_NAV_MONTH."\n"._EXTCAL_NAV_WEEK."\n"._EXTCAL_NAV_DAY."\n"._EXTCAL_NAV_AGENDA_WEEK."\n"._EXTCAL_NAV_AGENDA_DAY."\n" |
|
106 | + . _EXTCAL_NAV_SEARCH."\n"._EXTCAL_NAV_NEW_EVENT); |
|
107 | 107 | |
108 | 108 | define('_EXTCAL_PREFIX_VIEW', 'view_'); |
109 | 109 | define('_EXTCAL_SUFFIX_VIEW', '.php'); |
110 | 110 | |
111 | -define('_EXTCAL_FILE_CALMONTH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_CALMONTH . _EXTCAL_SUFFIX_VIEW); |
|
112 | -define('_EXTCAL_FILE_CALWEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_CALWEEK . _EXTCAL_SUFFIX_VIEW); |
|
113 | -define('_EXTCAL_FILE_YEAR', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_YEAR . _EXTCAL_SUFFIX_VIEW); |
|
114 | -define('_EXTCAL_FILE_MONTH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_MONTH . _EXTCAL_SUFFIX_VIEW); |
|
115 | -define('_EXTCAL_FILE_WEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_WEEK . _EXTCAL_SUFFIX_VIEW); |
|
116 | -define('_EXTCAL_FILE_DAY', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_DAY . _EXTCAL_SUFFIX_VIEW); |
|
117 | -define('_EXTCAL_FILE_AGENDA_WEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_AGENDA_WEEK . _EXTCAL_SUFFIX_VIEW); |
|
118 | -define('_EXTCAL_FILE_AGENDA_DAY', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_AGENDA_DAY . _EXTCAL_SUFFIX_VIEW); |
|
119 | -define('_EXTCAL_FILE_SEARCH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_SEARCH . _EXTCAL_SUFFIX_VIEW); |
|
120 | -define('_EXTCAL_FILE_NEW_EVENT', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_NEW_EVENT . _EXTCAL_SUFFIX_VIEW); |
|
111 | +define('_EXTCAL_FILE_CALMONTH', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_CALMONTH._EXTCAL_SUFFIX_VIEW); |
|
112 | +define('_EXTCAL_FILE_CALWEEK', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_CALWEEK._EXTCAL_SUFFIX_VIEW); |
|
113 | +define('_EXTCAL_FILE_YEAR', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_YEAR._EXTCAL_SUFFIX_VIEW); |
|
114 | +define('_EXTCAL_FILE_MONTH', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_MONTH._EXTCAL_SUFFIX_VIEW); |
|
115 | +define('_EXTCAL_FILE_WEEK', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_WEEK._EXTCAL_SUFFIX_VIEW); |
|
116 | +define('_EXTCAL_FILE_DAY', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_DAY._EXTCAL_SUFFIX_VIEW); |
|
117 | +define('_EXTCAL_FILE_AGENDA_WEEK', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_AGENDA_WEEK._EXTCAL_SUFFIX_VIEW); |
|
118 | +define('_EXTCAL_FILE_AGENDA_DAY', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_AGENDA_DAY._EXTCAL_SUFFIX_VIEW); |
|
119 | +define('_EXTCAL_FILE_SEARCH', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_SEARCH._EXTCAL_SUFFIX_VIEW); |
|
120 | +define('_EXTCAL_FILE_NEW_EVENT', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_NEW_EVENT._EXTCAL_SUFFIX_VIEW); |
|
121 | 121 | |
122 | 122 | define('_EXTCAL_MULTILOADER', '/class/xoopsform/multiuploads/formmultiuploads.php'); |
123 | 123 |
@@ -166,8 +166,8 @@ |
||
166 | 166 | |
167 | 167 | //delete .html entries from the tpl table |
168 | 168 | $sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $module->getVar('dirname', |
169 | - 'n') |
|
170 | - . "' AND `tpl_file` LIKE '%.html%'"; |
|
169 | + 'n') |
|
170 | + . "' AND `tpl_file` LIKE '%.html%'"; |
|
171 | 171 | $xoopsDB->queryF($sql); |
172 | 172 | |
173 | 173 | // Load class XoopsFile ==================== |
@@ -19,7 +19,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 | } |