Changeset 5316
- Timestamp:
- 01/06/12 08:52:37 (12 years ago)
- Location:
- trunk
- Files:
-
- 26 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/.htaccess
r5313 r5316 16 16 php_value url_rewriter.tags "a=href,area=href,frame=src,input=src,form=,fieldset=" 17 17 18 php_value session.auto_start 118 #php_value session.auto_start 1 19 19 php_value session.use_cookies 1 20 20 # Uses dir as a session handler -
trunk/API/class.servicelocator.php
r5158 r5316 41 41 } 42 42 43 define_once( 'ROOT', $_SESSION['rootPath'].'/' );43 define_once( 'ROOT', dirname(__FILE__).'/../' ); 44 44 45 45 define_once( 'SERVICES', ROOT.'/services/' ); -
trunk/calendar/inc/class.bocalendar.inc.php
r5281 r5316 974 974 $l_participants = (@$params['participants']?$params['participants']:$_POST['participants']); 975 975 976 require_once( $_SESSION['rootPath'].'/calendar/inc/class.ex_participants.inc.php');976 require_once(dirname(__FILE__).'/class.ex_participants.inc.php'); 977 977 $this->ex_participants = new exParticipants(); 978 978 $this->ex_participants->setParticipantsByString(@$params['ex_participants']?$params['ex_participants']:$_POST['ex_participants']); … … 3253 3253 function getLdap() 3254 3254 { 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'); 3257 3257 3258 3258 $common = new common(); … … 3769 3769 if(!is_object($this->ex_participants)) 3770 3770 { 3771 include_once( $_SESSION['rootPath'].'/calendar/inc/class.ex_participants.inc.php');3771 include_once(dirname(__FILE__).'/class.ex_participants.inc.php'); 3772 3772 $objexP = new exParticipants(); 3773 3773 $objexP->setParticipantsBySerializable($this->ex_participants); … … 3825 3825 * Cria Arqvuio ICS 3826 3826 */ 3827 require_once $_SESSION['rootPath'].'/API/class.servicelocator.php';3827 require_once dirname(__FILE__).'/../../API/class.servicelocator.php'; 3828 3828 $icalService = ServiceLocator::getService('ical'); 3829 3829 … … 3991 3991 } 3992 3992 3993 require_once $_SESSION['rootPath'] . '/API/class.servicelocator.php';3993 require_once dirname(__FILE__) . '/../../API/class.servicelocator.php'; 3994 3994 $icalService = ServiceLocator::getService('ical'); 3995 3995 $dia_inicio = $array_data_inicio[0]; … … 4157 4157 } 4158 4158 //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'); 4160 4160 $extOld = new exParticipants(); 4161 4161 $extNew = new exParticipants(); -
trunk/calendar/inc/class.boicalendar.inc.php
r5132 r5316 2785 2785 /*-------------------------------------------------------------*/ 2786 2786 2787 require_once ( $_SESSION['rootPath'] . '/calendar/inc/class.ex_participants.inc.php');2787 require_once (dirname(__FILE__) . '/class.ex_participants.inc.php'); 2788 2788 2789 2789 $c_events = count($ical['event']); … … 3058 3058 3059 3059 if (!isset ($this->bo)) { 3060 require_once ( $_SESSION['rootPath'] . '/calendar/inc/class.bocalendar.inc.php');3060 require_once (dirname(__FILE__) . '/class.bocalendar.inc.php'); 3061 3061 $this->bo = new bocalendar(); 3062 3062 } … … 3415 3415 return false; 3416 3416 3417 include_once ( $_SESSION['rootPath'] . '/calendar/inc/class.ex_participants.inc.php');3417 include_once (dirname(__FILE__) . '/class.ex_participants.inc.php'); 3418 3418 $exParticipants = new exParticipants(); 3419 3419 $exParticipants->setParticipantsBySerializable($row['ex_participants']); -
trunk/calendar/inc/class.socalendar_sql.inc.php
r5281 r5316 13 13 * option) any later version. * 14 14 \**************************************************************************/ 15 if($_SESSION['isCrun']){ 15 require_once dirname(__FILE__).'/../../API/class.servicelocator.php'; 16 17 if(isset($_SESSION['isCrun'])) 16 18 $_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 25 20 if (@$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar_']) 26 21 { -
trunk/calendar/inc/class.uicalendar.inc.php
r5269 r5316 95 95 $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; 96 96 $GLOBALS['phpgw_info']['flags']['currentapp'] = 'calendar'; 97 include_once( $_SESSION['rootPath'].'/header.inc.php' );97 include_once( dirname(__FILE__).'/../../header.inc.php' ); 98 98 99 99 $GLOBALS['phpgw']->nextmatchs = CreateObject('phpgwapi.nextmatchs'); … … 1028 1028 ); 1029 1029 1030 include_once( $_SESSION['rootPath'].'/calendar/inc/class.ex_participants.inc.php');1030 include_once(dirname(__FILE__).'/class.ex_participants.inc.php'); 1031 1031 $exParticipants = new exParticipants(); 1032 1032 $exParticipants->setParticipantsBySerializable($event['ex_participants']); … … 3899 3899 $porig = $GLOBALS['phpgw']->template; 3900 3900 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'].'/'; 3902 3902 3903 3903 $p = $GLOBALS['phpgw']->template; … … 4576 4576 $p->set_block('view','hr','hr'); 4577 4577 4578 include_once( $_SESSION['rootPath'].'/calendar/inc/class.ex_participants.inc.php');4578 include_once(dirname(__FILE__).'/class.ex_participants.inc.php'); 4579 4579 $langp = array(); 4580 4580 $langp['ACCEPTED'] = lang('Accepted'); … … 5054 5054 } 5055 5055 5056 include_once( $_SESSION['rootPath'].'/calendar/inc/class.ex_participants.inc.php');5056 include_once(dirname(__FILE__).'/class.ex_participants.inc.php'); 5057 5057 $langp = array(); 5058 5058 $langp['ACCEPTED'] = lang('Accepted'); -
trunk/contactcenter/inc/class.bo_global_ldap_catalog.inc.php
r5131 r5316 220 220 { 221 221 222 require_once $_SESSION['rootPath'].'/API/class.servicelocator.php';222 require_once dirname(__FILE__).'/../../API/class.servicelocator.php'; 223 223 $ldapService = ServiceLocator::getService('ldap'); 224 224 -
trunk/expressoMail1_2/inc/class.ScriptS.inc.php
r5294 r5316 50 50 $this->EmailExpresso = trim($_SESSION['phpgw_info']['expressomail']['user']['email']); 51 51 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'; 54 54 $alternativeMailService = ServiceLocator::getService('ldap'); 55 55 $this->AlternateEmailExpresso = $alternativeMailService->getMailAlternateByUidNumber($_SESSION['phpgw_info']['expressomail']['user']['account_id']); -
trunk/expressoMail1_2/inc/class.attachment.inc.php
r5172 r5316 37 37 * Requires 38 38 */ 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'; 41 41 //----------------------------------------------------------// 42 42 -
trunk/expressoMail1_2/inc/class.db_functions.inc.php
r5134 r5316 369 369 if($msg_number != null && $msg_part != null && $msg_folder != null && (intval($idx_file == '0' ? '1' : $idx_file))) 370 370 { 371 require_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php';371 require_once dirname(__FILE__).'/class.attachment.inc.php'; 372 372 $attachmentObj = new attachment(); 373 373 $attachmentObj->setStructureFromMail($msg_folder,$msg_number); -
trunk/expressoMail1_2/inc/class.exporteml.inc.php
r5181 r5316 664 664 function download_all_attachments($params) { 665 665 666 require_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php';666 require_once dirname(__FILE__).'/class.attachment.inc.php'; 667 667 $atObj = new attachment(); 668 668 $atObj->setStructureFromMail($params['folder'],$params['num_msg']); -
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r5309 r5316 274 274 $to = $header->to; 275 275 $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. 277 277 $head_array['to']['name'] = $head_array['to']['email'] = NULL; 278 278 } … … 935 935 { 936 936 $return = array(); 937 require_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php';937 require_once dirname(__FILE__).'/class.attachment.inc.php'; 938 938 939 939 $atObj = new attachment(); … … 1322 1322 * Requires of librarys 1323 1323 */ 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'; 1327 1327 //include_once("class.message_components.inc.php"); 1328 1328 //--------------------------------------------------------------------// … … 1533 1533 1534 1534 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'); 1537 1537 $boicalendar = new boicalendar(); 1538 1538 … … 2064 2064 if (!count($images)) return ''; 2065 2065 2066 foreach ($images as $key => $value) { 2066 foreach ($images as $key => $value) { 2067 2067 $images[$key]['width'] = 160; 2068 2068 $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"; 2070 2070 } 2071 2071 … … 2570 2570 function send_mail($params) 2571 2571 { 2572 require_once $_SESSION['rootPath'] . '/API/class.servicelocator.php';2572 require_once dirname(__FILE__) . '/../../API/class.servicelocator.php'; 2573 2573 $mailService = ServiceLocator::getService('mail'); 2574 2574 … … 3299 3299 function get_forwarding_attachment($msg_folder, $msg_number, $msg_part, $encoding) 3300 3300 { 3301 include_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php';3301 include_once dirname(__FILE__).'/class.attachment.inc.php'; 3302 3302 $attachment = new attachment(); 3303 3303 $attachment->decodeConf['rfc_822bodies'] = true; //Forçar a não decodificação de mensagens em anexo. … … 3308 3308 function get_forwarding_attachment2($msg_folder, $msg_number, $msg_part, $encoding) 3309 3309 { 3310 include_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php';3310 include_once dirname(__FILE__).'/class.attachment.inc.php'; 3311 3311 $attachment = new attachment(); 3312 3312 $attachment->setStructureFromMail($msg_folder, $msg_number); … … 3663 3663 { 3664 3664 3665 require_once $_SESSION['rootPath'] . '/API/class.servicelocator.php';3665 require_oncedirname(__FILE__) . '/../../API/class.servicelocator.php'; 3666 3666 $mailService = ServiceLocator::getService('mail'); 3667 3667 … … 4959 4959 fputs($f,base64_encode($source)); 4960 4960 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\""; 4962 4962 $return['command']= exec($command); 4963 4963 }else{ … … 5129 5129 "$msg_user</body><br><br><hr>"; 5130 5130 5131 require_once $_SESSION['rootPath'] . '/API/class.servicelocator.php';5131 require_once dirname(__FILE__) . '/../../API/class.servicelocator.php'; 5132 5132 $mailService = ServiceLocator::getService('mail'); 5133 5133 $mailService->addStringAttachment($mail_content, 'report.eml', 'application/text'); -
trunk/expressoMail1_2/inc/class.ldap_functions.inc.php
r5245 r5316 1 1 <?php 2 2 3 require_once( ($_SESSION['rootPath'] ? $_SESSION['rootPath'] : PHPGW_INCLUDE_ROOT).'/API/class.servicelocator.php');3 require_once(dirname(__FILE__).'/../../API/class.servicelocator.php'); 4 4 include_once("class.imap_functions.inc.php"); 5 5 include_once("class.functions.inc.php"); … … 277 277 $modal = true; 278 278 279 include_once $_SESSION['rootPath']. '/header.inc.php';279 include_once dirname(__FILE__). '/../../header.inc.php'; 280 280 281 281 if($modal) … … 387 387 function quickSearchGlobal($params, $all=false) 388 388 { 389 include_once $_SESSION['rootPath']. '/header.inc.php';389 include_once dirname(__FILE__). '/../../header.inc.php'; 390 390 $c = CreateObject('phpgwapi.config','contactcenter'); 391 391 $all_data = $c->read_repository(); -
trunk/expressoMail1_2/inc/get_archive.php
r5272 r5316 92 92 if($msgNumber != 'null' && $indexPart !== null && $msgFolder) 93 93 { 94 require_once $_SESSION['rootPath'].'/expressoMail1_2/inc/class.attachment.inc.php';94 require_once dirname(__FILE__).'/class.attachment.inc.php'; 95 95 96 96 $attachment = new attachment(); -
trunk/expressoMail1_2/inc/show_embedded_attach.php
r4416 r5316 4 4 */ 5 5 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'; 7 7 //------------------------// 8 8 -
trunk/expressoMail1_2/inc/show_img.php
r4416 r5316 4 4 */ 5 5 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'; 7 7 //------------------------// 8 8 -
trunk/expressoMail1_2/inc/show_thumbs.php
r4416 r5316 4 4 */ 5 5 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'; 7 7 //------------------------// 8 8 -
trunk/expressoMail1_2/index.php
r5295 r5316 169 169 $template->set_var("msg_number",$_GET['msgball']['msgnum'] ? $_GET['msgball']['msgnum'] : $_GET['to']); 170 170 $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'; 173 173 $alternativeMailService = ServiceLocator::getService('ldap'); 174 174 $AlternateEmailExpresso = Array(); -
trunk/library/Mail/Mail.php
r5146 r5316 44 44 */ 45 45 46 require_once $_SESSION['rootPath'].'/library/PEAR/PEAR.php';46 require_once dirname(__FILE__).'/../PEAR/PEAR.php'; 47 47 48 48 /** -
trunk/library/Mail/Mail/smtp.php
r5146 r5316 346 346 } 347 347 348 include_once $_SESSION['rootPath'].'/library/Net/SMTP.php';348 include_once dirname(__FILE__).'/../../Net/SMTP.php'; 349 349 $this->_smtp = &new Net_SMTP($this->host, 350 350 $this->port, -
trunk/library/Net/SMTP.php
r5146 r5316 21 21 // $Id: SMTP.php 314875 2011-08-13 17:03:30Z jon $ 22 22 23 require_once $_SESSION['rootPath'].'/library/PEAR/PEAR.php';24 require_once $_SESSION['rootPath'].'/library/Net/Socket.php';23 require_once dirname(__FILE__).'/../PEAR/PEAR.php'; 24 require_once dirname(__FILE__).'/../Net/Socket.php'; 25 25 26 26 /** -
trunk/library/Net/Socket.php
r5146 r5316 28 28 */ 29 29 30 require_once $_SESSION['rootPath'].'/library/PEAR/PEAR.php';30 require_once dirname(__FILE__).'/../PEAR/PEAR.php'; 31 31 32 32 define('NET_SOCKET_READ', 1); -
trunk/library/iCalcreator/iCalcreator.class.php
r5146 r5316 53 53 /*********************************************************************************/ 54 54 /* since 2.6.22 - 2010-09-25, do NOT remove!! */ 55 require_once ( $_SESSION['rootPath'].'/library/iCalcreator/iCalUtilityFunctions.class.php' );55 require_once ( dirname(__FILE__).'/iCalUtilityFunctions.class.php' ); 56 56 /*********************************************************************************/ 57 57 /* version string, do NOT remove!! */ -
trunk/library/mime/mime.php
r5158 r5316 64 64 * This package depends on PEAR to raise errors. 65 65 */ 66 require_once $_SESSION['rootPath'].'/library/PEAR/PEAR.php';66 require_once dirname(__FILE__).'/../PEAR/PEAR.php'; 67 67 68 68 /** -
trunk/login.php
r5091 r5316 124 124 session_start(); 125 125 } 126 127 $_SESSION['rootPath'] = realpath( './' );128 126 129 127 include(personalize_include_path('phpgwapi','login')); -
trunk/services/class.mail.php
r5130 r5316 31 31 */ 32 32 33 require_once ( $_SESSION['rootPath'].'/library/mime/mimePart.php' );34 require_once ( $_SESSION['rootPath'].'/library/mime/mime.php' );33 require_once ( dirname(__FILE__).'/../library/mime/mimePart.php' ); 34 require_once ( dirname(__FILE__).'/../library/mime/mime.php' ); 35 35 36 36 … … 88 88 $hdrs = $this->mail->headers($this->arrayFields); 89 89 90 require_once ( $_SESSION['rootPath'].'/library/Mail/Mail.php');90 require_once (dirname(__FILE__).'/../library/Mail/Mail.php'); 91 91 92 92 $mail_object =& Mail::factory("smtp", self::$configuration); … … 129 129 public function send() 130 130 { 131 require_once ( $_SESSION['rootPath'].'/library/Mail/Mail.php');131 require_once (dirname(__FILE__).'/../library/Mail/Mail.php'); 132 132 $hdrs = $this->mail->headers($this->arrayFields); 133 133 $mail_object =& Mail::factory("smtp", self::$configuration);
Note: See TracChangeset
for help on using the changeset viewer.