Merge branch 'master' of /var/www/trunk

actions/avatarsettings.php

@@ -119,9 +119,8 @@ class AvatarsettingsAction extends AccountSettingsAction
 
         $this->elementStart('ul', 'form_data');
         if ($original) {
-            $this->elementStart('li',
+            $this->elementStart('li', array('id' => 'avatar_original',
-                                array('id' => 'avatar_original',
+                                            'class' => 'avatar_view'));
-                                      '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',
+            $this->elementStart('li', array('id' => 'avatar_preview',
-                                array('id' => 'avatar_preview',
+                                            'class' => 'avatar_view'));
-                                      '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'));

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
+            // prompt for Facebook status update permission
-             if (!$this->facebook->api_client->users_hasAppPermission('status_update')) {
+            if (!$this->facebook->api_client->users_hasAppPermission('status_update')) {
 
                  if ($this->facebook->api_client->data_getUserPreference(
-                         FACEBOOK_PROMPTED_UPDATE_PREF) != 'true') {
+                    FACEBOOK_PROMPTED_UPDATE_PREF) != 'true') {
-                     $this->getUpdatePermission();
+                        $this->getUpdatePermission();
-                     return;
+                        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 {
 

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');

lib/action.php

@@ -156,10 +156,6 @@ class Action extends HTMLOutputter // lawsuit
                                      'type' => 'text/css',
                                      'href' => theme_path('css/display.css', 'base') . '?version=' . LACONICA_VERSION,
                                      '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,

lib/util.php

@@ -23,60 +23,15 @@
 
 function common_server_error($msg, $code=500)
 {
-    static $status = array(500 => 'Internal Server Error',
+    $err = new ServerErrorAction($msg, $code);
-                           501 => 'Not Implemented',
+    $err->showPage();
-                           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();
 }
 
 // Show a user error
 function common_user_error($msg, $code=400)
 {
-    static $status = array(400 => 'Bad Request',
+    $err = new ClientErrorAction($msg, $code);
-                           401 => 'Unauthorized',
+    $err->showPage();
-                           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();
 }
 
 function common_init_locale($language=null)

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;