From 3425f34373969fb8a13e35ae662455a0ebd8e512 Mon Sep 17 00:00:00 2001
From: Dominik Müller <info@profi-webdesign.net>
Date: Sun, 19 Jan 2014 16:08:39 -0500
Subject: [PATCH] writing correction deleted bak-file
---
/dev/null | 205 ---------------------------------------------------
interface/web/admin/lib/lang/cz_system_config.lng | 2
interface/web/admin/lib/lang/de_system_config.lng | 2
3 files changed, 2 insertions(+), 207 deletions(-)
diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng
index aa5960d..d3776ab 100644
--- a/interface/web/admin/lib/lang/cz_system_config.lng
+++ b/interface/web/admin/lib/lang/cz_system_config.lng
@@ -41,7 +41,7 @@
$wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
$wb['vhost_subdomains_txt'] = 'Vytvořit subdomény jako webové stránky';
$wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
-$wb['vhost_aliasbdomains_txt'] = 'Vytvořit aliasdomény jako webové stránky';
+$wb['vhost_aliasdomains_txt'] = 'Vytvořit aliasdomény jako webové stránky';
$wb['vhost_aliasdomains_note_txt'] = 'You cannot disable this as long as vhost aliasdomains exist in the system!';
$wb['phpmyadmin_url_error_regex'] = 'phpmyadmin neplatné URL';
$wb['use_combobox_txt'] = 'Použití jQuery UI Combobox';
diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng
index 1649038..00c421a 100644
--- a/interface/web/admin/lib/lang/de_system_config.lng
+++ b/interface/web/admin/lib/lang/de_system_config.lng
@@ -11,7 +11,7 @@
$wb['ftpuser_prefix_txt'] = 'FTP Benutzer Präfix';
$wb['vhost_subdomains_txt'] = 'Subdomains als Webseite anlegen';
$wb['vhost_subdomains_note_txt'] = 'Diese Einstellung kann nicht wieder deaktiviert werden, wenn Vhost Subdomains im System vorhanden sind!';
-$wb['vhost_aliasbdomains_txt'] = 'Subdomains als Webseite anlegen';
+$wb['vhost_aliasdomains_txt'] = 'Subdomains als Webseite anlegen';
$wb['vhost_aliasdomains_note_txt'] = 'Diese Einstellung kann nicht wieder deaktiviert werden, wenn Vhost Aliasdomains im System vorhanden sind!';
$wb['dbname_prefix_error_regex'] = 'Zeichen nicht erlaubt in Datenbank Namen Präfix.';
$wb['dbuser_prefix_error_regex'] = 'Zeichen nicht erlaubt in Datenbank Benutzer Präfix.';
diff --git a/interface/web/admin/system_config_edit.php.bak b/interface/web/admin/system_config_edit.php.bak
deleted file mode 100644
index 35140b4..0000000
--- a/interface/web/admin/system_config_edit.php.bak
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-/*
-Copyright (c) 2008-2010, Till Brehm, projektfarm Gmbh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of ISPConfig nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$tform_def_file = "form/system_config.tform.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('admin');
-
-// Loading classes
-$app->uses('tpl,tform,tform_actions');
-$app->load('tform_actions');
-
-class page_action extends tform_actions {
-
- //var $_js_changed = false;
-
- function onShowEdit() {
- global $app, $conf;
-
- if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin priveliges');
-
- if($app->tform->errorMessage == '') {
- $app->uses('ini_parser,getconf');
-
- $section = $this->active_tab;
- $server_id = $this->id;
-
- $this->dataRecord = $app->getconf->get_global_config($section);
- if ($section == 'domains'){
- if (isset($this->dataRecord['use_domain_module'])){
- $_SESSION['use_domain_module_old_value'] = $this->dataRecord['use_domain_module'];
- }
- }
- }
-
- $record = $app->tform->getHTML($this->dataRecord, $this->active_tab, 'EDIT');
-
- $record['warning'] = $app->tform->lng('warning');
- $record['id'] = $this->id;
- $app->tpl->setVar($record);
- }
-
- function onShowEnd() {
- global $app, $conf;
-
- // available dashlets
- $available_dashlets_txt = '';
- $handle = @opendir(ISPC_WEB_PATH.'/dashboard/dashlets');
- while ($file = @readdir($handle)) {
- if ($file != '.' && $file != '..' && !is_dir($file)) {
- $available_dashlets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.substr($file, 0, -4).']<pre class="addPlaceholderContent" style="display:none;">['.substr($file, 0, -4).'],</pre></a> ';
- }
- }
-
- if($available_dashlets_txt == '') $available_dashlets_txt = '------';
- $app->tpl->setVar("available_dashlets_txt", $available_dashlets_txt);
-
- parent::onShowEnd();
- }
-
- function onSubmit() {
- global $app;
-
- $app->uses('ini_parser,getconf');
-
- $section = $app->tform->getCurrentTab();
-
- $server_config_array = $app->getconf->get_global_config();
- $new_config = $app->tform->encode($this->dataRecord, $section);
- if($section == 'mail') {
- if($new_config['smtp_pass'] == '') $new_config['smtp_pass'] = $server_config_array['smtp_pass'];
- if($new_config['smtp_enabled'] == 'y' && ($new_config['admin_mail'] == '' || $new_config['admin_name'] == '')) {
- $app->tform->errorMessage .= $app->tform->lng("smtp_missing_admin_mail_txt");
- }
- }
-
- parent::onSubmit();
- }
-
- function onUpdateSave($sql) {
- global $app, $conf;
-
- if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin priveliges');
- $app->uses('ini_parser,getconf');
-
- $section = $app->tform->getCurrentTab();
-
- $server_config_array = $app->getconf->get_global_config();
-
- foreach($app->tform->formDef['tabs'][$section]['fields'] as $key => $field) {
- if ($field['formtype'] == 'CHECKBOX') {
- if($this->dataRecord[$key] == '') {
- // if a checkbox is not set, we set it to the unchecked value
- $this->dataRecord[$key] = $field['value'][0];
- }
- }
- }
-
- /*
- if((isset($this->dataRecord['use_loadindicator']) && $this->dataRecord['use_loadindicator'] != $server_config_array[$section]['use_loadindicator']) || (isset($this->dataRecord['use_combobox']) && $this->dataRecord['use_combobox'] != $server_config_array[$section]['use_combobox'])){
- $this->_js_changed = true;
- }
- */
-
- $new_config = $app->tform->encode($this->dataRecord, $section);
- if($section == 'sites' && $new_config['vhost_subdomains'] != 'y' && $server_config_array['sites']['vhost_subdomains'] == 'y') {
- // check for existing vhost subdomains, if found the mode cannot be disabled
- $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE `type` = 'vhostsubdomain'");
- if($check['cnt'] > 0) {
- $new_config['vhost_subdomains'] = 'y';
- }
- } elseif($section == 'mail') {
- if($new_config['smtp_pass'] == '') $new_config['smtp_pass'] = $server_config_array['mail']['smtp_pass'];
- } elseif($section == 'misc' && $new_config['session_timeout'] != $server_config_array['misc']['session_timeout']) {
- $app->db->query("DELETE FROM sys_config WHERE `config_id` = 2 AND `group` = 'interface' AND `name` = 'session_timeout'");
- $app->db->query("INSERT INTO sys_config (`config_id`, `group`, `name`, `value`) VALUES (2, 'interface', 'session_timeout', '" . intval($new_config['session_timeout']) . "')");
- }
- $server_config_array[$section] = $new_config;
- $server_config_str = $app->ini_parser->get_ini_string($server_config_array);
-
- //$sql = "UPDATE sys_ini SET config = '".$app->db->quote($server_config_str)."' WHERE sysini_id = 1";
- //if($conf['demo_mode'] != true) $app->db->query($sql);
- if($conf['demo_mode'] != true) $app->db->datalogUpdate('sys_ini', "config = '".$app->db->quote($server_config_str)."'", 'sysini_id', 1);
-
- /*
- * If we should use the domain-module, we have to insert all existing domains into the table
- * (only the first time!)
- */
- if (($section == 'domains') &&
- ($_SESSION['use_domain_module_old_value'] == '') &&
- ($server_config_array['domains']['use_domain_module'] == 'y')){
- $sql = "REPLACE INTO domain (sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, domain ) " .
- "SELECT sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, domain " .
- "FROM mail_domain";
- $app->db->query($sql);
- $sql = "REPLACE INTO domain (sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, domain ) " .
- "SELECT sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, domain " .
- "FROM web_domain WHERE type NOT IN ('subdomain','vhostsubdomain')";
- $app->db->query($sql);
- }
-
- // Maintenance mode
- if($server_config_array['misc']['maintenance_mode'] == 'y'){
- //print_r($_SESSION);
- //echo $_SESSION['s']['id'];
- $app->db->query("DELETE FROM sys_session WHERE session_id != '".$app->db->quote($_SESSION['s']['id'])."'");
- }
- }
-
- /*
- function onAfterUpdate() {
- if($this->_js_changed == true) {
- // not the best way, but it works
- header('Content-Type: text/html');
- print '<script type="text/javascript">document.location.reload(true);</script>';
- exit;
- }
- }
- */
-
-}
-
-$app->tform_actions = new page_action;
-$app->tform_actions->onLoad();
-
-
-?>
--
Gitblit v1.9.1