Changeset 1184

Timestamp:

07/27/09 10:13:31 (15 years ago)

Author:

niltonneto

Message:

Ticket #558 - Referências da pasta seguranca alteradas para security.

Location:

branches/2.0

Files:

• admin/inc/hook_admin.inc.php (modified) (1 diff)
• doc-expressolivre/debian/expressoInstallDebian-etch-ISO8859-1.sh (modified) (previous)
• doc-expressolivre/debian/expressoInstallDebian-etch.sh (modified) (previous)
• doc-expressolivre/debian/expressoInstallDebian-lenny.sh (modified) (1 diff)
• doc-expressolivre/debian/expressoInstallDebian-sarge.sh (modified) (previous)
• doc-expressolivre/debian/expressoInstallDebian.sh (modified) (previous)
• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (4 diffs)
• expressoMail1_2/inc/class.phpmailer.php (modified) (1 diff)
• expressoMail1_2/js/main.js (modified) (2 diffs)
• preferences/changepassword.php (modified) (1 diff)

branches/2.0/admin/inc/hook_admin.inc.php

@@ -81 +81 @@
                 if($GLOBALS['phpgw_info']['server']['use_assinar_criptografar']  ||  $GLOBALS['phpgw_info']['server']['certificado'])
                 {
-                        $file['CASCRLS']    = $GLOBALS['phpgw']->link('../seguranca/security_admin.php');
+                        $file['CASCRLS']    = $GLOBALS['phpgw']->link('../security/security_admin.php');
                 }
         } 

branches/2.0/doc-expressolivre/debian/expressoInstallDebian-lenny.sh

@@ -171 +171 @@
 
 ############################################################################################
-echo Acerta permissoes das pastas crls e temp em /var/www/expresso/seguranca:
-chown www-data:www-data /var/www/expresso/seguranca/temp   
+echo Acerta permissoes das pastas crls e temp em /var/www/expresso/security:
+chown www-data:www-data /var/www/expresso/security/temp
 chown www-data:www-data /var/www/expresso/logs 
-chown -R www-data:www-data /var/www/expresso/seguranca/crls
-chown www-data.www-data /var/www/expresso/seguranca/crl_admin/crl_admin.py
-chmod 755 /var/www/expresso/seguranca/temp                 
-chmod 755 /var/www/expresso/seguranca/crls  
-chmod 755 /var/www/expresso/seguranca/crl_admin/crl_admin.py
+chown -R www-data:www-data /var/www/expresso/security/crls
+chown www-data.www-data /var/www/expresso/security/crl_admin/crl_admin.py
+chmod 755 /var/www/expresso/security/temp
+chmod 755 /var/www/expresso/security/crls
+chmod 755 /var/www/expresso/security/crl_admin/crl_admin.py
 
 ############################################################################################

branches/2.0/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -116 +116 @@
                  * não parece ter perda considerável de performance.
                  */
-                $flag = preg_match('/importance *: *(.*)\r/i',
-                        imap_fetchheader($this->mbox, imap_msgno($this->mbox, $msg_number)),
-                        $importance);
+
+                $tempHeader = imap_fetchheader($this->mbox, imap_msgno($this->mbox, $msg_number));
+                $flag = preg_match('/importance *: *(.*)\r/i', $tempHeader, $importance);
+
+                // Reimplemenatado código para identificação dos e-mails assinados e cifrados
+                // no método getMessageType(). Mário César Kolling <mario.kolling@serpro.gov.br>
+                $head_array['ContentType'] = $this->getMessageType($msg_number, $tempHeader);
                 $head_array['Importance'] = $flag==0?"Normal":$importance[1];
 
@@ -1028 +1032 @@
         function get_signature($msg, $msg_number, $msg_folder)
         {
-        include_once("../seguranca/classes/CertificadoB.php");
+        include_once("../security/classes/CertificadoB.php");
                 include_once("class.db_functions.inc.php");
                 foreach ($msg->file_type[$msg_number] as $index => $file_type)
@@ -1591 +1595 @@
             // A MSG assinada deve ser testada neste ponto.
             // Testar o certificado e a integridade da msg....
-            include_once("../seguranca/classes/CertificadoB.php");
+            include_once("../security/classes/CertificadoB.php");
             $erros_acumulados = '';
             $certificado = new certificadoB();
@@ -1717 +1721 @@
                 }
             */
-                include_once("../seguranca/classes/CertificadoB.php");
+                include_once("../security/classes/CertificadoB.php");
 
                 foreach ($certificate['certs'] as $registro)

branches/2.0/expressoMail1_2/inc/class.phpmailer.php

@@ -590 +590 @@
                 {
             // Vai cifrar a msg antes de enviar ......
-                        include_once("../seguranca/classes/CertificadoB.php");
+                        include_once("../security/classes/CertificadoB.php");
 
             $teste1 = array();

branches/2.0/expressoMail1_2/js/main.js

@@ -107 +107 @@
             type:'application/x-java-applet;version=1.5',
             code:'ExpressoSmimeApplet',
-            codebase:'../',
+            codebase:'/security/',
             mayscript:'true',
             token: token_param,
@@ -142 +142 @@
         applet = document.createElement('embed');
         applet.innerHTML = '<embed style="display:yes;width:0;height:0;vertical-align:bottom;" id="cert_applet" code="ExpressoSmimeApplet.class" ' +
-            'codebase="../" locale="'+locale+'"'+
+            'codebase="/security/" locale="'+locale+'"'+
             'archive="ExpressoCertMail.jar,ExpressoCert.jar,bcmail-jdk15-142.jar,mail.jar,activation.jar,bcprov-jdk15-142.jar,commons-codec-1.3.jar,commons-httpclient-3.1.jar,commons-logging-1.1.1.jar" ' +
             'token="' + token_param + '" ' +

branches/2.0/preferences/changepassword.php

@@ -22 +22 @@
 function grava_senha_criptografada_com_certificado_no_ldap($aux_uid,$aux_senha)
    {    
-        require_once('/var/www/expresso/seguranca/classes/CertificadoB.php');
+        require_once('/var/www/expresso/security/classes/CertificadoB.php');
         $ldap_context = $GLOBALS['phpgw_info']['server']['ldap_context'];
         $ldap_servidor = $GLOBALS['phpgw_info']['server']['ldap_host'];