From d3d6a01e23ae701aebac87f7dd8561236d00359f Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Mon, 9 Mar 2015 10:00:07 -0400
Subject: [PATCH] I solved the issue PM-1553

---
 workflow/engine/controllers/newSiteProxy.php             | 2 ++
 workflow/engine/methods/login/login.php                  | 6 ++++++
 workflow/engine/methods/services/login_getStarted.php    | 7 +++++++
 workflow/engine/templates/services/login_getStarted.html | 2 +-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/controllers/newSiteProxy.php b/workflow/engine/controllers/newSiteProxy.php
index 7763e6fb6..5a5d0ae0b 100755
--- a/workflow/engine/controllers/newSiteProxy.php
+++ b/workflow/engine/controllers/newSiteProxy.php
@@ -37,6 +37,8 @@ class newSiteProxy extends HttpProxyController
             ), ($action === 'create') ? true : false );
             $result['result']['admin']['password'] = ($pass === $pass1) ? true : false;
             $result['result']['action'] = $action;
+            $_SESSION['NW_PASSWORD']  = $pass;
+            $_SESSION['NW_PASSWORD2'] = $pass1;
             //$json = new Services_JSON();
             //G::pr($result['result']['database']);G::pr($action);
             $dbWf = $result['result']['database']['ao']['ao_db_wf']['status'];
diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php
index f5ec92edf..ea533f27b 100755
--- a/workflow/engine/methods/login/login.php
+++ b/workflow/engine/methods/login/login.php
@@ -60,6 +60,9 @@ $sFailedLogins = $_SESSION['FAILED_LOGINS'];
 $usernamePrevious1 = $_SESSION["USERNAME_PREVIOUS1"];
 $usernamePrevious2 = $_SESSION["USERNAME_PREVIOUS2"];
 
+$pass = (isset($_SESSION['NW_PASSWORD'])) ? $_SESSION['NW_PASSWORD'] : '';
+$pass1 = (isset($_SESSION['NW_PASSWORD2'])) ? $_SESSION['NW_PASSWORD2'] : '';
+
 $aFields['LOGIN_VERIFY_MSG'] = G::loadTranslation('LOGIN_VERIFY_MSG');
 //$aFields['LOGIN_VERIFY_MSG'] = Bootstrap::loadTranslation('LOGIN_VERIFY_MSG');
 
@@ -135,6 +138,9 @@ $_SESSION['FAILED_LOGINS'] = $sFailedLogins;
 $_SESSION["USERNAME_PREVIOUS1"] = $usernamePrevious1;
 $_SESSION["USERNAME_PREVIOUS2"] = $usernamePrevious2;
 
+$_SESSION['NW_PASSWORD'] = $pass;
+$_SESSION['NW_PASSWORD2'] = $pass1;
+
 /*----------------------------------********---------------------------------*/
 if (!class_exists('pmLicenseManager')) {
   G::LoadClass('pmLicenseManager');
diff --git a/workflow/engine/methods/services/login_getStarted.php b/workflow/engine/methods/services/login_getStarted.php
index 52aa0bd92..914467b13 100755
--- a/workflow/engine/methods/services/login_getStarted.php
+++ b/workflow/engine/methods/services/login_getStarted.php
@@ -42,6 +42,12 @@ $oTemplatePower->assign('USR_UID', $aUser['USR_UID']);
 $oTemplatePower->assign('USR_FULLNAME', $aData['USR_FIRSTNAME'] . ' ' . $aData['USR_LASTNAME'] . ' (' . $aData['USR_USERNAME'] . ')');
 */
 $userName = 'admin';
+$userPass = 'The password introduced at the time of installing the application';
+if(isset($_SESSION['NW_PASSWORD'])){
+  if($_SESSION['NW_PASSWORD'] != ''){
+    $userPass = $_SESSION['NW_PASSWORD'];
+  }
+}
 require_once 'classes/model/Users.php';
 $oCriteria = new Criteria( 'workflow' );
 $oCriteria->addSelectColumn( UsersPeer::USR_USERNAME);
@@ -56,6 +62,7 @@ if ($oDataset->next()) {
 
 $oTemplatePower->assign("URL_MABORAK_JS", G::browserCacheFilesUrl("/js/maborak/core/maborak.js"));
 $oTemplatePower->assign("name", $userName);
+$oTemplatePower->assign("pass", $userPass);
 
 $G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
 
diff --git a/workflow/engine/templates/services/login_getStarted.html b/workflow/engine/templates/services/login_getStarted.html
index 2ccc6f855..84371dff0 100755
--- a/workflow/engine/templates/services/login_getStarted.html
+++ b/workflow/engine/templates/services/login_getStarted.html
@@ -71,7 +71,7 @@
             <p><span class="cLow">Welcome to ProcessMaker!</span></p>
             <p><span class="cLow">To get started, log in using the following credentials. You can change them later:</span></p>
             <span class="cNeg">Username:</span><span class="cLow"> {name}</span><br>
-            <span class="cNeg">Password:</span><span class="cLow"> The password introduced at the time of installing the application</span>
+            <span class="cNeg">Password:</span><span class="cLow"> {pass}</span>
             <p><span class="cLow">We suggest you follow our 7 easy videos to automate your workflow.  You can see a demo of each step at&nbsp;<a target="_blank" href="http://www.processmaker.com/demos/">http://www.processmaker.com/demos/</a> </span></p>
 
             <span class="cLow">Other Resources:</span><br/><br/>