From 1b5429f0ff71db8d49d37baa25c649ba25ac3813 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sun, 20 Mar 2016 16:30:01 +0000 Subject: [PATCH] replacing common::egw_exit() with exit, there is no more extra cleanup --- api/src/Etemplate/Request.php | 3 +-- api/src/Etemplate/Widget/Link.php | 5 +---- api/src/Etemplate/Widget/Taglist.php | 3 +-- api/src/Etemplate/Widget/Tree.php | 3 +-- api/src/Etemplate/Widget/Vfs.php | 2 +- api/src/Vfs/Sharing.php | 9 ++++----- api/src/Vfs/WebDAV.php | 7 +------ phpgwapi/inc/class.common.inc.php | 3 +-- 8 files changed, 11 insertions(+), 24 deletions(-) diff --git a/api/src/Etemplate/Request.php b/api/src/Etemplate/Request.php index 553e560672..8091ffb205 100644 --- a/api/src/Etemplate/Request.php +++ b/api/src/Etemplate/Request.php @@ -17,7 +17,6 @@ use EGroupware\Api; // explicitly import old not yet ported classes use egw_framework; -use common; // egw_exit /** * Class to represent the persitent information of an eTemplate request @@ -208,7 +207,7 @@ class Request { $response = Api\Json\Response::get(); $response->redirect($index_url, false, $app); - common::egw_exit(); + exit; } } else diff --git a/api/src/Etemplate/Widget/Link.php b/api/src/Etemplate/Widget/Link.php index ff1599a777..7a8a0eee4d 100644 --- a/api/src/Etemplate/Widget/Link.php +++ b/api/src/Etemplate/Widget/Link.php @@ -16,9 +16,6 @@ namespace EGroupware\Api\Etemplate\Widget; use EGroupware\Api\Etemplate; use EGroupware\Api; -// explicitly import old not yet ported classes -use common; // egw_exit - /** * eTemplate link widgets * Deals with creation and display of links between entries in various participating egw applications @@ -292,7 +289,7 @@ class Link extends Etemplate\Widget array_shift($files); } Api\Vfs::download_zip($files, Api\Link::title($app, $id)); - common::egw_exit(); + exit; } } diff --git a/api/src/Etemplate/Widget/Taglist.php b/api/src/Etemplate/Widget/Taglist.php index d531892c17..98d4d2fe88 100644 --- a/api/src/Etemplate/Widget/Taglist.php +++ b/api/src/Etemplate/Widget/Taglist.php @@ -17,7 +17,6 @@ use EGroupware\Api\Etemplate; use EGroupware\Api; // explicitly import old not yet ported classes -use common; use mail_compose; /** @@ -77,7 +76,7 @@ class Taglist extends Etemplate\Widget header('Content-Type: application/json; charset=utf-8'); echo json_encode($results); - common::egw_exit(); + exit; } /** diff --git a/api/src/Etemplate/Widget/Tree.php b/api/src/Etemplate/Widget/Tree.php index 3c38bfcfe3..78fdb79b07 100644 --- a/api/src/Etemplate/Widget/Tree.php +++ b/api/src/Etemplate/Widget/Tree.php @@ -17,7 +17,6 @@ use EGroupware\Api\Etemplate; use EGroupware\Api; // explicitly import old not yet ported classes -use common; // egw_exit use egw_framework; egw_framework::includeCSS('/phpgwapi/js/dhtmlxtree/codebase/dhtmlXTree.css'); @@ -155,7 +154,7 @@ class Tree extends Etemplate\Widget header('Content-Type: application/json; charset=utf-8'); echo json_encode(self::htmlencode_node($data)); - common::egw_exit(); + exit; } /** diff --git a/api/src/Etemplate/Widget/Vfs.php b/api/src/Etemplate/Widget/Vfs.php index b984fe9bb3..c104e22064 100644 --- a/api/src/Etemplate/Widget/Vfs.php +++ b/api/src/Etemplate/Widget/Vfs.php @@ -175,7 +175,7 @@ class Vfs extends File header('Content-Type: application/json; charset=utf-8'); echo json_encode($file); - common::egw_exit(); + exit; } /** diff --git a/api/src/Vfs/Sharing.php b/api/src/Vfs/Sharing.php index 2f1e9aba4c..621445a679 100644 --- a/api/src/Vfs/Sharing.php +++ b/api/src/Vfs/Sharing.php @@ -17,7 +17,6 @@ use EGroupware\Api; use EGroupware\Api\Vfs; // explicitly list old, not yet ported api classes -use common; // egw_exist use egw_framework; use asyncservice; use egw; // link @@ -193,7 +192,7 @@ class Sharing header("HTTP/1.1 $status"); header("X-WebDAV-Status: $status", true); echo "Requested resource '/".htmlspecialchars($token)."' does NOT exist!\n"; - common::egw_exit(); + exit; } // check password, if required @@ -208,7 +207,7 @@ class Sharing header("HTTP/1.1 $status"); header("X-WebDAV-Status: $status", true); echo "\n\n401 Unauthorized\n\nAuthorization failed.\n\n\n"; - common::egw_exit(); + exit; } // need to reset fs_tab, as resolve_url does NOT work with just share mounted @@ -256,7 +255,7 @@ class Sharing header("HTTP/1.1 $status"); header("X-WebDAV-Status: $status", true); echo "Requested resource '/".htmlspecialchars($token)."' does NOT exist!\n"; - common::egw_exit(); + exit; } Vfs::$is_root = false; Vfs::clearstatcache(); @@ -284,7 +283,7 @@ class Sharing header("HTTP/1.1 $status"); header("X-WebDAV-Status: $status", true); echo "Failed to create session: ".$GLOBALS['egw']->session->reason."\n"; - common::egw_exit(); + exit; } // only allow filemanager app (gets overwritten by session::create) $GLOBALS['egw_info']['user']['apps'] = array( diff --git a/api/src/Vfs/WebDAV.php b/api/src/Vfs/WebDAV.php index 4e3fdc5c97..bd5ea6121a 100644 --- a/api/src/Vfs/WebDAV.php +++ b/api/src/Vfs/WebDAV.php @@ -2,8 +2,6 @@ /** * eGroupWare API: VFS - WebDAV access using the new stream wrapper VFS interface * - * Using the PEAR HTTP/WebDAV/Server/Filesystem class (which need to be installed!) - * * @link http://www.egroupware.org * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @package api @@ -22,9 +20,6 @@ use HTTP_WebDAV_Server; use EGroupware\Api\Vfs; use EGroupware\Api; -// old, not yet ported api classes -use common; // egw_exit - /** * FileManger - WebDAV access using the new stream wrapper VFS interface * @@ -783,7 +778,7 @@ class WebDAV extends HTTP_WebDAV_Server_Filesystem echo "\n\n"; - common::egw_exit(); + exit; } /** diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php index 961ffb333f..53c4dbc693 100644 --- a/phpgwapi/inc/class.common.inc.php +++ b/phpgwapi/inc/class.common.inc.php @@ -265,9 +265,8 @@ class common /** * function to stop running an app * - * used to stop running an app in the middle of execution
- * There may need to be some cleanup before hand * @param $call_footer boolean value to if true then call footer else exit + * @deprecated use $GLOBALS['egw']->framework->footer(), if necessary, and exit */ static function egw_exit($call_footer = False) {