Changeset 8265 for sandbox/2.5.1-evolucao

Timestamp:

11/25/13 17:17:06 (10 years ago)

Author:

angelo

Message:

Ticket #0000 - sincronizacao das alteracoes do trunk com este sandbox

Location:

sandbox/2.5.1-evolucao

Files:

• INSTALL/arquivos/expresso-cron (modified) (1 diff)
• INSTALL/arquivos/scl.pl (added)
• INSTALL/arquivos/scripts/smtp.sh (modified) (3 diffs)
• INSTALL/debian/squeeze/etc/postfix/main.cf (modified) (2 diffs)
• INSTALL/debian/squeeze/etc/postfix/master.cf (modified) (1 diff)
• INSTALL/rhel/6/etc/postfix/main.cf (modified) (1 diff)
• INSTALL/rhel/6/etc/postfix/master.cf (modified) (1 diff)
• admin/inc/class.uiconfig.inc.php (modified) (1 diff)
• admin/inc/class.uimainscreen.inc.php (modified) (1 diff)
• expressoAdmin1_2/js/jscode/maillists.js (modified) (1 diff)
• expressoMail1_2/js/common_functions.js (modified) (1 diff)
• expressoMail1_2/js/rich_text_editor.js (modified) (1 diff)
• filemanager/inc/class.uifilemanager.inc.php (modified) (1 diff)
• news_admin/inc/class.uinews.inc.php (modified) (1 diff)
• prototype/config/calendarSignature.ini (modified) (1 diff)
• prototype/services/iCal.php (modified) (21 diffs)
• workflow/inc/smarty/wf_plugins/function.wf_fckeditor.php (modified) (1 diff)

sandbox/2.5.1-evolucao/INSTALL/arquivos/expresso-cron

@@ -5 +5 @@
 
 # Utilizado para verificar se ha algum alarme, por e-mail, do modulo ExpressoCalendar
-#CENTOS*/1 *    * * *   apache   php    EXPRESSO_DIR/prototype/modules/calendar/alarms.php 1>& /dev/null
-#DEBIAN*/1 *    * * *   www-data php5   EXPRESSO_DIR/prototype/modules/calendar/alarms.php 1>& /dev/null
+#CENTOS*/1 *    * * *   apache      php  EXPRESSO_DIR/prototype/modules/calendar/alarms.php 1>& /dev/null
+#DEBIAN*/1 *    * * *   www-data    php5 EXPRESSO_DIR/prototype/modules/calendar/alarms.php 1>& /dev/null
 
 # Utilizado para limpar a tabela, temporaria, que contem os e-mails (rascunhos) antes de
 #  serem salvos no IMAP.
-#CENTOS00 02    * * *   apache          php     EXPRESSO_DIR/prototype/modules/mail/cleanMailAttachments.php 
-#DEBIAN00 02    * * *   www-data        php5    EXPRESSO_DIR/prototype/modules/mail/cleanMailAttachments.php 
+#CENTOS00 02    * * *   apache          php      EXPRESSO_DIR/prototype/modules/mail/cleanMailAttachments.php 
+#DEBIAN00 02    * * *   www-data        php5 EXPRESSO_DIR/prototype/modules/mail/cleanMailAttachments.php 
 
 # Utilizado para limpar a tabela de registros de acesso, sessoes, do Expresso (phpgw_access_log)
-#CENTOS00 22    * * *   apache          php     EXPRESSO_DIR/phpgwapi/cron/clean_phpgw_tables.php
-#DEBIAN00 22    * * *   www-data        php5    EXPRESSO_DIR/phpgwapi/cron/clean_phpgw_tables.php
+#CENTOS00 22    * * *   apache          php      EXPRESSO_DIR/phpgwapi/cron/clean_phpgw_tables.php
+#DEBIAN00 22    * * *   www-data        php5 EXPRESSO_DIR/phpgwapi/cron/clean_phpgw_tables.php
 
 # Utilizado para limpar os arquivos de sessao do PHP
-#*/31 *  * * *   root                    find /dev/shm -type f -name "sess_*" -cmin 240 -print0 | xargs -n 200 -r -0 rm
-*/31 *  * * *   root                    find /dev/shm -type f -name "sess_*" -cmin +240 -delete
+#*/31 *         * * *   root        find /dev/shm -type f -name "sess_*" -cmin 240 -print0 | xargs -n 200 -r -0 rm
+*/31 *          * * *   root        find /dev/shm -type f -name "sess_*" -cmin +240 -delete
 
 # Utilizado para limpar os arquivos, eml, criados ao exportar mensagens
