fc2blog · fc2dev · Mar 15, 2021 · Mar 7, 2021 · Mar 7, 2021 · Mar 7, 2021
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,64 @@
+name: release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Setup PHP 8.0
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+          extensions: mbstring, gd, gettext, fileinfo, pdo, pdo_mysql, mysqli, zip
+
+      - uses: actions/checkout@v2
+
+      - name: get composer
+        run: |
+          curl -sSfL -o composer-setup.php https://getcomposer.org/installer
+          php composer-setup.php --filename=composer.phar
+          rm composer-setup.php
+
+      - name: composer install
+        run: php composer.phar install --no-ansi --no-interaction --no-scripts --no-progress
+
+      - name: pre build
+        run: |
+          cd dist_zip && make pre-build
+
+      - name: create version file
+        run: |
+          VERSION=$(echo ${{ github.ref }} | sed -e "s#refs/tags/##g")
+          cd dist_zip && echo $VERSION > fc2blog/app/version
+
+      - name: make zip
+        run: |
+          cd dist_zip && make make-zip
+
+      - name: create release
+        id: create_release
+        uses: actions/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          draft: false
+          prerelease: false
+
+      - name: attach zip
+        id: upload-release-asset
+        uses: actions/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: dist_zip/fc2blog_dist.zip
+          asset_name: fc2blog_dist.zip
+          asset_content_type: application/zip
diff --git a/Makefile b/Makefile
@@ -55,6 +55,14 @@ docker-compose-build:
 	$(eval GID := $(shell id -g))
 	@docker-compose build --build-arg PUID=$(UID) --build-arg PGID=$(GID) php
 
+.PHONY: mysql-shell
+mysql-shell:
+	$(dexec_tty) make d-mysql-shell
+
+.PHONY: d-mysql-shell
+d-mysql-shell:
+	mysql -u $(FC2_DB_USER) -p$(FC2_DB_PASSWORD) -h $(FC2_DB_HOST) -P $(FC2_DB_PORT) "$(FC2_DB_DATABASE)"
+
 .PHONY: db-dump-schema
 db-dump-schema:
 	$(dexec) make d-db-dump-schema

diff --git a/app/config.sample.php b/app/config.sample.php
@@ -21,6 +21,3 @@
 // publicとappの位置関係を修正した場合には変更してください
 // Please edit the path when change `app` and `public` relative path condition.
 define('WWW_DIR', __DIR__ . '/../public/'); // this path need finish with slash.
-
-// 設定クラス読み込み
-require(__DIR__ . '/core/bootstrap.php');
diff --git a/app/config_read_from_env.php b/app/config_read_from_env.php
@@ -41,8 +41,4 @@
 // Please edit the path when change `app` and `public` relative path condition.
 define('WWW_DIR', (string)getenv("FC2_DOCUMENT_ROOT_PATH"));
 
-//define('DEFAULT_BLOG_ID', (string)getenv("DEFAULT_BLOG_ID"));
 define("DEFAULT_BLOG_ID", (string)getenv("FC2_DEFAULT_BLOG_ID"));
-
-// 設定クラス読み込み
-require(__DIR__ . '/core/bootstrap.php');
diff --git a/app/include/index_include.php b/app/include/index_include.php
diff --git a/app/locale/en_US.UTF-8/LC_MESSAGES/messages.po b/app/locale/en_US.UTF-8/LC_MESSAGES/messages.po
@@ -2500,3 +2500,6 @@ msgstr ""
 
 msgid "Host port"
 msgstr ""
+
+msgid "Name that cannot be specified"
+msgstr ""
diff --git a/app/locale/ja_JP.UTF-8/LC_MESSAGES/messages.mo b/app/locale/ja_JP.UTF-8/LC_MESSAGES/messages.mo
diff --git a/app/locale/ja_JP.UTF-8/LC_MESSAGES/messages.po b/app/locale/ja_JP.UTF-8/LC_MESSAGES/messages.po
@@ -2547,3 +2547,6 @@ msgstr "(パスワードを変更しない場合、空欄のままとしてく
 
 msgid "Host port"
 msgstr "ホスト ポート番号"
