Changeset 241

Timestamp:

04/24/09 15:45:32 (3 years ago)

Author:

Nafania

Message:

Пофиксен баг из этого поста http://tbdevsz.ru/post3464.html#p3464
Функции хедера и футера убраны в общии функции (зачем каждый раз инклудить одни и те же файлы).
global.php переименован в functions.php (ибо так все же правильнее).
Мелкие фиксы.

Files:

• admin/admin_news.php (modified) (2 diffs)
• announce.php (modified) (3 diffs)
• bookmarks.php (modified) (1 diff)
• browse.php (modified) (1 diff)
• chat.php (modified) (1 diff)
• cheaters.php (modified) (1 diff)
• comment.php (modified) (2 diffs)
• db_updater.php (modified) (1 diff)
• details.php (modified) (1 diff)
• donate.php (modified) (1 diff)
• faq.php (modified) (1 diff)
• getrss.php (modified) (4 diffs)
• helpdesk.php (modified) (1 diff)
• include/benc.php (modified) (2 diffs)
• include/config.php (modified) (2 diffs)
• include/functions.php (added)
• include/functions_delete.php (modified) (1 diff)
• include/global.php (deleted)
• include/overall_footer.php (deleted)
• include/overall_header.php (deleted)
• include/sessions.php (modified) (1 diff)
• index.php (modified) (1 diff)
• log.php (modified) (1 diff)
• login.php (modified) (1 diff)
• message.php (modified) (1 diff)
• modtask.php (modified) (1 diff)
• my.php (modified) (1 diff)
• news.php (modified) (1 diff)
• offers.php (modified) (1 diff)
• phpBB2/index.php (modified) (2 diffs)
• phpBB2/viewtopic.php (modified) (1 diff)
• phpbb2.php (modified) (1 diff)
• releases.php (modified) (1 diff)
• reports.php (modified) (1 diff)
• requests.php (modified) (1 diff)
• rules.php (modified) (1 diff)
• scrape.php (modified) (4 diffs)
• signup.php (modified) (1 diff)
• simpaty.php (modified) (1 diff)
• staff.php (modified) (1 diff)
• tags.php (modified) (1 diff)
• templates/main/overall_header.html (modified) (2 diffs)
• topten.php (modified) (1 diff)
• upload.php (modified) (1 diff)
• uploadapp.php (modified) (1 diff)
• userdetails.php (modified) (1 diff)
• users.php (modified) (1 diff)
• usersearch.php (modified) (1 diff)

admin/admin_news.php