-#13 */4 * * * root                      find /tmp/ -iname "*.eml" -amin +60 -exec rm -f '{}' \;
-13 */4  * * * root                      find /tmp/ -iname "*.eml" -cmin +60 -delete
+#13 */4         * * *   root            find /tmp/ -iname "*.eml" -amin +60 -exec rm -f '{}' \;
+13 */4          * * *   root            find /tmp/ -iname "*.eml" -cmin +60 -delete
+
+# Para o DSPAM
+#*/15 *         * * *   root        pidof dspam 1&> /dev/null ; [ $? -ne 0 ] && service dspam restart
 
 #

sandbox/2.5.1-evolucao/INSTALL/arquivos/scripts/smtp.sh

@@ -11 +11 @@
         sed -e "s/DOMAIN/$DOMAIN/g" $DIR_POSTFIX/transport > /etc/postfix/transport
         cp $DIR_POSTFIX/master.cf /etc/postfix/
+        sed -e "s/LDAP_DN/$LDAP_DN/g" $ARQS/scl.pl > /etc/postfix/scl.pl
+    chmod a+x /etc/postfix/scl.pl
 
         postmap /etc/postfix/expresso-dominios
@@ -20 +22 @@
 smtp_rhel ()
 {
-        yum -y install postfix
+        yum -y install postfix perl-LDAP
 
         smtp $1 
@@ -36 +38 @@
 smtp_debian ()
 {
-        apt-get -y install postfix postfix-ldap
+        apt-get -y install postfix postfix-ldap libnet-ldap-perl
 
         smtp $1

sandbox/2.5.1-evolucao/INSTALL/debian/squeeze/etc/postfix/main.cf

@@ -108 +108 @@
 cra_maillists_chase_referral = 0
 cra_maillists_search_base = $ldapbase
-cra_maillists_query_filter = (&(mail=%s)(phpgwAccountType=l)(accountRestrictive=mailListRestriction))
+cra_maillists_query_filter = (&(|(mail=%s)(mailAlternateAddress=%s))(phpgwAccountType=l)(accountRestrictive=mailListRestriction))
 cra_maillists_result_attribute = accountRestrictive
 cra_maillists_domain = hash:/etc/postfix/expresso-dominios
@@ -166 +166 @@
 #SCL - Sender Control List - Restricoes para envio nas listas
 smtpd_restriction_classes = mailListRestriction
-mailListRestriction = check_sender_access ldap:csa_maillists,
-                        reject
+mailListRestriction = check_policy_service unix:private/scl
 
-

sandbox/2.5.1-evolucao/INSTALL/debian/squeeze/etc/postfix/master.cf

@@ -75 +75 @@
   ${nexthop} ${user}
 
+# Script para controle de envio nas listas de discussão
+scl  unix    -       n       n       -       0       spawn
+        user=nobody argv=/usr/bin/perl /etc/postfix/scl.pl
+

sandbox/2.5.1-evolucao/INSTALL/rhel/6/etc/postfix/main.cf

@@ -166 +166 @@
 #SCL - Sender Control List - Restricoes para envio nas listas
 smtpd_restriction_classes = mailListRestriction
-mailListRestriction = check_sender_access ldap:csa_maillists,
-                        reject
+mailListRestriction = check_policy_service unix:private/scl
 
 # LOCAL PATHNAME INFORMATION

sandbox/2.5.1-evolucao/INSTALL/rhel/6/etc/postfix/master.cf

@@ -78 +78 @@
 bsmtp     unix  -       n       n       -       -       pipe
   flags=Fq. user=foo argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient
+
+# Script para controle de envio nas listas de discussão
+scl  unix    -       n       n       -       0       spawn
+        user=nobody argv=/usr/bin/perl /etc/postfix/scl.pl
+

sandbox/2.5.1-evolucao/admin/inc/class.uiconfig.inc.php

@@ -335 +335 @@
                                                         <script type="text/javascript"> CKEDITOR.replace( \'newsettings[agree_term]\',{
                                                                 removePlugins : \'elementspath\',
-                                                                skin : \'office2003\',
+                                                                skin : \'moono_blue\',
                                                                 toolbar : [["Source","Preview","-","Cut","Copy","Paste","-","Print",
                                                                 "Undo","Redo","-","Find","Replace","-","SelectAll" ],

sandbox/2.5.1-evolucao/admin/inc/class.uimainscreen.inc.php

@@ -151 +151 @@
                                                 'CKEDITOR.replace( \'message\',{'.
                                                 'removePlugins : \'elementspath\','.
-                                                'skin : \'office2003\','.
+                                                'skin : \'moono_blue\','.
                                                 'toolbar : \'Full\''.
                                                 '}'.

sandbox/2.5.1-evolucao/expressoAdmin1_2/js/jscode/maillists.js

@@ -281 +281 @@
         if (new_options != '')
         {
-                select_usersInMaillist.innerHTML = '#' + new_options + select_usersInMaillist.innerHTML;
-                select_usersInMaillist.outerHTML = select_usersInMaillist.outerHTML;
+                usersOptionsHtml = select_usersInMaillist.innerHTML;
+                usersOptionsHtml = (($.browser.msie && $.browser.version < 9) ? '#' : '&nbsp;') + new_options + usersOptionsHtml;
+                $(select_usersInMaillist).html(usersOptionsHtml);
         }
 }

sandbox/2.5.1-evolucao/expressoMail1_2/js/common_functions.js

@@ -700 +700 @@
  function filter_from_msg (msg) { 
         var html = DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {}); 
-        initialize_container(html); 
+        initialize_container(html);
+        outOfficeVerify(); 
         list_container = create_filter_dialog(); 
         render_new_rule(msg.from.email, html_entities(msg.subject)); 

sandbox/2.5.1-evolucao/expressoMail1_2/js/rich_text_editor.js

@@ -367 +367 @@
                                 selection.selectRanges(selectionRanges);
                         }
-                        
+            if (CKEDITOR.env.ie){
+                var body = editor.document.getBody();
+                var range = new CKEDITOR.dom.range(body);
+                range.selectNodeContents(body);
+                range.collapse(true);
+                var selection = editor.getSelection();
+                selection.selectRanges([range]);
+            }                   
                         if (is_webkit){
                                 $('#cke_contents_body_'+id+'>iframe').scrollTo(':first');

sandbox/2.5.1-evolucao/filemanager/inc/class.uifilemanager.inc.php

@@ -975 +975 @@
                                                 <script type="text/javascript"> CKEDITOR.replace( \'edit_file_content\',{
 removePlugins : \'elementspath\',
-skin : \'office2003\',
+skin : \'moono_blue\',
 toolbar : [["Source","Preview","-","Cut","Copy","Paste","-","Print",
 "Undo","Redo","-","Find","Replace","-","SelectAll" ],

sandbox/2.5.1-evolucao/news_admin/inc/class.uinews.inc.php

@@ -443 +443 @@
                         <script type="text/javascript"> CKEDITOR.replace( \'news[content]\',{
                         removePlugins : \'elementspath\',
-                        skin : \'office2003\',
+                        skin : \'moono_blue\',
                         toolbar : [["Source","Preview","-","Cut","Copy","Paste","-","Print",
                         "Undo","Redo","-","Find","Replace","-","SelectAll" ],

sandbox/2.5.1-evolucao/prototype/config/calendarSignature.ini

@@ -16 +16 @@
 
 [before.read]
-calendarSignatureSecurity = modules/calendar/interceptors/DBMapping.php
+;calendarSignatureSecurity = modules/calendar/interceptors/DBMapping.php
 
 [before.find]
-calendarSignatureSecurity = modules/calendar/interceptors/DBMapping.php
+;calendarSignatureSecurity = modules/calendar/interceptors/DBMapping.php
 
 [after.read]

sandbox/2.5.1-evolucao/prototype/services/iCal.php

@@ -495 +495 @@
             $isResponseDelegated = false;
             if ((isset($pv['delegatedFrom']) && $pv['delegatedFrom'] == 0) || !isset($pv['delegatedFrom']))  {
-                if ($pv['isOrganizer'] == 1)
-                    $vevent->setProperty('organizer', $pv['user']['mail'], array('CN' => $pv['user']['name']));
-                else {
+                if ($pv['isOrganizer'] == 1){
+                        if($pv['user']['id'] == Config::me('uidNumber'))
+                                $pv['user']['mail'] = $pv['user']['mailSenderAddress'];
+                                //$pv['user']['mail'] = str_replace('@correiolivre.caixa','@caixa.gov.br',$pv['user']['mail']);                                   
+                        
+                        $vevent->setProperty('organizer', $pv['user']['mail'], array('CN' => $pv['user']['name']));
+                }else {
                     $pParams = array();
                     $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
 
+
                             $params['calendar'] = $params['calendar'] == 'true' ? $calendar : $params['calendar'];
                             $interation = self::_makeVEVENT($schedulable, $component, $params);
@@ -642 +647 @@
                     $interation = self::_makeVEVENT(array(), $component, $params);
 
-                    if (strpos($params['prodid'], 'kigkonsult.se') !== false) { //envia notificação para fora
+                       if (strpos($params['prodid'], 'kigkonsult.se') !== false) { //envia notificação para fora
 
                         /* Data de Inicio */
@@ -693 +698 @@
 
 
+
                         if ($uid = $component->getProperty('uid', false, false))
                         ;
@@ -710 +716 @@
 
 
+
+
                         if ($property = $component->getProperty('organizer', FALSE, TRUE)) {
                         $participant = array();
@@ -733 +741 @@
                         $sc['participants'][] = $participant;
                         }
+
 
 
@@ -749 +758 @@
                         $sc['participants'][] = $participant;
                         $sc['type'] = EVENT_ID;
+
 
 
@@ -801 +811 @@
                             break;
                         }
+
                         require_once ROOTPATH . '/api/parseTPL.php';
 
@@ -1228 +1239 @@
                     foreach ($schedulable['participants'] as $value){
 
+
                         if ($value['user']['id'] == $params['owner']) {
                             $isParticipant = true;
@@ -1429 +1441 @@
 
 
+
         return $offset;
     }
@@ -1457 +1470 @@
     }
 
+
     private function _getStatusTodo($id) {
         $a = array(
@@ -1467 +1481 @@
     return isset($a[$id]) ? $a[$id] : 'NEED_ACTION';
     }
+
 
     private static function _checkParticipantByPermissions($schedulable) {
@@ -1583 +1598 @@
 
     static private function _makeVEVENT($schedulable, $component, $params) {
+
+
         $interation = array();
         $eventID = isset($schedulable['id']) ? $schedulable['id'] : mt_rand() . '(Formatter)';
@@ -1641 +1658 @@
 
 
+
         $schedulable['summary'] = mb_convert_encoding($component->getProperty('summary', false, false), 'ISO-8859-1', 'UTF-8,ISO-8859-1');
 
@@ -1650 +1668 @@
         if ($location = $component->getProperty('location', false, false))
             $schedulable['location'] = mb_convert_encoding($location, 'ISO-8859-1', 'UTF-8,ISO-8859-1');
+
 
 
@@ -1694 +1713 @@
             $participant['schedulable'] = $eventID;
 
-            if (isset($params['status']) && $mailUser == Config::me('mail'))
+            if (isset($params['status']) &&  ltrim( substr( $mailUser, 0 , strpos( $mailUser, '@' ) ), '@' )  ==  ltrim( substr( Config::me('mail'), 0, strpos( Config::me('mail'), '@' ) ), '@' ))
                 $participant['status'] = $params['status'];
             else
                 $participant['status'] = (isset($property['params']['PARTSTAT']) && constant('STATUS_' . $property['params']['PARTSTAT']) !== null ) ? constant('STATUS_' . $property['params']['PARTSTAT']) : STATUS_UNANSWERED;
-
 
             $participant['isOrganizer'] = '0';
@@ -1731 +1749 @@
 
 
+
             if($participant = self::_getParticipantByMail($mailUser, $schedulable['participants'], true)){
 
@@ -1748 +1767 @@
             /* Verifica se este usuario é um usuario interno do ldap */
             $intUser = Controller::find(array('concept' => 'user'), array('id', 'isExternal'), array('filter' => array('OR', array('=', 'mail', $mailUser), array('=', 'mailAlternateAddress', $mailUser))));
-            $user = null;
-            if ($intUser && count($intUser) > 0) {
+
+            $user = null;
+            if ($intUser && count($intUser) > 0 && $intUser[0]['id']) {
                 $participant['isExternal'] = isset($intUser[0]['isExternal']) ? $intUser[0]['isExternal'] : 0;
                 $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');
 
+
         /* Definindo Description */
         if ($desc = $component->getProperty('description', false, false))
@@ -2144 +2165 @@
         $interation['schedulable://' . $todoID] = $schedulable;
 
+
+
     return $interation;
     }
@@ -2163 +2186 @@
                 foreach ($sig2 as $val)
                     $calendars[] = $val['calendar'];
+
 
 

sandbox/2.5.1-evolucao/workflow/inc/smarty/wf_plugins/function.wf_fckeditor.php

@@ -84 +84 @@
                                 'CKEDITOR.replace( \''.$base_arguments['InstanceName'].'\',{'.
                                         'removePlugins : \'elementspath\','.
-                                        'skin : \'office2003\','.
+                                        'skin : \'moono_blue\','.
                                         'toolbar : \'Full\''.
                                         '}'.