fix some bugs in Media Assistant, fixed like in Census Assistant

4 files changed, 16 insertions, 6 deletions

diff --git a/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php b/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php
index 57202c18d7..4ae7d9f243 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php
@@ -102,7 +102,8 @@ if ($action == "choose" && $paramok) {
 			alert(id_empty);
 		}else{
 			var iid = document.getElementById('gid').value;
-			var winblank = window.open('module.php?mod=GEDFact_assistant&mod_action=_MEDIA/media_query_3a&iid='+iid, 'winblank', 'top=100, left=200, width=400, height=20, toolbar=0, directories=0, location=0, status=0, menubar=0, resizable=1, scrollbars=1');
+			//var winblank = window.open('module.php?mod=GEDFact_assistant&mod_action=_MEDIA/media_query_3a&iid='+iid, 'winblank', 'top=100, left=200, width=400, height=20, toolbar=0, directories=0, location=0, status=0, menubar=0, resizable=1, scrollbars=1');
+			var winblank = window.open('modules/GEDFact_assistant/_MEDIA/media_query_3a.php?iid='+iid, 'winblank', 'top=100, left=200, width=400, height=20, toolbar=0, directories=0, location=0, status=0, menubar=0, resizable=1, scrollbars=1');
 		}
 	}
 	
@@ -150,8 +151,7 @@ if ($action == "choose" && $paramok) {
 			->execute(array($mediaid, WT_GED_ID))
 			->fetchOne();
 		$filename = str_replace(" ", "%20", $filename);
-		// $thumbnail = thumbnail_file($filename, false, false);
-		$thumbnail = str_replace("media/", "media/thumbs/", $filename);
+		$thumbnail = thumbnail_file($filename, false);
 		echo '<img src = ', $thumbnail, ' class="thumbheight" />';
 		echo '</td></tr></table>';
 		echo '</td></tr>';
@@ -203,7 +203,11 @@ if ($action == "choose" && $paramok) {
 	if (WT_USER_IS_ADMIN) {
 		echo "<tr><td class=\"descriptionbox ", $TEXT_DIRECTION, " wrap width25\">";
 		echo i18n::translate('Admin Option'), "</td><td class=\"optionbox wrap\">\n";
-		echo "<input type=\"checkbox\" name=\"preserve_last_changed\" value=\"no_change\"/ >\n";
+		if ($NO_UPDATE_CHAN) {
+			echo "<input type=\"checkbox\" checked=\"checked\" name=\"preserve_last_changed\" />\n";
+		} else {
+			echo "<input type=\"checkbox\" name=\"preserve_last_changed\" />\n";
+		}
 		echo i18n::translate('Do not update the CHAN (Last Change) records'), help_link('no_update_CHAN'), '<br /><br />';
 		echo "</td></tr>\n";
 	}
diff --git a/modules/GEDFact_assistant/_MEDIA/media_3_find.php b/modules/GEDFact_assistant/_MEDIA/media_3_find.php
index b908f07e96..70ea5e6ec4 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_3_find.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_3_find.php
@@ -30,7 +30,9 @@
  * @subpackage Display
  * @version $Id$
  */
-
+ 
+define('WT_SCRIPT_NAME', 'modules/GEDFact_assistant/_MEDIA/media_3_find.php');
+require '../../../includes/session.php';
 require WT_ROOT.'includes/functions/functions_print_lists.php';
 
 $type           =safe_GET('type', WT_REGEX_ALPHA, 'indi');
diff --git a/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php b/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php
index f79a4709ed..e840ff2277 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php
@@ -54,7 +54,8 @@ if (!defined('WT_WEBTREES')) {
 							alert(enter_name);
 					}else{
 						var win02 = window.open(
-						"module.php?mod=GEDFact_assistant&mod_action=_MEDIA/media_3_find&callback=paste_id&action=filter&type=indi&multiple=&filter="+txt, "win02", "resizable=1, menubar=0, scrollbars=1, top=180, left=600, HEIGHT=600, WIDTH=450 ");
+						//"module.php?mod=GEDFact_assistant&mod_action=_MEDIA/media_3_find&callback=paste_id&action=filter&type=indi&multiple=&filter="+txt, "win02", "resizable=1, menubar=0, scrollbars=1, top=180, left=600, HEIGHT=600, WIDTH=450 ");
+						"modules/GEDFact_assistant/_MEDIA/media_3_find.php?callback=paste_id&action=filter&type=indi&multiple=&filter="+txt, "win02", "resizable=1, menubar=0, scrollbars=1, top=180, left=600, HEIGHT=600, WIDTH=450 ");
 							if (window.focus) {
 							win02.focus();
 						}
diff --git a/modules/GEDFact_assistant/_MEDIA/media_query_3a.php b/modules/GEDFact_assistant/_MEDIA/media_query_3a.php
index 6fc5e4bb5c..e43efea5db 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_query_3a.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_query_3a.php
@@ -29,6 +29,9 @@
  * @version $Id$
  */
 
+define('WT_SCRIPT_NAME', 'modules/GEDFact_assistant/_MEDIA/media_query_3a.php');
+require '../../../includes/session.php';
+
 $iid2		= safe_GET('iid');
 
 print_simple_header(i18n::translate('Link media'));