[Fmsystem-commits] [11042] property: request

[Sigurd Nes]

Revision: 11042
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11042
Author:   sigurdne
Date:     2013-04-09 13:28:06 +0000 (Tue, 09 Apr 2013)
Log Message:
-----------
property: request

Modified Paths:
--------------
    trunk/phpgwapi/inc/functions.inc.php
    trunk/property/inc/class.uicondition_survey.inc.php
    trunk/property/templates/base/condition_survey.xsl

Modified: trunk/phpgwapi/inc/functions.inc.php
===================================================================
--- trunk/phpgwapi/inc/functions.inc.php        2013-04-09 06:47:04 UTC (rev 
11041)
+++ trunk/phpgwapi/inc/functions.inc.php        2013-04-09 13:28:06 UTC (rev 
11042)
@@ -626,7 +626,6 @@
        unset($server_info_cache);
 */
 
-
        // In case we use virtual hosts - some of them but not all with ntlm 
auth. 
        if ($GLOBALS['phpgw_info']['server']['auth_type'] == 'ntlm' && 
!isset($_SERVER['REMOTE_USER']))
        {

Modified: trunk/property/inc/class.uicondition_survey.inc.php
===================================================================
--- trunk/property/inc/class.uicondition_survey.inc.php 2013-04-09 06:47:04 UTC 
(rev 11041)
+++ trunk/property/inc/class.uicondition_survey.inc.php 2013-04-09 13:28:06 UTC 
(rev 11042)
@@ -432,12 +432,16 @@
                                'ColumnDefs'    => $summation_def
                        );
 
+                       $this->config                           = 
CreateObject('phpgwapi.config','property');
+                       $this->config->read();
+
                        $data = array
                        (
                                'datatable_def'                                 
=> $datatable_def,
                                'msgbox_data'                                   
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
                                'survey'                                        
        => $values,
-                               'location_data2'                                
        => $location_data,
+                               'location_data2'                                
=> $location_data,
+                               'lang_coordinator'                              
=> isset($this->config->config_data['lang_request_coordinator']) && 
$this->config->config_data['lang_request_coordinator'] ? 
$this->config->config_data['lang_request_coordinator'] : lang('coordinator'),
                                'categories'                                    
=> array('options' => $categories),
                                'status_list'                                   
=> array('options' => execMethod('property.bogeneric.get_list',array('type' => 
'condition_survey_status', 'selected' => $values['status_id'], 'add_empty' => 
true))),
                                'editable'                                      
        => $mode == 'edit',

Modified: trunk/property/templates/base/condition_survey.xsl
===================================================================
--- trunk/property/templates/base/condition_survey.xsl  2013-04-09 06:47:04 UTC 
(rev 11041)
+++ trunk/property/templates/base/condition_survey.xsl  2013-04-09 13:28:06 UTC 
(rev 11042)
@@ -169,7 +169,7 @@
 
                                        </dd>
                                        <dt>
-                                               <label 
for="coordinator"><xsl:value-of select="php:function('lang', 'coordinator')" 
/></label>
+                                               <label 
for="coordinator"><xsl:value-of select="lang_coordinator" /></label>
                                        </dt>
                                        <dd>