X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Futil.php;h=d990b8e1f0970973ae2db300d6852ea48293603a;hb=8a28d54f6acf93584076dbdc6e5db3f9bf033681;hp=b78edc93cc4ef4158fbc999e8e43a98f881cd9ac;hpb=239c888b847ffdd789ed18afed2a7932d4812902;p=quix0rs-gnu-social.git diff --git a/lib/util.php b/lib/util.php index b78edc93cc..d990b8e1f0 100644 --- a/lib/util.php +++ b/lib/util.php @@ -124,14 +124,14 @@ function common_end_xml() { } 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)); @@ -139,7 +139,7 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall= 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', @@ -166,11 +166,11 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall= 'href="'.theme_path('ie'.$ver.'.css').' /> 'text/javascript', 'src' => common_path('js/jquery.min.js')), ' '); - + if ($callable) { if ($data) { call_user_func($callable, $data); @@ -183,17 +183,24 @@ 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) { call_user_func($headercall, $data); @@ -266,6 +273,7 @@ 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'); } @@ -337,6 +345,7 @@ function common_submit($id, $label) { common_element('input', array('type' => 'submit', 'id' => $id, 'name' => $id, + 'class' => 'submit', 'value' => $label)); common_element_end('p'); } @@ -357,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 @@ -406,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; } @@ -436,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; @@ -464,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, @@ -521,6 +526,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': @@ -529,20 +536,24 @@ 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 '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']); @@ -559,6 +570,10 @@ function common_fancy_url($action, $args=NULL) { } 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); } @@ -600,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) { @@ -630,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', @@ -641,7 +661,11 @@ 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'), + ' '); + if ($action) { + common_hidden('returnto', $action); + } common_element('input', array('id' => 'status_submit', 'name' => 'status_submit', 'type' => 'submit', @@ -738,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'))); } @@ -752,17 +795,17 @@ 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('« After')); @@ -777,7 +820,7 @@ function common_pagination($have_before, $have_after, $page, $action, $args=NULL _t('Before »')); common_element_end('li'); } - + if ($have_before || $have_after) { common_element_end('ul'); common_element_end('div'); @@ -866,3 +909,36 @@ 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; +}