Continuation of non-breaking edits

admin/pagestart.php

@@ -11,8 +11,6 @@ define('BB_ROOT', './../');
 define('IN_ADMIN', true);
 
 require dirname(__DIR__) . '/common.php';
-require ATTACH_DIR . '/attachment_mod.php';
-require ATTACH_DIR . '/includes/functions_admin.php';
 
 $user->session_start();
 

ajax.php

@@ -25,14 +25,6 @@ switch ($ajax->action) {
     case 'post_mod_comment':
         require INC_DIR . '/bbcode.php';
         break;
-
-    case 'view_torrent':
-    case 'mod_action':
-    case 'change_tor_status':
-    case 'change_torrent':
-    case 'gen_passkey':
-        require ATTACH_DIR . '/attachment_mod.php';
-        break;
 }
 
 $ajax->exec();

callseed.php

@@ -8,11 +8,9 @@
  */
 
 define('BB_SCRIPT', 'callseed');
-define('BB_ROOT', './');
 require __DIR__ . '/common.php';
 
-// Init userdata
+$user->session_start(['req_login' => true]);
-$user->session_start(array('req_login' => true));
 
 $topic_id = (int)request_var('t', 0);
 $t_data = topic_info($topic_id);
@@ -49,7 +47,7 @@ $user_list = DB()->fetch_rowset("
 ");
 
 $subject = sprintf($lang['CALLSEED_SUBJECT'], $t_data['topic_title']);
-$message = sprintf($lang['CALLSEED_TEXT'], make_url(TOPIC_URL . $topic_id), $t_data['topic_title'], make_url(DL_URL . $t_data['attach_id']));
+$message = sprintf($lang['CALLSEED_TEXT'], make_url(TOPIC_URL . $topic_id), $t_data['topic_title'], make_url(DL_URL . $topic_id));
 
 if ($user_list) {
     foreach ($user_list as $row) {
@@ -65,7 +63,7 @@ if ($user_list) {
     send_pm($t_data['poster_id'], $subject, $message, BOT_UID);
 }
 
-DB()->query("UPDATE " . BB_BT_TORRENTS . " SET call_seed_time = " . TIMENOW . " WHERE topic_id = $topic_id");
+DB()->query("UPDATE " . BB_BT_TORRENTS . " SET call_seed_time = " . TIMENOW . " WHERE topic_id = $topic_id LIMIT 1");
 
 meta_refresh(TOPIC_URL . $topic_id);
 bb_die($lang['CALLSEED_MSG_OK']);

library/defines.php

@@ -25,7 +25,6 @@ define('CACHE_DIR', BB_PATH . '/internal_data/cache');
 define('LOG_DIR', BB_PATH . '/internal_data/log');
 define('TRIGGERS_DIR', BB_PATH . '/internal_data/triggers');
 define('AJAX_DIR', BB_PATH . '/library/ajax');
-define('ATTACH_DIR', BB_PATH . '/library/attach_mod');
 define('CFG_DIR', BB_PATH . '/library/config');
 define('INC_DIR', BB_PATH . '/library/includes');
 define('UCP_DIR', BB_PATH . '/library/includes/ucp');

library/includes/init_bb.php

@@ -137,9 +137,6 @@ define('TOPIC_UNLOCKED', 0);
 define('TOPIC_LOCKED', 1);
 define('TOPIC_MOVED', 2);
 
-define('TOPIC_WATCH_NOTIFIED', 1);
-define('TOPIC_WATCH_UNNOTIFIED', 0);
-
 // Topic types
 define('POST_NORMAL', 0);
 define('POST_STICKY', 1);
@@ -253,8 +250,6 @@ define('BB_POSTS_TEXT', 'bb_posts_text');
 define('BB_POSTS_HTML', 'bb_posts_html');
 define('BB_PRIVMSGS', 'bb_privmsgs');
 define('BB_PRIVMSGS_TEXT', 'bb_privmsgs_text');
-define('BB_QUOTA_LIMITS', 'bb_quota_limits');
-define('BB_QUOTA', 'bb_attach_quota');
 define('BB_RANKS', 'bb_ranks');
 define('BB_SEARCH_REBUILD', 'bb_search_rebuild');
 define('BB_SEARCH', 'bb_search_results');
@@ -262,7 +257,6 @@ define('BB_SESSIONS', 'bb_sessions');
 define('BB_SMILIES', 'bb_smilies');
 define('BB_TOPIC_TPL', 'bb_topic_tpl');
 define('BB_TOPICS', 'bb_topics');
-define('BB_TOPICS_WATCH', 'bb_topics_watch');
 define('BB_USER_GROUP', 'bb_user_group');
 define('BB_USERS', 'bb_users');
 define('BB_WORDS', 'bb_words');
@@ -347,21 +341,6 @@ function bb_exit($output = '')
     exit;
 }
 
-/**
- * @param $var
- * @param string $title
- * @param bool $print
- * @return string
- */
-function prn_r($var, $title = '', $print = true)
-{
-    $r = '<pre>' . ($title ? "<b>$title</b>\n\n" : '') . htmlspecialchars(print_r($var, true)) . '</pre>';
-    if ($print) {
-        echo $r;
-    }
-    return $r;
-}
-
 /**
  * @param $txt
  * @param bool $double_encode

modcp.php

@@ -8,7 +8,6 @@
  */
 
 define('BB_SCRIPT', 'modcp');
-define('BB_ROOT', './');
 require __DIR__ . '/common.php';
 require INC_DIR . '/bbcode.php';
 
@@ -347,7 +346,7 @@ switch ($mode) {
     case 'set_download':
     case 'unset_download':
         $set_download = ($mode == 'set_download');
-        $new_dl_type = ($set_download) ? TOPIC_DL_TYPE_DL : TOPIC_DL_TYPE_NORMAL;
+        $new_dl_type = $set_download ? TOPIC_DL_TYPE_DL : TOPIC_DL_TYPE_NORMAL;
 
         DB()->query("
 			UPDATE " . BB_TOPICS . " SET
@@ -455,16 +454,6 @@ switch ($mode) {
 
                 $new_topic_id = DB()->sql_nextid();
 
-                // Update topic watch table, switch users whose posts
-                // have moved, over to watching the new topic
-                $sql = "UPDATE " . BB_TOPICS_WATCH . "
-					SET topic_id = $new_topic_id
-					WHERE topic_id = $topic_id
-						AND user_id IN ($user_id_sql)";
-                if (!DB()->sql_query($sql)) {
-                    bb_die('Could not update topics watch table');
-                }
-
                 $sql_where = (!empty($_POST['split_type_beyond'])) ? " post_time >= $post_time AND topic_id = $topic_id" : "post_id IN ($post_id_sql)";
 
                 $sql = "UPDATE " . BB_POSTS . " SET topic_id = $new_topic_id, forum_id = $new_forum_id WHERE $sql_where";
@@ -596,7 +585,7 @@ switch ($mode) {
         $template->assign_vars(array(
             'TPL_MODCP_IP' => true,
             'IP' => $ip_this_post,
-            'U_LOOKUP_IP' => "modcp.php?mode=ip&" . POST_POST_URL . "=$post_id&" . POST_TOPIC_URL . "=$topic_id&rdns=$ip_this_post&sid=" . $userdata['session_id'],
+            'U_LOOKUP_IP' => "modcp.php?mode=ip&" . POST_POST_URL . "=$post_id&" . POST_TOPIC_URL . "=$topic_id&rdns=" . $ip_this_post,
         ));
 
         //
@@ -627,7 +616,7 @@ switch ($mode) {
                     'ROW_CLASS' => !($i % 2) ? 'row4' : 'row5',
                     'IP' => $ip,
                     'POSTS' => $row['postings'],
-                    'U_LOOKUP_IP' => "modcp.php?mode=ip&" . POST_POST_URL . "=$post_id&" . POST_TOPIC_URL . "=$topic_id&rdns=" . $row['poster_ip'] . "&sid=" . $userdata['session_id'],
+                    'U_LOOKUP_IP' => "modcp.php?mode=ip&" . POST_POST_URL . "=$post_id&" . POST_TOPIC_URL . "=$topic_id&rdns=" . $row['poster_ip'],
                 ));
 
                 $i++;

styles/templates/admin/admin_groups.tpl

@@ -3,7 +3,7 @@
 
 <h1>{L_GROUP_ADMINISTRATION}</h1>
 
-<form action="{S_GROUP_ACTION}" method="post" name="post">
+<form action="{S_GROUP_ACTION}" method="post">
 {S_HIDDEN_FIELDS}
 
 <table class="forumline wAuto">
@@ -51,14 +51,6 @@
 	<td>{L_GROUP_DELETE}:</td>
 	<td><input type="checkbox" name="group_delete" value="1"> {L_GROUP_DELETE_CHECK}</td>
 </tr>
-<tr>
-	<td>{L_UPLOAD_QUOTA}</td>
-	<td>{S_SELECT_UPLOAD_QUOTA}</td>
-</tr>
-<tr>
-	<td>{L_PM_QUOTA}</td>
-	<td>{S_SELECT_PM_QUOTA}</td>
-</tr>
 <!-- END group_edit -->
 <tr>
 	<td class="catBottom" colspan="2">

styles/templates/admin/admin_rebuild_search.tpl

@@ -126,7 +126,7 @@ function updateButton()
 {
 	if ( ticker >= 0)
 	{
-		if ( ticker == 0 )
+		if (ticker === 0)
 		{
 			document.form_rebuild_progress.submit_button.value = label;
 			document.form_rebuild_progress.submit_button.disabled = true;
@@ -134,8 +134,7 @@ function updateButton()
 		else
 		{
 			document.form_rebuild_progress.submit_button.value = label_next + " (" + ticker + ")";
-
+			ticker--;
-			ticker--;;
 			refresh = setTimeout("updateButton()", 1000);
 		}
 	}

styles/templates/default/index.tpl

@@ -1,7 +1,7 @@
 <!-- IF TORHELP_TOPICS -->
 	<!-- INCLUDE torhelp.tpl -->
 	<div class="spacer_6"></div>
-<!-- ENDIF -->
+<!-- ENDIF / TORHELP_TOPICS -->
 
 <div id="forums_list_wrap">
 
@@ -41,7 +41,7 @@
 	</tr>
 	</table>
 </div><!--/search-my-posts-->
-<!-- ENDIF -->
+  <!-- ENDIF / LOGGED_IN -->
 
 <img width="540" class="spacer" src="{SPACER}" alt="" />
 

styles/templates/default/tpl_config.php

@@ -94,8 +94,6 @@ $images['pm_new_msg'] = '';
 $images['pm_no_new_msg'] = '';
 
 // topic_mod_icons will be replaced with SELECT later...
-$images['topic_watch'] = '';
-$images['topic_un_watch'] = '';
 $images['topic_mod_lock'] = $_main . 'topic_lock.gif';
 $images['topic_mod_unlock'] = $_main . 'topic_unlock.gif';
 $images['topic_mod_split'] = $_main . 'topic_split.gif';

styles/templates/default/usercp_register.tpl

@@ -211,13 +211,6 @@ ajax.callback.posts = function(data){
 		<label><input type="radio" name="user_viewonline" value="0" <!-- IF not USER_VIEWONLINE -->checked="checked"<!-- ENDIF --> />{L_NO}</label>
 	</td>
 </tr>
-<tr>
-	<td class="prof-title">{L_ALWAYS_NOTIFY}:<br /><h6>{L_ALWAYS_NOTIFY_EXPLAIN}</h6></td>
-	<td>
-		<label><input type="radio" name="user_notify" value="1" <!-- IF USER_NOTIFY -->checked="checked"<!-- ENDIF --> />{L_YES}</label>&nbsp;&nbsp;
-		<label><input type="radio" name="user_notify" value="0" <!-- IF not USER_NOTIFY -->checked="checked"<!-- ENDIF --> />{L_NO}</label>
-	</td>
-</tr>
 <!-- IF $bb_cfg['pm_notify_enabled'] -->
 <tr>
 	<td class="prof-title">{L_NOTIFY_ON_PRIVMSG}:</td>

styles/templates/default/usercp_viewprofile.tpl

@@ -243,19 +243,18 @@ ajax.callback.gen_passkey = function(data){
 		<tr>
 			<th>{L_ICQ}:</th>
 			<td class="tLeft med" id="user_icq">
-				<span class="editable">{ICQ}
+				<span class="editable">
-					<a href="http://www.icq.com/people/{ICQ}"><img align="middle" src="http://web.icq.com/whitepages/online?icq={ICQ}&img=5"></a>
+					{ICQ}
 				</span>
 			</td>
 		</tr>
 		<!-- ENDIF -->
 		<!-- IF SKYPE -->
-		<script type="text/javascript" src="http://download.skype.com/share/skypebuttons/js/skypeCheck.js"></script>
 		<tr>
 			<th>{L_SKYPE}:</th>
 			<td class="tLeft med" id="user_skype">
-				<span class="editable">{SKYPE}
+				<span class="editable">
-					<a href="skype:{SKYPE}"><img align="middle" src="http://mystatus.skype.com/smallicon/{SKYPE}" width="16" height="16"></a>
+					{SKYPE}
 				</span>
 			</td>
 		</tr>
@@ -370,7 +369,6 @@ ajax.callback.gen_passkey = function(data){
 						[ <a href="{U_SEARCH_USER}" class="med">{L_SEARCH_USER_POSTS}</a> ]
 						[ <a href="{U_SEARCH_TOPICS}" class="med">{L_SEARCH_USER_TOPICS}</a> ]
 						[ <a href="{U_SEARCH_RELEASES}" class="med">{L_SEARCH_RELEASES}</a> ]
-						<!-- IF PROFILE_USER -->[ <a href="{U_WATCHED_TOPICS}" class="med">{L_WATCHED_TOPICS}</a> ]<!-- ENDIF -->
 						[ <a title="{L_ATOM_SUBSCRIBE}" href="#" onclick="return post2url('feed.php', {mode: 'get_feed_url', type: 'u', id: {PROFILE_USER_ID}})">{FEED_IMG}</a> ]
 					</p>
 				</td>

styles/templates/default/viewforum.tpl

@@ -478,7 +478,7 @@ td.topic_id { cursor: pointer; }
 	<!-- BEGIN tor -->
 		<div title="{L_DL_TORRENT}">
 			<div><span class="seedmed" title="Seeders"><b>{t.tor.SEEDERS}</b></span><span class="med"> | </span><span class="leechmed" title="Leechers"><b>{t.tor.LEECHERS}</b></span></div>
-			<div style="padding-top: 2px" class="small"><!-- IF t.TOR_FROZEN -->{t.tor.TOR_SIZE}<!-- ELSE --><a href="{DOWNLOAD_URL}{t.tor.ATTACH_ID}" class="small" style="text-decoration: none">{t.tor.TOR_SIZE}</a> <!-- IF MAGNET_LINKS -->{t.tor.MAGNET}<!-- ENDIF --><!-- ENDIF --></div>
+			<div style="padding-top: 2px" class="small"><!-- IF t.TOR_FROZEN -->{t.tor.TOR_SIZE}<!-- ELSE --><a href="{DOWNLOAD_URL}{t.TOPIC_ID}" class="small" style="text-decoration: none">{t.tor.TOR_SIZE}</a> <!-- IF MAGNET_LINKS -->{t.tor.MAGNET}<!-- ENDIF --><!-- ENDIF --></div>
 		</div>
 	<!-- END tor -->
 	</td>