Skip to content

Commit f349543

Browse files
ContentsViewerContentsViewer
authored
Merge pull request #120 from ContentsViewer/pre
コンテンツ読み込み時に作成時間と更新時間の情報をタイムスタンプに変換
2 parents 6a9c710 + 73d7b72 commit f349543

9 files changed

+177
-159
lines changed

‎Frontend/content-editor.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
<head>
5454
<?php readfile(CLIENT_DIR . "/Common/CommonHead.html");?>
55-
<title>編集 | <?=$content->Title();?></title>
55+
<title>編集 | <?=$content->title;?></title>
5656
<link rel="shortcut icon" href="<?=CLIENT_URI?>/Common/favicon-editor.ico" type="image/vnd.microsoft.icon" />
5757

5858
<script type="text/javascript" src="<?=CLIENT_URI?>/ThemeChanger/ThemeChanger.js"></script>
@@ -181,21 +181,21 @@
181181

182182
<body>
183183
<input type="hidden" id="token" value="<?=H(Authenticator::GenerateCsrfToken())?>">
184-
<input type="hidden" id="contentPath" value="<?=$content->Path()?>">
184+
<input type="hidden" id="contentPath" value="<?=$content->path?>">
185185
<input type="hidden" id="openTime" value="<?=time()?>">
186186

187187
<p id='logout'><a href="<?=ROOT_URI?>/Logout?token=<?=H(Authenticator::GenerateCsrfToken())?>">ログアウト</a></p>
188188

