Changeset 109

Timestamp:

2007-12-21 20:36:45 (1 year ago)

Author:

hannes

Message:

working on ticket #62:

• database table collation explicitely set
  
• internally, set to use Unicode everywhere the question popped up
  
• conversion to desired output encoding in the very end
  

Files:

• trunk/classes/misc/Post.php (modified) (1 diff)
• trunk/classes/pages/Forum.php (modified) (1 diff)
• trunk/db/mysql.sql (modified) (1 diff)
• trunk/db/spamboard.sql (deleted)
• trunk/db/sqlite.sql (modified) (1 diff)
• trunk/includes/config/settings.tmpl (modified) (1 diff)
• trunk/includes/page_out.php (modified) (1 diff)
• trunk/install.php (modified) (1 diff)

trunk/classes/misc/Post.php

@@ -102 +102 @@
-        }
-        // add this post
-amp;', '&
+', '&
-        // post footer
-        $table->addRow(Array(''), Array('colspan'=>'2', 'class'=>'postfooter'));

trunk/classes/pages/Forum.php

@@ -135 +135 @@
-                }
-                // add all the previously compiled topic information to table
-$SETTINGS['encoding']) . '</a></h3>' . str_replace('&amp;', '&amp;
+'UTF-8') . '</a></h3>' . str_replace('&', '&
-            }
-            // add finished table to parent HTML element

trunk/db/mysql.sql

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-CREATE INDEX idx_forums ON %prefix%forums (forum_category ASC);

trunk/db/sqlite.sql

@@ +1 @@
+CREATE TABLE %prefix%categories (
+  category_id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  category_name VARCHAR(255) NOT NULL COLLATE NOCASE,
+  category_order INTEGER NOT NULL
+);
+
+CREATE TABLE %prefix%forums (
+  forumid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  forumtitle VARCHAR(255) NOT NULL COLLATE NOCASE,
+  forumdescription VARCHAR(255) NOT NULL COLLATE NOCASE,
+  forum_category INTEGER  NOT NULL,
+  forum_order INTEGER  NOT NULL
+);
+
+CREATE TABLE %prefix%messages (
+  messageid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  messagesender INTEGER NOT NULL,
+  messagereceipient INTEGER NOT NULL,
+  messagetitle VARCHAR(255) NOT NULL COLLATE NOCASE,
+  message TEXT NOT NULL COLLATE NOCASE,
+  messagesenderflag INTEGER NOT NULL,
+  messagereceipientflag INTEGER NOT NULL,
+  messagetime DATETIME NOT NULL
+);
+
+CREATE TABLE %prefix%online (
+  onlinememberid INTEGER NOT NULL,
+  onlinetime INTEGER NOT NULL,
+  onlinesession VARCHAR(255) NOT NULL COLLATE BINARY,
+  onlineposted INTEGER NOT NULL DEFAULT 0
+);
+
+CREATE TABLE %prefix%polls (
+  pollid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  pollchoices TEXT NOT NULL COLLATE NOCASE,
+  pollvotes TEXT NOT NULL COLLATE NOCASE,
+  pollvoters TEXT NOT NULL COLLATE NOCASE
+);
+
+CREATE TABLE %prefix%posts (
+  postid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  topic INTEGER NOT NULL,
+  posteremail VARCHAR(255) NOT NULL COLLATE NOCASE,
+  poster VARCHAR(255) NOT NULL COLLATE NOCASE,
+  post TEXT NOT NULL COLLATE NOCASE,
+  ip VARCHAR(16) NOT NULL COLLATE BINARY,
+  attachment VARCHAR(255) NOT NULL COLLATE BINARY,
+  postedbymember INTEGER NOT NULL,
+  edited DATETIME DEFAULT NULL,
+  editedby VARCHAR(255) DEFAULT NULL COLLATE NOCASE,
+  posttime DATETIME NOT NULL
+);
+
+CREATE TABLE %prefix%topics (
+  topicid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  forum INTEGER NOT NULL,
+  topictitle VARCHAR(255) NOT NULL COLLATE NOCASE,
+  closed INTEGER NOT NULL DEFAULT 0,
+  pinned INTEGER NOT NULL DEFAULT 0,
+  poll INTEGER NOT NULL DEFAULT 0,
+  topic_views INTEGER NOT NULL DEFAULT 0
+);
+
+CREATE TABLE %prefix%groupmemberships (
+    member INTEGER,
+    usergroup INTEGER
+);
+
+CREATE TABLE %prefix%usergroups (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  name VARCHAR(255) COLLATE NOCASE,
+  public INTEGER
+);
+
+CREATE TABLE %prefix%members (
+  memberid INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  membername VARCHAR(255) NOT NULL COLLATE NOCASE,
+  memberemail VARCHAR(255) NOT NULL COLLATE NOCASE,
+  memberemailhidden INTEGER NOT NULL DEFAULT 0,
+  memberhomepage VARCHAR(255) NULL COLLATE NOCASE,
+  memberavatar VARCHAR(255) NOT NULL DEFAULT 'images/spacer.gif',
+  memberpassword VARCHAR(255) NOT NULL COLLATE BINARY,
+  memberstatus VARCHAR(255) NOT NULL COLLATE NOCASE,
+  memberposts INTEGER NOT NULL DEFAULT 0,
+  location VARCHAR(255) NULL COLLATE NOCASE,
+  icq VARCHAR(255) NULL COLLATE NOCASE,
+  aim VARCHAR(255) NULL COLLATE NOCASE,
+  yahoo VARCHAR(255) NULL COLLATE NOCASE,
+  msn VARCHAR(255) NULL COLLATE NOCASE,
+  signature VARCHAR(255) NULL COLLATE NOCASE,
+  lastvisit DATETIME NULL,
+  boardstyle VARCHAR(32) NULL COLLATE BINARY,
+  addressbook TEXT NULL COLLATE NOCASE,
+  birthday DATE DEFAULT NULL,
+  messagenotification_email INTEGER NOT NULL DEFAULT 0,
+  messagenotification_popup INTEGER NOT NULL DEFAULT 1,
+  registered DATETIME NOT NULL,
+  salt VARCHAR(16) NULL COLLATE BINARY,
+  lang VARCHAR(16) NULL COLLATE BINARY,
+  offset INTEGER NULL
+);
+
+CREATE TABLE %prefix%mails (
+  id INTEGER NOT NULL PRIMARY KEY,
+  receipient VARCHAR(255) NOT NULL COLLATE NOCASE,
+  subject VARCHAR(255) NOT NULL COLLATE NOCASE,
+  body TEXT NOT NULL COLLATE NOCASE
+);
+
+CREATE TABLE %prefix%moderators (
+    forum INTEGER NOT NULL,
+    member INTEGER NOT NULL
+);
+
+CREATE TABLE %prefix%subscriptions (
+    topic INTEGER NOT NULL,
+    member INTEGER NOT NULL
+);
+
+CREATE TABLE %prefix%rights (
+    page VARCHAR(255) COLLATE BINARY,
+    usergroup INTEGER,
+    r INTEGER,
+    w INTEGER,
+    PRIMARY KEY (page,usergroup)
+);
+
+CREATE TABLE %prefix%rights_default (
+    page VARCHAR(255) COLLATE BINARY,
+    usergroup INTEGER,
+    r INTEGER,
+    w INTEGER,
+    PRIMARY KEY (page,usergroup)
+);
+
-CREATE INDEX idx_forums ON %prefix%forums (forum_category ASC);
-CREATE INDEX idx_topics ON %prefix%topics (forum ASC);

