Widget.php

ralfbecker_sf 2016-03-22 10:21:13 UTC #1

Author: ralfbecker
New Revision: 55485

URL: http://svn.stylite.de/viewvc/egroupware?rev=55485&view=rev
Log:
only scanning widget directory, not parent

Modified:
trunk/egroupware/api/src/Etemplate/Widget.php

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

— trunk/egroupware/api/src/Etemplate/Widget.php (original)
+++ trunk/egroupware/api/src/Etemplate/Widget.php Tue Mar 22 11:21:13 2016
@@ -14,7 +14,6 @@
namespace EGroupware\Api\Etemplate;

use EGroupware\Api;
-use EGroupware\Api\Cache;
use XMLReader;
use ReflectionMethod;

@@ -288,7 +287,7 @@
self::$widget_registry[$widget] = $class;
}
}

/**
- Try to discover all widgets, as names don’t always match tags (eg:
- listbox is in menupopup)
  @@ -304,11 +303,11 @@
  public static function scanForWidgets()
  {

  $widget_registry = Cache::getInstance('etemplate', 'widget_registry');

  $widget_registry = Api\Cache::getInstance('etemplate', 'widget_registry');

  if (!$widget_registry)	// not in instance cache --> rescan from filesystem
  {

  	foreach(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(__DIR__)) as $path)

  	foreach(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(__DIR__.'/Widget')) as $path)
  	{
  		if(substr($path, -4) == '.php')
  		{

@@ -325,7 +324,7 @@

		// Use hook to load custom widgets from other apps
		$widgets = $GLOBALS['egw']->hooks->process('etemplate2_register_widgets',array(),true);

```
  	foreach($widgets as $app => $list)
```

  	foreach($widgets as $list)
  	{
  		if (is_array($list))
  		{

@@ -342,7 +341,7 @@
}
}
}

  	Cache::setInstance('etemplate', 'widget_registry', self::$widget_registry, 3600);

  	Api\Cache::setInstance('etemplate', 'widget_registry', self::$widget_registry, 3600);
  }
  else
  {

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=278785351&iu=/4140

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