fisharebest / webtrees

admin_media_upload.php

Indentation +176 added lines, -176 removed lines

@@ -33,136 +33,136 @@ 
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isManager($WT_TREE))
-	->setPageTitle(I18N::translate('Upload media files'));
+    ->restrictAccess(Auth::isManager($WT_TREE))
+    ->setPageTitle(I18N::translate('Upload media files'));
 
 $action = Filter::post('action');
 
 if ($action == "upload") {
-	for ($i = 1; $i < 6; $i++) {
-		if (!empty($_FILES['mediafile' . $i]["name"]) || !empty($_FILES['thumbnail' . $i]["name"])) {
-			$folder = Filter::post('folder' . $i);
+    for ($i = 1; $i < 6; $i++) {
+        if (!empty($_FILES['mediafile' . $i]["name"]) || !empty($_FILES['thumbnail' . $i]["name"])) {
+            $folder = Filter::post('folder' . $i);
 
-			// 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;
-				}
-			}
+            // 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;
-				}
-			}
+            // 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;
-				}
-			}
+            // 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)));
-					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)));
+                    break;
+                }
+            }
 
-			// A thumbnail file with no main image?
-			if (!empty($_FILES['thumbnail' . $i]['name']) && empty($_FILES['mediafile' . $i]['name'])) {
-				// Assume the user used the wrong field, and treat this as a main image
-				$_FILES['mediafile' . $i] = $_FILES['thumbnail' . $i];
-				unset($_FILES['thumbnail' . $i]);
-			}
+            // A thumbnail file with no main image?
+            if (!empty($_FILES['thumbnail' . $i]['name']) && empty($_FILES['mediafile' . $i]['name'])) {
+                // Assume the user used the wrong field, and treat this as a main image
+                $_FILES['mediafile' . $i] = $_FILES['thumbnail' . $i];
+                unset($_FILES['thumbnail' . $i]);
+            }
 
-			// Thumbnail files must contain images.
-			if (!empty($_FILES['thumbnail' . $i]['name']) && !preg_match('/^image\/(png|gif|jpeg)/', $_FILES['thumbnail' . $i]['type'])) {
-				FlashMessages::addMessage(I18N::translate('Thumbnail files must contain images.'));
-				break;
-			}
+            // Thumbnail files must contain images.
+            if (!empty($_FILES['thumbnail' . $i]['name']) && !preg_match('/^image\/(png|gif|jpeg)/', $_FILES['thumbnail' . $i]['type'])) {
+                FlashMessages::addMessage(I18N::translate('Thumbnail files must contain images.'));
+                break;
+            }
 
-			// User-specified filename?
-			$filename = Filter::post('filename' . $i);
-			// Use the name of the uploaded file?
-			if (!$filename && !empty($_FILES['mediafile' . $i]['name'])) {
-				$filename = $_FILES['mediafile' . $i]['name'];
-			}
+            // User-specified filename?
+            $filename = Filter::post('filename' . $i);
+            // Use the name of the uploaded file?
+            if (!$filename && !empty($_FILES['mediafile' . $i]['name'])) {
+                $filename = $_FILES['mediafile' . $i]['name'];
+            }
 
-			// Validate the media path and filename
-			if (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]));
-				$filename = '';
-				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]));
-				$filename = '';
-				break;
-			} elseif (!$filename) {
-				FlashMessages::addMessage(I18N::translate('No media file was provided.'));
-				break;
-			} else {
-				$fileName = $filename;
-			}
+            // Validate the media path and filename
+            if (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]));
+                $filename = '';
+                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]));
+                $filename = '';
+                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' . $i]['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));
-					$filename = '';
-					break;
-				}
-				if (move_uploaded_file($_FILES['mediafile' . $i]['tmp_name'], $serverFileName)) {
-					FlashMessages::addMessage(I18N::translate('The file %s has been uploaded.', Html::filename($serverFileName)));
-					Log::addMediaLog('Media file ' . $serverFileName . ' uploaded');
-				} else {
-					FlashMessages::addMessage(
-						I18N::translate('There was an error uploading your file.') .
-						'<br>' .
-						Functions::fileUploadErrorText($_FILES['mediafile' . $i]['error'])
-					);
-					$filename = '';
-					break;
-				}
+            // Now copy the file to the correct location.
+            if (!empty($_FILES['mediafile' . $i]['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));
+                    $filename = '';
+                    break;
+                }
+                if (move_uploaded_file($_FILES['mediafile' . $i]['tmp_name'], $serverFileName)) {
+                    FlashMessages::addMessage(I18N::translate('The file %s has been uploaded.', Html::filename($serverFileName)));
+                    Log::addMediaLog('Media file ' . $serverFileName . ' uploaded');
+                } else {
+                    FlashMessages::addMessage(
+                        I18N::translate('There was an error uploading your file.') .
+                        '<br>' .
+                        Functions::fileUploadErrorText($_FILES['mediafile' . $i]['error'])
+                    );
+                    $filename = '';
+                    break;
+                }
 
-				// Now copy the (optional thumbnail)
-				if (!empty($_FILES['thumbnail' . $i]['name']) && preg_match('/^image\/(png|gif|jpeg)/', $_FILES['thumbnail' . $i]['type'], $match)) {
-					$extension      = $match[1];
-					$thumbFile      = preg_replace('/\.[a-z0-9]{3,5}$/', '.' . $extension, $fileName);
-					$serverFileName = WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName . $thumbFile;
-					if (move_uploaded_file($_FILES['thumbnail' . $i]['tmp_name'], $serverFileName)) {
-						FlashMessages::addMessage(I18N::translate('The file %s has been uploaded.', Html::filename($serverFileName)));
-						Log::addMediaLog('Thumbnail file ' . $serverFileName . ' uploaded');
-					}
-				}
-			}
-		}
-	}
+                // Now copy the (optional thumbnail)
+                if (!empty($_FILES['thumbnail' . $i]['name']) && preg_match('/^image\/(png|gif|jpeg)/', $_FILES['thumbnail' . $i]['type'], $match)) {
+                    $extension      = $match[1];
+                    $thumbFile      = preg_replace('/\.[a-z0-9]{3,5}$/', '.' . $extension, $fileName);
+                    $serverFileName = WT_DATA_DIR . $MEDIA_DIRECTORY . 'thumbs/' . $folderName . $thumbFile;
+                    if (move_uploaded_file($_FILES['thumbnail' . $i]['tmp_name'], $serverFileName)) {
+                        FlashMessages::addMessage(I18N::translate('The file %s has been uploaded.', Html::filename($serverFileName)));
+                        Log::addMediaLog('Thumbnail file ' . $serverFileName . ' uploaded');
+                    }
+                }
+            }
+        }
+    }
 }
 
 $controller->pageHeader();
@@ -172,7 +172,7 @@ 
 // Determine file size limit
 $filesize = ini_get('upload_max_filesize');
 if (empty($filesize)) {
-	$filesize = "2M";
+    $filesize = "2M";
 }
 
 ?>
