fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up login/authentication and remove unused labels

Browse Source
This commit is contained in:
Fernando Ontiveros
2025-04-18 07:31:14 +00:00
parent 54cfe40f90
commit e749eb9b5e
13 changed files with 33 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
database/factories/AbeConfigurationFactory.php
View File

@@ -32,7 +32,7 @@ class AbeConfigurationFactory extends Factory
'ABE_TEMPLATE' => 'actionByEmail.html', 'ABE_TEMPLATE' => 'actionByEmail.html',
'ABE_DYN_TYPE' => 'NORMAL', 'ABE_DYN_TYPE' => 'NORMAL',
'DYN_UID' => $dynaform->DYN_UID, 'DYN_UID' => $dynaform->DYN_UID,
'ABE_EMAIL_FIELD' => 'admin@processmaker.com', 'ABE_EMAIL_FIELD' => 'admin@luranasoft.com',
'ABE_ACTION_FIELD' => '', 'ABE_ACTION_FIELD' => '',
'ABE_CASE_NOTE_IN_RESPONSE' => $this->faker->randomElement(['0', '1']), 'ABE_CASE_NOTE_IN_RESPONSE' => $this->faker->randomElement(['0', '1']),
'ABE_FORCE_LOGIN' => $this->faker->randomElement(['0', '1']), 'ABE_FORCE_LOGIN' => $this->faker->randomElement(['0', '1']),

24
gulliver/system/class.headPublisher.php
View File

