Changeset 5399
- Timestamp:
- 01/18/12 16:10:57 (12 years ago)
- Location:
- trunk
- Files:
-
- 26 added
- 18 deleted
- 48 edited
- 14 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/calendar/inc/class.bocalendar.inc.php
r5316 r5399 3825 3825 * Cria Arqvuio ICS 3826 3826 */ 3827 require_once dirname(__FILE__).'/../../ API/class.servicelocator.php';3827 require_once dirname(__FILE__).'/../../services/class.servicelocator.php'; 3828 3828 $icalService = ServiceLocator::getService('ical'); 3829 3829 … … 3991 3991 } 3992 3992 3993 require_once dirname(__FILE__) . '/../../ API/class.servicelocator.php';3993 require_once dirname(__FILE__) . '/../../services/class.servicelocator.php'; 3994 3994 $icalService = ServiceLocator::getService('ical'); 3995 3995 $dia_inicio = $array_data_inicio[0]; -
trunk/calendar/inc/class.socalendar_sql.inc.php
r5316 r5399 13 13 * option) any later version. * 14 14 \**************************************************************************/ 15 require_once dirname(__FILE__).'/../../ API/class.servicelocator.php';15 require_once dirname(__FILE__).'/../../services/class.servicelocator.php'; 16 16 17 17 if(isset($_SESSION['isCrun'])) -
trunk/contactcenter/inc/class.bo_global_ldap_catalog.inc.php
r5316 r5399 220 220 { 221 221 222 require_once dirname(__FILE__).'/../../ API/class.servicelocator.php';222 require_once dirname(__FILE__).'/../../services/class.servicelocator.php'; 223 223 $ldapService = ServiceLocator::getService('ldap'); 224 224 -
trunk/expressoAdmin1_2/controller.php
r5133 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/expressoCalendar/index.php
r5341 r5399 1 1 <?php 2 2 3 // $phpgw_flags = Array( 4 // 'currentapp' => 'expressoCalendar',5 // 'noheader' => false,6 // 'nonavbar' => false,7 // 'noappheader' => false,8 // 'noappfooter' => false, 9 // 'nofooter' => false 10 //);11 // 12 // $GLOBALS['phpgw_info']['flags'] = $phpgw_flags;13 // 14 // include('../header.inc.php');15 // $GLOBALS['phpgw']->common->phpgw_exit();3 $GLOBALS['phpgw_info']['flags'] = Array( 'currentapp' => 'expressoCalendar', 4 'noheader' => false, 5 'nonavbar' => false, 6 'noappheader' => true, 7 'noappfooter' => true, 8 'nofooter' => true ); 9 10 require_once( dirname(__FILE__).'/../prototype/api/config.php' ); 11 Config::init(true); 12 $_SESSION['flags']['currentapp'] = 'expressoCalendar'; 13 14 define( 'MODULESURL' , '../prototype/modules/calendar' ); 15 define( 'PLUGINSURL' , '../prototype/plugins' ); 16 16 17 header('location:../prototype/modules/calendar/index.php'); 17 include ROOTPATH.'/modules/calendar/templates/index.ejs'; 18 19 20 18 21 ?> -
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> -
trunk/login.php
r5316 r5399 127 127 include(personalize_include_path('phpgwapi','login')); 128 128 } 129 //Carregando na sessão configurações do usuario usado na nova API. 130 $_SESSION['wallet']['user']['uid'] = $GLOBALS['phpgw_info']['user']['userid']; 131 $_SESSION['wallet']['user']['uidNumber'] = $GLOBALS['phpgw_info']['user']['account_id']; 132 $_SESSION['wallet']['user']['password'] = $GLOBALS['phpgw_info']['user']['passwd']; 133 $_SESSION['wallet']['user']['cn'] = $GLOBALS['phpgw_info']['user']['cn']; 134 $_SESSION['wallet']['user']['mail'] = $GLOBALS['phpgw_info']['user']['email']; 129 135 ?> -
trunk/prototype
-
Property
svn:ignore
set to
.links.php.kate-swp
-
Property
svn:ignore
set to
-
trunk/prototype/REST.php
r5341 r5399 52 52 } 53 53 54 require_once 'ap p/controller.php';54 require_once 'api/controller.php'; 55 55 56 56 $URI = Controller::URI( $concept, $id ); -
trunk/prototype/Sync.php
r5376 r5399 39 39 } 40 40 41 require_once 'ap p/controller.php';41 require_once 'api/controller.php'; 42 42 43 43 $mounted = array(); $synced = array(); -
trunk/prototype/api/cache/MemoryCache.php
r5341 r5399 42 42 43 43 public function __construct($conf=Null) { 44 $this->_memcache = new Memcache();45 $this->_config = $conf;44 //$this->_memcache = new Memcache(); 45 // $this->_config = $conf; 46 46 47 47 // host, port, persistent, weight 48 if($conf!==Null){49 foreach ($conf as $c){50 $result = $this->_memcache->addServer($c[0], $c[1], $c[2], $c[3]);51 }52 }53 else{54 $this->_memcache->addServer('localhost', 11211);55 }48 // if($conf!==Null){ 49 // foreach ($conf as $c){ 50 // $result = $this->_memcache->addServer($c[0], $c[1], $c[2], $c[3]); 51 // } 52 // } 53 // else{ 54 // $this->_memcache->addServer('localhost', 11211); 55 // } 56 56 } 57 57 … … 67 67 public function put($id, $data, $expire=0, $compressed=false){ 68 68 69 ob_start();70 print_r( "criando $id e armazenando no cache" );71 $output = ob_get_clean();72 file_put_contents( "/tmp/cache.log", file_get_contents( "/tmp/cache.log" ) . $output . "\n" );73 69 74 70 // if($compressed) … … 89 85 // $return = $this->_memcache->get($id); 90 86 $return = false; 91 92 if( $return ){93 ob_start();94 print_r( "lendo $id do cache" );95 $output = ob_get_clean();96 file_put_contents( "/tmp/cache.log", file_get_contents( "/tmp/cache.log" ) . $output . "\n" );97 }98 87 99 88 return( $return ); -
trunk/prototype/api/config.php
r5341 r5399 8 8 static function module($config , $module = false) 9 9 { 10 self::init();11 12 10 //Todo: registrar na nova api o currentapp 13 11 if(!$module) 14 12 $module = $_SESSION['flags']['currentapp']; 15 /* 16 if( !isset( $_SESSION['config'][$module] ) ) 17 Carregar Config do modulo 18 */ 13 14 if( !isset( $_SESSION['config'][$module] ) || !isset( $_SESSION['config'][$module][$config] )) 15 $_SESSION['config'][$module] = parse_ini_file( ROOTPATH."/config/$module.ini", true ); 19 16 20 17 return isset($_SESSION['config'][$module][$config]) ? $_SESSION['config'][$module][$config] : false; … … 24 21 static function me($config) 25 22 { 26 self::init(); 23 27 24 return isset($_SESSION['wallet']['user'][$config]) ? $_SESSION['wallet']['user'][$config] : false; 28 29 25 } 30 26 27 static function service( $service , $config ) 28 { 29 if( !isset( $_SESSION['wallet'][$service] ) || !isset( $_SESSION['wallet'][$service][$config] )) 30 $_SESSION['wallet'][$service] = parse_ini_file( ROOTPATH."/config/$service.srv", true ); 31 32 return isset($_SESSION['wallet'][$service][$config]) ? $_SESSION['wallet'][$service][$config] : false; 33 } 34 31 35 static function regSet( $name , $value) 32 36 { 33 37 self::$register[$name] = $value; 34 38 } 35 39 static function regGet ($name ) 36 40 { 37 41 return (isset(self::$register[$name]) ? self::$register[$name] : false ); 38 42 } 39 43 40 static function init( )44 static function init( $header = false ) 41 45 { 42 if ( isset( $_COOKIE[ 'sessionid' ] ) ) 43 session_id( $_COOKIE[ 'sessionid' ] ); 46 47 if( !defined( 'ROOTPATH' ) ) 48 define( 'ROOTPATH', dirname(__FILE__).'/..' ); 49 50 if ( isset( $_COOKIE[ 'sessionid' ] ) ) 51 { 52 session_id( $_COOKIE[ 'sessionid' ] ); 53 $GLOBALS['phpgw']->session->sessionid = $_COOKIE[ 'sessionid' ]; 54 } 55 56 if( !self::$sessionStarted ) 57 self::$sessionStarted = session_start(); 58 59 if( $header === true ) 60 { 61 require_once (dirname(__FILE__).'/../../header.inc.php'); 44 62 45 if( !self::$sessionStarted ) 46 self::$sessionStarted = session_start(); 63 $_SESSION['wallet']['Sieve']['user'] = $GLOBALS['phpgw_info']['user']['account_lid']; 64 $_SESSION['wallet']['Sieve']['password'] = $GLOBALS['phpgw_info']['user']['passwd']; 65 66 $_SESSION['wallet']['Cyrus']['user'] = $GLOBALS['phpgw_info']['user']['account_lid']; 67 $_SESSION['wallet']['Cyrus']['password'] = $GLOBALS['phpgw_info']['user']['passwd']; 68 69 $_SESSION['wallet']['user']['uid'] = $GLOBALS['phpgw_info']['user']['userid']; 70 $_SESSION['wallet']['user']['uidNumber'] = $GLOBALS['phpgw_info']['user']['account_id']; 71 $_SESSION['wallet']['user']['password'] = $GLOBALS['phpgw_info']['user']['passwd']; 72 $_SESSION['wallet']['user']['cn'] = $GLOBALS['phpgw_info']['user']['cn']; 73 $_SESSION['wallet']['user']['mail'] = $GLOBALS['phpgw_info']['user']['email']; 74 75 $_SESSION['wallet']['PostgreSQL']['user'] = $GLOBALS['phpgw_info']['server']['db_user']; 76 $_SESSION['wallet']['PostgreSQL']['password'] = $GLOBALS['phpgw_info']['server']['db_pass']; 77 $_SESSION['wallet']['PostgreSQL']['dbname'] = $GLOBALS['phpgw_info']['server']['db_name']; 78 $_SESSION['wallet']['PostgreSQL']['host'] = $GLOBALS['phpgw_info']['server']['db_host']; 79 80 $_SESSION['wallet']['OpenLDAP']['context'] = $GLOBALS['phpgw_info']['server']['ldap_context']; 81 $_SESSION['wallet']['OpenLDAP']['host'] = $GLOBALS['phpgw_info']['server']['ldap_host']; 82 83 } 84 47 85 } 86 48 87 } 49 88 89 Config::init(); 90 91 50 92 ?> -
trunk/prototype/api/controller.php
r5341 r5399 4 4 define( 'ROOTPATH', dirname(__FILE__).'/..' ); 5 5 6 require_once(ROOTPATH.'/ap p/config.php');6 require_once(ROOTPATH.'/api/config.php'); 7 7 8 8 /** … … 251 251 } 252 252 253 public static function links( $concept ) 253 //TODO: Compatibilizar as configs relativas aos modulos, adicionando os mesmo nos parametros passados 254 public static function links( $concept = false ) 254 255 { 255 256 if( !isset(self::$config[ $concept ]) ) … … 261 262 262 263 public static function isConcept( $concept ) 263 264 { 264 265 if( isset( self::$config[ $concept ] ) && 265 266 self::$config[ $concept ] ) … … 269 270 } 270 271 271 public static function getConcept( $concept )272 public static function getConcept( $concept, $moduleName = false ) 272 273 { 273 274 if( isset( self::$config[ $concept ] ) ) 274 275 return( self::$config[ $concept ] ); 275 276 276 return( self::$config[ $concept ] = self::loadConfig( $concept ) );277 277 return( self::$config[ $concept ] = self::loadConfig( $concept, $moduleName ) ); 278 } 278 279 279 280 public static function loadCache( $cacheType = 'Memory' ) … … 283 284 } 284 285 285 public static function loadConfig( $className, $isService = false ) 286 //TODO: Compatibilizar as configs relativas aos modulos, adicionando os mesmo nos parametros passados 287 public static function loadConfig( $className, $isService = false) 286 288 { 287 289 $fileName = $className.'.'.($isService ? 'srv' : 'ini'); 288 290 289 291 $config = self::$cache->get( $fileName ); 290 292 291 293 if( !$config ) 292 294 { 293 $config = parse_ini_file( ROOTPATH."/config/$fileName", true );295 $config = parse_ini_file( ROOTPATH.'/config/'.$fileName, true ); 294 296 295 297 self::$cache->put( $fileName, $config ); … … 379 381 } 380 382 383 //TODO: Compatibilizar as configs relativas aos modulos, adicionando os mesmo nos parametros passados 381 384 public static function service( $serviceName, $concept = false ) 382 385 { … … 393 396 self::$config[ $serviceName ]['type'] = 'service'; 394 397 395 self::import( 'ap p/'.self::$config[ $serviceName ]['type'] ); //TODO: Item 4398 self::import( 'api/'.self::$config[ $serviceName ]['type'] ); //TODO: Item 4 396 399 397 400 $service = self::load( self::$config[ $serviceName ]['path'], … … 416 419 } 417 420 421 //TODO: Compatibilizar as configs relativas aos modulos, adicionando os mesmo nos parametros passados 418 422 public static function interceptor( $method, $concept = false, $serviceName = false, $isService = false ) 419 423 { … … 506 510 * array( '=' , 'campo' , 'valor' ) 507 511 */ 508 512 513 //TODO: Compatibilizar as configs relativas aos modulos, adicionando os mesmo nos parametros passados 509 514 public static function serviceName( $URI, $original = false ) 510 515 { … … 530 535 } 531 536 537 //TODO: Compatibilizar as configs relativas aos modulos, adicionando os mesmos nas options passadas 532 538 public static function call( $method, $URI, $properties = false, $options = false, $service = false, $noTX = false ) 533 539 { -
trunk/prototype/api/datalayer.js
r5376 r5399 1013 1013 result = this.request( concept, id || filter.filter, filter.criteria ); 1014 1014 1015 if( result && bothSides && !filter.criteria.format ) 1015 if( result && bothSides && (!filter || 1016 !filter.criteria || 1017 !filter.criteria.format) ) 1016 1018 { 1017 1019 var newResult = []; -
trunk/prototype/config/OpenLDAP.srv
r5341 r5399 2 2 class = "OpenLDAP" 3 3 [config] 4 idAtribute = "uidNumber" 4 5 host = 127.0.0.1 5 context = "dc=prognus"6 idAtribute = "uidNumber"7 ;user = expressodev8 ;password = ''9 6 7 ;context = dc=exemplo.com 8 ;user = 9 ;password = -
trunk/prototype/config/PostgreSQL.srv
r5341 r5399 2 2 class = "PostgreSQL" 3 3 [config] 4 port = 5432 5 dbname= expresso 6 7 ;conexão via socket unix 8 host= /tmp 9 ;conexão via tcp 10 ;host = 127.0.0.1 11 12 ;user= 13 ;password= -
trunk/prototype/config/SMTP.srv
r5341 r5399 5 5 prot = 25 6 6 auth = false 7 username = expresso-admin 8 password = prognus 7 ;username = 8 ;password = -
trunk/prototype/converter.php
r5346 r5399 1 1 <?php 2 2 3 require_once 'ap p/controller.php';3 require_once 'api/controller.php'; 4 4 5 5 $args = Controller::call( 'parse', -
trunk/prototype/links.php
r5341 r5399 1 1 <?php 2 2 3 require_once 'ap p/controller.php';3 require_once 'api/controller.php'; 4 4 5 $ links = Controller::links( $_GET['concept'] );5 $concept = isset($_GET['concept']) ? $_GET['concept'] : false; 6 6 7 $ concepts = array();7 $links = Controller::links( $concept ); 8 8 9 foreach( $links as $linkName => $linkTarget ) 9 if( $concept ) 10 $links = array( $concept => $links ); 11 12 $return = array(); 13 14 foreach( $links as $target => $link ) 15 { 16 $concepts = array(); 17 18 foreach( $link as $linkName => $linkTarget ) 10 19 if( Controller::isConcept( $linkName ) ) 11 20 $concepts[ $linkName ] = true; 12 21 13 echo json_encode( array( 'concepts' => $concepts, 'links' => $links ) ); 22 $return[ $target ] = array( 'concepts' => $concepts, 'links' => $link ); 23 } 24 25 echo json_encode( $concept ? $return[ $concept ] : $return ); -
trunk/prototype/me.php
r5341 r5399 1 1 <?php 2 2 3 if ( isset( $_COOKIE[ 'sessionid' ] ) ) 4 session_id( $_COOKIE[ 'sessionid' ] ); 3 require_once (dirname(__FILE__).'/api/controller.php'); 5 4 6 session_start();5 $me = Controller::read(array('concept' => 'user', 'service' => 'OpenLDAP' , 'id' => Config::me('uidNumber'))); 7 6 8 require_once "app/controller.php"; 9 10 echo json_encode( Controller::read(array('concept' => 'user', 'service' => 'OpenLDAP' , 'id' => Config::me('uidNumber'))) ); 7 echo json_encode( $me ); 8 9 // if( !$me ) 10 // return; 11 // 12 // $links = Controller::links(); 13 // 14 // $return = array(); 15 // 16 // foreach( $links as $concept => $link ) 17 // { 18 // $concepts = array(); 19 // 20 // foreach( $link as $linkName => $linkTarget ) 21 // if( Controller::isConcept( $linkName ) ) 22 // $concepts[ $linkName ] = true; 23 // 24 // $return[ $concept ] = array( 'concepts' => $concepts, 'links' => $link ); 25 // } 26 // 27 // echo json_encode( array( 'me' => $me, 'links' => $return ) ); -
trunk/prototype/modules/attach_message/attach_message.js
r5336 r5399 265 265 var firstFolder = jQuery("#foldertree-container") 266 266 .removeClass('empty-container') 267 .html(DataLayer.render(BASE_PATH + 'ap p/templates/foldertree.ejs', {folders: [tree1, tree2, tree3]}))267 .html(DataLayer.render(BASE_PATH + 'api/templates/foldertree.ejs', {folders: [tree1, tree2, tree3]})) 268 268 .find("#foldertree").treeview() 269 269 .click(function(event){ … … 313 313 jQuery("#mailgrid-container") 314 314 .removeClass('empty-container') 315 .html(DataLayer.render(BASE_PATH + 'ap p/templates/messagegrid.ejs', {}))315 .html(DataLayer.render(BASE_PATH + 'api/templates/messagegrid.ejs', {})) 316 316 .find("#message_attacher_grid") 317 317 .jqGrid({ -
trunk/prototype/modules/calendar/alarms.php
r5341 r5399 4 4 define('ROOTPATH', dirname(__FILE__).'/../..'); 5 5 6 require_once ROOTPATH.'/ap p/controller.php';6 require_once ROOTPATH.'/api/controller.php'; 7 7 require_once ROOTPATH.'/modules/calendar/constants.php'; 8 8 … … 37 37 if((((int)( $ev['startTime'] / 1000 )) - ( $v['time'] * $unit )) < time() ) //ja esta na hora de mandar o alarme ? 38 38 { 39 require_once (ROOTPATH.'/ap p/templates/parseTPL.php' );39 require_once (ROOTPATH.'/api/parseTPL.php' ); 40 40 41 41 switch ($v['type']) { … … 87 87 88 88 $mail['isHtml'] = true; 89 $mail['body'] = parseTPL::load_tpl($data,ROOTPATH.'/ app/templates/notify_alarm_body.tpl');89 $mail['body'] = parseTPL::load_tpl($data,ROOTPATH.'/modules/calendar/templates/notify_alarm_body.tpl'); 90 90 91 91 $mail['subject'] = 'Alarme de Calendario'; -
trunk/prototype/modules/calendar/css/layout.css
r5356 r5399 91 91 92 92 .ui-icon.ui-icon-gear { 93 background-image: url( images/cog.png);93 background-image: url(../img/cog.png); 94 94 background-position: 0 0; 95 95 } -
trunk/prototype/modules/calendar/css/style.css
r5351 r5399 26 26 } 27 27 .expresso-calendar-container #trash.empty { 28 background-image: url( images/trash-empty.png);28 background-image: url(../img/trash-empty.png); 29 29 background-repeat: no-repeat; 30 30 background-position: bottom center; … … 32 32 33 33 .expresso-calendar-container #trash.full { 34 background-image: url( images/trash-full.png);34 background-image: url(../img/trash-full.png); 35 35 background-repeat: no-repeat; 36 36 background-position: bottom center; -
trunk/prototype/modules/calendar/export.php
r5341 r5399 1 1 <?php 2 require_once '../../ap p/controller.php';2 require_once '../../api/controller.php'; 3 3 $params = $_GET; 4 4 -
trunk/prototype/modules/calendar/index.php
r5381 r5399 1 <?php2 3 $GLOBALS['phpgw_info']['flags'] = Array( 'currentapp' => 'expressoCalendar',4 'noheader' => false,5 'nonavbar' => false,6 'noappheader' => true,7 'noappfooter' => true,8 'nofooter' => true );9 10 include('../../../header.inc.php');11 12 $_SESSION['flags']['currentapp'] = 'expressoCalendar';13 14 15 $_SESSION['wallet']['Sieve']['user'] = $GLOBALS['phpgw_info']['user']['account_lid'];16 $_SESSION['wallet']['Sieve']['password'] = $GLOBALS['phpgw_info']['user']['passwd'];17 18 $_SESSION['wallet']['Cyrus']['user'] = $GLOBALS['phpgw_info']['user']['account_lid'];19 $_SESSION['wallet']['Cyrus']['password'] = $GLOBALS['phpgw_info']['user']['passwd'];20 21 $_SESSION['wallet']['user']['uid'] = $GLOBALS['phpgw_info']['user']['userid'];22 $_SESSION['wallet']['user']['uidNumber'] = $GLOBALS['phpgw_info']['user']['account_id'];23 $_SESSION['wallet']['user']['password'] = $GLOBALS['phpgw_info']['user']['passwd'];24 $_SESSION['wallet']['user']['cn'] = $GLOBALS['phpgw_info']['user']['cn'];25 $_SESSION['wallet']['user']['mail'] = $GLOBALS['phpgw_info']['user']['email'];26 27 //Configuração caldav28 $_SESSION['config']['expressoCalendar']['useCaldav'] = false;29 $_SESSION['wallet']['caldav']['url'] = 'http://davical.prognus.com.br/caldav.php';30 /////////////////////////////////////////////////////////////////////////////////////////////////////31 32 $_SESSION['wallet']['PostgreSQL']['user'] = $GLOBALS['phpgw_info']['server']['db_user'];33 $_SESSION['wallet']['PostgreSQL']['password'] = $GLOBALS['phpgw_info']['server']['db_pass'];34 $_SESSION['wallet']['PostgreSQL']['dbname'] = $GLOBALS['phpgw_info']['server']['db_name'];35 $_SESSION['wallet']['PostgreSQL']['host'] = $GLOBALS['phpgw_info']['server']['db_host'];36 ?>37 1 <html> 38 2 <head> 39 3 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> 40 <script> 41 function dump(arr,level) { 42 var dumped_text = ""; 43 if(!level) level = 0; 44 45 //The padding given at the beginning of the line. 46 var level_padding = ""; 47 for(var j=0;j<level+1;j++) level_padding += " "; 48 49 if(typeof(arr) == 'object') { //Array/Hashes/Objects 50 for(var item in arr) { 51 var value = arr[item]; 52 53 if(typeof(value) == 'object') { //If it is an array, 54 dumped_text += level_padding + "'" + item + "' ...\n"; 55 dumped_text += dump(value,level+1); 56 } else { 57 dumped_text += level_padding + "'" + item + "' => \"" + value + "\"\n"; 58 } 59 } 60 } else { //Stings/Chars/Numbers etc. 61 dumped_text = "===>"+arr+"<===("+typeof(arr)+")"; 62 } 63 return dumped_text; 64 } 65 </script> 4 <script type='text/javascript' src='js/debug.js'></script> 66 5 <!--<link rel='stylesheet' type='text/css' href="../../../templates/jquery-ui/redmond/jquery-ui.css"/>--> 67 6 68 7 <!--<link rel='stylesheet' type='text/css' href='../fullcalendar/fullcalendar.css' />--> 69 8 <link rel="stylesheet" type="text/css" href="css/reset.css" /> 70 <link rel='stylesheet' type='text/css' href='../../ app/plugins/fullcalendar/fullcalendar.css' />71 <link rel='stylesheet' type='text/css' href='../../ app/plugins/fullcalendar/fullcalendar.print.css' media='print' />72 <link rel='stylesheet' type='text/css' href='../../ app/plugins/jquery/jquery-ui.custom.css'/>73 <link rel='stylesheet' type='text/css' href='../../ app/plugins/icalendar/jquery.icalendar.css'/>74 <link type="text/css" href="../../app/plugins/fgmenu/fg.menu.css" media="screen" rel="stylesheet"/>9 <link rel='stylesheet' type='text/css' href='../../plugins/fullcalendar/fullcalendar.css' /> 10 <link rel='stylesheet' type='text/css' href='../../plugins/fullcalendar/fullcalendar.print.css' media='print' /> 11 <link rel='stylesheet' type='text/css' href='../../plugins/jquery/jquery-ui.custom.css'/> 12 <link rel='stylesheet' type='text/css' href='../../plugins/icalendar/jquery.icalendar.css'/> 13 <link rel="stylesheet" type="text/css" href="../../plugins/fgmenu/fg.menu.css" media="screen"/> 75 14 <!--<link type="text/css" href="../../fgmenu/theme/ui.all.css" media="screen" rel="stylesheet" />--> 76 15 77 <link rel='stylesheet' type='text/css' href='../../ app/plugins/fileupload/jquery.fileupload-ui.css'/>78 <link rel="stylesheet" href="../../app/plugins/jquery.pagination/pagination.css" />16 <link rel='stylesheet' type='text/css' href='../../plugins/fileupload/jquery.fileupload-ui.css'/> 17 <link rel="stylesheet" type='text/css' href="../../plugins/jquery.pagination/pagination.css" /> 79 18 80 19 <!-- JPicker --> 81 <link rel="Stylesheet" type="text/css" href="../../ app/plugins/jpicker/css/jPicker-1.1.6.min.css" />82 <link rel="Stylesheet" type="text/css" href="../../ app/plugins/jpicker/jPicker.css" />20 <link rel="Stylesheet" type="text/css" href="../../plugins/jpicker/css/jPicker-1.1.6.min.css" /> 21 <link rel="Stylesheet" type="text/css" href="../../plugins/jpicker/jPicker.css" /> 83 22 84 <link rel="Stylesheet" type="text/css" href="../../ app/plugins/farbtastic/farbtastic.css" />85 <link rel="Stylesheet" type="text/css" href="../../ app/plugins/timepicker/jquery-ui-timepicker-addon.css" />86 <link rel="stylesheet" type="text/css" href='../../ app/plugins/zebradialog/css/zebra_dialog.css'></link>23 <link rel="Stylesheet" type="text/css" href="../../plugins/farbtastic/farbtastic.css" /> 24 <link rel="Stylesheet" type="text/css" href="../../plugins/timepicker/jquery-ui-timepicker-addon.css" /> 25 <link rel="stylesheet" type="text/css" href='../../plugins/zebradialog/css/zebra_dialog.css'></link> 87 26 88 27 <link rel="stylesheet" type="text/css" href="css/layout.css" /> 89 28 <link rel="stylesheet" type="text/css" href="css/style.css" /> 90 29 91 <script type='text/javascript' src='../../ app/plugins/datejs/date-pt-BR.js'></script>92 <script type='text/javascript' src='../../ app/plugins/jquery/jquery.min.js'></script>93 <script type='text/javascript' src='../../ app/plugins/icalendar/jquery.icalendar.js'></script>94 <script type='text/javascript' src='../../ app/plugins/jquery/jquery-ui.custom.min.js'></script>95 <script type='text/javascript' src="../../ app/plugins/jquery/i18n/jquery.ui.datepicker-pt-BR.js"></script>96 <script type='text/javascript' src="../../ app/plugins/timepicker/jquery-ui-timepicker-addon.js"></script>97 <script type='text/javascript' src="../../ app/plugins/timepicker/localization/jquery-ui-timepicker-pt-BR.js"></script>98 <script type='text/javascript' src='../../ app/plugins/json2/json2.js'></script>99 <script type='text/javascript' src='../../ app/plugins/store/jquery.store.js'></script>100 <script type='text/javascript' src='../../ app/plugins/fileupload/jquery.fileupload.js'></script>101 <script type='text/javascript' src='../../ app/plugins/fileupload/jquery.fileupload-ui.js'></script>102 <script type='text/javascript' src='../../ app/plugins/fileupload/jquery.iframe-transport.js'></script>103 <script type='text/javascript' src='../../ app/plugins/store/jquery.store.js'></script>104 <script type="text/javascript" src="../../ app/plugins/jquery.pagination/jquery.pagination.js"></script>105 <script type='text/javascript' src='../../ app/plugins/mask/jquery.maskedinput.js'></script>106 <script type='text/javascript' src='../../ app/plugins/alphanumeric/jquery.alphanumeric.js'></script>107 <script type='text/javascript' src='../../ app/plugins/watermark/jquery.watermarkinput.js'></script>108 <script type='text/javascript' src='../../ app/plugins/encoder/encoder.js'></script>109 <script type='text/javascript' src='../../ap p/datalayer.js'></script>30 <script type='text/javascript' src='../../plugins/datejs/date-pt-BR.js'></script> 31 <script type='text/javascript' src='../../plugins/jquery/jquery.min.js'></script> 32 <script type='text/javascript' src='../../plugins/icalendar/jquery.icalendar.js'></script> 33 <script type='text/javascript' src='../../plugins/jquery/jquery-ui.custom.min.js'></script> 34 <script type='text/javascript' src="../../plugins/jquery/i18n/jquery.ui.datepicker-pt-BR.js"></script> 35 <script type='text/javascript' src="../../plugins/timepicker/jquery-ui-timepicker-addon.js"></script> 36 <script type='text/javascript' src="../../plugins/timepicker/localization/jquery-ui-timepicker-pt-BR.js"></script> 37 <script type='text/javascript' src='../../plugins/json2/json2.js'></script> 38 <script type='text/javascript' src='../../plugins/store/jquery.store.js'></script> 39 <script type='text/javascript' src='../../plugins/fileupload/jquery.fileupload.js'></script> 40 <script type='text/javascript' src='../../plugins/fileupload/jquery.fileupload-ui.js'></script> 41 <script type='text/javascript' src='../../plugins/fileupload/jquery.iframe-transport.js'></script> 42 <script type='text/javascript' src='../../plugins/store/jquery.store.js'></script> 43 <script type="text/javascript" src="../../plugins/jquery.pagination/jquery.pagination.js"></script> 44 <script type='text/javascript' src='../../plugins/mask/jquery.maskedinput.js'></script> 45 <script type='text/javascript' src='../../plugins/alphanumeric/jquery.alphanumeric.js'></script> 46 <script type='text/javascript' src='../../plugins/watermark/jquery.watermarkinput.js'></script> 47 <script type='text/javascript' src='../../plugins/encoder/encoder.js'></script> 48 <script type='text/javascript' src='../../api/datalayer.js'></script> 110 49 111 50 <!-- Datejs --> 112 51 <!-- <script type='text/javascript' src='../../datejs/core.js'></script> --> 113 <!-- <script type='text/javascript' src='../../app/plugins/datejs/date-pt-BR.js'></script>-->114 <!-- <script type='text/javascript' src='../../ app/plugins/datejs/globalization/pt-BR.js'></script> -->115 <script type='text/javascript' src='../../ app/plugins/datejs/sugarpak.js'></script>116 <script type='text/javascript' src='../../ app/plugins/datejs/parser.js'></script>52 <!-- <script type='text/javascript' src='../../plugins/datejs/date-pt-BR.js'></script>--> 53 <!-- <script type='text/javascript' src='../../plugins/datejs/globalization/pt-BR.js'></script> --> 54 <script type='text/javascript' src='../../plugins/datejs/sugarpak.js'></script> 55 <script type='text/javascript' src='../../plugins/datejs/parser.js'></script> 117 56 118 57 <!-- <script type='text/javascript' src='../../datejs/time.js'></script> --> 119 <script type='text/javascript' src='../../app/plugins/dateFormat/dateFormat.js'></script> 58 <script type='text/javascript' src='../../plugins/dateFormat/dateFormat.js'></script> 59 60 <!--<script type='text/javascript' src='../fullcalendar/fullcalendar.min.js'></script>--> 61 <script type='text/javascript' src='../../plugins/fullcalendar/fullcalendar.js'></script> 62 63 <script type='text/javascript' src='../../plugins/jquery.dateFormat/jquery.dateFormat.js'></script> 64 65 <script type='text/javascript' src='../../plugins/zebradialog/javascript/zebra_dialog.js'></script> 66 <script type='text/javascript' src='../../plugins/scrollto/jquery.scrollTo.js'></script> 67 <!-- <script type='text/javascript' src='../../plugins/view/jquerymx-1.0.custom.min.js'></script> --> 68 <script type='text/javascript' src='../../plugins/ejs/ejs.js'></script> 69 70 <script type="text/javascript" src="../../plugins/fgmenu/fg.menu.js"></script> 71 72 <script type="text/javascript" src="../../plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script> 73 74 <!-- JPicker --> 75 <script type="text/javascript" src="../../plugins/jpicker/jpicker-1.1.6.min.js"></script> 76 <script type="text/javascript" src="../../plugins/farbtastic/farbtastic.js"></script> 77 120 78 <script type='text/javascript' src='js/base64.js'></script> 121 79 <script type='text/javascript' src='js/helpers.js'></script> 122 80 <script type='text/javascript' src='js/calendar.codecs.js'></script> 81 <script type='text/javascript' src='js/I18n.js'></script> 82 <script type="text/javascript" src="js/init.js"></script> 123 83 124 125 126 <!--<script type='text/javascript' src='../fullcalendar/fullcalendar.min.js'></script>-->127 <script type='text/javascript' src='../../app/plugins/fullcalendar/fullcalendar.js'></script>128 <script type='text/javascript' src='js/I18n.js'></script>129 <script type='text/javascript' src='../../app/plugins/jquery.dateFormat/jquery.dateFormat.js'></script>130 131 <script type='text/javascript' src='../../app/plugins/zebradialog/javascript/zebra_dialog.js'></script>132 <script type='text/javascript' src='../../app/plugins/scrollto/jquery.scrollTo.js'></script>133 <!-- <script type='text/javascript' src='../../app/plugins/view/jquerymx-1.0.custom.min.js'></script> -->134 <script type='text/javascript' src='../../app/plugins/ejs/ejs.js'></script>135 136 <script type="text/javascript" src="../../app/plugins/fgmenu/fg.menu.js"></script>137 138 <script type="text/javascript" src="../../app/plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>139 140 <!-- JPicker -->141 <script src="../../app/plugins/jpicker/jpicker-1.1.6.min.js" type="text/javascript"></script>142 143 <script src="../../app/plugins/farbtastic/farbtastic.js" type="text/javascript"></script>144 145 <script type='text/javascript'>146 147 148 $(document).ready(function() {149 150 refresh_calendars();151 $tabs = $('#tabs').tabs({152 add: function( event, ui ) {153 User.lastView = $tabs.tabs('option' ,'selected');154 $tabs.tabs('select', '#' + ui.panel.id);155 },156 remove: function( event, ui ) {157 $tabs.tabs('select', User.lastView);158 },159 show: function( event, ui ){160 delete Calendar.currentViewKey;161 $('#calendar').fullCalendar('refetchEvents');162 }163 })164 .tabs('option', 'tabTemplate', "<li><a href='#{href}'>#{label}</a><span class='ui-icon ui-icon-close'>Remove Tab</span></li>" );165 166 /**167 * Make a button to close the tab168 */169 $tabs.find( "span.ui-icon-close" ).live( "click", function() {170 var index = $( "li", $tabs ).index( $( this ).parent() );171 if($tabs.tabs('option' ,'selected') == index){172 if($tabs.tabs("length") == 2 && User.lastView != 1)173 $tabs.tabs( "select", 0);174 $tabs.tabs( "select", User.lastView);175 }176 if($tabs.tabs('option' ,'selected') == 0 || $tabs.tabs('option' ,'selected') == 1)177 User.lastView = $tabs.tabs('option' ,'selected');178 if(index != -1)179 $tabs.tabs( "remove", index );180 181 182 });183 $('.button.config-menu').button({184 icons: {185 primary: "ui-icon-gear",186 secondary: "ui-icon-triangle-1-s"187 },188 text: false189 });190 $('.button.add').button({191 icons: {192 secondary: "ui-icon-plus"193 }194 })195 196 var miniCalendar = $('.block-vertical-toolbox .mini-calendar').datepicker({197 dateFormat: 'yy-m-d',198 //dateFormat: 'DD, d MM, yy',199 //inline: true,200 firstDay: dayOfWeek(User.preferences.weekStart),201 onSelect: function(dateText, inst)202 {203 $tabs.tabs("select", "#calendar");204 var date = dateText.split('-');205 var dateFullCalendar = $.fullCalendar.formatDate($('#calendar').fullCalendar('getDate'), "yyyy-MM-dd").split('-');206 $('#calendar').fullCalendar('gotoDate',date[0],date[1]-1,date[2]);207 $('#calendar').fullCalendar( 'changeView', 'agendaDay' );208 }209 })210 .find('.ui-icon-circle-triangle-e').removeClass('ui-icon-circle-triangle-e').addClass('ui-icon-triangle-1-e').end()211 .find('.ui-icon-circle-triangle-w').removeClass('ui-icon-circle-triangle-w').addClass('ui-icon-triangle-1-w');212 213 //Onclick do mês214 $('.ui-datepicker-title .ui-datepicker-month').live('click',function(){215 $tabs.tabs("select", "#calendar");216 $('#calendar').fullCalendar('gotoDate',$(this).siblings('span').html(), Date.getMonthNumberFromName($(this).html() == 'Março' ? 'Mar' : $(this).html()),'01');217 $('#calendar').fullCalendar( 'changeView', 'month');218 });219 //Onclick do ano220 $('.ui-datepicker-title .ui-datepicker-year').live('click',function(){221 $tabs.tabs("select", "#calendar");222 $('#calendar').fullCalendar('gotoDate',$(this).html(), '0', '01');223 $('.fc-button-year').click();224 });225 226 //Onclick em um dia do calendário anual227 $( ".fc-day-number" ).live( "click", function() {228 229 var date = $(this).parents('[class*="fc-day-"]').attr('class').match(/fc-day-(\d{4})-(\d{2})-(\d{2})/);230 231 if (date) date.shift();232 else return false;233 234 $('#calendar').fullCalendar('gotoDate',date[0],date[1]-1,date[2]);235 $('#calendar').fullCalendar( 'changeView', 'agendaDay' );236 });237 238 $('.main-search input.search').keydown(function(event){239 if(event.keyCode == 13) {240 Encoder.EncodeType = "entity";241 //$(this).val($(this).val());242 243 add_events_list($(this).val());244 $(this).val('');245 }246 });247 248 $('.block-horizontal-toolbox .main-config-menu').menu({249 content: $('.main-config-menu-content').html(),250 positionOpts: {251 posX: 'left',252 posY: 'bottom',253 offsetX: -140,254 offsetY: 0,255 directionH: 'right',256 directionV: 'down',257 detectH: true, // do horizontal collision detection258 detectV: true, // do vertical collision detection259 linkToFront: false260 },261 flyOut: true,262 showSpeed: 100,263 crumbDefaultText: '>'264 });265 266 $('#trash').droppable({267 drop: function(event, ui){268 // calendar.fullCalendar( 'removeEvents', ui.draggable.attr('event-id') );269 DataLayer.remove( "event", ui.draggable.attr('event-id') );270 $(this).switchClass('empty','full');271 },272 tolerance: "touch"273 });274 275 /* initialize the calendar276 -----------------------------------------------------------------*/277 $(".button.add.add-event").click(function(event){278 var startEvent = new Date();279 if(startEvent.toString('mm') < 30)280 startEvent.add({minutes: 30 - parseInt(startEvent.toString('mm'))});281 else282 startEvent.add({hours: 1, minutes: '-'+startEvent.toString('mm')});283 var endEvent = function(date){284 if(!!User.preferences.defaultCalendar){285 return Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration != "" ?286 (parseInt(date.getTime()) + Calendar.signatureOf[User.preferences.defaultCalendar].calendar.defaultDuration * 60000)287 : (User.preferences.defaultDuration * 60000);288 }else289 return parseInt(date.getTime()) + (User.preferences.defaultDuration * 60000);290 };291 eventDetails({292 startTime: startEvent.getTime(),293 endTime: endEvent(startEvent)294 }, true );295 });296 297 var calendar = $('#calendar').fullCalendar({298 299 defaultView: User.preferences.defaultCalView,300 timeFormat: User.preferences.hourFormat,301 axisFormat: User.preferences.hourFormat,302 eventSources: Calendar.sources,303 304 header: {305 left: 'prev,next today,basicWeek,basicDay',306 center: 'title',307 right: 'agendaDay,agendaWeek,month,year'308 },309 firstDay: dayOfWeek(User.preferences.weekStart),310 editable: true,311 selectable: true,312 selectHelper: true,313 droppable: true, // this allows things to be dropped onto the calendar !!!314 timeFormat: {315 agenda: 'HH:mm{ - HH:mm}',316 '': 'HH:mm{ - HH:mm} }'317 },318 titleFormat: {319 month: 'MMMM yyyy',320 week: "dd[ yyyy] { 'a'[ MMM] dd 'de' MMMM '-' yyyy}",321 day: 'dddd, dd MMM, yyyy'322 },323 columnFormat:{324 month: 'ddd',325 week: 'ddd dd/MM',326 day: 'dddd dd/MM'327 },328 monthNames: ['Janeiro','Fevereiro','Março','Abril','Maio','Junho','Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro' ],329 monthNamesShort: ['Jan','Fev','Mar','Abr','Mai','Jun','Jul','Ago','Set','Out','Nov','Dez'],330 dayNames: [ 'Domingo', 'Segunda', 'Terça', 'Quarta', 'Quinta', 'Sexta', 'Sábado'],331 dayNamesShort: ['Dom','Seg','Ter','Qua','Qui','Sex','Sáb'],332 dayNamesShortest: ['D','S','T','Q','Q','S','S'],333 allDayText: 'Dia todo',334 buttonText: {335 today: 'hoje',336 month: 'mês',337 week: 'semana',338 day: 'dia',339 year: 'ano'340 },341 342 eventRender: function( event, element, view ){343 $(element).attr( 'event-id', event.id );344 },345 346 select: function( start, end, allDay, event, view ){347 eventDetails( { 'start': start,348 'end': end,349 'allDay': allDay } );350 },351 352 eventDrop: function( event ){353 DataLayer.put( "schedulable:calendar", event );354 },355 356 eventResize: function( event ){357 DataLayer.put( "schedulable:calendar", event );358 },359 360 eventClick: function( evt, event, view ){361 eventDetails( DataLayer.get( "schedulable", evt.id), true);362 }363 });364 365 if($(window).height() < $('body').height()){366 var hei = $('body').height() - $(window).height();367 hei = $('#divAppbox').height() - hei;368 $('#divAppbox').css('max-height', hei);369 $('#divAppbox').css('min-height', hei);370 $('body').css('overflow-y','hidden');371 delete hei;372 }373 374 $(window).resize(function(){375 $('#divAppbox').css('max-height', $(window).height() - 104);376 $('#divAppbox').css('min-height', $(window).height() - 104);377 $('#divAppbox').css('overflow-x', 'auto');378 $('#divAppbox').css('overflow-y', 'scroll');379 });380 //Todo chamada do metodo que adiciona ao full calendar o botao de listagem de eventos381 //listEvents();382 });383 </script>384 84 </head> 385 85 -
trunk/prototype/modules/calendar/interceptors/DAViCalAdapter.php
r5366 r5399 39 39 40 40 static function import($data , $params = false) 41 { 41 { 42 42 $user = Controller::find(array('concept' => 'user' , 'service' => 'OpenLDAP' ),false,array('filter' => array('=','uid',$params['owner']))); 43 43 $params['owner'] = $user[0]['id']; … … 87 87 if(isset($params['calendar'])) 88 88 { 89 require_once ROOTPATH.'/ app/plugins/icalcreator/iCalUtilityFunctions.class.php';90 require_once ROOTPATH.'/ app/plugins/icalcreator/iCalcreator.class.php';89 require_once ROOTPATH.'/plugins/icalcreator/iCalUtilityFunctions.class.php'; 90 require_once ROOTPATH.'/plugins/icalcreator/iCalcreator.class.php'; 91 91 92 92 $vcalendar = new icalCreator( ); … … 118 118 119 119 static function move($origem , $destino , $owner) 120 { 120 { 121 121 $user = Controller::find(array('concept' => 'user' , 'service' => 'OpenLDAP' ),false,array('filter' => array('=','uid',$owner))); 122 122 $owner = $user[0]['id']; … … 153 153 { 154 154 ob_start(); 155 require_once ROOTPATH.'/ app/plugins/davicalCliente/caldav-client-v2.php';156 $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$params['collection'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password'] );157 $cal->DoPUTRequest( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$params['collection'].'/'.$params['uid'].'.ics', $data );155 require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php'; 156 $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$params['collection'].'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password'] ); 157 $cal->DoPUTRequest( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$params['collection'].'/'.$params['uid'].'.ics', $data ); 158 158 ob_end_clean(); 159 159 } … … 162 162 { 163 163 ob_start(); 164 require_once ROOTPATH.'/ app/plugins/davicalCliente/caldav-client-v2.php';165 $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$params['collection'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);166 $cal->DoDELETERequest( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$params['collection'].'/'.$data.'.ics' );164 require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php'; 165 $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$params['collection'].'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']); 166 $cal->DoDELETERequest( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$params['collection'].'/'.$data.'.ics' ); 167 167 ob_end_clean(); 168 168 } … … 171 171 { 172 172 ob_start(); 173 require_once ROOTPATH.'/ app/plugins/davicalCliente/caldav-client-v2.php';174 $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);175 $cal->DoDELETERequest( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$data.'/');173 require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php'; 174 $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']); 175 $cal->DoDELETERequest(Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$data.'/'); 176 176 ob_end_clean(); 177 177 } … … 180 180 { 181 181 ob_start(); 182 require_once ROOTPATH.'/ app/plugins/davicalCliente/caldav-client-v2.php';183 $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);182 require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php'; 183 $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']); 184 184 $cal->DoMOVERequest( $origem.'/' , $destination.'/' ); 185 185 ob_end_clean(); … … 189 189 { 190 190 ob_start(); 191 require_once ROOTPATH.'/ app/plugins/davicalCliente/caldav-client-v2.php';192 $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);191 require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php'; 192 $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']); 193 193 ob_end_clean(); 194 194 return $cal->FindCalendars(); … … 198 198 { 199 199 ob_start(); 200 require_once ROOTPATH.'/ app/plugins/davicalCliente/caldav-client-v2.php';201 $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);200 require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php'; 201 $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']); 202 202 203 203 $xml ="<?xml version=\"1.0\" encoding=\"utf-8\" ?> … … 216 216 217 217 218 $cal->DoXMLRequest('MKCALENDAR', $xml, $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$location.'/');218 $cal->DoXMLRequest('MKCALENDAR', $xml, Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$location.'/'); 219 219 ob_end_clean(); 220 220 } … … 223 223 { 224 224 ob_start(); 225 require_once ROOTPATH.'/ app/plugins/davicalCliente/caldav-client-v2.php';226 $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);225 require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php'; 226 $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']); 227 227 228 228 $events = $cal->GetCollectionETags($url) ; … … 234 234 $args = array_merge($args , $sync); 235 235 } 236 237 236 238 237 include ROOTPATH.'/Sync.php'; 239 238 ob_end_clean(); -
trunk/prototype/modules/calendar/interceptors/DBMapping.php
r5376 r5399 682 682 if($valid == true) 683 683 { 684 $newCriteria['filter'] = array('AND',$newCriteria['filter'] , array('=' , 'owner', $_SESSION['wallet']['user']['uidNumber']) );684 $newCriteria['filter'] = array('AND',$newCriteria['filter'] , array('=' , 'owner', Config::me('uidNumber')) ); 685 685 $externalUsers = Controller::find( $newuri , $original['properties'] ? $original['properties'] : null , $newCriteria ); 686 686 … … 709 709 public function createSchedulableMails( &$uri , &$result , &$criteria , $original ){ 710 710 711 require_once (ROOTPATH.'/ app/plugins/icalcreator/iCalcreator.class.php' );712 require_once (ROOTPATH.'/ap p/templates/parseTPL.php' );711 require_once (ROOTPATH.'/plugins/icalcreator/iCalcreator.class.php' ); 712 require_once (ROOTPATH.'/api/parseTPL.php' ); 713 713 $schedulable = Controller::read( array( 'concept' => 'schedulable' , 'id' => $result['id'] )); 714 714 $participants = Controller::find( array( 'concept' => 'participant' ) , false ,array( 'filter' => array('=', 'schedulable' , $result['id']) )) ; … … 777 777 'schedulableLocation' => $schedulable['location'], 778 778 'participants' => $attList 779 ),ROOTPATH.'/ap p/templates/notify_create_body.tpl');779 ),ROOTPATH.'/api/templates/notify_create_body.tpl'); 780 780 781 781 //TODO: Internacionalização do Subject … … 824 824 //HELPERS 825 825 private static function decodeRepeat( $repeat , $start , $end ) { 826 require_once ROOTPATH.'/ app/plugins/when/When.php';826 require_once ROOTPATH.'/plugins/when/When.php'; 827 827 828 828 $r = new When(); … … 982 982 $op = array_shift($filter); 983 983 984 if (is _array($filter[0])) {984 if (isset($filter[0]) && is_array($filter[0])) { 985 985 foreach ($filter as $i => $f) 986 986 $filter[$i] = self::validExternalUserCriteria($f, $map ,$findCalendar ); -
trunk/prototype/modules/calendar/interceptors/Notifications.php
r5341 r5399 2 2 require_once ROOTPATH.'/modules/calendar/constants.php'; 3 3 require_once ROOTPATH.'/modules/calendar/interceptors/Helpers.php'; 4 require_once ROOTPATH.'/ app/plugins/icalcreator/iCalcreator.class.php';5 require_once ROOTPATH.'/ap p/templates/parseTPL.php';4 require_once ROOTPATH.'/plugins/icalcreator/iCalcreator.class.php'; 5 require_once ROOTPATH.'/api/parseTPL.php'; 6 6 7 7 class Notifications extends Helpers … … 140 140 141 141 $subject['notificationType'] = 'Convite de Calendario'; 142 $subject['eventTitle'] = $schedulable['summary'];142 $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8'); 143 143 $subject['startDate'] = date_format( $sTime , 'd/m/Y'); 144 144 $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i'); … … 200 200 201 201 $subject['notificationType'] = 'Convite Aceito'; 202 $subject['eventTitle'] = $schedulable['summary'];202 $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8'); 203 203 $subject['startDate'] = date_format( $sTime , 'd/m/Y'); 204 204 $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i'); … … 241 241 $mail['attachments'][] = $ical; 242 242 $mail['isHtml'] = true; 243 $mail['body'] = parseTPL::load_tpl( $data ,ROOTPATH.'/ app/templates/'.$template.'.tpl');244 $mail['subject'] = parseTPL::load_tpl( $subject ,ROOTPATH.'/ app/templates/notify_subject.tpl');;243 $mail['body'] = parseTPL::load_tpl( $data ,ROOTPATH.'/modules/calendar/templates/'.$template.'.tpl'); 244 $mail['subject'] = parseTPL::load_tpl( $subject ,ROOTPATH.'/modules/calendar/templates/notify_subject.tpl');; 245 245 $mail['from'] = Config::me('mail'); 246 246 $mail['to'] = $to; … … 293 293 294 294 $subject['notificationType'] = 'Cancelamento de Calendario'; 295 $subject['eventTitle'] = $schedulable['summary'];295 $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8'); 296 296 $subject['startDate'] = date_format( $sTime , 'd/m/Y'); 297 297 $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i'); … … 347 347 348 348 $subject['notificationType'] = 'Cancelamento de Calendario'; 349 $subject['eventTitle'] = $schedulable['summary'];349 $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8'); 350 350 $subject['startDate'] = date_format( $sTime , 'd/m/Y'); 351 351 $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i'); … … 421 421 422 422 $subject['notificationType'] = 'Modificação de Calendario'; 423 $subject['eventTitle'] = $schedulable['summary'];423 $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8'); 424 424 $subject['startDate'] = date_format($sTime, 'd/m/Y'); 425 425 $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format($sTime, 'H:i'); -
trunk/prototype/modules/calendar/templates/calendar_list.ejs
r5381 r5399 22 22 </div> 23 23 <a class="cal-list-options-btn my-cal-list-options-btn-<%= agendas_usuario[i].id %>" style="background-color:#<%=assinatures.backgroundColor%>; border-color:#<%= assinatures.borderColor%>;"> 24 <img src=" img/arrow_down.png" width="10" height="10" class="cal-list-img"/>24 <img src="../prototype/modules/calendar/img/arrow_down.png" width="10" height="10" class="cal-list-img"/> 25 25 </a> 26 26 -
trunk/prototype/modules/calendar/templates/calendarlist.ejs
r5341 r5399 10 10 11 11 <a class="cal-list-options-btn my-cal-list-options-btn-<%= i %>" onclick="show_cal_list_options('my-cal-list-options-', <%= i %>)"> 12 <img src=" img/arrow_down.png" width="10" height="10" class="cal-list-img"/>12 <img src="../prototype/modules/calendar/img/arrow_down.png" width="10" height="10" class="cal-list-img"/> 13 13 </a> 14 14 <div class="cal-list-options my-cal-list-options-<%= i %> hidden"> -
trunk/prototype/modules/filters/filters.js
r5341 r5399 229 229 details_container.accordion({autoHeight: false}); 230 230 231 DataLayer.render( BASE_PATH + 'ap p/templates/folderselect.ejs', 'folder:select', function( html ){231 DataLayer.render( BASE_PATH + 'api/templates/folderselect.ejs', 'folder:select', function( html ){ 232 232 details_container.find(".select-folderlist").append( html ); 233 233 }); -
trunk/prototype/plugins/davicalCliente/AWLUtilities.php
r5341 r5399 365 365 366 366 if ( !function_exists("translate") ) { 367 require_once ROOTPATH.'/ app/plugins/davicalCliente/Translation.php';367 require_once ROOTPATH.'/plugins/davicalCliente/Translation.php'; 368 368 369 369 } -
trunk/prototype/plugins/davicalCliente/XMLDocument.php
r5341 r5399 10 10 * 11 11 */ 12 require_once ROOTPATH.'/ app/plugins/davicalCliente/XMLElement.php';12 require_once ROOTPATH.'/plugins/davicalCliente/XMLElement.php'; 13 13 14 14 /** -
trunk/prototype/plugins/davicalCliente/XMLElement.php
r5341 r5399 9 9 * @license http://www.gnu.org/licenses/lgpl-3.0.txt GNU LGPL version 3 or later 10 10 */ 11 require_once ROOTPATH.'/ app/plugins/davicalCliente/AWLUtilities.php';11 require_once ROOTPATH.'/plugins/davicalCliente/AWLUtilities.php'; 12 12 13 13 /** -
trunk/prototype/plugins/davicalCliente/caldav-client-v2.php
r5341 r5399 11 11 */ 12 12 13 require_once ROOTPATH.'/ app/plugins/davicalCliente/XMLDocument.php';13 require_once ROOTPATH.'/plugins/davicalCliente/XMLDocument.php'; 14 14 15 15 /** … … 364 364 $this->requestMethod = 'MOVE'; 365 365 $this->headers[] = 'Destination: '.$this->base_url.$destination; 366 return $this->DoRequest($this->base_url. $origem);366 return $this->DoRequest($this->base_url.urlencode($origem)); 367 367 } 368 368 -
trunk/prototype/plugins/icalcreator/iCalcreator.class.php
r5341 r5399 53 53 /*********************************************************************************/ 54 54 /* since 2.6.22 - 2010-09-25, do NOT remove!! */ 55 require_once ROOTPATH.'/ app/plugins/icalcreator/iCalUtilityFunctions.class.php';55 require_once ROOTPATH.'/plugins/icalcreator/iCalUtilityFunctions.class.php'; 56 56 /*********************************************************************************/ 57 57 /* version, do NOT remove!! */ -
trunk/prototype/post.php
r5341 r5399 5 5 $data = $_REQUEST['data']; unset( $_REQUEST['data'] ); 6 6 7 require_once "ap p/controller.php";7 require_once "api/controller.php"; 8 8 9 9 echo json_encode( Controller::put( $_REQUEST, $data ) ); -
trunk/prototype/request.php
r5341 r5399 26 26 $service = ( $criteria && isset( $criteria['service'] ) )? $criteria['service']: false; 27 27 28 require_once 'ap p/controller.php';28 require_once 'api/controller.php'; 29 29 30 30 ///Conversor Para utf8 ante de codificar para json pois o json so funciona com utf8 -
trunk/prototype/services/PostgreSQL.php
r5341 r5399 96 96 97 97 public function open ( $config ){ 98 98 99 99 $this->config = $config; 100 100 -
trunk/prototype/services/iCal.php
r5344 r5399 1 1 <?php 2 2 3 require_once ROOTPATH.'/ app/plugins/icalcreator/iCalUtilityFunctions.class.php';4 require_once ROOTPATH.'/ app/plugins/icalcreator/iCalcreator.class.php';3 require_once ROOTPATH.'/plugins/icalcreator/iCalUtilityFunctions.class.php'; 4 require_once ROOTPATH.'/plugins/icalcreator/iCalcreator.class.php'; 5 5 require_once ROOTPATH.'/modules/calendar/constants.php'; 6 6 -
trunk/prototype/upload.php
r5341 r5399 3 3 $result = array(); 4 4 5 require_once 'ap p/controller.php';5 require_once 'api/controller.php'; 6 6 $URI = Controller::URI( 'attachment' ); 7 7 -
trunk/services/class.servicelocator.php
r5316 r5399 41 41 } 42 42 43 define_once( 'ROOT', dirname(__FILE__).'/.. /' );43 define_once( 'ROOT', dirname(__FILE__).'/..' ); 44 44 45 45 define_once( 'SERVICES', ROOT.'/services/' );
Note: See TracChangeset
for help on using the changeset viewer.