MP: fixes/updates for install process

Gankarloo · May 14, 2010 · 2a7e359 · 2a7e359
1 parent 1302d3b
commit 2a7e359
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/install/8-to-9.xml b/install/8-to-9.xml
@@ -3,9 +3,12 @@
 <sql>
     <query platform="mysql|mysqlt">INSERT INTO sys_config (name,value,description,field_validation_rule,editable,deleteable,failed_rule_text) VALUES ( 'disable_guest', '0', 'Disable the autologin of the guest user.', '', '1', '0', '') on duplicate key update name='disable_guest'</query>
     <query platform="mysql|mysqlt">INSERT INTO sys_config (name,value,description,field_validation_rule,editable,deleteable,failed_rule_text) VALUES ( 'log_to_db', '0', 'Log only level 0 messages to the database.', '', '1', '0', '') on duplicate key update name='log_to_db'</query>
-    <query platform="mysql|mysqlt">INSERT INTO sys_config (name,value,description,field_validation_rule,editable,deleteable,failed_rule_text) VALUES ( 'dns_views', '0', 'Enable support for DNS views.', '', '1', '0', '') on duplicate key update name='dns_views'</query>
+    <query platform="mysql|mysqlt">INSERT INTO sys_config (name,value,description,field_validation_rule,editable,deleteable,failed_rule_text) VALUES ( 'dns_views', '0', 'Enable support for DNS views.', '', '0', '0', '') on duplicate key update name='dns_views'</query>
     <query platform="mysql|mysqlt">INSERT INTO dns_views (id, name, description) VALUES ( '0', 'DEFAULT', 'Default view for dns records') on duplicate key update name='DEFAULT'</query>
     <query platform="mysql|mysqlt">INSERT INTO dcm_module_list (name,description,file) VALUES ('subnet_nextip', 'Return the next available IP address on a subnet', 'ona/subnet.inc.php') on duplicate key update name='subnet_nextip'</query>;
+    <query platform="mysql|mysqlt">INSERT INTO dcm_module_list (name,description,file) VALUES ('report_run', 'Run a report', 'report_run.inc.php') on duplicate key update name='report_run'</query>;
+    <query platform="mysql|mysqlt">INSERT INTO custom_attribute_types VALUES (1,'nmap_scan','Used to determine if this subnet should be scanned by Nmap based tools.','/^[Y|N]$/','Must be either Y or N') on duplicate key update name='nmap_scan';</query>
+
 </sql>
 </schema>
 

diff --git a/install/install.php b/install/install.php
@@ -16,8 +16,9 @@
 $curr_ver = '';
 
 // Get some pre-requisite information
-$phpversion = phpversion() > '4.1' ? 'Yes' : '<font color="red">No</font>';
+$phpversion = phpversion() > '4.3' ? 'Yes' : '<font color="red">No</font>';
 $hasgmp = function_exists( 'gmp_init' ) ? 'Yes' : 'Recommended';
+$hasmbstring = function_exists( 'mb_internal_encoding' ) ? 'Yes' : 'Recommended';
 $dbconfwrite = @is_writable($onabase.'/www/local/config/') ? 'Yes' : '<font color="red">No</font>';
 
 $blankmain = "<script>el('main').style.display = 'none';</script>";
@@ -41,6 +42,7 @@
                     <tr><th colspan="5">Prerequisite checks</th></tr>
                     <tr><td>PHP version > 4.1:</td><td>{$phpversion}</td></tr>
                     <tr title="The PHP GMP modules provide extra functionality, but are not required."><td>Has GMP support:</td><td>{$hasgmp}</td></tr>
+                    <tr title="The PHP mbstring modules provide better text encoding for UTF etc, but are not required."><td>Has mbstring support:</td><td>{$hasmbstring}</td></tr>
                     <tr title="The local config directory must be writable by the web server user: {$_ENV['APACHE_RUN_USER']}"><td>{$onabase}/www/local/config dir writable by '{$_ENV['APACHE_RUN_USER']}':</td><td>{$dbconfwrite}</td></tr>
                 </table>
             </div>
@@ -704,4 +706,4 @@
 
 
 
-?>
+?>
diff --git a/install/ona-data.xml b/install/ona-data.xml
@@ -6,6 +6,10 @@
 
 <query>INSERT INTO `configuration_types` VALUES (1,'IOS_CONFIG'),(2,'IOS_VERSION');</query>
 
+<query>INSERT INTO `custom_attribute_types` VALUES
+(1,'nmap_scan','Used to determine if this subnet should be scanned by Nmap based tools.','/^[Y|N]$/','Must be either Y or N');
+</query>
+
 <query>INSERT INTO `dcm_module_list` VALUES
 ('domain_display','Displays an existing domain','ona/domain.inc.php'),
 ('get_module_list','Returns the list of available modules','get_module_list.inc.php'),
@@ -115,7 +119,7 @@
 ('dns_primary_master', '', 'The fqdn of your default primary master DNS server, leave blank if not required', '', '', 1, 0),
 ('dns_refresh', '86400', 'DNS refresh time used in SOA', '', '', 1, 0),
 ('dns_retry', '3600', 'DNS retry time used in SOA', '', '', 1, 0),
-('dns_views', '0', 'Enable support for DNS views.', '', '', 1, 0),
+('dns_views', '0', 'Enable support for DNS views.', '', '', 0, 0),
 ('logfile', '/var/log/ona.log', 'Local filesystem path to log messages', '', '', 1, 0),
 ('log_to_db', '0', 'Log only level 0 messages to the database.', '', '', 1, 0),
 ('search_results_per_page', '10', 'Sets the amount of rows per page in list items', '', '', 1, 0),