Changeset 5316


Ignore:
Timestamp:
01/06/12 08:52:37 (12 years ago)
Author:
cristiano
Message:

Ticket #2423 - Trocar chamada da variável rootPath

Location:
trunk
Files:
26 edited

Legend:

Unmodified
Added
Removed
  • trunk/.htaccess

    r5313 r5316  
    1616php_value url_rewriter.tags "a=href,area=href,frame=src,input=src,form=,fieldset=" 
    1717 
    18 php_value session.auto_start 1 
     18#php_value session.auto_start 1 
    1919php_value session.use_cookies 1 
    2020# Uses dir as a session handler 
  • trunk/API/class.servicelocator.php

    r5158 r5316  
    4141} 
    4242 
    43 define_once( 'ROOT', $_SESSION['rootPath'].'/' ); 
     43define_once( 'ROOT', dirname(__FILE__).'/../' ); 
    4444 
    4545define_once( 'SERVICES', ROOT.'/services/' ); 
  • trunk/calendar/inc/class.bocalendar.inc.php

    r5281 r5316  
    974974                        $l_participants = (@$params['participants']?$params['participants']:$_POST['participants']); 
    975975 
    976                         require_once($_SESSION['rootPath'].'/calendar/inc/class.ex_participants.inc.php'); 
     976                        require_once(dirname(__FILE__).'/class.ex_participants.inc.php'); 
    977977                        $this->ex_participants = new exParticipants(); 
    978978                        $this->ex_participants->setParticipantsByString(@$params['ex_participants']?$params['ex_participants']:$_POST['ex_participants']); 
     
    32533253                function getLdap() 
    32543254                { 
    3255                     require_once($_SESSION['rootPath'].'/header.inc.php'); 
    3256                     require_once($_SESSION['rootPath'].'/phpgwapi/inc/class.common.inc.php'); 
     3255                    require_once(dirname(__FILE__).'/../../header.inc.php'); 
     3256                    require_once(dirname(__FILE__).'/../../phpgwapi/inc/class.common.inc.php'); 
    32573257    
    32583258                    $common = new common(); 
     
    37693769                        if(!is_object($this->ex_participants)) 
    37703770                        { 
    3771                             include_once($_SESSION['rootPath'].'/calendar/inc/class.ex_participants.inc.php'); 
     3771                            include_once(dirname(__FILE__).'/class.ex_participants.inc.php'); 
    37723772                            $objexP = new exParticipants(); 
    37733773                            $objexP->setParticipantsBySerializable($this->ex_participants); 
     
    38253825                                 * Cria Arqvuio ICS 
    38263826                                 */ 
    3827                                 require_once $_SESSION['rootPath'].'/API/class.servicelocator.php'; 
     3827                                require_once dirname(__FILE__).'/../../API/class.servicelocator.php'; 
    38283828                                $icalService = ServiceLocator::getService('ical'); 
    38293829 
     
    39913991                     } 
    39923992                      
    3993                     require_once $_SESSION['rootPath'] . '/API/class.servicelocator.php'; 
     3993                    require_once dirname(__FILE__) . '/../../API/class.servicelocator.php'; 
    39943994                    $icalService = ServiceLocator::getService('ical'); 
    39953995                    $dia_inicio = $array_data_inicio[0]; 
     
    41574157                        } 
    41584158                         //Verificando alterações em usuarios externos 
    4159                          include_once($_SESSION['rootPath'].'/calendar/inc/class.ex_participants.inc.php'); 
     4159                         include_once(dirname(__FILE__).'/class.ex_participants.inc.php'); 
    41604160                         $extOld = new exParticipants(); 
    41614161                         $extNew = new exParticipants(); 
  • trunk/calendar/inc/class.boicalendar.inc.php

    r5132 r5316  
    27852785        /*-------------------------------------------------------------*/ 
    27862786 
    2787         require_once ($_SESSION['rootPath'] . '/calendar/inc/class.ex_participants.inc.php'); 
     2787        require_once (dirname(__FILE__) . '/class.ex_participants.inc.php'); 
    27882788 
    27892789        $c_events = count($ical['event']); 
     
    30583058 
    30593059                if (!isset ($this->bo)) { 
    3060                         require_once ($_SESSION['rootPath'] . '/calendar/inc/class.bocalendar.inc.php'); 
     3060                        require_once (dirname(__FILE__) . '/class.bocalendar.inc.php'); 
    30613061                        $this->bo = new bocalendar(); 
    30623062                } 
     
    34153415                return false; 
    34163416 
    3417         include_once ($_SESSION['rootPath'] . '/calendar/inc/class.ex_participants.inc.php'); 
     3417        include_once (dirname(__FILE__) . '/class.ex_participants.inc.php'); 
    34183418        $exParticipants = new exParticipants(); 
    34193419        $exParticipants->setParticipantsBySerializable($row['ex_participants']); 
  • trunk/calendar/inc/class.socalendar_sql.inc.php

    r5281 r5316  
    1313  *  option) any later version.                                              * 
    1414  \**************************************************************************/ 
    15 if($_SESSION['isCrun']){ 
     15require_once dirname(__FILE__).'/../../API/class.servicelocator.php'; 
     16 
     17if(isset($_SESSION['isCrun'])) 
    1618        $_SESSION['isCrun'] = false; 
    17         $_SESSION['rootPath'] = PHPGW_INCLUDE_ROOT; 
    18         require_once $_SESSION['rootPath'].'/API/class.servicelocator.php'; 
    19 }else if($_SESSION['rootPath']){ 
    20         require_once $_SESSION['rootPath'].'/API/class.servicelocator.php'; 
    21 }else{ 
    22         require_once PHPGW_INCLUDE_ROOT.'/API/class.servicelocator.php'; 
    23 } 
    24  
     19     
    2520        if (@$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar_']) 
    2621        { 
  • trunk/calendar/inc/class.uicalendar.inc.php

    r5269 r5316  
    9595                        $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; 
    9696                        $GLOBALS['phpgw_info']['flags']['currentapp'] = 'calendar'; 
    97                         include_once( $_SESSION['rootPath'].'/header.inc.php' ); 
     97                        include_once( dirname(__FILE__).'/../../header.inc.php' ); 
    9898 
    9999                        $GLOBALS['phpgw']->nextmatchs = CreateObject('phpgwapi.nextmatchs'); 
     
    10281028                    ); 
    10291029 
    1030                    include_once($_SESSION['rootPath'].'/calendar/inc/class.ex_participants.inc.php'); 
     1030                   include_once(dirname(__FILE__).'/class.ex_participants.inc.php'); 
    10311031                   $exParticipants = new exParticipants(); 
    10321032                   $exParticipants->setParticipantsBySerializable($event['ex_participants']); 
     
    38993899                        $porig = $GLOBALS['phpgw']->template; 
    39003900 
    3901                         $GLOBALS['phpgw']->template->root = $_SESSION['rootPath'].'/calendar/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/'; 
     3901                        $GLOBALS['phpgw']->template->root = dirname(__FILE__).'/../templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/'; 
    39023902 
    39033903                        $p = $GLOBALS['phpgw']->template; 
     
    45764576                        $p->set_block('view','hr','hr'); 
    45774577 
    4578                         include_once($_SESSION['rootPath'].'/calendar/inc/class.ex_participants.inc.php'); 
     4578                        include_once(dirname(__FILE__).'/class.ex_participants.inc.php'); 
    45794579                        $langp = array(); 
    45804580                        $langp['ACCEPTED'] = lang('Accepted'); 
     
    50545054                        } 
    50555055                         
    5056                         include_once($_SESSION['rootPath'].'/calendar/inc/class.ex_participants.inc.php'); 
     5056                        include_once(dirname(__FILE__).'/class.ex_participants.inc.php'); 
    50575057                        $langp = array(); 
    50585058                        $langp['ACCEPTED'] = lang('Accepted'); 
  • trunk/contactcenter/inc/class.bo_global_ldap_catalog.inc.php

    r5131 r5316  
    220220                { 
    221221 
    222                     require_once $_SESSION['rootPath'].'/API/class.servicelocator.php'; 
     222                    require_once dirname(__FILE__).'/../../API/class.servicelocator.php'; 
    223223                    $ldapService = ServiceLocator::getService('ldap'); 
    224224 
  • trunk/expressoMail1_2/inc/class.ScriptS.inc.php

    r5294 r5316  
    5050        $this->EmailExpresso = trim($_SESSION['phpgw_info']['expressomail']['user']['email']); 
    5151                 
    52                 include_once $_SESSION['rootPath'] . '/header.inc.php';  
    53                 require_once $_SESSION['rootPath'] . '/API/class.servicelocator.php'; 
     52                include_once dirname(__FILE__).'/../../header.inc.php';  
     53                require_once dirname(__FILE__).'/../../API/class.servicelocator.php'; 
    5454                $alternativeMailService = ServiceLocator::getService('ldap'); 
    5555                $this->AlternateEmailExpresso = $alternativeMailService->getMailAlternateByUidNumber($_SESSION['phpgw_info']['expressomail']['user']['account_id']); 
  • trunk/expressoMail1_2/inc/class.attachment.inc.php

    r5172 r5316  
    3737         * Requires 
    3838         */ 
    39             require_once $_SESSION['rootPath'].'/library/mime/mimePart.php'; 
    40             require_once $_SESSION['rootPath'].'/library/mime/mimeDecode.php'; 
     39            require_once dirname(__FILE__).'/../../library/mime/mimePart.php'; 
     40            require_once dirname(__FILE__).'/../../library/mime/mimeDecode.php'; 
    4141        //----------------------------------------------------------// 
    4242 
  • trunk/expressoMail1_2/inc/class.db_functions.inc.php

    r5134 r5316  
    369369            if($msg_number != null && $msg_part != null && $msg_folder != null && (intval($idx_file == '0' ? '1' : $idx_file))) 
    370370            { 
    371                 require_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php'; 
     371                require_once dirname(__FILE__).'/class.attachment.inc.php'; 
    372372                $attachmentObj = new attachment(); 
    373373                $attachmentObj->setStructureFromMail($msg_folder,$msg_number); 
  • trunk/expressoMail1_2/inc/class.exporteml.inc.php

    r5181 r5316  
    664664        function download_all_attachments($params) { 
    665665                 
    666                 require_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php'; 
     666                require_once dirname(__FILE__).'/class.attachment.inc.php'; 
    667667                $atObj = new attachment(); 
    668668                $atObj->setStructureFromMail($params['folder'],$params['num_msg']); 
  • trunk/expressoMail1_2/inc/class.imap_functions.inc.php

    r5309 r5316  
    274274                $to = $header->to; 
    275275                $head_array['to'] = array(); 
    276                 if(isset($to[1]) && $to[1]->host == ".SYNTAX-ERROR.") { //E-mails que não possuem o campo "para", vêm com o recipiente preenchido, porém com um recipiente a mais alegando erro de sintaxe. 
     276                if(isset($to[1]) && isset($to[1]->host) && $to[1]->host == ".SYNTAX-ERROR.") { //E-mails que não possuem o campo "para", vêm com o recipiente preenchido, porém com um recipiente a mais alegando erro de sintaxe. 
    277277                        $head_array['to']['name'] = $head_array['to']['email'] = NULL; 
    278278                } 
     
    935935    { 
    936936        $return = array(); 
    937         require_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php'; 
     937        require_once dirname(__FILE__).'/class.attachment.inc.php'; 
    938938         
    939939        $atObj = new attachment(); 
     
    13221322             * Requires of librarys 
    13231323             */ 
    1324             require_once $_SESSION['rootPath'].'/library/mime/mimePart.php'; 
    1325             require_once $_SESSION['rootPath'].'/library/mime/mimeDecode.php'; 
    1326             require_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php'; 
     1324            require_once dirname(__FILE__).'/../../library/mime/mimePart.php'; 
     1325            require_once dirname(__FILE__).'/../../library/mime/mimeDecode.php'; 
     1326            require_once dirname(__FILE__).'/class.attachment.inc.php'; 
    13271327            //include_once("class.message_components.inc.php"); 
    13281328            //--------------------------------------------------------------------// 
     
    15331533 
    15341534                    case 'REPLY': 
    1535                           include_once($_SESSION['rootPath'].'/header.inc.php'); 
    1536                           include_once($_SESSION['rootPath'].'/calendar/inc/class.boicalendar.inc.php'); 
     1535                          include_once(dirname(__FILE__).'/../../header.inc.php'); 
     1536                          include_once(dirname(__FILE__).'/../../calendar/inc/class.boicalendar.inc.php'); 
    15371537                          $boicalendar = new boicalendar(); 
    15381538 
     
    20642064                if (!count($images)) return ''; 
    20652065                
    2066                 foreach ($images as $key => $value) {  
     2066                foreach ($images as $key => $value) {                     
    20672067                        $images[$key]['width']  = 160;  
    20682068                        $images[$key]['height'] = 120;  
    2069                         $images[$key]['url']    = "inc/get_archive.php?msgFolder=".$msg_folder."&msgNumber=".$msg_number."&indexPart=".$image['pid']."&image=true";  
     2069                        $images[$key]['url']    = "inc/get_archive.php?msgFolder=".$msg_folder."&msgNumber=".$msg_number."&indexPart=".$value['pid']."&image=true";  
    20702070                } 
    20712071 
     
    25702570        function send_mail($params) 
    25712571        { 
    2572                 require_once $_SESSION['rootPath'] . '/API/class.servicelocator.php'; 
     2572                require_once dirname(__FILE__) . '/../../API/class.servicelocator.php'; 
    25732573                $mailService = ServiceLocator::getService('mail'); 
    25742574 
     
    32993299        function get_forwarding_attachment($msg_folder, $msg_number, $msg_part, $encoding) 
    33003300        { 
    3301             include_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php'; 
     3301            include_once dirname(__FILE__).'/class.attachment.inc.php'; 
    33023302            $attachment = new attachment(); 
    33033303                        $attachment->decodeConf['rfc_822bodies'] = true; //Forçar a não decodificação de mensagens em anexo. 
     
    33083308        function get_forwarding_attachment2($msg_folder, $msg_number, $msg_part, $encoding) 
    33093309        { 
    3310             include_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php'; 
     3310            include_once dirname(__FILE__).'/class.attachment.inc.php'; 
    33113311            $attachment = new attachment(); 
    33123312            $attachment->setStructureFromMail($msg_folder, $msg_number); 
     
    36633663        { 
    36643664         
    3665                 require_once $_SESSION['rootPath'] . '/API/class.servicelocator.php'; 
     3665                require_oncedirname(__FILE__) . '/../../API/class.servicelocator.php'; 
    36663666                $mailService = ServiceLocator::getService('mail'); 
    36673667 
     
    49594959                fputs($f,base64_encode($source)); 
    49604960            fclose($f); 
    4961             $command = "python ".$_SESSION['rootPath']."/expressoMail1_2/imap.py \"$imap_server\" \"$imap_port\" \"$username\" \"$password\" \"$timestamp\" \"$folder\" \"$file\""; 
     4961            $command = "python ".dirname(__FILE__)."/../imap.py \"$imap_server\" \"$imap_port\" \"$username\" \"$password\" \"$timestamp\" \"$folder\" \"$file\""; 
    49624962            $return['command']= exec($command); 
    49634963        }else{ 
     
    51295129                                "$msg_user</body><br><br><hr>";  
    51305130                              
    5131                 require_once $_SESSION['rootPath'] . '/API/class.servicelocator.php'; 
     5131                require_once dirname(__FILE__) . '/../../API/class.servicelocator.php'; 
    51325132                $mailService = ServiceLocator::getService('mail');       
    51335133                $mailService->addStringAttachment($mail_content, 'report.eml', 'application/text');  
  • trunk/expressoMail1_2/inc/class.ldap_functions.inc.php

    r5245 r5316  
    11<?php 
    22 
    3 require_once(($_SESSION['rootPath'] ? $_SESSION['rootPath'] : PHPGW_INCLUDE_ROOT).'/API/class.servicelocator.php'); 
     3require_once(dirname(__FILE__).'/../../API/class.servicelocator.php'); 
    44include_once("class.imap_functions.inc.php"); 
    55include_once("class.functions.inc.php"); 
     
    277277                $modal = true; 
    278278              
    279             include_once $_SESSION['rootPath']. '/header.inc.php'; 
     279            include_once dirname(__FILE__). '/../../header.inc.php'; 
    280280             
    281281            if($modal) 
     
    387387        function quickSearchGlobal($params, $all=false)  
    388388        {               
    389             include_once $_SESSION['rootPath']. '/header.inc.php'; 
     389            include_once dirname(__FILE__). '/../../header.inc.php'; 
    390390            $c = CreateObject('phpgwapi.config','contactcenter'); 
    391391            $all_data = $c->read_repository(); 
  • trunk/expressoMail1_2/inc/get_archive.php

    r5272 r5316  
    9292if($msgNumber != 'null' && $indexPart !== null && $msgFolder) 
    9393{ 
    94     require_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php'; 
     94    require_once dirname(__FILE__).'/class.attachment.inc.php'; 
    9595 
    9696    $attachment = new attachment(); 
  • trunk/expressoMail1_2/inc/show_embedded_attach.php

    r4416 r5316  
    44 */ 
    55 require_once '../../header.session.inc.php'; 
    6  require_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php'; 
     6 require_once dirname(__FILE__).'/class.attachment.inc.php'; 
    77 //------------------------// 
    88 
  • trunk/expressoMail1_2/inc/show_img.php

    r4416 r5316  
    44 */ 
    55 require_once '../../header.session.inc.php'; 
    6  require_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php'; 
     6 require_oncedirname(__FILE__).'/class.attachment.inc.php'; 
    77 //------------------------// 
    88 
  • trunk/expressoMail1_2/inc/show_thumbs.php

    r4416 r5316  
    44 */ 
    55 require_once '../../header.session.inc.php'; 
    6  require_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php'; 
     6 require_once dirname(__FILE__).'/class.attachment.inc.php'; 
    77 //------------------------// 
    88 
  • trunk/expressoMail1_2/index.php

    r5295 r5316  
    169169        $template->set_var("msg_number",$_GET['msgball']['msgnum'] ? $_GET['msgball']['msgnum'] : $_GET['to']); 
    170170        $template->set_var("user_email",$_SESSION['phpgw_info']['expressomail']['user']['email']); 
    171         include_once $_SESSION['rootPath'] . '/header.inc.php'; 
    172         require_once $_SESSION['rootPath'] . '/API/class.servicelocator.php'; 
     171        include_once dirname(__FILE__) . '/../header.inc.php'; 
     172        require_once dirname(__FILE__) . '/../API/class.servicelocator.php'; 
    173173        $alternativeMailService = ServiceLocator::getService('ldap'); 
    174174        $AlternateEmailExpresso = Array(); 
  • trunk/library/Mail/Mail.php

    r5146 r5316  
    4444 */ 
    4545 
    46 require_once $_SESSION['rootPath'].'/library/PEAR/PEAR.php'; 
     46require_once dirname(__FILE__).'/../PEAR/PEAR.php'; 
    4747 
    4848/** 
  • trunk/library/Mail/Mail/smtp.php

    r5146 r5316  
    346346        } 
    347347 
    348         include_once $_SESSION['rootPath'].'/library/Net/SMTP.php'; 
     348        include_once dirname(__FILE__).'/../../Net/SMTP.php'; 
    349349        $this->_smtp = &new Net_SMTP($this->host, 
    350350                                     $this->port, 
  • trunk/library/Net/SMTP.php

    r5146 r5316  
    2121// $Id: SMTP.php 314875 2011-08-13 17:03:30Z jon $ 
    2222 
    23 require_once $_SESSION['rootPath'].'/library/PEAR/PEAR.php'; 
    24 require_once $_SESSION['rootPath'].'/library/Net/Socket.php'; 
     23require_once dirname(__FILE__).'/../PEAR/PEAR.php'; 
     24require_once dirname(__FILE__).'/../Net/Socket.php'; 
    2525 
    2626/** 
  • trunk/library/Net/Socket.php

    r5146 r5316  
    2828 */ 
    2929 
    30 require_once $_SESSION['rootPath'].'/library/PEAR/PEAR.php'; 
     30require_once dirname(__FILE__).'/../PEAR/PEAR.php'; 
    3131 
    3232define('NET_SOCKET_READ', 1); 
  • trunk/library/iCalcreator/iCalcreator.class.php

    r5146 r5316  
    5353/*********************************************************************************/ 
    5454/*         since 2.6.22 - 2010-09-25, do NOT remove!!                            */ 
    55 require_once ( $_SESSION['rootPath'].'/library/iCalcreator/iCalUtilityFunctions.class.php' ); 
     55require_once ( dirname(__FILE__).'/iCalUtilityFunctions.class.php' ); 
    5656/*********************************************************************************/ 
    5757/*         version string, do NOT remove!!                                       */ 
  • trunk/library/mime/mime.php

    r5158 r5316  
    6464 * This package depends on PEAR to raise errors. 
    6565 */ 
    66 require_once $_SESSION['rootPath'].'/library/PEAR/PEAR.php'; 
     66require_once dirname(__FILE__).'/../PEAR/PEAR.php'; 
    6767 
    6868/** 
  • trunk/login.php

    r5091 r5316  
    124124                        session_start(); 
    125125                } 
    126  
    127                 $_SESSION['rootPath'] = realpath( './' ); 
    128126                 
    129127                include(personalize_include_path('phpgwapi','login')); 
  • trunk/services/class.mail.php

    r5130 r5316  
    3131*/ 
    3232 
    33 require_once ( $_SESSION['rootPath'].'/library/mime/mimePart.php' ); 
    34 require_once ( $_SESSION['rootPath'].'/library/mime/mime.php' ); 
     33require_once ( dirname(__FILE__).'/../library/mime/mimePart.php' ); 
     34require_once ( dirname(__FILE__).'/../library/mime/mime.php' ); 
    3535 
    3636 
     
    8888        $hdrs = $this->mail->headers($this->arrayFields); 
    8989                 
    90         require_once ($_SESSION['rootPath'].'/library/Mail/Mail.php'); 
     90        require_once (dirname(__FILE__).'/../library/Mail/Mail.php'); 
    9191        
    9292        $mail_object =& Mail::factory("smtp", self::$configuration); 
     
    129129    public function send() 
    130130    { 
    131         require_once ($_SESSION['rootPath'].'/library/Mail/Mail.php'); 
     131        require_once (dirname(__FILE__).'/../library/Mail/Mail.php'); 
    132132        $hdrs = $this->mail->headers($this->arrayFields); 
    133133        $mail_object =& Mail::factory("smtp", self::$configuration); 
Note: See TracChangeset for help on using the changeset viewer.