From 001e50bf08c0a7b8ffebc284c4370a08ded90bd9 Mon Sep 17 00:00:00 2001
From: paul <paul@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Tue, 21 Nov 2006 18:20:46 +0000
Subject: [PATCH] Fix for bug #2003 - CREATE NEW PLAYLIST broken

---
 .../src/modules/htmlUI/var/html/ui_handler.php   | 13 +++++++++----
 .../src/modules/htmlUI/var/ui_playlist.class.php | 16 +++++++++++-----
 .../src/modules/storageServer/var/MetaData.php   |  6 +++---
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/campcaster/src/modules/htmlUI/var/html/ui_handler.php b/campcaster/src/modules/htmlUI/var/html/ui_handler.php
index d55e8092f..b6bd12c6e 100644
--- a/campcaster/src/modules/htmlUI/var/html/ui_handler.php
+++ b/campcaster/src/modules/htmlUI/var/html/ui_handler.php
@@ -253,9 +253,10 @@ switch ($_REQUEST['act']) {
 	    break;
 
     case "PL.create":
-	    if (($ui_tmpid = $uiHandler->PLAYLIST->create($_REQUEST['id'])) !== FALSE) {
-	        if ($_REQUEST['id']) {
-	        	$uiHandler->SCRATCHPAD->addItem($_REQUEST['id']);
+    	$ids = (isset($_REQUEST['id']) ? $_REQUEST['id'] : null);
+	    if (($ui_tmpid = $uiHandler->PLAYLIST->create($ids)) !== FALSE) {
+	        if ($ids) {
+	        	$uiHandler->SCRATCHPAD->addItem($ids);
 	        }
 	        $uiHandler->SCRATCHPAD->addItem($ui_tmpid);
 	    }
@@ -457,7 +458,11 @@ if ($uiHandler->alertMsg) {
 //}
 ob_end_clean();
 if (isset($_REQUEST['target'])) {
-	header('Location: ui_browser.php?act='.$_REQUEST['target']);
+	if ($_REQUEST['target'] == "reload") {
+		header('Location: ui_browser.php?act='.$_REQUEST['target']);
+	} else {
+
+	}
 } else {
 	header("Location: ".$uiHandler->redirUrl);
 }
diff --git a/campcaster/src/modules/htmlUI/var/ui_playlist.class.php b/campcaster/src/modules/htmlUI/var/ui_playlist.class.php
index f66f710c5..5b09f3b96 100644
--- a/campcaster/src/modules/htmlUI/var/ui_playlist.class.php
+++ b/campcaster/src/modules/htmlUI/var/ui_playlist.class.php
@@ -290,7 +290,15 @@ class uiPlaylist
     } // fn removeItem
 
 
-    public function create($ids)
+    /**
+     * Create a playlist.
+     *
+     * @param array $ids
+     * 		Optional list of media files to be added to the playlist
+     * 		after it is created.
+     * @return FALSE|int
+     */
+    public function create($ids = null)
     {
         // create PL
         // activate
@@ -308,7 +316,7 @@ class uiPlaylist
             return FALSE;
         }
 
-        $this->Base->setMetadataValue($plid, UI_MDATA_KEY_CREATOR,     $this->Base->login);
+        $this->Base->setMetadataValue($plid, UI_MDATA_KEY_CREATOR, $this->Base->login);
         $this->Base->setMetadataValue($plid, UI_MDATA_KEY_DESCRIPTION, tra('created at $1', $datetime));
 
         if ($this->activate($plid)===FALSE) {
@@ -319,8 +327,6 @@ class uiPlaylist
                 return FALSE;
             }
         }
-        #$this->redirUrl = UI_BRWOSER.'?popup=_2PL.simpleManagement';<br>
-
         return $plid;
     } // fn create
 
@@ -641,7 +647,7 @@ class uiPlaylist
         }
 
         foreach ($mData as $key => $val) {
-            $r = $this->Base->gb->setMDataValue($id, $key, $this->Base->sessid, $val, $curr_langid);
+            $r = $this->Base->gb->setMetadataValue($id, $key, $this->Base->sessid, $val, $curr_langid);
             if (PEAR::isError($r)) {
                 if (UI_VERBOSE === TRUE) {
                 	print_r($r);
diff --git a/campcaster/src/modules/storageServer/var/MetaData.php b/campcaster/src/modules/storageServer/var/MetaData.php
index 41e6833d2..52d30aa92 100644
--- a/campcaster/src/modules/storageServer/var/MetaData.php
+++ b/campcaster/src/modules/storageServer/var/MetaData.php
@@ -451,7 +451,7 @@ class MetaData {
         $container='metadata')
     {
         // resolve actual element:
-        $rows = $this->getMetadataValue($category, $lang);
+        $rows = $this->getMetadataValueWithAttrs($category, $lang);
         $aktual = NULL;
         if (count($rows) > 1) {
             if (is_null($mid)) {
@@ -480,7 +480,7 @@ class MetaData {
             }
             if (!is_null($lang)
             	&& isset($aktual['attrs']['xml:lang'])
-            	&& $aktual['attrs']['xml:lang'] != $lang) {
+            	&& $aktual['attrs']['xml:lang'] != $lang)  {
                 $lg = $this->getMetadataEl('xml:lang', $aktual['mid']);
                 if (PEAR::isError($lg)) {
                 	return $lg;
@@ -500,7 +500,7 @@ class MetaData {
             }
         } else {
             // resolve container:
-            $contArr = $this->getMetadataValue($container, NULL, NULL, '_blank');
+            $contArr = $this->getMetadataValueWithAttrs($container, NULL, NULL, '_blank');
             if (PEAR::isError($contArr)) {
             	return $contArr;
             }