Changeset 1535

Timestamp:

12/01/2009 04:26:58 PM (9 months ago)

Author:

BrianKoontz

Message:

Rolled back several installer changes: [1524],[1523],[1521],[1520],
and [1515]. Refs #912.

Location:

branches/1.3

Files:

• .htaccess (modified) (1 diff)
• lang/en/defaults/TableMarkup.txt (added)
• lang/en/defaults/TableMarkupReference.txt (added)
• libs/Config.class.php (deleted)
• libs/Wakka.class.php (modified) (5 diffs)
• setup/check.php (deleted)
• setup/css (deleted)
• setup/default.php (modified) (1 diff)
• setup/footer.php (copied) (copied from branches/1.2/setup/footer.php)
• setup/grabinfo.php (deleted)
• setup/header.php (copied) (copied from branches/1.2/setup/header.php)
• setup/inc (deleted)
• setup/index.php (deleted)
• setup/install.php (modified) (11 diffs)
• setup/links.php (deleted)
• setup/setup.php (deleted)
• setup/writeconfig.php (modified) (2 diffs)
• wikka.php (modified) (8 diffs)

branches/1.3/.htaccess

@@ -6 +6 @@
 
 <IfModule mod_rewrite.c>
- #By default, RewriteEngine should be set to Off, to ensure at least installer works.
- RewriteEngine Off
- RewriteCond %{REQUEST_FILENAME} -d
- RewriteRule ^(.*/[^\./]*[^/])$ $1/
- RewriteRule ^(.*)$ wikka.php?wakka=$1 [QSA,L]
-</IfModule>
+        # turn on rewrite engine
+        RewriteEngine on
+
+        # if request is a directory, make sure it ends with a slash
+        RewriteCond %{REQUEST_FILENAME} -d
+        RewriteRule ^(.*/[^/]+)$ $1/
+
+        # if not rewritten before, AND requested file is wikka.php
+        # turn request into a query for a default (unspecified) page
+        RewriteCond %{QUERY_STRING} !wakka=
+        RewriteCond %{REQUEST_FILENAME} wikka.php
+        RewriteRule ^(.*)$ wikka.php?wakka= [QSA,L]
+
+        # if not rewritten before, AND requested file is a page name
+        # turn request into a query for that page name for wikka.php
+        RewriteCond %{QUERY_STRING} !wakka=
+        RewriteRule ^(.*)$ wikka.php?wakka=$1 [QSA,L]

branches/1.3/libs/Wakka.class.php

@@ -2715 +2715 @@
 #echo 'handler: '.$handler.'<br/>';
                 // now check if a handler by that name exists
-#echo 'checking path: '.$this->GetConfigValue('wikka_handler_path').DIRECTORY_SEPARATOR.'page'.DIRECTORY_SEPARATOR.$handler.'.php'.'<br/>';
-                $exists = $this->BuildFullpathFromMultipath($handler.DIRECTORY_SEPARATOR.$handler.'.php', $this->GetConfigValue('wikka_handler_path')); 
+#echo 'checking path: '.$this->GetConfigValue('handler_path').DIRECTORY_SEPARATOR.'page'.DIRECTORY_SEPARATOR.$handler.'.php'.'<br/>';
+                $exists = $this->BuildFullpathFromMultipath($handler.DIRECTORY_SEPARATOR.$handler.'.php', $this->GetConfigValue('handler_path')); 
                 // return conclusion
                 if(TRUE===empty($exists)) 
@@ -2785 +2785 @@
                 } 
                 $result =
-                $this->IncludeBuffered(strtolower($action_name).DIRECTORY_SEPARATOR.strtolower($action_name).'.php', 'Unknown action "'.$action_name.'"', $vars, $this->config['wikka_action_path']);
+                $this->IncludeBuffered(strtolower($action_name).DIRECTORY_SEPARATOR.strtolower($action_name).'.php', 'Unknown action "'.$action_name.'"', $vars, $this->config['action_path']);
                 if ($link_tracking_state) 
                 { 
@@ -2795 +2795 @@
         /**
          * @uses        Wakka::IncludeBuffered()
-         * @uses        Config::$wikka_handler_path
+         * @uses        Config::$handler_path
          * @param $handler
          * @return unknown_type
@@ -2823 +2823 @@
                 }
                 $handlerLocation = $handler.DIRECTORY_SEPARATOR.$handler.'.php';        #89
-                return $this->IncludeBuffered($handlerLocation, 'Unknown handler "'.$handlerLocation.'"', '', $this->config['wikka_handler_path']);
+                return $this->IncludeBuffered($handlerLocation, 'Unknown handler "'.$handlerLocation.'"', '', $this->config['handler_path']);
         }
         
@@ -2861 +2861 @@
                         // produce output
                         //$out = $this->IncludeBuffered($formatter_location, $this->GetConfigValue('wikka_formatter_path'), $formatter_not_found, FALSE, compact('text', 'format_option')); // @@@
-                        $out = $this->IncludeBuffered($formatter_location,
-                        $formatter_not_found, compact('text', 'format_option'), $this->GetConfigValue('wikka_formatter_path'));                         
+                        $out = $this->IncludeBuffered($formatter_location, $formatter_not_found, compact('text', 'format_option'), $this->GetConfigValue('wikka_formatter_path'));                              
                 }
                 return $out;

branches/1.3/setup/default.php

@@ -1 +1 @@
 <?php
-/**
- * Display a configuration form to set language and database settings.
- * 
- * @package     Setup
- * @version     $Id: default.php 893 2008-02-07 08:27:40Z DotMG $
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
- * @filesource
- *
- * @uses init_test_mod_rewrite()
- * @todo        make form accessible!
- */
+
+// Start session
+session_set_cookie_params(0, '/');
+session_name(md5('WikkaWiki'));
+session_start();
+        
+// Copy POST params to SESSION in preparation for redirect to install page
+$_SESSION['post'] = array();
+$_SESSION['post'] = array_merge($_SESSION['post'], $_POST);
+
+//Override default values with posted values
+if (isset($_POST['config']))
+{
+        /* debug */
+        //print_r($_POST['config']);
+        foreach($_POST['config'] as $key => $value)
+        {
+                $wakkaConfig[$key] = $value;
+        }
+}
+
+// Validate data
+$error['flag'] = false;
+if(isset($_SESSION['error_flag']))
+{
+        if (isset($_POST['config']['mysql_host']) && strlen($_POST['config']['mysql_host']) == 0)
+        {
+                $error['mysql_host'] = "Please fill in a valid MySQL host."; 
+                $error['flag'] = true;
+        }
+        if (isset($_POST['config']['mysql_database']) && strlen($_POST['config']['mysql_database']) == 0)
+        {
+                $error['mysql_database'] = "Please fill in a valid database."; 
+                $error['flag'] = true;
+        }
+        if      (isset($_POST['config']['mysql_user']) && strlen($_POST['config']['mysql_user']) == 0)
+        {
+                $error['mysql_user'] = "Please fill in a valid MySQL username."; 
+                $error['flag'] = true;
+        }
+        if      (isset($_POST['config']['wakka_name']) && strlen($_POST['config']['wakka_name']) == 0)
+        {
+                $error['wakka_name'] = "Please fill in a title for your wiki. For example: <em>My Wikka website</em>"; 
+                $error['flag'] = true;
+        }
+        if      (isset($_POST['config']['root_page']))
+        {
+                if  (strlen($_POST['config']['root_page']) == 0 || preg_match('/^[A-Za-z0-9]{3,}$/', $_POST['config']['root_page']) == 0)
+                {
+                        $error['root_page'] = "Please fill a valid name for your wiki's homepage. For example: <em>start</em> or <em>HomePage</em>"; 
+                        $error['flag'] = true;
+                }
+        }
+        if (isset($_POST['config']['admin_users']))
+        { 
+                if (strlen($_POST['config']['admin_users']) == 0)
+                {
+                        $error['admin_users'] = "Please fill in an admin name."; 
+                        $error['flag'] = true;
+                }
+                else if (strlen($_POST['config']['admin_users']) > 0 && preg_match('/^[A-Z][a-z]+[A-Z0-9][A-Za-z0-9]*$/', $_POST['config']['admin_users']) == 0)
+                {
+                        $error['admin_users'] = "Admin name must be formatted as a WikiName. For example: <em>JohnSmith</em> or <em>AbC</em> or <em>Ted22</em>"; 
+                        $error['flag'] = true;
+                }
+        }
+        if (isset($_POST['password']))
+        {
+                if (strlen($_POST['password']) == 0)
+                {
+                        $error['password'] = "Please fill in a password.";
+                        $error['flag'] = true;
+                }
+                else if (strlen($_POST['password']) < 5)
+                {
+                        $error['password'] = "Password must be at least five (5) characters long.";
+                        $error['flag'] = true;
+                }
+        }
+        if (isset($_POST['password2']))
+        {
+                if (strlen($_POST['password2']) == 0)
+                {
+                        $error['password2'] = "Please confirm your password.";
+                        $error['flag'] = true;
+                }
+                else if (strcmp($_POST['password'], $_POST['password2']) != 0)
+                {
+                        $error['password2'] = "Passwords don't match.";
+                        $error['flag'] = true;
+                }
+        }
+        if (isset($_POST['config']['admin_email']))
+        {
+                if (strlen($_POST['config']['admin_email']) == 0)
+                {
+                        $error['admin_email'] = "Please fill in your email address.";
+                        $error['flag'] = true;
+                }
+                else if (preg_match("/^[A-Za-z0-9.!#$%&'*+\/=?^_`{|}~-]+@[A-Za-z0-9.-]+$/i", $_POST['config']['admin_email']) == 0)
+                {
+                        $error['admin_email'] = "Please fill in a valid email address.";
+                        $error['flag'] = true;
+                }
+        }
+        if (isset($_POST['config']['base_url']) && strlen($_POST['config']['base_url']) == 0)
+        {
+                $error['base_url'] = "Please fill in a valid base URL."; 
+                $error['flag'] = true;
+        }
+}
+// i18n section
+if (!defined('SITE_SUFFIX_INFO')) define ('SITE_SUFFIX_INFO', 'Suffix used for cookies and part of the session name. This allows you to run multiple Wikka installations on the same server by configuring them to use different wiki prefixes.');
+if (!defined('SITE_SUFFIX_LABEL')) define ('SITE_SUFFIX_LABEL', 'Your Wiki suffix:');
+
+if (!$wakkaConfig["wakka_version"])
+{
+        $_SESSION['error_flag'] = $error['flag'];
+} 
+
+// Only redirect as a result of this page being POSTed!
+if(false === $_SESSION['error_flag'] &&
+   isset($_POST['submit']))
+{
+        header("Location: ".myLocation()."?installAction=install");
+}
+
 ?>
-<form action="<?php echo WIKKA_BASE_URL ?>setup/test/test-mod-rewrite.php" name="form1" method="post">
+<form action="<?php echo myLocation() ?>?installAction=default" name="form1" method="post">
 <table>
-        <?php
-        if (isset($config['wakka_version']) && ($config['wakka_version']))
-        {
-                echo '  <tr><td>&nbsp;</td><td><h1>'.__('WikkaWiki Upgrade').' (1/5)</h1></td></tr>'."\n";
-                echo '<tr><td>&nbsp;</td><td><p>'.sprintf(__('Welcome to the WikkaWiki Setup Wizard. Your installed WikkaWiki is reporting itself as %s'), '<tt>'.$config['wakka_version'].'</tt>').'</p><p>'.sprintf(__('You are about to %1$s WikkaWiki to version %2$s'), '<em>'.__('upgrade').'</em>', '<strong><tt>'.WAKKA_VERSION.'</tt></strong>').'. '.sprintf(__('Please refer to the %1$s for further instructions'), '<a href="http://docs.wikkawiki.org/UpgradeNotes" target="_blank">'.__('documentation').'</a>').'.</p></td></tr>'."\n";
+
+        <tr><td></td><td><h1>Wikka Installation</h1></td></tr>
+
+        <?php
+        if ($wakkaConfig["wakka_version"])
+        {
+                print("<tr><td></td><td>Your installed Wikka is reporting itself as <tt>".$wakkaConfig["wakka_version"]."</tt>. You are about to <strong>upgrade</strong> to Wikka ".WAKKA_VERSION.". Please review your configuration settings below.</td></tr>\n");
+                // This needs to be set to false for redirect to install page
+                $_SESSION['error_flag'] = false;
         }
         else
         {
-                echo '  <tr><td>&nbsp;</td><td><h1>'.__('WikkaWiki Installation').' (1/5)</h1></td></tr>'."\n";
-                echo '<tr><td>&nbsp;</td><td><p>'.__('Welcome to the WikkaWiki Setup Wizard. Since there is no existing WikkaWiki configuration, this probably is a <em>fresh install</em>').'.</p><p>'.sprintf(__('You are about to install WikkaWiki (version %s). This wizard will guide you through the installation, which should take only a few minutes'), '<strong><tt>'.WAKKA_VERSION.'</tt></strong>').'. '.sprintf(__('Please refer to the %1$s for further instructions'), '<a href="http://docs.wikkawiki.org/WikkaInstallation" target="_blank">'.__('documentation').'</a>').'.</p></td></tr>'."\n";
-        }
-
-        $setupfiles_to_update = array(
-                './.htaccess', './wikka.config.php', 'setup/test/.htaccess');
-        $setup_files_not_writable = '';
-        // Need to adjust setup/test/.htaccess if installed in a subdir
-        include_once('setup/inc/functions.inc.php');
-        $htaccess = 'setup/test/.htaccess';
-        if(setupfile_is_writable($htaccess))
-        {
-                $htaccess_content = file($htaccess);
-                $new_htaccess_content = '';
-                foreach($htaccess_content as $line)
-                {
-                        if(preg_match("/^\\s*RewriteBase/i", $line))
-                        {
-                                $line = 'RewriteBase '.WIKKA_BASE_URL_PATH.'setup/test'; 
-                        }
-                        $new_htaccess_content .= $line;
-                }
-                print('<tr><td>&nbsp;</td><td class="note">'."\n");
-                print('<h2>'.__('Setting up mod_rewrite autodetection').'</h2>'."\n");
-                test(sprintf(__('Writing .htaccess file (%s)'), '<tt>'.$htaccess.'</tt>').'...', $f1 = @fopen($htaccess, "w"), "", 0);
-                print('</td></tr>'."\n");
-                if ($f1)
-                {
-                        fwrite($f1, $new_htaccess_content);
-                        fclose($f1);
-                }
-        }
-
-        foreach ($setupfiles_to_update as $f1)
-        {
-                if (!setupfile_is_writable($f1))
-                {
-                        $setup_files_not_writable .= '<li><tt>'.$f1.'</tt></li>';
-                }
-        }
-        if ($setup_files_not_writable)
-        {
-                printf('<tr><td>&nbsp;</td><td class="note"><p>'.__('The following files need to be written/updated by the installer: %s'.
-                 'Please ensure that the file is writable.  <b>When fixed, reload this page using the Reload button in your browser.</b> ').
-                 '</p></td></tr>', '</p><ul>'.$setup_files_not_writable.'</ul><p>');
-        }
-        init_test_mod_rewrite();
-        // Language select
-        if (!isset($config['default_lang']))
-        {
-                // use constant CONFIG_DEFAULT_LANGUAGE
-                #$config['default_lang'] = 'en';
-                $config['default_lang'] = CONFIG_DEFAULT_LANGUAGE;
-        }
-        ?>
-        <tr><td>&nbsp;</td></tr>
-        <tr><td>&nbsp;</td><td><h2><?php echo __('Language settings'); ?></h2></td></tr>
-        <tr><td>&nbsp;</td><td><?php echo __('Please select a language for the default pages that Wikka will create:'); ?></td></tr>
-        <tr><td><?php echo __('Choose a default language'); ?>:</td><td><?php Language_selectbox($config['default_lang']); // @@@ does not actually display any language choice ?></td></tr>
-<?php 
-        if (!isset($config['wakka_version']) || (!$config['wakka_version']))
-        {
-        ?>
-        <tr><td>&nbsp;</td></tr>
-        <tr><td>&nbsp;</td><td><h2><?php echo __('Database settings'); ?></h2></td></tr>
-        <tr><td>&nbsp;</td><td><?php echo __('WikkaWiki uses a MySQL database to store data. The wizard will start by checking the connection to the database.');?></td></tr>
-        <tr><td>&nbsp;</td><td><?php echo __('1. The host your MySQL server is running on. <span class="note">Usually <tt>localhost</tt> (i.e. the same machine your WikkaWiki site is on).</span>'); ?></td></tr>
-        <tr><td align="right" nowrap="nowrap"><?php echo __('MySQL host');?>:</td><td><input type="text" size="50" name="pconfig[mysql_host]" value="<?php echo $config["mysql_host"] ?>" /></td></tr>
-        <tr><td>&nbsp;</td><td><?php echo __('2. The name of the database WikkaWiki will use. <span class="note">Note that this database must already exist before you continue.</span>'); ?></td></tr>
-        <tr><td align="right" nowrap="nowrap"><?php echo __('MySQL database'); ?>:</td><td><input type="text" size="50" name="pconfig[mysql_database]" value="<?php echo $config["mysql_database"] ?>" /></td></tr>
-        <tr><td>&nbsp;</td><td><?php printf(__('3. Username and password to connect to your database. <span class="note">This user must exist and be granted access for <tt>%s</tt> operations to the database where WikkaWiki will be installed.</span>'), 'SELECT, INSERT, UPDATE, DELETE, ALTER TABLE'); ?></td></tr>
-        <tr><td align="right" nowrap="nowrap"><?php echo __('MySQL username'); ?>:</td><td><input type="text" size="50" name="pconfig[mysql_user]" value="<?php echo $config["mysql_user"] ?>" /></td></tr>
-        <tr><td align="right" nowrap="nowrap"><?php echo __('MySQL password'); ?>:</td><td><input type="password" size="50" name="pconfig[mysql_password]" value="" /></td></tr>
-<?php
-        }
-?>
-        <tr><td>&nbsp;</td><td>
-        <input type="hidden" name="installAction" value="check" />
-        <input type="submit" value="<?php echo _p('Continue');?>" />
-        <input type="hidden" name="redirect_to" value="<?php echo $action_target; ?>" />
-        </td></tr>
+                print("<tr><td></td><td>Since there is no existing Wikka configuration, this probably is a fresh Wikka install. You are about to install Wikka <tt>".WAKKA_VERSION."</tt>. Installing Wikka will take only a few minutes. To start the installation, please fill in the form below.</td></tr>\n");
+        }
+        ?>
+
+        <tr><td></td><td><span class="note">NOTE: This installer will try to write the configuration data to a file called <tt>wikka.config.php</tt>, located in your Wikka directory. In order for this to work, you must make sure the web server has write access to that file! If you can't do this, you will have to edit the file manually (the installer will tell you how). Once Wikka is correctly installed, you will be able to modify its configuration by editing this file. See the <a href="http://docs.wikkawiki.org/WikkaInstallation" target="_blank">documentation</a> for details.</span></td></tr>
+        <?php if($error['flag'])
+        {
+        ?>
+        <tr><td></td><td><em class="error">Please correct the errors below to proceed with the installation.</em></td></tr>
+        <?php
+        }
+         if (!$wakkaConfig["wakka_version"])
+        {
+        ?>
+        <tr><td></td><td><br /><h2>1. Database Configuration</h2></td></tr>
+        <tr><td></td><td>The host your MySQL server is running on. Usually "localhost" (ie, the same machine your Wikka site is on).</td></tr>
+        <?php if(isset($error['mysql_host'])) { ?>
+        <tr><td></td><td><em class="error"><?php echo $error['mysql_host']; ?></em></td></tr>
+        <?php } ?>
+        <tr><td align="right" nowrap="nowrap">MySQL host:</td><td><input type="text" size="50" name="config[mysql_host]" value="<?php echo $wakkaConfig["mysql_host"] ?>" /></td></tr>
+        <tr><td></td><td>The MySQL database Wikka should use. This database needs to exist already before you continue!</td></tr>
+        <?php if(isset($error['mysql_database'])) { ?>
+        <tr><td></td><td><em class="error"><?php echo $error['mysql_database']; ?></em></td></tr>
+        <?php } ?>
+        <tr><td align="right" nowrap="nowrap">MySQL database:</td><td><input type="text" size="50" name="config[mysql_database]" value="<?php echo $wakkaConfig["mysql_database"] ?>" /></td></tr>
+        <tr><td></td><td>Name and password of the MySQL user used to connect to your database.</td></tr>
+        <?php if(isset($error['mysql_user'])) { ?>
+        <tr><td></td><td><em class="error"><?php echo $error['mysql_user']; ?></em></td></tr>
+        <?php } ?>
+        <tr><td align="right" nowrap="nowrap">MySQL user name:</td><td><input type="text" size="50" name="config[mysql_user]" value="<?php echo $wakkaConfig["mysql_user"] ?>" /></td></tr>
+        <tr><td align="right" nowrap="nowrap">MySQL password:</td><td><input type="password" size="50" name="config[mysql_password]" value="<?php echo $wakkaConfig["mysql_password"] ?>" /></td></tr>
+        <tr><td></td><td>Prefix of all tables used by Wikka. This allows you to run multiple Wikka installations using the same MySQL database by configuring them to use different table prefixes.</td></tr>
+        <tr><td align="right" nowrap="nowrap">Table prefix:</td><td><input type="text" size="50" name="config[table_prefix]" value="<?php echo $wakkaConfig["table_prefix"] ?>" /></td></tr>
+        <?php
+         }
+        ?>
+        <tr><td></td><td><br /><h2>2. Wiki Configuration</h2></td></tr>
+        <tr><td></td><td>The name of your wiki, as it will be displayed in the title.</td></tr>
+        <?php if(isset($error['wakka_name'])) { ?>
+        <tr><td></td><td><em class="error"><?php echo $error['wakka_name']; ?></em></td></tr>
+        <?php } ?>
+        <tr><td align="right" nowrap="nowrap">Your wiki's name:</td><td><input type="text" size="50" name="config[wakka_name]" value="<?php echo $wakkaConfig["wakka_name"] ?>" /></td></tr>
+        <tr><td></td><td>Your wiki's home page. It should not contain any space or special character and be at least 3 characters long. It is typically formatted as a <abbr title="A WikiName is formed by two or more capitalized words without space, e.g. HomePage">WikiName</abbr>.</td></tr>
+        <?php if(isset($error['root_page'])) { ?>
+        <tr><td></td><td><em class="error"><?php echo $error['root_page']; ?></em></td></tr>
+        <?php } ?>
+        <tr><td align="right" nowrap="nowrap">Home page:</td><td><input type="text" size="50" name="config[root_page]" value="<?php echo $wakkaConfig["root_page"] ?>" /></td></tr>
+
+        <tr><td></td><td><?php echo SITE_SUFFIX_INFO; ?></td></tr>
+        <tr><td align="right" nowrap="nowrap"><?php echo SITE_SUFFIX_LABEL; ?></td><td><input type="text" size="50" name="config[wiki_suffix]" value="<?php echo $wakkaConfig["wiki_suffix"] ?>" /></td></tr>
+
+        <tr><td></td><td>Optional keywords/description to insert into the HTML meta headers.</td></tr>
+        <tr><td align="right" nowrap="nowrap">Meta Keywords:</td><td><input type="text" size="50" name="config[meta_keywords]" value="<?php if(isset($wakkaConfig["meta_keywords"])) echo $wakkaConfig["meta_keywords"] ?>" /></td></tr>
+        <tr><td align="right" nowrap="nowrap">Meta Description:</td><td><input type="text" size="50" name="config[meta_description]" value="<?php if(isset($wakkaConfig["meta_description"])) echo $wakkaConfig["meta_description"] ?>" /></td></tr>
+        <tr><td></td><td>Choose the <em>look and feel</em> of your wiki (you'll be able to change this later).</td></tr>
+        <tr><td align="right" nowrap="nowrap">Theme:</td><td><?php SelectTheme(); ?></td></tr>
+
+        <?php
+         $curversion_num = ($wakkaConfig['wakka_version']) ? str_replace('.','',$wakkaConfig['wakka_version']) : 0;
+         if (!$wakkaConfig["wakka_version"])
+         {
+        ?>
+         <tr><td></td><td><br /><h2>3. Administrative Account Configuration</h2></td></tr>
+
+         <tr><td></td><td>This is the username of the person running this wiki. Later you'll be able to add other admins. The admin username should be formatted as a <abbr title="A WikiName is formed by two or more capitalized words without space, e.g. JohnDoe">WikiName</abbr>.</td></tr>
+        <?php if(isset($error['admin_users'])) { ?>
+        <tr><td></td><td><em class="error"><?php echo $error['admin_users']; ?></em></td></tr>
+        <?php } ?>
+         <tr><td align="right" nowrap="nowrap">Admin name:</td><td><input type="text" size="50" name="config[admin_users]" value="<?php echo $wakkaConfig["admin_users"] ?>" /></td></tr>
+         <tr><td></td><td>Choose a password for the wiki administrator (5+ chars)</td></tr>
+        <?php if(isset($error['password'])) { ?>
+        <tr><td></td><td><em class="error"><?php echo $error['password']; ?></em></td></tr>
+        <?php } ?>
+         <tr><td align="right" nowrap="nowrap">Enter password:</td><td><input type="password" size="50" name="password" value="<?php echo (isset($_POST['password']))? $_POST['password'] : ''; ?>" /></td></tr>
+        <?php if(isset($error['password2'])) { ?>
+        <tr><td></td><td><em class="error"><?php echo $error['password2']; ?></em></td></tr>
+        <?php } ?>
+         <tr><td align="right" nowrap="nowrap">Confirm password:</td><td><input type="password" size="50" name="password2" value="<?php echo (isset($_POST['password2']))? $_POST['password2'] : ''; ?>" /></td></tr>
+         <tr><td></td><td>Administrator email.</td></tr>
+        <?php if(isset($error['admin_email'])) { ?>
+        <tr><td></td><td><em class="error"><?php echo $error['admin_email']; ?></em></td></tr>
+        <?php } ?>
+         <tr><td align="right" nowrap="nowrap">Email:</td><td><input type="text" size="50" name="config[admin_email]" value="<?php echo $wakkaConfig["admin_email"] ?>" /></td></tr>
+
+        <tr><td></td><td><br /><h2>4. URL Configuration</h2><?php echo $wakkaConfig["wakka_version"] ? '' : '<span class="note">Since this is a new installation, the installer tried to guess the correct values of Rewrite Mode and Base URL.<br />Change them only if you know what you\'re doing!   See the <a href="http://docs.wikkawiki.org/ModRewrite" target="_blank">documentation</a> for details.</span>' ?></td></tr>
+        <tr><td></td><td><strong>Rewrite Mode</strong> is used to produce a nicer URL for your wiki. If Rewrite mode is modified, the base URL should be changed accordingly.
+        <ul>
+                <li>With Rewrite Mode <em>disabled</em>, your site's URL will look like the following:<br /><tt>http://www.example.com/wikka.php?wakka=HomePage</tt></li>
+                <li>If Rewrite Mode is <em>enabled</em>,  your site's URL will look like the following:<br /><tt>http://www.example.com/HomePage</tt></li>
+        </ul></td></tr>
+        <tr><td align="right" nowrap="nowrap">Rewrite mode:</td><td><input type="hidden" name="config[rewrite_mode]" value="0" /><input type="checkbox" name="config[rewrite_mode]" value="1" <?php echo ($wakkaConfig["rewrite_mode"])? 'checked="checked"' : ''; ?> /> Enabled</td></tr>
+        <tr><td></td><td>Your wiki's <strong>base URL</strong>. Page names get appended to it, so: <ul>
+                <li>if Rewrite Mode is not available on your server, the base URL should end with <tt>"wikka.php?wakka="</tt><br />e.g. <tt>http://www.example.com/wikka.php?wakka=</tt></li>
+                <li>if Rewrite Mode is enabled, make sure the base URL ends with a slash "/",<br />e.g. <tt>http://www.example.com/</tt></li>
+                </ul></td>
+        </tr>
+        <?php if(isset($error['base_url'])) { ?>
+        <tr><td></td><td><em class="error"><?php echo $error['base_url']; ?></em></td></tr>
+        <?php } ?>
+        <tr><td align="right" nowrap="nowrap">Base URL:</td><td><input type="text" size="50" name="config[base_url]" value="<?php echo $wakkaConfig["base_url"] ?>" /></td></tr>
+        <?php
+         }
+        ?>
+
+        <tr><td></td><td><br /><h2>5. Version update check</h2></td></tr>
+        <tr><td></td><td><span class="note">It is <strong>strongly recommended</strong> that you leave this option checked if your run your wiki on the internet. Administrator(s) will be notified automatically on the wiki if a new version of WikkaWiki is available for download.  See the <a href="http://docs.wikkawiki.org/CheckVersionActionInfo" target="_blank">documentation</a> for details.
+        </span></td></tr>
+        <tr><td align="right" nowrap="nowrap"><label for="id_enable_version_check">Enable version checking:</label></td><td><input type="checkbox"<?php echo !isset($wakkaConfig["enable_version_check"]) || $wakkaConfig["enable_version_check"] == "1" ? ' checked="checked"' : ""; ?> name="config[enable_version_check]" value="1" id="id_enable_version_check" /></td></tr>
+        <tr><td></td><td><input type="submit" name="submit" value="Continue" /></td></tr>
+
 </table>
 </form>

branches/1.3/setup/install.php

@@ -1 +1 @@
 <?php
-/**
- * Perform the operations required for installing/upgrading Wikka.
- * 
- * @package     Setup
- * @version     $Id: install.php 1225 2008-09-07 04:55:03Z BrianKoontz $
- * @license     http://www.gnu.org/copyleft/gpl.html GNU General Public License
- * @filesource
- * 
- * @todo i18n;
- */
+
+// Start session
+session_set_cookie_params(0, '/');
+session_name(md5('WikkaWiki'));
+session_start();
+
+// Copy POST params from SESSION, then destroy SESSION
+if(isset($_SESSION['post']))
+{
+        $_POST = array_merge($_POST, $_SESSION['post']);
+}
+$_SESSION=array();
+if(isset($_COOKIE[session_name()]))
+{
+        setcookie(session_name(), '', time()-42000, '/');
+}
+session_destroy();
+
+/*
+foreach($_POST as $key=>$value)
+{
+        print $key.":".$value."<br/>";
+}
+foreach($_POST['config'] as $key=>$value)
+{
+        print $key.":".$value."<br/>";
+}
+exit;
+*/
+
+// i18n section
+if (!defined('ADDING_CONFIG_ENTRY')) define('ADDING_CONFIG_ENTRY', 'Adding a new option to the wikka.config file: %s'); // %s - name of the config option
+if (!defined('DELETING_COOKIES')) define('DELETING_COOKIES', 'Deleting wikka cookies since their name has changed.');
+
+// initialization
+$config = array(); //required since PHP5, to avoid warning on array_merge #94
+// fetch configuration
+$config = $_POST["config"];
+
+/*
+print "\$config:<br/>";
+foreach($config as $key=>$value)
+{
+        print $key.":".$value."<br/>";
+}
+exit;
+*/
+
+// if the checkbox was not checked, $_POST['config']['enable_version_check'] would not be defined. We must explicitly set it to "0" to overwrite any value already set (if exists).
+if (!isset($config["enable_version_check"]))
+{
+        $config["enable_version_check"] = "0";
+}
+// merge existing configuration with new one
+$config = array_merge($wakkaConfig, $config);
+
+/*
+print "\$config:<br/>";
+foreach($config as $key=>$value)
+{
+        print $key.":".$value."<br/>";
+}
+exit;
+*/
 
 // test configuration
-if ($wakkaConfig['wakka_version'])
-{
-        echo '<h1>'.__('Wikka Upgrade').' (4/5)</h1>'."\n";
-}
-else
-{
-        echo '<h1>'.__('Wikka Installation').' (4/5)</h1>'."\n";
-}
+print("<h2>Testing Configuration</h2>\n");
+test("Testing MySQL connection settings...", $dblink = @mysql_connect($config["mysql_host"], $config["mysql_user"], $config["mysql_password"]));
+test("Looking for database...", @mysql_select_db($config["mysql_database"], $dblink), "The database you configured was not found. Remember, it needs to exist before you can install/upgrade Wakka!\n\nPress the Back button and reconfigure the settings.");
+print("<br />\n");
 
 // do installation stuff
@@ -25 +75 @@
 
 // set upgrade note to be used when overwriting default pages
-$upgrade_note = sprintf(__('Upgrading from %1$s to %2$s'), $version, WAKKA_VERSION);
-$_SESSION['sconfig']['logged_in_navigation_links'] = str_replace('_rootpage', $config['root_page'], $_SESSION['sconfig']['logged_in_navigation_links']);
-$_SESSION['sconfig']['navigation_links'] = str_replace('_rootpage', $config['root_page'], $_SESSION['sconfig']['navigation_links']);
-
-$lang_defaults_fallback_path = WIKKA_LANG_PATH.DIRECTORY_SEPARATOR.DEFAULT_FALLBACK_LANGUAGE.DIRECTORY_SEPARATOR.'defaults'.DIRECTORY_SEPARATOR;
-test('Checking availability of default pages...', is_dir($lang_defaults_fallback_path), 'default pages not found at '.$lang_defaults_fallback_path, 1);
-$lang_defaults_path = WIKKA_LANG_PATH.DIRECTORY_SEPARATOR.$config['default_lang'].DIRECTORY_SEPARATOR.'defaults'.DIRECTORY_SEPARATOR;
-// @@@ use test() here, too? (without stop on error but reporting back we're using sytem default language)
-if (!is_dir($lang_defaults_path))
-{
-        // no directory for selected language: set equal to fallback so we can continue
-        $lang_defaults_path = $lang_defaults_fallback_path;
-}
+$upgrade_note = 'Upgrading from '.$version.' to '.WAKKA_VERSION;
 
 switch ($version)
@@ -136 +174 @@
                         ") TYPE=MyISAM", $dblink), "Already exists?", 0);
 
