Update of /cvsroot/phpbt/phpbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32304
Modified Files:
include.php install.php newaccount.php upgrade.php
Log Message:
Make the group "User" less special (don't force everyone into it)
Index: include.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/include.php,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- include.php 29 Aug 2005 19:09:40 -0000 1.140
+++ include.php 3 Sep 2005 16:41:48 -0000 1.141
@@ -87,7 +87,7 @@
}
require_once ('inc/db/'.DB_TYPE.'.php');
-$me = $HTTP_SERVER_VARS['PHP_SELF'];
+$me = $_SERVER['PHP_SELF'];
$selrange = 30;
$now = time();
Index: install.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/install.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- install.php 29 Aug 2005 19:09:40 -0000 1.52
+++ install.php 3 Sep 2005 16:41:48 -0000 1.53
@@ -130,7 +130,7 @@
'/OPTION_ADMIN_PASS/' => $_POST['encrypt_pass'] ? md5($_POST['admin_pass']) : $_POST['admin_pass'],
'/OPTION_PHPBT_EMAIL/' => $_POST['phpbt_email'],
'/OPTION_ENCRYPT_PASS/' => $_POST['encrypt_pass'],
- '/OPTION_INSTALL_URL/' => 'http://'.$HTTP_SERVER_VARS['SERVER_NAME'].dirname($HTTP_SERVER_VARS['SCRIPT_NAME']),
+ '/OPTION_INSTALL_URL/' => 'http://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['SCRIPT_NAME']),
);
}
@@ -296,11 +296,11 @@
}
function show_front($error = '') {
- global $t, $_POST, $select, $HTTP_SERVER_VARS;
+ global $t, $_POST, $select;
extract($_POST);
$error = $error;
- $default_email = 'phpbt@'.$HTTP_SERVER_VARS['SERVER_NAME'];
+ $default_email = 'phpbt@'.$_SERVER['SERVER_NAME'];
include('templates/default/install.html');
}
Index: newaccount.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/newaccount.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- newaccount.php 22 Aug 2005 20:50:23 -0000 1.34
+++ newaccount.php 3 Sep 2005 16:41:48 -0000 1.35
@@ -58,7 +58,7 @@
}
$user_id = $db->nextId(TBL_AUTH_USER);
$db->query("insert into ".TBL_AUTH_USER." (user_id, login, first_name, last_name, email, password, active, created_date, last_modified_date) values (".join(', ', array($user_id, $db->quote(stripslashes($login)), $db->quote(stripslashes($firstname)), $db->quote(stripslashes($lastname)), $db->quote($_POST['email']), $mpassword, 1, $now, $now)).")");
- $db->query("insert into ".TBL_USER_GROUP." (user_id, group_id, created_by, created_date) select $user_id, group_id, 0, $now from ".TBL_AUTH_GROUP." where group_name = 'User'");
+ $db->query("insert into ".TBL_USER_GROUP." (user_id, group_id, created_by, created_date) select $user_id, group_id, 0, $now from ".TBL_AUTH_GROUP." where group_name = ".NEW_ACCOUNTS_GROUP);
$db->query("insert into ".TBL_USER_PREF." (user_id) values ($user_id)");
qp_mail($_POST['email'],
Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/upgrade.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- upgrade.php 31 Aug 2005 20:11:06 -0000 1.43
+++ upgrade.php 3 Sep 2005 16:41:48 -0000 1.44
@@ -208,6 +208,7 @@
log_query("INSERT INTO ".TBL_PRIORITY." VALUES (3,'Medium','Fix before next milestone (alpha, beta, etc.)',3,'#dac0c0')");
log_query("INSERT INTO ".TBL_PRIORITY." VALUES (4,'Medium High','Fix as soon as possible',4,'#dab0b0')");
log_query("INSERT INTO ".TBL_PRIORITY." VALUES (5,'High','Fix immediately',5,'#daaaaa')");
+ log_query("INSERT INTO ".TBL_CONFIGURATION." VALUES ('NEW_ACCOUNTS_GROUP', 'User', 'The group assigned to new user accounts', 'string')");
}
/* update to current DB_VERSION */
|
