Merge pull request #143 from ContentsViewer/pre

言語ごとのページに固有のurlを用意

Author: ContentsViewer

Frontend/400.php

@@ -21,7 +21,7 @@
 
 $vars['panelContentOnGameover'] = 
     Localization\Localize('400.panelContentOnGameover', 
-    "Back to the main objectives. ↓" . 
+    "Back to the main objective. ↓" . 
     "<a href='{0}'>Goto TopPage</a><br/>or",
     CreateContentHREF($vars['rootContentPath']));
 

Frontend/403.php

@@ -14,7 +14,7 @@
 
 $vars['panelContentOnGameover'] = 
     Localization\Localize('403.panelContentOnGameover',
-    "Back to the main objectives. ↓" .
+    "Back to the main objective. ↓" .
     "<a href='{0}'>Re-login to access the content</a><br/>or",
     ROOT_URI . "/Logout?token=" . H(Authenticator::GenerateCsrfToken()) . "&returnTo=" . urlencode($_SERVER["REQUEST_URI"]));
 

Frontend/500.php

@@ -22,7 +22,7 @@
 
 $vars['panelContentOnGameover'] = 
     Localization\Localize('500.panelContentOnGameover',
-    "Back to the main objectives. ↓" . 
+    "Back to the main objective. ↓" . 
     "<a href='{0}'>Goto TopPage</a><br/>or",
     CreateContentHREF($vars['rootContentPath']));
 

Frontend/contents-viewer.php

@@ -44,8 +44,9 @@
 Authenticator::GetUserInfo($vars['owner'], 'enableRemoteEdit',  $enableRemoteEdit);
 
 // layerの再設定
-$vars['layerName'] = UpdateLayerNameAndResetLocalization($vars['layerName'], $contentPath);
-
+$out = UpdateLayerNameAndResetLocalization($contentPath, $vars['layerName'], $vars['language']);
+$vars['layerName'] = $out['layerName'];
+$vars['language'] = $out['language'];
 $vars['layerSelector'] = CreateRelatedLayerSelector($contentPath);
 
 
@@ -251,11 +252,14 @@
 // page-tabの追加
 $vars['pageTabs'] = [
     ['selected' => true, 'innerHTML' => '<a href="' . CreateContentHREF($currentContent->path) . '">' . Localization\Localize('content', 'Content') .'</a>'],
-    ['selected' => false, 'innerHTML' => '<a href="' . CreateContentHREF($currentContent->path) . '.note">'. Localization\Localize('note', 'Note') . '</a>'],
-    ['selected' => false, 'innerHTML' => '<a href="' . CreateDirectoryHREF(dirname($contentPath)) .'">' . Localization\Localize('directory', 'Directory') .'</a>'],
+    ['selected' => false, 'innerHTML' => '<a href="' . CreateContentHREF($currentContent->path . '.note') . '">'. Localization\Localize('note', 'Note') . '</a>'],
+    ['selected' => false, 'innerHTML' => '<a href="' . CreateDirectoryHREF(dirname($contentPath), $vars['language']) .'">' . Localization\Localize('directory', 'Directory') .'</a>'],
     ['selected' => false, 'innerHTML' => '<a href="' . CreateContentHREF($currentContent->path) .'?related">' . Localization\Localize('related', 'Related') . '</a>']
 ];
 
+$vars['canonialUrl'] = (empty($_SERVER["HTTPS"]) ? "http://" : "https://") . 
+    $_SERVER["HTTP_HOST"] . CreateContentHREF($contentPath);
+
 // ビルド時間計測 終了
 $stopwatch->Stop();
 $vars['pageBuildReport']['times']['build']['ms'] = $stopwatch->Elapsed() * 1000;

Frontend/directory-viewer.php

@@ -50,10 +50,12 @@
 
 $vars['pageHeading']['parents'] = [];
 foreach($parents as $parent){
-    $vars['pageHeading']['parents'][] = ['title' => basename($parent), 'path' =>  CreateDirectoryHREF($parent)];
+    $vars['pageHeading']['parents'][] = [
+        'title' => basename($parent), 'path' =>  CreateDirectoryHREF($parent, $vars['language'])
+    ];
 }
 
