fisharebest / webtrees

admin_trees_duplicates.php

Indentation +71 added lines, -71 removed lines

@@ -29,119 +29,119 @@
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isManager($WT_TREE))
-	->setPageTitle(I18N::translate('Find duplicates') . ' — ' . $WT_TREE->getTitleHtml())
-	->pageHeader();
+    ->restrictAccess(Auth::isManager($WT_TREE))
+    ->setPageTitle(I18N::translate('Find duplicates') . ' — ' . $WT_TREE->getTitleHtml())
+    ->pageHeader();
 
 $repositories = Database::prepare(
-	"SELECT GROUP_CONCAT(n_id) AS xrefs " .
-	" FROM `##other`" .
-	" JOIN `##name` ON o_id = n_id AND o_file = n_file" .
-	" WHERE o_file = :tree_id AND o_type = 'REPO'" .
-	" GROUP BY n_full" .
-	" HAVING COUNT(n_id) > 1"
+    "SELECT GROUP_CONCAT(n_id) AS xrefs " .
+    " FROM `##other`" .
+    " JOIN `##name` ON o_id = n_id AND o_file = n_file" .
+    " WHERE o_file = :tree_id AND o_type = 'REPO'" .
+    " GROUP BY n_full" .
+    " HAVING COUNT(n_id) > 1"
 )->execute(array(
-	'tree_id' => $WT_TREE->getTreeId(),
+    'tree_id' => $WT_TREE->getTreeId(),
 ))->fetchAll();
 
 $repositories = array_map(
-	function (\stdClass $x) use ($WT_TREE) {
-		$tmp = explode(',', $x->xrefs);
+    function (\stdClass $x) use ($WT_TREE) {
+        $tmp = explode(',', $x->xrefs);
 
-		return array_map(function ($y) use ($WT_TREE) {
-			return Repository::getInstance($y, $WT_TREE);
-		}, $tmp);
-	}, $repositories
+        return array_map(function ($y) use ($WT_TREE) {
+            return Repository::getInstance($y, $WT_TREE);
+        }, $tmp);
+    }, $repositories
 );
 
 $sources = Database::prepare(
-	"SELECT GROUP_CONCAT(n_id) AS xrefs " .
-	" FROM `##sources`" .
-	" JOIN `##name` ON s_id = n_id AND s_file = n_file" .
-	" WHERE s_file = :tree_id" .
-	" GROUP BY n_full" .
-	" HAVING COUNT(n_id) > 1"
+    "SELECT GROUP_CONCAT(n_id) AS xrefs " .
+    " FROM `##sources`" .
+    " JOIN `##name` ON s_id = n_id AND s_file = n_file" .
+    " WHERE s_file = :tree_id" .
+    " GROUP BY n_full" .
+    " HAVING COUNT(n_id) > 1"
 )->execute(array(
-	'tree_id' => $WT_TREE->getTreeId(),
+    'tree_id' => $WT_TREE->getTreeId(),
 ))->fetchAll();
 
 $sources = array_map(
-	function (\stdClass $x) use ($WT_TREE) {
-		$tmp = explode(',', $x->xrefs);
+    function (\stdClass $x) use ($WT_TREE) {
+        $tmp = explode(',', $x->xrefs);
 
-		return array_map(function ($y) use ($WT_TREE) {
-			return Source::getInstance($y, $WT_TREE);
-		}, $tmp);
-	}, $sources
+        return array_map(function ($y) use ($WT_TREE) {
+            return Source::getInstance($y, $WT_TREE);
+        }, $tmp);
+    }, $sources
 );
 
 $individuals = Database::prepare(
-	"SELECT DISTINCT GROUP_CONCAT(d_gid ORDER BY d_gid) AS xrefs" .
-	" FROM `##dates` AS d" .
-	" JOIN `##name` ON d_file = n_file AND d_gid = n_id" .
-	" WHERE d_file = :tree_id AND d_fact IN ('BIRT', 'CHR', 'BAPM', 'DEAT', 'BURI')" .
-	" GROUP BY d_day, d_month, d_year, d_type, d_fact, n_type, n_full" .
-	" HAVING COUNT(DISTINCT d_gid) > 1"
+    "SELECT DISTINCT GROUP_CONCAT(d_gid ORDER BY d_gid) AS xrefs" .
+    " FROM `##dates` AS d" .
+    " JOIN `##name` ON d_file = n_file AND d_gid = n_id" .
+    " WHERE d_file = :tree_id AND d_fact IN ('BIRT', 'CHR', 'BAPM', 'DEAT', 'BURI')" .
+    " GROUP BY d_day, d_month, d_year, d_type, d_fact, n_type, n_full" .
+    " HAVING COUNT(DISTINCT d_gid) > 1"
 )->execute(array(
-	'tree_id' => $WT_TREE->getTreeId(),
+    'tree_id' => $WT_TREE->getTreeId(),
 ))->fetchAll();
 
 $individuals = array_map(
-	function (\stdClass $x) use ($WT_TREE) {
-		$tmp = explode(',', $x->xrefs);
+    function (\stdClass $x) use ($WT_TREE) {
+        $tmp = explode(',', $x->xrefs);
 
-		return array_map(function ($y) use ($WT_TREE) {
-			return Individual::getInstance($y, $WT_TREE);
-		}, $tmp);
-	}, $individuals
+        return array_map(function ($y) use ($WT_TREE) {
+            return Individual::getInstance($y, $WT_TREE);
+        }, $tmp);
+    }, $individuals
 );
 
 $families = Database::prepare(
-	"SELECT GROUP_CONCAT(f_id) AS xrefs " .
-	" FROM `##families`" .
-	" WHERE f_file = :tree_id" .
-	" GROUP BY LEAST(f_husb, f_wife), GREATEST(f_husb, f_wife)" .
-	" HAVING COUNT(f_id) > 1"
+    "SELECT GROUP_CONCAT(f_id) AS xrefs " .
+    " FROM `##families`" .
+    " WHERE f_file = :tree_id" .
+    " GROUP BY LEAST(f_husb, f_wife), GREATEST(f_husb, f_wife)" .
+    " HAVING COUNT(f_id) > 1"
 )->execute(array(
-	'tree_id' => $WT_TREE->getTreeId(),
+    'tree_id' => $WT_TREE->getTreeId(),
 ))->fetchAll();
 
 $families = array_map(
-	function (\stdClass $x) use ($WT_TREE) {
-		$tmp = explode(',', $x->xrefs);
+    function (\stdClass $x) use ($WT_TREE) {
+        $tmp = explode(',', $x->xrefs);
 
-		return array_map(function ($y) use ($WT_TREE) {
-			return Family::getInstance($y, $WT_TREE);
-		}, $tmp);
-	}, $families
+        return array_map(function ($y) use ($WT_TREE) {
+            return Family::getInstance($y, $WT_TREE);
+        }, $tmp);
+    }, $families
 );
 
 $media = Database::prepare(
-	"SELECT GROUP_CONCAT(m_id) AS xrefs " .
-	" FROM `##media`" .
-	" WHERE m_file = :tree_id" .
-	" GROUP BY m_titl" .
-	" HAVING COUNT(m_id) > 1"
+    "SELECT GROUP_CONCAT(m_id) AS xrefs " .
+    " FROM `##media`" .
+    " WHERE m_file = :tree_id" .
+    " GROUP BY m_titl" .
+    " HAVING COUNT(m_id) > 1"
 )->execute(array(
-	'tree_id' => $WT_TREE->getTreeId(),
+    'tree_id' => $WT_TREE->getTreeId(),
 ))->fetchAll();
 
 $media = array_map(
-	function (\stdClass $x) use ($WT_TREE) {
-		$tmp = explode(',', $x->xrefs);
+    function (\stdClass $x) use ($WT_TREE) {
+        $tmp = explode(',', $x->xrefs);
 
-		return array_map(function ($y) use ($WT_TREE) {
-			return Media::getInstance($y, $WT_TREE);
-		}, $tmp);
-	}, $media
+        return array_map(function ($y) use ($WT_TREE) {
+            return Media::getInstance($y, $WT_TREE);
+        }, $tmp);
+    }, $media
 );
 
 $all_duplicates = array(
-	I18N::translate('Repositories')  => $repositories,
-	I18N::translate('Sources')       => $sources,
-	I18N::translate('Individuals')   => $individuals,
-	I18N::translate('Families')      => $families,
-	I18N::translate('Media objects') => $media,
+    I18N::translate('Repositories')  => $repositories,
+    I18N::translate('Sources')       => $sources,
+    I18N::translate('Individuals')   => $individuals,
+    I18N::translate('Families')      => $families,
+    I18N::translate('Media objects') => $media,
 );
 
 ?>

Braces +5 added lines, -2 removed lines

@@ -177,8 +177,11 @@
 	</li>
 <?php endforeach; ?>
 </ul>
-<?php else: ?>
-<p><?php echo I18N::translate('No duplicates have been found.'); ?></p>
+<?php else {
+    : ?>
+<p><?php echo I18N::translate('No duplicates have been found.');
+}
+?></p>
 <?php endif; ?>
 
 <?php endforeach; ?>

addmedia.php

Indentation +533 added lines, -533 removed lines

@@ -49,27 +49,27 @@ 
 
 $controller = new SimpleController;
 $controller
-	->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-	->addInlineJavascript('autocomplete();')
-	->restrictAccess(Auth::isMember($WT_TREE));
+    ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+    ->addInlineJavascript('autocomplete();')
+    ->restrictAccess(Auth::isMember($WT_TREE));
 
 $disp  = true;
 $media = Media::getInstance($pid, $WT_TREE);
 if ($media) {
-	$disp = $media->canShow();
+    $disp = $media->canShow();
 }
 if ($action == 'update' || $action == 'create') {
-	if ($linktoid) {
-		$disp = GedcomRecord::getInstance($linktoid, $WT_TREE)->canShow();
-	}
+    if ($linktoid) {
+        $disp = GedcomRecord::getInstance($linktoid, $WT_TREE)->canShow();
+    }
 }
 
 if (!Auth::isEditor($WT_TREE) || !$disp) {
-	$controller
-		->pageHeader()
-		->addInlineJavascript('closePopupAndReloadParent();');
+    $controller
+        ->pageHeader()
+        ->addInlineJavascript('closePopupAndReloadParent();');
 
-	return;
+    return;
 }
 
 // There is a lot of common code in the create and update cases…
