Changeset 1342

Timestamp:

04/01/08 20:28:58 (5 years ago)

Author:

benoitg

Message:

• Apply patch from dc.ml@… to allow commas in authentication parameter strings. This is sometimes necessary for LDAP, and fixes #342

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/classes/Authenticators/AuthenticatorLDAP.php (modified) (1 diff)
• wifidog/classes/Content/FlickrPhotostream/FlickrPhotostream.php (modified) (3 diffs)
• wifidog/classes/Network.php (modified) (1 diff)

trunk/wifidog-auth/CHANGELOG

@@ -1 +1 @@
 # $Id$
-2008-3-31 Robin Jones
-        * Minor install script improvements, including making changelog accessible and colour in the permissions tables
+2008-04-01 Benoit Grégoire  <bock@step.polymtl.ca>
+        * Apply patch from dc.ml@oxys.net to allow commas in authentication parameter strings.  This is sometimes necessary for LDAP, and fixes #342
+
+2008-03-31 Robin Jones
+    * Minor install script improvements, including making changelog accessible and colour in the permissions tables
 
 2008-03-21 Benoit Grégoire  <bock@step.polymtl.ca>

trunk/wifidog-auth/wifidog/classes/Authenticators/AuthenticatorLDAP.php

@@ -143 +143 @@
      * @param string $password    Clear text password of user
      * @param string $ldap_server Hostname of LDAP server
-     * @param strong $o           The base dn of the LDAP server
+     * @param strong $o           The base dn string of the LDAP server (possibly including o=)
      * @param string $f           It's the field that will be used in the
      *                            LDAP search, i.e.: uid, mail, name server

trunk/wifidog-auth/wifidog/classes/Content/FlickrPhotostream/FlickrPhotostream.php

@@ -449 +449 @@
             $html .= "<div class='admin_element_data'>\n";
             $name = "flickr_photostream_".$this->id."_api_key";
-            $html .= "<input type='text' name='$name' value='".$this->getApiKey()."'\n";
+            $html .= "<input type='text' name='$name' size=40 value='".$this->getApiKey()."'\n";
             $html .= "</div>\n";
             $html .= "</li>\n";
@@ -594 +594 @@
                 catch (Phlickr_ConnectionException $e)
                 {
-                    $html .= _("Unable to connect to Flickr API.");
-                    echo $e;
+                    $html .= sprintf(_("Unable to connect to Flickr API: %s"), "<pre>$e</pre>");
                 }
                 catch (Phlickr_MethodFailureException $e)
@@ -851 +850 @@
                 catch (Phlickr_ConnectionException $e)
                 {
-                    $html .= _("Unable to connect to Flickr API.");
+                   $html .= sprintf(_("Unable to connect to Flickr API: %s"), "<pre>$e</pre>");
                 }
                 catch (Phlickr_MethodFailureException $e)

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

@@ -643 +643 @@
         }
 
-        return call_user_func_array(array (new ReflectionClass($this->_row['network_authenticator_class']), 'newInstance'), explode(",", str_replace(array ("'", '"'), "", str_replace(", ", ",", $this->_row['network_authenticator_params']))));
+        $string=$this->_row['network_authenticator_params'];
+         
+        $params = explode(',', $string);
+        for ($i = 0; $i < count($params); $i++) {
+            $nquotes = substr_count($params[$i], '\'');
+            if ($nquotes %2 == 1) {
+                for ($j = $i+1; $j < count($params); $j++) {
+                    if (substr_count($params[$j], '\'') > 0) {
+                        array_splice($params, $i, $j-$i+1,
+                        implode(',', array_slice($params, $i, $j-$i+1)));
+                        break;
+                    }
+                }
+            }
+            if ($nquotes > 0) {
+                $qstr =& $params[$i];
+                $qstr = substr_replace($qstr, '', strpos($qstr, '\''), 1);
+                $qstr = substr_replace($qstr, '', strrpos($qstr, '\''), 1);
+            }
+        }
+        return call_user_func_array(array (new ReflectionClass($this->_row['network_authenticator_class']), 'newInstance'), $params);
+
     }