summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@gmail.com>2013-11-01 18:17:25 +0000
committerGreg Roach <fisharebest@gmail.com>2013-11-01 18:17:25 +0000
commit677b8aa47ed770807b6f61f8b001f3fb2ffad6a2 (patch)
treecce217cefc89dbf20c085c51a67272b919a8be7e /includes
parentb1457a6c7c6aea70f6e1298a537433a630cf85ac (diff)
downloadwebtrees-677b8aa47ed770807b6f61f8b001f3fb2ffad6a2.tar.gz
webtrees-677b8aa47ed770807b6f61f8b001f3fb2ffad6a2.tar.bz2
webtrees-677b8aa47ed770807b6f61f8b001f3fb2ffad6a2.zip
Tidy up trailing whitespace
Diffstat (limited to 'includes')
-rw-r--r--includes/authentication.php4
-rw-r--r--includes/db_schema/db_schema_1_2.php2
-rw-r--r--includes/db_schema/db_schema_2_3.php2
-rw-r--r--includes/db_schema/db_schema_3_4.php2
-rw-r--r--includes/db_schema/db_schema_4_5.php2
-rw-r--r--includes/functions/functions.php2
-rw-r--r--includes/functions/functions_charts.php14
-rw-r--r--includes/functions/functions_import.php8
-rw-r--r--includes/functions/functions_print.php32
-rw-r--r--includes/functions/functions_print_facts.php18
-rw-r--r--includes/functions/functions_print_lists.php48
-rw-r--r--includes/functions/functions_utf-8.php6
12 files changed, 70 insertions, 70 deletions
diff --git a/includes/authentication.php b/includes/authentication.php
index ba91a64a72..0623a8f09b 100644
--- a/includes/authentication.php
+++ b/includes/authentication.php
@@ -39,7 +39,7 @@ if (!defined('WT_WEBTREES')) {
// On failure, return an error code
function authenticateUser($user_name, $password) {
global $WT_SESSION;
-
+
// If no cookies are available, then we cannot log in.
if (!isset($_COOKIE[WT_SESSION_NAME])) {
return -5;
@@ -266,7 +266,7 @@ function addMessage($message) {
$from,
$fromFullName,
// Reply-To:
- WT_Site::preference('SMTP_FROM_NAME'),
+ WT_Site::preference('SMTP_FROM_NAME'),
$WT_TREE->preference('title'),
// Message
WT_I18N::translate('webtrees Message') . ' - ' . $message['subject'],
diff --git a/includes/db_schema/db_schema_1_2.php b/includes/db_schema/db_schema_1_2.php
index 2ebb0fbc3c..e6cae91d76 100644
--- a/includes/db_schema/db_schema_1_2.php
+++ b/includes/db_schema/db_schema_1_2.php
@@ -2,7 +2,7 @@
// Update the database schema from version 1 to version 2
// - create the wt_session table to store session data in the database,
// rather than in the filesystem.
-//
+//
// The script should assume that it can be interrupted at
// any point, and be able to continue by re-running the script.
// Fatal errors, however, should be allowed to throw exceptions,
diff --git a/includes/db_schema/db_schema_2_3.php b/includes/db_schema/db_schema_2_3.php
index 593da6d20a..9f4a6d6b5a 100644
--- a/includes/db_schema/db_schema_2_3.php
+++ b/includes/db_schema/db_schema_2_3.php
@@ -2,7 +2,7 @@
// Update the database schema from version 2 to version 3
// - create the wt_gedcom_chunk table to import gedcoms in
// blocks of data smaller than the max_allowed_packet restriction.
-//
+//
// The script should assume that it can be interrupted at
// any point, and be able to continue by re-running the script.
// Fatal errors, however, should be allowed to throw exceptions,
diff --git a/includes/db_schema/db_schema_3_4.php b/includes/db_schema/db_schema_3_4.php
index 1d35f97a06..7703d6aa76 100644
--- a/includes/db_schema/db_schema_3_4.php
+++ b/includes/db_schema/db_schema_3_4.php
@@ -5,7 +5,7 @@
// setting.
//
// Also clean out some old/unused values.
-//
+//
// The script should assume that it can be interrupted at
// any point, and be able to continue by re-running the script.
// Fatal errors, however, should be allowed to throw exceptions,
diff --git a/includes/db_schema/db_schema_4_5.php b/includes/db_schema/db_schema_4_5.php
index 8ea33d67c1..0ca94e3fba 100644
--- a/includes/db_schema/db_schema_4_5.php
+++ b/includes/db_schema/db_schema_4_5.php
@@ -3,7 +3,7 @@
// - add support for sorting gedcoms non-alphabetically
//
// Also clean out some old/unused values and files.
-//
+//
// The script should assume that it can be interrupted at
// any point, and be able to continue by re-running the script.
// Fatal errors, however, should be allowed to throw exceptions,
diff --git a/includes/functions/functions.php b/includes/functions/functions.php
index 36017aa0db..c30aeb0cdd 100644
--- a/includes/functions/functions.php
+++ b/includes/functions/functions.php
@@ -1667,7 +1667,7 @@ function get_relationship_name_from_path($path, WT_Individual $person1=null, WT_
// Need to find out which languages use which rules.
switch (WT_LOCALE) {
case 'nn': // Source: Hogne Røed Nilsen
- case 'nb':
+ case 'nb':
case 'da': // Source: Patrick Sorensen
switch ($sex2) {
case 'M': return WT_I18N::translate('great x%d grandson', $up-3);
diff --git a/includes/functions/functions_charts.php b/includes/functions/functions_charts.php
index 6760d9b44f..d790840c53 100644
--- a/includes/functions/functions_charts.php
+++ b/includes/functions/functions_charts.php
@@ -189,7 +189,7 @@ function print_family_parents(WT_Family $family, $sosa=0, $label='', $parid='',
echo "</td>";
// wife's parents
$hfam = $wife->getPrimaryChildFamily();
-
+
if ($hfam || $sosa) {
echo "<td rowspan=\"2\"><img src=\"".$WT_IMAGES["hline"]."\" alt=\"\"></td><td rowspan=\"2\"><img src=\"".$WT_IMAGES["vline"]."\" width=\"3\" height=\"" . ($pbheight+9) . "\" alt=\"\"></td>";
echo "<td><img class=\"line5\" src=\"".$WT_IMAGES["hline"]."\" alt=\"\"></td><td>";
@@ -289,8 +289,8 @@ function print_family_children(WT_Family $family, $childid = "", $sosa = 0, $lab
if ($sosa != 0) {
// loop for all families where current child is a spouse
$famids = $child->getSpouseFamilies();
-
-
+
+
$maxfam = count($famids)-1;
for ($f=0; $f<=$maxfam; $f++) {
$famid_child = $famids[$f]->getXref();
@@ -302,7 +302,7 @@ function print_family_children(WT_Family $family, $childid = "", $sosa = 0, $lab
else echo " align=\"right\">";
//if ($f==$maxfam) echo "<img height=\"50%\"";
//else echo "<img height=\"100%\"";
-
+
//find out how many cousins there are to establish vertical line on second families
$fchildren=$famids[$f]->getChildren();
$kids = count($fchildren);
@@ -312,7 +312,7 @@ function print_family_children(WT_Family $family, $childid = "", $sosa = 0, $lab
if ($show_cousins>0) {
if (($cbheight * $kids) > $bheight) {
$PBadj = ($Pheader/2+$kids*4.5);
- }
+ }
}
if ($PBadj<0) $PBadj=0;
@@ -497,8 +497,8 @@ function print_cousins($famid, $personcount=1) {
if ($save_show_full) {
$bheight = $cbheight;
$bwidth = $cbwidth;
- }
-
+ }
+
$show_full = false;
echo '<td valign="middle" height="100%">';
if ($kids) {
diff --git a/includes/functions/functions_import.php b/includes/functions/functions_import.php
index 697fb0763c..f6c7a404e7 100644
--- a/includes/functions/functions_import.php
+++ b/includes/functions/functions_import.php
@@ -1105,7 +1105,7 @@ function uuid() {
// Official Format with dashes ('%04x%04x-%04x-%04x-%04x-%04x%04x%04x')
// Most users want this format (for compatibility with PAF)
$fmt='%04X%04X%04X%04X%04X%04X%04X%04X';
-
+
$uid = sprintf(
$fmt,
// 32 bits for "time_low"
@@ -1132,16 +1132,16 @@ function uuid() {
/**
* Produces checksums compliant with a Family Search guideline from 2007
* these checksums are compatible with PAF, Legacy, RootsMagic and other applications
-* following these guidelines. This prevents dropping and recreation of UID's
+* following these guidelines. This prevents dropping and recreation of UID's
*
* @author Veit Olschinski
-* @param string $uid the 32 hexadecimal character long uid
+* @param string $uid the 32 hexadecimal character long uid
* @return string containing the checksum string for the uid
*/
function getCheckSums($uid) {
$checkA=0; // a sum of the bytes
$checkB=0; // a sum of the incremental values of checkA
-
+
// Compute both checksums
for ($i = 0; $i < 32; $i+=2) {
$checkA += hexdec(substr($uid, $i, 2));
diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php
index 6d36d61274..f3240ba2f4 100644
--- a/includes/functions/functions_print.php
+++ b/includes/functions/functions_print.php
@@ -86,20 +86,20 @@ function print_pedigree_person($person, $style=1, $count=0, $personcount="1") {
$personlinks .= '<li><a href="pedigree.php?rootid='.$pid.'&amp;show_full='.$PEDIGREE_FULL_DETAILS.'&amp;PEDIGREE_GENERATIONS='.$OLD_PGENS.'&amp;talloffset='.$talloffset.'&amp;ged='.rawurlencode($GEDCOM).'"><b>'.WT_I18N::translate('Pedigree').'</b></a></li>';
if (array_key_exists('googlemap', WT_Module::getActiveModules())) {
$personlinks .= '<li><a href="module.php?mod=googlemap&amp;mod_action=pedigree_map&amp;rootid='.$pid.'&amp;ged='.WT_GEDURL.'"><b>'.WT_I18N::translate('Pedigree map').'</b></a></li>';
- }
+ }
if (WT_USER_GEDCOM_ID && WT_USER_GEDCOM_ID!=$pid) {
$personlinks .= '<li><a href="relationship.php?show_full='.$PEDIGREE_FULL_DETAILS.'&amp;pid1='.WT_USER_GEDCOM_ID.'&amp;pid2='.$pid.'&amp;show_full='.$PEDIGREE_FULL_DETAILS.'&amp;pretty=2&amp;followspouse=1&amp;ged='.WT_GEDURL.'"><b>'.WT_I18N::translate('Relationship to me').'</b></a></li>';
- }
- $personlinks .= '<li><a href="descendancy.php?rootid='.$pid.'&amp;show_full='.$PEDIGREE_FULL_DETAILS.'&amp;generations='.$generations.'&amp;box_width='.$box_width.'&amp;ged='.rawurlencode($GEDCOM).'"><b>'.WT_I18N::translate('Descendants').'</b></a></li>';
- $personlinks .= '<li><a href="ancestry.php?rootid='.$pid.'&amp;show_full='.$PEDIGREE_FULL_DETAILS.'&amp;chart_style='.$chart_style.'&amp;PEDIGREE_GENERATIONS='.$OLD_PGENS.'&amp;box_width='.$box_width.'&amp;ged='.rawurlencode($GEDCOM).'"><b>'.WT_I18N::translate('Ancestors').'</b></a></li>';
- $personlinks .= '<li><a href="compact.php?rootid='.$pid.'&amp;ged='.rawurlencode($GEDCOM).'"><b>'.WT_I18N::translate('Compact tree').'</b></a></li>';
+ }
+ $personlinks .= '<li><a href="descendancy.php?rootid='.$pid.'&amp;show_full='.$PEDIGREE_FULL_DETAILS.'&amp;generations='.$generations.'&amp;box_width='.$box_width.'&amp;ged='.rawurlencode($GEDCOM).'"><b>'.WT_I18N::translate('Descendants').'</b></a></li>';
+ $personlinks .= '<li><a href="ancestry.php?rootid='.$pid.'&amp;show_full='.$PEDIGREE_FULL_DETAILS.'&amp;chart_style='.$chart_style.'&amp;PEDIGREE_GENERATIONS='.$OLD_PGENS.'&amp;box_width='.$box_width.'&amp;ged='.rawurlencode($GEDCOM).'"><b>'.WT_I18N::translate('Ancestors').'</b></a></li>';
+ $personlinks .= '<li><a href="compact.php?rootid='.$pid.'&amp;ged='.rawurlencode($GEDCOM).'"><b>'.WT_I18N::translate('Compact tree').'</b></a></li>';
if (function_exists("imagettftext")) {
$personlinks .= '<li><a href="fanchart.php?rootid='.$pid.'&amp;PEDIGREE_GENERATIONS='.$OLD_PGENS.'&amp;ged='.rawurlencode($GEDCOM).'"><b>'.WT_I18N::translate('Fan chart').'</b></a></li>';
- }
- $personlinks .= '<li><a href="hourglass.php?rootid='.$pid.'&amp;show_full='.$PEDIGREE_FULL_DETAILS.'&amp;chart_style='.$chart_style.'&amp;PEDIGREE_GENERATIONS='.$OLD_PGENS.'&amp;box_width='.$box_width.'&amp;ged='.rawurlencode($GEDCOM).'&amp;show_spouse='.$show_spouse.'"><b>'.WT_I18N::translate('Hourglass chart').'</b></a></li>';
+ }
+ $personlinks .= '<li><a href="hourglass.php?rootid='.$pid.'&amp;show_full='.$PEDIGREE_FULL_DETAILS.'&amp;chart_style='.$chart_style.'&amp;PEDIGREE_GENERATIONS='.$OLD_PGENS.'&amp;box_width='.$box_width.'&amp;ged='.rawurlencode($GEDCOM).'&amp;show_spouse='.$show_spouse.'"><b>'.WT_I18N::translate('Hourglass chart').'</b></a></li>';
if (array_key_exists('tree', WT_Module::getActiveModules())) {
$personlinks .= '<li><a href="module.php?mod=tree&amp;mod_action=treeview&amp;ged='.WT_GEDURL.'&amp;rootid='.$pid.'"><b>'.WT_I18N::translate('Interactive tree').'</b></a></li>';
- }
+ }
foreach ($person->getSpouseFamilies() as $family) {
$spouse = $family->getSpouse($person);
if ($spouse) {
@@ -148,29 +148,29 @@ function print_pedigree_person($person, $style=1, $count=0, $personcount="1") {
//-- find the name
$name = $person->getFullName();
$shortname = $person->getShortName();
-
+
if ($SHOW_HIGHLIGHT_IMAGES) {
$thumbnail = $person->displayImage();
} else {
$thumbnail = '';
}
-
+
//-- find additional name, e.g. Hebrew
$addname=$person->getAddName();
-
+
if ($PEDIGREE_SHOW_GENDER && $show_full) {
$genderImage = " ".$person->getSexImage('small', "box-$boxID-gender");
}
-
+
// Here for alternate name2
if ($addname) {
$addname = "<br><span id=\"addnamedef-$boxID\" class=\"name1\"> ".$addname."</span>";
}
-
+
if ($SHOW_LDS_AT_GLANCE && $show_full) {
$addname = ' <span class="details$style">'.get_lds_glance($person).'</span>' . $addname;
}
-
+
if ($show_full && $person->canShow()) {
$opt_tags=preg_split('/\W/', $CHART_BOX_TAGS, 0, PREG_SPLIT_NO_EMPTY);
// Show BIRT or equivalent event
@@ -222,7 +222,7 @@ function print_pedigree_person($person, $style=1, $count=0, $personcount="1") {
}
}
-// print HTML header meta links
+// print HTML header meta links
// previously identical code in each theme's header.php file
// now added as a function here.
@@ -604,7 +604,7 @@ function print_asso_rela_record(WT_Fact $event, WT_GedcomRecord $record) {
if ($record instanceof WT_Family) {
$label_2=$associate->getSexImage().$label_2;
}
-
+
if ($SEARCH_SPIDER) {
$html[]=$label_2; // Search engines cannot use the relationship chart.
} else {
diff --git a/includes/functions/functions_print_facts.php b/includes/functions/functions_print_facts.php
index 88a69d355b..bb5991422f 100644
--- a/includes/functions/functions_print_facts.php
+++ b/includes/functions/functions_print_facts.php
@@ -312,7 +312,7 @@ function print_fact(WT_Fact $fact, WT_GedcomRecord $record) {
// Print the date of this fact/event
echo format_fact_date($fact, $record, true, true);
-
+
// Print the place of this fact/event
echo '<div class="place">', format_fact_place($fact, true, true, true), '</div>';
// A blank line between the primary attributes (value, date, place) and the secondary ones
@@ -379,7 +379,7 @@ function print_fact(WT_Fact $fact, WT_GedcomRecord $record) {
}
break;
case '_WT_USER':
- $fullname=getUserFullname(get_user_id($match[2])); // may not exist
+ $fullname=getUserFullname(get_user_id($match[2])); // may not exist
if ($fullname) {
echo WT_Gedcom_Tag::getLabelValue('_WT_USER', $fullname);
} else {
@@ -507,7 +507,7 @@ function print_fact_sources($factrec, $level) {
$data .= WT_I18N::translate('Source').':</span> <span class="field">';
$data .= '<a href="'.$source->getHtmlUrl().'">'.$source->getFullName().'</a>';
$data .= '</span></div>';
-
+
$data .= "<div id=\"$elementID\"";
if ($EXPAND_SOURCES) {
$data .= ' style="display:block"';
@@ -618,7 +618,7 @@ function print_main_sources(WT_Fact $fact, $level) {
$fact_id = $fact->getFactId();
$parent = $fact->getParent();
$pid = $parent->getXref();
-
+
$nlevel = $level+1;
if ($fact->isNew()) {
$styleadd = 'new';
@@ -963,7 +963,7 @@ function print_main_media(WT_Fact $fact, $level) {
$factrec = $fact->getGedcom();
$fact_id = $fact->getFactId();
$parent = $fact->getParent();
-
+
if ($fact->isNew()) {
$styleadd = 'new';
$can_edit = $level==1 && $fact->canEdit();
@@ -1026,7 +1026,7 @@ function print_main_media(WT_Fact $fact, $level) {
}
echo '<em>';
foreach ($media->getAllNames() as $name) {
- if ($name['type']!='TITL') echo '<br>';
+ if ($name['type']!='TITL') echo '<br>';
echo $name['full'];
}
echo '</em>';
@@ -1034,7 +1034,7 @@ function print_main_media(WT_Fact $fact, $level) {
echo '</a>';
}
echo '</span>';
-
+
echo WT_Gedcom_Tag::getLabelValue('FORM', $media->mimeType());
$imgsize = $media->getImageAttributes('main');
if (!empty($imgsize['WxH'])) {
@@ -1047,7 +1047,7 @@ function print_main_media(WT_Fact $fact, $level) {
if ($mediatype) {
echo WT_Gedcom_Tag::getLabelValue('TYPE', WT_Gedcom_Tag::getFileFormTypeValue($mediatype));
}
-
+
switch ($media->isPrimary()) {
case 'Y':
echo WT_Gedcom_Tag::getLabelValue('_PRIM', WT_I18N::translate('yes'));
@@ -1063,5 +1063,5 @@ function print_main_media(WT_Fact $fact, $level) {
}
echo '</td></tr>';
}
- }
+ }
}
diff --git a/includes/functions/functions_print_lists.php b/includes/functions/functions_print_lists.php
index 105410367a..4836f0af97 100644
--- a/includes/functions/functions_print_lists.php
+++ b/includes/functions/functions_print_lists.php
@@ -81,7 +81,7 @@ function format_indi_table($datalist, $option='') {
"iDisplayLength": 20,
"sPaginationType": "full_numbers"
});
-
+
jQuery("div.filtersH_'.$table_id.'").html("'.WT_Filter::escapeJs(
'<button type="button" id="SEX_M_'. $table_id.'" class="ui-state-default SEX_M" title="'. WT_I18N::translate('Show only males.').'">&nbsp;'.WT_Individual::sexImage('M', 'small').'&nbsp;</button>'.
'<button type="button" id="SEX_F_'. $table_id.'" class="ui-state-default SEX_F" title="'. WT_I18N::translate('Show only females.').'">&nbsp;'.WT_Individual::sexImage('F', 'small').'&nbsp;</button>'.
@@ -96,12 +96,12 @@ function format_indi_table($datalist, $option='') {
'<button type="button" id="TREE_L_'. $table_id.'" class="ui-state-default TREE_L" title="'. WT_I18N::translate('Show “leaves” couples or individuals. These are individuals who are alive but have no children recorded in the database.').'">'.WT_I18N::translate('Leaves').'</button>'.
'<button type="button" id="RESET_'. $table_id.'" class="ui-state-default RESET" title="'. WT_I18N::translate('Reset to the list defaults.').'">'.WT_I18N::translate('Reset').'</button>'
).'");
-
+
jQuery("div.filtersF_'.$table_id.'").html("'.WT_Filter::escapeJs(
'<button type="button" class="ui-state-default" id="cb_parents_indi_list_table" onclick="jQuery(\'div.parents_indi_list_table_'.$table_id.'\').toggle(); jQuery(this).toggleClass(\'ui-state-active\');">'.WT_I18N::translate('Show parents').'</button>'.
'<button type="button" class="ui-state-default" id="charts_indi_list_table" onclick="jQuery(\'div.indi_list_table-charts_'.$table_id.'\').toggle(); jQuery(this).toggleClass(\'ui-state-active\');">'.WT_I18N::translate('Show statistics charts').'</button>'
).'");
-
+
/* Add event listeners for filtering inputs */
jQuery("#SEX_M_'. $table_id.'").click( function() {
oTable'.$table_id.'.fnFilter("M", 20 );
@@ -168,7 +168,7 @@ function format_indi_table($datalist, $option='') {
oTable'.$table_id.'.fnFilter("L", 23 );
jQuery("#TREE_R_'.$table_id.'").removeClass("ui-state-active");
jQuery("#TREE_L_'.$table_id.'").addClass("ui-state-active");
- });
+ });
jQuery("#RESET_'. $table_id.'").click( function() {
for (i=20; i<=23; i++){
oTable'.$table_id.'.fnFilter("", i );
@@ -181,7 +181,7 @@ function format_indi_table($datalist, $option='') {
jQuery("th div:eq(3)").css("margin", "auto").css("text-align", "center");
jQuery("th span:eq(8)").css("display", "none");
jQuery("th div:eq(8)").css("margin", "auto").css("text-align", "center");
-
+
jQuery(".indi-list").css("visibility", "visible");
jQuery(".loading-image").css("display", "none");
');
@@ -436,7 +436,7 @@ function format_indi_table($datalist, $option='') {
'</td></tr></table>
</div>
</div>'; // Close "indi-list"
-
+
return $html;
}
@@ -508,7 +508,7 @@ function format_fam_table($datalist, $option='') {
'<button type="button" class="ui-state-default" id="cb_parents_'.$table_id.'" onclick="jQuery(\'div.parents_'.$table_id.'\').toggle(); jQuery(this).toggleClass(\'ui-state-active\');">'.WT_I18N::translate('Show parents').'</button>'.
'<button type="button" class="ui-state-default" id="charts_fam_list_table" onclick="jQuery(\'div.fam_list_table-charts_'.$table_id.'\').toggle(); jQuery(this).toggleClass(\'ui-state-active\');">'. WT_I18N::translate('Show statistics charts').'</button>'
).'");
-
+
/* Add event listeners for filtering inputs */
jQuery("#MARR_U_'. $table_id.'").click( function() {
oTable'.$table_id.'.fnFilter("U", 20);
@@ -587,7 +587,7 @@ function format_fam_table($datalist, $option='') {
oTable'.$table_id.'.fnFilter("L", 22);
jQuery("#TREE_R_'.$table_id.'").removeClass("ui-state-active");
jQuery("#TREE_L_'.$table_id.'").addClass("ui-state-active");
- });
+ });
jQuery("#RESET_'. $table_id.'").click( function() {
for (i=20; i<=22; i++) {
oTable'.$table_id.'.fnFilter("", i );
@@ -598,7 +598,7 @@ function format_fam_table($datalist, $option='') {
/* This code is a temporary fix for Datatables bug http://www.datatables.net/forums/discussion/4730/datatables_sort_wrapper-being-added-to-columns-with-bsortable-false/p1*/
jQuery("th span:eq(9)").css("display", "none");
jQuery("th div:eq(9)").css("margin", "auto").css("text-align", "center");
-
+
jQuery(".fam-list").css("visibility", "visible");
jQuery(".loading-image").css("display", "none");
');
@@ -858,7 +858,7 @@ function format_fam_table($datalist, $option='') {
'</td></tr></table>
</div>
</div>'; // Close "fam-list"
-
+
return $html;
}
@@ -940,7 +940,7 @@ function format_sour_table($datalist) {
} else {
$html .= '<a href="'. $source->getHtmlUrl(). '">'. highlight_search_hits($name['full']). '</a>';
}
- }
+ }
$html .= '</td>';
// Sortable name
$html .= '<td>'. strip_tags($source->getFullName()). '</td>';
@@ -976,7 +976,7 @@ function format_sour_table($datalist) {
} else {
$html .= '<td>&nbsp;</td>';
}
- //-- Delete
+ //-- Delete
if (WT_USER_GEDCOM_ADMIN) {
$html .= '<td><div title="'. WT_I18N::translate('Delete'). '" class="deleteicon" onclick="if (confirm(\''. WT_Filter::escapeJs(WT_I18N::translate('Are you sure you want to delete “%s”?', strip_tags($source->getFullName()))). '\')) jQuery.post(\'action.php\',{action:\'delete-source\',xref:\''. $source->getXref(). '\'},function(){location.reload();})"><span class="link_text">'. WT_I18N::translate('Delete'). '</span></div></td>';
} else {
@@ -985,7 +985,7 @@ function format_sour_table($datalist) {
$html .= '</tr>';
}
$html .= '</tbody></table></div>';
-
+
return $html;
}
@@ -1025,7 +1025,7 @@ function format_note_table($datalist) {
jQuery(".note-list").css("visibility", "visible");
jQuery(".loading-image").css("display", "none");
');
-
+
//--table wrapper
$html .= '<div class="loading-image">&nbsp;</div>';
$html .= '<div class="note-list">';
@@ -1077,7 +1077,7 @@ function format_note_table($datalist) {
} else {
$html .= '<td>&nbsp;</td>';
}
- //-- Delete
+ //-- Delete
if (WT_USER_GEDCOM_ADMIN) {
$html .= '<td><div title="'. WT_I18N::translate('Delete'). '" class="deleteicon" onclick="if (confirm(\''. WT_Filter::escapeJs(WT_I18N::translate('Are you sure you want to delete “%s”?', strip_tags($note->getFullName()))). '\')) jQuery.post(\'action.php\',{action:\'delete-note\',xref:\''. $note->getXref(). '\'},function(){location.reload();})"><span class="link_text">'. WT_I18N::translate('Delete'). '</span></div></td>';
} else {
@@ -1086,7 +1086,7 @@ function format_note_table($datalist) {
$html .= '</tr>';
}
$html .= '</tbody></table></div>';
-
+
return $html;
}
@@ -1120,7 +1120,7 @@ function format_repo_table($repos) {
jQuery(".repo-list").css("visibility", "visible");
jQuery(".loading-image").css("display", "none");
');
-
+
//--table wrapper
$html .= '<div class="loading-image">&nbsp;</div>';
$html .= '<div class="repo-list">';
@@ -1152,7 +1152,7 @@ function format_repo_table($repos) {
} else {
$html .= '<a href="'. $repo->getHtmlUrl(). '">'. highlight_search_hits($name['full']). '</a>';
}
- }
+ }
$html .= '</td>';
//-- Linked SOURces
$num = count($repo->linkedSources('REPO'));
@@ -1169,7 +1169,7 @@ function format_repo_table($repos) {
} else {
$html .= '<td>&nbsp;</td>';
}
- //-- Delete
+ //-- Delete
if (WT_USER_GEDCOM_ADMIN) {
$html .= '<td><div title="'. WT_I18N::translate('Delete'). '" class="deleteicon" onclick="if (confirm(\''. WT_Filter::escapeJs(WT_I18N::translate('Are you sure you want to delete “%s”?', strip_tags($repo->getFullName()))). '\')) jQuery.post(\'action.php\',{action:\'delete-repository\',xref:\''. $repo->getXref(). '\'},function(){location.reload();})"><span class="link_text">'. WT_I18N::translate('Delete'). '</span></div></td>';
} else {
@@ -1178,7 +1178,7 @@ function format_repo_table($repos) {
$html .= '</tr>';
}
$html .= '</tbody></table></div>';
-
+
return $html;
}
@@ -1216,7 +1216,7 @@ function format_media_table($datalist) {
jQuery(".media-list").css("visibility", "visible");
jQuery(".loading-image").css("display", "none");
');
-
+
//--table wrapper
$html .= '<div class="loading-image">&nbsp;</div>';
$html .= '<div class="media-list">';
@@ -1275,7 +1275,7 @@ function format_media_table($datalist) {
}
}
$html .= '</tbody></table></div>';
-
+
return $html;
}
@@ -1359,7 +1359,7 @@ function format_surname_table($surnames, $script) {
$html.='<td>'. $subtotal. '</td></tr>';
}
$html .= '</tbody></table>';
-
+
return $html;
}
@@ -1663,7 +1663,7 @@ function print_events_table($startjd, $endjd, $events='BIRT MARR DEAT', $only_li
/* 5-ANNIV */ { "sType": "numeric", "bVisible": false},
/* 6-Event */ { "sClass": "center" }
]
- });
+ });
');
// Did we have any output? Did we skip anything?
diff --git a/includes/functions/functions_utf-8.php b/includes/functions/functions_utf-8.php
index 82136dc36a..ec4ebdac96 100644
--- a/includes/functions/functions_utf-8.php
+++ b/includes/functions/functions_utf-8.php
@@ -215,7 +215,7 @@ function utf8_strcasecmp($string1, $string2) {
$offset2=strpos($ALPHABET_lower, $chr2);
if ($offset2===false) {
$offset2=strpos($ALPHABET_upper, $chr2);
- }
+ }
if ($offset1!==false && $offset2!==false) {
if ($offset1==$offset2) {
continue;
@@ -231,7 +231,7 @@ function utf8_strcasecmp($string1, $string2) {
$offset2=strpos(WT_UTF8_ALPHABET_LOWER, $chr2);
if ($offset2===false) {
$offset2=strpos(WT_UTF8_ALPHABET_UPPER, $chr2);
- }
+ }
if ($offset1!==false && $offset2!==false) {
if ($offset1==$offset2) {
continue;
@@ -254,7 +254,7 @@ function utf8_wordwrap($string, $width=75, $sep="\n", $cut=false) {
$string='';
} else {
$sub1=utf8_substr($string, 0, $width+1);
- if (utf8_substr($string,utf8_strlen($sub1)-1,1)==' ') //include words that end by a space immediately after the area.
+ if (utf8_substr($string,utf8_strlen($sub1)-1,1)==' ') //include words that end by a space immediately after the area.
$sub=$sub1;
else
$sub=utf8_substr($string, 0, $width);