Merge branch 'dev/php8' of github.com:collectiveaccess/pawtucket2 int…

…o dev/php8
collectiveaccess · Feb 7, 2024 · 247ede8 · 247ede8
2 parents a85c2e4 + 85f960c
commit 247ede8
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 20 deletions.
diff --git a/themes/nhs/conf/app.conf b/themes/nhs/conf/app.conf
@@ -8,7 +8,7 @@ do_content_caching = 0
 #
 use_identifiers_in_urls = 0
 
-dont_enforce_access_settings = 1
+dont_enforce_access_settings = 0
 
 disable_pdf_output = 1
 disable_export_output = 1
@@ -150,6 +150,13 @@ global_template_values = {
 		height = 100px,
 		usewysiwygeditor = 1 
 	},
+	people_project_guide_link = {
+		name = People Project and Database Guide Link,
+		description = People Project and Database Guide Link,
+		width = 600px,
+		height = 30px,
+		usewysiwygeditor = 0 
+	},
 	people_page_credit = {
 		name = People Credit Text,
 		description = People credit text,

diff --git a/themes/nhs/conf/contact.conf b/themes/nhs/conf/contact.conf
@@ -4,7 +4,7 @@
 contact_email = { [email protected] }
 
 # --- check for security arithmetic setting in form
-check_security = 1
+check_security = 0
 
 # --- array of elements appearing in form - the key is the name of the form element
 # --- options email_address -> set to true to check if valid email address is passed, required -> when true, required form element, label -> used to label each element in email generated by form

diff --git a/themes/nhs/views/Contact/form_html.php b/themes/nhs/views/Contact/form_html.php
@@ -94,22 +94,25 @@
 				</div>
 			</div><!-- end col -->
 		</div><!-- end row -->
-		<div class="row">
-			<div class="col-sm-4">
-					<div class="form-group<?php print (($va_errors["security"]) ? " has-error" : ""); ?>">
-						<label for="security">Security Question</label>
-						<div class='row'>
-							<div class='col-sm-4'>
-								<p class="form-control-static"><?php print $vn_num1; ?> + <?php print $vn_num2; ?> = </p>
-							</div>
-							<div class='col-sm-4'>
-								<input name="security" value="" id="security" type="text" class="form-control input-sm" />
-							</div>
-						</div><!--end row -->	
+<?php
+	if(!$this->request->isLoggedIn() && defined("__CA_GOOGLE_RECAPTCHA_KEY__") && __CA_GOOGLE_RECAPTCHA_KEY__){
+?>
+		<script type="text/javascript">
+			var gCaptchaRender = function(){
+                grecaptcha.render('regCaptcha', {'sitekey': '<?= __CA_GOOGLE_RECAPTCHA_KEY__; ?>'});
+        	};
+		</script>
+		<script src='https://www.google.com/recaptcha/api.js?onload=gCaptchaRender&render=explicit' async defer></script>
+			<div class="row">
+				<div class="col-sm-12">
+					<div class='form-group<?= (($va_errors["recaptcha"]) ? " has-error" : ""); ?>'>
+						<div id="regCaptcha"></div>
 					</div>
-			</div><!-- end col -->
-		</div><!-- end row -->
-
+				</div>
+			</div><!-- end row -->
+<?php
+	}
+?>				
 		<div class="form-group">
 			<br/><button type="submit" class="btn btn-default">Send</button>
 		</div><!-- end form-group -->

diff --git a/themes/nhs/views/People/index_html.php b/themes/nhs/views/People/index_html.php
@@ -271,17 +271,21 @@
 ?>
 		</div>
 	</div>
-
+<?php
+	if($vs_people_project_guide_link = $this->getVar("people_project_guide_link")){
+?>
 	<div class="row">
 		<div class="col-sm-12 col-lg-10 col-lg-offset-1">		
 			<div class="featuredList">
 				<div class='col-sm-12 col-md-6 col-md-offset-3'>
-					<a href="https://newporthistory.org/wp-content/uploads/2024/01/Voices-from-the-NHS-Archives-Guide_V1.pdf" class="btn btn-landing" target="_blank">Project & Database Guide <i class='fa fa-download'></i></a>
+					<a href="<?php print $vs_people_project_guide_link; ?>" class="btn btn-landing" target="_blank">Project & Database Guide <i class='fa fa-download'></i></a>
 				</div>
 			</div>
 		</div>
 	</div>
-
+<?php
+	}
+?>
 	<div class="row">
 		<div class="col-sm-12 col-lg-10 col-lg-offset-1"><hr/><p class="text-center">{{{people_page_credit}}}</p><br/></div>
 	</div>