summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2007-09-17 04:18:28 +0100
committerAndrew Dolgov <[email protected]>2007-09-17 04:18:28 +0100
commitdcffb2723ac2c80475c196e2f1b5e07affcdf78a (patch)
treef3aad1a1996bf7f863df00711ec086737dd47404
parenta5372e09c371b204633ad7c2f4349c639167a904 (diff)
urlencode login/pass before passing them to Magpie (closes #153)
-rw-r--r--functions.php4
-rw-r--r--magpierss/extlib/Snoopy.class.inc4
2 files changed, 4 insertions, 4 deletions
diff --git a/functions.php b/functions.php
index 362f965a4..66fda3936 100644
--- a/functions.php
+++ b/functions.php
@@ -442,8 +442,8 @@
return;
}
- $auth_login = db_fetch_result($result, 0, "auth_login");
- $auth_pass = db_fetch_result($result, 0, "auth_pass");
+ $auth_login = urlencode(db_fetch_result($result, 0, "auth_login"));
+ $auth_pass = urlencode(db_fetch_result($result, 0, "auth_pass"));
$update_interval = db_fetch_result($result, 0, "update_interval");
$cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
diff --git a/magpierss/extlib/Snoopy.class.inc b/magpierss/extlib/Snoopy.class.inc
index 83a1e7395..17e6a952d 100644
--- a/magpierss/extlib/Snoopy.class.inc
+++ b/magpierss/extlib/Snoopy.class.inc
@@ -157,9 +157,9 @@ class Snoopy
//preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
$URI_PARTS = parse_url($URI);
if (!empty($URI_PARTS["user"]))
- $this->user = $URI_PARTS["user"];
+ $this->user = urldecode($URI_PARTS["user"]);
if (!empty($URI_PARTS["pass"]))
- $this->pass = $URI_PARTS["pass"];
+ $this->pass = urldecode($URI_PARTS["pass"]);
$this->_scheme = $URI_PARTS["scheme"];