CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 07/10/07 15:27:30
Modified files:
inc/cron : import_from_scanner.php
Log message:
update
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/cron/import_from_scanner.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
Patches:
Index: import_from_scanner.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/cron/import_from_scanner.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- import_from_scanner.php 7 Oct 2007 15:09:33 -0000 1.3
+++ import_from_scanner.php 7 Oct 2007 15:27:30 -0000 1.4
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage custom
- * @version $Id: import_from_scanner.php,v 1.3 2007/10/07 15:09:33
sigurdne Exp $
+ * @version $Id: import_from_scanner.php,v 1.4 2007/10/07 15:27:30
sigurdne Exp $
*/
/**
@@ -175,6 +175,7 @@
{
$this->botts =
CreateObject($this->currentapp.'.botts');
$this->bolocation =
CreateObject($this->currentapp.'.bolocation');
+ $send =
CreateObject('phpgwapi.send');
foreach($file_list as $file_entry)
{
$file_entry['user_id'] =
$this->get_user_id($file_entry['user']);
@@ -262,7 +263,7 @@
//, '', $cc,
$bcc,$current_user_address,$current_user_name,
$to =
$prefs['email'];
- $rc =
$this->send->msg('email', $to, $subject, stripslashes($body), '', $cc,
$bcc,$current_user_address,$current_user_name,'html');
+ $rc =
$send->msg('email', $to, $subject, stripslashes($body), '', $cc,
$bcc,$current_user_address,$current_user_name,'html');
}
else
{
@@ -303,13 +304,12 @@
{
$dir_handle = @opendir($this->dir);
- $i=0; $myfilearray = '';
+ $myfilearray = array();
while ($file = @readdir($dir_handle))
{
if ((strtolower(substr($file, -3, 3)) ==
$this->meta_suffix) && is_file($this->dir . SEP . $file) )
{
- $myfilearray[$i] = $file;
- $i++;
+ $myfilearray[] = $file;
}
}
@@ -355,7 +355,7 @@
'relatives' => Array(RELATIVE_NONE)
)))
{
-
$this->receipt['error'][]=array('msg'=>lang('This file already exists !'));
+ $this->receipt['error'][]=array('msg'=>
'Denne filen finnes allerede for melding # ' . $id);
}
else
{
_______________________________________________
phpGroupWare-cvs mailing list
phpGroupWare-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/phpgroupware-cvs
