[eGroupWare-svn] r56105 - in /trunk/importexport/inc: class.importexport_import_ui.inc.php class.importexport_wizard_basic_import_csv.inc.php

Author: nathangray
Date: Tue May 10 01:08:59 2016
New Revision: 56105

URL: http://svn.stylite.de/viewvc/egroupware?rev=56105&view=rev
Log:
Move importexport to new API - appsession()->getSession()

Modified:
    trunk/importexport/inc/class.importexport_import_ui.inc.php
    trunk/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php

Modified: trunk/importexport/inc/class.importexport_import_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/importexport/inc/class.importexport_import_ui.inc.php?rev=56105&r1=56104&r2=56105&view=diff
==============================================================================
--- trunk/importexport/inc/class.importexport_import_ui.inc.php (original)
+++ trunk/importexport/inc/class.importexport_import_ui.inc.php Tue May 10 01:08:59 2016
@@ -471,7 +471,7 @@
 						if($dst_file)
 						{
 							// Still have uploaded file, jump there
-							$GLOBALS['egw']->session->appsession('csvfile','',$dst_file);
+							Cache::setSession($definition->application,'csvfile',$dst_file);
 							$edit_link['step'] = 'wizard_step30';
 						}
 						$edit_link = Egw::link('/index.php',$edit_link);

Modified: trunk/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php?rev=56105&r1=56104&r2=56105&view=diff
==============================================================================
--- trunk/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php (original)
+++ trunk/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php Tue May 10 01:08:59 2016
@@ -124,15 +124,15 @@
 			{
 				case 'next':
 					// Process sample file for fields
-					if ($GLOBALS['egw']->session->appsession('csvfile',$content['application']) &&
-						($handle = fopen($GLOBALS['egw']->session->appsession('csvfile',$content['application']), "rb")) !== FALSE
+					if (Api\Cache::getSession($content['application'],'csvfile') &&
+						($handle = fopen(Api\Cache::getSession($content['application'],'csvfile'), "rb")) !== FALSE
 					) {
 						$data = fgetcsv($handle, 8000, $content['fieldsep']);
 						//error_log(array2string($data));
 						fclose($handle);
 
 						// Remove & forget file
-						unlink($GLOBALS['egw']->session->appsession('csvfile',$content['application']));
+						unlink(Api\Cache::getSession($content['application'],'csvfile'));
 						Api\Cache::setSession($content['application'], 'csvfile', '');
 						$content['csv_fields'] = Api\Translation::convert($data,$content['charset']);
 


------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j