@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | // singleton for xoops_breadcrumbs |
4 | 4 | class AltsysBreadcrumbs |
5 | 5 | { |
6 | - public $paths = array() ; |
|
6 | + public $paths = array(); |
|
7 | 7 | |
8 | 8 | public function __construct() |
9 | 9 | { |
@@ -12,29 +12,29 @@ discard block |
||
12 | 12 | //function &getInstance() |
13 | 13 | public static function &getInstance() |
14 | 14 | { |
15 | - static $instance ; |
|
16 | - if (! isset($instance)) { |
|
17 | - $instance = new AltsysBreadcrumbs() ; |
|
15 | + static $instance; |
|
16 | + if (!isset($instance)) { |
|
17 | + $instance = new AltsysBreadcrumbs(); |
|
18 | 18 | } |
19 | - return $instance ; |
|
19 | + return $instance; |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | public function getXoopsBreadcrumbs() |
23 | 23 | { |
24 | - $ret = array() ; |
|
24 | + $ret = array(); |
|
25 | 25 | foreach ($this->paths as $val) { |
26 | 26 | // delayed language constant |
27 | 27 | if (substr($val['name'], 0, 1) == '_' && defined($val['name'])) { |
28 | 28 | $ret[] = array( |
29 | - 'url' => $val['url'] , |
|
29 | + 'url' => $val['url'], |
|
30 | 30 | 'name' => constant($val['name']) |
31 | - ) ; |
|
31 | + ); |
|
32 | 32 | } else { |
33 | - $ret[] = $val ; |
|
33 | + $ret[] = $val; |
|
34 | 34 | } |
35 | 35 | } |
36 | - unset($ret[count($ret) - 1 ]['url']) ; |
|
37 | - return $ret ; |
|
36 | + unset($ret[count($ret) - 1]['url']); |
|
37 | + return $ret; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | // all data should be escaped |
@@ -43,19 +43,19 @@ discard block |
||
43 | 43 | if (is_array($url_or_path)) { |
44 | 44 | if (empty($url_or_path['name'])) { |
45 | 45 | // multiple paths |
46 | - $this->paths = array_merge($this->paths, $url_or_path) ; |
|
46 | + $this->paths = array_merge($this->paths, $url_or_path); |
|
47 | 47 | } else { |
48 | 48 | // array format (just a path) |
49 | - $this->paths[] = $url_or_path ; |
|
49 | + $this->paths[] = $url_or_path; |
|
50 | 50 | } |
51 | 51 | } else { |
52 | 52 | // separate format |
53 | - $this->paths[] = array( 'url' => $url_or_path , 'name' => $name ) ; |
|
53 | + $this->paths[] = array('url' => $url_or_path, 'name' => $name); |
|
54 | 54 | } |
55 | 55 | } |
56 | 56 | |
57 | 57 | public function hasPaths() |
58 | 58 | { |
59 | - return ! empty($this->paths) ; |
|
59 | + return !empty($this->paths); |
|
60 | 60 | } |
61 | 61 | } |
@@ -46,42 +46,42 @@ discard block |
||
46 | 46 | $scoln = 'disabled'; |
47 | 47 | } else { |
48 | 48 | switch ($side) { |
49 | - case XOOPS_SIDEBLOCK_LEFT: |
|
50 | - $ssel0 = " checked='checked'"; |
|
51 | - $scol0 = 'selected'; |
|
52 | - break ; |
|
53 | - case XOOPS_SIDEBLOCK_RIGHT: |
|
54 | - $ssel1 = " checked='checked'"; |
|
55 | - $scol1 = 'selected'; |
|
56 | - break ; |
|
57 | - case XOOPS_CENTERBLOCK_LEFT: |
|
58 | - $ssel3 = " checked='checked'"; |
|
59 | - $scol3 = 'selected'; |
|
60 | - break ; |
|
61 | - case XOOPS_CENTERBLOCK_RIGHT: |
|
62 | - $ssel4 = " checked='checked'"; |
|
63 | - $scol4 = 'selected'; |
|
64 | - break ; |
|
65 | - case XOOPS_CENTERBLOCK_CENTER: |
|
66 | - $ssel5 = " checked='checked'"; |
|
67 | - $scol5 = 'selected'; |
|
68 | - break ; |
|
69 | - case XOOPS_CENTERBLOCK_BOTTOMLEFT: |
|
70 | - $ssel7 = " checked='checked'"; |
|
71 | - $scol7 = 'selected'; |
|
72 | - break ; |
|
73 | - case XOOPS_CENTERBLOCK_BOTTOMRIGHT: |
|
74 | - $ssel8 = " checked='checked'"; |
|
75 | - $scol8 = 'selected'; |
|
76 | - break ; |
|
77 | - case XOOPS_CENTERBLOCK_BOTTOM: |
|
78 | - $ssel9 = " checked='checked'"; |
|
79 | - $scol9 = 'selected'; |
|
80 | - break ; |
|
81 | - default: |
|
82 | - $value4extra_side = $side ; |
|
83 | - $stextbox = 'selected'; |
|
84 | - break ; |
|
49 | + case XOOPS_SIDEBLOCK_LEFT: |
|
50 | + $ssel0 = " checked='checked'"; |
|
51 | + $scol0 = 'selected'; |
|
52 | + break ; |
|
53 | + case XOOPS_SIDEBLOCK_RIGHT: |
|
54 | + $ssel1 = " checked='checked'"; |
|
55 | + $scol1 = 'selected'; |
|
56 | + break ; |
|
57 | + case XOOPS_CENTERBLOCK_LEFT: |
|
58 | + $ssel3 = " checked='checked'"; |
|
59 | + $scol3 = 'selected'; |
|
60 | + break ; |
|
61 | + case XOOPS_CENTERBLOCK_RIGHT: |
|
62 | + $ssel4 = " checked='checked'"; |
|
63 | + $scol4 = 'selected'; |
|
64 | + break ; |
|
65 | + case XOOPS_CENTERBLOCK_CENTER: |
|
66 | + $ssel5 = " checked='checked'"; |
|
67 | + $scol5 = 'selected'; |
|
68 | + break ; |
|
69 | + case XOOPS_CENTERBLOCK_BOTTOMLEFT: |
|
70 | + $ssel7 = " checked='checked'"; |
|
71 | + $scol7 = 'selected'; |
|
72 | + break ; |
|
73 | + case XOOPS_CENTERBLOCK_BOTTOMRIGHT: |
|
74 | + $ssel8 = " checked='checked'"; |
|
75 | + $scol8 = 'selected'; |
|
76 | + break ; |
|
77 | + case XOOPS_CENTERBLOCK_BOTTOM: |
|
78 | + $ssel9 = " checked='checked'"; |
|
79 | + $scol9 = 'selected'; |
|
80 | + break ; |
|
81 | + default: |
|
82 | + $value4extra_side = $side ; |
|
83 | + $stextbox = 'selected'; |
|
84 | + break ; |
|
85 | 85 | } |
86 | 86 | } |
87 | 87 | |
@@ -165,31 +165,31 @@ discard block |
||
165 | 165 | } |
166 | 166 | |
167 | 167 | switch ($mode) { |
168 | - case 'clone': |
|
169 | - $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM ; |
|
170 | - $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE ; |
|
171 | - $next_op = 'clone_ok' ; |
|
172 | - // breadcrumbs |
|
173 | - $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ; |
|
174 | - $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM) ; |
|
175 | - break ; |
|
176 | - case 'new': |
|
177 | - $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM ; |
|
178 | - $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW ; |
|
179 | - $next_op = 'new_ok' ; |
|
180 | - // breadcrumbs |
|
181 | - $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ; |
|
182 | - $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM) ; |
|
183 | - break ; |
|
184 | - case 'edit': |
|
185 | - default: |
|
186 | - $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM ; |
|
187 | - $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT ; |
|
188 | - $next_op = 'edit_ok' ; |
|
189 | - // breadcrumbs |
|
190 | - $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ; |
|
191 | - $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM) ; |
|
192 | - break ; |
|
168 | + case 'clone': |
|
169 | + $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM ; |
|
170 | + $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE ; |
|
171 | + $next_op = 'clone_ok' ; |
|
172 | + // breadcrumbs |
|
173 | + $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ; |
|
174 | + $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM) ; |
|
175 | + break ; |
|
176 | + case 'new': |
|
177 | + $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM ; |
|
178 | + $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW ; |
|
179 | + $next_op = 'new_ok' ; |
|
180 | + // breadcrumbs |
|
181 | + $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ; |
|
182 | + $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM) ; |
|
183 | + break ; |
|
184 | + case 'edit': |
|
185 | + default: |
|
186 | + $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM ; |
|
187 | + $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT ; |
|
188 | + $next_op = 'edit_ok' ; |
|
189 | + // breadcrumbs |
|
190 | + $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ; |
|
191 | + $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM) ; |
|
192 | + break ; |
|
193 | 193 | } |
194 | 194 | |
195 | 195 | $is_custom = in_array($block->getVar('block_type'), array( 'C', 'E' )) ? true : false ; |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require_once __DIR__.'/MyBlocksAdmin.class.php' ; |
|
3 | +require_once __DIR__.'/MyBlocksAdmin.class.php'; |
|
4 | 4 | |
5 | 5 | class MyBlocksAdminForX25 extends MyBlocksAdmin |
6 | 6 | { |
@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | |
12 | 12 | public function construct() |
13 | 13 | { |
14 | - parent::construct() ; |
|
14 | + parent::construct(); |
|
15 | 15 | |
16 | - @include_once XOOPS_ROOT_PATH.'/modules/system/language/'.$this->lang.'/admin/blocksadmin.php' ; |
|
16 | + @include_once XOOPS_ROOT_PATH.'/modules/system/language/'.$this->lang.'/admin/blocksadmin.php'; |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | //HACK by domifara for php5.3+ |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | static $instance; |
24 | 24 | if (!isset($instance)) { |
25 | 25 | $instance = new MyBlocksAdminForX25(); |
26 | - $instance->construct() ; |
|
26 | + $instance->construct(); |
|
27 | 27 | } |
28 | 28 | return $instance; |
29 | 29 | } |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | $sseln = $ssel0 = $ssel1 = $ssel3 = $ssel4 = $ssel5 = $ssel7 = $ssel8 = $ssel9 = ''; |
40 | 40 | $scoln = $scol0 = $scol1 = $scol3 = $scol4 = $scol5 = $scol7 = $scol8 = $scol9 = 'unselected'; |
41 | 41 | $stextbox = 'unselected'; |
42 | - $value4extra_side = '' ; |
|
42 | + $value4extra_side = ''; |
|
43 | 43 | |
44 | 44 | if ($visible != 1) { |
45 | 45 | $sseln = " checked='checked'"; |
@@ -49,39 +49,39 @@ discard block |
||
49 | 49 | case XOOPS_SIDEBLOCK_LEFT: |
50 | 50 | $ssel0 = " checked='checked'"; |
51 | 51 | $scol0 = 'selected'; |
52 | - break ; |
|
52 | + break; |
|
53 | 53 | case XOOPS_SIDEBLOCK_RIGHT: |
54 | 54 | $ssel1 = " checked='checked'"; |
55 | 55 | $scol1 = 'selected'; |
56 | - break ; |
|
56 | + break; |
|
57 | 57 | case XOOPS_CENTERBLOCK_LEFT: |
58 | 58 | $ssel3 = " checked='checked'"; |
59 | 59 | $scol3 = 'selected'; |
60 | - break ; |
|
60 | + break; |
|
61 | 61 | case XOOPS_CENTERBLOCK_RIGHT: |
62 | 62 | $ssel4 = " checked='checked'"; |
63 | 63 | $scol4 = 'selected'; |
64 | - break ; |
|
64 | + break; |
|
65 | 65 | case XOOPS_CENTERBLOCK_CENTER: |
66 | 66 | $ssel5 = " checked='checked'"; |
67 | 67 | $scol5 = 'selected'; |
68 | - break ; |
|
68 | + break; |
|
69 | 69 | case XOOPS_CENTERBLOCK_BOTTOMLEFT: |
70 | 70 | $ssel7 = " checked='checked'"; |
71 | 71 | $scol7 = 'selected'; |
72 | - break ; |
|
72 | + break; |
|
73 | 73 | case XOOPS_CENTERBLOCK_BOTTOMRIGHT: |
74 | 74 | $ssel8 = " checked='checked'"; |
75 | 75 | $scol8 = 'selected'; |
76 | - break ; |
|
76 | + break; |
|
77 | 77 | case XOOPS_CENTERBLOCK_BOTTOM: |
78 | 78 | $ssel9 = " checked='checked'"; |
79 | 79 | $scol9 = 'selected'; |
80 | - break ; |
|
80 | + break; |
|
81 | 81 | default: |
82 | - $value4extra_side = $side ; |
|
82 | + $value4extra_side = $side; |
|
83 | 83 | $stextbox = 'selected'; |
84 | - break ; |
|
84 | + break; |
|
85 | 85 | } |
86 | 86 | } |
87 | 87 | |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | <div class='blockposition $scoln'> |
143 | 143 | <input type='radio' name='sides[$bid]' value='-1' class='blockposition' $sseln onclick='document.getElementById(\"extra_side_$bid\").value=-1;' /> |
144 | 144 | </div> |
145 | - <div style='float:"._GLOBAL_LEFT.";'>"._NONE . '</div> |
|
145 | + <div style='float:"._GLOBAL_LEFT.";'>"._NONE.'</div> |
|
146 | 146 | </td> |
147 | 147 | </tr> |
148 | 148 | </table> |
@@ -154,53 +154,53 @@ discard block |
||
154 | 154 | $bid = (int)$bid; |
155 | 155 | |
156 | 156 | //HACK by domifara |
157 | - $block = new XoopsBlock($bid) ; |
|
157 | + $block = new XoopsBlock($bid); |
|
158 | 158 | |
159 | - if (! $block->getVar('bid')) { |
|
159 | + if (!$block->getVar('bid')) { |
|
160 | 160 | // new defaults |
161 | - $bid = 0 ; |
|
162 | - $mode = 'new' ; |
|
163 | - $block->setVar('mid', 0) ; |
|
164 | - $block->setVar('block_type', 'C') ; |
|
161 | + $bid = 0; |
|
162 | + $mode = 'new'; |
|
163 | + $block->setVar('mid', 0); |
|
164 | + $block->setVar('block_type', 'C'); |
|
165 | 165 | } |
166 | 166 | |
167 | 167 | switch ($mode) { |
168 | 168 | case 'clone': |
169 | - $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM ; |
|
170 | - $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE ; |
|
171 | - $next_op = 'clone_ok' ; |
|
169 | + $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM; |
|
170 | + $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE; |
|
171 | + $next_op = 'clone_ok'; |
|
172 | 172 | // breadcrumbs |
173 | - $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ; |
|
174 | - $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM) ; |
|
175 | - break ; |
|
173 | + $breadcrumbsObj = AltsysBreadcrumbs::getInstance(); |
|
174 | + $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM); |
|
175 | + break; |
|
176 | 176 | case 'new': |
177 | - $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM ; |
|
178 | - $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW ; |
|
179 | - $next_op = 'new_ok' ; |
|
177 | + $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM; |
|
178 | + $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW; |
|
179 | + $next_op = 'new_ok'; |
|
180 | 180 | // breadcrumbs |
181 | - $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ; |
|
182 | - $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM) ; |
|
183 | - break ; |
|
181 | + $breadcrumbsObj = AltsysBreadcrumbs::getInstance(); |
|
182 | + $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM); |
|
183 | + break; |
|
184 | 184 | case 'edit': |
185 | 185 | default: |
186 | - $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM ; |
|
187 | - $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT ; |
|
188 | - $next_op = 'edit_ok' ; |
|
186 | + $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM; |
|
187 | + $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT; |
|
188 | + $next_op = 'edit_ok'; |
|
189 | 189 | // breadcrumbs |
190 | - $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ; |
|
191 | - $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM) ; |
|
192 | - break ; |
|
190 | + $breadcrumbsObj = AltsysBreadcrumbs::getInstance(); |
|
191 | + $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM); |
|
192 | + break; |
|
193 | 193 | } |
194 | 194 | |
195 | - $is_custom = in_array($block->getVar('block_type'), array( 'C', 'E' )) ? true : false ; |
|
196 | - $block_template =& $block->getVar('template', 'n') ; |
|
197 | - $block_template_tplset = '' ; |
|
195 | + $is_custom = in_array($block->getVar('block_type'), array('C', 'E')) ? true : false; |
|
196 | + $block_template = & $block->getVar('template', 'n'); |
|
197 | + $block_template_tplset = ''; |
|
198 | 198 | |
199 | - if (! $is_custom && $block_template) { |
|
199 | + if (!$is_custom && $block_template) { |
|
200 | 200 | // find template of the block |
201 | 201 | $tplfile_handler = xoops_getHandler('tplfile'); |
202 | - $found_templates = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', null, null, $block_template) ; |
|
203 | - $block_template_tplset = count($found_templates) > 0 ? $GLOBALS['xoopsConfig']['template_set'] : 'default' ; |
|
202 | + $found_templates = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', null, null, $block_template); |
|
203 | + $block_template_tplset = count($found_templates) > 0 ? $GLOBALS['xoopsConfig']['template_set'] : 'default'; |
|
204 | 204 | } |
205 | 205 | //HACK by domifara |
206 | 206 | /* |
@@ -209,41 +209,41 @@ discard block |
||
209 | 209 | } |
210 | 210 | */ |
211 | 211 | $block_data = $this->preview_request + array( |
212 | - 'bid' => $bid , |
|
213 | - 'name' => $block->getVar('name', 'n') , |
|
214 | - 'title' => $block->getVar('title', 'n') , |
|
212 | + 'bid' => $bid, |
|
213 | + 'name' => $block->getVar('name', 'n'), |
|
214 | + 'title' => $block->getVar('title', 'n'), |
|
215 | 215 | 'weight' => (int)$block->getVar('weight'), |
216 | 216 | 'bcachetime' => (int)$block->getVar('bcachetime'), |
217 | 217 | 'side' => (int)$block->getVar('side'), |
218 | 218 | 'visible' => (int)$block->getVar('visible'), |
219 | - 'template' => $block_template , |
|
220 | - 'template_tplset' => $block_template_tplset , |
|
221 | - 'options' => $block->getVar('options') , |
|
222 | - 'content' => $block->getVar('content', 'n') , |
|
223 | - 'is_custom' => $is_custom , |
|
224 | - 'type' => $block->getVar('block_type') , |
|
219 | + 'template' => $block_template, |
|
220 | + 'template_tplset' => $block_template_tplset, |
|
221 | + 'options' => $block->getVar('options'), |
|
222 | + 'content' => $block->getVar('content', 'n'), |
|
223 | + 'is_custom' => $is_custom, |
|
224 | + 'type' => $block->getVar('block_type'), |
|
225 | 225 | 'ctype' => $block->getVar('c_type') |
226 | - ) ; |
|
226 | + ); |
|
227 | 227 | |
228 | 228 | $block4assign = array( |
229 | - 'name_raw' => $block_data['name'] , |
|
230 | - 'title_raw' => $block_data['title'] , |
|
231 | - 'content_raw' => $block_data['content'] , |
|
232 | - 'cell_position' => $this->renderCell4BlockPosition($block_data) , |
|
233 | - 'cell_module_link' => $this->renderCell4BlockModuleLink($block_data) , |
|
234 | - 'cell_group_perm' => $this->renderCell4BlockReadGroupPerm($block_data) , |
|
235 | - 'cell_options' => $this->renderCell4BlockOptions($block_data) , |
|
229 | + 'name_raw' => $block_data['name'], |
|
230 | + 'title_raw' => $block_data['title'], |
|
231 | + 'content_raw' => $block_data['content'], |
|
232 | + 'cell_position' => $this->renderCell4BlockPosition($block_data), |
|
233 | + 'cell_module_link' => $this->renderCell4BlockModuleLink($block_data), |
|
234 | + 'cell_group_perm' => $this->renderCell4BlockReadGroupPerm($block_data), |
|
235 | + 'cell_options' => $this->renderCell4BlockOptions($block_data), |
|
236 | 236 | 'content_preview' => $this->previewContent($block_data) |
237 | - ) + $block_data ; |
|
237 | + ) + $block_data; |
|
238 | 238 | |
239 | 239 | // display |
240 | - require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ; |
|
241 | - $tpl = new D3Tpl() ; |
|
240 | + require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php'; |
|
241 | + $tpl = new D3Tpl(); |
|
242 | 242 | //dhtml |
243 | 243 | include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php'; |
244 | 244 | |
245 | - if ($block_data['ctype']=='H' || empty($block_data['ctype'])) { |
|
246 | - $editor_configs=array(); |
|
245 | + if ($block_data['ctype'] == 'H' || empty($block_data['ctype'])) { |
|
246 | + $editor_configs = array(); |
|
247 | 247 | $editor_configs['name'] = 'content_block'; |
248 | 248 | $editor_configs['value'] = $block_data['content']; |
249 | 249 | $editor_configs['rows'] = 20; |
@@ -253,12 +253,12 @@ discard block |
||
253 | 253 | $editor_configs['editor'] = xoops_getModuleOption('blocks_editor', 'system'); |
254 | 254 | $form = new XoopsFormEditor('', 'textarea_content', $editor_configs); |
255 | 255 | $rendered = $form->render(); |
256 | - $tpl->assign('altsys_x25_dhtmltextarea', $rendered) ; |
|
256 | + $tpl->assign('altsys_x25_dhtmltextarea', $rendered); |
|
257 | 257 | } else { |
258 | 258 | $form = new XoopsFormDhtmlTextArea('', 'textarea_content', $block_data['content'], 80, 20); |
259 | 259 | $rendered = $form->render(); |
260 | - $rendered = '<div id="textarea_content_bbcode_buttons_pre" style="display:block;">'.str_replace(array( '<textarea', '</textarea><br />' ), array( '</div><textarea', '</textarea><div id="textarea_content_bbcode_buttons_post" style="display:block;">' ), $rendered) . '</div>' ; |
|
261 | - $tpl->assign('altsys_x25_dhtmltextarea', $rendered) ; |
|
260 | + $rendered = '<div id="textarea_content_bbcode_buttons_pre" style="display:block;">'.str_replace(array('<textarea', '</textarea><br />'), array('</div><textarea', '</textarea><div id="textarea_content_bbcode_buttons_post" style="display:block;">'), $rendered).'</div>'; |
|
261 | + $tpl->assign('altsys_x25_dhtmltextarea', $rendered); |
|
262 | 262 | } |
263 | 263 | |
264 | 264 | $tpl->assign(array( |
@@ -273,91 +273,91 @@ discard block |
||
273 | 273 | 'submit_button' => $button_value, |
274 | 274 | 'common_fck_installed' => file_exists(XOOPS_ROOT_PATH.'/common/fckeditor/fckeditor.js'), |
275 | 275 | 'gticket_hidden' => $GLOBALS['xoopsGTicket']->getTicketHtml(__LINE__, 1800, 'myblocksadmin') |
276 | - )) ; |
|
276 | + )); |
|
277 | 277 | //HACK by domifara |
278 | - $tpl->display('db:altsys_main_myblocksadmin_edit_4x25.html') ; |
|
278 | + $tpl->display('db:altsys_main_myblocksadmin_edit_4x25.html'); |
|
279 | 279 | |
280 | - return ; |
|
280 | + return; |
|
281 | 281 | } |
282 | 282 | public function fetchRequest4Block($bid) |
283 | 283 | { |
284 | 284 | $bid = (int)$bid; |
285 | - (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance() ; |
|
285 | + (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance(); |
|
286 | 286 | |
287 | 287 | if (@$_POST['extra_sides'][$bid] > 0) { |
288 | 288 | $_POST['sides'][$bid] = (int)$_POST['extra_sides'][$bid]; |
289 | 289 | } |
290 | 290 | |
291 | 291 | if (@$_POST['sides'][$bid] < 0) { |
292 | - $visible = 0 ; |
|
293 | - $_POST['sides'][$bid] = -1 ; |
|
292 | + $visible = 0; |
|
293 | + $_POST['sides'][$bid] = -1; |
|
294 | 294 | } else { |
295 | - $visible = 1 ; |
|
295 | + $visible = 1; |
|
296 | 296 | } |
297 | 297 | |
298 | 298 | return array( |
299 | - 'bid' => $bid , |
|
299 | + 'bid' => $bid, |
|
300 | 300 | 'side' => (int)(@$_POST['sides'][$bid]), |
301 | 301 | 'weight' => (int)(@$_POST['weights'][$bid]), |
302 | - 'visible' => $visible , |
|
303 | - 'title' => $myts->stripSlashesGPC(@$_POST['titles'][$bid]) , |
|
304 | - 'content' => $myts->stripSlashesGPC(@$_POST['textarea_content']) , |
|
305 | - 'ctype' => preg_replace('/[^A-Z]/', '', @$_POST['ctypes'][$bid]) , |
|
302 | + 'visible' => $visible, |
|
303 | + 'title' => $myts->stripSlashesGPC(@$_POST['titles'][$bid]), |
|
304 | + 'content' => $myts->stripSlashesGPC(@$_POST['textarea_content']), |
|
305 | + 'ctype' => preg_replace('/[^A-Z]/', '', @$_POST['ctypes'][$bid]), |
|
306 | 306 | 'bcachetime' => (int)(@$_POST['bcachetimes'][$bid]), |
307 | - 'bmodule' => is_array(@$_POST['bmodules'][$bid]) ? $_POST['bmodules'][$bid] : array( 0 ) , |
|
308 | - 'bgroup' => is_array(@$_POST['bgroups'][$bid]) ? $_POST['bgroups'][$bid] : array() , |
|
307 | + 'bmodule' => is_array(@$_POST['bmodules'][$bid]) ? $_POST['bmodules'][$bid] : array(0), |
|
308 | + 'bgroup' => is_array(@$_POST['bgroups'][$bid]) ? $_POST['bgroups'][$bid] : array(), |
|
309 | 309 | 'options' => is_array(@$_POST['options'][$bid]) ? $_POST['options'][$bid] : array() |
310 | - ) ; |
|
310 | + ); |
|
311 | 311 | } |
312 | 312 | |
313 | 313 | public function previewContent($block_data) |
314 | 314 | { |
315 | 315 | $bid = (int)$block_data['bid']; |
316 | 316 | |
317 | - if (! $block_data['is_custom']) { |
|
318 | - return '' ; |
|
317 | + if (!$block_data['is_custom']) { |
|
318 | + return ''; |
|
319 | 319 | } |
320 | 320 | if (empty($this->preview_request)) { |
321 | - return '' ; |
|
321 | + return ''; |
|
322 | 322 | } |
323 | 323 | |
324 | 324 | //HACK by domifara |
325 | 325 | //TODO : need no hook block at this |
326 | - $block = new XoopsBlock($bid) ; |
|
326 | + $block = new XoopsBlock($bid); |
|
327 | 327 | |
328 | 328 | if ($block->getVar('mid')) { |
329 | - return '' ; |
|
329 | + return ''; |
|
330 | 330 | } |
331 | 331 | |
332 | - $block->setVar('title', $block_data['title']) ; |
|
333 | - $block->setVar('content', $block_data['content']) ; |
|
332 | + $block->setVar('title', $block_data['title']); |
|
333 | + $block->setVar('content', $block_data['content']); |
|
334 | 334 | |
335 | - restore_error_handler() ; |
|
336 | - $original_level = error_reporting(E_ALL) ; |
|
335 | + restore_error_handler(); |
|
336 | + $original_level = error_reporting(E_ALL); |
|
337 | 337 | |
338 | 338 | // $ret = $block->getContent( 'S' , $block_data['ctype'] ) ; |
339 | 339 | |
340 | 340 | $c_type = $block_data['ctype']; |
341 | 341 | if ($c_type == 'H') { |
342 | - $ret = str_replace('{X_SITEURL}', XOOPS_URL . '/', $block->getVar('content', 'N')); |
|
342 | + $ret = str_replace('{X_SITEURL}', XOOPS_URL.'/', $block->getVar('content', 'N')); |
|
343 | 343 | } elseif ($c_type == 'P') { |
344 | 344 | ob_start(); |
345 | 345 | echo eval($block->getVar('content', 'N')); |
346 | 346 | $content = ob_get_contents(); |
347 | 347 | ob_end_clean(); |
348 | - $ret = str_replace('{X_SITEURL}', XOOPS_URL . '/', $content); |
|
348 | + $ret = str_replace('{X_SITEURL}', XOOPS_URL.'/', $content); |
|
349 | 349 | } elseif ($c_type == 'S') { |
350 | 350 | (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance(); |
351 | - $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $block->getVar('content', 'N')); |
|
351 | + $content = str_replace('{X_SITEURL}', XOOPS_URL.'/', $block->getVar('content', 'N')); |
|
352 | 352 | $ret = $myts->displayTarea($content, 1, 1); |
353 | 353 | } else { |
354 | 354 | (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance(); |
355 | - $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $block->getVar('content', 'N')); |
|
355 | + $content = str_replace('{X_SITEURL}', XOOPS_URL.'/', $block->getVar('content', 'N')); |
|
356 | 356 | $ret = $myts->displayTarea($content, 1, 0); |
357 | 357 | } |
358 | 358 | |
359 | - error_reporting($original_level) ; |
|
359 | + error_reporting($original_level); |
|
360 | 360 | |
361 | - return $ret ; |
|
361 | + return $ret; |
|
362 | 362 | } |
363 | 363 | } |
@@ -1,35 +1,35 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -eval(' function xoops_module_uninstall_'.$mydirname.'( $module ) { return altsys_onuninstall_base( $module , "'.$mydirname.'" ) ; } ') ; |
|
3 | +eval(' function xoops_module_uninstall_'.$mydirname.'( $module ) { return altsys_onuninstall_base( $module , "'.$mydirname.'" ) ; } '); |
|
4 | 4 | |
5 | 5 | |
6 | -if (! function_exists('altsys_onuninstall_base')) { |
|
6 | +if (!function_exists('altsys_onuninstall_base')) { |
|
7 | 7 | function altsys_onuninstall_base($module, $mydirname) |
8 | 8 | { |
9 | 9 | // transations on module uninstall |
10 | 10 | |
11 | - global $ret ; // TODO :-D |
|
11 | + global $ret; // TODO :-D |
|
12 | 12 | |
13 | 13 | // for Cube 2.1 |
14 | 14 | if (defined('XOOPS_CUBE_LEGACY')) { |
15 | 15 | $root = XCube_Root::getSingleton(); |
16 | - $root->mDelegateManager->add('Legacy.Admin.Event.ModuleUninstall.' . ucfirst($mydirname) . '.Success', 'altsys_message_append_onuninstall') ; |
|
17 | - $ret = array() ; |
|
16 | + $root->mDelegateManager->add('Legacy.Admin.Event.ModuleUninstall.'.ucfirst($mydirname).'.Success', 'altsys_message_append_onuninstall'); |
|
17 | + $ret = array(); |
|
18 | 18 | } else { |
19 | - if (! is_array($ret)) { |
|
20 | - $ret = array() ; |
|
19 | + if (!is_array($ret)) { |
|
20 | + $ret = array(); |
|
21 | 21 | } |
22 | 22 | } |
23 | 23 | |
24 | - $db = XoopsDatabaseFactory::getDatabaseConnection() ; |
|
25 | - $mid = $module->getVar('mid') ; |
|
24 | + $db = XoopsDatabaseFactory::getDatabaseConnection(); |
|
25 | + $mid = $module->getVar('mid'); |
|
26 | 26 | |
27 | 27 | // TABLES (loading mysql.sql) |
28 | - $sql_file_path = __DIR__.'/sql/mysql.sql' ; |
|
29 | - $prefix_mod = $db->prefix() . '_' . $mydirname ; |
|
28 | + $sql_file_path = __DIR__.'/sql/mysql.sql'; |
|
29 | + $prefix_mod = $db->prefix().'_'.$mydirname; |
|
30 | 30 | if (file_exists($sql_file_path)) { |
31 | - $ret[] = 'SQL file found at <b>' . htmlspecialchars($sql_file_path) . '</b>.<br /> Deleting tables...<br />'; |
|
32 | - $sql_lines = file($sql_file_path) ; |
|
31 | + $ret[] = 'SQL file found at <b>'.htmlspecialchars($sql_file_path).'</b>.<br /> Deleting tables...<br />'; |
|
32 | + $sql_lines = file($sql_file_path); |
|
33 | 33 | foreach ($sql_lines as $sql_line) { |
34 | 34 | if (preg_match('/^CREATE TABLE \`?([a-zA-Z0-9_-]+)\`? /i', $sql_line, $regs)) { |
35 | 35 | $sql = 'DROP TABLE '.addslashes($prefix_mod.'_'.$regs[1]); |
@@ -59,14 +59,14 @@ discard block |
||
59 | 59 | unset($templates); */ |
60 | 60 | |
61 | 61 | |
62 | - return true ; |
|
62 | + return true; |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | function altsys_message_append_onuninstall(&$module_obj, &$log) |
66 | 66 | { |
67 | 67 | if (is_array(@$GLOBALS['ret'])) { |
68 | 68 | foreach ($GLOBALS['ret'] as $message) { |
69 | - $log->add(strip_tags($message)) ; |
|
69 | + $log->add(strip_tags($message)); |
|
70 | 70 | } |
71 | 71 | } |
72 | 72 |
@@ -1,63 +1,63 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -eval(' function xoops_module_install_'.$mydirname.'( $module ) { return altsys_oninstall_base( $module , "'.$mydirname.'" ) ; } ') ; |
|
3 | +eval(' function xoops_module_install_'.$mydirname.'( $module ) { return altsys_oninstall_base( $module , "'.$mydirname.'" ) ; } '); |
|
4 | 4 | |
5 | 5 | |
6 | -if (! function_exists('altsys_oninstall_base')) { |
|
6 | +if (!function_exists('altsys_oninstall_base')) { |
|
7 | 7 | function altsys_oninstall_base($module, $mydirname) |
8 | 8 | { |
9 | 9 | // transations on module install |
10 | 10 | |
11 | - global $ret ; // TODO :-D |
|
11 | + global $ret; // TODO :-D |
|
12 | 12 | |
13 | 13 | // for Cube 2.1 |
14 | 14 | if (defined('XOOPS_CUBE_LEGACY')) { |
15 | 15 | $root = XCube_Root::getSingleton(); |
16 | - $root->mDelegateManager->add('Legacy.Admin.Event.ModuleInstall.' . ucfirst($mydirname) . '.Success', 'altsys_message_append_oninstall') ; |
|
17 | - $ret = array() ; |
|
16 | + $root->mDelegateManager->add('Legacy.Admin.Event.ModuleInstall.'.ucfirst($mydirname).'.Success', 'altsys_message_append_oninstall'); |
|
17 | + $ret = array(); |
|
18 | 18 | } else { |
19 | - if (! is_array($ret)) { |
|
20 | - $ret = array() ; |
|
19 | + if (!is_array($ret)) { |
|
20 | + $ret = array(); |
|
21 | 21 | } |
22 | 22 | } |
23 | 23 | |
24 | - $db = XoopsDatabaseFactory::getDatabaseConnection() ; |
|
25 | - $mid = $module->getVar('mid') ; |
|
24 | + $db = XoopsDatabaseFactory::getDatabaseConnection(); |
|
25 | + $mid = $module->getVar('mid'); |
|
26 | 26 | |
27 | 27 | /*************** BEGIN ALTSYS SPECIFIC PART ******************/ |
28 | 28 | // set weight=0 |
29 | - $db->queryF('UPDATE ' . $db->prefix('modules') . " SET weight=0 WHERE mid=$mid") ; |
|
29 | + $db->queryF('UPDATE '.$db->prefix('modules')." SET weight=0 WHERE mid=$mid"); |
|
30 | 30 | /*************** END ALTSYS SPECIFIC PART ******************/ |
31 | 31 | |
32 | 32 | // TABLES (loading mysql.sql) |
33 | - $sql_file_path = __DIR__.'/sql/mysql.sql' ; |
|
34 | - $prefix_mod = $db->prefix() . '_' . $mydirname ; |
|
33 | + $sql_file_path = __DIR__.'/sql/mysql.sql'; |
|
34 | + $prefix_mod = $db->prefix().'_'.$mydirname; |
|
35 | 35 | if (file_exists($sql_file_path)) { |
36 | - $ret[] = 'SQL file found at <b>' . htmlspecialchars($sql_file_path) . '</b>.<br /> Creating tables...'; |
|
36 | + $ret[] = 'SQL file found at <b>'.htmlspecialchars($sql_file_path).'</b>.<br /> Creating tables...'; |
|
37 | 37 | |
38 | 38 | if (file_exists(XOOPS_ROOT_PATH.'/class/database/oldsqlutility.php')) { |
39 | - include_once XOOPS_ROOT_PATH.'/class/database/oldsqlutility.php' ; |
|
40 | - $sqlutil = new OldSqlUtility ; |
|
39 | + include_once XOOPS_ROOT_PATH.'/class/database/oldsqlutility.php'; |
|
40 | + $sqlutil = new OldSqlUtility; |
|
41 | 41 | } else { |
42 | - include_once XOOPS_ROOT_PATH.'/class/database/sqlutility.php' ; |
|
43 | - $sqlutil = new SqlUtility ; |
|
42 | + include_once XOOPS_ROOT_PATH.'/class/database/sqlutility.php'; |
|
43 | + $sqlutil = new SqlUtility; |
|
44 | 44 | } |
45 | 45 | |
46 | - $sql_query = trim(file_get_contents($sql_file_path)) ; |
|
47 | - $sqlutil->splitMySqlFile($pieces, $sql_query) ; |
|
48 | - $created_tables = array() ; |
|
46 | + $sql_query = trim(file_get_contents($sql_file_path)); |
|
47 | + $sqlutil->splitMySqlFile($pieces, $sql_query); |
|
48 | + $created_tables = array(); |
|
49 | 49 | foreach ($pieces as $piece) { |
50 | - $prefixed_query = $sqlutil->prefixQuery($piece, $prefix_mod) ; |
|
51 | - if (! $prefixed_query) { |
|
52 | - $ret[] = 'Invalid SQL <b>' . htmlspecialchars($piece) . '</b><br />'; |
|
53 | - return false ; |
|
50 | + $prefixed_query = $sqlutil->prefixQuery($piece, $prefix_mod); |
|
51 | + if (!$prefixed_query) { |
|
52 | + $ret[] = 'Invalid SQL <b>'.htmlspecialchars($piece).'</b><br />'; |
|
53 | + return false; |
|
54 | 54 | } |
55 | - if (! $db->query($prefixed_query[0])) { |
|
56 | - $ret[] = '<b>'.htmlspecialchars($db->error()).'</b><br />' ; |
|
55 | + if (!$db->query($prefixed_query[0])) { |
|
56 | + $ret[] = '<b>'.htmlspecialchars($db->error()).'</b><br />'; |
|
57 | 57 | //var_dump( $db->error() ) ; |
58 | - return false ; |
|
58 | + return false; |
|
59 | 59 | } else { |
60 | - if (! in_array($prefixed_query[4], $created_tables)) { |
|
60 | + if (!in_array($prefixed_query[4], $created_tables)) { |
|
61 | 61 | $ret[] = 'Table <b>'.htmlspecialchars($prefix_mod.'_'.$prefixed_query[4]).'</b> created.<br />'; |
62 | 62 | $created_tables[] = $prefixed_query[4]; |
63 | 63 | } else { |
@@ -68,33 +68,33 @@ discard block |
||
68 | 68 | } |
69 | 69 | |
70 | 70 | // TEMPLATES |
71 | - $tplfile_handler = xoops_getHandler('tplfile') ; |
|
72 | - $tpl_path = __DIR__.'/templates' ; |
|
73 | - if ($handler = @opendir($tpl_path . '/')) { |
|
71 | + $tplfile_handler = xoops_getHandler('tplfile'); |
|
72 | + $tpl_path = __DIR__.'/templates'; |
|
73 | + if ($handler = @opendir($tpl_path.'/')) { |
|
74 | 74 | while (($file = readdir($handler)) !== false) { |
75 | 75 | if (substr($file, 0, 1) == '.') { |
76 | - continue ; |
|
76 | + continue; |
|
77 | 77 | } |
78 | - $file_path = $tpl_path . '/' . $file ; |
|
78 | + $file_path = $tpl_path.'/'.$file; |
|
79 | 79 | if (is_file($file_path)) { |
80 | 80 | $mtime = (int)(@filemtime($file_path)); |
81 | - $tplfile = $tplfile_handler->create() ; |
|
82 | - $tplfile->setVar('tpl_source', file_get_contents($file_path), true) ; |
|
83 | - $tplfile->setVar('tpl_refid', $mid) ; |
|
84 | - $tplfile->setVar('tpl_tplset', 'default') ; |
|
85 | - $tplfile->setVar('tpl_file', $mydirname . '_' . $file) ; |
|
86 | - $tplfile->setVar('tpl_desc', '', true) ; |
|
87 | - $tplfile->setVar('tpl_module', $mydirname) ; |
|
88 | - $tplfile->setVar('tpl_lastmodified', $mtime) ; |
|
89 | - $tplfile->setVar('tpl_lastimported', 0) ; |
|
90 | - $tplfile->setVar('tpl_type', 'module') ; |
|
91 | - if (! $tplfile_handler->insert($tplfile)) { |
|
81 | + $tplfile = $tplfile_handler->create(); |
|
82 | + $tplfile->setVar('tpl_source', file_get_contents($file_path), true); |
|
83 | + $tplfile->setVar('tpl_refid', $mid); |
|
84 | + $tplfile->setVar('tpl_tplset', 'default'); |
|
85 | + $tplfile->setVar('tpl_file', $mydirname.'_'.$file); |
|
86 | + $tplfile->setVar('tpl_desc', '', true); |
|
87 | + $tplfile->setVar('tpl_module', $mydirname); |
|
88 | + $tplfile->setVar('tpl_lastmodified', $mtime); |
|
89 | + $tplfile->setVar('tpl_lastimported', 0); |
|
90 | + $tplfile->setVar('tpl_type', 'module'); |
|
91 | + if (!$tplfile_handler->insert($tplfile)) { |
|
92 | 92 | $ret[] = '<span style="color:#ff0000;">ERROR: Could not insert template <b>'.htmlspecialchars($mydirname.'_'.$file).'</b> to the database.</span><br />'; |
93 | 93 | } else { |
94 | - $tplid = $tplfile->getVar('tpl_id') ; |
|
94 | + $tplid = $tplfile->getVar('tpl_id'); |
|
95 | 95 | $ret[] = 'Template <b>'.htmlspecialchars($mydirname.'_'.$file).'</b> added to the database. (ID: <b>'.$tplid.'</b>)<br />'; |
96 | - require_once XOOPS_TRUST_PATH.'/libs/altsys/include/altsys_functions.php' ; |
|
97 | - altsys_clear_templates_c() ; |
|
96 | + require_once XOOPS_TRUST_PATH.'/libs/altsys/include/altsys_functions.php'; |
|
97 | + altsys_clear_templates_c(); |
|
98 | 98 | // generate compiled file |
99 | 99 | /*include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php' ; |
100 | 100 | include_once XOOPS_ROOT_PATH.'/class/template.php' ; |
@@ -106,20 +106,20 @@ discard block |
||
106 | 106 | } |
107 | 107 | } |
108 | 108 | } |
109 | - closedir($handler) ; |
|
109 | + closedir($handler); |
|
110 | 110 | } |
111 | - include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php' ; |
|
112 | - include_once XOOPS_ROOT_PATH.'/class/template.php' ; |
|
113 | - xoops_template_clear_module_cache($mid) ; |
|
111 | + include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php'; |
|
112 | + include_once XOOPS_ROOT_PATH.'/class/template.php'; |
|
113 | + xoops_template_clear_module_cache($mid); |
|
114 | 114 | |
115 | - return true ; |
|
115 | + return true; |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | function altsys_message_append_oninstall(&$module_obj, &$log) |
119 | 119 | { |
120 | 120 | if (is_array(@$GLOBALS['ret'])) { |
121 | 121 | foreach ($GLOBALS['ret'] as $message) { |
122 | - $log->add(strip_tags($message)) ; |
|
122 | + $log->add(strip_tags($message)); |
|
123 | 123 | } |
124 | 124 | } |
125 | 125 |
@@ -1,33 +1,33 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require_once dirname(__DIR__).'/include/altsys_functions.php' ; |
|
3 | +require_once dirname(__DIR__).'/include/altsys_functions.php'; |
|
4 | 4 | |
5 | 5 | function b_altsys_admin_menu_show($options) |
6 | 6 | { |
7 | - global $xoopsUser ; |
|
7 | + global $xoopsUser; |
|
8 | 8 | |
9 | - $mydirname = empty($options[0]) ? 'altsys' : $options[0] ; |
|
10 | - $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]) ; |
|
9 | + $mydirname = empty($options[0]) ? 'altsys' : $options[0]; |
|
10 | + $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]); |
|
11 | 11 | |
12 | 12 | if (preg_match('/[^0-9a-zA-Z_-]/', $mydirname)) { |
13 | - die('Invalid mydirname') ; |
|
13 | + die('Invalid mydirname'); |
|
14 | 14 | } |
15 | - if (! is_object(@$xoopsUser)) { |
|
16 | - return array() ; |
|
15 | + if (!is_object(@$xoopsUser)) { |
|
16 | + return array(); |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | // coretype |
20 | - $coretype = altsys_get_core_type() ; |
|
20 | + $coretype = altsys_get_core_type(); |
|
21 | 21 | |
22 | 22 | // mid_selected |
23 | 23 | if (is_object(@$GLOBALS['xoopsModule'])) { |
24 | - $mid_selected = $GLOBALS['xoopsModule']->getVar('mid') ; |
|
24 | + $mid_selected = $GLOBALS['xoopsModule']->getVar('mid'); |
|
25 | 25 | // for system->preferences |
26 | - if ($mid_selected == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && ! empty($_GET['mod'])) { |
|
26 | + if ($mid_selected == 1 && @$_GET['fct'] == 'preferences' && @$_GET['op'] == 'showmod' && !empty($_GET['mod'])) { |
|
27 | 27 | $mid_selected = (int)$_GET['mod']; |
28 | 28 | } |
29 | 29 | } else { |
30 | - $mid_selected = 0 ; |
|
30 | + $mid_selected = 0; |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | $db = XoopsDatabaseFactory::getDatabaseConnection(); |
@@ -36,72 +36,72 @@ discard block |
||
36 | 36 | $module_handler = xoops_getHandler('module'); |
37 | 37 | $current_module = $module_handler->getByDirname($mydirname); |
38 | 38 | $config_handler = xoops_getHandler('config'); |
39 | - $current_configs = $config_handler->getConfigList($current_module->mid()) ; |
|
39 | + $current_configs = $config_handler->getConfigList($current_module->mid()); |
|
40 | 40 | $moduleperm_handler = xoops_getHandler('groupperm'); |
41 | 41 | $admin_mids = $moduleperm_handler->getItemIds('module_admin', $xoopsUser->getGroups()); |
42 | - $modules = $module_handler->getObjects(new Criteria('mid', '('.implode(',', $admin_mids) . ')', 'IN'), true) ; |
|
42 | + $modules = $module_handler->getObjects(new Criteria('mid', '('.implode(',', $admin_mids).')', 'IN'), true); |
|
43 | 43 | |
44 | 44 | $block = array( |
45 | - 'mydirname' => $mydirname , |
|
46 | - 'mod_url' => XOOPS_URL.'/modules/'.$mydirname , |
|
47 | - 'mod_imageurl' => XOOPS_URL.'/modules/'.$mydirname.'/'.$current_configs['images_dir'] , |
|
45 | + 'mydirname' => $mydirname, |
|
46 | + 'mod_url' => XOOPS_URL.'/modules/'.$mydirname, |
|
47 | + 'mod_imageurl' => XOOPS_URL.'/modules/'.$mydirname.'/'.$current_configs['images_dir'], |
|
48 | 48 | 'mod_config' => $current_configs |
49 | - ) ; |
|
49 | + ); |
|
50 | 50 | |
51 | 51 | foreach ($modules as $mod) { |
52 | 52 | $mid = (int)$mod->getVar('mid'); |
53 | - $dirname = $mod->getVar('dirname') ; |
|
54 | - $modinfo = $mod->getInfo() ; |
|
55 | - $submenus4assign = array() ; |
|
56 | - $adminmenu = array() ; |
|
57 | - $adminmenu4altsys = array() ; |
|
58 | - unset($adminmenu_use_altsys) ; |
|
59 | - @include XOOPS_ROOT_PATH.'/modules/'.$dirname.'/'.@$modinfo['adminmenu'] ; |
|
53 | + $dirname = $mod->getVar('dirname'); |
|
54 | + $modinfo = $mod->getInfo(); |
|
55 | + $submenus4assign = array(); |
|
56 | + $adminmenu = array(); |
|
57 | + $adminmenu4altsys = array(); |
|
58 | + unset($adminmenu_use_altsys); |
|
59 | + @include XOOPS_ROOT_PATH.'/modules/'.$dirname.'/'.@$modinfo['adminmenu']; |
|
60 | 60 | // from admin_menu.php etc. |
61 | - $adminmenu = array_merge($adminmenu, $adminmenu4altsys) ; |
|
61 | + $adminmenu = array_merge($adminmenu, $adminmenu4altsys); |
|
62 | 62 | foreach ($adminmenu as $sub) { |
63 | - $link = empty($sub['altsys_link']) ? $sub['link'] : $sub['altsys_link'] ; |
|
63 | + $link = empty($sub['altsys_link']) ? $sub['link'] : $sub['altsys_link']; |
|
64 | 64 | if (isset($sub['show']) && $sub['show'] === false) { |
65 | - continue ; |
|
65 | + continue; |
|
66 | 66 | } |
67 | 67 | $submenus4assign[] = array( |
68 | - 'title' => $myts->makeTboxData4Show($sub['title']) , |
|
68 | + 'title' => $myts->makeTboxData4Show($sub['title']), |
|
69 | 69 | 'url' => XOOPS_URL.'/modules/'.$dirname.'/'.htmlspecialchars($link, ENT_QUOTES) |
70 | - ) ; |
|
70 | + ); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | // for modules overriding Module.class.php (eg. Analyzer for XC) |
74 | - if (empty($submenus4assign) && defined('XOOPS_CUBE_LEGACY') && ! empty($modinfo['cube_style'])) { |
|
74 | + if (empty($submenus4assign) && defined('XOOPS_CUBE_LEGACY') && !empty($modinfo['cube_style'])) { |
|
75 | 75 | $module_handler = xoops_getHandler('module'); |
76 | 76 | $module = $module_handler->get($mid); |
77 | 77 | $moduleObj = Legacy_Utils::createModule($module); |
78 | - $modinfo['adminindex'] = $moduleObj->getAdminIndex() ; |
|
79 | - $modinfo['adminindex_absolute'] = true ; |
|
78 | + $modinfo['adminindex'] = $moduleObj->getAdminIndex(); |
|
79 | + $modinfo['adminindex_absolute'] = true; |
|
80 | 80 | foreach ($moduleObj->getAdminMenu() as $sub) { |
81 | 81 | if (@$sub['show'] === false) { |
82 | - continue ; |
|
82 | + continue; |
|
83 | 83 | } |
84 | 84 | $submenus4assign[] = array( |
85 | - 'title' => $myts->makeTboxData4Show($sub['title']) , |
|
85 | + 'title' => $myts->makeTboxData4Show($sub['title']), |
|
86 | 86 | 'url' => strncmp($sub['link'], 'http', 4) === 0 ? htmlspecialchars($sub['link'], ENT_QUOTES) : XOOPS_URL.'/modules/'.$dirname.'/'.htmlspecialchars($sub['link'], ENT_QUOTES) |
87 | - ) ; |
|
87 | + ); |
|
88 | 88 | } |
89 | 89 | } elseif (empty($adminmenu4altsys)) { |
90 | 90 | |
91 | 91 | // add preferences |
92 | - if ($mod->getVar('hasconfig') && ! in_array($mod->getVar('dirname'), array( 'system', 'legacy' ))) { |
|
92 | + if ($mod->getVar('hasconfig') && !in_array($mod->getVar('dirname'), array('system', 'legacy'))) { |
|
93 | 93 | $submenus4assign[] = array( |
94 | - 'title' => _PREFERENCES , |
|
94 | + 'title' => _PREFERENCES, |
|
95 | 95 | 'url' => htmlspecialchars(altsys_get_link2modpreferences($mid, $coretype), ENT_QUOTES) |
96 | - ) ; |
|
96 | + ); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | // add help |
100 | - if (defined('XOOPS_CUBE_LEGACY') && ! empty($modinfo['help'])) { |
|
100 | + if (defined('XOOPS_CUBE_LEGACY') && !empty($modinfo['help'])) { |
|
101 | 101 | $submenus4assign[] = array( |
102 | - 'title' => _HELP , |
|
102 | + 'title' => _HELP, |
|
103 | 103 | 'url' => XOOPS_URL.'/modules/legacy/admin/index.php?action=Help&dirname='.$dirname |
104 | - ) ; |
|
104 | + ); |
|
105 | 105 | } |
106 | 106 | } |
107 | 107 | |
@@ -123,25 +123,25 @@ discard block |
||
123 | 123 | 'submenu' => $submenus4assign, |
124 | 124 | 'selected' => $mid == $mid_selected, |
125 | 125 | 'dot_suffix' => $mid == $mid_selected ? 'selected_opened' : 'closed' |
126 | - ) ; |
|
127 | - $block['modules'][] = $module4assign ; |
|
126 | + ); |
|
127 | + $block['modules'][] = $module4assign; |
|
128 | 128 | } |
129 | 129 | |
130 | - require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ; |
|
131 | - $tpl = new D3Tpl() ; |
|
132 | - $tpl->assign('block', $block) ; |
|
133 | - $ret['content'] = $tpl->fetch($this_template) ; |
|
134 | - return $ret ; |
|
130 | + require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php'; |
|
131 | + $tpl = new D3Tpl(); |
|
132 | + $tpl->assign('block', $block); |
|
133 | + $ret['content'] = $tpl->fetch($this_template); |
|
134 | + return $ret; |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | |
138 | 138 | function b_altsys_admin_menu_edit($options) |
139 | 139 | { |
140 | - $mydirname = empty($options[0]) ? 'd3forum' : $options[0] ; |
|
141 | - $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]) ; |
|
140 | + $mydirname = empty($options[0]) ? 'd3forum' : $options[0]; |
|
141 | + $this_template = empty($options[1]) ? 'db:'.$mydirname.'_block_admin_menu.html' : trim($options[1]); |
|
142 | 142 | |
143 | 143 | if (preg_match('/[^0-9a-zA-Z_-]/', $mydirname)) { |
144 | - die('Invalid mydirname') ; |
|
144 | + die('Invalid mydirname'); |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | $form = " |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | // notification handler for D3 modules |
4 | 4 | |
5 | -require_once XOOPS_ROOT_PATH . '/include/notification_functions.php' ; |
|
5 | +require_once XOOPS_ROOT_PATH.'/include/notification_functions.php'; |
|
6 | 6 | |
7 | 7 | class D3NotificationHandler |
8 | 8 | { |
@@ -10,59 +10,59 @@ discard block |
||
10 | 10 | //function &getInstance( $conn = null ) |
11 | 11 | public static function &getInstance($conn = null) |
12 | 12 | { |
13 | - static $instance ; |
|
14 | - if (! isset($instance)) { |
|
15 | - $instance = new D3NotificationHandler() ; |
|
13 | + static $instance; |
|
14 | + if (!isset($instance)) { |
|
15 | + $instance = new D3NotificationHandler(); |
|
16 | 16 | } |
17 | - return $instance ; |
|
17 | + return $instance; |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | |
21 | 21 | public function getMailTemplateDir($mydirname, $mytrustdirname = '') |
22 | 22 | { |
23 | - global $xoopsConfig ; |
|
23 | + global $xoopsConfig; |
|
24 | 24 | |
25 | - $mydirpath = XOOPS_ROOT_PATH.'/modules/'.$mydirname ; |
|
26 | - $mytrustdirpath = XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname ; |
|
27 | - $language = empty($xoopsConfig['language']) ? 'english' : $xoopsConfig['language'] ; |
|
25 | + $mydirpath = XOOPS_ROOT_PATH.'/modules/'.$mydirname; |
|
26 | + $mytrustdirpath = XOOPS_TRUST_PATH.'/modules/'.$mytrustdirname; |
|
27 | + $language = empty($xoopsConfig['language']) ? 'english' : $xoopsConfig['language']; |
|
28 | 28 | |
29 | 29 | $search_paths = array( |
30 | - "$mydirpath/language/$language/mail_template/" , |
|
31 | - "$mytrustdirpath/language/$language/mail_template/" , |
|
32 | - "$mydirpath/language/english/mail_template/" , |
|
30 | + "$mydirpath/language/$language/mail_template/", |
|
31 | + "$mytrustdirpath/language/$language/mail_template/", |
|
32 | + "$mydirpath/language/english/mail_template/", |
|
33 | 33 | "$mytrustdirpath/language/english/mail_template/" |
34 | - ) ; |
|
34 | + ); |
|
35 | 35 | |
36 | - $mail_template_dir = "$mytrustdirpath/language/english/mail_template/" ; |
|
36 | + $mail_template_dir = "$mytrustdirpath/language/english/mail_template/"; |
|
37 | 37 | foreach ($search_paths as $path) { |
38 | 38 | if (file_exists($path)) { |
39 | - $mail_template_dir = $path ; |
|
40 | - break ; |
|
39 | + $mail_template_dir = $path; |
|
40 | + break; |
|
41 | 41 | } |
42 | 42 | } |
43 | 43 | |
44 | - return $mail_template_dir ; |
|
44 | + return $mail_template_dir; |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | |
48 | - public function triggerEvent($mydirname, $mytrustdirname, $category, $item_id, $event, $extra_tags=array(), $user_list=array(), $omit_user_id=null) |
|
48 | + public function triggerEvent($mydirname, $mytrustdirname, $category, $item_id, $event, $extra_tags = array(), $user_list = array(), $omit_user_id = null) |
|
49 | 49 | { |
50 | - $module_handler = xoops_getHandler('module') ; |
|
51 | - $module = $module_handler->getByDirname($mydirname) ; |
|
50 | + $module_handler = xoops_getHandler('module'); |
|
51 | + $module = $module_handler->getByDirname($mydirname); |
|
52 | 52 | |
53 | - $notification_handler = xoops_getHandler('notification') ; |
|
54 | - $mail_template_dir = $this->getMailTemplateDir($mydirname, $mytrustdirname) ; |
|
53 | + $notification_handler = xoops_getHandler('notification'); |
|
54 | + $mail_template_dir = $this->getMailTemplateDir($mydirname, $mytrustdirname); |
|
55 | 55 | |
56 | 56 | // calling a delegate before |
57 | 57 | if (class_exists('XCube_DelegateUtils')) { |
58 | - $force_return = false ; |
|
59 | - XCube_DelegateUtils::raiseEvent('D3NotificationHandler.Trigger', new XCube_Ref($category), new XCube_Ref($event), new XCube_Ref($item_id), new XCube_Ref($extra_tags), new XCube_Ref($module), new XCube_Ref($user_list), new XCube_Ref($omit_user_id), $module->getInfo('notification'), new XCube_Ref($force_return), new XCube_Ref($mail_template_dir), $mydirname, $mytrustdirname) ; |
|
58 | + $force_return = false; |
|
59 | + XCube_DelegateUtils::raiseEvent('D3NotificationHandler.Trigger', new XCube_Ref($category), new XCube_Ref($event), new XCube_Ref($item_id), new XCube_Ref($extra_tags), new XCube_Ref($module), new XCube_Ref($user_list), new XCube_Ref($omit_user_id), $module->getInfo('notification'), new XCube_Ref($force_return), new XCube_Ref($mail_template_dir), $mydirname, $mytrustdirname); |
|
60 | 60 | if ($force_return) { |
61 | - return ; |
|
61 | + return; |
|
62 | 62 | } |
63 | 63 | } |
64 | 64 | |
65 | - $mid = $module->getVar('mid') ; |
|
65 | + $mid = $module->getVar('mid'); |
|
66 | 66 | |
67 | 67 | // Check if event is enabled |
68 | 68 | $config_handler = xoops_getHandler('config'); |
@@ -70,8 +70,8 @@ discard block |
||
70 | 70 | if (empty($mod_config['notification_enabled'])) { |
71 | 71 | return false; |
72 | 72 | } |
73 | - $category_info =& notificationCategoryInfo($category, $mid); |
|
74 | - $event_info =& notificationEventInfo($category, $event, $mid); |
|
73 | + $category_info = & notificationCategoryInfo($category, $mid); |
|
74 | + $event_info = & notificationEventInfo($category, $event, $mid); |
|
75 | 75 | if (!in_array(notificationGenerateConfig($category_info, $event_info, 'option_name'), $mod_config['notification_events']) && empty($event_info['invisible'])) { |
76 | 76 | return false; |
77 | 77 | } |
@@ -103,11 +103,11 @@ discard block |
||
103 | 103 | $tags = array(); |
104 | 104 | // {X_ITEM_NAME} {X_ITEM_URL} {X_ITEM_TYPE} from lookup_func are disabled |
105 | 105 | $tags['X_MODULE'] = $module->getVar('name', 'n'); |
106 | - $tags['X_MODULE_URL'] = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/'; |
|
106 | + $tags['X_MODULE_URL'] = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/'; |
|
107 | 107 | $tags['X_NOTIFY_CATEGORY'] = $category; |
108 | 108 | $tags['X_NOTIFY_EVENT'] = $event; |
109 | 109 | |
110 | - $template = $event_info['mail_template'] . '.tpl'; |
|
110 | + $template = $event_info['mail_template'].'.tpl'; |
|
111 | 111 | $subject = $event_info['mail_subject']; |
112 | 112 | |
113 | 113 | if ($user_list) { |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | // user-specific tags |
122 | 122 | //$tags['X_UNSUBSCRIBE_URL'] = 'TODO'; |
123 | 123 | // TODO: don't show unsubscribe link if it is 'one-time' ?? |
124 | - $tags['X_UNSUBSCRIBE_URL'] = XOOPS_URL . '/notifications.php'; |
|
124 | + $tags['X_UNSUBSCRIBE_URL'] = XOOPS_URL.'/notifications.php'; |
|
125 | 125 | $tags = array_merge($tags, $extra_tags); |
126 | 126 | |
127 | 127 | $notification->notifyUser($mail_template_dir, $template, $subject, $tags); |
@@ -1,15 +1,15 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if (! defined('XOOPS_ROOT_PATH')) { |
|
4 | - exit ; |
|
3 | +if (!defined('XOOPS_ROOT_PATH')) { |
|
4 | + exit; |
|
5 | 5 | } |
6 | 6 | |
7 | -if (! defined('XOOPS_TRUST_PATH') || XOOPS_TRUST_PATH == '') { |
|
8 | - header('Location: '.XOOPS_URL.'/modules/altsys/setup_xoops_trust_path.php') ; |
|
9 | - exit ; |
|
7 | +if (!defined('XOOPS_TRUST_PATH') || XOOPS_TRUST_PATH == '') { |
|
8 | + header('Location: '.XOOPS_URL.'/modules/altsys/setup_xoops_trust_path.php'); |
|
9 | + exit; |
|
10 | 10 | } |
11 | 11 | |
12 | -define('ALTSYS_MYLANGUAGE_ROOT_PATH', XOOPS_ROOT_PATH . '/my_language'); |
|
12 | +define('ALTSYS_MYLANGUAGE_ROOT_PATH', XOOPS_ROOT_PATH.'/my_language'); |
|
13 | 13 | |
14 | 14 | |
15 | 15 | class SetupAltsysLangMgr extends XCube_ActionFilter |
@@ -26,23 +26,23 @@ discard block |
||
26 | 26 | } |
27 | 27 | |
28 | 28 | |
29 | -require_once XOOPS_ROOT_PATH . "/core/XCube_LanguageManager.class.php"; |
|
30 | -require_once XOOPS_ROOT_PATH . "/modules/legacy/kernel/Legacy_LanguageManager.class.php"; |
|
29 | +require_once XOOPS_ROOT_PATH."/core/XCube_LanguageManager.class.php"; |
|
30 | +require_once XOOPS_ROOT_PATH."/modules/legacy/kernel/Legacy_LanguageManager.class.php"; |
|
31 | 31 | |
32 | 32 | class AltsysLangMgr_LanguageManager extends Legacy_LanguageManager |
33 | 33 | { |
34 | - public $langman = null ; |
|
35 | - public $theme_lang_checked = false ; |
|
34 | + public $langman = null; |
|
35 | + public $theme_lang_checked = false; |
|
36 | 36 | |
37 | 37 | public function prepare() |
38 | 38 | { |
39 | - $langmanpath = XOOPS_TRUST_PATH.'/libs/altsys/class/D3LanguageManager.class.php' ; |
|
40 | - if (! file_exists($langmanpath)) { |
|
41 | - die('install the latest altsys') ; |
|
39 | + $langmanpath = XOOPS_TRUST_PATH.'/libs/altsys/class/D3LanguageManager.class.php'; |
|
40 | + if (!file_exists($langmanpath)) { |
|
41 | + die('install the latest altsys'); |
|
42 | 42 | } |
43 | - require_once($langmanpath) ; |
|
44 | - $this->langman = D3LanguageManager::getInstance() ; |
|
45 | - $this->langman->language = $this->mLanguageName ; |
|
43 | + require_once($langmanpath); |
|
44 | + $this->langman = D3LanguageManager::getInstance(); |
|
45 | + $this->langman->language = $this->mLanguageName; |
|
46 | 46 | |
47 | 47 | parent::prepare(); |
48 | 48 | } |
@@ -50,40 +50,40 @@ discard block |
||
50 | 50 | public function _loadLanguage($dirname, $fileBodyName) |
51 | 51 | { |
52 | 52 | // read/check once (selected_theme)/language/(lang).php |
53 | - if (! $this->theme_lang_checked) { |
|
54 | - $root =& XCube_Root::getSingleton() ; |
|
55 | - if (! empty($root->mContext->mXoopsConfig['theme_set'])) { |
|
56 | - $langdir = XOOPS_THEME_PATH.'/'.$root->mContext->mXoopsConfig['theme_set'].'/language' ; |
|
53 | + if (!$this->theme_lang_checked) { |
|
54 | + $root = & XCube_Root::getSingleton(); |
|
55 | + if (!empty($root->mContext->mXoopsConfig['theme_set'])) { |
|
56 | + $langdir = XOOPS_THEME_PATH.'/'.$root->mContext->mXoopsConfig['theme_set'].'/language'; |
|
57 | 57 | if (file_exists($langdir)) { |
58 | - $langfile = $langdir.'/'.$this->mLanguageName.'.php' ; |
|
59 | - $engfile = $langdir.'/english.php' ; |
|
58 | + $langfile = $langdir.'/'.$this->mLanguageName.'.php'; |
|
59 | + $engfile = $langdir.'/english.php'; |
|
60 | 60 | if (file_exists($langfile)) { |
61 | - require_once $langfile ; |
|
61 | + require_once $langfile; |
|
62 | 62 | } elseif (file_exists($engfile)) { |
63 | - require_once $engfile ; |
|
63 | + require_once $engfile; |
|
64 | 64 | } |
65 | 65 | } |
66 | - $this->theme_lang_checked = true ; |
|
66 | + $this->theme_lang_checked = true; |
|
67 | 67 | } |
68 | 68 | } |
69 | 69 | |
70 | 70 | // read normal |
71 | - $this->langman->read($fileBodyName.'.php', $dirname) ; |
|
71 | + $this->langman->read($fileBodyName.'.php', $dirname); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | public function loadPageTypeMessageCatalog($type) |
75 | 75 | { |
76 | 76 | // I dare not to use langman... |
77 | 77 | if (strpos($type, '.') === false && $this->langman->my_language) { |
78 | - $mylang_file = $this->langman->my_language.'/'.$this->mLanguageName.'/'.$type.'.php' ; |
|
78 | + $mylang_file = $this->langman->my_language.'/'.$this->mLanguageName.'/'.$type.'.php'; |
|
79 | 79 | if (file_exists($mylang_file)) { |
80 | - require_once $mylang_file ; |
|
80 | + require_once $mylang_file; |
|
81 | 81 | } |
82 | 82 | } |
83 | - $original_error_level = error_reporting() ; |
|
84 | - error_reporting($original_error_level & ~ E_NOTICE) ; |
|
83 | + $original_error_level = error_reporting(); |
|
84 | + error_reporting($original_error_level & ~ E_NOTICE); |
|
85 | 85 | parent::loadPageTypeMessageCatalog($type); |
86 | - error_reporting($original_error_level) ; |
|
86 | + error_reporting($original_error_level); |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | public function loadGlobalMessageCatalog() |
@@ -91,8 +91,8 @@ discard block |
||
91 | 91 | /* if (!$this->_loadFile(XOOPS_ROOT_PATH . "/modules/legacy/language/" . $this->mLanguageName . "/global.php")) { |
92 | 92 | $this->_loadFile(XOOPS_ROOT_PATH . "/modules/legacy/language/english/global.php"); |
93 | 93 | } */ |
94 | - $this->_loadLanguage('legacy', 'global') ; |
|
95 | - $this->_loadLanguage('legacy', 'setting') ; |
|
94 | + $this->_loadLanguage('legacy', 'global'); |
|
95 | + $this->_loadLanguage('legacy', 'setting'); |
|
96 | 96 | |
97 | 97 | // |
98 | 98 | // Now, if XOOPS_USE_MULTIBYTES isn't defined, set zero to it. |