fisharebest / webtrees

admin_module_menus.php

Braces +5 added lines, -2 removed lines

@@ -98,8 +98,11 @@
 				<td class="col-xs-1">
 					<?php if ($module instanceof ModuleConfigInterface): ?>
 					<a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a>
-					<?php else: ?>
-					<?php echo $module->getTitle(); ?>
+					<?php else {
+	: ?>
+					<?php echo $module->getTitle();
+}
+?>
 					<?php endif; ?>
 				</td>
 				<td class="col-xs-5"><?php echo $module->getDescription(); ?></td>

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+		 * webtrees: online genealogy
+		 * Copyright (C) 2016 webtrees development team
+		 * This program is free software: you can redistribute it and/or modify
+		 * it under the terms of the GNU General Public License as published by
+		 * the Free Software Foundation, either version 3 of the License, or
+		 * (at your option) any later version.
+		 * This program is distributed in the hope that it will be useful,
+		 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+		 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+		 * GNU General Public License for more details.
+		 * You should have received a copy of the GNU General Public License
+		 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+		 */
 namespace Fisharebest\Webtrees;
 
 define('WT_SCRIPT_NAME', 'site-offline.php');

admin_module_sidebar.php

Braces +5 added lines, -2 removed lines

@@ -98,8 +98,11 @@
 				<td class="col-xs-1">
 					<?php if ($module instanceof ModuleConfigInterface): ?>
 					<a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a>
-					<?php else: ?>
-					<?php echo $module->getTitle(); ?>
+					<?php else {
+	: ?>
+					<?php echo $module->getTitle();
+}
+?>
 					<?php endif; ?>
 				</td>
 				<td class="col-xs-5"><?php echo $module->getDescription(); ?></td>

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;

