Changing BSApi->objdata[] to BSApi->record[]

diff --git a/admin/automation.php b/admin/automation.php
index bfd2fee297d1e1888c132e50c567082672330ce2..07563506fcd92c02210b36d7946396aa1fb518ed 100644 (file)
--- a/admin/automation.php
+++ b/admin/automation.php
@@ -125,7 +125,7 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit')
                $action->set('actionid',        $input->in['actionid']);
                $action->set_condition();
                $action->fetch();
-               $action->objdata['fields'] = unserialize($action->objdata['fieldchanges']);
+               $action->record['fields'] = unserialize($action->record['fieldchanges']);
        }
        else
        {
@@ -139,30 +139,30 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit')
        
        if ($edit)
        {
-               $admin->form_hidden_field('actionid', $action->objdata['actionid']);
+               $admin->form_hidden_field('actionid', $action->record['actionid']);
        }
        
        $admin->table_start();
        $admin->table_head(($add ? T('New Automation') : T('Edit Automation')));
        
-       $admin->row_input(T('Name'), 'name', $action->objdata['name']);
-       $admin->row_textarea(T('Description'), 'description', $action->objdata['description']);
-       $admin->row_textarea(T('Add Comment'), 'comment', $action->objdata['comment']);
+       $admin->row_input(T('Name'), 'name', $action->record['name']);
+       $admin->row_textarea(T('Description'), 'description', $action->record['description']);
+       $admin->row_textarea(T('Add Comment'), 'comment', $action->record['comment']);
        
        $admin->row_span(T('Field Changes'), 'thead', 'center');
                
        // -------------------------------------------------------------------
        // built-in fields      
-       construct_datastore_select('severity', 'severity', 'severityid', $action->objdata['fields']['builtin']['severity'], true, true);
+       construct_datastore_select('severity', 'severity', 'severityid', $action->record['fields']['builtin']['severity'], true, true);
        $admin->row_list(T('Severity'), 'fields[severity]');
        
-       construct_datastore_select('priority', 'priority', 'priorityid', $action->objdata['fields']['builtin']['priority'], true, true);
+       construct_datastore_select('priority', 'priority', 'priorityid', $action->record['fields']['builtin']['priority'], true, true);
        $admin->row_list(T('Priority'), 'fields[priority]');
        
-       construct_datastore_select('status', 'status', 'statusid', $action->objdata['fields']['builtin']['status'], true, true);
+       construct_datastore_select('status', 'status', 'statusid', $action->record['fields']['builtin']['status'], true, true);
        $admin->row_list(T('Status'), 'fields[status]');
        
-       construct_datastore_select('resolution', 'resolution', 'resolutionid', $action->objdata['fields']['builtin']['resolution'], true, true);
+       construct_datastore_select('resolution', 'resolution', 'resolutionid', $action->record['fields']['builtin']['resolution'], true, true);
        $admin->row_list(T('Resolution'), 'fields[resolution]');
        
        $admin->row_span('', 'tcat', 'center');
@@ -175,24 +175,24 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit')
                switch ($field['type'])
                {
                        case 'input_text':
-                               $admin->row_input($field['name'], "fields[custom][$field[fieldid]]", $action->objdata['fields']['custom']["$field[fieldid]"]);
+                               $admin->row_input($field['name'], "fields[custom][$field[fieldid]]", $action->record['fields']['custom']["$field[fieldid]"]);
                        break;
                        
                        case 'input_checkbox':
-                               $admin->list_item('', -1, (!$action->objdata['fields']['custom']["$field[fieldid]"] OR $action->objdata['fields']['custom']["$field[fieldid]"] == -1));
-                               $admin->list_item(T('Checked'), 1, ($action->objdata['fields']['custom']["$field[fieldid]"] == 1));
-                               $admin->list_item(T('Un-Checked'), 0, (isset($action->objdata['fields']['custom']["$field[fieldid]"]) AND $action->objdata['fields']['custom']["$field[fieldid]"] == 0));
+                               $admin->list_item('', -1, (!$action->record['fields']['custom']["$field[fieldid]"] OR $action->record['fields']['custom']["$field[fieldid]"] == -1));
+                               $admin->list_item(T('Checked'), 1, ($action->record['fields']['custom']["$field[fieldid]"] == 1));
+                               $admin->list_item(T('Un-Checked'), 0, (isset($action->record['fields']['custom']["$field[fieldid]"]) AND $action->record['fields']['custom']["$field[fieldid]"] == 0));
                                $admin->row_list($field['name'], "fields[custom][$field[fieldid]]");
                        break;
                        
                        case 'select_single':
                                $selectopts = unserialize($field['selects']);
                                
-                               $admin->list_item('', -1, (!isset($action->objdata['fields']['custom']["$field[fieldid]"]) OR $action->objdata['fields']['custom']["$field[fieldid]"] == -1));
+                               $admin->list_item('', -1, (!isset($action->record['fields']['custom']["$field[fieldid]"]) OR $action->record['fields']['custom']["$field[fieldid]"] == -1));
                                
                                foreach ($selectopts AS $id => $select)
                                {
-                                       $admin->list_item(stripslashes($select), $id, (isset($action->objdata['fields']['custom']["$field[fieldid]"]) AND $action->objdata['fields']['custom']["$field[fieldid]"] == $id));
+                                       $admin->list_item(stripslashes($select), $id, (isset($action->record['fields']['custom']["$field[fieldid]"]) AND $action->record['fields']['custom']["$field[fieldid]"] == $id));
                                }
                                $admin->row_list($field['name'], "fields[custom][$field[fieldid]]");
                        break;

diff --git a/admin/field.php b/admin/field.php
index b07b033693531a960f03504e4f1229b329cf2c4b..2d5f8f34b4ad37d3ffde7a6327627f62abe572ef 100644 (file)
--- a/admin/field.php
+++ b/admin/field.php
@@ -78,7 +78,7 @@ if ($_REQUEST['do'] == 'update')
                
                $edit = true;
                $add = false;
-               $type = $field->objdata['type'];
+               $type = $field->record['type'];
        }
        else
        {
@@ -183,12 +183,12 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit')
                $field->set_condition();
                $field->fetch();
                
-               $admin->form_hidden_field('fieldid', $field->objdata['fieldid']);
+               $admin->form_hidden_field('fieldid', $field->record['fieldid']);
        }
        
        if (!$typeselect)
        {
-               $type = (($add) ? $input->in['type'] : $field->objdata['type']);
+               $type = (($add) ? $input->in['type'] : $field->record['type']);
        }
        
        // show type selector
@@ -211,10 +211,10 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit')
                // global fields
                $admin->row_span(T('Global Fields'), 'thead', 'center');
                $admin->row_text(T('Field Type'), FieldAPI::field_types($type));
-               $admin->row_input(T('Display Name'), 'name', $field->objdata['name']);
-               $admin->row_textarea(T('Description'), 'description', $field->objdata['description']);
-               $admin->row_yesno(T('Required'), 'required', $field->objdata['required']);
-               $admin->row_yesno(T('Can Be Searched'), 'cansearch', ((isset($field->objdata['cansearch'])) ? $field->objdata['cansearch'] : true));
+               $admin->row_input(T('Display Name'), 'name', $field->record['name']);
+               $admin->row_textarea(T('Description'), 'description', $field->record['description']);
+               $admin->row_yesno(T('Required'), 'required', $field->record['required']);
+               $admin->row_yesno(T('Can Be Searched'), 'cansearch', ((isset($field->record['cansearch'])) ? $field->record['cansearch'] : true));
                
                // type-specific fields
                $admin->row_span(T('Type-Specific Fields'), 'thead', 'center');
@@ -222,18 +222,18 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit')
                switch ($type)
                {
                        case 'input_text':
-                               $admin->row_input(T('Default Value'), 'defaultvalue', $field->objdata['defaultvalue']);
-                               $admin->row_input(T('Regular Expression Match'), 'regexmatch', $field->objdata['regexmatch']);
-                               $admin->row_input(T('Maximum Length'), 'maxlength', $field->objdata['maxlength'], 2, 10);
+                               $admin->row_input(T('Default Value'), 'defaultvalue', $field->record['defaultvalue']);
+                               $admin->row_input(T('Regular Expression Match'), 'regexmatch', $field->record['regexmatch']);
+                               $admin->row_input(T('Maximum Length'), 'maxlength', $field->record['maxlength'], 2, 10);
                        break;
                        
                        case 'input_checkbox':
-                               $admin->row_yesno(T('Checked By Default'), 'defaultvalue', $field->objdata['defaultvalue']);
+                               $admin->row_yesno(T('Checked By Default'), 'defaultvalue', $field->record['defaultvalue']);
                        break;
                        
                        case 'select_single':
-                               $admin->row_textarea(T('Selection Values'), 'selects', stripslashes(implode("\n", (array)unserialize($field->objdata['selects']))));
-                               $admin->row_yesno(T('Make the First Option Default'), 'usedefault', $field->objdata['usedefault']);
+                               $admin->row_textarea(T('Selection Values'), 'selects', stripslashes(implode("\n", (array)unserialize($field->record['selects']))));
+                               $admin->row_yesno(T('Make the First Option Default'), 'usedefault', $field->record['usedefault']);
                        break;
                }
                
@@ -245,7 +245,7 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit')
                
                if ($edit)
                {
-                       $perms = $db->query("SELECT usergroupid, mask FROM " . TABLE_PREFIX . "bugfieldpermission WHERE fieldid = " . $field->objdata['fieldid']);
+                       $perms = $db->query("SELECT usergroupid, mask FROM " . TABLE_PREFIX . "bugfieldpermission WHERE fieldid = " . $field->record['fieldid']);
                        foreach ($perms as $perm)
                        {
                                $permissions["$perm[usergroupid]"] = $perm['mask'];

diff --git a/admin/language.php b/admin/language.php
index 9967cec2df24d2783fad0e035be5b73c6b84612e..412e269a7835c3927a376b0dd2450322ccf554c9 100644 (file)
--- a/admin/language.php
+++ b/admin/language.php
@@ -131,7 +131,7 @@ if ($_REQUEST['do'] == 'edit')
        $languageapi->set_condition();
        $languageapi->fetch();
        
-       $language =& $languageapi->objdata;
+       $language =& $languageapi->record;
        
        $admin->page_start(T('Edit Language'));
        

diff --git a/admin/priority.php b/admin/priority.php
index 5883b2f29002ef1662f96e659d8cb7f3d2fa0e82..c4ca270ff68095c5a7f9ad71cd38b572768216cb 100755 (executable)
--- a/admin/priority.php
+++ b/admin/priority.php
@@ -121,11 +121,11 @@ if ($_REQUEST['do'] == 'edit')
        $admin->page_start(T('Edit Priority'));
        
        $admin->form_start('priority.php', 'update');
-       $admin->form_hidden_field('priorityid', $priority->objdata['priorityid']);
+       $admin->form_hidden_field('priorityid', $priority->record['priorityid']);
        $admin->table_start();
-       $admin->table_head(sprintf(T('Edit Priority `%1$s` (id: %2$s)'), $priority->objdata['priority'], $priority->objdata['priorityid']));
-       $admin->row_input(T('Priority Title<div><dfn>The title of this priority flag (eg: `Slated for Development` or `Address Now`)</dfn></div>'), 'priority', $priority->objdata['priority']);
-       $admin->row_input(T('Display Order<div><dfn>The order in which the priorities are displayed. The higher the number, the lower down in the list it is.</dfn></div>'), 'displayorder', $priority->objdata['displayorder']);
+       $admin->table_head(sprintf(T('Edit Priority `%1$s` (id: %2$s)'), $priority->record['priority'], $priority->record['priorityid']));
+       $admin->row_input(T('Priority Title<div><dfn>The title of this priority flag (eg: `Slated for Development` or `Address Now`)</dfn></div>'), 'priority', $priority->record['priority']);
+       $admin->row_input(T('Display Order<div><dfn>The order in which the priorities are displayed. The higher the number, the lower down in the list it is.</dfn></div>'), 'displayorder', $priority->record['displayorder']);
        $admin->row_submit();
        $admin->table_end();
        $admin->form_end();

diff --git a/admin/resolution.php b/admin/resolution.php
index 0c7fe3fc99af013659a2500b1e981821a76b534a..1ba5ee58d88924aef3229074e18398f7f5d64133 100755 (executable)
--- a/admin/resolution.php
+++ b/admin/resolution.php
@@ -121,11 +121,11 @@ if ($_REQUEST['do'] == 'edit')
        $admin->page_start(T('Edit Resolution'));
        
        $admin->form_start('resolution.php', 'update');
-       $admin->form_hidden_field('resolutionid', $resolution->objdata['resolutionid']);
+       $admin->form_hidden_field('resolutionid', $resolution->record['resolutionid']);
        $admin->table_start();
-       $admin->table_head(sprintf(T('Edit Resolution - %1$s (id: %2$s)'), $resolution->objdata['resolution'], $resolution->objdata['resolutionid']));
-       $admin->row_input(T('Resolution Title<div><dfn>The title of this resolution flag (eg: `Fixed` or `Bogus`)</dfn></div>'), 'resolution', $resolution->objdata['resolution']);
-       $admin->row_input(T('Display Order<div><dfn>The order in which the resolutions are displayed. The higher the number, the lower down in the list it is.</dfn></div>'), 'displayorder', $resolution->objdata['displayorder']);
+       $admin->table_head(sprintf(T('Edit Resolution - %1$s (id: %2$s)'), $resolution->record['resolution'], $resolution->record['resolutionid']));
+       $admin->row_input(T('Resolution Title<div><dfn>The title of this resolution flag (eg: `Fixed` or `Bogus`)</dfn></div>'), 'resolution', $resolution->record['resolution']);
+       $admin->row_input(T('Display Order<div><dfn>The order in which the resolutions are displayed. The higher the number, the lower down in the list it is.</dfn></div>'), 'displayorder', $resolution->record['displayorder']);
        $admin->row_submit();
        $admin->table_end();
        $admin->form_end();

diff --git a/admin/severity.php b/admin/severity.php
index 290b0789b9e547944376ca8a315728daefc62b2e..6e80b3619d281d9c8178e2ec2cd056a91a289c1c 100755 (executable)
--- a/admin/severity.php
+++ b/admin/severity.php
@@ -121,11 +121,11 @@ if ($_REQUEST['do'] == 'edit')
        $admin->page_start(T('Edit Severity'));
        
        $admin->form_start('severity.php', 'update');
-       $admin->form_hidden_field('severityid', $severity->objdata['severityid']);
+       $admin->form_hidden_field('severityid', $severity->record['severityid']);
        $admin->table_start();
-       $admin->table_head(sprintf(T('Edit Severity - %1$s (id: %2$s)'), $severity->objdata['severity'], $severity->objdata['severityid']));
-       $admin->row_input(T('Severity Title<div><dfn>The title of this severity flag (eg: `Major` or `Critical`)</dfn></div>'), 'severity', $severity->objdata['severity']);
-       $admin->row_input(T('Display Order<div><dfn>The order in which the severities are displayed. The higher the number, the lower down in the list it is.</dfn></div>'), 'displayorder', $severity->objdata['displayorder']);
+       $admin->table_head(sprintf(T('Edit Severity - %1$s (id: %2$s)'), $severity->record['severity'], $severity->record['severityid']));
+       $admin->row_input(T('Severity Title<div><dfn>The title of this severity flag (eg: `Major` or `Critical`)</dfn></div>'), 'severity', $severity->record['severity']);
+       $admin->row_input(T('Display Order<div><dfn>The order in which the severities are displayed. The higher the number, the lower down in the list it is.</dfn></div>'), 'displayorder', $severity->record['displayorder']);
        $admin->row_submit();
        $admin->table_end();
        $admin->form_end();

diff --git a/admin/status.php b/admin/status.php
index 5a81e07b27a086b33fc2b49b8f7d9a4f53b1c2df..77056e22bf7e4faf87a1d91cb8ce156a1c6177bc 100755 (executable)
--- a/admin/status.php
+++ b/admin/status.php
@@ -124,12 +124,12 @@ if ($_REQUEST['do'] == 'edit')
        $admin->page_start(T('Edit Status'));
        
        $admin->form_start('status.php', 'update');
-       $admin->form_hidden_field('statusid', $status->objdata['statusid']);
+       $admin->form_hidden_field('statusid', $status->record['statusid']);
        $admin->table_start();
-       $admin->table_head(sprintf(T('Edit Status - %1$s (id: %2$s)'), $status->objdata['status'], $status->objdata['statusid']));
-       $admin->row_input(T('Status Title<div><dfn>The title of this status flag (eg: `Confirmed` or `Closed (Fixed)`)</dfn></div>'), 'status', $status->objdata['status']);
-       $admin->row_input(T('Display Order<div><dfn>The order in which the statuses ar displayed.</dfn></div>'), 'displayorder', $status->objdata['displayorder']);
-       $admin->row_input(T('Status Color<div><dfn>The color of the status. This will be displayed on bug listings page to make viewing easier. Note: you must enter the # sign if you are using HEX values.</dfn></div>'), 'color', $status->objdata['color']);
+       $admin->table_head(sprintf(T('Edit Status - %1$s (id: %2$s)'), $status->record['status'], $status->record['statusid']));
+       $admin->row_input(T('Status Title<div><dfn>The title of this status flag (eg: `Confirmed` or `Closed (Fixed)`)</dfn></div>'), 'status', $status->record['status']);
+       $admin->row_input(T('Display Order<div><dfn>The order in which the statuses ar displayed.</dfn></div>'), 'displayorder', $status->record['displayorder']);
+       $admin->row_input(T('Status Color<div><dfn>The color of the status. This will be displayed on bug listings page to make viewing easier. Note: you must enter the # sign if you are using HEX values.</dfn></div>'), 'color', $status->record['color']);
        $admin->row_submit();
        $admin->table_end();
        $admin->form_end();

diff --git a/admin/user.php b/admin/user.php
index 5e82fec0e1ab754d4275d2e336abd14f401fd0ea..f715a95ae4cfbffff8acb298059a9539cae9fb2a 100644 (file)
--- a/admin/user.php
+++ b/admin/user.php
@@ -153,7 +153,7 @@ if ($_POST['do'] == 'update')
                }
        }
        
-       $admin->redirect('user.php?do=edit&userid=' . $user->objdata['userid']);
+       $admin->redirect('user.php?do=edit&userid=' . $user->record['userid']);
 }
 
 // ###################################################################
