[eGroupWare-svn] r33692 - /trunk/importexport/inc/

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

Author: nathangray
Date: Fri Jan 28 20:44:24 2011
New Revision: 33692

URL: http://www.egroupware.org/viewvc/egroupware?rev=33692&view=rev
Log:
- Hide expert options until they get worked out
- Add caching function has_definitions() to see if there are any definitions for the user
- Fix permissions check

Modified:
    trunk/importexport/inc/class.importexport_definitions_bo.inc.php
    trunk/importexport/inc/class.importexport_export_ui.inc.php
    trunk/importexport/inc/class.importexport_helper_functions.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=33692&r1=33691&r2=33692&view=diff
==============================================================================
--- trunk/importexport/inc/class.importexport_definitions_bo.inc.php (original)
+++ trunk/importexport/inc/class.importexport_definitions_bo.inc.php Fri Jan 28 20:44:24 2011
@@ -83,18 +83,12 @@
 	 * @return bool
 	 */
 	static public function is_permitted($_definition) {
-		$allowed_user = explode(',',$_definition['allowed_users']);
-		$this_user_id = $GLOBALS['egw_info']['user']['userid'];
-		$this_membership = $GLOBALS['egw']->accounts->membership($this_user_id);
-		$this_membership[] = array('account_id' => $this_user_id);
-		//echo $this_user_id;
-		//echo ' '.$this_membership;
-		foreach ((array)$this_membership as $account)
-		{
-			$this_membership_array[] =  $account['account_id'];
-		}
-		$alluser = array_intersect($allowed_user,$this_membership_array);
-		return in_array($this_user_id,$alluser) ? true : false;
+		$allowed_user = is_array($_definition['allowed_users']) ? $_definition['allowed_users'] : explode(',',$_definition['allowed_users']);
+		$this_user_id = $GLOBALS['egw_info']['user']['account_id'];
+		$this_membership = $GLOBALS['egw']->accounts->memberships($this_user_id, true);
+		$this_membership[] = $this_user_id;
+		$alluser = array_intersect($allowed_user,$this_membership);
+		return count($alluser) > 0 ? true : false;
 	}
 
 	/**

Modified: trunk/importexport/inc/class.importexport_export_ui.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/importexport/inc/class.importexport_export_ui.inc.php?rev=33692&r1=33691&r2=33692&view=diff
==============================================================================
--- trunk/importexport/inc/class.importexport_export_ui.inc.php (original)
+++ trunk/importexport/inc/class.importexport_export_ui.inc.php Fri Jan 28 20:44:24 2011
@@ -80,7 +80,7 @@
 			$content['definition'] = end($sel_options['definition']);
 		}
 		unset($definitions);
-		$sel_options['definition']['expert'] = lang('Expert options');
+		//$sel_options['definition']['expert'] = lang('Expert options');
 
 		if(isset($_definition) && array_key_exists($_definition,$sel_options['definition'])) {
 			$content['definition'] = $_definition;

Modified: trunk/importexport/inc/class.importexport_helper_functions.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/importexport/inc/class.importexport_helper_functions.inc.php?rev=33692&r1=33691&r2=33692&view=diff
==============================================================================
--- trunk/importexport/inc/class.importexport_helper_functions.inc.php (original)
+++ trunk/importexport/inc/class.importexport_helper_functions.inc.php Fri Jan 28 20:44:24 2011
@@ -316,8 +316,8 @@
 		$appnames = $_appname == 'all' ? array_keys($GLOBALS['egw_info']['apps']) : (array)$_appname;
 		$types = $_type == 'all' ? array('import','export') : (array)$_type;
 
-		foreach($plugins as $appname => $types) {
-			if(!in_array($appname, $appnames)) unset($plugins['appname']);
+		foreach($plugins as $appname => $_types) {
+			if(!in_array($appname, $appnames)) unset($plugins[$appname]);
 		}
 		foreach($plugins as $appname => $types) {
 			$plugins[$appname] = array_intersect_key($plugins[$appname], $types);
@@ -378,4 +378,45 @@
 	public static function guess_filetype( $_file ) {
 
 	}
+
+	/**
+	 * returns if the given app has importexport definitions for the current user
+	 *
+	 * @param string $_appname {<appname> | all}
+	 * @param string $_type {import | export | all}
+	 * @return boolean
+	 */
+	public static function has_definitions( $_appname = 'all', $_type = 'all' ) {
+		$definitions = egw_cache::getSession(
+			__CLASS__,
+			'has_definitions',
+			array('importexport_helper_functions','_has_definitions'),
+			array(array_keys($GLOBALS['egw_info']['apps']), array('import', 'export')),
+			self::CACHE_EXPIRATION
+		);
+		$appnames = $_appname == 'all' ? array_keys($GLOBALS['egw_info']['apps']) : (array)$_appname;
+		$types = $_type == 'all' ? array('import','export') : (array)$_type;
+
+		foreach($definitions as $appname => $_types) {
+			if(!in_array($appname, $appnames)) unset($definitions[$appname]);
+		}
+		foreach($definitions as $appname => $_types) {
+			$definitions[$appname] = array_intersect_key($definitions[$appname], array_flip($types));
+		}
+		return count($definitions[$appname]) > 0;
+	}
+
+	// egw_cache needs this public
+	public static function _has_definitions(Array $appnames, Array $types) {
+		$def = new importexport_definitions_bo(array('application'=>$appnames, 'type' => $types));
+		$list = array();
+		foreach($def->get_definitions() as $id) {
+			$definition = new importexport_definition($id);
+			if($def->is_permitted($definition->get_record_array())) {
+				$list[$definition->application][$definition->type] = $id;
+			}
+			$definition = null;
+		}
+		return $list;
+	}
 } // end of importexport_helper_functions