fisharebest / webtrees

addmedia.php

Spacing +1 added lines, -1 removed lines

@@ -473,7 +473,7 @@
 			'<p class="small text-muted">' . I18N::translate('Do not change to keep original filename.') . '<br>' . I18N::translate('You may enter a URL, beginning with “http://”.') . '</p>'
 		);
 	}
-	$folder   = '';
+	$folder = '';
 } else {
 	if ($isExternal) {
 		$fileName = substr($gedfile, 5);

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2015 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) 2015 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_trees_merge.php

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2015 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) 2015 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;
 
 /**

app/Controller/LifespanController.php

Indentation +15 added lines, -15 removed lines

@@ -1,18 +1,18 @@ 
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2015 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) 2015 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\Controller;
 
 use Fisharebest\Webtrees\ColorGenerator;
@@ -180,7 +180,7 @@ 
 
 		$tmp = strtoupper(strtr($this->calendar,
 			array('jewish' => 'hebrew',
-			      'french' => 'french r',
+						'french' => 'french r',
 			)));
 		$this->calendarEscape = sprintf('@#D%s@', $tmp);
 
@@ -395,7 +395,7 @@ 
 			$that          = $this; // PHP5.3 cannot access $this inside a closure
 			$acceptedFacts = array_filter($facts, function (Fact $fact) use ($that) {
 				return (in_array($fact->getTag(), $that->facts) && $fact->getDate()->isOK()) ||
-				       (($that->place_obj || $that->startDate) && $that->checkFact($fact));
+							 (($that->place_obj || $that->startDate) && $that->checkFact($fact));
 			});
 
 			$eventList = array();

Spacing +4 added lines, -4 removed lines

@@ -41,12 +41,12 @@ 
 	// Base color parameters
 	const RANGE           = 120; // degrees
 	const SATURATION      = 100; // percent
-	const LIGHTNESS       = 30;  // percent
+	const LIGHTNESS       = 30; // percent
 	const ALPHA           = 0.25;
 	const CHART_TOP       = 10; // pixels
 	const BAR_SPACING     = 22; // pixels
 	const YEAR_SPAN       = 10; // Number of years per scale section
-	const PIXELS_PER_YEAR = 7;  // Number of pixels to shift per year
+	const PIXELS_PER_YEAR = 7; // Number of pixels to shift per year
 	const SESSION_DATA    = 'lifespan_data';
 
 	/** @var string|null Chart parameter */
@@ -457,8 +457,8 @@ 
 			}
 			echo
 				'</div>' . // class="popup"
-				'</div>' .  // class="itr"
-				'</div>';   // class=$popupclass
+				'</div>' . // class="itr"
+				'</div>'; // class=$popupclass
 
 			$maxY = max($maxY, $Y);
 		}

app/Controller/PedigreeController.php

Spacing +3 added lines, -3 removed lines

@@ -152,7 +152,7 @@ 
 			switch ($this->orientation) {
 				case self::PORTRAIT:
 					$xoffset = ($this->generations - $curgen) * (($this->getBoxDimensions()->width + $bxspacing) / 1.8);
-					if(!$i && $this->root->getSpouseFamilies()) {
+					if (!$i && $this->root->getSpouseFamilies()) {
 						$xoffset -= self::ARROW_SIZE;
 					}
 					// -- compact the tree
@@ -207,7 +207,7 @@ 
 				case self::OLDEST_AT_TOP:
 					//swap x & y offsets as chart is rotated
 					$xoffset = $yoffset;
-					$yoffset = $curgen  * ($this->getBoxDimensions()->height + ($byspacing * 4));
+					$yoffset = $curgen * ($this->getBoxDimensions()->height + ($byspacing * 4));
 					break;
 				case self::OLDEST_AT_BOTTOM:
 					//swap x & y offsets as chart is rotated
@@ -245,7 +245,7 @@ 
 			return $item['y'];
 		}, $this->nodes));
 
