function common_element_end($tag) {
global $xw;
- $xw->endElement();
+ # TODO: switch based on $tag
+ $xw->fullEndElement();
}
function common_element($tag, $attrs=NULL, $content=NULL) {
common_element_start($tag, $attrs);
- if ($content) {
- global $xw;
- $xw->text($content);
- }
- common_element_end($tag);
+ global $xw;
+ $xw->text($content);
+ common_element_end($tag);
}
function common_start_xml($doc=NULL, $public=NULL, $system=NULL) {
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);
+ common_user_error(_t('This page is not available in a media type you accept'), 406);
exit(0);
}
if (file_exists(theme_file('ie'.$ver.'.css'))) {
# Yes, IE people should be put in jail.
$xw->writeComment('[if lte IE '.$ver.']><link rel="stylesheet" type="text/css" '.
- 'href="'.theme_path('ie'.$ver.'.css').' /><![endif]');
+ 'href="'.theme_path('ie'.$ver.'.css').'" /><![endif]');
}
}
common_element('script', array('type' => 'text/javascript',
'src' => common_path('js/jquery.min.js')),
' ');
+ common_element('script', array('type' => 'text/javascript',
+ 'src' => common_path('js/util.js')),
+ ' ');
if ($callable) {
if ($data) {
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_start('div', 'laconica');
+ if (common_config('site', 'broughtby')) {
+ $instr = _t('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
+ } else {
+ $instr = _t('**%%site.name%%** is a microblogging service. ');
+ }
+ $instr .= _t('It runs the [Laconica](http://laconi.ca/) ' .
+ 'microblogging software, version ' . LACONICA_VERSION . ', ' .
+ 'available under the ' .
+ '[GNU Affero General Public License]' .
+ '(http://www.fsf.org/licensing/licenses/agpl-3.0.html).');
+ $output = common_markup_to_html($instr);
+ common_raw($output);
+ common_element_end('div');
common_element('img', array('id' => 'cc',
'src' => $config['license']['image'],
'alt' => $config['license']['title']));
common_element_start('ul', array('id' => 'nav_sub'));
common_menu_item(common_local_url('doc', array('title' => 'about')),
_t('About'));
+ common_menu_item(common_local_url('doc', array('title' => 'faq')),
+ _t('FAQ'));
common_menu_item(common_local_url('doc', array('title' => 'privacy')),
_t('Privacy'));
common_menu_item(common_local_url('doc', array('title' => 'source')),
_t('Source'));
+ common_menu_item(common_local_url('doc', array('title' => 'contact')),
+ _t('Contact'));
common_element_end('ul');
}
common_element('label', array('for' => $id), $label);
$attrs = array('name' => $id,
'type' => 'text',
+ 'class' => 'input_text',
'id' => $id);
if ($value) {
$attrs['value'] = htmlspecialchars($value);
common_element_end('p');
}
-function common_checkbox($id, $label, $instructions=NULL, $value='true')
+function common_checkbox($id, $label, $checked=false, $instructions=NULL, $value='true')
{
common_element_start('p');
$attrs = array('name' => $id,
'type' => 'checkbox',
- 'id' => $id,
- 'value' => $value);
+ 'class' => 'checkbox',
+ 'id' => $id);
if ($value) {
$attrs['value'] = htmlspecialchars($value);
}
+ if ($checked) {
+ $attrs['checked'] = 'checked';
+ }
common_element('input', $attrs);
- common_element('label', array('for' => $id), $label);
+ # XXX: use a <label>
+ common_text(' ');
+ common_element('span', 'checkbox_label', $label);
+ common_text(' ');
if ($instructions) {
common_element('span', 'input_instructions', $instructions);
}
common_element('label', array('for' => $id), $label);
$attrs = array('name' => $id,
'type' => 'password',
+ 'class' => 'password',
'id' => $id);
common_element('input', $attrs);
if ($instructions) {
'cols' => 40,
'name' => $id,
'id' => $id),
- ($content) ? $content : ' ');
+ ($content) ? $content : '');
if ($instructions) {
common_element('span', 'input_instructions', $instructions);
}
if ($id && $code) {
$rm = Remember_me::staticGet($code);
if ($rm && ($rm->user_id == $id)) {
- $user = User::staticGet($rm->id);
+ $user = User::staticGet($rm->user_id);
if ($user) {
# successful!
$result = $rm->delete();
return common_path('avatar/'.$filename);
}
+function common_avatar_display_url($avatar) {
+ $server = common_config('avatar', 'server');
+ if ($server) {
+ return 'http://'.$server.'/'.$avatar->filename;
+ } else {
+ return $avatar->url;
+ }
+}
+
function common_default_avatar($size) {
static $sizenames = array(AVATAR_PROFILE_SIZE => 'profile',
AVATAR_STREAM_SIZE => 'stream',
case 'subscribe':
case 'unsubscribe':
return common_path('main/'.$action);
+ case 'remotesubscribe':
+ if ($args && $args['nickname']) {
+ return common_path('main/remote?nickname=' . $args['nickname']);
+ } else {
+ return common_path('main/remote');
+ }
case 'openidlogin':
return common_path('main/openid');
case 'avatar':
return common_path('main/confirmaddress/'.$args['code']);
case 'userbyid':
return common_path('user/'.$args['id']);
+ case 'recoverpassword':
+ $path = 'main/recoverpassword';
+ if ($args['code']) {
+ $path .= '/' . $args['code'];
+ }
+ return common_path($path);
+ case 'imsettings':
+ return common_path('settings/im');
default:
return common_simple_url($action, $args);
}
function common_date_string($dt) {
// XXX: do some sexy date formatting
// return date(DATE_RFC822, $dt);
- return $dt;
+ $t = strtotime($dt);
+ $now = time();
+ $diff = $now - $t;
+
+ if ($now < $t) { # that shouldn't happen!
+ return common_exact_date($dt);
+ } else if ($diff < 60) {
+ return _t('a few seconds ago');
+ } else if ($diff < 92) {
+ return _t('about a minute ago');
+ } else if ($diff < 3300) {
+ return _t('about ') . round($diff/60) . _t(' minutes ago');
+ } else if ($diff < 5400) {
+ return _t('about an hour ago');
+ } else if ($diff < 22 * 3600) {
+ return _t('about ') . round($diff/3600) . _t(' hours ago');
+ } else if ($diff < 37 * 3600) {
+ return _t('about a day ago');
+ } else if ($diff < 24 * 24 * 3600) {
+ return _t('about ') . round($diff/(24*3600)) . _t(' days ago');
+ } else if ($diff < 46 * 24 * 3600) {
+ return _t('about a month ago');
+ } else if ($diff < 330 * 24 * 3600) {
+ return _t('about ') . round($diff/(30*24*3600)) . _t(' months ago');
+ } else if ($diff < 480 * 24 * 3600) {
+ return _t('about a year ago');
+ } else {
+ return common_exact_date($dt);
+ }
+}
+
+function common_exact_date($dt) {
+ $t = strtotime($dt);
+ return date(DATE_RFC850, $t);
}
function common_date_w3dtf($dt) {
# Don't call if nobody's logged in
-function common_notice_form($action=NULL) {
+function common_notice_form($action=NULL, $content=NULL) {
$user = common_current_user();
assert(!is_null($user));
common_element_start('form', array('id' => 'status_form',
- 'method' => 'POST',
+ 'method' => 'post',
'action' => common_local_url('newnotice')));
common_element_start('p');
- common_element('label', array('for' => 'status_update',
+ common_element('label', array('for' => 'status_textarea',
'id' => 'status_label'),
_t('What\'s up, ').$user->nickname.'?');
+ common_element('span', array('id' => 'counter', 'class' => 'counter'), '140');
common_element('textarea', array('id' => 'status_textarea',
+ 'cols' => 60,
+ 'rows' => 3,
'name' => 'status_textarea'),
- ' ');
+ ($content) ? $content : '');
if ($action) {
common_hidden('returnto', $action);
}
function common_log($priority, $msg, $filename=NULL) {
common_ensure_syslog();
- syslog($priority, $msg);
+# syslog($priority, $msg);
}
function common_debug($msg, $filename=NULL) {
}
$bestq = 0;
- $besttype = NULL;
+ $besttype = "text/html";
foreach(array_keys($combine) as $type) {
if($combine[$type] > $bestq) {
for ($i = 0; $i < $chars; $i++) {
# XXX: convert to string and back
$num = hexdec(common_good_rand(1));
+ # XXX: randomness is too precious to throw away almost
+ # 40% of the bits we get!
$code .= $codechars[$num%32];
}
return $code;
}
+
+# convert markup to HTML
+
+function common_markup_to_html($c) {
+ $c = preg_replace('/%%action.(\w+)%%/e', "common_local_url('\\1')", $c);
+ $c = preg_replace('/%%doc.(\w+)%%/e', "common_local_url('doc', array('title'=>'\\1'))", $c);
+ $c = preg_replace('/%%(\w+).(\w+)%%/e', 'common_config(\'\\1\', \'\\2\')', $c);
+ return Markdown($c);
+}
projects / quix0rs-gnu-social.git / blobdiff