Changeset 71

Timestamp:

2007-11-30 19:38:14 (1 year ago)

Author:

hannes

Message:

merging changesets [60] to [70]; upgrading to version 5.0 RC3

Files:

• branches/5.0/admin/classes/pages/Settings.php (modified) (3 diffs)
• branches/5.0/classes/misc/Format.php (modified) (1 diff)
• branches/5.0/classes/misc/Forumjump.php (modified) (1 diff)
• branches/5.0/classes/misc/Postform.php (modified) (1 diff)
• branches/5.0/classes/pages/Category.php (modified) (2 diffs)
• branches/5.0/classes/pages/Page.php (modified) (1 diff)
• branches/5.0/classes/pages/Topic.php (modified) (1 diff)
• branches/5.0/db/spamboard.sql (modified) (3 diffs)
• branches/5.0/includes/checklogin.php (modified) (3 diffs)
• branches/5.0/includes/config/settings.tmpl (modified) (1 diff)
• branches/5.0/includes/config/version.php (modified) (1 diff)
• branches/5.0/includes/input.php (modified) (1 diff)
• branches/5.0/includes/js/js.js (modified) (4 diffs)
• branches/5.0/includes/lang/de.php (modified) (2 diffs)
• branches/5.0/includes/lang/en.php (modified) (1 diff)
• branches/5.0/includes/styles/default.css (modified) (2 diffs)
• branches/5.0/install.php (modified) (1 diff)

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

