Changeset 143

Timestamp:

2008-04-01 08:01:59 (9 months ago)

Author:

hannes

Message:

mergine changesets [122] to [142] from trunk; creating version 5.0 (stable)

Files:

• branches/5.0/classes/misc/Format.php (modified) (1 diff)
• branches/5.0/classes/misc/Member.php (modified) (4 diffs)
• branches/5.0/classes/misc/Post.php (modified) (4 diffs)
• branches/5.0/classes/misc/Postform.php (modified) (1 diff)
• branches/5.0/classes/pages/Delete.php (modified) (1 diff)
• branches/5.0/classes/pages/Edit.php (modified) (2 diffs)
• branches/5.0/classes/pages/Lostpassword.php (modified) (1 diff)
• branches/5.0/classes/pages/Mail.php (modified) (1 diff)
• branches/5.0/classes/pages/Messenger.php (modified) (1 diff)
• branches/5.0/classes/pages/Page.php (modified) (2 diffs)
• branches/5.0/classes/pages/Register.php (modified) (3 diffs)
• branches/5.0/classes/pages/Reply.php (modified) (1 diff)
• branches/5.0/classes/pages/Search.php (modified) (2 diffs)
• branches/5.0/classes/pages/Topic.php (modified) (3 diffs)
• branches/5.0/db/mysql.sql (modified) (1 diff)
• branches/5.0/db/sqlite.sql (modified) (1 diff)
• branches/5.0/includes/config/version.php (modified) (1 diff)
• branches/5.0/includes/lang/de.php (modified) (1 diff)
• branches/5.0/includes/lang/en.php (modified) (1 diff)
• branches/5.0/includes/login.php (modified) (1 diff)
• branches/5.0/install.php (modified) (2 diffs)
• branches/5.0/redirectors/pollvote.php (modified) (2 diffs)
• branches/5.0/redirectors/uploadavatar.php (modified) (1 diff)

branches/5.0/classes/misc/Format.php

@@ -172 +172 @@
-                        case '[img]':
-                            // get image width and height
-
+
+
+
+
-                            $_attr_close = 'width="' . $_img[0] . '" height="' . $_img[1] . '"';
-                        break;

branches/5.0/classes/misc/Member.php

@@ -315 +315 @@
-        $q = $C->prepare('SELECT COALESCE(COUNT(*), 0) FROM ' . $SETTINGS['dbtableprefix'] . 'posts WHERE poster = :membername AND postedbymember = :one');
-        $q->bindParam(':membername', $this->name, PDO::PARAM_STR);
-1
+$this->id
-        $q->execute();
-        $this->posts = $q->fetchColumn();
@@ -383 +383 @@
-        $today = new DateTime('now', new DateTimeZone('UTC'));
-        $diff = strtotime($today->format('Y-m-d')) - strtotime($this->registration);
-) / (60 * 60 * 24
+ / (60 * 60 * 24)
-        $table->addRow(Array($LANG['Posts'] . ':', $this->posts . ' (' . round($this->posts / $days , 1) . ' ' . $LANG['per_day'] . ')'));
-        $table->addRow(Array($LANG['Stage'] . ':', $this->stage));
-        $table->addRow(Array($LANG['Registration'] . ':', $F->datetime($this->registration, TRUE, FALSE)));
-
+NULL && $this->birthday !== 
-            $table->addRow(Array($LANG['Birthday'] . ':', $F->datetime($this->birthday, TRUE, FALSE)));
-        } else {
@@ -702 +702 @@
-                        $row = $q->fetchObject();
-                        $q = NULL;
-=
+>
-                            // it IS the topic starter
-                            $_permit = TRUE;
@@ -714 +714 @@
-                        $row = $q->fetchObject();
-                        $q = NULL;
-=
+>
-                            // it IS the poster
-                            $_permit = TRUE;

branches/5.0/classes/misc/Post.php

@@ -332 +332 @@
-                        // in case everything above was ok, proceed
-                        if ($ok === 1) {
-==
+>
-                                // don't save e-mail address every time for members
-                                $email = '';
@@ -419 +419 @@
-                            $q = NULL;
-                            // recount member's posts if necessary
-=
+>
-                                $_member = new Member($_SESSION['memberid']);
-                                $_member->recountPosts();
@@ -467 +467 @@
-                                        if ($row2->lang != '') {
-                                            include('includes/lang/' . $row2->lang .  '.php');
+                                        } else {
+                                            // receipient has selected 'board default'
+                                            include('includes/lang/' . $SETTINGS['language'] .  '.php');
-                                        }
+                                        $_title = Topic::getTitle($reply);
-                                        /* write mail to 'todo' database table to be sent out on one of the subsequent pageviews;
-                                         * this avoids bulk sending which might clobber the system */
@@ -473 +477 @@
-                                        $q->bindParam(':rec', $row2->memberemail, PDO::PARAM_STR);
-                                        $q->bindParam(':subj', $LANG['mail_notification_subject'], PDO::PARAM_STR);
-Array(Topic::getTitle($reply), $reply, $page)), $LANG['mail_notification_body']
+$_title, $reply, $page), $LANG['mail_notification_body'])
-                                        $q->execute();
-                                        $q = NULL;

