Merge branch 'master' of dev.sourcefabric.org:campcaster

src/modules/htmlUI/var/formmask/generic.inc.php

@@ -74,7 +74,8 @@ $ui_fmask = array(
             'isPref'    => TRUE,
             'type'      => 'text',
             'label'     => 'Archive server location URL',
-            'required'  => false,
+            'default'	=>  "http://" . $CC_CONFIG['archiveUrlHost'] . ":" . $CC_CONFIG['archiveUrlPort'] . $CC_CONFIG['archiveUrlPath']."/".$CC_CONFIG['archiveXMLRPC'],     
+            'required'  => TRUE,
         ),
         array(
             'rule'      => 'regex',

src/modules/htmlUI/var/templates/scratchpad/main.tpl

@@ -86,14 +86,16 @@
 				duration = duration.split(".");
 				duration = duration[0].split(":");
 
-				if(parseInt(duration[0] !== 0)) {
+				if(duration[0] == ''){
+					duration = "00:00";
+				}
+				else if(parseInt(duration[0]) !== 0) {
 					duration = duration[0] +":"+duration[1]+":"+duration[2];
 				}
 				else{
 					duration = duration[1]+":"+duration[2];
 				}
 				
-				
                 tool_tip_content.append("<tr><td>Duration: </td><td>"+duration+"</td></tr>");
 
                 if(type === "playlist") {

src/modules/htmlUI/var/ui_search.class.php

@@ -175,7 +175,7 @@ class uiSearch
         $this->criteria['counter'] = UI_SIMPLESEARCH_ROWS;
 
         // $criteria['form'] is used for retransfer to form
-        $this->criteria['form']['operator'] = 'OR';
+        $this->criteria['form']['operator'] = 'or';
         $this->criteria['form']['filetype'] = UI_SIMPLESEARCH_FILETYPE;
         $this->criteria['form']['limit'] = UI_SIMPLESEARCH_LIMIT;
 

src/modules/storageServer/var/BasicStor.php

@@ -175,23 +175,55 @@ class BasicStor {
             $res = BasicStor::RemoveObj($id, $forced);
             return $res;
         }
+        
+        $storedFile = StoredFile::Recall($id);
+            
+        if (is_null($storedFile) || PEAR::isError($storedFile)) {
+            return $storedFile;
+        }
+        if ($storedFile->isAccessed()) {
+             return PEAR::raiseError(
+                'Cannot delete an object that is currently accessed.'
+            );
+        }
         // move to trash:
         switch (BasicStor::GetObjType($id)) {
+            
             case "audioclip":
+                $playLists = $storedFile->getPlaylists();
+                $item_gunid = $storedFile->getGunid();
+                if( $playLists != NULL) {
+                   
+                    foreach($playLists as $key=>$val) {
+                        $playList_id = BasicStor::IdFromGunidBigInt($val["gunid"]);
+                        $playList_titles[] = BasicStor::bsGetMetadataValue($playList_id, "dc:title");
+                    }
+                    return PEAR::raiseError(
+                        'Please remove this song from all playlists: ' . join(",", $playList_titles)
+                    );
+                }
+                break;
+                
             case "playlist":
+                if($storedFile->isScheduled()) {
+                     return PEAR::raiseError(
+                        'Cannot delete an object that is scheduled to play.'
+                    );
+                }
+                break;
+                
             case "webstream":
-                $storedFile = StoredFile::Recall($id);
-                if (is_null($storedFile) || PEAR::isError($storedFile)) {
-                    return $storedFile;
-                }
-                $res = $storedFile->setState('deleted');
-                if (PEAR::isError($res)) {
-                    return $res;
-                }
+               
                 break;
             default:
         }
-				return TRUE;
+     
+        $res = $storedFile->setState('deleted');
+        if (PEAR::isError($res)) {
+            return $res;
+        }
+       
+	    return TRUE;
     }
 
 
@@ -1540,7 +1572,7 @@ class BasicStor {
 
 
     /**
-     * Get local id from global id.
+     * Get local id from global id (in hex).
      *
      * @param string $p_gunid
      * 		Global id
@@ -1553,6 +1585,21 @@ class BasicStor {
         global $CC_CONFIG;
         return $CC_DBC->getOne("SELECT id FROM ".$CC_CONFIG['filesTable']." WHERE gunid=x'$p_gunid'::bigint");
     }
+    
+     /**
+     * Get local id from global id (big int).
+     *
+     * @param string $p_gunid
+     * 		Global id
+     * @return int
+     * 		Local id
+     */
+    public static function IdFromGunidBigInt($p_gunid)
+    {
+        global $CC_DBC;
+        global $CC_CONFIG;
+        return $CC_DBC->getOne("SELECT id FROM ".$CC_CONFIG['filesTable']." WHERE gunid='$p_gunid'");
+    }
 
 
     /**

src/modules/storageServer/var/StoredFile.php

@@ -331,7 +331,7 @@ class StoredFile {
 	 * @var int
 	 */
 	private $currentlyaccessing;
-
+	
 	/**
 	 * @var int
 	 */
@@ -1153,6 +1153,35 @@ class StoredFile {
         }
         return TRUE;
     }
+    
+    /**
+     * Returns gunIds of the playlists the stored file is in.
+     */    
+    public function getPlaylists() {
+        global $CC_CONFIG, $CC_DBC;
+        
+        $_SESSION['delete'] = "gunid: " . $this->gunid;
+        
+        $sql = "SELECT gunid "
+            ." FROM ".$CC_CONFIG['mdataTable']
+            ." WHERE object='{$this->gunid}'";
+            
+        $_SESSION['delete'] = $sql;
+        $playlists = $CC_DBC->getAll($sql);
+        
+        return $playlists;
+    }
+    
+    public function isScheduled() {
+        global $CC_CONFIG, $CC_DBC;
+        
+        $sql = "SELECT * "
+            ." FROM ".$CC_CONFIG['scheduleTable']
+            ." WHERE ends > now() and playlist=x'{$this->gunid}'::bigint";
+        $scheduled = $CC_DBC->getAll($sql);
+        
+        return $scheduled;
+    }
 
 
     /**