Changeset 24

Timestamp:

2007-11-23 15:36:28 (4 years ago)

Author:

hannes

Message:

• fixed links added to tree using addAttribute with mod_rewrite being disabled (ticket #9)
  
  • classes/misc/Format.php: new input variable for link
    
  • various pages where this occured: added TRUE to link method call
    
• set show=index as valid target
  
  • includes/input.php
    

Files:

• trunk/classes/misc/Format.php (modified) (2 diffs)
• trunk/classes/misc/Postbuttons.php (modified) (2 diffs)
• trunk/classes/misc/Postform.php (modified) (1 diff)
• trunk/classes/pages/Category.php (modified) (1 diff)
• trunk/classes/pages/Forum.php (modified) (1 diff)
• trunk/classes/pages/Members.php (modified) (1 diff)
• trunk/classes/pages/Messenger.php (modified) (1 diff)
• trunk/classes/pages/Page.php (modified) (1 diff)
• trunk/includes/input.php (modified) (1 diff)
• trunk/redirectors/forumjump.php (modified) (1 diff)

trunk/classes/misc/Format.php

@@ -295 +295 @@
-     * Description: link to another forum page using either short names via
-     *              mod_rewrite or longer ones if that module isn't available
-
-
+
+
+
+
-     * Returns:     complete query string
-     **/
-
+, $as_attr = FALSE
-        // get settings
-        global $SETTINGS;
@@ -307 +309 @@
-        } else {
-            // regular links
-
+
+
+
+
+
+
-        }
-    } /* function link */

trunk/classes/misc/Postbuttons.php

@@ -47 +47 @@
-                // topic not closed
-                $a = $this->html->addChild('a', $LANG['Reply']);
-
+, TRUE
-            } else {
-                // topic closed
@@ -57 +57 @@
-            // new topic
-            $a = $this->html->addChild('a', $LANG['New_Topic']);
-
+, TRUE
-            // new poll
-            if ($SETTINGS['polls'] == 1) {
-                $a = $this->html->addChild('a', $LANG['New_Poll']);
-
+, TRUE
-            }
-        }

trunk/classes/misc/Postform.php

@@ -118 +118 @@
-            // show shortcuts to common smileys and board code
-            $_col1 .= '<div id="posthelp"><a href="javascript:addSmiley(\':)\')"><img src="images/smilies/smile.gif" alt=":)" border="0" /></a><a href="javascript:addSmiley(\':(\')"><img src="images/smilies/sad.gif" alt=":(" border="0" /></a><a href="javascript:addSmiley(\';)\')"><img src="images/smilies/wink.gif" alt=";)" border="0" /></a><a href="javascript:addSmiley(\':angry:\')"><img src="images/smilies/angry.gif" alt=":angry:" border="0" /></a><a href="javascript:addSmiley(\':D\')"><img src="images/smilies/biggrin.gif" alt=":D" border="0" /></a><a href="javascript:addSmiley(\':o\')"><img src="images/smilies/shocked.gif" alt=":o" border="0" /></a><a href="javascript:addSmiley(\':P\')"><img src="images/smilies/tongue.gif" alt=":P" border="0" /></a><a href="javascript:addSmiley(\':embarassed:\')"><img src="images/smilies/embarassed.gif" alt=":embarassed:" border="0" /></a><br />'.
-
+?s=" . session_id() . "
-        }
-        $_col1 .= '</td>';

trunk/classes/pages/Category.php

@@ -129 +129 @@
-                $h2 = $this->html->body->addChild('h2');
-                $a = $h2->addChild('a', $row['category_name']);
-
+, TRUE
-                // add newly constructed forums table to parent node
-                $_table = $table->get();

trunk/classes/pages/Forum.php

@@ -74 +74 @@
-            $h2 = $this->html->body->addChild('h2');
-            $a = $h2->addChild('a', $row->forumtitle);
-
+, TRUE
-            // get topic information for the topic list
-            $q2 = $C->prepare('SELECT DISTINCT(p.topic) AS topicid, t.topictitle AS topictitle, COUNT(p.postid) AS posts, t.topic_views AS views, MAX(p.posttime) AS posttime, t.poll AS poll, t.pinned AS pinned FROM ' . $SETTINGS['dbtableprefix'] . 'posts p, ' . $SETTINGS['dbtableprefix'] . 'topics t WHERE t.forum=:forumid AND p.topic=t.topicid GROUP BY p.topic ORDER BY pinned DESC, posttime DESC LIMIT ' . $_start . ',' . $SETTINGS['topicsperpage']);

