-
Date: getAddedAt() ?>
+
Uploaded Date: getAddedAt() ?>
File size: e($torrent->getTorrentSize(),'format_bytes') ?>
-
Uploader:
+
Uploader:
- Peers: getComplete() ?> / getIncomplete() ?> / getDownloaded() ?>
+ Peers: getComplete() ?> / getIncomplete() ?> / getDownloaded() ?>
Info Hash: getInfoHash() ?>
diff --git a/apps/views/torrents/helper.php b/apps/views/torrents/helper.php
index 0005e8b..6059633 100644
--- a/apps/views/torrents/helper.php
+++ b/apps/views/torrents/helper.php
@@ -14,9 +14,20 @@
* @param \apps\models\Torrent $torrent
* @return string
*/
-function get_torrent_uploader(\apps\models\Torrent $torrent)
+
+function get_torrent_uploader_id(\apps\models\Torrent $torrent)
{
if ($torrent->getUplver() == 'yes' and app()->user->getClass(true) < app()->config->get('authority.see_anonymous_uploader')) {
+ return 0;
+ } else {
+ return $torrent->getOwnerId();
+ }
+}
+
+function get_torrent_uploader(\apps\models\Torrent $torrent)
+{
+ $owner_id = get_torrent_uploader_id($torrent);
+ if ($owner_id == 0) {
return '
Anonymous';
} else {
return "
getOwnerId()}\" data-toggle=\"tooltip\" title=\"User\">{$torrent->getOwner()->getUsername()}";
diff --git a/framework/Http/ApiController.php b/framework/Http/ApiController.php
new file mode 100644
index 0000000..0052193
--- /dev/null
+++ b/framework/Http/ApiController.php
@@ -0,0 +1,42 @@
+request->method()) == strtolower($method))
+ return true;
+ }
+ return false;
+ }
+
+ protected function buildMethodFailMsg($want_methods)
+ {
+ if (is_array($want_methods)) $want_methods = implode(',', $want_methods);
+
+ app()->response->setStatusCode(405);
+ $method = app()->request->method();
+
+ return [
+ 'error' => 'Method Not Allowed',
+ 'detail' => [
+ 'method' => "The method `$method` is not allowed, You should use `$want_methods` in this action."
+ ]
+ ];
+ }
+}
diff --git a/framework/Http/BaseResponse.php b/framework/Http/BaseResponse.php
index c6a3e33..cd2c7d2 100644
--- a/framework/Http/BaseResponse.php
+++ b/framework/Http/BaseResponse.php
@@ -14,17 +14,11 @@ class BaseResponse extends Component
const FORMAT_HTML = 'html';
const FORMAT_JSON = 'json';
const FORMAT_JSONP = 'jsonp';
- const FORMAT_XML = 'xml';
const FORMAT_RAW = 'raw';
// 默认输出格式
public $defaultFormat = self::FORMAT_HTML;
- /**
- * @var \Rid\Http\Xml
- */
- public $xml;
-
// 当前输出格式
public $format;
@@ -71,9 +65,6 @@ protected function prepare()
case self::FORMAT_JSONP:
$this->setHeader('Content-Type', 'application/json; charset=utf-8');
break;
- case self::FORMAT_XML:
- $this->setHeader('Content-Type', 'text/xml; charset=utf-8');
- break;
}
}
// 转换内容为字符型
@@ -91,9 +82,6 @@ protected function prepare()
$content = $callback_key . '(' . $content . ')';
break;
}
- case self::FORMAT_XML:
- $content = $this->xml->encode($content);
- break;
}
}
$this->content = $content;
diff --git a/framework/Http/Error.php b/framework/Http/Error.php
index c69cdb1..9bf6706 100644
--- a/framework/Http/Error.php
+++ b/framework/Http/Error.php
@@ -13,7 +13,6 @@ class Error extends Component
// 格式值
const FORMAT_HTML = 'html';
const FORMAT_JSON = 'json';
- const FORMAT_XML = 'xml';
// 输出格式
public $format = self::FORMAT_HTML;
diff --git a/framework/User/User.php b/framework/User/User.php
index 1a80eae..c9ebe13 100644
--- a/framework/User/User.php
+++ b/framework/User/User.php
@@ -93,12 +93,12 @@ public function getBookmarkList()
if (!is_null($this->bookmark_list))
return $this->bookmark_list;
- $bookmaks = app()->redis->hGet($this->infoCacheKey, 'bookmark_array');
+ $bookmaks = app()->redis->get('User:' . $this->id . ':bookmark_array');
if ($bookmaks === false) {
$bookmaks = app()->pdo->createCommand('SELECT `tid` FROM `bookmarks` WHERE `uid` = :uid')->bindParams([
'uid' => $this->id
])->queryColumn() ?: [0];
- app()->redis->hSet($this->infoCacheKey, 'bookmark_array', $bookmaks);
+ app()->redis->set('User:' . $this->id . ':bookmark_array', $bookmaks, 132800);
}
$this->bookmark_list = $bookmaks; // Store in avg to reduce the cache call
diff --git a/framework/User/UserTrait.php b/framework/User/UserTrait.php
index c68d3d6..3efa4c7 100644
--- a/framework/User/UserTrait.php
+++ b/framework/User/UserTrait.php
@@ -48,7 +48,7 @@ trait UserTrait
public function loadUserContentById($id)
{
- $this->infoCacheKey = 'User:id_' . $id . '_content';
+ $this->infoCacheKey = 'User:' . $id . ':base_content';
$self = app()->redis->hGetAll($this->infoCacheKey);
if (empty($self)) {
$self = app()->pdo->createCommand("SELECT * FROM `users` WHERE id = :id;")->bindParams([
diff --git a/framework/Validators/Validator.php b/framework/Validators/Validator.php
index 272ef26..1ad453b 100644
--- a/framework/Validators/Validator.php
+++ b/framework/Validators/Validator.php
@@ -43,9 +43,10 @@ public static function callbackRules() {
}
- private function validateCallbackRules() {
- foreach ($this->callbackRules() as $rule) {
- call_user_func([$this,$rule]);
+ private function validateCallbackRules()
+ {
+ foreach (static::callbackRules() as $rule) {
+ call_user_func([$this, $rule]);
if (!$this->_success) break;
}
}