}
define('PAGE_TYPE_PREFS', 'application/xhtml+xml,text/html;q=0.7,application/xml;q=0.3,text/xml;q=0.2');
-
+
function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=NULL) {
global $config, $xw;
$httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : NULL;
# XXX: allow content negotiation for RDF, RSS, or XRDS
-
+
$type = common_negotiate_type(common_accept_to_prefs($httpaccept),
common_accept_to_prefs(PAGE_TYPE_PREFS));
common_client_error(_t('This page is not available in a media type you accept'), 406);
exit(0);
}
-
+
header('Content-Type: '.$type);
common_start_xml('html',
'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) {
call_user_func($headercall, $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
# who is the current user?
function common_current_user() {
- static $user = NULL; # FIXME: global memcached
- if (is_null($user)) {
- common_ensure_session();
- $id = $_SESSION['userid'];
- if ($id) {
- $user = User::staticGet($id);
- }
+ common_ensure_session();
+ $id = $_SESSION['userid'];
+ if ($id) {
+ $user = User::staticGet($id);
}
return $user;
}
$r = htmlspecialchars($text);
$id = $notice->profile_id;
$r = preg_replace('@https?://\S+@', '<a href="\0" class="extlink">\0</a>', $r);
- $r = preg_replace('/(^|\b)@([\w-]+)($|\b)/e', "'\\1@'.common_at_link($id, '\\2').'\\3'", $r);
+ $r = preg_replace('/(^|\s+)@([a-z0-9]{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
# XXX: # tags
# XXX: machine tags
return $r;
if ($sender) {
$recipient_user = User::staticGet('nickname', $nickname);
if ($recipient_user) {
- $recipient = $recipient->getProfile();
- return '<a href="'.htmlspecialchars($recipient->profileurl).'" class="atlink usertouser">'.$nickname.'</a>';
+ return '<a href="'.htmlspecialchars(common_profile_url($nickname)).'" class="atlink usertouser">'.$nickname.'</a>';
}
}
# Otherwise, no links. @messages from local users to remote users,
}
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':
return common_path('notice/'.$args['notice']);
- case 'xrds':
+ case 'xrds':
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']);
} else {
return common_path($args['nickname']);
}
+ case 'confirmaddress':
+ return common_path('main/confirmaddress/'.$args['code']);
+ case 'userbyid':
+ return common_path('user/'.$args['id']);
default:
return common_simple_url($action, $args);
}
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) {
# Don't call if nobody's logged in
-function common_notice_form() {
+function common_notice_form($action=NULL) {
$user = common_current_user();
assert(!is_null($user));
common_element_start('form', array('id' => 'status_form',
'id' => 'status_label'),
_t('What\'s up, ').$user->nickname.'?');
common_element('textarea', array('id' => 'status_textarea',
- 'name' => 'status_textarea'));
+ 'name' => 'status_textarea'),
+ ' ');
+ if ($action) {
+ common_hidden('returnto', $action);
+ }
common_element('input', array('id' => 'status_submit',
'name' => 'status_submit',
'type' => 'submit',
}
}
+function common_log_db_error(&$object, $verb, $filename=NULL) {
+ $objstr = common_log_objstring($object);
+ $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
+ common_log(LOG_ERROR, $last_error->message . '(' . $verb . ' on ' . $objstr . ')', $filename);
+}
+
+function common_log_objstring(&$object) {
+ if (is_null($object)) {
+ return "NULL";
+ }
+ $arr = $object->toArray();
+ $fields = array();
+ foreach ($arr as $k => $v) {
+ $fields[] = "$k='$v'";
+ }
+ $objstring = $object->tableName() . '[' . implode(',', $fields) . ']';
+ return $objstring;
+}
+
function common_valid_http_url($url) {
return Validate::uri($url, array('allowed_schemes' => array('http', 'https')));
}
# Does a little before-after block for next/prev page
-function common_pagination($have_before, $have_after, $page, $action, $args=NULL) {
-
+function common_pagination($have_before, $have_after, $page, $action, $args=NULL) {
+
if ($have_before || $have_after) {
common_element_start('div', array('id' => 'pagination'));
common_element_start('ul', array('id' => 'nav_pagination'));
}
-
+
if ($have_before) {
$pargs = array('page' => $page-1);
$newargs = ($args) ? array_merge($args,$pargs) : $pargs;
-
+
common_element_start('li', 'before');
common_element('a', array('href' => common_local_url($action, $newargs)),
_t('« After'));
_t('Before »'));
common_element_end('li');
}
-
+
if ($have_before || $have_after) {
common_element_end('ul');
common_element_end('div');
global $config;
return $config[$main][$sub];
}
+
+function common_copy_args($from) {
+ $to = array();
+ $strip = get_magic_quotes_gpc();
+ foreach ($from as $k => $v) {
+ $to[$k] = ($strip) ? stripslashes($v) : $v;
+ }
+ return $to;
+}
+
+function common_user_uri(&$user) {
+ return common_local_url('userbyid', array('id' => $user->id));
+}
+
+function common_notice_uri(&$notice) {
+ return common_local_url('shownotice',
+ array('notice' => $notice->id));
+}
+
+# 36 alphanums - lookalikes (0, O, 1, I) = 32 chars = 5 bits
+
+function common_confirmation_code($bits) {
+ # 36 alphanums - lookalikes (0, O, 1, I) = 32 chars = 5 bits
+ static $codechars = '23456789ABCDEFGHJKLMNPQRSTUVWXYZ';
+ $chars = ceil($bits/5);
+ $code = '';
+ for ($i = 0; $i < $chars; $i++) {
+ # XXX: convert to string and back
+ $num = hexdec(common_good_rand(1));
+ $code .= $codechars[$num%32];
+ }
+ return $code;
+}
projects / quix0rs-gnu-social.git / blobdiff