openrat-cms

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit 9143a3e34d050e433ac41aee6ceab653b2abc785
parent 27820ebb79c2f7fa914f27d10780d331e4ad9e8c
Author: Jan Dankert <devnull@localhost>
Date:   Wed,  4 Jan 2017 00:01:26 +0100

Tabellenpraefixe koennen nun einfacher und performanter ersetzt werden.

Diffstat:
auth/InternalAuth.class.php | 2+-
auth/LdapAuth.class.php | 2+-
auth/LdapUserDNAuth.class.php | 2+-
db/Statement.class.php | 7++++++-
model/Acl.class.php | 24++++++++++++------------
model/Element.class.php | 14+++++++-------
model/File.class.php | 26+++++++++++++-------------
model/Folder.class.php | 120++++++++++++++++++++++++++++++++++++++++----------------------------------------
model/Group.class.php | 66+++++++++++++++++++++++++++++++++---------------------------------
model/Language.class.php | 32++++++++++++++++----------------
model/Link.class.php | 10+++++-----
model/Model.class.php | 28++++++++++++++--------------
model/Object.class.php | 124++++++++++++++++++++++++++++++++++++++++----------------------------------------
model/Page.class.php | 26+++++++++++++-------------
model/Project.class.php | 150++++++++++++++++++++++++++++++++++++++++----------------------------------------
model/Template.class.php | 36++++++++++++++++++------------------
model/User.class.php | 124++++++++++++++++++++++++++++++++++++++++----------------------------------------
model/Value.class.php | 108++++++++++++++++++++++++++++++++++++++++----------------------------------------
18 files changed, 453 insertions(+), 448 deletions(-)

