Skip to content

Commit 6277775

Browse files
sergejeysergejey
authored
Merge pull request #999 from SmoKE585/alpha
Новый дизайн
2 parents b4a4880 + 9418810 commit 6277775

File tree

7 files changed

+594
-367
lines changed

7 files changed

+594
-367
lines changed

‎modules/blockly_code/blockly_code.class.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ function admin(&$out)
143143
}
144144

145145
$out['CODE_FIELD'] = $this->code_field;
146+
$out['ONLYCODE'] = $this->onlycode;
146147
//Code editor settings
147148
(defined('SETTINGS_CODEEDITOR_AUTOCLOSEQUOTES')) ? $out['SETTINGS_CODEEDITOR_AUTOCLOSEQUOTES'] = SETTINGS_CODEEDITOR_AUTOCLOSEQUOTES : $out['SETTINGS_CODEEDITOR_AUTOCLOSEQUOTES'] = 1;
148149
(defined('SETTINGS_CODEEDITOR_AUTOCLOSEQUOTES')) ? $out['SETTINGS_CODEEDITOR_AUTOCLOSEQUOTES'] = SETTINGS_CODEEDITOR_AUTOCLOSEQUOTES : $out['SETTINGS_CODEEDITOR_AUTOCLOSEQUOTES'] = 1;

‎modules/control_modules/control_modules.class.php

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ function run()
6161
global $mode2;
6262
$rec = SQLSelectOne("SELECT * FROM project_modules WHERE NAME='" . $name . "'");
6363
$rec['NAME'] = $name;
64+
6465
if ($mode2 == "update") {
6566
global $title;
6667
global $category;
@@ -126,7 +127,49 @@ function run()
126127
}
127128
$this->redirect("?");
128129
}
130+
131+
if(preg_match('|<#(.*?)#>|si', $rec['TITLE'], $arr)) {
132+
$rec['TITLE'] = constant($arr[1]);
133+
} else {
134+
$rec['TITLE'] = $rec['TITLE'];
135+
}
136+
129137
outHash($rec, $out);
138+
139+
//Получим конфиг модуля
140+
141+
include_once(DIR_MODULES . $name . '/' . $name . '.class.php');
142+
$module = $name;
143+
$module = new ${module}();
144+
145+
$genConfig = [];
146+
$iter = 0;
147+
148+
foreach($module->getConfig() as $key => $value) {
149+
$genConfig[$iter]['KEY'] = $key;
150+
$genConfig[$iter]['VALUE'] = $value;
151+
$iter++;
152+
}
153+
154+
$out['MODULE_CONFIG'] = $genConfig;
155+
156+
//Выгружаем инфо из коннекта
157+
$marketInfo = file_get_contents("https://connect.smartliving.ru/market/?op=list&search=".urlencode($rec['TITLE']));
158+
$marketInfo = json_decode($marketInfo, TRUE);
159+
$marketInfo = $marketInfo["PLUGINS"][0];
160+
161+
if(is_array($marketInfo)) {
162+
$out['MARKET_ID'] = $marketInfo['ID'];
163+
$out['MARKET_REPOSITORY_URL'] = $marketInfo['REPOSITORY_URL'];
164+
$out['MARKET_AUTHOR'] = $marketInfo['AUTHOR'];
165+
$out['MARKET_SUPPORT_URL'] = $marketInfo['SUPPORT_URL'];
166+
$out['MARKET_DESCRIPTION_RU'] = $marketInfo['DESCRIPTION_RU'];
167+
$out['MARKET_LATEST_VERSION'] = $marketInfo['LATEST_VERSION'];
168+
$out['MARKET_PRICE'] = $marketInfo['PRICE'];
169+
$out['MARKET_URL'] = $marketInfo['URL'];
170+
$out['MARKET_LATEST_VERSION_COMMENT'] = $marketInfo['LATEST_VERSION_COMMENT'];
171+
$out['MARKET_LATEST_VERSION_URL'] = $marketInfo['LATEST_VERSION_URL'];
172+
}
130173
}
131174

