steffen: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusy.php, 1.33, 1.34 misc.php, 1.3, 1.4 pfb.php, 1.10, 1.11

cvs at intevation.de cvs at intevation.de
Fri Dec 3 00:25:55 CET 2004


Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv32287/kolab-resource-handlers/freebusy

Modified Files:
	freebusy.php misc.php pfb.php 
Log Message:
Fix for Issue557 (passwd in errormsg)

Index: freebusy.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- freebusy.php	20 Oct 2004 09:31:47 -0000	1.33
+++ freebusy.php	2 Dec 2004 23:25:53 -0000	1.34
@@ -40,7 +40,7 @@
       . urlencode($_SERVER['PHP_AUTH_PW']) . '@' . $homeserver
       . $_SERVER['REQUEST_URI'];
     if (!@readfile($redirect)) {
-      unauthorized("Unable to read free/busy information from $redirect");
+      unauthorized("Unable to read free/busy information from ".removePassword($redirect));
     }
   }
   shutdown();

Index: misc.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/misc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- misc.php	7 Oct 2004 11:15:09 -0000	1.3
+++ misc.php	2 Dec 2004 23:25:53 -0000	1.4
@@ -203,4 +203,38 @@
     }
 }
 
+/** Helper function */
+function assembleUri($parsed)
+{
+    if (!is_array($parsed)) return false;
+
+    $uri = empty($parsed['scheme']) ? '' :
+        $parsed['scheme'] . ':' . ((strtolower($parsed['scheme']) == 'mailto') ? '' : '//');
+
+    $uri .= empty($parsed['user']) ? '' :
+        ($parsed['user']) .
+        (empty($parsed['pass']) ? '' : ':'.($parsed['pass']))
+        . '@';
+
+    $uri .= empty($parsed['host']) ? '' :
+        $parsed['host'];
+    $uri .= empty($parsed['port']) ? '' :
+        ':' . $parsed['port'];
+
+    $uri .= empty($parsed['path']) ? '' :
+        $parsed['path'];
+    $uri .= empty($parsed['query']) ? '' :
+        '?' . $parsed['query'];
+    $uri .= empty($parsed['anchor']) ? '' :
+        '#' . $parsed['anchor'];
+
+    return $uri;
+}
+
+function removePassword( $url ) {
+  $parsed = parse_url($url);
+  if( !empty($parsed['pass']) ) $parsed['pass'] = 'XXX';
+  return assembleUri($parsed);
+}
+
 ?>

Index: pfb.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/pfb.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pfb.php	25 Nov 2004 12:08:41 -0000	1.10
+++ pfb.php	2 Dec 2004 23:25:53 -0000	1.11
@@ -37,7 +37,7 @@
       . urlencode($_SERVER['PHP_AUTH_PW']) . '@' . $homeserver
       . $_SERVER['REQUEST_URI'];
     if (!@readfile($redirect)) {
-      unauthorized("Unable to read free/busy information from $redirect");
+      unauthorized("Unable to read free/busy information from ".removePassword($redirect));
     }
   }
   shutdown();





More information about the commits mailing list