* move privacy checks from controller to view level

* tidy up code

1 files changed, 15 insertions, 10 deletions

diff --git a/repo.php b/repo.php
index 3b4a1795cc..27ad1dd801 100644
--- a/repo.php
+++ b/repo.php
@@ -39,26 +39,31 @@ $nonfacts = array();
 $controller=new WT_Controller_Repository();
 $controller->init();
 
-// Tell addmedia.php what to link to
-$linkToID=$controller->rid;
-
 print_header($controller->getPageTitle());
 
-// LightBox
-if (WT_USE_LIGHTBOX) {
-	require WT_ROOT.WT_MODULES_DIR.'lightbox/lb_defaultconfig.php';
-	require WT_ROOT.WT_MODULES_DIR.'lightbox/functions/lb_call_js.php';
+if (!$controller->repository) {
+	echo '<b>', WT_I18N::translate('Unable to find record with ID'), '</b><br /><br />';
+	print_footer();
+	exit;
 }
 
-if (!$controller->repository) {
-	echo "<b>", WT_I18N::translate('Unable to find record with ID'), "</b><br /><br />";
+if (!$controller->repository->canDisplayDetails()) {
+	print_privacy_error();
 	print_footer();
 	exit;
 }
-else if ($controller->repository->isMarkedDeleted()) {
+
+if ($controller->repository->isMarkedDeleted()) {
 	echo '<span class="error">', WT_I18N::translate('This record has been marked for deletion upon admin approval.'), '</span>';
 }
 
+if (WT_USE_LIGHTBOX) {
+	require WT_ROOT.WT_MODULES_DIR.'lightbox/lb_defaultconfig.php';
+	require WT_ROOT.WT_MODULES_DIR.'lightbox/functions/lb_call_js.php';
+}
+
+$linkToID=$controller->rid; // Tell addmedia.php what to link to
+
 echo WT_JS_START;
 echo 'function show_gedcom_record() {';
 echo ' var recwin=window.open("gedrecord.php?pid=', $controller->rid, '", "_blank", "top=0, left=0, width=600, height=400, scrollbars=1, scrollable=1, resizable=1");';