R55669 - in /trunk: egroupware/api/src/Framework/ phpgwapi/inc/

ralfbecker_sf 2016-04-07 11:16:59 UTC #1

Author: ralfbecker
New Revision: 55669

URL: http://svn.stylite.de/viewvc/egroupware?rev=55669&view=rev
Log:
move egw_include_mgr class to Api\Framework\IncludeMgr

Added:
trunk/egroupware/api/src/Framework/
trunk/egroupware/api/src/Framework/IncludeMgr.php
- copied, changed from r55668, trunk/phpgwapi/inc/class.egw_include_mgr.inc.php
Removed:
trunk/phpgwapi/inc/class.egw_include_mgr.inc.php
Modified:
trunk/phpgwapi/inc/class.egw_framework.inc.php

Copied: trunk/egroupware/api/src/Framework/IncludeMgr.php (from r55668, trunk/phpgwapi/inc/class.egw_include_mgr.inc.php)
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Framework/IncludeMgr.php?p2=trunk/egroupware/api/src/Framework/IncludeMgr.php&p1=trunk/phpgwapi/inc/class.egw_include_mgr.inc.php&r1=55668&r2=55669&rev=55669&view=diff

— trunk/phpgwapi/inc/class.egw_include_mgr.inc.php (original)
+++ trunk/egroupware/api/src/Framework/IncludeMgr.php Thu Apr 7 13:16:58 2016
@@ -11,6 +11,8 @@

@copyright © 2011 Stylite
@version $Id$
*/

+namespace EGroupware\Api\Framework;

/**

Syntax for including JS files form others
@@ -42,11 +44,11 @@
Class can be tested by opening it in browser:

http://localhost/egroupware/phpgwapi/inc/class.egw_incluce_mgr.inc.php?path=/api/js/jsapi/egw_calendar.js

- ```
http://localhost/egroupware/api/src/Framework/IncludeMgr.inc.php?path=/api/js/jsapi/egw_calendar.js
```
- This will then show the parsed dependencies of the given path.
  */
  -class egw_include_mgr
  +class IncludeMgr
  {
  static private $DEBUG_MODE = true;

@@ -177,8 +179,8 @@

private function file_processed($file)
{

  return (array_key_exists($file, $this->included_files) ||

  	    array_key_exists($file, $this->parsed_files));

  return array_key_exists($file, $this->included_files) ||

```
  	array_key_exists($file, $this->parsed_files);
```
}

/**
@@ -414,10 +416,10 @@
// specify one or more files in url, eg. path[]=/phpgwapi/js/jsapi/egw.js&path[]=/etemplate/js/etemplate2.js
if (isset($_SERVER[‘SCRIPT_FILENAME’]) && $_SERVER[‘SCRIPT_FILENAME’] == FILE)
{

define(‘EGW_SERVER_ROOT’, dirname(dirname(DIR)));

define(‘EGW_SERVER_ROOT’, dirname(dirname(dirname(DIR))));
include_once(EGW_SERVER_ROOT.’/phpgwapi/inc/common_functions.inc.php’);

$mgr = new egw_include_mgr();

$mgr = new IncludeMgr();
echo “\n\n\tDependencies\n\n\n”;

$paths = !empty($_GET[‘path’]) ? (array)$_GET[‘path’] : (array)’/stylite/js/filemanager/filemanager.js’;

Modified: trunk/phpgwapi/inc/class.egw_framework.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.egw_framework.inc.php?rev=55669&r1=55668&r2=55669&view=diff

— trunk/phpgwapi/inc/class.egw_framework.inc.php (original)
+++ trunk/phpgwapi/inc/class.egw_framework.inc.php Thu Apr 7 13:16:58 2016
@@ -203,8 +203,8 @@
*/
public static function init_static()
{

  self::$js_include_mgr = new egw_include_mgr(array(

  	// We need LABjs, but putting it through egw_include_mgr causes it to re-load itself

  self::$js_include_mgr = new Api\Framework\IncludeMgr(array(

  	// We need LABjs, but putting it through Api\Framework\IncludeMgr causes it to re-load itself
  	//'/api/js/labjs/LAB.src.js',

  	// allways load jquery (not -ui) first

@@ -2119,7 +2119,7 @@
*/
public static function get_bundles()
{

```
  $inc_mgr = new egw_include_mgr();
```

  $inc_mgr = new Api\Framework\IncludeMgr();
  $bundles = array();

  $max_mod = array();

@@ -2169,7 +2169,7 @@
{
if (@file_exists(EGW_SERVER_ROOT.$file))
{

  		$inc_mgr = new egw_include_mgr($stock_files);	// reset loaded files to stock files

  		$inc_mgr = new Api\Framework\IncludeMgr($stock_files);	// reset loaded files to stock files
  		$inc_mgr->include_js_file($file);
  		$bundles[$bundle] = array_diff($inc_mgr->get_included_files(), $stock_files);
  		self::bundle_urls($bundles[$bundle], $max_mod[$bundle]);

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs