Changeset 588
- Timestamp:
- 01/12/09 11:28:22 (15 years ago)
- Location:
- trunk
- Files:
-
- 7 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/calendar/inc/class.bocalendar.inc.php
r583 r588 758 758 function update($params='') 759 759 { 760 761 if($params['from_mobile']) { 762 $ui_return = "mobile.ui_mobilecalendar.edit"; 763 $ui_index = "mobile.ui_mobilecalendar.index"; 764 $ui_overlap = "mobile.ui_mobilecalendar.overlap"; 765 } 766 else { 767 $ui_return = "calendar.uicalendar.edit"; 768 $ui_index = "calendar.uicalendar.index"; 769 $ui_overlap = "calendar.uicalendar.overlap"; 770 } 771 760 772 if(!is_object($GLOBALS['phpgw']->datetime)) 761 773 { … … 769 781 $l_end = (@isset($params['end']) && $params['end']?$params['end']:$_POST['end']); 770 782 $l_recur_enddate = (@isset($params['recur_enddate']) && $params['recur_enddate']?$params['recur_enddate']:$_POST['recur_enddate']); 783 771 784 772 785 $send_to_ui = True; … … 837 850 if($datetime_check) 838 851 { 839 ExecMethod( 'calendar.uicalendar.edit',852 ExecMethod($ui_return, 840 853 Array( 841 854 'cd' => $datetime_check, … … 843 856 ) 844 857 ); 845 $GLOBALS['phpgw']->common->phpgw_exit(True); 858 if(!$params['from_mobile']) 859 $GLOBALS['phpgw']->common->phpgw_exit(True); 860 else 861 return; 846 862 } 847 863 $overlapping_events = False; … … 860 876 return array(($l_cal['id']?1:2) => 'permission denied'); 861 877 } 862 ExecMethod('calendar.uicalendar.index'); 863 $GLOBALS['phpgw']->common->phpgw_exit(); 878 ExecMethod($ui_index); 879 if(!$params['from_mobile']) 880 $GLOBALS['phpgw']->common->phpgw_exit(); 881 else 882 return; 864 883 } 865 884 … … 1141 1160 return array($datetime_check => 'invalid input data'); 1142 1161 } 1143 ExecMethod( 'calendar.uicalendar.edit',1162 ExecMethod($ui_return, 1144 1163 Array( 1145 1164 'cd' => $datetime_check, … … 1147 1166 ) 1148 1167 ); 1149 $GLOBALS['phpgw']->common->phpgw_exit(True); 1168 if(!$params['from_mobile']) 1169 $GLOBALS['phpgw']->common->phpgw_exit(True); 1170 else 1171 return; 1150 1172 } 1151 1173 … … 1176 1198 unset($GLOBALS['phpgw_info']['flags']['noheader']); 1177 1199 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 1178 ExecMethod( 'calendar.uicalendar.overlap',1200 ExecMethod($ui_overlap, 1179 1201 Array( 1180 1202 'o_events' => $overlapping_events, … … 1182 1204 ) 1183 1205 ); 1184 $GLOBALS['phpgw']->common->phpgw_exit(True); 1206 if(!$params['from_mobile']) 1207 $GLOBALS['phpgw']->common->phpgw_exit(True); 1208 else 1209 return; 1185 1210 } 1186 1211 else … … 1229 1254 $GLOBALS['phpgw']->common->phpgw_exit(); 1230 1255 } 1231 Execmethod( 'calendar.uicalendar.index');1256 Execmethod($ui_index); 1232 1257 } 1233 1258 else -
trunk/contactcenter/inc/class.bo_ldap_manager.inc.php
r383 r588 104 104 105 105 $op_iop = array( 106 'contact.uidnumber' => array('uidNumber'), 106 107 'contact.id_contact' => array('dn'), 107 108 'contact.photo' => array('jpegPhoto'), -
trunk/mobile/calendar.php
r524 r588 49 49 $data[] = array(); 50 50 @ksort($daily); 51 $p->set_block("view","body"); 51 52 //print_r($daily); 52 53 //echo "accountId - $accountId\n"; … … 95 96 } 96 97 } 97 $p->pfp('out','views'); 98 $p->parse('events','views'); 99 //$p->pfp('out','views'); 98 100 } 99 101 else { … … 107 109 $p->set_var("start_date",$sday."/".$smonth."/".$syear); 108 110 $p->set_var("end_date", $eday."/".$emonth."/".$eyear); 109 $p->pfp('out','no_event'); 111 $p->parse('events','no_event'); 112 // $p->pfp('out','no_event'); 110 113 } 114 $p->set_var("lang_schedule",lang("schedule")); 115 $p->pfp('out','body'); 111 116 112 117 // Utiliza o novo header para a página principal. 113 118 print_header(); 119 114 120 // Utiliza o novo footer. 115 121 print_footer(); -
trunk/mobile/inc/class.mobilemail.inc.php
r534 r588 344 344 345 345 $messages = $this->imap_functions->get_range_msgs2($params); 346 347 346 $this->print_mails_list($messages); 348 347 $this->print_page_navigation($this->pages, $this->current_page); -
trunk/mobile/inc/class.ui_mobilecc.inc.php
r546 r588 129 129 */ 130 130 131 function contacts_list( ) {131 function contacts_list($from_calendar=false) { 132 132 133 133 $entries = array(); … … 163 163 else { //Só pego os dados completos caso haja resultado na busca 164 164 if($this->page_info['actual_catalog']!="bo_group_manager") { //Se não for grupo, tenho que ordenar as connections 165 $entries = $this->bo->get_multiple_entries($ids,array("names_ordered"=>true," id_contact"=>true,"connections"=>true));165 $entries = $this->bo->get_multiple_entries($ids,array("names_ordered"=>true,"uidnumber"=>true,"id_contact"=>true,"connections"=>true)); 166 166 /** 167 167 * As entradas vindas de get_multiple_entries não vem com as connections … … 187 187 $entries = $this->bo->get_multiple_entries($ids,array("id_group"=>true,"title"=>true,"short_name"=>true)); 188 188 } 189 189 190 } 190 191 191 192 ///////////////// Monto os dados gerais da página no template. 192 193 $p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); 193 $p->set_file(Array('entries' => 'cc_main.tpl')); 194 195 if(!$from_calendar) 196 $p->set_file(Array('entries' => 'cc_main.tpl')); 197 else 198 $p->set_file(Array('entries' => 'add_participants.tpl')); 194 199 195 200 $p->set_block('entries','body'); … … 202 207 $p->set_block('entries','page'); 203 208 $p->set_block('entries','page_no_link'); 209 $p->set_block('entries','row_addeds'); 204 210 205 211 … … 211 217 $p->set_var($texts); 212 218 219 $p->set_var('lang_already_addeds:',lang('already_addeds:')); 220 221 if($from_calendar) 222 $p->set_var('lang_continue_scheduling',lang('continue scheduling')); 223 213 224 /////////// Preenche o combo de catálogos 214 225 … … 216 227 $branchs = $bo_cc->get_catalog_tree(); 217 228 229 if(!$from_calendar) { 230 foreach($branchs as $branch) { //Pego apenas a estrutura dos ramos vindos do banco, pois as do ldap estão confusas e com dados aparentemente inconsistentes. 231 if($branch['class']!="bo_global_ldap_catalog" && $branch['class']!="bo_catalog_group_catalog") { 232 $p->set_var(array('option_value'=>$branch['class'],'option_text'=>$branch['name'])); 218 233 219 foreach($branchs as $branch) { //Pego apenas a estrutura dos ramos vindos do banco, pois as do ldap estão confusas e com dados aparentemente inconsistentes. 220 if($branch['class']!="bo_global_ldap_catalog" && $branch['class']!="bo_catalog_group_catalog") { 221 $p->set_var(array('option_value'=>$branch['class'],'option_text'=>$branch['name'])); 222 223 if($this->page_info['actual_catalog']==$branch['class']) 224 $p->set_var('selected','selected'); 225 else 226 $p->set_var('selected',''); 227 $p->parse('options','option',True); 228 } 229 234 if($this->page_info['actual_catalog']==$branch['class']) 235 $p->set_var('selected','selected'); 236 else 237 $p->set_var('selected',''); 238 $p->parse('options','option',True); 239 } 240 241 } 230 242 } 231 243 … … 248 260 } 249 261 250 $branchs = $bo_ldap_manager->get_external_ldap_sources(); 251 252 foreach($branchs as $id=>$branch) { //Ldaps externos 253 $p->set_var(array('option_value'=>"bo_global_ldap_catalog#". 254 $id."#". 255 $branch['dn']."#". 256 1, 257 'option_text'=>$branch['name'])); //No value eu passo também o id, o contexto e se é externo, quando é um ldap 258 259 if($this->page_info['actual_catalog']=="bo_global_ldap_catalog#".$id."#".$branch['dn']."#". 1) 260 $p->set_var('selected','selected'); 261 else 262 $p->set_var('selected',''); 263 $p->parse('options','option',True); 262 if(!$from_calendar) { 263 $branchs = $bo_ldap_manager->get_external_ldap_sources(); 264 265 foreach($branchs as $id=>$branch) { //Ldaps externos 266 $p->set_var(array('option_value'=>"bo_global_ldap_catalog#". 267 $id."#". 268 $branch['dn']."#". 269 1, 270 'option_text'=>$branch['name'])); //No value eu passo também o id, o contexto e se é externo, quando é um ldap 271 272 if($this->page_info['actual_catalog']=="bo_global_ldap_catalog#".$id."#".$branch['dn']."#". 1) 273 $p->set_var('selected','selected'); 274 else 275 $p->set_var('selected',''); 276 $p->parse('options','option',True); 277 } 264 278 } 265 279 … … 296 310 $p->parse('header','group_header',True); 297 311 } 298 312 299 313 /////////// Preencho as linhas do resultado 300 foreach($entries as $ entry) {314 foreach($entries as $id => $entry) { 301 315 $this->nextmatchs->template_alternate_row_color($p); 302 316 if(($this->page_info['actual_catalog']!="bo_group_manager") && … … 352 366 $var['row_telefone'] = $conn1['connection_value']; 353 367 } 354 $var['form_action'] = "index.php?menuaction=mobile.mobilemail.new_msg"; 368 if(!$from_calendar) 369 $var['form_action'] = "index.php?menuaction=mobile.mobilemail.new_msg"; 370 else { 371 $var['id_contact'] = $entry['uidnumber'][0].'U'; 372 $var['form_action'] = "index.php?menuaction=mobile.ui_mobilecalendar.add_participant"; 373 } 374 $var['lang_select'] = lang("select"); 355 375 $p->set_var($var); 356 376 $p->parse('rows','row',True); 357 377 } 378 } 379 } 380 381 if($from_calendar) { 382 $p->set_var('lang_choose_the_participants',lang("choose the participants")); 383 $participants = $_SESSION['mobile_calendar']; 384 reset($participants); 385 while (($participant = current($participants))!==false) { 386 $p->set_var('row_contact_name',$participant); 387 if(next($participants)!==false) 388 $p->set_var('row_separate',','); 389 else 390 $p->set_var('row_separate','.'); 391 $p->parse('rows_addeds','row_addeds',True); 358 392 } 359 393 } -
trunk/mobile/login.php
r454 r588 111 111 $tmpl->set_var('charset',$GLOBALS['phpgw']->translation->charset()); 112 112 $tmpl->set_var('cookie',$last_loginid); 113 $tmpl->set_var('lang_username',lang('username'));113 /*$tmpl->set_var('lang_username',lang('username')); 114 114 $tmpl->set_var('lang_password',lang('password')); 115 $tmpl->set_var('lang_login',lang('login')); 115 $tmpl->set_var('lang_login',lang('login'));*/ 116 //a função lang não funciona no login em dispositivos móveis... verificar o motivo... 117 $tmpl->set_var('lang_username',"Usuário"); 118 $tmpl->set_var('lang_password',"Senha"); 119 $tmpl->set_var('lang_login',"Login"); 120 116 121 $tmpl->set_var('website_title', $GLOBALS['phpgw_info']['server']['site_title']); 117 122 $tmpl->set_var('template_set',$GLOBALS['phpgw_info']['login_template_set']); -
trunk/mobile/setup/phpgw_pt-br.lang
r524 r588 33 33 Start Date/Time mobile pt-br Data/Hora Início 34 34 End Date/Time mobile pt-br Data/Hora Término 35 schedule mobile pt-br Agendar 36 continue scheduling mobile pt-br Continuar o agendamento 37 already_addeds: mobile pt-br Já adicionados: 38 Start Date mobile pt-br Data(Início) 39 End Date mobile pt-br Data(Término) 40 Start Time mobile pt-br Hora(Início) 41 End Time mobile pt-br Hora(Término) 42 keep add participants mobile pt-br Adicionar participantes 43 your suggested time of <b> %1 - %2 </b> conflicts with the following existing calendar entries: mobile pt-br Horário sugerido: <B> %1 - %2 </B> está em conflito com as seguintes entradas no calendário: 44 scheduling conflict mobile pt-br Conflito de agendamento 45 ignore conflict mobile pt-br Ignorar conflito 46 re-edit event mobile pt-br Re-Editar evento 47 username_mobile mobile pt-br Usuário 48 password_mobile mobile pt-br Senha 49 the search argument must have at least 4 digits mobile pt-br O argumento da busca deve possuir pelo menos 4 dígitos 50 choose the participants mobile pt-br Escolha os participantes -
trunk/mobile/templates/default/calendar.tpl
r524 r588 1 <!-- BEGIN body --> 2 {events} 3 <br> 4 <a href="index.php?menuaction=mobile.ui_mobilecalendar.init_schedule">{lang_schedule} </a> 5 6 <!-- END body --> 7 1 8 <!-- BEGIN view_event --> 2 <font color="# 000066"><b>{header_date}</b></font><br>3 <table bgcolor="#f7f7f7" style="border:1px solid black" border=" 1" width="20%">4 <tr >9 <font color="#2e2626"><b>{header_date}</b></font><br> 10 <table bgcolor="#f7f7f7" style="border:1px solid black" border="0" width="20%"> 11 <tr bgcolor="#c4bcbc"> 5 12 <td valign="top" width="10%"> <b>{title_field}:</b></td> 6 13 <td valign="top" nowrap>{title_data}</td> 7 14 </tr> 8 <tr >15 <tr bgcolor="#e7dede"> 9 16 <td valign="top" width="10%" nowrap> <b>{location_field}:</b></td> 10 17 <td valign="top" nowrap>{location_data}</td> 11 18 </tr> 12 <tr >19 <tr bgcolor="#c4bcbc"> 13 20 <td valign="top" width="10%" nowrap> <b>{startdate_field}:</b></td> 14 21 <td valign="top" nowrap>{startdate_data}</td> 15 22 </tr> 16 <tr >23 <tr bgcolor="#e7dede"> 17 24 <td valign="top" width="10%" nowrap> <b>{enddate_field}:</b></td> 18 25 <td valign="top" nowrap>{enddate_data}</td> 19 26 </tr> 20 <tr >27 <tr bgcolor="#c4bcbc"> 21 28 <td valign="top" width="10%" nowrap> <b>{description_field}:</b></td> 22 29 <td valign="top" >{description_data}</td> -
trunk/mobile/templates/default/login.tpl
r454 r588 27 27 </tr> 28 28 <tr> 29 <td width=" 66"> </td>29 <td width="120"> </td> 30 30 <td width="135"> 31 31 <input type="submit" value="{lang_login}" name="submitit" class="button"> -
trunk/phpgwapi/inc/class.sbox.inc.php
r2 r588 164 164 { 165 165 $out .= '<option value="'.$i.'"'.($selected!=$i?'':' selected').'>'.($this->monthnames[$i]!=''?lang($this->monthnames[$i]):'').'</option>'."\n"; 166 } 167 return '<select name="'.$name.'">'."\n".$out.'</select>'."\n"; 168 } 169 170 function getMonths($name, $selected=0) 171 { 172 $out = ''; 173 for($i=0;$i<=12;$i++) 174 { 175 $out .= '<option value="'.$i.'"'.($selected!=$i?'':' selected').'>'.($i?$i:'').'</option>'."\n"; 176 // $out .= '<option value="'.($i?$i:'').'"'.($selected!=$i?'':' selected').'>'.($i?$i:'').'</option>'."\n"; 166 177 } 167 178 return '<select name="'.$name.'">'."\n".$out.'</select>'."\n";
Note: See TracChangeset
for help on using the changeset viewer.