Changeset 484
- Timestamp:
- 09/26/08 11:00:35 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.db_functions.inc.php
r455 r484 143 143 } 144 144 145 function get_dropdown_contacts() 146 { 147 $dynamic_contact = new dynamic_contacts(); 145 function get_dropdown_contacts() { 148 146 149 147 $contacts = $this -> get_cc_contacts(); 150 148 $groups = $this -> get_cc_groups(); 151 $dynamic = $dynamic_contact->dynamic_contact_toString();152 149 153 150 if(($contacts) && ($groups)) … … 159 156 elseif ((!$contacts) && ($groups)) 160 157 $stringDropDownContacts = $groups; 161 if (($dynamic) && (($groups) || ($contacts))) 162 $stringDropDownContacts .= ',' . $dynamic; 163 else 158 159 if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['number_of_contacts'] && 160 $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts']) { 161 $dynamic_contact = new dynamic_contacts(); 162 $dynamic = $dynamic_contact->dynamic_contact_toString(); 164 163 if ($dynamic) 165 $stringDropDownContacts =$dynamic;166 164 $stringDropDownContacts .= ($stringDropDownContacts ? ',' : '') . $dynamic; 165 } 167 166 return $stringDropDownContacts; 168 167 } … … 288 287 return null; 289 288 } 289 //Sort by email 290 function cmp($a, $b) { return strcmp($a["email"], $b["email"]);} 291 usort($contacts,"cmp"); 290 292 return $contacts; 291 293 }
Note: See TracChangeset
for help on using the changeset viewer.