'href="'.theme_path('ie'.$ver.'.css').' /><![endif]');
}
}
+
+ common_element('script', array('type' => 'text/javascript',
+ 'src' => common_path('js/jquery.min.js')),
+ ' ');
+
if ($callable) {
if ($data) {
call_user_func($callable, $data);
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) {
} else {
common_menu_item(common_local_url('login'), _t('Login'));
common_menu_item(common_local_url('register'), _t('Register'));
+ common_menu_item(common_local_url('openidlogin'), _t('OpenID'));
}
common_element_end('ul');
}
common_element('input', array('type' => 'submit',
'id' => $id,
'name' => $id,
+ 'class' => 'submit',
'value' => $label));
common_element_end('p');
}
# 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
}
case 'publicrss':
return common_path('rss');
+ case 'publicxrds':
+ return common_path('xrds');
case 'doc':
return common_path('doc/'.$args['title']);
case 'login':
case 'subscribe':
case 'unsubscribe':
return common_path('main/'.$action);
+ case 'openidlogin':
+ return common_path('main/openid');
case 'avatar':
case 'password':
return common_path('settings/'.$action);
case 'profilesettings':
return common_path('settings/profile');
+ case 'openidsettings':
+ return common_path('settings/openid');
case 'newnotice':
return common_path('notice/new');
case 'shownotice':
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']);
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) {
'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',
common_element_start('li', 'before');
common_element('a', array('href' => common_local_url($action, $newargs)),
- _t('« Before'));
+ _t('« After'));
common_element_end('li');
}
$newargs = ($args) ? array_merge($args,$pargs) : $pargs;
common_element_start('li', 'after');
common_element('a', array('href' => common_local_url($action, $newargs)),
- _t('After »'));
+ _t('Before »'));
common_element_end('li');
}