Merge branch '0.7.x' into queuehandlers
This commit is contained in:
commit
986068d6e7
@ -487,4 +487,26 @@ class EmailsettingsAction extends AccountSettingsAction
|
||||
return $other->id != $user->id;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle old fashioned PEAR_Error msgs coming from DB_DataObject
|
||||
*
|
||||
* In this case email don't exist in the DB yet, so DB_DataObject
|
||||
* throws an error. Overrided from Action.
|
||||
*
|
||||
* @param PEAR_Error
|
||||
*
|
||||
* @return nothing
|
||||
*/
|
||||
|
||||
function handleError($error) {
|
||||
if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
|
||||
|
||||
// Do nothing.
|
||||
|
||||
} else {
|
||||
parent::handleError($error);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -228,6 +228,27 @@ class RegisterAction extends Action
|
||||
return ($user !== false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle old fashioned PEAR_Error msgs coming from DB_DataObject
|
||||
*
|
||||
* In this case nickname and email don't exist in the DB yet,
|
||||
* so DB_DataObject throws an error. Overrided from Action.
|
||||
*
|
||||
* @param PEAR_Error
|
||||
*
|
||||
* @return nothing
|
||||
*/
|
||||
|
||||
function handleError($error) {
|
||||
if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
|
||||
|
||||
// Do nothing.
|
||||
|
||||
} else {
|
||||
parent::handleError($error);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Does the given email address already exist?
|
||||
*
|
||||
|
25
index.php
25
index.php
@ -25,7 +25,8 @@ require_once INSTALLDIR . '/lib/common.php';
|
||||
$user = null;
|
||||
$action = null;
|
||||
|
||||
function getPath($req) {
|
||||
function getPath($req)
|
||||
{
|
||||
if (common_config('site', 'fancy')) {
|
||||
return $req['p'];
|
||||
} else if ($_SERVER['PATH_INFO']) {
|
||||
@ -35,10 +36,30 @@ function getPath($req) {
|
||||
}
|
||||
}
|
||||
|
||||
function main() {
|
||||
function handleError($error)
|
||||
{
|
||||
common_log(LOG_ERR, "PEAR error: " . $error->getMessage());
|
||||
$msg = sprintf(_('The database for %s isn\'t responding correctly, '.
|
||||
'so the site won\'t work properly. '.
|
||||
'The site admins probably know about the problem, '.
|
||||
'but you can contact them at %s to make sure. '.
|
||||
'Otherwise, wait a few minutes and try again.'),
|
||||
common_config('site', 'name'),
|
||||
common_config('site', 'email'));
|
||||
|
||||
$dac = new DBErrorAction($msg, 500);
|
||||
$dac->showPage();
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
function main()
|
||||
{
|
||||
global $user, $action;
|
||||
|
||||
// For database errors
|
||||
|
||||
PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');
|
||||
|
||||
// XXX: we need a little more structure in this script
|
||||
|
||||
// get and cache current user
|
||||
|
@ -82,6 +82,11 @@ class Action extends HTMLOutputter // lawsuit
|
||||
*/
|
||||
function prepare($argarray)
|
||||
{
|
||||
|
||||
// For PEAR_Errors comming from DB_DataObject
|
||||
PEAR::setErrorHandling(PEAR_ERROR_CALLBACK,
|
||||
array($this, "handleError"));
|
||||
|
||||
$this->args =& common_copy_args($argarray);
|
||||
return true;
|
||||
}
|
||||
@ -844,6 +849,32 @@ class Action extends HTMLOutputter // lawsuit
|
||||
throw new ClientException($msg, $code);
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle old fashioned PEAR_Error msgs coming from DB_DataObject
|
||||
*
|
||||
* Logs the DB_DataObject error. Override to do something else.
|
||||
*
|
||||
* @param PEAR_Error
|
||||
*
|
||||
* @return nothing
|
||||
*/
|
||||
|
||||
function handleError($error) {
|
||||
|
||||
common_log(LOG_ERR, "PEAR error: " . $error->getMessage());
|
||||
$msg = sprintf(_('The database for %s isn\'t responding correctly, '.
|
||||
'so the site won\'t work properly. '.
|
||||
'The site admins probably know about the problem, '.
|
||||
'but you can contact them at %s to make sure. '.
|
||||
'Otherwise, wait a few minutes and try again.'),
|
||||
common_config('site', 'name'),
|
||||
common_config('site', 'email'));
|
||||
|
||||
$dac = new DBErrorAction($msg, 500);
|
||||
$dac->showPage();
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the current URL
|
||||
*
|
||||
|
@ -21,7 +21,6 @@ if (!defined('LACONICA')) { exit(1); }
|
||||
|
||||
class Channel
|
||||
{
|
||||
|
||||
function on($user)
|
||||
{
|
||||
return false;
|
@ -19,7 +19,7 @@
|
||||
|
||||
if (!defined('LACONICA')) { exit(1); }
|
||||
|
||||
require_once(INSTALLDIR.'/classes/Channel.php');
|
||||
require_once(INSTALLDIR.'/lib/channel.php');
|
||||
|
||||
class Command
|
||||
{
|
@ -19,11 +19,10 @@
|
||||
|
||||
if (!defined('LACONICA')) { exit(1); }
|
||||
|
||||
require_once(INSTALLDIR.'/classes/Command.php');
|
||||
require_once INSTALLDIR.'/lib/command.php';
|
||||
|
||||
class CommandInterpreter
|
||||
{
|
||||
|
||||
function handle_command($user, $text)
|
||||
{
|
||||
# XXX: localise
|
73
lib/dberroraction.php
Normal file
73
lib/dberroraction.php
Normal file
@ -0,0 +1,73 @@
|
||||
<?php
|
||||
/**
|
||||
* DB error action.
|
||||
*
|
||||
* PHP version 5
|
||||
*
|
||||
* @category Action
|
||||
* @package Laconica
|
||||
* @author Evan Prodromou <evan@controlyourself.ca>
|
||||
* @author Zach Copley <zach@controlyourself.ca>
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
|
||||
* @link http://laconi.ca/
|
||||
*
|
||||
* Laconica - a distributed open-source microblogging tool
|
||||
* Copyright (C) 2008, Controlez-Vous, Inc.
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
if (!defined('LACONICA')) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
require_once INSTALLDIR.'/lib/servererroraction.php';
|
||||
|
||||
/**
|
||||
* Class for displaying DB Errors
|
||||
*
|
||||
* This only occurs if there's been a DB_DataObject_Error that's
|
||||
* reported through PEAR, so we try to avoid doing anything that connects
|
||||
* to the DB, so we don't trigger it again.
|
||||
*
|
||||
* @category Action
|
||||
* @package Laconica
|
||||
* @author Evan Prodromou <evan@controlyourself.ca>
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
|
||||
* @link http://laconi.ca/
|
||||
*/
|
||||
|
||||
class DBErrorAction extends ServerErrorAction
|
||||
{
|
||||
function __construct($message='Error', $code=500)
|
||||
{
|
||||
parent::__construct($message, $code);
|
||||
}
|
||||
|
||||
function title()
|
||||
{
|
||||
return _('Database error');
|
||||
}
|
||||
|
||||
function getLanguage()
|
||||
{
|
||||
// Don't try to figure out user's language; just show the page
|
||||
return common_config('site', 'language');
|
||||
}
|
||||
|
||||
function showPrimaryNav()
|
||||
{
|
||||
// don't show primary nav
|
||||
}
|
||||
}
|
@ -101,9 +101,8 @@ class HTMLOutputter extends XMLOutputter
|
||||
$type = common_negotiate_type($cp, $sp);
|
||||
|
||||
if (!$type) {
|
||||
common_user_error(_('This page is not available in a '.
|
||||
throw new ClientException(_('This page is not available in a '.
|
||||
'media type you accept'), 406);
|
||||
exit(0);
|
||||
}
|
||||
}
|
||||
|
||||
@ -115,15 +114,19 @@ class HTMLOutputter extends XMLOutputter
|
||||
'-//W3C//DTD XHTML 1.0 Strict//EN',
|
||||
'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
|
||||
|
||||
// FIXME: correct language for interface
|
||||
|
||||
$language = common_language();
|
||||
$language = $this->getLanguage();
|
||||
|
||||
$this->elementStart('html', array('xmlns' => 'http://www.w3.org/1999/xhtml',
|
||||
'xml:lang' => $language,
|
||||
'lang' => $language));
|
||||
}
|
||||
|
||||
function getLanguage()
|
||||
{
|
||||
// FIXME: correct language for interface
|
||||
return common_language();
|
||||
}
|
||||
|
||||
/**
|
||||
* Ends an HTML document
|
||||
*
|
||||
|
Loading…
Reference in New Issue
Block a user