From 1a15570339fa7ae5e33a98a7fe6a8645e3d3af72 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 17 May 2008 13:04:30 -0400 Subject: [PATCH] common_start_element -> common_element_start darcs-hash:20080517170430-84dde-74f42b52695699f646b65b939f78fbbe95a05c7e.gz --- actions/all.php | 4 ++-- actions/avatar.php | 3 ++- actions/login.php | 3 ++- actions/newnotice.php | 4 ++-- actions/password.php | 3 ++- actions/profilesettings.php | 3 ++- actions/public.php | 4 ++-- actions/register.php | 2 +- actions/shownotice.php | 16 ++++++++-------- actions/showstream.php | 34 +++++++++++++++++----------------- actions/subscribed.php | 12 ++++++------ actions/subscriptions.php | 12 ++++++------ lib/stream.php | 8 ++++---- 13 files changed, 56 insertions(+), 52 deletions(-) diff --git a/actions/all.php b/actions/all.php index f1a2229f03..4522329290 100644 --- a/actions/all.php +++ b/actions/all.php @@ -40,12 +40,12 @@ class AllAction extends ShowstreamAction { $notice->find(); - common_start_element('div', 'notices'); + common_element_start('div', 'notices'); while ($notice->fetch()) { $this->show_notice($notice); } - common_end_element('div'); + common_element_end('div'); } } diff --git a/actions/avatar.php b/actions/avatar.php index 2244e7c782..851ef23f4a 100644 --- a/actions/avatar.php +++ b/actions/avatar.php @@ -46,7 +46,7 @@ class AvatarAction extends SettingsAction { 'height' => AVATAR_PROFILE_SIZE)); } - common_start_element('form', array('enctype' => 'multipart/form-data', + common_element_start('form', array('enctype' => 'multipart/form-data', 'method' => 'POST', 'id' => 'avatar', 'action' => @@ -62,6 +62,7 @@ class AvatarAction extends SettingsAction { 'type' => 'submit', 'id' => 'submit'), _t('Upload')); + common_element_end('form'); } function handle_post() { diff --git a/actions/login.php b/actions/login.php index 3f096dc0c6..13e14f5bee 100644 --- a/actions/login.php +++ b/actions/login.php @@ -53,7 +53,7 @@ class LoginAction extends Action { if (!is_null($error)) { common_element('div', array('class' => 'error'), $msg); } - common_start_element('form', array('method' => 'POST', + common_element_start('form', array('method' => 'POST', 'id' => 'login', 'action' => common_local_url('login'))); common_element('label', array('for' => 'username'), @@ -74,5 +74,6 @@ class LoginAction extends Action { 'type' => 'button', 'id' => 'cancel'), _t('Cancel')); + common_element_end('form'); } } diff --git a/actions/newnotice.php b/actions/newnotice.php index b15232dec4..9fc9103188 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -54,11 +54,11 @@ class NewnoticeAction extends Action { } function show_form() { - common_start_element('form', array('id' => 'newnotice', 'method' => 'POST', + common_element_start('form', array('id' => 'newnotice', 'method' => 'POST', 'action' => common_local_url('newnotice'))); common_element('span', 'nickname', $profile->nickname); common_element('textarea', array('rows' => 4, 'cols' => 80, 'id' => 'content')); common_element('input', array('type' => 'submit'), 'Send'); - common_end_element('form'); + common_element_end('form'); } } \ No newline at end of file diff --git a/actions/password.php b/actions/password.php index fb670ecc9e..c9869f1778 100644 --- a/actions/password.php +++ b/actions/password.php @@ -25,7 +25,7 @@ class PasswordAction extends SettingsAction { common_show_header(_t('Change password')); $this->settings_menu(); $this->message($msg, $success); - common_start_element('form', array('method' => 'POST', + common_element_start('form', array('method' => 'POST', 'id' => 'password', 'action' => common_local_url('password'))); @@ -40,6 +40,7 @@ class PasswordAction extends SettingsAction { 'type' => 'button', 'id' => 'cancel'), _t('Cancel')); + common_element_end('form'); } function handle_post() { diff --git a/actions/profilesettings.php b/actions/profilesettings.php index f46045dde4..ae060dd908 100644 --- a/actions/profilesettings.php +++ b/actions/profilesettings.php @@ -25,7 +25,7 @@ class ProfilesettingsAction extends SettingsAction { common_show_header(_t('Profile settings')); $this->settings_menu(); $this->message($msg, $success); - common_start_element('form', array('method' => 'POST', + common_element_start('form', array('method' => 'POST', 'id' => 'profilesettings', 'action' => common_local_url('profilesettings'))); @@ -43,6 +43,7 @@ class ProfilesettingsAction extends SettingsAction { 'type' => 'button', 'id' => 'cancel'), _t('Cancel')); + common_element_end('form'); common_show_footer(); } diff --git a/actions/public.php b/actions/public.php index 698f991952..c8e6e36cfa 100644 --- a/actions/public.php +++ b/actions/public.php @@ -46,13 +46,13 @@ class PublicAction extends StreamAction { $notice->find(); - common_start_element('div', 'notices'); + common_element_start('div', 'notices'); while ($notice->fetch()) { $this->show_notice($notice); } - common_end_element('div'); + common_element_end('div'); } } diff --git a/actions/register.php b/actions/register.php index 369017b3bf..b8233784dd 100644 --- a/actions/register.php +++ b/actions/register.php @@ -101,7 +101,7 @@ class RegisterAction extends Action { common_show_header(_t('Login')); common_element_start('form', array('method' => 'POST', 'id' => 'login', - 'action' => common_local_url('login'))); + 'action' => common_local_url('register'))); common_element('label', array('for' => 'username'), _t('Name')); common_element('input', array('name' => 'username', diff --git a/actions/shownotice.php b/actions/shownotice.php index 21784e4fd2..b7a96f0ab0 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -50,7 +50,7 @@ class ShownoticeAction extends Action { function show_notice($notice) { $profile = $notice->getProfile(); # XXX: RDFa - common_start_element('div', array('class' => 'notice')); + common_element_start('div', array('class' => 'notice')); $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); if ($avatar) { common_element('img', array('src' => $avatar->url, @@ -61,17 +61,17 @@ class ShownoticeAction extends Action { ($profile->fullname) ? $profile->fullname : $profile->nickname)); } - common_start_element('a', array('href' => $profile->profileurl, - 'class' => 'nickname', - 'title' => - ($profile->fullname) ? $profile->fullname : - $profile->nickname), - $profile->nickname); + common_element('a', array('href' => $profile->profileurl, + 'class' => 'nickname', + 'title' => + ($profile->fullname) ? $profile->fullname : + $profile->nickname), + $profile->nickname); # FIXME: URL, image, video, audio common_element('span', array('class' => 'content'), $notice->content); common_element('span', array('class' => 'date'), common_date_string($notice->created)); - common_end_element('div'); + common_element_end('div'); } } diff --git a/actions/showstream.php b/actions/showstream.php index c477ae29b7..1f9fb935d4 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -77,15 +77,15 @@ class ShowstreamAction extends StreamAction { } function notice_form() { - common_start_element('form', array('id' => 'newnotice', 'method' => 'POST', + common_element_start('form', array('id' => 'newnotice', 'method' => 'POST', 'action' => common_local_url('newnotice'))); common_element('textarea', array('rows' => 4, 'cols' => 80, 'id' => 'content')); common_element('input', array('type' => 'submit'), 'Send'); - common_end_element('form'); + common_element_end('form'); } function show_profile($profile) { - common_start_element('div', 'profile'); + common_element_start('div', 'profile'); $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); if ($avatar) { common_element('img', array('src' => $avatar->url, @@ -113,42 +113,42 @@ class ShowstreamAction extends StreamAction { } function show_subscribe_form($profile) { - common_start_element('form', array('id' => 'subscribe', 'method' => 'POST', + common_element_start('form', array('id' => 'subscribe', 'method' => 'POST', 'action' => common_local_url('subscribe'))); common_element('input', array('id' => 'subscribeto', 'name' => 'subscribeto', 'type' => 'hidden', 'value' => $profile->nickname)); common_element('input', array('type' => 'submit'), _t('subscribe')); - common_end_element('form'); + common_element_end('form'); } function show_unsubscribe_form($profile) { - common_start_element('form', array('id' => 'unsubscribe', 'method' => 'POST', + common_element_start('form', array('id' => 'unsubscribe', 'method' => 'POST', 'action' => common_local_url('unsubscribe'))); common_element('input', array('id' => 'unsubscribeto', 'name' => 'unsubscribeto', 'type' => 'hidden', 'value' => $profile->nickname)); common_element('input', array('type' => 'submit'), _t('unsubscribe')); - common_end_element('form'); + common_element_end('form'); } function show_subscriptions($profile) { # XXX: add a limit $subs = $profile->getLink('id', 'subscription', 'subscriber'); - common_start_element('div', 'subscriptions'); + common_element_start('div', 'subscriptions'); $cnt = 0; while ($subs->fetch()) { $cnt++; if ($cnt % SUBSCRIPTIONS_PER_ROW == 1) { - common_start_element('div', 'row'); + common_element_start('div', 'row'); } - common_start_element('a', array('title' => $subs->fullname || + common_element_start('a', array('title' => $subs->fullname || $subs->nickname, 'href' => $subs->profileurl, 'class' => 'subscription')); @@ -157,10 +157,10 @@ class ShowstreamAction extends StreamAction { 'width' => AVATAR_MINI_SIZE, 'height' => AVATAR_MINI_SIZE, 'class' => 'avatar mini')); - common_end_element('a'); + common_element_end('a'); if ($cnt % SUBSCRIPTIONS_PER_ROW == 0) { - common_end_element('div'); + common_element_end('div'); } if ($cnt == SUBSCRIPTIONS) { @@ -173,7 +173,7 @@ class ShowstreamAction extends StreamAction { 'class' => 'moresubscriptions'), _t('All subscriptions')); - common_end_element('div'); + common_element_end('div'); } function show_statistics($profile) { @@ -192,14 +192,14 @@ class ShowstreamAction extends StreamAction { $notice_count = $notice->count(); # Other stats...? - common_start_element('dl', 'statistics'); + common_element_start('dl', 'statistics'); common_element('dt', _t('Subscriptions')); common_element('dd', $subs_count); common_element('dt', _t('Subscribers')); common_element('dd', $subbed_count); common_element('dt', _t('Notices')); common_element('dd', $notice_count); - common_end_element('dl'); + common_element_end('dl'); } function show_notices($profile) { @@ -215,13 +215,13 @@ class ShowstreamAction extends StreamAction { $notice->find(); - common_start_element('div', 'notices'); + common_element_start('div', 'notices'); while ($notice->fetch()) { $this->show_notice($notice); } - common_end_element('div'); + common_element_end('div'); } function show_last_notice($profile) { diff --git a/actions/subscribed.php b/actions/subscribed.php index d28ff237d8..8e0b2bc6b1 100644 --- a/actions/subscribed.php +++ b/actions/subscribed.php @@ -50,17 +50,17 @@ class SubscribedAction extends Action { $subs_count = $subs->find(); - common_start_element('div', 'subscriptions'); + common_element_start('div', 'subscriptions'); $idx = 0; while ($subs->fetch()) { $idx++; if ($idx % SUBSCRIPTIONS_PER_ROW == 1) { - common_start_element('div', 'row'); + common_element_start('div', 'row'); } - common_start_element('a', array('title' => $subs->fullname || + common_element_start('a', array('title' => $subs->fullname || $subs->nickname, 'href' => $subs->profileurl, 'class' => 'subscription')); @@ -69,12 +69,12 @@ class SubscribedAction extends Action { 'width' => AVATAR_STREAM_SIZE, 'height' => AVATAR_STREAM_SIZE, 'class' => 'avatar stream')); - common_end_element('a'); + common_element_end('a'); # XXX: subscribe form here if ($idx % SUBSCRIPTIONS_PER_ROW == 0) { - common_end_element('div'); + common_element_end('div'); } if ($idx == SUBSCRIPTIONS_PER_PAGE) { @@ -99,6 +99,6 @@ class SubscribedAction extends Action { 'class' => 'next'), _t('Next')); } - common_end_element('div'); + common_element_end('div'); } } \ No newline at end of file diff --git a/actions/subscriptions.php b/actions/subscriptions.php index 60ceb0c983..ef0e36e300 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -47,17 +47,17 @@ class SubscriptionsAction extends Action { $subs_count = $subs->find(); - common_start_element('div', 'subscriptions'); + common_element_start('div', 'subscriptions'); $idx = 0; while ($subs->fetch()) { $idx++; if ($idx % SUBSCRIPTIONS_PER_ROW == 1) { - common_start_element('div', 'row'); + common_element_start('div', 'row'); } - common_start_element('a', array('title' => $subs->fullname || + common_element_start('a', array('title' => $subs->fullname || $subs->nickname, 'href' => $subs->profileurl, 'class' => 'subscription')); @@ -66,12 +66,12 @@ class SubscriptionsAction extends Action { 'width' => AVATAR_STREAM_SIZE, 'height' => AVATAR_STREAM_SIZE, 'class' => 'avatar stream')); - common_end_element('a'); + common_element_end('a'); # XXX: subscribe form here if ($idx % SUBSCRIPTIONS_PER_ROW == 0) { - common_end_element('div'); + common_element_end('div'); } if ($idx == SUBSCRIPTIONS_PER_PAGE) { @@ -96,6 +96,6 @@ class SubscriptionsAction extends Action { 'class' => 'next'), _t('Next')); } - common_end_element('div'); + common_element_end('div'); } } \ No newline at end of file diff --git a/lib/stream.php b/lib/stream.php index 2b8361a735..71a4865462 100644 --- a/lib/stream.php +++ b/lib/stream.php @@ -31,9 +31,9 @@ class StreamAction extends Action { function show_notice($notice) { $profile = $notice->getProfile(); # XXX: RDFa - common_start_element('div', array('class' => 'notice')); + common_element_start('div', array('class' => 'notice')); $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE); - common_start_element('a', array('href' => $profile->profileurl)); + common_element_start('a', array('href' => $profile->profileurl)); common_element('img', array('src' => ($avatar) ? $avatar->url : DEFAULT_STREAM_AVATAR, 'class' => 'avatar stream', 'width' => AVATAR_STREAM_SIZE, @@ -41,7 +41,7 @@ class StreamAction extends Action { 'alt' => ($profile->fullname) ? $profile->fullname : $profile->nickname)); - common_end_element('a'); + common_element_end('a'); common_element('a', array('href' => $profile->profileurl, 'class' => 'nickname'), $profile->nickname); @@ -51,6 +51,6 @@ class StreamAction extends Action { common_element('a', array('class' => 'notice', 'href' => $noticeurl), common_date_string($notice->created)); - common_end_element('div'); + common_element_end('div'); } }