trunk/includes/config/settings.tmpl

@@ -42 +42 @@
-$SETTINGS['expire'] = 30; // cookie expiration in days
-$SETTINGS['debug'] = 2; // debug mode (0: off, 1: on, 2: admins only
-ripemd160
+sha512
-?>

trunk/includes/page_out.php

@@ -54 +54 @@
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-// send document to client
-str_replace(Array('ο', '»', 'α', '©', ' '), Array('ο', '»', 'α', '©', ' '), $html->asXML(
+iconv('UTF-8', $SETTINGS['encoding'], str_replace(Array('ο', '»', 'α', '©', ' '), Array('ο', '»', 'α', '©', ' '), $html->asXML()
-
-?>

trunk/install.php

@@ -221 +221 @@
-                    if ($C = new Connection()) {
-                        // get table structure
-spamboard
+' . $SETTINGS['sqltype'] . '
-                            // one SQL query at a time
-                            $db = explode(';', $db);
-                            foreach ($db as $query) {
-                                $C->query(str_replace('%prefix%', $SETTINGS['dbtableprefix'], $query));
-                            }
-                            // specialities dependent on database type
-                            if (is_file('db/' . $SETTINGS['sqltype'] . '.sql')) {
-                                if ($db = @file_get_contents('db/' . $SETTINGS['sqltype'] . '.sql')) {
-                                    // one SQL query at a time
-                                    $db = explode(';', $db);
-                                    foreach ($db as $query) {
-                                        $C->query(str_replace('%prefix%', $SETTINGS['dbtableprefix'], $query));
-                                    }
-                                } else { $ok = 0; }
-                            }
-                            // finally, fill in default data