[Phpgroupware-cvs] notes/class.base.php, 1.1.2.16

[nomail]

Update of /notes
Modified Files:
        Branch: proposal-branch
          class.base.php

date: 2004/07/06 07:22:50;  author: jengo;  state: Exp;  lines: +1 -14

Log Message:
Initial work to ACL, more info is in the wiki journal
=====================================================================
Index: notes/class.base.php
diff -u notes/class.base.php:1.1.2.15 notes/class.base.php:1.1.2.16
--- notes/class.base.php:1.1.2.15       Mon Jul  5 19:03:04 2004
+++ notes/class.base.php        Tue Jul  6 07:22:50 2004
@@ -39,7 +39,6 @@
                (
                        'form_submit'       => array('type' => 'enum',   
'default' => array('false','true'),     'desc' => 'form_submit'),
                        'category'          => array('type' => 'number', 
'default' => 0,                         'desc' => 'Category ID number'),
-                       'access'            => array('type' => 'enum',   
'default' => array('private','public'), 'desc' => 'Access type'),
                        'content'           => array('type' => 'any',    
'default' => NOTSET,                    'desc' => 'Note content'),
                        'dm_type'           => array('type' => 'enum',   
'default' => array('N','D'),            'desc' => 'Datamine type'),
                        'datamine_location' => array('type' => 'any',    
'default' => NOTSET,                    'desc' => 'Datamine location')
@@ -67,7 +66,6 @@
                        'form_submit' => array('type' => 'enum',   'default' => 
array('false','true'),     'desc' => 'form_submit'),
                        'note_id'     => array('type' => 'number', 'default' => 
REQUIRED,                  'desc' => 'Note ID number'),
                        'category'    => array('type' => 'number', 'default' => 
0,                         'desc' => 'Category ID number'),
-                       'access'      => array('type' => 'enum',   'default' => 
array('private','public'), 'desc' => 'Access type'),
                        'content'     => array('type' => 'any',    'default' => 
NOTSET,                    'desc' => 'Note content')
                )
        );
@@ -136,7 +134,6 @@
                                'dm_type'       => $db->fields['note_dm_type'],
                                'owner'         => 
$GLOBALS['phpgw']->accounts->cross_reference((int)$db->fields['note_owner']),
                                'owner_id'      => $db->fields['note_owner'],
-                               'access'        => $db->fields['note_access'],
                                'category'      => 
$this->_temp_cat($db->fields['note_category']),
                                'category_id'   => $db->fields['note_category'],
                                'content'       => $db->fields['note_content'],
@@ -212,7 +209,6 @@
                                $obj                    = 
createObject('api_history');
                                $obj->field_desc        = array
                                (
-                                       'access'   => lang('Access'),
                                        'category' => lang('Category'),
                                        'content'  => lang('Content')
                                );
@@ -230,7 +226,6 @@
                {
                        $args = new safe_args();
                        $args->set('form_submit',array('false','true'),'enum');
-                       $args->set('access',array('public','private'),'enum');
                        $args->set('dm_type',array('N','H','S'),'enum');
                        $args->set('datamine_location',NOTSET,'any');
                        $args->set('content',NOTSET,'any');
@@ -239,7 +234,6 @@
 
                        $result['note'] = array
                        (
-                               'access'            => $args['access'],
                                'content'           => $args['content'],
                                'category'          => $args['category'],
                                'dm_type'           => $args['dm_type'],
@@ -266,7 +260,6 @@
                                                (
                                                        note_id,
                                                        note_owner,
-                                                       note_access,
                                                        note_category,
                                                        note_content,
                                                        note_dm_type,
@@ -278,7 +271,6 @@
                                                (
                                                        $note_id,
                                                        '" . 
$GLOBALS['phpgw_data']['user']['id'] . "',
-                                                       '" . $args['access'] . 
"',
                                                        '" . $args['category'] 
. "',
                                                        '" . $args['content'] . 
"',
                                                        '" . $args['dm_type'] . 
"',
@@ -333,7 +325,6 @@
                        $args = new safe_args();
                        $args->set('form_submit',array('false','true'),'enum');
                        $args->set('note_id',REQUIRED,'number');
-                       $args->set('access',array('public','private'),'enum');
                        $args->set('content', NOTSET, 'any');
                        $args->set('category',0,'number');
                        $args = $args->get(func_get_args());
@@ -461,7 +452,6 @@
                        // args
                        $history_data = array
                        (
-                               'access'   => $_new_values['access'],
                                'category' => ($_new_values['category'] == '-' 
? '0' : $_new_values['category']),
                                'content'  => $_new_values['content']
                        );
@@ -469,7 +459,6 @@
                        // note_values
                        $old_values   = array
                        (
-                               'access'   => $_old_values['access'],
                                'category' => ($_old_values['category'] == '-' 
? '0' : $_old_values['category']),
                                'content'  => $_old_values['content']
                        );
@@ -482,7 +471,6 @@
                {
                        $args = new safe_args();
                        $args->set('id',REQUIRED,'number');
-                       $args->set('access',NOTSET,'string');
                        $args->set('content',NOTSET,'string');
                        $args->set('category',NOTSET,'number');
                        $args = $args->get(func_get_args());
@@ -493,7 +481,6 @@
                                                phpgw_notes
                                        SET
                                                note_content='" . 
$args['content'] . "',
-                                               note_access='" . 
$args['access'] . "',
                                                note_category='" . 
$args['category'] . "'
                                        WHERE
                                                note_id=" . $args['id']);