summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@gmail.com>2015-01-19 17:38:28 +0000
committerGreg Roach <fisharebest@gmail.com>2015-01-19 17:38:57 +0000
commitd5c54d7986ed1b7f196ff6d868314cf70f701f9b (patch)
tree404c9e7aec6f4931d0bc1df5ab2783b534425cd0 /includes
parent4582af0dc632a211210f69160bb2e84a22132a1c (diff)
downloadwebtrees-d5c54d7986ed1b7f196ff6d868314cf70f701f9b.tar.gz
webtrees-d5c54d7986ed1b7f196ff6d868314cf70f701f9b.tar.bz2
webtrees-d5c54d7986ed1b7f196ff6d868314cf70f701f9b.zip
Minor whitespace changes
Diffstat (limited to 'includes')
-rw-r--r--includes/functions/functions.php10
-rw-r--r--includes/functions/functions_charts.php12
-rw-r--r--includes/session.php6
3 files changed, 15 insertions, 13 deletions
diff --git a/includes/functions/functions.php b/includes/functions/functions.php
index 8302743dd9..85a242c6f2 100644
--- a/includes/functions/functions.php
+++ b/includes/functions/functions.php
@@ -160,12 +160,12 @@ function load_gedcom_settings($ged_id) {
foreach ($rows as $row) {
if ($row->xref !== null) {
if ($row->tag_type !== null) {
- $person_facts[$row->xref][$row->tag_type] = (int)$row->resn;
+ $person_facts[$row->xref][$row->tag_type] = (int) $row->resn;
} else {
- $person_privacy[$row->xref] = (int)$row->resn;
+ $person_privacy[$row->xref] = (int) $row->resn;
}
} else {
- $global_facts[$row->tag_type] = (int)$row->resn;
+ $global_facts[$row->tag_type] = (int) $row->resn;
}
}
}
@@ -2222,8 +2222,8 @@ function get_relationship_name_from_path($path, WT_Individual $person1 = null, W
$descent = $match[2];
$up = strlen($ascent) / 3;
$down = strlen($descent) / 3;
- $cousin = min($up, $down); // Moved out of switch (en/default case) so that
- $removed = abs($down - $up); // Spanish (and other languages) can use it, too.
+ $cousin = min($up, $down); // Moved out of switch (en/default case) so that
+ $removed = abs($down - $up); // Spanish (and other languages) can use it, too.
// Different languages have different rules for naming cousins. For example,
// an English “second cousin once removed” is a Polish “cousin of 7th degree”.
diff --git a/includes/functions/functions_charts.php b/includes/functions/functions_charts.php
index 982b40205b..3abfa3be9c 100644
--- a/includes/functions/functions_charts.php
+++ b/includes/functions/functions_charts.php
@@ -126,7 +126,7 @@ function print_family_parents(WT_Family $family, $sosa = 0, $label = '', $parid
print_pedigree_person(WT_Individual::getInstance($hfam->getHusband()->getXref()));
echo "</td></tr></table>";
} elseif ($hfam && !$hfam->getHusband()) {
- // here for empty box for grandfather
+ // Empty box for grandfather
echo "<table style=\"width: " . ($pbwidth) . "px; height: " . $pbheight . "px;\" border=\"0\"><tr>";
echo '<td valign="top">';
print_pedigree_person($hfam->getHusband());
@@ -149,7 +149,8 @@ function print_family_parents(WT_Family $family, $sosa = 0, $label = '', $parid
echo '<td valign="top">';
print_pedigree_person(WT_Individual::getInstance($hfam->getWife()->getXref()));
echo '</td></tr></table>';
- } elseif ($hfam && !$hfam->getWife()) { // here for empty box for grandmother
+ } elseif ($hfam && !$hfam->getWife()) {
+ // Empty box for grandmother
echo "<table style=\"width: " . ($pbwidth) . "px; height: " . $pbheight . "px;\" border=\"0\"><tr>";
echo '<td valign="top">';
print_pedigree_person($hfam->getWife());
@@ -207,7 +208,7 @@ function print_family_parents(WT_Family $family, $sosa = 0, $label = '', $parid
print_pedigree_person(WT_Individual::getInstance($hfam->getHusband()->getXref()));
echo "</td></tr></table>";
} elseif ($hfam && !$hfam->getHusband()) {
- // here for empty box for grandfather
+ // Empty box for grandfather
echo "<table style=\"width: " . ($pbwidth) . "px; height: " . $pbheight . "px;\" border=\"0\"><tr>";
echo '<td valign="top">';
print_pedigree_person($hfam->getHusband());
@@ -220,7 +221,7 @@ function print_family_parents(WT_Family $family, $sosa = 0, $label = '', $parid
print_url_arrow(($sosa == 0 ? '?famid=' . $hfam->getXref() . '&amp;ged=' . WT_GEDURL : '#' . $hfam->getXref()), $hfam->getXref(), 1);
echo '</td>';
}
- if ($hfam) { // remove the|| test for $sosa
+ if ($hfam) {
// wife’s mother
echo "</tr><tr><td><img src=\"" . Theme::theme()->parameter('image-hline') . "\" alt=\"\"></td><td>";
if ($hfam && $hfam->getWife()) {
@@ -230,7 +231,8 @@ function print_family_parents(WT_Family $family, $sosa = 0, $label = '', $parid
echo "<td valign=\"top\">";
print_pedigree_person(WT_Individual::getInstance($hfam->getWife()->getXref()));
echo "</td></tr></table>";
- } elseif ($hfam && !$hfam->getWife()) { // here for empty box for grandmother
+ } elseif ($hfam && !$hfam->getWife()) {
+ // Empty box for grandmother
echo "<table style=\"width: " . ($pbwidth) . "px; height: " . $pbheight . "px;\" border=\"0\"><tr>";
echo '<td valign="top">';
print_pedigree_person($hfam->getWife());
diff --git a/includes/session.php b/includes/session.php
index 433a9c4bcd..7ca4df308d 100644
--- a/includes/session.php
+++ b/includes/session.php
@@ -124,10 +124,10 @@ define('WT_EVENTS_DIV', 'DIV|ANUL|_SEPR');
define('WT_EOL', "\r\n");
// Gedcom specification/definitions
-define ('WT_GEDCOM_LINE_LENGTH', 255 - strlen(WT_EOL)); // Characters, not bytes
+define('WT_GEDCOM_LINE_LENGTH', 255 - strlen(WT_EOL)); // Characters, not bytes
// Used in Google charts
-define ('WT_GOOGLE_CHART_ENCODING', 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-.');
+define('WT_GOOGLE_CHART_ENCODING', 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-.');
// Privacy constants
define('WT_PRIV_PUBLIC', 2); // Allows visitors to view the marked information
@@ -136,7 +136,7 @@ define('WT_PRIV_NONE', 0); // Allows managers to access the marked informatio
define('WT_PRIV_HIDE', -1); // Hide the item to all users
// For performance, it is quicker to refer to files using absolute paths
-define ('WT_ROOT', realpath(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR);
+define('WT_ROOT', realpath(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR);
// Keep track of time statistics, for the summary in the footer
$start_time = microtime(true);