Skip to content

Commit e340248

Browse files
author
John Mertic
committed
Release 6.2.4
1 parent 8ea6d5b commit e340248

File tree

199 files changed

+4275
-3055
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+4275
-3055
lines changed

‎ModuleInstall/ModuleScanner.php

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,62 @@ class ModuleScanner{
6060

6161
private $validExt = array('png', 'gif', 'jpg', 'css', 'js', 'php', 'txt', 'html', 'htm', 'tpl', 'pdf', 'md5', 'xml');
6262
private $blackList = array(
63+
'popen',
64+
'proc_open',
65+
'escapeshellarg',
66+
'escapeshellcmd',
67+
'proc_close',
68+
'proc_get_status',
69+
'proc_nice',
70+
'basename',
71+
'passthru',
72+
'clearstatcache',
73+
'delete',
74+
'dirname',
75+
'disk_free_space',
76+
'disk_total_space',
77+
'diskfreespace',
78+
'fclose',
79+
'feof',
80+
'fflush',
81+
'fgetc',
82+
'fgetcsv',
83+
'fgets',
84+
'fgetss',
85+
'file_exists',
86+
'file_get_contents',
87+
'filesize',
88+
'filetype',
89+
'flock',
90+
'fnmatch',
91+
'fpassthru',
92+
'fputcsv',
93+
'fputs',
94+
'fread',
95+
'fscanf',
96+
'fseek',
97+
'fstat',
98+
'ftell',
99+
'ftruncate',
100+
'fwrite',
101+
'glob',
102+
'is_dir',
103+
'is_file',
104+
'is_link',
105+
'is_readable',
106+
'is_uploaded_file',
107+
'parse_ini_string',
108+
'pathinfo',
109+
'pclose',
110+
'readfile',
111+
'readlink',
112+
'realpath_cache_get',
113+
'realpath_cache_size',
114+
'realpath',
115+
'rewind',
116+
'set_file_buffer',
117+
'tmpfile',
118+
'umask',
63119
'eval',
64120
'exec',
65121
'system',

‎Zend/Gdata/Docs.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
class Zend_Gdata_Docs extends Zend_Gdata
5858
{
5959

60-
const DOCUMENTS_LIST_FEED_URI = 'http://docs.google.com/feeds/default/private/full';
60+
const DOCUMENTS_LIST_FEED_URI = 'https://docs.google.com/feeds/default/private/full';
6161
const AUTH_SERVICE_NAME = 'writely';
6262
const DEFAULT_MAJOR_PROTOCOL_VERSION = 3;
6363

@@ -174,7 +174,7 @@ public function getDocumentListEntry($location = null)
174174
* @return Zend_Gdata_Docs_DocumentListEntry
175175
*/
176176
public function getResource($resourceId) {
177-
$uri = 'http://docs.google.com/feeds/documents/private/full/' . $resourceId;
177+
$uri = 'https://docs.google.com/feeds/documents/private/full/' . $resourceId;
178178
return $this->getDocumentListEntry($uri);
179179
}
180180

@@ -191,7 +191,7 @@ public function getResource($resourceId) {
191191
* @deprecated Use getResource($resourceId) instead.
192192
*/
193193
public function getDoc($docId, $docType) {
194-
$location = 'http://docs.google.com/feeds/documents/private/full/' .
194+
$location = 'https://docs.google.com/feeds/documents/private/full/' .
195195
$docType . '%3A' . $docId;
196196
return $this->getDocumentListEntry($location);
197197
}

‎Zend/Gdata/Docs/Query.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class Zend_Gdata_Docs_Query extends Zend_Gdata_Query
5151
*
5252
* @var string
5353
*/
54-
const DOCUMENTS_LIST_FEED_URI = 'http://docs.google.com/feeds/default';
54+
const DOCUMENTS_LIST_FEED_URI = 'https://docs.google.com/feeds/default';
5555

5656
/**
5757
* The generic base URL used by some inherited methods

‎cron.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@
9393
///////////////////////////////////////////////////////////////////////////////
9494
//// EXECUTE IF VALID TIME (NOT DDOS)
9595

96-
if($timestamp[0] < strtotime(date('H:i'))) {
96+
// mjamil | bug # 45229 - schedulers not able to run due to current time being equal to
97+
// $timestamp[0]
98+
if($timestamp[0] <= strtotime(date('H:i'))) {
9799
if(is_writable($cachePath.'/'.$pid)) {
98100
write_array_to_file('timestamp', array(strtotime(date('H:i'))) , $cachePath.'/'.$pid);
99101
require('modules/Schedulers/Scheduler.php');

‎data/SugarBean.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4327,8 +4327,9 @@ function mark_deleted($id)
43274327
$this->modified_user_id = 1;
43284328
}
43294329
$query = "UPDATE $this->table_name set deleted=1 , date_modified = '$date_modified', modified_user_id = '$this->modified_user_id' where id='$id'";
4330-
} else
4330+
} else {
43314331
$query = "UPDATE $this->table_name set deleted=1 , date_modified = '$date_modified' where id='$id'";
4332+
}
43324333
$this->db->query($query, true,"Error marking record deleted: ");
43334334
$this->deleted = 1;
43344335
$this->mark_relationships_deleted($id);

‎download.php

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
die("Not a Valid Entry Point");
4343
}
4444
else {
45+
$file_type=''; // bug 45896
4546
ini_set('zlib.output_compression','Off');//bug 27089, if use gzip here, the Content-Length in hearder may be incorrect.
4647
// cn: bug 8753: current_user's preferred export charset not being honored
4748
$GLOBALS['current_user']->retrieve($_SESSION['authenticated_user_id']);
@@ -103,8 +104,15 @@
103104

104105
} // if
105106

106-
$local_location = (isset($_REQUEST['isTempFile'])) ? "{$GLOBALS['sugar_config']['cache_dir']}/modules/Emails/{$_REQUEST['ieId']}/attachments/{$_REQUEST['id']}"
107-
: $GLOBALS['sugar_config']['upload_dir']."/".$_REQUEST['id'];
107+
$local_location = $GLOBALS['sugar_config']['upload_dir']."/".$_REQUEST['id'];
108+
if (isset($_REQUEST['isTempFile']))
109+
{
110+
$local_location = $GLOBALS['sugar_config']['cache_dir'].'/modules/Emails/';
111+
if (isset($_REQUEST['ieId'])) {
112+
$local_location .= $_REQUEST['ieId'].'/';
113+
}
114+
$local_location .= 'attachments/'.$_REQUEST['id'];
115+
}
108116

109117
if(isset($_REQUEST['isTempFile']) && ($_REQUEST['type']=="SugarFieldImage")) {
110118
$local_location = $GLOBALS['sugar_config']['upload_dir']."/".$_REQUEST['id'];
@@ -149,7 +157,11 @@
149157
}
150158
else if(isset($_REQUEST['isTempFile']) && ($_REQUEST['type']=="SugarFieldImage")) {
151159
$download_location = $local_location;
152-
$name = $_REQUEST['tempName'];
160+
$name = '';
161+
if (isset($_REQUEST['tempName']))
162+
{
163+
$name = $_REQUEST['tempName'];
164+
}
153165
}
154166

155167
if(isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/MSIE/", $_SERVER['HTTP_USER_AGENT']))

‎export.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT" );
7171
header("Last-Modified: " . TimeDate::httpTime() );
7272
header("Cache-Control: post-check=0, pre-check=0", false );
73-
header("Content-Length: ".strlen($content));
73+
header("Content-Length: ".mb_strlen($GLOBALS['locale']->translateCharset($content, 'UTF-8', $GLOBALS['locale']->getExportCharset())));
7474

7575
print $GLOBALS['locale']->translateCharset($content, 'UTF-8', $GLOBALS['locale']->getExportCharset());
7676

0 commit comments

Comments
 (0)