@@ -185,27 +185,27 @@ if ($_REQUEST['do'] == 'edit' OR $_REQUEST['do'] == 'add')
        
        if ($edit)
        {
-               $admin->form_hidden_field('userid', $user->objdata['userid']);
+               $admin->form_hidden_field('userid', $user->record['userid']);
        }
        
        $admin->table_start();
        
-       $admin->table_head(($add ? T('Add User') : sprintf(T('Edit User (userid: %1$s)'), $user->objdata['userid'])));
+       $admin->table_head(($add ? T('Add User') : sprintf(T('Edit User (userid: %1$s)'), $user->record['userid'])));
        
-       $admin->row_input(T('Display Name'), 'displayname', $user->objdata['displayname']);
-       $admin->row_input(T('Email'), 'email', $user->objdata['email']);
+       $admin->row_input(T('Display Name'), 'displayname', $user->record['displayname']);
+       $admin->row_input(T('Email'), 'email', $user->record['email']);
        $admin->row_input(($add ? T('Password') : T('Password (Leave blank for no change)')), 'password');
        
        foreach (bugdar::$datastore['usergroup'] AS $group)
        {
-               $admin->list_item($group['title'], $group['usergroupid'], ($user->objdata['usergroupid'] == $group['usergroupid']));
+               $admin->list_item($group['title'], $group['usergroupid'], ($user->record['usergroupid'] == $group['usergroupid']));
        }
        $admin->row_list(T('Primary Usergroup'), 'usergroupid');
        
