version 0.1.6 / 0.2.6 imported

OpenEstate · Nov 27, 2014 · 056f6d0 · 056f6d0
1 parent 6c6e2a7
commit 056f6d0
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-OpenEstate-PHP-Wrapper for Joomla 0.1.5 / 0.2.5
+OpenEstate-PHP-Wrapper for Joomla 0.1.6 / 0.2.6
 ===============================================
 
 This extension integrates [OpenEstate-PHP-Export](https://github.com/OpenEstate/OpenEstate-PHP-Export)
@@ -34,6 +34,10 @@ Webseite integriert werden.
 Changelog
 ---------
 
+### 0.1.6 / 0.2.6
+
+-   Some smaller fixes
+
 ### 0.1.5 / 0.2.5
 
 -   Predefined filters / orderings are handled incorrectly under certain

diff --git a/release.sh b/release.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 NAME="com_openestate"
-VERSION15="0.1.5"
-VERSION25="0.2.5"
+VERSION15="0.1.6"
+VERSION25="0.2.6"
 PROJECT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 rm -Rf $PROJECT_DIR/release

diff --git a/src/joomla-1.5/com_openestate.xml b/src/joomla-1.5/com_openestate.xml
@@ -8,7 +8,7 @@
   <authorUrl>http://openestate.org</authorUrl>
   <copyright>(C) 2010-2012 All rights reserved.</copyright>
   <license>GNU/GPL3</license>
-  <version>0.1.5</version>
+  <version>0.1.6</version>
   <description><![CDATA[<h2>OpenEstate-PHP-Wrapper</h2><p>This component integrates PHP-exported properties from OpenEstate-ImmoTool into Joomla. You can find further informations at <a href="http://openestate.org" target="_blank">OpenEstate.org</a></p>]]></description>
 
   <!-- Site Main File Copy Section -->

diff --git a/src/joomla-1.5/openestate.wrapper.php b/src/joomla-1.5/openestate.wrapper.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * OpenEstate-PHP-Wrapper für Joomla.
- * $Id: openestate.wrapper.php 1617 2012-07-03 08:11:53Z andy $
+ * $Id: openestate.wrapper.php 1709 2012-08-15 15:00:58Z andy $
  *
  * @package OpenEstate
  * @author Andreas Rudolph & Walter Wagner
@@ -44,6 +44,8 @@
   define('IMMOTOOL_PARAM_EXPOSE_CONTACT', 'wrapped_contact');
 if (!defined('IMMOTOOL_PARAM_EXPOSE_CAPTCHA'))
   define('IMMOTOOL_PARAM_EXPOSE_CAPTCHA', 'wrapped_captchacode');
+if (!defined('OPENESTATE_WRAPPER'))
+  define('OPENESTATE_WRAPPER', '1');
 
 class OpenEstateWrapper {
 
@@ -170,12 +172,14 @@ function wrap( $defaultView, $scriptName, &$params, &$hiddenParams ) {
       // vorgegebene Filter-Kriterien mit der Anfrage zusammenführen
       if (!isset($_REQUEST[ 'wrap' ]) || isset($_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ])) {
         $filters = OpenEstateWrapper::parseValuesFromTxt( $params->get( 'filter' ) );
-        foreach ($filters as $filter=>$value) {
-          if (!is_array($_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ])) {
-            $_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ] = array();
-          }
-          if (!isset($_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ][$filter])) {
-            $_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ][$filter] = $value;
+        if (is_array($filters)) {
+          foreach ($filters as $filter=>$value) {
+            if (!is_array($_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ])) {
+              $_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ] = array();
+            }
+            if (!isset($_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ][$filter])) {
+              $_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ][$filter] = $value;
+            }
           }
         }
       }

diff --git a/src/joomla-2.5/openestate.xml b/src/joomla-2.5/openestate.xml
@@ -7,7 +7,7 @@
   <authorUrl>http://openestate.org</authorUrl>
   <copyright>(C) 2010-2012 All rights reserved.</copyright>
   <license>GNU/GPL3</license>
-  <version>0.2.5</version>
+  <version>0.2.6</version>
   <description>COM_OPENESTATE_DESCRIPTION</description>
   <updateservers>
     <server type="extension" priority="1" name="openestate.org">http://wiki.openestate.org/mediawiki/images/e/e9/Joomla25_extension.xml</server>

diff --git a/src/joomla-2.5/site/openestate.wrapper.php b/src/joomla-2.5/site/openestate.wrapper.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * OpenEstate-PHP-Wrapper für Joomla.
- * $Id: openestate.wrapper.php 1618 2012-07-03 08:12:06Z andy $
+ * $Id: openestate.wrapper.php 1708 2012-08-15 15:00:41Z andy $
  *
  * @package OpenEstate
  * @author Andreas Rudolph & Walter Wagner
@@ -44,6 +44,8 @@
   define('IMMOTOOL_PARAM_EXPOSE_CONTACT', 'wrapped_contact');
 if (!defined('IMMOTOOL_PARAM_EXPOSE_CAPTCHA'))
   define('IMMOTOOL_PARAM_EXPOSE_CAPTCHA', 'wrapped_captchacode');
+if (!defined('OPENESTATE_WRAPPER'))
+  define('OPENESTATE_WRAPPER', '1');
 
 class OpenEstateWrapper {
 
@@ -182,12 +184,14 @@ function wrap( $defaultView, $scriptName, &$params, &$hiddenParams ) {
       // vorgegebene Filter-Kriterien mit der Anfrage zusammenführen
       if (!isset($_REQUEST[ 'wrap' ]) || isset($_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ])) {
         $filters = OpenEstateWrapper::parseValuesFromTxt( $params->get( 'filter' ) );
-        foreach ($filters as $filter=>$value) {
-          if (!is_array($_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ])) {
-            $_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ] = array();
-          }
-          if (!isset($_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ][$filter])) {
-            $_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ][$filter] = $value;
+        if (is_array($filters)) {
+          foreach ($filters as $filter=>$value) {
+            if (!is_array($_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ])) {
+              $_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ] = array();
+            }
+            if (!isset($_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ][$filter])) {
+              $_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ][$filter] = $value;
+            }
           }
         }
       }