version 0.1.3 / 0.2.3 imported

OpenEstate · Nov 27, 2014 · 7d71a82 · 7d71a82
1 parent f8f6edc
commit 7d71a82
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-OpenEstate-PHP-Wrapper for Joomla 0.1.2 / 0.2.2
+OpenEstate-PHP-Wrapper for Joomla 0.1.3 / 0.2.3
 ===============================================
 
 This extension integrates [OpenEstate-PHP-Export](https://github.com/OpenEstate/OpenEstate-PHP-Export)
@@ -34,6 +34,17 @@ Webseite integriert werden.
 Changelog
 ---------
 
+### 0.1.3 / 0.2.3
+
+-   Reset filter selection, if a property page is accessed for the first time or
+    if the website visitor jumps between multiple property pages.
+    (see [Forum](http://board.openestate.org/viewtopic.php?f=7&t=3329))
+-   Show a **notice** instead of an **error** message on the website, if
+    *OpenEstate-ImmoTool* is currently exporting properties to the webspace.
+    (see [Forum](http://board.openestate.org/viewtopic.php?f=6&t=3208))
+-   Fixed problem with SEO URL's (URL-Rewrite), that occured solely on
+    1&1 webspaces.
+
 ### 0.1.2 / 0.2.2
 
 -   Show an error message on the website, if *OpenEstate-ImmoTool* is currently

diff --git a/release.sh b/release.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 NAME="com_openestate"
-VERSION15="0.1.2"
-VERSION25="0.2.2"
+VERSION15="0.1.3"
+VERSION25="0.2.3"
 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-2011 All rights reserved.</copyright>
   <license>GNU/GPL3</license>
-  <version>0.1.2</version>
+  <version>0.1.3</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/de-DE.com_openestate.ini b/src/joomla-1.5/de-DE.com_openestate.ini
@@ -7,6 +7,7 @@
 
 # error messages
 ERROR=Fehler
+NOTICE=Hinweis
 CANT_LOAD_COMPONENT_SETTINGS=Die Einstellungen der OpenEstate-Komponente konnten nicht geladen werden.
 CANT_LOAD_MENU_SETTINGS=Die Einstellungen des Menüpunktes konnten nicht geladen werden.
 CANT_FIND_SCRIPTS=Unter dem angebenen Skript-Pfad wurde kein PHP-Export gefunden.

diff --git a/src/joomla-1.5/en-GB.com_openestate.ini b/src/joomla-1.5/en-GB.com_openestate.ini
@@ -7,6 +7,7 @@
 
 # error messages
 ERROR=Error
+NOTICE=Notice
 CANT_LOAD_COMPONENT_SETTINGS=Can't load global settings for the OpenEstate component.
 CANT_LOAD_MENU_SETTINGS=Can't load settings for the current menu entry.
 CANT_FIND_SCRIPTS=Can't find PHP scripts at the provided script path.

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 904 2011-06-16 00:18:52Z andy $
+ * $Id: openestate.wrapper.php 1114 2011-10-21 19:12:11Z andy $
  *
  * @package OpenEstate
  * @author Andreas Rudolph & Walter Wagner
@@ -160,7 +160,7 @@ function wrap( $defaultView, $scriptName, &$params, &$hiddenParams ) {
       //echo '<pre>';
       //print_r($_REQUEST);
       //echo '</pre>';
-      $wrapParams = array( 'wrap', IMMOTOOL_PARAM_LANG, IMMOTOOL_PARAM_EXPOSE_ID, IMMOTOOL_PARAM_EXPOSE_VIEW );
+      $wrapParams = array( 'wrap', IMMOTOOL_PARAM_LANG, IMMOTOOL_PARAM_INDEX_VIEW, IMMOTOOL_PARAM_INDEX_MODE, IMMOTOOL_PARAM_INDEX_ORDER, IMMOTOOL_PARAM_INDEX_FILTER );
       $useDefaultParams = true;
       foreach ($wrapParams as $param) {
         if (isset($_REQUEST[ $param ])) {
@@ -169,6 +169,7 @@ function wrap( $defaultView, $scriptName, &$params, &$hiddenParams ) {
         }
       }
       if ($useDefaultParams) {
+        $_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER_CLEAR ] = '1';
         if ($params->get( 'lang', null )!=null)
           $_REQUEST[ IMMOTOOL_PARAM_LANG ] = $params->get( 'lang' );
         if ($params->get( 'view', null )!=null)

diff --git a/src/joomla-1.5/views/expose/view.html.php b/src/joomla-1.5/views/expose/view.html.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * OpenEstate-PHP-Wrapper für Joomla.
- * $Id: view.html.php 904 2011-06-16 00:18:52Z andy $
+ * $Id: view.html.php 1114 2011-10-21 19:12:11Z andy $
  *
  * @package OpenEstate
  * @author Andreas Rudolph & Walter Wagner
@@ -50,7 +50,7 @@ function display($tpl = null) {
       }
     }
     else if (is_file(IMMOTOOL_BASE_PATH . 'immotool.php.lock')) {
-      $msg = '<h2>'.JText::_( 'ERROR' ).'!</h2><p>'.JText::_( 'UPDATE_IS_RUNNING' ).'</p>';
+      $msg = '<h2>'.JText::_( 'NOTICE' ).'!</h2><p>'.JText::_( 'UPDATE_IS_RUNNING' ).'</p>';
       $this->assignRef( 'content', $msg );
       parent::display($tpl);
       return;
@@ -86,6 +86,9 @@ function display($tpl = null) {
         $requestUrl = explode('?', $_SERVER['REQUEST_URI']);
         $baseUrl = $requestUrl[0];
       }
+      else if (isset($_SERVER['REDIRECT_URL'])) {
+      	$baseUrl = $_SERVER['REDIRECT_URL'];
+      }
       else {
         $baseUrl = $_SERVER['PHP_SELF'];
       }

diff --git a/src/joomla-1.5/views/listing/view.html.php b/src/joomla-1.5/views/listing/view.html.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * OpenEstate-PHP-Wrapper für Joomla.
- * $Id: view.html.php 904 2011-06-16 00:18:52Z andy $
+ * $Id: view.html.php 1114 2011-10-21 19:12:11Z andy $
  *
  * @package OpenEstate
  * @author Andreas Rudolph & Walter Wagner
@@ -50,7 +50,7 @@ function display($tpl = null) {
       }
     }
     else if (is_file(IMMOTOOL_BASE_PATH . 'immotool.php.lock')) {
-      $msg = '<h2>'.JText::_( 'ERROR' ).'!</h2><p>'.JText::_( 'UPDATE_IS_RUNNING' ).'</p>';
+      $msg = '<h2>'.JText::_( 'NOTICE' ).'!</h2><p>'.JText::_( 'UPDATE_IS_RUNNING' ).'</p>';
       $this->assignRef( 'content', $msg );
       parent::display($tpl);
       return;
@@ -86,6 +86,9 @@ function display($tpl = null) {
         $requestUrl = explode('?', $_SERVER['REQUEST_URI']);
         $baseUrl = $requestUrl[0];
       }
+      else if (isset($_SERVER['REDIRECT_URL'])) {
+      	$baseUrl = $_SERVER['REDIRECT_URL'];
+      }
       else {
         $baseUrl = $_SERVER['PHP_SELF'];
       }

diff --git a/src/joomla-2.5/language/site/de-DE.com_openestate.ini b/src/joomla-2.5/language/site/de-DE.com_openestate.ini
@@ -1,10 +1,11 @@
-; $Id: de-DE.com_openestate.ini 906 2011-06-16 00:23:35Z andy $
+; $Id: de-DE.com_openestate.ini 1116 2011-10-21 19:13:16Z andy $
 ; OpenEstate.org
 ; copyright Copyright (C) 2010 - 2011 Andreas Rudolph & Walter Wagner
 ; license http://www.gnu.org/licenses/gpl.html
 
 ; error messages
 COM_OPENESTATE_ERROR="Fehler"
+COM_OPENESTATE_NOTICE="Hinweis"
 COM_OPENESTATE_CANT_LOAD_COMPONENT_SETTINGS="Die Einstellungen der OpenEstate-Komponente konnten nicht geladen werden."
 COM_OPENESTATE_CANT_LOAD_MENU_SETTINGS="Die Einstellungen des Menüpunktes konnten nicht geladen werden."
 COM_OPENESTATE_CANT_FIND_SCRIPTS="Unter dem angebenen Skript-Pfad wurde kein PHP-Export gefunden."

diff --git a/src/joomla-2.5/language/site/en-GB.com_openestate.ini b/src/joomla-2.5/language/site/en-GB.com_openestate.ini
@@ -1,10 +1,11 @@
-; $Id: en-GB.com_openestate.ini 906 2011-06-16 00:23:35Z andy $
+; $Id: en-GB.com_openestate.ini 1116 2011-10-21 19:13:16Z andy $
 ; OpenEstate.org
 ; copyright Copyright (C) 2010 - 2011 Andreas Rudolph & Walter Wagner
 ; license http://www.gnu.org/licenses/gpl.html
 
 ; error messages
 COM_OPENESTATE_ERROR="Error"
+COM_OPENESTATE_NOTICE="Notice"
 COM_OPENESTATE_CANT_LOAD_COMPONENT_SETTINGS="Can't load global settings for the OpenEstate component."
 COM_OPENESTATE_CANT_LOAD_MENU_SETTINGS="Can't load settings for the current menu entry."
 COM_OPENESTATE_CANT_FIND_SCRIPTS="Can't find PHP scripts at the provided script path."

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-2011 All rights reserved.</copyright>
   <license>GNU/GPL3</license>
-  <version>0.2.2</version>
+  <version>0.2.3</version>
   <description>COM_OPENESTATE_DESCRIPTION</description>
   <updateservers>
     <server type="extension" priority="1" name="openestate.org">http://wiki.openestate.org/mediawiki/images/9/9e/Joomla16_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 906 2011-06-16 00:23:35Z andy $
+ * $Id: openestate.wrapper.php 1116 2011-10-21 19:13:16Z andy $
  *
  * @package OpenEstate
  * @author Andreas Rudolph & Walter Wagner
@@ -172,7 +172,7 @@ function wrap( $defaultView, $scriptName, &$params, &$hiddenParams ) {
       //echo '<pre>';
       //print_r($_REQUEST);
       //echo '</pre>';
-      $wrapParams = array( 'wrap', IMMOTOOL_PARAM_LANG, IMMOTOOL_PARAM_EXPOSE_ID, IMMOTOOL_PARAM_EXPOSE_VIEW );
+      $wrapParams = array( 'wrap', IMMOTOOL_PARAM_LANG, IMMOTOOL_PARAM_INDEX_VIEW, IMMOTOOL_PARAM_INDEX_MODE, IMMOTOOL_PARAM_INDEX_ORDER, IMMOTOOL_PARAM_INDEX_FILTER );
       $useDefaultParams = true;
       foreach ($wrapParams as $param) {
         if (isset($_REQUEST[ $param ])) {
@@ -181,6 +181,7 @@ function wrap( $defaultView, $scriptName, &$params, &$hiddenParams ) {
         }
       }
       if ($useDefaultParams) {
+        $_REQUEST[ IMMOTOOL_PARAM_INDEX_FILTER_CLEAR ] = '1';
         if ($params->get( 'lang', null )!=null)
           $_REQUEST[ IMMOTOOL_PARAM_LANG ] = $params->get( 'lang' );
         if ($params->get( 'view', null )!=null)

diff --git a/src/joomla-2.5/site/views/expose/view.html.php b/src/joomla-2.5/site/views/expose/view.html.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * OpenEstate-PHP-Wrapper für Joomla.
- * $Id: view.html.php 906 2011-06-16 00:23:35Z andy $
+ * $Id: view.html.php 1116 2011-10-21 19:13:16Z andy $
  *
  * @package OpenEstate
  * @author Andreas Rudolph & Walter Wagner
@@ -50,7 +50,7 @@ function display($tpl = null) {
       }
     }
     else if (is_file(IMMOTOOL_BASE_PATH . 'immotool.php.lock')) {
-      $msg = '<h2>'.JText::_( 'COM_OPENESTATE_ERROR' ).'!</h2><p>'.JText::_( 'COM_OPENESTATE_UPDATE_IS_RUNNING' ).'</p>';
+      $msg = '<h2>'.JText::_( 'COM_OPENESTATE_NOTICE' ).'!</h2><p>'.JText::_( 'COM_OPENESTATE_UPDATE_IS_RUNNING' ).'</p>';
       $this->assignRef( 'content', $msg );
       parent::display($tpl);
       return;
@@ -87,6 +87,9 @@ function display($tpl = null) {
         $requestUrl = explode('?', $_SERVER['REQUEST_URI']);
         $baseUrl = $requestUrl[0];
       }
+      else if (isset($_SERVER['REDIRECT_URL'])) {
+      	$baseUrl = $_SERVER['REDIRECT_URL'];
+      }
       else {
         $baseUrl = $_SERVER['PHP_SELF'];
       }

diff --git a/src/joomla-2.5/site/views/listing/view.html.php b/src/joomla-2.5/site/views/listing/view.html.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * OpenEstate-PHP-Wrapper für Joomla.
- * $Id: view.html.php 906 2011-06-16 00:23:35Z andy $
+ * $Id: view.html.php 1116 2011-10-21 19:13:16Z andy $
  *
  * @package OpenEstate
  * @author Andreas Rudolph & Walter Wagner
@@ -50,7 +50,7 @@ function display($tpl = null) {
       }
     }
     else if (is_file(IMMOTOOL_BASE_PATH . 'immotool.php.lock')) {
-      $msg = '<h2>'.JText::_( 'COM_OPENESTATE_ERROR' ).'!</h2><p>'.JText::_( 'COM_OPENESTATE_UPDATE_IS_RUNNING' ).'</p>';
+      $msg = '<h2>'.JText::_( 'COM_OPENESTATE_NOTICE' ).'!</h2><p>'.JText::_( 'COM_OPENESTATE_UPDATE_IS_RUNNING' ).'</p>';
       $this->assignRef( 'content', $msg );
       parent::display($tpl);
       return;
@@ -87,6 +87,9 @@ function display($tpl = null) {
         $requestUrl = explode('?', $_SERVER['REQUEST_URI']);
         $baseUrl = $requestUrl[0];
       }
+      else if (isset($_SERVER['REDIRECT_URL'])) {
+      	$baseUrl = $_SERVER['REDIRECT_URL'];
+      }
       else {
         $baseUrl = $_SERVER['PHP_SELF'];
       }