summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--actions/avatarsettings.php13
-rw-r--r--actions/facebookhome.php19
-rw-r--r--actions/facebooksettings.php2
-rw-r--r--lib/action.php4
-rw-r--r--lib/clienterroraction.php (renamed from actions/clienterror.php)0
-rw-r--r--lib/servererroraction.php (renamed from actions/servererror.php)0
-rw-r--r--lib/util.php53
-rw-r--r--theme/base/css/display.css2
8 files changed, 22 insertions, 71 deletions
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 1db35237e..19f53b882 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -119,9 +119,8 @@ class AvatarsettingsAction extends AccountSettingsAction
$this->elementStart('ul', 'form_data');
if ($original) {
- $this->elementStart('li',
- array('id' => 'avatar_original',
- 'class' => 'avatar_view'));
+ $this->elementStart('li', array('id' => 'avatar_original',
+ 'class' => 'avatar_view'));
$this->element('h2', null, _("Original"));
$this->elementStart('div', array('id'=>'avatar_original_view'));
$this->element('img', array('src' => $original->url,
@@ -135,16 +134,16 @@ class AvatarsettingsAction extends AccountSettingsAction
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
if ($avatar) {
- $this->elementStart('li',
- array('id' => 'avatar_preview',
- 'class' => 'avatar_view'));
+ $this->elementStart('li', array('id' => 'avatar_preview',
+ 'class' => 'avatar_view'));
$this->element('h2', null, _("Preview"));
$this->elementStart('div', array('id'=>'avatar_preview_view'));
- $this->element('img', array('src' => $original->url,//$avatar->url,
+ $this->element('img', array('src' => $original->url,
'width' => AVATAR_PROFILE_SIZE,
'height' => AVATAR_PROFILE_SIZE,
'alt' => $user->nickname));
$this->elementEnd('div');
+ $this->elementEnd('li');
}
$this->elementStart('li', array ('id' => 'settings_attach'));
diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index b05e51b91..e8c10c9ed 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -57,29 +57,30 @@ class FacebookhomeAction extends FacebookAction
$this->user = $this->flink->getUser();
// If this is the first time the user has started the app
- // prompt for Facebook status update permission
- if (!$this->facebook->api_client->users_hasAppPermission('status_update')) {
+ // prompt for Facebook status update permission
+ if (!$this->facebook->api_client->users_hasAppPermission('status_update')) {
if ($this->facebook->api_client->data_getUserPreference(
- FACEBOOK_PROMPTED_UPDATE_PREF) != 'true') {
- $this->getUpdatePermission();
- return;
+ FACEBOOK_PROMPTED_UPDATE_PREF) != 'true') {
+ $this->getUpdatePermission();
+ return;
}
}
// Make sure the user's profile box has the lastest notice
$notice = $this->user->getCurrentNotice();
- $this->updateProfileBox($notice);
+ if ($notice) {
+ $this->updateProfileBox($notice);
+ }
- if ($this->arg('status_submit') == 'Send') {
+ if ($this->arg('status_submit') == 'Send') {
$this->saveNewNotice();
- }
+ }
// User is authenticated and has already been prompted once for
// Facebook status update permission? Then show the main page
// of the app
$this->showPage();
-
} else {
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index e40496c18..236460c1c 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -132,7 +132,7 @@ class FacebooksettingsAction extends FacebookAction
$this->elementStart('ul', array('id' => 'fb-permissions-list'));
$this->elementStart('li', array('id' => 'fb-permissions-item'));
$this->elementStart('fb:prompt-permission', array('perms' => 'status_update',
- 'next_fbjs' => 'document.setLocation(\'' . "$this->app_url/settings.php" . '\')'));
+ 'next_fbjs' => 'document.setLocation(\'' . "$this->app_uri/settings.php" . '\')'));
$this->element('span', array('class' => 'facebook-button'),
sprintf(_('Allow %s to update my Facebook status'), common_config('site', 'name')));
$this->elementEnd('fb:prompt-permission');
diff --git a/lib/action.php b/lib/action.php
index bf053424f..8f02b36bf 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -158,10 +158,6 @@ class Action extends HTMLOutputter // lawsuit
'media' => 'screen, projection, tv'));
$this->element('link', array('rel' => 'stylesheet',
'type' => 'text/css',
- 'href' => theme_path('css/thickbox.css', 'base') . '?version=' . LACONICA_VERSION,
- 'media' => 'screen, projection, tv'));
- $this->element('link', array('rel' => 'stylesheet',
- 'type' => 'text/css',
'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION,
'media' => 'screen, projection, tv'));
$this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
diff --git a/actions/clienterror.php b/lib/clienterroraction.php
index ef6fd51df..ef6fd51df 100644
--- a/actions/clienterror.php
+++ b/lib/clienterroraction.php
diff --git a/actions/servererror.php b/lib/servererroraction.php
index a39886591..a39886591 100644
--- a/actions/servererror.php
+++ b/lib/servererroraction.php
diff --git a/lib/util.php b/lib/util.php
index 42bc08e7e..0b5abfa48 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -23,60 +23,15 @@
function common_server_error($msg, $code=500)
{
- static $status = array(500 => 'Internal Server Error',
- 501 => 'Not Implemented',
- 502 => 'Bad Gateway',
- 503 => 'Service Unavailable',
- 504 => 'Gateway Timeout',
- 505 => 'HTTP Version Not Supported');
-
- if (!array_key_exists($code, $status)) {
- $code = 500;
- }
-
- $status_string = $status[$code];
-
- header('HTTP/1.1 '.$code.' '.$status_string);
- header('Content-type: text/plain');
-
- print $msg;
- print "\n";
- exit();
+ $err = new ServerErrorAction($msg, $code);
+ $err->showPage();
}
// Show a user error
function common_user_error($msg, $code=400)
{
- static $status = array(400 => 'Bad Request',
- 401 => 'Unauthorized',
- 402 => 'Payment Required',
- 403 => 'Forbidden',
- 404 => 'Not Found',
- 405 => 'Method Not Allowed',
- 406 => 'Not Acceptable',
- 407 => 'Proxy Authentication Required',
- 408 => 'Request Timeout',
- 409 => 'Conflict',
- 410 => 'Gone',
- 411 => 'Length Required',
- 412 => 'Precondition Failed',
- 413 => 'Request Entity Too Large',
- 414 => 'Request-URI Too Long',
- 415 => 'Unsupported Media Type',
- 416 => 'Requested Range Not Satisfiable',
- 417 => 'Expectation Failed');
-
- if (!array_key_exists($code, $status)) {
- $code = 400;
- }
-
- $status_string = $status[$code];
-
- header('HTTP/1.1 '.$code.' '.$status_string);
-
- common_show_header('Error');
- common_element('div', array('class' => 'error'), $msg);
- common_show_footer();
+ $err = new ClientErrorAction($msg, $code);
+ $err->showPage();
}
function common_init_locale($language=null)
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index b4f3ffd54..4eee3449b 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -226,7 +226,7 @@ position:absolute;
right:0;
top:49px;
float:right;
-width:322px;
+width:300px;
}
#page_notice {
clear:both;
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-01 04:05:36 +0000