openrat-cms

commit b246a5f9ce5727954ae1974cdc35419db8e1a5d3
parent 2b431e2006660d9d2ad1f025eec2ab0c6b0ea6d8
Author: Jan Dankert <devnull@localhost>
Date:   Sun,  9 Dec 2018 23:35:28 +0100

Cleanup.

Diffstat:
modules/cms-core/model/Folder.class.php
 | 
39
++++++++++++++++++++++-----------------
modules/cms-core/model/Page.class.php
 | 
3
+++

2 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/modules/cms-core/model/Folder.class.php b/modules/cms-core/model/Folder.class.php
@@ -278,7 +278,7 @@ class Folder extends BaseObject
 
 
 	
-	function getPages()
+	public function getPages()
 	{
 		$db = db_connection();
 
@@ -526,32 +526,39 @@ class Folder extends BaseObject
 
 	// Ermitteln aller Unterordner
 	//
-	function subfolder()
+	public function subfolder()
 	{
-		$db = db_connection();
+		$stmt = db()->sql(<<<SQL
 
-		$sql = $db->sql('SELECT id FROM {{object}} '.
-		               '  WHERE parentid={objectid} AND typeid='.OR_TYPEID_FOLDER.
-		               '  ORDER BY orderid ASC' );
-		$sql->setInt( 'objectid' ,$this->objectid  );
+SELECT id FROM {{object}}
+		                 WHERE parentid={objectid} AND typeid={typeid}
+		                 ORDER BY orderid ASC
+SQL
+        );
+
+		$stmt->setInt( 'objectid' ,$this->objectid        );
+		$stmt->setInt( 'typeid'   ,OR_TYPEID_FOLDER );
 
-		$this->subfolders = $sql->getCol();
+		$this->subfolders = $stmt->getCol();
 
 		return $this->subfolders;
 	}
 
 	
 	
-	function getSubfolderFilenames()
+	public function getSubfolderFilenames()
 	{
-		$db = db_connection();
+		$stmt = db()->sql(<<<SQL
+SELECT id,filename FROM {{object}}
+		                 WHERE parentid={objectid} AND typeid={typeid}
+		                 ORDER BY orderid ASC
+SQL
+        );
 
-		$sql = $db->sql('SELECT id,filename FROM {{object}} '.
-		               '  WHERE parentid={objectid} AND typeid='.OR_TYPEID_FOLDER.
-		               '  ORDER BY orderid ASC' );
-		$sql->setInt( 'objectid' ,$this->objectid  );
+		$stmt->setInt( 'objectid' ,$this->objectid        );
+        $stmt->setInt( 'typeid'   ,OR_TYPEID_FOLDER );
 
-		return $sql->getAssoc();
+		return $stmt->getAssoc();
 	}
 
 	
@@ -562,8 +569,6 @@ class Folder extends BaseObject
 	 */
 	function getAllSubFolderIds()
 	{
-		global $SESS;
-
 		$ids = array();
 
 		foreach( $this->getSubFolderIds() as $id )
diff --git a/modules/cms-core/model/Page.class.php b/modules/cms-core/model/Page.class.php
@@ -75,6 +75,9 @@ class Page extends BaseObject
      */
 	var $publisher;
 
+    /**
+     * @var Value[]
+     */
     public $values;
 
     /**