diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 938721782db27737904d5c00fcee309d00e243af..696a7042bde3d19a036f2c74f932ca96ee63610d 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -683,9 +683,6 @@ class installer_base {
if ($verbose){
echo $query ."\n";
}
- if(!$this->dbmaster->query($query, $value['db'] . '.software_update_inst', $value['user'], $host)) {
- $this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
- }
$query = "GRANT SELECT, UPDATE(`updated`) ON ?? TO ?@?";
if ($verbose){
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 02a588cc8826ad63494f344de4df6cf1538b6f2a..7c4c05d8877173dfab1317ef51bb3eb49e3804e5 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -11,3 +11,8 @@ SET SESSION old_alter_table=0;
ALTER TABLE mail_domain ADD COLUMN `relay_host` varchar(255) NOT NULL default '' AFTER `dkim_public`,
ADD COLUMN `relay_user` varchar(255) NOT NULL default '' AFTER `relay_host`,
ADD COLUMN `relay_pass` varchar(255) NOT NULL default '' AFTER `relay_user`;
+-- Purge apps & addons installer (#5795)
+DROP TABLE 'software_package';
+DROP TABLE 'software_repo';
+DROP TABLE 'software_update';
+DROP TABLE 'software_update_inst';
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 587df55382d0046675ddddcb9fb799564ad4e2f9..4c059203d1dcf4cf1fa1b1743a552e8488dc892f 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1467,88 +1467,6 @@ CREATE TABLE `shell_user` (
-- --------------------------------------------------------
---
--- Table structure for table `software_package`
---
-
-CREATE TABLE `software_package` (
- `package_id` int(11) unsigned NOT NULL auto_increment,
- `software_repo_id` int(11) unsigned NOT NULL DEFAULT '0',
- `package_name` varchar(64) NOT NULL DEFAULT '',
- `package_title` varchar(64) NOT NULL DEFAULT '',
- `package_description` text,
- `package_version` varchar(8) default NULL,
- `package_type` enum('ispconfig','app','web') NOT NULL default 'app',
- `package_installable` enum('yes','no','key') NOT NULL default 'yes',
- `package_requires_db` enum('no','mysql') NOT NULL default 'no',
- `package_remote_functions` text,
- `package_key` varchar(255) NOT NULL DEFAULT '',
- `package_config` text,
- PRIMARY KEY (`package_id`),
- UNIQUE KEY `package_name` (`package_name`)
-) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `software_repo`
---
-
-CREATE TABLE `software_repo` (
- `software_repo_id` int(11) unsigned NOT NULL auto_increment,
- `sys_userid` int(11) unsigned NOT NULL default '0',
- `sys_groupid` int(11) unsigned NOT NULL default '0',
- `sys_perm_user` varchar(5) default NULL,
- `sys_perm_group` varchar(5) default NULL,
- `sys_perm_other` varchar(5) default NULL,
- `repo_name` varchar(64) default NULL,
- `repo_url` varchar(255) default NULL,
- `repo_username` varchar(64) default NULL,
- `repo_password` varchar(64) default NULL,
- `active` enum('n','y') NOT NULL default 'y',
- PRIMARY KEY (`software_repo_id`)
-) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `software_update`
---
-
-CREATE TABLE `software_update` (
- `software_update_id` int(11) unsigned NOT NULL auto_increment,
- `software_repo_id` int(11) unsigned NOT NULL DEFAULT '0',
- `package_name` varchar(64) NOT NULL DEFAULT '',
- `update_url` varchar(255) NOT NULL DEFAULT '',
- `update_md5` varchar(255) NOT NULL DEFAULT '',
- `update_dependencies` varchar(255) NOT NULL DEFAULT '',
- `update_title` varchar(64) NOT NULL DEFAULT '',
- `v1` tinyint(1) NOT NULL default '0',
- `v2` tinyint(1) NOT NULL default '0',
- `v3` tinyint(1) NOT NULL default '0',
- `v4` tinyint(1) NOT NULL default '0',
- `type` enum('full','update') NOT NULL default 'full',
- PRIMARY KEY (`software_update_id`)
-) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `software_update_inst`
---
-
-CREATE TABLE `software_update_inst` (
- `software_update_inst_id` int(11) unsigned NOT NULL auto_increment,
- `software_update_id` int(11) unsigned NOT NULL default '0',
- `package_name` varchar(64) NOT NULL DEFAULT '',
- `server_id` int(11) unsigned NOT NULL DEFAULT '0',
- `status` enum('none','installing','installed','deleting','deleted','failed') NOT NULL default 'none',
- PRIMARY KEY (`software_update_inst_id`),
- UNIQUE KEY `software_update_id` (`software_update_id`,`package_name`,`server_id`)
-) DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
-
--- --------------------------------------------------------
-
--
-- Table structure for table `spamfilter_policy`
--
@@ -2534,14 +2452,6 @@ INSERT INTO `help_faq_sections` VALUES (1,'General',0,NULL,NULL,NULL,NULL,NULL);
-- --------------------------------------------------------
---
--- Dumping data for table `software_repo`
---
-
-INSERT INTO `software_repo` (`software_repo_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `repo_name`, `repo_url`, `repo_username`, `repo_password`, `active`) VALUES (1, 1, 1, 'riud', 'riud', '', 'ISPConfig Addons', 'http://repo.ispconfig.org/addons/', '', '', 'n');
-
--- --------------------------------------------------------
-
--
-- Dumping data for table `spamfilter_policy`
--
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 946a3ee50509afc9238c782a65e6ca0fb2e81003..bd5cc8f47fb0206e122361c6d60cb520e2e60bcf 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -33,11 +33,11 @@ if( !empty($_SERVER['DOCUMENT_ROOT']) ) {
Header("Pragma: no-cache");
Header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate");
Header("Content-Type: text/html; charset=utf-8");
-
+
//** Set a few php.ini values
ini_set('register_globals',0);
ini_set('magic_quotes_gpc', 0);
-
+
if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS']) || isset($_REQUEST['s']) || isset($_REQUEST['s_old']) || isset($_REQUEST['conf'])) {
die('Internal Error: var override attempt detected');
exit;
@@ -127,8 +127,8 @@ $conf['init_scripts'] = '/etc/init.d';
$conf['interface_modules_enabled'] = 'dashboard,mail,sites,dns,tools,help';
//** Demo mode
-/* The demo mode is an option to restrict certain actions in the interface like
-* changing the password of users with sys_userid < 3 etc. to be
+/* The demo mode is an option to restrict certain actions in the interface like
+* changing the password of users with sys_userid < 3 etc. to be
* able to run the ISPConfig interface as online demo. It does not
* affect the server part. The demo mode should be always set to false
* on every normal installation
@@ -141,10 +141,6 @@ $conf['log_file'] = $conf['ispconfig_log_dir'].$conf['fs_div'].'ispconfig.log';
$conf['log_priority'] = {ispconfig_log_priority}; // 0 = Debug, 1 = Warning, 2 = Error
-//** Allow software package installations
-$conf['software_updates_enabled'] = false;
-
-
//** Themes
$conf['theme'] = '{theme}';
$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
diff --git a/install/tpl/security_settings.ini.master b/install/tpl/security_settings.ini.master
index c135652e17cf15aa650168c206b44ff3725b3345..02b1058074810b1b9bfde9a173f9fb864093c92c 100644
--- a/install/tpl/security_settings.ini.master
+++ b/install/tpl/security_settings.ini.master
@@ -12,8 +12,6 @@ admin_allow_del_cpuser=superadmin
admin_allow_cpuser_group=superadmin
admin_allow_firewall_config=superadmin
admin_allow_osupdate=superadmin
-admin_allow_software_packages=superadmin
-admin_allow_software_repo=superadmin
remote_api_allowed=yes
password_reset_allowed=yes
session_regenerate_id=yes
@@ -44,4 +42,3 @@ warn_new_admin=yes
warn_passwd_change=no
warn_shadow_change=no
warn_group_change=no
-
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index ccda3717e1ed7a3857e6f23939cb807c54c0b870..c5d14d79cdbdb02d98e2a1129d91871101170258 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -128,10 +128,6 @@ $conf['log_file'] = $conf['ispconfig_log_dir'].'/ispconfig.log';
$conf['log_priority'] = 0; // 0 = Debug, 1 = Warning, 2 = Error
-//** Allow software package installations
-$conf['software_updates_enabled'] = false;
-
-
//** Themes
$conf['theme'] = 'default';
$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
diff --git a/interface/web/admin/form/software_package.tform.php b/interface/web/admin/form/software_package.tform.php
deleted file mode 100644
index 888bc6df1a0966249674670ca96213b8fa4dba2a..0000000000000000000000000000000000000000
--- a/interface/web/admin/form/software_package.tform.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2008, 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.
-*/
-
-/*
- Form Definition
-
- Tabellendefinition
-
- Datentypen:
- - INTEGER (Wandelt Ausdrücke in Int um)
- - DOUBLE
- - CURRENCY (Formatiert Zahlen nach Währungsnotation)
- - VARCHAR (kein weiterer Format Check)
- - TEXT (kein weiterer Format Check)
- - DATE (Datumsformat, Timestamp Umwandlung)
-
- Formtype:
- - TEXT (normales Textfeld)
- - TEXTAREA (normales Textfeld)
- - PASSWORD (Feldinhalt wird nicht angezeigt)
- - SELECT (Gibt Werte als option Feld aus)
- - RADIO
- - CHECKBOX
- - FILE
-
- VALUE:
- - Wert oder Array
-
- Hinweis:
- Das ID-Feld ist nicht bei den Table Values einzufügen.
-
-
-*/
-
-$form["title"] = "Software Package";
-//$form["description"] = "Modify software package details";
-$form["name"] = "software_package";
-$form["action"] = "software_package_edit.php";
-$form["db_table"] = "software_package";
-$form["db_table_idx"] = "package_id";
-$form["db_history"] = "no";
-$form["tab_default"] = "software_package";
-$form["list_default"] = "software_package_list.php";
-$form["auth"] = 'yes';
-
-$form["auth_preset"]["userid"] = 0; // 0 = id of the user, > 0 id must match with id of current user
-$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
-$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
-
-$form["tabs"]['software_package'] = array (
- 'title' => "Software Package",
- 'width' => 80,
- 'template' => "templates/software_package_edit.htm",
- 'fields' => array (
- //#################################
- // Beginn Datenbankfelder
- //#################################
- 'package_title' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'filters' => array(
- 0 => array( 'event' => 'SAVE',
- 'type' => 'STRIPTAGS'),
- 1 => array( 'event' => 'SAVE',
- 'type' => 'STRIPNL')
- ),
- 'validators' => '',
- 'default' => '',
- 'value' => '',
- 'separator' => '',
- 'width' => '40',
- 'maxlength' => '40',
- 'rows' => '',
- 'cols' => ''
- ),
- 'package_key' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'filters' => array(
- 0 => array( 'event' => 'SAVE',
- 'type' => 'STRIPTAGS'),
- 1 => array( 'event' => 'SAVE',
- 'type' => 'STRIPNL')
- ),
- 'validators' => '',
- 'default' => '',
- 'value' => '',
- 'separator' => '',
- 'width' => '40',
- 'maxlength' => '40',
- 'rows' => '',
- 'cols' => ''
- ),
- //#################################
- // ENDE Datenbankfelder
- //#################################
- )
-);
-?>
diff --git a/interface/web/admin/form/software_repo.tform.php b/interface/web/admin/form/software_repo.tform.php
deleted file mode 100644
index 2c208ce216f056c148ec38e9a48fbe6dbe1670aa..0000000000000000000000000000000000000000
--- a/interface/web/admin/form/software_repo.tform.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2008, 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.
-*/
-
-/*
- Form Definition
-
- Tabellendefinition
-
- Datentypen:
- - INTEGER (Wandelt Ausdrücke in Int um)
- - DOUBLE
- - CURRENCY (Formatiert Zahlen nach Währungsnotation)
- - VARCHAR (kein weiterer Format Check)
- - TEXT (kein weiterer Format Check)
- - DATE (Datumsformat, Timestamp Umwandlung)
-
- Formtype:
- - TEXT (normales Textfeld)
- - TEXTAREA (normales Textfeld)
- - PASSWORD (Feldinhalt wird nicht angezeigt)
- - SELECT (Gibt Werte als option Feld aus)
- - RADIO
- - CHECKBOX
- - FILE
-
- VALUE:
- - Wert oder Array
-
- Hinweis:
- Das ID-Feld ist nicht bei den Table Values einzufügen.
-
-
-*/
-
-$form["title"] = "Software Repository";
-//$form["description"] = "Software Repository which may contain addons or updates";
-$form["name"] = "software_repo";
-$form["action"] = "software_repo_edit.php";
-$form["db_table"] = "software_repo";
-$form["db_table_idx"] = "software_repo_id";
-$form["db_history"] = "no";
-$form["tab_default"] = "software_repo";
-$form["list_default"] = "software_repo_list.php";
-$form["auth"] = 'yes';
-
-$form["auth_preset"]["userid"] = 0; // 0 = id of the user, > 0 id must match with id of current user
-$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
-$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
-$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
-
-$form["tabs"]['software_repo'] = array (
- 'title' => "Repository",
- 'width' => 80,
- 'template' => "templates/software_repo_edit.htm",
- 'fields' => array (
- //#################################
- // Beginn Datenbankfelder
- //#################################
- 'repo_name' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'repo_name_empty'),
- 1 => array ( 'type' => 'UNIQUE',
- 'errmsg'=> 'repo_name_unique'),
- ),
- 'filters' => array(
- 0 => array( 'event' => 'SAVE',
- 'type' => 'STRIPTAGS'),
- 1 => array( 'event' => 'SAVE',
- 'type' => 'STRIPNL')
- ),
- 'default' => '',
- 'value' => '',
- 'separator' => '',
- 'width' => '40',
- 'maxlength' => '40',
- 'rows' => '',
- 'cols' => ''
- ),
- 'repo_url' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY',
- 'errmsg'=> 'repo_name_empty'),
- 1 => array ( 'type' => 'UNIQUE',
- 'errmsg'=> 'repo_name_unique'),
- ),
- 'filters' => array(
- 0 => array( 'event' => 'SAVE',
- 'type' => 'STRIPTAGS'),
- 1 => array( 'event' => 'SAVE',
- 'type' => 'STRIPNL')
- ),
- 'default' => '',
- 'value' => '',
- 'separator' => '',
- 'width' => '40',
- 'maxlength' => '40',
- 'rows' => '',
- 'cols' => ''
- ),
- 'repo_username' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'TEXT',
- 'filters' => array(
- 0 => array( 'event' => 'SAVE',
- 'type' => 'STRIPTAGS'),
- 1 => array( 'event' => 'SAVE',
- 'type' => 'STRIPNL')
- ),
- 'default' => '',
- 'value' => '',
- 'separator' => '',
- 'width' => '30',
- 'maxlength' => '30',
- 'rows' => '',
- 'cols' => ''
- ),
- 'repo_password' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'PASSWORD',
- 'encryption' => 'CLEARTEXT',
- 'default' => '',
- 'value' => '',
- 'separator' => '',
- 'width' => '30',
- 'maxlength' => '30',
- 'rows' => '',
- 'cols' => ''
- ),
- 'active' => array (
- 'datatype' => 'VARCHAR',
- 'formtype' => 'CHECKBOX',
- 'default' => 'y',
- 'value' => array(0 => 'n', 1 => 'y')
- ),
- //#################################
- // ENDE Datenbankfelder
- //#################################
- )
-);
-?>
diff --git a/interface/web/admin/lib/lang/ar_software_package.lng b/interface/web/admin/lib/lang/ar_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ar_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/ar_software_package_install.lng b/interface/web/admin/lib/lang/ar_software_package_install.lng
deleted file mode 100644
index 5c8b756434ce27d67e479a96383bbee01bce4f1f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ar_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install software package';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/admin/lib/lang/ar_software_package_list.lng b/interface/web/admin/lib/lang/ar_software_package_list.lng
deleted file mode 100644
index 9fa53867bc70f653a4410da5dc70988beebfdcdb..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ar_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Software packages';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Package';
-$wb['package_description_txt'] = 'Description';
-$wb['action_txt'] = 'Action';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/ar_software_repo.lng b/interface/web/admin/lib/lang/ar_software_repo.lng
deleted file mode 100644
index f2cbbb2c25776ab5f1794e7102ad264a98144049..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ar_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'User (optional)';
-$wb['repo_password_txt'] = 'Password (optional)';
-$wb['active_txt'] = 'Active';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/ar_software_repo_list.lng b/interface/web/admin/lib/lang/ar_software_repo_list.lng
deleted file mode 100644
index b7a219ffa8e2f6d389fabdc5386286a24fc2a11a..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ar_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Active';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/ar_software_update_list.lng b/interface/web/admin/lib/lang/ar_software_update_list.lng
deleted file mode 100644
index fe7639125cd2634fa809d9a6592e9e9fb21e84bb..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ar_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Software updates';
-$wb['server_select_txt'] = 'Select server';
-$wb['installed_txt'] = 'Action';
-$wb['update_title_txt'] = 'Update';
-$wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Action';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/bg_software_package.lng b/interface/web/admin/lib/lang/bg_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/bg_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/bg_software_package_install.lng b/interface/web/admin/lib/lang/bg_software_package_install.lng
deleted file mode 100644
index 0c9bd116c37c4378c7e84b41215accb29e06e68f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/bg_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'ИÑталиране на Ñофтуерни пакети';
-$wb['install_key_txt'] = 'ИнÑталационен ключ';
-$wb['btn_save_txt'] = 'Стартирай инÑталациÑта';
-$wb['btn_cancel_txt'] = 'Отказ';
-?>
diff --git a/interface/web/admin/lib/lang/bg_software_package_list.lng b/interface/web/admin/lib/lang/bg_software_package_list.lng
deleted file mode 100644
index e251c95fbd2a3d9bd3f8d01e883e8111fd489813..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/bg_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Софтуерни пакети';
-$wb['installed_txt'] = 'СтатуÑ';
-$wb['package_title_txt'] = 'Пакет';
-$wb['package_description_txt'] = 'ОпиÑание';
-$wb['action_txt'] = 'ДейÑтвие';
-$wb['toolsarea_head_txt'] = 'Пакети';
-$wb['repoupdate_txt'] = 'ОбновÑване на пакетите ';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/bg_software_repo.lng b/interface/web/admin/lib/lang/bg_software_repo.lng
deleted file mode 100644
index f5156543451cdbd127b34dfed1798a2c6dc5c58c..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/bg_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Потребител (не е задължително)';
-$wb['repo_password_txt'] = 'Парола (не е задължително)';
-$wb['active_txt'] = 'Ðктивен';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/bg_software_repo_list.lng b/interface/web/admin/lib/lang/bg_software_repo_list.lng
deleted file mode 100644
index 6471d706143866e7e1d94c76de6470d85cba5056..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/bg_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Хранилище';
-$wb['active_txt'] = 'Ðктивен';
-$wb['repo_name_txt'] = 'Хранилище';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/bg_software_update_list.lng b/interface/web/admin/lib/lang/bg_software_update_list.lng
deleted file mode 100644
index c7fa6e07f5741e21f04f6c78c5bef8eb8f329210..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/bg_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Ъпдейт на Ñофтуера';
-$wb['installed_txt'] = 'ДейÑтвие';
-$wb['update_title_txt'] = 'Ъпдейт';
-$wb['version_txt'] = 'ВерÑиÑ';
-$wb['action_txt'] = 'ДейÑтвие';
-$wb['server_select_txt'] = 'Избери Ñървър';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/br_software_package.lng b/interface/web/admin/lib/lang/br_software_package.lng
deleted file mode 100644
index d26e1d44509e56ecb7c4c55fda24a45eb4c2ea20..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/br_software_package.lng
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'TÃtulo do pacote';
-$wb['package_key_txt'] = 'Chave do pacote';
-$wb['Software Package'] = 'Pacote de software';
-$wb['Modify software package details'] = 'Modificar detalhes do pacote de software';
diff --git a/interface/web/admin/lib/lang/br_software_package_install.lng b/interface/web/admin/lib/lang/br_software_package_install.lng
deleted file mode 100644
index 77d24f2e153dd746822ca94f298a7b0346eda360..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/br_software_package_install.lng
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$wb['head_txt'] = 'Instalar pacote de software';
-$wb['install_key_txt'] = 'Insira a chave de instalação';
-$wb['btn_save_txt'] = 'Iniciar instalação';
-$wb['btn_cancel_txt'] = 'Cancelar';
diff --git a/interface/web/admin/lib/lang/br_software_package_list.lng b/interface/web/admin/lib/lang/br_software_package_list.lng
deleted file mode 100644
index 5dda114faf2cf335201854fead8adb6fcc48e2c0..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/br_software_package_list.lng
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Pacotes de APPs e complementos';
-$wb['installed_txt'] = 'Estado';
-$wb['package_title_txt'] = 'Pacote';
-$wb['package_description_txt'] = 'Descrição';
-$wb['action_txt'] = 'Ação';
-$wb['toolsarea_head_txt'] = 'Pacotes';
-$wb['repoupdate_txt'] = 'Atualizar lista de pacotes';
-$wb['package_id_txt'] = 'ID local do APP';
-$wb['no_packages_txt'] = 'Nenhum pacote disponÃvel.';
-$wb['edit_txt'] = 'Editar';
-$wb['delete_txt'] = 'Remover';
diff --git a/interface/web/admin/lib/lang/br_software_repo.lng b/interface/web/admin/lib/lang/br_software_repo.lng
deleted file mode 100644
index 13b4a2d87f70b47dbc818761edae15f0957a117d..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/br_software_repo.lng
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repositório';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Usuário (opcional)';
-$wb['repo_password_txt'] = 'Senha (opcional)';
-$wb['active_txt'] = 'Ativo';
-$wb['Software Repository which may contain addons or updates'] = 'Repositório de software pode conter complementos ou atualizações';
diff --git a/interface/web/admin/lib/lang/br_software_repo_list.lng b/interface/web/admin/lib/lang/br_software_repo_list.lng
deleted file mode 100644
index 86886e76714b2b05124d37ea28e871a471fbd1c7..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/br_software_repo_list.lng
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repositório';
-$wb['active_txt'] = 'Ativo';
-$wb['repo_name_txt'] = 'Repositório';
-$wb['repo_url_txt'] = 'URL';
diff --git a/interface/web/admin/lib/lang/br_software_update_list.lng b/interface/web/admin/lib/lang/br_software_update_list.lng
deleted file mode 100644
index 77315b76c4f6d98bc6466c8018d71c84a8a87390..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/br_software_update_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Atualizações de Software';
-$wb['server_select_txt'] = 'Selecionar o servidor';
-$wb['installed_txt'] = 'Ação';
-$wb['update_title_txt'] = 'Atualizar';
-$wb['version_txt'] = 'Versão';
-$wb['action_txt'] = 'Ação';
-$wb['no_updates_txt'] = 'Nenhuma atualização disponÃvel.';
diff --git a/interface/web/admin/lib/lang/ca_software_package.lng b/interface/web/admin/lib/lang/ca_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ca_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/ca_software_package_install.lng b/interface/web/admin/lib/lang/ca_software_package_install.lng
deleted file mode 100644
index 5c8b756434ce27d67e479a96383bbee01bce4f1f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ca_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install software package';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/admin/lib/lang/ca_software_package_list.lng b/interface/web/admin/lib/lang/ca_software_package_list.lng
deleted file mode 100644
index 2909d8376e51f4a801bf99fb0e0a3f191558d2a4..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ca_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Apps & Addon packages';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Package';
-$wb['package_description_txt'] = 'Description';
-$wb['action_txt'] = 'Action';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/ca_software_repo.lng b/interface/web/admin/lib/lang/ca_software_repo.lng
deleted file mode 100644
index f2cbbb2c25776ab5f1794e7102ad264a98144049..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ca_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'User (optional)';
-$wb['repo_password_txt'] = 'Password (optional)';
-$wb['active_txt'] = 'Active';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/ca_software_repo_list.lng b/interface/web/admin/lib/lang/ca_software_repo_list.lng
deleted file mode 100644
index b7a219ffa8e2f6d389fabdc5386286a24fc2a11a..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ca_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Active';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/ca_software_update_list.lng b/interface/web/admin/lib/lang/ca_software_update_list.lng
deleted file mode 100644
index fe7639125cd2634fa809d9a6592e9e9fb21e84bb..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ca_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Software updates';
-$wb['server_select_txt'] = 'Select server';
-$wb['installed_txt'] = 'Action';
-$wb['update_title_txt'] = 'Update';
-$wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Action';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/cz_software_package.lng b/interface/web/admin/lib/lang/cz_software_package.lng
deleted file mode 100644
index d4dc8af0b2cf9168ea900b84d92747fa3e091267..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/cz_software_package.lng
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
diff --git a/interface/web/admin/lib/lang/cz_software_package_install.lng b/interface/web/admin/lib/lang/cz_software_package_install.lng
deleted file mode 100644
index 74837beaff75ef67bbc62d8a195b3f9332c67da7..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/cz_software_package_install.lng
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$wb['head_txt'] = 'Instalace software';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Spustit instalaci';
-$wb['btn_cancel_txt'] = 'Zrušit';
diff --git a/interface/web/admin/lib/lang/cz_software_package_list.lng b/interface/web/admin/lib/lang/cz_software_package_list.lng
deleted file mode 100644
index 433cdcffd0809730e56c4500b49d890e03452746..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/cz_software_package_list.lng
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Softwarov̩ bal̀ky';
-$wb['installed_txt'] = 'Stav';
-$wb['package_title_txt'] = 'BalÃÄek';
-$wb['package_description_txt'] = 'Popis';
-$wb['action_txt'] = 'Akce';
-$wb['toolsarea_head_txt'] = 'BalÃÄky';
-$wb['repoupdate_txt'] = 'Aktualizace seznamu balÃků';
-$wb['package_id_txt'] = 'mÃstnà App-ID';
-$wb['no_packages_txt'] = 'Žádné balÃÄky nejsou k dispozici';
-$wb['edit_txt'] = 'Upravit';
-$wb['delete_txt'] = 'Smazat';
diff --git a/interface/web/admin/lib/lang/cz_software_repo.lng b/interface/web/admin/lib/lang/cz_software_repo.lng
deleted file mode 100644
index beca429d9a376beb6eb1dac0054b826418951ea9..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/cz_software_repo.lng
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Název zdroje';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Uživatel (volitelné)';
-$wb['repo_password_txt'] = 'Heslo (volitelné)';
-$wb['active_txt'] = 'AktivnÃ';
-$wb['Software Repository which may contain addons or updates'] = 'Softwarové zdroje, které mohou obsahovat addony nebo aktualizace';
diff --git a/interface/web/admin/lib/lang/cz_software_repo_list.lng b/interface/web/admin/lib/lang/cz_software_repo_list.lng
deleted file mode 100644
index 8d434ca336ee81b42ed85434ed412eaf8d65e70c..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/cz_software_repo_list.lng
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Zdroje repozitářů';
-$wb['active_txt'] = 'AktivnÃ';
-$wb['repo_name_txt'] = 'Název zdroje';
-$wb['repo_url_txt'] = 'URL';
diff --git a/interface/web/admin/lib/lang/cz_software_update_list.lng b/interface/web/admin/lib/lang/cz_software_update_list.lng
deleted file mode 100644
index 921db7594d7d5b13a2f37915a928507702f91202..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/cz_software_update_list.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Softwarové aktualizace';
-$wb['server_select_txt'] = 'Vybrat server';
-$wb['installed_txt'] = 'Akce';
-$wb['update_title_txt'] = 'Aktualizovat';
-$wb['version_txt'] = 'Verze';
-$wb['action_txt'] = 'Akce';
-$wb['no_updates_txt'] = 'Žádné aktualizace nejsou k dispozici';
diff --git a/interface/web/admin/lib/lang/de_software_package.lng b/interface/web/admin/lib/lang/de_software_package.lng
deleted file mode 100644
index 13b3d996c30489a23bf3c02ab9f2935463bf8e5a..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/de_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Softwarepaket Titel';
-$wb['package_key_txt'] = 'Softwarepaket Schlüssel';
-$wb['Software Package'] = 'Softwarepaket';
-$wb['Modify software package details'] = 'Softwarepaket Einstellungen bearbeiten';
-?>
diff --git a/interface/web/admin/lib/lang/de_software_package_install.lng b/interface/web/admin/lib/lang/de_software_package_install.lng
deleted file mode 100644
index 1ef69d13d32b0fd9cebc50cefc2e3b7b61623513..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/de_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Softwarepaket installieren';
-$wb['install_key_txt'] = 'Installationskey eingeben';
-$wb['btn_save_txt'] = 'Installation starten';
-$wb['btn_cancel_txt'] = 'Abbrechen';
-?>
diff --git a/interface/web/admin/lib/lang/de_software_package_list.lng b/interface/web/admin/lib/lang/de_software_package_list.lng
deleted file mode 100644
index 75b7504390489492a4d84de033807463aaef0540..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/de_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Softwarepakete';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Paket';
-$wb['package_description_txt'] = 'Beschreibung';
-$wb['action_txt'] = 'Aktion';
-$wb['toolsarea_head_txt'] = 'Pakete';
-$wb['repoupdate_txt'] = 'Softwarepakete Liste updaten';
-$wb['package_id_txt'] = 'Lokale App ID';
-$wb['no_packages_txt'] = 'Keine Pakete verfügbar';
-$wb['edit_txt'] = 'Bearbeiten';
-$wb['delete_txt'] = 'Löschen';
-?>
diff --git a/interface/web/admin/lib/lang/de_software_repo.lng b/interface/web/admin/lib/lang/de_software_repo.lng
deleted file mode 100644
index 242611cd08616fc1159c5dca536282ce672098f8..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/de_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Benutzername (optional)';
-$wb['repo_password_txt'] = 'Passwort (optional)';
-$wb['active_txt'] = 'Aktiv';
-$wb['Software Repository which may contain addons or updates'] = 'Software Archiv, das Add-Ons oder Updates enthalten kann';
-?>
diff --git a/interface/web/admin/lib/lang/de_software_repo_list.lng b/interface/web/admin/lib/lang/de_software_repo_list.lng
deleted file mode 100644
index db6f49fd4edd70c55ebc84f05dc84fc704e861ce..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/de_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Aktiv';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/de_software_update_list.lng b/interface/web/admin/lib/lang/de_software_update_list.lng
deleted file mode 100644
index cf31e88154c60bfcdc82fb9b9f778dbbf737eb9b..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/de_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Softwareupdates';
-$wb['server_select_txt'] = 'Server wählen';
-$wb['installed_txt'] = 'Aktion';
-$wb['update_title_txt'] = 'Update';
-$wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Aktion';
-$wb['no_updates_txt'] = 'Keine Updates verfügbar';
-?>
diff --git a/interface/web/admin/lib/lang/dk_software_package.lng b/interface/web/admin/lib/lang/dk_software_package.lng
deleted file mode 100644
index 86f45dc91ef21cd0c1f506379c272d5dc71921e9..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/dk_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Pakke Titel';
-$wb['package_key_txt'] = 'Pakke Nøgle';
-$wb['Software Package'] = 'Software Pakke';
-$wb['Modify software package details'] = 'Ændre software pakke detaljer';
-?>
diff --git a/interface/web/admin/lib/lang/dk_software_package_install.lng b/interface/web/admin/lib/lang/dk_software_package_install.lng
deleted file mode 100644
index fd9211652c73e2f188f48de99b97f2bff8738cee..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/dk_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install software pakke';
-$wb['install_key_txt'] = 'Indtast installations nøgle';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Annullere';
-?>
diff --git a/interface/web/admin/lib/lang/dk_software_package_list.lng b/interface/web/admin/lib/lang/dk_software_package_list.lng
deleted file mode 100644
index 3fb5399eaecb8a650547e99648e532aa95a6ccfa..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/dk_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Apps & Tilføjelses pakker';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Pakke';
-$wb['package_description_txt'] = 'Beskrivelse';
-$wb['action_txt'] = 'Handling';
-$wb['toolsarea_head_txt'] = 'Pakker';
-$wb['repoupdate_txt'] = 'Opdater pakke listen';
-$wb['package_id_txt'] = 'lokal App-ID';
-$wb['no_packages_txt'] = 'Ingen pakker tilgængelig';
-$wb['edit_txt'] = 'Rediger';
-$wb['delete_txt'] = 'Slet';
-?>
diff --git a/interface/web/admin/lib/lang/dk_software_repo.lng b/interface/web/admin/lib/lang/dk_software_repo.lng
deleted file mode 100644
index 2c506cdc6b6d9decbf8dda1827104b17c0aaf6b7..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/dk_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Arkiv';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Bruger (valgfri)';
-$wb['repo_password_txt'] = 'Adgangskode (valgfri)';
-$wb['active_txt'] = 'Aktiv';
-$wb['Software Repository which may contain addons or updates'] = 'Software Arkiv som kan indeholde tilføjelser eller opdateringer';
-?>
diff --git a/interface/web/admin/lib/lang/dk_software_repo_list.lng b/interface/web/admin/lib/lang/dk_software_repo_list.lng
deleted file mode 100644
index aa33919cbd6b8e088b3e5dd5fc9b371b97c405f7..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/dk_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Arkiv';
-$wb['active_txt'] = 'Aktiv';
-$wb['repo_name_txt'] = 'Arkiv';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/dk_software_update_list.lng b/interface/web/admin/lib/lang/dk_software_update_list.lng
deleted file mode 100644
index 8a8e8686af47c83de5cb82922cac2bd30f4709a9..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/dk_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Software opdateringer';
-$wb['server_select_txt'] = 'Vælg server';
-$wb['installed_txt'] = 'Handling';
-$wb['update_title_txt'] = 'Opdater';
-$wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Handling';
-$wb['no_updates_txt'] = 'Ingen opdateringer tilgængelig';
-?>
diff --git a/interface/web/admin/lib/lang/el_software_package.lng b/interface/web/admin/lib/lang/el_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/el_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/el_software_package_install.lng b/interface/web/admin/lib/lang/el_software_package_install.lng
deleted file mode 100644
index 5e3d0fd4022ce48fac39c9379b5de0774c46510b..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/el_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Εγκατάσταση πακÎτου λογισμικοÏ';
-$wb['install_key_txt'] = 'Εισαγωγή ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚';
-$wb['btn_save_txt'] = 'Εκκίνηση εγκατάστασης';
-$wb['btn_cancel_txt'] = 'ΑκÏÏωση';
-?>
diff --git a/interface/web/admin/lib/lang/el_software_package_list.lng b/interface/web/admin/lib/lang/el_software_package_list.lng
deleted file mode 100644
index 1553ea1ceafeca4b43be5bd163c9b3fc47ae9864..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/el_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'ΠακÎτα ΕφαÏμογών & Î Ïόσθετων';
-$wb['installed_txt'] = 'Κατάσταση';
-$wb['package_title_txt'] = 'ΠακÎτο';
-$wb['package_description_txt'] = 'ΠεÏιγÏαφή';
-$wb['action_txt'] = 'ΕνÎÏγεια';
-$wb['toolsarea_head_txt'] = 'ΠακÎτα';
-$wb['repoupdate_txt'] = 'ΕνημÎÏωση λίστας πακκÎτων';
-$wb['package_id_txt'] = 'τοπικό App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/el_software_repo.lng b/interface/web/admin/lib/lang/el_software_repo.lng
deleted file mode 100644
index 3b12d3fd874fd4e1945f6ce2f234e2f3d619ae24..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/el_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'ΑποθετήÏιο';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'ΧÏήστης (Î ÏοαιÏετικό)';
-$wb['repo_password_txt'] = 'Συνθηματικό (Î ÏοαιÏετικό)';
-$wb['active_txt'] = 'ΕνεÏγό';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/el_software_repo_list.lng b/interface/web/admin/lib/lang/el_software_repo_list.lng
deleted file mode 100644
index deb896a719c990ba6df4b00d5114b8dc1ac62f43..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/el_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'ΑποθετήÏιο';
-$wb['active_txt'] = 'ΕνεÏγό';
-$wb['repo_name_txt'] = 'ΑποθετήÏιο';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/el_software_update_list.lng b/interface/web/admin/lib/lang/el_software_update_list.lng
deleted file mode 100644
index 42100d0c8903ad84f65f8f5137feee995b83d3d5..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/el_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Αναβαθμίσεις ΛογισμικοÏ';
-$wb['server_select_txt'] = 'Επιλογή server';
-$wb['installed_txt'] = 'ΕνÎÏγεια';
-$wb['update_title_txt'] = 'ΕνημÎÏωση';
-$wb['version_txt'] = 'Έκδοση';
-$wb['action_txt'] = 'ΕνÎÏγεια';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/en_software_package.lng b/interface/web/admin/lib/lang/en_software_package.lng
deleted file mode 100644
index 5850719890ce87b8f5bc29f3356493f8316e9e85..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/en_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/en_software_package_install.lng b/interface/web/admin/lib/lang/en_software_package_install.lng
deleted file mode 100644
index d6ec373abb7aafe007f477c5f25a957bf521b4a7..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/en_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install software package';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/en_software_package_list.lng b/interface/web/admin/lib/lang/en_software_package_list.lng
deleted file mode 100644
index 2909d8376e51f4a801bf99fb0e0a3f191558d2a4..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/en_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Apps & Addon packages';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Package';
-$wb['package_description_txt'] = 'Description';
-$wb['action_txt'] = 'Action';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/en_software_repo.lng b/interface/web/admin/lib/lang/en_software_repo.lng
deleted file mode 100644
index 38c163507edd0eb8db509aba945cbb813275dabe..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/en_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'User (optional)';
-$wb['repo_password_txt'] = 'Password (optional)';
-$wb['active_txt'] = 'Active';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/en_software_repo_list.lng b/interface/web/admin/lib/lang/en_software_repo_list.lng
deleted file mode 100644
index 15b16e2d5b59473324eff98853281749bedf5b3d..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/en_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Active';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/en_software_update_list.lng b/interface/web/admin/lib/lang/en_software_update_list.lng
deleted file mode 100644
index fe7639125cd2634fa809d9a6592e9e9fb21e84bb..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/en_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Software updates';
-$wb['server_select_txt'] = 'Select server';
-$wb['installed_txt'] = 'Action';
-$wb['update_title_txt'] = 'Update';
-$wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Action';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/es_software_package.lng b/interface/web/admin/lib/lang/es_software_package.lng
deleted file mode 100644
index af80e4a47930c8e36e56eb77562ad336903dfed2..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/es_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['Modify software package details'] = 'Modificar los detalles del paquete de aplicación';
-$wb['package_key_txt'] = 'Clave del paquete';
-$wb['package_title_txt'] = 'TÃtulo del paquete';
-$wb['Software Package'] = 'Paquete de aplicación';
-?>
diff --git a/interface/web/admin/lib/lang/es_software_package_install.lng b/interface/web/admin/lib/lang/es_software_package_install.lng
deleted file mode 100644
index 838af344ecf3247fb4f49d96bd3a405d79edd36e..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/es_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['btn_cancel_txt'] = 'Cancelar';
-$wb['btn_save_txt'] = 'Iniciar instalación';
-$wb['head_txt'] = 'Instalar paquete de aplicación';
-$wb['install_key_txt'] = 'Ingrese la clave de instalación';
-?>
diff --git a/interface/web/admin/lib/lang/es_software_package_list.lng b/interface/web/admin/lib/lang/es_software_package_list.lng
deleted file mode 100644
index c1837c7a8248a5dd8649e64d431253967cab659e..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/es_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['action_txt'] = 'Acción';
-$wb['delete_txt'] = 'Borrar';
-$wb['edit_txt'] = 'Editar';
-$wb['installed_txt'] = 'Estado';
-$wb['list_head_txt'] = 'Apps & paquetes adicionales';
-$wb['no_packages_txt'] = 'No hay paquetes disponibles';
-$wb['package_description_txt'] = 'Descripción';
-$wb['package_id_txt'] = 'ID local de App';
-$wb['package_title_txt'] = 'Paquete';
-$wb['repoupdate_txt'] = 'Actualizar lista de paquetes';
-$wb['toolsarea_head_txt'] = 'Paquetes';
-?>
diff --git a/interface/web/admin/lib/lang/es_software_repo.lng b/interface/web/admin/lib/lang/es_software_repo.lng
deleted file mode 100644
index 26382bd50330f5dd9646ac1a61b8ad39d85543dd..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/es_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['active_txt'] = 'Habilitado';
-$wb['repo_name_txt'] = 'Repositorio';
-$wb['repo_password_txt'] = 'Contraseña (opcional)';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Usuario (opcional)';
-$wb['Software Repository which may contain addons or updates'] = 'Repositorio de aplicaciones que puede contener complementos o actualizaciones';
-?>
diff --git a/interface/web/admin/lib/lang/es_software_repo_list.lng b/interface/web/admin/lib/lang/es_software_repo_list.lng
deleted file mode 100644
index f6a624bd7d93b26e788f1d45d9d61270691a41aa..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/es_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['active_txt'] = 'Habilitado';
-$wb['list_head_txt'] = 'Repositorio';
-$wb['repo_name_txt'] = 'Repositorio';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/es_software_update_list.lng b/interface/web/admin/lib/lang/es_software_update_list.lng
deleted file mode 100644
index 827c60e2999d9449e066a37dc09d1e0998ca7111..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/es_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['action_txt'] = 'Acción';
-$wb['installed_txt'] = 'Acción';
-$wb['list_head_txt'] = 'Actualizaciones de aplicaciones';
-$wb['no_updates_txt'] = 'No hay actualizaciones';
-$wb['server_select_txt'] = 'Seleccionar servidor';
-$wb['update_title_txt'] = 'Actualizar';
-$wb['version_txt'] = 'Versión';
-?>
diff --git a/interface/web/admin/lib/lang/fi_software_package.lng b/interface/web/admin/lib/lang/fi_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fi_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/fi_software_package_install.lng b/interface/web/admin/lib/lang/fi_software_package_install.lng
deleted file mode 100644
index 5c8b756434ce27d67e479a96383bbee01bce4f1f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fi_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install software package';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/admin/lib/lang/fi_software_package_list.lng b/interface/web/admin/lib/lang/fi_software_package_list.lng
deleted file mode 100644
index 87a9e193b5af46ab72dd14323f5d181e74e9907a..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fi_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Ohjelmapaketit';
-$wb['installed_txt'] = 'Ohjelmapaketin tila';
-$wb['package_title_txt'] = 'Ohjelmapaketti';
-$wb['package_description_txt'] = 'Ohjelmapaketin kuvaus';
-$wb['action_txt'] = 'Toiminto';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/fi_software_repo.lng b/interface/web/admin/lib/lang/fi_software_repo.lng
deleted file mode 100644
index f875f428b61f390155ef162d7e27f404328627b2..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fi_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Ohjelmapakettien varasto';
-$wb['repo_url_txt'] = 'Varaston internetosoite';
-$wb['repo_username_txt'] = 'Käyttäjätunnus (valinnainen)';
-$wb['repo_password_txt'] = 'Salasana (valinnnainen)';
-$wb['active_txt'] = 'Käytössä';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/fi_software_repo_list.lng b/interface/web/admin/lib/lang/fi_software_repo_list.lng
deleted file mode 100644
index bde844c99f8d8ea61c5e7b4b1dd98c831ae57a92..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fi_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Ohjelmapakettien varastot';
-$wb['active_txt'] = 'Käytössä';
-$wb['repo_name_txt'] = 'Ohjelmapakettien varasto';
-$wb['repo_url_txt'] = 'Ohjelmapakettien varaston osoite';
-?>
diff --git a/interface/web/admin/lib/lang/fi_software_update_list.lng b/interface/web/admin/lib/lang/fi_software_update_list.lng
deleted file mode 100644
index 7871958353e51a7265e5910c7273e825a04ddb76..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fi_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Ohjelmapäivitykset';
-$wb['installed_txt'] = 'Toiminto';
-$wb['update_title_txt'] = 'Päivitä';
-$wb['version_txt'] = 'Versio';
-$wb['action_txt'] = 'Toiminto';
-$wb['server_select_txt'] = 'Valitse palvelin';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/fr_software_package.lng b/interface/web/admin/lib/lang/fr_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fr_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/fr_software_package_install.lng b/interface/web/admin/lib/lang/fr_software_package_install.lng
deleted file mode 100644
index 39f643d3e65cc933abfe042042a4b4c333629590..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fr_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Installer un paquet logiciel';
-$wb['install_key_txt'] = 'Entrez la clef dinstallation';
-$wb['btn_save_txt'] = 'Démarrer linstallation';
-$wb['btn_cancel_txt'] = 'Annuler';
-?>
diff --git a/interface/web/admin/lib/lang/fr_software_package_list.lng b/interface/web/admin/lib/lang/fr_software_package_list.lng
deleted file mode 100644
index 405b9e296fb191f3b337bf4f54ee0a8213748d4a..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fr_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Paquets de logiciels';
-$wb['installed_txt'] = 'Statut';
-$wb['package_title_txt'] = 'Paquet';
-$wb['package_description_txt'] = 'Description';
-$wb['action_txt'] = 'Action';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Mettre à jour la liste des paquets';
-$wb['package_id_txt'] = 'App-ID locale';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/fr_software_repo.lng b/interface/web/admin/lib/lang/fr_software_repo.lng
deleted file mode 100644
index f65c955d52d18927304af8fd78f1148091496408..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fr_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Référence';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Utilisateur (optionnel)';
-$wb['repo_password_txt'] = 'Mot de passe (optionnel)';
-$wb['active_txt'] = 'Actif';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/fr_software_repo_list.lng b/interface/web/admin/lib/lang/fr_software_repo_list.lng
deleted file mode 100644
index 56749896bb0bf5c6b876cc1646a07ee273380656..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fr_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Référence';
-$wb['active_txt'] = 'Actif';
-$wb['repo_name_txt'] = 'Référence';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/fr_software_update_list.lng b/interface/web/admin/lib/lang/fr_software_update_list.lng
deleted file mode 100644
index 8fb67a03104596fa99c9e79560ccab14b00f50cb..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/fr_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Mise à jour des logiciels';
-$wb['installed_txt'] = 'Action';
-$wb['update_title_txt'] = 'Mise à jour';
-$wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Action';
-$wb['server_select_txt'] = 'Sélectionnez le serveur';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/hr_software_package.lng b/interface/web/admin/lib/lang/hr_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hr_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/hr_software_package_install.lng b/interface/web/admin/lib/lang/hr_software_package_install.lng
deleted file mode 100644
index 22d7e0ce7a68bb864877ecaa7274034f9dc970bb..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hr_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Instaliraj softverski paket';
-$wb['install_key_txt'] = 'Unesi instalacijski kljuÄ';
-$wb['btn_save_txt'] = 'Pokreni instalaciju';
-$wb['btn_cancel_txt'] = 'Odustani';
-?>
diff --git a/interface/web/admin/lib/lang/hr_software_package_list.lng b/interface/web/admin/lib/lang/hr_software_package_list.lng
deleted file mode 100644
index 3722c5cff47ab2f4fc138fe036a087aa8226de13..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hr_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aplikacije i dodatni paketi';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Paketi';
-$wb['package_description_txt'] = 'Opis';
-$wb['action_txt'] = 'Akcija';
-$wb['toolsarea_head_txt'] = 'Paketi';
-$wb['repoupdate_txt'] = 'Osvježi listu paketa';
-$wb['package_id_txt'] = 'lokalni App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/hr_software_repo.lng b/interface/web/admin/lib/lang/hr_software_repo.lng
deleted file mode 100644
index bbfb2e2db29084c137cfd29804fc6be4ea2960ca..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hr_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repozitoriji';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'KorisniÄko ime (opcionalno)';
-$wb['repo_password_txt'] = 'Å ifra (opcionalno)';
-$wb['active_txt'] = 'Aktivno';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/hr_software_repo_list.lng b/interface/web/admin/lib/lang/hr_software_repo_list.lng
deleted file mode 100644
index b79045bd76e8c2bdd363617f56efde702ebf5c92..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hr_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repozitorij';
-$wb['active_txt'] = 'Aktivno';
-$wb['repo_name_txt'] = 'Repozitorij';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/hr_software_update_list.lng b/interface/web/admin/lib/lang/hr_software_update_list.lng
deleted file mode 100644
index 2250a186a33ca4e7cfa2f2882b9100047aed4a9b..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hr_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Softverske nadogradnje';
-$wb['server_select_txt'] = 'Izaberi server';
-$wb['installed_txt'] = 'Akcija';
-$wb['update_title_txt'] = 'Nadogradi';
-$wb['version_txt'] = 'Verzija';
-$wb['action_txt'] = 'Akcija';
-$wb['no_updates_txt'] = 'Nema nadogradnji';
-?>
diff --git a/interface/web/admin/lib/lang/hu_software_package.lng b/interface/web/admin/lib/lang/hu_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hu_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/hu_software_package_install.lng b/interface/web/admin/lib/lang/hu_software_package_install.lng
deleted file mode 100644
index 6dc8be3f899c18a4a3796440fccbd743a203d51e..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hu_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Szoftvercsomag telepÃtése';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Mégsem';
-?>
diff --git a/interface/web/admin/lib/lang/hu_software_package_list.lng b/interface/web/admin/lib/lang/hu_software_package_list.lng
deleted file mode 100644
index 430583ce8a807b7741947c3a561baa6ef165b74d..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hu_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Szoftver csomag';
-$wb['installed_txt'] = 'Ãllapot';
-$wb['package_title_txt'] = 'Csomag';
-$wb['package_description_txt'] = 'LeÃrás';
-$wb['action_txt'] = 'Művelet';
-$wb['toolsarea_head_txt'] = 'Csomagok';
-$wb['repoupdate_txt'] = 'Csomaglista frissÃtése';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/hu_software_repo.lng b/interface/web/admin/lib/lang/hu_software_repo.lng
deleted file mode 100644
index 3c578e3694e64e0bb61e2042a7af189fbb633b8b..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hu_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'CÃm';
-$wb['repo_username_txt'] = 'Felhasználó (opcionális)';
-$wb['repo_password_txt'] = 'Jelszó (opcionális)';
-$wb['active_txt'] = 'AktÃv';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/hu_software_repo_list.lng b/interface/web/admin/lib/lang/hu_software_repo_list.lng
deleted file mode 100644
index f5e7aabcb2dd935dc28ee9649aa2e33e85356a04..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hu_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'AktÃv';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'CÃm';
-?>
diff --git a/interface/web/admin/lib/lang/hu_software_update_list.lng b/interface/web/admin/lib/lang/hu_software_update_list.lng
deleted file mode 100644
index c2edc83217d879d6cfc829de25c24afb3a1964ef..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/hu_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Szoftver frissÃtések';
-$wb['installed_txt'] = 'Művelet';
-$wb['update_title_txt'] = 'FrissÃtés';
-$wb['version_txt'] = 'Verzió';
-$wb['action_txt'] = 'Művelet';
-$wb['server_select_txt'] = 'Válasszon szervert';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/id_software_package.lng b/interface/web/admin/lib/lang/id_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/id_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/id_software_package_install.lng b/interface/web/admin/lib/lang/id_software_package_install.lng
deleted file mode 100644
index 9e966893caefed15e144571afc07f91705df52ea..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/id_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Pasang paket perangkat lunak';
-$wb['install_key_txt'] = 'Masukkan kunci pemasangan';
-$wb['btn_save_txt'] = 'Mulai Pemasangan';
-$wb['btn_cancel_txt'] = 'Batal';
-?>
diff --git a/interface/web/admin/lib/lang/id_software_package_list.lng b/interface/web/admin/lib/lang/id_software_package_list.lng
deleted file mode 100644
index 02642be6e2c75183a8a08800207bf82f36424fb5..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/id_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Paket-paket Perangkat Lunak';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Paket';
-$wb['package_description_txt'] = 'Keterangan';
-$wb['action_txt'] = 'Aktif';
-$wb['toolsarea_head_txt'] = 'Paket';
-$wb['repoupdate_txt'] = 'Mutakhirkan daftar paket';
-$wb['package_id_txt'] = 'App-ID lokal';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/id_software_repo.lng b/interface/web/admin/lib/lang/id_software_repo.lng
deleted file mode 100644
index 1c3b0305b4f25e5b09952507b4eb9c200dbc71bd..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/id_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repositori';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Pengguna (opsional)';
-$wb['repo_password_txt'] = 'Sandi (opsional)';
-$wb['active_txt'] = 'Aktif';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/id_software_repo_list.lng b/interface/web/admin/lib/lang/id_software_repo_list.lng
deleted file mode 100644
index 63444907f31569d6926313329d15939bf2b9979c..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/id_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repositori';
-$wb['active_txt'] = 'Aktif';
-$wb['repo_name_txt'] = 'Repositori';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/id_software_update_list.lng b/interface/web/admin/lib/lang/id_software_update_list.lng
deleted file mode 100644
index f789a0e72c472d55b27e254771c57d98bfcae3fd..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/id_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Pemutakhiran Perangkat Lunak';
-$wb['server_select_txt'] = 'Pilih server';
-$wb['installed_txt'] = 'Tindakan';
-$wb['update_title_txt'] = 'Mutakhirkan';
-$wb['version_txt'] = 'Versi';
-$wb['action_txt'] = 'Tindakan';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/it_software_package.lng b/interface/web/admin/lib/lang/it_software_package.lng
deleted file mode 100644
index d2e123cf85abc3c9fce3de2d5b6f3d5fa3c85459..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/it_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Titolo pacchetto';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Pacchetto Software';
-$wb['Modify software package details'] = 'Modifica dettagli pacchetto software';
-?>
diff --git a/interface/web/admin/lib/lang/it_software_package_install.lng b/interface/web/admin/lib/lang/it_software_package_install.lng
deleted file mode 100644
index 1e210d58940cd0a352afaf9ff1d0f81697b8540e..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/it_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Installa pacchetto software';
-$wb['install_key_txt'] = 'Inserisci chiave pacchetto';
-$wb['btn_save_txt'] = 'Avvia installazione';
-$wb['btn_cancel_txt'] = 'Annulla';
-?>
diff --git a/interface/web/admin/lib/lang/it_software_package_list.lng b/interface/web/admin/lib/lang/it_software_package_list.lng
deleted file mode 100644
index 5ab82417de404318600984e7ac4d732fcb130840..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/it_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Pacchetti Software';
-$wb['installed_txt'] = 'Stato';
-$wb['package_title_txt'] = 'Pacchetto';
-$wb['package_description_txt'] = 'Descrizione';
-$wb['action_txt'] = 'Action';
-$wb['toolsarea_head_txt'] = 'Pacchetti';
-$wb['repoupdate_txt'] = 'Aggiorna elenco pacchetti';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'Nessun pacchetto disponibile';
-$wb['edit_txt'] = 'Modifica';
-$wb['delete_txt'] = 'Elimina';
-?>
diff --git a/interface/web/admin/lib/lang/it_software_repo.lng b/interface/web/admin/lib/lang/it_software_repo.lng
deleted file mode 100644
index 76b01826971d75f28c53c52dbbed40f3587a7fdd..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/it_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Utente (facoltativo)';
-$wb['repo_password_txt'] = 'Password (facoltativa)';
-$wb['active_txt'] = 'Attivo';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository che può contenere aggiunte o aggiornamenti';
-?>
diff --git a/interface/web/admin/lib/lang/it_software_repo_list.lng b/interface/web/admin/lib/lang/it_software_repo_list.lng
deleted file mode 100644
index 4db52118ec6bd564032ac437355c68aa5e17cf78..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/it_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Attivo';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'Indirizzo';
-?>
diff --git a/interface/web/admin/lib/lang/it_software_update_list.lng b/interface/web/admin/lib/lang/it_software_update_list.lng
deleted file mode 100644
index cc264b84eccbc926ccc68ca4b553548ad9eaf764..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/it_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aggiornamento programmi';
-$wb['installed_txt'] = 'Azione';
-$wb['update_title_txt'] = 'Aggiornamento';
-$wb['version_txt'] = 'Versione';
-$wb['action_txt'] = 'Azione';
-$wb['server_select_txt'] = 'Selezionare server';
-$wb['no_updates_txt'] = 'Nessun aggiornamento disponibile';
-?>
diff --git a/interface/web/admin/lib/lang/ja_software_package.lng b/interface/web/admin/lib/lang/ja_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ja_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/ja_software_package_install.lng b/interface/web/admin/lib/lang/ja_software_package_install.lng
deleted file mode 100644
index 5c8b756434ce27d67e479a96383bbee01bce4f1f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ja_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install software package';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/admin/lib/lang/ja_software_package_list.lng b/interface/web/admin/lib/lang/ja_software_package_list.lng
deleted file mode 100644
index e5352e91e7cf91fe7472f0797853dc7d9b77c1d9..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ja_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'ソフトウェアパッケージ';
-$wb['installed_txt'] = '状態';
-$wb['package_title_txt'] = 'パッケージ';
-$wb['package_description_txt'] = '説明';
-$wb['action_txt'] = 'æ“作';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/ja_software_repo.lng b/interface/web/admin/lib/lang/ja_software_repo.lng
deleted file mode 100644
index c95399a54ebba86be6c0d10e24e1bdecb0f737cb..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ja_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'リãƒã‚¸ãƒˆãƒªãƒ¼';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'ユーザー（必è¦ãŒã‚ã‚Œã°ï¼‰';
-$wb['repo_password_txt'] = 'パスワード（必è¦ãŒã‚ã‚Œã°ï¼‰';
-$wb['active_txt'] = '有効';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/ja_software_repo_list.lng b/interface/web/admin/lib/lang/ja_software_repo_list.lng
deleted file mode 100644
index a7d06d8fdec5616b64fbd9e572d0d37b11b0a337..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ja_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'リãƒã‚¸ãƒˆãƒªãƒ¼';
-$wb['active_txt'] = '有効';
-$wb['repo_name_txt'] = 'リãƒã‚¸ãƒˆãƒªãƒ¼';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/ja_software_update_list.lng b/interface/web/admin/lib/lang/ja_software_update_list.lng
deleted file mode 100644
index f0ecf5711bfbe603072a559a54073ea008303770..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ja_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'ソフトウェアã®æ›´æ–°';
-$wb['server_select_txt'] = 'サーãƒãƒ¼ã‚’é¸æŠžã—ã¦ãã ã•ã„';
-$wb['installed_txt'] = 'æ“作';
-$wb['update_title_txt'] = 'æ›´æ–°';
-$wb['version_txt'] = 'ãƒãƒ¼ã‚¸ãƒ§ãƒ³';
-$wb['action_txt'] = 'æ“作';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/nl_software_package.lng b/interface/web/admin/lib/lang/nl_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/nl_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/nl_software_package_install.lng b/interface/web/admin/lib/lang/nl_software_package_install.lng
deleted file mode 100644
index 87150b8cf190777da50b76bb1c1010aa108009c0..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/nl_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install softwarepakket';
-$wb['install_key_txt'] = 'Voer installatie sleutel in';
-$wb['btn_save_txt'] = 'Start installatie';
-$wb['btn_cancel_txt'] = 'Annuleren';
-?>
diff --git a/interface/web/admin/lib/lang/nl_software_package_list.lng b/interface/web/admin/lib/lang/nl_software_package_list.lng
deleted file mode 100644
index 44aaa563ad06f472796aa96a31d9a241c9cee4fc..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/nl_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Apps & Addon pakketten';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Pakket';
-$wb['package_description_txt'] = 'Omschrijving';
-$wb['action_txt'] = 'Actie';
-$wb['toolsarea_head_txt'] = 'Pakketten';
-$wb['repoupdate_txt'] = 'Update pakketlijst';
-$wb['package_id_txt'] = 'lokaal App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/nl_software_repo.lng b/interface/web/admin/lib/lang/nl_software_repo.lng
deleted file mode 100644
index 665c4197a24af7dd5caa4cc89e2e599f4a9a953e..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/nl_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'User (optionieel)';
-$wb['repo_password_txt'] = 'Password (optionieel)';
-$wb['active_txt'] = 'Actief';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/nl_software_repo_list.lng b/interface/web/admin/lib/lang/nl_software_repo_list.lng
deleted file mode 100644
index fc05fc269b9d6bdf36e7d0fb2d2f4f25822e33aa..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/nl_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Actief';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/nl_software_update_list.lng b/interface/web/admin/lib/lang/nl_software_update_list.lng
deleted file mode 100644
index 0d05c855943aad9b9933f72c91130efe5d17622f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/nl_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Software updates';
-$wb['server_select_txt'] = 'Selecteer server';
-$wb['installed_txt'] = 'Actie';
-$wb['update_title_txt'] = 'Update';
-$wb['version_txt'] = 'Versie';
-$wb['action_txt'] = 'Actie';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/pl_software_package.lng b/interface/web/admin/lib/lang/pl_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pl_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/pl_software_package_install.lng b/interface/web/admin/lib/lang/pl_software_package_install.lng
deleted file mode 100644
index fd2f2930dde345143a239e3755d6c6e0bfe32470..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pl_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Instalacja pakietu oprogramowania';
-$wb['install_key_txt'] = 'Podaj klucz instalacyjny';
-$wb['btn_save_txt'] = 'Start instalacji';
-$wb['btn_cancel_txt'] = 'Przerwij';
-?>
diff --git a/interface/web/admin/lib/lang/pl_software_package_list.lng b/interface/web/admin/lib/lang/pl_software_package_list.lng
deleted file mode 100644
index cb47abc46d380b691323486a72343a62f531b3ce..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pl_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Pakiety z oprogramowaniem';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Pakiet';
-$wb['package_description_txt'] = 'Opis';
-$wb['action_txt'] = 'Akcja';
-$wb['toolsarea_head_txt'] = 'Pakiety';
-$wb['repoupdate_txt'] = 'Aktualizuj listę pakietów';
-$wb['package_id_txt'] = 'lokalny App-ID';
-$wb['no_packages_txt'] = 'Brak dostępnych pakietów';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/pl_software_repo.lng b/interface/web/admin/lib/lang/pl_software_repo.lng
deleted file mode 100644
index 1cc3dbb61c0846e040754b5462bb40ccf7cad308..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pl_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repozytorium';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Użytkownik (Opcjonalnie)';
-$wb['repo_password_txt'] = 'Hasło (Opcjonalnie)';
-$wb['active_txt'] = 'Aktywny';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/pl_software_repo_list.lng b/interface/web/admin/lib/lang/pl_software_repo_list.lng
deleted file mode 100644
index 7ca6af9f9f43559891103a0c50ebd189da3f795b..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pl_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repozytoria';
-$wb['active_txt'] = 'Aktywny';
-$wb['repo_name_txt'] = 'Repozytoria';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/pl_software_update_list.lng b/interface/web/admin/lib/lang/pl_software_update_list.lng
deleted file mode 100644
index aa49fba4e72ce46c22c3ca7a2d0a23ee6728a8f9..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pl_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aktualizacje oprogramowania';
-$wb['server_select_txt'] = 'Wybierz serwer';
-$wb['installed_txt'] = 'Akcja';
-$wb['update_title_txt'] = 'Aktualizacja';
-$wb['version_txt'] = 'Wersja';
-$wb['action_txt'] = 'Akcja';
-$wb['no_updates_txt'] = 'Nie ma dostępnych aktualizacji';
-?>
diff --git a/interface/web/admin/lib/lang/pt_software_package.lng b/interface/web/admin/lib/lang/pt_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pt_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/pt_software_package_install.lng b/interface/web/admin/lib/lang/pt_software_package_install.lng
deleted file mode 100644
index 5c8b756434ce27d67e479a96383bbee01bce4f1f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pt_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install software package';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/admin/lib/lang/pt_software_package_list.lng b/interface/web/admin/lib/lang/pt_software_package_list.lng
deleted file mode 100644
index 1ec77bdd15f5403cd7bae71e328b56c5666f21ae..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pt_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Pacotes de Software';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Pacote';
-$wb['package_description_txt'] = 'Descrição';
-$wb['action_txt'] = 'Acção';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/pt_software_repo.lng b/interface/web/admin/lib/lang/pt_software_repo.lng
deleted file mode 100644
index 436758e6871176d63b44f4eb812ebe2b945dc187..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pt_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repositório';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Utilizador (opcional)';
-$wb['repo_password_txt'] = 'Senha (opcional)';
-$wb['active_txt'] = 'Activo';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/pt_software_repo_list.lng b/interface/web/admin/lib/lang/pt_software_repo_list.lng
deleted file mode 100644
index 5afba6d5e354b883e14193e3b1e45af361fbd135..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pt_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repositório';
-$wb['active_txt'] = 'Activo';
-$wb['repo_name_txt'] = 'Repositório';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/pt_software_update_list.lng b/interface/web/admin/lib/lang/pt_software_update_list.lng
deleted file mode 100644
index 12fd9e2fa9106e1b1e6087fe06fc4dc641b1f71e..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/pt_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Actualizações de Programas';
-$wb['server_select_txt'] = 'Seleccione o servidor';
-$wb['installed_txt'] = 'Acções';
-$wb['update_title_txt'] = 'Actualizar';
-$wb['version_txt'] = 'Versão';
-$wb['action_txt'] = 'Acção';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/ro_software_package.lng b/interface/web/admin/lib/lang/ro_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ro_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/ro_software_package_install.lng b/interface/web/admin/lib/lang/ro_software_package_install.lng
deleted file mode 100644
index 5c8b756434ce27d67e479a96383bbee01bce4f1f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ro_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install software package';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/admin/lib/lang/ro_software_package_list.lng b/interface/web/admin/lib/lang/ro_software_package_list.lng
deleted file mode 100644
index 4a8dcbcbf09d1141554f5f73e6a0cea790911448..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ro_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Pachete Software ';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Pachet';
-$wb['package_description_txt'] = 'Descriere';
-$wb['action_txt'] = 'Actiune';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/ro_software_repo.lng b/interface/web/admin/lib/lang/ro_software_repo.lng
deleted file mode 100644
index f2cbbb2c25776ab5f1794e7102ad264a98144049..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ro_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'User (optional)';
-$wb['repo_password_txt'] = 'Password (optional)';
-$wb['active_txt'] = 'Active';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/ro_software_repo_list.lng b/interface/web/admin/lib/lang/ro_software_repo_list.lng
deleted file mode 100644
index b7a219ffa8e2f6d389fabdc5386286a24fc2a11a..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ro_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Active';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/ro_software_update_list.lng b/interface/web/admin/lib/lang/ro_software_update_list.lng
deleted file mode 100644
index 1e85d6de5f373ca10133099e354f59a3debe33f1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ro_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Software update';
-$wb['server_select_txt'] = 'Selectie server';
-$wb['installed_txt'] = 'Actiune';
-$wb['update_title_txt'] = 'Update';
-$wb['version_txt'] = 'Versiune';
-$wb['action_txt'] = 'Actiune';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/ru_software_package.lng b/interface/web/admin/lib/lang/ru_software_package.lng
deleted file mode 100644
index 490184dd9273e48d69c9cecfdd313c95684a75f3..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ru_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Ðазвание пакета';
-$wb['package_key_txt'] = 'Ключ пакета';
-$wb['Software Package'] = 'Пакет ПО';
-$wb['Modify software package details'] = 'Изменить детали пакета программного обеÑпечениÑ';
-?>
diff --git a/interface/web/admin/lib/lang/ru_software_package_install.lng b/interface/web/admin/lib/lang/ru_software_package_install.lng
deleted file mode 100644
index 21efc7d5629d6f3eb9f561786eff2858d8afd2c8..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ru_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'УÑтановить пакет ПО';
-$wb['install_key_txt'] = 'Ввод ключа уÑтановки';
-$wb['btn_save_txt'] = 'Ðачать уÑтановку';
-$wb['btn_cancel_txt'] = 'Отменить';
-?>
diff --git a/interface/web/admin/lib/lang/ru_software_package_list.lng b/interface/web/admin/lib/lang/ru_software_package_list.lng
deleted file mode 100644
index 791cfa33aed4e3141df8a82bf1c4a0f6d9dbb27f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ru_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Пакеты ПО';
-$wb['installed_txt'] = 'СтатуÑ';
-$wb['package_title_txt'] = 'Пакет';
-$wb['package_description_txt'] = 'ОпиÑание';
-$wb['action_txt'] = 'ДейÑтвие';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Обновить ÑиÑок пакетов';
-$wb['package_id_txt'] = 'Локальный App-ID';
-$wb['no_packages_txt'] = 'Ðет доÑтупных пакетов';
-$wb['edit_txt'] = 'Изменить';
-$wb['delete_txt'] = 'Удалить';
-?>
diff --git a/interface/web/admin/lib/lang/ru_software_repo.lng b/interface/web/admin/lib/lang/ru_software_repo.lng
deleted file mode 100644
index 5aec8763c173d4ac73419c725857b0978e1b8743..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ru_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Репозиторий';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Логин (опционально)';
-$wb['repo_password_txt'] = 'Пароль (опционально)';
-$wb['active_txt'] = 'Ðктивен?';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/ru_software_repo_list.lng b/interface/web/admin/lib/lang/ru_software_repo_list.lng
deleted file mode 100644
index ed307454aef1042f662726326029eb9ed541340f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ru_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Репозитории';
-$wb['active_txt'] = 'Ðктивно';
-$wb['repo_name_txt'] = 'Репозиторий';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/ru_software_update_list.lng b/interface/web/admin/lib/lang/ru_software_update_list.lng
deleted file mode 100644
index dde28811d537a8d95b07736564cae1f6d81659cd..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/ru_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Обновление ПО';
-$wb['installed_txt'] = 'ДейÑтвие';
-$wb['update_title_txt'] = 'Обновить';
-$wb['version_txt'] = 'ВерÑиÑ';
-$wb['action_txt'] = 'ДейÑтвие';
-$wb['server_select_txt'] = 'Выберите Ñервер';
-$wb['no_updates_txt'] = 'Ðет доÑтупных обновлений';
-?>
diff --git a/interface/web/admin/lib/lang/se_software_package.lng b/interface/web/admin/lib/lang/se_software_package.lng
deleted file mode 100644
index 086902db0cbddab5c57150f462e0583e020903a6..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/se_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Pakettitel';
-$wb['package_key_txt'] = 'Packetnyckel';
-$wb['Software Package'] = 'Mjukvarupaket';
-$wb['Modify software package details'] = 'Redigera mjukvarupaketets uppgifter';
-?>
diff --git a/interface/web/admin/lib/lang/se_software_package_install.lng b/interface/web/admin/lib/lang/se_software_package_install.lng
deleted file mode 100644
index 434fc4bc98139ec1e01a513bd4cd8036e446edb7..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/se_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Installera mjukvarupaket';
-$wb['install_key_txt'] = 'Fyll i installationsnyckel';
-$wb['btn_save_txt'] = 'Påbörja installation';
-$wb['btn_cancel_txt'] = 'Avbryt';
-?>
diff --git a/interface/web/admin/lib/lang/se_software_package_list.lng b/interface/web/admin/lib/lang/se_software_package_list.lng
deleted file mode 100644
index c0222e1ba4fb975e56722d0080afde3d734e0cfb..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/se_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Mjukvarupaket';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Paket';
-$wb['package_description_txt'] = 'Beskrivning';
-$wb['action_txt'] = 'Händelse';
-$wb['toolsarea_head_txt'] = 'Paket';
-$wb['repoupdate_txt'] = 'Uppdatera paketlista';
-$wb['package_id_txt'] = 'lokalt App-ID';
-$wb['no_packages_txt'] = 'Inga paket tillgängliga';
-$wb['edit_txt'] = 'Redigera';
-$wb['delete_txt'] = 'Radera';
-?>
diff --git a/interface/web/admin/lib/lang/se_software_repo.lng b/interface/web/admin/lib/lang/se_software_repo.lng
deleted file mode 100644
index a0e0de6822419055beee042cb8df66b7532d9984..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/se_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Bibliotek';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Användare (Frivilligt)';
-$wb['repo_password_txt'] = 'Lösenord (Frivilligt)';
-$wb['active_txt'] = 'Aktiv';
-$wb['Software Repository which may contain addons or updates'] = 'Pragarmvarubibliotek som kan innehålla uppdateringar eller tillägg';
-?>
diff --git a/interface/web/admin/lib/lang/se_software_repo_list.lng b/interface/web/admin/lib/lang/se_software_repo_list.lng
deleted file mode 100644
index b7a219ffa8e2f6d389fabdc5386286a24fc2a11a..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/se_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Repository';
-$wb['active_txt'] = 'Active';
-$wb['repo_name_txt'] = 'Repository';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/se_software_update_list.lng b/interface/web/admin/lib/lang/se_software_update_list.lng
deleted file mode 100644
index 0cf7c0eddc2c9c336c80085af3a5cb98b0f0d806..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/se_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Programvaruuppdateringar';
-$wb['installed_txt'] = 'Händelse';
-$wb['update_title_txt'] = 'Uppdatera';
-$wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Händelse';
-$wb['server_select_txt'] = 'Välj server';
-$wb['no_updates_txt'] = 'Inga tillgängliga uppdateringar';
-?>
diff --git a/interface/web/admin/lib/lang/sk_software_package.lng b/interface/web/admin/lib/lang/sk_software_package.lng
deleted file mode 100644
index faffe38217fb9cac04020e73e473c6c46e3caaa1..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/sk_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
-?>
diff --git a/interface/web/admin/lib/lang/sk_software_package_install.lng b/interface/web/admin/lib/lang/sk_software_package_install.lng
deleted file mode 100644
index 5c8b756434ce27d67e479a96383bbee01bce4f1f..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/sk_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Install software package';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
-?>
diff --git a/interface/web/admin/lib/lang/sk_software_package_list.lng b/interface/web/admin/lib/lang/sk_software_package_list.lng
deleted file mode 100644
index 502a3a2237707e5c196a6b6523743c118fb02870..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/sk_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Softvérové balÃky';
-$wb['installed_txt'] = 'Stav';
-$wb['package_title_txt'] = 'BalÃky';
-$wb['package_description_txt'] = 'Popis';
-$wb['action_txt'] = 'Akcia';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
-?>
diff --git a/interface/web/admin/lib/lang/sk_software_repo.lng b/interface/web/admin/lib/lang/sk_software_repo.lng
deleted file mode 100644
index 263614f50c2b62177cdaf21eb27de6d42b6adc64..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/sk_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Skladisko';
-$wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'Uživateľ (voliteľný)';
-$wb['repo_password_txt'] = 'Heslo (voliteľné)';
-$wb['active_txt'] = 'Aktivovať';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
-?>
diff --git a/interface/web/admin/lib/lang/sk_software_repo_list.lng b/interface/web/admin/lib/lang/sk_software_repo_list.lng
deleted file mode 100644
index c77d4a3846eb7cbcdd5aa639f7c63e96aba501ee..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/sk_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Skladisko';
-$wb['active_txt'] = 'AktÃvne';
-$wb['repo_name_txt'] = 'Skladisko';
-$wb['repo_url_txt'] = 'URL';
-?>
diff --git a/interface/web/admin/lib/lang/sk_software_update_list.lng b/interface/web/admin/lib/lang/sk_software_update_list.lng
deleted file mode 100644
index 9a04707c3ed2dc48e79ece8016eab73babe8f86e..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/sk_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Aktualizácia softvéru';
-$wb['server_select_txt'] = 'Vyberte server';
-$wb['installed_txt'] = 'Akcia';
-$wb['update_title_txt'] = 'Aktualizácia ';
-$wb['version_txt'] = 'Verzia';
-$wb['action_txt'] = 'Akcia';
-$wb['no_updates_txt'] = 'No updates available';
-?>
diff --git a/interface/web/admin/lib/lang/tr_software_package.lng b/interface/web/admin/lib/lang/tr_software_package.lng
deleted file mode 100644
index addda60195a1bb25f115b50b835b59153eea8030..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/tr_software_package.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['package_title_txt'] = 'Paket Başlığı';
-$wb['package_key_txt'] = 'Paket Anahtarı';
-$wb['Software Package'] = 'Yazılım Paketi';
-$wb['Modify software package details'] = 'Yazılım paketi bilgilerini düzenle';
-?>
diff --git a/interface/web/admin/lib/lang/tr_software_package_install.lng b/interface/web/admin/lib/lang/tr_software_package_install.lng
deleted file mode 100644
index fe7dd26e735ac376fc846b932c0cc806d9347eed..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/tr_software_package_install.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['head_txt'] = 'Yazılım Paketi Yükleme';
-$wb['install_key_txt'] = 'Yükleme anahtarını yazın';
-$wb['btn_save_txt'] = 'Yüklemeyi Başlat';
-$wb['btn_cancel_txt'] = 'Geri';
-?>
diff --git a/interface/web/admin/lib/lang/tr_software_package_list.lng b/interface/web/admin/lib/lang/tr_software_package_list.lng
deleted file mode 100644
index 1838ff94cfc3b7f0e87cfd68f1bb25da551f4988..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/tr_software_package_list.lng
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Yazılım Paketleri';
-$wb['installed_txt'] = 'Durum';
-$wb['package_title_txt'] = 'Paket';
-$wb['package_description_txt'] = 'Açıklama';
-$wb['action_txt'] = 'Ä°ÅŸlem';
-$wb['toolsarea_head_txt'] = 'Paketler';
-$wb['repoupdate_txt'] = 'Paket Listesini Güncelle';
-$wb['package_id_txt'] = 'yerel uygulama kodu';
-$wb['no_packages_txt'] = 'Henüz kullanılabilecek bir paket yok';
-$wb['edit_txt'] = 'Düzenle';
-$wb['delete_txt'] = 'Sil';
-?>
diff --git a/interface/web/admin/lib/lang/tr_software_repo.lng b/interface/web/admin/lib/lang/tr_software_repo.lng
deleted file mode 100644
index 13e113967fad2f6fe9ef10ee1d190abc9ab7fd23..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/tr_software_repo.lng
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$wb['repo_name_txt'] = 'Depo';
-$wb['repo_url_txt'] = 'Ä°nternet Adresi';
-$wb['repo_username_txt'] = 'Kullanıcı Adı (isteğe bağlı)';
-$wb['repo_password_txt'] = 'Parola (isteğe bağlı)';
-$wb['active_txt'] = 'Etkin';
-$wb['Software Repository which may contain addons or updates'] = 'Eklenti ya da güncellemeleri içeren yazılım deposu';
-?>
diff --git a/interface/web/admin/lib/lang/tr_software_repo_list.lng b/interface/web/admin/lib/lang/tr_software_repo_list.lng
deleted file mode 100644
index 5e2fdf5b928950f51e2da6d597739afef36d1d11..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/tr_software_repo_list.lng
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Depolar';
-$wb['active_txt'] = 'Etkin';
-$wb['repo_name_txt'] = 'Depo';
-$wb['repo_url_txt'] = 'Ä°nternet Adresi';
-?>
diff --git a/interface/web/admin/lib/lang/tr_software_update_list.lng b/interface/web/admin/lib/lang/tr_software_update_list.lng
deleted file mode 100644
index a462d90faa7dc79180330f9ebe69d176cdc5117d..0000000000000000000000000000000000000000
--- a/interface/web/admin/lib/lang/tr_software_update_list.lng
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$wb['list_head_txt'] = 'Yazılım Güncellemeleri';
-$wb['server_select_txt'] = 'Sunucu Seçin';
-$wb['installed_txt'] = 'Ä°ÅŸlem';
-$wb['update_title_txt'] = 'Güncelleme';
-$wb['version_txt'] = 'Sürüm';
-$wb['action_txt'] = 'Ä°ÅŸlem';
-$wb['no_updates_txt'] = 'Henüz bir güncelleme yok';
-?>
diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index 124656b7f302df41d02cd388e21354f7d9688fbb..59b2e1ffc170909c060f93a4db265f965e04a3e5 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -92,30 +92,6 @@ $module['nav'][] = array( 'title' => 'Interface',
'items' => $items);
-// cleanup
-unset($items);
-
-
-$items[] = array( 'title' => 'Repositories',
- 'target' => 'content',
- 'link' => 'admin/software_repo_list.php',
- 'html_id' => 'software_repo_list');
-
-$items[] = array( 'title' => 'Packages',
- 'target' => 'content',
- 'link' => 'admin/software_package_list.php',
- 'html_id' => 'software_package_list');
-
-$items[] = array( 'title' => 'Updates',
- 'target' => 'content',
- 'link' => 'admin/software_update_list.php',
- 'html_id' => 'software_update_list');
-
-$module['nav'][] = array( 'title' => 'Software',
- 'open' => 1,
- 'items' => $items);
-
-
// cleanup
unset($items);
diff --git a/interface/web/admin/list/software_repo.list.php b/interface/web/admin/list/software_repo.list.php
deleted file mode 100644
index 0e172ace99ad7bf2bf53234922d2aa7432a90fb3..0000000000000000000000000000000000000000
--- a/interface/web/admin/list/software_repo.list.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/*
- Datatypes:
- - INTEGER
- - DOUBLE
- - CURRENCY
- - VARCHAR
- - TEXT
- - DATE
-*/
-
-
-
-// Name of the list
-$liste["name"] = "software_repo";
-
-// Database table
-$liste["table"] = "software_repo";
-
-// Index index field of the database table
-$liste["table_idx"] = "software_repo_id";
-
-// Search Field Prefix
-$liste["search_prefix"] = "search_";
-
-// Records per page
-$liste["records_per_page"] = "15";
-
-// Script File of the list
-$liste["file"] = "software_repo_list.php";
-
-// Script file of the edit form
-$liste["edit_file"] = "software_repo_edit.php";
-
-// Script File of the delete script
-$liste["delete_file"] = "software_repo_del.php";
-
-// Paging Template
-$liste["paging_tpl"] = "templates/paging.tpl.htm";
-
-// Enable auth
-$liste["auth"] = "yes";
-
-
-/*****************************************************
-* Suchfelder
-*****************************************************/
-
-$liste["item"][] = array( 'field' => "active",
- 'datatype' => "VARCHAR",
- 'formtype' => "SELECT",
- 'op' => "=",
- 'prefix' => "",
- 'suffix' => "",
- 'width' => "",
- 'value' => array('y' => $app->lng('yes_txt'), 'n' => $app->lng('no_txt')));
-
-$liste["item"][] = array( 'field' => "repo_name",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
-
-
-$liste["item"][] = array( 'field' => "repo_url",
- 'datatype' => "VARCHAR",
- 'formtype' => "TEXT",
- 'op' => "like",
- 'prefix' => "%",
- 'suffix' => "%",
- 'width' => "",
- 'value' => "");
-
-?>
diff --git a/interface/web/admin/software_package_del.php b/interface/web/admin/software_package_del.php
deleted file mode 100644
index e1387f39c43459b7261f1d90d19798a78c4a7d3e..0000000000000000000000000000000000000000
--- a/interface/web/admin/software_package_del.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2012, 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.
-*/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('admin');
-$app->auth->check_security_permissions('admin_allow_software_packages');
-if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
-
-// Check CSRF Token
-$app->auth->csrf_token_check('GET');
-
-$software_update_inst_id = $app->functions->intval($_GET['software_update_inst_id']);
-
-if($software_update_inst_id > 0) {
- $app->db->datalogDelete('software_update_inst', 'software_update_inst_id', $software_update_inst_id);
- //header('Location: admin/software_package_list.php');
- die('HEADER_REDIRECT: admin/software_package_list.php');
-} else {
- die('Invalid ID');
-}
-
-
-
-
-
-
-?>
diff --git a/interface/web/admin/software_package_edit.php b/interface/web/admin/software_package_edit.php
deleted file mode 100644
index 65555d3a3570d12fce552171a1df350201902c75..0000000000000000000000000000000000000000
--- a/interface/web/admin/software_package_edit.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/*
-Copyright (c) 2008, 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/software_package.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');
-$app->auth->check_security_permissions('admin_allow_software_packages');
-if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
-
-// Loading classes
-$app->uses('tpl,tform,tform_actions');
-$app->load('tform_actions');
-
-class page_action extends tform_actions {
-
-}
-
-$page = new page_action;
-$page->onLoad();
-
-?>
diff --git a/interface/web/admin/software_package_install.php b/interface/web/admin/software_package_install.php
deleted file mode 100644
index 6a5326d51a1bed56d1d1b2faf862d8aa38533f3d..0000000000000000000000000000000000000000
--- a/interface/web/admin/software_package_install.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-
-/*
-Copyright (c) 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.
-*/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('admin');
-$app->auth->check_security_permissions('admin_allow_software_packages');
-
-//* This is only allowed for administrators
-if(!$app->auth->is_admin()) die('only allowed for administrators.');
-
-// Check CSRF Token
-if(count($_POST) > 0) {
- $app->auth->csrf_token_check('POST');
-} else {
- $app->auth->csrf_token_check('GET');
-}
-
-$package_name = $_REQUEST['package'];
-$install_server_id = $app->functions->intval($_REQUEST['server_id']);
-$install_key = trim($_REQUEST['install_key']);
-
-$package = $app->db->queryOneRecord("SELECT * FROM software_package WHERE package_name = ?", $package_name);
-
-$install_key_verified = false;
-$message_err = '';
-$message_ok = '';
-
-//* verify the key
-if($package['package_installable'] == 'key' && $install_key != '') {
-
- $repo = $app->db->queryOneRecord("SELECT * FROM software_repo WHERE software_repo_id = ?", $package['software_repo_id']);
-
- $client = new SoapClient(null, array('location' => $repo['repo_url'],
- 'uri' => $repo['repo_url']));
-
- $install_key_verified = $client->check_installable($package_name, $install_key, $repo['repo_username'], $repo['repo_password']);
-
- if($install_key_verified == false) {
- //$install_key = '';
- $message_err = 'Verification of the key failed.';
- } else {
- // Store the verified key into the database
- $app->db->datalogUpdate('software_package', array("package_key" => $install_key), 'package_id', $package['package_id']);
- }
-} else {
- $message_ok = 'Please enter the software key for the package.';
-}
-
-//* Install packages, if all requirements are fullfilled.
-if($install_server_id > 0 && $package_name != '' && ($package['package_installable'] == 'yes' || $install_key_verified == true)) {
- $sql = "SELECT software_update_id, package_name, update_title FROM software_update WHERE type = 'full' AND package_name = ? ORDER BY v1 DESC, v2 DESC, v3 DESC, v4 DESC LIMIT 0,1";
- $tmp = $app->db->queryOneRecord($sql, $package_name);
- $software_update_id = $tmp['software_update_id'];
-
- //* if package requires a DB and there is no data for a db in config, then we create this data now
- if($package['package_requires_db'] == 'mysql') {
- $app->uses('ini_parser,getconf');
-
- $package_config_array = array();
- if(trim($package['package_config']) != '') {
- $package_config_array = $app->ini_parser->parse_ini_string(stripslashes($package['package_config']));
- }
-
- if(!isset($package_config_array['mysql'])) {
- $package_config_array['mysql'] = array( 'database_name' => 'ispapp'.$package['package_id'],
- 'database_user' => 'ispapp'.$package['package_id'],
- 'database_password' => md5(mt_rand()),
- 'database_host' => 'localhost');
- $package_config_str = $app->ini_parser->get_ini_string($package_config_array);
- $package['package_config'] = $package_config_str;
- $app->db->datalogUpdate('software_package', array("package_config" => $package_config_str), 'package_id', $package['package_id']);
- }
- }
-
- //* If the packages requires a remote user
- if($package['package_remote_functions'] != '') {
-
- if(trim($package['package_config']) != '') {
- $package_config_array = $app->ini_parser->parse_ini_string(stripslashes($package['package_config']));
- }
-
- if(!isset($package_config_array['remote_api'])) {
- $remote_user = 'ispapp'.$package['package_id'];
- $remote_password = md5(mt_rand());
- $remote_functions = $package['package_remote_functions'];
-
- $package_config_array['remote_api'] = array(
- 'remote_hostname' => $_SERVER['HTTP_HOST'],
- 'remote_user' => $remote_user,
- 'remote_password' => $remote_password
- );
-
- $package_config_str = $app->ini_parser->get_ini_string($package_config_array);
- $package['package_config'] = $package_config_str;
- $remote_password_md5 = md5($remote_password);
- $app->db->datalogUpdate('software_package', array("package_config" => $package_config_str), 'package_id', $package['package_id']);
-
- $sql = "INSERT INTO `remote_user` (`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `remote_username`, `remote_password`, `remote_functions`) VALUES
- (1, 1, 'riud', 'riud', '', ?, ?, ?)";
- $app->db->query($sql, $remote_user, $remote_password_md5, $remote_functions);
-
- }
-
- }
-
- //* Add the record to start the install process
- $insert_data = array(
- "package_name" => $package_name,
- "server_id" => $install_server_id,
- "software_update_id" => $software_update_id,
- "status" => 'installing'
- );
- $app->db->datalogInsert('software_update_inst', $insert_data, 'software_update_inst_id');
- $message_ok = 'Starting package installation '."<a href=\"#\" onclick=\"ISPConfig.submitForm('pageForm','admin/software_package_list.php');\">".$app->lng('next')."</a>";
-
-}
-
-if(count($_POST) > 2 && $install_key == '') {
- $message_ok = 'Please enter the software key.';
-}
-
-//* Show key input form
-if($package['package_installable'] == 'key' && !$install_key_verified) {
- $insert_key = true;
-} else {
- $insert_key = false;
-}
-
-// Loading the template
-$app->uses('tpl');
-$app->tpl->newTemplate("form.tpl.htm");
-$app->tpl->setInclude('content_tpl', 'templates/software_package_install.htm');
-
-$app->tpl->setVar('message_ok', $message_ok);
-$app->tpl->setVar('message_err', $message_err);
-$app->tpl->setVar('insert_key', $insert_key);
-$app->tpl->setVar('install_key', $install_key);
-$app->tpl->setVar('package_name', $package_name);
-$app->tpl->setVar('server_id', $install_server_id);
-
-
-include_once 'lib/lang/en_software_package_install.lng';
-$app->tpl->setVar($wb);
-
-
-$app->tpl_defaults();
-$app->tpl->pparse();
-
-?>
diff --git a/interface/web/admin/software_package_list.php b/interface/web/admin/software_package_list.php
deleted file mode 100644
index 8a21696c7f398600ba7083b3f95d3e8f548de825..0000000000000000000000000000000000000000
--- a/interface/web/admin/software_package_list.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2008, 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.
-*/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('admin');
-
-//* This is only allowed for administrators
-if(!$app->auth->is_admin()) die('only allowed for administrators.');
-
-//* Get the latest packages from the repositorys and insert them in the local database
-$packages_added = 0;
-$repos = $app->db->queryAllRecords("SELECT software_repo_id, repo_url, repo_username, repo_password FROM software_repo WHERE active = 'y'");
-if(is_array($repos) && isset($_GET['action']) && $_GET['action'] == 'repoupdate' ) {
- foreach($repos as $repo) {
- $client = new SoapClient(null, array('location' => $repo['repo_url'],
- 'uri' => $repo['repo_url']));
-
- $packages = $client->get_packages($repo['repo_username'], $repo['repo_password']);
- if(is_array($packages)) {
- foreach($packages as $p) {
- $package_name = $p['name'];
- $tmp = $app->db->queryOneRecord("SELECT package_id FROM software_package WHERE package_name = ?", $package_name);
-
- $package_title = $p['title'];
- $package_description = $p['description'];
- $software_repo_id = $app->functions->intval($repo['software_repo_id']);
- $package_type = $p['type'];
- $package_installable = $p['installable'];
- $package_requires_db = $p['requires_db'];
- $package_remote_functions = $p['remote_functions'];
-
- if(empty($tmp['package_id'])) {
- $insert_data = array(
- "software_repo_id" => $software_repo_id,
- "package_name" => $package_name,
- "package_title" => $package_title,
- "package_description" => $package_description,
- "package_type" => $package_type,
- "package_installable" => $package_installable,
- "package_requires_db" => $package_requires_db,
- "package_remote_functions" => $package_remote_functions
- );
- $app->db->datalogInsert('software_package', $insert_data, 'package_id');
- $packages_added++;
- } else {
- $update_data = array(
- "software_repo_id" => $software_repo_id,
- "package_title" => $package_title,
- "package_description" => $package_description,
- "package_type" => $package_type,
- "package_installable" => $package_installable,
- "package_requires_db" => $package_requires_db,
- "package_remote_functions" => $package_remote_functions
- );
- //echo $update_data;
- $app->db->datalogUpdate('software_package', $update_data, 'package_id', $tmp['package_id']);
- }
- }
- }
-
- $packages = $app->db->queryAllRecords("SELECT software_package.package_name, v1, v2, v3, v4 FROM software_package LEFT JOIN software_update ON ( software_package.package_name = software_update.package_name ) GROUP BY package_name ORDER BY v1 DESC , v2 DESC , v3 DESC , v4 DESC");
- if(is_array($packages)) {
- foreach($packages as $p) {
-
- $version = $p['v1'].'.'.$p['v2'].'.'.$p['v3'].'.'.$p['v4'];
- $updates = $client->get_updates($p['package_name'], $version, $repo['repo_username'], $repo['repo_password']);
-
- if(is_array($updates)) {
- foreach($updates as $u) {
-
- $version_array = explode('.', $u['version']);
- $v1 = $app->functions->intval($version_array[0]);
- $v2 = $app->functions->intval($version_array[1]);
- $v3 = $app->functions->intval($version_array[2]);
- $v4 = $app->functions->intval($version_array[3]);
-
- $package_name = $u['package_name'];
- $software_repo_id = $app->functions->intval($repo['software_repo_id']);
- $update_url = $u['url'];
- $update_md5 = $u['md5'];
- $update_dependencies = (isset($u['dependencies']))?$u['dependencies']:'';
- $update_title = $u['title'];
- $type = $u['type'];
-
- // Check that we do not have this update in the database yet
- $sql = "SELECT * FROM software_update WHERE package_name = ? and v1 = ? and v2 = ? and v3 = ? and v4 = ?";
- $tmp = $app->db->queryOneRecord($sql, $package_name, $v1, $v2, $v3, $v4);
- if(!isset($tmp['software_update_id'])) {
- $insert_data = array(
- "software_repo_id" => $software_repo_id,
- "package_name" => $package_name,
- "update_url" => $update_url,
- "update_md5" => $update_md5,
- "update_dependencies" => $update_dependencies,
- "update_title" => $update_title,
- "v1" => $v1,
- "v2" => $v2,
- "v3" => $v3,
- "v4" => $v4,
- "type" => $type
- );
- $app->db->datalogInsert('software_update', $insert_data, 'software_update_id');
- }
-
- }
- }
- }
- }
- }
-}
-
-// Show the list in the interface
-// Loading the template
-$app->uses('tpl');
-$app->tpl->newTemplate("form.tpl.htm");
-$app->tpl->setInclude('content_tpl', 'templates/software_package_list.htm');
-
-$csrf_token = $app->auth->csrf_token_get('software_package_list');
-$_csrf_id = $csrf_token['csrf_id'];
-$_csrf_key = $csrf_token['csrf_key'];
-
-$servers = $app->db->queryAllRecords('SELECT server_id, server_name FROM server ORDER BY server_name');
-$packages = $app->db->queryAllRecords('SELECT * FROM software_package');
-if(is_array($packages) && count($packages) > 0) {
- foreach($packages as $key => $p) {
- $installed_txt = '';
- foreach($servers as $s) {
- $inst = $app->db->queryOneRecord("SELECT * FROM software_update, software_update_inst WHERE software_update_inst.software_update_id = software_update.software_update_id AND software_update_inst.package_name = ? AND server_id = ?", $p["package_name"], $s["server_id"]);
- $version = $inst['v1'].'.'.$inst['v2'].'.'.$inst['v3'].'.'.$inst['v4'];
-
- if($inst['status'] == 'installed') {
- $installed_txt .= $s['server_name'].": ".$app->lng("Installed version $version")."<br />";
- } elseif ($inst['status'] == 'installing') {
- $installed_txt .= $s['server_name'].": ".$app->lng("Installation in progress")."<br />";
- } elseif ($inst['status'] == 'failed') {
- $installed_txt .= $s['server_name'].": ".$app->lng("Installation failed")."<br />";
- } elseif ($inst['status'] == 'deleting') {
- $installed_txt .= $s['server_name'].": ".$app->lng("Deletion in progress")."<br />";
- } else {
- if($p['package_installable'] == 'no') {
- $installed_txt .= $s['server_name'].": ".$app->lng("Package can not be installed.")."<br />";
- } else {
- $installed_txt .= $s['server_name'].": <a href=\"#\" data-load-content=\"admin/software_package_install.php?package=".$p["package_name"]."&server_id=".$s["server_id"]."&_csrf_key=".$_csrf_key."&_csrf_id=".$_csrf_id."\">Install now</a><br />";
- }
- }
- }
- $packages[$key]['software_update_inst_id'] = intval($inst['software_update_inst_id']);
- $packages[$key]['installed'] = $installed_txt;
- $packages[$key]['csrf_id'] = $_csrf_id;
- $packages[$key]['csrf_key'] = $_csrf_key;
- }
- $app->tpl->setVar('has_packages', 1);
-} else {
- $app->tpl->setVar('has_packages', 0);
-}
-
-
-
-$app->tpl->setLoop('records', $packages);
-
-$language = (isset($_SESSION['s']['language']))?$_SESSION['s']['language']:$conf['language'];
-include_once 'lib/lang/'.$app->functions->check_language($language).'_software_package_list.lng';
-$app->tpl->setVar($wb);
-
-
-$app->tpl_defaults();
-$app->tpl->pparse();
-
-
-?>
diff --git a/interface/web/admin/software_repo_del.php b/interface/web/admin/software_repo_del.php
deleted file mode 100644
index 630993717ce6dd20e3e77804bbf4497e6b6c0f2e..0000000000000000000000000000000000000000
--- a/interface/web/admin/software_repo_del.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2008, 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
-******************************************/
-
-$list_def_file = "list/software_repo.list.php";
-$tform_def_file = "form/software_repo.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');
-$app->auth->check_security_permissions('admin_allow_software_repo');
-if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
-
-$app->uses("tform_actions");
-$app->tform_actions->onDelete();
-
-?>
diff --git a/interface/web/admin/software_repo_edit.php b/interface/web/admin/software_repo_edit.php
deleted file mode 100644
index 6d52da2b56799f0274239b42bba857bd4388ec8b..0000000000000000000000000000000000000000
--- a/interface/web/admin/software_repo_edit.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/*
-Copyright (c) 2008, 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/software_repo.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');
-$app->auth->check_security_permissions('admin_allow_software_repo');
-if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
-
-// Loading classes
-$app->uses('tpl,tform,tform_actions');
-$app->load('tform_actions');
-
-class page_action extends tform_actions {
-
-}
-
-$page = new page_action;
-$page->onLoad();
-
-?>
diff --git a/interface/web/admin/software_repo_list.php b/interface/web/admin/software_repo_list.php
deleted file mode 100644
index b8afc8f9bc8f6bde874e87e75feb42e93587bd6f..0000000000000000000000000000000000000000
--- a/interface/web/admin/software_repo_list.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2008, 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.
-*/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-/******************************************
-* Begin Form configuration
-******************************************/
-
-$list_def_file = "list/software_repo.list.php";
-
-/******************************************
-* End Form configuration
-******************************************/
-
-//* Check permissions for module
-$app->auth->check_module_permissions('admin');
-
-$app->uses('listform_actions');
-
-$app->listform_actions->onLoad();
-
-
-?>
diff --git a/interface/web/admin/software_update_list.php b/interface/web/admin/software_update_list.php
deleted file mode 100644
index 6d680c0ec1ce613db0e448866dbd0036a30c78fa..0000000000000000000000000000000000000000
--- a/interface/web/admin/software_update_list.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2008, 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.
-*/
-
-require_once '../../lib/config.inc.php';
-require_once '../../lib/app.inc.php';
-
-//* Check permissions for module
-$app->auth->check_module_permissions('admin');
-$app->auth->check_security_permissions('admin_allow_software_packages');
-
-//* This is only allowed for administrators
-if(!$app->auth->is_admin()) die('only allowed for administrators.');
-
-//* Get the latest updates from the repositorys and insert them in the local database
-$updates_added = 0;
-$repos = $app->db->queryAllRecords("SELECT software_repo_id, repo_url, repo_username, repo_password FROM software_repo WHERE active = 'y'");
-if(is_array($repos)) {
- foreach($repos as $repo) {
-
- /*
- SELECT software_package.package_name, v1, v2, v3, v4
- FROM software_package
- LEFT JOIN software_update ON ( software_package.package_name = software_update.package_name )
- LEFT JOIN software_update_inst ON ( software_update.software_update_id = software_update_inst.software_update_id )
- GROUP BY package_name
- ORDER BY v1 DESC , v2 DESC , v3 DESC , v4 DESC
- */
-
- $client = new SoapClient(null, array('location' => $repo['repo_url'],
- 'uri' => $repo['repo_url']));
-
- $packages = $app->db->queryAllRecords("SELECT software_package.package_name, v1, v2, v3, v4 FROM software_package LEFT JOIN software_update ON ( software_package.package_name = software_update.package_name ) GROUP BY package_name ORDER BY v1 DESC , v2 DESC , v3 DESC , v4 DESC");
- if(is_array($packages)) {
- foreach($packages as $p) {
-
- $version = $p['v1'].'.'.$p['v2'].'.'.$p['v3'].'.'.$p['v4'];
- $updates = $client->get_updates($p['package_name'], $version, $repo['repo_username'], $repo['repo_password']);
-
- if(is_array($updates)) {
- foreach($updates as $u) {
-
- $version_array = explode('.', $u['version']);
- $v1 = $app->functions->intval($version_array[0]);
- $v2 = $app->functions->intval($version_array[1]);
- $v3 = $app->functions->intval($version_array[2]);
- $v4 = $app->functions->intval($version_array[3]);
-
- $package_name = $u['package_name'];
- $software_repo_id = $app->functions->intval($repo['software_repo_id']);
- $update_url = $u['url'];
- $update_md5 = $u['md5'];
- $update_dependencies = (isset($u['dependencies']))?$u['dependencies']:'';
- $update_title = $u['title'];
- $type = $u['type'];
-
- // Check that we do not have this update in the database yet
- $sql = "SELECT * FROM software_update WHERE package_name = ? and v1 = ? and v2 = ? and v3 = ? and v4 = ?";
- $tmp = $app->db->queryOneRecord($sql, $package_name, $v1, $v2, $v3, $v4);
- if(!isset($tmp['software_update_id'])) {
- // Insert the update in the datbase
- $sql = "INSERT INTO software_update (software_repo_id, package_name, update_url, update_md5, update_dependencies, update_title, v1, v2, v3, v4, type)
- VALUES ($software_repo_id, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
- //die($sql);
- $app->db->query($sql, $package_name, $update_url, $update_md5, $update_dependencies, $update_title, $v1, $v2, $v3, $v4, $type);
- }
-
- }
- }
- }
- }
- }
-}
-
-
-//* Install packages, if GET Request
-if(isset($_GET['action']) && $_GET['action'] == 'install' && $_GET['package'] != '' && $_GET['server_id'] > 0) {
- $package_name = $_GET['package'];
- $server_id = $app->functions->intval($_GET['server_id']);
- $software_update_id = $app->functions->intval($_GET['id']);
-
- $insert_data = array(
- "package_name" => $package_name,
- "server_id" => $server_id,
- "software_update_id" => $software_update_id,
- "status" => 'installing'
- );
- $app->db->datalogInsert('software_update_inst', $insert_data, 'software_update_inst_id');
-
-}
-
-
-
-// Show the list in the interface
-// Loading the template
-$app->uses('tpl');
-$app->tpl->newTemplate("form.tpl.htm");
-$app->tpl->setInclude('content_tpl', 'templates/software_update_list.htm');
-
-/*
-SELECT software_package.package_name, software_package.package_title, software_update.update_title, v1, v2, v3, v4, software_update_inst.status
- FROM software_package
- LEFT JOIN software_update ON ( software_package.package_name = software_update.package_name )
- LEFT JOIN software_update_inst ON ( software_update.software_update_id = software_update_inst.software_update_id )
-GROUP BY software_update.software_update_id
- ORDER BY v1 DESC , v2 DESC , v3 DESC , v4 DESC
-*/
-
-
-
-if(isset($_POST["server_id"]) && $_POST["server_id"] > 0) {
- $server_id = $app->functions->intval($_POST["server_id"]);
-} else {
- $server_id = 1;
-}
-
-$servers = $app->db->queryAllRecords('SELECT server_id, server_name FROM server ORDER BY server_name');
-foreach($servers as $key => $server) {
- if($server['server_id'] == $server_id) {
- $servers[$key]['selected'] = 'selected';
- } else {
- $servers[$key]['selected'] = '';
- }
-}
-
-$app->tpl->setLoop('servers', $servers);
-
-$sql = "SELECT v1, v2, v3, v4, software_update.update_title, software_update.software_update_id, software_update.package_name, v1, v2, v3, v4, software_update_inst.status
- FROM software_update LEFT JOIN software_update_inst ON ( software_update.software_update_id = software_update_inst.software_update_id )
- WHERE server_id = $server_id
- GROUP BY software_update.package_name
- ORDER BY software_update.package_name ASC, v1 DESC , v2 DESC , v3 DESC , v4 DESC";
-
-$installed_packages = $app->db->queryAllRecords($sql);
-
-
-$records_out = array();
-
-if(is_array($installed_packages)) {
- foreach($installed_packages as $ip) {
-
- // Get version number of the latest installed version
- $sql = "SELECT v1, v2, v3, v4 FROM software_update, software_update_inst WHERE software_update.software_update_id = software_update_inst.software_update_id AND server_id = ? ORDER BY v1 DESC , v2 DESC , v3 DESC , v4 DESC LIMIT 0,1";
- $lu = $app->db->queryOneRecord($sql, $server_id);
-
- // Get all installable updates
- $sql = "SELECT * FROM software_update WHERE v1 >= ? AND v2 >= ? AND v3 >= ? AND v4 >= ? AND package_name = ? ORDER BY v1 DESC , v2 DESC , v3 DESC , v4 DESC";
- $updates = $app->db->queryAllRecords($sql, $lu['v1'], $lu['v2'], $lu['v3'], $lu['v4'], $ip['package_name']);
- //die($sql);
-
- if(is_array($updates)) {
- // Delete the last record as it is already installed
- unset($updates[count($updates)-1]);
-
- foreach($updates as $key => $u) {
- $version = $u['v1'].'.'.$u['v2'].'.'.$u['v3'].'.'.$u['v4'];
- $installed_txt = "<a href=\"#\" data-load-content=\"admin/software_update_list.php?action=install&package=".$u["package_name"]."&id=".$u["software_update_id"]."&server_id=".$server_id."\">Install Update</a><br />";
- $records_out[] = array('version' => $version, 'update_title' => $u["update_title"], 'installed' => $installed_txt);
-
- }
- }
- }
-}
-
-
-
-$app->tpl->setLoop('records', $records_out);
-
-$language = (isset($_SESSION['s']['language']))?$_SESSION['s']['language']:$conf['language'];
-include_once 'lib/lang/'.$app->functions->check_language($language).'_software_update_list.lng';
-$app->tpl->setVar($wb);
-
-
-$app->tpl_defaults();
-$app->tpl->pparse();
-
-
-?>
diff --git a/interface/web/admin/templates/software_package_edit.htm b/interface/web/admin/templates/software_package_edit.htm
deleted file mode 100644
index 2569c267f0d55b6dc967118bc03e79ff8ae15c44..0000000000000000000000000000000000000000
--- a/interface/web/admin/templates/software_package_edit.htm
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"></h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
-
-
-
- <div class="form-group">
- <label for="package_title" class="col-sm-3 control-label">{tmpl_var name='package_title_txt'}</label>
- {tmpl_var name='package_title'}<input name="package_title" id="package_title" value="{tmpl_var name='package_title'}" size="40" maxlength="40" type="hidden" class="textInput" />
- </div>
- <div class="form-group">
- <label for="package_key" class="col-sm-3 control-label">{tmpl_var name='package_key_txt'}</label>
- <div class="col-sm-9"><input type="text" name="package_key" id="package_key" value="{tmpl_var name='package_key'}" class="form-control" /></div></div>
-
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="clear"><div class="right">
- <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/software_package_edit.php">{tmpl_var name='btn_save_txt'}</button>
- <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/software_package_list.php">{tmpl_var name='btn_cancel_txt'}</button>
- </div></div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/software_package_install.htm b/interface/web/admin/templates/software_package_install.htm
deleted file mode 100644
index 8524b3c08755982c38b050d12e8b45ee1d955d72..0000000000000000000000000000000000000000
--- a/interface/web/admin/templates/software_package_install.htm
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class='page-header'>
- <h1><tmpl_var name="head_txt"></h1>
-</div>
-<p><tmpl_var name="desc_txt"></p>
-
-<div class="panel panel_software_repo">
- <tmpl_if name="message_err">
- <div id="errorMsg"><tmpl_var name="message_err"></div>
- </tmpl_if>
- <tmpl_if name="message_ok">
- <div id="OKMsg"><tmpl_var name="message_ok"></div>
- </tmpl_if>
- <tmpl_if name="insert_key">
- <div class="pnl_formsarea">
-
- <p> </p>
- <div class="form-group">
- <label for="install_key" class="col-sm-3 control-label">{tmpl_var name='install_key_txt'}</label>
- <div class="col-sm-9"><input type="text" name="install_key" id="install_key" value="{tmpl_var name='install_key'}" class="form-control" /></div></div>
-
- <input type="hidden" name="package" value="{tmpl_var name='package_name'}">
- <input type="hidden" name="server_id" value="{tmpl_var name='server_id'}">
- <p> </p>
- <div class="clear"><div class="right">
- <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/software_package_install.php">{tmpl_var name='btn_save_txt'}</button>
- <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/software_package_list.php">{tmpl_var name='btn_cancel_txt'}</button>
- </div></div>
-
- </div>
- </tmpl_if>
-</div>
\ No newline at end of file
diff --git a/interface/web/admin/templates/software_package_list.htm b/interface/web/admin/templates/software_package_list.htm
deleted file mode 100644
index e69e3780af4e3ccff25906c9a5867f46b8b19f5c..0000000000000000000000000000000000000000
--- a/interface/web/admin/templates/software_package_list.htm
+++ /dev/null
@@ -1,55 +0,0 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"></h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
-
-
- <p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
-
- <button class="btn btn-default formbutton-success" type="button" data-load-content="admin/software_package_list.php?action=repoupdate">{tmpl_var name="repoupdate_txt"}</button>
-
-
-
-
- <p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
- <div class="table-wrapper marginTop15">
-<table class="table">
- <thead class="dark form-group-sm">
- <tr>
- <th data-column="installed"><tmpl_var name="installed_txt"></th>
- <th data-column="package_title"><tmpl_var name="package_title_txt"></th>
- <th data-column="package_description"><tmpl_var name="package_description_txt"></th>
- <th data-column="package_id"><tmpl_var name="package_id_txt"></th>
- <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
- </tr>
- </thead>
- <tbody>
- <tmpl_loop name="records">
- <tmpl_if name="has_packages">
- <tr>
- <td>{tmpl_var name="installed"}</td>
- <td>{tmpl_var name="package_title"}</td>
- <td>{tmpl_var name="package_description"}</td>
- <td>ispapp{tmpl_var name="package_id"}</td>
- <td class="text-right">
- <a class="btn btn-default formbutton-default formbutton-narrow" data-load-content="admin/software_package_edit.php?id={tmpl_var name='package_id'}"><span class="icon icon-edit"></span></a>
- <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('admin/software_package_del.php?software_update_inst_id={tmpl_var name='software_update_inst_id'}&_csrf_id={tmpl_var name='csrf_id'}&_csrf_key={tmpl_var name='csrf_key'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
- </td>
- </tr>
- </tmpl_if>
- </tmpl_loop>
- <tmpl_unless name="records">
- <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td colspan="5">{tmpl_var name='no_packages_txt'}</td>
- </tr>
- </tmpl_unless>
- </tbody>
- <tfoot>
- <tr>
- <td colspan="5"></td>
- </tr>
- </tfoot>
- </table>
-</div>
-
-
\ No newline at end of file
diff --git a/interface/web/admin/templates/software_repo_edit.htm b/interface/web/admin/templates/software_repo_edit.htm
deleted file mode 100644
index a43ea74900dddbd01d8091792acddadf45a15764..0000000000000000000000000000000000000000
--- a/interface/web/admin/templates/software_repo_edit.htm
+++ /dev/null
@@ -1,26 +0,0 @@
- <div class="form-group">
- <label for="repo_name" class="col-sm-3 control-label">{tmpl_var name='repo_name_txt'}</label>
- <div class="col-sm-9"><input type="text" name="repo_name" id="repo_name" value="{tmpl_var name='repo_name'}" class="form-control" /></div></div>
- <div class="form-group">
- <label for="repo_url" class="col-sm-3 control-label">{tmpl_var name='repo_url_txt'}</label>
- <div class="col-sm-9"><input type="text" name="repo_url" id="repo_url" value="{tmpl_var name='repo_url'}" class="form-control" /></div></div>
- <div class="form-group">
- <label for="repo_username" class="col-sm-3 control-label">{tmpl_var name='repo_username_txt'}</label>
- <div class="col-sm-9"><input type="text" name="repo_username" id="repo_username" value="{tmpl_var name='repo_username'}" autocomplete="off" class="form-control" /></div></div>
- <div class="form-group">
- <label for="repo_password" class="col-sm-3 control-label">{tmpl_var name='repo_password_txt'}</label>
- <div class="col-sm-9"><input type="password" name="repo_password" id="repo_password" value="{tmpl_var name='repo_password'}" autocomplete="off" class="form-control" /></div></div>
- <div class="form-group">
- <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
- <div class="col-sm-9">
- {tmpl_var name='active'}
- </div>
- </div>
-
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="clear"><div class="right">
- <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/software_repo_edit.php">{tmpl_var name='btn_save_txt'}</button>
- <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/software_repo_list.php">{tmpl_var name='btn_cancel_txt'}</button>
- </div></div>
diff --git a/interface/web/admin/templates/software_repo_list.htm b/interface/web/admin/templates/software_repo_list.htm
deleted file mode 100644
index d408896de6f943ba0a5d23240f37eefb58dc858a..0000000000000000000000000000000000000000
--- a/interface/web/admin/templates/software_repo_list.htm
+++ /dev/null
@@ -1,58 +0,0 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"></h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
-
-
- <p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
-
- <button class="btn btn-default formbutton-success" type="button" data-load-content="admin/software_repo_edit.php">{tmpl_var name="add_new_record_txt"}</button>
-
-
-
-
- <p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
- <div class="table-wrapper marginTop15">
-<table class="table">
- <thead class="dark form-group-sm">
- <tr>
- <th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
- <th data-column="repo_name"><tmpl_var name="repo_name_txt"></th>
- <th data-column="repo_url"><tmpl_var name="repo_url_txt"></th>
- <th class="text-right"> </th>
- </tr>
- <tr>
- <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
- <td><input class="form-control" type="text" name="search_repo_name" value="{tmpl_var name='search_repo_name'}" /></td>
- <td><input class="form-control" type="text" name="search_repo_url" value="{tmpl_var name='search_repo_url'}" /></td>
- <td class="text-right">
- <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="admin/software_repo_list.php"><span class="icon icon-filter"></span></button>
- </td>
- </tr>
- </thead>
- <tbody>
- <tmpl_loop name="records">
- <tr>
- <td><a href="#" data-load-content="admin/software_repo_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
- <td><a href="#" data-load-content="admin/software_repo_edit.php?id={tmpl_var name='id'}">{tmpl_var name="repo_name"}</a></td>
- <td><a href="#" data-load-content="admin/software_repo_edit.php?id={tmpl_var name='id'}">{tmpl_var name="repo_url"}</a></td>
- <td class="text-right">
- <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('admin/software_repo_del.php?id={tmpl_var name='id'}&_csrf_id={tmpl_var name='csrf_id'}&_csrf_key={tmpl_var name='csrf_key'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
- </td>
- </tr>
- </tmpl_loop>
- <tmpl_unless name="records">
- <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td colspan="4">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
- </tr>
- </tmpl_unless>
- </tbody>
- <tfoot>
- <tr>
- <td colspan="4"><tmpl_var name="paging"></td>
- </tr>
- </tfoot>
- </table>
-</div>
-
-
\ No newline at end of file
diff --git a/interface/web/admin/templates/software_update_list.htm b/interface/web/admin/templates/software_update_list.htm
deleted file mode 100644
index 6776b66a7a04ea4d3feb66fbe99dcf9b3e072b98..0000000000000000000000000000000000000000
--- a/interface/web/admin/templates/software_update_list.htm
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"></h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
-
-
- <legend>Tools</legend>
-
- <div class="form-group">
- <label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_select_txt'}</label>
- <div class="col-sm-9"><select name="server_id" id="server_id" class="form-control" onChange="ISPConfig.submitForm('pageForm','admin/software_update_list.php');">
- <tmpl_loop name="servers">
- <option value="{tmpl_var name='server_id'}" {tmpl_var name='selected'}>{tmpl_var name='server_name'}</option>
- </tmpl_loop>
- </select></div>
-
-
- </div>
-
-
- <p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
- <div class="table-wrapper marginTop15">
-<table class="table">
- <thead class="dark form-group-sm">
- <tr>
- <th data-column="installed"><tmpl_var name="installed_txt"></th>
- <th data-column="update_title"><tmpl_var name="update_title_txt"></th>
- <th data-column="version"><tmpl_var name="version_txt"></th>
- </tr>
- </thead>
- <tbody>
- <tmpl_loop name="records">
- <tr>
- <td>{tmpl_var name="installed"}</td>
- <td>{tmpl_var name="update_title"}</td>
- <td>{tmpl_var name="version"}</td>
- </tr>
- </tmpl_loop>
- <tmpl_unless name="records">
- <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td colspan="3">{tmpl_var name='no_updates_txt'}</td>
- </tr>
- </tmpl_unless>
- </tbody>
- <tfoot>
- <tr>
- <td colspan="3"></td>
- </tr>
- </tfoot>
- </table>
-</div>
-
-
\ No newline at end of file
diff --git a/security/README.txt b/security/README.txt
index b42cbaabb4adb2c698506c7c7abb1ecd22debc52..1825b981f2796bbdbbab6b81c4e984771fb32673 100644
--- a/security/README.txt
+++ b/security/README.txt
@@ -1,7 +1,7 @@
Description for security_settings.ini values.
-The option "superadmin" means that a setting is only available to the admin user with userid 1 in the interface.
+The option "superadmin" means that a setting is only available to the admin user with userid 1 in the interface.
If there are other amdins, then they cant access this setting.
-----------------------------------------------------------
@@ -57,14 +57,6 @@ Setting: admin_allow_osupdate
Options: yes/no/superadmin
Description: Disables System > OS update
-Setting: admin_allow_software_packages
-Options: yes/no/superadmin
-Description: Disables System > Apps & Addons > Packages and Update
-
-Setting: admin_allow_software_repo
-Options: yes/no/superadmin
-Description: Disables System > Apps & Addons > Repo
-
Setting: remote_api_allowed
Options: yes/no
Description: Disables the remote API
@@ -80,13 +72,13 @@ Description: Enables the Intrusion Detection System
Setting: ids_log_level
Options: 1 (number, default = 1)
Description: IDS score that triggers the log in /usr/local/ispconfig/interface/temp/ids.log
- This log can be used to feed the whitelist.
-
+ This log can be used to feed the whitelist.
+
Example:
-
+
cat /usr/local/ispconfig/interface/temp/ids.log >> /usr/local/ispconfig/security/ids.whitelist
rm -f /usr/local/ispconfig/interface/temp/ids.log
-
+
If you want to use a custom whitelist, then store it as /usr/local/ispconfig/security/ids.whitelist.custom
Setting: ids_warn_level
@@ -95,7 +87,7 @@ Description: When the IDS score exceeds this level, a error message is logged in
Setting: ids_block_level
Options: 100 (number, default = 100)
-Description: When the IDS score exceeds this level, a error message is shown to the user and further processing is blocked. A score of 100 will most likely never be reached.
+Description: When the IDS score exceeds this level, a error message is shown to the user and further processing is blocked. A score of 100 will most likely never be reached.
We have choosen such a high score as default until we have more complete whitelists for this new feature.
Setting: sql_scan_enabled
@@ -135,5 +127,3 @@ Description: Warn by email when /etc/shadow has been changed.
Setting: warn_group_change
Options: yes/no
Description: Warn by email when /etc/group has been changed.
-
-
diff --git a/server/mods-available/server_module.inc.php b/server/mods-available/server_module.inc.php
index bc846cf53062b0cec4fc653095a00ecace34f6a1..92a50c51286b32f092150568d6cc69bfc0c4f845 100644
--- a/server/mods-available/server_module.inc.php
+++ b/server/mods-available/server_module.inc.php
@@ -40,10 +40,7 @@ class server_module {
'server_ip_delete',
'firewall_insert',
'firewall_update',
- 'firewall_delete',
- 'software_update_inst_insert',
- 'software_update_inst_update',
- 'software_update_inst_delete');
+ 'firewall_delete');
//* This function is called during ispconfig installation to determine
// if a symlink shall be created for this plugin.
@@ -81,7 +78,6 @@ class server_module {
$app->modules->registerTableHook('server', 'server_module', 'process');
$app->modules->registerTableHook('server_ip', 'server_module', 'process');
$app->modules->registerTableHook('firewall', 'server_module', 'process');
- $app->modules->registerTableHook('software_update_inst', 'server_module', 'process');
// Register service
//$app->services->registerService('httpd','web_module','restartHttpd');
@@ -112,11 +108,6 @@ class server_module {
if($action == 'u') $app->plugins->raiseEvent('firewall_update', $data);
if($action == 'd') $app->plugins->raiseEvent('firewall_delete', $data);
break;
- case 'software_update_inst':
- if($action == 'i') $app->plugins->raiseEvent('software_update_inst_insert', $data);
- if($action == 'u') $app->plugins->raiseEvent('software_update_inst_update', $data);
- if($action == 'd') $app->plugins->raiseEvent('software_update_inst_delete', $data);
- break;
} // end switch
} // end function