Change $bugsys->in[] to $input->in[]
authorRobert Sesek <rsesek@bluestatic.org>
Mon, 18 Aug 2008 16:24:49 +0000 (12:24 -0400)
committerRobert Sesek <rsesek@bluestatic.org>
Mon, 18 Aug 2008 16:24:49 +0000 (12:24 -0400)
52 files changed:
admin/automation.php
admin/field.php
admin/language.php
admin/permission.php
admin/priority.php
admin/product.php
admin/resolution.php
admin/setting.php
admin/severity.php
admin/status.php
admin/user.php
admin/usergroup.php
admin/userhelp.php
attachment.php
editcomment.php
editreport.php
favorite.php
help.php
install/convert_database_charset.php
install/global.php
install/install.php
install/upgrade.php
install/upgrade1.php
install/upgrade10.php
install/upgrade11.php
install/upgrade12.php
install/upgrade13.php
install/upgrade14.php
install/upgrade15.php
install/upgrade16.php
install/upgrade17.php
install/upgrade2.php
install/upgrade3.php
install/upgrade4.php
install/upgrade5.php
install/upgrade6.php
install/upgrade7.php
install/upgrade8.php
install/upgrade9.php
locale/en_US/emails/activateaccount.xml.tpl
login.php
newreport.php
register.php
search.php
showreport.php
templates/lostpassword.tpl
templates/newattach.tpl
templates/newreport.tpl
templates/register.tpl
templates/search_save.tpl
templates/showreport.tpl
userctrl.php

