Changeset 25092 for extensions/UserAdvManager/trunk/main.inc.php

Timestamp:

Oct 23, 2013, 6:02:26 PM (11 years ago)

Author:

Eric

Message:

Bug 1109 fixed - Password enforcement features have been removed from UAM and set in a new dedicated plugin : Password Policy

Language files cleanup

Bug 2984 fixed - Display issue in Miscellaneous options
Bug 2986 fixed - Status for unvalidated users can not be "Guest" and is forced to "-------"
Bug 2987 fixed - New registered users have to follow a link on confirmation page before log in

Next release is 2.51.0

File:

• extensions/UserAdvManager/trunk/main.inc.php (modified) (1 diff)

extensions/UserAdvManager/trunk/main.inc.php

@@ -74 +74 @@
 }
 
-// Add new feature in user_list - Password Reset
-// ---------------------------------------------
-if (isset($conf_UAM['PWDRESET']) and $conf_UAM['PWDRESET'] == 'true')
-{
-  // Add new column on user_list
-  // ---------------------------
-  add_event_handler('loc_visible_user_list', 'UAM_loc_visible_user_list');
-
-  // Add prefilter on user_list
-  // --------------------------
-  add_event_handler('loc_begin_admin', 'UAM_PwdReset_Action',60);
-
-  /**
-   * UAM_PwdReset_Action - Triggered on UAM_PwdReset_Action
-   * Handle password reset action in user_list.php
-   */
-  function UAM_PwdReset_Action()
-  {
-    global $conf, $user, $template, $lang, $errors;
-
-    $page['errors'] = array();
-    $page['infos'] = array();
-    $page['filtered_users'] = array();
-
-    if (isset($_POST['pwdreset']))
-    {
-      $collection = array();
-
-      switch ($_POST['target'])
-      {
-        case 'all' :
-        {
-          foreach($page['filtered_users'] as $local_user)
-          {
-            array_push($collection, $local_user['id']);
-          }
-          break;
-        }
-        case 'selection' :
-        {
-          if (isset($_POST['selection']))
-          {
-            $collection = $_POST['selection'];
-          }
-          break;
-        }
-      }
-
-      if (count($collection) == 0)
-      {
-        array_push($page['errors'], l10n('Select at least one user'));
-      }
-    }
-
-    if (isset($_POST['pwdreset']) and count($collection) > 0)
-    {
-      if (in_array($conf['guest_id'], $collection))
-      {
-        array_push($page['errors'], l10n('UAM_Guest cannot be pwdreset'));
-        $template->append('errors', l10n('UAM_Guest cannot be pwdreset'));
-      }
-      if (($conf['guest_id'] != $conf['default_user_id']) and
-        in_array($conf['default_user_id'], $collection))
-      {
-        array_push($page['errors'], l10n('UAM_Default user cannot be pwgreset'));
-        $template->append('errors', l10n('UAM_Default user cannot be pwgreset'));
-      }
-      if (in_array($conf['webmaster_id'], $collection))
-      {
-        array_push($page['errors'], l10n('UAM_Webmaster cannot be pwdreset'));
-        $template->append('errors', l10n('UAM_Webmaster cannot be pwdreset'));
-      }
-      if (in_array($user['id'], $collection))
-      {
-        array_push($page['errors'], l10n('UAM_You cannot pwdreset your account'));
-        $template->append('errors', l10n('UAM_You cannot pwdreset your account'));
-      }
-
-      // Generic accounts exclusion (including Adult_Content generic users)
-      // ------------------------------------------------------------------
-      $query ='
-SELECT u.id
-FROM '.USERS_TABLE.' AS u
-INNER JOIN '.USER_INFOS_TABLE.' AS ui
-  ON u.id = ui.user_id
-WHERE ui.status = "generic"
-;';
-
-            $result = pwg_query($query);
-
-      while ($row = pwg_db_fetch_assoc($result))
-      {
-        if (in_array($row['id'], $collection))
-        {
-          array_push($page['errors'], l10n('UAM_Generic cannot be pwdreset'));
-          $errors = l10n('UAM_Generic cannot be pwdreset');
-        }
-      }
-
-      // Admins accounts exclusion
-      // --------------------------
-      $query ='
-SELECT u.id
-FROM '.USERS_TABLE.' AS u
-INNER JOIN '.USER_INFOS_TABLE.' AS ui
-  ON u.id = ui.user_id
-WHERE ui.status = "admin"
-;';
-
-            $result = pwg_query($query);
-
-      while ($row = pwg_db_fetch_assoc($result))
-      {
-        if (in_array($row['id'], $collection))
-        {
-          array_push($page['errors'], l10n('UAM_Admins cannot be pwdreset'));
-          $errors = l10n('UAM_Admins cannot be pwdreset');
-        }
-      }
-
-      $template->append('errors', $errors);
-
-      if (count($page['errors']) == 0)
-      {
-        if (isset($_POST['confirm_pwdreset']) and 1 == $_POST['confirm_pwdreset'])
-        {
-          foreach ($collection as $user_id)
-          {
-            UAM_Set_PwdReset($user_id);
-          }
-          array_push(
-            $page['infos'],
-            l10n_dec(
-              'UAM %d user pwdreseted', 'UAM %d users pwdreseted',
-              count($collection)
-              )
-            );
-          $template->append('infos', l10n_dec(
-              'UAM %d user pwdreseted', 'UAM %d users pwdreseted',
-              count($collection)));
-          foreach ($page['filtered_users'] as $filter_key => $filter_user)
-          {
-            if (in_array($filter_user['id'], $collection))
-            {
-              unset($page['filtered_users'][$filter_key]);
-            }
-          }
-        }
-        else
-        {
-          array_push($page['errors'], l10n('UAM_You need to confirm pwdreset'));
-          $template->append('errors', l10n('UAM_You need to confirm pwdreset'));
-        }
-      }
-    }
-    $template->set_prefilter('user_list', 'UAM_PwdReset_Prefilter');
-  }
-
-  /**
-   * UAM_PwdReset_Prefilter
-   * Adds action field for password reset in user_list.tpl
-   */
-  function UAM_PwdReset_Prefilter($content, &$smarty)
-  {
-    $search = '
-<fieldset>
-  <legend>{\'Deletions\'|@translate}</legend>
-  <label><input type="checkbox" name="confirm_deletion" value="1"> {\'confirm\'|@translate}</label>
-  <input class="submit" type="submit" value="{\'Delete selected users\'|@translate}" name="delete">
-</fieldset>
-';
- 
-    $addon = '
-<fieldset>
-  <legend>{\'UAM_PwdReset\'|@translate}</legend>
-  <label><input type="checkbox" name="confirm_pwdreset" value="1"> {\'confirm\'|@translate}</label>
-  <input class="submit" type="submit" value="{\'UAM_Password reset selected users\'|@translate}" name="pwdreset">
-</fieldset>
-';
-
-    $replacement = $addon.$search;
-
-    return str_replace($search, $replacement, $content);
-  }
-}
-
 
 // Check options compatibility between UAM and Piwigo at admin page load