@@ -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,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 |
@@ -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', __DIR__ . '/../class/pear'); |
|
40 | +define('_EXTCAL_PEAR_ROOT_DEFAULT', __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; |
@@ -72,22 +72,22 @@ discard block |
||
72 | 72 | //} |
73 | 73 | define('_EXTCAL_PEAR_ROOT', $pear_path); |
74 | 74 | |
75 | -define('_EXTCAL_PEAR_CALENDAR_ROOT', _EXTCAL_PEAR_ROOT . '/Calendar'); |
|
76 | -define('CALENDAR_ROOT', _EXTCAL_PEAR_CALENDAR_ROOT . '/'); |
|
75 | +define('_EXTCAL_PEAR_CALENDAR_ROOT', _EXTCAL_PEAR_ROOT.'/Calendar'); |
|
76 | +define('CALENDAR_ROOT', _EXTCAL_PEAR_CALENDAR_ROOT.'/'); |
|
77 | 77 | |
78 | 78 | //------------------------------------------------------------------- |
79 | 79 | define('_EXTCAL_SHOW_NO_PICTURE', false); |
80 | 80 | |
81 | 81 | define('_EXTCAL_PATH_HORLOGES', '/modules/extcal/assets/images/horloges/'); |
82 | -define('_EXTCAL_PATH_ICONS16', XOOPS_URL . '/Frameworks/moduleclasses/icons/16/'); |
|
83 | -define('_EXTCAL_PATH_ICONS32', XOOPS_URL . '/Frameworks/moduleclasses/icons/32/'); |
|
84 | -define('_EXTCAL_PATH_FO', XOOPS_URL . '/modules/extcal/'); |
|
85 | -define('_EXTCAL_PATH_BO', _EXTCAL_PATH_FO . 'admin/'); |
|
86 | -define('_EXTCAL_PATH_LG', XOOPS_URL . '/modules/extcal/languages/'); |
|
82 | +define('_EXTCAL_PATH_ICONS16', XOOPS_URL.'/Frameworks/moduleclasses/icons/16/'); |
|
83 | +define('_EXTCAL_PATH_ICONS32', XOOPS_URL.'/Frameworks/moduleclasses/icons/32/'); |
|
84 | +define('_EXTCAL_PATH_FO', XOOPS_URL.'/modules/extcal/'); |
|
85 | +define('_EXTCAL_PATH_BO', _EXTCAL_PATH_FO.'admin/'); |
|
86 | +define('_EXTCAL_PATH_LG', XOOPS_URL.'/modules/extcal/languages/'); |
|
87 | 87 | |
88 | 88 | define('_EXTCAL_IMG_INTERVAL', 'interval04.png'); |
89 | -define('_EXTCAL_IMG_INTERVAL16', _EXTCAL_PATH_ICONS16 . _EXTCAL_IMG_INTERVAL); |
|
90 | -define('_EXTCAL_IMG_INTERVAL32', _EXTCAL_PATH_ICONS32 . _EXTCAL_IMG_INTERVAL); |
|
89 | +define('_EXTCAL_IMG_INTERVAL16', _EXTCAL_PATH_ICONS16._EXTCAL_IMG_INTERVAL); |
|
90 | +define('_EXTCAL_IMG_INTERVAL32', _EXTCAL_PATH_ICONS32._EXTCAL_IMG_INTERVAL); |
|
91 | 91 | |
92 | 92 | //define('_EXTCAL_DIRNAME', $xoopsModule->getVar('dirname')); |
93 | 93 | |
@@ -103,22 +103,22 @@ discard block |
||
103 | 103 | define('_EXTCAL_NAV_NEW_EVENT', 'new-event'); |
104 | 104 | |
105 | 105 | define('_EXTCAL_NAV_LIST', |
106 | - _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" |
|
107 | - . _EXTCAL_NAV_SEARCH . "\n" . _EXTCAL_NAV_NEW_EVENT); |
|
106 | + _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" |
|
107 | + . _EXTCAL_NAV_SEARCH."\n"._EXTCAL_NAV_NEW_EVENT); |
|
108 | 108 | |
109 | 109 | define('_EXTCAL_PREFIX_VIEW', 'view_'); |
110 | 110 | define('_EXTCAL_SUFFIX_VIEW', '.php'); |
111 | 111 | |
112 | -define('_EXTCAL_FILE_CALMONTH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_CALMONTH . _EXTCAL_SUFFIX_VIEW); |
|
113 | -define('_EXTCAL_FILE_CALWEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_CALWEEK . _EXTCAL_SUFFIX_VIEW); |
|
114 | -define('_EXTCAL_FILE_YEAR', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_YEAR . _EXTCAL_SUFFIX_VIEW); |
|
115 | -define('_EXTCAL_FILE_MONTH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_MONTH . _EXTCAL_SUFFIX_VIEW); |
|
116 | -define('_EXTCAL_FILE_WEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_WEEK . _EXTCAL_SUFFIX_VIEW); |
|
117 | -define('_EXTCAL_FILE_DAY', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_DAY . _EXTCAL_SUFFIX_VIEW); |
|
118 | -define('_EXTCAL_FILE_AGENDA_WEEK', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_AGENDA_WEEK . _EXTCAL_SUFFIX_VIEW); |
|
119 | -define('_EXTCAL_FILE_AGENDA_DAY', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_AGENDA_DAY . _EXTCAL_SUFFIX_VIEW); |
|
120 | -define('_EXTCAL_FILE_SEARCH', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_SEARCH . _EXTCAL_SUFFIX_VIEW); |
|
121 | -define('_EXTCAL_FILE_NEW_EVENT', _EXTCAL_PREFIX_VIEW . _EXTCAL_NAV_NEW_EVENT . _EXTCAL_SUFFIX_VIEW); |
|
112 | +define('_EXTCAL_FILE_CALMONTH', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_CALMONTH._EXTCAL_SUFFIX_VIEW); |
|
113 | +define('_EXTCAL_FILE_CALWEEK', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_CALWEEK._EXTCAL_SUFFIX_VIEW); |
|
114 | +define('_EXTCAL_FILE_YEAR', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_YEAR._EXTCAL_SUFFIX_VIEW); |
|
115 | +define('_EXTCAL_FILE_MONTH', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_MONTH._EXTCAL_SUFFIX_VIEW); |
|
116 | +define('_EXTCAL_FILE_WEEK', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_WEEK._EXTCAL_SUFFIX_VIEW); |
|
117 | +define('_EXTCAL_FILE_DAY', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_DAY._EXTCAL_SUFFIX_VIEW); |
|
118 | +define('_EXTCAL_FILE_AGENDA_WEEK', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_AGENDA_WEEK._EXTCAL_SUFFIX_VIEW); |
|
119 | +define('_EXTCAL_FILE_AGENDA_DAY', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_AGENDA_DAY._EXTCAL_SUFFIX_VIEW); |
|
120 | +define('_EXTCAL_FILE_SEARCH', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_SEARCH._EXTCAL_SUFFIX_VIEW); |
|
121 | +define('_EXTCAL_FILE_NEW_EVENT', _EXTCAL_PREFIX_VIEW._EXTCAL_NAV_NEW_EVENT._EXTCAL_SUFFIX_VIEW); |
|
122 | 122 | |
123 | 123 | define('_EXTCAL_MULTILOADER', '/class/xoopsform/multiuploads/formmultiuploads.php'); |
124 | 124 |
@@ -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 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | function xoops_module_pre_install_extcal(XoopsModule $module) |
26 | 26 | { |
27 | 27 | $moduleDirName = basename(dirname(__DIR__)); |
28 | - $className = ucfirst($moduleDirName) . 'Utilities'; |
|
28 | + $className = ucfirst($moduleDirName).'Utilities'; |
|
29 | 29 | if (!class_exists($className)) { |
30 | 30 | xoops_load('utilities', $moduleDirName); |
31 | 31 | } |
@@ -39,9 +39,9 @@ discard block |
||
39 | 39 | return false; |
40 | 40 | } |
41 | 41 | |
42 | - $mod_tables =& $module->getInfo('tables'); |
|
42 | + $mod_tables = & $module->getInfo('tables'); |
|
43 | 43 | foreach ($mod_tables as $table) { |
44 | - $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';'); |
|
44 | + $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS '.$GLOBALS['xoopsDB']->prefix($table).';'); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | return true; |
@@ -70,20 +70,20 @@ discard block |
||
70 | 70 | */ |
71 | 71 | |
72 | 72 | // Access right |
73 | - $groupPermissionHandler->addRight($moduleDirName . '_perm_mask', 1, XOOPS_GROUP_ADMIN, $moduleId); |
|
74 | - $groupPermissionHandler->addRight($moduleDirName . '_perm_mask', 1, XOOPS_GROUP_USERS, $moduleId); |
|
75 | - $groupPermissionHandler->addRight($moduleDirName . '_perm_mask', 1, XOOPS_GROUP_ANONYMOUS, $moduleId); |
|
73 | + $groupPermissionHandler->addRight($moduleDirName.'_perm_mask', 1, XOOPS_GROUP_ADMIN, $moduleId); |
|
74 | + $groupPermissionHandler->addRight($moduleDirName.'_perm_mask', 1, XOOPS_GROUP_USERS, $moduleId); |
|
75 | + $groupPermissionHandler->addRight($moduleDirName.'_perm_mask', 1, XOOPS_GROUP_ANONYMOUS, $moduleId); |
|
76 | 76 | |
77 | 77 | // Can submit |
78 | - $groupPermissionHandler->addRight($moduleDirName . '_perm_mask', 2, XOOPS_GROUP_ADMIN, $moduleId); |
|
78 | + $groupPermissionHandler->addRight($moduleDirName.'_perm_mask', 2, XOOPS_GROUP_ADMIN, $moduleId); |
|
79 | 79 | |
80 | 80 | // Auto approve |
81 | - $groupPermissionHandler->addRight($moduleDirName . '_perm_mask', 4, XOOPS_GROUP_ADMIN, $moduleId); |
|
81 | + $groupPermissionHandler->addRight($moduleDirName.'_perm_mask', 4, XOOPS_GROUP_ADMIN, $moduleId); |
|
82 | 82 | |
83 | 83 | // $moduleDirName = $xoopsModule->getVar('dirname'); |
84 | - $configurator = include $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/config.php'); |
|
84 | + $configurator = include $GLOBALS['xoops']->path('modules/'.$moduleDirName.'/include/config.php'); |
|
85 | 85 | |
86 | - $classUtilities = ucfirst($moduleDirName) . 'Utilities'; |
|
86 | + $classUtilities = ucfirst($moduleDirName).'Utilities'; |
|
87 | 87 | if (!class_exists($classUtilities)) { |
88 | 88 | xoops_load('utilities', $moduleDirName); |
89 | 89 | } |
@@ -95,9 +95,9 @@ discard block |
||
95 | 95 | } |
96 | 96 | } |
97 | 97 | if (count($configurator['copyFiles']) > 0) { |
98 | - $file = __DIR__ . '/../assets/images/blank.png'; |
|
98 | + $file = __DIR__.'/../assets/images/blank.png'; |
|
99 | 99 | foreach (array_keys($configurator['copyFiles']) as $i) { |
100 | - $dest = $configurator['copyFiles'][$i] . '/blank.png'; |
|
100 | + $dest = $configurator['copyFiles'][$i].'/blank.png'; |
|
101 | 101 | $classUtilities::copyFile($file, $dest); |
102 | 102 | } |
103 | 103 | } |
@@ -1,9 +1,9 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | // defined('XOOPS_ROOT_PATH') || die('XOOPS Root Path not defined'); |
4 | -include_once __DIR__ . '/include/constantes.php'; |
|
5 | -include_once __DIR__ . '/include/agenda_fnc.php'; |
|
6 | -include_once __DIR__ . '/class/config.php'; |
|
4 | +include_once __DIR__.'/include/constantes.php'; |
|
5 | +include_once __DIR__.'/include/agenda_fnc.php'; |
|
6 | +include_once __DIR__.'/class/config.php'; |
|
7 | 7 | //$loc_de = setlocale (LC_ALL, 'french'); |
8 | 8 | |
9 | 9 | //echo "local :" . setlocale(LC_TIME, $xoopsConfig['language'])."</ br>"; |
@@ -78,12 +78,12 @@ discard block |
||
78 | 78 | |
79 | 79 | // Tables created by sql file (without prefix!) |
80 | 80 | $modversion['tables'] = array( |
81 | - $moduleDirName . '_' . 'cat', |
|
82 | - $moduleDirName . '_' . 'event', |
|
83 | - $moduleDirName . '_' . 'eventmember', |
|
84 | - $moduleDirName . '_' . 'eventnotmember', |
|
85 | - $moduleDirName . '_' . 'file', |
|
86 | - $moduleDirName . '_' . 'etablissement' |
|
81 | + $moduleDirName.'_'.'cat', |
|
82 | + $moduleDirName.'_'.'event', |
|
83 | + $moduleDirName.'_'.'eventmember', |
|
84 | + $moduleDirName.'_'.'eventnotmember', |
|
85 | + $moduleDirName.'_'.'file', |
|
86 | + $moduleDirName.'_'.'etablissement' |
|
87 | 87 | ); |
88 | 88 | |
89 | 89 | // SQL |
@@ -496,7 +496,7 @@ discard block |
||
496 | 496 | $modversion['config'][$i]['default'] = 5; |
497 | 497 | |
498 | 498 | ++$i; |
499 | -$modversion['config'][$i]['name'] = 'break' . $i; |
|
499 | +$modversion['config'][$i]['name'] = 'break'.$i; |
|
500 | 500 | $modversion['config'][$i]['title'] = '_MI_EXTCAL_SHOW_OTHEROPTIONS'; |
501 | 501 | $modversion['config'][$i]['description'] = ''; |
502 | 502 | $modversion['config'][$i]['formtype'] = 'line_break'; |
@@ -144,7 +144,7 @@ |
||
144 | 144 | // Flag current day |
145 | 145 | $selectedDays = array( |
146 | 146 | new Calendar_Day(date('Y', xoops_getUserTimestamp(time(), $extcalTimeHandler->_getUserTimeZone($GLOBALS['xoopsUser']))), date('n', xoops_getUserTimestamp(time(), $extcalTimeHandler->_getUserTimeZone($GLOBALS['xoopsUser']))), |
147 | - date('j', xoops_getUserTimestamp(time(), $extcalTimeHandler->_getUserTimeZone($GLOBALS['xoopsUser'])))), |
|
147 | + date('j', xoops_getUserTimestamp(time(), $extcalTimeHandler->_getUserTimeZone($GLOBALS['xoopsUser'])))), |
|
148 | 148 | ); |
149 | 149 | |
150 | 150 | // Build calendar object |
@@ -1,9 +1,9 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | global $extcalConfig, $xoopsUser; |
4 | -include_once __DIR__ . '/../include/constantes.php'; |
|
5 | -include_once __DIR__ . '/../class/utilities.php'; |
|
6 | -include_once __DIR__ . '/../class/tableForm.php'; |
|
4 | +include_once __DIR__.'/../include/constantes.php'; |
|
5 | +include_once __DIR__.'/../class/utilities.php'; |
|
6 | +include_once __DIR__.'/../class/tableForm.php'; |
|
7 | 7 | //--------------------------------------------------------------------------- |
8 | 8 | /** |
9 | 9 | * @param $options |
@@ -16,11 +16,11 @@ discard block |
||
16 | 16 | |
17 | 17 | extcal_getDefautminicalOption($options); |
18 | 18 | |
19 | - include_once __DIR__ . '/../class/config.php'; |
|
19 | + include_once __DIR__.'/../class/config.php'; |
|
20 | 20 | |
21 | - require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Util/Textual.php'; |
|
22 | - require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Month/Weeks.php'; |
|
23 | - require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Day.php'; |
|
21 | + require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Util/Textual.php'; |
|
22 | + require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Month/Weeks.php'; |
|
23 | + require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Day.php'; |
|
24 | 24 | // require_once CALENDAR_ROOT . 'Month/Weeks.php'; |
25 | 25 | // require_once CALENDAR_ROOT . 'Day.php'; |
26 | 26 | |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | 'cat' => $tCatSelected, |
107 | 107 | 'externalKeys' => 'cat_id', |
108 | 108 | ); |
109 | - $events = $eventHandler->getEventsOnPeriode($criteres); |
|
109 | + $events = $eventHandler->getEventsOnPeriode($criteres); |
|
110 | 110 | } else { |
111 | 111 | $events = array(); |
112 | 112 | } |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | 'number' => $dayCalObj->thisDay(), |
169 | 169 | 'isSelected' => $dayCalObj->isSelected(), |
170 | 170 | ); |
171 | - $day = $dayCalObj->thisDay(); |
|
171 | + $day = $dayCalObj->thisDay(); |
|
172 | 172 | if (isset($eventsArray[$day]) && !$dayCalObj->isEmpty()) { |
173 | 173 | $tableRows[$rowId]['week'][$cellId]['haveEvents'] = true; |
174 | 174 | $tableRows[$rowId]['week'][$cellId]['color'] = $eventsArray[$day]['color']; |
@@ -198,15 +198,15 @@ discard block |
||
198 | 198 | // Making navig data |
199 | 199 | $navig = array( |
200 | 200 | 'page' => $extcalConfig['start_page'], |
201 | - 'uri' => 'year=' . $monthCalObj->thisYear() . '&month=' . $monthCalObj->thisMonth(), |
|
201 | + 'uri' => 'year='.$monthCalObj->thisYear().'&month='.$monthCalObj->thisMonth(), |
|
202 | 202 | 'name' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_month'], $monthCalObj->getTimestamp()), |
203 | 203 | ); |
204 | 204 | |
205 | 205 | $horloge = array(); |
206 | 206 | $horloge['display'] = (trim($options[11]) != ''); |
207 | - $horloge['fullName'] = XOOPS_URL . _EXTCAL_PATH_HORLOGES . $options[11]; |
|
208 | - $horloge['width'] = $options[12] . 'px'; |
|
209 | - $horloge['height'] = $options[13] . 'px'; |
|
207 | + $horloge['fullName'] = XOOPS_URL._EXTCAL_PATH_HORLOGES.$options[11]; |
|
208 | + $horloge['width'] = $options[12].'px'; |
|
209 | + $horloge['height'] = $options[13].'px'; |
|
210 | 210 | |
211 | 211 | $ret = array( |
212 | 212 | 'imageParam' => $imageParam, |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | */ |
233 | 233 | function bExtcalMinicalEdit($options) |
234 | 234 | { |
235 | - include_once __DIR__ . '/../class/form/spin/formspin.php'; |
|
235 | + include_once __DIR__.'/../class/form/spin/formspin.php'; |
|
236 | 236 | global $xoopsUser; |
237 | 237 | |
238 | 238 | // $t = print_r(get_defined_vars(),true); |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | $imageCatHandler = xoops_getHandler('imagecategory'); |
254 | 254 | |
255 | 255 | //===================================================================== |
256 | - $form->insertBreak('<div style="text-align: center;font-weight: bold;">' . _MB_EXTCAL_OPT_SLIDE_SHOW . '</div>', 'head'); |
|
256 | + $form->insertBreak('<div style="text-align: center;font-weight: bold;">'._MB_EXTCAL_OPT_SLIDE_SHOW.'</div>', 'head'); |
|
257 | 257 | |
258 | 258 | $k = 0; |
259 | 259 | $xfValue[$k] = new XoopsFormRadio(_MB_EXTCAL_DISPLAY_IMG, "options[{$k}]", $options[$k]); |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | $xfValue[$k] = new ExtcalFormSpin(_MB_EXTCAL_SS_NB_PHOTOS, "options[{$k}]", $options[$k], 0, 50, 1, 0, 8, _MB_EXTCAL_PX, $imgFolder = ''); |
295 | 295 | $form->addElement($xfValue[$k], false); |
296 | 296 | //===================================================================== |
297 | - $form->insertBreak('<div style="text-align: center;font-weight: bold;">' . _MB_EXTCAL_OPT_SHOW . '</div>', 'head'); |
|
297 | + $form->insertBreak('<div style="text-align: center;font-weight: bold;">'._MB_EXTCAL_OPT_SHOW.'</div>', 'head'); |
|
298 | 298 | |
299 | 299 | $t = array( |
300 | 300 | -1 => _MB_EXTCAL_PREVIEW, |
@@ -333,9 +333,9 @@ discard block |
||
333 | 333 | $form->addElement($xfValue[$k], false); |
334 | 334 | |
335 | 335 | //===================================================================== |
336 | - $form->insertBreak('<div style="text-align: center;font-weight: bold;">' . _MB_EXTCAL_HORLOGE_OPT . '</div>', 'head'); |
|
336 | + $form->insertBreak('<div style="text-align: center;font-weight: bold;">'._MB_EXTCAL_HORLOGE_OPT.'</div>', 'head'); |
|
337 | 337 | //--------------------------------------------------------------------- |
338 | - $t = XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH . _EXTCAL_PATH_HORLOGES); |
|
338 | + $t = XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH._EXTCAL_PATH_HORLOGES); |
|
339 | 339 | $t = array_merge(array(' ' => _NONE), $t); |
340 | 340 | |
341 | 341 | $k = 11; |
@@ -418,12 +418,12 @@ discard block |
||
418 | 418 | // $src = $doc->createElement('src'); |
419 | 419 | $src = clone $tempSrc; |
420 | 420 | $src = $photo->appendChild($src); |
421 | - $value = $doc->createTextNode(XOOPS_URL . '/uploads/' . $images->getVar('image_name')); |
|
421 | + $value = $doc->createTextNode(XOOPS_URL.'/uploads/'.$images->getVar('image_name')); |
|
422 | 422 | $src->appendChild($value); |
423 | 423 | } |
424 | 424 | |
425 | 425 | // get completed xml document |
426 | - $xml_string = $doc->save(XOOPS_ROOT_PATH . '/cache/extcalSlideShowParam.xml'); |
|
426 | + $xml_string = $doc->save(XOOPS_ROOT_PATH.'/cache/extcalSlideShowParam.xml'); |
|
427 | 427 | } |
428 | 428 | |
429 | 429 | /**************************************************************************/ |
@@ -432,11 +432,11 @@ |
||
432 | 432 | * @param ExtcalEvent $event |
433 | 433 | * @param array $eventsArray |
434 | 434 | * @param ExtcalTime $extcalTimeHandler |
435 | - * @param $startMonth |
|
436 | - * @param $endMonth |
|
435 | + * @param integer $startMonth |
|
436 | + * @param integer $endMonth |
|
437 | 437 | * @param $cats |
438 | 438 | * |
439 | - * @return bool |
|
439 | + * @return false|null |
|
440 | 440 | */ |
441 | 441 | function bExtcalMinicalAddEventToArray(ExtcalEvent $event, &$eventsArray, $extcalTimeHandler, $startMonth, $endMonth, $cats) |
442 | 442 | { |
@@ -41,7 +41,7 @@ |
||
41 | 41 | |
42 | 42 | // Create who's not going table to fix bug. If the table exist, the query will faile |
43 | 43 | $sql = 'CREATE TABLE `' . $xoopsDB->prefix('extcal_eventnotmember') |
44 | - . "` (`eventnotmember_id` int(11) NOT NULL auto_increment,`event_id` int(11) NOT NULL default '0',`uid` int(11) NOT NULL default '0',PRIMARY KEY (`eventnotmember_id`),UNIQUE KEY `eventnotmember` (`event_id`,`uid`)) COMMENT='eXtcal By Zoullou' ;"; |
|
44 | + . "` (`eventnotmember_id` int(11) NOT NULL auto_increment,`event_id` int(11) NOT NULL default '0',`uid` int(11) NOT NULL default '0',PRIMARY KEY (`eventnotmember_id`),UNIQUE KEY `eventnotmember` (`event_id`,`uid`)) COMMENT='eXtcal By Zoullou' ;"; |
|
45 | 45 | $xoopsDB->query($sql); |
46 | 46 | } |
47 | 47 |
@@ -30,17 +30,17 @@ |
||
30 | 30 | global $xoopsDB; |
31 | 31 | |
32 | 32 | // Create eXtcal upload directory if don't exist |
33 | - $dir = XOOPS_ROOT_PATH . '/uploads/extcal'; |
|
33 | + $dir = XOOPS_ROOT_PATH.'/uploads/extcal'; |
|
34 | 34 | if (!is_dir($dir)) { |
35 | 35 | mkdir($dir); |
36 | 36 | |
37 | 37 | // Copy index.html files on uploads folders |
38 | - $indexFile = __DIR__ . '/index.html'; |
|
39 | - copy($indexFile, XOOPS_ROOT_PATH . '/uploads/extcal/index.html'); |
|
38 | + $indexFile = __DIR__.'/index.html'; |
|
39 | + copy($indexFile, XOOPS_ROOT_PATH.'/uploads/extcal/index.html'); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | // Create who's not going table to fix bug. If the table exist, the query will faile |
43 | - $sql = 'CREATE TABLE `' . $xoopsDB->prefix('extcal_eventnotmember') |
|
43 | + $sql = 'CREATE TABLE `'.$xoopsDB->prefix('extcal_eventnotmember') |
|
44 | 44 | . "` (`eventnotmember_id` int(11) NOT NULL auto_increment,`event_id` int(11) NOT NULL default '0',`uid` int(11) NOT NULL default '0',PRIMARY KEY (`eventnotmember_id`),UNIQUE KEY `eventnotmember` (`event_id`,`uid`)) COMMENT='eXtcal By Zoullou' ;"; |
45 | 45 | $xoopsDB->query($sql); |
46 | 46 | } |
@@ -48,11 +48,11 @@ |
||
48 | 48 | $xoopsDB->query($sql); |
49 | 49 | |
50 | 50 | $sql = 'CREATE TABLE `' . $xoopsDB->prefix('extcal_event') |
51 | - . "` (`eventnotmember_id` int(11) NOT NULL auto_increment,`event_id` int(11) NOT NULL default '0',`uid` int(11) NOT NULL default '0',PRIMARY KEY (`eventnotmember_id`),UNIQUE KEY `eventnotmember` (`event_id`,`uid`)) COMMENT='eXtcal By Zoullou' ;"; |
|
51 | + . "` (`eventnotmember_id` int(11) NOT NULL auto_increment,`event_id` int(11) NOT NULL default '0',`uid` int(11) NOT NULL default '0',PRIMARY KEY (`eventnotmember_id`),UNIQUE KEY `eventnotmember` (`event_id`,`uid`)) COMMENT='eXtcal By Zoullou' ;"; |
|
52 | 52 | $xoopsDB->query($sql); |
53 | 53 | |
54 | 54 | $sql = 'CREATE TABLE `' . $xoopsDB->prefix('extcal_file') |
55 | - . "` (`file_id` int(11) NOT NULL auto_increment,`file_name` varchar(255) NOT NULL,`file_nicename` varchar(255) NOT NULL,`file_mimetype` varchar(255) NOT NULL,`file_size` int(11) NOT NULL,`file_download` int(11) NOT NULL,`file_date` int(11) NOT NULL,`file_approved` tinyint(1) NOT NULL,`event_id` int(11) NOT NULL,`uid` int(11) NOT NULL,PRIMARY KEY (`file_id`)) COMMENT='eXtcal By Zoullou' ;"; |
|
55 | + . "` (`file_id` int(11) NOT NULL auto_increment,`file_name` varchar(255) NOT NULL,`file_nicename` varchar(255) NOT NULL,`file_mimetype` varchar(255) NOT NULL,`file_size` int(11) NOT NULL,`file_download` int(11) NOT NULL,`file_date` int(11) NOT NULL,`file_approved` tinyint(1) NOT NULL,`event_id` int(11) NOT NULL,`uid` int(11) NOT NULL,PRIMARY KEY (`file_id`)) COMMENT='eXtcal By Zoullou' ;"; |
|
56 | 56 | $xoopsDB->query($sql); |
57 | 57 | } |
58 | 58 |
@@ -32,26 +32,26 @@ |
||
32 | 32 | //$xoopsDB = Database::getInstance(); |
33 | 33 | $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection(); |
34 | 34 | |
35 | - $sql = 'ALTER TABLE `' . $xoopsDB->prefix('extcal_event') . "` CHANGE `event_approved` `event_approved` TINYINT( 1 ) NOT NULL DEFAULT '0' ;"; |
|
35 | + $sql = 'ALTER TABLE `'.$xoopsDB->prefix('extcal_event')."` CHANGE `event_approved` `event_approved` TINYINT( 1 ) NOT NULL DEFAULT '0' ;"; |
|
36 | 36 | $xoopsDB->query($sql); |
37 | 37 | |
38 | - $sql = 'ALTER TABLE `' . $xoopsDB->prefix('extcal_event') . '` ADD `event_isrecur` TINYINT( 1 ) NOT NULL AFTER `event_nbmember` ;'; |
|
38 | + $sql = 'ALTER TABLE `'.$xoopsDB->prefix('extcal_event').'` ADD `event_isrecur` TINYINT( 1 ) NOT NULL AFTER `event_nbmember` ;'; |
|
39 | 39 | $xoopsDB->query($sql); |
40 | 40 | |
41 | - $sql = 'ALTER TABLE `' . $xoopsDB->prefix('extcal_event') . '` ADD `event_recur_rules` VARCHAR( 255 ) NOT NULL AFTER `event_isrecur` '; |
|
41 | + $sql = 'ALTER TABLE `'.$xoopsDB->prefix('extcal_event').'` ADD `event_recur_rules` VARCHAR( 255 ) NOT NULL AFTER `event_isrecur` '; |
|
42 | 42 | $xoopsDB->query($sql); |
43 | 43 | |
44 | - $sql = 'ALTER TABLE `' . $xoopsDB->prefix('extcal_event') . '` ADD `event_recur_start` INT( 11 ) NOT NULL AFTER `event_recur_rules` ;'; |
|
44 | + $sql = 'ALTER TABLE `'.$xoopsDB->prefix('extcal_event').'` ADD `event_recur_start` INT( 11 ) NOT NULL AFTER `event_recur_rules` ;'; |
|
45 | 45 | $xoopsDB->query($sql); |
46 | 46 | |
47 | - $sql = 'ALTER TABLE `' . $xoopsDB->prefix('extcal_event') . '` ADD `event_recur_end` INT( 11 ) NOT NULL AFTER `event_recur_start` ;'; |
|
47 | + $sql = 'ALTER TABLE `'.$xoopsDB->prefix('extcal_event').'` ADD `event_recur_end` INT( 11 ) NOT NULL AFTER `event_recur_start` ;'; |
|
48 | 48 | $xoopsDB->query($sql); |
49 | 49 | |
50 | - $sql = 'CREATE TABLE `' . $xoopsDB->prefix('extcal_event') |
|
50 | + $sql = 'CREATE TABLE `'.$xoopsDB->prefix('extcal_event') |
|
51 | 51 | . "` (`eventnotmember_id` int(11) NOT NULL auto_increment,`event_id` int(11) NOT NULL default '0',`uid` int(11) NOT NULL default '0',PRIMARY KEY (`eventnotmember_id`),UNIQUE KEY `eventnotmember` (`event_id`,`uid`)) COMMENT='eXtcal By Zoullou' ;"; |
52 | 52 | $xoopsDB->query($sql); |
53 | 53 | |
54 | - $sql = 'CREATE TABLE `' . $xoopsDB->prefix('extcal_file') |
|
54 | + $sql = 'CREATE TABLE `'.$xoopsDB->prefix('extcal_file') |
|
55 | 55 | . "` (`file_id` int(11) NOT NULL auto_increment,`file_name` varchar(255) NOT NULL,`file_nicename` varchar(255) NOT NULL,`file_mimetype` varchar(255) NOT NULL,`file_size` int(11) NOT NULL,`file_download` int(11) NOT NULL,`file_date` int(11) NOT NULL,`file_approved` tinyint(1) NOT NULL,`event_id` int(11) NOT NULL,`uid` int(11) NOT NULL,PRIMARY KEY (`file_id`)) COMMENT='eXtcal By Zoullou' ;"; |
56 | 56 | $xoopsDB->query($sql); |
57 | 57 | } |