steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith attendeescommon.php, 1.3, 1.4
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/fbview/fbview/kronolith
In directory doto:/tmp/cvs-serv32287/kolab-resource-handlers/fbview/fbview/kronolith
Modified Files:
attendeescommon.php
Log Message:
Fix for Issue557 (passwd in errormsg)
Index: attendeescommon.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/attendeescommon.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- attendeescommon.php 14 Oct 2004 00:10:08 -0000 1.3
+++ attendeescommon.php 2 Dec 2004 23:25:53 -0000 1.4
@@ -70,6 +70,40 @@
return $kronolith_hash;
}
+/** 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);
+}
+
function getFreeBusy($user)
{
global $params;
@@ -78,7 +112,8 @@
$text = @file_get_contents($url);
if ($text == false || empty($text)) {
- return PEAR::raiseError(sprintf(_("Unable to read free/busy information from %s"), $url));
+ return PEAR::raiseError(sprintf(_("Unable to read free/busy information from %s"),
+ removePassword($url)));
}
$iCalendar = &new Horde_iCalendar();
@@ -86,7 +121,8 @@
$vfb = &$iCalendar->findComponent('VFREEBUSY');
if ($vfb === false) {
- return PEAR::raiseError(sprintf(_("No free/busy information found from %s"), $url));
+ return PEAR::raiseError(sprintf(_("No free/busy information found from %s"),
+ removePassword($url)));
}
return $vfb;
More information about the commits
mailing list