From c41360df19a3fe30641babc9f4ecbfe7bb5ff210 Mon Sep 17 00:00:00 2001
From: Nick Barry <nbarry@unl.edu>
Date: Mon, 17 Nov 2014 09:55:30 -0600
Subject: [PATCH] Move ip list for printing errors to config file
---
application/configs/application.ini.sample | 1 +
.../modules/default/controllers/ErrorController.php | 11 ++++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/application/configs/application.ini.sample b/application/configs/application.ini.sample
index f83e1f46..86a301f7 100644
--- a/application/configs/application.ini.sample
+++ b/application/configs/application.ini.sample
@@ -41,6 +41,7 @@ ldap.uri = "ldap://example.com"
ldap.dn = "uid=user,dc=example,dc=com"
ldap.password = "password"
unl.errors.notifyEmails = ""
+unl.errors.showErrorsForIPs = ""
resources.frontController.moduleDirectory = APPLICATION_PATH "/modules"
resources.layout.layoutPath = APPLICATION_PATH "/layouts/scripts/"
resources.layout.layout = "unl_wdn"
diff --git a/application/modules/default/controllers/ErrorController.php b/application/modules/default/controllers/ErrorController.php
index a0015d72..14e458be 100644
--- a/application/modules/default/controllers/ErrorController.php
+++ b/application/modules/default/controllers/ErrorController.php
@@ -22,7 +22,12 @@ class ErrorController extends Creq_Controller_Action {
return;
}
- if ($_SERVER['REMOTE_ADDR'] == '129.93.23.68' || $_SERVER['REMOTE_ADDR'] == '129.93.17.83' || $_SERVER['REMOTE_ADDR'] == '129.93.239.115' || $_SERVER['REMOTE_ADDR'] == '127.0.0.1') {
+ $front = Zend_Controller_Front::getInstance();
+ $options = $front->getParam('bootstrap')->getOptions();
+ $emails = explode(",", $options['unl']['errors']['notifyEmails']);
+ $ips = explode(",", $options['unl']['errors']['showErrorsForIPs']);
+
+ if (in_array($_SERVER['REMOTE_ADDR'], $ips)) {
header('Content-type: text/plain; charset=UTF-8');
//Add a Unicode byte-order marker for Chrome
echo chr(0xEF), chr(0xBB), chr(0xBF);
@@ -30,10 +35,6 @@ class ErrorController extends Creq_Controller_Action {
exit;
}
- $front = Zend_Controller_Front::getInstance();
- $options = $front->getParam('bootstrap')->getOptions();
- $emails = explode(",", $options['unl']['errors']['notifyEmails']);
-
$this->_sendEmail($emails);
$this->view->exceptions = $this->_exceptions;
}
--
GitLab