Changeset 2024
- Timestamp:
- May 25, 2007, 5:51:40 PM (17 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/user_list.php
r1960 r2024 253 253 if (isset($_POST['delete']) and count($collection) > 0) 254 254 { 255 if (in_array($conf['guest_id'], $collection)) 256 { 257 array_push($page['errors'], l10n('Guest cannot be deleted')); 258 } 259 if (($conf['guest_id'] != $conf['default_user_id']) and 260 in_array($conf['default_user_id'], $collection)) 261 { 262 array_push($page['errors'], l10n('Default user cannot be deleted')); 263 } 255 264 if (in_array($conf['webmaster_id'], $collection)) 256 265 { 257 266 array_push($page['errors'], l10n('Webmaster cannot be deleted')); 258 267 } 259 elseif (in_array($user['id'], $collection))268 if (in_array($user['id'], $collection)) 260 269 { 261 270 array_push($page['errors'], l10n('You cannot delete your account')); 262 271 } 263 else 272 273 if (count($page['errors']) == 0) 264 274 { 265 275 if (isset($_POST['confirm_deletion']) and 1 == $_POST['confirm_deletion']) … … 392 402 } 393 403 394 // Webmaster status must not be changed 395 if ($conf['webmaster_id'] == $user_id and isset($data['status'])) 404 // special users checks 405 if 406 ( 407 ($conf['webmaster_id'] == $user_id) or 408 ($conf['guest_id'] == $user_id) or 409 ($conf['default_user_id'] == $user_id) 410 ) 396 411 { 397 $data['status'] = 'webmaster'; 398 } 399 400 // Webmaster and guest adviser must not be changed 401 if ((($conf['webmaster_id'] == $user_id) or ($conf['guest_id'] == $user_id)) and isset($data['adviser'])) 402 { 403 $data['adviser'] = 'false'; 412 // status must not be changed 413 if (isset($data['status'])) 414 { 415 if ($conf['webmaster_id'] == $user_id) 416 { 417 $data['status'] = 'webmaster'; 418 } 419 else 420 { 421 $data['status'] = 'guest'; 422 } 423 } 424 425 // could not be adivser 426 if (isset($data['adviser'])) 427 { 428 $data['adviser'] = 'false'; 429 } 404 430 } 405 431 -
trunk/language/en_UK.iso-8859-1/admin.lang.php
r2009 r2024 615 615 $lang['display_thumbnail_hoverbox'] = 'Hoverbox display'; 616 616 $lang['Thumbnails'] = 'Thumbnails'; 617 $lang['Guest cannot be deleted'] = 'Guest cannot be deleted'; 618 $lang['Default user cannot be deleted'] = 'Default user cannot be deleted'; 617 619 ?> -
trunk/language/fr_FR.iso-8859-1/admin.lang.php
r2018 r2024 616 616 $lang['display_thumbnail_hoverbox'] = 'Affichage lors du survol'; 617 617 $lang['Thumbnails'] = 'Miniatures'; 618 $lang['Guest cannot be deleted'] = 'L\'invité ne peut pas être supprimé'; 619 $lang['Default user cannot be deleted'] = 'L\'utilisateur par défaut ne peut pas être supprimé'; 618 620 ?> -
trunk/plugins
- Property svn:ignore
-
old new 3 3 rv_gmaps 4 4 dotclear_easy 5 look_like_gbo 6 secureImages
-
- Property svn:ignore
Note: See TracChangeset
for help on using the changeset viewer.