summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BitUser.php34
-rw-r--r--admin/admin_login_inc.php18
-rw-r--r--assigned_modules.php6
-rw-r--r--bit_setup_inc.php38
-rw-r--r--module_controls_inc.php8
-rw-r--r--modules/mod_login_box.tpl4
-rw-r--r--preferences.php18
-rw-r--r--remind_password.php6
-rw-r--r--templates/login_inc.tpl2
-rw-r--r--templates/user_preferences.tpl4
-rw-r--r--validate.php18
11 files changed, 78 insertions, 78 deletions
diff --git a/BitUser.php b/BitUser.php
index 6c5dd60..6ec8c00 100644
--- a/BitUser.php
+++ b/BitUser.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_users/BitUser.php,v 1.60 2006/04/11 13:10:18 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/BitUser.php,v 1.61 2006/04/19 13:48:40 squareing Exp $
*
* Lib for user administration, groups and permissions
* This lib uses pear so the constructor requieres
@@ -12,7 +12,7 @@
* All Rights Reserved. See copyright.txt for details and a complete list of authors.
* Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
*
- * $Id: BitUser.php,v 1.60 2006/04/11 13:10:18 squareing Exp $
+ * $Id: BitUser.php,v 1.61 2006/04/19 13:48:40 squareing Exp $
* @package users
*/
@@ -40,7 +40,7 @@ define("ACCOUNT_DISABLED", -6);
* Class that holds all information for a given user
*
* @author spider <spider@steelsun.com>
- * @version $Revision: 1.60 $
+ * @version $Revision: 1.61 $
* @package users
* @subpackage BitUser
*/
@@ -168,9 +168,9 @@ class BitUser extends LibertyAttachable {
global $gBitSystem;
if( !$this->getPreference( 'user_information' ) ) { $this->setPreference( 'user_information', 'public' ); }
if( !$this->getPreference( 'messages_allow_messages' ) ) { $this->setPreference( 'messages_allow_messages', 'y' ); }
- if( !$this->getPreference( 'display_timezone' ) ) {
+ if( !$this->getPreference( 'site_display_timezone' ) ) {
$server_time = new BitDate();
- $this->setPreference( 'display_timezone', $server_time->display_offset );
+ $this->setPreference( 'site_display_timezone', $server_time->display_offset );
}
if( !$this->getPreference( 'userbreadCrumb' ) ) {
$this->setPreference( 'userbreadCrumb', $gBitSystem->getConfig('userbreadCrumb',4) );
@@ -431,7 +431,7 @@ class BitUser extends LibertyAttachable {
if ( ereg ( "^220", $Out ) ) {
// Inform client's reaching to server who connect.
if( $gBitSystem->hasValidSenderEmail() ) {
- $senderEmail = $gBitSystem->getConfig( 'sender_email' );
+ $senderEmail = $gBitSystem->getConfig( 'site_sender_email' );
fputs ( $Connect, "HELO $HTTP_HOST\r\n" );
if ($gDebug) echo "Run : HELO $HTTP_HOST<br>";
$Out = $this->get_SMTP_response ( $Connect ); // Receive server's answering cord.
@@ -483,7 +483,7 @@ if ($gDebug) echo "Run : QUIT<br>";
$ret = TRUE;
// set local time zone as default when registering
- $this->storePreference( 'display_timezone', 'Local' );
+ $this->storePreference( 'site_display_timezone', 'Local' );
if( !empty( $_REQUEST['CUSTOM'] ) ) {
foreach( $_REQUEST['CUSTOM'] as $field=>$value ) {
@@ -514,7 +514,7 @@ if ($gDebug) echo "Run : QUIT<br>";
$gBitSmarty->assign('mail_machine',$machine);
$gBitSmarty->assign('mail_apass',$apass);
$mail_data = $gBitSmarty->fetch('bitpackage:users/user_validation_mail.tpl');
- mail($pParamHash["email"], $siteName.' - '.tra('Your registration information'),$mail_data,"From: ".$gBitSystem->getConfig('sender_email')."\r\nContent-type: text/plain;charset=utf-8\r\n");
+ mail($pParamHash["email"], $siteName.' - '.tra('Your registration information'),$mail_data,"From: ".$gBitSystem->getConfig('site_sender_email')."\r\nContent-type: text/plain;charset=utf-8\r\n");
$gBitSmarty->assign('showmsg','y');
}
if( $gBitSystem->isFeatureActive( 'send_welcome_email' ) ) {
@@ -522,7 +522,7 @@ if ($gDebug) echo "Run : QUIT<br>";
$gBitSmarty->assign( 'mailPassword',$pParamHash['password'] );
$gBitSmarty->assign( 'mailEmail',$pParamHash['email'] );
$mail_data = $gBitSmarty->fetch('bitpackage:users/welcome_mail.tpl');
- mail($pParamHash["email"], tra( 'Welcome to' ).' '.$siteName,$mail_data,"From: ".$gBitSystem->getConfig('sender_email')."\r\nContent-type: text/plain;charset=utf-8\r\n");
+ mail($pParamHash["email"], tra( 'Welcome to' ).' '.$siteName,$mail_data,"From: ".$gBitSystem->getConfig('site_sender_email')."\r\nContent-type: text/plain;charset=utf-8\r\n");
}
}
return( $ret );
@@ -688,14 +688,14 @@ if ($gDebug) echo "Run : QUIT<br>";
$stay_in_ssl_mode = ((isset($_SERVER['HTTP_REFERER']) && (substr($_SERVER['HTTP_REFERER'], 0, 5) == 'https'))
|| (isset($_REQUEST['stay_in_ssl_mode']) && $_REQUEST['stay_in_ssl_mode'] == 'on'));
if (!$stay_in_ssl_mode) {
- $http_domain = $gBitSystem->getConfig('http_domain', false);
- $http_port = $gBitSystem->getConfig('http_port', 80);
- $http_prefix = $gBitSystem->getConfig('http_prefix', '/');
- if ($http_domain) {
- $prefix = 'http://' . $http_domain;
- if ($http_port != 80)
- $prefix .= ':' . $http_port;
- $prefix .= $http_prefix;
+ $site_http_domain = $gBitSystem->getConfig('site_http_domain', false);
+ $site_http_port = $gBitSystem->getConfig('site_http_port', 80);
+ $site_http_prefix = $gBitSystem->getConfig('site_http_prefix', '/');
+ if ($site_http_domain) {
+ $prefix = 'http://' . $site_http_domain;
+ if ($site_http_port != 80)
+ $prefix .= ':' . $site_http_port;
+ $prefix .= $site_http_prefix;
$url = $prefix . $url;
if (SID)
$url .= '?' . SID;
diff --git a/admin/admin_login_inc.php b/admin/admin_login_inc.php
index 18f8fd7..3b8c9a7 100644
--- a/admin/admin_login_inc.php
+++ b/admin/admin_login_inc.php
@@ -1,5 +1,5 @@
<?php
-// $Header: /cvsroot/bitweaver/_bit_users/admin/admin_login_inc.php,v 1.14 2006/04/13 15:24:39 squareing Exp $
+// $Header: /cvsroot/bitweaver/_bit_users/admin/admin_login_inc.php,v 1.15 2006/04/19 13:48:40 squareing Exp $
// Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
@@ -179,42 +179,42 @@ if( !empty( $_REQUEST["registerprefs"] ) ) {
}
$httpSettings = array(
- 'https_login' => array(
+ 'site_https_login' => array(
'label' => "Allow secure (https) login",
'type' => "checkbox",
'note' => "",
),
- 'https_login_required' => array(
+ 'site_https_login_required' => array(
'label' => "Require secure (https) login",
'type' => "checkbox",
'note' => "",
),
- 'http_domain' => array(
+ 'site_http_domain' => array(
'label' => "HTTP server name",
'type' => "text",
'note' => "",
),
- 'http_port' => array(
+ 'site_http_port' => array(
'label' => "HTTP port",
'type' => "text",
'note' => "",
),
- 'http_prefix' => array(
+ 'site_http_prefix' => array(
'label' => "HTTP URL prefix",
'type' => "text",
'note' => "",
),
- 'https_domain' => array(
+ 'site_https_domain' => array(
'label' => "HTTPS server name",
'type' => "text",
'note' => "",
),
- 'https_port' => array(
+ 'site_https_port' => array(
'label' => "HTTPS port",
'type' => "text",
'note' => "",
),
- 'https_prefix' => array(
+ 'site_https_prefix' => array(
'label' => "HTTPS URL prefix",
'type' => "text",
'note' => "",
diff --git a/assigned_modules.php b/assigned_modules.php
index f178e74..cce0300 100644
--- a/assigned_modules.php
+++ b/assigned_modules.php
@@ -3,13 +3,13 @@
* assigned_modules
*
* @author spider <spider@steelsun.com>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
* @package users
* @subpackage functions
* @copyright Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
* @license Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
*/
-// $Header: /cvsroot/bitweaver/_bit_users/assigned_modules.php,v 1.8 2006/04/11 17:52:11 squareing Exp $
+// $Header: /cvsroot/bitweaver/_bit_users/assigned_modules.php,v 1.9 2006/04/19 13:48:40 squareing Exp $
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Initialization
@@ -112,6 +112,6 @@ $gBitSmarty->assign_by_ref( 'layoutAreas', $layoutAreas );
$gBitSmarty->assign_by_ref('modules', $modules);
//print_r($modules);
-$gBitSystem->display( 'bitpackage:users/user_assigned_modules.tpl', 'Edit Layout');
+$gBitSystem->display( 'bitpackage:users/site_user_assigned_modules.tpl', 'Edit Layout');
?>
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index cd2a5bc..daad763 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -36,13 +36,13 @@ if( !defined( 'LOGO_MAX_DIM' ) ) {
$gBitSystem->storeConfig( 'cookie_path', $cookie_path, KERNEL_PKG_NAME );
// set session lifetime
- $session_lifetime = $gBitSystem->getConfig( 'session_lifetime', '0' );
- if( $session_lifetime > 0 ) {
- ini_set( 'session.gc_maxlifetime', $session_lifetime );
+ $site_session_lifetime = $gBitSystem->getConfig( 'site_session_lifetime', '0' );
+ if( $site_session_lifetime > 0 ) {
+ ini_set( 'session.gc_maxlifetime', $site_session_lifetime );
}
// is session data stored in DB or in filesystem?
- if( $gBitSystem->isFeatureActive( 'session_db' ) && !empty( $gBitDbType ) ) {
+ if( $gBitSystem->isFeatureActive( 'site_store_session_db' ) && !empty( $gBitDbType ) ) {
include(UTIL_PKG_PATH . 'adodb/session/adodb-session.php');
ADODB_Session::dataFieldName('session_data');
ADODB_Session::driver($gBitDbType);
@@ -56,9 +56,9 @@ if( !defined( 'LOGO_MAX_DIM' ) ) {
session_name( BIT_SESSION_NAME );
if ($gBitSystem->isFeatureActive('rememberme')) {
- session_set_cookie_params($session_lifetime, $cookie_path, $gBitSystem->getConfig('cookie_domain'));
+ session_set_cookie_params($site_session_lifetime, $cookie_path, $gBitSystem->getConfig('cookie_domain'));
} else {
- session_set_cookie_params($session_lifetime, BIT_ROOT_URL);
+ session_set_cookie_params($site_session_lifetime, BIT_ROOT_URL);
}
if (ini_get('safe_mode') && ini_get('safe_mode_gid')) {
umask(0007);
@@ -140,26 +140,26 @@ if( !defined( 'LOGO_MAX_DIM' ) ) {
$eponymous_groups = $gBitSystem->getConfig("eponymous_groups", 'n');
$use_register_passcode = $gBitSystem->getConfig("use_register_passcode", 'n');
$register_passcode = $gBitSystem->getConfig("register_passcode", '');
- $url_index = $gBitSystem->getConfig("url_index", '');
- $use_proxy = $gBitSystem->getConfig("use_proxy", 'n');
- $proxy_host = $gBitSystem->getConfig("proxy_host", '');
- $proxy_port = $gBitSystem->getConfig("proxy_port", '');
- $session_db = $gBitSystem->getConfig("session_db", 'n');
- $session_lifetime = $gBitSystem->getConfig("session_lifetime", 0);
+ $site_url_index = $gBitSystem->getConfig("site_url_index", '');
+ $site_use_proxy = $gBitSystem->getConfig("site_use_proxy", 'n');
+ $site_proxy_host = $gBitSystem->getConfig("site_proxy_host", '');
+ $site_proxy_port = $gBitSystem->getConfig("site_proxy_port", '');
+ $site_store_session_db = $gBitSystem->getConfig("site_store_session_db", 'n');
+ $site_session_lifetime = $gBitSystem->getConfig("site_session_lifetime", 0);
$remembertime = $gBitSystem->getConfig('remembertime', 7200);
- $https_login = $gBitSystem->getConfig('https_login', 'n');
- $https_login_required = $gBitSystem->getConfig('https_login_required', 'n');
+ $site_https_login = $gBitSystem->getConfig('site_https_login', 'n');
+ $site_https_login_required = $gBitSystem->getConfig('site_https_login_required', 'n');
$change_language = $gBitSystem->getConfig("change_language", 'y');
$gBitSmarty->assign('allow_register', $allow_register);
- $gBitSmarty->assign('url_index', $url_index);
- $gBitSmarty->assign('use_proxy', $use_proxy);
- $gBitSmarty->assign('proxy_host', $proxy_host);
- $gBitSmarty->assign('proxy_port', $proxy_port);
+ $gBitSmarty->assign('site_url_index', $site_url_index);
+ $gBitSmarty->assign('site_use_proxy', $site_use_proxy);
+ $gBitSmarty->assign('site_proxy_host', $site_proxy_host);
+ $gBitSmarty->assign('site_proxy_port', $site_proxy_port);
$gBitSmarty->assign('change_language', $change_language);
$gBitSmarty->assign('eponymous_groups', $eponymous_groups);
- $user_assigned_modules = 'n';
+ $site_user_assigned_modules = 'n';
$gBitSmarty->assign('remembertime', $remembertime);
$gBitSmarty->assign('webserverauth', 'n');
$gBitSmarty->assign('uf_use_db', 'y');
diff --git a/module_controls_inc.php b/module_controls_inc.php
index 0fb3573..d5c01b8 100644
--- a/module_controls_inc.php
+++ b/module_controls_inc.php
@@ -1,6 +1,6 @@
<?php
/**
- * @version $Header: /cvsroot/bitweaver/_bit_users/module_controls_inc.php,v 1.5 2006/04/11 13:10:18 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_users/module_controls_inc.php,v 1.6 2006/04/19 13:48:40 squareing Exp $
* @package users
* @subpackage functions
*
@@ -10,7 +10,7 @@
* All Rights Reserved. See copyright.txt for details and a complete list of authors.
* Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
*
- * $Id: module_controls_inc.php,v 1.5 2006/04/11 13:10:18 squareing Exp $
+ * $Id: module_controls_inc.php,v 1.6 2006/04/19 13:48:40 squareing Exp $
*/
/**
@@ -25,8 +25,8 @@ if (!$gBitUser->hasPermission( 'p_tidbits_configure_modules' ) && $check_req) {
$gBitSystem->display( 'error.tpl' );
die;
}
-if ($user_assigned_modules != 'y' && $check_req) {
- $gBitSmarty->assign('msg', tra("This feature is disabled").": user_assigned_modules");
+if ($site_user_assigned_modules != 'y' && $check_req) {
+ $gBitSmarty->assign('msg', tra("This feature is disabled").": site_user_assigned_modules");
$gBitSystem->display( 'error.tpl' );
die;
}
diff --git a/modules/mod_login_box.tpl b/modules/mod_login_box.tpl
index 73bbcde..66ce505 100644
--- a/modules/mod_login_box.tpl
+++ b/modules/mod_login_box.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_users/modules/mod_login_box.tpl,v 1.9 2006/04/11 13:10:19 squareing Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_users/modules/mod_login_box.tpl,v 1.10 2006/04/19 13:48:40 squareing Exp $ *}
{strip}
{bitmodule title="$moduleTitle" name="login_box"}
{if $gBitUser->IsRegistered()}
@@ -12,7 +12,7 @@
</div>
{/if}
{else}
- {assign var=force_secure value=$gBitSystem->isFeatureActive("https_login_required")}
+ {assign var=force_secure value=$gBitSystem->isFeatureActive("site_https_login_required")}
{form ipackage=users ifile='validate.php' secure=$force_secure}
<div class="row">
<input type="text" name="user" id="user" value="{tr}Username{/tr}" size="15" onfocus="this.value=''" />
diff --git a/preferences.php b/preferences.php
index ef5476c..bc477b2 100644
--- a/preferences.php
+++ b/preferences.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_users/preferences.php,v 1.24 2006/04/11 13:10:19 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/preferences.php,v 1.25 2006/04/19 13:48:40 squareing Exp $
*
* Copyright (c) 2004 bitweaver.org
* Copyright (c) 2003 tikwiki.org
@@ -8,7 +8,7 @@
* All Rights Reserved. See copyright.txt for details and a complete list of authors.
* Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
*
- * $Id: preferences.php,v 1.24 2006/04/11 13:10:19 squareing Exp $
+ * $Id: preferences.php,v 1.25 2006/04/19 13:48:40 squareing Exp $
* @package users
* @subpackage functions
*/
@@ -86,9 +86,9 @@ if (isset($_REQUEST["prefs"])) {
}
if (isset($_REQUEST["style"]))
$gBitSmarty->assign('style', $_REQUEST["style"]);
- if (isset($_REQUEST['display_timezone'])) {
- $editUser->storePreference( 'display_timezone', $_REQUEST['display_timezone'], 'users');
- $gBitSmarty->assign_by_ref('display_timezone', $_REQUEST['display_timezone'], 'users');
+ if (isset($_REQUEST['site_display_timezone'])) {
+ $editUser->storePreference( 'site_display_timezone', $_REQUEST['site_display_timezone'], 'users');
+ $gBitSmarty->assign_by_ref('site_display_timezone', $_REQUEST['site_display_timezone'], 'users');
}
$editUser->storePreference( 'country', $_REQUEST["country"], 'users' );
$editUser->storePreference( 'user_information', $_REQUEST['user_information'], 'users');
@@ -204,10 +204,10 @@ $gBitSmarty->assign('user_dbl', $user_dbl);
//$timezone_options = $gBitSystem->get_timezone_list(true);
//$gBitSmarty->assign_by_ref('timezone_options',$timezone_options);
//$server_time = new Date();
-$display_timezone = $editUser->getPreference( 'display_timezone', "UTC");
-if ($display_timezone != "UTC")
- $display_timezone = "Local";
-$gBitSmarty->assign_by_ref('display_timezone', $display_timezone);
+$site_display_timezone = $editUser->getPreference( 'site_display_timezone', "UTC");
+if ($site_display_timezone != "UTC")
+ $site_display_timezone = "Local";
+$gBitSmarty->assign_by_ref('site_display_timezone', $site_display_timezone);
$gBitSystem->display( 'bitpackage:users/user_preferences.tpl', 'Edit User Preferences');
?>
diff --git a/remind_password.php b/remind_password.php
index 8875a35..9dce71d 100644
--- a/remind_password.php
+++ b/remind_password.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_users/remind_password.php,v 1.9 2006/03/10 18:24:33 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/remind_password.php,v 1.10 2006/04/19 13:48:40 squareing Exp $
*
* Copyright (c) 2004 bitweaver.org
* Copyright (c) 2003 tikwiki.org
@@ -8,7 +8,7 @@
* All Rights Reserved. See copyright.txt for details and a complete list of authors.
* Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
*
- * $Id: remind_password.php,v 1.9 2006/03/10 18:24:33 spiderr Exp $
+ * $Id: remind_password.php,v 1.10 2006/04/19 13:48:40 squareing Exp $
* @package users
* @subpackage functions
*/
@@ -46,7 +46,7 @@ if( $gBitUser->isRegistered() ) {
$gBitSmarty->assign('mail_pass', $pass);
$mail_data = $gBitSmarty->fetch('bitpackage:users/password_reminder.tpl');
$subject = "Your password for ".$gBitSystem->getConfig( 'site_title', $_SERVER['HTTP_HOST'] );
- mail( $userInfo['email'], $subject, $mail_data, "From: ".$gBitSystem->getConfig( 'sender_email' )."\r\nContent-type: text/plain;charset=utf-8\r\n");
+ mail( $userInfo['email'], $subject, $mail_data, "From: ".$gBitSystem->getConfig( 'site_sender_email' )."\r\nContent-type: text/plain;charset=utf-8\r\n");
// Just show "success" message and no form
} else {
// Show error message (and leave form visible so user can fix problem)
diff --git a/templates/login_inc.tpl b/templates/login_inc.tpl
index 433b91a..2d7a2af 100644
--- a/templates/login_inc.tpl
+++ b/templates/login_inc.tpl
@@ -1,5 +1,5 @@
{strip}
-{assign var=force_secure value=$gBitSystem->isFeatureActive("https_login_required")}
+{assign var=force_secure value=$gBitSystem->isFeatureActive("site_https_login_required")}
{form legend="Sign in with your username or email to continue" ipackage=users ifile='validate.php' secure=$force_secure}
<div class="row">
{formfeedback error="$error"}
diff --git a/templates/user_preferences.tpl b/templates/user_preferences.tpl
index a836e3f..0977f1e 100644
--- a/templates/user_preferences.tpl
+++ b/templates/user_preferences.tpl
@@ -133,9 +133,9 @@
<div class="row">
{formlabel label="Displayed time zone"}
{forminput}
- <label><input type="radio" name="display_timezone" value="UTC" {if $display_timezone eq 'UTC'}checked="checked"{/if} />{tr}UTC{/tr}</label>
+ <label><input type="radio" name="site_display_timezone" value="UTC" {if $site_display_timezone eq 'UTC'}checked="checked"{/if} />{tr}UTC{/tr}</label>
<br />
- <label><input type="radio" name="display_timezone" value="Local" {if $display_timezone ne 'UTC'}checked="checked"{/if} />{tr}Local{/tr}</label>
+ <label><input type="radio" name="site_display_timezone" value="Local" {if $site_display_timezone ne 'UTC'}checked="checked"{/if} />{tr}Local{/tr}</label>
{formhelp note=""}
{/forminput}
</div>
diff --git a/validate.php b/validate.php
index 302b41e..b4557b4 100644
--- a/validate.php
+++ b/validate.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_users/validate.php,v 1.12 2006/03/23 19:17:10 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/validate.php,v 1.13 2006/04/19 13:48:40 squareing Exp $
*
* Copyright (c) 2004 bitweaver.org
* Copyright (c) 2003 tikwiki.org
@@ -8,7 +8,7 @@
* All Rights Reserved. See copyright.txt for details and a complete list of authors.
* Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
*
- * $Id: validate.php,v 1.12 2006/03/23 19:17:10 spiderr Exp $
+ * $Id: validate.php,v 1.13 2006/04/19 13:48:40 squareing Exp $
* @package users
* @subpackage functions
*/
@@ -30,13 +30,13 @@ if( isset( $_SERVER['HTTP_REFERER'] ) && strpos( $_SERVER['HTTP_REFERER'], 'logi
}
$https_mode = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on';
-$https_login_required = $gBitSystem->getConfig('https_login_required', 'n');
-if ($gBitSystem->isFeatureActive( 'https_login_required' ) && !$https_mode) {
- $url = $gBitSystem->getConfig( 'https_domain' );
- $https_port = $gBitSystem->getConfig('https_port', $https_port);
- if ($https_port != 443)
- $url .= ':' . $https_port;
- $url .= $gBitSystem->getConfig( 'https_prefix' ) . $gBitSystem->getDefaultPage();
+$site_https_login_required = $gBitSystem->getConfig('site_https_login_required', 'n');
+if ($gBitSystem->isFeatureActive( 'site_https_login_required' ) && !$https_mode) {
+ $url = $gBitSystem->getConfig( 'site_https_domain' );
+ $site_https_port = $gBitSystem->getConfig('site_https_port', $site_https_port);
+ if ($site_https_port != 443)
+ $url .= ':' . $site_https_port;
+ $url .= $gBitSystem->getConfig( 'site_https_prefix' ) . $gBitSystem->getDefaultPage();
if (SID)
$url .= '?' . SID;
$url = preg_replace('/\/+/', '/', $url);
generated by cgit v1.3 (git 2.53.0) at 2026-07-01 20:37:45 +0000