diff options
Diffstat (limited to 'modules/GEDFact_assistant/_MEDIA/media_3_find.php')
| -rw-r--r-- | modules/GEDFact_assistant/_MEDIA/media_3_find.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/GEDFact_assistant/_MEDIA/media_3_find.php b/modules/GEDFact_assistant/_MEDIA/media_3_find.php index 3ab19d6176..6f4201fb06 100644 --- a/modules/GEDFact_assistant/_MEDIA/media_3_find.php +++ b/modules/GEDFact_assistant/_MEDIA/media_3_find.php @@ -510,7 +510,7 @@ if ($action=="filter") { $levels = explode("/", $thumbdir); $pthumb = ""; for($i=0; $i<count($levels)-2; $i++) $pthumb.=$levels[$i]."/"; - $uplink = "<a href=\"".encode_url("find.php?directory={$pdir}&thumbdir={$pthumb}&level=".($level-1)."{$thumbget}&type=media&choose={$choose}")."\"> <-- <span dir=\"ltr\">".$pdir."</span> </a><br />"; + $uplink = "<a href=\"find.php?directory=".rawurlencode($pdir)."&thumbdir=".rawurlencode($pthumb)."&level=".($level-1)."{$thumbget}&type=media&choose={$choose}\"> <-- <span dir=\"ltr\">".$pdir."</span> </a><br />"; } // Start of media directory table @@ -533,11 +533,11 @@ if ($action=="filter") { echo $uplink, "</td></tr>"; } echo "<tr><td class=\"descriptionbox $TEXT_DIRECTION\" colspan=\"2\">"; - echo "<a href=\"", encode_url("find.php?directory={$directory}&thumbdir=".str_replace($MEDIA_DIRECTORY, $MEDIA_DIRECTORY."thumbs/", $directory)."&level={$level}{$thumbget}&external_links=http&type=media&choose={$choose}"), "\">", i18n::translate('External objects'), "</a>"; + echo "<a href=\"find.php?directory=".rawurlencode($directory)."&thumbdir=".str_replace($MEDIA_DIRECTORY, $MEDIA_DIRECTORY."thumbs/", $directory)."&level={$level}{$thumbget}&external_links=http&type=media&choose={$choose}"\">", i18n::translate('External objects'), "</a>"; echo "</td></tr>"; foreach ($dirs as $indexval => $dir) { echo "<tr><td class=\"list_value $TEXT_DIRECTION\" colspan=\"2\">"; - echo "<a href=\"", encode_url("find.php?directory={$directory}{$dir}/&thumbdir={$directory}{$dir}/&level=".($level+1)."{$thumbget}&type=media&choose={$choose}"), "\"><span dir=\"ltr\">", $dir, "</span></a>"; + echo "<a href=\"find.php?directory=".rawurlencode($directory.$dir)."/&thumbdir=".rawurlencode($directory.$dir)."/&level=".($level+1)."{$thumbget}&type=media&choose={$choose}\"><span dir=\"ltr\">", $dir, "</span></a>"; echo "</td></tr>"; } } @@ -613,7 +613,7 @@ if ($action=="filter") { foreach ($media["LINKS"] as $indi => $type_record) { if ($type_record!='INDI' && $type_record!='FAM' && $type_record!='SOUR' && $type_record!='OBJE') continue; $record=GedcomRecord::getInstance($indi); - echo '<br /><a href="', encode_url($record->getLinkUrl()), '">'; + echo '<br /><a href="', $record->getHtmlUrl(), '">'; switch($type_record) { case 'INDI': echo i18n::translate('View Person'), ' - '; @@ -692,7 +692,7 @@ if ($action=="filter") { if ($repo_list) { echo "<td class=\"list_value_wrap\"><ul>"; foreach ($repo_list as $repo) { - echo '<li><a href="', $repo->getLinkUrl(), '" onclick="pasteid(\'', $repo->getXref(), '\');"><span class="list_item">', $repo->getListName(),'</span></a></li>'; + echo '<li><a href="', $repo->getHtmlUrl(), '" onclick="pasteid(\'', $repo->getXref(), '\');"><span class="list_item">', $repo->getListName(),'</span></a></li>'; } echo "</ul></td></tr>"; echo "<tr><td class=\"list_label\">", i18n::translate('Repositories found'), " ", count($repo_list); @@ -718,7 +718,7 @@ if ($action=="filter") { usort($mynotelist, array('GedcomRecord', 'Compare')); echo '<tr><td class="list_value_wrap"><ul>'; foreach ($mynotelist as $note) { - echo '<li><a href="', $note->getLinkUrl(), '" onclick="pasteid(\'', $note->getXref(), '\');"><span class="list_item">', $note->getListName(),'</span></a></li>'; + echo '<li><a href="', $note->getHtmlUrl(), '" onclick="pasteid(\'', $note->getXref(), '\');"><span class="list_item">', $note->getListName(),'</span></a></li>'; } echo '</ul></td></tr><tr><td class="list_label">', i18n::translate('Shared Notes found'), ' ', count($mynotelist), '</td></tr>'; } @@ -740,7 +740,7 @@ if ($action=="filter") { usort($mysourcelist, array('GedcomRecord', 'Compare')); echo '<tr><td class="list_value_wrap"><ul>'; foreach ($mysourcelist as $source) { - echo '<li><a href="', $source->getLinkUrl(), '" onclick="pasteid(\'', $source->getXref(), '\');"><span class="list_item">', $source->getListName(),'</span></a></li>'; + echo '<li><a href="', $source->getHtmlUrl(), '" onclick="pasteid(\'', $source->getXref(), '\');"><span class="list_item">', $source->getListName(),'</span></a></li>'; } echo '</ul></td></tr><tr><td class="list_label">', i18n::translate('Total Sources'), ' ', count($mysourcelist), '</td></tr>'; } |