Author: nathangray
New Revision: 34954
URL: http://www.egroupware.org/viewvc/egroupware?rev=34954&view=rev
Log:
Skip spreadsheets shown in other selectbox
Modified:
trunk/calendar/inc/class.calendar_ui.inc.php
trunk/importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php
Modified: trunk/calendar/inc/class.calendar_ui.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/calendar/inc/class.calendar_ui.inc.php?rev=34954&r1=34953&r2=34954&view=diff
— trunk/calendar/inc/class.calendar_ui.inc.php (original)
+++ trunk/calendar/inc/class.calendar_ui.inc.php Mon May 16 20:42:49 2011
@@ -778,7 +778,18 @@
if ($GLOBALS[‘egw_info’][‘user’][‘preferences’][‘calendar’][‘document_dir’])
{
$options = ‘’;
-
foreach(calendar_merge::get_documents($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir']) as $key => $value)
-
$documents = calendar_merge::get_documents($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir']); -
// Skip spreadsheets that are in the other selectbox -
$spreadsheets = importexport_admin_prefs_sidebox_hooks::get_spreadsheet_list('calendar'); -
foreach($spreadsheets as $file_info) -
{ -
if($key = array_search($file_info['name'], $documents)) -
{ -
unset($documents[$key]); -
} -
} -
foreach($documents as $key => $value) { $options .= '<option value="'.$key.'">'.html::htmlspecialchars($value)."</option>\n"; }
Modified: trunk/importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php?rev=34954&r1=34953&r2=34954&view=diff
— trunk/importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php (original)
+++ trunk/importexport/inc/class.importexport_admin_prefs_sidebox_hooks.inc.php Mon May 16 20:42:49 2011
@@ -159,7 +159,7 @@
/**
* Get a list of spreadsheets, in the user’s preference folder, and / or a system provided template folder
*/
- protected static function get_spreadsheet_list($app) {
- public static function get_spreadsheet_list($app) {
$config = config::read(‘importexport’);
$config_dirs = $config[‘export_spreadsheet_folder’] ? explode(’,’,$config[‘export_spreadsheet_folder’]) : array(‘user’,‘stylite’);
$appname = $_GET[‘app’] ? $_GET[‘app’] : $app;
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs