fisharebest / webtrees

index_edit.php

Spacing +2 added lines, -2 removed lines

@@ -127,7 +127,7 @@ 
 			}
 		}
 	}
-	if ($user_id < 0 || $gedcom_id < 0 ) {
+	if ($user_id < 0 || $gedcom_id < 0) {
 		header('Location: admin.php');
 	} elseif ($user_id > 0) {
 		header('Location: index.php?ctype=user&ged=' . $WT_TREE->getNameUrl());
@@ -371,7 +371,7 @@ 
 						<?= FontAwesome::decorativeIcon('save') ?>
 						<?= I18N::translate('save') ?>
 					</button>
-					<?php if ($user_id < 0 || $gedcom_id < 0 ): ?>
+					<?php if ($user_id < 0 || $gedcom_id < 0): ?>
 						<a class="btn btn-secondary" href="admin.php">
 					<?php elseif ($user_id > 0): ?>
 						<a class="btn btn-secondary" href="index.php?ctype=user&amp;ged=<?= $WT_TREE->getNameHtml() ?>">

edit_interface.php

Switch Indentation +97 added lines, -97 removed lines

@@ -273,40 +273,40 @@ 
 
 		$level1type = $edit_fact->getTag();
 		switch ($record::RECORD_TYPE) {
-			case 'REPO':
-				// REPO:NAME facts may take a NOTE (but the REPO record may not).
-				if ($level1type === 'NAME') {
-					FunctionsEdit::printAddLayer('NOTE');
-					FunctionsEdit::printAddLayer('SHARED_NOTE');
+		case 'REPO':
+			// REPO:NAME facts may take a NOTE (but the REPO record may not).
+			if ($level1type === 'NAME') {
+				FunctionsEdit::printAddLayer('NOTE');
+				FunctionsEdit::printAddLayer('SHARED_NOTE');
+			}
+			break;
+		case 'FAM':
+		case 'INDI':
+			// FAM and INDI records have real facts. They can take NOTE/SOUR/OBJE/etc.
+			if ($level1type !== 'SEX' && $level1type !== 'NOTE' && $level1type !== 'ALIA') {
+				if ($level1type !== 'SOUR') {
+					FunctionsEdit::printAddLayer('SOUR');
 				}
-				break;
-			case 'FAM':
-			case 'INDI':
-				// FAM and INDI records have real facts. They can take NOTE/SOUR/OBJE/etc.
-				if ($level1type !== 'SEX' && $level1type !== 'NOTE' && $level1type !== 'ALIA') {
-					if ($level1type !== 'SOUR') {
-						FunctionsEdit::printAddLayer('SOUR');
-					}
-					if ($level1type !== 'OBJE') {
-						FunctionsEdit::printAddLayer('OBJE');
-					}
-					FunctionsEdit::printAddLayer('NOTE');
-					FunctionsEdit::printAddLayer('SHARED_NOTE', 2, $level1type);
-					if ($level1type !== 'ASSO' && $level1type !== 'NOTE' && $level1type !== 'SOUR') {
-						FunctionsEdit::printAddLayer('ASSO');
-					}
-					// allow to add godfather and godmother for CHR fact or best man and bridesmaid  for MARR fact in one window
-					if (in_array($level1type, Config::twoAssociates())) {
-						FunctionsEdit::printAddLayer('ASSO2');
-					}
-					if ($level1type !== 'SOUR') {
-						FunctionsEdit::printAddLayer('RESN');
-					}
+				if ($level1type !== 'OBJE') {
+					FunctionsEdit::printAddLayer('OBJE');
 				}
-				break;
-			default:
-				// Other types of record do not have these lower-level records
-				break;
+				FunctionsEdit::printAddLayer('NOTE');
+				FunctionsEdit::printAddLayer('SHARED_NOTE', 2, $level1type);
+				if ($level1type !== 'ASSO' && $level1type !== 'NOTE' && $level1type !== 'SOUR') {
+					FunctionsEdit::printAddLayer('ASSO');
+				}
+				// allow to add godfather and godmother for CHR fact or best man and bridesmaid  for MARR fact in one window
+				if (in_array($level1type, Config::twoAssociates())) {
+					FunctionsEdit::printAddLayer('ASSO2');
+				}
+				if ($level1type !== 'SOUR') {
+					FunctionsEdit::printAddLayer('RESN');
+				}
+			}
+			break;
+		default:
+			// Other types of record do not have these lower-level records
+			break;
 		}
 
 		?>
@@ -2089,15 +2089,15 @@ 
 								<b>
 									<?php
 									switch ($father->getSex()) {
-										case 'M':
-											echo I18N::translate('husband');
-											break;
-										case 'F':
-											echo I18N::translate('wife');
-											break;
-										default:
-											echo I18N::translate('spouse');
-											break;
+									case 'M':
+										echo I18N::translate('husband');
+										break;
+									case 'F':
+										echo I18N::translate('wife');
+										break;
+									default:
+										echo I18N::translate('spouse');
+										break;
 									}
 									?>
 								</b>
@@ -2128,15 +2128,15 @@ 
 								<b>
 									<?php
 									switch ($mother->getSex()) {
-										case 'M':
-											echo I18N::translate('husband');
-											break;
-										case 'F':
-											echo I18N::translate('wife');
-											break;
-										default:
-											echo I18N::translate('spouse');
-											break;
+									case 'M':
+										echo I18N::translate('husband');
+										break;
+									case 'F':
+										echo I18N::translate('wife');
+										break;
+									default:
+										echo I18N::translate('spouse');
+										break;
 									}
 									?>
 								</b>
@@ -2169,15 +2169,15 @@ 
 								<b>
 									<?php
 									switch ($child->getSex()) {
-										case 'M':
-											echo I18N::translate('son');
-											break;
-										case 'F':
-											echo I18N::translate('daughter');
-											break;
-										default:
-											echo I18N::translate('child');
-											break;
+									case 'M':
+										echo I18N::translate('son');
+										break;
+									case 'F':
+										echo I18N::translate('daughter');
+										break;
+									default:
+										echo I18N::translate('child');
+										break;
 									}
 									?>
 								</b>
@@ -2561,35 +2561,35 @@ 
 		}
 
 		switch ($nextaction) {
-			case 'add_child_to_family_action':
-				$name_fields = array_merge($name_fields, $surname_tradition->newChildNames($father_name, $mother_name, $gender));
-				break;
-			case 'add_child_to_individual_action':
-				if ($person->getSex() === 'F') {
-					$name_fields = array_merge($name_fields, $surname_tradition->newChildNames('', $indi_name, $gender));
-				} else {
-					$name_fields = array_merge($name_fields, $surname_tradition->newChildNames($indi_name, '', $gender));
-				}
-				break;
-			case 'add_parent_to_individual_action':
-				$name_fields = array_merge($name_fields, $surname_tradition->newParentNames($indi_name, $gender));
-				break;
-			case 'add_spouse_to_family_action':
-				if ($father) {
-					$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($father_name, $gender));
-				} else {
-					$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($mother_name, $gender));
-				}
-				break;
-			case 'add_spouse_to_individual_action':
-				$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($indi_name, $gender));
-				break;
-			case 'add_unlinked_indi_action':
-			case 'update':
-				if ($surname_tradition->hasSurnames()) {
-					$name_fields['NAME'] = '//';
-				}
-				break;
+		case 'add_child_to_family_action':
+			$name_fields = array_merge($name_fields, $surname_tradition->newChildNames($father_name, $mother_name, $gender));
+			break;
+		case 'add_child_to_individual_action':
+			if ($person->getSex() === 'F') {
+				$name_fields = array_merge($name_fields, $surname_tradition->newChildNames('', $indi_name, $gender));
+			} else {
+				$name_fields = array_merge($name_fields, $surname_tradition->newChildNames($indi_name, '', $gender));
+			}
+			break;
+		case 'add_parent_to_individual_action':
+			$name_fields = array_merge($name_fields, $surname_tradition->newParentNames($indi_name, $gender));
+			break;
+		case 'add_spouse_to_family_action':
+			if ($father) {
+				$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($father_name, $gender));
+			} else {
+				$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($mother_name, $gender));
+			}
+			break;
+		case 'add_spouse_to_individual_action':
+			$name_fields = array_merge($name_fields, $surname_tradition->newSpouseNames($indi_name, $gender));
+			break;
+		case 'add_unlinked_indi_action':
+		case 'update':
+			if ($surname_tradition->hasSurnames()) {
+				$name_fields['NAME'] = '//';
+			}
+			break;
 		}
 	}
 
