Changeset 8265
- Timestamp:
- 11/25/13 17:17:06 (10 years ago)
- Location:
- sandbox/2.5.1-evolucao
- Files:
-
- 1 added
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.5.1-evolucao/INSTALL/arquivos/expresso-cron
r8137 r8265 5 5 6 6 # Utilizado para verificar se ha algum alarme, por e-mail, do modulo ExpressoCalendar 7 #CENTOS*/1 * * * * apache phpEXPRESSO_DIR/prototype/modules/calendar/alarms.php 1>& /dev/null8 #DEBIAN*/1 * * * * www-data php5EXPRESSO_DIR/prototype/modules/calendar/alarms.php 1>& /dev/null7 #CENTOS*/1 * * * * apache php EXPRESSO_DIR/prototype/modules/calendar/alarms.php 1>& /dev/null 8 #DEBIAN*/1 * * * * www-data php5 EXPRESSO_DIR/prototype/modules/calendar/alarms.php 1>& /dev/null 9 9 10 10 # Utilizado para limpar a tabela, temporaria, que contem os e-mails (rascunhos) antes de 11 11 # serem salvos no IMAP. 12 #CENTOS00 02 * * * apache php EXPRESSO_DIR/prototype/modules/mail/cleanMailAttachments.php13 #DEBIAN00 02 * * * www-data php5 12 #CENTOS00 02 * * * apache php EXPRESSO_DIR/prototype/modules/mail/cleanMailAttachments.php 13 #DEBIAN00 02 * * * www-data php5 EXPRESSO_DIR/prototype/modules/mail/cleanMailAttachments.php 14 14 15 15 # Utilizado para limpar a tabela de registros de acesso, sessoes, do Expresso (phpgw_access_log) 16 #CENTOS00 22 * * * apache php EXPRESSO_DIR/phpgwapi/cron/clean_phpgw_tables.php17 #DEBIAN00 22 * * * www-data php5 16 #CENTOS00 22 * * * apache php EXPRESSO_DIR/phpgwapi/cron/clean_phpgw_tables.php 17 #DEBIAN00 22 * * * www-data php5 EXPRESSO_DIR/phpgwapi/cron/clean_phpgw_tables.php 18 18 19 19 # Utilizado para limpar os arquivos de sessao do PHP 20 #*/31 * * * * rootfind /dev/shm -type f -name "sess_*" -cmin 240 -print0 | xargs -n 200 -r -0 rm21 */31 * * * * rootfind /dev/shm -type f -name "sess_*" -cmin +240 -delete20 #*/31 * * * * root find /dev/shm -type f -name "sess_*" -cmin 240 -print0 | xargs -n 200 -r -0 rm 21 */31 * * * * root find /dev/shm -type f -name "sess_*" -cmin +240 -delete 22 22 23 23 # Utilizado para limpar os arquivos, eml, criados ao exportar mensagens 24 #13 */4 * * * root find /tmp/ -iname "*.eml" -amin +60 -exec rm -f '{}' \; 25 13 */4 * * * root find /tmp/ -iname "*.eml" -cmin +60 -delete 24 #13 */4 * * * root find /tmp/ -iname "*.eml" -amin +60 -exec rm -f '{}' \; 25 13 */4 * * * root find /tmp/ -iname "*.eml" -cmin +60 -delete 26 27 # Para o DSPAM 28 #*/15 * * * * root pidof dspam 1&> /dev/null ; [ $? -ne 0 ] && service dspam restart 26 29 27 30 # -
sandbox/2.5.1-evolucao/INSTALL/arquivos/scripts/smtp.sh
r7503 r8265 11 11 sed -e "s/DOMAIN/$DOMAIN/g" $DIR_POSTFIX/transport > /etc/postfix/transport 12 12 cp $DIR_POSTFIX/master.cf /etc/postfix/ 13 sed -e "s/LDAP_DN/$LDAP_DN/g" $ARQS/scl.pl > /etc/postfix/scl.pl 14 chmod a+x /etc/postfix/scl.pl 13 15 14 16 postmap /etc/postfix/expresso-dominios … … 20 22 smtp_rhel () 21 23 { 22 yum -y install postfix 24 yum -y install postfix perl-LDAP 23 25 24 26 smtp $1 … … 36 38 smtp_debian () 37 39 { 38 apt-get -y install postfix postfix-ldap 40 apt-get -y install postfix postfix-ldap libnet-ldap-perl 39 41 40 42 smtp $1 -
sandbox/2.5.1-evolucao/INSTALL/debian/squeeze/etc/postfix/main.cf
r8137 r8265 108 108 cra_maillists_chase_referral = 0 109 109 cra_maillists_search_base = $ldapbase 110 cra_maillists_query_filter = (&( mail=%s)(phpgwAccountType=l)(accountRestrictive=mailListRestriction))110 cra_maillists_query_filter = (&(|(mail=%s)(mailAlternateAddress=%s))(phpgwAccountType=l)(accountRestrictive=mailListRestriction)) 111 111 cra_maillists_result_attribute = accountRestrictive 112 112 cra_maillists_domain = hash:/etc/postfix/expresso-dominios … … 166 166 #SCL - Sender Control List - Restricoes para envio nas listas 167 167 smtpd_restriction_classes = mailListRestriction 168 mailListRestriction = check_sender_access ldap:csa_maillists, 169 reject 168 mailListRestriction = check_policy_service unix:private/scl 170 169 171 -
sandbox/2.5.1-evolucao/INSTALL/debian/squeeze/etc/postfix/master.cf
r5797 r8265 75 75 ${nexthop} ${user} 76 76 77 # Script para controle de envio nas listas de discussão 78 scl unix - n n - 0 spawn 79 user=nobody argv=/usr/bin/perl /etc/postfix/scl.pl 80 -
sandbox/2.5.1-evolucao/INSTALL/rhel/6/etc/postfix/main.cf
r8137 r8265 166 166 #SCL - Sender Control List - Restricoes para envio nas listas 167 167 smtpd_restriction_classes = mailListRestriction 168 mailListRestriction = check_sender_access ldap:csa_maillists, 169 reject 168 mailListRestriction = check_policy_service unix:private/scl 170 169 171 170 # LOCAL PATHNAME INFORMATION -
sandbox/2.5.1-evolucao/INSTALL/rhel/6/etc/postfix/master.cf
r5797 r8265 78 78 bsmtp unix - n n - - pipe 79 79 flags=Fq. user=foo argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient 80 81 # Script para controle de envio nas listas de discussão 82 scl unix - n n - 0 spawn 83 user=nobody argv=/usr/bin/perl /etc/postfix/scl.pl 84 -
sandbox/2.5.1-evolucao/admin/inc/class.uiconfig.inc.php
r8231 r8265 335 335 <script type="text/javascript"> CKEDITOR.replace( \'newsettings[agree_term]\',{ 336 336 removePlugins : \'elementspath\', 337 skin : \' office2003\',337 skin : \'moono_blue\', 338 338 toolbar : [["Source","Preview","-","Cut","Copy","Paste","-","Print", 339 339 "Undo","Redo","-","Find","Replace","-","SelectAll" ], -
sandbox/2.5.1-evolucao/admin/inc/class.uimainscreen.inc.php
r7109 r8265 151 151 'CKEDITOR.replace( \'message\',{'. 152 152 'removePlugins : \'elementspath\','. 153 'skin : \' office2003\','.153 'skin : \'moono_blue\','. 154 154 'toolbar : \'Full\''. 155 155 '}'. -
sandbox/2.5.1-evolucao/expressoAdmin1_2/js/jscode/maillists.js
r7752 r8265 281 281 if (new_options != '') 282 282 { 283 select_usersInMaillist.innerHTML = '#' + new_options + select_usersInMaillist.innerHTML; 284 select_usersInMaillist.outerHTML = select_usersInMaillist.outerHTML; 283 usersOptionsHtml = select_usersInMaillist.innerHTML; 284 usersOptionsHtml = (($.browser.msie && $.browser.version < 9) ? '#' : ' ') + new_options + usersOptionsHtml; 285 $(select_usersInMaillist).html(usersOptionsHtml); 285 286 } 286 287 } -
sandbox/2.5.1-evolucao/expressoMail1_2/js/common_functions.js
r8069 r8265 700 700 function filter_from_msg (msg) { 701 701 var html = DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {}); 702 initialize_container(html); 702 initialize_container(html); 703 outOfficeVerify(); 703 704 list_container = create_filter_dialog(); 704 705 render_new_rule(msg.from.email, html_entities(msg.subject)); -
sandbox/2.5.1-evolucao/expressoMail1_2/js/rich_text_editor.js
r8192 r8265 367 367 selection.selectRanges(selectionRanges); 368 368 } 369 369 if (CKEDITOR.env.ie){ 370 var body = editor.document.getBody(); 371 var range = new CKEDITOR.dom.range(body); 372 range.selectNodeContents(body); 373 range.collapse(true); 374 var selection = editor.getSelection(); 375 selection.selectRanges([range]); 376 } 370 377 if (is_webkit){ 371 378 $('#cke_contents_body_'+id+'>iframe').scrollTo(':first'); -
sandbox/2.5.1-evolucao/filemanager/inc/class.uifilemanager.inc.php
r7681 r8265 975 975 <script type="text/javascript"> CKEDITOR.replace( \'edit_file_content\',{ 976 976 removePlugins : \'elementspath\', 977 skin : \' office2003\',977 skin : \'moono_blue\', 978 978 toolbar : [["Source","Preview","-","Cut","Copy","Paste","-","Print", 979 979 "Undo","Redo","-","Find","Replace","-","SelectAll" ], -
sandbox/2.5.1-evolucao/news_admin/inc/class.uinews.inc.php
r5329 r8265 443 443 <script type="text/javascript"> CKEDITOR.replace( \'news[content]\',{ 444 444 removePlugins : \'elementspath\', 445 skin : \' office2003\',445 skin : \'moono_blue\', 446 446 toolbar : [["Source","Preview","-","Cut","Copy","Paste","-","Print", 447 447 "Undo","Redo","-","Find","Replace","-","SelectAll" ], -
sandbox/2.5.1-evolucao/prototype/config/calendarSignature.ini
r7935 r8265 16 16 17 17 [before.read] 18 calendarSignatureSecurity = modules/calendar/interceptors/DBMapping.php18 ;calendarSignatureSecurity = modules/calendar/interceptors/DBMapping.php 19 19 20 20 [before.find] 21 calendarSignatureSecurity = modules/calendar/interceptors/DBMapping.php21 ;calendarSignatureSecurity = modules/calendar/interceptors/DBMapping.php 22 22 23 23 [after.read] -
sandbox/2.5.1-evolucao/prototype/services/iCal.php
r7959 r8265 495 495 $isResponseDelegated = false; 496 496 if ((isset($pv['delegatedFrom']) && $pv['delegatedFrom'] == 0) || !isset($pv['delegatedFrom'])) { 497 if ($pv['isOrganizer'] == 1) 498 $vevent->setProperty('organizer', $pv['user']['mail'], array('CN' => $pv['user']['name'])); 499 else { 497 if ($pv['isOrganizer'] == 1){ 498 if($pv['user']['id'] == Config::me('uidNumber')) 499 $pv['user']['mail'] = $pv['user']['mailSenderAddress']; 500 //$pv['user']['mail'] = str_replace('@correiolivre.caixa','@caixa.gov.br',$pv['user']['mail']); 501 502 $vevent->setProperty('organizer', $pv['user']['mail'], array('CN' => $pv['user']['name'])); 503 }else { 500 504 $pParams = array(); 501 505 $pParams['CN'] = $pv['user']['name']; … … 618 622 if (self::_getTime($component, 'dtstamp') > $schedulable['dtstamp'] || $component->getProperty('sequence', false, false) > $schedulable['sequence']){ //Organizador esta requisitando que você atualize o evento 619 623 624 620 625 $params['calendar'] = $params['calendar'] == 'true' ? $calendar : $params['calendar']; 621 626 $interation = self::_makeVEVENT($schedulable, $component, $params); … … 642 647 $interation = self::_makeVEVENT(array(), $component, $params); 643 648 644 if (strpos($params['prodid'], 'kigkonsult.se') !== false) { //envia notificação para fora649 if (strpos($params['prodid'], 'kigkonsult.se') !== false) { //envia notificação para fora 645 650 646 651 /* Data de Inicio */ … … 693 698 694 699 700 695 701 if ($uid = $component->getProperty('uid', false, false)) 696 702 ; … … 710 716 711 717 718 719 712 720 if ($property = $component->getProperty('organizer', FALSE, TRUE)) { 713 721 $participant = array(); … … 733 741 $sc['participants'][] = $participant; 734 742 } 743 735 744 736 745 … … 749 758 $sc['participants'][] = $participant; 750 759 $sc['type'] = EVENT_ID; 760 751 761 752 762 … … 801 811 break; 802 812 } 813 803 814 require_once ROOTPATH . '/api/parseTPL.php'; 804 815 … … 1228 1239 foreach ($schedulable['participants'] as $value){ 1229 1240 1241 1230 1242 if ($value['user']['id'] == $params['owner']) { 1231 1243 $isParticipant = true; … … 1429 1441 1430 1442 1443 1431 1444 return $offset; 1432 1445 } … … 1457 1470 } 1458 1471 1472 1459 1473 private function _getStatusTodo($id) { 1460 1474 $a = array( … … 1467 1481 return isset($a[$id]) ? $a[$id] : 'NEED_ACTION'; 1468 1482 } 1483 1469 1484 1470 1485 private static function _checkParticipantByPermissions($schedulable) { … … 1583 1598 1584 1599 static private function _makeVEVENT($schedulable, $component, $params) { 1600 1601 1585 1602 $interation = array(); 1586 1603 $eventID = isset($schedulable['id']) ? $schedulable['id'] : mt_rand() . '(Formatter)'; … … 1641 1658 1642 1659 1660 1643 1661 $schedulable['summary'] = mb_convert_encoding($component->getProperty('summary', false, false), 'ISO-8859-1', 'UTF-8,ISO-8859-1'); 1644 1662 … … 1650 1668 if ($location = $component->getProperty('location', false, false)) 1651 1669 $schedulable['location'] = mb_convert_encoding($location, 'ISO-8859-1', 'UTF-8,ISO-8859-1'); 1670 1652 1671 1653 1672 … … 1694 1713 $participant['schedulable'] = $eventID; 1695 1714 1696 if (isset($params['status']) && $mailUser == Config::me('mail'))1715 if (isset($params['status']) && ltrim( substr( $mailUser, 0 , strpos( $mailUser, '@' ) ), '@' ) == ltrim( substr( Config::me('mail'), 0, strpos( Config::me('mail'), '@' ) ), '@' )) 1697 1716 $participant['status'] = $params['status']; 1698 1717 else 1699 1718 $participant['status'] = (isset($property['params']['PARTSTAT']) && constant('STATUS_' . $property['params']['PARTSTAT']) !== null ) ? constant('STATUS_' . $property['params']['PARTSTAT']) : STATUS_UNANSWERED; 1700 1701 1719 1702 1720 $participant['isOrganizer'] = '0'; … … 1731 1749 1732 1750 1751 1733 1752 if($participant = self::_getParticipantByMail($mailUser, $schedulable['participants'], true)){ 1734 1753 … … 1748 1767 /* Verifica se este usuario é um usuario interno do ldap */ 1749 1768 $intUser = Controller::find(array('concept' => 'user'), array('id', 'isExternal'), array('filter' => array('OR', array('=', 'mail', $mailUser), array('=', 'mailAlternateAddress', $mailUser)))); 1750 $user = null; 1751 if ($intUser && count($intUser) > 0) { 1769 1770 $user = null; 1771 if ($intUser && count($intUser) > 0 && $intUser[0]['id']) { 1752 1772 $participant['isExternal'] = isset($intUser[0]['isExternal']) ? $intUser[0]['isExternal'] : 0; 1753 1773 $participant['user'] = $intUser[0]['id']; … … 1942 1962 $schedulable['summary'] = mb_convert_encoding($component->getProperty('summary', false, false), 'ISO-8859-1', 'UTF-8,ISO-8859-1'); 1943 1963 1964 1944 1965 /* Definindo Description */ 1945 1966 if ($desc = $component->getProperty('description', false, false)) … … 2144 2165 $interation['schedulable://' . $todoID] = $schedulable; 2145 2166 2167 2168 2146 2169 return $interation; 2147 2170 } … … 2163 2186 foreach ($sig2 as $val) 2164 2187 $calendars[] = $val['calendar']; 2188 2165 2189 2166 2190 -
sandbox/2.5.1-evolucao/workflow/inc/smarty/wf_plugins/function.wf_fckeditor.php
r5331 r8265 84 84 'CKEDITOR.replace( \''.$base_arguments['InstanceName'].'\',{'. 85 85 'removePlugins : \'elementspath\','. 86 'skin : \' office2003\','.86 'skin : \'moono_blue\','. 87 87 'toolbar : \'Full\''. 88 88 '}'.
Note: See TracChangeset
for help on using the changeset viewer.