Changeset 3447

Timestamp:

11/03/10 08:01:49 (13 years ago)

Author:

rodsouza

Message:

Ticket #990 - Utilizando 'Magic constants' para definir o path.

Location:

branches/2.2

Files:

• login.php (modified) (1 diff)
• security/captcha.php (modified) (1 diff)

branches/2.2/login.php

@@ -99 +99 @@
                 $GLOBALS['phpgw']->session->phpgw_setcookie('serverID', $GLOBALS['phpgw_info']['server']['use_frontend_id']);
         }
-if($GLOBALS['phpgw_info']['server']['captcha']==1)
-  {
-    $key_convert = md5_file( __DIR__ . '/header.inc.php');
-    if(!$key_convert)
-        {
-            echo '<b>' . lang('Error in access. Please, alert the Administrator.') . '</b>';
-            exit();
-        }
-    session_name('ZABX');
-    if($_COOKIE['ZABX'] && $key_convert)
-        {
-            $aux = session_convert(base64_decode($_COOKIE['ZABX']),$key_convert);
-            if(substr($aux,0,32) == $key_convert)
-                {
-                    session_id(substr($aux,32));
-                }
-            else
-                {
-                    $GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/login.php','cd=5'));
-                }
-        }
-     session_start();
-  }
+
+if( $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'captcha' ] == 1 )
+{
+        $key_convert = md5_file( dirname( __FILE__ ) . '/header.inc.php' );
+        if ( ! $key_convert )
+        {
+                echo '<b>' . lang( 'Error in access. Please, alert the Administrator.' ) . '</b>';
+                exit;
+        }
+        session_name('ZABX');
+        if($_COOKIE['ZABX'] && $key_convert)
+        {
+                $aux = session_convert(base64_decode($_COOKIE['ZABX']),$key_convert);
+                if(substr($aux,0,32) == $key_convert)
+                {
+                        session_id(substr($aux,32));
+                }
+                else
+                {
+                        $GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/login.php','cd=5'));
+                }
+        }
+        session_start();
+}
+
 include(personalize_include_path('phpgwapi','login'));
 ?>

branches/2.2/security/captcha.php

@@ -150 +150 @@
 
 function session_convert($str,$ky='')
-    {
-        if($ky=='') return $str;
-        $ky=str_replace(chr(32),'',$ky);
-        if(strlen($ky)<8) return '';
-        $kl=strlen($ky)<32?strlen($ky):32;
-        $k=array();
-        for($i=0;$i<$kl;$i++)
-            {
-                $k[$i]=ord($ky{$i})&0x1F;
-            }
-        $j=0;
-        for($i=0;$i<strlen($str);$i++)
-            {
-                $e=ord($str{$i});
-                $str{$i}=$e&0xE0?chr($e^$k[$j]):chr($e);
-                $j++;$j=$j==$kl?0:$j;
-            }
-        return $str;
-    }
+{
+        if($ky=='') return $str;
+        $ky=str_replace(chr(32),'',$ky);
+        if(strlen($ky)<8) return '';
+        $kl=strlen($ky)<32?strlen($ky):32;
+        $k=array();
+        for($i=0;$i<$kl;$i++)
+        {
+                $k[$i]=ord($ky{$i})&0x1F;
+        }
+        $j=0;
+        for($i=0;$i<strlen($str);$i++)
+        {
+                $e=ord($str{$i});
+                $str{$i}=$e&0xE0?chr($e^$k[$j]):chr($e);
+                $j++;$j=$j==$kl?0:$j;
+        }
+        return $str;
+}
 
-  $key_convert = md5_file($_SERVER["DOCUMENT_ROOT"].'header.inc.php');
-  //Cria o CAPTCHA,  gera o string e a imagem ...
-  $GLOBALS['captcha'] = new captcha;
-  // Guarda o string do captcha na session...
-  session_name('ZABX');
-  session_id(substr(session_convert(base64_decode($_REQUEST['ZABX']),$key_convert),32));
-  session_start(); 
-  $_SESSION['CAPTCHAString'] = $GLOBALS['captcha'] ->GetCaptchaString();
-  // Vai exibir a imagem do captcha...
-  $GLOBALS['captcha'] ->Showcaptcha();
+$key_convert = md5_file( realpath( dirname( __FILE__ ) . '/../header.inc.php' ) );
+
+//Cria o CAPTCHA,  gera o string e a imagem ...
+$GLOBALS['captcha'] = new captcha;
+
+// Guarda o string do captcha na session...
+session_name( 'ZABX' );
+session_id( substr( session_convert( base64_decode( $_REQUEST['ZABX'] ), $key_convert ), 32 ) );
+session_start( );
+$_SESSION[ 'CAPTCHAString' ] = $GLOBALS[ 'captcha' ] -> GetCaptchaString( );
+
+// Vai exibir a imagem do captcha...
+$GLOBALS['captcha'] ->Showcaptcha();
 ?>