@@ -2609,15 +2609,15 @@ 
 	echo '<table class="facts_table">';
 
 	switch ($nextaction) {
-		case 'add_child_to_family_action':
-		case 'add_child_to_individual_action':
-			// When adding a new child, specify the pedigree
-			FunctionsEdit::addSimpleTag('0 PEDI');
-			break;
-		case 'update':
-			// When adding/editing a name, specify the type
-			FunctionsEdit::addSimpleTag('0 TYPE ' . $name_type, '', '', null, $person);
-			break;
+	case 'add_child_to_family_action':
+	case 'add_child_to_individual_action':
+		// When adding a new child, specify the pedigree
+		FunctionsEdit::addSimpleTag('0 PEDI');
+		break;
+	case 'update':
+		// When adding/editing a name, specify the type
+		FunctionsEdit::addSimpleTag('0 TYPE ' . $name_type, '', '', null, $person);
+		break;
 	}
 
 	// First - new/existing standard name fields

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
 
 $action = Filter::post('action', null, Filter::get('action'));
 
-$controller  = new PageController;
+$controller = new PageController;
 $controller
 	->restrictAccess(Auth::isEditor($controller->tree()))
 	->addInlineJavascript('var locale_date_format="' . preg_replace('/[^DMY]/', '', str_replace(['j', 'F'], ['D', 'M'], I18N::dateFormat())) . '";');
