new options and it is now possible to arrange the option entries

diff --git a/ChangeLog b/ChangeLog
index b10131e50f224110aa97eeab323b743a54a5ae7e..b1bfdd2e84e9d6b6060016a4e55dd9372fea7eba 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ version 1.1
        * older and newer link at the top no working
        * bug with path to the jquery.js file
        * some statistics
+       * options can be ordered now
 
 version 1.0 ()
 + jumpin.banana

diff --git a/lib/Insipid/Database.pm b/lib/Insipid/Database.pm
index 0815a7f070ad1290546c441e3ec8df90612ed064..28c239bb15f784fb72c2ca7657df010dd6969314 100755 (executable)
--- a/lib/Insipid/Database.pm
+++ b/lib/Insipid/Database.pm
@@ -70,32 +70,37 @@ sub export_options {
        $writer->endTag('options');
 }
 
+# this function is special for every version.
+# there is no generic function for upgrades
+# so changes to the DB needs to be saved here too
+# in the next version change this
 sub dbupgrade {
-       my $sql = "update $tbl_options set value = ? where (name = ?)";
+
+
+       my $sql = "ALTER TABLE `$tbl_options` ADD COLUMN `pos` int(10) NOT NULL AFTER `value`;";
        my $sth = $dbh->prepare($sql);
-       $sth->execute($version, 'version');
+       $sth->execute;
 
-       $sql = "insert into $tbl_options(name, value, description)
-                       values(?, ?, ?)";
-       $sth = $dbh->prepare($sql);
-       $sth->execute('version', $version, 'Internal Insipid version');
-       $sth->execute('use_rewrite', 'yes', 'Use mod_rewrite - disable this if you do not want to use mod_rewrite.');
+       my $sql = "UPDATE $tbl_options SET pos = ? where (name = ?)";
+       my $sth = $dbh->prepare($sql);
+       $sth->execute(3, 'feed_name');
+       $sth->execute(1, 'site_name');
+       $sth->execute(20, 'proxy_host');
+       $sth->execute(21, 'proxy_port');
+       $sth->execute(2, 'public_searches');
+       $sth->execute(90, 'use_rewrite');
+       $sth->execute(9999, 'version');
 
-       # Delete the old sessions table
-       $sql = 'drop table sessions';
-       $sth = $dbh->prepare($sql);
-       $sth->execute();
 
-       # Create the new session table if it's not there.
-       $sql = "create table $tbl_authentication (
-                       session_id varchar(32),
-                       create_time int,
-                       primary key(session_id))";
-       $sth = $dbh->prepare($sql);
-       $sth->execute();
-       if($dbh->errstr) {
-               print STDERR $dbh->errstr;
-       }
+       $sql = "INSERT INTO `$tbl_options` ( `name`, `value`, `description`, `pos`)
+                       VALUES ( 'feed_num', '10', 'How many feed entries per default (0 = all)', '4')";
+       my $sth = $dbh->prepare($sql);
+       $sth->execute;
+
+
+       my $sql = "update $tbl_options set value = ? where (name = ?)";
+       my $sth = $dbh->prepare($sql);
+       $sth->execute($version, 'version');
 
        return;
 }

diff --git a/lib/Insipid/Main.pm b/lib/Insipid/Main.pm
index 7557d69430088ee3fba141fd1141b87dfa43d3c8..e9a0b828544c3c80b0ecbf7b57d908a1b1273a0f 100755 (executable)
--- a/lib/Insipid/Main.pm
+++ b/lib/Insipid/Main.pm
@@ -524,7 +524,9 @@ sub show_options {
     }
 
     # Now show em
-    my $sql = "select name, description, value from $tbl_options";
+    my $sql = "SELECT name, description, value
+                               FROM $tbl_options
+                               ORDER BY `pos`";
     my $sth = $dbh->prepare($sql);
     $sth->execute();
 

diff --git a/lib/Insipid/Schemas.pm b/lib/Insipid/Schemas.pm
index 4c3c293ab512aad2fccd91af96fe4aa768e639a2..26f05cb221abaf920a2fa972a1ab1c5cfd4a85e2 100755 (executable)
--- a/lib/Insipid/Schemas.pm
+++ b/lib/Insipid/Schemas.pm
@@ -42,7 +42,7 @@ $createMySQL
 # Insipid will check the database version number on each initialization of
 # the options table (every hit essentially) and upgrade the tables if there's
 # any mismatch.
-our $version = "1.0";
+our $version = "1.1";
 
 our $createMySQL = <<CMYSQL;
 CREATE TABLE IF NOT EXISTS $tbl_authentication (
@@ -82,6 +82,7 @@ CREATE TABLE IF NOT EXISTS $tbl_options (
         name VARCHAR(255) NOT NULL UNIQUE,
         description TEXT NOT NULL DEFAULT '',
         value TEXT NOT NULL DEFAULT '',
+               pos INT(10) NO NULL,
         PRIMARY KEY(name)
 );
 
@@ -104,44 +105,55 @@ CREATE TABLE IF NOT EXISTS $tbl_pagecache_references (
 INSERT IGNORE INTO $tbl_options VALUES(
   'feed_name',
   'The title of your feed (e.g. My Bookmarks)',
-  'Bookmarks'
+  'Bookmarks',
+  3
+);
+INSERT IGNORE INTO $tbl_options VALUES(
+  'feed_num',
+  'How many feed entries per default (0 = all)',
+  '10',
+  4
 );
 
 INSERT IGNORE INTO $tbl_options VALUES(
   'site_name',
   'The title of the main page (e.g. My Bookmarks)',
-  'My Bookmarks'
+  'My Bookmarks',
+  1
 );
 
 INSERT IGNORE INTO $tbl_options VALUES(
   'public_searches',
   'Allow public searches - when set to yes, any visitor can search your bookmarks.',
-  'no'
+  'no',
+  2
 );
 
 INSERT IGNORE INTO $tbl_options VALUES(
   'proxy_host',
   'The proxy server (if any) to use when making page snapshots.',
-  ''
+  '',
+  20
 );
-
-
 INSERT IGNORE INTO $tbl_options VALUES(
   'proxy_port',
   'Your proxy port number.',
-  '3128'
+  '3128',
+  21
 );
 
 INSERT IGNORE INTO $tbl_options VALUES(
   'version',
   'Internal Insipid version number',
-  '$version'
+  '$version',
+  9999
 );
 
 INSERT IGNORE INTO $tbl_options VALUES(
   'use_rewrite',
   'Use mod_rewrite - disable this if you do not want .htaccess-controlled URLs, or if your Apache does not have the rewrite module installed.',
-  'no'
+  'no',
+  90
 );
 CMYSQL