index 3f6509b54bc00381a9d064499bef4aca334e2e20..bfd2fee297d1e1888c132e50c567082672330ce2 100644 (file)
@@ -45,7 +45,7 @@ if (empty($_REQUEST['do']))
 if ($_REQUEST['do'] == 'kill')
 {
        $action = new AutomationAPI($bugsys);
-       $action->set('actionid',        $bugsys->in['actionid']);
+       $action->set('actionid',        $input->in['actionid']);
        $action->set_condition();
        $action->delete();
        
@@ -56,7 +56,7 @@ if ($_REQUEST['do'] == 'kill')
 
 if ($_REQUEST['do'] == 'delete')
 {
-       $admin->page_confirm(T('Are you sure you want to delete this automation?'), 'automation.php', 'kill', array('actionid' => $bugsys->in['actionid']));
+       $admin->page_confirm(T('Are you sure you want to delete this automation?'), 'automation.php', 'kill', array('actionid' => $input->in['actionid']));
 }
 
 // ###################################################################
@@ -65,9 +65,9 @@ if ($_POST['do'] == 'insert' OR $_POST['do'] == 'update')
 {
        $deltas = array('builtin' => array(), 'custom' => array());
        
-       if (is_array($bugsys->in['fields']))
+       if (is_array($input->in['fields']))
        {
-               foreach ($bugsys->in['fields'] AS $key => $value)
+               foreach ($input->in['fields'] AS $key => $value)
                {
                        if (!empty($value) AND $value != -1 AND !is_array($value))
                        {
@@ -76,9 +76,9 @@ if ($_POST['do'] == 'insert' OR $_POST['do'] == 'update')
                }
        }
        
-       if (is_array($bugsys->in['fields']['custom']))
+       if (is_array($input->in['fields']['custom']))
        {
-               foreach ($bugsys->in['fields']['custom'] AS $key => $value)
+               foreach ($input->in['fields']['custom'] AS $key => $value)
                {
                        if ($value != '' AND $value != -1)
                        {
@@ -88,10 +88,10 @@ if ($_POST['do'] == 'insert' OR $_POST['do'] == 'update')
        }
        
        $action = new AutomationAPI($bugsys);
-       $action->set('name',                    $bugsys->in['name']);
-       $action->set('description',             $bugsys->in['description']);
+       $action->set('name',                    $input->in['name']);
+       $action->set('description',             $input->in['description']);
        $action->set('fieldchanges',    $deltas);
-       $action->set('comment',                 $bugsys->in['comment']);
+       $action->set('comment',                 $input->in['comment']);
        
        if ($_POST['do'] == 'insert')
        {
@@ -101,7 +101,7 @@ if ($_POST['do'] == 'insert' OR $_POST['do'] == 'update')
        }
        else
        {
-               $action->set('actionid',        $bugsys->in['actionid']);
+               $action->set('actionid',        $input->in['actionid']);
                $action->set_condition();
                $action->update();
                
@@ -118,11 +118,11 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit')
        
        if ($edit)
        {
-               NavLinks::automationsEdit($bugsys->in['actionid']);
+               NavLinks::automationsEdit($input->in['actionid']);
                $navigator->set_focus('link', 'fields-pages-automations', 'fields-pages');
        
                $action = new AutomationAPI($bugsys);
-               $action->set('actionid',        $bugsys->in['actionid']);
+               $action->set('actionid',        $input->in['actionid']);
                $action->set_condition();
                $action->fetch();
                $action->objdata['fields'] = unserialize($action->objdata['fieldchanges']);
index e2ed38f981744f184662bb5a42624d0133661f45..b07b033693531a960f03504e4f1229b329cf2c4b 100644 (file)
@@ -45,7 +45,7 @@ if (empty($_REQUEST['do']))
 if ($_REQUEST['do'] == 'kill')
 {
        $field = new FieldAPI($bugsys);
-       $field->set('fieldid',          $bugsys->in['fieldid']);
+       $field->set('fieldid',          $input->in['fieldid']);
        $field->set_condition();
        $field->delete();
        
@@ -56,7 +56,7 @@ if ($_REQUEST['do'] == 'kill')
 
 if ($_REQUEST['do'] == 'delete')
 {      
-       $admin->page_confirm(T('Are you sure you want to delete this bug field? Doing so will remove everything for this field and it cannot be undone!'), 'field.php', 'kill', array('fieldid' => $bugsys->in['fieldid']));
+       $admin->page_confirm(T('Are you sure you want to delete this bug field? Doing so will remove everything for this field and it cannot be undone!'), 'field.php', 'kill', array('fieldid' => $input->in['fieldid']));
 }
 
 // ###################################################################
@@ -66,13 +66,13 @@ if ($_REQUEST['do'] == 'update')
        $edit = false;
        $add = true;
        
-       $type = $bugsys->in['type'];
+       $type = $input->in['type'];
        
        $field = new FieldAPI($bugsys);
        
-       if ($bugsys->in['fieldid'])
+       if ($input->in['fieldid'])
        {
-               $field->set('fieldid',          $bugsys->in['fieldid']);
+               $field->set('fieldid',          $input->in['fieldid']);
                $field->set_condition();
                $field->fetch();
                
@@ -88,25 +88,25 @@ if ($_REQUEST['do'] == 'update')
        switch ($type)
        {
                case 'input_text':
-                       $field->set('defaultvalue',     $bugsys->in['defaultvalue']);
-                       $field->set('regexmatch',       $bugsys->in['regexmatch']);
-                       $field->set('maxlength',        $bugsys->in['maxlength']);
+                       $field->set('defaultvalue',     $input->in['defaultvalue']);
+                       $field->set('regexmatch',       $input->in['regexmatch']);
+                       $field->set('maxlength',        $input->in['maxlength']);
                break;
                
                case 'input_checkbox':
-                       $field->set('defaultvalue',     $bugsys->in['defaultvalue']);
+                       $field->set('defaultvalue',     $input->in['defaultvalue']);
                break;
                
                case 'select_single':
-                       $field->set('selects',          $bugsys->in['selects']);
-                       $field->set('usedefault',       $bugsys->in['usedefault']);
+                       $field->set('selects',          $input->in['selects']);
+                       $field->set('usedefault',       $input->in['usedefault']);
                break;
        }
        
-       $field->set('name',                     $bugsys->in['name']);
-       $field->set('description',      $bugsys->in['description']);
-       $field->set('required',         $bugsys->in['required']);
-       $field->set('cansearch',        $bugsys->in['cansearch']);
+       $field->set('name',                     $input->in['name']);
+       $field->set('description',      $input->in['description']);
+       $field->set('required',         $input->in['required']);
+       $field->set('cansearch',        $input->in['cansearch']);
        
        if ($add)
        {
@@ -123,7 +123,7 @@ if ($_REQUEST['do'] == 'update')
        }
        
        $input->inputClean('custom', TYPE_UINT);
-       foreach ($bugsys->in['custom'] AS $usergroupid => $mask)
+       foreach ($input->in['custom'] AS $usergroupid => $mask)
        {
                $values[] = $bugsys->clean($usergroupid, TYPE_UINT) . ", $fieldid, " . $mask;
        }
@@ -145,7 +145,7 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit')
        $field = new FieldAPI($bugsys);
        
        $add = (($_REQUEST['do'] == 'add') ? true : false);
-       $typeselect = (($add AND empty($bugsys->in['step'])) ? true : false);
+       $typeselect = (($add AND empty($input->in['step'])) ? true : false);
        $edit = (($add) ? false : true);
        
        if ($add)
@@ -155,7 +155,7 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit')
        }
        else
        {
-               NavLinks::fieldsEdit($bugsys->in['fieldid']);
+               NavLinks::fieldsEdit($input->in['fieldid']);
                $navigator->set_focus('link', 'fields-pages-fields', 'fields-pages');
        }
        
@@ -163,7 +163,7 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit')
        $admin->form_start('field.php', ($typeselect ? 'add' : 'update'));
        if ($add AND !$typeselect)
        {
-               $admin->form_hidden_field('type', $bugsys->in['type']);
+               $admin->form_hidden_field('type', $input->in['type']);
        }
        if ($typeselect)
        {
@@ -174,12 +174,12 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit')
        else
        {
                $admin->table_start();
-               $admin->table_head(($add ? T('Add New Bug Field') . ' - ' . FieldAPI::field_types($bugsys->in['type']) : T('Edit Field')));
+               $admin->table_head(($add ? T('Add New Bug Field') . ' - ' . FieldAPI::field_types($input->in['type']) : T('Edit Field')));
        }
        
        if ($edit)
        {
-               $field->set('fieldid',          $bugsys->in['fieldid']);
+               $field->set('fieldid',          $input->in['fieldid']);
                $field->set_condition();
                $field->fetch();
                
@@ -188,11 +188,11 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit')
        
        if (!$typeselect)
        {
-               $type = (($add) ? $bugsys->in['type'] : $field->objdata['type']);
+               $type = (($add) ? $input->in['type'] : $field->objdata['type']);
        }
        
        // show type selector
-       if (empty($bugsys->in['step']) AND $add)
+       if (empty($input->in['step']) AND $add)
        {
                foreach (FieldAPI::field_types() AS $name => $description)
                {
index 7fb56d05309522ceb70a1e460c34e541e084962b..9967cec2df24d2783fad0e035be5b73c6b84612e 100644 (file)
@@ -45,7 +45,7 @@ if (empty($_REQUEST['do']))
 if ($_REQUEST['do'] == 'kill')
 {
        $language = new LanguageAPI($bugsys);
-       $language->set('languageid',    $bugsys->in['languageid']);
+       $language->set('languageid',    $input->in['languageid']);
        $language->set_condition();
        $language->delete();
        
@@ -64,11 +64,11 @@ if ($_REQUEST['do'] == 'delete')
 if ($_POST['do'] == 'insert')
 {
        $language = new LanguageAPI($bugsys);
-       $language->set('title',                 $bugsys->in['title']);
-       $language->set('charset',               $bugsys->in['charset']);
-       $language->set('direction',             $bugsys->in['direction']);
-       $language->set('userselect',    $bugsys->in['userselect']);
-       $language->set('langcode',              $bugsys->in['langcode']);
+       $language->set('title',                 $input->in['title']);
+       $language->set('charset',               $input->in['charset']);
+       $language->set('direction',             $input->in['direction']);
+       $language->set('userselect',    $input->in['userselect']);
+       $language->set('langcode',              $input->in['langcode']);
        $language->insert();
        
        $admin->redirect('language.php?do=modify');
@@ -107,13 +107,13 @@ if ($_REQUEST['do'] == 'add')
 if ($_POST['do'] == 'update')
 {
        $language = new LanguageAPI($bugsys);
-       $language->set('languageid',    $bugsys->in['languageid']);
+       $language->set('languageid',    $input->in['languageid']);
        $language->set_condition();
-       $language->set('title',                 $bugsys->in['title']);
-       $language->set('charset',               $bugsys->in['charset']);
-       $language->set('direction',             $bugsys->in['direction']);
-       $language->set('userselect',    $bugsys->in['userselect']);
-       $language->set('langcode',              $bugsys->in['langcode']);
+       $language->set('title',                 $input->in['title']);
+       $language->set('charset',               $input->in['charset']);
+       $language->set('direction',             $input->in['direction']);
+       $language->set('userselect',    $input->in['userselect']);
+       $language->set('langcode',              $input->in['langcode']);
        $language->update();
        
        $admin->redirect('language.php?do=modify');
@@ -123,11 +123,11 @@ if ($_POST['do'] == 'update')
 
 if ($_REQUEST['do'] == 'edit')
 {
-       NavLinks::languagesEdit($bugsys->in['languageid']);
+       NavLinks::languagesEdit($input->in['languageid']);
        $navigator->set_focus('link', 'options-languages-edit', 'options-languages');
        
        $languageapi = new LanguageAPI($bugsys);
-       $languageapi->set('languageid', $bugsys->in['languageid']);
+       $languageapi->set('languageid', $input->in['languageid']);
        $languageapi->set_condition();
        $languageapi->fetch();
        
index 512edb62159ee0bdd7278f70b9ccc0d7377bdc18..aab83df0fbe0ca4b113aa622a86c95e43f8feff8 100755 (executable)
@@ -76,11 +76,11 @@ if (empty($_REQUEST['do']))
 if ($_REQUEST['do'] == 'kill')
 {
        $input->inputClean('usergroupid', TYPE_UINT);
-       $db->query("DELETE FROM " . TABLE_PREFIX . "permission WHERE usergroupid = " . $bugsys->in['usergroupid'] . " AND productid = " . $input->inputClean('productid', TYPE_UINT));
+       $db->query("DELETE FROM " . TABLE_PREFIX . "permission WHERE usergroupid = " . $input->in['usergroupid'] . " AND productid = " . $input->inputClean('productid', TYPE_UINT));
        
        build_permissions();
        
-       $admin->redirect('permission.php?do=modify&usergroupid=' . $bugsys->in['usergroupid']);
+       $admin->redirect('permission.php?do=modify&usergroupid=' . $input->in['usergroupid']);
 }
 
 // ###################################################################
@@ -98,9 +98,9 @@ if ($_REQUEST['do'] == 'edit')
                'usergroupid'   => TYPE_UINT,
                'productid'             => TYPE_UINT
        ));
-       $perm = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "permission WHERE usergroupid = " . $bugsys->in['usergroupid'] . " AND productid = " . $bugsys->in['productid']);
-       $usergroup = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "usergroup WHERE usergroupid = " . $bugsys->in['usergroupid']);
-       $product = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "product WHERE productid = " . $bugsys->in['productid']);
+       $perm = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "permission WHERE usergroupid = " . $input->in['usergroupid'] . " AND productid = " . $input->in['productid']);
+       $usergroup = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "usergroup WHERE usergroupid = " . $input->in['usergroupid']);
+       $product = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "product WHERE productid = " . $input->in['productid']);
        
        if (!$usergroup OR !$product)
        {
@@ -151,7 +151,7 @@ if ($_POST['do'] == 'update')
                'usergroupid'   => TYPE_UINT,
                'productid'             => TYPE_UINT
        ));
-       foreach ($bugsys->in['perm'] AS $permtitle => $binaryswitch)
+       foreach ($input->in['perm'] AS $permtitle => $binaryswitch)
        {
                $permissionvalue += $bugsys->permissions["$permtitle"] * $binaryswitch;
        }
@@ -160,15 +160,15 @@ if ($_POST['do'] == 'update')
                REPLACE INTO " . TABLE_PREFIX . "permission
                        (usergroupid, productid, mask)
                VALUES
-                       (" . $bugsys->in['usergroupid'] . ",
-                       " . $bugsys->in['productid'] . ",
+                       (" . $input->in['usergroupid'] . ",
+                       " . $input->in['productid'] . ",
                        $permissionvalue
                )"
        );
        
        build_permissions();
        
-       $admin->redirect('permission.php?do=modify&usergroupid=' . $bugsys->in['usergroupid']);
+       $admin->redirect('permission.php?do=modify&usergroupid=' . $input->in['usergroupid']);
 }
 
 // ###################################################################
@@ -189,9 +189,9 @@ if ($_REQUEST['do'] == 'modify')
        
        foreach ($usergroups AS $group)
        {
-               $admin->row_text($group['title'], ($bugsys->in['usergroupid'] != $group['usergroupid'] ? "<a href=\"permission.php?do=modify&amp;usergroupid=$group[usergroupid]\">[" . T('Expand') . "]</a>" : ''), 'top', 2, 'alt3');
+               $admin->row_text($group['title'], ($input->in['usergroupid'] != $group['usergroupid'] ? "<a href=\"permission.php?do=modify&amp;usergroupid=$group[usergroupid]\">[" . T('Expand') . "]</a>" : ''), 'top', 2, 'alt3');
                
-               if ($bugsys->in['usergroupid'] == $group['usergroupid'])
+               if ($input->in['usergroupid'] == $group['usergroupid'])
                {
                        $permissions_fetch = $db->query("SELECT * FROM " . TABLE_PREFIX . "permission WHERE usergroupid = $group[usergroupid]");
                        foreach ($permissions_fetch as $permission)
index c84cbbb88abf1f2954298ad7ef70db3b89888dca..5883b2f29002ef1662f96e659d8cb7f3d2fa0e82 100755 (executable)
@@ -45,7 +45,7 @@ if (empty($_REQUEST['do']))
 if ($_REQUEST['do'] == 'kill')
 {
        $priority = new PriorityAPI($bugsys);
-       $priority->set('priorityid',    $bugsys->in['priorityid']);
+       $priority->set('priorityid',    $input->in['priorityid']);
        $priority->set_condition();
        $priority->delete();
        
@@ -64,8 +64,8 @@ if ($_REQUEST['do'] == 'delete')
 if ($_POST['do'] == 'insert')
 {
        $priority = new PriorityAPI($bugsys);
-       $priority->set('priority',              $bugsys->in['priority']);
-       $priority->set('displayorder',  $bugsys->in['displayorder']);
+       $priority->set('priority',              $input->in['priority']);
+       $priority->set('displayorder',  $input->in['displayorder']);
        $priority->insert();
        
        $admin->redirect('priority.php?do=modify');
@@ -97,10 +97,10 @@ if ($_REQUEST['do'] == 'add')
 if ($_POST['do'] == 'update')
 {
        $priority = new PriorityAPI($bugsys);
-       $priority->set('priorityid',    $bugsys->in['priorityid']);
+       $priority->set('priorityid',    $input->in['priorityid']);
        $priority->set_condition();
-       $priority->set('priority',              $bugsys->in['priority']);
-       $priority->set('displayorder',  $bugsys->in['displayorder']);
+       $priority->set('priority',              $input->in['priority']);
+       $priority->set('displayorder',  $input->in['displayorder']);
        $priority->update();
        
        $admin->redirect('priority.php?do=modify');
@@ -110,11 +110,11 @@ if ($_POST['do'] == 'update')
 
 if ($_REQUEST['do'] == 'edit')
 {
-       NavLinks::prioritiesEdit($bugsys->in['priorityid']);
+       NavLinks::prioritiesEdit($input->in['priorityid']);
        $navigator->set_focus('link', 'fields-pages-priorities', 'fields-pages');
        
        $priority = new PriorityAPI($bugsys);
-       $priority->set('priorityid',    $bugsys->in['priorityid']);
+       $priority->set('priorityid',    $input->in['priorityid']);
        $priority->set_condition();
        $priority->fetch();
        
index 7efc13e62f0bd05bd2405ae01193ea2b5d98e61e..d9bc75c817b428115bbb38bbf67bff745126f43e 100755 (executable)
@@ -80,8 +80,8 @@ if (empty($_REQUEST['do']))
 if ($_REQUEST['do'] == 'killversion')
 {
        $input->inputClean('versionid', TYPE_UINT);
-       $db->query("DELETE FROM " . TABLE_PREFIX . "version WHERE versionid = " . $bugsys->in['versionid']);
-       $db->query("DELETE FROM " . TABLE_PREFIX . "bug WHERE version = " . $bugsys->in['versionid']);
+       $db->query("DELETE FROM " . TABLE_PREFIX . "version WHERE versionid = " . $input->in['versionid']);
+       $db->query("DELETE FROM " . TABLE_PREFIX . "bug WHERE version = " . $input->in['versionid']);
        
        build_versions();
        
@@ -111,9 +111,9 @@ if ($_REQUEST['do'] == 'addversion')
        NavLinks::productsEdit($input->inputClean('productid', TYPE_UINT));
        $navigator->set_focus('link', 'products-edit-version', 'products-edit');
        
-       if ($bugsys->in['productid'] != -1)
+       if ($input->in['productid'] != -1)
        {
-               $product = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "product WHERE productid = " . $bugsys->in['productid']);
+               $product = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "product WHERE productid = " . $input->in['productid']);
                if (!is_array($product))
                {
                        $admin->error(L_INVALID_ID);
@@ -121,13 +121,13 @@ if ($_REQUEST['do'] == 'addversion')
        }
        else
        {
-               $bugsys->in['productid'] = 0;
+               $input->in['productid'] = 0;
        }
        
        $admin->page_start(T('Add Version'));
        
        $admin->form_start('product.php', 'insertversion');
-       $admin->form_hidden_field('productid', $bugsys->in['productid']);
+       $admin->form_hidden_field('productid', $input->in['productid']);
        $admin->table_start();
        $admin->table_head(T('Add New Version'));
        $admin->row_input(T('Version Number<div><dfn>This is the version string for this product.</dfn></div>'), 'version');
@@ -144,7 +144,7 @@ if ($_REQUEST['do'] == 'addversion')
 
 if ($_REQUEST['do'] == 'updateversion')
 {
-       if (empty($bugsys->in['version']))
+       if (empty($input->in['version']))
        {
                $admin->error(T('Please fill in a version number.'));
        }
@@ -186,7 +186,7 @@ if ($_REQUEST['do'] == 'editversion')
 if ($_REQUEST['do'] == 'killproduct')
 {
        $input->inputClean('productid', TYPE_UINT);
-       $allprods = $db->query("SELECT * FROM " . TABLE_PREFIX . "product WHERE productid = " . $bugsys->in['productid'] . " OR parentid = " . $bugsys->in['productid']);
+       $allprods = $db->query("SELECT * FROM " . TABLE_PREFIX . "product WHERE productid = " . $input->in['productid'] . " OR parentid = " . $input->in['productid']);
        foreach ($allprods as $prod)
        {
                $list[] = $prod['productid'];
@@ -212,7 +212,7 @@ if ($_REQUEST['do'] == 'deleteproduct')
 
 if ($_REQUEST['do'] == 'insertproduct')
 {
-       if (empty($bugsys->in['title']))
+       if (empty($input->in['title']))
        {
                $admin->error(T('Please go back and fill in the title field.'));
        }
@@ -236,7 +236,7 @@ if ($_REQUEST['do'] == 'addproduct')
 {
        if ($input->inputClean('productid', TYPE_UINT))
        {
-               NavLinks::productsEdit($bugsys->in['productid']);
+               NavLinks::productsEdit($input->in['productid']);
        }
        else
        {
@@ -247,7 +247,7 @@ if ($_REQUEST['do'] == 'addproduct')
        $admin->page_start(T('Add New Product'));
        
        $admin->form_start('product.php', 'insertproduct');
-       $admin->form_hidden_field('parentid', $bugsys->in['productid']);
+       $admin->form_hidden_field('parentid', $input->in['productid']);
        $admin->table_start();
        $admin->table_head(T('Add Product'));
        $admin->row_input(T('Title'), 'title');
@@ -264,12 +264,12 @@ if ($_REQUEST['do'] == 'addproduct')
 
 if ($_REQUEST['do'] == 'updateproduct')
 {
-       if (empty($bugsys->in['title']))
+       if (empty($input->in['title']))
        {
                $admin->error(T('Please go back and fill in the title field.'));
        }
        
-       if (empty($bugsys->in['productid']))
+       if (empty($input->in['productid']))
        {
                $admin->error(L_INVALID_ID);
        }
@@ -289,7 +289,7 @@ if ($_REQUEST['do'] == 'editproduct')
        
        $admin->page_start(T('Edit Product'));
        
-       $product = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "product WHERE productid = " . $bugsys->in['productid']);
+       $product = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "product WHERE productid = " . $input->in['productid']);
        if (!is_array($product))
        {
                $admin->error(L_INVALID_ID);
@@ -314,9 +314,9 @@ if ($_REQUEST['do'] == 'editproduct')
 if ($_POST['do'] == 'displayorder')
 {
        $input->inputClean('displayorder', TYPE_UINT);
-       if (is_array($bugsys->in['displayorder']))
+       if (is_array($input->in['displayorder']))
        {
-               foreach ($bugsys->in['displayorder'] AS $namebit => $displayorder)
+               foreach ($input->in['displayorder'] AS $namebit => $displayorder)
                {
                        $name = explode('_', $namebit);
                        if ($name[0] == 'product' OR $name[0] == 'version')
index 18c827b6ac6fefd094a5d37a599dfe2cedc207ba..0c7fe3fc99af013659a2500b1e981821a76b534a 100755 (executable)
@@ -45,7 +45,7 @@ if (empty($_REQUEST['do']))
 if ($_REQUEST['do'] == 'kill')
 {
        $resolution = new ResolutionAPI($bugsys);
-       $resolution->set('resolutionid',        $bugsys->in['resolutionid']);
+       $resolution->set('resolutionid',        $input->in['resolutionid']);
        $resolution->set_condition();
        $resolution->delete();
        
@@ -64,8 +64,8 @@ if ($_REQUEST['do'] == 'delete')
 if ($_POST['do'] == 'insert')
 {
        $resolution = new ResolutionAPI($bugsys);
-       $resolution->set('resolution',          $bugsys->in['resolution']);
-       $resolution->set('displayorder',        $bugsys->in['displayorder']);
+       $resolution->set('resolution',          $input->in['resolution']);
+       $resolution->set('displayorder',        $input->in['displayorder']);
        $resolution->insert();
        
        $admin->redirect('resolution.php?do=modify');
@@ -97,10 +97,10 @@ if ($_REQUEST['do'] == 'add')
 if ($_POST['do'] == 'update')
 {
        $resolution = new ResolutionAPI($bugsys);
-       $resolution->set('resolutionid',        $bugsys->in['resolutionid']);
+       $resolution->set('resolutionid',        $input->in['resolutionid']);
        $resolution->set_condition();
-       $resolution->set('resolution',          $bugsys->in['resolution']);
-       $resolution->set('displayorder',        $bugsys->in['displayorder']);
+       $resolution->set('resolution',          $input->in['resolution']);
+       $resolution->set('displayorder',        $input->in['displayorder']);
        $resolution->update();
        
        $admin->redirect('resolution.php?do=modify');
@@ -110,11 +110,11 @@ if ($_POST['do'] == 'update')
 
 if ($_REQUEST['do'] == 'edit')
 {
-       NavLinks::resolutionsEdit($bugsys->in['resolutionid']);
+       NavLinks::resolutionsEdit($input->in['resolutionid']);
        $navigator->set_focus('link', 'fields-pages-resolutions', 'fields-pages');
        
        $resolution = new ResolutionAPI($bugsys);
-       $resolution->set('resolutionid',        $bugsys->in['resolutionid']);
+       $resolution->set('resolutionid',        $input->in['resolutionid']);
        $resolution->set_condition();
        $resolution->fetch();
        
index 72f7b305eccb4571bfb551089a25ad22ba2924b9..a2ed8368ec393942a85856a4514033510df8f59c 100755 (executable)
@@ -44,7 +44,7 @@ if (empty($_REQUEST['do']))
 if ($_POST['do'] == 'update')
 {
        $updates = array();
-       foreach ($bugsys->in['setting'] AS $varname => $value)
+       foreach ($input->in['setting'] AS $varname => $value)
        {
                if (is_array($value))
                {
index 50876ef48dd2b46d8b1a67ea310895fa7c3a6843..290b0789b9e547944376ca8a315728daefc62b2e 100755 (executable)
@@ -45,7 +45,7 @@ if (empty($_REQUEST['do']))
 if ($_REQUEST['do'] == 'kill')
 {
        $severity = new SeverityAPI($bugsys);
-       $severity->set('severityid',    $bugsys->in['severityid']);
+       $severity->set('severityid',    $input->in['severityid']);
        $severity->set_condition();
        $severity->delete();
        
@@ -64,8 +64,8 @@ if ($_REQUEST['do'] == 'delete')
 if ($_POST['do'] == 'insert')
 {
        $severity = new SeverityAPI($bugsys);
-       $severity->set('severity',              $bugsys->in['severity']);
-       $severity->set('displayorder',  $bugsys->in['displayorder']);
+       $severity->set('severity',              $input->in['severity']);
+       $severity->set('displayorder',  $input->in['displayorder']);
        $severity->insert();
        
        $admin->redirect('severity.php?do=modify');
@@ -97,10 +97,10 @@ if ($_REQUEST['do'] == 'add')
 if ($_POST['do'] == 'update')
 {
        $severity = new SeverityAPI($bugsys);
-       $severity->set('severityid',    $bugsys->in['severityid']);
+       $severity->set('severityid',    $input->in['severityid']);
        $severity->set_condition();
-       $severity->set('severity',              $bugsys->in['severity']);
-       $severity->set('displayorder',  $bugsys->in['displayorder']);
+       $severity->set('severity',              $input->in['severity']);
+       $severity->set('displayorder',  $input->in['displayorder']);
        $severity->update();
        
        $admin->redirect('severity.php?do=modify');
@@ -110,11 +110,11 @@ if ($_POST['do'] == 'update')
 
 if ($_REQUEST['do'] == 'edit')
 {
-       NavLinks::severitiesEdit($bugsys->in['severityid']);
+       NavLinks::severitiesEdit($input->in['severityid']);
        $navigator->set_focus('link', 'fields-pages-severities', 'fields-pages');
        
        $severity = new SeverityAPI($bugsys);
-       $severity->set('severityid',    $bugsys->in['severityid']);
+       $severity->set('severityid',    $input->in['severityid']);
        $severity->set_condition();
        $severity->fetch();
        
index 26b04dac57834169c651d2a1fff0b6fb91b00428..5a81e07b27a086b33fc2b49b8f7d9a4f53b1c2df 100755 (executable)
@@ -45,7 +45,7 @@ if (empty($_REQUEST['do']))
 if ($_REQUEST['do'] == 'kill')
 {
        $status = new StatusAPI($bugsys);
-       $status->set('statusid',        $bugsys->in['statusid']);
+       $status->set('statusid',        $input->in['statusid']);
        $status->set_condition();
        $status->delete();
        
@@ -64,9 +64,9 @@ if ($_REQUEST['do'] == 'delete')
 if ($_POST['do'] == 'insert')
 {
        $status = new StatusAPI($bugsys);
-       $status->set('status',                  $bugsys->in['status']);
-       $status->set('color',                   $bugsys->in['color']);
-       $status->set('displayorder',    $bugsys->in['displayorder']);
+       $status->set('status',                  $input->in['status']);
+       $status->set('color',                   $input->in['color']);
+       $status->set('displayorder',    $input->in['displayorder']);
        $status->insert();
        
        $admin->redirect('status.php?do=modify');
@@ -99,11 +99,11 @@ if ($_REQUEST['do'] == 'add')
 if ($_POST['do'] == 'update')
 {
        $status = new StatusAPI($bugsys);
-       $status->set('statusid',                $bugsys->in['statusid']);
+       $status->set('statusid',                $input->in['statusid']);
        $status->set_condition();
-       $status->set('status',                  $bugsys->in['status']);
-       $status->set('color',                   $bugsys->in['color']);
-       $status->set('displayorder',    $bugsys->in['displayorder']);
+       $status->set('status',                  $input->in['status']);
+       $status->set('color',                   $input->in['color']);
+       $status->set('displayorder',    $input->in['displayorder']);
        $status->update();
        
        $admin->redirect('status.php?do=modify');
@@ -113,11 +113,11 @@ if ($_POST['do'] == 'update')
 
 if ($_REQUEST['do'] == 'edit')
 {
-       NavLinks::statusesEdit($bugsys->in['statusid']);
+       NavLinks::statusesEdit($input->in['statusid']);
        $navigator->set_focus('link', 'fields-pages-statuses', 'fields-pages');
        
        $status = new StatusAPI($bugsys);
-       $status->set('statusid',        $bugsys->in['statusid']);
+       $status->set('statusid',        $input->in['statusid']);
        $status->set_condition();
        $status->fetch();
        
index 26ba54124196dcd8cf828d9cc152da9a9f1030cf..5e82fec0e1ab754d4275d2e336abd14f401fd0ea 100644 (file)
@@ -62,7 +62,7 @@ if (empty($_REQUEST['do']))
 if ($_REQUEST['do'] == 'kill')
 {
        $user = new UserAPI($bugsys);
-       $user->set('userid',    $bugsys->in['userid']);
+       $user->set('userid',    $input->in['userid']);
        $user->set_condition();
        $user->delete();
        
@@ -81,28 +81,28 @@ if ($_REQUEST['do'] == 'delete')
 if ($_POST['do'] == 'insert')
 {
        $user = new UserAPI($bugsys);
-       $user->set('displayname',               $bugsys->in['displayname']);
-       $user->set('email',                             $bugsys->in['email']);
-       $user->set('showemail',                 $bugsys->in['showemail']);
-       $user->set('showcolors',                $bugsys->in['showcolors']);
-       $user->set('usergroupid',               $bugsys->in['usergroupid']);
-       $user->set('groupids',                  $bugsys->in['groupids']);
-       $user->set('languageid',                $bugsys->in['languageid']);
-       $user->set('timezone',                  $bugsys->in['timezone']);
-       $user->set('usedst',                    $bugsys->in['usedst']);
-       $user->set('password',                  $bugsys->in['password']);
-       $user->set('hidestatuses',              $bugsys->in['hidestatuses']);
-       $user->set('defaultsortkey',    $bugsys->in['defaultsortkey']);
-       $user->set('defaultsortas',             $bugsys->in['defaultsortas']);
+       $user->set('displayname',               $input->in['displayname']);
+       $user->set('email',                             $input->in['email']);
+       $user->set('showemail',                 $input->in['showemail']);
+       $user->set('showcolors',                $input->in['showcolors']);
+       $user->set('usergroupid',               $input->in['usergroupid']);
+       $user->set('groupids',                  $input->in['groupids']);
+       $user->set('languageid',                $input->in['languageid']);
+       $user->set('timezone',                  $input->in['timezone']);
+       $user->set('usedst',                    $input->in['usedst']);
+       $user->set('password',                  $input->in['password']);
+       $user->set('hidestatuses',              $input->in['hidestatuses']);
+       $user->set('defaultsortkey',    $input->in['defaultsortkey']);
+       $user->set('defaultsortas',             $input->in['defaultsortas']);
        $user->insert();
        
        // post_insert will set the email options... so we now have to dump them
        $db->query("DELETE FROM " . TABLE_PREFIX . "useremail WHERE userid = " . $user->insertid);
        
        $input->inputClean('emailopts', TYPE_INT);
-       if (is_array($bugsys->in['emailopts']))
+       if (is_array($input->in['emailopts']))
        {
-               foreach ($bugsys->in['emailopts'] AS $relation => $bitarr)
+               foreach ($input->in['emailopts'] AS $relation => $bitarr)
                {
                        $bitmask = 0;
                        foreach ($bitarr AS $option => $yes)
@@ -121,28 +121,28 @@ if ($_POST['do'] == 'insert')
 if ($_POST['do'] == 'update')
 {
        $user = new UserAPI($bugsys);
-       $user->set('userid',                    $bugsys->in['userid']);
+       $user->set('userid',                    $input->in['userid']);
        $user->set_condition();
-       $user->set('displayname',               $bugsys->in['displayname']);
-       $user->set('email',                             $bugsys->in['email']);
-       $user->set('showemail',                 $bugsys->in['showemail']);
-       $user->set('showcolors',                $bugsys->in['showcolors']);
-       $user->set('usergroupid',               $bugsys->in['usergroupid']);
-       $user->set('groupids',                  $bugsys->in['groupids']);
-       $user->set('languageid',                $bugsys->in['languageid']);
-       $user->set('timezone',                  $bugsys->in['timezone']);
-       $user->set('usedst',                    $bugsys->in['usedst']);
-       $user->set('password',                  $bugsys->in['password']);
-       $user->set('hidestatuses',              $bugsys->in['hidestatuses']);
-       $user->set('defaultsortkey',    $bugsys->in['defaultsortkey']);
-       $user->set('defaultsortas',             $bugsys->in['defaultsortas']);
+       $user->set('displayname',               $input->in['displayname']);
+       $user->set('email',                             $input->in['email']);
+       $user->set('showemail',                 $input->in['showemail']);
+       $user->set('showcolors',                $input->in['showcolors']);
+       $user->set('usergroupid',               $input->in['usergroupid']);
+       $user->set('groupids',                  $input->in['groupids']);
+       $user->set('languageid',                $input->in['languageid']);
+       $user->set('timezone',                  $input->in['timezone']);
+       $user->set('usedst',                    $input->in['usedst']);
+       $user->set('password',                  $input->in['password']);
+       $user->set('hidestatuses',              $input->in['hidestatuses']);
+       $user->set('defaultsortkey',    $input->in['defaultsortkey']);
+       $user->set('defaultsortas',             $input->in['defaultsortas']);
        $user->update();
        
        $db->query("DELETE FROM " . TABLE_PREFIX . "useremail WHERE userid = " . $user->values['userid']);
        $input->inputClean('emailopts', TYPE_INT);
-       if (is_array($bugsys->in['emailopts']))
+       if (is_array($input->in['emailopts']))
        {
-               foreach ($bugsys->in['emailopts'] AS $relation => $bitarr)
+               foreach ($input->in['emailopts'] AS $relation => $bitarr)
                {
                        $bitmask = 0;
                        foreach ($bitarr AS $option => $yes)
@@ -165,11 +165,11 @@ if ($_REQUEST['do'] == 'edit' OR $_REQUEST['do'] == 'add')
        
        if ($edit)
        {
-               NavLinks::usersEdit($bugsys->in['userid']);
+               NavLinks::usersEdit($input->in['userid']);
                $navigator->set_focus('link', 'users-pages-users', 'users-pages');
                
                $user = new UserAPI($bugsys);
-               $user->set('userid', $bugsys->in['userid']);
+               $user->set('userid', $input->in['userid']);
                $user->set_condition();
                $user->fetch();
        }
@@ -328,12 +328,12 @@ if ($_REQUEST['do'] == 'search')
        NavLinks::usersAdd();
        $navigator->set_focus('link', 'users-pages-users', 'users-pages');
        
-       if (is_numeric($bugsys->in['userdata']))
+       if (is_numeric($input->in['userdata']))
        {
                $input->inputClean('userdata', TYPE_UINT);
-               if ($db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "user WHERE userid = " . $bugsys->in['userdata']))
+               if ($db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "user WHERE userid = " . $input->in['userdata']))
                {
-                       header('Location: user.php?do=edit&userid=' . $bugsys->in['userdata']);
+                       header('Location: user.php?do=edit&userid=' . $input->in['userdata']);
                }
                else
                {
@@ -342,7 +342,7 @@ if ($_REQUEST['do'] == 'search')
        }
        else
        {
-               $bugsys->in['userdata'] = str_replace('%', '\%', $bugsys->in['userdata']);
+               $input->in['userdata'] = str_replace('%', '\%', $input->in['userdata']);
                $results = $db->query("SELECT * FROM " . TABLE_PREFIX . "user WHERE email LIKE '%" . $bugsys->input_escape('userdata') . "%' OR displayname LIKE '%" . $bugsys->input_escape('userdata') . "%'");
                
                if ($db->num_rows($results) < 1)
index 9ad4975e6fe5dc15f205552e50b1721f1bf5ee58..6818c92c5934e84c8d29fd3a55c8f3ee813925b4 100755 (executable)
@@ -88,7 +88,7 @@ if (empty($_REQUEST['do']))
 if ($_REQUEST['do'] == 'kill')
 {
        $usergroup = new UsergroupAPI($bugsys);
-       $usergroup->set('usergroupid',  $bugsys->in['usergroupid']);
+       $usergroup->set('usergroupid',  $input->in['usergroupid']);
        $usergroup->set_condition();
        $usergroup->delete();
        
@@ -99,12 +99,12 @@ if ($_REQUEST['do'] == 'kill')
 
 if ($_REQUEST['do'] == 'delete')
 {
-       if ($bugsys->in['usergroupid'] < 7)
+       if ($input->in['usergroupid'] < 7)
        {
                $admin->error(T('You can\'t delete a default usergroup.'));
        }
        
-       $admin->page_confirm(T('Are you sure you want to delete this usergroup? All users in this group will be set back to the default registered usergroup (id: 2).'), 'usergroup.php', 'kill', array('usergroupid' => $bugsys->in['usergroupid']));
+       $admin->page_confirm(T('Are you sure you want to delete this usergroup? All users in this group will be set back to the default registered usergroup (id: 2).'), 'usergroup.php', 'kill', array('usergroupid' => $input->in['usergroupid']));
 }
 
 // ###################################################################
@@ -117,7 +117,7 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit' OR $_REQUEST['do'] ==
        
        if ($edit)
        {
-               NavLinks::usergroupsEdit($bugsys->in['usergroupid']);
+               NavLinks::usergroupsEdit($input->in['usergroupid']);
                $navigator->set_focus('link', 'users-pages-usergroups', 'users-pages');
        }
        else
@@ -133,7 +133,7 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit' OR $_REQUEST['do'] ==
        if ($edit OR $clone)
        {
                $usergroup = new UsergroupAPI($bugsys);
-               $usergroup->set('usergroupid',  $bugsys->in['usergroupid']);
+               $usergroup->set('usergroupid',  $input->in['usergroupid']);
                $usergroup->set_condition();
                $usergroup->fetch();
                
@@ -214,21 +214,21 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit' OR $_REQUEST['do'] ==
 if ($_POST['do'] == 'insert')
 {
        $input->inputClean('perm', TYPE_UINT);
-       foreach ($bugsys->in['perm'] AS $permtitle => $binaryswitch)
+       foreach ($input->in['perm'] AS $permtitle => $binaryswitch)
        {
                $permissionvalue += $bugsys->permissions["$permtitle"] * $binaryswitch;
        }
        
        $usergroup = new UsergroupAPI($bugsys);
-       $usergroup->set('title',                $bugsys->in['title']);
-       $usergroup->set('displaytitle', $bugsys->in['displaytitle']);
+       $usergroup->set('title',                $input->in['title']);
+       $usergroup->set('displaytitle', $input->in['displaytitle']);
        $usergroup->set('permissions',  $permissionvalue);
        $usergroup->insert();
        
        $input->inputClean('custom', TYPE_UINT);
-       if (is_array($bugsys->in['custom']))
+       if (is_array($input->in['custom']))
        {
-               foreach ($bugsys->in['custom'] AS $fieldid => $mask)
+               foreach ($input->in['custom'] AS $fieldid => $mask)
                {
                        $values[] = $usergroup->insertid . ", " . $bugsys->clean($fieldid, TYPE_UINT) . ", " . $mask;
                }
@@ -248,7 +248,7 @@ if ($_POST['do'] == 'insert')
        // copy product permissions from cloning
        if ($input->inputClean('cloneid', TYPE_UINT))
        {
-               $prodperms = $db->query("SELECT * FROM " . TABLE_PREFIX . "permission WHERE usergroupid = " . $bugsys->in['cloneid']);
+               $prodperms = $db->query("SELECT * FROM " . TABLE_PREFIX . "permission WHERE usergroupid = " . $input->in['cloneid']);
                foreach ($prodperms as $prod)
                {
                        $db->query("INSERT INTO " . TABLE_PREFIX . "permission (usergroupid, productid, mask) VALUES (" . $usergroup->insertid . ", $prod[productid], $prod[mask])");
@@ -269,23 +269,23 @@ if ($_POST['do'] == 'update')
                'custom'                => TYPE_UINT
        ));
        $input->inputClean('perm', TYPE_UINT);
-       foreach ($bugsys->in['perm'] AS $permtitle => $binaryswitch)
+       foreach ($input->in['perm'] AS $permtitle => $binaryswitch)
        {
                $permissionvalue += $bugsys->permissions["$permtitle"] * $binaryswitch;
        }
        
        $usergroup = new UsergroupAPI($bugsys);
-       $usergroup->set('usergroupid',  $bugsys->in['usergroupid']);
+       $usergroup->set('usergroupid',  $input->in['usergroupid']);
        $usergroup->set_condition();
-       $usergroup->set('title',                $bugsys->in['title']);
-       $usergroup->set('displaytitle', $bugsys->in['displaytitle']);
+       $usergroup->set('title',                $input->in['title']);
+       $usergroup->set('displaytitle', $input->in['displaytitle']);
        $usergroup->set('permissions',  $permissionvalue);
        $usergroup->update();
        
        $input->inputClean('custom', TYPE_UINT);
-       if (is_array($bugsys->in['custom']))
+       if (is_array($input->in['custom']))
        {
-               foreach ($bugsys->in['custom'] AS $fieldid => $mask)
+               foreach ($input->in['custom'] AS $fieldid => $mask)
                {
                        $values[] = $usergroup->values['usergroupid'] . ", " . $bugsys->clean($fieldid, TYPE_UINT) . ", " . $mask;
                }
@@ -312,9 +312,9 @@ if ($_POST['do'] == 'doapprove')
        $input->inputClean('approve', TYPE_UINT);
        
        $idlist = array();
-       if (is_array($bugsys->in['approve']))
+       if (is_array($input->in['approve']))
        {
-               foreach ($bugsys->in['approve'] AS $id => $yesno)
+               foreach ($input->in['approve'] AS $id => $yesno)
                {
                        if ($yesno > 0)
                        {
index b7c5b81468b8580d1e1cb5fc65d452322b08f337..4b227ce87fe33bc06d9f2174d5fca76ad0e667d7 100755 (executable)
@@ -47,7 +47,7 @@ if (empty($_REQUEST['do']))
 if ($_REQUEST['do'] == 'kill')
 {
        $help = new UserHelpAPI($bugsys);
-       $help->set('keystring', $bugsys->in['keystring']);
+       $help->set('keystring', $input->in['keystring']);
        $help->delete();
        
        build_user_help();
@@ -59,7 +59,7 @@ if ($_REQUEST['do'] == 'kill')
 
 if ($_REQUEST['do'] == 'delete')
 {
-       $admin->page_confirm(T('Are you sure you want to delete help text?'), 'userhelp.php', 'kill', array('keystring' => $bugsys->in['keystring']));
+       $admin->page_confirm(T('Are you sure you want to delete help text?'), 'userhelp.php', 'kill', array('keystring' => $input->in['keystring']));
 }
 
 // ###################################################################
@@ -67,9 +67,9 @@ if ($_REQUEST['do'] == 'delete')
 if ($_POST['do'] == 'insert')
 {
        $help = new UserHelpAPI($bugsys);
-       $help->set('keystring', $bugsys->in['keystring']);
-       $help->set('title',             $bugsys->in['title']);
-       $help->set('body',              $bugsys->in['body']);
+       $help->set('keystring', $input->in['keystring']);
+       $help->set('title',             $input->in['title']);
+       $help->set('body',              $input->in['body']);
        $help->insert();
        
        $admin->redirect('userhelp.php?do=modify');
@@ -105,7 +105,7 @@ if ($_REQUEST['do'] == 'add')
 
 if ($_POST['do'] == 'update')
 {
-       foreach ($bugsys->in['help'] AS $keystring => $fields)
+       foreach ($input->in['help'] AS $keystring => $fields)
        {
                $help = new UserHelpAPI($bugsys);
                $help->norunners = array('post_update');
index f2f38fb42eb663b1c008c516a193ae67f703732b..97c2bcc6de6cfb0d2dc4d403f5a87c0d2e1cc00d 100755 (executable)
@@ -36,7 +36,7 @@ require_once('./includes/api_comment.php');
 
 APIError(array(new API_Error_Handler($message), 'user_cumulative'));
 
-if (isset($bugsys->in['attachmentid']))
+if (isset($input->in['attachmentid']))
 {
        $attachment = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "attachment WHERE attachmentid = " . $input->inputClean('attachmentid', TYPE_UINT));
        if (!$attachment)
@@ -66,7 +66,7 @@ $notif->set_bug_data($bug);
 if ($_POST['do'] == 'insert')
 {
        $attachapi = new AttachmentAPI($bugsys);
-       $attachapi->set('bugid',        $bugsys->in['bugid']);
+       $attachapi->set('bugid',        $input->in['bugid']);
        
        if (!can_perform('canputattach', $bug['product']))
        {
@@ -108,7 +108,7 @@ if ($_POST['do'] == 'insert')
        $attachapi->set('filename',             $FILE['name']);
        $attachapi->set('mimetype',             $FILE['type']);
        $attachapi->set('filesize',             $FILE['size']);
-       $attachapi->set('description',  $bugsys->in['description']);
+       $attachapi->set('description',  $input->in['description']);
        $attachapi->set('userid',               bugdar::$userinfo['userid']);
                
        // insert an attachment
@@ -137,12 +137,12 @@ if ($_POST['do'] == 'insert')
                }
                
                // handle comment stuff
-               if (can_perform('canpostcomments', $bug['product']) AND trim($bugsys->in['comment']))
+               if (can_perform('canpostcomments', $bug['product']) AND trim($input->in['comment']))
                {
                        $comment = new CommentAPI($bugsys);
-                       $comment->set('bugid',          $bugsys->in['bugid']);
+                       $comment->set('bugid',          $input->in['bugid']);
                        $comment->set('userid',         bugdar::$userinfo['userid']);
-                       $comment->set('comment',        $bugsys->in['comment']);
+                       $comment->set('comment',        $input->in['comment']);
                        $comment->set('dateline',       $attachapi->values['dateline']);
                        $comment->insert();
                        
@@ -182,7 +182,7 @@ if ($_REQUEST['do'] == 'add')
        foreach ($obsoletes_fetch as $obsolete)
        {
                $show['obsoletes'] = true;
-               $obsoletes .= "<div><input name=\"obsoletes[]\" type=\"checkbox\" value=\"$obsolete[attachmentid]\"" . (is_array($bugsys->in['obsoletes']) AND in_array($obsolete['attachmentid'], $bugsys->in['obsoletes']) ? ' checked="checked"' : '') . " /> $obsolete[filename]" . ($obsolete['description'] ? " [$obsolete[description]]" : '') . "</div>\n";
+               $obsoletes .= "<div><input name=\"obsoletes[]\" type=\"checkbox\" value=\"$obsolete[attachmentid]\"" . (is_array($input->in['obsoletes']) AND in_array($obsolete['attachmentid'], $input->in['obsoletes']) ? ' checked="checked"' : '') . " /> $obsolete[filename]" . ($obsolete['description'] ? " [$obsolete[description]]" : '') . "</div>\n";
        }
        
        eval('$template->flush("' . $template->fetch('newattach') . '");');
@@ -198,11 +198,11 @@ if ($_POST['do'] == 'update')
        }
        
        $attachapi = new AttachmentAPI($bugsys);
-       $attachapi->set('attachmentid', $bugsys->in['attachmentid']);
+       $attachapi->set('attachmentid', $input->in['attachmentid']);
        $attachapi->dorelations = array();
        $attachapi->set_condition();
        
-       if ($bugsys->in['__delete__'] != '')
+       if ($input->in['__delete__'] != '')
        {
                if (!(can_perform('caneditattach', $bug['product']) AND can_perform('candeletedata', $bug['productid'])))
                {
@@ -217,14 +217,14 @@ if ($_POST['do'] == 'update')
        {
                $log = new Logging;
                $log->set_bugid($bug['bugid']);
-               $log->set_attachmentid($bugsys->in['attachmentid']);
+               $log->set_attachmentid($input->in['attachmentid']);
                
                $attachapi->fetch();
                
                $log->add_data(true, $attachapi->objdata, array('attachment'), true, 'attachment');
                
-               $attachapi->set('description',  $bugsys->in['description']);
-               $attachapi->set('obsolete',             $bugsys->in['obsolete']);
+               $attachapi->set('description',  $input->in['description']);
+               $attachapi->set('obsolete',             $input->in['obsolete']);
                $attachapi->update();
                
                $log->add_data(false, $attachapi->values, array('attachment'), true, 'attachment');
index 4ebaa2570bc66dfde9e8a87cea9eeec4afe47ad8..84808337ca0f328bd3755924d82b7c2aace69005 100644 (file)
@@ -34,7 +34,7 @@ require_once('./includes/class_api_error.php');
 APIError(array(new API_Error_Handler($message), 'user_cumulative'));
 
 $commentapi = new CommentAPI($bugsys);
-$commentapi->set('commentid',  $bugsys->in['commentid']);
+$commentapi->set('commentid',  $input->in['commentid']);
 $commentapi->set_condition();
 $commentapi->fetch();
 
@@ -128,11 +128,11 @@ if ($_POST['do'] == 'update')
                $message->errorPermission();
        }
        
-       $commentapi->set('comment',     $bugsys->in['comment']);
-       $commentapi->set('parselinks', $bugsys->in['parselinks']);
-       $commentapi->set('hidden',      $bugsys->in['hidden']);
+       $commentapi->set('comment',     $input->in['comment']);
+       $commentapi->set('parselinks', $input->in['parselinks']);
+       $commentapi->set('hidden',      $input->in['hidden']);
        
-       if ($bugsys->in['commentid'] == $bug['initialreport'] AND $bugsys->in['hidden'])
+       if ($input->in['commentid'] == $bug['initialreport'] AND $input->in['hidden'])
        {
                $message->addError(T('You cannot hide the first comment/initial report of a bug. Instead, hide the entire bug.'));
        }
@@ -174,8 +174,8 @@ if ($_POST['do'] == 'update')
        {
                $show['errors'] = true;
                $_REQUEST['do'] = 'edit';
-               $comment['comment'] = $bugsys->in['comment'];
-               $comment['hidden'] = $bugsys->in['hidden'];
+               $comment['comment'] = $input->in['comment'];
+               $comment['hidden'] = $input->in['hidden'];
        }
 }
 
index 432723be8675f01e3e5597946b6db0503f020e42..4f9b38f266d8ad26766ca1a216ae60cc5d577872 100644 (file)
@@ -58,7 +58,7 @@ $log->set_bugid($bug['bugid']);
 $notif = new NotificationCenter;
 
 $bugapi = new BugAPI($bugsys);
-$bugapi->set('bugid',          $bugsys->in['bugid']);
+$bugapi->set('bugid',          $input->in['bugid']);
 $bugapi->set_condition();
 $bugapi->dorelations = array();
 $bugapi->fetch();
@@ -102,7 +102,7 @@ if ($_POST['do'] == 'update')
        
        // -------------------------------------------------------------------
        // handle automations
-       if ($bugsys->in['automation'])
+       if ($input->in['automation'])
        {
                $automation = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "automation WHERE actionid = " . $input->inputClean('automation', TYPE_UINT));
                if ($automation)
@@ -113,7 +113,7 @@ if ($_POST['do'] == 'update')
                        {
                                foreach ($automation['fields']['builtin'] AS $field => $value)
                                {
-                                       $bugsys->in["$field"] = $value;
+                                       $input->in["$field"] = $value;
                                }
                        }
 
@@ -121,7 +121,7 @@ if ($_POST['do'] == 'update')
                        {
                                foreach ($automation['fields']['custom'] AS $field => $value)
                                {
-                                       $bugsys->in["custom$field"] = $value;
+                                       $input->in["custom$field"] = $value;
                                }
                        }
                }
@@ -129,26 +129,26 @@ if ($_POST['do'] == 'update')
 
        // -------------------------------------------------------------------
        // process comment stuff
-       if ($bugsys->in['comment'] OR $automation['comment'])
+       if ($input->in['comment'] OR $automation['comment'])
        {
-               if (!empty($bugsys->in['comment']) AND $automation['comment'])
+               if (!empty($input->in['comment']) AND $automation['comment'])
                {
-                       $commenttext = $bugsys->in['comment'] . "\n\n" . T('--------------- AUTOMATIC RESPONSE ---------------') . "\n" . $automation['comment'];
+                       $commenttext = $input->in['comment'] . "\n\n" . T('--------------- AUTOMATIC RESPONSE ---------------') . "\n" . $automation['comment'];
                }
-               else if (empty($bugsys->in['comment']) AND $automation['comment'])
+               else if (empty($input->in['comment']) AND $automation['comment'])
                {
                        $commenttext = $automation['comment'];
                }
                else
                {
-                       $commenttext = $bugsys->in['comment'];
+                       $commenttext = $input->in['comment'];
                }
                
                $comment = new CommentAPI($bugsys);
-               $comment->set('bugid',          $bugsys->in['bugid']);
+               $comment->set('bugid',          $input->in['bugid']);
                $comment->set('userid',         bugdar::$userinfo['userid']);
                $comment->set('comment',        $commenttext);
-               $comment->set('parselinks',     $bugsys->in['parselinks']);
+               $comment->set('parselinks',     $input->in['parselinks']);
                $comment->insert();
                
                // we redefine the bug data later, but it needs to be here in order to generate the user list
@@ -172,18 +172,18 @@ if ($_POST['do'] == 'update')
        
        // -------------------------------------------------------------------
        // do update stuff      
-       $dependencies = preg_split('#([^0-9].*?)#', $bugsys->in['dependency'], -1, PREG_SPLIT_NO_EMPTY);
+       $dependencies = preg_split('#([^0-9].*?)#', $input->in['dependency'], -1, PREG_SPLIT_NO_EMPTY);
        $dependencies = ((sizeof($dependencies) < 1) ? '' : implode(', ', $dependencies));
        
        if ((can_perform('caneditown', $bug['product']) AND bugdar::$userinfo['userid'] == $bug['userid']) OR (can_perform('caneditother', $bug['product']) AND bugdar::$userinfo['userid'] != $bug['userid']))
        {
-               $bugapi->set('summary',         $bugsys->in['summary']);
-               $bugapi->set('severity',        $bugsys->in['severity']);
-               $bugapi->set('duplicateof',     $bugsys->in['duplicateof']);
+               $bugapi->set('summary',         $input->in['summary']);
+               $bugapi->set('severity',        $input->in['severity']);
+               $bugapi->set('duplicateof',     $input->in['duplicateof']);
                $bugapi->set('dependency',      $dependencies);
-               $bugapi->set('hidden',          $bugsys->in['hidden']);
+               $bugapi->set('hidden',          $input->in['hidden']);
        
-               $product = explode(',',         $bugsys->in['product']);
+               $product = explode(',',         $input->in['product']);
                $bugapi->set('product',         $product[0]);
                $bugapi->set('component',       $product[1]);
                $bugapi->set('version',         $product[2]);
@@ -191,13 +191,13 @@ if ($_POST['do'] == 'update')
        
        if (can_perform('canchangestatus', $bug['product']))
        {
-               $bugapi->set('priority',        $bugsys->in['priority']);
-               $bugapi->set('status',          $bugsys->in['status']);
-               $bugapi->set('resolution',      $bugsys->in['resolution']);
+               $bugapi->set('priority',        $input->in['priority']);
+               $bugapi->set('status',          $input->in['status']);
+               $bugapi->set('resolution',      $input->in['resolution']);
        }
        if (can_perform('canassign', $bug['product']))
        {
-               $bugapi->set('assignedto',      $bugsys->in['assignedto']);
+               $bugapi->set('assignedto',      $input->in['assignedto']);
        }
        
        process_custom_fields($bugapi, $message, false);
index a4943d46fe30b05708b8d2e60ceeec5f04b6b920..aed29dd94ecd8790e55d15015b0982f39ce241b9 100644 (file)
@@ -42,7 +42,7 @@ require_once('./includes/class_sort.php');
 if ($_REQUEST['do'] == 'handle')
 {
        $input->inputClean('bugid', TYPE_UINT);
-       $bug = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = " . $bugsys->in['bugid']);
+       $bug = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = " . $input->in['bugid']);
        if (!check_bug_permissions($bug))
        {
                $message->errorPermission();
@@ -53,15 +53,15 @@ if ($_REQUEST['do'] == 'handle')
                $message->errorPermission();
        }
        
-       if ($db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "favorite WHERE userid = " . bugdar::$userinfo['userid'] . " AND bugid = " . $bugsys->in['bugid']))
+       if ($db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "favorite WHERE userid = " . bugdar::$userinfo['userid'] . " AND bugid = " . $input->in['bugid']))
        {
-               $db->query("DELETE FROM " . TABLE_PREFIX . "favorite WHERE userid = " . bugdar::$userinfo['userid'] . " AND bugid = " . $bugsys->in['bugid']);
-               $message->redirect(T('This bug has been removed from your favorites list.'), "showreport.php?bugid=" . $bugsys->in['bugid']);
+               $db->query("DELETE FROM " . TABLE_PREFIX . "favorite WHERE userid = " . bugdar::$userinfo['userid'] . " AND bugid = " . $input->in['bugid']);
+               $message->redirect(T('This bug has been removed from your favorites list.'), "showreport.php?bugid=" . $input->in['bugid']);
        }
        else
        {
-               $db->query("INSERT INTO " . TABLE_PREFIX . "favorite (userid, bugid) VALUES (" . bugdar::$userinfo['userid'] . ", " . $bugsys->in['bugid'] . ")");
-               $message->redirect(T('This bug has been added to your favorites list.'), "showreport.php?bugid=" . $bugsys->in['bugid']);
+               $db->query("INSERT INTO " . TABLE_PREFIX . "favorite (userid, bugid) VALUES (" . bugdar::$userinfo['userid'] . ", " . $input->in['bugid'] . ")");
+               $message->redirect(T('This bug has been added to your favorites list.'), "showreport.php?bugid=" . $input->in['bugid']);
        }
 }
 
index def80dca8cce67118fcba1a4ac2b38d523ea8a5c..edad78975918f9f5a4865b0e0cf6f234d378aa5e 100644 (file)
--- a/help.php
+++ b/help.php
@@ -27,14 +27,14 @@ define('SVN', '$Id$');
 
 require_once('./global.php');
 
-if (!$bugsys->in['topic'] OR !isset(bugdar::$datastore['help'][ $bugsys->in['topic'] ]))
+if (!$input->in['topic'] OR !isset(bugdar::$datastore['help'][ $input->in['topic'] ]))
 {
        $topic['title'] = T('Invalid');
        $topic['body'] = T('That help topic does not exist in the system.');
 }
 else
 {
-       $topic = bugdar::$datastore['help'][ $bugsys->in['topic'] ];
+       $topic = bugdar::$datastore['help'][ $input->in['topic'] ];
        $topic['body'] = nl2br($topic['body']);
 }
 
index 99683f41fb5d10bc64494050a9adc1a4097602db..36075a9b06b036a5e8f40d1f7910a854bc8015fd 100644 (file)
@@ -56,7 +56,7 @@ $admin->page_start('Convert Database Character Set');
 
 // ###################################################################
 
-if ($bugsys->in['step'] == 0)
+if ($input->in['step'] == 0)
 {
        $collation = $db->queryFirst("SHOW VARIABLES LIKE 'collation_database'");
        
@@ -70,7 +70,7 @@ if ($bugsys->in['step'] == 0)
 
 // ###################################################################
 
-else if ($bugsys->in['step'] == 1)
+else if ($input->in['step'] == 1)
 {
        echo '<h1>Preserve Existing Data</h1>';
        echo '<p>This converts all the table columns that are stored with a character set to a BLOB type to ensure there are no problems with the target character set.</p>';
@@ -163,7 +163,7 @@ else if ($bugsys->in['step'] == 1)
 
 // ###################################################################
 
-else if ($bugsys->in['step'] == 2)
+else if ($input->in['step'] == 2)
 {
        echo '<h1>Conversion Complete</h1>';
        echo '<p>Your database has now been converted to the <strong>' . TARGET . '</strong> collation. Congratulations. Please check that everything is operating correctly.</p>';
index 6f20ef2e25586603d66769af5931a6e8cb0bd965..4dc90cbe1ebacc7569e1d78e0f90f6ae5c7401a8 100644 (file)
@@ -106,7 +106,7 @@ $bugsys->load('installer', null);
 
 $input->inputClean('mark', TYPE_UINT);
 
-if ($bugsys->in['mark'] == STOP_MARK)
+if ($input->in['mark'] == STOP_MARK)
 {
        if (!preg_match('#^upgrade([0-9]*)\.php$#i', ACTIVE_SITE, $matches))
        {
index b7c5b6dfea1990a88b99147fb5a75d38f4faf6da..3f11e7c137a056a70c5538a0d77a8d25aa55bd60 100644 (file)
@@ -31,7 +31,7 @@ page_start();
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 0)
+if ($input->in['mark'] == 0)
 {
 ?>
 <h1>Welcome to Bugdar</h1>
@@ -46,7 +46,7 @@ if ($bugsys->in['mark'] == 0)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 1)
+if ($input->in['mark'] == 1)
 {
 ?>
 <h1>Installation Check</h1>
@@ -115,7 +115,7 @@ if ($bugsys->in['mark'] == 1)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 2)
+if ($input->in['mark'] == 2)
 {
 ?>
 <h1>Initializing Database</h1>
@@ -138,7 +138,7 @@ if ($bugsys->in['mark'] == 2)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 3)
+if ($input->in['mark'] == 3)
 {
 ?>
 <h1>Loading Default Data</h1>
@@ -172,7 +172,7 @@ if ($bugsys->in['mark'] == 3)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 4)
+if ($input->in['mark'] == 4)
 {
 ?>
 <h1>Loading Settings</h1>
@@ -194,7 +194,7 @@ if ($bugsys->in['mark'] == 4)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 5)
+if ($input->in['mark'] == 5)
 {
 ?>
 <h1>Cache Data</h1>
@@ -240,7 +240,7 @@ if ($bugsys->in['mark'] == 5)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 6)
+if ($input->in['mark'] == 6)
 {
        $value = 'http' . ($_SERVER['HTTPS'] == 'on' ? 's' : '') . '://' . $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : '') . str_replace('/install/install.php', '', $_SERVER['SCRIPT_NAME']);
 ?>
@@ -266,7 +266,7 @@ if ($bugsys->in['mark'] == 6)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 7)
+if ($input->in['mark'] == 7)
 {
 ?>
 <h1>New Administrator</h1>
@@ -296,7 +296,7 @@ if ($bugsys->in['mark'] == 7)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 8)
+if ($input->in['mark'] == 8)
 {
 ?>
 <h1>User Added</h1>
@@ -311,9 +311,9 @@ if ($bugsys->in['mark'] == 8)
        build_usergroups();
        
        $user = new UserAPI($bugsys);
-       $user->set('email',                     $bugsys->in['email']);
-       $user->set('displayname',       $bugsys->in['displayname']);
-       $user->set('password',          $bugsys->in['password']);
+       $user->set('email',                     $input->in['email']);
+       $user->set('displayname',       $input->in['displayname']);
+       $user->set('password',          $input->in['password']);
        $user->set('showcolors',        1);
        $user->set('usergroupid',       6, true, false); // don't verify because we haven't cached usergroups yet
        $user->insert();
index 567af00404fdb6cb62c50bd8a884b3e3998c443c..9069edce85964933a6d652d55efa6d9c02f65dfa 100644 (file)
@@ -23,7 +23,7 @@ require_once('./global.php');
 
 // ###################################################################
 
-if (!isset($bugsys->in['next']))
+if (!isset($input->in['next']))
 {
        $db->showerrors = false;
        
@@ -63,12 +63,12 @@ if (!isset($bugsys->in['next']))
 
 else
 {
-       if ($bugsys->versions[ $bugsys->in['next'] ] == -1)
+       if ($bugsys->versions[ $input->in['next'] ] == -1)
        {
                die('Bugdar is up-to-date already');
        }
        
-       header("Location: upgrade" . $bugsys->versions[ $bugsys->in['next'] ] . ".php");
+       header("Location: upgrade" . $bugsys->versions[ $input->in['next'] ] . ".php");
 }
 
 /*=====================================================================*\
index 0d335af37c0fb37dd852e9fe8ecad947b16a6734..e5f697424878df2d6d254c56f7c7b3be907470d8 100644 (file)
@@ -28,7 +28,7 @@ page_start();
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 0)
+if ($input->in['mark'] == 0)
 {
 ?>
 <h1>Welcome to Bugdar</h1>
@@ -43,7 +43,7 @@ if ($bugsys->in['mark'] == 0)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 1)
+if ($input->in['mark'] == 1)
 {
 ?>
 <h1>Version Number Change</h1>
index a571d9f756a91f06b8de4d92bd4d1a841456b214..2c8d73317c6f02976f2d0a84ef93ed5736e1b1d6 100644 (file)
@@ -29,7 +29,7 @@ page_start();
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 0)
+if ($input->in['mark'] == 0)
 {
 ?>
 <h1>Welcome to Bugdar</h1>
@@ -42,7 +42,7 @@ if ($bugsys->in['mark'] == 0)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 1)
+if ($input->in['mark'] == 1)
 {
 ?>
 <h1>Version Number Change</h1>
index 167eeb2afd84c7e2355446eb8f1c95e319f9badb..c5ed5fbb917b4d75dda448ccf2537ab03af07dbd 100644 (file)
@@ -29,7 +29,7 @@ page_start();
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 0)
+if ($input->in['mark'] == 0)
 {
 ?>
 <h1>Welcome to Bugdar</h1>
@@ -42,7 +42,7 @@ if ($bugsys->in['mark'] == 0)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 1)
+if ($input->in['mark'] == 1)
 {
 ?>
 <h1>Minor Database Table Changes</h1>
@@ -70,7 +70,7 @@ if ($bugsys->in['mark'] == 1)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 2)
+if ($input->in['mark'] == 2)
 {
 ?>
 <h1>Search Table Changes</h1>
@@ -95,7 +95,7 @@ if ($bugsys->in['mark'] == 2)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 3)
+if ($input->in['mark'] == 3)
 {
 ?>
 <h1>Custom Field Updates</h1>
@@ -126,7 +126,7 @@ if ($bugsys->in['mark'] == 3)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 4)
+if ($input->in['mark'] == 4)
 {
 ?>
 <h1>Database Table Changes</h1>
@@ -175,7 +175,7 @@ if ($bugsys->in['mark'] == 4)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 5)
+if ($input->in['mark'] == 5)
 {
 ?>
 <h1>Version Number Change</h1>
index a5a19f0c0172215ffb050ab0da6bb930eb87743f..5b64562d35be2bd4a151a36d98da63f61608c98e 100644 (file)
@@ -29,7 +29,7 @@ page_start();
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 0)
+if ($input->in['mark'] == 0)
 {
 ?>
 <h1>Welcome to Bugdar</h1>
@@ -42,7 +42,7 @@ if ($bugsys->in['mark'] == 0)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 1)
+if ($input->in['mark'] == 1)
 {
 ?>
 <h1>Schema Updates</h1>
@@ -55,7 +55,7 @@ if ($bugsys->in['mark'] == 1)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 2)
+if ($input->in['mark'] == 2)
 {
 ?>
 <h1>Version Number Change</h1>
index 8815b372ac9f7dd9e26225bc912e995bfb307cdd..f8da550f750990ad78b69b837f8c96a82af20807 100644 (file)
@@ -29,7 +29,7 @@ page_start();
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 0)
+if ($input->in['mark'] == 0)
 {
 ?>
 <h1>Welcome to Bugdar</h1>
@@ -42,7 +42,7 @@ if ($bugsys->in['mark'] == 0)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 1)
+if ($input->in['mark'] == 1)
 {
 ?>
 <h1>Potential Schema Updates</h1>
@@ -77,7 +77,7 @@ if ($bugsys->in['mark'] == 1)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 2)
+if ($input->in['mark'] == 2)
 {
 ?>
 <h1>Version Number Change</h1>
index 1644e667359750ef27dc9bb3fe5e58bd60214c5e..803e0e26a99745fcad391a54c1b70821daa6cf6d 100644 (file)
@@ -29,7 +29,7 @@ page_start();
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 0)
+if ($input->in['mark'] == 0)
 {
 ?>
 <h1>Welcome to Bugdar</h1>
@@ -42,7 +42,7 @@ if ($bugsys->in['mark'] == 0)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 1)
+if ($input->in['mark'] == 1)
 {
 ?>
 <h1>Version Number Change</h1>
index b8e38fcc80e865c3150ffc0c574fe6b5962e1777..3e2c7ebaa65feb52dbc8f8ea4c6b21c86d7ee1b2 100644 (file)
@@ -29,7 +29,7 @@ page_start();
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 0)
+if ($input->in['mark'] == 0)
 {
 ?>
 <h1>Welcome to Bugdar</h1>
@@ -42,7 +42,7 @@ if ($bugsys->in['mark'] == 0)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 1)
+if ($input->in['mark'] == 1)
 {
 ?>
 <h1>Version Number Change</h1>
index 010e105e214a8629ab8e4bf5854ac980379f7e5a..388784b640569cdd96172f17e6a37dc98d2bd3c6 100644 (file)
@@ -29,7 +29,7 @@ page_start();
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 0)
+if ($input->in['mark'] == 0)
 {
 ?>
 <h1>Welcome to Bugdar</h1>
@@ -42,7 +42,7 @@ if ($bugsys->in['mark'] == 0)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 1)
+if ($input->in['mark'] == 1)
 {
 ?>
 <h1>Version Number Change</h1>
index 76a8c4fbccce5958c83f6c8f4ef365956589d064..b6a61cd52215f3f0dbb1d79872236455b80784bb 100644 (file)
@@ -29,7 +29,7 @@ page_start();
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 0)
+if ($input->in['mark'] == 0)
 {
 ?>
 <h1>Welcome to Bugdar</h1>
@@ -42,7 +42,7 @@ if ($bugsys->in['mark'] == 0)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 1)
+if ($input->in['mark'] == 1)
 {
 ?>
 <h1>Version Number Change</h1>
index e7542a5dc4bafa8f43d195e3095b48e001902ac8..ff6f5d7956f0fd0f5aa160a42f204e560766858d 100644 (file)
@@ -28,7 +28,7 @@ page_start();
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 0)
+if ($input->in['mark'] == 0)
 {
 ?>
 <h1>Welcome to Bugdar</h1>
@@ -43,7 +43,7 @@ if ($bugsys->in['mark'] == 0)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 1)
+if ($input->in['mark'] == 1)
 {
 ?>
        <h1>Major Table Changes</h1>
@@ -69,7 +69,7 @@ if ($bugsys->in['mark'] == 1)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 2)
+if ($input->in['mark'] == 2)
 {
 ?>
        <h1>User Table Changes</h1>
@@ -93,7 +93,7 @@ if ($bugsys->in['mark'] == 2)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 3)
+if ($input->in['mark'] == 3)
 {
 ?>
        <h1>Minor Table Changes</h1>
@@ -124,7 +124,7 @@ if ($bugsys->in['mark'] == 3)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 4)
+if ($input->in['mark'] == 4)
 {
 ?>
        <h1>Caching User Data in Bug Table</h1>
@@ -165,7 +165,7 @@ if ($bugsys->in['mark'] == 4)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 5)
+if ($input->in['mark'] == 5)
 {
 ?>
        <h1>Updating Old History Items</h1>
@@ -214,7 +214,7 @@ if ($bugsys->in['mark'] == 5)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 6)
+if ($input->in['mark'] == 6)
 {
 ?>
 <h1>Adding User Email Options</h1>
@@ -247,7 +247,7 @@ if ($bugsys->in['mark'] == 6)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 7)
+if ($input->in['mark'] == 7)
 {
 ?>
 <h1>Version Number Change</h1>
index 4f9cd4c01f934bc046335cfb1d3ca9953c4f8773..bae507a71ba0af3662523bf704e751cc0ceeed4c 100644 (file)
@@ -28,7 +28,7 @@ page_start();
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 0)
+if ($input->in['mark'] == 0)
 {
 ?>
 <h1>Welcome to Bugdar</h1>
@@ -43,7 +43,7 @@ if ($bugsys->in['mark'] == 0)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 1)
+if ($input->in['mark'] == 1)
 {
 ?>
        <h1>Language System Updates</h1>
@@ -74,7 +74,7 @@ if ($bugsys->in['mark'] == 1)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 2)
+if ($input->in['mark'] == 2)
 {
 ?>
        <h1>English US Changes</h1>
@@ -93,7 +93,7 @@ if ($bugsys->in['mark'] == 2)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 3)
+if ($input->in['mark'] == 3)
 {
 ?>
        <h1>Adding New Permission Mask</h1>
@@ -108,7 +108,7 @@ if ($bugsys->in['mark'] == 3)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 4)
+if ($input->in['mark'] == 4)
 {
 ?>
 <h1>Version Number Change</h1>
index 838467099a9df8504cc1e03e4350798129a10670..e6ced0ff0e7c174bfaca7a5c15dcde6e85d228f8 100644 (file)
@@ -28,7 +28,7 @@ page_start();
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 0)
+if ($input->in['mark'] == 0)
 {
 ?>
 <h1>Welcome to Bugdar</h1>
@@ -43,7 +43,7 @@ if ($bugsys->in['mark'] == 0)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 1)
+if ($input->in['mark'] == 1)
 {
 ?>
 <h1>Version Number Change</h1>
index 5fa40216e0dc6017cd1d2b20ca5efea7a1650522..a96a922119d725177f9f85af9d42480157b8e717 100644 (file)
@@ -29,7 +29,7 @@ page_start();
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 0)
+if ($input->in['mark'] == 0)
 {
 ?>
 <h1>Welcome to Bugdar</h1>
@@ -44,7 +44,7 @@ if ($bugsys->in['mark'] == 0)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 1)
+if ($input->in['mark'] == 1)
 {
 ?>
        <h1>Rename Automatic Actions</h1>
@@ -77,7 +77,7 @@ The \"Automation\" drop-down next to this box (which may be hidden) will allow y
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 2)
+if ($input->in['mark'] == 2)
 {
 ?>
 <h1>Version Number Change</h1>
index 2e34f457f0410403fd9f19942962c955d758e907..9e703f548b87bab5fb52c8e2f478dd9b1891252e 100644 (file)
@@ -29,7 +29,7 @@ page_start();
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 0)
+if ($input->in['mark'] == 0)
 {
 ?>
 <h1>Welcome to Bugdar</h1>
@@ -44,7 +44,7 @@ if ($bugsys->in['mark'] == 0)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 1)
+if ($input->in['mark'] == 1)
 {
 ?>
 <h1>Version Number Change</h1>
index 07c0afdc617cad7add841d2c7d9f658e03cdf25d..e5a9d78cbe515c943462a4a030cdb33b12448e13 100644 (file)
@@ -29,7 +29,7 @@ page_start();
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 0)
+if ($input->in['mark'] == 0)
 {
 ?>
 <h1>Welcome to Bugdar</h1>
@@ -44,7 +44,7 @@ if ($bugsys->in['mark'] == 0)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 1)
+if ($input->in['mark'] == 1)
 {
 ?>
 <h1>Version Number Change</h1>
index fea0985655aee58afc8e32eb8f4f2b303826d24b..66415b888a130f646bd553a52b28db3804a4d59e 100644 (file)
@@ -29,7 +29,7 @@ page_start();
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 0)
+if ($input->in['mark'] == 0)
 {
 ?>
 <h1>Welcome to Bugdar</h1>
@@ -44,7 +44,7 @@ if ($bugsys->in['mark'] == 0)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 1)
+if ($input->in['mark'] == 1)
 {
 ?>
 <h1>Version Number Change</h1>
index 062edafb3bd362e7b5d91ca23cd95af8fb0ed787..96deb999f74761879d74ff79e6d775291d88e135 100644 (file)
@@ -29,7 +29,7 @@ page_start();
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 0)
+if ($input->in['mark'] == 0)
 {
 ?>
 <h1>Welcome to Bugdar</h1>
@@ -42,7 +42,7 @@ if ($bugsys->in['mark'] == 0)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 1)
+if ($input->in['mark'] == 1)
 {
 ?>
 <h1>Schema Changes</h1>
@@ -57,7 +57,7 @@ if ($bugsys->in['mark'] == 1)
 
 // ###################################################################
 
-if ($bugsys->in['mark'] == 2)
+if ($input->in['mark'] == 2)
 {
 ?>
 <h1>Version Number Change</h1>
index 1ff638d5fc676b58e52894c1c24c8f9124696556..f542d29f6aac832589ba829e577583eaba224a8f 100644 (file)
@@ -1,6 +1,6 @@
 <email>
        <subject>Welcome to {bugdar::$options['trackertitle']}</subject>
-       <bodyText>Hi {$bugsys->in['displayname']},
+       <bodyText>Hi {$input->in['displayname']},
 
 Welcome to the {bugdar::$options['trackertitle']} tracker. Before you can begin posting bug reports, you'll need to activate your account. To do this, please click this link:
 
index 89270da44cca8d3f4b05dbc891af81e2913c9535..1e77a3c6a950b2289b0ea30a3e55a22f692d2f04 100755 (executable)
--- a/login.php
+++ b/login.php
@@ -66,7 +66,7 @@ if ($_POST['do'] == 'login' OR $_POST['do'] == 'cplogin')
                $url = 'index.php';
        }
        
-       if ($auth->authenticateLogin($bugsys->in['email'], $bugsys->in['password'], $keeplogin))
+       if ($auth->authenticateLogin($input->in['email'], $input->in['password'], $keeplogin))
        {
                if ($_POST['do'] == 'cplogin')
                {
@@ -105,7 +105,7 @@ if ($_REQUEST['do'] == 'logout')
 if ($_POST['do'] == 'sendpw')
 {      
        $user = new UserAPI($bugsys);
-       $user->set('email', $bugsys->in['email'], true, false); // don't verify so we don't get errors about existing emails
+       $user->set('email', $input->in['email'], true, false); // don't verify so we don't get errors about existing emails
        $user->set_condition(array('email'));
        $user->fetch();
        
@@ -156,16 +156,16 @@ if ($_POST['do'] == 'resetpw')
        $user->set('userid', $activation['userid']);
        $user->set_condition();
        
-       if ($bugsys->in['fix_password'] != $bugsys->in['confirm_password'])
+       if ($input->in['fix_password'] != $input->in['confirm_password'])
        {
                $message->addError(T('The passwords you entered do not patch.'));
        }
-       if (empty($bugsys->in['fix_password']))
+       if (empty($input->in['fix_password']))
        {
                $message->addError(T('Your new password cannot be empty.'));
        }
        
-       $user->set('password', $bugsys->in['fix_password']);
+       $user->set('password', $input->in['fix_password']);
        
        if (!$message->hasErrors())
        {
index 0b02ecc8874e656e92ef92a1ad3ca647e077c1c6..5a2e7afa478b31a4faa4f9d46d580f0c3448bbbc 100755 (executable)
@@ -35,7 +35,7 @@ require_once('./includes/api_comment.php');
 
 require_once('./includes/class_api_error.php');
 
-$product = explode(',', $bugsys->in['product']);
+$product = explode(',', $input->in['product']);
 if (!can_perform('cansubmitbugs', $product[0]))
 {
        $message->errorPermission();
@@ -59,16 +59,16 @@ if ($_POST['do'] == 'insert')
                
        $bug->set('userid',                     bugdar::$userinfo['userid']);
        $bug->set('username',           bugdar::$userinfo['displayname']);
-       $bug->set('summary',            $bugsys->in['summary']);
-       $bug->set('severity',           $bugsys->in['severity']);
+       $bug->set('summary',            $input->in['summary']);
+       $bug->set('severity',           $input->in['severity']);
        
        $comment->set('userid',         bugdar::$userinfo['userid']);
-       $comment->set('comment',        $bugsys->in['comment']);
-       $comment->set('parselinks',     $bugsys->in['parselinks']);
+       $comment->set('comment',        $input->in['comment']);
+       $comment->set('parselinks',     $input->in['parselinks']);
        
        // -------------------------------------------------------------------
        // check permissions on various input values
-       if (!can_perform('canchangestatus', $bugsys->in['product']))
+       if (!can_perform('canchangestatus', $input->in['product']))
        {
                $bug->set('priority',   bugdar::$options['defaultpriority']);
                $bug->set('status',             bugdar::$options['defaultstatus']);
@@ -76,21 +76,21 @@ if ($_POST['do'] == 'insert')
        }
        else
        {
-               $bug->set('priority',   $bugsys->in['priority']);
-               $bug->set('status',             $bugsys->in['status']);
-               $bug->set('resolution', $bugsys->in['resolution']);
+               $bug->set('priority',   $input->in['priority']);
+               $bug->set('status',             $input->in['status']);
+               $bug->set('resolution', $input->in['resolution']);
        }
-       if (!can_perform('canassign', $bugsys->in['product']))
+       if (!can_perform('canassign', $input->in['product']))
        {
                $bug->set('assignedto', bugdar::$options['defaultassign']);
        }
        else
        {
                // assigned person is not a dev or a valid user
-               $bug->set('assignedto', $bugsys->in['assignedto']);
+               $bug->set('assignedto', $input->in['assignedto']);
        }
                
-       $product = explode(',', $bugsys->in['product']);
+       $product = explode(',', $input->in['product']);
        $bug->set('product',            $product[0]);
        $bug->set('component',          $product[1]);
        $bug->set('version',            $product[2]);
@@ -125,7 +125,7 @@ if ($_POST['do'] == 'insert')
                
                $notif->finalize();
                
-               $message->redirect(T('The bug has been added to the database.'), ($bugsys->in['submit_reload'] == '' ? "showreport.php?bugid=" . $bug->values['bugid'] : 'newreport.php'));
+               $message->redirect(T('The bug has been added to the database.'), ($input->in['submit_reload'] == '' ? "showreport.php?bugid=" . $bug->values['bugid'] : 'newreport.php'));
        }
        else
        {
@@ -147,15 +147,15 @@ if ($_REQUEST['do'] == 'add')
                $message->error(T('No versions have been setup underneath your product(s), therefore no bugs can be added.'));
        }
        
-       $select['severity'] = construct_datastore_select('severity', 'severity', 'severityid', ($bugsys->in['severity'] ? $bugsys->in['severity'] : bugdar::$options['defaultseverity']));
+       $select['severity'] = construct_datastore_select('severity', 'severity', 'severityid', ($input->in['severity'] ? $input->in['severity'] : bugdar::$options['defaultseverity']));
 
        $show['changestatus'] = can_perform('canchangestatus');
        
        if (can_perform('canchangestatus'))
        {
-               $select['priority'] = construct_datastore_select('priority', 'priority', 'priorityid', ($bugsys->in['priority'] ? $bugsys->in['priority'] : bugdar::$options['defaultpriority']));
-               $select['status'] = construct_datastore_select('status', 'status', 'statusid', ($bugsys->in['status'] ? $bugsys->in['status'] : bugdar::$options['defaultstatus']));
-               $select['resolution'] = construct_datastore_select('resolution', 'resolution', 'resolutionid', ($bugsys->in['resolution'] ? $bugsys->in['resolution'] : bugdar::$options['defaultresolve']));
+               $select['priority'] = construct_datastore_select('priority', 'priority', 'priorityid', ($input->in['priority'] ? $input->in['priority'] : bugdar::$options['defaultpriority']));
+               $select['status'] = construct_datastore_select('status', 'status', 'statusid', ($input->in['status'] ? $input->in['status'] : bugdar::$options['defaultstatus']));
+               $select['resolution'] = construct_datastore_select('resolution', 'resolution', 'resolutionid', ($input->in['resolution'] ? $input->in['resolution'] : bugdar::$options['defaultresolve']));
        }
        
        $show['assign'] = can_perform('canassign');
@@ -166,7 +166,7 @@ if ($_REQUEST['do'] == 'add')
                {
                        $value = $dev['userid'];
                        $label = construct_user_display($dev, false);
-                       $selected = ($bugsys->in['assignedto'] ? ($bugsys->in['assignedto'] == $dev['userid']) : ($dev['userid'] == bugdar::$options['defaultassign']));
+                       $selected = ($input->in['assignedto'] ? ($input->in['assignedto'] == $dev['userid']) : ($dev['userid'] == bugdar::$options['defaultassign']));
                        eval('$select[dev] .= "' . $template->fetch('selectoption') . '";');
                }
        }
@@ -190,7 +190,7 @@ if ($_REQUEST['do'] == 'add')
        $tpl = new BSTemplate('newreport');
        $tpl->vars = array(
                'reporter'              => construct_user_display(bugdar::$userinfo),
-               'productSelect' => ConstructProductSelect('cansubmitbugs', $bugsys->in['product'], false),
+               'productSelect' => ConstructProductSelect('cansubmitbugs', $input->in['product'], false),
                'select'                => $select,
                'customfields'  => $customfields
        );
index 05c3a586b2083256e499bfe50c182648b382d6ff..04e04dc6ea2efdcfa45d1353430fbcb6de08c6eb 100755 (executable)
@@ -47,12 +47,12 @@ if ($_POST['do'] == 'insert')
                $message->error(T('Sorry, we don\'t allow new registrations.'));
        }
 
-       if ($bugsys->in['email'] != $bugsys->in['confirmemail'])
+       if ($input->in['email'] != $input->in['confirmemail'])
        {
                $message->addError(T('The emails you entered do not match.'));
        }
        
-       if ($bugsys->in['password'] != $bugsys->in['confirmpassword'])
+       if ($input->in['password'] != $input->in['confirmpassword'])
        {
                $message->addError(T('The passwords you entered did not match.'));
        }
@@ -74,12 +74,12 @@ if ($_POST['do'] == 'insert')
        }
        
        $user = new UserAPI($bugsys);
-       $user->set('email',                     $bugsys->in['email']);
-       $user->set('displayname',       $bugsys->in['displayname']);
-       $user->set('password',          $bugsys->in['password']);
-       $user->set('showemail',         $bugsys->in['showemail']);
+       $user->set('email',                     $input->in['email']);
+       $user->set('displayname',       $input->in['displayname']);
+       $user->set('password',          $input->in['password']);
+       $user->set('showemail',         $input->in['showemail']);
        $user->set('showcolors',        1);
-       $user->set('languageid',        $bugsys->in['languageid']);
+       $user->set('languageid',        $input->in['languageid']);
        $user->set('timezone',          bugdar::$options['defaulttimezone']);
        $user->set('usergroupid',       $usergroupid);
        
@@ -96,12 +96,12 @@ if ($_POST['do'] == 'insert')
                        
                        $db->query("INSERT INTO " . TABLE_PREFIX . "useractivation (userid, activator, dateline, usergroupid) VALUES ($userid, '$activationid', " . TIMENOW . ", 2)");
                        
-                       eval('$email = "' . $template->fetch(FetchEmailPath('activateaccount.xml', bugdar::$datastore['language'][$bugsys->in['languageid']]['langcode'])) . '";');
+                       eval('$email = "' . $template->fetch(FetchEmailPath('activateaccount.xml', bugdar::$datastore['language'][$input->in['languageid']]['langcode'])) . '";');
                        $email = $bugsys->xml->parse($email);
                        $mail->setSubject($email['email']['subject']['value']);
                        $mail->setBodyText($email['email']['bodyText']['value']);
                        
-                       $mail->send($bugsys->in['email'], $bugsys->in['displayname']);
+                       $mail->send($input->in['email'], $input->in['displayname']);
                
                        $message->message(T('You now need to activate your account via email.'));
                }
@@ -109,12 +109,12 @@ if ($_POST['do'] == 'insert')
                {
                        if (bugdar::$options['sendwelcomemail'])
                        {
-                               $displayName = $bugsys->in['displayname'];
-                               eval('$email = "' . $template->fetch(FetchEmailPath('welcome.xml', bugdar::$datastore['language'][$bugsys->in['languageid']]['langcode'])) . '";');
+                               $displayName = $input->in['displayname'];
+                               eval('$email = "' . $template->fetch(FetchEmailPath('welcome.xml', bugdar::$datastore['language'][$input->in['languageid']]['langcode'])) . '";');
                                $email = $bugsys->xml->parse($email);
                                $mail->setSubject($email['email']['subject']['value']);
                                $mail->setBodyText($email['email']['bodyText']['value']);
-                               $mail->send($bugsys->in['email'], $bugsys->in['displayname']);
+                               $mail->send($input->in['email'], $input->in['displayname']);
                        }
                        
                        if ($usergroupid == 4)
@@ -151,7 +151,7 @@ if (empty($_REQUEST['do']))
        foreach (bugdar::$datastore['language'] AS $value => $temp)
        {
                $label = $temp['title'];
-               $selected = ($value == $bugsys->in['languageid']);
+               $selected = ($value == $input->in['languageid']);
                eval('$opts .= "' . $template->fetch('selectoption') . '";');
        }
        
@@ -163,11 +163,11 @@ if (empty($_REQUEST['do']))
 if ($_REQUEST['do'] == 'activate')
 {
        $input->inputClean('userid', TYPE_UINT);
-       if ($useractivation = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "useractivation WHERE userid = " . $bugsys->in['userid'] . " AND activator = '" . $bugsys->input_escape('activator') . "'"))
+       if ($useractivation = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "useractivation WHERE userid = " . $input->in['userid'] . " AND activator = '" . $bugsys->input_escape('activator') . "'"))
        {
-               $user = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "user WHERE userid = " . $bugsys->in['userid']);
-               $db->query("UPDATE " . TABLE_PREFIX . "user SET usergroupid = $useractivation[usergroupid] WHERE userid = " . $bugsys->in['userid']);
-               $db->query("DELETE FROM " . TABLE_PREFIX . "useractivation WHERE userid = " . $bugsys->in['userid']);
+               $user = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "user WHERE userid = " . $input->in['userid']);
+               $db->query("UPDATE " . TABLE_PREFIX . "user SET usergroupid = $useractivation[usergroupid] WHERE userid = " . $input->in['userid']);
+               $db->query("DELETE FROM " . TABLE_PREFIX . "useractivation WHERE userid = " . $input->in['userid']);
                
                if (bugdar::$options['sendwelcomemail'])
                {
index a94baaf7023dc8c3ff957c08004f03ad7c565b53..17f548637b816027b9920bb28fdea2053f6e1054 100644 (file)
@@ -70,11 +70,11 @@ if (empty($_REQUEST['do']))
 
 if ($_REQUEST['do'] == 'search')
 {
-       if ($bugsys->in['new'])
+       if ($input->in['new'])
        {
                $newsearch = true;
        }
-       else if ($bugsys->in['searchid'])
+       else if ($input->in['searchid'])
        {
                $cachedsearch = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "search WHERE searchid = " . $input->inputClean('searchid', TYPE_UINT) . " AND userid = " . bugdar::$userinfo['userid']);
        }
@@ -90,7 +90,7 @@ if ($_REQUEST['do'] == 'search')
        if ($cachedsearch)
        {
                $show['cached'] = true;
-               if ($cachedsearch['dateline'] < TIMENOW - 900 OR $bugsys->in['rerun'])
+               if ($cachedsearch['dateline'] < TIMENOW - 900 OR $input->in['rerun'])
                {
                        $_REQUEST['do'] = 'process';
                        $bugsys->in = array_merge(unserialize($cachedsearch['query']), $bugsys->in);
@@ -175,9 +175,9 @@ if ($_REQUEST['do'] == 'process')
 {
        // -------------------------------------------------------------------
        // handle keywords
-       if ($bugsys->in['summary'])
+       if ($input->in['summary'])
        {
-               $keywords = preg_split('#\s+#', $bugsys->in['summary']);
+               $keywords = preg_split('#\s+#', $input->in['summary']);
                
                // TODO - need to have some str to bool conversions
                
@@ -188,7 +188,7 @@ if ($_REQUEST['do'] == 'process')
                                continue;
                        }
                        
-                       if ($bugsys->in['mode'] == MODE_ALL)
+                       if ($input->in['mode'] == MODE_ALL)
                        {
                                $querybuild['text'] .= " +$word";
                        }
@@ -209,7 +209,7 @@ if ($_REQUEST['do'] == 'process')
                
                $temp = trim($querybuild['text']);
                
-               if ($bugsys->in['mode'] == MODE_ALL OR $bugsys->in['mode'] == MODE_RAW)
+               if ($input->in['mode'] == MODE_ALL OR $input->in['mode'] == MODE_RAW)
                {
                        $bool_flag = ' IN BOOLEAN MODE';
                }
@@ -219,7 +219,7 @@ if ($_REQUEST['do'] == 'process')
        
        // -------------------------------------------------------------------
        // reporter
-       if ($bugsys->in['reporter'])
+       if ($input->in['reporter'])
        {
                // force email or name?? make a distinction?
                // more elegant way to do this? probably
@@ -232,9 +232,9 @@ if ($_REQUEST['do'] == 'process')
        
        // -------------------------------------------------------------------
        // product/component/version stuff
-       if (is_array($bugsys->in['product']))
+       if (is_array($input->in['product']))
        {
-               foreach ($bugsys->in['product'] AS $prod)
+               foreach ($input->in['product'] AS $prod)
                {
                        $product = explode(',', $prod);
                        $product = $bugsys->clean($product, TYPE_UINT);
@@ -249,43 +249,43 @@ if ($_REQUEST['do'] == 'process')
        // severity, priority, status, resolution, assignedto
        
        // severity
-       if ($bugsys->in['severity'])
+       if ($input->in['severity'])
        {
                $input->inputClean('severity', TYPE_UINT);
-               $querybuild['severity'] = "AND bug.severity IN (" . implode(',', $bugsys->in['severity']) . ")";
+               $querybuild['severity'] = "AND bug.severity IN (" . implode(',', $input->in['severity']) . ")";
        }
        
        // priority
-       if ($bugsys->in['priority'])
+       if ($input->in['priority'])
        {
                $input->inputClean('priority', TYPE_UINT);
-               $querybuild['priority'] = "AND bug.priority IN (" . implode(',', $bugsys->in['priority']) . ")";
+               $querybuild['priority'] = "AND bug.priority IN (" . implode(',', $input->in['priority']) . ")";
        }
        
        // status
-       if ($bugsys->in['status'])
+       if ($input->in['status'])
        {
                $input->inputClean('status', TYPE_UINT);
-               $querybuild['status'] = "AND bug.status IN (" . implode(',', $bugsys->in['status']) . ")";
+               $querybuild['status'] = "AND bug.status IN (" . implode(',', $input->in['status']) . ")";
        }
        
        // resolution
-       if ($bugsys->in['resolution'])
+       if ($input->in['resolution'])
        {
                $input->inputClean('resolution', TYPE_UINT);
-               $querybuild['resolution'] = "AND bug.resolution IN (" . implode(',', $bugsys->in['resolution']) . ")";
+               $querybuild['resolution'] = "AND bug.resolution IN (" . implode(',', $input->in['resolution']) . ")";
        }
        
        // assignment
-       if ($bugsys->in['assignedto'])
+       if ($input->in['assignedto'])
        {
                $input->inputClean('assignedto', TYPE_UINT);
-               $querybuild['assignedto'] = "AND bug.assignedto IN (" . implode(',', $bugsys->in['assignedto']) . ")";
+               $querybuild['assignedto'] = "AND bug.assignedto IN (" . implode(',', $input->in['assignedto']) . ")";
        }
        
        // -------------------------------------------------------------------
        // date
-       if ($bugsys->in['date'])
+       if ($input->in['date'])
        {
                // now - (seconds/day * number of days)
                $dateline = time() - ($input->inputClean('date', TYPE_INT) * 3600);
@@ -295,26 +295,26 @@ if ($_REQUEST['do'] == 'process')
        // -------------------------------------------------------------------
        // favorites
        $input->inputClean('favorite', TYPE_INT);
-       if ($bugsys->in['favorite'] != 0 AND bugdar::$userinfo['userid'])
+       if ($input->in['favorite'] != 0 AND bugdar::$userinfo['userid'])
        {
                $favorites = $db->query("SELECT * FROM " . TABLE_PREFIX . "favorite WHERE userid = " . bugdar::$userinfo['userid']);
                foreach ($favorites as $favorite)
                {
                        $ids[] = $favorite['bugid'];
                }
-               $querybuild['favorites'] = "AND bug.bugid " . ($bugsys->in['favorite'] > 0 ? "IN" : "NOT IN") . " (" . implode(', ', $ids) . ")";
+               $querybuild['favorites'] = "AND bug.bugid " . ($input->in['favorite'] > 0 ? "IN" : "NOT IN") . " (" . implode(', ', $ids) . ")";
        }
        
        // -------------------------------------------------------------------
        // sort by
        $sortby = array('bugid', 'severity', 'priority', 'status', 'resolution', 'dateline');
        $orderby = array('ASC', 'DESC');
-       $bugsys->in['orderby'] = strtoupper($bugsys->in['orderby']);
-       if (in_array($bugsys->in['sortby'], $sortby) AND in_array($bugsys->in['orderby'], $orderby))
+       $input->in['orderby'] = strtoupper($input->in['orderby']);
+       if (in_array($input->in['sortby'], $sortby) AND in_array($input->in['orderby'], $orderby))
        {
-               $sortclause = "ORDER BY " . $bugsys->in['sortby'] . ' ' . $bugsys->in['orderby'];
+               $sortclause = "ORDER BY " . $input->in['sortby'] . ' ' . $input->in['orderby'];
        }
-       else if ($bugsys->in['sortby'] == 'relevance')
+       else if ($input->in['sortby'] == 'relevance')
        {
                $sortclause = '';
        }
@@ -337,20 +337,20 @@ if ($_REQUEST['do'] == 'process')
        );
        foreach ($fields_fetch as $field)
        {
-               if (!empty($bugsys->in["custom$field[fieldid]"]) OR ($field['type'] == 'select_single' AND isset($bugsys->in["custom$field[fieldid]"])))
+               if (!empty($input->in["custom$field[fieldid]"]) OR ($field['type'] == 'select_single' AND isset($input->in["custom$field[fieldid]"])))
                {
                        if ($field['type'] == 'input_checkbox' AND $input->inputClean("custom$field[fieldid]", TYPE_INT) != 0)
                        {
-                               $querybuild[] = "AND bug.custom$field[fieldid] = " . ($bugsys->in["custom$field[fieldid]"] > 0 ? 1 : 0);
+                               $querybuild[] = "AND bug.custom$field[fieldid] = " . ($input->in["custom$field[fieldid]"] > 0 ? 1 : 0);
                        }
                        else if ($field['type'] == 'input_text')
                        {
-                               $querybuild[] = "AND bug.custom$field[fieldid] LIKE '%" . $bugsys->in["custom$field[fieldid]"] . "%'";
+                               $querybuild[] = "AND bug.custom$field[fieldid] LIKE '%" . $input->in["custom$field[fieldid]"] . "%'";
                        }
-                       else if ($field['type'] == 'select_single' AND $bugsys->in["custom$field[fieldid]"] != -1)
+                       else if ($field['type'] == 'select_single' AND $input->in["custom$field[fieldid]"] != -1)
                        {
                                $temp = unserialize($field['selects']);
-                               $querybuild[] = "AND bug.custom$field[fieldid] = '" . trim($temp[ intval($bugsys->in["custom$field[fieldid]"]) ]) . "'";
+                               $querybuild[] = "AND bug.custom$field[fieldid] = '" . trim($temp[ intval($input->in["custom$field[fieldid]"]) ]) . "'";
                        }
                }
        }
@@ -398,7 +398,7 @@ if ($_REQUEST['do'] == 'process')
                $results[] = $result;
        }
                
-       if (bugdar::$userinfo['userid'] AND !$cachedsearch AND !$bugsys->in['rerun'])
+       if (bugdar::$userinfo['userid'] AND !$cachedsearch AND !$input->in['rerun'])
        {
                $db->query("DELETE FROM " . TABLE_PREFIX . "search WHERE userid = " . bugdar::$userinfo['userid'] . " AND name IS NULL");
        }
@@ -528,29 +528,29 @@ if ($_POST['do'] == 'doupdate')
                $log->set_bugid($bug['bugid']);
                $log->add_data(true, $bug, $log->getCommonFields(), true);
 
-               if ($bugsys->in['status'] AND can_perform('canchangestatus', $bug['product']))
+               if ($input->in['status'] AND can_perform('canchangestatus', $bug['product']))
                {
-                       $api->set('status',             $bugsys->in['status']);
+                       $api->set('status',             $input->in['status']);
                }
-               if ($bugsys->in['priority'] AND can_perform('canchangestatus', $bug['product']))
+               if ($input->in['priority'] AND can_perform('canchangestatus', $bug['product']))
                {
-                       $api->set('priority',   $bugsys->in['priority']);
+                       $api->set('priority',   $input->in['priority']);
                }
-               if ($bugsys->in['severity'])
+               if ($input->in['severity'])
                {
-                       $api->set('severity',   $bugsys->in['severity']);
+                       $api->set('severity',   $input->in['severity']);
                }
-               if ($bugsys->in['resolution'] AND can_perform('canchangestatus', $bug['product']))
+               if ($input->in['resolution'] AND can_perform('canchangestatus', $bug['product']))
                {
-                       $api->set('resolution', $bugsys->in['resolution']);
+                       $api->set('resolution', $input->in['resolution']);
                }
-               if ($bugsys->in['assignedto'] AND can_perform('canassign', $bug['product']))
+               if ($input->in['assignedto'] AND can_perform('canassign', $bug['product']))
                {
-                       $api->set('assignedto', $bugsys->in['assignedto']);
+                       $api->set('assignedto', $input->in['assignedto']);
                }
-               if ($bugsys->in['product'])
+               if ($input->in['product'])
                {
-                       $product = explode(',', $bugsys->in['product']);
+                       $product = explode(',', $input->in['product']);
                        $api->set('product',    $product[0]);
                        $api->set('component',  $product[1]);
                        $api->set('version',    $product[2]);
@@ -564,18 +564,18 @@ if ($_POST['do'] == 'doupdate')
                $log->update_history();
        }
        
-       $message->redirect(T('The specified bugs have been updated and you will now return to your search results.'), 'search.php?searchid=' . $bugsys->in['searchid']);
+       $message->redirect(T('The specified bugs have been updated and you will now return to your search results.'), 'search.php?searchid=' . $input->in['searchid']);
 }
 
 // ###################################################################
 
 if ($_REQUEST['do'] == 'export')
 {
-       if (!$bugsys->in['searchid'] AND bugdar::$userinfo['userid'])
+       if (!$input->in['searchid'] AND bugdar::$userinfo['userid'])
        {
                $search = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "search WHERE name IS NULL AND userid = " . bugdar::$userinfo['userid']);
        }
-       else if ($bugsys->in['searchid'])
+       else if ($input->in['searchid'])
        {
                $search = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "search WHERE searchid = " . $input->inputClean('searchid', TYPE_UINT) . " AND userid = " . bugdar::$userinfo['userid']);
        }
@@ -644,14 +644,14 @@ if ($_POST['do'] == 'dosave')
        {
                $message->addError(sprintf(T('This search has already been named "%1$s".'), $search['name']));
        }
-       if (empty($bugsys->in['name']))
+       if (empty($input->in['name']))
        {
                $message->addError(T('The name cannot be empty.'));
        }
        
        if (!$message->hasErrors())
        {
-               $db->query("UPDATE " . TABLE_PREFIX . "search SET name = '" . $bugsys->input_escape('name') . "' WHERE searchid = " . $bugsys->in['searchid']);
+               $db->query("UPDATE " . TABLE_PREFIX . "search SET name = '" . $bugsys->input_escape('name') . "' WHERE searchid = " . $input->in['searchid']);
                $message->redirect(T('Your search has been saved.'), 'search.php?searchid=' . $search['searchid']);
        }
        else
index 38734960c979573f650a14c8722ef356050a217b..3df3de74c6bb357497a75315233cacb3eeac32e5 100644 (file)
@@ -231,7 +231,7 @@ foreach ($fields AS $field)
 
 // -------------------------------------------------------------------
 // hilight
-$words = explode(' ', $bugsys->in['hilight']);
+$words = explode(' ', $input->in['hilight']);
 foreach ($words AS $word)
 {
        if (trim($word))
index e2f7ae98fc9ff9894156cf526e977483bdbd6240..3b3211176dcaf73d9d8506f7cec1628b5c89095f 100644 (file)
@@ -20,7 +20,7 @@ $header
                <div class="box-mid">
                        <% if ($show['lostpwerror']): %><div class="error"><%-T("The specified email could not be found or it is invalid.")%></div><% endif %>
                        <div><%-T("Enter your email in the box below and you will receive a message with instructions on how to set a new password.")%></div>
-                       <div><strong><%-T("Email")%>:</strong> <input type="text" name="email" size="30" value="{$bugsys->in['email']}" /></div>
+                       <div><strong><%-T("Email")%>:</strong> <input type="text" name="email" size="30" value="{$input->in['email']}" /></div>
                </div>
 
                <div class="box-foot box-center">
index f277415fee0ca8a8b657015e3a88a71c6e1df984..adc081c260cda3c3b717ccbdf6503fbd7f2abff0 100644 (file)
@@ -28,7 +28,7 @@ $header
 
        <div class="box-mid box-margmod-bottom" style="text-align: <%- $stylevar['left'] %>">
                <div><input name="attachment" type="file" /></div>
-               <div><strong><%-T("Description")%>:</strong> <input name="description" type="text" size="35" value="<%- $bugsys->in['description'] %>" maxlength="250" /></div>
+               <div><strong><%-T("Description")%>:</strong> <input name="description" type="text" size="35" value="<%- $input->in['description'] %>" maxlength="250" /></div>
        </div>
 
        <% if ($show['obsoletes']): %>
@@ -43,7 +43,7 @@ $header
        <div class="box-mid" style="text-align: <%- $stylevar['left'] %>">
                <div><strong><%-T("Add Comment")%>:</strong>
                        <div>
-                               <textarea name="comment" rows="10" cols="50" class="textarea"><%- $bugsys->in['comment'] %></textarea>
+                               <textarea name="comment" rows="10" cols="50" class="textarea"><%- $input->in['comment'] %></textarea>
                        </div>
                </div>
        </div>
index 1c004aa97e17124b82d43d7ba92ab9d0555930ca..550caa810752ef31c1d54dba717bc03b2ccda2fb 100644 (file)
@@ -35,7 +35,7 @@
                <!-- product -->
                <fieldset>
                        <legend><a href="explain.php?do=products"><%-T("Product/Version")%></a> $help[product]</legend>
-                       <div class="field"><select name="product"><% if (!$bugsys->in['product']): %><option value="0" selected="selected"><%-T("Select...")%></option><% endif %><%- $productSelect %></select></div>
+                       <div class="field"><select name="product"><% if (!$input->in['product']): %><option value="0" selected="selected"><%-T("Select...")%></option><% endif %><%- $productSelect %></select></div>
                </fieldset>
                <!-- / product -->
 
@@ -66,7 +66,7 @@
                <!-- summary -->
                <fieldset>
                        <legend><%-T("Summary")%> $help[summary]</legend>
-                       <div class="field"><input type="text" name="summary" size="25" value="<%- $bugsys->in['summary'] %>" style="width: 100%" maxlength="250" /></div>
+                       <div class="field"><input type="text" name="summary" size="25" value="<%- $input->in['summary'] %>" style="width: 100%" maxlength="250" /></div>
                </fieldset>
                <!-- / summary -->
 
        <fieldset>
                <legend><%-T("Description/Initial Report")%></legend>
 
-               <textarea name="comment" cols="50" rows="10" class="textarea"><% if ($bugsys->in['comment']): %><%- $bugsys->in['comment'] %><% else: %><%- bugdar::$options['defaultcomment'] %><% endif %></textarea>
+               <textarea name="comment" cols="50" rows="10" class="textarea"><% if ($input->in['comment']): %><%- $input->in['comment'] %><% else: %><%- bugdar::$options['defaultcomment'] %><% endif %></textarea>
 
-               <div><input type="checkbox" name="parselinks" value="1"<% if ($bugsys->in['parselinks']): %> checked="checked"<% endif %> /> <%-T("Parse Links in the Comment")%></div>
+               <div><input type="checkbox" name="parselinks" value="1"<% if ($input->in['parselinks']): %> checked="checked"<% endif %> /> <%-T("Parse Links in the Comment")%></div>
        </fieldset>
 </div>
 <!-- / new reply -->
 
 </form>
 
-<!-- <script type="text/javascript"> setup_report("{$bugsys->in['product']}", "{$bugsys->in['component']}", "{$bugsys->in['version']}"); </script> -->
+<!-- <script type="text/javascript"> setup_report("{$input->in['product']}", "{$input->in['component']}", "{$input->in['version']}"); </script> -->
 
 <%- $footer %>
\ No newline at end of file
index 00e4b849342d73cea6bb87d73e73d5a3a63944f9..99e9d6ca2ecc2bdf131afe4b9bc995705100cf56 100644 (file)
@@ -25,12 +25,12 @@ $header
                <div class="box-head"><%-T("Register")%></div>
 
                <div class="box-mid">
-                       <div><strong><%-T("Email")%>:</strong> <input type="text" name="email" size="30" value="<%- $bugsys->in['email'] %>" /></div>
-                       <div><strong><%-T("Confirm Email")%>:</strong> <input type="text" name="confirmemail" size="30" value="<%- $bugsys->in['confirmemail'] %>" /></div>
-                       <div><strong><%-T("Display Name")%>:</strong> <input type="text" name="displayname" size="30" value="<%- $bugsys->in['displayname'] %>" /></div>
+                       <div><strong><%-T("Email")%>:</strong> <input type="text" name="email" size="30" value="<%- $input->in['email'] %>" /></div>
+                       <div><strong><%-T("Confirm Email")%>:</strong> <input type="text" name="confirmemail" size="30" value="<%- $input->in['confirmemail'] %>" /></div>
+                       <div><strong><%-T("Display Name")%>:</strong> <input type="text" name="displayname" size="30" value="<%- $input->in['displayname'] %>" /></div>
                        <div><strong><%-T("Password")%>:</strong> <input type="password" name="password" size="30" /></div>
                        <div><strong><%-T("Confirm Password")%>:</strong> <input type="password" name="confirmpassword" size="30" /></div>
-                       <div><strong><%-T("Show My Email Publicly")%>:</strong> <input type="checkbox" value="1" name="showemail"<if condition="$bugsys->in['showemail']"> checked="checked"<% endif %> /> <%-T("Yes")%></div>
+                       <div><strong><%-T("Show My Email Publicly")%>:</strong> <input type="checkbox" value="1" name="showemail"<if condition="$input->in['showemail']"> checked="checked"<% endif %> /> <%-T("Yes")%></div>
                        <div><strong><%-T("Language")%>:</strong> <select name="languageid"><%- $opts %></select></div>
                </div>
 
index 706550d79f576fb436e0bf5dd4b0521b06cb24fa..edd1cfed58864d5af4e663856574bd7478999c23 100644 (file)
@@ -19,7 +19,7 @@
 
 <form action="search.php" name="register" method="post">
 <input type="hidden" name="do" value="dosave" />
-<input type="hidden" name="searchid" value="<%- $bugsys->in['searchid'] %>" />
+<input type="hidden" name="searchid" value="<%- $input->in['searchid'] %>" />
 
 <div align="center" style="margin-top: 10px">
        <div class="box altwidth">
@@ -31,7 +31,7 @@
                        <br />
                        <br />
 
-                       <div><strong><%-T("Name")%>:</strong> <input type="text" name="name" size="30" maxlength="250" value="<%- $bugsys->in['name'] %>" /></div>
+                       <div><strong><%-T("Name")%>:</strong> <input type="text" name="name" size="30" maxlength="250" value="<%- $input->in['name'] %>" /></div>
                </div>
 
                <div class="box-foot box-center">
index 7a783e1935ff6e12cc2bd09fd02fe7a385357d53..cd6a5aedaf6539b08d3bb97922a0b5f5654740d0 100644 (file)
 
                <textarea name="comment" cols="50" rows="10" class="textarea"></textarea>
 
-               <div><input type="checkbox" name="parselinks" value="1"<% if ($bugsys->in['parselinks']): %>> checked="checked"<% endif %> /> <%-T("Parse Links in the Comment")%></div>
+               <div><input type="checkbox" name="parselinks" value="1"<% if ($input->in['parselinks']): %>> checked="checked"<% endif %> /> <%-T("Parse Links in the Comment")%></div>
        </fieldset>
 </div>
 <!-- / new reply -->
index 1e48574d98ac5da1ba5bbe309eeebfb987406e55..6c05092a736973a3e70cfacb1f55fd8c7e57a70a 100644 (file)
@@ -63,7 +63,7 @@ if ($_POST['do'] == 'killsearch')
                $message->errorPermission();
        }
        
-       $db->query("DELETE FROM " . TABLE_PREFIX . "search WHERE searchid = " . $bugsys->in['searchid']);
+       $db->query("DELETE FROM " . TABLE_PREFIX . "search WHERE searchid = " . $input->in['searchid']);
        
        $message->redirect(T('This saved search has been removed from your list.'), 'userctrl.php');
 }
@@ -78,7 +78,7 @@ if ($_REQUEST['do'] == 'deletesearch')
                $message->errorPermission();
        }
        
-       $message->confirm(T('Are you sure you want to delete this saved search?'), 'userctrl.php', 'killsearch', T('Delete'), T('Cancel'), array('searchid' => $bugsys->in['searchid']));
+       $message->confirm(T('Are you sure you want to delete this saved search?'), 'userctrl.php', 'killsearch', T('Delete'), T('Cancel'), array('searchid' => $input->in['searchid']));
 }
 
 // ###################################################################
@@ -87,15 +87,15 @@ if ($_POST['do'] == 'update')
 {      
        // -------------------------------------------------------------------
        // authentication
-       if (!empty($bugsys->in['password_change']) OR !empty($bugsys->in['email_change']))
+       if (!empty($input->in['password_change']) OR !empty($input->in['email_change']))
        {
-               if (empty($bugsys->in['validate']))
+               if (empty($input->in['validate']))
                {
                        $message->addError(T('You need to enter your current password to change your email or password'));
                }
                else
                {
-                       if (md5(md5($bugsys->in['validate']) . md5(bugdar::$userinfo['salt'])) != bugdar::$userinfo['password'])
+                       if (md5(md5($input->in['validate']) . md5(bugdar::$userinfo['salt'])) != bugdar::$userinfo['password'])
                        {
                                $message->addError(T('Your authentication password does not match the one in our records'));
                        }
@@ -104,66 +104,66 @@ if ($_POST['do'] == 'update')
        
        // -------------------------------------------------------------------
        // email validation
-       if (!empty($bugsys->in['email_change']))
+       if (!empty($input->in['email_change']))
        {
-               if (!empty($bugsys->in['email_change']) AND empty($bugsys->in['email_confirm']))
+               if (!empty($input->in['email_change']) AND empty($input->in['email_confirm']))
                {
                        $message->addError(T('You need to enter both the email and confirm email fields to change your address'));
                }
                
-               if ($bugsys->in['email_change'] != $bugsys->in['email_confirm'])
+               if ($input->in['email_change'] != $input->in['email_confirm'])
                {
                        $message->addError(T('Your email and confirm email addresses do not match'));
                }
                
-               $userapi->set('email',  $bugsys->in['email_change']);
+               $userapi->set('email',  $input->in['email_change']);
        }
        
        // -------------------------------------------------------------------
        // password validation
-       if (!empty($bugsys->in['password_change']))
+       if (!empty($input->in['password_change']))
        {
-               if (!empty($bugsys->in['password_change']) AND empty($bugsys->in['password_confirm']))
+               if (!empty($input->in['password_change']) AND empty($input->in['password_confirm']))
                {
                        $message->addError(T('You need to enter both the password and confirm password fields to change your password'));
                }
                else
                {
-                       if ($bugsys->in['password_change'] != $bugsys->in['password_confirm'])
+                       if ($input->in['password_change'] != $input->in['password_confirm'])
                        {
                                $message->addError(T('Your password and confirm password do not match'));
                        }
                }
                
-               $userapi->set('password',       $bugsys->in['password_change']);
+               $userapi->set('password',       $input->in['password_change']);
        }
        
-       $userapi->set('displayname',    $bugsys->in['displayname']);
-       $userapi->set('showemail',              $bugsys->in['showemail']);
-       $userapi->set('showcolors',             $bugsys->in['showcolors']);
-       $userapi->set('languageid',             $bugsys->in['languageid']);
-       $userapi->set('timezone',               $bugsys->in['timezone']);
-       $userapi->set('usedst',                 $bugsys->in['usedst']);
-       $userapi->set('hidestatuses',   $bugsys->in['hidestatuses']);
-       $userapi->set('defaultsortkey', $bugsys->in['defaultsortkey']);
-       $userapi->set('defaultsortas',  $bugsys->in['defaultsortas']);
+       $userapi->set('displayname',    $input->in['displayname']);
+       $userapi->set('showemail',              $input->in['showemail']);
+       $userapi->set('showcolors',             $input->in['showcolors']);
+       $userapi->set('languageid',             $input->in['languageid']);
+       $userapi->set('timezone',               $input->in['timezone']);
+       $userapi->set('usedst',                 $input->in['usedst']);
+       $userapi->set('hidestatuses',   $input->in['hidestatuses']);
+       $userapi->set('defaultsortkey', $input->in['defaultsortkey']);
+       $userapi->set('defaultsortas',  $input->in['defaultsortas']);
        $userapi->set('columnoptions',  $input->inputClean('columnoptions', TYPE_UINT));
                
        // -------------------------------------------------------------------
        // copy fields
-       $userinfo['displayname'] = $bugsys->in['displayname'];
-       $userinfo['showemail'] = $bugsys->in['showemail'];
-       $userinfo['showcolors'] = $bugsys->in['showcolors'];
-       $userinfo['languageid'] = $bugsys->in['languageid'];
-       $userinfo['timezone'] = $bugsys->in['timezone'];
-       $userinfo['usedst'] = $bugsys->in['usedst'];
-       $userinfo['hidestatuses'] = $bugsys->in['hidestatuses'];
-       $userinfo['defaultsorkey'] = $bugsys->in['defaultsorkey'];
-       $userinfo['defaultsortas'] = $bugsys->in['defaultsortas'];
-       $userinfo['columnoptions'] = $bugsys->in['columnoptions'];
+       $userinfo['displayname'] = $input->in['displayname'];
+       $userinfo['showemail'] = $input->in['showemail'];
+       $userinfo['showcolors'] = $input->in['showcolors'];
+       $userinfo['languageid'] = $input->in['languageid'];
+       $userinfo['timezone'] = $input->in['timezone'];
+       $userinfo['usedst'] = $input->in['usedst'];
+       $userinfo['hidestatuses'] = $input->in['hidestatuses'];
+       $userinfo['defaultsorkey'] = $input->in['defaultsorkey'];
+       $userinfo['defaultsortas'] = $input->in['defaultsortas'];
+       $userinfo['columnoptions'] = $input->in['columnoptions'];
        
-       $email = $bugsys->in['email_change'];
-       $email_confirm = $bugsys->in['email_confirm'];
+       $email = $input->in['email_change'];
+       $email_confirm = $input->in['email_confirm'];
        
        // -------------------------------------------------------------------
        // error handling
@@ -178,9 +178,9 @@ if ($_POST['do'] == 'update')
                
                $db->query("DELETE FROM " . TABLE_PREFIX . "useremail WHERE userid = " . bugdar::$userinfo['userid']);
                $input->inputClean('emailopts', TYPE_INT);
-               if (is_array($bugsys->in['emailopts']))
+               if (is_array($input->in['emailopts']))
                {
-                       foreach ($bugsys->in['emailopts'] AS $relation => $bitarr)
+                       foreach ($input->in['emailopts'] AS $relation => $bitarr)
                        {
                                $bitmask = 0;
                                if (is_array($bitarr))
@@ -217,7 +217,7 @@ if ($_REQUEST['do'] == 'modify')
        }
        
        $checked = array();
-       if (!is_array($bugsys->in['emailopts']))
+       if (!is_array($input->in['emailopts']))
        {
                $options = $db->query("SELECT * FROM " . TABLE_PREFIX . "useremail WHERE userid = " . bugdar::$userinfo['userid']);
                foreach ($options as $opt)
@@ -236,7 +236,7 @@ if ($_REQUEST['do'] == 'modify')
        }
        else
        {
-               $checked = $bugsys->in['emailopts'];
+               $checked = $input->in['emailopts'];
                foreach ($checked AS $key1 => $value1)
                {
                        foreach ($value1 AS $key2 => $value2)
@@ -252,7 +252,7 @@ if ($_REQUEST['do'] == 'modify')
        $columns = array();
        $columnOptions = '';
        require_once('./includes/class_sort.php');
-       if (!is_array($bugsys->in['columnoptions']))
+       if (!is_array($input->in['columnoptions']))
        {
                foreach (ListSorter::fetch_by_text(false) AS $column => $name)
                {
@@ -269,7 +269,7 @@ if ($_REQUEST['do'] == 'modify')
        }
        else
        {
-               $columns = $bugsys->in['columnoptions'];
+               $columns = $input->in['columnoptions'];
                foreach (ListSorter::fetch_by_text(false) AS $column => $name)
                {
                        eval('$columnOptions .= "' . $template->fetch('userctrl_column') . '";');