switch password and id in munge_password

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

diff --git a/lib/util.php b/lib/util.php
index 1a29fcda97402709d5b36ac13d51c8d32294473c..eb019ac7ee849f97d243295c0ce164f7da293773 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -183,16 +183,23 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=
        common_element_start('div', array('id' => 'wrap'));
        common_element_start('div', array('id' => 'header'));
        common_nav_menu();
-       if ($config['site']['logo'] || file_exists(theme_file('logo.png'))) {
+       if ((is_string($config['site']['logo']) && (strlen($config['site']['logo']) > 0))
+               || file_exists(theme_file('logo.png')))
+       {
                common_element_start('a', array('href' => common_local_url('public')));
                common_element('img', array('src' => ($config['site']['logo']) ?
                                                                        ($config['site']['logo']) : theme_path('logo.png'),
                                                                        'alt' => $config['site']['name'],
                                                                        'id' => 'logo'));
                common_element_end('a');
+       } else {
+               common_element_start('p', array('id' => 'branding'));
+               common_element('a', array('href' => common_local_url('public')),
+                                          $config['site']['name']);
+               common_element_end('p');
        }
+       
        common_element('h1', 'pagetitle', $pagetitle);
-       common_element('h2', 'sitename', $config['site']['name']);
        
        if ($headercall) {
                if ($data) {
@@ -359,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
@@ -523,6 +530,8 @@ function common_fancy_url($action, $args=NULL) {
                }
         case 'publicrss':
                return common_path('rss');
+        case 'publicxrds':
+               return common_path('xrds');
         case 'doc':
                return common_path('doc/'.$args['title']);
         case 'login':
@@ -548,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']);
@@ -606,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) {
@@ -647,7 +661,8 @@ function common_notice_form() {
                                                                  'id' => 'status_label'),
                                   _t('What\'s up, ').$user->nickname.'?');
        common_element('textarea', array('id' => 'status_textarea',
-                                                                        'name' => 'status_textarea'));
+                                                                        'name' => 'status_textarea'),
+                                  ' ');
        common_element('input', array('id' => 'status_submit',
                                                                  'name' => 'status_submit',
                                                                  'type' => 'submit',