branches/5.0/classes/misc/Postform.php

@@ -42 +42 @@
-    public function __construct($show_orig, $page = FALSE, $id = FALSE, $subject = FALSE, $quote = '', $subscribed = FALSE) {
-        global $SETTINGS, $F, $C, $LANG;
-        // define replacements
-        $_rep = Array(
-            '&'=>'&',
-            '&lt;'=>'<',
-            '&gt;'=>'>',
-            "&apos;"=>"'",
-            '&quot;'=>'"'
-        );
-        // remove special characters from quote
-        $quote = strtr($quote, $_rep);
-        // form object
-        $this->form = new Form($F->link($show_orig).'commit=y', 'postform', 'multipart/form-data');

branches/5.0/classes/pages/Delete.php

@@ -74 +74 @@
-                    $row = $q->fetchObject();
-                    $q = NULL;
-=
+>
-                        // recount posts of this member
-                        $_member = new Member($row->poster, TRUE);

branches/5.0/classes/pages/Edit.php

@@ -52 +52 @@
-            $q2 = NULL;
-            $this->title = ' - ' . Category::getName($row2->forum_category) . ' - ' . $row2->forumtitle . ' - ' . $row->topictitle . ' - ' . $LANG['Edit_Post'];
-delete
+edit
-        }
-        // call parent constructor (general HTML 'skeleton')
@@ -63 +63 @@
-                // commit to database
-                $q = $C->prepare('UPDATE ' . $SETTINGS['dbtableprefix'] . 'posts SET post=:post, edited=:edited, editedby=:by WHERE postid=:id');
-
+, TRUE
-                $_now = new DateTime('now', new DateTimeZone('UTC'));
-                $q->bindParam(':edited', $_now->format('Y-m-d H:i:s'), PDO::PARAM_STR);

branches/5.0/classes/pages/Lostpassword.php

@@ -57 +57 @@
-                        Member::setPassword($row->memberid, $p->get());
-                        // send mail
-
+ . "\nContent-Type: text/plain; charset=" . $SETTINGS['encoding'] . "\nMIME-Version: 1.0"
-                        $div = $this->html->body->addChild('div', $LANG['new_password_sent']);
-                        $div->addAttribute('class', 'message');

branches/5.0/classes/pages/Mail.php

@@ -63 +63 @@
-                    if ($row2->memberemailhidden == '0') {
-                        // use receipient's language
-
-
+
+
+
+
+
-                        }
-                        // send mail
-'>'
+">\nContent-Type: text/plain; charset=" . $SETTINGS['encoding'] . "\nMIME-Version: 1.0"
-                            // back to user's language
-lang/' . $language
+includes/lang/' . $_SESSION['lang']
-                            // success message
-                            $div = $this->html->body->addChild('div', str_replace('%receipient%', $row2->membername, $LANG['mail_sent']));

branches/5.0/classes/pages/Messenger.php

@@ -248 +248 @@
-                                    $q = NULL;
-                                    // format message
-
-
+, TRUE
+, TRUE
-                                    // lock table
-                                    @$C->query('LOCK TABLE ' . $SETTINGS['dbtableprefix'] . 'messages WRITE');

branches/5.0/classes/pages/Page.php

@@ -382 +382 @@
-            $q = NULL;
-            // send it
-
+ . "\nContent-Type: text/plain; charset=" . $SETTINGS['encoding'] . "\nMIME-Version: 1.0"
-            // delete mail from 'to do' list
-            $q = $C->prepare('DELETE FROM ' . $SETTINGS['dbtableprefix'] . 'mails WHERE id=:id');
@@ -419 +419 @@
-                    }
-                    // add notification script
-this->html->body->addChild('script', "if (confirm('" . str_replace("%count%", $count, $LANG['x_unread_messages']) . "')) { window.location.href = '" . $F->link("messenger") . "action=inbox&s=" . session_id() . "
+script = $this->html->body->addChild('script', "if (confirm('" . str_replace("%count%", $count, $LANG['x_unread_messages']) . "')) { window.location.href = '" . $F->link("messenger") . "action=inbox&s=" . session_id() . "'
-                }
-            }

branches/5.0/classes/pages/Register.php

