Changeset 2566:9bf417837888 for admin/preferences.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/preferences.php (modified) (17 diffs)

admin/preferences.php

@@ -47 +47 @@
 $default_tab = !empty($_GET['tab']) ? html::escapeHTML($_GET['tab']) : 'user-profile';
 
-if (!empty($_GET['append']) || !empty($_GET['removed']) || !empty($_GET['neworder']) || 
-     !empty($_GET['replaced']) || !empty($_POST['appendaction']) || !empty($_POST['removeaction']) || 
+if (!empty($_GET['append']) || !empty($_GET['removed']) || !empty($_GET['neworder']) ||
+     !empty($_GET['replaced']) || !empty($_POST['appendaction']) || !empty($_POST['removeaction']) ||
      !empty($_GET['db-updated'])) {
      $default_tab = 'user-favorites';
@@ -84 +84 @@
      {
           $pwd_check = !empty($_POST['cur_pwd']) && $core->auth->checkPassword(crypt::hmac(DC_MASTER_KEY,$_POST['cur_pwd']));
-          
+
           if ($core->auth->allowPassChange() && !$pwd_check && $user_email != $_POST['user_email']) {
                throw new Exception(__('If you want to change your email or password you must provide your current password.'));
           }
-          
+
           $cur = $core->con->openCursor($core->prefix.'user');
-          
+
           $cur->user_name = $user_name = $_POST['user_name'];
           $cur->user_firstname = $user_firstname = $_POST['user_firstname'];
@@ -100 +100 @@
 
           $cur->user_options = new ArrayObject($user_options);
-          
+
           if ($core->auth->allowPassChange() && !empty($_POST['new_pwd']))
           {
@@ -106 +106 @@
                     throw new Exception(__('If you want to change your email or password you must provide your current password.'));
                }
-               
+
                if ($_POST['new_pwd'] != $_POST['new_pwd_c']) {
                     throw new Exception(__("Passwords don't match"));
                }
-               
+
                $cur->user_pwd = $_POST['new_pwd'];
           }
-          
+
           # --BEHAVIOR-- adminBeforeUserUpdate
           $core->callBehavior('adminBeforeUserProfileUpdate',$cur,$core->auth->userID());
-          
+
           # Udate user
           $core->updUser($core->auth->userID(),$cur);
-          
+
           # --BEHAVIOR-- adminAfterUserUpdate
           $core->callBehavior('adminAfterUserProfileUpdate',$cur,$core->auth->userID());
-          
+
           dcPage::addSuccessNotice(__('Personal information has been successfully updated.'));
 
@@ -134 +134 @@
 
 # Update user options
-if (isset($_POST['user_post_format'])) 
+if (isset($_POST['user_post_format']))
 {
      try
      {
           $cur = $core->con->openCursor($core->prefix.'user');
-          
+
           $cur->user_name = $user_name;
           $cur->user_firstname = $user_firstname;
@@ -149 +149 @@
 
           $cur->user_post_status = $user_post_status = $_POST['user_post_status'];
-          
+
           $user_options['edit_size'] = (integer) $_POST['user_edit_size'];
           if ($user_options['edit_size'] < 1) {
@@ -156 +156 @@
           $user_options['post_format'] = $_POST['user_post_format'];
           $user_options['enable_wysiwyg'] = !empty($_POST['user_wysiwyg']);
-          
+
           $cur->user_options = new ArrayObject($user_options);
-          
+
           # --BEHAVIOR-- adminBeforeUserOptionsUpdate
           $core->callBehavior('adminBeforeUserOptionsUpdate',$cur,$core->auth->userID());
-          
+
           # Update user prefs
           $core->auth->user_prefs->accessibility->put('nodragdrop',!empty($_POST['user_acc_nodragdrop']),'boolean');
@@ -170 +170 @@
           }
           $core->auth->user_prefs->interface->put('media_by_page',(integer)$_POST['user_ui_media_by_page'],'integer');
-          
+
           # Udate user
           $core->updUser($core->auth->userID(),$cur);
-          
+
           # --BEHAVIOR-- adminAfterUserOptionsUpdate
           $core->callBehavior('adminAfterUserOptionsUpdate',$cur,$core->auth->userID());
-          
+
           dcPage::addSuccessNotice(__('Personal options has been successfully updated.'));
           http::redirect('preferences.php#user-options');
@@ -192 +192 @@
           # --BEHAVIOR-- adminBeforeUserOptionsUpdate
           $core->callBehavior('adminBeforeDashboardOptionsUpdate',$core->auth->userID());
-          
+
           # Update user prefs
           $core->auth->user_prefs->dashboard->put('doclinks',!empty($_POST['user_dm_doclinks']),'boolean');
@@ -199 +199 @@
           $core->auth->user_prefs->interface->put('iconset',(!empty($_POST['user_ui_iconset']) ? $_POST['user_ui_iconset'] : ''));
           $core->auth->user_prefs->interface->put('nofavmenu',empty($_POST['user_ui_nofavmenu']),'boolean');
-          
+
           # --BEHAVIOR-- adminAfterUserOptionsUpdate
           $core->callBehavior('adminAfterDashboardOptionsUpdate',$core->auth->userID());
-          
+
           dcPage::addSuccessNotice(__('Dashboard options has been successfully updated.'));
           http::redirect('preferences.php#user-favorites');
@@ -213 +213 @@
 
 # Add selected favorites
-if (!empty($_POST['appendaction'])) 
+if (!empty($_POST['appendaction']))
 {
      try {
@@ -280 +280 @@
                unset($order[$k]);
           }
-     }    
+     }
      $core->favs->setFavoriteIDs($order,false);
      if (!$core->error->flag()) {
@@ -320 +320 @@
      dcPage::jsPageTabs($default_tab).
      dcPage::jsConfirmClose('user-form').
-     
+
      # --BEHAVIOR-- adminPreferencesHeaders
      $core->callBehavior('adminPreferencesHeaders'),
@@ -386 +386 @@
      echo
      '<h4 class="vertical-separator pretty-title">'.__('Change my password').'</h4>'.
-     
+
      '<div class="pw-table">'.
      '<p class="pw-cell"><label for="new_pwd">'.__('New password:').'</label>'.
@@ -395 +395 @@
      '</div>'.
      '</div>'.
-     
+
      '<p><label for="new_pwd_c">'.__('Confirm new password:').'</label>'.
      form::password('new_pwd_c',20,255).'</p>'.
-     
+
      '<p><label for="cur_pwd">'.__('Your current password:').'</label>'.
      form::password('cur_pwd',20,255).'</p>'.
@@ -589 +589 @@
 
 if (count($iconsets_combo) > 1) {
-     echo 
+     echo
           '<div class="fieldset">'.
           '<h4>'.__('Dashboard icons').'</h4>'.
@@ -631 +631 @@
 dcPage::helpBlock('core_user_pref');
 dcPage::close();
-?>