diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/lightbox/functions/lightbox_print_media.php | 87 | ||||
| -rw-r--r-- | modules/relatives/module.php | 8 |
2 files changed, 26 insertions, 69 deletions
diff --git a/modules/lightbox/functions/lightbox_print_media.php b/modules/lightbox/functions/lightbox_print_media.php index 1e386922fc..58b574d84e 100644 --- a/modules/lightbox/functions/lightbox_print_media.php +++ b/modules/lightbox/functions/lightbox_print_media.php @@ -302,69 +302,34 @@ function lightbox_print_media($pid, $level=1, $related=false, $kind=1, $noedit=f foreach ($current_objes as $media_id=>$value) { while ($value>0) { $objSubrec = array_pop($obje_links[$media_id]); - //-- check if we need to get the object from a remote location - $ct = preg_match("/(.*):(.*)/", $media_id, $match); - if ($ct>0) { - require_once WT_ROOT.'includes/classes/class_serviceclient.php'; - $client = ServiceClient::getInstance($match[1]); - if (!is_null($client)) { - $newrec = $client->getRemoteRecord($match[2]); - $row['m_media'] = $media_id; - $row['m_file'] = get_gedcom_value("FILE", 1, $newrec); - $row['m_titl'] = get_gedcom_value("TITL", 1, $newrec); - if (empty($row['m_titl'])) { - $row['m_titl'] = get_gedcom_value("FILE:TITL", 1, $newrec); - } - $row['m_gedrec'] = $newrec; - $et = preg_match("/(\.\w+)$/", $row['m_file'], $ematch); - $ext = ""; - if ($et>0) $ext = substr(trim($ematch[1]), 1); - $row['m_ext'] = $ext; - $row['mm_gid'] = $pid; - $row['mm_gedrec'] = get_sub_record($objSubrec{0}, $objSubrec, $gedrec); - if ($newrec && isset($rowm['m_file'])) { - // ----- - } else { - echo "<li class=\"li_new\" >"; - echo "<center><table class=\"pic\" border=\"0\" ></center>"; - echo "<tr><td align=\"center\" colspan=\"4\">"; - echo $row['m_media']; - echo "</td></tr>"; - - $res = lightbox_print_media_row('new', $row, $pid); - $media_found = $media_found || $res; - } - } + $row = array(); + $newrec = find_gedcom_record($media_id, $ged_id, true); + $row['m_media'] = $media_id; + $row['m_file'] = get_gedcom_value("FILE", 1, $newrec); + $row['m_titl'] = get_gedcom_value("TITL", 1, $newrec); + if (empty($row['m_titl'])) { + $row['m_titl'] = get_gedcom_value("FILE:TITL", 1, $newrec); + } + $row['m_gedrec'] = $newrec; + $et = preg_match("/(\.\w+)$/", $row['m_file'], $ematch); + $ext = ""; + if ($et>0) { + $ext = substr(trim($ematch[1]), 1); + } + $row['m_ext'] = $ext; + $row['mm_gid'] = $pid; + $row['mm_gedrec'] = get_sub_record($objSubrec{0}, $objSubrec, $gedrec); + if ($newrec && isset($rowm['m_file'])) { + // ----- } else { - $row = array(); - $newrec = find_gedcom_record($media_id, $ged_id, true); - $row['m_media'] = $media_id; - $row['m_file'] = get_gedcom_value("FILE", 1, $newrec); - $row['m_titl'] = get_gedcom_value("TITL", 1, $newrec); - if (empty($row['m_titl'])) { - $row['m_titl'] = get_gedcom_value("FILE:TITL", 1, $newrec); - } - $row['m_gedrec'] = $newrec; - $et = preg_match("/(\.\w+)$/", $row['m_file'], $ematch); - $ext = ""; - if ($et>0) { - $ext = substr(trim($ematch[1]), 1); - } - $row['m_ext'] = $ext; - $row['mm_gid'] = $pid; - $row['mm_gedrec'] = get_sub_record($objSubrec{0}, $objSubrec, $gedrec); - if ($newrec && isset($rowm['m_file'])) { - // ----- - } else { - echo "<li class=\"li_new\" >"; - echo "<center><table class=\"pic\" border=\"0\" ></center>"; - echo "<tr><td align=\"center\" colspan=\"4\">"; - echo $row['m_media']; - echo "</td></tr>"; + echo "<li class=\"li_new\" >"; + echo "<center><table class=\"pic\" border=\"0\" ></center>"; + echo "<tr><td align=\"center\" colspan=\"4\">"; + echo $row['m_media']; + echo "</td></tr>"; - $res = lightbox_print_media_row('new', $row, $pid); - $media_found = $media_found || $res; - } + $res = lightbox_print_media_row('new', $row, $pid); + $media_found = $media_found || $res; } $value--; } diff --git a/modules/relatives/module.php b/modules/relatives/module.php index cf84553837..dfa7077752 100644 --- a/modules/relatives/module.php +++ b/modules/relatives/module.php @@ -505,14 +505,6 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { </td> </tr> <?php } ?> - <?php if (WT_USER_GEDCOM_ADMIN) { ?> - <tr> - <td class="facts_value"> - <a href="javascript:;" onclick="return open_link_remote('<?php echo $this->controller->pid; ?>');"><?php echo i18n::translate('Link remote person'); ?></a> - <?php echo help_link('link_remote'); ?> - </td> - </tr> - <?php } ?> </table> <?php } ?> <br /> |