@@ -100 +100 @@
-                             * not every db supports this, but usually, it should work without locking, too; there just is the risk of a wrong member id being returned in the second query which is very unlikely - it can only occur on forums with very high traffic */
-                            @$C->query('LOCK TABLE ' . $SETTINGS['dbtableprefix'] . 'members WRITE');
-) VALUES (:user, :email, :pw, :ts, :membe
+, memberavatar) VALUES (:user, :email, :pw, :ts, :member, :avata
-                            // the actual password will be entered seperately
-                            $_pw = '*';
@@ -110 +110 @@
-                            $q->bindParam(':ts', $_t->format('Y-m-d H:i:s'), PDO::PARAM_STR, 19);
-                            $q->bindParam(':member', $_member, PDO::PARAM_STR, 6);
+                            $q->bindValue(':avatar', 'images/spacer.gif', PDO::PARAM_STR);
-                            $q->execute();
-                            $q = NULL;
@@ -131 +132 @@
-                            $q = NULL;
-                            // send e-mail
-
+ . "\nContent-Type: text/plain; charset=" . $SETTINGS['encoding'] . "\nMIME-Version: 1.0"
-                            $div = $this->html->body->addChild('div', $LANG['registration_success']);
-                            $div->addAttribute('class', 'message');

branches/5.0/classes/pages/Reply.php

@@ -73 +73 @@
-                    $row4 = $q->fetchObject();
-                    $q = NULL;
-F->htmlentities($row4->post, TRUE)
+row4->post
-                }
-                // default: not previously subscribed

branches/5.0/classes/pages/Search.php

@@ -129 +129 @@
-                            $_username = $q->fetchColumn();
-                            $q = NULL;
-1
+:memberid
-                        break;
-                        default:
@@ -157 +157 @@
-                            $q->bindParam(':username', $_username, PDO::PARAM_STR);
-                            $q2->bindParam(':username', $_username, PDO::PARAM_STR);
+                            $q->bindParam(':memberid', $all, PDO::PARAM_INT);
+                            $q2->bindParam(':memberid', $all, PDO::PARAM_INT);
-                        }
-                        $j = 0;

branches/5.0/classes/pages/Topic.php

@@ -103 +103 @@
-                $i=0; $voted=0;
-                while ($pollvoters[$i] != '') {
-name
+id
-                        $voted = 1;
-                    }
@@ -234 +234 @@
-     **/
-    public function getTitle($id) {
-
+, $SETTINGS
-        $q = $C->prepare('SELECT topictitle FROM ' . $SETTINGS['dbtableprefix'] . 'topics WHERE topicid=:id');
-        $q->bindParam(':id', $id, PDO::PARAM_INT, 12);
@@ -242 +242 @@
-            return $_title;
-        } else {
+            $q = NULL;
-            return FALSE;
-        }

branches/5.0/db/mysql.sql

@@ -79 +79 @@
-  memberemailhidden INTEGER NOT NULL DEFAULT 0,
-  memberhomepage VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL,
- DEFAULT 'images/spacer.gif'
+
-  memberpassword VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  memberstatus VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,

branches/5.0/db/sqlite.sql

@@ -79 +79 @@
-  memberemailhidden INTEGER NOT NULL DEFAULT 0,
-  memberhomepage VARCHAR(255) NULL COLLATE NOCASE,
- DEFAULT 'images/spacer.gif'
+
-  memberpassword VARCHAR(255) NOT NULL COLLATE BINARY,
-  memberstatus VARCHAR(255) NOT NULL COLLATE NOCASE,

branches/5.0/includes/config/version.php

@@ -28 +28 @@
- * Also good: Spam Board Viking Edition 1.0 (then, you can do your own version numbering from there) */
-
- RC5
+
-
-?>

branches/5.0/includes/lang/de.php

