Permalink
Browse files

Email filter fix 4.7.2

  • Loading branch information...
Theophilix
Theophilix committed Oct 10, 2018
1 parent b8d22f3 commit 2de7e81766589705f780b53518d2238873916f2c
Showing with 19 additions and 13 deletions.
  1. +0 −1 .gitignore
  2. +5 −5 admin/language/de-DE/de-DE.com_eventtableedit.sys.ini
  3. +3 −3 eventtableedit.xml
  4. +11 −4 site/models/etetable.php
View

This file was deleted.

Oops, something went wrong.
@@ -25,11 +25,11 @@ COM_EVENTTABLEEDIT_CSV_IMPORT="CSV Import"
COM_EVENTTABLEEDIT_CSV_EXPORT="CSV Export"
; Install
COM_EVENTTABLEEDIT_UNINSTALL_TEXT="Uninstall Event Table Edit"
COM_EVENTTABLEEDIT_UPDATE_TEXT="Update Event Table Edit"
COM_EVENTTABLEEDIT_PREFLIGHT_INSTALL_TEXT="Installing Event Table Edit ..."
COM_EVENTTABLEEDIT_PREFLIGHT_UPDATE_TEXT="Updating Event Table Edit ..."
COM_EVENTTABLEEDIT_PREFLIGHT_UNINSTALL_TEXT="Uninstalling Event Table Edit ..."
COM_EVENTTABLEEDIT_UNINSTALL_TEXT="Event Table Edit deinstallieren"
COM_EVENTTABLEEDIT_UPDATE_TEXT="Event Table Edit Update Hinweis:"
COM_EVENTTABLEEDIT_PREFLIGHT_INSTALL_TEXT="Installiere Event Table Edit ..."
COM_EVENTTABLEEDIT_PREFLIGHT_UPDATE_TEXT="Update Event Table Edit ..."
COM_EVENTTABLEEDIT_PREFLIGHT_UNINSTALL_TEXT="Deinstalliere Event Table Edit ..."
COM_EVENTTABLEEDIT_POSTFLIGHT_INSTALL_TEXT="Event Table Edit wurde erfolgreich installiert. Diese Komponente wurde von Manuel Kaspar und Theophilix erstellt. Besuchen Sie
<a href=\"http://www.eventtableedit.com\" target=\"_blank\">www.eventtableedit.com</a> für mehr Informationen und Hilfe."
COM_EVENTTABLEEDIT_POSTFLIGHT_UPDATE_TEXT="Event Table Edit wurde erfolgreich upgedatet. Diese Komponente wurde von Manuel Kaspar und Theophilix erstellt. Besuchen Sie
View
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="component" version="4.7.1" method="upgrade">
<extension type="component" version="4.7.2" method="upgrade">
<name>com_eventtableedit</name>
<creationDate>28-08-2018</creationDate>
<creationDate>10-10-2018</creationDate>
<author>Manuel Kaspar and Theophilix</author>
<license>GNU/GPL</license>
<copyright>2007 - 2018 Manuel Kaspar and Theophilix</copyright>
<authorEmail>webmaster@eventtableedit.com</authorEmail>
<authorUrl>http://www.eventtableedit.com</authorUrl>
<version>4.7.1</version>
<version>4.7.2</version>
<description>COM_EVENTTABLEEDIT_DESCRIPTION</description>
<scriptfile>script.php</scriptfile>
View
@@ -404,16 +404,23 @@ protected function getRowsQuery() {
*/
private function filterRows() {
$main = JFactory::getApplication()->input;
$filter1 = $this->getState('filterstring1','');
$filter1 = $this->getState('filterstring1','');
$this->filter = $this->getState('filterstring', '');
$identifier = false;
if ($this->filter == '' && $filter1 == '') {
return false;
}
if ($filter1 == '') {
$identifier = true;
}
$this->filter = str_replace('*', '%', $this->filter);
$filter1 = str_replace('*', '%', $filter1);
$filter1 = date("Y-m-d",strtotime($filter1));
$queryAr = array();
$queryAr1 = array();
$likeQuery = 'LIKE "'. "%". $this->filter . "%". '"';
@@ -439,12 +446,12 @@ private function filterRows() {
$query = '1=1';
}
if ($filter1 == '') {
if ($identifier) {
$query1 = '1=1';
}
$query2 = $query.'~'.$query1;
return $query2;
return $query2;
}
/**

0 comments on commit 2de7e81

Please sign in to comment.