• R/O
  • SSH
  • HTTPS

epitta-bbs: Commit


Commit MetaInfo

Revision34 (tree)
Time2011-09-24 15:45:34
Authorwajett

Log Message

2011/09/24 投稿系、削除。

Change Summary

Incremental Difference

--- app/actions/page_action.php (revision 33)
+++ app/actions/page_action.php (revision 34)
@@ -34,8 +34,18 @@
3434 }
3535
3636
37+ public function myerror()
38+ {
39+ //スキン
40+ //$this->readSkin('notice');
41+ $this->content = "";
3742
43+ $this->set['view'] = __FUNCTION__;
44+ $this->setLayout('base');
45+ return true;
3846
47+ }
48+
3949 }
4050
4151 ?>
\ No newline at end of file
--- app/actions/article_action.php (revision 33)
+++ app/actions/article_action.php (revision 34)
@@ -121,7 +121,7 @@
121121 $myContent .= getTreeHtml($tr, $this->baseSet['pubURL']);
122122 $branchMap = branchExtender($tree, $tr['id'], $tr['tree_number']);
123123 $depthBranch=array();
124- $myContent .= makeBranch($tree, $tr['id'], $branchMap, $depthBranch);
124+ $myContent .= makeBranch($tree, $tr['id'], $branchMap, $depthBranch, 1, $this->baseSet['pubURL']);
125125 break;
126126 }
127127 }
@@ -195,7 +195,7 @@
195195 $myContent .= getTreeHtml($tr, $this->baseSet['pubURL']);
196196 $branchMap = branchExtender($branches, $tr['id'], $tr['tree_number']);
197197 $depthBranch=array();
198- $myContent .= makeBranch($branches, $tr['id'], $branchMap, $depthBranch);
198+ $myContent .= makeBranch($branches, $tr['id'], $branchMap, $depthBranch, 1, $this->baseSet['pubURL']);
199199
200200 }
201201 $this->content = $myContent;
--- app/actions/post_action.php (revision 33)
+++ app/actions/post_action.php (revision 34)
@@ -35,6 +35,7 @@
3535 $this->postSet['captcha'] = "";
3636
3737 $this->set['pager'] = 0;
38+
3839
3940 }
4041
@@ -76,15 +77,17 @@
7677
7778 } else if ( $mode == 2 ) {
7879 $arc = $this->stripslashes_deep($_POST);
80+ $arc = array_merge( $this->getArtcleHash(), $arc );
7981
8082 } else {
83+ //$arc = $this->getArtcleHash();
8184 $arc = $this->stripslashes_deep($_POST);
82- //var_dump($arc);
85+ $arc = array_merge( $this->getArtcleHash(), $arc );
8386 }
8487
8588
8689 //投稿チケット・CAPTCHAパス
87- if ( empty($_POST) ) {
90+ if ( ! isset($_POST['ticket']) ) {
8891 $dh = $this->loadLib('DataHelper');
8992
9093 //投稿チケット
@@ -99,7 +102,7 @@
99102
100103 //CAPTCHAパス
101104 if ( $GLOBALS['CNF']['captcha_on'] == 1 ) {
102- $this->postSet['captcha_enc'] = $this->getPost('captcha_enc');
105+ $this->postSet['captcha'] = urldecode($this->getPost('captcha_enc'));
103106 }
104107
105108 }
@@ -110,7 +113,7 @@
110113
111114 if ( $mode==3 ) {
112115 //プレビュー
113- $arc['created_at'] = date( "Y/m/d H:i:s", time() );
116+ $arc['created'] = date( "Y/m/d H:i:s", time() );
114117 $arc['clipfile1'] = ''; $arc['clipfile2'] = ''; $arc['clipfile3'] = '';
115118 $this->postSet['preview'] = getArticleHtml($arc, $this->baseSet, $this->artlSet, 0, true);
116119
@@ -138,6 +141,7 @@
138141
139142 $this->set['vw_body'] = 'onLoad="inputInit();"';
140143 $this->set['view'] = 'input';
144+ $GLOBALS['CNF']['vw_robots'] = "noindex,nofollow";
141145 $this->setLayout('base');
142146
143147 return true;
@@ -164,8 +168,8 @@
164168 public function modifyInput($mode=1)
165169 {
166170
167- if ( ! $this->id or ! $this->getPost('article_id', 0) ) {
168- trigger_error ('Invalid article id!');
171+ if ( ! $this->id or empty( $_POST['article_id']) ) {
172+ $this->displayError('Invalid article id!');
169173 }
170174
171175
@@ -186,19 +190,20 @@
186190
187191 //投稿者パスワード確認
188192 if ( empty($org['password']) ) {
189-
193+ $this->displayError( $GLOBALS['LNG']['notSetUserPassword'] );
190194 }
191-
192-
193- //CAPTCHA
194-
195195
196196
197- if ( $this->getPost('article_id') and ! isset($_POST['timekey']) ) {
197+ if ( ! isset($_POST['ticket']) ) {
198198 //記事情報呼び出し
199199 $arc = $org;
200- $arc['auth_password'] = '';
201- $arc['article_id'] = $arc['id'];
200+ $arc['user_password'] = '';
201+ $arc['del_confirm'] = '';
202+ $arc['article_id'] = $this->getPost('article_id');
203+
204+ //投稿チケット
205+ $dh = $this->loadLib('DataHelper');
206+ $arc['ticket'] = $dh->encrypt( time(), EPITTAIDTF );
202207
203208 } else {
204209 //POST戻し
@@ -207,15 +212,15 @@
207212
208213 } else if ( $mode == 2 ) {
209214 $arc = $this->stripslashes_deep($_POST);
215+ $arc = array_merge( $this->getArtcleHash(), $arc );
210216
211217 } else {
212218 $arc = $this->stripslashes_deep($_POST);
213-
219+ $arc = array_merge( $this->getArtcleHash(), $arc );
214220 }
215221
216222 }
217223
218-
219224 //スキン
220225 $this->readSkin('article_input');
221226 $this->readSkin('article');
@@ -223,7 +228,7 @@
223228
224229 if ( $mode==3 ) {
225230 //プレビュー
226- $arc['created_at'] = date( "Y/m/d H:i:s", time() );
231+ $arc['created'] = date( "Y/m/d H:i:s", time() );
227232 $arc['clipfile1'] = ''; $arc['clipfile2'] = ''; $arc['clipfile3'] = '';
228233 $this->postSet['preview'] = getArticleHtml($arc, $this->baseSet, $this->artlSet, 0, true);
229234
@@ -241,7 +246,6 @@
241246
242247 } else if ( $this->action == 'delipt' or $this->action == 'delete' ) {
243248 //$myContent .= getArticleInputHtml($this->baseSet, $arc, $this->postSet, 1);
244-
245249 $this->set['view'] = 'input delete';
246250
247251 }
@@ -249,9 +253,9 @@
249253 $this->content = $myContent;
250254
251255 $this->set['vw_body'] = 'onLoad="inputInit();"';
256+ $GLOBALS['CNF']['vw_robots'] = "noindex,nofollow";
252257 $this->setLayout('base');
253258
254-
255259 }
256260
257261
@@ -272,8 +276,8 @@
272276 $this->postSet['timekey'] = 'faketimekey';
273277
274278 $this->postSet['captcha_on'] = $GLOBALS['CNF']['captcha_on'];
275- $this->postSet['captcha_number'] = "";
276- $this->postSet['captcha_key'] = "";
279+ //$this->postSet['captcha_number'] = "";
280+ //$this->postSet['captcha_key'] = "";
277281
278282 $this->postSet['preview'] = '';
279283 $this->postSet['resto'] = '';
@@ -295,38 +299,41 @@
295299
296300 //バリデート
297301 $vld = $this->loadLib('Validation');
298-
299302
300-
301- //投稿キーワード確認
302- if ( $GLOBALS['CNF']['keyword_on'] == 1 ) {
303- if ( $this->getPost('ticket') != $GLOBALS['CNF']['keyword_a'] ) {
304- array_push($vld->errMsgs, $GLOBALS['LNG']['invalidPostKeyword']);
305- }
306- }
307-
308303 //投稿チケット確認
309304 $dh = $this->loadLib('DataHelper');
310305 $ticketTime = $dh->decrypt( $this->getPost('ticket'), EPITTAIDTF );
311306 $now = time();
312- $now = $now + 7000;
313307 if ( empty($ticketTime) or $now - $ticketTime >= $GLOBALS['CNF']['ticket_limit'] ) {
314- array_push($vld->errMsgs, $GLOBALS['LNG']['invalidTicket']);
315- }
308+ array_push($vld->errMsgs, $GLOBALS['LNG']['invalidTicket'] . "(" .$GLOBALS['CNF']['ticket_limit']. "秒)");
309+
310+ }
316311
317- //画像認証確認
318- if ( $GLOBALS['CNF']['captcha_on'] == 1 ) {
319- if ( $this->getPost('captcha') != $GLOBALS['CNF']['keyword_a'] ) {
320- array_push($vld->errMsgs, $GLOBALS['LNG']['invalidPostKeyword']);
312+ if ( $this->action == 'create' ) {
313+
314+ //投稿キーワード確認
315+ if ( $GLOBALS['CNF']['keyword_on'] == 1 ) {
316+ if ( $this->getPost('answerkey') != $GLOBALS['CNF']['keyword_a'] ) {
317+ array_push($vld->errMsgs, $GLOBALS['LNG']['invalidPostKeyword']);
318+ }
321319 }
320+
321+ //画像認証確認
322+ $dh = $this->loadLib('DataHelper');
323+ if ( $GLOBALS['CNF']['captcha_on'] == 1 ) {
324+ if ( $this->getPost('captcha') != $dh->decrypt( urldecode($this->getPost('captcha_enc')), EPITTAIDTF ) ) {
325+ array_push($vld->errMsgs, $GLOBALS['LNG']['invalidCaptcha']);
326+ }
327+ }
328+
322329 }
323-
330+
324331 //まずここで
325332 if ( ! empty($vld->errMsgs) ) {
326333 $this->postSet['errMessage'] = $GLOBALS['LNG']['postInvalid'];
327334 $this->postSet['errMsgAry'] = $vld->errMsgs;
328335
329- if ( $this->action = 'create' ) {
336+ if ( $this->action == 'create' ) {
330337 $this->createInput(2);
331338 } else {
332339 $this->modifyInput(2);
@@ -333,19 +340,19 @@
333340 }
334341 return;
335342 }
336-
337343
344+
338345 //記事ID & 編集パスワードチェック
339346 if ( $this->action == 'modify' ) {
340347 //編集時
341- if ( $this->getPost('auth_password') ) {
348+ if ( $this->getPost('user_password') ) {
342349
343- if ( ! $this->checkPassword($this->getPost('article_id', 0), $this->getPost('auth_password')) ) {
344- array_push($vld->errMsgs, $GLOBALS['LNG']['failedPassword']);
350+ if ( ! $this->checkUserPassword($this->getPost('article_id', 0), $this->getPost('user_password')) ) {
351+ array_push($vld->errMsgs, $GLOBALS['LNG']['failedUserPassword']);
345352 }
346353
347354 } else {
348- array_push($vld->errMsgs, $GLOBALS['LNG']['failedPassword']);
355+ array_push($vld->errMsgs, $GLOBALS['LNG']['failedUserPassword']);
349356
350357 }
351358
@@ -369,73 +376,62 @@
369376
370377 //ファイルの検査
371378 $uploadFile = array();
372- if ( $GLOBALS['CNF']['clipfile'] >= 1 and $GLOBALS['CNF']['clipfile_types']!='' ) {
373-
374- if ( $_FILES ) {
379+ if ( $this->action == 'create' ) {
380+ if ( $GLOBALS['CNF']['clipfile'] >= 1 and $GLOBALS['CNF']['clipfile_types']!='' ) {
375381
376- //チェック
377- $fileCheck = true;
378- $types = explode(",", $GLOBALS['CNF']['clipfile_types']);
379- foreach ( $_FILES as $key => $file ) {
382+ if ( $_FILES ) {
383+
384+ //チェック(利便性を幽棲して拡張子しかチェックしない)
380385 $fileCheck = true;
381- if ( ! $file['tmp_name'] ) continue;
386+ $types = explode(",", $GLOBALS['CNF']['clipfile_types']);
382387
383- //var_dump($file);
384-
385- $typeOn = false;
386- foreach ( $types as $t ) {
387- //var_dump( strpos($file['type'], $t) );
388+ foreach ( $_FILES as $key => $file ) {
389+ $fileCheck = true;
390+ if ( ! $file['name'] ) continue;
391+
392+ $names = explode('.' , $file['name'] );
393+ $fType = $names[(count($names)-1)];
388394
389- if ( strpos($file['type'], $t) !== false ) {
390- $typeOn = true;
395+ $typeOn = false;
396+ foreach ( $types as $t ) {
397+ if ( strtolower($fType) == strtolower($t) ) {
398+ $typeOn = true;
399+ }
391400 }
392401
402+ if ( ! $typeOn ) {
403+ array_push($vld->errMsgs, $GLOBALS['LNG']['failedFileType']. "(" . $fType . ")");
404+ $fileCheck = false;
405+ break;
406+ }
407+
408+ //ファイルサイズ
409+ if ( $file['size'] > ( $GLOBALS['CNF']['clipfile_maxsize']*1024 ) ) {
410+ array_push($vld->errMsgs, $GLOBALS['LNG']['failedFileSize'] . "(" . $file['size'] . ")");
411+ $fileCheck = false;
412+ break;
413+ }
414+
415+
416+ //情報を格納
417+ if ( $fileCheck == true ) {
418+ $uploadFile[$key] = array( 'name'=>$file["name"], 'tmp_name'=>$file["tmp_name"] );
419+ }
420+
393421 }
394- if ( ! $typeOn ) {
395- array_push($vld->errMsgs, $GLOBALS['LNG']['failedFileType']. "(" . $file['type'] . ")");
396- $fileCheck = false;
397- break;
398- }
399-
400-
401- if ( $file['size'] > ( $GLOBALS['CNF']['clipfile_maxsize']*1024 ) ) {
402- array_push($vld->errMsgs, $GLOBALS['LNG']['failedFileSize'] . "(" . $file['size'] . ")");
403- $fileCheck = false;
404- break;
405- }
406422
407423
408- //情報を格納
409- if ( $fileCheck == true ) {
410- $uploadFile[$key] = array( 'name'=>$file["name"], 'tmp_name'=>$file["tmp_name"] );
411- }
412-
424+ } else {
425+ trigger_error ('Invalid file!');
413426 }
414-
415-
416- } else {
417- exit; //不正
427+
418428 }
419-
429+
420430 }
421431
422432 //var_dump($vld->errMsgs);
423433 //var_dump($uploadFile);
424434 //exit;
425-
426- /*
427- if (is_uploaded_file($_FILES["upfile"]["tmp_name"])) {
428- if (move_uploaded_file($_FILES["upfile"]["tmp_name"], "files/" . $_FILES["upfile"]["name"])) {
429- chmod("files/" . $_FILES["upfile"]["name"], 0644);
430- echo $_FILES["upfile"]["name"] . "をアップロードしました。";
431- } else {
432- echo "ファイルをアップロードできません。";
433- }
434- } else {
435- echo "ファイルが選択されていません。";
436- }
437- */
438-
439435
440436
441437 if ( ! empty($vld->errMsgs) ) {
@@ -442,7 +438,7 @@
442438 $this->postSet['errMessage'] = $GLOBALS['LNG']['postInvalid'];
443439 $this->postSet['errMsgAry'] = $vld->errMsgs;
444440
445- if ( $this->action = 'create' ) {
441+ if ( $this->action == 'create' ) {
446442 $this->createInput(2);
447443 } else {
448444 $this->modifyInput(2);
@@ -455,7 +451,7 @@
455451
456452 if ( isset($_POST['confirm']) and $_POST['confirm']==1) {
457453 //プレビューへ
458- if ( $this->action = 'create' ) {
454+ if ( $this->action == 'create' ) {
459455 $this->createInput(3);
460456 } else {
461457 $this->modifyInput(3);
@@ -465,15 +461,15 @@
465461
466462
467463
468- //
464+ //SQL用に値を加工
469465 $data = $this->getPostArticleForSQL();
470466
471467
472468 //データ加工
473469 $dh = $this->loadLib('dataHelper');
474- $data['pwHash'] = $dh->makePasswordHash($this->getPost('password'));
475- $data['personKey'] =
476- $dh->makePersonKey($this->getPost('author'), $this->getPost('password'), $GLOBALS['USR']['access']['host']);
470+ $data['pwHash'] = $this->qt( $dh->makePasswordHash($this->getPost('password')) );
471+ $data['personKey'] = $this->qt( $dh->makePersonKey($this->getPost('author'),
472+ $this->getPost('password'), $GLOBALS['USR']['access']['host']) );
477473
478474 //添付ファイル
479475 foreach ( $uploadFile as $key => $file ) {
@@ -480,15 +476,6 @@
480476 $data[$key] = $this->qt($file['name']);
481477 }
482478
483-
484- /*
485- var_dump( $GLOBALS['USR']['access'] );
486- echo "<br>";
487- echo $this->getPost('password') ." - ". $data['pwHash'] . "<br>";
488- echo $data['personKey'] . "<br>";
489- exit;
490- */
491-
492479 //var_dump($data);
493480 //exit();
494481
@@ -495,7 +482,6 @@
495482 $artMdl = new Article_model();
496483 if ( empty($data['article_id']) ) {
497484 //Create
498- //echo "INSERT!";
499485 $newId = $artMdl->insertArticle($data);
500486
501487 //ファイル処理
@@ -505,16 +491,13 @@
505491 if ( $ret == false ) trigger_error ('Failed move_uploaded_file.');
506492 }
507493
508- //exit;
509494 //リダイレクト
510495 $this->redirect('act=sngl&a=' . $newId);
511496
512497 } else {
513498 //Modify
514- echo "UPDATE!";
515499 $artMdl->updateArticle($data);
516500
517- exit;
518501 //リダイレクト
519502 $this->redirect('act=sngl&a=' . $data['article_id']);
520503
@@ -541,30 +524,55 @@
541524
542525
543526 $articleId = $this->getPost('article_id', 0);
544- if ( ! $articleId ) trigger_error ('Invalid article id to modify!');
527+ if ( ! $articleId ) trigger_error ('Invalid article id to delete!');
545528
546529
530+ //バリデート(エラー用)
531+ $vld = $this->loadLib('Validation');
532+
533+
534+ if ( empty($_POST['del_confirm']) ) {
535+ array_push($vld->errMsgs, $GLOBALS['LNG']['failedDeleteConfirm']);
536+ }
537+
547538 //記事ID & 編集パスワードチェック
548- if ( $this->getPost('auth_password') ) {
539+ if ( $this->getPost('user_password') ) {
549540
550- if ( ! $this->checkPassword($this->getPost('article_id', 0), $this->getPost('auth_password')) ) {
551- array_push($vld->errMsgs, $GLOBALS['LNG']['failedPassword']);
541+ if ( ! $this->checkUserPassword($articleId, $this->getPost('user_password')) ) {
542+ array_push($vld->errMsgs, $GLOBALS['LNG']['failedUserPassword']);
552543 }
553544
554545 } else {
555- array_push($vld->errMsgs, $GLOBALS['LNG']['failedPassword']);
546+ array_push($vld->errMsgs, $GLOBALS['LNG']['failedUserPassword']);
556547
557548 }
549+
550+
551+ if ( ! empty($vld->errMsgs) ) {
552+ $this->postSet['errMessage'] = $GLOBALS['LNG']['postInvalid'];
553+ $this->postSet['errMsgAry'] = $vld->errMsgs;
558554
559- //記事内容を取得
555+ $this->action = 'modify';
556+ $this->modifyInput(2);
557+ return;
558+ }
559+
560560
561-
562- //if () {
563- //子記事の有無でstatusを制御
564- //}
561+ //記事関係
562+ $status = 9;
563+ $parentId = $this->getPost('parent_id');
564+ if ( $parentId == 0 ) {
565+ //子記事の有無でstatusを制御
566+ $branches = getBranchesCount($parentId);
567+ if ( $branches > 0 ) {
568+ $status = 8;
569+ }
570+ }
571+
572+ //exit;
565573
566574 $artMdl = new Article_model();
567- $artMdl->deleteArticle($articleId, 8);
575+ $artMdl->deleteArticle($articleId, $parentId, $status);
568576
569577 //リダイレクト
570578 $this->redirect('act=sngl&a=' . $articleId);
@@ -574,8 +582,6 @@
574582
575583
576584
577-
578-
579585 /**
580586 * 編集・削除用パスワードチェック
581587 * @param int id
@@ -583,14 +589,21 @@
583589 */
584590 private function checkUserPassword($id, $passoword)
585591 {
586- $ret = true;
592+ $ret = false;
587593
594+ //記事呼び出し
595+ $artMdl = new Article_Model();
596+ $art = $artMdl->getSingleArticle( $id );
588597
589-
590-
591-
592-
598+ if ( !empty($art) ) {
599+ $dh = $this->loadLib('dataHelper');
600+ $pwHash = $dh->makePasswordHash($passoword);
593601
602+
603+ if( $art['password'] == $pwHash ) {
604+ $ret = true;
605+ }
606+ }
594607
595608 return $ret;
596609
--- app/actions/base_action.php (revision 33)
+++ app/actions/base_action.php (revision 34)
@@ -89,13 +89,17 @@
8989
9090 //$this->set['id'] =
9191
92+ $this->set['vw_robots'] = $GLOBALS['CNF']['vw_robots'];
93+ $this->set['vw_keywords'] = $GLOBALS['CNF']['vw_keywords'];
94+ $this->set['vw_description'] = $GLOBALS['CNF']['vw_description'];
9295 $this->set['vw_title'] = $GLOBALS['CNF']['vw_title'];
96+
9397 if ( ! isset($this->set['vw_body']) ) $this->set['vw_body'] = '';
9498 $this->set['vw_header'] = $GLOBALS['CNF']['vw_header'];
9599 $this->set['vw_footer'] = $GLOBALS['CNF']['vw_footer'];
96100
97101
98- $this->set['app_info'] = EPTNAME . EPTVER;
102+ $this->set['app_info'] = EPTNAME ."&nbsp;". EPTVER;
99103
100104 //$this->set['content'] = $this->content;
101105
@@ -276,15 +280,20 @@
276280 'clipfile1' => '',
277281 'clipfile2' => '',
278282 'clipfile3' => '',
283+
284+ 'captcha' => '',
285+ 'answerkey' => '',
286+
279287 'hostaddress' => '',
280288 'useragent' => '',
281289 'remarks' => '',
282290 'status_code' => '',
283- 'tree_updated_at' => '',
284- 'created_at' => '',
285- 'modified_at' => '',
291+ 'tree_updated' => '',
292+ 'created' => '',
293+ 'modified' => '',
286294
287295 'ticket' => '',
296+ 'del_confirm' => '',
288297
289298 );
290299
@@ -291,16 +300,34 @@
291300 }
292301
293302
294- protected function displayError($msg='')
303+ protected function displayError($msg='', $file='')
295304 {
296305
306+ $GLOBALS['ERR']['kind'] = 1;
297307 $GLOBALS['ERR']['message'] = $msg;
308+ $GLOBALS['ERR']['file'] = '';
298309
299- $path = SYSPATH . '/layouts/error.php';
300- require_once($path);
310+ $skinErr = $this->skinPath . '/error.php';
311+ $sysErr = SYSPATH . '/layouts/error.php';
312+ $path = '';
301313
302- exit();
314+ if ( file_exists( $skinErr )) {
315+ $this->readSkin('error');
316+ $this->content = getErrorHtml();
317+
318+ $this->set['view'] = 'error';
319+
320+ $GLOBALS['CNF']['vw_robots'] = "noindex,nofollow";
321+ $this->setLayout('base');
322+
323+ } else {
324+ $path = $sysErr;
325+ require_once($path);
326+
327+ }
303328
329+ exit;
330+
304331 }
305332
306333
--- app/models/base_model.php (revision 33)
+++ app/models/base_model.php (revision 34)
@@ -102,7 +102,7 @@
102102
103103 function execute($sql) {
104104 if ( empty($sql) ) trigger_error ('Empty Query!');
105- //echo $sql;
105+ echo $sql;
106106 $result = sqlite_exec($this->conn, $sql, $this->dbError);
107107 if (!$result) $this->errTrigger('Failed Execute Query!' . $this->dbError);
108108
--- app/models/article_model.php (revision 33)
+++ app/models/article_model.php (revision 34)
@@ -18,7 +18,7 @@
1818
1919 $this->mainFields =
2020 "id, tree_number, parent_id, subject, author, iconfile, clipfile1, clipfile2, clipfile3," .
21- "status_code, tree_updated_at, created_at, modified_at";
21+ "status_code, tree_updated, created, modified";
2222
2323 }
2424
@@ -103,9 +103,9 @@
103103 $maxTree = $onPage * $pageNum;
104104
105105 $sql =
106- " SELECT tree_updated_at, id FROM epitta_articles" .
106+ " SELECT tree_updated, id FROM epitta_articles" .
107107 " WHERE status_code=1 AND parent_id=0" .
108- " ORDER BY tree_updated_at DESC, id DESC LIMIT " . $maxTree;
108+ " ORDER BY tree_updated DESC, id DESC LIMIT " . $maxTree;
109109
110110 //echo $sql;
111111 $rows = $this->getRecord($sql);
@@ -128,7 +128,7 @@
128128 $sql =
129129 " SELECT * FROM epitta_articles" .
130130 " WHERE id IN (" . $ids . ")" .
131- " ORDER BY tree_updated_at DESC, id DESC";
131+ " ORDER BY tree_updated DESC, id DESC";
132132
133133 //echo $sql;
134134 $rows = $this->getRecord($sql);
@@ -160,7 +160,7 @@
160160
161161 $sql = "SELECT * FROM epitta_articles " .
162162 " WHERE status_code<9 AND parent_id!=0 AND tree_number IN (" . $numbers . ")" .
163- " ORDER BY created_at" .$asc. ",id" . $asc;
163+ " ORDER BY created" .$asc. ",id" . $asc;
164164
165165 $rows = $this->getRecord($sql);
166166
@@ -235,9 +235,9 @@
235235 $maxTree = $onPage * $pageNum;
236236
237237 $sql =
238- "SELECT tree_updated_at, id FROM epitta_articles" .
238+ "SELECT tree_updated, id FROM epitta_articles" .
239239 " WHERE status_code=1 AND parent_id=0" .
240- " ORDER BY tree_updated_at DESC, id DESC LIMIT " . $maxTree;
240+ " ORDER BY tree_updated DESC, id DESC LIMIT " . $maxTree;
241241
242242 //echo $sql;
243243 $rows = $this->getRecord($sql);
@@ -261,7 +261,7 @@
261261 " WHERE parent_id!=0 GROUP BY parent_id ) AS ea2" .
262262 " ON epitta_articles.id=ea2.pid" .
263263 " WHERE id IN (" . $ids . ")" .
264- " ORDER BY tree_updated_at DESC, id DESC";
264+ " ORDER BY tree_updated DESC, id DESC";
265265
266266 //echo $sql;
267267 $rows = $this->getRecord($sql);
@@ -326,8 +326,8 @@
326326
327327 $sql =
328328 "SELECT COUNT(id) AS count FROM epitta_articles " .
329- " WHERE status_code<9 AND parent_id=0 AND tree_updated_at >= (" .
330- " SELECT tree_updated_at AS count FROM epitta_articles " .
329+ " WHERE status_code<9 AND parent_id=0 AND tree_updated >= (" .
330+ " SELECT tree_updated AS count FROM epitta_articles " .
331331 " WHERE parent_id=0 AND tree_number>=" . $treeNum . " LIMIT 1" .
332332 ")";
333333
@@ -412,10 +412,10 @@
412412 " tree_number, parent_id, subject, author, password, personkey, article," .
413413 " email, email_code, homepage, fontcolor, iconfile, reserved1, reserved2, reserved3, " .
414414 " clipfile1, clipfile2, clipfile3," .
415- " hostaddress, useragent, tree_updated_at, created_at" .
415+ " hostaddress, useragent, tree_updated, created" .
416416 " ) VALUES ( " .
417417 "{$data['tree_number']}, {$data['parent_id']}, {$data['subject']}, {$data['author']},".
418- "{$data['password']}, {$data['personkey']}," .
418+ "{$data['pwHash']}, {$data['personKey']}," .
419419 "{$data['article']}, {$data['email']}, {$data['email_code']}, {$data['homepage']}," .
420420 "{$data['fontcolor']}, {$data['iconfile']}, {$data['reserved1']}, {$data['reserved2']}, {$data['reserved3']}, " .
421421 "{$data['clipfile1']}, {$data['clipfile2']}, {$data['clipfile3']}, {$data['hostaddress']}, {$data['useragent']}, " .
@@ -431,7 +431,7 @@
431431 //返信時、親記事書き換え
432432 $sql =
433433 "UPDATE epitta_articles SET " .
434- " tree_updated_at=$now" .
434+ " tree_updated=$now" .
435435 " WHERE id={$data['parent_id']}";
436436
437437 $result = $this->execute($sql);
@@ -470,7 +470,7 @@
470470 " reserved1=". $data['reserved1'] . "," .
471471 " reserved2=". $data['reserved2'] . "," .
472472 " reserved3=". $data['reserved3'] . "," .
473- " modified_at=$now" .
473+ " modified=$now" .
474474 " WHERE id={$data['article_id']}";
475475
476476 $result = $this->execute($sql);
@@ -480,7 +480,7 @@
480480 //返信時、親記事書き換え
481481 $sql =
482482 "UPDATE epitta_articles SET " .
483- " tree_updated_at=$now" .
483+ " tree_updated=$now" .
484484 " WHERE id={$data['parent_id']}";
485485
486486 $result = $this->execute($sql);
@@ -501,9 +501,6 @@
501501
502502 function updateAddArticle($data) {
503503
504- //
505- $now = $this->qt( date( "Y-m-d H:i:s", time() ) );
506-
507504 $this->openConn(2);
508505
509506 $now = $this->qt( date( "Y-m-d H:i:s", time() ) );
@@ -512,7 +509,7 @@
512509 "UPDATE epitta_articles SET " .
513510 " article=, " .
514511 " article_add=," .
515- " modified_at=" .
512+ " modified=" .
516513 " WHERE id={$data['article_id']}";
517514
518515 $result = $this->execute($sql);
@@ -522,7 +519,7 @@
522519 //返信時、親記事書き換え
523520 $sql =
524521 "UPDATE epitta_articles SET " .
525- " tree_updated_at=$now" .
522+ " tree_updated=$now" .
526523 " WHERE id={$data['parent_id']}";
527524
528525 $result = $this->execute($sql);
@@ -541,26 +538,26 @@
541538
542539
543540
544- function updateArticleStatus($id, $status) {
541+ function deleteArticle($id, $parentId, $status) {
545542
546543 $this->openConn(2);
547544
548- $now = date( "Y-m-d H:i:s", time() );
545+ $now = $this->qt( date( "Y-m-d H:i:s", time() ) );
549546
550547 $sql =
551548 "UPDATE epitta_articles SET " .
552- " status_code=$status, modified_at=$now" .
553- " WHERE id={$data['article_id']}";
549+ " status_code=$status, modified=$now" .
550+ " WHERE id=$id";
554551
555552 $result = $this->execute($sql);
556553
557554
558- if ( $data['parent_id'] > 0 ) {
555+ if ( ! empty($parentId) ) {
559556 //返信時、親記事書き換え
560557 $sql =
561558 "UPDATE epitta_articles SET " .
562- " tree_updated_at=$now" .
563- " WHERE id={$data['parent_id']}";
559+ " tree_updated=$now" .
560+ " WHERE id=$parentId";
564561
565562 $result = $this->execute($sql);
566563
--- app/app_controller.php (revision 33)
+++ app/app_controller.php (revision 34)
@@ -34,7 +34,8 @@
3434 'crtipt' =>array( 'act'=>'Post', 'func'=>'createInput' ),
3535 'create' =>array( 'act'=>'Post', 'func'=>'save' ),
3636 'modipt' =>array( 'act'=>'Post', 'func'=>'modifyInput' ),
37- 'modify' =>array( 'act'=>'Post', 'func'=>'modify' ),
37+ 'modify' =>array( 'act'=>'Post', 'func'=>'modify' ),
38+ 'delete' =>array( 'act'=>'Post', 'func'=>'delete' ),
3839 //
3940 'srhipt' =>array( 'act'=>'Search', 'func'=>'input' ),
4041 'srhrst' =>array( 'act'=>'Search', 'func'=>'result' ),
--- app/app_config.php (revision 33)
+++ app/app_config.php (revision 34)
@@ -7,7 +7,7 @@
77
88 //バージョン表記など
99 define('EPTNAME', 'Epitta BB');
10-define('EPTVER', 'ver 0.20 dev');
10+define('EPTVER', 'ver 0.22 dev');
1111 define('EPTSITE', 'Epitta PHP Project');
1212 define('EPTURL', 'http://');
1313
--- system/layouts/error.php (revision 33)
+++ system/layouts/error.php (revision 34)
@@ -4,7 +4,7 @@
44 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>" />
55 <meta http-equiv="content-script-type" content="text/javascript">
66 <meta http-equiv="content-style-type" content="text/css">
7-<link rel="stylesheet" type="text/css" href="<?php echo DATAPATH . '/default'; ?>/base.css">
7+<link rel="stylesheet" type="text/css" href="<?php echo PUBURL; ?>/common/css/base.css">
88 <title>ERROR</title>
99 </head>
1010 <body>
@@ -12,22 +12,29 @@
1212 <div class="container">
1313
1414 <!-- header -->
15-<div style="background-color:#ffffcc;">
16-ヘッダー
17-<?php echo ( ! empty($GLOBALS['CNF']['vw_header']) ) ? $GLOBALS['CNF']['vw_header'] : ''; ?>
15+<div style="background-color:#ffffff;">
16+
1817 </div>
1918 <br clear="all" class="clear" />
2019 <!-- header -->
2120
2221
22+
23+<br />
24+<div class="ctr">
25+
26+<table height="300">
27+<tr>
28+<td>
29+
2330 <div class="error">
2431
25-<h1>エラーが発生しました</h1>
32+<h2>エラーが発生しました</h2>
2633
2734 <div>
2835 <?php
2936
30-if ( $GLOBALS['ERR']['kind'] == 1 ) {
37+if ( isset($GLOBALS['ERR']['kind']) and $GLOBALS['ERR']['kind'] == 1 ) {
3138 echo '<div>'. $GLOBALS['ERR']['message'] . '</div>';
3239 echo '<div>'. $GLOBALS['ERR']['file'] . '</div>';
3340
@@ -39,19 +46,29 @@
3946
4047 }
4148
42-
4349 ?>
50+<br />
51+<br />
52+<br />
4453 </div>
4554
4655 </div>
4756
57+
58+</td>
59+</tr>
60+</table>
61+
62+</div>
63+
4864 <br clear="all" class="clear" />
4965
66+
67+
5068 <!-- footer -->
51-<div style="background-color:#ffffcc;">
69+<div style="background-color:#ffffff;">
5270 <br />
53-フッター
54-<?php echo ( ! empty($GLOBALS['CNF']['vw_footer']) ) ? $GLOBALS['CNF']['vw_footer'] : ''; ?>
71+
5572 </div>
5673 <!-- footer -->
5774
--- system/locals/ja/wordlist.php (revision 33)
+++ system/locals/ja/wordlist.php (revision 34)
@@ -100,8 +100,14 @@
100100 'postInvalid' => '入力に不備があります',
101101 'invalidTicket' => '投稿までの時間がかかりすぎました。あらためて投稿しなおしてください。',
102102 'invalidPostKeyword' => '投稿キーワードが正しくありません。',
103+'invalidCaptcha' => '画像認証キーが正しくありません。',
103104
104-'failedPassword' => 'パスワードが不正です。',
105+'failedPassword' => 'パスワードが不正です。',
106+'notSetUserPassword' => '投稿者パスワードが投稿時に設定されていません。',
107+'failedUserPassword' => '投稿者パスワードが合致しません。',
108+'failedDeleteConfirm' => '削除確認がチェックされていません。',
109+
110+
105111 'failedFileType' => '添付するファイルのタイプが許可されていません。',
106112 'failedFileSize' => '添付するファイルのサイズが制限を超えています。',
107113
--- views/pc/default/error.php (nonexistent)
+++ views/pc/default/error.php (revision 34)
@@ -0,0 +1,62 @@
1+<?php
2+function getErrorHtml() {
3+ $myContent = '';
4+
5+$myContent .=<<< HTML
6+
7+<br />
8+<div class="ctr">
9+
10+<table height="300">
11+<tr>
12+<td>
13+
14+<div class="error">
15+
16+<h3>エラーが発生しました</h3>
17+
18+<div>
19+HTML;
20+
21+
22+if ( isset($GLOBALS['ERR']['kind']) and $GLOBALS['ERR']['kind'] == 1 ) {
23+ $myContent .= '<div>'. $GLOBALS['ERR']['message'] . '</div>';
24+ $myContent .= '<div>'. $GLOBALS['ERR']['file'] . '</div>';
25+
26+} else {
27+ $myContent .= '<div>ERROR:['. $GLOBALS['ERR']['number'] . ']:';
28+ $myContent .= ''. $GLOBALS['ERR']['message'] . '</div>';
29+ $myContent .= '<div>File:'. $GLOBALS['ERR']['file'] . '</div>';
30+ $myContent .= '<div>Line:'. $GLOBALS['ERR']['line'] . '</div>';
31+
32+}
33+
34+
35+
36+$myContent .=<<< HTML
37+<br />
38+<br />
39+
40+</div>
41+
42+</div>
43+
44+<br />
45+<br />
46+
47+</td>
48+</tr>
49+</table>
50+
51+
52+</div>
53+
54+<br clear="all" class="clear" />
55+
56+
57+HTML;
58+
59+ return $myContent;
60+}
61+
62+?>
\ No newline at end of file
--- views/pc/default/list.php (revision 33)
+++ views/pc/default/list.php (revision 34)
@@ -7,7 +7,7 @@
77 $myContent .=<<< HTML
88 <div class="tree">
99 <div style="border:1px solid #678;">
10- <a href="?act=trsgl&t={$art['tree_number']}">[TR:{$art['tree_number']}:{$art['id']}]</>:<a href="?act=sngl&a={$art['id']}">{$art['subject']}</a>&nbsp;{$art['author']}&nbsp;{$art['created_at']}
10+ <a href="?act=trsgl&t={$art['tree_number']}">[TR:{$art['tree_number']}:{$art['id']}]</>:<a href="?act=sngl&a={$art['id']}">{$art['subject']}</a>&nbsp;{$art['author']}&nbsp;{$art['created']}
1111 </div>
1212 </div>
1313
--- views/pc/default/topic.php (revision 33)
+++ views/pc/default/topic.php (revision 34)
@@ -28,7 +28,7 @@
2828 </td>
2929 <td>
3030 <div style="border:1px solid #678;">
31- <a href="?act=thsgl&t={$art['tree_number']}">{$art['subject']}</a><br />{$art['created_at']}
31+ <a href="?act=thsgl&t={$art['tree_number']}">{$art['subject']}</a><br />{$art['created']}
3232 </div>
3333 </td>
3434 <td>{$art['author']}</td>
@@ -38,7 +38,7 @@
3838
3939 if ( !empty($last) ) {
4040 $myContent .=<<< HTML
41-{$last['author']}<br />{$last['created_at']}
41+{$last['author']}<br />{$last['created']}
4242 HTML;
4343 }
4444
--- views/pc/default/tree.php (revision 33)
+++ views/pc/default/tree.php (revision 34)
@@ -9,7 +9,7 @@
99 $myContent .=<<< HTML
1010 <div class="tree">
1111 <div style="border:1px solid #678;">
12- <a href="?act=trsgl&t={$art['tree_number']}">[TR:{$art['tree_number']}]</a>:<a href="?act=sngl&a={$art['id']}">[{$art['id']}]:{$art['subject']}</a>$clipfiles&nbsp;{$art['author']}&nbsp;<span class="treeParentDate">{$art['created_at']}</span>
12+ <a href="?act=trsgl&t={$art['tree_number']}">[TR:{$art['tree_number']}]</a>:<a href="?act=sngl&a={$art['id']}">[{$art['id']}]:{$art['subject']}</a>$clipfiles&nbsp;{$art['author']}&nbsp;<span class="treeParentDate">{$art['created']}</span>
1313 </div>
1414 </div>
1515
@@ -26,7 +26,7 @@
2626 $myContent = '';
2727 $myContent .=<<< HTML
2828 <div style="border:1px solid #678;">
29- {$twig}<!--{$art['tree_number']}--><a href="?act=sngl&a={$art['id']}">【{$art['id']}】][pid:{$art['parent_id']}]:{$art['subject']}</a>$clipfiles&nbsp;{$art['author']}&nbsp;<span class="treeChildDate">{$art['created_at']}</span>
29+ {$twig}<!--{$art['tree_number']}--><a href="?act=sngl&a={$art['id']}">【{$art['id']}】][pid:{$art['parent_id']}]:{$art['subject']}</a>$clipfiles&nbsp;{$art['author']}&nbsp;<span class="treeChildDate">{$art['created']}</span>
3030 </div>
3131 HTML;
3232
--- views/pc/default/article_input.php (revision 33)
+++ views/pc/default/article_input.php (revision 34)
@@ -7,8 +7,8 @@
77 $clips = makeFileUpload($postSet['clipfile']);
88 $ftclr = makeFontColorSelect($postSet['ftcolor_on'], $postSet['ftcolors'], $art['fontcolor']);
99 $icon = makeIconSelect($postSet['icon_on'], $postSet['icons'], $art['iconfile']);
10- $captc = makeCaptcha($postSet['captcha_on'], $postSet['captcha'], $baseSet['script'], $baseSet['pubURL']);
11- $kword = makeKeyword($postSet['keyword_on'], $postSet['keyword_q']);
10+ $captc = makeCaptcha($postSet['captcha_on'], $postSet['captcha'], $baseSet['script'], $baseSet['pubURL'], $art['captcha']);
11+ $kword = makeKeyword($postSet['keyword_on'], $postSet['keyword_q'], $art['answerkey'] );
1212 $prev = makePreview($postSet['preview']);
1313 $err = makeError($postSet['errMessage'], $postSet['errMsgAry']);
1414 $prnt = makeResponseTo($postSet['resto']);
@@ -127,11 +127,12 @@
127127 //パーツ作成
128128 $ftclr = makeFontColorSelect($postSet['ftcolor_on'], $postSet['ftcolors'], $art['fontcolor']);
129129 $icon = makeIconSelect($postSet['icon_on'], $postSet['icons'], $art['iconfile']);
130- $captc = makeCaptcha($postSet['captcha_on']);
131- $kword = makeKeyword($postSet['keyword_on'], $postSet['keyword_q'], $postSet['keyword_a']);
132130 $prev = makePreview($postSet['preview']);
133131 $err = makeError($postSet['errMessage'], $postSet['errMsgAry']);
134132
133+ $checked = "";
134+ if ($art['del_confirm']) $checked = "checked";
135+
135136 $myContent = '';
136137 $myContent .=<<< HTML
137138 <div class="ctr">
@@ -189,12 +190,8 @@
189190 <div class="itemName">{$GLOBALS['LNG']['homepage']}:</div>
190191 <div class="itemInput"><input name="homepage" type="text" value="{$art['homepage']}" size="60" class="ime_ia" /></div><div class="clear"></div>
191192
192- {$captc}
193- {$kword}
194-
195-
196193 <div class="itemName"><span class="rqd">*</span>{$GLOBALS['LNG']['password']}:</div>
197- <div class="itemInput"><input name="auth_password" type="text" value="{$art['auth_password']}" size="15" class="ime_ia rqd2" /></div><div class="clear"></div>
194+ <div class="itemInput"><input name="user_password" type="text" value="{$art['user_password']}" size="15" class="ime_ia rqd2" /></div><div class="clear"></div>
198195
199196 <input name="author" type="hidden" value="{$art['author']}" />
200197 <input name="subject" type="hidden" value="{$art['subject']}" />
@@ -206,12 +203,11 @@
206203 <input name="tree_number" type="hidden" value="{$art['tree_number']}" />
207204 <input name="parent_id" type="hidden" value="{$art['parent_id']}" />
208205 <input name="article_id" type="hidden" value="{$art['article_id']}" />
209- <input name="t&#105;&#109;&#101;&#107;&#101;&#121;" type="hidden" value="{$postSet['timekey']}" />
206+ <input name="&#116;i&#99;&#107;e&#116;" type="hidden" value="{$art['ticket']}" />
210207
211208 <div class="itemInput" style="width:40%;"></div>
212209 <div class="itemInput ctr" style="width:19%;"><input type="submit" value="{$GLOBALS['LNG']['modifyButton']}" /></div>
213210 <div class="itemInput" style="width:40%;">
214- <input type="checkbox" name="confirm" value="1" />{$GLOBALS['LNG']['preview']}
215211 </div>
216212 <br clear="all" class="clear" />
217213 </div>
@@ -254,17 +250,32 @@
254250 <div class="inputForm">
255251 <form method="post" action="{$baseSet['script']}" accept-charset="UTF-8">
256252 <div>&nbsp;</div>
253+
254+ <input name="author" type="hidden" value="{$art['author']}" />
255+ <input name="subject" type="hidden" value="{$art['subject']}" />
256+ <input name="article" type="hidden" value="{$art['article']}" />
257+ <input name="email" type="hidden" value="{$art['email']}" />
258+ <input name="email_mode" type="hidden" value="0" />
259+ <input name="homepage" type="hidden" value="{$art['homepage']}" />
260+ <input name="fontcolor" type="hidden" value="{$art['fontcolor']}" />
261+ <input name="iconfile" type="hidden" value="{$art['iconfile']}" />
262+
257263 <div class="itemName"><span class="rqd">*</span>{$GLOBALS['LNG']['password']}:</div>
258- <div class="itemInput"><input name="auth_password" type="text" value="{$art['auth_password']}" size="15" class="ime_ia rqd2" /></div><div class="clear"></div>
264+ <div class="itemInput"><input name="user_password" type="text" value="{$art['user_password']}" size="15" class="ime_ia rqd2" /></div><div class="clear"></div>
259265
260266 <input type="text" name="comment" size="1" maxlength="100" title="ダミーです" style="display:inline; display:none;" />
261267 <input name="id" type="hidden" value="{$baseSet['id']}" />
262268 <input name="plfm" type="hidden" value="{$baseSet['plfm']}" />
269+ <input name="act" type="hidden" value="delete" />
270+ <input name="tree_number" type="hidden" value="{$art['tree_number']}" />
271+ <input name="parent_id" type="hidden" value="{$art['parent_id']}" />
272+ <input name="article_id" type="hidden" value="{$art['article_id']}" />
273+ <input name="&#116;i&#99;&#107;e&#116;" type="hidden" value="{$art['ticket']}" />
263274
264275 <div class="itemInput" style="width:40%;"></div>
265276 <div class="itemInput ctr" style="width:19%;"><input type="submit" value="{$GLOBALS['LNG']['deleteButton']}" /></div>
266277 <div class="itemInput" style="width:40%;">
267- <input type="checkbox" name="confirm" value="1" />{$GLOBALS['LNG']['deleteConfirm']}
278+ <input type="checkbox" name="del_confirm" value="1" $checked />{$GLOBALS['LNG']['deleteConfirm']}
268279 </div>
269280 </form>
270281 <br clear="all" class="clear" />
@@ -412,20 +423,20 @@
412423 return $myContent;
413424 }
414425
415-function makeCaptcha($flag, $strNum, $script, $pubUrl) {
426+function makeCaptcha($flag, $strNum, $script, $pubUrl, $set) {
416427 if ( $flag==0 ) return '';
417428
418429 $myContent = '';
419-
430+ $strNumEnc = urlencode($strNum);
420431 $myContent .=<<< HTML
421432 <div class="itemName">{$GLOBALS['LNG']['captcha']}:</div>
422433 <div class="itemInput">
423- <input type="text" name="captcha" size=6 value="" class="PostInput" style="ime-mode: disabled;" />
424- <input type="hidden" name="captcha_enc" value="$strNum" />
434+ <input type="text" name="captcha" size="6" value="{$set}" class="PostInput" style="ime-mode: disabled;" />
435+ <input type="hidden" name="captcha_enc" value="$strNumEnc" />
425436 HTML;
426437
427438 if ( $flag == 1 ) {
428- $myContent .= "<img src=\"{$script}?act=cpc&cpc=" . urlencode($strNum) . '" width="70" height="20" align="top" class="captcha" />';
439+ $myContent .= "<img src=\"{$script}?act=cpc&cpc=" . $strNumEnc . '" width="70" height="20" align="top" class="captcha" />';
429440
430441 } else if ( $flag == 2 ) {
431442 $num = '';
@@ -444,13 +455,14 @@
444455 }
445456
446457
447-function makeKeyword($flag, $qst) {
458+function makeKeyword($flag, $qst, $set) {
459+ if ( $flag==0 ) return '';
460+
448461 $myContent = '';
449-
450462 $myContent .=<<< HTML
451463 <div class="itemName" style="padding-top:0px;">{$GLOBALS['LNG']['mySubmitKey']}:</div>
452464 <div class="itemInput">$qst<br />
453- <input type="text" name="captcha" size=10 value="" class="PostInput" style="ime-mode: disabled;" />
465+ <input type="text" name="answerkey" size="15" value="{$set}" class="PostInput" style="ime-mode:auto;" />
454466 </div>
455467 <div class="clear"></div>
456468 HTML;
--- views/pc/default/article.php (revision 33)
+++ views/pc/default/article.php (revision 34)
@@ -3,7 +3,7 @@
33
44 function getArticleHtml($art, $baseSet, $artlSet, $indent=0, $prev=false){
55
6- $new = makeNew($art['created_at'], $GLOBALS['CNF']['new_days'], $baseSet['pubURL']);
6+ $new = makeNew($art['created'], $GLOBALS['CNF']['new_days'], $baseSet['pubURL']);
77 $email = makeEmail($art['email']);
88 $homepage = makeHomepage($art['homepage']);
99 $icon = makeIcon($art['iconfile'], $baseSet['pubURL'] . "/img/icon/");
@@ -48,7 +48,7 @@
4848 </div>
4949
5050 <div class="articleTextBoxOut">
51-<div class="articleCreate">{$art['created_at']}</div>
51+<div class="articleCreate">{$art['created']}</div>
5252 <div class="articleTextBox">
5353 {$ftcspan}{$art['article']}</span>
5454
@@ -87,7 +87,7 @@
8787 </div>
8888
8989 <div class="articleTextBoxOut">
90-<div class="articleCreate">{$art['created_at']}</div>
90+<div class="articleCreate">{$art['created']}</div>
9191 <div class="articleTextBox">
9292 {$art['article']}
9393
--- views/pc/default/search.php (revision 33)
+++ views/pc/default/search.php (revision 34)
@@ -61,7 +61,7 @@
6161 $myContent .=<<< HTML
6262 <div class="tree">
6363 <div style="border:1px solid #678;">
64- <a href="?act=trsgl&t={$art['tree_number']}">[{$art['id']}]</>:<a href="?act=sngl&a={$art['id']}" title="{$art['article']}">{$art['subject']}</a>&nbsp;{$art['author']}&nbsp;{$art['created_at']}
64+ <a href="?act=trsgl&t={$art['tree_number']}">[{$art['id']}]</>:<a href="?act=sngl&a={$art['id']}" title="{$art['article']}">{$art['subject']}</a>&nbsp;{$art['author']}&nbsp;{$art['created']}
6565 </div>
6666 </div>\n
6767 HTML;
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
--- views/pc/default/base_layout.php (revision 33)
+++ views/pc/default/base_layout.php (revision 34)
@@ -1,13 +1,16 @@
11 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
22 <html lang="<?php echo LANG; ?>">
33 <head>
4-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>" />
5-<meta http-equiv="content-script-type" content="text/javascript" />
6-<meta http-equiv="content-style-type" content="text/css" />
7-<link rel="stylesheet" type="text/css" href="<?php echo $this->baseSet['pubCmn']; ?>/css/base.css" />
8-<link rel="stylesheet" type="text/css" href="<?php echo $this->baseSet['pubURL']; ?>/css/overwrite.css" />
9-<script type="text/javascript" src="<?php echo $this->baseSet['pubCmn']; ?>/js/common.js"></script>
10-<title><?php echo $this->set['vw_title']; ?></title>
4+ <meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>" />
5+ <meta http-equiv="content-script-type" content="text/javascript" />
6+ <meta http-equiv="content-style-type" content="text/css" />
7+ <meta name="robots" content="<?php echo $this->set['vw_robots']; ?>">
8+ <meta name="keywords" content="<?php echo $this->set['vw_keywords']; ?>">
9+ <meta name="description" content="<?php echo $this->set['vw_description']; ?>">
10+ <link rel="stylesheet" type="text/css" href="<?php echo $this->baseSet['pubCmn']; ?>/css/base.css" />
11+ <link rel="stylesheet" type="text/css" href="<?php echo $this->baseSet['pubURL']; ?>/css/overwrite.css" />
12+ <script type="text/javascript" src="<?php echo $this->baseSet['pubCmn']; ?>/js/common.js"></script>
13+ <title><?php echo $this->set['vw_title']; ?></title>
1114 </head>
1215 <body <?php echo $this->set['vw_body']; ?>>
1316
--- views/pc/default/thread.php (revision 33)
+++ views/pc/default/thread.php (revision 34)
@@ -45,7 +45,7 @@
4545 </div>
4646
4747 <div class="articleTextBoxOut">
48-<div class="articleCreate">{$art['created_at']}</div>
48+<div class="articleCreate">{$art['created']}</div>
4949 <div class="articleTextBox">
5050 {$ftcspan}{$art['article']}</span>
5151
@@ -90,7 +90,7 @@
9090 </div>
9191
9292 <div class="articleTextBoxOut">
93-<div class="articleCreate">[{$art['id']}]&nbsp;{$art['created_at']}</div>
93+<div class="articleCreate">[{$art['id']}]&nbsp;{$art['created']}</div>
9494 <div class="articleTextBox">
9595 {$art['article']}
9696
--- public/common/css/base.css (revision 33)
+++ public/common/css/base.css (revision 34)
@@ -72,12 +72,11 @@
7272
7373 div.itemError {
7474 color:red;
75- display:inline;
75+ display:block;
7676 margin-right:20px;
7777 }
7878
7979
80-
8180 div.menubar {
8281 background-color:#ccddff;
8382 margin: 1px 1px;
Show on old repository browser