- Timestamp:
- 08/10/12 12:25:20 (12 years ago)
- Location:
- sandbox/2.4.2-expresso1
- Files:
-
- 11 edited
-
expressoMail1_2/js/main.js (modified) (11 diffs)
-
expressoMail1_2/templates/default/index.tpl (modified) (1 diff)
-
expressoMail1_2/templates/default/main.css (modified) (4 diffs)
-
prototype/modules/calendar/css/layout.css (modified) (2 diffs)
-
prototype/modules/calendar/css/style.css (modified) (2 diffs)
-
prototype/modules/calendar/interceptors/DBMapping.php (modified) (1 diff)
-
prototype/modules/calendar/js/calendar.codecs.js (modified) (5 diffs)
-
prototype/modules/calendar/js/helpers.js (modified) (2 diffs)
-
prototype/modules/mail/css/followupflag.css (modified) (1 diff)
-
prototype/modules/mail/js/followupflag.js (modified) (1 diff)
-
prototype/services/iCal.php (modified) (20 diffs)
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.4.2-expresso1/expressoMail1_2/js/main.js
r6965 r6985 1 1 // Tempo do auto refresh (em milisegundos) 2 //var time_refresh = 300000; 3 var time_refresh = 30000; 2 var time_refresh = 300000; 4 3 5 4 // tempo do auto save (em milisegundos) … … 589 588 var handler_refresh = function(data){ 590 589 handlerMessageFilter = function (data) { 591 if(checkAlarmsFilter){ 592 alarmFollowupflagged('filtersAlarms', data); 593 } 590 alarmFollowupflagged('filtersAlarms', data); 594 591 notificationFilter(data, notifyPermission); 595 596 checkAlarmsFilter = true;597 598 592 } 599 593 /* Busca nas pastas indexadas para ver se há novas mensagens com a flag $FilteredMessage */ … … 3962 3956 type == 'event' ? 3963 3957 {calendar: User.preferences.defaultCalendar ? User.preferences.defaultCalendar : Calendar.calendars[0], calendars: Calendar.calendars} 3964 : {group: Calendar.groups[0].id, groups: Calendar.groups }3958 : {group: Calendar.groups[0].id, groups: Calendar.groups, percentage: 0} 3965 3959 ); 3966 3960 … … 4088 4082 4089 4083 if(typeof(typeImport) == "object"){ 4090 var calendar Permission = typeImport.calendar;4084 var calendarIds = !!typeImport.calendar ? typeImport.calendar : Calendar[typeImport.type]; 4091 4085 typeImport = typeImport.action; 4092 4086 } … … 4100 4094 var options = ''; 4101 4095 4102 if(typeImport == 10){ 4103 for(var i = 0; i < calendarPermission.length; i++) 4104 options += '<option value="'+calendarPermission[i]+'">'+Calendar.signatureOf[calendarPermission[i]].calendar.name+'</option>' 4105 }else{ 4106 for(var id in Calendar.signatures) 4107 options += parseInt(Calendar.signatures[id].isOwner) ? '<option value="'+Calendar.signatures[id].calendar.id+'">'+Calendar.signatures[id].calendar.name+'</option>' : ''; 4096 if(calendarIds){ 4097 for(var i = 0; i < calendarIds.length; i++) 4098 options += '<option value="'+calendarIds[i]+'">'+Calendar.signatureOf[calendarIds[i]].calendar.name+'</option>' 4108 4099 } 4109 4100 … … 4120 4111 url: "controller.php?action="+import_url+'&from_ajax=true&selected='+$("#select-agenda option:selected").val()+'&status='+$("#select-status option:selected").val()+'&uidAccount='+decodeOwner(), 4121 4112 success: function(msg){ 4122 var alt = ( (msg = connector.unserialize(msg)) == "ok") ? "Importado com sucesso para " : "Ocorreu um erro ao importar o evento para a agenda ";4113 var alt = ( (msg = connector.unserialize(msg)) == "ok") ? "Importado com sucesso para " : "Ocorreu um erro ao importar o evento/tarefa para a agenda "; 4123 4114 alert( alt + $("#select-agenda option:selected").text() ); 4124 4115 } … … 4138 4129 url: "controller.php?action="+import_url+'&from_ajax=true&selected=true', 4139 4130 success: function(msg){ 4140 alert( ( ( connector.unserialize(msg)) == "ok") ? "Seu evento foi removido " : "Ocorreu um erro ao remover o evento" );4131 alert( ( ( connector.unserialize(msg)) == "ok") ? "Seu evento/tarefa foi removido " : "Ocorreu um erro ao remover o evento/tarefa" ); 4141 4132 } 4142 4133 }); … … 4147 4138 url: "controller.php?action="+import_url+'&from_ajax=true&selected=true', 4148 4139 success: function(msg){ 4149 alert( ( ( connector.unserialize(msg)) == "ok") ? "Seu evento foi Atualizado com sucesso" : "Ocorreu um erro ao atualizar evento" );4140 alert( ( ( connector.unserialize(msg)) == "ok") ? "Seu evento/tarefa foi Atualizado com sucesso" : "Ocorreu um erro ao atualizar evento/tarefa" ); 4150 4141 } 4151 4142 }); … … 4153 4144 break; 4154 4145 case 6: 4155 var acceptedSuggestion = confirm("Deseja atualizar o evento de acordo com a sugestão ?");4146 var acceptedSuggestion = confirm("Deseja atualizar o evento/tarefa de acordo com a sugestão ?"); 4156 4147 $.ajax({ 4157 4148 url: "controller.php?action="+import_url+'&from_ajax=true&id_user='+User.me.id+'&selected=true&cirus_delimiter='+cyrus_delimiter+'&acceptedSuggestion='+acceptedSuggestion+"&from="+document.getElementById('from_values_'+currentTab).value+'&uidAccount='+decodeOwner(), 4158 4149 success: function(msg){ 4159 4150 if(acceptedSuggestion) 4160 alert( ( ( connector.unserialize(msg)) == "ok") ? "Evento atualizado com sucesso " : "Ocorreu um erro ao atualizar o evento" );4151 alert( ( ( connector.unserialize(msg)) == "ok") ? "Evento/tarefa atualizado com sucesso " : "Ocorreu um erro ao atualizar o evento" ); 4161 4152 } 4162 4153 }); … … 4164 4155 break; 4165 4156 case 9: 4166 alert('Seu evento não possui alterações!');4157 alert('Seu evento/tarefa não possui alterações!'); 4167 4158 return; 4168 4159 break; 4169 4160 case 11: 4170 alert('Este evento já fora importando por algum dos particpantes e já se encontra disponível em sua agenda compartilhada!');4161 alert('Este evento/tarefa já fora importando por algum dos particpantes e já se encontra disponível em sua agenda compartilhada!'); 4171 4162 return; 4172 4163 break; … … 4177 4168 $("#import-dialog" ).dialog({ 4178 4169 height: 160, 4179 title: 'Atualizar Evento ',4170 title: 'Atualizar Evento/Tarefa', 4180 4171 buttons: { 4181 4172 Cancel: function() { -
sandbox/2.4.2-expresso1/expressoMail1_2/templates/default/index.tpl
r6487 r6985 186 186 </fieldset> 187 187 </div> 188 <div id="import-dialog" title="Importar Evento " style="display:none">188 <div id="import-dialog" title="Importar Evento/Tarefa" style="display:none"> 189 189 <p>Seleciona uma Agenda para o Evento :</p> 190 190 <p> -
sandbox/2.4.2-expresso1/expressoMail1_2/templates/default/main.css
r6965 r6985 1060 1060 } 1061 1061 1062 div.new-event-win.active div.button-files-upload {margin: 15px 0 0 0;} 1063 1062 1064 fieldset.alarm{ 1063 1065 border: none !important; … … 1435 1437 1436 1438 .div-addtask #calendar_addtask_details2 textarea { 1437 width: 670px; 1438 } 1439 1440 .div-addtask{ 1441 width: 760px; 1442 } 1443 1444 .calendar-addevent-details-txt-timezone, .calendar-addtask-details-txt-timezone{width: 227px;} 1439 width: 675px; 1440 } 1441 1442 .div-addtask .button-files-upload{width: 100%;} 1443 .div-addtask fieldset.block-add-attendee .search-result-list, fieldset.block-add-activity .search-result-list{width: 330px;} 1444 1445 .new-event-win div.div-addevent, .new-task-win div.div-addtask{width: 775px;} 1446 1447 .calendar-addevent-details-txt-timezone, .calendar-addtask-details-txt-timezone{width: 212px;} 1445 1448 1446 1449 .div-addtask #calendar_addtask_details1 .time-previsao { width: 40px; } … … 1453 1456 .div-addtask #calendar_addtask_details1 .end-time{ width: 40px; } 1454 1457 .div-addtask #calendar_addtask_details1 .end-date{ width: 80px; } 1455 .div-addtask #calendar_addtask_details1 .previsao-termino { margin: 0 0 0 50px; }1458 .div-addtask #calendar_addtask_details1 .previsao-termino { margin: 0 0 0 20px; } 1456 1459 .div-addtask #calendar_addtask_details1 .subitem { margin: 5px; display: block;} 1457 1460 .div-addtask #calendar_addtask_details1 .subitem .span_done{ margin: 0 30px;} … … 1463 1466 .div-addtask #calendar_addtask_details1 .ui-spinner-buttons .ui-spinner-down{height: 8px !important;} 1464 1467 1465 .div-addtask #calendar_addtask_details1 .subitem .span_done.noAction{background-image: url("../img/gray.png"); background-repeat: no-repeat; } 1466 .div-addtask #calendar_addtask_details1 .subitem .span_done.inProcess{background-image: url("../img/yellow.png"); background-repeat: no-repeat;} 1467 .div-addtask #calendar_addtask_details1 .subitem .span_done.finished{background-image: url("../img/green.png"); background-repeat: no-repeat;} 1468 .div-addtask #calendar_addtask_details1 .subitem .span_done.canceled{background-image: url("../img/red.png"); background-repeat: no-repeat;} 1468 .div-addtask #calendar_addtask_details1 .subitem .span_done.noAction{background-image: url("../../../prototype/modules/calendar/img/gray.png"); background-repeat: no-repeat; } 1469 .div-addtask #calendar_addtask_details1 .subitem .span_done.inProcess{background-image: url("../../../prototype/modules/calendar/img/yellow.png"); background-repeat: no-repeat;} 1470 .div-addtask #calendar_addtask_details1 .subitem .span_done.finished{background-image: url("../../../prototype/modules/calendar/img/green.png"); background-repeat: no-repeat;} 1471 .div-addtask #calendar_addtask_details1 .subitem .span_done.canceled{background-image: url("../../../prototype/modules/calendar/img/red.png"); background-repeat: no-repeat;} 1472 1473 #calendar_addtask_details4{margin: 0;} 1474 #calendar_addtask_details5{margin: -2px 0 0 0;} 1475 #calendar_addtask_details7{margin: 3px 0 0 0;} 1469 1476 .div-addtask #calendar_addtask_details1 .subitem .span_done label{position: relative; left: 28px;} 1470 1477 1471 1478 .div-addtask fieldset#calendar_addtask_details5.tab-level2{ margin: 0 } 1472 1479 1473 .div-addtask #calendar_addtask_details8 .parent {width: 715px; min-height: 208px; float: left;} 1474 .div-addtask #calendar_addtask_details8 .parent .child-top {width: 745px; height: 30px; background: #E8F4FD; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;} 1480 .div-addtask #calendar_addtask_details8 .parent {width: 746px; min-height: 208px; float: left;} 1481 /*.div-addtask #calendar_addtask_details8 .parent .child-top {width: 745px; height: 20px; background: #E8F4FD; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;}*/ 1482 .div-addtask #calendar_addtask_details8 .parent .child-top {width: 745px; height: 25px; background: #E8F4FD; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC; border-top: 1px solid #CCC;} 1475 1483 .div-addtask #calendar_addtask_details8 .parent .child-bottom {width: 745px; height: 208px; overflow: auto; float: left; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;} 1476 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each { height: 30px; }1484 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each { height: 20px; } 1477 1485 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each:hover { background: #FFF2F2; cursor: pointer;} 1478 1486 1479 1480 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .date-hour { width: 30%; float: left; height: 30px} 1487 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .date-hour {overflow: hidden; width: 140px; float: left; height: 20px} 1481 1488 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .date-hour span { margin: 8px; float: left; } 1482 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .organization{ width: 69%; float: left; height: 30px; border-left: 1px solid #CCC; } 1483 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .organization span{ margin: 8px; float: left; } 1484 1485 1486 .div-addtask #calendar_addtask_details8 .parent .child-top .date-hour { width: 29%; float: left; background: #E8F4FD; height: 30px; } 1487 .div-addtask #calendar_addtask_details8 .parent .child-top .date-hour span{ margin: 8px; float: left; font-weight: bold; color: #2E6E9E; } 1488 .div-addtask #calendar_addtask_details8 .parent .child-top .organization { width: 70%; float: left; background: #E8F4FD; height: 30px; border-left: 1px solid #CCC; font-weight: bold; color: #2E6E9E; } 1489 .div-addtask #calendar_addtask_details8 .parent .child-top .organization span{margin: 8px; float: left; } 1489 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .user{overflow: hidden; width: 150px; float: left; height: 20px; border-left: 1px solid #CCC; } 1490 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .user span{ margin: 8px; float: left; } 1491 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .attribute{overflow: hidden; width: 130px; float: left; height: 20px; border-left: 1px solid #CCC; } 1492 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .attribute span{ margin: 8px; float: left; } 1493 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .beforeValue{overflow: hidden; width: 150px; float: left; height: 20px; border-left: 1px solid #CCC; } 1494 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .beforeValue span{ margin: 8px; float: left; } 1495 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .afterValue{overflow: hidden; width: 150px; float: left; height: 20px; border-left: 1px solid #CCC; } 1496 .div-addtask #calendar_addtask_details8 .parent .child-bottom .child-bottom-each .afterValue span{ margin: 8px; float: left; } 1497 1498 .div-addtask #calendar_addtask_details8 .parent .child-top .date-hour { width: 140px; float: left; background: #E8F4FD; height: 20px; text-align: center; } 1499 .div-addtask #calendar_addtask_details8 .parent .child-top .date-hour span{ display: block; padding: 6px; font-weight: bold; color: #2E6E9E; } 1500 .div-addtask #calendar_addtask_details8 .parent .child-top .user { width: 150px; float: left; background: #E8F4FD; height: 20px; font-weight: bold; color: #2E6E9E; text-align: center;} 1501 .div-addtask #calendar_addtask_details8 .parent .child-top .user span{display: block; padding: 6px;} 1502 .div-addtask #calendar_addtask_details8 .parent .child-top .attribute { width: 130px; float: left; background: #E8F4FD; height: 20px; font-weight: bold; color: #2E6E9E; text-align: center;} 1503 .div-addtask #calendar_addtask_details8 .parent .child-top .attribute span{display: block; padding: 6px;} 1504 .div-addtask #calendar_addtask_details8 .parent .child-top .beforeValue { width: 150px; float: left; background: #E8F4FD; height: 20px; font-weight: bold; color: #2E6E9E; text-align: center;} 1505 .div-addtask #calendar_addtask_details8 .parent .child-top .beforeValue span{display: block; padding: 6px; } 1506 .div-addtask #calendar_addtask_details8 .parent .child-top .afterValue { width: 150px; float: left; background: #E8F4FD; height: 20px; font-weight: bold; color: #2E6E9E; text-align: center;} 1507 .div-addtask #calendar_addtask_details8 .parent .child-top .afterValue span{display: block; padding: 6px; } -
sandbox/2.4.2-expresso1/prototype/modules/calendar/css/layout.css
r6984 r6985 983 983 } 984 984 985 .new-task-win div.div-addtask { padding: 0; width: 770px; border: 0;}986 985 .new-event-win form.form-addevent { padding: 9px; } 987 986 … … 990 989 .new-activity-win form.form-addevent { padding: 9px; } 991 990 .ui-dialog .ui-dialog-content { padding: 0; } 992 .new-event-win div.div-addevent, .new-task-win div.div-addtask { padding: 0; width: 700px; border: 0;} 991 .new-event-win div.div-addevent{ padding: 0; width: 700px; border: 0;} 992 .new-task-win div.div-addtask { padding: 0; width: 774px; border: 0;} 993 993 .new-event-win form.form-addevent, .new-task-win form.form-addtask { padding: 9px; } 994 994 .new-activity-win div.div-addevent { padding: 0; width: 700px; border: 0;} -
sandbox/2.4.2-expresso1/prototype/modules/calendar/css/style.css
r6984 r6985 414 414 .events-list-win table tr.last-event-same-start-date td { border-bottom: 1px solid #ccc;} 415 415 .events-list-win table th.start-date-multiple-events { border-bottom: 1px solid #ccc; } 416 417 .events-list-win .fc-header-right.list-right{width: 26%} 416 418 417 419 .events-list-win table .title { … … 658 660 .div-addactivity #group_addactivity_details6 .parent .child-top .afterValue { width: 129px; float: left; background: #E8F4FD; height: 20px; font-weight: bold; color: #2E6E9E; text-align: center;} 659 661 .div-addactivity #group_addactivity_details6 .parent .child-top .afterValue span{display: block; padding: 6px; } 660 661 662 /**********************************************************************************************************/663 664 /*665 .div-addactivity #group_addactivity_details6 .parent {width: 680px; min-height: 268px; float: left;}666 .div-addactivity #group_addactivity_details6 .parent .child-top {width: 690px; height: 30px; background: #E8F4FD; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;}667 .div-addactivity #group_addactivity_details6 .parent .child-bottom {width: 690px; height: 220px; overflow: auto; float: left; border-left: 1px solid #CCC; border-right: 1px solid #CCC; border-bottom: 1px solid #CCC;}668 .div-addactivity #group_addactivity_details6 .parent .child-bottom .child-bottom-each { height: 30px; }669 .div-addactivity #group_addactivity_details6 .parent .child-bottom .child-bottom-each:hover { background: #FFF2F2; cursor: pointer;}670 671 .div-addactivity #group_addactivity_details6 .parent .child-bottom .child-bottom-each .date-hour { width: 30%; float: left; height: 30px}672 .div-addactivity #group_addactivity_details6 .parent .child-bottom .child-bottom-each .date-hour span { margin: 8px; float: left; }673 .div-addactivity #group_addactivity_details6 .parent .child-bottom .child-bottom-each .organization{ width: 69%; float: left; height: 30px; border-left: 1px solid #CCC; }674 .div-addactivity #group_addactivity_details6 .parent .child-bottom .child-bottom-each .organization span{ margin: 8px; float: left; }675 676 .div-addactivity #group_addactivity_details6 .parent .child-top .date-hour { width: 29%; float: left; background: #E8F4FD; height: 30px; }677 .div-addactivity #group_addactivity_details6 .parent .child-top .date-hour span{ margin: 8px; float: left; font-weight: bold; color: #2E6E9E; }678 .div-addactivity #group_addactivity_details6 .parent .child-top .organization { width: 70%; float: left; background: #E8F4FD; height: 30px; border-left: 1px solid #CCC; font-weight: bold; color: #2E6E9E; }679 .div-addactivity #group_addactivity_details6 .parent .child-top .organization span{margin: 8px; float: left; }680 */ -
sandbox/2.4.2-expresso1/prototype/modules/calendar/interceptors/DBMapping.php
r6977 r6985 1242 1242 if (count($result) > 0) { 1243 1243 foreach ($result as $value) { 1244 if (isset($value['isOwner']) && $value['isOwner'] != 0 )1244 if (isset($value['isOwner']) && $value['isOwner'] != 0 && isset($value['type']) && $value['type'] == 0) 1245 1245 $isValidSignature = true; 1246 1247 1246 } 1248 1247 } -
sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.codecs.js
r6979 r6985 731 731 dueTime: (!objEvent.due || objEvent.due == '' || objEvent.due == '0') ? '' : dateCalendar.formatDate(Timezone.getDateEvent(new Date( parseInt(objEvent.due)), objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'startTime'), User.preferences.hourFormat), 732 732 allDay: !!parseInt( objEvent.allDay ), 733 historic: !!objEvent.historic ? decodeHisto tic(objEvent) : [] ,733 historic: !!objEvent.historic ? decodeHistoric(objEvent) : [] , 734 734 attachments: $.map(objEvent.attachments || [], function( attachment, i ){ 735 735 var attach = DataLayer.get('schedulableToAttachment', attachment, false); … … 807 807 }); 808 808 809 function decodeHisto tic ( evt ) {809 function decodeHistoric ( evt ) { 810 810 var historic = evt.historic; 811 811 var decoded = []; … … 819 819 'priority': 'Priorudade', 820 820 'due' : 'Previsão de término' 821 } 822 823 var statusDecoded = { 824 1: 'Sem ações', 825 2: 'Em processo', 826 3: 'Finalzada', 827 4: 'Cancelada', 821 828 } 822 829 … … 863 870 time: decodeDate(historic.time) 864 871 } 872 case 'status': 873 return{ 874 user :$.type(historic.user) == 'object' ? historic.user : DataLayer.get('user', historic.user), 875 attribute :attributeDecoded[historic.attribute], 876 beforeValue : statusDecoded[historic.beforeValue], 877 afterValue : statusDecoded[historic.afterValue], 878 time: decodeDate(historic.time) 879 } 865 880 break; 866 881 default: … … 1036 1051 tasks[task.id].description = tasks[task.id].startDate + ' - ' + (!!task.summary ? task.summary : task.description); 1037 1052 1038 historic.push({'task': (!!task.summary ? task.summary : task.description) , 'historic': decodeHisto tic(task)});1053 historic.push({'task': (!!task.summary ? task.summary : task.description) , 'historic': decodeHistoric(task)}); 1039 1054 } 1040 1055 -
sandbox/2.4.2-expresso1/prototype/modules/calendar/js/helpers.js
r6981 r6985 2347 2347 2348 2348 function paginatorList(currentView, view, type){ 2349 $(currentView+' .events-list.events-list-win.active .list-events-paginator .fc-header-title').html('<h2>'+mountTitleList( parseInt($( '[name = page_index]').val()),view)+'</h2>');2349 $(currentView+' .events-list.events-list-win.active .list-events-paginator .fc-header-title').html('<h2>'+mountTitleList( parseInt($(currentView+' [name = page_index]').val()),view)+'</h2>'); 2350 2350 $(currentView+' .events-list.events-list-win.active .header-paginator .fc-header-right .fc-button').removeClass('fc-state-active') 2351 2351 if(view == 'basicDay') … … 2389 2389 var paginator = $(this).attr('class'); 2390 2390 if(paginator.indexOf('next') > 0) 2391 pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($( '[name = page_index]').val())) +1), view, type);2391 pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($(currentView+' [name = page_index]').val())) +1), view, type); 2392 2392 else 2393 pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($( '[name = page_index]').val())) -1), view, type);2393 pageselectCallback($(currentView+' [name = keyword]').val(), ((parseInt($(currentView+' [name = page_index]').val())) -1), view, type); 2394 2394 }); 2395 2395 } -
sandbox/2.4.2-expresso1/prototype/modules/mail/css/followupflag.css
r6724 r6985 231 231 .content-alarm ul { 232 232 max-height: 100px; 233 overflow: auto;233 overflow: hidden; 234 234 } 235 235 .content-alarm { -
sandbox/2.4.2-expresso1/prototype/modules/mail/js/followupflag.js
r6751 r6985 720 720 return; 721 721 } 722 if($(event.target ).hasClass('confirm-alarm')){722 if($(event.target.parentElement).hasClass('confirm-alarm')){ 723 723 ok_function(event, type, type_cookie); 724 724 $('.'+type).remove(); -
sandbox/2.4.2-expresso1/prototype/services/iCal.php
r6951 r6985 292 292 293 293 public function parse($data, $params = false) { 294 Config::regSet('noAlarm', TRUE); //Evita o envio de notifica ção294 Config::regSet('noAlarm', TRUE); //Evita o envio de notificação 295 295 $vcalendar = new icalCreator( ); 296 296 $vcalendar->parse(trim($data)); … … 305 305 $interation = array(); 306 306 $uid = $component->getProperty('uid', false, false); //Resgata o uid do componente 307 308 ob_start();309 print_r(strtoupper($component->objName));310 $output = ob_get_clean();311 file_put_contents( "/tmp/acoutinho.log", $output , FILE_APPEND);312 313 307 314 308 switch (strtoupper($component->objName)) { … … 352 346 } 353 347 354 Config::regSet('noAlarm', FALSE); //reativa notifica ção348 Config::regSet('noAlarm', FALSE); //reativa notificação 355 349 } else { 356 350 357 if (self::_getTime($component, 'dtstamp') > $schedulable['dtstamp'] || $component->getProperty('sequence', false, false) > $schedulable['sequence']) //Organizador esta requisitando que voc êatualize o evento351 if (self::_getTime($component, 'dtstamp') > $schedulable['dtstamp'] || $component->getProperty('sequence', false, false) > $schedulable['sequence']) //Organizador esta requisitando que você atualize o evento 358 352 $interation = self::_makeVEVENT($schedulable, $component, $params); 359 353 else if ($component->getProperty('sequence', false, false) === $schedulable['sequence']) { 360 354 //Ler melhor rfc sobre isto 3.2.2.2 361 //Aparentemente épara retornar um ical com o evento atualizado para o attende355 //Aparentemente é para retornar um ical com o evento atualizado para o attende 362 356 } 363 357 … … 368 362 }else 369 363 $pID = self::_getParticipantByMail(Config::me('mail'), $schedulable['participants']); 370 //Verifica a importa ção de eventos em que não participo364 //Verifica a importação de eventos em que não participo 371 365 if ($pID) { 372 366 $interation['participant://' . $pID]['status'] = $params['status']; … … 377 371 $interation = self::_makeVEVENT(array(), $component, $params); 378 372 379 if (strpos($params['prodid'], 'kigkonsult.se') !== false) { //envia notifica ção para fora373 if (strpos($params['prodid'], 'kigkonsult.se') !== false) { //envia notificação para fora 380 374 381 375 /* Data de Inicio */ … … 650 644 $interation['participant://' . $pID]['status'] = $params['status']; 651 645 } 652 Config::regSet('noAlarm', FALSE); //reativa notifica ção646 Config::regSet('noAlarm', FALSE); //reativa notificação 653 647 } else { 654 648 655 if (self::_getTime($component, 'dtstamp') > $schedulable['dtstamp'] || $component->getProperty('sequence', false, false) > $schedulable['sequence']) //Organizador esta requisitando que voc êatualize o evento649 if (self::_getTime($component, 'dtstamp') > $schedulable['dtstamp'] || $component->getProperty('sequence', false, false) > $schedulable['sequence']) //Organizador esta requisitando que você atualize o evento 656 650 $interation = self::_makeVEVENT($schedulable, $component, $params); 657 651 else if ($component->getProperty('sequence', false, false) === $schedulable['sequence']) { 658 652 //Ler melhor rfc sobre isto 3.2.2.2 659 //Aparentemente épara retornar um ical com o evento atualizado para o attende653 //Aparentemente é para retornar um ical com o evento atualizado para o attende 660 654 } 661 655 … … 666 660 }else 667 661 $pID = self::_getParticipantByMail(Config::me('mail'), $schedulable['participants']); 668 //Verifica a importa ção de eventos em que não participo662 //Verifica a importação de eventos em que não participo 669 663 if ($pID) { 670 664 $interation['participant://' . $pID]['status'] = $params['status']; … … 675 669 $interation = self::_makeVEVENT(array(), $component, $params); 676 670 677 if (strpos($params['prodid'], 'kigkonsult.se') !== false) { //envia notifica ção para fora671 if (strpos($params['prodid'], 'kigkonsult.se') !== false) { //envia notificação para fora 678 672 679 673 /* Data de Inicio */ … … 944 938 switch ($method) { 945 939 case 'PUBLISH': 946 $interation = ICAL_ACTION_IMPORT;940 $interation = array('action' => ICAL_ACTION_IMPORT, 'type' => 'calendarIds'); 947 941 break; 948 942 … … 961 955 if (!self::_existInMyCalendars($schedulable['id'], $params['owner'])) { 962 956 $interation = ICAL_ACTION_UPDATE; 963 $interation = ( strrpos($value['acl'], ATTENDEE_ACL_PARTICIPATION_REQUIRED) ) ? ICAL_ACTION_IMPORT_REQUIRED : ICAL_ACTION_IMPORT;957 $interation = ( strrpos($value['acl'], ATTENDEE_ACL_PARTICIPATION_REQUIRED) ) ? ICAL_ACTION_IMPORT_REQUIRED : array('action' => ICAL_ACTION_IMPORT, 'type' => 'calendarIds'); 964 958 break; 965 959 } 966 960 } else { 967 if (self::_getTime($component, 'dtstamp') > $schedulable['dtstamp'] || $component->getProperty('sequence', false, false) > $schedulable['sequence']) //Organizador esta requisitando que voc êatualize o evento961 if (self::_getTime($component, 'dtstamp') > $schedulable['dtstamp'] || $component->getProperty('sequence', false, false) > $schedulable['sequence']) //Organizador esta requisitando que você atualize o evento 968 962 $interation = ($isOrganizer) ? ICAL_ACTION_ORGANIZER_UPDATE : ICAL_ACTION_UPDATE; 969 963 else … … 974 968 } 975 969 }else 976 $interation = ICAL_ACTION_IMPORT;970 $interation = array('action' => ICAL_ACTION_IMPORT, 'type' => 'calendarIds'); 977 971 978 972 if(($interation != ICAL_ACTION_NONE) && ($interation != ICAL_ACTION_ORGANIZER_NONE) && ($interation != ICAL_ACTION_ORGANIZER_UPDATE) && ($interation != ICAL_ACTION_NONE)) { … … 1024 1018 $interation = ICAL_ACTION_NONE; 1025 1019 else // Importar evento 1026 $interation = ICAL_ACTION_IMPORT;1020 $interation = array('action' => ICAL_ACTION_IMPORT, 'type' => 'calendarIds'); 1027 1021 1028 1022 break; … … 1034 1028 switch ($method) { 1035 1029 case 'PUBLISH': 1036 $interation = ICAL_ACTION_IMPORT;1030 $interation = array('action' => ICAL_ACTION_IMPORT, 'type' => 'groupIds'); 1037 1031 break; 1038 1032 … … 1050 1044 $isOrganizer = true; 1051 1045 1052 if (!self::_existInMyCalendars($schedulable['id'], $params['owner'])) { 1053 1054 ob_start(); 1055 print_r($schedulable['id']); 1056 print_r( $params['owner']); 1057 $output = ob_get_clean(); 1058 file_put_contents( "/tmp/acoutinho.log", $output , FILE_APPEND); 1059 1060 $interation = ICAL_ACTION_IMPORT; 1046 if (!self::_existInMyCalendars($schedulable['id'], $params['owner'])) { 1047 $interation = array('action' => ICAL_ACTION_IMPORT, 'type' => 'groupIds'); 1061 1048 break; 1062 1049 } 1063 1050 } else { 1064 if (self::_getTime($component, 'dtstamp') > $schedulable['dtstamp'] || $component->getProperty('sequence', false, false) > $schedulable['sequence']) //Organizador esta requisitando que voc êatualize o evento1051 if (self::_getTime($component, 'dtstamp') > $schedulable['dtstamp'] || $component->getProperty('sequence', false, false) > $schedulable['sequence']) //Organizador esta requisitando que você atualize o evento 1065 1052 $interation = ($isOrganizer) ? ICAL_ACTION_ORGANIZER_UPDATE : ICAL_ACTION_UPDATE; 1066 1053 else … … 1071 1058 } 1072 1059 }else 1073 $interation = ICAL_ACTION_IMPORT;1060 $interation = array('action' => ICAL_ACTION_IMPORT, 'type' => 'groupIds'); 1074 1061 break; 1075 1062 … … 1104 1091 $interation = ICAL_ACTION_NONE; 1105 1092 else // Importar evento 1106 $interation = ICAL_ACTION_IMPORT;1093 $interation = array('action' => ICAL_ACTION_IMPORT, 'type' => 'groupIds'); 1107 1094 1108 1095 break; … … 1408 1395 $participant['isOrganizer'] = '0'; 1409 1396 1410 /* Verifica se este usuario éum usuario interno do ldap */1397 /* Verifica se este usuario é um usuario interno do ldap */ 1411 1398 $intUser = Controller::find(array('concept' => 'user'), array('id', 'isExternal'), array('filter' => array('OR', array('=', 'mail', $mailUser), array('=', 'mailAlternateAddress', $mailUser)))); 1412 1399 … … 1443 1430 $participant['acl'] = 'rowi'; 1444 1431 1445 /* Verifica se este usuario éum usuario interno do ldap */1432 /* Verifica se este usuario é um usuario interno do ldap */ 1446 1433 $intUser = Controller::find(array('concept' => 'user'), array('id', 'isExternal'), array('filter' => array('OR', array('=', 'mail', $mailUser), array('=', 'mailAlternateAddress', $mailUser)))); 1447 1434 … … 1666 1653 $participant['isOrganizer'] = '0'; 1667 1654 1668 /* Verifica se este usuario éum usuario interno do ldap */1655 /* Verifica se este usuario é um usuario interno do ldap */ 1669 1656 $intUser = Controller::find(array('concept' => 'user'), array('id', 'isExternal'), array('filter' => array('OR', array('=', 'mail', $mailUser), array('=', 'mailAlternateAddress', $mailUser)))); 1670 1657 … … 1701 1688 $participant['acl'] = 'rowi'; 1702 1689 1703 /* Verifica se este usuario éum usuario interno do ldap */1690 /* Verifica se este usuario é um usuario interno do ldap */ 1704 1691 $intUser = Controller::find(array('concept' => 'user'), array('id', 'isExternal'), array('filter' => array('OR', array('=', 'mail', $mailUser), array('=', 'mailAlternateAddress', $mailUser)))); 1705 1692
Note: See TracChangeset
for help on using the changeset viewer.