diff --git a/auth/InternalAuth.class.php b/auth/InternalAuth.class.php @@ -22,7 +22,7 @@ class InternalAuth implements Auth // Lesen des Benutzers aus der DB-Tabelle $sql = $db->sql( <<<SQL -SELECT * FROM {t_user} +SELECT * FROM {{user}} WHERE name={name} SQL ); diff --git a/auth/LdapAuth.class.php b/auth/LdapAuth.class.php @@ -10,7 +10,7 @@ class LdapAuth implements Auth // Lesen des Benutzers aus der DB-Tabelle $sql = $db->sql( <<<SQL -SELECT * FROM {t_user} +SELECT * FROM {{user}} WHERE name={name} SQL ); diff --git a/auth/LdapUserDNAuth.class.php b/auth/LdapUserDNAuth.class.php @@ -18,7 +18,7 @@ class LdapUserDNAuth implements Auth // Lesen des Benutzers aus der DB-Tabelle $sql = $db->sql( <<<SQL -SELECT * FROM {t_user} +SELECT * FROM {{user}} WHERE name={name} SQL ); diff --git a/db/Statement.class.php b/db/Statement.class.php @@ -59,6 +59,11 @@ class Statement */ public function Statement( $sql, $client,$dbid ) { + // Tabellen-Praefixe ergaenzen. + global $conf; + $sql = str_replace('{{',$conf['database'][$dbid]['prefix'],$sql); + $sql = str_replace('}}',$conf['database'][$dbid]['suffix'],$sql); + $this->client = $client; $this->sql = new Sql( $sql,$dbid ); } @@ -73,7 +78,7 @@ class Statement */ public function query( ) { - $this->execute(); + return $this->execute(); } diff --git a/model/Acl.class.php b/model/Acl.class.php @@ -195,12 +195,12 @@ class Acl { $db = db_connection(); - $sql = $db->sql( 'SELECT {t_acl}.*,{t_user}.name as username,{t_group}.name as groupname,{t_language}.name as languagename'. - ' FROM {t_acl} '. - ' LEFT JOIN {t_user} ON {t_user}.id = {t_acl}.userid '. - ' LEFT JOIN {t_group} ON {t_group}.id = {t_acl}.groupid '. - ' LEFT JOIN {t_language} ON {t_language}.id = {t_acl}.languageid '. - ' WHERE {t_acl}.id={aclid}' ); + $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 '. + ' LEFT JOIN {{language}} ON {{language}}.id = {{acl}}.languageid '. + ' WHERE {{acl}}.id={aclid}' ); $sql->setInt('aclid',$this->aclid); @@ -225,8 +225,8 @@ class Acl $db = db_connection(); $sql = $db->sql( 'SELECT * '. - ' FROM {t_acl} '. - ' WHERE {t_acl}.id={aclid}' ); + ' FROM {{acl}} '. + ' WHERE {{acl}}.id={aclid}' ); $sql->setInt('aclid',$this->aclid); @@ -377,7 +377,7 @@ class Acl { $db = db_connection(); - $sql = $db->sql( 'DELETE FROM {t_acl} '. + $sql = $db->sql( 'DELETE FROM {{acl}} '. ' WHERE id = {aclid} '. ' AND objectid= {objectid}' ); @@ -406,7 +406,7 @@ class Acl $language_comp = intval($this->languageid)>0?'=':'IS'; $sql = $db->sql( <<<SQL - SELECT id FROM {t_acl} + SELECT id FROM {{acl}} WHERE userid $user_comp {userid} AND groupid $group_comp {groupid} AND languageid $language_comp {languageid} AND @@ -464,11 +464,11 @@ SQL - $sql = $db->sql('SELECT MAX(id) FROM {t_acl}'); + $sql = $db->sql('SELECT MAX(id) FROM {{acl}}'); $this->aclid = intval($sql->getOne($sql))+1; $sql = $db->sql( <<<SQL - INSERT INTO {t_acl} + 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} ) SQL diff --git a/model/Element.class.php b/model/Element.class.php @@ -140,10 +140,10 @@ class Element { $db = db_connection(); - $sql = $db->sql('SELECT MAX(id) FROM {t_element}'); + $sql = $db->sql('SELECT MAX(id) FROM {{element}}'); $this->elementid = intval($sql->getOne($sql))+1; - $sql = $db->sql( 'INSERT INTO {t_element}'. + $sql = $db->sql( 'INSERT INTO {{element}}'. ' (id,templateid,name,descr,type,writable) '. " VALUES ( {elementid},{templateid},{name},{description},{type},{writable} ) " ); @@ -179,7 +179,7 @@ class Element { $db = db_connection(); $sql = $db->sql( <<<SQL -SELECT * FROM {t_element} +SELECT * FROM {{element}} WHERE id={elementid} SQL ); @@ -229,7 +229,7 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'UPDATE {t_element}'. + $sql = $db->sql( 'UPDATE {{element}}'. ' SET templateid = {templateid},'. ' name = {name},'. ' descr = {desc},'. @@ -292,7 +292,7 @@ SQL $this->type = $type; $db = db_connection(); - $sql = $db->sql( 'UPDATE {t_element}'. + $sql = $db->sql( 'UPDATE {{element}}'. ' SET type = {type}'. ' WHERE id={elementid}' ); @@ -329,7 +329,7 @@ SQL $this->deleteValues(); // Element l?schen - $sql = $db->sql('DELETE FROM {t_element} '. + $sql = $db->sql('DELETE FROM {{element}} '. ' WHERE id={elementid}' ); $sql->setInt( 'elementid',$this->elementid ); @@ -346,7 +346,7 @@ SQL $db = db_connection(); // Alle Inhalte mit diesem Element l?schen - $sql = $db->sql('DELETE FROM {t_value} '. + $sql = $db->sql('DELETE FROM {{value}} '. ' WHERE elementid={elementid}' ); $sql->setInt( 'elementid',$this->elementid ); $sql->query( $sql ); diff --git a/model/File.class.php b/model/File.class.php @@ -150,7 +150,7 @@ class File extends Object global $SESS; $db = db_connection(); - $sqlquery = 'SELECT * FROM {t_object} '; + $sqlquery = 'SELECT * FROM {{object}} '; if ( $extension != '' ) { @@ -183,11 +183,11 @@ class File extends Object { $db = db_connection(); - $sql = $db->sql( 'SELECT {t_file}.objectid FROM {t_file} '. - ' LEFT JOIN {t_object} '. - ' ON {t_object}.id={t_file}.objectid'. - ' WHERE {t_file}.extension={extension}'. - ' AND {t_object}.projectid={projectid}' ); + $sql = $db->sql( 'SELECT {{file}}.objectid FROM {{file}} '. + ' LEFT JOIN {{object}} '. + ' ON {{object}}.id={{file}}.objectid'. + ' WHERE {{file}}.extension={extension}'. + ' AND {{object}}.projectid={projectid}' ); $sql->setInt ( 'projectid',$this->projectid ); $sql->setString( 'extension',$extension ); @@ -425,7 +425,7 @@ class File extends Object $db = db_connection(); $sql = $db->sql( 'SELECT id,extension,size'. - ' FROM {t_file}'. + ' FROM {{file}}'. ' WHERE objectid={objectid}' ); $sql->setInt( 'objectid',$this->objectid ); $row = $sql->getRow( $sql ); @@ -450,7 +450,7 @@ class File extends Object $db = db_connection(); // Datei l?schen - $sql = $db->sql( 'DELETE FROM {t_file} '. + $sql = $db->sql( 'DELETE FROM {{file}} '. ' WHERE objectid={objectid}' ); $sql->setInt( 'objectid',$this->objectid ); $sql->query( $sql ); @@ -516,7 +516,7 @@ class File extends Object $db = db_connection(); $sql = $db->sql( <<<EOF -UPDATE {t_file} SET +UPDATE {{file}} SET size = {size}, extension = {extension} WHERE objectid={objectid} @@ -556,7 +556,7 @@ EOF $db = db_connection(); $sql = $db->sql( 'SELECT size,value'. - ' FROM {t_file}'. + ' FROM {{file}}'. ' WHERE objectid={objectid}' ); $sql->setInt( 'objectid',$this->objectid ); $row = $sql->getRow( $sql ); @@ -589,7 +589,7 @@ EOF $db = db_connection(); - $sql = $db->sql( 'UPDATE {t_file}'. + $sql = $db->sql( 'UPDATE {{file}}'. ' SET value={value}, '. ' size={size} '. ' WHERE objectid={objectid}' ); @@ -624,10 +624,10 @@ EOF $this->objectAdd(); - $sql = $db->sql('SELECT MAX(id) FROM {t_file}'); + $sql = $db->sql('SELECT MAX(id) FROM {{file}}'); $this->fileid = intval($sql->getOne($sql))+1; - $sql = $db->sql('INSERT INTO {t_file}'. + $sql = $db->sql('INSERT INTO {{file}}'. ' (id,objectid,extension,size,value)'. " VALUES( {fileid},{objectid},{extension},0,'' )" ); $sql->setInt ('fileid' ,$this->fileid ); diff --git a/model/Folder.class.php b/model/Folder.class.php @@ -50,10 +50,10 @@ class Folder extends Object $db = db_connection(); - $sql = $db->sql('SELECT MAX(id) FROM {t_folder}'); + $sql = $db->sql('SELECT MAX(id) FROM {{folder}}'); $this->folderid = intval($sql->getOne($sql))+1; - $sql = $db->sql('INSERT INTO {t_folder}'. + $sql = $db->sql('INSERT INTO {{folder}}'. ' (id,objectid)'. ' VALUES( {folderid},{objectid} )' ); $sql->setInt ('folderid' ,$this->folderid ); @@ -69,7 +69,7 @@ class Folder extends Object global $SESS; $db = db_connection(); - $sql = $db->sql('SELECT id FROM {t_object}'. + $sql = $db->sql('SELECT id FROM {{object}}'. ' WHERE parentid IS NULL'. ' AND is_folder=1'. ' AND projectid={projectid}' ); @@ -94,7 +94,7 @@ class Folder extends Object { $db = db_connection(); - $sql = $db->sql('SELECT COUNT(*) FROM {t_object}'.' WHERE parentid={objectid} AND filename={filename}'); + $sql = $db->sql('SELECT COUNT(*) FROM {{object}}'.' WHERE parentid={objectid} AND filename={filename}'); if ( intval($this->objectid)== 0 ) $sql->setNull('objectid'); @@ -111,7 +111,7 @@ class Folder extends Object { // $db = db_connection(); // -// $sql = $db->sql('SELECT * FROM {t_folder} WHERE objectid={objectid}'); +// $sql = $db->sql('SELECT * FROM {{folder}} WHERE objectid={objectid}'); // $sql->setInt('objectid',$this->objectid); // // $row = $sql->getRow( $sql ); @@ -134,7 +134,7 @@ class Folder extends Object { $db = db_connection(); - $sql = $db->sql('UPDATE {t_folder} '. + $sql = $db->sql('UPDATE {{folder}} '. ' SET orderid={orderid}'. ' WHERE id={folderid}'); $sql->setInt('folderid',$this->folderid); @@ -150,7 +150,7 @@ class Folder extends Object // global $SESS; // $db = db_connection(); // -// $sql = $db->sql('SELECT id FROM {t_folder}'. +// $sql = $db->sql('SELECT id FROM {{folder}}'. // ' WHERE parentid={folderid}'. // ' AND projectid={projectid}'. // ' ORDER BY orderid ASC' ); @@ -166,7 +166,7 @@ class Folder extends Object { $db = db_connection(); - $sql = $db->sql('SELECT id FROM {t_object}'. + $sql = $db->sql('SELECT id FROM {{object}}'. ' WHERE parentid={objectid}'. ' ORDER BY orderid ASC' ); $sql->setInt('objectid' ,$this->objectid ); @@ -184,10 +184,10 @@ class Folder extends Object { $db = db_connection(); - $sql = $db->sql('SELECT {t_object}.*,{t_name}.name,{t_name}.descr'. - ' FROM {t_object}'. - ' LEFT JOIN {t_name} '. - ' ON {t_object}.id={t_name}.objectid AND {t_name}.languageid={languageid} '. + $sql = $db->sql('SELECT {{object}}.*,{{name}}.name,{{name}}.descr'. + ' FROM {{object}}'. + ' LEFT JOIN {{name}} '. + ' ON {{object}}.id={{name}}.objectid AND {{name}}.languageid={languageid} '. ' WHERE parentid={objectid}'. ' ORDER BY orderid ASC' ); $sql->setInt('languageid',$this->languageid ); @@ -211,7 +211,7 @@ class Folder extends Object { $db = db_connection(); - $sql = $db->sql('SELECT id FROM {t_object}'. + $sql = $db->sql('SELECT id FROM {{object}}'. ' WHERE parentid={objectid}'. ' ORDER BY is_link,is_page,is_file,is_folder,orderid ASC' ); $sql->setInt('projectid',$this->projectid ); @@ -226,10 +226,10 @@ class Folder extends Object { $db = db_connection(); - $sql = $db->sql('SELECT {t_object}.id FROM {t_object}'. - ' LEFT JOIN {t_name} ON {t_object}.id={t_name}.objectid AND {t_name}.languageid={languageid} '. + $sql = $db->sql('SELECT {{object}}.id FROM {{object}}'. + ' LEFT JOIN {{name}} ON {{object}}.id={{name}}.objectid AND {{name}}.languageid={languageid} '. ' WHERE parentid={objectid}'. - ' ORDER BY {t_name}.name,{t_object}.filename ASC'); + ' ORDER BY {{name}}.name,{{object}}.filename ASC'); $sql->setInt('objectid' , $this->objectid ); $sql->setInt('languageid', $this->languageid); return( $sql->getCol( $sql ) ); @@ -241,7 +241,7 @@ class Folder extends Object { $db = db_connection(); - $sql = $db->sql('SELECT id FROM {t_object}'. + $sql = $db->sql('SELECT id FROM {{object}}'. ' WHERE parentid={objectid}'. ' ORDER BY lastchange_date,orderid ASC' ); $sql->setInt('projectid',$this->projectid ); @@ -293,7 +293,7 @@ class Folder extends Object { $db = db_connection(); - $sql = $db->sql('SELECT id FROM {t_object}'. + $sql = $db->sql('SELECT id FROM {{object}}'. ' WHERE parentid={objectid}'. ' AND filename={filename}' ); $sql->setInt ('objectid' ,$this->objectid ); @@ -318,7 +318,7 @@ class Folder extends Object global $SESS; $db = db_connection(); - $sql = $db->sql('SELECT id FROM {t_object}'. + $sql = $db->sql('SELECT id FROM {{object}}'. ' WHERE projectid={projectid}'. ' AND ( is_folder={is_folder}' . ' OR is_file ={is_file}' . @@ -351,7 +351,7 @@ class Folder extends Object global $SESS; $db = db_connection(); - $sql = $db->sql('SELECT id FROM {t_object}'. + $sql = $db->sql('SELECT id FROM {{object}}'. ' WHERE parentid IS NULL'. ' AND projectid={projectid}' ); @@ -368,7 +368,7 @@ class Folder extends Object global $SESS; $db = db_connection(); - $sql = $db->sql('SELECT id FROM {t_object}'. + $sql = $db->sql('SELECT id FROM {{object}}'. ' WHERE is_folder=1'. ' and id != {objectid} '. ' AND projectid={projectid}' ); @@ -384,7 +384,7 @@ class Folder extends Object global $SESS; $db = db_connection(); - $sql = $db->sql('SELECT id FROM {t_object}'. + $sql = $db->sql('SELECT id FROM {{object}}'. ' WHERE is_folder=1'. ' AND projectid={projectid}' ); @@ -403,7 +403,7 @@ class Folder extends Object { $db = db_connection(); - $sql = $db->sql('SELECT id FROM {t_object} '. + $sql = $db->sql('SELECT id FROM {{object}} '. ' WHERE parentid={objectid} AND is_page=1'. ' ORDER BY orderid ASC' ); $sql->setInt( 'objectid' ,$this->objectid ); @@ -421,7 +421,7 @@ class Folder extends Object { $db = db_connection(); - $sql = $db->sql('SELECT id FROM {t_object} '. + $sql = $db->sql('SELECT id FROM {{object}} '. ' WHERE parentid={objectid}'. ' AND (is_page=1)'. ' ORDER BY orderid ASC' ); @@ -447,7 +447,7 @@ class Folder extends Object { $db = db_connection(); - $sql = $db->sql('SELECT id FROM {t_object} '. + $sql = $db->sql('SELECT id FROM {{object}} '. ' WHERE parentid={objectid}'. ' AND (is_page=1 OR is_link=1)'. ' ORDER BY orderid ASC' ); @@ -468,7 +468,7 @@ class Folder extends Object { $db = db_connection(); - $sql = $db->sql('SELECT id FROM {t_object} '. + $sql = $db->sql('SELECT id FROM {{object}} '. ' WHERE parentid={objectid}'. ' AND (is_page=1 OR is_link=1)'. ' ORDER BY orderid DESC' ); @@ -489,7 +489,7 @@ class Folder extends Object { $db = db_connection(); - $sql = $db->sql('SELECT id FROM {t_object} '. + $sql = $db->sql('SELECT id FROM {{object}} '. ' WHERE parentid={objectid} AND is_file=1'. ' ORDER BY orderid ASC' ); $sql->setInt( 'objectid' ,$this->objectid ); @@ -508,7 +508,7 @@ class Folder extends Object { $db = db_connection(); - $sql = $db->sql('SELECT id,filename FROM {t_object} '. + $sql = $db->sql('SELECT id,filename FROM {{object}} '. ' WHERE parentid={objectid} AND is_file=1'. ' ORDER BY orderid ASC' ); $sql->setInt( 'objectid' ,$this->objectid ); @@ -521,7 +521,7 @@ class Folder extends Object { $db = db_connection(); - $sql = $db->sql('SELECT id FROM {t_object} '. + $sql = $db->sql('SELECT id FROM {{object}} '. ' WHERE parentid={objectid} AND is_link=1'. ' ORDER BY orderid ASC' ); $sql->setInt( 'objectid' ,$this->objectid ); @@ -638,8 +638,8 @@ class Folder extends Object $sql = $db->sql( <<<SQL SELECT parentid,id,filename - FROM {t_object} - WHERE {t_object}.id={parentid} + FROM {{object}} + WHERE {{object}}.id={parentid} SQL ); @@ -673,11 +673,11 @@ SQL { $sql = $db->sql( <<<SQL -SELECT {t_object}.parentid,{t_object}.id,{t_object}.filename,{t_name}.name FROM {t_object} - LEFT JOIN {t_name} - ON {t_object}.id = {t_name}.objectid - AND {t_name}.languageid = {languageid} - WHERE {t_object}.id={parentid} +SELECT {{object}}.parentid,{{object}}.id,{{object}}.filename,{{name}}.name FROM {{object}} + LEFT JOIN {{name}} + ON {{object}}.id = {{name}}.objectid + AND {{name}}.languageid = {languageid} + WHERE {{object}}.id={parentid} SQL ); @@ -707,7 +707,7 @@ SQL { $db = db_connection(); - $sql = $db->sql('SELECT id FROM {t_object} '. + $sql = $db->sql('SELECT id FROM {{object}} '. ' WHERE parentid={objectid} AND is_folder=1'. ' ORDER BY orderid ASC' ); $sql->setInt( 'objectid' ,$this->objectid ); @@ -723,7 +723,7 @@ SQL { $db = db_connection(); - $sql = $db->sql('SELECT id,filename FROM {t_object} '. + $sql = $db->sql('SELECT id,filename FROM {{object}} '. ' WHERE parentid={objectid} AND is_folder=1'. ' ORDER BY orderid ASC' ); $sql->setInt( 'objectid' ,$this->objectid ); @@ -774,13 +774,13 @@ SQL // Nur loeschen, wenn es keine Unterelemente gibt if ( count( $this->getObjectIds() ) == 0 ) { - $sql = $db->sql( 'UPDATE {t_element} '. + $sql = $db->sql( 'UPDATE {{element}} '. ' SET folderobjectid=NULL '. ' WHERE folderobjectid={objectid}' ); $sql->setInt('objectid',$this->objectid); $sql->query( $sql ); - $sql = $db->sql( 'DELETE FROM {t_folder} '. + $sql = $db->sql( 'DELETE FROM {{folder}} '. ' WHERE objectid={objectid}' ); $sql->setInt('objectid',$this->objectid); $sql->query( $sql ); @@ -862,26 +862,26 @@ SQL $db = db_connection(); $sql = $db->sql( <<<SQL - SELECT {t_object}.id as objectid, - {t_object}.lastchange_date as lastchange_date, - {t_object}.filename as filename, - {t_object}.is_folder as is_folder, - {t_object}.is_file as is_file, - {t_object}.is_link as is_link, - {t_object}.is_page as is_page, - {t_name}.name as name, - {t_user}.name as username, - {t_user}.id as userid, - {t_user}.mail as usermail, - {t_user}.fullname as userfullname - FROM {t_object} - LEFT JOIN {t_name} - ON {t_name}.objectid = {t_object}.id - AND {t_name}.languageid = {languageid} - LEFT JOIN {t_user} - ON {t_user}.id = {t_object}.lastchange_userid - WHERE {t_object}.parentid = {folderid} - ORDER BY {t_object}.lastchange_date DESC + SELECT {{object}}.id as objectid, + {{object}}.lastchange_date as lastchange_date, + {{object}}.filename as filename, + {{object}}.is_folder as is_folder, + {{object}}.is_file as is_file, + {{object}}.is_link as is_link, + {{object}}.is_page as is_page, + {{name}}.name as name, + {{user}}.name as username, + {{user}}.id as userid, + {{user}}.mail as usermail, + {{user}}.fullname as userfullname + FROM {{object}} + LEFT JOIN {{name}} + ON {{name}}.objectid = {{object}}.id + AND {{name}}.languageid = {languageid} + LEFT JOIN {{user}} + ON {{user}}.id = {{object}}.lastchange_userid + WHERE {{object}}.parentid = {folderid} + ORDER BY {{object}}.lastchange_date DESC SQL ); diff --git a/model/Group.class.php b/model/Group.class.php @@ -54,7 +54,7 @@ class Group global $conf; $db = db_connection(); - $sql = $db->sql( 'SELECT id,name FROM {t_group}' ); + $sql = $db->sql( 'SELECT id,name FROM {{group}}' ); return $sql->getAssoc( $sql ); } @@ -65,7 +65,7 @@ class Group { $db = db_connection(); - $sql = $db->sql( 'SELECT * FROM {t_group}'. + $sql = $db->sql( 'SELECT * FROM {{group}}'. ' WHERE id={groupid}' ); $sql->setInt( 'groupid',$this->groupid ); @@ -82,7 +82,7 @@ class Group { $db = db_connection(); - $sql = $db->sql( 'SELECT * FROM {t_group}'. + $sql = $db->sql( 'SELECT * FROM {{group}}'. ' WHERE name={name}' ); $sql->setString('name',$name ); @@ -110,7 +110,7 @@ class Group $db = db_connection(); // Gruppe speichern - $sql = $db->sql( 'UPDATE {t_group} '. + $sql = $db->sql( 'UPDATE {{group}} '. 'SET name = {name} '. 'WHERE id={groupid}' ); $sql->setString( 'name' ,$this->name ); @@ -140,11 +140,11 @@ class Group if ( $name != '' ) $this->name = $name; - $sql = $db->sql('SELECT MAX(id) FROM {t_group}'); + $sql = $db->sql('SELECT MAX(id) FROM {{group}}'); $this->groupid = intval($sql->getOne($sql))+1; // Gruppe hinzuf?gen - $sql = $db->sql( 'INSERT INTO {t_group} '. + $sql = $db->sql( 'INSERT INTO {{group}} '. '(id,name) VALUES( {groupid},{name} )'); $sql->setInt ('groupid',$this->groupid ); $sql->setString('name' ,$this->name ); @@ -160,20 +160,20 @@ class Group $db = db_connection(); // Berechtigungen zu dieser Gruppe loeschen - $sql = $db->sql( 'DELETE FROM {t_acl} '. + $sql = $db->sql( 'DELETE FROM {{acl}} '. 'WHERE groupid={groupid}' ); $sql->setInt ('groupid',$this->groupid ); $sql->query( $sql ); // Alle Gruppenzugehoerigkeiten zu dieser Gruppe loeschen - $sql = $db->sql( 'DELETE FROM {t_usergroup} '. + $sql = $db->sql( 'DELETE FROM {{usergroup}} '. 'WHERE groupid={groupid}' ); $sql->setInt ('groupid',$this->groupid ); $sql->query($sql); // Gruppe loeschen - $sql = $db->sql( 'DELETE FROM {t_group} '. + $sql = $db->sql( 'DELETE FROM {{group}} '. 'WHERE id={groupid}' ); $sql->setInt ('groupid',$this->groupid ); $sql->query($sql); @@ -185,9 +185,9 @@ class Group { $db = db_connection(); - $sql = $db->sql( 'SELECT {t_user}.id,{t_user}.name FROM {t_user} '. - 'LEFT JOIN {t_usergroup} ON {t_usergroup}.userid={t_user}.id '. - 'WHERE {t_usergroup}.groupid={groupid}' ); + $sql = $db->sql( 'SELECT {{user}}.id,{{user}}.name FROM {{user}} '. + 'LEFT JOIN {{usergroup}} ON {{usergroup}}.userid={{user}}.id '. + 'WHERE {{usergroup}}.groupid={groupid}' ); $sql->setInt('groupid',$this->groupid ); return $sql->getAssoc( $sql ); @@ -199,9 +199,9 @@ class Group { $db = db_connection(); - $sql = $db->sql( 'SELECT {t_user}.id,{t_user}.name FROM {t_user}'. - ' LEFT JOIN {t_usergroup} ON {t_usergroup}.userid={t_user}.id AND {t_usergroup}.groupid={groupid}'. - ' WHERE {t_usergroup}.groupid IS NULL' ); + $sql = $db->sql( 'SELECT {{user}}.id,{{user}}.name FROM {{user}}'. + ' LEFT JOIN {{usergroup}} ON {{usergroup}}.userid={{user}}.id AND {{usergroup}}.groupid={groupid}'. + ' WHERE {{usergroup}}.groupid IS NULL' ); $sql->setInt('groupid' ,$this->groupid ); return $sql->getAssoc( $sql ); @@ -213,10 +213,10 @@ class Group { $db = db_connection(); - $sql = $db->sql('SELECT MAX(id) FROM {t_usergroup}'); + $sql = $db->sql('SELECT MAX(id) FROM {{usergroup}}'); $usergroupid = intval($sql->getOne($sql))+1; - $sql = $db->sql( 'INSERT INTO {t_usergroup} '. + $sql = $db->sql( 'INSERT INTO {{usergroup}} '. ' (id,userid,groupid) '. ' VALUES( {usergroupid},{userid},{groupid} )' ); $sql->setInt('usergroupid',$usergroupid ); @@ -233,7 +233,7 @@ class Group { $db = db_connection(); - $sql = $db->sql( 'DELETE FROM {t_usergroup} '. + $sql = $db->sql( 'DELETE FROM {{usergroup}} '. ' WHERE userid={userid} AND groupid={groupid}' ); $sql->setInt ('userid' ,$userid ); $sql->setInt ('groupid' ,$this->groupid ); @@ -250,7 +250,7 @@ class Group $var = array(); // Alle Projekte lesen - $sql = $db->sql( 'SELECT id,name FROM {t_project}' ); + $sql = $db->sql( 'SELECT id,name FROM {{project}}' ); $projects = $sql->getAssoc( $sql ); foreach( $projects as $projectid=>$projectname ) @@ -260,10 +260,10 @@ class Group $var[$projectid]['folders'] = array(); $var[$projectid]['rights'] = array(); - $sql = $db->sql( 'SELECT {t_acl}.* FROM {t_acl}'. - ' LEFT JOIN {t_folder} ON {t_acl}.folderid = {t_folder}.id'. - ' WHERE {t_folder}.projectid={projectid}'. - ' AND {t_acl}.groupid={groupid}' ); + $sql = $db->sql( 'SELECT {{acl}}.* FROM {{acl}}'. + ' LEFT JOIN {{folder}} ON {{acl}}.folderid = {{folder}}.id'. + ' WHERE {{folder}}.projectid={projectid}'. + ' AND {{acl}}.groupid={groupid}' ); $sql->setInt('projectid',$projectid ); $sql->setInt('groupid' ,$this->groupid ); @@ -279,7 +279,7 @@ class Group $var[$projectid]['rights'][$aclid]['delete_url'] = 'user.'.$conf_php.'?useraction=delright&aclid='.$aclid; } - $sql = $db->sql( 'SELECT id FROM {t_folder}'. + $sql = $db->sql( 'SELECT id FROM {{folder}}'. ' WHERE projectid={projectid}' ); $sql->setInt('projectid',$projectid); $folders = $sql->getCol( $sql ); @@ -306,7 +306,7 @@ class Group global $REQ,$SESS; $db = db_connection(); - $sql = $db->sql('INSERT INTO {t_acl} '. + $sql = $db->sql('INSERT INTO {{acl}} '. '(userid,groupid,folderid,`read`,`write`,`create`,`delete`,publish) '. 'VALUES({userid},{groupid},{folderid},{read},{write},{create},{delete},{publish})'); @@ -336,13 +336,13 @@ class Group function getAllAcls() { $db = db_connection(); - $sql = $db->sql( 'SELECT {t_acl}.*,{t_object}.projectid,{t_language}.name AS languagename FROM {t_acl}'. - ' LEFT JOIN {t_object} '. - ' ON {t_object}.id={t_acl}.objectid '. - ' LEFT JOIN {t_language} '. - ' ON {t_language}.id={t_acl}.languageid '. - ' WHERE ( {t_acl}.groupid={groupid} OR ({t_acl}.userid IS NULL AND {t_acl}.groupid IS NULL) )'. - ' ORDER BY {t_object}.projectid,{t_acl}.languageid' ); + $sql = $db->sql( 'SELECT {{acl}}.*,{{object}}.projectid,{{language}}.name AS languagename FROM {{acl}}'. + ' LEFT JOIN {{object}} '. + ' ON {{object}}.id={{acl}}.objectid '. + ' LEFT JOIN {{language}} '. + ' ON {{language}}.id={{acl}}.languageid '. + ' WHERE ( {{acl}}.groupid={groupid} OR ({{acl}}.userid IS NULL AND {{acl}}.groupid IS NULL) )'. + ' ORDER BY {{object}}.projectid,{{acl}}.languageid' ); $sql->setInt ( 'groupid' ,$this->groupid ); $aclList = array(); @@ -367,7 +367,7 @@ class Group // Berechtigung entfernen function delRight( $aclid ) { - $sql = $db->sql('DELETE FROM {t_acl} WHERE id={aclid}'); + $sql = $db->sql('DELETE FROM {{acl}} WHERE id={aclid}'); $sql->setInt( 'aclid',$aclid ); // Datenbankabfrage ausf?hren diff --git a/model/Language.class.php b/model/Language.class.php @@ -55,7 +55,7 @@ class Language { $db = db_connection(); - $sql = $db->sql('SELECT 1 FROM {t_language} '. + $sql = $db->sql('SELECT 1 FROM {{language}} '. ' WHERE id={id}'); $sql->setInt('id' ,$id ); @@ -70,7 +70,7 @@ class Language global $SESS; $db = db_connection(); - $sql = $db->sql( "SELECT id,name FROM {t_language} ". + $sql = $db->sql( "SELECT id,name FROM {{language}} ". " WHERE projectid = {projectid} ". " ORDER BY name" ); @@ -95,7 +95,7 @@ class Language $db = db_connection(); $sql = $db->sql( <<<SQL - SELECT count(*) FROM {t_language} + SELECT count(*) FROM {{language}} WHERE projectid = {projectid} SQL ); @@ -117,7 +117,7 @@ SQL { $db = Session::getDatabase(); - $sql = $db->sql( 'SELECT * FROM {t_language}'. + $sql = $db->sql( 'SELECT * FROM {{language}}'. ' WHERE id={languageid}' ); $sql->setInt( 'languageid',$this->languageid ); @@ -140,7 +140,7 @@ SQL $db = db_connection(); // Gruppe speichern - $sql = $db->sql( 'UPDATE {t_language} '. + $sql = $db->sql( 'UPDATE {{language}} '. 'SET name = {name}, '. ' isocode = {isocode} '. 'WHERE id={languageid}' ); @@ -184,11 +184,11 @@ SQL $this->name = $codes[ $isocode ]; } - $sql = $db->sql('SELECT MAX(id) FROM {t_language}'); + $sql = $db->sql('SELECT MAX(id) FROM {{language}}'); $this->languageid = intval($sql->getOne($sql))+1; // Sprache hinzuf?gen - $sql = $db->sql( 'INSERT INTO {t_language} '. + $sql = $db->sql( 'INSERT INTO {{language}} '. '(id,projectid,name,isocode,is_default) VALUES( {languageid},{projectid},{name},{isocode},0 )'); $sql->setInt ('languageid',$this->languageid ); $sql->setInt ('projectid' ,$this->projectid ); @@ -207,14 +207,14 @@ SQL $db = db_connection(); // Zuerst alle auf nicht-Standard setzen - $sql = $db->sql( 'UPDATE {t_language} '. + $sql = $db->sql( 'UPDATE {{language}} '. ' SET is_default = 0 '. ' WHERE projectid={projectid}' ); $sql->setInt('projectid',$this->projectid ); $sql->query( $sql ); // Jetzt die gew?nschte Sprachvariante auf Standard setzen - $sql = $db->sql( 'UPDATE {t_language} '. + $sql = $db->sql( 'UPDATE {{language}} '. ' SET is_default = 1 '. ' WHERE id={languageid}' ); $sql->setInt('languageid',$this->languageid ); @@ -227,7 +227,7 @@ SQL global $SESS; $db = db_connection(); - $sql = $db->sql( 'SELECT id FROM {t_language} '. + $sql = $db->sql( 'SELECT id FROM {{language}} '. ' WHERE projectid={projectid}'. ' ORDER BY is_default DESC' ); @@ -249,7 +249,7 @@ SQL $db = db_connection(); // Sprache l?schen -// $sql = $db->sql( 'SELECT COUNT(*) FROM {t_language} WHERE projectid={projectid}' ); +// $sql = $db->sql( 'SELECT COUNT(*) FROM {{language}} WHERE projectid={projectid}' ); // $sql->setInt( 'projectid',$this->projectid ); // $count = $sql->getOne( $sql ); // @@ -257,26 +257,26 @@ SQL // if ( $count >= 2 ) // { // Inhalte mit dieser Sprache l?schen - $sql = $db->sql( 'DELETE FROM {t_value} WHERE languageid={languageid}' ); + $sql = $db->sql( 'DELETE FROM {{value}} WHERE languageid={languageid}' ); $sql->setInt( 'languageid',$this->languageid ); $sql->query( $sql ); // Inhalte mit dieser Sprache l?schen - $sql = $db->sql( 'DELETE FROM {t_name} WHERE languageid={languageid}' ); + $sql = $db->sql( 'DELETE FROM {{name}} WHERE languageid={languageid}' ); $sql->setInt( 'languageid',$this->languageid ); $sql->query( $sql ); // Sprache l?schen - $sql = $db->sql( 'DELETE FROM {t_language} WHERE id={languageid}' ); + $sql = $db->sql( 'DELETE FROM {{language}} WHERE id={languageid}' ); $sql->setInt( 'languageid',$this->languageid ); $sql->query( $sql ); // Andere Sprache auf "Default" setzen - $sql = $db->sql( 'SELECT id FROM {t_language} WHERE projectid={projectid}' ); + $sql = $db->sql( 'SELECT id FROM {{language}} WHERE projectid={projectid}' ); $sql->setInt( 'projectid',$this->projectid ); $new_default_languageid = $sql->getOne( $sql ); - $sql = $db->sql( 'UPDATE {t_language} SET is_default=1 WHERE id={languageid}' ); + $sql = $db->sql( 'UPDATE {{language}} SET is_default=1 WHERE id={languageid}' ); $sql->setInt( 'languageid',$new_default_languageid ); $sql->query( $sql ); // } diff --git a/model/Link.class.php b/model/Link.class.php @@ -48,7 +48,7 @@ class Link extends Object $db = db_connection(); $sql = $db->sql( 'SELECT *'. - ' FROM {t_link}'. + ' FROM {{link}}'. ' WHERE objectid={objectid}' ); $sql->setInt( 'objectid',$this->objectid ); $row = $sql->getRow( $sql ); @@ -80,7 +80,7 @@ class Link extends Object $db = db_connection(); // Verkn�pfung l�schen - $sql = $db->sql( 'DELETE FROM {t_link} '. + $sql = $db->sql( 'DELETE FROM {{link}} '. ' WHERE objectid={objectid}' ); $sql->setInt( 'objectid',$this->objectid ); @@ -96,7 +96,7 @@ class Link extends Object global $SESS; $db = db_connection(); - $sql = $db->sql('UPDATE {t_link} SET '. + $sql = $db->sql('UPDATE {{link}} SET '. ' url = {url},'. ' link_objectid = {linkobjectid}'. ' WHERE objectid={objectid}' ); @@ -144,10 +144,10 @@ class Link extends Object $db = db_connection(); - $sql = $db->sql('SELECT MAX(id) FROM {t_link}'); + $sql = $db->sql('SELECT MAX(id) FROM {{link}}'); $this->linkid = intval($sql->getOne($sql))+1; - $sql = $db->sql('INSERT INTO {t_link}'. + $sql = $db->sql('INSERT INTO {{link}}'. ' (id,objectid,url,link_objectid)'. ' VALUES( {linkid},{objectid},{url},{linkobjectid} )' ); $sql->setInt ('linkid' ,$this->linkid ); diff --git a/model/Model.class.php b/model/Model.class.php @@ -55,7 +55,7 @@ class Model { $db = db_connection(); - $sql = $db->sql('SELECT 1 FROM {t_projectmodel} '. + $sql = $db->sql('SELECT 1 FROM {{projectmodel}} '. ' WHERE id={id}'); $sql->setInt('id' ,$id ); @@ -73,7 +73,7 @@ class Model global $SESS; $db = db_connection(); - $sql = $db->sql( "SELECT id,name FROM {t_projectmodel} ". + $sql = $db->sql( "SELECT id,name FROM {{projectmodel}} ". " WHERE projectid = {projectid} ". " ORDER BY name" ); @@ -99,7 +99,7 @@ class Model $db = db_connection(); $sql = $db->sql( <<<SQL - SELECT count(*) FROM {t_projectmodel} + SELECT count(*) FROM {{projectmodel}} WHERE projectid = {projectid} SQL ); @@ -118,7 +118,7 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'SELECT * FROM {t_projectmodel}'. + $sql = $db->sql( 'SELECT * FROM {{projectmodel}}'. ' WHERE id={modelid}' ); $sql->setInt( 'modelid',$this->modelid ); @@ -141,7 +141,7 @@ SQL $db = db_connection(); // Gruppe speichern - $sql = $db->sql( 'UPDATE {t_projectmodel} '. + $sql = $db->sql( 'UPDATE {{projectmodel}} '. ' SET name = {name} '. ' WHERE id={modelid}' ); $sql->setString( 'name' ,$this->name ); @@ -179,11 +179,11 @@ SQL $db = db_connection(); - $sql = $db->sql('SELECT MAX(id) FROM {t_projectmodel}'); + $sql = $db->sql('SELECT MAX(id) FROM {{projectmodel}}'); $this->modelid = intval($sql->getOne($sql))+1; // Modell hinzuf?gen - $sql = $db->sql( 'INSERT INTO {t_projectmodel} '. + $sql = $db->sql( 'INSERT INTO {{projectmodel}} '. "(id,projectid,name,extension,is_default) VALUES( {modelid},{projectid},{name},'',0 )"); $sql->setInt ('modelid' ,$this->modelid ); @@ -200,7 +200,7 @@ SQL global $SESS; $db = db_connection(); - $sql = $db->sql( 'SELECT id FROM {t_projectmodel} '. + $sql = $db->sql( 'SELECT id FROM {{projectmodel}} '. ' WHERE projectid={projectid}'. ' ORDER BY is_default DESC' ); if ( isset($this->projectid) ) @@ -223,14 +223,14 @@ SQL $db = db_connection(); // Zuerst alle auf nicht-Standard setzen - $sql = $db->sql( 'UPDATE {t_projectmodel} '. + $sql = $db->sql( 'UPDATE {{projectmodel}} '. ' SET is_default = 0 '. ' WHERE projectid={projectid}' ); $sql->setInt('projectid',$this->projectid ); $sql->query( $sql ); // Jetzt die gew?nschte Sprachvariante auf Standard setzen - $sql = $db->sql( 'UPDATE {t_projectmodel} '. + $sql = $db->sql( 'UPDATE {{projectmodel}} '. ' SET is_default = 1 '. ' WHERE id={modelid}' ); $sql->setInt('modelid',$this->modelid ); @@ -249,7 +249,7 @@ SQL // Vorlagen zu dieseem Modell loeschen $sql = $db->sql( <<<SQL - DELETE FROM {t_templatemodel} + DELETE FROM {{templatemodel}} WHERE projectmodelid = {modelid} SQL ); @@ -258,7 +258,7 @@ SQL // Dieses Modell löschen $sql = $db->sql( <<<SQL - DELETE FROM {t_projectmodel} + DELETE FROM {{projectmodel}} WHERE id={modelid} SQL ); @@ -268,11 +268,11 @@ SQL // Anderes Modell auf "Default" setzen (sofern vorhanden) if ( $this->isDefault ) { - $sql = $db->sql( 'SELECT id FROM {t_projectmodel} WHERE projectid={projectid}' ); + $sql = $db->sql( 'SELECT id FROM {{projectmodel}} WHERE projectid={projectid}' ); $sql->setInt( 'projectid',$this->projectid ); $new_default_modelid = $sql->getOne( $sql ); - $sql = $db->sql( 'UPDATE {t_projectmodel} SET is_default=1 WHERE id={modelid}' ); + $sql = $db->sql( 'UPDATE {{projectmodel}} SET is_default=1 WHERE id={modelid}' ); $sql->setInt( 'modelid',$new_default_modelid ); $sql->query( $sql ); } diff --git a/model/Object.class.php b/model/Object.class.php @@ -200,7 +200,7 @@ class Object $projectid = $this->projectid; } - $sql = $db->sql('SELECT id from {t_object} '. + $sql = $db->sql('SELECT id from {{object}} '. ' WHERE projectid={projectid}'); $sql->setInt('projectid', $projectid); @@ -263,13 +263,13 @@ class Object $sqlGroupClause = $user->getGroupClause(); $sql = $db->sql( <<<SQL -SELECT {t_acl}.* FROM {t_acl} - LEFT JOIN {t_object} - ON {t_object}.id={t_acl}.objectid +SELECT {{acl}}.* FROM {{acl}} + LEFT JOIN {{object}} + ON {{object}}.id={{acl}}.objectid WHERE objectid={objectid} AND ( languageid={languageid} OR languageid IS NULL ) - AND ( {t_acl}.userid={userid} OR $sqlGroupClause - OR ({t_acl}.userid IS NULL AND {t_acl}.groupid IS NULL) ) + AND ( {{acl}}.userid={userid} OR $sqlGroupClause + OR ({{acl}}.userid IS NULL AND {{acl}}.groupid IS NULL) ) SQL ); @@ -458,7 +458,7 @@ SQL if ( !is_numeric($objectid) || $objectid <= 0 ) return false; // Objekt-Id ung�ltig. - $sql = $db->sql('SELECT 1 FROM {t_object} '. + $sql = $db->sql('SELECT 1 FROM {{object}} '. ' WHERE id={objectid}'); $sql->setInt('objectid' , $objectid ); @@ -477,22 +477,22 @@ SQL global $SESS; $db = db_connection(); - $sql = $db->sql('SELECT {t_object}.*,' . - ' {t_name}.name,{t_name}.descr,'. + $sql = $db->sql('SELECT {{object}}.*,' . + ' {{name}}.name,{{name}}.descr,'. ' lastchangeuser.name as lastchange_username, '. ' lastchangeuser.fullname as lastchange_userfullname, '. ' lastchangeuser.mail as lastchange_usermail, '. ' createuser.name as create_username, '. ' createuser.fullname as create_userfullname, '. ' createuser.mail as create_usermail '. - ' FROM {t_object}'. - ' LEFT JOIN {t_name} '. - ' ON {t_object}.id={t_name}.objectid AND {t_name}.languageid={languageid} '. - ' LEFT JOIN {t_user} as lastchangeuser '. - ' ON {t_object}.lastchange_userid=lastchangeuser.id '. - ' LEFT JOIN {t_user} as createuser '. - ' ON {t_object}.create_userid=createuser.id '. - ' WHERE {t_object}.id={objectid}'); + ' FROM {{object}}'. + ' LEFT JOIN {{name}} '. + ' ON {{object}}.id={{name}}.objectid AND {{name}}.languageid={languageid} '. + ' LEFT JOIN {{user}} as lastchangeuser '. + ' ON {{object}}.lastchange_userid=lastchangeuser.id '. + ' LEFT JOIN {{user}} as createuser '. + ' ON {{object}}.create_userid=createuser.id '. + ' WHERE {{object}}.id={objectid}'); $sql->setInt('languageid', $this->languageid); $sql->setInt('objectid' , $this->objectid ); @@ -515,8 +515,8 @@ SQL global $SESS; $db = db_connection(); - $sql = $db->sql('SELECT * FROM {t_object}'. - ' WHERE {t_object}.id={objectid}'); + $sql = $db->sql('SELECT * FROM {{object}}'. + ' WHERE {{object}}.id={objectid}'); $sql->setInt('objectid' , $this->objectid ); $row = $sql->getRow($sql); @@ -633,7 +633,7 @@ SQL global $SESS; $db = db_connection(); - $sql = $db->sql('SELECT *'.' FROM {t_name}'.' WHERE objectid={objectid}'.' AND languageid={languageid}'); + $sql = $db->sql('SELECT *'.' FROM {{name}}'.' WHERE objectid={objectid}'.' AND languageid={languageid}'); $sql->setInt('objectid' , $this->objectid ); $sql->setInt('languageid', $this->languageid); $res = $sql->query($sql); @@ -641,7 +641,7 @@ SQL if ($res->numRows() == 0) { // Wenn Name in dieser Sprache nicht vorhanden, dann irgendeinen Namen lesen - $sql->setQuery('SELECT *'.' FROM {t_name}'.' WHERE objectid={objectid}'.' AND name != {blank}'); + $sql->setQuery('SELECT *'.' FROM {{name}}'.' WHERE objectid={objectid}'.' AND name != {blank}'); $sql->setString('blank', ''); $res = $sql->query($sql); } @@ -666,7 +666,7 @@ SQL $this->checkFilename(); $sql = $db->sql( <<<SQL -UPDATE {t_object} SET +UPDATE {{object}} SET parentid = {parentid}, lastchange_date = {time} , lastchange_userid = {userid} , @@ -711,7 +711,7 @@ SQL { $db = db_connection(); - $sql = $db->sql('UPDATE {t_object} SET '. + $sql = $db->sql('UPDATE {{object}} SET '. ' lastchange_date = {time} ,'. ' lastchange_userid = {userid} '. ' WHERE id={objectid}'); @@ -733,7 +733,7 @@ SQL { $db = db_connection(); - $sql = $db->sql('UPDATE {t_object} SET '. + $sql = $db->sql('UPDATE {{object}} SET '. ' create_date = {time} '. ' WHERE id={objectid}'); @@ -756,7 +756,7 @@ SQL $db = db_connection(); $sql = $db->sql(<<<SQL -SELECT COUNT(*) FROM {t_name} WHERE objectid ={objectid} AND languageid={languageid} +SELECT COUNT(*) FROM {{name}} WHERE objectid ={objectid} AND languageid={languageid} SQL ); $sql->setInt( 'objectid' , $this->objectid ); @@ -766,7 +766,7 @@ SQL if ($count > 0) { $sql = $db->sql( <<<SQL - UPDATE {t_name} SET + UPDATE {{name}} SET name = {name}, descr = {desc} WHERE objectid ={objectid} @@ -781,10 +781,10 @@ SQL } else { - $sql = $db->sql('SELECT MAX(id) FROM {t_name}'); + $sql = $db->sql('SELECT MAX(id) FROM {{name}}'); $nameid = intval($sql->getOne($sql))+1; - $sql->setQuery('INSERT INTO {t_name}'.' (id,objectid,languageid,name,descr)'.' VALUES( {nameid},{objectid},{languageid},{name},{desc} )'); + $sql->setQuery('INSERT INTO {{name}}'.' (id,objectid,languageid,name,descr)'.' VALUES( {nameid},{objectid},{languageid},{name},{desc} )'); $sql->setInt ('objectid' , $this->objectid ); $sql->setInt ('languageid', $this->languageid ); $sql->setInt ('nameid', $nameid ); @@ -803,19 +803,19 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'UPDATE {t_element} '. + $sql = $db->sql( 'UPDATE {{element}} '. ' SET default_objectid=NULL '. ' WHERE default_objectid={objectid}' ); $sql->setInt('objectid',$this->objectid); $sql->query( $sql ); - $sql = $db->sql( 'UPDATE {t_value} '. + $sql = $db->sql( 'UPDATE {{value}} '. ' SET linkobjectid=NULL '. ' WHERE linkobjectid={objectid}' ); $sql->setInt('objectid',$this->objectid); $sql->query( $sql ); - $sql = $db->sql( 'UPDATE {t_link} '. + $sql = $db->sql( 'UPDATE {{link}} '. ' SET link_objectid=NULL '. ' WHERE link_objectid={objectid}' ); $sql->setInt('objectid',$this->objectid); @@ -823,7 +823,7 @@ SQL // Objekt-Namen l?schen - $sql = $db->sql('DELETE FROM {t_name} WHERE objectid={objectid}'); + $sql = $db->sql('DELETE FROM {{name}} WHERE objectid={objectid}'); $sql->setInt('objectid', $this->objectid); $sql->query($sql); @@ -831,7 +831,7 @@ SQL $this->deleteAllACLs(); // Objekt l?schen - $sql = $db->sql('DELETE FROM {t_object} WHERE id={objectid}'); + $sql = $db->sql('DELETE FROM {{object}} WHERE id={objectid}'); $sql->setInt('objectid', $this->objectid); $sql->query($sql); } @@ -846,11 +846,11 @@ SQL $db = db_connection(); // Neue Objekt-Id bestimmen - $sql = $db->sql('SELECT MAX(id) FROM {t_object}'); + $sql = $db->sql('SELECT MAX(id) FROM {{object}}'); $this->objectid = intval($sql->getOne($sql))+1; $this->checkFilename(); - $sql = $db->sql('INSERT INTO {t_object}'. + $sql = $db->sql('INSERT INTO {{object}}'. ' (id,parentid,projectid,filename,orderid,create_date,create_userid,lastchange_date,lastchange_userid,is_folder,is_file,is_page,is_link)'. ' VALUES( {objectid},{parentid},{projectid},{filename},{orderid},{time},{userid},{time},{userid},{is_folder},{is_file},{is_page},{is_link} )'); @@ -943,7 +943,7 @@ SQL $db = db_connection(); $sql = $db->sql( <<<SQL -SELECT COUNT(*) FROM {t_object} +SELECT COUNT(*) FROM {{object}} WHERE parentid={parentid} AND filename={filename} AND NOT id = {objectid} SQL @@ -975,7 +975,7 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'SELECT id FROM {t_acl} '. + $sql = $db->sql( 'SELECT id FROM {{acl}} '. ' WHERE objectid={objectid}'. ' AND ( languageid IS NULL OR '. ' languageid = {languageid} )'. @@ -991,7 +991,7 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'SELECT id FROM {t_acl} '. + $sql = $db->sql( 'SELECT id FROM {{acl}} '. ' WHERE objectid={objectid}'. ' ORDER BY userid,groupid ASC' ); $sql->setInt('objectid' ,$this->objectid); @@ -1016,7 +1016,7 @@ SQL foreach( $folder->parentObjectFileNames(true,true) as $oid=>$filename ) { - $sql = $db->sql( 'SELECT id FROM {t_acl} '. + $sql = $db->sql( 'SELECT id FROM {{acl}} '. ' WHERE objectid={objectid}'. ' AND is_transmit = 1'. ' AND ( languageid IS NULL OR '. @@ -1047,7 +1047,7 @@ SQL foreach( $folder->parentObjectFileNames(true,true) as $oid=>$filename ) { - $sql = $db->sql( 'SELECT id FROM {t_acl} '. + $sql = $db->sql( 'SELECT id FROM {{acl}} '. ' WHERE objectid={objectid}'. ' AND is_transmit = 1'. ' ORDER BY userid,groupid ASC' ); @@ -1161,7 +1161,7 @@ SQL { $db = db_connection(); - $sql = $db->sql('UPDATE {t_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); @@ -1179,7 +1179,7 @@ SQL { $db = db_connection(); - $sql = $db->sql('UPDATE {t_object} '.' SET parentid={parentid}'.' WHERE id={objectid}'); + $sql = $db->sql('UPDATE {{object}} '.' SET parentid={parentid}'.' WHERE id={objectid}'); $sql->setInt('objectid', $this->objectid); $sql->setInt('parentid', $parentid); @@ -1191,9 +1191,9 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'SELECT {t_page}.objectid FROM {t_value}'. - ' LEFT JOIN {t_page} '. - ' ON {t_value}.pageid = {t_page}.id '. + $sql = $db->sql( 'SELECT {{page}}.objectid FROM {{value}}'. + ' LEFT JOIN {{page}} '. + ' ON {{value}}.pageid = {{page}}.id '. ' WHERE linkobjectid={objectid}' ); $sql->setInt( 'objectid',$this->objectid ); @@ -1210,7 +1210,7 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'SELECT id FROM {t_object} '. + $sql = $db->sql( 'SELECT id FROM {{object}} '. ' WHERE filename LIKE {filename}'. ' AND projectid={projectid}'. ' ORDER BY lastchange_date DESC' ); @@ -1230,12 +1230,12 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'SELECT {t_object}.id FROM {t_object} '. - ' LEFT JOIN {t_name} '. - ' ON {t_object}.id={t_name}.objectid'. - ' WHERE {t_name}.name LIKE {name}'. - ' AND {t_name}.languageid={languageid}'. - ' AND {t_object}.projectid={projectid}'. + $sql = $db->sql( 'SELECT {{object}}.id FROM {{object}} '. + ' LEFT JOIN {{name}} '. + ' ON {{object}}.id={{name}}.objectid'. + ' WHERE {{name}}.name LIKE {name}'. + ' AND {{name}}.languageid={languageid}'. + ' AND {{object}}.projectid={projectid}'. ' ORDER BY lastchange_date DESC' ); $sql->setInt ( 'projectid' ,$this->projectid ); $sql->setInt ( 'languageid',$this->languageid ); @@ -1254,12 +1254,12 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'SELECT {t_object}.id FROM {t_object} '. - ' LEFT JOIN {t_name} '. - ' ON {t_object}.id={t_name}.objectid'. - ' WHERE {t_name}.descr LIKE {desc}'. - ' AND {t_name}.languageid={languageid}'. - ' AND {t_object}.projectid={projectid}'. + $sql = $db->sql( 'SELECT {{object}}.id FROM {{object}} '. + ' LEFT JOIN {{name}} '. + ' ON {{object}}.id={{name}}.objectid'. + ' WHERE {{name}}.descr LIKE {desc}'. + ' AND {{name}}.languageid={languageid}'. + ' AND {{object}}.projectid={projectid}'. ' ORDER BY lastchange_date DESC' ); $sql->setInt ( 'projectid' ,$this->projectid ); $sql->setInt ( 'languageid',$this->languageid ); @@ -1278,7 +1278,7 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'SELECT id FROM {t_object} '. + $sql = $db->sql( 'SELECT id FROM {{object}} '. ' WHERE create_userid={userid}'. ' AND projectid={projectid}'. ' ORDER BY lastchange_date DESC' ); @@ -1298,7 +1298,7 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'SELECT id FROM {t_object} '. + $sql = $db->sql( 'SELECT id FROM {{object}} '. ' WHERE lastchange_userid={userid}'. ' AND projectid={projectid}'. ' ORDER BY lastchange_date DESC' ); @@ -1318,7 +1318,7 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'SELECT id FROM {t_object} '. + $sql = $db->sql( 'SELECT id FROM {{object}} '. ' WHERE id={objectid}'. ' AND projectid={projectid}' ); $sql->setInt ( 'projectid' ,$this->projectid ); @@ -1337,7 +1337,7 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'SELECT objectid FROM {t_link} '. + $sql = $db->sql( 'SELECT objectid FROM {{link}} '. ' WHERE link_objectid={myid}' ); $sql->setInt ( 'myid' ,$this->objectid ); diff --git a/model/Page.class.php b/model/Page.class.php @@ -82,7 +82,7 @@ class Page extends Object { $db = db_connection(); - $sql = $db->sql( 'SELECT objectid FROM {t_page} '. + $sql = $db->sql( 'SELECT objectid FROM {{page}} '. ' WHERE id={pageid}' ); $sql->setInt('pageid',$pageid); @@ -100,7 +100,7 @@ class Page extends Object { $db = db_connection(); - $sql = $db->sql( 'SELECT id FROM {t_page} '. + $sql = $db->sql( 'SELECT id FROM {{page}} '. ' WHERE objectid={objectid}' ); $sql->setInt('objectid',$objectid); @@ -348,10 +348,10 @@ class Page extends Object $this->objectAdd(); // Hinzuf?gen von Objekt (dabei wird Objekt-ID ermittelt) - $sql = $db->sql('SELECT MAX(id) FROM {t_page}'); + $sql = $db->sql('SELECT MAX(id) FROM {{page}}'); $this->pageid = intval($sql->getOne($sql))+1; - $sql = $db->sql('INSERT INTO {t_page}'. + $sql = $db->sql('INSERT INTO {{page}}'. ' (id,objectid,templateid)'. ' VALUES( {pageid},{objectid},{templateid} )' ); $sql->setInt ('pageid' ,$this->pageid ); @@ -369,7 +369,7 @@ class Page extends Object { $db = db_connection(); - $sql = $db->sql( 'SELECT * FROM {t_page} '. + $sql = $db->sql( 'SELECT * FROM {{page}} '. ' WHERE objectid={objectid}' ); $sql->setInt('objectid',$this->objectid); $row = $sql->getRow( $sql ); @@ -385,12 +385,12 @@ class Page extends Object { global $db; - $sql = $db->sql( 'DELETE FROM {t_value} '. + $sql = $db->sql( 'DELETE FROM {{value}} '. ' WHERE pageid={pageid}' ); $sql->setInt('pageid',$this->pageid); $sql->query( $sql ); - $sql = $db->sql( 'DELETE FROM {t_page} '. + $sql = $db->sql( 'DELETE FROM {{page}} '. ' WHERE objectid={objectid}' ); $sql->setInt('objectid',$this->objectid); $sql->query( $sql ); @@ -438,7 +438,7 @@ class Page extends Object { $db = db_connection(); - $sql = $db->sql('UPDATE {t_page}'. + $sql = $db->sql('UPDATE {{page}}'. ' SET templateid ={templateid}'. ' WHERE objectid={objectid}' ); $sql->setInt('templateid' ,$this->templateid); @@ -459,7 +459,7 @@ class Page extends Object // Template-id dieser Seite aendern $this->templateid = $newTemplateId; - $sql = $db->sql('UPDATE {t_page}'. + $sql = $db->sql('UPDATE {{page}}'. ' SET templateid ={templateid}'. ' WHERE objectid={objectid}' ); $sql->setInt('templateid' ,$this->templateid); @@ -475,7 +475,7 @@ class Page extends Object intval($replaceElementMap[$oldElementId]) < 1 ) { Logger::debug( 'deleting value of elementid '.$oldElementId ); - $sql = $db->sql('DELETE FROM {t_value}'. + $sql = $db->sql('DELETE FROM {{value}}'. ' WHERE pageid={pageid}'. ' AND elementid={elementid}' ); $sql->setInt('pageid' ,$this->pageid); @@ -488,7 +488,7 @@ class Page extends Object $newElementId = intval($replaceElementMap[$oldElementId]); Logger::debug( 'updating elementid '.$oldElementId.' -> '.$newElementId ); - $sql = $db->sql('UPDATE {t_value}'. + $sql = $db->sql('UPDATE {{value}}'. ' SET elementid ={newelementid}'. ' WHERE pageid ={pageid}'. ' AND elementid={oldelementid}' ); @@ -567,7 +567,7 @@ class Page extends Object // // $db = db_connection(); // -// $sql = $db->sql( 'SELECT COUNT(*) FROM {t_language}'. +// $sql = $db->sql( 'SELECT COUNT(*) FROM {{language}}'. // ' WHERE projectid={projectid}' ); // $sql->setInt('projectid',$SESS['projectid']); // @@ -578,7 +578,7 @@ class Page extends Object // } // else // { -// $sql = $db->sql( 'SELECT isocode FROM {t_language}'. +// $sql = $db->sql( 'SELECT isocode FROM {{language}}'. // ' WHERE id={languageid}' ); // $sql->setInt('languageid',$this->languageid); // $isocode = $sql->getOne( $sql ); diff --git a/model/Project.class.php b/model/Project.class.php @@ -54,7 +54,7 @@ class Project { $db = db_connection(); - $sql = $db->sql('SELECT 1 FROM {t_project} '. + $sql = $db->sql('SELECT 1 FROM {{project}} '. ' WHERE id={id}'); $sql->setInt('id' ,$id ); @@ -73,7 +73,7 @@ class Project function getAllProjects() { $db = db_connection(); - $sql = $db->sql( 'SELECT id,name FROM {t_project} '. + $sql = $db->sql( 'SELECT id,name FROM {{project}} '. ' ORDER BY name' ); return $sql->getAssoc( $sql ); @@ -84,7 +84,7 @@ class Project function getAllProjectIds() { $db = db_connection(); - $sql = $db->sql( 'SELECT id FROM {t_project} '. + $sql = $db->sql( 'SELECT id FROM {{project}} '. ' ORDER BY name' ); return $sql->getCol( $sql ); @@ -95,7 +95,7 @@ class Project { $db = db_connection(); - $sql = $db->sql( 'SELECT id,name FROM {t_language}'. + $sql = $db->sql( 'SELECT id,name FROM {{language}}'. ' WHERE projectid={projectid} '. ' ORDER BY name' ); $sql->setInt ('projectid',$this->projectid); @@ -114,7 +114,7 @@ class Project { $db = db_connection(); - $sql = $db->sql( 'SELECT id,name FROM {t_projectmodel}'. + $sql = $db->sql( 'SELECT id,name FROM {{projectmodel}}'. ' WHERE projectid= {projectid} '. ' ORDER BY name' ); $sql->setInt ('projectid',$this->projectid); @@ -133,7 +133,7 @@ class Project { $db = db_connection(); - $sql = $db->sql( 'SELECT id FROM {t_template}'. + $sql = $db->sql( 'SELECT id FROM {{template}}'. ' WHERE projectid= {projectid} ' ); $sql->setInt ('projectid',$this->projectid); @@ -145,7 +145,7 @@ class Project { $db = db_connection(); - $sql = $db->sql( 'SELECT id,name FROM {t_template}'. + $sql = $db->sql( 'SELECT id,name FROM {{template}}'. ' WHERE projectid= {projectid} ' ); $sql->setInt ('projectid',$this->projectid); @@ -165,7 +165,7 @@ class Project { $db = db_connection(); - $sql = $db->sql('SELECT id FROM {t_object}'. + $sql = $db->sql('SELECT id FROM {{object}}'. ' WHERE parentid IS NULL'. ' AND projectid={projectid}' ); @@ -181,7 +181,7 @@ class Project { $db = db_connection(); - $sql = $db->sql( 'SELECT * FROM {t_project} '. + $sql = $db->sql( 'SELECT * FROM {{project}} '. ' WHERE id={projectid}' ); $sql->setInt( 'projectid',$this->projectid ); @@ -205,7 +205,7 @@ class Project { $db = db_connection(); - $sql = $db->sql( 'SELECT * FROM {t_project} '. + $sql = $db->sql( 'SELECT * FROM {{project}} '. ' WHERE name={projectname}' ); $sql->setString( 'projectname',$this->name ); @@ -227,7 +227,7 @@ class Project $db = db_connection(); $sql = $db->sql( <<<SQL - UPDATE {t_project} + UPDATE {{project}} SET name = {name}, target_dir = {target_dir}, ftp_url = {ftp_url}, @@ -283,12 +283,12 @@ SQL { $db = db_connection(); - $sql = $db->sql('SELECT MAX(id) FROM {t_project}'); + $sql = $db->sql('SELECT MAX(id) FROM {{project}}'); $this->projectid = intval($sql->getOne($sql))+1; // Projekt hinzuf?gen - $sql = $db->sql( 'INSERT INTO {t_project} (id,name,target_dir,ftp_url,ftp_passive,cmd_after_publish,content_negotiation,cut_index) '. + $sql = $db->sql( 'INSERT INTO {{project}} (id,name,target_dir,ftp_url,ftp_passive,cmd_after_publish,content_negotiation,cut_index) '. " VALUES( {projectid},{name},'','',0,'',0,0 ) " ); $sql->setInt ('projectid',$this->projectid ); $sql->setString('name' ,$this->name ); @@ -373,7 +373,7 @@ SQL // Projekt l?schen - $sql = $db->sql( 'DELETE FROM {t_project}'. + $sql = $db->sql( 'DELETE FROM {{project}}'. ' WHERE id= {projectid} ' ); $sql->setInt( 'projectid',$this->projectid ); $sql->query( $sql ); @@ -385,7 +385,7 @@ SQL // ORDER BY deswegen, damit immer mind. eine Sprache // gelesen wird - $sql = $db->sql( 'SELECT id FROM {t_language} '. + $sql = $db->sql( 'SELECT id FROM {{language}} '. ' WHERE projectid={projectid}'. ' ORDER BY is_default DESC' ); @@ -401,7 +401,7 @@ SQL // ORDER BY deswegen, damit immer mind. eine Sprache // gelesen wird - $sql = $db->sql( 'SELECT id FROM {t_projectmodel} '. + $sql = $db->sql( 'SELECT id FROM {{projectmodel}} '. ' WHERE projectid={projectid}'. ' ORDER BY is_default DESC' ); $sql->setInt('projectid',$this->projectid ); @@ -455,8 +455,8 @@ SQL // Ordnerstruktur prüfen. $sql = $db->sql( <<<EOF -SELECT thistab.id FROM {t_object} AS thistab - LEFT JOIN {t_object} AS parenttab +SELECT thistab.id FROM {{object}} AS thistab + LEFT JOIN {{object}} AS parenttab ON parenttab.id = thistab.parentid WHERE thistab.projectid={projectid} AND thistab.parentid IS NOT NULL AND parenttab.id IS NULL EOF @@ -486,7 +486,7 @@ EOF // Prüfe, ob die Verbindung Projekt->Template->Templatemodell->Projectmodell->Projekt konsistent ist. $sql = $db->sql( <<<EOF -SELECT DISTINCT projectid FROM {t_projectmodel} WHERE id IN (SELECT projectmodelid from {t_templatemodel} WHERE templateid in (SELECT id from {t_template} WHERE projectid={projectid})) +SELECT DISTINCT projectid FROM {{projectmodel}} WHERE id IN (SELECT projectmodelid from {{templatemodel}} WHERE templateid in (SELECT id from {{template}} WHERE projectid={projectid})) EOF ); $sql->setInt('projectid',$this->projectid); @@ -730,7 +730,7 @@ EOF function countObjects() { $db = db_connection(); - $sql = $db->sql( 'SELECT COUNT(*) FROM {t_object} '. + $sql = $db->sql( 'SELECT COUNT(*) FROM {{object}} '. ' WHERE projectid = {projectid}' ); $sql->setInt( 'projectid', $this->projectid ); @@ -749,9 +749,9 @@ EOF $db = db_connection(); $sql = $db->sql( <<<SQL - SELECT SUM(size) FROM {t_file} - LEFT JOIN {t_object} - ON {t_file}.objectid = {t_object}.id + SELECT SUM(size) FROM {{file}} + LEFT JOIN {{object}} + ON {{file}}.objectid = {{object}}.id WHERE projectid = {projectid} SQL ); @@ -791,23 +791,23 @@ SQL $sql = $db->sql( <<<SQL - SELECT {t_object}.id as objectid, - {t_object}.filename as filename, - {t_object}.is_folder as is_folder, - {t_object}.is_file as is_file, - {t_object}.is_link as is_link, - {t_object}.is_page as is_page, - {t_object}.lastchange_date as lastchange_date, - {t_name}.name as name - FROM {t_object} - LEFT JOIN {t_name} - ON {t_name}.objectid = {t_object}.id - AND {t_name}.languageid = {languageid} - LEFT JOIN {t_project} - ON {t_object}.projectid = {t_project}.id - WHERE {t_object}.projectid = {projectid} - AND {t_object}.lastchange_userid = {userid} - ORDER BY {t_object}.lastchange_date DESC; + SELECT {{object}}.id as objectid, + {{object}}.filename as filename, + {{object}}.is_folder as is_folder, + {{object}}.is_file as is_file, + {{object}}.is_link as is_link, + {{object}}.is_page as is_page, + {{object}}.lastchange_date as lastchange_date, + {{name}}.name as name + FROM {{object}} + LEFT JOIN {{name}} + ON {{name}}.objectid = {{object}}.id + AND {{name}}.languageid = {languageid} + LEFT JOIN {{project}} + ON {{object}}.projectid = {{project}}.id + WHERE {{object}}.projectid = {projectid} + AND {{object}}.lastchange_userid = {userid} + ORDER BY {{object}}.lastchange_date DESC; SQL ); @@ -834,21 +834,21 @@ SQL $db = db_connection(); $sql = $db->sql( <<<SQL - SELECT {t_object}.id as objectid, - {t_object}.lastchange_date as lastchange_date, - {t_object}.filename as filename, - {t_project}.id as projectid, - {t_project}.name as projectname, - {t_user}.name as username, - {t_user}.id as userid, - {t_user}.mail as usermail, - {t_user}.fullname as userfullname - FROM {t_object} - LEFT JOIN {t_project} - ON {t_object}.projectid = {t_project}.id - LEFT JOIN {t_user} - ON {t_user}.id = {t_object}.lastchange_userid - ORDER BY {t_object}.lastchange_date DESC + SELECT {{object}}.id as objectid, + {{object}}.lastchange_date as lastchange_date, + {{object}}.filename as filename, + {{project}}.id as projectid, + {{project}}.name as projectname, + {{user}}.name as username, + {{user}}.id as userid, + {{user}}.mail as usermail, + {{user}}.fullname as userfullname + FROM {{object}} + LEFT JOIN {{project}} + ON {{object}}.projectid = {{project}}.id + LEFT JOIN {{user}} + ON {{user}}.id = {{object}}.lastchange_userid + ORDER BY {{object}}.lastchange_date DESC LIMIT 50 SQL ); @@ -868,26 +868,26 @@ SQL $db = db_connection(); $sql = $db->sql( <<<SQL - SELECT {t_object}.id as objectid, - {t_object}.lastchange_date as lastchange_date, - {t_object}.filename as filename, - {t_object}.is_folder as is_folder, - {t_object}.is_file as is_file, - {t_object}.is_link as is_link, - {t_object}.is_page as is_page, - {t_name}.name as name, - {t_user}.name as username, - {t_user}.id as userid, - {t_user}.mail as usermail, - {t_user}.fullname as userfullname - FROM {t_object} - LEFT JOIN {t_name} - ON {t_name}.objectid = {t_object}.id - AND {t_name}.languageid = {languageid} - LEFT JOIN {t_user} - ON {t_user}.id = {t_object}.lastchange_userid - WHERE {t_object}.projectid = {projectid} - ORDER BY {t_object}.lastchange_date DESC + SELECT {{object}}.id as objectid, + {{object}}.lastchange_date as lastchange_date, + {{object}}.filename as filename, + {{object}}.is_folder as is_folder, + {{object}}.is_file as is_file, + {{object}}.is_link as is_link, + {{object}}.is_page as is_page, + {{name}}.name as name, + {{user}}.name as username, + {{user}}.id as userid, + {{user}}.mail as usermail, + {{user}}.fullname as userfullname + FROM {{object}} + LEFT JOIN {{name}} + ON {{name}}.objectid = {{object}}.id + AND {{name}}.languageid = {languageid} + LEFT JOIN {{user}} + ON {{user}}.id = {{object}}.lastchange_userid + WHERE {{object}}.projectid = {projectid} + ORDER BY {{object}}.lastchange_date DESC SQL ); diff --git a/model/Template.class.php b/model/Template.class.php @@ -87,7 +87,7 @@ class Template global $SESS; $db = db_connection(); - $sql = $db->sql( 'SELECT id,name FROM {t_template}'. + $sql = $db->sql( 'SELECT id,name FROM {{template}}'. ' WHERE projectid={projectid}'. ' ORDER BY name ASC ' ); if ( isset($this) && isset($this->projectid) ) @@ -110,7 +110,7 @@ class Template global $SESS; $db = db_connection(); - $sql = $db->sql( 'SELECT * FROM {t_template}'. + $sql = $db->sql( 'SELECT * FROM {{template}}'. ' WHERE id={templateid}' ); $sql->setInt( 'templateid',$this->templateid ); $row = $sql->getRow( $sql ); @@ -121,7 +121,7 @@ class Template $this->name = $row['name' ]; $this->projectid = $row['projectid']; - $sql = $db->sql( 'SELECT * FROM {t_templatemodel}'. + $sql = $db->sql( 'SELECT * FROM {{templatemodel}}'. ' WHERE templateid={templateid}'. ' AND projectmodelid={modelid}' ); $sql->setInt( 'templateid',$this->templateid ); @@ -152,14 +152,14 @@ class Template $db = db_connection(); - $sql = $db->sql( 'UPDATE {t_template}'. + $sql = $db->sql( 'UPDATE {{template}}'. ' SET name={name}'. ' WHERE id={templateid}' ); $sql->setString( 'name' ,$this->name ); $sql->setInt ( 'templateid',$this->templateid ); $sql->query( $sql ); - $sql = $db->sql( 'SELECT COUNT(*) FROM {t_templatemodel}'. + $sql = $db->sql( 'SELECT COUNT(*) FROM {{templatemodel}}'. ' WHERE templateid={templateid}'. ' AND projectmodelid={modelid}' ); $sql->setInt ( 'templateid' ,$this->templateid ); @@ -168,7 +168,7 @@ class Template if ( intval($sql->getOne($sql)) > 0 ) { // Vorlagen-Quelltext existiert für diese Varianten schon. - $sql = $db->sql( 'UPDATE {t_templatemodel}'. + $sql = $db->sql( 'UPDATE {{templatemodel}}'. ' SET extension={extension},'. ' text={src} '. ' WHERE templateid={templateid}'. @@ -177,10 +177,10 @@ class Template else { // Vorlagen-Quelltext wird für diese Varianten neu angelegt. - $sql = $db->sql('SELECT MAX(id) FROM {t_templatemodel}'); + $sql = $db->sql('SELECT MAX(id) FROM {{templatemodel}}'); $nextid = intval($sql->getOne($sql))+1; - $sql = $db->sql( 'INSERT INTO {t_templatemodel}'. + $sql = $db->sql( 'INSERT INTO {{templatemodel}}'. ' (id,templateid,projectmodelid,extension,text) '. ' VALUES ({id},{templateid},{modelid},{extension},{src}) '); $sql->setInt ( 'id',$nextid ); @@ -204,7 +204,7 @@ class Template { $db = db_connection(); - $sql = $db->sql( 'SELECT templateid FROM {t_templatemodel}'. + $sql = $db->sql( 'SELECT templateid FROM {{templatemodel}}'. ' WHERE text LIKE {text} '. ' AND projectmodelid={modelid}' ); @@ -224,7 +224,7 @@ class Template { $db = db_connection(); - $sql = $db->sql( 'SELECT id FROM {t_element}'. + $sql = $db->sql( 'SELECT id FROM {{element}}'. ' WHERE templateid={templateid}'. ' ORDER BY name ASC' ); $sql->setInt( 'templateid',$this->templateid ); @@ -243,7 +243,7 @@ class Template $list = array(); $db = db_connection(); - $sql = $db->sql( 'SELECT * FROM {t_element}'. + $sql = $db->sql( 'SELECT * FROM {{element}}'. ' WHERE templateid={templateid}'. ' ORDER BY name ASC' ); $sql->setInt( 'templateid',$this->templateid ); @@ -274,7 +274,7 @@ class Template $db = db_connection(); $sql = $db->sql( <<<SQL -SELECT * FROM {t_element} +SELECT * FROM {{element}} WHERE templateid={templateid} AND writable=1 AND type NOT IN ($readonlyList) @@ -304,7 +304,7 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'SELECT id,name FROM {t_element}'. + $sql = $db->sql( 'SELECT id,name FROM {{element}}'. ' WHERE templateid={templateid}'. ' ORDER BY name ASC' ); $sql->setInt( 'templateid',$this->templateid ); @@ -341,10 +341,10 @@ SQL $db = db_connection(); - $sql = $db->sql('SELECT MAX(id) FROM {t_template}'); + $sql = $db->sql('SELECT MAX(id) FROM {{template}}'); $this->templateid = intval($sql->getOne($sql))+1; - $sql = $db->sql( 'INSERT INTO {t_template}'. + $sql = $db->sql( 'INSERT INTO {{template}}'. ' (id,name,projectid)'. ' VALUES({templateid},{name},{projectid})' ); $sql->setInt ('templateid',$this->templateid ); @@ -372,7 +372,7 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'SELECT objectid FROM {t_page}'. + $sql = $db->sql( 'SELECT objectid FROM {{page}}'. ' WHERE templateid={templateid}' ); $sql->setInt( 'templateid',$this->templateid ); @@ -395,12 +395,12 @@ SQL $element->delete(); } - $sql = $db->sql( 'DELETE FROM {t_templatemodel}'. + $sql = $db->sql( 'DELETE FROM {{templatemodel}}'. ' WHERE templateid={templateid}' ); $sql->setInt( 'templateid',$this->templateid ); $sql->query( $sql ); - $sql = $db->sql( 'DELETE FROM {t_template}'. + $sql = $db->sql( 'DELETE FROM {{template}}'. ' WHERE id={templateid}' ); $sql->setInt( 'templateid',$this->templateid ); $sql->query( $sql ); diff --git a/model/User.class.php b/model/User.class.php @@ -61,7 +61,7 @@ class User $db = db_connection(); $sql = $db->sql( 'SELECT id,name '. - ' FROM {t_user}'. + ' FROM {{user}}'. ' ORDER BY name' ); return $sql->getAssoc( $sql ); @@ -75,7 +75,7 @@ class User $db = db_connection(); $sql = $db->sql( 'SELECT * '. - ' FROM {t_user}'. + ' FROM {{user}}'. ' ORDER BY name' ); foreach( $sql->getAll( $sql ) as $row ) @@ -127,8 +127,8 @@ class User $db = db_connection(); $sql = $db->sql( 'SELECT COUNT(*)'. - ' FROM {t_acl}'. - ' LEFT JOIN {t_object} ON {t_object}.id={t_acl}.objectid '. + ' FROM {{acl}}'. + ' LEFT JOIN {{object}} ON {{object}}.id={{acl}}.objectid '. ' WHERE projectid={projectidid} AND '. ' ( userid={userid} OR'. ' '.$this->getGroupClause().' )' ); @@ -157,16 +157,16 @@ class User { $groupClause = $this->getGroupClause(); $sql = $db->sql(<<<SQL -SELECT DISTINCT {t_project}.id,{t_project}.name - FROM {t_object} - LEFT JOIN {t_acl} ON {t_object}.id = {t_acl}.objectid - LEFT JOIN {t_project} ON {t_project}.id = {t_object}.projectid - WHERE {t_object}.parentid IS NULL AND - {t_acl}.id IS NOT NULL AND - ( {t_acl}.userid={userid} OR +SELECT DISTINCT {{project}}.id,{{project}}.name + FROM {{object}} + LEFT JOIN {{acl}} ON {{object}}.id = {{acl}}.objectid + LEFT JOIN {{project}} ON {{project}}.id = {{object}}.projectid + WHERE {{object}}.parentid IS NULL AND + {{acl}}.id IS NOT NULL AND + ( {{acl}}.userid={userid} OR $groupClause OR - ({t_acl}.userid IS NULL AND {t_acl}.groupid IS NULL)) - ORDER BY {t_project}.name + ({{acl}}.userid IS NULL AND {{acl}}.groupid IS NULL)) + ORDER BY {{project}}.name SQL ); $sql->setInt ( 'userid',$this->userid ); @@ -207,7 +207,7 @@ SQL global $conf; $db = db_connection(); - $sql = $db->sql( 'SELECT id,mail,name,password FROM {t_user}'. + $sql = $db->sql( 'SELECT id,mail,name,password FROM {{user}}'. ' WHERE id={userid}' ); $sql->setInt( 'userid',$this->userid ); $row = $sql->getRow( $sql ); @@ -228,7 +228,7 @@ SQL global $conf; $db = db_connection(); - $sql = $db->sql( 'SELECT * FROM {t_user}'. + $sql = $db->sql( 'SELECT * FROM {{user}}'. ' WHERE id={userid}' ); $sql->setInt( 'userid',$this->userid ); $row = $sql->getRow( $sql ); @@ -253,7 +253,7 @@ SQL $db = db_connection(); // Benutzer �ber Namen suchen - $sql = $db->sql( 'SELECT id FROM {t_user}'. + $sql = $db->sql( 'SELECT id FROM {{user}}'. ' WHERE name={name}' ); //Html::debug($sql); $sql->setString( 'name',$name ); @@ -360,7 +360,7 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'SELECT name FROM {t_user}'. + $sql = $db->sql( 'SELECT name FROM {{user}}'. ' WHERE id={userid}' ); $sql->setInt( 'userid',$userid ); @@ -379,7 +379,7 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'UPDATE {t_user}'. + $sql = $db->sql( 'UPDATE {{user}}'. ' SET name={name},'. ' fullname={fullname},'. ' ldap_dn ={ldap_dn} ,'. @@ -416,10 +416,10 @@ SQL $db = db_connection(); - $sql = $db->sql('SELECT MAX(id) FROM {t_user}'); + $sql = $db->sql('SELECT MAX(id) FROM {{user}}'); $this->userid = intval($sql->getOne($sql))+1; - $sql = $db->sql('INSERT INTO {t_user}'. + $sql = $db->sql('INSERT INTO {{user}}'. ' (id,name,password,ldap_dn,fullname,tel,mail,descr,style,is_admin)'. " VALUES( {userid},{name},'','','','','','','default',0 )" ); $sql->setInt ('userid',$this->userid); @@ -448,7 +448,7 @@ SQL $db = db_connection(); $groupNames = "'".implode("','",$groupNames)."'"; - $sql = $db->sql("SELECT id FROM {t_group} WHERE name IN($groupNames)"); + $sql = $db->sql("SELECT id FROM {{group}} WHERE name IN($groupNames)"); $groupIds = array_unique( $sql->getCol($sql) ); // Wir brauchen hier nicht weiter pr�fen, ob der Benutzer eine Gruppe schon hat, denn @@ -476,40 +476,40 @@ SQL $db = db_connection(); // "Erzeugt von" f�r diesen Benutzer entfernen. - $sql = $db->sql( 'UPDATE {t_object} '. + $sql = $db->sql( 'UPDATE {{object}} '. 'SET create_userid=null '. 'WHERE create_userid={userid}' ); $sql->setInt ('userid',$this->userid ); $sql->query( $sql ); // "Letzte �nderung von" f�r diesen Benutzer entfernen - $sql = $db->sql( 'UPDATE {t_object} '. + $sql = $db->sql( 'UPDATE {{object}} '. 'SET lastchange_userid=null '. 'WHERE lastchange_userid={userid}' ); $sql->setInt ('userid',$this->userid ); $sql->query( $sql ); // Alle Archivdaten in Dateien mit diesem Benutzer entfernen - $sql = $db->sql( 'UPDATE {t_value} '. + $sql = $db->sql( 'UPDATE {{value}} '. 'SET lastchange_userid=null '. 'WHERE lastchange_userid={userid}' ); $sql->setInt ('userid',$this->userid ); $sql->query( $sql ); // Alle Berechtigungen dieses Benutzers l?schen - $sql = $db->sql( 'DELETE FROM {t_acl} '. + $sql = $db->sql( 'DELETE FROM {{acl}} '. 'WHERE userid={userid}' ); $sql->setInt ('userid',$this->userid ); $sql->query( $sql ); // Alle Gruppenzugehoerigkeiten dieses Benutzers l?schen - $sql = $db->sql( 'DELETE FROM {t_usergroup} '. + $sql = $db->sql( 'DELETE FROM {{usergroup}} '. 'WHERE userid={userid}' ); $sql->setInt ('userid',$this->userid ); $sql->query( $sql ); // Benutzer loeschen - $sql = $db->sql( 'DELETE FROM {t_user} '. + $sql = $db->sql( 'DELETE FROM {{user}} '. 'WHERE id={userid}' ); $sql->setInt ('userid',$this->userid ); $sql->query( $sql ); @@ -548,7 +548,7 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'UPDATE {t_user} SET password={password} '. + $sql = $db->sql( 'UPDATE {{user}} SET password={password} '. 'WHERE id={userid}' ); if ( $always ) @@ -576,9 +576,9 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'SELECT {t_group}.id,{t_group}.name FROM {t_group} '. - 'LEFT JOIN {t_usergroup} ON {t_usergroup}.groupid={t_group}.id '. - 'WHERE {t_usergroup}.userid={userid}' ); + $sql = $db->sql( 'SELECT {{group}}.id,{{group}}.name FROM {{group}} '. + 'LEFT JOIN {{usergroup}} ON {{usergroup}}.groupid={{group}}.id '. + 'WHERE {{usergroup}}.userid={userid}' ); $sql->setInt('userid',$this->userid ); $this->groups = $sql->getAssoc( $sql ); } @@ -595,7 +595,7 @@ SQL /* $db = db_connection(); - $sql = $db->sql( 'SELECT groupid FROM {t_usergroup} '. + $sql = $db->sql( 'SELECT groupid FROM {{usergroup}} '. 'WHERE userid={userid}' ); $sql->setInt('userid',$this->userid ); @@ -609,9 +609,9 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'SELECT {t_group}.id,{t_group}.name FROM {t_group}'. - ' LEFT JOIN {t_usergroup} ON {t_usergroup}.groupid={t_group}.id AND {t_usergroup}.userid={userid}'. - ' WHERE {t_usergroup}.userid IS NULL' ); + $sql = $db->sql( 'SELECT {{group}}.id,{{group}}.name FROM {{group}}'. + ' LEFT JOIN {{usergroup}} ON {{usergroup}}.groupid={{group}}.id AND {{usergroup}}.userid={userid}'. + ' WHERE {{usergroup}}.userid IS NULL' ); $sql->setInt('userid' ,$this->userid ); return $sql->getAssoc( $sql ); @@ -628,10 +628,10 @@ SQL { $db = db_connection(); - $sql = $db->sql('SELECT MAX(id) FROM {t_usergroup}'); + $sql = $db->sql('SELECT MAX(id) FROM {{usergroup}}'); $usergroupid = intval($sql->getOne($sql))+1; - $sql = $db->sql( 'INSERT INTO {t_usergroup} '. + $sql = $db->sql( 'INSERT INTO {{usergroup}} '. ' (id,userid,groupid) '. ' VALUES( {usergroupid},{userid},{groupid} )' ); $sql->setInt('usergroupid',$usergroupid ); @@ -653,7 +653,7 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'DELETE FROM {t_usergroup} '. + $sql = $db->sql( 'DELETE FROM {{usergroup}} '. ' WHERE userid={userid} AND groupid={groupid}' ); $sql->setInt ('userid' ,$this->userid ); $sql->setInt ('groupid' ,$groupid ); @@ -688,14 +688,14 @@ SQL $group_clause = $this->getGroupClause(); - $sql = $db->sql( 'SELECT {t_acl}.*,{t_object}.projectid,{t_language}.name AS languagename FROM {t_acl}'. - ' LEFT JOIN {t_object} '. - ' ON {t_object}.id={t_acl}.objectid '. - ' LEFT JOIN {t_language} '. - ' ON {t_language}.id={t_acl}.languageid '. - ' WHERE ( {t_acl}.userid={userid} OR '.$group_clause. - ' OR ({t_acl}.userid IS NULL AND {t_acl}.groupid IS NULL) )'. - ' ORDER BY {t_object}.projectid,{t_acl}.languageid' ); + $sql = $db->sql( 'SELECT {{acl}}.*,{{object}}.projectid,{{language}}.name AS languagename FROM {{acl}}'. + ' LEFT JOIN {{object}} '. + ' ON {{object}}.id={{acl}}.objectid '. + ' LEFT JOIN {{language}} '. + ' ON {{language}}.id={{acl}}.languageid '. + ' WHERE ( {{acl}}.userid={userid} OR '.$group_clause. + ' OR ({{acl}}.userid IS NULL AND {{acl}}.groupid IS NULL) )'. + ' ORDER BY {{object}}.projectid,{{acl}}.languageid' ); $sql->setInt ( 'userid' ,$this->userid ); $aclList = array(); @@ -728,7 +728,7 @@ SQL // $var = array(); // // // Alle Projekte lesen -// $sql = $db->sql( 'SELECT id,name FROM {t_project}' ); +// $sql = $db->sql( 'SELECT id,name FROM {{project}}' ); // $projects = $sql->getAssoc( $sql ); // // foreach( $projects as $projectid=>$projectname ) @@ -738,10 +738,10 @@ SQL // $var[$projectid]['folders'] = array(); // $var[$projectid]['rights'] = array(); // -// $sql = $db->sql( 'SELECT {t_acl}.* FROM {t_acl}'. -// ' LEFT JOIN {t_folder} ON {t_acl}.folderid = {t_folder}.id'. -// ' WHERE {t_folder}.projectid={projectid}'. -// ' AND {t_acl}.userid={userid}' ); +// $sql = $db->sql( 'SELECT {{acl}}.* FROM {{acl}}'. +// ' LEFT JOIN {{folder}} ON {{acl}}.folderid = {{folder}}.id'. +// ' WHERE {{folder}}.projectid={projectid}'. +// ' AND {{acl}}.userid={userid}' ); // $sql->setInt('projectid',$projectid ); // $sql->setInt('userid' ,$this->userid ); // @@ -757,7 +757,7 @@ SQL // $var[$projectid]['rights'][$aclid]['delete_url'] = Html::url(array('action'=>'user','subaction'=>'delright','aclid'=>$aclid)); // } // -// $sql = $db->sql( 'SELECT id FROM {t_folder}'. +// $sql = $db->sql( 'SELECT id FROM {{folder}}'. // ' WHERE projectid={projectid}' ); // $sql->setInt('projectid',$projectid); // $folders = $sql->getCol( $sql ); @@ -907,16 +907,16 @@ SQL $db = db_connection(); $sql = $db->sql( <<<SQL - SELECT {t_object}.id as objectid, - {t_object}.filename as filename, - {t_object}.lastchange_date as lastchange_date, - {t_project}.id as projectid, - {t_project}.name as projectname - FROM {t_object} - LEFT JOIN {t_project} - ON {t_object}.projectid = {t_project}.id - WHERE {t_object}.lastchange_userid = {userid} - ORDER BY {t_object}.lastchange_date DESC + SELECT {{object}}.id as objectid, + {{object}}.filename as filename, + {{object}}.lastchange_date as lastchange_date, + {{project}}.id as projectid, + {{project}}.name as projectname + FROM {{object}} + LEFT JOIN {{project}} + ON {{object}}.projectid = {{project}}.id + WHERE {{object}}.lastchange_userid = {userid} + ORDER BY {{object}}.lastchange_date DESC SQL ); diff --git a/model/Value.class.php b/model/Value.class.php @@ -160,13 +160,13 @@ class Value $db = db_connection(); if ( $this->publish ) - $sql = $db->sql( 'SELECT * FROM {t_value}'. + $sql = $db->sql( 'SELECT * FROM {{value}}'. ' WHERE elementid ={elementid}'. ' AND pageid ={pageid}'. ' AND languageid={languageid}'. ' AND publish=1' ); else - $sql = $db->sql( 'SELECT * FROM {t_value}'. + $sql = $db->sql( 'SELECT * FROM {{value}}'. ' WHERE elementid ={elementid}'. ' AND pageid ={pageid}'. ' AND languageid={languageid}'. @@ -203,10 +203,10 @@ class Value $db = db_connection(); - $sql = $db->sql( 'SELECT {t_value}.*,{t_user}.name as lastchange_username'. - ' FROM {t_value}'. - ' LEFT JOIN {t_user} ON {t_user}.id={t_value}.lastchange_userid'. - ' WHERE {t_value}.id={valueid}' ); + $sql = $db->sql( 'SELECT {{value}}.*,{{user}}.name as lastchange_username'. + ' FROM {{value}}'. + ' LEFT JOIN {{user}} ON {{user}}.id={{value}}.lastchange_userid'. + ' WHERE {{value}}.id={valueid}' ); $sql->setInt( 'valueid',$this->valueid); $row = $sql->getRow( $sql ); @@ -236,9 +236,9 @@ class Value { $db = db_connection(); - $sql = $db->sql( 'SELECT {t_value}.*,{t_user}.name as lastchange_username'. - ' FROM {t_value}'. - ' LEFT JOIN {t_user} ON {t_user}.id={t_value}.lastchange_userid'. + $sql = $db->sql( 'SELECT {{value}}.*,{{user}}.name as lastchange_username'. + ' FROM {{value}}'. + ' LEFT JOIN {{user}} ON {{user}}.id={{value}}.lastchange_userid'. ' WHERE elementid ={elementid}'. ' AND pageid ={pageid}'. ' AND languageid={languageid}'. @@ -279,7 +279,7 @@ class Value { $db = db_connection(); - $sql = $db->sql( 'SELECT COUNT(*) FROM {t_value}'. + $sql = $db->sql( 'SELECT COUNT(*) FROM {{value}}'. ' WHERE elementid ={elementid}'. ' AND pageid ={pageid}'. ' AND languageid={languageid}' ); @@ -297,7 +297,7 @@ class Value $sql = $db->sql( <<<SQL - SELECT lastchange_date FROM {t_value} + SELECT lastchange_date FROM {{value}} WHERE elementid ={elementid} AND pageid ={pageid} AND languageid={languageid} @@ -320,7 +320,7 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'UPDATE {t_value}'. + $sql = $db->sql( 'UPDATE {{value}}'. ' SET publish=0'. ' WHERE elementid ={elementid}'. ' AND pageid ={pageid}'. @@ -331,7 +331,7 @@ SQL $sql->query( $sql ); - $sql = $db->sql( 'UPDATE {t_value}'. + $sql = $db->sql( 'UPDATE {{value}}'. ' SET publish=1'. ' WHERE active = 1'. ' AND elementid ={elementid}'. @@ -352,7 +352,7 @@ SQL global $SESS; $db = db_connection(); - $sql = $db->sql( 'UPDATE {t_value}'. + $sql = $db->sql( 'UPDATE {{value}}'. ' SET active=0'. ' WHERE elementid ={elementid}'. ' AND pageid ={pageid}'. @@ -367,7 +367,7 @@ SQL { // Wenn Inhalt sofort veroeffentlicht werden kann, dann // alle anderen Inhalte auf nicht-veroeffentlichen stellen - $sql = $db->sql( 'UPDATE {t_value}'. + $sql = $db->sql( 'UPDATE {{value}}'. ' SET publish=0'. ' WHERE elementid ={elementid}'. ' AND pageid ={pageid}'. @@ -380,11 +380,11 @@ SQL } // Naechste ID aus Datenbank besorgen - $sql = $db->sql('SELECT MAX(id) FROM {t_value}'); + $sql = $db->sql('SELECT MAX(id) FROM {{value}}'); $this->valueid = intval($sql->getOne($sql))+1; $sql = $db->sql( <<<SQL -INSERT INTO {t_value} +INSERT INTO {{value}} (id ,linkobjectid ,text ,number ,date ,elementid ,pageid ,languageid ,active,publish ,lastchange_date ,lastchange_userid ) VALUES ({valueid},{linkobjectid},{text},{number},{date},{elementid},{pageid},{languageid},1 ,{publish},{lastchange_date},{lastchange_userid}) SQL @@ -435,7 +435,7 @@ SQL $db = db_connection(); $sql = $db->sql( <<<SQL - SELECT id FROM {t_value} + SELECT id FROM {{value}} WHERE elementid = {elementid} AND pageid = {pageid} AND languageid = {languageid} @@ -452,7 +452,7 @@ SQL if ( count($values) > $limit['min-revisions'] ) { $sql = $db->sql( <<<SQL - DELETE FROM {t_value} + DELETE FROM {{value}} WHERE elementid = {elementid} AND pageid = {pageid} AND languageid = {languageid} @@ -473,7 +473,7 @@ SQL if ( count($values) > $limit['max-revisions'] ) { $sql = $db->sql( <<<SQL - DELETE FROM {t_value} + DELETE FROM {{value}} WHERE elementid = {elementid} AND pageid = {pageid} AND languageid = {languageid} @@ -500,7 +500,7 @@ SQL function delete() { $db = db_connection(); - $sql = $db->sql( 'DELETE * FROM {t_value}'. + $sql = $db->sql( 'DELETE * FROM {{value}}'. ' WHERE elementid ={elementid}'. ' AND pageid ={pageid}'. ' AND languageid={languageid}' ); @@ -1541,14 +1541,14 @@ SQL { $db = db_connection(); - $sql = $db->sql( 'SELECT {t_object}.id FROM {t_value} '. - ' LEFT JOIN {t_page} '. - ' ON {t_page}.id={t_value}.pageid '. - ' LEFT JOIN {t_object} '. - ' ON {t_object}.id={t_page}.objectid '. - ' WHERE {t_value}.text LIKE {text}'. - ' AND {t_value}.languageid={languageid}'. - ' ORDER BY {t_object}.lastchange_date DESC' ); + $sql = $db->sql( 'SELECT {{object}}.id FROM {{value}} '. + ' LEFT JOIN {{page}} '. + ' ON {{page}}.id={{value}}.pageid '. + ' LEFT JOIN {{object}} '. + ' ON {{object}}.id={{page}}.objectid '. + ' WHERE {{value}}.text LIKE {text}'. + ' AND {{value}}.languageid={languageid}'. + ' ORDER BY {{object}}.lastchange_date DESC' ); $sql->setInt ( 'languageid',$this->languageid ); $sql->setString( 'text' ,'%'.$text.'%' ); @@ -1566,14 +1566,14 @@ SQL $db = db_connection(); - $sql = $db->sql( 'SELECT {t_object}.id FROM {t_value} '. - ' LEFT JOIN {t_page} '. - ' ON {t_page}.id={t_value}.pageid '. - ' LEFT JOIN {t_object} '. - ' ON {t_object}.id={t_page}.objectid '. - ' WHERE {t_value}.lastchange_userid={userid}'. - ' AND {t_value}.languageid={languageid}'. - ' ORDER BY {t_object}.lastchange_date DESC' ); + $sql = $db->sql( 'SELECT {{object}}.id FROM {{value}} '. + ' LEFT JOIN {{page}} '. + ' ON {{page}}.id={{value}}.pageid '. + ' LEFT JOIN {{object}} '. + ' ON {{object}}.id={{page}}.objectid '. + ' WHERE {{value}}.lastchange_userid={userid}'. + ' AND {{value}}.languageid={languageid}'. + ' ORDER BY {{object}}.lastchange_date DESC' ); $sql->setInt ( 'languageid',$this->languageid ); $sql->setInt ( 'userid' ,$userid ); @@ -1592,14 +1592,14 @@ SQL $db = db_connection(); $sql = $db->sql( <<<SQL -SELECT {t_object}.id - FROM {t_value} - LEFT JOIN {t_page} - ON {t_page}.id={t_value}.pageid - LEFT JOIN {t_object} - ON {t_object}.id={t_page}.objectid - WHERE {t_value}.lastchange_userid={userid} - ORDER BY {t_value}.lastchange_date DESC +SELECT {{object}}.id + FROM {{value}} + LEFT JOIN {{page}} + ON {{page}}.id={{value}}.pageid + LEFT JOIN {{object}} + ON {{object}}.id={{page}}.objectid + WHERE {{value}}.lastchange_userid={userid} + ORDER BY {{value}}.lastchange_date DESC SQL ); $sql->setInt ( 'userid' ,$userid ); @@ -1617,15 +1617,15 @@ SQL $db = db_connection(); $sql = $db->sql( <<<SQL -SELECT {t_object}.id - FROM {t_value} - LEFT JOIN {t_page} - ON {t_page}.id={t_value}.pageid - LEFT JOIN {t_object} - ON {t_object}.id={t_page}.objectid - WHERE {t_value}.lastchange_userid={userid} - AND {t_object}.projectid = {projectid} - ORDER BY {t_value}.lastchange_date DESC +SELECT {{object}}.id + FROM {{value}} + LEFT JOIN {{page}} + ON {{page}}.id={{value}}.pageid + LEFT JOIN {{object}} + ON {{object}}.id={{page}}.objectid + WHERE {{value}}.lastchange_userid={userid} + AND {{object}}.projectid = {projectid} + ORDER BY {{value}}.lastchange_date DESC SQL ); $sql->setInt ( 'userid' ,$userid );