diff -ur forum-server/feed.php forum-server.new/feed.php --- forum-server/feed.php 2009-09-05 04:52:49.000000000 -0400 +++ forum-server.new/feed.php 2010-02-10 01:04:50.000000000 -0500 @@ -50,14 +50,14 @@ //$title = __("Topic:", "vasthtml")." ".$vasthtml->get_subject($post->parent_id); $title = $post->subject; echo "\n - " . htmlspecialchars($title) . "\n + " . stripslashes(htmlspecialchars($title)) . "\n ".htmlspecialchars($vasthtml->output_filter($post->text, ENT_NOQUOTES))."\n ".htmlspecialchars($link)."\n - feeds@r.us\n + ".$user->user_login."\n ".date("r", strtotime($post->date))."\n ".htmlspecialchars($link."&guid=$post->id")." \n\n"; } ?> - \ No newline at end of file + diff -ur forum-server/wpf.class.php forum-server.new/wpf.class.php --- forum-server/wpf.class.php 2009-09-05 04:52:49.000000000 -0400 +++ forum-server.new/wpf.class.php 2010-03-03 16:38:48.000000000 -0500 @@ -65,11 +65,11 @@ $this->login_link = $this->path."/wp-login.php?redirect_to=".PHP_SELF.""; $this->profile_link = $this->path."/wp-admin/profile.php"; - $this->thread_link = $this->path."/?page_id=$this->page_id&vasthtmlaction=showthread&thread"; + $this->thread_link = $this->path."/?page_id=$this->page_id&vasthtmlaction=showthread&thread"; - $this->profil_link = $this->path."/?page_id=$this->page_id&vasthtmlaction=showprofile&user"; - $this->search_link = $this->path."/?page_id=$this->page_id&vasthtmlaction=search&"; - $this->grouplogin_link = $this->path."/?page_id=$this->page_id&vasthtmlaction=grouplogin&group"; + $this->profil_link = $this->path."/?page_id=$this->page_id&vasthtmlaction=showprofile&user"; + $this->search_link = $this->path."/?page_id=$this->page_id&vasthtmlaction=search&"; + $this->grouplogin_link = $this->path."/?page_id=$this->page_id&vasthtmlaction=grouplogin&group"; $this->t_groups = $table_prefix."forum_groups"; $this->t_forums = $table_prefix."forum_forums"; @@ -120,11 +120,11 @@ // Add admin pages function add_admin_pages(){ add_menu_page('Forum Server', 'Forum Server', 8, 'forum-server/fs-admin/fs-admin.php', '', WPFURL."images/logo.png"); - add_submenu_page('forum-server/fs-admin/fs-admin.php', 'Skins', 'Skins', 8,"admin.php?page=forum-server/fs-admin/fs-admin.php&vasthtml_action=skins"); - add_submenu_page('forum-server/fs-admin/fs-admin.php', 'Categories & Forums', 'Categories & Forums', 8, "admin.php?page=forum-server/fs-admin/fs-admin.php&vasthtml_action=structure"); - add_submenu_page('forum-server/fs-admin/fs-admin.php', 'Moderators', 'Moderators', 8, "admin.php?page=forum-server/fs-admin/fs-admin.php&vasthtml_action=moderators"); - add_submenu_page('forum-server/fs-admin/fs-admin.php', 'User Groups', 'User Groups', 8, "admin.php?page=forum-server/fs-admin/fs-admin.php&vasthtml_action=usergroups"); - add_submenu_page('forum-server/fs-admin/fs-admin.php', 'About', 'About', 8, "admin.php?page=forum-server/fs-admin/fs-admin.php&vasthtml_action=about"); + add_submenu_page('forum-server/fs-admin/fs-admin.php', 'Skins', 'Skins', 8,"admin.php?page=forum-server/fs-admin/fs-admin.php&vasthtml_action=skins"); + add_submenu_page('forum-server/fs-admin/fs-admin.php', 'Categories & Forums', 'Categories & Forums', 8, "admin.php?page=forum-server/fs-admin/fs-admin.php&vasthtml_action=structure"); + add_submenu_page('forum-server/fs-admin/fs-admin.php', 'Moderators', 'Moderators', 8, "admin.php?page=forum-server/fs-admin/fs-admin.php&vasthtml_action=moderators"); + add_submenu_page('forum-server/fs-admin/fs-admin.php', 'User Groups', 'User Groups', 8, "admin.php?page=forum-server/fs-admin/fs-admin.php&vasthtml_action=usergroups"); + add_submenu_page('forum-server/fs-admin/fs-admin.php', 'About', 'About', 8, "admin.php?page=forum-server/fs-admin/fs-admin.php&vasthtml_action=about"); } // ... and some styling and meta @@ -226,14 +226,14 @@ if($wp_rewrite->using_permalinks()) $delim = "?"; else - $delim = "&"; + $delim = "&"; $perm = get_permalink($this->page_id); - $this->forum_link = $perm.$delim."vasthtmlaction=viewforum&f="; - $this->group_link = $perm.$delim."vasthtmlaction=vforum&g="; - $this->thread_link = $perm.$delim."vasthtmlaction=viewtopic&t="; - $this->add_topic_link = $perm.$delim."vasthtmlaction=addtopic&forum=$this->current_forum"; - $this->post_reply_link = $perm.$delim."vasthtmlaction=postreply&thread=$this->current_thread"; + $this->forum_link = $perm.$delim."vasthtmlaction=viewforum&f="; + $this->group_link = $perm.$delim."vasthtmlaction=vforum&g="; + $this->thread_link = $perm.$delim."vasthtmlaction=viewtopic&t="; + $this->add_topic_link = $perm.$delim."vasthtmlaction=addtopic&forum=$this->current_forum"; + $this->post_reply_link = $perm.$delim."vasthtmlaction=postreply&thread=$this->current_thread"; $this->base_url = $perm.$delim."vasthtmlaction="; $this->reg_link = $this->path."/wp-register.php?redirect_to="; $this->topic_feed_url = WPFURL."feed.php?topic="; @@ -247,14 +247,14 @@ if($wp_rewrite->using_permalinks()) $delim = "?"; else - $delim = "&"; + $delim = "&"; - $this->forum_link = $perm.$delim."vasthtmlaction=viewforum&f="; - $this->group_link = $perm.$delim."vasthtmlaction=vforum&g="; - $this->thread_link = $perm.$delim."vasthtmlaction=viewtopic&t="; - $this->add_topic_link = $perm.$delim."vasthtmlaction=addtopic&forum=$this->current_forum"; - $this->post_reply_link = $perm.$delim."vasthtmlaction=postreply&thread=$this->current_thread"; + $this->forum_link = $perm.$delim."vasthtmlaction=viewforum&f="; + $this->group_link = $perm.$delim."vasthtmlaction=vforum&g="; + $this->thread_link = $perm.$delim."vasthtmlaction=viewtopic&t="; + $this->add_topic_link = $perm.$delim."vasthtmlaction=addtopic&forum=$this->current_forum"; + $this->post_reply_link = $perm.$delim."vasthtmlaction=postreply&thread=$this->current_thread"; $this->base_url = $perm.$delim."vasthtmlaction="; $this->reg_link = $this->path."/wp-register.php?redirect_to="; $this->topic_feed_url = WPFURL."feed.php?topic="; @@ -276,7 +276,8 @@ return $this->group_link.$id.".$this->curr_page"; } function get_threadlink($id){ - return $this->thread_link.$id.".$this->curr_page"; + //return $this->thread_link.$id.".$this->curr_page"; + return $this->thread_link.$id.".0"; } function get_pageid(){ global $wpdb; @@ -434,6 +435,7 @@ $load "; + $this->o = str_replace('$', '\$', $this->o); return preg_replace('||', "
".$this->o."
", $content); } @@ -535,7 +537,7 @@ .$this->output_filter($thread->subject)."".$this->get_pagelinks($thread->id)."  $image $del ".$this->profile_link($thread->starter)." - ".$this->num_posts($thread->id)." + ".($this->num_posts($thread->id)-1)." ".$thread->views." ".$this->get_lastpost($thread->id)." "; @@ -568,7 +570,7 @@ .$this->output_filter($thread->subject)."".$this->get_pagelinks($thread->id)."  $image $del ".$this->profile_link($thread->starter)." - ".$this->num_posts($thread->id)." + ".($this->num_posts($thread->id)-1)." ".$thread->views." ".$this->get_lastpost($thread->id)." "; @@ -699,11 +701,11 @@ $image ".$this->get_postname($post_id)."
on: ".$this->get_postdate($post_id).""; if(is_user_logged_in()) - $o .= " ".__("Quote", "vasthtml").""; + $o .= " ".__("Quote", "vasthtml").""; if($this->is_moderator($user_ID, $this->current_forum) || $user_ID == $author_id) - $o .= " ".__("Remove", "vasthtml")." - " .__("Edit", "vasthtml").""; + $o .= " ".__("Remove", "vasthtml")." + " .__("Edit", "vasthtml").""; $o .= " "; @@ -988,20 +990,21 @@ // Some SEO friendly stuff function get_pagetitle($bef_title){ global $wpdb; - $default_title = " » "; + $default_title = " | "; switch($_GET['vasthtmlaction']){ case "viewforum": - $title = $default_title.$this->get_groupname($this->get_parent_id(FORUM, $this->check_parms($_GET['f'])))." » ".$this->get_forumname($this->check_parms($_GET['f'])); + $title = $default_title.$this->get_groupname($this->get_parent_id(FORUM, $this->check_parms($_GET['f'])))." | ".$this->get_forumname($this->check_parms($_GET['f'])); break; case "viewtopic": $group = $this->get_groupname($this->get_parent_id(FORUM, $this->get_parent_id(THREAD, $this->check_parms($_GET['t'])))); - $title = $default_title.$group." » ".$this->get_forumname($this->get_parent_id(THREAD, $this->check_parms($_GET['t'])))." » ".$this->get_threadname($this->check_parms($_GET['t'])); + //$title = $default_title.$group." | ".$this->get_forumname($this->get_parent_id(THREAD, $this->check_parms($_GET['t'])))." | ".$this->get_threadname($this->check_parms($_GET['t'])); + $title = $default_title.$group." | ".$this->get_threadname($this->check_parms($_GET['t'])); break; case "search": $terms = $wpdb->escape($_POST['wpf_search_string']); - $title = $default_title.__("Search Results", "vasthtml"). " » $terms"; + $title = $default_title.__("Search Results", "vasthtml"). " | $terms"; break; case "profile": $title = $default_title.__("Profile", "vasthtml").""; @@ -1240,14 +1243,14 @@ $class= "maintab"; if($this->is_moderator($user_ID, $this->current_forum)){ if($this->is_sticky()) - $stick = "".__("Unmark as Sticky", "vasthtml").""; + $stick = "".__("Unmark as Sticky", "vasthtml").""; else - $stick = "".__("Mark as sticky", "vasthtml").""; + $stick = "".__("Mark as sticky", "vasthtml").""; } $menu .= ""; $menu .= " - + $stick @@ -1260,7 +1263,7 @@ global $user_ID; $this->setup_links(); - $link = "".__("My Profile", "vasthtml").""; + $link = "".__("My Profile", "vasthtml").""; $menuitems = array( "home" => "".__("Home", "vasthtml")."", @@ -1270,8 +1273,8 @@ "reply" => "".__("Reply", "vasthtml")."", "new_topic" => "".__("New Topic", "vasthtml")."", "feed" => "".__("Feed", "vasthtml")."", - "sticky" => "".__("Mark as Sticky", "vasthtml")."", - "unsticky" => "".__("Unmark as sticky", "vasthtml")."" + "sticky" => "".__("Mark as Sticky", "vasthtml")."", + "unsticky" => "".__("Unmark as sticky", "vasthtml")."" ); if($user_ID || $this->allow_unreg()){ @@ -1414,13 +1417,13 @@ $trail = "Forum"; if($this->current_group) - $trail .= " »".$this->get_groupname($this->current_group).""; + $trail .= " »".$this->get_groupname($this->current_group).""; if($this->current_forum) - $trail .= " »".$this->get_forumname($this->current_forum).""; + $trail .= " »".$this->get_forumname($this->current_forum).""; if($this->current_thread) - $trail .= " »".$this->get_threadname($this->current_thread).""; + $trail .= " »".$this->get_threadname($this->current_thread).""; if($this->current_view == NEWTOPICS) $trail .= " » ".__("New Topics since last visit", "vasthtml"); @@ -1515,7 +1518,8 @@
  ".__("Reply", "vasthtml")."".__("Notify", "vasthtml")."".__("Notify", "vasthtml")." ".__("RSS feed", "vasthtml")."  
-
+ +
@@ -1686,7 +1690,7 @@ if($user_op['allow_profile'] == false) return $user; - $link = "$user"; + $link = "$user"; return $link; } @@ -1864,10 +1868,10 @@ $this->current_view = SEARCH; $this->header(); - if(!isset($_POST['search_submit'])){ + if(!isset($_GET['search_words'])){ $groups = $this->get_groups(); - $o .= "
+ $o .= "
@@ -1926,6 +1930,7 @@ + "; @@ -1933,13 +1938,13 @@ } else{ - $search_string = $wpdb->escape($_POST['search_words']); - $option_topics_only = $_POST['topics_only']; - $option_show_as_post = $_POST['show_messages']; - $option_user = $_POST['search_user']; - $option_min_days = $_POST['search_min']; - $option_max_days = $_POST['search_max']; - $option_forums = $_POST['forum']; + $search_string = $wpdb->escape($_GET['search_words']); + $option_topics_only = $_GET['topics_only']; + $option_show_as_post = $_GET['show_messages']; + $option_user = $_GET['search_user']; + $option_min_days = $_GET['search_min']; + $option_max_days = $_GET['search_max']; + $option_forums = $_GET['forum']; if(!$option_max_days) $option_max_days = 9999; $op .= " AND $this->t_posts.`date` > SUBDATE(CURDATE(), INTERVAL $option_max_days DAY) "; @@ -2118,4 +2123,4 @@ } // End class } // End -?> \ No newline at end of file +?> Only in forum-server.new/: .wpf.class.php.swp diff -ur forum-server/wpf-post.php forum-server.new/wpf-post.php --- forum-server/wpf-post.php 2009-09-05 04:52:49.000000000 -0400 +++ forum-server.new/wpf-post.php 2009-11-11 16:31:27.000000000 -0500 @@ -25,7 +25,7 @@ + @@ -69,7 +69,7 @@ +
".__("Search", "vasthtml")."
".__("Subject:", "vasthtml")." -
".__("Message:", "vasthtml")."
".__("Subject:", "vasthtml")." -
".__("Message:", "vasthtml")."