-$vars['navigator'] = CreateNavi($parents, $vars['directoryPath'], $subDirs);
+$vars['navigator'] = CreateNavi($parents, $vars['directoryPath'], $subDirs, $vars['language']);
 $vars['childList'] = [];
 
 if(count($subDirs) > 0 || count($contents) > 0 || count($files) > 0){
@@ -77,7 +79,7 @@
     $body .= '<h3>' . Localization\Localize('subdirectories', 'Subdirectories') . '</h3>';
     $body .= '<div class="directory-container">';
     foreach($subDirs as $subDir){
-        $body .= '<a class="directory" href="' . CreateDirectoryHREF($subDir) . '">';
+        $body .= '<a class="directory" href="' . CreateDirectoryHREF($subDir, $vars['language']) . '">';
         $body .= '<div class="icon folder-icon"></div>';
         $body .= '<div class="name">' . basename($subDir) . '</div>';
         $body .= '</a>';
@@ -122,14 +124,17 @@
 }
 $vars['contentBody'] = $body;
 
+$vars['canonialUrl'] = (empty($_SERVER["HTTPS"]) ? "http://" : "https://") . 
+    $_SERVER["HTTP_HOST"] . $vars['subURI'] . '?hl=' . $vars['layerName'];
+
 // ビルド時間計測 終了
 $stopwatch->Stop();
 $vars['pageBuildReport']['times']['build']['ms'] = $stopwatch->Elapsed() * 1000;
 
 
 require(FRONTEND_DIR . '/viewer.php');
 
-function CreateNavi($parents, $current, $children){
+function CreateNavi($parents, $current, $children, $language){
     $navi = '<nav class="navi"><ul>';
 
     $parentIndex = -1;
@@ -154,12 +159,12 @@ function CreateNavi($parents, $current, $children){
 
         if(strpos($current, $path) === 0){
             $navi .= '<li><a class = "selected" href="' . 
-                CreateDirectoryHREF($path) . '">' . 
+                CreateDirectoryHREF($path, $language) . '">' . 
                 basename($path) . '</a></li>';
         }
         else{
             $navi .= '<li><a href="' . 
-                CreateDirectoryHREF($path) . '">' . 
+                CreateDirectoryHREF($path, $language) . '">' . 
                 basename($path) . '</a></li>';
         }
 

Frontend/note-viewer.php

@@ -32,8 +32,9 @@
 Authenticator::GetUserInfo($vars['owner'], 'enableRemoteEdit',  $enableRemoteEdit);
 
 // layerの再設定
-$vars['layerName'] = UpdateLayerNameAndResetLocalization($vars['layerName'], $vars['contentPath']);
-
+$out = UpdateLayerNameAndResetLocalization($vars['contentPath'], $vars['layerName'], $vars['language']);
+$vars['layerName'] = $out['layerName'];
+$vars['language'] = $out['language'];
 
 $relatedContentPath = dirname($vars['contentPath']) . '/' . basename($vars['contentPath'], '.note');
 
@@ -101,11 +102,19 @@
 $vars['pageHeading']['parents'] = [];
 $vars['pageHeading']['title'] = $vars['pageTitle'];
 
-$vars['pageTabs'][] = ['selected' => true, 'innerHTML' => '<a href="' . ROOT_URI . $vars['subURI'] . '">' . Localization\Localize('note', 'Note') . '</a>'];
-$vars['pageTabs'][] = ['selected' => false, 'innerHTML' => '<a href="' . ROOT_URI . dirname($vars['subURI']) . '">' . Localization\Localize('directory', 'Directory') . '</a>'];
+$vars['pageTabs'][] = [
+    'selected' => true, 
+    'innerHTML' => '<a href="' . CreateContentHREF($vars['contentPath']) . '">' . Localization\Localize('note', 'Note') . '</a>'
+];
+$vars['pageTabs'][] = [
+    'selected' => false, 
+    'innerHTML' => '<a href="' . CreateDirectoryHREF(dirname($vars['subURI']), $vars['language']) . '">' . Localization\Localize('directory', 'Directory') . '</a>'
+];
 
 if($relatedContentExists){
-    $vars['pageTabs'][] = ['selected' => false, 'innerHTML' => '<a href="' . CreateContentHREF($relatedContentPath) . '?related">' . Localization\Localize('related', 'Related') . '</a>'];
+    $vars['pageTabs'][] = [
+        'selected' => false, 'innerHTML' => '<a href="' . CreateContentHREF($relatedContentPath) . '?related">' . Localization\Localize('related', 'Related') . '</a>'
+    ];
 }
 
 
@@ -141,16 +150,19 @@
 $vars['contentBody'] = $body;
 
 // plainText リンクの追加
-$vars['addPlainTextLink'] = true;
+$vars['addPlainTextLink'] = $noteExists;
 
 // edit リンクの追加
-$vars['addEditLink'] = true;
+$vars['addEditLink'] = $noteExists;
 $vars['openNewTabEditLink'] = $enableRemoteEdit;
 
 // ビルド時間計測 終了
 $stopwatch->Stop();
 $vars['pageBuildReport']['times']['build']['ms'] = $stopwatch->Elapsed() * 1000;
 
+$vars['canonialUrl'] = (empty($_SERVER["HTTPS"]) ? "http://" : "https://") . 
+    $_SERVER["HTTP_HOST"] . CreateContentHREF($vars['contentPath']);
+
 require(FRONTEND_DIR . '/viewer.php');
 
 function GetNavigator($contentPath){

Frontend/related-viewer.php

@@ -104,6 +104,7 @@
 // Debug::Log($childPathList);
 // $titleSuggestions = SelectDifferentDirectoryContents($titleSuggestions, $currentContent->path, $childPathList);
 $suggestions = SelectDifferentDirectoryContents($suggestions, $currentContent->path, $childPathList);
+$suggestions = array_slice($suggestions, 0, 30); // 最大30件
 
 // End 関連コンテンツの検索 =================================================
 
@@ -125,8 +126,8 @@
 // page-tabの追加
 $vars['pageTabs'] = [
     ['selected' => false, 'innerHTML' => '<a href="' . CreateContentHREF($currentContent->path) . '">' . Localization\Localize('content', 'Content') . '</a>'],
-    ['selected' => false, 'innerHTML' => '<a href="' . CreateContentHREF($currentContent->path) . '.note">' . Localization\Localize('note', 'Note') . '</a>'],
-    ['selected' => false, 'innerHTML' => '<a href="' . CreateDirectoryHREF(dirname($contentPath)) .'">' . Localization\Localize('directory', 'Directory') . '</a>'],
+    ['selected' => false, 'innerHTML' => '<a href="' . CreateContentHREF($currentContent->path . '.note') . '">' . Localization\Localize('note', 'Note') . '</a>'],
+    ['selected' => false, 'innerHTML' => '<a href="' . CreateDirectoryHREF(dirname($contentPath), $vars['language']) .'">' . Localization\Localize('directory', 'Directory') . '</a>'],
     ['selected' => true, 'innerHTML' => '<a href="' . CreateContentHREF($currentContent->path) .'?related">' . Localization\Localize('related', 'Related') . '</a>']
 ];
 
@@ -156,6 +157,9 @@
 
 $vars['contentBody'] = $body;
 
+$vars['canonialUrl'] = (empty($_SERVER["HTTPS"]) ? "http://" : "https://") . 
+    $_SERVER["HTTP_HOST"] . CreateContentHREF($vars['contentPath']) . '?related';
+
 // ビルド時間計測 終了
 $stopwatch->Stop();
 $vars['pageBuildReport']['times']['build']['ms'] = $stopwatch->Elapsed() * 1000;

Frontend/tag-viewer.php

@@ -16,13 +16,27 @@
 $stopwatch = new Stopwatch();
 $stopwatch->Start();
 
-$layerSuffix = ContentsDatabaseManager::GetLayerSuffix($vars['layerName']);
+if(isset($_GET['layer'])){
+    $vars['layerName'] = $_GET['layer'];
+}
 
+$layerSuffix = ContentsDatabaseManager::GetLayerSuffix($vars['layerName']);
 $vars['rootContentPath'] = $vars['contentsFolder'] . '/' . ROOT_FILE_NAME . $layerSuffix;
 $vars['rootDirectory'] = substr(GetTopDirectory($vars['rootContentPath']), 1);
+$metaFileName = ContentsDatabaseManager::GetRelatedMetaFileName($vars['rootContentPath']);
+
+if(!file_exists(Content::RealPath($vars['rootContentPath'], '', false)) && 
+    !file_exists(Content::RealPath($metaFileName, '', false))){
+    // Rootコンテンツ, メタファイルがないとき
+    // 存在しないlayer名を見ている
+
+    $vars['errorMessage'] = Localization\Localize('invalidParameter', 'Invalid Parameter.');
+    require(FRONTEND_DIR . '/400.php');
+    exit();
+}
 
 ContentsDatabaseManager::LoadRelatedMetadata($vars['rootContentPath']);
-$metaFileName = ContentsDatabaseManager::GetRelatedMetaFileName($vars['rootContentPath']);
+setcookie('layer', $vars['layerName'], time()+(60*60*24*30*6), '/'); // 有効時間 6カ月
 
 $tag2path = array_key_exists('tag2path', ContentsDatabase::$metadata) ? ContentsDatabase::$metadata['tag2path'] : [];
 $path2tag = array_key_exists('path2tag', ContentsDatabase::$metadata) ? ContentsDatabase::$metadata['path2tag'] : [];
@@ -63,7 +77,7 @@
 }
 
 
-$relocatedURL = CreateTagMapHREF([[]], $vars['rootDirectory']);
+$relocatedURL = CreateTagMapHREF([], $vars['rootDirectory'], $vars['layerName']);
 $notFound = false;
 foreach($tagPathParts as $part){
     foreach($part as $j => $tag){
@@ -84,6 +98,9 @@
 
 // ここまでで, 各タグ名はtag2path内にあることが保証されている
 
+$vars['canonialUrl'] = (empty($_SERVER["HTTPS"]) ? "http://" : "https://") . 
+    $_SERVER["HTTP_HOST"] . $vars['subURI'] . '?layer=' . $vars['layerName'];
+
 $vars['pageTitle'] = '';
 $vars['pageHeading']['title'] = '';
 $vars['pageHeading']['parents'] = [];
@@ -113,11 +130,13 @@
         unset($workTagPathParts[$i + 1]);
         $vars['pageHeading']['parents'][] = [
             'title' => implode(', ', $tagPathParts[$i]), 
-            'path' => CreateTagMapHREF($workTagPathParts, $vars['rootDirectory'])];
+            'path' => CreateTagMapHREF($workTagPathParts, $vars['rootDirectory'], $vars['layerName'])
+        ];
     }
     $vars['pageHeading']['parents'][] = [
         'title' => Localization\Localize('tagmap', 'TagMap'), 
-        'path' => CreateTagMapHREF([[]], $vars['rootDirectory'])];
+        'path' => CreateTagMapHREF([], $vars['rootDirectory'], $vars['layerName'])
+    ];
     // Debug::Log($tagPathParts);
     // Debug::Log($workTagPathParts);
 }
@@ -126,16 +145,22 @@
 if(count($tagPathParts) <= 0){
     // タグマップを表示して, 終了する.
     $vars['contentSummary'] = '<div style="margin-top: 1em; margin-botton: 1em;">' .
-        CreateTagListElement($tag2path,  $vars['rootDirectory']) .
+        CreateTagListElement($tag2path,  $vars['rootDirectory'], $vars['layerName']) .
         '</div>';
-    $vars['navigator'] = CreateNavi([], $tag2path, $path2tag, $vars['rootDirectory']);
+    $vars['navigator'] = CreateNavi([], $tag2path, $path2tag, $vars['rootDirectory'], $vars['layerName']);
+    
+    // ビルド時間計測 終了
+    $stopwatch->Stop();
+    $vars['pageBuildReport']['times']['build']['ms'] = $stopwatch->Elapsed() * 1000;
+
     require(FRONTEND_DIR . '/viewer.php');
     exit();
 }
 
 // ここから先は, 何らかのタグが指定されている
 //  * $tagPathParts の要素数は 0 より大きい
 
+
 /**
  * [
  *  [
@@ -292,7 +317,7 @@
     array_splice($workTags, $i, 1);
     $workTagPathParts[count($workTagPathParts) - 1] = $workTags;
     $body .=  '<li><a href="' . 
-        CreateTagMapHREF($workTagPathParts, $vars['rootDirectory']) .
+        CreateTagMapHREF($workTagPathParts, $vars['rootDirectory'], $vars['layerName']) .
         '">' . $tag . '<span>' . count($excludedTags[$tag]) . '</span></a></li>';
 }
 $body .= '</ul>';
@@ -306,7 +331,7 @@
         $workTagPathParts[count($workTagPathParts) - 1][] = $tag;
         // Debug::Log($workTagPathParts);
         $body .=  '<li><a href="' . 
-            CreateTagMapHREF($workTagPathParts, $vars['rootDirectory']) .
+            CreateTagMapHREF($workTagPathParts, $vars['rootDirectory'], $vars['layerName']) .
             '">' . $tag . '<span>' . count($pathList) . '</span></a></li>';
     }
     $body .=  '</ul>';
@@ -320,7 +345,7 @@
     $workTagPathParts[count($workTagPathParts) - 1][] = $tag;
     // Debug::Log($workTagPathParts);
     $body .=  '<li><a href="' . 
-        CreateTagMapHREF($workTagPathParts, $vars['rootDirectory']) .
+        CreateTagMapHREF($workTagPathParts, $vars['rootDirectory'], $vars['layerName']) .
         '">' . $tag . '<span>' . count($pathList) . '</span></a></li>';
 }
 $body .=  '</ul>';
@@ -330,7 +355,7 @@
 
 if(count($childTags) > 0){
     $body .= '<div><h3>&gt; ' . Localization\Localize('tag-viewer.narrowDown', 'Narrow Down') . '</h3><div style="margin-left: 16px;">';
-    $body .= CreateTagListElement($childTags, $vars['rootDirectory'], $tagPathParts);
+    $body .= CreateTagListElement($childTags, $vars['rootDirectory'], $vars['layerName'], $tagPathParts);
     $body .= '</div></div>';
 }
 
@@ -350,7 +375,7 @@
 
 
 // navigator 設定
-$vars['navigator'] = CreateNavi($eachSelectedTaggedPaths, $tag2path, $path2tag, $vars['rootDirectory']);;
+$vars['navigator'] = CreateNavi($eachSelectedTaggedPaths, $tag2path, $path2tag, $vars['rootDirectory'], $vars['layerName']);;
 
 
 // ビルド時間計測 終了
@@ -395,7 +420,7 @@ function GetUnionTags($paths, $path2tag){
  *      ], ...
  *  ]
  */
-function CreateNavi($eachSelectedTaggedPaths, $tag2path, $path2tag, $rootDirectory){
+function CreateNavi($eachSelectedTaggedPaths, $tag2path, $path2tag, $rootDirectory, $layerName){
     $navi = '<nav class="navi"><ul>';
 
     $tagStack = array_reverse(array_keys($tag2path));
@@ -425,7 +450,7 @@ function CreateNavi($eachSelectedTaggedPaths, $tag2path, $path2tag, $rootDirecto
                     $alreadyCrawlIntoChildrenStack[] = true;
                     $currentPathParts[] = $currentTaggedPaths['selectors'];
                     $navi .= '<li><a href="' . 
-                        CreateTagMapHREF($currentPathParts, $rootDirectory) .
+                        CreateTagMapHREF($currentPathParts, $rootDirectory, $layerName) .
                         '" class="selected">' . implode(', ', $currentTaggedPaths['selectors']) .
                         '</a></li><ul>';
                     $unionTags = GetUnionTags($currentTaggedPaths['selected'], $path2tag);
@@ -447,7 +472,7 @@ function CreateNavi($eachSelectedTaggedPaths, $tag2path, $path2tag, $rootDirecto
             }
         }
         $navi .= '<li><a href="' . 
-            CreateTagMapHREF(array_merge($currentPathParts, [[$poppedTag]]), $rootDirectory) .
+            CreateTagMapHREF(array_merge($currentPathParts, [[$poppedTag]]), $rootDirectory, $layerName) .
             '">' . $poppedTag .
             '</a></li>';
     }