diff --git a/install/froxlor.sql b/install/froxlor.sql index c8470f1f..37581ceb 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -15,7 +15,7 @@ CREATE TABLE `ftp_groups` ( PRIMARY KEY (`id`), UNIQUE KEY `groupname` (`groupname`), KEY `customerid` (`customerid`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; # # Dumping data for table `ftp_groups` @@ -48,7 +48,7 @@ CREATE TABLE `ftp_users` ( PRIMARY KEY (`id`), UNIQUE KEY `username` (`username`), KEY `customerid` (`customerid`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; # # Dumping data for table `ftp_users` @@ -80,7 +80,7 @@ CREATE TABLE `mail_users` ( `imap` tinyint(1) NOT NULL default '1', PRIMARY KEY (`id`), UNIQUE KEY `email` (`email`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; # # Dumping data for table `mail_users` @@ -105,7 +105,7 @@ CREATE TABLE `mail_virtual` ( `iscatchall` tinyint(1) unsigned NOT NULL default '0', PRIMARY KEY (`id`), KEY `email` (`email`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; # # Dumping data for table `mail_virtual` @@ -168,7 +168,7 @@ CREATE TABLE `panel_admins` ( `email_autoresponder_used` int(5) NOT NULL default '0', PRIMARY KEY (`adminid`), UNIQUE KEY `loginname` (`loginname`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; # -------------------------------------------------------- @@ -234,7 +234,7 @@ CREATE TABLE `panel_customers` ( `email_autoresponder_used` int(5) NOT NULL default '0', PRIMARY KEY (`customerid`), UNIQUE KEY `loginname` (`loginname`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; # # Dumping data for table `panel_customers` # @@ -256,7 +256,7 @@ CREATE TABLE `panel_databases` ( `apsdb` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`), KEY `customerid` (`customerid`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; # # Dumping data for table `panel_databases` @@ -310,7 +310,7 @@ CREATE TABLE `panel_domains` ( KEY `customerid` (`customerid`), KEY `parentdomain` (`parentdomainid`), KEY `domain` (`domain`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; # # Dumping data for table `panel_domains` @@ -340,7 +340,7 @@ CREATE TABLE `panel_ipsandports` ( `ssl_cert_chainfile` varchar(255) NOT NULL, `docroot` varchar(255) NOT NULL default '', PRIMARY KEY (`id`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; # # Dumping data for table `panel_ipsandports` @@ -366,7 +366,7 @@ CREATE TABLE `panel_htaccess` ( `error401path` varchar(255) NOT NULL default '', `options_cgi` tinyint(1) NOT NULL default '0', PRIMARY KEY (`id`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; # # Dumping data for table `panel_htaccess` @@ -389,7 +389,7 @@ CREATE TABLE `panel_htpasswds` ( `authname` varchar(255) NOT NULL default 'Restricted Area', PRIMARY KEY (`id`), KEY `customerid` (`customerid`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; # # Dumping data for table `panel_htpasswds` @@ -435,7 +435,7 @@ CREATE TABLE `panel_settings` ( `varname` varchar(255) NOT NULL default '', `value` text NOT NULL, PRIMARY KEY (`settingid`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; # -------------------------------------------------------- @@ -624,7 +624,7 @@ CREATE TABLE `panel_tasks` ( `type` int(11) NOT NULL default '0', `data` text NOT NULL, PRIMARY KEY (`id`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; # # Dumping data for table `panel_tasks` @@ -647,7 +647,7 @@ CREATE TABLE `panel_templates` ( `value` longtext NOT NULL, PRIMARY KEY (id), KEY adminid (adminid) -) TYPE=MyISAM; +) ENGINE=MyISAM; # # Dumping data for table `panel_templates` @@ -674,7 +674,7 @@ CREATE TABLE `panel_traffic` ( `mail` bigint(30) unsigned NOT NULL default '0', PRIMARY KEY (`id`), KEY `customerid` (`customerid`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; # # Dumping data for table `panel_traffic` @@ -701,7 +701,7 @@ CREATE TABLE `panel_traffic_admins` ( `mail` bigint(30) unsigned NOT NULL default '0', PRIMARY KEY (`id`), KEY `adminid` (`adminid`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; # # Dumping data for table `panel_traffic_admins` @@ -727,7 +727,7 @@ CREATE TABLE `panel_diskspace` ( `mysql` bigint(30) unsigned NOT NULL default '0', PRIMARY KEY (`id`), KEY `customerid` (`customerid`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; # # Dumping data for table `panel_diskspace` @@ -752,7 +752,7 @@ CREATE TABLE `panel_diskspace_admins` ( `mysql` bigint(30) unsigned NOT NULL default '0', PRIMARY KEY (`id`), KEY `adminid` (`adminid`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; # # Dumping data for table `panel_diskspace_admins` @@ -770,7 +770,7 @@ CREATE TABLE `panel_languages` ( `language` varchar(30) NOT NULL default '', `file` varchar(255) NOT NULL default '', PRIMARY KEY (`id`) -) TYPE=MyISAM ; +) ENGINE=MyISAM ; # # Dumping data for table `panel_languages` diff --git a/install/install.php b/install/install.php index ef9f6950..93063bbb 100644 --- a/install/install.php +++ b/install/install.php @@ -212,6 +212,20 @@ function requirement_checks() { status_message('green', 'OK'); } + + status_message('begin', $lng['install']['phpxml']); + + if(!extension_loaded('xml')) + { + status_message('red', $lng['install']['notinstalled']); + $_die = true; + } + else + { + status_message('green', 'OK'); + } + + status_message('begin', $lng['install']['phpfilter']); diff --git a/install/lng/english.lng.php b/install/lng/english.lng.php index 960816c3..6cfac351 100644 --- a/install/lng/english.lng.php +++ b/install/lng/english.lng.php @@ -97,5 +97,5 @@ $lng['install']['froxlor_succ_checks'] = 'All requirements are satisfied'; $lng['install']['phpmagic_quotes_runtime'] = 'Checking whether magic_quotes_runtime is off'; $lng['install']['active'] = 'no'; $lng['install']['phpmagic_quotes_runtime_description'] = 'PHP setting "magic_quotes_runtime" must be set to "Off" in order to avoid strange behavior of Froxlor. Disabling it for now (this is only temporary, please fix our php.ini).'; - +$lng['install']['phpxml'] = 'Testing if PHP XML-extension is installed...'; ?> diff --git a/install/lng/french.lng.php b/install/lng/french.lng.php index ab9d5291..d80297bf 100644 --- a/install/lng/french.lng.php +++ b/install/lng/french.lng.php @@ -68,4 +68,5 @@ $lng['install']['httpgroup'] = 'Nom du la group du HTTP'; $lng['install']['webserver'] = 'Version du serveur'; +$lng['install']['phpxml'] = 'Tester si PHP XML-extension est installée...'; ?> diff --git a/install/lng/german.lng.php b/install/lng/german.lng.php index 9f4f91d0..755402cd 100644 --- a/install/lng/german.lng.php +++ b/install/lng/german.lng.php @@ -97,5 +97,5 @@ $lng['install']['froxlor_succ_checks'] = 'Alle Vorraussetzungen sind erfüll $lng['install']['phpmagic_quotes_runtime'] = 'Prüfe ob magic_quotes_runtime ausgeschalten ist'; $lng['install']['active'] = 'nein'; $lng['install']['phpmagic_quotes_runtime_description'] = 'Die PHP Einstellung "magic_quotes_runtime" muss deaktiviert sein ("Off"), um merkwürdige Verhalten von Froxlor zu umgehen. Sie wurde deaktiviert (nur temporär, bitte php.ini anpassen).'; - +$lng['install']['phpxml'] = 'Teste, ob die PHP XML-Erweiterung installiert ist...'; ?>