@@ -77,337 +77,337 @@ 
 
 switch ($action) {
 case 'create': // Save the information from the “showcreateform” action
-	$controller->setPageTitle(I18N::translate('Create a media object'));
-
-	// Validate the media folder
-	$folderName = str_replace('\\', '/', $folder);
-	$folderName = trim($folderName, '/');
-	if ($folderName == '.') {
-		$folderName = '';
-	}
-	if ($folderName) {
-		$folderName .= '/';
-		// Not allowed to use “../”
-		if (strpos('/' . $folderName, '/../') !== false) {
-			FlashMessages::addMessage('Folder names are not allowed to include “../”');
-			break;
-		}
-	}
-
-	// Make sure the media folder exists
-	if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-		if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-			FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)));
-		} else {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'danger');
-			break;
-		}
-	}
-
-	// Managers can create new media paths (subfolders). Users must use existing folders.
-	if ($folderName && !is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
-		if (Auth::isManager($WT_TREE)) {
-			if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
-				FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)));
-			} else {
-				FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)), 'danger');
-				break;
-			}
-		} else {
-			// Regular users should not have seen this option - so no need for an error message.
-			break;
-		}
-	}
-
-	// The media folder exists. Now create a thumbnail folder to match it.
-	if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
-		if (!File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)), 'danger');
-			break;
-		}
-	}
-
-	// A thumbnail file with no main image?
-	if (!empty($_FILES['thumbnail']['name']) && empty($_FILES['mediafile']['name'])) {
-		// Assume the user used the wrong field, and treat this as a main image
-		$_FILES['mediafile'] = $_FILES['thumbnail'];
-		unset($_FILES['thumbnail']);
-	}
-
-	// Thumbnail files must contain images.
-	if (!empty($_FILES['thumbnail']['name']) && !preg_match('/^image/', $_FILES['thumbnail']['type'])) {
-		FlashMessages::addMessage(I18N::translate('Thumbnail files must contain images.'));
-		break;
-	}
-
-	// User-specified filename?
-	if ($tag[0] == 'FILE' && $text[0]) {
-		$filename = $text[0];
-	}
-	// Use the name of the uploaded file?
-	// If no filename specified, use the name of the uploaded file?
-	if (!$filename && !empty($_FILES['mediafile']['name'])) {
-		$filename = $_FILES['mediafile']['name'];
-	}
-
-	// Validate the media path and filename
-	if (preg_match('/^https?:\/\//i', $text[0], $match)) {
-		// External media needs no further validation
-		$fileName   = $filename;
-		$folderName = '';
-		unset($_FILES['mediafile'], $_FILES['thumbnail']);
-	} elseif (preg_match('/([\/\\\\<>])/', $filename, $match)) {
-		// Local media files cannot contain certain special characters
-		FlashMessages::addMessage(I18N::translate('Filenames are not allowed to contain the character “%s”.', $match[1]));
-		break;
-	} elseif (preg_match('/(\.(php|pl|cgi|bash|sh|bat|exe|com|htm|html|shtml))$/i', $filename, $match)) {
-		// Do not allow obvious script files.
-		FlashMessages::addMessage(I18N::translate('Filenames are not allowed to have the extension “%s”.', $match[1]));
-		break;
-	} elseif (!$filename) {
-		FlashMessages::addMessage(I18N::translate('No media file was provided.'));
-		break;
-	} else {
-		$fileName = $filename;
-	}
-
-	// Now copy the file to the correct location.
-	if (!empty($_FILES['mediafile']['name'])) {
-		$serverFileName = WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName . $fileName;
-		if (file_exists($serverFileName)) {
-			FlashMessages::addMessage(I18N::translate('The file %s already exists. Use another filename.', $folderName . $fileName));
-			break;
-		}
-		if (move_uploaded_file($_FILES['mediafile']['tmp_name'], $serverFileName)) {
-			Log::addMediaLog('Media file ' . $serverFileName . ' uploaded');
-		} else {
-			FlashMessages::addMessage(
-				I18N::translate('There was an error uploading your file.') .
-				'<br>' .
-				Functions::fileUploadErrorText($_FILES['mediafile']['error'])
-			);
-			break;
-		}
-
-		// Now copy the (optional) thumbnail
-		if (!empty($_FILES['thumbnail']['name']) && preg_match('/^image\/(png|gif|jpeg)/', $_FILES['thumbnail']['type'], $match)) {
-			// Thumbnails have either
-			// (a) the same filename as the main image
-			// (b) the same filename as the main image - but with a .png extension
-			if ($match[1] == 'png' && !preg_match('/\.(png)$/i', $fileName)) {
-				$thumbFile = preg_replace('/\.[a-z0-9]{3,5}$/', '.png', $fileName);
-			} else {
-				$thumbFile = $fileName;
-			}
-			$serverFileName = WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName . $thumbFile;
-			if (move_uploaded_file($_FILES['thumbnail']['tmp_name'], $serverFileName)) {
-				Log::addMediaLog('Thumbnail file ' . $serverFileName . ' uploaded');
-			}
-		}
-	}
-
-	$controller->pageHeader();
-	// Build the gedcom record
-	$newged = "0 @new@ OBJE";
-	if ($tag[0] == 'FILE') {
-		// The admin has an edit field to change the filename
-		$text[0] = $folderName . $fileName;
-	} else {
-		// Users keep the original filename
-		$newged .= "\n1 FILE " . $folderName . $fileName;
-	}
-
-	$newged = FunctionsEdit::handleUpdates($newged);
-
-	$new_media = $WT_TREE->createRecord($newged);
-	if ($linktoid) {
-		$record = GedcomRecord::getInstance($linktoid, $WT_TREE);
-		$record->createFact('1 OBJE @' . $new_media->getXref() . '@', true);
-		Log::addEditLog('Media ID ' . $new_media->getXref() . " successfully added to $linktoid.");
-		$controller->addInlineJavascript('closePopupAndReloadParent();');
-	} else {
-		Log::addEditLog('Media ID ' . $new_media->getXref() . ' successfully added.');
-		$controller->addInlineJavascript('openerpasteid("' . $new_media->getXref() . '");');
-	}
-	echo '<button onclick="closePopupAndReloadParent();">', I18N::translate('close'), '</button>';
-
-	return;
+    $controller->setPageTitle(I18N::translate('Create a media object'));
+
+    // Validate the media folder
+    $folderName = str_replace('\\', '/', $folder);
+    $folderName = trim($folderName, '/');
+    if ($folderName == '.') {
+        $folderName = '';
+    }
+    if ($folderName) {
+        $folderName .= '/';
+        // Not allowed to use “../”
+        if (strpos('/' . $folderName, '/../') !== false) {
+            FlashMessages::addMessage('Folder names are not allowed to include “../”');
+            break;
+        }
+    }
+
+    // Make sure the media folder exists
+    if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+        if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+            FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)));
+        } else {
+            FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'danger');
+            break;
+        }
+    }
+
+    // Managers can create new media paths (subfolders). Users must use existing folders.
+    if ($folderName && !is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
+        if (Auth::isManager($WT_TREE)) {
+            if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
+                FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)));
+            } else {
+                FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)), 'danger');
+                break;
+            }
+        } else {
+            // Regular users should not have seen this option - so no need for an error message.
+            break;
+        }
+    }
+
+    // The media folder exists. Now create a thumbnail folder to match it.
+    if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
+        if (!File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
+            FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)), 'danger');
+            break;
+        }
+    }
+
+    // A thumbnail file with no main image?
+    if (!empty($_FILES['thumbnail']['name']) && empty($_FILES['mediafile']['name'])) {
+        // Assume the user used the wrong field, and treat this as a main image
+        $_FILES['mediafile'] = $_FILES['thumbnail'];
+        unset($_FILES['thumbnail']);
+    }
+
+    // Thumbnail files must contain images.
+    if (!empty($_FILES['thumbnail']['name']) && !preg_match('/^image/', $_FILES['thumbnail']['type'])) {
+        FlashMessages::addMessage(I18N::translate('Thumbnail files must contain images.'));
+        break;
+    }
+
+    // User-specified filename?
+    if ($tag[0] == 'FILE' && $text[0]) {
+        $filename = $text[0];
+    }
+    // Use the name of the uploaded file?
+    // If no filename specified, use the name of the uploaded file?
+    if (!$filename && !empty($_FILES['mediafile']['name'])) {
+        $filename = $_FILES['mediafile']['name'];
+    }
+
+    // Validate the media path and filename
+    if (preg_match('/^https?:\/\//i', $text[0], $match)) {
+        // External media needs no further validation
+        $fileName   = $filename;
+        $folderName = '';
+        unset($_FILES['mediafile'], $_FILES['thumbnail']);
+    } elseif (preg_match('/([\/\\\\<>])/', $filename, $match)) {
+        // Local media files cannot contain certain special characters
+        FlashMessages::addMessage(I18N::translate('Filenames are not allowed to contain the character “%s”.', $match[1]));
+        break;
+    } elseif (preg_match('/(\.(php|pl|cgi|bash|sh|bat|exe|com|htm|html|shtml))$/i', $filename, $match)) {
+        // Do not allow obvious script files.
+        FlashMessages::addMessage(I18N::translate('Filenames are not allowed to have the extension “%s”.', $match[1]));
+        break;
+    } elseif (!$filename) {
+        FlashMessages::addMessage(I18N::translate('No media file was provided.'));
+        break;
+    } else {
+        $fileName = $filename;
+    }
+
+    // Now copy the file to the correct location.
+    if (!empty($_FILES['mediafile']['name'])) {
+        $serverFileName = WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName . $fileName;
+        if (file_exists($serverFileName)) {
+            FlashMessages::addMessage(I18N::translate('The file %s already exists. Use another filename.', $folderName . $fileName));
+            break;
+        }
+        if (move_uploaded_file($_FILES['mediafile']['tmp_name'], $serverFileName)) {
+            Log::addMediaLog('Media file ' . $serverFileName . ' uploaded');
+        } else {
+            FlashMessages::addMessage(
+                I18N::translate('There was an error uploading your file.') .
+                '<br>' .
+                Functions::fileUploadErrorText($_FILES['mediafile']['error'])
+            );
+            break;
+        }
+
+        // Now copy the (optional) thumbnail
+        if (!empty($_FILES['thumbnail']['name']) && preg_match('/^image\/(png|gif|jpeg)/', $_FILES['thumbnail']['type'], $match)) {
+            // Thumbnails have either
+            // (a) the same filename as the main image
+            // (b) the same filename as the main image - but with a .png extension
+            if ($match[1] == 'png' && !preg_match('/\.(png)$/i', $fileName)) {
+                $thumbFile = preg_replace('/\.[a-z0-9]{3,5}$/', '.png', $fileName);
+            } else {
+                $thumbFile = $fileName;
+            }
+            $serverFileName = WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName . $thumbFile;
+            if (move_uploaded_file($_FILES['thumbnail']['tmp_name'], $serverFileName)) {
+                Log::addMediaLog('Thumbnail file ' . $serverFileName . ' uploaded');
+            }
+        }
+    }
+
+    $controller->pageHeader();
+    // Build the gedcom record
+    $newged = "0 @new@ OBJE";
+    if ($tag[0] == 'FILE') {
+        // The admin has an edit field to change the filename
+        $text[0] = $folderName . $fileName;
+    } else {
+        // Users keep the original filename
+        $newged .= "\n1 FILE " . $folderName . $fileName;
+    }
+
+    $newged = FunctionsEdit::handleUpdates($newged);
+
+    $new_media = $WT_TREE->createRecord($newged);
+    if ($linktoid) {
+        $record = GedcomRecord::getInstance($linktoid, $WT_TREE);
+        $record->createFact('1 OBJE @' . $new_media->getXref() . '@', true);
+        Log::addEditLog('Media ID ' . $new_media->getXref() . " successfully added to $linktoid.");
+        $controller->addInlineJavascript('closePopupAndReloadParent();');
+    } else {
+        Log::addEditLog('Media ID ' . $new_media->getXref() . ' successfully added.');
+        $controller->addInlineJavascript('openerpasteid("' . $new_media->getXref() . '");');
+    }
+    echo '<button onclick="closePopupAndReloadParent();">', I18N::translate('close'), '</button>';
+
+    return;
 
 case 'update': // Save the information from the “editmedia” action
