summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--addmedia.php3
-rw-r--r--addremotelink.php4
-rw-r--r--autocomplete.php2
-rw-r--r--branches.php10
-rw-r--r--compact.php2
-rw-r--r--downloadgedcom.php24
-rw-r--r--edit_changes.php17
-rw-r--r--edit_interface.php3
-rw-r--r--editconfig_gedcom.php4
-rw-r--r--editgedcoms.php6
-rw-r--r--family.php2
-rw-r--r--familybook.php2
-rw-r--r--fanchart.php3
-rw-r--r--find.php4
-rw-r--r--genservice.php3
-rw-r--r--hourglass.php4
-rw-r--r--hourglass_ajax.php3
-rw-r--r--index_edit.php2
-rw-r--r--indilist.php4
-rw-r--r--inverselink.php13
-rw-r--r--login.php5
-rw-r--r--media.php37
-rw-r--r--mediafirewall.php12
-rw-r--r--mediaviewer.php8
-rw-r--r--message.php3
-rw-r--r--module_admin.php2
26 files changed, 79 insertions, 103 deletions
diff --git a/addmedia.php b/addmedia.php
index 0aa983d502..21d89fa6e8 100644
--- a/addmedia.php
+++ b/addmedia.php
@@ -165,7 +165,7 @@ if ($action=="newentry") {
$parts = pathinfo_utf($fileName);
if (!empty($parts["basename"])) {
// User supplied a name to be used on the server
- $mediaFile = $parts["basename"]; // Use the supplied name
+ $mediaFile = $parts["basename"]; // Use the supplied name
if (empty($parts["extension"]) || !in_array(strtolower($parts["extension"]), $MEDIATYPE)) {
// Strip invalid extension from supplied name
$lastDot = strrpos($mediaFile, '.');
@@ -614,4 +614,3 @@ print "<br />";
print "<div class=\"center\"><a href=\"#\" onclick=\"if (window.opener.showchanges) window.opener.showchanges(); window.close();\">".i18n::translate('Close Window')."</a></div>\n";
print "<br />";
print_simple_footer();
-?>
diff --git a/addremotelink.php b/addremotelink.php
index 68f7f6f900..86e1496370 100644
--- a/addremotelink.php
+++ b/addremotelink.php
@@ -193,7 +193,7 @@ if (!$success) {
<td class="optionbox" id="tdUrlText">
<div id="existingContent">
<?php echo i18n::translate('Existing remote site'); ?><br />
- <select id="cbExistingServers" name="cbExistingServers" style="width: 400px;">
+ <select id="cbExistingServers" name="cbExistingServers" style="width: 400px;">
<?php
foreach ($controller->server_list as $key=>$server) {
echo '<option value="', $key, '"';
@@ -280,5 +280,3 @@ if ($success && !WT_DEBUG ) {
echo '<div class="center"><a href="javascript://', i18n::translate('Close Window'), '" onclick="edit_close();">', i18n::translate('Close Window'), '</a></div>';
print_simple_footer();
}
-
-?>
diff --git a/autocomplete.php b/autocomplete.php
index 2c48884a98..a3ac577f30 100644
--- a/autocomplete.php
+++ b/autocomplete.php
@@ -186,7 +186,7 @@ function autocomplete_INDI($FILTER, $OPTION) {
continue;
} elseif ($husb_birth_jd && $wife_birth_jd && $person_death_jd<$husb_birth_jd && $person_death_jd<$wife_birth_jd) {
continue;
- } elseif ($husb_birth_jd && $person_death_jd<$husb_birth_jd) {
+ } elseif ($husb_birth_jd && $person_death_jd<$husb_birth_jd) {
continue;
} elseif ($wife_birth_jd && $person_death_jd<$wife_birth_jd) {
continue;
diff --git a/branches.php b/branches.php
index 7621695316..534e9063ab 100644
--- a/branches.php
+++ b/branches.php
@@ -49,7 +49,7 @@ if (empty($ged)) {
$rootid = "";
if (WT_USER_ID) {
$rootid = WT_USER_ROOT_ID;
- if (empty($_SESSION['user_ancestors']) || $_SESSION['user_ancestors'][1]!==$rootid) {
+ if (empty($_SESSION['user_ancestors']) || $_SESSION['user_ancestors'][1]!==$rootid) {
unset($_SESSION['user_ancestors']);
load_ancestors_array($rootid);
}
@@ -149,9 +149,9 @@ function print_fams($person, $famid=null) {
$sex = $person->getSex();
$famcrec = get_sub_record(1, "1 FAMC @".$famid."@", $person->getGedcomRecord());
$pedi = get_gedcom_value("PEDI", 2, $famcrec, '', false);
- if ($sex=="F" && isset($PEDI_CODES_F[$pedi])) $label = $PEDI_CODES_F[$pedi];
- else if ($sex=="M" && isset($PEDI_CODES_M[$pedi])) $label = $PEDI_CODES_M[$pedi];
- else if (isset($PEDI_CODES[$pedi])) $label = $PEDI_CODES[$pedi];
+ if ($sex=="F" && isset($PEDI_CODES_F[$pedi])) $label = $PEDI_CODES_F[$pedi];
+ else if ($sex=="M" && isset($PEDI_CODES_M[$pedi])) $label = $PEDI_CODES_M[$pedi];
+ else if (isset($PEDI_CODES[$pedi])) $label = $PEDI_CODES[$pedi];
$current = "<span class='red'>".$label."</span> ".$current;
}
// spouses and children
@@ -235,7 +235,6 @@ function indis_array($surn, $soundex_std, $soundex_dm) {
WT_DB::prepare($sql)
->execute($args)
->fetchAll();
-// var_dump($sql); var_dump($rows);
$data=array();
foreach ($rows as $row) {
$data[$row->n_id]=Person::getInstance($row->n_id);
@@ -247,4 +246,3 @@ function sosa_gen($sosa) {
$gen = (int)log($sosa, 2)+1;
return "<sup title=\"".i18n::translate('Generation')."\">{$gen}</sup>";
}
-?>
diff --git a/compact.php b/compact.php
index 67fd0ea6ed..f7f6c221f3 100644
--- a/compact.php
+++ b/compact.php
@@ -308,7 +308,7 @@ function print_td_person($n) {
if ($showthumbs && $MULTI_MEDIA && $SHOW_HIGHLIGHT_IMAGES) {
$object = find_highlighted_object($pid, WT_GED_ID, $indi->getGedcomRecord());
if (!empty($object)) {
- $whichFile = thumb_or_main($object); // Do we send the main image or a thumbnail?
+ $whichFile = thumb_or_main($object); // Do we send the main image or a thumbnail?
$size = findImageSize($whichFile);
$class = "pedigree_image_portrait";
if ($size[0]>$size[1]) $class = "pedigree_image_landscape";
diff --git a/downloadgedcom.php b/downloadgedcom.php
index 46a3ee2df5..d612452533 100644
--- a/downloadgedcom.php
+++ b/downloadgedcom.php
@@ -1,7 +1,7 @@
<?php
/**
- * Allow an admin user to download the entire gedcom file.
+ * Allow an admin user to download the entire gedcom file.
*
* webtrees: Web based Family History software
* Copyright (C) 2010 webtrees development team.
@@ -36,26 +36,26 @@ require_once WT_ROOT.'includes/functions/functions_export.php';
if (!isset($_SESSION['exportConvPath'])) $_SESSION['exportConvPath'] = $MEDIA_DIRECTORY;
if (!isset($_SESSION['exportConvSlashes'])) $_SESSION['exportConvSlashes'] = 'forward';
-$ged = safe_GET('ged', get_all_gedcoms());
-$action = safe_GET('action', 'download');
-$remove = safe_GET('remove', 'yes', 'no');
-$convert = safe_GET('convert', 'yes', 'no');
-$zip = safe_GET('zip', 'yes', 'no');
-$conv_path = safe_GET('conv_path', WT_REGEX_NOSCRIPT, $_SESSION['exportConvPath']);
-$conv_slashes = safe_GET('conv_slashes', array('forward', 'backward'), $_SESSION['exportConvSlashes']);
-$privatize_export = safe_GET('privatize_export', array('none', 'visitor', 'user', 'gedadmin'));
+$ged = safe_GET('ged', get_all_gedcoms());
+$action = safe_GET('action', 'download');
+$remove = safe_GET('remove', 'yes', 'no');
+$convert = safe_GET('convert', 'yes', 'no');
+$zip = safe_GET('zip', 'yes', 'no');
+$conv_path = safe_GET('conv_path', WT_REGEX_NOSCRIPT, $_SESSION['exportConvPath']);
+$conv_slashes = safe_GET('conv_slashes', array('forward', 'backward'), $_SESSION['exportConvSlashes']);
+$privatize_export = safe_GET('privatize_export', array('none', 'visitor', 'user', 'gedadmin'));
$conv_path = stripLRMRLM($conv_path);
-$_SESSION['exportConvPath'] = $conv_path; // remember this for the next Download
+$_SESSION['exportConvPath'] = $conv_path; // remember this for the next Download
$_SESSION['exportConvSlashes'] = $conv_slashes;
if (!WT_USER_GEDCOM_ADMIN || !$ged) {
- header("Location: editgedcoms.php");
+ header('Location: editgedcoms.php');
exit;
}
if ($action == 'download') {
- $conv_path = rtrim(str_replace('\\', '/', trim($conv_path)), '/').'/'; // make sure we have a trailing slash here
+ $conv_path = rtrim(str_replace('\\', '/', trim($conv_path)), '/').'/'; // make sure we have a trailing slash here
if ($conv_path=='/') $conv_path = '';
$exportOptions = array();
diff --git a/edit_changes.php b/edit_changes.php
index e879ebd30f..faa1d88259 100644
--- a/edit_changes.php
+++ b/edit_changes.php
@@ -70,9 +70,9 @@ case 'undo':
"UPDATE `##change`".
" SET status = 'rejected'".
" WHERE status = 'pending'".
- " AND gedcom_id = ?".
- " AND xref = ?".
- " AND change_id >= ?"
+ " AND gedcom_id = ?".
+ " AND xref = ?".
+ " AND change_id >= ?"
)->execute(array($gedcom_id, $xref, $change_id));
echo '<b>', i18n::translate('Undo successful'), '</b>';
break;
@@ -85,9 +85,9 @@ case 'accept':
" FROM `##change` c".
" JOIN `##gedcom` g USING (gedcom_id)".
" WHERE c.status = 'pending'".
- " AND gedcom_id = ?".
- " AND xref = ?".
- " AND change_id <= ?".
+ " AND gedcom_id = ?".
+ " AND xref = ?".
+ " AND change_id <= ?".
" ORDER BY change_id"
)->execute(array($gedcom_id, $xref, $change_id))->fetchAll();
foreach ($changes as $change) {
@@ -190,8 +190,8 @@ if (!$changed_gedcoms) {
echo "</b></td>";
$output .= "<td class=\"list_value $TEXT_DIRECTION\"><a href=\"javascript:;\" onclick=\"return reply('".$change->user_name."', '".i18n::translate('Review GEDCOM Changes')."')\" alt=\"".i18n::translate('Send Message')."\">";
$output .= PrintReady($change->real_name);
- $output .= PrintReady("&nbsp;(".$change->user_name.")")."</a></td>";
- $output .= "<td class=\"list_value $TEXT_DIRECTION\">".$change->change_time."</td>";
+ $output .= PrintReady("&nbsp;(".$change->user_name.")")."</a></td>";
+ $output .= "<td class=\"list_value $TEXT_DIRECTION\">".$change->change_time."</td>";
$output .= "<td class=\"list_value $TEXT_DIRECTION\">".$change->gedcom_name."</td>";
$output .= "<td class=\"list_value $TEXT_DIRECTION\"><a href=\"".encode_url("edit_changes.php?action=undo&change_id={$change->change_id}")."\">".i18n::translate('Undo')."</a></td>";
$output.='</tr>';
@@ -235,4 +235,3 @@ echo '</div>';
echo "<br /><br /><center><a href=\"javascript:;\" onclick=\"if (window.opener.showchanges) window.opener.showchanges(); window.close();\">", i18n::translate('Close Window'), '</a><br /></center>';
print_simple_footer();
-?>
diff --git a/edit_interface.php b/edit_interface.php
index 45277c24f2..82c73706ef 100644
--- a/edit_interface.php
+++ b/edit_interface.php
@@ -1012,7 +1012,6 @@ case 'addmedia_links':
<form method="post" action="edit_interface.php?pid=<?php echo $pid; ?>" onsubmit="findindi()">
<input type="hidden" name="action" value="addmedia_links" />
<input type="hidden" name="noteid" value="newnote" />
- <!-- <input type="hidden" name="pid" value="<?php // echo $pid; ?>" /> -->
<?php
require WT_ROOT.'modules/GEDFact_assistant/MEDIA_ctrl.php';
?>
@@ -2640,5 +2639,3 @@ if ($action == 'addmedia_links' || $action == 'addnewnote_assisted' ) {
echo "<div class=\"center\"><a href=\"javascript:;\" onclick=\"edit_close('{$link}');\">", i18n::translate('Close Window'), "</a></div><br />\n";
print_simple_footer();
}
-
-?>
diff --git a/editconfig_gedcom.php b/editconfig_gedcom.php
index 98a00f4911..ef67882401 100644
--- a/editconfig_gedcom.php
+++ b/editconfig_gedcom.php
@@ -40,9 +40,9 @@ $INDEX_DIRECTORY=get_site_setting('INDEX_DIRECTORY');
/**
* find the name of the first GEDCOM file in a zipfile
- * @param string $zipfile the path and filename
+ * @param string $zipfile the path and filename
* @param boolean $extract true = extract and return filename, false = return filename
- * @return string the path and filename of the gedcom file
+ * @return string the path and filename of the gedcom file
*/
function GetGEDFromZIP($zipfile, $extract=true) {
GLOBAL $INDEX_DIRECTORY;
diff --git a/editgedcoms.php b/editgedcoms.php
index 173c930db4..4b8a395c51 100644
--- a/editgedcoms.php
+++ b/editgedcoms.php
@@ -42,9 +42,9 @@ function import_gedcom_file($gedcom_id, $file_name) {
// Cannot use the stream technique at http://php.net/manual/en/pdo.lobs.php
// It doesn't work, probably due to the MySQL bug mentioned below.
//WT_DB::prepare(
- // "UPDATE `##gedcom`".
- // " SET import_gedcom=?, import_offset=1".
- // " WHERE gedcom_id=?"
+ // "UPDATE `##gedcom`".
+ // " SET import_gedcom=?, import_offset=1".
+ // " WHERE gedcom_id=?"
//)
//->bindParam(1, $fp, PDO::PARAM_LOB)
//->bindParam(2, $gedcom_id, PDO::PARAM_INT)
diff --git a/family.php b/family.php
index 0926a543dc..54abe5a6b6 100644
--- a/family.php
+++ b/family.php
@@ -56,7 +56,7 @@ if (WT_USE_LIGHTBOX) {
}
// LB ======================================================================================
-$PEDIGREE_FULL_DETAILS = "1"; // Override GEDCOM configuration
+$PEDIGREE_FULL_DETAILS = "1"; // Override GEDCOM configuration
$show_full = "1";
?>
diff --git a/familybook.php b/familybook.php
index 80aa7d62a1..af3776cfc4 100644
--- a/familybook.php
+++ b/familybook.php
@@ -254,7 +254,7 @@ $gencount=0;
<?php echo i18n::translate('Root Person ID'), help_link('desc_rootid'); ?>
</td>
<td class="optionbox">
- <input class="pedigree_form" type="text" name="pid" id="pid" size="3" value="<?php echo $pid ?>" />
+ <input class="pedigree_form" type="text" name="pid" id="pid" size="3" value="<?php echo $pid; ?>" />
<?php print_findindi_link("pid",""); ?>
</td>
diff --git a/fanchart.php b/fanchart.php
index 14635a60ca..242358f570 100644
--- a/fanchart.php
+++ b/fanchart.php
@@ -388,7 +388,7 @@ function print_fan_chart($treeid, $fanw=640, $fandeg=270) {
// step 2. call imageflush.php to read this session variable and display image
// note: arg "image_name=" is to avoid image miscaching
$image_name= "V".time();
- unset($_SESSION[$image_name]); // statisticsplot.php uses this to hold a file name to send to browser
+ unset($_SESSION[$image_name]); // statisticsplot.php uses this to hold a file name to send to browser
$image_title=preg_replace("~<.*>~", "", $name) . " " . i18n::translate('Circle diagram');
echo "<p align=\"center\" >";
echo "<img src=\"imageflush.php?image_type=png&amp;image_name=$image_name&amp;height=$fanh&amp;width=$fanw\" width=\"$fanw\" height=\"$fanh\" border=\"0\" alt=\"$image_title\" title=\"$image_title\" usemap=\"#fanmap\" />";
@@ -484,4 +484,3 @@ $treeid = ancestry_array($rootid);
print_fan_chart($treeid, 640*$fan_width/100, $fan_style*90);
print_footer();
-?>
diff --git a/find.php b/find.php
index 646d0ca55d..548e4e70d5 100644
--- a/find.php
+++ b/find.php
@@ -42,12 +42,12 @@ $directory =safe_GET('directory', WT_REGEX_NOSCRIPT, $MEDIA_DIRECTORY);
$multiple =safe_GET_bool('multiple');
$showthumb =safe_GET_bool('showthumb');
$all =safe_GET_bool('all');
-$subclick =safe_GET('subclick');
+$subclick =safe_GET('subclick');
$choose =safe_GET('choose', WT_REGEX_NOSCRIPT, '0all');
$level =safe_GET('level', WT_REGEX_INTEGER, 0);
$language_filter=safe_GET('language_filter');
$magnify =safe_GET_bool('magnify');
-$qs =safe_GET('tags');
+$qs =safe_GET('tags');
diff --git a/genservice.php b/genservice.php
index 4c9f8a1325..3cfe20bfa0 100644
--- a/genservice.php
+++ b/genservice.php
@@ -39,7 +39,7 @@ if(!isset($_SERVER['QUERY_STRING']) || strstr($_SERVER['QUERY_STRING'],'wsdl')==
{
if (isset($HTTP_RAW_POST_DATA)) {
//-- set the session id
- // <ns4:SID>6ca1b44936bf4zb7202e6bd8ce4bkcbd</ns4:SID>
+ // <ns4:SID>6ca1b44936bf4zb7202e6bd8ce4bkcbd</ns4:SID>
$ct = preg_match("~<\w*:SID>(.*)</\w*:SID>~", $HTTP_RAW_POST_DATA, $match);
if ($ct>0) Zend_Session::setId(trim($match[1]));
@@ -59,4 +59,3 @@ require_once './webservice/ServiceLogic.class.php';
$genealogyServer = new ServiceLogic();
//-- process the SOAP request
$server = $genealogyServer->process();
-?>
diff --git a/hourglass.php b/hourglass.php
index d6200411da..a49c0f9a32 100644
--- a/hourglass.php
+++ b/hourglass.php
@@ -58,7 +58,7 @@ if (WT_USE_LIGHTBOX) {
$gencount=0;
?>
-<!-- // NOTE: Start form and table -->
+<!-- // NOTE: Start form and table -->
</td><td width="50px">&nbsp;</td><td><form method="get" name="people" action="?">
<input type="hidden" name="show_full" value="<?php print $controller->show_full; ?>" />
<table><tr>
@@ -68,7 +68,7 @@ $gencount=0;
<?php echo i18n::translate('Root Person ID'), help_link('desc_rootid'); ?>
</td>
<td class="optionbox">
- <input class="pedigree_form" type="text" name="pid" id="pid" size="3" value="<?php print $controller->pid; ?>" />
+ <input class="pedigree_form" type="text" name="pid" id="pid" size="3" value="<?php print $controller->pid; ?>" />
<?php print_findindi_link("pid",""); ?>
</td>
diff --git a/hourglass_ajax.php b/hourglass_ajax.php
index 6e3c837f16..62b352f126 100644
--- a/hourglass_ajax.php
+++ b/hourglass_ajax.php
@@ -38,7 +38,7 @@ require_once WT_ROOT.'includes/controllers/hourglass_ctrl.php';
/*
* The purpose of this page is to build the left half of the Hourglass chart via Ajax.
* This page only produces a husband and wife with the connecting lines to unite and
- * label the pair as a pair.
+ * label the pair as a pair.
*/
$controller = new HourglassController();
@@ -50,4 +50,3 @@ if (isset($_REQUEST['type']) && $_REQUEST['type']=='desc')
$controller->print_descendency($controller->pid, 1, false);
else
$controller->print_person_pedigree($controller->pid, 0);
-?>
diff --git a/index_edit.php b/index_edit.php
index 9a5179329c..6ccd883785 100644
--- a/index_edit.php
+++ b/index_edit.php
@@ -432,4 +432,4 @@ if ($action=="configure") {
echo "</div>\n";
}
-echo "</body></html>"; // Yes! Absolutely NOTHING at page bottom, please.
+echo "</body></html>"; // Yes! Absolutely NOTHING at page bottom, please.
diff --git a/indilist.php b/indilist.php
index 74180d53ac..11556d8882 100644
--- a/indilist.php
+++ b/indilist.php
@@ -182,7 +182,7 @@ echo '<br />', join(' | ', $list), '</p>';
// Search spiders don't get an option to show/hide the surname sublists,
// nor does it make sense on the all/unknown/surname views
if (!$SEARCH_SPIDER) {
- echo '<p class="center">';
+ echo '<p class="center">';
if ($alpha!='@' && $alpha!=',' && !$surname) {
if ($surname_sublist=='yes') {
echo '<a href="', $url, '&amp;surname_sublist=no">', i18n::translate('Skip surname lists'), '</a>';
@@ -288,5 +288,3 @@ if ($showList) {
}
print_footer();
-
-?>
diff --git a/inverselink.php b/inverselink.php
index 38be7ebc4e..239fb895aa 100644
--- a/inverselink.php
+++ b/inverselink.php
@@ -34,10 +34,10 @@ require './includes/session.php';
require WT_ROOT.'includes/functions/functions_edit.php';
//-- page parameters and checking
-$linktoid = safe_GET_xref('linktoid');
-$mediaid = safe_GET_xref('mediaid');
-$linkto = safe_GET ('linkto', array('person', 'source', 'family', 'manage', 'repository', 'note'));
-$action = safe_GET ('action', WT_REGEX_ALPHA, 'choose');
+$linktoid = safe_GET_xref('linktoid');
+$mediaid = safe_GET_xref('mediaid');
+$linkto = safe_GET ('linkto', array('person', 'source', 'family', 'manage', 'repository', 'note'));
+$action = safe_GET ('action', WT_REGEX_ALPHA, 'choose');
// If GedFAct_assistant/_MEDIA/ installed ======================
if (WT_USER_IS_ADMIN && $linkto=='manage' && file_exists(WT_ROOT.'modules/GEDFact_assistant/_MEDIA/media_1_ctrl.php')) {
@@ -190,7 +190,6 @@ if (WT_USER_IS_ADMIN && $linkto=='manage' && file_exists(WT_ROOT.'modules/GEDFac
echo '<td class="optionbox wrap">';
if ($linktoid=="") {
echo '<input class="pedigree_form" type="text" name="linktoid" id="linktorid" size="3" value="', $linktoid, '" />';
- // print_findsource_link("linktosid");
} else {
$record=Repository::getInstance($linktoid);
echo '<b>', PrintReady($record->getFullName()), '</b>&nbsp;&nbsp;&nbsp;';
@@ -205,7 +204,6 @@ if (WT_USER_IS_ADMIN && $linkto=='manage' && file_exists(WT_ROOT.'modules/GEDFac
echo '<td class="optionbox wrap">';
if ($linktoid=="") {
echo '<input class="pedigree_form" type="text" name="linktoid" id="linktonid" size="3" value="', $linktoid, '" />';
- // print_findsource_link("linktosid");
} else {
$record=Note::getInstance($linktoid);
echo '<b>', PrintReady($record->getFullName()), '</b>&nbsp;&nbsp;&nbsp;';
@@ -221,16 +219,13 @@ if (WT_USER_IS_ADMIN && $linkto=='manage' && file_exists(WT_ROOT.'modules/GEDFac
echo '</form>';
echo '<br/><br/><center><a href="javascript:;" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close();">', i18n::translate('Close Window'), '</a><br /></center>';
print_simple_footer();
-
} elseif ($action == "update" && $paramok) {
linkMedia($mediaid, $linktoid);
echo '<br/><br/><center><a href="javascript:;" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close();">', i18n::translate('Close Window'), '</a><br /></center>';
print_simple_footer();
-
} else {
echo '<center>nothing to do<center>';
echo '<br/><br/><center><a href="javascript:;" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close();">', i18n::translate('Close Window'), '</a><br /></center>';
print_simple_footer();
}
-
}
diff --git a/login.php b/login.php
index 39ce0fc9de..6fd3eed5d8 100644
--- a/login.php
+++ b/login.php
@@ -104,8 +104,8 @@ if ($action=='login') {
}
$url = str_replace("logout=1", "", $url);
- $url .= "&"; // Simplify the preg_replace following
- $url = preg_replace('/(&|\?)ged=.*&/', "$1", html_entity_decode(rawurldecode($url),ENT_COMPAT,'UTF-8')); // Remove any existing &ged= parameter
+ $url .= "&"; // Simplify the preg_replace following
+ $url = preg_replace('/(&|\?)ged=.*&/', "$1", html_entity_decode(rawurldecode($url),ENT_COMPAT,'UTF-8')); // Remove any existing &ged= parameter
if (substr($url, -1)=="&") $url = substr($url, 0, -1);
$url .= "&ged=".$ged;
$url = str_replace(array("&&", ".php&", ".php?&"), array("&", ".php?", ".php?"), $url);
@@ -226,4 +226,3 @@ print "</div><br /><br />";
<?php
if ($type=="full") print_footer();
else print_simple_footer();
-?>
diff --git a/media.php b/media.php
index 8c1790af20..8cfbb154a1 100644
--- a/media.php
+++ b/media.php
@@ -30,20 +30,20 @@
*/
/* TODO:
- * Add check for missing index.php files when creating a directory
- * Add an option to generate thumbnails for all files on the page
- * Add filter for correct media like php, gif etc.
- * Check for URL instead of physical file
- * Check array buld up use ID_GEDCOM for aray key
+ * Add check for missing index.php files when creating a directory
+ * Add an option to generate thumbnails for all files on the page
+ * Add filter for correct media like php, gif etc.
+ * Check for URL instead of physical file
+ * Check array buld up use ID_GEDCOM for aray key
*/
/* Standard variable convention media.php
- * $filename = Filename of the media item
- * $thumbnail = Filename of the thumbnail of the media item
- * $gedfile = Name of the GEDCOM file
- * $medialist = Array with all media items
- * $directory = Current directory, starting with $MEDIA_DIRECTORY. Has trailing "/".
- * $dirs = list of subdirectories within current directory. Built with medialist.
+ * $filename = Filename of the media item
+ * $thumbnail = Filename of the thumbnail of the media item
+ * $gedfile = Name of the GEDCOM file
+ * $medialist = Array with all media items
+ * $directory = Current directory, starting with $MEDIA_DIRECTORY. Has trailing "/".
+ * $dirs = list of subdirectories within current directory. Built with medialist.
*/
define('WT_SCRIPT_NAME', 'media.php');
@@ -62,7 +62,7 @@ require_once WT_ROOT.'includes/functions/functions_mediadb.php';
function dir_is_writable($dir) {
$err_write = false;
$handle = @fopen(filename_decode($dir."x.y"), "w+");
- if ($handle) {
+ if ($handle) {
$i = fclose($handle);
$err_write = true;
@unlink(filename_decode($dir."x.y"));
@@ -310,11 +310,11 @@ if (check_media_structure()) {
print i18n::translate('Uploading media files is not allowed because multi-media items have been disabled or because the media directory is not writable.');
print "</b></span><br />";
} else {
- show_mediaUpload_form('media.php', $showthumb); // We have the green light to upload media, print the form
+ show_mediaUpload_form('media.php', $showthumb); // We have the green light to upload media, print the form
}
print "</div><br />";
- ob_start(); // Save output until action table has been printed
+ ob_start(); // Save output until action table has been printed
if ($action == "deletedir") {
print "<table class=\"list_table width100\">";
@@ -850,7 +850,7 @@ jQuery(document).ready(function(){
</script>
<?php
- if (!empty($savedOutput)) print $savedOutput; // Print everything we have saved up
+ if (!empty($savedOutput)) print $savedOutput; // Print everything we have saved up
if ($action == "filter" && $subclick != "none") {
if (empty($directory)) $directory = $MEDIA_DIRECTORY;
@@ -1051,7 +1051,7 @@ jQuery(document).ready(function(){
}
// Sort the media list according to the user's wishes
- $sortedMediaList = $medialist; // Default sort (by title) has already been done
+ $sortedMediaList = $medialist; // Default sort (by title) has already been done
if ($sortby=='file') uasort($sortedMediaList, 'filesort');
// Set up for two passes, the first showing URLs, the second normal files
@@ -1120,8 +1120,8 @@ jQuery(document).ready(function(){
}
// Delete File
- // don't delete external files
- // don't delete files linked to more than 1 object
+ // don't delete external files
+ // don't delete files linked to more than 1 object
$objectCount = 0;
if (!$isExternal) {
foreach ($medialist as $tempMedia) {
@@ -1149,7 +1149,6 @@ jQuery(document).ready(function(){
$tempURL = "media.php?";
if (!empty($filter)) $tempURL .= "filter={$filter}&";
$tempURL .= "action=removelinks&showthumb={$showthumb}&sortby={$sortby}&filter={$filter}&subclick={$subclick}&filename=".urlencode($media['FILE'])."&directory={$directory}&level={$level}&xref={$media['XREF']}&gedfile={$media['GEDFILE']}";
- // print "<a href=\"".encode_url($tempURL)."\" onclick=\"return confirm('".i18n::translate('Are you sure you want to remove all links to this object?')."');\">".i18n::translate('Remove links')."</a><br />";
}
// Add or Remove Links
diff --git a/mediafirewall.php b/mediafirewall.php
index 3bb36ad0f4..4507dda521 100644
--- a/mediafirewall.php
+++ b/mediafirewall.php
@@ -39,10 +39,10 @@ Zend_Session::writeClose();
$controller = new MediaController();
$controller->init();
-$debug_mediafirewall = 0; // set to 1 if you want to see media firewall values displayed instead of images
-$debug_watermark = 0; // set to 1 if you want to see error messages from the watermark module instead of broken images
-$debug_forceImageRegen = 0; // set to 1 if you want to force an image to be regenerated (for debugging only)
-$debug_verboseLogging = 0; // set to 1 for extra logging details
+$debug_mediafirewall = 0; // set to 1 if you want to see media firewall values displayed instead of images
+$debug_watermark = 0; // set to 1 if you want to see error messages from the watermark module instead of broken images
+$debug_forceImageRegen = 0; // set to 1 if you want to force an image to be regenerated (for debugging only)
+$debug_verboseLogging = 0; // set to 1 for extra logging details
// pass in an image type and an error message
@@ -344,7 +344,7 @@ if (empty($controller->pid)) {
// only show these files to admin users
// bail since current user is not admin
// Note: the 404 error status is still in effect.
-// if (!$debug_mediafirewall) sendErrorAndExit($controller->mediaobject->getFiletype(), i18n::translate('Privacy restrictions prevent you from viewing this item'), $serverFilename);
+ // if (!$debug_mediafirewall) sendErrorAndExit($controller->mediaobject->getFiletype(), i18n::translate('Privacy restrictions prevent you from viewing this item'), $serverFilename);
}
}
@@ -553,5 +553,3 @@ header("Content-Length: " . $filesize);
$fp = fopen($serverFilename, 'rb');
fpassthru($fp);
exit;
-
-?>
diff --git a/mediaviewer.php b/mediaviewer.php
index c54d0fc11e..f90adf9046 100644
--- a/mediaviewer.php
+++ b/mediaviewer.php
@@ -175,10 +175,10 @@ if (WT_USE_LIGHTBOX) {
// javascript function to open the lightbox view
function lightboxView(){
-// var string = "<?php print $tmb; ?>";
-// alert(string);
-// document.write(string);
-// <?php print $tmb; ?>
+// var string = "<?php print $tmb; ?>";
+// alert(string);
+// document.write(string);
+// <?php print $tmb; ?>
return false;
}
diff --git a/message.php b/message.php
index 2297072ddf..6ad5c10e91 100644
--- a/message.php
+++ b/message.php
@@ -105,7 +105,7 @@ if (($action=="send")&&(isset($_SESSION["good_to_send"]))&&($_SESSION["good_to_s
}
if ($to == "last_6mo") {
$toarray = array();
- $sixmos = 60*60*24*30*6; //-- timestamp for six months
+ $sixmos = 60*60*24*30*6; //-- timestamp for six months
foreach (get_all_users() as $user_id=>$user_name) {
// SEE Bug [ 1827547 ] Message to inactive users sent to newcomers
if (get_user_setting($user_id,'sessiontime')>0 && (time() - get_user_setting($user_id, 'sessiontime') > $sixmos)) {
@@ -219,4 +219,3 @@ else if ($action=="delete") {
print "<center><br /><br /><a href=\"javascript:;\" onclick=\"if (window.opener.refreshpage) window.opener.refreshpage(); window.close();\">".i18n::translate('Close Window')."</a><br /></center>";
print_simple_footer();
-?>
diff --git a/module_admin.php b/module_admin.php
index 221963903d..d48fa3cbb5 100644
--- a/module_admin.php
+++ b/module_admin.php
@@ -231,7 +231,7 @@ print_header(i18n::translate('Module administration'));
jQuery('#menus_table').bind('sortupdate', function(event, ui) {
var id = jQuery(this).attr('id');
reindexMods(id);
- });
+ });
jQuery('#tabs_table').bind('sortupdate', function(event, ui) {
var id = jQuery(this).attr('id');
generated by cgit v1.3 (git 2.53.0) at 2026-07-08 22:43:59 +0000