Changeset 189

Timestamp:

12/27/08 13:20:57 (3 years ago)

Author:

Nafania

Message:

--

Files:

• admin/index.php (modified) (1 diff)
• docleanup.php (modified) (2 diffs)
• include/details/download.php (modified) (1 diff)
• include/details/edit.php (modified) (2 diffs)
• include/functions_delete.php (modified) (2 diffs)
• include/global.php (modified) (1 diff)
• phpBB2/includes/functions_post.php (modified) (8 diffs)
• phpBB2/posting.php (modified) (14 diffs)
• phpBB2/search.php (modified) (1 diff)
• phpBB2/viewforum.php (modified) (1 diff)
• phpBB2/viewtopic.php (modified) (3 diffs)
• templates/bithdtv/forum/viewforum_body.tpl (modified) (2 diffs)
• templates/main/browse.html (modified) (1 diff)
• templates/main/forum/viewforum_body.tpl (modified) (2 diffs)
• templates/main/main.css (modified) (3 diffs)
• templates/main/ucp_body.html (modified) (1 diff)
• templates/main/ucp_checkcomm_body.html (modified) (1 diff)
• templates/reflection/forum/modcp_body.tpl (modified) (1 diff)
• templates/reflection/forum/search_results_topics.tpl (modified) (1 diff)
• templates/reflection/forum/viewforum_body.tpl (modified) (2 diffs)
• upload.php (modified) (3 diffs)

admin/index.php

