commit 97c1ee30d57f391fa98138fdc2416b3caa64ab56 parent 81489403d99f65c06a79cff6986d5ffe412faa9d Author: Jan Dankert <develop@jandankert.de> Date: Sat, 26 Sep 2020 02:26:39 +0200 Refactoring: No global functions any more, the database object is read from the Db class. Diffstat:
34 files changed, 264 insertions(+), 268 deletions(-)
diff --git a/modules/cms/Dispatcher.class.php b/modules/cms/Dispatcher.class.php @@ -8,6 +8,7 @@ namespace cms; use BadMethodCallException; use cms\action\Action; use cms\action\RequestParams; +use cms\base\DB; use cms\base\DefaultConfig; use configuration\ConfigurationLoader; use database\Database; @@ -437,7 +438,7 @@ class Dispatcher $updater = new Update(); - if ( ! $updater->isUpdateRequired( db() ) ) + if ( ! $updater->isUpdateRequired( DB::get() ) ) return; @@ -548,7 +549,7 @@ class Dispatcher $data = array( 'database' => array( - 'id' => db()->id ), + 'id' => DB::get()->id ), 'user' => array( 'id' => @$user->userid, 'name' => @$user->name ), diff --git a/modules/cms/action/LoginAction.class.php b/modules/cms/action/LoginAction.class.php @@ -4,21 +4,11 @@ namespace cms\action; use cms\auth\Auth; +use cms\base\DB; use cms\model\User; -use cms\model\Project; use cms\model\Group; -use cms\model\Value; -use cms\model\Element; -use cms\model\Page; -use cms\model\BaseObject; -use cms\model\Language; -use cms\model\Model; - - -use \database\Database; -use \DB; -use cms\update\Update; -use \Exception; + + use util\Http; use cms\auth\InternalAuth; use logger\Logger; @@ -26,7 +16,6 @@ use \ObjectNotFoundException; use util\exception\UIException; use \security\Password; use util\Session; -use util\Html; use util\Mail; use util\Text; @@ -88,7 +77,7 @@ class LoginAction extends BaseAction unset( $SESS['user'] ); - $db = db_connection(); + $db = \cms\base\DB::get(); if ( !is_object($db) ) { @@ -408,7 +397,7 @@ class LoginAction extends BaseAction $this->setTemplateVar( 'dbids',$dbids ); - $db = db(); + $db = DB::get(); if ( is_object($db) ) $this->setTemplateVar('actdbid',$db->id); else @@ -1162,7 +1151,7 @@ class LoginAction extends BaseAction $this->setTemplateVar( 'dbids',$dbids ); - $db = db(); + $db = DB::get(); if ( is_object($db) ) $this->setTemplateVar('actdbid',$db->id); else @@ -1280,7 +1269,7 @@ class LoginAction extends BaseAction $this->setTemplateVar( 'dbids',$dbids ); - $db = db(); + $db = DB::get(); if ( is_object($db) ) $this->setTemplateVar('actdbid',$db->id); diff --git a/modules/cms/action/ProjectAction.class.php b/modules/cms/action/ProjectAction.class.php @@ -313,7 +313,7 @@ class ProjectAction extends BaseAction */ public function copyPost() { - $db = db_connection(); + $db = \cms\base\DB::get(); $this->setTemplateVar( 'dbid',$db->id ); global $conf; diff --git a/modules/cms/action/ProjectlistAction.class.php b/modules/cms/action/ProjectlistAction.class.php @@ -105,7 +105,7 @@ class ProjectlistAction extends BaseAction $this->addNotice('project',$project->name,'ADDED'); break; case 'copy': - $db = db_connection(); + $db = \cms\base\DB::get(); $project = new Project($this->getRequestVar('projectid')); $project->load(); $project->export($db->id); diff --git a/modules/cms/action/StartAction.class.php b/modules/cms/action/StartAction.class.php @@ -61,7 +61,7 @@ class StartAction extends BaseAction if ( !isset($conf['database'][$dbid] )) throw new \LogicException( 'unknown DB-Id: '.$dbid ); - $db = db_connection(); + $db = \cms\base\DB::get(); if ( is_object($db) ) { $db->rollback(); @@ -117,7 +117,7 @@ class StartAction extends BaseAction unset( $SESS['user'] ); - $db = db_connection(); + $db = \cms\base\DB::get(); if ( !$db->available ) { diff --git a/modules/cms/auth/InternalAuth.class.php b/modules/cms/auth/InternalAuth.class.php @@ -2,7 +2,7 @@ namespace cms\auth; -use cms\auth\Auth; +use cms\base\DB as Db; use cms\model\User; use LogicException; use security\Password; @@ -24,7 +24,7 @@ class InternalAuth implements Auth function login($username, $password, $token) { // Lesen des Benutzers aus der DB-Tabelle - $sql = db()->sql(<<<SQL + $sql = Db::sql(<<<SQL SELECT * FROM {{user}} WHERE name={name} SQL diff --git a/modules/cms/auth/LdapAuth.class.php b/modules/cms/auth/LdapAuth.class.php @@ -21,7 +21,7 @@ class LdapAuth implements Auth } global $conf; - $db = db_connection(); + $db = \cms\base\DB::get(); $this->mustChangePassword = false; // Lesen des Benutzers aus der DB-Tabelle diff --git a/modules/cms/auth/LdapUserDNAuth.class.php b/modules/cms/auth/LdapUserDNAuth.class.php @@ -18,7 +18,7 @@ class LdapUserDNAuth implements Auth */ public function login($username, $password, $token) { - $db = db_connection(); + $db = \cms\base\DB::get(); $this->mustChangePassword = false; // Lesen des Benutzers aus der DB-Tabelle diff --git a/modules/cms/base/Common.class.php b/modules/cms/base/Common.class.php @@ -1,6 +1,7 @@ <?php +use cms\base\DB; use util\Session; class Common @@ -64,7 +65,7 @@ class Common return true; // Aktuelle Datenbankverbindung ist readonly. - $db = db(); + $db = DB::get(); if (isset($db->conf['readonly']) && $db->conf['readonly']) return true; @@ -144,34 +145,6 @@ class Common { return !$var; } - - /** - * Liefert die Datenbankverbindung fuer die aktuelle Sitzung. - * - * @return \database\Database - * @deprecated use db() - */ - function db_connection() - { - - return db(); - } - - /** - * Liefert die Datenbankverbindung fuer die aktuelle Sitzung. - * - * @return \database\Database - */ - function db() - { - - $db = Session::getDatabase(); - - if (!is_object($db)) - throw new RuntimeException('no database available'); - - return $db; - } } } \ No newline at end of file diff --git a/modules/cms/base/DB.class.php b/modules/cms/base/DB.class.php @@ -2,6 +2,9 @@ namespace cms\base; +use RuntimeException; +use util\Session; + class DB { /** @@ -11,6 +14,20 @@ class DB { * @return \database\Statement SQL-Statement */ public static function sql( $sql ) { - return db()->sql( $sql ); + return self::get()->sql( $sql ); + } + + /** + * Returns the database connection. + * @return \database\Database + */ + public static function get() { + + $db = Session::getDatabase(); + + if (!is_object($db)) + throw new RuntimeException('no database available'); + + return $db; } } \ No newline at end of file diff --git a/modules/cms/generator/ValueGenerator.class.php b/modules/cms/generator/ValueGenerator.class.php @@ -4,6 +4,7 @@ namespace cms\generator; +use cms\base\DB; use cms\macros\MacroRunner; use cms\model\BaseObject; use cms\model\Element; @@ -822,10 +823,10 @@ class ValueGenerator extends BaseGenerator switch( $element->subtype ) { case 'db_id': - $inhalt = db()->id; + $inhalt = DB::get()->id; break; case 'db_name': - $inhalt = $conf['database_'.db()->id]['description']; + $inhalt = $conf['database_'.DB::get()->id]['description']; break; case 'project_id': $inhalt = $page->projectid; @@ -877,7 +878,6 @@ class ValueGenerator extends BaseGenerator if ( substr($inhalt,-4) == 'api/' ) $inhalt = substr($inhalt,0,-4); - $db = db(); $inhalt .= '/#/page/'.$page->objectid; break; case 'lastch_user_username': diff --git a/modules/cms/model/Acl.class.php b/modules/cms/model/Acl.class.php @@ -2,12 +2,11 @@ namespace cms\model; -/** +use cms\base\DB as Db;/** * <editor-fold defaultstate="collapsed" desc="license"> * * OpenRat Content Management System * Copyright (C) 2002-2012 Jan Dankert, cms@jandankert.de - * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 @@ -206,7 +205,7 @@ class Acl extends ModelBase */ public function load() { - $sql = db()->sql( 'SELECT {{acl}}.*,{{user}}.name as username,{{group}}.name as groupname,{{language}}.name as languagename'. + $sql = Db::sql( 'SELECT {{acl}}.*,{{user}}.name as username,{{group}}.name as groupname,{{language}}.name as languagename'. ' FROM {{acl}} '. ' LEFT JOIN {{user}} ON {{user}}.id = {{acl}}.userid '. ' LEFT JOIN {{group}} ON {{group}}.id = {{acl}}.groupid '. @@ -233,7 +232,7 @@ class Acl extends ModelBase */ public function loadRaw() { - $sql = db()->sql( 'SELECT * '. + $sql = Db::sql( 'SELECT * '. ' FROM {{acl}} '. ' WHERE {{acl}}.id={aclid}' ); @@ -384,7 +383,7 @@ class Acl extends ModelBase */ public function delete() { - $sql = db()->sql( 'DELETE FROM {{acl}} '. + $sql = Db::sql( 'DELETE FROM {{acl}} '. ' WHERE id = {aclid} '. ' AND objectid= {objectid}' ); @@ -410,7 +409,7 @@ class Acl extends ModelBase $group_comp = intval($this->groupid )>0?'={groupid}':'IS NULL'; $language_comp = intval($this->languageid)>0?'={languageid}':'IS NULL'; - $stmt = db()->sql( <<<SQL + $stmt = Db::sql( <<<SQL SELECT id FROM {{acl}} WHERE userid $user_comp AND groupid $group_comp AND @@ -464,10 +463,10 @@ SQL - $stmt = db()->sql('SELECT MAX(id) FROM {{acl}}'); + $stmt = Db::sql('SELECT MAX(id) FROM {{acl}}'); $this->aclid = intval($stmt->getOne())+1; - $stmt = db()->sql( <<<SQL + $stmt = Db::sql( <<<SQL INSERT INTO {{acl}} (id,userid,groupid,objectid,is_write,is_prop,is_create_folder,is_create_file,is_create_link,is_create_page,is_delete,is_release,is_publish,is_grant,is_transmit,languageid) VALUES( {aclid},{userid},{groupid},{objectid},{write},{prop},{create_folder},{create_file},{create_link},{create_page},{delete},{release},{publish},{grant},{transmit},{languageid} ) diff --git a/modules/cms/model/Alias.class.php b/modules/cms/model/Alias.class.php @@ -2,6 +2,8 @@ namespace cms\model; +use cms\base\DB as Db; + /** * Alias. Ein Alias kann auf alle anderen Objekte zeigen. * @@ -29,14 +31,14 @@ class Alias extends BaseObject { if ( $this->objectid != null ) { - $sql = db()->sql( 'SELECT *'. + $sql = Db::sql( 'SELECT *'. ' FROM {{alias}}'. ' WHERE objectid={objectid}' ); $sql->setInt( 'objectid',$this->objectid ); } elseif ( $this->linkedObjectId != null && intval($this->languageid) != 0 ) { - $sql = db()->sql( 'SELECT *'. + $sql = Db::sql( 'SELECT *'. ' FROM {{alias}}'. ' WHERE link_objectid={objectid}'. ' AND languageid={languageid}' ); @@ -45,7 +47,7 @@ class Alias extends BaseObject } elseif ( $this->linkedObjectId != null ) { - $sql = db()->sql( 'SELECT *'. + $sql = Db::sql( 'SELECT *'. ' FROM {{alias}}'. ' WHERE link_objectid={objectid}'. ' AND languageid IS NULL' ); @@ -77,7 +79,7 @@ class Alias extends BaseObject if ( ! $this->isPersistent() ) return; - $sql = db()->sql( 'DELETE FROM {{alias}} '. + $sql = Db::sql( 'DELETE FROM {{alias}} '. ' WHERE id={aliasid}' ); $sql->setInt( 'aliasid',$this->aliasid ); @@ -95,7 +97,7 @@ class Alias extends BaseObject if ( ! $this->isPersistent() ) $this->add(); - $sql = db()->sql('UPDATE {{alias}} SET '. + $sql = Db::sql('UPDATE {{alias}} SET '. ' link_objectid = {linkobjectid},'. ' languageid = {languageid}'. ' WHERE objectid={objectid}' ); @@ -123,10 +125,10 @@ class Alias extends BaseObject { parent::add(); - $stmt = db()->sql('SELECT MAX(id) FROM {{alias}}'); + $stmt = Db::sql('SELECT MAX(id) FROM {{alias}}'); $this->aliasid = intval($stmt->getOne())+1; - $stmt = db()->sql( <<<SQL + $stmt = Db::sql( <<<SQL INSERT INTO {{alias}} (id,objectid,link_objectid,languageid) VALUES( {linkid},{objectid},{linkobjectid},{languageid} ) diff --git a/modules/cms/model/BaseObject.class.php b/modules/cms/model/BaseObject.class.php @@ -3,6 +3,7 @@ namespace cms\model; +use cms\base\DB as Db; use util\ArrayUtils; use cms\generator\Publish; use phpseclib\Math\BigInteger; @@ -278,7 +279,7 @@ class BaseObject extends ModelBase // Anonymous $this->aclMask = 0; - $sql = db()->sql( <<<SQL + $sql = Db::sql( <<<SQL SELECT {{acl}}.* FROM {{acl}} WHERE objectid={objectid} AND {{acl}}.userid IS NULL @@ -334,7 +335,7 @@ SQL $this->aclMask = 0; $sqlGroupClause = $user->getGroupClause(); - $sql = db()->sql( <<<SQL + $sql = Db::sql( <<<SQL SELECT {{acl}}.* FROM {{acl}} WHERE objectid={objectid} AND ( languageid={languageid} OR languageid IS NULL ) @@ -643,7 +644,7 @@ SQL */ public static function available( $objectid ) { - $db = db_connection(); + $db = \cms\base\DB::get(); // Vielleicht k�nnen wir uns den DB-Zugriff auch ganz sparen. if ( !is_numeric($objectid) || $objectid <= 0 ) @@ -666,7 +667,7 @@ SQL */ function objectLoad() { - $db = db_connection(); + $db = \cms\base\DB::get(); $stmt = $db->sql('SELECT {{object}}.*,' . ' {{name}}.name,{{name}}.descr,'. @@ -709,7 +710,7 @@ SQL function objectLoadRaw() { global $SESS; - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT * FROM {{object}}'. ' WHERE {{object}}.id={objectid}'); @@ -862,7 +863,7 @@ SQL $this->setTimestamp(); $this->checkFilename(); - $stmt = db()->sql( <<<SQL + $stmt = Db::sql( <<<SQL UPDATE {{object}} SET parentid = {parentid}, lastchange_date = {time} , @@ -905,7 +906,7 @@ SQL */ public function setTimestamp() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('UPDATE {{object}} SET '. ' lastchange_date = {time} ,'. @@ -927,7 +928,7 @@ SQL public function setCreationTimestamp() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('UPDATE {{object}} SET '. ' create_date = {time} '. @@ -942,7 +943,7 @@ SQL public function setPublishedTimestamp() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('UPDATE {{object}} SET '. ' published_date = {time} ,'. @@ -969,7 +970,7 @@ SQL */ public function ObjectSaveName() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql(<<<SQL SELECT COUNT(*) FROM {{name}} WHERE objectid ={objectid} AND languageid={languageid} @@ -1025,7 +1026,7 @@ SQL */ public function delete() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'UPDATE {{element}} '. ' SET default_objectid=NULL '. @@ -1052,7 +1053,7 @@ SQL $sql->query(); // Aliases löschen. - $sql = db()->sql('DELETE FROM {{alias}} WHERE objectid={objectid}'); + $sql = Db::sql('DELETE FROM {{alias}} WHERE objectid={objectid}'); $sql->setInt('objectid', $this->objectid); $sql->query(); @@ -1086,11 +1087,11 @@ SQL function add() { // Neue Objekt-Id bestimmen - $sql = db()->sql('SELECT MAX(id) FROM {{object}}'); + $sql = Db::sql('SELECT MAX(id) FROM {{object}}'); $this->objectid = intval($sql->getOne())+1; $this->checkFilename(); - $sql = db()->sql('INSERT INTO {{object}}'. + $sql = Db::sql('INSERT INTO {{object}}'. ' (id,parentid,projectid,filename,orderid,create_date,create_userid,lastchange_date,lastchange_userid,typeid,settings)'. ' VALUES( {objectid},{parentid},{projectid},{filename},{orderid},{time},{createuserid},{createtime},{userid},{typeid},\'\' )'); @@ -1178,7 +1179,7 @@ SQL */ private function filenameIsUnique( $filename ) { - $sql = db()->sql( <<<SQL + $sql = Db::sql( <<<SQL SELECT COUNT(*) FROM {{object}} WHERE parentid={parentid} AND filename={filename} AND NOT id = {objectid} @@ -1209,7 +1210,7 @@ SQL function getAllAclIds() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT id FROM {{acl}} '. ' WHERE objectid={objectid}'. @@ -1266,7 +1267,7 @@ SQL */ public function setOrderId( $orderid ) { - $sql = db()->sql('UPDATE {{object}} '.' SET orderid={orderid}'.' WHERE id={objectid}'); + $sql = Db::sql('UPDATE {{object}} '.' SET orderid={orderid}'.' WHERE id={objectid}'); $sql->setInt('objectid', $this->objectid); $sql->setInt('orderid', $orderid); @@ -1282,7 +1283,7 @@ SQL */ public function setParentId( $parentid ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('UPDATE {{object}} '.' SET parentid={parentid}'.' WHERE id={objectid}'); $sql->setInt('objectid', $this->objectid); @@ -1294,7 +1295,7 @@ SQL public function getDependentObjectIds() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT {{page}}.objectid FROM {{value}}'. ' LEFT JOIN {{page}} '. @@ -1314,7 +1315,7 @@ SQL */ public function getLinksToMe() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT objectid FROM {{link}} '. ' WHERE link_objectid={myid}' ); @@ -1400,7 +1401,7 @@ SQL while( intval($foid)!=0 ) { - $sql = db()->sql( <<<SQL + $sql = Db::sql( <<<SQL SELECT parentid,id,filename FROM {{object}} @@ -1434,7 +1435,7 @@ SQL while( intval($foid)!=0 ) { - $sql = db()->sql( <<<SQL + $sql = Db::sql( <<<SQL SELECT {{object}}.parentid,{{object}}.id,{{object}}.filename,{{name}}.name FROM {{object}} LEFT JOIN {{name}} @@ -1524,7 +1525,7 @@ SQL */ public static function getObjectIdsByFileName( $text ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT id FROM {{object}} '. ' WHERE filename LIKE {filename}'. @@ -1542,7 +1543,7 @@ SQL */ public static function getObjectIdsByName( $text ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT {{object}}.id FROM {{object}} '. ' LEFT JOIN {{name}} '. @@ -1562,7 +1563,7 @@ SQL */ public static function getObjectIdsByDescription( $text ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT {{object}}.id FROM {{object}} '. ' LEFT JOIN {{name}} '. @@ -1582,7 +1583,7 @@ SQL */ public static function getObjectIdsByCreateUserId( $userid ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT id FROM {{object}} '. ' WHERE create_userid={userid}'. @@ -1600,7 +1601,7 @@ SQL */ public static function getObjectIdsByLastChangeUserId( $userid ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT id FROM {{object}} '. ' WHERE lastchange_userid={userid}'. diff --git a/modules/cms/model/Element.class.php b/modules/cms/model/Element.class.php @@ -2,6 +2,7 @@ namespace cms\model; +use cms\base\DB as Db; use util\ArrayUtils; use logger\Logger; @@ -189,10 +190,10 @@ class Element extends ModelBase */ function add() { - $sql = db()->sql('SELECT MAX(id) FROM {{element}}'); + $sql = Db::sql('SELECT MAX(id) FROM {{element}}'); $this->elementid = intval($sql->getOne())+1; - $sql = db()->sql( 'INSERT INTO {{element}}'. + $sql = Db::sql( 'INSERT INTO {{element}}'. ' (id,templateid,name,label,descr,typeid,flags) '. " VALUES ( {elementid},{templateid},{name},{label},{description},{typeid},{flags} ) " ); @@ -220,7 +221,7 @@ class Element extends ModelBase { if ( intval($this->elementid) != 0 ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( <<<SQL SELECT * FROM {{element}} WHERE id={elementid} @@ -278,7 +279,7 @@ SQL */ function save() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'UPDATE {{element}}'. ' SET templateid = {templateid},'. @@ -355,7 +356,7 @@ SQL */ public function delete() { - $db = db_connection(); + $db = \cms\base\DB::get(); // Inhalte loeschen. // notwendig, damit die Fremdschlüsselbeziehungen auf diesen Element aufgehoben werden. @@ -376,7 +377,7 @@ SQL */ public function deleteValues() { - $db = db_connection(); + $db = \cms\base\DB::get(); // Alle Inhalte mit diesem Element l?schen $sql = $db->sql('DELETE FROM {{value}} '. diff --git a/modules/cms/model/File.class.php b/modules/cms/model/File.class.php @@ -19,6 +19,7 @@ namespace cms\model; // Standard Mime-Type +use cms\base\DB as Db; use cms\generator\filter\AbstractFilter; use cms\generator\PublishPublic; use logger\Logger; @@ -64,7 +65,7 @@ class File extends BaseObject */ function __construct( $objectid='' ) { - $this->storeValueAsBase64 = db()->conf['base64']; + $this->storeValueAsBase64 = DB::get()->conf['base64']; parent::__construct( $objectid ); $this->isFile = true; @@ -76,7 +77,7 @@ class File extends BaseObject * @return FileCache */ public function getCache() { - $cacheKey = array('db'=>db()->id,'file'=>$this->objectid,'publish'=> \util\ClassUtils::getSimpleClassName($this->publisher)); + $cacheKey = array('db'=>DB::get()->id,'file'=>$this->objectid,'publish'=> \util\ClassUtils::getSimpleClassName($this->publisher)); return new FileCache( $cacheKey,function() { return $this->loadValueFromDatabase(); @@ -108,7 +109,7 @@ class File extends BaseObject function getFileObjectIdsByExtension( $extension ) { global $SESS; - $db = db_connection(); + $db = \cms\base\DB::get(); $sqlquery = 'SELECT * FROM {{object}} '; @@ -141,7 +142,7 @@ class File extends BaseObject */ public static function getObjectIdsByExtension( $extension ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT {{file}}.objectid FROM {{file}} '. ' LEFT JOIN {{object}} '. @@ -189,7 +190,7 @@ class File extends BaseObject */ public function load() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT id,extension,size,filterid'. ' FROM {{file}}'. @@ -217,7 +218,7 @@ class File extends BaseObject */ function delete() { - $db = db_connection(); + $db = \cms\base\DB::get(); // Datei l?schen $sql = $db->sql( 'DELETE FROM {{file}} '. @@ -282,7 +283,7 @@ class File extends BaseObject */ public function save() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( <<<EOF UPDATE {{file}} SET @@ -340,7 +341,7 @@ EOF else $objectid = $this->objectid; - $sql = db()->sql( 'SELECT size,value'. + $sql = Db::sql( 'SELECT size,value'. ' FROM {{file}}'. ' WHERE objectid={objectid}' ); $sql->setInt( 'objectid', $objectid); @@ -368,7 +369,7 @@ EOF { $this->getCache()->invalidate(); - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'UPDATE {{file}}'. ' SET value={value}, '. @@ -402,10 +403,10 @@ EOF { parent::add(); - $sql = db()->sql('SELECT MAX(id) FROM {{file}}'); + $sql = Db::sql('SELECT MAX(id) FROM {{file}}'); $this->fileid = intval($sql->getOne())+1; - $sql = db()->sql('INSERT INTO {{file}}'. + $sql = Db::sql('INSERT INTO {{file}}'. ' (id,objectid,extension,size,value)'. " VALUES( {fileid},{objectid},{extension},0,'' )" ); $sql->setInt ('fileid' ,$this->fileid ); @@ -442,7 +443,7 @@ EOF public function updateType() { - $stmt = db()->sql(<<<SQL + $stmt = Db::sql(<<<SQL UPDATE {{object}} SET typeid = {typeid} WHERE id={objectid} diff --git a/modules/cms/model/Folder.class.php b/modules/cms/model/Folder.class.php @@ -2,6 +2,7 @@ namespace cms\model; +use cms\base\DB as Db; use cms\generator\Publish; use Exception; @@ -31,7 +32,7 @@ class Folder extends BaseObject { parent::add(); - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT MAX(id) FROM {{folder}}'); $this->folderid = intval($sql->getOne())+1; @@ -49,7 +50,7 @@ class Folder extends BaseObject public function hasFilename( $filename ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT COUNT(*) FROM {{object}}'.' WHERE parentid={objectid} AND filename={filename}'); @@ -66,7 +67,7 @@ class Folder extends BaseObject public function load() { -// $db = db_connection(); +// $db = \cms\base\DB::get(); // // $sql = $db->sql('SELECT * FROM {{folder}} WHERE objectid={objectid}'); // $sql->setInt('objectid',$this->objectid); @@ -89,7 +90,7 @@ class Folder extends BaseObject function setOrderId( $orderid ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('UPDATE {{folder}} '. ' SET orderid={orderid}'. @@ -105,7 +106,7 @@ class Folder extends BaseObject // function getSubFolders() // { // global $SESS; -// $db = db_connection(); +// $db = \cms\base\DB::get(); // // $sql = $db->sql('SELECT id FROM {{folder}}'. // ' WHERE parentid={folderid}'. @@ -121,7 +122,7 @@ class Folder extends BaseObject // Liest alle Objekte in diesem Ordner function getObjectIds() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT id FROM {{object}}'. ' WHERE parentid={objectid}'. @@ -139,7 +140,7 @@ class Folder extends BaseObject */ function getObjects() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT {{object}}.*,{{name}}.name,{{name}}.descr'. ' FROM {{object}}'. @@ -166,7 +167,7 @@ class Folder extends BaseObject // Liest alle Objekte in diesem Ordner function getObjectIdsByType() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT id FROM {{object}}'. ' WHERE parentid={objectid}'. @@ -180,7 +181,7 @@ class Folder extends BaseObject // Liest alle Objekte in diesem Ordner sortiert nach dem Namen (nicht Dateinamen!) function getChildObjectIdsByName() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT {{object}}.id FROM {{object}}'. ' LEFT JOIN {{name}} ON {{object}}.id={{name}}.objectid AND {{name}}.languageid={languageid} '. @@ -195,7 +196,7 @@ class Folder extends BaseObject // Liest alle Objekte in diesem Ordner function getObjectIdsByLastChange() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT id FROM {{object}}'. ' WHERE parentid={objectid}'. @@ -209,7 +210,7 @@ class Folder extends BaseObject function getObjectIdByFileName( $filename ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT id FROM {{object}}'. ' WHERE parentid={objectid}'. @@ -224,7 +225,7 @@ class Folder extends BaseObject public function getPages() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT id FROM {{object}} '. ' WHERE parentid={objectid} AND typeid='.BaseObject::TYPEID_PAGE. @@ -242,7 +243,7 @@ class Folder extends BaseObject */ public function getFirstPage() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT id FROM {{object}} '. ' WHERE parentid={objectid}'. @@ -268,7 +269,7 @@ class Folder extends BaseObject */ function getFirstPageOrLink() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT id FROM {{object}} '. ' WHERE parentid={objectid}'. @@ -289,7 +290,7 @@ class Folder extends BaseObject function getLastPageOrLink() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT id FROM {{object}} '. ' WHERE parentid={objectid}'. @@ -314,7 +315,7 @@ class Folder extends BaseObject */ function getFiles() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT id FROM {{object}} '. ' WHERE parentid={objectid} AND typeid='.BaseObject::TYPEID_FILE. @@ -333,7 +334,7 @@ class Folder extends BaseObject */ function getFileFilenames() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT id,filename FROM {{object}} '. ' WHERE parentid={objectid} AND typeid='.BaseObject::TYPEID_FILE. @@ -346,7 +347,7 @@ class Folder extends BaseObject function getLinks() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT id FROM {{object}} '. ' WHERE parentid={objectid} AND typeid='.BaseObject::TYPEID_LINK. @@ -476,7 +477,7 @@ class Folder extends BaseObject // public function subfolder() { - $stmt = db()->sql(<<<SQL + $stmt = Db::sql(<<<SQL SELECT id FROM {{object}} WHERE parentid={objectid} AND typeid={typeid} @@ -496,7 +497,7 @@ SQL public function getSubfolderFilenames() { - $stmt = db()->sql(<<<SQL + $stmt = Db::sql(<<<SQL SELECT id,filename FROM {{object}} WHERE parentid={objectid} AND typeid={typeid} ORDER BY orderid ASC @@ -547,7 +548,7 @@ SQL */ function delete() { - $db = db_connection(); + $db = \cms\base\DB::get(); // Nur loeschen, wenn es keine Unterelemente gibt if ( count( $this->getObjectIds() ) == 0 ) @@ -579,7 +580,7 @@ SQL */ function deleteAll() { - $db = db_connection(); + $db = \cms\base\DB::get(); // L?schen aller Unterordner foreach( $this->subfolder() as $folderid ) @@ -659,7 +660,7 @@ SQL public function getLastChanges() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( <<<SQL SELECT {{object}}.id as objectid, diff --git a/modules/cms/model/Group.class.php b/modules/cms/model/Group.class.php @@ -16,7 +16,7 @@ namespace cms\model; // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - +use cms\base\DB as Db; /** @@ -54,7 +54,7 @@ class Group extends ModelBase */ public static function getAll() { - $stmt = db()->sql( 'SELECT id,name FROM {{group}}' ); + $stmt = Db::sql( 'SELECT id,name FROM {{group}}' ); return $stmt->getAssoc(); } @@ -65,7 +65,7 @@ class Group extends ModelBase */ public function load() { - $sql = db()->sql( 'SELECT * FROM {{group}}'. + $sql = Db::sql( 'SELECT * FROM {{group}}'. ' WHERE id={groupid}' ); $sql->setInt( 'groupid',$this->groupid ); @@ -85,7 +85,7 @@ class Group extends ModelBase */ public static function loadWithName( $name ) { - $sql = db()->sql( 'SELECT * FROM {{group}}'. + $sql = Db::sql( 'SELECT * FROM {{group}}'. ' WHERE name={name}' ); $sql->setString('name',$name ); @@ -113,7 +113,7 @@ class Group extends ModelBase $this->name = lang('GROUP').' '.$this->groupid; // Gruppe speichern - $sql = db()->sql( 'UPDATE {{group}} '. + $sql = Db::sql( 'UPDATE {{group}} '. 'SET name = {name} '. 'WHERE id={groupid}' ); $sql->setString( 'name' ,$this->name ); @@ -138,7 +138,7 @@ class Group extends ModelBase // Gruppe hinzufuegen function add( $name = '' ) { - $db = db_connection(); + $db = \cms\base\DB::get(); if ( $name != '' ) $this->name = $name; @@ -160,7 +160,7 @@ class Group extends ModelBase // Gruppe entfernen function delete() { - $db = db_connection(); + $db = \cms\base\DB::get(); // Berechtigungen zu dieser Gruppe loeschen $sql = $db->sql( 'DELETE FROM {{acl}} '. @@ -189,7 +189,7 @@ class Group extends ModelBase */ function getUsers() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT {{user}}.id,{{user}}.name FROM {{user}} '. 'LEFT JOIN {{usergroup}} ON {{usergroup}}.userid={{user}}.id '. @@ -203,7 +203,7 @@ class Group extends ModelBase // Benutzer ermitteln, die *nicht* Mitglied dieser Gruppe sind function getOtherUsers() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT {{user}}.id,{{user}}.name FROM {{user}}'. ' LEFT JOIN {{usergroup}} ON {{usergroup}}.userid={{user}}.id AND {{usergroup}}.groupid={groupid}'. @@ -217,7 +217,7 @@ class Group extends ModelBase // Benutzer einer Gruppe hinzufuegen function addUser( $userid ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT MAX(id) FROM {{usergroup}}'); $usergroupid = intval($sql->getOne())+1; @@ -237,7 +237,7 @@ class Group extends ModelBase // Benutzer aus Gruppe entfernen function delUser( $userid ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'DELETE FROM {{usergroup}} '. ' WHERE userid={userid} AND groupid={groupid}' ); @@ -252,7 +252,7 @@ class Group extends ModelBase function getRights() { global $SESS,$conf_php; - $db = db_connection(); + $db = \cms\base\DB::get(); $var = array(); // Alle Projekte lesen @@ -310,7 +310,7 @@ class Group extends ModelBase function addRight( $data ) { global $REQ,$SESS; - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('INSERT INTO {{acl}} '. '(userid,groupid,folderid,`read`,`write`,`create`,`delete`,publish) '. @@ -341,7 +341,7 @@ class Group extends ModelBase */ function getAllAcls() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT {{acl}}.*,{{object}}.projectid,{{language}}.name AS languagename FROM {{acl}}'. ' LEFT JOIN {{object}} '. ' ON {{object}}.id={{acl}}.objectid '. diff --git a/modules/cms/model/Language.class.php b/modules/cms/model/Language.class.php @@ -16,6 +16,7 @@ namespace cms\model; // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +use cms\base\DB as Db; /** @@ -67,7 +68,7 @@ class Language extends ModelBase */ function available( $id ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT 1 FROM {{language}} '. ' WHERE id={id}'); @@ -84,7 +85,7 @@ class Language extends ModelBase */ public function load() { - $stmt = db()->sql( 'SELECT * FROM {{language}}'. + $stmt = Db::sql( 'SELECT * FROM {{language}}'. ' WHERE id={languageid}' ); $stmt->setInt( 'languageid',$this->languageid ); @@ -106,7 +107,7 @@ class Language extends ModelBase */ public function save() { - $db = db_connection(); + $db = \cms\base\DB::get(); // Gruppe speichern $sql = $db->sql( 'UPDATE {{language}} '. @@ -141,7 +142,7 @@ class Language extends ModelBase { global $SESS; global $iso; - $db = db_connection(); + $db = \cms\base\DB::get(); if ( $isocode != '' ) { @@ -173,7 +174,7 @@ class Language extends ModelBase function setDefault() { global $SESS; - $db = db_connection(); + $db = \cms\base\DB::get(); // Zuerst alle auf nicht-Standard setzen $sql = $db->sql( 'UPDATE {{language}} '. @@ -194,7 +195,7 @@ class Language extends ModelBase // Sprache entfernen function delete() { - $db = db_connection(); + $db = \cms\base\DB::get(); // Sprache l?schen // $sql = $db->sql( 'SELECT COUNT(*) FROM {{language}} WHERE projectid={projectid}' ); diff --git a/modules/cms/model/Link.class.php b/modules/cms/model/Link.class.php @@ -2,6 +2,8 @@ namespace cms\model; +use cms\base\DB as Db; + /** * Darstellen einer Verkn�pfung. Eine Verkn�pfung kann auf eine Objekt oder auf * eine beliebige Url zeigen @@ -31,7 +33,7 @@ class Link extends BaseObject */ public function load() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT *'. ' FROM {{link}}'. @@ -53,7 +55,7 @@ class Link extends BaseObject */ public function delete() { - $db = db_connection(); + $db = \cms\base\DB::get(); // Verkn�pfung l�schen $sql = $db->sql( 'DELETE FROM {{link}} '. @@ -71,7 +73,7 @@ class Link extends BaseObject */ public function save() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('UPDATE {{link}} SET '. ' link_objectid = {linkobjectid}'. @@ -107,10 +109,10 @@ class Link extends BaseObject { parent::add(); - $stmt = db()->sql('SELECT MAX(id) FROM {{link}}'); + $stmt = Db::sql('SELECT MAX(id) FROM {{link}}'); $this->linkid = intval($stmt->getOne())+1; - $stmt = db()->sql('INSERT INTO {{link}}'. + $stmt = Db::sql('INSERT INTO {{link}}'. ' (id,objectid,link_objectid)'. ' VALUES( {linkid},{objectid},{linkobjectid} )' ); $stmt->setInt ('linkid' ,$this->linkid ); diff --git a/modules/cms/model/Model.class.php b/modules/cms/model/Model.class.php @@ -54,7 +54,7 @@ class Model extends ModelBase */ function available( $id ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT 1 FROM {{projectmodel}} '. ' WHERE id={id}'); @@ -71,7 +71,7 @@ class Model extends ModelBase */ function load() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT * FROM {{projectmodel}}'. ' WHERE id={modelid}' ); @@ -93,7 +93,7 @@ class Model extends ModelBase */ function save() { - $db = db_connection(); + $db = \cms\base\DB::get(); // Gruppe speichern $sql = $db->sql( 'UPDATE {{projectmodel}} '. @@ -132,7 +132,7 @@ class Model extends ModelBase if ( $name != '' ) $this->name = $name; - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT MAX(id) FROM {{projectmodel}}'); $this->modelid = intval($sql->getOne())+1; @@ -155,7 +155,7 @@ class Model extends ModelBase function setDefault() { global $SESS; - $db = db_connection(); + $db = \cms\base\DB::get(); // Zuerst alle auf nicht-Standard setzen $sql = $db->sql( 'UPDATE {{projectmodel}} '. @@ -180,7 +180,7 @@ class Model extends ModelBase */ function delete() { - $db = db_connection(); + $db = \cms\base\DB::get(); // Vorlagen zu dieseem Modell loeschen $sql = $db->sql( <<<SQL diff --git a/modules/cms/model/Name.class.php b/modules/cms/model/Name.class.php @@ -54,7 +54,7 @@ namespace cms\model { */ public function load() { - $db = db_connection(); + $db = \cms\base\DB::get(); $stmt = $db->sql( <<<SQL SELECT id,objectid,name,descr,languageid @@ -98,7 +98,7 @@ SQL */ public function save() { - $db = db_connection(); + $db = \cms\base\DB::get(); if ( intval($this->nameid) > 0) { diff --git a/modules/cms/model/Page.class.php b/modules/cms/model/Page.class.php @@ -16,6 +16,7 @@ namespace cms\model; // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +use cms\base\DB as Db; use cms\generator\PageContext; use Exception; use util\exception\GeneratorException; @@ -83,7 +84,7 @@ class Page extends BaseObject */ function getObjectIdFromPageId( $pageid ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT objectid FROM {{page}} '. ' WHERE id={pageid}' ); @@ -101,7 +102,7 @@ class Page extends BaseObject */ public static function getPageIdFromObjectId( $objectid ) { - $sql = db()->sql( 'SELECT id FROM {{page}} '. + $sql = Db::sql( 'SELECT id FROM {{page}} '. ' WHERE objectid={objectid}' ); $sql->setInt('objectid',$objectid); @@ -146,10 +147,10 @@ class Page extends BaseObject { parent::add(); // Hinzuf?gen von Objekt (dabei wird Objekt-ID ermittelt) - $sql = db()->sql('SELECT MAX(id) FROM {{page}}'); + $sql = Db::sql('SELECT MAX(id) FROM {{page}}'); $this->pageid = intval($sql->getOne())+1; - $sql = db()->sql(<<<SQL + $sql = Db::sql(<<<SQL INSERT INTO {{page}} (id,objectid,templateid) VALUES( {pageid},{objectid},{templateid} ) @@ -168,7 +169,7 @@ SQL */ function load() { - $sql = db()->sql( 'SELECT * FROM {{page}} '. + $sql = Db::sql( 'SELECT * FROM {{page}} '. ' WHERE objectid={objectid}' ); $sql->setInt('objectid',$this->objectid); $row = $sql->getRow(); @@ -185,7 +186,7 @@ SQL function delete() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'DELETE FROM {{value}} '. ' WHERE pageid={pageid}' ); @@ -238,7 +239,7 @@ SQL function save() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('UPDATE {{page}}'. ' SET templateid ={templateid}'. @@ -256,7 +257,7 @@ SQL { $oldTemplateId = $this->templateid; - $db = db_connection(); + $db = \cms\base\DB::get(); // Template-id dieser Seite aendern $this->templateid = $newTemplateId; diff --git a/modules/cms/model/Project.class.php b/modules/cms/model/Project.class.php @@ -99,7 +99,7 @@ class Project extends ModelBase */ public function isAvailable($id ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT 1 FROM {{project}} '. ' WHERE id={id}'); @@ -115,7 +115,7 @@ class Project extends ModelBase */ public static function getAllProjects() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT id,name FROM {{project}} '. ' ORDER BY name' ); @@ -126,7 +126,7 @@ class Project extends ModelBase // Liefert alle verf?gbaren Projekt-Ids public function getAllProjectIds() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT id FROM {{project}} '. ' ORDER BY name' ); @@ -141,7 +141,7 @@ class Project extends ModelBase */ public function getLanguages() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT id,name FROM {{language}}'. ' WHERE projectid={projectid} '. @@ -165,7 +165,7 @@ class Project extends ModelBase */ public function getModels() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT id,name FROM {{projectmodel}}'. ' WHERE projectid= {projectid} '. @@ -184,7 +184,7 @@ class Project extends ModelBase public function getTemplateIds() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT id FROM {{template}}'. ' WHERE projectid= {projectid} ' ); @@ -196,7 +196,7 @@ class Project extends ModelBase public function getTemplates() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT id,name FROM {{template}}'. ' WHERE projectid= {projectid} ' ); @@ -216,7 +216,7 @@ class Project extends ModelBase */ public function getRootObjectId() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT id FROM {{object}}'. ' WHERE parentid IS NULL'. @@ -236,7 +236,7 @@ class Project extends ModelBase */ public function load() { - $sql = db()->sql( 'SELECT * FROM {{project}} '. + $sql = Db::sql( 'SELECT * FROM {{project}} '. ' WHERE id={projectid}' ); $sql->setInt( 'projectid',$this->projectid ); @@ -325,7 +325,7 @@ SQL */ public function add() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT MAX(id) FROM {{project}}'); $this->projectid = intval($sql->getOne())+1; @@ -390,7 +390,7 @@ SQL // Projekt aus Datenbank entfernen public function delete() { - $db = db_connection(); + $db = \cms\base\DB::get(); // Root-Ordner rekursiv samt Inhalten loeschen $folder = new Folder( $this->getRootObjectId() ); @@ -434,7 +434,7 @@ SQL { // ORDER BY deswegen, damit immer mind. eine Sprache // gelesen wird - $sql = db()->sql( 'SELECT id FROM {{language}} '. + $sql = \cms\base\Db::sql( 'SELECT id FROM {{language}} '. ' WHERE projectid={projectid}'. ' ORDER BY is_default DESC, name ASC' ); @@ -448,7 +448,7 @@ SQL { // ORDER BY deswegen, damit immer mind. eine Sprache // gelesen wird - $sql = db()->sql( 'SELECT id FROM {{projectmodel}} '. + $sql = \cms\base\Db::sql( 'SELECT id FROM {{projectmodel}} '. ' WHERE projectid={projectid}'. ' ORDER BY is_default DESC' ); $sql->setInt('projectid',$this->projectid ); @@ -499,7 +499,7 @@ SQL $this->log = array(); // Ordnerstruktur prüfen. - $stmt = db()->sql( <<<EOF + $stmt = \cms\base\Db::sql( <<<EOF SELECT thistab.id FROM {{object}} AS thistab LEFT JOIN {{object}} AS parenttab ON parenttab.id = thistab.parentid @@ -530,7 +530,7 @@ EOF // Prüfe, ob die Verbindung Projekt->Template->Templatemodell->Projectmodell->Projekt konsistent ist. - $stmt = db()->sql( <<<EOF + $stmt = \cms\base\Db::sql( <<<EOF SELECT DISTINCT projectid FROM {{projectmodel}} WHERE id IN (SELECT projectmodelid from {{templatemodel}} WHERE templateid in (SELECT id from {{template}} WHERE projectid={projectid})) EOF ); @@ -580,7 +580,7 @@ EOF global $conf; $zeit = date('Y-m-d\TH:i:sO'); - $db_src = db_connection(); + $db_src = \cms\base\DB::get(); $db_dest = new Database( $conf['database'][$dbid_destination] ); $db_dest->id = $dbid_destination; $db_dest->start(); @@ -782,7 +782,7 @@ EOF */ public function countObjects() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT COUNT(*) FROM {{object}} '. ' WHERE projectid = {projectid}' ); $sql->setInt( 'projectid', $this->projectid ); @@ -799,7 +799,7 @@ EOF */ public function size() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( <<<SQL SELECT SUM(size) FROM {{file}} @@ -840,7 +840,7 @@ SQL public function getMyLastChanges() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( <<<SQL @@ -880,7 +880,7 @@ SQL */ public static function getAllLastChanges() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( <<<SQL SELECT {{object}}.id as objectid, @@ -914,7 +914,7 @@ SQL public function getLastChanges() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( <<<SQL SELECT {{object}}.id as objectid, @@ -956,7 +956,7 @@ SQL */ public function getAllObjectIds( $types=array('folder','page','link','file','image','url','text') ) { - $stmt = db()->sql( <<<SQL + $stmt = \cms\base\Db::sql( <<<SQL SELECT id FROM {{object}} WHERE projectid={projectid} AND ( typeid ={is_folder} @@ -990,7 +990,7 @@ SQL */ public function getAllFolders() { - $db = db_connection(); + $db = \cms\base\DB::get(); $stmt = $db->sql('SELECT id FROM {{object}}'. ' WHERE typeid='.BaseObject::TYPEID_FOLDER. diff --git a/modules/cms/model/Template.class.php b/modules/cms/model/Template.class.php @@ -61,7 +61,7 @@ class Template extends ModelBase */ function load() { - $stmt = db()->sql( 'SELECT * FROM {{template}}'. + $stmt = Db::sql( 'SELECT * FROM {{template}}'. ' WHERE id={templateid}' ); $stmt->setInt( 'templateid',$this->templateid ); $row = $stmt->getRow(); @@ -106,7 +106,7 @@ class Template extends ModelBase */ public static function getTemplateIdsByValue( $text ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $stmt = $db->sql( 'SELECT templateid FROM {{templatemodel}}'. ' WHERE text LIKE {text} ' ); @@ -124,7 +124,7 @@ class Template extends ModelBase */ function getElementIds() { - $db = db_connection(); + $db = \cms\base\DB::get(); $stmt = $db->sql( 'SELECT id FROM {{element}}'. ' WHERE templateid={templateid}'. @@ -143,7 +143,7 @@ class Template extends ModelBase function getElements() { $list = array(); - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT * FROM {{element}}'. ' WHERE templateid={templateid}'. @@ -173,7 +173,7 @@ class Template extends ModelBase $e = new Element(); $readonlyList = implode(',',Element::$readonlyElementTypeIds); - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( <<<SQL SELECT * FROM {{element}} @@ -206,7 +206,7 @@ SQL */ public function getElementNames() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT id,name FROM {{element}}'. ' WHERE templateid={templateid}'. @@ -246,7 +246,7 @@ SQL if ( !empty($name) ) $this->name = $name; - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT MAX(id) FROM {{template}}'); $this->templateid = intval($sql->getOne())+1; @@ -270,7 +270,7 @@ SQL */ function getDependentObjectIds() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT objectid FROM {{page}}'. ' WHERE templateid={templateid}' ); @@ -287,7 +287,7 @@ SQL */ function delete() { - $db = db_connection(); + $db = \cms\base\DB::get(); foreach( $this->getElementIds() as $elementid ) { diff --git a/modules/cms/model/TemplateModel.class.php b/modules/cms/model/TemplateModel.class.php @@ -51,7 +51,7 @@ class TemplateModel extends ModelBase */ function load() { - $db = db_connection(); + $db = \cms\base\DB::get(); $stmt = $db->sql( 'SELECT * FROM {{templatemodel}}'. ' WHERE templateid={templateid}'. @@ -137,7 +137,7 @@ class TemplateModel extends ModelBase */ public function delete() { - $db = db_connection(); + $db = \cms\base\DB::get(); $stmt = $db->sql( 'DELETE FROM {{templatemodel}}'. ' WHERE id={id}' ); diff --git a/modules/cms/model/Url.class.php b/modules/cms/model/Url.class.php @@ -1,6 +1,8 @@ <?php namespace cms\model; +use cms\base\DB as Db; + /** * Darstellen einer URL. An URL points to an string-based URL. * @@ -23,7 +25,7 @@ class Url extends BaseObject // Lesen der Verkn�pfung aus der Datenbank function load() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT *'. ' FROM {{url}}'. @@ -45,7 +47,7 @@ class Url extends BaseObject */ function delete() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'DELETE FROM {{url}} '. ' WHERE objectid={objectid}' ); @@ -61,7 +63,7 @@ class Url extends BaseObject public function save() { global $SESS; - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('UPDATE {{url}} SET '. ' url = {url}'. @@ -94,10 +96,10 @@ class Url extends BaseObject { parent::add(); - $sql = db()->sql('SELECT MAX(id) FROM {{url}}'); + $sql = Db::sql('SELECT MAX(id) FROM {{url}}'); $this->urlid = intval($sql->getOne())+1; - $sql = db()->sql('INSERT INTO {{url}}'. + $sql = Db::sql('INSERT INTO {{url}}'. ' (id,objectid,url)'. ' VALUES( {urlid},{objectid},{url} )' ); $sql->setInt ('urlid' ,$this->urlid ); diff --git a/modules/cms/model/User.class.php b/modules/cms/model/User.class.php @@ -18,6 +18,7 @@ namespace cms\model; // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +use cms\base\DB as Db; use security\Password; @@ -74,7 +75,7 @@ class User extends ModelBase */ public static function listAll() { - $sql = db()->sql( 'SELECT id,name '. + $sql = Db::sql( 'SELECT id,name '. ' FROM {{user}}'. ' ORDER BY name' ); @@ -90,7 +91,7 @@ class User extends ModelBase public static function getAllUsers() { $list = array(); - $sql = db()->sql( 'SELECT * '. + $sql = Db::sql( 'SELECT * '. ' FROM {{user}}'. ' ORDER BY name' ); @@ -123,7 +124,7 @@ class User extends ModelBase */ public function updateLoginTimestamp() { - $stmt = db()->sql( <<<SQL + $stmt = Db::sql( <<<SQL UPDATE {{user}} SET last_login={time} WHERE id={userid} @@ -163,7 +164,7 @@ SQL */ public function getReadableProjects() { - $db = db_connection(); + $db = \cms\base\DB::get(); if ( $this->isAdmin ) { @@ -216,10 +217,10 @@ SQL $tokenHash = Password::hash($token,Password::ALGO_SHA1); - $stmt = db()->sql( 'SELECT max(id) FROM {{auth}}'); + $stmt = Db::sql( 'SELECT max(id) FROM {{auth}}'); $count = $stmt->getOne(); - $stmt = db()->sql( <<<SQL + $stmt = Db::sql( <<<SQL INSERT INTO {{auth}} (id,userid,selector,token,token_algo,expires,create_date,platform,name) VALUES( {id},{userid},{selector},{token},{token_algo},{expires},{create_date},{platform},{name} ) SQL @@ -251,7 +252,7 @@ SQL */ function deleteLoginToken( $selector ) { - $stmt = db()->sql( <<<SQL + $stmt = Db::sql( <<<SQL DELETE FROM {{auth}} WHERE selector = {selector} SQL @@ -266,7 +267,7 @@ SQL */ public function load() { - $stmt = db()->sql( 'SELECT * FROM {{user}}'. + $stmt = Db::sql( 'SELECT * FROM {{user}}'. ' WHERE id={userid}' ); $stmt->setInt( 'userid',$this->userid ); $row = $stmt->getRow(); @@ -288,7 +289,7 @@ SQL public static function loadWithName( $name ) { // Benutzer �ber Namen suchen - $sql = db()->sql( 'SELECT id FROM {{user}}'. + $sql = Db::sql( 'SELECT id FROM {{user}}'. ' WHERE name={name}' ); //Html::debug($sql); $sql->setString( 'name',$name ); @@ -375,7 +376,7 @@ SQL */ function getUserName( $userid ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT name FROM {{user}}'. ' WHERE id={userid}' ); @@ -394,7 +395,7 @@ SQL */ function save() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( <<<SQL UPDATE {{user}} @@ -442,7 +443,7 @@ SQL if ( $name != '' ) $this->name = $name; - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT MAX(id) FROM {{user}}'); $this->userid = intval($sql->getOne())+1; @@ -475,7 +476,7 @@ SQL if ( count($groupNames) == 0 ) return; // Nichts zu tun. - $db = db_connection(); + $db = \cms\base\DB::get(); $groupNames = "'".implode("','",$groupNames)."'"; $sql = $db->sql("SELECT id FROM {{group}} WHERE name IN($groupNames)"); @@ -503,7 +504,7 @@ SQL */ public function delete() { - $db = db_connection(); + $db = \cms\base\DB::get(); // "Erzeugt von" f�r diesen Benutzer entfernen. $sql = $db->sql( 'UPDATE {{object}} '. @@ -538,7 +539,7 @@ SQL $sql->setInt ('userid',$this->userid ); $sql->query(); - $stmt = db()->sql( <<<SQL + $stmt = Db::sql( <<<SQL DELETE FROM {{auth}} WHERE userid={userid} SQL @@ -576,7 +577,7 @@ SQL */ function setPassword( $password, $always=true ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'UPDATE {{user}} SET password_hash={password},password_algo={algo},password_expires={expires} '. 'WHERE id={userid}' ); @@ -616,7 +617,7 @@ SQL { if ( !is_array($this->groups) ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT {{group}}.id,{{group}}.name FROM {{group}} '. 'LEFT JOIN {{usergroup}} ON {{usergroup}}.groupid={{group}}.id '. @@ -635,7 +636,7 @@ SQL return array_keys( $this->getGroups() ); /* - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT groupid FROM {{usergroup}} '. 'WHERE userid={userid}' ); @@ -649,7 +650,7 @@ SQL // Gruppen ermitteln, in denen der Benutzer *nicht* Mitglied ist function getOtherGroups() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT {{group}}.id,{{group}}.name FROM {{group}}'. ' LEFT JOIN {{usergroup}} ON {{usergroup}}.groupid={{group}}.id AND {{usergroup}}.userid={userid}'. @@ -668,7 +669,7 @@ SQL */ function addGroup( $groupid ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql('SELECT MAX(id) FROM {{usergroup}}'); $usergroupid = intval($sql->getOne())+1; @@ -693,7 +694,7 @@ SQL */ function delGroup( $groupid ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'DELETE FROM {{usergroup}} '. ' WHERE userid={userid} AND groupid={groupid}' ); @@ -728,7 +729,7 @@ SQL $group_clause = $this->getGroupClause(); - $sql = db()->sql( 'SELECT {{acl}}.*,{{object}}.projectid,{{language}}.name AS languagename FROM {{acl}}'. + $sql = Db::sql( 'SELECT {{acl}}.*,{{object}}.projectid,{{language}}.name AS languagename FROM {{acl}}'. ' LEFT JOIN {{object}} '. ' ON {{object}}.id={{acl}}.objectid '. ' LEFT JOIN {{language}} '. @@ -764,7 +765,7 @@ SQL { throw new \DomainException('User.class::getRights()'); -// $db = db_connection(); +// $db = \cms\base\DB::get(); // $var = array(); // // // Alle Projekte lesen @@ -901,7 +902,7 @@ SQL */ function checkPassword( $password ) { - $db = db_connection(); + $db = \cms\base\DB::get(); // Laden des Benutzers aus der Datenbank, um Password-Hash zu ermitteln. $sql = $db->sql( 'SELECT * FROM {{user}}'. ' WHERE id={userid}' ); @@ -967,7 +968,7 @@ SQL */ public function getLastChanges() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( <<<SQL SELECT {{object}}.id as objectid, @@ -1029,7 +1030,7 @@ SQL $secret = Password::randomHexString(64); - $db = db_connection(); + $db = \cms\base\DB::get(); $stmt = $db->sql('UPDATE {{user}} SET otp_secret={secret} WHERE id={id}'); diff --git a/modules/cms/model/Value.class.php b/modules/cms/model/Value.class.php @@ -249,7 +249,7 @@ class Value extends ModelBase if ( $valueid != 0 ) $this->valueid = $valueid; - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT {{value}}.*,{{user}}.name as lastchange_username'. ' FROM {{value}}'. @@ -283,7 +283,7 @@ class Value extends ModelBase */ function getVersionList() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT {{value}}.*,{{user}}.name as lastchange_username'. ' FROM {{value}}'. @@ -327,7 +327,7 @@ class Value extends ModelBase */ function getCountVersions() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT COUNT(*) FROM {{value}}'. ' WHERE elementid ={elementid}'. @@ -343,7 +343,7 @@ class Value extends ModelBase function getLastChangeTime() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( <<<SQL @@ -368,7 +368,7 @@ SQL */ function release() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'UPDATE {{value}}'. ' SET publish=0'. @@ -399,7 +399,7 @@ SQL */ function save() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'UPDATE {{value}}'. ' SET active=0'. @@ -482,7 +482,7 @@ SQL { $limit = config('content','revision-limit'); - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( <<<SQL SELECT id FROM {{value}} @@ -549,7 +549,7 @@ SQL */ function delete() { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'DELETE * FROM {{value}}'. ' WHERE elementid ={elementid}'. ' AND pageid ={pageid}'. @@ -569,7 +569,7 @@ SQL */ function getObjectIdsByValue( $text ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT {{object}}.id FROM {{value}} '. ' LEFT JOIN {{page}} '. @@ -594,7 +594,7 @@ SQL function getObjectIdsByLastChangeUserId( $userid ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( 'SELECT {{object}}.id FROM {{value}} '. ' LEFT JOIN {{page}} '. @@ -619,7 +619,7 @@ SQL */ public static function getLastChangedObjectByUserId( $userid ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( <<<SQL SELECT {{object}}.id @@ -644,7 +644,7 @@ SQL */ public static function getLastChangedObjectInProjectByUserId( $projectid, $userid ) { - $db = db_connection(); + $db = \cms\base\DB::get(); $sql = $db->sql( <<<SQL SELECT {{object}}.id @@ -669,7 +669,7 @@ SQL */ function tmpfile() { - $db = db_connection(); + $db = \cms\base\DB::get(); $filename = \util\FileUtils::getTempFileName( ); return $filename; } diff --git a/modules/cms/ui/action/TitleAction.class.php b/modules/cms/ui/action/TitleAction.class.php @@ -2,6 +2,7 @@ namespace cms\action; +use cms\base\DB; use cms\model\Project; use cms\model\BaseObject; use cms\model\Language; @@ -55,7 +56,7 @@ class TitleAction extends Action $this->setTemplateVar('isLoggedIn',true ); - $db = db(); + $db = DB::get(); $this->setTemplateVar('dbname',$db->conf['name'].(readonly()?' ('.lang('readonly').')':'')); $this->setTemplateVar('dbid' ,$db->id); diff --git a/modules/util/Api.class.php b/modules/util/Api.class.php @@ -37,7 +37,7 @@ class Api function db() { - return db_connection(); + return \cms\base\DB::get(); } function pageid() diff --git a/modules/util/Http.class.php b/modules/util/Http.class.php @@ -18,6 +18,7 @@ namespace util; +use cms\base\DB; use logger\Logger; use withPraefixQuestionMark; @@ -394,7 +395,7 @@ class Http public static function serverError($message, $reason = '') { if (class_exists('util\Session')) { - $db = db(); + $db = DB::get(); if (is_object($db)) $db->rollback(); } diff --git a/modules/util/Macro.class.php b/modules/util/Macro.class.php @@ -17,6 +17,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. namespace util; +use cms\base\DB; use cms\generator\PageContext; use cms\model\BaseObject; use cms\model\Page; @@ -66,7 +67,7 @@ class Macro */ protected function db() { - return db(); + return DB::get(); } diff --git a/modules/util/cache/FileCache.class.php b/modules/util/cache/FileCache.class.php @@ -2,6 +2,7 @@ namespace util\cache; +use cms\base\DB; use util\FileUtils; @@ -31,7 +32,7 @@ class FileCache implements Cache { if ( !is_array($key)) $key = [ $key ]; - $key = array_merge([ db()->id ], $key); + $key = array_merge([ DB::get()->id ], $key); $filename = FileUtils::getTempDir() . '/'. self::CACHE_FILENAME_PREFIX; $filename .= array_reduce($key,function($carry,$item){