@@ -339,7 +339,7 @@ 
 	////////////////////////////////////////////////////////////////////////////////
 	case 'add':
 		$xref = Filter::get('xref', WT_REGEX_XREF);
-		$fact    = Filter::get('fact', WT_REGEX_TAG);
+		$fact = Filter::get('fact', WT_REGEX_TAG);
 
 		$record = GedcomRecord::getInstance($xref, $controller->tree());
 		check_record_access($record);
@@ -438,7 +438,7 @@ 
 
 		$newged = '';
 		if (!empty($_POST['NAME'])) {
-			$newged     .= "\n1 NAME " . $_POST['NAME'];
+			$newged .= "\n1 NAME " . $_POST['NAME'];
 			$name_facts = ['TYPE', 'NPFX', 'GIVN', 'NICK', 'SPFX', 'SURN', 'NSFX'];
 			foreach ($name_facts as $name_fact) {
 				if (!empty($_POST[$name_fact])) {
@@ -1192,7 +1192,7 @@ 
 	////////////////////////////////////////////////////////////////////////////////
 	case 'linkspouse':
 		$famtag = Filter::get('famtag', 'HUSB|WIFE');
-		$xref    = Filter::get('xref', WT_REGEX_XREF);
+		$xref = Filter::get('xref', WT_REGEX_XREF);
 
 		$person = Individual::getInstance($xref, $controller->tree());
 		check_record_access($person);
@@ -1440,7 +1440,7 @@ 
 		$TITL = Filter::post('TITL');
 		if ($TITL) {
 			$newgedrec .= "\n1 TITL " . $TITL;
-			$_HEB      = Filter::post('_HEB');
+			$_HEB = Filter::post('_HEB');
 			if ($_HEB) {
 				$newgedrec .= "\n2 _HEB " . $_HEB;
 			}
@@ -1460,7 +1460,7 @@ 
 		$REPO = Filter::post('REPO', WT_REGEX_XREF);
 		if ($REPO) {
 			$newgedrec .= "\n1 REPO @" . $REPO . '@';
-			$CALN      = Filter::post('CALN');
+			$CALN = Filter::post('CALN');
 			if ($CALN) {
 				$newgedrec .= "\n2 CALN " . $CALN;
 			}
@@ -1734,7 +1734,7 @@ 
 		$REPO_NAME = Filter::post('REPO_NAME');
 		if ($REPO_NAME) {
 			$gedrec .= "\n1 NAME " . $REPO_NAME;
-			$_HEB   = Filter::post('_HEB');
+			$_HEB = Filter::post('_HEB');
 			if ($_HEB) {
 				$gedrec .= "\n2 _HEB " . $_HEB;
 			}
@@ -1944,7 +1944,7 @@ 
 	////////////////////////////////////////////////////////////////////////////////
 	case 'reorder_children':
 		$xref = Filter::post('xref', WT_REGEX_XREF, Filter::get('xref', WT_REGEX_XREF));
-		$option  = Filter::post('option');
+		$option = Filter::post('option');
 
 		$family = Family::getInstance($xref, $controller->tree());
 		check_record_access($family);
@@ -2342,7 +2342,7 @@ 
 	////////////////////////////////////////////////////////////////////////////////
 	case 'reorder_fams':
 		$xref = Filter::post('xref', WT_REGEX_XREF, Filter::get('xref', WT_REGEX_XREF));
-		$option  = Filter::post('option');
+		$option = Filter::post('option');
 
 		$person = Individual::getInstance($xref, $controller->tree());
 		check_record_access($person);
@@ -2460,7 +2460,7 @@ 
 			'<div class="form-group row"><label class="col-sm-3 col-form-label" for="keep_chan">' .
 			I18N::translate('Last change') .
 			'</label><div class="col-sm-9">' .
-			Bootstrap4::checkbox(I18N::translate('Keep the existing “last change” information'), true, ['name' => 'keep_chan', 'checked' => (bool)$controller->tree()->getPreference('NO_UPDATE_CHAN')]) .
+			Bootstrap4::checkbox(I18N::translate('Keep the existing “last change” information'), true, ['name' => 'keep_chan', 'checked' => (bool) $controller->tree()->getPreference('NO_UPDATE_CHAN')]) .
 			$details .
 			'</div></div>';
 	} else {

addmedia.php

Unused Use Statements -2 removed lines

@@ -17,9 +17,7 @@
 
 use Fisharebest\Webtrees\Controller\PageController;
 use Fisharebest\Webtrees\Functions\Functions;
-use Fisharebest\Webtrees\Functions\FunctionsDb;
 use Fisharebest\Webtrees\Functions\FunctionsEdit;
-use Fisharebest\Webtrees\Functions\FunctionsImport;
 use Fisharebest\Webtrees\Functions\FunctionsPrint;
 use Fisharebest\Webtrees\Query\QueryMedia;
 

app/Functions/FunctionsPrintFacts.php

Braces +3 added lines, -1 removed lines

@@ -176,7 +176,8 @@ 
 			<div class="editfacts">
 				<?php if ($fact->getTag() === 'FILE' && $fact->getParent() instanceof Media): ?>
 					<?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['class' => 'btn btn-link', 'href' => 'edit_interface.php?action=media-edit&xref=' . $parent->getXref() . '&fact_id=' . $fact->getFactId() . '&ged=' . $parent->getTree()->getNameHtml()]) ?>
-				<?php else: ?>
+				<?php else {
+	: ?>
 					<?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), ['class' => 'btn btn-link', 'href' => 'edit_interface.php?action=edit&xref=' . $parent->getXref() . '&fact_id=' . $fact->getFactId() . '&ged=' . $parent->getTree()->getNameHtml()]) ?>
 					<?= FontAwesome::linkIcon('copy', I18N::translate('Copy'), ['class' => 'btn btn-link', 'href' => '#', 'onclick' => 'return copy_fact("' . $parent->getXref() . '", "' . $fact->getFactId() . '");']) ?>
 					<?= FontAwesome::linkIcon('delete', I18N::translate('Delete'), ['class' => 'btn btn-link', 'href' => '#', 'onclick' => 'return delete_fact("' . I18N::translate('Are you sure you want to delete this fact?') . '", "' . $parent->getXref() . '", "' . $fact->getFactId() . '");']) ?>
@@ -185,6 +186,7 @@ 
 		<?php
 		} else {
 			echo $label;
+}
 		}
 
 		switch ($fact->getTag()) {

action.php

Spacing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
 
 	// Create a media object, and return parameters needed by Select2
 	header('Content-type: application/json');
-	$filename   = 'eek.jpg';
+	$filename = 'eek.jpg';
 	$auto   = Filter::post('auto');
 	$folder = Filter::post('folder');
 	$note   = Filter::post('note');
@@ -142,7 +142,7 @@ 
 		break;
 	}
 
-	$gedcom = "0 @new@ OBJE\n1 FILE " . $folder . $file . "\n2 FORM " .  $format;
+	$gedcom = "0 @new@ OBJE\n1 FILE " . $folder . $file . "\n2 FORM " . $format;
 	if ($type !== '') {
 		$gedcom .= "\n3 TYPE " . $type;
 	}