Menu
▾
▴
[phpBT-dev] CVS: phpbt include.php,1.126.4.1,1.126.4.2
|
From: Benjamin C. <bc...@us...> - 2003-09-05 11:59:17
|
Update of /cvsroot/phpbt/phpbt
In directory sc8-pr-cvs1:/tmp/cvs-serv15366
Modified Files:
Tag: htmltemplates
include.php
Log Message:
Cleanup. Gettext conversion. Dumping smarty
Index: include.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/include.php,v
retrieving revision 1.126.4.1
retrieving revision 1.126.4.2
diff -u -r1.126.4.1 -r1.126.4.2
--- include.php 30 Aug 2003 22:07:12 -0000 1.126.4.1
+++ include.php 5 Sep 2003 11:58:48 -0000 1.126.4.2
@@ -2,7 +2,7 @@
// include.php - Set up global variables
// ------------------------------------------------------------------------
-// Copyright (c) 2001, 2002 The phpBugTracker Group
+// Copyright (c) 2001 - 2003 The phpBugTracker Group
// ------------------------------------------------------------------------
// This file is part of phpBugTracker
//
@@ -27,12 +27,12 @@
@ini_set("session.save_handler", "files");
if (!@include('config.php')) {
- header("Location: install.php");
- exit();
+ header("Location: install.php");
+ exit();
}
if (!defined('DB_HOST')) { // Installation hasn't been completed
- header("Location: install.php");
- exit();
+ header("Location: install.php");
+ exit();
}
// Grab the global functions
@@ -47,7 +47,7 @@
'database' => DB_DATABASE,
'username' => DB_USER,
'password' => DB_PASSWORD
- );
+ );
$db = DB::Connect($dsn);
if (DB::isError($db)) {
die($db->message.'<br>'.$db->userinfo);
@@ -59,50 +59,45 @@
// Set up the configuration variables
$rs = $db->query('select varname, varvalue from '.TBL_CONFIGURATION);
while (list($k, $v) = $rs->fetchRow(DB_FETCHMODE_ORDERED)) {
- define($k, $v);
+ define($k, $v);
}
-define('OPEN_BUG_STATUSES', join(', ', array(BUG_UNCONFIRMED, BUG_PROMOTED,
- BUG_ASSIGNED, BUG_REOPENED)));
+define('OPEN_BUG_STATUSES', join(', ',
+ array(BUG_UNCONFIRMED, BUG_PROMOTED, BUG_ASSIGNED, BUG_REOPENED)));
require_once ('inc/db/'.DB_TYPE.'.php');
-// Localization - include the file with the desired language
-include 'languages/'.LANGUAGE.'.php';
-
$me = $HTTP_SERVER_VARS['PHP_SELF'];
$selrange = 30;
$now = time();
-$_gv =& $HTTP_GET_VARS;
-$_pv =& $HTTP_POST_VARS;
$all_db_fields = array(
- 'bug_id' => 'ID',
- 'title' => 'Title',
- 'description' => 'Description',
- 'url' => 'URL',
- 'severity_name' => 'Severity',
- 'priority' => 'Priority',
- 'status_name' => 'Status',
- 'resolution_name' => 'Resolution',
- 'closed_in_version_name' => 'Closed in Version',
- 'to_be_closed_in_version_name' => 'To be Closed in Version',
- 'database_name' => 'Database',
- 'site_name' => 'Site',
- 'reporter' => 'Reporter',
- 'owner' => 'Owner',
- 'created_date' => 'Created Date',
- 'lastmodifier' => 'Last Modified By',
- 'last_modified_date' => 'Last Modified Date',
- 'project_name' => 'Project',
- 'version_name' => 'Version',
- 'component_name' => 'Component',
- 'os_name' => 'OS',
- 'browser_string' => 'Browser',
- 'close_date' => 'Closed Date'
- );
+ 'bug_id' => 'ID',
+ 'title' => 'Title',
+ 'description' => 'Description',
+ 'url' => 'URL',
+ 'severity_name' => 'Severity',
+ 'priority' => 'Priority',
+ 'status_name' => 'Status',
+ 'resolution_name' => 'Resolution',
+ 'closed_in_version_name' => 'Closed in Version',
+ 'to_be_closed_in_version_name' => 'To be Closed in Version',
+ 'database_name' => 'Database',
+ 'site_name' => 'Site',
+ 'reporter' => 'Reporter',
+ 'owner' => 'Owner',
+ 'created_date' => 'Created Date',
+ 'lastmodifier' => 'Last Modified By',
+ 'last_modified_date' => 'Last Modified Date',
+ 'project_name' => 'Project',
+ 'version_name' => 'Version',
+ 'component_name' => 'Component',
+ 'os_name' => 'OS',
+ 'browser_string' => 'Browser',
+ 'close_date' => 'Closed Date'
+ );
$default_db_fields = array('bug_id', 'title', 'reporter', 'owner',
- 'severity_name', 'priority', 'status_name', 'resolution_name');
+ 'severity_name', 'priority', 'status_name', 'resolution_name');
// Template class
@@ -115,9 +110,9 @@
function render($content_template, $page_title, $wrap_file = '') {
extract($this->vars);
- $path = defined('TEMPLATE_PATH')
- ? './templates/'.THEME.'/'.TEMPLATE_PATH.'/'
- : './templates/'.THEME.'/';
+ $path = defined('TEMPLATE_PATH')
+ ? './templates/'.THEME.'/'.TEMPLATE_PATH.'/'
+ : './templates/'.THEME.'/';
include($wrap_file ? $path.$wrap_file : $path.'wrap.html');
}
@@ -133,11 +128,7 @@
}
$t = new template();
-$t->assign(array(
- 'STRING' => $STRING,
- 'TITLE' => $TITLE,
- 'STYLE' => STYLE
- ));
+$t->assign('STYLE', STYLE);
if (defined('TEMPLATE_PATH')) {
$t->assign('template_path', '../templates/'.THEME.'/'.TEMPLATE_PATH);
@@ -158,44 +149,45 @@
}
if (!defined('NO_AUTH')) {
- session_start();
- $_sv =& $HTTP_SESSION_VARS;
- $auth = new uauth;
- $perm = new uperm;
- $u = isset($_sv['uid']) ? $_sv['uid'] : 0;
+ session_start();
+ $auth = new uauth;
+ $perm = new uperm;
+ $u = isset($_SESSION['uid']) ? $_SESSION['uid'] : 0;
}
// Check to see if the user is trying to login
-if (isset($_pv['dologin'])) {
- if (!empty($_pv['sendpass'])) {
- $username = $_pv['username'];
- list($email, $password) = $db->getRow("select email, password from ".TBL_AUTH_USER." where login = '{$_pv['username']}' and active > 0", null, DB_FETCHMODE_ORDERED);
- if (!$email) {
- $t->assign('loginerror', '<div class="error">Invalid login</div>');
- } else {
- if (ENCRYPT_PASS) {
- $password = genpassword(10);
- $mpassword = md5($password);
- $db->query("update ".TBL_AUTH_USER." set password = '$mpassword' where login = '$username'");
- }
- qp_mail($email, $STRING['newacctsubject'], sprintf($STRING['newacctmessage'], $password),
- sprintf("From: %s",ADMIN_EMAIL));
- $t->assign('loginerror',
- '<div class="result">Your password has been emailed to you</div>');
+if (isset($_POST['dologin'])) {
+ if (!empty($_POST['sendpass'])) {
+ $username = $_POST['username'];
+ list($email, $password) = $db->getRow("select email, password from ".TBL_AUTH_USER." where login = '{$_POST['username']}' and active > 0", null, DB_FETCHMODE_ORDERED);
+ if (!$email) {
+ $t->assign('loginerror', '<div class="error">'.translate("Invalid login").'</div>');
+ } else {
+ if (ENCRYPT_PASS) {
+ $password = genpassword(10);
+ $mpassword = md5($password);
+ $db->query("update ".TBL_AUTH_USER." set password = '$mpassword' where login = '$username'");
+ }
+ qp_mail($email,
+ translate("phpBugTracker Login"),
+ sprintf(translate("Your phpBugTracker password is %s"), $password),
+ sprintf("From: %s", ADMIN_EMAIL));
+ $t->assign('loginerror',
+ '<div class="result">'.translate("Your password has been emailed to you").'</div>');
$emailsuccess = true;
- }
- } else {
- if (!$u = $auth->auth_validatelogin()) {
- $t->assign('loginerror', '<div class="error">Invalid login</div>');
- $username = $_pv['username'];
- }
- }
+ }
+ } else {
+ if (!$u = $auth->auth_validatelogin()) {
+ $t->assign('loginerror', '<div class="error">'.translate("Invalid login").'</div>');
+ $username = $_POST['username'];
+ }
+ }
// "Remember me" handling
if (RECALL_LOGIN) {
- if (!empty($_pv["savecookie"])) {
- setcookie('phpbt_user', $_pv["username"], $now + 18144000); // 3 week expiration
- } elseif (!empty($HTTP_COOKIE_VARS['phpbt_user'])) {
+ if (!empty($_POST["savecookie"])) {
+ setcookie('phpbt_user', $_POST["username"], $now + 18144000); // 3 week expiration
+ } elseif (!empty($_COOKIE['phpbt_user'])) {
// Clear the cookie if the cookie is populated and the box wasn't checked
setcookie('phpbt_user');
}
@@ -204,19 +196,17 @@
}
if (!empty($u)) {
- list($owner_open, $owner_closed) =
- $db->getRow(sprintf($QUERY['include-template-owner'], $u),
- DB_FETCHMODE_ORDERED);
- list($reporter_open, $reporter_closed) =
- $db->getRow(sprintf($QUERY['include-template-reporter'], $u),
- DB_FETCHMODE_ORDERED);
- $t->assign(array(
- 'owner_open' => $owner_open ? $owner_open : 0,
- 'owner_closed' => $owner_closed ? $owner_closed : 0,
- 'reporter_open' => $reporter_open ? $reporter_open : 0,
- 'reporter_closed' => $reporter_closed ? $reporter_closed : 0,
+ list($owner_open, $owner_closed) =
+ $db->getRow(sprintf($QUERY['include-template-owner'], $u), DB_FETCHMODE_ORDERED);
+ list($reporter_open, $reporter_closed) =
+ $db->getRow(sprintf($QUERY['include-template-reporter'], $u), DB_FETCHMODE_ORDERED);
+ $t->assign(array(
+ 'owner_open' => $owner_open ? $owner_open : 0,
+ 'owner_closed' => $owner_closed ? $owner_closed : 0,
+ 'reporter_open' => $reporter_open ? $reporter_open : 0,
+ 'reporter_closed' => $reporter_closed ? $reporter_closed : 0,
'perm' => $perm,
- ));
+ ));
}
if (defined('FORCE_LOGIN') and FORCE_LOGIN and !$u and !defined('NO_AUTH')) {
@@ -224,19 +214,17 @@
exit;
}
-$op = isset($_gv['op']) ? $_gv['op'] : (isset($_pv['op']) ? $_pv['op'] : '');
+$op = !empty($_REQUEST['op']) ? $_REQUEST['op'] : '';
if (!defined('NO_AUTH')) {
// Check to see if we have projects that shouldn't be visible to the user
$restricted_projects = '0';
if (!$perm->have_perm('Admin')) {
- $viewable_projects = delimit_list(',',
- $db->getCol("select project_id from ".TBL_PROJECT_GROUP.
- " where group_id in (".delimit_list(',', $_sv['group_ids']).")"));
+ $viewable_projects = @join(',',
+ $db->getCol("select project_id from ".TBL_PROJECT_GROUP." where group_id in (".delimit_list(',', $_SESSION['group_ids']).")"));
$viewable_projects = $viewable_projects ? $viewable_projects : '0';
$matching_projects = delimit_list(',',
- $db->getCol("select project_id from ".TBL_PROJECT_GROUP.
- " where project_id not in ($viewable_projects) group by project_id"));
+ $db->getCol("select project_id from ".TBL_PROJECT_GROUP." where project_id not in ($viewable_projects) group by project_id"));
if ($matching_projects) {
$restricted_projects .= ",$matching_projects";
}
|
