diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php
index cfefd507a..900d64baa 100644
--- a/workflow/engine/classes/model/ListCompleted.php
+++ b/workflow/engine/classes/model/ListCompleted.php
@@ -93,14 +93,7 @@ class ListCompleted extends BaseListCompleted
$criteriaSet = new Criteria("workflow");
$criteriaSet->add(ListParticipatedLastPeer::APP_STATUS, 'COMPLETED');
BasePeer::doUpdate($criteriaWhere, $criteriaSet, Propel::getConnection("workflow"));
-
- $users = new Users();
- $users->refreshTotal($data['USR_UID'], 'add', 'completed');
- if ($data['DEL_PREVIOUS'] != 0) {
- $users->refreshTotal($data['USR_UID'], 'remove', 'inbox');
- } else {
- $users->refreshTotal($data['USR_UID'], 'remove', 'draft');
- }
+
$con = Propel::getConnection( ListCompletedPeer::DATABASE_NAME );
try {
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php
index f3a40066c..2ad27b9c2 100644
--- a/workflow/engine/classes/model/ListInbox.php
+++ b/workflow/engine/classes/model/ListInbox.php
@@ -143,7 +143,6 @@ class ListInbox extends BaseListInbox
public function newRow ($data, $delPreviusUsrUid)
{
- $users = new Users();
$data['DEL_PREVIOUS_USR_UID'] = $delPreviusUsrUid;
if (isset($data['DEL_TASK_DUE_DATE'])) {
$data['DEL_DUE_DATE'] = $data['DEL_TASK_DUE_DATE'];
@@ -212,36 +211,6 @@ class ListInbox extends BaseListInbox
$data['DEL_PREVIOUS_USR_LASTNAME'] = $aRow['USR_LASTNAME'];
}
-
- if ($data['APP_STATUS'] == 'DRAFT') {
- $users->refreshTotal($data['USR_UID'], 'add', 'draft');
- } else {
- $criteria = new Criteria();
- $criteria->addSelectColumn(SubApplicationPeer::APP_UID);
- $criteria->add( SubApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL );
- $dataset = SubApplicationPeer::doSelectRS($criteria);
- if ($dataset->next()) {
- $users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
- $users->refreshTotal($data['USR_UID'], 'add', 'inbox');
- } else if ($data['DEL_INDEX'] == 2) {
- $users->refreshTotal($delPreviusUsrUid, 'remove', 'draft');
- $users->refreshTotal($data['USR_UID'], 'add', 'inbox');
- } else {
- $users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
- $users->refreshTotal($data['USR_UID'], 'add', 'inbox');
- }
- /*
- if ($data['DEL_INDEX'] == 1) {
- $users->refreshTotal($data['USR_UID'], 'add', 'draft');
- } elseif ($data['DEL_INDEX'] == 2) {
- $users->refreshTotal($delPreviusUsrUid, 'remove', 'draft');
- $users->refreshTotal($data['USR_UID'], 'add', 'inbox');
- } else {
- $users->refreshTotal($delPreviusUsrUid, 'remove', 'inbox');
- $users->refreshTotal($data['USR_UID'], 'add', 'inbox');
- }*/
- }
-
self::create($data);
}
diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php
index 085921ade..e6432b170 100644
--- a/workflow/engine/classes/model/ListParticipatedLast.php
+++ b/workflow/engine/classes/model/ListParticipatedLast.php
@@ -48,8 +48,6 @@ class ListParticipatedLast extends BaseListParticipatedLast
$aRow = $dataset->getRow();
$data['APP_STATUS'] = $aRow['APP_STATUS'];
- $users = new Users();
- $users->refreshTotal($data['USR_UID'], 'add', 'participated');
$con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
try {
$this->fromArray( $data, BasePeer::TYPE_FIELDNAME );
@@ -134,11 +132,6 @@ class ListParticipatedLast extends BaseListParticipatedLast
*/
public function remove ($app_uid, $usr_uid)
{
- $existField = ListParticipatedLastPeer::retrieveByPK($app_uid, $usr_uid);
- if (! is_null( $existField )) {
- $users = new Users();
- $users->refreshTotal($usr_uid, 'removed', 'participated');
- }
$con = Propel::getConnection( ListParticipatedLastPeer::DATABASE_NAME );
try {
$this->setAppUid($app_uid);
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 @@
Welcome to ProcessMaker!
To get started, log in using the following credentials. You can change them later:
Username: {name}
- Password: The password introduced at the time of installing the application
+ Password: {pass}
We suggest you follow our 7 easy videos to automate your workflow. You can see a demo of each step at http://www.processmaker.com/demos/
Other Resources: