R55447 - in /trunk: egroupware/api/src/Etemplate/ egroupware/api/src/Etemplate/Widget/ egroupware/api/src/Vfs/ phpgwapi/inc/

ralfbecker_sf 2016-03-20 16:30:01 UTC #1

Author: ralfbecker
New Revision: 55447

URL: http://svn.stylite.de/viewvc/egroupware?rev=55447&view=rev
Log:
replacing common::egw_exit() with exit, there is no more extra cleanup

Modified:
trunk/egroupware/api/src/Etemplate/Request.php
trunk/egroupware/api/src/Etemplate/Widget/Link.php
trunk/egroupware/api/src/Etemplate/Widget/Taglist.php
trunk/egroupware/api/src/Etemplate/Widget/Tree.php
trunk/egroupware/api/src/Etemplate/Widget/Vfs.php
trunk/egroupware/api/src/Vfs/Sharing.php
trunk/egroupware/api/src/Vfs/WebDAV.php
trunk/phpgwapi/inc/class.common.inc.php

Modified: trunk/egroupware/api/src/Etemplate/Request.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Etemplate/Request.php?rev=55447&r1=55446&r2=55447&view=diff

— trunk/egroupware/api/src/Etemplate/Request.php (original)
+++ trunk/egroupware/api/src/Etemplate/Request.php Sun Mar 20 17:30:01 2016
@@ -17,7 +17,6 @@

// 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 @@
{
$response = Api\Json\Response::get();
$response->redirect($index_url, false, $app);

```
  			common::egw_exit();
```

```
  			exit;
  		}
  	}
  	else
```

Modified: trunk/egroupware/api/src/Etemplate/Widget/Link.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Etemplate/Widget/Link.php?rev=55447&r1=55446&r2=55447&view=diff

— trunk/egroupware/api/src/Etemplate/Widget/Link.php (original)
+++ trunk/egroupware/api/src/Etemplate/Widget/Link.php Sun Mar 20 17:30:01 2016
@@ -16,9 +16,6 @@
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 @@
array_shift($files);
}
Api\Vfs::download_zip($files, Api\Link::title($app, $id));

```
  	common::egw_exit();
```

```
  	exit;
  }
```
}

Modified: trunk/egroupware/api/src/Etemplate/Widget/Taglist.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Etemplate/Widget/Taglist.php?rev=55447&r1=55446&r2=55447&view=diff

— trunk/egroupware/api/src/Etemplate/Widget/Taglist.php (original)
+++ trunk/egroupware/api/src/Etemplate/Widget/Taglist.php Sun Mar 20 17:30:01 2016
@@ -17,7 +17,6 @@
use EGroupware\Api;

// explicitly import old not yet ported classes
-use common;
use mail_compose;

/**
@@ -77,7 +76,7 @@

	header('Content-Type: application/json; charset=utf-8');
	echo json_encode($results);

```
  common::egw_exit();
```

```
  exit;
```
}

/**

Modified: trunk/egroupware/api/src/Etemplate/Widget/Tree.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Etemplate/Widget/Tree.php?rev=55447&r1=55446&r2=55447&view=diff

— trunk/egroupware/api/src/Etemplate/Widget/Tree.php (original)
+++ trunk/egroupware/api/src/Etemplate/Widget/Tree.php Sun Mar 20 17:30:01 2016
@@ -17,7 +17,6 @@
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 @@
header(‘Content-Type: application/json; charset=utf-8’);
echo json_encode(self::htmlencode_node($data));

```
  common::egw_exit();
```

```
  exit;
```
}

/**

Modified: trunk/egroupware/api/src/Etemplate/Widget/Vfs.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Etemplate/Widget/Vfs.php?rev=55447&r1=55446&r2=55447&view=diff

— trunk/egroupware/api/src/Etemplate/Widget/Vfs.php (original)
+++ trunk/egroupware/api/src/Etemplate/Widget/Vfs.php Sun Mar 20 17:30:01 2016
@@ -175,7 +175,7 @@
header(‘Content-Type: application/json; charset=utf-8’);
echo json_encode($file);

```
  common::egw_exit();
```

```
  exit;
```
}

/**

Modified: trunk/egroupware/api/src/Vfs/Sharing.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Vfs/Sharing.php?rev=55447&r1=55446&r2=55447&view=diff

— trunk/egroupware/api/src/Vfs/Sharing.php (original)
+++ trunk/egroupware/api/src/Vfs/Sharing.php Sun Mar 20 17:30:01 2016
@@ -17,7 +17,6 @@
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 @@
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 @@
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 @@
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 @@
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(

Modified: trunk/egroupware/api/src/Vfs/WebDAV.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Vfs/WebDAV.php?rev=55447&r1=55446&r2=55447&view=diff

— trunk/egroupware/api/src/Vfs/WebDAV.php (original)
+++ trunk/egroupware/api/src/Vfs/WebDAV.php Sun Mar 20 17:30:01 2016
@@ -1,8 +1,6 @@

<?php /** * 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 @@ -21,9 +19,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 @@ echo "\n\n"; - common::egw_exit(); + exit; } /** Modified: trunk/phpgwapi/inc/class.common.inc.php URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.common.inc.php?rev=55447&r1=55446&r2=55447&view=diff ============================================================================== --- trunk/phpgwapi/inc/class.common.inc.php (original) +++ trunk/phpgwapi/inc/class.common.inc.php Sun Mar 20 17:30:01 2016 @@ -265,9 +265,8 @@ /** * 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) { ------------------------------------------------------------------------------ Transform Data into Opportunity. Accelerate data analysis in your applications with Intel Data Analytics Acceleration Library. Click to learn more. http://pubads.g.doubleclick.net/gampad/clk?id=278785231&iu=/4140 _______________________________________________ eGroupWare-cvs mailing list eGroupWare-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/egroupware-cvs