Merge branch 'develop'

Author: kokoro912

Config/Schema/app.sql

@@ -249,6 +249,6 @@ CREATE TABLE IF NOT EXISTS `ib_cake_sessions` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 INSERT INTO `ib_settings` VALUES ('1', 'title', 'システム名', 'iroha Board');
-INSERT INTO `ib_settings` VALUES ('2', 'copyright', 'コピーライト', 'Copyright (C) 2016-2019 iroha Soft Co.,Ltd. All rights reserved.');
+INSERT INTO `ib_settings` VALUES ('2', 'copyright', 'コピーライト', 'Copyright (C) 2016-2021 iroha Soft Co.,Ltd. All rights reserved.');
 INSERT INTO `ib_settings` VALUES ('3', 'color', 'テーマカラー', '#337ab7');
 INSERT INTO `ib_settings` VALUES ('4', 'information', 'お知らせ', '全体のお知らせを表示します。\r\nこのお知らせは管理機能の「システム設定」にて変更可能です。');

Controller/ContentsQuestionsController.php

@@ -71,6 +71,15 @@ public function index($content_id, $record_id = null)
 				'conditions' => array('Record.id' => $record_id),
 			));
 
+			// 受講者によるテスト結果表示の場合、自身のテスト結果か確認
+			if(
+				($this->action == 'record')&&
+				($record['Record']['user_id']!=$this->Auth->user('id'))
+			)
+			{
+				throw new NotFoundException(__('Invalid access'));
+			}
+			
 			// テスト結果に紐づく問題ID一覧（出題順）を作成
 			$question_id_list = array();
 			foreach($record['RecordsQuestion'] as $question)

Vendor/FileUpload.php

@@ -199,7 +199,7 @@ function getBytes($str)
 				break;
 			case "t":
 			case "tb":
-				$bytes = $matches[1]*1024*1024*1024;
+				$bytes = $matches[1]*1024*1024*1024*1024;
 				break;
 		}
 

View/Layouts/default.ctp

@@ -91,15 +91,10 @@
 	</div>
 
 	<div id="container">
-		<div id="header" class="row">
-		</div>
 		<div id="content" class="row">
 			<?php echo $this->Session->flash(); ?>
-
 			<?php echo $this->fetch('content'); ?>
 		</div>
-		<div id="footer" class="row">
-	</div>
 	</div>
 
 	<div class="ib-theme-color text-center">

View/Settings/admin_index.ctp

@@ -1,4 +1,17 @@
 <?php echo $this->element('admin_menu');?>
+<?php $this->start('script-embedded'); ?>
+<script>
+	$(document).ready(function()
+	{
+		$('option').each(function(){
+			console.log($(this).val());
+			$(this).css('color',		'white');
+			$(this).css('background',	$(this).val());
+			$(this).css('font-weight',	'bold');
+		});
+	});
+</script>
+<?php $this->end(); ?>
 <div class="admin-settings-index">
 	<div class="panel panel-default">
 		<div class="panel-heading">