commit 27820ebb79c2f7fa914f27d10780d331e4ad9e8c
parent c0b61f93931f37f2afc3b0b3223ebe0f4e6a353c
Author: Jan Dankert <devnull@localhost>
Date: Tue, 3 Jan 2017 23:31:48 +0100
Refactoring der Datenbank-Zugriffe: Es gibt ein Statement-Objekt, auf dem die Zugriffe durchgeführt werden.
Diffstat:
23 files changed, 870 insertions(+), 738 deletions(-)
diff --git a/auth/DatabaseAuth.class.php b/auth/DatabaseAuth.class.php
@@ -22,7 +22,7 @@ class DatabaseAuth implements Auth
$authdb = new DB( $authDbConf );
- $sql = new Sql( $conf['security']['authdb']['sql'] );
+ $sql = $db->sql( $conf['security']['authdb']['sql'] );
$sql->setString('username',$user );
$sql->setString('password',$password);
$row = $authdb->getRow( $sql );
diff --git a/auth/InternalAuth.class.php b/auth/InternalAuth.class.php
@@ -21,14 +21,14 @@ class InternalAuth implements Auth
$db = db_connection();
// Lesen des Benutzers aus der DB-Tabelle
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT * FROM {t_user}
WHERE name={name}
SQL
);
$sql->setString('name',$username);
- $row_user = $db->getRow( $sql );
+ $row_user = $sql->getRow( $sql );
if ( empty($row_user) )
// Benutzer ist nicht vorhanden
diff --git a/auth/LdapAuth.class.php b/auth/LdapAuth.class.php
@@ -9,14 +9,14 @@ class LdapAuth implements Auth
$this->mustChangePassword = false;
// Lesen des Benutzers aus der DB-Tabelle
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT * FROM {t_user}
WHERE name={name}
SQL
);
$sql->setString('name',$username);
- $row_user = $db->getRow( $sql );
+ $row_user = $sql->getRow( $sql );
$userid = $row_user['id'];
$ldap = new Ldap();
diff --git a/auth/LdapUserDNAuth.class.php b/auth/LdapUserDNAuth.class.php
@@ -17,14 +17,14 @@ class LdapUserDNAuth implements Auth
$this->mustChangePassword = false;
// Lesen des Benutzers aus der DB-Tabelle
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT * FROM {t_user}
WHERE name={name}
SQL
);
$sql->setString('name',$username);
- $row_user = $db->getRow( $sql );
+ $row_user = $sql->getRow( $sql );
if ( empty($row_user) )
return false;
diff --git a/db/Database.class.php b/db/Database.class.php
@@ -180,189 +180,6 @@ class DB
return true;
}
-
- /**
- * Ausfuehren einer Datenbankanfrage.
- *
- * @param SQL-Objekt
- * @return Object (Result)
- */
- public function query( &$query )
- {
- if ( !is_object($query) )
- throw new RuntimeException('SQL-Query must be an object');
-
- // Vorbereitete Datenbankabfrage ("Prepared Statement")
- $this->client->clear();
-
- // Statement an die Datenbank schicken
- $this->client->prepare( $query->raw,$query->param );
-
- // Einzelne Parameter an die Anfrage binden
- foreach ($query->param as $name=>$unused)
- $this->client->bind($name,$query->data[$name]);
-
- // Ausfuehren...
- $result = $this->client->query($query);
-
- if ( $result === FALSE )
- {
- throw new Exception( 'Database error: '.$this->client->error);
- }
-
- return $result;
- }
-
-
- /**
- * Ermittelt genau 1 Datenbankergebnis aus einer SQL-Anfrage.
- * Falls es mehrere Treffer gibt, wird die 1. Spalte aus der 1. Zeile genommen.
- *
- * @param String $query
- * @return String
- */
- public function &getOne( $query )
- {
- $none = '';
- $result = $this->query($query);
-
- $row = $this->client->fetchRow( $result,0 );
- $this->client->freeResult($result);
-
- if ( ! is_array($row) )
- return $none;
-
- $keys = array_keys($row);
-
- return $row[ $keys[0] ];
- }
-
-
- /**
- * Ermittelt eine Zeile aus der Datenbank.
- *
- * @param String $query
- * @return Array
- */
- public function &getRow( $query )
- {
- $result = $this->query($query);
-
- if ( $result === FALSE )
- {
- $this->error = $this->client->error;
-
- Logger::warn('Database error: '.$this->error);
- Http::serverError('Database Error',$this->error);
- }
-
- $row = $this->client->fetchRow( $result,0 );
- $this->client->freeResult($result);
-
- if ( ! is_array($row) )
- $row = array();
-
- return $row;
- }
-
-
- /**
- * Ermittelt eine (die 1.) Spalte aus dem Datenbankergebnis.
- *
- * @param String $query
- * @return Array
- */
- public function &getCol( $query )
- {
- $result = $this->query($query);
-
- $i = 0;
- $col = array();
- while( $row = $this->client->fetchRow( $result,$i++ ) )
- {
- if ( empty($row) )
- break;
-
- $keys = array_keys($row);
- $col[] = $row[ $keys[0] ];
- }
-
- $this->client->freeResult($result);
-
- return $col;
- }
-
-
- /**
- * Ermittelt ein assoziatives Array aus der Datenbank.
- *
- * @param String $query
- * @param Boolean $force_array
- * @return Array
- */
- public function &getAssoc( $query, $force_array = false )
- {
- $results = array();
- $result = $this->query($query);
-
- $i = 0;
-
- while( $row = $this->client->fetchRow( $result,$i++ ) )
- {
- if ( empty($row) )
- break;
-
- if ( count($row) > 2 || $force_array )
- {
- // FIXME: Wird offenbar nie ausgeführt.
- $row = $res->fetchRow($i);
-
- $keys = array_keys($row);
- $key1 = $keys[0];
-
- unset( $row[$key1] );
- $results[ $row[$key1] ] = $row;
- }
- else
- {
- $keys = array_keys($row);
- $key1 = $keys[0];
- $key2 = $keys[1];
-
- $results[ $row[$key1] ] = $row[$key2];
- }
- }
-
- $this->client->freeResult( $result );
-
- return $results;
- }
-
-
- /**
- * Ermittelt alle Datenbankergebniszeilen.
- *
- * @param String $query
- * @return Array
- */
- public function &getAll( $query )
- {
- $result = $this->query( $query );
-
- $results = array();
- $i = 0;
-
- while( $row = $this->client->fetchRow( $result,$i++ ) )
- {
- $results[] = $row;
- }
-
- $this->client->freeResult( $result );
-
- return $results;
- }
-
-
/**
* Startet eine Transaktion.
* Falls der Schalter 'transaction' nicht gesetzt ist, passiert nichts.
@@ -387,28 +204,7 @@ class DB
}
}
-
- /**
- * Führt eine Query aus und gibt nur zurück, ob diese funktioniert.
- *
- * @param unknown_type $query
- * @return boolean
- */
- public function testQuery( $query )
- {
-
- try
- {
- $result = $this->query($query);
- return $result;
- }
- catch( Exception $e )
- {
- return false;
- }
-
- }
-
+
/**
* Setzt eine Transaktion zurueck.
@@ -425,7 +221,7 @@ class DB
public function sql( $sql )
{
- return new Statement( $sql,$this->client );
+ return new Statement( $sql,$this->client,$this->id);
}
}
diff --git a/db/DbVersion.class.php b/db/DbVersion.class.php
@@ -77,10 +77,10 @@ abstract class DbVersion
$table_opts = $this->dbmsType=='mysql'?' ENGINE=InnoDB CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci':'';
- $ddl = new Sql('CREATE TABLE '.$tableName.'(id INTEGER)'.$table_opts.';');
+ $ddl = $this->db->sql('CREATE TABLE '.$tableName.'(id INTEGER)'.$table_opts.';');
// The syntax 'TYPE = InnoDB' was deprecated in MySQL 5.0 and was removed in MySQL 5.1 and later versions.
- $this->db->query( $ddl );
+ $ddl->query();
}
@@ -179,12 +179,12 @@ abstract class DbVersion
}
- $ddl = new Sql('ALTER TABLE '.$table.
+ $ddl = $this->db->sql('ALTER TABLE '.$table.
' ADD COLUMN '.$columnName.' '.$dbmsInternalType.($size!=null?'('.$size.')':'').
($default!=null?' DEFAULT '.(is_string($default)?"'":'').$default.(is_string($default)?"'":''):'').
' '.($nullable?'NULL':'NOT NULL').';'
);
- $this->db->query( $ddl );
+ $ddl->query();
}
@@ -197,9 +197,9 @@ abstract class DbVersion
if ( !is_array($columnNames) )
$columnNames = explode(',',$columnNames);
- $ddl = new Sql('ALTER TABLE '.$table.' ADD PRIMARY KEY ('.implode(',',$columnNames).');');
- $this->db->query( $ddl );
-
+ $ddl = $this->db->sql('ALTER TABLE '.$table.' ADD PRIMARY KEY ('.implode(',',$columnNames).');');
+ $ddl->query();
+
}
@@ -220,8 +220,9 @@ abstract class DbVersion
// echo "CREATE UNIQUE INDEX ${prefix}uidx_${cnt}" >> $outfile
// else
- $ddl = new Sql('CREATE '.($unique?'UNIQUE ':'').'INDEX '.$indexName.' ON '.$table.' ('.implode(',',$columnNames).');');
- $this->db->query( $ddl );
+ $ddl = $this->db->sql('CREATE '.($unique?'UNIQUE ':'').'INDEX '.$indexName.' ON '.$table.' ('.implode(',',$columnNames).');');
+ $ddl->query();
+
}
@@ -256,9 +257,8 @@ abstract class DbVersion
// fi
// Oracle doesn't support "ON DELETE RESTRICT"-Statements, but its the default.
- $ddl = new Sql('ALTER TABLE '.$table.' ADD CONSTRAINT '.$constraintName.' FOREIGN KEY ('.$columnName.') REFERENCES '.$targetTable.' ('.$targetColumnName.') ON DELETE RESTRICT ON UPDATE RESTRICT;');
- $this->db->query( $ddl );
-
+ $ddl = $this->db->sql('ALTER TABLE '.$table.' ADD CONSTRAINT '.$constraintName.' FOREIGN KEY ('.$columnName.') REFERENCES '.$targetTable.' ('.$targetColumnName.') ON DELETE RESTRICT ON UPDATE RESTRICT;');
+ $ddl->query();
}
@@ -267,25 +267,24 @@ abstract class DbVersion
{
$table = $this->getTableName($tableName);
- $ddl = new Sql('DROP TABLE '.$table.';' );
- $this->db->query( $ddl );
-
+ $ddl = $this->db->sql('DROP TABLE '.$table.';' );
+ $ddl->query();
}
function dropColumn( $tableName,$columnName )
{
$table = $this->getTableName($tableName);
- $ddl = new Sql('ALTER TABLE '.$table.' DROP COLUMN '.$columnName.';');
- $this->db->query( $ddl );
+ $ddl = $this->db->sql('ALTER TABLE '.$table.' DROP COLUMN '.$columnName.';');
+ $ddl->query();
+
}
function dropIndex( $indexName,$unique=false)
{
- $ddl = new Sql('DROP'.($unique?' UNIQUE':'').' INDEX '.$indexName.';' );
- $this->db->query( $ddl );
-
+ $ddl = $this->db->sql('DROP'.($unique?' UNIQUE':'').' INDEX '.$indexName.';' );
+ $ddl->query();
}
function dropUniqueIndex( $indexName)
@@ -300,16 +299,15 @@ abstract class DbVersion
if ( !is_array($columnNames) )
$columnNames = explode(',',$columnNames);
- $ddl = new Sql('ALTER TABLE '.$table.' DROP PRIMARY KEY('.implode(',',$columnNames).')');
- $this->db->query( $ddl );
+ $ddl = $this->db->sql('ALTER TABLE '.$table.' DROP PRIMARY KEY('.implode(',',$columnNames).')');
+ $ddl->query();
}
function dropConstraint( $constraintName)
{
- $ddl = new Sql('DROP CONSTRAINT '.$constraintName.';' );
- $this->db->query( $ddl );
-
+ $ddl = $this->db->sql('DROP CONSTRAINT '.$constraintName.';' );
+ $ddl->query();
}
diff --git a/db/Statement.class.php b/db/Statement.class.php
@@ -0,0 +1,336 @@
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP version 4.0 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2001 The PHP Group |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license, |
+// | that is bundled with this package in the file LICENSE, and is |
+// | available at through the world-wide-web at |
+// | http://www.php.net/license/2_02.txt. |
+// | If you did not receive a copy of the PHP license and are unable to |
+// | obtain it through the world-wide-web, please send a note to |
+// | license@php.net so we can mail you a copy immediately. |
+// +----------------------------------------------------------------------+
+// | Authors: Stig Bakken <ssb@fast.no> |
+// | Jan Dankert <phpdb@jandankert.de> |
+// +----------------------------------------------------------------------+
+//
+
+// This is the database abstraction layer. This class was inspired by the
+// PHP-Pear-DB package. Thanks to its developers.
+
+/**
+ * Darstellung einer Datenbank-Verbindung.
+ * Fuer die echten DB-Aufrufe werden die entsprechenden
+ * Methoden des passenden Clients aufgerufen.
+ *
+ * Diese Klasse stammt urspruenglich aus dem PHP-Pear-DB-Projekt und unterliegt
+ * daher auch der PHP-licence.
+ *
+ * @author Jan Dankert
+ * @package openrat.database
+ */
+class Statement
+{
+
+ /**
+ * SQL-Objekt.
+ *
+ * @var SQL
+ */
+ var $sql;
+
+ /**
+ * Client.
+ * Enth�lt ein Objekt der Klasse db_<type>.
+ *
+ * @var Object
+ */
+ var $client;
+
+ /**
+ * Kontruktor.
+ * Erwartet die Datenbank-Konfiguration als Parameter.
+ *
+ * @param Array Konfiguration der Verbindung
+ * @return Status 'true' wenn Verbindung erfolgreich aufgebaut.
+ */
+ public function Statement( $sql, $client,$dbid )
+ {
+ $this->client = $client;
+ $this->sql = new Sql( $sql,$dbid );
+ }
+
+
+
+ /**
+ * Ausfuehren einer Datenbankanfrage.
+ *
+ * @param SQL-Objekt
+ * @return Object (Result)
+ */
+ public function query( )
+ {
+ $this->execute();
+ }
+
+
+ /**
+ * Ausfuehren einer Datenbankanfrage.
+ *
+ * @param SQL-Objekt
+ * @return Object (Result)
+ */
+ public function execute( )
+ {
+ // Vorbereitete Datenbankabfrage ("Prepared Statement")
+ $this->client->clear();
+
+ // Statement an die Datenbank schicken
+ $this->client->prepare( $this->sql->raw,$this->sql->param );
+
+ // Einzelne Parameter an die Anfrage binden
+ foreach ($this->sql->param as $name=>$unused)
+ $this->client->bind($name,$this->sql->data[$name]);
+
+ // Ausfuehren...
+ $result = $this->client->query($this->sql);
+
+ if ( $result === FALSE )
+ {
+ throw new Exception( 'Database error: '.$this->client->error);
+ }
+
+ return $result;
+ }
+
+
+ /**
+ * Ermittelt genau 1 Datenbankergebnis aus einer SQL-Anfrage.
+ * Falls es mehrere Treffer gibt, wird die 1. Spalte aus der 1. Zeile genommen.
+ *
+ * @param String $this->query
+ * @return String
+ */
+ public function &getOne()
+ {
+ $none = '';
+ $result = $this->query();
+
+ $row = $this->client->fetchRow( $result,0 );
+ $this->client->freeResult($result);
+
+ if ( ! is_array($row) )
+ return $none;
+
+ $keys = array_keys($row);
+
+ return $row[ $keys[0] ];
+ }
+
+
+ /**
+ * Ermittelt eine Zeile aus der Datenbank.
+ *
+ * @param String $this->query
+ * @return Array
+ */
+ public function &getRow()
+ {
+ $result = $this->query();
+
+ if ( $result === FALSE )
+ {
+ $this->error = $this->client->error;
+
+ Logger::warn('Database error: '.$this->error);
+ Http::serverError('Database Error',$this->error);
+ }
+
+ $row = $this->client->fetchRow( $result,0 );
+ $this->client->freeResult($result);
+
+ if ( ! is_array($row) )
+ $row = array();
+
+ return $row;
+ }
+
+
+ /**
+ * Ermittelt eine (die 1.) Spalte aus dem Datenbankergebnis.
+ *
+ * @param String $this->query
+ * @return Array
+ */
+ public function &getCol()
+ {
+ $result = $this->query();
+
+ $i = 0;
+ $col = array();
+ while( $row = $this->client->fetchRow( $result,$i++ ) )
+ {
+ if ( empty($row) )
+ break;
+
+ $keys = array_keys($row);
+ $col[] = $row[ $keys[0] ];
+ }
+
+ $this->client->freeResult($result);
+
+ return $col;
+ }
+
+
+ /**
+ * Ermittelt ein assoziatives Array aus der Datenbank.
+ *
+ * @param String $this->query
+ * @param Boolean $force_array
+ * @return Array
+ */
+ public function &getAssoc( $force_array = false )
+ {
+ $results = array();
+ $result = $this->query();
+
+ $i = 0;
+
+ while( $row = $this->client->fetchRow( $result,$i++ ) )
+ {
+ if ( empty($row) )
+ break;
+
+ if ( count($row) > 2 || $force_array )
+ {
+ // FIXME: Wird offenbar nie ausgeführt.
+ $row = $res->fetchRow($i);
+
+ $keys = array_keys($row);
+ $key1 = $keys[0];
+
+ unset( $row[$key1] );
+ $results[ $row[$key1] ] = $row;
+ }
+ else
+ {
+ $keys = array_keys($row);
+ $key1 = $keys[0];
+ $key2 = $keys[1];
+
+ $results[ $row[$key1] ] = $row[$key2];
+ }
+ }
+
+ $this->client->freeResult( $result );
+
+ return $results;
+ }
+
+
+ /**
+ * Ermittelt alle Datenbankergebniszeilen.
+ *
+ * @param String $this->query
+ * @return Array
+ */
+ public function &getAll()
+ {
+ $result = $this->query();
+
+ $results = array();
+ $i = 0;
+
+ while( $row = $this->client->fetchRow( $result,$i++ ) )
+ {
+ $results[] = $row;
+ }
+
+ $this->client->freeResult( $result );
+
+ return $results;
+ }
+
+
+ /**
+ * Führt eine Query aus und gibt nur zurück, ob diese funktioniert.
+ *
+ * @param unknown_type $this->query
+ * @return boolean
+ */
+ public function testQuery()
+ {
+ try
+ {
+ $result = $this->query();
+ return $result;
+ }
+ catch( Exception $e )
+ {
+ return false;
+ }
+ }
+
+
+
+ /**
+ * Setzt eine Ganzzahl als Parameter.<br>
+ *
+ * @param name Name des Parameters
+ * @param value Inhalt
+ */
+ function setInt( $name,$value )
+ {
+ $this->sql->setInt($name, $value);
+ }
+
+
+
+ /**
+ * Setzt eine Zeichenkette als Parameter.<br>
+ *
+ * @param name Name des Parameters
+ * @param value Inhalt
+ */
+ function setString( $name,$value )
+ {
+ $this->sql->setString($name, $value);
+ }
+
+
+
+ /**
+ * Setzt einen bool'schen Wert als Parameter.<br>
+ * Ist der Parameterwert wahr, dann wird eine 1 gesetzt. Sonst 0.<br>
+ *
+ * @param name Name des Parameters
+ * @param value Inhalt
+ */
+ function setBoolean( $name,$value )
+ {
+ if ( $value )
+ $this->setInt( $name,1 );
+ else $this->setInt( $name,0 );
+ }
+
+
+
+ /**
+ * Setzt einen Parameter auf den Wert <code>null</code>.<br>
+ *
+ * @param name Name des Parameters
+ */
+ function setNull( $name )
+ {
+ $this->sql->setNull($name);
+ }
+
+
+}
+
+
+?>+
\ No newline at end of file
diff --git a/db/include.inc.php b/db/include.inc.php
@@ -1,6 +1,7 @@
<?php
require_once( OR_DBCLASSES_DIR."Database.class.php" );
+require_once( OR_DBCLASSES_DIR."Statement.class.php" );
require_once( OR_DBCLASSES_DIR."driver/postgresql.class.php" );
require_once( OR_DBCLASSES_DIR."driver/mysql.class.php" );
if (version_compare(PHP_VERSION, '5.0.0', '>'))
diff --git a/model/Acl.class.php b/model/Acl.class.php
@@ -195,7 +195,7 @@ class Acl
{
$db = db_connection();
- $sql = new Sql( 'SELECT {t_acl}.*,{t_user}.name as username,{t_group}.name as groupname,{t_language}.name as languagename'.
+ $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 '.
@@ -204,7 +204,7 @@ class Acl
$sql->setInt('aclid',$this->aclid);
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
$this->setDatabaseRow( $row );
@@ -224,13 +224,13 @@ class Acl
{
$db = db_connection();
- $sql = new Sql( 'SELECT * '.
+ $sql = $db->sql( 'SELECT * '.
' FROM {t_acl} '.
' WHERE {t_acl}.id={aclid}' );
$sql->setInt('aclid',$this->aclid);
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
$this->setDatabaseRow( $row );
}
@@ -377,14 +377,14 @@ class Acl
{
$db = db_connection();
- $sql = new Sql( 'DELETE FROM {t_acl} '.
+ $sql = $db->sql( 'DELETE FROM {t_acl} '.
' WHERE id = {aclid} '.
' AND objectid= {objectid}' );
$sql->setInt('aclid' ,$this->aclid );
$sql->setInt('objectid',$this->objectid);
- $db->query( $sql );
+ $sql->query( $sql );
$this->aclid = 0;
}
@@ -405,7 +405,7 @@ class Acl
$group_comp = intval($this->groupid )>0?'=':'IS';
$language_comp = intval($this->languageid)>0?'=':'IS';
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT id FROM {t_acl}
WHERE userid $user_comp {userid} AND
groupid $group_comp {groupid} AND
@@ -453,7 +453,7 @@ SQL
else
$sql->setInt ('languageid',$this->languageid);
- $aclid = intval($db->getOne($sql));
+ $aclid = intval($sql->getOne($sql));
if ( $aclid > 0 )
{
// Eine ACL existiert bereits, wir übernehmen diese ID
@@ -464,10 +464,10 @@ SQL
- $sql = new Sql('SELECT MAX(id) FROM {t_acl}');
- $this->aclid = intval($db->getOne($sql))+1;
+ $sql = $db->sql('SELECT MAX(id) FROM {t_acl}');
+ $this->aclid = intval($sql->getOne($sql))+1;
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
INSERT INTO {t_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} )
@@ -504,6 +504,6 @@ SQL
else
$sql->setInt ('languageid',$this->languageid);
- $db->query( $sql );
+ $sql->query( $sql );
}
}
\ No newline at end of file
diff --git a/model/Element.class.php b/model/Element.class.php
@@ -140,10 +140,10 @@ class Element
{
$db = db_connection();
- $sql = new Sql('SELECT MAX(id) FROM {t_element}');
- $this->elementid = intval($db->getOne($sql))+1;
+ $sql = $db->sql('SELECT MAX(id) FROM {t_element}');
+ $this->elementid = intval($sql->getOne($sql))+1;
- $sql = new Sql( 'INSERT INTO {t_element}'.
+ $sql = $db->sql( 'INSERT INTO {t_element}'.
' (id,templateid,name,descr,type,writable) '.
" VALUES ( {elementid},{templateid},{name},{description},{type},{writable} ) " );
@@ -154,7 +154,7 @@ class Element
$sql->setBoolean( 'writable' ,$this->writable );
$sql->setString ( 'description',$this->desc );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -178,13 +178,13 @@ class Element
if ( intval($this->elementid) != 0 )
{
$db = db_connection();
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT * FROM {t_element}
WHERE id={elementid}
SQL
);
$sql->setInt( 'elementid',$this->elementid );
- $this->setDatabaseRow( $db->getRow( $sql ) );
+ $this->setDatabaseRow( $sql->getRow( $sql ) );
}
}
@@ -229,7 +229,7 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'UPDATE {t_element}'.
+ $sql = $db->sql( 'UPDATE {t_element}'.
' SET templateid = {templateid},'.
' name = {name},'.
' descr = {desc},'.
@@ -276,7 +276,7 @@ SQL
$sql->setNull( 'defaultObjectId' );
else $sql->setInt ( 'defaultObjectId' ,$this->defaultObjectId );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -292,14 +292,14 @@ SQL
$this->type = $type;
$db = db_connection();
- $sql = new Sql( 'UPDATE {t_element}'.
+ $sql = $db->sql( 'UPDATE {t_element}'.
' SET type = {type}'.
' WHERE id={elementid}' );
$sql->setInt ( 'elementid',$this->elementid );
$sql->setString ( 'type' ,$this->type );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -329,11 +329,11 @@ SQL
$this->deleteValues();
// Element l?schen
- $sql = new Sql('DELETE FROM {t_element} '.
+ $sql = $db->sql('DELETE FROM {t_element} '.
' WHERE id={elementid}' );
$sql->setInt( 'elementid',$this->elementid );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -346,10 +346,10 @@ SQL
$db = db_connection();
// Alle Inhalte mit diesem Element l?schen
- $sql = new Sql('DELETE FROM {t_value} '.
+ $sql = $db->sql('DELETE FROM {t_value} '.
' WHERE elementid={elementid}' );
$sql->setInt( 'elementid',$this->elementid );
- $db->query( $sql );
+ $sql->query( $sql );
}
diff --git a/model/File.class.php b/model/File.class.php
@@ -165,10 +165,10 @@ class File extends Object
$sqlquery .= " WHERE is_file=1 AND projectid={projectid}";
}
- $sql = new Sql( $sqlquery );
+ $sql = $db->sql( $sqlquery );
$sql->setInt( 'projectid',$SESS['projectid'] );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -183,7 +183,7 @@ class File extends Object
{
$db = db_connection();
- $sql = new Sql( 'SELECT {t_file}.objectid FROM {t_file} '.
+ $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}'.
@@ -191,7 +191,7 @@ class File extends Object
$sql->setInt ( 'projectid',$this->projectid );
$sql->setString( 'extension',$extension );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -424,11 +424,11 @@ class File extends Object
{
$db = db_connection();
- $sql = new Sql( 'SELECT id,extension,size'.
+ $sql = $db->sql( 'SELECT id,extension,size'.
' FROM {t_file}'.
' WHERE objectid={objectid}' );
$sql->setInt( 'objectid',$this->objectid );
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
if ( count($row)!=0 )
{
@@ -450,10 +450,10 @@ class File extends Object
$db = db_connection();
// Datei l?schen
- $sql = new Sql( 'DELETE FROM {t_file} '.
+ $sql = $db->sql( 'DELETE FROM {t_file} '.
' WHERE objectid={objectid}' );
$sql->setInt( 'objectid',$this->objectid );
- $db->query( $sql );
+ $sql->query( $sql );
$this->objectDelete();
}
@@ -515,7 +515,7 @@ class File extends Object
global $SESS;
$db = db_connection();
- $sql = new Sql( <<<EOF
+ $sql = $db->sql( <<<EOF
UPDATE {t_file} SET
size = {size},
extension = {extension}
@@ -525,7 +525,7 @@ EOF
$sql->setString('size' ,$this->size );
$sql->setString('extension',$this->extension );
$sql->setString('objectid' ,$this->objectid );
- $db->query( $sql );
+ $sql->query( $sql );
$this->objectSave();
}
@@ -555,11 +555,11 @@ EOF
$db = db_connection();
- $sql = new Sql( 'SELECT size,value'.
+ $sql = $db->sql( 'SELECT size,value'.
' FROM {t_file}'.
' WHERE objectid={objectid}' );
$sql->setInt( 'objectid',$this->objectid );
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
if ( count($row) != 0 )
{
@@ -589,7 +589,7 @@ EOF
$db = db_connection();
- $sql = new Sql( 'UPDATE {t_file}'.
+ $sql = $db->sql( 'UPDATE {t_file}'.
' SET value={value}, '.
' size={size} '.
' WHERE objectid={objectid}' );
@@ -601,7 +601,7 @@ EOF
else
$sql->setString( 'value',$this->value );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -624,17 +624,17 @@ EOF
$this->objectAdd();
- $sql = new Sql('SELECT MAX(id) FROM {t_file}');
- $this->fileid = intval($db->getOne($sql))+1;
+ $sql = $db->sql('SELECT MAX(id) FROM {t_file}');
+ $this->fileid = intval($sql->getOne($sql))+1;
- $sql = new Sql('INSERT INTO {t_file}'.
+ $sql = $db->sql('INSERT INTO {t_file}'.
' (id,objectid,extension,size,value)'.
" VALUES( {fileid},{objectid},{extension},0,'' )" );
$sql->setInt ('fileid' ,$this->fileid );
$sql->setInt ('objectid' ,$this->objectid );
$sql->setString('extension',$this->extension );
- $db->query( $sql );
+ $sql->query( $sql );
$this->saveValue();
}
diff --git a/model/Folder.class.php b/model/Folder.class.php
@@ -50,16 +50,16 @@ class Folder extends Object
$db = db_connection();
- $sql = new Sql('SELECT MAX(id) FROM {t_folder}');
- $this->folderid = intval($db->getOne($sql))+1;
+ $sql = $db->sql('SELECT MAX(id) FROM {t_folder}');
+ $this->folderid = intval($sql->getOne($sql))+1;
- $sql = new Sql('INSERT INTO {t_folder}'.
+ $sql = $db->sql('INSERT INTO {t_folder}'.
' (id,objectid)'.
' VALUES( {folderid},{objectid} )' );
$sql->setInt ('folderid' ,$this->folderid );
$sql->setInt ('objectid' ,$this->objectid );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -69,7 +69,7 @@ class Folder extends Object
global $SESS;
$db = db_connection();
- $sql = new SQL('SELECT id FROM {t_object}'.
+ $sql = $db->sql('SELECT id FROM {t_object}'.
' WHERE parentid IS NULL'.
' AND is_folder=1'.
' AND projectid={projectid}' );
@@ -86,7 +86,7 @@ class Folder extends Object
}
// Datenbankabfrage ausfuehren
- return $db->getOne( $sql );
+ return $sql->getOne( $sql );
}
@@ -94,7 +94,7 @@ class Folder extends Object
{
$db = db_connection();
- $sql = new Sql('SELECT COUNT(*) FROM {t_object}'.' WHERE parentid={objectid} AND filename={filename}');
+ $sql = $db->sql('SELECT COUNT(*) FROM {t_object}'.' WHERE parentid={objectid} AND filename={filename}');
if ( intval($this->objectid)== 0 )
$sql->setNull('objectid');
@@ -103,7 +103,7 @@ class Folder extends Object
$sql->setString('filename', $filename );
- return( $db->getOne($sql) > 0 );
+ return( $sql->getOne($sql) > 0 );
}
@@ -111,10 +111,10 @@ class Folder extends Object
{
// $db = db_connection();
//
-// $sql = new Sql('SELECT * FROM {t_folder} WHERE objectid={objectid}');
+// $sql = $db->sql('SELECT * FROM {t_folder} WHERE objectid={objectid}');
// $sql->setInt('objectid',$this->objectid);
//
-// $row = $db->getRow( $sql );
+// $row = $sql->getRow( $sql );
//
$this->objectLoad();
@@ -134,13 +134,13 @@ class Folder extends Object
{
$db = db_connection();
- $sql = new Sql('UPDATE {t_folder} '.
+ $sql = $db->sql('UPDATE {t_folder} '.
' SET orderid={orderid}'.
' WHERE id={folderid}');
$sql->setInt('folderid',$this->folderid);
$sql->setInt('orderid' ,$orderid );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -150,14 +150,14 @@ class Folder extends Object
// global $SESS;
// $db = db_connection();
//
-// $sql = new Sql('SELECT id FROM {t_folder}'.
+// $sql = $db->sql('SELECT id FROM {t_folder}'.
// ' WHERE parentid={folderid}'.
// ' AND projectid={projectid}'.
// ' ORDER BY orderid ASC' );
// $sql->setInt('folderid' ,$SESS['folderid' ]);
// $sql->setInt('projectid',$SESS['projectid']);
//
-// return( $db->getCol( $sql ));
+// return( $sql->getCol( $sql ));
// }
@@ -166,12 +166,12 @@ class Folder extends Object
{
$db = db_connection();
- $sql = new Sql('SELECT id FROM {t_object}'.
+ $sql = $db->sql('SELECT id FROM {t_object}'.
' WHERE parentid={objectid}'.
' ORDER BY orderid ASC' );
$sql->setInt('objectid' ,$this->objectid );
- return( $db->getCol( $sql ) );
+ return( $sql->getCol( $sql ) );
}
@@ -184,7 +184,7 @@ class Folder extends Object
{
$db = db_connection();
- $sql = new Sql('SELECT {t_object}.*,{t_name}.name,{t_name}.descr'.
+ $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} '.
@@ -194,7 +194,7 @@ class Folder extends Object
$sql->setInt('objectid' ,$this->objectid );
$liste = array();
- $res = $db->getAll( $sql );
+ $res = $sql->getAll( $sql );
foreach( $res as $row )
{
$o = new Object( $row['id'] );
@@ -211,13 +211,13 @@ class Folder extends Object
{
$db = db_connection();
- $sql = new Sql('SELECT id FROM {t_object}'.
+ $sql = $db->sql('SELECT id FROM {t_object}'.
' WHERE parentid={objectid}'.
' ORDER BY is_link,is_page,is_file,is_folder,orderid ASC' );
$sql->setInt('projectid',$this->projectid );
$sql->setInt('objectid' ,$this->objectid );
- return( $db->getCol( $sql ) );
+ return( $sql->getCol( $sql ) );
}
@@ -226,13 +226,13 @@ class Folder extends Object
{
$db = db_connection();
- $sql = new Sql('SELECT {t_object}.id FROM {t_object}'.
+ $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} '.
' WHERE parentid={objectid}'.
' ORDER BY {t_name}.name,{t_object}.filename ASC');
$sql->setInt('objectid' , $this->objectid );
$sql->setInt('languageid', $this->languageid);
- return( $db->getCol( $sql ) );
+ return( $sql->getCol( $sql ) );
}
@@ -241,13 +241,13 @@ class Folder extends Object
{
$db = db_connection();
- $sql = new Sql('SELECT id FROM {t_object}'.
+ $sql = $db->sql('SELECT id FROM {t_object}'.
' WHERE parentid={objectid}'.
' ORDER BY lastchange_date,orderid ASC' );
$sql->setInt('projectid',$this->projectid );
$sql->setInt('objectid' ,$this->objectid );
- return( $db->getCol( $sql ) );
+ return( $sql->getCol( $sql ) );
}
@@ -293,13 +293,13 @@ class Folder extends Object
{
$db = db_connection();
- $sql = new Sql('SELECT id FROM {t_object}'.
+ $sql = $db->sql('SELECT id FROM {t_object}'.
' WHERE parentid={objectid}'.
' AND filename={filename}' );
$sql->setInt ('objectid' ,$this->objectid );
$sql->setString('filename' ,$filename );
- return( intval($db->getOne( $sql )) );
+ return( intval($sql->getOne( $sql )) );
}
@@ -318,7 +318,7 @@ class Folder extends Object
global $SESS;
$db = db_connection();
- $sql = new Sql('SELECT id FROM {t_object}'.
+ $sql = $db->sql('SELECT id FROM {t_object}'.
' WHERE projectid={projectid}'.
' AND ( is_folder={is_folder}' .
' OR is_file ={is_file}' .
@@ -342,7 +342,7 @@ class Folder extends Object
$sql->setInt('is_page' ,in_array('page' ,$types)?1:2);
$sql->setInt('is_link' ,in_array('link' ,$types)?1:2);
- return( $db->getCol( $sql ) );
+ return( $sql->getCol( $sql ) );
}
@@ -351,7 +351,7 @@ class Folder extends Object
global $SESS;
$db = db_connection();
- $sql = new Sql('SELECT id FROM {t_object}'.
+ $sql = $db->sql('SELECT id FROM {t_object}'.
' WHERE parentid IS NULL'.
' AND projectid={projectid}' );
@@ -359,7 +359,7 @@ class Folder extends Object
$sql->setInt('projectid',$this->projectid );
else $sql->setInt('projectid',$SESS['projectid'] );
- return( $db->getOne( $sql ) );
+ return( $sql->getOne( $sql ) );
}
@@ -368,14 +368,14 @@ class Folder extends Object
global $SESS;
$db = db_connection();
- $sql = new Sql('SELECT id FROM {t_object}'.
+ $sql = $db->sql('SELECT id FROM {t_object}'.
' WHERE is_folder=1'.
' and id != {objectid} '.
' AND projectid={projectid}' );
$sql->setInt( 'projectid',$this->projectid );
$sql->setInt( 'objectid' ,$this->objectid );
- return( $db->getCol( $sql ) );
+ return( $sql->getCol( $sql ) );
}
@@ -384,7 +384,7 @@ class Folder extends Object
global $SESS;
$db = db_connection();
- $sql = new Sql('SELECT id FROM {t_object}'.
+ $sql = $db->sql('SELECT id FROM {t_object}'.
' WHERE is_folder=1'.
' AND projectid={projectid}' );
@@ -395,7 +395,7 @@ class Folder extends Object
}
else $sql->setInt( 'projectid',$this->projectid );
- return( $db->getCol( $sql ) );
+ return( $sql->getCol( $sql ) );
}
@@ -403,12 +403,12 @@ class Folder extends Object
{
$db = db_connection();
- $sql = new Sql('SELECT id FROM {t_object} '.
+ $sql = $db->sql('SELECT id FROM {t_object} '.
' WHERE parentid={objectid} AND is_page=1'.
' ORDER BY orderid ASC' );
$sql->setInt( 'objectid' ,$this->objectid );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -421,13 +421,13 @@ class Folder extends Object
{
$db = db_connection();
- $sql = new Sql('SELECT id FROM {t_object} '.
+ $sql = $db->sql('SELECT id FROM {t_object} '.
' WHERE parentid={objectid}'.
' AND (is_page=1)'.
' ORDER BY orderid ASC' );
$sql->setInt( 'objectid' ,$this->objectid );
- $oid = intval($db->getOne( $sql ));
+ $oid = intval($sql->getOne( $sql ));
if ( $oid != 0 )
$o = new Object($oid);
@@ -447,13 +447,13 @@ class Folder extends Object
{
$db = db_connection();
- $sql = new Sql('SELECT id FROM {t_object} '.
+ $sql = $db->sql('SELECT id FROM {t_object} '.
' WHERE parentid={objectid}'.
' AND (is_page=1 OR is_link=1)'.
' ORDER BY orderid ASC' );
$sql->setInt( 'objectid' ,$this->objectid );
- $oid = intval($db->getOne( $sql ));
+ $oid = intval($sql->getOne( $sql ));
if ( $oid != 0 )
$o = new Object($oid);
@@ -468,13 +468,13 @@ class Folder extends Object
{
$db = db_connection();
- $sql = new Sql('SELECT id FROM {t_object} '.
+ $sql = $db->sql('SELECT id FROM {t_object} '.
' WHERE parentid={objectid}'.
' AND (is_page=1 OR is_link=1)'.
' ORDER BY orderid DESC' );
$sql->setInt( 'objectid' ,$this->objectid );
- $oid = intval($db->getOne( $sql ));
+ $oid = intval($sql->getOne( $sql ));
if ( $oid != 0 )
$o = new Object($oid);
@@ -489,12 +489,12 @@ class Folder extends Object
{
$db = db_connection();
- $sql = new Sql('SELECT id FROM {t_object} '.
+ $sql = $db->sql('SELECT id FROM {t_object} '.
' WHERE parentid={objectid} AND is_file=1'.
' ORDER BY orderid ASC' );
$sql->setInt( 'objectid' ,$this->objectid );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -508,12 +508,12 @@ class Folder extends Object
{
$db = db_connection();
- $sql = new Sql('SELECT id,filename FROM {t_object} '.
+ $sql = $db->sql('SELECT id,filename FROM {t_object} '.
' WHERE parentid={objectid} AND is_file=1'.
' ORDER BY orderid ASC' );
$sql->setInt( 'objectid' ,$this->objectid );
- return $db->getAssoc( $sql );
+ return $sql->getAssoc( $sql );
}
@@ -521,12 +521,12 @@ class Folder extends Object
{
$db = db_connection();
- $sql = new Sql('SELECT id FROM {t_object} '.
+ $sql = $db->sql('SELECT id FROM {t_object} '.
' WHERE parentid={objectid} AND is_link=1'.
' ORDER BY orderid ASC' );
$sql->setInt( 'objectid' ,$this->objectid );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -635,7 +635,7 @@ class Folder extends Object
while( intval($foid)!=0 )
{
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT parentid,id,filename
FROM {t_object}
@@ -645,7 +645,7 @@ SQL
);
$sql->setInt('parentid' ,$foid );
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
if ( in_array($row['id'],$idCache))
Http::serverError('fatal: parent-rekursion in object-id: '.$this->objectid.', double-parent-id: '.$row['id']);
@@ -671,7 +671,7 @@ SQL
while( intval($foid)!=0 )
{
- $sql = new Sql( <<<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}
@@ -684,7 +684,7 @@ SQL
$sql->setInt('languageid',$this->languageid);
$sql->setInt('parentid' ,$foid );
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
if ( in_array($row['id'],$idCache))
Http::serverError('fatal: parent-rekursion in object-id: '.$this->objectid.', double-parent-id: '.$row['id']);
@@ -707,12 +707,12 @@ SQL
{
$db = db_connection();
- $sql = new Sql('SELECT id FROM {t_object} '.
+ $sql = $db->sql('SELECT id FROM {t_object} '.
' WHERE parentid={objectid} AND is_folder=1'.
' ORDER BY orderid ASC' );
$sql->setInt( 'objectid' ,$this->objectid );
- $this->subfolders = $db->getCol( $sql );
+ $this->subfolders = $sql->getCol( $sql );
return $this->subfolders;
}
@@ -723,12 +723,12 @@ SQL
{
$db = db_connection();
- $sql = new Sql('SELECT id,filename FROM {t_object} '.
+ $sql = $db->sql('SELECT id,filename FROM {t_object} '.
' WHERE parentid={objectid} AND is_folder=1'.
' ORDER BY orderid ASC' );
$sql->setInt( 'objectid' ,$this->objectid );
- return $db->getAssoc( $sql );
+ return $sql->getAssoc( $sql );
}
@@ -774,16 +774,16 @@ SQL
// Nur loeschen, wenn es keine Unterelemente gibt
if ( count( $this->getObjectIds() ) == 0 )
{
- $sql = new Sql( 'UPDATE {t_element} '.
+ $sql = $db->sql( 'UPDATE {t_element} '.
' SET folderobjectid=NULL '.
' WHERE folderobjectid={objectid}' );
$sql->setInt('objectid',$this->objectid);
- $db->query( $sql );
+ $sql->query( $sql );
- $sql = new Sql( 'DELETE FROM {t_folder} '.
+ $sql = $db->sql( 'DELETE FROM {t_folder} '.
' WHERE objectid={objectid}' );
$sql->setInt('objectid',$this->objectid);
- $db->query( $sql );
+ $sql->query( $sql );
$this->objectDelete();
}
@@ -861,7 +861,7 @@ SQL
$db = db_connection();
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT {t_object}.id as objectid,
{t_object}.lastchange_date as lastchange_date,
{t_object}.filename as filename,
@@ -891,7 +891,7 @@ SQL
$language = Session::getProjectLanguage();
$sql->setInt( 'languageid', $language->languageid );
- return $db->getAll( $sql );
+ return $sql->getAll( $sql );
}
}
diff --git a/model/Group.class.php b/model/Group.class.php
@@ -54,9 +54,9 @@ class Group
global $conf;
$db = db_connection();
- $sql = new Sql( 'SELECT id,name FROM {t_group}' );
+ $sql = $db->sql( 'SELECT id,name FROM {t_group}' );
- return $db->getAssoc( $sql );
+ return $sql->getAssoc( $sql );
}
@@ -65,11 +65,11 @@ class Group
{
$db = db_connection();
- $sql = new Sql( 'SELECT * FROM {t_group}'.
+ $sql = $db->sql( 'SELECT * FROM {t_group}'.
' WHERE id={groupid}' );
$sql->setInt( 'groupid',$this->groupid );
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
if ( count($row) > 0 )
$this->name = $row['name' ];
else
@@ -82,11 +82,11 @@ class Group
{
$db = db_connection();
- $sql = new Sql( 'SELECT * FROM {t_group}'.
+ $sql = $db->sql( 'SELECT * FROM {t_group}'.
' WHERE name={name}' );
$sql->setString('name',$name );
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
if ( count($row) > 0 )
{
$group = new Group( $row['id'] );
@@ -110,14 +110,14 @@ class Group
$db = db_connection();
// Gruppe speichern
- $sql = new Sql( 'UPDATE {t_group} '.
+ $sql = $db->sql( 'UPDATE {t_group} '.
'SET name = {name} '.
'WHERE id={groupid}' );
$sql->setString( 'name' ,$this->name );
$sql->setInt ('groupid',$this->groupid );
// Datenbankabfrage ausfuehren
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -140,17 +140,17 @@ class Group
if ( $name != '' )
$this->name = $name;
- $sql = new Sql('SELECT MAX(id) FROM {t_group}');
- $this->groupid = intval($db->getOne($sql))+1;
+ $sql = $db->sql('SELECT MAX(id) FROM {t_group}');
+ $this->groupid = intval($sql->getOne($sql))+1;
// Gruppe hinzuf?gen
- $sql = new Sql( 'INSERT INTO {t_group} '.
+ $sql = $db->sql( 'INSERT INTO {t_group} '.
'(id,name) VALUES( {groupid},{name} )');
$sql->setInt ('groupid',$this->groupid );
$sql->setString('name' ,$this->name );
// Datenbankbefehl ausfuehren
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -160,23 +160,23 @@ class Group
$db = db_connection();
// Berechtigungen zu dieser Gruppe loeschen
- $sql = new Sql( 'DELETE FROM {t_acl} '.
+ $sql = $db->sql( 'DELETE FROM {t_acl} '.
'WHERE groupid={groupid}' );
$sql->setInt ('groupid',$this->groupid );
- $db->query( $sql );
+ $sql->query( $sql );
// Alle Gruppenzugehoerigkeiten zu dieser Gruppe loeschen
- $sql = new Sql( 'DELETE FROM {t_usergroup} '.
+ $sql = $db->sql( 'DELETE FROM {t_usergroup} '.
'WHERE groupid={groupid}' );
$sql->setInt ('groupid',$this->groupid );
- $db->query($sql);
+ $sql->query($sql);
// Gruppe loeschen
- $sql = new Sql( 'DELETE FROM {t_group} '.
+ $sql = $db->sql( 'DELETE FROM {t_group} '.
'WHERE id={groupid}' );
$sql->setInt ('groupid',$this->groupid );
- $db->query($sql);
+ $sql->query($sql);
}
@@ -185,12 +185,12 @@ class Group
{
$db = db_connection();
- $sql = new Sql( 'SELECT {t_user}.id,{t_user}.name FROM {t_user} '.
+ $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->setInt('groupid',$this->groupid );
- return $db->getAssoc( $sql );
+ return $sql->getAssoc( $sql );
}
@@ -199,12 +199,12 @@ class Group
{
$db = db_connection();
- $sql = new Sql( 'SELECT {t_user}.id,{t_user}.name FROM {t_user}'.
+ $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->setInt('groupid' ,$this->groupid );
- return $db->getAssoc( $sql );
+ return $sql->getAssoc( $sql );
}
@@ -213,17 +213,17 @@ class Group
{
$db = db_connection();
- $sql = new Sql('SELECT MAX(id) FROM {t_usergroup}');
- $usergroupid = intval($db->getOne($sql))+1;
+ $sql = $db->sql('SELECT MAX(id) FROM {t_usergroup}');
+ $usergroupid = intval($sql->getOne($sql))+1;
- $sql = new Sql( 'INSERT INTO {t_usergroup} '.
+ $sql = $db->sql( 'INSERT INTO {t_usergroup} '.
' (id,userid,groupid) '.
' VALUES( {usergroupid},{userid},{groupid} )' );
$sql->setInt('usergroupid',$usergroupid );
$sql->setInt('userid' ,$userid );
$sql->setInt('groupid' ,$this->groupid );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -233,12 +233,12 @@ class Group
{
$db = db_connection();
- $sql = new Sql( 'DELETE FROM {t_usergroup} '.
+ $sql = $db->sql( 'DELETE FROM {t_usergroup} '.
' WHERE userid={userid} AND groupid={groupid}' );
$sql->setInt ('userid' ,$userid );
$sql->setInt ('groupid' ,$this->groupid );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -250,8 +250,8 @@ class Group
$var = array();
// Alle Projekte lesen
- $sql = new Sql( 'SELECT id,name FROM {t_project}' );
- $projects = $db->getAssoc( $sql );
+ $sql = $db->sql( 'SELECT id,name FROM {t_project}' );
+ $projects = $sql->getAssoc( $sql );
foreach( $projects as $projectid=>$projectname )
{
@@ -260,14 +260,14 @@ class Group
$var[$projectid]['folders'] = array();
$var[$projectid]['rights'] = array();
- $sql = new Sql( 'SELECT {t_acl}.* FROM {t_acl}'.
+ $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->setInt('projectid',$projectid );
$sql->setInt('groupid' ,$this->groupid );
- $acls = $db->getAll( $sql );
+ $acls = $sql->getAll( $sql );
foreach( $acls as $acl )
{
@@ -279,10 +279,10 @@ class Group
$var[$projectid]['rights'][$aclid]['delete_url'] = 'user.'.$conf_php.'?useraction=delright&aclid='.$aclid;
}
- $sql = new Sql( 'SELECT id FROM {t_folder}'.
+ $sql = $db->sql( 'SELECT id FROM {t_folder}'.
' WHERE projectid={projectid}' );
$sql->setInt('projectid',$projectid);
- $folders = $db->getCol( $sql );
+ $folders = $sql->getCol( $sql );
$var[$projectid]['folders'] = array();
@@ -306,7 +306,7 @@ class Group
global $REQ,$SESS;
$db = db_connection();
- $sql = new SQL('INSERT INTO {t_acl} '.
+ $sql = $db->sql('INSERT INTO {t_acl} '.
'(userid,groupid,folderid,`read`,`write`,`create`,`delete`,publish) '.
'VALUES({userid},{groupid},{folderid},{read},{write},{create},{delete},{publish})');
@@ -322,7 +322,7 @@ class Group
$sql->setInt ('publish',$data['publish']);
// Datenbankabfrage ausf?hren
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -336,7 +336,7 @@ class Group
function getAllAcls()
{
$db = db_connection();
- $sql = new Sql( 'SELECT {t_acl}.*,{t_object}.projectid,{t_language}.name AS languagename FROM {t_acl}'.
+ $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} '.
@@ -347,7 +347,7 @@ class Group
$aclList = array();
- foreach( $db->getAll( $sql ) as $row )
+ foreach( $sql->getAll( $sql ) as $row )
{
$acl = new Acl();
$acl->setDatabaseRow( $row );
@@ -367,11 +367,11 @@ class Group
// Berechtigung entfernen
function delRight( $aclid )
{
- $sql = new SQL('DELETE FROM {t_acl} WHERE id={aclid}');
+ $sql = $db->sql('DELETE FROM {t_acl} WHERE id={aclid}');
$sql->setInt( 'aclid',$aclid );
// Datenbankabfrage ausf?hren
- $db->query( $sql );
+ $sql->query( $sql );
}
}
diff --git a/model/Language.class.php b/model/Language.class.php
@@ -55,11 +55,11 @@ class Language
{
$db = db_connection();
- $sql = new Sql('SELECT 1 FROM {t_language} '.
+ $sql = $db->sql('SELECT 1 FROM {t_language} '.
' WHERE id={id}');
$sql->setInt('id' ,$id );
- return intval($db->getOne($sql)) == 1;
+ return intval($sql->getOne($sql)) == 1;
}
@@ -70,7 +70,7 @@ class Language
global $SESS;
$db = db_connection();
- $sql = new Sql( "SELECT id,name FROM {t_language} ".
+ $sql = $db->sql( "SELECT id,name FROM {t_language} ".
" WHERE projectid = {projectid} ".
" ORDER BY name" );
@@ -82,7 +82,7 @@ class Language
$sql->setInt('projectid',$project->projectid);
}
- return $db->getAssoc( $sql );
+ return $sql->getAssoc( $sql );
}
@@ -94,7 +94,7 @@ class Language
global $SESS;
$db = db_connection();
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT count(*) FROM {t_language}
WHERE projectid = {projectid}
SQL
@@ -108,7 +108,7 @@ SQL
$sql->setInt('projectid',$project->projectid);
}
- return $db->getOne( $sql );
+ return $sql->getOne( $sql );
}
@@ -117,11 +117,11 @@ SQL
{
$db = Session::getDatabase();
- $sql = new Sql( 'SELECT * FROM {t_language}'.
+ $sql = $db->sql( 'SELECT * FROM {t_language}'.
' WHERE id={languageid}' );
$sql->setInt( 'languageid',$this->languageid );
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
if ( count($row) > 0 )
{
@@ -140,7 +140,7 @@ SQL
$db = db_connection();
// Gruppe speichern
- $sql = new Sql( 'UPDATE {t_language} '.
+ $sql = $db->sql( 'UPDATE {t_language} '.
'SET name = {name}, '.
' isocode = {isocode} '.
'WHERE id={languageid}' );
@@ -150,7 +150,7 @@ SQL
$sql->setInt( 'languageid',$this->languageid );
// Datenbankabfrage ausfuehren
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -184,11 +184,11 @@ SQL
$this->name = $codes[ $isocode ];
}
- $sql = new Sql('SELECT MAX(id) FROM {t_language}');
- $this->languageid = intval($db->getOne($sql))+1;
+ $sql = $db->sql('SELECT MAX(id) FROM {t_language}');
+ $this->languageid = intval($sql->getOne($sql))+1;
// Sprache hinzuf?gen
- $sql = new Sql( 'INSERT INTO {t_language} '.
+ $sql = $db->sql( 'INSERT INTO {t_language} '.
'(id,projectid,name,isocode,is_default) VALUES( {languageid},{projectid},{name},{isocode},0 )');
$sql->setInt ('languageid',$this->languageid );
$sql->setInt ('projectid' ,$this->projectid );
@@ -196,7 +196,7 @@ SQL
$sql->setString('isocode' ,$this->isoCode );
// Datenbankbefehl ausfuehren
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -207,18 +207,18 @@ SQL
$db = db_connection();
// Zuerst alle auf nicht-Standard setzen
- $sql = new Sql( 'UPDATE {t_language} '.
+ $sql = $db->sql( 'UPDATE {t_language} '.
' SET is_default = 0 '.
' WHERE projectid={projectid}' );
$sql->setInt('projectid',$this->projectid );
- $db->query( $sql );
+ $sql->query( $sql );
// Jetzt die gew?nschte Sprachvariante auf Standard setzen
- $sql = new Sql( 'UPDATE {t_language} '.
+ $sql = $db->sql( 'UPDATE {t_language} '.
' SET is_default = 1 '.
' WHERE id={languageid}' );
$sql->setInt('languageid',$this->languageid );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -227,7 +227,7 @@ SQL
global $SESS;
$db = db_connection();
- $sql = new Sql( 'SELECT id FROM {t_language} '.
+ $sql = $db->sql( 'SELECT id FROM {t_language} '.
' WHERE projectid={projectid}'.
' ORDER BY is_default DESC' );
@@ -239,7 +239,7 @@ SQL
$sql->setInt('projectid',$project->projectid);
}
- return $db->getOne( $sql );
+ return $sql->getOne( $sql );
}
@@ -249,36 +249,36 @@ SQL
$db = db_connection();
// Sprache l?schen
-// $sql = new Sql( 'SELECT COUNT(*) FROM {t_language} WHERE projectid={projectid}' );
+// $sql = $db->sql( 'SELECT COUNT(*) FROM {t_language} WHERE projectid={projectid}' );
// $sql->setInt( 'projectid',$this->projectid );
-// $count = $db->getOne( $sql );
+// $count = $sql->getOne( $sql );
//
// // Nur l?schen, wenn es mindestens 2 Sprachen gibt
// if ( $count >= 2 )
// {
// Inhalte mit dieser Sprache l?schen
- $sql = new Sql( 'DELETE FROM {t_value} WHERE languageid={languageid}' );
+ $sql = $db->sql( 'DELETE FROM {t_value} WHERE languageid={languageid}' );
$sql->setInt( 'languageid',$this->languageid );
- $db->query( $sql );
+ $sql->query( $sql );
// Inhalte mit dieser Sprache l?schen
- $sql = new Sql( 'DELETE FROM {t_name} WHERE languageid={languageid}' );
+ $sql = $db->sql( 'DELETE FROM {t_name} WHERE languageid={languageid}' );
$sql->setInt( 'languageid',$this->languageid );
- $db->query( $sql );
+ $sql->query( $sql );
// Sprache l?schen
- $sql = new Sql( 'DELETE FROM {t_language} WHERE id={languageid}' );
+ $sql = $db->sql( 'DELETE FROM {t_language} WHERE id={languageid}' );
$sql->setInt( 'languageid',$this->languageid );
- $db->query( $sql );
+ $sql->query( $sql );
// Andere Sprache auf "Default" setzen
- $sql = new Sql( 'SELECT id FROM {t_language} WHERE projectid={projectid}' );
+ $sql = $db->sql( 'SELECT id FROM {t_language} WHERE projectid={projectid}' );
$sql->setInt( 'projectid',$this->projectid );
- $new_default_languageid = $db->getOne( $sql );
+ $new_default_languageid = $sql->getOne( $sql );
- $sql = new Sql( 'UPDATE {t_language} SET is_default=1 WHERE id={languageid}' );
+ $sql = $db->sql( 'UPDATE {t_language} SET is_default=1 WHERE id={languageid}' );
$sql->setInt( 'languageid',$new_default_languageid );
- $db->query( $sql );
+ $sql->query( $sql );
// }
}
}
diff --git a/model/Link.class.php b/model/Link.class.php
@@ -47,11 +47,11 @@ class Link extends Object
{
$db = db_connection();
- $sql = new Sql( 'SELECT *'.
+ $sql = $db->sql( 'SELECT *'.
' FROM {t_link}'.
' WHERE objectid={objectid}' );
$sql->setInt( 'objectid',$this->objectid );
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
if ( count($row ) != 0 )
{
@@ -80,11 +80,11 @@ class Link extends Object
$db = db_connection();
// Verkn�pfung l�schen
- $sql = new Sql( 'DELETE FROM {t_link} '.
+ $sql = $db->sql( 'DELETE FROM {t_link} '.
' WHERE objectid={objectid}' );
$sql->setInt( 'objectid',$this->objectid );
- $db->query( $sql );
+ $sql->query( $sql );
$this->objectDelete();
}
@@ -96,7 +96,7 @@ class Link extends Object
global $SESS;
$db = db_connection();
- $sql = new Sql('UPDATE {t_link} SET '.
+ $sql = $db->sql('UPDATE {t_link} SET '.
' url = {url},'.
' link_objectid = {linkobjectid}'.
' WHERE objectid={objectid}' );
@@ -113,7 +113,7 @@ class Link extends Object
$sql->setString('url',$this->url );
}
- $db->query( $sql );
+ $sql->query( $sql );
$this->objectSave();
}
@@ -144,10 +144,10 @@ class Link extends Object
$db = db_connection();
- $sql = new Sql('SELECT MAX(id) FROM {t_link}');
- $this->linkid = intval($db->getOne($sql))+1;
+ $sql = $db->sql('SELECT MAX(id) FROM {t_link}');
+ $this->linkid = intval($sql->getOne($sql))+1;
- $sql = new Sql('INSERT INTO {t_link}'.
+ $sql = $db->sql('INSERT INTO {t_link}'.
' (id,objectid,url,link_objectid)'.
' VALUES( {linkid},{objectid},{url},{linkobjectid} )' );
$sql->setInt ('linkid' ,$this->linkid );
@@ -164,7 +164,7 @@ class Link extends Object
$sql->setString('url',$this->url );
}
- $db->query( $sql );
+ $sql->query( $sql );
}
}
diff --git a/model/Model.class.php b/model/Model.class.php
@@ -55,11 +55,11 @@ class Model
{
$db = db_connection();
- $sql = new Sql('SELECT 1 FROM {t_projectmodel} '.
+ $sql = $db->sql('SELECT 1 FROM {t_projectmodel} '.
' WHERE id={id}');
$sql->setInt('id' ,$id );
- return intval($db->getOne($sql)) == 1;
+ return intval($sql->getOne($sql)) == 1;
}
@@ -73,7 +73,7 @@ class Model
global $SESS;
$db = db_connection();
- $sql = new Sql( "SELECT id,name FROM {t_projectmodel} ".
+ $sql = $db->sql( "SELECT id,name FROM {t_projectmodel} ".
" WHERE projectid = {projectid} ".
" ORDER BY name" );
@@ -85,7 +85,7 @@ class Model
$sql->setInt('projectid',$project->projectid);
}
- return $db->getAssoc( $sql );
+ return $sql->getAssoc( $sql );
}
@@ -98,7 +98,7 @@ class Model
global $SESS;
$db = db_connection();
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT count(*) FROM {t_projectmodel}
WHERE projectid = {projectid}
SQL
@@ -107,7 +107,7 @@ SQL
$sql->setInt('projectid',$this->projectid );
else $sql->setInt('projectid',$SESS['projectid'] );
- return $db->getOne( $sql );
+ return $sql->getOne( $sql );
}
@@ -118,11 +118,11 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'SELECT * FROM {t_projectmodel}'.
+ $sql = $db->sql( 'SELECT * FROM {t_projectmodel}'.
' WHERE id={modelid}' );
$sql->setInt( 'modelid',$this->modelid );
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
$this->name = $row['name' ];
$this->projectid = $row['projectid'];
@@ -141,7 +141,7 @@ SQL
$db = db_connection();
// Gruppe speichern
- $sql = new Sql( 'UPDATE {t_projectmodel} '.
+ $sql = $db->sql( 'UPDATE {t_projectmodel} '.
' SET name = {name} '.
' WHERE id={modelid}' );
$sql->setString( 'name' ,$this->name );
@@ -149,7 +149,7 @@ SQL
$sql->setInt( 'modelid',$this->modelid );
// Datenbankabfrage ausfuehren
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -179,11 +179,11 @@ SQL
$db = db_connection();
- $sql = new Sql('SELECT MAX(id) FROM {t_projectmodel}');
- $this->modelid = intval($db->getOne($sql))+1;
+ $sql = $db->sql('SELECT MAX(id) FROM {t_projectmodel}');
+ $this->modelid = intval($sql->getOne($sql))+1;
// Modell hinzuf?gen
- $sql = new Sql( 'INSERT INTO {t_projectmodel} '.
+ $sql = $db->sql( 'INSERT INTO {t_projectmodel} '.
"(id,projectid,name,extension,is_default) VALUES( {modelid},{projectid},{name},'',0 )");
$sql->setInt ('modelid' ,$this->modelid );
@@ -191,7 +191,7 @@ SQL
$sql->setString('name' ,$this->name );
// Datenbankbefehl ausfuehren
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -200,7 +200,7 @@ SQL
global $SESS;
$db = db_connection();
- $sql = new Sql( 'SELECT id FROM {t_projectmodel} '.
+ $sql = $db->sql( 'SELECT id FROM {t_projectmodel} '.
' WHERE projectid={projectid}'.
' ORDER BY is_default DESC' );
if ( isset($this->projectid) )
@@ -211,7 +211,7 @@ SQL
$sql->setInt('projectid',$project->projectid);
}
- return $db->getOne( $sql );
+ return $sql->getOne( $sql );
}
@@ -223,18 +223,18 @@ SQL
$db = db_connection();
// Zuerst alle auf nicht-Standard setzen
- $sql = new Sql( 'UPDATE {t_projectmodel} '.
+ $sql = $db->sql( 'UPDATE {t_projectmodel} '.
' SET is_default = 0 '.
' WHERE projectid={projectid}' );
$sql->setInt('projectid',$this->projectid );
- $db->query( $sql );
+ $sql->query( $sql );
// Jetzt die gew?nschte Sprachvariante auf Standard setzen
- $sql = new Sql( 'UPDATE {t_projectmodel} '.
+ $sql = $db->sql( 'UPDATE {t_projectmodel} '.
' SET is_default = 1 '.
' WHERE id={modelid}' );
$sql->setInt('modelid',$this->modelid );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -248,33 +248,33 @@ SQL
$db = db_connection();
// Vorlagen zu dieseem Modell loeschen
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
DELETE FROM {t_templatemodel}
WHERE projectmodelid = {modelid}
SQL
);
$sql->setInt( 'modelid',$this->modelid );
- $db->query( $sql );
+ $sql->query( $sql );
// Dieses Modell löschen
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
DELETE FROM {t_projectmodel}
WHERE id={modelid}
SQL
);
$sql->setInt( 'modelid',$this->modelid );
- $db->query( $sql );
+ $sql->query( $sql );
// Anderes Modell auf "Default" setzen (sofern vorhanden)
if ( $this->isDefault )
{
- $sql = new Sql( 'SELECT id FROM {t_projectmodel} WHERE projectid={projectid}' );
+ $sql = $db->sql( 'SELECT id FROM {t_projectmodel} WHERE projectid={projectid}' );
$sql->setInt( 'projectid',$this->projectid );
- $new_default_modelid = $db->getOne( $sql );
+ $new_default_modelid = $sql->getOne( $sql );
- $sql = new Sql( 'UPDATE {t_projectmodel} SET is_default=1 WHERE id={modelid}' );
+ $sql = $db->sql( 'UPDATE {t_projectmodel} SET is_default=1 WHERE id={modelid}' );
$sql->setInt( 'modelid',$new_default_modelid );
- $db->query( $sql );
+ $sql->query( $sql );
}
}
}
diff --git a/model/Object.class.php b/model/Object.class.php
@@ -200,11 +200,11 @@ class Object
$projectid = $this->projectid;
}
- $sql = new Sql('SELECT id from {t_object} '.
+ $sql = $db->sql('SELECT id from {t_object} '.
' WHERE projectid={projectid}');
$sql->setInt('projectid', $projectid);
- return $db->getCol($sql);
+ return $sql->getCol($sql);
}
@@ -262,7 +262,7 @@ class Object
$this->aclMask = 0;
$sqlGroupClause = $user->getGroupClause();
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT {t_acl}.* FROM {t_acl}
LEFT JOIN {t_object}
ON {t_object}.id={t_acl}.objectid
@@ -278,7 +278,7 @@ SQL
$sql->setInt ( 'userid' ,$user->userid );
$db = db_connection();
- foreach( $db->getAll( $sql ) as $row )
+ foreach( $sql->getAll( $sql ) as $row )
{
$acl = new Acl();
$acl->setDatabaseRow( $row );
@@ -458,11 +458,11 @@ SQL
if ( !is_numeric($objectid) || $objectid <= 0 )
return false; // Objekt-Id ung�ltig.
- $sql = new Sql('SELECT 1 FROM {t_object} '.
+ $sql = $db->sql('SELECT 1 FROM {t_object} '.
' WHERE id={objectid}');
$sql->setInt('objectid' , $objectid );
- return intval($db->getOne($sql)) == 1;
+ return intval($sql->getOne($sql)) == 1;
}
@@ -477,7 +477,7 @@ SQL
global $SESS;
$db = db_connection();
- $sql = new Sql('SELECT {t_object}.*,' .
+ $sql = $db->sql('SELECT {t_object}.*,' .
' {t_name}.name,{t_name}.descr,'.
' lastchangeuser.name as lastchange_username, '.
' lastchangeuser.fullname as lastchange_userfullname, '.
@@ -496,7 +496,7 @@ SQL
$sql->setInt('languageid', $this->languageid);
$sql->setInt('objectid' , $this->objectid );
- $row = $db->getRow($sql);
+ $row = $sql->getRow($sql);
if (count($row) == 0)
throw new ObjectNotFoundException('object '.$this->objectid.' not found');
@@ -515,10 +515,10 @@ SQL
global $SESS;
$db = db_connection();
- $sql = new Sql('SELECT * FROM {t_object}'.
+ $sql = $db->sql('SELECT * FROM {t_object}'.
' WHERE {t_object}.id={objectid}');
$sql->setInt('objectid' , $this->objectid );
- $row = $db->getRow($sql);
+ $row = $sql->getRow($sql);
if (count($row) == 0)
die('fatal: Object::objectLoadRaw(): objectid not found: '.$this->objectid.', SQL='.$sql->raw);
@@ -633,17 +633,17 @@ SQL
global $SESS;
$db = db_connection();
- $sql = new Sql('SELECT *'.' FROM {t_name}'.' WHERE objectid={objectid}'.' AND languageid={languageid}');
+ $sql = $db->sql('SELECT *'.' FROM {t_name}'.' WHERE objectid={objectid}'.' AND languageid={languageid}');
$sql->setInt('objectid' , $this->objectid );
$sql->setInt('languageid', $this->languageid);
- $res = $db->query($sql);
+ $res = $sql->query($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->setString('blank', '');
- $res = $db->query($sql);
+ $res = $sql->query($sql);
}
$row = $res->fetchRow();
@@ -665,7 +665,7 @@ SQL
$this->checkFilename();
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
UPDATE {t_object} SET
parentid = {parentid},
lastchange_date = {time} ,
@@ -690,7 +690,7 @@ SQL
$sql->setInt ('objectid', $this->objectid);
- $db->query($sql);
+ $sql->query($sql);
// Nur wenn nicht Wurzelordner
if ( !$this->isRoot && $withName )
@@ -711,7 +711,7 @@ SQL
{
$db = db_connection();
- $sql = new Sql('UPDATE {t_object} SET '.
+ $sql = $db->sql('UPDATE {t_object} SET '.
' lastchange_date = {time} ,'.
' lastchange_userid = {userid} '.
' WHERE id={objectid}');
@@ -724,7 +724,7 @@ SQL
$sql->setInt ('objectid',$this->objectid );
$sql->setInt ('time' ,$this->lastchangeDate );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -733,14 +733,14 @@ SQL
{
$db = db_connection();
- $sql = new Sql('UPDATE {t_object} SET '.
+ $sql = $db->sql('UPDATE {t_object} SET '.
' create_date = {time} '.
' WHERE id={objectid}');
$sql->setInt ('objectid',$this->objectid );
$sql->setInt ('time' ,$this->createDate );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -755,17 +755,17 @@ SQL
global $SESS;
$db = db_connection();
- $sql = new Sql(<<<SQL
+ $sql = $db->sql(<<<SQL
SELECT COUNT(*) FROM {t_name} WHERE objectid ={objectid} AND languageid={languageid}
SQL
);
$sql->setInt( 'objectid' , $this->objectid );
$sql->setInt( 'languageid', $this->languageid );
- $count = $db->getOne($sql);
+ $count = $sql->getOne($sql);
if ($count > 0)
{
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
UPDATE {t_name} SET
name = {name},
descr = {desc}
@@ -777,12 +777,12 @@ SQL
$sql->setString('desc', $this->desc);
$sql->setInt( 'objectid' , $this->objectid );
$sql->setInt( 'languageid', $this->languageid );
- $db->query($sql);
+ $sql->query($sql);
}
else
{
- $sql = new Sql('SELECT MAX(id) FROM {t_name}');
- $nameid = intval($db->getOne($sql))+1;
+ $sql = $db->sql('SELECT MAX(id) FROM {t_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->setInt ('objectid' , $this->objectid );
@@ -790,7 +790,7 @@ SQL
$sql->setInt ('nameid', $nameid );
$sql->setString('name' , $this->name);
$sql->setString('desc' , $this->desc);
- $db->query($sql);
+ $sql->query($sql);
}
}
@@ -803,37 +803,37 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'UPDATE {t_element} '.
+ $sql = $db->sql( 'UPDATE {t_element} '.
' SET default_objectid=NULL '.
' WHERE default_objectid={objectid}' );
$sql->setInt('objectid',$this->objectid);
- $db->query( $sql );
+ $sql->query( $sql );
- $sql = new Sql( 'UPDATE {t_value} '.
+ $sql = $db->sql( 'UPDATE {t_value} '.
' SET linkobjectid=NULL '.
' WHERE linkobjectid={objectid}' );
$sql->setInt('objectid',$this->objectid);
- $db->query( $sql );
+ $sql->query( $sql );
- $sql = new Sql( 'UPDATE {t_link} '.
+ $sql = $db->sql( 'UPDATE {t_link} '.
' SET link_objectid=NULL '.
' WHERE link_objectid={objectid}' );
$sql->setInt('objectid',$this->objectid);
- $db->query( $sql );
+ $sql->query( $sql );
// Objekt-Namen l?schen
- $sql = new Sql('DELETE FROM {t_name} WHERE objectid={objectid}');
+ $sql = $db->sql('DELETE FROM {t_name} WHERE objectid={objectid}');
$sql->setInt('objectid', $this->objectid);
- $db->query($sql);
+ $sql->query($sql);
// ACLs loeschen
$this->deleteAllACLs();
// Objekt l?schen
- $sql = new Sql('DELETE FROM {t_object} WHERE id={objectid}');
+ $sql = $db->sql('DELETE FROM {t_object} WHERE id={objectid}');
$sql->setInt('objectid', $this->objectid);
- $db->query($sql);
+ $sql->query($sql);
}
@@ -846,11 +846,11 @@ SQL
$db = db_connection();
// Neue Objekt-Id bestimmen
- $sql = new Sql('SELECT MAX(id) FROM {t_object}');
- $this->objectid = intval($db->getOne($sql))+1;
+ $sql = $db->sql('SELECT MAX(id) FROM {t_object}');
+ $this->objectid = intval($sql->getOne($sql))+1;
$this->checkFilename();
- $sql = new Sql('INSERT INTO {t_object}'.
+ $sql = $db->sql('INSERT INTO {t_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} )');
@@ -871,7 +871,7 @@ SQL
$sql->setBoolean('is_page', $this->isPage);
$sql->setBoolean('is_link', $this->isLink);
- $db->query($sql);
+ $sql->query($sql);
if ( !empty($this->name) )
$this->objectSaveName();
@@ -942,7 +942,7 @@ SQL
{
$db = db_connection();
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT COUNT(*) FROM {t_object}
WHERE parentid={parentid} AND filename={filename}
AND NOT id = {objectid}
@@ -954,7 +954,7 @@ SQL
$sql->setString('objectid', $this->objectid);
- return( intval($db->getOne($sql)) == 0 );
+ return( intval($sql->getOne($sql)) == 0 );
}
@@ -975,7 +975,7 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'SELECT id FROM {t_acl} '.
+ $sql = $db->sql( 'SELECT id FROM {t_acl} '.
' WHERE objectid={objectid}'.
' AND ( languageid IS NULL OR '.
' languageid = {languageid} )'.
@@ -983,7 +983,7 @@ SQL
$sql->setInt('languageid',$this->languageid);
$sql->setInt('objectid' ,$this->objectid);
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -991,12 +991,12 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'SELECT id FROM {t_acl} '.
+ $sql = $db->sql( 'SELECT id FROM {t_acl} '.
' WHERE objectid={objectid}'.
' ORDER BY userid,groupid ASC' );
$sql->setInt('objectid' ,$this->objectid);
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -1016,7 +1016,7 @@ SQL
foreach( $folder->parentObjectFileNames(true,true) as $oid=>$filename )
{
- $sql = new Sql( 'SELECT id FROM {t_acl} '.
+ $sql = $db->sql( 'SELECT id FROM {t_acl} '.
' WHERE objectid={objectid}'.
' AND is_transmit = 1'.
' AND ( languageid IS NULL OR '.
@@ -1024,7 +1024,7 @@ SQL
' ORDER BY userid,groupid ASC' );
$sql->setInt('objectid' ,$oid);
$sql->setInt('languageid',$this->languageid);
- $acls = array_merge( $acls,$db->getCol( $sql ) );
+ $acls = array_merge( $acls,$sql->getCol( $sql ) );
}
return $acls;
@@ -1047,12 +1047,12 @@ SQL
foreach( $folder->parentObjectFileNames(true,true) as $oid=>$filename )
{
- $sql = new Sql( 'SELECT id FROM {t_acl} '.
+ $sql = $db->sql( 'SELECT id FROM {t_acl} '.
' WHERE objectid={objectid}'.
' AND is_transmit = 1'.
' ORDER BY userid,groupid ASC' );
$sql->setInt('objectid' ,$oid);
- $acls = array_merge( $acls,$db->getCol( $sql ) );
+ $acls = array_merge( $acls,$sql->getCol( $sql ) );
}
return $acls;
@@ -1161,11 +1161,11 @@ SQL
{
$db = db_connection();
- $sql = new Sql('UPDATE {t_object} '.' SET orderid={orderid}'.' WHERE id={objectid}');
+ $sql = $db->sql('UPDATE {t_object} '.' SET orderid={orderid}'.' WHERE id={objectid}');
$sql->setInt('objectid', $this->objectid);
$sql->setInt('orderid', $orderid);
- $db->query($sql);
+ $sql->query($sql);
}
@@ -1179,11 +1179,11 @@ SQL
{
$db = db_connection();
- $sql = new Sql('UPDATE {t_object} '.' SET parentid={parentid}'.' WHERE id={objectid}');
+ $sql = $db->sql('UPDATE {t_object} '.' SET parentid={parentid}'.' WHERE id={objectid}');
$sql->setInt('objectid', $this->objectid);
$sql->setInt('parentid', $parentid);
- $db->query($sql);
+ $sql->query($sql);
}
@@ -1191,13 +1191,13 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'SELECT {t_page}.objectid FROM {t_value}'.
+ $sql = $db->sql( 'SELECT {t_page}.objectid FROM {t_value}'.
' LEFT JOIN {t_page} '.
' ON {t_value}.pageid = {t_page}.id '.
' WHERE linkobjectid={objectid}' );
$sql->setInt( 'objectid',$this->objectid );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -1210,14 +1210,14 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'SELECT id FROM {t_object} '.
+ $sql = $db->sql( 'SELECT id FROM {t_object} '.
' WHERE filename LIKE {filename}'.
' AND projectid={projectid}'.
' ORDER BY lastchange_date DESC' );
$sql->setInt ( 'projectid',$this->projectid );
$sql->setString( 'filename','%'.$text.'%' );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -1230,7 +1230,7 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'SELECT {t_object}.id FROM {t_object} '.
+ $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}'.
@@ -1241,7 +1241,7 @@ SQL
$sql->setInt ( 'languageid',$this->languageid );
$sql->setString( 'name' ,'%'.$text.'%' );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -1254,7 +1254,7 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'SELECT {t_object}.id FROM {t_object} '.
+ $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}'.
@@ -1265,7 +1265,7 @@ SQL
$sql->setInt ( 'languageid',$this->languageid );
$sql->setString( 'desc' ,'%'.$text.'%' );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -1278,14 +1278,14 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'SELECT id FROM {t_object} '.
+ $sql = $db->sql( 'SELECT id FROM {t_object} '.
' WHERE create_userid={userid}'.
' AND projectid={projectid}'.
' ORDER BY lastchange_date DESC' );
$sql->setInt ( 'projectid',$this->projectid );
$sql->setInt ( 'userid' ,$userid );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -1298,14 +1298,14 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'SELECT id FROM {t_object} '.
+ $sql = $db->sql( 'SELECT id FROM {t_object} '.
' WHERE lastchange_userid={userid}'.
' AND projectid={projectid}'.
' ORDER BY lastchange_date DESC' );
$sql->setInt ( 'projectid',$this->projectid );
$sql->setInt ( 'userid' ,$userid );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -1318,13 +1318,13 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'SELECT id FROM {t_object} '.
+ $sql = $db->sql( 'SELECT id FROM {t_object} '.
' WHERE id={objectid}'.
' AND projectid={projectid}' );
$sql->setInt ( 'projectid' ,$this->projectid );
$sql->setInt ( 'objectid' ,$id );
- return ($db->getOne($sql) == intval($id) );
+ return ($sql->getOne($sql) == intval($id) );
}
@@ -1337,11 +1337,11 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'SELECT objectid FROM {t_link} '.
+ $sql = $db->sql( 'SELECT objectid FROM {t_link} '.
' WHERE link_objectid={myid}' );
$sql->setInt ( 'myid' ,$this->objectid );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
diff --git a/model/Page.class.php b/model/Page.class.php
@@ -82,11 +82,11 @@ class Page extends Object
{
$db = db_connection();
- $sql = new Sql( 'SELECT objectid FROM {t_page} '.
+ $sql = $db->sql( 'SELECT objectid FROM {t_page} '.
' WHERE id={pageid}' );
$sql->setInt('pageid',$pageid);
- return $db->getOne( $sql );
+ return $sql->getOne( $sql );
}
@@ -100,11 +100,11 @@ class Page extends Object
{
$db = db_connection();
- $sql = new Sql( 'SELECT id FROM {t_page} '.
+ $sql = $db->sql( 'SELECT id FROM {t_page} '.
' WHERE objectid={objectid}' );
$sql->setInt('objectid',$objectid);
- return $db->getOne( $sql );
+ return $sql->getOne( $sql );
}
@@ -348,17 +348,17 @@ class Page extends Object
$this->objectAdd(); // Hinzuf?gen von Objekt (dabei wird Objekt-ID ermittelt)
- $sql = new Sql('SELECT MAX(id) FROM {t_page}');
- $this->pageid = intval($db->getOne($sql))+1;
+ $sql = $db->sql('SELECT MAX(id) FROM {t_page}');
+ $this->pageid = intval($sql->getOne($sql))+1;
- $sql = new Sql('INSERT INTO {t_page}'.
+ $sql = $db->sql('INSERT INTO {t_page}'.
' (id,objectid,templateid)'.
' VALUES( {pageid},{objectid},{templateid} )' );
$sql->setInt ('pageid' ,$this->pageid );
$sql->setInt ('objectid' ,$this->objectid );
$sql->setInt ('templateid',$this->templateid );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -369,10 +369,10 @@ class Page extends Object
{
$db = db_connection();
- $sql = new Sql( 'SELECT * FROM {t_page} '.
+ $sql = $db->sql( 'SELECT * FROM {t_page} '.
' WHERE objectid={objectid}' );
$sql->setInt('objectid',$this->objectid);
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
$this->pageid = $row['id' ];
$this->templateid = $row['templateid'];
@@ -385,15 +385,15 @@ class Page extends Object
{
global $db;
- $sql = new Sql( 'DELETE FROM {t_value} '.
+ $sql = $db->sql( 'DELETE FROM {t_value} '.
' WHERE pageid={pageid}' );
$sql->setInt('pageid',$this->pageid);
- $db->query( $sql );
+ $sql->query( $sql );
- $sql = new Sql( 'DELETE FROM {t_page} '.
+ $sql = $db->sql( 'DELETE FROM {t_page} '.
' WHERE objectid={objectid}' );
$sql->setInt('objectid',$this->objectid);
- $db->query( $sql );
+ $sql->query( $sql );
$this->objectDelete();
}
@@ -438,12 +438,12 @@ class Page extends Object
{
$db = db_connection();
- $sql = new Sql('UPDATE {t_page}'.
+ $sql = $db->sql('UPDATE {t_page}'.
' SET templateid ={templateid}'.
' WHERE objectid={objectid}' );
$sql->setInt('templateid' ,$this->templateid);
$sql->setInt('objectid' ,$this->objectid );
- $db->query( $sql );
+ $sql->query( $sql );
$this->objectSave();
}
@@ -459,12 +459,12 @@ class Page extends Object
// Template-id dieser Seite aendern
$this->templateid = $newTemplateId;
- $sql = new Sql('UPDATE {t_page}'.
+ $sql = $db->sql('UPDATE {t_page}'.
' SET templateid ={templateid}'.
' WHERE objectid={objectid}' );
$sql->setInt('templateid' ,$this->templateid);
$sql->setInt('objectid' ,$this->objectid );
- $db->query( $sql );
+ $sql->query( $sql );
// Inhalte umschluesseln, d.h. die Element-Ids aendern
@@ -475,27 +475,27 @@ class Page extends Object
intval($replaceElementMap[$oldElementId]) < 1 )
{
Logger::debug( 'deleting value of elementid '.$oldElementId );
- $sql = new Sql('DELETE FROM {t_value}'.
+ $sql = $db->sql('DELETE FROM {t_value}'.
' WHERE pageid={pageid}'.
' AND elementid={elementid}' );
$sql->setInt('pageid' ,$this->pageid);
$sql->setInt('elementid',$oldElementId );
- $db->query( $sql );
+ $sql->query( $sql );
}
else
{
$newElementId = intval($replaceElementMap[$oldElementId]);
Logger::debug( 'updating elementid '.$oldElementId.' -> '.$newElementId );
- $sql = new Sql('UPDATE {t_value}'.
+ $sql = $db->sql('UPDATE {t_value}'.
' SET elementid ={newelementid}'.
' WHERE pageid ={pageid}'.
' AND elementid={oldelementid}' );
$sql->setInt('pageid' ,$this->pageid);
$sql->setInt('oldelementid',$oldElementId );
$sql->setInt('newelementid',$newElementId );
- $db->query( $sql );
+ $sql->query( $sql );
}
}
}
@@ -567,21 +567,21 @@ class Page extends Object
//
// $db = db_connection();
//
-// $sql = new Sql( 'SELECT COUNT(*) FROM {t_language}'.
+// $sql = $db->sql( 'SELECT COUNT(*) FROM {t_language}'.
// ' WHERE projectid={projectid}' );
// $sql->setInt('projectid',$SESS['projectid']);
//
-// if ( $db->getOne( $sql ) == 1 )
+// if ( $sql->getOne( $sql ) == 1 )
// {
// // Wenn es nur eine Sprache gibt, keine Sprachangabe im Dateinamen
// return '';
// }
// else
// {
-// $sql = new Sql( 'SELECT isocode FROM {t_language}'.
+// $sql = $db->sql( 'SELECT isocode FROM {t_language}'.
// ' WHERE id={languageid}' );
// $sql->setInt('languageid',$this->languageid);
-// $isocode = $db->getOne( $sql );
+// $isocode = $sql->getOne( $sql );
//
// return strtolower( $isocode );
// }
diff --git a/model/Project.class.php b/model/Project.class.php
@@ -54,11 +54,11 @@ class Project
{
$db = db_connection();
- $sql = new Sql('SELECT 1 FROM {t_project} '.
+ $sql = $db->sql('SELECT 1 FROM {t_project} '.
' WHERE id={id}');
$sql->setInt('id' ,$id );
- return intval($db->getOne($sql)) == 1;
+ return intval($sql->getOne($sql)) == 1;
}
@@ -73,10 +73,10 @@ class Project
function getAllProjects()
{
$db = db_connection();
- $sql = new Sql( 'SELECT id,name FROM {t_project} '.
+ $sql = $db->sql( 'SELECT id,name FROM {t_project} '.
' ORDER BY name' );
- return $db->getAssoc( $sql );
+ return $sql->getAssoc( $sql );
}
@@ -84,10 +84,10 @@ class Project
function getAllProjectIds()
{
$db = db_connection();
- $sql = new Sql( 'SELECT id FROM {t_project} '.
+ $sql = $db->sql( 'SELECT id FROM {t_project} '.
' ORDER BY name' );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -95,12 +95,12 @@ class Project
{
$db = db_connection();
- $sql = new Sql( 'SELECT id,name FROM {t_language}'.
+ $sql = $db->sql( 'SELECT id,name FROM {t_language}'.
' WHERE projectid={projectid} '.
' ORDER BY name' );
$sql->setInt ('projectid',$this->projectid);
- return $db->getAssoc( $sql );
+ return $sql->getAssoc( $sql );
}
@@ -114,12 +114,12 @@ class Project
{
$db = db_connection();
- $sql = new Sql( 'SELECT id,name FROM {t_projectmodel}'.
+ $sql = $db->sql( 'SELECT id,name FROM {t_projectmodel}'.
' WHERE projectid= {projectid} '.
' ORDER BY name' );
$sql->setInt ('projectid',$this->projectid);
- return $db->getAssoc( $sql );
+ return $sql->getAssoc( $sql );
}
@@ -133,11 +133,11 @@ class Project
{
$db = db_connection();
- $sql = new Sql( 'SELECT id FROM {t_template}'.
+ $sql = $db->sql( 'SELECT id FROM {t_template}'.
' WHERE projectid= {projectid} ' );
$sql->setInt ('projectid',$this->projectid);
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -145,11 +145,11 @@ class Project
{
$db = db_connection();
- $sql = new Sql( 'SELECT id,name FROM {t_template}'.
+ $sql = $db->sql( 'SELECT id,name FROM {t_template}'.
' WHERE projectid= {projectid} ' );
$sql->setInt ('projectid',$this->projectid);
- return $db->getAssoc( $sql );
+ return $sql->getAssoc( $sql );
}
@@ -165,13 +165,13 @@ class Project
{
$db = db_connection();
- $sql = new Sql('SELECT id FROM {t_object}'.
+ $sql = $db->sql('SELECT id FROM {t_object}'.
' WHERE parentid IS NULL'.
' AND projectid={projectid}' );
$sql->setInt('projectid',$this->projectid);
- return( $db->getOne( $sql ) );
+ return( $sql->getOne( $sql ) );
}
@@ -181,11 +181,11 @@ class Project
{
$db = db_connection();
- $sql = new Sql( 'SELECT * FROM {t_project} '.
+ $sql = $db->sql( 'SELECT * FROM {t_project} '.
' WHERE id={projectid}' );
$sql->setInt( 'projectid',$this->projectid );
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
if ( empty($row) )
throw new ObjectNotFoundException('project '.$this->projectid.' not found');
@@ -205,11 +205,11 @@ class Project
{
$db = db_connection();
- $sql = new Sql( 'SELECT * FROM {t_project} '.
+ $sql = $db->sql( 'SELECT * FROM {t_project} '.
' WHERE name={projectname}' );
$sql->setString( 'projectname',$this->name );
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
$this->projectid = $row['id' ];
$this->target_dir = $row['target_dir' ];
@@ -226,7 +226,7 @@ class Project
{
$db = db_connection();
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
UPDATE {t_project}
SET name = {name},
target_dir = {target_dir},
@@ -248,7 +248,7 @@ SQL
$sql->setInt ('cut_index' ,$this->cut_index );
$sql->setInt ('projectid' ,$this->projectid );
- $db->query( $sql );
+ $sql->query( $sql );
try
{
@@ -283,17 +283,17 @@ SQL
{
$db = db_connection();
- $sql = new Sql('SELECT MAX(id) FROM {t_project}');
- $this->projectid = intval($db->getOne($sql))+1;
+ $sql = $db->sql('SELECT MAX(id) FROM {t_project}');
+ $this->projectid = intval($sql->getOne($sql))+1;
// Projekt hinzuf?gen
- $sql = new 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 {t_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 );
- $db->query( $sql );
+ $sql->query( $sql );
// Modell anlegen
$model = new Model();
@@ -373,10 +373,10 @@ SQL
// Projekt l?schen
- $sql = new Sql( 'DELETE FROM {t_project}'.
+ $sql = $db->sql( 'DELETE FROM {t_project}'.
' WHERE id= {projectid} ' );
$sql->setInt( 'projectid',$this->projectid );
- $db->query( $sql );
+ $sql->query( $sql );
}
function getDefaultLanguageId()
@@ -385,13 +385,13 @@ SQL
// ORDER BY deswegen, damit immer mind. eine Sprache
// gelesen wird
- $sql = new Sql( 'SELECT id FROM {t_language} '.
+ $sql = $db->sql( 'SELECT id FROM {t_language} '.
' WHERE projectid={projectid}'.
' ORDER BY is_default DESC' );
$sql->setInt('projectid',$this->projectid );
- return $db->getOne( $sql );
+ return $sql->getOne( $sql );
}
@@ -401,12 +401,12 @@ SQL
// ORDER BY deswegen, damit immer mind. eine Sprache
// gelesen wird
- $sql = new Sql( 'SELECT id FROM {t_projectmodel} '.
+ $sql = $db->sql( 'SELECT id FROM {t_projectmodel} '.
' WHERE projectid={projectid}'.
' ORDER BY is_default DESC' );
$sql->setInt('projectid',$this->projectid );
- return $db->getOne( $sql );
+ return $sql->getOne( $sql );
}
@@ -454,7 +454,7 @@ SQL
$db = &Session::getDatabase();
// Ordnerstruktur prüfen.
- $sql = new Sql( <<<EOF
+ $sql = $db->sql( <<<EOF
SELECT thistab.id FROM {t_object} AS thistab
LEFT JOIN {t_object} AS parenttab
ON parenttab.id = thistab.parentid
@@ -463,7 +463,7 @@ EOF
);
$sql->setInt('projectid',$this->projectid);
- $idList = $db->getCol($sql);
+ $idList = $sql->getCol($sql);
if ( count( $idList ) > 0 )
{
@@ -485,13 +485,13 @@ EOF
// Prüfe, ob die Verbindung Projekt->Template->Templatemodell->Projectmodell->Projekt konsistent ist.
- $sql = new Sql( <<<EOF
+ $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}))
EOF
);
$sql->setInt('projectid',$this->projectid);
- $idList = $db->getCol($sql);
+ $idList = $sql->getCol($sql);
if ( count( $idList ) > 1 )
{
@@ -615,7 +615,7 @@ EOF
$idcolumn = $data['primary_key'];
// Naechste freie Id in der Zieltabelle ermitteln.
- $sql = new Sql( 'SELECT MAX('.$idcolumn.') FROM {t_'.$tabelle.'}',$dbid_destination);
+ $sql = $db->sql( 'SELECT MAX('.$idcolumn.') FROM {t_'.$tabelle.'}',$dbid_destination);
$maxid = intval($db_dest->getOne($sql));
$nextid = $maxid;
@@ -632,14 +632,14 @@ EOF
break;
}
}
- $sql = new Sql( 'SELECT '.$idcolumn.' FROM {t_'.$tabelle.'} '.$where);
+ $sql = $db->sql( 'SELECT '.$idcolumn.' FROM {t_'.$tabelle.'} '.$where);
foreach( $db_src->getCol($sql) as $srcid )
{
Logger::debug('Id '.$srcid.' of table '.$tabelle);
$mapping[$tabelle][$srcid] = ++$nextid;
- $sql = new Sql( 'SELECT * FROM {t_'.$tabelle.'} WHERE id={id}');
+ $sql = $db->sql( 'SELECT * FROM {t_'.$tabelle.'} WHERE id={id}');
$sql->setInt('id',$srcid);
$row = $db_src->getRow( $sql );
@@ -660,7 +660,7 @@ EOF
if ( isset($data['unique_idx']) && $key == $data['unique_idx'] )
{
// Nachschauen, ob es einen UNIQUE-Key in der Zieltabelle schon gibt.
- $sql = new Sql( 'SELECT 1 FROM {t_'.$tabelle.'} WHERE '.$key."='".$row[$key]."'",$dbid_destination);
+ $sql = $db->sql( 'SELECT 1 FROM {t_'.$tabelle.'} WHERE '.$key."='".$row[$key]."'",$dbid_destination);
if ( intval($db_dest->getOne( $sql )) == 1 )
$row[$key] = $row[$key].$zeit;
@@ -694,7 +694,7 @@ EOF
}
// Daten in Zieltabelle einf�gen.
- $sql = new Sql( 'INSERT INTO {t_'.$tabelle.'} ('.join(array_keys($row),',').') VALUES({'.join(array_keys($row),'},{').'})',$dbid_destination);
+ $sql = $db->sql( 'INSERT INTO {t_'.$tabelle.'} ('.join(array_keys($row),',').') VALUES({'.join(array_keys($row),'},{').'})',$dbid_destination);
foreach( $row as $key=>$value )
{
if ( !$sameDB && isset($data['erase']) && in_array($key,$data['erase']) )
@@ -702,7 +702,7 @@ EOF
else
$sql->setVar($key,$value);
}
- //$sql = new Sql( 'INSERT INTO {t_'.$tabelle.'} ('.join(array_keys($row),',').') VALUES('.join($row,',').')',$dbid_destination);
+ //$sql = $db->sql( 'INSERT INTO {t_'.$tabelle.'} ('.join(array_keys($row),',').') VALUES('.join($row,',').')',$dbid_destination);
$db_dest->query( $sql );
}
@@ -710,7 +710,7 @@ EOF
{
foreach( $mapping[$tabelle] as $oldid=>$newid )
{
- $sql = new Sql( 'UPDATE {t_'.$tabelle.'} SET '.$data['self_key'].'='.$newid.' WHERE '.$data['self_key'].'='.($oldid+$maxid),$dbid_destination );
+ $sql = $db->sql( 'UPDATE {t_'.$tabelle.'} SET '.$data['self_key'].'='.$newid.' WHERE '.$data['self_key'].'='.($oldid+$maxid),$dbid_destination );
$db_dest->query( $sql );
}
}
@@ -730,11 +730,11 @@ EOF
function countObjects()
{
$db = db_connection();
- $sql = new Sql( 'SELECT COUNT(*) FROM {t_object} '.
+ $sql = $db->sql( 'SELECT COUNT(*) FROM {t_object} '.
' WHERE projectid = {projectid}' );
$sql->setInt( 'projectid', $this->projectid );
- return $db->getOne( $sql );
+ return $sql->getOne( $sql );
}
@@ -748,7 +748,7 @@ EOF
{
$db = db_connection();
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT SUM(size) FROM {t_file}
LEFT JOIN {t_object}
ON {t_file}.objectid = {t_object}.id
@@ -757,7 +757,7 @@ SQL
);
$sql->setInt( 'projectid', $this->projectid );
- return $db->getOne( $sql );
+ return $sql->getOne( $sql );
}
@@ -790,7 +790,7 @@ SQL
$db = db_connection();
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT {t_object}.id as objectid,
{t_object}.filename as filename,
{t_object}.is_folder as is_folder,
@@ -820,7 +820,7 @@ SQL
$user = Session::getUser();
$sql->setInt( 'userid', $user->userid );
- return $db->getAll( $sql );
+ return $sql->getAll( $sql );
}
@@ -833,7 +833,7 @@ SQL
{
$db = db_connection();
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT {t_object}.id as objectid,
{t_object}.lastchange_date as lastchange_date,
{t_object}.filename as filename,
@@ -853,7 +853,7 @@ SQL
SQL
);
- return $db->getAll( $sql );
+ return $sql->getAll( $sql );
}
@@ -867,7 +867,7 @@ SQL
$db = db_connection();
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT {t_object}.id as objectid,
{t_object}.lastchange_date as lastchange_date,
{t_object}.filename as filename,
@@ -897,7 +897,7 @@ SQL
$language = Session::getProjectLanguage();
$sql->setInt( 'languageid', $language->languageid );
- return $db->getAll( $sql );
+ return $sql->getAll( $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 = new Sql( 'SELECT id,name FROM {t_template}'.
+ $sql = $db->sql( 'SELECT id,name FROM {t_template}'.
' WHERE projectid={projectid}'.
' ORDER BY name ASC ' );
if ( isset($this) && isset($this->projectid) )
@@ -98,7 +98,7 @@ class Template
$sql->setInt( 'projectid',$project->projectid );
}
- return $db->getAssoc( $sql );
+ return $sql->getAssoc( $sql );
}
@@ -110,10 +110,10 @@ class Template
global $SESS;
$db = db_connection();
- $sql = new Sql( 'SELECT * FROM {t_template}'.
+ $sql = $db->sql( 'SELECT * FROM {t_template}'.
' WHERE id={templateid}' );
$sql->setInt( 'templateid',$this->templateid );
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
if ( empty($row) )
throw new ObjectNotFoundException("Template not found: ".$this->templateid);
@@ -121,12 +121,12 @@ class Template
$this->name = $row['name' ];
$this->projectid = $row['projectid'];
- $sql = new Sql( 'SELECT * FROM {t_templatemodel}'.
+ $sql = $db->sql( 'SELECT * FROM {t_templatemodel}'.
' WHERE templateid={templateid}'.
' AND projectmodelid={modelid}' );
$sql->setInt( 'templateid',$this->templateid );
$sql->setInt( 'modelid' ,$this->modelid );
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
if ( isset($row['extension']) )
{
@@ -152,23 +152,23 @@ class Template
$db = db_connection();
- $sql = new Sql( 'UPDATE {t_template}'.
+ $sql = $db->sql( 'UPDATE {t_template}'.
' SET name={name}'.
' WHERE id={templateid}' );
$sql->setString( 'name' ,$this->name );
$sql->setInt ( 'templateid',$this->templateid );
- $db->query( $sql );
+ $sql->query( $sql );
- $sql = new Sql( 'SELECT COUNT(*) FROM {t_templatemodel}'.
+ $sql = $db->sql( 'SELECT COUNT(*) FROM {t_templatemodel}'.
' WHERE templateid={templateid}'.
' AND projectmodelid={modelid}' );
$sql->setInt ( 'templateid' ,$this->templateid );
$sql->setInt ( 'modelid' ,$this->modelid );
- if ( intval($db->getOne($sql)) > 0 )
+ if ( intval($sql->getOne($sql)) > 0 )
{
// Vorlagen-Quelltext existiert für diese Varianten schon.
- $sql = new Sql( 'UPDATE {t_templatemodel}'.
+ $sql = $db->sql( 'UPDATE {t_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 = new Sql('SELECT MAX(id) FROM {t_templatemodel}');
- $nextid = intval($db->getOne($sql))+1;
+ $sql = $db->sql('SELECT MAX(id) FROM {t_templatemodel}');
+ $nextid = intval($sql->getOne($sql))+1;
- $sql = new Sql( 'INSERT INTO {t_templatemodel}'.
+ $sql = $db->sql( 'INSERT INTO {t_templatemodel}'.
' (id,templateid,projectmodelid,extension,text) '.
' VALUES ({id},{templateid},{modelid},{extension},{src}) ');
$sql->setInt ( 'id',$nextid );
@@ -191,7 +191,7 @@ class Template
$sql->setInt ( 'templateid' ,$this->templateid );
$sql->setInt ( 'modelid' ,$this->modelid );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -204,14 +204,14 @@ class Template
{
$db = db_connection();
- $sql = new Sql( 'SELECT templateid FROM {t_templatemodel}'.
+ $sql = $db->sql( 'SELECT templateid FROM {t_templatemodel}'.
' WHERE text LIKE {text} '.
' AND projectmodelid={modelid}' );
$sql->setInt ( 'modelid',$this->modelid );
$sql->setString( 'text' ,'%'.$text.'%' );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -224,11 +224,11 @@ class Template
{
$db = db_connection();
- $sql = new Sql( 'SELECT id FROM {t_element}'.
+ $sql = $db->sql( 'SELECT id FROM {t_element}'.
' WHERE templateid={templateid}'.
' ORDER BY name ASC' );
$sql->setInt( 'templateid',$this->templateid );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -243,11 +243,11 @@ class Template
$list = array();
$db = db_connection();
- $sql = new Sql( 'SELECT * FROM {t_element}'.
+ $sql = $db->sql( 'SELECT * FROM {t_element}'.
' WHERE templateid={templateid}'.
' ORDER BY name ASC' );
$sql->setInt( 'templateid',$this->templateid );
- foreach( $db->getAll( $sql ) as $row )
+ foreach( $sql->getAll( $sql ) as $row )
{
$e = new Element( $row['id'] );
$e->setDatabaseRow( $row );
@@ -273,7 +273,7 @@ class Template
$db = db_connection();
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT * FROM {t_element}
WHERE templateid={templateid}
AND writable=1
@@ -282,7 +282,7 @@ SELECT * FROM {t_element}
SQL
);
$sql->setInt ( 'templateid' ,$this->templateid );
- foreach( $db->getAll( $sql ) as $row )
+ foreach( $sql->getAll( $sql ) as $row )
{
$e = new Element( $row['id'] );
$e->setDatabaseRow( $row );
@@ -304,12 +304,12 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'SELECT id,name FROM {t_element}'.
+ $sql = $db->sql( 'SELECT id,name FROM {t_element}'.
' WHERE templateid={templateid}'.
' ORDER BY name ASC' );
$sql->setInt( 'templateid',$this->templateid );
- return $db->getAssoc( $sql );
+ return $sql->getAssoc( $sql );
}
@@ -341,10 +341,10 @@ SQL
$db = db_connection();
- $sql = new Sql('SELECT MAX(id) FROM {t_template}');
- $this->templateid = intval($db->getOne($sql))+1;
+ $sql = $db->sql('SELECT MAX(id) FROM {t_template}');
+ $this->templateid = intval($sql->getOne($sql))+1;
- $sql = new Sql( 'INSERT INTO {t_template}'.
+ $sql = $db->sql( 'INSERT INTO {t_template}'.
' (id,name,projectid)'.
' VALUES({templateid},{name},{projectid})' );
$sql->setInt ('templateid',$this->templateid );
@@ -359,7 +359,7 @@ SQL
$sql->setInt ('projectid' ,$this->projectid );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -372,11 +372,11 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'SELECT objectid FROM {t_page}'.
+ $sql = $db->sql( 'SELECT objectid FROM {t_page}'.
' WHERE templateid={templateid}' );
$sql->setInt( 'templateid',$this->templateid );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -395,15 +395,15 @@ SQL
$element->delete();
}
- $sql = new Sql( 'DELETE FROM {t_templatemodel}'.
+ $sql = $db->sql( 'DELETE FROM {t_templatemodel}'.
' WHERE templateid={templateid}' );
$sql->setInt( 'templateid',$this->templateid );
- $db->query( $sql );
+ $sql->query( $sql );
- $sql = new Sql( 'DELETE FROM {t_template}'.
+ $sql = $db->sql( 'DELETE FROM {t_template}'.
' WHERE id={templateid}' );
$sql->setInt( 'templateid',$this->templateid );
- $db->query( $sql );
+ $sql->query( $sql );
}
diff --git a/model/User.class.php b/model/User.class.php
@@ -60,11 +60,11 @@ class User
global $conf;
$db = db_connection();
- $sql = new Sql( 'SELECT id,name '.
+ $sql = $db->sql( 'SELECT id,name '.
' FROM {t_user}'.
' ORDER BY name' );
- return $db->getAssoc( $sql );
+ return $sql->getAssoc( $sql );
}
@@ -74,11 +74,11 @@ class User
$list = array();
$db = db_connection();
- $sql = new Sql( 'SELECT * '.
+ $sql = $db->sql( 'SELECT * '.
' FROM {t_user}'.
' ORDER BY name' );
- foreach( $db->getAll( $sql ) as $row )
+ foreach( $sql->getAll( $sql ) as $row )
{
$user = new User();
$user->setDatabaseRow( $row );
@@ -126,7 +126,7 @@ class User
{
$db = db_connection();
- $sql = new Sql( 'SELECT COUNT(*)'.
+ $sql = $db->sql( 'SELECT COUNT(*)'.
' FROM {t_acl}'.
' LEFT JOIN {t_object} ON {t_object}.id={t_acl}.objectid '.
' WHERE projectid={projectidid} AND '.
@@ -134,7 +134,7 @@ class User
' '.$this->getGroupClause().' )' );
$sql->setInt ( 'userid',$this->userid );
- return $db->getOne( $sql ) > 0;
+ return $sql->getOne( $sql ) > 0;
}
@@ -156,7 +156,7 @@ class User
else
{
$groupClause = $this->getGroupClause();
- $sql = new Sql(<<<SQL
+ $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
@@ -171,7 +171,7 @@ SQL
);
$sql->setInt ( 'userid',$this->userid );
- return $db->getAssoc( $sql );
+ return $sql->getAssoc( $sql );
}
}
@@ -207,10 +207,10 @@ SQL
global $conf;
$db = db_connection();
- $sql = new Sql( 'SELECT id,mail,name,password FROM {t_user}'.
+ $sql = $db->sql( 'SELECT id,mail,name,password FROM {t_user}'.
' WHERE id={userid}' );
$sql->setInt( 'userid',$this->userid );
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
if ( count($row) == 0 )
throw new ObjectNotFoundException();
@@ -228,10 +228,10 @@ SQL
global $conf;
$db = db_connection();
- $sql = new Sql( 'SELECT * FROM {t_user}'.
+ $sql = $db->sql( 'SELECT * FROM {t_user}'.
' WHERE id={userid}' );
$sql->setInt( 'userid',$this->userid );
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
if ( count($row) == 0 )
throw new ObjectNotFoundException();
@@ -253,11 +253,11 @@ SQL
$db = db_connection();
// Benutzer �ber Namen suchen
- $sql = new Sql( 'SELECT id FROM {t_user}'.
+ $sql = $db->sql( 'SELECT id FROM {t_user}'.
' WHERE name={name}' );
//Html::debug($sql);
$sql->setString( 'name',$name );
- $userId = $db->getOne( $sql );
+ $userId = $sql->getOne( $sql );
// Benutzer �ber Id instanziieren
$neuerUser = new User( $userId );
@@ -360,11 +360,11 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'SELECT name FROM {t_user}'.
+ $sql = $db->sql( 'SELECT name FROM {t_user}'.
' WHERE id={userid}' );
$sql->setInt( 'userid',$userid );
- $name = $db->getOne( $sql );
+ $name = $sql->getOne( $sql );
if ( $name == '' )
return lang('UNKNOWN');
@@ -379,7 +379,7 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'UPDATE {t_user}'.
+ $sql = $db->sql( 'UPDATE {t_user}'.
' SET name={name},'.
' fullname={fullname},'.
' ldap_dn ={ldap_dn} ,'.
@@ -400,7 +400,7 @@ SQL
$sql->setInt ( 'userid' ,$this->userid );
// Datenbankabfrage ausfuehren
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -416,17 +416,17 @@ SQL
$db = db_connection();
- $sql = new Sql('SELECT MAX(id) FROM {t_user}');
- $this->userid = intval($db->getOne($sql))+1;
+ $sql = $db->sql('SELECT MAX(id) FROM {t_user}');
+ $this->userid = intval($sql->getOne($sql))+1;
- $sql = new Sql('INSERT INTO {t_user}'.
+ $sql = $db->sql('INSERT INTO {t_user}'.
' (id,name,password,ldap_dn,fullname,tel,mail,descr,style,is_admin)'.
" VALUES( {userid},{name},'','','','','','','default',0 )" );
$sql->setInt ('userid',$this->userid);
$sql->setString('name' ,$this->name );
// Datenbankbefehl ausfuehren
- $db->query( $sql );
+ $sql->query( $sql );
$this->addNewUserGroups(); // Neue Gruppen hinzufuegen.
}
@@ -448,8 +448,8 @@ SQL
$db = db_connection();
$groupNames = "'".implode("','",$groupNames)."'";
- $sql = new Sql("SELECT id FROM {t_group} WHERE name IN($groupNames)");
- $groupIds = array_unique( $db->getCol($sql) );
+ $sql = $db->sql("SELECT id FROM {t_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
// - passiert dies nur bei der Neuanlage eines Benutzers
@@ -476,43 +476,43 @@ SQL
$db = db_connection();
// "Erzeugt von" f�r diesen Benutzer entfernen.
- $sql = new Sql( 'UPDATE {t_object} '.
+ $sql = $db->sql( 'UPDATE {t_object} '.
'SET create_userid=null '.
'WHERE create_userid={userid}' );
$sql->setInt ('userid',$this->userid );
- $db->query( $sql );
+ $sql->query( $sql );
// "Letzte �nderung von" f�r diesen Benutzer entfernen
- $sql = new Sql( 'UPDATE {t_object} '.
+ $sql = $db->sql( 'UPDATE {t_object} '.
'SET lastchange_userid=null '.
'WHERE lastchange_userid={userid}' );
$sql->setInt ('userid',$this->userid );
- $db->query( $sql );
+ $sql->query( $sql );
// Alle Archivdaten in Dateien mit diesem Benutzer entfernen
- $sql = new Sql( 'UPDATE {t_value} '.
+ $sql = $db->sql( 'UPDATE {t_value} '.
'SET lastchange_userid=null '.
'WHERE lastchange_userid={userid}' );
$sql->setInt ('userid',$this->userid );
- $db->query( $sql );
+ $sql->query( $sql );
// Alle Berechtigungen dieses Benutzers l?schen
- $sql = new Sql( 'DELETE FROM {t_acl} '.
+ $sql = $db->sql( 'DELETE FROM {t_acl} '.
'WHERE userid={userid}' );
$sql->setInt ('userid',$this->userid );
- $db->query( $sql );
+ $sql->query( $sql );
// Alle Gruppenzugehoerigkeiten dieses Benutzers l?schen
- $sql = new Sql( 'DELETE FROM {t_usergroup} '.
+ $sql = $db->sql( 'DELETE FROM {t_usergroup} '.
'WHERE userid={userid}' );
$sql->setInt ('userid',$this->userid );
- $db->query( $sql );
+ $sql->query( $sql );
// Benutzer loeschen
- $sql = new Sql( 'DELETE FROM {t_user} '.
+ $sql = $db->sql( 'DELETE FROM {t_user} '.
'WHERE id={userid}' );
$sql->setInt ('userid',$this->userid );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -548,7 +548,7 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'UPDATE {t_user} SET password={password} '.
+ $sql = $db->sql( 'UPDATE {t_user} SET password={password} '.
'WHERE id={userid}' );
if ( $always )
@@ -561,7 +561,7 @@ SQL
$sql->setInt ('userid' ,$this->userid );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -576,11 +576,11 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'SELECT {t_group}.id,{t_group}.name FROM {t_group} '.
+ $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->setInt('userid',$this->userid );
- $this->groups = $db->getAssoc( $sql );
+ $this->groups = $sql->getAssoc( $sql );
}
return $this->groups;
@@ -595,11 +595,11 @@ SQL
/*
$db = db_connection();
- $sql = new Sql( 'SELECT groupid FROM {t_usergroup} '.
+ $sql = $db->sql( 'SELECT groupid FROM {t_usergroup} '.
'WHERE userid={userid}' );
$sql->setInt('userid',$this->userid );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
*/
}
@@ -609,12 +609,12 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'SELECT {t_group}.id,{t_group}.name FROM {t_group}'.
+ $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->setInt('userid' ,$this->userid );
- return $db->getAssoc( $sql );
+ return $sql->getAssoc( $sql );
}
@@ -628,17 +628,17 @@ SQL
{
$db = db_connection();
- $sql = new Sql('SELECT MAX(id) FROM {t_usergroup}');
- $usergroupid = intval($db->getOne($sql))+1;
+ $sql = $db->sql('SELECT MAX(id) FROM {t_usergroup}');
+ $usergroupid = intval($sql->getOne($sql))+1;
- $sql = new Sql( 'INSERT INTO {t_usergroup} '.
+ $sql = $db->sql( 'INSERT INTO {t_usergroup} '.
' (id,userid,groupid) '.
' VALUES( {usergroupid},{userid},{groupid} )' );
$sql->setInt('usergroupid',$usergroupid );
$sql->setInt('userid' ,$this->userid );
$sql->setInt('groupid' ,$groupid );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -653,12 +653,12 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'DELETE FROM {t_usergroup} '.
+ $sql = $db->sql( 'DELETE FROM {t_usergroup} '.
' WHERE userid={userid} AND groupid={groupid}' );
$sql->setInt ('userid' ,$this->userid );
$sql->setInt ('groupid' ,$groupid );
- $db->query( $sql );
+ $sql->query( $sql );
}
@@ -688,7 +688,7 @@ SQL
$group_clause = $this->getGroupClause();
- $sql = new Sql( 'SELECT {t_acl}.*,{t_object}.projectid,{t_language}.name AS languagename FROM {t_acl}'.
+ $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} '.
@@ -700,7 +700,7 @@ SQL
$aclList = array();
- foreach( $db->getAll( $sql ) as $row )
+ foreach( $sql->getAll( $sql ) as $row )
{
$acl = new Acl();
$acl->setDatabaseRow( $row );
@@ -728,8 +728,8 @@ SQL
// $var = array();
//
// // Alle Projekte lesen
-// $sql = new Sql( 'SELECT id,name FROM {t_project}' );
-// $projects = $db->getAssoc( $sql );
+// $sql = $db->sql( 'SELECT id,name FROM {t_project}' );
+// $projects = $sql->getAssoc( $sql );
//
// foreach( $projects as $projectid=>$projectname )
// {
@@ -738,14 +738,14 @@ SQL
// $var[$projectid]['folders'] = array();
// $var[$projectid]['rights'] = array();
//
-// $sql = new Sql( 'SELECT {t_acl}.* FROM {t_acl}'.
+// $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->setInt('projectid',$projectid );
// $sql->setInt('userid' ,$this->userid );
//
-// $acls = $db->getAll( $sql );
+// $acls = $sql->getAll( $sql );
//
// foreach( $acls as $acl )
// {
@@ -757,10 +757,10 @@ SQL
// $var[$projectid]['rights'][$aclid]['delete_url'] = Html::url(array('action'=>'user','subaction'=>'delright','aclid'=>$aclid));
// }
//
-// $sql = new Sql( 'SELECT id FROM {t_folder}'.
+// $sql = $db->sql( 'SELECT id FROM {t_folder}'.
// ' WHERE projectid={projectid}' );
// $sql->setInt('projectid',$projectid);
-// $folders = $db->getCol( $sql );
+// $folders = $sql->getCol( $sql );
//
// $var[$projectid]['folders'] = array();
//
@@ -906,7 +906,7 @@ SQL
{
$db = db_connection();
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT {t_object}.id as objectid,
{t_object}.filename as filename,
{t_object}.lastchange_date as lastchange_date,
@@ -922,7 +922,7 @@ SQL
$sql->setInt( 'userid', $this->userid );
- return $db->getAll( $sql );
+ return $sql->getAll( $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 = new Sql( 'SELECT * FROM {t_value}'.
+ $sql = $db->sql( 'SELECT * FROM {t_value}'.
' WHERE elementid ={elementid}'.
' AND pageid ={pageid}'.
' AND languageid={languageid}'.
' AND publish=1' );
else
- $sql = new Sql( 'SELECT * FROM {t_value}'.
+ $sql = $db->sql( 'SELECT * FROM {t_value}'.
' WHERE elementid ={elementid}'.
' AND pageid ={pageid}'.
' AND languageid={languageid}'.
@@ -174,7 +174,7 @@ class Value
$sql->setInt( 'elementid' ,$this->element->elementid );
$sql->setInt( 'pageid' ,$this->pageid );
$sql->setInt( 'languageid',$this->languageid);
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
if ( count($row) > 0 ) // Wenn Inhalt gefunden
{
@@ -203,12 +203,12 @@ class Value
$db = db_connection();
- $sql = new Sql( 'SELECT {t_value}.*,{t_user}.name as lastchange_username'.
+ $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->setInt( 'valueid',$this->valueid);
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
$this->text = $row['text' ];
$this->pageid = intval($row['pageid' ]);
@@ -236,7 +236,7 @@ class Value
{
$db = db_connection();
- $sql = new Sql( 'SELECT {t_value}.*,{t_user}.name as lastchange_username'.
+ $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 elementid ={elementid}'.
@@ -248,7 +248,7 @@ class Value
$sql->setInt( 'languageid',$this->languageid);
$list = array();
- foreach( $db->getAll( $sql ) as $row )
+ foreach( $sql->getAll( $sql ) as $row )
{
$val = new Value();
$val->valueid = $row['id'];
@@ -279,7 +279,7 @@ class Value
{
$db = db_connection();
- $sql = new Sql( 'SELECT COUNT(*) FROM {t_value}'.
+ $sql = $db->sql( 'SELECT COUNT(*) FROM {t_value}'.
' WHERE elementid ={elementid}'.
' AND pageid ={pageid}'.
' AND languageid={languageid}' );
@@ -287,7 +287,7 @@ class Value
$sql->setInt( 'pageid' ,$this->pageid );
$sql->setInt( 'languageid',$this->languageid);
- return $db->getOne( $sql );
+ return $sql->getOne( $sql );
}
@@ -295,7 +295,7 @@ class Value
{
$db = db_connection();
- $sql = new Sql(
+ $sql = $db->sql(
<<<SQL
SELECT lastchange_date FROM {t_value}
WHERE elementid ={elementid}
@@ -308,7 +308,7 @@ SQL
$sql->setInt( 'pageid' ,$this->pageid );
$sql->setInt( 'languageid',$this->languageid);
- return $db->getOne( $sql );
+ return $sql->getOne( $sql );
}
@@ -320,7 +320,7 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'UPDATE {t_value}'.
+ $sql = $db->sql( 'UPDATE {t_value}'.
' SET publish=0'.
' WHERE elementid ={elementid}'.
' AND pageid ={pageid}'.
@@ -329,9 +329,9 @@ SQL
$sql->setInt( 'pageid' ,$this->pageid );
$sql->setInt( 'languageid',$this->languageid);
- $db->query( $sql );
+ $sql->query( $sql );
- $sql = new Sql( 'UPDATE {t_value}'.
+ $sql = $db->sql( 'UPDATE {t_value}'.
' SET publish=1'.
' WHERE active = 1'.
' AND elementid ={elementid}'.
@@ -341,7 +341,7 @@ SQL
$sql->setInt( 'pageid' ,$this->pageid );
$sql->setInt( 'languageid',$this->languageid);
- $db->query( $sql );
+ $sql->query( $sql );
}
/**
@@ -352,7 +352,7 @@ SQL
global $SESS;
$db = db_connection();
- $sql = new Sql( 'UPDATE {t_value}'.
+ $sql = $db->sql( 'UPDATE {t_value}'.
' SET active=0'.
' WHERE elementid ={elementid}'.
' AND pageid ={pageid}'.
@@ -361,13 +361,13 @@ SQL
$sql->setInt( 'pageid' ,$this->pageid );
$sql->setInt( 'languageid',$this->languageid);
- $db->query( $sql );
+ $sql->query( $sql );
if ( $this->publish )
{
// Wenn Inhalt sofort veroeffentlicht werden kann, dann
// alle anderen Inhalte auf nicht-veroeffentlichen stellen
- $sql = new Sql( 'UPDATE {t_value}'.
+ $sql = $db->sql( 'UPDATE {t_value}'.
' SET publish=0'.
' WHERE elementid ={elementid}'.
' AND pageid ={pageid}'.
@@ -376,14 +376,14 @@ SQL
$sql->setInt( 'pageid' ,$this->pageid );
$sql->setInt( 'languageid',$this->languageid);
- $db->query( $sql );
+ $sql->query( $sql );
}
// Naechste ID aus Datenbank besorgen
- $sql = new Sql('SELECT MAX(id) FROM {t_value}');
- $this->valueid = intval($db->getOne($sql))+1;
+ $sql = $db->sql('SELECT MAX(id) FROM {t_value}');
+ $this->valueid = intval($sql->getOne($sql))+1;
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
INSERT INTO {t_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})
@@ -415,7 +415,7 @@ SQL
$user = Session::getUser();
$sql->setInt ( 'lastchange_userid',$user->userid );
- $db->query( $sql );
+ $sql->query( $sql );
// Nur ausfuehren, wenn in Konfiguration aktiviert.
$limit = config('content','revision-limit');
@@ -434,7 +434,7 @@ SQL
$db = db_connection();
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT id FROM {t_value}
WHERE elementid = {elementid}
AND pageid = {pageid}
@@ -447,11 +447,11 @@ SQL
$sql->setInt( 'elementid' ,$this->element->elementid );
$sql->setInt( 'pageid' ,$this->pageid );
$sql->setInt( 'languageid',$this->languageid );
- $values = $db->getCol( $sql );
+ $values = $sql->getCol( $sql );
if ( count($values) > $limit['min-revisions'] )
{
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
DELETE FROM {t_value}
WHERE elementid = {elementid}
AND pageid = {pageid}
@@ -467,12 +467,12 @@ SQL
$sql->setInt( 'languageid',$this->languageid );
$sql->setInt( 'min_date' ,$limit['max-age']*24*60*60);
$sql->setInt( 'min_id' ,$values[count($values)-$limit['min-revisions']]);
- $db->query($sql);
+ $sql->query($sql);
}
if ( count($values) > $limit['max-revisions'] )
{
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
DELETE FROM {t_value}
WHERE elementid = {elementid}
AND pageid = {pageid}
@@ -488,7 +488,7 @@ SQL
$sql->setInt( 'languageid',$this->languageid );
$sql->setInt( 'min_date' ,$limit['min-age']*24*60*60);
$sql->setInt( 'min_id' ,$values[count($values)-$limit['max-revisions']]);
- $db->query($sql);
+ $sql->query($sql);
}
}
@@ -500,14 +500,14 @@ SQL
function delete()
{
$db = db_connection();
- $sql = new Sql( 'DELETE * FROM {t_value}'.
+ $sql = $db->sql( 'DELETE * FROM {t_value}'.
' WHERE elementid ={elementid}'.
' AND pageid ={pageid}'.
' AND languageid={languageid}' );
$sql->setInt( 'elementid' ,$this->element->elementid );
$sql->setInt( 'pageid' ,$this->pageid );
$sql->setInt( 'languageid',$this->languageid);
- $row = $db->getRow( $sql );
+ $row = $sql->getRow( $sql );
}
@@ -1541,7 +1541,7 @@ SQL
{
$db = db_connection();
- $sql = new Sql( 'SELECT {t_object}.id FROM {t_value} '.
+ $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} '.
@@ -1552,7 +1552,7 @@ SQL
$sql->setInt ( 'languageid',$this->languageid );
$sql->setString( 'text' ,'%'.$text.'%' );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -1566,7 +1566,7 @@ SQL
$db = db_connection();
- $sql = new Sql( 'SELECT {t_object}.id FROM {t_value} '.
+ $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} '.
@@ -1577,7 +1577,7 @@ SQL
$sql->setInt ( 'languageid',$this->languageid );
$sql->setInt ( 'userid' ,$userid );
- return $db->getCol( $sql );
+ return $sql->getCol( $sql );
}
@@ -1591,7 +1591,7 @@ SQL
{
$db = db_connection();
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT {t_object}.id
FROM {t_value}
LEFT JOIN {t_page}
@@ -1603,7 +1603,7 @@ SELECT {t_object}.id
SQL
);
$sql->setInt ( 'userid' ,$userid );
- return $db->getOne( $sql );
+ return $sql->getOne( $sql );
}
@@ -1616,7 +1616,7 @@ SQL
{
$db = db_connection();
- $sql = new Sql( <<<SQL
+ $sql = $db->sql( <<<SQL
SELECT {t_object}.id
FROM {t_value}
LEFT JOIN {t_page}
@@ -1630,7 +1630,7 @@ SQL
);
$sql->setInt ( 'userid' ,$userid );
$sql->setInt ( 'projectid' ,$projectid );
- return $db->getOne( $sql );
+ return $sql->getOne( $sql );
}
diff --git a/util/Sql.class.php b/util/Sql.class.php
@@ -27,7 +27,7 @@
* Beispiel<br>
* <pre>
* // Neues Objekt erzeugen mit SQL-Anweisung
- * $sql = new Sql('SELECT * FROM xy WHERE id={uid} AND name={name}');
+ * $sql = $db->sql('SELECT * FROM xy WHERE id={uid} AND name={name}');
*
* // Parameter f�llen
* $sql->setInt ('uid' ,1 );
