Changeset 2566:9bf417837888 for admin/user.php

Timestamp:

11/17/13 20:25:53 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.6

Children:

2567:6c11245cbf04, 2568:61c67a7d17fa

Message:

Add some people in CREDITS, remove trailing spaces and tabs.

File:

• admin/user.php (modified) (14 diffs)

admin/user.php

@@ -45 +45 @@
      try {
           $rs = $core->getUser($_REQUEST['id']);
-          
+
           $user_id = $rs->user_id;
           $user_super = $rs->user_super;
@@ -58 +58 @@
           $user_tz = $rs->user_tz;
           $user_post_status = $rs->user_post_status;
-          
+
           $user_options = array_merge($user_options,$rs->options());
-          
+
           $page_title = $user_id;
      } catch (Exception $e) {
@@ -75 +75 @@
                throw new Exception(__('Password verification failed'));
           }
-          
+
           $cur = $core->con->openCursor($core->prefix.'user');
-          
+
           $cur->user_id = $_POST['user_id'];
           $cur->user_super = $user_super = !empty($_POST['user_super']) ? 1 : 0;
@@ -88 +88 @@
           $cur->user_tz = $user_tz = $_POST['user_tz'];
           $cur->user_post_status = $user_post_status = $_POST['user_post_status'];
-          
+
           if ($cur->user_id == $core->auth->userID() && $core->auth->isSuperAdmin()) {
                // force super_user to true if current user
@@ -96 +96 @@
                $cur->user_change_pwd = !empty($_POST['user_change_pwd']) ? 1 : 0;
           }
-          
+
           if (!empty($_POST['new_pwd'])) {
                if ($_POST['new_pwd'] != $_POST['new_pwd_c']) {
@@ -104 +104 @@
                }
           }
-          
+
           $user_options['post_format'] = $_POST['user_post_format'];
           $user_options['edit_size'] = (integer) $_POST['user_edit_size'];
-          
+
           if ($user_options['edit_size'] < 1) {
                $user_options['edit_size'] = 10;
           }
-          
+
           $cur->user_options = new ArrayObject($user_options);
-          
+
           # Udate user
           if ($user_id)
@@ -119 +119 @@
                # --BEHAVIOR-- adminBeforeUserUpdate
                $core->callBehavior('adminBeforeUserUpdate',$cur,$user_id);
-               
+
                $new_id = $core->updUser($user_id,$cur);
-               
+
                # --BEHAVIOR-- adminAfterUserUpdate
                $core->callBehavior('adminAfterUserUpdate',$cur,$new_id);
-               
+
                if ($user_id == $core->auth->userID() &&
                $user_id != $new_id) {
                     $core->session->destroy();
                }
-               
+
                dcPage::addSuccessNotice(__('User has been successfully updated.'));
                http::redirect('user.php?id='.$new_id);
@@ -139 +139 @@
                     throw new Exception(sprintf(__('User "%s" already exists.'),html::escapeHTML($cur->user_id)));
                }
-               
+
                # --BEHAVIOR-- adminBeforeUserCreate
                $core->callBehavior('adminBeforeUserCreate',$cur);
-               
+
                $new_id = $core->addUser($cur);
-               
+
                # --BEHAVIOR-- adminAfterUserCreate
                $core->callBehavior('adminAfterUserCreate',$cur,$new_id);
-               
+
                dcPage::addSuccessNotice(__('User has been successfully created.'));
                if (!empty($_POST['saveplus'])) {
@@ -180 +180 @@
           "\n//]]>\n".
           "</script>\n".
-     
+
      # --BEHAVIOR-- adminUserHeaders
      $core->callBehavior('adminUserHeaders'),
@@ -299 +299 @@
 $core->callBehavior('adminUserForm',isset($rs) ? $rs : null);
 
-echo 
+echo
 '</div>'.
 '</div>';
@@ -332 +332 @@
           '</p>'.
           '</form>';
-          
+
           $permissions = $core->getUserPermissions($user_id);
           $perm_types = $core->auth->getPermissionsTypes();
-          
+
           if (count($permissions) == 0)
           {
@@ -346 +346 @@
                     if (count($v['p']) > 0)
                     {
-                         echo 
+                         echo
                          '<form action="users_actions.php" method="post" class="perm-block">'.
                          '<p class="blog-perm">'.__('Blog:').' <a href="blog.php?id='.html::escapeHTML($k).'">'.
                          html::escapeHTML($v['name']).'</a> ('.html::escapeHTML($k).')</p>';
-                         
+
                          echo '<ul class="ul-perm">';
                          foreach ($v['p'] as $p => $V) {
@@ -369 +369 @@
                     }
                }
-          }    
-
-     } 
+          }
+
+     }
      else {
           echo '<p>'.sprintf(__('%s is super admin (all rights on all blogs).'),'<strong>'.$user_id.'</strong>').'</p>';
-     }    
+     }
      echo '</div>';
 }
@@ -380 +380 @@
 dcPage::helpBlock('core_user');
 dcPage::close();
-?>