From 5174beaf5caba0b81e025e0d3e09b8866fb65b74 Mon Sep 17 00:00:00 2001
From: pherum83 <pherum83@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Tue, 21 Feb 2012 21:54:51 +0000
Subject: [PATCH] r376

 git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@376 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/ajax/manage_user.php                   |  2 +-
 upload/ajax/mod_action.php                    | 17 ++++++--
 upload/common.php                             | 13 ++++++
 upload/config.php                             |  4 +-
 upload/includes/functions.php                 | 42 +++++++++----------
 .../language/lang_english/lang_admin_bt.php   |  2 +-
 upload/language/lang_english/lang_main.php    |  2 +-
 .../language/lang_russian/lang_admin_bt.php   |  2 +-
 .../language/lang_russian/lang_log_action.php |  2 +-
 upload/language/lang_russian/lang_main.php    |  2 +-
 upload/templates/admin/admin_bt_forum_cfg.tpl |  2 +-
 .../templates/default/viewtopic_torrent.tpl   |  2 +-
 12 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/upload/ajax/manage_user.php b/upload/ajax/manage_user.php
index 937130020..936a1362c 100644
--- a/upload/ajax/manage_user.php
+++ b/upload/ajax/manage_user.php
@@ -15,8 +15,8 @@ switch($mode)
 
 		if ($user_id != BOT_UID)
         {
-	        user_delete($user_id);
 	        delete_user_sessions($user_id);
+			user_delete($user_id);
 
 	        $this->response['info'] = $lang['USER_DELETED'];
         }
diff --git a/upload/ajax/mod_action.php b/upload/ajax/mod_action.php
index 2da57c3e7..891c8d7f4 100644
--- a/upload/ajax/mod_action.php
+++ b/upload/ajax/mod_action.php
@@ -102,6 +102,16 @@ switch ($mode)
 			}
 		}
 		
+		if ($profiledata['user_level'] == ADMIN && !IS_ADMIN) $reg_ip = $last_ip = $lang['HIDDEN'];
+		elseif ($profiledata['user_level'] == MOD && IS_MOD)  $reg_ip = $last_ip = $lang['HIDDEN'];
+		else
+		{
+			$user_reg_ip  = decode_ip($profiledata['user_reg_ip']);
+			$user_last_ip = decode_ip($profiledata['user_last_ip']);
+			$reg_ip  = '<a href="'. $bb_cfg['whois_info'] . $user_reg_ip .'" class="gen" target="_blank">'. $user_reg_ip .'</a>';
+			$last_ip = '<a href="'. $bb_cfg['whois_info'] . $user_last_ip .'" class="gen" target="_blank">'. $user_last_ip .'</a>';
+		}
+		
 		$this->response['ip_list_html'] = '
 		    <style type="text/css">
 			table.mod_ip    { background: #F9F9F9; border: 1px solid #A5AFB4; border-collapse: separate;}
@@ -111,14 +121,15 @@ switch ($mode)
 			<br /><table class="mod_ip bCenter borderless" cellspacing="1">
                 <tr class="row5" >
 					<td>'. $lang['REG_IP'] .'</td>
-					<td class="tCenter"><a href="'. $bb_cfg['whois_info'] . decode_ip($profiledata['user_reg_ip']).'" class="gen" target="_blank">'.decode_ip($profiledata['user_reg_ip']).'</a></td>
+					<td class="tCenter">'. $reg_ip .'</td>
 					<td><div>'. $link_reg_ip .'</div></td>
 				</tr>
                 <tr class="row4">
 					<td>'. $lang['LAST_IP'] .'</td>
-					<td class="tCenter"><a href="'. $bb_cfg['whois_info'] . decode_ip($profiledata['user_last_ip']).'" class="gen" target="_blank">'.decode_ip($profiledata['user_last_ip']).'</a></td>
+					<td class="tCenter">'. $last_ip .'</td>
 					<td><div>'. $link_last_ip .'</div></td>
 				</tr>
-            </table><br />';
+            </table><br />
+		';
 	break;	
 }
diff --git a/upload/common.php b/upload/common.php
index ba308b5eb..26c74eb4c 100644
--- a/upload/common.php
+++ b/upload/common.php
@@ -157,6 +157,19 @@ class CACHES
 						$this->ref[$cache_name] =& $this->obj[$cache_name];
 						break;
 
