@@ -228,6 +228,9 @@ |
||
228 | 228 | return $str; |
229 | 229 | } |
230 | 230 | |
231 | +/** |
|
232 | + * @param string $str |
|
233 | + */ |
|
231 | 234 | function lf2crlf($str) |
232 | 235 | { |
233 | 236 | return mb_ereg_replace("\r\r\n", "\r\n", mb_ereg_replace("\n", "\r\n", $str)); |
@@ -28,6 +28,9 @@ discard block |
||
28 | 28 | $this->translator = $this->initTranslator($translator); |
29 | 29 | } |
30 | 30 | |
31 | + /** |
|
32 | + * @param boolean $request |
|
33 | + */ |
|
31 | 34 | private function initRequest($request) |
32 | 35 | { |
33 | 36 | if ($request) { |
@@ -37,6 +40,9 @@ discard block |
||
37 | 40 | return new RequestHttp(); |
38 | 41 | } |
39 | 42 | |
43 | + /** |
|
44 | + * @param boolean $translator |
|
45 | + */ |
|
40 | 46 | private function initTranslator($translator) |
41 | 47 | { |
42 | 48 | if ($translator) { |
@@ -29,12 +29,12 @@ |
||
29 | 29 | } |
30 | 30 | |
31 | 31 | switch ($action) { |
32 | - case 'addignore': |
|
33 | - sql("INSERT IGNORE INTO `cache_ignore` (`cache_id`, `user_id`) VALUES ('&1', '&2')", $cache_id, $login->userid); |
|
34 | - break; |
|
35 | - case 'removeignore': |
|
36 | - sql("DELETE FROM `cache_ignore` WHERE `cache_id`='&1' AND `user_id`='&2'", $cache_id, $login->userid); |
|
37 | - break; |
|
32 | + case 'addignore': |
|
33 | + sql("INSERT IGNORE INTO `cache_ignore` (`cache_id`, `user_id`) VALUES ('&1', '&2')", $cache_id, $login->userid); |
|
34 | + break; |
|
35 | + case 'removeignore': |
|
36 | + sql("DELETE FROM `cache_ignore` WHERE `cache_id`='&1' AND `user_id`='&2'", $cache_id, $login->userid); |
|
37 | + break; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | // clear cached map result, so that the change directly appears on the map |
@@ -113,6 +113,11 @@ discard block |
||
113 | 113 | return $this->nOptions[$pId]['internal_use']; |
114 | 114 | } |
115 | 115 | |
116 | + /** |
|
117 | + * @param integer $pId |
|
118 | + * |
|
119 | + * @return string |
|
120 | + */ |
|
116 | 121 | public function getOptValue($pId) |
117 | 122 | { |
118 | 123 | if ($pId == USR_OPT_SHOWSTATS && |
@@ -129,6 +134,9 @@ discard block |
||
129 | 134 | return false; |
130 | 135 | } |
131 | 136 | |
137 | + /** |
|
138 | + * @param integer $pValue |
|
139 | + */ |
|
132 | 140 | public function setOptVisible($pId, $pValue) |
133 | 141 | { |
134 | 142 | $pId += 0; |
@@ -205,7 +205,7 @@ |
||
205 | 205 | |
206 | 206 | /** |
207 | 207 | * @param string $str |
208 | - * @return mixed |
|
208 | + * @return string |
|
209 | 209 | */ |
210 | 210 | function lf2crlf($str) |
211 | 211 | { |
@@ -86,83 +86,83 @@ discard block |
||
86 | 86 | } |
87 | 87 | |
88 | 88 | switch ($action) { |
89 | - case 'selectlang': |
|
90 | - break; |
|
89 | + case 'selectlang': |
|
90 | + break; |
|
91 | 91 | |
92 | - case 'verify': |
|
93 | - verify(); |
|
94 | - break; |
|
92 | + case 'verify': |
|
93 | + verify(); |
|
94 | + break; |
|
95 | 95 | |
96 | - case 'resetids': |
|
97 | - resetIds(); |
|
98 | - break; |
|
96 | + case 'resetids': |
|
97 | + resetIds(); |
|
98 | + break; |
|
99 | 99 | |
100 | - case 'clearcache': |
|
101 | - clearCache(); |
|
102 | - break; |
|
100 | + case 'clearcache': |
|
101 | + clearCache(); |
|
102 | + break; |
|
103 | 103 | |
104 | - case 'export': |
|
105 | - export(); |
|
106 | - break; |
|
104 | + case 'export': |
|
105 | + export(); |
|
106 | + break; |
|
107 | 107 | |
108 | - case 'xmlexport': |
|
109 | - xmlexport(); |
|
110 | - break; |
|
108 | + case 'xmlexport': |
|
109 | + xmlexport(); |
|
110 | + break; |
|
111 | 111 | |
112 | - case 'xmlimport': |
|
113 | - break; |
|
112 | + case 'xmlimport': |
|
113 | + break; |
|
114 | 114 | |
115 | - case 'xmlimport2': |
|
116 | - xmlimport2(); |
|
117 | - break; |
|
115 | + case 'xmlimport2': |
|
116 | + xmlimport2(); |
|
117 | + break; |
|
118 | 118 | |
119 | - case 'xmlimport3': |
|
120 | - xmlimport3(); |
|
121 | - break; |
|
119 | + case 'xmlimport3': |
|
120 | + xmlimport3(); |
|
121 | + break; |
|
122 | 122 | |
123 | - case 'textexportnew': |
|
124 | - textexport($translang, false); |
|
125 | - break; |
|
123 | + case 'textexportnew': |
|
124 | + textexport($translang, false); |
|
125 | + break; |
|
126 | 126 | |
127 | - case 'textexportall': |
|
128 | - textexport($translang, true); |
|
129 | - break; |
|
127 | + case 'textexportall': |
|
128 | + textexport($translang, true); |
|
129 | + break; |
|
130 | 130 | |
131 | - case 'textimport': |
|
132 | - break; |
|
131 | + case 'textimport': |
|
132 | + break; |
|
133 | 133 | |
134 | - case 'textimport2': |
|
135 | - textimport($translang); |
|
136 | - break; |
|
134 | + case 'textimport2': |
|
135 | + textimport($translang); |
|
136 | + break; |
|
137 | 137 | |
138 | - case 'edit': |
|
139 | - if (!$access->mayTranslate($translang)) { |
|
140 | - $tpl->error(ERROR_NO_ACCESS); |
|
141 | - } |
|
142 | - edit(); |
|
143 | - break; |
|
138 | + case 'edit': |
|
139 | + if (!$access->mayTranslate($translang)) { |
|
140 | + $tpl->error(ERROR_NO_ACCESS); |
|
141 | + } |
|
142 | + edit(); |
|
143 | + break; |
|
144 | 144 | |
145 | - case 'copy_en': |
|
146 | - copy_english_texts(); |
|
147 | - break; |
|
145 | + case 'copy_en': |
|
146 | + copy_english_texts(); |
|
147 | + break; |
|
148 | 148 | |
149 | - case 'listfaults': |
|
150 | - $trans = sql( |
|
151 | - 'SELECT `sys_trans`.`id`, |
|
149 | + case 'listfaults': |
|
150 | + $trans = sql( |
|
151 | + 'SELECT `sys_trans`.`id`, |
|
152 | 152 | `sys_trans`.`text` |
153 | 153 | FROM `sys_trans` |
154 | 154 | LEFT JOIN `sys_trans_ref` |
155 | 155 | ON `sys_trans`.`id`=`sys_trans_ref`.`trans_id` |
156 | 156 | WHERE ISNULL(`sys_trans_ref`.`trans_id`) |
157 | 157 | ORDER BY `sys_trans`.`id` DESC' |
158 | - ); |
|
159 | - $tpl->assign_rs('trans', $trans); |
|
160 | - sql_free_result($trans); |
|
161 | - break; |
|
158 | + ); |
|
159 | + $tpl->assign_rs('trans', $trans); |
|
160 | + sql_free_result($trans); |
|
161 | + break; |
|
162 | 162 | |
163 | - case 'listall': |
|
164 | - $trans = sql( |
|
165 | - "SELECT `sys_trans`.`id`, |
|
163 | + case 'listall': |
|
164 | + $trans = sql( |
|
165 | + "SELECT `sys_trans`.`id`, |
|
166 | 166 | `sys_trans`.`text`, |
167 | 167 | `sys_trans_text`.`text` AS `trans` |
168 | 168 | FROM `sys_trans` |
@@ -170,48 +170,48 @@ discard block |
||
170 | 170 | ON `sys_trans`.`id`=`sys_trans_text`.`trans_id` |
171 | 171 | AND `sys_trans_text`.`lang`='&1' |
172 | 172 | ORDER BY `sys_trans`.`id` DESC", |
173 | - $translang |
|
174 | - ); |
|
175 | - $tpl->assign_rs('trans', $trans); |
|
176 | - sql_free_result($trans); |
|
177 | - break; |
|
173 | + $translang |
|
174 | + ); |
|
175 | + $tpl->assign_rs('trans', $trans); |
|
176 | + sql_free_result($trans); |
|
177 | + break; |
|
178 | 178 | |
179 | - case 'remove': |
|
180 | - if (!$access->mayTranslate($translang)) { |
|
181 | - $tpl->error(ERROR_NO_ACCESS); |
|
182 | - } |
|
183 | - remove(); |
|
184 | - break; |
|
185 | - |
|
186 | - case 'scan': |
|
187 | - scan(); |
|
188 | - break; |
|
189 | - |
|
190 | - case 'scanstart': |
|
191 | - scanStart(); |
|
192 | - break; |
|
193 | - |
|
194 | - case 'scanfile': |
|
195 | - $filename = isset($_REQUEST['filename']) ? $_REQUEST['filename'] : ''; |
|
196 | - scanFile($filename); |
|
197 | - exit; |
|
198 | - |
|
199 | - case 'quicknone': |
|
200 | - $cookie->un_set('translate_mode'); |
|
201 | - break; |
|
202 | - |
|
203 | - case 'quicknew': |
|
204 | - $cookie->set('translate_mode', 'new'); |
|
205 | - break; |
|
206 | - |
|
207 | - case 'quickall': |
|
208 | - $cookie->set('translate_mode', 'all'); |
|
209 | - break; |
|
210 | - |
|
211 | - default: |
|
212 | - $action = 'listnew'; |
|
213 | - $trans = sql( |
|
214 | - "SELECT DISTINCT `sys_trans`.`id`, |
|
179 | + case 'remove': |
|
180 | + if (!$access->mayTranslate($translang)) { |
|
181 | + $tpl->error(ERROR_NO_ACCESS); |
|
182 | + } |
|
183 | + remove(); |
|
184 | + break; |
|
185 | + |
|
186 | + case 'scan': |
|
187 | + scan(); |
|
188 | + break; |
|
189 | + |
|
190 | + case 'scanstart': |
|
191 | + scanStart(); |
|
192 | + break; |
|
193 | + |
|
194 | + case 'scanfile': |
|
195 | + $filename = isset($_REQUEST['filename']) ? $_REQUEST['filename'] : ''; |
|
196 | + scanFile($filename); |
|
197 | + exit; |
|
198 | + |
|
199 | + case 'quicknone': |
|
200 | + $cookie->un_set('translate_mode'); |
|
201 | + break; |
|
202 | + |
|
203 | + case 'quicknew': |
|
204 | + $cookie->set('translate_mode', 'new'); |
|
205 | + break; |
|
206 | + |
|
207 | + case 'quickall': |
|
208 | + $cookie->set('translate_mode', 'all'); |
|
209 | + break; |
|
210 | + |
|
211 | + default: |
|
212 | + $action = 'listnew'; |
|
213 | + $trans = sql( |
|
214 | + "SELECT DISTINCT `sys_trans`.`id`, |
|
215 | 215 | `sys_trans`.`text` |
216 | 216 | FROM `sys_trans` |
217 | 217 | LEFT JOIN `sys_trans_text` |
@@ -222,10 +222,10 @@ discard block |
||
222 | 222 | WHERE ISNULL(`sys_trans_text`.`trans_id`) |
223 | 223 | OR `sys_trans_text`.`text`='' |
224 | 224 | ORDER BY `sys_trans`.`id` DESC", |
225 | - $translang |
|
226 | - ); |
|
227 | - $tpl->assign_rs('trans', $trans); |
|
228 | - sql_free_result($trans); |
|
225 | + $translang |
|
226 | + ); |
|
227 | + $tpl->assign_rs('trans', $trans); |
|
228 | + sql_free_result($trans); |
|
229 | 229 | } |
230 | 230 | |
231 | 231 | $languages = []; |
@@ -162,7 +162,7 @@ |
||
162 | 162 | } |
163 | 163 | |
164 | 164 | /** |
165 | - * @param int|bool $privilege |
|
165 | + * @param integer $privilege |
|
166 | 166 | * @return bool |
167 | 167 | */ |
168 | 168 | public function hasAdminPriv($privilege = false) |
@@ -162,7 +162,7 @@ |
||
162 | 162 | } |
163 | 163 | |
164 | 164 | /** |
165 | - * @param int|bool $privilege |
|
165 | + * @param integer $privilege |
|
166 | 166 | * @return bool |
167 | 167 | */ |
168 | 168 | public function hasAdminPriv($privilege = false) |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | /** |
100 | 100 | * @param $filename |
101 | 101 | * @param $maxLength |
102 | - * @return bool|string |
|
102 | + * @return false|string |
|
103 | 103 | */ |
104 | 104 | function read_file($filename, $maxLength = 4096) |
105 | 105 | { |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | * format number with 1000s dots |
266 | 266 | * |
267 | 267 | * @param $n |
268 | - * @return mixed|string |
|
268 | + * @return string |
|
269 | 269 | */ |
270 | 270 | function number1000($n) |
271 | 271 | { |