app/SurnameTradition/PortugueseSurnameTradition.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 	 */
 	public function newParentNames($child_name, $parent_sex) {
 		if (preg_match(self::REGEX_SURNS, $child_name, $match)) {
-			switch($parent_sex) {
+			switch ($parent_sex) {
 			case 'M':
 				return array(
 					'NAME' => '/' . $match['SURN1'] . '/ //',

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;

admin_site_change.php

Switch Indentation +8 added lines, -8 removed lines

@@ -207,14 +207,14 @@
 
 		foreach ($differences as $difference) {
 			switch ($difference[1]) {
-				case MyersDiff::DELETE:
-					$diff_lines[] = '<del>' . $difference[0] . '</del>';
-					break;
-				case MyersDiff::INSERT:
-					$diff_lines[] = '<ins>' . $difference[0] . '</ins>';
-					break;
-				default:
-					$diff_lines[] = $difference[0];
+			case MyersDiff::DELETE:
+				$diff_lines[] = '<del>' . $difference[0] . '</del>';
+				break;
+			case MyersDiff::INSERT:
+				$diff_lines[] = '<ins>' . $difference[0] . '</ins>';
+				break;
+			default:
+				$diff_lines[] = $difference[0];
 			}
 		}
 

Spacing +3 added lines, -5 removed lines

@@ -179,7 +179,7 @@ 
 	$recordsTotal    = (int) Database::prepare("SELECT COUNT(*) FROM `##change`")->fetchOne();
 
 	$data = array();
-	$algorithm   = new MyersDiff;
+	$algorithm = new MyersDiff;
 
 	foreach ($rows as $row) {
 		$old_lines = preg_split('/[\n]+/', $row->old_gedcom, -1, PREG_SPLIT_NO_EMPTY);
@@ -207,14 +207,12 @@ 
 			$row->change_time,
 			I18N::translate($row->status),
 			GedcomRecord::getInstance($row->xref, Tree::findByName($gedc)) ?
-				"<a href='gedrecord.php?pid={$row->xref}&ged={$row->gedcom_name}'>{$row->xref}</a>" :
-				$row->xref,
+				"<a href='gedrecord.php?pid={$row->xref}&ged={$row->gedcom_name}'>{$row->xref}</a>" : $row->xref,
 			'<div class="gedcom-data" dir="ltr">' .
 				preg_replace_callback('/@(' . WT_REGEX_XREF . ')@/',
 					function ($match) use ($gedc) {
 						return GedcomRecord::getInstance($match[1], Tree::findByName($gedc)) ?
-							"<a href='#' onclick='return edit_raw(\"{$match[1]}\");'>{$match[0]}</a>" :
-							$match[0];
+							"<a href='#' onclick='return edit_raw(\"{$match[1]}\");'>{$match[0]}</a>" : $match[0];
 					},
 					implode("\n", $diff_lines)
 				) .

app/Date/JewishDate.php

Doc Comments +1 added lines, -1 removed lines

@@ -247,7 +247,7 @@
 	/**
 	 * Which months follows this one?  Calendars with leap-months should provide their own implementation.
 	 *
-	 * @return int[]
+	 * @return integer[]
 	 */
 	protected function nextMonth() {
 		if ($this->m == 6 && !$this->isLeapYear()) {

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;

app/Date/CalendarDate.php

Doc Comments +1 added lines, -1 removed lines

@@ -247,7 +247,7 @@
 	/**
 	 * Which months follows this one?  Calendars with leap-months should provide their own implementation.
 	 *
-	 * @return int[]
+	 * @return integer[]
 	 */
 	protected function nextMonth() {
 		if ($this->m == 6 && !$this->isLeapYear()) {

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;

admin.php

Braces +39 added lines, -16 removed lines

@@ -528,10 +528,12 @@ 
 	version_compare(PHP_VERSION, '7.0', '<') && date('Y-m-d') >= '2016-08-28'
 ) {
 	$server_warnings[] = I18N::translate('Your web server is using PHP version %s, which is no longer maintained. You should upgrade to a later version.', PHP_VERSION);
-} else
+} else {
 
 ?>
-<h1><?php echo $controller->getPageTitle(); ?></h1>
+<h1><?php echo $controller->getPageTitle();
+}
+?></h1>
 
 <p>
 	<?php echo I18N::translate('These pages provide access to all the configuration settings and management tools for this webtrees site.'); ?>
@@ -584,8 +586,11 @@ 
 					<a href="admin_site_upgrade.php" class="error">
 						<?php echo /* I18N: %s is a version number */ I18N::translate('Upgrade to webtrees %s.', Filter::escapeHtml($latest_version)); ?>
 					</a>
-					<?php else: ?>
-						<?php echo I18N::translate('This is the latest version of webtrees. No upgrade is available.'); ?>
+					<?php else {
+	: ?>
+						<?php echo I18N::translate('This is the latest version of webtrees. No upgrade is available.');
+}
+?>
 					<?php endif; ?>
 				</p>
 				<?php endif; ?>
@@ -747,9 +752,12 @@ 
 									<?php echo I18N::number($changes[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Pending changes'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 							<td class="text-right flip">
 								<?php if ($individuals[$tree->getTreeId()]): ?>
@@ -757,9 +765,12 @@ 
 									<?php echo I18N::number($individuals[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Individuals'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 									-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 								</td>
 							<td class="text-right flip">
 								<?php if ($families[$tree->getTreeId()]): ?>
@@ -767,9 +778,12 @@ 
 									<?php echo I18N::number($families[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Families'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 								</td>
 							<td class="text-right flip">
 								<?php if ($sources[$tree->getTreeId()]): ?>
@@ -777,9 +791,12 @@ 
 									<?php echo I18N::number($sources[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Sources'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 							<td class="text-right flip">
 								<?php if ($repositories[$tree->getTreeId()]): ?>
@@ -787,9 +804,12 @@ 
 									<?php echo I18N::number($repositories[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Repositories'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 									-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 							<td class="text-right flip">
 								<?php if ($media[$tree->getTreeId()]): ?>
@@ -797,9 +817,12 @@ 
 									<?php echo I18N::number($media[$tree->getTreeId()]); ?>
 									<span class="sr-only"><?php echo I18N::translate('Media objects'); ?> <?php echo $tree->getTitleHtml(); ?></span>
 								</a>
-								<?php else: ?>
+								<?php else {
+	: ?>
 								-
-								<?php endif; ?>
+								<?php endif;
+}
+?>
 							</td>
 						</tr>
 						<?php endforeach; ?>

app/I18N.php

Switch Indentation +18 added lines, -18 removed lines

@@ -282,15 +282,15 @@ 
 	 */
 	public static function gedcomAge($string) {
 		switch ($string) {
-			case 'STILLBORN':
-				// I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (stillborn)
-				return self::translate('(stillborn)');
-			case 'INFANT':
-				// I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (in infancy)
-				return self::translate('(in infancy)');
-			case 'CHILD':
-				// I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (in childhood)
-				return self::translate('(in childhood)');
+		case 'STILLBORN':
+			// I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (stillborn)
+			return self::translate('(stillborn)');
+		case 'INFANT':
+			// I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (in infancy)
+			return self::translate('(in infancy)');
+		case 'CHILD':
+			// I18N: Description of an individual’s age at an event. For example, Died 14 Jan 1900 (in childhood)
+			return self::translate('(in childhood)');
 		}
 		$age = array();
 		if (preg_match('/(\d+)y/', $string, $match)) {
@@ -874,15 +874,15 @@ 
 	 */
 	public static function defaultCalendar() {
 		switch (self::$locale->languageTag()) {
-			case 'ar':
-				return new ArabicCalendar;
-			case 'fa':
-				return new PersianCalendar;
-			case 'he':
-			case 'yi':
-				return new JewishCalendar;
-			default:
-				return new GregorianCalendar;
+		case 'ar':
+			return new ArabicCalendar;
+		case 'fa':
+			return new PersianCalendar;
+		case 'he':
+		case 'yi':
+			return new JewishCalendar;
+		default:
+			return new GregorianCalendar;
 		}
 	}
 }

Braces +2 added lines, -1 removed lines

@@ -421,7 +421,8 @@
 				$translation  = new Translation($translation_file);
 				$translations = array_merge($translations, $translation->asArray());
 			}
-			if ($cache_dir_exists && is_writeable($cache_file)) { // During setup, we may not have been able to create it.
+			if ($cache_dir_exists && is_writeable($cache_file)) {
+// During setup, we may not have been able to create it.
 				file_put_contents($cache_file, '<' . '?php return ' . var_export($translations, true) . ';');
 			}
 		} else {

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;

app/Functions/FunctionsRtl.php

Switch Indentation +212 added lines, -212 removed lines

@@ -124,227 +124,227 @@ 
 			$closeParIndex = strpos(self::CLOSE_PARENTHESES, $currentLetter); // Which closing parenthesis is this?
 
 			switch ($currentLetter) {
-				case '<':
-					// Assume this '<' starts an HTML element
-					$endPos = strpos($workingText, '>'); // look for the terminating '>'
-					if ($endPos === false) {
-						$endPos = 0;
-					}
-					$currentLen += $endPos;
-					$element = substr($workingText, 0, $currentLen);
-					$temp    = strtolower(substr($element, 0, 3));
-					if (strlen($element) < 7 && $temp == '<br') {
-						if ($numberState) {
-							$numberState = false;
-							if (self::$currentState == 'RTL') {
-								self::$waitingText .= WT_UTF8_PDF;
-							}
+			case '<':
+				// Assume this '<' starts an HTML element
+				$endPos = strpos($workingText, '>'); // look for the terminating '>'
+				if ($endPos === false) {
+					$endPos = 0;
+				}
+				$currentLen += $endPos;
+				$element = substr($workingText, 0, $currentLen);
+				$temp    = strtolower(substr($element, 0, 3));
+				if (strlen($element) < 7 && $temp == '<br') {
+					if ($numberState) {
+						$numberState = false;
+						if (self::$currentState == 'RTL') {
+							self::$waitingText .= WT_UTF8_PDF;
 						}
-						self::breakCurrentSpan($result);
-					} elseif (self::$waitingText == '') {
-						$result .= $element;
-					} else {
-						self::$waitingText .= $element;
 					}
-					$workingText = substr($workingText, $currentLen);
-					break;
-				case '&':
-					// Assume this '&' starts an HTML entity
-					$endPos = strpos($workingText, ';'); // look for the terminating ';'
+					self::breakCurrentSpan($result);
+				} elseif (self::$waitingText == '') {
+					$result .= $element;
+				} else {
+					self::$waitingText .= $element;
+				}
+				$workingText = substr($workingText, $currentLen);
+				break;
+			case '&':
+				// Assume this '&' starts an HTML entity
+				$endPos = strpos($workingText, ';'); // look for the terminating ';'
+				if ($endPos === false) {
+					$endPos = 0;
+				}
+				$currentLen += $endPos;
+				$entity = substr($workingText, 0, $currentLen);
+				if (strtolower($entity) == '&nbsp;') {
+					$entity .= '&nbsp;'; // Ensure consistent case for this entity
+				}
+				if (self::$waitingText == '') {
+					$result .= $entity;
+				} else {
+					self::$waitingText .= $entity;
+				}
+				$workingText = substr($workingText, $currentLen);
+				break;
+			case '{':
+				if (substr($workingText, 1, 1) == '{') {
+					// Assume this '{{' starts a TCPDF directive
+					$endPos = strpos($workingText, '}}'); // look for the terminating '}}'
 					if ($endPos === false) {
 						$endPos = 0;
 					}
-					$currentLen += $endPos;
-					$entity = substr($workingText, 0, $currentLen);
-					if (strtolower($entity) == '&nbsp;') {
-						$entity .= '&nbsp;'; // Ensure consistent case for this entity
-					}
-					if (self::$waitingText == '') {
-						$result .= $entity;
-					} else {
-						self::$waitingText .= $entity;
-					}
-					$workingText = substr($workingText, $currentLen);
+					$currentLen        = $endPos + 2;
+					$directive         = substr($workingText, 0, $currentLen);
+					$workingText       = substr($workingText, $currentLen);
+					$result            = $result . self::$waitingText . $directive;
+					self::$waitingText = '';
 					break;
-				case '{':
-					if (substr($workingText, 1, 1) == '{') {
-						// Assume this '{{' starts a TCPDF directive
-						$endPos = strpos($workingText, '}}'); // look for the terminating '}}'
-						if ($endPos === false) {
-							$endPos = 0;
+				}
+			default:
+				// Look for strings of numbers with optional leading or trailing + or -
+				// and with optional embedded numeric punctuation
+				if ($numberState) {
+					// If we're inside a numeric string, look for reasons to end it
+					$offset    = 0; // Be sure to look at the current character first
+					$charArray = self::getChar($workingText . "\n", $offset);
+					if (strpos(self::NUMBERS, $charArray['letter']) === false) {
+						// This is not a digit. Is it numeric punctuation?
+						if (substr($workingText . "\n", $offset, 6) == '&nbsp;') {
+							$offset += 6; // This could be numeric punctuation
+						} elseif (strpos(self::NUMBER_PUNCTUATION, $charArray['letter']) !== false) {
+							$offset += $charArray['length']; // This could be numeric punctuation
 						}
-						$currentLen        = $endPos + 2;
-						$directive         = substr($workingText, 0, $currentLen);
-						$workingText       = substr($workingText, $currentLen);
-						$result            = $result . self::$waitingText . $directive;
-						self::$waitingText = '';
-						break;
-					}
-				default:
-					// Look for strings of numbers with optional leading or trailing + or -
-					// and with optional embedded numeric punctuation
-					if ($numberState) {
-						// If we're inside a numeric string, look for reasons to end it
-						$offset    = 0; // Be sure to look at the current character first
+						// If the next character is a digit, the current character is numeric punctuation
 						$charArray = self::getChar($workingText . "\n", $offset);
 						if (strpos(self::NUMBERS, $charArray['letter']) === false) {
-							// This is not a digit. Is it numeric punctuation?
-							if (substr($workingText . "\n", $offset, 6) == '&nbsp;') {
-								$offset += 6; // This could be numeric punctuation
-							} elseif (strpos(self::NUMBER_PUNCTUATION, $charArray['letter']) !== false) {
-								$offset += $charArray['length']; // This could be numeric punctuation
-							}
-							// If the next character is a digit, the current character is numeric punctuation
-							$charArray = self::getChar($workingText . "\n", $offset);
-							if (strpos(self::NUMBERS, $charArray['letter']) === false) {
-								// This is not a digit. End the run of digits and punctuation.
-								$numberState = false;
-								if (self::$currentState == 'RTL') {
-									if (strpos(self::NUMBER_PREFIX, $currentLetter) === false) {
-										$currentLetter = WT_UTF8_PDF . $currentLetter;
-									} else {
-										$currentLetter = $currentLetter . WT_UTF8_PDF; // Include a trailing + or - in the run
-									}
+							// This is not a digit. End the run of digits and punctuation.
+							$numberState = false;
+							if (self::$currentState == 'RTL') {
+								if (strpos(self::NUMBER_PREFIX, $currentLetter) === false) {
+									$currentLetter = WT_UTF8_PDF . $currentLetter;
+								} else {
+									$currentLetter = $currentLetter . WT_UTF8_PDF; // Include a trailing + or - in the run
 								}
 							}
 						}
-					} else {
-						// If we're outside a numeric string, look for reasons to start it
-						if (strpos(self::NUMBER_PREFIX, $currentLetter) !== false) {
-							// This might be a number lead-in
-							$offset   = $currentLen;
-							$nextChar = substr($workingText . "\n", $offset, 1);
-							if (strpos(self::NUMBERS, $nextChar) !== false) {
-								$numberState = true; // We found a digit: the lead-in is therefore numeric
-								if (self::$currentState == 'RTL') {
-									$currentLetter = WT_UTF8_LRE . $currentLetter;
-								}
-							}
-						} elseif (strpos(self::NUMBERS, $currentLetter) !== false) {
-							$numberState = true; // The current letter is a digit
+					}
+				} else {
+					// If we're outside a numeric string, look for reasons to start it
+					if (strpos(self::NUMBER_PREFIX, $currentLetter) !== false) {
+						// This might be a number lead-in
+						$offset   = $currentLen;
+						$nextChar = substr($workingText . "\n", $offset, 1);
+						if (strpos(self::NUMBERS, $nextChar) !== false) {
+							$numberState = true; // We found a digit: the lead-in is therefore numeric
 							if (self::$currentState == 'RTL') {
 								$currentLetter = WT_UTF8_LRE . $currentLetter;
 							}
 						}
+					} elseif (strpos(self::NUMBERS, $currentLetter) !== false) {
+						$numberState = true; // The current letter is a digit
+						if (self::$currentState == 'RTL') {
+							$currentLetter = WT_UTF8_LRE . $currentLetter;
+						}
 					}
+				}
+
+				// Determine the directionality of the current UTF-8 character
+				$newState = self::$currentState;
+				while (true) {
+					if (I18N::scriptDirection(I18N::textScript($currentLetter)) === 'rtl') {
+						if (self::$currentState == '') {
+							$newState = 'RTL';
+							break;
+						}
 
-					// Determine the directionality of the current UTF-8 character
-					$newState = self::$currentState;
-					while (true) {
-						if (I18N::scriptDirection(I18N::textScript($currentLetter)) === 'rtl') {
-							if (self::$currentState == '') {
+						if (self::$currentState == 'RTL') {
+							break;
+						}
+						// Switch to RTL only if this isn't a solitary RTL letter
+						$tempText = substr($workingText, $currentLen);
+						while ($tempText != '') {
+							$nextCharArray = self::getChar($tempText, 0);
+							$nextLetter    = $nextCharArray['letter'];
+							$nextLen       = $nextCharArray['length'];
+							$tempText      = substr($tempText, $nextLen);
+
+							if (I18N::scriptDirection(I18N::textScript($nextLetter)) === 'rtl') {
 								$newState = 'RTL';
-								break;
+								break 2;
 							}
 
-							if (self::$currentState == 'RTL') {
-								break;
+							if (strpos(self::PUNCTUATION, $nextLetter) !== false || strpos(self::OPEN_PARENTHESES, $nextLetter) !== false) {
+								$newState = 'RTL';
+								break 2;
 							}
-							// Switch to RTL only if this isn't a solitary RTL letter
-							$tempText = substr($workingText, $currentLen);
-							while ($tempText != '') {
-								$nextCharArray = self::getChar($tempText, 0);
-								$nextLetter    = $nextCharArray['letter'];
-								$nextLen       = $nextCharArray['length'];
-								$tempText      = substr($tempText, $nextLen);
-
-								if (I18N::scriptDirection(I18N::textScript($nextLetter)) === 'rtl') {
-									$newState = 'RTL';
-									break 2;
-								}
-
-								if (strpos(self::PUNCTUATION, $nextLetter) !== false || strpos(self::OPEN_PARENTHESES, $nextLetter) !== false) {
-									$newState = 'RTL';
-									break 2;
-								}
 
-								if ($nextLetter === ' ') {
-									break;
-								}
-								$nextLetter .= substr($tempText . "\n", 0, 5);
-								if ($nextLetter === '&nbsp;') {
-									break;
-								}
-							}
-							// This is a solitary RTL letter : wrap it in UTF8 control codes to force LTR directionality
-							$currentLetter = WT_UTF8_LRO . $currentLetter . WT_UTF8_PDF;
-							$newState      = 'LTR';
-							break;
-						}
-						if (($currentLen != 1) || ($currentLetter >= 'A' && $currentLetter <= 'Z') || ($currentLetter >= 'a' && $currentLetter <= 'z')) {
-							// Since it’s neither Hebrew nor Arabic, this UTF-8 character or ASCII letter must be LTR
-							$newState = 'LTR';
-							break;
-						}
-						if ($closeParIndex !== false) {
-							// This closing parenthesis has to inherit the matching opening parenthesis' directionality
-							if (!empty($openParDirection[$closeParIndex]) && $openParDirection[$closeParIndex] != '?') {
-								$newState = $openParDirection[$closeParIndex];
+							if ($nextLetter === ' ') {
+								break;
 							}
-							$openParDirection[$closeParIndex] = '';
-							break;
-						}
-						if ($openParIndex !== false) {
-							// Opening parentheses always inherit the following directionality
-							self::$waitingText .= $currentLetter;
-							$workingText = substr($workingText, $currentLen);
-							while (true) {
-								if ($workingText === '') {
-									break;
-								}
-								if (substr($workingText, 0, 1) === ' ') {
-									// Spaces following this left parenthesis inherit the following directionality too
-									self::$waitingText .= ' ';
-									$workingText = substr($workingText, 1);
-									continue;
-								}
-								if (substr($workingText, 0, 6) === '&nbsp;') {
-									// Spaces following this left parenthesis inherit the following directionality too
-									self::$waitingText .= '&nbsp;';
-									$workingText = substr($workingText, 6);
-									continue;
-								}
+							$nextLetter .= substr($tempText . "\n", 0, 5);
+							if ($nextLetter === '&nbsp;') {
 								break;
 							}
-							$openParDirection[$openParIndex] = '?';
-							break 2; // double break because we're waiting for more information
 						}
-
-						// We have a digit or a "normal" special character.
-						//
-						// When this character is not at the start of the input string, it inherits the preceding directionality;
-						// at the start of the input string, it assumes the following directionality.
-						//
-						// Exceptions to this rule will be handled later during final clean-up.
-						//
+						// This is a solitary RTL letter : wrap it in UTF8 control codes to force LTR directionality
+						$currentLetter = WT_UTF8_LRO . $currentLetter . WT_UTF8_PDF;
+						$newState      = 'LTR';
+						break;
+					}
+					if (($currentLen != 1) || ($currentLetter >= 'A' && $currentLetter <= 'Z') || ($currentLetter >= 'a' && $currentLetter <= 'z')) {
+						// Since it’s neither Hebrew nor Arabic, this UTF-8 character or ASCII letter must be LTR
+						$newState = 'LTR';
+						break;
+					}
+					if ($closeParIndex !== false) {
+						// This closing parenthesis has to inherit the matching opening parenthesis' directionality
+						if (!empty($openParDirection[$closeParIndex]) && $openParDirection[$closeParIndex] != '?') {
+							$newState = $openParDirection[$closeParIndex];
+						}
+						$openParDirection[$closeParIndex] = '';
+						break;
+					}
+					if ($openParIndex !== false) {
+						// Opening parentheses always inherit the following directionality
 						self::$waitingText .= $currentLetter;
 						$workingText = substr($workingText, $currentLen);
-						if (self::$currentState != '') {
-							$result .= self::$waitingText;
-							self::$waitingText = '';
+						while (true) {
+							if ($workingText === '') {
+								break;
+							}
+							if (substr($workingText, 0, 1) === ' ') {
+								// Spaces following this left parenthesis inherit the following directionality too
+								self::$waitingText .= ' ';
+								$workingText = substr($workingText, 1);
+								continue;
+							}
+							if (substr($workingText, 0, 6) === '&nbsp;') {
+								// Spaces following this left parenthesis inherit the following directionality too
+								self::$waitingText .= '&nbsp;';
+								$workingText = substr($workingText, 6);
+								continue;
+							}
+							break;
 						}
+						$openParDirection[$openParIndex] = '?';
 						break 2; // double break because we're waiting for more information
 					}
-					if ($newState != self::$currentState) {
-						// A direction change has occurred
-						self::finishCurrentSpan($result, false);
-						self::$previousState = self::$currentState;
-						self::$currentState  = $newState;
-						self::beginCurrentSpan($result);
-					}
+
+					// We have a digit or a "normal" special character.
+					//
+					// When this character is not at the start of the input string, it inherits the preceding directionality;
+					// at the start of the input string, it assumes the following directionality.
+					//
+					// Exceptions to this rule will be handled later during final clean-up.
+					//
 					self::$waitingText .= $currentLetter;
 					$workingText = substr($workingText, $currentLen);
-					$result .= self::$waitingText;
-					self::$waitingText = '';
+					if (self::$currentState != '') {
+						$result .= self::$waitingText;
+						self::$waitingText = '';
+					}
+					break 2; // double break because we're waiting for more information
+				}
+				if ($newState != self::$currentState) {
+					// A direction change has occurred
+					self::finishCurrentSpan($result, false);
+					self::$previousState = self::$currentState;
+					self::$currentState  = $newState;
+					self::beginCurrentSpan($result);
+				}
+				self::$waitingText .= $currentLetter;
+				$workingText = substr($workingText, $currentLen);
+				$result .= self::$waitingText;
+				self::$waitingText = '';
 
-					foreach ($openParDirection as $index => $value) {
-						// Since we now know the proper direction, remember it for all waiting opening parentheses
-						if ($value === '?') {
-							$openParDirection[$index] = self::$currentState;
-						}
+				foreach ($openParDirection as $index => $value) {
+					// Since we now know the proper direction, remember it for all waiting opening parentheses
+					if ($value === '?') {
+						$openParDirection[$index] = self::$currentState;
 					}
+				}
 
-					break;
+				break;
 			}
 		}
 
@@ -461,34 +461,34 @@ 
 
 		// Finally, correct '<LTR>', '</LTR>', '<RTL>', and '</RTL>'
 		switch ($direction) {
-			case 'BOTH':
-			case 'both':
-				// LTR text: <span dir="ltr"> text </span>
-				// RTL text: <span dir="rtl"> text </span>
-				$sLTR = '<span dir="ltr" ' . $class . '>' . $nothing;
-				$eLTR = $nothing . '</span>';
-				$sRTL = '<span dir="rtl" ' . $class . '>' . $nothing;
-				$eRTL = $nothing . '</span>';
-				break;
-			case 'LTR':
-			case 'ltr':
-				// LTR text: <span dir="ltr"> text </span>
-				// RTL text: text
-				$sLTR = '<span dir="ltr" ' . $class . '>' . $nothing;
-				$eLTR = $nothing . '</span>';
-				$sRTL = '';
-				$eRTL = '';
-				break;
-			case 'RTL':
-			case 'rtl':
-			default:
-				// LTR text: text
-				// RTL text: <span dir="rtl"> text </span>
-				$sLTR = '';
-				$eLTR = '';
-				$sRTL = '<span dir="rtl" ' . $class . '>' . $nothing;
-				$eRTL = $nothing . '</span>';
-				break;
+		case 'BOTH':
+		case 'both':
+			// LTR text: <span dir="ltr"> text </span>
+			// RTL text: <span dir="rtl"> text </span>
+			$sLTR = '<span dir="ltr" ' . $class . '>' . $nothing;
+			$eLTR = $nothing . '</span>';
+			$sRTL = '<span dir="rtl" ' . $class . '>' . $nothing;
+			$eRTL = $nothing . '</span>';
+			break;
+		case 'LTR':
+		case 'ltr':
+			// LTR text: <span dir="ltr"> text </span>
+			// RTL text: text
+			$sLTR = '<span dir="ltr" ' . $class . '>' . $nothing;
+			$eLTR = $nothing . '</span>';
+			$sRTL = '';
+			$eRTL = '';
+			break;
+		case 'RTL':
+		case 'rtl':
+		default:
+			// LTR text: text
+			// RTL text: <span dir="rtl"> text </span>
+			$sLTR = '';
+			$eLTR = '';
+			$sRTL = '<span dir="rtl" ' . $class . '>' . $nothing;
+			$eRTL = $nothing . '</span>';
+			break;
 		}
 		$result = str_replace(array(self::$startLTR, self::$endLTR, self::$startRTL, self::$endRTL), array($sLTR, $eLTR, $sRTL, $eRTL), $result);
 

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2016 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+	 * webtrees: online genealogy
+	 * Copyright (C) 2016 webtrees development team
+	 * This program is free software: you can redistribute it and/or modify
+	 * it under the terms of the GNU General Public License as published by
+	 * the Free Software Foundation, either version 3 of the License, or
+	 * (at your option) any later version.
+	 * This program is distributed in the hope that it will be useful,
+	 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+	 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+	 * GNU General Public License for more details.
+	 * You should have received a copy of the GNU General Public License
+	 * along with this program. If not, see <http://www.gnu.org/licenses/>.
+	 */
 namespace Fisharebest\Webtrees;
 
 use Fisharebest\Webtrees\Theme\AdministrationTheme;