From b5715fb4a82d6494e6fba5ffcc1b0af3c9d2421c Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Sat, 07 Jul 2012 13:12:41 -0400
Subject: [PATCH] removed hardcoded width for list search_limit select-element -> css defined
---
interface/lib/classes/tpl.inc.php | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/interface/lib/classes/tpl.inc.php b/interface/lib/classes/tpl.inc.php
index e935240..72d0dfe 100644
--- a/interface/lib/classes/tpl.inc.php
+++ b/interface/lib/classes/tpl.inc.php
@@ -322,7 +322,8 @@
*/
public function setDbLoop($loopname, $result, $db_type = 'MYSQL')
{
- $db_type = strtoupper($db_type);
+ /*
+ $db_type = strtoupper($db_type);
if (!in_array($db_type, $this->allowed_loop_dbs)) {
vlibTemplateError::raiseError('VT_WARNING_INVALID_LOOP_DB', WARNING, $db_type);
return false;
@@ -448,6 +449,7 @@
}
$this->setLoop($loopname, $loop_arr);
return true;
+ */
}
/**
@@ -876,8 +878,15 @@
*/
private function _fileSearch($file)
{
- $filename = basename($file);
+
+ $filename = basename($file);
$filepath = dirname($file);
+
+ if(isset($_SESSION['s']['module']['name']) && isset($_SESSION['s']['theme'])) {
+ if(is_file(ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates/'.$_SESSION['s']['module']['name'].'/'.$filename)) {
+ return ISPC_THEMES_PATH.'/'.$_SESSION['s']['theme'].'/templates/'.$_SESSION['s']['module']['name'].'/'.$filename;
+ }
+ }
//* check fullpath first..
$fullpath = $filepath.'/'.$filename;
@@ -1224,10 +1233,10 @@
*/
private function _intParse ()
{
- $mqrt = get_magic_quotes_runtime();
- set_magic_quotes_runtime(0);
+ //$mqrt = get_magic_quotes_runtime();
+ //set_magic_quotes_runtime(0);
$this->_tmplfilep = '?>'.$this->_getData($this->_tmplfilename).'<?php return true;';
- set_magic_quotes_runtime($mqrt);
+ //set_magic_quotes_runtime($mqrt);
return true;
}
--
Gitblit v1.9.1