MP: fixes to the install process

docs/INSTALL

@@ -1,7 +1,8 @@
 Here are some basic notes on installation of the system.
 
 The files in www/local will not be touched and are meant to house local
-configuration and modules/plugins.
+configuration and modules/plugins.  However a few files will be touched by
+the installer in www/local/config such as the database_settings.inc.php file
 
 REQUIREMENTS:
   An apache server
@@ -32,7 +33,8 @@ INSTALL:
 
 4. touch /var/log/ona.log
 5. chmod 666 /var/log/ona.log
-6. Point your broswer to http://<servername>/ona
+6. chown www-data /opt/ona/www/local/config (or whatever your web server user is)
+7. Point your broswer to http://<servername>/ona
 
 
 MISC:

docs/UPGRADES

@@ -1,3 +1,8 @@
 Upgrades prior to version 08.02.18 must be manually done by loading the file install/PRE-v08.02.18-to-08.02.18.sql into the database. 
+This upgrade step has not been tested and likly has errors.
 
-Updates after this version should automatically process.
+If you are currently on v08.02.18 and you are upgrading to version v08.04.15 then you must load the following sql file:
+
+mysql -u <adminuser> -p ona < install/v08.02.18-to-v08.04.15.sql
+
+Updates after version v08.04.15 should automatically process.

install/PRE-v08.02.18-to-08.02.18.sql

@@ -59,7 +59,7 @@ INSERT INTO `sys_config` (`name`, `value`, `description`) VALUES
 ('stdout', '0', 'Flag to allow logging via STDOUT.. This is extreme debugging, not recomended.'),
 ('suggest_max_results', '10', 'Limits the amount of rows returned by queries. (test impact of changing this first)'),
 ('syslog', '0', 'Log via syslog, only works if debug is set to 0'),
-('version', '', 'Tracks current installed version, used to detect when upgrades should be done.');
+('version', '', 'Tracks current installed version, used to detect when upgrades should be done.'),
 ('upgrade_index', '1', 'Tracks current upgrade index, used to process database upgrades in order.');
 
 

install/install.php

@@ -72,7 +72,7 @@
             $result = mysql_query("SELECT value FROM sys_config WHERE name like 'version';",$con);
             $curr_ver = @mysql_result($result, 0);
 
-            if ($curr_ver == ' ') { $curr_ver = 'PRE-v08.02.18'; }
+            if ($curr_ver == '') { $curr_ver = 'PRE-v08.02.18'; }
 
             // Update the greet text with new info
             $greet_txt = "It looks as though you already have version '{$curr_ver}' of OpenNetAdmin installed.  You should make a backup of the data before proceeding with the upgrade.<br><br>We will be upgrading to the version '{$new_ver}'.";
@@ -209,7 +209,7 @@
             $result = mysql_query("SELECT value FROM sys_config WHERE name like 'upgrade_index';",$con);
             $upgrade_index = @mysql_result($result, 0);
         }
-$upgrade_index =1;
+
         if ($upgrade_index == '') {
             $text .= "<img src=\"{$images}/silk/error.png\" border=\"0\" /> Auto upgrades not yet supported. Please see docs/UPGRADES<br>";
         } else {

install/v08.02.18-to-v08.04.15.sql

@@ -0,0 +1,8 @@
+INSERT INTO `sys_config` (`name`, `value`, `description`) VALUES
+('version', '', 'Tracks current installed version, used to detect when upgrades should be done.'),
+('upgrade_index', '1', 'Tracks current upgrade index, used to process database upgrades in order.');
+
+INSERT INTO `permissions` (`id`, `name`, `description`) VALUES 
+(16, 'vlan_add', 'Add VLANs and VLAN Campuses'),
+(17, 'vlan_del', 'Delete VLANs and VLAN Campuses'),
+(18, 'vlan_modify', 'Modify VLANs and VLAN Campuses');