fisharebest / webtrees

app/Module/GoogleMapsModule.php

Unused Use Statements -1 removed lines

@@ -35,7 +35,6 @@
 use Fisharebest\Webtrees\Menu;
 use Fisharebest\Webtrees\Module;
 use Fisharebest\Webtrees\Stats;
-use Fisharebest\Webtrees\Theme;
 use Fisharebest\Webtrees\Tree;
 use PDO;
 

app/GedcomCode/GedcomCodeTemp.php

Spacing +6 added lines, -6 removed lines

@@ -57,14 +57,14 @@
 			'MADRI', 'MANAU', 'MANHA', 'MANIL', 'MANTI', 'MEDFO', 'MELBO', 'MEMPH',
 			'MERID', 'MEXIC', 'MNTVD', 'MONTE', 'MONTI', 'MONTR', 'MTIMP', 'NASHV',
 			'NAUV2', 'NAUVO', 'NBEAC', 'NUKUA', 'NYORK', 'NZEAL', 'OAKLA', 'OAXAC',
-			'OGDEN', 'OKLAH',	'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE',
-			'PAYSO', 'PERTH',	'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO',
+			'OGDEN', 'OKLAH', 'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE',
+			'PAYSO', 'PERTH', 'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO',
 			'QUETZ', 'RALEI', 'RECIF', 'REDLA', 'REGIN', 'RENO', 'REXBU', 'SACRA',
-			'SAMOA', 'SANTI',	'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL',
-			'SGEOR', 'SJOSE',	'SLAKE', 'SLOUI', 'SNOWF','SPAUL', 'SPMIN', 'SPOKA',
+			'SAMOA', 'SANTI', 'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL',
+			'SGEOR', 'SJOSE', 'SLAKE', 'SLOUI', 'SNOWF', 'SPAUL', 'SPMIN', 'SPOKA',
 			'STOCK', 'SUVA', 'SWISS', 'SYDNE', 'TAIPE', 'TAMPI', 'TEGUC', 'TGUTI',
-			'TIHUA', 'TOKYO',	'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA',
-			'VILLA', 'WASHI',	'WINTE',
+			'TIHUA', 'TOKYO', 'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA',
+			'VILLA', 'WASHI', 'WINTE',
 		);
 	}
 

app/Module/FamilyNavigatorModule.php

Braces +10 added lines, -4 removed lines

@@ -139,8 +139,11 @@ 
 					<div class="font9">
 						<?php echo $spouse->getLifeSpan(); ?>
 					</div>
-					<?php else: ?>
-						<?php echo $spouse->getFullName(); ?>
+					<?php else {
+	: ?>
+						<?php echo $spouse->getFullName();
+}
+?>
 					<?php endif; ?>
 				</td>
 			</tr>
@@ -164,8 +167,11 @@ 
 					<div class="font9">
 						<?php echo $child->getLifeSpan(); ?>
 					</div>
-					<?php else: ?>
-						<?php echo $child->getFullName(); ?>
+					<?php else {
+	: ?>
+						<?php echo $child->getFullName();
+}
+?>
 					<?php endif; ?>
 				</td>
 			</tr>

app/Family.php

Doc Comments +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
 	/**
 	 * Get the male (or first female) partner of the family
 	 *
-	 * @param $access_level int|null
+	 * @param integer $access_level int|null
 	 *
 	 * @return Individual|null
 	 */
@@ -118,7 +118,7 @@ 
 	/**
 	 * Get the female (or second male) partner of the family
 	 *
-	 * @param $access_level int|null
+	 * @param integer $access_level int|null
 	 *
 	 * @return Individual|null
 	 */

app/Individual.php

Doc Comments +1 added lines, -1 removed lines

@@ -388,7 +388,7 @@
 	 *    (b) Level 1 object with the Highlight option missing or set to other than "Y" or "N"
 	 *    (c) Level 2 or higher object with the Highlight option set to "Y"
 	 *
-	 * @return null|Media
+	 * @return GedcomRecord|null
 	 */
 	public function findHighlightedMedia() {
 		$objectA = null;

app/Statement.php

Doc Comments +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
 	 *
 	 * @param int $fetch_style
 	 *
-	 * @return \stdClass|array|null
+	 * @return \stdClass
 	 */
 	public function fetchOneRow($fetch_style = PDO::FETCH_OBJ) {
 		if (!$this->executed) {

app/Mail.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -16,8 +16,8 @@
 namespace Fisharebest\Webtrees;
 
 use Exception;
-use Swift_Mailer;
 use Swift_MailTransport;
+use Swift_Mailer;
 use Swift_Message;
 use Swift_NullTransport;
 use Swift_SmtpTransport;

Indentation +20 added lines, -20 removed lines

@@ -46,15 +46,15 @@ 
 	 */
 	public static function send(Tree $tree, $to_email, $to_name, $replyto_email, $replyto_name, $subject, $message_html, $message_text) {
 		try {
-		    $mail = Swift_Message::newInstance()
-                ->setSubject($subject)
-                ->setFrom(Site::getPreference('SMTP_FROM_NAME'), $tree->getPreference('title'))
-                ->setTo($to_email, $to_name)
-                ->setReplyTo($replyto_email, $replyto_name)
-                ->setBody($message_html, 'text/html')
-                ->addPart($message_text, 'text/plain');
+				$mail = Swift_Message::newInstance()
+								->setSubject($subject)
+								->setFrom(Site::getPreference('SMTP_FROM_NAME'), $tree->getPreference('title'))
+								->setTo($to_email, $to_name)
+								->setReplyTo($replyto_email, $replyto_name)
+								->setBody($message_html, 'text/html')
+								->addPart($message_text, 'text/plain');
 		    
-            Swift_Mailer::newInstance(self::transport())->send($mail);
+						Swift_Mailer::newInstance(self::transport())->send($mail);
 		} catch (Exception $ex) {
 			Log::addErrorLog('Mail: ' . $ex->getMessage());
 
@@ -96,20 +96,20 @@ 
 		case 'internal':
 			return Swift_MailTransport::newInstance();
 		case 'external':
-            $transport = Swift_SmtpTransport::newInstance()
-                ->setHost(Site::getPreference('SMTP_HOST'))
-                ->setPort(Site::getPreference('SMTP_PORT'))
-                ->setLocalDomain(Site::getPreference('SMTP_HELO'));
+						$transport = Swift_SmtpTransport::newInstance()
+								->setHost(Site::getPreference('SMTP_HOST'))
+								->setPort(Site::getPreference('SMTP_PORT'))
+								->setLocalDomain(Site::getPreference('SMTP_HELO'));
             
-            if (Site::getPreference('SMTP_AUTH')) {
-                $transport
-                    ->setUsername(Site::getPreference('SMTP_AUTH_USER'))
-                    ->setPassword(Site::getPreference('SMTP_AUTH_PASS'));
-            }
+						if (Site::getPreference('SMTP_AUTH')) {
+								$transport
+										->setUsername(Site::getPreference('SMTP_AUTH_USER'))
+										->setPassword(Site::getPreference('SMTP_AUTH_PASS'));
+						}
             
-            if (Site::getPreference('SMTP_SSL') !== 'none') {
-                $transport->setEncryption(Site::getPreference('SMTP_SSL'));
-            }
+						if (Site::getPreference('SMTP_SSL') !== 'none') {
+								$transport->setEncryption(Site::getPreference('SMTP_SSL'));
+						}
 			
 			return $transport;
 		default: