Changeset 93

Timestamp:

2007-12-10 18:28:54 (1 year ago)

Author:

hannes

Message:

merging changesets [73] to [92] from trunk (upgrade to RC4)

Files:

• branches/5.0/admin/classes/pages/Editmember.php (modified) (1 diff)
• branches/5.0/classes/misc/Authcode.php (modified) (1 diff)
• branches/5.0/classes/misc/Member.php (modified) (4 diffs)
• branches/5.0/classes/misc/Post.php (modified) (1 diff)
• branches/5.0/classes/misc/Table.php (modified) (2 diffs)
• branches/5.0/classes/pages/Forum.php (modified) (1 diff)
• branches/5.0/classes/pages/Members.php (modified) (1 diff)
• branches/5.0/classes/pages/Moderate.php (modified) (2 diffs)
• branches/5.0/classes/pages/Newpoll.php (modified) (1 diff)
• branches/5.0/classes/pages/Newtopic.php (modified) (1 diff)
• branches/5.0/classes/pages/Reply.php (modified) (3 diffs)
• branches/5.0/includes/checklogin.php (modified) (1 diff)
• branches/5.0/includes/config/bots.php (modified) (1 diff)
• branches/5.0/includes/config/version.php (modified) (1 diff)
• branches/5.0/includes/lang/de.php (modified) (2 diffs)
• branches/5.0/includes/lang/en.php (modified) (1 diff)
• branches/5.0/includes/login.php (modified) (1 diff)
• branches/5.0/includes/session.php (modified) (4 diffs)
• branches/5.0/includes/styles/default.css (modified) (6 diffs)
• branches/5.0/redirectors/logout.php (modified) (1 diff)

branches/5.0/admin/classes/pages/Editmember.php

@@ -466 +466 @@
-                } else {
-                    // choose member
-'<select name="id">'
+new XMLElement('<select name="id"></select>')
-                    foreach ($C->query('SELECT memberid, membername FROM ' . $SETTINGS['dbtableprefix'] . 'members ORDER BY membername ASC') as $row) {
-
+
+
-                    }
-
-
+
+
+
-                    $form->addRawTableRow(Array('<td colspan="2" align="center"><input type="reset" name="reset" value="' . $LANG['Reset'] . '" /> <input type="submit" name="submit" value="' . $LANG['Edit'] . '" /> <input type="submit" name="submit" value="' . $LANG['Delete'] . '" /> <input type="submit" name="submit" value="' . $LANG['User_Groups'] . '" /></td>'));
-                }

branches/5.0/classes/misc/Authcode.php