132175
if ($mode == 'repository_uninstall') {
@@ -141,7 +184,7 @@ function run()
141184
$lstCnt = count($lst);
142185

143186
for ($i = 0; $i < $lstCnt; $i++) {
144-
$rec = SQLSelectOne("SELECT *, DATE_FORMAT(ADDED, '%M %d, %Y (%H:%i)') AS DAT FROM project_modules WHERE NAME='" . $lst[$i]['FILENAME'] . "'");
187+
$rec = SQLSelectOne("SELECT *, DATE_FORMAT(ADDED, '%d.%m.%Y %H:%i') AS DAT FROM project_modules WHERE NAME='" . $lst[$i]['FILENAME'] . "'");
145188
if (IsSet($rec['ID'])) {
146189
outHash($rec, $lst[$i]);
147190
}

‎modules/pinghosts/pinghosts_edit.inc.php

Lines changed: 40 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
<?php
2-
/*
3-
* @version 0.2 (wizard)
4-
*/
2+
if(defined('SETTINGS_CODEEDITOR_TURNONSETTINGS')) {
3+
$out['SETTINGS_CODEEDITOR_TURNONSETTINGS'] = SETTINGS_CODEEDITOR_TURNONSETTINGS;
4+
$out['SETTINGS_CODEEDITOR_UPTOLINE'] = SETTINGS_CODEEDITOR_UPTOLINE;
5+
$out['SETTINGS_CODEEDITOR_SHOWERROR'] = SETTINGS_CODEEDITOR_SHOWERROR;
6+
}
7+
8+
59
if ($this->owner->name=='panel') {
610
$out['CONTROLPANEL']=1;
711
}
@@ -60,13 +64,22 @@
6064

6165

6266
if ($rec['CODE_ONLINE']!='' && $run_type_online=='code') {
63-
//echo $content;
64-
$errors=php_syntax_error($code_online);
65-
if ($errors) {
66-
$out['ERR_CODE_ONLINE']=1;
67-
$out['ERRORS_ONLINE']=nl2br($errors);
68-
$ok=0;
69-
}
67+
68+
$errors = php_syntax_error($code_online);
69+
if ($errors) {
70+
$out['ERR_LINE_ONLINE'] = preg_replace('/[^0-9]/', '', substr(stristr($errors, 'php on line '), 0, 18))-2;
71+
$out['ERR_CODE_ONLINE'] = 1;
72+
$errorStr = explode('Parse error: ', htmlspecialchars(strip_tags(nl2br($errors))));
73+
$errorStr = explode('Errors parsing', $errorStr[1]);
74+
$errorStr = explode(' in ', $errorStr[0]);
75+
//var_dump($errorStr);
76+
$out['ERRORS_ONLINE'] = $errorStr[0];
77+
$out['ERR_FULL_ONLINE'] = $errorStr[0].' '.$errorStr[1];
78+
$out['ERR_OLD_CODE_ONLINE'] = $old_code;
79+
$out['ERR_CODE_ONLINE']=1;
80+
$out['ERRORS_ONLINE']=nl2br($errors);
81+
$ok=0;
82+
}
7083
}
7184

7285

@@ -81,13 +94,23 @@
8194

8295

8396
if ($rec['CODE_OFFLINE']!='' && $run_type_offline=='code') {
84-
//echo $content;
85-
$errors=php_syntax_error($code_offline);
86-
if ($errors) {
87-
$out['ERR_CODE_OFFLINE']=1;
88-
$out['ERRORS_OFFLINE']=nl2br($errors);
89-
$ok=0;
90-
}
97+
$errors = php_syntax_error($code_offline);
98+
if ($errors) {
99+
$out['ERR_LINE_OFFLINE'] = preg_replace('/[^0-9]/', '', substr(stristr($errors, 'php on line '), 0, 18))-2;
100+
$out['ERR_CODE_OFFLINE'] = 1;
101+
$errorStr = explode('Parse error: ', htmlspecialchars(strip_tags(nl2br($errors))));
102+
$errorStr = explode('Errors parsing', $errorStr[1]);
103+
$errorStr = explode(' in ', $errorStr[0]);
104+
//var_dump($errorStr);
105+
$out['ERRORS_OFFLINE'] = $errorStr[0];
106+
$out['ERR_FULL_OFFLINE'] = $errorStr[0].' '.$errorStr[1];
107+
$out['ERR_OLD_CODE_OFFLINE'] = $old_code;
108+
$out['ERR_CODE_OFFLINE']=1;
109+
$out['ERRORS_OFFLINE']=nl2br($errors);
110+
$ok=0;
111+
}
112+
113+
91114
}
92115

93116

‎templates/blockly_code/blockly_code.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@
1111
}
1212
</script>
1313

14+
[#if ONLYCODE != 1#]
1415
<div style="margin-top: 3px;" id="blockyTypeForCoding">
1516
<#LANG_CODE_TYPE#>:
1617
<input type="radio" name="[#CODE_FIELD#]_code_type" class="[#CODE_FIELD#]_code_type" value="0"[#if CODE_TYPE="0"#] checked[#endif#]> <#LANG_CODE#> <#LANG_HCB#>codePhp<#LANG_HCE#>
1718
<input type="radio" name="[#CODE_FIELD#]_code_type" class="[#CODE_FIELD#]_code_type" value="1"[#if CODE_TYPE="1"#] checked[#endif#]> Blockly<#LANG_HCB#>codeBlockly<#LANG_HCE#>
1819
<input type="radio" name="[#CODE_FIELD#]_code_type" class="[#CODE_FIELD#]_code_type" value="2"[#if CODE_TYPE="2"#] checked[#endif#]> <#LANG_DEVICES#><#LANG_HCB#>codeDevices<#LANG_HCE#>
1920
</div>
21+
[#endif#]
2022

2123
<script language="javascript">
2224

0 commit comments

Comments
 (0)