[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] [19091] merging in changes (r19070:19090) from branch
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] [19091] merging in changes (r19070:19090) from branch - consider this RC2 |
|
Date: |
Sat, 21 Feb 2009 12:44:53 +0000 |
Revision: 19091
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=19091
Author: skwashd
Date: 2009-02-21 12:44:53 +0000 (Sat, 21 Feb 2009)
Log Message:
-----------
merging in changes (r19070:19090) from branch - consider this RC2
Modified Paths:
--------------
tags/Version-0_9_16-014-proposed/addressbook/inc/class.boaddressbook.inc.php
tags/Version-0_9_16-014-proposed/addressbook/inc/class.boaddressbook_prefs.inc.php
tags/Version-0_9_16-014-proposed/addressbook/inc/class.soaddressbook.inc.php
tags/Version-0_9_16-014-proposed/addressbook/inc/class.uiaddressbook.inc.php
tags/Version-0_9_16-014-proposed/addressbook/inc/class.uiaddressbook_prefs.inc.php
tags/Version-0_9_16-014-proposed/addressbook/inc/class.uicategorize_contacts.inc.php
tags/Version-0_9_16-014-proposed/addressbook/templates/default/preferences.tpl
tags/Version-0_9_16-014-proposed/infolog/setup/tables_update.inc.php
tags/Version-0_9_16-014-proposed/phpgwapi/inc/class.contact_person.inc.php
tags/Version-0_9_16-014-proposed/phpgwapi/inc/class.setup.inc.php
tags/Version-0_9_16-014-proposed/phpgwapi/setup/tables_update.inc.php
tags/Version-0_9_16-014-proposed/preferences/preferences.php
Modified:
tags/Version-0_9_16-014-proposed/addressbook/inc/class.boaddressbook.inc.php
===================================================================
---
tags/Version-0_9_16-014-proposed/addressbook/inc/class.boaddressbook.inc.php
2009-02-20 12:19:44 UTC (rev 19090)
+++
tags/Version-0_9_16-014-proposed/addressbook/inc/class.boaddressbook.inc.php
2009-02-21 12:44:53 UTC (rev 19091)
@@ -491,61 +491,67 @@
{
return $this->so->copy_contact($contact_id);
}
-
+
/**
- * Criteria for index primordially
- *
- * return string criteria for search.
- */
+ * Criteria for index primordially
+ *
+ * return string criteria for search.
+ */
function criteria_contacts($access, $category, $field,
$pattern, $show_fields)
{
- if($pattern)
+ if ($pattern)
{
- switch($field)
+ switch ($field)
{
- case 'person':
- $fields = array(
- 'per_full_name',
- 'per_prefix',
- 'per_suffix',
- 'per_birthday',
- 'per_pubkey',
- 'per_title',
- 'per_department',
- 'per_initials',
- 'per_sound',
- 'per_active');
- break;
- case 'org':
- $fields = array('org_name');
- break;
- case 'comms':
- foreach($this->comm_descr as $data)
- {
- $comms[] =
$data['comm_description'];
- }
- $fields['comm_media'] = $comms;
- break;
- case 'location':
- $fields = array('addr_add1',
+ case 'person':
+ $fields = array
+ (
+ 'per_full_name',
+ 'per_prefix',
+ 'per_suffix',
+ 'per_initials'
+ );
+ break;
+
+ case 'org':
+ $fields = array ('org_name' );
+ break;
+
+ case 'comms':
+ $fields['comm_media'] = array();
+ foreach ( $this->comm_descr as
$data )
+ {
+ $fields['comm_media'][]
= $data ['comm_description'];
+ }
+ break;
+
+ case 'location':
+ $fields = array
+ (
+ 'addr_add1',
'addr_add2',
'addr_add3',
'addr_city',
'addr_state',
'addr_postal_code',
- 'addr_country');
- break;
- case 'other':
- $fields = array('other_value');
- break;
- case 'note':
- $fields = array('note_text');
- break;
- default:
- $fields = array();
+ 'addr_country'
+ );
+ break;
+
+ case 'other':
+ $fields = array ('other_value');
+ break;
+
+ case 'note':
+ $fields = array ('note_text');
+ break;
+
+ default :
+ $fields = array ();
}
}
- return
$this->so->criteria_contacts($GLOBALS['phpgw_info']['user']['account_id'],
$access, $category, $fields, $pattern, $show_fields);
+ return
$this->so->criteria_contacts($GLOBALS['phpgw_info']['user']['account_id'],
+ $access, $category, $fields, $pattern,
$show_fields );
}
/**
Modified:
tags/Version-0_9_16-014-proposed/addressbook/inc/class.boaddressbook_prefs.inc.php
===================================================================
---
tags/Version-0_9_16-014-proposed/addressbook/inc/class.boaddressbook_prefs.inc.php
2009-02-20 12:19:44 UTC (rev 19090)
+++
tags/Version-0_9_16-014-proposed/addressbook/inc/class.boaddressbook_prefs.inc.php
2009-02-21 12:44:53 UTC (rev 19091)
@@ -44,7 +44,7 @@
&&(count($this->person_columns['comm_types'])>0)))
{
//print "<br /><B>count(Person )columns >=
1".print_r($this->person_columns)."</B><br />";
-
$this->preferences->add('addressbook','person_columns',serialize($this->person_columns),$type);
+ $this->preferences->add('addressbook',
'person_columns', $this->person_columns, $type);
}
else
{
@@ -56,7 +56,7 @@
}
else
{
-
$this->preferences->delete('addressbook','person_columns',$type);
+
$this->preferences->delete('addressbook','person_columns',$type);
$this->remove_from_forced("person_columns");
}
@@ -68,7 +68,7 @@
if(count($this->org_columns) >=1)
{
-
$this->preferences->add('addressbook','org_columns',serialize($this->org_columns),$type);
+ $this->preferences->add('addressbook',
'org_columns', $this->org_columns, $type);
}
else
{
@@ -98,15 +98,15 @@
$this->preferences->delete('addressbook','default_category',$type);
$this->remove_from_forced('default_category');
}
- $this->preferences->save_repository(true,$type);
+ $this->preferences->save_repository(true, $type);
}
function read_preferences($type='')
{
$this->preferences->read();
$temp=$this->preferences->data['addressbook'];
- $this->person_columns=unserialize($temp['person_columns']);
-
$this->person_columns_forced=$this->is_forced_value('person_columns');
+ $this->person_columns = $temp['person_columns'];
+ $this->person_columns_forced =
$this->is_forced_value('person_columns');
//Check that we dont reflect types that arent asked of us in
'type'
if(!$this->person_columns_forced && $type=='forced')
{
@@ -114,7 +114,7 @@
unset($this->person_columns);
}
- $this->org_columns=unserialize($temp['org_columns']);
+ $this->org_columns = $temp['org_columns'];
$this->org_columns_forced=$this->is_forced_value('org_columns');
if(!$this->org_columns_forced && $type=='forced')
{
@@ -130,7 +130,6 @@
{
$this->default_category='__NONE__';
}
-
}
function remove_from_forced($preference_name)
{
Modified:
tags/Version-0_9_16-014-proposed/addressbook/inc/class.soaddressbook.inc.php
===================================================================
---
tags/Version-0_9_16-014-proposed/addressbook/inc/class.soaddressbook.inc.php
2009-02-20 12:19:44 UTC (rev 19090)
+++
tags/Version-0_9_16-014-proposed/addressbook/inc/class.soaddressbook.inc.php
2009-02-21 12:44:53 UTC (rev 19091)
@@ -1044,16 +1044,16 @@
function read_preferences($contact_type)
{
- $prefs=$GLOBALS['phpgw']->preferences;
- $prefs=$prefs->data['addressbook'];
+ $prefs = $GLOBALS['phpgw']->preferences->read();
+ $prefs = $prefs['addressbook'];
if($contact_type==$this->tab_main_persons)
{
- return unserialize($prefs['person_columns']);
+ return $prefs['person_columns'];
}
elseif($contact_type==$this->tab_main_organizations)
{
- return unserialize($prefs['org_columns']);
+ return $prefs['org_columns'];
}
}
Modified:
tags/Version-0_9_16-014-proposed/addressbook/inc/class.uiaddressbook.inc.php
===================================================================
---
tags/Version-0_9_16-014-proposed/addressbook/inc/class.uiaddressbook.inc.php
2009-02-20 12:19:44 UTC (rev 19090)
+++
tags/Version-0_9_16-014-proposed/addressbook/inc/class.uiaddressbook.inc.php
2009-02-21 12:44:53 UTC (rev 19091)
@@ -221,9 +221,9 @@
}
if(!isset($this->cat_id))
- {
- $this->cat_id =
$this->prefs['default_category'];
- }
+ {
+ $this->cat_id =
$this->prefs['default_category'];
+ }
if($this->cat_id && $this->cat_id!=0)
{
@@ -3078,7 +3078,7 @@
function get_persons($fields_to_search, $current_person)
{
$criteria =
$this->bo->criteria_contacts(PHPGW_CONTACTS_ALL,PHPGW_CONTACTS_CATEGORIES_ALL,array(),'',$fields_to_search);
- $persons =
$this->bo->get_persons($fields_to_search,'','','first_name','','',$criteria);
+ $persons =
$this->bo->get_persons($fields_to_search,'','','last_name','','',$criteria);
if ($persons)
{
Modified:
tags/Version-0_9_16-014-proposed/addressbook/inc/class.uiaddressbook_prefs.inc.php
===================================================================
---
tags/Version-0_9_16-014-proposed/addressbook/inc/class.uiaddressbook_prefs.inc.php
2009-02-20 12:19:44 UTC (rev 19090)
+++
tags/Version-0_9_16-014-proposed/addressbook/inc/class.uiaddressbook_prefs.inc.php
2009-02-21 12:44:53 UTC (rev 19091)
@@ -470,6 +470,7 @@
print "<br /><b>Columns</b><br />"; */
}
+
function linearize_query($qresult,$key)
{
// print_r($qresult);
@@ -616,9 +617,6 @@
$this->template->set_file(
array(
'addressbook_preferences_t'
=>'preferences.tpl',
- 'preferences_bits_t' =>
'preferences_bits.tpl',
- 'select_columns_form_options_t'
=> 'preferences_bits.tpl',
-
'select_columns_commtypes_options_t' => 'preferences_bits.tpl',
'selected_rows_t' =>
'preferences_bits.tpl',
'principal_tabs_t' =>
'principal_tabs.tpl'
)
@@ -723,45 +721,49 @@
$org_or_person=$this->org_or_person;
}
$this->fields_to_show();
-
$this->template->set_block('select_columns_form_options_t','B_select_columns_form_options','V_select_columns_form_options');
-
$this->template->set_block('select_columns_commtypes_options_t','B_select_ctypes_options','V_select_columns_commtypes_options');
- if(count($this->fields_show_selectbox) > 1)
- {
- reset($this->fields_show_selectbox);
- // print "<br /><B> To
Show in Selectbox<br />".print_r($this->fields_show_selectbox)."</B><br />";
-
while(list($field,$lang)=each($this->fields_show_selectbox))
- {
- //not a comtype
+
$this->template->set_block('addressbook_preferences_t','B_select_columns_form_options','V_select_columns_form_options');
+ $this->template->set_block('addressbook_preferences_t',
'B_select_ctypes_options', 'V_select_ctypes_options');
+
+ if ( isset($this->fields_show_selectbox['comm_types']) )
+ {
+ if (
is_array($this->fields_show_selectbox['comm_types'])
+ &&
count($this->fields_show_selectbox['comm_types']) )
+ {
+ foreach (
$this->fields_show_selectbox['comm_types'] as $k => $description )
+ {
+
$this->template->set_var('lang_comtype_field', $description);
+
$this->template->set_var('commtype_description', $description);
+
$this->template->parse('V_select_ctypes_options', 'B_select_ctypes_options',
True);
+ }
+ }
+ else
+ {
+
$this->template->set_var('lang_comtype_field',$GLOBALS['phpgw']->lang('Empty'));
+ $this->template->set_var('value', '');
+
$this->template->parse('V_select_ctypes_options', 'B_select_ctypes_options',
True);
+ }
+
+
unset($this->fields_show_selectbox['comm_types']);
+ }
+
+ if ( count($this->fields_show_selectbox) )
+ {
+ //print "<br /><B> To Show in Selectbox<br
/>".print_r($this->fields_show_selectbox, true)."</B><br />";
+ foreach ( $this->fields_show_selectbox as
$field => $lang )
+ {
+
$this->template->set_var('lang_contact_field',$lang);
+
$this->template->set_var('value',$field);
+
$this->template->parse('V_select_columns_form_options','B_select_columns_form_options',True);
+ }
+ }
+ else
+ {
+
$this->template->set_var('lang_contact_field',$GLOBALS['phpgw']->lang('Empty'));
+ $this->template->set_var('value', '');
+
$this->template->parse('V_select_columns_form_options','B_select_columns_form_options',True);
+ }
+ }
- if(!is_array($lang))
- {
-
$this->template->set_var('lang_contact_field',$lang);
-
$this->template->set_var('value',$field);
-
$this->template->parse('V_select_columns_form_options','B_select_columns_form_options',True);
- }
- else
- {
-
while(list($k,$description)=each($lang))
- {
-
$this->template->set_var('lang_comtype_field',$description);
-
$this->template->set_var('commtype_description',$description);
-
$this->template->parse('V_select_ctypes_options',
-
'B_select_ctypes_options',True);
-
- }
- }
- }
- }
- else
- {
-
$this->template->set_var('lang_contact_field',$GLOBALS['phpgw']->lang('Empty'));
- $this->template->set_var('value',"");
-
$this->template->parse('V_select_columns_form_options','B_select_columns_form_options');
- }
-
$this->template->parse('B_select_columns_form_options','V_select_columns_form_options');
- $this->template->parse('B_select_ctypes_options',
'V_select_ctypes_options');
-
- }
function show_cols($org_or_person='')
{
if(empty($org_or_person))
Modified:
tags/Version-0_9_16-014-proposed/addressbook/inc/class.uicategorize_contacts.inc.php
===================================================================
---
tags/Version-0_9_16-014-proposed/addressbook/inc/class.uicategorize_contacts.inc.php
2009-02-20 12:19:44 UTC (rev 19090)
+++
tags/Version-0_9_16-014-proposed/addressbook/inc/class.uicategorize_contacts.inc.php
2009-02-21 12:44:53 UTC (rev 19091)
@@ -141,7 +141,7 @@
$GLOBALS['phpgw_info']['user']['account_id'],
$access, $cat_id);
$persons = $this->contacts->get_persons(
array('person_id', 'per_full_name'),
- '','','','','',$criteria);
+ '', '', 'last_name','ASC','',$criteria);
if(is_array($persons))
{
Modified:
tags/Version-0_9_16-014-proposed/addressbook/templates/default/preferences.tpl
===================================================================
---
tags/Version-0_9_16-014-proposed/addressbook/templates/default/preferences.tpl
2009-02-20 12:19:44 UTC (rev 19090)
+++
tags/Version-0_9_16-014-proposed/addressbook/templates/default/preferences.tpl
2009-02-21 12:44:53 UTC (rev 19091)
@@ -23,13 +23,16 @@
<td>
{hider_open}
<select name="{select_columns_selectbox_name}" multiple size="5">
-
- {B_select_columns_form_options}
+ <!-- BEGIN B_select_columns_form_options -->
+ <option value="{value}">{lang_contact_field}</option>
+ <!-- END B_select_columns_form_options -->
</select>
</td>
<td>
<select name="{select_columns_comtypes_name}" multiple size="5">
- {B_select_ctypes_options}
+ <!-- BEGIN B_select_ctypes_options -->
+ <option
value="{commtype_description}">{lang_comtype_field}</option>
+ <!-- END B_select_ctypes_options -->
</select>
</td>
</tr>
Modified: tags/Version-0_9_16-014-proposed/infolog/setup/tables_update.inc.php
===================================================================
--- tags/Version-0_9_16-014-proposed/infolog/setup/tables_update.inc.php
2009-02-20 12:19:44 UTC (rev 19090)
+++ tags/Version-0_9_16-014-proposed/infolog/setup/tables_update.inc.php
2009-02-21 12:44:53 UTC (rev 19091)
@@ -266,15 +266,15 @@
*
* @return string current infolog version
*/
- /*
function infolog_upgrade0_9_15_006()
{
+ /* Uncomment this block if you are upgrading from 0.9.14
$sql = 'UPDATE phpgw_links, phpgw_contact'
. ' SET phpgw_links.link_id2 = phpgw_contact.contact_id'
. " WHERE phpgw_links.link_app2 = 'addressbook' AND
phpgw_links.link_id2 = phpgw_contact.ab_id";
$GLOBALS['phpgw_setup']->oProc->query($sql);
+ */
$GLOBALS['setup_info']['infolog']['currentver'] = '0.9.15.007';
return $GLOBALS['setup_info']['infolog']['currentver'];
- }
- */
\ No newline at end of file
+ }
\ No newline at end of file
Modified:
tags/Version-0_9_16-014-proposed/phpgwapi/inc/class.contact_person.inc.php
===================================================================
--- tags/Version-0_9_16-014-proposed/phpgwapi/inc/class.contact_person.inc.php
2009-02-20 12:19:44 UTC (rev 19090)
+++ tags/Version-0_9_16-014-proposed/phpgwapi/inc/class.contact_person.inc.php
2009-02-21 12:44:53 UTC (rev 19091)
@@ -321,9 +321,11 @@
function full_name()
{
- $this->add_field('per_full_name',
sql::concat_null(array($this->real_field('per_first_name'), sql::string(' '),
+ $this->add_field('per_full_name',
sql::concat_null(array($this->real_field('per_prefix'), sql::string(' '),
+
$this->real_field('per_first_name'), sql::string(' '),
$this->real_field('per_middle_name'), sql::string(' '),
-
$this->real_field('per_last_name'))));
+
$this->real_field('per_last_name'), sql::string(' '),
+
$this->real_field('per_suffix'))));
}
}
Modified: tags/Version-0_9_16-014-proposed/phpgwapi/inc/class.setup.inc.php
===================================================================
--- tags/Version-0_9_16-014-proposed/phpgwapi/inc/class.setup.inc.php
2009-02-20 12:19:44 UTC (rev 19090)
+++ tags/Version-0_9_16-014-proposed/phpgwapi/inc/class.setup.inc.php
2009-02-21 12:44:53 UTC (rev 19091)
@@ -79,7 +79,7 @@
$ConfigLogin = get_var('ConfigLogin', array('POST'));
$HeaderLogin = get_var('HeaderLogin', array('POST'));
$FormDomain = get_var('FormDomain', array('POST'));
- $FormPW = get_var('FormPW', array('POST'));
+ $FormPW = stripslashes(get_var('FormPW',
array('POST')));
$ConfigDomain =
get_var('ConfigDomain',array('POST','COOKIE'));
$ConfigPW = get_var('ConfigPW',
array('POST','COOKIE'));
Modified: tags/Version-0_9_16-014-proposed/phpgwapi/setup/tables_update.inc.php
===================================================================
--- tags/Version-0_9_16-014-proposed/phpgwapi/setup/tables_update.inc.php
2009-02-20 12:19:44 UTC (rev 19090)
+++ tags/Version-0_9_16-014-proposed/phpgwapi/setup/tables_update.inc.php
2009-02-21 12:44:53 UTC (rev 19091)
@@ -1256,27 +1256,40 @@
if($data['org_name'])
{
-
$GLOBALS['phpgw_setup']->db->query("INSERT INTO phpgw_contact
(owner,access,cat_id,contact_type_id,ab_id) VALUES ("
- . $data['owner']
- . "," .
($data['access']?"'".$data['access']."'":"null")
- . "," .
($data['cat_id']?"'".$data['cat_id']."'":"null")
- . "," . $contact_type_org
- . "," . $key
- . ')');
+ // see if the org exists before
creating it
+ $org_name =
$GLOBALS['phpgw_setup']->db->db_addslashes(trim($data['org_name']));
+
$GLOBALS['phpgw_setup']->db->query("SELECT org_id FROM phpgw_contact_org WHERE
name LIKE '{$org_name}'");
+ if (
$GLOBALS['phpgw_setup']->db->next_record() )
+ {
+ // got it
+ $org_id = (int)
$GLOBALS['phpgw_setup']->db->f('org_id');
+ }
+ else
+ {
+
+ // need to create it
+
$GLOBALS['phpgw_setup']->db->query("INSERT INTO phpgw_contact
(owner,access,cat_id,contact_type_id,ab_id) VALUES ("
+ . $data['owner']
+ . "," .
($data['access']?"'".$data['access']."'":"null")
+ . "," .
($data['cat_id']?"'".$data['cat_id']."'":"null")
+ . "," .
$contact_type_org
+ . "," . $key
+ . ')');
- $contact_id++;
- $org_id = $contact_id;
+ $contact_id++;
+ $org_id = $contact_id;
-
$GLOBALS['phpgw_setup']->db->query("INSERT INTO phpgw_contact_org (org_id,name,
-
created_by,modified_by,created_on,modified_on,ab_id) VALUES ("
- . $org_id
- . ",'" .
$GLOBALS['phpgw_setup']->db->db_addslashes($data['org_name']) . "'"
- . "," . $data['owner']
- . "," . $data['owner']
- . "," . $time
- . "," . $time
- . "," . $key
- .')');
+
$GLOBALS['phpgw_setup']->db->query("INSERT INTO phpgw_contact_org (org_id,name,
+
created_by,modified_by,created_on,modified_on,ab_id) VALUES ("
+ . $org_id
+ .
",'{$org_name}'"
+ . "," .
$data['owner']
+ . "," .
$data['owner']
+ . "," . $time
+ . "," . $time
+ . "," . $key
+ .')');
+ }
$GLOBALS['phpgw_setup']->db->query("INSERT INTO phpgw_contact_org_person
(org_id,person_id, preferred,
created_on,created_by) VALUES ("
Modified: tags/Version-0_9_16-014-proposed/preferences/preferences.php
===================================================================
--- tags/Version-0_9_16-014-proposed/preferences/preferences.php
2009-02-20 12:19:44 UTC (rev 19090)
+++ tags/Version-0_9_16-014-proposed/preferences/preferences.php
2009-02-21 12:44:53 UTC (rev 19091)
@@ -238,7 +238,7 @@
$vars = $GLOBALS['phpgw']->preferences->vars;
if (is_array($vars2))
{
- $vars += $vars2;
+ $vars = array_merge($vars, $vars2);
}
$prefs[$name] =
$GLOBALS['phpgw']->preferences->lang_notify($prefs[$name],$vars);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] [19091] merging in changes (r19070:19090) from branch - consider this RC2,
Dave Hall <=