@@ -46,13 +46,11 @@ class headPublisher
modules :"dom,abbr,rpc,drag,drop,app,panel,fx,grid,xmlform,validator,dashboard", modules :"dom,abbr,rpc,drag,drop,app,panel,fx,grid,xmlform,validator,dashboard",
files :"" files :""
});'; });';
public $headerScript = ' public $headerScript = "
try{ try{
leimnud.exec(leimnud.fix.memoryLeak); leimnud.exec(leimnud.fix.memoryLeak);
if(leimnud.browser.isIphone){ }catch(e){}\n";
leimnud.iphone.make();
}
}catch(e){}';
public $disableHeaderScripts = false; public $disableHeaderScripts = false;
public $title = ''; public $title = '';
@@ -200,19 +198,7 @@ class headPublisher
$head = $head . " <link rel=\"stylesheet\" href=\"" . G::browserCacheFilesUrl($file) . "\">\n"; $head = $head . " <link rel=\"stylesheet\" href=\"" . G::browserCacheFilesUrl($file) . "\">\n";
} }
$head = $head . " $head = $head . "<noscript><div>". G::LoadTranslation( 'ID_ERROR_JS_NOT_AVAILABLE' )."</div></noscript>";
<!--//////////////////////////////////********//////////////////////////////////-->
<noscript>
<div>
". G::LoadTranslation( 'ID_ERROR_JS_NOT_AVAILABLE' )."
</div>
</noscript>
<!--//////////////////////////////////********//////////////////////////////////-->
<script type=\"text/javascript\">
var BROWSER_CACHE_FILES_UID = \"" . G::browserCacheFilesGetUid() . "\";
</script>
";
foreach ($this->scriptFiles as $file) { foreach ($this->scriptFiles as $file) {
$head = $head . "<script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl($file) . "\"></script>\n"; $head = $head . "<script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl($file) . "\"></script>\n";
@@ -223,6 +209,8 @@ class headPublisher
} }
$head .= "<script type='text/javascript'>\n"; $head .= "<script type='text/javascript'>\n";
$head .= "var BROWSER_CACHE_FILES_UID = \"" . G::browserCacheFilesGetUid() . "\";\n";
$head .= $this->leimnudInitString; $head .= $this->leimnudInitString;
foreach ($this->leimnudLoad as $file) { foreach ($this->leimnudLoad as $file) {

2
phpunit.xml
View File

@@ -65,7 +65,7 @@
<env name="emailEngine" value="PHPMAILER" /> <env name="emailEngine" value="PHPMAILER" />
<env name="emailServer" value="smtp.gmail.com" /> <env name="emailServer" value="smtp.gmail.com" />
<env name="emailPort" value="465" /> <env name="emailPort" value="465" />
<env name="emailAccount" value="admin@processmaker.com" /> <env name="emailAccount" value="admin@luranasoft.com" />
<env name="emailAccountPassword" value="" /> <env name="emailAccountPassword" value="" />
<env name="emailSecure" value="ssl" /> <env name="emailSecure" value="ssl" />
<!--Php variables--> <!--Php variables-->

4
rbac/engine/data/mysql/insert.sql
View File

@@ -230,8 +230,8 @@ INSERT INTO `RBAC_SYSTEMS` VALUES
('00000000000000000000000000000002','PROCESSMAKER','2007-07-31 19:10:22','2007-08-03 12:24:36',1); ('00000000000000000000000000000002','PROCESSMAKER','2007-07-31 19:10:22','2007-08-03 12:24:36',1);
INSERT INTO `RBAC_USERS` VALUES INSERT INTO `RBAC_USERS` VALUES
('00000000000000000000000000000001','admin','21232f297a57a5a743894a0e4a801fc3','Administrator','','admin@processmaker.com',DATE_ADD(curdate(), INTERVAL 1 YEAR),'2007-08-03 12:24:36','2008-02-13 07:24:07',1,'MYSQL','00000000000000000000000000000000','',''), ('00000000000000000000000000000001','admin','21232f297a57a5a743894a0e4a801fc3','Administrator','','admin@luranasoft.com',DATE_ADD(curdate(), INTERVAL 1 YEAR),'2007-08-03 12:24:36','2008-02-13 07:24:07',1,'MYSQL','00000000000000000000000000000000','',''),
('00000000000000000000000000000002','guest','$2y$10$rasFC.VNv9TLStNtFVJu6OjxhCi6FezdwkLrBzTFwmXsNnfW0/YZm','Guest','','guest@processmaker.com','2030-01-01','2009-02-01 12:24:36','2009-02-01 12:24:36',0,'MYSQL','00000000000000000000000000000000','',''); ('00000000000000000000000000000002','guest','$2y$10$rasFC.VNv9TLStNtFVJu6OjxhCi6FezdwkLrBzTFwmXsNnfW0/YZm','Guest','','guest@luranasoft.com','2030-01-01','2009-02-01 12:24:36','2009-02-01 12:24:36',0,'MYSQL','00000000000000000000000000000000','','');
INSERT INTO `RBAC_USERS_ROLES` VALUES INSERT INTO `RBAC_USERS_ROLES` VALUES
('00000000000000000000000000000001','00000000000000000000000000000002'), ('00000000000000000000000000000001','00000000000000000000000000000002'),

12
tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/EmailServerTest.php
View File

@@ -294,14 +294,14 @@ class EmailServerTest extends TestCase
if (is_executable($path)) { if (is_executable($path)) {
// The data that will be sent to the method // The data that will be sent to the method
$data = [ $data = [
"FROM_EMAIL" => "admin@processmaker.com", "FROM_EMAIL" => "info@luranasoft.com",
"FROM_NAME" => "Administrator", "FROM_NAME" => "Administrator",
"MESS_ENGINE" => "MAIL", "MESS_ENGINE" => "MAIL",
"MESS_SERVER" => "localhost", "MESS_SERVER" => "localhost",
"MESS_PORT" => 25, "MESS_PORT" => 25,
"MESS_ACCOUNT" => "admin@processmaker.com", "MESS_ACCOUNT" => "info@luranasoft.com",
"MESS_PASSWORD" => "", "MESS_PASSWORD" => "",
"TO" => "admin@processmaker.com", "TO" => "info@luranasoft.com",
"MESS_RAUTH" => true "MESS_RAUTH" => true
]; ];
@@ -329,14 +329,14 @@ class EmailServerTest extends TestCase
{ {
// The data that will be sent to the method // The data that will be sent to the method
$data = [ $data = [
"FROM_EMAIL" => "admin@processmaker.com", "FROM_EMAIL" => "info@luranasoft.com",
"FROM_NAME" => "Administrator", "FROM_NAME" => "Administrator",
"MESS_ENGINE" => "PHPMAILER", "MESS_ENGINE" => "PHPMAILER",
"MESS_SERVER" => "smtp.gmail.com", "MESS_SERVER" => "smtp.gmail.com",
"MESS_PORT" => 587, "MESS_PORT" => 587,
"MESS_ACCOUNT" => "admin@processmaker.com", "MESS_ACCOUNT" => "info@luranasoft.com",
"MESS_PASSWORD" => "", "MESS_PASSWORD" => "",
"TO" => "admin@processmaker.com", "TO" => "info@luranasoft.com",
"MESS_RAUTH" => false, "MESS_RAUTH" => false,
]; ];

4
workflow/engine/data/mysql/insert.sql
View File

@@ -1,6 +1,6 @@
INSERT INTO USERS (USR_UID,USR_USERNAME,USR_PASSWORD,USR_FIRSTNAME,USR_LASTNAME,USR_EMAIL,USR_DUE_DATE,USR_CREATE_DATE,USR_UPDATE_DATE,USR_STATUS,USR_COUNTRY,USR_CITY,USR_LOCATION,USR_ADDRESS,USR_PHONE,USR_FAX,USR_CELLULAR,USR_ZIP_CODE,DEP_UID,USR_POSITION,USR_RESUME,USR_BIRTHDAY,USR_ROLE,USR_REPORTS_TO,USR_REPLACED_BY ) VALUES INSERT INTO USERS (USR_UID,USR_USERNAME,USR_PASSWORD,USR_FIRSTNAME,USR_LASTNAME,USR_EMAIL,USR_DUE_DATE,USR_CREATE_DATE,USR_UPDATE_DATE,USR_STATUS,USR_COUNTRY,USR_CITY,USR_LOCATION,USR_ADDRESS,USR_PHONE,USR_FAX,USR_CELLULAR,USR_ZIP_CODE,DEP_UID,USR_POSITION,USR_RESUME,USR_BIRTHDAY,USR_ROLE,USR_REPORTS_TO,USR_REPLACED_BY ) VALUES
('00000000000000000000000000000001','admin','21232f297a57a5a743894a0e4a801fc3','Administrator',' ','admin@processmaker.com',DATE_ADD(curdate(), INTERVAL 1 YEAR),'1999-11-30 00:00:00','2008-05-23 18:36:19','ACTIVE', 'US','FL','MMK','','', '1-305-402-0282','1-305-675-1400','','','Administrator', '','1999-02-25','PROCESSMAKER_ADMIN','',''), ('00000000000000000000000000000001','admin','21232f297a57a5a743894a0e4a801fc3','Administrator',' ','admin@luranasoft.com',DATE_ADD(curdate(), INTERVAL 1 YEAR),'1999-11-30 00:00:00','2008-05-23 18:36:19','ACTIVE', 'BO','LP','LP','','', '591-71234567','591-71234567','','','Administrator', '','1999-02-25','PROCESSMAKER_ADMIN','',''),
('00000000000000000000000000000002','guest','674ba9750749d735ec9787d606170d78','Guest',' ', 'guest@processmaker.com','2030-01-01','2009-02-01 12:24:36','2009-02-01 12:24:36','INACTIVE', 'US','FL','MMK','','', '1-305-402-0282','1-305-675-1400','','','Guest', '','2009-02-01','PROCESSMAKER_GUEST','',''); ('00000000000000000000000000000002','guest','674ba9750749d735ec9787d606170d78','Guest',' ', 'guest@luranasoft.com','2030-01-01','2009-02-01 12:24:36','2009-02-01 12:24:36','INACTIVE', 'BO','LP','LP','','', '591-71234567','591-71234567','','','Guest', '','2009-02-01','PROCESSMAKER_GUEST','','');
INSERT INTO CONTENT (CON_CATEGORY,CON_PARENT,CON_ID,CON_LANG,CON_VALUE) VALUES INSERT INTO CONTENT (CON_CATEGORY,CON_PARENT,CON_ID,CON_LANG,CON_VALUE) VALUES
('PER_NAME','','00000000000000000000000000000001','en','Login'), ('PER_NAME','','00000000000000000000000000000001','en','Login'),

2
workflow/engine/data/partner/mysql/insert.sql
View File

@@ -1,2 +1,2 @@
# INSERT INTO USERS (USR_UID,USR_USERNAME,USR_PASSWORD,USR_FIRSTNAME,USR_LASTNAME,USR_EMAIL,USR_DUE_DATE,USR_CREATE_DATE,USR_UPDATE_DATE,USR_STATUS,USR_COUNTRY,USR_CITY,USR_LOCATION,USR_ADDRESS,USR_PHONE,USR_FAX,USR_CELLULAR,USR_ZIP_CODE,DEP_UID,USR_POSITION,USR_RESUME,USR_BIRTHDAY,USR_ROLE,USR_REPORTS_TO,USR_REPLACED_BY ) VALUES # INSERT INTO USERS (USR_UID,USR_USERNAME,USR_PASSWORD,USR_FIRSTNAME,USR_LASTNAME,USR_EMAIL,USR_DUE_DATE,USR_CREATE_DATE,USR_UPDATE_DATE,USR_STATUS,USR_COUNTRY,USR_CITY,USR_LOCATION,USR_ADDRESS,USR_PHONE,USR_FAX,USR_CELLULAR,USR_ZIP_CODE,DEP_UID,USR_POSITION,USR_RESUME,USR_BIRTHDAY,USR_ROLE,USR_REPORTS_TO,USR_REPLACED_BY ) VALUES
# ('00000000000000000000000000000001','admin','21232f297a57a5a743894a0e4a801fc3','Administrator',' ', 'admin@processmaker.com','2020-01-01','1999-11-30 00:00:00','2008-05-23 18:36:19','ACTIVE', 'US','FL','MMK','','', '1-305-402-0282','1-305-675-1400','','','Administrator', '','1999-02-25','PROCESSMAKER_ADMIN','',''); # ('00000000000000000000000000000001','admin','21232f297a57a5a743894a0e4a801fc3','Administrator',' ', 'admin@luranasoft.com','2020-01-01','1999-11-30 00:00:00','2008-05-23 18:36:19','ACTIVE', 'US','FL','MMK','','', '1-305-402-0282','1-305-675-1400','','','Administrator', '','1999-02-25','PROCESSMAKER_ADMIN','','');

19
workflow/engine/methods/login/authentication.php
View File

@@ -10,7 +10,7 @@ try {
$usr = ''; $usr = '';
$pwd = ''; $pwd = '';
if (strpos($_SERVER['HTTP_REFERER'], 'home/login') !== false) { if (isset($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], 'home/login') !== false) {
$urlLogin = '../home/login'; $urlLogin = '../home/login';
} else { } else {
$urlLogin = (substr(SYS_SKIN, 0, 2) !== 'ux')? 'login' : '../main/login'; $urlLogin = (substr(SYS_SKIN, 0, 2) !== 'ux')? 'login' : '../main/login';
@@ -226,7 +226,6 @@ try {
if (!is_null($user)) { if (!is_null($user)) {
$userTimeZone = $user->getUsrTimeZone(); $userTimeZone = $user->getUsrTimeZone();
if (trim($userTimeZone) == '') { if (trim($userTimeZone) == '') {
$arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace")); $arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));
@@ -236,16 +235,18 @@ try {
$_SESSION['USR_TIME_ZONE'] = $userTimeZone; $_SESSION['USR_TIME_ZONE'] = $userTimeZone;
} }
if (isset($_SESSION['__SYSTEM_UTC_TIME_ZONE__']) && $_SESSION['__SYSTEM_UTC_TIME_ZONE__']) { if (isset($_SESSION['__SYSTEM_UTC_TIME_ZONE__']) && $_SESSION['__SYSTEM_UTC_TIME_ZONE__']) {
$dateTime = new \ProcessMaker\Util\DateTime(); $dateTime = new \ProcessMaker\Util\DateTime();
$timeZoneOffset = $dateTime->getTimeZoneOffsetByTimeZoneId($_SESSION['USR_TIME_ZONE']); $timeZoneOffset = $dateTime->getTimeZoneOffsetByTimeZoneId($_SESSION['USR_TIME_ZONE']);
if ($timeZoneOffset === false || $timeZoneOffset != (int)($_POST['form']['BROWSER_TIME_ZONE_OFFSET'])) { if ($timeZoneOffset === false || $timeZoneOffset != (int)($_POST['form']['BROWSER_TIME_ZONE_OFFSET'])) {
$_SESSION['__TIME_ZONE_FAILED__'] = true; $_SESSION['__TIME_ZONE_FAILED__'] = true;
$_SESSION['BROWSER_TIME_ZONE'] = $dateTime->getTimeZoneIdByTimeZoneOffset((int)$_POST['form']['BROWSER_TIME_ZONE_OFFSET'], false); $_SESSION['BROWSER_TIME_ZONE'] = $dateTime->getTimeZoneIdByTimeZoneOffset((int)$_POST['form']['BROWSER_TIME_ZONE_OFFSET'], false);
} } else {
$_SESSION['__TIME_ZONE_FAILED__'] = False;
} }
}
//Set data //Set data
$aUser = $RBAC->userObj->load($_SESSION['USER_LOGGED']); $aUser = $RBAC->userObj->load($_SESSION['USER_LOGGED']);

28
workflow/engine/methods/login/index.php
View File

@@ -1,28 +0,0 @@
<?php
/**
* index.php
*
* ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2008 Colosa Inc.23
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*
*/
$newFile = str_replace ( 'index.php', 'login.php' , __FILE__ );
return $newFile;

2
workflow/engine/methods/processes/processesList.php
View File

@@ -75,4 +75,4 @@ $response->data = DateTime::convertUtcToTimeZone($proData);
$response->totalCount = Process::getCounter($usrUid); $response->totalCount = Process::getCounter($usrUid);
echo G::json_encode($response); echo G::json_encode($response);
header("Content-Type: application/json");

2
workflow/engine/methods/processes/processes_List.php
View File

@@ -3,7 +3,7 @@
* processes_List.php * processes_List.php
* *
* ProcessMaker Open Source Edition * ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2008 Colosa Inc.23 * Copyright (C) 2004 - 2008 Colosa Inc.
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as * it under the terms of the GNU Affero General Public License as

2
workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
View File

@@ -501,7 +501,7 @@ class EmailServer
$arrayDataAux = $arrayData; $arrayDataAux = $arrayData;
$arrayDataAux["MESS_TRY_SEND_INMEDIATLY"] = 1; $arrayDataAux["MESS_TRY_SEND_INMEDIATLY"] = 1;
$arrayDataAux["MAIL_TO"] = "admin@processmaker.com"; $arrayDataAux["MAIL_TO"] = "admin@luranasoft.com";
$arrayResult[$arrayMailTestName[1]] = $this->testConnectionByStep($arrayDataAux); $arrayResult[$arrayMailTestName[1]] = $this->testConnectionByStep($arrayDataAux);
$arrayResult[$arrayMailTestName[1]]["title"] = G::LoadTranslation("ID_EMAIL_SERVER_TEST_CONNECTION_VERIFYING_MAIL"); $arrayResult[$arrayMailTestName[1]]["title"] = G::LoadTranslation("ID_EMAIL_SERVER_TEST_CONNECTION_VERIFYING_MAIL");

2
workflow/engine/templates/admin/emails.js
View File

@@ -852,7 +852,7 @@ var testMethod = function()
params = { params = {
typeTest : 'MAIL', typeTest : 'MAIL',
request : 'mailTestMail_Show', request : 'mailTestMail_Show',
mail_to : 'admin@processmaker.com', mail_to : 'admin@luranasoft.com',
send_test_mail : 'yes', send_test_mail : 'yes',
from_mail : Ext.getCmp("fromMail").getValue(), from_mail : Ext.getCmp("fromMail").getValue(),
from_name : Ext.getCmp("eFromName").getValue() from_name : Ext.getCmp("eFromName").getValue()