@@ -24 +24 @@
- **/
-
-extends Page 
+
-
-    /**

branches/5.0/classes/misc/Member.php

@@ -331 +331 @@
-        global $STATUS;
-        if ($translated) {
-
-
-
-
+
+
+
-            return $_s;
-        } else {
@@ -382 +381 @@
-            $table->addRow(Array($LANG['Homepage'] . ':', '-'));
-        }
-
+
+
+
+
+
-        $table->addRow(Array($LANG['Stage'] . ':', $this->stage));
-        $table->addRow(Array($LANG['Registration'] . ':', $F->datetime($this->registration, TRUE, FALSE)));
@@ -485 +488 @@
-        if ($_fail == 1) {
-            // login failed -> log in cookie and session
-
+s
-            $newlogins2 = $_SESSION['loginattempts'] + 1;
-            // check which value is higher
@@ -649 +652 @@
-                return $_permit;
-            } elseif ($page == 'Reply' || $page == 'Newtopic' || $page == 'Newpoll') {
+                // for replying, $id is given as topic id, but forum id needed
-                if ($page == 'Reply') {
-
-
-
-
-
-
-
+
+
+
+
+
+
-                }
-                // check for each of the user's groups

branches/5.0/classes/misc/Post.php

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

branches/5.0/classes/misc/Table.php

@@ -76 +76 @@
-     *              $attr - Array containing key=>value attributes common
-     *                      to all columns
+     *              $decode - decode entities?
-     * Returns:     -
-     **/
-
+, $decode = FALSE
-        $tr = $this->table->addChild('tr');
-        if ($attr) {
@@ -90 +91 @@
-        // add the columns
-        while ($cols[$i] !== NULL) {
-
+
+
+
+
+
-                // contents for this column given as XML tree
-                $tr->addElement($xml);

branches/5.0/classes/pages/Forum.php

@@ -135 +135 @@
-                }
-                // add all the previously compiled topic information to table
-'<td><h3>' . $_prefix . '<a href="' . $F->link('topic') . 'id=' . $row2['topicid'] . '">' . $row2['topictitle'] . '</a></h3>' . $_multipages . '</td>', '<td align="center">' . $row2['posts'] . '</td>', '<td align="center">' . $row2['views'] . '</td>', '<td><div>' . $LANG['by'] . ' ' . $_poster1->getProfileLink() . '</div><div>' . $LANG['at'] . ' ' . $F->datetime($row3->posttime, FALSE, TRUE) . '</div><div>' . $LANG['on'] . ' ' . $F->datetime($row3->posttime, TRUE, FALSE) . '</div></td>', '<td><div>' . $LANG['by'] . ' ' . $_poster2->getProfileLink() . '</div><div>' . $LANG['at'] . ' ' . $F->datetime($row4->posttime, FALSE, TRUE) . '</div><div>' . $LANG['on'] . ' ' . $F->datetime($row4->posttime, TRUE, FALSE) . '</div></td>')
+ '<td><h3>' . $_prefix . '<a href="' . $F->link('topic') . 'id=' . $row2['topicid'] . '">' . htmlentities($row2['topictitle']) . '</a></h3>' . str_replace('&amp;', '&amp;amp;', $_multipages) . '</td>', '<td align="center">' . $row2['posts'] . '</td>', '<td align="center">' . $row2['views'] . '</td>', '<td><div>' . $LANG['by'] . ' ' . $_poster1->getProfileLink() . '</div><div>' . $LANG['at'] . ' ' . $F->datetime($row3->posttime, FALSE, TRUE) . '</div><div>' . $LANG['on'] . ' ' . $F->datetime($row3->posttime, TRUE, FALSE) . '</div></td>', '<td><div>' . $LANG['by'] . ' ' . $_poster2->getProfileLink() . '</div><div>' . $LANG['at'] . ' ' . $F->datetime($row4->posttime, FALSE, TRUE) . '</div><div>' . $LANG['on'] . ' ' . $F->datetime($row4->posttime, TRUE, FALSE) . '</div></td>'), FALSE, TRUE
-            }
-            // add finished table to parent HTML element

branches/5.0/classes/pages/Members.php

@@ -64 +64 @@
-                break;
-            }
-
-
-
+
-            $s = $q->execute();
-            // put all the results into an array

branches/5.0/classes/pages/Moderate.php

@@ -340 +340 @@
-                        $_form->addInput('hidden', 'commit', 'y');
-                        $_form->createTable('postform');
-'<select name="topic">'
+new XMLElement('<select name="topic"></select>')
-                        // order topics of this forum the same way they appear on the forum overview page, i.e. by last activity
-                        $q = $C->prepare('SELECT t.topicid AS topicid, t.topictitle AS topictitle, MAX(p.posttime) AS lastpost FROM ' . $SETTINGS['dbtableprefix'] . 'topics AS t, ' . $SETTINGS['dbtableprefix'] . 'posts AS p WHERE t.forum=:forum AND p.topic=t.topicid AND t.topicid!=:id GROUP BY t.topicid ORDER BY lastpost DESC');
@@ -347 +347 @@
-                        $q->execute();
-                        while ($_row_sel = $q->fetchObject()) {
-
-
-
-
-
+
+
+
+
+
+
+
-                        $_form->addTableEnd();
-                        $_form->addTable();

branches/5.0/classes/pages/Newpoll.php

@@ -33 +33 @@
-        global $LANG, $F, $C, $SETTINGS;
-        global $id, $forum, $commit;
+        // after submit, the forum id is called $forum
+        if (isset($commit) && $commit == 'y') {
+            $id = $forum;
+        }
-        // define title and location
-        $this->index = 0;

branches/5.0/classes/pages/Newtopic.php

@@ -33 +33 @@
-        global $LANG, $F, $C, $SETTINGS;
-        global $id, $forum, $commit;
+        // after submit, the forum id is called $forum
+        if (isset($commit) && $commit == 'y') {
+            $id = $forum;
+        }
-        // define title and location
-        $this->index = 0;

branches/5.0/classes/pages/Reply.php

@@ -33 +33 @@
-        global $LANG, $F, $C, $SETTINGS;
-        global $id, $page, $quote, $commit;
+        // after commit, the topic id is called 'reply'
+        if (isset($commit) && $commit == 'y') {
+            $id = $reply;
+        }
-        // define title and location
-        $this->index = 0;
@@ -60 +64 @@
-            // show reply form
-            // check if user has permission; required: read; dependent on id
-row->forum
+id
-                // permission granted
-                // get text to quote (if needed)
@@ -88 +92 @@
-                // add form to XML tree
-                $this->html->body->addElement($_form->get());
+                // header of 'thread reminder' (including a link to the full topic)
+                $h2 = $this->html->body->addChild('h2');
+                $this->html->body->addElement(new XMLElement('<h2>' . str_replace('%n%', $SETTINGS['postsperpage'], $LANG['Last_x_Posts']) . ' (<a href="' . $F->link('topic') . 'id=' . $id . '" target="_blank">' . $LANG['View_All'] . '</a>)</h2>'));
+                // get posts from database (last $SETTINGS['postsperpage'] in reversed order)
+                $q2 = $C->prepare('SELECT postid FROM ' . $SETTINGS['dbtableprefix'] . 'posts WHERE topic=:topic ORDER BY posttime DESC LIMIT 0, ' . $SETTINGS['postsperpage']);
+                $q2->bindParam(':topic', $id, PDO::PARAM_INT, 12);
+                $q2->execute();
+                $rows2 = $q2->fetchAll();
+                $q2 = NULL;
+                // list posts in a table
+                $table = new Table();
+                foreach ($rows2 as $row2) {
+                    $p = new Post($row2['postid']);
+                    $p->add($table);
+                }
+                $_table = $table->get();
+                // add whole table to the XML tree representing the page
+                $this->html->body->addElement($_table);
-            } else {
-                // not allowed -> log in

branches/5.0/includes/checklogin.php

@@ -54 +54 @@
-            // blocked - copy information to cookie
-            $exp = time() + $SETTINGS['expire'] * 24 * 60 * 60;
-'/'
+$SETTINGS['webpath']
-        }
-    }

branches/5.0/includes/config/bots.php

@@ -17 +17 @@
-$BOTS[] = 'jeeves';
-$BOTS[] = 'spider';
+$BOTS[] = 'robot';
+$BOTS[] = 'krawl';
+$BOTS[] = 'curl';
+$BOTS[] = 'wget';
+$BOTS[] = 'libwww-perl';
+$BOTS[] = 'metager';
+$BOTS[] = 'grub';
+$BOTS[] = 'netcraft';
+$BOTS[] = 'urllib';
+$BOTS[] = 'robozilla';
-
-?>

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) */
-
-3
+4
-
-?>

branches/5.0/includes/lang/de.php

@@ -244 +244 @@
-$LANG['Unpin_Topic'] = 'Thema losmachen';
-$LANG['Split_Topic'] = 'Thema aufsplitten';
-
+e
-$LANG['Delete_Post'] = 'Beitrag löschen';
-$LANG['Edit_Post'] = 'Beitrag bearbeiten';
@@ -307 +307 @@
-$LANG['IP_Logging'] = 'IP-Logging';
-$LANG['Login_Attempts'] = 'Erlaubte Loginversuche (0 = unendlich)';
+$LANG['Last_x_Posts'] = 'Die letzten %n% Beiträge';
+$LANG['View_All'] = 'Alle ansehen';
+$LANG['per_day'] = 'pro Tag';
-
-/* actual sentences */

