openrat-cms

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

commit db74a53625d5a93f6a76524917e0b41c8b1e448e
parent 2e09c835efc07a9b5e93d94b6698e193b04dd48d
Author: Jan Dankert <devnull@localhost>
Date:   Fri,  8 Dec 2017 00:00:13 +0100

Refactoring: Statement::getOne() und andere benötigen keinen Parameter mehr.

Diffstat:
auth/InternalAuth.class.php | 2+-
auth/LdapAuth.class.php | 2+-
auth/LdapUserDNAuth.class.php | 2+-
db/DbUpdate.class.php | 4++--
db/update/DBVersion000001.class.php | 2+-
db/update/DBVersion000007.class.php | 2+-
model/Acl.class.php | 8++++----
model/Element.class.php | 4++--
model/File.class.php | 10+++++-----
model/Folder.class.php | 46+++++++++++++++++++++++-----------------------
model/Group.class.php | 18+++++++++---------
model/Language.class.php | 48++++++++++++++++++++++++------------------------
model/Link.class.php | 4++--
model/Model.class.php | 48++++++++++++++++++++++++------------------------
model/Object.class.php | 40++++++++++++++++++++--------------------
model/Page.class.php | 8++++----
model/Project.class.php | 34+++++++++++++++++-----------------
model/Template.class.php | 20++++++++++----------
model/User.class.php | 26+++++++++++++-------------
model/Value.class.php | 22+++++++++++-----------
modules/database/Statement.class.php | 95+++++++++++++++++++++++++++++++++++++------------------------------------------
21 files changed, 219 insertions(+), 226 deletions(-)

