X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Futil.php;h=d990b8e1f0970973ae2db300d6852ea48293603a;hb=8a28d54f6acf93584076dbdc6e5db3f9bf033681;hp=900149fc22bfd10cf37b457152aacb1f503718c4;hpb=64b5b1902c5921929cad57a19244dbc0743b6936;p=quix0rs-gnu-social.git
diff --git a/lib/util.php b/lib/util.php
index 900149fc22..d990b8e1f0 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -123,10 +123,24 @@ function common_end_xml() {
$xw->flush();
}
-function common_show_header($pagetitle, $callable=NULL, $data=NULL, $notice=NULL) {
+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;
- header('Content-Type: application/xhtml+xml');
+ $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));
+
+ if (!$type) {
+ 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',
'-//W3C//DTD XHTML 1.0 Strict//EN',
@@ -152,6 +166,11 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $notice=NULL
'href="'.theme_path('ie'.$ver.'.css').' /> 'text/javascript',
+ 'src' => common_path('js/jquery.min.js')),
+ ' ');
+
if ($callable) {
if ($data) {
call_user_func($callable, $data);
@@ -164,20 +183,33 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $notice=NULL
common_element_start('div', array('id' => 'wrap'));
common_element_start('div', array('id' => 'header'));
common_nav_menu();
- 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');
- if (common_logged_in()) {
- common_notice_form();
+ 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);
+
+ if ($headercall) {
+ if ($data) {
+ call_user_func($headercall, $data);
+ } else {
+ call_user_func($headercall);
+ }
}
common_element_end('div');
common_element_start('div', array('id' => 'content'));
- if (common_logged_in()) {
- common_views_menu();
- }
}
function common_show_footer() {
@@ -185,6 +217,16 @@ function common_show_footer() {
common_element_end('div'); # content div
common_foot_menu();
common_element_start('div', array('id' => 'footer'));
+ common_element_start('p', 'laconica');
+ common_text(_t('This site is running the '));
+ common_element('a', array('class' => 'software',
+ href => 'http://laconi.ca/'),
+ 'Laconica');
+ common_text(_t('microblogging tool, version ' . LACONICA_VERSION . ', available under the '));
+ common_element('a', array(href => 'http://www.fsf.org/licensing/licenses/agpl-3.0.html'),
+ 'GNU Affero General Public License');
+ common_text(_t('.'));
+ common_element_end('p');
common_element('img', array('id' => 'cc',
'src' => $config['license']['image'],
'alt' => $config['license']['title']));
@@ -216,6 +258,10 @@ function common_raw($xml) {
function common_nav_menu() {
$user = common_current_user();
common_element_start('ul', array('id' => 'nav'));
+ if ($user) {
+ common_menu_item(common_local_url('all', array('nickname' => $user->nickname)),
+ _t('Home'));
+ }
common_menu_item(common_local_url('public'), _t('Public'));
common_menu_item(common_local_url('doc', array('title' => 'help')),
_t('Help'));
@@ -227,22 +273,11 @@ function common_nav_menu() {
} 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');
}
-function common_views_menu() {
- $user = common_current_user();
- common_element_start('ul', array('id' => 'nav_views'));
- common_menu_item(common_local_url('all', array('nickname' =>
- $user->nickname)),
- _t('Home'));
- common_menu_item(common_local_url('showstream', array('nickname' =>
- $user->nickname)),
- _t('Profile'), $user->fullname || $user->nickname);
- common_element_end('ul');
-}
-
function common_foot_menu() {
common_element_start('ul', array('id' => 'nav_sub'));
common_menu_item(common_local_url('doc', array('title' => 'about')),
@@ -254,17 +289,21 @@ function common_foot_menu() {
common_element_end('ul');
}
-function common_menu_item($url, $text, $title=NULL) {
+function common_menu_item($url, $text, $title=NULL, $is_selected=false) {
+ $lattrs = array();
+ if ($is_selected) {
+ $lattrs['class'] = 'current';
+ }
+ common_element_start('li', $lattrs);
$attrs['href'] = $url;
if ($title) {
$attrs['title'] = $title;
}
- common_element_start('li');
common_element('a', $attrs, $text);
common_element_end('li');
}
-function common_input($id, $label, $value=NULL) {
+function common_input($id, $label, $value=NULL,$instructions=NULL) {
common_element_start('p');
common_element('label', array('for' => $id), $label);
$attrs = array('name' => $id,
@@ -274,6 +313,9 @@ function common_input($id, $label, $value=NULL) {
$attrs['value'] = htmlspecialchars($value);
}
common_element('input', $attrs);
+ if ($instructions) {
+ common_element('span', 'input_instructions', $instructions);
+ }
common_element_end('p');
}
@@ -284,46 +326,48 @@ function common_hidden($id, $value) {
'value' => $value));
}
-function common_password($id, $label) {
+function common_password($id, $label, $instructions=NULL) {
common_element_start('p');
common_element('label', array('for' => $id), $label);
$attrs = array('name' => $id,
'type' => 'password',
'id' => $id);
common_element('input', $attrs);
+ if ($instructions) {
+ common_element('span', 'input_instructions', $instructions);
+ }
common_element_end('p');
}
function common_submit($id, $label) {
global $xw;
common_element_start('p');
- common_element_start('label', array('for' => $id));
- $xw->writeRaw(' ');
- common_element_end('label');
common_element('input', array('type' => 'submit',
'id' => $id,
'name' => $id,
- 'value' => $label,
- 'class' => 'button'));
+ 'class' => 'submit',
+ 'value' => $label));
common_element_end('p');
}
-function common_textarea($id, $label, $content=NULL) {
+function common_textarea($id, $label, $content=NULL, $instructions=NULL) {
common_element_start('p');
common_element('label', array('for' => $id), $label);
common_element('textarea', array('rows' => 3,
'cols' => 40,
'name' => $id,
- 'id' => $id,
- 'class' => 'width50'),
+ 'id' => $id),
($content) ? $content : ' ');
+ if ($instructions) {
+ common_element('span', 'input_instructions', $instructions);
+ }
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
@@ -371,13 +415,10 @@ function common_set_user($nickname) {
# 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;
}
@@ -401,7 +442,7 @@ function common_render_content($text, $notice) {
$r = htmlspecialchars($text);
$id = $notice->profile_id;
$r = preg_replace('@https?://\S+@', '\0', $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;
@@ -429,8 +470,7 @@ function common_at_link($sender_id, $nickname) {
if ($sender) {
$recipient_user = User::staticGet('nickname', $nickname);
if ($recipient_user) {
- $recipient = $recipient->getProfile();
- return ''.$nickname.'';
+ return ''.$nickname.'';
}
}
# Otherwise, no links. @messages from local users to remote users,
@@ -464,9 +504,7 @@ function common_default_avatar($size) {
static $sizenames = array(AVATAR_PROFILE_SIZE => 'profile',
AVATAR_STREAM_SIZE => 'stream',
AVATAR_MINI_SIZE => 'mini');
- global $config;
-
- return common_path($config['avatar']['default'][$sizenames[$size]]);
+ return theme_path('default-avatar-'.$sizenames[$size].'.png');
}
function common_local_url($action, $args=NULL) {
@@ -481,9 +519,15 @@ function common_local_url($action, $args=NULL) {
function common_fancy_url($action, $args=NULL) {
switch (strtolower($action)) {
case 'public':
- return common_path('');
+ if ($args && $args['page']) {
+ return common_path('?page=' . $args['page']);
+ } else {
+ return common_path('');
+ }
case 'publicrss':
return common_path('rss');
+ case 'publicxrds':
+ return common_path('xrds');
case 'doc':
return common_path('doc/'.$args['title']);
case 'login':
@@ -492,27 +536,44 @@ function common_fancy_url($action, $args=NULL) {
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 'subscriptions':
- case 'subscribed':
- case 'xrds':
- case 'all':
+ case 'xrds':
case 'foaf':
return common_path($args['nickname'].'/'.$action);
+ case 'subscriptions':
+ case 'subscribers':
+ case 'all':
+ if ($args && $args['page']) {
+ return common_path($args['nickname'].'/'.$action.'?page=' . $args['page']);
+ } else {
+ return common_path($args['nickname'].'/'.$action);
+ }
case 'allrss':
return common_path($args['nickname'].'/all/rss');
case 'userrss':
return common_path($args['nickname'].'/rss');
case 'showstream':
- return common_path($args['nickname']);
+ if ($args && $args['page']) {
+ return common_path($args['nickname'].'?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);
}
@@ -554,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) {
@@ -570,6 +636,13 @@ function common_broadcast_notice($notice, $remote=false) {
return true;
}
+function common_broadcast_profile($profile) {
+ // XXX: optionally use a queue system like http://code.google.com/p/microapps/wiki/NQDQ
+ require_once(INSTALLDIR.'/lib/omb.php');
+ omb_broadcast_profile($profile);
+ // XXX: Other broadcasts...?
+ return true;
+}
function common_profile_url($nickname) {
return common_local_url('showstream', array('nickname' => $nickname));
@@ -577,7 +650,7 @@ function common_profile_url($nickname) {
# 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',
@@ -587,8 +660,14 @@ function common_notice_form() {
common_element('label', array('for' => 'status_update',
'id' => 'status_label'),
_t('What\'s up, ').$user->nickname.'?');
- common_element('textarea', array('id' => 'status_textarea'));
+ common_element('textarea', array('id' => 'status_textarea',
+ 'name' => 'status_textarea'),
+ ' ');
+ if ($action) {
+ common_hidden('returnto', $action);
+ }
common_element('input', array('id' => 'status_submit',
+ 'name' => 'status_submit',
'type' => 'submit',
'value' => _t('Send')));
common_element_end('p');
@@ -683,6 +762,25 @@ function common_debug($msg, $filename=NULL) {
}
}
+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')));
}
@@ -697,20 +795,20 @@ function common_valid_tag($tag) {
# 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('« Before'));
+ _t('« After'));
common_element_end('li');
}
@@ -719,12 +817,128 @@ function common_pagination($have_before, $have_after, $page, $action, $args=NULL
$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');
}
-
+
if ($have_before || $have_after) {
common_element_end('ul');
common_element_end('div');
}
}
+
+/* Following functions are copied from MediaWiki GlobalFunctions.php
+ * and written by Evan Prodromou. */
+
+function common_accept_to_prefs($accept, $def = '*/*') {
+ # No arg means accept anything (per HTTP spec)
+ if(!$accept) {
+ return array($def => 1);
+ }
+
+ $prefs = array();
+
+ $parts = explode(',', $accept);
+
+ foreach($parts as $part) {
+ # FIXME: doesn't deal with params like 'text/html; level=1'
+ @list($value, $qpart) = explode(';', $part);
+ $match = array();
+ if(!isset($qpart)) {
+ $prefs[$value] = 1;
+ } elseif(preg_match('/q\s*=\s*(\d*\.\d+)/', $qpart, $match)) {
+ $prefs[$value] = $match[1];
+ }
+ }
+
+ return $prefs;
+}
+
+function common_mime_type_match($type, $avail) {
+ if(array_key_exists($type, $avail)) {
+ return $type;
+ } else {
+ $parts = explode('/', $type);
+ if(array_key_exists($parts[0] . '/*', $avail)) {
+ return $parts[0] . '/*';
+ } elseif(array_key_exists('*/*', $avail)) {
+ return '*/*';
+ } else {
+ return NULL;
+ }
+ }
+}
+
+function common_negotiate_type($cprefs, $sprefs) {
+ $combine = array();
+
+ foreach(array_keys($sprefs) as $type) {
+ $parts = explode('/', $type);
+ if($parts[1] != '*') {
+ $ckey = common_mime_type_match($type, $cprefs);
+ if($ckey) {
+ $combine[$type] = $sprefs[$type] * $cprefs[$ckey];
+ }
+ }
+ }
+
+ foreach(array_keys($cprefs) as $type) {
+ $parts = explode('/', $type);
+ if($parts[1] != '*' && !array_key_exists($type, $sprefs)) {
+ $skey = common_mime_type_match($type, $sprefs);
+ if($skey) {
+ $combine[$type] = $sprefs[$skey] * $cprefs[$type];
+ }
+ }
+ }
+
+ $bestq = 0;
+ $besttype = NULL;
+
+ foreach(array_keys($combine) as $type) {
+ if($combine[$type] > $bestq) {
+ $besttype = $type;
+ $bestq = $combine[$type];
+ }
+ }
+
+ return $besttype;
+}
+
+function common_config($main, $sub) {
+ 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;
+}