[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: notes/inc class.bo.inc.php,1.11,1.12 class.so.in
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: notes/inc class.bo.inc.php,1.11,1.12 class.so.inc.php,1.10,1.11 class.ui.inc.php,1.39,1.40 |
|
Date: |
Sun, 20 Oct 2002 18:00:54 -0400 |
Update of /cvsroot/phpgroupware/notes/inc
In directory subversions:/tmp/cvs-serv22007/inc
Modified Files:
class.bo.inc.php class.so.inc.php class.ui.inc.php
Log Message:
update
Index: class.bo.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/class.bo.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.bo.inc.php 12 Oct 2002 00:50:15 -0000 1.11
--- class.bo.inc.php 20 Oct 2002 22:00:52 -0000 1.12
***************
*** 155,158 ****
--- 155,160 ----
$data =
$GLOBALS['phpgw']->session->appsession('session_data','notes');
+ //_debug_array($data);
+
$this->start = $data['start'];
$this->query = $data['query'];
Index: class.so.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/class.so.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.so.inc.php 27 Sep 2002 02:26:02 -0000 1.10
--- class.so.inc.php 20 Oct 2002 22:00:52 -0000 1.11
***************
*** 101,105 ****
'access' =>
$this->db->f('note_access'),
'date' =>
$this->db->f('note_date'),
! 'cat' =>
(int)$this->db->f('note_category'),
'content' =>
stripslashes($this->db->f('note_content')),
'grants' => $ngrants
--- 101,105 ----
'access' =>
$this->db->f('note_access'),
'date' =>
$this->db->f('note_date'),
! 'cat_id' =>
(int)$this->db->f('note_category'),
'content' =>
stripslashes($this->db->f('note_content')),
'grants' => $ngrants
***************
*** 120,124 ****
$note['access'] =
$this->db->f('note_access');
$note['date'] =
$this->db->f('note_date');
! $note['cat'] =
(int)$this->db->f('note_category');
return $note;
--- 120,124 ----
$note['access'] =
$this->db->f('note_access');
$note['date'] =
$this->db->f('note_date');
! $note['cat_id'] =
(int)$this->db->f('note_category');
return $note;
***************
*** 132,136 ****
$this->db->query("INSERT INTO phpgw_notes
(note_owner,note_access,note_date,note_content,note_category) "
. "VALUES ('" . $this->account . "','" .
$note['access'] . "','" . time() . "','" . $note['content']
! . "','" . $note['cat'] .
"')",__LINE__,__FILE__);
return
$this->db->get_last_insert_id('phpgw_notes','note_id');
}
--- 132,136 ----
$this->db->query("INSERT INTO phpgw_notes
(note_owner,note_access,note_date,note_content,note_category) "
. "VALUES ('" . $this->account . "','" .
$note['access'] . "','" . time() . "','" . $note['content']
! . "','" . $note['cat_id'] .
"')",__LINE__,__FILE__);
return
$this->db->get_last_insert_id('phpgw_notes','note_id');
}
***************
*** 141,145 ****
$this->db->query("UPDATE phpgw_notes set
note_content='" . $note['content'] . "', note_date='" . time() . "',
note_category='"
! . $note['cat'] . "',
note_access='" . $note['access'] . "' WHERE note_id=" .
intval($note['note_id']),__LINE__,__FILE__);
}
--- 141,145 ----
$this->db->query("UPDATE phpgw_notes set
note_content='" . $note['content'] . "', note_date='" . time() . "',
note_category='"
! . $note['cat_id'] . "',
note_access='" . $note['access'] . "' WHERE note_id=" .
intval($note['note_id']),__LINE__,__FILE__);
}
Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/class.ui.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** class.ui.inc.php 6 Oct 2002 02:45:40 -0000 1.39
--- class.ui.inc.php 20 Oct 2002 22:00:52 -0000 1.40
***************
*** 231,235 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('list',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'cat_filter',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field',
--- 231,234 ----
***************
*** 300,307 ****
'function_msg'
=> lang('list notes'),
'lang_no_cat'
=> lang('no category'),
'cat_list'
=> $this->cats->formatted_xslt_list(array('selected' =>
$this->cat_id,'globals' => True)),
'select_action'
=> $GLOBALS['phpgw']->link('/index.php','menuaction=notes.ui.index'),
'filter_list'
=> $this->nextmatchs->xslt_filter(array('filter' => $this->filter,'yours' =>
'yes')),
- 'lang_cat_statustext' =>
lang('Select the category. To show all entries select NO CATEGORY'),
'lang_filter_statustext' =>
lang('Select the filter. To show all entries select SHOW ALL'),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
--- 299,307 ----
'function_msg'
=> lang('list notes'),
'lang_no_cat'
=> lang('no category'),
+ 'lang_cat_statustext' =>
lang('Select the category the notes belongs to. To do not use a category select
NO CATEGORY'),
+ 'select_name'
=> 'cat_id',
'cat_list'
=> $this->cats->formatted_xslt_list(array('selected' =>
$this->cat_id,'globals' => True)),
'select_action'
=> $GLOBALS['phpgw']->link('/index.php','menuaction=notes.ui.index'),
'filter_list'
=> $this->nextmatchs->xslt_filter(array('filter' => $this->filter,'yours' =>
'yes')),
'lang_filter_statustext' =>
lang('Select the filter. To show all entries select SHOW ALL'),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
***************
*** 332,337 ****
$this->display_app_header();
!
$GLOBALS['phpgw']->xslttpl->add_file(array('form',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'cat_select'));
if ($values['save'])
--- 332,336 ----
$this->display_app_header();
!
$GLOBALS['phpgw']->xslttpl->add_file(array('form',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
if ($values['save'])
***************
*** 354,380 ****
}
$data = array
(
! 'appname' =>
lang('notes'),
! 'function_msg' =>
$function_msg,
! 'form_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=notes.ui.edit¬e_id=' .
$note_id),
! 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=notes.ui.index'),
! 'lang_content' =>
lang('content'),
! 'lang_category' =>
lang('category'),
! 'lang_access' =>
lang('private'),
! 'lang_save' =>
lang('save'),
! 'lang_done' =>
lang('done'),
! 'value_content' =>
$note['content'],
! 'value_access' =>
$note['access'],
! 'value_cat' =>
$note['cat'],
! 'message' =>
$message,
! 'lang_no_cat' => lang('no
category'),
! 'lang_cat_statustext' => lang('Select the
category the notes belongs to. To do not use a category select NO CATEGORY'),
! 'lang_content_statustext' => lang('Enter
the content of the note'),
! 'lang_done_statustext' => lang('Back to the
list'),
! 'lang_save_statustext' => lang('Save the
note'),
'lang_access_off_statustext' => lang('The
note is public. If the note should be private, check this box'),
! 'lang_access_on_statustext' => lang('The
note is private. If the note should be public, uncheck this box'),
! 'cat_list' =>
$this->cats->formatted_xslt_list(array('selected' => $note['cat'],'globals' =>
True))
);
--- 353,385 ----
}
+ if ($note['cat_id'] > 0)
+ {
+ $this->cat_id = $note['cat_id'];
+ }
+
$data = array
(
! 'appname'
=> lang('notes'),
! 'function_msg'
=> $function_msg,
! 'form_action'
=> $GLOBALS['phpgw']->link('/index.php','menuaction=notes.ui.edit¬e_id=' .
$note_id),
! 'done_action'
=> $GLOBALS['phpgw']->link('/index.php','menuaction=notes.ui.index'),
! 'lang_content'
=> lang('content'),
! 'lang_category'
=> lang('category'),
! 'lang_access'
=> lang('private'),
! 'lang_save'
=> lang('save'),
! 'lang_done'
=> lang('done'),
! 'value_content'
=> $note['content'],
! 'value_access'
=> $note['access'],
! 'value_cat'
=> $note['cat'],
! 'message'
=> $message,
! 'lang_content_statustext' =>
lang('Enter the content of the note'),
! 'lang_done_statustext' =>
lang('Back to the list'),
! 'lang_save_statustext' =>
lang('Save the note'),
'lang_access_off_statustext' => lang('The
note is public. If the note should be private, check this box'),
! 'lang_access_on_statustext' =>
lang('The note is private. If the note should be public, uncheck this box'),
! 'lang_no_cat'
=> lang('no category'),
! 'lang_cat_statustext' =>
lang('Select the category the notes belongs to. To do not use a category select
NO CATEGORY'),
! 'select_name'
=> 'values[cat_id]',
! 'cat_list'
=> $this->cats->formatted_xslt_list(array('format' =>
'select','selected' => $this->cat_id,'globals' => True))
);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: notes/inc class.bo.inc.php,1.11,1.12 class.so.inc.php,1.10,1.11 class.ui.inc.php,1.39,1.40,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: notes/templates/default form.xsl,1.10,1.11 delete.xul,1.3,NONE edit.xul,1.6,NONE index.rows.xul,1.1,NONE index.xul,1.2,NONE
- Next by Date:
[Phpgroupware-cvs] CVS: phpgwapi/templates/default cat_filter.xsl,1.7,1.8 cat_select.xsl,1.7,1.8
- Previous by thread:
[Phpgroupware-cvs] CVS: notes/templates/default form.xsl,1.10,1.11 delete.xul,1.3,NONE edit.xul,1.6,NONE index.rows.xul,1.1,NONE index.xul,1.2,NONE
- Next by thread:
[Phpgroupware-cvs] CVS: phpgwapi/templates/default cat_filter.xsl,1.7,1.8 cat_select.xsl,1.7,1.8
- Index(es):