Changeset 465

Show
Ignore:
Timestamp:
11/25/08 14:34:36 (1 month ago)
Author:
nicolas
Message:

Map : correction paramètre proxy et form

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/apps/intranet/modules/maps/actions/actions.class.php

    r3 r465  
    77class mapsActions extends sfActions 
    88{ 
    9   public function executeIndex() 
     9  public function executeIndex($request) 
    1010  { 
    11     if($this->getRequestParameter('address')) 
    12     $this->address = $this->getRequestParameter('address'); 
     11    if($request->getParameter('address')) 
     12    $this->address = $request->getParameter('address'); 
    1313    else 
    1414    $this->address = false; 
    1515  } 
    1616 
    17   public function executeShow() 
     17  public function executeShow($request) 
    1818  { 
    19     $this->sales = SalesPeer::retrieveByPk($this->getRequestParameter('sales_id')); 
     19    $this->sales = SalesPeer::retrieveByPk($request->getParameter('sales_id')); 
    2020  } 
    2121} 

  • trunk/apps/intranet/modules/maps/templates/indexSuccess.php

    r3 r465  
    11<h3><?php echo ucfirst(__('map')) ?></h3> 
    2 <?php echo form_tag('maps') ?> 
     2<?php echo form_tag('maps/index') ?> 
    33Adresse : <?php echo input_tag('address', $address, array('size' => 40)) ?> 
    44<hr /> 

  • trunk/apps/intranet/modules/maps/templates/showSuccess.php

    r3 r465  
    1515  $address .= $sales->getEstate()->getPostalcode().' '; 
    1616  $address .= $sales->getEstate()->getCityValue().', FRANCE'; 
    17   if(!$map->addAddress($address, '<strong>'.ucfirst(__('sale')).':</strong><br /><br /> '.$address)): 
    18     $address = $sales->getEstate()->getAddress2().', '; 
    19     $address .= $sales->getEstate()->getPostalcode().' '; 
    20     $address .= $sales->getEstate()->getCityValue().', FRANCE'; 
    21     $map->addAddress($address, '<strong>'.ucfirst(__('sale')).':</strong><br /><br /> '.$address); 
    22   endif; 
     17  $map->addAddress($address, '<strong>'.ucfirst(__('sale')).'</strong><br />'.addslashes(ereg_replace(',', '<br />', $address))); 
    2318   
    2419  $address  = $sales->getContactRelatedBySellerId()->getAddress1().', '; 
    …… 
    2722  $address .= $sales->getContactRelatedBySellerId()->getPostalcode().' '; 
    2823  $address .= $sales->getContactRelatedBySellerId()->getCityValue().', '.$sales->getContactRelatedBySellerId()->getCountry(); 
    29   if(!$map->addAddress($address, '<strong>'.ucfirst(__('contact')).' :</strong><br /><br /> '.$sales->getContactRelatedBySellerId().'<br />'.addslashes($address))): 
    30     $address = $sales->getContactRelatedBySellerId()->getAddress2().', '; 
    31     $address .= $sales->getContactRelatedBySellerId()->getPostalcode().' '; 
    32     $address .= $sales->getContactRelatedBySellerId()->getCityValue().', FRANCE'; 
    33     $map->addAddress($address, '<strong>'.ucfirst(__('contact')).':</strong><br /><br /> '.$sales->getContactRelatedBySellerId().'<br />'.addslashes($address)); 
    34   endif; 
     24  $map->addAddress($address, '<strong>'.ucfirst(__('seller')).'</strong><br />'.$sales->getContactRelatedBySellerId().'<br />'.addslashes(ereg_replace(',', '<br />', $address))); 
    3525  $map->showMap(); 
    3626?> 

  • trunk/plugins/sfWebBrowserPlugin/lib/sfCurlAdapter.class.php

    r3 r465  
    4949  { 
    5050    $curl = curl_init(); 
    51     if(PROD == true) 
    5251    curl_setopt($curl, CURLOPT_PROXY, 'terminus.oxalide.net:3128'); 
    5352