summaryrefslogtreecommitdiff
path: root/includes/mysql.php.sample
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2013-08-25 20:22:30 +0200
committerMichael Tänzer <neo@nhng.de>2013-08-25 20:22:30 +0200
commit2d6e2851a754bbd8d5f5afb0d02bc5caba7d6626 (patch)
tree96cc8268ba19ee9418ab74c5fbbf7c29dc40cce0 /includes/mysql.php.sample
parenteac9744c793d06bc63269952e789a6a30de2e30d (diff)
parenta82f507306a9eba8a9f5dff82d2091dbd29edf71 (diff)
downloadcacert-devel-2d6e2851a754bbd8d5f5afb0d02bc5caba7d6626.tar.gz
cacert-devel-2d6e2851a754bbd8d5f5afb0d02bc5caba7d6626.tar.xz
cacert-devel-2d6e2851a754bbd8d5f5afb0d02bc5caba7d6626.zip
Merge branch 'release' into bug-1017bug-1017
Conflicts: pages/account/6.php Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'includes/mysql.php.sample')
-rw-r--r--includes/mysql.php.sample3
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/mysql.php.sample b/includes/mysql.php.sample
index eb86401..10185fc 100644
--- a/includes/mysql.php.sample
+++ b/includes/mysql.php.sample
@@ -64,7 +64,8 @@
fputs($smtp, "DATA\r\n");
$InputBuffer = fgets($smtp, 1024);
fputs($smtp, "X-Mailer: CAcert.org Website\r\n");
- fputs($smtp, "X-OriginatingIP: ".$_SERVER["REMOTE_ADDR"]."\r\n");
+ if (array_key_exists("REMOTE_ADDR", $_SERVER))
+ fputs($smtp, "X-OriginatingIP: ".$_SERVER["REMOTE_ADDR"]."\r\n");
fputs($smtp, "Sender: $errorsto\r\n");
fputs($smtp, "Errors-To: $errorsto\r\n");
if($replyto != "")