+
+msgid "Name that cannot be specified"
+msgstr "指定できない名称です"
diff --git a/app/src/App.php b/app/src/App.php
@@ -36,7 +36,7 @@ public static function getBlogLayer(string $blog_id): string
   public static function getUserFilePath(array $file, $abs = false, $timestamp = false): string
   {
     $file_path = static::getBlogLayer($file['blog_id']) . '/file/' . $file['id'] . '.' . $file['ext'];
-    return ($abs ? Config::get('WWW_UPLOAD_DIR') : '/' . Config::get('UPLOAD_DIR_NAME') . '/') . $file_path . ($timestamp ? '?t=' . strtotime($file['updated_at']) : '');
+    return ($abs ? Config::get('WWW_UPLOAD_DIR') : '/uploads/') . $file_path . ($timestamp ? '?t=' . strtotime($file['updated_at']) : '');
   }
 
   /**

diff --git a/app/src/Model/BlogTemplatesModel.php b/app/src/Model/BlogTemplatesModel.php
@@ -134,7 +134,7 @@ public static function getCssFilePath($blog_id, $device_type, $isPreview = false
    */
   public static function getCssUrl($blog_id, $device_type, $isPreview = false)
   {
-    return '/' . Config::get('UPLOAD_DIR_NAME') . '/' . App::getBlogLayer($blog_id) . '/' . $device_type . '/' . ($isPreview ? 'preview' : 'index') . '.css';
+    return '/uploads/' . App::getBlogLayer($blog_id) . '/' . $device_type . '/' . ($isPreview ? 'preview' : 'index') . '.css';
   }
 
   /**

diff --git a/app/src/Model/BlogsModel.php b/app/src/Model/BlogsModel.php
@@ -71,11 +71,17 @@ public static function isPasswordRegistered($blog_id)
    * @param string $value
    * @return bool|string
    */
-  public static function useDirectory(string $value)
+  public static function usableDirectory(string $value)
   {
+    // adminは予約済み
+    if ($value === "admin"){
+      return __('Name that cannot be specified');
+    }
+
     if (is_dir(Config::get('WWW_DIR') . $value)) {
       return __('Is already in use');
     }
+
     return true;
   }
 
