From c6b7aa7a8f778f6387eeea2761175e25894ecae3 Mon Sep 17 00:00:00 2001
From: YuCheng Hu <yhu@isharkfly.com>
Date: Sun, 14 Nov 2010 13:45:30 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=B0=205.2=20=E5=90=8E?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=20SVN=20=E6=8F=90=E4=BA=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增安装语言文件。

yuchenghu@hawebs.net


git-svn-id: https://svn.code.sf.net/p/hawebs/svn@567 a2543c7e-f6e9-4f8a-8bff-1ffc34733512
---
 oss/vtiger/trunk/cron/MailScanner.service    | 59 +++++++++++++++++---
 oss/vtiger/trunk/cron/MailScannerCron.bat    |  2 +-
 oss/vtiger/trunk/cron/MailScannerCron.sh     |  5 +-
 oss/vtiger/trunk/cron/intimateTaskStatus.php |  2 +-
 4 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/oss/vtiger/trunk/cron/MailScanner.service b/oss/vtiger/trunk/cron/MailScanner.service
index 0d083d7e..fd249765 100644
--- a/oss/vtiger/trunk/cron/MailScanner.service
+++ b/oss/vtiger/trunk/cron/MailScanner.service
@@ -45,6 +45,35 @@ require_once('modules/Settings/MailScanner/core/MailScannerInfo.php');
 require_once('modules/Settings/MailScanner/core/MailBox.php');
 require_once('modules/Settings/MailScanner/core/MailScanner.php');
 
+//Added as sometimes the php.ini file used for command line php and
+//for Apache php is different.
+require_once('include/install/language/en_us.lang.php');
+if(!function_exists('imap_open')) {
+	echo $installationStrings['LBL_NO'].' '.$installationStrings['LBL_IMAP_SUPPORT'];
+} elseif(!function_exists('openssl_encrypt')) {
+	echo $installationStrings['LBL_NO'].' '.$installationStrings['LBL_OPENSSL_SUPPORT'];
+}
+
+/**
+ * Helper function for triggering the scan.
+ */
+function service_MailScanner_performScanNow($scannerinfo, $debug) {
+	/** If the scanner is not enabled, stop. */
+	if($scannerinfo->isvalid) { 
+		echo "Scanning " . $scannerinfo->server . " in progress\n";
+
+		/** Start the scanning. */
+		$scanner = new Vtiger_MailScanner($scannerinfo);
+		$scanner->debug = $debug;
+		$scanner->performScanNow();
+		
+		echo "\nScanning " . $scannerinfo->server . " completed\n";
+		
+	} else {
+		echo "Failed! [{$scannerinfo->scannername}] is not enabled for scanning!";
+	}
+}
+
 /** 
  * Execution of this is based on number of emails and connection to mailserver.
  * So setting infinite timeout.
@@ -55,14 +84,28 @@ require_once('modules/Settings/MailScanner/core/MailScanner.php');
 $debug = true;
 
 /** Pick up the mail scanner for scanning. */
-$scannername = $_REQUEST['scannername'];
-if(!$scannername) $scannername = 'DEFAULT';
-$scannerinfo = new Vtiger_MailScannerInfo($scannername);
-
-/** If the scanner is not enabled, stop. */
-if(!$scannerinfo->isvalid) { 
-	echo "No active mailbox to scan.";
-	exit;
+if(isset($_REQUEST['scannername'])) {
+	
+	// Target scannername specified?	
+	$scannername = $_REQUEST['scannername'];
+	$scannerinfo = new Vtiger_MailScannerInfo($scannername);
+	
+	service_MailScanner_performScanNow($scannerinfo, $debug);
+	
+} else {
+	
+	// Scan all the configured mailscanners?
+	
+	$scannerinfos = Vtiger_MailScannerInfo::listAll();
+	if(empty($scannerinfos)) {
+		
+		echo "No mailbox configured for scanning!";
+		
+	} else {
+		foreach($scannerinfos as $scannerinfo) {
+			service_MailScanner_performScanNow($scannerinfo, $debug);
+		}
+	}	
 }
 
 echo "Scanning " . $scannerinfo->server . " in progress\n";
diff --git a/oss/vtiger/trunk/cron/MailScannerCron.bat b/oss/vtiger/trunk/cron/MailScannerCron.bat
index edfe2d68..e37db5b3 100644
--- a/oss/vtiger/trunk/cron/MailScannerCron.bat
+++ b/oss/vtiger/trunk/cron/MailScannerCron.bat
@@ -14,4 +14,4 @@ set PHP_EXE="C:\Program Files\vtigercrm5\php\php.exe"
 
 cd /D %VTIGERCRM_ROOTDIR%
 
-%PHP_EXE% -f vtigercron.php service="MailScanner" scannername="DEFAULT"
\ No newline at end of file
+%PHP_EXE% -f vtigercron.php service="MailScanner"
diff --git a/oss/vtiger/trunk/cron/MailScannerCron.sh b/oss/vtiger/trunk/cron/MailScannerCron.sh
index ca53d627..589332e2 100644
--- a/oss/vtiger/trunk/cron/MailScannerCron.sh
+++ b/oss/vtiger/trunk/cron/MailScannerCron.sh
@@ -13,4 +13,7 @@ export USE_PHP=php
 
 cd $VTIGERCRM_ROOTDIR
 
-$USE_PHP -f vtigercron.php service="MailScanner" scannername="DEFAULT"
\ No newline at end of file
+# Specify scannername to scan specific mailbox configured
+# $USE_PHP -f vtigercron.php service="MailScanner" scannername="DEFAULT"
+# Scan all the configured mailboxes
+  $USE_PHP -f vtigercron.php service="MailScanner"
diff --git a/oss/vtiger/trunk/cron/intimateTaskStatus.php b/oss/vtiger/trunk/cron/intimateTaskStatus.php
index de287c2b..d2f757b7 100644
--- a/oss/vtiger/trunk/cron/intimateTaskStatus.php
+++ b/oss/vtiger/trunk/cron/intimateTaskStatus.php
@@ -135,4 +135,4 @@ if($activevalue[0] == 1)
 	}
 }
 
-?>
+?>
\ No newline at end of file