diff --git a/auth/InternalAuth.class.php b/auth/InternalAuth.class.php @@ -29,7 +29,7 @@ SQL ); $sql->setString('name',$username); - $row_user = $sql->getRow( $sql ); + $row_user = $sql->getRow(); if ( empty($row_user) ) { diff --git a/auth/LdapAuth.class.php b/auth/LdapAuth.class.php @@ -17,7 +17,7 @@ SQL ); $sql->setString('name',$username); - $row_user = $sql->getRow( $sql ); + $row_user = $sql->getRow(); $userid = $row_user['id']; $ldap = new Ldap(); diff --git a/auth/LdapUserDNAuth.class.php b/auth/LdapUserDNAuth.class.php @@ -24,7 +24,7 @@ SQL ); $sql->setString('name',$username); - $row_user = $sql->getRow( $sql ); + $row_user = $sql->getRow(); if ( empty($row_user) ) return false; diff --git a/db/DbUpdate.class.php b/db/DbUpdate.class.php @@ -79,7 +79,7 @@ class DbUpdate SELECT COUNT(*) FROM {{version}} WHERE STATUS=0 SQL ,$db->id); - $countErrors = $sql->getOne($sql); + $countErrors = $sql->getOne(); if ( $countErrors > 0 ) Http::serverError('Database error','there are dirty versions (means: versions with status 0), see table VERSION for details.'); @@ -88,7 +88,7 @@ SQL SELECT MAX(version) FROM {{version}} SQL ,$db->id); - $version = $sql->getOne($sql); + $version = $sql->getOne(); if ( is_numeric($version) ) return $version; // Aktuelle Version.s diff --git a/db/update/DBVersion000001.class.php b/db/update/DBVersion000001.class.php @@ -336,7 +336,7 @@ class DBVersion000001 extends DbVersion { // Benutzer zählen. $sql = $db->sql('SELECT COUNT(*) From {{user}}',$db->id); - $countUsers = $sql->getOne( $sql ); + $countUsers = $sql->getOne(); // Wenn noch kein Benutzer vorhanden, dann einen anlegen. if ( $countUsers == 0 ) diff --git a/db/update/DBVersion000007.class.php b/db/update/DBVersion000007.class.php @@ -20,7 +20,7 @@ class DBVersion000007 extends DbVersion $table = $this->getTableName('user'); $db = $this->getDb(); $stmt = $db->sql('SELECT id FROM '.$table); - foreach( $stmt->getCol() as $userid ) + foreach($stmt->getCol() as $userid ) { $secret = Password::randomHexString(64); $stmt = $db->sql('UPDATE '.$table.' SET otp_secret={secret} WHERE id={id}'); diff --git a/model/Acl.class.php b/model/Acl.class.php @@ -205,7 +205,7 @@ class Acl $sql->setInt('aclid',$this->aclid); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); $this->setDatabaseRow( $row ); @@ -231,7 +231,7 @@ class Acl $sql->setInt('aclid',$this->aclid); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); $this->setDatabaseRow( $row ); } @@ -454,7 +454,7 @@ SQL else $sql->setInt ('languageid',$this->languageid); - $aclid = intval($sql->getOne($sql)); + $aclid = intval($sql->getOne()); if ( $aclid > 0 ) { // Eine ACL existiert bereits, wir übernehmen diese ID @@ -466,7 +466,7 @@ SQL $sql = $db->sql('SELECT MAX(id) FROM {{acl}}'); - $this->aclid = intval($sql->getOne($sql))+1; + $this->aclid = intval($sql->getOne())+1; $sql = $db->sql( <<<SQL INSERT INTO {{acl}} diff --git a/model/Element.class.php b/model/Element.class.php @@ -142,7 +142,7 @@ class Element $db = db_connection(); $sql = $db->sql('SELECT MAX(id) FROM {{element}}'); - $this->elementid = intval($sql->getOne($sql))+1; + $this->elementid = intval($sql->getOne())+1; $sql = $db->sql( 'INSERT INTO {{element}}'. ' (id,templateid,name,descr,type,writable) '. @@ -185,7 +185,7 @@ SELECT * FROM {{element}} SQL ); $sql->setInt( 'elementid',$this->elementid ); - $this->setDatabaseRow( $sql->getRow( $sql ) ); + $this->setDatabaseRow( $sql->getRow() ); } } diff --git a/model/File.class.php b/model/File.class.php @@ -169,7 +169,7 @@ class File extends Object $sql = $db->sql( $sqlquery ); $sql->setInt( 'projectid',$SESS['projectid'] ); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -192,7 +192,7 @@ class File extends Object $sql->setInt ( 'projectid',$this->projectid ); $sql->setString( 'extension',$extension ); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -429,7 +429,7 @@ class File extends Object ' FROM {{file}}'. ' WHERE objectid={objectid}' ); $sql->setInt( 'objectid',$this->objectid ); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); if ( count($row)!=0 ) { @@ -560,7 +560,7 @@ EOF ' FROM {{file}}'. ' WHERE objectid={objectid}' ); $sql->setInt( 'objectid',$this->objectid ); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); if ( count($row) != 0 ) { @@ -626,7 +626,7 @@ EOF $this->objectAdd(); $sql = $db->sql('SELECT MAX(id) FROM {{file}}'); - $this->fileid = intval($sql->getOne($sql))+1; + $this->fileid = intval($sql->getOne())+1; $sql = $db->sql('INSERT INTO {{file}}'. ' (id,objectid,extension,size,value)'. diff --git a/model/Folder.class.php b/model/Folder.class.php @@ -52,7 +52,7 @@ class Folder extends Object $db = db_connection(); $sql = $db->sql('SELECT MAX(id) FROM {{folder}}'); - $this->folderid = intval($sql->getOne($sql))+1; + $this->folderid = intval($sql->getOne())+1; $sql = $db->sql('INSERT INTO {{folder}}'. ' (id,objectid)'. @@ -87,7 +87,7 @@ class Folder extends Object } // Datenbankabfrage ausfuehren - return $sql->getOne( $sql ); + return $sql->getOne(); } @@ -104,7 +104,7 @@ class Folder extends Object $sql->setString('filename', $filename ); - return( $sql->getOne($sql) > 0 ); + return( $sql->getOne() > 0 ); } @@ -172,7 +172,7 @@ class Folder extends Object ' ORDER BY orderid ASC' ); $sql->setInt('objectid' ,$this->objectid ); - return( $sql->getCol( $sql ) ); + return( $sql->getCol() ); } @@ -218,7 +218,7 @@ class Folder extends Object $sql->setInt('projectid',$this->projectid ); $sql->setInt('objectid' ,$this->objectid ); - return( $sql->getCol( $sql ) ); + return( $sql->getCol() ); } @@ -233,7 +233,7 @@ class Folder extends Object ' ORDER BY {{name}}.name,{{object}}.filename ASC'); $sql->setInt('objectid' , $this->objectid ); $sql->setInt('languageid', $this->languageid); - return( $sql->getCol( $sql ) ); + return( $sql->getCol() ); } @@ -248,7 +248,7 @@ class Folder extends Object $sql->setInt('projectid',$this->projectid ); $sql->setInt('objectid' ,$this->objectid ); - return( $sql->getCol( $sql ) ); + return( $sql->getCol() ); } @@ -300,7 +300,7 @@ class Folder extends Object $sql->setInt ('objectid' ,$this->objectid ); $sql->setString('filename' ,$filename ); - return( intval($sql->getOne( $sql )) ); + return( intval($sql->getOne()) ); } @@ -343,7 +343,7 @@ class Folder extends Object $sql->setInt('is_page' ,in_array('page' ,$types)?OR_TYPEID_PAGE:0); $sql->setInt('is_link' ,in_array('link' ,$types)?OR_TYPEID_LINK:0); - return( $sql->getCol( $sql ) ); + return( $sql->getCol() ); } @@ -360,7 +360,7 @@ class Folder extends Object $sql->setInt('projectid',$this->projectid ); else $sql->setInt('projectid',$SESS['projectid'] ); - return( $sql->getOne( $sql ) ); + return( $sql->getOne() ); } @@ -376,7 +376,7 @@ class Folder extends Object $sql->setInt( 'projectid',$this->projectid ); $sql->setInt( 'objectid' ,$this->objectid ); - return( $sql->getCol( $sql ) ); + return( $sql->getCol() ); } @@ -396,7 +396,7 @@ class Folder extends Object } else $sql->setInt( 'projectid',$this->projectid ); - return( $sql->getCol( $sql ) ); + return( $sql->getCol() ); } @@ -409,7 +409,7 @@ class Folder extends Object ' ORDER BY orderid ASC' ); $sql->setInt( 'objectid' ,$this->objectid ); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -428,7 +428,7 @@ class Folder extends Object ' ORDER BY orderid ASC' ); $sql->setInt( 'objectid' ,$this->objectid ); - $oid = intval($sql->getOne( $sql )); + $oid = intval($sql->getOne()); if ( $oid != 0 ) $o = new Object($oid); @@ -454,7 +454,7 @@ class Folder extends Object ' ORDER BY orderid ASC' ); $sql->setInt( 'objectid' ,$this->objectid ); - $oid = intval($sql->getOne( $sql )); + $oid = intval($sql->getOne()); if ( $oid != 0 ) $o = new Object($oid); @@ -475,7 +475,7 @@ class Folder extends Object ' ORDER BY orderid DESC' ); $sql->setInt( 'objectid' ,$this->objectid ); - $oid = intval($sql->getOne( $sql )); + $oid = intval($sql->getOne()); if ( $oid != 0 ) $o = new Object($oid); @@ -495,7 +495,7 @@ class Folder extends Object ' ORDER BY orderid ASC' ); $sql->setInt( 'objectid' ,$this->objectid ); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -514,7 +514,7 @@ class Folder extends Object ' ORDER BY orderid ASC' ); $sql->setInt( 'objectid' ,$this->objectid ); - return $sql->getAssoc( $sql ); + return $sql->getAssoc(); } @@ -527,7 +527,7 @@ class Folder extends Object ' ORDER BY orderid ASC' ); $sql->setInt( 'objectid' ,$this->objectid ); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -646,7 +646,7 @@ SQL ); $sql->setInt('parentid' ,$foid ); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); if ( in_array($row['id'],$idCache)) \Http::serverError('fatal: parent-rekursion in object-id: '.$this->objectid.', double-parent-id: '.$row['id']); @@ -685,7 +685,7 @@ SQL $sql->setInt('languageid',$this->languageid); $sql->setInt('parentid' ,$foid ); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); if ( in_array($row['id'],$idCache)) \Http::serverError('fatal: parent-rekursion in object-id: '.$this->objectid.', double-parent-id: '.$row['id']); @@ -713,7 +713,7 @@ SQL ' ORDER BY orderid ASC' ); $sql->setInt( 'objectid' ,$this->objectid ); - $this->subfolders = $sql->getCol( $sql ); + $this->subfolders = $sql->getCol(); return $this->subfolders; } @@ -729,7 +729,7 @@ SQL ' ORDER BY orderid ASC' ); $sql->setInt( 'objectid' ,$this->objectid ); - return $sql->getAssoc( $sql ); + return $sql->getAssoc(); } diff --git a/model/Group.class.php b/model/Group.class.php @@ -57,7 +57,7 @@ class Group $sql = $db->sql( 'SELECT id,name FROM {{group}}' ); - return $sql->getAssoc( $sql ); + return $sql->getAssoc(); } @@ -70,7 +70,7 @@ class Group ' WHERE id={groupid}' ); $sql->setInt( 'groupid',$this->groupid ); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); if ( count($row) > 0 ) $this->name = $row['name' ]; else @@ -87,7 +87,7 @@ class Group ' WHERE name={name}' ); $sql->setString('name',$name ); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); if ( count($row) > 0 ) { $group = new Group( $row['id'] ); @@ -142,7 +142,7 @@ class Group $this->name = $name; $sql = $db->sql('SELECT MAX(id) FROM {{group}}'); - $this->groupid = intval($sql->getOne($sql))+1; + $this->groupid = intval($sql->getOne())+1; // Gruppe hinzuf?gen $sql = $db->sql( 'INSERT INTO {{group}} '. @@ -191,7 +191,7 @@ class Group 'WHERE {{usergroup}}.groupid={groupid}' ); $sql->setInt('groupid',$this->groupid ); - return $sql->getAssoc( $sql ); + return $sql->getAssoc(); } @@ -205,7 +205,7 @@ class Group ' WHERE {{usergroup}}.groupid IS NULL' ); $sql->setInt('groupid' ,$this->groupid ); - return $sql->getAssoc( $sql ); + return $sql->getAssoc(); } @@ -215,7 +215,7 @@ class Group $db = db_connection(); $sql = $db->sql('SELECT MAX(id) FROM {{usergroup}}'); - $usergroupid = intval($sql->getOne($sql))+1; + $usergroupid = intval($sql->getOne())+1; $sql = $db->sql( 'INSERT INTO {{usergroup}} '. ' (id,userid,groupid) '. @@ -252,7 +252,7 @@ class Group // Alle Projekte lesen $sql = $db->sql( 'SELECT id,name FROM {{project}}' ); - $projects = $sql->getAssoc( $sql ); + $projects = $sql->getAssoc(); foreach( $projects as $projectid=>$projectname ) { @@ -283,7 +283,7 @@ class Group $sql = $db->sql( 'SELECT id FROM {{folder}}'. ' WHERE projectid={projectid}' ); $sql->setInt('projectid',$projectid); - $folders = $sql->getCol( $sql ); + $folders = $sql->getCol(); $var[$projectid]['folders'] = array(); diff --git a/model/Language.class.php b/model/Language.class.php @@ -1,4 +1,4 @@ -<?php +<?php namespace cms\model; // OpenRat Content Management System // Copyright (C) 2002-2012 Jan Dankert, cms@jandankert.de @@ -46,23 +46,23 @@ class Language // $this->projectid = $SESS['projectid']; } - - - - /** - * Stellt fest, ob die angegebene Id existiert. - */ - function available( $id ) - { - $db = db_connection(); - - $sql = $db->sql('SELECT 1 FROM {{language}} '. - ' WHERE id={id}'); - $sql->setInt('id' ,$id ); - - return intval($sql->getOne($sql)) == 1; - } - + + + + /** + * Stellt fest, ob die angegebene Id existiert. + */ + function available( $id ) + { + $db = db_connection(); + + $sql = $db->sql('SELECT 1 FROM {{language}} '. + ' WHERE id={id}'); + $sql->setInt('id' ,$id ); + + return intval($sql->getOne()) == 1; + } + // Lesen aller Sprachen aus der Datenbank @@ -83,7 +83,7 @@ class Language $sql->setInt('projectid',$project->projectid); } - return $sql->getAssoc( $sql ); + return $sql->getAssoc(); } @@ -109,7 +109,7 @@ SQL $sql->setInt('projectid',$project->projectid); } - return $sql->getOne( $sql ); + return $sql->getOne(); } @@ -122,7 +122,7 @@ SQL ' WHERE id={languageid}' ); $sql->setInt( 'languageid',$this->languageid ); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); if ( count($row) > 0 ) { @@ -186,7 +186,7 @@ SQL } $sql = $db->sql('SELECT MAX(id) FROM {{language}}'); - $this->languageid = intval($sql->getOne($sql))+1; + $this->languageid = intval($sql->getOne())+1; // Sprache hinzuf?gen $sql = $db->sql( 'INSERT INTO {{language}} '. @@ -240,7 +240,7 @@ SQL $sql->setInt('projectid',$project->projectid); } - return $sql->getOne( $sql ); + return $sql->getOne(); } @@ -275,7 +275,7 @@ SQL // Andere Sprache auf "Default" setzen $sql = $db->sql( 'SELECT id FROM {{language}} WHERE projectid={projectid}' ); $sql->setInt( 'projectid',$this->projectid ); - $new_default_languageid = $sql->getOne( $sql ); + $new_default_languageid = $sql->getOne(); $sql = $db->sql( 'UPDATE {{language}} SET is_default=1 WHERE id={languageid}' ); $sql->setInt( 'languageid',$new_default_languageid ); diff --git a/model/Link.class.php b/model/Link.class.php @@ -52,7 +52,7 @@ class Link extends Object ' FROM {{link}}'. ' WHERE objectid={objectid}' ); $sql->setInt( 'objectid',$this->objectid ); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); if ( count($row ) != 0 ) { @@ -146,7 +146,7 @@ class Link extends Object $db = db_connection(); $sql = $db->sql('SELECT MAX(id) FROM {{link}}'); - $this->linkid = intval($sql->getOne($sql))+1; + $this->linkid = intval($sql->getOne())+1; $sql = $db->sql('INSERT INTO {{link}}'. ' (id,objectid,url,link_objectid)'. diff --git a/model/Model.class.php b/model/Model.class.php @@ -1,4 +1,4 @@ -<?php +<?php namespace cms\model; // OpenRat Content Management System // Copyright (C) 2002-2012 Jan Dankert, cms@jandankert.de @@ -47,23 +47,23 @@ class Model if ( is_numeric($modelid) ) $this->modelid = $modelid; } - - - /** - * Stellt fest, ob die angegebene Id existiert. - */ - function available( $id ) - { - $db = db_connection(); - - $sql = $db->sql('SELECT 1 FROM {{projectmodel}} '. - ' WHERE id={id}'); - $sql->setInt('id' ,$id ); - - return intval($sql->getOne($sql)) == 1; - } - - + + + /** + * Stellt fest, ob die angegebene Id existiert. + */ + function available( $id ) + { + $db = db_connection(); + + $sql = $db->sql('SELECT 1 FROM {{projectmodel}} '. + ' WHERE id={id}'); + $sql->setInt('id' ,$id ); + + return intval($sql->getOne()) == 1; + } + + /** @@ -86,7 +86,7 @@ class Model $sql->setInt('projectid',$project->projectid); } - return $sql->getAssoc( $sql ); + return $sql->getAssoc(); } @@ -108,7 +108,7 @@ SQL $sql->setInt('projectid',$this->projectid ); else $sql->setInt('projectid',$SESS['projectid'] ); - return $sql->getOne( $sql ); + return $sql->getOne(); } @@ -123,7 +123,7 @@ SQL ' WHERE id={modelid}' ); $sql->setInt( 'modelid',$this->modelid ); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); $this->name = $row['name' ]; $this->projectid = $row['projectid']; @@ -181,7 +181,7 @@ SQL $db = db_connection(); $sql = $db->sql('SELECT MAX(id) FROM {{projectmodel}}'); - $this->modelid = intval($sql->getOne($sql))+1; + $this->modelid = intval($sql->getOne())+1; // Modell hinzuf?gen $sql = $db->sql( 'INSERT INTO {{projectmodel}} '. @@ -212,7 +212,7 @@ SQL $sql->setInt('projectid',$project->projectid); } - return $sql->getOne( $sql ); + return $sql->getOne(); } @@ -271,7 +271,7 @@ SQL { $sql = $db->sql( 'SELECT id FROM {{projectmodel}} WHERE projectid={projectid}' ); $sql->setInt( 'projectid',$this->projectid ); - $new_default_modelid = $sql->getOne( $sql ); + $new_default_modelid = $sql->getOne(); $sql = $db->sql( 'UPDATE {{projectmodel}} SET is_default=1 WHERE id={modelid}' ); $sql->setInt( 'modelid',$new_default_modelid ); diff --git a/model/Object.class.php b/model/Object.class.php @@ -200,7 +200,7 @@ namespace cms\model { ' WHERE projectid={projectid}'); $sql->setInt('projectid', $projectid); - return $sql->getCol($sql); + return $sql->getCol(); } @@ -458,7 +458,7 @@ SQL ' WHERE id={objectid}'); $sql->setInt('objectid' , $objectid ); - return intval($sql->getOne($sql)) == 1; + return intval($sql->getOne()) == 1; } @@ -493,7 +493,7 @@ SQL $sql->setInt('languageid', $this->languageid); $sql->setInt('objectid' , $this->objectid ); - $row = $sql->getRow($sql); + $row = $sql->getRow(); if (count($row) == 0) throw new \ObjectNotFoundException('object '.$this->objectid.' not found'); @@ -515,7 +515,7 @@ SQL $sql = $db->sql('SELECT * FROM {{object}}'. ' WHERE {{object}}.id={objectid}'); $sql->setInt('objectid' , $this->objectid ); - $row = $sql->getRow($sql); + $row = $sql->getRow(); if (count($row) == 0) die('fatal: Object::objectLoadRaw(): objectid not found: '.$this->objectid.', SQL='.$sql->raw); @@ -761,7 +761,7 @@ SQL ); $sql->setInt( 'objectid' , $this->objectid ); $sql->setInt( 'languageid', $this->languageid ); - $count = $sql->getOne($sql); + $count = $sql->getOne(); if ($count > 0) { @@ -782,7 +782,7 @@ SQL else { $sql = $db->sql('SELECT MAX(id) FROM {{name}}'); - $nameid = intval($sql->getOne($sql))+1; + $nameid = intval($sql->getOne())+1; $sql = $db->sql('INSERT INTO {{name}}'.' (id,objectid,languageid,name,descr)'.' VALUES( {nameid},{objectid},{languageid},{name},{desc} )'); $sql->setInt ('objectid' , $this->objectid ); @@ -847,7 +847,7 @@ SQL // Neue Objekt-Id bestimmen $sql = $db->sql('SELECT MAX(id) FROM {{object}}'); - $this->objectid = intval($sql->getOne($sql))+1; + $this->objectid = intval($sql->getOne())+1; $this->checkFilename(); $sql = $db->sql('INSERT INTO {{object}}'. @@ -954,7 +954,7 @@ SQL $sql->setString('objectid', $this->objectid); - return( intval($sql->getOne($sql)) == 0 ); + return( intval($sql->getOne()) == 0 ); } @@ -983,7 +983,7 @@ SQL $sql->setInt('languageid',$this->languageid); $sql->setInt('objectid' ,$this->objectid); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -996,7 +996,7 @@ SQL ' ORDER BY userid,groupid ASC' ); $sql->setInt('objectid' ,$this->objectid); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -1024,7 +1024,7 @@ SQL ' ORDER BY userid,groupid ASC' ); $sql->setInt('objectid' ,$oid); $sql->setInt('languageid',$this->languageid); - $acls = array_merge( $acls,$sql->getCol( $sql ) ); + $acls = array_merge( $acls,$sql->getCol() ); } return $acls; @@ -1052,7 +1052,7 @@ SQL ' AND is_transmit = 1'. ' ORDER BY userid,groupid ASC' ); $sql->setInt('objectid' ,$oid); - $acls = array_merge( $acls,$sql->getCol( $sql ) ); + $acls = array_merge( $acls,$sql->getCol() ); } return $acls; @@ -1197,7 +1197,7 @@ SQL ' WHERE linkobjectid={objectid}' ); $sql->setInt( 'objectid',$this->objectid ); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -1217,7 +1217,7 @@ SQL $sql->setInt ( 'projectid',$this->projectid ); $sql->setString( 'filename','%'.$text.'%' ); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -1241,7 +1241,7 @@ SQL $sql->setInt ( 'languageid',$this->languageid ); $sql->setString( 'name' ,'%'.$text.'%' ); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -1265,7 +1265,7 @@ SQL $sql->setInt ( 'languageid',$this->languageid ); $sql->setString( 'desc' ,'%'.$text.'%' ); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -1285,7 +1285,7 @@ SQL $sql->setInt ( 'projectid',$this->projectid ); $sql->setInt ( 'userid' ,$userid ); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -1305,7 +1305,7 @@ SQL $sql->setInt ( 'projectid',$this->projectid ); $sql->setInt ( 'userid' ,$userid ); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -1324,7 +1324,7 @@ SQL $sql->setInt ( 'projectid' ,$this->projectid ); $sql->setInt ( 'objectid' ,$id ); - return ($sql->getOne($sql) == intval($id) ); + return ($sql->getOne() == intval($id) ); } @@ -1341,7 +1341,7 @@ SQL ' WHERE link_objectid={myid}' ); $sql->setInt ( 'myid' ,$this->objectid ); - return $sql->getCol( $sql ); + return $sql->getCol(); } private function getTypeid() diff --git a/model/Page.class.php b/model/Page.class.php @@ -87,7 +87,7 @@ class Page extends Object ' WHERE id={pageid}' ); $sql->setInt('pageid',$pageid); - return $sql->getOne( $sql ); + return $sql->getOne(); } @@ -105,7 +105,7 @@ class Page extends Object ' WHERE objectid={objectid}' ); $sql->setInt('objectid',$objectid); - return $sql->getOne( $sql ); + return $sql->getOne(); } @@ -350,7 +350,7 @@ class Page extends Object $this->objectAdd(); // Hinzuf?gen von Objekt (dabei wird Objekt-ID ermittelt) $sql = $db->sql('SELECT MAX(id) FROM {{page}}'); - $this->pageid = intval($sql->getOne($sql))+1; + $this->pageid = intval($sql->getOne())+1; $sql = $db->sql('INSERT INTO {{page}}'. ' (id,objectid,templateid)'. @@ -373,7 +373,7 @@ class Page extends Object $sql = $db->sql( 'SELECT * FROM {{page}} '. ' WHERE objectid={objectid}' ); $sql->setInt('objectid',$this->objectid); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); $this->pageid = $row['id' ]; $this->templateid = $row['templateid']; diff --git a/model/Project.class.php b/model/Project.class.php @@ -59,7 +59,7 @@ class Project ' WHERE id={id}'); $sql->setInt('id' ,$id ); - return intval($sql->getOne($sql)) == 1; + return intval($sql->getOne()) == 1; } @@ -77,7 +77,7 @@ class Project $sql = $db->sql( 'SELECT id,name FROM {{project}} '. ' ORDER BY name' ); - return $sql->getAssoc( $sql ); + return $sql->getAssoc(); } @@ -88,7 +88,7 @@ class Project $sql = $db->sql( 'SELECT id FROM {{project}} '. ' ORDER BY name' ); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -101,7 +101,7 @@ class Project ' ORDER BY name' ); $sql->setInt ('projectid',$this->projectid); - return $sql->getAssoc( $sql ); + return $sql->getAssoc(); } @@ -120,7 +120,7 @@ class Project ' ORDER BY name' ); $sql->setInt ('projectid',$this->projectid); - return $sql->getAssoc( $sql ); + return $sql->getAssoc(); } @@ -138,7 +138,7 @@ class Project ' WHERE projectid= {projectid} ' ); $sql->setInt ('projectid',$this->projectid); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -150,7 +150,7 @@ class Project ' WHERE projectid= {projectid} ' ); $sql->setInt ('projectid',$this->projectid); - return $sql->getAssoc( $sql ); + return $sql->getAssoc(); } @@ -172,7 +172,7 @@ class Project $sql->setInt('projectid',$this->projectid); - return( $sql->getOne( $sql ) ); + return( $sql->getOne() ); } @@ -186,7 +186,7 @@ class Project ' WHERE id={projectid}' ); $sql->setInt( 'projectid',$this->projectid ); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); if ( empty($row) ) throw new \ObjectNotFoundException('project '.$this->projectid.' not found'); @@ -210,7 +210,7 @@ class Project ' WHERE name={projectname}' ); $sql->setString( 'projectname',$this->name ); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); $this->projectid = $row['id' ]; $this->target_dir = $row['target_dir' ]; @@ -285,7 +285,7 @@ SQL $db = db_connection(); $sql = $db->sql('SELECT MAX(id) FROM {{project}}'); - $this->projectid = intval($sql->getOne($sql))+1; + $this->projectid = intval($sql->getOne())+1; // Projekt hinzuf?gen @@ -392,7 +392,7 @@ SQL $sql->setInt('projectid',$this->projectid ); - return $sql->getOne( $sql ); + return $sql->getOne(); } @@ -407,7 +407,7 @@ SQL ' ORDER BY is_default DESC' ); $sql->setInt('projectid',$this->projectid ); - return $sql->getOne( $sql ); + return $sql->getOne(); } @@ -464,7 +464,7 @@ EOF ); $sql->setInt('projectid',$this->projectid); - $idList = $sql->getCol($sql); + $idList = $sql->getCol(); if ( count( $idList ) > 0 ) { @@ -492,7 +492,7 @@ EOF ); $sql->setInt('projectid',$this->projectid); - $idList = $sql->getCol($sql); + $idList = $sql->getCol(); if ( count( $idList ) > 1 ) { @@ -735,7 +735,7 @@ EOF ' WHERE projectid = {projectid}' ); $sql->setInt( 'projectid', $this->projectid ); - return $sql->getOne( $sql ); + return $sql->getOne(); } @@ -758,7 +758,7 @@ SQL ); $sql->setInt( 'projectid', $this->projectid ); - return $sql->getOne( $sql ); + return $sql->getOne(); } diff --git a/model/Template.class.php b/model/Template.class.php @@ -99,7 +99,7 @@ class Template $sql->setInt( 'projectid',$project->projectid ); } - return $sql->getAssoc( $sql ); + return $sql->getAssoc(); } @@ -114,7 +114,7 @@ class Template $sql = $db->sql( 'SELECT * FROM {{template}}'. ' WHERE id={templateid}' ); $sql->setInt( 'templateid',$this->templateid ); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); if ( empty($row) ) throw new \ObjectNotFoundException("Template not found: ".$this->templateid); @@ -127,7 +127,7 @@ class Template ' AND projectmodelid={modelid}' ); $sql->setInt( 'templateid',$this->templateid ); $sql->setInt( 'modelid' ,$this->modelid ); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); if ( isset($row['extension']) ) { @@ -166,7 +166,7 @@ class Template $sql->setInt ( 'templateid' ,$this->templateid ); $sql->setInt ( 'modelid' ,$this->modelid ); - if ( intval($sql->getOne($sql)) > 0 ) + if ( intval($sql->getOne()) > 0 ) { // Vorlagen-Quelltext existiert für diese Varianten schon. $sql = $db->sql( 'UPDATE {{templatemodel}}'. @@ -179,7 +179,7 @@ class Template { // Vorlagen-Quelltext wird für diese Varianten neu angelegt. $sql = $db->sql('SELECT MAX(id) FROM {{templatemodel}}'); - $nextid = intval($sql->getOne($sql))+1; + $nextid = intval($sql->getOne())+1; $sql = $db->sql( 'INSERT INTO {{templatemodel}}'. ' (id,templateid,projectmodelid,extension,text) '. @@ -212,7 +212,7 @@ class Template $sql->setInt ( 'modelid',$this->modelid ); $sql->setString( 'text' ,'%'.$text.'%' ); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -229,7 +229,7 @@ class Template ' WHERE templateid={templateid}'. ' ORDER BY name ASC' ); $sql->setInt( 'templateid',$this->templateid ); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -310,7 +310,7 @@ SQL ' ORDER BY name ASC' ); $sql->setInt( 'templateid',$this->templateid ); - return $sql->getAssoc( $sql ); + return $sql->getAssoc(); } @@ -343,7 +343,7 @@ SQL $db = db_connection(); $sql = $db->sql('SELECT MAX(id) FROM {{template}}'); - $this->templateid = intval($sql->getOne($sql))+1; + $this->templateid = intval($sql->getOne())+1; $sql = $db->sql( 'INSERT INTO {{template}}'. ' (id,name,projectid)'. @@ -377,7 +377,7 @@ SQL ' WHERE templateid={templateid}' ); $sql->setInt( 'templateid',$this->templateid ); - return $sql->getCol( $sql ); + return $sql->getCol(); } diff --git a/model/User.class.php b/model/User.class.php @@ -78,7 +78,7 @@ class User extends ModelBase ' FROM {{user}}'. ' ORDER BY name' ); - return $sql->getAssoc( $sql ); + return $sql->getAssoc(); } @@ -163,7 +163,7 @@ SQL ' '.$this->getGroupClause().' )' ); $sql->setInt ( 'userid',$this->userid ); - return $sql->getOne( $sql ) > 0; + return $sql->getOne() > 0; } @@ -200,7 +200,7 @@ SQL ); $sql->setInt ( 'userid',$this->userid ); - return $sql->getAssoc( $sql ); + return $sql->getAssoc(); } } @@ -239,7 +239,7 @@ SQL $sql = $db->sql( 'SELECT id,mail,name,password_hash FROM {{user}}'. ' WHERE id={userid}' ); $sql->setInt( 'userid',$this->userid ); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); if ( count($row) == 0 ) throw new \ObjectNotFoundException(); @@ -260,7 +260,7 @@ SQL $sql = $db->sql( 'SELECT * FROM {{user}}'. ' WHERE id={userid}' ); $sql->setInt( 'userid',$this->userid ); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); if ( count($row) == 0 ) throw new \ObjectNotFoundException(); @@ -286,7 +286,7 @@ SQL ' WHERE name={name}' ); //Html::debug($sql); $sql->setString( 'name',$name ); - $userId = $sql->getOne( $sql ); + $userId = $sql->getOne(); // Benutzer �ber Id instanziieren $neuerUser = new \cms\model\User( $userId ); @@ -371,7 +371,7 @@ SQL ' WHERE id={userid}' ); $sql->setInt( 'userid',$userid ); - $name = $sql->getOne( $sql ); + $name = $sql->getOne(); if ( $name == '' ) return lang('UNKNOWN'); @@ -435,7 +435,7 @@ SQL $db = db_connection(); $sql = $db->sql('SELECT MAX(id) FROM {{user}}'); - $this->userid = intval($sql->getOne($sql))+1; + $this->userid = intval($sql->getOne())+1; $sql = $db->sql('INSERT INTO {{user}}'. ' (id,name,password_hash,ldap_dn,fullname,tel,mail,descr,style,is_admin,password_salt)'. @@ -469,7 +469,7 @@ SQL $groupNames = "'".implode("','",$groupNames)."'"; $sql = $db->sql("SELECT id FROM {{group}} WHERE name IN($groupNames)"); - $groupIds = array_unique( $sql->getCol($sql) ); + $groupIds = array_unique( $sql->getCol() ); // Wir brauchen hier nicht weiter pr�fen, ob der Benutzer eine Gruppe schon hat, denn // - passiert dies nur bei der Neuanlage eines Benutzers @@ -602,7 +602,7 @@ SQL 'LEFT JOIN {{usergroup}} ON {{usergroup}}.groupid={{group}}.id '. 'WHERE {{usergroup}}.userid={userid}' ); $sql->setInt('userid',$this->userid ); - $this->groups = $sql->getAssoc( $sql ); + $this->groups = $sql->getAssoc(); } return $this->groups; @@ -636,7 +636,7 @@ SQL ' WHERE {{usergroup}}.userid IS NULL' ); $sql->setInt('userid' ,$this->userid ); - return $sql->getAssoc( $sql ); + return $sql->getAssoc(); } @@ -651,7 +651,7 @@ SQL $db = db_connection(); $sql = $db->sql('SELECT MAX(id) FROM {{usergroup}}'); - $usergroupid = intval($sql->getOne($sql))+1; + $usergroupid = intval($sql->getOne())+1; $sql = $db->sql( 'INSERT INTO {{usergroup}} '. ' (id,userid,groupid) '. @@ -888,7 +888,7 @@ SQL $sql = $db->sql( 'SELECT * FROM {{user}}'. ' WHERE id={userid}' ); $sql->setInt( 'userid',$this->userid ); - $row_user = $sql->getRow( $sql ); + $row_user = $sql->getRow(); // Pruefen ob Kennwort mit Datenbank uebereinstimmt. return Password::check($this->pepperPassword($password),$row_user['password_hash'],$row_user['password_algo']); diff --git a/model/Value.class.php b/model/Value.class.php @@ -183,7 +183,7 @@ class Value $sql->setInt( 'elementid' ,$this->element->elementid ); $sql->setInt( 'pageid' ,$this->pageid ); $sql->setInt( 'languageid',$this->languageid); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); if ( count($row) > 0 ) // Wenn Inhalt gefunden { @@ -217,7 +217,7 @@ class Value ' LEFT JOIN {{user}} ON {{user}}.id={{value}}.lastchange_userid'. ' WHERE {{value}}.id={valueid}' ); $sql->setInt( 'valueid',$this->valueid); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); $this->text = $row['text' ]; $this->pageid = intval($row['pageid' ]); @@ -296,7 +296,7 @@ class Value $sql->setInt( 'pageid' ,$this->pageid ); $sql->setInt( 'languageid',$this->languageid); - return $sql->getOne( $sql ); + return $sql->getOne(); } @@ -317,7 +317,7 @@ SQL $sql->setInt( 'pageid' ,$this->pageid ); $sql->setInt( 'languageid',$this->languageid); - return $sql->getOne( $sql ); + return $sql->getOne(); } @@ -390,7 +390,7 @@ SQL // Naechste ID aus Datenbank besorgen $sql = $db->sql('SELECT MAX(id) FROM {{value}}'); - $this->valueid = intval($sql->getOne($sql))+1; + $this->valueid = intval($sql->getOne())+1; $sql = $db->sql( <<<SQL INSERT INTO {{value}} @@ -456,7 +456,7 @@ SQL $sql->setInt( 'elementid' ,$this->element->elementid ); $sql->setInt( 'pageid' ,$this->pageid ); $sql->setInt( 'languageid',$this->languageid ); - $values = $sql->getCol( $sql ); + $values = $sql->getCol(); if ( count($values) > $limit['min-revisions'] ) { @@ -516,7 +516,7 @@ SQL $sql->setInt( 'elementid' ,$this->element->elementid ); $sql->setInt( 'pageid' ,$this->pageid ); $sql->setInt( 'languageid',$this->languageid); - $row = $sql->getRow( $sql ); + $row = $sql->getRow(); } @@ -1561,7 +1561,7 @@ SQL $sql->setInt ( 'languageid',$this->languageid ); $sql->setString( 'text' ,'%'.$text.'%' ); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -1586,7 +1586,7 @@ SQL $sql->setInt ( 'languageid',$this->languageid ); $sql->setInt ( 'userid' ,$userid ); - return $sql->getCol( $sql ); + return $sql->getCol(); } @@ -1612,7 +1612,7 @@ SELECT {{object}}.id SQL ); $sql->setInt ( 'userid' ,$userid ); - return $sql->getOne( $sql ); + return $sql->getOne(); } @@ -1639,7 +1639,7 @@ SQL ); $sql->setInt ( 'userid' ,$userid ); $sql->setInt ( 'projectid' ,$projectid ); - return $sql->getOne( $sql ); + return $sql->getOne(); } diff --git a/modules/database/Statement.class.php b/modules/database/Statement.class.php @@ -47,18 +47,17 @@ class Statement /** * Datenbank-Konfiguration - * @var Array + * @var array */ var $conf; - - /** - * Kontruktor. - * Erwartet die Datenbank-Konfiguration als Parameter. - * - * @param Array Konfiguration der Verbindung - * @return Status 'true' wenn Verbindung erfolgreich aufgebaut. - */ - public function __construct( $sql, $client,$conf ) + + /** + * Statement constructor. + * @param $sql string Sql + * @param $client Database + * @param $conf array + */ + public function __construct($sql, $client, $conf ) { // Tabellen-Praefixe ergaenzen. $this->conf = $conf; @@ -108,15 +107,14 @@ class Statement 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 - */ + + /** + * Ermittelt genau 1 Datenbankergebnis aus einer SQL-Anfrage. + * Falls es mehrere Treffer gibt, wird die 1. Spalte aus der 1. Zeile genommen. + * + * @return String + */ public function &getOne() { $none = ''; @@ -134,12 +132,11 @@ class Statement } - /** - * Ermittelt eine Zeile aus der Datenbank. - * - * @param String $this->query - * @return Array - */ + /** + * Ermittelt eine Zeile aus der Datenbank. + * + * @return array + */ public function &getRow() { $result = $this->query(); @@ -154,12 +151,11 @@ class Statement } - /** - * Ermittelt eine (die 1.) Spalte aus dem Datenbankergebnis. - * - * @param String $this->query - * @return Array - */ + /** + * Ermittelt eine (die 1.) Spalte aus dem Datenbankergebnis. + * + * @return array + */ public function &getCol() { $result = $this->query(); @@ -181,13 +177,11 @@ class Statement } - /** - * Ermittelt ein assoziatives Array aus der Datenbank. - * - * @param String $this->query - * @param Boolean $force_array - * @return Array - */ + /** + * Ermittelt ein assoziatives Array aus der Datenbank. + * + * @return array + */ public function &getAssoc() { $force_array = false; @@ -251,7 +245,6 @@ class Statement /** * Führt eine Query aus und gibt nur zurück, ob diese funktioniert. * - * @param unknown_type $this->query * @return boolean */ public function testQuery() @@ -266,14 +259,13 @@ class Statement return false; } } - - - /** - * Setzt eine Ganzzahl als Parameter.<br> - * - * @param name Name des Parameters - * @param value Inhalt - */ + + + /** + * Setzt eine Ganzzahl als Parameter.<br> + * @param $name string + * @param $value integer + */ function setInt( $name,$value ) { $this->client->bind( $name, (int)$value ); @@ -284,8 +276,8 @@ class Statement /** * Setzt eine Zeichenkette als Parameter.<br> * - * @param name Name des Parameters - * @param value Inhalt + * @param $name string + * @param $value string */ function setString( $name,$value ) { @@ -298,8 +290,9 @@ class Statement * 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 + * @param $name string + * @param $value bool + */ function setBoolean( $name,$value ) { @@ -314,7 +307,7 @@ class Statement /** * Setzt einen Parameter auf den Wert <code>null</code>.<br> * - * @param name Name des Parameters + * @param $name string Name des Parameters */ function setNull( $name ) {