@@ -96,7 +102,7 @@ public function validate(array $data, ?array &$valid_data = [], array $white_lis
         'maxlength' => array('max' => 50),
         'alphanumeric' => array(),
         'strtolower' => array(),
-        'own' => array('method' => 'useDirectory'),
+        'own' => array('method' => 'usableDirectory'),
         'unique' => array(),
       ),
       'name' => array(

diff --git a/app/src/Web/Request.php b/app/src/Web/Request.php
@@ -70,7 +70,7 @@ public function __construct(
     $this->cookie = $cookie ?? $_COOKIE;
 
     $urls = parse_url($this->uri);
-    $this->path = $urls['path'];
+    $this->path = $urls['path'] ?? '';
     if (isset($urls['query'])) {
       $this->query = $urls['query'];
       parse_str($urls['query'], $this->get);

diff --git a/app/src/Web/Router/Router.php b/app/src/Web/Router/Router.php
@@ -44,7 +44,7 @@ public function __construct(Request $request)
     $args_controller = "mode";
     $args_action = "process";
 
-    if (preg_match('|\A/admin/|u', $request->uri)) { // Admin routing
+    if (preg_match('!\A(/admin\z|/admin/)!u', $request->uri)) { // Admin routing
       // http://example.jp/admin/* が対応
       $request->urlRewrite = true;
       $request->baseDirectory = '/admin/';

diff --git a/app/config/fc2_default_plugin.php → app/src/config/fc2_default_plugin.php b/app/config/fc2_default_plugin.php → app/src/config/fc2_default_plugin.php
diff --git a/app/config/fc2_template.php → app/src/config/fc2_template.php b/app/config/fc2_template.php → app/src/config/fc2_template.php
diff --git a/app/config/init_config.php → app/src/config/init_config.php b/app/config/init_config.php → app/src/config/init_config.php
@@ -4,15 +4,11 @@
 
 // -------------------- ディレクトリ構造関連 --------------------//
 
-$config['ROOT_DIR'] = realpath(__DIR__ . '/../../') . '/';
+$config['WWW_DIR'] = WWW_DIR;
+$config['WWW_UPLOAD_DIR'] = $config['WWW_DIR'] . 'uploads/';
 
-$config['UPLOAD_DIR_NAME'] = 'uploads';
-
-$config['WWW_DIR'] = defined('WWW_DIR') ? WWW_DIR : $config['ROOT_DIR'] . 'public/';
-$config['WWW_UPLOAD_DIR'] = $config['WWW_DIR'] . $config['UPLOAD_DIR_NAME'] . '/';
-
-$config['APP_DIR'] = defined('APP_DIR') ? APP_DIR : $config['ROOT_DIR'] . 'app/';
-$config['CONFIG_DIR'] = $config['APP_DIR'] . 'config/';
+$config['APP_DIR'] = APP_DIR;
+$config['CONFIG_DIR'] = $config['APP_DIR'] . 'src/config/';
 $config['LOCALE_DIR'] = $config['APP_DIR'] . 'locale/';
 $config['VIEW_DIR'] = $config['APP_DIR'] . 'view/';
 $config['TEMP_DIR'] = $config['APP_DIR'] . 'temp/';

diff --git a/app/core/bootstrap.php → app/src/include/bootstrap.php b/app/core/bootstrap.php → app/src/include/bootstrap.php
@@ -1,7 +1,7 @@
 <?php
 
 define('REQUEST_MICROTIME', microtime(true)); // 開始タイムスタンプ(ミリ秒含む)
-define('APP_DIR', realpath(__DIR__ . '/../') . '/'); // APPディレクトリのパス
+define('APP_DIR', realpath(__DIR__ . '/../../') . '/'); // APPディレクトリのパス
 
 // DBの接続ライブラリ
 if (class_exists('mysqli')) {

diff --git a/app/core/common_functions.php → app/src/include/common_functions.php b/app/core/common_functions.php → app/src/include/common_functions.php
diff --git a/app/include/config_loading_include.php → app/src/include/index_include.php b/app/include/config_loading_include.php → app/src/include/index_include.php
@@ -1,6 +1,11 @@
 <?php
+
+declare(strict_types=1);
+
+require_once(__DIR__ . '/../../vendor/autoload.php');
+
 // config.phpの存在チェック
-if (!file_exists(__DIR__ . '/../config.php') && (string)getenv("FC2_CONFIG_FROM_ENV") !== "1") {
+if (!file_exists(__DIR__ . '/../../config.php') && (string)getenv("FC2_CONFIG_FROM_ENV") !== "1") {
   header("Content-Type: text/html; charset=UTF-8");
   echo <<<HTML
 <!DOCTYPE html>
@@ -20,8 +25,16 @@
   exit;
 }
 
+// 設定クラス読み込み
 if ((string)getenv("FC2_CONFIG_FROM_ENV") === "1") {
-  require(__DIR__ . '/../config_read_from_env.php');
+  require(__DIR__ . '/../../config_read_from_env.php');
 } else {
-  require(__DIR__ . '/../config.php');
+  require(__DIR__ . '/../../config.php');
 }
+require(__DIR__ . '/bootstrap.php');
+
+$request = new \Fc2blog\Web\Request();
+
+$c = new $request->className($request);
+$c->execute($request->methodName);
+$c->emit();
diff --git a/app/twig_templates/admin/blog_plugins/form_js.twig b/app/twig_templates/admin/blog_plugins/form_js.twig
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="/admin/assets/js/syntax_check.js"></script>
+<script type="text/javascript" src="/assets/admin/js/syntax_check.js"></script>
 
 <script>
 var template_syntaxes = {{ template_syntaxes|json_encode()|raw }};

diff --git a/app/twig_templates/admin/blog_plugins/index_sp.twig b/app/twig_templates/admin/blog_plugins/index_sp.twig
@@ -2,7 +2,7 @@
 {% block title %}{{ _('Plugin management') }}{% endblock %}
 
 {% block content %}
-    <script type="text/javascript" src="/admin/assets/js/jquery/jquery-toggles/toggles.min.js"></script>
+    <script type="text/javascript" src="/assets/admin/js/jquery/jquery-toggles/toggles.min.js"></script>
 
     <header><h1 class="sh_heading_main_b">{{ _('Plugin management') }}</h1></header>
 

diff --git a/app/twig_templates/admin/blog_templates/form_js.twig b/app/twig_templates/admin/blog_templates/form_js.twig
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="/admin/assets/js/syntax_check.js"></script>
+<script type="text/javascript" src="/assets/admin/js/syntax_check.js"></script>
 <script>
 var template_syntaxes = {{ template_syntaxes|json_encode()|raw }};
 </script>
diff --git a/app/twig_templates/admin/categories/create_sp.twig b/app/twig_templates/admin/categories/create_sp.twig
@@ -2,7 +2,7 @@
 {% block title %}{{ _('Category management') }}{% endblock %}
 
 {% block content %}
-    <link rel="stylesheet" href="/admin/assets/css/sp/category_sp.css" type="text/css" media="all">
+    <link rel="stylesheet" href="/assets/admin/css/sp/category_sp.css" type="text/css" media="all">
 
     <header><h1 class="in_menu sh_heading_main_b"><span class="h1_title">{{ _('Category management') }}</span></h1></header>
 

diff --git a/app/twig_templates/admin/comments/index.twig b/app/twig_templates/admin/comments/index.twig
@@ -32,7 +32,7 @@
             <input type="submit" value="{{ _('Search') }}"/>
         </form>
     </div>
-    <script src="/admin/assets/js/search_form.js" type="text/javascript" charset="utf-8"></script>
+    <script src="/assets/admin/js/search_form.js" type="text/javascript" charset="utf-8"></script>
 
     {% include('admin/common/paging.twig') %}
 

diff --git a/app/twig_templates/admin/comments/index_sp.twig b/app/twig_templates/admin/comments/index_sp.twig
@@ -24,7 +24,7 @@
             </div>
         </form>
     </div>
-    <script src="/admin/assets/js/search_form.js" type="text/javascript" charset="utf-8"></script>
+    <script src="/assets/admin/js/search_form.js" type="text/javascript" charset="utf-8"></script>
 
     <ul class="link_list">
         {% for comment in comments %}

diff --git a/app/twig_templates/admin/entries/editor_js.twig b/app/twig_templates/admin/entries/editor_js.twig
@@ -1,27 +1,27 @@
 {% block head_include_css %}
     <link rel="stylesheet" href="/assets/js/jquery-ui/jquery-ui.min.css" type="text/css" media="screen">
-    <link rel="stylesheet" href="/admin/assets/js/elrte/css/elrte.min.css" type="text/css" media="screen">
+    <link rel="stylesheet" href="/assets/admin/js/elrte/css/elrte.min.css" type="text/css" media="screen">
 {% endblock %}
 
 {% block head_include_js %}
     {# jquery-ui needs load before time picker. #}
     <script type="text/javascript" src="/assets/js/jquery-ui/jquery-ui.min.js"></script>
-    <script type="text/javascript" src="/admin/assets/js/elrte/js/elrte.full.js"></script>
+    <script type="text/javascript" src="/assets/admin/js/elrte/js/elrte.full.js"></script>
 
     <!-- elRTE translation messages -->
-    <script type="text/javascript" src="/admin/assets/js/elrte/js/elRTE.options.js"></script>
-    <script type="text/javascript" src="/admin/assets/js/elrte/js/i18n/elrte.{{ lang_elrte }}.js"></script>
+    <script type="text/javascript" src="/assets/admin/js/elrte/js/elRTE.options.js"></script>
+    <script type="text/javascript" src="/assets/admin/js/elrte/js/i18n/elrte.{{ lang_elrte }}.js"></script>
     <!-- /elRTE -->
 
     <!-- timepicker-addon -->
-    <script type="text/javascript" src="/admin/assets/js/jquery/jquery-timepicker-addons/jquery-ui-timepicker-addon.js"></script>
+    <script type="text/javascript" src="/assets/admin/js/jquery/jquery-timepicker-addons/jquery-ui-timepicker-addon.js"></script>
     {% if lang != 'en' %}
-        <script type="text/javascript" src="/admin/assets/js/jquery/jquery-timepicker-addons/i18n/jquery-ui-timepicker-{{ lang }}.js"></script>
+        <script type="text/javascript" src="/assets/admin/js/jquery/jquery-timepicker-addons/i18n/jquery-ui-timepicker-{{ lang }}.js"></script>
     {% endif %}
     <!-- /timepicker-addon -->
 
     <script type="text/javascript" src="/assets/js/js.cookie.js"></script>
-    <script type="text/javascript" src="/admin/assets/js/entry_editor.js"></script>
+    <script type="text/javascript" src="/assets/admin/js/entry_editor.js"></script>
 {% endblock %}
 
 <!-- メディアを追加する -->
@@ -147,7 +147,7 @@
             height: 450,
             toolbar: 'custome',
             lang: '{{ lang_elrte }}',
-            cssfiles: ['/admin/assets/js/elrte/css/elrte-inner.css']
+            cssfiles: ['/assets/admin/js/elrte/css/elrte-inner.css']
         }
 
         var isSetupString = false;

diff --git a/app/twig_templates/admin/entries/form_sp.twig b/app/twig_templates/admin/entries/form_sp.twig
@@ -1,20 +1,20 @@
 {% block head_include_css %}
-    <link rel="stylesheet" href="/admin/assets/css/sp/category_sp.css" type="text/css" media="all">
-    <link rel="stylesheet" href="/admin/assets/css/sp/entry_sp.css" type="text/css">
+    <link rel="stylesheet" href="/assets/admin/css/sp/category_sp.css" type="text/css" media="all">
+    <link rel="stylesheet" href="/assets/admin/css/sp/entry_sp.css" type="text/css">
 {% endblock %}
 {% block head_include_js %}
     <!-- timepicker-addon -->
-    <script type="text/javascript" src="/admin/assets/js/jquery/jquery-timepicker-addons/jquery-ui-timepicker-addon.js"></script>
+    <script type="text/javascript" src="/assets/admin/js/jquery/jquery-timepicker-addons/jquery-ui-timepicker-addon.js"></script>
     {% if lang != 'en' %}
-        <script type="text/javascript" src="/admin/assets/js/jquery/jquery-timepicker-addons/i18n/jquery-ui-timepicker-{{ lang }}.js"></script>
+        <script type="text/javascript" src="/assets/admin/js/jquery/jquery-timepicker-addons/i18n/jquery-ui-timepicker-{{ lang }}.js"></script>
     {% endif %}
     <!-- /timepicker-addon -->
 
     <script type="text/javascript" src="/assets/js/js.cookie.js"></script>
-    <script type="text/javascript" src="/admin/assets/js/entry_editor.js"></script>
+    <script type="text/javascript" src="/assets/admin/js/entry_editor.js"></script>
 {% endblock %}
 
-<script type="text/javascript" src="/admin/assets/js/jquery/jquery.fc2tab.js"></script>
+<script type="text/javascript" src="/assets/admin/js/jquery/jquery.fc2tab.js"></script>
 <script type="text/javascript">
     $(function () {
         // 記事 or 追記のタブ

diff --git a/app/twig_templates/admin/entries/index.twig b/app/twig_templates/admin/entries/index.twig
@@ -25,7 +25,7 @@
             <input type="submit" value="{{ _('Search') }}"/>
         </form>
     </div>
-    <script src="/admin/assets/js/search_form.js" type="text/javascript" charset="utf-8"></script>
+    <script src="/assets/admin/js/search_form.js" type="text/javascript" charset="utf-8"></script>
 
     {% include('admin/common/paging.twig') %}
 

diff --git a/app/twig_templates/admin/entries/index_sp.twig b/app/twig_templates/admin/entries/index_sp.twig
@@ -24,7 +24,7 @@
             </div>
         </form>
     </div>
-    <script src="/admin/assets/js/search_form.js" type="text/javascript" charset="utf-8"></script>
+    <script src="/assets/admin/js/search_form.js" type="text/javascript" charset="utf-8"></script>
 
     <form method="POST" id="sys-list-form">
         <ul class="link_list">

diff --git a/app/twig_templates/admin/layouts/default.twig b/app/twig_templates/admin/layouts/default.twig
@@ -8,9 +8,9 @@
     <link rel="stylesheet" href="/assets/css/normalize.css" type="text/css" media="all">
     <link rel="stylesheet" href="/assets/css/common.css" type="text/css" media="all">
     <link rel="stylesheet" href="/assets/css/main.css" type="text/css" media="all">
-    <link rel="stylesheet" href="/admin/assets/css/admin-fc2.css" type="text/css" media="all">
-    <link rel="stylesheet" href="/admin/assets/css/admin-form.css" type="text/css" media="all">
-    <link rel="stylesheet" href="/admin/assets/css/admin_style.css" type="text/css" media="all">
+    <link rel="stylesheet" href="/assets/admin/css/admin-fc2.css" type="text/css" media="all">
+    <link rel="stylesheet" href="/assets/admin/css/admin-form.css" type="text/css" media="all">
+    <link rel="stylesheet" href="/assets/admin/css/admin_style.css" type="text/css" media="all">
 
     {% if block('head_include_css') is defined %}
         {{ block('head_include_css') }}
-Original file line number
+Diff line change
@@ Expand Up @@
        */
       public static function getCssUrl($blog_id, $device_type, $isPreview = false)
       {
-        return '/' . Config::get('UPLOAD_DIR_NAME') . '/' . App::getBlogLayer($blog_id) . '/' . $device_type . '/' . ($isPreview ? 'preview' : 'index') . '.css';
+        return '/uploads/' . App::getBlogLayer($blog_id) . '/' . $device_type . '/' . ($isPreview ? 'preview' : 'index') . '.css';
       }
       /**
@@ Expand Down @@