Skip to content

Commit 6149e17

Browse files
tbrehmtbrehm
committed
Removed some unmaintained tables and files and introduced the pre_update.sql script for sql commands to be run before an update.
1 parent 99481a0 commit 6149e17

24 files changed

+55
-1374
lines changed

‎install/sql/ispconfig3.sql‎

Lines changed: 0 additions & 257 deletions
Original file line numberDiff line numberDiff line change
@@ -40,126 +40,6 @@ SET FOREIGN_KEY_CHECKS = 0;
4040
-- --------------------------------------------------------
4141
-- --------------------------------------------------------
4242

43-
--
44-
-- Table structure for table `billing_invoice`
45-
--
46-
47-
CREATE TABLE `billing_invoice` (
48-
`billing_invoice_id` int(11) unsigned NOT NULL auto_increment,
49-
`sys_userid` int(11) unsigned NOT NULL default '0',
50-
`sys_groupid` int(11) unsigned NOT NULL default '0',
51-
`sys_perm_user` varchar(5) default NULL,
52-
`sys_perm_group` varchar(5) default NULL,
53-
`sys_perm_other` varchar(5) default NULL,
54-
`sys_perm_all` varchar(5) default NULL,
55-
`invoice_number` varchar(32) NOT NULL default '',
56-
`invoice_date` date default NULL,
57-
`xml` longtext NOT NULL,
58-
`total_fee_net` decimal(10,4) NOT NULL default '0.00',
59-
`total_fee_gross` decimal(10,4) NOT NULL default '0.00',
60-
`currency_code` char(3) default 'EUR',
61-
PRIMARY KEY (`billing_invoice_id`)
62-
) ENGINE=MyISAM AUTO_INCREMENT=1;
63-
64-
-- --------------------------------------------------------
65-
66-
--
67-
-- Table structure for table `billing_product`
68-
--
69-
70-
CREATE TABLE `billing_product` (
71-
`billing_product_id` int(11) unsigned NOT NULL auto_increment,
72-
`sys_userid` int(11) unsigned NOT NULL default '0',
73-
`sys_groupid` int(11) unsigned NOT NULL default '0',
74-
`sys_perm_user` varchar(5) default NULL,
75-
`sys_perm_group` varchar(5) default NULL,
76-
`sys_perm_other` varchar(5) default NULL,
77-
`sys_perm_all` varchar(5) default NULL,
78-
`parent_id` int(11) unsigned NOT NULL default '0',
79-
`product_name` varchar(64) default NULL,
80-
`product_details` varchar(256) default NULL,
81-
`template_id` int(11) unsigned NOT NULL default '0',
82-
`service_class_id` int(11) unsigned NOT NULL default '0',
83-
`billing_tax_id` int(11) unsigned NOT NULL default '0',
84-
`setup_fee_gross` decimal(10,4) NOT NULL default '0.00',
85-
`interval_fee_gross` decimal(10,4) NOT NULL default '0.00',
86-
`interval_length` tinyint(3) NOT NULL default '0',
87-
`interval_type` enum('non-recurring','hour','day','week','month','quarter','year') NOT NULL default 'non-recurring',
88-
`interval_payment` enum('prepaid','postpaid') NOT NULL default 'prepaid',
89-
`clearing_period` tinyint(3) unsigned default '1',
90-
`currency_code` char(3) default 'EUR',
91-
PRIMARY KEY (`billing_product_id`)
92-
) ENGINE=MyISAM AUTO_INCREMENT=1;
93-
94-
-- --------------------------------------------------------
95-
96-
--
97-
-- Table structure for table `billing_service`
98-
--
99-
100-
CREATE TABLE `billing_service` (
101-
`billing_service_id` int(11) unsigned NOT NULL auto_increment,
102-
`sys_userid` int(11) unsigned NOT NULL default '0',
103-
`sys_groupid` int(11) unsigned NOT NULL default '0',
104-
`sys_perm_user` varchar(5) default NULL,
105-
`sys_perm_group` varchar(5) default NULL,
106-
`sys_perm_other` varchar(5) default NULL,
107-
`sys_perm_all` varchar(5) default NULL,
108-
`product_id` int(11) unsigned default NULL,
109-
`product_pid` int(11) unsigned default NULL,
110-
`product_name` varchar(64) default NULL,
111-
`product_details` varchar(256) default NULL,
112-
`service_class_id` int(11) unsigned default '0',
113-
`service_template_id` int(11) unsigned default NULL,
114-
`service_id` int(11) unsigned default NULL,
115-
`billing_tax_id` int(11) unsigned NOT NULL default '1',
116-
`quantity` smallint(5) unsigned NOT NULL default '1',
117-
`setup_fee_gross` decimal(10,4) NOT NULL default '0.00',
118-
`interval_fee_gross` decimal(10,4) default '0.00',
119-
`interval_fee_is_individual` tinyint(1) default '0',
120-
`interval_length` int(11) NOT NULL default '1',
121-
`interval_type` enum('non-recurring','hour','day','week','month','quarter','year') NOT NULL default 'non-recurring',
122-
`interval_payment` enum('prepaid','postpaid') NOT NULL default 'prepaid',
123-
`clearing_period` tinyint(3) unsigned default '1',
124-
`currency_code` char(3) default 'EUR',
125-
`is_active` tinyint(1) NOT NULL default '0',
126-
`service_start_at` date default NULL,
127-
`service_end_at` date default NULL,
128-
`invoiced_upto` date default NULL,
129-
PRIMARY KEY (`billing_service_id`)
130-
) ENGINE=MyISAM AUTO_INCREMENT=1;
131-
132-
-- --------------------------------------------------------
133-
134-
--
135-
-- Table structure for table `billing_service_class`
136-
--
137-
138-
CREATE TABLE `billing_service_class` (
139-
`billing_service_class_id` int(11) unsigned NOT NULL auto_increment,
140-
`name` varchar(64) NOT NULL default '',
141-
`sort_order` int(11) unsigned NOT NULL default '0',
142-
PRIMARY KEY (`billing_service_class_id`)
143-
) ENGINE=MyISAM AUTO_INCREMENT=1;
144-
145-
-- --------------------------------------------------------
146-
147-
--
148-
-- Table structure for table `billing_tax`
149-
--
150-
151-
CREATE TABLE `billing_tax` (
152-
`billing_tax_id` int(11) unsigned NOT NULL auto_increment,
153-
`name` varchar(64) NOT NULL default '',
154-
`tax_rate` decimal(10,4) default NULL,
155-
`is_default` tinyint(1) NOT NULL default '0',
156-
`valid_from` date default NULL,
157-
`valid_till` date default NULL,
158-
PRIMARY KEY (`billing_tax_id`)
159-
) ENGINE=MyISAM AUTO_INCREMENT=1;
160-
161-
-- --------------------------------------------------------
162-
16343
--
16444
-- Table structure for table `client`
16545
--
@@ -226,38 +106,6 @@ CREATE TABLE `client` (
226106

227107
-- --------------------------------------------------------
228108

229-
--
230-
-- Table structure for table `client_address_book`
231-
--
232-
233-
CREATE TABLE `client_address_book` (
234-
`client_address_book_id` int(11) unsigned NOT NULL auto_increment,
235-
`sys_userid` int(11) unsigned NOT NULL default '0',
236-
`sys_groupid` int(11) unsigned NOT NULL default '0',
237-
`sys_perm_user` varchar(5) default NULL,
238-
`sys_perm_group` varchar(5) default NULL,
239-
`sys_perm_other` varchar(5) default NULL,
240-
`entry_role` enum('Standard','Other','Administrator','Abuse','Accounting','Owner','Emergency','Technician','Signatory') default 'Standard',
241-
`entry_company` varchar(64) default NULL,
242-
`entry_gender` enum('m','f') default NULL,
243-
`entry_title` varchar(16) default NULL,
244-
`entry_firstname` varchar(32) NOT NULL,
245-
`entry_lastname` varchar(32) NOT NULL,
246-
`entry_address1` varchar(64) default NULL,
247-
`entry_address2` varchar(64) default NULL,
248-
`entry_postcode` varchar(32) NOT NULL,
249-
`entry_city` varchar(64) NOT NULL,
250-
`entry_state` varchar(32) default NULL,
251-
`entry_country` char(2) default NULL,
252-
`entry_phone` varchar(32) default NULL,
253-
`entry_fax` varchar(32) default NULL,
254-
`entry_mobile` varchar(32) default NULL,
255-
`entry_email` varchar(256) default NULL,
256-
PRIMARY KEY (`client_address_book_id`)
257-
) ENGINE=MyISAM AUTO_INCREMENT=1;
258-
259-
-- --------------------------------------------------------
260-
261109
--
262110
-- Table structure for table `client_template`
263111
--
@@ -375,94 +223,6 @@ CREATE TABLE `dns_template` (
375223

376224
-- --------------------------------------------------------
377225

378-
--
379-
-- Table structure for table `domain`
380-
--
381-
382-
CREATE TABLE `domain` (
383-
`domain_id` int(11) unsigned NOT NULL auto_increment,
384-
`sys_userid` int(11) unsigned NOT NULL default '0',
385-
`sys_groupid` int(11) unsigned NOT NULL default '0',
386-
`sys_perm_user` varchar(5) default NULL,
387-
`sys_perm_group` varchar(5) default NULL,
388-
`sys_perm_other` varchar(5) default NULL,
389-
`sys_perm_all` varchar(5) default NULL,
390-
`domain_provider_id` int(11) unsigned NOT NULL default '0',
391-
`provider_domain_id` int(11) unsigned default NULL,
392-
`domain` varchar(255) NOT NULL default '',
393-
`tld` varchar(32) NOT NULL default '',
394-
`handle_desc` varchar(32) default NULL,
395-
`handle_admin_c` varchar(32) default NULL,
396-
`handle_tech_c` varchar(32) default NULL,
397-
`handle_zone_c` varchar(32) default NULL,
398-
`added_at` timestamp NULL default NULL,
399-
`connected_at` date default NULL,
400-
`disconnected_at` date default NULL,
401-
`status` varchar(64) NOT NULL default '0',
402-
PRIMARY KEY (`domain_id`)
403-
) ENGINE=MyISAM AUTO_INCREMENT=1;
404-
405-
-- --------------------------------------------------------
406-
407-
--
408-
-- Table structure for table `domain_handle`
409-
--
410-
411-
CREATE TABLE `domain_handle` (
412-
`domain_handle_id` int(11) unsigned NOT NULL auto_increment,
413-
`sys_userid` int(11) unsigned NOT NULL default '0',
414-
`sys_groupid` int(11) unsigned NOT NULL default '0',
415-
`sys_perm_user` varchar(5) default NULL,
416-
`sys_perm_group` varchar(5) default NULL,
417-
`sys_perm_other` varchar(5) default NULL,
418-
`sys_perm_all` varchar(5) default NULL,
419-
`domain_registrar` varchar(64) default NULL,
420-
`handle` varchar(32) default NULL,
421-
PRIMARY KEY (`domain_handle_id`)
422-
) ENGINE=MyISAM AUTO_INCREMENT=1;
423-
424-
-- --------------------------------------------------------
425-
426-
--
427-
-- Table structure for table `domain_provider`
428-
--
429-
430-
CREATE TABLE `domain_provider` (
431-
`domain_provider_id` int(11) unsigned NOT NULL auto_increment,
432-
`sys_userid` int(11) unsigned NOT NULL default '0',
433-
`sys_groupid` int(11) unsigned NOT NULL default '0',
434-
`sys_perm_user` varchar(5) default NULL,
435-
`sys_perm_group` varchar(5) default NULL,
436-
`sys_perm_other` varchar(5) default NULL,
437-
`sys_perm_all` varchar(5) default NULL,
438-
`provider` varchar(255) default NULL,
439-
`is_extern` tinyint(1) NOT NULL default '0',
440-
`domainrobot_interface` varchar(16) default '',
441-
PRIMARY KEY (`domain_provider_id`)
442-
) ENGINE=MyISAM AUTO_INCREMENT=1;
443-
444-
-- --------------------------------------------------------
445-
446-
--
447-
-- Table structure for table `domain_tld`
448-
--
449-
450-
CREATE TABLE `domain_tld` (
451-
`domain_tld_id` int(11) unsigned NOT NULL auto_increment,
452-
`sys_userid` int(11) unsigned NOT NULL default '0',
453-
`sys_groupid` int(11) unsigned NOT NULL default '0',
454-
`sys_perm_user` varchar(5) default NULL,
455-
`sys_perm_group` varchar(5) default NULL,
456-
`sys_perm_other` varchar(5) default NULL,
457-
`sys_perm_all` varchar(5) default NULL,
458-
`tld` varchar(32) default NULL,
459-
`domain_provider_id` int(11) unsigned NOT NULL default '0',
460-
`domain_registrar` varchar(64) default NULL,
461-
PRIMARY KEY (`domain_tld_id`)
462-
) ENGINE=MyISAM AUTO_INCREMENT=1;
463-
464-
-- --------------------------------------------------------
465-
466226
--
467227
-- Table structure for table `firewall`
468228
--
@@ -1330,23 +1090,6 @@ CREATE TABLE `country` (
13301090
-- --------------------------------------------------------
13311091
-- --------------------------------------------------------
13321092

1333-
--
1334-
-- Dumping data for table `billing_service_class`
1335-
--
1336-
1337-
INSERT INTO `billing_service_class` VALUES (1,'other',9999);
1338-
INSERT INTO `billing_service_class` VALUES (2,'hosting',10);
1339-
INSERT INTO `billing_service_class` VALUES (3,'domains',20);
1340-
INSERT INTO `billing_service_class` VALUES (4,'traffic',30);
1341-
INSERT INTO `billing_service_class` VALUES (5,'diskspace',40);
1342-
1343-
--
1344-
-- Dumping data for table `billing_tax_class`
1345-
--
1346-
1347-
INSERT INTO `billing_tax` VALUES (1,'USt. (DE)',19,1,'2007-01-01',NULL);
1348-
INSERT INTO `billing_tax` VALUES (2,'USt. ermäßigt (DE)',7,0,'2007-01-01',NULL);
1349-
13501093
--
13511094
-- Dumping data for table `dns_template`
13521095
--

interface/web/domain/domain_del.php renamed to install/sql/pre_update.sql

Lines changed: 46 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,46 @@
1-
<?php
2-
3-
/*
4-
Copyright (c) 2007, Till Brehm, projektfarm Gmbh
5-
All rights reserved.
6-
7-
Redistribution and use in source and binary forms, with or without modification,
8-
are permitted provided that the following conditions are met:
9-
10-
* Redistributions of source code must retain the above copyright notice,
11-
this list of conditions and the following disclaimer.
12-
* Redistributions in binary form must reproduce the above copyright notice,
13-
this list of conditions and the following disclaimer in the documentation
14-
and/or other materials provided with the distribution.
15-
* Neither the name of ISPConfig nor the names of its contributors
16-
may be used to endorse or promote products derived from this software without
17-
specific prior written permission.
18-
19-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
20-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
21-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
22-
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
23-
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
24-
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
26-
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
27-
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
28-
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29-
*/
30-
31-
/******************************************
32-
* Begin Form configuration
33-
******************************************/
34-
35-
$list_def_file = "list/domain.list.php";
36-
$tform_def_file = "form/domain.tform.php";
37-
38-
/******************************************
39-
* End Form configuration
40-
******************************************/
41-
42-
require_once('../../lib/config.inc.php');
43-
require_once('../../lib/app.inc.php');
44-
45-
//* Check permissions for module
46-
$app->auth->check_module_permissions('domain');
47-
48-
$app->uses('tpl,tform,tform_actions');
49-
$app->load('tform_actions');
50-
51-
class page_action extends tform_actions {
52-
53-
function onBeforeDelete() {
54-
global $app; $conf;
55-
56-
if($app->tform->checkPerm($this->id,'d') == false) $app->error($app->lng('error_no_delete_permission'));
57-
58-
// Delete all records that belog to this domain.
59-
$app->db->query("DELETE FROM domain WHERE domain_id = $domain_id");
60-
}
61-
}
62-
63-
$page = new page_action;
64-
$page->onDelete();
65-
66-
?>
1+
/*
2+
Copyright (c) 2007-2009, Till Brehm, projektfarm Gmbh
3+
All rights reserved.
4+
5+
Redistribution and use in source and binary forms, with or without modification,
6+
are permitted provided that the following conditions are met:
7+
8+
* Redistributions of source code must retain the above copyright notice,
9+
this list of conditions and the following disclaimer.
10+
* Redistributions in binary form must reproduce the above copyright notice,
11+
this list of conditions and the following disclaimer in the documentation
12+
and/or other materials provided with the distribution.
13+
* Neither the name of ISPConfig nor the names of its contributors
14+
may be used to endorse or promote products derived from this software without
15+
specific prior written permission.
16+
17+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
18+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
20+
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
21+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
22+
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
24+
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
25+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
26+
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27+
*/
28+
29+
--
30+
-- These SQL commands will be executed before the ISPConfig update is performed.
31+
--
32+
33+
SET FOREIGN_KEY_CHECKS = 0;
34+
35+
DROP TABLE IF EXISTS `billing_invoice`;
36+
DROP TABLE IF EXISTS `billing_product`;
37+
DROP TABLE IF EXISTS `billing_service`;
38+
DROP TABLE IF EXISTS `billing_service_class`;
39+
DROP TABLE IF EXISTS `billing_tax`;
40+
DROP TABLE IF EXISTS `client_address_book`;
41+
DROP TABLE IF EXISTS `domain`;
42+
DROP TABLE IF EXISTS `domain_handle`;
43+
DROP TABLE IF EXISTS `domain_provider`;
44+
DROP TABLE IF EXISTS `domain_tld`;
45+
46+
SET FOREIGN_KEY_CHECKS = 1;

0 commit comments

Comments
 (0)