@@ -386 +386 @@
-$LANG['group_memberships_updated'] = 'Ihre Gruppenmitgliedschaften wurden gespeichert.';
-$LANG['installer_intro'] = 'Hallo und willkommen zum Spam-Board-Installationsskript! Hiermit installieren sie Version ' . $VERSION . " des Forums.<br /><br />Es werden Ihnen im Folgenden ein paar Fragen gestellt. Sie brauchen sich jedoch nicht darum zu sorgen, etwas falsch zu machen, denn nichts wird tatsächlich durchgeführt, bevor Sie im vorletzten Schritt die Gelegenheit hatten, alle Daten nochmals zu überprüfen. Bitte benutzen Sie nicht die Vor und Zurück-Buttons Ihres Browsers, da dies zu Problemen führen kann. Sollten Sie eventuelle Fehler bemerken, oder sich während des Vorgangs bzgl. einer Angabe umentscheiden, können Sie jederzeit mit Hilfe des entsprechenden Buttons vor vorne beginnen.<br /><br />Diese Einleitungstexte sollten Ihnen die benötigten Hintergrunderklärungen liefern. Sollten Sie weitere Informationen benötigen, könnte Sie der (englische) <a href=\"http://www.spamboard.net/wiki/UsersGuide\" target=\"_blank\">&quot;User's Guide&quot;</a> auf der Spam-Board-Homepage interessieren.";
-
+ Sollte es n&ouml;tig sein, dass Sie die Rechte manuell setzen, folgen Sie bitte den Anweisungen unter <a href=\"http://www.spamboard.net/wiki/FilePermissions\" target=\"_blank\">https://www.spamboard.net/wiki/FilePermissions</a>.
-$LANG['installer_database'] = "Bitte geben Sie nun einige Informationen über das von Ihnen benutzte Datenbanksystem ein. Wenn Sie SQLite benutzen, brauchen Sie keinen Benutzernamen und kein Passwort einzugeben. Andere Datenbanksysteme benötigen diese Angaben, und die Datenbank muss bereits existieren. Das Tabellenpräfix wird an den Anfang jedes Tabellennamens geschrieben. Dadurch kann das Board in einer Datenbank, die auch noch andere (boardfremde) Tabellen enthält, betrieben werden.";
-$LANG['installer_pathes'] = "Bitte geben Sie zwei Pfade ein, die den Installationsort des Boards definieren. Der Dateisystempfad ist der Pfad vom Root des Dateisystems zum Root des Boardskripts. Der Webserverpfad ist der Verzeichnisbaum nach der Top-Level-Domain (.com, .net, .org) bis zum Board-Root. Das Installationsskript hat bereits versucht, diese Angaben herauszubekommen und gibt Ihnen Werte vor, die höchstwahrscheinlich stimmen. Bitte ändern Sie sie nur, wenn Sie wissen, was Sie tun.";

branches/5.0/includes/lang/en.php

@@ -387 +387 @@
-$LANG['group_memberships_updated'] = 'Your group memberships have been updated successfully.';
-$LANG['installer_intro'] = 'Hello and welcome to the Spam Board installer script! You are about to install version ' . $VERSION . " of this forum.<br /><br />We will ask you a few questions now. Don't worry, nothing will be committed before you had a chance to review all the options again. Please don't use your browser's back and forward buttons, as they'll break things. If you feel the need to change anything, you can start over at any time by using the respective button.<br /><br />These texts should give you the information needed to fill everything out. If you need additional help, try the <a href=\"http://www.spamboard.net/wiki/UsersGuide\" target=\"_blank\">User's Guide</a> available on the Spam Board website.";
-
+ If you need to set these up manually, follow the instructions found at <a href=\"http://www.spamboard.net/wiki/FilePermissions\" target=\"_blank\">https://www.spamboard.net/wiki/FilePermissions</a>.
-$LANG['installer_database'] = "Now please enter some information about the database system you're going to use. If you select SQLite, you don't have to enter a username and password. For other database systems, the database you enter here already has to exist. The table prefix is put in front of the name of each table the board will create. This enabled you to run the board within a database which also contains other tables.";
-$LANG['installer_pathes'] = "Please enter two pathes which define the location you're installing the board to. The file system path is the board root in respect to the filesystem root. The web path is the directory tree after the top level domain (.com, .net, .org) to the board root. The installer script has already tried to guess them and entered these values into the respective fields. Usually, this should be correct. Only change these values if you know what you're doing.";

branches/5.0/includes/login.php

@@ -43 +43 @@
-$_SESSION['boardstyle'] = $row->boardstyle;
-// language
-
+
+
+
+
+
+
-// update session in online table
-$q = $C->prepare('UPDATE ' . $SETTINGS['dbtableprefix'] . 'online SET onlinememberid=:id WHERE onlinesession=:session');

branches/5.0/install.php

@@ -60 +60 @@
-$nextpage = $page + 1;
-
-
+,
-$hashes_default = Array();
-$hashes_default[0] = 'sha512';
@@ -334 +334 @@
-            }
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                $ok = -1;
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                $ok = -1;
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    break;

branches/5.0/redirectors/pollvote.php

@@ -131 +131 @@
-                $i = 0; $voted = 0;
-                while ($pollvoters[$i] != '') {
-name
+id
-                        $voted = 1;
-                    }
@@ -141 +141 @@
-                    $pollvotes[$vote]++;
-                    $row->pollvotes = implode("\n", $pollvotes);
-name
+id
-                    // update database
-                    $q = $C->prepare('UPDATE ' . $SETTINGS['dbtableprefix'] . 'polls SET pollvotes=:votes, pollvoters=:voters WHERE pollid=:id');

branches/5.0/redirectors/uploadavatar.php

@@ -63 +63 @@
-            if ($_FILES['avatarfile']['size'] <= 512000) {
-                // check file type
-
+, 'image/jpeg'
-                    // this wasn't too reliable, so check file type again
-                    $_size = @getimagesize($_FILES['avatarfile']['tmp_name']);