extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 00:58:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

allow etemplate to use xajax

Browse Source
This commit is contained in:
Cornelius Weiß 2006-03-29 19:25:00 +00:00
parent 4fc82a393c
commit d79ed4aa96
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
etemplate/inc/class.uietemplate.inc.php
View File

@ -78,6 +78,10 @@
{ {
$GLOBALS['egw']->html =& CreateObject('phpgwapi.html'); $GLOBALS['egw']->html =& CreateObject('phpgwapi.html');
} }
if (!is_object($GLOBALS['egw']->template))
{
$GLOBALS['egw']->template =& CreateObject('phpgwapi.template');
}
$this->html = &$GLOBALS['egw']->html; $this->html = &$GLOBALS['egw']->html;
$this->boetemplate($name,$load_via); $this->boetemplate($name,$load_via);
@ -318,24 +322,28 @@
* *
* @return mixed false if no sessiondata and $this->sitemgr, else the returnvalue of exec of the method-calls * @return mixed false if no sessiondata and $this->sitemgr, else the returnvalue of exec of the method-calls
*/ */
function process_exec() function process_exec($etemplate_exec_id = null, $submit_button = null, $exec = null )
{ {
if(!$etemplate_exec_id) $etemplate_exec_id = $_POST['etemplate_exec_id'];
if(!$submit_button) $submit_button = $_POST['submit_button'];
if(!$exec) $exec = $_POST;
//echo "process_exec: _POST ="; _debug_array($_POST); //echo "process_exec: _POST ="; _debug_array($_POST);
$session_data = $this->get_appsession($_POST['etemplate_exec_id']); $session_data = $this->get_appsession($etemplate_exec_id);
//echo "<p>process_exec: session_data ="; _debug_array($session_data); //echo "<p>process_exec: session_data ="; _debug_array($session_data);
if (!$_POST['etemplate_exec_id'] || !is_array($session_data) || count($session_data) < 10) if (!$etemplate_exec_id || !is_array($session_data) || count($session_data) < 10)
{ {
if ($this->sitemgr) return false; if ($this->sitemgr) return false;
//echo "uitemplate::process_exec() id='$_POST[etemplate_exec_id]' invalid session-data !!!"; _debug_array($_SESSION); //echo "uitemplate::process_exec() id='$_POST[etemplate_exec_id]' invalid session-data !!!"; _debug_array($_SESSION);
// this prevents an empty screen, if the sessiondata gets lost somehow // this prevents an empty screen, if the sessiondata gets lost somehow
$this->location(array('menuaction' => $_GET['menuaction'])); $this->location(array('menuaction' => $_GET['menuaction']));
} }
if (isset($_POST['submit_button']) && !empty($_POST['submit_button'])) if (isset($submit_button) && !empty($submit_button))
{ {
$this->set_array($_POST,$_POST['submit_button'],'pressed'); $this->set_array($exec,$submit_button,'pressed');
} }
$content = $_POST['exec']; $content = $exec['exec'];
if (!is_array($content)) if (!is_array($content))
{ {
$content = array(); $content = array();

6
xajax.php
View File

@ -25,7 +25,7 @@
list($appName, $className, $functionName) = explode('.',$arg0); list($appName, $className, $functionName) = explode('.',$arg0);
if(substr($className,0,4) != 'ajax') if(substr($className,0,4) != 'ajax' && $arg0 != 'etemplate.etemplate.process_exec')
{ {
// stopped for security reasons // stopped for security reasons
error_log($_SERVER["PHP_SELF"]. ' stopped for security reason. className '.$className.' is not valid. className must start with ajax!!!'); error_log($_SERVER["PHP_SELF"]. ' stopped for security reason. className '.$className.' is not valid. className must start with ajax!!!');
@ -38,9 +38,9 @@
'noheader' => True, 'noheader' => True,
'disable_Template_class' => True, 'disable_Template_class' => True,
); );
include('./header.inc.php'); include('./header.inc.php');
$ajaxClass = CreateObject("$appName.$className"); $ajaxClass = CreateObject("$appName.$className");
$argList = $GLOBALS['egw']->translation->convert($argList, 'utf-8'); $argList = $GLOBALS['egw']->translation->convert($argList, 'utf-8');
return call_user_func_array(array(&$ajaxClass, $functionName), $argList ); return call_user_func_array(array(&$ajaxClass, $functionName), $argList );