Merge branch 'release/7.3.8' into 'master'

Release/7.3.8

See merge request !3703

Author: nifeng

CHANGELOG

@@ -1,5 +1,8 @@
 CHANGELOG
 =========
+7.3.8（2016-12-23）
+新增：移动端接口支持
+
 7.3.7 （2016-12-22）
 新增：后台订单新增手机号、邮箱检索
 新增：班级添加课程，新增翻页

api/src/Topxia/Api/Filter/UserFilter.php

@@ -1,8 +1,8 @@
 <?php
 
 namespace Topxia\Api\Filter;
+use Codeages\PluginBundle\System\PluginConfigurationManager;
 use Topxia\Service\Common\ServiceKernel;
-use Topxia\Common\PluginToolkit;
 
 class UserFilter implements Filter
 {
@@ -24,7 +24,7 @@ public function filter(array &$data)
             unset($data['verifiedMobile']);
         }
 
-        if (PluginToolkit::isPluginInstalled('Vip')) {
+        if ($this->isPluginInstalled('Vip')) {
             $userVip = $this->getVipService()->getMemberByUserId($data['id']);
 
             if (!empty($userVip)) {
@@ -147,6 +147,12 @@ public function convertAbsoluteUrl($host, $html)
 
     }
 
+    protected function isPluginInstalled($code)
+    {
+        $pluginManager = new PluginConfigurationManager(ServiceKernel::instance()->getParameter('kernel.root_dir'));
+        return $pluginManager->isPluginInstalled($code);
+    }
+
     protected function getVipLevelService()
     {
         return ServiceKernel::instance()->createService('Vip:Vip.LevelService');

api/src/Topxia/Api/Resource/BaseResource.php

@@ -177,7 +177,7 @@ public function getFileUrl($path)
         if (empty($path)) {
             return '';
         }
-        if (strpos($path, "http://") !== false) {
+        if (strpos($path, $this->getHttpHost()."://") !== false) {
             return $path;
         }
         $path = str_replace('public://', '', $path);
@@ -198,7 +198,16 @@ protected function getAssetUrl($path)
 
     protected function getHttpHost()
     {
-        return "http://{$_SERVER['HTTP_HOST']}";
+        return $this->getSchema()."://{$_SERVER['HTTP_HOST']}";
+    }
+
+    protected function getSchema()
+    {
+        $https = $_SERVER['HTTPS'];
+        if(!empty($https) && 'off' !== strtolower($https)) {
+            return 'https';
+        }
+        return 'http';
     }
 
     protected function generateUrl($route, $parameters = array())

app/config/config.yml

@@ -25,7 +25,7 @@ framework:
     fragments:       ~
     http_method_override: true
     assets:
-        version: '7.3.7'
+        version: '7.3.8'
 
 # Twig Configuration
 twig:
@@ -68,10 +68,13 @@ parameters:
     topxia.upload.public_directory: "%kernel.root_dir%/../web/files"
     topxia.upload.public_url_path: "/files"
     topxia.upload.private_directory: "%kernel.root_dir%/data/private_files"
-    templating.asset.path_package.class: Topxia\WebBundle\Twig\Asset\PathPackage
 
 services:
 
+    assets.path_package:
+        class: Topxia\WebBundle\Twig\Asset\PathPackage
+        arguments: ["", "", "@assets.context"]
+
     app.locale_listener:
         class: Topxia\WebBundle\Listener\LocaleListener
         arguments: ['%kernel.default_locale%']

src/MaterialLib/Service/MaterialLib/Impl/MaterialLibServiceImpl.php

@@ -19,9 +19,9 @@ public function getByGlobalId($globalId)
         return $this->getUploadFileService()->getFileByGlobalId($globalId);
     }
 
-    public function player($globalId)
+    public function player($globalId, $ssl = false)
     {
-        return $this->getCloudFileService()->player($globalId);
+        return $this->getCloudFileService()->player($globalId, $ssl);
     }
 
     public function edit($fileId, $fields)

src/MaterialLib/Service/MaterialLib/MaterialLibService.php

@@ -28,7 +28,7 @@ public function getDefaultHumbnails($globalId);
 
     public function getThumbnail($globalId, $options);
 
-    public function player($globalId);
+    public function player($globalId, $ssl = false);
 
     public function synData();
 

src/Topxia/AdminBundle/Resources/public/js/controller/user/edit-modal.js

@@ -60,7 +60,7 @@ define(function(require, exports, module) {
         validator.addItem({
             element: '[name="site"]',
             rule: 'url',
-            errormessageUrl: Translator.trans('网站地址不正确，须以http://开头。')
+            errormessageUrl: Translator.trans('网站地址不正确，须以http://或https://开头。')
         });
 
         validator.addItem({

src/Topxia/AdminBundle/Resources/translations/messages.en.yml

@@ -1817,7 +1817,7 @@ Key生成失败，请检查服务器网络后，重试！: 'Key created failed,p
 '新用户添加失败': 'New user add failed'
 用户信息保存成功: 'User information saved successfully'
 '网站地址不正确，须以http://weibo.com开头。': 'The website address is not correct which should starts with http://weibo.com.'
-'网站地址不正确，须以http://开头。': 'The website address is not correct which should starts with http://.'
+'网站地址不正确，须以http://或者https://开头。': 'The website address is not correct which should starts with http://.'
 '已经导入：%progressNum%': '%progressNum% already imported'
 '%data%完成': '%data% completed'
 真的要%title%吗？: 'Are you sure want  %title%？'

src/Topxia/AdminBundle/Resources/views/Block/Tag/imglink.html.twig

@@ -19,7 +19,7 @@
  <div class="form-group">
     <label class="control-label col-md-3 col-xs-3" for="data[{{ code }}][{{ dataId }}][href]">{{'图片链接'|trans}}</label>
   <div class="col-md-8 col-xs-8">
-    <input class="form-control" type="text" name="data[{{ code }}][{{ dataId }}][href]" id="data[{{ code }}][{{ dataId }}][href]" value="{{ data.href|default('') }}" placeholder="http://">
+    <input class="form-control" type="text" name="data[{{ code }}][{{ dataId }}][href]" id="data[{{ code }}][{{ dataId }}][href]" value="{{ data.href|default('') }}" placeholder="{{ app.request.getScheme() }}://">
   </div>
  </div>
 

src/Topxia/AdminBundle/Resources/views/Block/Tag/link.html.twig

@@ -7,7 +7,7 @@
  <div class="form-group">
   <label class="control-label col-md-3 col-xs-3" for="data[{{ code }}][{{ dataId }}][href]">{{'链接地址'|trans}}</label>
   <div class="col-md-9 col-xs-9">
-    <input class="form-control" type="text" name="data[{{ code }}][{{ dataId }}][href]" value="{{ data.href|default('') }}" placeholder="http://" >
+    <input class="form-control" type="text" name="data[{{ code }}][{{ dataId }}][href]" value="{{ data.href|default('') }}" placeholder="{{ app.request.getScheme() }}://" >
   </div>
  </div>
  <div class="form-group">