trunk/classes/pages/Members.php

@@ -111 +111 @@
-                    $_nonpostercount = $membercount - $_postercount;
-                    // define start and length of database query
-$start - $_postercount
+max($start - $_postercount, 0)
-                    $_num = $SETTINGS['topicsperpage'] - count($rows_ordered);
-                    // get the non-poster ids

trunk/classes/pages/Messenger.php

@@ -53 +53 @@
-        $div->addAttribute('align', 'center');
-        $a = $div->addChild('a', $LANG['Inbox']);
-
+, TRUE
-        $div->addChild('span', ' - ');
-        $a = $div->addChild('a', $LANG['Outbox']);
-
+, TRUE
-        $div->addChild('span', ' - ');
-        $a = $div->addChild('a', $LANG['Compose']);
-
+, TRUE
-        $div->addChild('span', ' - ');
-        $a = $div->addChild('a', $LANG['Address_Book']);
-
+, TRUE
-        $div->addChild('br');
-        $div->addChild('br');

trunk/classes/pages/Page.php

@@ -99 +99 @@
-                $div->addAttribute('id', 'admin_menu');
-                $a = $div->addChild('a', $LANG['Admin_Main']);
-
+, TRUE
-                $div->addChild('br');
-                $div->addChild('hr');
-                $a = $div->addChild('a', $LANG['Settings']);
-
+, TRUE
-                $div->addChild('br');
-                $a = $div->addChild('a', $LANG['Header']);
-
+, TRUE
-                $div->addChild('br');
-                $a = $div->addChild('a', $LANG['Footer']);
-
+, TRUE
-                $div->addChild('br');
-                $div->addChild('hr');
-                $a = $div->addChild('a', $LANG['Add_Category']);
-
+, TRUE
-                $div->addChild('br');
-                $a = $div->addChild('a', $LANG['Modify_Category']);
-
+, TRUE
-                $div->addChild('br');
-                $a = $div->addChild('a', $LANG['Delete_Category']);
-
+, TRUE
-                $div->addChild('br');
-                $div->addChild('hr');
-                $a = $div->addChild('a', $LANG['Add_Forum']);
-
+, TRUE
-                $div->addChild('br');
-                $a = $div->addChild('a', $LANG['Modify_Forum']);
-
+, TRUE
-                $div->addChild('br');
-                $a = $div->addChild('a', $LANG['Delete_Forum']);
-
+, TRUE
-                $div->addChild('br');
-                $a = $div->addChild('a', $LANG['Moderators']);
-
+, TRUE
-                $div->addChild('br');
-                $div->addChild('hr');
-                $a = $div->addChild('a', $LANG['Memberstages']);
-
+, TRUE
-                $div->addChild('br');
-                $a = $div->addChild('a', $LANG['User_Groups']);
-
+, TRUE
-                $div->addChild('br');
-                $a = $div->addChild('a', $LANG['Edit_Member']);
-
+, TRUE
-                $div->addChild('br');
-                $a = $div->addChild('a', $LANG['Banning']);
-
+, TRUE
-                $div->addChild('br');
-            }

trunk/includes/input.php

@@ -53 +53 @@
-// translate input variables to local names and check their integrity
-$show = $_GET['show'];
-
+ || $show == 'index'
-if (preg_match('/^[a-z]+$/', $show) != 1) { die($LANG['error_input']); }
-

trunk/redirectors/forumjump.php

@@ -59 +59 @@
-    session_start();
-    // forward to forum / category
-
+, TRUE
-    // just in case something went wrong with redirecting, print something
-    print(str_replace('%link%', '<a href="../' . $F->link(strtolower($_red[0])) . 'id='.$_red[1] . '&' . strip_tags(SID) . '">../' . $F->link(strtolower($_red[0])) . 'id=' . $_red[1] . '&' . strip_tags(SID) . '</a>', $LANG['redirection_problem']));