@@ -222,8 +222,7 @@ discard block |
||
222 | 222 | { |
223 | 223 | $padding .= ' '; |
224 | 224 | $padding_store[$row['parent_id']] = $padding; |
225 | - } |
|
226 | - else if ($row['left_id'] > $right + 1) |
|
225 | + } else if ($row['left_id'] > $right + 1) |
|
227 | 226 | { |
228 | 227 | $padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : ''; |
229 | 228 | } |
@@ -249,15 +248,13 @@ discard block |
||
249 | 248 | if (($select_id == $this->gallery_auth->get_setting_permissions()) && !$row['album_user_id']) |
250 | 249 | { |
251 | 250 | $list = true; |
252 | - } |
|
253 | - else if (!$row['album_user_id']) |
|
251 | + } else if (!$row['album_user_id']) |
|
254 | 252 | { |
255 | 253 | if ($this->gallery_auth->acl_check('a_list', $row['album_id'], $row['album_user_id']) || defined('IN_ADMIN')) |
256 | 254 | { |
257 | 255 | $list = true; |
258 | 256 | } |
259 | - } |
|
260 | - else if (!$ignore_personals) |
|
257 | + } else if (!$ignore_personals) |
|
261 | 258 | { |
262 | 259 | if ($row['album_user_id'] == $this->user->data['user_id']) |
263 | 260 | { |
@@ -268,16 +265,14 @@ discard block |
||
268 | 265 | if ($requested_permission) |
269 | 266 | { |
270 | 267 | $requested_own = !$this->gallery_auth->acl_check($requested_permission, $this->gallery_auth->get_own_album()); |
271 | - } |
|
272 | - else |
|
268 | + } else |
|
273 | 269 | { |
274 | 270 | $requested_own = false; // We need the negated version of true here |
275 | 271 | } |
276 | 272 | } |
277 | 273 | $list = (!$list) ? $access_own : $list; |
278 | 274 | $disabled = (!$disabled) ? $requested_own : $disabled; |
279 | - } |
|
280 | - else if ($row['album_user_id']) |
|
275 | + } else if ($row['album_user_id']) |
|
281 | 276 | { |
282 | 277 | if (!$c_access_personal) |
283 | 278 | { |
@@ -286,8 +281,7 @@ discard block |
||
286 | 281 | if ($requested_permission) |
287 | 282 | { |
288 | 283 | $requested_personal = !$this->gallery_auth->acl_check($requested_permission, $this->gallery_auth->get_personal_album()); |
289 | - } |
|
290 | - else |
|
284 | + } else |
|
291 | 285 | { |
292 | 286 | $requested_personal = false; // We need the negated version of true here |
293 | 287 | } |
@@ -299,8 +293,7 @@ discard block |
||
299 | 293 | if (($album_user_id != \phpbbgallery\core\block::PUBLIC_ALBUM) && ($album_user_id != $row['album_user_id'])) |
300 | 294 | { |
301 | 295 | $list = false; |
302 | - } |
|
303 | - else if (($album_user_id != \phpbbgallery\core\block::PUBLIC_ALBUM) && ($row['parent_id'] == 0)) |
|
296 | + } else if (($album_user_id != \phpbbgallery\core\block::PUBLIC_ALBUM) && ($row['parent_id'] == 0)) |
|
304 | 297 | { |
305 | 298 | $disabled = true; |
306 | 299 | } |
@@ -318,8 +311,7 @@ discard block |
||
318 | 311 | $gallery_albumbox = "<select name='$select_name' id='$select_name'>"; |
319 | 312 | $gallery_albumbox .= $album_list; |
320 | 313 | $gallery_albumbox .= '</select>'; |
321 | - } |
|
322 | - else |
|
314 | + } else |
|
323 | 315 | { |
324 | 316 | $gallery_albumbox = $album_list; |
325 | 317 | } |
@@ -388,8 +380,7 @@ discard block |
||
388 | 380 | 'album_last_user_colour' => $row['image_user_colour'], |
389 | 381 | 'album_last_user_id' => $row['image_user_id'], |
390 | 382 | ); |
391 | - } |
|
392 | - else |
|
383 | + } else |
|
393 | 384 | { |
394 | 385 | // No approved image, so we clear the columns |
395 | 386 | $sql_ary = array( |
@@ -159,7 +159,7 @@ |
||
159 | 159 | 'GALLERY_RESYNC_ALBUMS_TO_CPF_EXPAIN' => 'Diese Aktion wird alle persönlichen Alben auf dem Toplevel als kontaktbasierte selbsterstellt Profilfelder resynchronisieren . <br> WARNUNG! Dies kann beim Vorhandensein sehr vieler solcher Alben sehr lange dauern!', |
160 | 160 | 'GALLERY_RESYNC_ALBUMS_TO_CPF_CONFIRM' => 'Bist Du sicher, dass Du den Resync aller persönlichen Alben auf dem Toplevel als kontaktbasierte selbsterstellte Profilfelder durchführen willst?', |
161 | 161 | 'GALLERY_STATS' => 'Galerie Statistik', |
162 | - 'GALLERY_VERSION' => 'Version der phpBB Gallery',//ja mit ll und y, da es sich um den MOD-Namen handelt |
|
162 | + 'GALLERY_VERSION' => 'Version der phpBB Gallery', //ja mit ll und y, da es sich um den MOD-Namen handelt |
|
163 | 163 | 'GD_VERSION' => 'GD Version optimieren', |
164 | 164 | 'GENERAL_ALBUM_SETTINGS' => 'Allgemeine Albumseinstellungen', |
165 | 165 | 'GIF_ALLOWED' => 'Es ist erlaubt GIF-Dateien hochzuladen', |