+                    case 'db_sqlite':
+						if (!isset($this->obj[$cache_name]))
+						{
+							$cache_cfg['pconnect']     = $this->cfg['pconnect'];
+							$cache_cfg['db_file_path'] = $this->get_db_path($cache_name, $cache_cfg, '.sqlite.db');
+							$cache_cfg['table_name']   = $cache_name;
+							$cache_cfg['table_schema'] = $this->get_table_schema($cache_cfg);
+
+							$this->obj[$cache_name] = new sqlite_common($cache_cfg);
+						}
+						$this->ref[$cache_name] =& $this->obj[$cache_name];
+						break;
+
                     case 'redis':
                         if (!isset($this->obj[$cache_name]))
 						{
diff --git a/upload/config.php b/upload/config.php
index 528c7b67d..6bb1d062c 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -52,8 +52,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.4 (beta)';
-$bb_cfg['tp_release_state'] = 'R375';
-$bb_cfg['tp_release_date'] = '16-02-2012';
+$bb_cfg['tp_release_state'] = 'R376';
+$bb_cfg['tp_release_date'] = '22-02-2012';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index 1ad9d0de8..06ca952de 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -2721,28 +2721,28 @@ function create_magnet($infohash, $auth_key, $logged_in)
 	return '<a href="magnet:?xt=urn:btih:'. bin2hex($infohash) .'&tr='. urlencode($bb_cfg['bt_announce_url'] . $passkey_url) .'"><img src="images/magnet.png" width="12" height="12" border="0" /></a>';
 }
 
-function get_avatar ($avatar, $type, $allow_avatar = true)
+function get_avatar ($avatar, $type, $allow_avatar = true, $height = false, $width = false)
 {
-	global $bb_cfg, $lang;
-
-	$user_avatar = '<img src="'. $bb_cfg['no_avatar'] .'" alt="" border="0" />';
-
-	if ($allow_avatar)
-	{
-		switch($type)
-		{
-			case USER_AVATAR_UPLOAD:
-				$user_avatar = ( $bb_cfg['allow_avatar_upload'] ) ? '<img src="'. $bb_cfg['avatar_path'] .'/'. $avatar .'" alt="" border="0" />' : '';
-				break;
-			case USER_AVATAR_REMOTE:
-				$user_avatar = ( $bb_cfg['allow_avatar_remote'] ) ? '<img src="'. $avatar .'" alt="" border="0" onload="imgFit(this, 100);" onClick="return imgFit(this, 100);" />' : '';
-				break;
-			case USER_AVATAR_GALLERY:
-				$user_avatar = ( $bb_cfg['allow_avatar_local'] ) ? '<img src="'. $bb_cfg['avatar_gallery_path'] .'/'. $avatar .'" alt="" border="0" />' : '';
-				break;
-		}
-	}
-	return $user_avatar;
+    global $bb_cfg, $lang;
+ 
+    $user_avatar = '<img src="'. $bb_cfg['no_avatar'] .'" alt="" border="0" height="'. $height .'" width="'. $width .'" />';
+ 
+    if ($allow_avatar)
+    {
+        switch($type)
+        {
+            case USER_AVATAR_UPLOAD:
+                $user_avatar = ( $bb_cfg['allow_avatar_upload'] ) ? '<img src="'. $bb_cfg['avatar_path'] .'/'. $avatar .'" alt="" border="0" height="'. $height .'" width="'. $width .'" />' : '';
+                break;
+            case USER_AVATAR_REMOTE:
+                $user_avatar = ( $bb_cfg['allow_avatar_remote'] ) ? '<img src="'. $avatar .'" alt="" border="0" onload="imgFit(this, 100);" onClick="return imgFit(this, 100);" height="'. $height .'" width="'. $width .'" />' : '';
+                break;
+            case USER_AVATAR_GALLERY:
+                $user_avatar = ( $bb_cfg['allow_avatar_local'] ) ? '<img src="'. $bb_cfg['avatar_gallery_path'] .'/'. $avatar .'" alt="" border="0" height="'. $height .'" width="'. $width .'" />' : '';
+                break;
+        }
+    }
+    return $user_avatar;
 }
 
 function set_die_append_msg ($forum_id = null, $topic_id = null)
diff --git a/upload/language/lang_english/lang_admin_bt.php b/upload/language/lang_english/lang_admin_bt.php
index eec904fc5..45a1256b1 100644
--- a/upload/language/lang_english/lang_admin_bt.php
+++ b/upload/language/lang_english/lang_admin_bt.php
@@ -62,7 +62,7 @@ $lang['BT_SELECT_FORUMS'] = 'Forum options:';
 $lang['BT_SELECT_FORUMS_EXPL'] = 'hold down <i>Ctrl</i> while selecting multiple forums';
 
 $lang['ALLOW_REG_TRACKER'] = 'Allowed forums for registering .torrents on tracker';
-$lang['DISALLOW_PORNO_TOPIC'] = 'Allow post porno topics';
+$lang['ALLOW_PORNO_TOPIC'] = 'Allow post porno topics';
 $lang['SHOW_DL_BUTTONS'] = 'Show buttons for manually changing DL-status';
 $lang['SELF_MODERATED'] = 'Users can <b>move</b> their topics to another forum';
 
diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php
index 6de3c8f08..9f729d5bf 100644
--- a/upload/language/lang_english/lang_main.php
+++ b/upload/language/lang_english/lang_main.php
@@ -1391,7 +1391,7 @@ $lang['LAST_IP'] = 'Last IP:';
 $lang['REG_IP']  = 'Registration IP:';
 $lang['OTHER_IP']  = 'Other IP:';
 $lang['ALREADY_REG_IP'] = 'With your IP-address is already registered user %s. If you have not previously registered on our tracker, mail to <a href="mailto:%s">Administrator</ a>';
