Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-05-07 07:27:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(config): reset configure item variable name

Browse Source
This commit is contained in:
OldHawk
2017-09-01 11:34:00 +08:00
parent ad48d49f4d
commit d2eae81eb2
39 changed files with 157 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
README.md
View File

@@ -202,15 +202,15 @@ such as:
```javascript
announce: {
url: 'http://chd.im/announce',
announce_prefix: '[CHD.im].',
announcePrefix: '[CHD.im].',
admin: 'admin@chd.im',
base_url: 'http://chd.im',
client_black_list_url: 'http://chd.im/client_black_list',
private_torrent_cms: true
baseUrl: 'http://chd.im',
clientBlackListUrl: 'http://chd.im/client_black_list',
privateTorrentCmsMode: true
},
```
meanTorrent tracker is private, please set the `announce.url` to your server url, then when user to upload torrent file, It will autocheck the torrent announce url whether matching as `announce.url`.
But, meanTorrent support public tracker torrents CMS mode with `private_torrent_cms` set to `false`, in `public` mode, user can upload and download public tracker torrent files, but these torrent files is can not
But, meanTorrent support public tracker torrents CMS mode with `privateTorrentCmsMode` set to `false`, in `public` mode, user can upload and download public tracker torrent files, but these torrent files is can not
used by meanTorrent tracker server.
```javascript
@@ -245,20 +245,20 @@ And you can make a list page to tell users witch clients are unpopular.
```javascript
sign: {
open_signup: true,
allow_social_sign: true
openSignup: true,
allowSocialSignin: true
},
```
```javascript
invite: {
open_invite: true,
score_exchange: 10000,
openInvite: true,
scoreExchange: 10000,
expires: 60 * 60 * 1000 * 24
},
```
If your site do not accept user free register, please set `open_signup` to `false`, then user only can register through friend invitation or system(admin/oper) invitation.
if you set `open_invite` to `true`, the normal user can invite friends to join, if `false` only oper/admin can invite users.
If your site do not accept user free register, please set `openSignup` to `false`, then user only can register through friend invitation or system(admin/oper) invitation.
if you set `openInvite` to `true`, the normal user can invite friends to join, if `false` only oper/admin can invite users.
```javascript
ircAnnounce: {
@@ -270,7 +270,6 @@ if you set `open_invite` to `true`, the normal user can invite friends to join,
userName: 'meanTorrent',
realName: 'IRC announce client',
channel: '#chdAnnounce',
msg_format: '%s upload torrent %s at %s',
showErrors: true,
autoRejoin: true,
autoConnect: true,
@@ -283,13 +282,13 @@ Now, IRC announce support [Node-irc](https://github.com/martynsmith/node-irc), t
```javascript
app: {
show_demo_warning_popup: true
showDemoWarningPopup: true
},
sign: {
show_demo_sign_message: true
showDemoSignMessage: true
},
```
If you started meanTorrent at `production` env, please set `show_demo_warning_popup` and `show_demo_sign_message` to `false`, this will not show demo message any where.
If you started meanTorrent at `production` env, please set `showDemoWarningPopup` and `showDemoSignMessage` to `false`, this will not show demo message any where.
There is not much comment of `config/env/torrent.js`, because the development time is limited, I'll add more comment in my free time, If you has any question, please post an [issue](https://github.com/taobataoma/meanTorrent/issues), and i will focus it.

60
config/env/torrents.js vendored
View File

@@ -4,7 +4,7 @@ module.exports = {
meanTorrentConfig: {
app: {
domain: 'http://chd.im:3000',
show_demo_warning_popup: true
showDemoWarningPopup: true
},
language: [
{name: 'en', index: 0, class: 'flag-icon-gb', title: 'English'},
@@ -13,12 +13,12 @@ module.exports = {
announce: {
url: 'http://chd.im:3000/announce',
comment: 'meanTorrent group',
announce_interval: 60 * 1000,
announce_prefix: '{CHD.im}.',
announceInterval: 60 * 1000,
announcePrefix: '{CHD.im}.',
admin: 'admin@chd.im',
base_url: 'http://chd.im:3000',
client_black_list_url: 'http://chd.im:3000/client_black_list',
private_torrent_cms: true
baseUrl: 'http://chd.im:3000',
clientBlackListUrl: 'http://chd.im:3000/client_black_list',
privateTorrentCmsMode: true
},
ircAnnounce: {
enable: true,
@@ -29,8 +29,8 @@ module.exports = {
userName: 'meanTorrent',
realName: 'IRC announce client',
channel: '#chdAnnounce',
default_msg_format: '%s upload - torrent: %s, type: %s, size: %d, sale: %s, at %s',
tvserial_msg_format: '%s upload - torrent: %s, type: %s, size: %d, seasons: %d, episodes: %s, sale: %s, at %s',
defaultMsgFormat: '%s upload - torrent: %s, type: %s, size: %d, sale: %s, at %s',
tvserialMsgFormat: '%s upload - torrent: %s, type: %s, size: %d, seasons: %d, episodes: %s, sale: %s, at %s',
showErrors: true,
autoRejoin: true,
autoConnect: true,
@@ -39,17 +39,17 @@ module.exports = {
encoding: 'UTF-8'
},
sign: {
open_signup: true,
allow_social_sign: false,
show_demo_sign_message: true
openSignup: true,
allowSocialSignin: false,
showDemoSignMessage: true
},
invite: {
open_invite: true,
score_exchange: 10000,
openInvite: true,
scoreExchange: 10000,
expires: 60 * 60 * 1000 * 24
},
score: {
level_step: 500,
levelStep: 500,
action: {
signEveryday: {name: 'signEveryday', value: 10, enable: true},
uploadTorrent: {name: 'uploadTorrent', value: 50, enable: true},
@@ -186,19 +186,19 @@ module.exports = {
}
},
tmdbConfig: {
tmdb_home: 'https://www.themoviedb.org',
tmdb_movie_link_url: 'https://www.themoviedb.org/movie/',
tmdb_tv_link_url: 'https://www.themoviedb.org/tv/',
tmdbHome: 'https://www.themoviedb.org',
tmdbMovieLinkUrl: 'https://www.themoviedb.org/movie/',
tmdbTvserialLinkUrl: 'https://www.themoviedb.org/tv/',
//please change it to your api key from themoviedb.org
key: '7888f0042a366f63289ff571b68b7ce0',
backdrop_img_base_url: 'http://image.tmdb.org/t/p/w1280',
backdrop_img_base_url_300: 'http://image.tmdb.org/t/p/w300',
poster_img_base_url: 'http://image.tmdb.org/t/p/w500',
poster_list_base_url: 'http://image.tmdb.org/t/p/w92',
cast_img_base_url: 'http://image.tmdb.org/t/p/w132_and_h132_bestv2'
backdropImgBaseUrl: 'http://image.tmdb.org/t/p/w1280',
backdropImgBaseUrl_300: 'http://image.tmdb.org/t/p/w300',
posterImgBaseUrl: 'http://image.tmdb.org/t/p/w500',
posterListBaseUrl: 'http://image.tmdb.org/t/p/w92',
castImgBaseUrl: 'http://image.tmdb.org/t/p/w132_and_h132_bestv2'
},
imdbConfig: {
imdb_link_url: 'http://www.imdb.com/title/'
imdbLinkUrl: 'http://www.imdb.com/title/'
},
forumsConfig: {
category: [
@@ -206,15 +206,15 @@ module.exports = {
{name: 'DISCUSS', value: 'discuss', index: 1},
{name: 'BUSINESS', value: 'business', index: 2}
],
show_thumbs_up_user_list: true
showThumbsUpUserList: true
},
itemsPerPage: {
topics_per_page: 10,
replies_per_page: 10,
topics_search_per_page: 10,
torrents_per_page: 15,
torrents_comments_per_page: 10,
traces_per_page: 30
topicsPerPage: 10,
repliesPerPage: 10,
topicsSearchPerPage: 10,
torrentsPerPage: 15,
torrentsCommentsPerPage: 10,
tracesPerPage: 30
},
resourcesTags: {
radio: [

6
modules/announce/server/controllers/announces.server.controller.js
View File

@@ -31,7 +31,7 @@ const FAILURE_REASONS = {
151: 'Invalid peerid: peerid is not 20 bytes long',
152: 'Invalid numwant. Client requested more peers than allowed by tracker',
153: 'Passkey length error (length=32)',
154: 'Invalid passkey, if you changed you passkey, please re-download the torrent file from ' + config.meanTorrentConfig.announce.base_url,
154: 'Invalid passkey, if you changed you passkey, please re-download the torrent file from ' + config.meanTorrentConfig.announce.baseUrl,
160: 'Invalid torrent info_hash',
161: 'No torrent with that info_hash has been found',
@@ -39,7 +39,7 @@ const FAILURE_REASONS = {
170: 'your account is banned',
171: 'your account is sealed',
172: 'your client is not allowed, here is the blacklist: ' + config.meanTorrentConfig.announce.client_black_list_url,
172: 'your client is not allowed, here is the blacklist: ' + config.meanTorrentConfig.announce.clientBlackListUrl,
180: 'You already are downloading the same torrent. You may only leech from one location at a time',
181: 'You cannot seed the same torrent from more than 3 locations',
@@ -62,7 +62,7 @@ const PEERSTATE_SEEDER = 'seeder';
const PEERSTATE_LEECHER = 'leecher';
const PEER_COMPACT_SIZE = 6;
const ANNOUNCE_INTERVAL = Math.floor(config.meanTorrentConfig.announce.announce_interval / 1000);
const ANNOUNCE_INTERVAL = Math.floor(config.meanTorrentConfig.announce.announceInterval / 1000);
const ANNOUNCE_GHOST = 2;
const PARAMS_INTEGER = [

6
modules/core/client/controllers/home.client.controller.js
View File

@@ -47,7 +47,7 @@
*/
vm.initTopOneMovieInfo = function () {
if (vm.movieTopOne.resource_detail_info.backdrop_path) {
$('.movie-backdrop').css('backgroundImage', 'url(' + vm.tmdbConfig.backdrop_img_base_url + vm.movieTopOne.resource_detail_info.backdrop_path + ')');
$('.movie-backdrop').css('backgroundImage', 'url(' + vm.tmdbConfig.backdropImgBaseUrl + vm.movieTopOne.resource_detail_info.backdrop_path + ')');
}
};
@@ -56,7 +56,7 @@
*/
vm.initTopOneTVInfo = function () {
if (vm.TVTopOne.resource_detail_info.backdrop_path) {
$('.tv-backdrop').css('backgroundImage', 'url(' + vm.tmdbConfig.backdrop_img_base_url + vm.TVTopOne.resource_detail_info.backdrop_path + ')');
$('.tv-backdrop').css('backgroundImage', 'url(' + vm.tmdbConfig.backdropImgBaseUrl + vm.TVTopOne.resource_detail_info.backdrop_path + ')');
}
};
@@ -68,7 +68,7 @@
vm.getTVTopInfo();
var sw = localStorageService.get('showed_warning');
if (vm.appConfig.show_demo_warning_popup && !sw) {
if (vm.appConfig.showDemoWarningPopup && !sw) {
$timeout(function () {
$('#warning_popup').popup('show');
//$('.warning_popup_open').trigger('click');

4
modules/core/client/views/footer.client.view.html
View File

@@ -8,8 +8,8 @@
<div class="col-xs-6 col-sm-4 col-md-3">{{'TOTAL_TORRENTSSIZE' | translate}}:　{{vm.siteInfo.totalTorrentsSize | bytes}}</div>
<div class="col-xs-6 col-sm-4 col-md-3">{{'TOTAL_SEEDERS' | translate}}:　{{vm.siteInfo.totalSeeders}}</div>
<div class="col-xs-6 col-sm-4 col-md-3">{{'TOTAL_LEECHERS' | translate}}:　{{vm.siteInfo.totalLeechers}}</div>
<div class="col-xs-6 col-sm-4 col-md-3" ng-if="vm.announceConfig.private_torrent_cms">{{'TOTAL_UPLOADED' | translate}}:　{{vm.siteInfo.totalUploaded | bytes}}</div>
<div class="col-xs-6 col-sm-4 col-md-3" ng-if="vm.announceConfig.private_torrent_cms">{{'TOTAL_DOWNLOADED' | translate}}:　{{vm.siteInfo.totalDownloaded | bytes}}</div>
<div class="col-xs-6 col-sm-4 col-md-3" ng-if="vm.announceConfig.privateTorrentCmsMode">{{'TOTAL_UPLOADED' | translate}}:　{{vm.siteInfo.totalUploaded | bytes}}</div>
<div class="col-xs-6 col-sm-4 col-md-3" ng-if="vm.announceConfig.privateTorrentCmsMode">{{'TOTAL_DOWNLOADED' | translate}}:　{{vm.siteInfo.totalDownloaded | bytes}}</div>
<div class="col-xs-6 col-sm-4 col-md-3">{{'TOTAL_FORUMTOPICS' | translate}}:　{{vm.siteInfo.totalForumTopics}}</div>
<div class="col-xs-6 col-sm-4 col-md-3">{{'TOTAL_FORUMREPLIES' | translate}}:　{{vm.siteInfo.totalForumReplies}}</div>
</div>

2
modules/core/client/views/header.client.view.html
View File

@@ -58,7 +58,7 @@
<li ui-sref-active="active" ng-repeat="item in vm.accountMenu.items">
<a ui-sref="{{item.state}}" ng-bind="item.title" menu-title="{{item.title}}"></a>
</li>
<li ui-sref-active="active" ng-if="vm.signConfig.allow_social_sign">
<li ui-sref-active="active" ng-if="vm.signConfig.allowSocialSignin">
<a ui-sref="settings.accounts" ng-bind="MANAGE_SOCIAL_ACCOUNTS" menu-title="MANAGE_SOCIAL_ACCOUNTS"></a>
</li>
<li class="divider"></li>

16
modules/core/client/views/home.client.view.html
View File

@@ -5,7 +5,7 @@
<div class="container">
<div class="topone">
<div class="col-md-4">
<img ng-src="{{vm.tmdbConfig.poster_img_base_url}}{{vm.movieTopOne.resource_detail_info.poster_path}}"
<img ng-src="{{vm.tmdbConfig.posterImgBaseUrl}}{{vm.movieTopOne.resource_detail_info.poster_path}}"
class="img-thumbnail center-block"
onload="this.style.opacity='1';" ng-click="vm.openTorrentInfo(vm.movieTopOne._id);">
@@ -76,7 +76,7 @@
<div class="row cast-list">
<div class="col-xs-4 col-md-2 text-center"
ng-repeat="cast in vm.movieTopOne.resource_detail_info.credits.cast | limitTo: 6">
<img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{cast.profile_path}}"
<img ng-src="{{vm.tmdbConfig.castImgBaseUrl}}{{cast.profile_path}}"
on-error-src="/./modules/core/client/img/default_face.jpg"
class="img-circle img-thumbnail img-responsive center-block" onload="this.style.opacity='1';">
<span class="cast-xs-info"><strong>{{cast.name}}</strong></span>
@@ -99,7 +99,7 @@
<div data-ng-if="$index != 0 && $index % 4 == 0" class="clearfix visible-md-block visible-lg-block"></div>
<div class="col-xs-6 col-sm-3 col-md-3 col-small-padding">
<div class="thumbnail torrent-post-info" ng-click="vm.openTorrentInfo(item._id);">
<img ng-src="{{vm.tmdbConfig.poster_img_base_url}}{{item.resource_detail_info.poster_path}}"
<img ng-src="{{vm.tmdbConfig.posterImgBaseUrl}}{{item.resource_detail_info.poster_path}}"
alt="{{item.resource_detail_info.title}}"
class="img-responsive">
@@ -155,7 +155,7 @@
ng-class="[$index > 0 ? 'hide-big' : 'show-big', $index >= 12 ? 'hide-more' : '']">
<td>
<div class="newest-item-big" ng-click="vm.openTorrentInfo(nt._id);">
<img ng-src="{{vm.tmdbConfig.backdrop_img_base_url_300}}{{nt.resource_detail_info.backdrop_path}}"
<img ng-src="{{vm.tmdbConfig.backdropImgBaseUrl_300}}{{nt.resource_detail_info.backdrop_path}}"
on-error-src="/./modules/torrents/client/img/default_backdrop_300.jpg">
<div class="newest-user-info">
@@ -204,7 +204,7 @@
<div class="container">
<div class="topone">
<div class="col-md-4">
<img ng-src="{{vm.tmdbConfig.poster_img_base_url}}{{vm.TVTopOne.resource_detail_info.poster_path}}"
<img ng-src="{{vm.tmdbConfig.posterImgBaseUrl}}{{vm.TVTopOne.resource_detail_info.poster_path}}"
class="img-thumbnail center-block"
onload="this.style.opacity='1';" ng-click="vm.openTorrentInfo(vm.TVTopOne._id);">
@@ -284,7 +284,7 @@
<div class="row cast-list">
<div class="col-xs-4 col-md-2 text-center"
ng-repeat="cast in vm.TVTopOne.resource_detail_info.credits.cast | limitTo: 6">
<img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{cast.profile_path}}"
<img ng-src="{{vm.tmdbConfig.castImgBaseUrl}}{{cast.profile_path}}"
on-error-src="/./modules/core/client/img/default_face.jpg"
class="img-circle img-thumbnail img-responsive center-block" onload="this.style.opacity='1';">
<span class="cast-xs-info"><strong>{{cast.name}}</strong></span>
@@ -307,7 +307,7 @@
<div data-ng-if="$index != 0 && $index % 4 == 0" class="clearfix visible-md-block visible-lg-block"></div>
<div class="col-xs-6 col-sm-3 col-md-3 col-small-padding">
<div class="thumbnail torrent-post-info" ng-click="vm.openTorrentInfo(item._id);">
<img ng-src="{{vm.tmdbConfig.poster_img_base_url}}{{item.resource_detail_info.poster_path}}"
<img ng-src="{{vm.tmdbConfig.posterImgBaseUrl}}{{item.resource_detail_info.poster_path}}"
alt="{{item.resource_detail_info.name}}"
class="img-responsive">
@@ -363,7 +363,7 @@
ng-class="[$index > 0 ? 'hide-big' : 'show-big', $index >= 12 ? 'hide-more' : '']">
<td>
<div class="newest-item-big" ng-click="vm.openTorrentInfo(nt._id);">
<img ng-src="{{vm.tmdbConfig.backdrop_img_base_url_300}}{{nt.resource_detail_info.backdrop_path}}"
<img ng-src="{{vm.tmdbConfig.backdropImgBaseUrl_300}}{{nt.resource_detail_info.backdrop_path}}"
on-error-src="/./modules/torrents/client/img/default_backdrop_300.jpg">
<div class="newest-user-info">

2
modules/forums/client/controllers/forums-search-result.client.controller.js
View File

@@ -19,7 +19,7 @@
*/
vm.buildPager = function () {
vm.pagedItems = [];
vm.itemsPerPage = vm.itemsPerPageConfig.topics_search_per_page;
vm.itemsPerPage = vm.itemsPerPageConfig.topicsSearchPerPage;
vm.currentPage = 1;
vm.figureOutItemsToDisplay();
};

2
modules/forums/client/controllers/forums-topic.client.controller.js
View File

@@ -33,7 +33,7 @@
*/
vm.buildPager = function () {
vm.pagedItems = [];
vm.itemsPerPage = vm.itemsPerPageConfig.replies_per_page;
vm.itemsPerPage = vm.itemsPerPageConfig.repliesPerPage;
vm.currentPage = 1;
vm.figureOutItemsToDisplay();
};

2
modules/forums/client/controllers/forums-view.client.controller.js
View File

@@ -29,7 +29,7 @@
*/
vm.buildPager = function () {
vm.pagedItems = [];
vm.itemsPerPage = vm.itemsPerPageConfig.topics_per_page;
vm.itemsPerPage = vm.itemsPerPageConfig.topicsPerPage;
vm.currentPage = 1;
vm.figureOutItemsToDisplay();
};

8
modules/forums/client/views/topic.client.view.html
View File

@@ -72,7 +72,7 @@
<span user-info="vm.topic.user" info-name></span>
<span score-level="vm.getUserScoreLevel(vm.topic.user);"></span>
<span message-to="vm.topic.user" to-class="message-to-icon"></span>
<span class="user-ud-text" ng-if="vm.announce.private_torrent_cms">
<span class="user-ud-text" ng-if="vm.announce.privateTorrentCmsMode">
(<span class="glyphicon glyphicon-arrow-up torrent-up"></span>{{vm.topic.user.uploaded | bytes}}
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>{{vm.topic.user.downloaded | bytes}}
)
@@ -128,7 +128,7 @@
</ol>
</div>
<div class="thumbs-up-list"
ng-if="vm.topic._thumbs.length && vm.forumsConfig.show_thumbs_up_user_list">
ng-if="vm.topic._thumbs.length && vm.forumsConfig.showThumbsUpUserList">
<div class="thumbs-header" translate="FORUMS.THUMBS_LIST_HEADER"
translate-values="{number: vm.topic._thumbs.length}"></div>
<div class="thumbs-users panel-collapsed" id="thumbs-{{vm.topic._id}}">
@@ -154,7 +154,7 @@
<span user-info="rep.user" info-name></span>
<span score-level="vm.getUserScoreLevel(vm.topic.user);"></span>
<span message-to="vm.topic.user" to-class="message-to-icon"></span>
<span class="user-ud-text" ng-if="vm.announce.private_torrent_cms">
<span class="user-ud-text" ng-if="vm.announce.privateTorrentCmsMode">
(<span class="glyphicon glyphicon-arrow-up torrent-up"></span>{{rep.user.uploaded | bytes}}
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>{{rep.user.downloaded | bytes}}
)
@@ -199,7 +199,7 @@
</li>
</ol>
</div>
<div class="thumbs-up-list" ng-if="rep._thumbs.length && vm.forumsConfig.show_thumbs_up_user_list">
<div class="thumbs-up-list" ng-if="rep._thumbs.length && vm.forumsConfig.showThumbsUpUserList">
<div class="thumbs-header" translate="FORUMS.THUMBS_LIST_HEADER"
translate-values="{number: rep._thumbs.length}"></div>
<div class="thumbs-users panel-collapsed" id="thumbs-{{rep._id}}">

18
modules/invitations/client/views/detail.client.view.html
View File

@@ -1,6 +1,6 @@
<section class="container" ng-controller="InviteController as vm" ng-init="vm.getMyInvitations();">
<div class="margin-top-30">
<div class="row" ng-hide="vm.inviteConfig.open_invite">
<div class="row" ng-hide="vm.inviteConfig.openInvite">
<div class="col-sm-8 col-sm-offset-2 text-center">
<div class="alert alert-warning" role="alert">
<strong>{{ 'NOTE_CAPTION' | translate }}</strong> <span translate="INVITE_INFO"></span>
@@ -137,23 +137,23 @@
<script type="text/ng-template" id="userinfo.html">
<div>
<ul class="list-unstyled margin-left-10 margin-right-10">
<li ng-if="vm.announce.private_torrent_cms">{{ 'STATUS_FIELD.UPLOADED' | translate}}：
<li ng-if="vm.announce.privateTorrentCmsMode">{{ 'STATUS_FIELD.UPLOADED' | translate}}：
<span class="glyphicon glyphicon-arrow-up torrent-up"></span>{{ vm.selectedUser.uploaded | bytes:2 }}
</li>
<li ng-if="vm.announce.private_torrent_cms">{{ 'STATUS_FIELD.DOWNLOADED' | translate}}：
<li ng-if="vm.announce.privateTorrentCmsMode">{{ 'STATUS_FIELD.DOWNLOADED' | translate}}：
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>{{ vm.selectedUser.downloaded | bytes:2 }}
</li>
<li ng-if="vm.announce.private_torrent_cms">{{ 'STATUS_FIELD.RATIO' | translate}}：
<li ng-if="vm.announce.privateTorrentCmsMode">{{ 'STATUS_FIELD.RATIO' | translate}}：
<span ng-class="vm.selectedUser.ratio > 1 ? 'ratio-normal' : 'ratio-warning' ">{{ vm.selectedUser.ratio }}</span>
</li>
<li class="status-divider" ng-if="vm.announce.private_torrent_cms"></li>
<li class="status-divider" ng-if="vm.announce.privateTorrentCmsMode"></li>
<li ng-if="vm.announce.private_torrent_cms">{{ 'STATUS_FIELD.SEEDED' | translate}}：{{ vm.selectedUser.seeded }}</li>
<li ng-if="vm.announce.private_torrent_cms">{{ 'STATUS_FIELD.LEECHED' | translate}}：{{ vm.selectedUser.leeched }}</li>
<li ng-if="vm.announce.private_torrent_cms">{{ 'STATUS_FIELD.FINISHED' | translate}}：{{ vm.selectedUser.finished }}</li>
<li ng-if="vm.announce.privateTorrentCmsMode">{{ 'STATUS_FIELD.SEEDED' | translate}}：{{ vm.selectedUser.seeded }}</li>
<li ng-if="vm.announce.privateTorrentCmsMode">{{ 'STATUS_FIELD.LEECHED' | translate}}：{{ vm.selectedUser.leeched }}</li>
<li ng-if="vm.announce.privateTorrentCmsMode">{{ 'STATUS_FIELD.FINISHED' | translate}}：{{ vm.selectedUser.finished }}</li>
<li class="status-divider" ng-if="vm.announce.private_torrent_cms"></li>
<li class="status-divider" ng-if="vm.announce.privateTorrentCmsMode"></li>
<li>{{ 'STATUS_FIELD.FORUM_TOPICS' | translate}}：{{ vm.selectedUser.topics }}</li>
<li>{{ 'STATUS_FIELD.FORUM_REPLIES' | translate}}：{{ vm.selectedUser.replies }}</li>

6
modules/invitations/server/controllers/invitations.server.controller.js
View File

@@ -36,21 +36,21 @@ exports.create = function (req, res) {
//res.json(invitation);
var user = req.user;
user.update({
$set: {score: user.score - config.meanTorrentConfig.invite.score_exchange}
$set: {score: user.score - config.meanTorrentConfig.invite.scoreExchange}
}).exec(function (err, result) {
if (err) {
return res.status(422).send({
message: errorHandler.getErrorMessage(err)
});
} else {
user.score = user.score - config.meanTorrentConfig.invite.score_exchange;
user.score = user.score - config.meanTorrentConfig.invite.scoreExchange;
res.json(user);
//create trace log
traceLogCreate(req, traceConfig.action.userInvitationExchange, {
user: req.user._id,
token: invitation.token,
score: config.meanTorrentConfig.invite.score_exchange
score: config.meanTorrentConfig.invite.scoreExchange
});
}
});

6
modules/ranking/client/controllers/ranking.client.controller.js
View File

@@ -20,17 +20,17 @@
{
title: $translate.instant('PAGE_HEADER_RANKING_UPLOAD'),
templateUrl: 'upload_ranking.html',
ng_show: vm.announce.private_torrent_cms
ng_show: vm.announce.privateTorrentCmsMode
},
{
title: $translate.instant('PAGE_HEADER_RANKING_DOWNLOAD'),
templateUrl: 'download_ranking.html',
ng_show: vm.announce.private_torrent_cms
ng_show: vm.announce.privateTorrentCmsMode
},
{
title: $translate.instant('PAGE_HEADER_RANKING_RATIO'),
templateUrl: 'ratio_ranking.html',
ng_show: vm.announce.private_torrent_cms
ng_show: vm.announce.privateTorrentCmsMode
}
];

24
modules/ranking/client/views/ranking.client.view.html
View File

@@ -157,12 +157,12 @@
<th class="text-center"></th>
<th>{{ 'TABLE_FIELDS.USERNAME' | translate}}</th>
<th class="text-center ranking-active-col">{{ 'TABLE_FIELDS.SCORE' | translate}}</th>
<th class="text-center" ng-if="vm.announce.private_torrent_cms">{{ 'TABLE_FIELDS.UPLOAD' | translate}}</th>
<th class="text-center" ng-if="vm.announce.private_torrent_cms">{{ 'TABLE_FIELDS.DOWNLOAD' | translate}}</th>
<th class="text-center" ng-if="vm.announce.private_torrent_cms">{{ 'TABLE_FIELDS.RATIO' | translate}}</th>
<th class="text-center" ng-if="vm.announce.private_torrent_cms">{{ 'TABLE_FIELDS.SEEDED' | translate}}</th>
<th class="text-center" ng-if="vm.announce.private_torrent_cms">{{ 'TABLE_FIELDS.LEECHED' | translate}}</th>
<th class="text-center" ng-if="vm.announce.private_torrent_cms">{{ 'TABLE_FIELDS.FINISHED' | translate}}</th>
<th class="text-center" ng-if="vm.announce.privateTorrentCmsMode">{{ 'TABLE_FIELDS.UPLOAD' | translate}}</th>
<th class="text-center" ng-if="vm.announce.privateTorrentCmsMode">{{ 'TABLE_FIELDS.DOWNLOAD' | translate}}</th>
<th class="text-center" ng-if="vm.announce.privateTorrentCmsMode">{{ 'TABLE_FIELDS.RATIO' | translate}}</th>
<th class="text-center" ng-if="vm.announce.privateTorrentCmsMode">{{ 'TABLE_FIELDS.SEEDED' | translate}}</th>
<th class="text-center" ng-if="vm.announce.privateTorrentCmsMode">{{ 'TABLE_FIELDS.LEECHED' | translate}}</th>
<th class="text-center" ng-if="vm.announce.privateTorrentCmsMode">{{ 'TABLE_FIELDS.FINISHED' | translate}}</th>
<th class="text-center">{{ 'TABLE_FIELDS.JOINED' | translate}}</th>
</tr>
</thead>
@@ -178,12 +178,12 @@
<span message-to="user" to-class="message-to-icon"></span>
</td>
<td class="text-center ranking-active-col">{{user.score}}</td>
<td class="text-center" ng-if="vm.announce.private_torrent_cms">{{user.uploaded | bytes:2}}</td>
<td class="text-center" ng-if="vm.announce.private_torrent_cms">{{user.downloaded | bytes:2}}</td>
<td class="text-center" ng-if="vm.announce.private_torrent_cms"><span ng-class="user.ratio == 0 ? 'ratio-warning' : 'ratio-normal' ">{{ user.ratio | ratio}}</span></td>
<td class="text-center" ng-if="vm.announce.private_torrent_cms">{{user.seeded}}</td>
<td class="text-center" ng-if="vm.announce.private_torrent_cms">{{user.leeched}}</td>
<td class="text-center" ng-if="vm.announce.private_torrent_cms">{{user.finished}}</td>
<td class="text-center" ng-if="vm.announce.privateTorrentCmsMode">{{user.uploaded | bytes:2}}</td>
<td class="text-center" ng-if="vm.announce.privateTorrentCmsMode">{{user.downloaded | bytes:2}}</td>
<td class="text-center" ng-if="vm.announce.privateTorrentCmsMode"><span ng-class="user.ratio == 0 ? 'ratio-warning' : 'ratio-normal' ">{{ user.ratio | ratio}}</span></td>
<td class="text-center" ng-if="vm.announce.privateTorrentCmsMode">{{user.seeded}}</td>
<td class="text-center" ng-if="vm.announce.privateTorrentCmsMode">{{user.leeched}}</td>
<td class="text-center" ng-if="vm.announce.privateTorrentCmsMode">{{user.finished}}</td>
<td class="text-center">{{user.created | life}}</td>
</tr>
</tbody>

6
modules/torrents/client/controllers/torrent-info.client.controller.js
View File

@@ -39,7 +39,7 @@
*/
vm.commentBuildPager = function () {
vm.commentPagedItems = [];
vm.commentItemsPerPage = vm.itemsPerPageConfig.torrents_comments_per_page;
vm.commentItemsPerPage = vm.itemsPerPageConfig.torrentsCommentsPerPage;
vm.commentCurrentPage = 1;
vm.commentFigureOutItemsToDisplay();
};
@@ -121,7 +121,7 @@
torrentId: $stateParams.torrentId
}, function (res) {
if (res.resource_detail_info.backdrop_path) {
$('.backdrop').css('backgroundImage', 'url(' + vm.tmdbConfig.backdrop_img_base_url + res.resource_detail_info.backdrop_path + ')');
$('.backdrop').css('backgroundImage', 'url(' + vm.tmdbConfig.backdropImgBaseUrl + res.resource_detail_info.backdrop_path + ')');
}
vm.initTabLists();
@@ -158,7 +158,7 @@
{
title: $translate.instant('TAB_USER_INFO'),
templateUrl: 'userInfo.html',
ng_show: vm.announce.private_torrent_cms,
ng_show: vm.announce.privateTorrentCmsMode,
badges: [
{
value: '↑ ' + vm.torrentLocalInfo.torrent_seeds + '　↓ ' + vm.torrentLocalInfo.torrent_leechers + '　√ ' + vm.torrentLocalInfo.torrent_finished,

2
modules/torrents/client/controllers/torrents.client.controller.js
View File

@@ -39,7 +39,7 @@
*/
vm.torrentBuildPager = function () {
vm.torrentPagedItems = [];
vm.torrentItemsPerPage = vm.itemsPerPageConfig.torrents_per_page;
vm.torrentItemsPerPage = vm.itemsPerPageConfig.torrentsPerPage;
vm.torrentCurrentPage = 1;
vm.torrentFigureOutItemsToDisplay();
};

2
modules/torrents/client/templates/upload-rules-en.md
View File

@@ -1,6 +1,6 @@
1. If this is a private torrents management system, the torrent file announce URL must be: __{{vm.announceConfig.url}}__.
1. If you selected resource type with `Movie` or `TVSerial`, the torrent TMDB_ID must be `TheMovieDB` resources ID, you can [find the ID
from here]({{vm.tmdbConfig.tmdb_home}}), then the resources detail info can be autoload, if everything looks good, hit submit.
from here]({{vm.tmdbConfig.tmdbHome}}), then the resources detail info can be autoload, if everything looks good, hit submit.
1. Select one or more tags that match the resources, which will play a significant role in your search results.
1. After the submission of documents, may be approved by the management, the rules do not meet the seeds will be deleted directly.
1. For additional assistance, please contact our administrator: [{{vm.announceConfig.admin}}](mailto:{{vm.announceConfig.admin}}).

2
modules/torrents/client/templates/upload-rules-zh.md
View File

@@ -1,6 +1,6 @@
1. 如果这是私有种子管理系统，种子文件的Announce地址必须为：__{{vm.announceConfig.url}}__.
1. 如果你选择的资源类型为`电影`或`电视剧`，种子文件的 TMDB_ID 必须是 `TheMovieDB` 相对应的资源ID号，
您可以[从这里找到ID号]({{vm.tmdbConfig.tmdb_home}}). 资源的详细信息，系统会自动载入，如无误可直接提交.
您可以[从这里找到ID号]({{vm.tmdbConfig.tmdbHome}}). 资源的详细信息，系统会自动载入，如无误可直接提交.
1. 请为资源选择匹配的一个或多个标签，它会在您的搜索结果中发挥重大作用.
1. 种子文件提交后，可能会由后台管理人员进行审批，不符合规则的种子会被直接删除.
1. 如需其它帮助，请与我们的管理员联系：[{{vm.announceConfig.admin}}](mailto:{{vm.announceConfig.admin}}).

4
modules/torrents/client/views/admin/admin-list.client.view.html
View File

@@ -136,7 +136,7 @@
<td class="col-md-7 td-text-overflow">
<div class="media">
<div class="media-left">
<img class="media-object" ng-src="{{vm.tmdbConfig.poster_list_base_url}}{{item.resource_detail_info.poster_path}}"
<img class="media-object" ng-src="{{vm.tmdbConfig.posterListBaseUrl}}{{item.resource_detail_info.poster_path}}"
alt="...">
</div>
<div class="media-body">
@@ -230,7 +230,7 @@
{{ 'ADMIN_BASIC_DELETE' | translate}}
</button>
</div>
<div class="margin-top-2" ng-if="vm.announce.private_torrent_cms">
<div class="margin-top-2" ng-if="vm.announce.privateTorrentCmsMode">
<div class="admin-tools-btn-list btn-group" uib-dropdown dropdown-append-to-body>
<button id="btn-append-to-body" type="button"
class="btn btn-xs btn-default btn-block"

4
modules/torrents/client/views/movie-list.client.view.html
View File

@@ -6,7 +6,7 @@
<div data-ng-if="$index != 0 && $index % 6 == 0" class="clearfix visible-md-block visible-lg-block"></div>
<div class="col-xs-6 col-sm-4 col-md-2 col-small-padding">
<div class="thumbnail torrent-post-info" ng-click="vm.openTorrentInfo(item._id);">
<img ng-src="{{vm.tmdbConfig.poster_img_base_url}}{{item.resource_detail_info.poster_path}}"
<img ng-src="{{vm.tmdbConfig.posterImgBaseUrl}}{{item.resource_detail_info.poster_path}}"
alt="{{item.resource_detail_info.title || item.resource_detail_info.name}}"
class="img-responsive">
@@ -142,7 +142,7 @@
<td class="col-md-7 td-text-overflow">
<div class="media">
<div class="media-left">
<img class="media-object" ng-src="{{vm.tmdbConfig.poster_list_base_url}}{{item.resource_detail_info.poster_path}}"
<img class="media-object" ng-src="{{vm.tmdbConfig.posterListBaseUrl}}{{item.resource_detail_info.poster_path}}"
alt="...">
</div>
<div class="media-body">

20
modules/torrents/client/views/uploads-torrents.client.view.html
View File

@@ -167,7 +167,7 @@
<div class="col-md-12 col-sm-12 col-xs-12">
<legend class="small-legend" translate="TMDB_RESOURCE_INFO"></legend>
<div class="col-md-4 col-sm-4 col-xs-12">
<img ng-src="{{vm.tmdbConfig.poster_img_base_url}}{{vm.movieinfo.poster_path}}" class="img-thumbnail">
<img ng-src="{{vm.tmdbConfig.posterImgBaseUrl}}{{vm.movieinfo.poster_path}}" class="img-thumbnail">
</div>
<div class="col-md-8 col-sm-8 col-xs-12">
<dl class="dl-horizontal">
@@ -214,12 +214,12 @@
<dd class="h-line">{{vm.movieinfo.vote_average}} / {{vm.movieinfo.vote_count}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}}</dd>
<dt class="h-line">{{ 'TMDB_FIELDS.IMDB_LINK' | translate}}：</dt>
<dd class="h-line"><a href="{{vm.imdbConfig.imdb_link_url}}{{vm.movieinfo.imdb_id}}"
target="_blank">{{vm.imdbConfig.imdb_link_url}}{{vm.movieinfo.imdb_id}}</a></dd>
<dd class="h-line"><a href="{{vm.imdbConfig.imdbLinkUrl}}{{vm.movieinfo.imdb_id}}"
target="_blank">{{vm.imdbConfig.imdbLinkUrl}}{{vm.movieinfo.imdb_id}}</a></dd>
<dt class="h-line">{{ 'TMDB_FIELDS.TMDB_LINK' | translate}}：</dt>
<dd class="h-line"><a href="{{vm.tmdbConfig.tmdb_movie_link_url}}{{vm.movieinfo.id}}"
target="_blank">{{vm.tmdbConfig.tmdb_movie_link_url}}{{vm.movieinfo.id}}</a></dd>
<dd class="h-line"><a href="{{vm.tmdbConfig.tmdbMovieLinkUrl}}{{vm.movieinfo.id}}"
target="_blank">{{vm.tmdbConfig.tmdbMovieLinkUrl}}{{vm.movieinfo.id}}</a></dd>
<dt class="h-line">{{ 'TMDB_FIELDS.OVERVIEW' | translate}}：</dt>
<dd class="h-line">{{vm.movieinfo.overview}}</dd>
@@ -227,7 +227,7 @@
<legend class="xsmall-legend strong-legend" translate="TMDB_FIELDS.CAST"></legend>
<div class="row cast-list">
<div class="col-xs-4 col-md-2 text-center" ng-repeat="cast in vm.movieinfo.credits.cast | limitTo: 6">
<img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{cast.profile_path}}"
<img ng-src="{{vm.tmdbConfig.castImgBaseUrl}}{{cast.profile_path}}"
on-error-src="/./modules/core/client/img/default_face.jpg"
class="img-circle img-thumbnail img-responsive center-block">
<span class="cast-xs-info"><strong>{{cast.name}}</strong></span>
@@ -282,7 +282,7 @@
<div class="col-md-12 col-sm-12 col-xs-12">
<legend class="small-legend" translate="TMDB_RESOURCE_INFO"></legend>
<div class="col-md-4 col-sm-4 col-xs-12">
<img ng-src="{{vm.tmdbConfig.poster_img_base_url}}{{vm.tvinfo.poster_path}}" class="img-thumbnail">
<img ng-src="{{vm.tmdbConfig.posterImgBaseUrl}}{{vm.tvinfo.poster_path}}" class="img-thumbnail">
</div>
<div class="col-md-8 col-sm-8 col-xs-12">
<dl class="dl-horizontal">
@@ -329,8 +329,8 @@
<dd class="h-line">{{vm.tvinfo.vote_average}} / {{vm.tvinfo.vote_count}} {{ 'TMDB_FIELDS.VOTE_UNIT' | translate}}</dd>
<dt class="h-line">{{ 'TMDB_FIELDS.TMDB_LINK' | translate}}：</dt>
<dd class="h-line"><a href="{{vm.tmdbConfig.tmdb_tv_link_url}}{{vm.tvinfo.id}}"
target="_blank">{{vm.tmdbConfig.tmdb_tv_link_url}}{{vm.tvinfo.id}}</a></dd>
<dd class="h-line"><a href="{{vm.tmdbConfig.tmdbTvserialLinkUrl}}{{vm.tvinfo.id}}"
target="_blank">{{vm.tmdbConfig.tmdbTvserialLinkUrl}}{{vm.tvinfo.id}}</a></dd>
<dt class="h-line">{{ 'TMDB_FIELDS.OVERVIEW' | translate}}：</dt>
<dd class="h-line">{{vm.tvinfo.overview}}</dd>
@@ -338,7 +338,7 @@
<legend class="xsmall-legend strong-legend" translate="TMDB_FIELDS.CAST"></legend>
<div class="row cast-list">
<div class="col-xs-4 col-md-2 text-center" ng-repeat="cast in vm.tvinfo.credits.cast | limitTo: 6">
<img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{cast.profile_path}}"
<img ng-src="{{vm.tmdbConfig.castImgBaseUrl}}{{cast.profile_path}}"
on-error-src="/./modules/core/client/img/default_face.jpg"
class="img-circle img-thumbnail img-responsive center-block">
<span class="cast-xs-info"><strong>{{cast.name}}</strong></span>

24
modules/torrents/client/views/view-torrent.client.view.html
View File

@@ -4,7 +4,7 @@
<div class="container">
<div class="topone">
<div class="col-md-4">
<img ng-src="{{vm.tmdbConfig.poster_img_base_url}}{{vm.torrentLocalInfo.resource_detail_info.poster_path}}"
<img ng-src="{{vm.tmdbConfig.posterImgBaseUrl}}{{vm.torrentLocalInfo.resource_detail_info.poster_path}}"
class="img-thumbnail center-block"
onload="this.style.opacity='1';">
@@ -138,15 +138,15 @@
<div ng-show="vm.torrentLocalInfo.resource_detail_info.imdb_id">
<dt class="h-line">{{ 'TMDB_FIELDS.IMDB_LINK' | translate}}：</dt>
<dd class="h-line">
<a href="{{vm.imdbConfig.imdb_link_url}}{{vm.torrentLocalInfo.resource_detail_info.imdb_id}}"
target="_blank">{{vm.imdbConfig.imdb_link_url}}{{vm.torrentLocalInfo.resource_detail_info.imdb_id}}</a>
<a href="{{vm.imdbConfig.imdbLinkUrl}}{{vm.torrentLocalInfo.resource_detail_info.imdb_id}}"
target="_blank">{{vm.imdbConfig.imdbLinkUrl}}{{vm.torrentLocalInfo.resource_detail_info.imdb_id}}</a>
</dd>
</div>
<div ng-show="vm.torrentLocalInfo.resource_detail_info.id">
<dt class="h-line">{{ 'TMDB_FIELDS.TMDB_LINK' | translate}}：</dt>
<dd class="h-line"><a href="{{vm.tmdbConfig.tmdb_movie_link_url}}{{vm.torrentLocalInfo.resource_detail_info.id}}"
target="_blank">{{vm.tmdbConfig.tmdb_movie_link_url}}{{vm.torrentLocalInfo.resource_detail_info.id}}</a>
<dd class="h-line"><a href="{{vm.tmdbConfig.tmdbMovieLinkUrl}}{{vm.torrentLocalInfo.resource_detail_info.id}}"
target="_blank">{{vm.tmdbConfig.tmdbMovieLinkUrl}}{{vm.torrentLocalInfo.resource_detail_info.id}}</a>
</dd>
</div>
@@ -157,7 +157,7 @@
<div class="row cast-list">
<div class="col-xs-4 col-md-2 text-center"
ng-repeat="cast in vm.torrentLocalInfo.resource_detail_info.credits.cast | limitTo: 6">
<img ng-src="{{vm.tmdbConfig.cast_img_base_url}}{{cast.profile_path}}"
<img ng-src="{{vm.tmdbConfig.castImgBaseUrl}}{{cast.profile_path}}"
on-error-src="/./modules/core/client/img/default_face.jpg"
class="img-circle img-thumbnail img-responsive center-block" onload="this.style.opacity='1';">
<span class="cast-xs-info"><strong>{{cast.name}}</strong></span>
@@ -212,7 +212,7 @@
<div class="timeline-comment-header-text">
<span user-info="item.user" info-name></span>
<span message-to="item.user" to-class="message-to-icon"></span>
<span class="user-ud-text" ng-if="vm.announce.private_torrent_cms">
<span class="user-ud-text" ng-if="vm.announce.privateTorrentCmsMode">
(<span class="glyphicon glyphicon-arrow-up torrent-up"></span>{{item.user.uploaded | bytes}}
<span class="glyphicon glyphicon-arrow-down torrent-down"></span>{{item.user.downloaded | bytes}}
)
@@ -359,7 +359,7 @@
</div>
</dd>
<div ng-if="vm.announce.private_torrent_cms">
<div ng-if="vm.announce.privateTorrentCmsMode">
<dt class="h-line">{{ 'VIDEO_SALE_INFO' | translate}}：</dt>
<dd class="h-line">
<span class="label label-sale"
@@ -669,14 +669,14 @@
<button class="btn btn-default btn-sm" ng-click="vm.deleteTorrent();">{{ 'ADMIN_BASIC_DELETE' | translate}}</button>
</dt>
<div class="margin-top-20" ng-if="vm.announce.private_torrent_cms"></div>
<div class="margin-top-20" ng-if="vm.announce.privateTorrentCmsMode"></div>
<dt class="h-line" ng-if="vm.announce.private_torrent_cms">{{ 'ADMIN_SALE_TYPE_SET' | translate}}:</dt>
<dd class="h-line" ng-if="vm.announce.private_torrent_cms">
<dt class="h-line" ng-if="vm.announce.privateTorrentCmsMode">{{ 'ADMIN_SALE_TYPE_SET' | translate}}:</dt>
<dd class="h-line" ng-if="vm.announce.privateTorrentCmsMode">
<mark>{{vm.getSaleTypeDesc();}}</mark>
</dd>
<div class="padding-top-10 margin-left-50" ng-if="vm.announce.private_torrent_cms">
<div class="padding-top-10 margin-left-50" ng-if="vm.announce.privateTorrentCmsMode">
<div class="btn-group sales-btn-group text-center">
<label ng-repeat="st in vm.torrentSalesType.value"
class="btn btn-sm" ng-model="vm.model_salestype" uib-btn-radio="'{{st.name}}'" uncheckable

10
modules/torrents/server/controllers/torrents.server.controller.js
View File

@@ -154,7 +154,7 @@ exports.upload = function (req, res) {
message = 'Read torrent file faild';
reject(message);
} else {
if (config.meanTorrentConfig.announce.private_torrent_cms) {
if (config.meanTorrentConfig.announce.privateTorrentCmsMode) {
if (torrent.metadata.announce !== config.meanTorrentConfig.announce.url) {
console.log(torrent.metadata.announce);
message = 'ANNOUNCE_URL_ERROR';
@@ -320,7 +320,7 @@ exports.download = function (req, res) {
getTorrentFileData(filePath)
.then(function () {
res.set('Content-Type', 'application/x-bittorrent');
res.set('Content-Disposition', 'attachment; filename=' + config.meanTorrentConfig.announce.announce_prefix + encodeURI(req.torrent.torrent_filename));
res.set('Content-Disposition', 'attachment; filename=' + config.meanTorrentConfig.announce.announcePrefix + encodeURI(req.torrent.torrent_filename));
res.set('Content-Length', stat.size);
res.send(benc.encode(torrent_data));
@@ -345,7 +345,7 @@ exports.download = function (req, res) {
message = 'Read torrent file faild';
reject(message);
} else {
if (config.meanTorrentConfig.announce.private_torrent_cms) {
if (config.meanTorrentConfig.announce.privateTorrentCmsMode) {
var announce = config.meanTorrentConfig.announce.url + '/' + req.user.passkey;
torrent.metadata.announce = announce;
}
@@ -608,7 +608,7 @@ exports.setReviewedStatus = function (req, res) {
var client = req.app.get('ircClient');
if (torrent.torrent_type === 'tvserial') {
msg = vsprintf(ircConfig.tvserial_msg_format, [
msg = vsprintf(ircConfig.tvserialMsgFormat, [
torrent.user.displayName,
torrent.torrent_filename,
torrent.torrent_type,
@@ -619,7 +619,7 @@ exports.setReviewedStatus = function (req, res) {
moment().format('YYYY-MM-DD HH:mm:ss')
]);
} else {
msg = vsprintf(ircConfig.default_msg_format, [
msg = vsprintf(ircConfig.defaultMsgFormat, [
torrent.user.displayName,
torrent.torrent_filename,
torrent.torrent_type,

2
modules/traces/client/controllers/traces.client.controller.js
View File

@@ -26,7 +26,7 @@
*/
vm.buildPager = function () {
vm.pagedItems = [];
vm.itemsPerPage = vm.itemsPerPageConfig.traces_per_page;
vm.itemsPerPage = vm.itemsPerPageConfig.tracesPerPage;
vm.currentPage = 1;
vm.figureOutItemsToDisplay();
};

2
modules/users/client/controllers/score/score.client.controller.js
View File

@@ -46,7 +46,7 @@
closeButtonText: $translate.instant('EXCHANGE_INVITATION_CONFIRM_CANCEL'),
actionButtonText: $translate.instant('EXCHANGE_INVITATION_CONFIRM_OK'),
headerText: $translate.instant('EXCHANGE_INVITATION_CONFIRM_HEADER_TEXT'),
bodyText: $translate.instant('EXCHANGE_INVITATION_CONFIRM_BODY_TEXT', {score: vm.inviteConfig.score_exchange})
bodyText: $translate.instant('EXCHANGE_INVITATION_CONFIRM_BODY_TEXT', {score: vm.inviteConfig.scoreExchange})
};
ModalConfirmService.showModal({}, modalOptions)

2
modules/users/client/services/scoreLevel.client.service.js
View File

@@ -9,7 +9,7 @@
function ScoreLevelService(MeanTorrentConfig) {
var scoreConfig = MeanTorrentConfig.meanTorrentConfig.score;
var step = scoreConfig.level_step;
var step = scoreConfig.levelStep;
return {
getScoreLevelJson: function (score) {

6
modules/users/client/views/admin/view-user.client.view.html
View File

@@ -95,7 +95,7 @@
</div>
</dd>
<div ng-if="vm.announce.private_torrent_cms">
<div ng-if="vm.announce.privateTorrentCmsMode">
<dt class="h-line">{{ 'STATUS_FIELD.LEECHED_IP' | translate}}：</dt>
<dd class="h-line">
<div class="list-all-ips">
@@ -113,7 +113,7 @@
<li class="status-divider"></li>
<div ng-if="vm.announce.private_torrent_cms">
<div ng-if="vm.announce.privateTorrentCmsMode">
<dt class="h-line">{{ 'STATUS_FIELD.UPLOADED' | translate}}：</dt>
<dd class="h-line">
<span class="glyphicon glyphicon-arrow-up torrent-up"></span>
@@ -176,7 +176,7 @@
<li class="status-divider"></li>
<div ng-if="vm.announce.private_torrent_cms">
<div ng-if="vm.announce.privateTorrentCmsMode">
<dt class="h-line">{{ 'STATUS_FIELD.SEEDED' | translate}}：</dt>
<dd class="h-line">{{ vm.user.seeded }}</dd>

2
modules/users/client/views/authentication/authentication.client.view.html
View File

@@ -6,7 +6,7 @@
<div class="col-sm-7">
<div ui-view></div>
<div ng-if="vm.signConfig.allow_social_sign">
<div ng-if="vm.signConfig.allowSocialSignin">
<legend class="col-sm-10 col-sm-offset-1 small-legend margin-top-40">{{ 'SIGN.SIGN_SOCIAL' | translate}}</legend>
<div class="col-md-12 text-center social-list margin-bottom-40">

2
modules/users/client/views/authentication/signin.client.view.html
View File

@@ -2,7 +2,7 @@
<legend class="col-sm-10 col-sm-offset-1 small-legend margin-top-40">{{ 'SIGN.SIGN_IN' | translate}}</legend>
<div class="col-sm-8 col-sm-offset-2">
<div class="margin-bottom-30" ng-if="vm.signConfig.show_demo_sign_message">
<div class="margin-bottom-30" ng-if="vm.signConfig.showDemoSignMessage">
<span translate="DEMO_INFO"></span>
</div>
<form name="vm.userForm" ng-submit="vm.signin(vm.userForm.$valid)" class="signin" novalidate autocomplete="off">

4
modules/users/client/views/authentication/signup.client.view.html
View File

@@ -1,9 +1,9 @@
<div ng-init="vm.verifyToken();">
<div class="margin-top-50 padding-top-20" ng-if="!vm.signConfig.open_signup && !vm.validToken">
<div class="margin-top-50 padding-top-20" ng-if="!vm.signConfig.openSignup && !vm.validToken">
<div class="col-sm-10 col-sm-offset-1" marked src="'/modules/users/client/templates/sign-in-closed-message-'+vm.lang+'.md'" compile="true">
</div>
</div>
<div ng-if="vm.signConfig.open_signup || vm.validToken">
<div ng-if="vm.signConfig.openSignup || vm.validToken">
<legend class="col-sm-10 col-sm-offset-1 small-legend margin-top-40">{{ 'SIGN.SIGN_UP' | translate}}</legend>
<div class="col-sm-8 col-sm-offset-2">

8
modules/users/client/views/score/detail.client.view.html
View File

@@ -23,16 +23,16 @@
</div>
</div>
<div class="row margin-top-30" ng-show="vm.inviteConfig.open_invite">
<div class="row margin-top-30" ng-show="vm.inviteConfig.openInvite">
<div class="col-sm-8 col-sm-offset-2 text-center">
<button class="btn btn-default" ng-disabled="vm.user.score < vm.inviteConfig.score_exchange"
translate="EXCHANGE_INVITATION" translate-values='{ score: vm.inviteConfig.score_exchange}'
<button class="btn btn-default" ng-disabled="vm.user.score < vm.inviteConfig.scoreExchange"
translate="EXCHANGE_INVITATION" translate-values='{ score: vm.inviteConfig.scoreExchange}'
ng-click="vm.exchangeInvitation();">
</button>
</div>
</div>
<div class="row margin-top-30" ng-hide="vm.inviteConfig.open_invite">
<div class="row margin-top-30" ng-hide="vm.inviteConfig.openInvite">
<div class="col-sm-8 col-sm-offset-2 text-center">
<div class="alert alert-warning" role="alert">
<strong>{{ 'NOTE_CAPTION' | translate }}</strong> {{ 'INVITE_CLOSED' | translate }}

2
modules/users/client/views/settings/settings.client.view.html
View File

@@ -17,7 +17,7 @@
<li ui-sref-active="active">
<a ui-sref="settings.passkey">{{'RESET_PASSKEY' | translate}}</a>
</li>
<li ui-sref-active="active" ng-if="vm.signConfig.allow_social_sign">
<li ui-sref-active="active" ng-if="vm.signConfig.allowSocialSignin">
<a ui-sref="settings.accounts">{{'MANAGE_SOCIAL_ACCOUNTS' | translate}}</a>
</li>
</ul>

2
modules/users/client/views/status/account.client.view.html
View File

@@ -71,7 +71,7 @@
</div>
</dd>
<div ng-if="vm.announce.private_torrent_cms">
<div ng-if="vm.announce.privateTorrentCmsMode">
<dt class="h-line">{{ 'STATUS_FIELD.LEECHED_IP' | translate}}：</dt>
<dd class="h-line">
<div class="list-all-ips">

2
modules/users/client/views/status/downloading.client.view.html
View File

@@ -37,7 +37,7 @@
<div class="media">
<div class="media-left">
<img class="media-object"
ng-src="{{vm.tmdbConfig.poster_list_base_url}}{{item.torrent.resource_detail_info.poster_path}}"
ng-src="{{vm.tmdbConfig.posterListBaseUrl}}{{item.torrent.resource_detail_info.poster_path}}"
alt="...">
</div>
<div class="media-body">

2
modules/users/client/views/status/seeding.client.view.html
View File

@@ -37,7 +37,7 @@
<div class="media">
<div class="media-left">
<img class="media-object"
ng-src="{{vm.tmdbConfig.poster_list_base_url}}{{item.torrent.resource_detail_info.poster_path}}"
ng-src="{{vm.tmdbConfig.posterListBaseUrl}}{{item.torrent.resource_detail_info.poster_path}}"
alt="...">
</div>
<div class="media-body">

6
modules/users/client/views/status/status.client.view.html
View File

@@ -2,9 +2,9 @@
<div class="tab-status margin-top-40">
<ul class="nav nav-tabs">
<li ui-sref="status.account" ui-sref-active="active"><a>{{'STATUS_ACCOUNT' | translate}}</a></li>
<li ui-sref="status.uploaded" ui-sref-active="active" ng-if="vm.announce.private_torrent_cms"><a>{{'STATUS_UPLOADED' | translate}}</a></li>
<li ui-sref="status.seeding" ui-sref-active="active" ng-if="vm.announce.private_torrent_cms"><a>{{'STATUS_SEEDING' | translate}}</a></li>
<li ui-sref="status.downloading" ui-sref-active="active" ng-if="vm.announce.private_torrent_cms"><a>{{'STATUS_DOWNLOADING' | translate}}</a></li>
<li ui-sref="status.uploaded" ui-sref-active="active" ng-if="vm.announce.privateTorrentCmsMode"><a>{{'STATUS_UPLOADED' | translate}}</a></li>
<li ui-sref="status.seeding" ui-sref-active="active" ng-if="vm.announce.privateTorrentCmsMode"><a>{{'STATUS_SEEDING' | translate}}</a></li>
<li ui-sref="status.downloading" ui-sref-active="active" ng-if="vm.announce.privateTorrentCmsMode"><a>{{'STATUS_DOWNLOADING' | translate}}</a></li>
</ul>
</div>

2
modules/users/client/views/status/uploaded.client.view.html
View File

@@ -37,7 +37,7 @@
<div class="media">
<div class="media-left">
<img class="media-object"
ng-src="{{vm.tmdbConfig.poster_list_base_url}}{{item.resource_detail_info.poster_path}}"
ng-src="{{vm.tmdbConfig.posterListBaseUrl}}{{item.resource_detail_info.poster_path}}"
alt="...">
</div>
<div class="media-body">

6
modules/users/client/views/userinfo/userinfo.client.view.html
View File

@@ -63,7 +63,7 @@
<dt class="h-line">{{ 'STATUS_FIELD.LATEST_SIGNED_TIME' | translate}}：</dt>
<dd class="h-line">{{ vm.user.last_signed | date: 'yyyy-MM-dd HH:mm:ss' }}</dd>
<div ng-if="vm.announce.private_torrent_cms">
<div ng-if="vm.announce.privateTorrentCmsMode">
<dt class="h-line">{{ 'STATUS_FIELD.SIGNED_IP' | translate}}：</dt>
<dd class="h-line">
<div class="list-all-ips">
@@ -88,7 +88,7 @@
<li class="status-divider"></li>
<div ng-if="vm.announce.private_torrent_cms">
<div ng-if="vm.announce.privateTorrentCmsMode">
<dt class="h-line">{{ 'STATUS_FIELD.UPLOADED' | translate}}：</dt>
<dd class="h-line">
<span class="glyphicon glyphicon-arrow-up torrent-up"></span>
@@ -110,7 +110,7 @@
<span>{{ vm.user.score }}</span> <span score-level="vm.scoreLevelData.currLevel"></span>
</dd>
<div ng-if="vm.announce.private_torrent_cms">
<div ng-if="vm.announce.privateTorrentCmsMode">
<li class="status-divider"></li>
<dt class="h-line">{{ 'STATUS_FIELD.SEEDED' | translate}}：</dt>