Upload page 'replace' pulldown: 1) account for local media with abs urls; 2) alphabetize; 3) tooltips

Author: craigdietrich

system/application/controllers/book.php

@@ -572,7 +572,7 @@ private function upload() {
 			}
 
 			try {
-				$result = $this->file_upload->uploadMedia($source_file, $this->versions);
+				$result = $this->file_upload->uploadMedia($source_file, $this->versions, $this->data['base_uri']);
 				$url = $result['url'];
 				$thumb_url = $result['thumbUrl'];
 			} catch (Exception $e) {
@@ -595,11 +595,11 @@ private function upload() {
 		} // if
 
 		$this->data['book_media'] = $this->pages->get_all($this->data['book']->book_id, 'media', null, false);  // List of media pages
-		$to_remove = array();
 		for ($j = 0; $j < count($this->data['book_media']); $j++) {
 			$this->data['book_media'][$j]->versions = array();
-			$this->data['book_media'][$j]->versions[0] = $this->versions->get_single($this->data['book_media'][$j]->content_id, $this->data['book_media'][$j]->recent_version_id);
+			$this->data['book_media'][$j]->versions[0] = $this->versions->get_single($this->data['book_media'][$j]->content_id, $this->data['book_media'][$j]->recent_version_id, null, false);
 		}
+		usort($this->data['book_media'], "sortSearchResults");
 
 	}
 

system/application/libraries/File_Upload.php

@@ -38,7 +38,7 @@ public function assertValidFileUpload($file) {
     }
 
     // Upload media file and its thumbnail image
-    public function uploadMedia($file, $versions = null) {
+    public function uploadMedia($file, $versions = null, $base_uri = '') {
         $this->assertValidFileUpload($file);
 
         // check the path that is prepended to the source file name is valid (no prepend or "media")
@@ -53,8 +53,9 @@ public function uploadMedia($file, $versions = null) {
         if (!empty($_POST['replace']) && !empty($versions)) {
             $arr = explode(':', $_POST['replace']);  // replace is an urn
             $version_id = array_pop($arr);
-            $version = $versions->get($version_id);
+            $version = $versions->get($version_id, null, false);
             $sourceName = $version->url;
+            if (!empty($base_uri) && substr($sourceName, 0, strlen($base_uri)) == $base_uri) $sourceName = substr($sourceName, strlen($base_uri));
             if (substr($sourceName, 0, 6) == 'media/') $sourceName = substr($sourceName, 6);  // Don't use ltrim() because of an apparent OS X bug (we have verifiable problems when a filename began with "em")
             if (!$this->is_allowed($sourceName)) {
                 throw new Exception(FILE_NAME_NOT_ALLOWED);

system/application/models/version_model.php

@@ -594,10 +594,11 @@ public function set_recent_version_id($content_id=0, $version_id=0) {
     /**
      * Make an assumption on whether or not the URL field is local or external
      */
-    public function url_is_local($url) {
+    public function url_is_local($url, $base_uri='') {
 
     	$arr = parse_url($url);
     	if (!isset($arr['scheme']) || empty($arr['scheme'])) return true;
+    	if (!empty($base_uri) && $base_uri == substr($url, 0, strlen($base_uri))) return true;
     	return false;
 
     }

system/application/views/melons/cantaloupe/upload.php

@@ -271,14 +271,15 @@ function escapeHtml(text) {
 		<label><input type="radio" name="name_policy" value="title" CHECKED />&nbsp; Create from title</label>
 	</td></tr>
 	<tr><td class="field">Replace existing</td><td>
-		<select name="replace" class="form-control"><option rel="" value="">-- choose an existing local media file to replace with this upload</option><?
+		<select name="replace" class="form-control" style="max-width:570px;"><option rel="" value="">-- choose an existing local media file to replace with this upload</option><?
 	  	foreach($book_media as $book_media_row) {
 	  		if (!isset($book_media_row->versions) || empty($book_media_row->versions)) continue;
-	  		if (!$this->versions->url_is_local($book_media_row->versions[0]->url)) continue;
+	  		if (!isset($book_media_row->versions[0])) continue;
+	  		if (!$this->versions->url_is_local($book_media_row->versions[0]->url, $base_uri)) continue;
 	  		echo '<option ';
 	  		echo 'rel="'.$book_media_row->slug.'" ';
+	  		echo 'title="'.htmlspecialchars($book_media_row->versions[0]->url).'" ';
 	  		echo 'value="'.$this->versions->urn($book_media_row->versions[0]->version_id).'">';
-	  		if (!isset($book_media_row->versions[0])) continue;
 	  		echo $book_media_row->versions[0]->title;
 	  		echo '</option>';
 	  	}