Move a few header() calls after including config.php3 so that we have access to the...

variables.

diff --git a/Changelog b/Changelog
index 40111369f8531c5ff508ecb13df98031cdf3c44c..445af180ce98fea45f65dfb115323c87c913d80a 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -19,6 +19,8 @@ Ver 1.75:
 * Fix operator escaping in lib/sql/change_attrs.php3
 * In user_state also take into account any open sessions when calculating daily/weekly usage.
   Add two more lines in the output stating the number of current open sessions and the time used.
+* Move a few header() calls after including config.php3 so that we have access to the relevant
+  variables.
 Ver 1.72:
 * Move the xlat function to a separate file in lib/xlat.php3
 * Add a lib/sql/nas_list.php3 to also get the nas list from sql (naslist.conf still works)

diff --git a/htdocs/group_admin.php3 b/htdocs/group_admin.php3
index 6f60f5cb4f17fbe5cbeea1aae3226a6a44a89a93..41bb7e85dd87af72e2d7bf25ce190f68626dacbd 100644 (file)
--- a/htdocs/group_admin.php3
+++ b/htdocs/group_admin.php3
@@ -1,9 +1,9 @@
 <?php
+require('../conf/config.php3');
 if ($show == 1 && isset($del_members)){
         header("Location: user_admin.php3?login=$del_members[0]");
         exit;
 }
-require('../conf/config.php3');
 if ($config[general_lib_type] != 'sql'){
        echo <<<EOM
 <title>Group Administration Page</title>

diff --git a/htdocs/group_new.php3 b/htdocs/group_new.php3
index a833697d8cf5c660a01672df00b3b32deb0bb6bd..2c63a8067920be93f8c2ad295f114f15836c71ef 100644 (file)
--- a/htdocs/group_new.php3
+++ b/htdocs/group_new.php3
@@ -1,9 +1,9 @@
 <?php
+require('../conf/config.php3');
 if ($show == 1){
        header("Location: group_admin.php3?login=$login");
        exit;
 }
-require('../conf/config.php3');
 
 if ($config[general_lib_type] != 'sql'){
        echo <<<EOM

diff --git a/htdocs/user_edit.php3 b/htdocs/user_edit.php3
index 2daad5686775835c093ea530bbbb7d6ae1d61fed..053ba4d0638a9902d431597fc211a5c6cc4ec5ef 100644 (file)
--- a/htdocs/user_edit.php3
+++ b/htdocs/user_edit.php3
@@ -1,9 +1,9 @@
 <?php
+require('../conf/config.php3');
 if ($edit_group == 1){
        header("Location: group_admin.php3?login=$group_to_edit");
        exit;
 }
-require('../conf/config.php3');
 require('../lib/attrshow.php3');
 require('../lib/defaults.php3');
 if ($user_type != 'group'){

diff --git a/htdocs/user_new.php3 b/htdocs/user_new.php3
index 71ccb57d536f2ccd09da3e0459667be8ee098955..b40c0eb1c6de227ee6bea47554bdb6ebebfe0de6 100644 (file)
--- a/htdocs/user_new.php3
+++ b/htdocs/user_new.php3
@@ -1,9 +1,9 @@
 <?php
+require('../conf/config.php3');
 if ($show == 1){
        header("Location: user_admin.php3?login=$login");
        exit;
 }
-require('../conf/config.php3');
 require('../lib/attrshow.php3');
 require('../lib/defaults.php3');