@@ -32 +32 @@
-    public function __construct() {
-        global $LANG, $C, $F, $SETTINGS, $LANG;
-
+, $newloginattempts
-        // define location and title parameter
-        $this->title = '';
@@ -73 +73 @@
-                    fwrite($file, "\$SETTINGS['floodcontrol'] = " . $newfloodcontrol . "; // number of seconds someone has to wait between two posts\n");
-                    fwrite($file, "\$SETTINGS['floodcontrol_search'] = " . $newfloodcontrol_search . "; // number of seconds someone has to wait between two searches\n");
+                    fwrite($file, "\$SETTINGS['loginattempts'] = " . $newloginattempts . "; // number of failed login attempts by a user after which the board will try to lock him or her out for good (set to 0 to disable)\n");
-                    fwrite($file, "\$SETTINGS['maxuploadsize'] = " . $newmaxuploadsize . "; // maximum file size of attachments in bytes\n");
-                    fwrite($file, "\$SETTINGS['uploadextensions'] = '" . $newuploadextensions . "'; // allowed file extensions for attachments (seperated by commas)\n");
@@ -201 +202 @@
-                $form->addTableRow($LANG['Flood_Control'], 'text', 'newfloodcontrol', $SETTINGS['floodcontrol']);
-                $form->addTableRow($LANG['Flood_Control_search'], 'text', 'newfloodcontrol_search', $SETTINGS['floodcontrol_search']);
+                $form->addTableRow($LANG['Login_Attempts'], 'text', 'newloginattempts', $SETTINGS['loginattempts']);
-                $form->addTableRow($LANG['Max_attachment_size'], 'text', 'newmaxuploadsize', $SETTINGS['maxuploadsize']);
-                $form->addTableRow($LANG['Attachment_Extensions'], 'text', 'newuploadextensions', $SETTINGS['uploadextensions']);

branches/5.0/classes/misc/Format.php

@@ -92 +92 @@
-         * The string contained between opening and closing board tag will automatically appear between opening and closing HTML part anyway. Note that I wrote 'HTML part', not 'tag', since in some cases (e.g. images), the latter doesn't apply. If you're planning to add more code tags, just look at the existing ones and you should understand the different ways to use those definitions to the best effect... */
-        $tags_open_html = Array('<b>', '<i>', '<u>', '<s>', '<span style="color:%%">', '<span style="font-size:%%px">', '<span style="font-family:%%">', '<div align="%%">', '<div class="quote1">' . $LANG['Quote'] . ':</div><div class="quote">', '<div class="code1">' . $LANG['Code'] . ':</div><pre class="code">', '<img src="', '<a target="_blank" href="', '<a target="_blank" href="%%">', '<a href="mailto:', '<a href="mailto:%%">');
-
+/
-        // initialize string for comparison
-        $str_prev = '';

branches/5.0/classes/misc/Forumjump.php

@@ -36 +36 @@
-    public function __construct() {
-        global $F, $LANG, $C, $SETTINGS;
-span id="forumjump"><form action="redirectors/forumjump.php" method="post"></form></span
+div id="forumjump"><form action="redirectors/forumjump.php" method="post"></form></div
-        $_sel = '<select name="search_scope">';
-        $q = $C->prepare('SELECT category_id, category_name FROM ' . $SETTINGS['dbtableprefix'] . 'categories ORDER BY category_order ASC');

branches/5.0/classes/misc/Postform.php

@@ -119 +119 @@
-        }
-        $_col1 .= '</td>';
- wrap="virtual"
+
-        // poll choices
-        if ($show_orig === 'newpoll') {

branches/5.0/classes/pages/Category.php

@@ -101 +101 @@
-                        // get poster information
-                        $_poster = new Member($row5->poster, $row5->postedbymember);
-$LANG['by'] . ' ' . $_poster->getProfileLink() . '</div><div>' . $LANG['in'] . ' <a href="' . $F->link('topic') . 'id=' . $row5->topicid . '">' . $row5->topictitle . '</a
+'<div>' . $LANG['by'] . ' ' . $_poster->getProfileLink() . '</div><div>' . $LANG['in'] . ' <a href="' . $F->link('topic') . 'id=' . $row5->topicid . '">' . $row5->topictitle . '</a></div><div>' . $F->datetime($row5->posttime) . '</div
-                    }
-                    /* new posts since user's last visit;
@@ -126 +126 @@
-                    }
-                    // show forum overview
-<div>' . $_col4  . '</div><div>' . $F->datetime($row5->posttime) . '</div>
+' . $_col4  . '
-                }
-            }

branches/5.0/classes/pages/Page.php

@@ -244 +244 @@
-                $i = 0; $n = 0; $_str = '';
-                foreach ($rows as $row) {
-->onlinememberid
+['onlinememberid']
-                        // if it's a member
-                        if ($i !=0 ) {

branches/5.0/classes/pages/Topic.php

@@ -191 +191 @@
-            $this->html->body->addElement($_jump->get());
-            // moderation
-span id="moderation"><form action="' . $F->link('moderate') . 'id=' . $id . '" method="post"><select name="all"></select></form></span
+div id="moderation"><form action="' . $F->link('moderate') . 'id=' . $id . '" method="post"><select name="all"></select></form></div
-            // show ALL moderation options at all times; authentication is done later
-            $_opt = $_mod->form->select->addChild('option', $LANG['Edit_Title']);

branches/5.0/db/spamboard.sql

@@ -31 +31 @@
-  onlinetime INTEGER NOT NULL,
-  onlinesession VARCHAR(255) NOT NULL,
-
-
+
-);
-
@@ -49 +48 @@
-  poster VARCHAR(255) NOT NULL,
-  post TEXT NOT NULL,
-255
+16
-  attachment VARCHAR(255) NOT NULL,
-  postedbymember INTEGER NOT NULL,
-datetime
+DATETIME
-  editedby VARCHAR(255) DEFAULT NULL,
-datetime
+DATETIME
-  PRIMARY KEY  (postid)
-);
@@ -88 +87 @@
-  memberhomepage VARCHAR(255) NULL,
-  memberavatar VARCHAR(255) NOT NULL DEFAULT 'images/spacer.gif',
-TEXT
+VARCHAR(255)
-  memberstatus VARCHAR(255) NOT NULL,
-  memberposts INTEGER NOT NULL DEFAULT 0,

branches/5.0/includes/checklogin.php

@@ -31 +31 @@
-}
-// check if user should be allowed even to TRY logging in
-_COOKIE['sb_logins'] >= 3
+SETTINGS['loginattempts'] > 0 && $_COOKIE['sb_logins'] >= $SETTINGS['loginattempts']
-    exit;
-} else { // also check for sessions
-_SESSION['loginattempts'] >= 3
+SETTINGS['loginattempts'] > 0 && $_SESSION['loginattempts'] >= $SETTINGS['loginattempts']
-        exit;
-    } else { // finally, check with text log
@@ -46 +46 @@
-            $logindata = explode('|', $logins[$i]);
-            // IP of visitor matches entry?
-logindata[1] >= 3
+SETTINGS['loginattempts'] > 0 && $logindata[1] >= $SETTINGS['loginattempts']
-                $found = 1;
-            }
@@ -54 +54 @@
-            // blocked - copy information to cookie
-            $exp = time() + $SETTINGS['expire'] * 24 * 60 * 60;
-'3'
+$SETTINGS['loginattempts']
-        }
-    }

branches/5.0/includes/config/settings.tmpl

@@ -31 +31 @@
-$SETTINGS['floodcontrol'] = 30; // number of seconds someone has to wait between two posts
-$SETTINGS['floodcontrol_search'] = 15; // number of seconds someone has to wait between two searches
+$SETTINGS['loginattempts'] = 5; // number of failed login attempts by a user after which the board will try to lock him or her out for good (set to 0 to disable)
-$SETTINGS['maxuploadsize'] = 102400; // maximum file size of attachments in bytes
-$SETTINGS['uploadextensions'] = '.gif,.jpg,.jpeg,.bmp,.png,.zip,.rar,.ace,.7z,.txt,.rtf'; // allowed file extensions for attachments (seperated by commas)

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

branches/5.0/includes/input.php

@@ -573 +573 @@
-}
-
+$newloginattempts = $_POST['newloginattempts'];
+if (preg_match('/^[0-9]*$/', $newloginattempts) != 1) {
+    die($LANG['error_input']);
+}
+
-?>

branches/5.0/includes/js/js.js

@@ -76 +76 @@
-    // the textarea
-    var obj = document.getElementsByName('postform')[0].post;
-
+ !== false
-        // Gecko / Opera
-        var start = obj.selectionStart;
@@ -84 +84 @@
-        var pos = start + smiley.length;
-        obj.setSelectionRange(pos, pos);
-
+ !== false
-        // Internet Exploder (*choke*)
-        obj.focus();
@@ -98 +98 @@
-    // the textarea
-    var obj = document.getElementsByName('postform')[0].post;
-
+ !== false
-        // Gecko / Opera
-        var start = obj.selectionStart;
@@ -106 +106 @@
-        var pos = start + code.length + 2;
-        obj.setSelectionRange(pos, pos);
-
+ !== false
-        // Internet Exploder (*choke*)
-        obj.focus();

branches/5.0/includes/lang/de.php

@@ -84 +84 @@
-$LANG['members'] = 'Mitglieder';
-$LANG['and'] = 'und';
-keine
+-
-$LANG['Statistics'] = 'Statistiken';
-$LANG['Register'] = 'Anmelden';
@@ -306 +306 @@
-$LANG['Set_Permissions'] = 'Rechte setzen?';
-$LANG['IP_Logging'] = 'IP-Logging';
+$LANG['Login_Attempts'] = 'Erlaubte Loginversuche (0 = unendlich)';
-
-/* actual sentences */

branches/5.0/includes/lang/en.php

@@ -307 +307 @@
-$LANG['Set_Permissions'] = 'Set Permissions?';
-$LANG['IP_Logging'] = 'IP Logging';
+$LANG['Login_Attempts'] = 'Allowed Login Attempts (0 = infinite)';
-
-/* actual sentences */

branches/5.0/includes/styles/default.css

@@ -382 +382 @@
-    left:5%;
-    top:-1em;
+    display:inline;
-}
-
@@ -388 +389 @@
-    left:5%;
-    top:-0.8em;
+    display:inline;
-}
-

branches/5.0/install.php

@@ -152 +152 @@
-                    fwrite($file, "\$SETTINGS['floodcontrol'] = " . $SETTINGS['floodcontrol'] . "; // number of seconds someone has to wait between two posts\n");
-                    fwrite($file, "\$SETTINGS['floodcontrol_search'] = " . $SETTINGS['floodcontrol_search'] . "; // number of seconds someone has to wait between two searches\n");
+                    fwrite($file, "\$SETTINGS['loginattempts'] = " . $SETTINGS['loginattempts'] . "; // number of failed login attempts by a user after which the board will try to lock him or her out for good (set to 0 to disable)\n");
-                    fwrite($file, "\$SETTINGS['maxuploadsize'] = " . $SETTINGS['maxuploadsize'] . "; // maximum file size of attachments in bytes\n");
-                    fwrite($file, "\$SETTINGS['uploadextensions'] = '" . $SETTINGS['uploadextensions'] . "'; // allowed file extensions for attachments (seperated by commas)\n");