From e55b260b9849974ac86c20555fa7876fef2b0c89 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Thu, 2 Aug 2012 16:22:45 -0400
Subject: [PATCH] BUG 9530 HeartBeat SOLVED

- HeartBeat not checked.
- HeartBeat works in skin classic and uxmodern.
---
 workflow/engine/controllers/main.php    | 53 ++++++++++++-------------
 workflow/engine/methods/login/login.php |  1 -
 workflow/engine/templates/main/login.js | 16 ++++++++
 3 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/workflow/engine/controllers/main.php b/workflow/engine/controllers/main.php
index a866f1bd6..e4bed9372 100644
--- a/workflow/engine/controllers/main.php
+++ b/workflow/engine/controllers/main.php
@@ -192,42 +192,41 @@ class Main extends Controller
 
         $availableLangArray = $this->getLanguagesList();
 
-        //$G_PUBLISH = new Publisher ();
-        //$G_PUBLISH->AddContent ('xmlform', 'xmlform', 'login/login', '', $aFields, SYS_URI .
-        //'login/authentication.php');
-
         G::LoadClass ('serverConfiguration');
 
-        if (($nextBeatDate = $this->memcache->get('nextBeatDate')) === false) {
-            //get the serverconf singleton, and check if we can send the heartbeat
-            $oServerConf = & serverConf::getSingleton ();
+        $oServerConf = & serverConf::getSingleton ();
+        $flagHeartBeat = '';
+        $sflag = $oServerConf->getHeartbeatProperty('HB_OPTION', 'HEART_BEAT_CONF');
+        $sflag = (trim($sflag) != '') ? $sflag : '1';
 
-            $sflag = $oServerConf->getHeartbeatProperty('HB_OPTION','HEART_BEAT_CONF');
-            $sflag = (trim($sflag)!='')?$sflag:'1';
+        //get date of next beat
+        $nextBeatDate = $oServerConf->getHeartbeatProperty('HB_NEXT_BEAT_DATE', 'HEART_BEAT_CONF');
 
-            //get date of next beat
-            $nextBeatDate = $oServerConf->getHeartbeatProperty('HB_NEXT_BEAT_DATE','HEART_BEAT_CONF');
-            $this->memcache->set('nextBeatDate', $nextBeatDate, 1*3600);
+        //if flag to send heartbeat is enabled, and it is time to send heartbeat, sent it using asynchronous beat.
+        if (($sflag == "1") && ((strtotime("now") > $nextBeatDate) || is_null($nextBeatDate))) {
+            //To do: we need to change to ExtJs
+            $this->setJSVar('flagHeartBeat', ($flagHeartBeat == 1));
+        } else {
+            $this->setJSVar('flagHeartBeat', ($flagHeartBeat == 0));
         }
 
-        $sflag = 1;
         //check if we show the panel with the getting started info
-        if (($flagGettingStarted = $this->memcache->get('flagGettingStarted')) === false) {
-            require_once 'classes/model/Configuration.php';
-            $oConfiguration = new Configuration ();
-            $oCriteria = new Criteria ('workflow');
-            $oCriteria->add (ConfigurationPeer::CFG_UID, 'getStarted');
-            $oCriteria->add (ConfigurationPeer::OBJ_UID, '');
-            $oCriteria->add (ConfigurationPeer::CFG_VALUE, '1');
-            $oCriteria->add (ConfigurationPeer::PRO_UID, '');
-            $oCriteria->add (ConfigurationPeer::USR_UID, '');
-            $oCriteria->add (ConfigurationPeer::APP_UID, '');
-            $flagGettingStarted =  ConfigurationPeer::doCount ($oCriteria);
-            $this->memcache->set('flagGettingStarted', $flagGettingStarted, 8*3600) ;
+        require_once 'classes/model/Configuration.php';
+        $oConfiguration = new Configuration ();
+        $oCriteria = new Criteria ('workflow');
+        $oCriteria->add (ConfigurationPeer::CFG_UID, 'getStarted');
+        $oCriteria->add (ConfigurationPeer::OBJ_UID, '');
+        $oCriteria->add (ConfigurationPeer::CFG_VALUE, '1');
+        $oCriteria->add (ConfigurationPeer::PRO_UID, '');
+        $oCriteria->add (ConfigurationPeer::USR_UID, '');
+        $oCriteria->add (ConfigurationPeer::APP_UID, '');
+        $flagGettingStarted =  ConfigurationPeer::doCount ($oCriteria);
+        if ($flagGettingStarted == 0) {
+            $this->setJSVar('flagGettingStarted', ($flagGettingStarted == 1));
+        } else {
+            $this->setJSVar('flagGettingStarted', ($flagGettingStarted == 0));
         }
 
-        $this->setJSVar('flagGettingStarted', ($flagGettingStarted == 0));
-
         G::loadClass('configuration');
         $oConf = new Configurations;
         $oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS','');
diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php
index 7bdd57d2a..f3e76dc88 100755
--- a/workflow/engine/methods/login/login.php
+++ b/workflow/engine/methods/login/login.php
@@ -160,7 +160,6 @@ $sflag = (trim($sflag) != '') ? $sflag : '1';
 
 //get date of next beat
 $nextBeatDate = $oServerConf->getHeartbeatProperty('HB_NEXT_BEAT_DATE', 'HEART_BEAT_CONF');
-$sflag = 1;
 
 //if flag to send heartbeat is enabled, and it is time to send heartbeat, sent it using asynchronous beat.
 if (($sflag == "1") && ((strtotime("now") > $nextBeatDate) || is_null($nextBeatDate))) {
diff --git a/workflow/engine/templates/main/login.js b/workflow/engine/templates/main/login.js
index f5c9d377e..e007b6d3f 100644
--- a/workflow/engine/templates/main/login.js
+++ b/workflow/engine/templates/main/login.js
@@ -72,6 +72,9 @@ var Login = function() {
       if (flagGettingStarted) {
         this.gettingStartedWindow.show();
       }
+      if (flagHeartBeat) {
+        processHbInfo();
+      }
     }
   }
 }();
@@ -374,6 +377,19 @@ Login.initComponents = function()
   //Ext.getCmp('login-form').hide();
 }
 
+processHbInfo = function() {
+  Ext.Ajax.request({
+    url : '../services/processHeartBeat_Ajax' ,
+    params : {action:'processInformation'},
+    success: function ( result, request ) {
+      //console.info("");
+    },
+    failure: function ( result, request) {
+      //Ext.MessageBox.alert(_('ID_FAILED'), result.responseText);
+    }
+  });
+}
+
 Login.forgotPassword = function()
 {
   this.window.hide();