-       $ids = explode(',', $user->objdata['groupids']);
+       $ids = explode(',', $user->record['groupids']);
        foreach (bugdar::$datastore['usergroup'] AS $id => $group)
        {
-               if ($id == $user->objdata['usergroupid'])
+               if ($id == $user->record['usergroupid'])
                {
                        continue;
                }
@@ -213,25 +213,25 @@ if ($_REQUEST['do'] == 'edit' OR $_REQUEST['do'] == 'add')
        }
        $admin->row_checkbox(T('Secondary Usergroups'), 'groupids');
        
-       $admin->row_yesno(T('Show Email Publicly'), 'showemail', $user->objdata['showemail']);
-       $admin->row_yesno(T('Show Status Colors on Bug Listings'), 'showcolors', $user->objdata['showcolors']);
+       $admin->row_yesno(T('Show Email Publicly'), 'showemail', $user->record['showemail']);
+       $admin->row_yesno(T('Show Status Colors on Bug Listings'), 'showcolors', $user->record['showcolors']);
        
        foreach (bugdar::$datastore['language'] AS $language)
        {
-               $admin->list_item($language['title'], $language['languageid'], ($user->objdata['languageid'] == $language['languageid']));
+               $admin->list_item($language['title'], $language['languageid'], ($user->record['languageid'] == $language['languageid']));
        }
        $admin->row_list(T('Language'), 'languageid');
        
        foreach ($datef->fetch_timezone_list() AS $value => $string)
        {
-               $admin->list_item($string, $value, ($user->objdata['timezone'] == $value));
+               $admin->list_item($string, $value, ($user->record['timezone'] == $value));
        }
        $admin->row_list(T('Timezone'), 'timezone');
        
