r2: Changed Environment object to be BugTrack ($env --> $bugsys).. hopefully this...

diff --git a/admin/global.php b/admin/global.php
index 038b574139fbcee93d4f5b42329dbd3bb50cb1d7..8a338d9f4ce473e2180271148571b2f1e5504bdb 100755 (executable)
--- a/admin/global.php
+++ b/admin/global.php
@@ -22,14 +22,14 @@ $admin = new Admin_Print_Class();
 
 function admin_login()
 {
-       global $admin, $env;
+       global $admin, $bugsys;
        
-       $admin->page_start('Login', '', 15, '', 'document.cplogin.' . iff($env->userinfo['email'], 'password', 'email') . '.focus();');
+       $admin->page_start('Login', '', 15, '', 'document.cplogin.' . iff($bugsys->userinfo['email'], 'password', 'email') . '.focus();');
        
        $admin->form_start('../login.php', 'cplogin', false, 'cplogin');
        $admin->table_start(true, '425');
        $admin->table_head('[#]app[#] Login');
-       $admin->row_input('Email', 'email', $env->userinfo['email'], 2, 35, false, false, 'middle');
+       $admin->row_input('Email', 'email', $bugsys->userinfo['email'], 2, 35, false, false, 'middle');
        $admin->row_input('Password', 'password', '', 2, 35, false, true, 'middle');
        $admin->row_submit('', 'Login');
        $admin->table_end();
@@ -42,9 +42,9 @@ function admin_login()
 
 if ($_COOKIE[COOKIE_PREFIX . 'adminsession'])
 {
-       if ($env->userinfo['permissions'] & CANADMINPANEL)
+       if ($bugsys->userinfo['permissions'] & CANADMINPANEL)
        {
-               if (md5(md5($env->userinfo['authkey']) . md5($env->userinfo['email']) . md5($env->userinfo['userid'])) != $_COOKIE[COOKIE_PREFIX . 'adminsession'])
+               if (md5(md5($bugsys->userinfo['authkey']) . md5($bugsys->userinfo['email']) . md5($bugsys->userinfo['userid'])) != $_COOKIE[COOKIE_PREFIX . 'adminsession'])
                {
                        mysetcookie(COOKIE_PREFIX . 'adminsession', '');
                        $admin->error('Invalid admin session has been terminated.');

diff --git a/admin/options.php b/admin/options.php
index 178d8eba80155fb0cda82be61a99508ab32a1773..c432916d8066f1977a9881eab6f21e21b1b92a2b 100755 (executable)
--- a/admin/options.php
+++ b/admin/options.php
@@ -14,7 +14,7 @@ require_once('./global.php');
 require_once('./includes/settings.php');
 require_once('./includes/functions_datastore.php');
 
-if (!($env->userinfo['permissions'] & CANADMINTOOLS))
+if (!($bugsys->userinfo['permissions'] & CANADMINTOOLS))
 {
        admin_login();
 }
@@ -79,7 +79,7 @@ if ($_REQUEST['do'] == 'modify')
                $admin->table_head(phrase('settinggroup_' . $group));
                foreach ($settings["$group"] AS $opt)
                {
-                       $admin->row_span('<span' . iff(DEVDEBUG, ' title="$env->options[\'' . $opt[1] . '\']"') . "><strong>" . phrase('setting_' . $opt[1] . '_title') . "</strong></span>", 'thead');
+                       $admin->row_span('<span' . iff(DEVDEBUG, ' title="$bugsys->options[\'' . $opt[1] . '\']"') . "><strong>" . phrase('setting_' . $opt[1] . '_title') . "</strong></span>", 'thead');
                        switch ($opt[2])
                        {
                                case 'textbox':

diff --git a/admin/priority.php b/admin/priority.php
index 84dc69f5c19b93b7d907a136cadcd5152a184750..6b5cf98dce626777336fd75dd7f0bb543beed569 100755 (executable)
--- a/admin/priority.php
+++ b/admin/priority.php
@@ -13,7 +13,7 @@
 require_once('./global.php');
 require_once('./includes/functions_datastore.php');
 
-if (!($env->userinfo['permissions'] & CANADMINFIELDS))
+if (!($bugsys->userinfo['permissions'] & CANADMINFIELDS))
 {
        admin_login();
 }

diff --git a/admin/product.php b/admin/product.php
index b456ee200f78874613e428d7a002963f4f59d15b..09b7ceb13677717923d1383a5bfbbd705380b509 100755 (executable)
--- a/admin/product.php
+++ b/admin/product.php
@@ -12,7 +12,7 @@
 
 require_once('./global.php');
 
-if (!($env->userinfo['permissions'] & CANADMINVERSIONS))
+if (!($bugsys->userinfo['permissions'] & CANADMINVERSIONS))
 {
        admin_login();
 }

diff --git a/admin/resolution.php b/admin/resolution.php
index b3d44dee0ef6c836a6232191521b1f2fffa1c7c2..c3e7680e678198c880f9ca98b2bebbd85728ff10 100755 (executable)
--- a/admin/resolution.php
+++ b/admin/resolution.php
@@ -13,7 +13,7 @@
 require_once('./global.php');
 require_once('./includes/functions_datastore.php');
 
-if (!($env->userinfo['permissions'] & CANADMINFIELDS))
+if (!($bugsys->userinfo['permissions'] & CANADMINFIELDS))
 {
        admin_login();
 }

diff --git a/admin/severity.php b/admin/severity.php
index 936f586bff6fb012633aa28738fd3ae67bc649af..212eac00dffbb904ee098c81c8d9dd2e670efff8 100755 (executable)
--- a/admin/severity.php
+++ b/admin/severity.php
@@ -13,7 +13,7 @@
 require_once('./global.php');
 require_once('./includes/functions_datastore.php');
 
-if (!($env->userinfo['permissions'] & CANADMINFIELDS))
+if (!($bugsys->userinfo['permissions'] & CANADMINFIELDS))
 {
        admin_login();
 }

diff --git a/admin/status.php b/admin/status.php
index 4ffcc069cc6b07dd92bf86768eb4a93f18f74f1a..6de2c1422e0f6145cb0ba546fb2614904a98f3a1 100755 (executable)
--- a/admin/status.php
+++ b/admin/status.php
@@ -13,7 +13,7 @@
 require_once('./global.php');
 require_once('./includes/functions_datastore.php');
 
-if (!($env->userinfo['permissions'] & CANADMINFIELDS))
+if (!($bugsys->userinfo['permissions'] & CANADMINFIELDS))
 {
        admin_login();
 }

diff --git a/admin/usergroup.php b/admin/usergroup.php
index f114b7b003082a65f5620684f2bc542f6004cf31..20e4d26bf35ae6df3f49969c9bec4599fb1e83c6 100755 (executable)
--- a/admin/usergroup.php
+++ b/admin/usergroup.php
@@ -13,7 +13,7 @@
 require_once('./global.php');
 require_once('./includes/functions_datastore.php');
 
-if (!($env->userinfo['permissions'] & CANADMINGROUPS))
+if (!($bugsys->userinfo['permissions'] & CANADMINGROUPS))
 {
        admin_login();
 }

diff --git a/includes/adminfunctions.php b/includes/adminfunctions.php
index 0a497720fc6516e75015665fd1047de0303ed603..1e47b6d8bb8795f6d7a263f8411eedf35bc93f0d 100755 (executable)
--- a/includes/adminfunctions.php
+++ b/includes/adminfunctions.php
@@ -100,9 +100,9 @@ EOD;
        
        function page_end()
        {
-               global $env;
+               global $bugsys;
                
-               $copyright = "\r<br />\r<p align=\"center\" class=\"copyright\">\r\t<a href=\"http://www.iris-studios.com\" target=\"_blank\">[#]app[#] " . $env->options['trackerversion'] . ", &copy; 2003 - " . date('Y') . " Iris Studios, Inc.</a>\r</p>";
+               $copyright = "\r<br />\r<p align=\"center\" class=\"copyright\">\r\t<a href=\"http://www.iris-studios.com\" target=\"_blank\">[#]app[#] " . $bugsys->options['trackerversion'] . ", &copy; 2003 - " . date('Y') . " Iris Studios, Inc.</a>\r</p>";
                                
                if (!defined('HIDE_SETUP'))
                {

diff --git a/includes/functions.php b/includes/functions.php
index 722060eafe11eeb719d1152cdf396db38287d216..e80e6774b4101b015fe52fa193d44746dc2a098d 100755 (executable)
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -13,7 +13,7 @@
 // ########################### Start phrase ##########################
 function phrase()
 {
-       global $env;
+       global $bugsys;
        
        $args = func_get_args();
        $numargs = count($args);
@@ -23,7 +23,7 @@ function phrase()
                return false;
        }
        
-       if ($phrasetext = $env->language["$args[0]"])
+       if ($phrasetext = $bugsys->language["$args[0]"])
        {
                if ($numargs < 2)
                {

diff --git a/includes/functions_datastore.php b/includes/functions_datastore.php
index 1370f6c9c64f304eca6191861ae07ef889a0ad3c..493b3c25ea901034b08117e11f0f115a22dd991a 100755 (executable)
--- a/includes/functions_datastore.php
+++ b/includes/functions_datastore.php
@@ -13,7 +13,7 @@
 // ###################### Start build_languages ######################
 function build_languages()
 {
-       global $DB_sql, $env;
+       global $DB_sql, $bugsys;
        
        $languages = $DB_sql->query("SELECT * FROM " . TABLE_PREFIX . "language");
        while ($language = $DB_sql->fetch_array($languages))
@@ -27,13 +27,13 @@ function build_languages()
                VALUES ('language', '" . addslasheslike(serialize($tempstore)) . "')"
        );
 
-       $env->datastore['language'] = $tempstore;
+       $bugsys->datastore['language'] = $tempstore;
 }
 
 // ####################### Start build_settings ######################
 function build_settings()
 {
-       global $DB_sql, $env;
+       global $DB_sql, $bugsys;
        
        $settings = $DB_sql->query("SELECT * FROM " . TABLE_PREFIX . "setting");
        while ($setting = $DB_sql->fetch_array($settings))
@@ -47,13 +47,13 @@ function build_settings()
                VALUES ('setting', '" . addslasheslike(serialize($options)) . "')"
        );
        
-       $env->datastore['setting'] = $options;
+       $bugsys->datastore['setting'] = $options;
 }
 
 // ###################### Start build_usergroups #####################
 function build_usergroups()
 {
-       global $DB_sql, $env;
+       global $DB_sql, $bugsys;
        
        $usergroups = $DB_sql->query("SELECT * FROM " . TABLE_PREFIX . "usergroup");
        while ($usergroup = $DB_sql->fetch_array($usergroups))
@@ -67,13 +67,13 @@ function build_usergroups()
                VALUES ('usergroup', '" . addslasheslike(serialize($groups)) . "')"
        );
        
-       $env->datastore['usergroup'] = $groups;
+       $bugsys->datastore['usergroup'] = $groups;
 }
 
 // ####################### Start build_statuses ######################
 function build_statuses()
 {
-       global $DB_sql, $env;
+       global $DB_sql, $bugsys;
        
        $statuses = $DB_sql->query("SELECT * FROM " . TABLE_PREFIX . "status ORDER BY displayorder ASC");
        while ($status = $DB_sql->fetch_array($statuses))
@@ -87,13 +87,13 @@ function build_statuses()
                VALUES ('status', '" . addslasheslike(serialize($tempstore)) . "')"
        );
        
-       $env->datastore['status'] = $tempstore;
+       $bugsys->datastore['status'] = $tempstore;
 }
 
 // ###################### Start build_severities #####################
 function build_severities()
 {
-       global $DB_sql, $env;
+       global $DB_sql, $bugsys;
        
        $severities = $DB_sql->query("SELECT * FROM " . TABLE_PREFIX . "severity ORDER BY displayorder ASC");
        while ($severity = $DB_sql->fetch_array($severities))
@@ -107,13 +107,13 @@ function build_severities()
                VALUES ('severity', '" . addslasheslike(serialize($tempstore)) . "')"
        );
        
-       $env->datastore['severity'] = $tempstore;
+       $bugsys->datastore['severity'] = $tempstore;
 }
 
 // ###################### Start build_priorities #####################
 function build_priorities()
 {
-       global $DB_sql, $env;
+       global $DB_sql, $bugsys;
        
        $priorities = $DB_sql->query("SELECT * FROM " . TABLE_PREFIX . "priority ORDER BY displayorder ASC");
        while ($priority = $DB_sql->fetch_array($priorities))
@@ -127,13 +127,13 @@ function build_priorities()
                VALUES ('priority', '" . addslasheslike(serialize($tempstore)) . "')"
        );
        
-       $env->datastore['priority'] = $tempstore;
+       $bugsys->datastore['priority'] = $tempstore;
 }
 
 // ###################### Start build_assignedto #####################
 function build_assignedto()
 {
-       global $DB_sql, $env;
+       global $DB_sql, $bugsys;
        
        $users = $DB_sql->query("
                SELECT user.email, user.displayname, user.userid, user.showemail
@@ -153,13 +153,13 @@ function build_assignedto()
                VALUES ('assignto', '" . addslasheslike(serialize($devs)) . "')"
        );
        
-       $env->datastore['assignto'] = $devs;
+       $bugsys->datastore['assignto'] = $devs;
 }
 
 // ##################### Start build_resolutions #####################
 function build_resolutions()
 {
-       global $DB_sql, $env;
+       global $DB_sql, $bugsys;
        
        $resolutions = $DB_sql->query("SELECT * FROM " . TABLE_PREFIX . "resolution ORDER BY displayorder ASC");
        while ($resolution = $DB_sql->fetch_array($resolutions))
@@ -173,7 +173,7 @@ function build_resolutions()
                VALUES ('resolution', '" . addslasheslike(serialize($tempstore)) . "')"
        );
        
-       $env->datastore['resolution'] = $tempstore;
+       $bugsys->datastore['resolution'] = $tempstore;
 }
 
 /*=====================================================================*\

diff --git a/includes/functions_mail.php b/includes/functions_mail.php
index fb27f8557ddf3d23126aef20e4de72cf88599b55..2b52dd3eef820454d20c41bd83cd3a6f3a70f511 100755 (executable)
--- a/includes/functions_mail.php
+++ b/includes/functions_mail.php
@@ -13,7 +13,7 @@
 // ########################### Start mymail ##########################
 function mymail($toemail, $subject, $message, $fromemail = '', $headers = '', $fparam = true)
 {
-       global $env;
+       global $bugsys;
        
        // Make sure sendmail is at our disposal
        if (!(@ini_get('sendmail_path')))
@@ -25,9 +25,9 @@ function mymail($toemail, $subject, $message, $fromemail = '', $headers = '', $f
        $fromemail = fetch_first_line($fromemail);
        if ($fromemail == -1 OR !$fromemail)
        {
-               if ($env->options['webmasteremail'])
+               if ($bugsys->options['webmasteremail'])
                {
-                       $fromemail = fetch_first_line($env->options['webmasteremail']);
+                       $fromemail = fetch_first_line($bugsys->options['webmasteremail']);
                }
                else
                {
@@ -50,7 +50,7 @@ function mymail($toemail, $subject, $message, $fromemail = '', $headers = '', $f
        $subject = fetch_first_line($subject);
        if (!$subject)
        {
-               $subject = $env->options['trackertitle'] . ' Notification';
+               $subject = $bugsys->options['trackertitle'] . ' Notification';
        }
        
        // Work out the body
@@ -62,10 +62,10 @@ function mymail($toemail, $subject, $message, $fromemail = '', $headers = '', $f
        
        // Construct mail headers
        $headers = convert_standard_line_breaks($headers, "\n");
-       $headers .= "From: \"$fromemail\" <" . $env->options['webmasteremail'] . ">\n";
-       $headers .= "Return-Path: " . $env->options['webmasteremail'] . "\n";
+       $headers .= "From: \"$fromemail\" <" . $bugsys->options['webmasteremail'] . ">\n";
+       $headers .= "Return-Path: " . $bugsys->options['webmasteremail'] . "\n";
        $headers .= "X-Mailer: [#]app[#] [#]version[#] Mail\n";
-       $headers .= "Content-Type: text/plain; charset=\"" . $env->options['lang_charset'] . "\"\n";
+       $headers .= "Content-Type: text/plain; charset=\"" . $bugsys->options['lang_charset'] . "\"\n";
        $headers .= "Content-Transfer-Encoding: 7bit\n";
        
        if ($fparam)

diff --git a/includes/init.php b/includes/init.php
index 22fd90a5407ab6ff589b086c87e4573f5fa10ec3..5d1a325b512884c837f0ba1daff10559e4c2a76f 100755 (executable)
--- a/includes/init.php
+++ b/includes/init.php
@@ -39,14 +39,14 @@ unset($database, $servername, $username, $password, $usepconnect, $tableprefix,
 // Initialize our environment
 require_once('./includes/functions_datastore.php');
 require_once('./includes/functions.php');
-class Environment
+class BugTracker
 {
        var $options = array();
        var $userinfo = array();
        var $language = array();
        var $datastore = array();
        
-       function Environment()
+       function BugTracker()
        {
                global $DB_sql, $vars;
                
@@ -155,7 +155,7 @@ class Environment
        }
 }
 
-$env = new Environment();
+$bugsys = new BugTracker();
 
 // ###################################################################
 // Initialize usergroup system

diff --git a/login.php b/login.php
index 3cb2b64a8c1c1287f73b1d947df70c1d8d788ecc..9aaf276a8b30e099d577f62d52d907ad25b5cba2 100755 (executable)
--- a/login.php
+++ b/login.php
@@ -14,7 +14,7 @@ require_once('./global.php');
 
 // ###################################################################
 
-if ($env->userinfo['userid'] AND $_REQUEST['do'] != 'logout' AND $_POST['do'] != 'cplogin')
+if ($bugsys->userinfo['userid'] AND $_REQUEST['do'] != 'logout' AND $_POST['do'] != 'cplogin')
 {
        echo 'You are already logged in.';
        exit;
@@ -89,7 +89,7 @@ if ($_POST['do'] == 'login' OR $_POST['do'] == 'cplogin')
 
 if ($_REQUEST['do'] == 'logout')
 {
-       if ($env->userinfo['userid'])
+       if ($bugsys->userinfo['userid'])
        {
                mysetcookie(COOKIE_PREFIX . 'userid');
                mysetcookie(COOKIE_PREFIX . 'authkey');

diff --git a/newreport.php b/newreport.php
index f0cbd45a8e5ffddbba139d2e2cbfc895235c633f..1114297d681caf902989045ff171b5d8c0386255 100755 (executable)
--- a/newreport.php
+++ b/newreport.php
@@ -12,7 +12,7 @@
 
 require_once('./global.php');
 
-if (!($env->userinfo['permissions'] & CANSUBMITBUGS))
+if (!($bugsys->userinfo['permissions'] & CANSUBMITBUGS))
 {
        echo 'NO permission';
        exit;
@@ -43,22 +43,38 @@ if ($_POST['do'] == 'insert')
        );
        
        // check permissions on various input values
-       if (!$env->userinfo['permissions'] & CANCHANGESTATUS)
+       if (!$bugsys->userinfo['permissions'] & CANCHANGESTATUS)
        {
                unset($vars['priority'], $vars['status'], $vars['resolution']);
        }
-       if (!$env->userinfo['permissions'] & CANASSIGN)
+       if (!$bugsys->userinfo['permissions'] & CANASSIGN)
        {
                unset($vars['assignedto']);
        }
        else
        {
                // assigned person is not a dev or a valid user
-               if (!$env->datastore['assignto']["$vars[assignedto]"]['userid'])
+               if (!$bugsys->datastore['assignto']["$vars[assignedto]"]['userid'])
                {
                        unset($vars['assignedto']);
                }
        }
+       
+       if (!$vars['product'] OR !$vars['component'] OR !$vars['version'])
+       {
+               echo 'there was a problem selecting the product, component, or version';
+               exit;
+       }
+       if (!$vars['summary'])
+       {
+               echo 'please enter a bug title';
+               exit;
+       }
+       if (!$vars['comment'])
+       {
+               echo 'please enter a bug description';
+               exit;
+       }
 }
 
 // ###################################################################
@@ -159,40 +175,40 @@ if ($_REQUEST['do'] == 'add')
                echo '<div><strong>Summary/Title:</strong> <input type="text" name="summary" size="25" /></div>';
                
                echo '<div><strong>Severity:</strong> <select name="severity">';
-               foreach ($env->datastore['severity'] AS $severity)
+               foreach ($bugsys->datastore['severity'] AS $severity)
                {
                        echo '<option value="' . $severity['severityid'] . '">' . $severity['severity'] . '</option>';
                }
                echo '</select></div>';
                
-               if ($env->userinfo['permissions'] & CANCHANGESTATUS)
+               if ($bugsys->userinfo['permissions'] & CANCHANGESTATUS)
                {
                        echo '<div><strong>Priority:</strong> <select name="priority">';
-                       foreach ($env->datastore['priority'] AS $priority)
+                       foreach ($bugsys->datastore['priority'] AS $priority)
                        {
                                echo '<option value="' . $priority['priorityid'] . '">' . $priority['priority'] . '</option>';
                        }
                        echo '</select></div>';
                        
                        echo '<div><strong>Status:</strong> <select name="status">';
-                       foreach ($env->datastore['status'] AS $status)
+                       foreach ($bugsys->datastore['status'] AS $status)
                        {
                                echo '<option value="' . $status['statusid'] . '">' . $status['status'] . '</option>';
                        }
                        echo '</select></div>';
                        
                        echo '<div><strong>Resolution:</strong> <select name="resolution">';
-                       foreach ($env->datastore['resolution'] AS $resolution)
+                       foreach ($bugsys->datastore['resolution'] AS $resolution)
                        {
                                echo '<option value="' . $resolution['resolutionid'] . '">' . $resolution['resolution'] . '</option>';
                        }
                        echo '</select></div>';
                }
                
-               if ($env->userinfo['permissions'] & CANASSIGN)
+               if ($bugsys->userinfo['permissions'] & CANASSIGN)
                {
                        echo '<div><strong>Assigned to:</strong> <select name="assignedto"><option value="0">No Assignment</option>';
-                       foreach ($env->datastore['assignto'] AS $dev)
+                       foreach ($bugsys->datastore['assignto'] AS $dev)
                        {
                                fetch_user_display_name($dev);
                                echo '<option value="' . $dev['userid'] . '">' . $dev['displayname'] . iff($dev['showemail'], ' <' . $dev['email'] . '>', '') . '</option>';

diff --git a/register.php b/register.php
index 309d4189f1580e7c8b8c785eb17c6dca1fbd68c9..0b71c8031da9e755aa4dc50081e8468ed776be3f 100755 (executable)
--- a/register.php
+++ b/register.php
@@ -14,13 +14,13 @@ require_once('./global.php');
 
 // ###################################################################
 
-if ($env->userinfo['userid'])
+if ($bugsys->userinfo['userid'])
 {
        echo 'Sorry, you are already registered!';
        exit;
 }
 
-if (!$env->options['allownewreg'])
+if (!$bugsys->options['allownewreg'])
 {
        echo 'Sorry, we don\'t allow new registrations!';
        exit;
@@ -30,7 +30,7 @@ if (!$env->options['allownewreg'])
 
 if (empty($_REQUEST['do']))
 {
-       foreach ($env->datastore['language'] AS $languageid => $language)
+       foreach ($bugsys->datastore['language'] AS $languageid => $language)
        {
                $opts .= "<option value=\"$languageid\">$language[title]</option>";
        }
@@ -89,13 +89,13 @@ if ($_POST['do'] == 'insert')
        
        $salt = fetch_random_chars(15);
        
-       if ($env->options['verifyemail'])
+       if ($bugsys->options['verifyemail'])
        {
                $usergroupid = 3;
        }
        else
        {
-               if ($env->options['moderatenewusers'])
+               if ($bugsys->options['moderatenewusers'])
                {
                        $usergroupid = 4;
                }
@@ -129,15 +129,15 @@ if ($_POST['do'] == 'insert')
                
                $DB_sql->query("INSERT INTO " . TABLE_PREFIX . "useractivation (userid, activator, dateline, usergroupid) VALUES ($userid, '$activationid', " . NOW . ", 2)");
                
-               mymail(addslasheslike($vars['email']), 'Welcome to ' . $env->options['trackertitle'], "Hi " . addslasheslike($vars['displayname']) . " you need to activate your account: http://devbox/bugtraq/register.php?do=activate&userid=" . $userid . "&activator=" . $activationid);
+               mymail(addslasheslike($vars['email']), 'Welcome to ' . $bugsys->options['trackertitle'], "Hi " . addslasheslike($vars['displayname']) . " you need to activate your account: http://devbox/bugtraq/register.php?do=activate&userid=" . $userid . "&activator=" . $activationid);
        
                echo 'You now need to activate your account via email.';
        }
        else if ($usergroupid == 4 OR $usergroupid == 2)
        {
-               if ($env->options['sendwelcomemail'])
+               if ($bugsys->options['sendwelcomemail'])
                {
-                       mymail(addslasheslike($vars['email']), 'Welcome to ' . $env->options['trackertitle'], "Hi " . addslasheslike($vars['displayname']) . " and welcome to the " . $env->options['trackertitle'] . " bug tracker! Thanks for registering.");
+                       mymail(addslasheslike($vars['email']), 'Welcome to ' . $bugsys->options['trackertitle'], "Hi " . addslasheslike($vars['displayname']) . " and welcome to the " . $bugsys->options['trackertitle'] . " bug tracker! Thanks for registering.");
                }
                
                if ($usergroupid == 4)