-        $challenge = dechex(crc32(time()));
-        $pass_val = md5($challenge.md5(mysql_real_escape_string($_SESSION['wikka']['install']['password'])));
-        setcookie('user_name'.$config['wiki_suffix'], $config['admin_users'], time() + DEFAULT_COOKIE_EXPIRATION_HOURS * 60 * 60, WIKKA_COOKIE_PATH);
-        $_COOKIE['user_name'.$config['wiki_suffix']] = $config['admin_users'];
-        setcookie('pass'.$config['wiki_suffix'], $pass_val, time() + DEFAULT_COOKIE_EXPIRATION_HOURS * 60 * 60, WIKKA_COOKIE_PATH);
-        $_COOKIE['pass'.$config['wiki_suffix']] = $pass_val;
-        # first, I delete a previous entry in the table _users, in case this setup's
-        # script was run twice. If the following insert fails, the new Admin won't be auto-logged in.
-        @mysql_query('delete from '.$config['table_prefix'].'users where name = \''.$config['admin_users'].'\'', $dblink);
-        test(__('Adding admin user').'...', 
-                @mysql_query("insert into ".$config["table_prefix"]."users set name = '".$config["admin_users"]."', password = md5('".mysql_real_escape_string($_SESSION['wikka']['install']['password'])."'), email = '".$config["admin_email"]."', signuptime = now(), challenge='".$challenge."'", $dblink), "Hmm!", 0);
-
-        update_default_page(array(
-        '_rootpage', 
-        'AdminPages',
-        'AdminUsers',
-        'CategoryAdmin',
-        'CategoryCategory', 
-        'CategoryWiki', 
-        'DatabaseInfo',
-        'FormattingRules', 
-        'HighScores', 
-        'InterWiki', 
-        'MyChanges', 
-        'MyPages', 
-        'OrphanedPages', 
-        'OwnedPages', 
-        'PageIndex', 
-        'PasswordForgotten', 
-        'RecentChanges', 
-        'RecentlyCommented', 
-        'SandBox', 
-        'SysInfo',
-        'TextSearch', 
-        'TextSearchExpanded', 
-        'UserSettings', 
-        'WantedPages', 
-        'WikiCategory', 
-        'WikkaDocumentation', 
-        'WikkaReleaseNotes'), $dblink, $config, $lang_defaults_path, $lang_defaults_fallback_path); 
-
-        // @@@  ?? *default* ACLs are in the configuration file; settings on UserSettings page are irrelevant for default ACLs!
-        //              use page-specific "ACL" files to create page-specific ACLs (in update_default_page()!).
-        // @@@  use test() function to report actual results instead of assuming success!
-        test(__('Setting default ACL').'...', 1);
-        mysql_query("insert into ".$config["table_prefix"]."acls set page_tag = 'UserSettings', read_acl = '*', write_acl = '+', comment_read_acl = '*', comment_post_acl = '+'", $dblink);
-        test(__('Building links table').'...', 1);
+
+        test("Adding default pages...", 1);
+        // Do not create another (active) copy when re-running teh installer
+        if
+        (!Wakka::existsPage($config['root_page'],$config['table_prefix'],$dblink))
+        mysql_query("insert into ".$config['table_prefix']."pages set tag = '".$config["root_page"]."', body = '{{image url=\"images/wikka_logo.jpg\" alt=\"wikka logo\" title=\"Welcome to your Wikka site\"}}\n{{checkversion}}\nThanks for installing Wikka! This wiki runs on version ##{{wikkaversion}}##, patch level ##{{wikkapatchlevel}}##. You may want to read the [[WikkaReleaseNotes release notes]] to learn what''s new in this release.\n\n>>==Keep up-to-date==\nTo receive the latest news from the Wikka Development Team, you can sign up to one of our [[http://wikkawiki.org/WikkaMailingLists lists]], subscribe to our [[http://blog.wikkawiki.org Blog]] or join us for a chat on [[http://wikkawiki.org/TheLounge IRC]].\n>>====Getting started====\nDouble-click on this page or click on the **Edit** link in the page footer to get started. If you are not sure how a wiki works, you can check out the [[FormattingRules Wikka formatting guide]] and play in the SandBox.\n\n>>==Need more help?==\nDon\'t forget to visit the [[http://wikkawiki.org WikkaWiki website]]!>>====Some useful pages====\n~-[[FormattingRules Wikka formatting guide]]\n~-[[WikkaDocumentation Documentation]]\n~-[[RecentChanges Recently modified pages]]\n~-[[SysInfo System Information]]\nYou will find more useful pages in the [[CategoryWiki Wiki category]] or in the PageIndex.', user = 'WikkaInstaller', owner = '".$config["admin_users"]."', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('RecentChanges',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'RecentChanges', body = '{{RecentChanges}}{{nocomments}}\n\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('RecentlyCommented',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'RecentlyCommented', body = '{{RecentlyCommented}}{{nocomments}}\n\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('UserSettings',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'UserSettings', body = '{{UserSettings}}{{nocomments}}\n\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('PageIndex',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'PageIndex', body = '{{PageIndex}}{{nocomments}}\n\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('WikkaReleaseNotes',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'WikkaReleaseNotes', body = '{{wikkachanges}}{{nocomments}}\n\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('WikkaDocumentation',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'WikkaDocumentation' , body = '=====Wikka Documentation=====\n\nComprehensive and up-to-date documentation on Wikka Wiki can be found on the [[http://docs.wikkawiki.org/ Wikka Documentation server]].', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('WantedPages',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'WantedPages', body = '{{WantedPages}}{{nocomments}}\n\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('OrphanedPages',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'OrphanedPages', body = '====Orphaned Pages====\n\nThe following list shows those pages held in the Wiki that are not linked to on any other pages.\n\n{{OrphanedPages}}{{nocomments}}\n\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('TextSearch',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'TextSearch', body = '{{TextSearch}}{{nocomments}}\n\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('TextSearchExpanded',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'TextSearchExpanded', body = '{{textsearchexpanded}}{{nocomments}}\n\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('MyPages',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'MyPages', body = '{{MyPages}}{{nocomments}}\n\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('MyChanges',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'MyChanges', body = '{{MyChanges}}{{nocomments}}\n\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('InterWiki',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'InterWiki', body = '{{interwikilist}}\n\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('PasswordForgotten',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'PasswordForgotten', body = '{{emailpassword}}\n\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('WikiCategory',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'WikiCategory', body = '=====How to use categories=====\nThis wiki is using a very flexible but simple categorizing system to keep everything properly organized.\n\n====1. Adding a page to an existing category====\nTo \'\'add a page to an existing category\'\' simply add a link to the relevant category page. For example, to mark page ##\"\"MyPage\"\"## as a child of category ##\"\"MyCategory\"\"##, just add a link to ##\"\"MyCategory\"\"## from ##\"\"MyPage\"\"##. This will automatically add ##\"\"MyPage\"\"## to the list of pages belonging to that category. Category links are put by convention at the end of the page, but the position of these links does not affect their behavior.\n\n====2. Adding a subcategory to an existing category====\nTo \'\'create a hierarchy of categories\'\', you can follow the same instructions to add pages to categories. For example, to mark category ##\"\"Category2\"\"## as a child (or subcategory) of another category ##\"\"Category1\"\"##, just add a link to ##\"\"Category1\"\"## in ##\"\"Category2\"\"##. This will automatically add ##\"\"Category2\"\"## to the list of ##\"\"Category1\"\"##\'s children.\n\n====3. Creating new categories====\nTo \'\'start a new category\'\' just create a page containing ##\"\"{{category}}\"\"##. This will mark the page as a special //category page// and will output a list of pages belonging to the category. Category page names start by convention with the word ##Category## but you can also create categories without following this convention. To add a new category to the master list of categories just add a link from it to CategoryCategory.\n\n====4. Browsing categories====\nTo \'\'browse the categories\'\' available on your wiki you can start from CategoryCategory. If all pages and subcategories are properly linked as described above, you will be able to browse the whole hierarchy of categories starting from this page.\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('CategoryWiki',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'CategoryWiki', body = '===Wiki Related Category===\nThis Category will contain links to pages talking about Wikis and Wikis specific topics. When creating such pages, be sure to include CategoryWiki at the bottom of each page, so that page shows listed.\n\n\n----\n\n{{category col=\"3\"}}\n\n\n----\n[[CategoryCategory List of all categories]]', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('CategoryAdmin',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'CategoryAdmin', body = '=====Wiki Administration Category=====\nThis category links to pages for wiki administration.\n\n\n----\n\n{{category}}\n\n\n----\n[[CategoryCategory List of all categories]]', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);      
+        if (!Wakka::existsPage('CategoryCategory',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'CategoryCategory', body = '===List of All Categories===\nBelow is the list of all Categories existing on this Wiki, granted that users did things right when they created their pages or new Categories. See WikiCategory for how the system works.\n\n----\n\n{{Category}}', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('FormattingRules',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'FormattingRules', body = '======Wikka Formatting Guide======\n\n<<**Note:** Anything between 2 sets of double-quotes is not formatted.<<::c::\nOnce you have read through this, test your formatting skills in the SandBox.\n----\n===1. Text Formatting===\n\n~##\"\"**I\'m bold**\"\"##\n~**I\'m bold **\n\n~##\"\"//I\'m italic text!//\"\"##\n~//I\'m italic text!//\n\n~##\"\"And I\'m __underlined__!\"\"##\n~And I\'m __underlined__!\n\n~##\"\"##monospace text##\"\"##\n~##monospace text##\n\n~##\"\"\'\'highlight text\'\'\"\"## (using 2 single-quotes)\n~\'\'highlight text\'\'\n\n~##\"\"++Strike through text++\"\"##\n~++Strike through text++\n\n~##\"\"Press #%ANY KEY#%\"\"##\n~Press #%ANY KEY#%\n\n~##\"\"@@Center text@@\"\"##\n~@@Center text@@\n\n===2. Headers===\n\nUse between six ##=## (for the biggest header) and two ##=## (for the smallest header) on both sides of a text to render it as a header.\n\n~##\"\"====== Really big header ======\"\"##\n~====== Really big header ======\n  \n~##\"\"===== Rather big header =====\"\"##\n~===== Rather big header =====\n\n~##\"\"==== Medium header ====\"\"##\n~==== Medium header ====\n\n~##\"\"=== Not-so-big header ===\"\"##\n~=== Not-so-big header ===\n\n~##\"\"== Smallish header ==\"\"##\n~== Smallish header ==\n\n===3. Horizontal separator===\n~##\"\"----\"\"##\n----\n\n===4. Forced line break===\n~##\"\"---\"\"##\n---\n\n===5. Lists and indents===\n\nYou can indent text using a **~**, a **tab** or **4 spaces** (which will auto-convert into a tab).\n\n##\"\"~This text is indented<br />~~This text is double-indented<br />&nbsp;&nbsp;&nbsp;&nbsp;This text is also indented\"\"##\n\n~This text is indented\n~~This text is double-indented\n This text is also indented\n\nTo create bulleted/ordered lists, use the following markup (you can always use 4 spaces instead of a ##**~**##):\n\n**Bulleted lists**\n##\"\"~- Line one\"\"##\n##\"\"~- Line two\"\"##\n\n      - Line one\n    - Line two\n\n**Numbered lists**\n##\"\"~1) Line one\"\"##\n##\"\"~1) Line two\"\"##\n\n        1) Line one\n   1) Line two\n\n**Ordered lists using uppercase characters**\n##\"\"~A) Line one\"\"##\n##\"\"~A) Line two\"\"##\n\n     A) Line one\n   A) Line two\n\n**Ordered lists using lowercase characters**\n##\"\"~a) Line one\"\"##\n##\"\"~a) Line two\"\"##\n\n     a) Line one\n   a) Line two\n\n**Ordered lists using roman numerals**\n##\"\"~I) Line one\"\"##\n##\"\"~I) Line two\"\"##\n\n   I) Line one\n   I) Line two\n\n**Ordered lists using lowercase roman numerals**\n##\"\"~i) Line one\"\"##\n##\"\"~i) Line two\"\"##\n\n i) Line one\n   i) Line two\n\n===6. Inline comments===\n\nTo format some text as an inline comment, use an indent ( **~**, a **tab** or **4 spaces**) followed by a **\"\"&amp;\"\"**.\n\n**Example:**\n\n##\"\"~&amp; Comment\"\"##\n##\"\"~~&amp; Subcomment\"\"##\n##\"\"~~~&amp; Subsubcomment\"\"##\n\n~& Comment\n~~& Subcomment\n~~~& Subsubcomment\n\n===7. Images===\n\nTo place images on a Wiki page, you can use the ##image## action.\n\n**Example:**\n\n~##\"\"{{image class=\"center\" alt=\"DVD logo\" title=\"An Image Link\" url=\"images/dvdvideo.gif\" link=\"RecentChanges\"}}\"\"##\n~{{image class=\"center\" alt=\"dvd logo\" title=\"An Image Link\" url=\"images/dvdvideo.gif\" link=\"RecentChanges\"}}\n\nLinks can be external, or internal Wiki links. You don\'t need to enter a link at all, and in that case just an image will be inserted. You can use the optional classes ##left## and ##right## to float images left and right. You don\'t need to use all those attributes, only ##url## is required while ##alt## is recommended for accessibility.\n\n===8. Links===\n\nTo create a **link to a wiki page** you can use any of the following options: ---\n~1) type a ##\"\"WikiName\"\"##: --- --- ##\"\"FormattingRules\"\"## --- FormattingRules --- ---\n~1) add a forced link surrounding the page name by ##\"\"[[\"\"## and ##\"\"]]\"\"## (everything after the first space will be shown as description): --- --- ##\"\"[[SandBox Test your formatting skills]]\"\"## --- [[SandBox Test your formatting skills]] --- --- ##\"\"[[SandBox &#27801;&#31665;]]\"\"## --- [[SandBox &#27801;&#31665;]] --- ---\n~1) add an image with a link (see instructions above).\n\nTo **link to external pages**, you can do any of the following: ---\n~1) type a URL inside the page: --- --- ##\"\"http://www.example.com\"\"## --- http://www.example.com --- --- \n~1) add a forced link surrounding the URL by ##\"\"[[\"\"## and ##\"\"]]\"\"## (everything after the first space will be shown as description): --- --- ##\"\"[[http://example.com/jenna/ Jenna\'s Home Page]]\"\"## --- [[http://example.com/jenna/ Jenna\'s Home Page]] --- --- ##\"\"[[mail@example.com Write me!]]\"\"## --- [[mail@example.com Write me!]] --- ---\n~1) add an image with a link (see instructions above);\n~1) add an interwiki link (browse the [[InterWiki list of available interwiki tags]]): --- --- ##\"\"WikiPedia:WikkaWiki\"\"## --- WikiPedia:WikkaWiki --- --- ##\"\"Google:CSS\"\"## --- Google:CSS --- --- ##\"\"Thesaurus:Happy\"\"## --- Thesaurus:Happy --- ---\n\n===9. Tables===\n\n<<The ##table## action has been deprecated as of Wikka version 1.2 and has been replaced with the syntax that follows. Please visit the [[Docs:TableActionInfo Wikka documentation server]] for information about the older ##table## action.<<::c::\nTables can be created using two pipe (##\"\"||\"\"##) symbols. Everything in a single line is rendered as a table row.\n\n**Example:**\n\n##\"\"||Cell 1||Cell 2||\"\"##\n\n||Cell 1||Cell 2||\n\nHeader cells can be rendered by placing an equals sign between the pipes.\n\n**Example:**\n\n##\"\"|=|Header 1|=|Header 2||\"\"##\n##\"\"||Cell 1||Cell 2||\"\"##\n\n|=|Header 1|=|Header 2||\n||Cell 1||Cell 2||\n\nRow and column spans are specified with ##x:## and ##y:## in parentheses just after the pipes.\n\n**Example:**\n\n##\"\"|=| |=|(x:2)Columns||\"\"##\n##\"\"|=|(y:2) Rows||Cell 1||Cell 2||\"\"##\n##\"\"||Cell 3||Cell 4||\"\"##\n\n|=| |=|(x:2)Columns||\n|=|(y:2) Rows||Cell 1||Cell 2||\n||Cell 3||Cell 4||\n\nMany additional features are available using table markup. A more comprehensive table markup guide is available on this server\'s TableMarkup page. A complete syntax reference is available on this server\'s TableMarkupReference page.\n\n===10. Colored Text===\n\nColored text can be created using the ##color## action:\n\n**Example:**\n\n~##\"\"{{color c=\"blue\" text=\"This is a test.\"}}\"\"##\n~{{color c=\"blue\" text=\"This is a test.\"}}\n\nYou can also use hex values:\n\n**Example:**\n\n~##\"\"{{color hex=\"#DD0000\" text=\"This is another test.\"}}\"\"##\n~{{color hex=\"#DD0000\" text=\"This is another test.\"}}\n\nAlternatively, you can specify a foreground and background color using the ##fg## and ##bg## parameters (they accept both named and hex values):\n\n**Examples:**\n\n~##\"\"{{color fg=\"#FF0000\" bg=\"#000000\" text=\"This is colored text on colored background\"}}\"\"##\n~{{color fg=\"#FF0000\" bg=\"#000000\" text=\"This is colored text on colored background\"}}\n\n~##\"\"{{color fg=\"yellow\" bg=\"black\" text=\"This is colored text on colored background\"}}\"\"##\n~{{color fg=\"yellow\" bg=\"black\" text=\"This is colored text on colored background\"}}\n\n\n===11. Floats===\n\nTo create a **left floated box**, use two ##<## characters before and after the block.\n\n**Example:**\n\n~##\"\"&lt;&lt;Some text in a left-floated box hanging around&lt;&lt; Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler.\"\"##\n\n<<Some text in a left-floated box hanging around<<Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler.\n\n::c::To create a **right floated box**, use two ##>## characters before and after the block.\n\n**Example:**\n\n~##\"\">>Some text in a right-floated box hanging around>> Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler.\"\"##\n\n   >>Some text in a right-floated box hanging around>>Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler.\n\n::c:: Use ##\"\"::c::\"\"##  to clear floated blocks.\n\n===12. Code formatters===\n\nYou can easily embed code blocks in a wiki page using a simple markup. Anything within a code block is displayed literally. \nTo create a **generic code block** you can use the following markup:\n\n~##\"\"%% This is a code block %%\"\"##. \n\n%% This is a code block %%\n\nTo create a **code block with syntax highlighting**, you need to specify a //code formatter// (see below for a list of available code formatters). \n\n~##\"\"%%(\"\"{{color c=\"red\" text=\"php\"}}\"\")<br />&lt;?php<br />echo \"Hello, World!\";<br />?&gt;<br />%%\"\"##\n\n%%(php)\n<?php\necho \"Hello, World!\";\n?>\n%%\n\nYou can also specify an optional //starting line// number.\n\n~##\"\"%%(php;\"\"{{color c=\"red\" text=\"15\"}}\"\")<br />&lt;?php<br />echo \"Hello, World!\";<br />?&gt;<br />%%\"\"##\n\n%%(php;15)\n<?php\necho \"Hello, World!\";\n?>\n%%\n\nIf you specify a //filename//, this will be used for downloading the code.\n\n~##\"\"%%(php;15;\"\"{{color c=\"red\" text=\"test.php\"}}\"\")<br />&lt;?php<br />echo \"Hello, World!\";<br />?&gt;<br />%%\"\"##\n\n%%(php;15;test.php)\n<?php\necho \"Hello, World!\";\n?>\n%%\n\n**List of available code formatters:**\n{{table columns=\"6\" cellpadding=\"1\" cells=\"LANGUAGE;FORMATTER;LANGUAGE;FORMATTER;LANGUAGE;FORMATTER;ABAP;abap;Actionscript;actionscript;ADA;ada;Apache Log;apache;AppleScript; applescript;ASM;asm;ASP;asp;AutoIT;autoit;Axapta/Dynamics Ax X++;xpp;Bash;bash;BlitzBasic;blitzbasic;BNF;bnf;C;c;C for Macs;c_mac;c#;csharp;C++;cpp;C++ (QT extensions);cpp-qt;CAD DCL;caddcl;CadLisp;cadlisp;CFDG;cfdg;ColdFusion;cfm; CSS;css;D;d;Delphi;delphi;Diff-Output;diff;DIV; div;DOS;dos;dot;dot;Eiffel;eiffel;Fortran;fortran;FOURJ\'s Genero 4GL;genero;FreeBasic;freebasic;GML;gml;Groovy;groovy;Haskell;haskell;HTML;html4strict;INI;ini;IO;io;Inno Script;inno;Java 5;java5;Java;java;Javascript;javascript;LaTeX;latex;Lisp;lisp;Lua;lua;Matlab;matlab;Microchip Assembler;mpasm;Microsoft Registry;reg;mIRC;mirc;Motorola 68000 Assembler;m68k;MySQL;mysql;NSIS;nsis;Objective C;objc;OpenOffice BASIC;oobas;Objective Caml;ocaml;Objective Caml (brief);ocaml-brief;Oracle 8;oracle8;Pascal;pascal;Per (forms);per;Perl;perl;PHP;php;PHP (brief);php-brief;PL/SQL;plsql;Python;phyton;Q(uick)BASIC;qbasic;robots.txt;robots;Ruby;ruby;Ruby on Rails;rails;SAS;sas;Scheme;scheme;sdlBasic;sdlbasic;SmallTalk;smalltalk;Smarty;smarty;SQL;sql;TCL/iTCL;tcl;T-SQL;tsql;Text;text;thinBasic;thinbasic;Unoidl;idl;VB.NET;vbnet;VHDL;vhdl;Visual BASIC;vb;Visual Fox Pro;visualfoxpro;WinBatch;winbatch;XML;xml;ZiLOG Z80;z80;###\"}}\n\n===13. Mindmaps===\n\nWikka has native support for [[Docs:FreeMind mindmaps]]. There are two options for embedding a mindmap in a wiki page.\n\n**Option 1:** Upload a \"\"FreeMind\"\" file to a webserver, and then place a link to it on a wikka page:\n  ##\"\"http://yourdomain.com/freemind/freemind.mm\"\"##\nNo special formatting is necessary.\n\n**Option 2:** Paste the \"\"FreeMind\"\" data directly into a wikka page:\n~- Open a \"\"FreeMind\"\" file with a text editor.\n~- Select all, and copy the data.\n~- Browse to your Wikka site and paste the Freemind data into a page. \n\n===14. Embedded HTML===\n\nYou can easily paste HTML in a wiki page by wrapping it into two sets of doublequotes. \n\n~##&quot;&quot;[html code]&quot;&quot;##\n\n**Examples:**\n\n~##&quot;&quot;y = x<sup>n+1</sup>&quot;&quot;##\n~\"\"y = x<sup>n+1</sup>\"\"\n\n~##&quot;&quot;<acronym title=\"Cascade Style Sheet\">CSS</acronym>&quot;&quot;##\n~\"\"<acronym title=\"Cascade Style Sheet\">CSS</acronym>\"\"\n\nBy default, some HTML tags are removed by the \"\"SafeHTML\"\" parser to protect against potentially dangerous code.  The list of tags that are stripped can be found on the [[Docs:SafeHTML SafeHTML]] documentation page.\n\nIt is possible to allow //all// HTML tags to be used, see Docs:UsingHTML for more information.\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('OwnedPages',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'OwnedPages', body = '{{ownedpages}}{{nocomments}}These numbers merely reflect how many pages you have created, not how much content you have contributed or the quality of your contributions. To see how you rank with other members, you may be interested in checking out the HighScores. \n\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('SandBox',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'SandBox', body = 'Test your formatting skills here.\n\n\n\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('SysInfo',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'SysInfo', body = '{{checkversion}}\n===== System Information =====\n\n~-Wikka version: ##{{wikkaversion}}##\n~-Wikka patch level: ##{{wikkapatchlevel}}##\n~-PHP version: ##{{phpversion}}##\n~-\"\"MySQL\"\" version: ##{{mysqlversion}}##\n~-\"\"GeSHi\"\" version: ##{{geshiversion}}##\n~-Server:\n~~-Host: ##{{system show=\"host\"}}##\n~~-Operative System: ##{{system show=\"os\"}}##\n~~-Machine: ##{{system show=\"machine\"}}##\n\n{{wikkaconfig}}\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('AdminUsers',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'AdminUsers', body = '{{checkversion}}\n{{adminusers}}\n\n----\nCategoryAdmin', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('AdminPages',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'AdminPages', body = '{{checkversion}}\n{{adminpages}}\n\n----\nCategoryAdmin', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('DatabaseInfo',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'DatabaseInfo', body = '{{dbinfo}}\n\n----\nCategoryAdmin', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('HighScores',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'HighScores', body = '{{highscores}}\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('TableMarkup',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'TableMarkup', body = '=====Wikka Table Markup Guide=====\n>>==See also:==\n~-For earlier Wikka versions, check the [[Docs:TableActionInfo table]] action\n~-Updated versions of this page can be found on the [[Docs:TableMarkup Wikka documentation server]] \n~-For a more formal description, check this server\'s TableMarkupReference page.\n>>\nAs of ##1.2##, Wikka introduces a flexible markup for data tables. Any kind of tables allowed by XHTML can be created using this markup, from the most basic examples (e.g. simple rows of cells) to complex tables with full support for accessibility options.::c::\n\n====1. Table basics: cells, rows, columns====\n\nThe most basic element of a table is a **cell**. Single cells can be created using the standard delimiter ##\"\"||\"\"##, e.g.:\n\n##\"\"||Hello||\"\"##\n\n||Hello||\n\nNote that a cell must always be open and closed by delimiters. \n\n**Rows** can be created by adding on the same line multiple cells:\n\n##\"\"||Cell 1||Cell 2||Cell 3||\"\"##\n\n||Cell 1||Cell 2||Cell 3||\n\n**Columns** can be created by adding rows on separate lines:\n\n##\"\"||Cell 1||\"\"##\n##\"\"||Cell 2||\"\"##\n##\"\"||Cell 3||\"\"##\n\n||Cell 1||\n||Cell 2||\n||Cell 3||\n\nBy now you should be able to create simple tables with **multiple rows and columns**.\n\n##\"\"||Cell 1||Cell 2||Cell 3||\"\"##\n##\"\"||Cell 4||Cell 5||Cell 6||\"\"##\n##\"\"||Cell 7||Cell 8||Cell 9||\"\"##\n\n||Cell 1||Cell 2||Cell 3||\n||Cell 4||Cell 5||Cell 6||\n||Cell 7||Cell 8||Cell 9||\n\n====2. Headings====\n\nAs soon as you create slightly more complex data tables, you will need to specify column and row **headings**. Headings are special cells that specify what kind of data rows and columns contain. The most basic way of creating a heading is by using ##\"\"|=|\"\"## as a delimiter.\n\nThe following is an example of a simple table with **column headings**:\n\n##\"\"|=|Apples|=|Pears|=|\"\"##\n##\"\"||300Kg||480Kg||\"\"##\n\n|=|Apples|=|Pears|=|\n||300Kg||480Kg||\n\n**Row headings** are created in the same way. Since they are usually followed by normal cells, they must be terminated with the ##\"\"||\"\"## standard delimiter if the next element in the row is a simple cell:\n\n##\"\"|=|Apples||300Kg||\"\"##\n##\"\"|=|Pears||480Kg||\"\"##\n\n|=|Apples||300Kg||\n|=|Pears||480Kg||\n\nYou should be able by now to create simple tables with row and column headings:\n\n##\"\"|=|       |=|Apples|=|Pears|=|\"\"##\n##\"\"|=|Mary||300Kg||320Kg||\"\"##\n##\"\"|=|John||400Kg||630Kg||\"\"##\n\n|=| |=|Apples|=|Pears|=|\n|=|Mary||300Kg||320Kg||\n|=|John||400Kg||630Kg||\n\nWe will describe later how to add accessibility parameters for row and column headings.\n\n====3. Captions====\n\nUsually tables are introduced with a caption that describes what the table contains. A caption element is introduced with a ##\"\"|?|\"\"## delimiter and terminated with a standard delimiter ##\"\"||\"\"##.\n\n##\"\"|?|Fruit production in 2006||\"\"##\n##\"\"|=|       |=|Apples|=|Pears|=|\"\"##\n##\"\"|=|Mary||300Kg||320Kg||\"\"##\n##\"\"|=|John||400Kg||630Kg||\"\"##\n\n|?|Fruit production in 2006||\n|=| |=|Apples|=|Pears|=|\n|=|Mary||300Kg||320Kg||\n|=|John||400Kg||630Kg||\n\n====4. Spans====\n\n**Spans** are used to combine multiple cells or multiple headings vertically or horizontally and are created using the following [[TableMarkupReference attribute parameters]]:\n\n##\"\"||\"\"(\'\'span options\'\')Element content\"\"||\"\"##\n\nA **cell spanning multiple columns** is generated by prefixing the cell content with a ##(x:\'\'n\'\')## parameter, where ##\'\'n\'\'## is the number of columns to be spanned. The following example shows how to create a cell spanning two columns:\n\n##\"\"||(x:2)Cell spanning 2 columns||Cell 3||\"\"##\n##\"\"||Cell 4||Cell 5||Cell 6||\"\"##\n##\"\"||Cell 7||Cell 8||Cell 9||\"\"##\n\n||(x:2)Cell spanning 2 columns||Cell 3||\n||Cell 4||Cell 5||Cell 6||\n||Cell 7||Cell 8||Cell 9||\n\nSpans can also be applied to rows. A **cell spanning multiple rows** is generated by prefixing the cell content with a ##(y:\'\'n\'\')## parameter, where  ##\'\'n\'\'##  is the number of rows to be spanned. The following example shows how to create a cell spanning two rows:\n\n##\"\"||(y:2)Cell spanning 2 rows||Cell 2||Cell 3||\"\"##\n##\"\"||Cell 5||Cell 6||\"\"##\n##\"\"||Cell 7||Cell 8||Cell 9||\"\"##\n\n||(y:2)Cell spanning 2 rows||Cell 2||Cell 3||\n||Cell 5||Cell 6||\n||Cell 7||Cell 8||Cell 9||\n\nSpans are particularly useful to create **subheadings**:\n\n##\"\"|?|Fruit production in the last two years||\"\"##\n##\"\"|=|       |=|(x:2)Apples|=|(x:2)Pears|=|\"\"##\n##\"\"|=|       |=|2005|=|2006|=|2005|=|2006|=|\"\"##\n##\"\"|=|Mary||300Kg||320Kg||400kg||280Kg||\"\"##\n##\"\"|=|John||400Kg||630Kg||210Kg||300Kg||\"\"##\n\n|?|Fruit production in the last two years||\n|=|       |=|(x:2)Apples|=|(x:2)Pears|=|\n|=|       |=|2005|=|2006|=|2005|=|2006|=|\n|=|Mary||300Kg||320Kg||400kg||280Kg||\n|=|John||400Kg||630Kg||210Kg||300Kg||\n\nColumn and row spans can be combined to created funky table layouts:\n\n##\"\"||(x:2;y:2)2x2||(x:2)2x1||(y:2)1x2||\"\"##\n##\"\"||(y:2)1x2||1x1||\"\"##\n##\"\"||1x1||1x1||(x:2)2x1||\"\"##\n\n||(x:2;y:2)2x2||(x:2)2x1||(y:2)1x2||\n||(y:2)1x2||1x1||\n||1x1||1x1||(x:2)2x1||\n\n\n====5. Formatting text within tables====\n\nYou can use any kind of basic [[Docs:TextFormatting Wikka markup]] to render text within tables.\nThe following example adds basic formatting to cell content:\n\n##\"\"|?|Using text formatting within tables||\"\"##\n##\"\"||##Monospaced##||//Italics//||**Bold**||__Underlined__||\"\"##\n##\"\"||\'\'Highlighted\'\'||++Strikethrough++||(x:2)**//Bold italics//**||\"\"##\n\n|?|Using text formatting within tables||\n||##Monospaced##||//Italics//||**Bold**||__Underlined__||\n||\'\'Highlighted\'\'||++Strikethrough++||(x:2)**//Bold italics//**||\n\n====6. Adding actions and images within tables====\n\nSimple, content-generating [[Docs:UsingActions actions]] (including [[Docs:AddingImages images]]) can be added within table cells and headings.\n\n##\"\"|?|Using actions within tables||\"\"##\n##\"\"||This wiki contains {{countpages}} pages||\"\"##\n##\"\"||{{image url=\"images/wikka_logo.jpg\" class=\"center\" alt=\"a w\" title=\"w image\"}}||\"\"##\n##\"\"||{{color c=\"red\" text=\"some colored text\"}}||\"\"##\n\n|?|Using actions within tables||\n||This wiki contains {{countpages}} pages||\n||{{image url=\"images/wikka_logo.jpg\" class=\"center\" alt=\"a w\" title=\"w image\"}}||\n||{{color c=\"red\" text=\"some colored text\"}}||\n\n====7. Adding links within tables====\n\nAll the available options to create [[Docs:AddingLinks links]] can be used within table cells or headings:\n\n##\"\"|?|Adding links within tables||\"\"##\n##\"\"||Camelcase links: SandBox||\"\"##\n##\"\"||Escaped camelcase links: &quot;&quot;SandBox&quot;&quot; escaped||\"\"##\n##\"\"||Forced links: [[HomePage main]]||\"\"##\n##\"\"||Interwiki links: Wikipedia:Wikka||\"\"##\n##\"\"||Forced interwiki links: [[Wikipedia:Wikka Wikka article on Wikipedia]]||\"\"##\n##\"\"||External links: http://www.example.com ||\"\"##\n##\"\"||Forced external links: [[http://www.example.com Example.com]]||\"\"##\n##\"\"||Image links: {{image url=\"images/wizard.gif\" alt=\"wizard\" title=\"Display an index of pages on this wiki\" link=\"PageIndex\"}}||\"\"##\n\n|?|Adding links within tables||\n||Camelcase links: SandBox||\n||Escaped camelcase links: \"\"SandBox escaped\"\"||\n||Forced links: [[HomePage main]]||\n||Interwiki links: Wikipedia:Wikka||\n||Forced interwiki links: [[Wikipedia:Wikka Wikka article on Wikipedia]]||\n||External links: http://www.example.com ||\n||Forced external links: [[http://www.example.com Example.com]]||\n||Image links: {{image url=\"images/wizard.gif\" alt=\"wizard\" title=\"Display an index of pages on this wiki\" link=\"PageIndex\"}}||\n\n====8. Adding HTML within tables====\n\nYou can also use [[Docs:UsingHTML embedded HTML]] in table elements:\n\n##\"\"|?|Embedding HTML within tables||\"\"##\n##\"\"||Here\'s some superscript: &quot;&quot;a&lt;sup&gt;2+1&lt;/sup&gt;&quot;&quot;||\"\"##\n##\"\"||And here\'s some subscript too: &quot;&quot;a&lt;sub&gt;2k&lt;/sub&gt;&quot;&quot;||\"\"##\n##\"\"||I love acronyms: &quot;&quot;&lt;acronym title=\"What You See Is What You Get\"&gt;WYSIWYG&lt;/acronym&gt;&quot;&quot;||\"\"##\n\n|?|Embedding HTML within tables||\n||Here\'s some superscript: \"\"a<sup>2+1</sup>\"\"||\n||And here\'s some subscript too: \"\"a<sub>2k</sub>\"\"||\n||I love acronyms: \"\"<acronym title=\"What You See Is What You Get\">WYSIWYG</acronym>\"\"||\n\n====9. Adding a touch of style====\n\nThe table markup introduces a new [[TableMarkupReference style selector]]. CSS style options can be added to any element by enclosing them within **single braces**, right before the element content, e.g.:\n##\"\"||\"\"{\'\'style options\'\'}Element content\"\"||\"\"##\n\nFor example, to render a cell with **red background** and **white text color**, you can do the following:\n\n##\"\"||{background-color:red; color:white}Hello||\"\"##\n\n||{background-color:red; color:white}Hello||\n\nYou can play with **font size** and **text alignment**:\n\n##\"\"|?|Adding some more style||\"\"##\n##\"\"||{font-size:190%; text-align:right}Please scale me!||\"\"##\n##\"\"||{font-size:170%; text-align:right}Please scale me!||\"\"##\n##\"\"||{font-size:150%; text-align:right}Please scale me!||\"\"##\n##\"\"||{font-size:130%; text-align:right}Please scale me!||\"\"##\n##\"\"||{font-size:110%; text-align:right}Please scale me!||\"\"##\n##\"\"||{font-size:90%; text-align:right}Please scale me!||\"\"##\n##\"\"||{font-size:70%; text-align:right}Please scale me!||\"\"##\n\n|?|Adding some more style||\n||{font-size:190%; text-align:right}Please scale me!||\n||{font-size:170%; text-align:right}Please scale me!||\n||{font-size:150%; text-align:right}Please scale me!||\n||{font-size:130%; text-align:right}Please scale me!||\n||{font-size:110%; text-align:right}Please scale me!||\n||{font-size:90%; text-align:right}Please scale me!||\n||{font-size:70%; text-align:right}Please scale me!||\n\nYou can also apply style to **headings** and **captions**:\n\n##\"\"|?|{border:1px dotted red; color:red}Style can be applied anywhere||\"\"##\n##\"\"|=|{color:#000; font-size:150%; font-style:italic; font-family:Georgia, Hoefler Text, Georgia, serif; font-weight:normal; line-height:150%}Emphemeral Quibus|=|\"\"##\n##\"\"||Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Duis auctor auctor pede.||\"\"##\n\n|?|{border:1px dotted red; color:red}Style can be applied anywhere||\n|=|{color:#000; font-size:150%; font-style:italic; font-family:Georgia, Hoefler Text, Georgia, serif; font-weight:normal; line-height:150%}Emphemeral Quibus|=|\n||Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Duis auctor auctor pede.||\n\nPlease note that **style parameters should always follow attribute parameters**, when both are specified for an element (see the [[TableMarkupReference table markup reference]]):\n\n##\"\"|?|Give priority||\"\"##\n##\"\"||(x:2;y:2){background-color:pink}2x2||(x:2){background-color:lightblue}2x1||(y:2){background-color:lightyellow}1x2||\"\"##\n##\"\"||(y:2){background-color:lightyellow}1x2||{background-color:#333;color:white}1x1||\"\"##\n##\"\"||{background-color:lightblue}1x1||{background-color:#333;color:white}1x1||(x:2){background-color:pink}2x1||\"\"##\n\n|?|Give priority||\n||(x:2;y:2){background-color:pink}2x2||(x:2){background-color:lightblue}2x1||(y:2){background-color:lightyellow}1x2||\n||(y:2){background-color:lightyellow}1x2||{background-color:#333;color:white}1x1||\n||{background-color:lightblue}1x1||{background-color:#333;color:white}1x1||(x:2){background-color:pink}2x1||\n\n====10. Adding style through classes====\n\nYou can apply existing classes from your stylesheet to any element using the class parameter ##(c:\'\'class\'\')##. Note that custom style declarations specified through braced markup override class attributes.\n\nThe following example applies to table cells two class selectors defined in the stylesheet. The third row shows how to override a class selector with custom style attributes:\n\n##\"\"|?|Using class selectors to add style to table elements||\"\"##\n##\"\"||(c:highlight)This cell uses the ##.highlight## class||\"\"##\n##\"\"||(c:smaller)This cell uses the ##.smaller## class||\"\"##\n##\"\"||(c:smaller){font-size:150%}This cell uses the ##.smaller## class overridden by custom style settings||\"\"##\n\n|?|Using class selectors to add style to table elements||\n||(c:highlight)This cell uses the ##.highlight## class||\n||(c:smaller)This cell uses the ##.smaller## class||\n||(c:smaller){font-size:150%}This cell uses a ##.smaller## class overridden by custom style settings||\n\n====11. Global table attributes====\n\nTable-level attributes can be specified by adding at the beginning of the table the following element: ##\"\"|!|   ||\"\"##, which is used as a container for global table attributes. For example, you can specify **global style options** for a table by adding them to this element:\n\n##\"\"|!|{border:3px solid blue; background-color: black; color: white; width: 300px; text-align: center}||\"\"##\n##\"\"||Cell 1||\"\"##\n##\"\"||Cell 2||\"\"##\n##\"\"||Cell 3||\"\"##\n\n|!|{border:3px solid blue; background-color: black; color: white; width: 300px; text-align: center}||\n||Cell 1||\n||Cell 2||\n||Cell 3||\n\n====12. Referring to elements: the ##id## attribute====\n\n##id## attributes are used to refer to unique elements in a page and to provide an anchor for styling and linking. You can specify an ##id## for any table element by using the ##(i:\'\'id\'\')## parameter.\n\nFor example, the following markup creates a table with the ##id## \"main_table\" containing two cells with ##id##\'s \"cell_1\" and \"cell_2\"\n\n##\"\"|!|(i:main_table)||\"\"##\n##\"\"|?|Using id to refer to table elements||\"\"##\n##\"\"||(i:cell_1)This cell can be referred to by using the ##cell_1## id||\"\"##\n##\"\"||(i:cell_2)This cell can be referred to by using the ##cell_2## id||\"\"##\n\n|!|(i:main_table)||\n|?|Using id to refer to table elements||\n||(i:cell_1)This cell can be referred to by using the ##cell_1## id||\n||(i:cell_2)This cell can be referred to by using the ##cell_2## id||\n\n====13. Accessibility options: adding titles====\n\nAny table element can be given a ##title## attribute to enhance its accessibility. Titles are typically displayed in graphical browsers by hovering over the corresponding element and are useful to display unobtrusive descriptions about specific elements. You can specify a ##title## for any table element by using the ##(t:\'\'title\'\')## parameter.\n\nThe following example adds titles to several table elements (you can hover over the table to display them):\n\n##\"\"|!|(t:Comparative figures for fruit production in the last year){width: 350px}||\"\"##\n##\"\"|?|Fruit production in 2006||\"\"##\n##\"\"|=|       |=|(t:yearly production of apples)Apples|=|(t:yearly production of pears)Pears|=|\"\"##\n##\"\"|=|(t:Mary\'s contribution to 2006 production)Mary||(t:Mary\'s production of apples in 2006){text-align:center}300Kg||(t:Mary\'s production of pears in 2006){text-align:center}320Kg||\"\"##\n##\"\"|=|(t:John\'s contribution to 2006 production)John||(t:John\'s production of apples in 2006){text-align:center}400Kg||(t:John\'s production of pears in 2006){text-align:center}630Kg||\"\"##\n\n|!|(t:Comparative figures for fruit production in the last year){width: 350px}||\n|?|Fruit production in 2006||\n|=|       |=|(t:yearly production of apples)Apples|=|(t:yearly production of pears)Pears|=|\n|=|(t:Mary\'s contribution to 2006 production)Mary||(t:Mary\'s production of apples in 2006){text-align:center}300Kg||(t:Mary\'s production of pears in 2006){text-align:center}320Kg||\n|=|(t:John\'s contribution to 2006 production)John||(t:John\'s production of apples in 2006){text-align:center}400Kg||(t:John\'s production of pears in 2006){text-align:center}630Kg||\n\n====14. Accessibility options: adding a summary====\n\nTables can take an optional ##summary## attribute to describe the purpose and/or structure of the table. The description provided by the summary attribute is particularly helpful to users of non-visual browsers. You can specify a summary by adding a ##(u:\'\'Summary\'\')## parameter in the table global attributes.\n\nFor example, the following line:\n##\"\"|!|(u:This is a summary)||\"\"##\nwill add to the table a ##summary## attribute with the value ##This is a summary##.\n\n====15. Accessibility options: table head, table body and table foot====\n\nRows in a table can be grouped in a table head, table body and table foot. This division enables browsers to support scrolling of table bodies independently of the table head and foot. When long tables are printed, the table head and foot information may be repeated on each page that contains table data. The table head and table foot should contain information about the table\'s columns. The table body should contain rows of table data.\n\nWikka allows you to create groups of rows with special markers:\n~- The ##\"\"|[|\"\"## marker groups the rows it precedes as a **table head** block;\n~- The ##\"\"|]|\"\"## marker groups the rows it precedes as a **table foot** block;\n~- The ##\"\"|#|\"\"## marker groups the rows it precedes as a **table body**;\n\nThe following example shows how to use these elements to create row groups. Note that Wikka uses different backgrounds to differentiate column headings in the table head and foot from row headings in the table body:\n\n##\"\"|!|(u:A table with summary, caption, head, foot and body){width: 400px}||\"\"##\n##\"\"|?|Here\'s how you can group rows||\"\"##\n##\"\"|[|\"\"##\n##\"\"|=|Name|=|Place|=|Telephone||\"\"##\n##\"\"|]|\"\"##\n##\"\"|=|Name|=|Place|=|Telephone||\"\"##\n##\"\"|#|\"\"##\n##\"\"|=|John Smith||New York||555-1234||\"\"##\n##\"\"|=|Jane Smith||Los Angeles||555-2345||\"\"##\n##\"\"|=|John Doe||Unknown||Unknown||\"\"##\n##\"\"|=|Jane Doe||Unknown||Unknown||\"\"##\n\n|!|(u:A table with summary, caption, head, foot and body){width: 400px}||\n|?|Here\'s how you can group rows||\n|[|\n|=|Name|=|Place|=|Telephone||\n|]|\n|=|Name|=|Place|=|Telephone||\n|#|\n|=|John Smith||New York||555-1234||\n|=|Jane Smith||Los Angeles||555-2345||\n|=|John Doe||Unknown||Unknown||\n|=|Jane Doe||Unknown||Unknown||\n\n====16. Accessibility options: heading scope====\n\nTo be semantically correct and accessible to users with non-visual browsers, headings should contain scope attributes describing the cell range they refer to. \n~-Column heading scopes can be specified using the ##(o:col)## parameter in the corresponding column heading;\n~-Row heading scopes can be specified using the ##(o:row)## parameter in the corresponding row heading;\n\nThe following example shows how to correctly add column and row scopes to a table to make it accessible:\n\n##\"\"|!|(u:The number of employees and the foundation year of some imaginary companies.)||\"\"##\n##\"\"|?|Table 1: Company data||\"\"##\n##\"\"|[|\"\"##\n##\"\"|||=|(o:col)Employees|=|(o:col)Founded||\"\"##\n##\"\"|#|\"\"##\n##\"\"|=|(o:row)ACME Inc||1000||1947||\"\"##\n##\"\"|=|(o:row)XYZ Corp||2000||1973||\"\"##\n\n|!|(u:The number of employees and the foundation year of some imaginary companies.)||\n|?|Table 1: Company data||\n|[|\n|||=|(o:col)Employees|=|(o:col)Founded||\n|#|\n|=|(o:row)ACME Inc||1000||1947||\n|=|(o:row)XYZ Corp||2000||1973||\n\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        if (!Wakka::existsPage('TableMarkupReference',$config['table_prefix'],$dblink)) mysql_query("insert into ".$config['table_prefix']."pages set tag = 'TableMarkupReference', body = '======Wikka Table Markup Reference======\n>>==See also:==\n~-For an informal introduction to this markup and several examples consult this server\'s TableMarkup page.\n~-Updated versions of this page can be found on the [[Docs:TableMarkupReference Wikka documentation server]].\n>>\n==== 1. Table Markup Scheme ====\n\nThe generic markup for table elements follows this scheme:\n\n~**##{{color fg=\"#F00\" text=\"|*|\"}}{{color fg=\"blue\" text=\"(attribute parameters)\"}}{{color fg=\"green\" text=\"{style parameters}\"}}content{{color fg=\"#F00\" text=\"||\"}}##**\n\n==Example:==\n\n~##\"\"|=|(i:main_heading){text-size: 120%}This is the main heading||\"\"##\n\n===Understanding the Table Markup Scheme===\n\n~1)**Opening delimiter** --- **##{{color fg=\"#F00\" text=\"|*|\"}}##** is any of the delimiters described in the //elements table// below.\n~1)**Attributes** --- **##{{color fg=\"blue\" text=\"(attribute parameters)\"}}##** is an optional series of ##parameter:value## declarations enclosed in brackets. Valid parameters are described in the //attribute table// below. Multiple parameter declarations can be separated with a semicolon (**##;##**).\n~1)**Style** --- **##{{color fg=\"green\" text=\"{style parameters}\"}}##** is an optional series of CSS style declarations enclosed in braces. Multiple style declarations can be separated with a semicolon (**##;##**).\n~1)**Content** --- **##content##** can be any valid content for that element (including [[Docs:TextFormatting formatted text]]).\n~1)**Closing delimiter** --- **##{{color fg=\"#F00\" text=\"||\"}}##** is the standard delimiter.\n\n==Note:==\nSome elements are //self closing// and do not accept any attributes, style parameters or content. See the notes in the //elements table// below.\n\n==== 2. Elements ====\n\n|!|{width: 80%}||\n|?|Table Elements||\n|=|\"\"XHTML Elements\"\"|=|Delimiter|=|Notes||\n||##<table>##||##\"\"|!|\"\"##||Optional, only useful for adding attributes. **Must** be first in table markup if used. Should be on a line by itself.||\n||##<caption>##||##\"\"|?|\"\"##||||\n||##<colgroup>##||##\"\"|_|\"\"##||||\n||##<col />##||##\"\"|-|\"\"##||Selfclosing - must not be closed!||\n||##<thead>##||##\"\"|[|\"\"##||||\n||##<tfoot>##||##\"\"|]|\"\"##||||\n||##<tbody>##||##\"\"|#|\"\"##||||\n||##<tr>##||none||Will be opened for each row of table cells.||\n||##<th>##||##\"\"|=|\"\"##||||\n||##<td>##||##\"\"||\"\"##||||\n\n==== 3. Attributes ====\n\n|?|Table Attributes||\n|[|\n|=|Attribute|=|Markup key||\n|]|\n|=|Attribute|=|Markup key||\n|#|\n|=|(x:2)Core||\n||##id##||##i##||\n||##title##||##t##||\n||##class##||##c##||\n||##style##||##s##||\n|=|(x:2)i18n||\n||##xml:lang##||##l##||\n||##dir##||##d##||\n|=|(x:2)Table cells||\n||##colspan##||##x##||\n||##rowspan##||##y##||\n||##scope##||##o##||\n||##headers##||##h##||\n||##abbr##||##a##||\n||##axis##||##z##||\n|=|(x:2)Other Table elements||\n||##span##||##p##||\n||##summary##||##u##||\n\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink);
+        test('Building links table...', 1);
         /**
          * Script for (re)building links table.
@@ -188 +214 @@
         include('links.php');
 
-        break;
-
-// The funny upgrading stuff. Make sure these are in order! //
-// And yes, there are no break;s here. This is on purpose.  //
+        // @@@  ?? *default* ACLs are in the configuration file; settings on UserSettings page are irrelevant for default ACLs!
+        //              use page-specific "ACL" files to create page-specific ACLs (in update_default_page()!).
+        // @@@  use test() function to report actual results instead of assuming success!
         test("Setting default ACL...", 1);
         mysql_query("insert into ".$config['table_prefix']."acls set page_tag = 'UserSettings', read_acl = '*', write_acl = '+', comment_read_acl = '*', comment_post_acl = '+'", $dblink);
@@ -202 +227 @@
         //
         // Set default cookie path
+        test("Setting initial session cookies for auto-login...", 1);
         $base_url_path = preg_replace('/wikka\.php/', '', $_SERVER['SCRIPT_NAME']);
         $wikka_cookie_path = ('/' == $base_url_path) ? '/' : substr($base_url_path,0,-1);
@@ -207 +233 @@
         SetCookie('user_name'.$config['wiki_suffix'], $config['admin_users'], time() + PERSISTENT_COOKIE_EXPIRY, $wikka_cookie_path); 
         $_COOKIE['user_name'.$config['wiki_suffix']] = $config['admin_users']; 
-        SetCookie('pass'.$config['wiki_suffix'], md5(mysql_real_escape_string($_POST['password'])), time() + PERSISTENT_COOKIE_EXPIRY, $wikka_cookie_path); 
-        $_COOKIE['pass'.$config['wiki_suffix']] = md5(mysql_real_escape_string($_POST['password'])); 
+        SetCookie('pass'.$config['wiki_suffix'], $pass_val, time() + PERSISTENT_COOKIE_EXPIRY, $wikka_cookie_path); 
+        $_COOKIE['pass'.$config['wiki_suffix']] = $pass_val; 
 
         break;
 
 // The funny upgrading stuff. Make sure these are in order! //
-// And yes, there are no break;s here. This is on purpose.  //
+// And yes, there are no breaks here. This is on purpose.  //
 
 // from 0.1 to 0.1.1
@@ -339 +365 @@
 case "1.1.5.2":
 case "1.1.5.3":
-        update_default_page(array('WikkaReleaseNotes', 'WikkaDocumentation'), $dblink, $config, $lang_defaults_path, $lang_defaults_fallback_path);
+        test("Adding WikkaReleaseNotes page...",
+        mysql_query("insert into ".$config['table_prefix']."pages set tag = 'WikkaReleaseNotes', body = '{{wikkachanges}}{{nocomments}}\n\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink), "Already done? OK!", 0);
+        test("Adding WikkaDocumentation page...",
+        mysql_query("insert into ".$config['table_prefix']."pages set tag = 'WikkaDocumentation' , body = '=====Wikka Documentation=====\n\nComprehensive and up-to-date documentation on Wikka Wiki can be found on the [[http://docs.wikkawiki.org/ Wikka Documentation server]].', owner = '(Public)', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink), "Already done? OK!", 0);
         // cookie names have changed -- logout user and delete the old cookies
         test(DELETING_COOKIES, 1);
@@ -365 +394 @@
         DeleteCookie("wikka_user_name");
         DeleteCookie("wikka_pass");
+        //adding SysInfo page
+        test("Adding SysInfo page...",
+        mysql_query("insert into ".$config['table_prefix']."pages set tag = 'SysInfo', body = '===== System Information =====\n\n~-Wikka version: ##{{wikkaversion}}##\n~-PHP version: ##{{phpversion}}##\n~-\"\"MySQL\"\" version: ##{{mysqlversion}}##\n~-\"\"GeSHi\"\" version: ##{{geshiversion}}##\n~-Server:\n~~-Host: ##{{system show=\"host\"}}##\n~~-Operative System: ##{{system show=\"os\"}}##\n~~-Machine: ##{{system show=\"machine\"}}##\n\n----\nCategoryWiki', owner = '(Public)', note='".$upgrade_note."',  user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink), "Already done? OK!", 0);
 case "1.1.6.2-alpha":
 case "1.1.6.2-beta":
@@ -373 +405 @@
         test(sprintf(ADDING_CONFIG_ENTRY, 'wikka_template_path' ), 1);
         $config["wikka_template_path"] = 'templates';
+        test("Adding HighScores page...",
+        mysql_query("insert into ".$config['table_prefix']."pages set tag = 'HighScores', body = '{{highscores}}\n\n----\nCategoryWiki', owner = '(Public)', note='".$upgrade_note."', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink), "Already done? OK!", 0);
+        test("Adding CategoryAdmin page...",
+        mysql_query("insert into ".$config['table_prefix']."pages set tag = 'CategoryAdmin', body = '=====Wiki Administration Category=====\nThis category links to pages for wiki administration.\n\n\n----\n\n{{category}}\n\n\n----\n[[CategoryCategory List of all categories]]', owner = '(Public)', note='".$upgrade_note."', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink), "Already done? OK!", 0);
+        test("Adding DatabaseInfo page...",
+        mysql_query("insert into ".$config['table_prefix']."pages set tag = 'DatabaseInfo', body = '{{dbinfo}}\n\n----\nCategoryAdmin', owner = '(Public)', note='".$upgrade_note."', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink), "Already done? OK!", 0);
+        test("Setting ACL for DatabaseInfo...",
+        mysql_query("insert into ".$config['table_prefix']."acls set page_tag = 'DatabaseInfo', read_acl = '!*', write_acl = '!*', comment_acl = '!*'", $dblink), "Already done? OK!", 0);
+        test("Adding AdminUsers page...",
+        mysql_query("insert into ".$config['table_prefix']."pages set tag = 'AdminUsers', body = '{{checkversion}}\n{{adminusers}}\n\n----\nCategoryAdmin', owner = '(Public)', note='".$upgrade_note."', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink), "Already done? OK!", 0);
+        test("Setting ACL for AdminUsers...",
+        mysql_query("insert into ".$config['table_prefix']."acls set page_tag = 'AdminUsers', read_acl = '!*', write_acl = '!*', comment_acl = '!*'", $dblink), "Already done? OK!", 0);
+        test("Adding AdminPages page...",
+        mysql_query("insert into ".$config['table_prefix']."pages set tag = 'AdminPages', body = '{{checkversion}}\n{{adminpages}}\n\n----\nCategoryAdmin', owner = '(Public)', note='".$upgrade_note."', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink), "Already done? OK!", 0);
+        test("Setting ACL for AdminPages...",
+        mysql_query("insert into ".$config['table_prefix']."acls set page_tag = 'AdminPages', read_acl = '!*', write_acl = '!*', comment_acl = '!*'", $dblink), "Already done? OK!", 0);        
+        test("Archiving latest SysInfo revision...", 
+        mysql_query("update ".$config["table_prefix"]."pages set latest = 'N' where tag = 'SysInfo'"), "Already done? OK!", 0);
+        test("Updating SysInfo page...",
+        mysql_query("insert into ".$config['table_prefix']."pages set tag = 'SysInfo', body = '{{checkversion}}\n===== System Information =====\n\n~-Wikka version: ##{{wikkaversion}}##\n~-PHP version: ##{{phpversion}}##\n~-\"\"MySQL\"\" version: ##{{mysqlversion}}##\n~-\"\"GeSHi\"\" version: ##{{geshiversion}}##\n~-Server:\n~~-Host: ##{{system show=\"host\"}}##\n~~-Operative System: ##{{system show=\"os\"}}##\n~~-Machine: ##{{system show=\"machine\"}}##\n\n{{wikkaconfig}}\n\n----\nCategoryWiki', owner = '(Public)', note='".$upgrade_note."', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink), "Already done? OK!", 0);
+        test("Archiving latest WikiCategory revision...", 
+        mysql_query("update ".$config["table_prefix"]."pages set latest = 'N' where tag = 'WikiCategory'"), "Already done? OK!", 0);
+        test("Updating WikiCategory page...",
+        mysql_query("insert into ".$config['table_prefix']."pages set tag = 'WikiCategory', body = '=====How to use categories=====\nThis wiki is using a very flexible but simple categorizing system to keep everything properly organized.\n\n====1. Adding a page to an existing category====\nTo \'\'add a page to an existing category\'\' simply add a link to the relevant category page. For example, to mark page ##\"\"MyPage\"\"## as a child of category ##\"\"MyCategory\"\"##, just add a link to ##\"\"MyCategory\"\"## from ##\"\"MyPage\"\"##. This will automatically add ##\"\"MyPage\"\"## to the list of pages belonging to that category. Category links are put by convention at the end of the page, but the position of these links does not affect their behavior.\n\n====2. Adding a subcategory to an existing category====\nTo \'\'create a hierarchy of categories\'\', you can follow the same instructions to add pages to categories. For example, to mark category ##\"\"Category2\"\"## as a child (or subcategory) of another category ##\"\"Category1\"\"##, just add a link to ##\"\"Category1\"\"## in ##\"\"Category2\"\"##. This will automatically add ##\"\"Category2\"\"## to the list of ##\"\"Category1\"\"##\'s children.\n\n====3. Creating new categories====\nTo \'\'start a new category\'\' just create a page containing ##\"\"{{category}}\"\"##. This will mark the page as a special //category page// and will output a list of pages belonging to the category. Category page names start by convention with the word ##Category## but you can also create categories without following this convention. To add a new category to the master list of categories just add a link from it to CategoryCategory.\n\n====4. Browsing categories====\nTo \'\'browse the categories\'\' available on your wiki you can start from CategoryCategory. If all pages and subcategories are properly linked as described above, you will be able to browse the whole hierarchy of categories starting from this page.\n\n----\nCategoryWiki', owner = '(Public)', note='".$upgrade_note."', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink), "Already done? OK!", 0);
         test("Adding status field to users table...",
         mysql_query("alter table ".$config['table_prefix']."users add column status enum ('invited','signed-up','pending','active','suspended','banned','deleted')"), "Already done? OK!", 0); 
@@ -379 +435 @@
         test('Dropping obsolete index `from_tag`...',
         mysql_query('alter table '.$config['table_prefix'].'links drop index `idx_from`'), 'Already done?  OK!', 0);
-        update_default_page(array('HighScores', 'FormattingRules', 'WikiCategory', 'DatabaseInfo', 'SysInfo', 'AdminUsers', 'AdminPages'), $dblink, $config, $lang_defaults_path, $lang_defaults_fallback_path);
-        test("Setting ACL for DatabaseInfo...",
-        mysql_query("insert into ".$config['table_prefix']."acls set page_tag = 'DatabaseInfo', read_acl = '!*', write_acl = '!*', comment_acl = '!*'", $dblink), "Already done? OK!", 0);
-        test("Setting ACL for AdminUsers...",
-        mysql_query("insert into ".$config['table_prefix']."acls set page_tag = 'AdminUsers', read_acl = '!*', write_acl = '!*', comment_acl = '!*'", $dblink), "Already done? OK!", 0);
-        test("Setting ACL for AdminPages...",
-        mysql_query("insert into ".$config['table_prefix']."acls set page_tag = 'AdminPages', read_acl = '!*', write_acl = '!*', comment_acl = '!*'", $dblink), "Already done? OK!", 0);        
 case "1.1.6.4":
 case "1.1.6.5":
-        update_default_page('FormattingRules', $dblink, $config, $lang_defaults_path, $lang_defaults_fallback_path);
-        @unlink('handlers'.DIRECTORY_SEPARATOR.'referrers_sites'.DIRECTORY_SEPARATOR.'referrers_sites.php');
-        rmdirr('handlers'.DIRECTORY_SEPARATOR.'referrers_sites');
 case "1.1.6.6":
 case "1.1.6.7":
 case "1.2":
-        update_default_page(array('FormattingRules', 'TableMarkup', 'TableMarkupReference'), $dblink, $config, $lang_defaults_path, $lang_defaults_fallback_path);
         test(sprintf(ADDING_CONFIG_ENTRY, 'enable_user_host_lookup' ), 1);
         $config['enable_user_host_lookup'] = '1';
+        test("Archiving latest FormattingRules revision...", 
+        mysql_query("update ".$config["table_prefix"]."pages set latest = 'N' where tag = 'FormattingRules'"), "Already done? OK!", 0);
+        test("Updating FormattingRules page...",
+        mysql_query("insert into ".$config['table_prefix']."pages set tag = 'FormattingRules', body = '======Wikka Formatting Guide======\n\n<<**Note:** Anything between 2 sets of double-quotes is not formatted.<<::c::\nOnce you have read through this, test your formatting skills in the SandBox.\n----\n===1. Text Formatting===\n\n~##\"\"**I\'m bold**\"\"##\n~**I\'m bold **\n\n~##\"\"//I\'m italic text!//\"\"##\n~//I\'m italic text!//\n\n~##\"\"And I\'m __underlined__!\"\"##\n~And I\'m __underlined__!\n\n~##\"\"##monospace text##\"\"##\n~##monospace text##\n\n~##\"\"\'\'highlight text\'\'\"\"## (using 2 single-quotes)\n~\'\'highlight text\'\'\n\n~##\"\"++Strike through text++\"\"##\n~++Strike through text++\n\n~##\"\"Press #%ANY KEY#%\"\"##\n~Press #%ANY KEY#%\n\n~##\"\"@@Center text@@\"\"##\n~@@Center text@@\n\n===2. Headers===\n\nUse between six ##=## (for the biggest header) and two ##=## (for the smallest header) on both sides of a text to render it as a header.\n\n~##\"\"====== Really big header ======\"\"##\n~====== Really big header ======\n  \n~##\"\"===== Rather big header =====\"\"##\n~===== Rather big header =====\n\n~##\"\"==== Medium header ====\"\"##\n~==== Medium header ====\n\n~##\"\"=== Not-so-big header ===\"\"##\n~=== Not-so-big header ===\n\n~##\"\"== Smallish header ==\"\"##\n~== Smallish header ==\n\n===3. Horizontal separator===\n~##\"\"----\"\"##\n----\n\n===4. Forced line break===\n~##\"\"---\"\"##\n---\n\n===5. Lists and indents===\n\nYou can indent text using a **~**, a **tab** or **4 spaces** (which will auto-convert into a tab).\n\n##\"\"~This text is indented<br />~~This text is double-indented<br />&nbsp;&nbsp;&nbsp;&nbsp;This text is also indented\"\"##\n\n~This text is indented\n~~This text is double-indented\n    This text is also indented\n\nTo create bulleted/ordered lists, use the following markup (you can always use 4 spaces instead of a ##**~**##):\n\n**Bulleted lists**\n##\"\"~- Line one\"\"##\n##\"\"~- Line two\"\"##\n\n      - Line one\n    - Line two\n\n**Numbered lists**\n##\"\"~1) Line one\"\"##\n##\"\"~1) Line two\"\"##\n\n        1) Line one\n   1) Line two\n\n**Ordered lists using uppercase characters**\n##\"\"~A) Line one\"\"##\n##\"\"~A) Line two\"\"##\n\n     A) Line one\n   A) Line two\n\n**Ordered lists using lowercase characters**\n##\"\"~a) Line one\"\"##\n##\"\"~a) Line two\"\"##\n\n     a) Line one\n   a) Line two\n\n**Ordered lists using roman numerals**\n##\"\"~I) Line one\"\"##\n##\"\"~I) Line two\"\"##\n\n   I) Line one\n   I) Line two\n\n**Ordered lists using lowercase roman numerals**\n##\"\"~i) Line one\"\"##\n##\"\"~i) Line two\"\"##\n\n i) Line one\n   i) Line two\n\n===6. Inline comments===\n\nTo format some text as an inline comment, use an indent ( **~**, a **tab** or **4 spaces**) followed by a **\"\"&amp;\"\"**.\n\n**Example:**\n\n##\"\"~&amp; Comment\"\"##\n##\"\"~~&amp; Subcomment\"\"##\n##\"\"~~~&amp; Subsubcomment\"\"##\n\n~& Comment\n~~& Subcomment\n~~~& Subsubcomment\n\n===7. Images===\n\nTo place images on a Wiki page, you can use the ##image## action.\n\n**Example:**\n\n~##\"\"{{image class=\"center\" alt=\"DVD logo\" title=\"An Image Link\" url=\"images/dvdvideo.gif\" link=\"RecentChanges\"}}\"\"##\n~{{image class=\"center\" alt=\"dvd logo\" title=\"An Image Link\" url=\"images/dvdvideo.gif\" link=\"RecentChanges\"}}\n\nLinks can be external, or internal Wiki links. You don\'t need to enter a link at all, and in that case just an image will be inserted. You can use the optional classes ##left## and ##right## to float images left and right. You don\'t need to use all those attributes, only ##url## is required while ##alt## is recommended for accessibility.\n\n===8. Links===\n\nTo create a **link to a wiki page** you can use any of the following options: ---\n~1) type a ##\"\"WikiName\"\"##: --- --- ##\"\"FormattingRules\"\"## --- FormattingRules --- ---\n~1) add a forced link surrounding the page name by ##\"\"[[\"\"## and ##\"\"]]\"\"## (everything after the first space will be shown as description): --- --- ##\"\"[[SandBox Test your formatting skills]]\"\"## --- [[SandBox Test your formatting skills]] --- --- ##\"\"[[SandBox &#27801;&#31665;]]\"\"## --- [[SandBox &#27801;&#31665;]] --- ---\n~1) add an image with a link (see instructions above).\n\nTo **link to external pages**, you can do any of the following: ---\n~1) type a URL inside the page: --- --- ##\"\"http://www.example.com\"\"## --- http://www.example.com --- --- \n~1) add a forced link surrounding the URL by ##\"\"[[\"\"## and ##\"\"]]\"\"## (everything after the first space will be shown as description): --- --- ##\"\"[[http://example.com/jenna/ Jenna\'s Home Page]]\"\"## --- [[http://example.com/jenna/ Jenna\'s Home Page]] --- --- ##\"\"[[mail@example.com Write me!]]\"\"## --- [[mail@example.com Write me!]] --- ---\n~1) add an image with a link (see instructions above);\n~1) add an interwiki link (browse the [[InterWiki list of available interwiki tags]]): --- --- ##\"\"WikiPedia:WikkaWiki\"\"## --- WikiPedia:WikkaWiki --- --- ##\"\"Google:CSS\"\"## --- Google:CSS --- --- ##\"\"Thesaurus:Happy\"\"## --- Thesaurus:Happy --- ---\n\n===9. Tables===\n\n<<The ##table## action has been deprecated as of Wikka version 1.2 and has been replaced with the syntax that follows. Please visit the [[Docs:TableActionInfo Wikka documentation server]] for information about the older ##table## action.<<::c::\nTables can be created using two pipe (##\"\"||\"\"##) symbols. Everything in a single line is rendered as a table row.\n\n**Example:**\n\n##\"\"||Cell 1||Cell 2||\"\"##\n\n||Cell 1||Cell 2||\n\nHeader cells can be rendered by placing an equals sign between the pipes.\n\n**Example:**\n\n##\"\"|=|Header 1|=|Header 2||\"\"##\n##\"\"||Cell 1||Cell 2||\"\"##\n\n|=|Header 1|=|Header 2||\n||Cell 1||Cell 2||\n\nRow and column spans are specified with ##x:## and ##y:## in parentheses just after the pipes.\n\n**Example:**\n\n##\"\"|=| |=|(x:2)Columns||\"\"##\n##\"\"|=|(y:2) Rows||Cell 1||Cell 2||\"\"##\n##\"\"||Cell 3||Cell 4||\"\"##\n\n|=| |=|(x:2)Columns||\n|=|(y:2) Rows||Cell 1||Cell 2||\n||Cell 3||Cell 4||\n\nMany additional features are available using table markup. A more comprehensive table markup guide is available on this server\'s TableMarkup page. A complete syntax reference is available on this server\'s TableMarkupReference page.\n\n===10. Colored Text===\n\nColored text can be created using the ##color## action:\n\n**Example:**\n\n~##\"\"{{color c=\"blue\" text=\"This is a test.\"}}\"\"##\n~{{color c=\"blue\" text=\"This is a test.\"}}\n\nYou can also use hex values:\n\n**Example:**\n\n~##\"\"{{color hex=\"#DD0000\" text=\"This is another test.\"}}\"\"##\n~{{color hex=\"#DD0000\" text=\"This is another test.\"}}\n\nAlternatively, you can specify a foreground and background color using the ##fg## and ##bg## parameters (they accept both named and hex values):\n\n**Examples:**\n\n~##\"\"{{color fg=\"#FF0000\" bg=\"#000000\" text=\"This is colored text on colored background\"}}\"\"##\n~{{color fg=\"#FF0000\" bg=\"#000000\" text=\"This is colored text on colored background\"}}\n\n~##\"\"{{color fg=\"yellow\" bg=\"black\" text=\"This is colored text on colored background\"}}\"\"##\n~{{color fg=\"yellow\" bg=\"black\" text=\"This is colored text on colored background\"}}\n\n\n===11. Floats===\n\nTo create a **left floated box**, use two ##<## characters before and after the block.\n\n**Example:**\n\n~##\"\"&lt;&lt;Some text in a left-floated box hanging around&lt;&lt; Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler.\"\"##\n\n<<Some text in a left-floated box hanging around<<Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler.\n\n::c::To create a **right floated box**, use two ##>## characters before and after the block.\n\n**Example:**\n\n~##\"\">>Some text in a right-floated box hanging around>> Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler.\"\"##\n\n   >>Some text in a right-floated box hanging around>>Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler. Some more text as a filler.\n\n::c:: Use ##\"\"::c::\"\"##  to clear floated blocks.\n\n===12. Code formatters===\n\nYou can easily embed code blocks in a wiki page using a simple markup. Anything within a code block is displayed literally. \nTo create a **generic code block** you can use the following markup:\n\n~##\"\"%% This is a code block %%\"\"##. \n\n%% This is a code block %%\n\nTo create a **code block with syntax highlighting**, you need to specify a //code formatter// (see below for a list of available code formatters). \n\n~##\"\"%%(\"\"{{color c=\"red\" text=\"php\"}}\"\")<br />&lt;?php<br />echo \"Hello, World!\";<br />?&gt;<br />%%\"\"##\n\n%%(php)\n<?php\necho \"Hello, World!\";\n?>\n%%\n\nYou can also specify an optional //starting line// number.\n\n~##\"\"%%(php;\"\"{{color c=\"red\" text=\"15\"}}\"\")<br />&lt;?php<br />echo \"Hello, World!\";<br />?&gt;<br />%%\"\"##\n\n%%(php;15)\n<?php\necho \"Hello, World!\";\n?>\n%%\n\nIf you specify a //filename//, this will be used for downloading the code.\n\n~##\"\"%%(php;15;\"\"{{color c=\"red\" text=\"test.php\"}}\"\")<br />&lt;?php<br />echo \"Hello, World!\";<br />?&gt;<br />%%\"\"##\n\n%%(php;15;test.php)\n<?php\necho \"Hello, World!\";\n?>\n%%\n\n**List of available code formatters:**\n{{table columns=\"6\" cellpadding=\"1\" cells=\"LANGUAGE;FORMATTER;LANGUAGE;FORMATTER;LANGUAGE;FORMATTER;ABAP;abap;Actionscript;actionscript;ADA;ada;Apache Log;apache;AppleScript; applescript;ASM;asm;ASP;asp;AutoIT;autoit;Axapta/Dynamics Ax X++;xpp;Bash;bash;BlitzBasic;blitzbasic;BNF;bnf;C;c;C for Macs;c_mac;c#;csharp;C++;cpp;C++ (QT extensions);cpp-qt;CAD DCL;caddcl;CadLisp;cadlisp;CFDG;cfdg;ColdFusion;cfm; CSS;css;D;d;Delphi;delphi;Diff-Output;diff;DIV; div;DOS;dos;dot;dot;Eiffel;eiffel;Fortran;fortran;FOURJ\'s Genero 4GL;genero;FreeBasic;freebasic;GML;gml;Groovy;groovy;Haskell;haskell;HTML;html4strict;INI;ini;IO;io;Inno Script;inno;Java 5;java5;Java;java;Javascript;javascript;LaTeX;latex;Lisp;lisp;Lua;lua;Matlab;matlab;Microchip Assembler;mpasm;Microsoft Registry;reg;mIRC;mirc;Motorola 68000 Assembler;m68k;MySQL;mysql;NSIS;nsis;Objective C;objc;OpenOffice BASIC;oobas;Objective Caml;ocaml;Objective Caml (brief);ocaml-brief;Oracle 8;oracle8;Pascal;pascal;Per (forms);per;Perl;perl;PHP;php;PHP (brief);php-brief;PL/SQL;plsql;Python;phyton;Q(uick)BASIC;qbasic;robots.txt;robots;Ruby;ruby;Ruby on Rails;rails;SAS;sas;Scheme;scheme;sdlBasic;sdlbasic;SmallTalk;smalltalk;Smarty;smarty;SQL;sql;TCL/iTCL;tcl;T-SQL;tsql;Text;text;thinBasic;thinbasic;Unoidl;idl;VB.NET;vbnet;VHDL;vhdl;Visual BASIC;vb;Visual Fox Pro;visualfoxpro;WinBatch;winbatch;XML;xml;ZiLOG Z80;z80;###\"}}\n\n===13. Mindmaps===\n\nWikka has native support for [[Docs:FreeMind mindmaps]]. There are two options for embedding a mindmap in a wiki page.\n\n**Option 1:** Upload a \"\"FreeMind\"\" file to a webserver, and then place a link to it on a wikka page:\n  ##\"\"http://yourdomain.com/freemind/freemind.mm\"\"##\nNo special formatting is necessary.\n\n**Option 2:** Paste the \"\"FreeMind\"\" data directly into a wikka page:\n~- Open a \"\"FreeMind\"\" file with a text editor.\n~- Select all, and copy the data.\n~- Browse to your Wikka site and paste the Freemind data into a page. \n\n===14. Embedded HTML===\n\nYou can easily paste HTML in a wiki page by wrapping it into two sets of doublequotes. \n\n~##&quot;&quot;[html code]&quot;&quot;##\n\n**Examples:**\n\n~##&quot;&quot;y = x<sup>n+1</sup>&quot;&quot;##\n~\"\"y = x<sup>n+1</sup>\"\"\n\n~##&quot;&quot;<acronym title=\"Cascade Style Sheet\">CSS</acronym>&quot;&quot;##\n~\"\"<acronym title=\"Cascade Style Sheet\">CSS</acronym>\"\"\n\nBy default, some HTML tags are removed by the \"\"SafeHTML\"\" parser to protect against potentially dangerous code.  The list of tags that are stripped can be found on the [[Docs:SafeHTML SafeHTML]] documentation page.\n\nIt is possible to allow //all// HTML tags to be used, see Docs:UsingHTML for more information.\n\n----\nCategoryWiki', owner = '(Public)', user = 'WikkaInstaller', note='".$upgrade_note."', time = now(), latest = 'Y'", $dblink), "Already done? OK!", 0);
+        test("Adding TableMarkup page...",
+        mysql_query("insert into ".$config['table_prefix']."pages set tag = 'TableMarkup', body = '======Wikka Table Markup Guide======\n>>==See also:==\n~-For earlier Wikka versions, check the [[Docs:TableActionInfo table]] action\n~-Updated versions of this page can be found on the [[Docs:TableMarkup Wikka documentation server]] \n~-For a more formal description, check this server\'s TableMarkupReference page.\n>>\nAs of ##1.2##, Wikka introduces a flexible markup for data tables. Any kind of tables allowed by XHTML can be created using this markup, from the most basic examples (e.g. simple rows of cells) to complex tables with full support for accessibility options.::c::\n\n====1. Table basics: cells, rows, columns====\n\nThe most basic element of a table is a **cell**. Single cells can be created using the standard delimiter ##\"\"||\"\"##, e.g.:\n\n##\"\"||Hello||\"\"##\n\n||Hello||\n\nNote that a cell must always be open and closed by delimiters. \n\n**Rows** can be created by adding on the same line multiple cells:\n\n##\"\"||Cell 1||Cell 2||Cell 3||\"\"##\n\n||Cell 1||Cell 2||Cell 3||\n\n**Columns** can be created by adding rows on separate lines:\n\n##\"\"||Cell 1||\"\"##\n##\"\"||Cell 2||\"\"##\n##\"\"||Cell 3||\"\"##\n\n||Cell 1||\n||Cell 2||\n||Cell 3||\n\nBy now you should be able to create simple tables with **multiple rows and columns**.\n\n##\"\"||Cell 1||Cell 2||Cell 3||\"\"##\n##\"\"||Cell 4||Cell 5||Cell 6||\"\"##\n##\"\"||Cell 7||Cell 8||Cell 9||\"\"##\n\n||Cell 1||Cell 2||Cell 3||\n||Cell 4||Cell 5||Cell 6||\n||Cell 7||Cell 8||Cell 9||\n\n====2. Headings====\n\nAs soon as you create slightly more complex data tables, you will need to specify column and row **headings**. Headings are special cells that specify what kind of data rows and columns contain. The most basic way of creating a heading is by using ##\"\"|=|\"\"## as a delimiter.\n\nThe following is an example of a simple table with **column headings**:\n\n##\"\"|=|Apples|=|Pears|=|\"\"##\n##\"\"||300Kg||480Kg||\"\"##\n\n|=|Apples|=|Pears|=|\n||300Kg||480Kg||\n\n**Row headings** are created in the same way. Since they are usually followed by normal cells, they must be terminated with the ##\"\"||\"\"## standard delimiter if the next element in the row is a simple cell:\n\n##\"\"|=|Apples||300Kg||\"\"##\n##\"\"|=|Pears||480Kg||\"\"##\n\n|=|Apples||300Kg||\n|=|Pears||480Kg||\n\nYou should be able by now to create simple tables with row and column headings:\n\n##\"\"|=|       |=|Apples|=|Pears|=|\"\"##\n##\"\"|=|Mary||300Kg||320Kg||\"\"##\n##\"\"|=|John||400Kg||630Kg||\"\"##\n\n|=| |=|Apples|=|Pears|=|\n|=|Mary||300Kg||320Kg||\n|=|John||400Kg||630Kg||\n\nWe will describe later how to add accessibility parameters for row and column headings.\n\n====3. Captions====\n\nUsually tables are introduced with a caption that describes what the table contains. A caption element is introduced with a ##\"\"|?|\"\"## delimiter and terminated with a standard delimiter ##\"\"||\"\"##.\n\n##\"\"|?|Fruit production in 2006||\"\"##\n##\"\"|=|       |=|Apples|=|Pears|=|\"\"##\n##\"\"|=|Mary||300Kg||320Kg||\"\"##\n##\"\"|=|John||400Kg||630Kg||\"\"##\n\n|?|Fruit production in 2006||\n|=| |=|Apples|=|Pears|=|\n|=|Mary||300Kg||320Kg||\n|=|John||400Kg||630Kg||\n\n====4. Spans====\n\n**Spans** are used to combine multiple cells or multiple headings vertically or horizontally and are created using the following [[TableMarkupReference attribute parameters]]:\n\n##\"\"||\"\"(\'\'span options\'\')Element content\"\"||\"\"##\n\nA **cell spanning multiple columns** is generated by prefixing the cell content with a ##(x:\'\'n\'\')## parameter, where ##\'\'n\'\'## is the number of columns to be spanned. The following example shows how to create a cell spanning two columns:\n\n##\"\"||(x:2)Cell spanning 2 columns||Cell 3||\"\"##\n##\"\"||Cell 4||Cell 5||Cell 6||\"\"##\n##\"\"||Cell 7||Cell 8||Cell 9||\"\"##\n\n||(x:2)Cell spanning 2 columns||Cell 3||\n||Cell 4||Cell 5||Cell 6||\n||Cell 7||Cell 8||Cell 9||\n\nSpans can also be applied to rows. A **cell spanning multiple rows** is generated by prefixing the cell content with a ##(y:\'\'n\'\')## parameter, where  ##\'\'n\'\'##  is the number of rows to be spanned. The following example shows how to create a cell spanning two rows:\n\n##\"\"||(y:2)Cell spanning 2 rows||Cell 2||Cell 3||\"\"##\n##\"\"||Cell 5||Cell 6||\"\"##\n##\"\"||Cell 7||Cell 8||Cell 9||\"\"##\n\n||(y:2)Cell spanning 2 rows||Cell 2||Cell 3||\n||Cell 5||Cell 6||\n||Cell 7||Cell 8||Cell 9||\n\nSpans are particularly useful to create **subheadings**:\n\n##\"\"|?|Fruit production in the last two years||\"\"##\n##\"\"|=|       |=|(x:2)Apples|=|(x:2)Pears|=|\"\"##\n##\"\"|=|       |=|2005|=|2006|=|2005|=|2006|=|\"\"##\n##\"\"|=|Mary||300Kg||320Kg||400kg||280Kg||\"\"##\n##\"\"|=|John||400Kg||630Kg||210Kg||300Kg||\"\"##\n\n|?|Fruit production in the last two years||\n|=|       |=|(x:2)Apples|=|(x:2)Pears|=|\n|=|       |=|2005|=|2006|=|2005|=|2006|=|\n|=|Mary||300Kg||320Kg||400kg||280Kg||\n|=|John||400Kg||630Kg||210Kg||300Kg||\n\nColumn and row spans can be combined to created funky table layouts:\n\n##\"\"||(x:2;y:2)2x2||(x:2)2x1||(y:2)1x2||\"\"##\n##\"\"||(y:2)1x2||1x1||\"\"##\n##\"\"||1x1||1x1||(x:2)2x1||\"\"##\n\n||(x:2;y:2)2x2||(x:2)2x1||(y:2)1x2||\n||(y:2)1x2||1x1||\n||1x1||1x1||(x:2)2x1||\n\n\n====5. Formatting text within tables====\n\nYou can use any kind of basic [[TextFormatting Wikka markup]] to render text within tables.\nThe following example adds basic formatting to cell content:\n\n##\"\"|?|Using text formatting within tables||\"\"##\n##\"\"||##Monospaced##||//Italics//||**Bold**||__Underlined__||\"\"##\n##\"\"||\'\'Highlighted\'\'||++Strikethrough++||(x:2)**//Bold italics//**||\"\"##\n\n|?|Using text formatting within tables||\n||##Monospaced##||//Italics//||**Bold**||__Underlined__||\n||\'\'Highlighted\'\'||++Strikethrough++||(x:2)**//Bold italics//**||\n\n====6. Adding actions and images within tables====\n\nSimple, content-generating [[Docs:UsingActions actions]] (including [[Docs:AddingImages images]]) can be added within table cells and headings.\n\n##\"\"|?|Using actions within tables||\"\"##\n##\"\"||This wiki contains {{countpages}} pages||\"\"##\n##\"\"||{{image url=\"images/wikka_logo.jpg\" class=\"center\" alt=\"a w\" title=\"w image\"}}||\"\"##\n##\"\"||{{color c=\"red\" text=\"some colored text\"}}||\"\"##\n\n|?|Using actions within tables||\n||This wiki contains {{countpages}} pages||\n||{{image url=\"images/wikka_logo.jpg\" class=\"center\" alt=\"a w\" title=\"w image\"}}||\n||{{color c=\"red\" text=\"some colored text\"}}||\n\n====7. Adding links within tables====\n\nAll the available options to create [[Docs:AddingLinks links]] can be used within table cells or headings:\n\n##\"\"|?|Adding links within tables||\"\"##\n##\"\"||Camelcase links: SandBox||\"\"##\n##\"\"||Escaped camelcase links: &quot;&quot;SandBox&quot;&quot; escaped||\"\"##\n##\"\"||Forced links: [[HomePage main]]||\"\"##\n##\"\"||Interwiki links: Wikipedia:Wikka||\"\"##\n##\"\"||Forced interwiki links: [[Wikipedia:Wikka Wikka article on Wikipedia]]||\"\"##\n##\"\"||External links: http://www.example.com ||\"\"##\n##\"\"||Forced external links: [[http://www.example.com Example.com]]||\"\"##\n##\"\"||Image links: {{image url=\"images/wizard.gif\" alt=\"wizard\" title=\"Display an index of pages on this wiki\" link=\"PageIndex\"}}||\"\"##\n\n|?|Adding links within tables||\n||Camelcase links: SandBox||\n||Escaped camelcase links: \"\"SandBox escaped\"\"||\n||Forced links: [[HomePage main]]||\n||Interwiki links: Wikipedia:Wikka||\n||Forced interwiki links: [[Wikipedia:Wikka Wikka article on Wikipedia]]||\n||External links: http://www.example.com ||\n||Forced external links: [[http://www.example.com Example.com]]||\n||Image links: {{image url=\"images/wizard.gif\" alt=\"wizard\" title=\"Display an index of pages on this wiki\" link=\"PageIndex\"}}||\n\n====8. Adding HTML within tables====\n\nYou can also use [[Docs:UsingHTML embedded HTML]] in table elements:\n\n##\"\"|?|Embedding HTML within tables||\"\"##\n##\"\"||Here\'s some superscript: &quot;&quot;a&lt;sup&gt;2+1&lt;/sup&gt;&quot;&quot;||\"\"##\n##\"\"||And here\'s some subscript too: &quot;&quot;a&lt;sub&gt;2k&lt;/sub&gt;&quot;&quot;||\"\"##\n##\"\"||I love acronyms: &quot;&quot;&lt;acronym title=\"What You See Is What You Get\"&gt;WYSIWYG&lt;/acronym&gt;&quot;&quot;||\"\"##\n\n|?|Embedding HTML within tables||\n||Here\'s some superscript: \"\"a<sup>2+1</sup>\"\"||\n||And here\'s some subscript too: \"\"a<sub>2k</sub>\"\"||\n||I love acronyms: \"\"<acronym title=\"What You See Is What You Get\">WYSIWYG</acronym>\"\"||\n\n====9. Adding a touch of style====\n\nThe table markup introduces a new [[TableMarkupReference style selector]]. CSS style options can be added to any element by enclosing them within **single braces**, right before the element content, e.g.:\n##\"\"||\"\"{\'\'style options\'\'}Element content\"\"||\"\"##\n\nFor example, to render a cell with **red background** and **white text color**, you can do the following:\n\n##\"\"||{background-color:red; color:white}Hello||\"\"##\n\n||{background-color:red; color:white}Hello||\n\nYou can play with **font size** and **text alignment**:\n\n##\"\"|?|Adding some more style||\"\"##\n##\"\"||{font-size:190%; text-align:right}Please scale me!||\"\"##\n##\"\"||{font-size:170%; text-align:right}Please scale me!||\"\"##\n##\"\"||{font-size:150%; text-align:right}Please scale me!||\"\"##\n##\"\"||{font-size:130%; text-align:right}Please scale me!||\"\"##\n##\"\"||{font-size:110%; text-align:right}Please scale me!||\"\"##\n##\"\"||{font-size:90%; text-align:right}Please scale me!||\"\"##\n##\"\"||{font-size:70%; text-align:right}Please scale me!||\"\"##\n\n|?|Adding some more style||\n||{font-size:190%; text-align:right}Please scale me!||\n||{font-size:170%; text-align:right}Please scale me!||\n||{font-size:150%; text-align:right}Please scale me!||\n||{font-size:130%; text-align:right}Please scale me!||\n||{font-size:110%; text-align:right}Please scale me!||\n||{font-size:90%; text-align:right}Please scale me!||\n||{font-size:70%; text-align:right}Please scale me!||\n\nYou can also apply style to **headings** and **captions**:\n\n##\"\"|?|{border:1px dotted red; color:red}Style can be applied anywhere||\"\"##\n##\"\"|=|{color:#000; font-size:150%; font-style:italic; font-family:Georgia, Hoefler Text, Georgia, serif; font-weight:normal; line-height:150%}Emphemeral Quibus|=|\"\"##\n##\"\"||Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Duis auctor auctor pede.||\"\"##\n\n|?|{border:1px dotted red; color:red}Style can be applied anywhere||\n|=|{color:#000; font-size:150%; font-style:italic; font-family:Georgia, Hoefler Text, Georgia, serif; font-weight:normal; line-height:150%}Emphemeral Quibus|=|\n||Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Duis auctor auctor pede.||\n\nPlease note that **style parameters should always follow attribute parameters**, when both are specified for an element (see the [[TableMarkupReference table markup reference]]):\n\n##\"\"|?|Give priority||\"\"##\n##\"\"||(x:2;y:2){background-color:pink}2x2||(x:2){background-color:lightblue}2x1||(y:2){background-color:lightyellow}1x2||\"\"##\n##\"\"||(y:2){background-color:lightyellow}1x2||{background-color:#333;color:white}1x1||\"\"##\n##\"\"||{background-color:lightblue}1x1||{background-color:#333;color:white}1x1||(x:2){background-color:pink}2x1||\"\"##\n\n|?|Give priority||\n||(x:2;y:2){background-color:pink}2x2||(x:2){background-color:lightblue}2x1||(y:2){background-color:lightyellow}1x2||\n||(y:2){background-color:lightyellow}1x2||{background-color:#333;color:white}1x1||\n||{background-color:lightblue}1x1||{background-color:#333;color:white}1x1||(x:2){background-color:pink}2x1||\n\n====10. Adding style through classes====\n\nYou can apply existing classes from your stylesheet to any element using the class parameter ##(c:\'\'class\'\')##. Note that custom style declarations specified through braced markup override class attributes.\n\nThe following example applies to table cells two class selectors defined in the stylesheet. The third row shows how to override a class selector with custom style attributes:\n\n##\"\"|?|Using class selectors to add style to table elements||\"\"##\n##\"\"||(c:highlight)This cell uses the ##.highlight## class||\"\"##\n##\"\"||(c:smaller)This cell uses the ##.smaller## class||\"\"##\n##\"\"||(c:smaller){font-size:150%}This cell uses the ##.smaller## class overridden by custom style settings||\"\"##\n\n|?|Using class selectors to add style to table elements||\n||(c:highlight)This cell uses the ##.highlight## class||\n||(c:smaller)This cell uses the ##.smaller## class||\n||(c:smaller){font-size:150%}This cell uses a ##.smaller## class overridden by custom style settings||\n\n====11. Global table attributes====\n\nTable-level attributes can be specified by adding at the beginning of the table the following element: ##\"\"|!|   ||\"\"##, which is used as a container for global table attributes. For example, you can specify **global style options** for a table by adding them to this element:\n\n##\"\"|!|{border:3px solid blue; background-color: black; color: white; width: 300px; text-align: center}||\"\"##\n##\"\"||Cell 1||\"\"##\n##\"\"||Cell 2||\"\"##\n##\"\"||Cell 3||\"\"##\n\n|!|{border:3px solid blue; background-color: black; color: white; width: 300px; text-align: center}||\n||Cell 1||\n||Cell 2||\n||Cell 3||\n\n====12. Referring to elements: the ##id## attribute====\n\n##id## attributes are used to refer to unique elements in a page and to provide an anchor for styling and linking. You can specify an ##id## for any table element by using the ##(i:\'\'id\'\')## parameter.\n\nFor example, the following markup creates a table with the ##id## \"main_table\" containing two cells with ##id##\'s \"cell_1\" and \"cell_2\"\n\n##\"\"|!|(i:main_table)||\"\"##\n##\"\"|?|Using id to refer to table elements||\"\"##\n##\"\"||(i:cell_1)This cell can be referred to by using the ##cell_1## id||\"\"##\n##\"\"||(i:cell_2)This cell can be referred to by using the ##cell_2## id||\"\"##\n\n|!|(i:main_table)||\n|?|Using id to refer to table elements||\n||(i:cell_1)This cell can be referred to by using the ##cell_1## id||\n||(i:cell_2)This cell can be referred to by using the ##cell_2## id||\n\n====13. Accessibility options: adding titles====\n\nAny table element can be given a ##title## attribute to enhance its accessibility. Titles are typically displayed in graphical browsers by hovering over the corresponding element and are useful to display unobtrusive descriptions about specific elements. You can specify a ##title## for any table element by using the ##(t:\'\'title\'\')## parameter.\n\nThe following example adds titles to several table elements (you can hover over the table to display them):\n\n##\"\"|!|(t:Comparative figures for fruit production in the last year){width: 350px}||\"\"##\n##\"\"|?|Fruit production in 2006||\"\"##\n##\"\"|=|       |=|(t:yearly production of apples)Apples|=|(t:yearly production of pears)Pears|=|\"\"##\n##\"\"|=|(t:Mary\'s contribution to 2006 production)Mary||(t:Mary\'s production of apples in 2006){text-align:center}300Kg||(t:Mary\'s production of pears in 2006){text-align:center}320Kg||\"\"##\n##\"\"|=|(t:John\'s contribution to 2006 production)John||(t:John\'s production of apples in 2006){text-align:center}400Kg||(t:John\'s production of pears in 2006){text-align:center}630Kg||\"\"##\n\n|!|(t:Comparative figures for fruit production in the last year){width: 350px}||\n|?|Fruit production in 2006||\n|=|       |=|(t:yearly production of apples)Apples|=|(t:yearly production of pears)Pears|=|\n|=|(t:Mary\'s contribution to 2006 production)Mary||(t:Mary\'s production of apples in 2006){text-align:center}300Kg||(t:Mary\'s production of pears in 2006){text-align:center}320Kg||\n|=|(t:John\'s contribution to 2006 production)John||(t:John\'s production of apples in 2006){text-align:center}400Kg||(t:John\'s production of pears in 2006){text-align:center}630Kg||\n\n====14. Accessibility options: adding a summary====\n\nTables can take an optional ##summary## attribute to describe the purpose and/or structure of the table. The description provided by the summary attribute is particularly helpful to users of non-visual browsers. You can specify a summary by adding a ##(u:\'\'Summary\'\')## parameter in the table global attributes.\n\nFor example, the following line:\n##\"\"|!|(u:This is a summary)||\"\"##\nwill add to the table a ##summary## attribute with the value ##This is a summary##.\n\n====15. Accessibility options: table head, table body and table foot====\n\nRows in a table can be grouped in a table head, table body and table foot. This division enables browsers to support scrolling of table bodies independently of the table head and foot. When long tables are printed, the table head and foot information may be repeated on each page that contains table data. The table head and table foot should contain information about the table\'s columns. The table body should contain rows of table data.\n\nWikka allows you to create groups of rows with special markers:\n~- The ##\"\"|[|\"\"## marker groups the rows it precedes as a **table head** block;\n~- The ##\"\"|]|\"\"## marker groups the rows it precedes as a **table foot** block;\n~- The ##\"\"|#|\"\"## marker groups the rows it precedes as a **table body**;\n\nThe following example shows how to use these elements to create row groups. Note that Wikka uses different backgrounds to differentiate column headings in the table head and foot from row headings in the table body:\n\n##\"\"|!|(u:A table with summary, caption, head, foot and body){width: 400px}||\"\"##\n##\"\"|?|Here\'s how you can group rows||\"\"##\n##\"\"|[|\"\"##\n##\"\"|=|Name|=|Place|=|Telephone||\"\"##\n##\"\"|]|\"\"##\n##\"\"|=|Name|=|Place|=|Telephone||\"\"##\n##\"\"|#|\"\"##\n##\"\"|=|John Smith||New York||555-1234||\"\"##\n##\"\"|=|Jane Smith||Los Angeles||555-2345||\"\"##\n##\"\"|=|John Doe||Unknown||Unknown||\"\"##\n##\"\"|=|Jane Doe||Unknown||Unknown||\"\"##\n\n|!|(u:A table with summary, caption, head, foot and body){width: 400px}||\n|?|Here\'s how you can group rows||\n|[|\n|=|Name|=|Place|=|Telephone||\n|]|\n|=|Name|=|Place|=|Telephone||\n|#|\n|=|John Smith||New York||555-1234||\n|=|Jane Smith||Los Angeles||555-2345||\n|=|John Doe||Unknown||Unknown||\n|=|Jane Doe||Unknown||Unknown||\n\n====16. Accessibility options: heading scope====\n\nTo be semantically correct and accessible to users with non-visual browsers, headings should contain scope attributes describing the cell range they refer to. \n~-Column heading scopes can be specified using the ##(o:col)## parameter in the corresponding column heading;\n~-Row heading scopes can be specified using the ##(o:row)## parameter in the corresponding row heading;\n\nThe following example shows how to correctly add column and row scopes to a table to make it accessible:\n\n##\"\"|!|(u:The number of employees and the foundation year of some imaginary companies.)||\"\"##\n##\"\"|?|Table 1: Company data||\"\"##\n##\"\"|[|\"\"##\n##\"\"|||=|(o:col)Employees|=|(o:col)Founded||\"\"##\n##\"\"|#|\"\"##\n##\"\"|=|(o:row)ACME Inc||1000||1947||\"\"##\n##\"\"|=|(o:row)XYZ Corp||2000||1973||\"\"##\n\n|!|(u:The number of employees and the foundation year of some imaginary companies.)||\n|?|Table 1: Company data||\n|[|\n|||=|(o:col)Employees|=|(o:col)Founded||\n|#|\n|=|(o:row)ACME Inc||1000||1947||\n|=|(o:row)XYZ Corp||2000||1973||\n\n\n----\nCategoryWiki', owner = '(Public)', note='".$upgrade_note."', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink), 'Already done?  OK!', 0);
+        test("Adding TableMarkupReference page...",
+        mysql_query("insert into ".$config['table_prefix']."pages set tag = 'TableMarkupReference', body = '=====Wikka Table Markup Reference=====\n>>==See also:==\n~-For an informal introduction to this markup and several examples consult this server\'s TableMarkup page.\n~-Updated versions of this page can be found on the [[Docs:TableMarkupReference Wikka documentation server]].\n>>\n==== 1. Table Markup Scheme ====\n\nThe generic markup for table elements follows this scheme:\n\n~**##{{color fg=\"#F00\" text=\"|*|\"}}{{color fg=\"blue\" text=\"(attribute parameters)\"}}{{color fg=\"green\" text=\"{style parameters}\"}}content{{color fg=\"#F00\" text=\"||\"}}##**\n\n==Example:==\n\n~##\"\"|=|(i:main_heading){text-size: 120%}This is the main heading||\"\"##\n\n===Understanding the Table Markup Scheme===\n\n~1)**Opening delimiter** --- **##{{color fg=\"#F00\" text=\"|*|\"}}##** is any of the delimiters described in the //elements table// below.\n~1)**Attributes** --- **##{{color fg=\"blue\" text=\"(attribute parameters)\"}}##** is an optional series of ##parameter:value## declarations enclosed in brackets. Valid parameters are described in the //attribute table// below. Multiple parameter declarations can be separated with a semicolon (**##;##**).\n~1)**Style** --- **##{{color fg=\"green\" text=\"{style parameters}\"}}##** is an optional series of CSS style declarations enclosed in braces. Multiple style declarations can be separated with a semicolon (**##;##**).\n~1)**Content** --- **##content##** can be any valid content for that element (including [[TextFormatting formatted text]]).\n~1)**Closing delimiter** --- **##{{color fg=\"#F00\" text=\"||\"}}##** is the standard delimiter.\n\n==Note:==\nSome elements are //self closing// and do not accept any attributes, style parameters or content. See the notes in the //elements table// below.\n\n==== 2. Elements ====\n\n|!|{width: 80%}||\n|?|Table Elements||\n|=|\"\"XHTML Elements\"\"|=|Delimiter|=|Notes||\n||##<table>##||##\"\"|!|\"\"##||Optional, only useful for adding attributes. **Must** be first in table markup if used. Should be on a line by itself.||\n||##<caption>##||##\"\"|?|\"\"##||||\n||##<colgroup>##||##\"\"|_|\"\"##||||\n||##<col />##||##\"\"|-|\"\"##||Selfclosing - must not be closed!||\n||##<thead>##||##\"\"|[|\"\"##||||\n||##<tfoot>##||##\"\"|]|\"\"##||||\n||##<tbody>##||##\"\"|#|\"\"##||||\n||##<tr>##||none||Will be opened for each row of table cells.||\n||##<th>##||##\"\"|=|\"\"##||||\n||##<td>##||##\"\"||\"\"##||||\n\n==== 3. Attributes ====\n\n|?|Table Attributes||\n|[|\n|=|Attribute|=|Markup key||\n|]|\n|=|Attribute|=|Markup key||\n|#|\n|=|(x:2)Core||\n||##id##||##i##||\n||##title##||##t##||\n||##class##||##c##||\n||##style##||##s##||\n|=|(x:2)i18n||\n||##xml:lang##||##l##||\n||##dir##||##d##||\n|=|(x:2)Table cells||\n||##colspan##||##x##||\n||##rowspan##||##y##||\n||##scope##||##o##||\n||##headers##||##h##||\n||##abbr##||##a##||\n||##axis##||##z##||\n|=|(x:2)Other Table elements||\n||##span##||##p##||\n||##summary##||##u##||\n\n\n----\nCategoryWiki', owner = '(Public)', note='".$upgrade_note."', user = 'WikkaInstaller', time = now(), latest = 'Y'", $dblink), 'Already done?  OK!', 0);
         test("Adding theme field to user preference table...",
         @mysql_query("ALTER TABLE ".$config['table_prefix']."users ADD theme varchar(50) default ''", $dblink), "Failed.", 1);
 case "1.3":
         // Dropping obsolete "handler" field from pages table, refs #452
-        test(__('Removing handler field from the pages table').'...',
+        test('Removing handler field from the pages table...',
         @mysql_query("ALTER TABLE ".$config["table_prefix"]."pages DROP handler", $dblink), __('Already done? Hmm!'), 1);
         // Support for threaded comments
@@ -412 +465 @@
         // Create new fields for comment_read_acl and comment_post_acl, 
         // and copy existing comment_acl values to these new fields 
-        test(__('Creating new comment_read_acl field').'...', 
+        test('Creating new comment_read_acl field...', 
         @mysql_query("alter table ".$config['table_prefix']."acls add comment_read_acl text not null", $dblink), __('Already done?  OK!'), 0); 
-        test(__('Creating new comment_post_acl field').'...', 
+        test('Creating new comment_post_acl field...', 
         @mysql_query("alter table ".$config['table_prefix']."acls add comment_post_acl text not null", $dblink), __('Already done?  OK!'), 0); 
-        test(__('Copying existing comment_acls to new fields').'...', 
+        test('Copying existing comment_acls to new fields...', 
         @mysql_query("update ".$config['table_prefix']."acls as a inner join(select page_tag, comment_acl from ".$config['table_prefix']."acls) as b on a.page_tag = b.page_tag set a.comment_read_acl=b.comment_acl, a.comment_post_acl=b.comment_acl", $dblink), __('Failed').'. ?', 1);
-        test("Setting default ACL for UserSettings...",
+        test("Setting default UserSettings ACL...",
         @mysql_query("insert into ".$config['table_prefix']."acls set page_tag = 'UserSettings', comment_read_acl = '*', comment_post_acl = '+'", $dblink), __('Already done? OK!'), 0);
-        test("Setting default ACL for AdminUsers...",
+        test("Setting default AdminUsers ACL...",
         @mysql_query("insert into ".$config['table_prefix']."acls set page_tag = 'AdminUsers', comment_read_acl = '!*', comment_post_acl = '!*'", $dblink), __('Already done? OK!'), 0);
-        test("Setting default ACL for AdminPages...",
+        test("Setting default AdminPages ACL...",
         @mysql_query("insert into ".$config['table_prefix']."acls set page_tag = 'AdminPages', comment_read_acl = '!*', comment_post_acl = '!*'", $dblink), __('Already done? OK!'), 0);
-        test("Setting default ACL for DatabaseInfo...",
+        test("Setting default DatabaseInfo ACL...",
         @mysql_query("insert into ".$config['table_prefix']."acls set page_tag = 'DatabaseInfo', comment_read_acl = '!*', comment_post_acl = '!*'", $dblink), __('Already done? OK!'), 0);
-case "trunk": // Latest development version from SVN repo - do not remove
-        break;  
-}
-
-// (directly) use configured location SITE_CONFIGFILE
-if (!file_exists(SITE_CONFIGFILE) || !is_writeable(SITE_CONFIGFILE))
-{
+}
+
+// #600: Force reloading of stylesheet.
+// #6: Append this to individual theme stylesheets
+$config['stylesheet_hash'] = substr(md5(time()),1,5);
 ?>
-<p><?php
-        printf(__('In the next step, the installer will try to write the updated configuration file, %s').'. ', '<tt>'.SITE_CONFIGFILE.'</tt>');
-echo __('Please make sure the web server has write access to the file, or you will have to edit it manually').'.';
-printf(__('Once again, see %s for details'), '<a href="http://docs.wikkawiki.org/WikkaInstallation" target="_blank">Wikka:WikkaInstallation</a>');
-?>.
+
+<p>
+In the next step, the installer will try to write the updated configuration file, <tt><?php echo $wakkaConfigLocation ?></tt>.
+Please make sure the web server has write access to the file, or you will have to edit it manually.
+Once again, see <a href="http://docs.wikkawiki.org/WikkaInstallation" target="_blank">WikkaInstallation</a> for details.
 </p>
-<?php
-}
-?>
-
-<form action="<?php echo $action_target; ?>" method="post">
-<input type="hidden" name="installAction" value="writeconfig" />
-<input type="submit" value="<?php echo _p('Continue');?>" />
+
+<form action="<?php echo myLocation(); ?>?installAction=writeconfig" method="post">
+<input type="hidden" name="config" value="<?php echo Wakka::hsc_secure(serialize($config)) ?>" /><?php /* #427 */ ?>
+<input type="submit" value="Continue" />
 </form>
-<?php /* echo '<pre>'; print_r($_SESSION); echo '</pre>'; */ ?>

branches/1.3/setup/writeconfig.php

@@ -1 +1 @@
 <?php
-/**
- * Store the configuration in a file called wikka.config.php
- * 
- * @package     Setup
- * @version     $Id: writeconfig.php 1340 2009-03-03 01:42:06Z BrianKoontz $
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
- * @filesource
- */
+// fetch config
+$config = $config2 = unserialize($_POST["config"]);
 
-// remove config values for whatever reason
-unset($config['allow_doublequote_html']);
+// merge existing configuration with new one
+$config = array_merge($wakkaConfig, $config);
+
+// remove obsolete config settings if present
+unset($config["allow_doublequote_html"]);
+unset($config["header_action"]);
+unset($config["footer_action"]);
+unset($config["external_link_tail"]);
+
+// Parse navlinks, convert to menu configuration files, #891 (since 1.2)
+// Check to see if config is writeable...
+if(!is_writeable('config'))
+{
+        print("<p><span class=\"failed\">WARNING:</span> The <tt>config</tt> directory is not writeable; therefore, conversion of old navigation links to new menu items cannot be performed.  Please give your web server temporary write access to the <tt>config</tt> directory (<tt>chmod 777 config</tt>; don't forget to remove write access later, i.e. <tt>chmod 555 config</tt>). If you are unable to make this directory writeable, you will need to manually edit the menu files in the <tt>config</tt> directory.  You will also need to remove the <tt>navigation_links</tt> and <tt>logged_in_navigation_links</tt> parameters in your <tt>wikka.config.php</tt> file. If you are still having difficulties, please visit <a href=\"http://docs.wikkawiki.org/WikkaInstallation\">WikkaInstallation</a>.</p>\n"); 
+        ?>
+        <form action="<?php echo myLocation() ?>?installAction=writeconfig" method="post">
+        <input type="hidden" name="config" value="<?php echo Wakka::hsc_secure(serialize($config2)) ?>" /><?php /*  #427 */ ?>
+        <input type="submit" value="Try again" />
+        </form> 
+        <?php
+        return; 
+}
+$path = 'config'.DIRECTORY_SEPARATOR;
+if(isset($config['navigation_links']))
+{
+        $navlinks = $config['navigation_links'];
+        $links = array();
+        if(FALSE!==preg_match_all('/[A-ZÄÖÜ]+[a-zßäöü]+[A-Z0-9ÄÖÜ][A-Za-z0-9ÄÖÜßäöü]*|\[\[.*?\]\]/', $navlinks, $links))
+        {
+                if(file_exists($path.'main_menu.inc'))
+                {
+                        rename($path.'main_menu.inc', $path.'main_menu.orig.inc');
+                }
+                $h = fopen($path.'main_menu.inc', 'w'); 
+                foreach($links[0] as $link)
+                {
+                        fwrite($h, $link."\n");
+                }
+                fwrite($h, "{{searchform}}\n");
+                fwrite($h, 'Your hostname is {{whoami}}');
+                fclose($h);
+        }
+        unset($config['navigation_links']);
+}
+if(isset($config['logged_in_navigation_links']))
+{
+    $navlinks = $config['logged_in_navigation_links'];
+        $links = array();
+        if(FALSE!==preg_match_all('/[A-ZÄÖÜ]+[a-zßäöü]+[A-Z0-9ÄÖÜ][A-Za-z0-9ÄÖÜßäöü]*|\[\[.*?\]\]/', $navlinks, $links))
+        {
+                if(file_exists($path.'main_menu.user.inc'))
+                {
+                        rename($path.'main_menu.user.inc', $path.'main_menu.user.orig.inc');
+                }
+                $h = fopen($path.'main_menu.user.inc', 'w'); 
+                foreach($links[0] as $link)
+                {
+                        fwrite($h, $link."\n");
+                }
+                fwrite($h, "{{searchform}}\n");
+                fwrite($h, 'You are {{whoami}}');
+                fclose($h);
+        }
+    unset($config['logged_in_navigation_links']); // since 1.2
+}
 
 // set version to current version, yay!
-$config['wakka_version'] = WAKKA_VERSION;
-// initialize! Suppose rewrite_mode unavailable.
-if (!isset($config['rewrite_mode']))
-{
-        $config['rewrite_mode'] = 0;
-        if (($_SESSION['server_info']['mod_rewrite']) && (file_exists($htaccessLocation)) && (is_writeable($htaccessLocation)))
-        {
-                $config['rewrite_mode'] = 1;
-        }
-}
+$config["wakka_version"] = WAKKA_VERSION;
 
-if ($wakkaConfig['wakka_version'])
-{
-        echo '<h1>'.__('Wikka Upgrade').' (5/5)</h1>'."\n";
-}
-else
-{
-        echo '<h1>'.__('Wikka Installation').' (5/5)</h1>'."\n";
-}
-
-// Writing .htaccess
-// Flag registering status of attempt to update .htaccess
-$htaccess_updated = 0;
-if ($config['rewrite_mode'] == 1)
-{
-        $htaccess_content = file($htaccessLocation);
-        $new_htaccess_content = '';
-        $on_rewrite_section = 0;
-        foreach ($htaccess_content as $line)
-        {
-                if ((preg_match("/^(\\s*Rewrite(Engine|Base)|#---WIKKA-REWRITING-BEGIN)/i", $line)) && ($on_rewrite_section == 1))
-                {
-                        $line = '';
-                }
-                if (preg_match("/^(\\s*)<IfModule\\s+mod_rewrite.c>/i", $line , $m))
-                {
-                        $line .= '#---WIKKA-REWRITING-BEGIN'."\r\n";
-                        $line .= $m[1].' RewriteEngine On'."\r\n";
-                        $line .= $m[1].' RewriteBase '.WIKKA_BASE_URL_PATH."\r\n";
-                        $on_rewrite_section = 1;
-                }
-                if (($on_rewrite_section == 1) && (preg_match("/^(\\s*)<\\/IfModule>/i", $line)))
-                {
-                        $on_rewrite_section = 2;
-                }
-                $new_htaccess_content .= $line;
-        }
-        print('<h2>'.__('Updating .htaccess').'</h2>'."\n");
-        test(__('Updating rewriting rules').'...', $on_rewrite_section, '', 0);
-        if ($on_rewrite_section)
-        {
-                test(sprintf(__('Writing .htaccess file (%s)'), '<tt>'.$htaccessLocation.'</tt>').'...', $f1 = @fopen($htaccessLocation, "w"), "", 0);
-                if ($f1)
-                {
-                        fwrite($f1, $new_htaccess_content);
-                        fclose($f1);
-                        $htaccess_updated = 1;
-                }
-        }
-}
-$config['rewrite_mode'] = $htaccess_updated;
-// #600: Force reloading of stylesheets. @@@ Do this in StaticHref()
-if (!empty($config['stylesheet']))
-{
-        $config['stylesheet'] = preg_replace('/(&amp;|\\?)(.*)$/', '', $config['stylesheet']); // Needed in case of reinstall
-        $config['stylesheet'] .= strstr($config['stylesheet'], '?') ? '&amp;' : '?';
-        $config['stylesheet'] .= substr(md5(time()),1,5);
-}
-if (!empty($config['comment_stylesheet']))
-{
-        $config['comment_stylesheet'] = preg_replace('/(&amp;|\\?)(.*)$/', '', $config['comment_stylesheet']);
-        $config['comment_stylesheet'] .= strstr($config['comment_stylesheet'], '?') ? '&amp;' : '?';
-        $config['comment_stylesheet'] .= substr(md5(time()),1,5);
-}
 // convert config array into PHP code
 $double_backslash = '\\\\';
@@ -93 +78 @@
 foreach ($config as $k => $v)
 {
-        if ($k !== 0)
-        {
-                // @@@ make sure to write strings as strings, numbers as numbers, and booleans as booleans!
-                //     we can use datatypes in the default config for this!
-                $entries[] = "\t'".$k."' => '".preg_replace('/['.$double_backslash.$single_quote.']/', $double_backslash.'$0', $v)."'"; // #5
-        }
+        $entries[] = "\t'".$k."' => '".preg_replace('/['.$double_backslash.$single_quote.']/', $double_backslash.'$0', $v)."'"; // #5
 }
 $configCode .= implode(",\n", $entries).");\n?>";
 
 // try to write configuration file
-print('<h2>'.__('Writing configuration').'</h2>'."\n");
-// (directly) use configured location SITE_CONFIGFILE
-#test(sprintf(__('Writing configuration file %s'), '<tt>'.$wakkaConfigLocation.'</tt>...'), $fp = @fopen($wakkaConfigLocation, "w"), "", 0);
-test(sprintf(__('Writing configuration file %s'), '<tt>'.SITE_CONFIGFILE.'</tt>...'), $fp = @fopen(SITE_CONFIGFILE, "w"), "", 0);
+print("<h2>Writing configuration</h2>\n");
+test("Writing configuration file <tt>".$wakkaConfigLocation."</tt>...", $fp = @fopen($wakkaConfigLocation, "w"), "", 0);
 
 if ($fp)
 {
-        $_SESSION['server_info'] = $_SESSION['sconfig'] = $_SESSION['wikka'] = null;
         fwrite($fp, $configCode);
         // write
         fclose($fp);
-        printf('<p>'.__('That\'s all! You can now %1$sreturn to your WikkaWiki site%2$s'), '<a href="'.WIKKA_BASE_URL.'">', '</a>');
-        echo '. '."\n";
-        printf(__('However, you are advised to remove write access to %s again now that it\'s been written. Leaving the file writable can be a security risk'), '<tt>wikka.config.php</tt>');
-        echo '!</p>';
+        
+        print("<p>That's all! You can now <a href=\"".$config["base_url"]."\">return to your Wikka site</a>. However, you are advised to remove write access to <tt>wikka.config.php</tt> again now that it's been written. Leaving the file writable can be a security risk!</p>");
 }
 else
 {
         // complain
-        print('<p><span class="failed">'.__('WARNING').':</span> ');
-        printf(__('The file %1$s could not be written. You will need to give your web server temporary write access to either your wikka directory, or a blank file called %1$s'), '<tt>'.SITE_CONFIGFILE.'</tt>');
-        echo ' (<kbd>touch wikka.config.php ; chmod 666 wikka.config.php</kbd>) ; ';
-        printf(__('don\'t forget to remove write access again later, ie %s'), '<kbd>chmod 644 '.SITE_CONFIGFILE.'</kbd>');
-        echo ".\n";
-        printf(__('If, for any reason, you can\'t do this, you\'ll have to copy the text below into a new file and save/upload it as %1$s'), '<tt>'.SITE_CONFIGFILE.'</tt>');
-        printf(__('Once you\'ve done this, your Wikka site should work. If not, please visit %s'), '<a href="http://docs.wikkawiki.org/WikkaInstallation">WikkaInstallation</a>');
-        echo '.</p>'."\n";
+        print("<p><span class=\"failed\">WARNING:</span> The configuration file <tt>".$wakkaConfigLocation."</tt> could not be written. You will need to give your web server temporary write access to either your wakka directory, or a blank file called <tt>wikka.config.php</tt> (<tt>touch wikka.config.php ; chmod 666 wikka.config.php</tt>; don't forget to remove write access again later, ie <tt>chmod 644 wikka.config.php</tt>). If, for any reason, you can't do this, you'll have to copy the text below into a new file and save/upload it as <tt>wikka.config.php</tt> into the Wikka directory. Once you've done this, your Wikka site should work. If not, please visit <a href=\"http://docs.wikkawiki.org/WikkaInstallation\">WikkaInstallation</a>.</p>\n");
         ?>
-        <form action="<?php echo $action_target; ?>" method="post">
-        <input type="hidden" name="installAction" value="writeconfig" />
-        <input type="submit" value="<?php echo _p('Try again'); ?>" />
+        <form action="<?php echo myLocation() ?>?installAction=writeconfig" method="post">
+        <input type="hidden" name="config" value="<?php echo Wakka::hsc_secure(serialize($config2)) ?>" /><?php /*  #427 */ ?>
+        <input type="submit" value="Try again" />
         </form> 
         <?php
-        echo '<div><textarea readonly="readonly" style="width: 80%; height: 600px;">'.str_replace(array('&', '<'), array('&amp;', '&lt;'), $configCode)."</textarea></div>\n"; //TODO: make code block downloadable
+        print("<xmp>".$configCode."</xmp>\n"); //TODO: replace xmp and make code block downloadable
 }
 

branches/1.3/wikka.php

@@ -5 +5 @@
  * This file is called each time a request is made from the browser.
  * Most of the core methods used by the engine are located in the Wakka class.
- * @see Wakka
+ * @see Wakka
  * This file was originally written by Hendrik Mans for WakkaWiki
  * and released under the terms of the modified BSD license
- * @see /docs/WakkaWiki.LICENSE
- *
- * @package             Wikka
- * @subpackage  Core
- * @version             $Id: wikka.php 1293 2009-01-12 17:06:21Z DarTar $
- * @license             http://www.gnu.org/copyleft/gpl.html GNU General Public License
- * @see                 /docs/Wikka.LICENSE
+ * @see /docs/WakkaWiki.LICENSE
+ *
+ * @package Wikka
+ * @subpackage Core
+ * @version $Id$
+ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
+ * @see /docs/Wikka.LICENSE
  * @filesource
  *
@@ -24 +24 @@
  * @author      {@link http://wikkawiki.org/DarTar Dario Taraborelli}
  * @author      {@link http://wikkawiki.org/BrianKoontz Brian Koontz}
- * @author      {@link http://www.tormodh.net/ Tormod Haugen}
- *
- * @copyright   Copyright 2002-2003, Hendrik Mans <hendrik@mans.de>
- * @copyright   Copyright 2004-2005, Jason Tourtelotte <wikka-admin@jsnx.com>
- * @copyright   Copyright 2006-2009, {@link http://wikkawiki.org/CreditsPage Wikka Development Team}
- *
- * @uses        getmicrotime()          for determining page generation time
- * @uses        magicQuotesWorkaround() to overcome magic quotes that may be imposed
- *                              on a system
- * @uses        instantiate()           for a version-independent method to instantiate a class
- * @uses        getMysqlVersion()       to retrieve MySQL version for a requirements check
- *
- * @todo        use templating class for page generation;
- */
-
-require_once('libs'.DIRECTORY_SEPARATOR.'Compatibility.lib.php');
-
-// ---------------------- DEBUGGING AND ERROR REPORTING -----------------------
-/**
- * Controls generation of debug messages.
- *
- * May cause quirks mod in browser!
- * By using a 'debug' key file during development (and keeping this out of the
- * repository!) it's is simple to trigger debug messages without needing to edit
- * (this) code.
- */
-$debug = (file_exists('debug')) ? TRUE : FALSE;
-/**
- * Controls error_reporting mode: E_ALL if TRUE, E_ALL ^ E_NOTICE if FALSE.
- *
- * By using a 'errors' key file during development (and keeping this out of the
- * repository!) it's is simple to test a system without needing to edit (this)
- * code.
- */
-$track_errors = (file_exists('errors')) ? TRUE : FALSE;
-ob_start();                                                     // need to pick up tracing messages
-/**
- * Interpret debugging and development/production modes.
- */
-if ($debug || $track_errors)
-{
-        error_reporting(E_ALL);                         // always on for debug mode
-}
-else
-{
-        error_reporting(E_ALL ^ E_NOTICE);      // production mode
-}
-// -------------------- END DEBUGGING AND ERROR REPORTING ---------------------
-
-// ---------------------------- VERSIONING ------------------------------------
-include_once('./version.php');
-
-/**#@-*/ 
+ * @author      {@link http://wikkawiki.org/TormodHaugen Tormod Haugen}
+ *
+ * @copyright Copyright 2002-2003, Hendrik Mans <hendrik@mans.de>
+ * @copyright Copyright 2004-2005, Jason Tourtelotte <wikka-admin@jsnx.com>
+ * @copyright Copyright 2006-2009, {@link http://wikkawiki.org/CreditsPage Wikka Development Team}
+ *
+ * @todo use templating class for page generation;
+ * @todo add phpdoc documentation for configuration array elements;
+ */
+
+//error_reporting(E_ALL);
+error_reporting (E_ALL ^ E_NOTICE);
+
+// If you need to use this installation with a configuration file outside the
+// installation directory uncomment the following line and adapt it to reflect
+// the (filesystem) path to where your configuration file is located.
+// This would make it possible to store the configuration file outside of the
+// webroot, or to share one configuration file between several Wikka Wiki
+// installations.
+// This replaces the use of the environment variable WAKKA_CONFIG for security
+// reasons. [SEC]
+#if (!defined('WAKKA_CONFIG')) define('WAKKA_CONFIG','path/to/your/wikka.config.php');
+
 /** 
- * Defines the current Wikka patch level. This should be 0 by default,  
- * and does not need to be changed for major/minor releases. 
+ * Include language file if it exists. 
+ * @see /lang/en.inc.php 
  */ 
-if(!defined('WIKKA_PATCH_LEVEL')) define('WIKKA_PATCH_LEVEL', '1'); 
-
-// ----------------------------- BASIC CONSTANTS -------------------------------
-/**
- * Defines the basic name the session name will be derived from.
- */
-if (!defined('BASIC_SESSION_NAME'))             define('BASIC_SESSION_NAME', 'Wikkawiki');
-
-/**
- * Path where the Wikka installer is located.
- */
-if (!defined('WIKKA_SETUP_PATH'))               define('WIKKA_SETUP_PATH', 'setup');
+$default_lang_path = 'lang'.DIRECTORY_SEPARATOR.'en'.DIRECTORY_SEPARATOR.'en.inc.php';
+if (file_exists($default_lang_path)) require_once($default_lang_path); 
+else die('Language file '.$default_lang_path.' not found! Please add the file.');
+
+/**
+ * Defines the current Wikka version. Do not change the version number or you will have problems upgrading.
+ */
+if (!defined('WAKKA_VERSION')) define('WAKKA_VERSION', '1.2');
+
+/**
+ * Defines the current Wikka patch level. This should be 0 by default, 
+ * and does not need to be changed for major/minor releases.
+ */
+if(!defined('WIKKA_PATCH_LEVEL')) define('WIKKA_PATCH_LEVEL', '1');
+
 
 /**#@+
- * Minimum version requirement.
- */
-if (!defined('MINIMUM_PHP_VERSION'))    define('MINIMUM_PHP_VERSION', '4.1');
-if (!defined('MINIMUM_MYSQL_VERSION'))  define('MINIMUM_MYSQL_VERSION', '3.23');        // 3.23.23 referred to in commented-out code
+ * Simple constant. May be made a configurable value.
+ */
+/**
+ * Defines the default cookie name.
+ */
+if (!defined('BASIC_COOKIE_NAME')) define('BASIC_COOKIE_NAME', 'Wikkawiki');
+/**
+ * Length to use for generated part of id attribute.
+ */
+define('ID_LENGTH',10);                 // @@@ maybe make length configurable
+/**
+ * Character used for multi-path lists
+ */
+if(!defined('PATH_DIVIDER')) define('PATH_DIVIDER', ',');
 /**#@-*/
 
-// The following error messages are in English only, because at the point these
-// messages need to be shown, no language preference may have been set yet, no
-// language file loaded yet, or even the language file could not be loaded(!).
-
-/**#@+
- * Error message constant.
- */
-define('ERROR_WRONG_PHP_VERSION', 'Wikka requires PHP %s or higher!');  // %s - version number
-define('ERROR_LANGUAGE_FILE_MISSING', 'Language file (%s) not found! Please add the file.'); // %s - path to default language file
-/**#@-*/
-// --------------------------- END BASIC CONSTANTS -----------------------------
-
-
-// --------------------------- VERSION CHECK (PHP) -----------------------------
+// Sanity checks - we die if these conditions aren't met
+
 // More intelligent version check, more intelligently placed ;)
-// Basically if we are going to fail, we want to do that as soon as possible.
-// BUT: to have the error message localized, the desied language file must have
-// been loaded already; and that in turn depends on a bunch of other things...
-//
-// So here we use one of the few exceptions: an error message in English because
-// we don't have a language file loaded yet. (The installer needs to start in
-// English anyway, and the error message when the language file *cannot* be loaded
-// will also have to be English!)
-//
-// Given the above, it doesn't need any of the constant definitions, except the
-// error message and version constants, so it can go way up now!
-if ($debug) echo "PHP version check...<br/>\n";
 if (!function_exists('version_compare') ||
         version_compare(phpversion(),MINIMUM_PHP_VERSION,'<')   // < PHP minimum version??
@@ -135 +94 @@
         die($php_version_error);                # fatalerror    !!! default error in English
 }
-// ------------------------- END VERSION CHECK (PHP) ---------------------------
+// MySQL needs to be installed and available
+// @@@ message could be refined by detecting detect OS (mention module name) and maybe server name
+if (!function_exists('mysql_connect'))
+{
+        die(ERROR_MYSQL_SUPPORT_MISSING);
+}
+
+/**
+ * Include main library if it exists.
+ * @see libs/Wakka.class.php
+ */
+if (file_exists('libs/Wakka.class.php'))
+{
+        require_once('libs/Compatibility.lib.php');
+        require_once('libs/Wakka.class.php');
+}
+else
+{
+        die(ERROR_WAKKA_LIBRARY_MISSING);
+}
+
+// Sanity checks OK - start rolling....
+
+ob_start();
+global $tstart;
+$tstart = getmicrotime();
+set_magic_quotes_runtime(0);
+if (get_magic_quotes_gpc())
+{
+        magicQuotesWorkaround($_POST);
+        magicQuotesWorkaround($_GET);
+        magicQuotesWorkaround($_COOKIE);
+}
+
+/**
+ * Default configuration.
+ */
+// attempt to derive base URL fragments and whether rewrite mode is enabled (#438)
+$t_domain       = $_SERVER['SERVER_NAME'];
+$t_scheme = ((isset($_SERVER['HTTPS'])) && !empty($_SERVER['HTTPS']) && 'off' != $_SERVER['HTTPS']) ? 'https://' : 'http://';
+$t_port = ':'.$_SERVER['SERVER_PORT'];
+if ((('http://' == $t_scheme) && (':80' == $t_port)) || (('https://' == $t_scheme) && (':443' == $t_port)))
+{
+        $t_port = '';
+}
+$t_request      = $_SERVER['REQUEST_URI'];
+// append slash if $t_request does not end with either a slash or the string .php
+if (!preg_match('@(\\.php|/)$@i', $t_request))
+{
+        $t_request .= '/';
+}
+
+if (preg_match('@\.php$@', $t_request) && !preg_match('@wikka\.php$@', $t_request))
+{
+        // handle "overridden" redirect from index.php
+        $t_request = preg_replace('@/[^.]+\.php@', '/wikka.php', $t_request);   // handle "overridden" redirect from index.php
+}
+
+if ( !preg_match('@wakka=@',$_SERVER['REQUEST_URI']) && isset($_SERVER['QUERY_STRING']) && preg_match('@wakka=@',$_SERVER['QUERY_STRING']))
+{
+        // looks like we got a rewritten request via .htaccess
+        // remove 'wikka.php' and request (page name) from 'request' part: should not be part of base_url!
+        $query_part = preg_replace('@wakka=@', '', $_SERVER['QUERY_STRING']);
+        $t_request  = preg_replace('@'.preg_quote('wikka.php').'@', '', $t_request);
+        $t_request  = preg_replace('@'.preg_quote($query_part).'@', '', $t_request);
+        $t_query = '';
+        $t_rewrite_mode = 1;
+}
+else
+{
+        // no rewritten request apparent
+        $t_query = '?wakka=';
+        $t_rewrite_mode = 0;
+}
 
 // ---------------------- DEFINE URL DOMAIN / PATH -----------------------------
@@ -154 +186 @@
  * URL fragment consisting of scheme + domain part.
  * Represents the domain URL where the current instance of Wikka is located.
+ * This variable can be overriden in {@link override.config.php}
  *
  * @var string
@@ -187 +220 @@
 // ----------------------- END URL DOMAIN / PATH -------------------------------
 
-// ------------------------ DEFINE & DERIVE CORE PATHS -------------------------
-// Universal path divider; path parser also recognizes Unix-style
-// dividers (:) and Windows-style dividers (;)
-define('PATH_DIVIDER', ',');
-
-if ($debug) echo "default filesystem paths...<br/>\n";
-
-/**
-  * Default filesystem path for the <b>site</b> configuration
-  * <b>file</b>.
-  */
-if(!defined('DEFAULT_SITE_CONFIGFILE')) define ('DEFAULT_SITE_CONFIGFILE', 'wikka.config.php');
-// For backwards compatibility with existing code...probably needs to
-// be removed at some point
-if(!defined('SITE_CONFIGFILE')) define ('SITE_CONFIGFILE', DEFAULT_SITE_CONFIGFILE);
-
-if ($debug) echo "core component paths...<br/>\n";
-
-/**
- * Effective path to the Wikka code library which contains core components.
- */
-if (!defined('WIKKA_LIBRARY_PATH')) define('WIKKA_LIBRARY_PATH', 'libs');
-
-/**
- * Effective path to the Wikka language library which contains language files
- * and localized system content.
- */
-if (!defined('WIKKA_LANG_PATH')) define('WIKKA_LANG_PATH', 'lang');
-
-/**
-  * Default <b>directory</b> where actions bundled with Wikka are
-  * stored.
-  */
-if(!defined('DEFAULT_ACTION_PATH')) define('DEFAULT_ACTION_PATH', 'plugins/actions'.PATH_DIVIDER.'actions');
-
-/**
-  * Default <b>directory</b> where handlers bundled with Wikka are
-  * stored.
-  */
-if(!defined('DEFAULT_HANDLER_PATH')) define('DEFAULT_HANDLER_PATH', 'plugins/handlers'.PATH_DIVIDER.'handlers');
-
-/**
-  * Default <b>directory</b> where formatters bundled with Wikka are
-  * stored.
-  */
-if(!defined('DEFAULT_FORMATTER_PATH')) define('DEFAULT_FORMATTER_PATH', 'plugins/formatters'.PATH_DIVIDER.'formatters');
-
-/**
-  * Default <b>directory</b> where templates bundled with Wikka are
-  * stored.
-  */
-if(!defined('DEFAULT_TEMPLATE_PATH')) define('DEFAULT_TEMPLATE_PATH', 'plugins/templates'.PATH_DIVIDER.'templates');
-
-/**
-  * Directory for 3rd-party components
-  */
-if(!defined('DEFAULT_3RDPARTY_PATH')) define('DEFAULT_3RDPARTY_PATH', '3rdparty');
-
-/** Default <b>directory</b> where 3rdparty core components bundled
-  * with Wikka are stored.  These components are required for basic
-  * Wikka functionality.
-  */
-if(!defined('DEFAULT_3RDPARTY_CORE_PATH')) define('DEFAULT_3RDPARTY_CORE_PATH', DEFAULT_3RDPARTY_PATH.DIRECTORY_SEPARATOR.'core');
-
-/** Default <b>directory</b> where 3rdparty plugin components bundled
-  * with Wikka are stored.  These components are optional and extend
-  * Wikka functionality.
-  */
-if(!defined('DEFAULT_3RDPARTY_PLUGIN_PATH')) define('DEFAULT_3RDPARTY_PLUGIN_PATH', DEFAULT_3RDPARTY_PATH.DIRECTORY_SEPARATOR.'plugin');
-
-/** 
-  * Default <b>directory</b> for the FeedCreator 3rd party component.
-  */
-if(!defined('DEFAULT_FEEDCREATOR_PATH')) define('DEFAULT_FEEDCREATOR_PATH', DEFAULT_3RDPARTY_CORE_PATH.DIRECTORY_SEPARATOR.'feedcreator');
-
-/** 
-  * Default <b>directory</b> for the SafeHTML 3rd party component.
-  */
-if(!defined('DEFAULT_SAFEHTML_PATH')) define('DEFAULT_SAFEHTML_PATH', DEFAULT_3RDPARTY_CORE_PATH.DIRECTORY_SEPARATOR.'safehtml');
-
-/** 
-  * Default <b>directory</b> for the optional GeSHi 3rd party plugin component.
-  */
-if(!defined('DEFAULT_GESHI_PATH')) define('DEFAULT_GESHI_PATH', DEFAULT_3RDPARTY_PLUGIN_PATH.DIRECTORY_SEPARATOR.'geshi');
-
-/** 
-  * Default <b>directory</b> for the language files for the GeSHi 3rd
-  * party plugin component.
-  */
-if(!defined('DEFAULT_GESHI_LANG_PATH')) define('DEFAULT_GESHI_LANG_PATH', DEFAULT_GESHI_PATH.DIRECTORY_SEPARATOR.'geshi');
-
-/** 
-  * Default <b>directory</b> for the optional Onyx-RSS 3rd party
-  * plugin component.
-  */
-if(!defined('DEFAULT_ONYX_PATH')) define('DEFAULT_ONYX_PATH', DEFAULT_3RDPARTY_PLUGIN_PATH.DIRECTORY_SEPARATOR.'onyx-rss');
-
-  /**
-   * <b>URL path component</b> pointing to the location of the WikiEdit scripts.
-   * This path will be extended by the system with the file name for each of
-   * the required scripts.
-   */
-if(!defined('DEFAULT_WIKIEDIT_URIPATH')) define('DEFAULT_WIKIEDIT_URIPATH', filesys2uri(DEFAULT_3RDPARTY_PLUGIN_PATH).DIRECTORY_SEPARATOR.'wikiedit');
-
-  /**
-   * <b>URL path component</b> for the FreeMind display applet.
-   * This path will be extended by the system with the file name for the
-   * applet's jar archive.
-   */
-if(!defined('DEFAULT_FREEMIND_URIPATH')) define('DEFAULT_FREEMIND_URIPATH', filesys2uri(DEFAULT_3RDPARTY_PLUGIN_PATH).DIRECTORY_SEPARATOR.'freemind');
-
-// ------------------- COMPONENT PATHS DEFINED --------------------
-
-// -------------------------------- START TIMER --------------------------------
-if ($debug) echo "start timer...<br/>\n";
-// --- this requires a function from the Compatibility library, so it must come
-//     at least after loading that library
-// Now that all paths and other basic settings are known, start page generation
-// timer.
-$tstart = getmicrotime(TRUE);
-// ------------------------------- TIMER STARTED -------------------------------
-
-// ----------------------------- GATHER CONFIGURATION --------------------------
-if ($debug) echo "gather configuration...<br/>\n";
-// --- this requires a function from the Compatibility library, so it must come
-//     at least after loading that library; it also uses the effective locations
-//     for the configuration files, so these locations must have been derived.
-/**
- * 1. Get the default configuration.
- */
-require_once('libs'.DIRECTORY_SEPARATOR.'Config.class.php');
-$DefaultConfig = instantiate('Config');
-$wakkaDefaultConfig = get_object_vars($DefaultConfig);
-unset($DefaultConfig);
-// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
-/**
- * 2. Load and update the (current) user configuration if it exists.
- */
-$wakkaConfig = array(); // empty array in case there's no user configuration yet
-
-// Get any inherited configuration from Wakka
-if (file_exists('wakka.config.php'))
-{
-        rename('wakka.config.php', 'wikka.config.php');
-}
-if(file_exists(SITE_CONFIGFILE))
-{
-        include SITE_CONFIGFILE;
-}
-
-// migrate some old to new variable names (should come before merge!)
-//TODO move these checks to a directive file to be used by the installer/upgrader, #97
-if (isset($wakkaConfig['action_path']) && !isset($wakkaConfig['wikka_action_path']))
-{
-        $wakkaConfig['wikka_action_path'] = $wakkaConfig['action_path'];
-        unset($wakkaConfig['action_path']); //since 1.1.7
-}
-if (isset($wakkaConfig['handler_path']) && !isset($wakkaConfig['wikka_handler_path']))
-{
-        $wakkaConfig['wikka_handler_path'] = $wakkaConfig['handler_path'];
-        unset($wakkaConfig['handler_path']); //since 1.1.7
-}
+
+$wakkaDefaultConfig = array(
+        'mysql_host'                            => 'localhost',
+        'mysql_database'                        => 'wikka',
+        'mysql_user'                            => 'wikka',
+        'table_prefix'                          => 'wikka_',
+
+        'root_page'                                     => 'HomePage',
+        'wakka_name'                            => 'MyWikkaSite',
+        'base_url'                                      => $t_scheme.$t_domain.$t_port.$t_request.$t_query,
+        'rewrite_mode'                          => $t_rewrite_mode,
+        'wiki_suffix'                           => '@wikka',
+        'enable_user_host_lookup'       => '1', #enable (1, default) or disable (0) lookup of user hostname from IP address
+
+        'action_path'                           => 'plugins/actions'.PATH_DIVIDER.'actions',
+        'handler_path'                          => 'plugins/handlers'.PATH_DIVIDER.'handlers',
+        'gui_editor'                            => '1',
+        'default_comment_display'       => '1',
+        'theme'                                         => 'light',
+
+        // formatter and code highlighting paths
+        'wikka_formatter_path'          => 'plugins/formatters'.PATH_DIVIDER.'formatters',              # (location of Wikka formatter - REQUIRED)
+        'wikka_highlighters_path'       => 'formatters',                # (location of Wikka code highlighters - REQUIRED)
+        'geshi_path'                            => '3rdparty/plugins/geshi',                            # (location of GeSHi package)
+        'geshi_languages_path'          => '3rdparty/plugins/geshi/geshi',              # (location of GeSHi language highlighting files)
+
+        // template
+        'wikka_template_path'           => 'plugins/templates'.PATH_DIVIDER.'templates',                # (location of Wikka template files - REQUIRED)
+        'feedcreator_path'                      => '3rdparty/core/feedcreator',
+        'safehtml_path'                         => '3rdparty/core/safehtml',
+        'referrers_purge_time'          => '30',
+        'pages_purge_time'                      => '0',
+        'xml_recent_changes'            => '10',
+        'hide_comments'                         => '0',
+        'comment_stylesheet'            => 'boxed-comments.css',
+        'require_edit_note'                     => '0',         # edit note optional (0, default), edit note required (1) edit note disabled (2)
+        'anony_delete_own_comments'     => '1',
+        'public_sysinfo'                        => '0',         # enable or disable public display of system information in SysInfo
+        'double_doublequote_html'       => 'safe',
+        'external_link_tail'            => '<span class="exttail">&#8734;</span>',
+        'sql_debugging'                         => '0',
+        'admin_users'                           => '',
+        'admin_email'                           => '',
+        'upload_path'                           => 'uploads',
+        'mime_types'                            => 'mime_types.txt',
+
+        // code hilighting with GeSHi
+        'geshi_header'                          => 'div',       # 'div' (default) or 'pre' to surround code block
+        'geshi_line_numbers'            => '1',         # disable line numbers (0), or enable normal (1) or fancy line numbers (2)
+        'geshi_tab_width'                       => '4',         # set tab width
+        'grabcode_button'                       => '1',         # allow code block downloading
+
+        'wikiping_server'                       => '',
+
+        'default_write_acl'                     => '+',
+        'default_read_acl'                      => '*',
+        'default_comment_read_acl'              => '*',
+        'default_comment_post_acl'              => '+',
+        'allow_user_registration'       => '1',
+        'enable_version_check'      => '1',
+        'version_check_interval'        => '1h'
+        );
+
+// load config
+$wakkaConfig = array();
+if (file_exists('wakka.config.php')) rename('wakka.config.php', 'wikka.config.php"');   // upgrade from Wakka
+#if (!$configfile = GetEnv("WAKKA_CONFIG")) $configfile = "wikka.config.php";
+if (defined('WAKKA_CONFIG'))    // use a define instead of GetEnv [SEC]
+{
+        $configfile = WAKKA_CONFIG;
+}
+else
+{
+        $configfile = 'wikka.config.php';
+}
+if (file_exists($configfile)) include($configfile);
+$wakkaConfigLocation = $configfile;
 
 // remove obsolete config settings (should come before merge!)
@@ -354 +302 @@
 if (isset($wakkaConfig['header_action']))
 {
-        unset($wakkaConfig['header_action']); //since 1.1.7
-}
-if (isset($wakkaConfig['footer_action'])) //since 1.1.7
+        unset($wakkaConfig['header_action']); //since 1.1.6.4
+}
+if (isset($wakkaConfig['footer_action'])) //since 1.1.6.4
 {
         unset($wakkaConfig['footer_action']);
 }
-if (isset($wakkaConfig['stylesheet']))
-{
-        unset($wakkaConfig['stylesheet']); //since 1.2
-}
-if (isset($wakkaConfig['navigation_links']))
-{
-        unset($wakkaConfig['navigation_links']); //since 1.2
-}
-if (isset($wakkaConfig['logged_in_navigation_links']))
-{
-        unset($wakkaConfig['logged_in_navigation_links']); //since 1.2
-}
-
-// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
-/**
- * 3. Now, the default configuration is merged with any already-existing (and
- * maybe updated) site configuration.
- * If a new install or upgrade is needed, the installer will ultimately write an
- * (updated) site configuration.
- */
-$wakkaConfig = array_merge($wakkaDefaultConfig, $wakkaConfig);
-//--------------------- (DEFAULT) CONFIGURATION READY --------------------------
-
-
-// ------------------------------ LANGUAGE FILE --------------------------------
-// --- In an existing installation, the actual language choice is picked up from
-//     the configuration; otherwise an initial 'default_language' setting is
-//     created using the system language default.
-// --- Dependencies:
-//     - CONFIG_DEFAULT_LANGUAGE and WIKKA_LANG_PATH must have been defined
-//     - Error message to show when no language file could be loaded must
-//       have been defined
-// @@@ maybe NOT load this when we don't have a configuration file (and thus
-// need to do a NEW install)? isset($wakkaConfig['default_lang']) - it would
-// prevent dynamic language switching during installation...?
-if ($debug) echo "get language file...<br/>\n";
-/**
- * Include language file if one exists.
- *
- * Language files are bundled under <b>lang/</b> in a
- * folder named after their ISO 639-1 code (e.g. 'en' for English).
- *
- * Other language files that exist in the language folder will be
- * included as well (useful for plugins that define their own
- * language strings).
- */
-$default_lang = $wakkaConfig['default_lang'];
-$lang_base_dir = 'lang'; 
-$fallback_lang  = 'en';                 // should always be available
-$default_language_file  = $lang_base_dir.DIRECTORY_SEPARATOR.$default_lang.DIRECTORY_SEPARATOR.$default_lang.'.inc.php';
-$fallback_language_file = $lang_base_dir.$fallback_lang.DIRECTORY_SEPARATOR.$fallback_lang.'.inc.php';
-$language_file_not_found = sprintf(ERROR_LANGUAGE_FILE_MISSING,$default_language_file);
-// load language package if it exists
-if (file_exists($default_language_file))
-{
-        /**
-         * Check for other language files (i.e., for plugins)
-         */
-        $lang_dir = $lang_base_dir.DIRECTORY_SEPARATOR.$default_lang;
-        $hdir = opendir($lang_dir);
-        if(FALSE !== $hdir)
-        {
-                while(FALSE !== ($file = readdir($hdir)))
-                {
-                        if(0 == preg_match('/\.inc\.php$/', $file))
-                        {
-                                continue; // .inc.php files only!
-                        }
-                        require_once $lang_dir.DIRECTORY_SEPARATOR.$file;
-                }
-        }
-
-        /**
-         * Language file for configured default language.
-         */
-        require_once $default_language_file;
-}
-elseif (file_exists($fallback_language_file))
-{
-        /**
-         * Check for other language files (i.e., for plugins)
-         */
-        $lang_dir = $lang_base_dir.DIRECTORY_SEPARATOR.$fallback_lang;
-        $hdir = opendir($lang_dir);
-        if(FALSE !== $hdir)
-        {
-                while(FALSE !== ($file = readdir($hdir)))
-                {
-                        if(0 == preg_match('/\.inc\.php$/', $file))
-                        {
-                                continue; // .inc.php files only!
-                        }
-                        require_once $lang_dir.DIRECTORY_SEPARATOR.$file;
-                }
-        }
-
-        /**
-         * Language file for system default language: fallback.
-         */
-        require_once $fallback_language_file;   // silent fallback
-}
-else
-{
-        die($language_file_not_found);  # fatalerror - local error message in English because we don't _have_ a language file(!)
-}
-
-/*
- * Defines the (configurable) default language. Wikka will attempt to
- * oad the corresponding language file.  This value is directly used
- * here in wikka.php but also used as the default value in the default
- * configuration file.
- */
-if (!defined('DEFAULT_FALLBACK_LANGUAGE')) define('DEFAULT_FALLBACK_LANGUAGE' , $fallback_lang);
-
-// ---------------------------- END LANGUAGE FILE ------------------------------
-
-
-//------------------------------ ENVIRONMENT -----------------------------------
-if ($debug) echo "handle magic quotes...<br/>\n";
-// --- needed (just) before we start looking at cookies and get / post parameters
-set_magic_quotes_runtime(0);
-if (get_magic_quotes_gpc())
-{
-        magicQuotesWorkaround($_POST);
-        magicQuotesWorkaround($_GET);
-        magicQuotesWorkaround($_COOKIE);
-}
-//---------------------------- END ENVIRONMENT ---------------------------------
-
-
-// ----------------------------- MAINTENANCE LOCK ------------------------------
-if ($debug) echo "maintenance lock (if needed)...<br/>\n";
-// --- requires SOME language file to be loaded with error message definition
-// --- BUT requires a USER-defined config value, so installer needs to have run
-//     at some time - IOW we need an existing installation for this to work
+
+// Remove old stylesheet, #6
+if(isset($wakkaConfig['stylesheet']))
+{
+        unset($wakkaConfig['stylesheet']); // since 1.2
+}
+
+// Add plugin paths if they do not already exist
+if(isset($wakkaConfig['action_path']) && preg_match('/plugins\/actions/', $wakkaConfig['action_path']) <= 0)
+        $wakkaConfig['action_path'] = "plugins/actions," .  $wakkaConfig['action_path'];        
+if(isset($wakkaConfig['handler_path']) && preg_match('/plugins\/handlers/', $wakkaConfig['handler_path']) <= 0)
+        $wakkaConfig['handler_path'] = "plugins/handlers," .  $wakkaConfig['handler_path'];     
+if(isset($wakkaConfig['wikka_template_path']) && preg_match('/plugins\/templates/', $wakkaConfig['wikka_template_path']) <= 0)
+        $wakkaConfig['wikka_template_path'] = "plugins/templates," .  $wakkaConfig['wikka_template_path'];      
+if(isset($wakkaConfig['wikka_formatter_path']) && preg_match('/plugins\/formatters/', $wakkaConfig['wikka_formatter_path']) <= 0)
+        $wakkaConfig['wikka_formatter_path'] = "plugins/formatters," .  $wakkaConfig['wikka_formatter_path'];   
+
+$wakkaConfig = array_merge($wakkaDefaultConfig, $wakkaConfig);  // merge defaults with config from file
+
 /**
  * Check for locking.
@@ -500 +332 @@
 if (file_exists('locked'))
 {
-        // init
-        $ask = 0;
-
         // read password from lockfile
-        $lines = file('locked');
+        $lines = file("locked");
         $lockpw = trim($lines[0]);
 
-        // is authentication given?
-        if (isset($_SERVER['PHP_AUTH_USER']))
-        {
-                if (!(($_SERVER['PHP_AUTH_USER'] == 'admin') && ($_SERVER['PHP_AUTH_PW'] == $lockpw)))
-                {
+        // is authentification given?
+        if (isset($_SERVER["PHP_AUTH_USER"])) {
+                if (!(($_SERVER["PHP_AUTH_USER"] == "admin") && ($_SERVER["PHP_AUTH_PW"] == $lockpw))) {
                         $ask = 1;
                 }
-                // authenticated
+        } else {
+                $ask = 1;
+        }
+
+        if ($ask) {
+                header("WWW-Authenticate: Basic realm=\"".$wakkaConfig["wakka_name"]." Install/Upgrade Interface\"");
+                header("HTTP/1.0 401 Unauthorized");
+                print WIKI_UPGRADE_NOTICE;
+                exit;
+        }
+}
+
+/**
+ * Compare versions, start installer if necessary.
+ */
+if (!isset($wakkaConfig['wakka_version'])) $wakkaConfig['wakka_version'] = 0;
+if ($wakkaConfig['wakka_version'] !== WAKKA_VERSION)
+{
+        /**
+         * Start installer.
+         *
+         * Data entered by the user is submitted in $_POST, next action for the
+         * installer (which will receive this data) is passed as a $_GET parameter!
+         */
+        $installAction = 'default';
+        if (isset($_GET['installAction'])) $installAction = trim($_GET['installAction']);       #312
+        if (file_exists('setup'.DIRECTORY_SEPARATOR.'header.php'))
+        include('setup'.DIRECTORY_SEPARATOR.'header.php'); else print '<em class="error">'.ERROR_SETUP_HEADER_MISSING.'</em>'; #89
+        if
+        (file_exists('setup'.DIRECTORY_SEPARATOR.$installAction.'.php'))
+        include('setup'.DIRECTORY_SEPARATOR.$installAction.'.php'); else print '<em class="error">'.ERROR_SETUP_FILE_MISSING.'</em>'; #89
+        if (file_exists('setup'.DIRECTORY_SEPARATOR.'footer.php'))
+        include('setup'.DIRECTORY_SEPARATOR.'footer.php'); else print '<em class="error">'.ERROR_SETUP_FOOTER_MISSING.'</em>'; #89
+        exit;
+}
+
+/**
+ * Start session.
+ */
+$base_url_path = preg_replace('/wikka\.php/', '', $_SERVER['SCRIPT_NAME']);
+$wikka_cookie_path = ('/' == $base_url_path) ? '/' : substr($base_url_path,0,-1);
+session_set_cookie_params(0, $wikka_cookie_path);
+session_name(md5(BASIC_COOKIE_NAME.$wakkaConfig['wiki_suffix']));
+session_start();
+
+// fetch wakka location
+/**
+ * Fetch wakka location (requested page + parameters)
+ *
+ * @todo files action uses POST, everything else uses GET #312
+ */
+$wakka = $_GET['wakka']; #312
+
+/**
+ * Remove leading slash.
+ */
+$wakka = preg_replace("/^\//", "", $wakka);
+
+/**
+ * Extract pagename and handler from URL 
+ *
+ * Note this splits at the FIRST / so $handler may contain one or more slashes;
+ * this is not allowed, and ultimately handled in the Handler() method. [SEC]
+ */
+if (preg_match("#^(.+?)/(.*)$#", $wakka, $matches)) list(, $page, $handler) = $matches;
+else if (preg_match("#^(.*)$#", $wakka, $matches)) list(, $page) = $matches;
+//Fix lowercase mod_rewrite bug: URL rewriting makes pagename lowercase. #135
+if ((strtolower($page) == $page) && (isset($_SERVER['REQUEST_URI']))) #38
+{
+        $pattern = preg_quote($page, '/');
+        if (preg_match("/($pattern)/i", urldecode($_SERVER['REQUEST_URI']), $match_url))
+        {
+                $page = $match_url[1];
+        }
+}
+
+/**
+ * Create Wakka object
+ */
+$wakka = instantiate('Wakka',$wakkaConfig);
+
+/**
+ * Check for database access.
+ */
+if (!$wakka->dblink)
+{
+        echo '<em class="error">'.ERROR_NO_DB_ACCESS.'</em>';
+        exit;
+}
+
+/**
+ * Save session ID
+ */
+$user = $wakka->GetUser();
+// Only store sessions for real users!
+if(NULL != $user)
+{
+        $res = $wakka->LoadSingle("SELECT * FROM ".$wakka->config['table_prefix']."sessions WHERE sessionid='".session_id()."' AND userid='".$user['name']."'"); 
+        if(isset($res))
+        {
+                // Just update the session_start time
+                $wakka->Query("UPDATE ".$wakka->config['table_prefix']."sessions SET session_start=FROM_UNIXTIME(".$wakka->GetMicroTime().") WHERE sessionid='".session_id()."' AND userid='".$user['name']."'");
         }
         else
         {
-                $ask = 1;
+                // Create new session record
+                $wakka->Query("INSERT INTO ".$wakka->config['table_prefix']."sessions (sessionid, userid, session_start) VALUES('".session_id()."', '".$user['name']."', FROM_UNIXTIME(".$wakka->GetMicroTime()."))");
         }
-
-        // request authentication
-        if ($ask)
-        {
-                header('WWW-Authenticate: Basic realm="'.$wakkaConfig['wakka_name'].' Install/Upgrade Interface"');
-                header('HTTP/1.0 401 Unauthorized');
-                die(STATUS_WIKI_UPGRADE_NOTICE); #fatalerror
-        }
-}
-// --------------------------- END MAINTENANCE LOCK ----------------------------
-
-
-// ---------------------------------- INSTALLER --------------------------------
-if ($debug) echo "installer (if needed)...<br/>\n";
-// --- requires at least default configuration to be present
-//     constants WAKKA_VERSION, SITE_CONFIGFILE and WIKKA_SETUP_PATH must have been defined
-//     language file must be loaded for error message
-/**
- * Compare versions, start installer if necessary.
- */
-if (!isset($wakkaConfig['wakka_version']))
-{
-        $wakkaConfig['wakka_version'] = 0;
-}
-$version1 = array();
-$version2 = array();
-// We are interested in the version root (i.e., given "trunk-r1009" or
-// "trunk_r1009", we only want to compare against "trunk"). 
-$version1 = preg_split('/-|_/', WAKKA_VERSION);
-// There is some weirdness with the way PHP either (1) returns from
-// preg_replace when the search string is "0", or (2) a type
-// comparison beetween a string and an integer 0.  In any case, 
-// remove the if clause below at your own risk.
-if(0 === $wakkaConfig['wakka_version'])
-{
-        $version2[0] = $wakkaConfig['wakka_version'];
-}
-else    
-{
-        $version2 = preg_split('/-|_/', $wakkaConfig['wakka_version']);
-}
-if ( $version1[0] !== $version2[0] )
-//if($wakkaConfig['wakka_version'] !== WAKKA_VERSION)
-{
-        // set up (intended) config location for the installer
-        #$wakkaConfigLocation = SITE_CONFIGFILE;                // @@@ use directly in installer
-        if ($debug) echo 'site configuration file (to be) lodated at: '.SITE_CONFIGFILE."<br/>\n";
-        $htaccessLocation = str_replace('\\', '/', dirname(__FILE__)).DIRECTORY_SEPARATOR.'.htaccess';
-        #if (file_exists('setup'.DIRECTORY_SEPARATOR.'index.php'))      #89
-        if (file_exists(WIKKA_SETUP_PATH.DIRECTORY_SEPARATOR.'index.php'))      # #89
-        {
-                // run the installer
-                #include 'setup'.DIRECTORY_SEPARATOR.'index.php';               #89
-                include WIKKA_SETUP_PATH.DIRECTORY_SEPARATOR.'index.php';               # #89
-                return;                         // prevent "fall-through"
-        }
-        else
-        {
-                // installer can not be run
-                die(WIKKA_ERROR_SETUP_FILE_MISSING);    #fatalerror
-        }
-}
-// -------------------------------- END INSTALLER ------------------------------
-
-
-// ---------------------------- GET READY TO ROLL ------------------------------
-if ($debug) echo "get ready to roll...<br/>\n";
-if ($debug) echo '=> register_globals: '.ini_get('register_globals')."</br>\n";
-// --- - requires SOME language file to be loaded for error messages
-//     - constants WIKKA_LIBRARY_PATH, BASIC_SESSION_NAME and MINIMUM_MYSQL_VERSION
-//       must have been defined
-//     - Compatibility library must be included for MySQL version check
-/**
- * Include main library if it exists.
- *
- * @see         libs/Wakka.class.php
- */
-$wakka_library = WIKKA_LIBRARY_PATH.DIRECTORY_SEPARATOR.'Wakka.class.php';
-$wakka_library_missing = sprintf(ERROR_WAKKA_LIBRARY_MISSING, $wakka_library);
-if (file_exists($wakka_library))
-{
-        require_once $wakka_library;
-}
-else
-{
-        die($wakka_library_missing);    #fatalerror
-}
-
-/**
- * Start session.
- * @todo        consider whether to derive the complete set of paths (but earlier)
- *                      and pass them to the Wakka object; that way we still derive only once
- *                      but the installer can use them as well.
- */
-
-// start session
-session_name(md5(BASIC_SESSION_NAME.$wakkaConfig['wiki_suffix']));
-session_set_cookie_params(0, WIKKA_COOKIE_PATH);        // default path is '/' - we don't want that! this call overrides php.ini settings
-session_cache_limiter(''); # #279
-session_start();
-
-/**
- * Fetch wakka value (requested page + parameters)
- *
- * @todo files action uses POST, everything else uses GET #312
- * @todo use different name - $wakka clashes with $wakka object (which should be #Wakka)
- */
-$wakka_request = $_GET['wakka']; # #312
-
-/**
- * Remove leading slash.
- *
- * @todo        use different name - $wakka_request clashes with $wakka_request object (which should be #Wakka)
- */
-$wakka_request = preg_replace("/^\//", "", $wakka_request);
-
-/**
- * Extract pagename and handler from URL
- *
- * Note this splits at the FIRST '/', so $method may contain one or more slashes;
- * this is not allowed, and ultimately handled in the Method() method. [SEC]
- *
- * @todo        devise a more intelligent page and handler derivation and error out
- *                      when URL syntax isn't correct. E.g., explode at '/' - there may only
- *                      be one or two elements in the resulting array [SEC]
- */
-// init
-$handler = '';
-// analyze request to derive page and handler
-if (preg_match("#^(.+?)/(.*)$#", $wakka_request, $matches))
-{
-        list(, $page, $handler) = $matches;
-}
-else if (preg_match("#^(.*)$#", $wakka_request, $matches))
-{
-        list(, $page) = $matches;
-}
-
-//Fix lowercase mod_rewrite bug: URL rewriting makes pagename lowercase. #135
-if ((strtolower($page) == $page) && (isset($_SERVER['REQUEST_URI']))) # #38
-{
-        $pattern = preg_quote($page, '/');
-        if (preg_match('/('.$pattern.')/i', urldecode($_SERVER['REQUEST_URI']), $match_url))
-        {
-                $page = $match_url[1];
-        }
-}
-if ($debug) echo 'page: '.$page."<br/>\n";
-if ($debug) echo 'handler: '.$handler."<br/>\n";
-
-/**
- * Create Wakka object.
- *
- * @todo        use name with Capital for object
- */
-$wakka = instantiate('Wakka',$wakkaConfig);
-
-/**
- * Check if we have database access.
- * @todo        use name with Capital for object
- */
-if (!$wakka->dblink)
-{
-        $mysql_access_error = STATUS_WIKI_UNAVAILABLE.'<br/>'.ERROR_NO_DB_ACCESS;
-        die($mysql_access_error);               #FatalErrorAfterLangFileIncluded
-}
-
-/**
- * We have database access: now check if the version is one we support.
- */
-$errors = array();
-$mysql_version = getMysqlVersion($errors);
-if (($n = count($errors)) > 0)
-{
-        for ($i=0; $i <= $n; $i++)
-        {
-                #echo 'MySQL error: '.$errors['no'][$i].' - '.$errors['txt'][$i]."<br/>\n";     # i18n  @@@
-                printf(WIKKA_ERROR_MYSQL_ERROR, $errors['no'][$i], $errors['txt'][$i]);
-                echo "<br/>\n";
-        }
-        $mysql_version_retrieval_error = ERROR_RETRIEVAL_MYSQL_VERSION;
-        die($mysql_version_retrieval_error);
-}
-if ($debug) echo 'MySQL version: '.$mysql_version."<br/>\n";
-if ($mysql_version !== FALSE &&
-        version_compare($mysql_version, MINIMUM_MYSQL_VERSION,'<')      // < MYSQL minimum version??
-   )
-{
-        $mysql_version_error = sprintf(ERROR_WRONG_MYSQL_VERSION, MINIMUM_MYSQL_VERSION);
-        die($mysql_version_error);              #FatalErrorAfterLangFileIncluded
-}
-
-/**
- * Save session ID
- */
-$user = $wakka->GetUser(); 
-// Only store sessions for real users! 
-if(NULL != $user) 
-{ 
-        $res = $wakka->LoadSingle("SELECT * FROM ".$wakka->config['table_prefix']."sessions WHERE sessionid='".session_id()."' AND userid='".$user['name']."'");  
-        if(!empty($res)) 
-        { 
-                // Just update the session_start time 
-                $wakka->Query("UPDATE ".$wakka->config['table_prefix']."sessions SET session_start=NOW() WHERE sessionid='".session_id()."' AND userid='".$user['name']."'"); 
-        } 
-        else 
-        { 
-                // Create new session record 
-                $wakka->Query("INSERT INTO ".$wakka->config['table_prefix']."sessions (sessionid, userid, session_start) VALUES('".session_id()."', '".$user['name']."', NOW())"); 
-        } 
-}
-
-// ---------------------------- READY TO ROLL NOW ------------------------------
-// ---------------------------------- ROLL! ------------------------------------
-// --- Dependencies:
-//     - language file loaded
-// ....- configuration defined
-//     - Wakka class instantiated
-//     - Compatibility library loaded
-if ($debug) echo "roll...<br/>\n";
-$debug_info = '';
-if (!$debug)
-{
-        $debug_info = ob_get_contents();
-        @ob_end_clean();        // in case there was a previous buffer left from debug mode!
-        ob_start();             // start buffering output
-}
+}
+
 /**
  * Run the engine.
- *
- * @todo        use name with Capital for object; also clashes with $wakka (above) now
- */
-$wakka->Run($page, $handler);                           // This is where it all happens!
-// ------------------------------- PAGE ROLLED ---------------------------------
-
-
-// ------------------------- WRAP UP AND DISPLAY PAGE --------------------------
-if ($debug) echo "wrap up...<br/>\n";
-$content =  ob_get_contents();                          // pick up contents of buffer
+ */
+if (!isset($handler)) $handler='';
+$wakka->Run($page, $handler);
+$content =  ob_get_contents();
 /**
  * Use gzip compression if possible.
- *
- * @todo        use config value to optionally turn off gzip-encoding here #541
- */
-if (isset($_SERVER['HTTP_ACCEPT_ENCODING']) &&
-        strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') &&
-        function_exists('gzencode') # #38
-   )
+ */
+/*
+if ( isset($_SERVER['HTTP_ACCEPT_ENCODING']) && strstr ($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode') ) #38
 {
         // Tell the browser the content is compressed with gzip
-        header('Content-Encoding: gzip');
+        header ("Content-Encoding: gzip");
         $page_output = gzencode($content);
-        //$page_length = strlen($page_output);  // We no longer send Content-Length header - see below
-}
-else
-{
+        $page_length = strlen($page_output);
+} else {
+ */
         $page_output = $content;
-        //$page_length = strlen($page_output);  // We no longer send Content-Length header - see below
-}
-
-$etag = md5($content);
-header('ETag: '.$etag);         // @@@ should not contain footer with page generation time!
-
-if (!isset($wakka->do_not_send_anticaching_headers) ||
-        (!$wakka->do_not_send_anticaching_headers) # #279
-   )
-{
-        header('Expires: Thu, 19 Nov 1981 08:52:00 GMT');
-        header('Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0');
-        header('Pragma: no-cache');
-}
-
-/**
- * We no longer send Content-Length header, due to a bug in PHP {@link http://wush.net/trac/wikka/ticket/152}.
- * The Webserver will be clever enough to use chunked transfer encoding. #152
- * @todo remove $page_length calculation above.
- */
-//header('Content-Length: '.$page_length);
-@ob_end_clean();
+        $page_length = strlen($page_output);
+//}
+
+// header("Cache-Control: pre-check=0");
+header("Cache-Control: no-cache");
+// header("Pragma: ");
+// header("Expires: ");
+
+$etag =  md5($content);
+header('ETag: '.$etag);
+
+header('Content-Length: '.$page_length);
+ob_end_clean();
 
 /**
@@ -804 +488 @@
  */
 echo $page_output;
-// --------------------------------- ALL DONE ----------------------------------
 ?>