[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: infolog csv_import.php,1.8,1.9
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: infolog csv_import.php,1.8,1.9 |
Date: |
Tue, 05 Mar 2002 07:59:18 -0500 |
Update of /cvsroot/phpgroupware/infolog
In directory subversions:/tmp/cvs-serv2001
Modified Files:
csv_import.php
Log Message:
saving field-assignments now in preferences and not longer in a separate file
in /tmp
Index: csv_import.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/csv_import.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** csv_import.php 14 Feb 2002 19:56:06 -0000 1.8
--- csv_import.php 5 Mar 2002 12:59:16 -0000 1.9
***************
*** 141,149 ****
case 'download':
! $pref_file = '/tmp/csv_import_info_log.php';
! if (is_readable($pref_file) && ($prefs =
fopen($pref_file,'r'))) {
! eval(fread($prefs,8000));
! // echo "<p>defaults =
array".dump_array($defaults)."</p>\n";
! } else {
$defaults = array();
}
--- 141,148 ----
case 'download':
! $GLOBALS['phpgw']->preferences->read_repository();
! $defaults =
$GLOBALS['phpgw_info']['user']['preferences']['infolog']['cvs_import'];
! if (!is_array($defaults))
! {
$defaults = array();
}
***************
*** 155,160 ****
$t->parse('fheaderhandle','fheader');
$hiddenvars .= '<input type="hidden" name="action"
value="import">'."\n".
! '<input type="hidden"
name="fieldsep" value="'.$fieldsep."\">\n".
! '<input type="hidden"
name="pref_file" value="'.$pref_file."\">\n";
$info_names = array( 'type' => 'Type:
task,phone,note,confirm,reject,email,fax',
--- 154,158 ----
$t->parse('fheaderhandle','fheader');
$hiddenvars .= '<input type="hidden" name="action"
value="import">'."\n".
! '<input type="hidden"
name="fieldsep" value="'.$fieldsep."\">\n";
$info_names = array( 'type' => 'Type:
task,phone,note,confirm,reject,email,fax',
***************
*** 178,181 ****
--- 176,180 ----
'addr_id' => 'Addressbook id, to set use @addr_id(nlast,nfirst,org)'
);
+ /* this are settings to import from Lotus Organizer
$mktime_lotus = "${PSep}0?([0-9]+)[ .:-]+0?([0-9]*)[
.:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[
.:-]+0?([0-9]*)address@hidden(${VPre}4,${VPre}5,${VPre}6,${VPre}2,${VPre}3,${VPre}1)";
***************
*** 191,195 ****
'no CSV
1' => "type${PSep}phone",
'no CSV
2' => "address@hidden(${CPre}Notiz$CPos,0,60).' ...'" );
!
$info_name_options = "<option value=\"\">none\n";
while (list($field,$name) = each($info_names)) {
--- 190,194 ----
'no CSV
1' => "type${PSep}phone",
'no CSV
2' => "address@hidden(${CPre}Notiz$CPos,0,60).' ...'" );
! */
$info_name_options = "<option value=\"\">none\n";
while (list($field,$name) = each($info_names)) {
***************
*** 260,278 ****
$fp=fopen($csvfile,"r");
$csv_fields = fgetcsv($fp,8000,$fieldsep);
$info_fields = array_diff($info_fields,array( '' )); //
throw away empty / not assigned entrys
! if ($pref_file) {
! // echo "writing pref_file ...<p>";
! if (file_exists($pref_file))
rename($pref_file,$pref_file.'.old');
! $pref = fopen($pref_file,'w');
! while (list($csv_idx,$info) = each($info_fields)) {
! $defaults[$csv_fields[$csv_idx]] = $info;
! if ($trans[$csv_idx])
! $defaults[$csv_fields[$csv_idx]] .=
$PSep.$trans[$csv_idx];
}
- fwrite($pref,'$defaults = array'.dump_array( $defaults
).';');
- fclose($pref);
}
$log = "<table border=1>\n\t<tr><td>#</td>\n";
--- 259,283 ----
$fp=fopen($csvfile,"r");
$csv_fields = fgetcsv($fp,8000,$fieldsep);
+ $csv_fields[] = 'no CSV 1';
// eg. for static assignments
+ $csv_fields[] = 'no CSV 2';
+ $csv_fields[] = 'no CSV 3';
$info_fields = array_diff($info_fields,array( '' )); //
throw away empty / not assigned entrys
! $defaults = array();
! while (list($csv_idx,$info) = each($info_fields))
! { // convert $trans[$csv_idx] into array of pattern =>
value
! $defaults[$csv_fields[$csv_idx]] = $info;
! if ($trans[$csv_idx])
! {
! $defaults[$csv_fields[$csv_idx]] .=
$PSep.addslashes($trans[$csv_idx]);
}
}
+
+ $GLOBALS['phpgw']->preferences->read_repository();
+ $test =
$GLOBALS['phpgw']->preferences->add('infolog','cvs_import',$defaults);
+ echo "add('infolog','cvs_import',defaults) =";
_debug_array($test);
+ $GLOBALS['phpgw']->preferences->save_repository(True);
+
$log = "<table border=1>\n\t<tr><td>#</td>\n";
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: infolog csv_import.php,1.8,1.9,
Ralf Becker <address@hidden> <=