SuiteCRM/SuiteCRM-Core
2
0
Fork 0
mirror of https://github.com/SuiteCRM/SuiteCRM-Core.git synced 2025-09-13 00:42:08 +08:00
Code Issues Projects Packages Activity Actions

Merge next into suite 8

Browse source 
Merge commit 'de4bf25cb3' into release/8.4.0-beta

# Conflicts:
#	public/legacy/data/SugarBean.php
#	public/legacy/include/Smarty/plugins/function.sugarvar.php
#	public/legacy/include/SugarDateTime.php
#	public/legacy/include/database/MysqliManager.php
#	public/legacy/modules/Alerts/metadata/listviewdefs.php
#	public/legacy/modules/SugarFeed/Dashlets/SugarFeedDashlet/SugarFeedDashlet.php
#	public/legacy/modules/Trackers/metadata/SearchFields.php
#	public/legacy/modules/Trackers/metadata/listviewdefs.php
#	public/legacy/modules/UpgradeWizard/SugarMerge/EditViewMerge.php
#	public/legacy/suitecrm_version.php
This commit is contained in:
Clemente Raposo 2023-07-21 15:22:52 +01:00
commit 5aa0daf046
1656 changed files with 8616 additions and 6081 deletions
Download patch file Download diff file Expand all files Collapse all files

6
public/legacy/modules/Tasks/Dashlets/MyTasksDashlet/MyTasksDashlet.php
View file

@ -48,11 +48,15 @@ if (!defined('sugarEntry') || !sugarEntry) {
require_once('include/Dashlets/DashletGeneric.php');


#[\AllowDynamicProperties]
class MyTasksDashlet extends DashletGeneric
{
public function __construct($id, $def = null)
{
global $current_user, $app_strings;
global $current_user, $app_strings, $dashletData;

$dashletData = $dashletData ?? [];

require('modules/Tasks/Dashlets/MyTasksDashlet/MyTasksDashlet.data.php');

parent::__construct($id, $def);

2
public/legacy/modules/Tasks/Save.php
View file

@ -60,7 +60,7 @@ if (!isset($prefix)) {
global $timedate;
$time_format = $timedate->get_user_time_format();
$time_separator = ":";
if (preg_match('/\d+([^\d])\d+([^\d]*)/s', $time_format, $match)) {
if (preg_match('/\d+([^\d])\d+([^\d]*)/s', (string) $time_format, $match)) {
$time_separator = $match[1];
}


5
public/legacy/modules/Tasks/Task.php
View file

@ -43,6 +43,7 @@ if (!defined('sugarEntry') || !sugarEntry) {


// Task is used to store customer information.
#[\AllowDynamicProperties]
class Task extends SugarBean
{
public $field_name_map;
@ -116,7 +117,7 @@ class Task extends SugarBean
{
$custom_join = $this->getCustomJoin(true, true, $where);
$custom_join['join'] .= $relate_link_join;
$contact_required = stristr($where, "contacts");
$contact_required = stristr((string) $where, "contacts");
if ($contact_required) {
$query = "SELECT tasks.*, contacts.first_name, contacts.last_name, users.user_name as assigned_user_name ";
$query .= $custom_join['select'];
@ -212,7 +213,7 @@ class Task extends SugarBean
$this->parent_name_owner = $row['parent_name_owner'];
$this->parent_name_mod = $this->parent_type;
}
if (is_subclass_of($parent, 'Person') and $row != null) {
if (is_subclass_of($parent, 'Person') && $row != null) {
$this->parent_name = $locale->getLocaleFormattedName(stripslashes($row['first_name']), stripslashes($row['last_name']));
} else {
if (is_subclass_of($parent, 'File') && $row != null) {

9
public/legacy/modules/Tasks/TasksQuickCreate.php
View file

@ -46,6 +46,7 @@ require_once('include/EditView/QuickCreate.php');



#[\AllowDynamicProperties]
class TasksQuickCreate extends QuickCreate
{
public $javascript;
@ -62,20 +63,20 @@ class TasksQuickCreate extends QuickCreate
$this->ss->assign("TIME_FORMAT", '('. $timedate->get_user_time_format().')');
$focus = BeanFactory::newBean('Tasks');
$time_start_hour = (int)substr($focus->time_start, 0, 2);
$time_start_minutes = substr($focus->time_start, 3, 5);
$time_start_hour = (int)substr((string) $focus->time_start, 0, 2);
$time_start_minutes = substr((string) $focus->time_start, 3, 5);
if ($time_start_minutes > 45) {
$time_start_hour += 1;
}

$time_pref = $timedate->get_time_format();
if (strpos($time_pref, 'a')) {
if (strpos((string) $time_pref, 'a')) {
if (!isset($focus->meridiem_am_values)) {
$focus->meridiem_am_values = array('am'=>'am', 'pm'=>'pm');
}
$this->ss->assign("TIME_MERIDIEM", get_select_options_with_id($focus->meridiem_am_values, $time_start_hour < 12 ? 'am' : 'pm'));
} else {
if (strpos($time_pref, 'A')) {
if (strpos((string) $time_pref, 'A')) {
if (!isset($focus->meridiem_AM_values)) {
$focus->meridiem_AM_values = array('AM'=>'AM', 'PM'=>'PM');
}

1
public/legacy/modules/Tasks/views/view.edit.php
View file

@ -43,6 +43,7 @@ if (!defined('sugarEntry') || !sugarEntry) {
*/


#[\AllowDynamicProperties]
class TasksViewEdit extends ViewEdit
{
/**