-	$controller->setPageTitle(I18N::translate('Edit the media object'));
-
-	// Validate the media folder
-	$folderName = str_replace('\\', '/', $folder);
-	$folderName = trim($folderName, '/');
-	if ($folderName == '.') {
-		$folderName = '';
-	}
-	if ($folderName) {
-		$folderName .= '/';
-		// Not allowed to use “../”
-		if (strpos('/' . $folderName, '/../') !== false) {
-			FlashMessages::addMessage('Folder names are not allowed to include “../”');
-			break;
-		}
-	}
-
-	// Make sure the media folder exists
-	if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-		if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-			FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)));
-		} else {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'danger');
-			break;
-		}
-	}
-
-	// Managers can create new media paths (subfolders). Users must use existing folders.
-	if ($folderName && !is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
-		if (Auth::isManager($WT_TREE)) {
-			if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
-				FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)));
-			} else {
-				FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)), 'danger');
-				break;
-			}
-		} else {
-			// Regular users should not have seen this option - so no need for an error message.
-			break;
-		}
-	}
-
-	// The media folder exists. Now create a thumbnail folder to match it.
-	if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
-		if (!File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)), 'danger');
-			break;
-		}
-	}
-
-	// Validate the media path and filename
-	if (preg_match('/^https?:\/\//i', $filename, $match)) {
-		// External media needs no further validation
-		$fileName   = $filename;
-		$folderName = '';
-		unset($_FILES['mediafile'], $_FILES['thumbnail']);
-	} elseif (preg_match('/([\/\\\\<>])/', $filename, $match)) {
-		// Local media files cannot contain certain special characters
-		FlashMessages::addMessage(I18N::translate('Filenames are not allowed to contain the character “%s”.', $match[1]));
-		break;
-	} elseif (preg_match('/(\.(php|pl|cgi|bash|sh|bat|exe|com|htm|html|shtml))$/i', $filename, $match)) {
-		// Do not allow obvious script files.
-		FlashMessages::addMessage(I18N::translate('Filenames are not allowed to have the extension “%s”.', $match[1]));
-		break;
-	} elseif (!$filename) {
-		FlashMessages::addMessage(I18N::translate('No media file was provided.'));
-		break;
-	} else {
-		$fileName = $filename;
-	}
-
-	$oldFilename = $media->getFilename();
-	$newFilename = $folderName . $fileName;
-
-	// Cannot rename local to external or vice-versa
-	if (Functions::isFileExternal($oldFilename) != Functions::isFileExternal($filename)) {
-		FlashMessages::addMessage(I18N::translate('The media file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
-		break;
-	}
-
-	$messages  = false;
-	$move_file = false;
-
-	// Move files on disk (if we can) to reflect the change to the GEDCOM data
-	if (!$media->isExternal()) {
-		$oldServerFile  = $media->getServerFilename('main');
-		$oldServerThumb = $media->getServerFilename('thumb');
-
-		$newmedia       = new Media("xxx", "0 @xxx@ OBJE\n1 FILE " . $newFilename, null, $WT_TREE);
-		$newServerFile  = $newmedia->getServerFilename('main');
-		$newServerThumb = $newmedia->getServerFilename('thumb');
-
-		// We could be either renaming an existing file, or updating a record (with no valid file) to point to a new file
-		if ($oldServerFile !== $newServerFile) {
-			//-- check if the file is used in more than one gedcom
-			//-- do not allow it to be moved or renamed if it is
-			if (!$media->isExternal() && FunctionsDb::isMediaUsedInOtherTree($media->getFilename(), $WT_TREE->getTreeId())) {
-				FlashMessages::addMessage(I18N::translate('This file is linked to another family tree on this server. It cannot be deleted, moved, or renamed until these links have been removed.'));
-				break;
-			}
-
-			$move_file = true;
-			if (!file_exists($newServerFile) || md5_file($oldServerFile) === md5_file($newServerFile)) {
-				try {
-					rename($oldServerFile, $newServerFile);
-					FlashMessages::addMessage(I18N::translate('The media file %1$s has been renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
-				} catch (\ErrorException $ex) {
-					FlashMessages::addMessage(I18N::translate('The media file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
-				}
-				$messages = true;
-			}
-			if (!file_exists($newServerFile)) {
-				FlashMessages::addMessage(I18N::translate('The media file %s does not exist.', Html::filename($newFilename)));
-				$messages = true;
-			}
-		}
-		if ($oldServerThumb != $newServerThumb) {
-			$move_file = true;
-			if (!file_exists($newServerThumb) || md5_file($oldServerFile) == md5_file($newServerThumb)) {
-				try {
-					rename($oldServerThumb, $newServerThumb);
-					FlashMessages::addMessage(I18N::translate('The thumbnail file %1$s has been renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
-				} catch (\ErrorException $ex) {
-					FlashMessages::addMessage(I18N::translate('The thumbnail file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
-				}
-				$messages = true;
-			}
-			if (!file_exists($newServerThumb)) {
-				FlashMessages::addMessage(I18N::translate('The thumbnail file %s does not exist.', Html::filename($newFilename)));
-				$messages = true;
-			}
-		}
-	}
-
-	// Insert the 1 FILE xxx record into the arrays used by function FunctionsEdit::handle_updatesges()
-	$glevels = array_merge(array('1'), $glevels);
-	$tag     = array_merge(array('FILE'), $tag);
-	$islink  = array_merge(array(0), $islink);
-	$text    = array_merge(array($newFilename), $text);
-
-	$record = GedcomRecord::getInstance($pid, $WT_TREE);
-	$newrec = "0 @$pid@ OBJE\n";
-	$newrec = FunctionsEdit::handleUpdates($newrec);
-	$record->updateRecord($newrec, $update_CHAN);
-
-	if ($move_file) {
-		// We've moved a file. Therefore we must approve the change, as rejecting
-		// the change will create broken references.
-		FunctionsImport::acceptAllChanges($record->getXref(), $record->getTree()->getTreeId());
-	}
-
-	if ($pid && $linktoid) {
-		$record = GedcomRecord::getInstance($linktoid, $WT_TREE);
-		$record->createFact('1 OBJE @' . $pid . '@', true);
-		Log::addEditLog('Media ID ' . $pid . " successfully added to $linktoid.");
-	}
-	$controller->pageHeader();
-	if ($messages) {
-		echo '<button onclick="closePopupAndReloadParent();">', I18N::translate('close'), '</button>';
-	} else {
-		$controller->addInlineJavascript('closePopupAndReloadParent();');
-	}
-
-	return;
+    $controller->setPageTitle(I18N::translate('Edit the media object'));
+
+    // Validate the media folder
+    $folderName = str_replace('\\', '/', $folder);
+    $folderName = trim($folderName, '/');
+    if ($folderName == '.') {
+        $folderName = '';
+    }
+    if ($folderName) {
+        $folderName .= '/';
+        // Not allowed to use “../”
+        if (strpos('/' . $folderName, '/../') !== false) {
+            FlashMessages::addMessage('Folder names are not allowed to include “../”');
+            break;
+        }
+    }
+
+    // Make sure the media folder exists
+    if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+        if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+            FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)));
+        } else {
+            FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'danger');
+            break;
+        }
+    }
+
+    // Managers can create new media paths (subfolders). Users must use existing folders.
+    if ($folderName && !is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
+        if (Auth::isManager($WT_TREE)) {
+            if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
+                FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)));
+            } else {
+                FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)), 'danger');
+                break;
+            }
+        } else {
+            // Regular users should not have seen this option - so no need for an error message.
+            break;
+        }
+    }
+
+    // The media folder exists. Now create a thumbnail folder to match it.
+    if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
+        if (!File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
+            FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)), 'danger');
+            break;
+        }
+    }
+
+    // Validate the media path and filename
+    if (preg_match('/^https?:\/\//i', $filename, $match)) {
+        // External media needs no further validation
+        $fileName   = $filename;
+        $folderName = '';
+        unset($_FILES['mediafile'], $_FILES['thumbnail']);
+    } elseif (preg_match('/([\/\\\\<>])/', $filename, $match)) {
+        // Local media files cannot contain certain special characters
+        FlashMessages::addMessage(I18N::translate('Filenames are not allowed to contain the character “%s”.', $match[1]));
+        break;
+    } elseif (preg_match('/(\.(php|pl|cgi|bash|sh|bat|exe|com|htm|html|shtml))$/i', $filename, $match)) {
+        // Do not allow obvious script files.
+        FlashMessages::addMessage(I18N::translate('Filenames are not allowed to have the extension “%s”.', $match[1]));
+        break;
+    } elseif (!$filename) {
+        FlashMessages::addMessage(I18N::translate('No media file was provided.'));
+        break;
+    } else {
+        $fileName = $filename;
+    }
+
+    $oldFilename = $media->getFilename();
+    $newFilename = $folderName . $fileName;
+
+    // Cannot rename local to external or vice-versa
+    if (Functions::isFileExternal($oldFilename) != Functions::isFileExternal($filename)) {
+        FlashMessages::addMessage(I18N::translate('The media file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+        break;
+    }
+
+    $messages  = false;
+    $move_file = false;
+
+    // Move files on disk (if we can) to reflect the change to the GEDCOM data
+    if (!$media->isExternal()) {
+        $oldServerFile  = $media->getServerFilename('main');
+        $oldServerThumb = $media->getServerFilename('thumb');
+
+        $newmedia       = new Media("xxx", "0 @xxx@ OBJE\n1 FILE " . $newFilename, null, $WT_TREE);
+        $newServerFile  = $newmedia->getServerFilename('main');
+        $newServerThumb = $newmedia->getServerFilename('thumb');
+
+        // We could be either renaming an existing file, or updating a record (with no valid file) to point to a new file
+        if ($oldServerFile !== $newServerFile) {
+            //-- check if the file is used in more than one gedcom
+            //-- do not allow it to be moved or renamed if it is
+            if (!$media->isExternal() && FunctionsDb::isMediaUsedInOtherTree($media->getFilename(), $WT_TREE->getTreeId())) {
+                FlashMessages::addMessage(I18N::translate('This file is linked to another family tree on this server. It cannot be deleted, moved, or renamed until these links have been removed.'));
+                break;
+            }
+
+            $move_file = true;
+            if (!file_exists($newServerFile) || md5_file($oldServerFile) === md5_file($newServerFile)) {
+                try {
+                    rename($oldServerFile, $newServerFile);
+                    FlashMessages::addMessage(I18N::translate('The media file %1$s has been renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+                } catch (\ErrorException $ex) {
+                    FlashMessages::addMessage(I18N::translate('The media file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+                }
+                $messages = true;
+            }
+            if (!file_exists($newServerFile)) {
+                FlashMessages::addMessage(I18N::translate('The media file %s does not exist.', Html::filename($newFilename)));
+                $messages = true;
+            }
+        }
+        if ($oldServerThumb != $newServerThumb) {
+            $move_file = true;
+            if (!file_exists($newServerThumb) || md5_file($oldServerFile) == md5_file($newServerThumb)) {
+                try {
+                    rename($oldServerThumb, $newServerThumb);
+                    FlashMessages::addMessage(I18N::translate('The thumbnail file %1$s has been renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+                } catch (\ErrorException $ex) {
+                    FlashMessages::addMessage(I18N::translate('The thumbnail file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+                }
+                $messages = true;
+            }
+            if (!file_exists($newServerThumb)) {
+                FlashMessages::addMessage(I18N::translate('The thumbnail file %s does not exist.', Html::filename($newFilename)));
+                $messages = true;
+            }
+        }
+    }
+
+    // Insert the 1 FILE xxx record into the arrays used by function FunctionsEdit::handle_updatesges()
+    $glevels = array_merge(array('1'), $glevels);
+    $tag     = array_merge(array('FILE'), $tag);
+    $islink  = array_merge(array(0), $islink);
+    $text    = array_merge(array($newFilename), $text);
+
+    $record = GedcomRecord::getInstance($pid, $WT_TREE);
+    $newrec = "0 @$pid@ OBJE\n";
+    $newrec = FunctionsEdit::handleUpdates($newrec);
+    $record->updateRecord($newrec, $update_CHAN);
+
+    if ($move_file) {
+        // We've moved a file. Therefore we must approve the change, as rejecting
+        // the change will create broken references.
+        FunctionsImport::acceptAllChanges($record->getXref(), $record->getTree()->getTreeId());
+    }
+
+    if ($pid && $linktoid) {
+        $record = GedcomRecord::getInstance($linktoid, $WT_TREE);
+        $record->createFact('1 OBJE @' . $pid . '@', true);
+        Log::addEditLog('Media ID ' . $pid . " successfully added to $linktoid.");
+    }
+    $controller->pageHeader();
+    if ($messages) {
+        echo '<button onclick="closePopupAndReloadParent();">', I18N::translate('close'), '</button>';
+    } else {
+        $controller->addInlineJavascript('closePopupAndReloadParent();');
+    }
+
+    return;
 case 'showmediaform':
-	$controller->setPageTitle(I18N::translate('Create a media object'));
-	$action = 'create';
-	break;
+    $controller->setPageTitle(I18N::translate('Create a media object'));
+    $action = 'create';
+    break;
 case 'editmedia':
-	$controller->setPageTitle(I18N::translate('Edit the media object'));
-	$action = 'update';
-	break;
+    $controller->setPageTitle(I18N::translate('Edit the media object'));
+    $action = 'update';
+    break;
 default:
-	throw new \Exception('Bad $action (' . $action . ') in addmedia.php');
+    throw new \Exception('Bad $action (' . $action . ') in addmedia.php');
 }
 
 $controller->pageHeader();
@@ -418,140 +418,140 @@ 
 echo '<input type="hidden" name="ged" value="', $WT_TREE->getNameHtml(), '">';
 echo '<input type="hidden" name="pid" value="', $pid, '">';
 if ($linktoid) {
-	echo '<input type="hidden" name="linktoid" value="', $linktoid, '">';
+    echo '<input type="hidden" name="linktoid" value="', $linktoid, '">';
 }
 echo '<table class="facts_table">';
 echo '<tr><td class="topbottombar" colspan="2">';
 echo $controller->getPageTitle(), FunctionsPrint::helpLink('OBJE');
 echo '</td></tr>';
 if (!$linktoid && $action == 'create') {
-	echo '<tr><td class="descriptionbox wrap width25">';
-	echo I18N::translate('Enter an individual, family, or source ID');
-	echo '</td><td class="optionbox wrap"><input type="text" data-autocomplete-type="IFS" name="linktoid" id="linktoid" size="6" value="">';
-	echo ' ', FunctionsPrint::printFindIndividualLink('linktoid');
-	echo ' ', FunctionsPrint::printFindFamilyLink('linktoid');
-	echo ' ', FunctionsPrint::printFindSourceLink('linktoid');
-	echo '<p class="small text-muted">', I18N::translate('Enter or search for the ID of the individual, family, or source to which this media object should be linked.'), '</p></td></tr>';
+    echo '<tr><td class="descriptionbox wrap width25">';
+    echo I18N::translate('Enter an individual, family, or source ID');
+    echo '</td><td class="optionbox wrap"><input type="text" data-autocomplete-type="IFS" name="linktoid" id="linktoid" size="6" value="">';
+    echo ' ', FunctionsPrint::printFindIndividualLink('linktoid');
+    echo ' ', FunctionsPrint::printFindFamilyLink('linktoid');
+    echo ' ', FunctionsPrint::printFindSourceLink('linktoid');
+    echo '<p class="small text-muted">', I18N::translate('Enter or search for the ID of the individual, family, or source to which this media object should be linked.'), '</p></td></tr>';
 }
 
 if ($media) {
-	$gedrec = $media->getGedcom();
+    $gedrec = $media->getGedcom();
 } else {
-	$gedrec = '';
+    $gedrec = '';
 }
 
 // 1 FILE
 if (preg_match('/\n\d (FILE.*)/', $gedrec, $match)) {
-	$gedfile = $match[1];
+    $gedfile = $match[1];
 } elseif ($filename) {
-	$gedfile = 'FILE ' . $filename;
+    $gedfile = 'FILE ' . $filename;
 } else {
-	$gedfile = 'FILE';
+    $gedfile = 'FILE';
 }
 
 if ($gedfile == 'FILE') {
-	// Box for user to choose to upload file from local computer
-	echo '<tr><td class="descriptionbox wrap width25">';
-	echo I18N::translate('Media file to upload') . '</td><td class="optionbox wrap"><input type="file" name="mediafile" onchange="updateFormat(this.value);" size="40"></td></tr>';
-	// Check for thumbnail generation support
-	if (Auth::isManager($WT_TREE)) {
-		echo '<tr><td class="descriptionbox wrap width25">';
-		echo I18N::translate('Thumbnail to upload') . '</td><td class="optionbox wrap"><input type="file" name="thumbnail" size="40">';
-		echo '<p class="small text-muted">', I18N::translate('Choose the thumbnail image that you want to upload. Although thumbnails can be generated automatically for images, you may wish to generate your own thumbnail, especially for other media types. For example, you can provide a still image from a video, or a photograph of the individual who made an audio recording.'), '</p>';
-		echo '</td></tr>';
-	}
+    // Box for user to choose to upload file from local computer
+    echo '<tr><td class="descriptionbox wrap width25">';
+    echo I18N::translate('Media file to upload') . '</td><td class="optionbox wrap"><input type="file" name="mediafile" onchange="updateFormat(this.value);" size="40"></td></tr>';
+    // Check for thumbnail generation support
+    if (Auth::isManager($WT_TREE)) {
+        echo '<tr><td class="descriptionbox wrap width25">';
+        echo I18N::translate('Thumbnail to upload') . '</td><td class="optionbox wrap"><input type="file" name="thumbnail" size="40">';
+        echo '<p class="small text-muted">', I18N::translate('Choose the thumbnail image that you want to upload. Although thumbnails can be generated automatically for images, you may wish to generate your own thumbnail, especially for other media types. For example, you can provide a still image from a video, or a photograph of the individual who made an audio recording.'), '</p>';
+        echo '</td></tr>';
+    }
 }
 
 // Filename on server
 $isExternal = Functions::isFileExternal($gedfile);
 if ($gedfile == 'FILE') {
-	if (Auth::isManager($WT_TREE)) {
-		FunctionsEdit::addSimpleTag(
-			"1 $gedfile",
-			'',
-			I18N::translate('Filename on server'),
-			'<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 = '';
+    if (Auth::isManager($WT_TREE)) {
+        FunctionsEdit::addSimpleTag(
+            "1 $gedfile",
+            '',
+            I18N::translate('Filename on server'),
+            '<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 = '';
 } else {
-	if ($isExternal) {
-		$fileName = substr($gedfile, 5);
-		$folder   = '';
-	} else {
-		$tmp      = substr($gedfile, 5);
-		$fileName = basename($tmp);
-		$folder   = dirname($tmp);
-		if ($folder === '.') {
-			$folder = '';
-		}
-	}
-
-	echo '<tr>';
-	echo '<td class="descriptionbox wrap width25">';
-	echo I18N::translate('Filename on server');
-	echo '</td>';
-	echo '<td class="optionbox wrap wrap">';
-	if (Auth::isManager($WT_TREE)) {
-		echo '<input name="filename" type="text" value="' . Filter::escapeHtml($fileName) . '" size="40"';
-		if ($isExternal) {
-			echo '>';
-		} else {
-			echo '><p class="small text-muted">' . I18N::translate('Do not change to keep original filename.') . '</p>';
-		}
-	} else {
-		echo $fileName;
-		echo '<input name="filename" type="hidden" value="' . Filter::escapeHtml($fileName) . '" size="40">';
-	}
-	echo '</td>';
-	echo '</tr>';
+    if ($isExternal) {
+        $fileName = substr($gedfile, 5);
+        $folder   = '';
+    } else {
+        $tmp      = substr($gedfile, 5);
+        $fileName = basename($tmp);
+        $folder   = dirname($tmp);
+        if ($folder === '.') {
+            $folder = '';
+        }
+    }
+
+    echo '<tr>';
+    echo '<td class="descriptionbox wrap width25">';
+    echo I18N::translate('Filename on server');
+    echo '</td>';
+    echo '<td class="optionbox wrap wrap">';
+    if (Auth::isManager($WT_TREE)) {
+        echo '<input name="filename" type="text" value="' . Filter::escapeHtml($fileName) . '" size="40"';
+        if ($isExternal) {
+            echo '>';
+        } else {
+            echo '><p class="small text-muted">' . I18N::translate('Do not change to keep original filename.') . '</p>';
+        }
+    } else {
+        echo $fileName;
+        echo '<input name="filename" type="hidden" value="' . Filter::escapeHtml($fileName) . '" size="40">';
+    }
+    echo '</td>';
+    echo '</tr>';
 }
 
 // Box for user to choose the folder to store the image
 if (!$isExternal) {
-	echo '<tr><td class="descriptionbox wrap width25">';
-	echo I18N::translate('Folder name on server'), '</td><td class="optionbox wrap">';
-	//-- don’t let regular users change the location of media items
-	if ($action !== 'update' || Auth::isManager($WT_TREE)) {
-		$mediaFolders = QueryMedia::folderList();
-		echo '<select name="folder_list" onchange="document.newmedia.folder.value=this.options[this.selectedIndex].value;">';
-		echo '<option ';
-		if ($folder == '') {
-			echo 'selected';
-		}
-		echo ' value=""> ', I18N::translate('Choose: '), ' </option>';
-		if (Auth::isAdmin()) {
-			echo '<option value="other" disabled>', I18N::translate('Other folder… please type in'), "</option>";
-		}
-		foreach ($mediaFolders as $f) {
-			echo '<option value="', $f, '" ';
-			if ($folder == $f) {
-				echo 'selected';
-			}
-			echo '>', $f, "</option>";
-		}
-		echo '</select>';
-	} else {
-		echo $folder;
-	}
-	if (Auth::isAdmin()) {
-		echo '<br><input type="text" name="folder" size="40" value="', $folder, '">';
-		if ($gedfile === 'FILE') {
-			echo '<p class="small text-muted">', I18N::translate('This entry is ignored if you have entered a URL into the filename field.'), '</p>';
-		}
-	} else {
-		echo '<input name="folder" type="hidden" value="', Filter::escapeHtml($folder), '">';
-	}
-	echo '<p class="small text-muted">', I18N::translate('If you have a large number of media files, you can organize them into folders and subfolders.'), '</p>'; echo '</td></tr>';
+    echo '<tr><td class="descriptionbox wrap width25">';
+    echo I18N::translate('Folder name on server'), '</td><td class="optionbox wrap">';
+    //-- don’t let regular users change the location of media items
+    if ($action !== 'update' || Auth::isManager($WT_TREE)) {
+        $mediaFolders = QueryMedia::folderList();
+        echo '<select name="folder_list" onchange="document.newmedia.folder.value=this.options[this.selectedIndex].value;">';
+        echo '<option ';
+        if ($folder == '') {
+            echo 'selected';
+        }
+        echo ' value=""> ', I18N::translate('Choose: '), ' </option>';
+        if (Auth::isAdmin()) {
+            echo '<option value="other" disabled>', I18N::translate('Other folder… please type in'), "</option>";
+        }
+        foreach ($mediaFolders as $f) {
+            echo '<option value="', $f, '" ';
+            if ($folder == $f) {
+                echo 'selected';
+            }
+            echo '>', $f, "</option>";
+        }
+        echo '</select>';
+    } else {
+        echo $folder;
+    }
+    if (Auth::isAdmin()) {
+        echo '<br><input type="text" name="folder" size="40" value="', $folder, '">';
+        if ($gedfile === 'FILE') {
+            echo '<p class="small text-muted">', I18N::translate('This entry is ignored if you have entered a URL into the filename field.'), '</p>';
+        }
+    } else {
+        echo '<input name="folder" type="hidden" value="', Filter::escapeHtml($folder), '">';
+    }
+    echo '<p class="small text-muted">', I18N::translate('If you have a large number of media files, you can organize them into folders and subfolders.'), '</p>'; echo '</td></tr>';
 } else {
-	echo '<input name="folder" type="hidden" value="">';
+    echo '<input name="folder" type="hidden" value="">';
 }
 
 // 1 FILE / 2 FORM
 if (preg_match('/\n(2 FORM .*)/', $gedrec, $match)) {
-	$gedform = $match[1];
+    $gedform = $match[1];
 } else {
-	$gedform = '2 FORM';
+    $gedform = '2 FORM';
 }
 $formid = FunctionsEdit::addSimpleTag($gedform);
 
@@ -573,45 +573,45 @@ 
 
 // 1 FILE / 2 FORM / 3 TYPE
 if (preg_match('/\n(3 TYPE .*)/', $gedrec, $match)) {
-	$gedtype = $match[1];
+    $gedtype = $match[1];
 } else {
-	$gedtype = '3 TYPE photo'; // default to ‘Photo’
+    $gedtype = '3 TYPE photo'; // default to ‘Photo’
 }
 FunctionsEdit::addSimpleTag($gedtype);
 
 // 1 FILE / 2 TITL
 if (preg_match('/\n(2 TITL .*)/', $gedrec, $match)) {
-	$gedtitl = $match[1];
+    $gedtitl = $match[1];
 } else {
-	$gedtitl = '2 TITL';
+    $gedtitl = '2 TITL';
 }
 FunctionsEdit::addSimpleTag($gedtitl);
 
 // 1 FILE / 2 TITL / 3 _HEB
 if (strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), '_HEB') !== false) {
-	if (preg_match('/\n(3 _HEB .*)/', $gedrec, $match)) {
-		$gedtitl = $match[1];
-	} else {
-		$gedtitl = '3 _HEB';
-	}
-	FunctionsEdit::addSimpleTag($gedtitl);
+    if (preg_match('/\n(3 _HEB .*)/', $gedrec, $match)) {
+        $gedtitl = $match[1];
+    } else {
+        $gedtitl = '3 _HEB';
+    }
+    FunctionsEdit::addSimpleTag($gedtitl);
 }
 
 // 1 FILE / 2 TITL / 3 ROMN
 if (strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), 'ROMN') !== false) {
-	if (preg_match('/\n(3 ROMN .*)/', $gedrec, $match)) {
-		$gedtitl = $match[1];
-	} else {
-		$gedtitl = '3 ROMN';
-	}
-	FunctionsEdit::addSimpleTag($gedtitl);
+    if (preg_match('/\n(3 ROMN .*)/', $gedrec, $match)) {
+        $gedtitl = $match[1];
+    } else {
+        $gedtitl = '3 ROMN';
+    }
+    FunctionsEdit::addSimpleTag($gedtitl);
 }
 
 // 1 _PRIM
 if (preg_match('/\n(1 _PRIM .*)/', $gedrec, $match)) {
-	$gedprim = $match[1];
+    $gedprim = $match[1];
 } else {
-	$gedprim = '1 _PRIM';
+    $gedprim = '1 _PRIM';
 }
 FunctionsEdit::addSimpleTag($gedprim);
 
@@ -623,87 +623,87 @@ 
 $sourceDATE  = '';
 $sourceQUAY  = '';
 if (!empty($gedrec)) {
-	preg_match_all('/\n(1 (?!FILE|FORM|TYPE|TITL|_PRIM|_THUM|CHAN|DATA).*(\n[2-9] .*)*)/', $gedrec, $matches);
-	foreach ($matches[1] as $subrec) {
-		$pieces = explode("\n", $subrec);
-		foreach ($pieces as $piece) {
-			$ft = preg_match("/(\d) (\w+)(.*)/", $piece, $match);
-			if ($ft == 0) {
-				continue;
-			}
-			$subLevel = $match[1];
-			$fact     = trim($match[2]);
-			$event    = trim($match[3]);
-			if ($fact === 'NOTE' || $fact === 'TEXT') {
-				$event .= Functions::getCont($subLevel + 1, $subrec);
-			}
-			if ($sourceSOUR !== '' && $subLevel <= $sourceLevel) {
-				// Get rid of all saved Source data
-				FunctionsEdit::addSimpleTag($sourceLevel . ' SOUR ' . $sourceSOUR);
-				FunctionsEdit::addSimpleTag(($sourceLevel + 1) . ' PAGE ' . $sourcePAGE);
-				FunctionsEdit::addSimpleTag(($sourceLevel + 2) . ' TEXT ' . $sourceTEXT);
-				FunctionsEdit::addSimpleTag(($sourceLevel + 2) . ' DATE ' . $sourceDATE, '', GedcomTag::getLabel('DATA:DATE'));
-				FunctionsEdit::addSimpleTag(($sourceLevel + 1) . ' QUAY ' . $sourceQUAY);
-				$sourceSOUR = '';
-			}
-
-			if ($fact === 'SOUR') {
-				$sourceLevel = $subLevel;
-				$sourceSOUR  = $event;
-				$sourcePAGE  = '';
-				$sourceTEXT  = '';
-				$sourceDATE  = '';
-				$sourceQUAY  = '';
-				continue;
-			}
-
-			// Save all incoming data about this source reference
-			if ($sourceSOUR !== '') {
-				if ($fact === 'PAGE') {
-					$sourcePAGE = $event;
-					continue;
-				}
-				if ($fact === 'TEXT') {
-					$sourceTEXT = $event;
-					continue;
-				}
-				if ($fact === 'DATE') {
-					$sourceDATE = $event;
-					continue;
-				}
-				if ($fact === 'QUAY') {
-					$sourceQUAY = $event;
-					continue;
-				}
-				continue;
-			}
-
-			// Output anything that isn’t part of a source reference
-			if (!empty($fact) && $fact !== 'CONC' && $fact !== 'CONT' && $fact !== 'DATA') {
-				FunctionsEdit::addSimpleTag($subLevel . ' ' . $fact . ' ' . $event);
-			}
-		}
-	}
-
-	if ($sourceSOUR !== '') {
-		// Get rid of all saved Source data
-		FunctionsEdit::addSimpleTag($sourceLevel . ' SOUR ' . $sourceSOUR);
-		FunctionsEdit::addSimpleTag(($sourceLevel + 1) . ' PAGE ' . $sourcePAGE);
-		FunctionsEdit::addSimpleTag(($sourceLevel + 2) . ' TEXT ' . $sourceTEXT);
-		FunctionsEdit::addSimpleTag(($sourceLevel + 2) . ' DATE ' . $sourceDATE, '', GedcomTag::getLabel('DATA:DATE'));
-		FunctionsEdit::addSimpleTag(($sourceLevel + 1) . ' QUAY ' . $sourceQUAY);
-	}
+    preg_match_all('/\n(1 (?!FILE|FORM|TYPE|TITL|_PRIM|_THUM|CHAN|DATA).*(\n[2-9] .*)*)/', $gedrec, $matches);
+    foreach ($matches[1] as $subrec) {
+        $pieces = explode("\n", $subrec);
+        foreach ($pieces as $piece) {
+            $ft = preg_match("/(\d) (\w+)(.*)/", $piece, $match);
+            if ($ft == 0) {
+                continue;
+            }
+            $subLevel = $match[1];
+            $fact     = trim($match[2]);
+            $event    = trim($match[3]);
+            if ($fact === 'NOTE' || $fact === 'TEXT') {
+                $event .= Functions::getCont($subLevel + 1, $subrec);
+            }
+            if ($sourceSOUR !== '' && $subLevel <= $sourceLevel) {
+                // Get rid of all saved Source data
+                FunctionsEdit::addSimpleTag($sourceLevel . ' SOUR ' . $sourceSOUR);
+                FunctionsEdit::addSimpleTag(($sourceLevel + 1) . ' PAGE ' . $sourcePAGE);
+                FunctionsEdit::addSimpleTag(($sourceLevel + 2) . ' TEXT ' . $sourceTEXT);
+                FunctionsEdit::addSimpleTag(($sourceLevel + 2) . ' DATE ' . $sourceDATE, '', GedcomTag::getLabel('DATA:DATE'));
+                FunctionsEdit::addSimpleTag(($sourceLevel + 1) . ' QUAY ' . $sourceQUAY);
+                $sourceSOUR = '';
+            }
+
+            if ($fact === 'SOUR') {
+                $sourceLevel = $subLevel;
+                $sourceSOUR  = $event;
+                $sourcePAGE  = '';
+                $sourceTEXT  = '';
+                $sourceDATE  = '';
+                $sourceQUAY  = '';
+                continue;
+            }
+
+            // Save all incoming data about this source reference
+            if ($sourceSOUR !== '') {
+                if ($fact === 'PAGE') {
+                    $sourcePAGE = $event;
+                    continue;
+                }
+                if ($fact === 'TEXT') {
+                    $sourceTEXT = $event;
+                    continue;
+                }
+                if ($fact === 'DATE') {
+                    $sourceDATE = $event;
+                    continue;
+                }
+                if ($fact === 'QUAY') {
+                    $sourceQUAY = $event;
+                    continue;
+                }
+                continue;
+            }
+
+            // Output anything that isn’t part of a source reference
+            if (!empty($fact) && $fact !== 'CONC' && $fact !== 'CONT' && $fact !== 'DATA') {
+                FunctionsEdit::addSimpleTag($subLevel . ' ' . $fact . ' ' . $event);
+            }
+        }
+    }
+
+    if ($sourceSOUR !== '') {
+        // Get rid of all saved Source data
+        FunctionsEdit::addSimpleTag($sourceLevel . ' SOUR ' . $sourceSOUR);
+        FunctionsEdit::addSimpleTag(($sourceLevel + 1) . ' PAGE ' . $sourcePAGE);
+        FunctionsEdit::addSimpleTag(($sourceLevel + 2) . ' TEXT ' . $sourceTEXT);
+        FunctionsEdit::addSimpleTag(($sourceLevel + 2) . ' DATE ' . $sourceDATE, '', GedcomTag::getLabel('DATA:DATE'));
+        FunctionsEdit::addSimpleTag(($sourceLevel + 1) . ' QUAY ' . $sourceQUAY);
+    }
 }
 if (Auth::isAdmin() && $action === 'update') {
-	echo '<tr><td class="descriptionbox wrap width25">';
-	echo GedcomTag::getLabel('CHAN'), '</td><td class="optionbox wrap">';
-	if ($NO_UPDATE_CHAN) {
-		echo '<input type="checkbox" checked name="preserve_last_changed">';
-	} else {
-		echo '<input type="checkbox" name="preserve_last_changed">';
-	}
-	echo I18N::translate('Keep the existing “last change” information'), '<br>';
-	echo '</td></tr>';
+    echo '<tr><td class="descriptionbox wrap width25">';
+    echo GedcomTag::getLabel('CHAN'), '</td><td class="optionbox wrap">';
+    if ($NO_UPDATE_CHAN) {
+        echo '<input type="checkbox" checked name="preserve_last_changed">';
+    } else {
+        echo '<input type="checkbox" name="preserve_last_changed">';
+    }
+    echo I18N::translate('Keep the existing “last change” information'), '<br>';
+    echo '</td></tr>';
 }
 echo '</table>';
 FunctionsEdit::printAddLayer('SOUR', 1);

Switch Indentation +332 added lines, -332 removed lines

@@ -76,338 +76,338 @@
 // …and also in the admin_media_upload.php script
 
 switch ($action) {
-case 'create': // Save the information from the “showcreateform” action
-	$controller->setPageTitle(I18N::translate('Create a media object'));
-
-	// Validate the media folder
-	$folderName = str_replace('\\', '/', $folder);
-	$folderName = trim($folderName, '/');
-	if ($folderName == '.') {
-		$folderName = '';
-	}
-	if ($folderName) {
-		$folderName .= '/';
-		// Not allowed to use “../”
-		if (strpos('/' . $folderName, '/../') !== false) {
-			FlashMessages::addMessage('Folder names are not allowed to include “../”');
-			break;
-		}
-	}
-
-	// Make sure the media folder exists
-	if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-		if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-			FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)));
-		} else {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'danger');
-			break;
-		}
-	}
-
-	// Managers can create new media paths (subfolders). Users must use existing folders.
-	if ($folderName && !is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
-		if (Auth::isManager($WT_TREE)) {
-			if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
-				FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)));
-			} else {
-				FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)), 'danger');
-				break;
-			}
-		} else {
-			// Regular users should not have seen this option - so no need for an error message.
-			break;
-		}
-	}
-
-	// The media folder exists. Now create a thumbnail folder to match it.
-	if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
-		if (!File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)), 'danger');
-			break;
-		}
-	}
-
-	// A thumbnail file with no main image?
-	if (!empty($_FILES['thumbnail']['name']) && empty($_FILES['mediafile']['name'])) {
-		// Assume the user used the wrong field, and treat this as a main image
-		$_FILES['mediafile'] = $_FILES['thumbnail'];
-		unset($_FILES['thumbnail']);
-	}
-
-	// Thumbnail files must contain images.
-	if (!empty($_FILES['thumbnail']['name']) && !preg_match('/^image/', $_FILES['thumbnail']['type'])) {
-		FlashMessages::addMessage(I18N::translate('Thumbnail files must contain images.'));
-		break;
-	}
-
-	// User-specified filename?
-	if ($tag[0] == 'FILE' && $text[0]) {
-		$filename = $text[0];
-	}
-	// Use the name of the uploaded file?
-	// If no filename specified, use the name of the uploaded file?
-	if (!$filename && !empty($_FILES['mediafile']['name'])) {
-		$filename = $_FILES['mediafile']['name'];
-	}
-
-	// Validate the media path and filename
-	if (preg_match('/^https?:\/\//i', $text[0], $match)) {
-		// External media needs no further validation
-		$fileName   = $filename;
-		$folderName = '';
-		unset($_FILES['mediafile'], $_FILES['thumbnail']);
-	} elseif (preg_match('/([\/\\\\<>])/', $filename, $match)) {
-		// Local media files cannot contain certain special characters
-		FlashMessages::addMessage(I18N::translate('Filenames are not allowed to contain the character “%s”.', $match[1]));
-		break;
-	} elseif (preg_match('/(\.(php|pl|cgi|bash|sh|bat|exe|com|htm|html|shtml))$/i', $filename, $match)) {
-		// Do not allow obvious script files.
-		FlashMessages::addMessage(I18N::translate('Filenames are not allowed to have the extension “%s”.', $match[1]));
-		break;
-	} elseif (!$filename) {
-		FlashMessages::addMessage(I18N::translate('No media file was provided.'));
-		break;
-	} else {
-		$fileName = $filename;
-	}
-
-	// Now copy the file to the correct location.
-	if (!empty($_FILES['mediafile']['name'])) {
-		$serverFileName = WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName . $fileName;
-		if (file_exists($serverFileName)) {
-			FlashMessages::addMessage(I18N::translate('The file %s already exists. Use another filename.', $folderName . $fileName));
-			break;
-		}
-		if (move_uploaded_file($_FILES['mediafile']['tmp_name'], $serverFileName)) {
-			Log::addMediaLog('Media file ' . $serverFileName . ' uploaded');
-		} else {
-			FlashMessages::addMessage(
-				I18N::translate('There was an error uploading your file.') .
-				'<br>' .
-				Functions::fileUploadErrorText($_FILES['mediafile']['error'])
-			);
-			break;
-		}
-
-		// Now copy the (optional) thumbnail
-		if (!empty($_FILES['thumbnail']['name']) && preg_match('/^image\/(png|gif|jpeg)/', $_FILES['thumbnail']['type'], $match)) {
-			// Thumbnails have either
-			// (a) the same filename as the main image
-			// (b) the same filename as the main image - but with a .png extension
-			if ($match[1] == 'png' && !preg_match('/\.(png)$/i', $fileName)) {
-				$thumbFile = preg_replace('/\.[a-z0-9]{3,5}$/', '.png', $fileName);
-			} else {
-				$thumbFile = $fileName;
-			}
-			$serverFileName = WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName . $thumbFile;
-			if (move_uploaded_file($_FILES['thumbnail']['tmp_name'], $serverFileName)) {
-				Log::addMediaLog('Thumbnail file ' . $serverFileName . ' uploaded');
-			}
-		}
-	}
-
-	$controller->pageHeader();
-	// Build the gedcom record
-	$newged = "0 @new@ OBJE";
-	if ($tag[0] == 'FILE') {
-		// The admin has an edit field to change the filename
-		$text[0] = $folderName . $fileName;
-	} else {
-		// Users keep the original filename
-		$newged .= "\n1 FILE " . $folderName . $fileName;
-	}
-
-	$newged = FunctionsEdit::handleUpdates($newged);
-
-	$new_media = $WT_TREE->createRecord($newged);
-	if ($linktoid) {
-		$record = GedcomRecord::getInstance($linktoid, $WT_TREE);
-		$record->createFact('1 OBJE @' . $new_media->getXref() . '@', true);
-		Log::addEditLog('Media ID ' . $new_media->getXref() . " successfully added to $linktoid.");
-		$controller->addInlineJavascript('closePopupAndReloadParent();');
-	} else {
-		Log::addEditLog('Media ID ' . $new_media->getXref() . ' successfully added.');
-		$controller->addInlineJavascript('openerpasteid("' . $new_media->getXref() . '");');
-	}
-	echo '<button onclick="closePopupAndReloadParent();">', I18N::translate('close'), '</button>';
-
-	return;
-
-case 'update': // Save the information from the “editmedia” action
-	$controller->setPageTitle(I18N::translate('Edit the media object'));
-
-	// Validate the media folder
-	$folderName = str_replace('\\', '/', $folder);
-	$folderName = trim($folderName, '/');
-	if ($folderName == '.') {
-		$folderName = '';
-	}
-	if ($folderName) {
-		$folderName .= '/';
-		// Not allowed to use “../”
-		if (strpos('/' . $folderName, '/../') !== false) {
-			FlashMessages::addMessage('Folder names are not allowed to include “../”');
-			break;
-		}
-	}
-
-	// Make sure the media folder exists
-	if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-		if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
-			FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)));
-		} else {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'danger');
-			break;
-		}
-	}
-
-	// Managers can create new media paths (subfolders). Users must use existing folders.
-	if ($folderName && !is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
-		if (Auth::isManager($WT_TREE)) {
-			if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
-				FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)));
-			} else {
-				FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)), 'danger');
-				break;
-			}
-		} else {
-			// Regular users should not have seen this option - so no need for an error message.
-			break;
-		}
-	}
-
-	// The media folder exists. Now create a thumbnail folder to match it.
-	if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
-		if (!File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
-			FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)), 'danger');
-			break;
-		}
-	}
-
-	// Validate the media path and filename
-	if (preg_match('/^https?:\/\//i', $filename, $match)) {
-		// External media needs no further validation
-		$fileName   = $filename;
-		$folderName = '';
-		unset($_FILES['mediafile'], $_FILES['thumbnail']);
-	} elseif (preg_match('/([\/\\\\<>])/', $filename, $match)) {
-		// Local media files cannot contain certain special characters
-		FlashMessages::addMessage(I18N::translate('Filenames are not allowed to contain the character “%s”.', $match[1]));
-		break;
-	} elseif (preg_match('/(\.(php|pl|cgi|bash|sh|bat|exe|com|htm|html|shtml))$/i', $filename, $match)) {
-		// Do not allow obvious script files.
-		FlashMessages::addMessage(I18N::translate('Filenames are not allowed to have the extension “%s”.', $match[1]));
-		break;
-	} elseif (!$filename) {
-		FlashMessages::addMessage(I18N::translate('No media file was provided.'));
-		break;
-	} else {
-		$fileName = $filename;
-	}
-
-	$oldFilename = $media->getFilename();
-	$newFilename = $folderName . $fileName;
-
-	// Cannot rename local to external or vice-versa
-	if (Functions::isFileExternal($oldFilename) != Functions::isFileExternal($filename)) {
-		FlashMessages::addMessage(I18N::translate('The media file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
-		break;
-	}
-
-	$messages  = false;
-	$move_file = false;
-
-	// Move files on disk (if we can) to reflect the change to the GEDCOM data
-	if (!$media->isExternal()) {
-		$oldServerFile  = $media->getServerFilename('main');
-		$oldServerThumb = $media->getServerFilename('thumb');
-
-		$newmedia       = new Media("xxx", "0 @xxx@ OBJE\n1 FILE " . $newFilename, null, $WT_TREE);
-		$newServerFile  = $newmedia->getServerFilename('main');
-		$newServerThumb = $newmedia->getServerFilename('thumb');
-
-		// We could be either renaming an existing file, or updating a record (with no valid file) to point to a new file
-		if ($oldServerFile !== $newServerFile) {
-			//-- check if the file is used in more than one gedcom
-			//-- do not allow it to be moved or renamed if it is
-			if (!$media->isExternal() && FunctionsDb::isMediaUsedInOtherTree($media->getFilename(), $WT_TREE->getTreeId())) {
-				FlashMessages::addMessage(I18N::translate('This file is linked to another family tree on this server. It cannot be deleted, moved, or renamed until these links have been removed.'));
-				break;
-			}
-
-			$move_file = true;
-			if (!file_exists($newServerFile) || md5_file($oldServerFile) === md5_file($newServerFile)) {
-				try {
-					rename($oldServerFile, $newServerFile);
-					FlashMessages::addMessage(I18N::translate('The media file %1$s has been renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
-				} catch (\ErrorException $ex) {
-					FlashMessages::addMessage(I18N::translate('The media file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
-				}
-				$messages = true;
-			}
-			if (!file_exists($newServerFile)) {
-				FlashMessages::addMessage(I18N::translate('The media file %s does not exist.', Html::filename($newFilename)));
-				$messages = true;
-			}
-		}
-		if ($oldServerThumb != $newServerThumb) {
-			$move_file = true;
-			if (!file_exists($newServerThumb) || md5_file($oldServerFile) == md5_file($newServerThumb)) {
-				try {
-					rename($oldServerThumb, $newServerThumb);
-					FlashMessages::addMessage(I18N::translate('The thumbnail file %1$s has been renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
-				} catch (\ErrorException $ex) {
-					FlashMessages::addMessage(I18N::translate('The thumbnail file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
-				}
-				$messages = true;
-			}
-			if (!file_exists($newServerThumb)) {
-				FlashMessages::addMessage(I18N::translate('The thumbnail file %s does not exist.', Html::filename($newFilename)));
-				$messages = true;
-			}
-		}
-	}
-
-	// Insert the 1 FILE xxx record into the arrays used by function FunctionsEdit::handle_updatesges()
-	$glevels = array_merge(array('1'), $glevels);
-	$tag     = array_merge(array('FILE'), $tag);
-	$islink  = array_merge(array(0), $islink);
-	$text    = array_merge(array($newFilename), $text);
-
-	$record = GedcomRecord::getInstance($pid, $WT_TREE);
-	$newrec = "0 @$pid@ OBJE\n";
-	$newrec = FunctionsEdit::handleUpdates($newrec);
-	$record->updateRecord($newrec, $update_CHAN);
-
-	if ($move_file) {
-		// We've moved a file. Therefore we must approve the change, as rejecting
-		// the change will create broken references.
-		FunctionsImport::acceptAllChanges($record->getXref(), $record->getTree()->getTreeId());
-	}
-
-	if ($pid && $linktoid) {
-		$record = GedcomRecord::getInstance($linktoid, $WT_TREE);
-		$record->createFact('1 OBJE @' . $pid . '@', true);
-		Log::addEditLog('Media ID ' . $pid . " successfully added to $linktoid.");
-	}
-	$controller->pageHeader();
-	if ($messages) {
-		echo '<button onclick="closePopupAndReloadParent();">', I18N::translate('close'), '</button>';
-	} else {
-		$controller->addInlineJavascript('closePopupAndReloadParent();');
-	}
-
-	return;
-case 'showmediaform':
-	$controller->setPageTitle(I18N::translate('Create a media object'));
-	$action = 'create';
-	break;
-case 'editmedia':
-	$controller->setPageTitle(I18N::translate('Edit the media object'));
-	$action = 'update';
-	break;
-default:
-	throw new \Exception('Bad $action (' . $action . ') in addmedia.php');
+    case 'create': // Save the information from the “showcreateform” action
+	    $controller->setPageTitle(I18N::translate('Create a media object'));
+
+	    // Validate the media folder
+	    $folderName = str_replace('\\', '/', $folder);
+	    $folderName = trim($folderName, '/');
+	    if ($folderName == '.') {
+		    $folderName = '';
+	    }
+	    if ($folderName) {
+		    $folderName .= '/';
+		    // Not allowed to use “../”
+		    if (strpos('/' . $folderName, '/../') !== false) {
+			    FlashMessages::addMessage('Folder names are not allowed to include “../”');
+			    break;
+		    }
+	    }
+
+	    // Make sure the media folder exists
+	    if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+		    if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+			    FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)));
+		    } else {
+			    FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'danger');
+			    break;
+		    }
+	    }
+
+	    // Managers can create new media paths (subfolders). Users must use existing folders.
+	    if ($folderName && !is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
+		    if (Auth::isManager($WT_TREE)) {
+			    if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
+				    FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)));
+			    } else {
+				    FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)), 'danger');
+				    break;
+			    }
+		    } else {
+			    // Regular users should not have seen this option - so no need for an error message.
+			    break;
+		    }
+	    }
+
+	    // The media folder exists. Now create a thumbnail folder to match it.
+	    if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
+		    if (!File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
+			    FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)), 'danger');
+			    break;
+		    }
+	    }
+
+	    // A thumbnail file with no main image?
+	    if (!empty($_FILES['thumbnail']['name']) && empty($_FILES['mediafile']['name'])) {
+		    // Assume the user used the wrong field, and treat this as a main image
+		    $_FILES['mediafile'] = $_FILES['thumbnail'];
+		    unset($_FILES['thumbnail']);
+	    }
+
+	    // Thumbnail files must contain images.
+	    if (!empty($_FILES['thumbnail']['name']) && !preg_match('/^image/', $_FILES['thumbnail']['type'])) {
+		    FlashMessages::addMessage(I18N::translate('Thumbnail files must contain images.'));
+		    break;
+	    }
+
+	    // User-specified filename?
+	    if ($tag[0] == 'FILE' && $text[0]) {
+		    $filename = $text[0];
+	    }
+	    // Use the name of the uploaded file?
+	    // If no filename specified, use the name of the uploaded file?
+	    if (!$filename && !empty($_FILES['mediafile']['name'])) {
+		    $filename = $_FILES['mediafile']['name'];
+	    }
+
+	    // Validate the media path and filename
+	    if (preg_match('/^https?:\/\//i', $text[0], $match)) {
+		    // External media needs no further validation
+		    $fileName   = $filename;
+		    $folderName = '';
+		    unset($_FILES['mediafile'], $_FILES['thumbnail']);
+	    } elseif (preg_match('/([\/\\\\<>])/', $filename, $match)) {
+		    // Local media files cannot contain certain special characters
+		    FlashMessages::addMessage(I18N::translate('Filenames are not allowed to contain the character “%s”.', $match[1]));
+		    break;
+	    } elseif (preg_match('/(\.(php|pl|cgi|bash|sh|bat|exe|com|htm|html|shtml))$/i', $filename, $match)) {
+		    // Do not allow obvious script files.
+		    FlashMessages::addMessage(I18N::translate('Filenames are not allowed to have the extension “%s”.', $match[1]));
+		    break;
+	    } elseif (!$filename) {
+		    FlashMessages::addMessage(I18N::translate('No media file was provided.'));
+		    break;
+	    } else {
+		    $fileName = $filename;
+	    }
+
+	    // Now copy the file to the correct location.
+	    if (!empty($_FILES['mediafile']['name'])) {
+		    $serverFileName = WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName . $fileName;
+		    if (file_exists($serverFileName)) {
+			    FlashMessages::addMessage(I18N::translate('The file %s already exists. Use another filename.', $folderName . $fileName));
+			    break;
+		    }
+		    if (move_uploaded_file($_FILES['mediafile']['tmp_name'], $serverFileName)) {
+			    Log::addMediaLog('Media file ' . $serverFileName . ' uploaded');
+		    } else {
+			    FlashMessages::addMessage(
+				    I18N::translate('There was an error uploading your file.') .
+				    '<br>' .
+				    Functions::fileUploadErrorText($_FILES['mediafile']['error'])
+			    );
+			    break;
+		    }
+
+		    // Now copy the (optional) thumbnail
+		    if (!empty($_FILES['thumbnail']['name']) && preg_match('/^image\/(png|gif|jpeg)/', $_FILES['thumbnail']['type'], $match)) {
+			    // Thumbnails have either
+			    // (a) the same filename as the main image
+			    // (b) the same filename as the main image - but with a .png extension
+			    if ($match[1] == 'png' && !preg_match('/\.(png)$/i', $fileName)) {
+				    $thumbFile = preg_replace('/\.[a-z0-9]{3,5}$/', '.png', $fileName);
+			    } else {
+				    $thumbFile = $fileName;
+			    }
+			    $serverFileName = WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName . $thumbFile;
+			    if (move_uploaded_file($_FILES['thumbnail']['tmp_name'], $serverFileName)) {
+				    Log::addMediaLog('Thumbnail file ' . $serverFileName . ' uploaded');
+			    }
+		    }
+	    }
+
+	    $controller->pageHeader();
+	    // Build the gedcom record
+	    $newged = "0 @new@ OBJE";
+	    if ($tag[0] == 'FILE') {
+		    // The admin has an edit field to change the filename
+		    $text[0] = $folderName . $fileName;
+	    } else {
+		    // Users keep the original filename
+		    $newged .= "\n1 FILE " . $folderName . $fileName;
+	    }
+
+	    $newged = FunctionsEdit::handleUpdates($newged);
+
+	    $new_media = $WT_TREE->createRecord($newged);
+	    if ($linktoid) {
+		    $record = GedcomRecord::getInstance($linktoid, $WT_TREE);
+		    $record->createFact('1 OBJE @' . $new_media->getXref() . '@', true);
+		    Log::addEditLog('Media ID ' . $new_media->getXref() . " successfully added to $linktoid.");
+		    $controller->addInlineJavascript('closePopupAndReloadParent();');
+	    } else {
+		    Log::addEditLog('Media ID ' . $new_media->getXref() . ' successfully added.');
+		    $controller->addInlineJavascript('openerpasteid("' . $new_media->getXref() . '");');
+	    }
+	    echo '<button onclick="closePopupAndReloadParent();">', I18N::translate('close'), '</button>';
+
+	    return;
+
+    case 'update': // Save the information from the “editmedia” action
+	    $controller->setPageTitle(I18N::translate('Edit the media object'));
+
+	    // Validate the media folder
+	    $folderName = str_replace('\\', '/', $folder);
+	    $folderName = trim($folderName, '/');
+	    if ($folderName == '.') {
+		    $folderName = '';
+	    }
+	    if ($folderName) {
+		    $folderName .= '/';
+		    // Not allowed to use “../”
+		    if (strpos('/' . $folderName, '/../') !== false) {
+			    FlashMessages::addMessage('Folder names are not allowed to include “../”');
+			    break;
+		    }
+	    }
+
+	    // Make sure the media folder exists
+	    if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+		    if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY)) {
+			    FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)));
+		    } else {
+			    FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY)), 'danger');
+			    break;
+		    }
+	    }
+
+	    // Managers can create new media paths (subfolders). Users must use existing folders.
+	    if ($folderName && !is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
+		    if (Auth::isManager($WT_TREE)) {
+			    if (File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)) {
+				    FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)));
+			    } else {
+				    FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . $folderName)), 'danger');
+				    break;
+			    }
+		    } else {
+			    // Regular users should not have seen this option - so no need for an error message.
+			    break;
+		    }
+	    }
+
+	    // The media folder exists. Now create a thumbnail folder to match it.
+	    if (!is_dir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
+		    if (!File::mkdir(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)) {
+			    FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName)), 'danger');
+			    break;
+		    }
+	    }
+
+	    // Validate the media path and filename
+	    if (preg_match('/^https?:\/\//i', $filename, $match)) {
+		    // External media needs no further validation
+		    $fileName   = $filename;
+		    $folderName = '';
+		    unset($_FILES['mediafile'], $_FILES['thumbnail']);
+	    } elseif (preg_match('/([\/\\\\<>])/', $filename, $match)) {
+		    // Local media files cannot contain certain special characters
+		    FlashMessages::addMessage(I18N::translate('Filenames are not allowed to contain the character “%s”.', $match[1]));
+		    break;
+	    } elseif (preg_match('/(\.(php|pl|cgi|bash|sh|bat|exe|com|htm|html|shtml))$/i', $filename, $match)) {
+		    // Do not allow obvious script files.
+		    FlashMessages::addMessage(I18N::translate('Filenames are not allowed to have the extension “%s”.', $match[1]));
+		    break;
+	    } elseif (!$filename) {
+		    FlashMessages::addMessage(I18N::translate('No media file was provided.'));
+		    break;
+	    } else {
+		    $fileName = $filename;
+	    }
+
+	    $oldFilename = $media->getFilename();
+	    $newFilename = $folderName . $fileName;
+
+	    // Cannot rename local to external or vice-versa
+	    if (Functions::isFileExternal($oldFilename) != Functions::isFileExternal($filename)) {
+		    FlashMessages::addMessage(I18N::translate('The media file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+		    break;
+	    }
+
+	    $messages  = false;
+	    $move_file = false;
+
+	    // Move files on disk (if we can) to reflect the change to the GEDCOM data
+	    if (!$media->isExternal()) {
+		    $oldServerFile  = $media->getServerFilename('main');
+		    $oldServerThumb = $media->getServerFilename('thumb');
+
+		    $newmedia       = new Media("xxx", "0 @xxx@ OBJE\n1 FILE " . $newFilename, null, $WT_TREE);
+		    $newServerFile  = $newmedia->getServerFilename('main');
+		    $newServerThumb = $newmedia->getServerFilename('thumb');
+
+		    // We could be either renaming an existing file, or updating a record (with no valid file) to point to a new file
+		    if ($oldServerFile !== $newServerFile) {
+			    //-- check if the file is used in more than one gedcom
+			    //-- do not allow it to be moved or renamed if it is
+			    if (!$media->isExternal() && FunctionsDb::isMediaUsedInOtherTree($media->getFilename(), $WT_TREE->getTreeId())) {
+				    FlashMessages::addMessage(I18N::translate('This file is linked to another family tree on this server. It cannot be deleted, moved, or renamed until these links have been removed.'));
+				    break;
+			    }
+
+			    $move_file = true;
+			    if (!file_exists($newServerFile) || md5_file($oldServerFile) === md5_file($newServerFile)) {
+				    try {
+					    rename($oldServerFile, $newServerFile);
+					    FlashMessages::addMessage(I18N::translate('The media file %1$s has been renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+				    } catch (\ErrorException $ex) {
+					    FlashMessages::addMessage(I18N::translate('The media file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+				    }
+				    $messages = true;
+			    }
+			    if (!file_exists($newServerFile)) {
+				    FlashMessages::addMessage(I18N::translate('The media file %s does not exist.', Html::filename($newFilename)));
+				    $messages = true;
+			    }
+		    }
+		    if ($oldServerThumb != $newServerThumb) {
+			    $move_file = true;
+			    if (!file_exists($newServerThumb) || md5_file($oldServerFile) == md5_file($newServerThumb)) {
+				    try {
+					    rename($oldServerThumb, $newServerThumb);
+					    FlashMessages::addMessage(I18N::translate('The thumbnail file %1$s has been renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+				    } catch (\ErrorException $ex) {
+					    FlashMessages::addMessage(I18N::translate('The thumbnail file %1$s could not be renamed to %2$s.', Html::filename($oldFilename), Html::filename($newFilename)));
+				    }
+				    $messages = true;
+			    }
+			    if (!file_exists($newServerThumb)) {
+				    FlashMessages::addMessage(I18N::translate('The thumbnail file %s does not exist.', Html::filename($newFilename)));
+				    $messages = true;
+			    }
+		    }
+	    }
+
+	    // Insert the 1 FILE xxx record into the arrays used by function FunctionsEdit::handle_updatesges()
+	    $glevels = array_merge(array('1'), $glevels);
+	    $tag     = array_merge(array('FILE'), $tag);
+	    $islink  = array_merge(array(0), $islink);
+	    $text    = array_merge(array($newFilename), $text);
+
+	    $record = GedcomRecord::getInstance($pid, $WT_TREE);
+	    $newrec = "0 @$pid@ OBJE\n";
+	    $newrec = FunctionsEdit::handleUpdates($newrec);
+	    $record->updateRecord($newrec, $update_CHAN);
+
+	    if ($move_file) {
+		    // We've moved a file. Therefore we must approve the change, as rejecting
+		    // the change will create broken references.
+		    FunctionsImport::acceptAllChanges($record->getXref(), $record->getTree()->getTreeId());
+	    }
+
+	    if ($pid && $linktoid) {
+		    $record = GedcomRecord::getInstance($linktoid, $WT_TREE);
+		    $record->createFact('1 OBJE @' . $pid . '@', true);
+		    Log::addEditLog('Media ID ' . $pid . " successfully added to $linktoid.");
+	    }
+	    $controller->pageHeader();
+	    if ($messages) {
+		    echo '<button onclick="closePopupAndReloadParent();">', I18N::translate('close'), '</button>';
+	    } else {
+		    $controller->addInlineJavascript('closePopupAndReloadParent();');
+	    }
+
+	    return;
+    case 'showmediaform':
+	    $controller->setPageTitle(I18N::translate('Create a media object'));
+	    $action = 'create';
+	    break;
+    case 'editmedia':
+	    $controller->setPageTitle(I18N::translate('Edit the media object'));
+	    $action = 'update';
+	    break;
+    default:
+	    throw new \Exception('Bad $action (' . $action . ') in addmedia.php');
 }
 
 $controller->pageHeader();

app/Census/CensusColumnBornForeignParts.php

Indentation +26 added lines, -26 removed lines

@@ -21,33 +21,33 @@
  * Was the individual born in "foreign parts".
  */
 class CensusColumnBornForeignParts extends AbstractCensusColumn implements CensusColumnInterface {
-	/**
-	 * Generate the likely value of this census column, based on available information.
-	 *
-	 * @param Individual      $individual
-	 * @param Individual|null $head
-	 *
-	 * @return string
-	 */
-	public function generate(Individual $individual, Individual $head = null) {
-		$birth_place  = explode(', ', $individual->getBirthPlace());
-		$birth_place  = end($birth_place);
-		$census_place = $this->place();
+    /**
+     * Generate the likely value of this census column, based on available information.
+     *
+     * @param Individual      $individual
+     * @param Individual|null $head
+     *
+     * @return string
+     */
+    public function generate(Individual $individual, Individual $head = null) {
+        $birth_place  = explode(', ', $individual->getBirthPlace());
+        $birth_place  = end($birth_place);
+        $census_place = $this->place();
 
-		if ($birth_place === 'Wales') {
-			$birth_place = 'England';
-		}
+        if ($birth_place === 'Wales') {
+            $birth_place = 'England';
+        }
 
-		if ($census_place === 'Wales') {
-			$census_place = 'England';
-		}
+        if ($census_place === 'Wales') {
+            $census_place = 'England';
+        }
 
-		if ($birth_place === $census_place || $birth_place === '') {
-			return '';
-		} elseif ($birth_place === 'England' || $birth_place === 'Scotland' || $birth_place === 'Ireland') {
-			return substr($birth_place, 0, 1);
-		} else {
-			return 'F';
-		}
-	}
+        if ($birth_place === $census_place || $birth_place === '') {
+            return '';
+        } elseif ($birth_place === 'England' || $birth_place === 'Scotland' || $birth_place === 'Ireland') {
+            return substr($birth_place, 0, 1);
+        } else {
+            return 'F';
+        }
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * Was the individual born in "foreign parts".
  */
-class CensusColumnBornForeignParts extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnBornForeignParts extends AbstractCensusColumn implements CensusColumnInterface
+{
 	/**
 	 * Generate the likely value of this census column, based on available information.
 	 *
@@ -29,7 +30,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function generate(Individual $individual, Individual $head = null) {
+	public function generate(Individual $individual, Individual $head = null)
+	{
 		$birth_place  = explode(', ', $individual->getBirthPlace());
 		$birth_place  = end($birth_place);
 		$census_place = $this->place();

app/Census/CensusOfDenmark1801.php

Indentation +22 added lines, -22 removed lines

@@ -19,27 +19,27 @@
  * Definitions for a census
  */
 class CensusOfDenmark1801 extends CensusOfDenmark implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '01 FEB 1801';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '01 FEB 1801';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnFullName($this, 'Navn', ''),
-			new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
-			new CensusColumnAge($this, 'Alder', ''),
-			new CensusColumnConditionDanish($this, 'Civilstand', ''),
-			new CensusColumnOccupation($this, 'Erhverv', ''),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnFullName($this, 'Navn', ''),
+            new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
+            new CensusColumnAge($this, 'Alder', ''),
+            new CensusColumnConditionDanish($this, 'Civilstand', ''),
+            new CensusColumnOccupation($this, 'Erhverv', ''),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfDenmark1801 extends CensusOfDenmark implements CensusInterface {
+class CensusOfDenmark1801 extends CensusOfDenmark implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '01 FEB 1801';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnFullName($this, 'Navn', ''),
 			new CensusColumnRelationToHead($this, 'Stilling i familien', ''),

app/Census/CensusColumnConditionFrenchHomme.php

Indentation +15 added lines, -15 removed lines

@@ -19,23 +19,23 @@
  * Marital status.
  */
 class CensusColumnConditionFrenchHomme extends AbstractCensusColumnCondition {
-	/* Text to display for married individuals */
-	protected $husband = '1';
-	protected $wife    = '';
+    /* Text to display for married individuals */
+    protected $husband = '1';
+    protected $wife    = '';
 
-	/* Text to display for unmarried individuals */
-	protected $bachelor = '';
-	protected $spinster = '';
+    /* Text to display for unmarried individuals */
+    protected $bachelor = '';
+    protected $spinster = '';
 
-	/* Text to display for children */
-	protected $boy  = '';
-	protected $girl = '';
+    /* Text to display for children */
+    protected $boy  = '';
+    protected $girl = '';
 
-	/* Text to display for divorced individuals */
-	protected $divorce  = '1';
-	protected $divorcee = '';
+    /* Text to display for divorced individuals */
+    protected $divorce  = '1';
+    protected $divorcee = '';
 
-	/* Text to display for widowed individuals (not yet implemented) */
-	protected $widower = '';
-	protected $widow   = '';
+    /* Text to display for widowed individuals (not yet implemented) */
+    protected $widower = '';
+    protected $widow   = '';
 }

Braces +2 added lines, -1 removed lines

@@ -18,7 +18,8 @@
 /**
  * Marital status.
  */
-class CensusColumnConditionFrenchHomme extends AbstractCensusColumnCondition {
+class CensusColumnConditionFrenchHomme extends AbstractCensusColumnCondition
+{
 	/* Text to display for married individuals */
 	protected $husband = '1';
 	protected $wife    = '';

app/Census/CensusColumnFatherBirthPlaceSimple.php

Indentation +11 added lines, -11 removed lines

@@ -21,15 +21,15 @@
  * The individual's father's birth place.
  */
 class CensusColumnFatherBirthPlaceSimple extends CensusColumnFatherBirthPlace implements CensusColumnInterface {
-	/**
-	 * Generate the likely value of this census column, based on available information.
-	 *
-	 * @param Individual      $individual
-	 * @param Individual|null $head
-	 *
-	 * @return string
-	 */
-	public function generate(Individual $individual, Individual $head = null) {
-		return $this->lastPartOfPlace(parent::generate($individual, $head));
-	}
+    /**
+     * Generate the likely value of this census column, based on available information.
+     *
+     * @param Individual      $individual
+     * @param Individual|null $head
+     *
+     * @return string
+     */
+    public function generate(Individual $individual, Individual $head = null) {
+        return $this->lastPartOfPlace(parent::generate($individual, $head));
+    }
 }

Braces +4 added lines, -2 removed lines

@@ -20,7 +20,8 @@ 
 /**
  * The individual's father's birth place.
  */
-class CensusColumnFatherBirthPlaceSimple extends CensusColumnFatherBirthPlace implements CensusColumnInterface {
+class CensusColumnFatherBirthPlaceSimple extends CensusColumnFatherBirthPlace implements CensusColumnInterface
+{
 	/**
 	 * Generate the likely value of this census column, based on available information.
 	 *
@@ -29,7 +30,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function generate(Individual $individual, Individual $head = null) {
+	public function generate(Individual $individual, Individual $head = null)
+	{
 		return $this->lastPartOfPlace(parent::generate($individual, $head));
 	}
 }

app/Census/CensusOfEngland.php

Indentation +26 added lines, -26 removed lines

@@ -19,31 +19,31 @@
  * Definitions for a census
  */
 class CensusOfEngland extends Census implements CensusPlaceInterface {
-	/**
-	 * All available censuses for this census place.
-	 *
-	 * @return CensusInterface[]
-	 */
-	public function allCensusDates() {
-		return array(
-			new CensusOfEngland1841(),
-			new CensusOfEngland1851(),
-			new CensusOfEngland1861(),
-			new CensusOfEngland1871(),
-			new CensusOfEngland1881(),
-			new CensusOfEngland1891(),
-			new CensusOfEngland1901(),
-			new CensusOfEngland1911(),
-			new RegisterOfEngland1939(),
-		);
-	}
+    /**
+     * All available censuses for this census place.
+     *
+     * @return CensusInterface[]
+     */
+    public function allCensusDates() {
+        return array(
+            new CensusOfEngland1841(),
+            new CensusOfEngland1851(),
+            new CensusOfEngland1861(),
+            new CensusOfEngland1871(),
+            new CensusOfEngland1881(),
+            new CensusOfEngland1891(),
+            new CensusOfEngland1901(),
+            new CensusOfEngland1911(),
+            new RegisterOfEngland1939(),
+        );
+    }
 
-	/**
-	 * Where did this census occur, in GEDCOM format.
-	 *
-	 * @return string
-	 */
-	public function censusPlace() {
-		return 'England';
-	}
+    /**
+     * Where did this census occur, in GEDCOM format.
+     *
+     * @return string
+     */
+    public function censusPlace() {
+        return 'England';
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfEngland extends Census implements CensusPlaceInterface {
+class CensusOfEngland extends Census implements CensusPlaceInterface
+{
 	/**
 	 * All available censuses for this census place.
 	 *
 	 * @return CensusInterface[]
 	 */
-	public function allCensusDates() {
+	public function allCensusDates()
+	{
 		return array(
 			new CensusOfEngland1841(),
 			new CensusOfEngland1851(),
@@ -43,7 +45,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function censusPlace() {
+	public function censusPlace()
+	{
 		return 'England';
 	}
 }

app/Census/CensusOfDenmark1845.php

Indentation +24 added lines, -24 removed lines

@@ -19,29 +19,29 @@
  * Definitions for a census
  */
 class CensusOfDenmark1845 extends CensusOfDenmark implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '01 FEB 1845';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '01 FEB 1845';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnFullName($this, 'Navn', ''),
-			new CensusColumnAge($this, 'Alder', ''),
-			new CensusColumnConditionDanish($this, 'Civilstand', ''),
-			new CensusColumnOccupation($this, 'Erhverv', ''),
-			new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnFullName($this, 'Navn', ''),
+            new CensusColumnAge($this, 'Alder', ''),
+            new CensusColumnConditionDanish($this, 'Civilstand', ''),
+            new CensusColumnOccupation($this, 'Erhverv', ''),
+            new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
+            new CensusColumnNull($this, '', ''),
+            new CensusColumnNull($this, '', ''),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfDenmark1845 extends CensusOfDenmark implements CensusInterface {
+class CensusOfDenmark1845 extends CensusOfDenmark implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '01 FEB 1845';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnFullName($this, 'Navn', ''),
 			new CensusColumnAge($this, 'Alder', ''),

app/Census/CensusOfCzechRepublic1921.php

Indentation +31 added lines, -31 removed lines

@@ -19,36 +19,36 @@
  * Definitions for a census
  */
 class CensusOfCzechRepublic1921 extends CensusOfCzechRepublic implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '15 FEB 1921';
-	}
+    /**
+     * When did this census occur.
+     *
+     * @return string
+     */
+    public function censusDate() {
+        return '15 FEB 1921';
+    }
 
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnFullName($this, 'Jméno', ''),
-			new CensusColumnRelationToHead($this, 'Vztah', ''),
-			new CensusColumnSexMZ($this, 'Pohlaví', ''),
-			new CensusColumnNull($this, 'Stav', 'Rodinný stav'),
-			new CensusColumnBirthDaySlashMonthYear($this, 'Narození', 'Datum narození'),
-			new CensusColumnBirthPlace($this, 'Místo', 'Místo narození'),
-			new CensusColumnNull($this, 'Přísluší', 'Domovské právo'),
-			new CensusColumnNull($this, 'Jazyk', 'Jazyk v obcování'),
-			new CensusColumnReligion($this, 'Vyznání', ''),
-			new CensusColumnOccupation($this, 'Povolání', ''),
-			new CensusColumnNull($this, 'Postavení', 'Postavení v zaměstnání'),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
-		);
-	}
+    /**
+     * The columns of the census.
+     *
+     * @return CensusColumnInterface[]
+     */
+    public function columns() {
+        return array(
+            new CensusColumnFullName($this, 'Jméno', ''),
+            new CensusColumnRelationToHead($this, 'Vztah', ''),
+            new CensusColumnSexMZ($this, 'Pohlaví', ''),
+            new CensusColumnNull($this, 'Stav', 'Rodinný stav'),
+            new CensusColumnBirthDaySlashMonthYear($this, 'Narození', 'Datum narození'),
+            new CensusColumnBirthPlace($this, 'Místo', 'Místo narození'),
+            new CensusColumnNull($this, 'Přísluší', 'Domovské právo'),
+            new CensusColumnNull($this, 'Jazyk', 'Jazyk v obcování'),
+            new CensusColumnReligion($this, 'Vyznání', ''),
+            new CensusColumnOccupation($this, 'Povolání', ''),
+            new CensusColumnNull($this, 'Postavení', 'Postavení v zaměstnání'),
+            new CensusColumnNull($this, '', ''),
+            new CensusColumnNull($this, '', ''),
+            new CensusColumnNull($this, '', ''),
+        );
+    }
 }

Braces +6 added lines, -3 removed lines

@@ -18,13 +18,15 @@ 
 /**
  * Definitions for a census
  */
-class CensusOfCzechRepublic1921 extends CensusOfCzechRepublic implements CensusInterface {
+class CensusOfCzechRepublic1921 extends CensusOfCzechRepublic implements CensusInterface
+{
 	/**
 	 * When did this census occur.
 	 *
 	 * @return string
 	 */
-	public function censusDate() {
+	public function censusDate()
+	{
 		return '15 FEB 1921';
 	}
 
@@ -33,7 +35,8 @@ 
 	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns() {
+	public function columns()
+	{
 		return array(
 			new CensusColumnFullName($this, 'Jméno', ''),
 			new CensusColumnRelationToHead($this, 'Vztah', ''),