@@ -196,68 +196,68 @@ 
 
 // Print 5 forms for uploading images
 for ($i = 1; $i < 6; $i++) {
-	echo '<table class="upload_media">';
-	echo '<tr><th>', I18N::translate('Media file'), ' ', $i, '</th></tr>';
-	echo '<tr><td>';
-	echo I18N::translate('Media file to upload');
-	echo '</td>';
-	echo '<td>';
-	echo '<input name="mediafile', $i, '" type="file" size="40">';
-	echo '</td></tr>';
-	echo '<tr><td>';
-	echo I18N::translate('Thumbnail to upload');
-	echo '</td>';
-	echo '<td>';
-	echo '<input name="thumbnail', $i, '" type="file" size="40">';
-	if ($i === 1) {
-		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>';
+    echo '<table class="upload_media">';
+    echo '<tr><th>', I18N::translate('Media file'), ' ', $i, '</th></tr>';
+    echo '<tr><td>';
+    echo I18N::translate('Media file to upload');
+    echo '</td>';
+    echo '<td>';
+    echo '<input name="mediafile', $i, '" type="file" size="40">';
+    echo '</td></tr>';
+    echo '<tr><td>';
+    echo I18N::translate('Thumbnail to upload');
+    echo '</td>';
+    echo '<td>';
+    echo '<input name="thumbnail', $i, '" type="file" size="40">';
+    if ($i === 1) {
+        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>';
 
-	if (Auth::isManager($WT_TREE)) {
-		echo '<tr><td>';
-		echo I18N::translate('Filename on server');
-		echo '</td>';
-		echo '<td>';
-		echo '<input name="filename', $i, '" type="text" size="40">';
-		if ($i == 1) {
-			echo '<p class="small text-muted">', I18N::translate('Do not change to keep original filename.'), "</p>";
-			echo '<p class="small text-muted">', I18N::translate('The media file you are uploading can be, and probably should be, named differently on the server than it is on your local computer. This is so because often the local filename has meaning to you but is much less meaningful to others visiting this website. Consider also the possibility that you and someone else both try to upload different files called “granny.jpg“.<br><br>In this field, you specify the new name of the file you are uploading. The name you enter here will also be used to name the thumbnail, which can be uploaded separately or generated automatically. You do not need to enter the filename extension (jpg, gif, pdf, doc, etc.)<br><br>Leave this field blank to keep the original name of the file you have uploaded from your local computer.'), '</p>';
-		}
-		echo '</td></tr>';
-	} else {
-		echo '<tr style="display:none;"><td><input type="hidden" name="filename', $i, '" value=""></td></tr>';
-	}
+    if (Auth::isManager($WT_TREE)) {
+        echo '<tr><td>';
+        echo I18N::translate('Filename on server');
+        echo '</td>';
+        echo '<td>';
+        echo '<input name="filename', $i, '" type="text" size="40">';
+        if ($i == 1) {
+            echo '<p class="small text-muted">', I18N::translate('Do not change to keep original filename.'), "</p>";
+            echo '<p class="small text-muted">', I18N::translate('The media file you are uploading can be, and probably should be, named differently on the server than it is on your local computer. This is so because often the local filename has meaning to you but is much less meaningful to others visiting this website. Consider also the possibility that you and someone else both try to upload different files called “granny.jpg“.<br><br>In this field, you specify the new name of the file you are uploading. The name you enter here will also be used to name the thumbnail, which can be uploaded separately or generated automatically. You do not need to enter the filename extension (jpg, gif, pdf, doc, etc.)<br><br>Leave this field blank to keep the original name of the file you have uploaded from your local computer.'), '</p>';
+        }
+        echo '</td></tr>';
+    } else {
+        echo '<tr style="display:none;"><td><input type="hidden" name="filename', $i, '" value=""></td></tr>';
+    }
 
-	if (Auth::isManager($WT_TREE)) {
-		echo '<tr><td>';
-		echo I18N::translate('Folder name on server');
-		echo '</td>';
-		echo '<td>';
+    if (Auth::isManager($WT_TREE)) {
+        echo '<tr><td>';
+        echo I18N::translate('Folder name on server');
+        echo '</td>';
+        echo '<td>';
 
-		echo '<select name="folder_list', $i, '" onchange="document.uploadmedia.folder', $i, '.value=this.options[this.selectedIndex].value;">';
-		echo '<option';
-		echo ' value="/"> ', I18N::translate('&lt;select&gt;'), ' </option>';
-		if (Auth::isAdmin()) {
-			echo '<option value="other" disabled>', I18N::translate('Other folder… please type in'), "</option>";
-		}
-		foreach ($mediaFolders as $f) {
-			echo '<option value="', Filter::escapeHtml($f), '">', Filter::escapeHtml($f), "</option>";
-		}
-		echo "</select>";
-		if (Auth::isAdmin()) {
-			echo '<br><input name="folder', $i, '" type="text" size="40" value="">';
-		} else {
-			echo '<input name="folder', $i, '" type="hidden" value="">';
-		}
-		if ($i === 1) {
-			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 '<tr style="display:none;"><td><input name="folder', $i, '" type="hidden" value=""></td></tr>';
-	}
-	echo '</table>';
+        echo '<select name="folder_list', $i, '" onchange="document.uploadmedia.folder', $i, '.value=this.options[this.selectedIndex].value;">';
+        echo '<option';
+        echo ' value="/"> ', I18N::translate('&lt;select&gt;'), ' </option>';
+        if (Auth::isAdmin()) {
+            echo '<option value="other" disabled>', I18N::translate('Other folder… please type in'), "</option>";
+        }
+        foreach ($mediaFolders as $f) {
+            echo '<option value="', Filter::escapeHtml($f), '">', Filter::escapeHtml($f), "</option>";
+        }
+        echo "</select>";
+        if (Auth::isAdmin()) {
+            echo '<br><input name="folder', $i, '" type="text" size="40" value="">';
+        } else {
+            echo '<input name="folder', $i, '" type="hidden" value="">';
+        }
+        if ($i === 1) {
+            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 '<tr style="display:none;"><td><input name="folder', $i, '" type="hidden" value=""></td></tr>';
+    }
+    echo '</table>';
 }
 // Print the Submit button for uploading the media
 echo '<input type="submit" value="', /* I18N: A button label. */ I18N::translate('upload'), '">';

repo.php

Indentation +52 added lines, -52 removed lines

@@ -34,34 +34,34 @@ 
 $controller = new RepositoryController($record);
 
 if ($controller->record && $controller->record->canShow()) {
-	if ($controller->record->isPendingDeletion()) {
-		if (Auth::isModerator($controller->record->getTree())) {
-			FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
-				'This repository has been deleted. You should review the deletion and then %1$s or %2$s it.',
-				'<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>',
-				'<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>'
-			) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		} elseif (Auth::isEditor($controller->record->getTree())) {
-			FlashMessages::addMessage(I18N::translate('This repository has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		}
-	} elseif ($controller->record->isPendingAddtion()) {
-		if (Auth::isModerator($controller->record->getTree())) {
-			FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
-				'This repository has been edited. You should review the changes and then %1$s or %2$s them.',
-				'<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>',
-				'<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>'
-			) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		} elseif (Auth::isEditor($controller->record->getTree())) {
-			FlashMessages::addMessage(I18N::translate('This repository has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		}
-	}
-	$controller->pageHeader();
+    if ($controller->record->isPendingDeletion()) {
+        if (Auth::isModerator($controller->record->getTree())) {
+            FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
+                'This repository has been deleted. You should review the deletion and then %1$s or %2$s it.',
+                '<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>',
+                '<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>'
+            ) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        } elseif (Auth::isEditor($controller->record->getTree())) {
+            FlashMessages::addMessage(I18N::translate('This repository has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        }
+    } elseif ($controller->record->isPendingAddtion()) {
+        if (Auth::isModerator($controller->record->getTree())) {
+            FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
+                'This repository has been edited. You should review the changes and then %1$s or %2$s them.',
+                '<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>',
+                '<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>'
+            ) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        } elseif (Auth::isEditor($controller->record->getTree())) {
+            FlashMessages::addMessage(I18N::translate('This repository has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        }
+    }
+    $controller->pageHeader();
 } else {
-	FlashMessages::addMessage(I18N::translate('This repository does not exist or you do not have permission to view it.'), 'danger');
-	http_response_code(404);
-	$controller->pageHeader();
+    FlashMessages::addMessage(I18N::translate('This repository does not exist or you do not have permission to view it.'), 'danger');
+    http_response_code(404);
+    $controller->pageHeader();
 
-	return;
+    return;
 }
 
 $controller->addInlineJavascript('
@@ -82,24 +82,24 @@ 
 $facts = $controller->record->getFacts();
 
 usort(
-	$facts,
-	function (Fact $x, Fact $y) {
-		static $order = array(
-			'NAME' => 0,
-			'ADDR' => 1,
-			'NOTE' => 2,
-			'WWW'  => 3,
-			'REFN' => 4,
-			'RIN'  => 5,
-			'_UID' => 6,
-			'CHAN' => 7,
-		);
-
-		return
-			(array_key_exists($x->getTag(), $order) ? $order[$x->getTag()] : PHP_INT_MAX)
-			-
-			(array_key_exists($y->getTag(), $order) ? $order[$y->getTag()] : PHP_INT_MAX);
-	}
+    $facts,
+    function (Fact $x, Fact $y) {
+        static $order = array(
+            'NAME' => 0,
+            'ADDR' => 1,
+            'NOTE' => 2,
+            'WWW'  => 3,
+            'REFN' => 4,
+            'RIN'  => 5,
+            '_UID' => 6,
+            'CHAN' => 7,
+        );
+
+        return
+            (array_key_exists($x->getTag(), $order) ? $order[$x->getTag()] : PHP_INT_MAX)
+            -
+            (array_key_exists($y->getTag(), $order) ? $order[$y->getTag()] : PHP_INT_MAX);
+    }
 );
 
 ?>
@@ -150,14 +150,14 @@ 
 		<div id="repo-edit">
 			<table class="facts_table">
 				<?php
-				foreach ($facts as $fact) {
-					FunctionsPrintFacts::printFact($fact, $controller->record);
-				}
-
-				if ($controller->record->canEdit()) {
-					FunctionsPrint::printAddNewFact($controller->record->getXref(), $facts, 'REPO');
-				}
-				?>
+                foreach ($facts as $fact) {
+                    FunctionsPrintFacts::printFact($fact, $controller->record);
+                }
+
+                if ($controller->record->canEdit()) {
+                    FunctionsPrint::printAddNewFact($controller->record->getXref(), $facts, 'REPO');
+                }
+                ?>
 			</table>
 		</div>
 

index.php

Indentation +70 added lines, -70 removed lines

@@ -35,16 +35,16 @@ 
 
 // The default view depends on whether we are logged in
 if (Auth::check()) {
-	$ctype = Filter::get('ctype', 'gedcom|user', 'user');
+    $ctype = Filter::get('ctype', 'gedcom|user', 'user');
 } else {
-	$ctype = 'gedcom';
+    $ctype = 'gedcom';
 }
 
 // Get the blocks list
 if ($ctype === 'user') {
-	$blocks = FunctionsDb::getUserBlocks(Auth::id());
+    $blocks = FunctionsDb::getUserBlocks(Auth::id());
 } else {
-	$blocks = FunctionsDb::getTreeBlocks($WT_TREE->getTreeId());
+    $blocks = FunctionsDb::getTreeBlocks($WT_TREE->getTreeId());
 }
 
 $active_blocks = Module::getActiveBlocks($WT_TREE);
@@ -54,91 +54,91 @@ 
 
 // We generate individual blocks using AJAX
 if ($action === 'ajax') {
-	$controller = new AjaxController;
-	$controller->pageHeader();
+    $controller = new AjaxController;
+    $controller->pageHeader();
 
-	// Check we’re displaying an allowable block.
-	$block_id = Filter::getInteger('block_id');
-	if (array_key_exists($block_id, $blocks['main'])) {
-		$module_name = $blocks['main'][$block_id];
-	} elseif (array_key_exists($block_id, $blocks['side'])) {
-		$module_name = $blocks['side'][$block_id];
-	} else {
-		return;
-	}
-	if (array_key_exists($module_name, $active_blocks)) {
-		echo $active_blocks[$module_name]->getBlock($block_id);
-	}
+    // Check we’re displaying an allowable block.
+    $block_id = Filter::getInteger('block_id');
+    if (array_key_exists($block_id, $blocks['main'])) {
+        $module_name = $blocks['main'][$block_id];
+    } elseif (array_key_exists($block_id, $blocks['side'])) {
+        $module_name = $blocks['side'][$block_id];
+    } else {
+        return;
+    }
+    if (array_key_exists($module_name, $active_blocks)) {
+        echo $active_blocks[$module_name]->getBlock($block_id);
+    }
 
-	return;
+    return;
 }
 
 // Redirect search engines to the full URL
 if (Filter::get('ctype') !== $ctype || Filter::get('ged') !== $WT_TREE->getName()) {
-	header('Location: ' . WT_BASE_URL . 'index.php?ctype=' . $ctype . '&ged=' . $WT_TREE->getNameUrl());
+    header('Location: ' . WT_BASE_URL . 'index.php?ctype=' . $ctype . '&ged=' . $WT_TREE->getNameUrl());
 
-	return;
+    return;
 }
 
 $controller = new PageController;
 if ($ctype === 'user') {
-	$controller->restrictAccess(Auth::check());
+    $controller->restrictAccess(Auth::check());
 }
 $controller
-	->setPageTitle($ctype === 'user' ? I18N::translate('My page') : $WT_TREE->getTitle())
-	->setMetaRobots('index,follow')
-	->pageHeader()
-	// By default jQuery modifies AJAX URLs to disable caching, causing JS libraries to be loaded many times.
-	->addInlineJavascript('jQuery.ajaxSetup({cache:true});');
+    ->setPageTitle($ctype === 'user' ? I18N::translate('My page') : $WT_TREE->getTitle())
+    ->setMetaRobots('index,follow')
+    ->pageHeader()
+    // By default jQuery modifies AJAX URLs to disable caching, causing JS libraries to be loaded many times.
+    ->addInlineJavascript('jQuery.ajaxSetup({cache:true});');
 
 if ($ctype === 'user') {
-	echo '<div id="my-page">';
-	echo '<h2 class="center">', I18N::translate('My page'), '</h2>';
+    echo '<div id="my-page">';
+    echo '<h2 class="center">', I18N::translate('My page'), '</h2>';
 } else {
-	echo '<div id="home-page">';
+    echo '<div id="home-page">';
 }
 if ($blocks['main']) {
-	if ($blocks['side']) {
-		echo '<div id="index_main_blocks">';
-	} else {
-		echo '<div id="index_full_blocks">';
-	}
-	foreach ($blocks['main'] as $block_id => $module_name) {
-		if (array_key_exists($module_name, $active_blocks)) {
-			if (Auth::isSearchEngine() || !$active_blocks[$module_name]->loadAjax()) {
-				// Load the block directly
-				echo $active_blocks[$module_name]->getBlock($block_id);
-			} else {
-				// Load the block asynchronously
-				echo '<div id="block_', $block_id, '"><div class="loading-image"></div></div>';
-				$controller->addInlineJavascript(
-					'jQuery("#block_' . $block_id . '").load("index.php?ctype=' . $ctype . '&action=ajax&block_id=' . $block_id . '");'
-				);
-			}
-		}
-	}
-	echo '</div>';
+    if ($blocks['side']) {
+        echo '<div id="index_main_blocks">';
+    } else {
+        echo '<div id="index_full_blocks">';
+    }
+    foreach ($blocks['main'] as $block_id => $module_name) {
+        if (array_key_exists($module_name, $active_blocks)) {
+            if (Auth::isSearchEngine() || !$active_blocks[$module_name]->loadAjax()) {
+                // Load the block directly
+                echo $active_blocks[$module_name]->getBlock($block_id);
+            } else {
+                // Load the block asynchronously
+                echo '<div id="block_', $block_id, '"><div class="loading-image"></div></div>';
+                $controller->addInlineJavascript(
+                    'jQuery("#block_' . $block_id . '").load("index.php?ctype=' . $ctype . '&action=ajax&block_id=' . $block_id . '");'
+                );
+            }
+        }
+    }
+    echo '</div>';
 }
 if ($blocks['side']) {
-	if ($blocks['main']) {
-		echo '<div id="index_small_blocks">';
-	} else {
-		echo '<div id="index_full_blocks">';
-	}
-	foreach ($blocks['side'] as $block_id => $module_name) {
-		if (array_key_exists($module_name, $active_blocks)) {
-			if (Auth::isSearchEngine() || !$active_blocks[$module_name]->loadAjax()) {
-				// Load the block directly
-				echo $active_blocks[$module_name]->getBlock($block_id);
-			} else {
-				// Load the block asynchronously
-				echo '<div id="block_', $block_id, '"><div class="loading-image"></div></div>';
-				$controller->addInlineJavascript(
-					'jQuery("#block_' . $block_id . '").load("index.php?ctype=' . $ctype . '&action=ajax&block_id=' . $block_id . '");'
-				);
-			}
-		}
-	}
-	echo '</div>';
+    if ($blocks['main']) {
+        echo '<div id="index_small_blocks">';
+    } else {
+        echo '<div id="index_full_blocks">';
+    }
+    foreach ($blocks['side'] as $block_id => $module_name) {
+        if (array_key_exists($module_name, $active_blocks)) {
+            if (Auth::isSearchEngine() || !$active_blocks[$module_name]->loadAjax()) {
+                // Load the block directly
+                echo $active_blocks[$module_name]->getBlock($block_id);
+            } else {
+                // Load the block asynchronously
+                echo '<div id="block_', $block_id, '"><div class="loading-image"></div></div>';
+                $controller->addInlineJavascript(
+                    'jQuery("#block_' . $block_id . '").load("index.php?ctype=' . $ctype . '&action=ajax&block_id=' . $block_id . '");'
+                );
+            }
+        }
+    }
+    echo '</div>';
 }
 echo '</div>';

admin_modules.php

Indentation +55 added lines, -55 removed lines

@@ -32,85 +32,85 @@
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isAdmin())
-	->setPageTitle(I18N::translate('Module administration'));
+    ->restrictAccess(Auth::isAdmin())
+    ->setPageTitle(I18N::translate('Module administration'));
 
 $modules       = Module::getInstalledModules('disabled');
 $module_status = Database::prepare("SELECT module_name, status FROM `##module`")->fetchAssoc();
 
 uasort($modules, function (AbstractModule $x, AbstractModule $y) {
-	return I18N::strcasecmp($x->getTitle(), $y->getTitle());
+    return I18N::strcasecmp($x->getTitle(), $y->getTitle());
 });
 
 if (Filter::post('action') === 'update_mods' && Filter::checkCsrf()) {
-	foreach ($modules as $module) {
-		$new_status = Filter::post('status-' . $module->getName(), '[01]');
-		if ($new_status !== null) {
-			$new_status = $new_status ? 'enabled' : 'disabled';
-			$old_status = $module_status[$module->getName()];
-			if ($new_status !== $old_status) {
-				Database::prepare("UPDATE `##module` SET status=? WHERE module_name=?")->execute(array($new_status, $module->getName()));
-				if ($new_status === 'disabled') {
-					FlashMessages::addMessage(I18N::translate('The module “%s” has been disabled.', $module->getTitle()), 'success');
-				} else {
-					FlashMessages::addMessage(I18N::translate('The module “%s” has been enabled.', $module->getTitle()), 'success');
-				}
-			}
-		}
-	}
+    foreach ($modules as $module) {
+        $new_status = Filter::post('status-' . $module->getName(), '[01]');
+        if ($new_status !== null) {
+            $new_status = $new_status ? 'enabled' : 'disabled';
+            $old_status = $module_status[$module->getName()];
+            if ($new_status !== $old_status) {
+                Database::prepare("UPDATE `##module` SET status=? WHERE module_name=?")->execute(array($new_status, $module->getName()));
+                if ($new_status === 'disabled') {
+                    FlashMessages::addMessage(I18N::translate('The module “%s” has been disabled.', $module->getTitle()), 'success');
+                } else {
+                    FlashMessages::addMessage(I18N::translate('The module “%s” has been enabled.', $module->getTitle()), 'success');
+                }
+            }
+        }
+    }
 
-	header('Location: ' . WT_BASE_URL . 'admin_modules.php');
+    header('Location: ' . WT_BASE_URL . 'admin_modules.php');
 
-	return;
+    return;
 }
 
 if (Filter::post('action') === 'delete' && Filter::checkCsrf()) {
-	$module_name = Filter::post('module_name');
-	Database::prepare(
-		"DELETE `##block_setting`" .
-		" FROM `##block_setting`" .
-		" JOIN `##block` USING (block_id)" .
-		" JOIN `##module` USING (module_name)" .
-		" WHERE module_name=?"
-	)->execute(array($module_name));
-	Database::prepare(
-		"DELETE `##block`" .
-		" FROM `##block`" .
-		" JOIN `##module` USING (module_name)" .
-		" WHERE module_name=?"
-	)->execute(array($module_name));
-	Database::prepare("DELETE FROM `##module_setting` WHERE module_name=?")->execute(array($module_name));
-	Database::prepare("DELETE FROM `##module_privacy` WHERE module_name=?")->execute(array($module_name));
-	Database::prepare("DELETE FROM `##module` WHERE module_name=?")->execute(array($module_name));
+    $module_name = Filter::post('module_name');
+    Database::prepare(
+        "DELETE `##block_setting`" .
+        " FROM `##block_setting`" .
+        " JOIN `##block` USING (block_id)" .
+        " JOIN `##module` USING (module_name)" .
+        " WHERE module_name=?"
+    )->execute(array($module_name));
+    Database::prepare(
+        "DELETE `##block`" .
+        " FROM `##block`" .
+        " JOIN `##module` USING (module_name)" .
+        " WHERE module_name=?"
+    )->execute(array($module_name));
+    Database::prepare("DELETE FROM `##module_setting` WHERE module_name=?")->execute(array($module_name));
+    Database::prepare("DELETE FROM `##module_privacy` WHERE module_name=?")->execute(array($module_name));
+    Database::prepare("DELETE FROM `##module` WHERE module_name=?")->execute(array($module_name));
 
-	FlashMessages::addMessage(I18N::translate('The preferences for the module “%s” have been deleted.', $module_name), 'success');
+    FlashMessages::addMessage(I18N::translate('The preferences for the module “%s” have been deleted.', $module_name), 'success');
 
-	header('Location: ' . WT_BASE_URL . 'admin_modules.php');
+    header('Location: ' . WT_BASE_URL . 'admin_modules.php');
 
-	return;
+    return;
 }
 
 // The module can’t be found on disk?
 // Don't delete it automatically. It may be temporarily missing, after a re-installation, etc.
 foreach ($module_status as $module_name => $status) {
-	if (!array_key_exists($module_name, $modules)) {
-		$html =
-			I18N::translate('Preferences exist for the module “%s”, but this module no longer exists.', '<span dir="ltr">' . $module_name . '</span>') .
-			'<form method="post" class="form-inline">' .
-			Filter::getCsrf() .
-			'<input type="hidden" name="action" value="delete">' .
-			'<input type="hidden" name="module_name" value="' . $module_name . '">' .
-			'<button type="submit" class="btn btn-link">' . I18N::translate('Delete the preferences for this module.') . '</button>' .
-			'</form>';
-		FlashMessages::addMessage($html, 'warning');
-	}
+    if (!array_key_exists($module_name, $modules)) {
+        $html =
+            I18N::translate('Preferences exist for the module “%s”, but this module no longer exists.', '<span dir="ltr">' . $module_name . '</span>') .
+            '<form method="post" class="form-inline">' .
+            Filter::getCsrf() .
+            '<input type="hidden" name="action" value="delete">' .
+            '<input type="hidden" name="module_name" value="' . $module_name . '">' .
+            '<button type="submit" class="btn btn-link">' . I18N::translate('Delete the preferences for this module.') . '</button>' .
+            '</form>';
+        FlashMessages::addMessage($html, 'warning');
+    }
 }
 
 $controller
-	->pageHeader()
-	->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-	->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
-	->addInlineJavascript('
+    ->pageHeader()
+    ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+    ->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
+    ->addInlineJavascript('
 		function reindexMods(id) {
 			jQuery("#" + id + " input").each(
 				function (index, value) {

admin_site_clean.php

Indentation +46 added lines, -46 removed lines

@@ -23,45 +23,45 @@ 
 
 $to_delete = Filter::postArray('to_delete');
 if ($to_delete && Filter::checkCsrf()) {
-	foreach ($to_delete as $path) {
-		$is_dir = is_dir(WT_DATA_DIR . $path);
-		if (File::delete(WT_DATA_DIR . $path)) {
-			if ($is_dir) {
-				FlashMessages::addMessage(I18N::translate('The folder %s has been deleted.', Filter::escapeHtml($path)), 'success');
-			} else {
-				FlashMessages::addMessage(I18N::translate('The file %s has been deleted.', Filter::escapeHtml($path)), 'success');
-			}
-		} else {
-			if ($is_dir) {
-				FlashMessages::addMessage(I18N::translate('The folder %s could not be deleted.', Filter::escapeHtml($path)), 'danger');
-			} else {
-				FlashMessages::addMessage(I18N::translate('The file %s could not be deleted.', Filter::escapeHtml($path)), 'danger');
-			}
-		}
-	}
-
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
+    foreach ($to_delete as $path) {
+        $is_dir = is_dir(WT_DATA_DIR . $path);
+        if (File::delete(WT_DATA_DIR . $path)) {
+            if ($is_dir) {
+                FlashMessages::addMessage(I18N::translate('The folder %s has been deleted.', Filter::escapeHtml($path)), 'success');
+            } else {
+                FlashMessages::addMessage(I18N::translate('The file %s has been deleted.', Filter::escapeHtml($path)), 'success');
+            }
+        } else {
+            if ($is_dir) {
+                FlashMessages::addMessage(I18N::translate('The folder %s could not be deleted.', Filter::escapeHtml($path)), 'danger');
+            } else {
+                FlashMessages::addMessage(I18N::translate('The file %s could not be deleted.', Filter::escapeHtml($path)), 'danger');
+            }
+        }
+    }
+
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+    return;
 }
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isAdmin())
-	->setPageTitle(/* I18N: The “Data folder” is a configuration setting */ I18N::translate('Clean up data folder'))
-	->pageHeader();
+    ->restrictAccess(Auth::isAdmin())
+    ->setPageTitle(/* I18N: The “Data folder” is a configuration setting */ I18N::translate('Clean up data folder'))
+    ->pageHeader();
 
 $do_not_delete = array('index.php', 'config.ini.php', 'language');
 
 // If we are storing the media in the data folder (this is the default), then don’t delete it.
 foreach (Tree::getAll() as $tree) {
-	$MEDIA_DIRECTORY = $tree->getPreference('MEDIA_DIRECTORY');
+    $MEDIA_DIRECTORY = $tree->getPreference('MEDIA_DIRECTORY');
 
-	if (substr($MEDIA_DIRECTORY, 0, 3) != '../') {
-		// Just need to add the first part of the path
-		$tmp             = explode('/', $MEDIA_DIRECTORY);
-		$do_not_delete[] = $tmp[0];
-	}
+    if (substr($MEDIA_DIRECTORY, 0, 3) != '../') {
+        // Just need to add the first part of the path
+        $tmp             = explode('/', $MEDIA_DIRECTORY);
+        $do_not_delete[] = $tmp[0];
+    }
 }
 
 $locked_icon = '<i class="fa fa-ban text-danger"></i>';
@@ -69,9 +69,9 @@ 
 $dir     = dir(WT_DATA_DIR);
 $entries = array();
 while (false !== ($entry = $dir->read())) {
-	if ($entry[0] != '.') {
-		$entries[] = $entry;
-	}
+    if ($entry[0] != '.') {
+        $entries[] = $entry;
+    }
 }
 
 sort($entries);
@@ -94,20 +94,20 @@ 
 		<legend class="sr-only"><?php echo $controller->getPageTitle(); ?></legend>
 		<ul class="fa-ul">
 			<?php
-			foreach ($entries as $entry) {
-				if (in_array($entry, $do_not_delete)) {
-					echo '<li><i class="fa-li fa fa-ban text-danger"></i>', Filter::escapeHtml($entry), '</li>';
-				} else {
-					$id = 'input-' . Uuid::uuid4();
-					echo '<li><i class="fa-li fa fa-trash-o"></i>';
-					echo '<label for="', $id, '">';
-					echo '<input type="checkbox" id="', $id, '" name="to_delete[]" value="', Filter::escapeHtml($entry), '"> ';
-					echo Filter::escapeHtml($entry);
-					echo '</label></li>';
-				}
-			}
-			$dir->close();
-			?>
+            foreach ($entries as $entry) {
+                if (in_array($entry, $do_not_delete)) {
+                    echo '<li><i class="fa-li fa fa-ban text-danger"></i>', Filter::escapeHtml($entry), '</li>';
+                } else {
+                    $id = 'input-' . Uuid::uuid4();
+                    echo '<li><i class="fa-li fa fa-trash-o"></i>';
+                    echo '<label for="', $id, '">';
+                    echo '<input type="checkbox" id="', $id, '" name="to_delete[]" value="', Filter::escapeHtml($entry), '"> ';
+                    echo Filter::escapeHtml($entry);
+                    echo '</label></li>';
+                }
+            }
+            $dir->close();
+            ?>
 		</ul>
 	</fieldset>
 	<button class="btn btn-danger" type="submit">

admin_trees_places.php

Indentation +46 added lines, -46 removed lines

@@ -34,56 +34,56 @@
 $changes = array();
 
 if ($search && $replace) {
-	$rows = Database::prepare(
-		"SELECT i_id AS xref, i_gedcom AS gedcom" .
-		" FROM `##individuals`" .
-		" LEFT JOIN `##change` ON (i_id = xref AND i_file=gedcom_id AND status='pending')" .
-		" WHERE i_file = ?" .
-		" AND COALESCE(new_gedcom, i_gedcom) REGEXP CONCAT('\n2 PLAC ([^\n]*, )*', ?, '(\n|$)')"
-	)->execute(array($WT_TREE->getTreeId(), preg_quote($search)))->fetchAll();
-	foreach ($rows as $row) {
-		$record = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		foreach ($record->getFacts() as $fact) {
-			$old_place = $fact->getAttribute('PLAC');
-			if (preg_match('/(^|, )' . preg_quote($search, '/') . '$/i', $old_place)) {
-				$new_place           = preg_replace('/(^|, )' . preg_quote($search, '/') . '$/i', '$1' . $replace, $old_place);
-				$changes[$old_place] = $new_place;
-				if ($confirm == 'update') {
-					$gedcom = preg_replace('/(\n2 PLAC (?:.*, )*)' . preg_quote($search, '/') . '(\n|$)/i', '$1' . $replace . '$2', $fact->getGedcom());
-					$record->updateFact($fact->getFactId(), $gedcom, false);
-				}
-			}
-		}
-	}
-	$rows = Database::prepare(
-		"SELECT f_id AS xref, f_gedcom AS gedcom" .
-		" FROM `##families`" .
-		" LEFT JOIN `##change` ON (f_id = xref AND f_file=gedcom_id AND status='pending')" .
-		" WHERE f_file = ?" .
-		" AND COALESCE(new_gedcom, f_gedcom) REGEXP CONCAT('\n2 PLAC ([^\n]*, )*', ?, '(\n|$)')"
-	)->execute(array($WT_TREE->getTreeId(), preg_quote($search)))->fetchAll();
-	foreach ($rows as $row) {
-		$record = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		foreach ($record->getFacts() as $fact) {
-			$old_place = $fact->getAttribute('PLAC');
-			if (preg_match('/(^|, )' . preg_quote($search, '/') . '$/i', $old_place)) {
-				$new_place           = preg_replace('/(^|, )' . preg_quote($search, '/') . '$/i', '$1' . $replace, $old_place);
-				$changes[$old_place] = $new_place;
-				if ($confirm == 'update') {
-					$gedcom = preg_replace('/(\n2 PLAC (?:.*, )*)' . preg_quote($search, '/') . '(\n|$)/i', '$1' . $replace . '$2', $fact->getGedcom());
-					$record->updateFact($fact->getFactId(), $gedcom, false);
-				}
-			}
-		}
-	}
+    $rows = Database::prepare(
+        "SELECT i_id AS xref, i_gedcom AS gedcom" .
+        " FROM `##individuals`" .
+        " LEFT JOIN `##change` ON (i_id = xref AND i_file=gedcom_id AND status='pending')" .
+        " WHERE i_file = ?" .
+        " AND COALESCE(new_gedcom, i_gedcom) REGEXP CONCAT('\n2 PLAC ([^\n]*, )*', ?, '(\n|$)')"
+    )->execute(array($WT_TREE->getTreeId(), preg_quote($search)))->fetchAll();
+    foreach ($rows as $row) {
+        $record = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+        foreach ($record->getFacts() as $fact) {
+            $old_place = $fact->getAttribute('PLAC');
+            if (preg_match('/(^|, )' . preg_quote($search, '/') . '$/i', $old_place)) {
+                $new_place           = preg_replace('/(^|, )' . preg_quote($search, '/') . '$/i', '$1' . $replace, $old_place);
+                $changes[$old_place] = $new_place;
+                if ($confirm == 'update') {
+                    $gedcom = preg_replace('/(\n2 PLAC (?:.*, )*)' . preg_quote($search, '/') . '(\n|$)/i', '$1' . $replace . '$2', $fact->getGedcom());
+                    $record->updateFact($fact->getFactId(), $gedcom, false);
+                }
+            }
+        }
+    }
+    $rows = Database::prepare(
+        "SELECT f_id AS xref, f_gedcom AS gedcom" .
+        " FROM `##families`" .
+        " LEFT JOIN `##change` ON (f_id = xref AND f_file=gedcom_id AND status='pending')" .
+        " WHERE f_file = ?" .
+        " AND COALESCE(new_gedcom, f_gedcom) REGEXP CONCAT('\n2 PLAC ([^\n]*, )*', ?, '(\n|$)')"
+    )->execute(array($WT_TREE->getTreeId(), preg_quote($search)))->fetchAll();
+    foreach ($rows as $row) {
+        $record = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+        foreach ($record->getFacts() as $fact) {
+            $old_place = $fact->getAttribute('PLAC');
+            if (preg_match('/(^|, )' . preg_quote($search, '/') . '$/i', $old_place)) {
+                $new_place           = preg_replace('/(^|, )' . preg_quote($search, '/') . '$/i', '$1' . $replace, $old_place);
+                $changes[$old_place] = $new_place;
+                if ($confirm == 'update') {
+                    $gedcom = preg_replace('/(\n2 PLAC (?:.*, )*)' . preg_quote($search, '/') . '(\n|$)/i', '$1' . $replace . '$2', $fact->getGedcom());
+                    $record->updateFact($fact->getFactId(), $gedcom, false);
+                }
+            }
+        }
+    }
 }
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isManager($WT_TREE))
-	->setPageTitle(I18N::translate('Update all the place names in a family tree') . ' — ' . $WT_TREE->getTitleHtml())
-	->addInlineJavascript('autocomplete();')
-	->pageHeader();
+    ->restrictAccess(Auth::isManager($WT_TREE))
+    ->setPageTitle(I18N::translate('Update all the place names in a family tree') . ' — ' . $WT_TREE->getTitleHtml())
+    ->addInlineJavascript('autocomplete();')
+    ->pageHeader();
 ?>
 
 <ol class="breadcrumb small">

family.php

Indentation +49 added lines, -49 removed lines

@@ -33,38 +33,38 @@ 
 $controller = new FamilyController($record);
 
 if ($controller->record && $controller->record->canShow()) {
-	if ($controller->record->isPendingDeletion()) {
-		if (Auth::isModerator($controller->record->getTree())) {
-			FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
-				'This family has been deleted. You should review the deletion and then %1$s or %2$s it.',
-				'<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>',
-				'<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>'
-			) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		} elseif (Auth::isEditor($controller->record->getTree())) {
-			FlashMessages::addMessage(I18N::translate('This family has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		}
-	} elseif ($controller->record->isPendingAddtion()) {
-		if (Auth::isModerator($controller->record->getTree())) {
-			FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
-				'This family has been edited. You should review the changes and then %1$s or %2$s them.',
-				'<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>',
-				'<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>'
-			) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		} elseif (Auth::isEditor($controller->record->getTree())) {
-			FlashMessages::addMessage(I18N::translate('This family has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
-		}
-	}
-	$controller->pageHeader();
+    if ($controller->record->isPendingDeletion()) {
+        if (Auth::isModerator($controller->record->getTree())) {
+            FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
+                'This family has been deleted. You should review the deletion and then %1$s or %2$s it.',
+                '<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'accept') . '</a>',
+                '<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the deletion and then accept or reject it.', 'reject') . '</a>'
+            ) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        } elseif (Auth::isEditor($controller->record->getTree())) {
+            FlashMessages::addMessage(I18N::translate('This family has been deleted. The deletion will need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        }
+    } elseif ($controller->record->isPendingAddtion()) {
+        if (Auth::isModerator($controller->record->getTree())) {
+            FlashMessages::addMessage(/* I18N: %1$s is “accept”, %2$s is “reject”. These are links. */ I18N::translate(
+                'This family has been edited. You should review the changes and then %1$s or %2$s them.',
+                '<a href="#" onclick="accept_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'accept') . '</a>',
+                '<a href="#" onclick="reject_changes(\'' . $controller->record->getXref() . '\');">' . I18N::translateContext('You should review the changes and then accept or reject them.', 'reject') . '</a>'
+            ) . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        } elseif (Auth::isEditor($controller->record->getTree())) {
+            FlashMessages::addMessage(I18N::translate('This family has been edited. The changes need to be reviewed by a moderator.') . ' ' . FunctionsPrint::helpLink('pending_changes'), 'warning');
+        }
+    }
+    $controller->pageHeader();
 } elseif ($controller->record && $controller->record->getTree()->getPreference('SHOW_PRIVATE_RELATIONSHIPS')) {
-	$controller->pageHeader();
-	// Continue - to display the children/parents/grandparents.
-	// We'll check for showing the details again later
+    $controller->pageHeader();
+    // Continue - to display the children/parents/grandparents.
+    // We'll check for showing the details again later
 } else {
-	FlashMessages::addMessage(I18N::translate('This family does not exist or you do not have permission to view it.'), 'danger');
-	http_response_code(404);
-	$controller->pageHeader();
+    FlashMessages::addMessage(I18N::translate('This family does not exist or you do not have permission to view it.'), 'danger');
+    http_response_code(404);
+    $controller->pageHeader();
 
-	return;
+    return;
 }
 
 ?>
@@ -85,32 +85,32 @@ 
 					<tr>
 						<td colspan="2">
 							<?php
-							FunctionsCharts::printFamilyParents($controller->record);
-							if (Auth::isEditor($controller->record->getTree())) {
-								$husb = $controller->record->getHusband();
-								if (!$husb) {
-									echo '<a href="#" onclick="return add_spouse_to_family(\'', $controller->record->getXref(), '\', \'HUSB\');">', I18N::translate('Add a father'), '</a><br>';
-								}
-								$wife = $controller->record->getWife();
-								if (!$wife) {
-									echo '<a href="#" onclick="return add_spouse_to_family(\'', $controller->record->getXref(), '\', \'WIFE\');">', I18N::translate('Add a mother'), '</a><br>';
-								}
-							}
-							?>
+                            FunctionsCharts::printFamilyParents($controller->record);
+                            if (Auth::isEditor($controller->record->getTree())) {
+                                $husb = $controller->record->getHusband();
+                                if (!$husb) {
+                                    echo '<a href="#" onclick="return add_spouse_to_family(\'', $controller->record->getXref(), '\', \'HUSB\');">', I18N::translate('Add a father'), '</a><br>';
+                                }
+                                $wife = $controller->record->getWife();
+                                if (!$wife) {
+                                    echo '<a href="#" onclick="return add_spouse_to_family(\'', $controller->record->getXref(), '\', \'WIFE\');">', I18N::translate('Add a mother'), '</a><br>';
+                                }
+                            }
+                            ?>
 						</td>
 					</tr>
 					<tr>
 						<td colspan="2">
 							<span class="subheaders"><?php echo I18N::translate('Family group information'); ?></span>
 							<?php
-							if ($controller->record->canShow()) {
-								echo '<table class="facts_table">';
-								$controller->printFamilyFacts();
-								echo '</table>';
-							} else {
-								echo '<p>', I18N::translate('The details of this family are private.'), '</p>';
-							}
-							?>
+                            if ($controller->record->canShow()) {
+                                echo '<table class="facts_table">';
+                                $controller->printFamilyFacts();
+                                echo '</table>';
+                            } else {
+                                echo '<p>', I18N::translate('The details of this family are private.'), '</p>';
+                            }
+                            ?>
 						</td>
 					</tr>
 				</table>

admin_site_change.php

Indentation +156 added lines, -156 removed lines

@@ -32,8 +32,8 @@ 
 
 $controller = new PageController;
 $controller
-	->restrictAccess(Auth::isManager($WT_TREE))
-	->setPageTitle(I18N::translate('Changes'));
+    ->restrictAccess(Auth::isManager($WT_TREE))
+    ->setPageTitle(I18N::translate('Changes'));
 
 $earliest = Database::prepare("SELECT IFNULL(DATE(MIN(change_time)), CURDATE()) FROM `##change`")->execute(array())->fetchOne();
 $latest   = Database::prepare("SELECT IFNULL(DATE(MAX(change_time)), CURDATE()) FROM `##change`")->execute(array())->fetchOne();
@@ -51,197 +51,197 @@ 
 $search = isset($search['value']) ? $search['value'] : null;
 
 $statuses = array(
-	'accepted' => /* I18N: the status of an edit accepted/rejected/pending */ I18N::translate('accepted'),
-	'rejected' => /* I18N: the status of an edit accepted/rejected/pending */ I18N::translate('rejected'),
-	'pending'  => /* I18N: the status of an edit accepted/rejected/pending */ I18N::translate('pending'),
+    'accepted' => /* I18N: the status of an edit accepted/rejected/pending */ I18N::translate('accepted'),
+    'rejected' => /* I18N: the status of an edit accepted/rejected/pending */ I18N::translate('rejected'),
+    'pending'  => /* I18N: the status of an edit accepted/rejected/pending */ I18N::translate('pending'),
 );
 
 if (Auth::isAdmin()) {
-	// Administrators can see all logs
-	$gedc = Filter::get('gedc');
+    // Administrators can see all logs
+    $gedc = Filter::get('gedc');
 } else {
-	// Managers can only see logs relating to this gedcom
-	$gedc = $WT_TREE->getName();
+    // Managers can only see logs relating to this gedcom
+    $gedc = $WT_TREE->getName();
 }
 
 $sql_select =
-	"SELECT SQL_CALC_FOUND_ROWS change_id, change_time, status, xref, old_gedcom, new_gedcom, IFNULL(user_name, '<none>') AS user_name, IFNULL(gedcom_name, '<none>') AS gedcom_name" .
-	" FROM `##change`" .
-	" LEFT JOIN `##user` USING (user_id)" . // user may be deleted
-	" LEFT JOIN `##gedcom` USING (gedcom_id)"; // gedcom may be deleted
+    "SELECT SQL_CALC_FOUND_ROWS change_id, change_time, status, xref, old_gedcom, new_gedcom, IFNULL(user_name, '<none>') AS user_name, IFNULL(gedcom_name, '<none>') AS gedcom_name" .
+    " FROM `##change`" .
+    " LEFT JOIN `##user` USING (user_id)" . // user may be deleted
+    " LEFT JOIN `##gedcom` USING (gedcom_id)"; // gedcom may be deleted
 
 $where = " WHERE 1";
 $args  = array();
 if ($search) {
-	$where .= " AND (old_gedcom LIKE CONCAT('%', :search_1, '%') OR new_gedcom LIKE CONCAT('%', :search_2, '%'))";
-	$args['search_1'] = $search;
-	$args['search_2'] = $search;
+    $where .= " AND (old_gedcom LIKE CONCAT('%', :search_1, '%') OR new_gedcom LIKE CONCAT('%', :search_2, '%'))";
+    $args['search_1'] = $search;
+    $args['search_2'] = $search;
 }
 if ($from) {
-	$where .= " AND change_time >= :from";
-	$args['from'] = $from;
+    $where .= " AND change_time >= :from";
+    $args['from'] = $from;
 }
 if ($to) {
-	$where .= " AND change_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
-	$args['to'] = $to;
+    $where .= " AND change_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
+    $args['to'] = $to;
 }
 if ($type) {
-	$where .= " AND status = :status";
-	$args['status'] = $type;
+    $where .= " AND status = :status";
+    $args['status'] = $type;
 }
 if ($oldged) {
-	$where .= " AND old_gedcom LIKE CONCAT('%', :old_ged, '%')";
-	$args['old_ged'] = $oldged;
+    $where .= " AND old_gedcom LIKE CONCAT('%', :old_ged, '%')";
+    $args['old_ged'] = $oldged;
 }
 if ($newged) {
-	$where .= " AND new_gedcom LIKE CONCAT('%', :new_ged, '%')";
-	$args['new_ged'] = $newged;
+    $where .= " AND new_gedcom LIKE CONCAT('%', :new_ged, '%')";
+    $args['new_ged'] = $newged;
 }
 if ($xref) {
-	$where .= " AND xref = :xref";
-	$args['xref'] = $xref;
+    $where .= " AND xref = :xref";
+    $args['xref'] = $xref;
 }
 if ($user) {
-	$where .= " AND user_name LIKE CONCAT('%', :user, '%')";
-	$args['user'] = $user;
+    $where .= " AND user_name LIKE CONCAT('%', :user, '%')";
+    $args['user'] = $user;
 }
 if ($gedc) {
-	$where .= " AND gedcom_name LIKE CONCAT('%', :gedc, '%')";
-	$args['gedc'] = $gedc;
+    $where .= " AND gedcom_name LIKE CONCAT('%', :gedc, '%')";
+    $args['gedc'] = $gedc;
 }
 
 switch ($action) {
 case 'delete':
-	$sql_delete =
-		"DELETE `##change` FROM `##change`" .
-		" LEFT JOIN `##user` USING (user_id)" . // user may be deleted
-		" LEFT JOIN `##gedcom` USING (gedcom_id)"; // gedcom may be deleted
+    $sql_delete =
+        "DELETE `##change` FROM `##change`" .
+        " LEFT JOIN `##user` USING (user_id)" . // user may be deleted
+        " LEFT JOIN `##gedcom` USING (gedcom_id)"; // gedcom may be deleted
 
-	Database::prepare($sql_delete . $where)->execute($args);
-	break;
+    Database::prepare($sql_delete . $where)->execute($args);
+    break;
 
 case 'export':
-	header('Content-Type: text/csv');
-	header('Content-Disposition: attachment; filename="webtrees-changes.csv"');
-	$rows = Database::prepare($sql_select . $where . ' ORDER BY change_id')->execute($args)->fetchAll();
-	foreach ($rows as $row) {
-		echo
-			'"', $row->change_time, '",',
-			'"', $row->status, '",',
-			'"', $row->xref, '",',
-			'"', str_replace('"', '""', $row->old_gedcom), '",',
-			'"', str_replace('"', '""', $row->new_gedcom), '",',
-			'"', str_replace('"', '""', $row->user_name), '",',
-			'"', str_replace('"', '""', $row->gedcom_name), '"',
-			"\n";
-	}
-
-	return;
+    header('Content-Type: text/csv');
+    header('Content-Disposition: attachment; filename="webtrees-changes.csv"');
+    $rows = Database::prepare($sql_select . $where . ' ORDER BY change_id')->execute($args)->fetchAll();
+    foreach ($rows as $row) {
+        echo
+            '"', $row->change_time, '",',
+            '"', $row->status, '",',
+            '"', $row->xref, '",',
+            '"', str_replace('"', '""', $row->old_gedcom), '",',
+            '"', str_replace('"', '""', $row->new_gedcom), '",',
+            '"', str_replace('"', '""', $row->user_name), '",',
+            '"', str_replace('"', '""', $row->gedcom_name), '"',
+            "\n";
+    }
+
+    return;
 case 'load_json':
-	$start  = Filter::getInteger('start');
-	$length = Filter::getInteger('length');
-	$order  = Filter::getArray('order');
-
-	if ($order) {
-		$order_by = " ORDER BY ";
-		foreach ($order as $key => $value) {
-			if ($key > 0) {
-				$order_by .= ',';
-			}
-			// Datatables numbers columns 0, 1, 2
-			// MySQL numbers columns 1, 2, 3
-			switch ($value['dir']) {
-			case 'asc':
-				$order_by .= (1 + $value['column']) . " ASC ";
-				break;
-			case 'desc':
-				$order_by .= (1 + $value['column']) . " DESC ";
-				break;
-			}
-		}
-	} else {
-		$order_by = " ORDER BY 1 DESC";
-	}
-
-	if ($length) {
-		Auth::user()->setPreference('admin_site_change_page_size', $length);
-		$limit          = " LIMIT :limit OFFSET :offset";
-		$args['limit']  = $length;
-		$args['offset'] = $start;
-	} else {
-		$limit = "";
-	}
-
-	// This becomes a JSON list, not array, so need to fetch with numeric keys.
-	$rows = Database::prepare($sql_select . $where . $order_by . $limit)->execute($args)->fetchAll(PDO::FETCH_OBJ);
-	// Total filtered/unfiltered rows
-	$recordsFiltered = (int) Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
-	$recordsTotal    = (int) Database::prepare("SELECT COUNT(*) FROM `##change`")->fetchOne();
-
-	$data      = array();
-	$algorithm = new MyersDiff;
-
-	foreach ($rows as $row) {
-		$old_lines = preg_split('/[\n]+/', $row->old_gedcom, -1, PREG_SPLIT_NO_EMPTY);
-		$new_lines = preg_split('/[\n]+/', $row->new_gedcom, -1, PREG_SPLIT_NO_EMPTY);
-
-		$differences = $algorithm->calculate($old_lines, $new_lines);
-		$diff_lines  = array();
-
-		foreach ($differences as $difference) {
-			switch ($difference[1]) {
-			case MyersDiff::DELETE:
-				$diff_lines[] = '<del>' . $difference[0] . '</del>';
-				break;
-			case MyersDiff::INSERT:
-				$diff_lines[] = '<ins>' . $difference[0] . '</ins>';
-				break;
-			default:
-				$diff_lines[] = $difference[0];
-			}
-		}
-
-		// Only convert valid xrefs to links
-		$record = GedcomRecord::getInstance($row->xref, Tree::findByName($gedc));
-		$data[] = array(
-			$row->change_id,
-			$row->change_time,
-			I18N::translate($row->status),
-			$record ? '<a href="' . $record->getHtmlUrl() . '">' . $record->getXref() . '</a>' : $row->xref,
-			'<div class="gedcom-data" dir="ltr">' .
-				preg_replace_callback('/@(' . WT_REGEX_XREF . ')@/',
-					function ($match) use ($gedc) {
-						$record = GedcomRecord::getInstance($match[1], Tree::findByName($gedc));
-
-						return $record ? '<a href="#" onclick="return edit_raw(\'' . $match[1] . '\');">' . $match[0] . '</a>' : $match[0];
-					},
-					implode("\n", $diff_lines)
-				) .
-			'</div>',
-			$row->user_name,
-			$row->gedcom_name,
-		);
-	}
-
-	header('Content-type: application/json');
-	// See http://www.datatables.net/usage/server-side
-	echo json_encode(array(
-		'draw'            => Filter::getInteger('draw'),
-		'recordsTotal'    => $recordsTotal,
-		'recordsFiltered' => $recordsFiltered,
-		'data'            => $data,
-	));
-
-	return;
+    $start  = Filter::getInteger('start');
+    $length = Filter::getInteger('length');
+    $order  = Filter::getArray('order');
+
+    if ($order) {
+        $order_by = " ORDER BY ";
+        foreach ($order as $key => $value) {
+            if ($key > 0) {
+                $order_by .= ',';
+            }
+            // Datatables numbers columns 0, 1, 2
+            // MySQL numbers columns 1, 2, 3
+            switch ($value['dir']) {
+            case 'asc':
+                $order_by .= (1 + $value['column']) . " ASC ";
+                break;
+            case 'desc':
+                $order_by .= (1 + $value['column']) . " DESC ";
+                break;
+            }
+        }
+    } else {
+        $order_by = " ORDER BY 1 DESC";
+    }
+
+    if ($length) {
+        Auth::user()->setPreference('admin_site_change_page_size', $length);
+        $limit          = " LIMIT :limit OFFSET :offset";
+        $args['limit']  = $length;
+        $args['offset'] = $start;
+    } else {
+        $limit = "";
+    }
+
+    // This becomes a JSON list, not array, so need to fetch with numeric keys.
+    $rows = Database::prepare($sql_select . $where . $order_by . $limit)->execute($args)->fetchAll(PDO::FETCH_OBJ);
+    // Total filtered/unfiltered rows
+    $recordsFiltered = (int) Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
+    $recordsTotal    = (int) Database::prepare("SELECT COUNT(*) FROM `##change`")->fetchOne();
+
+    $data      = array();
+    $algorithm = new MyersDiff;
+
+    foreach ($rows as $row) {
+        $old_lines = preg_split('/[\n]+/', $row->old_gedcom, -1, PREG_SPLIT_NO_EMPTY);
+        $new_lines = preg_split('/[\n]+/', $row->new_gedcom, -1, PREG_SPLIT_NO_EMPTY);
+
+        $differences = $algorithm->calculate($old_lines, $new_lines);
+        $diff_lines  = array();
+
+        foreach ($differences as $difference) {
+            switch ($difference[1]) {
+            case MyersDiff::DELETE:
+                $diff_lines[] = '<del>' . $difference[0] . '</del>';
+                break;
+            case MyersDiff::INSERT:
+                $diff_lines[] = '<ins>' . $difference[0] . '</ins>';
+                break;
+            default:
+                $diff_lines[] = $difference[0];
+            }
+        }
+
+        // Only convert valid xrefs to links
+        $record = GedcomRecord::getInstance($row->xref, Tree::findByName($gedc));
+        $data[] = array(
+            $row->change_id,
+            $row->change_time,
+            I18N::translate($row->status),
+            $record ? '<a href="' . $record->getHtmlUrl() . '">' . $record->getXref() . '</a>' : $row->xref,
+            '<div class="gedcom-data" dir="ltr">' .
+                preg_replace_callback('/@(' . WT_REGEX_XREF . ')@/',
+                    function ($match) use ($gedc) {
+                        $record = GedcomRecord::getInstance($match[1], Tree::findByName($gedc));
+
+                        return $record ? '<a href="#" onclick="return edit_raw(\'' . $match[1] . '\');">' . $match[0] . '</a>' : $match[0];
+                    },
+                    implode("\n", $diff_lines)
+                ) .
+            '</div>',
+            $row->user_name,
+            $row->gedcom_name,
+        );
+    }
+
+    header('Content-type: application/json');
+    // See http://www.datatables.net/usage/server-side
+    echo json_encode(array(
+        'draw'            => Filter::getInteger('draw'),
+        'recordsTotal'    => $recordsTotal,
+        'recordsFiltered' => $recordsFiltered,
+        'data'            => $data,
+    ));
+
+    return;
 }
 
 $controller
-	->pageHeader()
-	->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-	->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
-	->addExternalJavascript(WT_MOMENT_JS_URL)
-	->addExternalJavascript(WT_BOOTSTRAP_DATETIMEPICKER_JS_URL)
-	->addInlineJavascript('
+    ->pageHeader()
+    ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+    ->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
+    ->addExternalJavascript(WT_MOMENT_JS_URL)
+    ->addExternalJavascript(WT_BOOTSTRAP_DATETIMEPICKER_JS_URL)
+    ->addInlineJavascript('
 		jQuery(".table-site-changes").dataTable( {
 			processing: true,
 			serverSide: true,
@@ -280,7 +280,7 @@ 
 
 $users_array = array();
 foreach (User::all() as $tmp_user) {
-	$users_array[$tmp_user->getUserName()] = $tmp_user->getUserName();
+    $users_array[$tmp_user->getUserName()] = $tmp_user->getUserName();
 }
 
 ?>

admin_users.php

Indentation +300 added lines, -300 removed lines

@@ -36,248 +36,248 @@ 
 
 // Valid values for form variables
 $ALL_EDIT_OPTIONS = array(
-	'none'   => /* I18N: Listbox entry; name of a role */ I18N::translate('Visitor'),
-	'access' => /* I18N: Listbox entry; name of a role */ I18N::translate('Member'),
-	'edit'   => /* I18N: Listbox entry; name of a role */ I18N::translate('Editor'),
-	'accept' => /* I18N: Listbox entry; name of a role */ I18N::translate('Moderator'),
-	'admin'  => /* I18N: Listbox entry; name of a role */ I18N::translate('Manager'),
+    'none'   => /* I18N: Listbox entry; name of a role */ I18N::translate('Visitor'),
+    'access' => /* I18N: Listbox entry; name of a role */ I18N::translate('Member'),
+    'edit'   => /* I18N: Listbox entry; name of a role */ I18N::translate('Editor'),
+    'accept' => /* I18N: Listbox entry; name of a role */ I18N::translate('Moderator'),
+    'admin'  => /* I18N: Listbox entry; name of a role */ I18N::translate('Manager'),
 );
 
 // Form actions
 switch (Filter::post('action')) {
 case 'save':
-	if (Filter::checkCsrf()) {
-		$user_id        = Filter::postInteger('user_id');
-		$user           = User::find($user_id);
-		$username       = Filter::post('username');
-		$real_name      = Filter::post('real_name');
-		$email          = Filter::postEmail('email');
-		$pass1          = Filter::post('pass1', WT_REGEX_PASSWORD);
-		$pass2          = Filter::post('pass2', WT_REGEX_PASSWORD);
-		$theme          = Filter::post('theme', implode('|', array_keys(Theme::themeNames())), '');
-		$language       = Filter::post('language');
-		$timezone       = Filter::post('timezone');
-		$contact_method = Filter::post('contact_method');
-		$comment        = Filter::post('comment');
-		$auto_accept    = Filter::postBool('auto_accept');
-		$canadmin       = Filter::postBool('canadmin');
-		$visible_online = Filter::postBool('visible_online');
-		$verified       = Filter::postBool('verified');
-		$approved       = Filter::postBool('approved');
-
-		if ($user_id === 0) {
-			// Create a new user
-			if (User::findByUserName($username)) {
-				FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
-			} elseif (User::findByEmail($email)) {
-				FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
-			} elseif ($pass1 !== $pass2) {
-				FlashMessages::addMessage(I18N::translate('The passwords do not match.'));
-			} else {
-				$user = User::create($username, $real_name, $email, $pass1);
-				$user->setPreference('reg_timestamp', date('U'))->setPreference('sessiontime', '0');
-				Log::addAuthenticationLog('User ->' . $username . '<- created');
-			}
-		} else {
-			$user = User::find($user_id);
-			if ($user && $username && $real_name) {
-				$user->setEmail($email);
-				$user->setUserName($username);
-				$user->setRealName($real_name);
-				if ($pass1 !== null && $pass1 === $pass2) {
-					$user->setPassword($pass1);
-				}
-			}
-		}
-
-		if ($user) {
-			// Approving for the first time? Send a confirmation email
-			if ($approved && !$user->getPreference('verified_by_admin') && $user->getPreference('sessiontime') == 0) {
-				I18N::init($user->getPreference('language'));
-				Mail::systemMessage(
-					$WT_TREE,
-					$user,
-					I18N::translate('Approval of account at %s', WT_BASE_URL),
-					I18N::translate('The administrator at the webtrees site %s has approved your application for an account. You may now sign in by accessing the following link: %s', WT_BASE_URL, WT_BASE_URL)
-				);
-			}
-
-			$user
-				->setPreference('theme', $theme)
-				->setPreference('language', $language)
-				->setPreference('TIMEZONE', $timezone)
-				->setPreference('contactmethod', $contact_method)
-				->setPreference('comment', $comment)
-				->setPreference('auto_accept', $auto_accept ? '1' : '0')
-				->setPreference('visibleonline', $visible_online ? '1' : '0')
-				->setPreference('verified', $verified ? '1' : '0')
-				->setPreference('verified_by_admin', $approved ? '1' : '0');
-
-			// We cannot change our own admin status. Another admin will need to do it.
-			if ($user->getUserId() !== Auth::id()) {
-				$user->setPreference('canadmin', $canadmin ? '1' : '0');
-			}
-
-			foreach (Tree::getAll() as $tree) {
-				$tree->setUserPreference($user, 'gedcomid', Filter::post('gedcomid' . $tree->getTreeId(), WT_REGEX_XREF));
-				$tree->setUserPreference($user, 'canedit', Filter::post('canedit' . $tree->getTreeId(), implode('|', array_keys($ALL_EDIT_OPTIONS))));
-				if (Filter::post('gedcomid' . $tree->getTreeId(), WT_REGEX_XREF)) {
-					$tree->setUserPreference($user, 'RELATIONSHIP_PATH_LENGTH', Filter::postInteger('RELATIONSHIP_PATH_LENGTH' . $tree->getTreeId(), 0, 10, 0));
-				} else {
-					// Do not allow a path length to be set if the individual ID is not
-					$tree->setUserPreference($user, 'RELATIONSHIP_PATH_LENGTH', null);
-				}
-			}
-		}
-	}
-
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-
-	return;
+    if (Filter::checkCsrf()) {
+        $user_id        = Filter::postInteger('user_id');
+        $user           = User::find($user_id);
+        $username       = Filter::post('username');
+        $real_name      = Filter::post('real_name');
+        $email          = Filter::postEmail('email');
+        $pass1          = Filter::post('pass1', WT_REGEX_PASSWORD);
+        $pass2          = Filter::post('pass2', WT_REGEX_PASSWORD);
+        $theme          = Filter::post('theme', implode('|', array_keys(Theme::themeNames())), '');
+        $language       = Filter::post('language');
+        $timezone       = Filter::post('timezone');
+        $contact_method = Filter::post('contact_method');
+        $comment        = Filter::post('comment');
+        $auto_accept    = Filter::postBool('auto_accept');
+        $canadmin       = Filter::postBool('canadmin');
+        $visible_online = Filter::postBool('visible_online');
+        $verified       = Filter::postBool('verified');
+        $approved       = Filter::postBool('approved');
+
+        if ($user_id === 0) {
+            // Create a new user
+            if (User::findByUserName($username)) {
+                FlashMessages::addMessage(I18N::translate('Duplicate username. A user with that username already exists. Please choose another username.'));
+            } elseif (User::findByEmail($email)) {
+                FlashMessages::addMessage(I18N::translate('Duplicate email address. A user with that email already exists.'));
+            } elseif ($pass1 !== $pass2) {
+                FlashMessages::addMessage(I18N::translate('The passwords do not match.'));
+            } else {
+                $user = User::create($username, $real_name, $email, $pass1);
+                $user->setPreference('reg_timestamp', date('U'))->setPreference('sessiontime', '0');
+                Log::addAuthenticationLog('User ->' . $username . '<- created');
+            }
+        } else {
+            $user = User::find($user_id);
+            if ($user && $username && $real_name) {
+                $user->setEmail($email);
+                $user->setUserName($username);
+                $user->setRealName($real_name);
+                if ($pass1 !== null && $pass1 === $pass2) {
+                    $user->setPassword($pass1);
+                }
+            }
+        }
+
+        if ($user) {
+            // Approving for the first time? Send a confirmation email
+            if ($approved && !$user->getPreference('verified_by_admin') && $user->getPreference('sessiontime') == 0) {
+                I18N::init($user->getPreference('language'));
+                Mail::systemMessage(
+                    $WT_TREE,
+                    $user,
+                    I18N::translate('Approval of account at %s', WT_BASE_URL),
+                    I18N::translate('The administrator at the webtrees site %s has approved your application for an account. You may now sign in by accessing the following link: %s', WT_BASE_URL, WT_BASE_URL)
+                );
+            }
+
+            $user
+                ->setPreference('theme', $theme)
+                ->setPreference('language', $language)
+                ->setPreference('TIMEZONE', $timezone)
+                ->setPreference('contactmethod', $contact_method)
+                ->setPreference('comment', $comment)
+                ->setPreference('auto_accept', $auto_accept ? '1' : '0')
+                ->setPreference('visibleonline', $visible_online ? '1' : '0')
+                ->setPreference('verified', $verified ? '1' : '0')
+                ->setPreference('verified_by_admin', $approved ? '1' : '0');
+
+            // We cannot change our own admin status. Another admin will need to do it.
+            if ($user->getUserId() !== Auth::id()) {
+                $user->setPreference('canadmin', $canadmin ? '1' : '0');
+            }
+
+            foreach (Tree::getAll() as $tree) {
+                $tree->setUserPreference($user, 'gedcomid', Filter::post('gedcomid' . $tree->getTreeId(), WT_REGEX_XREF));
+                $tree->setUserPreference($user, 'canedit', Filter::post('canedit' . $tree->getTreeId(), implode('|', array_keys($ALL_EDIT_OPTIONS))));
+                if (Filter::post('gedcomid' . $tree->getTreeId(), WT_REGEX_XREF)) {
+                    $tree->setUserPreference($user, 'RELATIONSHIP_PATH_LENGTH', Filter::postInteger('RELATIONSHIP_PATH_LENGTH' . $tree->getTreeId(), 0, 10, 0));
+                } else {
+                    // Do not allow a path length to be set if the individual ID is not
+                    $tree->setUserPreference($user, 'RELATIONSHIP_PATH_LENGTH', null);
+                }
+            }
+        }
+    }
+
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+
+    return;
 }
 
 switch (Filter::get('action')) {
 case 'load_json':
-	// Generate an AJAX/JSON response for datatables to load a block of rows
-	$search = Filter::postArray('search');
-	$search = $search['value'];
-	$start  = Filter::postInteger('start');
-	$length = Filter::postInteger('length');
-	$order  = Filter::postArray('order');
-
-	$sql_select =
-		"SELECT SQL_CALC_FOUND_ROWS '', u.user_id, user_name, real_name, email, us1.setting_value, us2.setting_value, NULL, us3.setting_value, NULL, us4.setting_value, us5.setting_value" .
-		" FROM `##user` u" .
-		" LEFT JOIN `##user_setting` us1 ON (u.user_id=us1.user_id AND us1.setting_name='language')" .
-		" LEFT JOIN `##user_setting` us2 ON (u.user_id=us2.user_id AND us2.setting_name='reg_timestamp')" .
-		" LEFT JOIN `##user_setting` us3 ON (u.user_id=us3.user_id AND us3.setting_name='sessiontime')" .
-		" LEFT JOIN `##user_setting` us4 ON (u.user_id=us4.user_id AND us4.setting_name='verified')" .
-		" LEFT JOIN `##user_setting` us5 ON (u.user_id=us5.user_id AND us5.setting_name='verified_by_admin')" .
-		" WHERE u.user_id > 0";
-
-	$args = array();
-
-	if ($search) {
-		$sql_select .= " AND (user_name LIKE CONCAT('%', :search_1, '%') OR real_name LIKE CONCAT('%', :search_2, '%') OR email LIKE CONCAT('%', :search_3, '%'))";
-		$args['search_1'] = $search;
-		$args['search_2'] = $search;
-		$args['search_3'] = $search;
-	}
-
-	if ($order) {
-		$sql_select .= " ORDER BY ";
-		foreach ($order as $key => $value) {
-			if ($key > 0) {
-				$sql_select .= ',';
-			}
-			// Datatables numbers columns 0, 1, 2
-			// MySQL numbers columns 1, 2, 3
-			switch ($value['dir']) {
-			case 'asc':
-				$sql_select .= (1 + $value['column']) . " ASC ";
-				break;
-			case 'desc':
-				$sql_select .= (1 + $value['column']) . " DESC ";
-				break;
-			}
-		}
-	} else {
-		$sql_select = " ORDER BY 1 ASC";
-	}
-
-	if ($length) {
-		Auth::user()->setPreference('admin_users_page_size', $length);
-		$sql_select .= " LIMIT :limit OFFSET :offset";
-		$args['limit']  = $length;
-		$args['offset'] = $start;
-	}
-
-	// This becomes a JSON list, not array, so need to fetch with numeric keys.
-	$data = Database::prepare($sql_select)->execute($args)->fetchAll(PDO::FETCH_NUM);
-
-	$installed_languages = array();
-	foreach (I18N::installedLocales() as $installed_locale) {
-		$installed_languages[$installed_locale->languageTag()] = $installed_locale->endonym();
-	}
-
-	// Reformat various columns for display
-	foreach ($data as &$datum) {
-		$user_id   = $datum[1];
-		$user_name = $datum[2];
-
-		if ($user_id != Auth::id()) {
-			$admin_options = '<li><a href="#" onclick="return masquerade(' . $user_id . ')"><i class="fa fa-fw fa-user"></i> ' . /* I18N: Pretend to be another user, by logging in as them */
-				I18N::translate('Masquerade as this user') . '</a></li>' . '<li><a href="#" onclick="delete_user(\'' . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeJs($user_name)) . '\', \'' . Filter::escapeJs($user_id) . '\');"><i class="fa fa-fw fa-trash-o"></i> ' . I18N::translate('Delete') . '</a></li>';
-		} else {
-			// Do not delete ourself!
-			$admin_options = '';
-		}
-
-		$datum[0] = '<div class="btn-group"><button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-pencil"></i> <span class="caret"></span></button><ul class="dropdown-menu" role="menu"><li><a href="?action=edit&amp;user_id=' . $user_id . '"><i class="fa fa-fw fa-pencil"></i> ' . I18N::translate('Edit') . '</a></li><li class="divider"><li><a href="index_edit.php?user_id=' . $user_id . '"><i class="fa fa-fw fa-th-large"></i> ' . I18N::translate('Change the blocks on this user’s “My page”') . '</a></li>' . $admin_options . '</ul></div>';
-		// $datum[1] is the user ID
-		// $datum[3] is the real name
-		$datum[3] = '<span dir="auto">' . Filter::escapeHtml($datum[3]) . '</span>';
-		// $datum[4] is the email address
-		if ($user_id != Auth::id()) {
-			$datum[4] = '<a href="#" onclick="return message(\'' . Filter::escapeHtml($datum[2]) . '\', \'\', \'\');">' . Filter::escapeHtml($datum[4]) . '</i></a>';
-		}
-		// $datum[2] is the username
-		$datum[2] = '<span dir="auto">' . Filter::escapeHtml($datum[2]) . '</span>';
-		// $datum[5] is the langauge
-		if (array_key_exists($datum[5], $installed_languages)) {
-			$datum[5] = $installed_languages[$datum[5]];
-		}
-		// $datum[6] is the sortable registration timestamp
-		$datum[7] = $datum[6] ? FunctionsDate::formatTimestamp($datum[6] + WT_TIMESTAMP_OFFSET) : '';
-		if (date("U") - $datum[6] > 604800 && !$datum[10]) {
-			$datum[7] = '<span class="red">' . $datum[7] . '</span>';
-		}
-		// $datum[8] is the sortable last-login timestamp
-		if ($datum[8]) {
-			$datum[9] = FunctionsDate::formatTimestamp($datum[8] + WT_TIMESTAMP_OFFSET) . '<br>' . I18N::timeAgo(WT_TIMESTAMP - $datum[8]);
-		} else {
-			$datum[9] = I18N::translate('Never');
-		}
-		$datum[10] = $datum[10] ? I18N::translate('yes') : I18N::translate('no');
-		$datum[11] = $datum[11] ? I18N::translate('yes') : I18N::translate('no');
-	}
-
-	// Total filtered/unfiltered rows
-	$recordsFiltered = (int) Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
-	$recordsTotal    = User::count();
-
-	header('Content-type: application/json');
-	// See http://www.datatables.net/usage/server-side
-	echo json_encode(array(
-		'draw'            => Filter::getInteger('draw'),
-		'recordsTotal'    => $recordsTotal,
-		'recordsFiltered' => $recordsFiltered,
-		'data'            => $data,
-	));
-
-	return;
+    // Generate an AJAX/JSON response for datatables to load a block of rows
+    $search = Filter::postArray('search');
+    $search = $search['value'];
+    $start  = Filter::postInteger('start');
+    $length = Filter::postInteger('length');
+    $order  = Filter::postArray('order');
+
+    $sql_select =
+        "SELECT SQL_CALC_FOUND_ROWS '', u.user_id, user_name, real_name, email, us1.setting_value, us2.setting_value, NULL, us3.setting_value, NULL, us4.setting_value, us5.setting_value" .
+        " FROM `##user` u" .
+        " LEFT JOIN `##user_setting` us1 ON (u.user_id=us1.user_id AND us1.setting_name='language')" .
+        " LEFT JOIN `##user_setting` us2 ON (u.user_id=us2.user_id AND us2.setting_name='reg_timestamp')" .
+        " LEFT JOIN `##user_setting` us3 ON (u.user_id=us3.user_id AND us3.setting_name='sessiontime')" .
+        " LEFT JOIN `##user_setting` us4 ON (u.user_id=us4.user_id AND us4.setting_name='verified')" .
+        " LEFT JOIN `##user_setting` us5 ON (u.user_id=us5.user_id AND us5.setting_name='verified_by_admin')" .
+        " WHERE u.user_id > 0";
+
+    $args = array();
+
+    if ($search) {
+        $sql_select .= " AND (user_name LIKE CONCAT('%', :search_1, '%') OR real_name LIKE CONCAT('%', :search_2, '%') OR email LIKE CONCAT('%', :search_3, '%'))";
+        $args['search_1'] = $search;
+        $args['search_2'] = $search;
+        $args['search_3'] = $search;
+    }
+
+    if ($order) {
+        $sql_select .= " ORDER BY ";
+        foreach ($order as $key => $value) {
+            if ($key > 0) {
+                $sql_select .= ',';
+            }
+            // Datatables numbers columns 0, 1, 2
+            // MySQL numbers columns 1, 2, 3
+            switch ($value['dir']) {
+            case 'asc':
+                $sql_select .= (1 + $value['column']) . " ASC ";
+                break;
+            case 'desc':
+                $sql_select .= (1 + $value['column']) . " DESC ";
+                break;
+            }
+        }
+    } else {
+        $sql_select = " ORDER BY 1 ASC";
+    }
+
+    if ($length) {
+        Auth::user()->setPreference('admin_users_page_size', $length);
+        $sql_select .= " LIMIT :limit OFFSET :offset";
+        $args['limit']  = $length;
+        $args['offset'] = $start;
+    }
+
+    // This becomes a JSON list, not array, so need to fetch with numeric keys.
+    $data = Database::prepare($sql_select)->execute($args)->fetchAll(PDO::FETCH_NUM);
+
+    $installed_languages = array();
+    foreach (I18N::installedLocales() as $installed_locale) {
+        $installed_languages[$installed_locale->languageTag()] = $installed_locale->endonym();
+    }
+
+    // Reformat various columns for display
+    foreach ($data as &$datum) {
+        $user_id   = $datum[1];
+        $user_name = $datum[2];
+
+        if ($user_id != Auth::id()) {
+            $admin_options = '<li><a href="#" onclick="return masquerade(' . $user_id . ')"><i class="fa fa-fw fa-user"></i> ' . /* I18N: Pretend to be another user, by logging in as them */
+                I18N::translate('Masquerade as this user') . '</a></li>' . '<li><a href="#" onclick="delete_user(\'' . I18N::translate('Are you sure you want to delete “%s”?', Filter::escapeJs($user_name)) . '\', \'' . Filter::escapeJs($user_id) . '\');"><i class="fa fa-fw fa-trash-o"></i> ' . I18N::translate('Delete') . '</a></li>';
+        } else {
+            // Do not delete ourself!
+            $admin_options = '';
+        }
+
+        $datum[0] = '<div class="btn-group"><button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-pencil"></i> <span class="caret"></span></button><ul class="dropdown-menu" role="menu"><li><a href="?action=edit&amp;user_id=' . $user_id . '"><i class="fa fa-fw fa-pencil"></i> ' . I18N::translate('Edit') . '</a></li><li class="divider"><li><a href="index_edit.php?user_id=' . $user_id . '"><i class="fa fa-fw fa-th-large"></i> ' . I18N::translate('Change the blocks on this user’s “My page”') . '</a></li>' . $admin_options . '</ul></div>';
+        // $datum[1] is the user ID
+        // $datum[3] is the real name
+        $datum[3] = '<span dir="auto">' . Filter::escapeHtml($datum[3]) . '</span>';
+        // $datum[4] is the email address
+        if ($user_id != Auth::id()) {
+            $datum[4] = '<a href="#" onclick="return message(\'' . Filter::escapeHtml($datum[2]) . '\', \'\', \'\');">' . Filter::escapeHtml($datum[4]) . '</i></a>';
+        }
+        // $datum[2] is the username
+        $datum[2] = '<span dir="auto">' . Filter::escapeHtml($datum[2]) . '</span>';
+        // $datum[5] is the langauge
+        if (array_key_exists($datum[5], $installed_languages)) {
+            $datum[5] = $installed_languages[$datum[5]];
+        }
+        // $datum[6] is the sortable registration timestamp
+        $datum[7] = $datum[6] ? FunctionsDate::formatTimestamp($datum[6] + WT_TIMESTAMP_OFFSET) : '';
+        if (date("U") - $datum[6] > 604800 && !$datum[10]) {
+            $datum[7] = '<span class="red">' . $datum[7] . '</span>';
+        }
+        // $datum[8] is the sortable last-login timestamp
+        if ($datum[8]) {
+            $datum[9] = FunctionsDate::formatTimestamp($datum[8] + WT_TIMESTAMP_OFFSET) . '<br>' . I18N::timeAgo(WT_TIMESTAMP - $datum[8]);
+        } else {
+            $datum[9] = I18N::translate('Never');
+        }
+        $datum[10] = $datum[10] ? I18N::translate('yes') : I18N::translate('no');
+        $datum[11] = $datum[11] ? I18N::translate('yes') : I18N::translate('no');
+    }
+
+    // Total filtered/unfiltered rows
+    $recordsFiltered = (int) Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
+    $recordsTotal    = User::count();
+
+    header('Content-type: application/json');
+    // See http://www.datatables.net/usage/server-side
+    echo json_encode(array(
+        'draw'            => Filter::getInteger('draw'),
+        'recordsTotal'    => $recordsTotal,
+        'recordsFiltered' => $recordsFiltered,
+        'data'            => $data,
+    ));
+
+    return;
 
 case 'edit':
-	$user_id = Filter::getInteger('user_id');
-
-	if ($user_id === 0) {
-		$controller->setPageTitle(I18N::translate('Add a user'));
-		$tmp            = new \stdClass;
-		$tmp->user_id   = '';
-		$tmp->user_name = '';
-		$tmp->real_name = '';
-		$tmp->email     = '';
-		$user           = new User($tmp);
-	} else {
-		$controller->setPageTitle(I18N::translate('Edit the user'));
-		$user = User::find($user_id);
-	}
-
-	$controller
-		->pageHeader()
-		->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-		->addInlineJavascript('autocomplete();')
-		->addInlineJavascript('
+    $user_id = Filter::getInteger('user_id');
+
+    if ($user_id === 0) {
+        $controller->setPageTitle(I18N::translate('Add a user'));
+        $tmp            = new \stdClass;
+        $tmp->user_id   = '';
+        $tmp->user_name = '';
+        $tmp->real_name = '';
+        $tmp->email     = '';
+        $user           = new User($tmp);
+    } else {
+        $controller->setPageTitle(I18N::translate('Edit the user'));
+        $user = User::find($user_id);
+    }
+
+    $controller
+        ->pageHeader()
+        ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+        ->addInlineJavascript('autocomplete();')
+        ->addInlineJavascript('
 			jQuery(".relpath").change(function() {
 				var fieldIDx = jQuery(this).attr("id");
 				var idNum = fieldIDx.replace("RELATIONSHIP_PATH_LENGTH","");
@@ -292,7 +292,7 @@ 
 			}
 		');
 
-	?>
+    ?>
 	<ol class="breadcrumb small">
 		<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 		<li><a href="admin_users.php"><?php echo I18N::translate('User administration'); ?></a></li>
@@ -474,7 +474,7 @@ 
 				<?php echo FunctionsEdit::editFieldContact('contact_method', $user->getPreference('contactmethod')); ?>
 				<p class="small text-muted">
 					<?php echo /* I18N: Help text for the “Preferred contact method” configuration setting */
-					I18N::translate('Site members can send each other messages. You can choose to how these messages are sent to you, or choose not receive them at all.'); ?>
+                    I18N::translate('Site members can send each other messages. You can choose to how these messages are sent to you, or choose not receive them at all.'); ?>
 				</p>
 			</div>
 		</div>
@@ -656,15 +656,15 @@ 
 	</form>
 	<?php
 
-	return;
+    return;
 
 case 'cleanup':
 
-	$controller
-		->setPageTitle(I18N::translate('Delete inactive users'))
-		->pageHeader();
+    $controller
+        ->setPageTitle(I18N::translate('Delete inactive users'))
+        ->pageHeader();
 
-	?>
+    ?>
 	<ol class="breadcrumb small">
 		<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 		<li><a href="admin_users.php"><?php echo I18N::translate('User administration'); ?></a></li>
@@ -675,30 +675,30 @@ 
 	<form method="post" action="?action=cleanup2">
 	<table class="table table-bordered">
 	<?php
-	// Check for idle users
-	$month = Filter::getInteger('month', 1, 12, 6);
-	echo '<tr><th colspan="2">', I18N::translate('Number of months since the last sign-in for a user’s account to be considered inactive: '), '</th>';
-	echo '<td><select onchange="document.location=options[selectedIndex].value;">';
-	for ($i = 1; $i <= 12; $i++) {
-		echo '<option value="admin_users.php?action=cleanup&amp;month=' . $i . '" ';
-		if ($i === $month) {
-			echo 'selected';
-		}
-		echo '>', $i, '</option>';
-	}
-	echo '</select></td></tr>';
-
-	// Check users not logged in too long
-	$ucnt = 0;
-	foreach (User::all() as $user) {
-		if ($user->getPreference('sessiontime') === '0') {
-			$datelogin = (int) $user->getPreference('reg_timestamp');
-		} else {
-			$datelogin = (int) $user->getPreference('sessiontime');
-		}
-		if (mktime(0, 0, 0, (int) date('m') - $month, (int) date('d'), (int) date('Y')) > $datelogin && $user->getPreference('verified') && $user->getPreference('verified_by_admin')) {
-			$ucnt++;
-			?>
+    // Check for idle users
+    $month = Filter::getInteger('month', 1, 12, 6);
+    echo '<tr><th colspan="2">', I18N::translate('Number of months since the last sign-in for a user’s account to be considered inactive: '), '</th>';
+    echo '<td><select onchange="document.location=options[selectedIndex].value;">';
+    for ($i = 1; $i <= 12; $i++) {
+        echo '<option value="admin_users.php?action=cleanup&amp;month=' . $i . '" ';
+        if ($i === $month) {
+            echo 'selected';
+        }
+        echo '>', $i, '</option>';
+    }
+    echo '</select></td></tr>';
+
+    // Check users not logged in too long
+    $ucnt = 0;
+    foreach (User::all() as $user) {
+        if ($user->getPreference('sessiontime') === '0') {
+            $datelogin = (int) $user->getPreference('reg_timestamp');
+        } else {
+            $datelogin = (int) $user->getPreference('sessiontime');
+        }
+        if (mktime(0, 0, 0, (int) date('m') - $month, (int) date('d'), (int) date('Y')) > $datelogin && $user->getPreference('verified') && $user->getPreference('verified_by_admin')) {
+            $ucnt++;
+            ?>
 			<tr>
 				<td>
 					<a href="?action=edit&amp;user_id=<?php echo $user->getUserId(); ?>">
@@ -715,14 +715,14 @@ 
 				</td>
 			</tr>
 		<?php
-		}
-	}
-
-	// Check unverified users
-	foreach (User::all() as $user) {
-		if (((date('U') - (int) $user->getPreference('reg_timestamp')) > 604800) && !$user->getPreference('verified')) {
-			$ucnt++;
-			?>
+        }
+    }
+
+    // Check unverified users
+    foreach (User::all() as $user) {
+        if (((date('U') - (int) $user->getPreference('reg_timestamp')) > 604800) && !$user->getPreference('verified')) {
+            $ucnt++;
+            ?>
 			<tr>
 				<td>
 					<a href="?action=edit&amp;user_id=<?php echo $user->getUserId(); ?>">
@@ -739,14 +739,14 @@ 
 				</td>
 			</tr>
 			<?php
-		}
-	}
-
-	// Check users not verified by admin
-	foreach (User::all() as $user) {
-		if ($user->getUserId() !== Auth::id() && !$user->getPreference('verified_by_admin') && $user->getPreference('verified')) {
-			$ucnt++;
-			?>
+        }
+    }
+
+    // Check users not verified by admin
+    foreach (User::all() as $user) {
+        if ($user->getUserId() !== Auth::id() && !$user->getPreference('verified_by_admin') && $user->getPreference('verified')) {
+            $ucnt++;
+            ?>
 			<tr>
 				<td>
 					<a href="?action=edit&amp;user_id=<?php echo $user->getUserId(); ?>">
@@ -763,9 +763,9 @@ 
 				</td>
 			</tr>
 			<?php
-		}
-	}
-		?>
+        }
+    }
+        ?>
 		</table>
 		<p>
 		<?php if ($ucnt): ?>
@@ -776,25 +776,25 @@ 
 		</p>
 	</form>
 	<?php
-	break;
+    break;
 
 case 'cleanup2':
-	foreach (User::all() as $user) {
-		if (Filter::post('del_' . $user->getUserId()) == '1') {
-			Log::addAuthenticationLog('Deleted user: ' . $user->getUserName());
-			$user->delete();
-			I18N::translate('The user %s has been deleted.', Filter::escapeHtml($user->getUserName()));
-		}
-	}
-
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
-	break;
+    foreach (User::all() as $user) {
+        if (Filter::post('del_' . $user->getUserId()) == '1') {
+            Log::addAuthenticationLog('Deleted user: ' . $user->getUserName());
+            $user->delete();
+            I18N::translate('The user %s has been deleted.', Filter::escapeHtml($user->getUserName()));
+        }
+    }
+
+    header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+    break;
 default:
-	$controller
-		->setPageTitle(I18N::translate('User administration'))
-		->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-		->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
-		->addInlineJavascript('
+    $controller
+        ->setPageTitle(I18N::translate('User administration'))
+        ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+        ->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
+        ->addInlineJavascript('
 			jQuery(".table-user-list").dataTable({
 				' . I18N::datatablesI18N() . ',
 				stateSave: true,
@@ -828,9 +828,9 @@ 
 			})
 			.fnFilter("' . Filter::get('filter') . '"); // View the details of a newly created user
 		')
-		->pageHeader();
+        ->pageHeader();
 
-	?>
+    ?>
 	<ol class="breadcrumb small">
 		<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 		<li class="active"><?php echo $controller->getPageTitle(); ?></li>
@@ -858,5 +858,5 @@ 
 		</tbody>
 	</table>
 	<?php
-	break;
+    break;
 }