[Fmsystem-commits] [7380] property: more on integration

[Sigurd Nes]

Revision: 7380
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7380
Author:   sigurdne
Date:     2011-06-15 08:32:41 +0000 (Wed, 15 Jun 2011)
Log Message:
-----------
property: more on integration

Modified Paths:
--------------
    trunk/property/inc/class.bolocation.inc.php
    trunk/property/inc/class.uilocation.inc.php
    trunk/property/templates/base/location.xsl

Modified: trunk/property/inc/class.bolocation.inc.php
===================================================================
--- trunk/property/inc/class.bolocation.inc.php 2011-06-14 11:51:29 UTC (rev 
7379)
+++ trunk/property/inc/class.bolocation.inc.php 2011-06-15 08:32:41 UTC (rev 
7380)
@@ -89,6 +89,11 @@
                        $allrows                                = 
phpgw::get_var('allrows', 'bool');
                        $location_code                  = 
phpgw::get_var('location_code');
 
+                       if($location_code && !$type_id)
+                       {
+                               $type_id = count(explode('-',$location_code));
+                       }
+
                        $this->start                    = $start ? $start : 0;
                        $this->query                    = isset($query) && 
$query ? $query : '';
                        $this->filter                   = isset($filter) && 
$filter ? $filter : '';

Modified: trunk/property/inc/class.uilocation.inc.php
===================================================================
--- trunk/property/inc/class.uilocation.inc.php 2011-06-14 11:51:29 UTC (rev 
7379)
+++ trunk/property/inc/class.uilocation.inc.php 2011-06-15 08:32:41 UTC (rev 
7380)
@@ -2302,7 +2302,9 @@
                                                $cxContext = 
stream_context_create($aContext);
                                                $response = 
trim(file_get_contents($request, False, $cxContext));
 
-                                               $integration[]  = 
array('section' => $_config_section);
+                                               
+                                               $_config_section_name = 
str_replace(' ', '_',$_config_section);
+                                               $integration[]  = 
array('section' => $_config_section_name);
                                                $_config_section_data['url']    
        = htmlspecialchars_decode($_config_section_data['url']);
                                                
$_config_section_data['parametres']     = 
htmlspecialchars_decode($_config_section_data['parametres']);
 
@@ -2364,7 +2366,7 @@
                                                        foreach ($output as 
$_dummy => $_substitute)
                                                        {
                                                                $_keys[] = 
$_substitute;
-                                                               $_values[] = 
urlencode($values['location_data'][trim($_substitute, '_')]);
+                                                               $_values[] = 
urlencode($values[trim($_substitute, '_')]);
                                                        }
                                                        $integration_src .= '&' 
. str_replace($_keys, $_values, $_config_section_data['location_data']);
                                                }
@@ -2372,13 +2374,13 @@
                                                $integration_src .= 
"&{$_config_section_data['auth_key_name']}={$response}";
                                                //_debug_array($values);
                                                
//_debug_array($integration_src);die();
-                                               $tabs[$_config_section] = 
array('label' => $_config_section_data['tab'], 'link' => "#{$_config_section}", 
'function' => "document.getElementById('{$_config_section}_content').src = 
'{$integration_src}';");
+
+                                               $tabs[$_config_section] = 
array('label' => $_config_section_data['tab'], 'link' => 
"#{$_config_section_name}", 'function' => 
"document.getElementById('{$_config_section_name}_content').src = 
'{$integration_src}';");
                                        }
                                }
 // ---- END INTEGRATION -------------------------
                        }
 
-
                        $data = array
                        (
                                'integration'                                   
=> $integration,

Modified: trunk/property/templates/base/location.xsl
===================================================================
--- trunk/property/templates/base/location.xsl  2011-06-14 11:51:29 UTC (rev 
7379)
+++ trunk/property/templates/base/location.xsl  2011-06-15 08:32:41 UTC (rev 
7380)
@@ -557,16 +557,15 @@
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
+                                       <xsl:for-each select="integration">
+                                               <div id="{section}">
+                                                       <iframe id = 
"{section}_content" width="100%" height="500">
+                                                               <p>Your browser 
does not support iframes.</p>
+                                                       </iframe>
+                                               </div>
+                               </xsl:for-each>
                                </div>
 
-                               <xsl:for-each select="integration">
-                                       <div id="{section}">
-                                               <iframe id = 
"{section}_content" width="100%" height="500">
-                                                       <p>Your browser does 
not support iframes.</p>
-                                               </iframe>
-                                       </div>
-                               </xsl:for-each>
-
                                <table cellpadding="2" cellspacing="2" 
width="80%" align="center">
                                        <tr height="50">
                                                <xsl:choose>