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

I solved issues [April 18]

Browse Source
This commit is contained in:
Paula V. Quispe
2015-04-21 13:42:09 -04:00
parent e374f7a550
commit 0071e43de7
6 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gulliver/system/class.bootstrap.php
View File

@@ -1273,7 +1273,7 @@ class Bootstrap
$checkSum = ''; $checkSum = '';
foreach ($files as $file) { foreach ($files as $file) {
if (is_file($file)) { if (is_file($file)) {
$checkSum .= md5_file($file); $checkSum .= G::encryptFileOld($file);
} }
} }
return Bootstrap::encryptOld($checkSum . $key); return Bootstrap::encryptOld($checkSum . $key);

17
gulliver/thirdparty/pear/class.wsdlcache.php vendored
View File

@@ -134,7 +134,7 @@ class wsdlcache {
$this->debug("Lock for $filename already exists"); $this->debug("Lock for $filename already exists");
return false; return false;
} }
$this->fplock[md5($filename)] = fopen($filename.".lock", "w"); $this->fplock[G::encryptOld($filename)] = fopen($filename.".lock", "w");
if ($mode == "r") { if ($mode == "r") {
return flock($this->fplock[G::encryptOld($filename)], LOCK_SH); return flock($this->fplock[G::encryptOld($filename)], LOCK_SH);
} else { } else {
@@ -173,9 +173,18 @@ class wsdlcache {
* @access private * @access private
*/ */
function releaseMutex($filename) { function releaseMutex($filename) {
$ret = flock($this->fplock[md5($filename)], LOCK_UN); if(!class_exists('G')){
fclose($this->fplock[md5($filename)]); $realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
unset($this->fplock[md5($filename)]); $docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$ret = flock($this->fplock[G::encryptOld($filename)], LOCK_UN);
fclose($this->fplock[G::encryptOld($filename)]);
unset($this->fplock[G::encryptOld($filename)]);
if (! $ret) { if (! $ret) {
$this->debug("Not able to release lock for $filename"); $this->debug("Not able to release lock for $filename");
} }

2
gulliver/thirdparty/phpmailer/class.phpmailer.php vendored
View File

@@ -2527,7 +2527,7 @@ class PHPMailer {
$mimeType = self::_mime_types($ext); $mimeType = self::_mime_types($ext);
if ( strlen($basedir) > 1 && substr($basedir, -1) != '/') { $basedir .= '/'; } if ( strlen($basedir) > 1 && substr($basedir, -1) != '/') { $basedir .= '/'; }
if ( strlen($directory) > 1 && substr($directory, -1) != '/') { $directory .= '/'; } if ( strlen($directory) > 1 && substr($directory, -1) != '/') { $directory .= '/'; }
if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($url), $filename, 'base64', $mimeType) ) { if ( $this->AddEmbeddedImage($basedir.$directory.$filename, G::encryptOld($url), $filename, 'base64', $mimeType) ) {
$message = preg_replace("/".$images[1][$i]."=[\"']".preg_quote($url, '/')."[\"']/Ui", $images[1][$i]."=\"".$cid."\"", $message); $message = preg_replace("/".$images[1][$i]."=[\"']".preg_quote($url, '/')."[\"']/Ui", $images[1][$i]."=\"".$cid."\"", $message);
} }
} }

2
workflow/engine/classes/class.Upgrade.php
View File

@@ -98,7 +98,7 @@ class Upgrade
$installedMD5 = ""; $installedMD5 = "";
} else { } else {
$time = microtime(1); $time = microtime(1);
$installedMD5 = md5_file($installedFile); $installedMD5 = G::encryptFileOld($installedFile);
$checksumTime += microtime(1) - $time; $checksumTime += microtime(1) - $time;
} }
$archiveMD5 = $checksum; $archiveMD5 = $checksum;

4
workflow/engine/classes/class.system.php
View File

@@ -260,7 +260,7 @@ class System
continue; continue;
} }
if (file_exists( realpath( $filename ) )) { if (file_exists( realpath( $filename ) )) {
if (strcmp( $checksum, md5_file( realpath( $filename ) ) ) != 0) { if (strcmp( $checksum, G::encryptFileOld( realpath( $filename ) ) ) != 0) {
$result['diff'][] = $filename; $result['diff'][] = $filename;
} }
} else { } else {
@@ -542,7 +542,7 @@ class System
$file = PATH_TRUNK . trim( $line[2] ); $file = PATH_TRUNK . trim( $line[2] );
if (is_readable( $file )) { if (is_readable( $file )) {
$size = sprintf( "%07d", filesize( $file ) ); $size = sprintf( "%07d", filesize( $file ) );
$checksum = sprintf( "%010u", crc32( file_get_contents( $file ) ) ); $checksum = sprintf( "%010u", G::encryptCrc32( file_get_contents( $file ) ) );
if (! ($line[0] == $size && $line[1] == $checksum) && substr( $file, - 4 ) != '.xml') { if (! ($line[0] == $size && $line[1] == $checksum) && substr( $file, - 4 ) != '.xml') {
$distinctFiles .= $file . "\n"; $distinctFiles .= $file . "\n";
$distinct ++; $distinct ++;

12
workflow/engine/controllers/installer.php
View File

@@ -840,15 +840,15 @@ class Installer extends Controller
$query = sprintf( "USE %s;", $wf_workpace ); $query = sprintf( "USE %s;", $wf_workpace );
$this->mysqlQuery( $query ); $this->mysqlQuery( $query );
$query = sprintf( "UPDATE USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, md5( $adminPassword ) ); $query = sprintf( "UPDATE USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, G::encryptOld( $adminPassword ) );
$this->mysqlQuery( $query ); $this->mysqlQuery( $query );
$query = sprintf( "UPDATE RBAC_USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, md5( $adminPassword ) ); $query = sprintf( "UPDATE RBAC_USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, G::encryptOld( $adminPassword ) );
$this->mysqlQuery( $query ); $this->mysqlQuery( $query );
// Write the paths_installed.php file (contains all the information configured so far) // Write the paths_installed.php file (contains all the information configured so far)
if (! file_exists( FILE_PATHS_INSTALLED )) { if (! file_exists( FILE_PATHS_INSTALLED )) {
$sh = md5( filemtime( PATH_GULLIVER . '/class.g.php' ) ); $sh = G::encryptOld( filemtime( PATH_GULLIVER . '/class.g.php' ) );
$h = G::encrypt( $db_hostname . $sh . $db_username . $sh . $db_password, $sh ); $h = G::encrypt( $db_hostname . $sh . $db_username . $sh . $db_password, $sh );
$dbText = "<?php\n"; $dbText = "<?php\n";
$dbText .= sprintf( " define('PATH_DATA', '%s');\n", $pathShared ); $dbText .= sprintf( " define('PATH_DATA', '%s');\n", $pathShared );
@@ -1152,18 +1152,18 @@ class Installer extends Controller
$query = sprintf( "USE %s;", $wf ); $query = sprintf( "USE %s;", $wf );
$this->mssqlQuery( $query ); $this->mssqlQuery( $query );
$query = sprintf( "UPDATE USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, md5( $adminPassword ) ); $query = sprintf( "UPDATE USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, G::encryptOld( $adminPassword ) );
$this->mssqlQuery( $query ); $this->mssqlQuery( $query );
$query = sprintf( "USE %s;", $wf ); $query = sprintf( "USE %s;", $wf );
$this->mssqlQuery( $query ); $this->mssqlQuery( $query );
$query = sprintf( "UPDATE RBAC_USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, md5( $adminPassword ) ); $query = sprintf( "UPDATE RBAC_USERS SET USR_USERNAME = '%s', USR_PASSWORD = '%s' WHERE USR_UID = '00000000000000000000000000000001' ", $adminUsername, G::encryptOld( $adminPassword ) );
$this->mssqlQuery( $query ); $this->mssqlQuery( $query );
// Write the paths_installed.php file (contains all the information configured so far) // Write the paths_installed.php file (contains all the information configured so far)
if (! file_exists( FILE_PATHS_INSTALLED )) { if (! file_exists( FILE_PATHS_INSTALLED )) {
$sh = md5( filemtime( PATH_GULLIVER . '/class.g.php' ) ); $sh = G::encryptOld( filemtime( PATH_GULLIVER . '/class.g.php' ) );
$h = G::encrypt( $db_hostname . $sh . $db_username . $sh . $db_password . '1', $sh ); $h = G::encrypt( $db_hostname . $sh . $db_username . $sh . $db_password . '1', $sh );
$dbText = "<?php\n"; $dbText = "<?php\n";
$dbText .= sprintf( " define ('PATH_DATA', '%s' );\n", $pathShared ); $dbText .= sprintf( " define ('PATH_DATA', '%s' );\n", $pathShared );