Changeset 1438

Timestamp:

01/21/10 15:31:55 (2 years ago)

Author:

gbastien

Message:

Corrected some one-liners:

• Permission error when deleting user role (#689)
• Patch by Steven Kurylo to remove white spaces from authenticator arguments (#612)
• Search for stakeholders has now same case-sensitivity as the user's network (#662)
• Corrected (#613) patch by Hélène Gauthier

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/classes/Authenticator.php (modified) (1 diff)
• wifidog/classes/Mail.php (modified) (1 diff)
• wifidog/classes/Network.php (modified) (1 diff)
• wifidog/classes/Role.php (modified) (1 diff)
• wifidog/classes/User.php (modified) (2 diffs)

trunk/wifidog-auth/CHANGELOG

@@ -1 +1 @@
 # $Id$
 
-2009-12-17
+2010-01-21 Geneviève Bastien <gbastien@versatic.net>
+ * Permission error when deleting user role (#689)
+ * Patch by Steven Kurylo to remove white spaces from authenticator arguments (#612)
+ * Search for stakeholders has now same case-sensitivity as the user's network (#662)
+ * Corrected (#613) patch by Hélène Gauthier
+
+2009-12-17 Geneviève Bastien <gbastien@versatic.net>
  * Code refactoring: Network, NodeGroup, Node inherit from HotspotGraphElement (#677)
 
-2009-12-08
+2009-12-08 Geneviève Bastien <gbastien@versatic.net>
  * Added the concept of node group and hierarchy (in a not too clean way to start with, I will refactor the code before adding new functionalities to nodes and groups) (#246)
  * Login and signup and logout script now receive the mac address as parameter (#675)

trunk/wifidog-auth/wifidog/classes/Authenticator.php

@@ -147 +147 @@
  
         foreach ($network_array as $network) {
-                if ($network->getName() == $default_network)
+                if ($network->getName() == $default_network->getName())
                         $default_network_param = $network->getId();
         }

trunk/wifidog-auth/wifidog/classes/Mail.php

@@ -368 +368 @@
          */
         public function send() {
-            $phpmailerPath = 'lib/PHPMailer_v2.0.0/';
+            $dir = new DirectoryIterator('lib');
+            foreach ($dir as $fileinfo) {
+                if ($fileinfo->isDir() && (substr($fileinfo->getFilename(), 0, 9) == 'PHPMailer')) {
+                    $phpmailerPath = 'lib/' . $fileinfo->getFilename() . '/';
+                }
+            }
             require_once ($phpmailerPath.'class.phpmailer.php');
             require_once ($phpmailerPath.'class.smtp.php');

trunk/wifidog-auth/wifidog/classes/Network.php

@@ -688 +688 @@
             }
         }
+        $params = array_map('trim',$params);
         return call_user_func_array(array (new ReflectionClass($this->_row['network_authenticator_class']), 'newInstance'), $params);
 

trunk/wifidog-auth/wifidog/classes/Role.php

@@ -485 +485 @@
 
         $retval = false;
-        if (Security::hasPermission('SERVER_PERM_EDIT_ROLES', Server::getServer())) {
+        if (Security::hasPermission(Permission::P('SERVER_PERM_EDIT_ROLES'), Server::getServer())) {
             $db = AbstractDb::getObject();
             $id = $db->escapeString($this->getId());

trunk/wifidog-auth/wifidog/classes/User.php

@@ -172 +172 @@
         return $object;
     }
+    
+                /** Instantiate a user object
+     * @param $username The username of the user
+     * @param $account_origin Network:  The account origin
+     * @param &$errMsg An error message will be appended to this if the username is not empty, but the user doesn't exist.
+     * @return a User object, or null if there was an error
+     */
+    public static function getUserByUsernameOrEmailAndOrigin($usernameOrEmail, Network $account_origin, &$errMsg = null) {
+        $db = AbstractDb::getObject();
+        $object = null;
+
+        $username_str = $db->escapeString($usernameOrEmail);
+        $comparison = ($account_origin->getUsernamesCaseSensitive()? '=': 'ILike');
+        $account_origin_str = $db->escapeString($account_origin->getId());
+        $db->execSqlUniqueRes("SELECT user_id FROM users WHERE (username {$comparison} '$username_str' OR email ILike '$username_str') AND account_origin = '$account_origin_str'", $user_info, false);
+
+        if ($user_info != null) {
+            $object = self::getObject($user_info['user_id']);
+        }
+        else if (!empty($usernameOrEmail)) {
+            $errMsg .= sprintf(_("There is no user with username or email %s"),$usernameOrEmail);
+        }
+        return $object;
+    }
 
     /** Instantiate a user object
@@ -857 +881 @@
             if (!empty ($_REQUEST[$name])) {
                 $username = $_REQUEST[$name];
-                return self :: getUserByUsernameOrEmail($username, $errMsg);
+                return self :: getUserByUsernameOrEmailAndOrigin($username, $network, $errMsg);
             } else
             return null;