branches/5.0/includes/lang/en.php

@@ -308 +308 @@
-$LANG['IP_Logging'] = 'IP Logging';
-$LANG['Login_Attempts'] = 'Allowed Login Attempts (0 = infinite)';
+$LANG['Last_x_Posts'] = 'Last %n% Posts';
+$LANG['View_All'] = 'View All';
+$LANG['per_day'] = 'per day';
-
-/* actual sentences */

branches/5.0/includes/login.php

@@ -65 +65 @@
-}
-// delete potential number of failed logins from cookie
-'/'
+$SETTINGS['webpath']
-// set special admin flag if necessary
-if ($admin) {

branches/5.0/includes/session.php

@@ -24 +24 @@
-
-// ignore well-known bots
-
+
+
+
+
+
+
+
-    // save session info in subdirectory instead of system-wide /tmp/
-    ini_set('session.save_path', $SETTINGS['fspath'] . 'sessions');
@@ -168 +174 @@
-    }
-    // don't list well-known bots in online table
-in_array(strtolower($_SERVER['HTTP_USER_AGENT']), $BOTS) === FALSE
+$is_bot === 0
-        // new entry to table
-        $q = $C->prepare('INSERT INTO ' . $SETTINGS['dbtableprefix'] . 'online (onlinememberid, onlinetime, onlinesession) VALUES (:memberid, :time, :session)');
-
+
+
+
+
+
-        $q->bindParam(':time', time(), PDO::PARAM_INT, 12);
-        $q->bindParam(':session', session_id(), PDO::PARAM_STR, 40);
@@ -211 +221 @@
-    }
-    // check for duplicate entries of members
-->onlinememberid
+['onlinememberid']
-        $q2 = $C->prepare('SELECT onlinetime FROM ' . $SETTINGS['dbtableprefix'] . 'online WHERE onlinememberid=:memberid ORDER BY onlinetime DESC');
-        $q2->bindParam(':memberid', $row['onlinememberid'], PDO::PARAM_INT, 12);
@@ -220 +230 @@
-            $q = $C->prepare('DELETE FROM ' . $SETTINGS['dbtableprefix'] . 'online WHERE onlinememberid=:memberid AND onlinetime<:time');
-            $q->bindParam(':memberid', $row['onlinememberid'], PDO::PARAM_INT, 12);
-['onlinetime']
+->onlinetime
-            $q->execute();
-            $q = NULL;

branches/5.0/includes/styles/default.css

@@ -24 +24 @@
-    padding:0px;
-    margin:0px;
+    color:#555555;
-}
-
@@ -29 +30 @@
-    font-family:sans-serif;
-    font-size:0.7em;
-    color:#555555;
-    background:#f2f2f2;
-    margin:0px;
@@ -39 +39 @@
-
-h1 {
+    font-size:1.5em;
-    position:relative;
-    top:0.5em;
@@ -60 +61 @@
-    color:#000000;
-    font-weight:bold;
+    font-size:1.5em;
-}
-
@@ -70 +72 @@
-    margin:0px;
-    padding:0px;
+    font-size:1.2em;
-}
-
@@ -252 +255 @@
-    padding:0.2em;
-    vertical-align:top;
+}
+
+.liketr {
+    background:#cccccc;
+    vertical-align:top;
+    text-align:center;
+    width:90%;
+    margin:0px;
+    position:relative;
+    left:5%;
+    border-left:1px solid #83be83;
+    border-right:1px solid #83be83;
-}
-

branches/5.0/redirectors/logout.php

@@ -66 +66 @@
-    session_start();
-    // update in database
-
+
+
-    $q->bindParam(':session', session_id(), PDO::PARAM_STR, 40);
-    $q->execute();