Merged in bugfix/HOR-3670-RG-2 (pull request #5926)
HOR-3670 Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
@@ -1500,7 +1500,7 @@ function get_infoOnPM($workspace) {
|
||||
|
||||
if( defined("DB_HOST") ) {
|
||||
|
||||
$dbNetView = new NET(DB_HOST);
|
||||
$dbNetView = new Net(DB_HOST);
|
||||
$dbNetView->loginDbServer(DB_USER, DB_PASS);
|
||||
|
||||
$dbConns = new DbConnections('');
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,8 +1,10 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* class.ldapAdvanced.php
|
||||
* LDAP plugin for the RBAC class. This
|
||||
class ldapAdvanced
|
||||
* LDAP plugin for the RBAC class. This
|
||||
*/
|
||||
class LdapAdvanced
|
||||
{
|
||||
/**
|
||||
* The authsource id
|
||||
@@ -38,7 +40,7 @@ class ldapAdvanced
|
||||
* Object where an rbac instance is set
|
||||
* @var Object
|
||||
*/
|
||||
static private $instance = null;
|
||||
private static $instance = null;
|
||||
|
||||
private $arrayObjectClassFilter = array(
|
||||
"user" => "|(objectclass=inetorgperson)(objectclass=organizationalperson)(objectclass=person)(objectclass=user)",
|
||||
@@ -457,14 +459,14 @@ class ldapAdvanced
|
||||
$logFile = PATH_DATA . "log/ldapAdvanced.log";
|
||||
|
||||
if (!file_exists($logFile) || is_writable($logFile)) {
|
||||
$fpt= fopen ($logFile, "a");
|
||||
$fpt= fopen($logFile, "a");
|
||||
$ldapErrorMsg = "";
|
||||
$ldapErrorNr = 0;
|
||||
|
||||
if ($link != null) {
|
||||
$ldapErrorNr = ldap_errno($link);
|
||||
|
||||
if ( $ldapErrorNr != 0 ) {
|
||||
if ($ldapErrorNr != 0) {
|
||||
$ldapErrorMsg = ldap_error($link);
|
||||
$text = $ldapErrorMsg . " : " . $text;
|
||||
}
|
||||
@@ -474,7 +476,7 @@ class ldapAdvanced
|
||||
fwrite($fpt, sprintf("%s %s %s %s %s \n", date("Y-m-d H:i:s"), getenv("REMOTE_ADDR"), SYS_SYS, $ldapErrorNr, $text));
|
||||
fclose($fpt);
|
||||
} else {
|
||||
error_log ("file $logFile is not writable ");
|
||||
error_log("file $logFile is not writable ");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -505,11 +507,11 @@ class ldapAdvanced
|
||||
*/
|
||||
public function ldapConnection($aAuthSource)
|
||||
{
|
||||
$pass = explode("_",$aAuthSource["AUTH_SOURCE_PASSWORD"]);
|
||||
$pass = explode("_", $aAuthSource["AUTH_SOURCE_PASSWORD"]);
|
||||
|
||||
foreach ($pass as $index => $value) {
|
||||
if ($value == "2NnV3ujj3w") {
|
||||
$aAuthSource["AUTH_SOURCE_PASSWORD"] = G::decrypt($pass[0],$aAuthSource["AUTH_SOURCE_SERVER_NAME"]);
|
||||
$aAuthSource["AUTH_SOURCE_PASSWORD"] = G::decrypt($pass[0], $aAuthSource["AUTH_SOURCE_SERVER_NAME"]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1045,11 +1047,11 @@ class ldapAdvanced
|
||||
$strUser = trim($strUser);
|
||||
}
|
||||
|
||||
if ( $strUser == "" ) {
|
||||
if ($strUser == "") {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if ( strlen( $strPass ) == 0) {
|
||||
if (strlen($strPass) == 0) {
|
||||
return -2;
|
||||
}
|
||||
|
||||
@@ -1140,7 +1142,7 @@ class ldapAdvanced
|
||||
|
||||
$ldapcnn = $this->ldapConnection($arrayAuthSource);
|
||||
$flagUpdate = false;
|
||||
switch(ldap_errno($ldapcnn)) {
|
||||
switch (ldap_errno($ldapcnn)) {
|
||||
case '0x00':
|
||||
$flagUpdate = true;
|
||||
$statusRbac = 1;
|
||||
@@ -1195,7 +1197,7 @@ class ldapAdvanced
|
||||
$validUserPass = -5;
|
||||
}
|
||||
|
||||
if ( $validUserPass == 1 ) {
|
||||
if ($validUserPass == 1) {
|
||||
$this->log($ldapcnn, "sucessful login user " . $verifiedUser["sDN"]);
|
||||
} else {
|
||||
$this->log($ldapcnn, "failure authentication for user $strUser");
|
||||
@@ -1295,7 +1297,7 @@ class ldapAdvanced
|
||||
$entries = ldap_count_entries($ldapcnn, $oSearch);
|
||||
$totalUser = $entries;
|
||||
|
||||
if ( $entries > 0) {
|
||||
if ($entries > 0) {
|
||||
$oEntry = ldap_first_entry($ldapcnn, $oSearch);
|
||||
|
||||
$countEntries=0;
|
||||
@@ -1546,11 +1548,11 @@ class ldapAdvanced
|
||||
$res = 0;
|
||||
|
||||
if (!empty($user)) {
|
||||
if ($this->VerifyLogin( $user['sUsername'], $strPass) === true) {
|
||||
if ($this->VerifyLogin($user['sUsername'], $strPass) === true) {
|
||||
$res = 1;
|
||||
}
|
||||
|
||||
if ($res == 0 && $this->VerifyLogin( $user['sDN'], $strPass) === true) {
|
||||
if ($res == 0 && $this->VerifyLogin($user['sDN'], $strPass) === true) {
|
||||
$res = 1;
|
||||
}
|
||||
} else {
|
||||
@@ -1583,8 +1585,8 @@ class ldapAdvanced
|
||||
|
||||
if (!empty($aAttributes)) {
|
||||
foreach ($aAttributes as $value) {
|
||||
if (isset( $user[$value['attributeUser']] )) {
|
||||
$aData[$value['attributeUser']] = str_replace( "*", "'", $user[$value['attributeUser']] );
|
||||
if (isset($user[$value['attributeUser']])) {
|
||||
$aData[$value['attributeUser']] = str_replace("*", "'", $user[$value['attributeUser']]);
|
||||
if ($value['attributeUser'] == 'USR_STATUS') {
|
||||
$evalValue = $aData[$value['attributeUser']];
|
||||
$statusValue = (isset($user['USR_STATUS'])) ? $user['USR_STATUS'] :'ACTIVE';
|
||||
@@ -1595,7 +1597,7 @@ class ldapAdvanced
|
||||
}
|
||||
|
||||
//req - accountexpires
|
||||
if (isset($user["USR_DUE_DATE"]) && $user["USR_DUE_DATE"]!='' ) {
|
||||
if (isset($user["USR_DUE_DATE"]) && $user["USR_DUE_DATE"]!='') {
|
||||
$aData["USR_DUE_DATE"] = $this->convertDateADtoPM($user["USR_DUE_DATE"]);
|
||||
}
|
||||
//end
|
||||
@@ -1768,12 +1770,12 @@ class ldapAdvanced
|
||||
* @param <type> $currentDN
|
||||
* @return <type>
|
||||
*/
|
||||
public function getDepUidIfExistsDN ($currentDN)
|
||||
public function getDepUidIfExistsDN($currentDN)
|
||||
{
|
||||
try {
|
||||
$oCriteria = new Criteria('workflow');
|
||||
$oCriteria->add(DepartmentPeer::DEP_STATUS , 'ACTIVE' );
|
||||
$oCriteria->add(DepartmentPeer::DEP_LDAP_DN, $currentDN );
|
||||
$oCriteria->add(DepartmentPeer::DEP_STATUS, 'ACTIVE');
|
||||
$oCriteria->add(DepartmentPeer::DEP_LDAP_DN, $currentDN);
|
||||
|
||||
$oDataset = DepartmentPeer::doSelectRS($oCriteria);
|
||||
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
@@ -1888,7 +1890,7 @@ class ldapAdvanced
|
||||
BasePeer::doUpdate($c1, $c2, $con);
|
||||
}
|
||||
|
||||
public function deactivateUser ($userUid)
|
||||
public function deactivateUser($userUid)
|
||||
{
|
||||
if (!class_exists('RbacUsers')) {
|
||||
require_once(PATH_RBAC.'model/RbacUsers.php');
|
||||
@@ -2045,7 +2047,7 @@ class ldapAdvanced
|
||||
|
||||
$criteriaCount = new Criteria('workflow');
|
||||
$criteriaCount->clearSelectColumns();
|
||||
$criteriaCount->addSelectColumn( 'COUNT(*)' );
|
||||
$criteriaCount->addSelectColumn('COUNT(*)');
|
||||
$criteriaCount->add(DepartmentPeer::DEP_PARENT, $oDepartment->getDepUid(), Criteria::EQUAL);
|
||||
$rs = DepartmentPeer::doSelectRS($criteriaCount);
|
||||
$rs->next();
|
||||
@@ -2054,7 +2056,7 @@ class ldapAdvanced
|
||||
$result[] = $node;
|
||||
}
|
||||
|
||||
if ( count($result) >= 1 ) {
|
||||
if (count($result) >= 1) {
|
||||
$result[ count($result) -1 ]['DEP_LAST'] = 1;
|
||||
}
|
||||
|
||||
@@ -2108,11 +2110,11 @@ class ldapAdvanced
|
||||
$attributes = $aAuthSource["AUTH_SOURCE_DATA"];
|
||||
$this->sTerminatedOu = isset($attributes['AUTH_SOURCE_RETIRED_OU'])? trim($attributes['AUTH_SOURCE_RETIRED_OU']) : '';
|
||||
|
||||
if ($this->sTerminatedOu == '' ) {
|
||||
if ($this->sTerminatedOu == '') {
|
||||
return $aUsers;
|
||||
}
|
||||
|
||||
return $this->getUsersFromDepartmentByName( $this->sTerminatedOu );
|
||||
return $this->getUsersFromDepartmentByName($this->sTerminatedOu);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2142,8 +2144,8 @@ class ldapAdvanced
|
||||
$con = Propel::getConnection('rbac');
|
||||
// select set
|
||||
$c1 = new Criteria('rbac');
|
||||
$c1->add(RbacUsersPeer::USR_USERNAME, $aUsrUid, Criteria::IN );
|
||||
$c1->add(RbacUsersPeer::USR_STATUS, 1 );
|
||||
$c1->add(RbacUsersPeer::USR_USERNAME, $aUsrUid, Criteria::IN);
|
||||
$c1->add(RbacUsersPeer::USR_STATUS, 1);
|
||||
// update set
|
||||
$c2 = new Criteria('rbac');
|
||||
$c2->add(RbacUsersPeer::USR_STATUS, '0');
|
||||
@@ -2152,7 +2154,7 @@ class ldapAdvanced
|
||||
$con = Propel::getConnection('workflow');
|
||||
// select set
|
||||
$c1 = new Criteria('workflow');
|
||||
$c1->add(UsersPeer::USR_USERNAME, $aUsrUid, Criteria::IN );
|
||||
$c1->add(UsersPeer::USR_USERNAME, $aUsrUid, Criteria::IN);
|
||||
// update set
|
||||
$c2 = new Criteria('workflow');
|
||||
$c2->add(UsersPeer::USR_STATUS, 'INACTIVE');
|
||||
@@ -2360,7 +2362,7 @@ class ldapAdvanced
|
||||
{
|
||||
try {
|
||||
$criteria = new Criteria('workflow');
|
||||
$criteria->add(GroupwfPeer::GRP_STATUS , 'ACTIVE');
|
||||
$criteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
|
||||
$criteria->add(GroupwfPeer::GRP_LDAP_DN, $currentDN);
|
||||
$dataset = GroupwfPeer::doSelectRS($criteria);
|
||||
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
|
||||
|
||||
@@ -1,57 +1,6 @@
|
||||
<?php
|
||||
/**
|
||||
* Project: Distrubution License Class
|
||||
* File: class.license.app.php
|
||||
*
|
||||
* Copyright (C) 2005 Oliver Lillie
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the Free
|
||||
* Software Foundation; either version 2 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 General Public License
|
||||
* for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
* @link http://www.buggedcom.co.uk/
|
||||
* @link http://www.phpclasses.org/browse/package/2298.html
|
||||
* @author Oliver Lillie, buggedcom <publicmail at buggedcom dot co dot uk>
|
||||
* @history---------------------------------------------
|
||||
* see CHANGELOG
|
||||
*/
|
||||
|
||||
/**
|
||||
* Project: Distrubution License Class
|
||||
* File: class.license.app.php
|
||||
*
|
||||
* Copyright (C) 2005 Oliver Lillie
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the Free
|
||||
* Software Foundation; either version 2 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 General Public License
|
||||
* for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
* @link http://www.buggedcom.co.uk/
|
||||
* @link http://www.phpclasses.org/browse/package/2298.html
|
||||
* @author Oliver Lillie, buggedcom <publicmail at buggedcom dot co dot uk>
|
||||
* @history---------------------------------------------
|
||||
* see CHANGELOG
|
||||
*/class license_application extends padl
|
||||
class license_application extends padl
|
||||
{
|
||||
/**
|
||||
* The number of allowed differences between the $_SERVER vars and the vars
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,35 +1,11 @@
|
||||
<?php
|
||||
/**
|
||||
* class.processes.php
|
||||
*
|
||||
* @package workflow.engine.ProcessMaker
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* ObjectDocument Collection
|
||||
*
|
||||
* @package workflow.engine.ProcessMaker
|
||||
*/class ObjectCellection
|
||||
*/
|
||||
class ObjectCollection
|
||||
{
|
||||
public $num;
|
||||
public $swapc;
|
||||
@@ -40,7 +16,7 @@
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
$this->objects = Array();
|
||||
$this->objects = array();
|
||||
$this->num = 0;
|
||||
$this->swapc = $this->num;
|
||||
array_push($this->objects, 'void');
|
||||
@@ -347,7 +347,7 @@
|
||||
{
|
||||
$sMySQLVersion = '?????';
|
||||
if (defined("DB_HOST")) {
|
||||
$dbNetView = new NET(DB_HOST);
|
||||
$dbNetView = new Net(DB_HOST);
|
||||
$dbNetView->loginDbServer(DB_USER, DB_PASS);
|
||||
|
||||
$dbConns = new DbConnections('');
|
||||
|
||||
@@ -1145,7 +1145,7 @@ class WorkspaceTools
|
||||
$Fields['WORKSPACE_NAME'] = $this->name;
|
||||
|
||||
if (isset($this->dbHost)) {
|
||||
$dbNetView = new NET($this->dbHost);
|
||||
$dbNetView = new Net($this->dbHost);
|
||||
$dbNetView->loginDbServer($this->dbUser, $this->dbPass);
|
||||
try {
|
||||
if (!defined('DB_ADAPTER')) {
|
||||
|
||||
@@ -230,7 +230,7 @@ class Admin extends Controller
|
||||
|
||||
$redhat .= " (" . PHP_OS . ")";
|
||||
if (defined( "DB_HOST" )) {
|
||||
$dbNetView = new NET( DB_HOST );
|
||||
$dbNetView = new Net( DB_HOST );
|
||||
$dbNetView->loginDbServer( DB_USER, DB_PASS );
|
||||
|
||||
$dbConns = new DbConnections( '' );
|
||||
|
||||
@@ -433,7 +433,7 @@ class adminProxy extends HttpProxyController
|
||||
$Mailto = $_POST['eMailto'];
|
||||
$SMTPSecure = $_POST['UseSecureCon'];
|
||||
|
||||
$Server = new NET($server);
|
||||
$Server = new Net($server);
|
||||
$smtp = new SMTP;
|
||||
|
||||
$timeout = 10;
|
||||
|
||||
@@ -695,7 +695,7 @@ class Main extends Controller
|
||||
|
||||
$redhat .= " (" . PHP_OS . ")";
|
||||
if (defined( "DB_HOST" )) {
|
||||
$dbNetView = new NET( DB_HOST );
|
||||
$dbNetView = new Net( DB_HOST );
|
||||
$dbNetView->loginDbServer( DB_USER, DB_PASS );
|
||||
|
||||
$dbConns = new DbConnections( '' );
|
||||
|
||||
@@ -918,7 +918,7 @@ class pmTablesProxy extends HttpProxyController
|
||||
|
||||
try {
|
||||
$result = new stdClass();
|
||||
$net = new NET( G::getIpAddress() );
|
||||
$net = new Net( G::getIpAddress() );
|
||||
|
||||
$META = " \n-----== ProcessMaker Open Source Private Tables ==-----\n" . " @Ver: 1.0 Oct-2009\n" . " @Processmaker version: " . PmSystem::getVersion() . "\n" . " -------------------------------------------------------\n" . " @Export Date: " . date( "l jS \of F Y h:i:s A" ) . "\n" . " @Server address: " . getenv( 'SERVER_NAME' ) . " (" . getenv( 'SERVER_ADDR' ) . ")\n" . " @Client address: " . $net->hostname . "\n" . " @Workspace: " . SYS_SYS . "\n" . " @Export trace back:\n\n";
|
||||
|
||||
|
||||
@@ -235,7 +235,7 @@ try {
|
||||
function getLDAPAdvanceInstance($authUid)
|
||||
{
|
||||
$RBAC = &RBAC::getSingleton();
|
||||
$ldapAdvanced = new ldapAdvanced();
|
||||
$ldapAdvanced = new LdapAdvanced();
|
||||
$ldapAdvanced->sAuthSource = $authUid;
|
||||
$ldapAdvanced->sSystem = $RBAC->sSystem;
|
||||
|
||||
|
||||
@@ -152,7 +152,7 @@ switch ($function) {
|
||||
$aFields['AUTH_SOURCE_DATA'] = $aData;
|
||||
|
||||
//LDAP_PAGE_SIZE_LIMIT
|
||||
$ldapAdvanced = new ldapAdvanced();
|
||||
$ldapAdvanced = new LdapAdvanced();
|
||||
|
||||
try {
|
||||
$arrayAuthenticationSourceData = $aFields;
|
||||
@@ -205,7 +205,7 @@ switch ($function) {
|
||||
//Get data
|
||||
$arrayData = array();
|
||||
|
||||
$ldapAdvanced = new ldapAdvanced();
|
||||
$ldapAdvanced = new LdapAdvanced();
|
||||
$ldapAdvanced->sAuthSource = $authenticationSourceUid;
|
||||
|
||||
$result = $ldapAdvanced->searchUsers($keyword, $start, $limit);
|
||||
@@ -345,7 +345,7 @@ switch ($function) {
|
||||
$arrayAuthenticationSourceData['AUTH_SOURCE_VERSION'] = 3;
|
||||
|
||||
//Test connection
|
||||
$ldapAdvanced = new ldapAdvanced();
|
||||
$ldapAdvanced = new LdapAdvanced();
|
||||
|
||||
$ldapcnn = $ldapAdvanced->ldapConnection($arrayAuthenticationSourceData);
|
||||
|
||||
|
||||
@@ -240,7 +240,7 @@ switch ($action) {
|
||||
}
|
||||
}
|
||||
|
||||
$Server = new NET($server);
|
||||
$Server = new Net($server);
|
||||
|
||||
switch ($step) {
|
||||
case 1:
|
||||
@@ -305,7 +305,7 @@ switch ($action) {
|
||||
$connectionType = $_POST["connectionType"];
|
||||
$tns = $_POST["tns"];
|
||||
|
||||
$net = new NET();
|
||||
$net = new Net();
|
||||
|
||||
switch ($step) {
|
||||
case 1:
|
||||
|
||||
@@ -48,7 +48,7 @@ class ldapadvancedClassCron
|
||||
$rbac->authSourcesObj = new AuthenticationSource();
|
||||
}
|
||||
|
||||
$plugin = new ldapAdvanced();
|
||||
$plugin = new LdapAdvanced();
|
||||
$plugin->sSystem = $rbac->sSystem;
|
||||
|
||||
$plugin->setFrontEnd(true);
|
||||
|
||||
@@ -26,7 +26,7 @@ function testConnection($type, $server, $user, $passwd, $port = 'none', $dbName
|
||||
}
|
||||
}
|
||||
|
||||
$Server = new NET($server);
|
||||
$Server = new Net($server);
|
||||
$filter = new InputFilter();
|
||||
|
||||
if ($Server->getErrno() == 0) {
|
||||
|
||||
@@ -92,7 +92,7 @@ switch ($request) {
|
||||
$SMTPSecure = $_POST['SMTPSecure'];
|
||||
$timeout = 10;
|
||||
|
||||
$Server = new NET( $srv );
|
||||
$Server = new Net( $srv );
|
||||
$smtp = new SMTP();
|
||||
|
||||
switch ($step) {
|
||||
|
||||
@@ -271,7 +271,7 @@ class DataBaseConnection
|
||||
$flagTns = ($dataCon["DBS_TYPE"] == "oracle" && $dataCon["DBS_CONNECTION_TYPE"] == "TNS")? 1 : 0;
|
||||
|
||||
if ($flagTns == 0) {
|
||||
$Server = new \NET($dataCon['DBS_SERVER']);
|
||||
$Server = new \Net($dataCon['DBS_SERVER']);
|
||||
|
||||
// STEP 1 : Resolving Host Name
|
||||
$respTest['0'] = array();
|
||||
@@ -356,7 +356,7 @@ class DataBaseConnection
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$net = new \NET();
|
||||
$net = new \Net();
|
||||
|
||||
//STEP 0: Trying to open database type TNS
|
||||
$respTest["0"] = array();
|
||||
|
||||
@@ -316,7 +316,7 @@ class EmailServer
|
||||
$mailTo = $arrayData["MAIL_TO"];
|
||||
$smtpSecure = $arrayData["SMTPSECURE"];
|
||||
|
||||
$serverNet = new \NET($server);
|
||||
$serverNet = new \Net($server);
|
||||
$smtp = new \SMTP();
|
||||
|
||||
$timeout = 10;
|
||||
|
||||
@@ -47,7 +47,7 @@ $html = '
|
||||
$flagTns = ($_POST["type"] == "oracle" && $_POST["connectionType"] == "TNS")? 1 : 0;
|
||||
|
||||
if ($flagTns == 0) {
|
||||
$host = new NET($_POST["server"]);
|
||||
$host = new Net($_POST["server"]);
|
||||
|
||||
$port = $_POST["port"];
|
||||
|
||||
|
||||
@@ -1,98 +1,98 @@
|
||||
<?php
|
||||
/**
|
||||
* groups_Tree.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.
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* @Description This is the View of all groups from a determinated user
|
||||
* @author Erik Amaru Ortiz <erik@colosa.com>
|
||||
* @Date 24/04/2008
|
||||
* @LastModification 30/05/2008
|
||||
* @Updated Nov 6th, 2009 bye Eriknyk
|
||||
*/
|
||||
|
||||
$host = new net($_POST['srv']);
|
||||
$host = $filter->xssFilterHard($host);
|
||||
$width_content = '550px';
|
||||
$filter = new InputFilter();
|
||||
$_POST = $filter->xssFilterHard($_POST);
|
||||
$ID_SETUP_MAILCONF_TITLE = $filter->xssFilterHard(G::loadTranslation('ID_SETUP_MAILCONF_TITLE'));
|
||||
|
||||
$html = '
|
||||
<div class="boxTopBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
|
||||
<div class="boxContentBlue">
|
||||
<table style="margin:0px;" cellspacing="0" cellpadding="0">
|
||||
<tr>
|
||||
<td class="userGroupTitle"><center>'.$ID_SETUP_MAILCONF_TITLE.'</center></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="boxBottomBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>';
|
||||
|
||||
$tests = Array(
|
||||
'',
|
||||
'Resolve host name '.$_POST['srv'],
|
||||
'Checking port <b>'.$_POST['port'].'</b>',
|
||||
'Establishing connection to host <b>'.$host->hostname.'</b>'
|
||||
);
|
||||
$tests[] = 'Login as <b>'.$_POST['account'].'</b> on '.$host->hostname.' SMTP Server';
|
||||
|
||||
|
||||
if($_POST['send_test_mail'] == 'yes'){
|
||||
$tests[] = 'Sending a test mail from <b>'.$_POST['account'].'</b> to '.$_POST['mail_to'].'...';
|
||||
}
|
||||
$tree->showSign = false;
|
||||
$n = Array('','uno','dos','tres','cuatro','cinco');
|
||||
for($i=1; $i<count($tests);$i++)
|
||||
{
|
||||
$html .= "
|
||||
<div id='test_$i' style='display:none'>
|
||||
<table width='100%' cellspacing='0' cellpadding='0' border='1' style='border:0px;'>
|
||||
<tr>
|
||||
<td width=10 class='treeNode' style='border:0px;background-color:transparent;'><span id='status_$i'></span></td>
|
||||
<td width='*' class='treeNode' style='border:0px;background-color:transparent;'>
|
||||
<span id='action_$i'>$tests[$i]</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width='*' class='treeNode' style='border:0px;background-color:transparent;' colspan='2'>
|
||||
<span id='status2_$i'></span>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>";
|
||||
}
|
||||
echo '<div class="grid" style="width:'.$width_content.'">
|
||||
<div class="boxTop"><div class="a"></div><div class="b"></div><div class="c"></div></div>
|
||||
<div class="content" style="">
|
||||
<table width="90%">
|
||||
<tbody><tr>
|
||||
<td valign="top">
|
||||
'.$html.'
|
||||
</td>
|
||||
</tr>
|
||||
</tbody></table>
|
||||
</div>
|
||||
<div class="boxBottom"><div class="a"></div><div class="b"></div><div class="c"></div></div>
|
||||
</div>';
|
||||
print ("<div id='bnt_ok' style='display:none'><input type=button class='module_app_button___gray' onclick='jvascript:cancelTestConnection()' value='DONE'></div>");
|
||||
<?php
|
||||
/**
|
||||
* groups_Tree.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.
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* @Description This is the View of all groups from a determinated user
|
||||
* @author Erik Amaru Ortiz <erik@colosa.com>
|
||||
* @Date 24/04/2008
|
||||
* @LastModification 30/05/2008
|
||||
* @Updated Nov 6th, 2009 bye Eriknyk
|
||||
*/
|
||||
|
||||
$host = new Net($_POST['srv']);
|
||||
$host = $filter->xssFilterHard($host);
|
||||
$width_content = '550px';
|
||||
$filter = new InputFilter();
|
||||
$_POST = $filter->xssFilterHard($_POST);
|
||||
$ID_SETUP_MAILCONF_TITLE = $filter->xssFilterHard(G::loadTranslation('ID_SETUP_MAILCONF_TITLE'));
|
||||
|
||||
$html = '
|
||||
<div class="boxTopBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>
|
||||
<div class="boxContentBlue">
|
||||
<table style="margin:0px;" cellspacing="0" cellpadding="0">
|
||||
<tr>
|
||||
<td class="userGroupTitle"><center>'.$ID_SETUP_MAILCONF_TITLE.'</center></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="boxBottomBlue"><div class="a"></div><div class="b"></div><div class="c"></div></div>';
|
||||
|
||||
$tests = Array(
|
||||
'',
|
||||
'Resolve host name '.$_POST['srv'],
|
||||
'Checking port <b>'.$_POST['port'].'</b>',
|
||||
'Establishing connection to host <b>'.$host->hostname.'</b>'
|
||||
);
|
||||
$tests[] = 'Login as <b>'.$_POST['account'].'</b> on '.$host->hostname.' SMTP Server';
|
||||
|
||||
|
||||
if($_POST['send_test_mail'] == 'yes'){
|
||||
$tests[] = 'Sending a test mail from <b>'.$_POST['account'].'</b> to '.$_POST['mail_to'].'...';
|
||||
}
|
||||
$tree->showSign = false;
|
||||
$n = Array('','uno','dos','tres','cuatro','cinco');
|
||||
for($i=1; $i<count($tests);$i++)
|
||||
{
|
||||
$html .= "
|
||||
<div id='test_$i' style='display:none'>
|
||||
<table width='100%' cellspacing='0' cellpadding='0' border='1' style='border:0px;'>
|
||||
<tr>
|
||||
<td width=10 class='treeNode' style='border:0px;background-color:transparent;'><span id='status_$i'></span></td>
|
||||
<td width='*' class='treeNode' style='border:0px;background-color:transparent;'>
|
||||
<span id='action_$i'>$tests[$i]</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width='*' class='treeNode' style='border:0px;background-color:transparent;' colspan='2'>
|
||||
<span id='status2_$i'></span>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>";
|
||||
}
|
||||
echo '<div class="grid" style="width:'.$width_content.'">
|
||||
<div class="boxTop"><div class="a"></div><div class="b"></div><div class="c"></div></div>
|
||||
<div class="content" style="">
|
||||
<table width="90%">
|
||||
<tbody><tr>
|
||||
<td valign="top">
|
||||
'.$html.'
|
||||
</td>
|
||||
</tr>
|
||||
</tbody></table>
|
||||
</div>
|
||||
<div class="boxBottom"><div class="a"></div><div class="b"></div><div class="c"></div></div>
|
||||
</div>';
|
||||
print ("<div id='bnt_ok' style='display:none'><input type=button class='module_app_button___gray' onclick='jvascript:cancelTestConnection()' value='DONE'></div>");
|
||||
|
||||
Reference in New Issue
Block a user