Passed
Pull Request — developer (#15456)
by Arkadiusz
20:21
created
app/Components/InterestsConflict.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -294,7 +294,7 @@
 block discarded – undo
294 294
 		if (\App\Cache::has($cacheName, '')) {
295 295
 			return \App\Cache::get($cacheName, '');
296 296
 		}
297
-		$allModules = array_map(function ($v) {
297
+		$allModules = array_map(function($v) {
298 298
 			return 0 > $v ? 999 : sprintf('%03d', $v);
299 299
 		}, array_column(\vtlib\Functions::getAllModules(false, true), 'tabsequence', 'name'));
300 300
 		$excludedModules = ['SMSNotifier', 'ModComments'];
Please login to merge, or discard this patch.
user_privileges/user_privileges_1.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1 1
 <?php
2
-$is_admin=true;
3
-$user_info=['user_name'=>'admin','is_admin'=>'on','user_password'=>'$2y$10$mvy47VqQjd853TpAUr5aE.pd2fSTjBv.Z3G0g8AqyPwPNcV/YtB02','confirm_password'=>'','first_name'=>'','last_name'=>'Administrator','roleid'=>'H2','email1'=>'[email protected]','status'=>'Active','activity_view'=>'This Month','hour_format'=>'24','start_hour'=>'08:00','reports_to_id'=>0,'date_format'=>'yyyy-mm-dd','description'=>'','accesskey'=>'aOFXop10GCJ1uw0P','time_zone'=>'Europe/Sarajevo','currency_id'=>1,'currency_grouping_pattern'=>'123456789','currency_decimal_separator'=>'.','currency_grouping_separator'=>' ','currency_symbol_placement'=>'1.0$','imagename'=>'','internal_mailer'=>1,'theme'=>'twilight','language'=>'pl-PL','reminder_interval'=>'15 Minutes','phone_crm_extension'=>'','no_of_currency_decimals'=>'2','truncate_trailing_zeros'=>1,'dayoftheweek'=>'Monday','othereventduration'=>'[{&quot;activitytype&quot;:&quot;Call&quot;,&quot;duration&quot;:&quot;60&quot;},{&quot;activitytype&quot;:&quot;Meeting&quot;,&quot;duration&quot;:&quot;60&quot;},{&quot;activitytype&quot;:&quot;Task&quot;,&quot;duration&quot;:&quot;60&quot;}]','default_record_view'=>'Summary','leftpanelhide'=>0,'rowheight'=>'medium','defaulteventstatus'=>'PLL_PLANNED','defaultactivitytype'=>'Meeting','is_owner'=>'1','end_hour'=>'23:00','emailoptout'=>1,'available'=>1,'auto_assign'=>0,'view_date_format'=>'PLL_ELAPSED','login_method'=>'PLL_PASSWORD','sync_carddav'=>'PLL_OWNER','sync_caldav'=>'PLL_OWNER','secondary_email'=>'','default_search_operator'=>'PLL_CONTAINS','super_user'=>1,'currency_name'=>'Poland, Zlotych','currency_code'=>'PLN','currency_symbol'=>'zł','conv_rate'=>'1.00000','id'=>1];
4
-return ['details'=>['user_name'=>'admin','is_admin'=>'1','user_password'=>'$2y$10$mvy47VqQjd853TpAUr5aE.pd2fSTjBv.Z3G0g8AqyPwPNcV/YtB02','confirm_password'=>'','first_name'=>'','last_name'=>'Administrator','roleid'=>'H2','email1'=>'[email protected]','status'=>'Active','activity_view'=>'This Month','hour_format'=>'24','start_hour'=>'08:00','reports_to_id'=>0,'date_format'=>'yyyy-mm-dd','description'=>'','accesskey'=>'aOFXop10GCJ1uw0P','time_zone'=>'Europe/Sarajevo','currency_id'=>1,'currency_grouping_pattern'=>'123456789','currency_decimal_separator'=>'.','currency_grouping_separator'=>' ','currency_symbol_placement'=>'1.0$','imagename'=>'','internal_mailer'=>1,'theme'=>'twilight','language'=>'pl-PL','reminder_interval'=>'15 Minutes','phone_crm_extension'=>'','no_of_currency_decimals'=>'2','truncate_trailing_zeros'=>1,'dayoftheweek'=>'Monday','othereventduration'=>'[{"activitytype":"Call","duration":"60"},{"activitytype":"Meeting","duration":"60"},{"activitytype":"Task","duration":"60"}]','default_record_view'=>'Summary','leftpanelhide'=>0,'rowheight'=>'medium','defaulteventstatus'=>'PLL_PLANNED','defaultactivitytype'=>'Meeting','is_owner'=>'1','end_hour'=>'23:00','emailoptout'=>1,'available'=>1,'auto_assign'=>0,'records_limit'=>'','phone_crm_extension_extra'=>'','date_password_change'=>'','force_password_change'=>'','view_date_format'=>'PLL_ELAPSED','authy_methods'=>'','authy_secret_totp'=>'','login_method'=>'PLL_PASSWORD','sync_carddav'=>'PLL_OWNER','sync_caldav'=>'PLL_OWNER','sync_carddav_default_country'=>'','default_search_module'=>'','default_search_override'=>'','primary_phone_extra'=>'','primary_phone'=>'','mail_scanner_actions'=>'','mail_scanner_fields'=>'','secondary_email'=>'','default_search_operator'=>'PLL_CONTAINS','super_user'=>1,'currency_name'=>'Poland, Zlotych','currency_code'=>'PLN','currency_symbol'=>'zł','conv_rate'=>'1.00000','record_id'=>1,'record_module'=>'Users'],'displayName'=>'Administrator','profiles'=>[1],'groups'=>[3],'parent_roles'=>['H1'],'parent_role_seq'=>'H1::H2','roleName'=>'Board of Management','multiCompanyId'=>1,'multiCompanyLogo'=>['name'=>'logo_yetiforce.png','size'=>'3 KB','path'=>'public_html/layouts/resources/Logo/logo_login_page.png','key'=>'11111111111111111111111111111111111111111111111111'],'multiCompanyLogoUrl'=>'file.php?module=MultiCompany&action=Logo&record=1&key=11111111111111111111111111111111111111111111111111'];
2
+$is_admin = true;
3
+$user_info = ['user_name'=>'admin', 'is_admin'=>'on', 'user_password'=>'$2y$10$mvy47VqQjd853TpAUr5aE.pd2fSTjBv.Z3G0g8AqyPwPNcV/YtB02', 'confirm_password'=>'', 'first_name'=>'', 'last_name'=>'Administrator', 'roleid'=>'H2', 'email1'=>'[email protected]', 'status'=>'Active', 'activity_view'=>'This Month', 'hour_format'=>'24', 'start_hour'=>'08:00', 'reports_to_id'=>0, 'date_format'=>'yyyy-mm-dd', 'description'=>'', 'accesskey'=>'aOFXop10GCJ1uw0P', 'time_zone'=>'Europe/Sarajevo', 'currency_id'=>1, 'currency_grouping_pattern'=>'123456789', 'currency_decimal_separator'=>'.', 'currency_grouping_separator'=>' ', 'currency_symbol_placement'=>'1.0$', 'imagename'=>'', 'internal_mailer'=>1, 'theme'=>'twilight', 'language'=>'pl-PL', 'reminder_interval'=>'15 Minutes', 'phone_crm_extension'=>'', 'no_of_currency_decimals'=>'2', 'truncate_trailing_zeros'=>1, 'dayoftheweek'=>'Monday', 'othereventduration'=>'[{&quot;activitytype&quot;:&quot;Call&quot;,&quot;duration&quot;:&quot;60&quot;},{&quot;activitytype&quot;:&quot;Meeting&quot;,&quot;duration&quot;:&quot;60&quot;},{&quot;activitytype&quot;:&quot;Task&quot;,&quot;duration&quot;:&quot;60&quot;}]', 'default_record_view'=>'Summary', 'leftpanelhide'=>0, 'rowheight'=>'medium', 'defaulteventstatus'=>'PLL_PLANNED', 'defaultactivitytype'=>'Meeting', 'is_owner'=>'1', 'end_hour'=>'23:00', 'emailoptout'=>1, 'available'=>1, 'auto_assign'=>0, 'view_date_format'=>'PLL_ELAPSED', 'login_method'=>'PLL_PASSWORD', 'sync_carddav'=>'PLL_OWNER', 'sync_caldav'=>'PLL_OWNER', 'secondary_email'=>'', 'default_search_operator'=>'PLL_CONTAINS', 'super_user'=>1, 'currency_name'=>'Poland, Zlotych', 'currency_code'=>'PLN', 'currency_symbol'=>'zł', 'conv_rate'=>'1.00000', 'id'=>1];
4
+return ['details'=>['user_name'=>'admin', 'is_admin'=>'1', 'user_password'=>'$2y$10$mvy47VqQjd853TpAUr5aE.pd2fSTjBv.Z3G0g8AqyPwPNcV/YtB02', 'confirm_password'=>'', 'first_name'=>'', 'last_name'=>'Administrator', 'roleid'=>'H2', 'email1'=>'[email protected]', 'status'=>'Active', 'activity_view'=>'This Month', 'hour_format'=>'24', 'start_hour'=>'08:00', 'reports_to_id'=>0, 'date_format'=>'yyyy-mm-dd', 'description'=>'', 'accesskey'=>'aOFXop10GCJ1uw0P', 'time_zone'=>'Europe/Sarajevo', 'currency_id'=>1, 'currency_grouping_pattern'=>'123456789', 'currency_decimal_separator'=>'.', 'currency_grouping_separator'=>' ', 'currency_symbol_placement'=>'1.0$', 'imagename'=>'', 'internal_mailer'=>1, 'theme'=>'twilight', 'language'=>'pl-PL', 'reminder_interval'=>'15 Minutes', 'phone_crm_extension'=>'', 'no_of_currency_decimals'=>'2', 'truncate_trailing_zeros'=>1, 'dayoftheweek'=>'Monday', 'othereventduration'=>'[{"activitytype":"Call","duration":"60"},{"activitytype":"Meeting","duration":"60"},{"activitytype":"Task","duration":"60"}]', 'default_record_view'=>'Summary', 'leftpanelhide'=>0, 'rowheight'=>'medium', 'defaulteventstatus'=>'PLL_PLANNED', 'defaultactivitytype'=>'Meeting', 'is_owner'=>'1', 'end_hour'=>'23:00', 'emailoptout'=>1, 'available'=>1, 'auto_assign'=>0, 'records_limit'=>'', 'phone_crm_extension_extra'=>'', 'date_password_change'=>'', 'force_password_change'=>'', 'view_date_format'=>'PLL_ELAPSED', 'authy_methods'=>'', 'authy_secret_totp'=>'', 'login_method'=>'PLL_PASSWORD', 'sync_carddav'=>'PLL_OWNER', 'sync_caldav'=>'PLL_OWNER', 'sync_carddav_default_country'=>'', 'default_search_module'=>'', 'default_search_override'=>'', 'primary_phone_extra'=>'', 'primary_phone'=>'', 'mail_scanner_actions'=>'', 'mail_scanner_fields'=>'', 'secondary_email'=>'', 'default_search_operator'=>'PLL_CONTAINS', 'super_user'=>1, 'currency_name'=>'Poland, Zlotych', 'currency_code'=>'PLN', 'currency_symbol'=>'zł', 'conv_rate'=>'1.00000', 'record_id'=>1, 'record_module'=>'Users'], 'displayName'=>'Administrator', 'profiles'=>[1], 'groups'=>[3], 'parent_roles'=>['H1'], 'parent_role_seq'=>'H1::H2', 'roleName'=>'Board of Management', 'multiCompanyId'=>1, 'multiCompanyLogo'=>['name'=>'logo_yetiforce.png', 'size'=>'3 KB', 'path'=>'public_html/layouts/resources/Logo/logo_login_page.png', 'key'=>'11111111111111111111111111111111111111111111111111'], 'multiCompanyLogoUrl'=>'file.php?module=MultiCompany&action=Logo&record=1&key=11111111111111111111111111111111111111111111111111'];
Please login to merge, or discard this patch.
app/Extension/PwnedPassword/YetiForce.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
 			$url = 'https://passwords.yetiforce.eu/pwned';
41 41
 			\App\Log::beginProfile("POST|YetiForce::check|{$url}", __NAMESPACE__);
42 42
 			$request = (new \GuzzleHttp\Client(\App\RequestHttp::getOptions()))->request('POST', $url,
43
-				['json' => ['sha1' => sha1($password)], 'timeout' => 2,  'http_errors' => false,  'auth' => [$product['params']['login'], $product['params']['pass']], 'headers' => ['InsKey' => \App\YetiForce\Register::getInstanceKey()]]);
43
+				['json' => ['sha1' => sha1($password)], 'timeout' => 2, 'http_errors' => false, 'auth' => [$product['params']['login'], $product['params']['pass']], 'headers' => ['InsKey' => \App\YetiForce\Register::getInstanceKey()]]);
44 44
 			\App\Log::endProfile("POST|YetiForce::check|{$url}", __NAMESPACE__);
45 45
 			if (200 === $request->getStatusCode()) {
46 46
 				$response = \App\Json::decode($request->getBody());
Please login to merge, or discard this patch.
app/Fields/RecordNumber.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@
 block discarded – undo
158 158
 		if ($this->getRecord()) {
159 159
 			$string = \App\TextParser::getInstanceByModel($this->getRecord())->setGlobalPermissions(false)->setContent($string)->parse()->getContent();
160 160
 		}
161
-		return preg_replace_callback('/{{picklist:([a-z0-9_]+)}}/i', function ($matches) {
161
+		return preg_replace_callback('/{{picklist:([a-z0-9_]+)}}/i', function($matches) {
162 162
 			return $this->getRecord() ? $this->getPicklistValue($matches[1]) : $matches[1];
163 163
 		}, $string);
164 164
 	}
Please login to merge, or discard this patch.
modules/PaymentsIn/models/PaymentStatus.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 	{
68 68
 		$changes = false;
69 69
 		$recordModel = \Vtiger_Record_Model::getInstanceById($recordId, static::$moduleName);
70
-		if(!empty(static::$fieldPaymentStatusName)){
70
+		if (!empty(static::$fieldPaymentStatusName)) {
71 71
 			$statusFieldModel = $recordModel->getField(static::$fieldPaymentStatusName);
72 72
 			if ($statusFieldModel && $statusFieldModel->isActiveField()) {
73 73
 				$recordModel->set(
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 				$changes = true;
78 78
 			}
79 79
 		}
80
-		if(!empty(static::$fieldPaymentSumName)){
80
+		if (!empty(static::$fieldPaymentSumName)) {
81 81
 			$sumFieldModel = $recordModel->getField(static::$fieldPaymentSumName);
82 82
 			if ($sumFieldModel && $sumFieldModel->isActiveField()) {
83 83
 				$recordModel->set(
Please login to merge, or discard this patch.
modules/Vtiger/models/EditRecordStructure.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -54,8 +54,7 @@
 block discarded – undo
54 54
 					}
55 55
 				}
56 56
 			}
57
-		}
58
-		++Vtiger_Field_Model::$tabIndexLastSeq;
57
+		}++Vtiger_Field_Model::$tabIndexLastSeq;
59 58
 		return $this->structuredValues = $values;
60 59
 	}
61 60
 }
Please login to merge, or discard this patch.
modules/Users/models/EditRecordStructure.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -54,8 +54,7 @@
 block discarded – undo
54 54
 					}
55 55
 				}
56 56
 			}
57
-		}
58
-		++Vtiger_Field_Model::$tabIndexLastSeq;
57
+		}++Vtiger_Field_Model::$tabIndexLastSeq;
59 58
 		return $this->structuredValues = $values;
60 59
 	}
61 60
 }
Please login to merge, or discard this patch.
modules/Calendar/models/EditRecordStructure.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -54,8 +54,7 @@
 block discarded – undo
54 54
 					}
55 55
 				}
56 56
 			}
57
-		}
58
-		++Vtiger_Field_Model::$tabIndexLastSeq;
57
+		}++Vtiger_Field_Model::$tabIndexLastSeq;
59 58
 		return $this->structuredValues = $values;
60 59
 	}
61 60
 }
Please login to merge, or discard this patch.
modules/Documents/models/EditRecordStructure.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -54,8 +54,7 @@
 block discarded – undo
54 54
 					}
55 55
 				}
56 56
 			}
57
-		}
58
-		++Vtiger_Field_Model::$tabIndexLastSeq;
57
+		}++Vtiger_Field_Model::$tabIndexLastSeq;
59 58
 		return $this->structuredValues = $values;
60 59
 	}
61 60
 }
Please login to merge, or discard this patch.