-       $admin->row_yesno(T('Observe Daylight Savings Time (DST)'), 'usedst', $user->objdata['usedst']);
-       $admin->row_text(T('Hidden Statuses on Bug Listing'), construct_option_select('hidestatuses', bugdar::$datastore['status'], $user->objdata['hidestatuses'], 'statusid', 'status', 0, true));
-       $admin->row_text(T('Default Sort Order Column'), construct_option_select('defaultsortkey', ListSorter::fetch_by_text(false), $user->objdata['defaultsortkey']));
-       $admin->row_text(T('Default Sort Order Direction'), construct_option_select('defaultsortas', ListSorter::fetch_as_text(false), $user->objdata['defaultsortas']));       
+       $admin->row_yesno(T('Observe Daylight Savings Time (DST)'), 'usedst', $user->record['usedst']);
+       $admin->row_text(T('Hidden Statuses on Bug Listing'), construct_option_select('hidestatuses', bugdar::$datastore['status'], $user->record['hidestatuses'], 'statusid', 'status', 0, true));
+       $admin->row_text(T('Default Sort Order Column'), construct_option_select('defaultsortkey', ListSorter::fetch_by_text(false), $user->record['defaultsortkey']));
+       $admin->row_text(T('Default Sort Order Direction'), construct_option_select('defaultsortas', ListSorter::fetch_as_text(false), $user->record['defaultsortas']));        
        
        $admin->table_end();
        
