made exceptions from the db optional

set address for updae mails correctly
This commit is contained in:
Alexander Kampmann 2012-04-09 14:04:49 +02:00
parent 0d60dbef31
commit 7ac4b83c39
3 changed files with 930 additions and 884 deletions

159
boot.php
View File

@ -111,9 +111,9 @@ define ( 'NETWORK_GPLUS', 'goog'); // Google+
/* /*
* These numbers are used in stored permissions * These numbers are used in stored permissions
* and existing allocations MUST NEVER BE CHANGED * and existing allocations MUST NEVER BE CHANGED
* OR RE-ASSIGNED! You may only add to them. * OR RE-ASSIGNED! You may only add to them.
*/ */
$netgroup_ids = array( $netgroup_ids = array(
NETWORK_DFRN => (-1), NETWORK_DFRN => (-1),
@ -263,7 +263,7 @@ function startup() {
*/ */
if(! class_exists('App')) { if(! class_exists('App')) {
class App { class App {
public $module_loaded = false; public $module_loaded = false;
public $query_string; public $query_string;
@ -419,18 +419,18 @@ class App {
if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL)) if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL))
$scheme = 'https'; $scheme = 'https';
// We need to populate the $ssl flag across the entire program before turning this on. // We need to populate the $ssl flag across the entire program before turning this on.
// Basically, we'll have $ssl = true on any links which can only be seen by a logged in user // Basically, we'll have $ssl = true on any links which can only be seen by a logged in user
// (and also the login link). Anything seen by an outsider will have it turned off. // (and also the login link). Anything seen by an outsider will have it turned off.
// At present, setting SSL_POLICY_SELFSIGN will only force remote contacts to update their // At present, setting SSL_POLICY_SELFSIGN will only force remote contacts to update their
// contact links to this site with "http:" if they are currently using "https:" // contact links to this site with "http:" if they are currently using "https:"
// if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) { // if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
// if($ssl) // if($ssl)
// $scheme = 'https'; // $scheme = 'https';
// else // else
// $scheme = 'http'; // $scheme = 'http';
// } // }
} }
$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' ); $this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
@ -515,16 +515,18 @@ class App {
} }
}} }
}
// retrieve the App structure // retrieve the App structure
// useful in functions which require it but don't get it passed to them // useful in functions which require it but don't get it passed to them
if(! function_exists('get_app')) { if(! function_exists('get_app')) {
function get_app() { function get_app() {
global $a; global $a;
return $a; return $a;
}}; }
};
// Multi-purpose function to check variable state. // Multi-purpose function to check variable state.
@ -534,7 +536,7 @@ function get_app() {
// e.g. x('') or x(0) returns 0; // e.g. x('') or x(0) returns 0;
if(! function_exists('x')) { if(! function_exists('x')) {
function x($s,$k = NULL) { function x($s,$k = NULL) {
if($k != NULL) { if($k != NULL) {
if((is_array($s)) && (array_key_exists($k,$s))) { if((is_array($s)) && (array_key_exists($k,$s))) {
if($s[$k]) if($s[$k])
@ -552,24 +554,26 @@ function x($s,$k = NULL) {
} }
return false; return false;
} }
}} }
}
// called from db initialisation if db is dead. // called from db initialisation if db is dead.
if(! function_exists('system_unavailable')) { if(! function_exists('system_unavailable')) {
function system_unavailable() { function system_unavailable() {
include('system_unavailable.php'); include('system_unavailable.php');
system_down(); system_down();
killme(); killme();
}} }
}
function clean_urls() { function clean_urls() {
global $a; global $a;
// if($a->config['system']['clean_urls']) // if($a->config['system']['clean_urls'])
return true; return true;
// return false; // return false;
} }
function z_path() { function z_path() {
@ -602,7 +606,7 @@ function is_ajax() {
if(! function_exists('check_config')) { if(! function_exists('check_config')) {
function check_config(&$a) { function check_config(&$a) {
$build = get_config('system','build'); $build = get_config('system','build');
if(! x($build)) if(! x($build))
@ -654,6 +658,7 @@ function check_config(&$a) {
// call the specific update // call the specific update
global $db; global $db;
$db->excep(TRUE);
try { try {
$db->beginTransaction(); $db->beginTransaction();
$func = 'update_' . $x; $func = 'update_' . $x;
@ -670,14 +675,14 @@ function check_config(&$a) {
'$error' => $ex->getMessage()); '$error' => $ex->getMessage());
$subject=sprintf(t('Update Error at %s'), $a->get_baseurl()); $subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
mail($email, $subject, $text, mail($a->config['admin_email'], $subject, $text,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' ); . 'Content-transfer-encoding: 8bit' );
//try the logger //try the logger
logger('update failed: '.$ex->getMessage().EOL); logger('update failed: '.$ex->getMessage().EOL);
} }
$db->excep(FALSE);
} }
} }
set_config('system','build', DB_UPDATE_VERSION); set_config('system','build', DB_UPDATE_VERSION);
@ -737,7 +742,8 @@ function check_config(&$a) {
load_hooks(); load_hooks();
return; return;
}} }
}
function get_guid($size=16) { function get_guid($size=16) {
@ -758,7 +764,7 @@ function get_guid($size=16) {
// returns the complete html for inserting into the page // returns the complete html for inserting into the page
if(! function_exists('login')) { if(! function_exists('login')) {
function login($register = false, $hiddens=false) { function login($register = false, $hiddens=false) {
$a = get_app(); $a = get_app();
$o = ""; $o = "";
$reg = false; $reg = false;
@ -805,69 +811,77 @@ function login($register = false, $hiddens=false) {
call_hooks('login_hook',$o); call_hooks('login_hook',$o);
return $o; return $o;
}} }
}
// Used to end the current process, after saving session state. // Used to end the current process, after saving session state.
if(! function_exists('killme')) { if(! function_exists('killme')) {
function killme() { function killme() {
session_write_close(); session_write_close();
exit; exit;
}} }
}
// redirect to another URL and terminate this process. // redirect to another URL and terminate this process.
if(! function_exists('goaway')) { if(! function_exists('goaway')) {
function goaway($s) { function goaway($s) {
header("Location: $s"); header("Location: $s");
killme(); killme();
}} }
}
// Returns the uid of locally logged in user or false. // Returns the uid of locally logged in user or false.
if(! function_exists('local_user')) { if(! function_exists('local_user')) {
function local_user() { function local_user() {
if((x($_SESSION,'authenticated')) && (x($_SESSION,'uid'))) if((x($_SESSION,'authenticated')) && (x($_SESSION,'uid')))
return intval($_SESSION['uid']); return intval($_SESSION['uid']);
return false; return false;
}} }
}
// Returns contact id of authenticated site visitor or false // Returns contact id of authenticated site visitor or false
if(! function_exists('remote_user')) { if(! function_exists('remote_user')) {
function remote_user() { function remote_user() {
if((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id'))) if((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id')))
return intval($_SESSION['visitor_id']); return intval($_SESSION['visitor_id']);
return false; return false;
}} }
}
// contents of $s are displayed prominently on the page the next time // contents of $s are displayed prominently on the page the next time
// a page is loaded. Usually used for errors or alerts. // a page is loaded. Usually used for errors or alerts.
if(! function_exists('notice')) { if(! function_exists('notice')) {
function notice($s) { function notice($s) {
$a = get_app(); $a = get_app();
if(! x($_SESSION,'sysmsg')) $_SESSION['sysmsg'] = array(); if(! x($_SESSION,'sysmsg')) $_SESSION['sysmsg'] = array();
if($a->interactive) if($a->interactive)
$_SESSION['sysmsg'][] = $s; $_SESSION['sysmsg'][] = $s;
}} }
}
if(! function_exists('info')) { if(! function_exists('info')) {
function info($s) { function info($s) {
$a = get_app(); $a = get_app();
if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array(); if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array();
if($a->interactive) if($a->interactive)
$_SESSION['sysmsg_info'][] = $s; $_SESSION['sysmsg_info'][] = $s;
}} }
}
// wrapper around config to limit the text length of an incoming message // wrapper around config to limit the text length of an incoming message
if(! function_exists('get_max_import_size')) { if(! function_exists('get_max_import_size')) {
function get_max_import_size() { function get_max_import_size() {
global $a; global $a;
return ((x($a->config,'max_import_size')) ? $a->config['max_import_size'] : 0 ); return ((x($a->config,'max_import_size')) ? $a->config['max_import_size'] : 0 );
}} }
}
@ -893,7 +907,7 @@ function get_max_import_size() {
*/ */
if(! function_exists('profile_load')) { if(! function_exists('profile_load')) {
function profile_load(&$a, $nickname, $profile = 0) { function profile_load(&$a, $nickname, $profile = 0) {
if(remote_user()) { if(remote_user()) {
$r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1", $r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
intval($_SESSION['visitor_id'])); intval($_SESSION['visitor_id']));
@ -969,7 +983,8 @@ function profile_load(&$a, $nickname, $profile = 0) {
$a->page['aside'] .= contact_block();*/ $a->page['aside'] .= contact_block();*/
return; return;
}} }
}
/** /**
@ -989,7 +1004,7 @@ function profile_load(&$a, $nickname, $profile = 0) {
if(! function_exists('profile_sidebar')) { if(! function_exists('profile_sidebar')) {
function profile_sidebar($profile, $block = 0) { function profile_sidebar($profile, $block = 0) {
$a = get_app(); $a = get_app();
@ -1118,11 +1133,12 @@ function profile_sidebar($profile, $block = 0) {
call_hooks('profile_sidebar', $arr); call_hooks('profile_sidebar', $arr);
return $o; return $o;
}} }
}
if(! function_exists('get_birthdays')) { if(! function_exists('get_birthdays')) {
function get_birthdays() { function get_birthdays() {
$a = get_app(); $a = get_app();
$o = ''; $o = '';
@ -1187,11 +1203,12 @@ function get_birthdays() {
} }
} }
return $o; return $o;
}} }
}
if(! function_exists('get_events')) { if(! function_exists('get_events')) {
function get_events() { function get_events() {
require_once('include/bbcode.php'); require_once('include/bbcode.php');
@ -1251,7 +1268,8 @@ function get_events() {
} }
return $o; return $o;
}} }
}
/** /**
@ -1269,7 +1287,7 @@ function get_events() {
*/ */
if(! function_exists('proc_run')) { if(! function_exists('proc_run')) {
function proc_run($cmd){ function proc_run($cmd){
$a = get_app(); $a = get_app();
@ -1287,10 +1305,11 @@ function proc_run($cmd){
} }
$cmdline = implode($args," "); $cmdline = implode($args," ");
proc_close(proc_open($cmdline." &",array(),$foo)); proc_close(proc_open($cmdline." &",array(),$foo));
}} }
}
if(! function_exists('current_theme')) { if(! function_exists('current_theme')) {
function current_theme(){ function current_theme(){
$app_base_themes = array('duepuntozero', 'loozah'); $app_base_themes = array('duepuntozero', 'loozah');
$a = get_app(); $a = get_app();
@ -1313,23 +1332,25 @@ function current_theme(){
if(count($fallback)) if(count($fallback))
return (str_replace('view/theme/','', substr($fallback[0],0,-10))); return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
}} }
}
/* /*
* Return full URL to theme which is currently in effect. * Return full URL to theme which is currently in effect.
* Provide a sane default if nothing is chosen or the specified theme does not exist. * Provide a sane default if nothing is chosen or the specified theme does not exist.
*/ */
if(! function_exists('current_theme_url')) { if(! function_exists('current_theme_url')) {
function current_theme_url() { function current_theme_url() {
global $a; global $a;
$t = current_theme(); $t = current_theme();
if (file_exists('view/theme/' . $t . '/style.php')) if (file_exists('view/theme/' . $t . '/style.php'))
return($a->get_baseurl() . '/view/theme/' . $t . '/style.pcss'); return($a->get_baseurl() . '/view/theme/' . $t . '/style.pcss');
return($a->get_baseurl() . '/view/theme/' . $t . '/style.css'); return($a->get_baseurl() . '/view/theme/' . $t . '/style.css');
}} }
}
if(! function_exists('feed_birthday')) { if(! function_exists('feed_birthday')) {
function feed_birthday($uid,$tz) { function feed_birthday($uid,$tz) {
/** /**
* *
@ -1374,19 +1395,21 @@ function feed_birthday($uid,$tz) {
} }
return $birthday; return $birthday;
}} }
}
if(! function_exists('is_site_admin')) { if(! function_exists('is_site_admin')) {
function is_site_admin() { function is_site_admin() {
$a = get_app(); $a = get_app();
if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email'])) if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
return true; return true;
return false; return false;
}} }
}
if(! function_exists('load_contact_links')) { if(! function_exists('load_contact_links')) {
function load_contact_links($uid) { function load_contact_links($uid) {
$a = get_app(); $a = get_app();
@ -1408,10 +1431,11 @@ function load_contact_links($uid) {
$ret['empty'] = true; $ret['empty'] = true;
$a->contacts = $ret; $a->contacts = $ret;
return; return;
}} }
}
if(! function_exists('profile_tabs')){ if(! function_exists('profile_tabs')){
function profile_tabs($a, $is_owner=False, $nickname=Null){ function profile_tabs($a, $is_owner=False, $nickname=Null){
//echo "<pre>"; var_dump($a->user); killme(); //echo "<pre>"; var_dump($a->user); killme();
if (is_null($nickname)) if (is_null($nickname))
@ -1460,7 +1484,8 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
$tpl = get_markup_template('common_tabs.tpl'); $tpl = get_markup_template('common_tabs.tpl');
return replace_macros($tpl,array('$tabs' => $arr['tabs'])); return replace_macros($tpl,array('$tabs' => $arr['tabs']));
}} }
}
function get_my_url() { function get_my_url() {
if(x($_SESSION,'my_url')) if(x($_SESSION,'my_url'))

View File

@ -21,6 +21,8 @@ if(! class_exists('dba')) {
private $debug = 0; private $debug = 0;
private $db; private $db;
private $exceptions;
public $mysqli = true; public $mysqli = true;
public $connected = false; public $connected = false;
public $error = false; public $error = false;
@ -68,6 +70,10 @@ if(! class_exists('dba')) {
} }
} }
public function excep($excep) {
$this->exceptions=$excep;
}
public function getdb() { public function getdb() {
return $this->db; return $this->db;
} }
@ -75,7 +81,8 @@ if(! class_exists('dba')) {
public function q($sql) { public function q($sql) {
if((! $this->db) || (! $this->connected)) { if((! $this->db) || (! $this->connected)) {
throw new RuntimeException(t("There is no db connection. ")); throwOrLog(new RuntimeException(t("There is no db connection. ")));
return;
} }
if($this->mysqli) { if($this->mysqli) {
@ -114,7 +121,8 @@ if(! class_exists('dba')) {
} }
logger('dba: ' . $str ); logger('dba: ' . $str );
if(FALSE===$result) { if(FALSE===$result) {
throw new RuntimeException('dba: ' . $str); throwOrLog(new RuntimeException('dba: ' . $str));
return;
} }
} }
@ -155,6 +163,19 @@ if(! class_exists('dba')) {
} }
} }
private function throwOrLog(Exception $ex) {
if($this->exceptions) {
throw $ex;
} else {
logger('dba: '.$ex->getMessage());
}
}
/**
* starts a transaction. Transactions need to be finished with
* commit() or rollback(). Please mind that the db table engine may
* not support this.
*/
public function beginTransaction() { public function beginTransaction() {
if($this->mysqli) { if($this->mysqli) {
return $this->db->autocommit(false); return $this->db->autocommit(false);
@ -164,6 +185,10 @@ if(! class_exists('dba')) {
} }
} }
/**
* rollback a transaction. So, rollback anything that was done since the last call
* to beginTransaction().
*/
public function rollback() { public function rollback() {
if($this->mysqli) { if($this->mysqli) {
return $this->db->rollback(); return $this->db->rollback();
@ -174,6 +199,9 @@ if(! class_exists('dba')) {
$this->stopTransaction(); $this->stopTransaction();
} }
/**
* commit a transaction. So, write any query to the database.
*/
public function commit() { public function commit() {
if($this->mysqli) { if($this->mysqli) {
return $this->db->commit(); return $this->db->commit();

View File

@ -11,7 +11,6 @@
* bootstrap the application * bootstrap the application
* *
*/ */
try {
require_once('boot.php'); require_once('boot.php');
@ -371,9 +370,3 @@ else
session_write_close(); session_write_close();
exit; exit;
} catch(Exception $ex) {
// it may fail because logger uses the db,
// but give it a try:
logger('exception caught at index.php: '.$ex->getMessage());
system_unavailable();
}