more work associated with DBA and index.php shuffle
This commit is contained in:
redmatrix
parent
84ba6393ad
commit
516c43ba15
@ -12,7 +12,6 @@ namespace Zotlabs\Module;
|
||||
/**
|
||||
* @brief Initialisation for the setup module.
|
||||
*
|
||||
* @param[in,out] App &$a
|
||||
*/
|
||||
|
||||
class Setup extends \Zotlabs\Web\Controller {
|
||||
@ -54,16 +53,15 @@ class Setup extends \Zotlabs\Web\Controller {
|
||||
/**
|
||||
* @brief Handle the actions of the different setup steps.
|
||||
*
|
||||
* @param[in,out] App &$a
|
||||
*/
|
||||
|
||||
function post() {
|
||||
global $db;
|
||||
|
||||
switch($this->install_wizard_pass) {
|
||||
case 1:
|
||||
case 2:
|
||||
return;
|
||||
break; // just in case return don't return :)
|
||||
// implied break;
|
||||
case 3:
|
||||
$urlpath = \App::get_path();
|
||||
$dbhost = trim($_POST['dbhost']);
|
||||
@ -88,33 +86,9 @@ class Setup extends \Zotlabs\Web\Controller {
|
||||
if(! \DBA::$dba->connected) {
|
||||
echo 'Database Connect failed: ' . DBA::$dba->error;
|
||||
killme();
|
||||
\App::$data['db_conn_failed']=true;
|
||||
}
|
||||
/*if(get_db_errno()) {
|
||||
unset($db);
|
||||
$db = dba_factory($dbhost, $dbport, $dbuser, $dbpass, '', true);
|
||||
|
||||
if(! get_db_errno()) {
|
||||
$r = q("CREATE DATABASE '%s'",
|
||||
dbesc($dbdata)
|
||||
);
|
||||
if($r) {
|
||||
unset($db);
|
||||
$db = new dba($dbhost, $dbport, $dbuser, $dbpass, $dbdata, true);
|
||||
} else {
|
||||
\App::$data['db_create_failed']=true;
|
||||
}
|
||||
} else {
|
||||
\App::$data['db_conn_failed']=true;
|
||||
return;
|
||||
}
|
||||
}*/
|
||||
//if(get_db_errno()) {
|
||||
|
||||
//}
|
||||
|
||||
return;
|
||||
break;
|
||||
// implied break;
|
||||
case 4:
|
||||
$urlpath = \App::get_path();
|
||||
$dbhost = notags(trim($_POST['dbhost']));
|
||||
@ -177,6 +151,8 @@ class Setup extends \Zotlabs\Web\Controller {
|
||||
\App::$data['db_installed'] = true;
|
||||
|
||||
return;
|
||||
// implied break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -193,11 +169,10 @@ class Setup extends \Zotlabs\Web\Controller {
|
||||
*
|
||||
* Depending on the state we are currently in it returns different content.
|
||||
*
|
||||
* @param App &$a
|
||||
* @return string parsed HTML output
|
||||
*/
|
||||
|
||||
function get() {
|
||||
global $db;
|
||||
|
||||
$o = '';
|
||||
$wizard_status = '';
|
||||
|
||||
@ -1,19 +1,16 @@
|
||||
<?php /** @file */
|
||||
|
||||
namespace Zotlabs\Web;
|
||||
|
||||
class WebServer {
|
||||
|
||||
public function run() {
|
||||
|
||||
global $db;
|
||||
|
||||
/*
|
||||
* Bootstrap the application, load configuration, load modules, load theme, etc.
|
||||
*/
|
||||
|
||||
/*
|
||||
* bootstrap the application
|
||||
*/
|
||||
|
||||
require_once('boot.php');
|
||||
|
||||
if(file_exists('.htsite.php'))
|
||||
@ -54,8 +51,8 @@ class WebServer {
|
||||
require_once('include/dba/dba_driver.php');
|
||||
|
||||
if(! \App::$install) {
|
||||
$db = DBA::dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type, \App::$install);
|
||||
if(! $db->connected) {
|
||||
\DBA::dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type, \App::$install);
|
||||
if(! \DBA::$dba->connected) {
|
||||
system_unavailable();
|
||||
}
|
||||
|
||||
@ -69,7 +66,7 @@ class WebServer {
|
||||
load_config('system');
|
||||
load_config('feature');
|
||||
|
||||
\App::$session = new Zotlabs\Web\Session();
|
||||
\App::$session = new Session();
|
||||
\App::$session->init();
|
||||
load_hooks();
|
||||
call_hooks('init_1');
|
||||
@ -150,7 +147,7 @@ class WebServer {
|
||||
|
||||
nav_set_selected('nothing');
|
||||
|
||||
$Router = new Zotlabs\Web\Router($a);
|
||||
$Router = new Router($a);
|
||||
|
||||
/* initialise content region */
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ require_once('boot.php');
|
||||
|
||||
function cli_startup() {
|
||||
|
||||
global $a, $db, $default_timezone;
|
||||
global $default_timezone;
|
||||
|
||||
if(is_null($a)) {
|
||||
$a = new miniApp;
|
||||
@ -14,7 +14,6 @@ function cli_startup() {
|
||||
|
||||
App::init();
|
||||
|
||||
if(! DBA::$connected) {
|
||||
@include(".htconfig.php");
|
||||
|
||||
$a->convert();
|
||||
@ -26,9 +25,8 @@ function cli_startup() {
|
||||
date_default_timezone_set(App::$timezone);
|
||||
|
||||
require_once('include/dba/dba_driver.php');
|
||||
$db = DBA::dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type);
|
||||
DBA::dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type);
|
||||
unset($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type);
|
||||
};
|
||||
|
||||
App::$session = new Zotlabs\Web\Session();
|
||||
App::$session->init();
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
<?php
|
||||
|
||||
class DBA {
|
||||
|
||||
/**
|
||||
* @file dba_driver.php
|
||||
* @brief some database related functions and abstract driver class.
|
||||
@ -27,6 +28,7 @@ static public $dbtype = null;
|
||||
* @param bool $install Defaults to false
|
||||
* @return null|dba_driver A database driver object (dba_mysql|dba_mysqli) or null if no driver found.
|
||||
*/
|
||||
|
||||
static public function dba_factory($server, $port,$user,$pass,$db,$dbtype,$install = false) {
|
||||
|
||||
self::$dba = null;
|
||||
@ -38,7 +40,8 @@ static public function dba_factory($server, $port,$user,$pass,$db,$dbtype,$insta
|
||||
require_once('include/dba/dba_postgres.php');
|
||||
if(is_null($port)) $set_port = 5432;
|
||||
self::$dba = new dba_postgres($server, $set_port, $user, $pass, $db, $install);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
|
||||
// Highly experimental at the present time.
|
||||
// require_once('include/dba/dba_pdo.php');
|
||||
@ -256,7 +259,6 @@ function dbg($state) {
|
||||
* @return Return an escaped string of the value to pass to a DB query.
|
||||
*/
|
||||
function dbesc($str) {
|
||||
global $db;
|
||||
|
||||
if(\DBA::$dba && \DBA::$dba->connected)
|
||||
return(\DBA::$dba->escape($str));
|
||||
@ -264,12 +266,10 @@ function dbesc($str) {
|
||||
return(str_replace("'", "\\'", $str));
|
||||
}
|
||||
function dbescbin($str) {
|
||||
global $db;
|
||||
return \DBA::$dba->escapebin($str);
|
||||
}
|
||||
|
||||
function dbunescbin($str) {
|
||||
global $db;
|
||||
return \DBA::$dba->unescapebin($str);
|
||||
}
|
||||
|
||||
@ -283,36 +283,25 @@ function dbescdate($date) {
|
||||
}
|
||||
|
||||
function db_quoteinterval($txt) {
|
||||
global $db;
|
||||
return \DBA::$dba->quote_interval($txt);
|
||||
}
|
||||
|
||||
function dbesc_identifier($str) {
|
||||
global $db;
|
||||
return \DBA::$dba->escape_identifier($str);
|
||||
}
|
||||
|
||||
function db_utcnow() {
|
||||
global $db;
|
||||
return \DBA::$dba->utcnow();
|
||||
}
|
||||
|
||||
function db_optimizetable($table) {
|
||||
global $db;
|
||||
\DBA::$dba->optimize_table($table);
|
||||
}
|
||||
|
||||
function db_concat($fld, $sep) {
|
||||
global $db;
|
||||
return \DBA::$dba->concat($fld, $sep);
|
||||
}
|
||||
|
||||
// Function: q($sql,$args);
|
||||
// Description: execute SQL query with printf style args.
|
||||
// Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
|
||||
// 'user', 1);
|
||||
|
||||
|
||||
/**
|
||||
* @brief Execute a SQL query with printf style args.
|
||||
*
|
||||
@ -328,8 +317,8 @@ function db_concat($fld, $sep) {
|
||||
* @param string $sql The SQL query to execute
|
||||
* @return bool|array
|
||||
*/
|
||||
|
||||
function q($sql) {
|
||||
global $db;
|
||||
|
||||
$args = func_get_args();
|
||||
unset($args[0]);
|
||||
@ -343,13 +332,14 @@ function q($sql) {
|
||||
else
|
||||
db_logger('dba: vsprintf error: ' . print_r(debug_backtrace(), true),LOGGER_NORMAL,LOG_CRIT);
|
||||
}
|
||||
return $db->q($stmt);
|
||||
return \DBA::$dba->q($stmt);
|
||||
}
|
||||
|
||||
/*
|
||||
* This will happen occasionally trying to store the
|
||||
* session data after abnormal program termination
|
||||
*/
|
||||
|
||||
db_logger('dba: no database: ' . print_r($args,true),LOGGER_NORMAL,LOG_CRIT);
|
||||
|
||||
return false;
|
||||
@ -363,7 +353,6 @@ function q($sql) {
|
||||
* @param string $sql The SQL query to execute
|
||||
*/
|
||||
function dbq($sql) {
|
||||
global $db;
|
||||
|
||||
if(\DBA::$dba && \DBA::$dba->connected)
|
||||
$ret = \DBA::$dba->q($sql);
|
||||
@ -427,11 +416,11 @@ function db_getfunc($f) {
|
||||
|
||||
// The logger function may make DB calls internally to query the system logging parameters.
|
||||
// This can cause a recursion if database debugging is enabled.
|
||||
// So this function preserves the current database debugging state and then turns it off while
|
||||
// doing the logger() call
|
||||
// So this function preserves the current database debugging state and then turns it off
|
||||
// temporarily while doing the logger() call
|
||||
|
||||
function db_logger($s,$level = LOGGER_NORMAL,$syslog = LOG_INFO) {
|
||||
global $db;
|
||||
|
||||
$saved = \DBA::$dba->debug;
|
||||
\DBA::$dba->debug = false;
|
||||
logger($s,$level,$syslog);
|
||||
|
||||
@ -567,21 +567,25 @@ function attribute_contains($attr, $s) {
|
||||
*/
|
||||
|
||||
function logger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) {
|
||||
// turn off logger in install mode
|
||||
global $a;
|
||||
global $db;
|
||||
|
||||
if((App::$module == 'install') || (! (DBA::$dba && DBA::$dba->connected)))
|
||||
return;
|
||||
|
||||
if(App::$module == 'setup' && is_writable('install.log')) {
|
||||
$debugging = true;
|
||||
$logfile = 'install.log';
|
||||
$loglevel = LOGGER_ALL;
|
||||
}
|
||||
else {
|
||||
$debugging = get_config('system', 'debugging');
|
||||
$loglevel = intval(get_config('system', 'loglevel'));
|
||||
$logfile = get_config('system', 'logfile');
|
||||
}
|
||||
|
||||
if((! $debugging) || (! $logfile) || ($level > $loglevel))
|
||||
return;
|
||||
|
||||
$where = '';
|
||||
|
||||
// We require > 5.4 but leave the version check so that install issues (including version) can be logged
|
||||
|
||||
if(version_compare(PHP_VERSION, '5.4.0') >= 0) {
|
||||
$stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
|
||||
$where = basename($stack[0]['file']) . ':' . $stack[0]['line'] . ':' . $stack[1]['function'] . ': ';
|
||||
@ -590,6 +594,7 @@ function logger($msg, $level = LOGGER_NORMAL, $priority = LOG_INFO) {
|
||||
$s = datetime_convert() . ':' . log_priority_str($priority) . ':' . session_id() . ':' . $where . $msg . PHP_EOL;
|
||||
$pluginfo = array('filename' => $logfile, 'loglevel' => $level, 'message' => $s,'priority' => $priority, 'logged' => false);
|
||||
|
||||
if(! (App::$module == 'setup'))
|
||||
call_hooks('logger',$pluginfo);
|
||||
|
||||
if(! $pluginfo['logged'])
|
||||
|
||||
Reference in New Issue
Block a user