Robert Marshall 10 years ago
parent
commit
e4816e7d08
3 changed files with 11 additions and 7 deletions
  1. 1 1
      Controller/Gallery.php
  2. 8 4
      Model/Album.php
  3. 2 2
      settings.ini

+ 1 - 1
Controller/Gallery.php

@@ -14,7 +14,7 @@ class Gallery {
 	public function Manage($params) {
 	public function Manage($params) {
 		$vars=array();
 		$vars=array();
 		Breadcrumbs::Add("Manage", "");
 		Breadcrumbs::Add("Manage", "");
-		$vars["albums"]=Album::GetAlbums();
+		$vars["albums"]=Album::GetAlbums(true,true);
 		if (isset($params['errors']))
 		if (isset($params['errors']))
 			$vars["errors"]=$params['errors'];
 			$vars["errors"]=$params['errors'];
 		$vars['images']=Image::GetImagesByAlbum(0);
 		$vars['images']=Image::GetImagesByAlbum(0);

+ 8 - 4
Model/Album.php

@@ -2,12 +2,16 @@
 class Album extends DBObjectAutoCreate {
 class Album extends DBObjectAutoCreate {
 	public $Images=array();
 	public $Images=array();
 	
 	
-	public static function GetAlbums() {
+	public static function GetAlbums($includeHidden=false, $includeEmpty=false) {
 		self::CreateTable("albums");
 		self::CreateTable("albums");
 		$albums=array();
 		$albums=array();
-		$albumIds=self::$PDO->query("SELECT album_id FROM albums WHERE album_deleted=0");
-		while ($albumId=$albumIds->fetchColumn())
-			$albums[]=new Album($albumId);
+		$hidden=$includeHidden?" AND album_hidden=":"";
+		$albumIds=self::$PDO->query("SELECT album_id FROM albums WHERE album_deleted=0".$hidden);
+		while ($albumId=$albumIds->fetchColumn()){
+			$album=new Album($albumId);
+			if ($includeEmpty || count($album->Images)>0)
+				$albums[]=$album;
+		}
 		return $albums;
 		return $albums;
 	}
 	}
 	
 	

+ 2 - 2
settings.ini

@@ -5,8 +5,8 @@ template=template.php
 
 
 [database]
 [database]
 host=localhost
 host=localhost
-username=robware-test
-password=robware-test
+username=root
+password=""
 database=robware-test
 database=robware-test
 
 
 [navigation]
 [navigation]