@@ -265 +265 @@
-
-        $torrents_dir_size = 0;
-
+
+
+
-        if ($torrents_dir = @opendir($torrent_dir))
-        {

docleanup.php

@@ -73 +73 @@
-                $torrents[$row['fid']] = 1;
-        }
-
-
+
+
+
-                while ( ( $file = readdir($dp) ) !== false ) {
-config['torrent_dir']
+torrent_dir
-                                if ( !preg_match('/^(\d+)\.torrent$/', $file, $matches) ) {
-                                        $delete_files[] = $file;
@@ -91 +92 @@
-        if ( sizeof($delete_files) ) {
-                for ( $i = 0; $i < sizeof($delete_files); ++$i ) {
-config['torrent_dir']
+torrent_dir
-                        write_log('docleanup - ' . $delete_files[$i] . ' file deleted - not present in torrents table', LOG_VIEW_SYSOP);
-                }

include/details/download.php

@@ -23 +23 @@
-}
-
-config['torrent_dir'] = ( !empty( $config['torrent_dir'] ) ? $config['torrent_dir'] : $root_path . 'torrents' 
-config['torrent_dir']
+torrent_dir = $root_path . ( !empty($config['torrent_dir']) ? $config['torrent_dir'] : 'torrents'
+torrent_dir
-if ( !is_file( $fn ) || !is_readable( $fn ) ) {
-        trigger_error( $lang['error_reading_torrent_file'] );

include/details/edit.php

@@ -79 +79 @@
-                list( $tmpname, $infohash, $fname, $totallen, $filelist, $dname, $dict ) = check_torrent( $_FILES['file'] );
-
-
-
-
+
+
+
+
-                                $updateset[] = 'filename = ' . "'" . $db->sql_escape( $fname ) . "'";
-                                $updateset[] = 'size = ' . "'" . $db->sql_escape( $totallen ) . "'";
@@ -107 +108 @@
-                        }
-                }
-config['torrent_dir'] ) || !is_writable( $config['torrent_dir']
+torrent_dir ) || !is_writable( $torrent_dir
-                        trigger_error( $lang['dir_not_exist_or_not_writable'] );
-                }

include/functions_delete.php

@@ -3 +3 @@
-        global $config, $db, $root_path;
-
-config['torrent_dir'] = ( !empty($config['torrent_dir']) ? $config['torrent_dir'] : $root_path .
+torrent_dir = $root_path . ( !empty($config['torrent_dir']) ? $config['torrent_dir'] :
-        $ids = implode(',', $arr_ids) ;
-
@@ -43 +43 @@
-
-          foreach ( $arr_ids AS $_null => $id ) {
-config['torrent_dir']
+torrent_dir
-                  @unlink($root_path . 'cache/png/torrent_nfo_' . $id . '.png');
-          }

include/global.php

@@ -953 +953 @@
-                $length = $length - 3;
-                $words = preg_split("/[\s,]+/", $string, -1);
-=
+ = 
-                        if ( $mb_ch && mb_strlen($line . $words[$i] . ' ', $lang['language_charset']) < $length){
-                                $line .= $words[$i] . ' ';

phpBB2/includes/functions_post.php

@@ -39 +39 @@
-        // Clean up the message
-        //
-        $message = trim($message);
-
-        if ($html_on)
@@ -62 +61 @@
-                $message = str_replace('"', '\"', $message);
-        }
-
-
-
-
+//
+//
+//
+//
-
-        if($bbcode_on && $bbcode_uid != '')
@@ -149 +148 @@
-        $separator = str_replace("'", "''", $separator);
-
-$last_message
+htmlspecialchars($last_message)
-        $message = prepare_message($message, $last_html, $last_bbcode, $last_smilies, $last_bbcode_uid);
-
@@ -206 +205 @@
-        if (!empty($subject))
-        {
-htmlspecialchars(trim($subject)
+trim($subject
-        }
-        else if ($mode == 'newtopic' || ($mode == 'editpost' && $post_data['first_post']))
@@ -241 +240 @@
-                if (!empty($poll_title))
-                {
-htmlspecialchars(trim($poll_title)
+trim($poll_title
-                }
-
@@ -252 +251 @@
-                                if (!empty($option_text))
-                                {
-htmlspecialchars($option_text)
+$option_text
-                                }
-                        }
@@ -385 +384 @@
-                        if (!empty($option_text))
-                        {
-htmlspecialchars($option_text)
+$option_text
-                                $poll_result = ($mode == "editpost" && isset($old_poll_result[$option_id])) ? $old_poll_result[$option_id] : 0;
-
@@ -519 +518 @@
-        global $config, $lang, $db, $root_path, $phpEx;
-        global $userdata, $user_ip;
+
+        $forum_update_sql = '';
-
-        if ($mode != 'poll_delete')

phpBB2/posting.php

@@ -36 +36 @@
-//
-$params = array('submit' => 'post', 'preview' => 'preview', 'delete' => 'delete', 'poll_delete' => 'poll_delete', 'poll_add' => 'add_poll_option', 'poll_edit' => 'edit_poll_option', 'mode' => 'mode');
-
-
-
-
-
-
-
-
-
-
+
+
+
-}
-
-$confirm = isset($_POST['confirm']) ? true : false;
-(isset($_POST['sid'])) ? $_POST['sid'] : 0
+request_var('sid', '')
-
-$params = array('forum_id' => POST_FORUM_URL, 'topic_id' => POST_TOPIC_URL, 'post_id' => POST_POST_URL);
-
-
-
-
-
-
-
-
-
-
+
+
+
-}
-
@@ -70 +56 @@
-// Set topic type
-//
-( isset($_POST['topictype']) ) ? intval($_POST['topictype']) : POST_NORMAL
+request_var('topictype', POST_NORMAL)
-$topic_type = ( in_array($topic_type, array(POST_NORMAL, POST_STICKY, POST_ANNOUNCE)) ) ? $topic_type : POST_NORMAL;
-$post_data['topic_type'] = POST_NORMAL;
-
-//
@@ -220 +205 @@
-                }
-
-
-
-
+
+
+
+
+
+
-
-                $sql = "SELECT f.*, t.topic_id, t.topic_status, t.topic_type, t.topic_first_post_id, t.topic_last_post_id, t.topic_vote, p.post_id, p.poster_id" . $select_sql . "
@@ -236 +224 @@
-                return;
-}
-
-
+
+
+
-{
-        $db->sql_freeresult($result);
@@ -400 +389 @@
-else
-{
-!empty($_POST['disable_html']) ) ? 0 : TRUE
+isset($_POST['disable_html']) ) ? 0 : true
-}
-
@@ -409 +398 @@
-else
-{
-!empty($_POST['disable_bbcode']) ) ? 0 : TRUE
+isset($_POST['disable_bbcode']) ) ? 0 : true
-}
-
@@ -418 +407 @@
-else
-{
-!empty($_POST['disable_smilies']) ) ? 0 : TRUE
+isset($_POST['disable_smilies']) ) ? 0 : true
-}
-
-if ( ($submit || $refresh) && $is_auth['auth_read'])
-{
-!empty($_POST['notify']) ) ? TRUE
+isset($_POST['notify']) ) ? true
-}
-else
@@ -443 +432 @@
-        }
-}
-
+
+
+
+
+
-
-// --------------------
@@ -469 +462 @@
-                'MESSAGE_TEXT' => $l_confirm,
-
-                'L_YES' => $lang['yes'],
-                'L_NO' => $lang['no'],
-
-                //'S_CONFIRM_ACTION' => append_sid("posting.$phpEx"),
-                'S_CONFIRM_ACTION' => append_sid("phpbb2.php?page=posting"),
@@ -488 +478 @@
-        // Vote in a poll
-        //
-!empty
+isset
-        {
-                $vote_option_id = intval($_POST['vote_id']);
@@ -566 +556 @@
-                case 'newtopic':
-                case 'reply':
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                        $time2merge = intval($config['time_to_merge']) * 3600;
-
@@ -663 +654 @@
-if( $refresh || isset($_POST['del_poll_option']) || $error_msg != '' )
-{
-( !empty($_POST['username']) ) ? htmlspecialchars(trim($_POST['username'])) : ''
-( !empty($_POST['subject']) ) ? htmlspecialchars(trim($_POST['subject'])) : ''
-( !empty($_POST['message']) ) ? htmlspecialchars(trim($_POST['message'])) : ''
-
-( !empty($_POST['poll_title']) ) ? htmlspecialchars(trim($_POST['poll_title'])) : ''
-( isset($_POST['poll_length']) ) ? max(0, intval($_POST['poll_length'])) : 0
-
+request_var('username', '')
+request_var('subject', '')
+request_var('message', '')
+
+request_var('poll_title', '')
+request_var('poll_length', 0)
+
-        $poll_options = array();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -823 +811 @@
-                $subject = ( $post_data['first_post'] ) ? $post_info['topic_title'] : $post_info['post_subject'];
-                $message = $post_info['post_text'];
+                $username = '';
-
-                if ( $mode == 'editpost' )
@@ -858 +847 @@
-                if ( $mode == 'quote' )
-                {
-row
+_info
-
-                        // Use trim to get rid of spaces placed there by MS-SQL 2000

phpBB2/search.php

@@ -1302 +1302 @@
-                        'PAGE_NUMBER' => sprintf($lang['page_of'], ( floor( $start / $per_page ) + 1 ), ceil( $total_match_count / $per_page )),
-
-
+_
-                        // Topic search MOD
-                        'L_JUMP_TO_POST' => $lang['jump_to_post'],

phpBB2/viewforum.php

@@ -425 +425 @@
-        'FOLDER_ANNOUNCE_NEW_IMG' => $images['folder_announce_new'],
-
-        'L_TOPICS' => $lang['topics'],
-        'L_REPLIES' => $lang['replies'],
-        'L_VIEWS' => $lang['views'],
-        'L_POSTS' => $lang['posts'],
-        'L_LASTPOST' => $lang['last_post'],
-        'L_MODERATOR' => $l_moderators,
-        'L_MARK_TOPICS_READ' => $lang['mark_all_topics'],
-        'L_POST_NEW_TOPIC' => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['forum_locked'] : $lang['post_new_topic'],
-        'L_NO_NEW_POSTS' => $lang['no_new_posts'],
-        'L_NEW_POSTS' => $lang['new_posts'],
-        'L_NO_NEW_POSTS_LOCKED' => $lang['no_new_posts_locked'],
-        'L_NEW_POSTS_LOCKED' => $lang['new_posts_locked'],
-        'L_NO_NEW_POSTS_HOT' => $lang['no_new_posts_hot'],
-        'L_NEW_POSTS_HOT' => $lang['new_posts_hot'],
-        'L_ANNOUNCEMENT' => $lang['post_announcement'],
-        'L_STICKY' => $lang['post_sticky'],
-        'L_POSTED' => $lang['posted'],
-        'L_JOINED' => $lang['joined'],
-        'L_AUTHOR' => $lang['author'],
-        'L_SEARCH' => $lang['search'],
-        'L_SEARCH_IN_FORUM' => $lang['search_in_forum'],
-

phpBB2/viewtopic.php

@@ -71 +71 @@
-
-//
+// Start session management
+//
+$userdata = session_pagestart($user_ip);
+init_userprefs($userdata);
+//
+// End session management
+//
+
+//
-// Find topic id if user requested a newer
-// or older topic
@@ -79 +88 @@
-        {
-                        $sql = "SELECT p.post_id
-
-
-
-
-
+
+
+
-                                 ORDER BY p.post_time ASC
-                              LIMIT 1";
@@ -152 +159 @@
-
-$forum_id = intval($forum_topic_data['forum_id']);
-
-//
-// Start session management
-//
-$userdata = session_pagestart($user_ip, $forum_id);
-init_userprefs($userdata);
-//
-// End session management
-//
-
-if(!file_exists(@phpbb_realpath($root_path . 'languages/lang_' . $config['default_lang'] . '/lang_printertopic.'.$phpEx)))

templates/bithdtv/forum/viewforum_body.tpl

@@ -107 +107 @@
-                                <td>{L_NO_NEW_POSTS}</td>
-                                <td>&nbsp;&nbsp;</td>
-
+POST_
-                                <td>{L_POST_ANNOUNCEMENT}</td>
-                        </tr>
@@ -117 +117 @@
-                                <td>{L_NO_NEW_POSTS_HOT}</td>
-                                <td>&nbsp;&nbsp;</td>
-
+POST_
-                                <td>{L_POST_STICKY}</td>
-                        </tr>

templates/main/browse.html

@@ -8 +8 @@
-        <tr valign="top">
-                <!-- BEGIN cats_col -->
-
+
+
+
+
+
+
-                        <div style="padding-left:10px;display:<!-- IF cats_row.cats_col.OPEN_SUBCATS -->block<!-- ELSE -->none<!-- ENDIF -->;" id="k{cats_row.cats_col.CAT_ID}">
-                        <!-- BEGIN subcats_row -->

templates/main/forum/viewforum_body.tpl

@@ -107 +107 @@
-                                <td>{L_NO_NEW_POSTS}</td>
-                                <td>&nbsp;&nbsp;</td>
-
+POST_
-                                <td>{L_POST_ANNOUNCEMENT}</td>
-                        </tr>
@@ -117 +117 @@
-                                <td>{L_NO_NEW_POSTS_HOT}</td>
-                                <td>&nbsp;&nbsp;</td>
-
+POST_
-                                <td>{L_POST_STICKY}</td>
-                        </tr>

templates/main/main.css

@@ -88 +88 @@
-        padding: 0 10px 0 10px;
-        min-width: 960px;
-        max-width: 1280px;
-        margin: auto;
-}
@@ -296 +295 @@
-        border: solid 1px  #A9B8C2;
-        min-width: 570px;
-        max-width: 750px;
-        width:90%;
-}
@@ -316 +314 @@
-        font-family: Verdana, Arial, Helvetica, sans-serif;
-        font-size: 1.1em;
-
+       
-        background: none;
-        margin-bottom: 10px;
-        text-align:left;
-        background-color:#EFEFEF;
-
-
-
-
+
+
+
+
+
+
+
-        text-decoration: none;
-        line-height: 120%;
-        margin-top: 25px;
-
-
+
+
+
+
-ul.news {
-text-align:left;

templates/main/ucp_body.html

@@ -34 +34 @@
-                                <tr valign="top">
-                                <!-- BEGIN cats_col -->
-span class="nowrap"><input name="cats[{main_part.cats_row.cats_col.CAT_ID}]" type="checkbox" value="yes"{main_part.cats_row.cats_col.CHECKED} />&nbsp;<strong>{main_part.cats_row.cats_col.CAT_NAME}</strong></span
+input name="cats[{main_part.cats_row.cats_col.CAT_ID}]" type="checkbox" value="yes"{main_part.cats_row.cats_col.CHECKED} />&nbsp;<strong>{main_part.cats_row.cats_col.CAT_NAME}</strong
-                                                <!-- BEGIN subcats_row -->
-class="nowrap" 
+
-                                                <!-- END subcats_row -->
-                                        </td>

templates/main/ucp_checkcomm_body.html

@@ -7 +7 @@
-<!-- ELSE -->
-
-
+ width="100%" cellpadding="0" cellspacing="0"
-        <col class="col1" /><col class="col1" /><col class="col1" />
-        <thead>

templates/reflection/forum/modcp_body.tpl

@@ -20 +20 @@
-          <th nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
-          <th width="8%" nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
-
+_
-          <th width="5%" class="thRight" nowrap="nowrap">&nbsp;{L_SELECT}&nbsp;</th>
-        </tr>

templates/reflection/forum/search_results_topics.tpl

@@ -21 +21 @@
-        <th class="thTop" nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
-        <th class="thTop" nowrap="nowrap">&nbsp;{L_VIEWS}&nbsp;</th>
-
+_
-  </tr>
-  <!-- BEGIN searchresults -->

templates/reflection/forum/viewforum_body.tpl

@@ -107 +107 @@
-                                <td class="gensmall">{L_NO_NEW_POSTS}</td>
-                                <td>&nbsp;&nbsp;</td>
-
-
+POST_
+POST_
-                        </tr>
-                        <tr>
@@ -117 +117 @@
-                                <td class="gensmall">{L_NO_NEW_POSTS_HOT}</td>
-                                <td>&nbsp;&nbsp;</td>
-
-
+POST_
+POST_
-                        </tr>
-                        <tr>

upload.php

@@ -173 +173 @@
-
-                $id = $db->sql_nextid();
-
-
+
+
+
+
-
-                        $sql = 'INSERT INTO ' . COMMENTS_NOTIFY_TABLE . ' (checkcomm_userid, checkcomm_for_id, checkcomm_type) VALUES (' . $userdata['uid'] . ', ' . $id . ', ' . COMMENT_TYPE_TORRENT . ')';
@@ -187 +189 @@
-                        //private tracker start
-                        if ( !$private ) {
-config['torrent_dir']
+torrent_dir
-                         @fwrite($fp, benc($dict), strlen(benc($dict)));
-                         fclose($fp);
@@ -201 +203 @@
-                        $sql = 'DELETE FROM ' . TORRENTS_TABLE . ' WHERE fid = ' . $id;
-                        $db->sql_query($sql);
-config['torrent_dir']) || !is_writable($config['torrent_dir']
+torrent_dir) || !is_writable($torrent_dir
-                                trigger_error($lang['dir_not_exist_or_not_writable']);
-                        }