@@ -21 +21 @@
-        $confirm = isset($_POST['confirm']);
-        $cancel = isset($_POST['cancel']);
+        $id = request_var('id', 0);
-
-        if ( $confirm ) {
-$newsid = ( isset($_POST['id']) ? intval($_POST['id']) : 0 
-
-               $db->sql_query($sql
+require($root_path . 'include/functions_delete.php'
+
+               delete_news($id
-
-                $cache->destroy('sql', NEWS_TABLE);
@@ -33 +34 @@
-     }
-     elseif ( !$cancel ) {
-                $newsid = ( isset($_GET['id']) ? intval($_GET['id']) : 0 );
-                $template->set_filenames(array(
-                  'body' => '../admin/confirm_body.tpl')
-          );
-
-news
+
-
-          $template->assign_vars(array(

announce.php

@@ -2 +2 @@
-define('IN_ANNOUNCE', true);
-$root_path = './';
-
-
-@include
+ 
+ 
+require 
-
-
@@ -314 +314 @@
-        }
-        else {
-             $error = $db->sql_error();
-                if ( $error['code'] == 1062 ) { //we have unique key in database at fid-uid-ip rows
-                        err('You can\'t leech or seed one torrent from one IP more than one time');
-                }
-                err('Insert peers error');
-        }
@@ -466 +462 @@
-}
-benc_resp_raw($resp);
-if ( !empty($cache) ) {
-        $cache->unload();
-}
-if ( !empty($db) ) {
-        $db->sql_close();
-}
-exit();
-?>

bookmarks.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
+
+
-
-$userdata = session_pagestart($user_ip);

browse.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
-
-
+
+
+
+
-
-$userdata = session_pagestart($user_ip);

chat.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
+
-
-$userdata = session_pagestart($user_ip);

cheaters.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
+
+
+
-$userdata = session_pagestart($user_ip);
-init_userprefs($userdata);

comment.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
+
+
-
-$userdata = session_pagestart($user_ip);
@@ -219 +217 @@
-
-                        case TYPE_NEWS:
-
+ AS name
-                                $from = NEWS_TABLE . ' n';
-                                $where = 'c.comment_for_id = n.id';

db_updater.php

@@ -5 +5 @@
-
-$root_path = './';
-
-
-
+
-
-$userdata = session_pagestart($user_ip);

details.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
-
+
+
+
-
-$userdata = session_pagestart( $user_ip );

donate.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
+
-
-$userdata = session_pagestart($user_ip);

faq.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
+
-
-$userdata = session_pagestart($user_ip);

getrss.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
+
+
-$userdata = session_pagestart($user_ip);
-init_userprefs($userdata);
@@ -13 +12 @@
-        $login_type = request_var('login', '');
-        $feed = request_var('feed', '');
+        $cat = request_var('cat', array( 0 => 0 ) );
-        if ( $feed == 'dl' ) {
-                $query[] = 'feed=dl';
-     }
-
-isset($_POST['cat']
-sizeof($_POST['cat'])
-_POST['cat']
-               
-     
+$sizeof_cat = sizeof($cat
+$sizeof_cat
+cat
+            
+       
-        else {
-                trigger_error($lang['you_must_select_category']);
@@ -56 +56 @@
-                                $selected =  (strpos($userdata['notifs'], '[cat' . $cat_id . ']') !== false ? ' checked="checked"' : '');
-                                $catoptions .= ' --> <input type="checkbox" name="cat[]" value="' . $key . '"' . $selected . ' /> ' . $value. "<br />\n";
-                                //$select .= '<option value="' . $key . '"' . $selected . '> --> ' . $value . '</option>' . "\n";
-                        }
-                }
@@ -62 +61 @@
-
-     $template->assign_vars(array(
-          
-     'S_FORM_ACTION' => append_sid('getrss.php') 
-
+       
+'S_FORM_ACTION' => append_sid('getrss.php'
+)
-
-        stdhead($lang['rss']);

helpdesk.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
+
+
-
-$userdata = session_pagestart($user_ip);

include/benc.php

@@ -212 +212 @@
-}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if ( !empty($cache) ) {
@@ -223 +245 @@
-                $db->sql_close();
-        }
-
-        exit();
-}
-
-function benc_resp($d) {
-        benc_resp_raw(benc(array('type' => 'dictionary', 'value' => $d)));
-}
-
-function benc_resp_raw($x) {
-        if ($_SERVER['HTTP_ACCEPT_ENCODING'] == 'gzip') {
-                header('Content-Encoding: gzip');
-                $x = gzencode($x, 9, FORCE_GZIP);
-        }
-        header('Content-Type: text/plain');
-        header('Pragma: no-cache');
-        header('Cache-Control: no-cache, must-revalidate'); // HTTP/1.1
-        header('Expires: Mon, 26 Jul 1997 05:00:00 +0400'); // Date in the past
-        echo $x;
-}
-

include/config.php

@@ -114 +114 @@
-//we don't include some scripts when we are in announce
-if ( !defined('IN_ANNOUNCE') ) {
-global
+functions
-        require_once($root_path . 'include/functions_utf.php');
-        set_error_handler('msg_handler');
@@ -154 +154 @@
-
-//start determine user ip
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-}
-else {
-
-
-
-
-
-
-
-
-
+
-}
-$user_ip = implode('.', array_slice(explode('.', $user_ip), 0, 4));

include/functions_delete.php

@@ -221 +221 @@
-        return;
-}
+
+function delete_news ( $id ) {
+        $sql = 'DELETE FROM ' . NEWS_TABLE . ' WHERE id = ' . $id;
+     $db->sql_query($sql);
+        $sql = 'DELETE FROM ' . COMMENTS_TABLE . ' WHERE comment_for_id = ' . $id . ' AND comment_type = ' . TYPE_NEWS;
+        $db->sql_query($sql);
+        $sql = 'DELETE FROM ' . COMMENTS_NOTIFY_TABLE . ' WHERE checkcomm_for_id = ' . $id . ' AND checkcomm_type = ' . TYPE_NEWS;
+        $db->sql_query($sql);
+}
-?>

include/sessions.php

@@ -934 +934 @@
-{
-        global $SID, $_EXTRA_URL;
+        global $seo;
+
+        if (!empty($seo->seo_opt['url_rewrite'])) {
+                return $seo->url_rewrite($url, $params, $is_amp, $session_id);
+        }
-
-        // Assign sid if session id is not specified

index.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
+
+
-
-$userdata = session_pagestart($user_ip);

log.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
-
+
+
+
+
-$userdata = session_pagestart($user_ip);
-init_userprefs($userdata);

login.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
+
-
-$userdata = session_pagestart($user_ip);

message.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
-
-
+
+
+
+
-
-$userdata = session_pagestart($user_ip);

modtask.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
-
-
-
+
+
+
+
+
-
-$userdata = session_pagestart($user_ip);

my.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
+
+
-
-$userdata = session_pagestart($user_ip);

news.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
+
+
-
-$userdata = session_pagestart($user_ip);

offers.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
-
-
+
+
+
+
-
-$userdata = session_pagestart($user_ip);

phpBB2/index.php

@@ -257 +257 @@
-        //
-        define('SHOW_ONLINE', true);
-        $page_title = $lang['index'];
-
-        $online_time = ( $config['online_time'] > 60 ) ? round($config['online_time'] / 60 ) : 1;
@@ -589 +588 @@
-// Generate the page
-//
- . ( isset($page_title) ? ' :: ' . $page_title : '' )
+
-
-$template->set_filenames(array(

phpBB2/viewtopic.php

@@ -585 +585 @@
-// Output page header
-//
-lang['view_topic'] .' - ' . $
+
-if(isset($_GET['printertopic']))
-{

phpbb2.php

@@ -3 +3 @@
-$root_path = './';
-require ($root_path . 'include/config.php');
-@include ($root_path . 'include/overall_header.php');
-@include ($root_path . 'include/overall_footer.php');
-
-( isset($_GET['page']) ? htmlspecialchars($_GET['page']) : '' 
-( isset($_GET['mode']) ? htmlspecialchars($_GET['mode']) : '' 
+request_var('page', ''
+request_var('mode', ''
-
-switch ($page)

releases.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
+ 
-require ($root_path . 'include/functions_post.php');
-
-
-
+
+
-$userdata = session_pagestart($user_ip);
-init_userprefs($userdata);

reports.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
+
-
-$userdata = session_pagestart($user_ip);

requests.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
-
-
+
+
+
+
-
-$userdata = session_pagestart($user_ip);

rules.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
+
+
-$userdata = session_pagestart($user_ip);
-init_userprefs($userdata);

scrape.php

@@ -2 +2 @@
-define('IN_ANNOUNCE', true);
-$root_path = './';
-
+ 
-require ($root_path . 'include/benc.php');
-
@@ -18 +18 @@
-}
-
-($result = $db->sql_query($sql)
+$result = $db->sql_query($sql
-        err('scrape sql error');
-}
@@ -24 +24 @@
-if ( $row = $db->sql_fetchrow($result) ) {
-        $r = 'd' . benc_str('files') . 'd';
-        
-               
-                      
-       
-       
-       
-   
-   
-   
-        
+       
+            
+                       
+
+
+
+
+
+
+       
-}
-else {
@@ -39 +39 @@
-}
-$db->sql_freeresult($result);
-
-benc_resp_raw($r);
-
-if ( !empty($cache) ) {
-        $cache->unload();
-}
-if ( !empty($db) ) {
-        $db->sql_close();
-}
-exit();
-?>

signup.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
-
+
+
+
-
-$userdata = session_pagestart($user_ip);

simpaty.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
+
-
-$userdata = session_pagestart($user_ip);
-init_userprefs($userdata);
-loggedinorreturn();
-
-/*
-types
-1 - comment
-2 - torrent
-3 - request
-4 - offer
-5 - forum post
-*/
-
-$template->set_filenames(array(

staff.php

@@ -2 +2 @@
-$root_path = './';
-require ($root_path . 'include/config.php');
-
-
+
-$userdata = session_pagestart($user_ip);
-init_userprefs($userdata);

tags.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
+
+
-
-$userdata = session_pagestart($user_ip);

templates/main/overall_header.html

@@ -49 +49 @@
-                <div id="tabs">
-                        <ul>
-PHP -->echo (strpos($_SERVER['PHP_SELF'], 'index')?' id="activetab"':'');<!-- ENDPHP
-PHP -->echo (strpos($_SERVER['PHP_SELF'], 'browse')?' id="activetab"':'');<!-- ENDPHP
+IF CURRENT_PAGE == U_INDEX --> id="activetab"<!-- ENDIF
+IF CURRENT_PAGE == U_BROWSE --> id="activetab"<!-- ENDIF
-                                <!-- BEGIN switch_non_uploader_view -->
-PHP -->echo (strpos($_SERVER['PHP_SELF'], 'uploadapp')?' id="activetab"':'');<!-- ENDPHP
+IF CURRENT_PAGE == U_UPLOADAPP --> id="activetab"<!-- ENDIF
-                                <!-- END switch_non_uploader_view -->
-                                <!-- BEGIN switch_uploader_view -->
-PHP -->echo (strpos($_SERVER['PHP_SELF'], 'upload.php')?' id="activetab"':'');<!-- ENDPHP
+IF CURRENT_PAGE == U_UPLOAD --> id="activetab"<!-- ENDIF
-                                <!-- END switch_uploader_view -->
-                                <!-- BEGIN switch_non_curuser_view -->
-PHP -->echo (strpos($_SERVER['PHP_SELF'], 'login')?' id="activetab"':'');<!-- ENDPHP
-PHP -->echo (strpos($_SERVER['PHP_SELF'], 'signup')?' id="activetab"':'');<!-- ENDPHP
+IF CURRENT_PAGE == U_LOGIN --> id="activetab"<!-- ENDIF
+IF CURRENT_PAGE == U_SIGNUP --> id="activetab"<!-- ENDIF
-                                <!-- END switch_non_curuser_view -->
-PHP -->echo (strpos($_SERVER['PHP_SELF'], 'phpbb2')?' id="activetab"':'');<!-- ENDPHP
-PHP -->echo (strpos($_SERVER['PHP_SELF'], 'rules')?' id="activetab"':'');<!-- ENDPHP
-PHP -->echo (strpos($_SERVER['PHP_SELF'], 'faq')?' id="activetab"':'');<!-- ENDPHP
+IF CURRENT_PAGE == U_FORUM --> id="activetab"<!-- ENDIF
+IF CURRENT_PAGE == U_RULES --> id="activetab"<!-- ENDIF
+IF CURRENT_PAGE == U_FAQ --> id="activetab"<!-- ENDIF
-                                <!-- BEGIN switch_curuser_view -->
-PHP -->echo (strpos($_SERVER['PHP_SELF'], 'helpdesk.php')?' id="activetab"':'');<!-- ENDPHP
+IF CURRENT_PAGE == U_HELPDESC --> id="activetab"<!-- ENDIF
-                                <!-- END switch_curuser_view -->
-PHP -->echo (strpos($_SERVER['PHP_SELF'], 'staff.php')?' id="activetab"':'');<!-- ENDPHP
+IF CURRENT_PAGE == U_STAFF --> id="activetab"<!-- ENDIF
-                        </ul>
-                </div>
@@ -78 +78 @@
-                                                <ul>
-                                                        <!-- BEGIN switch_curuser_view -->
+
-                                                        <li class="header">{L_TORRENTS}</li>
-
-
-
-
+
+
+
+
+
-                                                        <!-- END switch_curuser_view -->
+
-                                                        <!-- BEGIN switch_non_uploader_view -->
-
+
+
+
-                                                        <!-- END switch_non_uploader_view -->
+
-                                                        <!-- BEGIN switch_uploader_view -->
-
+
+
+
-                                                        <!-- END switch_uploader_view -->
+
-                                                        <li class="header">{L_COMMUNITY}</li>
-
-
-
-
+
+
+
+
+
-                                                        <!-- BEGIN switch_curuser_view -->
+
-                                                        <li class="header">{L_PERSONAL}</li>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                                        <!-- END switch_curuser_view -->
+
-                                                        <li class="header">{L_OTHER}</li>
-PHP -->echo (strpos($_SERVER['PHP_SELF'], 'getrss')?' id="activemenu"':'');<!-- ENDPHP
-PHP -->echo (strpos($_SERVER['PHP_SELF'], 'donate')?' id="activemenu"':'');<!-- ENDPHP
+IF CURRENT_PAGE == U_GETRSS --> id="activemenu"<!-- ENDIF
+IF CURRENT_PAGE == U_DONATE --> id="activemenu"<!-- ENDIF
-                                                        <li class="header">{L_RULES}</li>
-PHP -->echo (strpos($_SERVER['PHP_SELF'], 'faq')?' id="activemenu"':'');<!-- ENDPHP
-PHP -->echo (strpos($_SERVER['PHP_SELF'], 'rules')?' id="activemenu"':'');<!-- ENDPHP
+IF CURRENT_PAGE == U_FAQ --> id="activemenu"<!-- ENDIF
+IF CURRENT_PAGE == U_RULES --> id="activemenu"<!-- ENDIF
-                                                        <li class="header">{L_STAFF}</li>
-
-
+
+
+
-                                                        <!-- BEGIN switch_moderator_view -->
-
-
-
-
+
+
+
+
+
+
-                                                        <!-- END switch_moderator_view -->
+
-                                                        <!-- BEGIN switch_admin_view -->
-
+
+
+
-                                                        <!-- END switch_admin_view -->
+
-                                                        <!-- BEGIN switch_sysop_view -->
-
+
+
+
-                                                        <!-- END switch_sysop_view -->
-                                                </ul>

topten.php

@@ -2 +2 @@
-$root_path = './';
-require ($root_path . 'include/config.php');
-
-
+
-$userdata = session_pagestart($user_ip);
-init_userprefs($userdata);

upload.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-$userdata = session_pagestart($user_ip);

uploadapp.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
-
+
+
+
-
-$userdata = session_pagestart($user_ip);

userdetails.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
-
-
+
+
+
-
-$userdata = session_pagestart( $user_ip );

users.php

@@ -1 +1 @@
-<?php
-$root_path = './';
-
-
-
+
-
-$userdata = session_pagestart($user_ip);

usersearch.php

@@ -4 +4 @@
-require ($root_path . 'include/functions_check.php');
-require ($root_path . 'include/functions_selects.php');
-@include ($root_path . 'include/overall_header.php');
-@include ($root_path . 'include/overall_footer.php');
-
-$userdata = session_pagestart($user_ip);