summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Gummi <martin.gummi@cacert.org>2015-01-08 05:17:41 +0100
committerMartin Gummi <martin.gummi@cacert.org>2015-01-08 05:17:41 +0100
commit2bdd7bb9d76b13d88e7cac6a51b5f9cc71e07d34 (patch)
tree66f47efeb8301831b12b52fa5bcd4cac1ed27f93
parentf4972110d997835318b232601dd7edd2adca1140 (diff)
downloadcacert-devel-2bdd7bb9d76b13d88e7cac6a51b5f9cc71e07d34.tar.gz
cacert-devel-2bdd7bb9d76b13d88e7cac6a51b5f9cc71e07d34.tar.xz
cacert-devel-2bdd7bb9d76b13d88e7cac6a51b5f9cc71e07d34.zip
bug 1355: remove tverfiy parts of general.php
-rw-r--r--includes/general.php14
1 files changed, 4 insertions, 10 deletions
diff --git a/includes/general.php b/includes/general.php
index 87fea14..2eb7450 100644
--- a/includes/general.php
+++ b/includes/general.php
@@ -47,7 +47,6 @@
if(array_key_exists('HTTP_HOST',$_SERVER) &&
$_SERVER['HTTP_HOST'] != $_SESSION['_config']['normalhostname'] &&
$_SERVER['HTTP_HOST'] != $_SESSION['_config']['securehostname'] &&
- $_SERVER['HTTP_HOST'] != $_SESSION['_config']['tverify'] &&
$_SERVER['HTTP_HOST'] != "stamp.cacert.org")
{
if(array_key_exists('HTTPS',$_SERVER) && $_SERVER['HTTPS'] == "on")
@@ -58,8 +57,7 @@
}
if(array_key_exists('HTTP_HOST',$_SERVER) &&
- ($_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'] ||
- $_SERVER['HTTP_HOST'] == $_SESSION['_config']['tverify']))
+ ($_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname']
{
if(array_key_exists('HTTPS',$_SERVER) && $_SERVER['HTTPS'] == "on")
{
@@ -68,8 +66,6 @@
{
if($_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'])
header("location: https://". $_SESSION['_config']['securehostname']);
- if($_SERVER['HTTP_HOST'] == $_SESSION['_config']['tverify'])
- header("location: https://".$_SESSION['_config']['tverify']);
exit;
}
}
@@ -94,7 +90,7 @@
function loadem($section = "index")
{
- if($section != "index" && $section != "account" && $section != "tverify")
+ if($section != "index" && $section != "account")
{
$section = "index";
}
@@ -109,14 +105,12 @@
function includeit($id = "0", $section = "index")
{
$id = intval($id);
- if($section != "index" && $section != "account" && $section != "wot" && $section != "help" && $section != "gpg" && $section != "disputes" && $section != "tverify" && $section != "advertising")
+ if($section != "index" && $section != "account" && $section != "wot" && $section != "help" && $section != "gpg" && $section != "disputes" && $section != "advertising")
{
$section = "index";
}
- if($section == "tverify" && file_exists($_SESSION['_config']['filepath']."/tverify/index/$id.php"))
- include_once($_SESSION['_config']['filepath']."/tverify/index/$id.php");
- else if(file_exists($_SESSION['_config']['filepath']."/pages/$section/$id.php"))
+ if(file_exists($_SESSION['_config']['filepath']."/pages/$section/$id.php"))
include_once($_SESSION['_config']['filepath']."/pages/$section/$id.php");
else {
$id = "0";