holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: remove boudarys for time range of bdays

Browse Source
This commit is contained in:
Cornelius Weiß 2006-01-07 10:33:40 +00:00
parent 99cb0bd567
commit 50222354b8
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addressbook/inc/class.bocontacts.inc.php
View File

@ -136,9 +136,6 @@ class bocontacts extends socontacts
$contact['last_mod'] = time(); $contact['last_mod'] = time();
// only owner can set access status // only owner can set access status
$contact['access'] = $contact['owner'] == $this->user ? ($contact['private'] ? 'private': 'public') : $contact['access']; $contact['access'] = $contact['owner'] == $this->user ? ($contact['private'] ? 'private': 'public') : $contact['access'];
// convert bithdate format
$tmp_bday = $contact['bday'];
$contact['bday'] = $contact['bday'] ? date('m/d/Y',$contact['bday']) : '';
// create fullname // create fullname
$contact['fn'] = $contact['prefix']. $contact['fn'] = $contact['prefix'].
($contact['n_given'] ? ' '.$contact['n_given'] : ''). ($contact['n_given'] ? ' '.$contact['n_given'] : '').
@ -161,8 +158,6 @@ class bocontacts extends socontacts
} }
} }
//reconvert bday as we are dealing with references
$contact['bday'] = $tmp_bday;
// for some bad historical reasons we mainfileds saved in cf :-((( // for some bad historical reasons we mainfileds saved in cf :-(((
$data['ophone'] = $data['#ophone']; unset($data['#ophone']); $data['ophone'] = $data['#ophone']; unset($data['#ophone']);
$data['address2'] = $data['#address2']; unset($data['#address2']); $data['address2'] = $data['#address2']; unset($data['#address2']);
@ -194,10 +189,6 @@ class bocontacts extends socontacts
return $content['msg'] = lang('you are not permittet to view this contact'); return $content['msg'] = lang('you are not permittet to view this contact');
} }
// convert birthday format
list($m,$d,$y) = explode('/',$data['bday']);
$data['bday'] = strpos($data['bday'],'/') ? mktime(0,0,0,$m,$d,$y) : '';
// convert access into private for historical reasons // convert access into private for historical reasons
$data['private'] = $data['access'] == 'private' ? 1 : 0; $data['private'] = $data['access'] == 'private' ? 1 : 0;
// for some bad historical reasons we mainfileds saved in cf :-((( // for some bad historical reasons we mainfileds saved in cf :-(((
@ -226,11 +217,6 @@ class bocontacts extends socontacts
*/ */
function search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false) function search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
{ {
// convert bday format
if(isset($criteria['bday']))
{
$criteria['bday'] = date('m/d/Y',$criteria['bday']);
}
$filter = array( $filter = array(
'owner' => array_keys($this->grants), 'owner' => array_keys($this->grants),
); );

4
addressbook/setup/etemplates.inc.php
View File

@ -1,5 +1,5 @@
<?php <?php
// eTemplates for Application 'addressbook', generated by soetemplate::dump4setup() 2005-11-30 13:31 // eTemplates for Application 'addressbook', generated by soetemplate::dump4setup() 2006-01-07 11:49
/* $Id$ */ /* $Id$ */
@ -21,7 +21,7 @@ $templ_data[] = array('name' => 'addressbook.edit.details','template' => '','lan
$templ_data[] = array('name' => 'addressbook.edit.home','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:2:{s:2:"c6";s:9:",baseline";s:2:"h6";s:4:"100%";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"gohome";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"home street";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"40";s:4:"name";s:14:"adr_two_street";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"home city";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"40";s:4:"name";s:16:"adr_two_locality";}}i:3;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"home zip code";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"40";s:4:"name";s:18:"adr_two_postalcode";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"home state";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"40";s:4:"name";s:16:"adr_two_locality";}}i:5;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"home country";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"40";s:4:"name";s:19:"adr_two_countryname";}}i:6;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:3;s:4:"size";s:4:",320";s:7:"options";a:1:{i:1;s:3:"320";}}}','size' => ',320','style' => '','modified' => '1130409535',); $templ_data[] = array('name' => 'addressbook.edit.home','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:2:{s:2:"c6";s:9:",baseline";s:2:"h6";s:4:"100%";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"gohome";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"home street";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"40";s:4:"name";s:14:"adr_two_street";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"home city";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"40";s:4:"name";s:16:"adr_two_locality";}}i:3;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"home zip code";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"40";s:4:"name";s:18:"adr_two_postalcode";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"home state";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"40";s:4:"name";s:16:"adr_two_locality";}}i:5;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"home country";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"40";s:4:"name";s:19:"adr_two_countryname";}}i:6;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:3;s:4:"size";s:4:",320";s:7:"options";a:1:{i:1;s:3:"320";}}}','size' => ',320','style' => '','modified' => '1130409535',);
$templ_data[] = array('name' => 'addressbook.edit.home','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:1:{s:2:"h6";s:2:"30";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"gohome";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"street";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:14:"adr_two_street";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"city";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:16:"adr_two_locality";}}i:3;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"zip code";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:18:"adr_two_postalcode";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"state";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:14:"adr_two_region";}}i:5;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"country";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:19:"adr_two_countryname";}}i:6;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,bday";s:5:"label";s:8:"Birthday";}s:1:"C";a:3:{s:4:"type";s:4:"date";i:1;a:1:{s:4:"type";s:5:"label";}s:4:"name";s:4:"bday";}}i:7;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:5:",,,tz";s:5:"label";s:9:"Time zone";}s:1:"C";a:3:{s:4:"type";s:6:"select";s:4:"name";s:2:"tz";s:7:"no_lang";s:1:"1";}}i:8;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Public key";}s:1:"C";a:3:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,45";s:4:"name";s:6:"pubkey";}}}s:4:"rows";i:8;s:4:"cols";i:3;s:4:"size";s:4:",250";s:7:"options";a:1:{i:1;s:3:"250";}}}','size' => ',250','style' => '','modified' => '1130409535',); $templ_data[] = array('name' => 'addressbook.edit.home','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:1:{s:2:"h6";s:2:"30";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"gohome";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"street";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:14:"adr_two_street";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"city";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:16:"adr_two_locality";}}i:3;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"zip code";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:18:"adr_two_postalcode";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"state";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:14:"adr_two_region";}}i:5;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"country";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:19:"adr_two_countryname";}}i:6;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,bday";s:5:"label";s:8:"Birthday";}s:1:"C";a:4:{s:4:"type";s:4:"date";i:1;a:1:{s:4:"type";s:5:"label";}s:4:"name";s:4:"bday";s:4:"size";s:5:"m/d/Y";}}i:7;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:5:",,,tz";s:5:"label";s:9:"Time zone";}s:1:"C";a:3:{s:4:"type";s:6:"select";s:4:"name";s:2:"tz";s:7:"no_lang";s:1:"1";}}i:8;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Public key";}s:1:"C";a:3:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,45";s:4:"name";s:6:"pubkey";}}}s:4:"rows";i:8;s:4:"cols";i:3;s:4:"size";s:4:",250";s:7:"options";a:1:{i:1;s:3:"250";}}}','size' => ',250','style' => '','modified' => '1130409535',);
$templ_data[] = array('name' => 'addressbook.edit.links','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:2:"c3";s:2:"th";s:2:"h1";s:6:",@view";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"Create new links";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:7:"link-to";s:4:"name";s:7:"link_to";}}i:3;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Existing links";}}i:4;a:1:{s:1:"A";a:2:{s:4:"type";s:9:"link-list";s:4:"name";s:4:"link";}}}s:4:"rows";i:4;s:4:"cols";i:1;s:4:"size";s:17:"100%,250,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"250";i:6;s:4:"auto";}}}','size' => '100%,250,,,,,auto','style' => '','modified' => '1131900825',); $templ_data[] = array('name' => 'addressbook.edit.links','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:2:"c3";s:2:"th";s:2:"h1";s:6:",@view";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"Create new links";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:7:"link-to";s:4:"name";s:7:"link_to";}}i:3;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Existing links";}}i:4;a:1:{s:1:"A";a:2:{s:4:"type";s:9:"link-list";s:4:"name";s:4:"link";}}}s:4:"rows";i:4;s:4:"cols";i:1;s:4:"size";s:17:"100%,250,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"250";i:6;s:4:"auto";}}}','size' => '100%,250,,,,,auto','style' => '','modified' => '1131900825',);

2
addressbook/templates/default/edit.xet
View File

@ -166,7 +166,7 @@
<row height="30"> <row height="30">
<description/> <description/>
<description options=",,,bday" value="Birthday"/> <description options=",,,bday" value="Birthday"/>
<date 1="label" id="bday"/> <date 1="label" id="bday" options="m/d/Y"/>
</row> </row>
<row> <row>
<description/> <description/>