@@ -22,8 +22,8 @@ discard block |
||
22 | 22 | isset($_REQUEST['desclang']) && |
23 | 23 | !isset($_REQUEST['descid'])) { // Ocprop |
24 | 24 | |
25 | - $cache_id = $_REQUEST['cacheid']; // Ocprop |
|
26 | - $desc_lang = $_REQUEST['desclang']; // Ocprop |
|
25 | + $cache_id = $_REQUEST['cacheid']; // Ocprop |
|
26 | + $desc_lang = $_REQUEST['desclang']; // Ocprop |
|
27 | 27 | |
28 | 28 | $rs = sql("SELECT `id` FROM `cache_desc` WHERE `cache_id`='&1' AND `language`='&2'", $cache_id, $desc_lang); |
29 | 29 | if (mysql_num_rows($rs) == 1) { |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | //save to DB? |
90 | 90 | if (isset($_POST['post'])) { // Ocprop |
91 | 91 | //here we read all used information from the form if submitted |
92 | - $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1; // Ocprop |
|
92 | + $descMode = isset($_POST['descMode']) ? $_POST['descMode'] + 0 : 1; // Ocprop |
|
93 | 93 | |
94 | 94 | // fuer alte Versionen von OCProp |
95 | 95 | if (isset($_POST['submit']) && !isset($_POST['version2'])) { |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | $oldDescMode = $descMode; |
123 | 123 | } |
124 | 124 | |
125 | - $short_desc = trim($_POST['short_desc']); // Ocprop |
|
125 | + $short_desc = trim($_POST['short_desc']); // Ocprop |
|
126 | 126 | $hint = htmlspecialchars(trim($_POST['hints']), ENT_COMPAT, 'UTF-8'); |
127 | 127 | $desclang = $_POST['desclang']; |
128 | 128 | $show_all_langs = isset($_POST['show_all_langs_value']) ? $_POST['show_all_langs_value'] : 0; |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | } |
138 | 138 | |
139 | 139 | // Text from textarea |
140 | - $desc = trim($_POST['desc']); // Ocprop |
|
140 | + $desc = trim($_POST['desc']); // Ocprop |
|
141 | 141 | |
142 | 142 | // fuer alte Versionen von OCProp |
143 | 143 | if (isset($_POST['submit']) && !isset($_POST['version2'])) { |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | tpl_set_var('desclang', htmlspecialchars($desc_lang, ENT_COMPAT, 'UTF-8')); |
297 | 297 | tpl_set_var('desclang_name', htmlspecialchars(db_LanguageFromShort($desc_lang), ENT_COMPAT, 'UTF-8')); |
298 | 298 | tpl_set_var('cachename', htmlspecialchars($desc_record['name'], ENT_COMPAT, 'UTF-8')); |
299 | - tpl_set_var('reset', $reset); // obsolete |
|
299 | + tpl_set_var('reset', $reset); // obsolete |
|
300 | 300 | tpl_set_var('submit', $submit); |
301 | 301 | |
302 | 302 | // Text / normal HTML / HTML editor |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | if ($error == false) { |
74 | 74 | $cache_id = 0; |
75 | 75 | if (isset($_REQUEST['cacheid'])) { |
76 | - $cache_id = (int) $_REQUEST['cacheid']; |
|
76 | + $cache_id = (int)$_REQUEST['cacheid']; |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | if ($usr === false) { |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | } |
135 | 135 | |
136 | 136 | //here we read all used information from the form if submitted, otherwise from DB |
137 | - $cache_name = trim(isset($_POST['name']) ? trim($_POST['name']) : $cache_record['name']); // Ocprop |
|
137 | + $cache_name = trim(isset($_POST['name']) ? trim($_POST['name']) : $cache_record['name']); // Ocprop |
|
138 | 138 | $cache_type = isset($_POST['type']) ? $_POST['type'] : $cache_record['type']; |
139 | 139 | if (!isset($_POST['size'])) { |
140 | 140 | if ($cache_type == 4 || $cache_type == 5) { |
@@ -148,15 +148,15 @@ discard block |
||
148 | 148 | $cache_hidden_day = isset($_POST['hidden_day']) ? $_POST['hidden_day'] : date( |
149 | 149 | 'd', |
150 | 150 | strtotime($cache_record['date_hidden']) |
151 | - ); // Ocprop |
|
151 | + ); // Ocprop |
|
152 | 152 | $cache_hidden_month = isset($_POST['hidden_month']) ? $_POST['hidden_month'] : date( |
153 | 153 | 'm', |
154 | 154 | strtotime($cache_record['date_hidden']) |
155 | - ); // Ocprop |
|
155 | + ); // Ocprop |
|
156 | 156 | $cache_hidden_year = isset($_POST['hidden_year']) ? $_POST['hidden_year'] : date( |
157 | 157 | 'Y', |
158 | 158 | strtotime($cache_record['date_hidden']) |
159 | - ); // Ocprop |
|
159 | + ); // Ocprop |
|
160 | 160 | |
161 | 161 | if (is_null($cache_record['date_activate'])) { |
162 | 162 | $cache_activate_day = isset($_POST['activate_day']) ? $_POST['activate_day'] : date('d'); |
@@ -182,12 +182,12 @@ discard block |
||
182 | 182 | ); |
183 | 183 | } |
184 | 184 | |
185 | - $cache_difficulty = isset($_POST['difficulty']) ? $_POST['difficulty'] : $cache_record['difficulty']; // Ocprop |
|
186 | - $cache_terrain = isset($_POST['terrain']) ? $_POST['terrain'] : $cache_record['terrain']; // Ocprop |
|
187 | - $cache_country = isset($_POST['country']) ? $_POST['country'] : $cache_record['country']; // Ocprop |
|
185 | + $cache_difficulty = isset($_POST['difficulty']) ? $_POST['difficulty'] : $cache_record['difficulty']; // Ocprop |
|
186 | + $cache_terrain = isset($_POST['terrain']) ? $_POST['terrain'] : $cache_record['terrain']; // Ocprop |
|
187 | + $cache_country = isset($_POST['country']) ? $_POST['country'] : $cache_record['country']; // Ocprop |
|
188 | 188 | $show_all_countries = isset($_POST['show_all_countries']) ? $_POST['show_all_countries'] : 0; |
189 | 189 | $listing_modified = isset($_POST['listing_modified']) ? $_POST['listing_modified'] + 0 : 0; |
190 | - $status = isset($_POST['status']) ? $_POST['status'] : $cache_record['status']; // Ocprop |
|
190 | + $status = isset($_POST['status']) ? $_POST['status'] : $cache_record['status']; // Ocprop |
|
191 | 191 | $status_old = $cache_record['status']; |
192 | 192 | $search_time = isset($_POST['search_time']) ? trim($_POST['search_time']) : $cache_record['search_time']; |
193 | 193 | $way_length = isset($_POST['way_length']) ? trim($_POST['way_length']) : $cache_record['way_length']; |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | |
249 | 249 | $log_pw = isset($_POST['log_pw']) ? mb_substr($_POST['log_pw'], 0, 20) : $cache_record['logpw']; |
250 | 250 | // fix #4356: gc waypoints are frequently copy&pasted with leading spaces |
251 | - $wp_gc = isset($_POST['wp_gc']) ? strtoupper(trim($_POST['wp_gc'])) : $cache_record['wp_gc']; // Ocprop |
|
251 | + $wp_gc = isset($_POST['wp_gc']) ? strtoupper(trim($_POST['wp_gc'])) : $cache_record['wp_gc']; // Ocprop |
|
252 | 252 | $showlists = isset($_POST['showlists']) ? 1 : $cache_record['show_cachelists'] + 0; |
253 | 253 | $protect_old_coords = isset($_POST['protect_old_coords']) ? 1 : $cache_record['protect_old_coords'] + 0; |
254 | 254 | |
@@ -260,12 +260,12 @@ discard block |
||
260 | 260 | |
261 | 261 | if (isset($_POST['latNS'])) { |
262 | 262 | //get coords from post-form |
263 | - $coords_latNS = $_POST['latNS']; // Ocprop |
|
264 | - $coords_lonEW = $_POST['lonEW']; // Ocprop |
|
265 | - $coords_lat_h = trim($_POST['lat_h']); // Ocprop |
|
266 | - $coords_lon_h = trim($_POST['lon_h']); // Ocprop |
|
267 | - $coords_lat_min = trim($_POST['lat_min']); // Ocprop |
|
268 | - $coords_lon_min = trim($_POST['lon_min']); // Ocprop |
|
263 | + $coords_latNS = $_POST['latNS']; // Ocprop |
|
264 | + $coords_lonEW = $_POST['lonEW']; // Ocprop |
|
265 | + $coords_lat_h = trim($_POST['lat_h']); // Ocprop |
|
266 | + $coords_lon_h = trim($_POST['lon_h']); // Ocprop |
|
267 | + $coords_lat_min = trim($_POST['lat_min']); // Ocprop |
|
268 | + $coords_lon_min = trim($_POST['lon_min']); // Ocprop |
|
269 | 269 | } else { |
270 | 270 | //get coords from DB |
271 | 271 | $coords_lon = $cache_record['longitude']; |
@@ -563,7 +563,7 @@ discard block |
||
563 | 563 | $logtype = 13; |
564 | 564 | break; |
565 | 565 | default: |
566 | - $logtype = 0; // ??? |
|
566 | + $logtype = 0; // ??? |
|
567 | 567 | } |
568 | 568 | if ($logtype > 0) { |
569 | 569 | sql( |
@@ -959,8 +959,8 @@ discard block |
||
959 | 959 | . '</option>'; |
960 | 960 | } |
961 | 961 | tpl_set_var('statusoptions', $statusoptions); |
962 | - $statuschange_a_msg = mb_ereg_replace('%1', $cache_id, $status_change_a); |
|
963 | - $statuschange_msg = mb_ereg_replace('{a}', $statuschange_a_msg, $status_change); |
|
962 | + $statuschange_a_msg = mb_ereg_replace('%1', $cache_id, $status_change_a); |
|
963 | + $statuschange_msg = mb_ereg_replace('{a}', $statuschange_a_msg, $status_change); |
|
964 | 964 | tpl_set_var('statuschange', $status_old == 5 ? '' : $statuschange_msg); |
965 | 965 | |
966 | 966 | // show activation form? |
@@ -1105,7 +1105,7 @@ discard block |
||
1105 | 1105 | tpl_set_var('showlists_checked', $showlists ? 'checked="checked"' : ''); |
1106 | 1106 | tpl_set_var('protectcoords_checked', $protect_old_coords ? 'checked="checked"' : ''); |
1107 | 1107 | |
1108 | - tpl_set_var('reset', $reset); // obsolete |
|
1108 | + tpl_set_var('reset', $reset); // obsolete |
|
1109 | 1109 | tpl_set_var('submit', $submit); |
1110 | 1110 | } |
1111 | 1111 | } |
@@ -43,11 +43,11 @@ discard block |
||
43 | 43 | |
44 | 44 | //get the posted data |
45 | 45 | $show_all_langs = isset($_POST['show_all_langs']) ? $_POST['show_all_langs'] : 0; |
46 | - $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : ''; // Ocprop |
|
46 | + $short_desc = isset($_POST['short_desc']) ? $_POST['short_desc'] : ''; // Ocprop |
|
47 | 47 | |
48 | - $hints = isset($_POST['hints']) ? trim($_POST['hints']) : ''; // Ocprop |
|
49 | - $sel_lang = isset($_POST['desc_lang']) ? trim($_POST['desc_lang']) : $default_lang; // Ocprop |
|
50 | - $desc = isset($_POST['desc']) ? trim($_POST['desc']) : ''; // Ocprop |
|
48 | + $hints = isset($_POST['hints']) ? trim($_POST['hints']) : ''; // Ocprop |
|
49 | + $sel_lang = isset($_POST['desc_lang']) ? trim($_POST['desc_lang']) : $default_lang; // Ocprop |
|
50 | + $desc = isset($_POST['desc']) ? trim($_POST['desc']) : ''; // Ocprop |
|
51 | 51 | |
52 | 52 | // read descMode; if not set, initialize from user profile |
53 | 53 | if (isset($_POST['descMode'])) { // Ocprop |
@@ -212,8 +212,7 @@ discard block |
||
212 | 212 | tpl_set_var('name', htmlspecialchars($cache_record['name'], ENT_COMPAT, 'UTF-8')); |
213 | 213 | tpl_set_var('cacheid', htmlspecialchars($cache_id, ENT_COMPAT, 'UTF-8')); |
214 | 214 | |
215 | - tpl_set_var('lang_message', $desc_lang_exists ? $lang_message : |
|
216 | - (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : '')); |
|
215 | + tpl_set_var('lang_message', $desc_lang_exists ? $lang_message : (isset($_POST['submitform']) && $sel_lang == '0' ? $error_no_lang_selected : '')); |
|
217 | 216 | |
218 | 217 | tpl_set_var('show_all_langs', $show_all_langs); |
219 | 218 | tpl_set_var('show_all_langs_submit', ($show_all_langs == 0) ? $show_all_langs_submit : ''); |
@@ -235,7 +234,7 @@ discard block |
||
235 | 234 | $headers .= '<script language="javascript" type="text/javascript" src="' . editorJsPath() . '"></script>' . "\n"; |
236 | 235 | tpl_set_var('htmlheaders', $headers); |
237 | 236 | |
238 | - tpl_set_var('reset', $reset); // obsolete |
|
237 | + tpl_set_var('reset', $reset); // obsolete |
|
239 | 238 | tpl_set_var('submit', $submit); |
240 | 239 | } |
241 | 240 | } else { |