Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: rev update source beautifarming to make review easier fixed some typos made exceptions from the db optional set address for updae mails correctly added exceptions to dba class added exception handling to index.php, please mind that there is no recovery at the moment added transactions to db update. Please mind that they might not be supported by db table engines. added admin email on failed updates * master:
This commit is contained in:
Simon L'nu
commit
61c28e8c2e
176
boot.php
176
boot.php
|
|
@ -9,7 +9,7 @@ require_once('include/nav.php');
|
|||
require_once('include/cache.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1306' );
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1307' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1137 );
|
||||
|
||||
|
|
@ -109,7 +109,7 @@ define ( 'NETWORK_XMPP', 'xmpp'); // XMPP
|
|||
define ( 'NETWORK_MYSPACE', 'mysp'); // MySpace
|
||||
define ( 'NETWORK_GPLUS', 'goog'); // Google+
|
||||
|
||||
/*
|
||||
/**
|
||||
* These numbers are used in stored permissions
|
||||
* and existing allocations MUST NEVER BE CHANGED
|
||||
* OR RE-ASSIGNED! You may only add to them.
|
||||
|
|
@ -263,7 +263,7 @@ function startup() {
|
|||
*/
|
||||
|
||||
if(! class_exists('App')) {
|
||||
class App {
|
||||
class App {
|
||||
|
||||
public $module_loaded = false;
|
||||
public $query_string;
|
||||
|
|
@ -419,18 +419,18 @@ class App {
|
|||
if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL))
|
||||
$scheme = 'https';
|
||||
|
||||
// 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
|
||||
// (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
|
||||
// contact links to this site with "http:" if they are currently using "https:"
|
||||
// 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
|
||||
// (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
|
||||
// contact links to this site with "http:" if they are currently using "https:"
|
||||
|
||||
// if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
|
||||
// if($ssl)
|
||||
// $scheme = 'https';
|
||||
// else
|
||||
// $scheme = 'http';
|
||||
// }
|
||||
// if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
|
||||
// if($ssl)
|
||||
// $scheme = 'https';
|
||||
// else
|
||||
// $scheme = 'http';
|
||||
// }
|
||||
}
|
||||
|
||||
$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
|
||||
|
|
@ -515,16 +515,18 @@ class App {
|
|||
}
|
||||
|
||||
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
// retrieve the App structure
|
||||
// useful in functions which require it but don't get it passed to them
|
||||
|
||||
if(! function_exists('get_app')) {
|
||||
function get_app() {
|
||||
function get_app() {
|
||||
global $a;
|
||||
return $a;
|
||||
}};
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
// Multi-purpose function to check variable state.
|
||||
|
|
@ -534,7 +536,7 @@ function get_app() {
|
|||
// e.g. x('') or x(0) returns 0;
|
||||
|
||||
if(! function_exists('x')) {
|
||||
function x($s,$k = NULL) {
|
||||
function x($s,$k = NULL) {
|
||||
if($k != NULL) {
|
||||
if((is_array($s)) && (array_key_exists($k,$s))) {
|
||||
if($s[$k])
|
||||
|
|
@ -552,24 +554,26 @@ function x($s,$k = NULL) {
|
|||
}
|
||||
return false;
|
||||
}
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
// called from db initialisation if db is dead.
|
||||
|
||||
if(! function_exists('system_unavailable')) {
|
||||
function system_unavailable() {
|
||||
function system_unavailable() {
|
||||
include('system_unavailable.php');
|
||||
system_down();
|
||||
killme();
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
function clean_urls() {
|
||||
global $a;
|
||||
// if($a->config['system']['clean_urls'])
|
||||
// if($a->config['system']['clean_urls'])
|
||||
return true;
|
||||
// return false;
|
||||
// return false;
|
||||
}
|
||||
|
||||
function z_path() {
|
||||
|
|
@ -602,7 +606,7 @@ function is_ajax() {
|
|||
|
||||
|
||||
if(! function_exists('check_config')) {
|
||||
function check_config(&$a) {
|
||||
function check_config(&$a) {
|
||||
|
||||
$build = get_config('system','build');
|
||||
if(! x($build))
|
||||
|
|
@ -653,8 +657,32 @@ function check_config(&$a) {
|
|||
|
||||
// call the specific update
|
||||
|
||||
global $db;
|
||||
$db->excep(TRUE);
|
||||
try {
|
||||
$db->beginTransaction();
|
||||
$func = 'update_' . $x;
|
||||
$func($a);
|
||||
$db->commit();
|
||||
} catch(Exception $ex) {
|
||||
$db->rollback();
|
||||
//send the administrator an e-mail
|
||||
$email_tpl = get_intltext_template("update_fail_eml.tpl");
|
||||
$email_tpl = replace_macros($email_tpl, array(
|
||||
'$sitename' => $a->config['sitename'],
|
||||
'$siteurl' => $a->get_baseurl(),
|
||||
'$update' => $x,
|
||||
'$error' => $ex->getMessage()));
|
||||
$subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
|
||||
|
||||
mail($a->config['admin_email'], $subject, $text,
|
||||
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
|
||||
. 'Content-type: text/plain; charset=UTF-8' . "\n"
|
||||
. 'Content-transfer-encoding: 8bit' );
|
||||
//try the logger
|
||||
logger('update failed: '.$ex->getMessage().EOL);
|
||||
}
|
||||
$db->excep(FALSE);
|
||||
}
|
||||
}
|
||||
set_config('system','build', DB_UPDATE_VERSION);
|
||||
|
|
@ -714,7 +742,8 @@ function check_config(&$a) {
|
|||
load_hooks();
|
||||
|
||||
return;
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function get_guid($size=16) {
|
||||
|
|
@ -735,7 +764,7 @@ function get_guid($size=16) {
|
|||
// returns the complete html for inserting into the page
|
||||
|
||||
if(! function_exists('login')) {
|
||||
function login($register = false, $hiddens=false) {
|
||||
function login($register = false, $hiddens=false) {
|
||||
$a = get_app();
|
||||
$o = "";
|
||||
$reg = false;
|
||||
|
|
@ -782,69 +811,77 @@ function login($register = false, $hiddens=false) {
|
|||
call_hooks('login_hook',$o);
|
||||
|
||||
return $o;
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
// Used to end the current process, after saving session state.
|
||||
|
||||
if(! function_exists('killme')) {
|
||||
function killme() {
|
||||
function killme() {
|
||||
session_write_close();
|
||||
exit;
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
// redirect to another URL and terminate this process.
|
||||
|
||||
if(! function_exists('goaway')) {
|
||||
function goaway($s) {
|
||||
function goaway($s) {
|
||||
header("Location: $s");
|
||||
killme();
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Returns the uid of locally logged in user or false.
|
||||
|
||||
if(! function_exists('local_user')) {
|
||||
function local_user() {
|
||||
function local_user() {
|
||||
if((x($_SESSION,'authenticated')) && (x($_SESSION,'uid')))
|
||||
return intval($_SESSION['uid']);
|
||||
return false;
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
// Returns contact id of authenticated site visitor or false
|
||||
|
||||
if(! function_exists('remote_user')) {
|
||||
function remote_user() {
|
||||
function remote_user() {
|
||||
if((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id')))
|
||||
return intval($_SESSION['visitor_id']);
|
||||
return false;
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
// contents of $s are displayed prominently on the page the next time
|
||||
// a page is loaded. Usually used for errors or alerts.
|
||||
|
||||
if(! function_exists('notice')) {
|
||||
function notice($s) {
|
||||
function notice($s) {
|
||||
$a = get_app();
|
||||
if(! x($_SESSION,'sysmsg')) $_SESSION['sysmsg'] = array();
|
||||
if($a->interactive)
|
||||
$_SESSION['sysmsg'][] = $s;
|
||||
}}
|
||||
}
|
||||
}
|
||||
if(! function_exists('info')) {
|
||||
function info($s) {
|
||||
function info($s) {
|
||||
$a = get_app();
|
||||
if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array();
|
||||
if($a->interactive)
|
||||
$_SESSION['sysmsg_info'][] = $s;
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// wrapper around config to limit the text length of an incoming message
|
||||
|
||||
if(! function_exists('get_max_import_size')) {
|
||||
function get_max_import_size() {
|
||||
function get_max_import_size() {
|
||||
global $a;
|
||||
return ((x($a->config,'max_import_size')) ? $a->config['max_import_size'] : 0 );
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -870,7 +907,7 @@ function get_max_import_size() {
|
|||
*/
|
||||
|
||||
if(! function_exists('profile_load')) {
|
||||
function profile_load(&$a, $nickname, $profile = 0) {
|
||||
function profile_load(&$a, $nickname, $profile = 0) {
|
||||
if(remote_user()) {
|
||||
$r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
|
||||
intval($_SESSION['visitor_id']));
|
||||
|
|
@ -946,7 +983,8 @@ function profile_load(&$a, $nickname, $profile = 0) {
|
|||
$a->page['aside'] .= contact_block();*/
|
||||
|
||||
return;
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -966,7 +1004,7 @@ function profile_load(&$a, $nickname, $profile = 0) {
|
|||
|
||||
|
||||
if(! function_exists('profile_sidebar')) {
|
||||
function profile_sidebar($profile, $block = 0) {
|
||||
function profile_sidebar($profile, $block = 0) {
|
||||
|
||||
$a = get_app();
|
||||
|
||||
|
|
@ -1095,11 +1133,12 @@ function profile_sidebar($profile, $block = 0) {
|
|||
call_hooks('profile_sidebar', $arr);
|
||||
|
||||
return $o;
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if(! function_exists('get_birthdays')) {
|
||||
function get_birthdays() {
|
||||
function get_birthdays() {
|
||||
|
||||
$a = get_app();
|
||||
$o = '';
|
||||
|
|
@ -1164,11 +1203,12 @@ function get_birthdays() {
|
|||
}
|
||||
}
|
||||
return $o;
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if(! function_exists('get_events')) {
|
||||
function get_events() {
|
||||
function get_events() {
|
||||
|
||||
require_once('include/bbcode.php');
|
||||
|
||||
|
|
@ -1228,7 +1268,8 @@ function get_events() {
|
|||
}
|
||||
|
||||
return $o;
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -1246,7 +1287,7 @@ function get_events() {
|
|||
*/
|
||||
|
||||
if(! function_exists('proc_run')) {
|
||||
function proc_run($cmd){
|
||||
function proc_run($cmd){
|
||||
|
||||
$a = get_app();
|
||||
|
||||
|
|
@ -1264,10 +1305,11 @@ function proc_run($cmd){
|
|||
}
|
||||
$cmdline = implode($args," ");
|
||||
proc_close(proc_open($cmdline." &",array(),$foo));
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
if(! function_exists('current_theme')) {
|
||||
function current_theme(){
|
||||
function current_theme(){
|
||||
$app_base_themes = array('duepuntozero', 'loozah');
|
||||
|
||||
$a = get_app();
|
||||
|
|
@ -1290,23 +1332,25 @@ function current_theme(){
|
|||
if(count($fallback))
|
||||
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.
|
||||
*/
|
||||
if(! function_exists('current_theme_url')) {
|
||||
function current_theme_url() {
|
||||
function current_theme_url() {
|
||||
global $a;
|
||||
$t = current_theme();
|
||||
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.css');
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
if(! function_exists('feed_birthday')) {
|
||||
function feed_birthday($uid,$tz) {
|
||||
function feed_birthday($uid,$tz) {
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -1351,19 +1395,21 @@ function feed_birthday($uid,$tz) {
|
|||
}
|
||||
|
||||
return $birthday;
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
if(! function_exists('is_site_admin')) {
|
||||
function is_site_admin() {
|
||||
function is_site_admin() {
|
||||
$a = get_app();
|
||||
if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
|
||||
return true;
|
||||
return false;
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if(! function_exists('load_contact_links')) {
|
||||
function load_contact_links($uid) {
|
||||
function load_contact_links($uid) {
|
||||
|
||||
$a = get_app();
|
||||
|
||||
|
|
@ -1385,10 +1431,11 @@ function load_contact_links($uid) {
|
|||
$ret['empty'] = true;
|
||||
$a->contacts = $ret;
|
||||
return;
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
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();
|
||||
|
||||
if (is_null($nickname))
|
||||
|
|
@ -1437,7 +1484,8 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
|
|||
$tpl = get_markup_template('common_tabs.tpl');
|
||||
|
||||
return replace_macros($tpl,array('$tabs' => $arr['tabs']));
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
function get_my_url() {
|
||||
if(x($_SESSION,'my_url'))
|
||||
|
|
|
|||
250
include/dba.php
250
include/dba.php
|
|
@ -8,16 +8,21 @@ require_once('include/datetime.php');
|
|||
*
|
||||
* For debugging, insert 'dbg(1);' anywhere in the program flow.
|
||||
* dbg(0); will turn it off. Logging is performed at LOGGER_DATA level.
|
||||
* When logging, all binary info is converted to text and html entities are escaped so that
|
||||
* the debugging stream is safe to view within both terminals and web pages.
|
||||
* When logging, all binary info is converted to
|
||||
* text and html entities are escaped so that
|
||||
* the debugging stream is safe to view
|
||||
* within both terminals and web pages.
|
||||
*
|
||||
*/
|
||||
|
||||
if(! class_exists('dba')) {
|
||||
class dba {
|
||||
|
||||
class dba {
|
||||
|
||||
private $debug = 0;
|
||||
private $db;
|
||||
private $exceptions;
|
||||
|
||||
public $mysqli = true;
|
||||
public $connected = false;
|
||||
public $error = false;
|
||||
|
|
@ -29,41 +34,44 @@ class dba {
|
|||
$pass = trim($pass);
|
||||
$db = trim($db);
|
||||
|
||||
//we need both, server and username, so fail if one is missing
|
||||
if (!(strlen($server) && strlen($user))){
|
||||
$this->connected = false;
|
||||
$this->db = null;
|
||||
return;
|
||||
throw new InvalidArgumentException(t("Server name of user name are missing. "));
|
||||
}
|
||||
|
||||
//when we are installing
|
||||
if($install) {
|
||||
if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
|
||||
if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
|
||||
$this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server);
|
||||
$this->connected = false;
|
||||
$this->db = null;
|
||||
return;
|
||||
throw new InvalidArgumentException( t('Cannot locate DNS info for database server \'%s\''), $server);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(class_exists('mysqli')) {
|
||||
$this->db = @new mysqli($server,$user,$pass,$db);
|
||||
if(! mysqli_connect_errno()) {
|
||||
$this->db = new mysqli($server,$user,$pass,$db);
|
||||
if(NULL === $this->db->connect_error) {
|
||||
$this->connected = true;
|
||||
} else {
|
||||
throw new RuntimeException($this->db->connect_error);
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$this->mysqli = false;
|
||||
$this->db = mysql_connect($server,$user,$pass);
|
||||
if($this->db && mysql_select_db($db,$this->db)) {
|
||||
$this->connected = true;
|
||||
} else {
|
||||
throw new RuntimeException(mysql_error());
|
||||
}
|
||||
}
|
||||
if(! $this->connected) {
|
||||
$this->db = null;
|
||||
if(! $install)
|
||||
system_unavailable();
|
||||
}
|
||||
|
||||
public function excep($excep) {
|
||||
$this->exceptions=$excep;
|
||||
}
|
||||
|
||||
public function getdb() {
|
||||
|
|
@ -72,125 +80,201 @@ class dba {
|
|||
|
||||
public function q($sql) {
|
||||
|
||||
if((! $this->db) || (! $this->connected))
|
||||
return false;
|
||||
if((! $this->db) || (! $this->connected)) {
|
||||
$this->throwOrLog(new RuntimeException(t("There is no db connection. ")));
|
||||
return;
|
||||
}
|
||||
|
||||
if($this->mysqli)
|
||||
$result = @$this->db->query($sql);
|
||||
else
|
||||
$result = @mysql_query($sql,$this->db);
|
||||
if($this->mysqli) {
|
||||
$result = $this->db->query($sql);
|
||||
} else {
|
||||
$result = mysql_query($sql,$this->db);
|
||||
}
|
||||
|
||||
if($this->debug) {
|
||||
//on debug mode or fail, the query is written to the log.
|
||||
//this won't work if logger can not read it's logging level
|
||||
//from the db.
|
||||
if($this->debug || FALSE === $result) {
|
||||
|
||||
$mesg = '';
|
||||
|
||||
if($this->mysqli) {
|
||||
if($this->db->errno)
|
||||
logger('dba: ' . $this->db->error);
|
||||
}
|
||||
elseif(mysql_errno($this->db))
|
||||
logger('dba: ' . mysql_error($this->db));
|
||||
|
||||
if($result === false)
|
||||
$mesg = 'false';
|
||||
elseif($result === true)
|
||||
$mesg = 'true';
|
||||
else {
|
||||
if($this->mysqli)
|
||||
$mesg = $result->num_rows . ' results' . EOL;
|
||||
else
|
||||
$mesg = mysql_num_rows($result) . ' results' . EOL;
|
||||
}
|
||||
|
||||
$str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg . EOL;
|
||||
|
||||
logger('dba: ' . $str );
|
||||
}
|
||||
|
||||
/**
|
||||
* If dbfail.out exists, we will write any failed calls directly to it,
|
||||
* regardless of any logging that may or may nor be in effect.
|
||||
* These usually indicate SQL syntax errors that need to be resolved.
|
||||
*/
|
||||
|
||||
if($result === false) {
|
||||
logger('dba: ' . printable($sql) . ' returned false.');
|
||||
if(file_exists('dbfail.out'))
|
||||
file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n", FILE_APPEND);
|
||||
$mesg = 'false '.$this->error();
|
||||
} elseif($result === true) {
|
||||
$mesg = 'true';
|
||||
} else {
|
||||
if($this->mysqli) {
|
||||
$mesg = $result->num_rows . t(' results') . EOL;
|
||||
} else {
|
||||
$mesg = mysql_num_rows($result) . t(' results') . EOL;
|
||||
}
|
||||
}
|
||||
|
||||
if(($result === true) || ($result === false))
|
||||
$str = 'SQL = ' . printable($sql) . EOL . t('SQL returned ') . $mesg . EOL;
|
||||
|
||||
|
||||
// If dbfail.out exists, we will write any failed calls directly to it,
|
||||
// regardless of any logging that may or may nor be in effect.
|
||||
// These usually indicate SQL syntax errors that need to be resolved.
|
||||
if(file_exists('dbfail.out')) {
|
||||
file_put_contents('dbfail.out', datetime_convert() . "\n" . $str . "\n", FILE_APPEND);
|
||||
}
|
||||
logger('dba: ' . $str );
|
||||
if(FALSE===$result) {
|
||||
$this->throwOrLog(new RuntimeException('dba: ' . $str));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if($result === true) {
|
||||
return $result;
|
||||
}
|
||||
|
||||
$r = array();
|
||||
if($this->mysqli) {
|
||||
if($result->num_rows) {
|
||||
while($x = $result->fetch_array(MYSQLI_ASSOC))
|
||||
while($x = $result->fetch_array(MYSQLI_ASSOC)) {
|
||||
$r[] = $x;
|
||||
}
|
||||
$result->free_result();
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
if(mysql_num_rows($result)) {
|
||||
while($x = mysql_fetch_array($result, MYSQL_ASSOC))
|
||||
while($x = mysql_fetch_array($result, MYSQL_ASSOC)) {
|
||||
$r[] = $x;
|
||||
}
|
||||
mysql_free_result($result);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if($this->debug)
|
||||
if($this->debug) {
|
||||
logger('dba: ' . printable(print_r($r, true)));
|
||||
}
|
||||
return($r);
|
||||
}
|
||||
|
||||
private function error() {
|
||||
if($this->mysqli) {
|
||||
return $this->db->error;
|
||||
} else {
|
||||
return mysql_error($this->db);
|
||||
}
|
||||
}
|
||||
|
||||
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() {
|
||||
if($this->mysqli) {
|
||||
return $this->db->autocommit(false);
|
||||
} else {
|
||||
//no transaction support in mysql module...
|
||||
mysql_query('SET AUTOCOMMIT = 0;', $db);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* rollback a transaction. So, rollback anything that was done since the last call
|
||||
* to beginTransaction().
|
||||
*/
|
||||
public function rollback() {
|
||||
if($this->mysqli) {
|
||||
return $this->db->rollback();
|
||||
} else {
|
||||
//no transaction support in mysql module...
|
||||
mysql_query('ROLLBACK;', $db);
|
||||
}
|
||||
$this->stopTransaction();
|
||||
}
|
||||
|
||||
/**
|
||||
* commit a transaction. So, write any query to the database.
|
||||
*/
|
||||
public function commit() {
|
||||
if($this->mysqli) {
|
||||
return $this->db->commit();
|
||||
} else {
|
||||
//no transaction support in mysql module...
|
||||
mysql_query('COMMIT;', $db);
|
||||
}
|
||||
$this->stopTransaction();
|
||||
}
|
||||
|
||||
private function stopTransaction() {
|
||||
if($this->mysqli) {
|
||||
return $this->db->autocommit(true);
|
||||
} else {
|
||||
//no transaction support in mysql module...
|
||||
mysql_query('SET AUTOCOMMIT = 1;', $db);
|
||||
}
|
||||
}
|
||||
|
||||
public function dbg($dbg) {
|
||||
$this->debug = $dbg;
|
||||
}
|
||||
|
||||
public function escape($str) {
|
||||
if($this->db && $this->connected) {
|
||||
if($this->mysqli)
|
||||
return @$this->db->real_escape_string($str);
|
||||
else
|
||||
return @mysql_real_escape_string($str,$this->db);
|
||||
if($this->mysqli) {
|
||||
return $this->db->real_escape_string($str);
|
||||
} else {
|
||||
return mysql_real_escape_string($str,$this->db);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function __destruct() {
|
||||
if ($this->db)
|
||||
if($this->mysqli)
|
||||
if ($this->db) {
|
||||
if($this->mysqli) {
|
||||
$this->db->close();
|
||||
else
|
||||
}
|
||||
} else {
|
||||
mysql_close($this->db);
|
||||
}
|
||||
}}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(! function_exists('printable')) {
|
||||
function printable($s) {
|
||||
function printable($s) {
|
||||
$s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s);
|
||||
$s = str_replace("\x00",'.',$s);
|
||||
if(x($_SERVER,'SERVER_NAME'))
|
||||
$s = escape_tags($s);
|
||||
return $s;
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
// Procedural functions
|
||||
if(! function_exists('dbg')) {
|
||||
function dbg($state) {
|
||||
function dbg($state) {
|
||||
global $db;
|
||||
if($db)
|
||||
$db->dbg($state);
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
if(! function_exists('dbesc')) {
|
||||
function dbesc($str) {
|
||||
function dbesc($str) {
|
||||
global $db;
|
||||
if($db && $db->connected)
|
||||
return($db->escape($str));
|
||||
else
|
||||
return(str_replace("'","\\'",$str));
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -200,7 +284,7 @@ function dbesc($str) {
|
|||
// 'user', 1);
|
||||
|
||||
if(! function_exists('q')) {
|
||||
function q($sql) {
|
||||
function q($sql) {
|
||||
|
||||
global $db;
|
||||
$args = func_get_args();
|
||||
|
|
@ -222,7 +306,8 @@ function q($sql) {
|
|||
logger('dba: no database: ' . print_r($args,true));
|
||||
return false;
|
||||
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -231,7 +316,7 @@ function q($sql) {
|
|||
*/
|
||||
|
||||
if(! function_exists('dbq')) {
|
||||
function dbq($sql) {
|
||||
function dbq($sql) {
|
||||
|
||||
global $db;
|
||||
if($db && $db->connected)
|
||||
|
|
@ -239,7 +324,8 @@ function dbq($sql) {
|
|||
else
|
||||
$ret = false;
|
||||
return $ret;
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Caller is responsible for ensuring that any integer arguments to
|
||||
|
|
@ -249,17 +335,19 @@ function dbq($sql) {
|
|||
|
||||
|
||||
if(! function_exists('dbesc_array_cb')) {
|
||||
function dbesc_array_cb(&$item, $key) {
|
||||
function dbesc_array_cb(&$item, $key) {
|
||||
if(is_string($item))
|
||||
$item = dbesc($item);
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if(! function_exists('dbesc_array')) {
|
||||
function dbesc_array(&$arr) {
|
||||
function dbesc_array(&$arr) {
|
||||
if(is_array($arr) && count($arr)) {
|
||||
array_walk($arr,'dbesc_array_cb');
|
||||
}
|
||||
}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 2.3.1306\n"
|
||||
"Project-Id-Version: 2.3.1307\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-04-08 10:00-0700\n"
|
||||
"POT-Creation-Date: 2012-04-09 10:00-0700\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -34,7 +34,7 @@ msgstr ""
|
|||
msgid "Contact update failed."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:43
|
||||
#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
|
||||
#: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26
|
||||
#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:866
|
||||
#: ../../mod/editpost.php:10 ../../mod/install.php:171
|
||||
|
|
@ -50,7 +50,7 @@ msgstr ""
|
|||
#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
|
||||
#: ../../mod/profile_photo.php:163 ../../mod/message.php:38
|
||||
#: ../../mod/message.php:91 ../../mod/allfriends.php:9
|
||||
#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9
|
||||
#: ../../mod/wall_upload.php:46 ../../mod/follow.php:8 ../../mod/common.php:9
|
||||
#: ../../mod/display.php:138 ../../mod/profiles.php:7
|
||||
#: ../../mod/profiles.php:232 ../../mod/delegate.php:6
|
||||
#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
|
||||
|
|
@ -173,12 +173,12 @@ msgstr ""
|
|||
msgid "Page not found."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/wall_attach.php:57
|
||||
#: ../../mod/wall_attach.php:58
|
||||
#, php-format
|
||||
msgid "File exceeds size limit of %d"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/wall_attach.php:85 ../../mod/wall_attach.php:96
|
||||
#: ../../mod/wall_attach.php:86 ../../mod/wall_attach.php:97
|
||||
msgid "File upload failed."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -420,12 +420,12 @@ msgid "Image file is empty."
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:654 ../../mod/profile_photo.php:124
|
||||
#: ../../mod/wall_upload.php:65
|
||||
#: ../../mod/wall_upload.php:69
|
||||
msgid "Unable to process image."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:674 ../../mod/profile_photo.php:257
|
||||
#: ../../mod/wall_upload.php:84
|
||||
#: ../../mod/wall_upload.php:88
|
||||
msgid "Image upload failed."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2753,8 +2753,8 @@ msgstr ""
|
|||
msgid "Empty post discarded."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/item.php:373 ../../mod/wall_upload.php:81
|
||||
#: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97
|
||||
#: ../../mod/item.php:373 ../../mod/wall_upload.php:85
|
||||
#: ../../mod/wall_upload.php:94 ../../mod/wall_upload.php:101
|
||||
#: ../../include/message.php:144
|
||||
msgid "Wall Photos"
|
||||
msgstr ""
|
||||
|
|
@ -2805,7 +2805,7 @@ msgstr ""
|
|||
msgid "Unable to process image"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:56
|
||||
#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:60
|
||||
#, php-format
|
||||
msgid "Image exceeds size limit of %d"
|
||||
msgstr ""
|
||||
|
|
@ -5339,7 +5339,7 @@ msgstr ""
|
|||
msgid "j F"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/profile_advanced.php:30 ../../include/datetime.php:438
|
||||
#: ../../include/profile_advanced.php:30 ../../include/datetime.php:448
|
||||
#: ../../include/items.php:1392
|
||||
msgid "Birthday:"
|
||||
msgstr ""
|
||||
|
|
@ -6097,71 +6097,71 @@ msgstr ""
|
|||
msgid "Miscellaneous"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/datetime.php:121 ../../include/datetime.php:253
|
||||
#: ../../include/datetime.php:131 ../../include/datetime.php:263
|
||||
msgid "year"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/datetime.php:126 ../../include/datetime.php:254
|
||||
#: ../../include/datetime.php:136 ../../include/datetime.php:264
|
||||
msgid "month"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/datetime.php:131 ../../include/datetime.php:256
|
||||
#: ../../include/datetime.php:141 ../../include/datetime.php:266
|
||||
msgid "day"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/datetime.php:244
|
||||
#: ../../include/datetime.php:254
|
||||
msgid "never"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/datetime.php:250
|
||||
#: ../../include/datetime.php:260
|
||||
msgid "less than a second ago"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/datetime.php:253
|
||||
#: ../../include/datetime.php:263
|
||||
msgid "years"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/datetime.php:254
|
||||
#: ../../include/datetime.php:264
|
||||
msgid "months"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/datetime.php:255
|
||||
#: ../../include/datetime.php:265
|
||||
msgid "week"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/datetime.php:255
|
||||
#: ../../include/datetime.php:265
|
||||
msgid "weeks"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/datetime.php:256
|
||||
#: ../../include/datetime.php:266
|
||||
msgid "days"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/datetime.php:257
|
||||
#: ../../include/datetime.php:267
|
||||
msgid "hour"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/datetime.php:257
|
||||
#: ../../include/datetime.php:267
|
||||
msgid "hours"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/datetime.php:258
|
||||
#: ../../include/datetime.php:268
|
||||
msgid "minute"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/datetime.php:258
|
||||
#: ../../include/datetime.php:268
|
||||
msgid "minutes"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/datetime.php:259
|
||||
#: ../../include/datetime.php:269
|
||||
msgid "second"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/datetime.php:259
|
||||
#: ../../include/datetime.php:269
|
||||
msgid "seconds"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/datetime.php:267
|
||||
#: ../../include/datetime.php:277
|
||||
#, php-format
|
||||
msgid "%1$d %2$s ago"
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -777,7 +777,7 @@ $a->strings["{0} tagged %s's post with #%s"] = "{0} hat %ss Beitrag mit dem Schl
|
|||
$a->strings["{0} mentioned you in a post"] = "{0} hat dich in einem Beitrag erwähnt";
|
||||
$a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
|
||||
$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet.";
|
||||
$a->strings["Login failed."] = "Annmeldung fehlgeschlagen.";
|
||||
$a->strings["Login failed."] = "Anmeldung fehlgeschlagen.";
|
||||
$a->strings["Connect URL missing."] = "Connect-URL fehlt";
|
||||
$a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann.";
|
||||
$a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden.";
|
||||
|
|
@ -1511,3 +1511,4 @@ $a->strings["[today]"] = "[heute]";
|
|||
$a->strings["Event Reminders"] = "Veranstaltungserinnerungen";
|
||||
$a->strings["Events this week:"] = "Veranstaltungen diese Woche";
|
||||
$a->strings["[No description]"] = "[keine Beschreibung]";
|
||||
$a->strings['Update Error at %s'] = 'Fehler beim Updaten von %s';
|
||||
|
|
|
|||
12
view/de/update_fail_eml.tpl
Normal file
12
view/de/update_fail_eml.tpl
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
Hey,
|
||||
Ich bin's, $sitename.
|
||||
Die Friendica-Entwickler haben gerade Update $update freigegeben,
|
||||
aber als ich es installieren wollte, ist irgendetwas schief gegangen.
|
||||
Das sollte schnell repariert werden und alleine schaffe ich es nicht.
|
||||
Wende dich bitte an einen Friendica-Entwickler, wenn du mir nicht selbst helfen kannst.
|
||||
Meine Datenbank könnte ziemlich durcheinander sein.
|
||||
|
||||
Die Fehlermeldung ist '$error'.
|
||||
|
||||
Tut mir leid,
|
||||
dein Friendica Server unter $siteurl
|
||||
11
view/update_fail_eml.tpl
Normal file
11
view/update_fail_eml.tpl
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
Hey,
|
||||
I'm $sitename.
|
||||
The friendica developers released update $update recently,
|
||||
but when I tried to install it, something went terribly wrong.
|
||||
This needs to be fixed soon and I can't do it alone. Please contact a
|
||||
friendica developer if you can not help me on your own. My database might be invalid.
|
||||
|
||||
The error message is '$error'.
|
||||
|
||||
I'm sorry,
|
||||
your friendica server at $siteurl
|
||||
Loading…
Reference in a new issue