@@ -239,9 +239,9 @@ if ($_REQUEST['do'] == 'edit' OR $_REQUEST['do'] == 'add')
        $admin->table_start(false);
        $admin->table_head(T('Email Options'), 6);
        
-       if ($user->objdata['userid'])
+       if ($user->record['userid'])
        {
-               $options = $db->query("SELECT * FROM " . TABLE_PREFIX . "useremail WHERE userid = " . $user->objdata['userid']);
+               $options = $db->query("SELECT * FROM " . TABLE_PREFIX . "useremail WHERE userid = " . $user->record['userid']);
                foreach ($options as $opt)
                {
                        foreach ($bugsys->emailoptions['notifications'] AS $name => $notif)

diff --git a/admin/usergroup.php b/admin/usergroup.php
index 6818c92c5934e84c8d29fd3a55c8f3ee813925b4..70b5242f723b612d12ae5ebb7b1b686f2ba2bebd 100755 (executable)
--- a/admin/usergroup.php
+++ b/admin/usergroup.php
@@ -139,11 +139,11 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit' OR $_REQUEST['do'] ==
                
                if ($clone)
                {
-                       $admin->form_hidden_field('cloneid', $usergroup->objdata['usergroupid']);
+                       $admin->form_hidden_field('cloneid', $usergroup->record['usergroupid']);
                }
                else
                {
-                       $admin->form_hidden_field('usergroupid', $usergroup->objdata['usergroupid']);
+                       $admin->form_hidden_field('usergroupid', $usergroup->record['usergroupid']);
                }
        }
        else
@@ -154,8 +154,8 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit' OR $_REQUEST['do'] ==
        // Details
        $admin->table_start();
        $admin->table_head(T('Usergroup Details'));
-       $admin->row_input(T('Usergroup Title'), 'title', (($add AND $clone) ? '' : $bugsys->sanitize($usergroup->objdata['title'])));
-       $admin->row_input(T('Display Title<div><dfn>This is the title that others will be able to see when comments are posted.</dfn></div>'), 'displaytitle', (($add AND $clone) ? '' : $bugsys->sanitize($usergroup->objdata['displaytitle'])));
+       $admin->row_input(T('Usergroup Title'), 'title', (($add AND $clone) ? '' : $bugsys->sanitize($usergroup->record['title'])));
+       $admin->row_input(T('Display Title<div><dfn>This is the title that others will be able to see when comments are posted.</dfn></div>'), 'displaytitle', (($add AND $clone) ? '' : $bugsys->sanitize($usergroup->record['displaytitle'])));
        $admin->table_end();
        
        // Permission
@@ -168,7 +168,7 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit' OR $_REQUEST['do'] ==
                $admin->row_span($group, 'thead', 'center');
                foreach ($settings AS $setting => $name)
                {
-                       $admin->row_yesno($name, "perm[$setting]", ($usergroup->objdata['permissions'] & $bugsys->permissions["$setting"]));
+                       $admin->row_yesno($name, "perm[$setting]", ($usergroup->record['permissions'] & $bugsys->permissions["$setting"]));
                }
        }
        
