[eGroupWare-svn] r33723 - in /trunk/importexport/inc: class.importexport_definitions_bo.inc.php class.importexport_definitions_ui.inc.php

[<nat...@us...>]

Author: nathangray
Date: Thu Feb  3 17:42:03 2011
New Revision: 33723

URL: http://www.egroupware.org/viewvc/egroupware?rev=33723&view=rev
Log:
Actually use definition permissions

Modified:
    trunk/importexport/inc/class.importexport_definitions_bo.inc.php
    trunk/importexport/inc/class.importexport_definitions_ui.inc.php

Modified: trunk/importexport/inc/class.importexport_definitions_bo.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/importexport/inc/class.importexport_definitions_bo.inc.php?rev=33723&r1=33722&r2=33723&view=diff
==============================================================================
--- trunk/importexport/inc/class.importexport_definitions_bo.inc.php (original)
+++ trunk/importexport/inc/class.importexport_definitions_bo.inc.php Thu Feb  3 17:42:03 2011
@@ -29,13 +29,13 @@
 	 */
 	private $definitions;
 
-	public function __construct($_query=false)
+	public function __construct($_query=false, $ignore_acl = false)
 	{
 		$this->so_sql = new so_sql(self::_appname, self::_defintion_table );
 		if ($_query) {
-			$definitions = $this->so_sql->search($_query, true);
+			$definitions = $this->so_sql->search($_query, false);
 			foreach ((array)$definitions as $definition) {
-				$this->definitions[] = $definition['definition_id'];
+				if(self::is_permitted($definition) || $ignore_acl) $this->definitions[] = $definition['definition_id'];
 			}
 		}
 	}

Modified: trunk/importexport/inc/class.importexport_definitions_ui.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/importexport/inc/class.importexport_definitions_ui.inc.php?rev=33723&r1=33722&r2=33723&view=diff
==============================================================================
--- trunk/importexport/inc/class.importexport_definitions_ui.inc.php (original)
+++ trunk/importexport/inc/class.importexport_definitions_ui.inc.php Thu Feb  3 17:42:03 2011
@@ -77,7 +77,7 @@
 	 */
 	function index($content = null,$msg='')
 	{
-		$bodefinitions = new importexport_definitions_bo(array('name' => '*'));
+		$bodefinitions = new importexport_definitions_bo(array('name' => '*'), true);
 		if (is_array($content))
 		{
 			if (isset($content['delete']))