From 4f1de1c95e0a6c0a9da8f9865b960386ca040d4f Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Mon, 12 Nov 2012 11:29:10 -0500
Subject: [PATCH] - Make sure alias domain SEO redirects get written only if they don't collide with SEO redirects from parent web site.
---
interface/lib/classes/listform_actions.inc.php | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php
index 8b99abd..9c3e4b3 100644
--- a/interface/lib/classes/listform_actions.inc.php
+++ b/interface/lib/classes/listform_actions.inc.php
@@ -33,8 +33,9 @@
private $id;
public $idx_key;
public $DataRowColor;
- public $SQLExtWhere = '';
- public $SQLOrderBy = '';
+ public $SQLExtWhere = '';
+ public $SQLOrderBy = '';
+ public $SQLExtSelect = '';
public function onLoad()
{
@@ -248,6 +249,12 @@
$order_by_sql = "GROUP BY mailuser_id ".$order_by_sql;
}
}
+
+ if($this->SQLExtSelect != '') {
+ if(substr($this->SQLExtSelect,0,1) != ',') $this->SQLExtSelect = ','.$this->SQLExtSelect;
+ $extselect .= $this->SQLExtSelect;
+ }
+
return 'SELECT '.$app->listform->listDef['table'].'.*'.$extselect.' FROM '.$app->listform->listDef['table']."$join WHERE $sql_where $order_by_sql $limit_sql";
}
@@ -278,11 +285,20 @@
$app->tpl->setVar($app->listform->wordbook);
$app->tpl->setVar('form_action', $app->listform->listDef['file']);
+ if(isset($_SESSION['show_info_msg'])) {
+ $app->tpl->setVar('show_info_msg', $_SESSION['show_info_msg']);
+ unset($_SESSION['show_info_msg']);
+ }
+ if(isset($_SESSION['show_error_msg'])) {
+ $app->tpl->setVar('show_error_msg', $_SESSION['show_error_msg']);
+ unset($_SESSION['show_error_msg']);
+ }
+
//* Parse the templates and send output to the browser
$this->onShowEnd();
}
- private function onShowEnd()
+ public function onShowEnd()
{
global $app;
$app->tpl_defaults();
--
Gitblit v1.9.1