@@ -180,7 +180,7 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit' OR $_REQUEST['do'] ==
        
        if ($edit OR $clone)
        {
-               $perms = $db->query("SELECT fieldid, mask FROM " . TABLE_PREFIX . "bugfieldpermission WHERE usergroupid = " . $usergroup->objdata['usergroupid']);
+               $perms = $db->query("SELECT fieldid, mask FROM " . TABLE_PREFIX . "bugfieldpermission WHERE usergroupid = " . $usergroup->record['usergroupid']);
                foreach ($perms as $perm)
                {
                        $permissions["$perm[fieldid]"] = $perm['mask'];

diff --git a/attachment.php b/attachment.php
index 97c2bcc6de6cfb0d2dc4d403f5a87c0d2e1cc00d..2ccac17aa2966a53c0bbd01f5f95668226455e4b 100755 (executable)
--- a/attachment.php
+++ b/attachment.php
@@ -221,7 +221,7 @@ if ($_POST['do'] == 'update')
                
                $attachapi->fetch();
                
-               $log->add_data(true, $attachapi->objdata, array('attachment'), true, 'attachment');
+               $log->add_data(true, $attachapi->record, array('attachment'), true, 'attachment');
                
                $attachapi->set('description',  $input->in['description']);
                $attachapi->set('obsolete',             $input->in['obsolete']);

diff --git a/editcomment.php b/editcomment.php
index 84808337ca0f328bd3755924d82b7c2aace69005..ed3a9e450491c9bbb5ddeba7a7e8c603cdadfb25 100644 (file)
--- a/editcomment.php
+++ b/editcomment.php
@@ -38,7 +38,7 @@ $commentapi->set('commentid', $input->in['commentid']);
 $commentapi->set_condition();
 $commentapi->fetch();
 
-$comment =& $commentapi->objdata;
+$comment =& $commentapi->record;
 
 $bug = $db->queryFirst("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = $comment[bugid]");
 
@@ -147,7 +147,7 @@ if ($_POST['do'] == 'update')
                $log->set_bugid($bug['bugid']);
                $log->set_commentid($comment['commentid']);
                
-               $log->add_data(true, $commentapi->objdata, array('comment', 'hidden'), false, 'comment');
+               $log->add_data(true, $commentapi->record, array('comment', 'hidden'), false, 'comment');
                $log->add_data(false, $commentapi->values, array('comment', 'hidden'), false, 'comment');
                
                $lastgood = $db->queryFirst("
@@ -195,7 +195,7 @@ if ($_REQUEST['do'] == 'edit')
                $commenter->set('userid', $comment['userid']);
                $commenter->set_condition();
                $commenter->fetch();
-               $commenter = $commenter->objdata;
+               $commenter = $commenter->record;
        }
        $comment['postby'] = construct_user_display($commenter);
        $comment['comment'] = $bugsys->sanitize($comment['comment']);

diff --git a/editreport.php b/editreport.php
index 4f9b38f266d8ad26766ca1a216ae60cc5d577872..9c55f87921f5e7c324815ebf3e93a149586d315b 100644 (file)
--- a/editreport.php
+++ b/editreport.php
@@ -98,7 +98,7 @@ if ($_POST['do'] == 'update')
                $message->errorPermission();
        }
        
-       $log->add_data(true, $bugapi->objdata, $log->getCommonFields(), true);
+       $log->add_data(true, $bugapi->record, $log->getCommonFields(), true);
        
        // -------------------------------------------------------------------
        // handle automations
@@ -152,7 +152,7 @@ if ($_POST['do'] == 'update')
                $comment->insert();
                
                // we redefine the bug data later, but it needs to be here in order to generate the user list
-               $notif->set_bug_data($bugapi->objdata);
+               $notif->set_bug_data($bugapi->record);
                $notif->send_new_comment_notice($comment->values);
                
                $bugapi->set('lastposttime',                    $comment->values['dateline']);
@@ -205,7 +205,7 @@ if ($_POST['do'] == 'update')
        // -------------------------------------------------------------------
        // handle logging and perform updates
        
-       $notif->set_bug_data($bugapi->objdata, array_merge($bugapi->objdata, $bugapi->values));
+       $notif->set_bug_data($bugapi->record, array_merge($bugapi->record, $bugapi->values));
        $log->add_data(false, $bugapi->values, $log->getCommonFields(), true);
        
        if (!$message->hasErrors())

diff --git a/includes/api_field.php b/includes/api_field.php
index cb303692e323eccebcf46cbb3db376c2b9aaff82..a58dc1da9783e0d5b92b74fb610f5da8e5334dfe 100644 (file)
--- a/includes/api_field.php
+++ b/includes/api_field.php
@@ -159,7 +159,7 @@ class FieldAPI extends API
        function verify_selects()
        {
                static $serialized;
-               if ($this->values['type'] == 'select_single' OR $this->objdata['type'] == 'select_single')
+               if ($this->values['type'] == 'select_single' OR $this->record['type'] == 'select_single')
                {
                        $this->registry->debug('it works');
                        // can't use explode() here because explode() returns !empty() when splitting an empty string

diff --git a/includes/api_user.php b/includes/api_user.php
index e9c5670eb730e8e7d56f3741bc07eeabdb0ebddb..a78c07e2d326ce03c58137af6d9a03892435eec7 100644 (file)
--- a/includes/api_user.php
+++ b/includes/api_user.php
@@ -230,12 +230,12 @@ class UserAPI extends BSApi
                
                if ($this->values['password'] == '')
                {
-                       $this->set('password', $this->objdata['password']);
+                       $this->set('password', $this->record['password']);
                }
                else
                {
                        $this->registry->debug("updating password = true");
-                       $this->set('password', md5(md5($this->values['password']) . md5($this->objdata['salt'])));
+                       $this->set('password', md5(md5($this->values['password']) . md5($this->record['salt'])));
                }
        }
        

diff --git a/includes/auth/auth.php b/includes/auth/auth.php
index b4d3fbc57291fc44429bc4599f1c838e75b07fa1..c1bffe014148731a21b2192413c3a5a37d4b4d81 100644 (file)
--- a/includes/auth/auth.php
+++ b/includes/auth/auth.php
@@ -263,7 +263,7 @@ class Authentication
                        $user->update();
                        $user->fetch();
                        
-                       return $user->objdata;
+                       return $user->record;
                }
                else
                {

diff --git a/includes/class_notification.php b/includes/class_notification.php
index 0118906b4787b5b52c3fed81abd9ea8d2f71575d..5d71cea740a48ba0e6970fa872462b6e661d8bc5 100644 (file)
--- a/includes/class_notification.php
+++ b/includes/class_notification.php
@@ -201,7 +201,7 @@ class NotificationCenter
        // ###################################################################
        /**
        * Sends the appropriate emails for changes to bugs. This function
-       * works a lot like the Logging class by taking BugAPI->objdata and
+       * works a lot like the Logging class by taking BugAPI->record and
        * BugAPI->values and then comparing the two arries and sending emails
        * with the differences.
        *

diff --git a/locale/en_US/emails/passwordreset.xml.tpl b/locale/en_US/emails/passwordreset.xml.tpl
index 988f40a96d6d3c617c3a005e477c41b783858eda..8d43d063af7b18f1472fe1becf9f8d00a869adf2 100644 (file)
--- a/locale/en_US/emails/passwordreset.xml.tpl
+++ b/locale/en_US/emails/passwordreset.xml.tpl
@@ -1,6 +1,6 @@
 <email>
        <subject>{bugdar::$options['trackertitle']} Password Reset</subject>
-       <bodyText>Hi {$user->objdata['displayname']},
+       <bodyText>Hi {$user->record['displayname']},
 
 You requested this lost password email at the {bugdar::$options['trackertitle']} bug tracker. To reset your password, simply click the link below (or paste it into your browser window exactly) and enter a new password.
 

diff --git a/login.php b/login.php
index 1e77a3c6a950b2289b0ea30a3e55a22f692d2f04..0bdb0c2d431e6f297e5f91db56ed4f74200fdcb3 100755 (executable)
--- a/login.php
+++ b/login.php
@@ -117,17 +117,17 @@ if ($_POST['do'] == 'sendpw')
        else
        {
                $activator = BSFunctions::random(25);
-               $db->query("INSERT INTO " . TABLE_PREFIX . "passwordreset (activatorid, dateline, userid) VALUES ('" . $activator . "', " . TIMENOW . ", " . $user->objdata['userid'] . ")");
+               $db->query("INSERT INTO " . TABLE_PREFIX . "passwordreset (activatorid, dateline, userid) VALUES ('" . $activator . "', " . TIMENOW . ", " . $user->record['userid'] . ")");
                
-               eval('$email = "' . $template->fetch(FetchEmailPath('passwordreset.xml', bugdar::$datastore['language'][$user->objdata['languageid']]['langcode'])) . '";');
+               eval('$email = "' . $template->fetch(FetchEmailPath('passwordreset.xml', bugdar::$datastore['language'][$user->record['languageid']]['langcode'])) . '";');
                $email = $bugsys->xml->parse($email);
                
                $mail->setSubject($email['email']['subject']['value']);
                $mail->setBodyText($email['email']['bodyText']['value']);
                
-               $mail->send($user->objdata['email'], $user->objdata['displayname']);
+               $mail->send($user->record['email'], $user->record['displayname']);
                
-               $message->message(sprintf(T('An email has been dispatched to %1$s that contains instructions on how to reset your password.'), $user->objdata['email']));
+               $message->message(sprintf(T('An email has been dispatched to %1$s that contains instructions on how to reset your password.'), $user->record['email']));
        }
 }
 

diff --git a/newreport.php b/newreport.php
index 5a2e7afa478b31a4faa4f9d46d580f0c3448bbbc..a570a94007f0abc5910bddc029f6ed51f85d7f57 100755 (executable)
--- a/newreport.php
+++ b/newreport.php
@@ -121,7 +121,7 @@ if ($_POST['do'] == 'insert')
                $bug->set('hiddenlastpostbyname',       bugdar::$userinfo['displayname']);
                $bug->update();
                
-               $notif->set_bug_data($bug->objdata);
+               $notif->set_bug_data($bug->record);
                
                $notif->finalize();