Merge pull request hestiacp#1 from serghey-rodin/master

sync

Author: Neil

web/api/index.php

@@ -32,6 +32,17 @@
         exit;
     }
 
+    // Define the command to use
+    if (isset($_POST['cmd']))
+    {
+        $cmd = escapeshellarg($_POST['cmd']);
+    } else
+    {
+        // If there's no command, just exit.
+        echo 'No command specified.';
+        exit;
+    }
+    
     // Prepare for iteration
     $args = [];
     $i = 0;

web/edit/file/index.php

@@ -74,7 +74,7 @@
 <input type="submit" name="save" value="Save" class="save" />
 
 
-<textarea name="contents" class="editor" id="editor" rows="4" style="display:none;width: 100%; height: 100%;"><?php echo $content ?></textarea>
+<textarea name="contents" class="editor" id="editor" rows="4" style="display:none;width: 100%; height: 100%;"><?=htmlentities($content)?></textarea>
 
 </form>
 

web/inc/i18n/cn.php

@@ -152,6 +152,7 @@
     'User Directories' => '用户目录',
     'Template' => '模板',
     'Web Template' => 'Web模板',
+    'Backend Template' => '后台模板',
     'Proxy Template' => '代理模板',
     'DNS Template' => 'DNS模板',
     'Web Domains' => '网站域名',
@@ -195,10 +196,10 @@
     'User' => '用户',
     'Host' => '主机',
     'Charset' => '编码',
-    'Min' => '分钟',
-    'Hour' => '小时',
-    'Day' => '天',
-    'Month' => '月',
+    'Min' => '几分',
+    'Hour' => '几点',
+    'Day' => '几号',
+    'Month' => '月份',
     'Day of week' => '星期几',
     'local' => '本地',
     'Run Time' => '运行时间',