Fixed #147 Fatal Error when AOP function redeclared

salesagility · Mar 11, 2015 · dda786a · dda786a
1 parent d2b97e4
commit dda786a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/custom/Extension/modules/Schedulers/Ext/Language/en_us.AdvancedOpenPortal.php b/custom/Extension/modules/Schedulers/Ext/Language/en_us.AdvancedOpenPortal.php
@@ -21,4 +21,4 @@
  *
  * @author Salesagility Ltd <[email protected]>
  */
-$mod_strings['LBL_POLLMONITOREDINBOXESCUSTOMAOP'] = 'AOP Poll Monitored Inboxes';?>
+$mod_strings['LBL_POLLMONITOREDINBOXESAOP'] = 'AOP Poll Monitored Inboxes';?>
diff --git a/custom/Extension/modules/Schedulers/Ext/Language/es_es.AdvancedOpenPortal.php b/custom/Extension/modules/Schedulers/Ext/Language/es_es.AdvancedOpenPortal.php
@@ -21,4 +21,4 @@
  *
  * @author Salesagility Ltd <[email protected]>
  */
-$mod_strings['LBL_POLLMONITOREDINBOXESCUSTOMAOP'] = 'AOP Procesar Casillas de Correo Monitorizadas';?>
+$mod_strings['LBL_POLLMONITOREDINBOXESAOP'] = 'AOP Procesar Casillas de Correo Monitorizadas';?>
diff --git a/custom/Extension/modules/Schedulers/Ext/Language/ru_ru.AdvancedOpenPortal.php b/custom/Extension/modules/Schedulers/Ext/Language/ru_ru.AdvancedOpenPortal.php
@@ -21,4 +21,4 @@
  *
  * @author Salesagility Ltd <[email protected]>
  */
-$mod_strings['LBL_POLLMONITOREDINBOXESCUSTOMAOP'] = 'Портал - проверять почтовые ящики для входящей почты';?>
+$mod_strings['LBL_POLLMONITOREDINBOXESAOP'] = 'Портал - проверять почтовые ящики для входящей почты';?>
diff --git a/custom/Extension/modules/Schedulers/Ext/ScheduledTasks/AOPScheduler.php b/custom/Extension/modules/Schedulers/Ext/ScheduledTasks/AOPScheduler.php
@@ -22,12 +22,12 @@
  * @author Salesagility Ltd <[email protected]>
  */
 
-$job_strings[] = 'pollMonitoredInboxesCustomAOP';
+$job_strings[] = 'pollMonitoredInboxesAOP';
 
-function pollMonitoredInboxesCustomAOP() {
+function pollMonitoredInboxesAOP() {
     require_once 'custom/modules/InboundEmail/AOPInboundEmail.php';
     $_bck_up = array('team_id' => $GLOBALS['current_user']->team_id, 'team_set_id' => $GLOBALS['current_user']->team_set_id);
-    $GLOBALS['log']->info('----->Scheduler fired job of type pollMonitoredInboxesCustomAOP()');
+    $GLOBALS['log']->info('----->Scheduler fired job of type pollMonitoredInboxesAOP()');
     global $dictionary;
     global $app_strings;
     global $sugar_config;

diff --git a/install/suite_install/AdvancedOpenPortal.php b/install/suite_install/AdvancedOpenPortal.php
@@ -27,14 +27,14 @@ function install_aop() {
 function updateScheduler(){
 	require_once('modules/Schedulers/Scheduler.php');
 	$scheduler = new Scheduler();
-	if(count($scheduler->get_full_list('',"job = 'function::pollMonitoredInboxesCustomAOP'"))){
+	if(count($scheduler->get_full_list('',"job = 'function::pollMonitoredInboxesAOP'"))){
 		return;
 	}
 	$scheduler->name = "AOP Check Inbound Mailboxes";
 	$scheduler->date_time_start = "2005-01-01 11:15:00";
 	$scheduler->date_time_end = "2020-12-31 00:00:00";
 	$scheduler->job_interval = "*/1::*::*::*::*";
-	$scheduler->job = "function::pollMonitoredInboxesCustomAOP";
+	$scheduler->job = "function::pollMonitoredInboxesAOP";
 	$scheduler->status = "Active";
 	$scheduler->catch_up = 0;
 	$scheduler->save();

diff --git a/modules/Schedulers/language/ru_ru.lang.php b/modules/Schedulers/language/ru_ru.lang.php
@@ -171,6 +171,6 @@
 'LBL_REMOVEDOCUMENTSFROMFS' => 'Удалять неиспользуемые файлы из системы',
 );
 
-$mod_strings['LBL_POLLMONITOREDINBOXESCUSTOMAOP'] = 'Портал - проверять почтовые ящики для входящей почты';
+$mod_strings['LBL_POLLMONITOREDINBOXESAOP'] = 'Портал - проверять почтовые ящики для входящей почты';
 
 ?>