fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
dheeyi
2015-04-10 12:33:22 -04:00
parent 2bf6165e92 7ca6cb9a13
commit 43d7ecf0dd
36 changed files with 410 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gulliver/system/class.form.php
View File

@@ -478,6 +478,14 @@ class Form extends XmlForm
}
}
break;
case 'yesno':
$values[$k] = $newValues[$k];
if($newValues[$k] == 1){
$values[$k . "_label"] = G::LoadTranslation('ID_YES_VALUE');
} else {
$values[$k . "_label"] = G::LoadTranslation('ID_NO_VALUE');
}
break;
case "link":
$values[$k] = $newValues[$k];
$values[$k . "_label"] = $newValues[$k . "_label"];

43
gulliver/system/class.xmlform.php
View File

@@ -1109,6 +1109,7 @@ class XmlForm_Field_Text extends XmlForm_Field_SimpleText
public $replaceTags = 0;
public $renderMode = '';
public $comma_separator = '.';
public $autocomplete = "on";
/**
* Function render
@@ -1121,6 +1122,13 @@ class XmlForm_Field_Text extends XmlForm_Field_SimpleText
*/
public function render ($value = null, $owner = null)
{
if ($this->autocomplete === '1') {
$this->autocomplete = "on";
} else {
if ($this->autocomplete === '0') {
$this->autocomplete = "off";
}
}
if ($this->renderMode == '') {
$this->renderMode = $this->mode;
}
@@ -1168,6 +1176,7 @@ class XmlForm_Field_Text extends XmlForm_Field_SimpleText
$html .= 'id="form[' . $this->name . ']" ';
$html .= 'name="form[' . $this->name . ']" ';
$html .= 'type="text" size="' . $this->size . '" maxlength="' . $this->maxLength . '" ';
$html .= 'autocomplete="' . $this->autocomplete . '" ';
$html .= 'value="' . $this->htmlentities( $value, ENT_QUOTES, 'utf-8' ) . '" ';
$html .= 'style="' . $this->htmlentities( $this->style, ENT_COMPAT, 'utf-8' ) . '" ';
$html .= 'onkeypress="' . $this->htmlentities( $onkeypress, ENT_COMPAT, 'utf-8' ) . '" ';
@@ -4827,23 +4836,23 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
/*
//Year
%Y year with the century
%y year without the century (range 00 to 99)
//Month
%m month, range 01 to 12
%B full month name
%b abbreviated month name
//Day
%d the day of the month (range 01 to 31)
%e the day of the month (range 1 to 31)
//Hour
%H hour, range 00 to 23 (24h format)
%I hour, range 01 to 12 (12h format)
%k hour, range 0 to 23 (24h format)
%l hour, range 1 to 12 (12h format)
//Min
%M minute, range 00 to 59
//Sec
%Y year with the century
%y year without the century (range 00 to 99)
//Month
%m month, range 01 to 12
%B full month name
%b abbreviated month name
//Day
%d the day of the month (range 01 to 31)
%e the day of the month (range 1 to 31)
//Hour
%H hour, range 00 to 23 (24h format)
%I hour, range 01 to 12 (12h format)
%k hour, range 0 to 23 (24h format)
%l hour, range 1 to 12 (12h format)
//Min
%M minute, range 00 to 59
//Sec
%S seconds, range 00 to 59
*/
function date_create_from_format( $dformat, $dvalue, $withHours = false )

11
gulliver/thirdparty/creole/Creole.php vendored
View File

@@ -189,10 +189,19 @@ class Creole {
trigger_error("The Creole::NO_ASSOC_LOWER flag has been deprecated, and is now the default behavior. Use Creole::COMPAT_ASSOC_LOWER to lowercase resulset keys.", E_USER_WARNING);
}
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
// sort $dsninfo by keys so the serialized result is always the same
// for identical connection parameters, no matter what their order is
ksort($dsninfo);
$connectionMapKey = crc32(serialize($dsninfo + array('compat_flags' => ($flags & Creole::COMPAT_ALL))));
$connectionMapKey = G::encryptCrc32(serialize($dsninfo + array('compat_flags' => ($flags & Creole::COMPAT_ALL))));
// see if we already have a connection with these parameters cached
if(isset(self::$connectionMap[$connectionMapKey]) && $dsninfo['phptype'] !== 'dbarray')

11
gulliver/thirdparty/geshi/geshi.php vendored
View File

@@ -3738,10 +3738,19 @@ class GeSHi {
/** NOTE: memorypeak #1 */
$parsed_code = preg_replace('#<span[^>]+>(\s*)</span>#', '\\1', $parsed_code);
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
// If we are using IDs for line numbers, there needs to be an overall
// ID set to prevent collisions.
if ($this->add_ids && !$this->overall_id) {
$this->overall_id = 'geshi-' . substr(md5(microtime()), 0, 4);
$this->overall_id = 'geshi-' . substr(G::encryptOld(microtime()), 0, 4);
}
// Get code into lines

11
gulliver/thirdparty/html2ps_pdf/box.checkbutton.php vendored
View File

@@ -57,11 +57,20 @@ class CheckBox extends GenericFormattedBox {
* @see CheckBox::CheckBox()
*/
function &create(&$root, &$pipeline) {
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$value = $root->get_attribute('value');
if (trim($value) == "") {
error_log("Checkbox with empty 'value' attribute");
$value = sprintf("___Value%s",md5(time().rand()));
$value = sprintf("___Value%s",G::encryptOld(time().rand()));
};
$box =& new CheckBox($root->has_attribute('checked'),

11
gulliver/thirdparty/html2ps_pdf/box.radiobutton.php vendored
View File

@@ -19,12 +19,21 @@ class RadioBox extends SimpleInlineBox {
var $_value;
function &create(&$root, &$pipeline) {
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$checked = $root->has_attribute('checked');
$value = $root->get_attribute('value');
if (trim($value) == "") {
error_log("Radiobutton with empty 'value' attribute");
$value = sprintf("___Value%s",md5(time().rand()));
$value = sprintf("___Value%s",G::encryptOld(time().rand()));
};
$css_state = $pipeline->getCurrentCSSState();

11
gulliver/thirdparty/html2ps_pdf/css.cache.class.php vendored
View File

@@ -15,7 +15,16 @@ class CSSCache {
}
function _getCacheFilename($url) {
return CACHE_DIR.md5($url).'.css.compiled';
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
return CACHE_DIR.G::encryptOld($url).'.css.compiled';
}
function _isCached($url) {

11
gulliver/thirdparty/html2ps_pdf/image.class.php vendored
View File

@@ -80,7 +80,16 @@ class Image {
// allowed file name length (especially after escaping specialy symbols)
// thus, we generate long almost random 32-character name using the md5 hash function
//
return CACHE_DIR.md5(time() + $url + rand());
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
return CACHE_DIR.G::encryptOld(time() + $url + rand());
}
// Checks if cache directory is available

11
gulliver/thirdparty/pear/Log/console.php vendored
View File

@@ -67,7 +67,16 @@ class Log_console extends Log
function Log_console($name, $ident = '', $conf = array(),
$level = PEAR_LOG_DEBUG)
{
$this->_id = md5(microtime());
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$this->_id = G::encryptOld(microtime());
$this->_ident = $ident;
$this->_mask = Log::UPTO($level);

11
gulliver/thirdparty/pear/Log/daemon.php vendored
View File

@@ -74,7 +74,16 @@ class Log_daemon extends Log
$name = LOG_SYSLOG;
}
$this->_id = md5(microtime());
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$this->_id = G::encryptOld(microtime());
$this->_name = $name;
$this->_ident = $ident;
$this->_mask = Log::UPTO($level);

11
gulliver/thirdparty/pear/Log/display.php vendored
View File

@@ -54,7 +54,16 @@ class Log_display extends Log
function Log_display($name = '', $ident = '', $conf = array(),
$level = PEAR_LOG_DEBUG)
{
$this->_id = md5(microtime());
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$this->_id = G::encryptOld(microtime());
$this->_ident = $ident;
$this->_mask = Log::UPTO($level);

11
gulliver/thirdparty/pear/Log/error_log.php vendored
View File

@@ -52,7 +52,16 @@ class Log_error_log extends Log
function Log_error_log($name, $ident = '', $conf = array(),
$level = PEAR_LOG_DEBUG)
{
$this->_id = md5(microtime());
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$this->_id = G::encryptOld(microtime());
$this->_type = $name;
$this->_ident = $ident;
$this->_mask = Log::UPTO($level);

11
gulliver/thirdparty/pear/Log/file.php vendored
View File

@@ -98,7 +98,16 @@ class Log_file extends Log
function Log_file($name, $ident = '', $conf = array(),
$level = PEAR_LOG_DEBUG)
{
$this->_id = md5(microtime());
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$this->_id = G::encryptOld(microtime());
$this->_filename = $name;
$this->_ident = $ident;
$this->_mask = Log::UPTO($level);

11
gulliver/thirdparty/pear/Log/firebug.php vendored
View File

@@ -81,7 +81,16 @@ class Log_firebug extends Log
function Log_firebug($name = '', $ident = 'PHP', $conf = array(),
$level = PEAR_LOG_DEBUG)
{
$this->_id = md5(microtime());
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$this->_id = G::encryptOld(microtime());
$this->_ident = $ident;
$this->_mask = Log::UPTO($level);
if (isset($conf['buffering'])) {

11
gulliver/thirdparty/pear/Log/mail.php vendored
View File

@@ -103,7 +103,16 @@ class Log_mail extends Log
function Log_mail($name, $ident = '', $conf = array(),
$level = PEAR_LOG_DEBUG)
{
$this->_id = md5(microtime());
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$this->_id = G::encryptOld(microtime());
$this->_recipients = $name;
$this->_ident = $ident;
$this->_mask = Log::UPTO($level);

11
gulliver/thirdparty/pear/Log/mcal.php vendored
View File

@@ -74,7 +74,16 @@ class Log_mcal extends Log
function Log_mcal($name, $ident = '', $conf = array(),
$level = PEAR_LOG_DEBUG)
{
$this->_id = md5(microtime());
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$this->_id = G::encryptOld(microtime());
$this->_name = $name;
$this->_ident = $ident;
$this->_mask = Log::UPTO($level);

11
gulliver/thirdparty/pear/Log/mdb2.php vendored
View File

@@ -115,7 +115,16 @@ class Log_mdb2 extends Log
function Log_mdb2($name, $ident = '', $conf = array(),
$level = PEAR_LOG_DEBUG)
{
$this->_id = md5(microtime());
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$this->_id = G::encryptOld(microtime());
$this->_table = $name;
$this->_mask = Log::UPTO($level);

11
gulliver/thirdparty/pear/Log/null.php vendored
View File

@@ -30,7 +30,16 @@ class Log_null extends Log
function Log_null($name, $ident = '', $conf = array(),
$level = PEAR_LOG_DEBUG)
{
$this->_id = md5(microtime());
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$this->_id = G::encryptOld(microtime());
$this->_ident = $ident;
$this->_mask = Log::UPTO($level);
}

22
gulliver/thirdparty/pear/Net/DIME.php vendored
View File

@@ -167,7 +167,16 @@ class Net_DIME_Record extends PEAR
function generateID()
{
$id = md5(time());
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$id = G::encryptOld(time());
$this->setID($id);
return $id;
}
@@ -373,6 +382,15 @@ class Net_DIME_Message extends PEAR
function startChunk(&$data, $typestr='', $id=NULL, $type=NET_DIME_TYPE_UNKNOWN)
{
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$this->me = 0;
$this->cf = 1;
$this->type = $type;
@@ -380,7 +398,7 @@ class Net_DIME_Message extends PEAR
if ($id) {
$this->id = $id;
} else {
$this->id = md5(time());
$this->id = G::encryptOld(time());
}
return $this->_makeRecord($data, $this->typestr, $this->id, $this->type);
}

11
gulliver/thirdparty/pear/Net/UserAgent/Detect/APC.php vendored
View File

@@ -29,6 +29,15 @@ class Net_UserAgent_Detect_APC extends Net_UserAgent_Detect
$restored = false;
$ua_cache_timeout = apc_fetch('useragent:cache_timeout'); // don't cache after time period
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
if ($ua_cache_window > 0) {
if (!$ua_cache_timeout) {
// check apc uptime and disable after x mins
@@ -49,7 +58,7 @@ class Net_UserAgent_Detect_APC extends Net_UserAgent_Detect
if ($in_detect !== null) {
$key_flags = implode('-', $in_detect);
}
$this->key = 'useragent:'.md5($in_userAgent.$key_flags);
$this->key = 'useragent:'.G::encryptOld($in_userAgent.$key_flags);
}
if ($data = apc_fetch($this->key)) {

22
gulliver/thirdparty/pear/PEAR/Installer.php vendored
View File

@@ -232,8 +232,17 @@ class PEAR_Installer extends PEAR_Common
$fp = fopen($orig_file, "r");
$contents = fread($fp, filesize($orig_file));
fclose($fp);
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
if (isset($atts['md5sum'])) {
$md5sum = md5($contents);
$md5sum = G::encryptOld($contents);
}
$subst_from = $subst_to = array();
foreach ($atts['replacements'] as $a) {
@@ -863,11 +872,20 @@ class PEAR_Installer extends PEAR_Common
if (!function_exists("md5_file")) {
function md5_file($filename) {
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$fp = fopen($filename, "r");
if (!$fp) return null;
$contents = fread($fp, filesize($filename));
fclose($fp);
return md5($contents);
return G::encryptOld($contents);
}
}

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

@@ -53,7 +53,16 @@ class wsdlcache {
* @access private
*/
function createFilename($wsdl) {
return $this->cache_dir.'/wsdlcache-' . md5($wsdl);
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
return $this->cache_dir.'/wsdlcache-' . G::encryptOld($wsdl);
}
/**
@@ -112,15 +121,24 @@ class wsdlcache {
* @access private
*/
function obtainMutex($filename, $mode) {
if (isset($this->fplock[md5($filename)])) {
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
if (isset($this->fplock[G::encryptOld($filename)])) {
$this->debug("Lock for $filename already exists");
return false;
}
$this->fplock[md5($filename)] = fopen($filename.".lock", "w");
if ($mode == "r") {
return flock($this->fplock[md5($filename)], LOCK_SH);
return flock($this->fplock[G::encryptOld($filename)], LOCK_SH);
} else {
return flock($this->fplock[md5($filename)], LOCK_EX);
return flock($this->fplock[G::encryptOld($filename)], LOCK_EX);
}
}

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

@@ -1360,8 +1360,17 @@ class PHPMailer {
public function CreateHeader() {
$result = '';
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
// Set the boundaries
$uniq_id = md5(uniqid(time()));
$uniq_id = G::encryptOld(uniqid(time()));
$this->boundary[1] = 'b1_' . $uniq_id;
$this->boundary[2] = 'b2_' . $uniq_id;
$this->boundary[3] = 'b3_' . $uniq_id;
@@ -1777,6 +1786,15 @@ class PHPMailer {
$mime = array();
$cidUniq = array();
$incl = array();
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
// Add all attachments
foreach ($this->attachment as $attachment) {
@@ -1792,7 +1810,7 @@ class PHPMailer {
$path = $attachment[0];
}
$inclhash = md5(serialize($attachment));
$inclhash = G::encryptOld(serialize($attachment));
if (in_array($inclhash, $incl)) { continue; }
$incl[] = $inclhash;
$filename = $attachment[1];
@@ -2486,6 +2504,15 @@ class PHPMailer {
*/
public function MsgHTML($message, $basedir = '') {
preg_match_all("/(src|background)=[\"'](.*)[\"']/Ui", $message, $images);
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
if(isset($images[2])) {
foreach($images[2] as $i => $url) {
// do not change urls for absolute images (thanks to corvuscorax)
@@ -2495,7 +2522,7 @@ class PHPMailer {
if ($directory == '.') {
$directory = '';
}
$cid = 'cid:' . md5($url);
$cid = 'cid:' . G::encryptOld($url);
$ext = pathinfo($filename, PATHINFO_EXTENSION);
$mimeType = self::_mime_types($ext);
if ( strlen($basedir) > 1 && substr($basedir, -1) != '/') { $basedir .= '/'; }

13
gulliver/thirdparty/propel/om/BaseObject.php vendored
View File

@@ -165,11 +165,20 @@ abstract class BaseObject {
*/
public function hashCode()
{
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$ok = $this->getPrimaryKey();
if ($ok === null) {
return crc32(serialize($this));
return G::encryptCrc32(serialize($this));
}
return crc32(serialize($ok)); // serialize because it could be an array ("ComboKey")
return G::encryptCrc32(serialize($ok)); // serialize because it could be an array ("ComboKey")
}
/**

17
gulliver/thirdparty/propel/util/Criteria.php vendored
View File

@@ -1669,14 +1669,23 @@ class Criterion {
*/
public function hashCode()
{
$h = crc32(serialize($this->value)) ^ crc32($this->comparison);
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
$h = G::encryptCrc32(serialize($this->value)) ^ G::encryptCrc32($this->comparison);
if ($this->table !== null) {
$h ^= crc32($this->table);
$h ^= G::encryptCrc32($this->table);
}
if ($this->column !== null) {
$h ^= crc32($this->column);
$h ^= G::encryptCrc32($this->column);
}
foreach ( $this->clauses as $clause ) {
@@ -1687,7 +1696,7 @@ class Criterion {
$sb = '';
$params = array();
$clause->appendPsTo($sb,$params);
$h ^= crc32(serialize(array($sb,$params)));
$h ^= G::encryptCrc32(serialize(array($sb,$params)));
unset ( $sb, $params );
}

11
gulliver/thirdparty/tcpdf/2dbarcodes.php vendored
View File

@@ -85,6 +85,15 @@ class TCPDF2DBarcode {
* @public
*/
public function getBarcodeSVG($w=3, $h=3, $color='black') {
if(!class_exists('G')){
$realdocuroot = str_replace( '\\', '/', $_SERVER['DOCUMENT_ROOT'] );
$docuroot = explode( '/', $realdocuroot );
array_pop( $docuroot );
$pathhome = implode( '/', $docuroot ) . '/';
array_pop( $docuroot );
$pathTrunk = implode( '/', $docuroot ) . '/';
require_once($pathTrunk.'gulliver/system/class.g.php');
}
// send headers
$code = $this->getBarcodeSVGcode($w, $h, $color);
header('Content-Type: application/svg+xml');
@@ -92,7 +101,7 @@ class TCPDF2DBarcode {
header('Pragma: public');
header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
header('Content-Disposition: inline; filename="'.md5($code).'.svg";');
header('Content-Disposition: inline; filename="'.G::encryptOld($code).'.svg";');
//header('Content-Length: '.strlen($code));
echo $code;
}

5
workflow/engine/classes/class.wsBase.php
View File

@@ -1057,6 +1057,8 @@ class wsBase
$oCriteria->addSelectColumn( AppDelegationPeer::DEL_THREAD );
$oCriteria->addSelectColumn( AppDelegationPeer::DEL_THREAD_STATUS );
$oCriteria->addSelectColumn( AppDelegationPeer::DEL_FINISH_DATE );
$oCriteria->addSelectColumn(AppDelegationPeer::DEL_INIT_DATE);
$oCriteria->addSelectColumn(AppDelegationPeer::DEL_TASK_DUE_DATE);
$oCriteria->add( AppDelegationPeer::APP_UID, $caseId );
$oCriteria->add( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL );
@@ -1096,6 +1098,8 @@ class wsBase
$currentUser->delIndex = $aAppDel['DEL_INDEX'];
$currentUser->delThread = $aAppDel['DEL_THREAD'];
$currentUser->delThreadStatus = $aAppDel['DEL_THREAD_STATUS'];
$currentUser->delInitDate = $aAppDel["DEL_INIT_DATE"];
$currentUser->delTaskDueDate = $aAppDel["DEL_TASK_DUE_DATE"];
$aCurrentUsers[] = $currentUser;
}
@@ -3304,4 +3308,3 @@ class wsBase
}
}
}

15
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -481,6 +481,8 @@ class Cases
$current_task['del_index'] = $current_task['delIndex'];
$current_task['del_thread'] = $current_task['delThread'];
$current_task['del_thread_status'] = $current_task['delThreadStatus'];
$current_task["del_init_date"] = $current_task["delInitDate"] . "";
$current_task["del_task_due_date"] = $current_task["delTaskDueDate"];
unset($current_task['userId']);
unset($current_task['userName']);
unset($current_task['taskId']);
@@ -551,6 +553,8 @@ class Cases
$del = \DBAdapter::getStringDelimiter();
$oCriteria->addSelectColumn( \AppDelegationPeer::DEL_INDEX );
$oCriteria->addSelectColumn( \AppDelegationPeer::TAS_UID );
$oCriteria->addSelectColumn(\AppDelegationPeer::DEL_INIT_DATE);
$oCriteria->addSelectColumn(\AppDelegationPeer::DEL_TASK_DUE_DATE);
$oCriteria->addAsColumn( 'TAS_TITLE', 'C1.CON_VALUE' );
$oCriteria->addAlias( "C1", 'CONTENT' );
$tasTitleConds = array ();
@@ -568,7 +572,9 @@ class Cases
while ($aRow = $oDataset->getRow()) {
$result = array ('tas_uid' => $aRow['TAS_UID'],
'tas_title' => $aRow['TAS_TITLE'],
'del_index' => $aRow['DEL_INDEX']);
'del_index' => $aRow['DEL_INDEX'],
"del_init_date" => $aRow["DEL_INIT_DATE"] . "",
"del_task_due_date" => $aRow["DEL_TASK_DUE_DATE"]);
$oDataset->next();
}
//Return
@@ -811,6 +817,12 @@ class Cases
}
Validator::isInteger($del_index, '$del_index');
$oDelay = new \AppDelay();
if (!$oDelay->isPaused($app_uid, $del_index)) {
throw (new \Exception(\G::LoadTranslation("ID_CASE_NOT_PAUSED", array($app_uid))));
}
$case = new \Cases();
$case->unpauseCase( $app_uid, $del_index, $usr_uid );
}
@@ -2206,4 +2218,3 @@ class Cases
}
}
}

25
workflow/engine/src/ProcessMaker/BusinessModel/User.php
View File

@@ -24,7 +24,6 @@ class User
"USR_STATUS" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array("ACTIVE", "INACTIVE", "VACATION"), "fieldNameAux" => "usrStatus"),
"USR_ROLE" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "usrRole"),
"USR_NEW_PASS" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "usrNewPass"),
"USR_CNF_PASS" => array("type" => "string", "required" => true, "empty" => false, "defaultValues" => array(), "fieldNameAux" => "usrCnfPass"),
"USR_UX" => array("type" => "string", "required" => false, "empty" => false, "defaultValues" => array("NORMAL", "SIMPLIFIED", "SWITCHABLE", "SINGLE"), "fieldNameAux" => "usrUx"),
"DEP_UID" => array("type" => "string", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "depUid"),
"USR_BIRTHDAY" => array("type" => "date", "required" => false, "empty" => true, "defaultValues" => array(), "fieldNameAux" => "usrBirthday"),
@@ -216,14 +215,6 @@ class User
if (isset($arrayData["USR_NEW_PASS"])) {
$this->throwExceptionIfPasswordIsInvalid($arrayData["USR_NEW_PASS"], $this->arrayFieldNameForException["usrNewPass"]);
if (!isset($arrayData["USR_CNF_PASS"])) {
throw new \Exception(\G::LoadTranslation("ID_UNDEFINED_VALUE_IS_REQUIRED", array($this->arrayFieldNameForException["usrCnfPass"])));
}
if ($arrayData["USR_NEW_PASS"] != $arrayData["USR_CNF_PASS"]) {
throw new \Exception($this->arrayFieldNameForException["usrNewPass"] . ", " . $this->arrayFieldNameForException["usrCnfPass"] . ": " . \G::LoadTranslation("ID_NEW_PASS_SAME_OLD_PASS"));
}
}
if (isset($arrayData["USR_REPLACED_BY"]) && $arrayData["USR_REPLACED_BY"] != "") {
@@ -609,13 +600,13 @@ class User
$userProperty = new \UsersProperties();
$aUserProperty = $userProperty->loadOrCreateIfNotExists($userUid, array("USR_PASSWORD_HISTORY" => serialize(array(\Bootstrap::hashPassword($arrayData["USR_PASSWORD"])))));
//$memKey = "rbacSession" . session_id();
//$memcache = & \PMmemcached::getSingleton(defined("SYS_SYS")? SYS_SYS : "");
//
//if (($rbac->aUserInfo = $memcache->get($memKey)) == false) {
// $rbac->loadUserRolePermission("PROCESSMAKER", $userUidLogged);
// $memcache->set($memKey, $rbac->aUserInfo, \PMmemcached::EIGHT_HOURS);
//}
$memKey = "rbacSession" . session_id();
$memcache = & \PMmemcached::getSingleton(defined("SYS_SYS")? SYS_SYS : "");
if (($rbac->aUserInfo = $memcache->get($memKey)) == false) {
$rbac->loadUserRolePermission("PROCESSMAKER", $userUidLogged);
$memcache->set($memKey, $rbac->aUserInfo, \PMmemcached::EIGHT_HOURS);
}
if ($rbac->aUserInfo["PROCESSMAKER"]["ROLE"]["ROL_CODE"] == "PROCESSMAKER_ADMIN") {
$aUserProperty["USR_LAST_UPDATE_DATE"] = date("Y-m-d H:i:s");
@@ -651,7 +642,7 @@ class User
$sDescription = $sDescription . " - " . G::LoadTranslation("PASSWORD_HISTORY") . ": " . PPP_PASSWORD_HISTORY . "\n";
$sDescription = $sDescription . "\n" . G::LoadTranslation("ID_PLEASE_CHANGE_PASSWORD_POLICY") . "";
throw new \Exception($this->arrayFieldNameForException["usrNewPass"] . ", " . $this->arrayFieldNameForException["usrCnfPass"] . ": " . $sDescription);
throw new \Exception($this->arrayFieldNameForException["usrNewPass"] . ": " . $sDescription);
}
if (count($aHistory) >= PPP_PASSWORD_HISTORY) {

3
workflow/engine/src/ProcessMaker/Services/Api/User.php
View File

@@ -75,8 +75,6 @@ class User extends Api
$userLoggedUid = $this->getUserId();
$user = new \ProcessMaker\BusinessModel\User();
$arrayData = $user->update($usr_uid, $request_data, $userLoggedUid);
$response = $arrayData;
return $response;
} catch (\Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
}
@@ -113,4 +111,3 @@ class User extends Api
}
}
}

Some files were not shown because too many files have changed in this diff Show More