-		$this->chartsize['x'] = $max_xoffset + $bxspacing + $this->getBoxDimensions()->width  + $addoffset['x'];
+		$this->chartsize['x'] = $max_xoffset + $bxspacing + $this->getBoxDimensions()->width + $addoffset['x'];
 		$this->chartsize['y'] = $max_yoffset + $byspacing + $this->getBoxDimensions()->height + $addoffset['y'];
 	}
 

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2015 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) 2015 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/Controller/RepositoryController.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 		$menu = new Menu(I18N::translate('Edit'), '#', 'menu-repo');
 
 		if (Auth::isEditor($this->record->getTree())) {
-			$fact    = $this->record->getFirstFact('NAME');
+			$fact = $this->record->getFirstFact('NAME');
 			if ($fact) {
 				// Edit existing name
 				$menu->addSubmenu(new Menu(I18N::translate('Edit repository'), '#', 'menu-repo-edit', array(

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2015 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) 2015 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/Database.php

Spacing +1 added lines, -2 removed lines

@@ -85,8 +85,7 @@
 		// Create the underlying PDO object
 		self::$pdo = new PDO(
 			(substr($DBHOST, 0, 1) === '/' ?
-				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" :
-				"mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
+				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
 			),
 			$DBUSER, $DBPASS,
 			array(

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2015 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) 2015 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/FunctionsDb.php

Indentation +20 added lines, -20 removed lines

@@ -1,18 +1,18 @@ 
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2015 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) 2015 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\Functions;
 
 use Fisharebest\Webtrees\Auth;
@@ -748,13 +748,13 @@ 
 	public static function getAnniversaryEvents($jd, $facts, Tree $tree) {
 		$found_facts = array();
 		foreach (array(
-			         new GregorianDate($jd),
-			         new JulianDate($jd),
-			         new FrenchDate($jd),
-			         new JewishDate($jd),
-			         new HijriDate($jd),
-			         new JalaliDate($jd),
-		         ) as $anniv) {
+							 new GregorianDate($jd),
+							 new JulianDate($jd),
+							 new FrenchDate($jd),
+							 new JewishDate($jd),
+							 new HijriDate($jd),
+							 new JalaliDate($jd),
+						 ) as $anniv) {
 			// Build a SQL where clause to match anniversaries in the appropriate calendar.
 			$ind_sql =
 				"SELECT DISTINCT i_id AS xref, i_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact" .

app/Module/CensusAssistantModule.php

Spacing +3 added lines, -3 removed lines

@@ -425,10 +425,10 @@ 
 	 * @return string
 	 */
 	public static function censusNavigatorFamily(CensusInterface $census, Family $family, Individual $head) {
-		$headImg2  = '<i class="icon-button_head" title="' . I18N::translate('Click to choose individual as head of family.') . '"></i>';
+		$headImg2 = '<i class="icon-button_head" title="' . I18N::translate('Click to choose individual as head of family.') . '"></i>';
 
 		foreach ($family->getSpouses() as $spouse) {
-			$menu  = new Menu(Functions::getCloseRelationshipName($head, $spouse));
+			$menu = new Menu(Functions::getCloseRelationshipName($head, $spouse));
 			foreach ($spouse->getChildFamilies() as $grandparents) {
 				foreach ($grandparents->getSpouses() as $grandparent) {
 					$submenu = new Menu(
@@ -463,7 +463,7 @@ 
 		}
 
 		foreach ($family->getChildren() as $child) {
-			$menu  = new Menu(Functions::getCloseRelationshipName($head, $child));
+			$menu = new Menu(Functions::getCloseRelationshipName($head, $child));
 			foreach ($child->getSpouseFamilies() as $spouse_family) {
 				foreach ($spouse_family->getSpouses() as $spouse_family_spouse) {
 					if ($spouse_family_spouse != $child) {

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2015 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) 2015 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/Module/GoogleMapsModule.php

Spacing +5 added lines, -5 removed lines

@@ -408,7 +408,7 @@ 
 							if ($level == 1) {
 								$label = I18N::translate('Country');
 							} else {
-								$label = I18N::translate('Level') .  ' ' . $level;
+								$label = I18N::translate('Level') . ' ' . $level;
 							}
 							?>
 							<div class="input-group">
@@ -424,7 +424,7 @@ 
 							if ($level == 1) {
 								$label = I18N::translate('Country');
 							} else {
-								$label = I18N::translate('Level') .  ' ' . $level;
+								$label = I18N::translate('Level') . ' ' . $level;
 							}
 							?>
 							<div class="input-group">
@@ -3014,7 +3014,7 @@ 
 			}
 		');
 
-		$levelm                           = $this->setLevelMap($level, $parent);
+		$levelm = $this->setLevelMap($level, $parent);
 		if (isset($levelo[0])) {
 			$levelo[0] = 0;
 		}
@@ -4170,7 +4170,7 @@ 
 						} else {
 							$placelist[$j]['long'] = null;
 						}
-						$j                          = $j + 1;
+						$j = $j + 1;
 					}
 					$i        = $i + 1;
 					$placerec = Functions::getSubRecord(2, '2 PLAC', $gedrec, $i);
@@ -4366,7 +4366,7 @@ 
 			$j            = 0;
 			$maxLevel     = 0;
 			foreach ($lines as $p => $placerec) {
-				$fieldrec                               = explode(';', $placerec);
+				$fieldrec = explode(';', $placerec);
 				if ($fieldrec[0] > $maxLevel) {
 					$maxLevel = $fieldrec[0];
 				}

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 /**
- * webtrees: online genealogy
- * Copyright (C) 2015 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) 2015 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;