From a69c00368108b6e7d9da794de7cc4ff9557a495e Mon Sep 17 00:00:00 2001 From: Ermal Date: Mon, 15 Mar 2010 19:13:20 +0000 Subject: Ticket #423. Remove priv.inc/priv.defs.inc from files. They used require() instead of required once so produced errors or redefinitions of functions. These includes are now included on authgui.inc. --- usr/local/www/diag_authentication.php | 3 --- usr/local/www/system_groupmanager.php | 2 -- usr/local/www/system_groupmanager_addprivs.php | 2 -- usr/local/www/system_usermanager.php | 2 -- usr/local/www/system_usermanager_addcert.php | 2 -- usr/local/www/system_usermanager_addprivs.php | 2 -- usr/local/www/system_usermanager_settings.php | 3 --- usr/local/www/system_usermanager_settings_ldapacpicker.php | 2 -- usr/local/www/system_usermanager_settings_test.php | 2 -- 9 files changed, 20 deletions(-) diff --git a/usr/local/www/diag_authentication.php b/usr/local/www/diag_authentication.php index 8bb5000..f6ed771 100755 --- a/usr/local/www/diag_authentication.php +++ b/usr/local/www/diag_authentication.php @@ -42,9 +42,6 @@ require("guiconfig.inc"); require_once("PEAR.inc"); require_once("radius.inc"); -require_once("auth.inc"); -require("priv.defs.inc"); -require("priv.inc"); if ($_POST) { $pconfig = $_POST; diff --git a/usr/local/www/system_groupmanager.php b/usr/local/www/system_groupmanager.php index f7054c6..74ead6d 100644 --- a/usr/local/www/system_groupmanager.php +++ b/usr/local/www/system_groupmanager.php @@ -44,8 +44,6 @@ ##|*MATCH=system_groupmanager.php* ##|-PRIV -require("priv.defs.inc"); -require("priv.inc"); require("guiconfig.inc"); $pgtitle = array("System", "Group manager"); diff --git a/usr/local/www/system_groupmanager_addprivs.php b/usr/local/www/system_groupmanager_addprivs.php index e1937a2..9bec9f0 100644 --- a/usr/local/www/system_groupmanager_addprivs.php +++ b/usr/local/www/system_groupmanager_addprivs.php @@ -52,8 +52,6 @@ function admin_groups_sort() { } require("guiconfig.inc"); -require("priv.defs.inc"); -require("priv.inc"); $pgtitle = array("System","Group manager","Add privileges"); diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php index 1a1701d..259bda4 100644 --- a/usr/local/www/system_usermanager.php +++ b/usr/local/www/system_usermanager.php @@ -48,8 +48,6 @@ require("certs.inc"); require("guiconfig.inc"); -require("priv.defs.inc"); -require("priv.inc"); if (isAllowedPage("system_usermanager")) { diff --git a/usr/local/www/system_usermanager_addcert.php b/usr/local/www/system_usermanager_addcert.php index 2c9040c..29af55a 100644 --- a/usr/local/www/system_usermanager_addcert.php +++ b/usr/local/www/system_usermanager_addcert.php @@ -39,8 +39,6 @@ require("guiconfig.inc"); require("certs.inc"); -require("priv.defs.inc"); -require("priv.inc"); $cert_keylens = array( "512", "1024", "2048", "4096"); diff --git a/usr/local/www/system_usermanager_addprivs.php b/usr/local/www/system_usermanager_addprivs.php index 9272121..8f13c55 100644 --- a/usr/local/www/system_usermanager_addprivs.php +++ b/usr/local/www/system_usermanager_addprivs.php @@ -52,8 +52,6 @@ function admin_users_sort() { } require("guiconfig.inc"); -require("priv.defs.inc"); -require("priv.inc"); $pgtitle = array("System","User manager","Add privileges"); diff --git a/usr/local/www/system_usermanager_settings.php b/usr/local/www/system_usermanager_settings.php index e681e98..a8384ff 100755 --- a/usr/local/www/system_usermanager_settings.php +++ b/usr/local/www/system_usermanager_settings.php @@ -45,9 +45,6 @@ if($_POST['savetest']) $save_and_test = true; require("guiconfig.inc"); -require_once("auth.inc"); -require("priv.defs.inc"); -require("priv.inc"); $pconfig['session_timeout'] = &$config['system']['webgui']['session_timeout']; $pconfig['authmode'] = &$config['system']['webgui']['authmode']; diff --git a/usr/local/www/system_usermanager_settings_ldapacpicker.php b/usr/local/www/system_usermanager_settings_ldapacpicker.php index 511c7e5..6a3d186 100644 --- a/usr/local/www/system_usermanager_settings_ldapacpicker.php +++ b/usr/local/www/system_usermanager_settings_ldapacpicker.php @@ -33,8 +33,6 @@ require("guiconfig.inc"); require_once("auth.inc"); -require("priv.defs.inc"); -require("priv.inc"); $ous = array(); if($_GET) { $authcfg = array(); diff --git a/usr/local/www/system_usermanager_settings_test.php b/usr/local/www/system_usermanager_settings_test.php index 6421488..34fb172 100755 --- a/usr/local/www/system_usermanager_settings_test.php +++ b/usr/local/www/system_usermanager_settings_test.php @@ -40,8 +40,6 @@ require("guiconfig.inc"); require_once("auth.inc"); -require("priv.defs.inc"); -require("priv.inc"); $authserver = $_GET['authserver']; $authcfg = auth_get_authserver($authserver); -- cgit v1.1