Changeset 5399 for trunk/expressoMail1_2
- Timestamp:
- 01/18/12 16:10:57 (12 years ago)
- Location:
- trunk/expressoMail1_2
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/controller.php
r5134 r5399 8 8 } 9 9 require_once '../header.session.inc.php'; 10 require_once '../ API/class.servicelocator.php';10 require_once '../services/class.servicelocator.php'; 11 11 12 12 // Explode action from cExecuteForm function -
trunk/expressoMail1_2/inc/class.ScriptS.inc.php
r5316 r5399 51 51 52 52 include_once dirname(__FILE__).'/../../header.inc.php'; 53 require_once dirname(__FILE__).'/../../ API/class.servicelocator.php';53 require_once dirname(__FILE__).'/../../services/class.servicelocator.php'; 54 54 $alternativeMailService = ServiceLocator::getService('ldap'); 55 55 $this->AlternateEmailExpresso = $alternativeMailService->getMailAlternateByUidNumber($_SESSION['phpgw_info']['expressomail']['user']['account_id']); -
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r5375 r5399 2484 2484 function send_mail($params) 2485 2485 { 2486 require_once dirname(__FILE__) . '/../../ API/class.servicelocator.php';2486 require_once dirname(__FILE__) . '/../../services/class.servicelocator.php'; 2487 2487 $mailService = ServiceLocator::getService('mail'); 2488 2488 … … 3590 3590 { 3591 3591 3592 require_once dirname(__FILE__) . '/../../ API/class.servicelocator.php';3592 require_once dirname(__FILE__) . '/../../services/class.servicelocator.php'; 3593 3593 $mailService = ServiceLocator::getService('mail'); 3594 3594 … … 5009 5009 "$msg_user</body><br><br><hr>"; 5010 5010 5011 require_once dirname(__FILE__) . '/../../ API/class.servicelocator.php';5011 require_once dirname(__FILE__) . '/../../services/class.servicelocator.php'; 5012 5012 $mailService = ServiceLocator::getService('mail'); 5013 5013 $mailService->addStringAttachment($mail_content, 'report.eml', 'application/text'); -
trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
r5316 r5399 1 1 <?php 2 2 3 require_once(dirname(__FILE__).'/../../ API/class.servicelocator.php');3 require_once(dirname(__FILE__).'/../../services/class.servicelocator.php'); 4 4 include_once("class.imap_functions.inc.php"); 5 5 include_once("class.functions.inc.php"); -
trunk/expressoMail1_2/index.php
r5394 r5399 19 19 //jquery and Editor 20 20 echo " <link rel='Stylesheet' type='text/css' href='templates/default/expressoMail_reset.css' /> 21 <script type='text/javascript' src='../prototype/ app/plugins/jquery/jquery.min.js'></script>22 <script type='text/javascript' src='../prototype/ app/plugins/jquery/jquery-ui.min.js'></script>23 <script type='text/javascript' src='../prototype/ app/plugins/jquery/jquery-ui.custom.min.js'></script>24 <script src='../prototype/ app/plugins/json2/json2.js' language='javascript'></script>25 <script src='../prototype/ app/plugins/ejs/ejs.js' language='javascript'></script>26 <script src='../prototype/ app/plugins/store/jquery.store.js' language='javascript'></script>27 <script src='../prototype/ap p/datalayer.js' language='javascript'></script>28 <script type='text/javascript' src='../prototype/ app/plugins/scrollto/jquery.scrollTo.js'></script>21 <script type='text/javascript' src='../prototype/plugins/jquery/jquery.min.js'></script> 22 <script type='text/javascript' src='../prototype/plugins/jquery/jquery-ui.min.js'></script> 23 <script type='text/javascript' src='../prototype/plugins/jquery/jquery-ui.custom.min.js'></script> 24 <script src='../prototype/plugins/json2/json2.js' language='javascript'></script> 25 <script src='../prototype/plugins/ejs/ejs.js' language='javascript'></script> 26 <script src='../prototype/plugins/store/jquery.store.js' language='javascript'></script> 27 <script src='../prototype/api/datalayer.js' language='javascript'></script> 28 <script type='text/javascript' src='../prototype/plugins/scrollto/jquery.scrollTo.js'></script> 29 29 <script language='javascript'>DataLayer.dispatchPath = '../prototype/';</script> 30 <script src='../library/ckeditor/ckeditor.js' language='javascript'></script> 31 <script src='../library/ckeditor/adapters/jquery.js' language='javascript'></script> 32 <link rel='Stylesheet' type='text/css' href='../prototype/app/plugins/jquery/jquery-ui.css' /> 33 <link rel='Stylesheet' type='text/css' href='../prototype/app/plugins/jquery/jquery-ui.custom.css' /> 34 <script type='text/javascript' src='../prototype/app/plugins/timepicker/jquery-ui-timepicker-addon.js'></script> 35 <script type='text/javascript' src='../prototype/app/plugins/jquery/i18n/jquery.ui.datepicker-pt-BR.js'></script> 36 <link rel='Stylesheet' type='text/css' href='../prototype/app/plugins/timepicker/jquery-ui-timepicker-addon.css' /> 37 <link rel='stylesheet' type='text/css' href='../prototype/app/plugins/zebradialog/css/zebra_dialog.css'></link> 38 <script type='text/javascript' src='../prototype/app/plugins/zebradialog/javascript/zebra_dialog.js'></script> 39 <script type='text/javascript' src='../prototype/app/plugins/datejs/date-pt-BR.js'></script> 40 <script type='text/javascript' src='../prototype/app/plugins/datejs/sugarpak.js'></script> 41 <script type='text/javascript' src='../prototype/app/plugins/datejs/parser.js'></script> 42 <script type='text/javascript' src='../prototype/app/plugins/dateFormat/dateFormat.js'></script> 43 <script type='text/javascript' src='../prototype/app/plugins/watermark/jquery.watermarkinput.js'></script> 44 <script type='text/javascript' src='../prototype/app/plugins/mask/jquery.maskedinput.js'></script> 45 <script type='text/javascript' src='../prototype/app/plugins/alphanumeric/jquery.alphanumeric.js'></script> 46 <script> 47 $.ajax({ 48 url: '../prototype/modules/calendar/index.php', 49 async: false, 50 success: function(){ 51 } 52 }); 53 </script> 54 <script type='text/javascript' src='../prototype/app/plugins/timepicker/localization/jquery-ui-timepicker-pt-BR.js'></script> 55 <script type='text/javascript' src='../prototype/modules/calendar/js/calendar.codecs.js'></script> 56 <script type='text/javascript' src='../prototype/modules/calendar/js/helpers.js'></script> 57 <script type='text/javascript' src='../prototype/app/plugins/encoder/encoder.js'></script> 58 <script type='text/javascript' src='../prototype/app/plugins/qtip/jquery.qtip-1.0.0-rc3.min.js'></script> 30 <script src='../library/ckeditor/ckeditor.js' language='javascript'></script> 31 <script src='../library/ckeditor/adapters/jquery.js' language='javascript'></script> 32 <link rel='Stylesheet' type='text/css' href='../prototype/plugins/jquery/jquery-ui.css' /> 33 <link rel='Stylesheet' type='text/css' href='../prototype/plugins/jquery/jquery-ui.custom.css' /> 34 <script type='text/javascript' src='../prototype/plugins/timepicker/jquery-ui-timepicker-addon.js'></script> 35 <script type='text/javascript' src='../prototype/plugins/jquery/i18n/jquery.ui.datepicker-pt-BR.js'></script> 36 <link rel='Stylesheet' type='text/css' href='../prototype/plugins/timepicker/jquery-ui-timepicker-addon.css' /> 37 <link rel='stylesheet' type='text/css' href='../prototype/plugins/zebradialog/css/zebra_dialog.css'></link> 38 <script type='text/javascript' src='../prototype/plugins/zebradialog/javascript/zebra_dialog.js'></script> 39 <script type='text/javascript' src='../prototype/plugins/datejs/date-pt-BR.js'></script> 40 <script type='text/javascript' src='../prototype/plugins/datejs/sugarpak.js'></script> 41 <script type='text/javascript' src='../prototype/plugins/datejs/parser.js'></script> 42 <script type='text/javascript' src='../prototype/plugins/dateFormat/dateFormat.js'></script> 43 <script type='text/javascript' src='../prototype/plugins/watermark/jquery.watermarkinput.js'></script> 44 <script type='text/javascript' src='../prototype/plugins/mask/jquery.maskedinput.js'></script> 45 <script type='text/javascript' src='../prototype/plugins/alphanumeric/jquery.alphanumeric.js'></script> 46 <script type='text/javascript' src='../prototype/plugins/timepicker/localization/jquery-ui-timepicker-pt-BR.js'></script> 47 <script type='text/javascript' src='../prototype/modules/calendar/js/helpers.js'></script> 48 <script type='text/javascript' src='../prototype/modules/calendar/js/calendar.codecs.js'></script> 49 <script type='text/javascript' src='../prototype/plugins/encoder/encoder.js'></script> 50 <script type='text/javascript' src='../prototype/plugins/qtip/jquery.qtip-1.0.0-rc3.min.js'></script> 59 51 <script language='javascript'>var CalendarBkp = Calendar;</script> 60 52 <script src='js/rich_text_editor.js' type='text/javascript'></script> … … 77 69 echo ' 78 70 79 <script type="text/javascript" src="../prototype/ app/plugins/treeview/jquery.treeview.js"></script>80 <script type="text/javascript" src="../prototype/ app/plugins/block/jquery.blockUI.js"></script>81 <script type="text/javascript" src="../prototype/ app/plugins/scrollto/jquery.scrollTo.js"></script>82 83 <link rel="stylesheet" href="../prototype/ app/plugins/treeview/jquery.treeview.css" type="text/css" media="screen" />84 <script src="../prototype/ app/plugins/jqgrid/js/i18n/grid.locale-pt-br.js" type="text/javascript"></script>85 <script src="../prototype/ app/plugins/jqgrid/js/jquery.jqGrid.min.js" type="text/javascript"></script>86 <link rel="stylesheet" href="../prototype/ app/plugins/jqgrid/css/ui.jqgrid.css" type="text/css" />87 <link rel="stylesheet" href="../prototype/ app/plugins/jqgrid/themes/prognusone/jquery-ui-1.8.2.custom.css" type="text/css" />88 89 <script src="../prototype/ app/plugins/countdown/jquery.countdown.min.js" type="text/javascript"></script>90 <script src="../prototype/ app/plugins/countdown/jquery.countdown-pt-BR.js" type="text/javascript"></script>71 <script type="text/javascript" src="../prototype/plugins/treeview/jquery.treeview.js"></script> 72 <script type="text/javascript" src="../prototype/plugins/block/jquery.blockUI.js"></script> 73 <script type="text/javascript" src="../prototype/plugins/scrollto/jquery.scrollTo.js"></script> 74 75 <link rel="stylesheet" href="../prototype/plugins/treeview/jquery.treeview.css" type="text/css" media="screen" /> 76 <script src="../prototype/plugins/jqgrid/js/i18n/grid.locale-pt-br.js" type="text/javascript"></script> 77 <script src="../prototype/plugins/jqgrid/js/jquery.jqGrid.min.js" type="text/javascript"></script> 78 <link rel="stylesheet" href="../prototype/plugins/jqgrid/css/ui.jqgrid.css" type="text/css" /> 79 <link rel="stylesheet" href="../prototype/plugins/jqgrid/themes/prognusone/jquery-ui-1.8.2.custom.css" type="text/css" /> 80 81 <script src="../prototype/plugins/countdown/jquery.countdown.min.js" type="text/javascript"></script> 82 <script src="../prototype/plugins/countdown/jquery.countdown-pt-BR.js" type="text/javascript"></script> 91 83 '; 92 93 /**94 * Importacao de plugins e dados do nova agenda95 *96 *97 */98 99 echo"100 101 <script type='text/javascript' src='../prototype/app/plugins/datejs/date-pt-BR.js'></script>102 <script type='text/javascript' src='../prototype/app/plugins/datejs/sugarpak.js'></script>103 <script type='text/javascript' src='../prototype/app/plugins/datejs/parser.js'></script>104 <script type='text/javascript' src='../prototype/app/plugins/dateFormat/dateFormat.js'></script>105 106 <script src='../prototype/app/plugins/ejs/ejs.js' language='javascript'></script>107 <script src='../prototype/app/plugins/store/jquery.store.js' language='javascript'></script>108 <script src='../prototype/app/datalayer.js' language='javascript'></script>109 <script type='text/javascript' src='../prototype/app/plugins/scrollto/jquery.scrollTo.js'></script>110 <script language='javascript'>DataLayer.dispatchPath = '../prototype/';</script>111 112 <script>113 $.ajax({114 url: '../prototype/modules/calendar/index.php',115 async: false,116 success: function(){117 }118 });119 </script>120 <script type='text/javascript' src='../prototype/modules/calendar/js/calendar.codecs.js'></script>121 <script type='text/javascript' src='../prototype/modules/calendar/js/helpers.js'></script>122 <script language='javascript'>var CalendarBkp = Calendar;</script>123 124 125 126 ";127 84 128 85 echo "<script language='javascript'>Calendar = $.extend(CalendarBkp, Calendar);</script>"; … … 245 202 $template->set_var("user_email",$_SESSION['phpgw_info']['expressomail']['user']['email']); 246 203 include_once dirname(__FILE__) . '/../header.inc.php'; 247 require_once dirname(__FILE__) . '/../ API/class.servicelocator.php';204 require_once dirname(__FILE__) . '/../services/class.servicelocator.php'; 248 205 $alternativeMailService = ServiceLocator::getService('ldap'); 249 206 $AlternateEmailExpresso = Array(); -
trunk/expressoMail1_2/js/main.js
r5394 r5399 3344 3344 function import_calendar(data){ 3345 3345 var import_url = '$this.db_functions.import_vcard&msg_folder='+data; 3346 3347 3346 var logUser; 3347 var up; 3348 3348 function handler_import_calendar(data){ 3349 3349 if(data === true){ … … 3370 3370 modal: true, 3371 3371 resizable : false, 3372 buttons: {3373 Cancel: function() {3374 $( this ).dialog( "close" );3375 },3376 "Importar": function() {3377 $.ajax({3378 url: "controller.php?action="+import_url+'&from_ajax=true&selected='+$("#select-agenda option:selected").val()+'&status='+$("#select-status option:selected").val(),3379 success: function(data){3380 data = connector.unserialize(data);3381 if(data == "ok"){3382 if(!up)3383 alert("Importado com sucesso para "+$("#select-agenda option:selected").text());3384 else3385 alert("Evento atualizado com sucesso ... ");3386 }3387 else{3388 if(!up)3389 alert("Ocorreu um erro ao importar o evento para a agenda "+$("#select-agenda option:selected").text());3390 else3391 alert("Ocorreu um erro ao atualizar o evento ... ");3392 }3393 }3394 });3395 3396 $( this ).dialog( "close" );3397 }3398 },3399 3372 close: function(event) { 3400 3373 event.stopPropagation(); … … 3402 3375 closeOnEscape: true 3403 3376 }); 3404 $.ajax({ 3405 url: '../prototype/modules/calendar/index.php', 3406 async: false, 3407 success: function(){ 3408 $.ajax({ 3409 url: "controller.php?action="+import_url+'&from_ajax=true&id_user='+User.me.id+'&readable=true&cirus_delimiter='+cyrus_delimiter, 3410 async: false, 3411 success: function(data){ 3412 data = connector.unserialize(data); 3413 3414 3415 var createDialog = function(isCorrentEvent){ 3416 3417 if(!(!!isCorrentEvent)){ 3418 $("#select-agenda").html(''); 3419 for(var calendario in Calendar.calendarIds){ 3420 var doc = document .createElement("OPTION"); 3421 doc.value = Calendar.signatures[parseInt(calendario)].calendar.id; 3422 doc.innerHTML = Calendar.signatures[parseInt(calendario)].calendar.name; 3423 $("#select-agenda").append(doc); 3424 }; 3425 3426 }else{ 3427 up = true; 3428 $("#select-agenda").css("display", "none"); 3429 $("#import-dialog" ).children("p:first-child").css("display", "none"); 3430 $("#import-dialog" ).dialog({ 3431 height: 160, 3432 title: 'Atualizar Evento' 3433 }); 3434 $(".ui-dialog-buttonpane").find(".ui-button:last").children().html("Atualizar"); 3435 }; 3436 $( "#import-dialog" ).dialog( "open" ); 3437 }; 3438 3439 3440 3441 if(!!data){ 3442 var isCorrentEvent = false; 3443 var count = 0; 3444 3445 $.getJSON("../prototype/request.php", 3446 { 3447 concept : "calendarToSchedulable", 3448 filter : ['AND', ['IN', 'calendar', Calendar.calendarIds], ['=', 'schedulable', data]] 3449 }, createDialog); 3450 }else{ 3451 createDialog(false); 3452 } 3453 }}); 3454 }}); 3377 $.ajax({ 3378 url: "controller.php?action="+import_url+'&from_ajax=true&id_user='+User.me.id+'&readable=true&cirus_delimiter='+cyrus_delimiter, 3379 async: false, 3380 success: function(data){ 3381 data = connector.unserialize(data); 3382 3383 3384 var createDialog = function(isCorrentEvent){ 3385 3386 if(!(!!isCorrentEvent)){ 3387 $("#select-agenda").html(''); 3388 for(var calendario in Calendar.calendarIds){ 3389 var doc = document .createElement("OPTION"); 3390 doc.value = Calendar.signatures[parseInt(calendario)].calendar.id; 3391 doc.innerHTML = Calendar.signatures[parseInt(calendario)].calendar.name; 3392 $("#select-agenda").append(doc); 3393 3394 }; 3395 $("#import-dialog" ).dialog({ 3396 buttons: { 3397 Cancel: function() { 3398 $( this ).dialog( "close" ); 3399 }, 3400 "Importar" : function(){ 3401 3402 $.ajax({ 3403 url: "controller.php?action="+import_url+'&from_ajax=true&selected='+$("#select-agenda option:selected").val()+'&status='+$("#select-status option:selected").val(), 3404 success: function(msg){ 3405 3406 msg = connector.unserialize(msg) == "ok" ? "Importado com sucesso para " : "Ocorreu um erro ao importar o evento para a agenda "; 3407 3408 alert( msg + $("#select-agenda option:selected").text() ); 3409 3410 $( this ).dialog( "close" ); 3411 } 3412 }); 3413 } 3414 } 3415 }); 3416 3417 }else{ 3418 up = true; 3419 $("#select-agenda").css("display", "none"); 3420 $("#import-dialog" ).children("p:first-child").css("display", "none"); 3421 $("#import-dialog" ).dialog({ 3422 height: 160, 3423 title: 'Atualizar Evento', 3424 buttons: { 3425 Cancel: function() { 3426 $( this ).dialog( "close" ); 3427 }, 3428 "Atualizar": function() { 3429 if ($(".ui-dialog-buttonpane").find(".ui-button:last").children().html() == 'Atualizar'){ 3430 3431 var isOk = DataLayer.put('participant', { id: ( DataLayer.get('participant', ['AND', ['=', 'user', User.me.id], ['=', 'schedulable', isCorrentEvent[0].schedulable]] ) )[0].id, 3432 status: $("#select-status option:selected").val() }); 3433 3434 DataLayer.commit(); 3435 3436 alert( !!isOk ? "Evento atualizado com sucesso ... " : "Ocorreu um erro ao atualizar o evento ... "); 3437 3438 $( this ).dialog( "close" ); 3439 3440 } 3441 } 3442 } 3443 }); 3444 $(".ui-dialog-buttonpane").find(".ui-button:last").children().html("Atualizar"); 3445 }; 3446 $( "#import-dialog" ).dialog( "open" ); 3447 }; 3448 3449 3450 3451 if(!!data){ 3452 var isCorrentEvent = false; 3453 var count = 0; 3454 3455 $.getJSON("../prototype/request.php", 3456 { 3457 concept : "calendarToSchedulable", 3458 filter : ['AND', ['IN', 'calendar', Calendar.calendarIds], ['=', 'schedulable', data]] 3459 }, createDialog); 3460 }else{ 3461 createDialog(false); 3462 } 3463 }}); 3464 3465 } 3466 else 3467 { 3468 if(confirm(get_lang("Do you confirm this import to your Calendar?"))){ 3469 cExecute( import_url + "&from_ajax=true", handler_import_calendar); 3470 } 3455 3471 } 3456 3472 } -
trunk/expressoMail1_2/templates/default/index.tpl
r5389 r5399 198 198 <select style="width:100%;" id="select-status"> 199 199 <option value="1">Eu vou</option> 200 <option value=" 2">Não vou</option>201 <option value=" 3">Tentativa</option>200 <option value="3">Não vou</option> 201 <option value="2">Tentativa</option> 202 202 </select> 203 203 </p>
Note: See TracChangeset
for help on using the changeset viewer.