holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow to specify app for redirects (for Stylite or Pixelegg template)

Browse Source
This commit is contained in:
Ralf Becker 2014-01-28 11:00:39 +00:00
parent e4285b67f4
commit d40025f732
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpgwapi/inc/class.egw.inc.php
View File

@ -96,10 +96,12 @@ class egw extends egw_minimal
// ignore exception, get handled below // ignore exception, get handled below
} }
catch(egw_exception_db_invalid_sql $e1) { catch(egw_exception_db_invalid_sql $e1) {
unset($e1); // not used
try { try {
$phpgw_config = $this->db->select('phpgw_config','COUNT(config_name)',false,__LINE__,__FILE__)->fetchColumn(); $phpgw_config = $this->db->select('phpgw_config','COUNT(config_name)',false,__LINE__,__FILE__)->fetchColumn();
} }
catch (egw_exception_db_invalid_sql $e2) { catch (egw_exception_db_invalid_sql $e2) {
unset($e2); // not used
// ignor error, get handled below // ignor error, get handled below
} }
} }
@ -296,6 +298,7 @@ class egw extends egw_minimal
// check if we have a session, if not try to automatic create one // check if we have a session, if not try to automatic create one
if ($this->session->verify()) return true; if ($this->session->verify()) return true;
$account = null;
if (($account_callback = $GLOBALS['egw_info']['flags']['autocreate_session_callback']) && is_callable($account_callback) && if (($account_callback = $GLOBALS['egw_info']['flags']['autocreate_session_callback']) && is_callable($account_callback) &&
($sessionid = call_user_func_array($account_callback,array(&$account))) === true) // $account_call_back returns true, false or a session-id ($sessionid = call_user_func_array($account_callback,array(&$account))) === true) // $account_call_back returns true, false or a session-id
{ {
@ -313,6 +316,7 @@ class egw extends egw_minimal
} }
else // the webserver-url is empty or just a slash '/' (eGW is installed in the docroot and no domain given) else // the webserver-url is empty or just a slash '/' (eGW is installed in the docroot and no domain given)
{ {
$matches = null;
if (preg_match('/^https?:\/\/[^\/]*\/(.*)$/',$relpath=$_SERVER['PHP_SELF'],$matches)) if (preg_match('/^https?:\/\/[^\/]*\/(.*)$/',$relpath=$_SERVER['PHP_SELF'],$matches))
{ {
$relpath = $matches[1]; $relpath = $matches[1];
@ -469,8 +473,9 @@ class egw extends egw_minimal
* This function handles redirects under iis and apache it assumes that $phpgw->link() has already been called * This function handles redirects under iis and apache it assumes that $phpgw->link() has already been called
* *
* @param string The url ro redirect to * @param string The url ro redirect to
* @param string $link_app=null appname to redirect for, default currentapp
*/ */
static function redirect($url) static function redirect($url, $link_app)
{ {
// Determines whether the current output buffer should be flushed // Determines whether the current output buffer should be flushed
$do_flush = true; $do_flush = true;
@ -478,13 +483,14 @@ class egw extends egw_minimal
if (egw_json_response::isJSONResponse() || egw_json_request::isJSONRequest()) if (egw_json_response::isJSONResponse() || egw_json_request::isJSONRequest())
{ {
$response = egw_json_response::get(); $response = egw_json_response::get();
$response->redirect($url); $response->redirect($url, false, $link_app);
// If we are in a json request, we should not flush the current output! // If we are in a json request, we should not flush the current output!
$do_flush = false; $do_flush = false;
} }
else else
{ {
$file = $line = null;
if (headers_sent($file,$line)) if (headers_sent($file,$line))
{ {
throw new egw_exception_assertion_failed(__METHOD__."('".htmlspecialchars($url)."') can NOT redirect, output already started at $file line $line!"); throw new egw_exception_assertion_failed(__METHOD__."('".htmlspecialchars($url)."') can NOT redirect, output already started at $file line $line!");

12
phpgwapi/inc/class.egw_framework.inc.php
View File

@ -177,10 +177,11 @@ abstract class egw_framework
* Link url generator * Link url generator
* *
* @param string $url The url the link is for * @param string $url The url the link is for
* @param string/array $extravars Extra params to be passed to the url * @param string|array $extravars Extra params to be passed to the url
* @param string $link_app=null if appname or true, some templates generate a special link-handler url
* @return string The full url after processing * @return string The full url after processing
*/ */
static function link($url, $extravars = '') static function link($url, $extravars = '', $link_app=null)
{ {
return $GLOBALS['egw']->session->link($url, $extravars); return $GLOBALS['egw']->session->link($url, $extravars);
} }
@ -189,12 +190,13 @@ abstract class egw_framework
* Redirects direct to a generated link * Redirects direct to a generated link
* *
* @param string $url The url the link is for * @param string $url The url the link is for
* @param string/array $extravars Extra params to be passed to the url * @param string|array $extravars Extra params to be passed to the url
* @param string $link_app=null if appname or true, some templates generate a special link-handler url
* @return string The full url after processing * @return string The full url after processing
*/ */
static function redirect_link($url, $extravars='') static function redirect_link($url, $extravars='', $link_app=null)
{ {
egw::redirect(self::link($url, $extravars)); egw::redirect(self::link($url, $extravars), $link_app);
} }
/** /**