version 0.2.7 imported

OpenEstate · Nov 25, 2014 · ed5ef2c · ed5ef2c
1 parent 6a1d3c3
commit ed5ef2c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-A WordPress plugin for the OpenEstate-PHP-Export 0.2.6
+A WordPress plugin for the OpenEstate-PHP-Export 0.2.7
 ======================================================
 
 This plugin integrates [OpenEstate-PHP-Export](https://github.com/OpenEstate/OpenEstate-PHP-Export)
@@ -94,6 +94,11 @@ Screenshots
 Changelog
 ---------
 
+### 0.2.7
+
+-   Fixed possible PHP notice message
+-   Fixed session initialization
+
 ### 0.2.6
 
 -   Write wrapped CSS into page header

diff --git a/src/openestate-php-wrapper.php b/src/openestate-php-wrapper.php
@@ -3,11 +3,11 @@
 Plugin Name: OpenEstate PHP-Wrapper
 Plugin URI: http://wiki.openestate.org/PHP-Wrapper_-_Wordpress
 Description: This plugin integrates PHP-exported properties from OpenEstate-ImmoTool into WordPress.
-Version: 0.2.6
+Version: 0.2.7
 Author: Andreas Rudolph, Walter Wagner (OpenEstate.org)
 Author URI: http://openestate.org/
 License: GPL3
-Id: $Id: openestate-php-wrapper.php 1877 2012-10-24 21:09:35Z andy $
+Id: $Id: openestate-php-wrapper.php 2060 2013-02-13 03:27:08Z andy $
 */
 
 /**
@@ -53,7 +53,7 @@ function openestate_wrapper_load( $scriptPath, $scriptUrl, &$environmentErrors )
     define('IMMOTOOL_PARAM_EXPOSE_CAPTCHA', 'wrapped_captchacode');
 
   // minimale Skript-Umgebung laden
-  $environmentFiles = array( 'config.php', 'include/functions.php', 'data/language.php' );
+  $environmentFiles = array( 'config.php', 'private.php', 'include/functions.php', 'data/language.php' );
   if (!is_dir($scriptPath)) {
     $environmentErrors[] = __('error_no_export_path', 'openestate-php-wrapper');
     return false;
@@ -594,7 +594,10 @@ function openestate_wrapper_post_callback( $matches ) {
   }
 
   // Script ermitteln
-  $wrap = (isset($_REQUEST['wrap']) && is_string($_REQUEST['wrap']))? $_REQUEST['wrap']: $settings['wrap'];
+  $wrap = (isset($_REQUEST['wrap']))? $_REQUEST['wrap']: null;
+  if (!is_string($wrap) && isset($settings['wrap'])) {
+    $wrap = $settings['wrap'];
+  }
   if ($wrap=='expose') {
     $wrap = 'expose';
     $script = 'expose.php';
@@ -641,10 +644,10 @@ function openestate_wrapper_post_callback( $matches ) {
 
     // vorgegebene Filter-Kriterien mit der Anfrage zusammenführen
     if (!isset($_REQUEST[ 'wrap' ]) || isset($_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ])) {
-      $filters = $settings['filter'];
+      $filters = (isset($settings['filter']))? $settings['filter']: null;
       if (is_array($filters)) {
         foreach ($filters as $filter=>$value) {
-          if (!is_array($_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ])) {
+          if (!isset($_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ]) || !is_array($_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ])) {
             $_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ] = array();
           }
           if (!isset($_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER ][$filter])) {

diff --git a/src/readme.txt b/src/readme.txt
@@ -4,7 +4,7 @@ Donate link: http://en.openestate.org/sponsors/
 Tags: homes, listings, openestate, promote, properties, property, real estate, realestate, real-estate, realty, wrapper
 Requires at least: 3.0.0
 Tested up to: 3.4
-Stable tag: 0.2.6
+Stable tag: 0.2.7
 
 This plugin integrates your properties from OpenEstate-ImmoTool into your WordPress blog.
 
@@ -76,6 +76,10 @@ This plugin is focused on users of the freeware real-estate software [OpenEstate
 
 == Changelog ==
 
+= 0.2.7 =
+* Fixed possible PHP notice message
+* Fixed session initialization
+
 = 0.2.6 =
 * Write wrapped CSS into page header
 * Fixed session initialization