immediate mode for openid

[quix0rs-gnu-social.git] / lib / util.php

diff --git a/lib/util.php b/lib/util.php
index 9b4415c1765d478f255929a22f05c9ce8709798c..eb019ac7ee849f97d243295c0ce164f7da293773 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -366,8 +366,8 @@ function common_textarea($id, $label, $content=NULL, $instructions=NULL) {
 
 # salted, hashed passwords are stored in the DB
 
-function common_munge_password($id, $password) {
-       return md5($id . $password);
+function common_munge_password($password, $id) {
+       return md5($password . $id);
 }
 
 # check if a username exists and has matching password
@@ -557,7 +557,7 @@ function common_fancy_url($action, $args=NULL) {
         case 'foaf':
                return common_path($args['nickname'].'/'.$action);
         case 'subscriptions':
-        case 'subscribed':
+        case 'subscribers':
         case 'all':
                if ($args && $args['page']) {
                        return common_path($args['nickname'].'/'.$action.'?page=' . $args['page']);
@@ -615,7 +615,12 @@ function common_redirect($url, $code=307) {
                                                   307 => "Temporary Redirect");
        header("Status: ${code} $status[$code]");
        header("Location: $url");
+       
+       common_start_xml('a',
+                                        '-//W3C//DTD XHTML 1.0 Strict//EN',
+                                        'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
        common_element('a', array('href' => $url), $url);
+       common_end_xml();
 }
 
 function common_broadcast_notice($notice, $remote=false) {