-
+$lang['HIDDEN']  = 'Hidden';
 //
 // That's all, Folks!
 // -------------------------------------------------
diff --git a/upload/language/lang_russian/lang_admin_bt.php b/upload/language/lang_russian/lang_admin_bt.php
index eda0c8328..67ffccf53 100644
--- a/upload/language/lang_russian/lang_admin_bt.php
+++ b/upload/language/lang_russian/lang_admin_bt.php
@@ -62,7 +62,7 @@ $lang['BT_SELECT_FORUMS'] = 'Форумы, в которых:';
 $lang['BT_SELECT_FORUMS_EXPL'] = 'для выделения нескольких форумов, отмечайте их с нажатой клавишей <i>Ctrl</i>';
 
 $lang['ALLOW_REG_TRACKER'] = 'Разрешена регистрация торрентов на трекере';
-$lang['DISALLOW_PORNO_TOPIC'] = 'Запрещено создавать порно топики';
+$lang['ALLOW_PORNO_TOPIC'] = 'Разрешено создавать порно топики';
 $lang['SHOW_DL_BUTTONS'] = 'Показывать кнопки для изменения DL-статуса';
 $lang['SELF_MODERATED'] = 'Автор топика может перенести его в другой форум';
 
diff --git a/upload/language/lang_russian/lang_log_action.php b/upload/language/lang_russian/lang_log_action.php
index d56f2ea60..f65a0d5b3 100644
--- a/upload/language/lang_russian/lang_log_action.php
+++ b/upload/language/lang_russian/lang_log_action.php
@@ -21,7 +21,7 @@ $lang['ACTS_LOG_LOGS_FROM'] = 'Логи с ';
 $lang['ACTS_LOG_FIRST'] = 'сначала: ';
 $lang['ACTS_LOG_DAYS_BACK'] = 'дней назад';
 $lang['ACTS_LOG_TOPIC_MATCH'] = 'Совпадение с названием темы';
-$lang['ACTS_LOG_SORT_BY'] = 'Сотировать по';
+$lang['ACTS_LOG_SORT_BY'] = 'Сортировать по';
 $lang['ACTS_LOG_LOGS_ACTION'] = 'Действие';
 $lang['ACTS_LOG_USERNAME'] = 'Имя пользователя';
 $lang['ACTS_LOG_TIME'] = 'Время';
diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php
index 6786b3196..bdd1392b5 100644
--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
@@ -1398,7 +1398,7 @@ $lang['LAST_IP'] = 'Последний IP:';
 $lang['REG_IP']  = 'IP регистрации:';
 $lang['OTHER_IP']  = 'Другие IP:';
 $lang['ALREADY_REG_IP'] = 'С вашего IP-адреса уже зарегистрирован пользователь %s. Если Вы ранее не регистрировались на нашем сайте, обратитесь к <a href="mailto:%s">Администрации</a>';
-
+$lang['HIDDEN']  = 'Скрыт';
 //
 // That's all, Folks!
 // -------------------------------------------------
diff --git a/upload/templates/admin/admin_bt_forum_cfg.tpl b/upload/templates/admin/admin_bt_forum_cfg.tpl
index 8e2d6fbd5..42dc2507d 100644
--- a/upload/templates/admin/admin_bt_forum_cfg.tpl
+++ b/upload/templates/admin/admin_bt_forum_cfg.tpl
@@ -13,7 +13,7 @@
 <tr class="row2 tCenter">
 	<td>{L_ALLOW_REG_TRACKER}</td>
 	<td>{L_SELF_MODERATED}</td>
-	<td>{L_DISALLOW_PORNO_TOPIC}</td>
+	<td>{L_ALLOW_PORNO_TOPIC}</td>
 </tr>
 <tr class="tCenter">
 	<td>{S_ALLOW_REG_TRACKER}</td>
diff --git a/upload/templates/default/viewtopic_torrent.tpl b/upload/templates/default/viewtopic_torrent.tpl
index c81e709a2..d5f638b8f 100644
--- a/upload/templates/default/viewtopic_torrent.tpl
+++ b/upload/templates/default/viewtopic_torrent.tpl
@@ -237,7 +237,7 @@ $(document).ready(function(){
 		<!-- IF DL_BUT_CANCEL --><input type="submit" name="dl_set_cancel" value="{L_DL_CANCEL}" class="liteoption" /><!-- ENDIF -->
 	</form>
 	<!-- ENDIF -->
-	<!-- IF $bb_cfg['callseed'] --><form action="callseed.php?t={TOPIC_ID}" method="post"><input type="submit" value="{L_CALLSEED}" class="liteoption" />&nbsp;</form><!-- ENDIF -->
+	<!-- IF $bb_cfg['callseed'] && not SEED_COUNT --><form action="callseed.php?t={TOPIC_ID}" method="post"><input type="submit" value="{L_CALLSEED}" class="liteoption" />&nbsp;</form><!-- ENDIF -->
 	&nbsp;
 	</td>
 </tr>