189189
<div id='head'>
190190
<div>
191-
タイトル: <input id='title-input' type='text' value='<?=H($content->Title());?>'>
191+
タイトル: <input id='title-input' type='text' value='<?=H($content->title);?>'>
192192
</div>
193193
<div>
194194
作成日: <input id='created-at-input' type='text' value='<?php
195-
$createdAt = $content->CreatedAt();
195+
$createdAt = $content->createdTimeRaw;
196196
if ($createdAt === "") {
197197
// date_default_timezone_set('Asia/Tokyo');
198-
$createdAt = date("Y/m/d");
198+
$createdAt = date("Y-m-d");
199199
}
200200
echo H($createdAt);
201201
?>'>
@@ -205,7 +205,7 @@
205205
タグ:
206206
<ul class='tag-list' id='tag-list'>
207207
<?php
208-
foreach ($content->Tags() as $tag) {
208+
foreach ($content->tags as $tag) {
209209
echo '<li name="' . H($tag) . '">' . $tag . '<span class="remove" onclick=RemoveTag(event)>x</span></li>';
210210
}
211211
?>
@@ -227,22 +227,22 @@
227227
</div>
228228
<hr>
229229
<div>
230-
親コンテンツ: <input type='text' id='parent-input' value='<?=H($content->ParentPath())?>'>
230+
親コンテンツ: <input type='text' id='parent-input' value='<?=H($content->parentPath)?>'>
231231
</div>
232232
<hr>
233233
<div>
234234
子コンテンツ:
235235
<textarea id='children-input' cols=50 rows=<?=$content->ChildCount() + 2?>><?php
236-
foreach ($content->ChildPathList() as $child) {
236+
foreach ($content->childPathList as $child) {
237237
echo H($child) . "\n";
238238
}
239239
?></textarea>
240240
</div>
241241
</div>
242242

243-
<pre id="summary-editor"><?=H($content->Summary());?></pre>
243+
<pre id="summary-editor"><?=H($content->summary);?></pre>
244244

245-
<pre id="body-editor"><?=H($content->Body());?></pre>
245+
<pre id="body-editor"><?=H($content->body);?></pre>
246246

247247
<div class='save' onclick=SaveContentFile()>SAVE</div>
248248
<div id="preview-field">

‎Frontend/contents-viewer.php

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@
5858
$stopwatch->Start();
5959

6060
$text = GetDecodedText($currentContent);
61-
$currentContent->SetSummary($text['summary']);
62-
$currentContent->SetBody($text['body']);
61+
$currentContent->summary = $text['summary'];
62+
$currentContent->body = $text['body'];
6363

6464
$vars['pageBuildReport']['times']['parse']['ms'] = $stopwatch->Elapsed() * 1000;
6565

6666
// ChildContentsの取得
67-
$childrenPathList = $currentContent->ChildPathList();
67+
$childrenPathList = $currentContent->childPathList;
6868
$childrenPathListCount = count($childrenPathList);
6969
for ($i = 0; $i < $childrenPathListCount; $i++) {
7070
$child = $currentContent->Child($i);
@@ -87,7 +87,7 @@
8787
// LeftContent, RightContentの取得
8888
if (isset($parents[0])) {
8989
$parent = $parents[0];
90-
$brothers = $parent->ChildPathList();
90+
$brothers = $parent->childPathList;
9191
$myIndex = $currentContent->ChildIndex();
9292

9393
if ($myIndex >= 0) {
@@ -119,10 +119,10 @@
119119
//
120120
$contentsIsChanged =
121121
(!array_key_exists('contentsChangedTime', ContentsDatabase::$metadata) ||
122-
$currentContent->UpdatedAtTimestamp() > ContentsDatabase::$metadata['contentsChangedTime']);
122+
$currentContent->modifiedTime > ContentsDatabase::$metadata['contentsChangedTime']);
123123

124124
$cache = new Cache;
125-
$cache->Connect($currentContent->Path());
125+
$cache->Connect($currentContent->path);
126126

127127
$cache->Lock(LOCK_SH);
128128
$cache->Fetch();
@@ -175,9 +175,9 @@
175175

176176
// title作成
177177
$title = "";
178-
$title .= NotBlankTitle($currentContent->Title());
178+
$title .= NotBlankTitle($currentContent->title);
179179
if (isset($parents[0])) {
180-
$title .= " | " . NotBlankTitle($parents[0]->Title());
180+
$title .= " | " . NotBlankTitle($parents[0]->title);
181181
}
182182
$vars['pageTitle'] = $title;
183183

@@ -188,34 +188,34 @@
188188
}
189189

190190
// pageHeading の作成
191-
$vars['pageHeading']['title'] = NotBlankTitle($currentContent->Title());
191+
$vars['pageHeading']['title'] = NotBlankTitle($currentContent->title);
192192
$parentTitlePathList = [];
193193
foreach($parents as $parent){
194194
if($parent === false) break;
195-
$parentTitlePathList[] = ['title' => NotBlankTitle($parent->Title()), 'path' => CreateContentHREF($parent->Path())];
195+
$parentTitlePathList[] = ['title' => NotBlankTitle($parent->title), 'path' => CreateContentHREF($parent->path)];
196196
}
197197
$vars['pageHeading']['parents'] = $parentTitlePathList;
198198

199199
// Left, Right Content の設定
200200
if (!is_null($leftContent) && $leftContent !== false) {
201-
$vars['leftContent'] = ['title' => NotBlankTitle($leftContent->Title()), 'url' => CreateContentHREF($leftContent->Path())];
201+
$vars['leftContent'] = ['title' => NotBlankTitle($leftContent->title), 'url' => CreateContentHREF($leftContent->path)];
202202
}
203203

204204
if (!is_null($rightContent) && $rightContent !== false) {
205-
$vars['rightContent'] = ['title' => NotBlankTitle($rightContent->Title()), 'url' => CreateContentHREF($rightContent->Path())];
205+
$vars['rightContent'] = ['title' => NotBlankTitle($rightContent->title), 'url' => CreateContentHREF($rightContent->path)];
206206
}
207207

208208
// navigator の設定
209209
$vars['navigator'] = $navigator;
210210

211211
// file date の設定
212-
$vars['fileDate'] = ['createdAt' => $currentContent->CreatedAt(), 'updatedAt' => $currentContent->UpdatedAt()];
212+
$vars['fileDate'] = ['createdTime' => $currentContent->createdTime, 'modifiedTime' => $currentContent->modifiedTime];
213213

214214
// tagline の設定
215-
$vars['tagline']['tags'] = $currentContent->Tags();
215+
$vars['tagline']['tags'] = $currentContent->tags;
216216

217217
// content summary の設定
218-
$vars['contentSummary'] = $currentContent->Summary();
218+
$vars['contentSummary'] = $currentContent->summary;
219219

220220
// tagList と 最新のコンテンツ 設定
221221
if ($currentContent->IsRoot()){
@@ -233,16 +233,16 @@
233233
}
234234

235235
// content body の設定
236-
$vars['contentBody'] = $currentContent->Body();
236+
$vars['contentBody'] = $currentContent->body;
237237

238238
// child list の設定
239239
$vars['childList'] = []; // [ ['title' => '', 'summary' => '', 'url' => ''], ... ]
240240

241241
foreach ($children as $child) {
242242
$vars['childList'][] = [
243-
'title' => NotBlankTitle($child->Title()),
243+
'title' => NotBlankTitle($child->title),
244244
'summary' => GetDecodedText($child)['summary'],
245-
'url' => CreateContentHREF($child->Path())
245+
'url' => CreateContentHREF($child->path)
246246
];
247247
}
248248

@@ -260,13 +260,13 @@
260260
// 警告表示設定
261261

262262
// $vars['warningMessages'][] = "Hello world";
263-
$vars['warningMessages'] = array_merge($vars['warningMessages'], GetMessages($currentContent->Path()));
263+
$vars['warningMessages'] = array_merge($vars['warningMessages'], GetMessages($currentContent->path));
264264

265265
if ($vars['pageBuildReport']['times']['build']['ms'] > 1000) {
266266
Debug::LogWarning("
267267
Performance Note:
268-
Page Title: {$currentContent->Title()}
269-
Page Path: {$currentContent->Path()}
268+
Page Title: {$currentContent->title}
269+
Page Path: {$currentContent->path}
270270
--- Build Report ---
271271
" . print_r($vars['pageBuildReport'], true) . "
272272
--------------------"
@@ -282,12 +282,12 @@ function CreateNavHelper($parents, $parentsIndex, $currentContent, $children, &$
282282
{
283283
if ($parentsIndex < 0) {
284284
// echo '1+';
285-
$navigator .= '<li><a class = "selected" href="' . CreateContentHREF($currentContent->Path()) . '">' . NotBlankTitle($currentContent->Title()) . '</a></li>';
285+
$navigator .= '<li><a class = "selected" href="' . CreateContentHREF($currentContent->path) . '">' . NotBlankTitle($currentContent->title) . '</a></li>';
286286

287287
$navigator .= "<ul>";
288288
foreach ($children as $c) {
289289

290-
$navigator .= '<li><a href="' . CreateContentHREF($c->Path()) . '">' . NotBlankTitle($c->Title()) . '</a></li>';
290+
$navigator .= '<li><a href="' . CreateContentHREF($c->path) . '">' . NotBlankTitle($c->title) . '</a></li>';
291291
}
292292

293293
$navigator .= "</ul>";
@@ -297,7 +297,7 @@ function CreateNavHelper($parents, $parentsIndex, $currentContent, $children, &$
297297

298298
$childrenCount = $parents[$parentsIndex]->ChildCount();
299299

300-
$navigator .= '<li><a class = "selected" href="' . CreateContentHREF($parents[$parentsIndex]->Path()) . '">' . NotBlankTitle($parents[$parentsIndex]->Title()) . '</a></li>';
300+
$navigator .= '<li><a class = "selected" href="' . CreateContentHREF($parents[$parentsIndex]->path) . '">' . NotBlankTitle($parents[$parentsIndex]->title) . '</a></li>';
301301

302302
$navigator .= "<ul>";
303303
if ($parentsIndex == 0) {
@@ -311,15 +311,15 @@ function CreateNavHelper($parents, $parentsIndex, $currentContent, $children, &$
311311
}
312312

313313
if ($i == $currentContentIndex) {
314-
$navigator .= '<li><a class = "selected" href="' . CreateContentHREF($child->Path()) . '">' . NotBlankTitle($child->Title()) . '</a></li>';
314+
$navigator .= '<li><a class = "selected" href="' . CreateContentHREF($child->path) . '">' . NotBlankTitle($child->title) . '</a></li>';
315315

316316
$navigator .= "<ul>";
317317
foreach ($children as $c) {
318-
$navigator .= '<li><a href="' . CreateContentHREF($c->Path()) . '">' . NotBlankTitle($c->Title()) . '</a></li>';
318+
$navigator .= '<li><a href="' . CreateContentHREF($c->path) . '">' . NotBlankTitle($c->title) . '</a></li>';
319319
}
320320
$navigator .= "</ul>";
321321
} else {
322-
$navigator .= '<li><a href="' . CreateContentHREF($child->Path()) . '">' . NotBlankTitle($child->Title()) . '</a></li>';
322+
$navigator .= '<li><a href="' . CreateContentHREF($child->path) . '">' . NotBlankTitle($child->title) . '</a></li>';
323323
}
324324
}
325325
} else {
@@ -333,7 +333,7 @@ function CreateNavHelper($parents, $parentsIndex, $currentContent, $children, &$
333333
if ($child === false) {
334334
continue;
335335
}
336-
$navigator .= '<li><a href="' . CreateContentHREF($child->Path()) . '">' . NotBlankTitle($child->Title()) . '</a></li>';
336+
$navigator .= '<li><a href="' . CreateContentHREF($child->path) . '">' . NotBlankTitle($child->title) . '</a></li>';
337337
}
338338
}
339339
}

‎Frontend/tag-viewer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@
9595
foreach($sortedContents as $content){
9696
$parent = $content->Parent();
9797
$vars['childList'][] = [
98-
'title' => NotBlankTitle($content->Title()) . ($parent === false ? '' : ' | ' . NotBlankTitle($parent->Title())),
98+
'title' => NotBlankTitle($content->title) . ($parent === false ? '' : ' | ' . NotBlankTitle($parent->title)),
9999
'summary' => GetDecodedText($content)['summary'],
100-
'url' => CreateContentHREF($content->Path())
100+
'url' => CreateContentHREF($content->path)
101101
];
102102
}
103103

‎Frontend/viewer.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* $vars['addPlainTextLink']
2121
* $vars['addEditLink']
2222
* $vars['openNewTabEditLink']
23-
* $vars['fileDate'] = ['createdAt' => '', 'updatedAt' => '']
23+
* $vars['fileDate'] = ['createdTime' => '', 'modifiedTime' => '']
2424
* $vars['tagline']['tags']
2525
* $vars['tagList']
2626
* $vars['latestContents']
@@ -115,8 +115,12 @@
115115

116116
<?php if (isset($vars['fileDate'])): ?>
117117
<div id="file-date">
118-
<img src='<?=CLIENT_URI?>/Common/CreatedAtStampA.png' alt='公開日'>: <?=$vars['fileDate']['createdAt']?>
119-
<img src='<?=CLIENT_URI?>/Common/UpdatedAtStampA.png' alt='更新日'>: <?=$vars['fileDate']['updatedAt']?>
118+
<?php if (is_int($vars['fileDate']['createdTime'])): ?>
119+
<img src='<?=CLIENT_URI?>/Common/CreatedAtStampA.png' alt='公開日'>: <time><?=date("Y-m-d", $vars['fileDate']['createdTime'])?></time>
120+
<?php endif;?>
121+
<?php if (is_int($vars['fileDate']['modifiedTime'])): ?>
122+
<img src='<?=CLIENT_URI?>/Common/UpdatedAtStampA.png' alt='更新日'>: <time><?=date("Y-m-d", $vars['fileDate']['modifiedTime'])?></time>
123+
<?php endif;?>
120124
</div>
121125
<?php endif;?>
122126

0 commit comments

Comments
 (0)