Changeset 3

Timestamp:

2007-11-20 19:57:18 (5 years ago)

Author:

hannes

Message:

added configurable pathes for file system and webserver (ticket #1)

Files:

• trunk/admin/classes/pages/Settings.php (modified) (4 diffs)
• trunk/includes/config/settings.tmpl (modified) (1 diff)
• trunk/includes/input.php (modified) (1 diff)
• trunk/includes/lang/en.php (modified) (1 diff)
• trunk/includes/login.php (modified) (1 diff)
• trunk/includes/session.php (modified) (1 diff)
• trunk/redirectors/logout.php (modified) (2 diffs)

trunk/admin/classes/pages/Settings.php

@@ -32 +32 @@
-    public function __construct() {
-        global $LANG, $C, $F, $SETTINGS, $LANG;
-
+, $newfspath, $newwebpath
-        // define location and title parameter
-        $this->title = '';
@@ -56 +56 @@
-                    fwrite($file, "\$SETTINGS['dbname'] = '" . $newdbname . "'; // name of the SQL database\n");
-                    fwrite($file, "\$SETTINGS['dbtableprefix'] = '" . $newdbtableprefix . "'; // prefix of all the database tables\n");
+                    fwrite($file, "\$SETTINGS['fspath'] = '" . $newfspath . "'; // full file system path to the forum root\n");
+                    fwrite($file, "\$SETTINGS['webpath'] = '" . $newwebpath . "'; // path to the forum from domain's root\n");
-                    fwrite($file, "\$SETTINGS['forumname'] = '" . $newforumname . "'; // displayed in browser's title and used for outgoing e-mail\n");
-                    fwrite($file, "\$SETTINGS['slogan'] = '" . $newslogan . "'; // displayed in browser's title\n");
@@ -83 +85 @@
-                    // close file
-                    @fclose($file);
+                    // write path to the .htaccess files (if present)
+                    if (is_file('../.htaccess')) {
+                        if ($newurl_rewriting == 1) {
+                            $_rewrite = 'On';
+                        } else {
+                            $_rewrite = 'Off';
+                        }
+                        if ($file = @fopen('../.htaccess', 'w')) {
+                            // write settings
+                            fwrite($file, "RewriteEngine " . $_rewrite . "\n\nRewriteBase " . $newwebpath . "\n\nRewriteRule ^index\.php$ index.php [L]\nRewriteRule ^([a-z]+)\.php$ index.php?show=$1&%{QUERY_STRING} [L]\n\nOptions -Indexes\n");
+                            @fclose($file);
+                        }
+                        if ($file = @fopen('../admin/.htaccess', 'w')) {
+                            // write settings
+                            fwrite($file, "RewriteEngine " . $_rewrite . "\n\nRewriteBase " . $newwebpath . "admin/\n\nRewriteRule ^index\.php$ index.php [L]\nRewriteRule ^([a-z]+)\.php$ index.php?show=$1&%{QUERY_STRING} [L]\n\nOptions -Indexes\n");
+                            @fclose($file);
+                        }
+                    }
-                    $div = $this->html->body->addChild('div', $LANG['board_settings_updated']);
-                    $div->addAttribute('id', 'admin_main');
@@ -121 +141 @@
-                $form->addTableRow($LANG['SQL_Database'], 'text', 'newdbname', $SETTINGS['dbname']);
-                $form->addTableRow($LANG['SQL_Database_Table_Prefix'], 'text', 'newdbtableprefix', $SETTINGS['dbtableprefix']);
+                $form->addTableRow($LANG['Filesystem_Path'], 'text', 'newfspath', $SETTINGS['fspath']);
+                $form->addTableRow($LANG['Webserver_Path'], 'text', 'newwebpath', $SETTINGS['webpath']);
-                $form->addTableRow($LANG['Board_Name'], 'text', 'newforumname', $SETTINGS['forumname']);
-                $form->addTableRow($LANG['Board_Slogan'], 'text', 'newslogan', $SETTINGS['slogan']);

trunk/includes/config/settings.tmpl

@@ -14 +14 @@
-$SETTINGS['dbname'] = ''; // name of the SQL database
-$SETTINGS['dbtableprefix'] = 'sb_'; // prefix of all the database tables
+$SETTINGS['fspath'] = ''; // full file system path to the forum root
+$SETTINGS['webpath'] = ''; // path to the forum from domain's root
-$SETTINGS['forumname'] = 'Spam Board'; // displayed in browser's title and used for outgoing e-mail
-$SETTINGS['slogan'] = 'The Tastiest Forum on Earth!'; // displayed in browser's title

trunk/includes/input.php

@@ -539 +539 @@
-}
-
+$newfspath = $_POST['newfspath'];
+if (preg_match('/^[A-Za-z0-9_\-\/\\:\.]*$/', $newfspath) != 1) {
+    // die($LANG['error_input']);
+}
+
+$newwebpath = $_POST['newwebpath'];
+if (preg_match('/^[A-Za-z0-9_\-\/\.]*$/', $newwebpath) != 1) {
+    // die($LANG['error_input']);
+}
+
-?>

trunk/includes/lang/en.php

@@ -297 +297 @@
-$LANG['Maintainance_Mode'] = 'Maintainance Mode';
-$LANG['new_message_subject'] = 'New Private Message at ' . $SETTINGS['forumname'];
+$LANG['Filesystem_Path'] = 'Filesystem Path';
+$LANG['Webserver_Path'] = 'Webserver Path';
-
-/* actual sentences */

trunk/includes/login.php

@@ -59 +59 @@
-    // send cookie
-    $exp = time() + $SETTINGS['expire'] * 24 * 60 * 60;
-substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'], '/') - 11)
+$SETTINGS['webpath']
-}
-// delete potential number of failed logins from cookie

trunk/includes/session.php

@@ -25 +25 @@
-// ignore well-known bots
-if (stristr($_SERVER['HTTP_USER_AGENT'], 'Googlebot') === FALSE && stristr($_SERVER['HTTP_USER_AGENT'], 'Slurp') === FALSE && stristr($_SERVER['HTTP_USER_AGENT'], 'ia_archiver') === FALSE && stristr($_SERVER['HTTP_USER_AGENT'], 'Harvest') === FALSE && stristr($_SERVER['HTTP_USER_AGENT'], 'crawl') === FALSE && stristr($_SERVER['HTTP_USER_AGENT'], 'bot') === FALSE && stristr($_SERVER['HTTP_USER_AGENT'], 'jeeves') === FALSE && stristr($_SERVER['HTTP_USER_AGENT'], 'spider') === FALSE) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    // name of the session variable
-    ini_set('session.name', 's');

trunk/redirectors/logout.php

@@ -57 +57 @@
-    if ($_SESSION['remember'] === 1) {
-        // delete cookie
-substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'], '/') - 11)
+$SETTINGS['webpath']
-    }
-    $_SESSION['remember'] = 0;
@@ -64 +64 @@
-    session_start();
-    // update in database
-.$SETTINGS['dbtableprefix'].
+ . $SETTINGS['dbtableprefix'] . 
-    $q->bindParam(':session', session_id(), PDO::PARAM_STR, 40);
-    $q->execute();