Skip to content
This repository was archived by the owner on Sep 6, 2023. It is now read-only.

Commit 45de64a

Browse files
ggrachdevggrachdev
committed
Улучшен код репрезентера
1 parent 0758267 commit 45de64a

File tree

8 files changed

+72
-111
lines changed

8 files changed

+72
-111
lines changed

‎module/ggrachdev.debugbar/assets/DebugBar/images/git/example_for_git.png‎

-191 KB
Binary file not shown.

‎module/ggrachdev.debugbar/classes/general/BitrixDebugger/Configurator/DebuggerConfigurator.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ public function getLogPath(string $typeLog) {
104104
}
105105
}
106106

107+
/**
108+
* Получить разделитель при записи в лог-файл
109+
*
110+
* @return type
111+
*/
107112
public function getLogChunkDelimeter() {
108113
return $this->logChunkDelimeter;
109114
}

‎module/ggrachdev.debugbar/classes/general/BitrixDebugger/Representer/DebugBarRepresenter.php‎

Lines changed: 55 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,35 @@
1111
*/
1212
class DebugBarRepresenter {
1313

14-
public static function render(Debugger $debugger): string {
14+
const SYSTEM_KEYS_LOG = ['POST', 'GET', 'COOKIE', 'BX', 'SERVER'];
1515

16-
global $DBDebug, $APPLICATION;
16+
protected static $leftSlotChunks = [];
17+
protected static $rightSlotChunks = [];
1718

18-
$debugIsOn = false;
19+
public static function addViewInLeftSlot($view) {
20+
self::$leftSlotChunks[] = $view;
21+
}
1922

20-
$bxSettingsDebug = \Bitrix\Main\Config\Configuration::getValue("exception_handling")['debug'];
23+
public static function addViewInRightSlot($view) {
24+
self::$rightSlotChunks[] = $view;
25+
}
2126

22-
$log = $debugger->getLog();
27+
protected static function renderLeftView(): string {
28+
$view = '';
29+
$view .= implode('', self::$leftSlotChunks);
30+
return $view;
31+
}
2332

24-
$view = '<section class="ggrach__overlay" style="display: none;"></section><section class="ggrach__debug_bar">';
33+
protected static function renderRightView(): string {
34+
$view = '<div class="ggrach__debug_bar__right">';
35+
$view .= implode('', self::$rightSlotChunks);
36+
$view .= '</div>';
2537

26-
if ($DBDebug || $bxSettingsDebug) {
27-
$debugIsOn = true;
28-
} else {
29-
$debugIsOn = false;
30-
}
38+
return $view;
39+
}
40+
41+
protected static function getPreparedLog(Debugger $debugger) {
42+
$log = $debugger->getLog();
3143

3244
if (!empty($_GET)) {
3345
$log['GET'] = [
@@ -92,11 +104,27 @@ public static function render(Debugger $debugger): string {
92104
];
93105
}
94106

107+
return $log;
108+
}
109+
110+
public static function render(Debugger $debugger): string {
111+
112+
global $DBDebug, $APPLICATION;
113+
114+
// Включен ли дебаг-режим
115+
$bxSettingsDebug = \Bitrix\Main\Config\Configuration::getValue("exception_handling")['debug'];
116+
117+
if ($DBDebug || $bxSettingsDebug) {
118+
self::addViewInRightSlot('<a target="_blank" href="/bitrix/admin/fileman_file_edit.php?path=/bitrix/.settings.php&full_src=Y" class="ggrach__debug_bar__right__item type-notice-error" title="В битриксе включен дебаг-режим, он замедляет работу сайта!">D</a>');
119+
}
120+
121+
$log = self::getPreparedLog($debugger);
122+
95123
if (!empty($log)) {
96124
foreach ($log as $typeLog => $arLogs) {
97-
$view .= '<div class="ggrach__debug_bar__item type-notice-' . strtolower($typeLog) . '" data-type-notice="' . $typeLog . '" data-click="show_notice_panel">';
125+
$viewLeft = '<div class="ggrach__debug_bar__item type-notice-' . strtolower($typeLog) . '" data-type-notice="' . $typeLog . '" data-click="show_notice_panel">';
98126

99-
if (in_array($typeLog, ['POST', 'GET', 'COOKIE', 'BX', 'SERVER'])) {
127+
if (in_array($typeLog, self::SYSTEM_KEYS_LOG)) {
100128
$count = $typeLog;
101129
} else {
102130

@@ -107,41 +135,41 @@ public static function render(Debugger $debugger): string {
107135
}
108136
}
109137

110-
$view .= $count;
111-
$view .= '</div>';
138+
$viewLeft .= $count;
139+
$viewLeft .= '</div>';
112140

113-
$view .= '<div class="ggrach__debug_bar__log" data-type-notice="' . $typeLog . '" style="display: none;">';
141+
$viewLeft .= '<div class="ggrach__debug_bar__log" data-type-notice="' . $typeLog . '" style="display: none;">';
114142

115143
foreach ($arLogs as $arLogType) {
116144

117145
foreach ($arLogType['data'] as $logValue) {
118-
if (!in_array($typeLog, ['POST', 'GET', 'COOKIE', 'BX', 'SERVER'])) {
146+
if (!in_array($typeLog, self::SYSTEM_KEYS_LOG)) {
119147
$lineView = '<a class="ggrach__debug_bar__log__line" target="_blank" href="/bitrix/admin/fileman_file_edit.php?path=' . str_replace($_SERVER['DOCUMENT_ROOT'], '', $arLogType['file']) . '&full_src=Y">' . $arLogType['file'] . ' on line ' . $arLogType['line'] . '</a>';
120148
} else {
121149
$lineView = '';
122150
}
123151

124-
$needHideBlocks = !(in_array($typeLog, ['POST', 'GET', 'COOKIE', 'BX', 'SERVER']));
152+
$needHideBlocks = !(in_array($typeLog, self::SYSTEM_KEYS_LOG));
125153

126-
$view .= str_replace(['<span style="color: #0000BB">&lt;?</span>', '<span style="color: #0000BB">?&gt;</span>', '&lt;?', '?&gt;', '&lt;?php'], ['', '', '', ''], '<pre>' . \ggrach_highlight_data($logValue, $needHideBlocks) . $lineView . '</pre>');
154+
$viewLeft .= str_replace(['<span style="color: #0000BB">&lt;?</span>', '<span style="color: #0000BB">?&gt;</span>', '&lt;?', '?&gt;', '&lt;?php'], ['', '', '', ''], '<pre>' . \ggrach_highlight_data($logValue, $needHideBlocks) . $lineView . '</pre>');
127155
}
128156
}
129157

130-
$view .= '</div>';
158+
$viewLeft .= '</div>';
159+
160+
self::addViewInLeftSlot($viewLeft);
131161
}
132162
}
133163

134-
$view .= '<div class="ggrach__debug_bar__right">';
164+
self::addViewInRightSlot('<a target="_blank" href="/bitrix/admin/site_edit.php?LID=' . \SITE_ID . '&lang=ru" class="ggrach__debug_bar__right__item type-notice-notice" title="SITE ID - Идентификатор сайта">' . \SITE_ID . '</a>');
135165

136-
$view .= '<a target="_blank" href="/bitrix/admin/site_edit.php?LID=' . \SITE_ID . '&lang=ru" class="ggrach__debug_bar__right__item type-notice-notice" title="SITE ID - Идентификатор сайта">' . \SITE_ID . '</a>';
166+
self::addViewInRightSlot('<a target="_blank" href="/bitrix/admin/site_edit.php?LID=' . \SITE_ID . '&lang=ru" class="ggrach__debug_bar__right__item type-notice-success" title="Текущая страница">' . SITE_CHARSET . '</a>');
137167

138-
$view .= '<a target="_blank" href="/bitrix/admin/site_edit.php?LID=' . \SITE_ID . '&lang=ru" class="ggrach__debug_bar__right__item type-notice-success" title="Текущая страница">' . SITE_CHARSET . '</a>';
168+
$view = '<section class="ggrach__overlay" style="display: none;"></section><section class="ggrach__debug_bar">';
139169

140-
if ($debugIsOn) {
141-
$view .= '<a target="_blank" href="/bitrix/admin/fileman_file_edit.php?path=/bitrix/.settings.php&full_src=Y" class="ggrach__debug_bar__right__item type-notice-error" title="В битриксе включен дебаг-режим, он замедляет работу сайта!">D</a>';
142-
}
170+
$view .= self::renderLeftView();
171+
$view .= self::renderRightView();
143172

144-
$view .= '</div>';
145173
$view .= '</section>';
146174

147175
return $view;

‎module/ggrachdev.debugbar/classes/general/BitrixDebugger/Validator/ShowModeDebuggerValidator.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
use GGrach\BitrixDebugger\Contract\ShowModableContract;
66

77
/**
8-
* Description of ShowModeDebuggerValidator
8+
* Проверка допустимых действий для режимов отображения
99
*
1010
* @author ggrachdev
1111
*/
1212
class ShowModeDebuggerValidator {
1313

14-
public static function needShowInDebugBar(ShowModableContract $debugger) {
15-
return in_array('debug_bar', $debugger->getShowModes());
14+
public static function needShowInDebugBar(ShowModableContract $showModable) {
15+
return in_array('debug_bar', $showModable->getShowModes());
1616
}
1717

18-
public static function needShowInCode(ShowModableContract $debugger) {
18+
public static function needShowInCode(ShowModableContract $showModable) {
1919
global $USER;
20-
return in_array('code', $debugger->getShowModes()) && \is_object($USER) && $USER->IsAdmin();
20+
return in_array('code', $showModable->getShowModes()) && \is_object($USER) && $USER->IsAdmin();
2121
}
2222

2323
}

‎module/ggrachdev.debugbar/classes/general/Writer/FileWriter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use GGrach\Writer\Contract\WritableContract;
66

77
/**
8-
* Description of FileWriter
8+
* Запись данных в файл
99
*
1010
* @author ggrachdev
1111
*/

‎module/ggrachdev.debugbar/initializers/cli.php‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎module/ggrachdev.debugbar/initializers/server.php‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎module/ggrachdev.debugbar/install/index.php‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,18 +90,16 @@ public function reinstallAssets() {
9090

9191
// delete js
9292

93-
$dirJsTo = "/bitrix/js/" . $this->MODULE_ID;
94-
95-
if (!\is_dir($dirJsTo)) {
96-
\DeleteDirFilesEx($dirJsTo);
93+
$dirJs = "/bitrix/js/" . $this->MODULE_ID;
94+
if (!\is_dir($dirJs)) {
95+
\DeleteDirFilesEx($dirJs);
9796
}
9897

9998
// delete css
10099

101-
$dirCssTo = "/bitrix/css/" . $this->MODULE_ID;
102-
103-
if (!\is_dir($dirCssTo)) {
104-
\DeleteDirFilesEx($dirCssTo);
100+
$dirCss = "/bitrix/css/" . $this->MODULE_ID;
101+
if (!\is_dir($dirCss)) {
102+
\DeleteDirFilesEx($dirCss);
105103
}
106104
}
107105

0 commit comments

Comments
 (0)